diff --git a/.config/nextest.toml b/.config/nextest.toml
new file mode 100644
index 000000000..2a4cd2cb9
--- /dev/null
+++ b/.config/nextest.toml
@@ -0,0 +1,3 @@
+# Minimum cargo-nextest for this repository: GHSA-vc25-qg58-w57c is fixed in 0.9.150 and CI
+# installs exactly that version, so an older nextest refuses to run (exit 92 REQUIRED_VERSION_NOT_MET).
+nextest-version = "0.9.150"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0d1fd873..65fc735bf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     uses: storytold/craft-common-actions/.github/workflows/gate.yml@main
     with:
       # Same craft-fonts commit as release.yml.
-      craft-fonts-ref: a71c20e30af613287c504f7e685ca8fad77752bc
+      craft-fonts-ref: b076417b5880bd4154bd22f00695b1d28c6bea83
       timeout-minutes: 90
       packages: >-
         pkg-config libxkbcommon-dev libwayland-dev libx11-dev libxcb1-dev libxcursor-dev
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index d6b897cec..70a310d38 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -27,4 +27,4 @@ jobs:
     # Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
     uses: storytold/craft-common-actions/.github/workflows/freebsd.yml@main
     with:
-      craft-fonts-ref: a71c20e30af613287c504f7e685ca8fad77752bc
+      craft-fonts-ref: b076417b5880bd4154bd22f00695b1d28c6bea83
diff --git a/.github/workflows/packaging-lint.yml b/.github/workflows/packaging-lint.yml
index f54b0538b..ea61d8430 100644
--- a/.github/workflows/packaging-lint.yml
+++ b/.github/workflows/packaging-lint.yml
@@ -21,3 +21,27 @@ jobs:
   lint:
     # Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
     uses: storytold/craft-common-actions/.github/workflows/packaging-lint.yml@main
+
+  windows-install-policy:
+    timeout-minutes: 10
+    name: Windows installation policy (no app build)
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - name: Install the pinned packaging toolchain
+        shell: pwsh
+        run: |
+          $tools = Join-Path $env:RUNNER_TEMP 'craft-install-policy-wix'
+          dotnet tool install --tool-path $tools wix --version 5.0.2
+          if ($LASTEXITCODE -ne 0) { throw 'WiX installation failed.' }
+          $tools >> $env:GITHUB_PATH
+          $policy = Get-Content -Raw -LiteralPath packaging/windows/install-policy.json | ConvertFrom-Json
+          foreach ($extension in @($policy.extensions)) {
+            & (Join-Path $tools 'wix.exe') extension add -g "WixToolset.$extension.wixext/5.0.2"
+            if ($LASTEXITCODE -ne 0) { throw "WiX extension $extension installation failed." }
+          }
+      - name: Build and check non-executable installer fixtures
+        shell: pwsh
+        run: ./packaging/windows/test-install-policy.ps1 -OutputDirectory (Join-Path $env:RUNNER_TEMP 'craft-install-policy-tests')
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f65960f27..622ace75c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,7 +68,7 @@ jobs:
     with:
       app-name: designcraft
       app-title: DesignCraft
-      craft-fonts-ref: a71c20e30af613287c504f7e685ca8fad77752bc
+      craft-fonts-ref: b076417b5880bd4154bd22f00695b1d28c6bea83
       web-craft-fonts: true
       version: ${{ inputs.version }}
     secrets:
diff --git a/.github/workflows/windows-arm64.yml b/.github/workflows/windows-arm64.yml
index 85856800b..211ed988d 100644
--- a/.github/workflows/windows-arm64.yml
+++ b/.github/workflows/windows-arm64.yml
@@ -26,8 +26,10 @@ permissions:
 
 jobs:
   windows-arm64:
-    # Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
-    uses: storytold/craft-common-actions/.github/workflows/windows-arm64.yml@main
+    # Immutable supporting workflow revision until the new install contract lands upstream.
+    uses: storytold/craft-common-actions/.github/workflows/windows-arm64.yml@8bb4e5ab95443171104ad88113fe1ef9b0e5ce3f
     with:
       app-name: designcraft
       app-dir: DesignCraft
+      install-relative-path: Programs/ArtCraft/DesignCraft
+      install-scope: perUser
diff --git a/ASSETS.md b/ASSETS.md
index 407a26c92..356309cee 100644
--- a/ASSETS.md
+++ b/ASSETS.md
@@ -8,6 +8,8 @@ Generated-in-code art is original and has no file to list: the UI icon set (`cra
 
 | Asset | Author | Source | Licence | Notes |
 |---|---|---|---|---|
+| `epaint_default_fonts/fonts/egui-icons.ttf` (egui dependency) | John Slegers (emoji-icon-font) | https://github.com/storytold/egui/blob/173cc7375d35dc5fbc5b5d0994fdf787f547c5d1/crates/epaint_default_fonts/fonts/egui-icons.txt; original https://github.com/jslegers/emoji-icon-font | MIT (full text in NOTICE) | Small special-icon subset embedded by default_fonts |
+| `epaint_default_fonts/fonts/emoji-icon-font.ttf` (egui dependency) | John Slegers | https://github.com/storytold/egui/blob/173cc7375d35dc5fbc5b5d0994fdf787f547c5d1/crates/epaint_default_fonts/fonts/emoji-icon-font-mit-license.txt; original https://github.com/jslegers/emoji-icon-font | MIT (full text in NOTICE) | Parent face embedded by monochrome_emoji_fonts |
 | `crates/ui-egui/src/i18n/uk.rs` (332 common phrases) | VectorCraft contributors | https://github.com/storytold/vectorcraft/blob/01f329aa99fa0c9517311c7b6cf7233ffc207742/crates/ui-egui/src/i18n/uk.tsv | MIT OR Apache-2.0 | Adapted for DesignCraft context; remaining Ukrainian phrases are original or credited below |
 | `crates/ui-egui/src/i18n/uk.rs` (68 common phrases) | PhotoCraft contributors | https://github.com/storytold/photocraft/blob/ed057bdc6fd89a858c5e0ea4eab158a2a7052dde/crates/ui-egui/src/i18n/uk.tsv | MIT OR Apache-2.0 | Adapted interface vocabulary |
 | `crates/ui-egui/src/i18n/uk.rs` (37 common phrases) | WordCraft contributors | https://github.com/storytold/wordcraft/blob/7fb7b013591e2593fbd038f90bbc535be318e5a3/crates/ui-egui/src/i18n/uk.tsv | MIT OR Apache-2.0 | Adapted interface vocabulary |
diff --git a/CLAUDE.md b/CLAUDE.md
index e8c455b0a..bed556afb 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -16,7 +16,7 @@ People trust DesignCraft with their layouts; a crash loses their work. **This ou
 - **Bound recursion** (seen-sets or depth limits for nested or cyclic documents). **Locks:** `lock().unwrap_or_else(PoisonError::into_inner)` or an error; thread joins are `Result`s.
 - **Last-resort guard:** escaped panics during command execution and file import/export become an error, never a lost document. It's a safety net, not a licence.
 - **Prove it:** every crash fix lands with a small synthetic regression test that panicked before the fix.
-- Clean crates carry `#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]`; new crates start with it. Tests may `unwrap` (`clippy.toml`).
+- Clean crates carry `#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]`; new production crate roots must include the attribute before modules or other crate items, with crate-level `//!` documentation allowed before it. Every new workspace crate must also include `[lints] workspace = true` in `Cargo.toml` to inherit `[workspace.lints]`. Tests may `unwrap` (`clippy.toml`).
 
 ## Non-negotiables
 - **Clean-room.** InDesign is installed on the dev machine and may be *observed* black-box: run it, use its UI with synthetic documents, take screenshots (by window id) stored only under `plan/indesign/screenshots/` (never committed). Never read, disassemble or copy anything inside the InDesign bundle (names/listings only), never copy Adobe icons, artwork, presets or wording beyond feature names, never commit files produced by InDesign. Never copy GPL/AGPL/LGPL code (Scribus, LibreOffice, Ghostscript…).
diff --git a/Cargo.lock b/Cargo.lock
index beb1f6f8f..1c361aef2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,76 +4,70 @@ version = 4
 
 [[package]]
 name = "accesskit"
-version = "0.24.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320"
+checksum = "4e883d1d28c5fd5568c79ed2d2bd48d9f2fd3945c8974ed0f53690ceddb051be"
 dependencies = [
  "uuid",
 ]
 
 [[package]]
 name = "accesskit_atspi_common"
-version = "0.18.1"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8c61bee90b42a772d39d06a740207dc71a4e780004ace1db8d99fb1baaa954"
+checksum = "24f5baf62e34a4a6c30e3d697e4782f821a7337049c44c3b40576a27dfbb580d"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.36.0",
+ "accesskit_consumer",
  "atspi-common",
- "phf",
+ "phf 0.14.0",
  "serde",
  "zvariant",
 ]
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.35.0"
+version = "0.39.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10"
+checksum = "f3da8f27636015191b2264ee1df681503170a632cafd832fdc1edfdd4e3a2fd3"
 dependencies = [
  "accesskit",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.1",
 ]
 
 [[package]]
-name = "accesskit_consumer"
-version = "0.36.0"
+name = "accesskit_ios"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60"
+checksum = "a5280724673bbfa8b30a838c013500b719392989be3b97c5a9964062c252c232"
 dependencies = [
  "accesskit",
- "hashbrown 0.16.1",
-]
-
-[[package]]
-name = "accesskit_consumer"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d10a236f96f87d70732e44520046785431ef01d5bcd6b041317bfadd2f88245"
-dependencies = [
- "accesskit",
- "hashbrown 0.16.1",
+ "accesskit_consumer",
+ "hashbrown 0.17.1",
+ "objc2 0.5.3",
+ "objc2-foundation 0.2.2",
+ "objc2-ui-kit 0.2.2",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.26.3"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce02dc63b43f0c9296af9ac946312a2dc8814427d7a64d2d600971dac55b6076"
+checksum = "123828ceeec755b05255e3976cb0852993202de98a0626c97dd8d34246991f84"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.38.0",
- "hashbrown 0.16.1",
- "objc2 0.5.2",
+ "accesskit_consumer",
+ "hashbrown 0.17.1",
+ "objc2 0.5.3",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
 ]
 
 [[package]]
 name = "accesskit_unix"
-version = "0.21.1"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b016ca8db0ea0ea2ceff29a9d6240391492d960716aa471967c00e8cc8cb197c"
+checksum = "30d5192871228c54f1b0fb4a85cef000e11a3804f25d2165f14afa0daa67f3f6"
 dependencies = [
  "accesskit",
  "accesskit_atspi_common",
@@ -89,13 +83,13 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.32.1"
+version = "0.35.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21"
+checksum = "498668b90da9995302a0055aaecad4756932333da2ddef6baee1c00844c430fc"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.35.0",
- "hashbrown 0.16.1",
+ "accesskit_consumer",
+ "hashbrown 0.17.1",
  "static_assertions",
  "windows",
  "windows-core",
@@ -103,11 +97,12 @@ dependencies = [
 
 [[package]]
 name = "accesskit_winit"
-version = "0.32.2"
+version = "0.34.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe9a94394896352cc4660ca2288bd4ef883d83238853c038b44070c8f134313"
+checksum = "cd4ab4437b520ff03088fbe48676a11e7d44a929535e64b31432c1073e48dbcc"
 dependencies = [
  "accesskit",
+ "accesskit_ios",
  "accesskit_macos",
  "accesskit_unix",
  "accesskit_windows",
@@ -212,30 +207,31 @@ checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
 [[package]]
 name = "arbitrary"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
+checksum = "3bc62ac97cc33321f50863d514c3bc38a453947a8f9e781137e47c7401020aed"
 dependencies = [
  "derive_arbitrary",
 ]
 
 [[package]]
 name = "arboard"
-version = "3.6.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
+checksum = "aeb9553e62312c8756a5979254fc6d7da8bbeb5986a1e17037fab932f7037917"
 dependencies = [
  "clipboard-win",
  "image",
  "log",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
  "parking_lot",
  "percent-encoding",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
+ "wl-clipboard-rs",
  "x11rb",
 ]
 
@@ -250,6 +246,9 @@ name = "arrayvec"
 version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "as-raw-xcb-connection"
@@ -353,13 +352,13 @@ dependencies = [
 
 [[package]]
 name = "async-recursion"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+checksum = "4f8abc12baad266b1c8cec146854c195b5864b4221d4b2ca7296a7ae82d9e451"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.119",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -394,7 +393,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -446,12 +445,48 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
+[[package]]
+name = "aws-lc-rs"
+version = "1.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faac5829c2b74c28f830747e7818ccfb684261b5f48a1118b1e2a13d36dfab13"
+dependencies = [
+ "aws-lc-sys",
+ "untrusted 0.7.1",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1622d8446a2d4b2ce0c7eefc73dd43a99779028d5ee5c2dd8073a658ba8a2bc"
+dependencies = [
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+ "pkg-config",
+]
+
 [[package]]
 name = "base64"
 version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
+
+[[package]]
+name = "base64ct"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
+
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -470,6 +505,15 @@ dependencies = [
  "bit-vec 0.9.1",
 ]
 
+[[package]]
+name = "bit-set"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56d87354e4229f54a44f7bf2435906a4656dba36026ab6eaca629a2c436a691c"
+dependencies = [
+ "bit-vec 0.10.1",
+]
+
 [[package]]
 name = "bit-vec"
 version = "0.8.0"
@@ -482,6 +526,16 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
 
+[[package]]
+name = "bit-vec"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269"
+dependencies = [
+ "borsh",
+ "serde",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -494,13 +548,22 @@ version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "block2"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
 dependencies = [
- "objc2 0.5.2",
+ "objc2 0.5.3",
 ]
 
 [[package]]
@@ -509,7 +572,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 dependencies = [
- "objc2 0.6.4",
+ "objc2 0.6.5",
 ]
 
 [[package]]
@@ -525,6 +588,30 @@ dependencies = [
  "piper",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"
+dependencies = [
+ "borsh-derive",
+ "bytes",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
 [[package]]
 name = "brotli"
 version = "8.0.4"
@@ -569,7 +656,7 @@ checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -600,14 +687,13 @@ dependencies = [
 
 [[package]]
 name = "calloop"
-version = "0.14.4"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
+checksum = "43b32313e937c8721c9d17ee9bf60699a6402b4b7c2cb6ac1bee0ffcaa4b4e5e"
 dependencies = [
  "bitflags 2.13.2",
  "polling",
  "rustix 1.1.5",
- "slab",
  "tracing",
 ]
 
@@ -629,7 +715,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa"
 dependencies = [
- "calloop 0.14.4",
+ "calloop 0.14.5",
  "rustix 1.1.5",
  "wayland-backend",
  "wayland-client",
@@ -652,9 +738,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.5.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f360145194ee8e21db5ee7f3fcd4fe52210864c75c985dae33218202c8bbe040"
+checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -683,24 +769,82 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "chacha20"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.1",
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
+ "iana-time-zone",
+ "js-sys",
  "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "windows-link",
 ]
 
 [[package]]
 name = "clipboard-win"
-version = "5.4.1"
+version = "5.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
+checksum = "052af7878466feccda12ba7a6a67d019d712f296809559b47c12c8cc196d3a9a"
 dependencies = [
  "error-code",
 ]
 
+[[package]]
+name = "cmake"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "cmpv2"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "961b955a666e25ee5a1091d219128d6e6401e3dab84efb1a2bf6b4035d797b39"
+dependencies = [
+ "crmf",
+ "der",
+ "spki",
+ "x509-cert",
+]
+
+[[package]]
+name = "cms"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b77c319abfd5219629c45c34c89ba945ed3c5e49fcde9d16b6c3885f118a730"
+dependencies = [
+ "const-oid",
+ "der",
+ "spki",
+ "x509-cert",
+]
+
+[[package]]
+name = "cobs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
+dependencies = [
+ "thiserror 2.0.21",
+]
+
 [[package]]
 name = "codespan-reporting"
 version = "0.13.1"
@@ -739,9 +883,9 @@ dependencies = [
 
 [[package]]
 name = "combine"
-version = "4.6.8"
+version = "4.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e"
+checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92"
 dependencies = [
  "bytes",
  "memchr",
@@ -756,6 +900,12 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -766,6 +916,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -779,7 +939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-graphics-types",
  "foreign-types",
  "libc",
@@ -792,7 +952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
@@ -802,12 +962,18 @@ version = "20.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
 dependencies = [
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-graphics",
  "foreign-types",
  "libc",
 ]
 
+[[package]]
+name = "core_detect"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48"
+
 [[package]]
 name = "core_maths"
 version = "0.1.1"
@@ -817,10 +983,28 @@ dependencies = [
  "libm",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "craft-atomic"
 version = "0.1.0"
-source = "git+https://github.com/storytold/craft-libs?rev=e9546e191dd62f2bc1d61eca45dbdc2f1b3c1d8e#e9546e191dd62f2bc1d61eca45dbdc2f1b3c1d8e"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "rustix 1.1.5",
 ]
@@ -828,20 +1012,73 @@ dependencies = [
 [[package]]
 name = "craft-cms"
 version = "0.1.0"
-source = "git+https://github.com/storytold/craft-libs?rev=e9546e191dd62f2bc1d61eca45dbdc2f1b3c1d8e#e9546e191dd62f2bc1d61eca45dbdc2f1b3c1d8e"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "craft-dialogs"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=1a11a4897865f7410c40d25ca6e452ce399a1a2c#1a11a4897865f7410c40d25ca6e452ce399a1a2c"
+dependencies = [
+ "block2 0.6.2",
+ "objc2 0.6.5",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
+ "raw-window-handle",
+ "rfd",
+]
+
 [[package]]
 name = "craft-docpath"
 version = "0.1.0"
-source = "git+https://github.com/storytold/craft-libs?rev=82a24b006eefa036b43c09a67fb9a3fbd17ffe63#82a24b006eefa036b43c09a67fb9a3fbd17ffe63"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+
+[[package]]
+name = "craft-fonts-build"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+
+[[package]]
+name = "craft-i18n"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+dependencies = [
+ "fixed_decimal",
+ "icu_decimal",
+ "icu_locale_core",
+ "icu_locale_fallback",
+ "icu_normalizer",
+ "icu_plurals",
+ "icu_properties",
+ "icu_provider",
+ "icu_provider_adapters",
+ "icu_provider_blob",
+ "log",
+ "objc2-foundation 0.3.2",
+ "sys-locale",
+ "unicode-bidi",
+ "windows-registry",
+ "writeable",
+]
+
+[[package]]
+name = "craft-keymap"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+dependencies = [
+ "craft-i18n",
+ "craft-ui",
+ "egui",
+ "serde",
+ "serde_json",
+]
 
 [[package]]
 name = "craft-pdf"
 version = "0.1.0"
-source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "bytemuck",
  "hayro",
@@ -851,32 +1088,118 @@ dependencies = [
  "thiserror 2.0.21",
 ]
 
+[[package]]
+name = "craft-prepress"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+dependencies = [
+ "craft-cms",
+ "craft-pdf",
+ "kurbo",
+ "linesweeper",
+ "thiserror 2.0.21",
+ "ttf-parser",
+]
+
 [[package]]
 name = "craft-print"
 version = "0.1.0"
-source = "git+https://github.com/storytold/craft-libs?rev=d991bf6792f8ade99c51358bf3c1d902c8cd96b5#d991bf6792f8ade99c51358bf3c1d902c8cd96b5"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
+ "craft-winprint-gdi",
+ "miniz_oxide 0.9.1",
+ "roxmltree 0.21.2",
  "tempfile",
+ "winprint",
+ "winsafe",
 ]
 
 [[package]]
 name = "craft-ui"
 version = "0.1.0"
-source = "git+https://github.com/storytold/craft-libs?rev=5c874d51eeb3de70e735c8ce87a59a7dedd47675#5c874d51eeb3de70e735c8ce87a59a7dedd47675"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+dependencies = [
+ "craft-fonts-build",
+ "craft-i18n",
+ "egui",
+ "epaint",
+ "js-sys",
+ "log",
+ "objc2 0.6.5",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
+ "serde",
+ "skrifa 0.44.0",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "craft-update"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+dependencies = [
+ "chrono",
+ "dunce",
+ "egui",
+ "flate2",
+ "getrandom 0.3.4",
+ "log",
+ "plist",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tar",
+ "tempfile",
+ "ureq",
+ "verifysign",
+ "winreg",
+ "winsafe",
+ "zip 9.1.1",
+]
+
+[[package]]
+name = "craft-window"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "egui",
- "serde",
+ "objc2 0.6.5",
+ "objc2-app-kit 0.3.2",
+ "wayland-client",
+]
+
+[[package]]
+name = "craft-winprint-gdi"
+version = "0.1.0"
+source = "git+https://github.com/storytold/winprint.rs?rev=417ac3c4d14d3da5485a99c7d5ce8f05664ec312#417ac3c4d14d3da5485a99c7d5ce8f05664ec312"
+dependencies = [
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78"
+checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"
 dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crmf"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36fe21b96d5b87f5de4b5b7202ec41c00110ac817ce6728fe75fb2fe5962ed92"
+dependencies = [
+ "cms",
+ "der",
+ "spki",
+ "x509-cert",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.17"
@@ -917,6 +1240,16 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
 [[package]]
 name = "cursor-icon"
 version = "1.2.0"
@@ -930,21 +1263,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
 
 [[package]]
-name = "derive_arbitrary"
-version = "1.4.2"
+name = "der"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+dependencies = [
+ "const-oid",
+ "der_derive",
+ "flagset",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "der_derive"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e"
+
+[[package]]
+name = "derive_arbitrary"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b034bd7d5f032402a2479444dcc6f74e36a03f31854d41680fb240ef682a1ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
 [[package]]
 name = "designcraft"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "arboard",
+ "craft-update",
+ "craft-window",
  "designcraft-engine",
  "designcraft-ui-egui",
  "eframe",
@@ -952,7 +1317,7 @@ dependencies = [
  "fmv-macos-events",
  "log",
  "muda",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "rfd",
  "serde",
@@ -964,7 +1329,7 @@ dependencies = [
 
 [[package]]
 name = "designcraft-cli"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "designcraft-color",
  "designcraft-compose",
@@ -980,7 +1345,7 @@ dependencies = [
 
 [[package]]
 name = "designcraft-color"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "craft-cms",
  "kurbo",
@@ -992,7 +1357,7 @@ dependencies = [
 
 [[package]]
 name = "designcraft-compose"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "designcraft-color",
  "designcraft-doc",
@@ -1012,7 +1377,7 @@ dependencies = [
 
 [[package]]
 name = "designcraft-doc"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "chrono",
  "designcraft-color",
@@ -1025,11 +1390,12 @@ dependencies = [
 
 [[package]]
 name = "designcraft-engine"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "caseless",
  "craft-atomic",
  "craft-docpath",
+ "craft-prepress",
  "craft-print",
  "designcraft-color",
  "designcraft-compose",
@@ -1051,7 +1417,7 @@ dependencies = [
  "indd",
  "kurbo",
  "log",
- "quick-xml",
+ "quick-xml 0.41.0",
  "same-file",
  "serde",
  "serde_json",
@@ -1059,22 +1425,22 @@ dependencies = [
  "thiserror 2.0.21",
  "unicode-segmentation",
  "wasm-bindgen-test",
- "zip",
+ "zip 3.0.0",
 ]
 
 [[package]]
 name = "designcraft-epub"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "chrono",
  "designcraft-color",
  "designcraft-doc",
- "zip",
+ "zip 3.0.0",
 ]
 
 [[package]]
 name = "designcraft-fonts"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "core-text",
  "harfrust 0.13.3",
@@ -1087,19 +1453,19 @@ dependencies = [
 
 [[package]]
 name = "designcraft-format"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "designcraft-doc",
  "designcraft-images",
  "serde",
  "serde_json",
  "thiserror 2.0.21",
- "zip",
+ "zip 3.0.0",
 ]
 
 [[package]]
 name = "designcraft-geom"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "flo_curves",
  "kurbo",
@@ -1112,7 +1478,7 @@ dependencies = [
 
 [[package]]
 name = "designcraft-idml"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "designcraft-color",
  "designcraft-compose",
@@ -1120,20 +1486,22 @@ dependencies = [
  "designcraft-geom",
  "designcraft-images",
  "log",
- "quick-xml",
+ "quick-xml 0.41.0",
  "thiserror 2.0.21",
- "zip",
+ "zip 3.0.0",
 ]
 
 [[package]]
 name = "designcraft-images"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "craft-cms",
  "designcraft-color",
  "designcraft-fonts",
+ "flate2",
  "image",
  "log",
+ "quick-xml 0.41.0",
  "resvg",
  "tiff",
  "zune-core",
@@ -1142,7 +1510,7 @@ dependencies = [
 
 [[package]]
 name = "designcraft-mcp"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "designcraft-engine",
  "designcraft-geom",
@@ -1155,10 +1523,12 @@ dependencies = [
 
 [[package]]
 name = "designcraft-pdf"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "chrono",
+ "craft-cms",
  "craft-pdf",
+ "craft-prepress",
  "designcraft-color",
  "designcraft-compose",
  "designcraft-doc",
@@ -1178,7 +1548,7 @@ dependencies = [
 
 [[package]]
 name = "designcraft-pptx"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "chrono",
  "designcraft-color",
@@ -1188,15 +1558,15 @@ dependencies = [
  "designcraft-geom",
  "designcraft-images",
  "image",
- "quick-xml",
+ "quick-xml 0.41.0",
  "skrifa 0.47.0",
  "thiserror 2.0.21",
- "zip",
+ "zip 3.0.0",
 ]
 
 [[package]]
 name = "designcraft-render"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "craft-pdf",
  "designcraft-color",
@@ -1215,16 +1585,16 @@ dependencies = [
 
 [[package]]
 name = "designcraft-textimport"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "designcraft-doc",
- "quick-xml",
- "zip",
+ "quick-xml 0.41.0",
+ "zip 3.0.0",
 ]
 
 [[package]]
 name = "designcraft-tools"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "designcraft-color",
  "designcraft-compose",
@@ -1236,9 +1606,14 @@ dependencies = [
 
 [[package]]
 name = "designcraft-ui-egui"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
+ "craft-dialogs",
+ "craft-keymap",
+ "craft-prepress",
  "craft-ui",
+ "craft-update",
+ "craft-window",
  "designcraft-color",
  "designcraft-compose",
  "designcraft-doc",
@@ -1251,19 +1626,19 @@ dependencies = [
  "egui",
  "egui_kittest",
  "log",
+ "raw-window-handle",
  "serde",
  "serde_json",
  "tempfile",
  "toml",
  "unicode-bidi",
- "unicode-bidi-mirroring",
- "unicode-segmentation",
- "zip",
+ "web-time",
+ "zip 3.0.0",
 ]
 
 [[package]]
 name = "designcraft-web"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "designcraft-engine",
  "designcraft-format",
@@ -1293,6 +1668,16 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -1308,7 +1693,7 @@ dependencies = [
  "bitflags 2.13.2",
  "block2 0.6.2",
  "libc",
- "objc2 0.6.4",
+ "objc2 0.6.5",
 ]
 
 [[package]]
@@ -1319,7 +1704,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1353,10 +1738,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
-name = "ecolor"
-version = "0.36.2"
+name = "dunce"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0656a7530b9e2841ee7a5f983965bdd9840c32f4012f759cfd44b912cced6b34"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "ecolor"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "bytemuck",
  "emath",
@@ -1364,9 +1754,8 @@ dependencies = [
 
 [[package]]
 name = "eframe"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ad41fac6e3149abb4866e93df37dbd33baa95db525c3368c944584e95a5dc2"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1380,7 +1769,7 @@ dependencies = [
  "image",
  "js-sys",
  "log",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
  "parking_lot",
@@ -1388,6 +1777,7 @@ dependencies = [
  "pollster 1.0.1",
  "profiling",
  "raw-window-handle",
+ "send_wrapper",
  "static_assertions",
  "wasm-bindgen",
  "web-sys",
@@ -1399,9 +1789,8 @@ dependencies = [
 
 [[package]]
 name = "egui"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc938cc27cd911415e1e4d151bc56ff9df063d8db081374e87aeb805ea74b2ba"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "accesskit",
  "ahash",
@@ -1419,9 +1808,8 @@ dependencies = [
 
 [[package]]
 name = "egui-wgpu"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cef1f6d1bba40b09a4d0d62cb822b81030922cfbf65c5373398c3a3caafc5bd"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1439,31 +1827,34 @@ dependencies = [
 
 [[package]]
 name = "egui-winit"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98466000559d66ba4db786a30448b01483946add4188e7f10f522a27b4fb89cc"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "accesskit_winit",
  "arboard",
+ "block2 0.6.2",
  "bytemuck",
  "egui",
+ "image",
  "log",
- "objc2 0.6.4",
+ "objc2 0.6.5",
+ "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
  "objc2-ui-kit 0.3.2",
+ "parking_lot",
  "profiling",
  "raw-window-handle",
  "smithay-clipboard",
  "web-time",
  "webbrowser",
+ "windows-sys 0.61.2",
  "winit",
 ]
 
 [[package]]
 name = "egui_glow"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "606ed4167daf341e5753d703285c4c1d562324b2c07aa8f405cd7d066fe58f3b"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1475,9 +1866,8 @@ dependencies = [
 
 [[package]]
 name = "egui_kittest"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb3f3effb2726fee23449293e67acbf6cc6ce35525b1722bd5743bb348114d5"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "dify",
  "eframe",
@@ -1496,19 +1886,32 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"
+checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"
 
 [[package]]
 name = "emath"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52c8d4141cf0f60fb2f7aefaf352d3ffa5171ef0ab09731c64391801e95e48f1"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e985e0451871ad22fb8d2b6b076e2028a502a0d3950998c2c5c0a4f9b5d9679"
+dependencies = [
+ "cfg-if",
+ "core_detect",
+ "multiversion_no_op",
+ "rustversion",
+ "scopeguard",
+ "simdutf8",
+]
+
 [[package]]
 name = "endi"
 version = "1.1.1"
@@ -1538,16 +1941,15 @@ dependencies = [
 
 [[package]]
 name = "epaint"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ec0308dc23130fc1a7d4623a8534c2ed069c6dc84e258ee4f3de99615aa1a3"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "ahash",
  "bytemuck",
  "ecolor",
  "emath",
  "epaint_default_fonts",
- "font-types 0.12.5",
+ "font-types 0.12.7",
  "harfrust 0.12.0",
  "log",
  "nohash-hasher",
@@ -1556,22 +1958,23 @@ dependencies = [
  "self_cell",
  "skrifa 0.44.0",
  "smallvec",
+ "unicode-bidi",
  "unicode-general-category",
+ "unicode-properties",
  "unicode-segmentation",
- "vello_cpu 0.1.0",
+ "vello_cpu 0.2.0",
 ]
 
 [[package]]
 name = "epaint_default_fonts"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773fa9c96dd0dbef887e39d0ed6177f141cce4d68e6041df77570aa3702dfa13"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
 
 [[package]]
 name = "errno"
@@ -1657,10 +2060,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693"
 
 [[package]]
-name = "find-msvc-tools"
-version = "0.1.14"
+name = "filetime"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
+checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759"
+dependencies = [
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"
+
+[[package]]
+name = "fixed_decimal"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2214fb00f669ee96bee5bb29dfb1ddabe058b2bc426817efc79afa03c9bc55ae"
+dependencies = [
+ "displaydoc",
+ "smallvec",
+ "writeable",
+]
+
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
+[[package]]
+name = "flagset"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
 
 [[package]]
 name = "flate2"
@@ -1694,13 +2130,35 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "fmt-derive"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cb4a4b45c26455885f8b462db12978e51f60cc914337bccb9a36faf93410169"
+dependencies = [
+ "fmt-derive-proc",
+]
+
+[[package]]
+name = "fmt-derive-proc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7704da0760734344ce8753f15b21e97c6be85dc5a8f2c3a963fbd042b3380d23"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "fmv-macos-events"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90642cf66dde7f205dc8b42dfe57b47d0f3a29f571b832742883ef512e23fe55"
 dependencies = [
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
 ]
@@ -1711,6 +2169,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
 [[package]]
 name = "foldhash"
 version = "0.2.0"
@@ -1728,9 +2192,9 @@ dependencies = [
 
 [[package]]
 name = "font-types"
-version = "0.12.5"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8eb065f3251655b3c90e22e5e363f310fc5332fb3402e37bbc94752283248f6"
+checksum = "835ae9d781464a79026cde387f9cbc650c9a4909d7cf7e658b127e3c35d2f35d"
 dependencies = [
  "bytemuck",
 ]
@@ -1776,7 +2240,7 @@ checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1794,6 +2258,22 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
+[[package]]
+name = "futures-channel"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
 [[package]]
 name = "futures-core"
 version = "0.3.34"
@@ -1827,9 +2307,15 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
+[[package]]
+name = "futures-sink"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d"
+
 [[package]]
 name = "futures-task"
 version = "0.3.34"
@@ -1843,12 +2329,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
 dependencies = [
  "futures-core",
+ "futures-io",
  "futures-macro",
+ "futures-sink",
  "futures-task",
+ "memchr",
  "pin-project-lite",
  "slab",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "gethostname"
 version = "1.1.0"
@@ -1868,6 +2367,19 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.3.4"
@@ -1887,8 +2399,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 6.0.0",
+ "rand_core 0.10.1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1919,7 +2434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d99fc21d493812643aae86d53b7bbd02f376434a90317e8a790bc209fdd6605e"
 dependencies = [
  "bytemuck",
- "foldhash",
+ "foldhash 0.2.0",
  "hashbrown 0.17.1",
  "log",
  "peniko",
@@ -1929,22 +2444,6 @@ dependencies = [
  "vello_common 0.0.9",
 ]
 
-[[package]]
-name = "glifo"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed4a1bb24121291d27230c1b1b44e07d6a9b28cefdb32fe1581dfb84e14f940a"
-dependencies = [
- "bytemuck",
- "foldhash",
- "hashbrown 0.17.1",
- "log",
- "peniko",
- "skrifa 0.44.0",
- "smallvec",
- "vello_common 0.1.0",
-]
-
 [[package]]
 name = "glifo"
 version = "0.3.0"
@@ -1952,7 +2451,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282a26c1e23de04bdab3e34a21b6f877a479b96737792516b9b8b8f69b6661be"
 dependencies = [
  "bytemuck",
- "foldhash",
+ "foldhash 0.2.0",
  "hashbrown 0.17.1",
  "log",
  "peniko",
@@ -1988,7 +2487,7 @@ dependencies = [
  "glutin_glx_sys",
  "glutin_wgl_sys",
  "libloading",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -2063,6 +2562,25 @@ dependencies = [
  "euclid",
 ]
 
+[[package]]
+name = "h2"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d29020232d6aa3fb1daca64c1127cf662cf97f254ae16c18c05b8ab635fc118"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "half"
 version = "2.7.1"
@@ -2100,6 +2618,15 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash 0.1.5",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.16.1"
@@ -2108,7 +2635,7 @@ checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
  "allocator-api2",
  "equivalent",
- "foldhash",
+ "foldhash 0.2.0",
 ]
 
 [[package]]
@@ -2117,13 +2644,13 @@ version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 dependencies = [
- "foldhash",
+ "foldhash 0.2.0",
 ]
 
 [[package]]
 name = "hayro"
 version = "0.7.1"
-source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "bytemuck",
  "hayro-interpret",
@@ -2143,7 +2670,7 @@ checksum = "9f4d0e94ddd48749f06bbe4e5389fb9799a0c45bcaf00495042076ef05e3241a"
 [[package]]
 name = "hayro-cmap"
 version = "0.1.0"
-source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "brotli",
  "hayro-postscript",
@@ -2152,14 +2679,14 @@ dependencies = [
 [[package]]
 name = "hayro-interpret"
 version = "0.7.0"
-source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "bitflags 2.13.2",
  "hayro-cmap",
  "hayro-syntax",
  "kurbo",
  "moxcms",
- "phf",
+ "phf 0.13.1",
  "rustc-hash 2.1.3",
  "siphasher",
  "skrifa 0.47.0",
@@ -2170,7 +2697,7 @@ dependencies = [
 [[package]]
 name = "hayro-jbig2"
 version = "0.3.0"
-source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "fearless_simd",
  "hayro-ccitt",
@@ -2188,13 +2715,12 @@ dependencies = [
 [[package]]
 name = "hayro-postscript"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "885c5ef0654933139a9b9546fc2c69e18d37f38aa2520f079092b1be18f1fcaa"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 
 [[package]]
 name = "hayro-syntax"
 version = "0.7.2"
-source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "flate2",
  "hayro-ccitt",
@@ -2224,6 +2750,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.5.3"
@@ -2236,12 +2768,137 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "http"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0"
+dependencies = [
+ "bytes",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "hyper"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c3e324da4c95177d6291d4c8730197c0d1822f8a9766814a4a44fa5ab797c9c"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddc03d96684f9226b8a787cdb71488417b53ab5ea8fdb1dac946cb9431cc8bff"
+dependencies = [
+ "base64 0.23.1",
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "httparse",
+ "hyper",
+ "ipnet",
+ "libc",
+ "percent-encoding",
+ "pin-project-lite",
+ "socket2",
+ "system-configuration",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "windows-registry",
+]
+
 [[package]]
 name = "hypher"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45f2b4f6b5da34d400d4c112eadcc14512cc5d04307a8eee182586d9bebd7ce6"
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "icu_collections"
 version = "2.3.0"
@@ -2256,6 +2913,23 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "icu_decimal"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eb8f655bba2d0c0459e43a5b0e6cd3cd388109898fb3d85d048165e8b0abd08"
+dependencies = [
+ "displaydoc",
+ "fixed_decimal",
+ "icu_locale_core",
+ "icu_pattern",
+ "icu_plurals",
+ "icu_provider",
+ "serde",
+ "writeable",
+ "zerovec",
+]
+
 [[package]]
 name = "icu_locale_core"
 version = "2.3.0"
@@ -2264,11 +2938,32 @@ checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb"
 dependencies = [
  "displaydoc",
  "litemap",
+ "serde",
  "tinystr",
  "writeable",
  "zerovec",
 ]
 
+[[package]]
+name = "icu_locale_fallback"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "251af8e57c9400e3eb58242fe5b8b1152b2a64fdf4cf632f923c38ccee6f2fa9"
+dependencies = [
+ "icu_locale_core",
+ "icu_locale_fallback_data",
+ "icu_provider",
+ "potential_utf",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_fallback_data"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "decf2a22ec8fa68f1a0c1129a3f8583f8f8bc24e8b9ccbe98ead99f62a4dc3a8"
+
 [[package]]
 name = "icu_normalizer"
 version = "2.3.0"
@@ -2280,6 +2975,9 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
  "zerovec",
 ]
 
@@ -2289,6 +2987,32 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0"
 
+[[package]]
+name = "icu_pattern"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc43ce0e76ee8cb0482dc6e2dbb9b76278e8038f45daabf2a2877577e2ceb18f"
+dependencies = [
+ "displaydoc",
+ "either",
+ "serde",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_plurals"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e475e6766ef87b1d3c1f97be6363995b0bfaeddbc789671615df598a97ff0593"
+dependencies = [
+ "displaydoc",
+ "fixed_decimal",
+ "icu_provider",
+ "serde",
+ "zerovec",
+]
+
 [[package]]
 name = "icu_properties"
 version = "2.3.0"
@@ -2318,6 +3042,9 @@ checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
+ "postcard",
+ "serde",
+ "stable_deref_trait",
  "writeable",
  "yoke",
  "zerofrom",
@@ -2325,6 +3052,30 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "icu_provider_adapters"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df887bc4f55dbc773c7c45a0c7dfa75be886f7b7812830a71ab7271cc1801820"
+dependencies = [
+ "icu_locale_fallback",
+ "icu_provider",
+]
+
+[[package]]
+name = "icu_provider_blob"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5916b44fac319d3f58e4d8d805a627df19e27937b582cd99fcde3bb6b7ce1b0e"
+dependencies = [
+ "icu_provider",
+ "postcard",
+ "serde",
+ "writeable",
+ "zerotrie",
+ "zerovec",
+]
+
 [[package]]
 name = "idna"
 version = "1.1.0"
@@ -2396,6 +3147,12 @@ dependencies = [
  "hashbrown 0.17.1",
 ]
 
+[[package]]
+name = "ipnet"
+version = "2.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0"
+
 [[package]]
 name = "is-docker"
 version = "0.2.0"
@@ -2547,20 +3304,20 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "kittest"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ceaa75eb0036a32b6b9833962eb18137449e9817e2e586006471925b727fd5"
+checksum = "0bb81a721ba76aa095b7f45deb180504f786904e56ca4b8e141f66eb89a78b75"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.35.0",
+ "accesskit_consumer",
 ]
 
 [[package]]
 name = "krilla"
 version = "0.8.2"
-source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "bumpalo",
  "flate2",
  "float-cmp",
@@ -2620,9 +3377,9 @@ checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb"
 
 [[package]]
 name = "libc"
-version = "0.2.189"
+version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
 [[package]]
 name = "libloading"
@@ -2649,7 +3406,7 @@ dependencies = [
  "bitflags 2.13.2",
  "libc",
  "plain",
- "redox_syscall 0.9.4",
+ "redox_syscall 0.9.5",
 ]
 
 [[package]]
@@ -2658,6 +3415,19 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"
 
+[[package]]
+name = "linesweeper"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a25df1b0c5432893f41bba817150e323703ee5f6d974f3a6808ac7fd7f046d18"
+dependencies = [
+ "arrayvec",
+ "kurbo",
+ "polycool",
+ "rustc-hash 2.1.3",
+ "smallvec",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -2675,12 +3445,15 @@ name = "litemap"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae"
+dependencies = [
+ "serde_core",
+]
 
 [[package]]
 name = "litrs"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+checksum = "4744e383959f0db86ede514b809b1c53251889093803c05267acc7d4e7030d70"
 
 [[package]]
 name = "lock_api"
@@ -2697,6 +3470,12 @@ version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
+[[package]]
+name = "lru-slab"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f"
+
 [[package]]
 name = "memchr"
 version = "2.8.3"
@@ -2705,9 +3484,9 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "memmap2"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
+checksum = "6b0ca1155a9ecc25aa12e8313a119f32edf0255fea2f44839c4ac0a12b2ac157"
 dependencies = [
  "libc",
 ]
@@ -2721,6 +3500,12 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
 [[package]]
 name = "minicov"
 version = "0.3.8"
@@ -2751,6 +3536,17 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "mio"
+version = "1.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "moxcms"
 version = "0.8.1"
@@ -2763,23 +3559,28 @@ dependencies = [
 
 [[package]]
 name = "muda"
-version = "0.21.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6744ab645ebe79f9c428455c7cb9dfa4275fa3b50a25408e08f927da8dc618c"
+checksum = "4340e89c178916e62879c5c36b7f699019369be413e496178a6983ce91b8bc03"
 dependencies = [
  "crossbeam-channel",
  "dpi",
  "keyboard-types",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
- "once_cell",
  "png",
  "thiserror 2.0.21",
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "multiversion_no_op"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d"
+
 [[package]]
 name = "naga"
 version = "30.0.1"
@@ -2848,12 +3649,33 @@ dependencies = [
  "jni-sys 0.3.1",
 ]
 
+[[package]]
+name = "nix"
+version = "0.31.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
+dependencies = [
+ "bitflags 2.13.2",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
 [[package]]
 name = "nohash-hasher"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.3"
@@ -2863,6 +3685,12 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -2903,9 +3731,9 @@ checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
 
 [[package]]
 name = "objc2"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+checksum = "19d5490aaf8f1d7cf7688dfa9b0ce07900e168852c45cd2c03f534dfd27cfd0b"
 dependencies = [
  "objc-sys",
  "objc2-encode",
@@ -2913,9 +3741,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+checksum = "08849bbd4767dfae9457696856ae1c84fe4e0281bbe4a7abff2d0e06fb7981f8"
 dependencies = [
  "objc2-encode",
 ]
@@ -2929,7 +3757,7 @@ dependencies = [
  "bitflags 2.13.2",
  "block2 0.5.1",
  "libc",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-core-data",
  "objc2-core-image",
  "objc2-foundation 0.2.2",
@@ -2944,7 +3772,7 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.6.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
@@ -2958,7 +3786,7 @@ checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-core-location",
  "objc2-foundation 0.2.2",
 ]
@@ -2970,7 +3798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
 dependencies = [
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-foundation 0.2.2",
 ]
 
@@ -2982,7 +3810,7 @@ checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-foundation 0.2.2",
 ]
 
@@ -2994,7 +3822,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
  "bitflags 2.13.2",
  "dispatch2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
 ]
 
 [[package]]
@@ -3005,7 +3833,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
  "bitflags 2.13.2",
  "dispatch2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
@@ -3017,7 +3845,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
 dependencies = [
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-foundation 0.2.2",
  "objc2-metal 0.2.2",
 ]
@@ -3029,7 +3857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
 dependencies = [
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-contacts",
  "objc2-foundation 0.2.2",
 ]
@@ -3050,7 +3878,7 @@ dependencies = [
  "block2 0.5.1",
  "dispatch",
  "libc",
- "objc2 0.5.2",
+ "objc2 0.5.3",
 ]
 
 [[package]]
@@ -3061,7 +3889,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.6.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
 ]
 
@@ -3072,7 +3900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
  "bitflags 2.13.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
 ]
 
@@ -3083,7 +3911,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
 dependencies = [
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
 ]
@@ -3096,7 +3924,7 @@ checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-foundation 0.2.2",
 ]
 
@@ -3108,7 +3936,7 @@ checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.6.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-foundation 0.3.2",
 ]
 
@@ -3120,7 +3948,7 @@ checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-foundation 0.2.2",
  "objc2-metal 0.2.2",
 ]
@@ -3132,7 +3960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
  "bitflags 2.13.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
@@ -3145,7 +3973,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
 dependencies = [
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-foundation 0.2.2",
 ]
 
@@ -3157,7 +3985,7 @@ checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-cloud-kit",
  "objc2-core-data",
  "objc2-core-image",
@@ -3177,7 +4005,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
  "bitflags 2.13.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
 ]
@@ -3189,7 +4017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
 dependencies = [
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-foundation 0.2.2",
 ]
 
@@ -3201,7 +4029,7 @@ checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.5.1",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-core-location",
  "objc2-foundation 0.2.2",
 ]
@@ -3220,14 +4048,20 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "open"
-version = "5.4.4"
+version = "5.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa576c76302b7b808eecc68061e67336c47833ef9d22caa74dda10fa9675eebc"
+checksum = "8d8c8b8e725ad26404d6896eb2f064294a0a7b4f1d9120210d85544684c4ca95"
 dependencies = [
  "is-wsl",
  "libc",
 ]
 
+[[package]]
+name = "openssl-probe"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
+
 [[package]]
 name = "orbclient"
 version = "0.3.55"
@@ -3249,9 +4083,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "5.5.0"
+version = "5.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c7c9e0d9b23589f26070720bac724174bfec1083e82f7854cdd0267518343c0"
+checksum = "7f59006ce1e204c30956638535b74d317bca99477b9356dfaec54c37f6f600ab"
 dependencies = [
  "num-traits",
 ]
@@ -3266,6 +4100,16 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "os_pipe"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "ouroboros"
 version = "0.18.5"
@@ -3283,7 +4127,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
@@ -3331,6 +4175,25 @@ dependencies = [
  "ryu",
 ]
 
+[[package]]
+name = "pem"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
+dependencies = [
+ "base64 0.22.1",
+ "serde_core",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "peniko"
 version = "0.6.1"
@@ -3350,14 +4213,35 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
+[[package]]
+name = "petgraph"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
+dependencies = [
+ "fixedbitset",
+ "hashbrown 0.15.5",
+ "indexmap",
+]
+
 [[package]]
 name = "phf"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 dependencies = [
- "phf_macros",
- "phf_shared",
+ "phf_macros 0.13.1",
+ "phf_shared 0.13.1",
+]
+
+[[package]]
+name = "phf"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6"
+dependencies = [
+ "phf_macros 0.14.0",
+ "phf_shared 0.14.0",
  "serde",
 ]
 
@@ -3368,7 +4252,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
 dependencies = [
  "fastrand",
- "phf_shared",
+ "phf_shared 0.13.1",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100"
+dependencies = [
+ "fastrand",
+ "phf_shared 0.14.0",
 ]
 
 [[package]]
@@ -3377,8 +4271,21 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
 dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.13.1",
+ "phf_shared 0.13.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085"
+dependencies = [
+ "phf_generator 0.14.0",
+ "phf_shared 0.14.0",
  "proc-macro2",
  "quote",
  "syn 2.0.119",
@@ -3393,6 +4300,15 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "phf_shared"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pic-scale"
 version = "0.7.12"
@@ -3458,6 +4374,19 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
+[[package]]
+name = "plist"
+version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327a4cb2ad49dc48adfdc9da89e22c64d488b508c67a044d71ba729e4521a285"
+dependencies = [
+ "base64 0.23.1",
+ "indexmap",
+ "quick-xml 0.42.0",
+ "serde",
+ "time",
+]
+
 [[package]]
 name = "png"
 version = "0.18.1"
@@ -3521,23 +4450,32 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "postcard"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24"
+dependencies = [
+ "cobs",
+ "serde",
+]
+
 [[package]]
 name = "potential_utf"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661"
 dependencies = [
+ "serde_core",
+ "writeable",
  "zerovec",
 ]
 
 [[package]]
-name = "ppv-lite86"
-version = "0.2.21"
+name = "powerfmt"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
+checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958"
 
 [[package]]
 name = "presser"
@@ -3554,6 +4492,30 @@ dependencies = [
  "toml_edit",
 ]
 
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.107"
@@ -3584,16 +4546,17 @@ checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
 
 [[package]]
 name = "proptest"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744"
+checksum = "b8530004ccb15eae51c7e40009fbe317f341f804db54dc033eec1c50be28cfa0"
 dependencies = [
- "bit-set 0.8.0",
- "bit-vec 0.8.0",
+ "bit-set 0.11.1",
+ "bit-vec 0.10.1",
  "bitflags 2.13.2",
+ "chacha20",
+ "core_detect",
  "num-traits",
  "rand",
- "rand_chacha",
  "rand_xorshift",
  "regex-syntax",
  "rusty-fork",
@@ -3634,6 +4597,72 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quinn"
+version = "0.11.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4051e23e9185c255a7e33ef59cdbca87a22d359052eecd22fc6b901fb37d9d11"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.1.3",
+ "rustls",
+ "socket2",
+ "thiserror 2.0.21",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e750cca55fe4f0439a15d0bb529da9651e79993e8e72c61a899a36d462befbe"
+dependencies = [
+ "aws-lc-rs",
+ "bytes",
+ "getrandom 0.4.3",
+ "lru-slab",
+ "rand",
+ "rand_pcg",
+ "ring",
+ "rustc-hash 2.1.3",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.21",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af66907df18639dcf4db56ca65490cabc4b27a97dbadd96f2926cca73298f016"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.47"
@@ -3657,40 +4686,43 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "rand"
-version = "0.9.5"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
+checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af"
 dependencies = [
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
-dependencies = [
- "ppv-lite86",
- "rand_core",
+ "chacha20",
+ "getrandom 0.4.3",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.5"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+
+[[package]]
+name = "rand_core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+
+[[package]]
+name = "rand_pcg"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
 dependencies = [
- "getrandom 0.3.4",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
 name = "rand_xorshift"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
+checksum = "60aa6af80be32871323012e02e6e65f8a7cc7890931ae421d217ad8fe0df2ccf"
 dependencies = [
- "rand_core",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -3711,7 +4743,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"
 dependencies = [
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
  "objc2-quartz-core 0.3.2",
@@ -3754,7 +4786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709"
 dependencies = [
  "bytemuck",
- "font-types 0.12.5",
+ "font-types 0.12.7",
  "once_cell",
 ]
 
@@ -3765,7 +4797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "005c8acf251756c478b0bf402885bfd88a1476020c4c7e6060edc1aa68da38ea"
 dependencies = [
  "bytemuck",
- "font-types 0.12.5",
+ "font-types 0.12.7",
  "once_cell",
 ]
 
@@ -3776,7 +4808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5a0cf4bb6cbce4c29756270d189a5e400ac05e91192161d83a0bcb6e68492e8"
 dependencies = [
  "bytemuck",
- "font-types 0.12.5",
+ "font-types 0.12.7",
  "once_cell",
 ]
 
@@ -3800,9 +4832,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "737970939a87c6fa31e7acad13307bccbb017a073b695b6089a2c484f929e20e"
+checksum = "580c875845b41ecb1564ad1ae4703044cef774145e3d7a94dc2b3fa7c97868fd"
 dependencies = [
  "bitflags 2.13.2",
 ]
@@ -3842,6 +4874,49 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
+[[package]]
+name = "reqwest"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029"
+dependencies = [
+ "base64 0.23.1",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-rustls",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "resvg"
 version = "0.47.0"
@@ -3870,7 +4945,7 @@ dependencies = [
  "js-sys",
  "libc",
  "log",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -3895,6 +4970,20 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.17",
+ "libc",
+ "untrusted 0.9.0",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "roots"
 version = "0.0.8"
@@ -3909,9 +4998,9 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
 [[package]]
 name = "roxmltree"
-version = "0.21.1"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1964b10c76125c36f8afe190065a4bf9a87bf324842c05701330bba9f1cacbb"
+checksum = "9da7f59328b09405b181fee1018925fad50f157afb43c0c0f5c522c256dd5907"
 dependencies = [
  "memchr",
 ]
@@ -3963,6 +5052,83 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf"
+dependencies = [
+ "aws-lc-rs",
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a073f5dc7469f984c52ad2752b63b0807745133b6de880b7b64c1ac4c48aec4"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96"
+dependencies = [
+ "web-time",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281"
+dependencies = [
+ "aws-lc-rs",
+ "ring",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.23"
@@ -4005,6 +5171,12 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
+[[package]]
+name = "ryu-js"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04d056b875a9d2e6cb9a61d127afee9ac5999b9f87bcb32079d1318e505be714"
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -4014,6 +5186,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cb23c424d8ee841bb4d813677ca237e2a610067d594fec130f87d6093495ab5"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -4026,6 +5207,29 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "security-framework"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
+dependencies = [
+ "bitflags 2.13.2",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "self_cell"
 version = "1.3.0"
@@ -4037,6 +5241,16 @@ name = "semver"
 version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
@@ -4065,14 +5279,14 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.151"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
 dependencies = [
  "itoa",
  "memchr",
@@ -4081,6 +5295,17 @@ dependencies = [
  "zmij",
 ]
 
+[[package]]
+name = "serde_json_canonicalizer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe52319a927259afbfa5180c5157cd8167edfd3e8c254f9558c7fef44c5649f2"
+dependencies = [
+ "ryu-js",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "serde_repr"
 version = "0.1.21"
@@ -4089,18 +5314,52 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
+checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c"
 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 = "sha1"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest",
+]
+
 [[package]]
 name = "shlex"
 version = "2.0.1"
@@ -4117,6 +5376,175 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "sigstore-bundle"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7dc53c8a941858d01479622dbb7650aaa2ee0ca1fb58fb6cdddbfc3064abbb"
+dependencies = [
+ "base64 0.22.1",
+ "hex",
+ "serde",
+ "serde_json",
+ "sigstore-crypto",
+ "sigstore-merkle",
+ "sigstore-rekor",
+ "sigstore-tsa",
+ "sigstore-types",
+ "thiserror 2.0.21",
+]
+
+[[package]]
+name = "sigstore-crypto"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da90c3d9af638898a5fdc347479b18f950bb0dde11ecf2244f94cd28135da53b"
+dependencies = [
+ "aws-lc-rs",
+ "base64 0.22.1",
+ "const-oid",
+ "der",
+ "digest",
+ "pem",
+ "rand_core 0.10.1",
+ "sha2",
+ "signature",
+ "sigstore-types",
+ "spki",
+ "thiserror 2.0.21",
+ "tracing",
+ "x509-cert",
+]
+
+[[package]]
+name = "sigstore-merkle"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c0d53558825c77716855c13794306fff766854c1bf92948e77d7890da3f2455"
+dependencies = [
+ "base64 0.22.1",
+ "hex",
+ "sigstore-crypto",
+ "sigstore-types",
+ "thiserror 2.0.21",
+]
+
+[[package]]
+name = "sigstore-rekor"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "641fdaaa40d0cd6e249cf1671c2240beff1a3ece578062cf43e750779e8db2b3"
+dependencies = [
+ "base64 0.22.1",
+ "hex",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "sigstore-crypto",
+ "sigstore-merkle",
+ "sigstore-types",
+ "thiserror 2.0.21",
+ "url",
+]
+
+[[package]]
+name = "sigstore-trust-root"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6b0d2550f05c096400066e858db13d91f9de3b750a7541fb1291c1dc80ca290"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "sigstore-crypto",
+ "sigstore-types",
+ "thiserror 2.0.21",
+ "x509-cert",
+]
+
+[[package]]
+name = "sigstore-tsa"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bc86c8abc1ece6832236e7e34e9baebb5d4d40490c0332b814a0d8624ca7255"
+dependencies = [
+ "aws-lc-rs",
+ "base64 0.22.1",
+ "chrono",
+ "cmpv2",
+ "cms",
+ "const-oid",
+ "der",
+ "hex",
+ "rand",
+ "reqwest",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "sigstore-crypto",
+ "sigstore-types",
+ "thiserror 2.0.21",
+ "tracing",
+ "x509-cert",
+ "x509-tsp",
+]
+
+[[package]]
+name = "sigstore-types"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8d870c9bcfdf83396ac2bd2d6a23c5d09ec02cc9fda50fa1cbb3dd71a9bee53"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "pem",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.21",
+]
+
+[[package]]
+name = "sigstore-verify"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d30aff69036e4579b416956e9ba68cec45b793116f78f10842d04c7f8b924bab"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "cms",
+ "const-oid",
+ "hex",
+ "pem",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "serde",
+ "serde_json",
+ "serde_json_canonicalizer",
+ "sigstore-bundle",
+ "sigstore-crypto",
+ "sigstore-merkle",
+ "sigstore-rekor",
+ "sigstore-trust-root",
+ "sigstore-tsa",
+ "sigstore-types",
+ "thiserror 2.0.21",
+ "tls_codec",
+ "tracing",
+ "x509-cert",
+]
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.10"
@@ -4201,9 +5629,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.16.2"
+version = "1.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e"
+checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
 dependencies = [
  "serde",
 ]
@@ -4240,7 +5668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"
 dependencies = [
  "bitflags 2.13.2",
- "calloop 0.14.4",
+ "calloop 0.14.5",
  "calloop-wayland-source 0.4.1",
  "cursor-icon",
  "libc",
@@ -4280,6 +5708,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "spirv"
 version = "0.4.0+sdk-1.4.341.0"
@@ -4289,6 +5727,16 @@ dependencies = [
  "bitflags 2.13.2",
 ]
 
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -4321,6 +5769,27 @@ dependencies = [
  "unicode-properties",
 ]
 
+[[package]]
+name = "strum"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "subsetter"
 version = "0.2.6"
@@ -4333,6 +5802,12 @@ dependencies = [
  "write-fonts",
 ]
 
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
 [[package]]
 name = "svgtypes"
 version = "0.16.1"
@@ -4343,6 +5818,16 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "unicode-ident",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.119"
@@ -4356,15 +5841,24 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.6"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
 [[package]]
 name = "synstructure"
 version = "0.14.0"
@@ -4373,7 +5867,51 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
+]
+
+[[package]]
+name = "sys-locale"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
+dependencies = [
+ "js-sys",
+ "libc",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
+dependencies = [
+ "bitflags 2.13.2",
+ "core-foundation 0.9.4",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tar"
+version = "0.4.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
 ]
 
 [[package]]
@@ -4435,7 +5973,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -4461,6 +5999,36 @@ dependencies = [
  "zune-jpeg",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde_core",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
+
+[[package]]
+name = "time-macros"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
 [[package]]
 name = "tiny-skia"
 version = "0.12.0"
@@ -4489,11 +6057,12 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643"
+checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a"
 dependencies = [
  "displaydoc",
+ "serde_core",
  "zerovec",
 ]
 
@@ -4504,19 +6073,69 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee"
 
 [[package]]
-name = "tokio"
-version = "1.53.1"
+name = "tls_codec"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed"
+checksum = "0de2e01245e2bb89d6f05801c564fa27624dbd7b1846859876c7dad82e90bf6b"
 dependencies = [
+ "tls_codec_derive",
+ "zeroize",
+]
+
+[[package]]
+name = "tls_codec_derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "tokio"
+version = "1.54.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
  "pin-project-lite",
+ "socket2",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e464cf451ba96ebfc6f9b6542f17ee8b8956e33f1e40d9690624e59d7a7f8a4b"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "libc",
+ "pin-project-lite",
+ "tokio",
 ]
 
 [[package]]
 name = "toml"
-version = "1.1.6+spec-1.1.0"
+version = "1.1.8+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "920602543f0911ab71da12c50d59701da54c196d1a2bf5cb4b75667f137a406a"
+checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d"
 dependencies = [
  "indexmap",
  "serde_core",
@@ -4529,18 +6148,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "1.1.1+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
+checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.25.15+spec-1.1.0"
+version = "0.25.17+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1340ea94a5856333492c9064b02c778b191dd2c853778d9609debdcdfea3a614"
+checksum = "e3641d5bbb5349a79e1020a242d251efbc546ad8048d133958323ce9c40a9c9c"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -4550,18 +6169,63 @@ dependencies = [
 
 [[package]]
 name = "toml_parser"
-version = "1.1.3+spec-1.1.0"
+version = "1.1.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"
+checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c"
 dependencies = [
  "winnow",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.1.2+spec-1.1.0"
+version = "1.1.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
+checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770"
+
+[[package]]
+name = "tower"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
+dependencies = [
+ "bitflags 2.13.2",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "pin-project-lite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "url",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -4595,6 +6259,23 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "tree_magic_mini"
+version = "3.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
+dependencies = [
+ "memchr",
+ "nom",
+ "petgraph",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
 [[package]]
 name = "ttf-parser"
 version = "0.25.1"
@@ -4613,6 +6294,18 @@ dependencies = [
  "rustc-hash 2.1.3",
 ]
 
+[[package]]
+name = "typed-path"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce898823d8cd0f028662d2f349694b1af0a5cc9be83f1d213a00d3147445e1e"
+
+[[package]]
+name = "typenum"
+version = "1.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
+
 [[package]]
 name = "uds_windows"
 version = "1.2.1"
@@ -4656,15 +6349,15 @@ checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+checksum = "75cd3fb03d5288b3ba9a1ee103ac7e9cbb59f0b03d64f8ddfcc04dd42758a85d"
 dependencies = [
  "tinyvec",
 ]
@@ -4699,6 +6392,47 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "ureq"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde93ff05758a36a851a398a772b0b79a82fbe3c186a46f2696baaeaf84c966b"
+dependencies = [
+ "base64 0.23.1",
+ "flate2",
+ "log",
+ "percent-encoding",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "ureq-proto",
+ "utf8-zero",
+]
+
+[[package]]
+name = "ureq-proto"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841583fc36089d7d59419568ae157f43a5a03a2e5a81ba87c77d1596ef46e922"
+dependencies = [
+ "base64 0.23.1",
+ "http",
+ "httparse",
+ "log",
+]
+
 [[package]]
 name = "url"
 version = "2.5.8"
@@ -4717,7 +6451,7 @@ version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d46cf96c5f498d36b7a9693bc6a7075c0bb9303189d61b2249b0dc3d309c07de"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "data-url",
  "flate2",
  "fontdb",
@@ -4725,7 +6459,7 @@ dependencies = [
  "kurbo",
  "log",
  "pico-args",
- "roxmltree 0.21.1",
+ "roxmltree 0.21.2",
  "rustybuzz",
  "simplecss",
  "siphasher",
@@ -4739,6 +6473,18 @@ dependencies = [
  "xmlwriter",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8-zero"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e"
+
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -4747,9 +6493,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "uuid"
-version = "1.26.1"
+version = "1.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce"
+checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514"
 dependencies = [
  "js-sys",
  "serde_core",
@@ -4790,21 +6536,6 @@ dependencies = [
  "thiserror 2.0.21",
 ]
 
-[[package]]
-name = "vello_common"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e9aed918117e8152c9eddfd8362d73c465c23f26c44786aa331707b8a64fa2"
-dependencies = [
- "bytemuck",
- "fearless_simd",
- "guillotiere",
- "log",
- "peniko",
- "smallvec",
- "thiserror 2.0.21",
-]
-
 [[package]]
 name = "vello_common"
 version = "0.2.0"
@@ -4834,18 +6565,6 @@ dependencies = [
  "vello_common 0.0.8",
 ]
 
-[[package]]
-name = "vello_cpu"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac7349e1f55f6b801c7c277958df4ea53e7f20f21e8014910ad888b2ecda93ea"
-dependencies = [
- "bytemuck",
- "glifo 0.2.0",
- "hashbrown 0.17.1",
- "vello_common 0.1.0",
-]
-
 [[package]]
 name = "vello_cpu"
 version = "0.2.0"
@@ -4863,6 +6582,16 @@ dependencies = [
  "vello_common 0.2.0",
 ]
 
+[[package]]
+name = "verifysign"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6acfcc42a8d44f340d001193d97ef56bf33210b51ad760ae8308c97d5241ca51"
+dependencies = [
+ "core-foundation 0.10.1",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -4888,6 +6617,21 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "want"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec4cdd0dd910afe868b7ef477227d8d538b46b3075031afee8a9f2acb0a2ed0b"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
 [[package]]
 name = "wasip2"
 version = "1.0.4+wasi-0.2.12"
@@ -4940,7 +6684,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "wasm-bindgen-shared",
 ]
 
@@ -4983,7 +6727,7 @@ checksum = "3b84b5ac638bfb168196a1a461fcc8f46a294a18b1b6be52133b4e0db122cc9f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -5111,7 +6855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
 dependencies = [
  "proc-macro2",
- "quick-xml",
+ "quick-xml 0.41.0",
  "quote",
 ]
 
@@ -5149,20 +6893,29 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "1.2.4"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62c35be770821a214dbc362fc26908c853e776c0004294d0b10b8a6bad582f94"
+checksum = "d2c8ddfbbf66e501434657400268cefe51b95140a0266236415cda7627732df7"
 dependencies = [
  "jni",
  "log",
  "ndk-context",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
  "url",
  "web-sys",
 ]
 
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "weezl"
 version = "0.1.12"
@@ -5297,7 +7050,7 @@ dependencies = [
  "naga",
  "naga-types",
  "ndk-sys",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
@@ -5444,6 +7197,17 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "windows-registry"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
+dependencies = [
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.4.1"
@@ -5468,7 +7232,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -5477,16 +7241,7 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -5504,31 +7259,14 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
-dependencies = [
- "windows-link",
- "windows_aarch64_gnullvm 0.53.1",
- "windows_aarch64_msvc 0.53.1",
- "windows_i686_gnu 0.53.1",
- "windows_i686_gnullvm 0.53.1",
- "windows_i686_msvc 0.53.1",
- "windows_x86_64_gnu 0.53.1",
- "windows_x86_64_gnullvm 0.53.1",
- "windows_x86_64_msvc 0.53.1",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
@@ -5546,100 +7284,52 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
-
 [[package]]
 name = "winit"
 version = "0.30.13"
-source = "git+https://github.com/storytold/winit.git?rev=3d51077fd1a966f84df9ef287839dc84fd5b4ca7#3d51077fd1a966f84df9ef287839dc84fd5b4ca7"
+source = "git+https://github.com/storytold/winit.git?rev=a517b3846ee8457d84ee4975110bfda6797c44dc#a517b3846ee8457d84ee4975110bfda6797c44dc"
 dependencies = [
  "ahash",
  "android-activity",
@@ -5650,7 +7340,7 @@ dependencies = [
  "calloop 0.13.0",
  "cfg_aliases",
  "concurrent-queue",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-graphics",
  "cursor-icon",
  "dpi",
@@ -5658,7 +7348,7 @@ dependencies = [
  "libc",
  "memmap2",
  "ndk",
- "objc2 0.5.2",
+ "objc2 0.5.3",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
  "objc2-ui-kit 0.2.2",
@@ -5696,10 +7386,41 @@ dependencies = [
 ]
 
 [[package]]
-name = "winresource"
-version = "0.1.31"
+name = "winprint"
+version = "0.2.1"
+source = "git+https://github.com/storytold/winprint.rs?rev=5f80b9baf6b58937c401656634e42d33f00ddf49#5f80b9baf6b58937c401656634e42d33f00ddf49"
+dependencies = [
+ "flate2",
+ "fmt-derive",
+ "reqwest",
+ "scopeguard",
+ "sigstore-trust-root",
+ "sigstore-types",
+ "sigstore-verify",
+ "strum",
+ "tar",
+ "thiserror 2.0.21",
+ "windows",
+ "windows-core",
+ "windows-implement",
+ "xml",
+]
+
+[[package]]
+name = "winreg"
+version = "0.55.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0986a8b1d586b7d3e4fe3d9ea39fb451ae22869dcea4aa109d287a374d866087"
+checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winresource"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bc6d36480b829272a5bdabf08e6dca8004761c1da7e35efef800540c66221b"
 dependencies = [
  "toml",
  "version_check",
@@ -5717,6 +7438,24 @@ version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
+[[package]]
+name = "wl-clipboard-rs"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d7888ccd4896447b2d14d3a9350a85df2aeb6f181e2e7a31349d104ac46cac1"
+dependencies = [
+ "libc",
+ "log",
+ "os_pipe",
+ "rustix 1.1.5",
+ "thiserror 2.0.21",
+ "tree_magic_mini",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+]
+
 [[package]]
 name = "write-fonts"
 version = "0.48.1"
@@ -5730,11 +7469,20 @@ dependencies = [
  "read-fonts 0.39.2",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
 [[package]]
 name = "writeable"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
+dependencies = [
+ "either",
+]
 
 [[package]]
 name = "x11-dl"
@@ -5768,6 +7516,41 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
 
+[[package]]
+name = "x509-cert"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94"
+dependencies = [
+ "const-oid",
+ "der",
+ "sha1",
+ "signature",
+ "spki",
+ "tls_codec",
+]
+
+[[package]]
+name = "x509-tsp"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5ceece934a21607055b7ac5c25adb56a2ff559804b10705dc674d1d838c15e1"
+dependencies = [
+ "cmpv2",
+ "cms",
+ "der",
+]
+
+[[package]]
+name = "xattr"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
+dependencies = [
+ "libc",
+ "rustix 1.1.5",
+]
+
 [[package]]
 name = "xcursor"
 version = "0.3.11"
@@ -5793,6 +7576,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 
+[[package]]
+name = "xml"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f45bb2c13fec6a6cb4c0f76a7e94839e110a14ec803ec2940777a94c347bc52"
+
 [[package]]
 name = "xml-rs"
 version = "0.8.29"
@@ -5813,7 +7602,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee"
 
 [[package]]
 name = "xtask"
-version = "0.12.0"
+version = "0.14.0"
 dependencies = [
  "serde_json",
 ]
@@ -5826,9 +7615,9 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "yoke"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
+checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
@@ -5843,7 +7632,7 @@ checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "synstructure",
 ]
 
@@ -5915,7 +7704,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -5923,9 +7712,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.3.4"
+version = "4.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e"
+checksum = "812a12be4ead7a59e18ea8f047d08add0066b73bc62fc1467066a2472ae088dd"
 dependencies = [
  "serde",
  "winnow",
@@ -5955,18 +7744,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.59"
+version = "0.8.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df92bf3d9227be3d53173901ddbffac2babc27ae50f397776ffd6dc33f800cb"
+checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.59"
+version = "0.8.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac4f328cf2f05d084e496c3e9c3f33ed0a183656a16e1fcec4d464d8373aec82"
+checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5990,10 +7779,30 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "synstructure",
 ]
 
+[[package]]
+name = "zeroize"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "zerotrie"
 version = "0.2.5"
@@ -6001,16 +7810,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f"
 dependencies = [
  "displaydoc",
+ "litemap",
+ "serde_core",
  "yoke",
  "zerofrom",
+ "zerovec",
 ]
 
 [[package]]
 name = "zerovec"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8"
+checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40"
 dependencies = [
+ "serde",
  "yoke",
  "zerofrom",
  "zerovec-derive",
@@ -6018,13 +7831,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.6"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da"
+checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -6041,6 +7854,23 @@ dependencies = [
  "zopfli",
 ]
 
+[[package]]
+name = "zip"
+version = "9.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518b847fd864440c379748ad684c449f293af68978a485a4ff16f7c901c1f7c4"
+dependencies = [
+ "crc32fast",
+ "flate2",
+ "getrandom 0.4.3",
+ "indexmap",
+ "memchr",
+ "nix",
+ "typed-path",
+ "windows-sys 0.61.2",
+ "zopfli",
+]
+
 [[package]]
 name = "zlib-rs"
 version = "0.6.8"
@@ -6055,9 +7885,9 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
 
 [[package]]
 name = "zopfli"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
+checksum = "aaf7fc5d30c28483d93805c4a5e12b05bbb52407fa67c5f8bd552374cd01fb11"
 dependencies = [
  "bumpalo",
  "crc32fast",
@@ -6082,9 +7912,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.15.0"
+version = "5.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d34c27cc6cdd1f458427519dd6b8612f7b7e3f7b9a0b2355d041dda9869147"
+checksum = "80bf6d6cd6a4b601acb64cfb8284cdc643fcfa75ef26ae3c46ec8aa4e8a1fbb7"
 dependencies = [
  "endi",
  "enumflags2",
@@ -6097,14 +7927,14 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.15.0"
+version = "5.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864155e69b4352db0c7f374917bf45d1e0c8d17659c8b3dbf9795f3673f8c497"
+checksum = "ef2672456ba1cb54b5eaec136e63135b3c7495fb938e53b28a62e633496d486d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "zvariant_utils",
 ]
 
@@ -6117,6 +7947,26 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 3.0.6",
+ "syn 3.0.9",
  "winnow",
 ]
+
+[[patch.unused]]
+name = "egui_demo_lib"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
+
+[[patch.unused]]
+name = "egui_extras"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
+
+[[patch.unused]]
+name = "egui_inspection"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
+
+[[patch.unused]]
+name = "egui_system_font_provider"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
diff --git a/Cargo.toml b/Cargo.toml
index 0245708f0..139d06f01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ members = ["crates/*", "apps/*", "xtask"]
 default-members = ["crates/*", "apps/designcraft", "apps/designcraft-cli", "xtask"]
 
 [workspace.package]
-version = "0.12.0"
+version = "0.14.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.95"
@@ -12,7 +12,12 @@ repository = "https://github.com/storytold/designcraft"
 
 [workspace.dependencies]
 # Shared reader and writer; publish the immutable revision before this consumer.
-craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.1.0", default-features = false }
+craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.1.0", default-features = false }
+# Shared keyboard bindings: chords, overrides, conflicts, egui dispatch, the Keyboard Shortcuts dialog.
+craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.1.0", features = ["egui", "ui"] }
+# Separations, ink coverage and the ink manager; same revision as craft-pdf and the krilla patch.
+craft-prepress = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.1.0", features = ["flatten"] }
+craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", features = ["egui"] }
 # internal
 designcraft-geom = { path = "crates/geom" }
 designcraft-color = { path = "crates/color" }
@@ -75,32 +80,41 @@ zip = { version = "3", default-features = false, features = ["deflate"] }
 indd = { git = "https://github.com/storytold/indd-utils", branch = "main" }
 
 # Which paths stored in documents may be followed (craft-libs).
-craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }
+craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0" }
 # Atomic file replacement for saves and exports (craft-libs).
-craft-atomic = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "e9546e191dd62f2bc1d61eca45dbdc2f1b3c1d8e" }
+craft-atomic = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0" }
 # File › Print through the system print spooler (craft-libs).
-craft-print = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "d991bf6792f8ade99c51358bf3c1d902c8cd96b5" }
+craft-print = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0" }
 
 # ICC colour management: working spaces, transforms, black point compensation (craft-libs).
-craft-cms = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "e9546e191dd62f2bc1d61eca45dbdc2f1b3c1d8e" }
+craft-cms = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0" }
 
 # ui
 # Shared frontend components; keep this dependency above the engine boundary.
-craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5c874d51eeb3de70e735c8ce87a59a7dedd47675", features = ["serde"] }
-egui = "0.36"
-egui_extras = { version = "0.36", default-features = false, features = ["svg"] }
-eframe = { version = "0.36", default-features = false }
-egui_kittest = "0.36"
+craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", features = ["serde"] }
+# The application bar as the window's title bar (craft-libs).
+craft-window = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", features = ["egui"] }
+egui = "0.37"
+egui_extras = { version = "0.37", default-features = false, features = ["svg"] }
+eframe = { version = "0.37", default-features = false }
+egui_kittest = "0.37"
+# Monotonic clock on native and web (`Instant`); screenshot settlement must not use wall time.
+web-time = "1"
 rfd = "0.17"
+# Native file and message dialogs that never block the event loop (craft-libs).
+craft-dialogs = { git = "https://github.com/storytold/craft-libs", rev = "1a11a4897865f7410c40d25ca6e452ce399a1a2c" }
+raw-window-handle = "0.6"
 arboard = { version = "3.6", default-features = false }
 
 [workspace.lints.rust]
 unsafe_code = "forbid"
 
 [workspace.lints.clippy]
+cognitive_complexity = "deny"
+too_many_arguments = "deny"
+wildcard_imports = "deny"
 dbg_macro = "warn"
 todo = "warn"
-too_many_arguments = "allow"
 type_complexity = "allow"
 
 # Line tables keep file and line in panics and backtraces; full debug info
@@ -122,10 +136,27 @@ debug = 0
 
 # Opt-in cancelable macOS termination on the pinned winit 0.30 line.
 [patch.crates-io]
-krilla = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.8.2" }
-winit = { git = "https://github.com/storytold/winit.git", rev = "3d51077fd1a966f84df9ef287839dc84fd5b4ca7" }
-hayro = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.7.1" }
-hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.7.0" }
-hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.7.2" }
-hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.3.0" }
-hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.1.0" }
+krilla = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.8.2" }
+winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" }
+# The hayro crates from craft-libs' vendor/ directory (pdfcraft's, plus the plate mode and decode
+# limits craft-pdf and craft-prepress need); same revision as craft-pdf.
+hayro = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.7.1" }
+hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.7.0" }
+hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.7.2" }
+hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.3.0" }
+hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.1.0" }
+hayro-postscript = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.1.0" }
+ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+epaint_default_fonts = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui-winit = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_glow = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_extras = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_system_font_provider = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+eframe = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_demo_lib = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_inspection = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
diff --git a/NOTICE b/NOTICE
index 71abff776..fc46bcdf3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -114,3 +114,21 @@ Assets already bundled through Hayro's default features retain their licences:
   non-visual character-mapping data; see licenses/pdf-backend/hayro-cmap/LICENSE.txt.
   Adobe and contributor names do not endorse or promote this product.
 Per-file hashes and sources are recorded in ASSETS.md.
+
+Bundled egui font icons
+
+The pinned egui dependency includes egui-icons.ttf, a small subset of John Slegers'
+emoji-icon-font, through default_fonts. The parent emoji-icon-font.ttf face is
+included through monochrome_emoji_fonts. Their upstream project is
+https://github.com/jslegers/emoji-icon-font; both use the same exact copyright
+and permission notice below.
+
+MIT License
+
+Copyright (c) 2014 John Slegers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/ROADMAP.md b/ROADMAP.md
index af3f0abff..6d27866cc 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,9 +1,10 @@
 # DesignCraft roadmap
 
 **Stage: pre-alpha** · next: alpha, ~5–7 h away; beta ~28 points and ~420–750 h beyond that (the core-workflow gate, not the percentage: ready for real work is already ~47%)
+- 2026-10-23: placed-artwork layer options survive IDML and native round trips per placement, independently of shared assets. Unsupported visibility overrides are explicit import/preflight/PDF warnings; format 4 prevents older native readers from silently discarding them. Rendering parity is still open; see [graphic-layer-options.md](docs/graphic-layer-options.md).
 - FID1: PDF export normalizes mixed emitted gradient color spaces to RGB with an explicit warning; homogeneous device-space gradients retain their components. Linear/radial, midpoint, archival and print policies have synthetic regression coverage.
 
-> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-13 · **Change:** minor (File ▸ Open Recent; .indd and .indt open through indd-utils; text threads by hand; the alpha gate waits on Primary Text Frame page fixes; Japanese print, import and table controls localized; Live corners (#186); Optical kerning from outlines (#181); window and menu quit confirmation; failed writes preserve live save and collection state; spring-loaded Zoom navigation; orderly native exit recovery; Pages panel parents; cancelable macOS Dock Quit; text stroke behind fill; Based on Parent; object styles carry effects; table anchors keep their own paragraphs; grouped HTML/EPUB reading order; Links source paths; XLSX cached cell values retain numeric precision and text) · **Target:** Adobe InDesign 2026
+> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-23 · **Change:** minor (placed graphic layer-option preservation and explicit rendering warnings; File ▸ Open Recent; .indd and .indt open through indd-utils; text threads by hand; the alpha gate waits on Primary Text Frame page fixes; Japanese print, import and table controls localized; Live corners (#186); Optical kerning from outlines (#181); window and menu quit confirmation; failed writes preserve live save and collection state; spring-loaded Zoom navigation; orderly native exit recovery; Pages panel parents; cancelable macOS Dock Quit; text stroke behind fill; Based on Parent; object styles carry effects; table anchors keep their own paragraphs; grouped HTML/EPUB reading order; Links source paths; XLSX cached cell values retain numeric precision and text) · **Target:** Adobe InDesign 2026
 - AR1.1: Kashida justification tests verify space fallback without Tatweel fonts using an isolated font database, while retaining elongation assertions when fonts support it.
 
 - AR1: Arabic IDML controls now retain character direction, kashida switches, diacritic offsets/forms, paragraph policy values and independent story/table directions. Shaping preserves joining context and script/language selection; paragraph-level bidi, contextual digit conversion, mark-safe elongation, RTL columns/tables and physical column insertion have regression coverage. Vendor-specific justification and diacritic presets remain explicit preflight warnings; see docs/arabic-typography.md.
@@ -11,6 +12,24 @@
 
 DesignCraft aims at full Adobe InDesign parity — and to be better: faster, open (documented JSON format + IDML), scriptable by agents (MCP), and available on the web.
 
+- **2026-10-25** · The application bar uses craft-window's shared title-bar code. A drag that
+  starts on a floating panel over the bar moves the panel, not the window, and in full screen the
+  bar no longer zooms or moves the window. No readiness percentage change.
+- **2026-10-24** · Embedded IDML keeps independent placed-PDF layer choices in table-cell and
+  footnote text. The variant rewrite reaches endnote stories too, but IDML endnote structures and
+  artwork remain unsupported. External-only export continues to reject active nested choices.
+  Shared placement ids with different sources or choices fail closed; no readiness percentage change.
+- **2026-10-24** · PDF/A-2b preparation applies placed-PDF layer choices, including explicit all-on,
+  to anchors inside table-cell text, footnotes and endnotes in an export-only copy. The nested
+  IDML variant write pass remains separate work; no readiness percentage change.
+- **2026-10-24** · Explicit PDF layer choices, including all-on, are checked with one actual
+  rewrite per distinct source before editing; reset to file defaults bypasses the check. Native
+  format 4 covers both explicit all-on PDF layers and retained graphic-layer options. No readiness percentage change.
+- **2026-10-23** · Placed PDF layers can explicitly all be shown, separately from Use File Defaults.
+  Legacy commands keep their reset behavior; native saves require a capable reader only for
+  the new all-on state, and PDF/embedded IDML exports preserve the choice. No readiness percentage change.
+- **2026-10-23** · IDML graphic-layer export rejects parents in already closed subtrees,
+  preserving native-edited layer order through round trips. Synthetic regression added.
 - **2026-10-23** · PDF layer choices now validate before editing all targets; rejected rewrites
   leave document/undo state intact. Null trailer entries remain unencrypted, and unsupported
   all-content crops retain the whole page rather than silently clipping hidden layers.
@@ -19,6 +38,10 @@ DesignCraft aims at full Adobe InDesign parity — and to be better: faster, ope
   regression tests cover metadata, output-intent references, nonzero generations and
   forward Prev links; repeated cross-reference offsets are rejected explicitly. No readiness percentage change.
 
+- **2026-10-23** · PDF layer commands reject overrides on layerless files atomically;
+  default layer queries find a placed PDF anywhere in mixed selections. Regression tests cover
+  IDML export after rejection and both selection orders.
+
 ## Status (2026-10-01)
 
 **Working today**
@@ -59,7 +82,7 @@ DesignCraft aims at full Adobe InDesign parity — and to be better: faster, ope
 - Control panel scale X/Y, rotation and shear fields (`transform.info`, absolute `transform.set {scaleX, scaleY, rotation, shear}` about the reference point) and Preferences › Transformations are Totals for nested objects and placed graphics.
 - Variable fonts: each named instance is a style (Font menu, shaping with feature variations, metrics, outlines) and embeds at its axis settings in PDF; free axis sliders still to come.
 - Object ▸ Select (first/next above, next/last below, container, content, previous/next in group), full Object ▸ Convert Shape (`object.convertShape`), Table ▸ Split Cell Horizontally/Vertically.
-- Attributes panel (`object.attributes`: Overprint Fill/Stroke/Gap, Nonprinting), with Overprint Gap in Overprint Preview and IDML.
+- Attributes panel (`object.attributes`: Overprint Fill/Stroke/Gap, Nonprinting), with Overprint Gap in Overprint Preview and IDML; PDF export writes them as `/op` and `/OP` with `/OPM 1`.
 - Page Numbering View (Preferences: section or absolute): page labels everywhere follow it; Go to Page takes section names, numbers or `+n`.
 - Preferences › Advanced Type (document `advancedType`: superscript/subscript size and position; IDML TextPreference); subscripts now drop 33.3% like InDesign.
 - Preferences › Composition › Highlight: keep violations, H&J violations (three shades), custom tracking/kerning, substituted fonts.
@@ -71,12 +94,12 @@ DesignCraft aims at full Adobe InDesign parity — and to be better: faster, ope
 - Endnotes (`endnote.insert/edit/delete/list/options`, Type ▸ Insert Endnote): references number through the document, the endnote frame on a new last page lists them under a heading; IDML keeps the listed text only.
 - Editorial notes (`note.new/edit/delete/convertToText/list`, Notes panel): anchored in text, flagged on screen, never printed or exported.
 - File ▸ Print Booklet (`file.printBooklet`): saddle-stitch or 2-up consecutive printer spreads as PDF, padded with blanks, with a gap between pages.
-- Edit ▸ Transparency Blend Space (`edit.transparencyBlendSpace`; RGB for web/mobile documents; IDML TransparencyPreference) — exported PDFs give pages with transparency a DeviceCMYK or DeviceRGB page group, so viewers and RIPs blend in that space. On screen, spreads with transparency in a CMYK blend space are shown through the working CMYK profile (their colours keep to its gamut, as when composited in CMYK).
+- Edit ▸ Transparency Blend Space (`edit.transparencyBlendSpace`; RGB for web/mobile documents; IDML TransparencyPreference) — exported PDFs blend in that space: CMYK print exports write their transparency groups and page groups in DeviceCMYK (PDF/X-4 also carries the CMYK working space as its `GTS_PDFX` output intent); RGB exports give pages with transparency a DeviceRGB page group. On screen, spreads with transparency in a CMYK blend space are shown through the working CMYK profile (their colors keep to its gamut, as when composited in CMYK).
 - High Contrast interface theme (fifth Interface Color Theme: black chrome, white text, yellow selection).
 - Place Excel workbooks (.xlsx): the first worksheet's used range becomes a table (shared/inline strings, numbers, booleans).
 - Object Library (`library.new/open/add/place/remove/list/json/close`, Library panel): `.dclib` files of snippets that keep stories, styles, swatches and images.
 - Ink Manager (`ink.list`, `ink.options`; Swatches panel menu): All Spots to Process, per-ink conversion and ink aliases in PDF output; IDML ConvertToProcess/AliasInkName.
-- Appearance of Black complete: Printing/Exporting rich black for RGB output (PNG), Overprint [Black] Swatch at 100% (document, IDML OverprintBlack).
+- Appearance of Black complete: Printing/Exporting rich black for RGB output (PNG), Overprint [Black] Swatch at 100% (document, IDML OverprintBlack; 100% [Black] fills, strokes and text overprint in PDF export).
 - Hyperlinks and Bookmarks panels (Window ▸ Interactive): new from the selection, edit (`hyperlink.edit`), go to source (`hyperlink.goToSource`), rename bookmarks (`bookmark.rename`), go to page, delete.
 - Nested line styles (`nestedLineStyles` paragraph attribute, Paragraph Style Options › Drop Caps and Nested Styles, IDML AllNestedLineStyles): the first lines restyle until the line breaks settle.
 - User dictionary hyphenation exceptions (`hyphenation.addException/removeException/list`, Edit ▸ Spelling ▸ User Dictionary): `ex~am~ple` breaks only at `~`, a plain word never hyphenates.
@@ -92,7 +115,7 @@ DesignCraft aims at full Adobe InDesign parity — and to be better: faster, ope
 - Image Import Options › Crop to for placed PDFs (`file.place {pdfCrop: crop|art|trim|bleed|media|contentVisible|contentAll}`, Place PDF dialog): the graphic spans that page box, the document stores the choice, and IDML keeps it as `PDFCrop`.
 - Stroke styles: striped (thick-thin… and custom bands), wavy and straight-hash strokes now draw on screen and in PDF; named custom stripe/dash/dot styles (`strokeStyle.new/delete/list`, Stroke panel Type list; IDML Striped/Dashed/DottedStrokeStyle).
 - Object ▸ Primary Text Frame (`object.primaryTextFrame`): any text frame's story can become (or stop being) the primary story Smart Text Reflow follows.
-- Column rules (Text Frame Options › Column Rules, `object.textFrameOptions {columnRule, columnRuleWeight, columnRuleColor, columnRuleTint, columnRuleOffset, columnRuleTopInset, columnRuleBottomInset}`, reported by `document.inspect`): a bar centred in each gutter of a multi-column frame, inside the insets and between the columns of right-to-left and vertical frames too, broken around paragraphs that span columns, with weight, colour, tint, horizontal offset and top/bottom insets; on screen, in PDF (tagged as an artifact) and in IDML (`ColumnRule…` attributes of `TextFramePreference`, also in object styles). The dialog shows the frame's options and changes only the fields edited. Rule stroke types and overprint aren't there yet.
+- Column rules (Text Frame Options › Column Rules, `object.textFrameOptions {columnRule, columnRuleWeight, columnRuleColor, columnRuleTint, columnRuleOffset, columnRuleTopInset, columnRuleBottomInset}`, reported by `document.inspect`): a bar centred in each gutter of a multi-column frame from the top line's ascent to the bottom line's descent, between the columns of right-to-left and vertical frames too, broken around paragraphs that span columns, with weight, colour, tint, horizontal offset and top/bottom insets; on screen, in PDF (tagged as an artifact) and in IDML (`ColumnRule…` attributes of `TextFramePreference`, also in object styles). The dialog shows the frame's options and changes only the fields edited. Rule stroke types and overprint aren't there yet.
 - Place a page of an IDML or DesignCraft document (`file.place {layoutPage}`): its objects, stories, styles and swatches as one group (INDD files are not readable).
 - Articles panel (`article.new/add/remove/options/delete/list`): reading order and content of EPUB and HTML exports.
 - Object ▸ Clipping Path (`object.clippingPath {type: alpha|edges, threshold, tolerance}`): traces the placed image and makes the outline the frame.
@@ -103,8 +126,7 @@ DesignCraft aims at full Adobe InDesign parity — and to be better: faster, ope
 - Content Collector and Placer tools (B; `conveyor.collect/place/list/clear`): copies of objects (with stories, styles, images) ride a conveyor between pages and documents; Alt-click keeps them on it.
 - Linked stories (Edit ▸ Place and Link, `story.placeAndLink/links/updateLink/unlink`): child stories copy a parent, show out of date in the Links panel and update.
 - Edit ▸ Menus (`window.hideMenuItem`): hide menu items; menus with hidden items end in Show All Menu Items.
-- View ▸ Separations Preview (`view.separations`): one process plate as ink density, or areas over an ink limit in red (a GCR preview of the rendered view; spot plates and the flattener preview aren't there).
-- Separations Preview plates now come from each object's own colour (CMYK as authored; RGB and images through the colour settings, images via a cached 17³ table), so pure black shows only on the black plate.
+- View ▸ Separations Preview (`view.separations`, Window ▸ Output ▸ Separations Preview, `ink.separations`): the plates the print PDF puts on film, spot plates included. Each visible spread is exported as Export PDF writes it and separated with craft-prepress, so the Ink Manager's aliases and spots to process, overprint and the flattener show as printed. All inks as printed, one plate as film, or an ink limit in red over gray; the panel lists the plates with each ink's percentage under the pointer.
 - Language (Character panel ▸ Language, Properties ▸ Character, `type.char {language}`): text in other languages isn't hyphenated or spell-checked with the English dictionaries, typographer's quotes follow the language (German „…“, French and Russian «…», Swiss, Spanish, Dutch, Nordic, Japanese and Traditional Chinese 「…」, Simplified Chinese “…”), the font's localized forms (OpenType `locl`: Turkish i, Bulgarian Cyrillic, Japanese / Chinese / Korean glyph variants) follow it too, and so does the fallback for CJK characters the font lacks (with Draw Missing Glyphs from Fallback Fonts on): Japanese, Simplified Chinese, Traditional Chinese and Korean each try their own installed system fonts (Japanese starts with the craft-fonts Japanese faces, Mincho first, when built with them; Hangul, kana and Bopomofo pick their language's fonts whatever the language). Language names from IDML keep their spelling; locale codes as InDesign writes them for some languages (`de_DE_2006`, `nl_NL_2005`; any `ll`, `ll_CC`, `ll-CC`) are their language and region for all of the above, and Chinese is also recognised in its common spellings ("Simplified Chinese", "Chinese (Traditional)", `zh_CN`, `zh-Hant`). Spanish is hyphenated with Javier Bezos's Liang patterns (`hyph-es.tex` 5.0, MIT) through the `hypher` crate; hyphenation for other languages isn't bundled yet.
 - Books (`book.new/open/add/remove/list/styleSource/paginate/syncStyles/exportPdf`, Book panel): `.dcbook` files, continuous page numbering, style sync from a style source, one merged PDF.
 - Track Changes (`changes.track/list/acceptAll/rejectAll`, Type ▸ Track Changes): typing is marked added (highlighted on screen), deletions are kept but hidden from layout and exports until accepted or rejected. Per-change accept/reject and authors aren't there yet.
@@ -132,10 +154,10 @@ DesignCraft aims at full Adobe InDesign parity — and to be better: faster, ope
 - View ▸ Rotate Spread (`view.rotateSpread`, `layout.rotateSpreadView`): the spread in view turns in quarter turns on screen (stored with the document; output is unaffected). The canvas maps each spread through its own transform, so tools, snapping, resize handles, guides, overlays and rendering all follow the turned spread.
 - Vertical type (Vertical Type Tool, Type ▸ Story Direction `type.storyDirection`, IDML StoryOrientation): the direction belongs to the story, so every frame of a thread is vertical or horizontal together and a frame threaded onto a story takes its direction (`object.textFrameOptions {vertical}` sets the frames' stories); lines run top to bottom and follow each other right to left; the arrow keys follow them (Down and Up along the line, Left and Right to the next and previous line, keeping the position along it); CJK characters stay upright and other text turns, on screen and in PDF; CJK line breaking with basic kinsoku (also in horizontal text); Korean breaks at spaces, word by word (Hangul in any language, hanja in Korean text), or between syllables when the paragraph asks for it (`type.para {koreanCharBreaks}`, Paragraph Style Options ▸ Justification; not written to IDML). Upright text is shaped top to bottom: punctuation and brackets take their vertical forms (OpenType `vert`; `vkrn` and `vpal` through OpenType features), glyphs advance by their vertical metrics (`vmtx`) and hang from their vertical origins (`VORG`) on the centre of the ideographic em box (`BASE`, else OS/2), which the first line's ascent follows; turned text keeps its horizontal forms. Tate-chu-yoko (Type ▸ Tate-Chu-Yoko, `type.tateChuYoko`, IDML `Tatechuyoko`) sets a run such as "12" side by side within one em of the line. Ruby (Type ▸ Ruby…, `type.ruby`, IDML RubyString; group ruby spread 1-2-1 or centred) and kenten emphasis dots (`type.kenten`, IDML KentenKind) are set over their text — to its right in vertical frames — without changing line breaks. Warichu and ruby options (per-character ruby, positions, overhang) aren't there yet.
 - Math expressions (Type ▸ Insert Math Expression…, `math.insert`, `math.svg`): a LaTeX subset (fractions, scripts, roots, big operators with limits, Greek, relations and operators with math spacing, `\left…\right`, `\text`) typeset by our own engine into SVG, placed inline at the cursor or as a frame; the LaTeX is kept as alt text and can be edited.
-- Object Layer Options for placed PDFs (`object.pdfLayers`, `object.layerOptions`, Object ▸ Object Layer Options…): the file's optional-content layers listed and shown or hidden per frame on screen; in exported PDFs such graphics go out as 300 ppi images of their visible layers.
+- Object Layer Options for placed PDFs (`object.pdfLayers`, `object.layerOptions`, Object ▸ Object Layer Options…): the file's optional-content layers listed and shown or hidden per frame on screen; plain and PDF/X-4 exports preserve their visible layers as vectors.
 - Effects: Inner Glow (edge or centre), Bevel and Emboss (inner bevel lit from the light angle), Satin (`object.innerGlow`, `object.bevel`, `object.satin`); PDF export now keeps soft effects: objects with shadows, glows, feathers, bevels or satin go out as 300 ppi transparent images of their appearance (threaded text frames excepted).
 - Directional Feather (`object.directionalFeather {widths: [top, left, bottom, right]}`): each side fades over its own width.
-- View ▸ Flattener Preview (`view.flattenerPreview`): objects involving transparency highlighted in red; knockout groups export as images (PDF output has no knockout groups).
+- View ▸ Flattener Preview (`view.flattenerPreview`): objects involving transparency highlighted in red; PDF export writes Knockout Group as a knockout transparency group (`/K true`) and Isolate Blending as `/I true`.
 - Live captions (`object.caption {live: true}`, Object ▸ Captions ▸ Generate Live Caption): the caption text is re-filled from the source object's metadata after every edit (same undo step).
 - Style Export Tagging (`style.exportTag`, Paragraph Style Options ▸ Export Tagging): paragraph and character styles choose their HTML element and class in EPUB/HTML.
 - Tagged Text: export (`file.exportText {format: "tagged"}`) and place (detected by its header; ASCII, UTF-8 or UTF-16) with paragraph and character styles, font, typeface and size, and `<0x…>` characters.
@@ -152,14 +174,14 @@ DesignCraft aims at full Adobe InDesign parity — and to be better: faster, ope
 - Preferences › Appearance of Black: 100% K on screen accurately (dark grey) or as rich black (`window.richBlack`); the printing/export side is still to come.
 - Spreads of up to 10 pages: Add to Previous Spread and Allow Spread to Shuffle (Pages panel; `layout.pages.toSpread`, `layout.spreadShuffle`); inserted pages go around kept spreads.
 - Page tool (⇧P) and `layout.pageSize`: pages of their own size (or a preset); the spine stays put and objects keep their place on their page.
-- File › Print (⌘P): printer, copies, page range, spreads, marks, bleed; printed as PDF through the system spooler (`file.print`, `file.printers`, `dryRun` for agents). Shortcuts now act like choosing the menu item (dialogs open), and UI commands win shortcut ties (⌘N opens New Document).
+- File › Print (⌘P): printer, copies, page range, spreads, marks, bleed; printed through the system spooler as the PDF File › Export PDF writes with the same settings (effects, flattener, print color, warnings) (`file.print`, `file.printers`, `dryRun` for agents). Shortcuts now act like choosing the menu item (dialogs open), and UI commands win shortcut ties (⌘N opens New Document).
 - Nested styles (through/up to N sentences, words, characters, letters, digits, tabs, breaks, spaces or given characters) and GREP styles (regex → character style), edited in Paragraph Style Options and composed under local formatting; `ui.dialog.open` for agents. Nested line styles are still to come; nested and GREP styles round-trip through IDML.
 - Table and cell styles (round-trip through IDML): cell styles (fill, insets, vertical justification, strokes, paragraph style) and table styles (region cell styles, border, alternating rows, spacing); apply from the Table panel, edits re-apply to every user; `style.cell.*`, `style.table.*`.
 - Style groups: paragraph and character styles shown in group folders, Move to Group (new, existing, none); `style.group` renames every use (styles, stories, table cells, footnotes, object styles).
 - Scrubby zoom: drag the Zoom tool left or right to zoom continuously around the press point.
 - Guides belong to the active layer: hidden with it (or with its Show Guides off) and locked with it.
 - Pencil tool (N): freehand strokes simplified to smooth paths (Alt closes); Smooth and Erase tools re-fit or remove the stretch you drag along (`path.smooth`, `path.erase`).
-- Edit › Keyboard Shortcuts: every command, click and press the new keys, conflicts shown, per-command and global reset; `window.setShortcut`.
+- Edit › Keyboard Shortcuts (the shared craft-keymap dialog): every command grouped by menu, recording with conflicts asked about, undo, named shortcut sets, an on-screen US keyboard, InDesign set import with a review, JSON export and a printable summary; `window.setShortcut`, `window.shortcutSets`.
 - Primary Text Frame (New Document) and Smart Text Reflow: pages are added while the primary story oversets and empty ones at the end removed, in the same undo step (Preferences › Type).
 - Glyphs panel: every character of any font (rendered by our renderer), search by character or U+code, click to insert, recently used.
 - UI scaling (Preferences › Interface, 50–200%; `window.uiScale`); the window title steps aside when the bar is crowded.
@@ -171,7 +193,7 @@ DesignCraft aims at full Adobe InDesign parity — and to be better: faster, ope
 - Pathfinder (Object › Pathfinder and a Pathfinder panel): Add, Subtract, Intersect, Exclude Overlap, Minus Back; curves stay curves (flo_curves); `object.pathfinder`.
 - Make / Release Compound Path (⌘8; nested paths become holes), Create Outlines (⇧⌘O; one path per text colour), Scissors tool (C) with `path.split`.
 - Transform Again / Individually / Sequence Again (⌥⌘3; a moved copy repeats like Step and Repeat), Clear Transformations; Layers: Merge, Delete Unused, Hide/Lock Others, Show/Unlock All; Break Link to Style (paragraph and character).
-- Floating panels: tear a panel off the dock (its float button, or drag its header away) into a movable, resizable window; Dock puts it back; positions persist; `window.floatPanel` / `window.dockPanel`.
+- Floating panels: drag a panel's tab, or a group by its drag bar, off the dock (or choose Float Panel) into a movable floating window that resizes from every edge; Dock Panel (in its tab menu and ≡ menu) puts it back where it was; positions persist; `window.panel.float` / `window.panel.dock` (aliases `window.floatPanel` / `window.dockPanel`).
 - Place SVG (vector in PDF export via krilla-svg, resvg on screen, text in the bundled fonts), Photoshop (.psd/.psb composite in its colour mode — Bitmap, Grayscale, Duotone, Indexed, RGB, CMYK, Lab, 8/16-bit — with merged transparency; extra alpha and spot channels don't change the image), BMP, and Illustrator files saved with PDF compatibility (.ai). New `designcraft-images` crate (L2) for sniffing, sizes and decoding. EPS is still missing.
 - View › Display Performance: Fast (grey boxes, no effects, ⌥⇧⌘Z), Typical (72 ppi proxies, ⌥⌘Z), High Quality (⌥⌘H, our default — the renderer is fast enough).
 - OpenType menu (Character panel): discretionary ligatures, fractions, ordinal, swash, titling, contextual alternates, slashed zero, the four figure styles and stylistic sets 1–20; `type.openType`; mapped to IDML's OTF attributes.
@@ -358,10 +380,44 @@ list) · [roadmap.md](docs/roadmap.md) (milestones, plan) · [parity-checklist.m
 
 Newest first.
 
+- **2026-10-27** · An iconic panel's flyout stays open while you work in the canvas or a text field: Auto-Collapse Iconic Panels is off by default, and preferences saved with it on start with it off. Preferences › Interface › Panels holds the setting next to the column bar's menu item. No readiness percentage change.
+- **2026-10-24** · Column rules run from the top line's ascent to the bottom line's descent, as InDesign draws them, instead of from the top to the bottom of the columns, on screen, in PDF and in PowerPoint export. The top and bottom insets shorten the rule from those lines. Existing documents draw their column rules at the new length. No readiness percentage change.
+- **2026-10-20** · Edit › Keyboard Shortcuts is craft-keymap's shared dialog: commands grouped by menu with Show and Filter, recording that asks before taking a key from another command, undo and redo, named shortcut sets (edits of Default become Custom; an imported set becomes a set of its own), an on-screen US keyboard, InDesign Show Set files reviewed before they apply, JSON export and an HTML summary. ui.json keeps the `shortcuts` map earlier versions read, for the active set. No readiness percentage change.
+- **2026-10-19** · Import InDesign Set… runs on craft-keymap's importer: a set's Window menu panel items (Layers F7, Pages F12, Swatches F5) and Tools items set the panel and tool shortcuts, all of an item's Default keys apply, and the report adds numeric keypad keys read as main keys and likely commands for unmatched items (`window.importShortcuts`). On InDesign's Windows defaults it matches 366 of 1,629 items (was 233) and changes 23 commands. No readiness percentage change.
+- **2026-10-19** · Keyboard shortcuts run on the shared craft-keymap crate. Panels take shortcuts, with InDesign's defaults where the key is free (Swatches F5, Color F6, Layers F7, Info F8, Stroke F10, Paragraph Styles F11, Character Styles Shift+F11, Pages F12, Align Shift+F7); tool keys are editable in Edit › Keyboard Shortcuts and `window.setShortcut`, and tools sharing a key take turns (B). Saved shortcuts load unchanged. No readiness percentage change.
+- **2026-10-16** · Edit › Keyboard Shortcuts imports a set saved by InDesign's Show Set (.txt, Windows or Mac key names, UTF-8 or UTF-16): matched commands take its Default shortcuts or lose theirs, other commands give up keys it takes, and a report lists what it changed and the items it could not match (`window.importShortcuts`, #1180). Tool keys stay fixed. No readiness percentage change.
+- **2026-10-20** · PDF/X-1a:2003 export (craft-libs#194): `file.exportPdf {standard: "x1a"}`, the Export PDF dialog's PDF/X-1a:2003 preset and standard. The PDF/X-4 print file is flattened in its inks by craft-prepress (no transparency; spot, process, overprint and live text kept; complex regions as DeviceN images at the Transparency Flattener preset's resolution), then written as PDF 1.4 with the X-1a identification and checked; `validate-pdf --standard x1a`. Soft drop shadows reach the flattener in their swatch's inks; other soft effects are still RGB images. No readiness percentage change.
+- **2026-10-20** · Print color (craft-libs#190): CMYK print PDFs blend in DeviceCMYK through craft-pdf's print settings instead of byte rewrites, with the CMYK working space as the output intent in PDF/X-4 only; overprint (Overprint Fill, Stroke and Gap, overprinting text, 100% [Black]) is written as `/op` `/OP` `/OPM 1`; Knockout Group writes `/K true` instead of becoming an image; File › Print prints the PDF Export PDF writes. No readiness percentage change.
+- **2026-10-20** · Separations Preview shows the plates the exported PDF prints, spot plates included: each visible spread is exported in memory with the Export PDF settings and separated by craft-prepress off the UI thread, then shown as all inks, one plate or an ink limit. The Ink Manager builds craft-prepress's `InkSet` from the document for export and preview. On the sample magazine the first preview of a spread takes about 0.6–1.1 s, most of it the PDF export. No readiness percentage change.
+- **2026-10-20** · Spot gradients print on their plates. A gradient stop keeps the swatch it was given (Gradient panel drop, `swatch.create {gradient}`, `object.gradient`, IDML `StopColor`), following its renames and edits. PDF export shades one spot with its tints or [Paper] as a Separation, and a spot with process inks or a second spot as DeviceN; a process gradient to [Paper] prints in DeviceCMYK. Documents with plain-color stops export as before. No readiness percentage change.
+- **2026-10-24** · Panels dock through the suite's shared docking (craft-libs), and on desktop a floating panel opens in its own window that can leave the main window: keys pressed there run the main window's shortcuts, clipboard and tool keys, and the canvas paints no tool cursor while another of the app's windows has the pointer. The web build keeps floating panels in the page. No readiness percentage change.
+- **2026-10-24** · Story Options rejects malformed or nonexistent explicit story/frame IDs without changing the selected story, including an invalid frame alongside a valid story. Null targets remain absent; omitted targets still use the selection. No readiness percentage change.
+- **2026-10-24** · Text Frame Options explains that a custom baseline-grid increment must be a measure greater than zero when zero, a negative value or a non-measure is entered. Validation is unchanged. No readiness percentage change.
+- **2026-10-24** · Renaming a paragraph or character style, or moving it into a style group, keeps its Export Tagging under the new name, and undo puts it back under the old one. Deleting a tagged style drops its tagging and leaves the replacement style's own tagging as it was. No readiness percentage change.
+- **2026-10-24** · Quick Apply and the application bar's search leave out the interface commands that failed or reset a setting when chosen there: those that need a workspace, a command and shortcut, a menu item, a panel, a window edge, an app page, a recent file or a swatch they can't give them, a Contextual Task Bar place, and Interface Color Theme, UI Scaling, Reset Shortcuts, the flattener preset, Screen Mode and Zoom To, which without a value switched to the dark theme, set 100%, cleared every custom shortcut or the preset, or went to Normal mode or 100% zoom. Each stays in the menu, panel or dialog that gives it the value. No readiness percentage change.
+- **2026-10-24** · EPUB Export Options › Split Document, a dialog before File › Export EPUB… saves (`document.epubSplit`, stored with the document): off, a single paragraph style, or based on paragraph style export tags, with Paragraph Style Options › Export Tagging's Split Document flag marking those styles. A reflowable EPUB is one content file unless Split Document is on; the split before each top-level h1 from #791 is gone. A split before a list item or preformatted line no longer leaves an unclosed list or block in a content file. IDML import and export keep the setting and the flag, and Load Styles the flag. No readiness percentage change.
+- **2026-10-18** · Repeated placed-PDF layer variants are prepared once per asset and hidden-name set, with recovery warnings retained. All-visible named layers keep their original source bytes, including PDFs whose cross-reference tables the reader repairs, in plain, PDF/X-4, booklet and book-merge output. Layer changes that require writing still reject an unusable cross-reference table with a file-named damage error; the first placement error is retained (#906). No readiness percentage change.
+- **2026-10-18** · Placed PDF optional-content defaults and per-frame overrides survive plain and PDF/X-4 vector export, including repeated placements, booklet output and book merging (#906). Source usage-application arrays are accepted; groups without a catalog configuration stay visible. Missing or unreadable default configurations and unsupported base states use all-ON defaults with a file-named export warning, retaining explicit frame overrides. Readable groups omitted from the catalog list are added with a distinct file-named warning, preserving their default ON/OFF states. Concurrent recovery warnings are combined. Malformed ON data is recoverable when a known ON base and empty OFF list prove it cannot hide artwork; missing display names are generated without changing known visibility when no override needs name matching. Contradictory states, unresolved references and ambiguous name overrides still fail export. Print-usage adjustments and IDML layer overrides remain follow-ups. No readiness percentage change.
+
+- **2026-10-24** · Optical Margin Alignment and hanging punctuation apply to lines with a tab or a right indent tab, as both composers already measured them: the edge glyphs hang, and tab stops stay where they are. Such a line was set without the hang: a justified line that fit only because its period or closing quote hangs had its word spaces squeezed to make up for it, and text after a right indent tab stopped at the measure instead of hanging. No readiness percentage change.
+- **2026-10-23** · `designcraft-cli mcp` takes `--automation-read-root` and `--automation-write-root` more than once, as the suite's other apps do (#1552): a path inside any root of its kind passes, and the roots' common parent, `..` or a link out of them and the other kind's roots stay refused. No readiness percentage change.
+- **2026-10-23** · Layout › Go Back and Go Forward (Cmd+Page Up / Cmd+Page Down, Ctrl on Windows and Linux) retrace the jumps between pages (Go to Page, the page and spread commands, the Pages panel) as InDesign's do, returning to where the view was on each page at the current zoom; a new jump after going back drops the pages ahead, scrolling adds no entry, and pages deleted since are skipped. No readiness percentage change.
+- **2026-10-24** · The Story Editor has InDesign's vertical depth ruler between the style column and the text, and View › Story Editor › Show/Hide Depth Ruler (`view.storyEditorDepthRuler`) shows or hides it in the Story Editor, remembered with the preferences. The ruler is marked in the document's vertical ruler units with how deep the story's text fills its frames, counted through its columns and threaded frames (lines set side by side, in the sub-columns of a split paragraph or on both sides of a wrap object, count once), and is shaded down to the overset point, where a red line now crosses the editor. No readiness percentage change.
+- **2026-10-24** · Split Note (`note.split {story, id, at}`, the Notes panel's Split Note button): as in InDesign, a note splits in two at the insertion point in its text. DesignCraft moves the text after it into a new note by the same author, anchored right after the first. No readiness percentage change.
+- **2026-10-24** · Type › Notes › Previous Note and Next Note (`note.previous`, `note.next`): as in InDesign, they move the insertion point from note to note in the story, putting the caret after the note's anchor. Each item is unavailable when no note lies in its direction in the story, or when the insertion point is in a table cell or a footnote. No readiness percentage change.
+- **2026-10-24** · Type › Notes › Convert to Note (`note.convertFromText {author?}`): as in InDesign, the selected text leaves the story and becomes the text of a new note, whose anchor takes its place; Convert Note to Text puts it back. DesignCraft refuses a selection in a table cell, or one that holds a note, footnote, endnote, anchored object, index marker, text anchor, cross-reference or table. No readiness percentage change.
+- **2026-10-23** · Effects dialog: with Use Global Light on, the Angle field (and the Bevel and Emboss one) stays editable and shows the document's global light angle; a change there sets the global light for every effect that uses it, applied with the effects in one undo step (`object.effects` takes `globalLight`). Before, the field was greyed out and the angle couldn't be changed in the dialog. No readiness percentage change.
+- **2026-10-24** · Story panel (Window › Type & Tables › Story): Optical Margin Alignment and its size for the stories of the text selection or the selected text frames, disabled without either; `type.selectionAttrs` reports them as `storyOptions`, null where the stories differ. The Paragraph panel menu has Ignore Optical Margin in place of the per-paragraph Optical Margin Alignment switch, which stays in `type.para`, and Paragraph Style Options › Indents and Spacing has Ignore Optical Margin (#947). No readiness percentage change.
+- **2026-10-24** · Optical Margin Alignment per story with a size (`story.options {opticalMargin, opticalMarginSize}`, off by default): when it is on, the story's paragraphs hang punctuation and letter edges by amounts set for that type size, except paragraphs with Ignore Optical Margin (`ignoreOpticalMargin` in `type.para` and paragraph styles). Table cells and footnotes don't take the story setting yet. When it is off, the per-paragraph switch still hangs at the text's own size. IDML imports and exports both (`StoryPreference/@OpticalMarginAlignment`, `@OpticalMarginSize`, `IgnoreEdgeAlignment`) (#947). No readiness percentage change.
+- **2026-10-24** · Text frames: a custom baseline grid's Relative To (Text Frame Options › Baseline Options, `object.textFrameOptions {baselineGrid: {relativeTo}}`, IDML `BaselineFrameGridRelativeOption`) measures the grid's start from the top of the page, the top margin, the top of the frame or its top inset. Text Frame Options had no custom baseline grid controls, imports dropped the setting and every frame grid started from the page top, so grid-aligned text in a frame measured from its own top sat on the wrong lines. No readiness percentage change.
+- **2026-10-24** · Paragraph Style Options › Indents and Spacing has an Align to Grid menu: None, All Lines or First Line Only. It shows the style's current setting. A First Line Only style could be set only in the CJK Grid Settings section, which shows only with CJK features on, or through commands. No readiness percentage change.
+- **2026-10-24** · Anchored text frames, such as marginal notes, compose where their host story places them: they align to the baseline grid at that position, and page-number markers and spine-relative alignment inside them read the host's page. They composed against a grid measured from their stored position and on no page, so a note set to Only Align First Line to Grid could sit a fraction of a line off the body text's grid line. No readiness percentage change.
+- **2026-10-24** · Tables: a gradient swatch in a cell fill draws as a gradient on the canvas and in PDF, in one gradient space for the whole table, so it runs across cells without restarting. Cells showed the gradient's first stop as a solid colour. No readiness percentage change.
 - **2026-10-24** · New documents start with Hyphenate Capitalized Words, Hyphenate Last Word and Hyphenate Across Column off in [Basic Paragraph], as in InDesign. Opened and imported files keep the values they carry. No readiness percentage change.
 - **2026-10-24** · The baseline grid's Relative To setting applies: with Top Margin, the grid starts at each page's own top margin in text composition, on the canvas and for snapping. It started at the page top, so grid-aligned text sat on the wrong lines and a page could fit one line fewer. No readiness percentage change.
 - **2026-10-24** · Custom-positioned anchored objects honour Relative to Spine (`anchored.options {spineRelative}`, IDML `SpineRelative`): the settings describe a left-hand page and mirror on a right-hand page, so marginal notes stay in the outside margin on both pages of a spread. On right-hand pages they took the left-hand placement and landed in the inside margin, across the spine or over the body text. No readiness percentage change.
 - **2026-10-24** · Text frames: a custom baseline grid (Text Frame Options › Baseline Options) from an IDML file sets lines from its start by its increment. The composer read the two values in the other order, so lines landed on the wrong grid. No readiness percentage change.
+- **2026-10-23** · File › File Info… edits the document's Document Title, Author, Description, Keywords, Copyright Notice and Copyright Info URL (`file.info`), and the document saves them. PDF export (PDF/X-4 and Print Booklet included) writes the title, author, description and keywords into the PDF's document information and XMP. EPUB export takes the title and author from File Info, and HTML export takes the title. A title or author given to the export replaces File Info's, and an empty Document Title leaves the document's name as the title. No readiness percentage change.
 - **2026-10-23** · Save and export dialogs (Save As, Save a Copy, Export PDF and the other exports, Package, libraries and books) start in the active document's folder once it has been saved, and for a document never saved in the folder of the last file saved or exported, remembered across sessions (#1653). A folder deleted since falls back to the system's choice. No readiness percentage change.
 - **2026-10-22** · Autoflow (Shift-click with the loaded text cursor, autoflow on Place, `text.thread {autoflow}`) fills the pages that follow before it adds any, as InDesign does: one frame per column on each following page, whatever else the page holds, then new pages at the end of the document. It inserted pages right after the story's last frame, in front of the document's own pages. Frames it set past the end of the text go again; a page the document had stays, and a page autoflow added only for such a frame goes with it. Smart Text Reflow of the primary text frame is unchanged. No readiness percentage change.
 - **2026-10-16** · Edit › Keyboard Shortcuts imports a set saved by InDesign's Show Set (.txt, Windows or Mac key names, UTF-8 or UTF-16): matched commands take its Default shortcuts or lose theirs, other commands give up keys it takes, and a report lists what it changed and the items it could not match (`window.importShortcuts`, #1180). Tool keys stay fixed. No readiness percentage change.
@@ -371,6 +427,7 @@ Newest first.
 - **2026-10-22** · The Paragraph panel is laid out as InDesign's: the nine alignment buttons in groups; indent, spacing and drop cap fields by their icons in two columns, with Space Between Paragraphs Using Same Style (Ignore or a space); Shading and Border with the Paragraph Borders and Shading button and colour; Hyphenate with Do Not Align / Align to Baseline Grid. Its panel menu follows InDesign's order: Paragraph and Single-line Composer, Only Align First Line to Grid, Balance Ragged Lines, Optical Margin Alignment, Justification…, Keep Options…, Span Columns…, Hyphenation…, Drop Caps and Nested Styles…, GREP Styles… (these three now open for the selected paragraphs), Paragraph Rules…, Paragraph Borders and Shading…, Bullets and Numbering…, Restart/Continue Numbering, Define Lists… and the paragraph direction. Convert Bullets and Numbering to Text is listed but not available yet. No readiness percentage change.
 - **2026-10-22** · A ruler guide dragged with the Selection tools, out of a ruler, on its own or with other selected guides, snaps along its axis as objects do (#1221): to other ruler guides, margins, columns, bleed, page and object edges and centers (with the smart-guide mark) and the document grid, within the snap zone and following Snap to Guides and Smart Guides. Shift snaps to the ruler's ticks and Cmd suspends snapping. The preview line, the position readout and the drop use the same snapped position. No readiness percentage change.
 - **2026-10-22** · macOS: the app menu has a Language submenu after Settings… with each interface language in its own name and the current one checked, as in the suite's other apps; Preferences › General › Interface Language stays. No readiness percentage change.
+- **2026-10-23** · Type › Text Variables › Convert Variable to Text (`variables.convertToText`): the variable instances in the selected text, in a story, a table cell or a footnote, become plain text of the value each shows on its own page (a running header on page 3 becomes page 3's heading). `variables.convertAllToText {name}` does the same for every instance of one variable in the document, as the Text Variables dialog's Convert to Text button. The variable stays defined; one undo step. No readiness percentage change.
 - **2026-10-22** · macOS menu bar: the menus keep working after the interface language or Show CJK Features changes (a rebuilt menu bar lost every click, Quit included), and its key equivalents are the shortcuts in effect, so a shortcut moved in the Keyboard Shortcuts editor leaves its old menu item. No readiness percentage change.
 - **2026-10-22** · Paragraph rules: Rule Above's offset is measured from the first line's baseline to the rule's bottom edge, as in InDesign. Rules sat one ascent too high and crossed the previous paragraph's text (reported from an imported INDD document). No readiness percentage change.
 - **2026-10-21** · Ruler guides are selected like objects (#1282): a click with the Selection tools selects a guide (also where it crosses an object), Shift-click adds or removes one, a new guide from the rulers is selected, a marquee that touches no object selects the guides it crosses, and Edit › Select All Guides (⌥⌘G, `guide.selectAll`) selects every unlocked guide on the spread. Selected guides draw thicker in their layer's color, drag together (all of them shown moving), nudge with the arrow keys and go with Delete, each as one undo step (`guide.select`, `guide.deselect`, `guide.moveBy`, `guide.delete {}`). With one guide selected the Control bar's X (vertical guide) or Y (horizontal guide) field and Properties › Transform show where it is, as the rulers measure, and typing a value moves it there. No readiness percentage change.
diff --git a/apps/designcraft-cli/examples/pdf_export.rs b/apps/designcraft-cli/examples/pdf_export.rs
new file mode 100644
index 000000000..c427741a2
--- /dev/null
+++ b/apps/designcraft-cli/examples/pdf_export.rs
@@ -0,0 +1,64 @@
+//! File › Export PDF on the `designcraft-cli perf` stress document, timed.
+//!
+//! ```text
+//! cargo run --release -p designcraft-cli --example pdf_export -- [--pages N] [--runs N] [--out FILE.pdf]
+//! ```
+//!
+//! Builds the synthetic document (200 pages, 1M characters in threaded stories, 500 placed
+//! images, gradients, a drop shadow per spread), opens it in a headless session and runs
+//! `file.exportPdf` on all pages: one warm-up export (composition), then `--runs` timed ones.
+//! Prints each run, the median and the minimum. `--out` keeps the last PDF, written with a fixed
+//! creation date so two builds can be compared byte for byte.
+
+use std::time::Instant;
+
+use designcraft_cli::stress;
+
+fn main() -> Result<(), String> {
+    let mut spec = stress::Spec::default();
+    let mut runs = 7usize;
+    let mut out: Option<String> = None;
+    let mut args = std::env::args().skip(1);
+    while let Some(a) = args.next() {
+        let mut num = || args.next().and_then(|v| v.parse::<usize>().ok()).ok_or(format!("{a} needs a number"));
+        match a.as_str() {
+            "--pages" => spec.pages = num()?,
+            "--runs" => runs = num()?.max(1),
+            "--out" => out = Some(args.next().ok_or("--out needs a file")?),
+            other => return Err(format!("unknown option `{other}`")),
+        }
+    }
+    let doc = stress::synthetic(&spec)?;
+    let bytes = designcraft_format::save(&doc).map_err(|e| e.to_string())?;
+    let dir = std::env::temp_dir().join(format!("designcraft-pdf-bench-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
+    let file = dir.join("stress.designcraft");
+    let keep = out.is_some();
+    let pdf = out.map_or_else(|| dir.join("stress.pdf"), std::path::PathBuf::from);
+    std::fs::write(&file, bytes).map_err(|e| e.to_string())?;
+    let mut s = designcraft_engine::Session::new();
+    s.execute("file.open", &serde_json::json!({"path": file})).map_err(|e| e.to_string())?;
+    let params = serde_json::json!({"path": pdf, "created": 1_700_000_000});
+    let mut export = || -> Result<f64, String> {
+        let t = Instant::now();
+        s.execute("file.exportPdf", &params).map_err(|e| e.to_string())?;
+        Ok(t.elapsed().as_secs_f64() * 1000.0)
+    };
+    let warm = export()?;
+    println!("{} pages, warm-up export (with composition) {warm:.1} ms", doc.page_count());
+    let mut ms = Vec::with_capacity(runs);
+    for i in 0..runs {
+        let t = export()?;
+        println!("run {}: {t:.1} ms", i + 1);
+        ms.push(t);
+    }
+    ms.sort_by(f64::total_cmp);
+    let size = std::fs::metadata(&pdf).map_or(0, |m| m.len());
+    println!("median {:.1} ms, min {:.1} ms, {} kB", ms[ms.len() / 2], ms[0], size / 1024);
+    let _ = std::fs::remove_file(&file);
+    if !keep {
+        let _ = std::fs::remove_file(&pdf);
+    }
+    let _ = std::fs::remove_dir(&dir);
+    Ok(())
+}
diff --git a/apps/designcraft-cli/src/automation_args.rs b/apps/designcraft-cli/src/automation_args.rs
index 52ef34f20..2ad9af786 100644
--- a/apps/designcraft-cli/src/automation_args.rs
+++ b/apps/designcraft-cli/src/automation_args.rs
@@ -3,30 +3,22 @@
 
 use std::path::PathBuf;
 
+#[derive(Default)]
 pub struct AutomationArgs {
-    pub read_root: Option<PathBuf>,
-    pub write_root: Option<PathBuf>,
-    read_given: bool,
-    write_given: bool,
+    pub read_roots: Vec<PathBuf>,
+    pub write_roots: Vec<PathBuf>,
 }
 
 impl AutomationArgs {
-    pub fn new(read_root: Option<PathBuf>, write_root: Option<PathBuf>) -> Self {
-        Self { read_root, write_root, read_given: false, write_given: false }
-    }
-
-    /// Returns whether this argument is a root flag. A second occurrence of a flag is an error,
-    /// including when the two spellings (`--flag DIR`, `--flag=DIR`) are mixed.
+    /// Returns whether this argument is a root flag. Each flag may be given more than once (#1552),
+    /// in either spelling (`--flag DIR`, `--flag=DIR`): every use adds a folder, none replaces one.
     pub fn consume(&mut self, arg: &str, args: &mut impl Iterator<Item = String>) -> Result<bool, String> {
         let (flag, inline) = arg.split_once('=').map_or((arg, None), |(flag, value)| (flag, Some(value)));
-        let (root, given) = match flag {
-            "--automation-read-root" => (&mut self.read_root, &mut self.read_given),
-            "--automation-write-root" => (&mut self.write_root, &mut self.write_given),
+        let roots = match flag {
+            "--automation-read-root" => &mut self.read_roots,
+            "--automation-write-root" => &mut self.write_roots,
             _ => return Ok(false),
         };
-        if *given {
-            return Err(format!("{flag} given twice"));
-        }
         let value = match inline {
             Some(value) => value.to_owned(),
             None => {
@@ -40,8 +32,7 @@ impl AutomationArgs {
         if value.is_empty() {
             return Err(format!("{flag} needs a non-empty folder"));
         }
-        *root = Some(value.into());
-        *given = true;
+        roots.push(value.into());
         Ok(true)
     }
 }
@@ -51,40 +42,43 @@ mod tests {
     use super::*;
 
     #[test]
-    fn roots_are_taken_once_and_other_arguments_are_left() {
-        let mut roots = AutomationArgs::new(None, None);
+    fn roots_add_up_and_other_arguments_are_left() {
+        let mut roots = AutomationArgs::default();
         let mut args = ["a folder".to_owned(), "doc.designcraft".to_owned()].into_iter();
         assert!(roots.consume("--automation-read-root", &mut args).unwrap());
         assert!(roots.consume("--automation-write-root=out", &mut args).unwrap());
         assert!(!roots.consume("--sample", &mut args).unwrap());
-        assert_eq!(roots.read_root, Some("a folder".into()));
-        assert_eq!(roots.write_root, Some("out".into()));
+        assert_eq!(roots.read_roots, [PathBuf::from("a folder")]);
+        assert_eq!(roots.write_roots, [PathBuf::from("out")]);
         assert_eq!(args.next().as_deref(), Some("doc.designcraft"));
-        assert!(roots.consume("--automation-read-root=other", &mut args).is_err());
-        assert_eq!(roots.read_root, Some("a folder".into()));
+        // #1552: a flag given again adds a folder, in either spelling, and keeps the first.
+        assert!(roots.consume("--automation-read-root=other", &mut args).unwrap());
+        assert!(roots.consume("--automation-write-root", &mut ["out2".to_owned()].into_iter()).unwrap());
+        assert_eq!(roots.read_roots, [PathBuf::from("a folder"), PathBuf::from("other")]);
+        assert_eq!(roots.write_roots, [PathBuf::from("out"), PathBuf::from("out2")]);
     }
 
     #[test]
     fn invalid_operands_leave_roots_unchanged() {
         for flag in ["--automation-read-root", "--automation-write-root"] {
             for operand in [None, Some(""), Some("--version"), Some("--connect"), Some("-folder")] {
-                let mut roots = AutomationArgs::new(Some("read".into()), Some("write".into()));
+                let mut roots = AutomationArgs { read_roots: vec!["read".into()], write_roots: vec!["write".into()] };
                 let mut args = operand.map(str::to_owned).into_iter();
                 assert!(roots.consume(flag, &mut args).is_err(), "{flag} {operand:?}");
-                assert_eq!(roots.read_root, Some("read".into()));
-                assert_eq!(roots.write_root, Some("write".into()));
+                assert_eq!(roots.read_roots, [PathBuf::from("read")]);
+                assert_eq!(roots.write_roots, [PathBuf::from("write")]);
             }
-            let mut roots = AutomationArgs::new(None, None);
+            let mut roots = AutomationArgs::default();
             assert!(roots.consume(&format!("{flag}="), &mut std::iter::empty()).is_err());
         }
     }
 
     #[test]
     fn explicit_dash_folder_and_relative_dash_folder_are_valid() {
-        let mut roots = AutomationArgs::new(None, None);
+        let mut roots = AutomationArgs::default();
         assert!(roots.consume("--automation-read-root=-folder", &mut std::iter::empty()).unwrap());
         assert!(roots.consume("--automation-write-root", &mut ["./-folder".to_owned()].into_iter()).unwrap());
-        assert_eq!(roots.read_root, Some("-folder".into()));
-        assert_eq!(roots.write_root, Some("./-folder".into()));
+        assert_eq!(roots.read_roots, [PathBuf::from("-folder")]);
+        assert_eq!(roots.write_roots, [PathBuf::from("./-folder")]);
     }
 }
diff --git a/apps/designcraft-cli/src/lib.rs b/apps/designcraft-cli/src/lib.rs
new file mode 100644
index 000000000..f63ceb415
--- /dev/null
+++ b/apps/designcraft-cli/src/lib.rs
@@ -0,0 +1,5 @@
+//! Headless DesignCraft's shared parts: the synthetic stress document of `designcraft-cli perf`,
+//! which the PDF export benchmark (`examples/pdf_export.rs`) exports too.
+#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
+
+pub mod stress;
diff --git a/apps/designcraft-cli/src/main.rs b/apps/designcraft-cli/src/main.rs
index faa4f4af0..9ce15674c 100644
--- a/apps/designcraft-cli/src/main.rs
+++ b/apps/designcraft-cli/src/main.rs
@@ -10,11 +10,12 @@
 //!                                      # run a command script (crates/engine/src/script.rs): `$N.path` references
 //! designcraft-cli app [--port PORT] COMMAND [JSON]   # run a command in the running app (designcraft --control PORT)
 //! designcraft-cli app [--port PORT] --method METHOD [JSON]   # any control-channel method (ui.screenshot, ui.render, …)
-//! designcraft-cli mcp [--connect PORT] [--sample] [--automation-read-root DIR] [--automation-write-root DIR]
+//! designcraft-cli mcp [--connect PORT] [--sample] [--automation-read-root DIR]... [--automation-write-root DIR]...
 //!                                      # MCP server over stdio (docs/mcp.md); the roots confine the files it reads and writes
 //! designcraft-cli perf [--pages N] [--frames N] [--chars N] [--images N] [--runs N] [--strict]  # budgets on a synthetic stress document
 //! designcraft-cli bench FILE [--runs N]  # the same measurements on one document
-//! designcraft-cli validate-pdf FILE.pdf    # run the built-in PDF/X-4 conformance checks
+//! designcraft-cli validate-pdf FILE.pdf [--standard x4|x1a]   # the built-in PDF/X-4 or PDF/X-1a checks (default: the
+//!                                      # file's own GTS_PDFXVersion)
 //! designcraft-cli links                   # Discord, website, app page and GitHub links
 //! designcraft-cli --version               # print the version
 //! ```
@@ -39,7 +40,7 @@ use designcraft_engine::Session;
 use serde_json::{Value, json};
 
 /// The usage block. Shared by `--help` (stdout, success) and an unknown command (stderr, failure).
-const USAGE: &str = "usage: designcraft-cli run [--in FILE | --sample] [--cmd ID[=JSON]]... [--page N] [--scale S] [--pdf-options JSON] [--export OUT] [--all-pages DIR]\n         (--page, --scale and --pdf-options apply to the exports that follow them)\n       designcraft-cli commands [FILTER]\n       designcraft-cli describe COMMAND\n       designcraft-cli script [FILE|-] [--in FILE | --sample] [--connect PORT] [--save OUT] [--export OUT] [--keep-going]\n       designcraft-cli app [--port PORT] COMMAND [JSON] | --method METHOD [JSON]\n       designcraft-cli mcp [--connect PORT] [--sample] [--automation-read-root DIR] [--automation-write-root DIR]\n         the two roots confine every file the agent's commands read (open, placed images, data sources, libraries) and\n         write (save, export, package) to those folders, links followed. A root left out grants none of its access.\n         They run the in-process server, so they conflict with --connect (a running app is not confined by them).\n       designcraft-cli perf [--pages N] [--runs N] [--strict]\n       designcraft-cli bench FILE [--runs N]\n       designcraft-cli validate-pdf FILE.pdf  # built-in PDF/X-4 checks (including visible unembedded fonts)\n       designcraft-cli links\n       designcraft-cli --version";
+const USAGE: &str = "usage: designcraft-cli run [--in FILE | --sample] [--cmd ID[=JSON]]... [--page N] [--scale S] [--pdf-options JSON] [--export OUT] [--all-pages DIR]\n         (--page, --scale and --pdf-options apply to the exports that follow them)\n       designcraft-cli commands [FILTER]\n       designcraft-cli describe COMMAND\n       designcraft-cli script [FILE|-] [--in FILE | --sample] [--connect PORT] [--save OUT] [--export OUT] [--keep-going]\n       designcraft-cli app [--port PORT] COMMAND [JSON] | --method METHOD [JSON]\n       designcraft-cli mcp [--connect PORT] [--sample] [--automation-read-root DIR]... [--automation-write-root DIR]...\n         the roots confine every file the agent's commands read (open, placed images, data sources, libraries) and\n         write (save, export, package) to those folders, links followed. Each may be given more than once; a kind\n         left out grants none of its access.\n         They run the in-process server, so they conflict with --connect (a running app is not confined by them).\n       designcraft-cli perf [--pages N] [--runs N] [--strict]\n       designcraft-cli bench FILE [--runs N]\n       designcraft-cli validate-pdf FILE.pdf  # built-in PDF/X-4 checks (including visible unembedded fonts)\n       designcraft-cli links\n       designcraft-cli --version";
 
 /// `script --help`: the script syntax, otherwise only in `describe script.run` and docs/agents.md.
 const SCRIPT_HELP: &str = r#"usage: designcraft-cli script [FILE|-] [--in FILE | --sample] [--connect PORT] [--save OUT] [--export OUT] [--keep-going]
@@ -122,7 +123,7 @@ fn main() -> ExitCode {
         Some("mcp") => report(mcp(&args[1..])),
         Some("perf") => report(perf::perf(&args[1..])),
         Some("bench") => report(perf::bench(&args[1..])),
-        Some("validate-pdf") => report(validate_pdf(args.get(1).map(String::as_str))),
+        Some("validate-pdf") => report(validate_pdf(args.get(1..).unwrap_or_default())),
         Some("links") => {
             use designcraft_engine::links::{APP_PAGE, DISCORD, GITHUB, ISSUES, WEBSITE};
             outln!("Discord   {DISCORD}\nWebsite   {WEBSITE}\nApp page  {APP_PAGE}\nGitHub    {GITHUB}\nIssues    {ISSUES}");
@@ -153,14 +154,38 @@ fn report(r: Result<(), String>) -> ExitCode {
     }
 }
 
-fn validate_pdf(path: Option<&str>) -> Result<(), String> {
-    let path = path.ok_or("usage: designcraft-cli validate-pdf FILE.pdf")?;
+fn validate_pdf(args: &[String]) -> Result<(), String> {
+    const USAGE: &str = "usage: designcraft-cli validate-pdf FILE.pdf [--standard x4|x1a]";
+    const X1A: &[u8] = b"/GTS_PDFXVersion(PDF/X-1:";
+    let mut path = None;
+    let mut standard = None;
+    let mut it = args.iter();
+    while let Some(a) = it.next() {
+        match a.as_str() {
+            "--standard" => standard = Some(it.next().ok_or(USAGE)?.as_str()),
+            p if path.is_none() => path = Some(p),
+            _ => return Err(USAGE.into()),
+        }
+    }
+    let path = path.ok_or(USAGE)?;
     let bytes = std::fs::read(path).map_err(|e| format!("{path}: {e}"))?;
-    let issues = designcraft_pdf::check_pdfx4(&bytes);
+    let standard = match standard.map(designcraft_pdf::Standard::parse) {
+        Some(Some(s)) => s,
+        Some(None) => return Err(USAGE.into()),
+        None if bytes.windows(X1A.len()).any(|w| w == X1A) => designcraft_pdf::Standard::PdfX1a,
+        None => designcraft_pdf::Standard::PdfX4,
+    };
+    let (name, issues) = match standard {
+        designcraft_pdf::Standard::PdfX1a => ("PDF/X-1a:2003", designcraft_pdf::check_pdfx1a(&bytes)),
+        designcraft_pdf::Standard::PdfX4 => ("PDF/X-4", designcraft_pdf::check_pdfx4(&bytes)),
+        _ => return Err(USAGE.into()),
+    };
+    let (warnings, issues): (Vec<String>, Vec<String>) = issues.into_iter().partition(|i| i.starts_with("warning: "));
+    let warnings: Vec<&str> = warnings.iter().map(|w| w.trim_start_matches("warning: ")).collect();
     let valid = issues.is_empty();
-    let report = json!({"path": path, "standard": "PDF/X-4", "valid": valid, "issues": issues});
+    let report = json!({"path": path, "standard": name, "valid": valid, "issues": issues, "warnings": warnings});
     outln!("{}", serde_json::to_string_pretty(&report).map_err(|e| e.to_string())?);
-    if valid { Ok(()) } else { Err(format!("{path} failed PDF/X-4 validation")) }
+    if valid { Ok(()) } else { Err(format!("{path} failed {name} validation")) }
 }
 
 /// `mcp` (headless, in-process engine) or `mcp --connect PORT|HOST:PORT` (drive a running app
@@ -170,7 +195,7 @@ fn mcp(args: &[String]) -> Result<(), String> {
     use designcraft_mcp::{Backend, Headless, Remote, Server, control_addr};
     let mut connect: Option<String> = None;
     let mut sample = false;
-    let mut roots_args = automation_args::AutomationArgs::new(None, None);
+    let mut roots_args = automation_args::AutomationArgs::default();
     let mut it = args.iter().cloned();
     while let Some(a) = it.next() {
         if roots_args.consume(&a, &mut it)? {
@@ -181,12 +206,14 @@ fn mcp(args: &[String]) -> Result<(), String> {
             "--sample" => sample = true,
             other => {
                 return Err(format!(
-                    "unknown mcp option `{other}` (usage: designcraft-cli mcp [--connect PORT] [--sample] [--automation-read-root DIR] [--automation-write-root DIR])"
+                    "unknown mcp option `{other}` (usage: designcraft-cli mcp [--connect PORT] [--sample] [--automation-read-root DIR]... [--automation-write-root DIR]...)"
                 ));
             }
         }
     }
-    let roots = AutomationRoots::new(roots_args.read_root.as_deref(), roots_args.write_root.as_deref())?;
+    let read: Vec<&std::path::Path> = roots_args.read_roots.iter().map(std::path::PathBuf::as_path).collect();
+    let write: Vec<&std::path::Path> = roots_args.write_roots.iter().map(std::path::PathBuf::as_path).collect();
+    let roots = AutomationRoots::new(&read, &write)?;
     if roots.is_some() && connect.is_some() {
         return Err("--automation-read-root and --automation-write-root confine the in-process server; a running app is not confined by them, \
 so drop --connect (or use --connect without the roots)"
@@ -209,8 +236,7 @@ so drop --connect (or use --connect without the roots)"
             if let Some(roots) = roots {
                 // Every thread of this process, not only the server's: nothing reaches past the roots.
                 file_access::confine_process(roots.clone());
-                let show = |root: Option<&std::path::Path>| root.map_or_else(|| "none".to_string(), |r| r.display().to_string());
-                eprintln!("designcraft-cli: files confined: read root {}, write root {}", show(roots.read_root()), show(roots.write_root()));
+                eprintln!("designcraft-cli: files confined: {}", roots.describe());
                 h = h.with_automation_roots(Some(roots));
             }
             Box::new(h)
diff --git a/apps/designcraft-cli/src/perf.rs b/apps/designcraft-cli/src/perf.rs
index 0c665f7e7..3a3afe931 100644
--- a/apps/designcraft-cli/src/perf.rs
+++ b/apps/designcraft-cli/src/perf.rs
@@ -10,255 +10,18 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::Instant;
 
-use designcraft_color::{Color, Gradient, GradientKind, GradientStop, Swatch, SwatchValue};
 use designcraft_compose::Cache;
-use designcraft_doc::build::NewDocument;
-use designcraft_doc::{Asset, AssetId, Content, Document, Fill, Graphic, Item, ItemId, ParaFormat, Shape, SpreadRef, StoryId};
-use designcraft_geom::{Affine, Rect, Vec2, shapes};
+use designcraft_doc::{Document, SpreadRef, StoryId};
+use designcraft_geom::{Affine, Rect, Vec2};
 use designcraft_render::{Placed, RenderOptions, Renderer};
 
+use designcraft_cli::stress::{Spec, synthetic};
+
 /// Device pixels per point at 100% (HiDPI canvas).
 const HIDPI: f64 = 2.0;
 const W: u32 = 2880;
 const H: u32 = 1800;
 
-/// Deterministic xorshift in 0..1.
-struct Rng(u64);
-impl Rng {
-    fn next(&mut self) -> f64 {
-        self.0 ^= self.0 << 13;
-        self.0 ^= self.0 >> 7;
-        self.0 ^= self.0 << 17;
-        (self.0 % 1_000_000) as f64 / 1_000_000.0
-    }
-    fn pick<'a>(&mut self, v: &[&'a str]) -> &'a str {
-        v[((self.next() * v.len() as f64) as usize).min(v.len() - 1)]
-    }
-}
-
-const WORDS: &[&str] = &[
-    "the",
-    "grid",
-    "page",
-    "margin",
-    "column",
-    "rhythm",
-    "baseline",
-    "reader",
-    "story",
-    "frame",
-    "quiet",
-    "layout",
-    "type",
-    "paragraph",
-    "composer",
-    "weighs",
-    "every",
-    "line",
-    "break",
-    "texture",
-    "even",
-    "hyphen",
-    "image",
-    "spread",
-    "pulse",
-    "caption",
-    "colour",
-    "swatch",
-    "ink",
-    "tint",
-    "gradient",
-    "style",
-    "voice",
-    "printer",
-    "proof",
-    "bleed",
-    "a",
-    "of",
-    "and",
-    "to",
-    "in",
-    "with",
-    "for",
-    "is",
-    "on",
-    "that",
-    "by",
-    "it",
-    "as",
-    "careful",
-    "measure",
-    "leading",
-    "kerning",
-    "tracking",
-    "glyph",
-    "serif",
-    "italic",
-    "heading",
-    "running",
-    "folio",
-];
-
-/// `chars` characters of original filler text in paragraphs of ~400 characters.
-fn filler(r: &mut Rng, chars: usize) -> String {
-    let mut s = String::with_capacity(chars + 16);
-    let mut para = 0;
-    while s.len() < chars {
-        let w = r.pick(WORDS);
-        if para == 0 {
-            let mut c = w.chars();
-            if let Some(f) = c.next() {
-                s.extend(f.to_uppercase());
-                s.push_str(c.as_str());
-            }
-        } else {
-            s.push_str(w);
-        }
-        para += w.len() + 1;
-        if para > 400 {
-            s.push_str(".\n");
-            para = 0;
-        } else {
-            s.push(' ');
-        }
-    }
-    s
-}
-
-/// Procedural RGB image, PNG-encoded.
-fn art_png(w: u32, h: u32, seed: f32) -> Vec<u8> {
-    let mut px = Vec::with_capacity((w * h * 4) as usize);
-    for y in 0..h {
-        for x in 0..w {
-            let (fx, fy) = (x as f32 / w as f32, y as f32 / h as f32);
-            let v = ((fx * 9.0 + seed).sin() * (fy * 7.0 - seed).cos() * 0.5 + 0.5).clamp(0.0, 1.0);
-            px.extend([(v * 255.0) as u8, ((1.0 - fy) * 200.0) as u8, ((fx * 0.6 + seed * 0.1).fract() * 255.0) as u8, 255]);
-        }
-    }
-    designcraft_render::Rendered { width: w, height: h, pixels: px }.to_png()
-}
-
-/// Parameters of the synthetic stress document.
-pub struct Spec {
-    pub pages: usize,
-    pub frames_per_page: usize,
-    pub frames_per_story: usize,
-    pub chars: usize,
-    pub images: usize,
-    pub assets: usize,
-}
-
-impl Default for Spec {
-    fn default() -> Self {
-        Spec { pages: 200, frames_per_page: 10, frames_per_story: 50, chars: 1_000_000, images: 500, assets: 25 }
-    }
-}
-
-/// A `spec.pages`-page facing document: per page a gradient band, a 2×N grid of threaded text
-/// frames, and a strip of placed images (one with a drop shadow per spread).
-pub fn synthetic(spec: &Spec) -> Result<Document, String> {
-    let mut d = Document::new(&NewDocument { pages: spec.pages, ..Default::default() });
-    let lid = d.default_layer();
-    d.swatches.push(Swatch {
-        name: "Perf Gradient".into(),
-        value: SwatchValue::Gradient {
-            gradient: Gradient {
-                kind: GradientKind::Linear,
-                stops: vec![
-                    GradientStop { offset: 0.0, color: Color::cmyk(0.6, 0.9, 0.3, 0.2), opacity: 1.0, midpoint: 0.5 },
-                    GradientStop { offset: 1.0, color: Color::cmyk(0.0, 0.6, 0.8, 0.0), opacity: 1.0, midpoint: 0.5 },
-                ],
-            },
-        },
-        locked: false,
-        named: true,
-        hidden: false,
-    });
-    let mut rng = Rng(0x5eed);
-    let (aw, ah) = (800u32, 600u32);
-    let assets: Vec<AssetId> = (0..spec.assets.max(1))
-        .map(|k| {
-            let id = AssetId(d.alloc());
-            let data = art_png(aw, ah, k as f32 * 0.37);
-            d.assets.insert(
-                id,
-                Arc::new(Asset {
-                    id,
-                    name: format!("art-{k}.png"),
-                    mime: "image/png".into(),
-                    data: Arc::new(data),
-                    pixels: Some((aw, ah)),
-                    ..Default::default()
-                }),
-            );
-            id
-        })
-        .collect();
-    let total_frames = spec.pages * spec.frames_per_page;
-    let stories = total_frames.div_ceil(spec.frames_per_story.max(1));
-    let per_story = spec.chars / stories.max(1);
-    let rows = spec.frames_per_page.div_ceil(2);
-    let (top, strip) = (48.0, 130.0);
-    let row_h = (792.0 - 36.0 - top - strip - 8.0) / rows as f64;
-    let mut prev: Option<ItemId> = None;
-    let mut n_frame = 0usize;
-    let mut placed_images = 0usize;
-    for abs in 0..spec.pages {
-        let Some((si, pi)) = d.page_loc(abs) else { break };
-        let sr = SpreadRef::Doc(si);
-        let x0 = d.spreads[si].pages[pi].x;
-        // Gradient band.
-        let id = ItemId(d.alloc());
-        let mut band = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(Rect::new(x0 + 36.0, 20.0, x0 + 576.0, 40.0)));
-        band.fill = Fill { swatch: "Perf Gradient".into(), ..Fill::none() };
-        band.fill.gradient_angle = Some(rng.next() * 90.0);
-        d.insert_item(sr, band, None).map_err(|e| e.to_string())?;
-        // Text frames.
-        for k in 0..spec.frames_per_page {
-            let (c, r) = (k % 2, k / 2);
-            let fx = x0 + 36.0 + c as f64 * 280.0;
-            let fy = top + r as f64 * row_h;
-            let rect = Rect::new(fx, fy, fx + 260.0, fy + row_h - 6.0);
-            let first = n_frame.is_multiple_of(spec.frames_per_story.max(1));
-            let text = if first { filler(&mut rng, per_story) } else { String::new() };
-            let (fid, _) = d.add_text_frame(sr, rect, lid, &text, ParaFormat::default()).map_err(|e| e.to_string())?;
-            if let (false, Some(p)) = (first, prev) {
-                d.thread(p, fid).map_err(|e| e.to_string())?;
-            }
-            prev = Some(fid);
-            n_frame += 1;
-        }
-        // Images: spread the requested count evenly over the pages.
-        let want = (spec.images * (abs + 1)) / spec.pages - placed_images;
-        for k in 0..want {
-            let w = 540.0 / want as f64;
-            let r = Rect::new(x0 + 36.0 + k as f64 * w, 792.0 - 36.0 - strip, x0 + 36.0 + (k + 1) as f64 * w - 8.0, 792.0 - 36.0);
-            let asset = assets[(placed_images + k) % assets.len()];
-            let id = ItemId(d.alloc());
-            let mut it = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(r));
-            let (nw, nh) = (aw as f64, ah as f64);
-            let s = (r.width() / nw).max(r.height() / nh);
-            it.content = Content::Graphic(Graphic {
-                asset,
-                size: (nw, nh),
-                xf: Affine::translate((r.x0 + (r.width() - nw * s) / 2.0, r.y0 + (r.height() - nh * s) / 2.0)) * Affine::scale(s),
-                clip: None,
-                auto_fit: designcraft_doc::Fitting::FillProportionally,
-                fit_align: 4,
-                crop: [0.0; 4],
-                wrap: Default::default(),
-                fill: Default::default(),
-            });
-            if k == 0 && pi == 0 {
-                it.effects.drop_shadow.on = true;
-            }
-            d.insert_item(sr, it, None).map_err(|e| e.to_string())?;
-        }
-        placed_images += want;
-    }
-    Ok(d)
-}
-
 fn median_ms(runs: usize, mut f: impl FnMut()) -> f64 {
     let mut v: Vec<f64> = (0..runs.max(1))
         .map(|_| {
@@ -372,11 +135,11 @@ fn measure(doc: &Document, runs: usize) -> Result<Vec<Row>, String> {
             let _ = std::fs::write(format!("{d}/{name}.png"), img.to_png());
         }
     };
-    save("fit", r.render(doc, &cache, &all, W, H, fit.1, &greek(fit.0)));
+    save("fit", r.render(doc, &cache, &all, (W, H), fit.1, &greek(fit.0)));
     row(
         &mut rows,
         format!("render spread, fit ({:.0}%), {W}×{H}", fit.0 / HIDPI * 100.0),
-        median_ms(runs, || drop(r.render(doc, &cache, &all, W, H, fit.1, &greek(fit.0)))),
+        median_ms(runs, || drop(r.render(doc, &cache, &all, (W, H), fit.1, &greek(fit.0)))),
         Some(16.0),
     );
     for zoom in [0.25, 1.0, 4.0] {
@@ -384,12 +147,12 @@ fn measure(doc: &Document, runs: usize) -> Result<Vec<Row>, String> {
         // At 100% look at the text block of the left page.
         let c = if zoom >= 1.0 { centre - Vec2::new(placed[mid].1.width() / 4.0, 100.0) } else { centre };
         let v = view_at(c, s);
-        save(&format!("zoom-{:.0}", zoom * 100.0), r.render(doc, &cache, &all, W, H, v, &greek(s)));
+        save(&format!("zoom-{:.0}", zoom * 100.0), r.render(doc, &cache, &all, (W, H), v, &greek(s)));
         let budget = if zoom == 1.0 { Some(16.0) } else { None };
         row(
             &mut rows,
             format!("render at {:.0}%, {W}×{H}", zoom * 100.0),
-            median_ms(runs, || drop(r.render(doc, &cache, &all, W, H, v, &greek(s)))),
+            median_ms(runs, || drop(r.render(doc, &cache, &all, (W, H), v, &greek(s)))),
             budget,
         );
     }
@@ -398,13 +161,13 @@ fn measure(doc: &Document, runs: usize) -> Result<Vec<Row>, String> {
     let pan = median_ms(runs, || {
         dy += 37.0;
         let v = view_at(centre + Vec2::new(-200.0, dy - 300.0), HIDPI);
-        drop(r.render(doc, &cache, &all, W, H, v, &greek(HIDPI)));
+        drop(r.render(doc, &cache, &all, (W, H), v, &greek(HIDPI)));
     });
     row(&mut rows, "render at 100% while panning", pan, Some(16.0));
     // Cold renderer (no glyph-path / image caches): first frame after open.
     let cold = median_ms(runs.min(3), || {
         let mut r = Renderer::new();
-        drop(r.render(doc, &cache, &all, W, H, view_at(centre, HIDPI), &greek(HIDPI)));
+        drop(r.render(doc, &cache, &all, (W, H), view_at(centre, HIDPI), &greek(HIDPI)));
     });
     row(&mut rows, "render at 100%, cold renderer", cold, None);
 
@@ -425,7 +188,7 @@ fn measure(doc: &Document, runs: usize) -> Result<Vec<Row>, String> {
                 st.rev += 1;
                 k += 1;
             }
-            drop(r.render(&d, &cache, &all, W, H, v, &greek(HIDPI)));
+            drop(r.render(&d, &cache, &all, (W, H), v, &greek(HIDPI)));
         });
         row(&mut rows, "keystroke: recompose story + full repaint at 100%", ms, None);
         // What the canvas does: repaint only the damaged region (designcraft_render::damage).
@@ -454,7 +217,7 @@ fn measure(doc: &Document, runs: usize) -> Result<Vec<Row>, String> {
             if let Some(p) = px {
                 let (x0, y0) = (p.x0.floor(), p.y0.floor());
                 let (w, h) = ((p.x1.ceil() - x0) as u32, (p.y1.ceil() - y0) as u32);
-                drop(r.render(&d, &cache, &all, w.max(1), h.max(1), Affine::translate((-x0, -y0)) * v, &greek(HIDPI)));
+                drop(r.render(&d, &cache, &all, (w.max(1), h.max(1)), Affine::translate((-x0, -y0)) * v, &greek(HIDPI)));
             }
         });
         row(&mut rows, "keystroke: recompose story + damage repaint at 100%", ms, Some(8.0));
diff --git a/apps/designcraft-cli/src/stress.rs b/apps/designcraft-cli/src/stress.rs
new file mode 100644
index 000000000..c9d5b3015
--- /dev/null
+++ b/apps/designcraft-cli/src/stress.rs
@@ -0,0 +1,244 @@
+//! The synthetic stress document `designcraft-cli perf` measures, also used by the PDF export
+//! benchmark (`examples/pdf_export.rs`).
+
+use std::sync::Arc;
+
+use designcraft_color::{Color, Gradient, GradientKind, GradientStop, Swatch, SwatchValue};
+use designcraft_doc::build::NewDocument;
+use designcraft_doc::{Asset, AssetId, Content, Document, Fill, Graphic, Item, ItemId, ParaFormat, Shape, SpreadRef};
+use designcraft_geom::{Affine, Rect, shapes};
+
+/// Deterministic xorshift in 0..1.
+struct Rng(u64);
+impl Rng {
+    fn next(&mut self) -> f64 {
+        self.0 ^= self.0 << 13;
+        self.0 ^= self.0 >> 7;
+        self.0 ^= self.0 << 17;
+        (self.0 % 1_000_000) as f64 / 1_000_000.0
+    }
+    fn pick<'a>(&mut self, v: &[&'a str]) -> &'a str {
+        v[((self.next() * v.len() as f64) as usize).min(v.len() - 1)]
+    }
+}
+
+const WORDS: &[&str] = &[
+    "the",
+    "grid",
+    "page",
+    "margin",
+    "column",
+    "rhythm",
+    "baseline",
+    "reader",
+    "story",
+    "frame",
+    "quiet",
+    "layout",
+    "type",
+    "paragraph",
+    "composer",
+    "weighs",
+    "every",
+    "line",
+    "break",
+    "texture",
+    "even",
+    "hyphen",
+    "image",
+    "spread",
+    "pulse",
+    "caption",
+    "colour",
+    "swatch",
+    "ink",
+    "tint",
+    "gradient",
+    "style",
+    "voice",
+    "printer",
+    "proof",
+    "bleed",
+    "a",
+    "of",
+    "and",
+    "to",
+    "in",
+    "with",
+    "for",
+    "is",
+    "on",
+    "that",
+    "by",
+    "it",
+    "as",
+    "careful",
+    "measure",
+    "leading",
+    "kerning",
+    "tracking",
+    "glyph",
+    "serif",
+    "italic",
+    "heading",
+    "running",
+    "folio",
+];
+
+/// `chars` characters of original filler text in paragraphs of ~400 characters.
+fn filler(r: &mut Rng, chars: usize) -> String {
+    let mut s = String::with_capacity(chars + 16);
+    let mut para = 0;
+    while s.len() < chars {
+        let w = r.pick(WORDS);
+        if para == 0 {
+            let mut c = w.chars();
+            if let Some(f) = c.next() {
+                s.extend(f.to_uppercase());
+                s.push_str(c.as_str());
+            }
+        } else {
+            s.push_str(w);
+        }
+        para += w.len() + 1;
+        if para > 400 {
+            s.push_str(".\n");
+            para = 0;
+        } else {
+            s.push(' ');
+        }
+    }
+    s
+}
+
+/// Procedural RGB image, PNG-encoded.
+fn art_png(w: u32, h: u32, seed: f32) -> Vec<u8> {
+    let mut px = Vec::with_capacity((w * h * 4) as usize);
+    for y in 0..h {
+        for x in 0..w {
+            let (fx, fy) = (x as f32 / w as f32, y as f32 / h as f32);
+            let v = ((fx * 9.0 + seed).sin() * (fy * 7.0 - seed).cos() * 0.5 + 0.5).clamp(0.0, 1.0);
+            px.extend([(v * 255.0) as u8, ((1.0 - fy) * 200.0) as u8, ((fx * 0.6 + seed * 0.1).fract() * 255.0) as u8, 255]);
+        }
+    }
+    designcraft_render::Rendered { width: w, height: h, pixels: px }.to_png()
+}
+
+/// Parameters of the synthetic stress document.
+pub struct Spec {
+    pub pages: usize,
+    pub frames_per_page: usize,
+    pub frames_per_story: usize,
+    pub chars: usize,
+    pub images: usize,
+    pub assets: usize,
+}
+
+impl Default for Spec {
+    fn default() -> Self {
+        Spec { pages: 200, frames_per_page: 10, frames_per_story: 50, chars: 1_000_000, images: 500, assets: 25 }
+    }
+}
+
+/// A `spec.pages`-page facing document: per page a gradient band, a 2×N grid of threaded text
+/// frames, and a strip of placed images (one with a drop shadow per spread).
+pub fn synthetic(spec: &Spec) -> Result<Document, String> {
+    let mut d = Document::new(&NewDocument { pages: spec.pages, ..Default::default() });
+    let lid = d.default_layer();
+    d.swatches.push(Swatch {
+        name: "Perf Gradient".into(),
+        value: SwatchValue::Gradient {
+            gradient: Gradient {
+                kind: GradientKind::Linear,
+                stops: vec![GradientStop::new(0.0, Color::cmyk(0.6, 0.9, 0.3, 0.2)), GradientStop::new(1.0, Color::cmyk(0.0, 0.6, 0.8, 0.0))],
+            },
+        },
+        locked: false,
+        named: true,
+        hidden: false,
+    });
+    let mut rng = Rng(0x5eed);
+    let (aw, ah) = (800u32, 600u32);
+    let assets: Vec<AssetId> = (0..spec.assets.max(1))
+        .map(|k| {
+            let id = AssetId(d.alloc());
+            let data = art_png(aw, ah, k as f32 * 0.37);
+            d.assets.insert(
+                id,
+                Arc::new(Asset {
+                    id,
+                    name: format!("art-{k}.png"),
+                    mime: "image/png".into(),
+                    data: Arc::new(data),
+                    pixels: Some((aw, ah)),
+                    ..Default::default()
+                }),
+            );
+            id
+        })
+        .collect();
+    let total_frames = spec.pages * spec.frames_per_page;
+    let stories = total_frames.div_ceil(spec.frames_per_story.max(1));
+    let per_story = spec.chars / stories.max(1);
+    let rows = spec.frames_per_page.div_ceil(2);
+    let (top, strip) = (48.0, 130.0);
+    let row_h = (792.0 - 36.0 - top - strip - 8.0) / rows as f64;
+    let mut prev: Option<ItemId> = None;
+    let mut n_frame = 0usize;
+    let mut placed_images = 0usize;
+    for abs in 0..spec.pages {
+        let Some((si, pi)) = d.page_loc(abs) else { break };
+        let sr = SpreadRef::Doc(si);
+        let x0 = d.spreads[si].pages[pi].x;
+        // Gradient band.
+        let id = ItemId(d.alloc());
+        let mut band = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(Rect::new(x0 + 36.0, 20.0, x0 + 576.0, 40.0)));
+        band.fill = Fill { swatch: "Perf Gradient".into(), ..Fill::none() };
+        band.fill.gradient_angle = Some(rng.next() * 90.0);
+        d.insert_item(sr, band, None).map_err(|e| e.to_string())?;
+        // Text frames.
+        for k in 0..spec.frames_per_page {
+            let (c, r) = (k % 2, k / 2);
+            let fx = x0 + 36.0 + c as f64 * 280.0;
+            let fy = top + r as f64 * row_h;
+            let rect = Rect::new(fx, fy, fx + 260.0, fy + row_h - 6.0);
+            let first = n_frame.is_multiple_of(spec.frames_per_story.max(1));
+            let text = if first { filler(&mut rng, per_story) } else { String::new() };
+            let (fid, _) = d.add_text_frame(sr, rect, lid, &text, ParaFormat::default()).map_err(|e| e.to_string())?;
+            if let (false, Some(p)) = (first, prev) {
+                d.thread(p, fid).map_err(|e| e.to_string())?;
+            }
+            prev = Some(fid);
+            n_frame += 1;
+        }
+        // Images: spread the requested count evenly over the pages.
+        let want = (spec.images * (abs + 1)) / spec.pages - placed_images;
+        for k in 0..want {
+            let w = 540.0 / want as f64;
+            let r = Rect::new(x0 + 36.0 + k as f64 * w, 792.0 - 36.0 - strip, x0 + 36.0 + (k + 1) as f64 * w - 8.0, 792.0 - 36.0);
+            let asset = assets[(placed_images + k) % assets.len()];
+            let id = ItemId(d.alloc());
+            let mut it = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(r));
+            let (nw, nh) = (aw as f64, ah as f64);
+            let s = (r.width() / nw).max(r.height() / nh);
+            it.content = Content::Graphic(Graphic {
+                layer_options: None,
+                asset,
+                size: (nw, nh),
+                xf: Affine::translate((r.x0 + (r.width() - nw * s) / 2.0, r.y0 + (r.height() - nh * s) / 2.0)) * Affine::scale(s),
+                clip: None,
+                auto_fit: designcraft_doc::Fitting::FillProportionally,
+                fit_align: 4,
+                crop: [0.0; 4],
+                wrap: Default::default(),
+                fill: Default::default(),
+            });
+            if k == 0 && pi == 0 {
+                it.effects.drop_shadow.on = true;
+            }
+            d.insert_item(sr, it, None).map_err(|e| e.to_string())?;
+        }
+        placed_images += want;
+    }
+    Ok(d)
+}
diff --git a/apps/designcraft-cli/tests/it/cli.rs b/apps/designcraft-cli/tests/it/cli.rs
index 173a605f4..861cb514f 100644
--- a/apps/designcraft-cli/tests/it/cli.rs
+++ b/apps/designcraft-cli/tests/it/cli.rs
@@ -347,6 +347,29 @@ fn make_document(path: &std::path::Path) {
     assert!(path.exists());
 }
 
+/// `path` without the `\\?\` or `\\?\UNC\` prefix that `canonicalize` adds on Windows, as the
+/// server shows a root (`file_access::plain`).
+fn without_verbatim_prefix(path: std::path::PathBuf) -> std::path::PathBuf {
+    let Some(text) = path.to_str() else {
+        return path;
+    };
+    if let Some(rest) = text.strip_prefix(r"\\?\UNC\") {
+        return std::path::PathBuf::from(format!(r"\\{rest}"));
+    }
+    match text.strip_prefix(r"\\?\") {
+        Some(rest) => std::path::PathBuf::from(rest),
+        None => path,
+    }
+}
+
+#[test]
+fn without_verbatim_prefix_keeps_a_share_a_share() {
+    let p = |t: &str| without_verbatim_prefix(std::path::PathBuf::from(t));
+    assert_eq!(p(r"\\?\UNC\server\share\dir"), std::path::PathBuf::from(r"\\server\share\dir"));
+    assert_eq!(p(r"\\?\C:\Users\dir"), std::path::PathBuf::from(r"C:\Users\dir"));
+    assert_eq!(p("/private/var/dir"), std::path::PathBuf::from("/private/var/dir"));
+}
+
 #[test]
 fn mcp_automation_roots_confine_the_server() {
     let base = std::env::temp_dir().join(format!("dc-cli-roots-{}", std::process::id()));
@@ -401,6 +424,99 @@ fn mcp_automation_roots_confine_the_server() {
     let _ = std::fs::remove_dir_all(base);
 }
 
+/// #1552: each root flag may be given more than once. A path inside any root of its kind passes;
+/// the roots' common parent, a sibling whose name starts like a root's, `..` out of a root, the
+/// other kind's roots and a link out of a root stay refused.
+#[test]
+fn mcp_automation_roots_take_several_folders() {
+    let base = std::env::temp_dir().join(format!("dc-cli-roots-several-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&base);
+    for d in ["in", "shared", "out", "scratch", "outside", "in2", "scratch2"] {
+        std::fs::create_dir_all(base.join(d)).unwrap();
+    }
+    // Resolved, as the server shows the roots (`/var` is `/private/var` on macOS), and without the
+    // `\\?\` prefix that `canonicalize` adds on Windows: the server shows the roots without it, and
+    // Windows does not resolve `..` in a path that has it.
+    let base = without_verbatim_prefix(std::fs::canonicalize(base).unwrap());
+    for f in ["in/a.designcraft", "shared/b.designcraft", "outside/secret.designcraft", "parent.designcraft", "in2/c.designcraft"] {
+        make_document(&base.join(f));
+    }
+    // Windows' canonical `\\?\` form is not a prefix under which `..` is a path component:
+    // traversal requests use the ordinary spelling, while the other requests keep the resolved one.
+    let plain = |path: &std::path::Path| -> String {
+        let text = path.to_string_lossy();
+        if !cfg!(windows) {
+            return text.into_owned();
+        }
+        if let Some(rest) = text.strip_prefix(r"\\?\UNC\") {
+            return format!(r"\\{rest}");
+        }
+        match text.strip_prefix(r"\\?\") {
+            Some(rest) => rest.to_owned(),
+            None => text.into_owned(),
+        }
+    };
+    let p = |f: &str| base.join(f).to_str().unwrap().to_string();
+    let sep = std::path::MAIN_SEPARATOR;
+    let up = |root: &str, rest: &str| format!("{}{sep}..{sep}{rest}", plain(&base.join(root)));
+    let calls = [
+        ("open_document", serde_json::json!({"path": p("in/a.designcraft")})),
+        ("open_document", serde_json::json!({"path": p("shared/b.designcraft")})),
+        // The roots' common parent is not a root.
+        ("open_document", serde_json::json!({"path": p("parent.designcraft")})),
+        ("open_document", serde_json::json!({"path": up("shared", &format!("outside{sep}secret.designcraft"))})),
+        // `in2` only starts like `in`.
+        ("open_document", serde_json::json!({"path": p("in2/c.designcraft")})),
+        // `..` from one read root into another stays inside.
+        ("open_document", serde_json::json!({"path": up("shared", &format!("in{sep}a.designcraft"))})),
+        ("save_document", serde_json::json!({"path": p("out/x.designcraft")})),
+        ("save_document", serde_json::json!({"path": p("scratch/y.designcraft")})),
+        ("save_document", serde_json::json!({"path": p("z.designcraft")})),
+        ("save_document", serde_json::json!({"path": p("scratch2/z.designcraft")})),
+        // Read and write stay separate: a read root is not a write root, nor the other way round.
+        ("save_document", serde_json::json!({"path": p("shared/w.designcraft")})),
+        ("open_document", serde_json::json!({"path": p("out/x.designcraft")})),
+        ("export_png", serde_json::json!({"path": up("scratch", &format!("outside{sep}p.png"))})),
+    ];
+    let read2 = format!("--automation-read-root={}", p("shared"));
+    let args = ["--automation-read-root", &p("in"), &read2, "--automation-write-root", &p("out"), "--automation-write-root", &p("scratch")];
+    let (success, stderr, replies) = mcp_session(&args, &calls);
+    assert!(success, "{stderr}");
+    let confined = format!(
+        "files confined: read {}, {}; write {}, {}",
+        plain(&base.join("in")),
+        plain(&base.join("shared")),
+        plain(&base.join("out")),
+        plain(&base.join("scratch"))
+    );
+    assert!(stderr.contains(&confined), "expected {confined:?} in {stderr:?}");
+    let errors: Vec<bool> = replies.iter().map(|r| r["result"]["isError"] == true).collect();
+    assert_eq!(errors, [false, false, true, true, true, false, false, false, true, true, true, true, true], "{replies:?}");
+    for (i, kind) in [(2, "read"), (3, "read"), (4, "read"), (8, "write"), (9, "write"), (10, "write"), (11, "read"), (12, "write")] {
+        assert!(text(&replies[i]).contains(&format!("outside the {kind} roots ")), "{i}: {}", text(&replies[i]));
+    }
+    assert!(base.join("out/x.designcraft").is_file() && base.join("scratch/y.designcraft").is_file());
+    for f in ["z.designcraft", "scratch2/z.designcraft", "shared/w.designcraft", "outside/p.png"] {
+        assert!(!base.join(f).exists(), "{f} was written outside the write roots");
+    }
+
+    // A link in one root that leads out of all of them is outside, for reading and for writing.
+    #[cfg(unix)]
+    {
+        std::os::unix::fs::symlink(base.join("outside/secret.designcraft"), base.join("shared/leak.designcraft")).unwrap();
+        std::os::unix::fs::symlink(base.join("outside"), base.join("scratch/away")).unwrap();
+        let calls = [
+            ("open_document", serde_json::json!({"path": p("shared/leak.designcraft")})),
+            ("save_document", serde_json::json!({"path": p("scratch/away/x.designcraft")})),
+        ];
+        let (_, _, replies) = mcp_session(&args, &calls);
+        assert!(text(&replies[0]).contains("outside the read roots"), "{}", text(&replies[0]));
+        assert!(text(&replies[1]).contains("outside the write roots"), "{}", text(&replies[1]));
+        assert!(!base.join("outside/x.designcraft").exists());
+    }
+    let _ = std::fs::remove_dir_all(base);
+}
+
 #[test]
 fn mcp_automation_root_flags_are_checked_up_front() {
     let base = std::env::temp_dir().join(format!("dc-cli-roots-args-{}", std::process::id()));
@@ -419,9 +535,11 @@ fn mcp_automation_root_flags_are_checked_up_front() {
     // The flags confine the in-process server, so they cannot be combined with --connect.
     fails(&["--connect", "7979", "--automation-read-root", dir], "--connect");
     fails(&["--automation-write-root", dir, "--connect", "7979"], "--connect");
-    fails(&["--automation-read-root", dir, "--automation-read-root", dir], "given twice");
-    fails(&["--automation-write-root", dir, "--automation-write-root", dir], "given twice");
-    fails(&["--automation-read-root", dir, "--automation-read-root=x"], "given twice");
+    // #1552: a flag may be given again, but every folder it names must exist and be given.
+    fails(&["--automation-read-root", dir, "--automation-read-root", missing.to_str().unwrap()], "cannot open the automation read root");
+    fails(&["--automation-write-root", missing.to_str().unwrap(), "--automation-write-root", dir], "cannot open the automation write root");
+    fails(&["--automation-write-root", dir, "--automation-write-root"], "needs a folder");
+    fails(&["--automation-read-root", dir, "--automation-read-root="], "needs a non-empty folder");
     fails(&["--automation-read-root"], "needs a folder");
     fails(&["--automation-write-root", "--sample"], "needs a folder");
     fails(&["--automation-read-root", missing.to_str().unwrap()], "cannot open the automation read root");
diff --git a/apps/designcraft-web/src/web.rs b/apps/designcraft-web/src/web.rs
index 27d236a2f..19bc3a122 100644
--- a/apps/designcraft-web/src/web.rs
+++ b/apps/designcraft-web/src/web.rs
@@ -350,9 +350,14 @@ struct WebShell {
 impl eframe::App for WebShell {
     fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         let graphics = self.graphics.clone();
-        let _ = graphics.run_if_healthy(|| {
-            let dropped = ctx.input_mut(|i| std::mem::take(&mut i.raw.dropped_files));
-            for f in dropped {
+        let _ = graphics.run_if_healthy(|| self.app.logic(ctx));
+    }
+
+    fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
+        let _ = self.graphics.run_if_healthy(|| {
+            // Dropped files belong to this host iteration's raw input, not to stale logic input:
+            // read them here once, before the batch is saved as pending for a hidden pass.
+            for f in std::mem::take(&mut raw.dropped_files) {
                 let request = self.app.import_request("drop");
                 let inbox = self.inbox.clone();
                 let ctx = ctx.clone();
@@ -367,14 +372,8 @@ impl eframe::App for WebShell {
                     }
                 });
             }
-            self.app.logic(ctx);
-        });
-    }
-
-    fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
-        let _ = self.graphics.run_if_healthy(|| {
             designcraft_ui_egui::drop_key_name_text(raw, ctx.text_edit_focused() || self.app.canvas_ime());
-            self.app.raw_input_hook(raw);
+            self.app.raw_input_hook(ctx, raw);
         });
     }
 
@@ -396,7 +395,7 @@ fn services(inbox: Inbox, ctx: egui::Context) -> Services {
             let dialog = if request.purpose == "swatches" {
                 rfd::AsyncFileDialog::new().add_filter("Swatch Exchange (ASE)", &["ase"])
             } else if request.purpose == "shortcuts" {
-                rfd::AsyncFileDialog::new().add_filter("Shortcut set (text)", &["txt"])
+                rfd::AsyncFileDialog::new().add_filter("Shortcut set (JSON, InDesign text)", &["json", "txt"])
             } else if request.purpose == "place" {
                 rfd::AsyncFileDialog::new().add_filter("Graphics", IMAGE_EXTS)
             } else {
@@ -411,8 +410,6 @@ fn services(inbox: Inbox, ctx: egui::Context) -> Services {
                 ctx.request_repaint();
             });
         })),
-        // Exports ask for a name; the browser decides where the download goes.
-        pick_save: Some(Box::new(|name: &str| Some(name.to_string()))),
         write: Some(Box::new(|name: &str, bytes: &[u8]| download(name, bytes))),
         download: Some(Box::new(|name: &str, bytes: &[u8]| download(name, bytes))),
         inbox: Some(inbox),
diff --git a/apps/designcraft/Cargo.toml b/apps/designcraft/Cargo.toml
index 7dc83bc55..d706374c7 100644
--- a/apps/designcraft/Cargo.toml
+++ b/apps/designcraft/Cargo.toml
@@ -13,7 +13,7 @@ workspace = true
 [dependencies]
 designcraft-engine = { workspace = true }
 designcraft-ui-egui = { workspace = true }
-eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "wayland", "x11", "links"] }
+eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "wayland", "x11", "links", "clipboard"] }
 egui = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
@@ -24,6 +24,8 @@ log = { workspace = true }
 winresource = "0.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+# Not called here: craft-dialogs shows the dialogs. rfd's default features keep its Wayland
+# support on, so portal dialogs get the window as their parent.
 rfd = { workspace = true }
 arboard = { workspace = true }
 
@@ -32,6 +34,7 @@ arboard = { workspace = true }
 winit = { version = "0.30", default-features = false, features = ["x11"] }
 
 [target.'cfg(windows)'.dependencies]
+craft-update = { workspace = true }
 # EnumDisplayDevices (src/gpu.rs): which GPU drives the display, so the window draws on the GPU
 # that shows it; drawing on a GPU without a monitor reset the display driver. Safe wrappers over
 # Win32 (MIT); the `user` feature is User32.dll only.
@@ -41,10 +44,12 @@ winsafe = { version = "0.0.29", default-features = false, features = ["user"] }
 # The same winit as eframe; only the native termination opt-in is used.
 winit = { version = "0.30", default-features = false }
 muda = { version = "0.21", default-features = false }
-# The input context, to drop the IME's marked text when the Type tool ends a composition; the
-# window's `movable` flag (see `mac_window`). The versions muda uses, through safe methods.
+# The input context, to drop the IME's marked text when the Type tool ends a composition. The
+# versions muda uses, through safe methods.
 objc2 = "0.6"
-objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSResponder", "NSTextInputContext", "NSWindow"] }
+objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSResponder", "NSTextInputContext"] }
+# The window's `movable` flag follows the application bar's controls.
+craft-window = { workspace = true }
 # Finder double-clicks, Open With, Dock drops and `open -a DesignCraft brochure.idml` arrive as a
 # kAEOpenDocuments Apple event, which winit 0.30 doesn't handle. This crate (also used by PhotoCraft,
 # PdfCraft and WordCraft) registers the handler behind a safe API (Objective-C interop needs unsafe,
diff --git a/apps/designcraft/src/gpu.rs b/apps/designcraft/src/gpu.rs
index 01b3ca6d4..907117b0c 100644
--- a/apps/designcraft/src/gpu.rs
+++ b/apps/designcraft/src/gpu.rs
@@ -758,583 +758,4 @@ fn restart(skip: &[String], startup: &Startup) -> std::io::Result<()> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn gpu(name: &str, backend: Backend, device_type: DeviceType) -> Candidate {
-        Candidate { key: format!("{backend:?}:{name}"), name: name.into(), backend, device_type, pci: (0, 0), presents: true }
-    }
-
-    fn names(c: &[Candidate], order: &[usize]) -> Vec<String> {
-        order.iter().map(|&i| c[i].name.clone()).collect()
-    }
-
-    const NVIDIA_3090: (u32, u32) = (0x10de, 0x2204);
-    const AMD_IGPU: (u32, u32) = (0x1002, 0x164e);
-    const INTEL_IGPU: (u32, u32) = (0x8086, 0xa780);
-    const WARP: (u32, u32) = (0x1414, 0x008c);
-
-    fn pci_gpu(name: &str, backend: Backend, device_type: DeviceType, pci: (u32, u32)) -> Candidate {
-        Candidate { key: key(backend, pci.0, pci.1, name), name: name.into(), backend, device_type, pci, presents: true }
-    }
-
-    fn monitor(pci: (u32, u32)) -> DisplayGpu {
-        DisplayGpu { pci, primary: false }
-    }
-
-    fn primary(pci: (u32, u32)) -> DisplayGpu {
-        DisplayGpu { pci, primary: true }
-    }
-
-    /// A Windows desktop as wgpu lists it with every backend: a Ryzen's integrated GPU without a
-    /// monitor and an RTX 3090 driving both monitors, each under Vulkan and DX12, then WARP and
-    /// OpenGL (which reports no device id).
-    fn ryzen_desktop() -> Vec<Candidate> {
-        vec![
-            pci_gpu("NVIDIA GeForce RTX 3090", Backend::Vulkan, DeviceType::DiscreteGpu, NVIDIA_3090),
-            pci_gpu("AMD Radeon(TM) Graphics", Backend::Vulkan, DeviceType::IntegratedGpu, AMD_IGPU),
-            pci_gpu("NVIDIA GeForce RTX 3090", Backend::Dx12, DeviceType::DiscreteGpu, NVIDIA_3090),
-            pci_gpu("AMD Radeon(TM) Graphics", Backend::Dx12, DeviceType::IntegratedGpu, AMD_IGPU),
-            pci_gpu("Microsoft Basic Render Driver", Backend::Dx12, DeviceType::Cpu, WARP),
-            pci_gpu("NVIDIA GeForce RTX 3090/PCIe/SSE2", Backend::Gl, DeviceType::Other, (NVIDIA_3090.0, 0)),
-        ]
-    }
-
-    /// Power saving picked the integrated GPU, whose driver reset when Windows had to present its
-    /// frames on the monitors of the NVIDIA card. The GPU that drives the displays comes first,
-    /// through DX12; the integrated GPU stays the fallback a restart reaches.
-    #[test]
-    fn a_desktop_draws_on_the_gpu_that_drives_its_monitors() {
-        let c = ryzen_desktop();
-        for displays in [vec![primary(NVIDIA_3090)], vec![monitor(NVIDIA_3090)]] {
-            assert_eq!(adapter_order(&c, PowerPreference::LowPower, &displays, None, &[]), [2, 0, 3, 1, 5, 4], "{displays:?}");
-            assert_eq!(adapter_order(&c, PowerPreference::None, &displays, None, &[]), [2, 0, 3, 1, 5, 4], "{displays:?}");
-        }
-        // Without the display information the order is power saving's.
-        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[], None, &[]), [3, 1, 2, 0, 5, 4]);
-        // After the NVIDIA adapters failed, the integrated GPU is next.
-        let skip = vec![c[2].key.clone(), c[0].key.clone()];
-        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[primary(NVIDIA_3090)], None, &skip), [3, 1, 5, 4]);
-    }
-
-    /// A hybrid laptop: the panel (primary) on the integrated GPU, an external monitor on the
-    /// discrete one. Power saving and the display agree, in either enumeration order.
-    #[test]
-    fn a_hybrid_laptop_draws_on_the_integrated_gpu_that_drives_its_panel() {
-        let c = ryzen_desktop();
-        for displays in [vec![primary(AMD_IGPU), monitor(NVIDIA_3090)], vec![monitor(NVIDIA_3090), primary(AMD_IGPU)], vec![primary(AMD_IGPU)]] {
-            assert_eq!(adapter_order(&c, PowerPreference::LowPower, &displays, None, &[]), [3, 1, 2, 0, 5, 4], "{displays:?}");
-        }
-        // Linux names no primary unless there is a built-in panel: a monitor on each GPU keeps the
-        // system's order among them (Mesa puts the compositor's GPU first), and a GPU without one
-        // comes after both.
-        let linux = vec![
-            pci_gpu("AMD Radeon Graphics (RADV RAPHAEL_MENDOCINO)", Backend::Vulkan, DeviceType::IntegratedGpu, AMD_IGPU),
-            pci_gpu("NVIDIA GeForce RTX 3090", Backend::Vulkan, DeviceType::DiscreteGpu, NVIDIA_3090),
-            pci_gpu("Intel(R) Arc(TM) A380", Backend::Vulkan, DeviceType::DiscreteGpu, INTEL_IGPU),
-            pci_gpu("llvmpipe (LLVM 20.1.8, 256 bits)", Backend::Vulkan, DeviceType::Cpu, (0x10005, 0)),
-        ];
-        let both = [monitor(AMD_IGPU), monitor(NVIDIA_3090)];
-        assert_eq!(adapter_order(&linux, PowerPreference::None, &both, None, &[]), [0, 1, 2, 3]);
-        assert_eq!(adapter_order(&linux, PowerPreference::None, &[monitor(INTEL_IGPU)], None, &[]), [2, 0, 1, 3]);
-        assert_eq!(adapter_order(&linux, PowerPreference::None, &[monitor(NVIDIA_3090), primary(AMD_IGPU)], None, &[]), [0, 1, 2, 3]);
-    }
-
-    /// A Windows desktop with a monitor on each GPU: the window opens on the primary display, so
-    /// its GPU draws, whichever kind it is.
-    #[test]
-    fn the_primary_display_decides_between_gpus_that_both_drive_a_monitor() {
-        let c = ryzen_desktop();
-        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[monitor(AMD_IGPU), primary(NVIDIA_3090)], None, &[]), [2, 0, 3, 1, 5, 4]);
-        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[primary(AMD_IGPU), monitor(NVIDIA_3090)], None, &[]), [3, 1, 2, 0, 5, 4]);
-        // The displays only matter among adapters that can show the window; a GPU driving no
-        // display still loses to one that does.
-        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[monitor(AMD_IGPU), monitor(INTEL_IGPU)], None, &[]), [3, 1, 2, 0, 5, 4]);
-    }
-
-    /// Display GPUs none of the adapters match (another driver's ids, OpenGL's missing device id,
-    /// Metal's zeros) change nothing: power saving's order.
-    #[test]
-    fn displays_no_adapter_matches_leave_the_power_preference_in_charge() {
-        let c = ryzen_desktop();
-        let low = adapter_order(&c, PowerPreference::LowPower, &[], None, &[]);
-        for displays in [vec![monitor(INTEL_IGPU)], vec![primary((0x8086, 0x1234)), monitor((0x8086, 0x5678))], vec![primary((0, 0))]] {
-            assert_eq!(adapter_order(&c, PowerPreference::LowPower, &displays, None, &[]), low, "{displays:?}");
-        }
-        assert_eq!(names(&c, &adapter_order(&c, PowerPreference::HighPerformance, &[monitor(INTEL_IGPU)], None, &[]))[0], "NVIDIA GeForce RTX 3090");
-        // The Wayland desktop's adapters report no ids in these tests: the primary display never matches.
-        let c = wayland_desktop();
-        assert_eq!(
-            adapter_order(&c, PowerPreference::None, &[primary(NVIDIA_3090)], None, &[]),
-            adapter_order(&c, PowerPreference::None, &[], None, &[])
-        );
-        assert!(adapter_order(&[], PowerPreference::LowPower, &[primary(NVIDIA_3090)], None, &[]).is_empty());
-    }
-
-    /// `WGPU_ADAPTER_NAME` and "can't present" still come before the displays.
-    #[test]
-    fn a_named_adapter_comes_before_the_one_driving_the_display() {
-        let mut c = ryzen_desktop();
-        let displays = [primary(NVIDIA_3090)];
-        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &displays, Some("radeon"), &[]), [3, 1, 2, 0, 5, 4]);
-        c[2].presents = false;
-        c[0].presents = false;
-        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &displays, None, &[]), [3, 1, 5, 4]);
-    }
-
-    /// `WGPU_POWER_PREF`, the user's own choice, is kept as it is; only without it do the displays
-    /// count.
-    #[test]
-    fn only_automatic_considers_which_gpu_drives_the_display() {
-        assert!(automatic(None));
-        assert!(!automatic(Some(PowerPreference::None)));
-        assert!(!automatic(Some(PowerPreference::LowPower)));
-        assert!(preferred_displays(Some(PowerPreference::HighPerformance)).is_empty());
-        // Automatic reports whatever this machine has (nothing on macOS, in CI, or under Remote Desktop).
-        assert_eq!(preferred_displays(None), display_gpus());
-    }
-
-    #[test]
-    fn pci_ids_come_from_windows_device_ids() {
-        assert_eq!(pci_ids("PCI\\VEN_10DE&DEV_2204&SUBSYS_40421458&REV_A1"), Some(NVIDIA_3090));
-        assert_eq!(pci_ids("PCI\\VEN_1002&DEV_164E&SUBSYS_88771043&REV_C1"), Some(AMD_IGPU));
-        assert_eq!(pci_ids("pci\\ven_1002&dev_164e"), Some(AMD_IGPU));
-        // Remote Desktop and other non-PCI display devices, and malformed ids.
-        assert_eq!(pci_ids("ROOT\\BasicDisplay\\0000"), None);
-        assert_eq!(pci_ids("PCI\\VEN_10DE&SUBSYS_40421458"), None);
-        assert_eq!(pci_ids("PCI\\VEN_10DE&DEV_ZZZZ"), None);
-        assert_eq!(pci_ids("VEN_&DEV_"), None);
-        assert_eq!(pci_ids("PCI\\VEN_10DÉ&DEV_2204"), None);
-        assert_eq!(pci_ids(""), None);
-    }
-
-    /// Whatever this machine has: every GPU listed is a PCI device, at most one drives the primary
-    /// display, and none is listed twice. (A headless CI runner may list none.)
-    #[cfg(windows)]
-    #[test]
-    fn windows_lists_each_gpu_with_a_monitor_once() {
-        let gpus = windows_display_gpus();
-        assert!(gpus.iter().filter(|g| g.primary).count() <= 1, "{gpus:?}");
-        for (i, g) in gpus.iter().enumerate() {
-            assert_ne!(g.pci.0, 0, "{gpus:?}");
-            assert!(!gpus[..i].iter().any(|h| h.pci == g.pci), "{gpus:?}");
-        }
-    }
-
-    #[test]
-    fn internal_panels_are_edp_lvds_and_dsi_connectors() {
-        for name in ["eDP-1", "LVDS-1", "DSI-1"] {
-            assert!(is_internal_panel(name), "{name}");
-        }
-        for name in ["DP-3", "HDMI-A-1", "DVI-D-1", "VGA-1", "Writeback-1", ""] {
-            assert!(!is_internal_panel(name), "{name}");
-        }
-    }
-
-    /// A sysfs like a hybrid laptop's with an external monitor: the panel and a disconnected port
-    /// on the integrated GPU (card0), the monitor on the discrete one (card1), and a card without
-    /// PCI ids. Each GPU is listed once, the one with the panel as primary.
-    #[test]
-    fn linux_display_gpus_come_from_the_connected_connectors() -> std::io::Result<()> {
-        let dir = std::env::temp_dir().join(format!("designcraft-drm-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        let card = |name: &str, (vendor, device): (u32, u32)| -> std::io::Result<()> {
-            std::fs::create_dir_all(dir.join(name).join("device"))?;
-            std::fs::write(dir.join(name).join("device/vendor"), format!("{vendor:#06x}\n"))?;
-            std::fs::write(dir.join(name).join("device/device"), format!("{device:#06x}\n"))
-        };
-        let connector = |name: &str, status: &str| -> std::io::Result<()> {
-            std::fs::create_dir_all(dir.join(name))?;
-            std::fs::write(dir.join(name).join("status"), format!("{status}\n"))
-        };
-        card("card0", AMD_IGPU)?;
-        card("card1", NVIDIA_3090)?;
-        std::fs::create_dir_all(dir.join("card2"))?;
-        connector("card0-eDP-1", "connected")?;
-        connector("card0-HDMI-A-1", "disconnected")?;
-        connector("card1-DP-1", "connected")?;
-        connector("card1-DP-2", "connected")?;
-        connector("card2-Virtual-1", "connected")?;
-        std::fs::write(dir.join("renderD128"), "")?;
-        let mut gpus = linux_display_gpus(&dir);
-        gpus.sort_by_key(|g| g.pci);
-        assert_eq!(gpus, [primary(AMD_IGPU), monitor(NVIDIA_3090)]);
-        assert!(linux_display_gpus(&dir.join("no such dir")).is_empty());
-        std::fs::remove_dir_all(&dir)
-    }
-
-    #[test]
-    fn display_gpus_are_logged_as_pci_ids() {
-        assert_eq!(primary(NVIDIA_3090).to_string(), "10de:2204 (primary)");
-        assert_eq!(monitor(AMD_IGPU).to_string(), "1002:164e");
-        let mut gpus = vec![];
-        add_display_gpu(&mut gpus, NVIDIA_3090, false);
-        add_display_gpu(&mut gpus, NVIDIA_3090, true);
-        add_display_gpu(&mut gpus, AMD_IGPU, false);
-        assert_eq!(gpus, [primary(NVIDIA_3090), monitor(AMD_IGPU)]);
-    }
-
-    /// A dual-GPU Linux desktop as Vulkan lists it with Mesa's device-select layer: the GPU KDE's
-    /// compositor runs on (NVIDIA) first, then the Ryzen's integrated GPU, Mesa's software
-    /// renderer, and OpenGL.
-    fn wayland_desktop() -> Vec<Candidate> {
-        vec![
-            gpu("NVIDIA GeForce RTX 5070", Backend::Vulkan, DeviceType::DiscreteGpu),
-            gpu("AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)", Backend::Vulkan, DeviceType::IntegratedGpu),
-            gpu("llvmpipe (LLVM 20.1.8, 256 bits)", Backend::Vulkan, DeviceType::Cpu),
-            gpu("NVIDIA GeForce RTX 5070/PCIe/SSE2", Backend::Gl, DeviceType::Other),
-        ]
-    }
-
-    #[test]
-    fn automatic_keeps_the_systems_order_on_linux_and_saves_power_elsewhere() {
-        let c = wayland_desktop();
-        let order = adapter_order(&c, power_preference(None), &[], None, &[]);
-        let first = &c[order[0]].name;
-        if cfg!(any(windows, target_os = "macos")) {
-            assert_eq!(first, "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)");
-        } else {
-            // The integrated GPU couldn't show frames to a compositor on the NVIDIA GPU.
-            assert_eq!(first, "NVIDIA GeForce RTX 5070");
-        }
-    }
-
-    #[test]
-    fn each_preference_orders_the_adapters_then_falls_back_to_opengl_and_software() {
-        let c = wayland_desktop();
-        let order = |power| names(&c, &adapter_order(&c, power, &[], None, &[]));
-        assert_eq!(
-            order(PowerPreference::None),
-            [
-                "NVIDIA GeForce RTX 5070",
-                "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)",
-                "NVIDIA GeForce RTX 5070/PCIe/SSE2",
-                "llvmpipe (LLVM 20.1.8, 256 bits)"
-            ]
-        );
-        assert_eq!(
-            order(PowerPreference::LowPower),
-            [
-                "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)",
-                "NVIDIA GeForce RTX 5070",
-                "NVIDIA GeForce RTX 5070/PCIe/SSE2",
-                "llvmpipe (LLVM 20.1.8, 256 bits)"
-            ]
-        );
-        assert_eq!(
-            order(PowerPreference::HighPerformance),
-            [
-                "NVIDIA GeForce RTX 5070",
-                "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)",
-                "NVIDIA GeForce RTX 5070/PCIe/SSE2",
-                "llvmpipe (LLVM 20.1.8, 256 bits)"
-            ]
-        );
-    }
-
-    /// A restart leaves out the adapter the window failed on, and once every adapter failed there
-    /// is nothing to try. A dual-GPU Mac reports both GPUs under Metal with no PCI ids: their keys
-    /// still differ, so when the integrated GPU fails, the restart renders on the discrete one.
-    #[test]
-    fn gpus_without_pci_ids_are_told_apart_by_name() {
-        let mac = |name: &str, device_type| Candidate {
-            key: key(Backend::Metal, 0, 0, name),
-            name: name.into(),
-            backend: Backend::Metal,
-            device_type,
-            pci: (0, 0),
-            presents: true,
-        };
-        let c = vec![mac("NVIDIA GeForce GT 750M", DeviceType::DiscreteGpu), mac("Intel Iris Pro Graphics", DeviceType::IntegratedGpu)];
-        assert_eq!((c[0].key.as_str(), c[1].key.as_str()), ("Metal:NVIDIA GeForce GT 750M", "Metal:Intel Iris Pro Graphics"));
-        let first = adapter_order(&c, PowerPreference::LowPower, &[], None, &[]);
-        assert_eq!(names(&c, &first)[0], "Intel Iris Pro Graphics");
-        let skip = parse_skip(&c[first[0]].key);
-        assert_eq!(names(&c, &adapter_order(&c, PowerPreference::LowPower, &[], None, &skip)), ["NVIDIA GeForce GT 750M"]);
-        // A comma in a name can't split the list.
-        assert_eq!(parse_skip(&key(Backend::Gl, 0, 0, "Mesa, llvmpipe")), ["Gl:Mesa  llvmpipe"]);
-    }
-
-    fn sample(frames: u64, busy: bool, leaves: u64, hidden: bool) -> Sample {
-        Sample { frames, busy, leaves, hidden }
-    }
-
-    /// Runs `ticks` looks with the same sample; the verdicts other than `Wait`.
-    fn run(w: &mut Watch, s: Sample, ticks: u32) -> Vec<(u32, Verdict)> {
-        (1..=ticks).filter_map(|t| Some((t, w.step(s, WATCH_TICK))).filter(|(_, v)| *v != Verdict::Wait)).collect()
-    }
-
-    const TICKS_PER_S: u32 = 4;
-
-    /// The UI thread stuck in the graphics stack (not in the app's code, no progress) with the
-    /// window not known to be hidden: late after 20 s, hung after 60 s.
-    #[test]
-    fn a_ui_thread_stuck_in_the_graphics_stack_hangs_its_adapter() {
-        let mut w = Watch::default();
-        let v = run(&mut w, sample(1, false, 1, false), 61 * TICKS_PER_S);
-        assert_eq!(v.first(), Some(&(20 * TICKS_PER_S, Verdict::Late)));
-        // `leaves` moved from 0 to 1 on the first look, so the stuck time starts one look later.
-        assert_eq!(v.get(1), Some(&(60 * TICKS_PER_S + 1, Verdict::Hung)));
-        // The second frame began: the first was presented.
-        assert_eq!(Watch::default().step(sample(2, false, 9, false), WATCH_TICK), Verdict::Shown);
-    }
-
-    /// A busy UI thread (a large document composing on a slow machine) is only ever late.
-    #[test]
-    fn a_busy_ui_thread_never_hangs_its_adapter() {
-        let mut w = Watch::default();
-        let v = run(&mut w, sample(0, true, 0, false), 600 * TICKS_PER_S);
-        assert_eq!(v, [(20 * TICKS_PER_S, Verdict::Late)]);
-        // Nor does one that keeps coming back from the graphics stack.
-        let mut w = Watch::default();
-        for t in 0..(600 * TICKS_PER_S) {
-            assert_ne!(w.step(sample(1, false, u64::from(t), false), WATCH_TICK), Verdict::Hung);
-        }
-    }
-
-    /// A window known to be hidden (locked screen, another workspace, minimized) may have its frames
-    /// held back by the compositor: that time counts for nothing and starts the stuck time over.
-    #[test]
-    fn time_while_the_window_is_hidden_does_not_count() {
-        let mut w = Watch::default();
-        assert!(run(&mut w, sample(1, false, 0, true), 600 * TICKS_PER_S).is_empty());
-        assert!(run(&mut w, sample(1, false, 0, false), 50 * TICKS_PER_S).iter().all(|(_, v)| *v == Verdict::Late));
-        assert!(run(&mut w, sample(1, false, 0, true), 10 * TICKS_PER_S).is_empty());
-        assert!(run(&mut w, sample(1, false, 0, false), 59 * TICKS_PER_S).is_empty());
-        assert_eq!(run(&mut w, sample(1, false, 0, false), TICKS_PER_S), [(TICKS_PER_S, Verdict::Hung)]);
-    }
-
-    #[test]
-    fn a_hung_adapter_is_left_out_once() {
-        let skip = vec!["Dx12:10de:28a0".to_string()];
-        assert_eq!(restart_without(true, 1, Some("Dx12:10de:28a0"), &skip), None);
-        assert_eq!(restart_without(true, 1, Some("Dx12:8086:a7a8"), &skip), Some("Dx12:8086:a7a8"));
-    }
-
-    /// Windows, a hardware DX12 adapter failing: the software renderer (WARP) is passed over while
-    /// another backend is left, the restarts go through OpenGL and Vulkan, and only then back to
-    /// every backend with software allowed. The chain ends.
-    #[test]
-    fn software_renderers_come_after_every_backends_hardware() {
-        use backend::Backend as B;
-        let c = ryzen_desktop();
-        let order = adapter_order(&c, PowerPreference::LowPower, &[], None, &[]);
-        assert_eq!(without_software(order.clone(), &c, false), (order.clone(), false));
-        let (hardware, dropped) = without_software(order, &c, true);
-        assert!(dropped && !hardware.contains(&4), "{hardware:?}");
-
-        let dx12 = "Dx12:10de:2204".to_string();
-        // The adapter that failed first.
-        let (skip, _) = next_start(&[], Some(&dx12), Some((B::Dx12, Some(B::Gl))), true).unwrap();
-        assert_eq!(skip, [dx12.as_str()]);
-        // Only WARP left on DX12 (passed over, nothing picked): OpenGL next.
-        let (skip, what) = next_start(&skip, None, Some((B::Dx12, Some(B::Gl))), true).unwrap();
-        assert_eq!(skip, [dx12.as_str(), "Dx12", SOFTWARE_LEFT]);
-        assert!(what.contains("OpenGL"), "{what}");
-        // OpenGL has no adapter, Vulkan next; then Vulkan has none and no backend is left.
-        let (skip, _) = next_start(&skip, None, Some((B::Gl, Some(B::Vulkan))), false).unwrap();
-        assert_eq!(skip, [dx12.as_str(), "Dx12", SOFTWARE_LEFT, "Gl"]);
-        let (skip, what) = next_start(&skip, None, Some((B::Vulkan, None)), false).unwrap();
-        assert_eq!(skip, [dx12.as_str(), SOFTWARE], "{what}");
-        assert!(backend::skipped_backends(&skip).is_empty());
-        // With software allowed and nothing left: the end.
-        assert_eq!(next_start(&skip, None, Some((B::Dx12, None)), false), None);
-        // Nothing was passed over (a Mac whose GPUs all failed): no software round.
-        assert_eq!(next_start(&[], None, Some((B::Metal, None)), false), None);
-        // Without the backend fallback (`WGPU_BACKEND`), only adapters.
-        assert_eq!(next_start(&[], None, None, false), None);
-    }
-
-    /// The skip list travels as an argument, which processes the app starts don't inherit.
-    #[test]
-    fn the_skip_list_is_an_argument() {
-        assert_eq!(skip_arg("--gpu-skip=Dx12:10de:2204,Dx12"), Some(vec!["Dx12:10de:2204".to_string(), "Dx12".to_string()]));
-        assert_eq!(skip_arg("--gpu-skip="), Some(vec![]));
-        assert_eq!(skip_arg("--gpu-skip"), None);
-        assert_eq!(skip_arg("layout.designcraft"), None);
-    }
-
-    #[test]
-    fn a_restart_tries_the_next_adapter() {
-        let c = wayland_desktop();
-        let mut skip = vec![];
-        let mut tried = vec![];
-        while let Some(&i) = adapter_order(&c, PowerPreference::LowPower, &[], None, &skip).first() {
-            tried.push(c[i].name.clone());
-            skip.push(c[i].key.clone());
-        }
-        assert_eq!(
-            tried,
-            [
-                "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)",
-                "NVIDIA GeForce RTX 5070",
-                "NVIDIA GeForce RTX 5070/PCIe/SSE2",
-                "llvmpipe (LLVM 20.1.8, 256 bits)"
-            ]
-        );
-    }
-
-    #[test]
-    fn adapters_that_cannot_present_to_the_window_are_never_tried() {
-        let mut c = wayland_desktop();
-        c[0].presents = false;
-        c[3].presents = false;
-        for power in [PowerPreference::None, PowerPreference::LowPower, PowerPreference::HighPerformance] {
-            let order = adapter_order(&c, power, &[], None, &[]);
-            assert!(!order.contains(&0) && !order.contains(&3), "{power:?}: {order:?}");
-            assert_eq!(order.len(), 2);
-        }
-        for p in &mut c {
-            p.presents = false;
-        }
-        assert!(adapter_order(&c, PowerPreference::None, &[], None, &[]).is_empty());
-        assert!(adapter_order(&[], PowerPreference::HighPerformance, &[], None, &[]).is_empty());
-    }
-
-    #[test]
-    fn wgpu_adapter_name_picks_an_adapter_first_and_the_rest_stay_as_fallbacks() {
-        let c = wayland_desktop();
-        let order = adapter_order(&c, PowerPreference::HighPerformance, &[], Some("radv"), &[]);
-        assert_eq!(c[order[0]].name, "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)");
-        assert_eq!(order.len(), 4);
-        // Any case; every match comes before the rest, natively first.
-        let order = adapter_order(&c, PowerPreference::LowPower, &[], Some("GeForce"), &[]);
-        assert_eq!(names(&c, &order[..2]), ["NVIDIA GeForce RTX 5070", "NVIDIA GeForce RTX 5070/PCIe/SSE2"]);
-        // An empty name or one nothing matches changes nothing.
-        for named in ["", "no such gpu"] {
-            assert_eq!(
-                adapter_order(&c, PowerPreference::LowPower, &[], Some(named), &[]),
-                adapter_order(&c, PowerPreference::LowPower, &[], None, &[])
-            );
-        }
-        // A named adapter that failed is left out like any other.
-        let skip = vec![c[1].key.clone()];
-        assert_eq!(adapter_order(&c, PowerPreference::None, &[], Some("radv"), &skip)[0], 0);
-    }
-
-    /// A Windows machine lists every GPU twice when Vulkan and DX12 are both in the instance:
-    /// power saving still takes the integrated GPU first, each GPU through DX12 first.
-    #[test]
-    fn hybrid_laptop_on_windows_renders_on_the_integrated_gpu_with_power_saving() {
-        let c = vec![
-            gpu("Intel(R) Arc(TM) A370M", Backend::Vulkan, DeviceType::DiscreteGpu),
-            gpu("Intel(R) Iris(R) Xe Graphics", Backend::Vulkan, DeviceType::IntegratedGpu),
-            gpu("Intel(R) Arc(TM) A370M", Backend::Dx12, DeviceType::DiscreteGpu),
-            gpu("Intel(R) Iris(R) Xe Graphics", Backend::Dx12, DeviceType::IntegratedGpu),
-            gpu("Microsoft Basic Render Driver", Backend::Dx12, DeviceType::Cpu),
-        ];
-        let order = adapter_order(&c, PowerPreference::LowPower, &[], None, &[]);
-        assert_eq!(order, [3, 1, 2, 0, 4]);
-        assert_eq!(adapter_order(&c, PowerPreference::HighPerformance, &[], None, &[]), [2, 0, 3, 1, 4]);
-    }
-
-    /// One Intel GPU whose Vulkan driver made the window flicker black: DX12 comes first whatever
-    /// the preference; Vulkan stays a fallback, and `WGPU_ADAPTER_NAME` or a restart leaving DX12
-    /// out still reach it.
-    #[test]
-    fn a_windows_gpu_renders_through_dx12_before_vulkan() {
-        let c = vec![
-            gpu("Intel(R) Graphics", Backend::Vulkan, DeviceType::IntegratedGpu),
-            gpu("Intel(R) Graphics", Backend::Dx12, DeviceType::IntegratedGpu),
-            gpu("Microsoft Basic Render Driver", Backend::Dx12, DeviceType::Cpu),
-            gpu("Intel(R) Graphics", Backend::Gl, DeviceType::Other),
-        ];
-        for power in [PowerPreference::LowPower, PowerPreference::HighPerformance, PowerPreference::None] {
-            assert_eq!(adapter_order(&c, power, &[], None, &[]), [1, 0, 3, 2], "{power:?}");
-        }
-        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[], None, &[c[1].key.clone()]), [0, 3, 2], "DX12 failed: Vulkan next");
-    }
-
-    #[test]
-    fn power_preference_follows_the_environment() {
-        assert_eq!(power_preference(None), AUTOMATIC);
-        for p in [PowerPreference::LowPower, PowerPreference::HighPerformance, PowerPreference::None] {
-            assert_eq!(power_preference(Some(p)), p);
-        }
-        assert_eq!(AUTOMATIC, if cfg!(any(windows, target_os = "macos")) { PowerPreference::LowPower } else { PowerPreference::None });
-    }
-
-    /// The Intel Mac of #334 lost its Metal device compiling the compute shader of wgpu's indirect
-    /// call check: off unless `WGPU_VALIDATION_INDIRECT_CALL` turns it on.
-    #[test]
-    fn the_indirect_call_check_is_off() {
-        if std::env::var_os("WGPU_VALIDATION_INDIRECT_CALL").is_none() {
-            assert!(!instance_flags().contains(wgpu::InstanceFlags::VALIDATION_INDIRECT_CALL));
-        }
-        // The other flags of the build stay as wgpu sets them.
-        let others = wgpu::InstanceFlags::from_build_config() - wgpu::InstanceFlags::VALIDATION_INDIRECT_CALL;
-        if std::env::vars_os().all(|(k, _)| !k.to_string_lossy().starts_with("WGPU_")) {
-            assert_eq!(instance_flags(), others);
-        }
-    }
-
-    #[test]
-    fn skipped_adapters_parse_from_a_comma_separated_list() {
-        assert_eq!(parse_skip("Vulkan:1002:164e, Gl:10de:2f04,,"), ["Vulkan:1002:164e", "Gl:10de:2f04"]);
-        assert!(parse_skip("").is_empty());
-        assert_eq!(key(Backend::Vulkan, 0x1002, 0x164e, "AMD Radeon"), "Vulkan:1002:164e");
-        assert_eq!(key(Backend::Gl, 0x10de, 0x2f04, "NVIDIA"), "Gl:10de:2f04");
-        // A whole backend left out is its bare name; it never matches an adapter's key.
-        let skip = parse_skip("Dx12,Dx12:10de:2204");
-        assert_eq!(backend::skipped_backends(&skip), [backend::Backend::Dx12]);
-        let c = vec![pci_gpu("NVIDIA GeForce RTX 3090", Backend::Dx12, DeviceType::DiscreteGpu, NVIDIA_3090)];
-        assert!(adapter_order(&c, PowerPreference::None, &[], None, &skip).is_empty());
-        assert_eq!(adapter_order(&c, PowerPreference::None, &[], None, &skip[..1]), [0]);
-    }
-
-    #[test]
-    fn panics_in_wgpu_egui_wgpu_and_naga_are_graphics_failures() {
-        for file in [
-            "/home/u/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/egui-wgpu-0.36.2/src/winit.rs",
-            r"C:\Users\u\.cargo\registry\src\index.crates.io-1949cf8c6b5b557f\wgpu-core-30.0.1\src\device\mod.rs",
-            "/rustc/deps/wgpu-hal-30.0.1/src/vulkan/adapter.rs",
-            "naga-30.0.0/src/back/spv/writer.rs",
-        ] {
-            assert!(in_graphics_stack(file), "{file}");
-        }
-        for file in [
-            "apps/designcraft/src/main.rs",
-            "/home/wgpu/designcraft/crates/ui-egui/src/lib.rs",
-            "egui-0.36.2/src/context.rs",
-            "winit-0.30.12/src/x.rs",
-        ] {
-            assert!(!in_graphics_stack(file), "{file}");
-        }
-    }
-
-    #[test]
-    fn only_a_graphics_failure_while_starting_up_restarts_without_the_adapter() {
-        let amd = Some("Vulkan:1002:164e");
-        assert_eq!(restart_without(true, 0, amd, &[]), amd);
-        assert_eq!(restart_without(true, STARTUP_FRAMES - 1, amd, &[]), amd);
-        // After start-up the adapter has shown frames; a lost window is something else.
-        assert_eq!(restart_without(true, STARTUP_FRAMES, amd, &[]), None);
-        // A bug outside the graphics, or no adapter picked: nothing another adapter would change.
-        assert_eq!(restart_without(false, 0, amd, &[]), None);
-        assert_eq!(restart_without(true, 0, None, &[]), None);
-        // Never the same adapter twice, so restarts end.
-        assert_eq!(restart_without(true, 0, amd, &["Vulkan:1002:164e".into()]), None);
-    }
-
-    /// Without a backend fallback (`WGPU_BACKEND` set), a start whose graphics failed with no
-    /// adapter to leave out ends with the error and the hint; a bug ends with its message.
-    #[test]
-    fn a_normal_exit_or_another_failure_does_not_restart() {
-        let startup = Startup::new(None, Vec::new());
-        assert_eq!(finish(Ok(Ok(())), &startup), Ok(()));
-        // No adapter was picked (none can show the window): the error is returned, nothing restarts.
-        let none =
-            eframe::Error::Wgpu(eframe::egui_wgpu::WgpuError::CustomNativeAdapterSelectionError("no graphics adapter can show the window".into()));
-        assert_eq!(
-            finish(Ok(Err(none)), &startup),
-            Err(format!("WGPU error: Adapter selection failed: no graphics adapter can show the window ({HELP})"))
-        );
-        let _ = startup.adapter.set("Vulkan:1002:164e".into());
-        GRAPHICS_PANIC.store(false, Ordering::Relaxed);
-        assert_eq!(finish(Err("a bug".into()), &startup), Err("a bug".into()));
-        // Nothing to record without a fallback.
-        startup.presented();
-        startup.started_with(wgpu::Backend::Gl);
-        assert_eq!(startup.status_line(), None);
-    }
-}
+mod tests;
diff --git a/apps/designcraft/src/gpu/tests.rs b/apps/designcraft/src/gpu/tests.rs
new file mode 100644
index 000000000..c7990aab0
--- /dev/null
+++ b/apps/designcraft/src/gpu/tests.rs
@@ -0,0 +1,571 @@
+use super::*;
+
+fn gpu(name: &str, backend: Backend, device_type: DeviceType) -> Candidate {
+    Candidate { key: format!("{backend:?}:{name}"), name: name.into(), backend, device_type, pci: (0, 0), presents: true }
+}
+
+fn names(c: &[Candidate], order: &[usize]) -> Vec<String> {
+    order.iter().map(|&i| c[i].name.clone()).collect()
+}
+
+const NVIDIA_3090: (u32, u32) = (0x10de, 0x2204);
+const AMD_IGPU: (u32, u32) = (0x1002, 0x164e);
+const INTEL_IGPU: (u32, u32) = (0x8086, 0xa780);
+const WARP: (u32, u32) = (0x1414, 0x008c);
+
+fn pci_gpu(name: &str, backend: Backend, device_type: DeviceType, pci: (u32, u32)) -> Candidate {
+    Candidate { key: key(backend, pci.0, pci.1, name), name: name.into(), backend, device_type, pci, presents: true }
+}
+
+fn monitor(pci: (u32, u32)) -> DisplayGpu {
+    DisplayGpu { pci, primary: false }
+}
+
+fn primary(pci: (u32, u32)) -> DisplayGpu {
+    DisplayGpu { pci, primary: true }
+}
+
+/// A Windows desktop as wgpu lists it with every backend: a Ryzen's integrated GPU without a
+/// monitor and an RTX 3090 driving both monitors, each under Vulkan and DX12, then WARP and
+/// OpenGL (which reports no device id).
+fn ryzen_desktop() -> Vec<Candidate> {
+    vec![
+        pci_gpu("NVIDIA GeForce RTX 3090", Backend::Vulkan, DeviceType::DiscreteGpu, NVIDIA_3090),
+        pci_gpu("AMD Radeon(TM) Graphics", Backend::Vulkan, DeviceType::IntegratedGpu, AMD_IGPU),
+        pci_gpu("NVIDIA GeForce RTX 3090", Backend::Dx12, DeviceType::DiscreteGpu, NVIDIA_3090),
+        pci_gpu("AMD Radeon(TM) Graphics", Backend::Dx12, DeviceType::IntegratedGpu, AMD_IGPU),
+        pci_gpu("Microsoft Basic Render Driver", Backend::Dx12, DeviceType::Cpu, WARP),
+        pci_gpu("NVIDIA GeForce RTX 3090/PCIe/SSE2", Backend::Gl, DeviceType::Other, (NVIDIA_3090.0, 0)),
+    ]
+}
+
+/// Power saving picked the integrated GPU, whose driver reset when Windows had to present its
+/// frames on the monitors of the NVIDIA card. The GPU that drives the displays comes first,
+/// through DX12; the integrated GPU stays the fallback a restart reaches.
+#[test]
+fn a_desktop_draws_on_the_gpu_that_drives_its_monitors() {
+    let c = ryzen_desktop();
+    for displays in [vec![primary(NVIDIA_3090)], vec![monitor(NVIDIA_3090)]] {
+        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &displays, None, &[]), [2, 0, 3, 1, 5, 4], "{displays:?}");
+        assert_eq!(adapter_order(&c, PowerPreference::None, &displays, None, &[]), [2, 0, 3, 1, 5, 4], "{displays:?}");
+    }
+    // Without the display information the order is power saving's.
+    assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[], None, &[]), [3, 1, 2, 0, 5, 4]);
+    // After the NVIDIA adapters failed, the integrated GPU is next.
+    let skip = vec![c[2].key.clone(), c[0].key.clone()];
+    assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[primary(NVIDIA_3090)], None, &skip), [3, 1, 5, 4]);
+}
+
+/// A hybrid laptop: the panel (primary) on the integrated GPU, an external monitor on the
+/// discrete one. Power saving and the display agree, in either enumeration order.
+#[test]
+fn a_hybrid_laptop_draws_on_the_integrated_gpu_that_drives_its_panel() {
+    let c = ryzen_desktop();
+    for displays in [vec![primary(AMD_IGPU), monitor(NVIDIA_3090)], vec![monitor(NVIDIA_3090), primary(AMD_IGPU)], vec![primary(AMD_IGPU)]] {
+        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &displays, None, &[]), [3, 1, 2, 0, 5, 4], "{displays:?}");
+    }
+    // Linux names no primary unless there is a built-in panel: a monitor on each GPU keeps the
+    // system's order among them (Mesa puts the compositor's GPU first), and a GPU without one
+    // comes after both.
+    let linux = vec![
+        pci_gpu("AMD Radeon Graphics (RADV RAPHAEL_MENDOCINO)", Backend::Vulkan, DeviceType::IntegratedGpu, AMD_IGPU),
+        pci_gpu("NVIDIA GeForce RTX 3090", Backend::Vulkan, DeviceType::DiscreteGpu, NVIDIA_3090),
+        pci_gpu("Intel(R) Arc(TM) A380", Backend::Vulkan, DeviceType::DiscreteGpu, INTEL_IGPU),
+        pci_gpu("llvmpipe (LLVM 20.1.8, 256 bits)", Backend::Vulkan, DeviceType::Cpu, (0x10005, 0)),
+    ];
+    let both = [monitor(AMD_IGPU), monitor(NVIDIA_3090)];
+    assert_eq!(adapter_order(&linux, PowerPreference::None, &both, None, &[]), [0, 1, 2, 3]);
+    assert_eq!(adapter_order(&linux, PowerPreference::None, &[monitor(INTEL_IGPU)], None, &[]), [2, 0, 1, 3]);
+    assert_eq!(adapter_order(&linux, PowerPreference::None, &[monitor(NVIDIA_3090), primary(AMD_IGPU)], None, &[]), [0, 1, 2, 3]);
+}
+
+/// A Windows desktop with a monitor on each GPU: the window opens on the primary display, so
+/// its GPU draws, whichever kind it is.
+#[test]
+fn the_primary_display_decides_between_gpus_that_both_drive_a_monitor() {
+    let c = ryzen_desktop();
+    assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[monitor(AMD_IGPU), primary(NVIDIA_3090)], None, &[]), [2, 0, 3, 1, 5, 4]);
+    assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[primary(AMD_IGPU), monitor(NVIDIA_3090)], None, &[]), [3, 1, 2, 0, 5, 4]);
+    // The displays only matter among adapters that can show the window; a GPU driving no
+    // display still loses to one that does.
+    assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[monitor(AMD_IGPU), monitor(INTEL_IGPU)], None, &[]), [3, 1, 2, 0, 5, 4]);
+}
+
+/// Display GPUs none of the adapters match (another driver's ids, OpenGL's missing device id,
+/// Metal's zeros) change nothing: power saving's order.
+#[test]
+fn displays_no_adapter_matches_leave_the_power_preference_in_charge() {
+    let c = ryzen_desktop();
+    let low = adapter_order(&c, PowerPreference::LowPower, &[], None, &[]);
+    for displays in [vec![monitor(INTEL_IGPU)], vec![primary((0x8086, 0x1234)), monitor((0x8086, 0x5678))], vec![primary((0, 0))]] {
+        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &displays, None, &[]), low, "{displays:?}");
+    }
+    assert_eq!(names(&c, &adapter_order(&c, PowerPreference::HighPerformance, &[monitor(INTEL_IGPU)], None, &[]))[0], "NVIDIA GeForce RTX 3090");
+    // The Wayland desktop's adapters report no ids in these tests: the primary display never matches.
+    let c = wayland_desktop();
+    assert_eq!(
+        adapter_order(&c, PowerPreference::None, &[primary(NVIDIA_3090)], None, &[]),
+        adapter_order(&c, PowerPreference::None, &[], None, &[])
+    );
+    assert!(adapter_order(&[], PowerPreference::LowPower, &[primary(NVIDIA_3090)], None, &[]).is_empty());
+}
+
+/// `WGPU_ADAPTER_NAME` and "can't present" still come before the displays.
+#[test]
+fn a_named_adapter_comes_before_the_one_driving_the_display() {
+    let mut c = ryzen_desktop();
+    let displays = [primary(NVIDIA_3090)];
+    assert_eq!(adapter_order(&c, PowerPreference::LowPower, &displays, Some("radeon"), &[]), [3, 1, 2, 0, 5, 4]);
+    c[2].presents = false;
+    c[0].presents = false;
+    assert_eq!(adapter_order(&c, PowerPreference::LowPower, &displays, None, &[]), [3, 1, 5, 4]);
+}
+
+/// `WGPU_POWER_PREF`, the user's own choice, is kept as it is; only without it do the displays
+/// count.
+#[test]
+fn only_automatic_considers_which_gpu_drives_the_display() {
+    assert!(automatic(None));
+    assert!(!automatic(Some(PowerPreference::None)));
+    assert!(!automatic(Some(PowerPreference::LowPower)));
+    assert!(preferred_displays(Some(PowerPreference::HighPerformance)).is_empty());
+    // Automatic reports whatever this machine has (nothing on macOS, in CI, or under Remote Desktop).
+    assert_eq!(preferred_displays(None), display_gpus());
+}
+
+#[test]
+fn pci_ids_come_from_windows_device_ids() {
+    assert_eq!(pci_ids("PCI\\VEN_10DE&DEV_2204&SUBSYS_40421458&REV_A1"), Some(NVIDIA_3090));
+    assert_eq!(pci_ids("PCI\\VEN_1002&DEV_164E&SUBSYS_88771043&REV_C1"), Some(AMD_IGPU));
+    assert_eq!(pci_ids("pci\\ven_1002&dev_164e"), Some(AMD_IGPU));
+    // Remote Desktop and other non-PCI display devices, and malformed ids.
+    assert_eq!(pci_ids("ROOT\\BasicDisplay\\0000"), None);
+    assert_eq!(pci_ids("PCI\\VEN_10DE&SUBSYS_40421458"), None);
+    assert_eq!(pci_ids("PCI\\VEN_10DE&DEV_ZZZZ"), None);
+    assert_eq!(pci_ids("VEN_&DEV_"), None);
+    assert_eq!(pci_ids("PCI\\VEN_10DÉ&DEV_2204"), None);
+    assert_eq!(pci_ids(""), None);
+}
+
+/// Whatever this machine has: every GPU listed is a PCI device, at most one drives the primary
+/// display, and none is listed twice. (A headless CI runner may list none.)
+#[cfg(windows)]
+#[test]
+fn windows_lists_each_gpu_with_a_monitor_once() {
+    let gpus = windows_display_gpus();
+    assert!(gpus.iter().filter(|g| g.primary).count() <= 1, "{gpus:?}");
+    for (i, g) in gpus.iter().enumerate() {
+        assert_ne!(g.pci.0, 0, "{gpus:?}");
+        assert!(!gpus[..i].iter().any(|h| h.pci == g.pci), "{gpus:?}");
+    }
+}
+
+#[test]
+fn internal_panels_are_edp_lvds_and_dsi_connectors() {
+    for name in ["eDP-1", "LVDS-1", "DSI-1"] {
+        assert!(is_internal_panel(name), "{name}");
+    }
+    for name in ["DP-3", "HDMI-A-1", "DVI-D-1", "VGA-1", "Writeback-1", ""] {
+        assert!(!is_internal_panel(name), "{name}");
+    }
+}
+
+/// A sysfs like a hybrid laptop's with an external monitor: the panel and a disconnected port
+/// on the integrated GPU (card0), the monitor on the discrete one (card1), and a card without
+/// PCI ids. Each GPU is listed once, the one with the panel as primary.
+#[test]
+fn linux_display_gpus_come_from_the_connected_connectors() -> std::io::Result<()> {
+    let dir = std::env::temp_dir().join(format!("designcraft-drm-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    let card = |name: &str, (vendor, device): (u32, u32)| -> std::io::Result<()> {
+        std::fs::create_dir_all(dir.join(name).join("device"))?;
+        std::fs::write(dir.join(name).join("device/vendor"), format!("{vendor:#06x}\n"))?;
+        std::fs::write(dir.join(name).join("device/device"), format!("{device:#06x}\n"))
+    };
+    let connector = |name: &str, status: &str| -> std::io::Result<()> {
+        std::fs::create_dir_all(dir.join(name))?;
+        std::fs::write(dir.join(name).join("status"), format!("{status}\n"))
+    };
+    card("card0", AMD_IGPU)?;
+    card("card1", NVIDIA_3090)?;
+    std::fs::create_dir_all(dir.join("card2"))?;
+    connector("card0-eDP-1", "connected")?;
+    connector("card0-HDMI-A-1", "disconnected")?;
+    connector("card1-DP-1", "connected")?;
+    connector("card1-DP-2", "connected")?;
+    connector("card2-Virtual-1", "connected")?;
+    std::fs::write(dir.join("renderD128"), "")?;
+    let mut gpus = linux_display_gpus(&dir);
+    gpus.sort_by_key(|g| g.pci);
+    assert_eq!(gpus, [primary(AMD_IGPU), monitor(NVIDIA_3090)]);
+    assert!(linux_display_gpus(&dir.join("no such dir")).is_empty());
+    std::fs::remove_dir_all(&dir)
+}
+
+#[test]
+fn display_gpus_are_logged_as_pci_ids() {
+    assert_eq!(primary(NVIDIA_3090).to_string(), "10de:2204 (primary)");
+    assert_eq!(monitor(AMD_IGPU).to_string(), "1002:164e");
+    let mut gpus = vec![];
+    add_display_gpu(&mut gpus, NVIDIA_3090, false);
+    add_display_gpu(&mut gpus, NVIDIA_3090, true);
+    add_display_gpu(&mut gpus, AMD_IGPU, false);
+    assert_eq!(gpus, [primary(NVIDIA_3090), monitor(AMD_IGPU)]);
+}
+
+/// A dual-GPU Linux desktop as Vulkan lists it with Mesa's device-select layer: the GPU KDE's
+/// compositor runs on (NVIDIA) first, then the Ryzen's integrated GPU, Mesa's software
+/// renderer, and OpenGL.
+fn wayland_desktop() -> Vec<Candidate> {
+    vec![
+        gpu("NVIDIA GeForce RTX 5070", Backend::Vulkan, DeviceType::DiscreteGpu),
+        gpu("AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)", Backend::Vulkan, DeviceType::IntegratedGpu),
+        gpu("llvmpipe (LLVM 20.1.8, 256 bits)", Backend::Vulkan, DeviceType::Cpu),
+        gpu("NVIDIA GeForce RTX 5070/PCIe/SSE2", Backend::Gl, DeviceType::Other),
+    ]
+}
+
+#[test]
+fn automatic_keeps_the_systems_order_on_linux_and_saves_power_elsewhere() {
+    let c = wayland_desktop();
+    let order = adapter_order(&c, power_preference(None), &[], None, &[]);
+    let first = &c[order[0]].name;
+    if cfg!(any(windows, target_os = "macos")) {
+        assert_eq!(first, "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)");
+    } else {
+        // The integrated GPU couldn't show frames to a compositor on the NVIDIA GPU.
+        assert_eq!(first, "NVIDIA GeForce RTX 5070");
+    }
+}
+
+#[test]
+fn each_preference_orders_the_adapters_then_falls_back_to_opengl_and_software() {
+    let c = wayland_desktop();
+    let order = |power| names(&c, &adapter_order(&c, power, &[], None, &[]));
+    assert_eq!(
+        order(PowerPreference::None),
+        [
+            "NVIDIA GeForce RTX 5070",
+            "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)",
+            "NVIDIA GeForce RTX 5070/PCIe/SSE2",
+            "llvmpipe (LLVM 20.1.8, 256 bits)"
+        ]
+    );
+    assert_eq!(
+        order(PowerPreference::LowPower),
+        [
+            "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)",
+            "NVIDIA GeForce RTX 5070",
+            "NVIDIA GeForce RTX 5070/PCIe/SSE2",
+            "llvmpipe (LLVM 20.1.8, 256 bits)"
+        ]
+    );
+    assert_eq!(
+        order(PowerPreference::HighPerformance),
+        [
+            "NVIDIA GeForce RTX 5070",
+            "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)",
+            "NVIDIA GeForce RTX 5070/PCIe/SSE2",
+            "llvmpipe (LLVM 20.1.8, 256 bits)"
+        ]
+    );
+}
+
+/// A restart leaves out the adapter the window failed on, and once every adapter failed there
+/// is nothing to try. A dual-GPU Mac reports both GPUs under Metal with no PCI ids: their keys
+/// still differ, so when the integrated GPU fails, the restart renders on the discrete one.
+#[test]
+fn gpus_without_pci_ids_are_told_apart_by_name() {
+    let mac = |name: &str, device_type| Candidate {
+        key: key(Backend::Metal, 0, 0, name),
+        name: name.into(),
+        backend: Backend::Metal,
+        device_type,
+        pci: (0, 0),
+        presents: true,
+    };
+    let c = vec![mac("NVIDIA GeForce GT 750M", DeviceType::DiscreteGpu), mac("Intel Iris Pro Graphics", DeviceType::IntegratedGpu)];
+    assert_eq!((c[0].key.as_str(), c[1].key.as_str()), ("Metal:NVIDIA GeForce GT 750M", "Metal:Intel Iris Pro Graphics"));
+    let first = adapter_order(&c, PowerPreference::LowPower, &[], None, &[]);
+    assert_eq!(names(&c, &first)[0], "Intel Iris Pro Graphics");
+    let skip = parse_skip(&c[first[0]].key);
+    assert_eq!(names(&c, &adapter_order(&c, PowerPreference::LowPower, &[], None, &skip)), ["NVIDIA GeForce GT 750M"]);
+    // A comma in a name can't split the list.
+    assert_eq!(parse_skip(&key(Backend::Gl, 0, 0, "Mesa, llvmpipe")), ["Gl:Mesa  llvmpipe"]);
+}
+
+fn sample(frames: u64, busy: bool, leaves: u64, hidden: bool) -> Sample {
+    Sample { frames, busy, leaves, hidden }
+}
+
+/// Runs `ticks` looks with the same sample; the verdicts other than `Wait`.
+fn run(w: &mut Watch, s: Sample, ticks: u32) -> Vec<(u32, Verdict)> {
+    (1..=ticks).filter_map(|t| Some((t, w.step(s, WATCH_TICK))).filter(|(_, v)| *v != Verdict::Wait)).collect()
+}
+
+const TICKS_PER_S: u32 = 4;
+
+/// The UI thread stuck in the graphics stack (not in the app's code, no progress) with the
+/// window not known to be hidden: late after 20 s, hung after 60 s.
+#[test]
+fn a_ui_thread_stuck_in_the_graphics_stack_hangs_its_adapter() {
+    let mut w = Watch::default();
+    let v = run(&mut w, sample(1, false, 1, false), 61 * TICKS_PER_S);
+    assert_eq!(v.first(), Some(&(20 * TICKS_PER_S, Verdict::Late)));
+    // `leaves` moved from 0 to 1 on the first look, so the stuck time starts one look later.
+    assert_eq!(v.get(1), Some(&(60 * TICKS_PER_S + 1, Verdict::Hung)));
+    // The second frame began: the first was presented.
+    assert_eq!(Watch::default().step(sample(2, false, 9, false), WATCH_TICK), Verdict::Shown);
+}
+
+/// A busy UI thread (a large document composing on a slow machine) is only ever late.
+#[test]
+fn a_busy_ui_thread_never_hangs_its_adapter() {
+    let mut w = Watch::default();
+    let v = run(&mut w, sample(0, true, 0, false), 600 * TICKS_PER_S);
+    assert_eq!(v, [(20 * TICKS_PER_S, Verdict::Late)]);
+    // Nor does one that keeps coming back from the graphics stack.
+    let mut w = Watch::default();
+    for t in 0..(600 * TICKS_PER_S) {
+        assert_ne!(w.step(sample(1, false, u64::from(t), false), WATCH_TICK), Verdict::Hung);
+    }
+}
+
+/// A window known to be hidden (locked screen, another workspace, minimized) may have its frames
+/// held back by the compositor: that time counts for nothing and starts the stuck time over.
+#[test]
+fn time_while_the_window_is_hidden_does_not_count() {
+    let mut w = Watch::default();
+    assert!(run(&mut w, sample(1, false, 0, true), 600 * TICKS_PER_S).is_empty());
+    assert!(run(&mut w, sample(1, false, 0, false), 50 * TICKS_PER_S).iter().all(|(_, v)| *v == Verdict::Late));
+    assert!(run(&mut w, sample(1, false, 0, true), 10 * TICKS_PER_S).is_empty());
+    assert!(run(&mut w, sample(1, false, 0, false), 59 * TICKS_PER_S).is_empty());
+    assert_eq!(run(&mut w, sample(1, false, 0, false), TICKS_PER_S), [(TICKS_PER_S, Verdict::Hung)]);
+}
+
+#[test]
+fn a_hung_adapter_is_left_out_once() {
+    let skip = vec!["Dx12:10de:28a0".to_string()];
+    assert_eq!(restart_without(true, 1, Some("Dx12:10de:28a0"), &skip), None);
+    assert_eq!(restart_without(true, 1, Some("Dx12:8086:a7a8"), &skip), Some("Dx12:8086:a7a8"));
+}
+
+/// Windows, a hardware DX12 adapter failing: the software renderer (WARP) is passed over while
+/// another backend is left, the restarts go through OpenGL and Vulkan, and only then back to
+/// every backend with software allowed. The chain ends.
+#[test]
+fn software_renderers_come_after_every_backends_hardware() {
+    use backend::Backend as B;
+    let c = ryzen_desktop();
+    let order = adapter_order(&c, PowerPreference::LowPower, &[], None, &[]);
+    assert_eq!(without_software(order.clone(), &c, false), (order.clone(), false));
+    let (hardware, dropped) = without_software(order, &c, true);
+    assert!(dropped && !hardware.contains(&4), "{hardware:?}");
+
+    let dx12 = "Dx12:10de:2204".to_string();
+    // The adapter that failed first.
+    let (skip, _) = next_start(&[], Some(&dx12), Some((B::Dx12, Some(B::Gl))), true).unwrap();
+    assert_eq!(skip, [dx12.as_str()]);
+    // Only WARP left on DX12 (passed over, nothing picked): OpenGL next.
+    let (skip, what) = next_start(&skip, None, Some((B::Dx12, Some(B::Gl))), true).unwrap();
+    assert_eq!(skip, [dx12.as_str(), "Dx12", SOFTWARE_LEFT]);
+    assert!(what.contains("OpenGL"), "{what}");
+    // OpenGL has no adapter, Vulkan next; then Vulkan has none and no backend is left.
+    let (skip, _) = next_start(&skip, None, Some((B::Gl, Some(B::Vulkan))), false).unwrap();
+    assert_eq!(skip, [dx12.as_str(), "Dx12", SOFTWARE_LEFT, "Gl"]);
+    let (skip, what) = next_start(&skip, None, Some((B::Vulkan, None)), false).unwrap();
+    assert_eq!(skip, [dx12.as_str(), SOFTWARE], "{what}");
+    assert!(backend::skipped_backends(&skip).is_empty());
+    // With software allowed and nothing left: the end.
+    assert_eq!(next_start(&skip, None, Some((B::Dx12, None)), false), None);
+    // Nothing was passed over (a Mac whose GPUs all failed): no software round.
+    assert_eq!(next_start(&[], None, Some((B::Metal, None)), false), None);
+    // Without the backend fallback (`WGPU_BACKEND`), only adapters.
+    assert_eq!(next_start(&[], None, None, false), None);
+}
+
+/// The skip list travels as an argument, which processes the app starts don't inherit.
+#[test]
+fn the_skip_list_is_an_argument() {
+    assert_eq!(skip_arg("--gpu-skip=Dx12:10de:2204,Dx12"), Some(vec!["Dx12:10de:2204".to_string(), "Dx12".to_string()]));
+    assert_eq!(skip_arg("--gpu-skip="), Some(vec![]));
+    assert_eq!(skip_arg("--gpu-skip"), None);
+    assert_eq!(skip_arg("layout.designcraft"), None);
+}
+
+#[test]
+fn a_restart_tries_the_next_adapter() {
+    let c = wayland_desktop();
+    let mut skip = vec![];
+    let mut tried = vec![];
+    while let Some(&i) = adapter_order(&c, PowerPreference::LowPower, &[], None, &skip).first() {
+        tried.push(c[i].name.clone());
+        skip.push(c[i].key.clone());
+    }
+    assert_eq!(
+        tried,
+        [
+            "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)",
+            "NVIDIA GeForce RTX 5070",
+            "NVIDIA GeForce RTX 5070/PCIe/SSE2",
+            "llvmpipe (LLVM 20.1.8, 256 bits)"
+        ]
+    );
+}
+
+#[test]
+fn adapters_that_cannot_present_to_the_window_are_never_tried() {
+    let mut c = wayland_desktop();
+    c[0].presents = false;
+    c[3].presents = false;
+    for power in [PowerPreference::None, PowerPreference::LowPower, PowerPreference::HighPerformance] {
+        let order = adapter_order(&c, power, &[], None, &[]);
+        assert!(!order.contains(&0) && !order.contains(&3), "{power:?}: {order:?}");
+        assert_eq!(order.len(), 2);
+    }
+    for p in &mut c {
+        p.presents = false;
+    }
+    assert!(adapter_order(&c, PowerPreference::None, &[], None, &[]).is_empty());
+    assert!(adapter_order(&[], PowerPreference::HighPerformance, &[], None, &[]).is_empty());
+}
+
+#[test]
+fn wgpu_adapter_name_picks_an_adapter_first_and_the_rest_stay_as_fallbacks() {
+    let c = wayland_desktop();
+    let order = adapter_order(&c, PowerPreference::HighPerformance, &[], Some("radv"), &[]);
+    assert_eq!(c[order[0]].name, "AMD Ryzen 9 7900X (RADV RAPHAEL_MENDOCINO)");
+    assert_eq!(order.len(), 4);
+    // Any case; every match comes before the rest, natively first.
+    let order = adapter_order(&c, PowerPreference::LowPower, &[], Some("GeForce"), &[]);
+    assert_eq!(names(&c, &order[..2]), ["NVIDIA GeForce RTX 5070", "NVIDIA GeForce RTX 5070/PCIe/SSE2"]);
+    // An empty name or one nothing matches changes nothing.
+    for named in ["", "no such gpu"] {
+        assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[], Some(named), &[]), adapter_order(&c, PowerPreference::LowPower, &[], None, &[]));
+    }
+    // A named adapter that failed is left out like any other.
+    let skip = vec![c[1].key.clone()];
+    assert_eq!(adapter_order(&c, PowerPreference::None, &[], Some("radv"), &skip)[0], 0);
+}
+
+/// A Windows machine lists every GPU twice when Vulkan and DX12 are both in the instance:
+/// power saving still takes the integrated GPU first, each GPU through DX12 first.
+#[test]
+fn hybrid_laptop_on_windows_renders_on_the_integrated_gpu_with_power_saving() {
+    let c = vec![
+        gpu("Intel(R) Arc(TM) A370M", Backend::Vulkan, DeviceType::DiscreteGpu),
+        gpu("Intel(R) Iris(R) Xe Graphics", Backend::Vulkan, DeviceType::IntegratedGpu),
+        gpu("Intel(R) Arc(TM) A370M", Backend::Dx12, DeviceType::DiscreteGpu),
+        gpu("Intel(R) Iris(R) Xe Graphics", Backend::Dx12, DeviceType::IntegratedGpu),
+        gpu("Microsoft Basic Render Driver", Backend::Dx12, DeviceType::Cpu),
+    ];
+    let order = adapter_order(&c, PowerPreference::LowPower, &[], None, &[]);
+    assert_eq!(order, [3, 1, 2, 0, 4]);
+    assert_eq!(adapter_order(&c, PowerPreference::HighPerformance, &[], None, &[]), [2, 0, 3, 1, 4]);
+}
+
+/// One Intel GPU whose Vulkan driver made the window flicker black: DX12 comes first whatever
+/// the preference; Vulkan stays a fallback, and `WGPU_ADAPTER_NAME` or a restart leaving DX12
+/// out still reach it.
+#[test]
+fn a_windows_gpu_renders_through_dx12_before_vulkan() {
+    let c = vec![
+        gpu("Intel(R) Graphics", Backend::Vulkan, DeviceType::IntegratedGpu),
+        gpu("Intel(R) Graphics", Backend::Dx12, DeviceType::IntegratedGpu),
+        gpu("Microsoft Basic Render Driver", Backend::Dx12, DeviceType::Cpu),
+        gpu("Intel(R) Graphics", Backend::Gl, DeviceType::Other),
+    ];
+    for power in [PowerPreference::LowPower, PowerPreference::HighPerformance, PowerPreference::None] {
+        assert_eq!(adapter_order(&c, power, &[], None, &[]), [1, 0, 3, 2], "{power:?}");
+    }
+    assert_eq!(adapter_order(&c, PowerPreference::LowPower, &[], None, &[c[1].key.clone()]), [0, 3, 2], "DX12 failed: Vulkan next");
+}
+
+#[test]
+fn power_preference_follows_the_environment() {
+    assert_eq!(power_preference(None), AUTOMATIC);
+    for p in [PowerPreference::LowPower, PowerPreference::HighPerformance, PowerPreference::None] {
+        assert_eq!(power_preference(Some(p)), p);
+    }
+    assert_eq!(AUTOMATIC, if cfg!(any(windows, target_os = "macos")) { PowerPreference::LowPower } else { PowerPreference::None });
+}
+
+/// The Intel Mac of #334 lost its Metal device compiling the compute shader of wgpu's indirect
+/// call check: off unless `WGPU_VALIDATION_INDIRECT_CALL` turns it on.
+#[test]
+fn the_indirect_call_check_is_off() {
+    if std::env::var_os("WGPU_VALIDATION_INDIRECT_CALL").is_none() {
+        assert!(!instance_flags().contains(wgpu::InstanceFlags::VALIDATION_INDIRECT_CALL));
+    }
+    // The other flags of the build stay as wgpu sets them.
+    let others = wgpu::InstanceFlags::from_build_config() - wgpu::InstanceFlags::VALIDATION_INDIRECT_CALL;
+    if std::env::vars_os().all(|(k, _)| !k.to_string_lossy().starts_with("WGPU_")) {
+        assert_eq!(instance_flags(), others);
+    }
+}
+
+#[test]
+fn skipped_adapters_parse_from_a_comma_separated_list() {
+    assert_eq!(parse_skip("Vulkan:1002:164e, Gl:10de:2f04,,"), ["Vulkan:1002:164e", "Gl:10de:2f04"]);
+    assert!(parse_skip("").is_empty());
+    assert_eq!(key(Backend::Vulkan, 0x1002, 0x164e, "AMD Radeon"), "Vulkan:1002:164e");
+    assert_eq!(key(Backend::Gl, 0x10de, 0x2f04, "NVIDIA"), "Gl:10de:2f04");
+    // A whole backend left out is its bare name; it never matches an adapter's key.
+    let skip = parse_skip("Dx12,Dx12:10de:2204");
+    assert_eq!(backend::skipped_backends(&skip), [backend::Backend::Dx12]);
+    let c = vec![pci_gpu("NVIDIA GeForce RTX 3090", Backend::Dx12, DeviceType::DiscreteGpu, NVIDIA_3090)];
+    assert!(adapter_order(&c, PowerPreference::None, &[], None, &skip).is_empty());
+    assert_eq!(adapter_order(&c, PowerPreference::None, &[], None, &skip[..1]), [0]);
+}
+
+#[test]
+fn panics_in_wgpu_egui_wgpu_and_naga_are_graphics_failures() {
+    for file in [
+        "/home/u/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/egui-wgpu-0.36.2/src/winit.rs",
+        r"C:\Users\u\.cargo\registry\src\index.crates.io-1949cf8c6b5b557f\wgpu-core-30.0.1\src\device\mod.rs",
+        "/rustc/deps/wgpu-hal-30.0.1/src/vulkan/adapter.rs",
+        "naga-30.0.0/src/back/spv/writer.rs",
+    ] {
+        assert!(in_graphics_stack(file), "{file}");
+    }
+    for file in
+        ["apps/designcraft/src/main.rs", "/home/wgpu/designcraft/crates/ui-egui/src/lib.rs", "egui-0.36.2/src/context.rs", "winit-0.30.12/src/x.rs"]
+    {
+        assert!(!in_graphics_stack(file), "{file}");
+    }
+}
+
+#[test]
+fn only_a_graphics_failure_while_starting_up_restarts_without_the_adapter() {
+    let amd = Some("Vulkan:1002:164e");
+    assert_eq!(restart_without(true, 0, amd, &[]), amd);
+    assert_eq!(restart_without(true, STARTUP_FRAMES - 1, amd, &[]), amd);
+    // After start-up the adapter has shown frames; a lost window is something else.
+    assert_eq!(restart_without(true, STARTUP_FRAMES, amd, &[]), None);
+    // A bug outside the graphics, or no adapter picked: nothing another adapter would change.
+    assert_eq!(restart_without(false, 0, amd, &[]), None);
+    assert_eq!(restart_without(true, 0, None, &[]), None);
+    // Never the same adapter twice, so restarts end.
+    assert_eq!(restart_without(true, 0, amd, &["Vulkan:1002:164e".into()]), None);
+}
+
+/// Without a backend fallback (`WGPU_BACKEND` set), a start whose graphics failed with no
+/// adapter to leave out ends with the error and the hint; a bug ends with its message.
+#[test]
+fn a_normal_exit_or_another_failure_does_not_restart() {
+    let startup = Startup::new(None, Vec::new());
+    assert_eq!(finish(Ok(Ok(())), &startup), Ok(()));
+    // No adapter was picked (none can show the window): the error is returned, nothing restarts.
+    let none = eframe::Error::Wgpu(eframe::egui_wgpu::WgpuError::CustomNativeAdapterSelectionError("no graphics adapter can show the window".into()));
+    assert_eq!(
+        finish(Ok(Err(none)), &startup),
+        Err(format!("WGPU error: Adapter selection failed: no graphics adapter can show the window ({HELP})"))
+    );
+    let _ = startup.adapter.set("Vulkan:1002:164e".into());
+    GRAPHICS_PANIC.store(false, Ordering::Relaxed);
+    assert_eq!(finish(Err("a bug".into()), &startup), Err("a bug".into()));
+    // Nothing to record without a fallback.
+    startup.presented();
+    startup.started_with(wgpu::Backend::Gl);
+    assert_eq!(startup.status_line(), None);
+}
diff --git a/apps/designcraft/src/mac_window.rs b/apps/designcraft/src/mac_window.rs
deleted file mode 100644
index b7fd267f1..000000000
--- a/apps/designcraft/src/mac_window.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-//! macOS: AppKit moves the window when a drag starts anywhere in the title-bar band, on the
-//! application bar's controls too. The window is made unmovable while the pointer is on one of
-//! them (`designcraft_ui_egui::title_bar::window_movable`), so only the bar's empty space moves it.
-
-use objc2::MainThreadMarker;
-use objc2_app_kit::{NSApplication, NSWindowStyleMask};
-
-/// Sets the window's `movable` flag from this frame's title bar. `applied` holds the value last
-/// set, so AppKit is only called when it changes.
-pub fn sync_movable(ctx: &egui::Context, applied: &mut Option<bool>) {
-    let movable = designcraft_ui_egui::title_bar::window_movable(ctx);
-    if *applied == Some(movable) {
-        return;
-    }
-    // eframe runs the app on the main thread; anywhere else AppKit is out of reach.
-    let Some(mtm) = MainThreadMarker::new() else {
-        return;
-    };
-    let mut found = false;
-    for window in NSApplication::sharedApplication(mtm).windows().to_vec() {
-        // The main window is the only one with a full-size content view.
-        if window.styleMask().contains(NSWindowStyleMask::FullSizeContentView) {
-            window.setMovable(movable);
-            found = true;
-        }
-    }
-    // Before the window is on screen there is nothing to set yet; try again next frame.
-    if found {
-        *applied = Some(movable);
-    }
-}
diff --git a/apps/designcraft/src/main.rs b/apps/designcraft/src/main.rs
index 195a2dc6e..5f056aab3 100644
--- a/apps/designcraft/src/main.rs
+++ b/apps/designcraft/src/main.rs
@@ -20,8 +20,6 @@ mod gpu;
 mod gpu_limits;
 mod logging;
 #[cfg(target_os = "macos")]
-mod mac_window;
-#[cfg(target_os = "macos")]
 mod native_menu;
 mod profile;
 
@@ -37,7 +35,7 @@ struct App {
     /// Documents and quit requests from Finder, the Dock and Open With.
     #[cfg(target_os = "macos")]
     apple_events: fmv_macos_events::Inbox,
-    /// The window's `movable` flag as last set; see `mac_window`.
+    /// The window's `movable` flag as last set; see `craft_window::title_bar`.
     #[cfg(target_os = "macos")]
     movable: Option<bool>,
     /// Frames begun so far.
@@ -51,39 +49,45 @@ struct App {
 impl eframe::App for App {
     fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         self.startup.enter();
-        if let Some(note) = self.startup.take_notice() {
-            self.app.status(note);
-        }
-        // The third call: two frames went through `ui`, so the first was presented and the driver
-        // survived it (a fault at the first present is what the fallback in `gpu` is for).
-        if self.frames == 2 {
-            self.startup.presented();
-        }
-        self.frames = self.frames.saturating_add(1);
-        if u64::from(self.frames) >= gpu::STARTUP_FRAMES
-            && let Some(device) = self.log_errors_after_startup.take()
-        {
-            gpu_limits::log_uncaptured_errors(&device);
-        }
-        #[cfg(target_os = "macos")]
-        {
-            if self.menu.is_none() && std::env::var_os("DESIGNCRAFT_NO_NATIVE_MENU").is_none() {
-                self.menu = Some(native_menu::NativeMenu::install(&mut self.app, ctx));
-            }
-            if let Some(m) = &mut self.menu {
-                m.poll(&mut self.app, ctx);
-            }
-            // Noted for a start again after a graphics failure, which reopens them (`gpu::restart`).
-            self.startup.opening(apple_events::poll(&self.apple_events, &mut self.app, ctx));
-        }
+        // Queue/deadline work only. A hidden `run_logic` tick also reports pass index zero, so
+        // startup counters and native-menu polling must not live here.
         self.app.logic(ctx);
         self.startup.leave();
     }
-    fn raw_input_hook(&mut self, _ctx: &egui::Context, raw: &mut egui::RawInput) {
-        self.app.raw_input_hook(raw);
+    fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
+        self.app.raw_input_hook(ctx, raw);
     }
-    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
         self.startup.enter();
+        // `App::ui` is the only signal that a real layout pass ran. A discarded multipass first
+        // pass reports index 0 once, so these once-per-frame counters/menu polls still run once.
+        if ui.ctx().current_pass_index() == 0 {
+            if let Some(note) = self.startup.take_notice() {
+                self.app.status(note);
+            }
+            // The third UI callback: two frames went through `ui`, so the first was presented and
+            // the driver survived it (a fault at the first present is what `gpu` falls back for).
+            if self.frames == 2 {
+                self.startup.presented();
+            }
+            self.frames = self.frames.saturating_add(1);
+            if u64::from(self.frames) >= gpu::STARTUP_FRAMES
+                && let Some(device) = self.log_errors_after_startup.take()
+            {
+                gpu_limits::log_uncaptured_errors(&device);
+            }
+            #[cfg(target_os = "macos")]
+            {
+                if self.menu.is_none() && std::env::var_os("DESIGNCRAFT_NO_NATIVE_MENU").is_none() {
+                    self.menu = Some(native_menu::NativeMenu::install(&mut self.app, ui.ctx()));
+                }
+                if let Some(m) = &mut self.menu {
+                    m.poll(&mut self.app, ui.ctx());
+                }
+                // Noted for a start again after a graphics failure, which reopens them (`gpu::restart`).
+                self.startup.opening(apple_events::poll(&self.apple_events, &mut self.app, ui.ctx()));
+            }
+        }
         self.app.ui(ui);
         self.startup.leave();
         #[cfg(target_os = "macos")]
@@ -91,7 +95,10 @@ impl eframe::App for App {
             discard_marked_text();
         }
         #[cfg(target_os = "macos")]
-        mac_window::sync_movable(ui.ctx(), &mut self.movable);
+        craft_window::title_bar::sync_movable(ui.ctx(), &mut self.movable);
+        // After the frame, never inside it: the dialog answers on a later frame. On macOS Save and
+        // message boxes are sheets on this window.
+        self.app.show_file_dialogs(Some(&*frame));
     }
     fn on_exit(&mut self) {
         // A normal exit before the third frame is not a crash.
@@ -143,15 +150,48 @@ fn prefs_path() -> Option<std::path::PathBuf> {
     profile::config_dir().map(|b| b.join("ui.json"))
 }
 
+/// Set when `ui.json` could not be read in full and no copy of it could be kept: the file is
+/// then left as it is rather than overwritten.
+static KEEP_UI_PREFS: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
+
+/// Copy an unreadable (or partly unreadable) `ui.json` beside it, as `ui.unreadable.json` or the
+/// first free `ui.unreadable-N.json`, before the next save replaces it. A newer DesignCraft may
+/// have written it.
+fn keep_unreadable_prefs(path: &std::path::Path, bytes: &[u8]) {
+    use std::io::Write as _;
+    for n in 1..100u32 {
+        let name = if n == 1 { "ui.unreadable.json".to_string() } else { format!("ui.unreadable-{n}.json") };
+        match std::fs::OpenOptions::new().write(true).create_new(true).open(path.with_file_name(name)) {
+            Ok(mut file) => {
+                if file.write_all(bytes).is_ok() {
+                    return;
+                }
+                break;
+            }
+            Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => {}
+            Err(_) => break,
+        }
+    }
+    KEEP_UI_PREFS.store(true, std::sync::atomic::Ordering::Relaxed);
+}
+
 fn load_prefs(app: &mut DesignApp) {
     if no_prefs() {
         return;
     }
     if let Some(p) = prefs_path()
         && let Ok(bytes) = std::fs::read(&p)
-        && let Ok(ui) = designcraft_ui_egui::UiState::from_preferences_json(&bytes)
     {
-        app.ui = ui;
+        match designcraft_ui_egui::UiState::read_preferences(&bytes) {
+            Ok(read) => {
+                app.ui = read.ui;
+                if !read.intact {
+                    keep_unreadable_prefs(&p, &bytes);
+                }
+            }
+            Err(_) => keep_unreadable_prefs(&p, &bytes),
+        }
+        app.sync_keymap();
     }
     // Engine preferences (Preferences dialog, favourites…) live beside the UI state.
     if let Some(p) = prefs_path().map(|p| p.with_file_name("prefs.json"))
@@ -168,7 +208,9 @@ fn save_prefs(app: &DesignApp) {
     }
     if let Some(p) = prefs_path() {
         let _ = std::fs::create_dir_all(p.parent().unwrap_or(std::path::Path::new(".")));
-        if let Ok(bytes) = serde_json::to_vec_pretty(&app.ui) {
+        if !KEEP_UI_PREFS.load(std::sync::atomic::Ordering::Relaxed)
+            && let Ok(bytes) = serde_json::to_vec_pretty(&app.ui)
+        {
             let _ = std::fs::write(&p, bytes);
         }
         if let Ok(bytes) = serde_json::to_vec_pretty(&app.session.prefs) {
@@ -177,157 +219,8 @@ fn save_prefs(app: &DesignApp) {
     }
 }
 
-/// One file-type row in an open dialog. `open_filters` is what `pick_open` applies.
-struct OpenFilter {
-    name: &'static str,
-    extensions: &'static [&'static str],
-}
-
-fn open_filters(purpose: &str) -> &'static [OpenFilter] {
-    match purpose {
-        "swatches" => &[OpenFilter { name: "Swatch Exchange (ASE)", extensions: &["ase"] }],
-        "script" => &[OpenFilter { name: "Script", extensions: &["dcscript", "txt", "json"] }],
-        "shortcuts" => &[OpenFilter { name: "Shortcut set (text)", extensions: &["txt"] }],
-        "icc" => &[OpenFilter { name: "ICC profile", extensions: &["icc", "icm"] }],
-        "book" => &[OpenFilter { name: "Book", extensions: &["dcbook"] }],
-        "xml" => &[OpenFilter { name: "XML", extensions: &["xml"] }],
-        "library" => &[OpenFilter { name: "Object Library", extensions: &["dclib"] }],
-        "relink" => &[OpenFilter {
-            name: "Graphics",
-            extensions: &["png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "psd", "svg", "pdf", "ai", "eps"],
-        }],
-        "dataMerge" => &[OpenFilter { name: "Data source (CSV, TSV, text, Excel)", extensions: &["csv", "tsv", "tab", "txt", "xlsx"] }],
-        "place" => &[
-            OpenFilter {
-                name: "Graphics and text",
-                extensions: &[
-                    "png",
-                    "jpg",
-                    "jpeg",
-                    "gif",
-                    "webp",
-                    "tif",
-                    "tiff",
-                    "bmp",
-                    "psd",
-                    "svg",
-                    "pdf",
-                    "ai",
-                    "eps",
-                    "txt",
-                    "docx",
-                    "rtf",
-                    "md",
-                    "xlsx",
-                    "idml",
-                    "designcraft",
-                    "mp4",
-                    "m4v",
-                    "mov",
-                    "webm",
-                    "mp3",
-                    "m4a",
-                    "wav",
-                    "ogg",
-                ],
-            },
-            OpenFilter {
-                name: "Graphics",
-                extensions: &["png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "psd", "svg", "pdf", "ai", "eps"],
-            },
-            OpenFilter { name: "Text (Word, RTF, plain, Excel)", extensions: &["docx", "rtf", "txt", "md", "xlsx"] },
-            OpenFilter { name: "Video and sound", extensions: &["mp4", "m4v", "mov", "webm", "mp3", "m4a", "wav", "ogg"] },
-        ],
-        _ => &[
-            OpenFilter { name: "DesignCraft, IDML or InDesign", extensions: &["designcraft", "idml", "indd", "indt"] },
-            OpenFilter { name: "DesignCraft", extensions: &["designcraft"] },
-            OpenFilter { name: "InDesign Markup (IDML)", extensions: &["idml"] },
-            OpenFilter { name: "InDesign document or template (INDD, INDT)", extensions: &["indd", "indt"] },
-            // Files saved without an extension; `file.open` tells the formats apart by content.
-            OpenFilter { name: "All files", extensions: &[ALL_FILES] },
-        ],
-    }
-}
-
-/// The "All files" pattern. The macOS panel merges every filter into one list of allowed types,
-/// which takes type identifiers as well as extensions: `public.data` admits any file.
-const ALL_FILES: &str = if cfg!(target_os = "macos") { "public.data" } else { "*" };
-
-/// The extension of the file name a save dialog suggests (`Brochure.designcraft`), if it has one.
-/// The dialog filters on it, so the macOS and Windows dialogs add it to a name typed without it.
-fn suggested_extension(name: &str) -> Option<&str> {
-    std::path::Path::new(name).extension().and_then(std::ffi::OsStr::to_str).filter(|e| !e.is_empty() && !e.contains(char::is_whitespace))
-}
-
-/// The file a save dialog's answer writes: `picked` with the suggested extension added when it has
-/// none (Linux dialogs don't add it). A document always ends in `.designcraft`, as `file.save`
-/// writes it.
-fn picked_save_path(picked: std::path::PathBuf, ext: Option<&str>) -> std::path::PathBuf {
-    let Some(ext) = ext else { return picked };
-    if ext.eq_ignore_ascii_case("designcraft") {
-        let p = picked.to_string_lossy();
-        return designcraft_engine::cmd::with_document_extension(&p).into();
-    }
-    if picked.extension().is_some() || picked.file_name().is_none() {
-        return picked;
-    }
-    let mut s = picked.into_os_string();
-    s.push(".");
-    s.push(ext);
-    s.into()
-}
-
-/// The folder a save dialog starts in and the name it suggests. A suggestion with a folder in
-/// front (the document's, or the last one used) starts there while that folder still exists;
-/// otherwise the system picks, as it did before.
-fn save_dialog_start(suggested: &str) -> (Option<std::path::PathBuf>, String) {
-    let path = std::path::Path::new(suggested);
-    let name = path.file_name().map_or_else(|| suggested.to_string(), |n| n.to_string_lossy().to_string());
-    let folder = path.parent().filter(|f| !f.as_os_str().is_empty() && f.is_dir()).map(std::path::Path::to_path_buf);
-    (folder, name)
-}
-
-/// The save dialog: the suggested name's extension as its filter, and the extension added to a
-/// name typed without it. Adding it names another file than the one the dialog checked, so
-/// replacing an existing one asks again.
-fn pick_save(suggested: &str) -> Option<String> {
-    let (folder, name) = save_dialog_start(suggested);
-    let name = name.as_str();
-    let ext = suggested_extension(name);
-    let mut dialog = rfd::FileDialog::new().set_file_name(name);
-    if let Some(folder) = folder {
-        dialog = dialog.set_directory(folder);
-    }
-    if let Some(ext) = ext {
-        dialog = dialog.add_filter(ext.to_ascii_uppercase(), &[ext]);
-    }
-    let picked = dialog.save_file()?;
-    let path = picked_save_path(picked.clone(), ext);
-    if path != picked && path.exists() {
-        let file = path.file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_default();
-        let answer = rfd::MessageDialog::new()
-            .set_level(rfd::MessageLevel::Warning)
-            .set_title("Replace File?")
-            .set_description(format!("“{file}” already exists. Do you want to replace it?"))
-            .set_buttons(rfd::MessageButtons::YesNo)
-            .show();
-        if answer != rfd::MessageDialogResult::Yes {
-            return None;
-        }
-    }
-    Some(path.to_string_lossy().to_string())
-}
-
 fn services() -> Services {
     Services {
-        pick_open: Some(Box::new(|purpose: &str| {
-            let mut dialog = rfd::FileDialog::new();
-            for filter in open_filters(purpose) {
-                dialog = dialog.add_filter(filter.name, filter.extensions);
-            }
-            dialog.pick_file().map(|p| p.to_string_lossy().to_string())
-        })),
-        pick_save: Some(Box::new(pick_save)),
         read: Some(Box::new(|p: &str| std::fs::read(p).map_err(|e| e.to_string()))),
         write: Some(Box::new(|p: &str, b: &[u8]| designcraft_engine::atomic::write_atomic(std::path::Path::new(p), b).map_err(|e| e.to_string()))),
         clipboard_text: Some(Box::new(|| arboard::Clipboard::new().and_then(|mut c| c.get_text()).ok())),
@@ -360,6 +253,11 @@ fn control_port_from(source: &str, value: Option<String>) -> Option<u16> {
 }
 
 fn main() -> std::process::ExitCode {
+    // Windows: the update helper is a copy of this program started with `--finish-update`.
+    #[cfg(windows)]
+    if let Some(result) = craft_update::self_update::finish(&craft_update::suite::DESIGNCRAFT, &std::env::args_os().skip(1).collect::<Vec<_>>()) {
+        std::process::exit(i32::from(result.is_err()));
+    }
     // First, so every start-up record (and the engine's panic hook, installed with the first
     // Session) is captured; see `logging`.
     let logger = logging::install();
@@ -407,6 +305,9 @@ fn main() -> std::process::ExitCode {
             .with_fullsize_content_view(true)
             .with_titlebar_shown(false)
             .with_title_shown(false),
+        // DesignCraft's own FontDb supplies script-specific system fallbacks; egui's system-font
+        // provider would put its discovery ahead of that order and change line metrics.
+        system_font_fallback: false,
         ..Default::default()
     };
     options.viewport = options.viewport.with_app_id(APP_ID);
@@ -512,6 +413,7 @@ fn main() -> std::process::ExitCode {
                 session.recovery_dir = profile::recovery_dir();
                 let recovered = session.execute("file.recovery.open", &serde_json::json!({})).ok();
                 let mut app = DesignApp::new(session, services());
+                app.set_startup_update_check(true);
                 if let Some(line) = restarted.or_else(|| created.status_line()) {
                     app.status(line);
                 }
@@ -573,13 +475,19 @@ fn main() -> std::process::ExitCode {
 #[cfg(test)]
 mod tests {
     #[test]
-    fn relink_open_dialog_lists_graphics() {
-        let filters = super::open_filters("relink");
-        let exts: Vec<&str> = filters.iter().flat_map(|filter| filter.extensions.iter().copied()).collect();
-        for ext in ["png", "jpg", "tif", "psd", "svg", "pdf", "ai", "eps"] {
-            assert!(exts.contains(&ext), "{ext} is missing from the relink dialog: {exts:?}");
-        }
-        assert!(!exts.contains(&"designcraft") && !exts.contains(&"idml"));
+    fn an_unreadable_ui_json_is_kept_beside_it() {
+        let stamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+        let dir = std::env::temp_dir().join(format!("designcraft-ui-prefs-{}-{stamp}", std::process::id()));
+        std::fs::create_dir(&dir).unwrap();
+        let path = dir.join("ui.json");
+        super::keep_unreadable_prefs(&path, b"{\"docking\": {\"root\": {\"FutureLayout\": {}}}}");
+        super::keep_unreadable_prefs(&path, b"not json");
+        let first = std::fs::read(dir.join("ui.unreadable.json")).unwrap();
+        let second = std::fs::read(dir.join("ui.unreadable-2.json")).unwrap();
+        let _ = std::fs::remove_dir_all(&dir);
+        assert!(first.starts_with(b"{\"docking\""), "the first copy is not replaced");
+        assert_eq!(second, b"not json");
+        assert!(!super::KEEP_UI_PREFS.load(std::sync::atomic::Ordering::Relaxed), "ui.json can be saved once a copy is kept");
     }
 
     #[test]
@@ -591,47 +499,6 @@ mod tests {
             assert_eq!(super::control_port_from("--control", Some(bad.into())), None, "{bad:?}");
         }
     }
-
-    #[test]
-    fn data_merge_open_dialog_lists_table_extensions() {
-        let filters = super::open_filters("dataMerge");
-        let exts: Vec<&str> = filters.iter().flat_map(|filter| filter.extensions.iter().copied()).collect();
-        for ext in ["csv", "tsv", "tab", "txt", "xlsx"] {
-            assert!(exts.contains(&ext), "{ext} is missing from the dataMerge dialog: {exts:?}");
-        }
-        assert!(!exts.iter().any(|ext| *ext == "designcraft" || *ext == "idml"), "dataMerge must not fall through to the document filters: {exts:?}");
-        let place = super::open_filters("place");
-        assert!(place.len() > 1, "the place dialog keeps a filter for each kind of file");
-        assert!(place.iter().any(|filter| filter.extensions.contains(&"png")));
-        let documents = super::open_filters("");
-        for ext in ["designcraft", "idml", "indd", "indt"] {
-            assert!(documents.first().is_some_and(|filter| filter.extensions.contains(&ext)), "{ext} is missing from the first Open filter");
-        }
-        assert!(documents.last().is_some_and(|filter| filter.extensions == [super::ALL_FILES]), "files without an extension can be picked");
-    }
-
-    #[test]
-    fn save_dialog_answers_get_the_suggested_extension() {
-        use std::path::PathBuf;
-        let save = |picked: &str, name: &str| super::picked_save_path(PathBuf::from(picked), super::suggested_extension(name));
-        assert_eq!(save("/d/Brochure", "Untitled.designcraft"), PathBuf::from("/d/Brochure.designcraft"));
-        assert_eq!(save("/d/Brochure.idml", "Untitled.designcraft"), PathBuf::from("/d/Brochure.idml.designcraft"));
-        assert_eq!(save("/d/Brochure.designcraft", "Untitled.designcraft"), PathBuf::from("/d/Brochure.designcraft"));
-        assert_eq!(save("/d/Brochure", "Untitled.pdf"), PathBuf::from("/d/Brochure.pdf"));
-        assert_eq!(save("/d/Brochure.txt", "Untitled.rtf"), PathBuf::from("/d/Brochure.txt"), "another export format is kept");
-        assert_eq!(save("/d/Package", "Untitled 1.2 Folder"), PathBuf::from("/d/Package"), "a folder has no extension");
-    }
-
-    /// #1653: the save dialog opens in the folder the suggestion names, unless it is gone.
-    #[test]
-    fn save_dialog_starts_in_the_suggested_folder_while_it_exists() {
-        let folder = std::env::temp_dir();
-        let suggested = folder.join("Brochure.pdf");
-        assert_eq!(super::save_dialog_start(&suggested.to_string_lossy()), (Some(folder.clone()), "Brochure.pdf".to_string()));
-        let gone = folder.join(format!("designcraft-gone-{}", std::process::id())).join("Brochure.pdf");
-        assert_eq!(super::save_dialog_start(&gone.to_string_lossy()), (None, "Brochure.pdf".to_string()), "a folder deleted since: the system's own");
-        assert_eq!(super::save_dialog_start("Untitled 1.2 Folder"), (None, "Untitled 1.2 Folder".to_string()), "a bare name: the system's own");
-    }
 }
 
 #[cfg(all(test, unix))]
diff --git a/apps/designcraft/src/native_menu.rs b/apps/designcraft/src/native_menu.rs
index 1ac9437d1..e127776ba 100644
--- a/apps/designcraft/src/native_menu.rs
+++ b/apps/designcraft/src/native_menu.rs
@@ -22,9 +22,10 @@ pub struct NativeMenu {
     items: HashMap<String, (String, Value, Handle)>,
     events: Receiver<MenuEvent>,
     last_refresh: f64,
-    /// The interface language the titles are in and whether CJK features are shown: the menu is
-    /// rebuilt when either changes.
-    shown_for: (String, bool),
+    /// The interface language the titles are in, whether CJK features are shown and whether the
+    /// Keyboard Shortcuts dialog records keys (the menu then has no key equivalents, so the keys
+    /// reach the dialog): the menu is rebuilt when any of them changes.
+    shown_for: (String, bool, bool),
     /// File › Open Recent, rebuilt when the list of recent files changes.
     recent: Option<RecentMenu>,
     /// The commands with key equivalents and the shortcut each was given: the menu is rebuilt
@@ -65,10 +66,11 @@ impl NativeMenu {
         // muda keeps the first handler for the life of the process, so this channel serves every
         // menu bar built later (`build_bar`).
         let (tx, events) = channel();
-        let repaint = ctx.clone();
+        let notify = app.native_action_notifier(ctx.clone());
         MenuEvent::set_event_handler(Some(move |e: MenuEvent| {
-            let _ = tx.send(e);
-            repaint.request_repaint();
+            if tx.send(e).is_ok() {
+                notify();
+            }
         }));
         Self::build_bar(app, events)
     }
@@ -85,7 +87,7 @@ impl NativeMenu {
         for entry in menus::MAC_APP_MENU {
             let _ = match *entry {
                 AppMenuItem::Cmd { id, label, command } => {
-                    let sc = shortcut(app, command).as_deref().and_then(accel);
+                    let sc = shortcut(app, command).filter(|_| !app.shortcut_recording()).as_deref().and_then(accel);
                     let item = MenuItem::with_id(id, menu_title(app, label), true, sc);
                     let appended = app_menu.append(&item);
                     items.insert(id.into(), (command.into(), Value::Null, Handle::Plain(item)));
@@ -120,14 +122,18 @@ impl NativeMenu {
         app.native_menu = true;
         let keys: Vec<(String, Option<String>)> =
             items.values().filter(|(_, p, _)| p.is_null()).map(|(id, _, _)| (id.clone(), shortcut(app, id))).collect();
-        app.native_shortcuts = keys.iter().filter(|(_, sc)| sc.as_deref().and_then(accel).is_some()).map(|(id, _)| id.clone()).collect();
+        let recording = app.shortcut_recording();
+        app.native_shortcuts = keys
+            .iter()
+            .filter_map(|(id, sc)| sc.as_ref().filter(|sc| !recording && accel(sc).is_some()).map(|sc| (id.clone(), sc.clone())))
+            .collect();
         let recent = recent.map(|submenu| RecentMenu { submenu, shown: Vec::new(), ids: Vec::new(), separator: None });
         Self {
             _menu: menu,
             items,
             events,
             last_refresh: 0.0,
-            shown_for: (app.ui.language.clone(), designcraft_ui_egui::cjk_features(app)),
+            shown_for: (app.ui.language.clone(), designcraft_ui_egui::cjk_features(app), app.shortcut_recording()),
             recent,
             keys,
         }
@@ -170,15 +176,22 @@ impl NativeMenu {
     }
 
     pub fn poll(&mut self, app: &mut DesignApp, ctx: &egui::Context) {
-        while let Ok(ev) = self.events.try_recv() {
-            if let Some((cmd, params, _)) = self.items.get(ev.id.as_ref()) {
-                menus::activate_native(app, ctx, &cmd.clone(), &params.clone());
+        app.poll_native_actions(ctx, || {
+            loop {
+                let ev = self.events.try_recv().ok()?;
+                if let Some((cmd, params, _)) = self.items.get(ev.id.as_ref()) {
+                    return Some((cmd.clone(), params.clone()));
+                }
             }
-        }
+        });
         // Interface Language and Show CJK Features (set in Preferences or by `app.language`, or put
         // back by Cancel): the system menu bar follows at once, like the panels (the new menu
-        // replaces the old one as the application's menu before that one is dropped).
-        if app.ui.language != self.shown_for.0 || designcraft_ui_egui::cjk_features(app) != self.shown_for.1 {
+        // replaces the old one as the application's menu before that one is dropped). While the
+        // Keyboard Shortcuts dialog records, the bar has no key equivalents.
+        if app.ui.language != self.shown_for.0
+            || designcraft_ui_egui::cjk_features(app) != self.shown_for.1
+            || app.shortcut_recording() != self.shown_for.2
+        {
             let events = std::mem::replace(&mut self.events, channel().1);
             *self = Self::build_bar(app, events);
         }
@@ -236,7 +249,7 @@ fn build(
             Item::Cmd { label, id, params, .. } => {
                 *counter += 1;
                 let mid = format!("dc{counter}");
-                let sc = if params.is_null() { shortcut(app, id).as_deref().and_then(accel) } else { None };
+                let sc = if params.is_null() && !app.shortcut_recording() { shortcut(app, id).as_deref().and_then(accel) } else { None };
                 let label = menu_title(app, label);
                 let handle = if menus::checked(app, id, params).is_some() {
                     let c = CheckMenuItem::with_id(mid.clone(), label, true, false, sc);
diff --git a/clippy.toml b/clippy.toml
index 4b6c79f55..7b45b7aca 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -2,3 +2,9 @@ allow-unwrap-in-tests = true
 allow-expect-in-tests = true
 allow-panic-in-tests = true
 allow-indexing-slicing-in-tests = true
+disallowed-types = [
+    { path = "egui::ComboBox", reason = "use craft_ui::ComboBox: egui's combo box menu can't grow back while open (egui#5225)" },
+    { path = "rfd::FileDialog", reason = "use DesignApp::ask_open/ask_save (craft-dialogs): a blocking dialog inside the frame aborts the app on macOS" },
+    { path = "rfd::MessageDialog", reason = "use craft-dialogs' ask_message: a blocking dialog inside the frame aborts the app on macOS" },
+]
+cognitive-complexity-threshold = 30
diff --git a/contributors/people.toml b/contributors/people.toml
index 2f44f93d4..79acd86b0 100644
--- a/contributors/people.toml
+++ b/contributors/people.toml
@@ -68,3 +68,6 @@ sync_github_name = false
 
 [people.4waymedia]
 real_name = "Paul Gemignani"
+
+[people.skylartaylor]
+display_name = "skylartaylor"
diff --git a/crates/color/src/cms/mod.rs b/crates/color/src/cms.rs
similarity index 100%
rename from crates/color/src/cms/mod.rs
rename to crates/color/src/cms.rs
diff --git a/crates/color/src/gradient.rs b/crates/color/src/gradient.rs
index 6c19aabb1..6243101ef 100644
--- a/crates/color/src/gradient.rs
+++ b/crates/color/src/gradient.rs
@@ -24,16 +24,29 @@ impl GradientKind {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct GradientStop {
     /// 0..=1 along the gradient.
     pub offset: f32,
+    /// The display color. For a stop with a `swatch`, the swatch's color when it was last
+    /// resolved ([`GradientStop::swatch`]).
     pub color: Color,
     #[serde(default = "one")]
     pub opacity: f32,
     /// Midpoint to the next stop, 0.13..=0.87 (InDesign's diamond), default 0.5.
     #[serde(default = "half")]
     pub midpoint: f32,
+    /// The color swatch the stop takes its ink from: a spot or process color, a tint of one,
+    /// or `[Paper]`. Print export writes the stop in that swatch's inks; `None` is a plain color.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub swatch: Option<String>,
+}
+
+impl GradientStop {
+    /// A plain-color stop, opaque, with the midpoint halfway to the next stop.
+    pub fn new(offset: f32, color: Color) -> Self {
+        Self { offset, color, opacity: 1.0, midpoint: 0.5, swatch: None }
+    }
 }
 
 fn one() -> f32 {
@@ -52,13 +65,7 @@ pub struct Gradient {
 impl Default for Gradient {
     /// InDesign's default "White, Black" gradient.
     fn default() -> Self {
-        Self {
-            kind: GradientKind::Linear,
-            stops: vec![
-                GradientStop { offset: 0.0, color: Color::WHITE, opacity: 1.0, midpoint: 0.5 },
-                GradientStop { offset: 1.0, color: Color::BLACK, opacity: 1.0, midpoint: 0.5 },
-            ],
-        }
+        Self { kind: GradientKind::Linear, stops: vec![GradientStop::new(0.0, Color::WHITE), GradientStop::new(1.0, Color::BLACK)] }
     }
 }
 
@@ -238,6 +245,16 @@ mod tests {
         assert!(matches!(Color::rgb(1.0, 0.0, 0.0).lerp(&Color::cmyk(1.0, 0.0, 0.0, 0.0), 0.5), Color::Rgb { .. }));
     }
 
+    #[test]
+    fn saved_stops_without_a_swatch_are_plain_colors() {
+        let old = r#"{"offset": 0.0, "color": {"model": "cmyk", "c": 0.0, "m": 0.3, "y": 0.9, "k": 0.1}, "opacity": 1.0, "midpoint": 0.5}"#;
+        let stop: GradientStop = serde_json::from_str(old).unwrap();
+        assert_eq!(stop, GradientStop::new(0.0, Color::cmyk(0.0, 0.3, 0.9, 0.1)));
+        assert!(!serde_json::to_string(&stop).unwrap().contains("swatch"), "plain stops save as before");
+        let on = GradientStop { swatch: Some("Gold".into()), ..stop };
+        assert_eq!(serde_json::from_str::<GradientStop>(&serde_json::to_string(&on).unwrap()).unwrap(), on);
+    }
+
     #[test]
     fn midpoint_shifts() {
         let mut g = Gradient::default();
@@ -272,7 +289,7 @@ mod tests {
         // With several stops, the reversed gradient is the original mirrored.
         let mut g = Gradient::default();
         g.stops[0].midpoint = 0.3;
-        g.stops.insert(1, GradientStop { offset: 0.4, color: Color::rgb(1.0, 0.0, 0.0), opacity: 0.5, midpoint: 0.8 });
+        g.stops.insert(1, GradientStop { offset: 0.4, color: Color::rgb(1.0, 0.0, 0.0), opacity: 0.5, midpoint: 0.8, swatch: None });
         let original = g.clone();
         g.reverse();
         for t in [0.1, 0.3, 0.5, 0.7, 0.9] {
diff --git a/crates/compose/src/breaker.rs b/crates/compose/src/breaker.rs
index 85b3a0dc2..9b453ff0a 100644
--- a/crates/compose/src/breaker.rs
+++ b/crates/compose/src/breaker.rs
@@ -48,6 +48,9 @@ pub struct Spacing {
     pub hyph_zone: f64,
     /// Optical margin alignment: punctuation hangs outside the measure (counted as extra width).
     pub optical: bool,
+    /// The type size the hang amounts are set for (Story ▸ Optical Margin Alignment's size);
+    /// `None`: each glyph's own size, so the hang is [`hang`]'s proportion of its advance.
+    pub optical_size: Option<f64>,
     /// Korean text breaks between syllables instead of at spaces.
     pub korean_char_breaks: bool,
     /// 0: minimum adjustment; 1: push in; 2: push out first; 3: push out only.
@@ -72,6 +75,7 @@ impl Default for Spacing {
             ragged_stretch: 24.0,
             hyph_zone: 0.0,
             optical: false,
+            optical_size: None,
             korean_char_breaks: false,
             kinsoku_priority: 0,
         }
@@ -318,16 +322,32 @@ pub fn hang(c: char) -> (f64, f64) {
     }
 }
 
-fn hang_left(g: &Glyph) -> f64 {
-    hang(g.ch).0 * g.adv
+/// How much more than [`hang`]'s proportions `g` hangs: the hang is set for
+/// [`Spacing::optical_size`] and grows with it, relative to the glyph's own size.
+pub(crate) fn optical_scale(g: &Glyph, sp: &Spacing) -> f64 {
+    match sp.optical_size {
+        Some(s) if s.is_finite() && g.size.is_finite() && g.size > 0.0 => s / g.size,
+        _ => 1.0,
+    }
+}
+
+/// Optical hang of `g` at the start of a line (0 without optical margin alignment).
+pub(crate) fn hang_left(g: &Glyph, sp: &Spacing) -> f64 {
+    if sp.optical { hang(g.ch).0 * g.adv * optical_scale(g, sp) } else { 0.0 }
+}
+
+/// Optical hang of `g` at the end of a line (0 without optical margin alignment).
+pub(crate) fn hang_right(g: &Glyph, sp: &Spacing) -> f64 {
+    if sp.optical { hang(g.ch).1 * g.adv * optical_scale(g, sp) } else { 0.0 }
 }
 
 fn right_hang(g: &Glyph, sp: &Spacing) -> f64 {
-    g.cjk_hang.max(if sp.optical { hang_right(g) } else { 0.0 }) - g.moji.end
+    g.cjk_hang.max(hang_right(g, sp)) - g.moji.end
 }
 
-fn hang_right(g: &Glyph) -> f64 {
-    hang(g.ch).1 * g.adv
+/// The part of a hyphen after `g` (of width `hw`) that hangs past the line's end.
+fn hyphen_hang(g: &Glyph, hw: f64, sp: &Spacing) -> f64 {
+    if sp.optical { hw * hang('-').1 * optical_scale(g, sp) } else { 0.0 }
 }
 
 /// Advance of the hyphen glyph that would follow `g` (cached per face).
@@ -428,15 +448,13 @@ fn items(glyphs: &[Glyph], hyph_after: &[bool], emergency_after: &[bool], sp: &S
             let mut p = Item::penalty(hw, sp.hyphen_penalty, true);
             p.auto = true;
             p.zone_from = last_space;
-            if sp.optical {
-                p.hang = hw * hang('-').1;
-            }
+            p.hang = hyphen_hang(g, hw, sp);
             push_inword(&mut it, &mut ig, p, i + 1, sp);
             continue;
         }
         let (st, sh) = sp.box_elastic(g);
         let mut bx = Item::boxed(g.adv, st, sh);
-        bx.hang = (if sp.optical { hang_left(g) } else { 0.0 }) - g.moji.start;
+        bx.hang = hang_left(g, sp) - g.moji.start;
         bx.start_elastic = crate::mojikumi::start_elastic(g, sp.justify, sp.kinsoku_priority != 3);
         it.push(bx);
         ig.push(i);
@@ -457,9 +475,7 @@ fn items(glyphs: &[Glyph], hyph_after: &[bool], emergency_after: &[bool], sp: &S
                 let mut p = Item::penalty(hw, sp.hyphen_penalty, true);
                 p.auto = true;
                 p.zone_from = last_space;
-                if sp.optical {
-                    p.hang = hw * hang('-').1;
-                }
+                p.hang = hyphen_hang(g, hw, sp);
                 push_inword(&mut it, &mut ig, p, i + 1, sp);
             } else if emergency_after.get(i) == Some(&true) {
                 let mut p = Item::penalty(0.0, EMERGENCY_PENALTY, false);
@@ -510,7 +526,9 @@ pub fn knuth_plass(glyphs: &[Glyph], hyph_after: &[bool], sp: &Spacing, width: &
         (items, ig) = self::items(glyphs, hyph_after, &emergency_after, sp);
     }
     for tolerance in [2.5, 12.0, f64::INFINITY] {
-        if let Some(b) = kp_pass(&items, &ig, glyphs, sp, width, tolerance, tolerance.is_infinite()) {
+        if let Some(b) =
+            kp_pass(PassInput { items: &items, item_glyphs: &ig, glyphs, spacing: sp, width, tolerance, emergency: tolerance.is_infinite() })
+        {
             return b;
         }
     }
@@ -587,22 +605,78 @@ fn overlong_words(items: &[Item], ig: &[usize], glyphs: &[Glyph], measure: f64)
 /// Upper bound on the hyphen-count states tracked per breakpoint.
 const MAX_HYPHEN_STATES: usize = 8;
 
-#[allow(clippy::too_many_arguments)]
-fn kp_pass(
-    items: &[Item],
-    ig: &[usize],
-    glyphs: &[Glyph],
-    sp: &Spacing,
-    width: &dyn Fn(usize) -> f64,
-    tol: f64,
+struct PassInput<'a> {
+    items: &'a [Item],
+    item_glyphs: &'a [usize],
+    glyphs: &'a [Glyph],
+    spacing: &'a Spacing,
+    width: &'a dyn Fn(usize) -> f64,
+    tolerance: f64,
     emergency: bool,
-) -> Option<Vec<Break>> {
-    let m = items.len();
-    // Prefix sums (before item i).
-    let mut sw = vec![0.0; m + 1];
-    let mut sy = vec![[0.0; 3]; m + 1];
-    let mut sz = vec![[0.0; 3]; m + 1];
-    let mut so = vec![0.0; m + 1];
+}
+
+/// Enforce consecutive-hyphen limits and the unjustified hyphenation zone.
+fn hyphen_allowed(it: Item, n: Node, sp: &Spacing, widths: &[f64], items: &[Item], target: f64) -> bool {
+    let limit = sp.hyphen_limit as usize;
+    if limit > 0 && n.hyphens as usize >= limit {
+        return false;
+    }
+    if it.auto && !sp.justify && sp.hyph_zone > 0.0 && it.zone_from != NONE && it.zone_from > n.pos {
+        let before = widths[it.zone_from] - n.tw - items[it.zone_from].hang;
+        if target - before < sp.hyph_zone {
+            return false;
+        }
+    }
+    true
+}
+
+/// Fitness class and cumulative penalty for a candidate line break.
+fn break_demerits(n: Node, r: f64, pp: f64, flagged: bool, priority: u8) -> (usize, f64) {
+    let preference = match priority {
+        1 if r > 0.0 => 4.0,
+        2 if r < 0.0 => 4.0,
+        _ => 1.0,
+    };
+    let bad = preference * 100.0 * r.abs().powi(3);
+    let lp = 10.0 + bad;
+    let mut d = if pp >= 0.0 {
+        lp * lp + pp * pp
+    } else if pp > -INF {
+        lp * lp - pp * pp
+    } else {
+        lp * lp
+    };
+    if flagged && n.flagged {
+        d += 3000.0;
+    }
+    let fit = if r < -0.5 {
+        0
+    } else if r <= 0.5 {
+        1
+    } else if r <= 1.0 {
+        2
+    } else {
+        3
+    };
+    if (fit as i32 - n.fitness as i32).abs() > 1 {
+        d += 3000.0;
+    }
+    (fit, n.demerits + d)
+}
+
+/// Width, stretch, shrink and overhang totals before each item.
+struct PrefixSums {
+    sw: Vec<f64>,
+    sy: Vec<[f64; 3]>,
+    sz: Vec<[f64; 3]>,
+    so: Vec<f64>,
+}
+
+fn prefix_sums(items: &[Item]) -> PrefixSums {
+    let mut sw = vec![0.0; items.len() + 1];
+    let mut sy = vec![[0.0; 3]; items.len() + 1];
+    let mut sz = vec![[0.0; 3]; items.len() + 1];
+    let mut so = vec![0.0; items.len() + 1];
     for (i, it) in items.iter().enumerate() {
         let (w, y, z) = match it.kind {
             Kind::Box | Kind::Glue => (it.w, it.st, it.sh),
@@ -615,6 +689,13 @@ fn kp_pass(
             sz[i + 1][t] = sz[i][t] + z[t];
         }
     }
+    PrefixSums { sw, sy, sz, so }
+}
+
+fn kp_pass(input: PassInput<'_>) -> Option<Vec<Break>> {
+    let PassInput { items, item_glyphs, glyphs, spacing: sp, width, tolerance: tol, emergency } = input;
+    let m = items.len();
+    let PrefixSums { sw, sy, sz, so } = prefix_sums(items);
     let first_box = items.iter().find(|i| i.kind == Kind::Box);
     let first_hang = first_box.map_or(0.0, |b| b.hang);
     let first_elastic = first_box.map_or([0.0; 2], |b| b.start_elastic);
@@ -679,51 +760,11 @@ fn kp_pass(
             if !feasible || (r > tol && !forced) {
                 continue;
             }
-            if flagged {
-                // Hyphen limit: a hard constraint.
-                if limit > 0 && n.hyphens as usize >= limit {
-                    continue;
-                }
-                // Hyphenation zone (unjustified): break before the word instead when that leaves
-                // less than the zone at the line end.
-                if it.auto && !sp.justify && sp.hyph_zone > 0.0 && it.zone_from != NONE && it.zone_from > n.pos {
-                    let before = sw[it.zone_from] - n.tw - items[it.zone_from].hang;
-                    if target - before < sp.hyph_zone {
-                        continue;
-                    }
-                }
-            }
-            let preference = match sp.kinsoku_priority {
-                1 if r > 0.0 => 4.0,
-                2 if r < 0.0 => 4.0,
-                _ => 1.0,
-            };
-            let bad = preference * 100.0 * r.abs().powi(3);
-            let lp = 10.0 + bad;
-            let mut d = if pp >= 0.0 {
-                lp * lp + pp * pp
-            } else if pp > -INF {
-                lp * lp - pp * pp
-            } else {
-                lp * lp
-            };
-            if flagged && n.flagged {
-                d += 3000.0;
-            }
-            let fit = if r < -0.5 {
-                0
-            } else if r <= 0.5 {
-                1
-            } else if r <= 1.0 {
-                2
-            } else {
-                3
-            };
-            if (fit as i32 - n.fitness as i32).abs() > 1 {
-                d += 3000.0;
+            if flagged && !hyphen_allowed(it, n, sp, &sw, items, target) {
+                continue;
             }
+            let (fit, total) = break_demerits(n, r, pp, flagged, sp.kinsoku_priority);
             let hs = if flagged { (n.hyphens as usize + 1).min(states - 1) } else { 0 };
-            let total = n.demerits + d;
             let slot = &mut best[fit * states + hs];
             if slot.is_none_or(|(bd, _)| total < bd) {
                 *slot = Some((total, a));
@@ -804,7 +845,7 @@ fn kp_pass(
         cur = arena[c].prev;
     }
     chain.reverse();
-    Some(breaks_from_positions(items, ig, glyphs, &chain))
+    Some(breaks_from_positions(items, item_glyphs, glyphs, &chain))
 }
 
 fn breaks_from_positions(items: &[Item], ig: &[usize], glyphs: &[Glyph], chain: &[usize]) -> Vec<Break> {
@@ -876,7 +917,7 @@ pub fn greedy(
     let may_hyphenate = |hyphens: u32| sp.hyphen_limit == 0 || hyphens < sp.hyphen_limit;
     while start < n {
         let w = width(line).max(1.0);
-        let mut x = (if sp.optical { -hang_left(&glyphs[start]) } else { 0.0 }) + glyphs[start].moji.start;
+        let mut x = -hang_left(&glyphs[start], sp) + glyphs[start].moji.start;
         let mut shrink = crate::mojikumi::start_elastic(&glyphs[start], sp.justify, sp.kinsoku_priority != 3)[1];
         let mut last_natural: Option<(usize, bool)> = None;
         let mut last_ok: Option<(usize, bool)> = None; // (break position = end glyph, hyphen)
@@ -939,7 +980,8 @@ pub fn greedy(
                         last_natural = last_ok;
                     }
                 } else if hyph_after[i] && may_hyphenate(hyphens) {
-                    let hy = hyphen_width(g, &mut hy_cache) * if sp.optical { 1.0 - hang('-').1 } else { 1.0 };
+                    let hw = hyphen_width(g, &mut hy_cache);
+                    let hy = (hw - hyphen_hang(g, hw, sp)).max(0.0);
                     if x + hy <= w + shrink + FIT_EPS {
                         last_ok = Some((i + 1, true));
                     }
diff --git a/crates/compose/src/cache.rs b/crates/compose/src/cache.rs
index 70e22710d..66122ccf4 100644
--- a/crates/compose/src/cache.rs
+++ b/crates/compose/src/cache.rs
@@ -3,7 +3,8 @@
 //! An entry is valid while the inputs it was composed from are the *same allocations*: the story
 //! `Arc` (and its revision), the styles `Arc`, the frame items' `Arc`s and the `Arc`s of every
 //! wrapping item on the frames' spreads, and the same for every story whose anchored objects wrap
-//! its text ([`crate::wrap::neighbours`]). Entries hold clones of those `Arc`s, so the pointers
+//! its text ([`crate::wrap::neighbours`]). An anchored frame's entry also records where its host
+//! story's composition places it. Entries hold clones of those `Arc`s, so the pointers
 //! can't be reused by other allocations while the entry lives.
 
 use std::collections::HashMap;
@@ -99,11 +100,12 @@ impl Cache {
 
     /// [`Cache::get`] for any [`ShownOn`].
     pub fn get_on(&self, doc: &Document, sid: StoryId, on: ShownOn) -> Arc<ComposedStory> {
-        self.get_with(doc, sid, on, true)
+        self.get_with(doc, sid, on, true, 0)
     }
 
-    /// [`Cache::get_on`], wrapped by other stories' anchored objects only when `cross` is set.
-    fn get_with(&self, doc: &Document, sid: StoryId, on: ShownOn, cross: bool) -> Arc<ComposedStory> {
+    /// [`Cache::get_on`], wrapped by other stories' anchored objects only when `cross` is set, for
+    /// a story `depth` hosts down from the story asked for.
+    fn get_with(&self, doc: &Document, sid: StoryId, on: ShownOn, cross: bool, depth: usize) -> Arc<ComposedStory> {
         let Some(story) = doc.stories.get(&sid) else { return Arc::new(ComposedStory { story: sid, ..Default::default() }) };
         let (mut sig, mut keep_items) = signature(doc, story);
         let neighbours = if cross { crate::wrap::neighbours(doc, sid) } else { Vec::new() };
@@ -117,6 +119,24 @@ impl Cache {
                 keep_stories.push(ns.clone());
             }
         }
+        // Anchored frames compose where their host story places them, so the host is composed
+        // first and the placements are part of the signature.
+        let placed = if depth < crate::placed::MAX_DEPTH {
+            crate::placed::placements(doc, sid, &mut |host| self.get_with(doc, host, ShownOn::Own, true, depth + 1))
+        } else {
+            Vec::new()
+        };
+        for (id, p) in &placed {
+            use std::hash::{Hash, Hasher};
+            let mut h = std::collections::hash_map::DefaultHasher::new();
+            (id, p.spread, p.xf.as_coeffs().map(f64::to_bits)).hash(&mut h);
+            // The placed spread's pages give the frame its page, side and page rect.
+            for pg in doc.spread(p.spread).map_or(&[][..], |sp| &sp.pages[..]) {
+                let m = &pg.margins;
+                (pg.side as u8, [pg.x, pg.width, pg.height, m.top, m.bottom, m.inside, m.outside].map(f64::to_bits)).hash(&mut h);
+            }
+            sig.push(h.finish() as usize);
+        }
         let key = (sid, on, !neighbours.is_empty());
         // The key holds the page's index, which a renumbering doesn't change: its name (section
         // start number, style, prefix) is part of the signature.
@@ -209,11 +229,11 @@ impl Cache {
         // Parent-page items are composed per page: markers show its name, variables need its index.
         let page = page.filter(|_| with_vars);
         let running = running.then(|| self.running_index(doc));
-        let others: Vec<Arc<ComposedStory>> = neighbours.iter().map(|n| self.neighbour(doc, *n)).collect();
+        let others: Vec<Arc<ComposedStory>> = neighbours.iter().map(|n| self.neighbour(doc, *n, depth)).collect();
         let out = Arc::new(crate::wrap::compose_among(
             doc,
             sid,
-            &ComposeOptions { page_name, section_marker, page, running, label: None, xrefs: with_xrefs.then(|| self.xref_index(doc)) },
+            &ComposeOptions { page_name, section_marker, page, running, label: None, xrefs: with_xrefs.then(|| self.xref_index(doc)), placed },
             &others.iter().map(|o| &**o).collect::<Vec<_>>(),
         ));
         let mut g = self.map.lock().unwrap_or_else(PoisonError::into_inner);
@@ -295,13 +315,13 @@ impl Cache {
     /// Story `sid` composed for the wrap of its anchored objects in other stories: without other
     /// stories' anchored objects (no cycles), and outside the cache when it needs the document-wide
     /// indexes (they compose every story).
-    fn neighbour(&self, doc: &Document, sid: StoryId) -> Arc<ComposedStory> {
+    fn neighbour(&self, doc: &Document, sid: StoryId, depth: usize) -> Arc<ComposedStory> {
         let indexed =
             doc.stories.get(&sid).is_some_and(|st| crate::xref::has_xrefs(st) || (crate::vars::has_vars(st) && crate::vars::has_running(doc, st)));
         if indexed {
             Arc::new(crate::wrap::compose_among(doc, sid, &ComposeOptions::default(), &[]))
         } else {
-            self.get_with(doc, sid, ShownOn::Own, false)
+            self.get_with(doc, sid, ShownOn::Own, false, depth)
         }
     }
 
diff --git a/crates/compose/src/grep.rs b/crates/compose/src/grep.rs
index 1d7e0e6a9..6f9e8f9e3 100644
--- a/crates/compose/src/grep.rs
+++ b/crates/compose/src/grep.rs
@@ -23,6 +23,13 @@ use designcraft_doc::story;
 pub const MAX_PATTERN: usize = 4096;
 /// Backtracking steps one search may take before it gives up.
 pub const BACKTRACK_LIMIT: usize = 200_000;
+/// Matches one GREP style may contribute to one paragraph.
+///
+/// [`BACKTRACK_LIMIT`] bounds a single search, not a scan: `find_all` pays it again for every
+/// match, so a pattern tuned just under the limit cost `BACKTRACK_LIMIT × matches` per paragraph
+/// on every relayout (#1598). A paragraph cannot usefully carry more styled runs than this, and
+/// a scan that reaches it stops with what it has.
+pub const MAX_MATCHES_PER_PARAGRAPH: usize = 4096;
 /// Compiled program size cap (bytes) for the underlying regex engine.
 const SIZE_LIMIT: usize = 4 << 20;
 
@@ -378,6 +385,17 @@ impl Grep {
         self.re.find_iter(text).take(limit).map(|m| m.map(|m| m.range()).map_err(run_err)).collect()
     }
 
+    /// Non-empty matches in `text`, at most `limit` of them: an empty match styles nothing, so it
+    /// doesn't count toward a GREP style's cap.
+    pub fn find_nonempty(&self, text: &str, limit: usize) -> Result<Vec<Range<usize>>, GrepError> {
+        self.re
+            .find_iter(text)
+            .filter(|m| !m.as_ref().is_ok_and(|m| m.range().is_empty()))
+            .take(limit)
+            .map(|m| m.map(|m| m.range()).map_err(run_err))
+            .collect()
+    }
+
     /// Matches in `text` and their replacements, `template` expanded per match (`$1`…; see
     /// [`translate_replacement`]). Stops after the first match when `first_only`.
     pub fn replacements(&self, text: &str, template: &str, first_only: bool) -> Result<Vec<(Range<usize>, String)>, GrepError> {
diff --git a/crates/compose/src/hyphen/mod.rs b/crates/compose/src/hyphen.rs
similarity index 99%
rename from crates/compose/src/hyphen/mod.rs
rename to crates/compose/src/hyphen.rs
index 57b75d63b..3f07f4b40 100644
--- a/crates/compose/src/hyphen/mod.rs
+++ b/crates/compose/src/hyphen.rs
@@ -26,8 +26,8 @@ use std::sync::OnceLock;
 pub use dict::Dictionary;
 pub use patterns::Patterns;
 
-static EN_US_DIC: &[u8] = include_bytes!("../../../../assets/hyphenation/en-us.dic");
-static EN_US_PAT: &str = include_str!("../../../../assets/hyphenation/en-us.pat");
+static EN_US_DIC: &[u8] = include_bytes!("../../../assets/hyphenation/en-us.dic");
+static EN_US_PAT: &str = include_str!("../../../assets/hyphenation/en-us.pat");
 
 impl Dictionary {
     /// The bundled US English dictionary (decoded on first use).
diff --git a/crates/compose/src/lib.rs b/crates/compose/src/lib.rs
index e80121543..88becd85f 100644
--- a/crates/compose/src/lib.rs
+++ b/crates/compose/src/lib.rs
@@ -23,6 +23,7 @@ pub mod optical;
 mod outline;
 mod overlay;
 mod parabox;
+mod placed;
 mod ruby;
 pub mod shape;
 pub mod shatai;
@@ -46,10 +47,11 @@ use designcraft_geom::{Affine, Point, Rect};
 
 use crate::breaker::{Break, Spacing};
 pub use crate::cache::{Cache, ShownOn};
-use crate::notes::Notes;
+use crate::notes::{NoteColumn, Notes};
 pub use crate::notes::{find_note, hit_note, hit_note_with, note_caret};
 pub use crate::outline::FrameOutline;
 use crate::parabox::ParaBox;
+pub use crate::placed::Placement;
 use crate::shape::{Glyph, StyleTable, SubstCtx};
 pub use crate::table::{BorderHit, PlacedCell, StrokeSeg, TableFrag, cell_caret, find_cell, hit_border, hit_cell, hit_cell_with};
 
@@ -627,6 +629,9 @@ pub struct ComposeOptions {
     pub label: Option<String>,
     /// Anchor pages for cross-references (needed when the story contains cross-references).
     pub xrefs: Option<Arc<xref::XrefIndex>>,
+    /// Where the story's anchored frames sit on their spreads; an anchored frame not listed is
+    /// composed where it is stored, on no page.
+    pub placed: Vec<(ItemId, Placement)>,
 }
 
 /// Nesting depth past which wrap obstacles inside groups are not collected.
@@ -657,40 +662,84 @@ fn wrap_obstacles(it: &Item, parent: Affine, inv: Affine, skip: ItemId, left_pag
     }
 }
 
+/// Adds to `exclusions` the objects on `sp` that wrap the text of frame `item`. Only objects that
+/// reach the frame's text area wrap its text: one elsewhere on the spread would otherwise cost a
+/// narrow column its room (the 1.5 em minimum segment of `free_slots` applies once an object cuts
+/// the column).
+fn frame_wrap_exclusions(doc: &Document, sp: &designcraft_doc::Spread, item: &Item, inv: Affine, exclusions: &mut Vec<Exclusion>) {
+    let left = |x: f64| sp.page_at_x(x).and_then(|pi| sp.pages.get(pi)).is_some_and(|p| p.side == designcraft_doc::PageSide::Left);
+    for other in &sp.items {
+        if doc.layer(other.layer).is_some_and(|l| !l.visible) {
+            continue;
+        }
+        wrap_obstacles(other, Affine::IDENTITY, inv, item.id, &left, 0, exclusions);
+    }
+    let a = item.text_area();
+    exclusions.retain(|e| {
+        let r = e.rect;
+        r.is_finite() && r.x0 < a.x1 && r.x1 > a.x0 && r.y0 < a.y1 && r.y1 > a.y0
+    });
+}
+
+/// The text area and options a frame composes into. On a path, one line as long as the path (from
+/// the start offset).
+fn frame_text_area(doc: &Document, st: &Story, item: &Item, tf: &designcraft_doc::TextFrame) -> (Rect, TextFrameOptions) {
+    match &tf.options.path {
+        Some(pt) => {
+            let len = designcraft_geom::warp::PathWarp::new(&item.path.to_bezpath(), false).length();
+            let size = st
+                .paras
+                .first()
+                .map(|p| doc.styles.resolve_para(p).1)
+                .map(|base| st.runs().map(|(_, f)| doc.styles.resolve_char(&base, f).size).fold(base.size, f64::max))
+                .unwrap_or(12.0);
+            let opts = TextFrameOptions {
+                columns: 1,
+                inset: [0.0; 4],
+                first_baseline: designcraft_doc::FirstBaseline::Ascent,
+                // Keep the path identity: its synthetic area uses full line extents.
+                ..tf.options.clone()
+            };
+            let end = pt.end.map_or(len, |e| e.max(0.0).min(len));
+            (Rect::new(0.0, 0.0, (end - pt.start).max(1.0), size * 1.6), opts)
+        }
+        None => (item.text_area(), tf.options.clone()),
+    }
+}
+
 /// Build the frame specs of a story from the document (geometry, wrap, page names, grid).
 pub fn frame_specs(doc: &Document, sid: StoryId) -> Vec<FrameSpec> {
+    frame_specs_placed(doc, sid, &[])
+}
+
+/// [`frame_specs`] with anchored frames where their host story placed them (`placed`).
+pub(crate) fn frame_specs_placed(doc: &Document, sid: StoryId, placed: &[(ItemId, Placement)]) -> Vec<FrameSpec> {
     let Some(st) = doc.story(sid) else { return vec![] };
     let mut out = Vec::with_capacity(st.frames.len());
     for &fid in &st.frames {
         let loc = doc.find(fid);
         let Some(item) = loc.as_ref().and_then(|l| doc.item_at(l)).or_else(|| doc.anchored_item(fid)) else { continue };
         let Some(tf) = item.text_frame() else { continue };
-        let parent = loc.as_ref().map(|l| doc.parent_xf(l)).unwrap_or(designcraft_geom::Affine::IDENTITY);
+        // An anchored frame takes its page, page side, page rect and grid from where it is placed.
+        let placement = if loc.is_none() { placed.iter().find(|(id, _)| *id == fid).map(|(_, p)| *p) } else { None };
+        let parent = match (&loc, placement) {
+            (Some(l), _) => doc.parent_xf(l),
+            (None, Some(p)) => p.xf,
+            (None, None) => Affine::IDENTITY,
+        };
         let xf = parent * item.xf;
         // Where the frame is on the spread (a group's transform included), to find its page.
         let center_x = parent.transform_rect_bbox(item.bounds()).center().x;
         let inv = xf.inverse();
         let mut exclusions = Vec::new();
-        let spread_ref = loc.as_ref().map(|l| l.spread);
+        let spread_ref = loc.as_ref().map(|l| l.spread).or(placement.map(|p| p.spread));
         let spread = spread_ref.and_then(|r| doc.spread(r));
+        // Page items wrap the text of frames on the spread, not of anchored frames.
         if !tf.options.ignore_wrap
+            && loc.is_some()
             && let Some(sp) = spread
         {
-            let left = |x: f64| sp.page_at_x(x).and_then(|pi| sp.pages.get(pi)).is_some_and(|p| p.side == designcraft_doc::PageSide::Left);
-            for other in &sp.items {
-                if doc.layer(other.layer).is_some_and(|l| !l.visible) {
-                    continue;
-                }
-                wrap_obstacles(other, Affine::IDENTITY, inv, item.id, &left, 0, &mut exclusions);
-            }
-            // Only objects that reach the frame's text area wrap its text: one elsewhere on the
-            // spread would otherwise cost a narrow column its room (the 1.5 em minimum segment of
-            // `free_slots` applies once an object cuts the column).
-            let a = item.text_area();
-            exclusions.retain(|e| {
-                let r = e.rect;
-                r.is_finite() && r.x0 < a.x1 && r.x1 > a.x0 && r.y0 < a.y1 && r.y1 > a.y0
-            });
+            frame_wrap_exclusions(doc, sp, item, inv, &mut exclusions);
         }
         let (page_name, page, side) = match (spread_ref, spread) {
             (Some(designcraft_doc::SpreadRef::Doc(si)), Some(sp)) => {
@@ -713,32 +762,26 @@ pub fn frame_specs(doc: &Document, sid: StoryId) -> Vec<FrameSpec> {
         let under = spread.and_then(|sp| sp.page_at_x(center_x).and_then(|pi| sp.pages.get(pi)));
         let page_rect = under.map(|pg| (inv.transform_rect_bbox(pg.bounds()), inv.transform_rect_bbox(pg.margin_rect())));
         let g = &doc.settings.baseline_grid;
-        let (start, inc) = tf.options.baseline_grid.map_or((under.map_or(g.start, |pg| g.origin(pg)), g.increment), |f| (f.start, f.increment));
         // Grid lines are at spread y = start + n·inc (page tops are y = 0); map into inner space (translation only).
         let ty = xf.translation().y;
+        let (start, inc) = match tf.options.baseline_grid {
+            None => (under.map_or(g.start, |pg| g.origin(pg)), g.increment),
+            Some(f) => {
+                use designcraft_doc::FrameGridRelative as R;
+                // The frame's own edges are in inner space; `ty` takes them to spread y as it takes
+                // the grid back, so a frame-relative grid keeps its place in a turned frame.
+                let from = match f.relative_to {
+                    R::TopOfPage => 0.0,
+                    R::TopMargin => under.map_or(0.0, |pg| pg.margins.top),
+                    R::TopOfFrame => ty + item.inner_bounds().y0,
+                    R::TopInset => ty + item.text_area().y0,
+                };
+                (from + f.start, f.increment)
+            }
+        };
         let grid = (inc > 0.0 && inc.is_finite() && start.is_finite()).then_some((start - ty, inc));
         // Type on a path: one line as long as the path (from the start offset).
-        let (area, opts) = match &tf.options.path {
-            Some(pt) => {
-                let len = designcraft_geom::warp::PathWarp::new(&item.path.to_bezpath(), false).length();
-                let size = st
-                    .paras
-                    .first()
-                    .map(|p| doc.styles.resolve_para(p).1)
-                    .map(|base| st.runs().map(|(_, f)| doc.styles.resolve_char(&base, f).size).fold(base.size, f64::max))
-                    .unwrap_or(12.0);
-                let opts = TextFrameOptions {
-                    columns: 1,
-                    inset: [0.0; 4],
-                    first_baseline: designcraft_doc::FirstBaseline::Ascent,
-                    // Keep the path identity: its synthetic area uses full line extents.
-                    ..tf.options.clone()
-                };
-                let end = pt.end.map_or(len, |e| e.max(0.0).min(len));
-                (Rect::new(0.0, 0.0, (end - pt.start).max(1.0), size * 1.6), opts)
-            }
-            None => (item.text_area(), tf.options.clone()),
-        };
+        let (area, opts) = frame_text_area(doc, st, item, tf);
         // A non-rectangular frame keeps the top inset inward from its outline; its rectangular text
         // area (all four insets) still bounds the lines.
         let outline = match &tf.options.path {
@@ -783,10 +826,23 @@ pub fn frame_specs(doc: &Document, sid: StoryId) -> Vec<FrameSpec> {
 
 /// Compose a story of `doc` through its frames, with the text wrap of page items and of anchored
 /// objects ([`wrap`]).
+/// Anchored frames are composed where their host story places them (unless `opts` places them).
 pub fn compose_story(doc: &Document, sid: StoryId, opts: &ComposeOptions) -> ComposedStory {
+    compose_story_at(doc, sid, opts, 0)
+}
+
+/// [`compose_story`] for a story `depth` hosts down from the story asked for.
+fn compose_story_at(doc: &Document, sid: StoryId, opts: &ComposeOptions, depth: usize) -> ComposedStory {
     let others: Vec<ComposedStory> =
         wrap::neighbours(doc, sid).into_iter().map(|o| wrap::compose_among(doc, o, &ComposeOptions::default(), &[])).collect();
-    wrap::compose_among(doc, sid, opts, &others.iter().collect::<Vec<_>>())
+    let others: Vec<&ComposedStory> = others.iter().collect();
+    if opts.placed.is_empty() && depth < placed::MAX_DEPTH {
+        let placed = placed::placements(doc, sid, &mut |host| Arc::new(compose_story_at(doc, host, &ComposeOptions::default(), depth + 1)));
+        if !placed.is_empty() {
+            return wrap::compose_among(doc, sid, &ComposeOptions { placed, ..opts.clone() }, &others);
+        }
+    }
+    wrap::compose_among(doc, sid, opts, &others)
 }
 
 const DEFAULT_TAB: f64 = 36.0;
@@ -796,26 +852,1780 @@ pub fn compose(doc: &Document, story: &Story, frames: &[FrameSpec], opts: &Compo
     compose_with_db(doc, story, frames, opts, FontDb::global())
 }
 
+struct SubstitutionInput<'a> {
+    doc: &'a Document,
+    story: &'a Story,
+    range: Range<usize>,
+    props: &'a designcraft_doc::ParaProps,
+    frame: Option<&'a FrameSpec>,
+    opts: &'a ComposeOptions,
+    var_story: bool,
+    var_cache: &'a mut HashMap<Option<usize>, Arc<Vec<String>>>,
+    notes: &'a mut Notes,
+}
+
+fn paragraph_substitution(input: SubstitutionInput<'_>) -> SubstCtx {
+    let SubstitutionInput { doc, story, range: prange, props: pp, frame: cur_frame, opts, var_story, var_cache, notes } = input;
+    let var_values = if var_story {
+        let page = opts.page.or_else(|| cur_frame.and_then(|f| f.page));
+        var_cache.entry(page).or_insert_with(|| std::sync::Arc::new(vars::values(doc, page, opts.running.as_deref()))).clone()
+    } else {
+        Default::default()
+    };
+    let mut sub = SubstCtx {
+        page_name: opts.page_name.clone().or_else(|| cur_frame.and_then(|f| f.page_name.clone())),
+        section_marker: opts.section_marker.clone().or_else(|| cur_frame.and_then(|f| f.section_marker.clone())),
+        vars: var_values,
+        hidden_conditions: doc.conditions.iter().filter(|c| !c.visible).map(|c| c.name.clone()).collect(),
+        vertical: cur_frame.is_some_and(|f| f.vertical),
+        auto_tcy: pp.auto_tcy.min(shape::AUTO_TCY_MAX),
+        auto_tcy_roman: pp.auto_tcy_include_roman,
+        rotate_roman: pp.rotate_roman,
+        ..Default::default()
+    };
+    if !story.endnotes.is_empty() {
+        // Endnote reference numbers continue through the document.
+        let first = doc.endnote_start(story.id).saturating_add(story.text[..prange.start].matches(designcraft_doc::ENDNOTE_REF).count() as u32);
+        for (k, (i, _)) in story.text[prange.clone()].match_indices(designcraft_doc::ENDNOTE_REF).enumerate() {
+            sub.notes.insert(prange.start + i, doc.endnote_options.label(first.saturating_add(k as u32)));
+        }
+    }
+    if !story.objects.is_empty() {
+        let before = story.text[..prange.start].matches(designcraft_doc::OBJECT_MARK).count();
+        for (k, (i, _)) in story.text[prange.clone()].match_indices(designcraft_doc::OBJECT_MARK).enumerate() {
+            let Some(o) = story.objects.get(before + k) else { continue };
+            let (w, h) = o.size();
+            let (y_offset, space, custom) = match &o.position {
+                designcraft_doc::AnchorPosition::Inline { y_offset } => (Some(*y_offset), 0.0, false),
+                designcraft_doc::AnchorPosition::AboveLine { space_before, space_after, .. } => (None, space_before + space_after, false),
+                designcraft_doc::AnchorPosition::Custom { .. } => (Some(0.0), 0.0, true),
+            };
+            sub.objects.insert(prange.start + i, shape::ObjectSpec { index: before + k, w, h, y_offset, space, custom });
+        }
+    }
+    if !story.xrefs.is_empty() {
+        sub.xrefs = xref::texts_in(doc, story, prange.clone(), opts.xrefs.as_deref());
+    }
+    if notes.active() {
+        notes.number_refs(doc, prange.clone(), cur_frame.and_then(|f| f.page), &mut sub);
+    }
+    sub
+}
+
+fn rule_color(r: &designcraft_doc::Rule, text: &(String, f32)) -> (String, f32) {
+    if r.color == designcraft_doc::TEXT_COLOR { text.clone() } else { (r.color.clone(), r.tint) }
+}
+
+fn forced_break_start(forced: bool, has_more_lines: bool, break_char: Option<char>) -> Option<StartParagraph> {
+    if forced && has_more_lines { break_char.and_then(break_start) } else { None }
+}
+
+fn line_has_wrapping_exclusion(frame: &FrameSpec, range: Range<usize>, column: Rect, baseline: f64) -> bool {
+    frame.exclusions.iter().any(|ex| {
+        ex.after.is_some_and(|a| range.contains(&a))
+            && ex.rect.x0 < column.x1
+            && ex.rect.x1 > column.x0
+            && ex.rect.y1 > baseline
+            && ex.rect.y0 < column.y1
+    })
+}
+
+fn previous_visible_break(doc: &Document, story: &Story, ranges: &[Range<usize>], deleted: &[bool], pi: usize) -> Option<StartParagraph> {
+    (0..pi).rev().find(|&p| !deleted.get(p).copied().unwrap_or(false)).and_then(|p| {
+        let range = ranges.get(p)?;
+        let (index, character) = story.text.get(range.clone())?.char_indices().next_back()?;
+        let start = break_start(character)?;
+        let (_, chars) = doc.styles.resolve_para(story.paras.get(p)?);
+        let props = doc.styles.resolve_char(&chars, story.char_format_at(range.start + index + character.len_utf8()));
+        let gone = props.change == designcraft_doc::ChangeMark::Deleted || doc.conditions_hide(&props.conditions);
+        (!gone).then_some(start)
+    })
+}
+
+fn named_list_labels(doc: &Document, story: &Story, ranges: &[Range<usize>], deleted: &[bool]) -> Vec<Option<String>> {
+    let mut counters: std::collections::HashMap<String, ListCounter> = std::collections::HashMap::new();
+    story
+        .paras
+        .iter()
+        .zip(ranges)
+        .zip(deleted)
+        .map(|((paragraph, range), is_deleted)| {
+            let (props, _) = doc.styles.resolve_para(paragraph);
+            if props.list_type != designcraft_doc::ListType::Numbers || props.list_name.is_empty() || range.is_empty() || *is_deleted {
+                return None;
+            }
+            let counter = counters.entry(props.list_name.clone()).or_insert_with(|| doc.list_start(story.id, &props.list_name));
+            counter.advance(&props);
+            Some(props.number_label_in(counter))
+        })
+        .collect()
+}
+
+fn deleted_paragraph_info(info: &[ParaInfo], cursor: &Cursor) -> ParaInfo {
+    info.last().map_or(
+        ParaInfo {
+            start: (cursor.fi, cursor.col),
+            at_top: cursor.last_baseline.is_none(),
+            end: (cursor.fi, cursor.col),
+            lines: 0,
+            lines_in_end_col: 0,
+            keep_with_next: 0,
+            keep_together: false,
+            keep_all: false,
+            keep_first: 1,
+            keep_last: 1,
+        },
+        |previous| ParaInfo { lines_in_end_col: 0, ..previous.clone() },
+    )
+}
+
+fn frame_columns_and_text(frames: &[FrameSpec], direction: designcraft_doc::TextDirection) -> (Vec<Vec<Rect>>, Vec<FrameText>) {
+    let columns: Vec<Vec<Rect>> = frames
+        .iter()
+        .map(|frame| {
+            let mut frame_columns = frame.columns();
+            if direction == designcraft_doc::TextDirection::RightToLeft && !frame.vertical {
+                frame_columns.reverse();
+            }
+            frame_columns
+        })
+        .collect();
+    let frame_text = frames
+        .iter()
+        .zip(&columns)
+        .map(|(frame, columns)| FrameText { frame: frame.id, vertical: frame.vertical, columns: columns.clone(), ..Default::default() })
+        .collect();
+    (columns, frame_text)
+}
+
+struct ParagraphProgressInput<'a> {
+    paragraph: usize,
+    count: usize,
+    balance_frames: usize,
+    trial: &'a mut Option<Trial>,
+    limits: &'a mut Rc<Vec<(BandKey, f64)>>,
+    cursor: &'a Cursor,
+    columns: &'a [Vec<Rect>],
+    frames: &'a [FrameSpec],
+    out: &'a ComposedStory,
+    may_retry: bool,
+}
+
+enum ParagraphProgress {
+    Continue,
+    Restart(usize),
+    Complete,
+}
+
+fn paragraph_progress(input: ParagraphProgressInput<'_>) -> ParagraphProgress {
+    let ParagraphProgressInput { paragraph, count, balance_frames, trial, limits, cursor, columns, frames, out, may_retry } = input;
+    if paragraph < count {
+        return ParagraphProgress::Continue;
+    }
+    if balance_frames > 0
+        && let Some(j) = balance_end(trial, limits, cursor, columns, frames, out, count, may_retry)
+    {
+        return ParagraphProgress::Restart(j);
+    }
+    ParagraphProgress::Complete
+}
+
+struct TableParagraphInput<'a> {
+    doc: &'a Document,
+    table: &'a designcraft_doc::Table,
+    anchor: usize,
+    paragraph: usize,
+    range_start: usize,
+    props: &'a designcraft_doc::ParaProps,
+    start: StartParagraph,
+    frames: &'a [FrameSpec],
+    columns: &'a [Vec<Rect>],
+    cursor: &'a mut Cursor,
+    out: &'a mut ComposedStory,
+    opts: &'a ComposeOptions,
+    trial: &'a mut Option<Trial>,
+    limits: &'a mut Rc<Vec<(BandKey, f64)>>,
+    balance_runs: &'a mut usize,
+    balance_budget: usize,
+    snaps: &'a [Snapshot],
+    note_snaps: &'a [(u32, Option<usize>, usize)],
+    notes: &'a mut Notes,
+    list_counter: &'a mut ListCounter,
+    force_col: &'a mut [bool],
+    line_cap: &'a mut [Option<usize>],
+    no_hyph: &'a mut [Vec<usize>],
+    info: &'a mut Vec<ParaInfo>,
+    boxes: &'a mut [Option<ParaBox>],
+}
+
+enum TableParagraphResult {
+    Placed,
+    Restart(usize),
+    Overset,
+}
+
+fn place_table_paragraph(input: TableParagraphInput<'_>) -> TableParagraphResult {
+    let TableParagraphInput {
+        doc,
+        table,
+        anchor,
+        paragraph,
+        range_start,
+        props,
+        start,
+        frames,
+        columns,
+        cursor,
+        out,
+        opts,
+        trial,
+        limits,
+        balance_runs,
+        balance_budget,
+        snaps,
+        note_snaps,
+        notes,
+        list_counter,
+        force_col,
+        line_cap,
+        no_hyph,
+        info,
+        boxes,
+    } = input;
+    if cursor.last_baseline.is_some() {
+        cursor.start(start, columns, frames, doc);
+    } else {
+        cursor.start_at_top(start, frames, doc);
+    }
+    let at_top = cursor.last_baseline.is_none();
+    let start_at = (cursor.fi, cursor.col);
+    if !table::place_table(doc, table, anchor, paragraph, props, frames, columns, cursor, out, opts) {
+        if let Some(j) = trial_failed(trial, limits, *balance_runs < balance_budget) {
+            *balance_runs += 1;
+            rewind(j, snaps, note_snaps, notes, out, cursor, list_counter, force_col, line_cap, no_hyph);
+            return TableParagraphResult::Restart(j);
+        }
+        out.overset_at = Some(range_start);
+        return TableParagraphResult::Overset;
+    }
+    info.push(ParaInfo {
+        start: start_at,
+        at_top,
+        end: (cursor.fi, cursor.col),
+        lines: 1,
+        lines_in_end_col: 1,
+        keep_with_next: 0,
+        keep_together: false,
+        keep_all: false,
+        keep_first: 1,
+        keep_last: 1,
+    });
+    *list_counter = ListCounter::default();
+    boxes[paragraph] = None;
+    cursor.pending += props.space_after;
+    TableParagraphResult::Placed
+}
+
+struct NestedLineStyleInput<'a, 'b, 'font> {
+    db: &'a ScopedFonts<'font>,
+    doc: &'a Document,
+    story: &'a Story,
+    range: Range<usize>,
+    props: &'a designcraft_doc::ParaProps,
+    para_chars: &'a designcraft_doc::CharProps,
+    drop_end: usize,
+    base_leading: f64,
+    base_cap: f64,
+    drop_grid: Option<f64>,
+    drop_align: bool,
+    drop_tabs: (&'a [designcraft_doc::TabStop], f64),
+    cursor: &'a Cursor,
+    frames: &'a [FrameSpec],
+    columns: &'a [Vec<Rect>],
+    exceptions: &'a HashMap<String, Vec<usize>>,
+    suppressed_hyphens: &'a [usize],
+    subst: &'a SubstCtx,
+    style_table: &'a mut StyleTable<'b>,
+    env: shape::TypeEnv,
+    shaped: &'a mut shape::ShapedPara,
+}
+
+fn apply_nested_line_styles(input: NestedLineStyleInput<'_, '_, '_>) {
+    let NestedLineStyleInput {
+        db,
+        doc,
+        story,
+        range: prange,
+        props: pp,
+        para_chars: base_chars,
+        drop_end,
+        base_leading,
+        base_cap,
+        drop_grid,
+        drop_align,
+        drop_tabs,
+        cursor: cur,
+        frames,
+        columns: cols,
+        exceptions: hyph_exceptions,
+        suppressed_hyphens,
+        subst: sub,
+        style_table: table,
+        env,
+        shaped: sp,
+    } = input;
+    if !pp.nested_line_styles.is_empty() && cur.fi < frames.len() {
+        // Nested line styles: find where the first lines end in this column, restyle them, and
+        // look again (the style changes the widths) until the lines settle.
+        let cols_here = &cols[cur.fi];
+        let col = span_rect(cols_here, cols_here[cur.col.min(cols_here.len() - 1)], pp.span_columns);
+        let col = SplitCfg::of(pp).map_or(col, |c| c.sub_rect(col, 0));
+        let spacing = spacing_for(pp, base_chars.size, story);
+        let mut lines: Vec<(std::ops::Range<usize>, String)> = Vec::new();
+        for _ in 0..3 {
+            // The same drop cap, spacing, hyphenation and breaker as the layout below.
+            let mut gl = sp.glyphs.clone();
+            let dc = split_drop_cap(db, &mut gl, drop_end, pp.drop_cap_lines, base_leading, base_cap, drop_grid, drop_align, drop_tabs);
+            let width = |j: usize| {
+                let ind = match &dc {
+                    Some(dc) if j < dc.lines => dc.indent(),
+                    _ if j == 0 => pp.first_line_indent,
+                    _ => 0.0,
+                };
+                (col.width() - pp.left_indent - pp.right_indent - ind).max(1.0)
+            };
+            apply_desired_spacing(&mut gl, pp);
+            mojikumi::apply(&mut gl, &doc.styles, &pp.mojikumi);
+            let mut hy = hyphenation_points(&story.text, &gl, pp, hyph_exceptions, &foreign_ranges(doc, story, prange.clone(), base_chars));
+            suppress_hyphens(&mut hy, &gl, suppressed_hyphens);
+            let breaks = if pp.composer.single_line() || gl.iter().any(|g| g.ch == '\t') || gl.len() > 4000 {
+                let tab = |j: usize, x: f64, i: usize| {
+                    let ind = pp.left_indent + if j == 0 { pp.first_line_indent } else { 0.0 };
+                    tab_advance(&pp.tabs, pp.left_indent, ind + x, gl.get(i + 1..).unwrap_or_default()).0
+                };
+                breaker::greedy(&gl, &hy, &spacing, &width, &tab)
+            } else if pp.balance_ragged && !spacing.justify {
+                breaker::balanced(&gl, &hy, &spacing, &width)
+            } else {
+                breaker::knuth_plass(&gl, &hy, &spacing, &width)
+            };
+            // Byte where line `k` starts (the paragraph end past the last line).
+            let byte_at =
+                |k: usize| if k == 0 { prange.start } else { breaks.get(k - 1).and_then(|b| gl.get(b.next)).map_or(prange.end, |g| g.byte) };
+            let mut want = Vec::new();
+            let mut line = 0usize;
+            for nl in &pp.nested_line_styles {
+                if line >= breaks.len() || nl.lines == 0 {
+                    break;
+                }
+                let end = line + nl.lines as usize;
+                if !nl.style.is_empty() && nl.style != designcraft_doc::NO_CHAR_STYLE {
+                    want.push((byte_at(line)..byte_at(end).max(byte_at(line)), nl.style.clone()));
+                }
+                line = end;
+            }
+            if want == lines {
+                break;
+            }
+            lines = want;
+            *sp = shape::shape_para(
+                shape::ShapeInput {
+                    db,
+                    styles: &doc.styles,
+                    story,
+                    range: prange.clone(),
+                    para_chars: base_chars,
+                    auto_leading: env,
+                    sub,
+                    nested: &pp.nested_styles,
+                    grep: &pp.grep_styles,
+                    lines: &lines,
+                    drop_cap: (drop_end, &pp.drop_cap_style),
+                },
+                &mut *table,
+            );
+        }
+    }
+}
+
+struct PlacementShared<'a, 'font> {
+    doc: &'a Document,
+    story: &'a Story,
+    frames: &'a [FrameSpec],
+    cols: &'a [Vec<Rect>],
+    opts: &'a ComposeOptions,
+    db: &'a ScopedFonts<'font>,
+    out: &'a mut ComposedStory,
+    styles_tab: &'a mut Vec<RunStyle>,
+    cur: &'a mut Cursor,
+    notes: &'a mut Notes,
+    snaps: &'a [Snapshot],
+    note_snaps: &'a [(u32, Option<usize>, usize)],
+    list_counter: &'a mut ListCounter,
+    force_col: &'a mut [bool],
+    line_cap: &'a mut [Option<usize>],
+    no_hyph: &'a mut [Vec<usize>],
+    trial: &'a mut Option<Trial>,
+    limits: &'a mut Rc<Vec<(BandKey, f64)>>,
+    balance_runs: &'a mut usize,
+    balance_budget: usize,
+    split_trial: &'a mut Option<Trial<SplitKey>>,
+    split_limits: &'a mut Rc<Vec<(SplitKey, f64)>>,
+    split_runs: &'a mut usize,
+    split_budget: usize,
+    hyph_relays: &'a mut usize,
+    restores: &'a mut usize,
+}
+
+struct ParagraphLines<'a> {
+    paragraph: usize,
+    range: Range<usize>,
+    props: &'a designcraft_doc::ParaProps,
+    glyphs: &'a [Glyph],
+    hyph_after: &'a [bool],
+    drop_cap: Option<&'a DropCap>,
+    base_chars: &'a designcraft_doc::CharProps,
+    mark_chars: &'a designcraft_doc::CharProps,
+    mark_leading: f64,
+    base_leading: f64,
+    last_line_mark: Option<f64>,
+    base_size: f64,
+    spacing: &'a Spacing,
+    bidi_info: &'a unicode_bidi::BidiInfo<'a>,
+    sub_objects: &'a HashMap<usize, shape::ObjectSpec>,
+    spanning: bool,
+    at_top: bool,
+    paragraph_count: usize,
+    info: &'a [ParaInfo],
+    label_aligned: usize,
+    label_tab: bool,
+    list_align: ListAlign,
+}
+
+enum LinePlacement {
+    Complete { line_no: usize, col_first_line: usize, first_line_rect: Option<(usize, f64, f64, f64)> },
+    Restart(usize),
+    Overset,
+    StoryComplete,
+}
+
+struct PositionLineInput<'a, 'font> {
+    frame: &'a FrameSpec,
+    column: Rect,
+    glyphs: &'a [Glyph],
+    hyph_after: &'a [bool],
+    range_start: usize,
+    props: &'a designcraft_doc::ParaProps,
+    cursor: &'a mut Cursor,
+    line_no: usize,
+    carry: &'a mut Vec<(f64, f64)>,
+    carry_baseline: &'a mut f64,
+    carry_grid: &'a mut Option<f64>,
+    para_block: &'a mut Option<((usize, usize), f64)>,
+    index: usize,
+    glyph_offset: usize,
+    breaks: &'a [Break],
+    break_index: usize,
+    line_glyphs: &'a [Glyph],
+    spacing: &'a Spacing,
+    ascent: f64,
+    tops: Tops,
+    descent: f64,
+    lead: f64,
+    reference: f64,
+    model: designcraft_doc::cjk::LeadingModel,
+    advance: f64,
+    base_size: f64,
+    rtl: bool,
+    db: &'a ScopedFonts<'font>,
+    mark_leading: f64,
+    mark_chars: &'a designcraft_doc::CharProps,
+    last_line_mark: Option<f64>,
+}
+
+struct LinePosition {
+    x0: f64,
+    x1: f64,
+    baseline: f64,
+    grid_end: Option<f64>,
+    continues: bool,
+}
+
+fn position_line(input: PositionLineInput<'_, '_>) -> LinePosition {
+    let PositionLineInput {
+        frame: f,
+        column: col,
+        glyphs,
+        hyph_after,
+        range_start,
+        props: pp,
+        cursor: cur,
+        line_no,
+        carry,
+        carry_baseline,
+        carry_grid,
+        para_block,
+        index: s,
+        glyph_offset: g0,
+        breaks,
+        break_index: k,
+        line_glyphs,
+        spacing,
+        ascent: asc,
+        tops,
+        descent: desc,
+        lead,
+        reference,
+        model,
+        advance,
+        base_size,
+        rtl,
+        db,
+        mark_leading,
+        mark_chars,
+        last_line_mark,
+    } = input;
+    let (mut x0, mut x1) = (col.x0, col.x1);
+    let ind = pp.left_indent + pp.right_indent + if line_no == 0 { pp.first_line_indent } else { 0.0 };
+    let need = if f.exclusions.is_empty() && f.outline.is_none() {
+        0.0
+    } else {
+        let w = breaker::first_word_width(glyphs.get(s..).unwrap_or_default(), hyph_after.get(s..).unwrap_or_default(), spacing);
+        if w > col.width() - ind { 0.0 } else { w }
+    };
+    let holds = |&(a, b): &(f64, f64)| b - a - ind + 0.01 >= need;
+    let mut continues = false;
+    let mut baseline = *carry_baseline;
+    let mut grid_end = None;
+    if let Some(i) = carry.iter().position(holds) {
+        continues = i == 0;
+        grid_end = *carry_grid;
+        (x0, x1) = carry.get(i).copied().unwrap_or((x0, x1));
+        carry.drain(..=i);
+    } else {
+        carry.clear();
+        baseline = cur.next_baseline(f, col, advance, asc, tops, pp);
+        if cur.last_baseline.is_some() {
+            baseline += cur.last_reference - reference;
+        }
+        let grid = f.grid.filter(|&(_, inc)| {
+            inc > 0.0 && inc.is_finite() && (pp.grid_align == GridAlign::AllLines || (pp.grid_align == GridAlign::FirstLineOnly && line_no == 0))
+        });
+        if let Some((g_start, inc)) = grid {
+            let n = pp.grid_gyoudori.min(grid::MAX_GYOUDORI);
+            match para_block.filter(|(at, _)| line_no > 0 && *at == (cur.fi, cur.col)) {
+                Some((_, end)) => grid_end = Some(end),
+                None => {
+                    let r = grid::reference_offset(line_glyphs, pp.grid_reference);
+                    let block = n > 0 && pp.paragraph_gyoudori && line_no == 0;
+                    let span = if block {
+                        let aki_below = |line_model, line_lead| (line_model == designcraft_doc::cjk::LeadingModel::AkiBelow).then_some(line_lead);
+                        let (mut down, mut prev, mut prev_aki, mut last_r) = (0.0, reference, aki_below(model, lead), r);
+                        for (j, next_break) in breaks.iter().enumerate().skip(k + 1) {
+                            let (ns, ne) = (g0 + next_break.start, g0 + next_break.end);
+                            let next_glyphs = glyphs.get(ns..ne.max(ns)).unwrap_or_default();
+                            let (_, _, _, next_lead) = line_metrics(next_glyphs, glyphs, ns, mark_leading, mark_chars.size, db, mark_chars);
+                            let next_lead = match last_line_mark {
+                                Some(mark) if j + 1 == breaks.len() => next_lead.max(mark),
+                                _ => next_lead,
+                            };
+                            let (next_reference, next_model) = cjk_line_reference(next_glyphs);
+                            down += prev_aki.unwrap_or(next_lead) + prev - next_reference;
+                            prev = next_reference;
+                            prev_aki = aki_below(next_model, next_lead);
+                            last_r = grid::reference_offset(next_glyphs, pp.grid_reference);
+                        }
+                        (down + last_r - r).max(0.0)
+                    } else {
+                        0.0
+                    };
+                    let lines = if block { grid::lines_for(span, inc, n) } else { n.max(1) };
+                    let free = cur.grid_next.filter(|(b, _)| cur.last_baseline == Some(*b)).map(|(_, y)| y);
+                    let band = grid::Band { natural: baseline + r, free, pending: cur.pending, fixed: n > 0, lines, span };
+                    let (y, end) = grid::place((g_start, inc), pp.grid_reference, band);
+                    baseline = y - r;
+                    grid_end = Some(end);
+                    if block {
+                        *para_block = Some(((cur.fi, cur.col), end));
+                    }
+                }
+            }
+        }
+        let on_grid = baseline;
+        let snap = |y: f64| grid.map_or(y, |(_, inc)| on_grid + ((y - on_grid) / inc - 1e-6).ceil().max(0.0) * inc);
+        if !f.exclusions.is_empty() || f.outline.is_some() {
+            let jump = cur.jump(f, advance, asc, tops);
+            let line_start = glyphs.get(s).map_or(range_start, |g| g.byte);
+            let mut tries = 0;
+            loop {
+                let Some((next_baseline, segments)) = wrap_slot(f, col, baseline, asc, desc, jump, base_size, rtl, line_start, &holds) else {
+                    baseline = baseline.max(col.y1) + 1.0;
+                    carry.clear();
+                    break;
+                };
+                let pushed = next_baseline > baseline;
+                baseline = next_baseline;
+                if let Some((&first, rest)) = segments.split_first() {
+                    (x0, x1) = first;
+                    *carry = rest.to_vec();
+                }
+                tries += 1;
+                if !pushed || grid.is_none() || tries > 4000 {
+                    break;
+                }
+                baseline = snap(baseline);
+            }
+        }
+        grid_end = grid_end.map(|end| end + baseline - on_grid);
+        *carry_baseline = baseline;
+        *carry_grid = grid_end;
+    }
+    LinePosition { x0, x1, baseline, grid_end, continues }
+}
+
+struct BreakInput<'a> {
+    glyphs: &'a [Glyph],
+    hyphens: &'a [bool],
+    props: &'a designcraft_doc::ParaProps,
+    slots: &'a [(f64, f64)],
+    column: Rect,
+    drop_cap: Option<&'a DropCap>,
+    line_no: usize,
+    col_first_line: usize,
+    rtl: bool,
+    has_tabs: bool,
+    spacing: &'a Spacing,
+}
+
+fn choose_paragraph_breaks(input: BreakInput<'_>) -> Vec<Break> {
+    let BreakInput { glyphs, hyphens, props: pp, slots, column: col, drop_cap, line_no, col_first_line, rtl, has_tabs, spacing } = input;
+    let width = |j: usize| -> f64 {
+        let (x0, x1) = slots.get(j).copied().unwrap_or((col.x0, col.x1));
+        let indent = pp.left_indent
+            + pp.right_indent
+            + match drop_cap {
+                Some(dc) if line_no + j < dc.lines && col_first_line == 0 => dc.indent(),
+                _ if line_no + j == 0 => pp.first_line_indent,
+                _ => 0.0,
+            };
+        (x1 - x0 - indent).max(1.0)
+    };
+    if pp.composer.single_line() || has_tabs || glyphs.len() > 4000 {
+        let tab = |j: usize, x: f64, i: usize| {
+            let x0 = slots.get(j).map_or(col.x0, |s| s.0);
+            let indent = pp.left_indent
+                + match drop_cap {
+                    Some(dc) if line_no + j < dc.lines && col_first_line == 0 => {
+                        if rtl {
+                            0.0
+                        } else {
+                            dc.indent()
+                        }
+                    }
+                    _ if line_no + j == 0 => pp.first_line_indent,
+                    _ => 0.0,
+                };
+            tab_advance(&pp.tabs, pp.left_indent, x0 + indent + x - col.x0, glyphs.get(i + 1..).unwrap_or_default()).0
+        };
+        breaker::greedy(glyphs, hyphens, spacing, &width, &tab)
+    } else if pp.balance_ragged && !spacing.justify {
+        breaker::balanced(glyphs, hyphens, spacing, &width)
+    } else {
+        breaker::knuth_plass(glyphs, hyphens, spacing, &width)
+    }
+}
+
+struct LineFitInput<'a> {
+    doc: &'a Document,
+    story: &'a Story,
+    cols: &'a [Vec<Rect>],
+    opts: &'a ComposeOptions,
+    out: &'a mut ComposedStory,
+    cur: &'a mut Cursor,
+    notes: &'a mut Notes,
+    snaps: &'a [Snapshot],
+    note_snaps: &'a [(u32, Option<usize>, usize)],
+    list_counter: &'a mut ListCounter,
+    force_col: &'a mut [bool],
+    line_cap: &'a mut [Option<usize>],
+    no_hyph: &'a mut [Vec<usize>],
+    split_trial: &'a mut Option<Trial<SplitKey>>,
+    split_limits: &'a mut Rc<Vec<(SplitKey, f64)>>,
+    split_runs: &'a mut usize,
+    split_budget: usize,
+    balance_runs: usize,
+    hyph_relays: &'a mut usize,
+    restores: &'a mut usize,
+    paragraph_count: usize,
+    info: &'a [ParaInfo],
+    props: &'a designcraft_doc::ParaProps,
+    paragraph: usize,
+    line_no: usize,
+    col_first_line: usize,
+    at_top: bool,
+    remaining_lines: usize,
+    frame: &'a FrameSpec,
+    column: Rect,
+    line_glyphs: &'a [Glyph],
+    baseline: f64,
+    descent: f64,
+    hyphen_at: Option<usize>,
+    sub_objects: &'a HashMap<usize, shape::ObjectSpec>,
+    carry: &'a mut Vec<(f64, f64)>,
+}
+
+enum LineFit {
+    Ready(Vec<usize>),
+    Restart(usize),
+    NextSub,
+    NextColumn,
+}
+
+fn fit_line(input: LineFitInput<'_>) -> LineFit {
+    let LineFitInput {
+        doc,
+        story,
+        cols,
+        opts,
+        out,
+        cur,
+        notes,
+        snaps,
+        note_snaps,
+        list_counter,
+        force_col,
+        line_cap,
+        no_hyph,
+        split_trial,
+        split_limits,
+        split_runs,
+        split_budget,
+        balance_runs,
+        restores,
+        paragraph_count,
+        info,
+        props: pp,
+        paragraph: pi,
+        line_no,
+        col_first_line,
+        at_top,
+        remaining_lines,
+        frame: f,
+        column: col,
+        line_glyphs,
+        baseline,
+        descent: desc,
+        hyph_relays,
+        hyphen_at,
+        sub_objects,
+        carry,
+    } = input;
+    let capped = cur.split.is_none() && line_cap[pi] == Some(line_no) && line_no > col_first_line;
+    let line_notes = if notes.active() { notes.refs_in(line_glyphs) } else { Vec::new() };
+    let col_w = notes.area(&cols[cur.fi], cur.col).map_or(0.0, |r| r.width());
+    let note_column = NoteColumn { frame_index: cur.fi, column_index: cur.col, width: col_w, frame: f };
+    let reserve = notes.reserve(doc, note_column, &line_notes, opts);
+    let reserve = if cur.last_baseline.is_none() { notes.reserve(doc, note_column, &[], opts) } else { reserve };
+    let fit_descent =
+        if f.opts.path.is_some() || f.vertical || reserve > 0.0 || line_glyphs.iter().any(|g| sub_objects.get(&g.byte).is_some_and(|o| !o.custom)) {
+            desc
+        } else {
+            0.0
+        };
+    let fits = baseline + fit_descent <= col.y1 - reserve + 0.01 && !capped;
+    if !fits
+        && !pp.hyph_across_column
+        && line_no > col_first_line
+        && let Some(at) = hyphen_at
+        && *hyph_relays < story.text.len().saturating_add(64).saturating_mul(restores.saturating_add(1))
+    {
+        *hyph_relays += 1;
+        no_hyph[pi].push(at);
+        rewind(pi, snaps, note_snaps, notes, out, cur, list_counter, force_col, line_cap, no_hyph);
+        return LineFit::Restart(pi);
+    }
+    if fits {
+        return LineFit::Ready(line_notes);
+    }
+    if cur.can_next_sub() {
+        cur.next_sub();
+        carry.clear();
+        return LineFit::NextSub;
+    }
+    if let Some(key) = cur.split_key()
+        && limit_of(split_limits, key).is_some_and(f64::is_finite)
+    {
+        let j = if split_trial.as_ref().is_some_and(|t| t.key == key) {
+            trial_failed(split_trial, split_limits, *split_runs < split_budget)
+        } else {
+            set_limit(split_limits, key, Some(f64::INFINITY));
+            Some(key.2)
+        };
+        if let Some(j) = j {
+            *split_runs += 1;
+            rewind(j, snaps, note_snaps, notes, out, cur, list_counter, force_col, line_cap, no_hyph);
+            return LineFit::Restart(j);
+        }
+    }
+    if !capped && cur.split.is_none_or(|s| s.part_lines == 0) {
+        let ctx = KeepCtx {
+            pi,
+            line_no,
+            in_col: line_no - col_first_line,
+            started_here: col_first_line == 0,
+            at_top,
+            remaining: remaining_lines,
+            here: (cur.fi, cur.col),
+        };
+        if *restores < (4 * paragraph_count + 64) * (balance_runs + 1)
+            && let Some(action) = keep_violation(&ctx, pp, info, force_col, line_cap)
+        {
+            let j = match action {
+                KeepAction::Force(j) => {
+                    force_col[j] = true;
+                    j
+                }
+                KeepAction::Cap(j, count) => {
+                    line_cap[j] = Some(count);
+                    j
+                }
+            };
+            *restores += 1;
+            rewind(j, snaps, note_snaps, notes, out, cur, list_counter, force_col, line_cap, no_hyph);
+            return LineFit::Restart(j);
+        }
+    }
+    carry.clear();
+    LineFit::NextColumn
+}
+
+struct PlacementOverflow<'a> {
+    story: &'a Story,
+    range: &'a Range<usize>,
+    glyphs: &'a [Glyph],
+    glyph_index: usize,
+    trial: &'a mut Option<Trial>,
+    limits: &'a mut Rc<Vec<(BandKey, f64)>>,
+    balance_runs: &'a mut usize,
+    balance_budget: usize,
+    snaps: &'a [Snapshot],
+    note_snaps: &'a [(u32, Option<usize>, usize)],
+    notes: &'a mut Notes,
+    out: &'a mut ComposedStory,
+    cur: &'a mut Cursor,
+    list_counter: &'a mut ListCounter,
+    force_col: &'a mut [bool],
+    line_cap: &'a mut [Option<usize>],
+    no_hyph: &'a mut [Vec<usize>],
+}
+
+fn placement_overflow(input: PlacementOverflow<'_>) -> LinePlacement {
+    let PlacementOverflow {
+        story,
+        range,
+        glyphs,
+        glyph_index,
+        trial,
+        limits,
+        balance_runs,
+        balance_budget,
+        snaps,
+        note_snaps,
+        notes,
+        out,
+        cur,
+        list_counter,
+        force_col,
+        line_cap,
+        no_hyph,
+    } = input;
+    if let Some(j) = trial_failed(trial, limits, *balance_runs < balance_budget) {
+        *balance_runs += 1;
+        rewind(j, snaps, note_snaps, notes, out, cur, list_counter, force_col, line_cap, no_hyph);
+        return LinePlacement::Restart(j);
+    }
+    if range.is_empty() && range.start >= story.text.len() {
+        return LinePlacement::StoryComplete;
+    }
+    out.overset_at = Some(glyphs.get(glyph_index).map(|g| g.byte).unwrap_or(range.start));
+    LinePlacement::Overset
+}
+
+fn advance_placement_column(cursor: &mut Cursor, spanning: bool, columns: &[Vec<Rect>]) {
+    if spanning {
+        cursor.next_frame();
+    } else if cursor.can_next_sub() {
+        cursor.next_sub();
+    } else {
+        cursor.next_column(columns);
+    }
+}
+
+fn start_placement(cursor: &mut Cursor, start: StartParagraph, spanning: bool, frames: &[FrameSpec], columns: &[Vec<Rect>], doc: &Document) {
+    if matches!(start, StartParagraph::NextColumn) {
+        let (fi, col) = (cursor.fi, cursor.col);
+        advance_placement_column(cursor, spanning, columns);
+        if cursor.fi == fi && cursor.col != col {
+            cursor.band.tail = Some((cursor.pi, cursor.col));
+        }
+    } else {
+        cursor.start(start, columns, frames, doc);
+    }
+}
+
+fn place_sub_objects(
+    story: &Story,
+    frame: &mut FrameText,
+    objects: &HashMap<usize, shape::ObjectSpec>,
+    line_index: usize,
+    line_glyphs: &[Glyph],
+    base_size: f64,
+) {
+    if objects.is_empty() {
+        return;
+    }
+    let text_ascent = line_glyphs.iter().filter(|g| g.ch != designcraft_doc::OBJECT_MARK).map(|g| g.ascent).fold(0.0, f64::max);
+    let text_ascent = if text_ascent > 0.0 { text_ascent } else { base_size * 0.75 };
+    for glyph in frame.lines[line_index].glyphs.iter().filter(|g| g.len > 0) {
+        if let Some(object) = objects.get(&glyph.byte)
+            && let Some(source) = story.objects.get(object.index)
+        {
+            frame.objects.push(PlacedObject {
+                index: object.index,
+                object: Arc::clone(source),
+                origin: Point::ZERO,
+                size: (object.w, object.h),
+                line: line_index,
+                x: glyph.x,
+                text_ascent,
+            });
+        }
+    }
+}
+
+fn place_paragraph_lines(shared: PlacementShared<'_, '_>, paragraph: ParagraphLines<'_>) -> LinePlacement {
+    let PlacementShared {
+        doc,
+        story,
+        frames,
+        cols,
+        opts,
+        db,
+        out,
+        styles_tab,
+        cur,
+        notes,
+        snaps,
+        note_snaps,
+        list_counter,
+        force_col,
+        line_cap,
+        no_hyph,
+        trial,
+        limits,
+        balance_runs,
+        balance_budget,
+        split_trial,
+        split_limits,
+        split_runs,
+        split_budget,
+        hyph_relays,
+        restores,
+    } = shared;
+    let ParagraphLines {
+        paragraph: pi,
+        range: prange,
+        props: pp,
+        glyphs,
+        hyph_after,
+        drop_cap,
+        base_chars,
+        mark_chars,
+        mark_leading,
+        base_leading,
+        last_line_mark,
+        base_size,
+        spacing,
+        bidi_info,
+        sub_objects,
+        spanning,
+        at_top,
+        paragraph_count: np,
+        info,
+        label_aligned,
+        label_tab,
+        list_align,
+    } = paragraph;
+    let mut g0 = 0usize;
+    let mut line_no = 0usize;
+    // Paragraph line number of the first line in the current column.
+    let mut col_first_line = 0usize;
+    // The story byte at which the last line set ended at an automatic hyphenation point.
+    let mut hyphen_at: Option<usize> = None;
+    let has_tabs = glyphs.iter().any(|g| g.ch == '\t');
+    let mut first_line_rect: Option<(usize, f64, f64, f64)> = None; // frame, baseline, ascent, x-span
+    let rtl = pp.direction == designcraft_doc::TextDirection::RightToLeft;
+    // Paragraph gyoudori: the (frame, column) of the block and the grid line after it.
+    let mut para_block: Option<((usize, usize), f64)> = None;
+    // Segments of a line already placed (beside an object with text on both sides) that the
+    // next lines of the paragraph fill before a new line starts, and that line's baseline.
+    let mut carry: Vec<(f64, f64)> = Vec::new();
+    let mut carry_baseline = 0.0;
+    // The grid line after the carried line's band (see `grid_end`).
+    let mut carry_grid: Option<f64> = None;
+    // Re-breaks after a line's segment turned out other than the breaker assumed.
+    let mut rebreaks = 0usize;
+    loop {
+        if cur.fi >= frames.len() {
+            // An empty last paragraph isn't overset text, as in InDesign.
+            return placement_overflow(PlacementOverflow {
+                story,
+                range: &prange,
+                glyphs,
+                glyph_index: g0,
+                trial,
+                limits,
+                balance_runs,
+                balance_budget,
+                snaps,
+                note_snaps,
+                notes,
+                out,
+                cur,
+                list_counter,
+                force_col,
+                line_cap,
+                no_hyph,
+            });
+        }
+        let f = &frames[cur.fi];
+        let base = cols[cur.fi][cur.col.min(cols[cur.fi].len() - 1)];
+        let col = cur.clip(base);
+        // A spanning paragraph isn't held to the balanced bottom of the columns above it.
+        let col = if spanning { span_rect(&cols[cur.fi], Rect::new(col.x0, col.y0, col.x1, base.y1), pp.span_columns) } else { col };
+        let col = cur.split_rect(col);
+        // Estimate slots for the breaker with the paragraph's base leading.
+        // A shaped frame's slots change from line to line, so they are estimated with the
+        // band the lines are placed with (or a taller one, so no line outgrows its slot).
+        let (est_asc, est_band) = if f.outline.is_some() {
+            let (a, _, d, _) = line_metrics(&[], glyphs, g0, mark_leading, mark_chars.size, db, mark_chars);
+            (a, (a.max(base_chars.size * 0.8), d.max(base_chars.size * 0.25)))
+        } else {
+            (base_chars.size * 0.75, (base_chars.size * 0.8, 0.0))
+        };
+        let est_tops = Tops { typo_ascent: est_asc, cap: est_asc * 0.72, xh: est_asc * 0.5, em: base_chars.size * 0.88 };
+        let est_first = if carry.is_empty() { cur.next_baseline(f, col, base_leading, est_asc, est_tops, pp) } else { carry_baseline + base_leading };
+        let est_jump = cur.jump(f, base_leading, est_asc, est_tops);
+        let slots = estimate_slots(f, col, est_first, est_jump, base_leading, base_chars.size, est_band, &glyphs[g0..], rtl, &carry);
+        let breaks = choose_paragraph_breaks(BreakInput {
+            glyphs: &glyphs[g0..],
+            hyphens: &hyph_after[g0..],
+            props: pp,
+            slots: &slots,
+            column: col,
+            drop_cap,
+            line_no,
+            col_first_line,
+            rtl,
+            has_tabs,
+            spacing,
+        });
+        let mut moved = false;
+        for (k, b) in breaks.iter().enumerate() {
+            let (s, e) = (g0 + b.start, g0 + b.end);
+            let line_glyphs = &glyphs[s..e.max(s)];
+            let (asc, tops, desc, lead) = line_metrics(line_glyphs, glyphs, s, mark_leading, mark_chars.size, db, mark_chars);
+            let lead = match last_line_mark {
+                Some(m) if k + 1 == breaks.len() => lead.max(m),
+                _ => lead,
+            };
+            let (reference, model) = cjk_line_reference(line_glyphs);
+            let advance = if cur.last_baseline.is_some() { cur.aki_below.unwrap_or(lead) } else { lead };
+            let position = position_line(PositionLineInput {
+                frame: f,
+                column: col,
+                glyphs,
+                hyph_after,
+                range_start: prange.start,
+                props: pp,
+                cursor: cur,
+                line_no,
+                carry: &mut carry,
+                carry_baseline: &mut carry_baseline,
+                carry_grid: &mut carry_grid,
+                para_block: &mut para_block,
+                index: s,
+                glyph_offset: g0,
+                breaks: &breaks,
+                break_index: k,
+                line_glyphs,
+                spacing,
+                ascent: asc,
+                tops,
+                descent: desc,
+                lead,
+                reference,
+                model,
+                advance,
+                base_size,
+                rtl,
+                db,
+                mark_leading,
+                mark_chars,
+                last_line_mark,
+            });
+            let LinePosition { x0, x1, baseline, grid_end, continues } = position;
+            // The breaker set this line for another segment width: re-break the rest of the
+            // paragraph from here, starting with this line's segments as they are. A pass
+            // re-breaks at its first line only for a new line, whose segments it carries, so
+            // every re-break makes progress; their number is capped too.
+            // Past the estimated slots the breaker assumes the whole column. Check that
+            // fallback too: narrow wrap segments may need more lines than the estimate.
+            let (estimated_x0, estimated_x1) = slots.get(k).copied().unwrap_or((col.x0, col.x1));
+            if (k > 0 || !continues) && rebreaks < 256 && ((estimated_x1 - estimated_x0) - (x1 - x0)).abs() > 0.5 {
+                rebreaks += 1;
+                carry.insert(0, (x0, x1));
+                g0 = s;
+                moved = true;
+                break;
+            }
+            let line_notes = match fit_line(LineFitInput {
+                doc,
+                story,
+                cols,
+                opts,
+                out,
+                cur,
+                notes,
+                snaps,
+                note_snaps,
+                list_counter,
+                force_col,
+                line_cap,
+                no_hyph,
+                split_trial,
+                split_limits,
+                split_runs,
+                split_budget,
+                balance_runs: *balance_runs,
+                hyph_relays,
+                restores,
+                paragraph_count: np,
+                info,
+                props: pp,
+                paragraph: pi,
+                line_no,
+                col_first_line,
+                at_top,
+                remaining_lines: breaks.len() - k,
+                frame: f,
+                column: col,
+                line_glyphs,
+                baseline,
+                descent: desc,
+                hyphen_at,
+                sub_objects,
+                carry: &mut carry,
+            }) {
+                LineFit::Ready(line_notes) => line_notes,
+                LineFit::Restart(j) => return LinePlacement::Restart(j),
+                LineFit::NextSub => {
+                    g0 = s;
+                    col_first_line = line_no;
+                    moved = true;
+                    break;
+                }
+                LineFit::NextColumn => {
+                    g0 = s;
+                    advance_placement_column(cur, spanning, cols);
+                    col_first_line = line_no;
+                    moved = true;
+                    break;
+                }
+            };
+            let col_w = notes.area(&cols[cur.fi], cur.col).map_or(0.0, |r| r.width());
+            let note_column = NoteColumn { frame_index: cur.fi, column_index: cur.col, width: col_w, frame: f };
+            // A drop cap sits at the start-side indent; the first-line indent doesn't move it.
+            let beside = drop_cap.filter(|dc| line_no < dc.lines && col_first_line == 0).map(|dc| dc.indent());
+            let first_line = if line_no == 0 { pp.first_line_indent } else { 0.0 };
+            let (ind_l, ind_r) = match beside {
+                Some(w) if rtl => (pp.left_indent, pp.right_indent + w),
+                Some(w) => (pp.left_indent + w, pp.right_indent),
+                // The first-line indent is at the paragraph's start side, which is the right
+                // one in a right-to-left paragraph: applied on the left it moved the line the
+                // wrong way, out of the frame for the hanging indent a numbered list uses
+                // (#1448).
+                None if rtl => (pp.left_indent, pp.right_indent + first_line),
+                None => (pp.left_indent + first_line, pp.right_indent),
+            };
+            let lx0 = x0 + ind_l;
+            let lx1 = x1 - ind_r;
+            let last = k + 1 == breaks.len();
+            // The break character that ends this line, if any (it is the line's last glyph).
+            let brk =
+                if b.forced && e > s { e.checked_sub(1).and_then(|i| glyphs.get(i)).map(|g| g.ch).filter(|&c| breaker::is_forced(c)) } else { None };
+            // A column, frame or page break ends the line as a paragraph's last line (last-line
+            // alignment); a justified line ended by a forced line break stays justified.
+            let ends_para = last || brk.is_some_and(story::is_break_char);
+            let forced_mid = brk == Some(story::FORCED_LINE_BREAK) && !last;
+            let (mut placed, end_x, ratio) =
+                layout_line(glyphs, s, e, b.hyphen, lx0, lx1, col.x0, pp, spacing, ends_para, forced_mid, f.left_page, bidi_info);
+            let end_x = if line_no == 0 && s == 0 { align_label(&mut placed, label_aligned, label_tab, list_align, end_x) } else { end_x };
+            // Warichu runs before ruby so a reading is placed over the stacked note, and before
+            // the trimmed spaces and the drop cap join the line, so neither is stacked.
+            let end_x = end_x + warichu::place(styles_tab, &mut placed);
+            // The spaces the break trimmed off the end follow the line undrawn, so the caret
+            // and the selection reach them; alignment and justification ignore them.
+            if pp.direction != designcraft_doc::TextDirection::RightToLeft && !placed.iter().any(|g| g.rtl) {
+                let mut x = end_x;
+                for g in glyphs.get(e..(g0 + b.next).min(glyphs.len())).unwrap_or(&[]).iter().filter(|g| g.is_space()) {
+                    placed.push(PlacedGlyph { visible: false, ..place(g, x) });
+                    x += g.adv;
+                }
+            }
+            let mut drop_box = None;
+            if line_no == 0
+                && let Some(dc) = &drop_cap
+            {
+                let at = if rtl { x1 - pp.right_indent - dc.width } else { x0 + pp.left_indent - dc.lsb };
+                placed.splice(0..0, place_drop_cap(dc, at, rtl));
+                drop_box = Some(DropCapBox {
+                    end: dc.end,
+                    baseline: baseline + dc.drop,
+                    // From its line's top, or its own top when it rises above that line.
+                    rect: Rect::new(at, (baseline - asc).min(baseline + dc.drop - dc.cap), at + dc.width, baseline + dc.drop + desc),
+                });
+            }
+            ruby::annotate(db, styles_tab, &story.text, &mut placed, doc.settings.glyph_fallback, f.vertical);
+            kenten::annotate(db, styles_tab, &mut placed, doc.settings.glyph_fallback);
+            let range_end = if last { prange.end } else { glyphs.get(g0 + b.next).map(|g| g.byte).unwrap_or(prange.end) };
+            let range_start = glyphs.get(s).map(|g| g.byte).unwrap_or(prange.start).min(range_end);
+            let range_start = if line_no == 0 { prange.start } else { range_start };
+            let ft = &mut out.frames[cur.fi];
+            if line_no == 0 {
+                first_line_rect = Some((cur.fi, baseline, asc, x0));
+            }
+            if let Some(sb) = cur.split.as_mut() {
+                sb.line0.get_or_insert(ft.lines.len());
+                sb.sub_lines += 1;
+                sb.part_lines += 1;
+            }
+            ft.lines.push(Line {
+                column: cur.col as u32,
+                baseline,
+                x0,
+                x1,
+                ascent: asc,
+                descent: desc,
+                leading: lead,
+                range: range_start..range_end,
+                para: pi,
+                glyphs: placed,
+                hyphenated: b.hyphen,
+                first_in_para: line_no == 0,
+                last_in_para: last,
+                end_x,
+                spacing: ratio,
+                hj: hj_severity(ratio, pp.word_space_min, pp.word_space_max),
+                keep_violation: false,
+                drop_cap: drop_box,
+            });
+            let placed_notes = !line_notes.is_empty();
+            for k in line_notes {
+                notes.place(doc, k, note_column, opts);
+            }
+            // Notes spanning the columns take room from the columns before this one too: re-lay
+            // the frame with that room left.
+            if placed_notes {
+                let r = notes.reserve(doc, note_column, &[], opts);
+                if notes.earlier_columns_collide(&out.frames[cur.fi].lines, cur.fi, cur.col, &cols[cur.fi], r)
+                    && let Some(j) = out.frames[cur.fi].lines.first().map(|l| l.para)
+                {
+                    rewind(j, snaps, note_snaps, notes, out, cur, list_counter, force_col, line_cap, no_hyph);
+                    return LinePlacement::Restart(j);
+                }
+            }
+            let ft = &mut out.frames[cur.fi];
+            place_sub_objects(story, ft, sub_objects, ft.lines.len() - 1, line_glyphs, base_chars.size);
+            cur.last_baseline = Some(baseline);
+            cur.last_reference = reference;
+            cur.aki_below = (model == designcraft_doc::cjk::LeadingModel::AkiBelow).then_some(lead);
+            cur.last_descent = desc;
+            cur.pending = 0.0;
+            cur.grid_next = grid_end.map(|end| (baseline, end));
+            hyphen_at =
+                e.checked_sub(1).filter(|&i| b.hyphen && hyph_after.get(i) == Some(&true)).and_then(|i| glyphs.get(i)).map(|g| g.byte + g.len);
+            line_no += 1;
+            // A column / frame / page break inside the paragraph: the rest of it continues in the
+            // new column/frame/page, re-broken there. (A break that ends the paragraph moves the
+            // next paragraph instead.)
+            if let Some(start) = forced_break_start(b.forced, k + 1 < breaks.len(), brk) {
+                start_placement(cur, start, spanning, frames, cols, doc);
+                col_first_line = line_no;
+                g0 += b.next;
+                carry.clear();
+                moved = true;
+                break;
+            }
+            // An own-story anchored object anchored in this line wraps the lines after it,
+            // which were broken without it: break them again.
+            if k + 1 < breaks.len() && line_has_wrapping_exclusion(f, range_start..range_end, col, baseline) {
+                g0 += b.next;
+                moved = true;
+                break;
+            }
+        }
+        if !moved {
+            break;
+        }
+    }
+    LinePlacement::Complete { line_no, col_first_line, first_line_rect }
+}
+
+struct ParagraphShapeInput<'a, 'font> {
+    db: &'a ScopedFonts<'font>,
+    doc: &'a Document,
+    story: &'a Story,
+    opts: &'a ComposeOptions,
+    range: Range<usize>,
+    props: &'a mut designcraft_doc::ParaProps,
+    para_chars: &'a designcraft_doc::CharProps,
+    frame: Option<&'a FrameSpec>,
+    paragraph: usize,
+    subst: &'a SubstCtx,
+    exceptions: &'a HashMap<String, Vec<usize>>,
+    suppressed_hyphens: &'a [usize],
+    named_labels: &'a [Option<String>],
+    list_counter: &'a mut ListCounter,
+    styles: &'a mut Vec<RunStyle>,
+    missing_fonts: &'a mut HashMap<String, bool>,
+    frames: &'a [FrameSpec],
+    columns: &'a [Vec<Rect>],
+    cursor: &'a Cursor,
+}
+
+struct ShapedParagraph {
+    sub_objects: HashMap<usize, shape::ObjectSpec>,
+    base_leading: f64,
+    above: (String, f32),
+    below: (String, f32),
+    drop_cap: Option<DropCap>,
+    label_aligned: usize,
+    label_tab: bool,
+    list_align: ListAlign,
+    glyphs: Vec<Glyph>,
+    bidi_text: String,
+    hyph_after: Vec<bool>,
+    base_size: f64,
+    spacing: Spacing,
+    mark_chars: designcraft_doc::CharProps,
+    mark_leading: f64,
+    last_line_mark: Option<f64>,
+    para_box: Option<ParaBox>,
+}
+
+fn shape_paragraph(input: ParagraphShapeInput<'_, '_>) -> ShapedParagraph {
+    let ParagraphShapeInput {
+        db,
+        doc,
+        story,
+        opts,
+        range: prange,
+        props: pp,
+        para_chars: base_chars,
+        frame: cur_frame,
+        paragraph,
+        subst: sub,
+        exceptions: hyph_exceptions,
+        suppressed_hyphens,
+        named_labels,
+        list_counter,
+        styles,
+        missing_fonts,
+        frames,
+        columns,
+        cursor,
+    } = input;
+    let drop_end = drop_cap_end(&story.text, prange.clone(), pp, sub.vertical);
+    let mut table = StyleTable { styles, missing: missing_fonts };
+    let env = shape::TypeEnv { auto_leading: pp.auto_leading, adv: doc.settings.advanced_type, glyph_fallback: doc.settings.glyph_fallback };
+    let mut sp = shape::shape_para(
+        shape::ShapeInput {
+            db,
+            styles: &doc.styles,
+            story,
+            range: prange.clone(),
+            para_chars: base_chars,
+            auto_leading: env,
+            sub,
+            nested: &pp.nested_styles,
+            grep: &pp.grep_styles,
+            lines: &[],
+            drop_cap: (drop_end, &pp.drop_cap_style),
+        },
+        &mut table,
+    );
+    // An empty paragraph has no glyphs of its own, so its only addressable character is its
+    // hidden paragraph mark (the `\n` just past `prange.end`). A leading/size override applied
+    // there (e.g. selecting the pilcrow to adjust line height) still needs to set the line's
+    // height, so resolve the mark's own run instead of the paragraph's plain default when present.
+    let mark_chars = prange
+        .is_empty()
+        .then(|| story.runs().find(|(r, _)| r.contains(&prange.end)))
+        .flatten()
+        .map(|(_, fmt)| doc.styles.resolve_char(base_chars, fmt))
+        .unwrap_or_else(|| base_chars.clone());
+    let leading_chars = &mark_chars;
+    // Drop cap: the size and indent come from the text beside it (`base_*` when there's none).
+    let base_leading = match leading_chars.leading {
+        designcraft_doc::Leading::Auto => leading_chars.size * pp.auto_leading,
+        designcraft_doc::Leading::Points(v) => v,
+    };
+    let base_cap = {
+        let face = db.face(&base_chars.font_family, &base_chars.font_style);
+        face.cap_height * base_chars.size / face.upem * base_chars.v_scale
+    };
+    let drop_grid = cur_frame.and_then(|f| f.grid).filter(|_| pp.grid_align == GridAlign::AllLines).map(|g| g.1);
+    // Align Left Edge (left-to-right paragraphs).
+    let drop_align = pp.drop_cap_align_left && pp.direction == designcraft_doc::TextDirection::LeftToRight;
+    // Tab stops for the drop cap, with the start-side indent (the right one, right to left).
+    let drop_tab_indent = if pp.direction == designcraft_doc::TextDirection::RightToLeft { pp.right_indent } else { pp.left_indent };
+    apply_nested_line_styles(NestedLineStyleInput {
+        db,
+        doc,
+        story,
+        range: prange.clone(),
+        props: pp,
+        para_chars: base_chars,
+        drop_end,
+        base_leading,
+        base_cap,
+        drop_grid,
+        drop_align,
+        drop_tabs: (&pp.tabs[..], drop_tab_indent),
+        cursor,
+        frames,
+        columns,
+        exceptions: hyph_exceptions,
+        suppressed_hyphens,
+        subst: sub,
+        style_table: &mut table,
+        env,
+        shaped: &mut sp,
+    });
+    // Rules in Text Color: the colour of the paragraph's first character (rule above) and last
+    // character (rule below).
+    let text_color = |g: Option<&Glyph>| {
+        g.and_then(|g| table.styles.get(g.style as usize)).map_or((base_chars.fill.clone(), base_chars.fill_tint), |s| (s.fill.clone(), s.fill_tint))
+    };
+    let (above, below) = (text_color(sp.glyphs.iter().find(|g| g.len > 0)), text_color(sp.glyphs.iter().rev().find(|g| g.len > 0)));
+    let drop_cap = split_drop_cap(
+        db,
+        &mut sp.glyphs,
+        drop_end,
+        pp.drop_cap_lines,
+        base_leading,
+        base_cap,
+        drop_grid,
+        drop_align,
+        (&pp.tabs[..], drop_tab_indent),
+    );
+    // List labels take the default super/subscript settings.
+    let label_env = shape::TypeEnv { adv: Default::default(), ..env };
+    let list_label = match pp.list_type {
+        // An empty paragraph has no bullet or number, and the numbering carries on past it.
+        designcraft_doc::ListType::Numbers | designcraft_doc::ListType::Bullets if prange.is_empty() => None,
+        // A named list: carries on past other paragraphs (and from earlier stories).
+        designcraft_doc::ListType::Numbers if !pp.list_name.is_empty() => {
+            Some(named_labels.get(paragraph).cloned().flatten().unwrap_or_else(|| pp.number_label(1)))
+        }
+        designcraft_doc::ListType::Numbers => {
+            list_counter.advance(pp);
+            Some(pp.number_label_in(list_counter))
+        }
+        designcraft_doc::ListType::Bullets => Some(pp.bullet_label()),
+        designcraft_doc::ListType::None => {
+            *list_counter = ListCounter::default();
+            None
+        }
+    };
+    // The label's glyphs at the paragraph start, and how many of them (up to its first tab)
+    // the list alignment places.
+    let mut label_aligned = 0usize;
+    let mut label_tab = false;
+    if let Some(label) = &list_label {
+        let mut chars = label_chars(doc, pp, base_chars);
+        // The number is drawn in the Digits of the paragraph's first run, so Persian text
+        // gets Persian numbers whether Digits is set on the paragraph style or on the text
+        // (unless the number's character style sets its own).
+        if chars.digits == base_chars.digits
+            && let Some((_, fmt)) = story.runs().find(|(rr, _)| rr.end > prange.start && rr.start < prange.end)
+        {
+            chars.digits = doc.styles.resolve_char(base_chars, fmt).digits;
+        }
+        let n = prepend_label(db, &mut sp.glyphs, label, prange.start, &chars, label_env, &mut table);
+        for g in sp.glyphs.iter_mut().take(n) {
+            g.list_label = true;
+        }
+        label_aligned = sp.glyphs.get(..n).unwrap_or_default().iter().position(|g| g.ch == '\t').unwrap_or(n);
+        label_tab = label_aligned < n;
+        // Tab Position: a stop for the text after the label.
+        if let Some(t) = pp.list_tab.filter(|t| t.is_finite() && *t >= 0.0)
+            && !pp.tabs.iter().any(|s| (s.position - t).abs() < 1e-6)
+        {
+            pp.tabs.push(designcraft_doc::TabStop { position: t, align: TabAlign::Left, leader: String::new(), align_on: String::new() });
+            pp.tabs.sort_by(|a, b| a.position.total_cmp(&b.position));
+        }
+    }
+    if paragraph == 0
+        && let Some(label) = &opts.label
+    {
+        prepend_label(db, &mut sp.glyphs, label, prange.start, base_chars, label_env, &mut table);
+        label_aligned = 0;
+    }
+    let list_align = match pp.list_type {
+        _ if label_aligned == 0 || pp.direction == designcraft_doc::TextDirection::RightToLeft => designcraft_doc::ListAlign::Left,
+        designcraft_doc::ListType::Bullets => pp.bullet_align,
+        _ => pp.number_align,
+    };
+    let para_box = ParaBox::of(doc, pp);
+    let mut glyphs = sp.glyphs;
+    if !pp.composer.japanese() {
+        // Every IDML's root style carries a leading model and character alignment, which only
+        // the Japanese composers use.
+        for g in &mut glyphs {
+            g.leading_model = designcraft_doc::cjk::LeadingModel::Roman;
+            g.character_alignment = designcraft_doc::cjk::CharacterAlignment::Baseline;
+        }
+    }
+    let bidi_text = bidi::paragraph_text(&mut glyphs, &story.text);
+    bidi::resolve_mirroring(
+        &mut glyphs,
+        &unicode_bidi::BidiInfo::new(
+            &bidi_text,
+            Some(if pp.direction == designcraft_doc::TextDirection::RightToLeft { unicode_bidi::Level::rtl() } else { unicode_bidi::Level::ltr() }),
+        ),
+    );
+    apply_desired_spacing(&mut glyphs, pp);
+    mojikumi::apply(&mut glyphs, &doc.styles, &pp.mojikumi);
+    let mut hyph_after = hyphenation_points(&story.text, &glyphs, pp, hyph_exceptions, &foreign_ranges(doc, story, prange.clone(), base_chars));
+    suppress_hyphens(&mut hyph_after, &glyphs, suppressed_hyphens);
+    let base_size = base_chars.size;
+    let spacing = spacing_for(pp, base_size, story);
+    // An empty paragraph takes its height from its paragraph mark's character format.
+    let mark_chars = if glyphs.is_empty() { doc.styles.resolve_char(base_chars, story.char_format_of(prange.start)) } else { base_chars.clone() };
+    let mark_leading = match mark_chars.leading {
+        designcraft_doc::Leading::Auto => mark_chars.size * pp.auto_leading,
+        designcraft_doc::Leading::Points(v) => v,
+    };
+    // The paragraph mark is a character of the last line: its leading counts there like any
+    // other character's. It doesn't set the line's ascent or descent. A hidden or deleted
+    // mark takes no room.
+    let last_line_mark = story.text.get(prange.end..).filter(|t| t.starts_with('\n')).and_then(|_| {
+        let props = doc.styles.resolve_char(base_chars, story.format_after(prange.end));
+        let hidden = props.change == designcraft_doc::ChangeMark::Deleted
+            || (!props.conditions.is_empty() && props.conditions.iter().all(|c| sub.hidden_conditions.contains(c)));
+        (!hidden).then_some(match props.leading {
+            designcraft_doc::Leading::Auto => props.size * pp.auto_leading,
+            designcraft_doc::Leading::Points(v) => v,
+        })
+    });
+    ShapedParagraph {
+        sub_objects: sub.objects.clone(),
+        base_leading,
+        above,
+        below,
+        drop_cap,
+        label_aligned,
+        label_tab,
+        list_align,
+        glyphs,
+        bidi_text,
+        hyph_after,
+        base_size,
+        spacing,
+        mark_chars,
+        mark_leading,
+        last_line_mark,
+        para_box,
+    }
+}
+
+struct ParagraphFinishInput<'a> {
+    doc: &'a Document,
+    story: &'a Story,
+    frames: &'a [FrameSpec],
+    cols: &'a [Vec<Rect>],
+    out: &'a mut ComposedStory,
+    cur: &'a mut Cursor,
+    notes: &'a mut Notes,
+    snaps: &'a [Snapshot],
+    note_snaps: &'a [(u32, Option<usize>, usize)],
+    list_counter: &'a mut ListCounter,
+    force_col: &'a mut [bool],
+    line_cap: &'a mut [Option<usize>],
+    no_hyph: &'a mut [Vec<usize>],
+    split_trial: &'a mut Option<Trial<SplitKey>>,
+    split_limits: &'a mut Rc<Vec<(SplitKey, f64)>>,
+    split_runs: &'a mut usize,
+    split_budget: usize,
+    paragraph: usize,
+    paragraph_count: usize,
+    props: &'a designcraft_doc::ParaProps,
+    info: &'a mut Vec<ParaInfo>,
+    start_at: (usize, usize),
+    at_top: bool,
+    end_line: usize,
+    end_column_first_line: usize,
+    first_line_rect: Option<(usize, f64, f64, f64)>,
+    above: &'a (String, f32),
+    below: &'a (String, f32),
+    spanning: bool,
+}
+
+enum ParagraphFinish {
+    Done(bool),
+    Restart(usize),
+}
+
+fn finish_paragraph(input: ParagraphFinishInput<'_>) -> ParagraphFinish {
+    let ParagraphFinishInput {
+        doc,
+        story,
+        frames,
+        cols,
+        out,
+        cur,
+        notes,
+        snaps,
+        note_snaps,
+        list_counter,
+        force_col,
+        line_cap,
+        no_hyph,
+        split_trial,
+        split_limits,
+        split_runs,
+        split_budget,
+        paragraph: pi,
+        paragraph_count: np,
+        props: pp,
+        info,
+        start_at,
+        at_top,
+        end_line: line_no,
+        end_column_first_line: col_first_line,
+        first_line_rect,
+        above,
+        below,
+        spanning,
+    } = input;
+    let spans_in = |fi: usize| spanning && cols.get(fi).is_some_and(|c| c.len() > 1);
+    info.push(ParaInfo {
+        start: start_at,
+        at_top,
+        end: (cur.fi, cur.col),
+        lines: line_no,
+        lines_in_end_col: line_no - col_first_line,
+        keep_with_next: pp.keep_with_next,
+        keep_together: pp.keep_lines_together,
+        keep_all: pp.keep_all_lines,
+        keep_first: pp.keep_first as usize,
+        keep_last: pp.keep_last as usize,
+    });
+    // The columns below a spanning paragraph start under it.
+    if spanning
+        && let Some(ft) = out.frames.get(cur.fi)
+        && let Some(l) = ft.lines.last().filter(|l| l.para == pi)
+    {
+        let top_band = Above {
+            top: l.baseline + l.descent,
+            baseline: l.baseline,
+            descent: l.descent,
+            reference: cur.last_reference,
+            aki_below: cur.aki_below,
+            pending: if spans_in(cur.fi) { pp.space_after.max(pp.span_space_after) } else { pp.space_after },
+        };
+        cur.band = Band { para: pi + 1, line0: ft.lines.len(), above: Some(top_band), tail: None };
+    }
+    // Rules and shading for the paragraph.
+    if let Some((fi, bl, _, _)) = first_line_rect {
+        let ft = &mut out.frames[fi];
+        if pp.rule_above.on {
+            let r = &pp.rule_above;
+            // The offset runs from the first line's baseline up to the rule's bottom edge.
+            let y = bl - r.offset;
+            let col = ft
+                .lines
+                .iter()
+                .find(|l| l.para == pi && l.first_in_para)
+                .map(|l| if r.column_width { (l.x0, l.x1) } else { (l.x0, l.end_x) })
+                .unwrap_or((0.0, 0.0));
+            let (color, tint) = rule_color(r, above);
+            ft.decos.push(Deco { rect: Rect::new(col.0 + r.left_indent, y - r.weight, col.1 - r.right_indent, y), color, tint, ..Deco::default() });
+        }
+    }
+    if pp.rule_below.on
+        && let Some(ft) = out.frames.get_mut(cur.fi.min(frames.len().saturating_sub(1)))
+        && let Some(l) = ft.lines.iter().rev().find(|l| l.para == pi)
+    {
+        let r = &pp.rule_below;
+        let y = l.baseline + r.offset;
+        let (x0, x1) = if r.column_width { (l.x0, l.x1) } else { (l.x0, l.end_x) };
+        let (color, tint) = rule_color(r, below);
+        ft.decos.push(Deco { rect: Rect::new(x0 + r.left_indent, y, x1 - r.right_indent, y + r.weight), color, tint, ..Deco::default() });
+    }
+    // The end of a split block: text after it continues below its deepest sub-column, which
+    // are balanced first. A block that ends the story fills its sub-columns in turn.
+    let mut ends_split = false;
+    if let Some(sb) = cur.split {
+        let next = story.paras.get(pi + 1).filter(|_| story.para_table(pi + 1).is_none()).and_then(|p| SplitCfg::of(&doc.styles.resolve_para(p).0));
+        if next != Some(sb.cfg) {
+            cur.split = None;
+            ends_split = true;
+            let part = out.frames.get(cur.fi).and_then(|ft| {
+                let lines = ft.lines.get(sb.line0?..)?;
+                let top = lines.first().map(|l| l.baseline - l.ascent)?;
+                let deepest = lines.iter().map(|l| (l.baseline, l.descent)).max_by(|a, b| (a.0 + a.1).total_cmp(&(b.0 + b.1)))?;
+                Some((sb.top.unwrap_or(top), deepest))
+            });
+            if pi + 1 < np
+                && let Some((top, (baseline, descent))) = part
+            {
+                let key = (cur.fi, cur.col, sb.para);
+                let active = split_trial.as_ref().is_some_and(|t| t.key == key);
+                if !active && let Some(t) = split_trial.take() {
+                    set_limit(split_limits, t.key, None);
+                }
+                if sb.part_lines > 1 && (active || limit_of(split_limits, key).is_none() && *split_runs < split_budget) {
+                    let bottom = baseline + descent;
+                    let mut t = split_trial.take().unwrap_or(Trial { key, span: pi, lo: top, hi: bottom, tries: 0, done: false });
+                    // This layout fits: its bottom is the best so far.
+                    t.hi = t.hi.min(bottom);
+                    let next = if t.done { t.hi } else { t.next() };
+                    set_limit(split_limits, key, Some(next));
+                    if !t.done {
+                        *split_trial = Some(t);
+                        *split_runs += 1;
+                        rewind(key.2, snaps, note_snaps, notes, out, cur, list_counter, force_col, line_cap, no_hyph);
+                        return ParagraphFinish::Restart(key.2);
+                    }
+                }
+                cur.last_baseline = Some(baseline);
+                cur.last_descent = descent;
+            }
+        }
+    }
+    ParagraphFinish::Done(ends_split)
+}
+
 fn compose_with_db(doc: &Document, story: &Story, frames: &[FrameSpec], opts: &ComposeOptions, db: &FontDb) -> ComposedStory {
     let db = &db.scoped(doc.font_scope);
     let mut out = ComposedStory { story: story.id, rev: story.rev, text_len: story.text.len(), ..Default::default() };
     let mut styles_tab: Vec<RunStyle> = Vec::new();
     let mut missing_fonts: HashMap<String, bool> = HashMap::new();
-    let cols: Vec<Vec<Rect>> = frames
-        .iter()
-        .map(|f| {
-            let mut columns = f.columns();
-            if story.direction == designcraft_doc::TextDirection::RightToLeft && !f.vertical {
-                columns.reverse();
-            }
-            columns
-        })
-        .collect();
-    out.frames = frames
-        .iter()
-        .zip(&cols)
-        .map(|(f, columns)| FrameText { frame: f.id, vertical: f.vertical, columns: columns.clone(), ..Default::default() })
-        .collect();
+    let (cols, frame_text) = frame_columns_and_text(frames, story.direction);
+    out.frames = frame_text;
     let mut cur = Cursor {
         fi: 0,
         col: 0,
@@ -837,24 +2647,7 @@ fn compose_with_db(doc: &Document, story: &Story, frames: &[FrameSpec], opts: &C
     let hyph_exceptions = doc.hyphenation_exception_map();
     let mut list_counter = ListCounter::default();
     // Named lists number independently of layout: one pass up front, for the labels.
-    let named_labels: Vec<Option<String>> = {
-        let mut counters: std::collections::HashMap<String, ListCounter> = std::collections::HashMap::new();
-        story
-            .paras
-            .iter()
-            .zip(&para_ranges)
-            .zip(&deleted)
-            .map(|((p, r), del)| {
-                let (pp, _) = doc.styles.resolve_para(p);
-                if pp.list_type != designcraft_doc::ListType::Numbers || pp.list_name.is_empty() || r.is_empty() || *del {
-                    return None;
-                }
-                let c = counters.entry(pp.list_name.clone()).or_insert_with(|| doc.list_start(story.id, &pp.list_name));
-                c.advance(&pp);
-                Some(pp.number_label_in(c))
-            })
-            .collect()
-    };
+    let named_labels = named_list_labels(doc, story, &para_ranges, &deleted);
     // Border and shading of each paragraph set, drawn once the lines are in place.
     let mut boxes: Vec<Option<ParaBox>> = vec![None; np];
     // Keep options: paragraphs are re-laid from a snapshot when a keep is violated, either forced
@@ -912,36 +2705,30 @@ fn compose_with_db(doc: &Document, story: &Story, frames: &[FrameSpec], opts: &C
             pi = j;
             continue 'paras;
         }
-        if pi >= np {
-            // The story ends here: Balance Columns evens out the columns of its last frame.
-            if balance_frames > 0
-                && let Some(j) = balance_end(&mut trial, &mut limits, &cur, &cols, frames, &out, np, balance_runs < balance_budget)
-            {
+        match paragraph_progress(ParagraphProgressInput {
+            paragraph: pi,
+            count: np,
+            balance_frames,
+            trial: &mut trial,
+            limits: &mut limits,
+            cursor: &cur,
+            columns: &cols,
+            frames,
+            out: &out,
+            may_retry: balance_runs < balance_budget,
+        }) {
+            ParagraphProgress::Continue => {}
+            ParagraphProgress::Restart(j) => {
                 balance_runs += 1;
                 rewind(j, &snaps, &note_snaps, &mut notes, &mut out, &mut cur, &mut list_counter, &mut force_col, &mut line_cap, &mut no_hyph);
                 pi = j;
                 continue 'paras;
             }
-            break 'paras;
+            ParagraphProgress::Complete => break 'paras,
         }
         if deleted.get(pi).copied().unwrap_or(false) {
             // A deleted paragraph takes no room; for keeps it stands in for the one before it.
-            let filler = info.last().map_or(
-                ParaInfo {
-                    start: (cur.fi, cur.col),
-                    at_top: cur.last_baseline.is_none(),
-                    end: (cur.fi, cur.col),
-                    lines: 0,
-                    lines_in_end_col: 0,
-                    keep_with_next: 0,
-                    keep_together: false,
-                    keep_all: false,
-                    keep_first: 1,
-                    keep_last: 1,
-                },
-                |p| ParaInfo { lines_in_end_col: 0, ..p.clone() },
-            );
-            info.push(filler);
+            info.push(deleted_paragraph_info(&info, &cur));
             pi += 1;
             continue;
         }
@@ -950,333 +2737,110 @@ fn compose_with_db(doc: &Document, story: &Story, frames: &[FrameSpec], opts: &C
         let (mut pp, base_chars) = doc.styles.resolve_para(pf);
         // A break character that ends the previous paragraph sends this one on, like a start option.
         // Deleted paragraphs in between don't count, nor does a deleted or hidden break.
-        let after_break = (0..pi).rev().find(|p| !deleted.get(*p).copied().unwrap_or(false)).and_then(|p| {
-            let r = para_ranges.get(p)?;
-            let (i, c) = story.text.get(r.clone())?.char_indices().next_back()?;
-            let start = break_start(c)?;
-            let (_, chars) = doc.styles.resolve_para(story.paras.get(p)?);
-            let props = doc.styles.resolve_char(&chars, story.char_format_at(r.start + i + c.len_utf8()));
-            let gone = props.change == designcraft_doc::ChangeMark::Deleted || doc.conditions_hide(&props.conditions);
-            (!gone).then_some(start)
-        });
+        let after_break = previous_visible_break(doc, story, &para_ranges, &deleted, pi);
         if let Some(t) = story.para_table(pi) {
             let start = after_break.unwrap_or(pp.start_paragraph);
-            if cur.last_baseline.is_some() {
-                cur.start(start, &cols, frames, doc);
-            } else {
-                cur.start_at_top(start, frames, doc);
-            }
-            let at_top = cur.last_baseline.is_none();
-            let start_at = (cur.fi, cur.col);
             let anchor = prange.start + story.text[prange.clone()].find(story::TABLE_ANCHOR).unwrap_or(0);
-            if !table::place_table(doc, t, anchor, pi, &pp, frames, &cols, &mut cur, &mut out, opts) {
-                if let Some(j) = trial_failed(&mut trial, &mut limits, balance_runs < balance_budget) {
-                    balance_runs += 1;
-                    rewind(j, &snaps, &note_snaps, &mut notes, &mut out, &mut cur, &mut list_counter, &mut force_col, &mut line_cap, &mut no_hyph);
+            match place_table_paragraph(TableParagraphInput {
+                doc,
+                table: t,
+                anchor,
+                paragraph: pi,
+                range_start: prange.start,
+                props: &pp,
+                start,
+                frames,
+                columns: &cols,
+                cursor: &mut cur,
+                out: &mut out,
+                opts,
+                trial: &mut trial,
+                limits: &mut limits,
+                balance_runs: &mut balance_runs,
+                balance_budget,
+                snaps: &snaps,
+                note_snaps: &note_snaps,
+                notes: &mut notes,
+                list_counter: &mut list_counter,
+                force_col: &mut force_col,
+                line_cap: &mut line_cap,
+                no_hyph: &mut no_hyph,
+                info: &mut info,
+                boxes: &mut boxes,
+            }) {
+                TableParagraphResult::Placed => {
+                    pi += 1;
+                    continue;
+                }
+                TableParagraphResult::Restart(j) => {
                     pi = j;
                     continue 'paras;
                 }
-                out.overset_at = Some(prange.start);
-                break 'paras;
+                TableParagraphResult::Overset => break 'paras,
             }
-            info.push(ParaInfo {
-                start: start_at,
-                at_top,
-                end: (cur.fi, cur.col),
-                lines: 1,
-                lines_in_end_col: 1,
-                keep_with_next: 0,
-                keep_together: false,
-                keep_all: false,
-                keep_first: 1,
-                keep_last: 1,
-            });
-            list_counter = ListCounter::default();
-            boxes[pi] = None;
-            cur.pending += pp.space_after;
-            pi += 1;
-            continue;
         }
         // Bullets & numbering: generated prefix (shaped as its own glyphs, mapped to the paragraph start).
         let cur_frame = frames.get(cur.fi.min(frames.len().saturating_sub(1)));
-        let var_values = if var_story {
-            let page = opts.page.or_else(|| cur_frame.and_then(|f| f.page));
-            var_cache.entry(page).or_insert_with(|| std::sync::Arc::new(vars::values(doc, page, opts.running.as_deref()))).clone()
-        } else {
-            Default::default()
-        };
-        let mut sub = SubstCtx {
-            page_name: opts.page_name.clone().or_else(|| cur_frame.and_then(|f| f.page_name.clone())),
-            section_marker: opts.section_marker.clone().or_else(|| cur_frame.and_then(|f| f.section_marker.clone())),
-            vars: var_values,
-            hidden_conditions: doc.conditions.iter().filter(|c| !c.visible).map(|c| c.name.clone()).collect(),
-            vertical: cur_frame.is_some_and(|f| f.vertical),
-            auto_tcy: pp.auto_tcy.min(shape::AUTO_TCY_MAX),
-            auto_tcy_roman: pp.auto_tcy_include_roman,
-            rotate_roman: pp.rotate_roman,
-            ..Default::default()
-        };
-        if !story.endnotes.is_empty() {
-            // Endnote reference numbers continue through the document.
-            let first = doc.endnote_start(story.id) + story.text[..prange.start].matches(designcraft_doc::ENDNOTE_REF).count() as u32;
-            for (k, (i, _)) in story.text[prange.clone()].match_indices(designcraft_doc::ENDNOTE_REF).enumerate() {
-                sub.notes.insert(prange.start + i, doc.endnote_options.label(first + k as u32));
-            }
-        }
-        if !story.objects.is_empty() {
-            let before = story.text[..prange.start].matches(designcraft_doc::OBJECT_MARK).count();
-            for (k, (i, _)) in story.text[prange.clone()].match_indices(designcraft_doc::OBJECT_MARK).enumerate() {
-                let Some(o) = story.objects.get(before + k) else { continue };
-                let (w, h) = o.size();
-                let (y_offset, space, custom) = match &o.position {
-                    designcraft_doc::AnchorPosition::Inline { y_offset } => (Some(*y_offset), 0.0, false),
-                    designcraft_doc::AnchorPosition::AboveLine { space_before, space_after, .. } => (None, space_before + space_after, false),
-                    designcraft_doc::AnchorPosition::Custom { .. } => (Some(0.0), 0.0, true),
-                };
-                sub.objects.insert(prange.start + i, shape::ObjectSpec { index: before + k, w, h, y_offset, space, custom });
-            }
-        }
-        if !story.xrefs.is_empty() {
-            sub.xrefs = xref::texts_in(doc, story, prange.clone(), opts.xrefs.as_deref());
-        }
-        if notes.active() {
-            notes.number_refs(doc, prange.clone(), cur_frame.and_then(|f| f.page), &mut sub);
-        }
-        let sub_objects = sub.objects.clone();
-        let drop_end = drop_cap_end(&story.text, prange.clone(), &pp, sub.vertical);
-        let mut table = StyleTable { styles: &mut styles_tab, missing: &mut missing_fonts };
-        let env = shape::TypeEnv { auto_leading: pp.auto_leading, adv: doc.settings.advanced_type, glyph_fallback: doc.settings.glyph_fallback };
-        let mut sp = shape::shape_para(
-            db,
-            &doc.styles,
+        let sub = paragraph_substitution(SubstitutionInput {
+            doc,
             story,
-            pi,
-            prange.clone(),
-            &base_chars,
-            env,
-            &sub,
-            &mut table,
-            &pp.nested_styles,
-            &pp.grep_styles,
-            &[],
-            (drop_end, &pp.drop_cap_style),
-        );
-        // An empty paragraph has no glyphs of its own, so its only addressable character is its
-        // hidden paragraph mark (the `\n` just past `prange.end`). A leading/size override applied
-        // there (e.g. selecting the pilcrow to adjust line height) still needs to set the line's
-        // height, so resolve the mark's own run instead of the paragraph's plain default when present.
-        let mark_chars = prange
-            .is_empty()
-            .then(|| story.runs().find(|(r, _)| r.contains(&prange.end)))
-            .flatten()
-            .map(|(_, fmt)| doc.styles.resolve_char(&base_chars, fmt));
-        let leading_chars = mark_chars.as_ref().unwrap_or(&base_chars);
-        // Drop cap: the size and indent come from the text beside it (`base_*` when there's none).
-        let base_leading = match leading_chars.leading {
-            designcraft_doc::Leading::Auto => leading_chars.size * pp.auto_leading,
-            designcraft_doc::Leading::Points(v) => v,
-        };
-        let base_cap = {
-            let face = db.face(&base_chars.font_family, &base_chars.font_style);
-            face.cap_height * base_chars.size / face.upem * base_chars.v_scale
-        };
-        let drop_grid = cur_frame.and_then(|f| f.grid).filter(|_| pp.grid_align == GridAlign::AllLines).map(|g| g.1);
-        // Align Left Edge (left-to-right paragraphs).
-        let drop_align = pp.drop_cap_align_left && pp.direction == designcraft_doc::TextDirection::LeftToRight;
-        // Tab stops for the drop cap, with the start-side indent (the right one, right to left).
-        let drop_tabs = (&pp.tabs[..], if pp.direction == designcraft_doc::TextDirection::RightToLeft { pp.right_indent } else { pp.left_indent });
-        if !pp.nested_line_styles.is_empty() && cur.fi < frames.len() {
-            // Nested line styles: find where the first lines end in this column, restyle them, and
-            // look again (the style changes the widths) until the lines settle.
-            let cols_here = &cols[cur.fi];
-            let col = span_rect(cols_here, cols_here[cur.col.min(cols_here.len() - 1)], pp.span_columns);
-            let col = SplitCfg::of(&pp).map_or(col, |c| c.sub_rect(col, 0));
-            let spacing = spacing_for(&pp, base_chars.size);
-            let mut lines: Vec<(std::ops::Range<usize>, String)> = Vec::new();
-            for _ in 0..3 {
-                // The same drop cap, spacing, hyphenation and breaker as the layout below.
-                let mut gl = sp.glyphs.clone();
-                let dc = split_drop_cap(db, &mut gl, drop_end, pp.drop_cap_lines, base_leading, base_cap, drop_grid, drop_align, drop_tabs);
-                let width = |j: usize| {
-                    let ind = match &dc {
-                        Some(dc) if j < dc.lines => dc.indent(),
-                        _ if j == 0 => pp.first_line_indent,
-                        _ => 0.0,
-                    };
-                    (col.width() - pp.left_indent - pp.right_indent - ind).max(1.0)
-                };
-                apply_desired_spacing(&mut gl, &pp);
-                mojikumi::apply(&mut gl, &doc.styles, &pp.mojikumi);
-                let mut hy = hyphenation_points(&story.text, &gl, &pp, &hyph_exceptions, &foreign_ranges(doc, story, prange.clone(), &base_chars));
-                suppress_hyphens(&mut hy, &gl, no_hyph.get(pi).map_or(&[], Vec::as_slice));
-                let breaks = if pp.composer.single_line() || gl.iter().any(|g| g.ch == '\t') || gl.len() > 4000 {
-                    let tab = |j: usize, x: f64, i: usize| {
-                        let ind = pp.left_indent + if j == 0 { pp.first_line_indent } else { 0.0 };
-                        tab_advance(&pp.tabs, pp.left_indent, ind + x, gl.get(i + 1..).unwrap_or_default()).0
-                    };
-                    breaker::greedy(&gl, &hy, &spacing, &width, &tab)
-                } else if pp.balance_ragged && !spacing.justify {
-                    breaker::balanced(&gl, &hy, &spacing, &width)
-                } else {
-                    breaker::knuth_plass(&gl, &hy, &spacing, &width)
-                };
-                // Byte where line `k` starts (the paragraph end past the last line).
-                let byte_at =
-                    |k: usize| if k == 0 { prange.start } else { breaks.get(k - 1).and_then(|b| gl.get(b.next)).map_or(prange.end, |g| g.byte) };
-                let mut want = Vec::new();
-                let mut line = 0usize;
-                for nl in &pp.nested_line_styles {
-                    if line >= breaks.len() || nl.lines == 0 {
-                        break;
-                    }
-                    let end = line + nl.lines as usize;
-                    if !nl.style.is_empty() && nl.style != designcraft_doc::NO_CHAR_STYLE {
-                        want.push((byte_at(line)..byte_at(end).max(byte_at(line)), nl.style.clone()));
-                    }
-                    line = end;
-                }
-                if want == lines {
-                    break;
-                }
-                lines = want;
-                sp = shape::shape_para(
-                    db,
-                    &doc.styles,
-                    story,
-                    pi,
-                    prange.clone(),
-                    &base_chars,
-                    env,
-                    &sub,
-                    &mut table,
-                    &pp.nested_styles,
-                    &pp.grep_styles,
-                    &lines,
-                    (drop_end, &pp.drop_cap_style),
-                );
-            }
-        }
-        // Rules in Text Color: the colour of the paragraph's first character (rule above) and last
-        // character (rule below).
-        let text_color = |g: Option<&Glyph>| {
-            g.and_then(|g| table.styles.get(g.style as usize))
-                .map_or((base_chars.fill.clone(), base_chars.fill_tint), |s| (s.fill.clone(), s.fill_tint))
-        };
-        let (above, below) = (text_color(sp.glyphs.iter().find(|g| g.len > 0)), text_color(sp.glyphs.iter().rev().find(|g| g.len > 0)));
-        let rule_color = |r: &designcraft_doc::Rule, text: &(String, f32)| {
-            if r.color == designcraft_doc::TEXT_COLOR { text.clone() } else { (r.color.clone(), r.tint) }
-        };
-        let drop_cap = split_drop_cap(db, &mut sp.glyphs, drop_end, pp.drop_cap_lines, base_leading, base_cap, drop_grid, drop_align, drop_tabs);
-        // List labels take the default super/subscript settings.
-        let label_env = shape::TypeEnv { adv: Default::default(), ..env };
-        let list_label = match pp.list_type {
-            // An empty paragraph has no bullet or number, and the numbering carries on past it.
-            designcraft_doc::ListType::Numbers | designcraft_doc::ListType::Bullets if prange.is_empty() => None,
-            // A named list: carries on past other paragraphs (and from earlier stories).
-            designcraft_doc::ListType::Numbers if !pp.list_name.is_empty() => {
-                Some(named_labels.get(pi).cloned().flatten().unwrap_or_else(|| pp.number_label(1)))
-            }
-            designcraft_doc::ListType::Numbers => {
-                list_counter.advance(&pp);
-                Some(pp.number_label_in(&list_counter))
-            }
-            designcraft_doc::ListType::Bullets => Some(pp.bullet_label()),
-            designcraft_doc::ListType::None => {
-                list_counter = ListCounter::default();
-                None
-            }
-        };
-        // The label's glyphs at the paragraph start, and how many of them (up to its first tab)
-        // the list alignment places.
-        let mut label_aligned = 0usize;
-        let mut label_tab = false;
-        if let Some(label) = &list_label {
-            let mut chars = label_chars(doc, &pp, &base_chars);
-            // The number is drawn in the Digits of the paragraph's first run, so Persian text
-            // gets Persian numbers whether Digits is set on the paragraph style or on the text
-            // (unless the number's character style sets its own).
-            if chars.digits == base_chars.digits
-                && let Some((_, fmt)) = story.runs().find(|(rr, _)| rr.end > prange.start && rr.start < prange.end)
-            {
-                chars.digits = doc.styles.resolve_char(&base_chars, fmt).digits;
-            }
-            let n = prepend_label(db, &mut sp.glyphs, label, prange.start, &chars, label_env, &mut table);
-            for g in sp.glyphs.iter_mut().take(n) {
-                g.list_label = true;
-            }
-            label_aligned = sp.glyphs.get(..n).unwrap_or_default().iter().position(|g| g.ch == '\t').unwrap_or(n);
-            label_tab = label_aligned < n;
-            // Tab Position: a stop for the text after the label.
-            if let Some(t) = pp.list_tab.filter(|t| t.is_finite() && *t >= 0.0)
-                && !pp.tabs.iter().any(|s| (s.position - t).abs() < 1e-6)
-            {
-                pp.tabs.push(designcraft_doc::TabStop { position: t, align: TabAlign::Left, leader: String::new(), align_on: String::new() });
-                pp.tabs.sort_by(|a, b| a.position.total_cmp(&b.position));
-            }
-        }
-        if pi == 0
-            && let Some(label) = &opts.label
-        {
-            prepend_label(db, &mut sp.glyphs, label, prange.start, &base_chars, label_env, &mut table);
-            label_aligned = 0;
-        }
-        let list_align = match pp.list_type {
-            _ if label_aligned == 0 || pp.direction == designcraft_doc::TextDirection::RightToLeft => designcraft_doc::ListAlign::Left,
-            designcraft_doc::ListType::Bullets => pp.bullet_align,
-            _ => pp.number_align,
-        };
-        boxes[pi] = ParaBox::of(doc, &pp);
-        let mut glyphs = sp.glyphs;
-        if !pp.composer.japanese() {
-            // Every IDML's root style carries a leading model and character alignment, which only
-            // the Japanese composers use.
-            for g in &mut glyphs {
-                g.leading_model = designcraft_doc::cjk::LeadingModel::Roman;
-                g.character_alignment = designcraft_doc::cjk::CharacterAlignment::Baseline;
-            }
-        }
-        let bidi_text = bidi::paragraph_text(&mut glyphs, &story.text);
+            range: prange.clone(),
+            props: &pp,
+            frame: cur_frame,
+            opts,
+            var_story,
+            var_cache: &mut var_cache,
+            notes: &mut notes,
+        });
+        let shaped = shape_paragraph(ParagraphShapeInput {
+            db,
+            doc,
+            story,
+            opts,
+            range: prange.clone(),
+            props: &mut pp,
+            para_chars: &base_chars,
+            frame: cur_frame,
+            paragraph: pi,
+            subst: &sub,
+            exceptions: &hyph_exceptions,
+            suppressed_hyphens: no_hyph.get(pi).map_or(&[], Vec::as_slice),
+            named_labels: &named_labels,
+            list_counter: &mut list_counter,
+            styles: &mut styles_tab,
+            missing_fonts: &mut missing_fonts,
+            frames,
+            columns: &cols,
+            cursor: &cur,
+        });
+        boxes[pi] = shaped.para_box;
+        let ShapedParagraph {
+            sub_objects,
+            base_leading,
+            above,
+            below,
+            drop_cap,
+            label_aligned,
+            label_tab,
+            list_align,
+            glyphs,
+            bidi_text,
+            hyph_after,
+            base_size,
+            spacing,
+            mark_chars,
+            mark_leading,
+            last_line_mark,
+            para_box: _,
+        } = shaped;
         let bidi_info = unicode_bidi::BidiInfo::new(
             &bidi_text,
             Some(if pp.direction == designcraft_doc::TextDirection::RightToLeft { unicode_bidi::Level::rtl() } else { unicode_bidi::Level::ltr() }),
         );
-        bidi::resolve_mirroring(&mut glyphs, &bidi_info);
-        apply_desired_spacing(&mut glyphs, &pp);
-        mojikumi::apply(&mut glyphs, &doc.styles, &pp.mojikumi);
-        let mut hyph_after =
-            hyphenation_points(&story.text, &glyphs, &pp, &hyph_exceptions, &foreign_ranges(doc, story, prange.clone(), &base_chars));
-        suppress_hyphens(&mut hyph_after, &glyphs, no_hyph.get(pi).map_or(&[], Vec::as_slice));
-        let base_size = base_chars.size;
-        let spacing = spacing_for(&pp, base_size);
-        // An empty paragraph takes its height from its paragraph mark's character format.
-        let mark_chars = if glyphs.is_empty() {
-            std::borrow::Cow::Owned(doc.styles.resolve_char(&base_chars, story.char_format_of(prange.start)))
-        } else {
-            std::borrow::Cow::Borrowed(&base_chars)
-        };
-        let mark_leading = match mark_chars.leading {
-            designcraft_doc::Leading::Auto => mark_chars.size * pp.auto_leading,
-            designcraft_doc::Leading::Points(v) => v,
-        };
-        // The paragraph mark is a character of the last line: its leading counts there like any
-        // other character's. It doesn't set the line's ascent or descent. A hidden or deleted
-        // mark takes no room.
-        let last_line_mark = story.text.get(prange.end..).filter(|t| t.starts_with('\n')).and_then(|_| {
-            let props = doc.styles.resolve_char(&base_chars, story.format_after(prange.end));
-            let hidden = props.change == designcraft_doc::ChangeMark::Deleted
-                || (!props.conditions.is_empty() && props.conditions.iter().all(|c| sub.hidden_conditions.contains(c)));
-            (!hidden).then_some(match props.leading {
-                designcraft_doc::Leading::Auto => props.size * pp.auto_leading,
-                designcraft_doc::Leading::Points(v) => v,
-            })
-        });
         // A paragraph set across the columns moves on to the next frame where others move on to
         // the next column.
         let spanning = matches!(pp.span_columns, SpanColumns::Span(n) if n != 1);
         span_paras[pi] = spanning;
-        // Span space applies where the paragraph spans more than one column; in a one-column frame
-        // a span changes nothing.
-        let spans_in = |fi: usize| spanning && cols.get(fi).is_some_and(|c| c.len() > 1);
         // Consecutive paragraphs with the same Split Columns settings share a split block; within
         // it, a paragraph moves on to the next sub-column.
         let split_cfg = SplitCfg::of(&pp);
@@ -1395,652 +2959,140 @@ fn compose_with_db(doc: &Document, story: &Story, frames: &[FrameSpec], opts: &C
         let at_top = cur.last_baseline.is_none();
         let start_at = (cur.fi, cur.col);
         // Rule above / shading track the paragraph's first line.
-        let mut g0 = 0usize;
-        let mut line_no = 0usize;
-        // Paragraph line number of the first line in the current column.
-        let mut col_first_line = 0usize;
-        // The story byte at which the last line set ended at an automatic hyphenation point.
-        let mut hyphen_at: Option<usize> = None;
-        let has_tabs = glyphs.iter().any(|g| g.ch == '\t');
-        let mut first_line_rect: Option<(usize, f64, f64, f64)> = None; // frame, baseline, ascent, x-span
-        let rtl = pp.direction == designcraft_doc::TextDirection::RightToLeft;
-        // Paragraph gyoudori: the (frame, column) of the block and the grid line after it.
-        let mut para_block: Option<((usize, usize), f64)> = None;
-        // Segments of a line already placed (beside an object with text on both sides) that the
-        // next lines of the paragraph fill before a new line starts, and that line's baseline.
-        let mut carry: Vec<(f64, f64)> = Vec::new();
-        let mut carry_baseline = 0.0;
-        // The grid line after the carried line's band (see `grid_end`).
-        let mut carry_grid: Option<f64> = None;
-        // Re-breaks after a line's segment turned out other than the breaker assumed.
-        let mut rebreaks = 0usize;
-        loop {
-            if cur.fi >= frames.len() {
-                if let Some(j) = trial_failed(&mut trial, &mut limits, balance_runs < balance_budget) {
-                    balance_runs += 1;
-                    rewind(j, &snaps, &note_snaps, &mut notes, &mut out, &mut cur, &mut list_counter, &mut force_col, &mut line_cap, &mut no_hyph);
-                    pi = j;
-                    continue 'paras;
-                }
-                // An empty last paragraph (the story ends with a return) isn't overset text, as in
-                // InDesign: nothing of it is left to show.
-                if prange.is_empty() && prange.start >= story.text.len() {
-                    break 'paras;
-                }
-                out.overset_at = Some(glyphs.get(g0).map(|g| g.byte).unwrap_or(prange.start));
-                break 'paras;
+        let placement = place_paragraph_lines(
+            PlacementShared {
+                doc,
+                story,
+                frames,
+                cols: &cols,
+                opts,
+                db,
+                out: &mut out,
+                styles_tab: &mut styles_tab,
+                cur: &mut cur,
+                notes: &mut notes,
+                snaps: &snaps,
+                note_snaps: &note_snaps,
+                list_counter: &mut list_counter,
+                force_col: &mut force_col,
+                line_cap: &mut line_cap,
+                no_hyph: &mut no_hyph,
+                trial: &mut trial,
+                limits: &mut limits,
+                balance_runs: &mut balance_runs,
+                balance_budget,
+                split_trial: &mut split_trial,
+                split_limits: &mut split_limits,
+                split_runs: &mut split_runs,
+                split_budget,
+                hyph_relays: &mut hyph_relays,
+                restores: &mut restores,
+            },
+            ParagraphLines {
+                paragraph: pi,
+                range: prange.clone(),
+                props: &pp,
+                glyphs: &glyphs,
+                hyph_after: &hyph_after,
+                drop_cap: drop_cap.as_ref(),
+                base_chars: &base_chars,
+                mark_chars: &mark_chars,
+                mark_leading,
+                base_leading,
+                last_line_mark,
+                base_size,
+                spacing: &spacing,
+                bidi_info: &bidi_info,
+                sub_objects: &sub_objects,
+                spanning,
+                at_top,
+                paragraph_count: np,
+                info: &info,
+                label_aligned,
+                label_tab,
+                list_align,
+            },
+        );
+        let (line_no, col_first_line, first_line_rect) = match placement {
+            LinePlacement::Restart(j) => {
+                pi = j;
+                continue 'paras;
             }
-            let f = &frames[cur.fi];
-            let base = cols[cur.fi][cur.col.min(cols[cur.fi].len() - 1)];
-            let col = cur.clip(base);
-            // A spanning paragraph isn't held to the balanced bottom of the columns above it.
-            let col = if spanning { span_rect(&cols[cur.fi], Rect::new(col.x0, col.y0, col.x1, base.y1), pp.span_columns) } else { col };
-            let col = cur.split_rect(col);
-            // Estimate slots for the breaker with the paragraph's base leading.
-            // A shaped frame's slots change from line to line, so they are estimated with the
-            // band the lines are placed with (or a taller one, so no line outgrows its slot).
-            let (est_asc, est_band) = if f.outline.is_some() {
-                let (a, _, d, _) = line_metrics(&[], &glyphs, g0, mark_leading, mark_chars.size, db, &mark_chars);
-                (a, (a.max(base_chars.size * 0.8), d.max(base_chars.size * 0.25)))
-            } else {
-                (base_chars.size * 0.75, (base_chars.size * 0.8, 0.0))
-            };
-            let est_tops = Tops { typo_ascent: est_asc, cap: est_asc * 0.72, xh: est_asc * 0.5, em: base_chars.size * 0.88 };
-            let est_first =
-                if carry.is_empty() { cur.next_baseline(f, col, base_leading, est_asc, est_tops, &pp) } else { carry_baseline + base_leading };
-            let est_jump = cur.jump(f, base_leading, est_asc, est_tops);
-            let slots = estimate_slots(f, col, est_first, est_jump, base_leading, base_chars.size, est_band, &glyphs[g0..], rtl, &carry);
-            let width = |j: usize| -> f64 {
-                let (x0, x1) = slots.get(j).copied().unwrap_or((col.x0, col.x1));
-                // Beside the drop cap (in the column the paragraph starts in), its width; else the
-                // first-line indent.
-                let ind = pp.left_indent
-                    + pp.right_indent
-                    + match &drop_cap {
-                        Some(dc) if line_no + j < dc.lines && col_first_line == 0 => dc.indent(),
-                        _ if line_no + j == 0 => pp.first_line_indent,
-                        _ => 0.0,
-                    };
-                (x1 - x0 - ind).max(1.0)
-            };
-            let rest = &glyphs[g0..];
-            let rest_h = &hyph_after[g0..];
-            let breaks: Vec<Break> = if pp.composer.single_line() || has_tabs || rest.len() > 4000 {
-                // Where each line starts relative to the tab origin, as `layout_line` places it.
-                let tab = |j: usize, x: f64, i: usize| {
-                    let x0 = slots.get(j).map_or(col.x0, |s| s.0);
-                    let ind = pp.left_indent
-                        + match &drop_cap {
-                            // Beside a drop cap: at its start-side indent (the right side in RTL).
-                            Some(dc) if line_no + j < dc.lines && col_first_line == 0 => {
-                                if rtl {
-                                    0.0
-                                } else {
-                                    dc.indent()
-                                }
-                            }
-                            _ if line_no + j == 0 => pp.first_line_indent,
-                            _ => 0.0,
-                        };
-                    tab_advance(&pp.tabs, pp.left_indent, x0 + ind + x - col.x0, rest.get(i + 1..).unwrap_or_default()).0
-                };
-                breaker::greedy(rest, rest_h, &spacing, &width, &tab)
-            } else if pp.balance_ragged && !spacing.justify {
-                breaker::balanced(rest, rest_h, &spacing, &width)
-            } else {
-                breaker::knuth_plass(rest, rest_h, &spacing, &width)
-            };
-            let mut moved = false;
-            for (k, b) in breaks.iter().enumerate() {
-                let (s, e) = (g0 + b.start, g0 + b.end);
-                let line_glyphs = &glyphs[s..e.max(s)];
-                let (asc, tops, desc, lead) = line_metrics(line_glyphs, &glyphs, s, mark_leading, mark_chars.size, db, &mark_chars);
-                let lead = match last_line_mark {
-                    Some(m) if k + 1 == breaks.len() => lead.max(m),
-                    _ => lead,
-                };
-                let (reference, model) = cjk_line_reference(line_glyphs);
-                let advance = if cur.last_baseline.is_some() { cur.aki_below.unwrap_or(lead) } else { lead };
-                let (mut x0, mut x1) = (col.x0, col.x1);
-                // A wrap segment that can't hold the line's first word whole stays empty and the
-                // text goes on in the next segment or line (a word wider than the column is split
-                // wherever it lands).
-                let ind = pp.left_indent + pp.right_indent + if line_no == 0 { pp.first_line_indent } else { 0.0 };
-                let need = if f.exclusions.is_empty() && f.outline.is_none() {
-                    0.0
-                } else {
-                    let w = breaker::first_word_width(glyphs.get(s..).unwrap_or_default(), hyph_after.get(s..).unwrap_or_default(), &spacing);
-                    if w > col.width() - ind { 0.0 } else { w }
-                };
-                let holds = |&(a, b): &(f64, f64)| b - a - ind + 0.01 >= need;
-                // The line takes the next segment of a line already placed, the one the breaker
-                // set it for.
-                let mut continues = false;
-                let mut baseline = carry_baseline;
-                let mut grid_end = None;
-                if let Some(i) = carry.iter().position(holds) {
-                    continues = i == 0;
-                    grid_end = carry_grid;
-                    (x0, x1) = carry.get(i).copied().unwrap_or((x0, x1));
-                    carry.drain(..=i);
-                } else {
-                    carry.clear();
-                    baseline = cur.next_baseline(f, col, advance, asc, tops, &pp);
-                    if cur.last_baseline.is_some() {
-                        baseline += cur.last_reference - reference;
-                    }
-                    // Baseline grid: grid alignment and gyoudori (see `grid`).
-                    let grid = f.grid.filter(|&(_, inc)| {
-                        inc > 0.0
-                            && inc.is_finite()
-                            && (pp.grid_align == GridAlign::AllLines || (pp.grid_align == GridAlign::FirstLineOnly && line_no == 0))
-                    });
-                    if let Some((g_start, inc)) = grid {
-                        let n = pp.grid_gyoudori.min(grid::MAX_GYOUDORI);
-                        match para_block.filter(|(at, _)| line_no > 0 && *at == (cur.fi, cur.col)) {
-                            // Inside a paragraph-gyoudori block, lines after the first keep their leading.
-                            Some((_, end)) => grid_end = Some(end),
-                            None => {
-                                let r = grid::reference_offset(line_glyphs, pp.grid_reference);
-                                let block = n > 0 && pp.paragraph_gyoudori && line_no == 0;
-                                let span = if block {
-                                    // From this line's reference point to the paragraph's last line's.
-                                    let aki_below = |model, lead| (model == designcraft_doc::cjk::LeadingModel::AkiBelow).then_some(lead);
-                                    let (mut down, mut prev, mut prev_aki, mut last_r) = (0.0, reference, aki_below(model, lead), r);
-                                    for (j, nb) in breaks.iter().enumerate().skip(k + 1) {
-                                        let (ns, ne) = (g0 + nb.start, g0 + nb.end);
-                                        let lg = glyphs.get(ns..ne.max(ns)).unwrap_or_default();
-                                        let (_, _, _, nlead) = line_metrics(lg, &glyphs, ns, mark_leading, mark_chars.size, db, &mark_chars);
-                                        let nlead = match last_line_mark {
-                                            Some(m) if j + 1 == breaks.len() => nlead.max(m),
-                                            _ => nlead,
-                                        };
-                                        let (nref, nmodel) = cjk_line_reference(lg);
-                                        down += prev_aki.unwrap_or(nlead) + prev - nref;
-                                        prev = nref;
-                                        prev_aki = aki_below(nmodel, nlead);
-                                        last_r = grid::reference_offset(lg, pp.grid_reference);
-                                    }
-                                    (down + last_r - r).max(0.0)
-                                } else {
-                                    0.0
-                                };
-                                let lines = if block { grid::lines_for(span, inc, n) } else { n.max(1) };
-                                let free = cur.grid_next.filter(|(b, _)| cur.last_baseline == Some(*b)).map(|(_, y)| y);
-                                let band = grid::Band { natural: baseline + r, free, pending: cur.pending, fixed: n > 0, lines, span };
-                                let (y, end) = grid::place((g_start, inc), pp.grid_reference, band);
-                                baseline = y - r;
-                                grid_end = Some(end);
-                                if block {
-                                    para_block = Some(((cur.fi, cur.col), end));
-                                }
-                            }
-                        }
-                    }
-                    // A line a wrap pushes down moves by whole grid lines, keeping its place in its band.
-                    let on_grid = baseline;
-                    let snap = |y: f64| grid.map_or(y, |(_, inc)| on_grid + ((y - on_grid) / inc - 1e-6).ceil().max(0.0) * inc);
-                    // Wrap: push the line down to the first position with a slot (back on the grid).
-                    // Segments after the first are carried to the next lines of the paragraph.
-                    if !f.exclusions.is_empty() || f.outline.is_some() {
-                        let jump = cur.jump(f, advance, asc, tops);
-                        let line_start = glyphs.get(s).map_or(prange.start, |g| g.byte);
-                        let mut tries = 0;
-                        loop {
-                            let Some((nb, segs)) = wrap_slot(f, col, baseline, asc, desc, jump, base_size, rtl, line_start, &holds) else {
-                                // No room in this column.
-                                baseline = baseline.max(col.y1) + 1.0;
-                                carry.clear();
-                                break;
-                            };
-                            let pushed = nb > baseline;
-                            baseline = nb;
-                            if let Some((&first, rest)) = segs.split_first() {
-                                (x0, x1) = first;
-                                carry = rest.to_vec();
-                            }
-                            tries += 1;
-                            if !pushed || grid.is_none() || tries > 4000 {
-                                break;
-                            }
-                            baseline = snap(baseline);
-                        }
-                    }
-                    grid_end = grid_end.map(|end| end + baseline - on_grid);
-                    carry_baseline = baseline;
-                    carry_grid = grid_end;
-                }
-                // The breaker set this line for another segment width: re-break the rest of the
-                // paragraph from here, starting with this line's segments as they are. A pass
-                // re-breaks at its first line only for a new line, whose segments it carries, so
-                // every re-break makes progress; their number is capped too.
-                // Past the estimated slots the breaker assumes the whole column. Check that
-                // fallback too: narrow wrap segments may need more lines than the estimate.
-                let (estimated_x0, estimated_x1) = slots.get(k).copied().unwrap_or((col.x0, col.x1));
-                if (k > 0 || !continues) && rebreaks < 256 && ((estimated_x1 - estimated_x0) - (x1 - x0)).abs() > 0.5 {
-                    rebreaks += 1;
-                    carry.insert(0, (x0, x1));
-                    g0 = s;
-                    moved = true;
-                    break;
-                }
-                let capped = cur.split.is_none() && line_cap[pi] == Some(line_no) && line_no > col_first_line;
-                // Footnotes referenced on this line need room at the bottom of the column too
-                // (a line at the top of a column is set anyway).
-                let line_notes = if notes.active() { notes.refs_in(line_glyphs) } else { Vec::new() };
-                let col_w = notes.area(&cols[cur.fi], cur.col).map_or(0.0, |r| r.width());
-                let reserve = notes.reserve(doc, cur.fi, cur.col, &line_notes, col_w, f, opts);
-                let reserve = if cur.last_baseline.is_none() { notes.reserve(doc, cur.fi, cur.col, &[], col_w, f, opts) } else { reserve };
-                // A horizontal text frame's bottom inset limits the last baseline, not
-                // the font's descender box. Descenders remain in the line metrics and may
-                // hang below that edge. Paths, vertical text, inline objects and text above
-                // reserved footnotes keep the full extent to prevent collisions.
-                let fit_descent = if f.opts.path.is_some()
-                    || f.vertical
-                    || reserve > 0.0
-                    || line_glyphs.iter().any(|g| sub_objects.get(&g.byte).is_some_and(|o| !o.custom))
-                {
-                    desc
-                } else {
-                    0.0
-                };
-                let fits = baseline + fit_descent <= col.y1 - reserve + 0.01 && !capped;
-                if !fits
-                    && !pp.hyph_across_column
-                    && line_no > col_first_line
-                    && let Some(at) = hyphen_at
-                    && hyph_relays < story.text.len().saturating_add(64).saturating_mul(restores.saturating_add(1))
-                {
-                    hyph_relays += 1;
-                    no_hyph[pi].push(at);
-                    rewind(pi, &snaps, &note_snaps, &mut notes, &mut out, &mut cur, &mut list_counter, &mut force_col, &mut line_cap, &mut no_hyph);
-                    continue 'paras;
-                }
-                if !fits {
-                    if cur.can_next_sub() {
-                        g0 = s;
-                        cur.next_sub();
-                        col_first_line = line_no;
-                        carry.clear();
-                        moved = true;
-                        break;
-                    }
-                    // A split block that doesn't fit above its trial bottom: re-lay it lower.
-                    if let Some(key) = cur.split_key()
-                        && limit_of(&split_limits, key).is_some_and(f64::is_finite)
-                    {
-                        let j = if split_trial.as_ref().is_some_and(|t| t.key == key) {
-                            trial_failed(&mut split_trial, &mut split_limits, split_runs < split_budget)
-                        } else {
-                            set_limit(&mut split_limits, key, Some(f64::INFINITY));
-                            Some(key.2)
-                        };
-                        if let Some(j) = j {
-                            split_runs += 1;
-                            rewind(
-                                j,
-                                &snaps,
-                                &note_snaps,
-                                &mut notes,
-                                &mut out,
-                                &mut cur,
-                                &mut list_counter,
-                                &mut force_col,
-                                &mut line_cap,
-                                &mut no_hyph,
-                            );
-                            pi = j;
-                            continue 'paras;
-                        }
-                    }
-                    // Keep options don't apply between a split block's lines.
-                    if !capped && cur.split.is_none_or(|s| s.part_lines == 0) {
-                        let ctx = KeepCtx {
-                            pi,
-                            line_no,
-                            in_col: line_no - col_first_line,
-                            started_here: col_first_line == 0,
-                            at_top,
-                            remaining: breaks.len() - k,
-                            here: (cur.fi, cur.col),
-                        };
-                        let action = if restores < (4 * np + 64) * (balance_runs + 1) {
-                            keep_violation(&ctx, &pp, &info, &force_col, &line_cap)
-                        } else {
-                            None
-                        };
-                        if let Some(action) = action {
-                            restores += 1;
-                            let j = match action {
-                                KeepAction::Force(j) => {
-                                    force_col[j] = true;
-                                    j
-                                }
-                                KeepAction::Cap(j, n) => {
-                                    line_cap[j] = Some(n);
-                                    j
-                                }
-                            };
-                            rewind(
-                                j,
-                                &snaps,
-                                &note_snaps,
-                                &mut notes,
-                                &mut out,
-                                &mut cur,
-                                &mut list_counter,
-                                &mut force_col,
-                                &mut line_cap,
-                                &mut no_hyph,
-                            );
-                            pi = j;
-                            continue 'paras;
-                        }
-                    }
-                    // Next column / frame; re-break the rest of the paragraph there.
-                    g0 = s;
-                    next_column(&mut cur);
-                    col_first_line = line_no;
-                    carry.clear();
-                    moved = true;
-                    break;
-                }
-                // A drop cap sits at the start-side indent; the first-line indent doesn't move it.
-                let beside = drop_cap.as_ref().filter(|dc| line_no < dc.lines && col_first_line == 0).map(DropCap::indent);
-                let first_line = if line_no == 0 { pp.first_line_indent } else { 0.0 };
-                let (ind_l, ind_r) = match beside {
-                    Some(w) if rtl => (pp.left_indent, pp.right_indent + w),
-                    Some(w) => (pp.left_indent + w, pp.right_indent),
-                    // The first-line indent is at the paragraph's start side, which is the right
-                    // one in a right-to-left paragraph: applied on the left it moved the line the
-                    // wrong way, out of the frame for the hanging indent a numbered list uses
-                    // (#1448).
-                    None if rtl => (pp.left_indent, pp.right_indent + first_line),
-                    None => (pp.left_indent + first_line, pp.right_indent),
-                };
-                let lx0 = x0 + ind_l;
-                let lx1 = x1 - ind_r;
-                let last = k + 1 == breaks.len();
-                // The break character that ends this line, if any (it is the line's last glyph).
-                let brk = if b.forced && e > s {
-                    e.checked_sub(1).and_then(|i| glyphs.get(i)).map(|g| g.ch).filter(|&c| breaker::is_forced(c))
-                } else {
-                    None
-                };
-                // A column, frame or page break ends the line as a paragraph's last line (last-line
-                // alignment); a justified line ended by a forced line break stays justified.
-                let ends_para = last || brk.is_some_and(story::is_break_char);
-                let forced_mid = brk == Some(story::FORCED_LINE_BREAK) && !last;
-                let (mut placed, end_x, ratio) =
-                    layout_line(&glyphs, s, e, b.hyphen, lx0, lx1, col.x0, &pp, &spacing, ends_para, forced_mid, f.left_page, &bidi_info);
-                let end_x = if line_no == 0 && s == 0 { align_label(&mut placed, label_aligned, label_tab, list_align, end_x) } else { end_x };
-                // Warichu runs before ruby so a reading is placed over the stacked note, and before
-                // the trimmed spaces and the drop cap join the line, so neither is stacked.
-                let end_x = end_x + warichu::place(&styles_tab, &mut placed);
-                // The spaces the break trimmed off the end follow the line undrawn, so the caret
-                // and the selection reach them; alignment and justification ignore them.
-                if pp.direction != designcraft_doc::TextDirection::RightToLeft && !placed.iter().any(|g| g.rtl) {
-                    let mut x = end_x;
-                    for g in glyphs.get(e..(g0 + b.next).min(glyphs.len())).unwrap_or(&[]).iter().filter(|g| g.is_space()) {
-                        placed.push(PlacedGlyph { visible: false, ..place(g, x) });
-                        x += g.adv;
-                    }
-                }
-                let mut drop_box = None;
-                if line_no == 0
-                    && let Some(dc) = &drop_cap
-                {
-                    let at = if rtl { x1 - pp.right_indent - dc.width } else { x0 + pp.left_indent - dc.lsb };
-                    placed.splice(0..0, place_drop_cap(dc, at, rtl));
-                    drop_box = Some(DropCapBox {
-                        end: dc.end,
-                        baseline: baseline + dc.drop,
-                        // From its line's top, or its own top when it rises above that line.
-                        rect: Rect::new(at, (baseline - asc).min(baseline + dc.drop - dc.cap), at + dc.width, baseline + dc.drop + desc),
-                    });
-                }
-                ruby::annotate(db, &mut styles_tab, &story.text, &mut placed, doc.settings.glyph_fallback, f.vertical);
-                kenten::annotate(db, &styles_tab, &mut placed, doc.settings.glyph_fallback);
-                let range_end = if last { prange.end } else { glyphs.get(g0 + b.next).map(|g| g.byte).unwrap_or(prange.end) };
-                let range_start = glyphs.get(s).map(|g| g.byte).unwrap_or(prange.start).min(range_end);
-                let range_start = if line_no == 0 { prange.start } else { range_start };
-                let ft = &mut out.frames[cur.fi];
-                if line_no == 0 {
-                    first_line_rect = Some((cur.fi, baseline, asc, x0));
-                }
-                if let Some(sb) = cur.split.as_mut() {
-                    sb.line0.get_or_insert(ft.lines.len());
-                    sb.sub_lines += 1;
-                    sb.part_lines += 1;
-                }
-                ft.lines.push(Line {
-                    column: cur.col as u32,
-                    baseline,
-                    x0,
-                    x1,
-                    ascent: asc,
-                    descent: desc,
-                    leading: lead,
-                    range: range_start..range_end,
-                    para: pi,
-                    glyphs: placed,
-                    hyphenated: b.hyphen,
-                    first_in_para: line_no == 0,
-                    last_in_para: last,
-                    end_x,
-                    spacing: ratio,
-                    hj: hj_severity(ratio, pp.word_space_min, pp.word_space_max),
-                    keep_violation: false,
-                    drop_cap: drop_box,
-                });
-                let placed_notes = !line_notes.is_empty();
-                for k in line_notes {
-                    notes.place(doc, k, cur.fi, cur.col, col_w, f, opts);
-                }
-                // Notes spanning the columns take room from the columns before this one too: re-lay
-                // the frame with that room left.
-                if placed_notes {
-                    let r = notes.reserve(doc, cur.fi, cur.col, &[], col_w, f, opts);
-                    if notes.earlier_columns_collide(&out.frames[cur.fi].lines, cur.fi, cur.col, &cols[cur.fi], r)
-                        && let Some(j) = out.frames[cur.fi].lines.first().map(|l| l.para)
-                    {
-                        rewind(
-                            j,
-                            &snaps,
-                            &note_snaps,
-                            &mut notes,
-                            &mut out,
-                            &mut cur,
-                            &mut list_counter,
-                            &mut force_col,
-                            &mut line_cap,
-                            &mut no_hyph,
-                        );
-                        pi = j;
-                        continue 'paras;
-                    }
-                }
-                if !sub_objects.is_empty() {
-                    let ft = &mut out.frames[cur.fi];
-                    let li = ft.lines.len() - 1;
-                    let text_ascent = line_glyphs.iter().filter(|g| g.ch != designcraft_doc::OBJECT_MARK).map(|g| g.ascent).fold(0.0, f64::max);
-                    let text_ascent = if text_ascent > 0.0 { text_ascent } else { base_chars.size * 0.75 };
-                    for g in ft.lines[li].glyphs.iter().filter(|g| g.len > 0) {
-                        if let Some(o) = sub_objects.get(&g.byte)
-                            && let Some(source) = story.objects.get(o.index)
-                        {
-                            ft.objects.push(PlacedObject {
-                                index: o.index,
-                                object: Arc::clone(source),
-                                origin: Point::ZERO,
-                                size: (o.w, o.h),
-                                line: li,
-                                x: g.x,
-                                text_ascent,
-                            });
-                        }
-                    }
-                }
-                cur.last_baseline = Some(baseline);
-                cur.last_reference = reference;
-                cur.aki_below = (model == designcraft_doc::cjk::LeadingModel::AkiBelow).then_some(lead);
-                cur.last_descent = desc;
-                cur.pending = 0.0;
-                cur.grid_next = grid_end.map(|end| (baseline, end));
-                hyphen_at =
-                    e.checked_sub(1).filter(|&i| b.hyphen && hyph_after.get(i) == Some(&true)).and_then(|i| glyphs.get(i)).map(|g| g.byte + g.len);
-                line_no += 1;
-                // A column / frame / page break inside the paragraph: the rest of it continues in the
-                // new column/frame/page, re-broken there. (A break that ends the paragraph moves the
-                // next paragraph instead.)
-                if b.forced
-                    && k + 1 < breaks.len()
-                    && let Some(start) = brk.and_then(break_start)
-                {
-                    go(&mut cur, start);
-                    col_first_line = line_no;
-                    g0 += b.next;
-                    carry.clear();
-                    moved = true;
-                    break;
-                }
-                // An own-story anchored object anchored in this line wraps the lines after it,
-                // which were broken without it: break them again.
-                if k + 1 < breaks.len()
-                    && f.exclusions.iter().any(|ex| {
-                        ex.after.is_some_and(|a| (range_start..range_end).contains(&a))
-                            && ex.rect.x0 < col.x1
-                            && ex.rect.x1 > col.x0
-                            && ex.rect.y1 > baseline
-                            && ex.rect.y0 < col.y1
-                    })
-                {
-                    g0 += b.next;
-                    moved = true;
-                    break;
-                }
-            }
-            if !moved {
-                break;
-            }
-        }
-        info.push(ParaInfo {
-            start: start_at,
+            LinePlacement::Overset => break 'paras,
+            LinePlacement::StoryComplete => break 'paras,
+            LinePlacement::Complete { line_no, col_first_line, first_line_rect } => (line_no, col_first_line, first_line_rect),
+        };
+        let ends_split = match finish_paragraph(ParagraphFinishInput {
+            doc,
+            story,
+            frames,
+            cols: &cols,
+            out: &mut out,
+            cur: &mut cur,
+            notes: &mut notes,
+            snaps: &snaps,
+            note_snaps: &note_snaps,
+            list_counter: &mut list_counter,
+            force_col: &mut force_col,
+            line_cap: &mut line_cap,
+            no_hyph: &mut no_hyph,
+            split_trial: &mut split_trial,
+            split_limits: &mut split_limits,
+            split_runs: &mut split_runs,
+            split_budget,
+            paragraph: pi,
+            paragraph_count: np,
+            props: &pp,
+            info: &mut info,
+            start_at,
             at_top,
-            end: (cur.fi, cur.col),
-            lines: line_no,
-            lines_in_end_col: line_no - col_first_line,
-            keep_with_next: pp.keep_with_next,
-            keep_together: pp.keep_lines_together,
-            keep_all: pp.keep_all_lines,
-            keep_first: pp.keep_first as usize,
-            keep_last: pp.keep_last as usize,
-        });
-        // The columns below a spanning paragraph start under it.
-        if spanning
-            && let Some(ft) = out.frames.get(cur.fi)
-            && let Some(l) = ft.lines.last().filter(|l| l.para == pi)
-        {
-            let above = Above {
-                top: l.baseline + l.descent,
-                baseline: l.baseline,
-                descent: l.descent,
-                reference: cur.last_reference,
-                aki_below: cur.aki_below,
-                pending: if spans_in(cur.fi) { pp.space_after.max(pp.span_space_after) } else { pp.space_after },
-            };
-            cur.band = Band { para: pi + 1, line0: ft.lines.len(), above: Some(above), tail: None };
-        }
-        // Rules and shading for the paragraph.
-        if let Some((fi, bl, _, _)) = first_line_rect {
-            let ft = &mut out.frames[fi];
-            if pp.rule_above.on {
-                let r = &pp.rule_above;
-                // The offset runs from the first line's baseline up to the rule's bottom edge.
-                let y = bl - r.offset;
-                let col = ft
-                    .lines
-                    .iter()
-                    .find(|l| l.para == pi && l.first_in_para)
-                    .map(|l| if r.column_width { (l.x0, l.x1) } else { (l.x0, l.end_x) })
-                    .unwrap_or((0.0, 0.0));
-                let (color, tint) = rule_color(r, &above);
-                ft.decos.push(Deco {
-                    rect: Rect::new(col.0 + r.left_indent, y - r.weight, col.1 - r.right_indent, y),
-                    color,
-                    tint,
-                    ..Deco::default()
-                });
+            end_line: line_no,
+            end_column_first_line: col_first_line,
+            first_line_rect,
+            above: &above,
+            below: &below,
+            spanning,
+        }) {
+            ParagraphFinish::Done(ends_split) => ends_split,
+            ParagraphFinish::Restart(j) => {
+                pi = j;
+                continue 'paras;
             }
-        }
-        if pp.rule_below.on
-            && let Some(ft) = out.frames.get_mut(cur.fi.min(frames.len().saturating_sub(1)))
-            && let Some(l) = ft.lines.iter().rev().find(|l| l.para == pi)
-        {
-            let r = &pp.rule_below;
-            let y = l.baseline + r.offset;
-            let (x0, x1) = if r.column_width { (l.x0, l.x1) } else { (l.x0, l.end_x) };
-            let (color, tint) = rule_color(r, &below);
-            ft.decos.push(Deco { rect: Rect::new(x0 + r.left_indent, y, x1 - r.right_indent, y + r.weight), color, tint, ..Deco::default() });
-        }
-        // The end of a split block: text after it continues below its deepest sub-column, which
-        // are balanced first. A block that ends the story fills its sub-columns in turn.
-        let mut ends_split = false;
-        if let Some(sb) = cur.split {
-            let next =
-                story.paras.get(pi + 1).filter(|_| story.para_table(pi + 1).is_none()).and_then(|p| SplitCfg::of(&doc.styles.resolve_para(p).0));
-            if next != Some(sb.cfg) {
-                cur.split = None;
-                ends_split = true;
-                let part = out.frames.get(cur.fi).and_then(|ft| {
-                    let lines = ft.lines.get(sb.line0?..)?;
-                    let top = lines.first().map(|l| l.baseline - l.ascent)?;
-                    let deepest = lines.iter().map(|l| (l.baseline, l.descent)).max_by(|a, b| (a.0 + a.1).total_cmp(&(b.0 + b.1)))?;
-                    Some((sb.top.unwrap_or(top), deepest))
-                });
-                if pi + 1 < np
-                    && let Some((top, (baseline, descent))) = part
-                {
-                    let key = (cur.fi, cur.col, sb.para);
-                    let active = split_trial.as_ref().is_some_and(|t| t.key == key);
-                    if !active && let Some(t) = split_trial.take() {
-                        set_limit(&mut split_limits, t.key, None);
-                    }
-                    if sb.part_lines > 1 && (active || limit_of(&split_limits, key).is_none() && split_runs < split_budget) {
-                        let bottom = baseline + descent;
-                        let mut t = split_trial.take().unwrap_or(Trial { key, span: pi, lo: top, hi: bottom, tries: 0, done: false });
-                        // This layout fits: its bottom is the best so far.
-                        t.hi = t.hi.min(bottom);
-                        let next = if t.done { t.hi } else { t.next() };
-                        set_limit(&mut split_limits, key, Some(next));
-                        if !t.done {
-                            split_trial = Some(t);
-                            split_runs += 1;
-                            rewind(
-                                key.2,
-                                &snaps,
-                                &note_snaps,
-                                &mut notes,
-                                &mut out,
-                                &mut cur,
-                                &mut list_counter,
-                                &mut force_col,
-                                &mut line_cap,
-                                &mut no_hyph,
-                            );
-                            pi = key.2;
-                            continue 'paras;
-                        }
-                    }
-                    cur.last_baseline = Some(baseline);
-                    cur.last_descent = descent;
-                }
-            }
-        }
-        cur.pending += if spans_in(cur.fi) || ends_split { pp.space_after.max(pp.span_space_after) } else { pp.space_after };
+        };
+        let spans_in_current_frame = spanning && cols.get(cur.fi).is_some_and(|c| c.len() > 1);
+        cur.pending += if spans_in_current_frame || ends_split { pp.space_after.max(pp.span_space_after) } else { pp.space_after };
         pi += 1;
     }
-    notes.finish(doc, story, frames, &cols, &mut out);
+    finish_composition(FinishInput {
+        doc,
+        story,
+        frames,
+        cols: &cols,
+        notes: &mut notes,
+        out: &mut out,
+        boxes: &boxes,
+        span_paras: &span_paras,
+        split_paras: &split_paras,
+        styles_tab,
+    })
+}
+
+struct FinishInput<'a> {
+    doc: &'a Document,
+    story: &'a Story,
+    frames: &'a [FrameSpec],
+    cols: &'a [Vec<Rect>],
+    notes: &'a mut Notes,
+    out: &'a mut ComposedStory,
+    boxes: &'a [Option<ParaBox>],
+    span_paras: &'a [bool],
+    split_paras: &'a [bool],
+    styles_tab: Vec<RunStyle>,
+}
+
+fn finish_composition(input: FinishInput<'_>) -> ComposedStory {
+    let FinishInput { doc, story, frames, cols, notes, out, boxes, span_paras, split_paras, styles_tab } = input;
+    notes.finish(doc, story, frames, cols, out);
     // Ranges, content heights and vertical justification.
     for (fi, ft) in out.frames.iter_mut().enumerate() {
         let f = &frames[fi];
@@ -2129,7 +3181,7 @@ fn compose_with_db(doc: &Document, story: &Story, frames: &[FrameSpec], opts: &C
     }
     // Paragraph borders and shading (the part of a paragraph that fits keeps its box), and column
     // rules, once vertical justification has put the lines in place.
-    parabox::draw(&mut out, &boxes, frames);
+    parabox::draw(out, boxes, frames);
     for (ft, f) in out.frames.iter_mut().zip(frames) {
         if f.opts.column_rule {
             let rects = column_rule_rects(&ft.columns, &ft.lines, &f.opts);
@@ -2138,8 +3190,8 @@ fn compose_with_db(doc: &Document, story: &Story, frames: &[FrameSpec], opts: &C
         }
     }
     out.styles = styles_tab;
-    mark_keep_violations(doc, story, &mut out);
-    out
+    mark_keep_violations(doc, story, out);
+    std::mem::take(out)
 }
 
 /// The columns a spanning paragraph is set across, from `col`'s top to its bottom.
@@ -2199,19 +3251,28 @@ fn mark_keep_violations(doc: &Document, story: &Story, out: &mut ComposedStory)
 const MAX_COLUMN_RULE_WEIGHT: f64 = 1000.0;
 
 /// Text Frame Options › Column Rules: one bar per gutter, `column_rule_weight` wide, centred
-/// between the facing edges of the two columns and moved by `column_rule_offset`, from the
-/// columns' top to their bottom (the text area, inside the insets) shortened by the rule's top
-/// and bottom insets. Works in the composed space, so right-to-left and vertical frames (whose
-/// columns are laid out in the turned box) get their rules between the columns too.
+/// between the facing edges of the two columns and moved by `column_rule_offset`, from the top of
+/// the frame's top line (its ascent) to the bottom of its bottom line (its descent), as InDesign
+/// draws them, shortened by the rule's top and bottom insets (a negative inset extends it). Works
+/// in the composed space, so right-to-left and vertical frames (whose columns are laid out in the
+/// turned box) get their rules between the columns too.
 ///
 /// A paragraph that spans columns interrupts the rule: the bar stops at the top of its first line
-/// and resumes below its last line. Nothing is drawn for a single column or a weight that is not a
-/// positive finite number.
+/// and resumes below its last line. Nothing is drawn for a frame without lines, a single column or
+/// a weight that is not a positive finite number.
 pub fn column_rule_rects(columns: &[Rect], lines: &[Line], opts: &TextFrameOptions) -> Vec<Rect> {
     let weight = opts.column_rule_weight;
     if !weight.is_finite() || weight <= 0.0 || columns.len() < 2 {
         return Vec::new();
     }
+    let (text_top, text_bottom) = lines
+        .iter()
+        .map(|l| (l.baseline - l.ascent, l.baseline + l.descent))
+        .filter(|(t, z)| t.is_finite() && z.is_finite())
+        .fold((f64::INFINITY, f64::NEG_INFINITY), |(t, z), (lt, lz)| (t.min(lt), z.max(lz)));
+    if text_bottom < text_top {
+        return Vec::new();
+    }
     let finite = |v: f64| if v.is_finite() { v } else { 0.0 };
     let (offset, top_inset, bottom_inset) =
         (finite(opts.column_rule_offset), finite(opts.column_rule_top_inset), finite(opts.column_rule_bottom_inset));
@@ -2223,7 +3284,7 @@ pub fn column_rule_rects(columns: &[Rect], lines: &[Line], opts: &TextFrameOptio
     for pair in cols.windows(2) {
         let [a, b] = [pair[0], pair[1]];
         let cx = (a.x1 + b.x0) / 2.0;
-        let (top, bottom) = (a.y0.max(b.y0) + top_inset, a.y1.min(b.y1) - bottom_inset);
+        let (top, bottom) = (text_top + top_inset, text_bottom - bottom_inset);
         if bottom <= top {
             continue;
         }
@@ -2258,8 +3319,22 @@ pub fn column_rule_rects(columns: &[Rect], lines: &[Line], opts: &TextFrameOptio
     out
 }
 
+/// Optical margin alignment for a paragraph of `story`: (on, the size the hang is set for).
+/// Ignore Optical Margin turns it off; the story's setting, when on, applies to every other
+/// paragraph; otherwise the paragraph's own switch hangs at each glyph's own size.
+fn optical_for(pp: &ParaProps, story: &Story) -> (bool, Option<f64>) {
+    if pp.ignore_optical_margin {
+        return (false, None);
+    }
+    match story.optical_margin.hang_size() {
+        Some(size) => (true, Some(size)),
+        None => (pp.optical_margin, None),
+    }
+}
+
 /// Breaker parameters from the paragraph's settings.
-fn spacing_for(pp: &ParaProps, base_size: f64) -> Spacing {
+fn spacing_for(pp: &ParaProps, base_size: f64, story: &Story) -> Spacing {
+    let (optical, optical_size) = optical_for(pp, story);
     Spacing {
         justify: pp.align.is_justified(),
         word_min: pp.word_space_min,
@@ -2277,7 +3352,8 @@ fn spacing_for(pp: &ParaProps, base_size: f64) -> Spacing {
         // The zone is the Single-line Composer's (unjustified text only), as in InDesign: the
         // Paragraph Composer weighs every break of the paragraph instead.
         hyph_zone: if pp.align.is_justified() || !pp.composer.single_line() { 0.0 } else { pp.hyph_zone },
-        optical: pp.optical_margin,
+        optical,
+        optical_size,
         korean_char_breaks: pp.korean_char_breaks,
         kinsoku_priority: match pp.kinsoku_type.as_str() {
             "KinsokuPushInFirst" => 1,
@@ -3326,6 +4402,143 @@ fn tab_advance<'a>(tabs: &'a [designcraft_doc::TabStop], left_indent: f64, abs:
     (w.max(0.0), stop)
 }
 
+/// Geometry needed to measure tabs on a line with hanging edge glyphs.
+struct TabMeasure {
+    x0: f64,
+    x1: f64,
+    tab_origin: f64,
+    hl: f64,
+    optical_right: f64,
+    cjk_right: f64,
+    regular_hang: bool,
+}
+
+/// Measure tabs left to right while preserving their stops across hanging margins.
+fn layout_tabs(line: &mut [Glyph], pp: &ParaProps, geometry: TabMeasure) -> (Vec<(usize, String)>, Option<(usize, bool)>) {
+    let TabMeasure { x0, x1, tab_origin, hl, optical_right, cjk_right, regular_hang } = geometry;
+    let measure = x1 - x0;
+    let mut x = -hl;
+    let mut i = 0;
+    let mut leaders: Vec<(usize, String)> = Vec::new();
+    // The line's last tab and whether it is a left tab (only text after a left tab justifies).
+    let mut last_tab: Option<(usize, bool)> = None;
+    while i < line.len() {
+        if line[i].ch == '\t' {
+            let (w, stop) = tab_advance(&pp.tabs, pp.left_indent, x0 + x - tab_origin, line.get(i + 1..).unwrap_or_default());
+            if let Some(t) = stop
+                && !t.leader.is_empty()
+            {
+                leaders.push((i, t.leader.clone()));
+            }
+            line[i].adv = w;
+            // A default tab stop is a left tab.
+            last_tab = Some((i, stop.as_ref().is_none_or(|t| t.align == TabAlign::Left)));
+        } else if line[i].ch == story::RIGHT_INDENT_TAB {
+            // Use the first stop past the right margin, or the last stop at/before it.
+            // Choose the stop before checking its leader: an empty leader takes precedence too.
+            let right = x1 - tab_origin;
+            let stop = pp
+                .tabs
+                .iter()
+                .filter(|t| t.position > right)
+                .min_by(|a, b| a.position.total_cmp(&b.position))
+                .or_else(|| pp.tabs.iter().filter(|t| t.position <= right).max_by(|a, b| a.position.total_cmp(&b.position)));
+            if let Some(t) = stop.filter(|t| !t.leader.is_empty()) {
+                leaders.push((i, t.leader.clone()));
+            }
+            let rest: f64 = line[i + 1..].iter().map(|g| g.adv).sum();
+            let hr = if regular_hang { optical_right } else { optical_right.max(cjk_right) };
+            line[i].adv = (measure + hr - x - rest).max(0.0);
+            last_tab = Some((i, false));
+        }
+        x += line[i].adv;
+        i += 1;
+    }
+    (leaders, last_tab)
+}
+
+/// Resolve spine-relative alignment to a physical edge for this page.
+fn page_alignment(align: Align, left_page: bool) -> Align {
+    match align {
+        Align::TowardsSpine => {
+            if left_page {
+                Align::Right
+            } else {
+                Align::Left
+            }
+        }
+        Align::AwayFromSpine => {
+            if left_page {
+                Align::Left
+            } else {
+                Align::Right
+            }
+        }
+        a => a,
+    }
+}
+
+/// Allocate justified Arabic elongation before distributing the remaining space.
+fn allocate_kashidas(line: &[Glyph], add: &mut [f64], pp: &ParaProps, seg: usize, extra: &mut f64) -> Vec<(usize, f64)> {
+    if !(*extra > 0.0 && pp.kashidas && pp.arabic_justification != "DefaultJustification") {
+        return Vec::new();
+    }
+    let points: Vec<usize> = kashida_points(line).into_iter().filter(|&i| i >= seg).collect();
+    if points.is_empty() {
+        return Vec::new();
+    }
+    let total = extra.min(points.iter().map(|&i| line[i].size * 1.5).sum());
+    let per = total / points.len() as f64;
+    *extra -= total;
+    let kashidas: Vec<(usize, f64)> = points.into_iter().map(|i| (i, per)).collect();
+    for &(i, length) in &kashidas {
+        add[i] += length;
+    }
+    kashidas
+}
+
+/// Add stretched tatweel glyphs to the gaps allocated for Arabic elongation.
+fn append_kashidas(line: &[Glyph], out: &mut Vec<PlacedGlyph>, kashidas: Vec<(usize, f64)>) {
+    for (i, l) in kashidas {
+        let first = (0..=i).rev().take_while(|&j| line[j].byte == line[i].byte).last().unwrap_or(i);
+        let (g, at) = (&line[i], out[first].x - line[first].dx - l);
+        let gid = designcraft_fonts::first_glyph(&g.face, &['\u{0640}']);
+        let w = g.face.advance(gid) * g.sx;
+        if gid == 0 || w <= 0.0 {
+            continue;
+        }
+        // One tatweel stretched over the gap (overlapping its neighbours a little).
+        let k = (l + 0.4) / w;
+        out.push(PlacedGlyph {
+            gid,
+            x: at - 0.2,
+            y: -g.shift,
+            adv: 0.0,
+            sx: g.sx * k,
+            len: 0,
+            generated_text: None,
+            upright: false,
+            tcy: None,
+            dx: 0.0,
+            ..place(g, at)
+        });
+    }
+}
+
+/// Average the actual word-space ratios for H&J highlighting.
+fn word_space_ratio(line: &[Glyph], add: &[f64], spaces: &[usize]) -> f64 {
+    let mut ratio_sum = 0.0;
+    let mut ratio_n = 0usize;
+    for &i in spaces {
+        let g = &line[i];
+        if matches!(g.ch, ' ' | shape::NBSP) && g.space > 0.0 {
+            ratio_sum += (g.adv + add[i]) / g.space;
+            ratio_n += 1;
+        }
+    }
+    if ratio_n > 0 { ratio_sum / ratio_n as f64 } else { 1.0 }
+}
+
 /// Position glyphs `s..e` within `[x0, x1]`; returns (glyphs, end x, word-space ratio).
 ///
 /// Justified lines distribute the difference to the measure in priority order: word spaces up to
@@ -3359,58 +4572,23 @@ fn layout_line(
         let h = shape::hyphen_after(g);
         line.push(h);
     }
-    // Tabs: compute widths left to right.
     let measure = x1 - x0;
-    let mut x = 0.0;
-    let mut i = 0;
-    let mut leaders: Vec<(usize, String)> = Vec::new();
-    // The line's last tab and whether it is a left tab (only text after a left tab justifies).
-    let mut last_tab: Option<(usize, bool)> = None;
-    while i < line.len() {
-        if line[i].ch == '\t' {
-            let (w, stop) = tab_advance(&pp.tabs, pp.left_indent, x0 + x - tab_origin, line.get(i + 1..).unwrap_or_default());
-            if let Some(t) = stop
-                && !t.leader.is_empty()
-            {
-                leaders.push((i, t.leader.clone()));
-            }
-            line[i].adv = w;
-            // A default tab stop is a left tab.
-            last_tab = Some((i, stop.as_ref().is_none_or(|t| t.align == TabAlign::Left)));
-        } else if line[i].ch == story::RIGHT_INDENT_TAB {
-            // Use the first stop past the right margin, or the last stop at/before it.
-            // Choose the stop before checking its leader: an empty leader takes precedence too.
-            let right = x1 - tab_origin;
-            let stop = pp
-                .tabs
-                .iter()
-                .filter(|t| t.position > right)
-                .min_by(|a, b| a.position.total_cmp(&b.position))
-                .or_else(|| pp.tabs.iter().filter(|t| t.position <= right).max_by(|a, b| a.position.total_cmp(&b.position)));
-            if let Some(t) = stop.filter(|t| !t.leader.is_empty()) {
-                leaders.push((i, t.leader.clone()));
-            }
-            let rest: f64 = line[i + 1..].iter().map(|g| g.adv).sum();
-            line[i].adv = (measure - x - rest).max(0.0);
-            last_tab = Some((i, false));
-        }
-        x += line[i].adv;
-        i += 1;
-    }
-    let has_tab = line.iter().any(|g| g.ch == '\t' || g.ch == story::RIGHT_INDENT_TAB);
-    // Optical margin alignment: the measure grows by the hang of the edge glyphs.
+    // Optical margin alignment and hanging punctuation: the glyphs at the line's edges hang
+    // outside the measure. A tab at an edge hangs nothing.
+    let is_tab = |g: &Glyph| g.ch == '\t' || g.ch == story::RIGHT_INDENT_TAB;
+    let at_edge = |g: &&Glyph| is_tab(g) || (g.adv > 0.0 && !g.is_space());
+    let first = line.iter().find(at_edge);
+    let lastg = line.iter().rev().find(at_edge);
+    let hl = first.map_or(0.0, |g| breaker::hang_left(g, sp));
+    let optical_right = lastg.map_or(0.0, |g| breaker::hang_right(g, sp));
+    let cjk_right = lastg.map_or(0.0, |g| g.cjk_hang);
+    let regular_hang = pp.kinsoku_hang == designcraft_doc::cjk::KinsokuHang::Regular;
+    let tab_measure = TabMeasure { x0, x1, tab_origin, hl, optical_right, cjk_right, regular_hang };
+    let (leaders, last_tab) = layout_tabs(&mut line, pp, tab_measure);
+    // The measure grows by the hang of the edge glyphs.
     let (mut x0, mut measure) = (x0, measure);
-    if (sp.optical || pp.kinsoku_hang != designcraft_doc::cjk::KinsokuHang::None) && !has_tab {
-        let first = line.iter().find(|g| g.adv > 0.0 && !g.is_space());
-        let lastg = line.iter().rev().find(|g| g.adv > 0.0 && !g.is_space());
-        let hl = if sp.optical { first.map_or(0.0, |g| breaker::hang(g.ch).0 * g.adv) } else { 0.0 };
-        let optical_right = if sp.optical { lastg.map_or(0.0, |g| breaker::hang(g.ch).1 * g.adv) } else { 0.0 };
-        let cjk_right = lastg.map_or(0.0, |g| g.cjk_hang);
-        let cjk_right = if pp.kinsoku_hang == designcraft_doc::cjk::KinsokuHang::Regular {
-            cjk_right.min((line.iter().map(|g| g.adv).sum::<f64>() - measure).max(0.0))
-        } else {
-            cjk_right
-        };
+    if sp.optical || pp.kinsoku_hang != designcraft_doc::cjk::KinsokuHang::None {
+        let cjk_right = if regular_hang { cjk_right.min((line.iter().map(|g| g.adv).sum::<f64>() - measure).max(0.0)) } else { cjk_right };
         let hr = optical_right.max(cjk_right);
         x0 -= hl;
         measure += hl + hr;
@@ -3423,23 +4601,7 @@ fn layout_line(
     let seg_justifies = last_tab.is_none_or(|(_, left)| left);
     // Spaces inside a jidori run keep the run's fitted width, as in the breaker.
     let spaces: Vec<usize> = line.iter().enumerate().skip(seg).filter(|(_, g)| g.is_justify_space() && !g.locked_advance).map(|(i, _)| i).collect();
-    let align = match pp.align {
-        Align::TowardsSpine => {
-            if left_page {
-                Align::Right
-            } else {
-                Align::Left
-            }
-        }
-        Align::AwayFromSpine => {
-            if left_page {
-                Align::Left
-            } else {
-                Align::Right
-            }
-        }
-        a => a,
-    };
+    let align = page_alignment(pp.align, left_page);
     let justify_this = align.is_justified() && (!last || align == Align::FullyJustified || forced_mid) && seg_justifies;
     // A justified paragraph's last line may have been composed with shrunk spaces: shrink it too.
     let squeeze_last = !justify_this
@@ -3451,19 +4613,7 @@ fn layout_line(
     let mut scale = vec![1.0; line.len()];
     let mut offset = 0.0;
     // Kashidas: in justified Arabic, the joins of words take the extra length first.
-    let mut kashidas: Vec<(usize, f64)> = Vec::new();
-    if justify_this && extra > 0.0 && pp.kashidas && pp.arabic_justification != "DefaultJustification" {
-        let points: Vec<usize> = kashida_points(&line).into_iter().filter(|&i| i >= seg).collect();
-        if !points.is_empty() {
-            let total = extra.min(points.iter().map(|&i| line[i].size * 1.5).sum());
-            let per = total / points.len() as f64;
-            kashidas = points.into_iter().map(|i| (i, per)).collect();
-            extra -= total;
-            for &(i, l) in &kashidas {
-                add[i] += l;
-            }
-        }
-    }
+    let kashidas = if justify_this { allocate_kashidas(&line, &mut add, pp, seg, &mut extra) } else { Vec::new() };
     if (justify_this || squeeze_last) && (extra >= 0.0 || sp.kinsoku_priority != 3) {
         extra = mojikumi::distribute(line.get_mut(seg..).unwrap_or_default(), extra, add.get_mut(seg..).unwrap_or_default());
     }
@@ -3524,17 +4674,7 @@ fn layout_line(
             offset = 0.0;
         }
     }
-    // Word-space ratio actually used (vs the space width), for H&J highlighting.
-    let mut ratio_sum = 0.0;
-    let mut ratio_n = 0usize;
-    for &i in &spaces {
-        let g = &line[i];
-        if matches!(g.ch, ' ' | shape::NBSP) && g.space > 0.0 {
-            ratio_sum += (g.adv + add[i]) / g.space;
-            ratio_n += 1;
-        }
-    }
-    let ratio = if ratio_n > 0 { ratio_sum / ratio_n as f64 } else { 1.0 };
+    let ratio = word_space_ratio(&line, &add, &spaces);
     let mut out = Vec::with_capacity(line.len());
     let mut x = x0 + offset;
     let bidi = bidi_info.has_rtl();
@@ -3571,30 +4711,7 @@ fn layout_line(
             tab_leader(g, leader, p.x, p.adv, tab_origin, &mut out);
         }
     }
-    for (i, l) in kashidas {
-        let first = (0..=i).rev().take_while(|&j| line[j].byte == line[i].byte).last().unwrap_or(i);
-        let (g, at) = (&line[i], out[first].x - line[first].dx - l);
-        let gid = designcraft_fonts::first_glyph(&g.face, &['\u{0640}']);
-        let w = g.face.advance(gid) * g.sx;
-        if gid == 0 || w <= 0.0 {
-            continue;
-        }
-        // One tatweel stretched over the gap (overlapping its neighbours a little).
-        let k = (l + 0.4) / w;
-        out.push(PlacedGlyph {
-            gid,
-            x: at - 0.2,
-            y: -g.shift,
-            adv: 0.0,
-            sx: g.sx * k,
-            len: 0,
-            generated_text: None,
-            upright: false,
-            tcy: None,
-            dx: 0.0,
-            ..place(g, at)
-        });
-    }
+    append_kashidas(&line, &mut out, kashidas);
     (out, x, ratio)
 }
 
@@ -4044,7 +5161,22 @@ fn prepend_label(
     let mut tmp = Story::new(StoryId(0));
     tmp.insert(0, label);
     let styles = designcraft_doc::Styles::default();
-    let shaped = shape::shape_para(db, &styles, &tmp, 0, 0..label.len(), base, env, &SubstCtx::default(), table, &[], &[], &[], (0, ""));
+    let shaped = shape::shape_para(
+        shape::ShapeInput {
+            db,
+            styles: &styles,
+            story: &tmp,
+            range: 0..label.len(),
+            para_chars: base,
+            auto_leading: env,
+            sub: &SubstCtx::default(),
+            nested: &[],
+            grep: &[],
+            lines: &[],
+            drop_cap: (0, ""),
+        },
+        table,
+    );
     let mut pre: Vec<Glyph> = shaped
         .glyphs
         .into_iter()
diff --git a/crates/compose/src/notes.rs b/crates/compose/src/notes.rs
index 2a465fbfa..a385a9093 100644
--- a/crates/compose/src/notes.rs
+++ b/crates/compose/src/notes.rs
@@ -46,6 +46,14 @@ pub(crate) struct NoteMetrics {
     descent: f64,
 }
 
+#[derive(Clone, Copy)]
+pub(crate) struct NoteColumn<'a> {
+    pub(crate) frame_index: usize,
+    pub(crate) column_index: usize,
+    pub(crate) width: f64,
+    pub(crate) frame: &'a FrameSpec,
+}
+
 /// Height of footnotes stacked baseline to baseline, from the top of the footnote area to the
 /// last footnote's descent.
 fn stack_height<'a>(notes: impl IntoIterator<Item = &'a NoteMetrics>, space_between: f64) -> f64 {
@@ -130,7 +138,7 @@ impl Notes {
                 self.num = o.start_at;
             }
             self.numbers[k] = self.num;
-            self.num += 1;
+            self.num = self.num.saturating_add(1);
             sub.notes.insert(self.refs[k], o.label(self.numbers[k], false));
         }
         sub.note_position = o.ref_position;
@@ -180,6 +188,7 @@ impl Notes {
             running: opts.running.clone(),
             label: Some(label),
             xrefs: opts.xrefs.clone(),
+            placed: Vec::new(),
         };
         let cs = crate::compose(doc, &self.notes[k].text, std::slice::from_ref(&spec), &nopts);
         let lines = cs.frames.first().map(|ft| ft.lines.as_slice()).unwrap_or_default();
@@ -193,16 +202,16 @@ impl Notes {
     }
 
     /// Height the footnotes of column (fi, col) take, with `extra` footnotes added.
-    #[allow(clippy::too_many_arguments)]
-    pub fn reserve(&mut self, doc: &Document, fi: usize, col: usize, extra: &[usize], w: f64, f: &FrameSpec, opts: &ComposeOptions) -> f64 {
+    pub fn reserve(&mut self, doc: &Document, column: NoteColumn<'_>, extra: &[usize], opts: &ComposeOptions) -> f64 {
         let o = &doc.footnote_options;
         let (space_between, space_before) = (o.space_between, o.space_before);
-        let mut ms: Vec<NoteMetrics> = self.placed.iter().filter(|p| self.same_area(p, fi, col)).map(|p| p.m).collect();
+        let mut ms: Vec<NoteMetrics> =
+            self.placed.iter().filter(|p| self.same_area(p, column.frame_index, column.column_index)).map(|p| p.m).collect();
         for &k in extra {
-            ms.push(self.compose(doc, k, w, f, opts).1);
+            ms.push(self.compose(doc, k, column.width, column.frame, opts).1);
         }
         let r = if ms.is_empty() { 0.0 } else { stack_height(&ms, space_between) + space_before };
-        if self.span { r.max(self.floor.get(&fi).copied().unwrap_or(0.0)) } else { r }
+        if self.span { r.max(self.floor.get(&column.frame_index).copied().unwrap_or(0.0)) } else { r }
     }
 
     /// After spanning notes were placed in column `col` of frame `fi`: whether a line of an earlier
@@ -220,12 +229,12 @@ impl Notes {
         hit
     }
 
-    pub fn place(&mut self, doc: &Document, k: usize, fi: usize, col: usize, w: f64, f: &FrameSpec, opts: &ComposeOptions) {
+    pub fn place(&mut self, doc: &Document, k: usize, column: NoteColumn<'_>, opts: &ComposeOptions) {
         if self.placed.iter().any(|p| p.k == k) {
             return;
         }
-        let (text, m) = self.compose(doc, k, w, f, opts);
-        self.placed.push(Placed { k, fi, col, m, text });
+        let (text, m) = self.compose(doc, k, column.width, column.frame, opts);
+        self.placed.push(Placed { k, fi: column.frame_index, col: column.column_index, m, text });
     }
 
     /// Stack each column's footnotes against its bottom, rule above the first.
diff --git a/crates/compose/src/overlay.rs b/crates/compose/src/overlay.rs
index d65460949..b09ef908e 100644
--- a/crates/compose/src/overlay.rs
+++ b/crates/compose/src/overlay.rs
@@ -9,9 +9,42 @@ use designcraft_doc::{GrepStyle, NestedStyle, NestedUntil};
 
 use crate::grep::{Grep, GrepOptions};
 
+/// Patterns kept compiled at once. A document's GREP styles are few; the cache grew without
+/// bound across every pattern a session ever composed (#1598).
+const MAX_CACHED_PATTERNS: usize = 64;
+
 thread_local! {
-    /// Compiled GREP styles by pattern; None for one that doesn't compile or gave up on a search.
-    static PATTERNS: RefCell<HashMap<String, Option<Grep>>> = RefCell::new(HashMap::new());
+    /// Compiled GREP styles by pattern, with the tick they were last used at; `None` for one that
+    /// doesn't compile or gave up on a search. Bounded to [`MAX_CACHED_PATTERNS`], least recently
+    /// used evicted first.
+    static PATTERNS: RefCell<HashMap<String, (Option<Grep>, u64)>> = RefCell::new(HashMap::new());
+    /// Counts cache uses, so the least recently used entry can be found.
+    static TICK: RefCell<u64> = const { RefCell::new(0) };
+}
+
+/// The compiled pattern for `pattern`, compiling it on first use and evicting the least recently
+/// used entry once the cache is full. `f` is given `None` when the pattern does not compile.
+fn with_pattern<R>(pattern: &str, f: impl FnOnce(&mut Option<Grep>) -> R) -> R {
+    let now = TICK.with(|t| {
+        let mut t = t.borrow_mut();
+        *t += 1;
+        *t
+    });
+    PATTERNS.with(|p| {
+        let mut p = p.borrow_mut();
+        if !p.contains_key(pattern)
+            && p.len() >= MAX_CACHED_PATTERNS
+            && let Some(oldest) = p.iter().min_by_key(|(_, (_, used))| *used).map(|(k, _)| k.clone())
+        {
+            p.remove(&oldest);
+        }
+        let slot = p.entry(pattern.to_string()).or_insert_with(|| {
+            let re = Grep::new(pattern, GrepOptions::default()).map_err(|e| log::warn!("GREP style {pattern:?} skipped: {e}")).ok();
+            (re, now)
+        });
+        slot.1 = now;
+        f(&mut slot.0)
+    })
 }
 
 fn is_event(u: &NestedUntil, c: char, prev: Option<char>, next: Option<char>) -> bool {
@@ -71,14 +104,15 @@ pub(crate) fn overlays(text: &str, range: Range<usize>, nested: &[NestedStyle],
         if g.style.is_empty() || g.pattern.is_empty() {
             continue;
         }
-        PATTERNS.with(|p| {
-            let mut p = p.borrow_mut();
-            let slot = p.entry(g.pattern.clone()).or_insert_with(|| {
-                Grep::new(&g.pattern, GrepOptions::default()).map_err(|e| log::warn!("GREP style {:?} skipped: {e}", g.pattern)).ok()
-            });
+        with_pattern(&g.pattern, |slot| {
             let Some(re) = slot else { return };
-            match re.find_all(text.get(range.start..end).unwrap_or(""), usize::MAX) {
-                Ok(ms) => out.extend(ms.into_iter().filter(|m| !m.is_empty()).map(|m| (range.start + m.start..range.start + m.end, g.style.clone()))),
+            match re.find_nonempty(text.get(range.start..end).unwrap_or(""), crate::grep::MAX_MATCHES_PER_PARAGRAPH) {
+                Ok(ms) => {
+                    if ms.len() == crate::grep::MAX_MATCHES_PER_PARAGRAPH {
+                        log::warn!("GREP style {:?} matched more than {} times in one paragraph; the rest are not styled", g.pattern, ms.len());
+                    }
+                    out.extend(ms.into_iter().filter(|m| !m.is_empty()).map(|m| (range.start + m.start..range.start + m.end, g.style.clone())));
+                }
                 Err(e) => {
                     log::warn!("GREP style {:?} disabled: {e}", g.pattern);
                     *slot = None;
@@ -93,6 +127,40 @@ pub(crate) fn overlays(text: &str, range: Range<usize>, nested: &[NestedStyle],
 mod tests {
     use super::*;
 
+    /// A pattern that can match nothing still styles a paragraph longer than the cap: empty
+    /// matches don't count toward it.
+    #[test]
+    fn empty_matches_do_not_use_up_the_grep_cap() {
+        let text = format!("{}a", "b".repeat(crate::grep::MAX_MATCHES_PER_PARAGRAPH + 100));
+        let o = overlays(&text, 0..text.len(), &[], &[GrepStyle { style: "A".into(), pattern: "a*".into() }], 0);
+        assert_eq!(o.len(), 1, "the one non-empty match at the end is styled");
+    }
+
+    /// A GREP style's scan is bounded two ways (#1598): the matches one paragraph can take, and
+    /// the patterns kept compiled at once.
+    #[test]
+    fn a_grep_scan_and_the_pattern_cache_are_bounded() {
+        // More matches in one paragraph than the cap: the scan stops with what it has instead of
+        // paying the backtrack limit again for each one.
+        let text = "a ".repeat(crate::grep::MAX_MATCHES_PER_PARAGRAPH + 500);
+        let o = overlays(&text, 0..text.len(), &[], &[GrepStyle { style: "A".into(), pattern: "a".into() }], 0);
+        assert_eq!(o.len(), crate::grep::MAX_MATCHES_PER_PARAGRAPH, "the scan stops at the cap");
+
+        // The cache holds at most MAX_CACHED_PATTERNS, and the one just used is not the one
+        // dropped: a document's own styles stay compiled however many patterns a session saw.
+        PATTERNS.with(|p| p.borrow_mut().clear());
+        for i in 0..MAX_CACHED_PATTERNS + 20 {
+            let pattern = format!("x{i}y");
+            overlays("x1y", 0..3, &[], &[GrepStyle { style: "S".into(), pattern }], 0);
+        }
+        let (len, has_last) = PATTERNS.with(|p| {
+            let p = p.borrow();
+            (p.len(), p.contains_key(&format!("x{}y", MAX_CACHED_PATTERNS + 19)))
+        });
+        assert_eq!(len, MAX_CACHED_PATTERNS, "the cache is bounded");
+        assert!(has_last, "the most recently used pattern is still cached");
+    }
+
     #[test]
     fn nested_and_grep_ranges() {
         let text = "Q: what is 42? A drop of 7 words.\n".to_string();
diff --git a/crates/compose/src/placed.rs b/crates/compose/src/placed.rs
new file mode 100644
index 000000000..200ff6e3c
--- /dev/null
+++ b/crates/compose/src/placed.rs
@@ -0,0 +1,84 @@
+//! Where anchored text frames sit on their spread.
+//!
+//! An anchored frame is not a spread item: its host story's composition places it on a line. Its
+//! own story is composed against that placement (page, page side, page rect, baseline grid), so
+//! the host story is composed first.
+
+use std::sync::Arc;
+
+use designcraft_doc::{Document, Item, ItemId, SpreadRef, StoryId};
+use designcraft_geom::Affine;
+
+use crate::{ComposedStory, FrameText};
+
+/// Hosts nested deeper than this (a note anchored in a note anchored in …, or stories anchored in
+/// each other in a cycle) are composed where they are stored.
+pub(crate) const MAX_DEPTH: usize = 8;
+
+/// An anchored item's parent space on its spread, where its host story's composition placed it.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Placement {
+    pub spread: SpreadRef,
+    /// The item's parent space → spread space.
+    pub xf: Affine,
+}
+
+/// The placements of `sid`'s anchored frames, from their host stories composed by `host`.
+pub(crate) fn placements(doc: &Document, sid: StoryId, host: &mut dyn FnMut(StoryId) -> Arc<ComposedStory>) -> Vec<(ItemId, Placement)> {
+    let Some(st) = doc.story(sid) else { return Vec::new() };
+    let mut anchored = None;
+    let mut out = Vec::new();
+    for &fid in &st.frames {
+        if doc.find(fid).is_some() {
+            continue;
+        }
+        let items = anchored.get_or_insert_with(|| doc.anchored_items());
+        // A frame anchored in its own story would need its own composition to place it.
+        let Some(owner) = items.iter().find_map(|(owner, it)| (it.id == fid).then_some(*owner)).filter(|o| *o != sid) else { continue };
+        if let Some(p) = locate(doc, &host(owner), fid) {
+            out.push((fid, p));
+        }
+    }
+    out
+}
+
+/// Where `cs` (a host story's composition) places item `fid`: in its frames' anchored objects,
+/// footnotes and table cells.
+fn locate(doc: &Document, cs: &ComposedStory, fid: ItemId) -> Option<Placement> {
+    cs.frames.iter().find_map(|ft| {
+        let loc = doc.find(ft.frame)?;
+        let frame = doc.item_at(&loc)?;
+        let xf = in_frame(ft, doc.parent_xf(&loc) * doc.text_xf(frame), fid, 0)?;
+        Some(Placement { spread: loc.spread, xf })
+    })
+}
+
+/// The parent space of `fid` among the objects of `ft`, whose text space maps to the spread by
+/// `xf`.
+fn in_frame(ft: &FrameText, xf: Affine, fid: ItemId, depth: usize) -> Option<Affine> {
+    if depth > MAX_DEPTH {
+        return None;
+    }
+    let objects = ft.objects.iter().find_map(|o| in_item(&o.object.item, xf * Affine::translate(o.origin.to_vec2()), fid, 0));
+    objects
+        .or_else(|| ft.notes.iter().find_map(|n| in_frame(n.text.frames.first()?, xf * Affine::translate(n.origin.to_vec2()), fid, depth + 1)))
+        .or_else(|| {
+            ft.tables
+                .iter()
+                .flat_map(|t| &t.cells)
+                .find_map(|c| in_frame(c.text.frames.first()?, xf * Affine::translate(c.origin.to_vec2()), fid, depth + 1))
+        })
+}
+
+/// The parent space of `fid` in `it` (it or a group member), `it`'s parent space mapping to the
+/// spread by `parent`.
+fn in_item(it: &Item, parent: Affine, fid: ItemId, depth: usize) -> Option<Affine> {
+    if it.id == fid {
+        return Some(parent);
+    }
+    if depth > crate::MAX_WRAP_DEPTH {
+        return None;
+    }
+    let xf = parent * it.xf;
+    it.children().iter().find_map(|c| in_item(c, xf, fid, depth + 1))
+}
diff --git a/crates/compose/src/shape.rs b/crates/compose/src/shape.rs
index 0f739e16e..d972cad30 100644
--- a/crates/compose/src/shape.rs
+++ b/crates/compose/src/shape.rs
@@ -319,30 +319,50 @@ impl StyleTable<'_> {
 
 /// Resolve and shape one paragraph. Its drop cap ends at byte `drop.0` (`range.start` without
 /// one) and takes the character style `drop.1` ("" = none).
-pub(crate) fn shape_para(
-    db: &ScopedFonts<'_>,
-    styles: &Styles,
-    story: &Story,
-    pi: usize,
-    range: std::ops::Range<usize>,
-    para_chars: &CharProps,
-    auto_leading: TypeEnv,
-    sub: &SubstCtx,
-    table: &mut StyleTable<'_>,
-    nested: &[designcraft_doc::NestedStyle],
-    grep: &[designcraft_doc::GrepStyle],
-    lines: &[(std::ops::Range<usize>, String)],
-    drop: (usize, &str),
-) -> ShapedPara {
-    let _ = pi;
-    let mut glyphs = Vec::with_capacity(range.len());
-    // Nested line styles lie under nested and GREP styles, and the drop cap's style over them all
-    // (later overlays win).
+pub(crate) struct ShapeInput<'a, 'font> {
+    pub(crate) db: &'a ScopedFonts<'font>,
+    pub(crate) styles: &'a Styles,
+    pub(crate) story: &'a Story,
+    pub(crate) range: std::ops::Range<usize>,
+    pub(crate) para_chars: &'a CharProps,
+    pub(crate) auto_leading: TypeEnv,
+    pub(crate) sub: &'a SubstCtx,
+    pub(crate) nested: &'a [designcraft_doc::NestedStyle],
+    pub(crate) grep: &'a [designcraft_doc::GrepStyle],
+    pub(crate) lines: &'a [(std::ops::Range<usize>, String)],
+    pub(crate) drop_cap: (usize, &'a str),
+}
+
+pub(crate) fn shape_para(input: ShapeInput<'_, '_>, table: &mut StyleTable<'_>) -> ShapedPara {
+    let db = input.db;
+    let sub = input.sub;
+    let range = input.range.clone();
+    let auto_leading = input.auto_leading;
+    let (pieces, auto_tcy) = resolve_pieces(&input, table);
+    let mut glyphs = shape_pieces(&input, table, pieces);
+    fit_auto_tcy(&mut glyphs, &auto_tcy);
+    collapse_tcy(&mut glyphs, sub.vertical);
+    crate::ruby::reserve(db, table.styles, &mut glyphs, auto_leading.glyph_fallback, sub.vertical);
+    ShapedPara { glyphs, range }
+}
+
+fn resolve_pieces(input: &ShapeInput<'_, '_>, table: &mut StyleTable<'_>) -> (Vec<Piece>, Vec<std::ops::Range<usize>>) {
+    let db = input.db;
+    let styles = input.styles;
+    let story = input.story;
+    let range = input.range.clone();
+    let para_chars = input.para_chars;
+    let auto_leading = input.auto_leading;
+    let sub = input.sub;
+    let nested = input.nested;
+    let grep = input.grep;
+    let lines = input.lines;
+    let drop_cap = input.drop_cap;
     let mut overlays: Vec<(std::ops::Range<usize>, String)> = lines.to_vec();
     // The drop cap's style is the nested styles' leading "through 1 Dropcap" entry (the form IDML
     // stores it in). Set (`[None]` included), it restyles that entry; a real one stands in for a
     // missing entry. Either way the nested styles after it start after the drop cap.
-    let set = Some(drop.1).filter(|s| !s.is_empty());
+    let set = Some(drop_cap.1).filter(|s| !s.is_empty());
     let cap_style = set.filter(|s| *s != designcraft_doc::NO_CHAR_STYLE);
     let with_cap: Vec<designcraft_doc::NestedStyle>;
     let nested = match set {
@@ -357,12 +377,12 @@ pub(crate) fn shape_para(
         _ => nested,
     };
     if !nested.is_empty() || !grep.is_empty() {
-        overlays.extend(crate::overlay::overlays(&story.text, range.clone(), nested, grep, drop.0));
+        overlays.extend(crate::overlay::overlays(&story.text, range.clone(), nested, grep, drop_cap.0));
     }
     if let Some(s) = cap_style
-        && drop.0 > range.start
+        && drop_cap.0 > range.start
     {
-        overlays.push((range.start..drop.0, s.to_string()));
+        overlays.push((range.start..drop_cap.0, s.to_string()));
     }
     // Each run, cut where nested / GREP styles start and end.
     let mut segments: Vec<(usize, usize, Option<&str>, &designcraft_doc::CharFormat)> = Vec::new();
@@ -474,6 +494,15 @@ pub(crate) fn shape_para(
             pieces.push(Piece { range: k..b, props, style, env: auto_leading, hidden: false, composite_note: false });
         }
     }
+    (pieces, auto_tcy)
+}
+
+fn shape_pieces(input: &ShapeInput<'_, '_>, table: &mut StyleTable<'_>, pieces: Vec<Piece>) -> Vec<Glyph> {
+    let db = input.db;
+    let styles = input.styles;
+    let story = input.story;
+    let sub = input.sub;
+    let mut glyphs = Vec::new();
     let mut i = 0;
     while i < pieces.len() {
         let first = &pieces[i];
@@ -562,10 +591,7 @@ pub(crate) fn shape_para(
         }
         i = j;
     }
-    fit_auto_tcy(&mut glyphs, &auto_tcy);
-    collapse_tcy(&mut glyphs, sub.vertical);
-    crate::ruby::reserve(db, table.styles, &mut glyphs, auto_leading.glyph_fallback, sub.vertical);
-    ShapedPara { glyphs, range }
+    glyphs
 }
 
 /// Combining marks that start a run are shaped with the letter before them when the two runs
diff --git a/crates/compose/src/table.rs b/crates/compose/src/table.rs
index 9a41a546e..c620622a3 100644
--- a/crates/compose/src/table.rs
+++ b/crates/compose/src/table.rs
@@ -1096,483 +1096,4 @@ mod height_tests {
 }
 
 #[cfg(test)]
-mod border_tests {
-    use super::*;
-    use designcraft_doc::{CellRange, ParaFormat, SpreadRef, build::NewDocument};
-
-    fn compose_table(table: Table) -> ComposedStory {
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let (_, sid) = doc.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 0.0, 120.0, 200.0), layer, "", ParaFormat::default()).unwrap();
-        doc.story_mut(sid).unwrap().insert_table(0, table);
-        crate::compose_story(&doc, sid, &ComposeOptions::default())
-    }
-
-    #[test]
-    fn explicit_cell_edges_override_table_border_without_changing_native_defaults() {
-        let mut table = Table::new(77, 1, 1, 0, 0, 100.0);
-        table.options.border.weight = 2.0;
-        table.cell_mut(0, 0).unwrap().strokes = std::array::from_fn(|_| CellStroke::none());
-        let native = compose_table(table.clone());
-        let strokes = &native.frames[0].tables[0].strokes;
-        assert_eq!(strokes.len(), 4, "default cells still use all four table borders");
-        assert!(strokes.iter().all(|s| s.stroke.weight == 2.0));
-
-        let cell = table.cell_mut(0, 0).unwrap();
-        cell.border_overrides = [true, true, true, false];
-        cell.strokes[2] = CellStroke { weight: 3.0, ..Default::default() };
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 2, "top and left None overrides suppress borders");
-        let bottom = fragment.strokes.iter().find(|s| s.a.y == fragment.rect.y1 && s.b.y == fragment.rect.y1).unwrap();
-        assert_eq!(bottom.stroke.weight, 3.0);
-        let right = fragment.strokes.iter().find(|s| s.a.x == fragment.rect.x1 && s.b.x == fragment.rect.x1).unwrap();
-        assert_eq!(right.stroke.weight, 2.0, "unoverridden right edge keeps the table border");
-    }
-
-    #[test]
-    fn merged_cell_keeps_explicit_border_suppression() {
-        let mut table = Table::new(77, 2, 2, 0, 0, 100.0);
-        table.merge(CellRange::new(0, 0, 1, 1)).unwrap();
-        let cell = table.cell_mut(0, 0).unwrap();
-        cell.border_overrides = [true; 4];
-        cell.strokes = std::array::from_fn(|_| CellStroke::none());
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.cells.len(), 1);
-        assert!(fragment.strokes.is_empty());
-    }
-
-    fn rule_table(body: usize, cols: usize, header: usize, footer: usize) -> Table {
-        let mut table = Table::new(77, body, cols, header, footer, 100.0);
-        table.options.border = CellStroke::none();
-        for row in &mut table.rows {
-            row.height = 20.0;
-            row.mode = RowHeightMode::Exactly;
-        }
-        for cell in &mut table.cells {
-            cell.insets = [0.0; 4];
-            cell.strokes = std::array::from_fn(|_| CellStroke::none());
-        }
-        table
-    }
-
-    fn set_rule(table: &mut Table, row: usize, col: usize, side: usize, weight: f64, priority: i32) {
-        let cell = table.cell_mut(row, col).unwrap();
-        cell.strokes[side] = CellStroke { weight, ..Default::default() };
-        cell.stroke_defined[side] = true;
-        cell.stroke_priorities[side] = priority;
-    }
-
-    fn assert_no_overlapping_rules(fragment: &TableFrag) {
-        for (i, a) in fragment.strokes.iter().enumerate() {
-            for b in &fragment.strokes[i + 1..] {
-                let horizontal_overlap = a.a.y == a.b.y && a.a.y == b.a.y && b.a.y == b.b.y && a.a.x.max(b.a.x) < a.b.x.min(b.b.x);
-                let vertical_overlap = a.a.x == a.b.x && a.a.x == b.a.x && b.a.x == b.b.x && a.a.y.max(b.a.y) < a.b.y.min(b.b.y);
-                assert!(!horizontal_overlap && !vertical_overlap, "duplicate shared edge: {a:?}, {b:?}");
-            }
-        }
-    }
-
-    #[test]
-    fn header_bottom_only_style_survives_zero_body_edges() {
-        // Synthetic equivalent of a header with a one-point bottom rule and zero on all
-        // remaining header/body edges. Both sides supply style formatting at priority zero.
-        let mut table = rule_table(2, 3, 1, 0);
-        for cell in &mut table.cells {
-            cell.stroke_defined = [true; 4];
-            cell.border_overrides = [true; 4];
-        }
-        for col in 0..3 {
-            set_rule(&mut table, 0, col, 2, 1.0, 0);
-        }
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        let y = fragment.cell(0, 0).unwrap().rect.y1;
-        assert_eq!(fragment.strokes.len(), 3);
-        assert!(fragment.strokes.iter().all(|s| s.a.y == y && s.b.y == y && s.stroke.weight == 1.0));
-        assert_eq!(fragment.strokes.iter().map(|s| s.b.x - s.a.x).sum::<f64>(), 100.0);
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn shared_rules_choose_numeric_priority_once_and_preserve_drawing_order() {
-        let mut table = rule_table(2, 2, 0, 0);
-        set_rule(&mut table, 0, 0, 2, 3.0, 7);
-        set_rule(&mut table, 1, 0, 0, 1.0, 4);
-        set_rule(&mut table, 0, 0, 3, 4.0, 3);
-        set_rule(&mut table, 0, 1, 1, 2.0, 9);
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 2);
-        let horizontal = &fragment.strokes[0];
-        assert_eq!(horizontal.a.y, horizontal.b.y);
-        assert_eq!(horizontal.stroke.weight, 3.0);
-        let vertical = &fragment.strokes[1];
-        assert_eq!(vertical.a.x, vertical.b.x);
-        assert_eq!(vertical.stroke.weight, 2.0, "higher priority draws last at a crossing");
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn signed_negative_priorities_resolve_and_draw_in_numeric_order() {
-        let mut table = rule_table(2, 2, 0, 0);
-        set_rule(&mut table, 0, 0, 2, 1.0, -2);
-        set_rule(&mut table, 1, 0, 0, 3.0, -1);
-        set_rule(&mut table, 0, 0, 3, 2.0, -3);
-        set_rule(&mut table, 0, 1, 1, 4.0, -2);
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 2);
-        assert_eq!(fragment.strokes[0].stroke.weight, 4.0, "priority -2 draws before -1");
-        assert_eq!(fragment.strokes[0].a.x, fragment.strokes[0].b.x);
-        assert_eq!(fragment.strokes[1].stroke.weight, 3.0, "priority -1 wins over -2");
-        assert_eq!(fragment.strokes[1].a.y, fragment.strokes[1].b.y);
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn default_zero_priority_beats_a_negative_priority_rule() {
-        let mut table = rule_table(2, 1, 0, 0);
-        set_rule(&mut table, 0, 0, 2, 3.0, -1);
-        assert_eq!(table.cell(1, 0).unwrap().stroke_priorities, [0; 4]);
-        let composed = compose_table(table.clone());
-        assert!(composed.frames[0].tables[0].strokes.is_empty(), "priority zero None suppresses priority -1");
-        table.cell_mut(1, 0).unwrap().strokes[0] = CellStroke::default();
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 1);
-        assert_eq!(fragment.strokes[0].stroke.weight, 1.0, "the priority-zero native rule wins over priority -1");
-    }
-
-    #[test]
-    fn higher_priority_zero_or_none_suppresses_a_visible_shared_rule() {
-        for invisible in [CellStroke::none(), CellStroke { color: designcraft_color::swatch::NONE.into(), ..Default::default() }] {
-            let mut table = rule_table(2, 2, 0, 0);
-            set_rule(&mut table, 0, 0, 2, 3.0, 7);
-            set_rule(&mut table, 1, 0, 0, 0.0, 8);
-            table.cell_mut(1, 0).unwrap().strokes[0] = invisible.clone();
-            set_rule(&mut table, 0, 0, 3, 3.0, 7);
-            set_rule(&mut table, 0, 1, 1, 0.0, 8);
-            table.cell_mut(0, 1).unwrap().strokes[1] = invisible;
-            let composed = compose_table(table);
-            assert!(composed.frames[0].tables[0].strokes.is_empty());
-        }
-    }
-
-    #[test]
-    fn supplied_zero_shared_edge_beats_missing_native_default() {
-        let mut table = Table::new(77, 2, 1, 0, 0, 100.0);
-        table.options.border = CellStroke::none();
-        let upper = table.cell_mut(0, 0).unwrap();
-        upper.strokes[2] = CellStroke::none();
-        upper.stroke_defined[2] = true;
-        let composed = compose_table(table.clone());
-        assert!(composed.frames[0].tables[0].strokes.is_empty(), "explicit zero beats a missing edge's one-point default");
-        table.cell_mut(0, 0).unwrap().stroke_defined[2] = false;
-        let composed = compose_table(table);
-        assert_eq!(composed.frames[0].tables[0].strokes.len(), 1, "a missing zero cannot suppress the opposite visible default");
-    }
-
-    #[test]
-    fn specified_zero_priority_outer_edges_keep_per_side_table_borders() {
-        for direction in [designcraft_doc::TextDirection::LeftToRight, designcraft_doc::TextDirection::RightToLeft] {
-            let mut table = rule_table(1, 1, 0, 0);
-            table.options.direction = direction;
-            table.options.borders = std::array::from_fn(|i| Some(CellStroke { weight: (i + 1) as f64, ..Default::default() }));
-            table.cell_mut(0, 0).unwrap().stroke_defined = [true; 4];
-            let composed = compose_table(table);
-            let fragment = &composed.frames[0].tables[0];
-            assert_eq!(fragment.strokes.len(), 4);
-            for rule in &fragment.strokes {
-                let expected = if rule.a.y == rule.b.y {
-                    if rule.a.y == fragment.rect.y0 { 1.0 } else { 3.0 }
-                } else if rule.a.x == fragment.rect.x0 {
-                    2.0
-                } else {
-                    4.0
-                };
-                assert_eq!(rule.stroke.weight, expected, "priority-zero cell values do not override perimeter formatting");
-            }
-            assert_no_overlapping_rules(fragment);
-        }
-    }
-
-    fn uniform_pattern(weight: f64) -> designcraft_doc::AltStrokes {
-        let stroke = CellStroke { weight, ..Default::default() };
-        designcraft_doc::AltStrokes { first: 1, next: 1, first_stroke: stroke.clone(), next_stroke: stroke, skip_first: 0, skip_last: 0 }
-    }
-
-    #[test]
-    fn uniform_zero_table_patterns_suppress_missing_grid_edges_but_not_perimeter() {
-        let mut table = Table::new(77, 2, 2, 0, 0, 100.0);
-        table.options.row_strokes = Some(uniform_pattern(0.0));
-        table.options.column_strokes = Some(uniform_pattern(0.0));
-        table.options.border.weight = 2.0;
-        let composed = compose_table(table.clone());
-        let fragment = &composed.frames[0].tables[0];
-        assert!(!fragment.strokes.is_empty(), "table perimeter remains visible");
-        assert!(fragment.strokes.iter().all(|s| {
-            s.stroke.weight == 2.0
-                && ((s.a.x == s.b.x && (s.a.x == fragment.rect.x0 || s.a.x == fragment.rect.x1))
-                    || (s.a.y == s.b.y && (s.a.y == fragment.rect.y0 || s.a.y == fragment.rect.y1)))
-        }));
-        assert_no_overlapping_rules(fragment);
-        table.options.border = CellStroke::none();
-        set_rule(&mut table, 0, 0, 2, 3.0, 0);
-        set_rule(&mut table, 0, 1, 1, 4.0, 0);
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 2, "supplied cell strokes override the table patterns");
-        assert!(fragment.strokes.iter().any(|s| s.stroke.weight == 3.0));
-        assert!(fragment.strokes.iter().any(|s| s.stroke.weight == 4.0));
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn uniform_visible_table_patterns_supply_continuous_rules_below_explicit_none() {
-        let mut table = Table::new(77, 2, 2, 0, 0, 100.0);
-        table.options.border = CellStroke::none();
-        table.options.row_strokes = Some(uniform_pattern(2.0));
-        table.options.column_strokes = Some(uniform_pattern(3.0));
-        let composed = compose_table(table.clone());
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 2, "a table pattern stays continuous across cell boundaries");
-        assert!(fragment.strokes.iter().any(|s| s.stroke.weight == 2.0 && s.b.x - s.a.x == 100.0));
-        assert!(fragment.strokes.iter().any(|s| s.stroke.weight == 3.0 && s.b.y - s.a.y == fragment.rect.height()));
-        for cell in &mut table.cells {
-            cell.strokes = std::array::from_fn(|_| CellStroke::none());
-            cell.stroke_defined = [true; 4];
-        }
-        let composed = compose_table(table);
-        assert!(composed.frames[0].tables[0].strokes.is_empty(), "explicit cell None is stronger than table patterns");
-    }
-
-    #[test]
-    fn uniform_table_patterns_leave_header_and_footer_edges_unchanged() {
-        let mut table = Table::new(77, 2, 2, 1, 1, 100.0);
-        table.options.border = CellStroke::none();
-        table.options.row_strokes = Some(uniform_pattern(0.0));
-        table.options.column_strokes = Some(uniform_pattern(0.0));
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        let header = fragment.cell(0, 0).unwrap().rect;
-        let body = fragment.cell(1, 0).unwrap().rect;
-        let footer = fragment.cell(3, 0).unwrap().rect;
-        assert!(fragment.strokes.iter().any(|s| s.a == Point::new(header.x1, header.y0) && s.b == Point::new(header.x1, header.y1)));
-        assert!(fragment.strokes.iter().any(|s| s.a == Point::new(footer.x1, footer.y0) && s.b == Point::new(footer.x1, footer.y1)));
-        assert!(!fragment.strokes.iter().any(|s| s.a.y == body.y1 && s.b.y == body.y1));
-        assert!(!fragment.strokes.iter().any(|s| s.a == Point::new(body.x1, body.y0) && s.b == Point::new(body.x1, body.y1)));
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn unverified_nonuniform_or_skipped_pattern_phase_keeps_native_edges() {
-        for skipped in [false, true] {
-            let mut table = Table::new(77, 2, 2, 0, 0, 100.0);
-            table.options.border = CellStroke::none();
-            let mut pattern = uniform_pattern(2.0);
-            if skipped {
-                pattern.skip_first = 1;
-            } else {
-                pattern.next_stroke.weight = 3.0;
-            }
-            table.options.row_strokes = Some(pattern.clone());
-            table.options.column_strokes = Some(pattern);
-            let composed = compose_table(table);
-            let fragment = &composed.frames[0].tables[0];
-            assert_eq!(fragment.strokes.len(), 4);
-            assert!(fragment.strokes.iter().all(|s| s.stroke.weight == 1.0));
-        }
-    }
-
-    #[test]
-    fn metadata_free_native_and_legacy_edges_keep_top_and_left_suppression() {
-        let mut table = Table::new(77, 2, 2, 0, 0, 100.0);
-        table.options.border = CellStroke::none();
-        let composed = compose_table(table.clone());
-        assert_eq!(composed.frames[0].tables[0].strokes.len(), 4, "unmodified native grid control");
-        // The metadata arrays also default to zero/false when reading legacy JSON. Older
-        // native table.setCell code changed these strokes without setting any metadata.
-        table.cell_mut(1, 0).unwrap().strokes[0] = CellStroke::none();
-        table.cell_mut(0, 1).unwrap().strokes[1].color = designcraft_color::swatch::NONE.into();
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 2);
-        let hidden_top = fragment.cell(1, 0).unwrap().rect;
-        let hidden_left = fragment.cell(0, 1).unwrap().rect;
-        assert!(!fragment.strokes.iter().any(|s| s.a == Point::new(hidden_top.x0, hidden_top.y0) && s.b == Point::new(hidden_top.x1, hidden_top.y0)));
-        assert!(
-            !fragment.strokes.iter().any(|s| s.a == Point::new(hidden_left.x0, hidden_left.y0) && s.b == Point::new(hidden_left.x0, hidden_left.y1))
-        );
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn equal_priority_visible_rules_keep_top_and_left_ownership() {
-        let mut table = rule_table(2, 2, 0, 0);
-        set_rule(&mut table, 0, 0, 2, 5.0, 0);
-        set_rule(&mut table, 1, 0, 0, 2.0, 0);
-        set_rule(&mut table, 0, 0, 3, 6.0, 0);
-        set_rule(&mut table, 0, 1, 1, 3.0, 0);
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 2);
-        assert_eq!(fragment.strokes[0].stroke.weight, 2.0);
-        assert_eq!(fragment.strokes[1].stroke.weight, 3.0);
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn row_spanning_edge_resolves_each_neighbor_without_internal_rules() {
-        let mut table = rule_table(2, 2, 0, 0);
-        table.merge(CellRange::new(0, 0, 1, 0)).unwrap();
-        set_rule(&mut table, 0, 0, 3, 1.0, 5);
-        set_rule(&mut table, 0, 1, 1, 2.0, 6);
-        set_rule(&mut table, 1, 1, 1, 3.0, 4);
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 2);
-        let upper = fragment.strokes.iter().find(|s| s.stroke.weight == 2.0).unwrap();
-        let lower = fragment.strokes.iter().find(|s| s.stroke.weight == 1.0).unwrap();
-        assert_eq!(upper.a, Point::new(50.0, fragment.rect.y0));
-        assert_eq!(upper.b, lower.a);
-        assert_eq!(lower.b, Point::new(50.0, fragment.rect.y1));
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn column_spanning_edge_resolves_each_neighbor_without_internal_rules() {
-        let mut table = rule_table(2, 2, 0, 0);
-        table.merge(CellRange::new(0, 0, 0, 1)).unwrap();
-        set_rule(&mut table, 0, 0, 2, 1.0, 5);
-        set_rule(&mut table, 1, 0, 0, 2.0, 6);
-        set_rule(&mut table, 1, 1, 0, 3.0, 4);
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 2);
-        let left = fragment.strokes.iter().find(|s| s.stroke.weight == 2.0).unwrap();
-        let right = fragment.strokes.iter().find(|s| s.stroke.weight == 1.0).unwrap();
-        let y = fragment.cell(0, 0).unwrap().rect.y1;
-        assert_eq!(left.a, Point::new(fragment.rect.x0, y));
-        assert_eq!(left.b, right.a);
-        assert_eq!(right.b, Point::new(fragment.rect.x1, y));
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn merged_winning_dashed_edge_stays_continuous_across_losing_neighbors() {
-        let mut table = rule_table(2, 2, 0, 0);
-        table.columns.iter_mut().for_each(|column| column.width = 45.0);
-        table.merge(CellRange::new(1, 0, 1, 1)).unwrap();
-        set_rule(&mut table, 1, 0, 0, 1.0, 1);
-        table.cell_mut(1, 0).unwrap().strokes[0].kind = designcraft_doc::StrokeType::Dashed { pattern: vec![6.0, 4.0] };
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 1, "one winning source edge must retain one dash phase");
-        let rule = &fragment.strokes[0];
-        let merged = fragment.cell(1, 0).unwrap().rect;
-        assert_eq!(rule.a, Point::new(merged.x0, merged.y0));
-        assert_eq!(rule.b, Point::new(merged.x1, merged.y0));
-        assert_eq!(rule.b.x - rule.a.x, 90.0);
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn merged_perimeter_keeps_four_continuous_strokes() {
-        let mut table = rule_table(2, 2, 0, 0);
-        table.merge(CellRange::new(0, 0, 1, 1)).unwrap();
-        table.options.border.weight = 2.0;
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 4);
-        assert_eq!(fragment.strokes.iter().filter(|s| s.a.y == s.b.y).count(), 2);
-        assert_eq!(fragment.strokes.iter().filter(|s| s.a.x == s.b.x).count(), 2);
-        assert_no_overlapping_rules(fragment);
-    }
-
-    #[test]
-    fn rtl_shared_rules_use_physical_edges_and_outer_borders() {
-        let mut table = rule_table(1, 2, 0, 0);
-        table.options.direction = designcraft_doc::TextDirection::RightToLeft;
-        table.columns[0].width = 30.0;
-        table.columns[1].width = 70.0;
-        set_rule(&mut table, 0, 0, 1, 2.0, 9);
-        set_rule(&mut table, 0, 1, 3, 4.0, 2);
-        set_rule(&mut table, 0, 0, 3, 5.0, 3);
-        table.cell_mut(0, 0).unwrap().border_overrides[3] = true;
-        set_rule(&mut table, 0, 1, 1, 6.0, 4);
-        table.cell_mut(0, 1).unwrap().border_overrides[1] = true;
-        let composed = compose_table(table);
-        let fragment = &composed.frames[0].tables[0];
-        assert_eq!(fragment.strokes.len(), 3);
-        for (x, weight) in [(0.0, 6.0), (70.0, 2.0), (100.0, 5.0)] {
-            let rule = fragment.strokes.iter().find(|s| s.a.x == x && s.b.x == x).unwrap();
-            assert_eq!(rule.stroke.weight, weight);
-        }
-        assert_no_overlapping_rules(fragment);
-    }
-
-    fn compose_two_fragments(table: Table, height: f64) -> ComposedStory {
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let (first, sid) = doc.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 0.0, 120.0, height), layer, "", ParaFormat::default()).unwrap();
-        let (second, _) =
-            doc.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 200.0, 120.0, 200.0 + height), layer, "", ParaFormat::default()).unwrap();
-        doc.thread(first, second).unwrap();
-        doc.story_mut(sid).unwrap().insert_table(0, table);
-        let composed = crate::compose_story(&doc, sid, &ComposeOptions::default());
-        assert!(!composed.is_overset(), "overset at {:?}", composed.overset_at);
-        assert_eq!(composed.frames[0].tables.len(), 1);
-        assert_eq!(composed.frames[1].tables.len(), 1);
-        composed
-    }
-
-    #[test]
-    fn repeated_header_and_footer_rules_resolve_displayed_fragment_neighbors() {
-        let mut table = rule_table(4, 2, 1, 1);
-        table.merge(CellRange::new(0, 0, 0, 1)).unwrap();
-        table.merge(CellRange::new(5, 0, 5, 1)).unwrap();
-        set_rule(&mut table, 0, 0, 2, 1.0, 2);
-        set_rule(&mut table, 5, 0, 0, 2.0, 3);
-        // Keep 19 points for the anchor's trailing empty paragraph, still below the
-        // 100 points needed to fit a third body row plus the header and footer.
-        let composed = compose_two_fragments(table, 99.0);
-        for (i, frame) in composed.frames.iter().enumerate() {
-            let fragment = &frame.tables[0];
-            let header = fragment.cell(0, 0).unwrap();
-            let footer = fragment.cell(5, 0).unwrap();
-            assert_eq!(header.repeated, i == 1);
-            assert_eq!(footer.repeated, i == 0);
-            assert_eq!(fragment.strokes.len(), 2);
-            let header_rules: Vec<_> = fragment.strokes.iter().filter(|s| s.a.y == header.rect.y1 && s.b.y == header.rect.y1).collect();
-            let footer_rules: Vec<_> = fragment.strokes.iter().filter(|s| s.a.y == footer.rect.y0 && s.b.y == footer.rect.y0).collect();
-            assert_eq!(header_rules.len(), 1);
-            assert!(header_rules.iter().all(|s| s.stroke.weight == 1.0));
-            assert_eq!(footer_rules.len(), 1);
-            assert!(footer_rules.iter().all(|s| s.stroke.weight == 2.0));
-            assert_no_overlapping_rules(fragment);
-        }
-        assert!(composed.frames[0].tables[0].cell(1, 0).is_some());
-        assert!(composed.frames[1].tables[0].cell(3, 0).is_some());
-    }
-
-    #[test]
-    fn fragment_boundary_does_not_resolve_against_an_undisplayed_neighbor() {
-        let mut table = rule_table(4, 1, 0, 0);
-        set_rule(&mut table, 1, 0, 2, 3.0, 5);
-        table.cell_mut(1, 0).unwrap().border_overrides[2] = true;
-        set_rule(&mut table, 2, 0, 0, 4.0, 6);
-        table.cell_mut(2, 0).unwrap().border_overrides[0] = true;
-        // Two rows fit in each frame; leave room for the trailing empty paragraph.
-        let composed = compose_two_fragments(table, 59.0);
-        let first = &composed.frames[0].tables[0];
-        let second = &composed.frames[1].tables[0];
-        assert_eq!(first.strokes.len(), 1);
-        assert_eq!(first.strokes[0].stroke.weight, 3.0);
-        assert_eq!(first.strokes[0].a.y, first.rect.y1);
-        assert_eq!(second.strokes.len(), 1);
-        assert_eq!(second.strokes[0].stroke.weight, 4.0);
-        assert_eq!(second.strokes[0].a.y, second.rect.y0);
-    }
-}
+mod border_tests;
diff --git a/crates/compose/src/table/border_tests.rs b/crates/compose/src/table/border_tests.rs
new file mode 100644
index 000000000..5a28d7274
--- /dev/null
+++ b/crates/compose/src/table/border_tests.rs
@@ -0,0 +1,475 @@
+use super::*;
+use designcraft_doc::{CellRange, ParaFormat, SpreadRef, build::NewDocument};
+
+fn compose_table(table: Table) -> ComposedStory {
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let (_, sid) = doc.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 0.0, 120.0, 200.0), layer, "", ParaFormat::default()).unwrap();
+    doc.story_mut(sid).unwrap().insert_table(0, table);
+    crate::compose_story(&doc, sid, &ComposeOptions::default())
+}
+
+#[test]
+fn explicit_cell_edges_override_table_border_without_changing_native_defaults() {
+    let mut table = Table::new(77, 1, 1, 0, 0, 100.0);
+    table.options.border.weight = 2.0;
+    table.cell_mut(0, 0).unwrap().strokes = std::array::from_fn(|_| CellStroke::none());
+    let native = compose_table(table.clone());
+    let strokes = &native.frames[0].tables[0].strokes;
+    assert_eq!(strokes.len(), 4, "default cells still use all four table borders");
+    assert!(strokes.iter().all(|s| s.stroke.weight == 2.0));
+
+    let cell = table.cell_mut(0, 0).unwrap();
+    cell.border_overrides = [true, true, true, false];
+    cell.strokes[2] = CellStroke { weight: 3.0, ..Default::default() };
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 2, "top and left None overrides suppress borders");
+    let bottom = fragment.strokes.iter().find(|s| s.a.y == fragment.rect.y1 && s.b.y == fragment.rect.y1).unwrap();
+    assert_eq!(bottom.stroke.weight, 3.0);
+    let right = fragment.strokes.iter().find(|s| s.a.x == fragment.rect.x1 && s.b.x == fragment.rect.x1).unwrap();
+    assert_eq!(right.stroke.weight, 2.0, "unoverridden right edge keeps the table border");
+}
+
+#[test]
+fn merged_cell_keeps_explicit_border_suppression() {
+    let mut table = Table::new(77, 2, 2, 0, 0, 100.0);
+    table.merge(CellRange::new(0, 0, 1, 1)).unwrap();
+    let cell = table.cell_mut(0, 0).unwrap();
+    cell.border_overrides = [true; 4];
+    cell.strokes = std::array::from_fn(|_| CellStroke::none());
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.cells.len(), 1);
+    assert!(fragment.strokes.is_empty());
+}
+
+fn rule_table(body: usize, cols: usize, header: usize, footer: usize) -> Table {
+    let mut table = Table::new(77, body, cols, header, footer, 100.0);
+    table.options.border = CellStroke::none();
+    for row in &mut table.rows {
+        row.height = 20.0;
+        row.mode = RowHeightMode::Exactly;
+    }
+    for cell in &mut table.cells {
+        cell.insets = [0.0; 4];
+        cell.strokes = std::array::from_fn(|_| CellStroke::none());
+    }
+    table
+}
+
+fn set_rule(table: &mut Table, row: usize, col: usize, side: usize, weight: f64, priority: i32) {
+    let cell = table.cell_mut(row, col).unwrap();
+    cell.strokes[side] = CellStroke { weight, ..Default::default() };
+    cell.stroke_defined[side] = true;
+    cell.stroke_priorities[side] = priority;
+}
+
+fn assert_no_overlapping_rules(fragment: &TableFrag) {
+    for (i, a) in fragment.strokes.iter().enumerate() {
+        for b in &fragment.strokes[i + 1..] {
+            let horizontal_overlap = a.a.y == a.b.y && a.a.y == b.a.y && b.a.y == b.b.y && a.a.x.max(b.a.x) < a.b.x.min(b.b.x);
+            let vertical_overlap = a.a.x == a.b.x && a.a.x == b.a.x && b.a.x == b.b.x && a.a.y.max(b.a.y) < a.b.y.min(b.b.y);
+            assert!(!horizontal_overlap && !vertical_overlap, "duplicate shared edge: {a:?}, {b:?}");
+        }
+    }
+}
+
+#[test]
+fn header_bottom_only_style_survives_zero_body_edges() {
+    // Synthetic equivalent of a header with a one-point bottom rule and zero on all
+    // remaining header/body edges. Both sides supply style formatting at priority zero.
+    let mut table = rule_table(2, 3, 1, 0);
+    for cell in &mut table.cells {
+        cell.stroke_defined = [true; 4];
+        cell.border_overrides = [true; 4];
+    }
+    for col in 0..3 {
+        set_rule(&mut table, 0, col, 2, 1.0, 0);
+    }
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    let y = fragment.cell(0, 0).unwrap().rect.y1;
+    assert_eq!(fragment.strokes.len(), 3);
+    assert!(fragment.strokes.iter().all(|s| s.a.y == y && s.b.y == y && s.stroke.weight == 1.0));
+    assert_eq!(fragment.strokes.iter().map(|s| s.b.x - s.a.x).sum::<f64>(), 100.0);
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn shared_rules_choose_numeric_priority_once_and_preserve_drawing_order() {
+    let mut table = rule_table(2, 2, 0, 0);
+    set_rule(&mut table, 0, 0, 2, 3.0, 7);
+    set_rule(&mut table, 1, 0, 0, 1.0, 4);
+    set_rule(&mut table, 0, 0, 3, 4.0, 3);
+    set_rule(&mut table, 0, 1, 1, 2.0, 9);
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 2);
+    let horizontal = &fragment.strokes[0];
+    assert_eq!(horizontal.a.y, horizontal.b.y);
+    assert_eq!(horizontal.stroke.weight, 3.0);
+    let vertical = &fragment.strokes[1];
+    assert_eq!(vertical.a.x, vertical.b.x);
+    assert_eq!(vertical.stroke.weight, 2.0, "higher priority draws last at a crossing");
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn signed_negative_priorities_resolve_and_draw_in_numeric_order() {
+    let mut table = rule_table(2, 2, 0, 0);
+    set_rule(&mut table, 0, 0, 2, 1.0, -2);
+    set_rule(&mut table, 1, 0, 0, 3.0, -1);
+    set_rule(&mut table, 0, 0, 3, 2.0, -3);
+    set_rule(&mut table, 0, 1, 1, 4.0, -2);
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 2);
+    assert_eq!(fragment.strokes[0].stroke.weight, 4.0, "priority -2 draws before -1");
+    assert_eq!(fragment.strokes[0].a.x, fragment.strokes[0].b.x);
+    assert_eq!(fragment.strokes[1].stroke.weight, 3.0, "priority -1 wins over -2");
+    assert_eq!(fragment.strokes[1].a.y, fragment.strokes[1].b.y);
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn default_zero_priority_beats_a_negative_priority_rule() {
+    let mut table = rule_table(2, 1, 0, 0);
+    set_rule(&mut table, 0, 0, 2, 3.0, -1);
+    assert_eq!(table.cell(1, 0).unwrap().stroke_priorities, [0; 4]);
+    let composed = compose_table(table.clone());
+    assert!(composed.frames[0].tables[0].strokes.is_empty(), "priority zero None suppresses priority -1");
+    table.cell_mut(1, 0).unwrap().strokes[0] = CellStroke::default();
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 1);
+    assert_eq!(fragment.strokes[0].stroke.weight, 1.0, "the priority-zero native rule wins over priority -1");
+}
+
+#[test]
+fn higher_priority_zero_or_none_suppresses_a_visible_shared_rule() {
+    for invisible in [CellStroke::none(), CellStroke { color: designcraft_color::swatch::NONE.into(), ..Default::default() }] {
+        let mut table = rule_table(2, 2, 0, 0);
+        set_rule(&mut table, 0, 0, 2, 3.0, 7);
+        set_rule(&mut table, 1, 0, 0, 0.0, 8);
+        table.cell_mut(1, 0).unwrap().strokes[0] = invisible.clone();
+        set_rule(&mut table, 0, 0, 3, 3.0, 7);
+        set_rule(&mut table, 0, 1, 1, 0.0, 8);
+        table.cell_mut(0, 1).unwrap().strokes[1] = invisible;
+        let composed = compose_table(table);
+        assert!(composed.frames[0].tables[0].strokes.is_empty());
+    }
+}
+
+#[test]
+fn supplied_zero_shared_edge_beats_missing_native_default() {
+    let mut table = Table::new(77, 2, 1, 0, 0, 100.0);
+    table.options.border = CellStroke::none();
+    let upper = table.cell_mut(0, 0).unwrap();
+    upper.strokes[2] = CellStroke::none();
+    upper.stroke_defined[2] = true;
+    let composed = compose_table(table.clone());
+    assert!(composed.frames[0].tables[0].strokes.is_empty(), "explicit zero beats a missing edge's one-point default");
+    table.cell_mut(0, 0).unwrap().stroke_defined[2] = false;
+    let composed = compose_table(table);
+    assert_eq!(composed.frames[0].tables[0].strokes.len(), 1, "a missing zero cannot suppress the opposite visible default");
+}
+
+#[test]
+fn specified_zero_priority_outer_edges_keep_per_side_table_borders() {
+    for direction in [designcraft_doc::TextDirection::LeftToRight, designcraft_doc::TextDirection::RightToLeft] {
+        let mut table = rule_table(1, 1, 0, 0);
+        table.options.direction = direction;
+        table.options.borders = std::array::from_fn(|i| Some(CellStroke { weight: (i + 1) as f64, ..Default::default() }));
+        table.cell_mut(0, 0).unwrap().stroke_defined = [true; 4];
+        let composed = compose_table(table);
+        let fragment = &composed.frames[0].tables[0];
+        assert_eq!(fragment.strokes.len(), 4);
+        for rule in &fragment.strokes {
+            let expected = if rule.a.y == rule.b.y {
+                if rule.a.y == fragment.rect.y0 { 1.0 } else { 3.0 }
+            } else if rule.a.x == fragment.rect.x0 {
+                2.0
+            } else {
+                4.0
+            };
+            assert_eq!(rule.stroke.weight, expected, "priority-zero cell values do not override perimeter formatting");
+        }
+        assert_no_overlapping_rules(fragment);
+    }
+}
+
+fn uniform_pattern(weight: f64) -> designcraft_doc::AltStrokes {
+    let stroke = CellStroke { weight, ..Default::default() };
+    designcraft_doc::AltStrokes { first: 1, next: 1, first_stroke: stroke.clone(), next_stroke: stroke, skip_first: 0, skip_last: 0 }
+}
+
+#[test]
+fn uniform_zero_table_patterns_suppress_missing_grid_edges_but_not_perimeter() {
+    let mut table = Table::new(77, 2, 2, 0, 0, 100.0);
+    table.options.row_strokes = Some(uniform_pattern(0.0));
+    table.options.column_strokes = Some(uniform_pattern(0.0));
+    table.options.border.weight = 2.0;
+    let composed = compose_table(table.clone());
+    let fragment = &composed.frames[0].tables[0];
+    assert!(!fragment.strokes.is_empty(), "table perimeter remains visible");
+    assert!(fragment.strokes.iter().all(|s| {
+        s.stroke.weight == 2.0
+            && ((s.a.x == s.b.x && (s.a.x == fragment.rect.x0 || s.a.x == fragment.rect.x1))
+                || (s.a.y == s.b.y && (s.a.y == fragment.rect.y0 || s.a.y == fragment.rect.y1)))
+    }));
+    assert_no_overlapping_rules(fragment);
+    table.options.border = CellStroke::none();
+    set_rule(&mut table, 0, 0, 2, 3.0, 0);
+    set_rule(&mut table, 0, 1, 1, 4.0, 0);
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 2, "supplied cell strokes override the table patterns");
+    assert!(fragment.strokes.iter().any(|s| s.stroke.weight == 3.0));
+    assert!(fragment.strokes.iter().any(|s| s.stroke.weight == 4.0));
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn uniform_visible_table_patterns_supply_continuous_rules_below_explicit_none() {
+    let mut table = Table::new(77, 2, 2, 0, 0, 100.0);
+    table.options.border = CellStroke::none();
+    table.options.row_strokes = Some(uniform_pattern(2.0));
+    table.options.column_strokes = Some(uniform_pattern(3.0));
+    let composed = compose_table(table.clone());
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 2, "a table pattern stays continuous across cell boundaries");
+    assert!(fragment.strokes.iter().any(|s| s.stroke.weight == 2.0 && s.b.x - s.a.x == 100.0));
+    assert!(fragment.strokes.iter().any(|s| s.stroke.weight == 3.0 && s.b.y - s.a.y == fragment.rect.height()));
+    for cell in &mut table.cells {
+        cell.strokes = std::array::from_fn(|_| CellStroke::none());
+        cell.stroke_defined = [true; 4];
+    }
+    let composed = compose_table(table);
+    assert!(composed.frames[0].tables[0].strokes.is_empty(), "explicit cell None is stronger than table patterns");
+}
+
+#[test]
+fn uniform_table_patterns_leave_header_and_footer_edges_unchanged() {
+    let mut table = Table::new(77, 2, 2, 1, 1, 100.0);
+    table.options.border = CellStroke::none();
+    table.options.row_strokes = Some(uniform_pattern(0.0));
+    table.options.column_strokes = Some(uniform_pattern(0.0));
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    let header = fragment.cell(0, 0).unwrap().rect;
+    let body = fragment.cell(1, 0).unwrap().rect;
+    let footer = fragment.cell(3, 0).unwrap().rect;
+    assert!(fragment.strokes.iter().any(|s| s.a == Point::new(header.x1, header.y0) && s.b == Point::new(header.x1, header.y1)));
+    assert!(fragment.strokes.iter().any(|s| s.a == Point::new(footer.x1, footer.y0) && s.b == Point::new(footer.x1, footer.y1)));
+    assert!(!fragment.strokes.iter().any(|s| s.a.y == body.y1 && s.b.y == body.y1));
+    assert!(!fragment.strokes.iter().any(|s| s.a == Point::new(body.x1, body.y0) && s.b == Point::new(body.x1, body.y1)));
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn unverified_nonuniform_or_skipped_pattern_phase_keeps_native_edges() {
+    for skipped in [false, true] {
+        let mut table = Table::new(77, 2, 2, 0, 0, 100.0);
+        table.options.border = CellStroke::none();
+        let mut pattern = uniform_pattern(2.0);
+        if skipped {
+            pattern.skip_first = 1;
+        } else {
+            pattern.next_stroke.weight = 3.0;
+        }
+        table.options.row_strokes = Some(pattern.clone());
+        table.options.column_strokes = Some(pattern);
+        let composed = compose_table(table);
+        let fragment = &composed.frames[0].tables[0];
+        assert_eq!(fragment.strokes.len(), 4);
+        assert!(fragment.strokes.iter().all(|s| s.stroke.weight == 1.0));
+    }
+}
+
+#[test]
+fn metadata_free_native_and_legacy_edges_keep_top_and_left_suppression() {
+    let mut table = Table::new(77, 2, 2, 0, 0, 100.0);
+    table.options.border = CellStroke::none();
+    let composed = compose_table(table.clone());
+    assert_eq!(composed.frames[0].tables[0].strokes.len(), 4, "unmodified native grid control");
+    // The metadata arrays also default to zero/false when reading legacy JSON. Older
+    // native table.setCell code changed these strokes without setting any metadata.
+    table.cell_mut(1, 0).unwrap().strokes[0] = CellStroke::none();
+    table.cell_mut(0, 1).unwrap().strokes[1].color = designcraft_color::swatch::NONE.into();
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 2);
+    let hidden_top = fragment.cell(1, 0).unwrap().rect;
+    let hidden_left = fragment.cell(0, 1).unwrap().rect;
+    assert!(!fragment.strokes.iter().any(|s| s.a == Point::new(hidden_top.x0, hidden_top.y0) && s.b == Point::new(hidden_top.x1, hidden_top.y0)));
+    assert!(!fragment.strokes.iter().any(|s| s.a == Point::new(hidden_left.x0, hidden_left.y0) && s.b == Point::new(hidden_left.x0, hidden_left.y1)));
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn equal_priority_visible_rules_keep_top_and_left_ownership() {
+    let mut table = rule_table(2, 2, 0, 0);
+    set_rule(&mut table, 0, 0, 2, 5.0, 0);
+    set_rule(&mut table, 1, 0, 0, 2.0, 0);
+    set_rule(&mut table, 0, 0, 3, 6.0, 0);
+    set_rule(&mut table, 0, 1, 1, 3.0, 0);
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 2);
+    assert_eq!(fragment.strokes[0].stroke.weight, 2.0);
+    assert_eq!(fragment.strokes[1].stroke.weight, 3.0);
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn row_spanning_edge_resolves_each_neighbor_without_internal_rules() {
+    let mut table = rule_table(2, 2, 0, 0);
+    table.merge(CellRange::new(0, 0, 1, 0)).unwrap();
+    set_rule(&mut table, 0, 0, 3, 1.0, 5);
+    set_rule(&mut table, 0, 1, 1, 2.0, 6);
+    set_rule(&mut table, 1, 1, 1, 3.0, 4);
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 2);
+    let upper = fragment.strokes.iter().find(|s| s.stroke.weight == 2.0).unwrap();
+    let lower = fragment.strokes.iter().find(|s| s.stroke.weight == 1.0).unwrap();
+    assert_eq!(upper.a, Point::new(50.0, fragment.rect.y0));
+    assert_eq!(upper.b, lower.a);
+    assert_eq!(lower.b, Point::new(50.0, fragment.rect.y1));
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn column_spanning_edge_resolves_each_neighbor_without_internal_rules() {
+    let mut table = rule_table(2, 2, 0, 0);
+    table.merge(CellRange::new(0, 0, 0, 1)).unwrap();
+    set_rule(&mut table, 0, 0, 2, 1.0, 5);
+    set_rule(&mut table, 1, 0, 0, 2.0, 6);
+    set_rule(&mut table, 1, 1, 0, 3.0, 4);
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 2);
+    let left = fragment.strokes.iter().find(|s| s.stroke.weight == 2.0).unwrap();
+    let right = fragment.strokes.iter().find(|s| s.stroke.weight == 1.0).unwrap();
+    let y = fragment.cell(0, 0).unwrap().rect.y1;
+    assert_eq!(left.a, Point::new(fragment.rect.x0, y));
+    assert_eq!(left.b, right.a);
+    assert_eq!(right.b, Point::new(fragment.rect.x1, y));
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn merged_winning_dashed_edge_stays_continuous_across_losing_neighbors() {
+    let mut table = rule_table(2, 2, 0, 0);
+    table.columns.iter_mut().for_each(|column| column.width = 45.0);
+    table.merge(CellRange::new(1, 0, 1, 1)).unwrap();
+    set_rule(&mut table, 1, 0, 0, 1.0, 1);
+    table.cell_mut(1, 0).unwrap().strokes[0].kind = designcraft_doc::StrokeType::Dashed { pattern: vec![6.0, 4.0] };
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 1, "one winning source edge must retain one dash phase");
+    let rule = &fragment.strokes[0];
+    let merged = fragment.cell(1, 0).unwrap().rect;
+    assert_eq!(rule.a, Point::new(merged.x0, merged.y0));
+    assert_eq!(rule.b, Point::new(merged.x1, merged.y0));
+    assert_eq!(rule.b.x - rule.a.x, 90.0);
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn merged_perimeter_keeps_four_continuous_strokes() {
+    let mut table = rule_table(2, 2, 0, 0);
+    table.merge(CellRange::new(0, 0, 1, 1)).unwrap();
+    table.options.border.weight = 2.0;
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 4);
+    assert_eq!(fragment.strokes.iter().filter(|s| s.a.y == s.b.y).count(), 2);
+    assert_eq!(fragment.strokes.iter().filter(|s| s.a.x == s.b.x).count(), 2);
+    assert_no_overlapping_rules(fragment);
+}
+
+#[test]
+fn rtl_shared_rules_use_physical_edges_and_outer_borders() {
+    let mut table = rule_table(1, 2, 0, 0);
+    table.options.direction = designcraft_doc::TextDirection::RightToLeft;
+    table.columns[0].width = 30.0;
+    table.columns[1].width = 70.0;
+    set_rule(&mut table, 0, 0, 1, 2.0, 9);
+    set_rule(&mut table, 0, 1, 3, 4.0, 2);
+    set_rule(&mut table, 0, 0, 3, 5.0, 3);
+    table.cell_mut(0, 0).unwrap().border_overrides[3] = true;
+    set_rule(&mut table, 0, 1, 1, 6.0, 4);
+    table.cell_mut(0, 1).unwrap().border_overrides[1] = true;
+    let composed = compose_table(table);
+    let fragment = &composed.frames[0].tables[0];
+    assert_eq!(fragment.strokes.len(), 3);
+    for (x, weight) in [(0.0, 6.0), (70.0, 2.0), (100.0, 5.0)] {
+        let rule = fragment.strokes.iter().find(|s| s.a.x == x && s.b.x == x).unwrap();
+        assert_eq!(rule.stroke.weight, weight);
+    }
+    assert_no_overlapping_rules(fragment);
+}
+
+fn compose_two_fragments(table: Table, height: f64) -> ComposedStory {
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let (first, sid) = doc.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 0.0, 120.0, height), layer, "", ParaFormat::default()).unwrap();
+    let (second, _) = doc.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 200.0, 120.0, 200.0 + height), layer, "", ParaFormat::default()).unwrap();
+    doc.thread(first, second).unwrap();
+    doc.story_mut(sid).unwrap().insert_table(0, table);
+    let composed = crate::compose_story(&doc, sid, &ComposeOptions::default());
+    assert!(!composed.is_overset(), "overset at {:?}", composed.overset_at);
+    assert_eq!(composed.frames[0].tables.len(), 1);
+    assert_eq!(composed.frames[1].tables.len(), 1);
+    composed
+}
+
+#[test]
+fn repeated_header_and_footer_rules_resolve_displayed_fragment_neighbors() {
+    let mut table = rule_table(4, 2, 1, 1);
+    table.merge(CellRange::new(0, 0, 0, 1)).unwrap();
+    table.merge(CellRange::new(5, 0, 5, 1)).unwrap();
+    set_rule(&mut table, 0, 0, 2, 1.0, 2);
+    set_rule(&mut table, 5, 0, 0, 2.0, 3);
+    // Keep 19 points for the anchor's trailing empty paragraph, still below the
+    // 100 points needed to fit a third body row plus the header and footer.
+    let composed = compose_two_fragments(table, 99.0);
+    for (i, frame) in composed.frames.iter().enumerate() {
+        let fragment = &frame.tables[0];
+        let header = fragment.cell(0, 0).unwrap();
+        let footer = fragment.cell(5, 0).unwrap();
+        assert_eq!(header.repeated, i == 1);
+        assert_eq!(footer.repeated, i == 0);
+        assert_eq!(fragment.strokes.len(), 2);
+        let header_rules: Vec<_> = fragment.strokes.iter().filter(|s| s.a.y == header.rect.y1 && s.b.y == header.rect.y1).collect();
+        let footer_rules: Vec<_> = fragment.strokes.iter().filter(|s| s.a.y == footer.rect.y0 && s.b.y == footer.rect.y0).collect();
+        assert_eq!(header_rules.len(), 1);
+        assert!(header_rules.iter().all(|s| s.stroke.weight == 1.0));
+        assert_eq!(footer_rules.len(), 1);
+        assert!(footer_rules.iter().all(|s| s.stroke.weight == 2.0));
+        assert_no_overlapping_rules(fragment);
+    }
+    assert!(composed.frames[0].tables[0].cell(1, 0).is_some());
+    assert!(composed.frames[1].tables[0].cell(3, 0).is_some());
+}
+
+#[test]
+fn fragment_boundary_does_not_resolve_against_an_undisplayed_neighbor() {
+    let mut table = rule_table(4, 1, 0, 0);
+    set_rule(&mut table, 1, 0, 2, 3.0, 5);
+    table.cell_mut(1, 0).unwrap().border_overrides[2] = true;
+    set_rule(&mut table, 2, 0, 0, 4.0, 6);
+    table.cell_mut(2, 0).unwrap().border_overrides[0] = true;
+    // Two rows fit in each frame; leave room for the trailing empty paragraph.
+    let composed = compose_two_fragments(table, 59.0);
+    let first = &composed.frames[0].tables[0];
+    let second = &composed.frames[1].tables[0];
+    assert_eq!(first.strokes.len(), 1);
+    assert_eq!(first.strokes[0].stroke.weight, 3.0);
+    assert_eq!(first.strokes[0].a.y, first.rect.y1);
+    assert_eq!(second.strokes.len(), 1);
+    assert_eq!(second.strokes[0].stroke.weight, 4.0);
+    assert_eq!(second.strokes[0].a.y, second.rect.y0);
+}
diff --git a/crates/compose/src/tests.rs b/crates/compose/src/tests.rs
index 6e1784f5e..3083261fb 100644
--- a/crates/compose/src/tests.rs
+++ b/crates/compose/src/tests.rs
@@ -577,6 +577,7 @@ fn same_as_clipping_wrap_follows_the_clipping_path() {
     );
     let triangle = PathData::single(SubPath::polyline(&[Point::new(75.0, 0.0), Point::new(150.0, 200.0), Point::new(0.0, 200.0)], true));
     it.content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
+        layer_options: None,
         asset: designcraft_doc::AssetId(1),
         size: (150.0, 200.0),
         xf: designcraft_geom::Affine::translate((150.0, 100.0)),
@@ -725,6 +726,7 @@ fn an_image_contour_stops_at_its_frame() {
     let mut it = designcraft_doc::Item::new(ItemId(d.alloc()), lid, designcraft_doc::Shape::Polygon, frame);
     // The image overhangs the frame on every side.
     it.content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
+        layer_options: None,
         asset: designcraft_doc::AssetId(d.alloc()),
         size: (300.0, 250.0),
         xf: designcraft_geom::Affine::IDENTITY,
@@ -769,6 +771,7 @@ fn a_clipping_path_contour_stops_at_its_frame() {
         true,
     ));
     it.content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
+        layer_options: None,
         asset: designcraft_doc::AssetId(1),
         size: (150.0, 200.0),
         xf: designcraft_geom::Affine::translate((150.0, 100.0)),
@@ -1358,6 +1361,111 @@ fn optical_margin_hangs_punctuation() {
     assert!(lines.iter().all(|l| l.end_x <= l.x1 + 12.0));
 }
 
+#[test]
+fn optical_margin_hangs_the_edges_of_lines_with_tabs() {
+    // Both line breakers let the edge glyphs of a line hang, tab or not, so layout hangs them
+    // too: a line that fits only because its period hangs is not squeezed into the measure or
+    // set past it. The left hang leaves tab stops where they are.
+    let stop = designcraft_doc::TabStop { position: 40.0, align: TabAlign::Left, leader: String::new(), align_on: String::new() };
+    let rest = "right here. More words follow it on the next line.";
+    let cases = [
+        ("tab", format!("“A”\tsits {rest}"), Align::LeftJustified),
+        ("no tab", format!("“A” sits {rest}"), Align::LeftJustified),
+        ("right indent tab", format!("“A” sits{}{rest}", story::RIGHT_INDENT_TAB), Align::Left),
+    ];
+    for (name, text, align) in &cases {
+        let ch = |g: &PlacedGlyph| text.get(g.byte..).and_then(|s| s.chars().next()).unwrap_or(' ');
+        let edge_glyphs = |l: &Line| -> Vec<PlacedGlyph> { l.glyphs.iter().filter(|g| g.visible && !ch(g).is_whitespace()).cloned().collect() };
+        for composer in [Composer::Paragraph, Composer::SingleLine] {
+            let mut ending = 0;
+            for w in 100..=240 {
+                let para = ParaAttrs {
+                    align: Some(*align),
+                    optical_margin: Some(true),
+                    hyphenate: Some(false),
+                    composer: Some(composer),
+                    tabs: Some(vec![stop.clone()]),
+                    ..Default::default()
+                };
+                let (d, sid, _) = doc_with(text, Rect::new(0.0, 0.0, f64::from(w), 1000.0), para);
+                let cs = compose_story(&d, sid, &ComposeOptions::default());
+                let lines = all_lines(&cs);
+                for (i, l) in lines.iter().enumerate() {
+                    let Some(last) = edge_glyphs(l).last().cloned() else { continue };
+                    let hang = breaker::hang(ch(&last)).1 * last.adv;
+                    let end = last.x + last.adv;
+                    assert!(end <= l.x1 + hang + 0.01, "{name}, {composer:?}, width {w}: line {i} ends at {end}, past {} and its hang {hang}", l.x1);
+                }
+                let glyphs = edge_glyphs(lines[0]);
+                let (x0, x1) = (lines[0].x0, lines[0].x1);
+                let first = &glyphs[0];
+                assert!((first.x + first.adv - x0).abs() < 0.01, "{name}, {composer:?}, width {w}: the opening quote is at {}", first.x);
+                if *name == "tab" {
+                    let s = glyphs.iter().find(|g| ch(g) == 's').unwrap();
+                    assert!((s.x - (x0 + 40.0)).abs() < 0.01, "{composer:?}, width {w}: the text after the tab starts at {}", s.x);
+                }
+                // Line 0 ends with the period of "here.": the period hangs past the measure.
+                let last = glyphs.last().unwrap();
+                if text.get(last.byte..).is_some_and(|s| s.starts_with(". More")) {
+                    ending += 1;
+                    assert!((last.x - x1).abs() < 0.01, "{name}, {composer:?}, width {w}: the period starts at {}, not at {x1}", last.x);
+                }
+            }
+            assert!(ending > 3, "{name}, {composer:?}: line 0 ends with the period at {ending} widths");
+        }
+    }
+}
+
+/// How far the opening quote of a one-line paragraph at `text_size` hangs into the left margin,
+/// with the story's Optical Margin Alignment `story` (on, size) and the paragraph's attributes.
+fn quote_hang(text_size: f64, story: Option<f64>, para: ParaAttrs) -> f64 {
+    let text = "“Quoted” words.";
+    let first_x = |story: Option<f64>, para: ParaAttrs| {
+        let (mut d, sid, _) = doc_with(text, Rect::new(0.0, 0.0, 400.0, 200.0), para);
+        let st = d.story_mut(sid).unwrap();
+        st.format_chars(0..text.len(), |f| f.over.size = Some(text_size));
+        if let Some(size) = story {
+            st.optical_margin = designcraft_doc::OpticalMargin { on: true, size };
+        }
+        let cs = compose_story(&d, sid, &ComposeOptions::default());
+        let lines = all_lines(&cs);
+        assert_eq!(lines.len(), 1);
+        lines[0].glyphs[0].x
+    };
+    first_x(None, ParaAttrs::default()) - first_x(story, para)
+}
+
+#[test]
+fn story_optical_margin_hang_scales_with_its_size() {
+    let at12 = quote_hang(12.0, Some(12.0), ParaAttrs::default());
+    let at24 = quote_hang(12.0, Some(24.0), ParaAttrs::default());
+    assert!(at12 > 1.0, "{at12}");
+    assert!((at24 - 2.0 * at12).abs() < 0.01, "{at12} {at24}");
+    // The size is the type size the hang is set for: 24 pt text at 24 hangs like 12 at 12, twice as far.
+    let big = quote_hang(24.0, Some(24.0), ParaAttrs::default());
+    assert!((big - 2.0 * at12).abs() < 0.01, "{at12} {big}");
+}
+
+#[test]
+fn ignore_optical_margin_paragraph_does_not_hang() {
+    let ignored = ParaAttrs { ignore_optical_margin: Some(true), optical_margin: Some(true), ..Default::default() };
+    assert_eq!(quote_hang(12.0, Some(12.0), ignored.clone()), 0.0);
+    assert_eq!(quote_hang(12.0, None, ignored), 0.0);
+}
+
+#[test]
+fn paragraph_optical_margin_hangs_at_the_text_size() {
+    // Documents saved before the story setting existed: the paragraph's switch hangs each
+    // character by its own size, not the story's default 12 pt.
+    let own = ParaAttrs { optical_margin: Some(true), ..Default::default() };
+    let at24 = quote_hang(24.0, None, own.clone());
+    assert!((at24 - quote_hang(24.0, Some(24.0), ParaAttrs::default())).abs() < 0.01);
+    assert!((at24 - 2.0 * quote_hang(12.0, None, own)).abs() < 0.01);
+    // The story setting, when on, sets the size.
+    let story = quote_hang(24.0, Some(12.0), ParaAttrs { optical_margin: Some(true), ..Default::default() });
+    assert!((story - at24 / 2.0).abs() < 0.01, "{story} {at24}");
+}
+
 // ---------- golden paragraph corpus ----------
 
 /// Original prose (written for this corpus) with a realistic mix of short and long words.
@@ -5595,14 +5703,27 @@ fn ruled(text: &str, rect: Rect, columns: u32, edit: impl FnOnce(&mut Document,
     (d, fid, rules)
 }
 
+/// Returns the top of the first frame's top line (its ascent) and the bottom of its bottom line
+/// (its descent).
+fn text_extent(d: &Document, fid: ItemId) -> (f64, f64) {
+    let sid = d.item(fid).unwrap().text_frame().unwrap().story;
+    let cs = compose_story(d, sid, &ComposeOptions::default());
+    let lines = &cs.frames[0].lines;
+    assert!(!lines.is_empty());
+    let top = lines.iter().map(|l| l.baseline - l.ascent).fold(f64::INFINITY, f64::min);
+    let bottom = lines.iter().map(|l| l.baseline + l.descent).fold(f64::NEG_INFINITY, f64::max);
+    (top, bottom)
+}
+
 #[test]
 fn column_rules_sit_in_the_gutters_inside_the_insets() {
     // Two columns in 0..300 with 6 pt side insets: the gutter is centred on 150.
-    let (_, _, rules) = ruled("Text", Rect::new(0.0, 0.0, 300.0, 200.0), 2, |_, _| {});
+    let (d, fid, rules) = ruled("Text", Rect::new(0.0, 0.0, 300.0, 200.0), 2, |_, _| {});
     assert_eq!(rules.len(), 1, "{rules:?}");
     let r = rules[0];
     assert!((r.center().x - 150.0).abs() < 1e-9 && (r.width() - 2.0).abs() < 1e-9, "{r:?}");
-    assert!((r.y0 - 10.0).abs() < 1e-9 && (r.y1 - 180.0).abs() < 1e-9, "{r:?}");
+    let (top, bottom) = text_extent(&d, fid);
+    assert!((r.y0 - top).abs() < 1e-9 && (r.y1 - bottom).abs() < 1e-9, "{r:?} for the text {top}..{bottom}");
     // Three columns: one rule per gutter, each centred between its two columns.
     let (_, _, rules) = ruled("Text", Rect::new(0.0, 0.0, 300.0, 200.0), 3, |_, _| {});
     assert_eq!(rules.len(), 2, "{rules:?}");
@@ -5621,16 +5742,36 @@ fn column_rules_sit_in_the_gutters_inside_the_insets() {
     assert!(rules.is_empty());
 }
 
+/// Column rules run from the top line's ascent to the bottom line's descent: text that fills the
+/// top of a tall frame gets rules down to its bottom line, not to the bottom of the columns.
+#[test]
+fn column_rules_run_from_the_top_lines_ascent_to_the_bottom_lines_descent() {
+    let (d, fid, rules) = ruled(LOREM, Rect::new(0.0, 0.0, 300.0, 600.0), 2, |_, _| {});
+    let (top, bottom) = text_extent(&d, fid);
+    assert!(bottom < 300.0, "the text fills the top of the 10..580 columns: {top}..{bottom}");
+    assert_eq!(rules.len(), 1, "{rules:?}");
+    assert!((rules[0].y0 - top).abs() < 1e-9 && (rules[0].y1 - bottom).abs() < 1e-9, "{rules:?} for the text {top}..{bottom}");
+    // Without lines there is no rule.
+    let cols = [Rect::new(0.0, 0.0, 100.0, 50.0), Rect::new(110.0, 0.0, 200.0, 50.0)];
+    assert!(column_rule_rects(&cols, &[], &TextFrameOptions { column_rule_weight: 1.0, ..Default::default() }).is_empty());
+}
+
 #[test]
 fn column_rules_centre_on_unequal_gutters_and_ignore_bad_weights() {
     let cols = [Rect::new(200.0, 0.0, 300.0, 50.0), Rect::new(0.0, 0.0, 100.0, 50.0), Rect::new(110.0, 0.0, 180.0, 50.0)];
+    // One line in the first column, from 0 to 50.
+    let (d, sid, _) = doc_with("Text", Rect::new(0.0, 0.0, 100.0, 50.0), ParaAttrs::default());
+    let mut line = compose_story(&d, sid, &ComposeOptions::default()).frames[0].lines[0].clone();
+    (line.x0, line.x1, line.ascent, line.descent, line.baseline) = (0.0, 100.0, 40.0, 10.0, 40.0);
+    let lines = [line];
     let weight = |w: f64| TextFrameOptions { column_rule_weight: w, ..Default::default() };
-    let rules = column_rule_rects(&cols, &[], &weight(1.0));
+    let rules = column_rule_rects(&cols, &lines, &weight(1.0));
     let centres: Vec<f64> = rules.iter().map(|r| r.center().x).collect();
     assert_eq!(centres, [105.0, 190.0]);
-    assert!(column_rule_rects(&cols, &[], &weight(f64::NAN)).is_empty());
-    assert!(column_rule_rects(&cols, &[], &weight(-1.0)).is_empty());
-    assert!((column_rule_rects(&cols, &[], &weight(1e12))[0].width() - 1000.0).abs() < 1e-9);
+    assert!(rules.iter().all(|r| r.y0 == 0.0 && r.y1 == 50.0), "{rules:?}");
+    assert!(column_rule_rects(&cols, &lines, &weight(f64::NAN)).is_empty());
+    assert!(column_rule_rects(&cols, &lines, &weight(-1.0)).is_empty());
+    assert!((column_rule_rects(&cols, &lines, &weight(1e12))[0].width() - 1000.0).abs() < 1e-9);
 }
 
 #[test]
@@ -5643,9 +5784,12 @@ fn column_rules_in_right_to_left_and_vertical_frames() {
     // Vertical type: the columns stack top to bottom, so the rule runs across the frame.
     let (d, fid, rules) = ruled("縦書き", Rect::new(100.0, 100.0, 400.0, 300.0), 2, |d, sid| d.story_mut(sid).unwrap().vertical = true);
     assert_eq!(rules.len(), 1);
+    let (top, bottom) = text_extent(&d, fid);
+    assert!((rules[0].y0 - top).abs() < 1e-9 && (rules[0].y1 - bottom).abs() < 1e-9, "{rules:?} for the text {top}..{bottom}");
     let r = d.text_xf(d.item(fid).unwrap()).transform_rect_bbox(rules[0]);
-    // Text area: x 106..394, y 110..280; the gutter is centred on y 195.
-    assert!((r.x0 - 106.0).abs() < 1e-6 && (r.x1 - 394.0).abs() < 1e-6, "{r:?}");
+    // Text area: x 106..394, y 110..280; the gutter is centred on y 195, and the one line of
+    // text runs from the right edge, so the rule is as long as that line is deep.
+    assert!(r.x0 > 106.0 && (r.x1 - 394.0).abs() < 2.0 && (r.width() - (bottom - top)).abs() < 1e-6, "{r:?}");
     assert!((r.center().y - 195.0).abs() < 1e-6 && (r.height() - 2.0).abs() < 1e-6, "{r:?}");
 }
 
@@ -5664,13 +5808,15 @@ fn column_rules_break_around_paragraphs_that_span_columns() {
     for r in &rules {
         assert!(r.y1 <= top + 1e-9 || r.y0 >= bottom - 1e-9, "rule {r:?} cuts the span {top}..{bottom}");
     }
-    // The rule resumes below the span and runs to the bottom of the columns.
-    assert!(rules.iter().any(|r| (r.y0 - bottom).abs() < 1e-9 && (r.y1 - 380.0).abs() < 1e-9), "{rules:?}");
+    // The rule resumes below the span and runs to the bottom line's descent.
+    let (_, text_bottom) = text_extent(&d, fid);
+    assert!(text_bottom < 380.0 - 1.0, "the text ends above the columns' bottom: {text_bottom}");
+    assert!(rules.iter().any(|r| (r.y0 - bottom).abs() < 1e-9 && (r.y1 - text_bottom).abs() < 1e-9), "{rules:?}");
 }
 
 #[test]
 fn column_rules_take_their_offset_insets_and_tint() {
-    let (d, fid, rules) = ruled("Text", Rect::new(0.0, 0.0, 300.0, 200.0), 2, |d, sid| {
+    let (d, fid, rules) = ruled(LOREM, Rect::new(0.0, 0.0, 300.0, 200.0), 2, |d, sid| {
         let fid = d.story(sid).unwrap().frames[0];
         let o = &mut d.item_mut(fid).unwrap().text_frame_mut().unwrap().options;
         o.column_rule_offset = 3.0;
@@ -5678,13 +5824,22 @@ fn column_rules_take_their_offset_insets_and_tint() {
         o.column_rule_bottom_inset = 25.0;
         o.column_rule_tint = 0.4;
     });
-    // Gutter centre 150 moved 3 pt; columns 10..180 shortened to 25..155.
+    // Gutter centre 150 moved 3 pt; the text's extent shortened by 15 at the top and 25 at the
+    // bottom.
+    let (top, bottom) = text_extent(&d, fid);
     assert_eq!(rules.len(), 1, "{rules:?}");
     let r = rules[0];
-    assert!((r.center().x - 153.0).abs() < 1e-9 && (r.y0 - 25.0).abs() < 1e-9 && (r.y1 - 155.0).abs() < 1e-9, "{r:?}");
+    assert!((r.center().x - 153.0).abs() < 1e-9 && (r.y0 - (top + 15.0)).abs() < 1e-9 && (r.y1 - (bottom - 25.0)).abs() < 1e-9, "{r:?}");
     let sid = d.item(fid).unwrap().text_frame().unwrap().story;
     let cs = compose_story(&d, sid, &ComposeOptions::default());
     assert!(cs.frames[0].decos.iter().any(|dc| dc.rect == r && (dc.tint - 0.4).abs() < 1e-6));
+    // A negative inset extends the rule past the text.
+    let (d, fid, rules) = ruled(LOREM, Rect::new(0.0, 0.0, 300.0, 200.0), 2, |d, sid| {
+        let fid = d.story(sid).unwrap().frames[0];
+        d.item_mut(fid).unwrap().text_frame_mut().unwrap().options.column_rule_top_inset = -4.0;
+    });
+    let (top, bottom) = text_extent(&d, fid);
+    assert!(rules.len() == 1 && (rules[0].y0 - (top - 4.0)).abs() < 1e-9 && (rules[0].y1 - bottom).abs() < 1e-9, "{rules:?}");
     // Insets that meet leave no rule.
     let (_, _, rules) = ruled("Text", Rect::new(0.0, 0.0, 300.0, 200.0), 2, |d, sid| {
         let fid = d.story(sid).unwrap().frames[0];
@@ -6697,7 +6852,7 @@ fn roman_word_break_breaks_inside_words_without_hyphens() {
 fn grid_doc(text: &str, para: ParaAttrs, edit: impl FnOnce(&mut Document, StoryId)) -> (Vec<Line>, (f64, f64)) {
     let (mut d, sid, fid) = doc_with(text, Rect::new(0.0, 0.0, 300.0, 400.0), para);
     if let Some(tf) = d.item_mut(fid).and_then(|i| i.text_frame_mut()) {
-        tf.options.baseline_grid = Some(designcraft_doc::FrameBaselineGrid { start: 0.0, increment: 12.0 });
+        tf.options.baseline_grid = Some(designcraft_doc::FrameBaselineGrid::new(0.0, 12.0));
     }
     edit(&mut d, sid);
     // Vertical frames have no baseline grid.
@@ -7407,6 +7562,37 @@ fn baseline_grid_relative_to_the_top_margin_starts_at_each_pages_margin() {
     assert_eq!(lines.len(), 41);
 }
 
+/// A frame's custom grid (start 10, increment 13) measured from the page top, the top margin
+/// (36), the frame top (100) or the top inset (6 below it).
+#[test]
+fn frame_baseline_grid_relative_to_page_margin_frame_or_inset() {
+    use designcraft_doc::{FrameBaselineGrid, FrameGridRelative as R};
+    let first_baseline = |relative_to: Option<R>| {
+        let mut d = Document::new(&NewDocument { margins: designcraft_doc::Margins::uniform(36.0), ..Default::default() });
+        let lid = d.default_layer();
+        let para = ParaFormat { para: ParaAttrs { grid_align: Some(GridAlign::AllLines), ..Default::default() }, ..Default::default() };
+        let (fid, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 100.0, 336.0, 400.0), lid, "Grid", para).unwrap();
+        let st = d.story_mut(sid).unwrap();
+        st.paras[0].chars =
+            designcraft_doc::CharAttrs { size: Some(11.0), leading: Some(designcraft_doc::Leading::Points(13.0)), ..Default::default() };
+        let tf = d.item_mut(fid).unwrap().text_frame_mut().unwrap();
+        tf.options.inset = [6.0, 0.0, 0.0, 0.0];
+        tf.options.baseline_grid = relative_to.map(|r| FrameBaselineGrid { relative_to: r, ..FrameBaselineGrid::new(10.0, 13.0) });
+        // A document grid that matches none of the frame grids.
+        d.settings.baseline_grid.start = 0.0;
+        d.settings.baseline_grid.increment = 0.0;
+        compose_story(&d, sid, &ComposeOptions::default()).frames[0].lines[0].baseline
+    };
+    // Without a grid the first baseline sits an ascent below the top inset.
+    let natural = first_baseline(None);
+    assert!(natural > 106.0 && natural < 120.0, "{natural}");
+    for (r, origin) in [(R::TopOfPage, 10.0), (R::TopMargin, 46.0), (R::TopOfFrame, 110.0), (R::TopInset, 116.0)] {
+        let want = (0..).map(|n| origin + 13.0 * f64::from(n)).find(|y| *y >= natural - 1e-9).unwrap();
+        let got = first_baseline(Some(r));
+        assert!((got - want).abs() < 1e-6, "{r:?}: first baseline {got}, want {want} (natural {natural})");
+    }
+}
+
 /// A group's transform moves a frame from the left page of a spread to the right one: the grid
 /// starts at the right page's top margin.
 #[test]
@@ -7658,3 +7844,91 @@ fn an_rtl_first_line_indent_is_at_the_right_edge() {
     assert!((left_edge(lines[0]) - rect.x0).abs() < 1.0, "left to right, first line at the edge: {}", left_edge(lines[0]));
     assert!((left_edge(lines[1]) - (rect.x0 + 10.0 * MM)).abs() < 1.0, "left to right, wrapped line indented: {}", left_edge(lines[1]));
 }
+
+/// A marginal note (an anchored text frame, Only Align First Line to Grid, 9/10) hangs 15 pt
+/// above its anchor's baseline on a right-hand page. It composes against the document grid where
+/// it is placed: its first line moves down onto the grid line, the second follows 10 pt below,
+/// and its page is the host's. Composed where it was stored, it snapped to a grid measured from
+/// its own top edge and sat on no page.
+#[test]
+fn anchored_text_frames_compose_against_the_grid_where_they_are_placed() {
+    use designcraft_doc::anchored::AnchorRelative as R;
+    let mut d = Document::new(&NewDocument { pages: 3, ..Default::default() });
+    d.settings.baseline_grid.start = 36.0;
+    d.settings.baseline_grid.increment = 10.0;
+    let lid = d.default_layer();
+    let page = d.spreads[1].pages[1].clone();
+    assert_eq!(page.side, designcraft_doc::PageSide::Right);
+    // Body lines at 46, 56, 66, … (on the grid) while the frame top is at 36.
+    let body = "One.\nTwo.\nThree.\nFour.";
+    let rect = Rect::new(page.x + 108.0, 36.0, page.x + page.width - 36.0, 400.0);
+    let (bf, sid) = d.add_text_frame(SpreadRef::Doc(1), rect, lid, body, ParaFormat::default()).unwrap();
+    d.item_mut(bf).unwrap().text_frame_mut().unwrap().options.first_baseline = FirstBaseline::Leading;
+    let nine_ten = |f: &mut designcraft_doc::story::CharFormat| {
+        f.over.size = Some(9.0);
+        f.over.leading = Some(designcraft_doc::Leading::Points(10.0));
+    };
+    d.story_mut(sid).unwrap().format_chars(0..body.len(), nine_ten);
+    // The note: its own story in a 60 × 40 frame anchored in the third line.
+    let (nid, nsid) = (ItemId(d.alloc()), StoryId(d.alloc()));
+    let text = "Note one\u{2028}note two";
+    let para = ParaFormat { para: ParaAttrs { grid_align: Some(GridAlign::FirstLineOnly), ..Default::default() }, ..Default::default() };
+    let mut story = Story::with_text(nsid, text, para);
+    story.format_chars(0..text.len(), nine_ten);
+    story.frames.push(nid);
+    d.stories.insert(nsid, Arc::new(story));
+    let mut note =
+        designcraft_doc::Item::new(nid, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(0.0, 0.0, 60.0, 40.0)));
+    note.content = Content::Text(designcraft_doc::TextFrame { story: nsid, options: Default::default() });
+    let position = designcraft_doc::AnchorPosition::Custom {
+        x_relative: R::TextFrame,
+        y_relative: R::Anchor,
+        x_offset: -72.0,
+        y_offset: -15.0,
+        object_point: 0,
+        ref_point: 0,
+        keep_within_column: false,
+        spine_relative: false,
+    };
+    let at = body.find("Three").unwrap();
+    d.story_mut(sid).unwrap().insert_object(at, designcraft_doc::AnchoredObject::new(note, position));
+
+    let cache = Cache::new();
+    let on_grid = |y: f64| on_grid(y, (36.0, 10.0));
+    // (anchor line baseline, note baselines), in spread space.
+    let baselines = |d: &Document, cs: &ComposedStory| {
+        let host = compose_story(d, sid, &ComposeOptions::default());
+        let ft = host.frame(bf).unwrap();
+        let o = &ft.objects[0];
+        let fxf = d.item(bf).unwrap().xf;
+        let anchor = (fxf * Point::new(0.0, ft.lines[o.line].baseline)).y;
+        let nxf = fxf * Affine::translate(o.origin.to_vec2()) * d.anchored_item(nid).unwrap().xf;
+        (anchor, all_lines(cs).iter().map(|l| (nxf * Point::new(0.0, l.baseline)).y).collect::<Vec<_>>())
+    };
+    let near = |a: f64, b: f64| (a - b).abs() < 1e-6;
+
+    let (anchor, lines) = baselines(&d, &cache.get(&d, nsid, None));
+    assert!(near(anchor, 66.0), "anchor baseline {anchor}");
+    assert_eq!(lines.len(), 2);
+    assert!(near(lines[0], anchor) && near(lines[1], anchor + 10.0), "note baselines {lines:?}, anchor {anchor}");
+    assert_eq!(baselines(&d, &compose_story(&d, nsid, &ComposeOptions::default())).1, lines);
+    // The note is on the host's right-hand page, with that page's rectangle.
+    let placed = placed::placements(&d, nsid, &mut |h| Arc::new(compose_story(&d, h, &ComposeOptions::default())));
+    let spec = &frame_specs_placed(&d, nsid, &placed)[0];
+    assert_eq!((spec.page, spec.right_page, spec.left_page), (Some(2), true, false));
+    assert!(spec.page_rect.is_some());
+
+    // Host moved down 5 pt: the anchor is off the grid, and the note's first line moves down from
+    // 10 pt above it onto the grid line 5 pt above it. The cache composes the note again.
+    let xf = d.item(bf).unwrap().xf;
+    d.item_mut(bf).unwrap().xf = Affine::translate((0.0, 5.0)) * xf;
+    let (anchor, lines) = baselines(&d, &cache.get(&d, nsid, None));
+    assert!(near(anchor, 71.0), "anchor baseline {anchor}");
+    assert!(on_grid(lines[0]) && near(lines[0], anchor - 5.0) && near(lines[1], lines[0] + 10.0), "note baselines {lines:?}, anchor {anchor}");
+    assert_eq!(baselines(&d, &compose_story(&d, nsid, &ComposeOptions::default())).1, lines);
+
+    // The host's page turns into a left-hand page: the note is composed again for that side.
+    let before = cache.get(&d, nsid, None);
+    Arc::make_mut(&mut d.spreads[1]).pages[1].side = designcraft_doc::PageSide::Left;
+    assert!(!Arc::ptr_eq(&before, &cache.get(&d, nsid, None)));
+}
diff --git a/crates/compose/src/wrap.rs b/crates/compose/src/wrap.rs
index 57657213f..e1cdc5fa7 100644
--- a/crates/compose/src/wrap.rs
+++ b/crates/compose/src/wrap.rs
@@ -182,7 +182,7 @@ fn settled(a: &[Vec<Exclusion>], b: &[Vec<Exclusion>]) -> bool {
 /// [`neighbours`]) and of its own.
 pub(crate) fn compose_among(doc: &Document, sid: StoryId, opts: &ComposeOptions, others: &[&ComposedStory]) -> ComposedStory {
     let Some(st) = doc.story(sid) else { return ComposedStory { story: sid, ..Default::default() } };
-    let mut specs = crate::frame_specs(doc, sid);
+    let mut specs = crate::frame_specs_placed(doc, sid, &opts.placed);
     if !others.is_empty() {
         let mut obs = Vec::new();
         for cs in others {
diff --git a/crates/doc/src/assets.rs b/crates/doc/src/assets.rs
index 0be5604c3..1533b8b4b 100644
--- a/crates/doc/src/assets.rs
+++ b/crates/doc/src/assets.rs
@@ -15,6 +15,72 @@ use crate::{Asset, AssetId, Content, Document, Item};
 /// is treated as using every asset, so nothing it references is merged away or pruned.
 const MAX_DEPTH: usize = 64;
 
+fn item_layer_options(it: &Item, depth: usize, overrides_only: bool) -> bool {
+    depth > MAX_DEPTH
+        || it.graphic().is_some_and(|g| g.layer_options.as_ref().is_some_and(|o| !overrides_only || o.has_visibility_overrides()))
+        || it.children().iter().any(|child| item_layer_options(child, depth + 1, overrides_only))
+}
+
+fn story_layer_options(st: &Story, depth: usize, overrides_only: bool) -> bool {
+    depth > MAX_DEPTH
+        || st.objects.iter().any(|object| item_layer_options(&object.item, depth + 1, overrides_only))
+        || st.tables.values().flat_map(|table| &table.cells).any(|cell| {
+            cell.graphic.as_ref().is_some_and(|g| g.layer_options.as_ref().is_some_and(|o| !overrides_only || o.has_visibility_overrides()))
+                || story_layer_options(&cell.text, depth + 1, overrides_only)
+        })
+        || st.notes.iter().chain(&st.endnotes).any(|note| story_layer_options(&note.text, depth + 1, overrides_only))
+}
+
+fn item_any(it: &Item, depth: usize, f: &impl Fn(&Item) -> bool) -> bool {
+    depth > MAX_DEPTH || f(it) || it.children().iter().any(|child| item_any(child, depth + 1, f))
+}
+
+fn story_any(st: &Story, depth: usize, f: &impl Fn(&Item) -> bool) -> bool {
+    depth > MAX_DEPTH
+        || st.objects.iter().any(|object| item_any(&object.item, depth + 1, f))
+        || st.tables.values().flat_map(|table| &table.cells).any(|cell| story_any(&cell.text, depth + 1, f))
+        || st.notes.iter().chain(&st.endnotes).any(|note| story_any(&note.text, depth + 1, f))
+}
+
+impl Document {
+    /// Whether saving needs a reader that retains per-placement graphic layer settings.
+    /// Exceeding the traversal budget conservatively requires the newer format.
+    pub fn has_graphic_layer_options(&self) -> bool {
+        self.spreads.iter().chain(&self.parents).flat_map(|spread| &spread.items).any(|item| item_layer_options(item, 0, false))
+            || self.stories.values().any(|story| story_layer_options(story, 0, false))
+    }
+
+    /// Whether any placed PDF, on document or parent spreads, in groups or anchored, explicitly
+    /// shows every layer (an override with an empty hidden list). Older readers would take that
+    /// for "use the file's defaults". Exceeding the traversal budget conservatively says yes.
+    pub fn has_explicit_all_on_pdf_layers(&self) -> bool {
+        let all_on = |it: &Item| it.pdf_layer_override && it.pdf_hidden_layers.is_empty();
+        self.spreads.iter().chain(&self.parents).flat_map(|spread| &spread.items).any(|item| item_any(item, 0, &all_on))
+            || self.stories.values().any(|story| story_any(story, 0, &all_on))
+    }
+
+    /// Whether any placed PDF, on document or parent spreads, in groups or anchored, has an
+    /// Object Layer Options choice (hidden layers or explicit all-on). Exceeding the traversal
+    /// budget conservatively says yes.
+    pub fn has_pdf_layer_overrides(&self) -> bool {
+        let chosen = |it: &Item| it.has_pdf_layer_override();
+        self.spreads.iter().chain(&self.parents).flat_map(|spread| &spread.items).any(|item| item_any(item, 0, &chosen))
+            || self.stories.values().any(|story| story_any(story, 0, &chosen))
+    }
+
+    /// Placements outside the ordinary document-spread frame walk used by preflight.
+    pub fn has_unwalked_graphic_layer_visibility_overrides(&self) -> bool {
+        self.parents.iter().flat_map(|spread| &spread.items).any(|item| item_layer_options(item, 0, true))
+            || self.stories.values().any(|story| story_layer_options(story, 0, true))
+    }
+
+    /// Includes parent items, anchored objects, graphic cells and nested notes.
+    pub fn has_graphic_layer_visibility_overrides(&self) -> bool {
+        self.spreads.iter().chain(&self.parents).flat_map(|spread| &spread.items).any(|item| item_layer_options(item, 0, true))
+            || self.stories.values().any(|story| story_layer_options(story, 0, true))
+    }
+}
+
 impl Asset {
     /// Whether `other` holds the same file: the same type, PDF page and crop, link and bytes. Files at
     /// different paths stay apart even with identical bytes, since each can be updated or
@@ -356,6 +422,7 @@ mod tests {
     fn graphic_item(id: u64, asset: u64, crop: f64) -> Item {
         let mut it = Item::new(ItemId(id), LayerId(1), Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)));
         it.content = Content::Graphic(Graphic {
+            layer_options: None,
             asset: AssetId(asset),
             size: (10.0, 10.0),
             xf: Affine::translate((crop, 0.0)),
diff --git a/crates/doc/src/attrs.rs b/crates/doc/src/attrs.rs
index fa7cffc68..bb6ae3686 100644
--- a/crates/doc/src/attrs.rs
+++ b/crates/doc/src/attrs.rs
@@ -113,6 +113,32 @@ macro_rules! attr_set {
     };
 }
 
+mod enums;
+mod language;
+mod rules_lists;
+mod tabs;
+
+pub use enums::{
+    Align, Capitalization, ChangeMark, Composer, Digits, GrepStyle, GridAlign, Kerning, Leading, NestedLineStyle, NestedStyle, NestedUntil, Position,
+    SpanColumns, StartParagraph, TextDirection,
+};
+pub use language::{capitalizes, language_subtag, language_tag};
+use rules_lists::list_level_index;
+pub use rules_lists::{
+    BoxBottom, BoxTop, BoxWidth, LIST_LEVELS, ListAlign, ListCounter, ListType, NumberStyle, Rule, TEXT_COLOR, expand_list_levels, expand_list_text,
+};
+use tabs::sanitized_tabs;
+pub use tabs::{
+    MAX_MEASURE, MAX_TAB_LEADER, MAX_TAB_POSITION, MAX_TAB_STOPS, MAX_TYPE_SIZE, MIN_TYPE_SIZE, SAME_TAB_POSITION, TabAlign, TabStop,
+    imported_measure, imported_type_size,
+};
+
+mod char_attrs;
+mod para_attrs;
+
+pub use char_attrs::{CharAttrs, CharProps};
+pub use para_attrs::{ParaAttrs, ParaProps};
+
 fn attr_key(snake: &'static str) -> &'static str {
     snake
 }
@@ -168,1618 +194,5 @@ fn unknown_attribute(key: &str, fields: &[&str]) -> String {
     }
 }
 
-// ---------- value types ----------
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "kind", content = "value")]
-pub enum Leading {
-    /// Auto leading (percentage of the largest size on the line, Justification → Auto Leading).
-    #[default]
-    Auto,
-    Points(f64),
-}
-
-/// Paragraph direction.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum TextDirection {
-    #[default]
-    LeftToRight,
-    RightToLeft,
-}
-
-/// Digits (World-Ready): the figures 0–9 are drawn as these.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Digits {
-    /// Contextual digits; composition selects the preceding strong script/language.
-    #[default]
-    Default,
-    /// European (0123).
-    Arabic,
-    /// Arabic-Indic (٠١٢٣).
-    Hindi,
-    /// Extended Arabic-Indic, as used for Persian and Urdu (۰۱۲۳).
-    Farsi,
-    /// Those of the text's language (Thai, Devanagari, Bengali, Arabic, Persian…); else as typed.
-    Native,
-}
-
-impl Digits {
-    /// The digit `c` (0–9) is drawn as, for text in `language`.
-    pub fn map(self, c: char, language: &str) -> char {
-        let d = match c {
-            '0'..='9' => c as u32 - '0' as u32,
-            '\u{0660}'..='\u{0669}' => c as u32 - 0x0660,
-            '\u{06F0}'..='\u{06F9}' => c as u32 - 0x06F0,
-            _ => return c,
-        };
-        let zero = match self {
-            Digits::Default => return c,
-            Digits::Arabic => 0x0030,
-            Digits::Hindi => 0x0660,
-            Digits::Farsi => 0x06F0,
-            Digits::Native => {
-                let l = language.to_ascii_lowercase();
-                match () {
-                    _ if l.starts_with("arabic") || l == "ar" || l.starts_with("ar-") => 0x0660,
-                    _ if l.starts_with("persian")
-                        || l.starts_with("farsi")
-                        || l.starts_with("urdu")
-                        || l == "fa"
-                        || l.starts_with("fa-")
-                        || l == "ur"
-                        || l.starts_with("ur-") =>
-                    {
-                        0x06F0
-                    }
-                    _ if l.starts_with("hindi") || l.starts_with("marathi") || l.starts_with("nepali") || l.starts_with("sanskrit") => 0x0966,
-                    _ if l.starts_with("bengali") => 0x09E6,
-                    _ if l.starts_with("gujarati") => 0x0AE6,
-                    _ if l.starts_with("punjabi") => 0x0A66,
-                    _ if l.starts_with("tamil") => 0x0BE6,
-                    _ if l.starts_with("telugu") => 0x0C66,
-                    _ if l.starts_with("kannada") => 0x0CE6,
-                    _ if l.starts_with("malayalam") => 0x0D66,
-                    _ if l.starts_with("thai") => 0x0E50,
-                    _ if l.starts_with("lao") => 0x0ED0,
-                    _ if l.starts_with("tibetan") => 0x0F20,
-                    _ if l.starts_with("burmese") => 0x1040,
-                    _ if l.starts_with("khmer") => 0x17E0,
-                    _ => return c,
-                }
-            }
-        };
-        char::from_u32(zero + d).unwrap_or(c)
-    }
-}
-
-/// Does `c` belong to a script that capitalizes the first letter of sentences, words and headings?
-/// Georgian doesn't: Unicode maps Mkhedruli to Mtavruli capitals, but those are only for all-caps
-/// text, never for a sentence's, a title's or an index heading's first letter.
-pub fn capitalizes(c: char) -> bool {
-    !matches!(c, '\u{10A0}'..='\u{10FF}' | '\u{1C90}'..='\u{1CBF}' | '\u{2D00}'..='\u{2D2F}')
-}
-
-/// The BCP 47 tag of a language name as InDesign and IDML write it ("English: USA", "Chinese:
-/// Simplified", or a locale code such as "de_DE_2006"), for the shaper's localized forms (`locl`)
-/// and everything that depends on the language (quotes, hyphenation and spelling, line breaking,
-/// fallback fonts). A variant we don't know falls back to its language ("English: Australian" →
-/// `en`); an unknown language (or "[No Language]") has none. Case, punctuation and IDML's `$ID/`
-/// don't matter. Locale codes (`ll`, `ll_CC`, `ll-CC`, with a reform year after them as in
-/// `de_DE_2006`) are their tag (`de-DE`), and Chinese also goes by its other common spellings
-/// ("Simplified Chinese", "Chinese (Traditional)", "zh_CN", "zh-Hant").
-pub fn language_tag(language: &str) -> Option<&'static str> {
-    let language = language.trim();
-    let language = language.strip_prefix("$ID/").unwrap_or(language);
-    let l = language.to_lowercase();
-    let words: Vec<&str> = l.split(|c: char| !c.is_alphanumeric()).filter(|w| !w.is_empty()).collect();
-    let first = words.first().copied().unwrap_or("");
-    let has = |any: &[&str]| words.iter().any(|w| any.contains(w));
-    if first == "zh" || has(&["chinese"]) {
-        // The script decides; then the name; then the region.
-        return Some(if has(&["hans"]) {
-            "zh-Hans"
-        } else if has(&["hant"]) {
-            "zh-Hant"
-        } else if has(&["simplified", "cn", "sg"]) {
-            "zh-Hans"
-        } else if has(&["traditional", "tw", "hk", "mo"]) {
-            "zh-Hant"
-        } else {
-            "zh"
-        });
-    }
-    if let Some(tag) = locale_code(&words) {
-        return intern_tag(tag);
-    }
-    let variant = match words.join(" ").as_str() {
-        "english usa" => Some("en-US"),
-        "english uk" => Some("en-GB"),
-        "english canadian" => Some("en-CA"),
-        "german swiss 2006 reform" | "german swiss" => Some("de-CH"),
-        "french swiss" => Some("fr-CH"),
-        "italian swiss" => Some("it-CH"),
-        "spanish castilian" => Some("es-ES"),
-        "french canadian" => Some("fr-CA"),
-        "portuguese brazilian" => Some("pt-BR"),
-        "norwegian bokmål" | "norwegian bokmal" => Some("nb"),
-        "norwegian nynorsk" => Some("nn"),
-        _ => None,
-    };
-    if variant.is_some() {
-        return variant;
-    }
-    Some(match first {
-        "english" => "en",
-        "german" => "de",
-        "french" => "fr",
-        "spanish" => "es",
-        "catalan" => "ca",
-        "italian" => "it",
-        "portuguese" => "pt",
-        "dutch" => "nl",
-        "danish" => "da",
-        "swedish" => "sv",
-        "norwegian" => "no",
-        "finnish" => "fi",
-        "polish" => "pl",
-        "czech" => "cs",
-        "slovak" => "sk",
-        "hungarian" => "hu",
-        "romanian" => "ro",
-        "croatian" => "hr",
-        "lithuanian" => "lt",
-        "greek" => "el",
-        "russian" => "ru",
-        "ukrainian" => "uk",
-        "bulgarian" => "bg",
-        "serbian" => "sr",
-        "macedonian" => "mk",
-        "turkish" => "tr",
-        "japanese" => "ja",
-        "korean" => "ko",
-        "arabic" => "ar",
-        "persian" | "farsi" => "fa",
-        "urdu" => "ur",
-        "hebrew" => "he",
-        "georgian" => "ka",
-        _ => return None,
-    })
-}
-
-/// The tag of a locale code split into lowercase `words`: a language (2 or 3 letters), then
-/// optionally a region (2 letters or 3 digits) and a reform year (4 digits) → `ll` or `ll-CC`.
-fn locale_code(words: &[&str]) -> Option<String> {
-    let letters = |w: &str, n: std::ops::RangeInclusive<usize>| n.contains(&w.len()) && w.bytes().all(|b| b.is_ascii_lowercase());
-    let digits = |w: &str, n: usize| w.len() == n && w.bytes().all(|b| b.is_ascii_digit());
-    match *words {
-        [lang] if letters(lang, 2..=3) => Some(lang.to_string()),
-        [lang, region] | [lang, region, _] if letters(lang, 2..=3) && (letters(region, 2..=2) || digits(region, 3)) => {
-            if let [_, _, year] = *words
-                && !digits(year, 4)
-            {
-                return None;
-            }
-            Some(format!("{lang}-{}", region.to_ascii_uppercase()))
-        }
-        _ => None,
-    }
-}
-
-/// `tag` as a `&'static str`: each distinct tag is kept once for the process. Language names come
-/// from documents, so at most [`MAX_TAGS`] are kept; past that a new tag is unknown (`None`).
-fn intern_tag(tag: String) -> Option<&'static str> {
-    const MAX_TAGS: usize = 512;
-    static TAGS: std::sync::Mutex<Vec<&str>> = std::sync::Mutex::new(Vec::new());
-    let mut tags = TAGS.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
-    if let Some(t) = tags.iter().find(|t| **t == tag) {
-        return Some(t);
-    }
-    if tags.len() >= MAX_TAGS {
-        return None;
-    }
-    let t: &'static str = Box::leak(tag.into_boxed_str());
-    tags.push(t);
-    Some(t)
-}
-
-/// The language subtag of a BCP 47 tag (`de-DE` → `de`, `zh-Hant` → `zh`).
-pub fn language_subtag(tag: &str) -> &str {
-    tag.split('-').next().unwrap_or(tag)
-}
-
-/// A tracked change on text.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum ChangeMark {
-    #[default]
-    None,
-    Inserted,
-    Deleted,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "kind", content = "value")]
-pub enum Kerning {
-    #[default]
-    Metrics,
-    Optical,
-    /// Zero ("0" in the kerning menu).
-    None,
-    /// Manual pair kerning in 1/1000 em (applies after this character).
-    Manual(f64),
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Capitalization {
-    #[default]
-    Normal,
-    AllCaps,
-    SmallCaps,
-    OpenTypeAllSmallCaps,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Position {
-    #[default]
-    Normal,
-    Superscript,
-    Subscript,
-    OtSuperscript,
-    OtSubscript,
-    OtNumerator,
-    OtDenominator,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Align {
-    #[default]
-    Left,
-    Center,
-    Right,
-    LeftJustified,
-    CenterJustified,
-    RightJustified,
-    FullyJustified,
-    TowardsSpine,
-    AwayFromSpine,
-}
-
-impl Align {
-    pub fn is_justified(self) -> bool {
-        matches!(self, Align::LeftJustified | Align::CenterJustified | Align::RightJustified | Align::FullyJustified)
-    }
-    pub const ALL: [Align; 9] = [
-        Align::Left,
-        Align::Center,
-        Align::Right,
-        Align::LeftJustified,
-        Align::CenterJustified,
-        Align::RightJustified,
-        Align::FullyJustified,
-        Align::TowardsSpine,
-        Align::AwayFromSpine,
-    ];
-    pub fn label(self) -> &'static str {
-        match self {
-            Align::Left => "Align left",
-            Align::Center => "Align center",
-            Align::Right => "Align right",
-            Align::LeftJustified => "Justify with last line aligned left",
-            Align::CenterJustified => "Justify with last line aligned center",
-            Align::RightJustified => "Justify with last line aligned right",
-            Align::FullyJustified => "Justify all lines",
-            Align::TowardsSpine => "Align towards spine",
-            Align::AwayFromSpine => "Align away from spine",
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Composer {
-    /// Total-fit (Knuth–Plass) over the whole paragraph.
-    #[default]
-    Paragraph,
-    /// Greedy, line by line.
-    SingleLine,
-    /// The Japanese paragraph composer: total fit, with the CJK leading model and character
-    /// alignment.
-    Japanese,
-    /// The Japanese single-line composer.
-    JapaneseSingleLine,
-}
-
-impl Composer {
-    /// Breaks lines greedily, one at a time.
-    pub fn single_line(self) -> bool {
-        matches!(self, Composer::SingleLine | Composer::JapaneseSingleLine)
-    }
-
-    /// A Japanese composer: lines follow the leading model ([`crate::cjk::LeadingModel`]) and
-    /// characters their [`crate::cjk::CharacterAlignment`]. The others set lines baseline to
-    /// baseline with every character on the Roman baseline.
-    pub fn japanese(self) -> bool {
-        matches!(self, Composer::Japanese | Composer::JapaneseSingleLine)
-    }
-}
-
-/// What a nested style runs to (Drop Caps and Nested Styles).
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "kind", content = "chars")]
-pub enum NestedUntil {
-    Sentences,
-    #[default]
-    Words,
-    Characters,
-    Letters,
-    Digits,
-    Tab,
-    ForcedLineBreak,
-    EmSpace,
-    EnSpace,
-    /// The paragraph's drop cap characters.
-    Dropcap,
-    /// Any of these characters.
-    Chars(String),
-}
-
-/// A character style applied from the start of the paragraph through (or up to) the `count`-th
-/// delimiter; nested styles follow each other.
-/// A nested line style: `style` for the next `lines` lines.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct NestedLineStyle {
-    pub style: String,
-    pub lines: u32,
-}
-
-impl Default for NestedLineStyle {
-    fn default() -> Self {
-        NestedLineStyle { style: String::new(), lines: 1 }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct NestedStyle {
-    pub style: String,
-    /// Through (include the delimiter) or up to (stop before it).
-    pub through: bool,
-    pub count: u32,
-    pub until: NestedUntil,
-}
-
-impl Default for NestedStyle {
-    fn default() -> Self {
-        NestedStyle { style: String::new(), through: true, count: 1, until: NestedUntil::Words }
-    }
-}
-
-impl NestedStyle {
-    /// The drop cap's character style as a nested style: `style` through 1 drop cap.
-    pub fn drop_cap(style: &str) -> Self {
-        NestedStyle { style: style.into(), through: true, count: 1, until: NestedUntil::Dropcap }
-    }
-
-    /// Is this the form a drop cap's character style takes at the start of a nested style list?
-    pub fn is_drop_cap(&self) -> bool {
-        self.until == NestedUntil::Dropcap && self.through && self.count == 1
-    }
-}
-
-/// A character style applied to every match of a regular expression in the paragraph.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct GrepStyle {
-    pub style: String,
-    pub pattern: String,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum GridAlign {
-    #[default]
-    None,
-    AllLines,
-    FirstLineOnly,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum StartParagraph {
-    #[default]
-    Anywhere,
-    NextColumn,
-    NextFrame,
-    NextPage,
-    NextOddPage,
-    NextEvenPage,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "kind", content = "columns")]
-pub enum SpanColumns {
-    #[default]
-    Single,
-    /// Span `n` columns (0 = all).
-    Span(u32),
-    /// Split into `n` sub-columns.
-    Split(u32),
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum TabAlign {
-    #[default]
-    Left,
-    Center,
-    Right,
-    /// Align on a character (default `.`).
-    Char,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct TabStop {
-    /// A file that held a non-finite position (written as `null`) reads it back as NaN, which
-    /// [`TabStop::sanitized_list`] drops.
-    #[serde(deserialize_with = "position_or_nan")]
-    pub position: f64,
-    #[serde(default)]
-    pub align: TabAlign,
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub leader: String,
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub align_on: String,
-}
-
-/// The colour of a paragraph rule that follows the paragraph's text colour.
-pub const TEXT_COLOR: &str = "Text Color";
-
-/// Most stops a paragraph holds.
-pub const MAX_TAB_STOPS: usize = 100;
-/// Furthest stop position: 216 in, the largest page.
-pub const MAX_TAB_POSITION: f64 = 15_552.0;
-/// Longest leader, in characters.
-pub const MAX_TAB_LEADER: usize = 8;
-/// Stops closer than this share a position.
-pub const SAME_TAB_POSITION: f64 = 0.01;
-
-impl TabStop {
-    /// A finite position clamped to `0..=MAX_TAB_POSITION`.
-    pub fn clamp_position(v: f64) -> Result<f64, String> {
-        if v.is_finite() { Ok(v.clamp(0.0, MAX_TAB_POSITION)) } else { Err("position must be a finite number".into()) }
-    }
-
-    /// A leader: up to [`MAX_TAB_LEADER`] characters, no control characters.
-    pub fn check_leader(v: &str) -> Result<(), String> {
-        if v.chars().count() > MAX_TAB_LEADER || v.chars().any(char::is_control) {
-            return Err(format!("`leader`: at most {MAX_TAB_LEADER} printable characters"));
-        }
-        Ok(())
-    }
-
-    /// An align-on character: one printable character or none (a decimal point).
-    pub fn check_align_on(v: &str) -> Result<(), String> {
-        if v.chars().count() > 1 || v.chars().any(char::is_control) {
-            return Err("`alignOn`: one printable character".into());
-        }
-        Ok(())
-    }
-
-    /// A tab-stop list as the Tabs commands keep it: at most [`MAX_TAB_STOPS`] stops, positions
-    /// clamped, leaders and align-on characters checked, a char stop aligning on `.` unless it
-    /// names a character, sorted by position, and one stop per position (the later one wins).
-    pub fn checked_list(mut tabs: Vec<TabStop>) -> Result<Vec<TabStop>, String> {
-        if tabs.len() > MAX_TAB_STOPS {
-            return Err(format!("a paragraph holds at most {MAX_TAB_STOPS} tab stops"));
-        }
-        for t in &mut tabs {
-            t.position = Self::clamp_position(t.position)?;
-            Self::check_leader(&t.leader)?;
-            Self::check_align_on(&t.align_on)?;
-        }
-        Ok(Self::normalized(tabs))
-    }
-
-    /// A tab-stop list read from a file, repaired to what [`checked_list`](Self::checked_list)
-    /// accepts: stops with a non-finite position dropped, positions clamped, control characters
-    /// removed from leaders and align-on characters and both cut to their limits, sorted, one stop
-    /// per position (the later one wins), and the first [`MAX_TAB_STOPS`] by position kept.
-    pub fn sanitized_list(tabs: Vec<TabStop>) -> Vec<TabStop> {
-        let tabs = tabs
-            .into_iter()
-            .filter_map(|mut t| {
-                t.position = Self::clamp_position(t.position).ok()?;
-                if Self::check_leader(&t.leader).is_err() {
-                    t.leader = t.leader.chars().filter(|c| !c.is_control()).take(MAX_TAB_LEADER).collect();
-                }
-                if Self::check_align_on(&t.align_on).is_err() {
-                    t.align_on = t.align_on.chars().filter(|c| !c.is_control()).take(1).collect();
-                }
-                Some(t)
-            })
-            .collect();
-        let mut out = Self::normalized(tabs);
-        out.truncate(MAX_TAB_STOPS);
-        out
-    }
-
-    /// Finite, clamped stops sorted by position, one per position: of stops closer than
-    /// [`SAME_TAB_POSITION`], the later one in `tabs` wins. A char stop with no character aligns
-    /// on `.`.
-    fn normalized(tabs: Vec<TabStop>) -> Vec<TabStop> {
-        let mut stops: Vec<(usize, TabStop)> = tabs.into_iter().enumerate().collect();
-        stops.sort_by(|a, b| a.1.position.total_cmp(&b.1.position));
-        let mut out: Vec<(usize, TabStop)> = Vec::with_capacity(stops.len());
-        for (i, mut t) in stops {
-            if t.align == TabAlign::Char && t.align_on.is_empty() {
-                t.align_on = ".".into();
-            }
-            match out.last_mut() {
-                Some(last) if t.position - last.1.position < SAME_TAB_POSITION => {
-                    if i > last.0 {
-                        *last = (i, t);
-                    }
-                }
-                _ => out.push((i, t)),
-            }
-        }
-        out.into_iter().map(|(_, t)| t).collect()
-    }
-}
-
-/// A stop's position; `null` (how JSON writes a non-finite number) reads as NaN.
-fn position_or_nan<'de, D: serde::Deserializer<'de>>(d: D) -> Result<f64, D::Error> {
-    Ok(Option::<f64>::deserialize(d)?.unwrap_or(f64::NAN))
-}
-
-/// A paragraph's tab-stop list in either attribute form, as read from a file.
-trait FileTabs: Sized {
-    fn sanitized(self) -> Self;
-}
-
-impl FileTabs for Vec<TabStop> {
-    fn sanitized(self) -> Self {
-        TabStop::sanitized_list(self)
-    }
-}
-
-impl FileTabs for Option<Vec<TabStop>> {
-    fn sanitized(self) -> Self {
-        self.map(TabStop::sanitized_list)
-    }
-}
-
-/// Deserializes a `tabs` field through [`TabStop::sanitized_list`]: a saved document's tab lists
-/// get the limits the Tabs commands keep.
-fn sanitized_tabs<'de, D: serde::Deserializer<'de>, T: Deserialize<'de> + FileTabs>(d: D) -> Result<T, D::Error> {
-    T::deserialize(d).map(FileTabs::sanitized)
-}
-
-/// A paragraph rule (Rule Above / Rule Below).
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(default, rename_all = "camelCase")]
-pub struct Rule {
-    pub on: bool,
-    pub weight: f64,
-    /// A swatch, or [`TEXT_COLOR`].
-    pub color: String,
-    pub tint: f32,
-    /// Width: column (true) or text (false).
-    pub column_width: bool,
-    pub offset: f64,
-    pub left_indent: f64,
-    pub right_indent: f64,
-}
-
-impl Default for Rule {
-    fn default() -> Self {
-        Rule { on: false, weight: 1.0, color: TEXT_COLOR.into(), tint: 1.0, column_width: true, offset: 0.0, left_indent: 0.0, right_indent: 0.0 }
-    }
-}
-
-/// How wide a paragraph border or shading box is: the column, or the text's longest line.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum BoxWidth {
-    #[default]
-    Column,
-    Text,
-}
-
-/// Where a paragraph border or shading box starts above the first line (before its top offset).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum BoxTop {
-    /// The tallest ascent on the line.
-    #[default]
-    Ascent,
-    Baseline,
-    /// The top of the em box.
-    EmBox,
-    /// The top of the line's leading.
-    Leading,
-}
-
-/// Where a paragraph border or shading box ends below the last line (before its bottom offset).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum BoxBottom {
-    /// The deepest descent on the line.
-    #[default]
-    Descent,
-    Baseline,
-    /// The bottom of the em box.
-    EmBox,
-}
-
-/// Where a bullet or number sits against the first line's start (the left and first-line
-/// indents): it starts there, is centred on it, or ends there.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum ListAlign {
-    #[default]
-    Left,
-    Center,
-    Right,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum ListType {
-    #[default]
-    None,
-    Bullets,
-    Numbers,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum NumberStyle {
-    #[default]
-    Arabic,
-    UpperRoman,
-    LowerRoman,
-    UpperLetters,
-    LowerLetters,
-    /// 01, 02, …
-    ArabicLeadingZero,
-    /// 001, 002, …
-    ArabicThreeDigits,
-    /// 0001, 0002, …
-    ArabicFourDigits,
-    /// *, †, ‡, §, ¶, ‖, then doubled (**, ††, …): footnotes.
-    Symbols,
-    /// 一, 二, 三, …: Chinese numerals written digit by digit, so 10 is 一〇 and 38 is 三八.
-    Kanji,
-}
-
-/// Numbers past this are written in Arabic digits by the styles that repeat characters (roman
-/// numerals, letters, symbols), so a hostile start number can't build a huge label.
-const MAX_REPEATED_FORM: u32 = 3999;
-
-impl NumberStyle {
-    pub fn format(self, n: u32) -> String {
-        if n > MAX_REPEATED_FORM
-            && matches!(
-                self,
-                NumberStyle::UpperRoman | NumberStyle::LowerRoman | NumberStyle::UpperLetters | NumberStyle::LowerLetters | NumberStyle::Symbols
-            )
-        {
-            return n.to_string();
-        }
-        match self {
-            NumberStyle::Arabic => n.to_string(),
-            NumberStyle::ArabicLeadingZero => format!("{n:02}"),
-            NumberStyle::ArabicThreeDigits => format!("{n:03}"),
-            NumberStyle::ArabicFourDigits => format!("{n:04}"),
-            NumberStyle::UpperRoman => roman(n),
-            NumberStyle::LowerRoman => roman(n).to_lowercase(),
-            NumberStyle::UpperLetters => letters(n),
-            NumberStyle::LowerLetters => letters(n).to_lowercase(),
-            NumberStyle::Symbols => {
-                const SYM: [char; 6] = ['*', '†', '‡', '§', '¶', '‖'];
-                let n = n.max(1) as usize - 1;
-                std::iter::repeat_n(SYM[n % SYM.len()], n / SYM.len() + 1).collect()
-            }
-            NumberStyle::Kanji => kanji_digits(n),
-        }
-    }
-}
-
-/// Expand the metacharacters of a list's label text (`^t` tab, `^>` en space, `^^` caret, …),
-/// putting `number` in for `^#`. Level placeholders (`^1`…`^9`) and metacharacters with no
-/// meaning in a label are dropped; a label never holds a paragraph break.
-pub fn expand_list_text(s: &str, number: &str) -> String {
-    expand_list_levels(s, number, &[])
-}
-
-/// [`expand_list_text`] with `levels[k]` in for `^1`…`^9` (level k + 1's current number; a level
-/// past the end is dropped).
-pub fn expand_list_levels(s: &str, number: &str, levels: &[String]) -> String {
-    let mut out = String::with_capacity(s.len() + number.len());
-    let mut it = s.chars();
-    while let Some(c) = it.next() {
-        if c != '^' {
-            if c != '\n' && c != '\r' {
-                out.push(c);
-            }
-            continue;
-        }
-        let Some(m) = it.next() else {
-            out.push('^');
-            break;
-        };
-        let r = match m {
-            '#' => {
-                out.push_str(number);
-                continue;
-            }
-            d @ '1'..='9' => {
-                let k = d as usize - '1' as usize;
-                if let Some(l) = levels.get(k) {
-                    out.push_str(l);
-                }
-                continue;
-            }
-            '^' => '^',
-            't' => '\t',
-            'y' => crate::story::RIGHT_INDENT_TAB,
-            'i' => crate::story::INDENT_HERE,
-            'n' => crate::story::FORCED_LINE_BREAK,
-            'm' => '\u{2003}',
-            '>' => '\u{2002}',
-            'f' => '\u{2001}',
-            '|' => '\u{200A}',
-            '<' => '\u{2009}',
-            '/' => '\u{2007}',
-            '.' => '\u{2008}',
-            's' => '\u{A0}',
-            'S' => '\u{202F}',
-            '_' => '\u{2014}',
-            '=' => '\u{2013}',
-            '~' => '\u{2011}',
-            '{' => '\u{201C}',
-            '}' => '\u{201D}',
-            '[' => '\u{2018}',
-            ']' => '\u{2019}',
-            '"' => '"',
-            '\'' => '\'',
-            _ => continue,
-        };
-        out.push(r);
-    }
-    out
-}
-
-fn kanji_digits(n: u32) -> String {
-    const DIGITS: [char; 10] = ['〇', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
-    n.to_string().chars().map(|c| c.to_digit(10).and_then(|d| DIGITS.get(d as usize)).copied().unwrap_or(c)).collect()
-}
-
-fn roman(mut n: u32) -> String {
-    if n == 0 {
-        return "0".into();
-    }
-    let t = [
-        (1000, "M"),
-        (900, "CM"),
-        (500, "D"),
-        (400, "CD"),
-        (100, "C"),
-        (90, "XC"),
-        (50, "L"),
-        (40, "XL"),
-        (10, "X"),
-        (9, "IX"),
-        (5, "V"),
-        (4, "IV"),
-        (1, "I"),
-    ];
-    let mut s = String::new();
-    for (v, r) in t {
-        while n >= v {
-            s.push_str(r);
-            n -= v;
-        }
-    }
-    s
-}
-
-/// A, B, …, Z, AA, BB, … (InDesign's letter numbering repeats the letter).
-fn letters(n: u32) -> String {
-    if n == 0 {
-        return String::new();
-    }
-    let i = (n - 1) % 26;
-    let reps = (n - 1) / 26 + 1;
-    std::iter::repeat_n(char::from(b'A' + i as u8), reps as usize).collect()
-}
-
-attr_set! {
-    /// Character attributes (Character panel / character styles / the character part of paragraph styles).
-    CharAttrs / CharProps {
-        font_family: String = "Source Serif 4".into(),
-        font_style: String = "Regular".into(),
-        /// Point size.
-        size: f64 = 12.0,
-        leading: Leading = Leading::Auto,
-        kerning: Kerning = Kerning::Metrics,
-        /// Tracking in 1/1000 em.
-        tracking: f64 = 0.0,
-        /// Explicit CJK aki, in em; None restores automatic spacing.
-        leading_aki: Option<f64> = None => "deserialize_explicit_value",
-        trailing_aki: Option<f64> = None => "deserialize_explicit_value",
-        /// Proportional character compression, 0..1.
-        tsume: f64 = 0.0,
-        /// Target em cells for the contiguous formatted group (0 disables jidori).
-        jidori: u32 = 0,
-        character_alignment: crate::cjk::CharacterAlignment = crate::cjk::CharacterAlignment::Baseline,
-        leading_model: crate::cjk::LeadingModel = crate::cjk::LeadingModel::Roman,
-        /// The kenten mark's text: a custom mark, or the preset of `kenten_kind` (see
-        /// [`crate::cjk_settings::kenten_mark`]); empty is the sesame dot.
-        kenten_character: String = String::new(),
-        /// Horizontal / vertical scale, 1.0 = 100%.
-        h_scale: f64 = 1.0,
-        v_scale: f64 = 1.0,
-        baseline_shift: f64 = 0.0,
-        /// Skew (false italic), degrees.
-        skew: f64 = 0.0,
-        fill: String = "[Black]".into(),
-        fill_tint: f32 = 1.0,
-        stroke: String = "[None]".into(),
-        stroke_tint: f32 = 1.0,
-        stroke_weight: f64 = 1.0,
-        /// Stroke behind fill: the stroke is painted under the fill and lies wholly outside the
-        /// letters at its full weight, so the letters keep their shape. Off, it straddles the outline.
-        stroke_behind_fill: bool = false,
-        capitalization: Capitalization = Capitalization::Normal,
-        position: Position = Position::Normal,
-        underline: bool = false,
-        strikethrough: bool = false,
-        /// Underline Options: weight and offset below the baseline (`None` = from the size),
-        /// colour (empty = the text colour) and tint.
-        underline_weight: Option<f64> = None => "deserialize_explicit_value",
-        underline_offset: Option<f64> = None => "deserialize_explicit_value",
-        underline_color: String = String::new(),
-        underline_tint: f32 = 1.0,
-        /// Strikethrough Options: offset above the baseline.
-        strikethrough_weight: Option<f64> = None => "deserialize_explicit_value",
-        strikethrough_offset: Option<f64> = None => "deserialize_explicit_value",
-        strikethrough_color: String = String::new(),
-        strikethrough_tint: f32 = 1.0,
-        glyph_form: String = String::new(),
-        ligatures: bool = true,
-        no_break: bool = false,
-        /// Tate-chu-yoko: in vertical text, the run is set horizontally within one em of the line.
-        tate_chu_yoko: bool = false,
-        tate_chu_yoko_x_offset: f64 = 0.0,
-        tate_chu_yoko_y_offset: f64 = 0.0,
-        /// Ruby: the reading set small above the text (to its right in vertical text). Group ruby
-        /// sets it over the whole run; per-character ruby holds one reading per character,
-        /// separated by U+3000. Its other settings are the `ruby_*` fields below.
-        ruby: String = String::new(),
-        /// Kenten: an emphasis dot above each character.
-        kenten: bool = false,
-        /// Warichu: the run is set in smaller lines stacked inside one line height.
-        warichu: bool = false,
-        /// How many warichu lines (InDesign's minimum is 2).
-        warichu_lines: u32 = 2,
-        /// Warichu size as a percentage of the parent size.
-        warichu_size: f64 = 50.0,
-        /// Extra points between warichu baselines. 0 is automatic (one small em).
-        warichu_line_spacing: f64 = 0.0,
-        warichu_alignment: crate::cjk::WarichuAlignment = crate::cjk::WarichuAlignment::Auto,
-        /// Minimum characters on a warichu line before a break, and on the line after it.
-        warichu_chars_before_break: u32 = 1,
-        warichu_chars_after_break: u32 = 1,
-        // Kenten Settings / Kenten Color (`kenten` switches the marks on).
-        /// The mark; [`crate::cjk_settings::KentenKind::Custom`] draws `kenten_character`.
-        kenten_kind: crate::cjk_settings::KentenKind = crate::cjk_settings::KentenKind::SesameDot,
-        /// Font of a custom mark (empty = the text's font) and its style.
-        kenten_font: String = String::new(),
-        kenten_font_style: String = String::new(),
-        /// Mark size in points; `None` is half the text size.
-        kenten_size: Option<f64> = None,
-        /// Horizontal / vertical scale of the mark, 1.0 = 100%.
-        kenten_x_scale: f64 = 1.0,
-        kenten_y_scale: f64 = 1.0,
-        /// Points between the text's em box and the mark's.
-        kenten_distance: f64 = 0.0,
-        kenten_position: crate::cjk_settings::KentenPosition = crate::cjk_settings::KentenPosition::AboveRight,
-        kenten_alignment: crate::cjk_settings::KentenAlignment = crate::cjk_settings::KentenAlignment::Center,
-        /// How a custom mark was entered (IDML `KentenCharacterSet`), kept for interchange.
-        kenten_character_set: String = String::new(),
-        /// Mark fill and stroke swatches (empty = the text's), tints and stroke weight (`None` =
-        /// the text's).
-        kenten_fill: String = String::new(),
-        kenten_fill_tint: Option<f32> = None,
-        kenten_stroke: String = String::new(),
-        kenten_stroke_tint: Option<f32> = None,
-        kenten_stroke_weight: Option<f64> = None,
-        kenten_overprint_fill: crate::cjk_settings::AdornmentOverprint = crate::cjk_settings::AdornmentOverprint::Auto,
-        kenten_overprint_stroke: crate::cjk_settings::AdornmentOverprint = crate::cjk_settings::AdornmentOverprint::Auto,
-        // Shatai (斜体): the character is compressed across the direction at `shatai_angle`.
-        /// Compression in percent of the em (0 = off).
-        shatai_magnification: f64 = 0.0,
-        /// Degrees from the line direction, counter-clockwise.
-        shatai_angle: f64 = 45.0,
-        /// Turn the compressed character back so its edge along the line stays along the line.
-        shatai_adjust_rotation: bool = false,
-        /// Fit the advance to the compressed em box.
-        shatai_adjust_tsume: bool = true,
-        // Ruby settings (see [`crate::ruby`]). Defaults are the IDML text defaults.
-        ruby_type: crate::ruby::RubyType = crate::ruby::RubyType::Group,
-        /// How a ruby shorter than its parent is spread over it.
-        ruby_alignment: crate::ruby::RubyAlignment = crate::ruby::RubyAlignment::Jis,
-        ruby_position: crate::ruby::RubyPosition = crate::ruby::RubyPosition::AboveRight,
-        /// Points along the line, and away from the parent text across it.
-        ruby_x_offset: f64 = 0.0,
-        ruby_y_offset: f64 = 0.0,
-        /// Empty: the parent's font and style.
-        ruby_font: String = String::new(),
-        ruby_font_style: String = String::new(),
-        /// Points; `None` is half the parent size.
-        ruby_font_size: Option<f64> = None,
-        /// 1.0 = 100%.
-        ruby_x_scale: f64 = 1.0,
-        ruby_y_scale: f64 = 1.0,
-        /// Use the font's ruby glyphs (OpenType `ruby`).
-        ruby_open_type_pro: bool = true,
-        /// Tate-chu-yoko in vertical ruby for runs of up to this many digits (0 = off).
-        ruby_auto_tcy_digits: u32 = 0,
-        ruby_auto_tcy_include_roman: bool = false,
-        ruby_auto_tcy_auto_scale: bool = true,
-        /// IDML `RubyOverhang`, kept for round trips; `ruby_overhang_amount` sets the overhang.
-        ruby_overhang: bool = false,
-        ruby_overhang_amount: crate::ruby::RubyOverhang = crate::ruby::RubyOverhang::OneRuby,
-        ruby_parent_spacing: crate::ruby::RubyParentSpacing = crate::ruby::RubyParentSpacing::Aki121,
-        /// A longer ruby at a line's start or end is set flush with the line edge.
-        ruby_auto_align: bool = true,
-        /// A longer ruby is narrowed first, down to `ruby_scaling_min` (1.0 = 100%).
-        ruby_auto_scaling: bool = false,
-        ruby_scaling_min: f64 = 0.66,
-        /// Ruby colour: empty is the text's colour; `None` tint and weight follow the text.
-        ruby_fill: String = String::new(),
-        ruby_fill_tint: Option<f32> = None,
-        ruby_stroke: String = String::new(),
-        ruby_stroke_tint: Option<f32> = None,
-        ruby_stroke_weight: Option<f64> = None,
-        ruby_overprint_fill: crate::cjk_settings::AdornmentOverprint = crate::cjk_settings::AdornmentOverprint::Auto,
-        ruby_overprint_stroke: crate::cjk_settings::AdornmentOverprint = crate::cjk_settings::AdornmentOverprint::Auto,
-        /// Digits (World-Ready): how 0–9 are drawn.
-        digits: Digits = Digits::Default,
-        character_direction: crate::arabic::CharacterDirection = crate::arabic::CharacterDirection::Default,
-        /// Character-level permission, additionally gated by paragraph kashidas.
-        allow_kashidas: bool = true,
-        diacritic_position: crate::arabic::DiacriticPosition = crate::arabic::DiacriticPosition::Default,
-        /// Additional mark offsets, in thousandths of an em. Positive y is up.
-        diacritic_x_offset: f64 = 0.0,
-        diacritic_y_offset: f64 = 0.0,
-        /// IDML contextual-form request, separate from general OpenType features.
-        positional_form: String = String::new(),
-        language: String = "English: USA".into(),
-        /// Additional OpenType features, e.g. `["onum", "ss01"]`.
-        otf_features: Vec<String> = Vec::new(),
-        /// Conditional text: the conditions applied (Window › Type & Tables › Conditional Text).
-        conditions: Vec<String> = Vec::new(),
-        /// Track Changes: text added or deleted while tracking (deleted text isn't laid out).
-        change: ChangeMark = ChangeMark::None,
-        /// XML: the element this text is tagged with (Tags panel, inline).
-        xml_tag: String = String::new(),
-    }
-}
-
-attr_set! {
-    /// Paragraph attributes (Paragraph panel / paragraph styles).
-    ParaAttrs / ParaProps {
-        align: Align = Align::Left,
-        /// Paragraph Direction (World-Ready): the base direction lines are ordered in.
-        direction: TextDirection = TextDirection::LeftToRight,
-        left_indent: f64 = 0.0,
-        right_indent: f64 = 0.0,
-        first_line_indent: f64 = 0.0,
-        last_line_indent: f64 = 0.0,
-        space_before: f64 = 0.0,
-        space_after: f64 = 0.0,
-        /// Space between consecutive paragraphs of the same style; replaces space after/before there (None = ignore).
-        same_para_style_spacing: Option<f64> = None => "deserialize_explicit_value",
-        /// Drop cap: the paragraph's first `drop_cap_chars` characters (code points, never
-        /// splitting a base from its combining marks) set `drop_cap_lines` lines tall, in the
-        /// character style `drop_cap_style` ("" or `[None]`: the text's own formatting).
-        drop_cap_lines: u32 = 0,
-        drop_cap_chars: u32 = 0,
-        drop_cap_style: String = String::new(),
-        /// Align Left Edge: the drop cap's ink starts at the indent (its first letter's left side
-        /// bearing is taken off), and the lines beside it start where its advance ends.
-        drop_cap_align_left: bool = true,
-        /// Scale for Descenders (kept and round-tripped; doesn't change the layout).
-        drop_cap_scale_descenders: bool = false,
-        /// Nested styles, in order from the paragraph start.
-        nested_styles: Vec<NestedStyle> = Vec::new(),
-        /// GREP styles: a character style for every match of a pattern (applied after nested).
-        grep_styles: Vec<GrepStyle> = Vec::new(),
-        /// Nested line styles: a character style for the paragraph's first lines, in order.
-        nested_line_styles: Vec<NestedLineStyle> = Vec::new(),
-        grid_align: GridAlign = GridAlign::None,
-        composer: Composer = Composer::Paragraph,
-        // Hyphenation
-        hyphenate: bool = true,
-        hyph_min_word: u32 = 5,
-        hyph_after_first: u32 = 2,
-        hyph_before_last: u32 = 2,
-        /// Max consecutive hyphenated lines (0 = unlimited).
-        hyph_limit: u32 = 3,
-        hyph_zone: f64 = 36.0,
-        hyph_capitalized: bool = true,
-        hyph_last_word: bool = true,
-        hyph_across_column: bool = true,
-        /// Better spacing (0) ↔ fewer hyphens (1).
-        hyph_weight: f64 = 0.5,
-        // Justification (percent as fractions)
-        word_space_min: f64 = 0.8,
-        word_space_desired: f64 = 1.0,
-        word_space_max: f64 = 1.33,
-        letter_space_min: f64 = 0.0,
-        letter_space_desired: f64 = 0.0,
-        letter_space_max: f64 = 0.0,
-        glyph_scale_min: f64 = 1.0,
-        glyph_scale_desired: f64 = 1.0,
-        glyph_scale_max: f64 = 1.0,
-        auto_leading: f64 = 1.2,
-        single_word_justify: Align = Align::FullyJustified,
-        /// Insert Kashidas (World-Ready): justified Arabic lines stretch at joins before spaces.
-        kashidas: bool = true,
-        /// Preserved vendor policy; non-default policies require a dedicated composer.
-        arabic_justification: String = String::new(),
-        paragraph_kashida_width: Option<f64> = None => "deserialize_explicit_value",
-        /// Korean text breaks between any two syllables (character-based breaking); otherwise
-        /// it breaks at spaces, word by word.
-        korean_char_breaks: bool = false,
-        // Keeps
-        keep_with_next: u32 = 0,
-        keep_lines_together: bool = false,
-        /// All lines in paragraph (true) or at start/end of paragraph (false).
-        keep_all_lines: bool = false,
-        keep_first: u32 = 2,
-        keep_last: u32 = 2,
-        start_paragraph: StartParagraph = StartParagraph::Anywhere,
-        span_columns: SpanColumns = SpanColumns::Single,
-        /// Split Columns: the space between sub-columns and the inset from the column's edges.
-        split_inside_gutter: f64 = 6.0,
-        split_outside_gutter: f64 = 0.0,
-        rule_above: Rule = Rule::default(),
-        rule_below: Rule = Rule::default(),
-        #[serde(deserialize_with = "sanitized_tabs")]
-        tabs: Vec<TabStop> = Vec::new(),
-        list_type: ListType = ListType::None,
-        /// Named list (Define Lists) the numbers belong to ("" = the story's own list).
-        list_name: String = String::new(),
-        /// Start At: restart the numbering at this number.
-        start_at: Option<u32> = None => "deserialize_explicit_value",
-        bullet_char: String = "\u{2022}".into(),
-        number_style: NumberStyle = NumberStyle::Arabic,
-        /// A numbered paragraph's label: `^#` is the number, other metacharacters expand as in
-        /// [`expand_list_text`].
-        number_expression: String = "^#.^t".into(),
-        /// Text after the bullet (metacharacters expand as in [`expand_list_text`]).
-        list_separator: String = "\t".into(),
-        /// The hanging indent was set by the Bulleted or Numbered List button, which takes it away
-        /// again with the list (an indent the paragraph had before stays).
-        list_hang: bool = false,
-        balance_ragged: bool = false,
-        optical_margin: bool = false,
-        /// None uses the legacy built-in rules; an empty set explicitly disables kinsoku.
-        kinsoku: Option<crate::cjk::Kinsoku> = None => "deserialize_explicit_value",
-        /// Preserved spacing-table reference; compatibility audit reports unsupported composition.
-        mojikumi: String = String::new(),
-        /// Preserved priority policy; the current breaker does not implement these priorities.
-        kinsoku_type: String = String::new(),
-        kinsoku_hang: crate::cjk::KinsokuHang = crate::cjk::KinsokuHang::None,
-        bunri_kinshi: bool = false,
-        rensuuji: bool = true,
-        treat_ideographic_space_as_space: bool = false,
-        // Auto Tate-chu-yoko, Japanese Composition and Grid Settings.
-        /// Auto tate-chu-yoko: in vertical text, runs of up to this many half-width digits are set
-        /// across one em (0 = off).
-        auto_tcy: u32 = 0,
-        /// Auto tate-chu-yoko also takes runs of half-width roman letters.
-        auto_tcy_include_roman: bool = false,
-        /// Rotate Roman Characters in Vertical Text (縦組み中の欧文回転): half-width characters
-        /// stand upright one by one instead of lying along the line.
-        rotate_roman: bool = false,
-        /// Roman word break (欧文泣き別れ): roman words may break between any two letters,
-        /// without a hyphen.
-        roman_word_break: bool = false,
-        /// The point of a line that sits on the grid while `grid_align` is on.
-        grid_reference: crate::cjk::CharacterAlignment = crate::cjk::CharacterAlignment::Baseline,
-        /// Gyoudori (行取り): grid lines each line takes (0 = as many as its leading needs).
-        grid_gyoudori: u32 = 0,
-        /// Paragraph gyoudori: the paragraph as a whole, not each line, takes `grid_gyoudori` lines.
-        paragraph_gyoudori: bool = false,
-        /// Paragraph shading, and how far it reaches past the text: top, left, bottom, right.
-        shading_on: bool = false,
-        shading_color: String = "[Black]".into(),
-        shading_tint: f32 = 0.2,
-        shading_offsets: [f64; 4] = [0.0; 4],
-        /// Paragraph border: stroke weights (top, left, bottom, right), colour, and offsets past the
-        /// text (top, left, bottom, right).
-        border_on: bool = false,
-        border_weights: [f64; 4] = [1.0; 4],
-        border_color: String = "[Black]".into(),
-        border_tint: f32 = 1.0,
-        border_offsets: [f64; 4] = [0.0; 4],
-        /// The border's stroke type (a document stroke style by name, or a built-in type), cap and
-        /// join.
-        border_type: crate::item::StrokeType = crate::item::StrokeType::Solid,
-        border_cap: crate::item::Cap = crate::item::Cap::Butt,
-        border_join: crate::item::Join = crate::item::Join::Miter,
-        /// Corner shape and size: top left, top right, bottom right, bottom left.
-        border_corners: [designcraft_geom::corners::Corner; 4] = [designcraft_geom::corners::Corner::default(); 4],
-        border_width: BoxWidth = BoxWidth::Column,
-        border_top: BoxTop = BoxTop::Ascent,
-        border_bottom: BoxBottom = BoxBottom::Descent,
-        /// A paragraph split across frames or columns gets a closed box in each part (otherwise the
-        /// box is open where it splits).
-        border_display_if_splits: bool = false,
-        /// Consecutive paragraphs with the same border and shading share one box.
-        border_merge: bool = true,
-        /// The colour between the dashes, dots or stripes of a border that isn't solid.
-        border_gap_color: String = "[None]".into(),
-        border_gap_tint: f32 = 1.0,
-        /// Shading corners: top left, top right, bottom right, bottom left.
-        shading_corners: [designcraft_geom::corners::Corner; 4] = [designcraft_geom::corners::Corner::default(); 4],
-        shading_width: BoxWidth = BoxWidth::Column,
-        shading_top: BoxTop = BoxTop::Ascent,
-        shading_bottom: BoxBottom = BoxBottom::Descent,
-        /// The shading stops at the edges of the text frame.
-        shading_clip: bool = false,
-        /// The shading shows on screen only: not printed or exported.
-        shading_nonprinting: bool = false,
-        /// Least space between a spanning or split paragraph and the column text above and below it.
-        span_space_before: f64 = 0.0,
-        span_space_after: f64 = 0.0,
-        /// List level (1–9): each level numbers on its own, and `^1`…`^9` in a number's text are the
-        /// current numbers of those levels.
-        list_level: u32 = 1,
-        /// Character styles of the bullet and of the number.
-        bullet_char_style: String = crate::story::NO_CHAR_STYLE.into(),
-        number_char_style: String = crate::story::NO_CHAR_STYLE.into(),
-        bullet_align: ListAlign = ListAlign::Left,
-        number_align: ListAlign = ListAlign::Left,
-        /// A tab stop for the text after the bullet or number, from the column's left edge.
-        list_tab: Option<f64> = None,
-        /// Restart Numbers at This Level After: a paragraph at a higher level (0 = any; otherwise
-        /// that level) starts this level's numbering again.
-        restart_numbers: bool = true,
-        restart_after_level: u32 = 0,
-        /// The bullet's font family and style ("" = the paragraph's).
-        bullet_font: String = String::new(),
-        bullet_font_style: String = String::new(),
-    }
-}
-
-impl ParaAttrs {
-    /// [`set_json`](Self::set_json), except that a `ruleAbove` / `ruleBelow` object names only the
-    /// rule fields to change; the others keep their values in `current` (the resolved attributes
-    /// of the paragraph or style being edited). A `tabs` list is checked and sorted as
-    /// [`TabStop::checked_list`] does.
-    pub fn set_json_over(&mut self, key: &str, value: &serde_json::Value, current: &ParaProps) -> Result<(), String> {
-        let rule = match key.chars().filter(|c| *c != '_').collect::<String>().to_ascii_lowercase().as_str() {
-            "ruleabove" => &current.rule_above,
-            "rulebelow" => &current.rule_below,
-            "tabs" if !value.is_null() => {
-                // Count before deserializing: the list may be arbitrarily long.
-                if value.as_array().is_some_and(|a| a.len() > MAX_TAB_STOPS) {
-                    return Err(format!("{key}: a paragraph holds at most {MAX_TAB_STOPS} tab stops"));
-                }
-                let tabs: Vec<TabStop> = serde_json::from_value(value.clone()).map_err(|e| format!("{key}: {e}"))?;
-                self.tabs = Some(TabStop::checked_list(tabs).map_err(|e| format!("{key}: {e}"))?);
-                return Ok(());
-            }
-            _ => return self.set_json(key, value),
-        };
-        let serde_json::Value::Object(patch) = value else { return self.set_json(key, value) };
-        let mut merged = serde_json::to_value(rule).map_err(|e| format!("{key}: {e}"))?;
-        let serde_json::Value::Object(fields) = &mut merged else { return Err(format!("{key}: not an object")) };
-        for (k, v) in patch {
-            if !fields.contains_key(k) {
-                return Err(format!("{key}: unknown rule field `{k}`"));
-            }
-            fields.insert(k.clone(), v.clone());
-        }
-        self.set_json(key, &merged)
-    }
-}
-
-impl ParaProps {
-    /// The label of a numbered paragraph with number `n`.
-    pub fn number_label(&self, n: u32) -> String {
-        expand_list_text(&self.number_expression, &self.number_style.format(n))
-    }
-
-    /// The label of a numbered paragraph that `list` has just numbered ([`ListCounter::advance`]).
-    pub fn number_label_in(&self, list: &ListCounter) -> String {
-        let level = list_level_index(self.list_level);
-        let number = list.labels.get(level).map_or("", String::as_str);
-        expand_list_levels(&self.number_expression, number, &list.labels)
-    }
-
-    /// The label of a bulleted paragraph.
-    pub fn bullet_label(&self) -> String {
-        let mut s: String = self.bullet_char.chars().filter(|c| *c != '\n' && *c != '\r').collect();
-        s.push_str(&expand_list_text(&self.list_separator, ""));
-        s
-    }
-}
-
-/// Levels a list can have.
-pub const LIST_LEVELS: usize = 9;
-
-/// Index (0-based) of list level `level` (1-based, clamped to 1–[`LIST_LEVELS`]).
-fn list_level_index(level: u32) -> usize {
-    (level.clamp(1, LIST_LEVELS as u32) - 1) as usize
-}
-
-/// The numbering of one list as it goes: each level's last number and its text, and when each
-/// level last numbered a paragraph (for Restart Numbers at This Level After).
-#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
-pub struct ListCounter {
-    numbers: [u32; LIST_LEVELS],
-    labels: [String; LIST_LEVELS],
-    seen: [u64; LIST_LEVELS],
-    tick: u64,
-}
-
-impl ListCounter {
-    /// Number the next paragraph of `pp` (a numbered paragraph with text) and return its number.
-    pub fn advance(&mut self, pp: &ParaProps) -> u32 {
-        let l = list_level_index(pp.list_level);
-        self.tick = self.tick.saturating_add(1);
-        let since = self.seen[l];
-        let restart = pp.restart_numbers
-            && match pp.restart_after_level {
-                0 => self.seen[..l].iter().any(|&t| t > since),
-                m => (m as usize) <= l && self.seen.get(m as usize - 1).is_some_and(|&t| t > since),
-            };
-        let n = match pp.start_at {
-            Some(s) => s.max(1),
-            None if restart => 1,
-            None => self.numbers[l].saturating_add(1),
-        };
-        self.numbers[l] = n;
-        self.labels[l] = pp.number_style.format(n);
-        self.seen[l] = self.tick;
-        n
-    }
-}
-
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// #777: an unknown attribute names the nearest one, or lists them all.
-    #[test]
-    fn unknown_attributes_suggest_the_right_name() {
-        let mut c = CharAttrs::default();
-        assert_eq!(c.set_json("font", &serde_json::json!("X")).unwrap_err(), "unknown attribute `font`; did you mean `fontFamily`?");
-        assert_eq!(c.set_json("fontFamly", &serde_json::json!("X")).unwrap_err(), "unknown attribute `fontFamly`; did you mean `fontFamily`?");
-        let all = c.set_json("zzzzzz", &serde_json::json!(1)).unwrap_err();
-        assert!(
-            all.starts_with("unknown attribute `zzzzzz`; the attributes are: ") && all.contains("fontFamily") && all.contains("fontStyle"),
-            "{all}"
-        );
-        assert!(c.set_json("font_family", &serde_json::json!("X")).is_ok() && c.set_json("fontFamily", &serde_json::json!("X")).is_ok());
-        let mut p = ParaAttrs::default();
-        assert_eq!(p.set_json("spaceBefor", &serde_json::json!(3)).unwrap_err(), "unknown attribute `spaceBefor`; did you mean `spaceBefore`?");
-        assert_eq!(camel("first_line_indent"), "firstLineIndent");
-    }
-
-    #[test]
-    fn levels_number_on_their_own_and_restart_after_a_higher_level() {
-        let at =
-            |level: u32| ParaProps { list_type: ListType::Numbers, list_level: level, number_expression: "^1.^#".into(), ..ParaProps::default() };
-        let mut c = ListCounter::default();
-        let mut labels = vec![];
-        for level in [1, 2, 2, 1, 2] {
-            let pp = at(level);
-            c.advance(&pp);
-            labels.push(pp.number_label_in(&c));
-        }
-        assert_eq!(labels, ["1.1", "1.1", "1.2", "2.2", "2.1"]);
-        // Without the restart, level 2 carries on.
-        let mut c = ListCounter::default();
-        let keep = |level: u32| ParaProps { restart_numbers: false, ..at(level) };
-        let n: Vec<u32> = [1, 2, 1, 2].into_iter().map(|l| c.advance(&keep(l))).collect();
-        assert_eq!(n, [1, 1, 2, 2]);
-    }
-
-    #[test]
-    fn a_partial_rule_keeps_the_other_fields() {
-        let current = ParaProps {
-            rule_below: Rule { on: true, weight: 3.0, color: "Red".into(), offset: 4.0, column_width: false, ..Rule::default() },
-            ..ParaProps::default()
-        };
-        let mut a = ParaAttrs::default();
-        a.set_json_over("ruleBelow", &serde_json::json!({"color": "Blue"}), &current).unwrap();
-        assert_eq!(a.rule_below, Some(Rule { color: "Blue".into(), ..current.rule_below.clone() }));
-        assert_eq!(a.rule_above, None);
-        assert!(a.set_json_over("ruleAbove", &serde_json::json!({"colour": "Blue"}), &current).is_err(), "unknown field");
-        a.set_json_over("ruleBelow", &serde_json::Value::Null, &current).unwrap();
-        assert_eq!(a.rule_below, None, "null clears the override");
-    }
-
-    #[test]
-    fn stroke_behind_fill_is_saved_only_when_set() {
-        assert!(!CharProps::default().stroke_behind_fill);
-        assert_eq!(serde_json::to_value(CharAttrs::default()).unwrap(), serde_json::json!({}));
-        let mut a = CharAttrs::default();
-        a.set_json("strokeBehindFill", &serde_json::json!(true)).unwrap();
-        let v = serde_json::to_value(&a).unwrap();
-        assert_eq!(v, serde_json::json!({"strokeBehindFill": true}));
-        assert_eq!(serde_json::from_value::<CharAttrs>(v).unwrap(), a);
-        let mut p = CharProps::default();
-        p.apply(&a);
-        assert!(p.stroke_behind_fill);
-    }
-
-    #[test]
-    fn digits_map_to_their_script() {
-        assert_eq!(Digits::Default.map('7', "Arabic"), '7');
-        assert_eq!(Digits::Hindi.map('3', ""), '\u{0663}');
-        assert_eq!(Digits::Farsi.map('0', ""), '\u{06F0}');
-        assert_eq!(Digits::Native.map('5', "Thai"), '\u{0E55}');
-        assert_eq!(Digits::Native.map('5', "English: USA"), '5');
-        assert_eq!(Digits::Hindi.map('x', ""), 'x');
-    }
-
-    #[test]
-    fn language_names_map_to_bcp47_tags() {
-        assert_eq!(language_tag("English: USA"), Some("en-US"));
-        assert_eq!(language_tag("English: Australian"), Some("en"));
-        assert_eq!(language_tag("Turkish"), Some("tr"));
-        assert_eq!(language_tag("Georgian"), Some("ka"));
-        assert_eq!(language_tag("Japanese"), Some("ja"));
-        assert_eq!(language_tag("Korean"), Some("ko"));
-        assert_eq!(language_tag("Chinese"), Some("zh"));
-        assert_eq!(language_tag("Chinese: Simplified"), Some("zh-Hans"));
-        assert_eq!(language_tag("Chinese: Traditional"), Some("zh-Hant"));
-        assert_eq!(language_tag("Arabic"), Some("ar"));
-        assert_eq!(language_tag("Persian"), Some("fa"));
-        assert_eq!(language_tag("Farsi"), Some("fa"));
-        assert_eq!(language_tag("Urdu"), Some("ur"));
-        assert_eq!(language_tag("Hebrew"), Some("he"));
-        assert_eq!(language_tag("[No Language]"), None);
-        assert_eq!(language_tag("Klingon"), None);
-        assert_eq!(language_tag(""), None);
-    }
-
-    #[test]
-    fn chinese_japanese_and_korean_names_map_in_their_common_spellings() {
-        for (name, tag) in [
-            ("Chinese: Simplified", Some("zh-Hans")),
-            ("Simplified Chinese", Some("zh-Hans")),
-            ("Chinese Simplified", Some("zh-Hans")),
-            ("Chinese (Simplified)", Some("zh-Hans")),
-            ("  chinese:  SIMPLIFIED ", Some("zh-Hans")),
-            ("zh_CN", Some("zh-Hans")),
-            ("zh-CN", Some("zh-Hans")),
-            ("zh-Hans", Some("zh-Hans")),
-            ("zh-Hans-CN", Some("zh-Hans")),
-            ("Chinese: Traditional", Some("zh-Hant")),
-            ("Traditional Chinese", Some("zh-Hant")),
-            ("Chinese Traditional", Some("zh-Hant")),
-            ("Chinese (Traditional)", Some("zh-Hant")),
-            ("zh_TW", Some("zh-Hant")),
-            ("zh-TW", Some("zh-Hant")),
-            ("zh_HK", Some("zh-Hant")),
-            ("zh-HK", Some("zh-Hant")),
-            ("zh-Hant", Some("zh-Hant")),
-            ("Chinese", Some("zh")),
-            ("zh", Some("zh")),
-            ("Japanese", Some("ja")),
-            ("ja", Some("ja")),
-            ("ja_JP", Some("ja-JP")),
-            ("ja-JP", Some("ja-JP")),
-            ("Korean", Some("ko")),
-            ("ko_KR", Some("ko-KR")),
-            ("ko-KR", Some("ko-KR")),
-            ("English: USA", Some("en-US")),
-            ("German: Swiss 2006 Reform", Some("de-CH")),
-            ("Norwegian: Bokmål", Some("nb")),
-            ("[No Language]", None),
-        ] {
-            assert_eq!(language_tag(name), tag, "{name}");
-        }
-    }
-
-    #[test]
-    fn locale_codes_map_to_their_tags() {
-        for (name, tag) in [
-            // As InDesign-exported IDML writes them (AppliedLanguage).
-            ("$ID/de_DE_2006", Some("de-DE")),
-            ("$ID/nl_NL_2005", Some("nl-NL")),
-            ("$ID/English: USA", Some("en-US")),
-            ("$ID/English: UK", Some("en-GB")),
-            ("$ID/Spanish: Castilian", Some("es-ES")),
-            ("$ID/French", Some("fr")),
-            // As IDML import keeps them.
-            ("de_DE_2006", Some("de-DE")),
-            ("nl_NL_2005", Some("nl-NL")),
-            ("Spanish: Castilian", Some("es-ES")),
-            ("French", Some("fr")),
-            // Other locale codes.
-            ("de-DE", Some("de-DE")),
-            ("de_CH_2006", Some("de-CH")),
-            ("pt_BR", Some("pt-BR")),
-            ("en_us", Some("en-US")),
-            ("es_419", Some("es-419")),
-            ("fil_PH", Some("fil-PH")),
-            ("sv", Some("sv")),
-            ("ja", Some("ja")),
-            // Not codes.
-            ("de_DE_2006_x", None),
-            ("d_DE", None),
-            ("de_D", None),
-            ("de_DE_06", None),
-            ("1e_DE", None),
-            ("[No Language]", None),
-        ] {
-            assert_eq!(language_tag(name), tag, "{name}");
-        }
-        assert_eq!(language_subtag("de-DE"), "de");
-        assert_eq!(language_subtag("zh-Hant"), "zh");
-        assert_eq!(language_subtag("ko"), "ko");
-    }
-
-    #[test]
-    fn merge_and_resolve() {
-        let mut a = CharAttrs { size: Some(10.0), ..Default::default() };
-        a.merge(&CharAttrs { tracking: Some(20.0), size: Some(11.0), ..Default::default() });
-        assert_eq!(a.size, Some(11.0));
-        assert_eq!(a.count(), 2);
-        let mut p = CharProps::default();
-        p.apply(&a);
-        assert_eq!(p.size, 11.0);
-        assert_eq!(p.tracking, 20.0);
-        assert_eq!(p.font_family, "Source Serif 4");
-    }
-
-    #[test]
-    fn tab_lists_are_checked() {
-        let stop = |position: f64| TabStop { position, align: TabAlign::Left, leader: String::new(), align_on: String::new() };
-        assert!(TabStop::checked_list(vec![stop(f64::NAN)]).is_err());
-        assert!(TabStop::checked_list(vec![stop(f64::INFINITY)]).is_err());
-        assert!(TabStop::checked_list((0..=MAX_TAB_STOPS).map(|i| stop(i as f64)).collect()).is_err());
-        let list = TabStop::checked_list(vec![stop(50.0), TabStop { leader: ".".into(), ..stop(10.0) }, stop(50.001)]).unwrap();
-        assert_eq!(list.iter().map(|t| t.position).collect::<Vec<_>>(), [10.0, 50.001], "sorted, one stop per position");
-    }
-
-    /// A file's tab list is repaired, never refused; a list the commands accept comes through
-    /// unchanged.
-    #[test]
-    fn tab_lists_from_files_are_sanitized() {
-        let stop = |position: f64| TabStop { position, align: TabAlign::Left, leader: String::new(), align_on: String::new() };
-        let mut tabs: Vec<TabStop> = (0..500).rev().map(|i| stop(i as f64 * 10.0)).collect();
-        tabs.push(stop(f64::NAN));
-        tabs.push(stop(f64::NEG_INFINITY));
-        tabs.push(TabStop { leader: "\u{7}0123456789".into(), align: TabAlign::Char, align_on: "\n,;".into(), ..stop(-3.0) });
-        let list = TabStop::sanitized_list(tabs);
-        assert_eq!(list.len(), MAX_TAB_STOPS);
-        assert!(list.windows(2).all(|w| w[1].position - w[0].position >= SAME_TAB_POSITION), "sorted, one stop per position");
-        let first = &list[0];
-        assert_eq!((first.position, first.leader.as_str(), first.align_on.as_str()), (0.0, "01234567", ","), "the later stop at 0 wins");
-        assert_eq!(list.last().map(|t| t.position), Some(990.0), "the first stops by position are kept");
-
-        let ok = TabStop::checked_list(vec![stop(72.0), TabStop { align: TabAlign::Char, ..stop(10.0) }]).unwrap();
-        assert_eq!(TabStop::sanitized_list(ok.clone()), ok);
-
-        // `null` is how JSON writes a non-finite position; that stop is dropped, the others kept.
-        let json = r#"{"tabs":[{"position":null},{"position":20000,"leader":"0123456789"},{"position":5}]}"#;
-        let a: ParaAttrs = serde_json::from_str(json).unwrap();
-        let tabs = a.tabs.unwrap();
-        assert_eq!(tabs.iter().map(|t| t.position).collect::<Vec<_>>(), [5.0, MAX_TAB_POSITION]);
-        assert_eq!(tabs[1].leader, "01234567");
-        let p: ParaProps = serde_json::from_str(json).unwrap();
-        assert_eq!(p.tabs, tabs);
-        assert!(serde_json::from_str::<TabStop>("{}").is_err(), "a stop names its position");
-    }
-
-    #[test]
-    fn set_json_by_name() {
-        let mut a = ParaAttrs::default();
-        a.set_json("spaceBefore", &serde_json::json!(6.0)).unwrap();
-        a.set_json("align", &serde_json::json!("center")).unwrap();
-        a.set_json("left_indent", &serde_json::json!(12)).unwrap();
-        assert_eq!(a.space_before, Some(6.0));
-        assert_eq!(a.align, Some(Align::Center));
-        assert_eq!(a.left_indent, Some(12.0));
-        assert!(a.set_json("nope", &serde_json::json!(1)).is_err());
-        a.set_json("align", &serde_json::Value::Null).unwrap();
-        assert_eq!(a.align, None);
-    }
-
-    #[test]
-    fn delta_and_common() {
-        let a = CharProps::default();
-        let mut b = a.clone();
-        b.size = 18.0;
-        let d = a.delta(&b);
-        assert_eq!(d.count(), 1);
-        let c = CharProps::common([&a, &b]);
-        assert_eq!(c.size, None);
-        assert_eq!(c.font_family.as_deref(), Some("Source Serif 4"));
-    }
-
-    #[test]
-    fn serde_skips_unset() {
-        let a = CharAttrs { size: Some(9.0), ..Default::default() };
-        assert_eq!(serde_json::to_string(&a).unwrap(), r#"{"size":9.0}"#);
-        let p: ParaProps = serde_json::from_str(r#"{"align":"center"}"#).unwrap();
-        assert_eq!(p.align, Align::Center);
-        assert_eq!(p.word_space_max, 1.33);
-    }
-
-    #[test]
-    fn same_para_style_spacing_ignore_survives_serde() {
-        for v in [None, Some(None), Some(Some(0.0))] {
-            let a = ParaAttrs { same_para_style_spacing: v, ..Default::default() };
-            let back: ParaAttrs = serde_json::from_str(&serde_json::to_string(&a).unwrap()).unwrap();
-            assert_eq!(back.same_para_style_spacing, v);
-        }
-    }
-
-    #[test]
-    fn numbering_styles() {
-        assert_eq!(NumberStyle::UpperRoman.format(14), "XIV");
-        assert_eq!(NumberStyle::LowerRoman.format(9), "ix");
-        assert_eq!(NumberStyle::UpperLetters.format(1), "A");
-        assert_eq!(NumberStyle::UpperLetters.format(27), "AA");
-        assert_eq!(NumberStyle::LowerLetters.format(28), "bb");
-        assert_eq!(NumberStyle::ArabicLeadingZero.format(3), "03");
-        assert_eq!(NumberStyle::ArabicThreeDigits.format(7), "007");
-        assert_eq!(NumberStyle::ArabicFourDigits.format(12), "0012");
-        // Repeating forms stay small for huge numbers.
-        assert_eq!(NumberStyle::UpperRoman.format(u32::MAX), u32::MAX.to_string());
-        assert_eq!(NumberStyle::LowerLetters.format(u32::MAX), u32::MAX.to_string());
-        assert_eq!(NumberStyle::Symbols.format(u32::MAX), u32::MAX.to_string());
-    }
-
-    #[test]
-    fn kanji_numbers_are_written_digit_by_digit() {
-        for (n, s) in [
-            (0, "〇"),
-            (1, "一"),
-            (5, "五"),
-            (10, "一〇"),
-            (11, "一一"),
-            (20, "二〇"),
-            (38, "三八"),
-            (99, "九九"),
-            (100, "一〇〇"),
-            (105, "一〇五"),
-            (1000, "一〇〇〇"),
-            (2026, "二〇二六"),
-            (u32::MAX, "四二九四九六七二九五"),
-        ] {
-            assert_eq!(NumberStyle::Kanji.format(n), s, "{n}");
-        }
-    }
-
-    #[test]
-    fn list_labels_expand_metacharacters() {
-        let p = ParaProps { number_style: NumberStyle::UpperLetters, ..Default::default() };
-        assert_eq!(p.number_label(2), "B.\t");
-        let p = ParaProps { number_expression: "Tabel ^#^t".into(), ..Default::default() };
-        assert_eq!(p.number_label(3), "Tabel 3\t");
-        assert_eq!(expand_list_text("^2.^#.^>x^^^", "4"), ".4.\u{2002}x^^");
-        assert_eq!(expand_list_text("a\nb^p", "1"), "ab");
-        assert_eq!(ParaProps::default().bullet_label(), "\u{2022}\t");
-    }
-}
+mod tests;
diff --git a/crates/doc/src/attrs/char_attrs.rs b/crates/doc/src/attrs/char_attrs.rs
new file mode 100644
index 000000000..4f4cb9d52
--- /dev/null
+++ b/crates/doc/src/attrs/char_attrs.rs
@@ -0,0 +1,177 @@
+use super::{
+    Capitalization, ChangeMark, Deserialize, Digits, Kerning, Leading, Position, Serialize, attr_key, deserialize_explicit_value, unknown_attribute,
+};
+
+attr_set! {
+    /// Character attributes (Character panel / character styles / the character part of paragraph styles).
+    CharAttrs / CharProps {
+        font_family: String = "Source Serif 4".into(),
+        font_style: String = "Regular".into(),
+        /// Point size.
+        size: f64 = 12.0,
+        leading: Leading = Leading::Auto,
+        kerning: Kerning = Kerning::Metrics,
+        /// Tracking in 1/1000 em.
+        tracking: f64 = 0.0,
+        /// Explicit CJK aki, in em; None restores automatic spacing.
+        leading_aki: Option<f64> = None => "deserialize_explicit_value",
+        trailing_aki: Option<f64> = None => "deserialize_explicit_value",
+        /// Proportional character compression, 0..1.
+        tsume: f64 = 0.0,
+        /// Target em cells for the contiguous formatted group (0 disables jidori).
+        jidori: u32 = 0,
+        character_alignment: crate::cjk::CharacterAlignment = crate::cjk::CharacterAlignment::Baseline,
+        leading_model: crate::cjk::LeadingModel = crate::cjk::LeadingModel::Roman,
+        /// The kenten mark's text: a custom mark, or the preset of `kenten_kind` (see
+        /// [`crate::cjk_settings::kenten_mark`]); empty is the sesame dot.
+        kenten_character: String = String::new(),
+        /// Horizontal / vertical scale, 1.0 = 100%.
+        h_scale: f64 = 1.0,
+        v_scale: f64 = 1.0,
+        baseline_shift: f64 = 0.0,
+        /// Skew (false italic), degrees.
+        skew: f64 = 0.0,
+        fill: String = "[Black]".into(),
+        fill_tint: f32 = 1.0,
+        stroke: String = "[None]".into(),
+        stroke_tint: f32 = 1.0,
+        stroke_weight: f64 = 1.0,
+        /// Stroke behind fill: the stroke is painted under the fill and lies wholly outside the
+        /// letters at its full weight, so the letters keep their shape. Off, it straddles the outline.
+        stroke_behind_fill: bool = false,
+        capitalization: Capitalization = Capitalization::Normal,
+        position: Position = Position::Normal,
+        underline: bool = false,
+        strikethrough: bool = false,
+        /// Underline Options: weight and offset below the baseline (`None` = from the size),
+        /// colour (empty = the text colour) and tint.
+        underline_weight: Option<f64> = None => "deserialize_explicit_value",
+        underline_offset: Option<f64> = None => "deserialize_explicit_value",
+        underline_color: String = String::new(),
+        underline_tint: f32 = 1.0,
+        /// Strikethrough Options: offset above the baseline.
+        strikethrough_weight: Option<f64> = None => "deserialize_explicit_value",
+        strikethrough_offset: Option<f64> = None => "deserialize_explicit_value",
+        strikethrough_color: String = String::new(),
+        strikethrough_tint: f32 = 1.0,
+        glyph_form: String = String::new(),
+        ligatures: bool = true,
+        no_break: bool = false,
+        /// Tate-chu-yoko: in vertical text, the run is set horizontally within one em of the line.
+        tate_chu_yoko: bool = false,
+        tate_chu_yoko_x_offset: f64 = 0.0,
+        tate_chu_yoko_y_offset: f64 = 0.0,
+        /// Ruby: the reading set small above the text (to its right in vertical text). Group ruby
+        /// sets it over the whole run; per-character ruby holds one reading per character,
+        /// separated by U+3000. Its other settings are the `ruby_*` fields below.
+        ruby: String = String::new(),
+        /// Kenten: an emphasis dot above each character.
+        kenten: bool = false,
+        /// Warichu: the run is set in smaller lines stacked inside one line height.
+        warichu: bool = false,
+        /// How many warichu lines (InDesign's minimum is 2).
+        warichu_lines: u32 = 2,
+        /// Warichu size as a percentage of the parent size.
+        warichu_size: f64 = 50.0,
+        /// Extra points between warichu baselines. 0 is automatic (one small em).
+        warichu_line_spacing: f64 = 0.0,
+        warichu_alignment: crate::cjk::WarichuAlignment = crate::cjk::WarichuAlignment::Auto,
+        /// Minimum characters on a warichu line before a break, and on the line after it.
+        warichu_chars_before_break: u32 = 1,
+        warichu_chars_after_break: u32 = 1,
+        // Kenten Settings / Kenten Color (`kenten` switches the marks on).
+        /// The mark; [`crate::cjk_settings::KentenKind::Custom`] draws `kenten_character`.
+        kenten_kind: crate::cjk_settings::KentenKind = crate::cjk_settings::KentenKind::SesameDot,
+        /// Font of a custom mark (empty = the text's font) and its style.
+        kenten_font: String = String::new(),
+        kenten_font_style: String = String::new(),
+        /// Mark size in points; `None` is half the text size.
+        kenten_size: Option<f64> = None,
+        /// Horizontal / vertical scale of the mark, 1.0 = 100%.
+        kenten_x_scale: f64 = 1.0,
+        kenten_y_scale: f64 = 1.0,
+        /// Points between the text's em box and the mark's.
+        kenten_distance: f64 = 0.0,
+        kenten_position: crate::cjk_settings::KentenPosition = crate::cjk_settings::KentenPosition::AboveRight,
+        kenten_alignment: crate::cjk_settings::KentenAlignment = crate::cjk_settings::KentenAlignment::Center,
+        /// How a custom mark was entered (IDML `KentenCharacterSet`), kept for interchange.
+        kenten_character_set: String = String::new(),
+        /// Mark fill and stroke swatches (empty = the text's), tints and stroke weight (`None` =
+        /// the text's).
+        kenten_fill: String = String::new(),
+        kenten_fill_tint: Option<f32> = None,
+        kenten_stroke: String = String::new(),
+        kenten_stroke_tint: Option<f32> = None,
+        kenten_stroke_weight: Option<f64> = None,
+        kenten_overprint_fill: crate::cjk_settings::AdornmentOverprint = crate::cjk_settings::AdornmentOverprint::Auto,
+        kenten_overprint_stroke: crate::cjk_settings::AdornmentOverprint = crate::cjk_settings::AdornmentOverprint::Auto,
+        // Shatai (斜体): the character is compressed across the direction at `shatai_angle`.
+        /// Compression in percent of the em (0 = off).
+        shatai_magnification: f64 = 0.0,
+        /// Degrees from the line direction, counter-clockwise.
+        shatai_angle: f64 = 45.0,
+        /// Turn the compressed character back so its edge along the line stays along the line.
+        shatai_adjust_rotation: bool = false,
+        /// Fit the advance to the compressed em box.
+        shatai_adjust_tsume: bool = true,
+        // Ruby settings (see [`crate::ruby`]). Defaults are the IDML text defaults.
+        ruby_type: crate::ruby::RubyType = crate::ruby::RubyType::Group,
+        /// How a ruby shorter than its parent is spread over it.
+        ruby_alignment: crate::ruby::RubyAlignment = crate::ruby::RubyAlignment::Jis,
+        ruby_position: crate::ruby::RubyPosition = crate::ruby::RubyPosition::AboveRight,
+        /// Points along the line, and away from the parent text across it.
+        ruby_x_offset: f64 = 0.0,
+        ruby_y_offset: f64 = 0.0,
+        /// Empty: the parent's font and style.
+        ruby_font: String = String::new(),
+        ruby_font_style: String = String::new(),
+        /// Points; `None` is half the parent size.
+        ruby_font_size: Option<f64> = None,
+        /// 1.0 = 100%.
+        ruby_x_scale: f64 = 1.0,
+        ruby_y_scale: f64 = 1.0,
+        /// Use the font's ruby glyphs (OpenType `ruby`).
+        ruby_open_type_pro: bool = true,
+        /// Tate-chu-yoko in vertical ruby for runs of up to this many digits (0 = off).
+        ruby_auto_tcy_digits: u32 = 0,
+        ruby_auto_tcy_include_roman: bool = false,
+        ruby_auto_tcy_auto_scale: bool = true,
+        /// IDML `RubyOverhang`, kept for round trips; `ruby_overhang_amount` sets the overhang.
+        ruby_overhang: bool = false,
+        ruby_overhang_amount: crate::ruby::RubyOverhang = crate::ruby::RubyOverhang::OneRuby,
+        ruby_parent_spacing: crate::ruby::RubyParentSpacing = crate::ruby::RubyParentSpacing::Aki121,
+        /// A longer ruby at a line's start or end is set flush with the line edge.
+        ruby_auto_align: bool = true,
+        /// A longer ruby is narrowed first, down to `ruby_scaling_min` (1.0 = 100%).
+        ruby_auto_scaling: bool = false,
+        ruby_scaling_min: f64 = 0.66,
+        /// Ruby colour: empty is the text's colour; `None` tint and weight follow the text.
+        ruby_fill: String = String::new(),
+        ruby_fill_tint: Option<f32> = None,
+        ruby_stroke: String = String::new(),
+        ruby_stroke_tint: Option<f32> = None,
+        ruby_stroke_weight: Option<f64> = None,
+        ruby_overprint_fill: crate::cjk_settings::AdornmentOverprint = crate::cjk_settings::AdornmentOverprint::Auto,
+        ruby_overprint_stroke: crate::cjk_settings::AdornmentOverprint = crate::cjk_settings::AdornmentOverprint::Auto,
+        /// Digits (World-Ready): how 0–9 are drawn.
+        digits: Digits = Digits::Default,
+        character_direction: crate::arabic::CharacterDirection = crate::arabic::CharacterDirection::Default,
+        /// Character-level permission, additionally gated by paragraph kashidas.
+        allow_kashidas: bool = true,
+        diacritic_position: crate::arabic::DiacriticPosition = crate::arabic::DiacriticPosition::Default,
+        /// Additional mark offsets, in thousandths of an em. Positive y is up.
+        diacritic_x_offset: f64 = 0.0,
+        diacritic_y_offset: f64 = 0.0,
+        /// IDML contextual-form request, separate from general OpenType features.
+        positional_form: String = String::new(),
+        language: String = "English: USA".into(),
+        /// Additional OpenType features, e.g. `["onum", "ss01"]`.
+        otf_features: Vec<String> = Vec::new(),
+        /// Conditional text: the conditions applied (Window › Type & Tables › Conditional Text).
+        conditions: Vec<String> = Vec::new(),
+        /// Track Changes: text added or deleted while tracking (deleted text isn't laid out).
+        change: ChangeMark = ChangeMark::None,
+        /// XML: the element this text is tagged with (Tags panel, inline).
+        xml_tag: String = String::new(),
+    }
+}
diff --git a/crates/doc/src/attrs/enums.rs b/crates/doc/src/attrs/enums.rs
new file mode 100644
index 000000000..e655c7658
--- /dev/null
+++ b/crates/doc/src/attrs/enums.rs
@@ -0,0 +1,310 @@
+use super::{Deserialize, Serialize};
+
+// ---------- value types ----------
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", tag = "kind", content = "value")]
+pub enum Leading {
+    /// Auto leading (percentage of the largest size on the line, Justification → Auto Leading).
+    #[default]
+    Auto,
+    Points(f64),
+}
+
+/// Paragraph direction.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum TextDirection {
+    #[default]
+    LeftToRight,
+    RightToLeft,
+}
+
+/// Digits (World-Ready): the figures 0–9 are drawn as these.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Digits {
+    /// Contextual digits; composition selects the preceding strong script/language.
+    #[default]
+    Default,
+    /// European (0123).
+    Arabic,
+    /// Arabic-Indic (٠١٢٣).
+    Hindi,
+    /// Extended Arabic-Indic, as used for Persian and Urdu (۰۱۲۳).
+    Farsi,
+    /// Those of the text's language (Thai, Devanagari, Bengali, Arabic, Persian…); else as typed.
+    Native,
+}
+
+impl Digits {
+    /// The digit `c` (0–9) is drawn as, for text in `language`.
+    pub fn map(self, c: char, language: &str) -> char {
+        let d = match c {
+            '0'..='9' => c as u32 - '0' as u32,
+            '\u{0660}'..='\u{0669}' => c as u32 - 0x0660,
+            '\u{06F0}'..='\u{06F9}' => c as u32 - 0x06F0,
+            _ => return c,
+        };
+        let zero = match self {
+            Digits::Default => return c,
+            Digits::Arabic => 0x0030,
+            Digits::Hindi => 0x0660,
+            Digits::Farsi => 0x06F0,
+            Digits::Native => {
+                let l = language.to_ascii_lowercase();
+                match () {
+                    _ if l.starts_with("arabic") || l == "ar" || l.starts_with("ar-") => 0x0660,
+                    _ if l.starts_with("persian")
+                        || l.starts_with("farsi")
+                        || l.starts_with("urdu")
+                        || l == "fa"
+                        || l.starts_with("fa-")
+                        || l == "ur"
+                        || l.starts_with("ur-") =>
+                    {
+                        0x06F0
+                    }
+                    _ if l.starts_with("hindi") || l.starts_with("marathi") || l.starts_with("nepali") || l.starts_with("sanskrit") => 0x0966,
+                    _ if l.starts_with("bengali") => 0x09E6,
+                    _ if l.starts_with("gujarati") => 0x0AE6,
+                    _ if l.starts_with("punjabi") => 0x0A66,
+                    _ if l.starts_with("tamil") => 0x0BE6,
+                    _ if l.starts_with("telugu") => 0x0C66,
+                    _ if l.starts_with("kannada") => 0x0CE6,
+                    _ if l.starts_with("malayalam") => 0x0D66,
+                    _ if l.starts_with("thai") => 0x0E50,
+                    _ if l.starts_with("lao") => 0x0ED0,
+                    _ if l.starts_with("tibetan") => 0x0F20,
+                    _ if l.starts_with("burmese") => 0x1040,
+                    _ if l.starts_with("khmer") => 0x17E0,
+                    _ => return c,
+                }
+            }
+        };
+        char::from_u32(zero + d).unwrap_or(c)
+    }
+}
+
+/// A tracked change on text.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ChangeMark {
+    #[default]
+    None,
+    Inserted,
+    Deleted,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", tag = "kind", content = "value")]
+pub enum Kerning {
+    #[default]
+    Metrics,
+    Optical,
+    /// Zero ("0" in the kerning menu).
+    None,
+    /// Manual pair kerning in 1/1000 em (applies after this character).
+    Manual(f64),
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Capitalization {
+    #[default]
+    Normal,
+    AllCaps,
+    SmallCaps,
+    OpenTypeAllSmallCaps,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Position {
+    #[default]
+    Normal,
+    Superscript,
+    Subscript,
+    OtSuperscript,
+    OtSubscript,
+    OtNumerator,
+    OtDenominator,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Align {
+    #[default]
+    Left,
+    Center,
+    Right,
+    LeftJustified,
+    CenterJustified,
+    RightJustified,
+    FullyJustified,
+    TowardsSpine,
+    AwayFromSpine,
+}
+
+impl Align {
+    pub fn is_justified(self) -> bool {
+        matches!(self, Align::LeftJustified | Align::CenterJustified | Align::RightJustified | Align::FullyJustified)
+    }
+    pub const ALL: [Align; 9] = [
+        Align::Left,
+        Align::Center,
+        Align::Right,
+        Align::LeftJustified,
+        Align::CenterJustified,
+        Align::RightJustified,
+        Align::FullyJustified,
+        Align::TowardsSpine,
+        Align::AwayFromSpine,
+    ];
+    pub fn label(self) -> &'static str {
+        match self {
+            Align::Left => "Align left",
+            Align::Center => "Align center",
+            Align::Right => "Align right",
+            Align::LeftJustified => "Justify with last line aligned left",
+            Align::CenterJustified => "Justify with last line aligned center",
+            Align::RightJustified => "Justify with last line aligned right",
+            Align::FullyJustified => "Justify all lines",
+            Align::TowardsSpine => "Align towards spine",
+            Align::AwayFromSpine => "Align away from spine",
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Composer {
+    /// Total-fit (Knuth–Plass) over the whole paragraph.
+    #[default]
+    Paragraph,
+    /// Greedy, line by line.
+    SingleLine,
+    /// The Japanese paragraph composer: total fit, with the CJK leading model and character
+    /// alignment.
+    Japanese,
+    /// The Japanese single-line composer.
+    JapaneseSingleLine,
+}
+
+impl Composer {
+    /// Breaks lines greedily, one at a time.
+    pub fn single_line(self) -> bool {
+        matches!(self, Composer::SingleLine | Composer::JapaneseSingleLine)
+    }
+
+    /// A Japanese composer: lines follow the leading model ([`crate::cjk::LeadingModel`]) and
+    /// characters their [`crate::cjk::CharacterAlignment`]. The others set lines baseline to
+    /// baseline with every character on the Roman baseline.
+    pub fn japanese(self) -> bool {
+        matches!(self, Composer::Japanese | Composer::JapaneseSingleLine)
+    }
+}
+
+/// What a nested style runs to (Drop Caps and Nested Styles).
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", tag = "kind", content = "chars")]
+pub enum NestedUntil {
+    Sentences,
+    #[default]
+    Words,
+    Characters,
+    Letters,
+    Digits,
+    Tab,
+    ForcedLineBreak,
+    EmSpace,
+    EnSpace,
+    /// The paragraph's drop cap characters.
+    Dropcap,
+    /// Any of these characters.
+    Chars(String),
+}
+
+/// A character style applied from the start of the paragraph through (or up to) the `count`-th
+/// delimiter; nested styles follow each other.
+/// A nested line style: `style` for the next `lines` lines.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct NestedLineStyle {
+    pub style: String,
+    pub lines: u32,
+}
+
+impl Default for NestedLineStyle {
+    fn default() -> Self {
+        NestedLineStyle { style: String::new(), lines: 1 }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct NestedStyle {
+    pub style: String,
+    /// Through (include the delimiter) or up to (stop before it).
+    pub through: bool,
+    pub count: u32,
+    pub until: NestedUntil,
+}
+
+impl Default for NestedStyle {
+    fn default() -> Self {
+        NestedStyle { style: String::new(), through: true, count: 1, until: NestedUntil::Words }
+    }
+}
+
+impl NestedStyle {
+    /// The drop cap's character style as a nested style: `style` through 1 drop cap.
+    pub fn drop_cap(style: &str) -> Self {
+        NestedStyle { style: style.into(), through: true, count: 1, until: NestedUntil::Dropcap }
+    }
+
+    /// Is this the form a drop cap's character style takes at the start of a nested style list?
+    pub fn is_drop_cap(&self) -> bool {
+        self.until == NestedUntil::Dropcap && self.through && self.count == 1
+    }
+}
+
+/// A character style applied to every match of a regular expression in the paragraph.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct GrepStyle {
+    pub style: String,
+    pub pattern: String,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum GridAlign {
+    #[default]
+    None,
+    AllLines,
+    FirstLineOnly,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum StartParagraph {
+    #[default]
+    Anywhere,
+    NextColumn,
+    NextFrame,
+    NextPage,
+    NextOddPage,
+    NextEvenPage,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", tag = "kind", content = "columns")]
+pub enum SpanColumns {
+    #[default]
+    Single,
+    /// Span `n` columns (0 = all).
+    Span(u32),
+    /// Split into `n` sub-columns.
+    Split(u32),
+}
diff --git a/crates/doc/src/attrs/language.rs b/crates/doc/src/attrs/language.rs
new file mode 100644
index 000000000..35ac044a1
--- /dev/null
+++ b/crates/doc/src/attrs/language.rs
@@ -0,0 +1,134 @@
+/// Does `c` belong to a script that capitalizes the first letter of sentences, words and headings?
+/// Georgian doesn't: Unicode maps Mkhedruli to Mtavruli capitals, but those are only for all-caps
+/// text, never for a sentence's, a title's or an index heading's first letter.
+pub fn capitalizes(c: char) -> bool {
+    !matches!(c, '\u{10A0}'..='\u{10FF}' | '\u{1C90}'..='\u{1CBF}' | '\u{2D00}'..='\u{2D2F}')
+}
+
+/// The BCP 47 tag of a language name as InDesign and IDML write it ("English: USA", "Chinese:
+/// Simplified", or a locale code such as "de_DE_2006"), for the shaper's localized forms (`locl`)
+/// and everything that depends on the language (quotes, hyphenation and spelling, line breaking,
+/// fallback fonts). A variant we don't know falls back to its language ("English: Australian" →
+/// `en`); an unknown language (or "[No Language]") has none. Case, punctuation and IDML's `$ID/`
+/// don't matter. Locale codes (`ll`, `ll_CC`, `ll-CC`, with a reform year after them as in
+/// `de_DE_2006`) are their tag (`de-DE`), and Chinese also goes by its other common spellings
+/// ("Simplified Chinese", "Chinese (Traditional)", "zh_CN", "zh-Hant").
+pub fn language_tag(language: &str) -> Option<&'static str> {
+    let language = language.trim();
+    let language = language.strip_prefix("$ID/").unwrap_or(language);
+    let l = language.to_lowercase();
+    let words: Vec<&str> = l.split(|c: char| !c.is_alphanumeric()).filter(|w| !w.is_empty()).collect();
+    let first = words.first().copied().unwrap_or("");
+    let has = |any: &[&str]| words.iter().any(|w| any.contains(w));
+    if first == "zh" || has(&["chinese"]) {
+        // The script decides; then the name; then the region.
+        return Some(if has(&["hans"]) {
+            "zh-Hans"
+        } else if has(&["hant"]) {
+            "zh-Hant"
+        } else if has(&["simplified", "cn", "sg"]) {
+            "zh-Hans"
+        } else if has(&["traditional", "tw", "hk", "mo"]) {
+            "zh-Hant"
+        } else {
+            "zh"
+        });
+    }
+    if let Some(tag) = locale_code(&words) {
+        return intern_tag(tag);
+    }
+    let variant = match words.join(" ").as_str() {
+        "english usa" => Some("en-US"),
+        "english uk" => Some("en-GB"),
+        "english canadian" => Some("en-CA"),
+        "german swiss 2006 reform" | "german swiss" => Some("de-CH"),
+        "french swiss" => Some("fr-CH"),
+        "italian swiss" => Some("it-CH"),
+        "spanish castilian" => Some("es-ES"),
+        "french canadian" => Some("fr-CA"),
+        "portuguese brazilian" => Some("pt-BR"),
+        "norwegian bokmål" | "norwegian bokmal" => Some("nb"),
+        "norwegian nynorsk" => Some("nn"),
+        _ => None,
+    };
+    if variant.is_some() {
+        return variant;
+    }
+    Some(match first {
+        "english" => "en",
+        "german" => "de",
+        "french" => "fr",
+        "spanish" => "es",
+        "catalan" => "ca",
+        "italian" => "it",
+        "portuguese" => "pt",
+        "dutch" => "nl",
+        "danish" => "da",
+        "swedish" => "sv",
+        "norwegian" => "no",
+        "finnish" => "fi",
+        "polish" => "pl",
+        "czech" => "cs",
+        "slovak" => "sk",
+        "hungarian" => "hu",
+        "romanian" => "ro",
+        "croatian" => "hr",
+        "lithuanian" => "lt",
+        "greek" => "el",
+        "russian" => "ru",
+        "ukrainian" => "uk",
+        "bulgarian" => "bg",
+        "serbian" => "sr",
+        "macedonian" => "mk",
+        "turkish" => "tr",
+        "japanese" => "ja",
+        "korean" => "ko",
+        "arabic" => "ar",
+        "persian" | "farsi" => "fa",
+        "urdu" => "ur",
+        "hebrew" => "he",
+        "georgian" => "ka",
+        _ => return None,
+    })
+}
+
+/// The tag of a locale code split into lowercase `words`: a language (2 or 3 letters), then
+/// optionally a region (2 letters or 3 digits) and a reform year (4 digits) → `ll` or `ll-CC`.
+fn locale_code(words: &[&str]) -> Option<String> {
+    let letters = |w: &str, n: std::ops::RangeInclusive<usize>| n.contains(&w.len()) && w.bytes().all(|b| b.is_ascii_lowercase());
+    let digits = |w: &str, n: usize| w.len() == n && w.bytes().all(|b| b.is_ascii_digit());
+    match *words {
+        [lang] if letters(lang, 2..=3) => Some(lang.to_string()),
+        [lang, region] | [lang, region, _] if letters(lang, 2..=3) && (letters(region, 2..=2) || digits(region, 3)) => {
+            if let [_, _, year] = *words
+                && !digits(year, 4)
+            {
+                return None;
+            }
+            Some(format!("{lang}-{}", region.to_ascii_uppercase()))
+        }
+        _ => None,
+    }
+}
+
+/// `tag` as a `&'static str`: each distinct tag is kept once for the process. Language names come
+/// from documents, so at most [`MAX_TAGS`] are kept; past that a new tag is unknown (`None`).
+fn intern_tag(tag: String) -> Option<&'static str> {
+    const MAX_TAGS: usize = 512;
+    static TAGS: std::sync::Mutex<Vec<&str>> = std::sync::Mutex::new(Vec::new());
+    let mut tags = TAGS.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+    if let Some(t) = tags.iter().find(|t| **t == tag) {
+        return Some(t);
+    }
+    if tags.len() >= MAX_TAGS {
+        return None;
+    }
+    let t: &'static str = Box::leak(tag.into_boxed_str());
+    tags.push(t);
+    Some(t)
+}
+
+/// The language subtag of a BCP 47 tag (`de-DE` → `de`, `zh-Hant` → `zh`).
+pub fn language_subtag(tag: &str) -> &str {
+    tag.split('-').next().unwrap_or(tag)
+}
diff --git a/crates/doc/src/attrs/para_attrs.rs b/crates/doc/src/attrs/para_attrs.rs
new file mode 100644
index 000000000..17edc8cc1
--- /dev/null
+++ b/crates/doc/src/attrs/para_attrs.rs
@@ -0,0 +1,254 @@
+use super::{
+    Align, BoxBottom, BoxTop, BoxWidth, Composer, Deserialize, GrepStyle, GridAlign, ListAlign, ListCounter, ListType, MAX_TAB_STOPS,
+    NestedLineStyle, NestedStyle, NumberStyle, Rule, Serialize, SpanColumns, StartParagraph, TabStop, TextDirection, attr_key,
+    deserialize_explicit_value, expand_list_levels, expand_list_text, list_level_index, sanitized_tabs, unknown_attribute,
+};
+
+attr_set! {
+    /// Paragraph attributes (Paragraph panel / paragraph styles).
+    ParaAttrs / ParaProps {
+        align: Align = Align::Left,
+        /// Paragraph Direction (World-Ready): the base direction lines are ordered in.
+        direction: TextDirection = TextDirection::LeftToRight,
+        left_indent: f64 = 0.0,
+        right_indent: f64 = 0.0,
+        first_line_indent: f64 = 0.0,
+        last_line_indent: f64 = 0.0,
+        space_before: f64 = 0.0,
+        space_after: f64 = 0.0,
+        /// Space between consecutive paragraphs of the same style; replaces space after/before there (None = ignore).
+        same_para_style_spacing: Option<f64> = None => "deserialize_explicit_value",
+        /// Drop cap: the paragraph's first `drop_cap_chars` characters (code points, never
+        /// splitting a base from its combining marks) set `drop_cap_lines` lines tall, in the
+        /// character style `drop_cap_style` ("" or `[None]`: the text's own formatting).
+        drop_cap_lines: u32 = 0,
+        drop_cap_chars: u32 = 0,
+        drop_cap_style: String = String::new(),
+        /// Align Left Edge: the drop cap's ink starts at the indent (its first letter's left side
+        /// bearing is taken off), and the lines beside it start where its advance ends.
+        drop_cap_align_left: bool = true,
+        /// Scale for Descenders (kept and round-tripped; doesn't change the layout).
+        drop_cap_scale_descenders: bool = false,
+        /// Nested styles, in order from the paragraph start.
+        nested_styles: Vec<NestedStyle> = Vec::new(),
+        /// GREP styles: a character style for every match of a pattern (applied after nested).
+        grep_styles: Vec<GrepStyle> = Vec::new(),
+        /// Nested line styles: a character style for the paragraph's first lines, in order.
+        nested_line_styles: Vec<NestedLineStyle> = Vec::new(),
+        grid_align: GridAlign = GridAlign::None,
+        composer: Composer = Composer::Paragraph,
+        // Hyphenation
+        hyphenate: bool = true,
+        hyph_min_word: u32 = 5,
+        hyph_after_first: u32 = 2,
+        hyph_before_last: u32 = 2,
+        /// Max consecutive hyphenated lines (0 = unlimited).
+        hyph_limit: u32 = 3,
+        hyph_zone: f64 = 36.0,
+        hyph_capitalized: bool = true,
+        hyph_last_word: bool = true,
+        hyph_across_column: bool = true,
+        /// Better spacing (0) ↔ fewer hyphens (1).
+        hyph_weight: f64 = 0.5,
+        // Justification (percent as fractions)
+        word_space_min: f64 = 0.8,
+        word_space_desired: f64 = 1.0,
+        word_space_max: f64 = 1.33,
+        letter_space_min: f64 = 0.0,
+        letter_space_desired: f64 = 0.0,
+        letter_space_max: f64 = 0.0,
+        glyph_scale_min: f64 = 1.0,
+        glyph_scale_desired: f64 = 1.0,
+        glyph_scale_max: f64 = 1.0,
+        auto_leading: f64 = 1.2,
+        single_word_justify: Align = Align::FullyJustified,
+        /// Insert Kashidas (World-Ready): justified Arabic lines stretch at joins before spaces.
+        kashidas: bool = true,
+        /// Preserved vendor policy; non-default policies require a dedicated composer.
+        arabic_justification: String = String::new(),
+        paragraph_kashida_width: Option<f64> = None => "deserialize_explicit_value",
+        /// Korean text breaks between any two syllables (character-based breaking); otherwise
+        /// it breaks at spaces, word by word.
+        korean_char_breaks: bool = false,
+        // Keeps
+        keep_with_next: u32 = 0,
+        keep_lines_together: bool = false,
+        /// All lines in paragraph (true) or at start/end of paragraph (false).
+        keep_all_lines: bool = false,
+        keep_first: u32 = 2,
+        keep_last: u32 = 2,
+        start_paragraph: StartParagraph = StartParagraph::Anywhere,
+        span_columns: SpanColumns = SpanColumns::Single,
+        /// Split Columns: the space between sub-columns and the inset from the column's edges.
+        split_inside_gutter: f64 = 6.0,
+        split_outside_gutter: f64 = 0.0,
+        rule_above: Rule = Rule::default(),
+        rule_below: Rule = Rule::default(),
+        #[serde(deserialize_with = "sanitized_tabs")]
+        tabs: Vec<TabStop> = Vec::new(),
+        list_type: ListType = ListType::None,
+        /// Named list (Define Lists) the numbers belong to ("" = the story's own list).
+        list_name: String = String::new(),
+        /// Start At: restart the numbering at this number.
+        start_at: Option<u32> = None => "deserialize_explicit_value",
+        bullet_char: String = "\u{2022}".into(),
+        number_style: NumberStyle = NumberStyle::Arabic,
+        /// A numbered paragraph's label: `^#` is the number, other metacharacters expand as in
+        /// [`expand_list_text`].
+        number_expression: String = "^#.^t".into(),
+        /// Text after the bullet (metacharacters expand as in [`expand_list_text`]).
+        list_separator: String = "\t".into(),
+        /// The hanging indent was set by the Bulleted or Numbered List button, which takes it away
+        /// again with the list (an indent the paragraph had before stays).
+        list_hang: bool = false,
+        balance_ragged: bool = false,
+        /// Hang punctuation outside the measure in this paragraph, at each character's own size
+        /// (DesignCraft's own per-paragraph switch; a story with Optical Margin Alignment on
+        /// overrides it with the story's size).
+        optical_margin: bool = false,
+        /// Ignore Optical Margin: no hang in this paragraph, whatever the story or
+        /// `optical_margin` say.
+        ignore_optical_margin: bool = false,
+        /// None uses the legacy built-in rules; an empty set explicitly disables kinsoku.
+        kinsoku: Option<crate::cjk::Kinsoku> = None => "deserialize_explicit_value",
+        /// Preserved spacing-table reference; compatibility audit reports unsupported composition.
+        mojikumi: String = String::new(),
+        /// Preserved priority policy; the current breaker does not implement these priorities.
+        kinsoku_type: String = String::new(),
+        kinsoku_hang: crate::cjk::KinsokuHang = crate::cjk::KinsokuHang::None,
+        bunri_kinshi: bool = false,
+        rensuuji: bool = true,
+        treat_ideographic_space_as_space: bool = false,
+        // Auto Tate-chu-yoko, Japanese Composition and Grid Settings.
+        /// Auto tate-chu-yoko: in vertical text, runs of up to this many half-width digits are set
+        /// across one em (0 = off).
+        auto_tcy: u32 = 0,
+        /// Auto tate-chu-yoko also takes runs of half-width roman letters.
+        auto_tcy_include_roman: bool = false,
+        /// Rotate Roman Characters in Vertical Text (縦組み中の欧文回転): half-width characters
+        /// stand upright one by one instead of lying along the line.
+        rotate_roman: bool = false,
+        /// Roman word break (欧文泣き別れ): roman words may break between any two letters,
+        /// without a hyphen.
+        roman_word_break: bool = false,
+        /// The point of a line that sits on the grid while `grid_align` is on.
+        grid_reference: crate::cjk::CharacterAlignment = crate::cjk::CharacterAlignment::Baseline,
+        /// Gyoudori (行取り): grid lines each line takes (0 = as many as its leading needs).
+        grid_gyoudori: u32 = 0,
+        /// Paragraph gyoudori: the paragraph as a whole, not each line, takes `grid_gyoudori` lines.
+        paragraph_gyoudori: bool = false,
+        /// Paragraph shading, and how far it reaches past the text: top, left, bottom, right.
+        shading_on: bool = false,
+        shading_color: String = "[Black]".into(),
+        shading_tint: f32 = 0.2,
+        shading_offsets: [f64; 4] = [0.0; 4],
+        /// Paragraph border: stroke weights (top, left, bottom, right), colour, and offsets past the
+        /// text (top, left, bottom, right).
+        border_on: bool = false,
+        border_weights: [f64; 4] = [1.0; 4],
+        border_color: String = "[Black]".into(),
+        border_tint: f32 = 1.0,
+        border_offsets: [f64; 4] = [0.0; 4],
+        /// The border's stroke type (a document stroke style by name, or a built-in type), cap and
+        /// join.
+        border_type: crate::item::StrokeType = crate::item::StrokeType::Solid,
+        border_cap: crate::item::Cap = crate::item::Cap::Butt,
+        border_join: crate::item::Join = crate::item::Join::Miter,
+        /// Corner shape and size: top left, top right, bottom right, bottom left.
+        border_corners: [designcraft_geom::corners::Corner; 4] = [designcraft_geom::corners::Corner::default(); 4],
+        border_width: BoxWidth = BoxWidth::Column,
+        border_top: BoxTop = BoxTop::Ascent,
+        border_bottom: BoxBottom = BoxBottom::Descent,
+        /// A paragraph split across frames or columns gets a closed box in each part (otherwise the
+        /// box is open where it splits).
+        border_display_if_splits: bool = false,
+        /// Consecutive paragraphs with the same border and shading share one box.
+        border_merge: bool = true,
+        /// The colour between the dashes, dots or stripes of a border that isn't solid.
+        border_gap_color: String = "[None]".into(),
+        border_gap_tint: f32 = 1.0,
+        /// Shading corners: top left, top right, bottom right, bottom left.
+        shading_corners: [designcraft_geom::corners::Corner; 4] = [designcraft_geom::corners::Corner::default(); 4],
+        shading_width: BoxWidth = BoxWidth::Column,
+        shading_top: BoxTop = BoxTop::Ascent,
+        shading_bottom: BoxBottom = BoxBottom::Descent,
+        /// The shading stops at the edges of the text frame.
+        shading_clip: bool = false,
+        /// The shading shows on screen only: not printed or exported.
+        shading_nonprinting: bool = false,
+        /// Least space between a spanning or split paragraph and the column text above and below it.
+        span_space_before: f64 = 0.0,
+        span_space_after: f64 = 0.0,
+        /// List level (1–9): each level numbers on its own, and `^1`…`^9` in a number's text are the
+        /// current numbers of those levels.
+        list_level: u32 = 1,
+        /// Character styles of the bullet and of the number.
+        bullet_char_style: String = crate::story::NO_CHAR_STYLE.into(),
+        number_char_style: String = crate::story::NO_CHAR_STYLE.into(),
+        bullet_align: ListAlign = ListAlign::Left,
+        number_align: ListAlign = ListAlign::Left,
+        /// A tab stop for the text after the bullet or number, from the column's left edge.
+        list_tab: Option<f64> = None,
+        /// Restart Numbers at This Level After: a paragraph at a higher level (0 = any; otherwise
+        /// that level) starts this level's numbering again.
+        restart_numbers: bool = true,
+        restart_after_level: u32 = 0,
+        /// The bullet's font family and style ("" = the paragraph's).
+        bullet_font: String = String::new(),
+        bullet_font_style: String = String::new(),
+    }
+}
+
+impl ParaAttrs {
+    /// [`set_json`](Self::set_json), except that a `ruleAbove` / `ruleBelow` object names only the
+    /// rule fields to change; the others keep their values in `current` (the resolved attributes
+    /// of the paragraph or style being edited). A `tabs` list is checked and sorted as
+    /// [`TabStop::checked_list`] does.
+    pub fn set_json_over(&mut self, key: &str, value: &serde_json::Value, current: &ParaProps) -> Result<(), String> {
+        let rule = match key.chars().filter(|c| *c != '_').collect::<String>().to_ascii_lowercase().as_str() {
+            "ruleabove" => &current.rule_above,
+            "rulebelow" => &current.rule_below,
+            "tabs" if !value.is_null() => {
+                // Count before deserializing: the list may be arbitrarily long.
+                if value.as_array().is_some_and(|a| a.len() > MAX_TAB_STOPS) {
+                    return Err(format!("{key}: a paragraph holds at most {MAX_TAB_STOPS} tab stops"));
+                }
+                let tabs: Vec<TabStop> = serde_json::from_value(value.clone()).map_err(|e| format!("{key}: {e}"))?;
+                self.tabs = Some(TabStop::checked_list(tabs).map_err(|e| format!("{key}: {e}"))?);
+                return Ok(());
+            }
+            _ => return self.set_json(key, value),
+        };
+        let serde_json::Value::Object(patch) = value else { return self.set_json(key, value) };
+        let mut merged = serde_json::to_value(rule).map_err(|e| format!("{key}: {e}"))?;
+        let serde_json::Value::Object(fields) = &mut merged else { return Err(format!("{key}: not an object")) };
+        for (k, v) in patch {
+            if !fields.contains_key(k) {
+                return Err(format!("{key}: unknown rule field `{k}`"));
+            }
+            fields.insert(k.clone(), v.clone());
+        }
+        self.set_json(key, &merged)
+    }
+}
+
+impl ParaProps {
+    /// The label of a numbered paragraph with number `n`.
+    pub fn number_label(&self, n: u32) -> String {
+        expand_list_text(&self.number_expression, &self.number_style.format(n))
+    }
+
+    /// The label of a numbered paragraph that `list` has just numbered ([`ListCounter::advance`]).
+    pub fn number_label_in(&self, list: &ListCounter) -> String {
+        let level = list_level_index(self.list_level);
+        let number = list.labels.get(level).map_or("", String::as_str);
+        expand_list_levels(&self.number_expression, number, &list.labels)
+    }
+
+    /// The label of a bulleted paragraph.
+    pub fn bullet_label(&self) -> String {
+        let mut s: String = self.bullet_char.chars().filter(|c| *c != '\n' && *c != '\r').collect();
+        s.push_str(&expand_list_text(&self.list_separator, ""));
+        s
+    }
+}
diff --git a/crates/doc/src/attrs/rules_lists.rs b/crates/doc/src/attrs/rules_lists.rs
new file mode 100644
index 000000000..f4ef952e4
--- /dev/null
+++ b/crates/doc/src/attrs/rules_lists.rs
@@ -0,0 +1,285 @@
+use super::{Deserialize, ParaProps, Serialize};
+
+/// The colour of a paragraph rule that follows the paragraph's text colour.
+pub const TEXT_COLOR: &str = "Text Color";
+
+/// A paragraph rule (Rule Above / Rule Below).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(default, rename_all = "camelCase")]
+pub struct Rule {
+    pub on: bool,
+    pub weight: f64,
+    /// A swatch, or [`TEXT_COLOR`].
+    pub color: String,
+    pub tint: f32,
+    /// Width: column (true) or text (false).
+    pub column_width: bool,
+    pub offset: f64,
+    pub left_indent: f64,
+    pub right_indent: f64,
+}
+
+impl Default for Rule {
+    fn default() -> Self {
+        Rule { on: false, weight: 1.0, color: TEXT_COLOR.into(), tint: 1.0, column_width: true, offset: 0.0, left_indent: 0.0, right_indent: 0.0 }
+    }
+}
+
+/// How wide a paragraph border or shading box is: the column, or the text's longest line.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum BoxWidth {
+    #[default]
+    Column,
+    Text,
+}
+
+/// Where a paragraph border or shading box starts above the first line (before its top offset).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum BoxTop {
+    /// The tallest ascent on the line.
+    #[default]
+    Ascent,
+    Baseline,
+    /// The top of the em box.
+    EmBox,
+    /// The top of the line's leading.
+    Leading,
+}
+
+/// Where a paragraph border or shading box ends below the last line (before its bottom offset).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum BoxBottom {
+    /// The deepest descent on the line.
+    #[default]
+    Descent,
+    Baseline,
+    /// The bottom of the em box.
+    EmBox,
+}
+
+/// Where a bullet or number sits against the first line's start (the left and first-line
+/// indents): it starts there, is centred on it, or ends there.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ListAlign {
+    #[default]
+    Left,
+    Center,
+    Right,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ListType {
+    #[default]
+    None,
+    Bullets,
+    Numbers,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum NumberStyle {
+    #[default]
+    Arabic,
+    UpperRoman,
+    LowerRoman,
+    UpperLetters,
+    LowerLetters,
+    /// 01, 02, …
+    ArabicLeadingZero,
+    /// 001, 002, …
+    ArabicThreeDigits,
+    /// 0001, 0002, …
+    ArabicFourDigits,
+    /// *, †, ‡, §, ¶, ‖, then doubled (**, ††, …): footnotes.
+    Symbols,
+    /// 一, 二, 三, …: Chinese numerals written digit by digit, so 10 is 一〇 and 38 is 三八.
+    Kanji,
+}
+
+/// Numbers past this are written in Arabic digits by the styles that repeat characters (roman
+/// numerals, letters, symbols), so a hostile start number can't build a huge label.
+const MAX_REPEATED_FORM: u32 = 3999;
+
+impl NumberStyle {
+    pub fn format(self, n: u32) -> String {
+        if n > MAX_REPEATED_FORM
+            && matches!(
+                self,
+                NumberStyle::UpperRoman | NumberStyle::LowerRoman | NumberStyle::UpperLetters | NumberStyle::LowerLetters | NumberStyle::Symbols
+            )
+        {
+            return n.to_string();
+        }
+        match self {
+            NumberStyle::Arabic => n.to_string(),
+            NumberStyle::ArabicLeadingZero => format!("{n:02}"),
+            NumberStyle::ArabicThreeDigits => format!("{n:03}"),
+            NumberStyle::ArabicFourDigits => format!("{n:04}"),
+            NumberStyle::UpperRoman => roman(n),
+            NumberStyle::LowerRoman => roman(n).to_lowercase(),
+            NumberStyle::UpperLetters => letters(n),
+            NumberStyle::LowerLetters => letters(n).to_lowercase(),
+            NumberStyle::Symbols => {
+                const SYM: [char; 6] = ['*', '†', '‡', '§', '¶', '‖'];
+                let n = n.max(1) as usize - 1;
+                std::iter::repeat_n(SYM[n % SYM.len()], n / SYM.len() + 1).collect()
+            }
+            NumberStyle::Kanji => kanji_digits(n),
+        }
+    }
+}
+
+/// Expand the metacharacters of a list's label text (`^t` tab, `^>` en space, `^^` caret, …),
+/// putting `number` in for `^#`. Level placeholders (`^1`…`^9`) and metacharacters with no
+/// meaning in a label are dropped; a label never holds a paragraph break.
+pub fn expand_list_text(s: &str, number: &str) -> String {
+    expand_list_levels(s, number, &[])
+}
+
+/// [`expand_list_text`] with `levels[k]` in for `^1`…`^9` (level k + 1's current number; a level
+/// past the end is dropped).
+pub fn expand_list_levels(s: &str, number: &str, levels: &[String]) -> String {
+    let mut out = String::with_capacity(s.len() + number.len());
+    let mut it = s.chars();
+    while let Some(c) = it.next() {
+        if c != '^' {
+            if c != '\n' && c != '\r' {
+                out.push(c);
+            }
+            continue;
+        }
+        let Some(m) = it.next() else {
+            out.push('^');
+            break;
+        };
+        let r = match m {
+            '#' => {
+                out.push_str(number);
+                continue;
+            }
+            d @ '1'..='9' => {
+                let k = d as usize - '1' as usize;
+                if let Some(l) = levels.get(k) {
+                    out.push_str(l);
+                }
+                continue;
+            }
+            '^' => '^',
+            't' => '\t',
+            'y' => crate::story::RIGHT_INDENT_TAB,
+            'i' => crate::story::INDENT_HERE,
+            'n' => crate::story::FORCED_LINE_BREAK,
+            'm' => '\u{2003}',
+            '>' => '\u{2002}',
+            'f' => '\u{2001}',
+            '|' => '\u{200A}',
+            '<' => '\u{2009}',
+            '/' => '\u{2007}',
+            '.' => '\u{2008}',
+            's' => '\u{A0}',
+            'S' => '\u{202F}',
+            '_' => '\u{2014}',
+            '=' => '\u{2013}',
+            '~' => '\u{2011}',
+            '{' => '\u{201C}',
+            '}' => '\u{201D}',
+            '[' => '\u{2018}',
+            ']' => '\u{2019}',
+            '"' => '"',
+            '\'' => '\'',
+            _ => continue,
+        };
+        out.push(r);
+    }
+    out
+}
+
+fn kanji_digits(n: u32) -> String {
+    const DIGITS: [char; 10] = ['〇', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
+    n.to_string().chars().map(|c| c.to_digit(10).and_then(|d| DIGITS.get(d as usize)).copied().unwrap_or(c)).collect()
+}
+
+fn roman(mut n: u32) -> String {
+    if n == 0 {
+        return "0".into();
+    }
+    let t = [
+        (1000, "M"),
+        (900, "CM"),
+        (500, "D"),
+        (400, "CD"),
+        (100, "C"),
+        (90, "XC"),
+        (50, "L"),
+        (40, "XL"),
+        (10, "X"),
+        (9, "IX"),
+        (5, "V"),
+        (4, "IV"),
+        (1, "I"),
+    ];
+    let mut s = String::new();
+    for (v, r) in t {
+        while n >= v {
+            s.push_str(r);
+            n -= v;
+        }
+    }
+    s
+}
+
+/// A, B, …, Z, AA, BB, … (InDesign's letter numbering repeats the letter).
+fn letters(n: u32) -> String {
+    if n == 0 {
+        return String::new();
+    }
+    let i = (n - 1) % 26;
+    let reps = (n - 1) / 26 + 1;
+    std::iter::repeat_n(char::from(b'A' + i as u8), reps as usize).collect()
+}
+
+/// Levels a list can have.
+pub const LIST_LEVELS: usize = 9;
+
+/// Index (0-based) of list level `level` (1-based, clamped to 1–[`LIST_LEVELS`]).
+pub(super) fn list_level_index(level: u32) -> usize {
+    (level.clamp(1, LIST_LEVELS as u32) - 1) as usize
+}
+
+/// The numbering of one list as it goes: each level's last number and its text, and when each
+/// level last numbered a paragraph (for Restart Numbers at This Level After).
+#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
+pub struct ListCounter {
+    numbers: [u32; LIST_LEVELS],
+    pub(super) labels: [String; LIST_LEVELS],
+    seen: [u64; LIST_LEVELS],
+    tick: u64,
+}
+
+impl ListCounter {
+    /// Number the next paragraph of `pp` (a numbered paragraph with text) and return its number.
+    pub fn advance(&mut self, pp: &ParaProps) -> u32 {
+        let l = list_level_index(pp.list_level);
+        self.tick = self.tick.saturating_add(1);
+        let since = self.seen[l];
+        let restart = pp.restart_numbers
+            && match pp.restart_after_level {
+                0 => self.seen[..l].iter().any(|&t| t > since),
+                m => (m as usize) <= l && self.seen.get(m as usize - 1).is_some_and(|&t| t > since),
+            };
+        let n = match pp.start_at {
+            Some(s) => s.max(1),
+            None if restart => 1,
+            None => self.numbers[l].saturating_add(1),
+        };
+        self.numbers[l] = n;
+        self.labels[l] = pp.number_style.format(n);
+        self.seen[l] = self.tick;
+        n
+    }
+}
diff --git a/crates/doc/src/attrs/tabs.rs b/crates/doc/src/attrs/tabs.rs
new file mode 100644
index 000000000..b30299bd5
--- /dev/null
+++ b/crates/doc/src/attrs/tabs.rs
@@ -0,0 +1,181 @@
+use super::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum TabAlign {
+    #[default]
+    Left,
+    Center,
+    Right,
+    /// Align on a character (default `.`).
+    Char,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TabStop {
+    /// A file that held a non-finite position (written as `null`) reads it back as NaN, which
+    /// [`TabStop::sanitized_list`] drops.
+    #[serde(deserialize_with = "position_or_nan")]
+    pub position: f64,
+    #[serde(default)]
+    pub align: TabAlign,
+    #[serde(default, skip_serializing_if = "String::is_empty")]
+    pub leader: String,
+    #[serde(default, skip_serializing_if = "String::is_empty")]
+    pub align_on: String,
+}
+
+/// Most stops a paragraph holds.
+pub const MAX_TAB_STOPS: usize = 100;
+
+/// Furthest stop position: 216 in, the largest page.
+pub const MAX_TAB_POSITION: f64 = 15_552.0;
+
+/// Longest leader, in characters.
+pub const MAX_TAB_LEADER: usize = 8;
+
+/// Stops closer than this share a position.
+pub const SAME_TAB_POSITION: f64 = 0.01;
+
+/// Smallest type size the engine accepts, in points.
+pub const MIN_TYPE_SIZE: f64 = 0.1;
+
+/// Largest type size the engine accepts, in points, as InDesign's own field allows.
+pub const MAX_TYPE_SIZE: f64 = 1296.0;
+
+/// Largest measure an imported indent, spacing or offset can carry, in points: the furthest tab
+/// stop, which is the widest page.
+pub const MAX_MEASURE: f64 = MAX_TAB_POSITION;
+
+/// A type size read from a file, or `None` when it is not a size the engine can mean.
+///
+/// A file can hold any number, including `NaN`, `inf`, `0`, a negative or `1e300`. Every importer
+/// had its own spelling of this test, or only checked that the value was finite -- so tagged text
+/// took `<cSize:1e300>` and set a 1e300 pt size on the text (#1593). A size outside the range is
+/// dropped rather than clamped, so the text keeps the size its style gives it.
+pub fn imported_type_size(pt: f64) -> Option<f64> {
+    (pt.is_finite() && (MIN_TYPE_SIZE..=MAX_TYPE_SIZE).contains(&pt)).then_some(pt)
+}
+
+/// An indent, spacing or offset read from a file, clamped to ±[`MAX_MEASURE`]; `None` when the
+/// value is not finite.
+///
+/// Unlike a type size this is clamped rather than dropped: a file that says "indent everything"
+/// still indents to the widest page the engine has, where dropping the value would quietly
+/// restore the style's own indent and hide what the file asked for (#1593).
+pub fn imported_measure(pt: f64) -> Option<f64> {
+    pt.is_finite().then(|| pt.clamp(-MAX_MEASURE, MAX_MEASURE))
+}
+
+impl TabStop {
+    /// A finite position clamped to `0..=MAX_TAB_POSITION`.
+    pub fn clamp_position(v: f64) -> Result<f64, String> {
+        if v.is_finite() { Ok(v.clamp(0.0, MAX_TAB_POSITION)) } else { Err("position must be a finite number".into()) }
+    }
+
+    /// A leader: up to [`MAX_TAB_LEADER`] characters, no control characters.
+    pub fn check_leader(v: &str) -> Result<(), String> {
+        if v.chars().count() > MAX_TAB_LEADER || v.chars().any(char::is_control) {
+            return Err(format!("`leader`: at most {MAX_TAB_LEADER} printable characters"));
+        }
+        Ok(())
+    }
+
+    /// An align-on character: one printable character or none (a decimal point).
+    pub fn check_align_on(v: &str) -> Result<(), String> {
+        if v.chars().count() > 1 || v.chars().any(char::is_control) {
+            return Err("`alignOn`: one printable character".into());
+        }
+        Ok(())
+    }
+
+    /// A tab-stop list as the Tabs commands keep it: at most [`MAX_TAB_STOPS`] stops, positions
+    /// clamped, leaders and align-on characters checked, a char stop aligning on `.` unless it
+    /// names a character, sorted by position, and one stop per position (the later one wins).
+    pub fn checked_list(mut tabs: Vec<TabStop>) -> Result<Vec<TabStop>, String> {
+        if tabs.len() > MAX_TAB_STOPS {
+            return Err(format!("a paragraph holds at most {MAX_TAB_STOPS} tab stops"));
+        }
+        for t in &mut tabs {
+            t.position = Self::clamp_position(t.position)?;
+            Self::check_leader(&t.leader)?;
+            Self::check_align_on(&t.align_on)?;
+        }
+        Ok(Self::normalized(tabs))
+    }
+
+    /// A tab-stop list read from a file, repaired to what [`checked_list`](Self::checked_list)
+    /// accepts: stops with a non-finite position dropped, positions clamped, control characters
+    /// removed from leaders and align-on characters and both cut to their limits, sorted, one stop
+    /// per position (the later one wins), and the first [`MAX_TAB_STOPS`] by position kept.
+    pub fn sanitized_list(tabs: Vec<TabStop>) -> Vec<TabStop> {
+        let tabs = tabs
+            .into_iter()
+            .filter_map(|mut t| {
+                t.position = Self::clamp_position(t.position).ok()?;
+                if Self::check_leader(&t.leader).is_err() {
+                    t.leader = t.leader.chars().filter(|c| !c.is_control()).take(MAX_TAB_LEADER).collect();
+                }
+                if Self::check_align_on(&t.align_on).is_err() {
+                    t.align_on = t.align_on.chars().filter(|c| !c.is_control()).take(1).collect();
+                }
+                Some(t)
+            })
+            .collect();
+        let mut out = Self::normalized(tabs);
+        out.truncate(MAX_TAB_STOPS);
+        out
+    }
+
+    /// Finite, clamped stops sorted by position, one per position: of stops closer than
+    /// [`SAME_TAB_POSITION`], the later one in `tabs` wins. A char stop with no character aligns
+    /// on `.`.
+    fn normalized(tabs: Vec<TabStop>) -> Vec<TabStop> {
+        let mut stops: Vec<(usize, TabStop)> = tabs.into_iter().enumerate().collect();
+        stops.sort_by(|a, b| a.1.position.total_cmp(&b.1.position));
+        let mut out: Vec<(usize, TabStop)> = Vec::with_capacity(stops.len());
+        for (i, mut t) in stops {
+            if t.align == TabAlign::Char && t.align_on.is_empty() {
+                t.align_on = ".".into();
+            }
+            match out.last_mut() {
+                Some(last) if t.position - last.1.position < SAME_TAB_POSITION => {
+                    if i > last.0 {
+                        *last = (i, t);
+                    }
+                }
+                _ => out.push((i, t)),
+            }
+        }
+        out.into_iter().map(|(_, t)| t).collect()
+    }
+}
+
+/// A stop's position; `null` (how JSON writes a non-finite number) reads as NaN.
+fn position_or_nan<'de, D: serde::Deserializer<'de>>(d: D) -> Result<f64, D::Error> {
+    Ok(Option::<f64>::deserialize(d)?.unwrap_or(f64::NAN))
+}
+
+/// A paragraph's tab-stop list in either attribute form, as read from a file.
+pub(super) trait FileTabs: Sized {
+    fn sanitized(self) -> Self;
+}
+
+impl FileTabs for Vec<TabStop> {
+    fn sanitized(self) -> Self {
+        TabStop::sanitized_list(self)
+    }
+}
+
+impl FileTabs for Option<Vec<TabStop>> {
+    fn sanitized(self) -> Self {
+        self.map(TabStop::sanitized_list)
+    }
+}
+
+/// Deserializes a `tabs` field through [`TabStop::sanitized_list`]: a saved document's tab lists
+/// get the limits the Tabs commands keep.
+pub(super) fn sanitized_tabs<'de, D: serde::Deserializer<'de>, T: Deserialize<'de> + FileTabs>(d: D) -> Result<T, D::Error> {
+    T::deserialize(d).map(FileTabs::sanitized)
+}
diff --git a/crates/doc/src/attrs/tests.rs b/crates/doc/src/attrs/tests.rs
new file mode 100644
index 000000000..068fbaee8
--- /dev/null
+++ b/crates/doc/src/attrs/tests.rs
@@ -0,0 +1,316 @@
+use super::*;
+
+/// #777: an unknown attribute names the nearest one, or lists them all.
+#[test]
+fn unknown_attributes_suggest_the_right_name() {
+    let mut c = CharAttrs::default();
+    assert_eq!(c.set_json("font", &serde_json::json!("X")).unwrap_err(), "unknown attribute `font`; did you mean `fontFamily`?");
+    assert_eq!(c.set_json("fontFamly", &serde_json::json!("X")).unwrap_err(), "unknown attribute `fontFamly`; did you mean `fontFamily`?");
+    let all = c.set_json("zzzzzz", &serde_json::json!(1)).unwrap_err();
+    assert!(all.starts_with("unknown attribute `zzzzzz`; the attributes are: ") && all.contains("fontFamily") && all.contains("fontStyle"), "{all}");
+    assert!(c.set_json("font_family", &serde_json::json!("X")).is_ok() && c.set_json("fontFamily", &serde_json::json!("X")).is_ok());
+    let mut p = ParaAttrs::default();
+    assert_eq!(p.set_json("spaceBefor", &serde_json::json!(3)).unwrap_err(), "unknown attribute `spaceBefor`; did you mean `spaceBefore`?");
+    assert_eq!(camel("first_line_indent"), "firstLineIndent");
+}
+
+#[test]
+fn levels_number_on_their_own_and_restart_after_a_higher_level() {
+    let at = |level: u32| ParaProps { list_type: ListType::Numbers, list_level: level, number_expression: "^1.^#".into(), ..ParaProps::default() };
+    let mut c = ListCounter::default();
+    let mut labels = vec![];
+    for level in [1, 2, 2, 1, 2] {
+        let pp = at(level);
+        c.advance(&pp);
+        labels.push(pp.number_label_in(&c));
+    }
+    assert_eq!(labels, ["1.1", "1.1", "1.2", "2.2", "2.1"]);
+    // Without the restart, level 2 carries on.
+    let mut c = ListCounter::default();
+    let keep = |level: u32| ParaProps { restart_numbers: false, ..at(level) };
+    let n: Vec<u32> = [1, 2, 1, 2].into_iter().map(|l| c.advance(&keep(l))).collect();
+    assert_eq!(n, [1, 1, 2, 2]);
+}
+
+#[test]
+fn a_partial_rule_keeps_the_other_fields() {
+    let current = ParaProps {
+        rule_below: Rule { on: true, weight: 3.0, color: "Red".into(), offset: 4.0, column_width: false, ..Rule::default() },
+        ..ParaProps::default()
+    };
+    let mut a = ParaAttrs::default();
+    a.set_json_over("ruleBelow", &serde_json::json!({"color": "Blue"}), &current).unwrap();
+    assert_eq!(a.rule_below, Some(Rule { color: "Blue".into(), ..current.rule_below.clone() }));
+    assert_eq!(a.rule_above, None);
+    assert!(a.set_json_over("ruleAbove", &serde_json::json!({"colour": "Blue"}), &current).is_err(), "unknown field");
+    a.set_json_over("ruleBelow", &serde_json::Value::Null, &current).unwrap();
+    assert_eq!(a.rule_below, None, "null clears the override");
+}
+
+#[test]
+fn stroke_behind_fill_is_saved_only_when_set() {
+    assert!(!CharProps::default().stroke_behind_fill);
+    assert_eq!(serde_json::to_value(CharAttrs::default()).unwrap(), serde_json::json!({}));
+    let mut a = CharAttrs::default();
+    a.set_json("strokeBehindFill", &serde_json::json!(true)).unwrap();
+    let v = serde_json::to_value(&a).unwrap();
+    assert_eq!(v, serde_json::json!({"strokeBehindFill": true}));
+    assert_eq!(serde_json::from_value::<CharAttrs>(v).unwrap(), a);
+    let mut p = CharProps::default();
+    p.apply(&a);
+    assert!(p.stroke_behind_fill);
+}
+
+#[test]
+fn digits_map_to_their_script() {
+    assert_eq!(Digits::Default.map('7', "Arabic"), '7');
+    assert_eq!(Digits::Hindi.map('3', ""), '\u{0663}');
+    assert_eq!(Digits::Farsi.map('0', ""), '\u{06F0}');
+    assert_eq!(Digits::Native.map('5', "Thai"), '\u{0E55}');
+    assert_eq!(Digits::Native.map('5', "English: USA"), '5');
+    assert_eq!(Digits::Hindi.map('x', ""), 'x');
+}
+
+#[test]
+fn language_names_map_to_bcp47_tags() {
+    assert_eq!(language_tag("English: USA"), Some("en-US"));
+    assert_eq!(language_tag("English: Australian"), Some("en"));
+    assert_eq!(language_tag("Turkish"), Some("tr"));
+    assert_eq!(language_tag("Georgian"), Some("ka"));
+    assert_eq!(language_tag("Japanese"), Some("ja"));
+    assert_eq!(language_tag("Korean"), Some("ko"));
+    assert_eq!(language_tag("Chinese"), Some("zh"));
+    assert_eq!(language_tag("Chinese: Simplified"), Some("zh-Hans"));
+    assert_eq!(language_tag("Chinese: Traditional"), Some("zh-Hant"));
+    assert_eq!(language_tag("Arabic"), Some("ar"));
+    assert_eq!(language_tag("Persian"), Some("fa"));
+    assert_eq!(language_tag("Farsi"), Some("fa"));
+    assert_eq!(language_tag("Urdu"), Some("ur"));
+    assert_eq!(language_tag("Hebrew"), Some("he"));
+    assert_eq!(language_tag("[No Language]"), None);
+    assert_eq!(language_tag("Klingon"), None);
+    assert_eq!(language_tag(""), None);
+}
+
+#[test]
+fn chinese_japanese_and_korean_names_map_in_their_common_spellings() {
+    for (name, tag) in [
+        ("Chinese: Simplified", Some("zh-Hans")),
+        ("Simplified Chinese", Some("zh-Hans")),
+        ("Chinese Simplified", Some("zh-Hans")),
+        ("Chinese (Simplified)", Some("zh-Hans")),
+        ("  chinese:  SIMPLIFIED ", Some("zh-Hans")),
+        ("zh_CN", Some("zh-Hans")),
+        ("zh-CN", Some("zh-Hans")),
+        ("zh-Hans", Some("zh-Hans")),
+        ("zh-Hans-CN", Some("zh-Hans")),
+        ("Chinese: Traditional", Some("zh-Hant")),
+        ("Traditional Chinese", Some("zh-Hant")),
+        ("Chinese Traditional", Some("zh-Hant")),
+        ("Chinese (Traditional)", Some("zh-Hant")),
+        ("zh_TW", Some("zh-Hant")),
+        ("zh-TW", Some("zh-Hant")),
+        ("zh_HK", Some("zh-Hant")),
+        ("zh-HK", Some("zh-Hant")),
+        ("zh-Hant", Some("zh-Hant")),
+        ("Chinese", Some("zh")),
+        ("zh", Some("zh")),
+        ("Japanese", Some("ja")),
+        ("ja", Some("ja")),
+        ("ja_JP", Some("ja-JP")),
+        ("ja-JP", Some("ja-JP")),
+        ("Korean", Some("ko")),
+        ("ko_KR", Some("ko-KR")),
+        ("ko-KR", Some("ko-KR")),
+        ("English: USA", Some("en-US")),
+        ("German: Swiss 2006 Reform", Some("de-CH")),
+        ("Norwegian: Bokmål", Some("nb")),
+        ("[No Language]", None),
+    ] {
+        assert_eq!(language_tag(name), tag, "{name}");
+    }
+}
+
+#[test]
+fn locale_codes_map_to_their_tags() {
+    for (name, tag) in [
+        // As InDesign-exported IDML writes them (AppliedLanguage).
+        ("$ID/de_DE_2006", Some("de-DE")),
+        ("$ID/nl_NL_2005", Some("nl-NL")),
+        ("$ID/English: USA", Some("en-US")),
+        ("$ID/English: UK", Some("en-GB")),
+        ("$ID/Spanish: Castilian", Some("es-ES")),
+        ("$ID/French", Some("fr")),
+        // As IDML import keeps them.
+        ("de_DE_2006", Some("de-DE")),
+        ("nl_NL_2005", Some("nl-NL")),
+        ("Spanish: Castilian", Some("es-ES")),
+        ("French", Some("fr")),
+        // Other locale codes.
+        ("de-DE", Some("de-DE")),
+        ("de_CH_2006", Some("de-CH")),
+        ("pt_BR", Some("pt-BR")),
+        ("en_us", Some("en-US")),
+        ("es_419", Some("es-419")),
+        ("fil_PH", Some("fil-PH")),
+        ("sv", Some("sv")),
+        ("ja", Some("ja")),
+        // Not codes.
+        ("de_DE_2006_x", None),
+        ("d_DE", None),
+        ("de_D", None),
+        ("de_DE_06", None),
+        ("1e_DE", None),
+        ("[No Language]", None),
+    ] {
+        assert_eq!(language_tag(name), tag, "{name}");
+    }
+    assert_eq!(language_subtag("de-DE"), "de");
+    assert_eq!(language_subtag("zh-Hant"), "zh");
+    assert_eq!(language_subtag("ko"), "ko");
+}
+
+#[test]
+fn merge_and_resolve() {
+    let mut a = CharAttrs { size: Some(10.0), ..Default::default() };
+    a.merge(&CharAttrs { tracking: Some(20.0), size: Some(11.0), ..Default::default() });
+    assert_eq!(a.size, Some(11.0));
+    assert_eq!(a.count(), 2);
+    let mut p = CharProps::default();
+    p.apply(&a);
+    assert_eq!(p.size, 11.0);
+    assert_eq!(p.tracking, 20.0);
+    assert_eq!(p.font_family, "Source Serif 4");
+}
+
+#[test]
+fn tab_lists_are_checked() {
+    let stop = |position: f64| TabStop { position, align: TabAlign::Left, leader: String::new(), align_on: String::new() };
+    assert!(TabStop::checked_list(vec![stop(f64::NAN)]).is_err());
+    assert!(TabStop::checked_list(vec![stop(f64::INFINITY)]).is_err());
+    assert!(TabStop::checked_list((0..=MAX_TAB_STOPS).map(|i| stop(i as f64)).collect()).is_err());
+    let list = TabStop::checked_list(vec![stop(50.0), TabStop { leader: ".".into(), ..stop(10.0) }, stop(50.001)]).unwrap();
+    assert_eq!(list.iter().map(|t| t.position).collect::<Vec<_>>(), [10.0, 50.001], "sorted, one stop per position");
+}
+
+/// A file's tab list is repaired, never refused; a list the commands accept comes through
+/// unchanged.
+#[test]
+fn tab_lists_from_files_are_sanitized() {
+    let stop = |position: f64| TabStop { position, align: TabAlign::Left, leader: String::new(), align_on: String::new() };
+    let mut tabs: Vec<TabStop> = (0..500).rev().map(|i| stop(i as f64 * 10.0)).collect();
+    tabs.push(stop(f64::NAN));
+    tabs.push(stop(f64::NEG_INFINITY));
+    tabs.push(TabStop { leader: "\u{7}0123456789".into(), align: TabAlign::Char, align_on: "\n,;".into(), ..stop(-3.0) });
+    let list = TabStop::sanitized_list(tabs);
+    assert_eq!(list.len(), MAX_TAB_STOPS);
+    assert!(list.windows(2).all(|w| w[1].position - w[0].position >= SAME_TAB_POSITION), "sorted, one stop per position");
+    let first = &list[0];
+    assert_eq!((first.position, first.leader.as_str(), first.align_on.as_str()), (0.0, "01234567", ","), "the later stop at 0 wins");
+    assert_eq!(list.last().map(|t| t.position), Some(990.0), "the first stops by position are kept");
+
+    let ok = TabStop::checked_list(vec![stop(72.0), TabStop { align: TabAlign::Char, ..stop(10.0) }]).unwrap();
+    assert_eq!(TabStop::sanitized_list(ok.clone()), ok);
+
+    // `null` is how JSON writes a non-finite position; that stop is dropped, the others kept.
+    let json = r#"{"tabs":[{"position":null},{"position":20000,"leader":"0123456789"},{"position":5}]}"#;
+    let a: ParaAttrs = serde_json::from_str(json).unwrap();
+    let tabs = a.tabs.unwrap();
+    assert_eq!(tabs.iter().map(|t| t.position).collect::<Vec<_>>(), [5.0, MAX_TAB_POSITION]);
+    assert_eq!(tabs[1].leader, "01234567");
+    let p: ParaProps = serde_json::from_str(json).unwrap();
+    assert_eq!(p.tabs, tabs);
+    assert!(serde_json::from_str::<TabStop>("{}").is_err(), "a stop names its position");
+}
+
+#[test]
+fn set_json_by_name() {
+    let mut a = ParaAttrs::default();
+    a.set_json("spaceBefore", &serde_json::json!(6.0)).unwrap();
+    a.set_json("align", &serde_json::json!("center")).unwrap();
+    a.set_json("left_indent", &serde_json::json!(12)).unwrap();
+    assert_eq!(a.space_before, Some(6.0));
+    assert_eq!(a.align, Some(Align::Center));
+    assert_eq!(a.left_indent, Some(12.0));
+    assert!(a.set_json("nope", &serde_json::json!(1)).is_err());
+    a.set_json("align", &serde_json::Value::Null).unwrap();
+    assert_eq!(a.align, None);
+}
+
+#[test]
+fn delta_and_common() {
+    let a = CharProps::default();
+    let mut b = a.clone();
+    b.size = 18.0;
+    let d = a.delta(&b);
+    assert_eq!(d.count(), 1);
+    let c = CharProps::common([&a, &b]);
+    assert_eq!(c.size, None);
+    assert_eq!(c.font_family.as_deref(), Some("Source Serif 4"));
+}
+
+#[test]
+fn serde_skips_unset() {
+    let a = CharAttrs { size: Some(9.0), ..Default::default() };
+    assert_eq!(serde_json::to_string(&a).unwrap(), r#"{"size":9.0}"#);
+    let p: ParaProps = serde_json::from_str(r#"{"align":"center"}"#).unwrap();
+    assert_eq!(p.align, Align::Center);
+    assert_eq!(p.word_space_max, 1.33);
+}
+
+#[test]
+fn same_para_style_spacing_ignore_survives_serde() {
+    for v in [None, Some(None), Some(Some(0.0))] {
+        let a = ParaAttrs { same_para_style_spacing: v, ..Default::default() };
+        let back: ParaAttrs = serde_json::from_str(&serde_json::to_string(&a).unwrap()).unwrap();
+        assert_eq!(back.same_para_style_spacing, v);
+    }
+}
+
+#[test]
+fn numbering_styles() {
+    assert_eq!(NumberStyle::UpperRoman.format(14), "XIV");
+    assert_eq!(NumberStyle::LowerRoman.format(9), "ix");
+    assert_eq!(NumberStyle::UpperLetters.format(1), "A");
+    assert_eq!(NumberStyle::UpperLetters.format(27), "AA");
+    assert_eq!(NumberStyle::LowerLetters.format(28), "bb");
+    assert_eq!(NumberStyle::ArabicLeadingZero.format(3), "03");
+    assert_eq!(NumberStyle::ArabicThreeDigits.format(7), "007");
+    assert_eq!(NumberStyle::ArabicFourDigits.format(12), "0012");
+    // Repeating forms stay small for huge numbers.
+    assert_eq!(NumberStyle::UpperRoman.format(u32::MAX), u32::MAX.to_string());
+    assert_eq!(NumberStyle::LowerLetters.format(u32::MAX), u32::MAX.to_string());
+    assert_eq!(NumberStyle::Symbols.format(u32::MAX), u32::MAX.to_string());
+}
+
+#[test]
+fn kanji_numbers_are_written_digit_by_digit() {
+    for (n, s) in [
+        (0, "〇"),
+        (1, "一"),
+        (5, "五"),
+        (10, "一〇"),
+        (11, "一一"),
+        (20, "二〇"),
+        (38, "三八"),
+        (99, "九九"),
+        (100, "一〇〇"),
+        (105, "一〇五"),
+        (1000, "一〇〇〇"),
+        (2026, "二〇二六"),
+        (u32::MAX, "四二九四九六七二九五"),
+    ] {
+        assert_eq!(NumberStyle::Kanji.format(n), s, "{n}");
+    }
+}
+
+#[test]
+fn list_labels_expand_metacharacters() {
+    let p = ParaProps { number_style: NumberStyle::UpperLetters, ..Default::default() };
+    assert_eq!(p.number_label(2), "B.\t");
+    let p = ParaProps { number_expression: "Tabel ^#^t".into(), ..Default::default() };
+    assert_eq!(p.number_label(3), "Tabel 3\t");
+    assert_eq!(expand_list_text("^2.^#.^>x^^^", "4"), ".4.\u{2002}x^^");
+    assert_eq!(expand_list_text("a\nb^p", "1"), "ab");
+    assert_eq!(ParaProps::default().bullet_label(), "\u{2022}\t");
+}
diff --git a/crates/doc/src/build.rs b/crates/doc/src/build.rs
index d4500f7ce..c7259f317 100644
--- a/crates/doc/src/build.rs
+++ b/crates/doc/src/build.rs
@@ -125,6 +125,7 @@ impl Document {
         };
         let mut d = Document {
             title: nd.title.clone(),
+            file_info: Default::default(),
             settings,
             spreads: vec![],
             parents: vec![],
diff --git a/crates/doc/src/edit.rs b/crates/doc/src/edit.rs
index 43b65144a..1bdd088fb 100644
--- a/crates/doc/src/edit.rs
+++ b/crates/doc/src/edit.rs
@@ -87,7 +87,9 @@ impl Document {
     /// The horizontal ruler of spread `r` in pieces `(from x, to x, base)`, spread coordinates,
     /// covering every x: one piece, or one per page for a page origin.
     pub fn ruler_pieces(&self, r: SpreadRef) -> Vec<(f64, f64, Point)> {
-        let Some(sp) = self.spread(r) else { return Vec::new() };
+        let Some(sp) = self.spread(r) else {
+            return Vec::new();
+        };
         if self.settings.ruler_origin != crate::RulerOrigin::Page || sp.pages.len() < 2 {
             return self.ruler_base(r, 0.0).map(|o| (f64::NEG_INFINITY, f64::INFINITY, o)).into_iter().collect();
         }
@@ -318,15 +320,16 @@ impl Document {
         let pos_to = other.frames.iter().position(|f| *f == to).unwrap_or(0);
         let after = other.frames.split_off(pos_to);
         let before = std::mem::take(&mut other.frames);
-        let (vertical, direction) = (other.vertical, other.direction);
+        let (vertical, direction, optical_margin) = (other.vertical, other.direction, other.optical_margin);
         let offset;
         {
             let st = self.story_mut(fs).ok_or(DocError::NoStory(fs))?;
             offset = if st.text.is_empty() { 0 } else { st.text.len().saturating_add(1) };
-            // The story keeps its own direction, even when it was empty and takes the other's text.
-            let own = (st.vertical, st.direction);
+            // The story keeps its own direction and options, even when it was empty and takes the
+            // other's text.
+            let own = (st.vertical, st.direction, st.optical_margin);
             st.append_story(other);
-            (st.vertical, st.direction) = own;
+            (st.vertical, st.direction, st.optical_margin) = own;
             let at = st.frames.iter().position(|f| *f == from).map_or(st.frames.len(), |p| p + 1);
             for (k, f) in after.iter().enumerate() {
                 st.frames.insert(at + k, *f);
@@ -345,6 +348,7 @@ impl Document {
             ns.frames = before.clone();
             ns.vertical = vertical;
             ns.direction = direction;
+            ns.optical_margin = optical_margin;
             for f in &before {
                 if let Some(t) = self.item_mut(*f).and_then(Item::text_frame_mut) {
                     t.story = nid;
@@ -363,7 +367,9 @@ impl Document {
         let from_empty = fs.is_none_or(|fs| self.story(fs).is_some_and(|s| s.text.is_empty() && s.frames == [from]));
         let ts = self.frame_story(to)?;
         let to_first = ts.and_then(|ts| self.story(ts)).is_some_and(|s| s.frames.first() == Some(&to));
-        let (Some(ts), true, true) = (ts, from_empty, to_first && from != to) else { return self.thread(from, to) };
+        let (Some(ts), true, true) = (ts, from_empty, to_first && from != to) else {
+            return self.thread(from, to);
+        };
         self.check_thread_links(from, to, true)?;
         if let Some(fs) = fs {
             self.stories.remove(&fs);
@@ -466,7 +472,9 @@ impl Document {
                 return Err(DocError::Invalid(format!("{id} is locked or on a locked layer")));
             }
         }
-        let (Some(fl), Some(tl)) = (self.find(from), self.find(to)) else { return Err(DocError::NoItem(to)) };
+        let (Some(fl), Some(tl)) = (self.find(from), self.find(to)) else {
+            return Err(DocError::NoItem(to));
+        };
         let same_place = match (fl.spread, tl.spread) {
             (SpreadRef::Doc(_), SpreadRef::Doc(_)) => true,
             (a, b) => a == b,
@@ -526,12 +534,12 @@ impl Document {
     /// stays with the first part and may become overset).
     pub fn unthread_after(&mut self, frame: ItemId) -> Result<()> {
         let sid = self.item(frame).and_then(|i| i.text_frame()).map(|t| t.story).ok_or(DocError::NoItem(frame))?;
-        let (tail, vertical, direction) = {
+        let (tail, vertical, direction, optical_margin) = {
             let st = self.story_mut(sid).ok_or(DocError::NoStory(sid))?;
             let p = st.frames.iter().position(|f| *f == frame).ok_or(DocError::NoItem(frame))?;
             let tail = st.frames.split_off(p + 1);
             st.rev = st.rev.wrapping_add(1);
-            (tail, st.vertical, st.direction)
+            (tail, st.vertical, st.direction, st.optical_margin)
         };
         if tail.is_empty() {
             return Ok(());
@@ -541,6 +549,7 @@ impl Document {
         ns.frames = tail.clone();
         ns.vertical = vertical;
         ns.direction = direction;
+        ns.optical_margin = optical_margin;
         self.stories.insert(nid, Arc::new(ns));
         for f in tail {
             if let Some(t) = self.item_mut(f).and_then(Item::text_frame_mut) {
@@ -554,20 +563,21 @@ impl Document {
     /// `frame` stays on the page with a new empty story.
     pub fn remove_from_thread(&mut self, frame: ItemId) -> Result<()> {
         let sid = self.item(frame).and_then(|i| i.text_frame()).map(|t| t.story).ok_or(DocError::NoItem(frame))?;
-        let (vertical, direction) = {
+        let (vertical, direction, optical_margin) = {
             let st = self.story_mut(sid).ok_or(DocError::NoStory(sid))?;
             if st.frames.len() < 2 {
                 return Err(DocError::Invalid(format!("frame {frame} is not threaded to another frame")));
             }
             st.frames.retain(|f| *f != frame);
             st.rev = st.rev.wrapping_add(1);
-            (st.vertical, st.direction)
+            (st.vertical, st.direction, st.optical_margin)
         };
         let nid = StoryId(self.alloc());
         let mut ns = Story::new(nid);
         ns.frames = vec![frame];
         ns.vertical = vertical;
         ns.direction = direction;
+        ns.optical_margin = optical_margin;
         self.stories.insert(nid, Arc::new(ns));
         let t = self.item_mut(frame).and_then(Item::text_frame_mut).ok_or(DocError::NoItem(frame))?;
         t.story = nid;
@@ -638,6 +648,45 @@ impl Document {
         found
     }
 
+    /// Every item on document and parent spreads, in groups, and among the objects anchored in
+    /// stories, including the stories in table cells and in notes: walks that must cover every
+    /// placement use this, not [`Document::all_items`].
+    pub fn placed_items(&self) -> Vec<&Item> {
+        let mut v = Vec::new();
+        for sp in self.spreads.iter().chain(&self.parents) {
+            for it in &sp.items {
+                placed_item(it, 0, &mut v);
+            }
+        }
+        for st in self.stories.values() {
+            placed_story_items(st, 0, &mut v);
+        }
+        v
+    }
+
+    /// Applies `f` to every placed item `hit` selects, wherever it sits: on document or parent
+    /// spreads, in groups, and anchored in a story (also inside table cells and notes).
+    /// Returns how many items `f` saw.
+    pub fn update_placed_items(&mut self, hit: impl Fn(&Item) -> bool, mut f: impl FnMut(&mut Item)) -> usize {
+        let mut n = 0;
+        for sp in self.spreads.iter_mut().chain(self.parents.iter_mut()) {
+            if !sp.items.iter().any(|it| has_hit(it, &hit)) {
+                continue;
+            }
+            for it in Arc::make_mut(sp).items.iter_mut() {
+                if has_hit(it, &hit) {
+                    update_placed_item(Arc::make_mut(it), 0, &hit, &mut f, &mut n);
+                }
+            }
+        }
+        for st in self.stories.values_mut() {
+            if story_has_hit(st, 0, &hit) {
+                update_story_items(Arc::make_mut(st), 0, &hit, &mut f, &mut n);
+            }
+        }
+        n
+    }
+
     /// Every item id (pre-order) on document spreads.
     pub fn all_items(&self) -> Vec<ItemId> {
         let mut v = Vec::new();
@@ -732,6 +781,91 @@ impl Document {
     }
 }
 
+/// How deep nested stories (a cell's text, a footnote's text, an endnote's text) are followed
+/// when every placement is visited. A document nested deeper is left alone.
+const MAX_PLACEMENT_DEPTH: usize = 64;
+
+/// The items anchored in `st`, and in the stories nested in its cells and notes, pre-order.
+fn placed_story_items<'a>(st: &'a Story, depth: usize, v: &mut Vec<&'a Item>) {
+    if depth > MAX_PLACEMENT_DEPTH {
+        return;
+    }
+    for o in &st.objects {
+        placed_item(&o.item, 0, v);
+    }
+    for c in st.tables.values().flat_map(|t| &t.cells) {
+        placed_story_items(&c.text, depth + 1, v);
+    }
+    for n in st.notes.iter().chain(&st.endnotes) {
+        placed_story_items(&n.text, depth + 1, v);
+    }
+}
+
+/// Whether `it` or anything in it is selected by `hit`.
+fn has_hit(it: &Item, hit: &impl Fn(&Item) -> bool) -> bool {
+    fn check(it: &Item, depth: usize, hit: &impl Fn(&Item) -> bool) -> bool {
+        hit(it) || (depth < MAX_PLACEMENT_DEPTH && it.children().iter().any(|child| check(child, depth + 1, hit)))
+    }
+    check(it, 0, hit)
+}
+
+/// [`Document::update_placed_items`] for one item: only the branches holding a hit are copied.
+fn update_placed_item(it: &mut Item, depth: usize, hit: &impl Fn(&Item) -> bool, f: &mut impl FnMut(&mut Item), n: &mut usize) {
+    if hit(it) {
+        f(it);
+        *n += 1;
+    }
+    if depth >= MAX_PLACEMENT_DEPTH {
+        return;
+    }
+    if let Some(children) = it.children_mut() {
+        for c in children.iter_mut().filter(|c| has_hit(c, hit)) {
+            update_placed_item(Arc::make_mut(c), depth + 1, hit, f, n);
+        }
+    }
+}
+
+/// [`Document::update_placed_items`] for the placements of one story, and of the stories nested
+/// in its cells and notes.
+fn update_story_items(st: &mut Story, depth: usize, hit: &impl Fn(&Item) -> bool, f: &mut impl FnMut(&mut Item), n: &mut usize) {
+    if depth > MAX_PLACEMENT_DEPTH {
+        return;
+    }
+    for o in st.objects.iter_mut() {
+        if has_hit(&o.item, hit) {
+            update_placed_item(&mut Arc::make_mut(o).item, 0, hit, f, n);
+        }
+    }
+    for t in st.tables.values_mut().filter(|t| t.cells.iter().any(|c| story_has_hit(&c.text, depth + 1, hit))) {
+        for c in &mut Arc::make_mut(t).cells {
+            if story_has_hit(&c.text, depth + 1, hit) {
+                update_story_items(&mut c.text, depth + 1, hit, f, n);
+            }
+        }
+    }
+    for note in st.notes.iter_mut().chain(st.endnotes.iter_mut()) {
+        if story_has_hit(&note.text, depth + 1, hit) {
+            update_story_items(&mut Arc::make_mut(note).text, depth + 1, hit, f, n);
+        }
+    }
+}
+
+fn placed_item<'a>(it: &'a Item, depth: usize, v: &mut Vec<&'a Item>) {
+    v.push(it);
+    if depth < MAX_PLACEMENT_DEPTH {
+        for child in it.children() {
+            placed_item(child, depth + 1, v);
+        }
+    }
+}
+
+fn story_has_hit(st: &Story, depth: usize, hit: &impl Fn(&Item) -> bool) -> bool {
+    depth <= MAX_PLACEMENT_DEPTH
+        && (st.objects.iter().any(|o| has_hit(&o.item, hit))
+            || st.tables.values().flat_map(|t| &t.cells).any(|c| story_has_hit(&c.text, depth + 1, hit))
+            || st.notes.iter().chain(&st.endnotes).any(|n| story_has_hit(&n.text, depth + 1, hit)))
+}
+
 /// Does `p` (in the item's parent space) hit `it`?
 pub fn item_hit(it: &Item, p: Point, tol: f64) -> bool {
     if let Content::Group { items } = &it.content {
@@ -776,3 +910,71 @@ pub fn hit_descendant(it: &Item, p: Point, tol: f64, want: &dyn Fn(&Item) -> boo
 /// How far from its path type on a path is hit (points): about a cap height of 12–18 pt type,
 /// either side (the type may sit on or under the path).
 const PATH_TYPE_REACH: f64 = 12.0;
+#[cfg(test)]
+mod placed_item_tests {
+    use super::*;
+
+    #[test]
+    fn exhaustive_placements_keep_unselected_branches_shared() {
+        let mut d = Document::new(&Default::default());
+        let layer = d.default_layer();
+        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 0.0, 80.0, 80.0), layer, "Body", Default::default()).unwrap();
+        let id = ItemId(d.alloc());
+        let mut item = Item::new(id, layer, Shape::Rectangle, Default::default());
+        item.content = Content::Group { items: vec![Arc::new(Item::new(ItemId(d.alloc()), layer, Shape::Rectangle, Default::default()))] };
+        let child = item.children()[0].id;
+        let mut table = crate::Table::new(1, 1, 1, 0, 0, 20.0);
+        table.cells[0].text.insert_object(0, crate::AnchoredObject { item, position: Default::default() });
+        d.story_mut(sid).unwrap().insert_table(0, table);
+        let untouched = StoryId(d.alloc());
+        d.stories.insert(untouched, Arc::new(Story::new(untouched)));
+        let snapshot = d.clone();
+        assert!(d.placed_items().iter().any(|i| i.id == child));
+        assert_eq!(d.update_placed_items(|i| i.id == child, |i| i.hidden = true), 1);
+        assert!(d.placed_items().iter().find(|i| i.id == child).unwrap().hidden);
+        assert!(!snapshot.placed_items().iter().find(|i| i.id == child).unwrap().hidden);
+        assert!(Arc::ptr_eq(&d.stories[&untouched], &snapshot.stories[&untouched]));
+        assert!(Arc::ptr_eq(&d.spreads[0], &snapshot.spreads[0]));
+        let unchanged = d.clone();
+        let mut calls = 0;
+        assert_eq!(d.update_placed_items(|_| false, |_| calls += 1), 0);
+        assert_eq!(calls, 0);
+        assert!(d.spreads.iter().zip(&unchanged.spreads).all(|(a, b)| Arc::ptr_eq(a, b)));
+        assert!(d.parents.iter().zip(&unchanged.parents).all(|(a, b)| Arc::ptr_eq(a, b)));
+        assert!(d.stories.iter().all(|(id, st)| Arc::ptr_eq(st, &unchanged.stories[id])));
+    }
+    #[test]
+    fn exhaustive_placements_bound_nested_stories_and_groups() {
+        let mut d = Document::new(&Default::default());
+        let layer = d.default_layer();
+        let target = ItemId(d.alloc());
+        let mut item = Item::new(target, layer, Shape::Rectangle, Default::default());
+        for _ in 0..MAX_PLACEMENT_DEPTH + 2 {
+            let mut group = Item::new(ItemId(d.alloc()), layer, Shape::Rectangle, Default::default());
+            group.content = Content::Group { items: vec![Arc::new(item)] };
+            item = group;
+        }
+        d.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+        assert!(!d.placed_items().iter().any(|i| i.id == target));
+        let mut calls = 0;
+        assert_eq!(d.update_placed_items(|i| i.id == target, |_| calls += 1), 0);
+        assert_eq!(calls, 0);
+
+        let nested = ItemId(d.alloc());
+        let sid = StoryId(d.alloc());
+        let mut story = Story::new(sid);
+        story.insert_object(
+            0,
+            crate::AnchoredObject { item: Item::new(nested, layer, Shape::Rectangle, Default::default()), position: Default::default() },
+        );
+        for _ in 0..MAX_PLACEMENT_DEPTH + 2 {
+            let mut outer = Story::new(sid);
+            outer.notes.push(Arc::new(crate::Footnote { id: 1, text: story }));
+            story = outer;
+        }
+        d.stories.insert(sid, Arc::new(story));
+        assert!(!d.placed_items().iter().any(|i| i.id == nested));
+        assert_eq!(d.update_placed_items(|i| i.id == nested, |_| calls += 1), 0);
+        assert_eq!(calls, 0);
+    }
+}
diff --git a/crates/doc/src/endnotes.rs b/crates/doc/src/endnotes.rs
index da213d08c..b15bb745c 100644
--- a/crates/doc/src/endnotes.rs
+++ b/crates/doc/src/endnotes.rs
@@ -147,7 +147,7 @@ impl crate::Document {
             if st.id == sid {
                 break;
             }
-            n += st.endnotes.len() as u32;
+            n = n.saturating_add(st.endnotes.len() as u32);
         }
         n
     }
@@ -173,7 +173,7 @@ impl crate::Document {
                     let at = out.len();
                     out.insert_with(at, &note.text.text[r].replace('\n', " "), f.clone());
                 }
-                n += 1;
+                n = n.saturating_add(1);
             }
         }
         out
diff --git a/crates/doc/src/file_info.rs b/crates/doc/src/file_info.rs
new file mode 100644
index 000000000..de450e687
--- /dev/null
+++ b/crates/doc/src/file_info.rs
@@ -0,0 +1,123 @@
+//! File › File Info: the document's title, author, description, keywords and copyright, saved
+//! with the document. PDF export writes the title, author, description and keywords into the
+//! file's metadata, and EPUB export writes the title and author.
+
+use serde::{Deserialize, Serialize};
+
+use crate::Document;
+
+/// File › File Info.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct FileInfo {
+    /// Document Title. Empty: exports use the document's name.
+    pub document_title: String,
+    pub author: String,
+    pub description: String,
+    /// Keywords in the order they were typed, trimmed, without empty or repeated ones.
+    pub keywords: Vec<String>,
+    pub copyright_notice: String,
+    pub copyright_info_url: String,
+}
+
+impl FileInfo {
+    pub fn is_empty(&self) -> bool {
+        *self == FileInfo::default()
+    }
+}
+
+/// Keywords typed as one line: separated by semicolons or commas, trimmed, empty and repeated
+/// ones dropped.
+pub fn parse_keywords(text: &str) -> Vec<String> {
+    clean_keywords(text.split([';', ',']))
+}
+
+/// Keywords typed as one line, read as [`parse_keywords`] reads them, except that a keyword of
+/// `kept` that holds a semicolon or comma stays one keyword wherever it still stands whole
+/// between separators.
+pub fn parse_keywords_keeping(text: &str, kept: &[String]) -> Vec<String> {
+    let mut whole: Vec<&str> = kept.iter().map(|k| k.trim()).filter(|k| k.contains([';', ','])).collect();
+    whole.sort_by_key(|k| std::cmp::Reverse(k.len()));
+    let separator = |c: char| c == ';' || c == ',';
+    let mut words = Vec::new();
+    let mut rest = text;
+    loop {
+        rest = rest.trim_start_matches(|c: char| separator(c) || c.is_whitespace());
+        if rest.is_empty() {
+            break;
+        }
+        let kept_here = whole.iter().find(|k| rest.strip_prefix(**k).is_some_and(|after| after.trim_start().chars().next().is_none_or(separator)));
+        let end = kept_here.map_or_else(|| rest.find(separator).unwrap_or(rest.len()), |k| k.len());
+        let (word, after) = rest.split_at_checked(end).unwrap_or((rest, ""));
+        words.push(word);
+        rest = after;
+    }
+    clean_keywords(words)
+}
+
+/// Trimmed keywords without empty or repeated ones, in their first order.
+pub fn clean_keywords<'a>(words: impl IntoIterator<Item = &'a str>) -> Vec<String> {
+    let mut seen = std::collections::HashSet::new();
+    words.into_iter().map(str::trim).filter(|w| !w.is_empty() && seen.insert(*w)).map(str::to_string).collect()
+}
+
+impl Document {
+    /// The title exports write into a file's metadata: File Info's Document Title, or the
+    /// document's name when that is empty.
+    pub fn metadata_title(&self) -> &str {
+        let t = self.file_info.document_title.trim();
+        if t.is_empty() { &self.title } else { t }
+    }
+
+    /// File Info's Author, if any.
+    pub fn metadata_author(&self) -> Option<&str> {
+        let a = self.file_info.author.trim();
+        (!a.is_empty()).then_some(a)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::build::NewDocument;
+
+    #[test]
+    fn keywords_split_at_semicolons_and_commas() {
+        assert_eq!(parse_keywords(" spring; catalog,  shoes ;;spring , "), ["spring", "catalog", "shoes"]);
+        assert!(parse_keywords(" ; , ").is_empty());
+    }
+
+    #[test]
+    fn keywords_with_separators_stay_whole_when_another_one_changes() {
+        let kept = ["Washington, DC".to_string(), "map".into(), "a; b".into()];
+        assert_eq!(parse_keywords_keeping("Washington, DC; atlas", &kept), ["Washington, DC", "atlas"]);
+        assert_eq!(parse_keywords_keeping("atlas, a; b ;Washington, DC", &kept), ["atlas", "a; b", "Washington, DC"]);
+        // Edited, a keyword is read like any other text.
+        assert_eq!(parse_keywords_keeping("Washington, D.C.; map", &kept), ["Washington", "D.C.", "map"]);
+        assert_eq!(parse_keywords_keeping("Washington, DCX", &kept), ["Washington", "DCX"]);
+        assert_eq!(parse_keywords_keeping(" spring; catalog,  shoes ;;spring , ", &[]), ["spring", "catalog", "shoes"]);
+    }
+
+    #[test]
+    fn the_metadata_title_falls_back_to_the_document_name() {
+        let mut d = Document::new(&NewDocument { title: "Flyer".into(), ..Default::default() });
+        assert_eq!((d.metadata_title(), d.metadata_author()), ("Flyer", None));
+        d.file_info.document_title = "  Spring Catalog ".into();
+        d.file_info.author = " Ana ".into();
+        assert_eq!((d.metadata_title(), d.metadata_author()), ("Spring Catalog", Some("Ana")));
+        d.file_info.document_title = "   ".into();
+        assert_eq!(d.metadata_title(), "Flyer");
+    }
+
+    #[test]
+    fn a_document_without_file_info_saves_as_before() {
+        let mut d = Document::new(&NewDocument::default());
+        let v = serde_json::to_value(&d).unwrap();
+        assert!(v.get("fileInfo").is_none());
+        d.file_info.keywords = vec!["a".into()];
+        d.file_info.copyright_notice = "© 2026 Ana".into();
+        let json = serde_json::to_string(&d).unwrap();
+        let back: Document = serde_json::from_str(&json).unwrap();
+        assert_eq!(back.file_info, d.file_info);
+    }
+}
diff --git a/crates/doc/src/item.rs b/crates/doc/src/item.rs
index 6d1308240..4c930c878 100644
--- a/crates/doc/src/item.rs
+++ b/crates/doc/src/item.rs
@@ -9,1345 +9,38 @@ use serde::{Deserialize, Serialize};
 
 use crate::ids::{AssetId, ItemId, LayerId, StoryId};
 
-/// Fill: a swatch reference and tint (InDesign fills always go through swatches or unnamed colours).
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct Fill {
-    pub swatch: String,
-    pub tint: f32,
-    /// Gradient angle (degrees) and length override for gradient swatches (`None` = fit to bounds).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub gradient_angle: Option<f64>,
-    /// Gradient Swatch tool vector in the item's own space: start and end of a linear gradient,
-    /// centre and radius point of a radial one (`None` = fit to bounds at `gradient_angle`).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub gradient_vector: Option<[f64; 4]>,
-    pub overprint: bool,
-}
+mod content;
+mod effects;
+mod graphic;
+mod paint;
+mod text_frame;
 
-impl Default for Fill {
-    fn default() -> Self {
-        Fill::none()
-    }
-}
-
-impl Fill {
-    /// A radial gradient's ellipse on an object whose bounds (in its own space) are `b`: centre and
-    /// horizontal and vertical radii. As in InDesign, a radial gradient stretches with the object's
-    /// box: by default it's centred and reaches the box's sides (an ellipse in a non-square box);
-    /// with a Gradient Swatch tool vector it's centred at the vector's start, and the vector's
-    /// length, measured with the box made square, sets its size.
-    pub fn radial_ellipse(&self, b: designcraft_geom::Rect) -> (designcraft_geom::Point, f64, f64) {
-        let k = if b.width() > 1e-9 && b.height() > 1e-9 { b.height() / b.width() } else { 1.0 };
-        match self.gradient_vector {
-            Some([x0, y0, x1, y1]) => {
-                let r = designcraft_geom::Vec2::new(x1 - x0, (y1 - y0) / k).hypot();
-                (designcraft_geom::Point::new(x0, y0), r, r * k)
-            }
-            // A box with no width or height (a straight line's) has no ellipse: a circle across
-            // its length.
-            None if b.width() <= 1e-9 || b.height() <= 1e-9 => {
-                let r = b.width().max(b.height()).max(1e-3) / 2.0;
-                (b.center(), r, r)
-            }
-            None => (b.center(), b.width() / 2.0, b.height() / 2.0),
-        }
-    }
-
-    /// A linear gradient's axis on an object whose bounds (in its own space) are `b`: the
-    /// Gradient Swatch tool's vector, or the box's extent along the gradient's angle through its
-    /// centre. A box with no extent along that angle (a straight line, across it) takes its longer
-    /// side.
-    pub fn linear_axis(&self, b: Rect) -> (Point, Point) {
-        if let Some([x0, y0, x1, y1]) = self.gradient_vector {
-            return (Point::new(x0, y0), Point::new(x1, y1));
-        }
-        let a = self.gradient_angle.unwrap_or(0.0).to_radians();
-        let half = (b.width() * a.cos().abs() + b.height() * a.sin().abs()) / 2.0;
-        let half = if half > 1e-9 { half } else { b.width().max(b.height()).max(1e-3) / 2.0 };
-        let d = designcraft_geom::Vec2::new(a.cos(), -a.sin()) * half;
-        (b.center() - d, b.center() + d)
-    }
-
-    pub fn none() -> Self {
-        Fill { swatch: designcraft_color::swatch::NONE.into(), tint: 1.0, gradient_angle: None, gradient_vector: None, overprint: false }
-    }
-    pub fn swatch(name: &str) -> Self {
-        Fill { swatch: name.into(), ..Fill::none() }
-    }
-    pub fn is_none(&self) -> bool {
-        self.swatch == designcraft_color::swatch::NONE
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum StrokeAlign {
-    #[default]
-    Center,
-    Inside,
-    Outside,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Cap {
-    #[default]
-    Butt,
-    Round,
-    Projecting,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Join {
-    #[default]
-    Miter,
-    Round,
-    Bevel,
-}
-
-/// The shortest non-zero dash or gap a command accepts, in points.
-pub const MIN_DASH: f64 = 0.1;
-/// The longest dash or gap a command accepts, in points.
-pub const MAX_DASH: f64 = 10_000.0;
-/// The most lengths a dash pattern holds.
-pub const MAX_DASH_ENTRIES: usize = 64;
-/// The most pattern repeats a renderer expands along one path; finer patterns draw solid.
-pub const MAX_DASH_PERIODS: f64 = 20_000.0;
-
-/// An upper bound of the length of `bp`: the length of its control polygon.
-pub fn path_length_bound(bp: &designcraft_geom::BezPath) -> f64 {
-    use designcraft_geom::PathSeg;
-    bp.segments()
-        .map(|s| match s {
-            PathSeg::Line(l) => l.p0.distance(l.p1),
-            PathSeg::Quad(q) => q.p0.distance(q.p1) + q.p1.distance(q.p2),
-            PathSeg::Cubic(c) => c.p0.distance(c.p1) + c.p1.distance(c.p2) + c.p2.distance(c.p3),
-        })
-        .sum()
-}
-
-/// Stroke types (Stroke panel → Type). Dash/gap arrays are in points.
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "kind")]
-pub enum StrokeType {
-    #[default]
-    Solid,
-    Dashed {
-        pattern: Vec<f64>,
-    },
-    Dotted,
-    ThickThin,
-    ThinThick,
-    ThinThin,
-    ThickThick,
-    ThinThickThin,
-    ThickThinThick,
-    Wavy,
-    Hashed,
-    /// A custom striped stroke: bands (start, width) as fractions of the weight from the left edge.
-    Stripes {
-        bands: Vec<(f64, f64)>,
-    },
-    /// A named stroke style of the document (Stroke Styles), by name.
-    Style {
-        name: String,
-    },
-}
-
-impl StrokeType {
-    pub fn label(&self) -> &'static str {
-        match self {
-            StrokeType::Solid => "Solid",
-            StrokeType::Dashed { .. } => "Dashed",
-            StrokeType::Dotted => "Dotted",
-            StrokeType::ThickThin => "Thick - Thin",
-            StrokeType::ThinThick => "Thin - Thick",
-            StrokeType::ThinThin => "Thin - Thin",
-            StrokeType::ThickThick => "Thick - Thick",
-            StrokeType::ThinThickThin => "Thin - Thick - Thin",
-            StrokeType::ThickThinThick => "Thick - Thin - Thick",
-            StrokeType::Wavy => "Wavy",
-            StrokeType::Hashed => "Straight Hash",
-            StrokeType::Stripes { .. } => "Stripes",
-            StrokeType::Style { .. } => "Custom",
-        }
-    }
-
-    /// Whether `pattern` is a dash pattern commands accept: 1 to [`MAX_DASH_ENTRIES`] lengths,
-    /// each 0 or from [`MIN_DASH`] to [`MAX_DASH`] points, not all 0.
-    pub fn valid_dash_pattern(pattern: &[f64]) -> bool {
-        !pattern.is_empty()
-            && pattern.len() <= MAX_DASH_ENTRIES
-            && pattern.iter().all(|x| *x == 0.0 || (MIN_DASH..=MAX_DASH).contains(x))
-            && pattern.iter().any(|x| *x > 0.0)
-    }
-
-    /// Whether a renderer may expand `pattern` along a path at most `length` points long: at
-    /// most [`MAX_DASH_ENTRIES`] finite, non-negative lengths that repeat at most
-    /// [`MAX_DASH_PERIODS`] times. Otherwise the stroke draws solid, so a degenerate pattern
-    /// from a file can't stall rendering.
-    pub fn expandable_dashes(pattern: &[f64], length: f64) -> bool {
-        let period: f64 = pattern.iter().sum();
-        pattern.len() <= MAX_DASH_ENTRIES
-            && pattern.iter().all(|x| x.is_finite() && *x >= 0.0)
-            && period > 0.0
-            && length.is_finite()
-            && length / period <= MAX_DASH_PERIODS
-    }
-
-    /// The bands of a striped type (start, width as fractions of the weight).
-    pub fn bands(&self) -> Option<Vec<(f64, f64)>> {
-        Some(match self {
-            StrokeType::ThickThin => vec![(0.0, 0.5), (0.75, 0.25)],
-            StrokeType::ThinThick => vec![(0.0, 0.25), (0.5, 0.5)],
-            StrokeType::ThinThin => vec![(0.0, 1.0 / 3.0), (2.0 / 3.0, 1.0 / 3.0)],
-            StrokeType::ThickThick => vec![(0.0, 0.4), (0.6, 0.4)],
-            StrokeType::ThinThickThin => vec![(0.0, 0.2), (0.35, 0.3), (0.8, 0.2)],
-            StrokeType::ThickThinThick => vec![(0.0, 0.35), (0.45, 0.1), (0.65, 0.35)],
-            StrokeType::Stripes { bands } => bands.clone(),
-            _ => return None,
-        })
-    }
-
-    /// The filled area for types drawn as fills (stripes, wavy, hash); `None` for solid, dashed
-    /// and dotted strokes (and unresolved named styles).
-    pub fn outline(&self, bp: &designcraft_geom::BezPath, weight: f64, tol: f64) -> Option<designcraft_geom::BezPath> {
-        use designcraft_geom::stroke_style as ss;
-        match self {
-            StrokeType::Wavy => Some(ss::wavy(bp, weight, tol)),
-            StrokeType::Hashed => Some(ss::hashed(bp, weight, tol)),
-            t => t.bands().map(|b| ss::stripes(bp, weight, &b, tol)),
-        }
-    }
-}
-
-/// A named custom stroke style (Stroke Styles dialog): dashes, dots or stripes.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct StrokeStyleDef {
-    pub name: String,
-    pub kind: StrokeType,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Arrowhead {
-    #[default]
-    None,
-    SimpleWide,
-    Simple,
-    Triangle,
-    TriangleWide,
-    Barbed,
-    Curved,
-    Circle,
-    CircleSolid,
-    Square,
-    SquareSolid,
-    Bar,
-}
-
-impl Arrowhead {
-    pub const ALL: [Arrowhead; 12] = [
-        Arrowhead::None,
-        Arrowhead::Simple,
-        Arrowhead::SimpleWide,
-        Arrowhead::Triangle,
-        Arrowhead::TriangleWide,
-        Arrowhead::Barbed,
-        Arrowhead::Curved,
-        Arrowhead::Circle,
-        Arrowhead::CircleSolid,
-        Arrowhead::Square,
-        Arrowhead::SquareSolid,
-        Arrowhead::Bar,
-    ];
-
-    pub fn label(self) -> &'static str {
-        match self {
-            Arrowhead::None => "None",
-            Arrowhead::Simple => "Simple",
-            Arrowhead::SimpleWide => "Simple - Wide",
-            Arrowhead::Triangle => "Triangle",
-            Arrowhead::TriangleWide => "Triangle - Wide",
-            Arrowhead::Barbed => "Barbed",
-            Arrowhead::Curved => "Curved",
-            Arrowhead::Circle => "Circle",
-            Arrowhead::CircleSolid => "Circle - Solid",
-            Arrowhead::Square => "Square",
-            Arrowhead::SquareSolid => "Square - Solid",
-            Arrowhead::Bar => "Bar",
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct Stroke {
-    pub swatch: String,
-    pub tint: f32,
-    pub weight: f64,
-    #[serde(rename = "type")]
-    pub kind: StrokeType,
-    pub align: StrokeAlign,
-    pub cap: Cap,
-    pub join: Join,
-    pub miter_limit: f64,
-    pub start: Arrowhead,
-    pub end: Arrowhead,
-    /// Gap colour for dashed/striped strokes.
-    pub gap_swatch: String,
-    pub gap_tint: f32,
-    pub overprint: bool,
-    /// Overprint Gap (Attributes panel).
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub gap_overprint: bool,
-    /// A gradient swatch's angle on the stroke, as [`Fill::gradient_angle`].
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub gradient_angle: Option<f64>,
-    /// The Gradient Swatch tool's vector on the stroke, as [`Fill::gradient_vector`].
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub gradient_vector: Option<[f64; 4]>,
-}
-
-impl Default for Stroke {
-    /// InDesign's default for drawn shapes: 1 pt black.
-    fn default() -> Self {
-        Stroke {
-            swatch: designcraft_color::swatch::BLACK.into(),
-            tint: 1.0,
-            weight: 1.0,
-            kind: StrokeType::Solid,
-            align: StrokeAlign::Center,
-            cap: Cap::Butt,
-            join: Join::Miter,
-            miter_limit: 4.0,
-            start: Arrowhead::None,
-            end: Arrowhead::None,
-            gap_swatch: designcraft_color::swatch::NONE.into(),
-            gap_tint: 1.0,
-            overprint: false,
-            gap_overprint: false,
-            gradient_angle: None,
-            gradient_vector: None,
-        }
-    }
-}
-
-impl Stroke {
-    /// The stroke's paint (swatch, tint and gradient geometry) as a fill, to paint it the same way:
-    /// a gradient swatch on a stroke runs across the object's box as on its fill.
-    pub fn as_fill(&self) -> Fill {
-        Fill {
-            swatch: self.swatch.clone(),
-            tint: self.tint,
-            gradient_angle: self.gradient_angle,
-            gradient_vector: self.gradient_vector,
-            overprint: self.overprint,
-        }
-    }
-
-    /// How far the painted stroke can reach beyond the path (arrowheads reach further).
-    pub fn extent(&self) -> f64 {
-        if self.start == Arrowhead::None && self.end == Arrowhead::None { self.weight } else { self.weight.max(0.5) * 5.5 }
-    }
-
-    pub fn none() -> Self {
-        Stroke { swatch: designcraft_color::swatch::NONE.into(), ..Stroke::default() }
-    }
-    pub fn is_none(&self) -> bool {
-        self.swatch == designcraft_color::swatch::NONE || self.weight <= 0.0
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum VerticalJustification {
-    #[default]
-    Top,
-    Center,
-    Bottom,
-    Justify,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum FirstBaseline {
-    #[default]
-    Ascent,
-    CapHeight,
-    Leading,
-    XHeight,
-    Fixed,
-    /// The top of the font's em box: its `BASE` em box; else, for a CJK font, its OS/2 typo
-    /// ascender when the typo ascender and descender span one em; else half an em above half the
-    /// cap height.
-    EmboxHeight,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum AutoSize {
-    #[default]
-    Off,
-    HeightOnly,
-    WidthOnly,
-    HeightAndWidth,
-    HeightAndWidthProportionally,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum ColumnsKind {
-    #[default]
-    FixedNumber,
-    FixedWidth,
-    FlexibleWidth,
-}
-
-/// Text Frame Options.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct TextFrameOptions {
-    pub columns: u32,
-    pub columns_kind: ColumnsKind,
-    pub gutter: f64,
-    /// Column width for fixed/flexible width columns.
-    pub column_width: f64,
-    pub balance_columns: bool,
-    /// Inset spacing: top, left, bottom, right.
-    pub inset: [f64; 4],
-    pub vertical_justification: VerticalJustification,
-    pub vj_paragraph_spacing_limit: f64,
-    pub first_baseline: FirstBaseline,
-    pub first_baseline_min: f64,
-    pub ignore_wrap: bool,
-    pub auto_size: AutoSize,
-    /// Reference point (0..9, row-major from the top left) that stays fixed when auto-sizing.
-    pub auto_size_ref: u8,
-    /// Auto-size never makes the frame shorter than `auto_size_min_height` while this is on.
-    #[serde(skip_serializing_if = "std::ops::Not::not")]
-    pub auto_size_use_min_height: bool,
-    #[serde(skip_serializing_if = "is_default")]
-    pub auto_size_min_height: f64,
-    /// Auto-size never makes the frame narrower than `auto_size_min_width` while this is on.
-    #[serde(skip_serializing_if = "std::ops::Not::not")]
-    pub auto_size_use_min_width: bool,
-    #[serde(skip_serializing_if = "is_default")]
-    pub auto_size_min_width: f64,
-    /// Width-growing auto-size sets each paragraph on one line (the frame widens to the longest).
-    #[serde(skip_serializing_if = "std::ops::Not::not")]
-    pub auto_size_no_line_breaks: bool,
-    pub column_rule: bool,
-    pub column_rule_weight: f64,
-    pub column_rule_color: String,
-    /// 0..1.
-    pub column_rule_tint: f32,
-    /// Horizontal offset of each rule from the middle of its gutter.
-    pub column_rule_offset: f64,
-    /// The rule starts this far below the column top and ends this far above its bottom.
-    pub column_rule_top_inset: f64,
-    pub column_rule_bottom_inset: f64,
-    /// Use a custom baseline grid for this frame.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub baseline_grid: Option<FrameBaselineGrid>,
-    /// Type on a Path: the text runs along the item's path instead of filling it.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<PathType>,
-}
-
-/// A text frame's custom baseline grid. Saved as `[start, increment]`.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(from = "(f64, f64)", into = "(f64, f64)")]
-pub struct FrameBaselineGrid {
-    /// The first grid line, down from the top of the page.
-    pub start: f64,
-    /// The distance between grid lines; 0 or less turns the grid off.
-    pub increment: f64,
-}
-
-impl From<(f64, f64)> for FrameBaselineGrid {
-    fn from((start, increment): (f64, f64)) -> Self {
-        FrameBaselineGrid { start, increment }
-    }
-}
-
-impl From<FrameBaselineGrid> for (f64, f64) {
-    fn from(g: FrameBaselineGrid) -> Self {
-        (g.start, g.increment)
-    }
-}
-
-/// Type on a Path Options.
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct PathType {
-    /// Where the text starts, as a distance along the path (the start bracket).
-    pub start: f64,
-    /// Where the text ends, as a distance along the path (the end bracket); `None` is the path's
-    /// end. Text past it is overset.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub end: Option<f64>,
-    /// Run the other way (the text sits on the other side).
-    pub flip: bool,
-    pub align: PathAlign,
-}
-
-/// Which part of the type sits on the path.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum PathAlign {
-    #[default]
-    Baseline,
-    Ascender,
-    Descender,
-    Center,
-}
-
-impl Default for TextFrameOptions {
-    fn default() -> Self {
-        TextFrameOptions {
-            columns: 1,
-            columns_kind: ColumnsKind::FixedNumber,
-            gutter: 12.0,
-            column_width: 0.0,
-            balance_columns: false,
-            inset: [0.0; 4],
-            vertical_justification: VerticalJustification::Top,
-            vj_paragraph_spacing_limit: 0.0,
-            first_baseline: FirstBaseline::Ascent,
-            first_baseline_min: 0.0,
-            ignore_wrap: false,
-            auto_size: AutoSize::Off,
-            auto_size_ref: 4,
-            auto_size_use_min_height: false,
-            auto_size_min_height: 0.0,
-            auto_size_use_min_width: false,
-            auto_size_min_width: 0.0,
-            auto_size_no_line_breaks: false,
-            column_rule: false,
-            column_rule_weight: 1.0,
-            column_rule_color: designcraft_color::swatch::BLACK.into(),
-            column_rule_tint: 1.0,
-            column_rule_offset: 0.0,
-            column_rule_top_inset: 0.0,
-            column_rule_bottom_inset: 0.0,
-            baseline_grid: None,
-            path: None,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum WrapMode {
-    #[default]
-    None,
-    BoundingBox,
-    Contour,
-    JumpObject,
-    JumpToNextColumn,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum WrapSide {
-    #[default]
-    BothSides,
-    RightSide,
-    LeftSide,
-    TowardsSpine,
-    AwayFromSpine,
-    LargestArea,
-}
-
-/// Text Wrap panel › Contour Options › Type: the outline a contour wrap follows on a graphic frame.
-/// Other frames always wrap around their own path.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum ContourType {
-    /// The placed graphic's rectangle (within the frame).
-    BoundingBox,
-    /// Edges detected in the image. Composition follows the frame path.
-    DetectEdges,
-    /// The image's alpha channel. Composition follows the frame path.
-    AlphaChannel,
-    /// A path saved in the image. Composition follows the frame path.
-    PhotoshopPath,
-    /// The frame's path.
-    GraphicFrame,
-    /// The graphic's clipping path, or the frame's path when it has none.
-    #[default]
-    SameAsClipping,
-}
-
-/// Text Wrap panel settings.
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct TextWrap {
-    pub mode: WrapMode,
-    /// Top, left, bottom, right offsets.
-    pub offsets: [f64; 4],
-    pub invert: bool,
-    pub side: WrapSide,
-    pub contour: ContourType,
-    /// A custom wrap boundary in the item's inner space, offsets already included. Bounding-box
-    /// and contour wraps follow it instead of the frame; other modes use its bounds. Resizing the
-    /// item transforms it with the path; other path edits keep it as it is.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<PathData>,
-}
-
-impl TextWrap {
-    pub fn is_default(&self) -> bool {
-        *self == TextWrap::default()
-    }
-}
-
-/// Frame fitting options (Object → Fitting → Frame Fitting Options).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Fitting {
-    #[default]
-    None,
-    FillProportionally,
-    FitProportionally,
-    FitContentToFrame,
-    CenterContent,
-}
-
-/// A placed graphic inside a frame.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Graphic {
-    pub asset: AssetId,
-    /// Natural size of the graphic in points (pixels at its resolution, or PDF page size).
-    pub size: (f64, f64),
-    /// Graphic space (0,0)-(w,h) → frame inner space.
-    pub xf: Affine,
-    /// Clipping path: only the part of the graphic inside it shows.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub clip: Option<Arc<ClippingPath>>,
-    #[serde(default)]
-    pub auto_fit: Fitting,
-    /// Frame Fitting Options › Align From: the reference point (0–8, row-major; 4 = centre).
-    #[serde(default = "center_ref")]
-    pub fit_align: u8,
-    /// Frame Fitting Options › Crop Amount: top, left, bottom, right (negative adds space).
-    #[serde(default)]
-    pub crop: [f64; 4],
-    /// Text wrap set on the graphic itself (Direct Selection), around the part its frame shows.
-    #[serde(default, skip_serializing_if = "TextWrap::is_default")]
-    pub wrap: TextWrap,
-    /// The swatch applied to the image itself: InDesign colours a greyscale or bitmap image with
-    /// it, colour images ignore it. `None` (the default, like InDesign's Black) leaves it as is.
-    #[serde(default, skip_serializing_if = "Fill::is_none")]
-    pub fill: Fill,
-}
-
-fn center_ref() -> u8 {
-    4
-}
-
-/// Most anchors a clipping path read from a file keeps (detected edges can be dense).
-pub const MAX_CLIP_ANCHORS: usize = 100_000;
-
-/// Clipping Path › Type: where the clipping path came from.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum ClippingKind {
-    /// Traced from the image's edges against a light background.
-    DetectEdges,
-    /// Traced from one of the image's alpha channels.
-    AlphaChannel,
-    /// A path saved in the image file.
-    PhotoshopPath,
-    /// One of the above, edited by hand.
-    UserModifiedPath,
-}
-
-/// A placed graphic's clipping path. The tracing options are kept as the file had them; the
-/// outline itself is `path`.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ClippingPath {
-    pub kind: ClippingKind,
-    /// The outline in graphic space ((0,0)-(w,h) is the graphic's natural rectangle).
-    pub path: PathData,
-    /// Show the graphic outside the path instead of inside it.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub invert: bool,
-    /// Holes inside the traced shape are part of the path.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub include_inside_edges: bool,
-    /// Detect Edges: trace only the part of the image the frame shows.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub restrict_to_frame: bool,
-    /// Trace the full-resolution image rather than the screen proxy.
-    #[serde(default = "yes")]
-    pub use_high_resolution: bool,
-    /// Detect Edges / Alpha Channel: the darkness or opacity level that counts as inside (0–255).
-    #[serde(default = "clip_threshold")]
-    pub threshold: f64,
-    /// How closely the traced path follows the pixels, in pixels.
-    #[serde(default = "clip_tolerance")]
-    pub tolerance: f64,
-    /// Inset Frame: how far the path is pulled in (points; negative pushes it out).
-    #[serde(default)]
-    pub inset: f64,
-    /// The alpha channel or image path the clip came from.
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub source_name: String,
-    /// Index of the alpha channel (-1 = none).
-    #[serde(default = "no_index")]
-    pub source_index: i32,
-}
-
-fn yes() -> bool {
-    true
-}
-fn clip_threshold() -> f64 {
-    25.0
-}
-fn clip_tolerance() -> f64 {
-    2.0
-}
-fn no_index() -> i32 {
-    -1
-}
-
-impl ClippingPath {
-    /// A clipping path of `kind` with the default options.
-    pub fn new(kind: ClippingKind, path: PathData) -> Self {
-        Self {
-            kind,
-            path,
-            invert: false,
-            include_inside_edges: false,
-            restrict_to_frame: false,
-            use_high_resolution: true,
-            threshold: clip_threshold(),
-            tolerance: clip_tolerance(),
-            inset: 0.0,
-            source_name: String::new(),
-            source_index: no_index(),
-        }
-    }
-}
-
-/// Liquid Layout object rules: which edges stay at their distance from the page edge, and
-/// whether the object may stretch.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct ObjectLiquid {
-    pub resize_width: bool,
-    pub resize_height: bool,
-    pub pin_top: bool,
-    pub pin_bottom: bool,
-    pub pin_left: bool,
-    pub pin_right: bool,
-}
-
-/// Object Export Options: tagged PDF and EPUB/HTML handling of one object.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct ExportOptions {
-    /// Tagged PDF: the object is decoration (an artifact), not content.
-    pub artifact: bool,
-    /// EPUB/HTML: export the object as an image (whatever it is).
-    pub rasterize: bool,
-    /// EPUB/HTML: "left", "center" or "right" ("" = as the flow puts it).
-    pub align: String,
-    /// EPUB/HTML: start a new page (screen) before the object.
-    pub page_break_before: bool,
-}
-
-impl ExportOptions {
-    pub fn is_default(&self) -> bool {
-        *self == ExportOptions::default()
-    }
-}
-
-/// A PDF form field.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FormField {
-    pub kind: FieldKind,
-    /// Field name (unique in the exported PDF).
-    pub name: String,
-    /// Default value: the text, the chosen option, or "On"/"" for a check box.
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub value: String,
-    /// Choices of a combo box or list box.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub options: Vec<String>,
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub multiline: bool,
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub required: bool,
-    /// Font size of the field's text (0 = auto).
-    #[serde(default)]
-    pub font_size: f64,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum FieldKind {
-    TextField,
-    CheckBox,
-    ComboBox,
-    ListBox,
-    Signature,
-}
-
-/// The source and template of a live caption.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct LiveCaption {
-    pub source: ItemId,
-    pub template: String,
-}
-
-/// Media panel options for a placed video or sound.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct MediaOptions {
-    pub play_on_page_load: bool,
-    #[serde(rename = "loop")]
-    pub looping: bool,
-    /// Show the player controls.
-    pub controls: bool,
-    /// Poster image (shown on the page and in print); `None` = a placeholder frame.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub poster: Option<AssetId>,
-}
-
-impl Item {
-    /// The graphic to draw for this frame: a media frame with a poster draws the poster
-    /// stretched over the media rectangle.
-    pub fn drawn_graphic(&self, assets: &std::collections::BTreeMap<AssetId, Arc<crate::Asset>>) -> Option<Graphic> {
-        let Content::Graphic(g) = &self.content else { return None };
-        if let Some(poster) = self.media.as_ref().and_then(|m| m.poster)
-            && let Some((pw, ph)) = assets.get(&poster).and_then(|a| a.pixels)
-        {
-            let (pw, ph) = (pw.max(1) as f64, ph.max(1) as f64);
-            return Some(Graphic { asset: poster, size: (pw, ph), xf: g.xf * Affine::scale_non_uniform(g.size.0 / pw, g.size.1 / ph), ..g.clone() });
-        }
-        Some(g.clone())
-    }
-}
-
-/// Vertical text: composed in a box `area.height()` wide and `area.width()` tall at the origin,
-/// placed so lines go down and follow each other leftwards (a clockwise quarter turn).
-pub fn vertical_text_xf(area: Rect) -> Affine {
-    Affine::new([0.0, 1.0, -1.0, 0.0, area.x1, area.y0])
-}
-
-/// "video" or "audio" for a media MIME type.
-pub fn media_kind(mime: &str) -> Option<&'static str> {
-    if mime.starts_with("video/") {
-        Some("video")
-    } else if mime.starts_with("audio/") {
-        Some("audio")
-    } else {
-        None
-    }
-}
-
-/// MIME type of a media file by its extension.
-pub fn media_mime(name: &str) -> Option<&'static str> {
-    let ext = name.rsplit('.').next()?.to_ascii_lowercase();
-    Some(match ext.as_str() {
-        "mp4" | "m4v" => "video/mp4",
-        "mov" => "video/quicktime",
-        "webm" => "video/webm",
-        "ogv" => "video/ogg",
-        "mp3" => "audio/mpeg",
-        "m4a" => "audio/mp4",
-        "wav" => "audio/wav",
-        "ogg" | "oga" => "audio/ogg",
-        "aac" => "audio/aac",
-        _ => return None,
-    })
-}
-
-/// A button's On Release action.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "kind")]
-pub enum ButtonAction {
-    GoToPage { page: usize },
-    GoToFirstPage,
-    GoToLastPage,
-    GoToNextPage,
-    GoToPreviousPage,
-    GoToUrl { url: String },
-}
+pub use content::{Content, Shape};
+pub use effects::{
+    Bevel, DirectionalFeather, DropShadow, Effects, FeatherCorners, FeatherOptions, GlowTechnique, GradientFeather, InnerGlow, InnerShadow,
+    OuterGlow, Satin,
+};
+pub use graphic::{
+    ButtonAction, ClippingKind, ClippingPath, ExportOptions, FieldKind, Fitting, FormField, GRAPHIC_LAYER_RENDERING_WARNING, Graphic,
+    GraphicLayerOptions, LiveCaption, MAX_CLIP_ANCHORS, MediaOptions, ObjectLiquid, media_kind, media_mime,
+};
+pub use paint::{
+    Arrowhead, Cap, Fill, Join, MAX_DASH, MAX_DASH_ENTRIES, MAX_DASH_PERIODS, MIN_DASH, Stroke, StrokeAlign, StrokeStyleDef, StrokeType,
+    path_length_bound,
+};
+pub use text_frame::{
+    AutoSize, ColumnsKind, ContourType, FirstBaseline, FrameBaselineGrid, FrameGridRelative, PathAlign, PathType, TextFrame, TextFrameOptions,
+    TextWrap, VerticalJustification, WrapMode, WrapSide, vertical_text_xf,
+};
 
 fn is_zero_usize(v: &usize) -> bool {
     *v == 0
 }
 
-impl Graphic {
-    /// The part of the graphic its frame shows, in the frame's inner space (bounding boxes);
-    /// None when nothing shows.
-    pub fn shown_bounds(&self, frame: Rect) -> Option<Rect> {
-        let r = self.xf.transform_rect_bbox(Rect::new(0.0, 0.0, self.size.0, self.size.1)).intersect(frame);
-        (r.width() > 0.0 && r.height() > 0.0).then_some(r)
-    }
-
-    /// The region the clipping path lets through, in frame inner space, and whether it is filled
-    /// even-odd (an inverted clip: the graphic's rectangle minus the path). `None` when the graphic
-    /// has no clipping path or the path is empty.
-    pub fn clip_region(&self) -> Option<(designcraft_geom::BezPath, bool)> {
-        use designcraft_geom::Shape;
-        let c = self.clip.as_ref().filter(|c| !c.path.is_empty())?;
-        let mut path = c.path.to_bezpath();
-        if !c.invert {
-            path.apply_affine(self.xf);
-            return Some((path, false));
-        }
-        let outer = Rect::new(0.0, 0.0, self.size.0, self.size.1).union(path.bounding_box()).inflate(1.0, 1.0);
-        let mut region = outer.to_path(0.1);
-        region.extend(path.iter());
-        region.apply_affine(self.xf);
-        Some((region, true))
-    }
-
-    /// The graphic transform that fits it into `frame` (the frame's inner rect) with `mode`,
-    /// honouring the crop amounts and the reference point.
-    pub fn fitted(&self, frame: Rect, mode: Fitting) -> Option<Affine> {
-        let (nw, nh) = self.size;
-        if nw <= 0.0 || nh <= 0.0 {
-            return None;
-        }
-        let [t, l, b, r] = self.crop;
-        let area = Rect::new(frame.x0 - l, frame.y0 - t, frame.x1 + r, frame.y1 + b);
-        if area.width() <= 0.0 || area.height() <= 0.0 {
-            return None;
-        }
-        let (fx, fy) = ([0.0, 0.5, 1.0][(self.fit_align % 3) as usize], [0.0, 0.5, 1.0][(self.fit_align / 3).min(2) as usize]);
-        let place = |w: f64, h: f64| (area.x0 + (area.width() - w) * fx, area.y0 + (area.height() - h) * fy);
-        Some(match mode {
-            Fitting::None => return None,
-            Fitting::FillProportionally | Fitting::FitProportionally => {
-                let k = if mode == Fitting::FillProportionally {
-                    (area.width() / nw).max(area.height() / nh)
-                } else {
-                    (area.width() / nw).min(area.height() / nh)
-                };
-                Affine::translate(place(nw * k, nh * k)) * Affine::scale(k)
-            }
-            Fitting::FitContentToFrame => Affine::translate((area.x0, area.y0)) * Affine::scale_non_uniform(area.width() / nw, area.height() / nh),
-            Fitting::CenterContent => {
-                let cur = self.xf.transform_rect_bbox(Rect::new(0.0, 0.0, nw, nh));
-                let (x, y) = place(cur.width(), cur.height());
-                Affine::translate((x - cur.x0, y - cur.y0)) * self.xf
-            }
-        })
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct TextFrame {
-    pub story: StoryId,
-    #[serde(default)]
-    pub options: TextFrameOptions,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "type")]
-pub enum Content {
-    #[default]
-    Unassigned,
-    Text(TextFrame),
-    Graphic(Graphic),
-    Group {
-        items: Vec<Arc<Item>>,
-    },
-}
-
-/// What kind of spline the item was drawn as (labels in the Layers panel, tool behaviours).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Shape {
-    #[default]
-    Rectangle,
-    Oval,
-    Polygon,
-    GraphicLine,
-    Path,
-    Group,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct DropShadow {
-    pub on: bool,
-    pub color: String,
-    pub opacity: f32,
-    pub angle: f64,
-    /// Use Global Light (the document angle instead of `angle`).
-    #[serde(skip_serializing_if = "std::ops::Not::not")]
-    pub global_light: bool,
-    pub distance: f64,
-    pub size: f64,
-    pub spread: f64,
-    /// How the shadow blends with what's behind it (InDesign: Multiply). A document saved before
-    /// effects had modes reads Normal, as they were drawn then.
-    #[serde(default = "normal_blend")]
-    pub mode: BlendMode,
-}
-
-/// The blend of an effect saved before effects had one.
-fn normal_blend() -> BlendMode {
-    BlendMode::Normal
-}
-
-impl Default for DropShadow {
-    fn default() -> Self {
-        DropShadow {
-            on: false,
-            mode: BlendMode::Multiply,
-            color: designcraft_color::swatch::BLACK.into(),
-            opacity: 0.75,
-            angle: 120.0,
-            distance: 7.0,
-            size: 5.0,
-            spread: 0.0,
-            global_light: false,
-        }
-    }
-}
-
-/// Inner shadow: a blurred, offset shadow inside the object's edge.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct InnerShadow {
-    pub on: bool,
-    pub color: String,
-    pub opacity: f32,
-    pub angle: f64,
-    /// Use Global Light (the document angle instead of `angle`).
-    #[serde(skip_serializing_if = "std::ops::Not::not")]
-    pub global_light: bool,
-    pub distance: f64,
-    pub size: f64,
-    /// Percentage (0–100) of `size` that hardens the edge instead of blurring it.
-    pub choke: f64,
-    /// How the shadow blends with the object (InDesign: Multiply; Normal when saved before).
-    #[serde(default = "normal_blend")]
-    pub mode: BlendMode,
-}
-
-impl Default for InnerShadow {
-    fn default() -> Self {
-        InnerShadow {
-            on: false,
-            mode: BlendMode::Multiply,
-            color: designcraft_color::swatch::BLACK.into(),
-            opacity: 0.75,
-            angle: 120.0,
-            distance: 7.0,
-            size: 7.0,
-            choke: 0.0,
-            global_light: false,
-        }
-    }
-}
-
-/// Outer glow: a blurred silhouette around the object, without offset.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct OuterGlow {
-    pub on: bool,
-    pub color: String,
-    pub opacity: f32,
-    pub size: f64,
-    /// Percentage (0–100) of `size` that grows the silhouette instead of blurring it.
-    pub spread: f64,
-    /// How the glow blends with what's behind it (InDesign: Screen; Normal when saved before).
-    #[serde(default = "normal_blend")]
-    pub mode: BlendMode,
-}
-
-impl Default for OuterGlow {
-    fn default() -> Self {
-        // InDesign starts a glow screened in white.
-        OuterGlow { on: false, color: designcraft_color::swatch::PAPER.into(), opacity: 0.75, size: 7.0, spread: 0.0, mode: BlendMode::Screen }
-    }
-}
-
 fn is_default<T: Default + PartialEq>(v: &T) -> bool {
     *v == T::default()
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct Effects {
-    /// Drop shadow. `size` is the blur size; `spread` is a percentage (0–100) of it that grows
-    /// the silhouette instead of blurring it.
-    pub drop_shadow: DropShadow,
-    /// Basic feather width (0 = off).
-    pub feather: f64,
-    /// Basic feather's choke and corners.
-    #[serde(skip_serializing_if = "is_default")]
-    pub feather_options: FeatherOptions,
-    #[serde(skip_serializing_if = "is_default")]
-    pub inner_shadow: InnerShadow,
-    #[serde(skip_serializing_if = "is_default")]
-    pub outer_glow: OuterGlow,
-    #[serde(skip_serializing_if = "is_default")]
-    pub gradient_feather: GradientFeather,
-    #[serde(skip_serializing_if = "is_default")]
-    pub inner_glow: InnerGlow,
-    #[serde(skip_serializing_if = "is_default")]
-    pub bevel: Bevel,
-    #[serde(skip_serializing_if = "is_default")]
-    pub satin: Satin,
-    #[serde(skip_serializing_if = "is_default")]
-    pub directional_feather: DirectionalFeather,
-}
-
-/// Basic Feather › Corners: how the fade follows the shape's corners.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum FeatherCorners {
-    /// Mitred: the fade keeps the corners sharp.
-    Sharp,
-    /// The fade rounds the corners by its width.
-    Rounded,
-    /// From opaque to transparent, softly (InDesign's default).
-    #[default]
-    Diffused,
-}
-
-/// Basic Feather options besides its width.
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct FeatherOptions {
-    /// Percentage (0–100) of the width that stays opaque: the fade gets shorter.
-    pub choke: f64,
-    pub corners: FeatherCorners,
-}
-
-/// Inner/Outer Glow › Technique.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum GlowTechnique {
-    /// A soft, blurred glow.
-    #[default]
-    Softer,
-    /// A glow that keeps closer to the shape's edges.
-    Precise,
-}
-
-/// Directional Feather: each side fades over its own width (item space, before rotation).
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct DirectionalFeather {
-    pub on: bool,
-    /// Top, left, bottom, right widths in points.
-    pub widths: [f64; 4],
-}
-
-/// Inner Glow: a glow inside the edge (or from the centre).
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct InnerGlow {
-    pub on: bool,
-    pub color: String,
-    pub opacity: f32,
-    pub size: f64,
-    /// Percentage (0–100) of `size` that hardens the glow.
-    pub choke: f64,
-    /// Glow from the centre instead of the edges.
-    pub center: bool,
-    /// How the glow blends with the object (InDesign: Screen).
-    pub mode: BlendMode,
-    pub technique: GlowTechnique,
-}
-
-impl Default for InnerGlow {
-    fn default() -> Self {
-        InnerGlow {
-            on: false,
-            color: designcraft_color::swatch::PAPER.into(),
-            opacity: 0.75,
-            size: 7.0,
-            choke: 0.0,
-            center: false,
-            mode: BlendMode::Screen,
-            technique: GlowTechnique::Softer,
-        }
-    }
-}
-
-/// Bevel and Emboss (inner bevel): a highlight on the lit edges, a shadow on the others.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct Bevel {
-    pub on: bool,
-    pub size: f64,
-    /// Depth in percent (scales the highlight and shadow offset).
-    pub depth: f64,
-    pub angle: f64,
-    #[serde(skip_serializing_if = "std::ops::Not::not")]
-    pub global_light: bool,
-    pub highlight: String,
-    pub highlight_opacity: f32,
-    pub shadow: String,
-    pub shadow_opacity: f32,
-}
-
-impl Default for Bevel {
-    fn default() -> Self {
-        Bevel {
-            on: false,
-            size: 7.0,
-            depth: 100.0,
-            angle: 120.0,
-            global_light: true,
-            highlight: designcraft_color::swatch::PAPER.into(),
-            highlight_opacity: 0.75,
-            shadow: designcraft_color::swatch::BLACK.into(),
-            shadow_opacity: 0.75,
-        }
-    }
-}
-
-/// Satin: soft interior shading from two offset copies of the shape.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct Satin {
-    pub on: bool,
-    pub color: String,
-    pub opacity: f32,
-    pub angle: f64,
-    pub distance: f64,
-    pub size: f64,
-    pub invert: bool,
-}
-
-impl Default for Satin {
-    fn default() -> Self {
-        Satin { on: false, color: designcraft_color::swatch::BLACK.into(), opacity: 0.5, angle: 120.0, distance: 7.0, size: 7.0, invert: false }
-    }
-}
-
-/// Gradient Feather: the object fades from `start` to `end` opacity along a gradient.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct GradientFeather {
-    pub on: bool,
-    pub radial: bool,
-    /// Degrees (linear), when no vector was dragged.
-    pub angle: f64,
-    pub start: f32,
-    pub end: f32,
-    /// Gradient Feather tool vector in the item's space: start and end (linear), centre and
-    /// radius point (radial).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub vector: Option<[f64; 4]>,
-}
-
-impl Default for GradientFeather {
-    fn default() -> Self {
-        GradientFeather { on: false, radial: false, angle: 0.0, start: 1.0, end: 0.0, vector: None }
-    }
-}
-
-impl GradientFeather {
-    /// The gradient's two points in item space for an object with inner bounds `b`.
-    pub fn points(&self, b: designcraft_geom::Rect) -> (designcraft_geom::Point, designcraft_geom::Point) {
-        use designcraft_geom::{Point, Vec2};
-        if let Some([x0, y0, x1, y1]) = self.vector {
-            return (Point::new(x0, y0), Point::new(x1, y1));
-        }
-        let c = b.center();
-        if self.radial {
-            return (c, c + Vec2::new(b.width().max(b.height()) / 2.0, 0.0));
-        }
-        let a = self.angle.to_radians();
-        let d = Vec2::new(a.cos(), -a.sin());
-        let half = (b.width() * d.x.abs() + b.height() * d.y.abs()) / 2.0;
-        (c - d * half, c + d * half)
-    }
-}
-
-impl Effects {
-    /// These effects with opacities in 0–1, percentages in 0–100 and sizes, widths and distances
-    /// not below 0, or an error naming the first value that isn't a finite number.
-    pub fn sanitized(mut self) -> Result<Effects, String> {
-        fn finite(name: &str, v: f64) -> Result<f64, String> {
-            if v.is_finite() { Ok(v) } else { Err(format!("{name} must be a finite number")) }
-        }
-        let len = |name: &str, v: f64| finite(name, v).map(|v| v.max(0.0));
-        let pct = |name: &str, v: f64| finite(name, v).map(|v| v.clamp(0.0, 100.0));
-        let opacity = |name: &str, v: f32| finite(name, f64::from(v)).map(|v| v.clamp(0.0, 1.0) as f32);
-        let ds = &mut self.drop_shadow;
-        ds.opacity = opacity("dropShadow.opacity", ds.opacity)?;
-        ds.angle = finite("dropShadow.angle", ds.angle)?;
-        ds.distance = len("dropShadow.distance", ds.distance)?;
-        ds.size = len("dropShadow.size", ds.size)?;
-        ds.spread = pct("dropShadow.spread", ds.spread)?;
-        self.feather = len("feather", self.feather)?;
-        let e = &mut self.inner_shadow;
-        e.opacity = opacity("innerShadow.opacity", e.opacity)?;
-        e.angle = finite("innerShadow.angle", e.angle)?;
-        e.distance = len("innerShadow.distance", e.distance)?;
-        e.size = len("innerShadow.size", e.size)?;
-        e.choke = pct("innerShadow.choke", e.choke)?;
-        let e = &mut self.outer_glow;
-        e.opacity = opacity("outerGlow.opacity", e.opacity)?;
-        e.size = len("outerGlow.size", e.size)?;
-        e.spread = pct("outerGlow.spread", e.spread)?;
-        let e = &mut self.gradient_feather;
-        e.angle = finite("gradientFeather.angle", e.angle)?;
-        e.start = opacity("gradientFeather.start", e.start)?;
-        e.end = opacity("gradientFeather.end", e.end)?;
-        if let Some(v) = &mut e.vector {
-            for c in v.iter_mut() {
-                *c = finite("gradientFeather.vector", *c)?;
-            }
-        }
-        let e = &mut self.inner_glow;
-        e.opacity = opacity("innerGlow.opacity", e.opacity)?;
-        e.size = len("innerGlow.size", e.size)?;
-        e.choke = pct("innerGlow.choke", e.choke)?;
-        let e = &mut self.bevel;
-        e.size = len("bevel.size", e.size)?;
-        e.depth = len("bevel.depth", e.depth)?;
-        e.angle = finite("bevel.angle", e.angle)?;
-        e.highlight_opacity = opacity("bevel.highlightOpacity", e.highlight_opacity)?;
-        e.shadow_opacity = opacity("bevel.shadowOpacity", e.shadow_opacity)?;
-        let e = &mut self.satin;
-        e.opacity = opacity("satin.opacity", e.opacity)?;
-        e.angle = finite("satin.angle", e.angle)?;
-        e.distance = len("satin.distance", e.distance)?;
-        e.size = len("satin.size", e.size)?;
-        for w in self.directional_feather.widths.iter_mut() {
-            *w = len("directionalFeather.widths", *w)?;
-        }
-        Ok(self)
-    }
-
-    /// Any effect drawn with soft (raster) filters?
-    pub fn any(&self) -> bool {
-        self.drop_shadow.on
-            || self.feather > 0.0
-            || self.inner_shadow.on
-            || self.outer_glow.on
-            || self.gradient_feather.on
-            || self.inner_glow.on
-            || self.bevel.on
-            || self.satin.on
-            || self.directional_feather.on
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Item {
@@ -1411,6 +104,10 @@ pub struct Item {
     /// Object › Object Layer Options: layers of a placed PDF that are hidden.
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub pdf_hidden_layers: Vec<String>,
+    /// Explicit placed-PDF visibility, including an all-on override with no hidden names.
+    /// False with an empty hidden list retains the file's own settings (legacy behavior).
+    #[serde(default, skip_serializing_if = "is_false")]
+    pub pdf_layer_override: bool,
     /// Window › Interactive › Media: options of a placed video or sound.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub media: Option<MediaOptions>,
@@ -1443,7 +140,15 @@ fn one() -> f32 {
     1.0
 }
 
+fn is_false(value: &bool) -> bool {
+    !*value
+}
+
 impl Item {
+    pub fn has_pdf_layer_override(&self) -> bool {
+        self.pdf_layer_override || !self.pdf_hidden_layers.is_empty()
+    }
+
     pub fn new(id: ItemId, layer: LayerId, shape: Shape, path: PathData) -> Self {
         Item {
             id,
@@ -1470,6 +175,7 @@ impl Item {
             xml_tag: String::new(),
             button: None,
             pdf_hidden_layers: Vec::new(),
+            pdf_layer_override: false,
             live_caption: None,
             form_field: None,
             export_options: ExportOptions::default(),
@@ -1699,6 +405,7 @@ mod tests {
     #[test]
     fn graphics_without_a_clipping_path_load_and_save_as_before() {
         let g = Graphic {
+            layer_options: None,
             asset: AssetId(3),
             size: (40.0, 30.0),
             xf: Affine::translate((5.0, 5.0)),
@@ -1710,6 +417,7 @@ mod tests {
             fill: Default::default(),
         };
         let v = serde_json::to_value(&g).unwrap();
+        assert!(v.get("layerOptions").is_none(), "legacy graphics keep their existing representation");
         assert!(v.get("clip").is_none(), "{v}");
         assert_eq!(serde_json::from_value::<Graphic>(v.clone()).unwrap(), g);
         // A clip written with only its type and path gets the default options.
@@ -1721,10 +429,24 @@ mod tests {
 
     #[test]
     fn frame_baseline_grid_saves_as_start_then_increment() {
+        // A file saved before Relative To existed: the grid starts from the top of the page and
+        // saves back unchanged.
         let v = serde_json::json!({"baselineGrid": [6.0, 14.0]});
         let o = serde_json::from_value::<TextFrameOptions>(v).unwrap();
-        assert_eq!(o.baseline_grid, Some(FrameBaselineGrid { start: 6.0, increment: 14.0 }));
+        assert_eq!(o.baseline_grid, Some(FrameBaselineGrid { start: 6.0, increment: 14.0, relative_to: FrameGridRelative::TopOfPage }));
         assert_eq!(serde_json::to_value(&o).unwrap()["baselineGrid"], serde_json::json!([6.0, 14.0]));
+        for r in [FrameGridRelative::TopMargin, FrameGridRelative::TopOfFrame, FrameGridRelative::TopInset] {
+            let o = TextFrameOptions {
+                baseline_grid: Some(FrameBaselineGrid { relative_to: r, ..FrameBaselineGrid::new(6.0, 14.0) }),
+                ..Default::default()
+            };
+            let v = serde_json::to_value(&o).unwrap();
+            assert_eq!(v["baselineGrid"], serde_json::json!([6.0, 14.0, r.name()]));
+            assert_eq!(serde_json::from_value::<TextFrameOptions>(v).unwrap().baseline_grid, o.baseline_grid);
+        }
+        for bad in [serde_json::json!([6.0]), serde_json::json!([6.0, 14.0, "frame", 1]), serde_json::json!([6.0, 14.0, "spine"])] {
+            assert!(serde_json::from_value::<TextFrameOptions>(serde_json::json!({"baselineGrid": bad})).is_err());
+        }
     }
 
     #[test]
diff --git a/crates/doc/src/item/content.rs b/crates/doc/src/item/content.rs
new file mode 100644
index 000000000..b81dd266b
--- /dev/null
+++ b/crates/doc/src/item/content.rs
@@ -0,0 +1,28 @@
+use super::graphic::Graphic;
+use super::text_frame::TextFrame;
+use super::{Arc, Deserialize, Item, Serialize};
+
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", tag = "type")]
+pub enum Content {
+    #[default]
+    Unassigned,
+    Text(TextFrame),
+    Graphic(Graphic),
+    Group {
+        items: Vec<Arc<Item>>,
+    },
+}
+
+/// What kind of spline the item was drawn as (labels in the Layers panel, tool behaviours).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Shape {
+    #[default]
+    Rectangle,
+    Oval,
+    Polygon,
+    GraphicLine,
+    Path,
+    Group,
+}
diff --git a/crates/doc/src/item/effects.rs b/crates/doc/src/item/effects.rs
new file mode 100644
index 000000000..46aac2e95
--- /dev/null
+++ b/crates/doc/src/item/effects.rs
@@ -0,0 +1,363 @@
+use super::{BlendMode, Deserialize, Serialize, is_default};
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct DropShadow {
+    pub on: bool,
+    pub color: String,
+    pub opacity: f32,
+    pub angle: f64,
+    /// Use Global Light (the document angle instead of `angle`).
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub global_light: bool,
+    pub distance: f64,
+    pub size: f64,
+    pub spread: f64,
+    /// How the shadow blends with what's behind it (InDesign: Multiply). A document saved before
+    /// effects had modes reads Normal, as they were drawn then.
+    #[serde(default = "normal_blend")]
+    pub mode: BlendMode,
+}
+
+/// The blend of an effect saved before effects had one.
+fn normal_blend() -> BlendMode {
+    BlendMode::Normal
+}
+
+impl Default for DropShadow {
+    fn default() -> Self {
+        DropShadow {
+            on: false,
+            mode: BlendMode::Multiply,
+            color: designcraft_color::swatch::BLACK.into(),
+            opacity: 0.75,
+            angle: 120.0,
+            distance: 7.0,
+            size: 5.0,
+            spread: 0.0,
+            global_light: false,
+        }
+    }
+}
+
+/// Inner shadow: a blurred, offset shadow inside the object's edge.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct InnerShadow {
+    pub on: bool,
+    pub color: String,
+    pub opacity: f32,
+    pub angle: f64,
+    /// Use Global Light (the document angle instead of `angle`).
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub global_light: bool,
+    pub distance: f64,
+    pub size: f64,
+    /// Percentage (0–100) of `size` that hardens the edge instead of blurring it.
+    pub choke: f64,
+    /// How the shadow blends with the object (InDesign: Multiply; Normal when saved before).
+    #[serde(default = "normal_blend")]
+    pub mode: BlendMode,
+}
+
+impl Default for InnerShadow {
+    fn default() -> Self {
+        InnerShadow {
+            on: false,
+            mode: BlendMode::Multiply,
+            color: designcraft_color::swatch::BLACK.into(),
+            opacity: 0.75,
+            angle: 120.0,
+            distance: 7.0,
+            size: 7.0,
+            choke: 0.0,
+            global_light: false,
+        }
+    }
+}
+
+/// Outer glow: a blurred silhouette around the object, without offset.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct OuterGlow {
+    pub on: bool,
+    pub color: String,
+    pub opacity: f32,
+    pub size: f64,
+    /// Percentage (0–100) of `size` that grows the silhouette instead of blurring it.
+    pub spread: f64,
+    /// How the glow blends with what's behind it (InDesign: Screen; Normal when saved before).
+    #[serde(default = "normal_blend")]
+    pub mode: BlendMode,
+}
+
+impl Default for OuterGlow {
+    fn default() -> Self {
+        // InDesign starts a glow screened in white.
+        OuterGlow { on: false, color: designcraft_color::swatch::PAPER.into(), opacity: 0.75, size: 7.0, spread: 0.0, mode: BlendMode::Screen }
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Effects {
+    /// Drop shadow. `size` is the blur size; `spread` is a percentage (0–100) of it that grows
+    /// the silhouette instead of blurring it.
+    pub drop_shadow: DropShadow,
+    /// Basic feather width (0 = off).
+    pub feather: f64,
+    /// Basic feather's choke and corners.
+    #[serde(skip_serializing_if = "is_default")]
+    pub feather_options: FeatherOptions,
+    #[serde(skip_serializing_if = "is_default")]
+    pub inner_shadow: InnerShadow,
+    #[serde(skip_serializing_if = "is_default")]
+    pub outer_glow: OuterGlow,
+    #[serde(skip_serializing_if = "is_default")]
+    pub gradient_feather: GradientFeather,
+    #[serde(skip_serializing_if = "is_default")]
+    pub inner_glow: InnerGlow,
+    #[serde(skip_serializing_if = "is_default")]
+    pub bevel: Bevel,
+    #[serde(skip_serializing_if = "is_default")]
+    pub satin: Satin,
+    #[serde(skip_serializing_if = "is_default")]
+    pub directional_feather: DirectionalFeather,
+}
+
+/// Basic Feather › Corners: how the fade follows the shape's corners.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum FeatherCorners {
+    /// Mitred: the fade keeps the corners sharp.
+    Sharp,
+    /// The fade rounds the corners by its width.
+    Rounded,
+    /// From opaque to transparent, softly (InDesign's default).
+    #[default]
+    Diffused,
+}
+
+/// Basic Feather options besides its width.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct FeatherOptions {
+    /// Percentage (0–100) of the width that stays opaque: the fade gets shorter.
+    pub choke: f64,
+    pub corners: FeatherCorners,
+}
+
+/// Inner/Outer Glow › Technique.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum GlowTechnique {
+    /// A soft, blurred glow.
+    #[default]
+    Softer,
+    /// A glow that keeps closer to the shape's edges.
+    Precise,
+}
+
+/// Directional Feather: each side fades over its own width (item space, before rotation).
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct DirectionalFeather {
+    pub on: bool,
+    /// Top, left, bottom, right widths in points.
+    pub widths: [f64; 4],
+}
+
+/// Inner Glow: a glow inside the edge (or from the centre).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct InnerGlow {
+    pub on: bool,
+    pub color: String,
+    pub opacity: f32,
+    pub size: f64,
+    /// Percentage (0–100) of `size` that hardens the glow.
+    pub choke: f64,
+    /// Glow from the centre instead of the edges.
+    pub center: bool,
+    /// How the glow blends with the object (InDesign: Screen).
+    pub mode: BlendMode,
+    pub technique: GlowTechnique,
+}
+
+impl Default for InnerGlow {
+    fn default() -> Self {
+        InnerGlow {
+            on: false,
+            color: designcraft_color::swatch::PAPER.into(),
+            opacity: 0.75,
+            size: 7.0,
+            choke: 0.0,
+            center: false,
+            mode: BlendMode::Screen,
+            technique: GlowTechnique::Softer,
+        }
+    }
+}
+
+/// Bevel and Emboss (inner bevel): a highlight on the lit edges, a shadow on the others.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Bevel {
+    pub on: bool,
+    pub size: f64,
+    /// Depth in percent (scales the highlight and shadow offset).
+    pub depth: f64,
+    pub angle: f64,
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub global_light: bool,
+    pub highlight: String,
+    pub highlight_opacity: f32,
+    pub shadow: String,
+    pub shadow_opacity: f32,
+}
+
+impl Default for Bevel {
+    fn default() -> Self {
+        Bevel {
+            on: false,
+            size: 7.0,
+            depth: 100.0,
+            angle: 120.0,
+            global_light: true,
+            highlight: designcraft_color::swatch::PAPER.into(),
+            highlight_opacity: 0.75,
+            shadow: designcraft_color::swatch::BLACK.into(),
+            shadow_opacity: 0.75,
+        }
+    }
+}
+
+/// Satin: soft interior shading from two offset copies of the shape.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Satin {
+    pub on: bool,
+    pub color: String,
+    pub opacity: f32,
+    pub angle: f64,
+    pub distance: f64,
+    pub size: f64,
+    pub invert: bool,
+}
+
+impl Default for Satin {
+    fn default() -> Self {
+        Satin { on: false, color: designcraft_color::swatch::BLACK.into(), opacity: 0.5, angle: 120.0, distance: 7.0, size: 7.0, invert: false }
+    }
+}
+
+/// Gradient Feather: the object fades from `start` to `end` opacity along a gradient.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct GradientFeather {
+    pub on: bool,
+    pub radial: bool,
+    /// Degrees (linear), when no vector was dragged.
+    pub angle: f64,
+    pub start: f32,
+    pub end: f32,
+    /// Gradient Feather tool vector in the item's space: start and end (linear), centre and
+    /// radius point (radial).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub vector: Option<[f64; 4]>,
+}
+
+impl Default for GradientFeather {
+    fn default() -> Self {
+        GradientFeather { on: false, radial: false, angle: 0.0, start: 1.0, end: 0.0, vector: None }
+    }
+}
+
+impl GradientFeather {
+    /// The gradient's two points in item space for an object with inner bounds `b`.
+    pub fn points(&self, b: designcraft_geom::Rect) -> (designcraft_geom::Point, designcraft_geom::Point) {
+        use designcraft_geom::{Point, Vec2};
+        if let Some([x0, y0, x1, y1]) = self.vector {
+            return (Point::new(x0, y0), Point::new(x1, y1));
+        }
+        let c = b.center();
+        if self.radial {
+            return (c, c + Vec2::new(b.width().max(b.height()) / 2.0, 0.0));
+        }
+        let a = self.angle.to_radians();
+        let d = Vec2::new(a.cos(), -a.sin());
+        let half = (b.width() * d.x.abs() + b.height() * d.y.abs()) / 2.0;
+        (c - d * half, c + d * half)
+    }
+}
+
+impl Effects {
+    /// These effects with opacities in 0–1, percentages in 0–100 and sizes, widths and distances
+    /// not below 0, or an error naming the first value that isn't a finite number.
+    pub fn sanitized(mut self) -> Result<Effects, String> {
+        fn finite(name: &str, v: f64) -> Result<f64, String> {
+            if v.is_finite() { Ok(v) } else { Err(format!("{name} must be a finite number")) }
+        }
+        let len = |name: &str, v: f64| finite(name, v).map(|v| v.max(0.0));
+        let pct = |name: &str, v: f64| finite(name, v).map(|v| v.clamp(0.0, 100.0));
+        let opacity = |name: &str, v: f32| finite(name, f64::from(v)).map(|v| v.clamp(0.0, 1.0) as f32);
+        let ds = &mut self.drop_shadow;
+        ds.opacity = opacity("dropShadow.opacity", ds.opacity)?;
+        ds.angle = finite("dropShadow.angle", ds.angle)?;
+        ds.distance = len("dropShadow.distance", ds.distance)?;
+        ds.size = len("dropShadow.size", ds.size)?;
+        ds.spread = pct("dropShadow.spread", ds.spread)?;
+        self.feather = len("feather", self.feather)?;
+        let e = &mut self.inner_shadow;
+        e.opacity = opacity("innerShadow.opacity", e.opacity)?;
+        e.angle = finite("innerShadow.angle", e.angle)?;
+        e.distance = len("innerShadow.distance", e.distance)?;
+        e.size = len("innerShadow.size", e.size)?;
+        e.choke = pct("innerShadow.choke", e.choke)?;
+        let e = &mut self.outer_glow;
+        e.opacity = opacity("outerGlow.opacity", e.opacity)?;
+        e.size = len("outerGlow.size", e.size)?;
+        e.spread = pct("outerGlow.spread", e.spread)?;
+        let e = &mut self.gradient_feather;
+        e.angle = finite("gradientFeather.angle", e.angle)?;
+        e.start = opacity("gradientFeather.start", e.start)?;
+        e.end = opacity("gradientFeather.end", e.end)?;
+        if let Some(v) = &mut e.vector {
+            for c in v.iter_mut() {
+                *c = finite("gradientFeather.vector", *c)?;
+            }
+        }
+        let e = &mut self.inner_glow;
+        e.opacity = opacity("innerGlow.opacity", e.opacity)?;
+        e.size = len("innerGlow.size", e.size)?;
+        e.choke = pct("innerGlow.choke", e.choke)?;
+        let e = &mut self.bevel;
+        e.size = len("bevel.size", e.size)?;
+        e.depth = len("bevel.depth", e.depth)?;
+        e.angle = finite("bevel.angle", e.angle)?;
+        e.highlight_opacity = opacity("bevel.highlightOpacity", e.highlight_opacity)?;
+        e.shadow_opacity = opacity("bevel.shadowOpacity", e.shadow_opacity)?;
+        let e = &mut self.satin;
+        e.opacity = opacity("satin.opacity", e.opacity)?;
+        e.angle = finite("satin.angle", e.angle)?;
+        e.distance = len("satin.distance", e.distance)?;
+        e.size = len("satin.size", e.size)?;
+        for w in self.directional_feather.widths.iter_mut() {
+            *w = len("directionalFeather.widths", *w)?;
+        }
+        Ok(self)
+    }
+
+    /// Any effect drawn with soft (raster) filters?
+    pub fn any(&self) -> bool {
+        self.drop_shadow.on
+            || self.feather > 0.0
+            || self.inner_shadow.on
+            || self.outer_glow.on
+            || self.gradient_feather.on
+            || self.inner_glow.on
+            || self.bevel.on
+            || self.satin.on
+            || self.directional_feather.on
+    }
+}
diff --git a/crates/doc/src/item/graphic.rs b/crates/doc/src/item/graphic.rs
new file mode 100644
index 000000000..b0b3b310a
--- /dev/null
+++ b/crates/doc/src/item/graphic.rs
@@ -0,0 +1,367 @@
+use super::content::Content;
+use super::paint::Fill;
+use super::text_frame::TextWrap;
+use super::{Affine, Arc, AssetId, Deserialize, Item, ItemId, PathData, Rect, Serialize};
+
+/// Frame fitting options (Object → Fitting → Frame Fitting Options).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Fitting {
+    #[default]
+    None,
+    FillProportionally,
+    FitProportionally,
+    FitContentToFrame,
+    CenterContent,
+}
+
+/// Retained IDML layer choices for one placement, independent of shared asset bytes.
+/// Scalar attributes are kept verbatim, including view/export/print state and link-update policy.
+/// XML Self IDs are regenerated by the exporter and are not stored here.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GraphicLayerOptions {
+    pub attributes: std::collections::BTreeMap<String, String>,
+    pub layers: Vec<std::collections::BTreeMap<String, String>>,
+    /// Parent indices in pre-order; absent entries are top-level layers (older native files).
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub parents: Vec<Option<usize>>,
+}
+
+pub const GRAPHIC_LAYER_RENDERING_WARNING: &str =
+    "Placed graphic layer visibility overrides are preserved but are not applied to rendering or PDF output";
+
+impl GraphicLayerOptions {
+    pub fn has_visibility_overrides(&self) -> bool {
+        self.layers.iter().any(|layer| {
+            layer.get("CurrentVisibility").is_some_and(|v| Some(v) != layer.get("OriginalVisibility"))
+                || ["HasViewState", "HasExportState", "HasPrintState"].iter().any(|key| layer.get(*key).is_some_and(|v| v == "true"))
+        })
+    }
+}
+
+/// A placed graphic inside a frame.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Graphic {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub layer_options: Option<GraphicLayerOptions>,
+    pub asset: AssetId,
+    /// Natural size of the graphic in points (pixels at its resolution, or PDF page size).
+    pub size: (f64, f64),
+    /// Graphic space (0,0)-(w,h) → frame inner space.
+    pub xf: Affine,
+    /// Clipping path: only the part of the graphic inside it shows.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub clip: Option<Arc<ClippingPath>>,
+    #[serde(default)]
+    pub auto_fit: Fitting,
+    /// Frame Fitting Options › Align From: the reference point (0–8, row-major; 4 = centre).
+    #[serde(default = "center_ref")]
+    pub fit_align: u8,
+    /// Frame Fitting Options › Crop Amount: top, left, bottom, right (negative adds space).
+    #[serde(default)]
+    pub crop: [f64; 4],
+    /// Text wrap set on the graphic itself (Direct Selection), around the part its frame shows.
+    #[serde(default, skip_serializing_if = "TextWrap::is_default")]
+    pub wrap: TextWrap,
+    /// The swatch applied to the image itself: InDesign colours a greyscale or bitmap image with
+    /// it, colour images ignore it. `None` (the default, like InDesign's Black) leaves it as is.
+    #[serde(default, skip_serializing_if = "Fill::is_none")]
+    pub fill: Fill,
+}
+
+fn center_ref() -> u8 {
+    4
+}
+
+/// Most anchors a clipping path read from a file keeps (detected edges can be dense).
+pub const MAX_CLIP_ANCHORS: usize = 100_000;
+
+/// Clipping Path › Type: where the clipping path came from.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ClippingKind {
+    /// Traced from the image's edges against a light background.
+    DetectEdges,
+    /// Traced from one of the image's alpha channels.
+    AlphaChannel,
+    /// A path saved in the image file.
+    PhotoshopPath,
+    /// One of the above, edited by hand.
+    UserModifiedPath,
+}
+
+/// A placed graphic's clipping path. The tracing options are kept as the file had them; the
+/// outline itself is `path`.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ClippingPath {
+    pub kind: ClippingKind,
+    /// The outline in graphic space ((0,0)-(w,h) is the graphic's natural rectangle).
+    pub path: PathData,
+    /// Show the graphic outside the path instead of inside it.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub invert: bool,
+    /// Holes inside the traced shape are part of the path.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub include_inside_edges: bool,
+    /// Detect Edges: trace only the part of the image the frame shows.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub restrict_to_frame: bool,
+    /// Trace the full-resolution image rather than the screen proxy.
+    #[serde(default = "yes")]
+    pub use_high_resolution: bool,
+    /// Detect Edges / Alpha Channel: the darkness or opacity level that counts as inside (0–255).
+    #[serde(default = "clip_threshold")]
+    pub threshold: f64,
+    /// How closely the traced path follows the pixels, in pixels.
+    #[serde(default = "clip_tolerance")]
+    pub tolerance: f64,
+    /// Inset Frame: how far the path is pulled in (points; negative pushes it out).
+    #[serde(default)]
+    pub inset: f64,
+    /// The alpha channel or image path the clip came from.
+    #[serde(default, skip_serializing_if = "String::is_empty")]
+    pub source_name: String,
+    /// Index of the alpha channel (-1 = none).
+    #[serde(default = "no_index")]
+    pub source_index: i32,
+}
+
+fn yes() -> bool {
+    true
+}
+
+fn clip_threshold() -> f64 {
+    25.0
+}
+
+fn clip_tolerance() -> f64 {
+    2.0
+}
+
+fn no_index() -> i32 {
+    -1
+}
+
+impl ClippingPath {
+    /// A clipping path of `kind` with the default options.
+    pub fn new(kind: ClippingKind, path: PathData) -> Self {
+        Self {
+            kind,
+            path,
+            invert: false,
+            include_inside_edges: false,
+            restrict_to_frame: false,
+            use_high_resolution: true,
+            threshold: clip_threshold(),
+            tolerance: clip_tolerance(),
+            inset: 0.0,
+            source_name: String::new(),
+            source_index: no_index(),
+        }
+    }
+}
+
+/// Liquid Layout object rules: which edges stay at their distance from the page edge, and
+/// whether the object may stretch.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct ObjectLiquid {
+    pub resize_width: bool,
+    pub resize_height: bool,
+    pub pin_top: bool,
+    pub pin_bottom: bool,
+    pub pin_left: bool,
+    pub pin_right: bool,
+}
+
+/// Object Export Options: tagged PDF and EPUB/HTML handling of one object.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct ExportOptions {
+    /// Tagged PDF: the object is decoration (an artifact), not content.
+    pub artifact: bool,
+    /// EPUB/HTML: export the object as an image (whatever it is).
+    pub rasterize: bool,
+    /// EPUB/HTML: "left", "center" or "right" ("" = as the flow puts it).
+    pub align: String,
+    /// EPUB/HTML: start a new page (screen) before the object.
+    pub page_break_before: bool,
+}
+
+impl ExportOptions {
+    pub fn is_default(&self) -> bool {
+        *self == ExportOptions::default()
+    }
+}
+
+/// A PDF form field.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FormField {
+    pub kind: FieldKind,
+    /// Field name (unique in the exported PDF).
+    pub name: String,
+    /// Default value: the text, the chosen option, or "On"/"" for a check box.
+    #[serde(default, skip_serializing_if = "String::is_empty")]
+    pub value: String,
+    /// Choices of a combo box or list box.
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub options: Vec<String>,
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub multiline: bool,
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub required: bool,
+    /// Font size of the field's text (0 = auto).
+    #[serde(default)]
+    pub font_size: f64,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum FieldKind {
+    TextField,
+    CheckBox,
+    ComboBox,
+    ListBox,
+    Signature,
+}
+
+/// The source and template of a live caption.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct LiveCaption {
+    pub source: ItemId,
+    pub template: String,
+}
+
+/// Media panel options for a placed video or sound.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct MediaOptions {
+    pub play_on_page_load: bool,
+    #[serde(rename = "loop")]
+    pub looping: bool,
+    /// Show the player controls.
+    pub controls: bool,
+    /// Poster image (shown on the page and in print); `None` = a placeholder frame.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub poster: Option<AssetId>,
+}
+
+impl Item {
+    /// The graphic to draw for this frame: a media frame with a poster draws the poster
+    /// stretched over the media rectangle.
+    pub fn drawn_graphic(&self, assets: &std::collections::BTreeMap<AssetId, Arc<crate::Asset>>) -> Option<Graphic> {
+        let Content::Graphic(g) = &self.content else { return None };
+        if let Some(poster) = self.media.as_ref().and_then(|m| m.poster)
+            && let Some((pw, ph)) = assets.get(&poster).and_then(|a| a.pixels)
+        {
+            let (pw, ph) = (pw.max(1) as f64, ph.max(1) as f64);
+            return Some(Graphic { asset: poster, size: (pw, ph), xf: g.xf * Affine::scale_non_uniform(g.size.0 / pw, g.size.1 / ph), ..g.clone() });
+        }
+        Some(g.clone())
+    }
+}
+
+/// "video" or "audio" for a media MIME type.
+pub fn media_kind(mime: &str) -> Option<&'static str> {
+    if mime.starts_with("video/") {
+        Some("video")
+    } else if mime.starts_with("audio/") {
+        Some("audio")
+    } else {
+        None
+    }
+}
+
+/// MIME type of a media file by its extension.
+pub fn media_mime(name: &str) -> Option<&'static str> {
+    let ext = name.rsplit('.').next()?.to_ascii_lowercase();
+    Some(match ext.as_str() {
+        "mp4" | "m4v" => "video/mp4",
+        "mov" => "video/quicktime",
+        "webm" => "video/webm",
+        "ogv" => "video/ogg",
+        "mp3" => "audio/mpeg",
+        "m4a" => "audio/mp4",
+        "wav" => "audio/wav",
+        "ogg" | "oga" => "audio/ogg",
+        "aac" => "audio/aac",
+        _ => return None,
+    })
+}
+
+/// A button's On Release action.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", tag = "kind")]
+pub enum ButtonAction {
+    GoToPage { page: usize },
+    GoToFirstPage,
+    GoToLastPage,
+    GoToNextPage,
+    GoToPreviousPage,
+    GoToUrl { url: String },
+}
+
+impl Graphic {
+    /// The part of the graphic its frame shows, in the frame's inner space (bounding boxes);
+    /// None when nothing shows.
+    pub fn shown_bounds(&self, frame: Rect) -> Option<Rect> {
+        let r = self.xf.transform_rect_bbox(Rect::new(0.0, 0.0, self.size.0, self.size.1)).intersect(frame);
+        (r.width() > 0.0 && r.height() > 0.0).then_some(r)
+    }
+
+    /// The region the clipping path lets through, in frame inner space, and whether it is filled
+    /// even-odd (an inverted clip: the graphic's rectangle minus the path). `None` when the graphic
+    /// has no clipping path or the path is empty.
+    pub fn clip_region(&self) -> Option<(designcraft_geom::BezPath, bool)> {
+        use designcraft_geom::Shape;
+        let c = self.clip.as_ref().filter(|c| !c.path.is_empty())?;
+        let mut path = c.path.to_bezpath();
+        if !c.invert {
+            path.apply_affine(self.xf);
+            return Some((path, false));
+        }
+        let outer = Rect::new(0.0, 0.0, self.size.0, self.size.1).union(path.bounding_box()).inflate(1.0, 1.0);
+        let mut region = outer.to_path(0.1);
+        region.extend(path.iter());
+        region.apply_affine(self.xf);
+        Some((region, true))
+    }
+
+    /// The graphic transform that fits it into `frame` (the frame's inner rect) with `mode`,
+    /// honouring the crop amounts and the reference point.
+    pub fn fitted(&self, frame: Rect, mode: Fitting) -> Option<Affine> {
+        let (nw, nh) = self.size;
+        if nw <= 0.0 || nh <= 0.0 {
+            return None;
+        }
+        let [t, l, b, r] = self.crop;
+        let area = Rect::new(frame.x0 - l, frame.y0 - t, frame.x1 + r, frame.y1 + b);
+        if area.width() <= 0.0 || area.height() <= 0.0 {
+            return None;
+        }
+        let (fx, fy) = ([0.0, 0.5, 1.0][(self.fit_align % 3) as usize], [0.0, 0.5, 1.0][(self.fit_align / 3).min(2) as usize]);
+        let place = |w: f64, h: f64| (area.x0 + (area.width() - w) * fx, area.y0 + (area.height() - h) * fy);
+        Some(match mode {
+            Fitting::None => return None,
+            Fitting::FillProportionally | Fitting::FitProportionally => {
+                let k = if mode == Fitting::FillProportionally {
+                    (area.width() / nw).max(area.height() / nh)
+                } else {
+                    (area.width() / nw).min(area.height() / nh)
+                };
+                Affine::translate(place(nw * k, nh * k)) * Affine::scale(k)
+            }
+            Fitting::FitContentToFrame => Affine::translate((area.x0, area.y0)) * Affine::scale_non_uniform(area.width() / nw, area.height() / nh),
+            Fitting::CenterContent => {
+                let cur = self.xf.transform_rect_bbox(Rect::new(0.0, 0.0, nw, nh));
+                let (x, y) = place(cur.width(), cur.height());
+                Affine::translate((x - cur.x0, y - cur.y0)) * self.xf
+            }
+        })
+    }
+}
diff --git a/crates/doc/src/item/paint.rs b/crates/doc/src/item/paint.rs
new file mode 100644
index 000000000..dfbf5751a
--- /dev/null
+++ b/crates/doc/src/item/paint.rs
@@ -0,0 +1,357 @@
+use super::{Deserialize, Point, Rect, Serialize};
+
+/// Fill: a swatch reference and tint (InDesign fills always go through swatches or unnamed colours).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Fill {
+    pub swatch: String,
+    pub tint: f32,
+    /// Gradient angle (degrees) and length override for gradient swatches (`None` = fit to bounds).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gradient_angle: Option<f64>,
+    /// Gradient Swatch tool vector in the item's own space: start and end of a linear gradient,
+    /// centre and radius point of a radial one (`None` = fit to bounds at `gradient_angle`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gradient_vector: Option<[f64; 4]>,
+    pub overprint: bool,
+}
+
+impl Default for Fill {
+    fn default() -> Self {
+        Fill::none()
+    }
+}
+
+impl Fill {
+    /// A radial gradient's ellipse on an object whose bounds (in its own space) are `b`: centre and
+    /// horizontal and vertical radii. As in InDesign, a radial gradient stretches with the object's
+    /// box: by default it's centred and reaches the box's sides (an ellipse in a non-square box);
+    /// with a Gradient Swatch tool vector it's centred at the vector's start, and the vector's
+    /// length, measured with the box made square, sets its size.
+    pub fn radial_ellipse(&self, b: designcraft_geom::Rect) -> (designcraft_geom::Point, f64, f64) {
+        let k = if b.width() > 1e-9 && b.height() > 1e-9 { b.height() / b.width() } else { 1.0 };
+        match self.gradient_vector {
+            Some([x0, y0, x1, y1]) => {
+                let r = designcraft_geom::Vec2::new(x1 - x0, (y1 - y0) / k).hypot();
+                (designcraft_geom::Point::new(x0, y0), r, r * k)
+            }
+            // A box with no width or height (a straight line's) has no ellipse: a circle across
+            // its length.
+            None if b.width() <= 1e-9 || b.height() <= 1e-9 => {
+                let r = b.width().max(b.height()).max(1e-3) / 2.0;
+                (b.center(), r, r)
+            }
+            None => (b.center(), b.width() / 2.0, b.height() / 2.0),
+        }
+    }
+
+    /// A linear gradient's axis on an object whose bounds (in its own space) are `b`: the
+    /// Gradient Swatch tool's vector, or the box's extent along the gradient's angle through its
+    /// centre. A box with no extent along that angle (a straight line, across it) takes its longer
+    /// side.
+    pub fn linear_axis(&self, b: Rect) -> (Point, Point) {
+        if let Some([x0, y0, x1, y1]) = self.gradient_vector {
+            return (Point::new(x0, y0), Point::new(x1, y1));
+        }
+        let a = self.gradient_angle.unwrap_or(0.0).to_radians();
+        let half = (b.width() * a.cos().abs() + b.height() * a.sin().abs()) / 2.0;
+        let half = if half > 1e-9 { half } else { b.width().max(b.height()).max(1e-3) / 2.0 };
+        let d = designcraft_geom::Vec2::new(a.cos(), -a.sin()) * half;
+        (b.center() - d, b.center() + d)
+    }
+
+    pub fn none() -> Self {
+        Fill { swatch: designcraft_color::swatch::NONE.into(), tint: 1.0, gradient_angle: None, gradient_vector: None, overprint: false }
+    }
+    pub fn swatch(name: &str) -> Self {
+        Fill { swatch: name.into(), ..Fill::none() }
+    }
+    pub fn is_none(&self) -> bool {
+        self.swatch == designcraft_color::swatch::NONE
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum StrokeAlign {
+    #[default]
+    Center,
+    Inside,
+    Outside,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Cap {
+    #[default]
+    Butt,
+    Round,
+    Projecting,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Join {
+    #[default]
+    Miter,
+    Round,
+    Bevel,
+}
+
+/// The shortest non-zero dash or gap a command accepts, in points.
+pub const MIN_DASH: f64 = 0.1;
+
+/// The longest dash or gap a command accepts, in points.
+pub const MAX_DASH: f64 = 10_000.0;
+
+/// The most lengths a dash pattern holds.
+pub const MAX_DASH_ENTRIES: usize = 64;
+
+/// The most pattern repeats a renderer expands along one path; finer patterns draw solid.
+pub const MAX_DASH_PERIODS: f64 = 20_000.0;
+
+/// An upper bound of the length of `bp`: the length of its control polygon.
+pub fn path_length_bound(bp: &designcraft_geom::BezPath) -> f64 {
+    use designcraft_geom::PathSeg;
+    bp.segments()
+        .map(|s| match s {
+            PathSeg::Line(l) => l.p0.distance(l.p1),
+            PathSeg::Quad(q) => q.p0.distance(q.p1) + q.p1.distance(q.p2),
+            PathSeg::Cubic(c) => c.p0.distance(c.p1) + c.p1.distance(c.p2) + c.p2.distance(c.p3),
+        })
+        .sum()
+}
+
+/// Stroke types (Stroke panel → Type). Dash/gap arrays are in points.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", tag = "kind")]
+pub enum StrokeType {
+    #[default]
+    Solid,
+    Dashed {
+        pattern: Vec<f64>,
+    },
+    Dotted,
+    ThickThin,
+    ThinThick,
+    ThinThin,
+    ThickThick,
+    ThinThickThin,
+    ThickThinThick,
+    Wavy,
+    Hashed,
+    /// A custom striped stroke: bands (start, width) as fractions of the weight from the left edge.
+    Stripes {
+        bands: Vec<(f64, f64)>,
+    },
+    /// A named stroke style of the document (Stroke Styles), by name.
+    Style {
+        name: String,
+    },
+}
+
+impl StrokeType {
+    pub fn label(&self) -> &'static str {
+        match self {
+            StrokeType::Solid => "Solid",
+            StrokeType::Dashed { .. } => "Dashed",
+            StrokeType::Dotted => "Dotted",
+            StrokeType::ThickThin => "Thick - Thin",
+            StrokeType::ThinThick => "Thin - Thick",
+            StrokeType::ThinThin => "Thin - Thin",
+            StrokeType::ThickThick => "Thick - Thick",
+            StrokeType::ThinThickThin => "Thin - Thick - Thin",
+            StrokeType::ThickThinThick => "Thick - Thin - Thick",
+            StrokeType::Wavy => "Wavy",
+            StrokeType::Hashed => "Straight Hash",
+            StrokeType::Stripes { .. } => "Stripes",
+            StrokeType::Style { .. } => "Custom",
+        }
+    }
+
+    /// Whether `pattern` is a dash pattern commands accept: 1 to [`MAX_DASH_ENTRIES`] lengths,
+    /// each 0 or from [`MIN_DASH`] to [`MAX_DASH`] points, not all 0.
+    pub fn valid_dash_pattern(pattern: &[f64]) -> bool {
+        !pattern.is_empty()
+            && pattern.len() <= MAX_DASH_ENTRIES
+            && pattern.iter().all(|x| *x == 0.0 || (MIN_DASH..=MAX_DASH).contains(x))
+            && pattern.iter().any(|x| *x > 0.0)
+    }
+
+    /// Whether a renderer may expand `pattern` along a path at most `length` points long: at
+    /// most [`MAX_DASH_ENTRIES`] finite, non-negative lengths that repeat at most
+    /// [`MAX_DASH_PERIODS`] times. Otherwise the stroke draws solid, so a degenerate pattern
+    /// from a file can't stall rendering.
+    pub fn expandable_dashes(pattern: &[f64], length: f64) -> bool {
+        let period: f64 = pattern.iter().sum();
+        pattern.len() <= MAX_DASH_ENTRIES
+            && pattern.iter().all(|x| x.is_finite() && *x >= 0.0)
+            && period > 0.0
+            && length.is_finite()
+            && length / period <= MAX_DASH_PERIODS
+    }
+
+    /// The bands of a striped type (start, width as fractions of the weight).
+    pub fn bands(&self) -> Option<Vec<(f64, f64)>> {
+        Some(match self {
+            StrokeType::ThickThin => vec![(0.0, 0.5), (0.75, 0.25)],
+            StrokeType::ThinThick => vec![(0.0, 0.25), (0.5, 0.5)],
+            StrokeType::ThinThin => vec![(0.0, 1.0 / 3.0), (2.0 / 3.0, 1.0 / 3.0)],
+            StrokeType::ThickThick => vec![(0.0, 0.4), (0.6, 0.4)],
+            StrokeType::ThinThickThin => vec![(0.0, 0.2), (0.35, 0.3), (0.8, 0.2)],
+            StrokeType::ThickThinThick => vec![(0.0, 0.35), (0.45, 0.1), (0.65, 0.35)],
+            StrokeType::Stripes { bands } => bands.clone(),
+            _ => return None,
+        })
+    }
+
+    /// The filled area for types drawn as fills (stripes, wavy, hash); `None` for solid, dashed
+    /// and dotted strokes (and unresolved named styles).
+    pub fn outline(&self, bp: &designcraft_geom::BezPath, weight: f64, tol: f64) -> Option<designcraft_geom::BezPath> {
+        use designcraft_geom::stroke_style as ss;
+        match self {
+            StrokeType::Wavy => Some(ss::wavy(bp, weight, tol)),
+            StrokeType::Hashed => Some(ss::hashed(bp, weight, tol)),
+            t => t.bands().map(|b| ss::stripes(bp, weight, &b, tol)),
+        }
+    }
+}
+
+/// A named custom stroke style (Stroke Styles dialog): dashes, dots or stripes.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct StrokeStyleDef {
+    pub name: String,
+    pub kind: StrokeType,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Arrowhead {
+    #[default]
+    None,
+    SimpleWide,
+    Simple,
+    Triangle,
+    TriangleWide,
+    Barbed,
+    Curved,
+    Circle,
+    CircleSolid,
+    Square,
+    SquareSolid,
+    Bar,
+}
+
+impl Arrowhead {
+    pub const ALL: [Arrowhead; 12] = [
+        Arrowhead::None,
+        Arrowhead::Simple,
+        Arrowhead::SimpleWide,
+        Arrowhead::Triangle,
+        Arrowhead::TriangleWide,
+        Arrowhead::Barbed,
+        Arrowhead::Curved,
+        Arrowhead::Circle,
+        Arrowhead::CircleSolid,
+        Arrowhead::Square,
+        Arrowhead::SquareSolid,
+        Arrowhead::Bar,
+    ];
+
+    pub fn label(self) -> &'static str {
+        match self {
+            Arrowhead::None => "None",
+            Arrowhead::Simple => "Simple",
+            Arrowhead::SimpleWide => "Simple - Wide",
+            Arrowhead::Triangle => "Triangle",
+            Arrowhead::TriangleWide => "Triangle - Wide",
+            Arrowhead::Barbed => "Barbed",
+            Arrowhead::Curved => "Curved",
+            Arrowhead::Circle => "Circle",
+            Arrowhead::CircleSolid => "Circle - Solid",
+            Arrowhead::Square => "Square",
+            Arrowhead::SquareSolid => "Square - Solid",
+            Arrowhead::Bar => "Bar",
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Stroke {
+    pub swatch: String,
+    pub tint: f32,
+    pub weight: f64,
+    #[serde(rename = "type")]
+    pub kind: StrokeType,
+    pub align: StrokeAlign,
+    pub cap: Cap,
+    pub join: Join,
+    pub miter_limit: f64,
+    pub start: Arrowhead,
+    pub end: Arrowhead,
+    /// Gap colour for dashed/striped strokes.
+    pub gap_swatch: String,
+    pub gap_tint: f32,
+    pub overprint: bool,
+    /// Overprint Gap (Attributes panel).
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub gap_overprint: bool,
+    /// A gradient swatch's angle on the stroke, as [`Fill::gradient_angle`].
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gradient_angle: Option<f64>,
+    /// The Gradient Swatch tool's vector on the stroke, as [`Fill::gradient_vector`].
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gradient_vector: Option<[f64; 4]>,
+}
+
+impl Default for Stroke {
+    /// InDesign's default for drawn shapes: 1 pt black.
+    fn default() -> Self {
+        Stroke {
+            swatch: designcraft_color::swatch::BLACK.into(),
+            tint: 1.0,
+            weight: 1.0,
+            kind: StrokeType::Solid,
+            align: StrokeAlign::Center,
+            cap: Cap::Butt,
+            join: Join::Miter,
+            miter_limit: 4.0,
+            start: Arrowhead::None,
+            end: Arrowhead::None,
+            gap_swatch: designcraft_color::swatch::NONE.into(),
+            gap_tint: 1.0,
+            overprint: false,
+            gap_overprint: false,
+            gradient_angle: None,
+            gradient_vector: None,
+        }
+    }
+}
+
+impl Stroke {
+    /// The stroke's paint (swatch, tint and gradient geometry) as a fill, to paint it the same way:
+    /// a gradient swatch on a stroke runs across the object's box as on its fill.
+    pub fn as_fill(&self) -> Fill {
+        Fill {
+            swatch: self.swatch.clone(),
+            tint: self.tint,
+            gradient_angle: self.gradient_angle,
+            gradient_vector: self.gradient_vector,
+            overprint: self.overprint,
+        }
+    }
+
+    /// How far the painted stroke can reach beyond the path (arrowheads reach further).
+    pub fn extent(&self) -> f64 {
+        if self.start == Arrowhead::None && self.end == Arrowhead::None { self.weight } else { self.weight.max(0.5) * 5.5 }
+    }
+
+    pub fn none() -> Self {
+        Stroke { swatch: designcraft_color::swatch::NONE.into(), ..Stroke::default() }
+    }
+    pub fn is_none(&self) -> bool {
+        self.swatch == designcraft_color::swatch::NONE || self.weight <= 0.0
+    }
+}
diff --git a/crates/doc/src/item/text_frame.rs b/crates/doc/src/item/text_frame.rs
new file mode 100644
index 000000000..d8f7f29e3
--- /dev/null
+++ b/crates/doc/src/item/text_frame.rs
@@ -0,0 +1,321 @@
+use super::{Affine, Deserialize, PathData, Rect, Serialize, StoryId, is_default};
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum VerticalJustification {
+    #[default]
+    Top,
+    Center,
+    Bottom,
+    Justify,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum FirstBaseline {
+    #[default]
+    Ascent,
+    CapHeight,
+    Leading,
+    XHeight,
+    Fixed,
+    /// The top of the font's em box: its `BASE` em box; else, for a CJK font, its OS/2 typo
+    /// ascender when the typo ascender and descender span one em; else half an em above half the
+    /// cap height.
+    EmboxHeight,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum AutoSize {
+    #[default]
+    Off,
+    HeightOnly,
+    WidthOnly,
+    HeightAndWidth,
+    HeightAndWidthProportionally,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ColumnsKind {
+    #[default]
+    FixedNumber,
+    FixedWidth,
+    FlexibleWidth,
+}
+
+/// Text Frame Options.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct TextFrameOptions {
+    pub columns: u32,
+    pub columns_kind: ColumnsKind,
+    pub gutter: f64,
+    /// Column width for fixed/flexible width columns.
+    pub column_width: f64,
+    pub balance_columns: bool,
+    /// Inset spacing: top, left, bottom, right.
+    pub inset: [f64; 4],
+    pub vertical_justification: VerticalJustification,
+    pub vj_paragraph_spacing_limit: f64,
+    pub first_baseline: FirstBaseline,
+    pub first_baseline_min: f64,
+    pub ignore_wrap: bool,
+    pub auto_size: AutoSize,
+    /// Reference point (0..9, row-major from the top left) that stays fixed when auto-sizing.
+    pub auto_size_ref: u8,
+    /// Auto-size never makes the frame shorter than `auto_size_min_height` while this is on.
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub auto_size_use_min_height: bool,
+    #[serde(skip_serializing_if = "is_default")]
+    pub auto_size_min_height: f64,
+    /// Auto-size never makes the frame narrower than `auto_size_min_width` while this is on.
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub auto_size_use_min_width: bool,
+    #[serde(skip_serializing_if = "is_default")]
+    pub auto_size_min_width: f64,
+    /// Width-growing auto-size sets each paragraph on one line (the frame widens to the longest).
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub auto_size_no_line_breaks: bool,
+    pub column_rule: bool,
+    pub column_rule_weight: f64,
+    pub column_rule_color: String,
+    /// 0..1.
+    pub column_rule_tint: f32,
+    /// Horizontal offset of each rule from the middle of its gutter.
+    pub column_rule_offset: f64,
+    /// The rule starts this far below the column top and ends this far above its bottom.
+    pub column_rule_top_inset: f64,
+    pub column_rule_bottom_inset: f64,
+    /// Use a custom baseline grid for this frame.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub baseline_grid: Option<FrameBaselineGrid>,
+    /// Type on a Path: the text runs along the item's path instead of filling it.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub path: Option<PathType>,
+}
+
+/// A text frame's custom baseline grid. Saved as `[start, increment]` when it starts from the
+/// top of the page, otherwise as `[start, increment, relativeTo]`.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct FrameBaselineGrid {
+    /// The first grid line, down from the line `relative_to` names.
+    pub start: f64,
+    /// The distance between grid lines; 0 or less turns the grid off.
+    pub increment: f64,
+    pub relative_to: FrameGridRelative,
+}
+
+impl FrameBaselineGrid {
+    /// A grid measured from the top of the page.
+    pub fn new(start: f64, increment: f64) -> Self {
+        FrameBaselineGrid { start, increment, relative_to: FrameGridRelative::TopOfPage }
+    }
+}
+
+/// What a frame's custom baseline grid's start is measured from.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum FrameGridRelative {
+    #[default]
+    #[serde(rename = "page")]
+    TopOfPage,
+    #[serde(rename = "margin")]
+    TopMargin,
+    #[serde(rename = "frame")]
+    TopOfFrame,
+    #[serde(rename = "inset")]
+    TopInset,
+}
+
+impl FrameGridRelative {
+    pub const ALL: [FrameGridRelative; 4] =
+        [FrameGridRelative::TopOfPage, FrameGridRelative::TopMargin, FrameGridRelative::TopOfFrame, FrameGridRelative::TopInset];
+
+    /// The name commands and native files use: page, margin, frame or inset.
+    pub fn name(self) -> &'static str {
+        match self {
+            FrameGridRelative::TopOfPage => "page",
+            FrameGridRelative::TopMargin => "margin",
+            FrameGridRelative::TopOfFrame => "frame",
+            FrameGridRelative::TopInset => "inset",
+        }
+    }
+
+    pub fn from_name(name: &str) -> Option<Self> {
+        Self::ALL.into_iter().find(|r| r.name() == name)
+    }
+}
+
+impl Serialize for FrameBaselineGrid {
+    fn serialize<S: serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
+        // Files saved before Relative To existed hold two elements; a page-relative grid keeps that form.
+        match self.relative_to {
+            FrameGridRelative::TopOfPage => (self.start, self.increment).serialize(s),
+            r => (self.start, self.increment, r).serialize(s),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for FrameBaselineGrid {
+    fn deserialize<D: serde::Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
+        struct Grid;
+        impl<'de> serde::de::Visitor<'de> for Grid {
+            type Value = FrameBaselineGrid;
+            fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+                f.write_str("[start, increment] or [start, increment, relativeTo]")
+            }
+            fn visit_seq<A: serde::de::SeqAccess<'de>>(self, mut a: A) -> Result<Self::Value, A::Error> {
+                use serde::de::Error;
+                let start = a.next_element()?.ok_or_else(|| A::Error::invalid_length(0, &self))?;
+                let increment = a.next_element()?.ok_or_else(|| A::Error::invalid_length(1, &self))?;
+                let relative_to = a.next_element()?.unwrap_or_default();
+                if a.next_element::<serde::de::IgnoredAny>()?.is_some() {
+                    return Err(A::Error::invalid_length(4, &self));
+                }
+                Ok(FrameBaselineGrid { start, increment, relative_to })
+            }
+        }
+        d.deserialize_seq(Grid)
+    }
+}
+
+/// Type on a Path Options.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct PathType {
+    /// Where the text starts, as a distance along the path (the start bracket).
+    pub start: f64,
+    /// Where the text ends, as a distance along the path (the end bracket); `None` is the path's
+    /// end. Text past it is overset.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub end: Option<f64>,
+    /// Run the other way (the text sits on the other side).
+    pub flip: bool,
+    pub align: PathAlign,
+}
+
+/// Which part of the type sits on the path.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum PathAlign {
+    #[default]
+    Baseline,
+    Ascender,
+    Descender,
+    Center,
+}
+
+impl Default for TextFrameOptions {
+    fn default() -> Self {
+        TextFrameOptions {
+            columns: 1,
+            columns_kind: ColumnsKind::FixedNumber,
+            gutter: 12.0,
+            column_width: 0.0,
+            balance_columns: false,
+            inset: [0.0; 4],
+            vertical_justification: VerticalJustification::Top,
+            vj_paragraph_spacing_limit: 0.0,
+            first_baseline: FirstBaseline::Ascent,
+            first_baseline_min: 0.0,
+            ignore_wrap: false,
+            auto_size: AutoSize::Off,
+            auto_size_ref: 4,
+            auto_size_use_min_height: false,
+            auto_size_min_height: 0.0,
+            auto_size_use_min_width: false,
+            auto_size_min_width: 0.0,
+            auto_size_no_line_breaks: false,
+            column_rule: false,
+            column_rule_weight: 1.0,
+            column_rule_color: designcraft_color::swatch::BLACK.into(),
+            column_rule_tint: 1.0,
+            column_rule_offset: 0.0,
+            column_rule_top_inset: 0.0,
+            column_rule_bottom_inset: 0.0,
+            baseline_grid: None,
+            path: None,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum WrapMode {
+    #[default]
+    None,
+    BoundingBox,
+    Contour,
+    JumpObject,
+    JumpToNextColumn,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum WrapSide {
+    #[default]
+    BothSides,
+    RightSide,
+    LeftSide,
+    TowardsSpine,
+    AwayFromSpine,
+    LargestArea,
+}
+
+/// Text Wrap panel › Contour Options › Type: the outline a contour wrap follows on a graphic frame.
+/// Other frames always wrap around their own path.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ContourType {
+    /// The placed graphic's rectangle (within the frame).
+    BoundingBox,
+    /// Edges detected in the image. Composition follows the frame path.
+    DetectEdges,
+    /// The image's alpha channel. Composition follows the frame path.
+    AlphaChannel,
+    /// A path saved in the image. Composition follows the frame path.
+    PhotoshopPath,
+    /// The frame's path.
+    GraphicFrame,
+    /// The graphic's clipping path, or the frame's path when it has none.
+    #[default]
+    SameAsClipping,
+}
+
+/// Text Wrap panel settings.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct TextWrap {
+    pub mode: WrapMode,
+    /// Top, left, bottom, right offsets.
+    pub offsets: [f64; 4],
+    pub invert: bool,
+    pub side: WrapSide,
+    pub contour: ContourType,
+    /// A custom wrap boundary in the item's inner space, offsets already included. Bounding-box
+    /// and contour wraps follow it instead of the frame; other modes use its bounds. Resizing the
+    /// item transforms it with the path; other path edits keep it as it is.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub path: Option<PathData>,
+}
+
+impl TextWrap {
+    pub fn is_default(&self) -> bool {
+        *self == TextWrap::default()
+    }
+}
+
+/// Vertical text: composed in a box `area.height()` wide and `area.width()` tall at the origin,
+/// placed so lines go down and follow each other leftwards (a clockwise quarter turn).
+pub fn vertical_text_xf(area: Rect) -> Affine {
+    Affine::new([0.0, 1.0, -1.0, 0.0, area.x1, area.y0])
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TextFrame {
+    pub story: StoryId,
+    #[serde(default)]
+    pub options: TextFrameOptions,
+}
diff --git a/crates/doc/src/lib.rs b/crates/doc/src/lib.rs
index a509fdd8b..bf9998209 100644
--- a/crates/doc/src/lib.rs
+++ b/crates/doc/src/lib.rs
@@ -20,6 +20,7 @@ pub mod cjk_settings;
 pub mod datamerge;
 mod edit;
 pub mod endnotes;
+pub mod file_info;
 pub mod flex;
 pub mod ids;
 pub mod index;
@@ -53,6 +54,7 @@ pub use designcraft_color as color;
 pub use designcraft_geom as geom;
 pub use edit::{ItemLoc, ItemPath, SpreadRef, hit_descendant, item_hit as edit_hit};
 pub use endnotes::{ENDNOTE_REF, EditorialNote, EndnoteOptions, NOTE_MARK};
+pub use file_info::FileInfo;
 pub use flex::{FlexAlign, FlexDirection, FlexJustify, FlexLayout, FlexSize};
 pub use ids::*;
 pub use index::{INDEX_MARK, IndexRef};
@@ -237,7 +239,8 @@ impl Document {
     }
 }
 
-/// Ink Manager settings for output.
+/// Ink Manager settings for output, by swatch name. Output applies them through a
+/// `craft_prepress::InkSet` built from the document (`designcraft_pdf::inks`).
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase", default)]
 pub struct InkManager {
@@ -253,19 +256,6 @@ impl InkManager {
     fn is_default(&self) -> bool {
         *self == Self::default()
     }
-
-    /// The ink a spot swatch prints on (after aliases; at most a few hops) and whether it's
-    /// converted to process.
-    pub fn resolve<'a>(&'a self, ink: &'a str) -> (&'a str, bool) {
-        let mut n = ink;
-        for _ in 0..8 {
-            match self.aliases.iter().find(|(a, _)| a == n) {
-                Some((_, to)) if to != n => n = to,
-                _ => break,
-            }
-        }
-        (n, self.all_to_process || self.to_process.iter().any(|x| x == n))
-    }
 }
 
 /// XML tags and mappings.
@@ -343,6 +333,26 @@ pub enum ChapterSource {
     SameAsPrevious,
 }
 
+/// EPUB Export Options › Split Document: where a reflowable EPUB starts a new content file.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum EpubSplit {
+    /// One content file.
+    #[default]
+    Off,
+    /// Single Paragraph Style: a file starts before each paragraph of the named style.
+    Style(String),
+    /// Based on Paragraph Style Export Tags: a file starts before each paragraph of a style whose
+    /// Export Tagging has Split Document on.
+    ExportTags,
+}
+
+impl EpubSplit {
+    pub fn is_off(&self) -> bool {
+        *self == EpubSplit::Off
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase", default)]
 pub struct DocSettings {
@@ -417,6 +427,9 @@ pub struct DocSettings {
     /// The fill and stroke new shapes are drawn with: what the Tools panel's proxy shows and sets
     /// with nothing selected (InDesign's document defaults).
     pub new_object: NewObjectColors,
+    /// EPUB Export Options › Split Document.
+    #[serde(skip_serializing_if = "EpubSplit::is_off")]
+    pub epub_split: EpubSplit,
 }
 
 fn is_true(b: &bool) -> bool {
@@ -482,6 +495,7 @@ impl Default for DocSettings {
             zero_point_locked: false,
             column_guides_locked: true,
             new_object: NewObjectColors::default(),
+            epub_split: EpubSplit::Off,
         }
     }
 }
@@ -640,6 +654,9 @@ fn is_zero(v: &u32) -> bool {
 #[serde(rename_all = "camelCase")]
 pub struct Document {
     pub title: String,
+    /// File › File Info.
+    #[serde(default, skip_serializing_if = "FileInfo::is_empty")]
+    pub file_info: FileInfo,
     pub settings: DocSettings,
     pub spreads: Vec<Arc<Spread>>,
     pub parents: Vec<Arc<Spread>>,
diff --git a/crates/doc/src/notes.rs b/crates/doc/src/notes.rs
index c4d83969a..0811c549c 100644
--- a/crates/doc/src/notes.rs
+++ b/crates/doc/src/notes.rs
@@ -262,7 +262,7 @@ impl crate::Document {
         let Some(me) = self.story(sid) else { return o.start_at };
         let mine = key(me);
         let before: usize = self.stories.values().filter(|st| st.id != sid && !st.notes.is_empty() && key(st) < mine).map(|st| st.notes.len()).sum();
-        o.start_at + before as u32
+        o.start_at.saturating_add(before as u32)
     }
 
     /// Absolute page an item sits on (its center), None on parent pages / pasteboard-only spreads.
diff --git a/crates/doc/src/story.rs b/crates/doc/src/story.rs
index e3a0e39ee..05adcb35f 100644
--- a/crates/doc/src/story.rs
+++ b/crates/doc/src/story.rs
@@ -125,6 +125,9 @@ pub struct Story {
     /// right to left, in every frame of the thread.
     #[serde(default, skip_serializing_if = "std::ops::Not::not")]
     pub vertical: bool,
+    /// Story ▸ Optical Margin Alignment.
+    #[serde(default, skip_serializing_if = "OpticalMargin::is_default")]
+    pub optical_margin: OpticalMargin,
     /// Bumped on every edit (composition cache key).
     #[serde(default)]
     pub rev: u64,
@@ -160,6 +163,45 @@ pub struct Story {
     pub file_link: Option<TextFileLink>,
 }
 
+/// Story ▸ Optical Margin Alignment: punctuation and the edges of some letters hang outside the
+/// frame's edges, in every paragraph of the story except those with Ignore Optical Margin.
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct OpticalMargin {
+    pub on: bool,
+    /// The type size (points) the hang amounts are set for: text of this size hangs by the
+    /// built-in proportions of each character's advance, and the hang grows with this size.
+    pub size: f64,
+}
+
+impl Default for OpticalMargin {
+    fn default() -> Self {
+        OpticalMargin { on: false, size: Self::DEFAULT_SIZE }
+    }
+}
+
+impl OpticalMargin {
+    pub const DEFAULT_SIZE: f64 = 12.0;
+    /// InDesign's range for the size.
+    pub const MIN_SIZE: f64 = 0.1;
+    pub const MAX_SIZE: f64 = 1296.0;
+
+    /// `v` clamped to the size range, or `None` when it isn't a finite number.
+    pub fn clamp_size(v: f64) -> Option<f64> {
+        v.is_finite().then(|| v.clamp(Self::MIN_SIZE, Self::MAX_SIZE))
+    }
+
+    /// The size the story's text hangs for, when the setting is on (a stored size outside the
+    /// range is clamped, a non-finite one reads as the default).
+    pub fn hang_size(&self) -> Option<f64> {
+        self.on.then(|| Self::clamp_size(self.size).unwrap_or(Self::DEFAULT_SIZE))
+    }
+
+    pub fn is_default(&self) -> bool {
+        *self == Self::default()
+    }
+}
+
 /// A linked text file: where a placed story came from, what the file held, and the Word Import
 /// Options that brought it in, so Update Link can import it again the same way.
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
@@ -201,6 +243,7 @@ impl Story {
             frames: vec![],
             direction: crate::TextDirection::LeftToRight,
             vertical: false,
+            optical_margin: OpticalMargin::default(),
             rev: 0,
             tables: BTreeMap::new(),
             notes: Vec::new(),
@@ -596,6 +639,22 @@ mod tests {
         Story::with_text(StoryId(1), t, ParaFormat::default())
     }
 
+    #[test]
+    fn optical_margin_is_optional_in_saved_stories() {
+        let plain = serde_json::to_value(st("Text")).unwrap();
+        assert!(plain.get("opticalMargin").is_none());
+        let old: Story = serde_json::from_value(plain).unwrap();
+        assert_eq!(old.optical_margin, OpticalMargin { on: false, size: 12.0 });
+        let mut s = st("Text");
+        s.optical_margin = OpticalMargin { on: true, size: 18.0 };
+        let back: Story = serde_json::from_value(serde_json::to_value(&s).unwrap()).unwrap();
+        assert_eq!(back.optical_margin, s.optical_margin);
+        // A hostile stored size is clamped where it is used.
+        assert_eq!(OpticalMargin { on: true, size: 1e9 }.hang_size(), Some(OpticalMargin::MAX_SIZE));
+        assert_eq!(OpticalMargin { on: true, size: -3.0 }.hang_size(), Some(OpticalMargin::MIN_SIZE));
+        assert_eq!(OpticalMargin { on: false, size: 18.0 }.hang_size(), None);
+    }
+
     #[test]
     fn paragraphs_track_newlines() {
         let mut s = st("one\ntwo");
diff --git a/crates/doc/src/styles.rs b/crates/doc/src/styles.rs
index 5c747fdbf..7605cc447 100644
--- a/crates/doc/src/styles.rs
+++ b/crates/doc/src/styles.rs
@@ -113,6 +113,10 @@ pub struct ExportTag {
     pub tag: String,
     /// CSS class (empty = from the style name).
     pub class: String,
+    /// Split Document (EPUB only): an EPUB content file starts before each paragraph of the
+    /// style, when the document's EPUB split is based on export tags (`EpubSplit::ExportTags`).
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub split: bool,
 }
 
 impl Styles {
diff --git a/crates/doc/src/swatch_refs.rs b/crates/doc/src/swatch_refs.rs
index d15519fcf..1e79662e9 100644
--- a/crates/doc/src/swatch_refs.rs
+++ b/crates/doc/src/swatch_refs.rs
@@ -17,6 +17,53 @@ struct Names<'a> {
 }
 
 impl Names<'_> {
+    /// Rename the swatch references in every paragraph, character, object, cell and table style.
+    fn styles(&self, styles: &mut crate::styles::Styles) {
+        let n = self;
+        for p in &mut styles.paragraph {
+            n.para(&mut p.para);
+            n.chars(&mut p.chars);
+        }
+        for c in &mut styles.character {
+            n.chars(&mut c.chars);
+        }
+        for o in &mut styles.object {
+            if let Some(f) = &mut o.fill {
+                n.fill(f);
+            }
+            if let Some(s) = &mut o.stroke {
+                n.stroke(s);
+            }
+            if let Some(tf) = &mut o.text_frame {
+                n.frame(tf);
+            }
+        }
+        for c in &mut styles.cell {
+            n.o(&mut c.fill);
+            if let Some(s) = &mut c.stroke {
+                n.cell_stroke(s);
+            }
+            for s in &mut c.strokes {
+                n.stroke_attrs(s);
+            }
+        }
+        for t in &mut styles.table {
+            if let Some(b) = &mut t.border {
+                n.cell_stroke(b);
+            }
+            for b in &mut t.borders {
+                n.stroke_attrs(b);
+            }
+            if let Some(f) = &mut t.alt_rows {
+                n.alt_fills(f);
+            }
+            n.alt_fill_attrs(&mut t.row_fills);
+            n.alt_fill_attrs(&mut t.column_fills);
+            n.alt_stroke_attrs(&mut t.row_strokes);
+            n.alt_stroke_attrs(&mut t.column_strokes);
+        }
+    }
+
     fn s(&self, v: &mut String) {
         if v == self.from {
             *v = self.to.to_string();
@@ -142,9 +189,50 @@ impl Names<'_> {
 }
 
 impl Document {
+    /// Give gradient stops that name a color swatch that swatch's current color, after a
+    /// swatch edit. Stops whose swatch is gone or isn't a color keep the color they have.
+    pub fn refresh_gradient_stops(&mut self) {
+        let mut fresh: Vec<(usize, usize, designcraft_color::Color)> = Vec::new();
+        for (wi, w) in self.swatches.iter().enumerate() {
+            let SwatchValue::Gradient { gradient } = &w.value else { continue };
+            for (si, stop) in gradient.stops.iter().enumerate() {
+                let Some(name) = &stop.swatch else { continue };
+                if designcraft_color::swatch::resolve_gradient(&self.swatches, name).is_some() {
+                    continue;
+                }
+                if let Some(c) = self.resolve_color(name, 1.0)
+                    && c != stop.color
+                {
+                    fresh.push((wi, si, c));
+                }
+            }
+        }
+        for (wi, si, c) in fresh {
+            if let Some(SwatchValue::Gradient { gradient }) = self.swatches.get_mut(wi).map(|w| &mut w.value)
+                && let Some(stop) = gradient.stops.get_mut(si)
+            {
+                stop.color = c;
+            }
+        }
+    }
+
+    /// Turn gradient stops that name swatch `name` into plain colors (the swatch is being
+    /// deleted); each keeps the color it shows.
+    pub fn forget_gradient_stop_swatch(&mut self, name: &str) {
+        for w in &mut self.swatches {
+            let SwatchValue::Gradient { gradient } = &mut w.value else { continue };
+            for stop in &mut gradient.stops {
+                if stop.swatch.as_deref() == Some(name) {
+                    stop.swatch = None;
+                }
+            }
+        }
+    }
+
     /// Point every reference to swatch `from` at `to`: tints based on it, colour groups, inks,
     /// styles, page items (fills, strokes, gaps, effects, column rules), text, kenten and ruby
     /// colours, rules, shading, borders and border gaps, tables (with stroke gaps), footnotes,
+    /// gradient stops,
     /// endnotes and the footnote rule. The swatch itself is renamed by the
     /// caller.
     pub fn rename_swatch_refs(&mut self, from: &str, to: &str) {
@@ -153,8 +241,14 @@ impl Document {
         }
         let n = Names { from, to };
         for w in &mut self.swatches {
-            if let SwatchValue::Tint { base, .. } = &mut w.value {
-                n.s(base);
+            match &mut w.value {
+                SwatchValue::Tint { base, .. } => n.s(base),
+                SwatchValue::Gradient { gradient } => {
+                    for stop in &mut gradient.stops {
+                        n.o(&mut stop.swatch);
+                    }
+                }
+                _ => {}
             }
         }
         for g in &mut self.color_groups {
@@ -170,49 +264,7 @@ impl Document {
             n.s(b);
         }
         n.s(&mut self.footnote_options.rule.color);
-        let styles = self.styles_mut();
-        for p in &mut styles.paragraph {
-            n.para(&mut p.para);
-            n.chars(&mut p.chars);
-        }
-        for c in &mut styles.character {
-            n.chars(&mut c.chars);
-        }
-        for o in &mut styles.object {
-            if let Some(f) = &mut o.fill {
-                n.fill(f);
-            }
-            if let Some(s) = &mut o.stroke {
-                n.stroke(s);
-            }
-            if let Some(tf) = &mut o.text_frame {
-                n.frame(tf);
-            }
-        }
-        for c in &mut styles.cell {
-            n.o(&mut c.fill);
-            if let Some(s) = &mut c.stroke {
-                n.cell_stroke(s);
-            }
-            for s in &mut c.strokes {
-                n.stroke_attrs(s);
-            }
-        }
-        for t in &mut styles.table {
-            if let Some(b) = &mut t.border {
-                n.cell_stroke(b);
-            }
-            for b in &mut t.borders {
-                n.stroke_attrs(b);
-            }
-            if let Some(f) = &mut t.alt_rows {
-                n.alt_fills(f);
-            }
-            n.alt_fill_attrs(&mut t.row_fills);
-            n.alt_fill_attrs(&mut t.column_fills);
-            n.alt_stroke_attrs(&mut t.row_strokes);
-            n.alt_stroke_attrs(&mut t.column_strokes);
-        }
+        n.styles(self.styles_mut());
         for sp in self.spreads.iter_mut().chain(self.parents.iter_mut()) {
             for it in &mut Arc::make_mut(sp).items {
                 n.item(Arc::make_mut(it), 0);
diff --git a/crates/doc/src/table.rs b/crates/doc/src/table.rs
index d80b1d475..d5342b5c9 100644
--- a/crates/doc/src/table.rs
+++ b/crates/doc/src/table.rs
@@ -16,345 +16,14 @@ use crate::ids::StoryId;
 use crate::item::{FirstBaseline, StrokeType, VerticalJustification};
 use crate::story::{CharFormat, ParaFormat, Story, TABLE_ANCHOR};
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum RowHeightMode {
-    /// Grows with the content (the height is a minimum).
-    #[default]
-    AtLeast,
-    Exactly,
-}
+mod cell;
+mod edit;
+mod grid;
+mod merge;
+mod story;
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum RowKind {
-    Header,
-    #[default]
-    Body,
-    Footer,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct Row {
-    pub height: f64,
-    pub mode: RowHeightMode,
-    pub kind: RowKind,
-}
-
-impl Default for Row {
-    fn default() -> Self {
-        Row { height: 3.0, mode: RowHeightMode::AtLeast, kind: RowKind::Body }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Column {
-    pub width: f64,
-}
-
-/// One cell edge or the table border.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct CellStroke {
-    pub weight: f64,
-    pub color: String,
-    pub tint: f32,
-    pub kind: StrokeType,
-    /// Painted in the gaps of dashed, dotted and striped types.
-    #[serde(skip_serializing_if = "is_no_swatch")]
-    pub gap_color: String,
-    #[serde(skip_serializing_if = "is_full")]
-    pub gap_tint: f32,
-}
-
-fn is_no_swatch(s: &str) -> bool {
-    s == designcraft_color::swatch::NONE
-}
-fn is_full(t: &f32) -> bool {
-    *t == 1.0
-}
-
-impl Default for CellStroke {
-    fn default() -> Self {
-        CellStroke {
-            weight: 1.0,
-            color: designcraft_color::swatch::BLACK.into(),
-            tint: 1.0,
-            kind: StrokeType::Solid,
-            gap_color: designcraft_color::swatch::NONE.into(),
-            gap_tint: 1.0,
-        }
-    }
-}
-
-impl CellStroke {
-    pub fn none() -> Self {
-        CellStroke { weight: 0.0, ..Default::default() }
-    }
-    pub fn is_visible(&self) -> bool {
-        self.weight > 0.0 && self.color != designcraft_color::swatch::NONE
-    }
-}
-
-/// Table-level alternating row/column strokes. Retained independently of cell formatting
-/// so an explicit cell style or local edge continues to take precedence.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct AltStrokes {
-    pub first: u32,
-    pub next: u32,
-    pub first_stroke: CellStroke,
-    pub next_stroke: CellStroke,
-    pub skip_first: u32,
-    pub skip_last: u32,
-}
-
-impl Default for AltStrokes {
-    fn default() -> Self {
-        Self {
-            first: 0,
-            next: 0,
-            first_stroke: CellStroke::default(),
-            next_stroke: CellStroke { weight: 0.25, ..Default::default() },
-            skip_first: 0,
-            skip_last: 0,
-        }
-    }
-}
-
-impl AltStrokes {
-    /// A phase-independent stroke for unskipped, visually uniform patterns. Unequal
-    /// patterns and skip settings are preserved for round trips until their boundary
-    /// phase is supported; they must not be rendered with a guessed phase.
-    pub fn uniform_stroke(&self) -> Option<&CellStroke> {
-        if self.skip_first > 0 || self.skip_last > 0 {
-            return None;
-        }
-        match (self.first > 0, self.next > 0) {
-            (true, false) => Some(&self.first_stroke),
-            (false, true) => Some(&self.next_stroke),
-            (true, true) if self.first_stroke == self.next_stroke || (!self.first_stroke.is_visible() && !self.next_stroke.is_visible()) => {
-                Some(&self.first_stroke)
-            }
-            _ => None,
-        }
-    }
-}
-
-fn no_flags(flags: &[bool; 4]) -> bool {
-    !flags.iter().any(|v| *v)
-}
-fn no_priorities(priorities: &[i32; 4]) -> bool {
-    priorities.iter().all(|v| *v == 0)
-}
-
-fn one() -> u32 {
-    1
-}
-fn full() -> f32 {
-    1.0
-}
-fn no_fill() -> String {
-    designcraft_color::swatch::NONE.into()
-}
-fn is_ascent(f: &FirstBaseline) -> bool {
-    *f == FirstBaseline::Ascent
-}
-fn is_zero_min(v: &f64) -> bool {
-    *v == 0.0
-}
-fn default_insets() -> [f64; 4] {
-    [4.0; 4]
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Cell {
-    #[serde(default = "one")]
-    pub row_span: u32,
-    #[serde(default = "one")]
-    pub col_span: u32,
-    /// Cell content (a frameless story).
-    pub text: Story,
-    #[serde(default = "no_fill")]
-    pub fill: String,
-    #[serde(default = "full")]
-    pub fill_tint: f32,
-    /// Top, left, bottom, right.
-    #[serde(default = "default_insets")]
-    pub insets: [f64; 4],
-    #[serde(default)]
-    pub vj: VerticalJustification,
-    /// Cell Options › Text › First Baseline: how far the first line's baseline sits below the
-    /// top inset (IDML `FirstBaselineOffset`), and its minimum (`MinimumFirstBaselineOffset`).
-    #[serde(default, skip_serializing_if = "is_ascent")]
-    pub first_baseline: FirstBaseline,
-    #[serde(default, skip_serializing_if = "is_zero_min")]
-    pub first_baseline_min: f64,
-    /// Text rotation in degrees (only 0 is composed for now).
-    #[serde(default)]
-    pub rotation: f64,
-    /// Edge strokes: top, left, bottom, right.
-    #[serde(default)]
-    pub strokes: [CellStroke; 4],
-    /// Explicit cell-edge formatting takes precedence over the table border, in the same
-    /// top, left, bottom, right order as `strokes`. Older documents keep their table border.
-    #[serde(default)]
-    pub border_overrides: [bool; 4],
-    /// Whether an edge has supplied cell/style attributes, independently of perimeter priority.
-    #[serde(default, skip_serializing_if = "no_flags")]
-    pub stroke_defined: [bool; 4],
-    /// IDML edge-conflict priorities, in top, left, bottom, right order.
-    #[serde(default, skip_serializing_if = "no_priorities")]
-    pub stroke_priorities: [i32; 4],
-    /// Applied cell style ("" = [None]).
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub style: String,
-    /// Graphic cell: an image in the cell instead of text (its `xf` maps into the cell's
-    /// content box, origin at the box's top left).
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub graphic: Option<crate::Graphic>,
-}
-
-impl Default for Cell {
-    fn default() -> Self {
-        Cell {
-            row_span: 1,
-            col_span: 1,
-            text: Story::new(StoryId(0)),
-            fill: no_fill(),
-            fill_tint: 1.0,
-            insets: default_insets(),
-            vj: VerticalJustification::Top,
-            first_baseline: FirstBaseline::Ascent,
-            first_baseline_min: 0.0,
-            rotation: 0.0,
-            strokes: Default::default(),
-            border_overrides: [false; 4],
-            stroke_priorities: [0; 4],
-            stroke_defined: [false; 4],
-            style: String::new(),
-            graphic: None,
-        }
-    }
-}
-
-impl Cell {
-    pub fn with_text(text: &str, para: ParaFormat) -> Cell {
-        Cell { text: Story::with_text(StoryId(0), text, para), ..Default::default() }
-    }
-    /// A cell with this cell's formatting and no text (new rows / columns, unmerged cells).
-    pub fn blank_like(&self) -> Cell {
-        let mut c = Cell { row_span: 1, col_span: 1, ..self.clone() };
-        let para = self.text.paras.first().cloned().map(|p| ParaFormat { table: None, ..p }).unwrap_or_default();
-        let fmt = self.text.chars.first().map(|r| r.format.clone()).unwrap_or_default();
-        c.text = Story::new(StoryId(0));
-        c.text.paras[0] = para;
-        c.text.chars[0].format = fmt;
-        c
-    }
-    pub fn has_fill(&self) -> bool {
-        self.fill != designcraft_color::swatch::NONE
-    }
-}
-
-/// Table → Table Options → Fills (alternating pattern).
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct AltFills {
-    pub first: u32,
-    pub first_color: String,
-    pub first_tint: f32,
-    pub next: u32,
-    pub next_color: String,
-    pub next_tint: f32,
-    pub skip_first: u32,
-    pub skip_last: u32,
-}
-
-impl Default for AltFills {
-    fn default() -> Self {
-        AltFills {
-            first: 1,
-            first_color: designcraft_color::swatch::BLACK.into(),
-            first_tint: 0.2,
-            next: 1,
-            next_color: designcraft_color::swatch::NONE.into(),
-            next_tint: 1.0,
-            skip_first: 0,
-            skip_last: 0,
-        }
-    }
-}
-
-impl AltFills {
-    /// Fill for the `i`-th of `n` body rows/columns, if the pattern paints it.
-    pub fn fill_for(&self, i: usize, n: usize) -> Option<(&str, f32)> {
-        let (sf, sl) = (self.skip_first as usize, self.skip_last as usize);
-        if i < sf || i >= n.saturating_sub(sl) {
-            return None;
-        }
-        let period = (u64::from(self.first) + u64::from(self.next)).max(1);
-        let k = (i - sf) as u64 % period;
-        let (c, t) = if k < u64::from(self.first) { (&self.first_color, self.first_tint) } else { (&self.next_color, self.next_tint) };
-        (c != designcraft_color::swatch::NONE).then_some((c.as_str(), t))
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", default)]
-pub struct TableOptions {
-    /// Logical column zero is drawn at the right edge for RTL tables.
-    pub direction: crate::TextDirection,
-    /// Outer border (overrides the outer cell edges).
-    pub border: CellStroke,
-    /// Per-side borders; absent sides use the legacy uniform `border`.
-    #[serde(skip_serializing_if = "no_borders")]
-    pub borders: [Option<CellStroke>; 4],
-    pub space_before: f64,
-    pub space_after: f64,
-    /// Header rows repeat at the top of every text column / frame the table continues into.
-    pub repeat_header: bool,
-    pub repeat_footer: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub alt_rows: Option<AltFills>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub alt_cols: Option<AltFills>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub row_strokes: Option<AltStrokes>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub column_strokes: Option<AltStrokes>,
-}
-
-fn no_borders(borders: &[Option<CellStroke>; 4]) -> bool {
-    borders.iter().all(Option::is_none)
-}
-
-impl TableOptions {
-    pub fn border_for(&self, side: usize) -> &CellStroke {
-        self.borders.get(side).and_then(Option::as_ref).unwrap_or(&self.border)
-    }
-}
-
-impl Default for TableOptions {
-    fn default() -> Self {
-        TableOptions {
-            direction: crate::TextDirection::LeftToRight,
-            border: CellStroke::default(),
-            borders: Default::default(),
-            space_before: 4.0,
-            space_after: -4.0,
-            repeat_header: true,
-            repeat_footer: true,
-            alt_rows: None,
-            alt_cols: None,
-            row_strokes: None,
-            column_strokes: None,
-        }
-    }
-}
+pub use cell::{AltFills, AltStrokes, Cell, CellStroke, Column, Row, RowHeightMode, RowKind, TableOptions};
+pub use grid::CellRange;
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -371,906 +40,6 @@ pub struct Table {
     pub style: String,
 }
 
-/// A rectangular range of cells (inclusive).
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CellRange {
-    pub r0: usize,
-    pub c0: usize,
-    pub r1: usize,
-    pub c1: usize,
-}
-
-impl CellRange {
-    pub fn cell(r: usize, c: usize) -> Self {
-        CellRange { r0: r, c0: c, r1: r, c1: c }
-    }
-    pub fn new(ra: usize, ca: usize, rb: usize, cb: usize) -> Self {
-        CellRange { r0: ra.min(rb), c0: ca.min(cb), r1: ra.max(rb), c1: ca.max(cb) }
-    }
-    pub fn contains(&self, r: usize, c: usize) -> bool {
-        r >= self.r0 && r <= self.r1 && c >= self.c0 && c <= self.c1
-    }
-}
-
-impl Table {
-    /// A `rows × cols` table (`header` + body + `footer` rows) whose columns share `width`.
-    pub fn new(id: u64, body_rows: usize, cols: usize, header: usize, footer: usize, width: f64) -> Table {
-        let cols = cols.max(1);
-        let mut rows = Vec::new();
-        rows.extend((0..header).map(|_| Row { kind: RowKind::Header, ..Default::default() }));
-        rows.extend((0..body_rows.max(1)).map(|_| Row::default()));
-        rows.extend((0..footer).map(|_| Row { kind: RowKind::Footer, ..Default::default() }));
-        let w = (width / cols as f64).max(3.0);
-        let n = rows.len() * cols;
-        Table {
-            id,
-            rows,
-            columns: vec![Column { width: w }; cols],
-            cells: vec![Cell::default(); n],
-            options: TableOptions::default(),
-            style: String::new(),
-        }
-    }
-
-    /// A table from rows of cell strings (Convert Text to Table). Short rows are padded.
-    pub fn from_strings(id: u64, data: &[Vec<String>], width: f64, para: &ParaFormat, fmt: &CharFormat) -> Table {
-        let cols = data.iter().map(Vec::len).max().unwrap_or(1).max(1);
-        let mut t = Table::new(id, data.len().max(1), cols, 0, 0, width);
-        for (r, row) in data.iter().enumerate() {
-            for (c, s) in row.iter().enumerate() {
-                let Some(cell) = t.cell_mut(r, c) else { continue };
-                cell.text = Story::with_text(StoryId(0), "", ParaFormat { table: None, ..para.clone() });
-                cell.text.chars[0].format = fmt.clone();
-                cell.text.insert(0, s);
-            }
-        }
-        t
-    }
-
-    pub fn nrows(&self) -> usize {
-        self.rows.len()
-    }
-    pub fn ncols(&self) -> usize {
-        self.columns.len()
-    }
-    pub fn width(&self) -> f64 {
-        self.columns.iter().map(|c| c.width).sum()
-    }
-    fn idx(&self, r: usize, c: usize) -> Option<usize> {
-        (r < self.nrows() && c < self.ncols()).then(|| r * self.ncols() + c)
-    }
-    pub fn cell(&self, r: usize, c: usize) -> Option<&Cell> {
-        self.cells.get(self.idx(r, c)?)
-    }
-    pub fn cell_mut(&mut self, r: usize, c: usize) -> Option<&mut Cell> {
-        let i = self.idx(r, c)?;
-        self.cells.get_mut(i)
-    }
-    pub fn header_rows(&self) -> usize {
-        self.rows.iter().take_while(|r| r.kind == RowKind::Header).count()
-    }
-    pub fn footer_rows(&self) -> usize {
-        self.rows.iter().rev().take_while(|r| r.kind == RowKind::Footer).count()
-    }
-    pub fn body_rows(&self) -> std::ops::Range<usize> {
-        self.header_rows()..self.nrows() - self.footer_rows()
-    }
-
-    /// For every grid position, the (row, col) of the cell that owns it.
-    pub fn owners(&self) -> Vec<(usize, usize)> {
-        let (nr, nc) = (self.nrows(), self.ncols());
-        let mut v: Vec<(usize, usize)> = (0..nr * nc).map(|i| (i / nc.max(1), i % nc.max(1))).collect();
-        for r in 0..nr {
-            for c in 0..nc {
-                let cell = &self.cells[r * nc + c];
-                if v[r * nc + c] != (r, c) {
-                    continue;
-                }
-                for rr in r..(r + cell.row_span.max(1) as usize).min(nr) {
-                    for cc in c..(c + cell.col_span.max(1) as usize).min(nc) {
-                        v[rr * nc + cc] = (r, c);
-                    }
-                }
-            }
-        }
-        v
-    }
-
-    /// Owning cells touched by the range, once each in row-major order. Bounds are clipped
-    /// to the grid; resolving covered positions does not expand the selection rectangle.
-    pub fn selected_owners(&self, range: CellRange) -> Vec<(usize, usize)> {
-        let (nr, nc) = (self.nrows(), self.ncols());
-        if range.r0 >= nr || range.c0 >= nc || range.r0 > range.r1 || range.c0 > range.c1 {
-            return Vec::new();
-        }
-        let owners = self.owners();
-        let mut selected = std::collections::BTreeSet::new();
-        for r in range.r0..=range.r1.min(nr - 1) {
-            for c in range.c0..=range.c1.min(nc - 1) {
-                if let Some(&owner) = owners.get(r * nc + c) {
-                    selected.insert(owner);
-                }
-            }
-        }
-        selected.into_iter().collect()
-    }
-
-    /// The owning (top-left) cell address of grid position (r, c).
-    pub fn owner(&self, r: usize, c: usize) -> (usize, usize) {
-        self.owners().get(r * self.ncols() + c).copied().unwrap_or((r, c))
-    }
-
-    /// Merged regions `(r, c, row_span, col_span)` (span > 1 in some direction).
-    pub fn regions(&self) -> Vec<(usize, usize, usize, usize)> {
-        let owners = self.owners();
-        let mut v = Vec::new();
-        for r in 0..self.nrows() {
-            for c in 0..self.ncols() {
-                let cell = &self.cells[r * self.ncols() + c];
-                if owners[r * self.ncols() + c] == (r, c) && (cell.row_span > 1 || cell.col_span > 1) {
-                    v.push((r, c, cell.row_span as usize, cell.col_span as usize));
-                }
-            }
-        }
-        v
-    }
-
-    fn set_regions(&mut self, regions: &[(usize, usize, usize, usize)]) {
-        for c in &mut self.cells {
-            c.row_span = 1;
-            c.col_span = 1;
-        }
-        for &(r, c, rs, cs) in regions {
-            if rs == 0 || cs == 0 {
-                continue;
-            }
-            if let Some(cell) = self.cell_mut(r, c) {
-                cell.row_span = rs as u32;
-                cell.col_span = cs as u32;
-            }
-        }
-    }
-
-    /// Insert `n` rows before row `at` (formatted like the neighbouring row).
-    pub fn insert_rows(&mut self, at: usize, n: usize) {
-        let at = at.min(self.nrows());
-        if n == 0 {
-            return;
-        }
-        let nc = self.ncols();
-        let src = if at < self.nrows() { at } else { at.saturating_sub(1) };
-        let mut row = self.rows.get(src).cloned().unwrap_or_default();
-        // A row inserted between body rows (or after the last header / before the first footer) is a body row.
-        if at > 0 && at < self.nrows() && self.rows[at - 1].kind != self.rows[at].kind {
-            row.kind = RowKind::Body;
-        }
-        if at == self.nrows() && row.kind == RowKind::Header {
-            row.kind = RowKind::Body;
-        }
-        if at == 0 && row.kind == RowKind::Footer {
-            row.kind = RowKind::Body;
-        }
-        let template: Vec<Cell> = (0..nc).map(|c| self.cell(src, c).map(Cell::blank_like).unwrap_or_default()).collect();
-        let regions: Vec<_> = self
-            .regions()
-            .into_iter()
-            .map(|(r, c, rs, cs)| {
-                if r >= at {
-                    (r + n, c, rs, cs)
-                } else if r + rs > at {
-                    (r, c, rs + n, cs)
-                } else {
-                    (r, c, rs, cs)
-                }
-            })
-            .collect();
-        for k in 0..n {
-            self.rows.insert(at + k, row.clone());
-            let i = (at + k) * nc;
-            for (c, cell) in template.iter().enumerate() {
-                self.cells.insert(i + c, cell.clone());
-            }
-        }
-        self.set_regions(&regions);
-    }
-
-    /// Delete rows `at..at+n` (at least one row always remains).
-    pub fn delete_rows(&mut self, at: usize, n: usize) {
-        let nr = self.nrows();
-        let at = at.min(nr);
-        let n = n.min(nr - at).min(nr.saturating_sub(1));
-        if n == 0 {
-            return;
-        }
-        let nc = self.ncols();
-        let end = at + n;
-        let mut regions = Vec::new();
-        for (r, c, rs, cs) in self.regions() {
-            let r1 = r + rs;
-            if r >= at && r1 <= end {
-                continue; // removed entirely
-            }
-            let new_rs = rs - (r1.min(end).saturating_sub(r.max(at)));
-            if r >= at && r < end {
-                // The owner row goes away: move its content to the first surviving row.
-                let content = self.cells[r * nc + c].clone();
-                self.cells[end * nc + c] = content;
-                regions.push((at, c, new_rs, cs));
-            } else if r < at {
-                regions.push((r, c, new_rs, cs));
-            } else {
-                regions.push((r - n, c, rs, cs));
-            }
-        }
-        self.rows.drain(at..end);
-        self.cells.drain(at * nc..end * nc);
-        self.set_regions(&regions);
-    }
-
-    /// Insert `n` columns of `width` before column `at`.
-    pub fn insert_cols(&mut self, at: usize, n: usize, width: f64) {
-        let at = at.min(self.ncols());
-        if n == 0 {
-            return;
-        }
-        let nc = self.ncols();
-        let src = if at < nc { at } else { at.saturating_sub(1) };
-        let regions: Vec<_> = self
-            .regions()
-            .into_iter()
-            .map(|(r, c, rs, cs)| {
-                if c >= at {
-                    (r, c + n, rs, cs)
-                } else if c + cs > at {
-                    (r, c, rs, cs + n)
-                } else {
-                    (r, c, rs, cs)
-                }
-            })
-            .collect();
-        let mut cells = Vec::with_capacity(self.nrows() * (nc + n));
-        for r in 0..self.nrows() {
-            for c in 0..nc {
-                if c == at {
-                    let t = self.cells[r * nc + src].blank_like();
-                    cells.extend(std::iter::repeat_n(t, n));
-                }
-                cells.push(self.cells[r * nc + c].clone());
-            }
-            if at == nc {
-                let t = self.cells[r * nc + src].blank_like();
-                cells.extend(std::iter::repeat_n(t, n));
-            }
-        }
-        self.cells = cells;
-        for k in 0..n {
-            self.columns.insert(at + k, Column { width });
-        }
-        self.set_regions(&regions);
-    }
-
-    /// Delete columns `at..at+n` (at least one column always remains).
-    pub fn delete_cols(&mut self, at: usize, n: usize) {
-        let nc = self.ncols();
-        let at = at.min(nc);
-        let n = n.min(nc - at).min(nc.saturating_sub(1));
-        if n == 0 {
-            return;
-        }
-        let end = at + n;
-        let mut regions = Vec::new();
-        for (r, c, rs, cs) in self.regions() {
-            let c1 = c + cs;
-            if c >= at && c1 <= end {
-                continue;
-            }
-            let new_cs = cs - (c1.min(end).saturating_sub(c.max(at)));
-            if c >= at && c < end {
-                let content = self.cells[r * nc + c].clone();
-                self.cells[r * nc + end] = content;
-                regions.push((r, at, rs, new_cs));
-            } else if c < at {
-                regions.push((r, c, rs, new_cs));
-            } else {
-                regions.push((r, c - n, rs, cs));
-            }
-        }
-        let mut cells = Vec::with_capacity(self.nrows() * (nc - n));
-        for r in 0..self.nrows() {
-            for c in 0..nc {
-                if c < at || c >= end {
-                    cells.push(self.cells[r * nc + c].clone());
-                }
-            }
-        }
-        self.cells = cells;
-        self.columns.drain(at..end);
-        self.set_regions(&regions);
-    }
-
-    /// The smallest range containing `r` that doesn't cut through a merged region.
-    pub fn expand_range(&self, mut r: CellRange) -> CellRange {
-        loop {
-            let mut grown = r;
-            for (rr, cc, rs, cs) in self.regions() {
-                let (re, ce) = (rr + rs - 1, cc + cs - 1);
-                let overlaps = rr <= r.r1 && re >= r.r0 && cc <= r.c1 && ce >= r.c0;
-                if overlaps {
-                    grown = CellRange { r0: grown.r0.min(rr), c0: grown.c0.min(cc), r1: grown.r1.max(re), c1: grown.c1.max(ce) };
-                }
-            }
-            if grown == r {
-                return r;
-            }
-            r = grown;
-        }
-    }
-
-    /// Merge a range into its top-left cell; the other cells' text is appended as paragraphs.
-    pub fn merge(&mut self, range: CellRange) -> Result<(), String> {
-        if range.r1 >= self.nrows() || range.c1 >= self.ncols() {
-            return Err("cell range out of bounds".into());
-        }
-        let range = self.expand_range(range);
-        if range.r0 == range.r1 && range.c0 == range.c1 {
-            return Ok(());
-        }
-        let owners = self.owners();
-        let nc = self.ncols();
-        let mut regions: Vec<_> = self.regions().into_iter().filter(|&(r, c, _, _)| !range.contains(r, c)).collect();
-        let mut extra: Vec<Story> = Vec::new();
-        for r in range.r0..=range.r1 {
-            for c in range.c0..=range.c1 {
-                if (r, c) != (range.r0, range.c0) && owners[r * nc + c] == (r, c) {
-                    let t = std::mem::take(&mut self.cells[r * nc + c]);
-                    self.cells[r * nc + c] = t.blank_like();
-                    if !t.text.is_empty() {
-                        extra.push(t.text);
-                    }
-                }
-            }
-        }
-        let owner = &mut self.cells[range.r0 * nc + range.c0];
-        for s in extra {
-            append_story(&mut owner.text, &s);
-        }
-        regions.push((range.r0, range.c0, range.r1 - range.r0 + 1, range.c1 - range.c0 + 1));
-        self.set_regions(&regions);
-        Ok(())
-    }
-
-    /// Unmerge the merged cell covering (r, c).
-    pub fn unmerge(&mut self, r: usize, c: usize) {
-        let (or, oc) = self.owner(r, c);
-        let regions: Vec<_> = self.regions().into_iter().filter(|&(rr, cc, _, _)| (rr, cc) != (or, oc)).collect();
-        self.set_regions(&regions);
-    }
-
-    /// Split each original owner touched by `range` once. Remember merged-cell cuts in the
-    /// original grid: a neighboring split may refine that grid before we reach the owner.
-    pub fn split_cells(&mut self, range: CellRange, horizontal: bool) -> Result<(), String> {
-        if range.r0 > range.r1 || range.c0 > range.c1 || range.r1 >= self.nrows() || range.c1 >= self.ncols() {
-            return Err("cell range out of bounds".into());
-        }
-        let owners = self.owners();
-        let mut selected = std::collections::BTreeSet::new();
-        for r in range.r0..=range.r1 {
-            for c in range.c0..=range.c1 {
-                let owner = owners.get(r * self.ncols() + c).ok_or("missing cell owner")?;
-                selected.insert(*owner);
-            }
-        }
-        let mut targets = Vec::new();
-        for (r, c) in selected {
-            let cell = self.cell(r, c).ok_or("missing split cell")?;
-            let span = if horizontal { cell.row_span } else { cell.col_span } as usize;
-            let start = if horizontal { r } else { c };
-            let cut = if span > 1 { Some(start.checked_add(span.div_ceil(2)).ok_or("invalid split boundary")?) } else { None };
-            targets.push((r, c, cut));
-        }
-        for i in 0..targets.len() {
-            let (r, c, cut) = *targets.get(i).ok_or("missing split target")?;
-            let cell = self.cell(r, c).ok_or("missing split cell")?;
-            let (rs, cs) = (cell.row_span as usize, cell.col_span as usize);
-            let mut blank = cell.blank_like();
-            // Splitting creates an empty half, not a duplicate of graphic-cell content.
-            blank.graphic = None;
-            let before = if horizontal { self.nrows() } else { self.ncols() };
-            if let Some(cut) = cut {
-                let (start, span) = if horizontal { (r, rs) } else { (c, cs) };
-                let first = cut.checked_sub(start).filter(|n| *n > 0 && *n < span).ok_or("invalid split boundary")?;
-                let mut regions: Vec<_> = self.regions().into_iter().filter(|&(rr, cc, _, _)| (rr, cc) != (r, c)).collect();
-                if horizontal {
-                    regions.push((r, c, first, cs));
-                    regions.push((cut, c, rs - first, cs));
-                } else {
-                    regions.push((r, c, rs, first));
-                    regions.push((r, cut, rs, cs - first));
-                }
-                self.set_regions(&regions);
-            } else {
-                // An originally single-track cell may now span two tracks inserted for its
-                // neighbor. split_cell divides that span instead of inserting another track.
-                self.split_cell(r, c, horizontal);
-            }
-            let first = self.cell(r, c).ok_or("missing split half")?;
-            let second = if horizontal { (r + first.row_span as usize, c) } else { (r, c + first.col_span as usize) };
-            let second = self.cell_mut(second.0, second.1).ok_or("missing split half")?;
-            blank.row_span = second.row_span;
-            blank.col_span = second.col_span;
-            *second = blank;
-            let after = if horizontal { self.nrows() } else { self.ncols() };
-            if after > before {
-                let at = if horizontal { r + 1 } else { c + 1 };
-                let added = after - before;
-                for (row, col, cut) in targets.iter_mut().skip(i + 1) {
-                    let axis = if horizontal { row } else { col };
-                    if *axis >= at {
-                        *axis += added;
-                    }
-                    if let Some(cut) = cut
-                        && *cut >= at
-                    {
-                        *cut += added;
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    /// Split the cell covering (r, c) in two: `horizontal` stacks the halves (Split Cell
-    /// Horizontally), otherwise side by side. A merged cell splits its span; a single cell gets a
-    /// new row (column) that the cells beside it span, the row height (column width) shared.
-    pub fn split_cell(&mut self, r: usize, c: usize, horizontal: bool) {
-        if r >= self.nrows() || c >= self.ncols() {
-            return;
-        }
-        let (or, oc) = self.owner(r, c);
-        let (rs, cs) = self.cell(or, oc).map_or((1, 1), |x| (x.row_span as usize, x.col_span as usize));
-        let mut regions: Vec<_> = self.regions().into_iter().filter(|&(rr, cc, _, _)| (rr, cc) != (or, oc)).collect();
-        let span = if horizontal { rs } else { cs };
-        if span > 1 {
-            let a = span.div_ceil(2);
-            if horizontal {
-                regions.push((or, oc, a, cs));
-                regions.push((or + a, oc, rs - a, cs));
-            } else {
-                regions.push((or, oc, rs, a));
-                regions.push((or, oc + a, rs, cs - a));
-            }
-            self.set_regions(&regions);
-            return;
-        }
-        if horizontal {
-            let row = self.rows[or].clone();
-            self.insert_rows(or + 1, 1);
-            self.rows[or].height = row.height / 2.0;
-            // Both halves keep the split row's height mode and header/body/footer role.
-            self.rows[or + 1] = Row { height: row.height / 2.0, ..row };
-            // insert_rows doesn't grow regions that end at the split row; everything else on it
-            // spans the new row now.
-            let mut regions: Vec<_> = self.regions();
-            let (nr, nc) = (self.nrows(), self.ncols());
-            let mut covered = vec![false; nr * nc];
-            for &(rr, cc, rrs, ccs) in &regions {
-                for y in rr..rr + rrs {
-                    for x in cc..cc + ccs {
-                        covered[y * nc + x] = true;
-                    }
-                }
-            }
-            for reg in regions.iter_mut() {
-                let (rr, cc, rrs, ccs) = *reg;
-                if rr + rrs == or + 1 && !(cc <= oc && oc < cc + ccs) {
-                    *reg = (rr, cc, rrs + 1, ccs);
-                }
-            }
-            for x in 0..nc {
-                if (oc..oc + cs).contains(&x) || covered[or * nc + x] {
-                    continue;
-                }
-                regions.push((or, x, 2, 1));
-            }
-            if cs > 1 {
-                regions.push((or + 1, oc, 1, cs));
-            }
-            self.set_regions(&regions);
-        } else {
-            let w = self.columns[oc].width;
-            self.insert_cols(oc + 1, 1, w / 2.0);
-            self.columns[oc].width = w / 2.0;
-            let mut regions: Vec<_> = self.regions();
-            let (nr, nc) = (self.nrows(), self.ncols());
-            let mut covered = vec![false; nr * nc];
-            for &(rr, cc, rrs, ccs) in &regions {
-                for y in rr..rr + rrs {
-                    for x in cc..cc + ccs {
-                        covered[y * nc + x] = true;
-                    }
-                }
-            }
-            for reg in regions.iter_mut() {
-                let (rr, cc, rrs, ccs) = *reg;
-                if cc + ccs == oc + 1 && !(rr <= or && or < rr + rrs) {
-                    *reg = (rr, cc, rrs, ccs + 1);
-                }
-            }
-            for y in 0..nr {
-                if (or..or + rs).contains(&y) || covered[y * nc + oc] {
-                    continue;
-                }
-                regions.push((y, oc, 1, 2));
-            }
-            if rs > 1 {
-                regions.push((or, oc + 1, rs, 1));
-            }
-            self.set_regions(&regions);
-        }
-    }
-
-    /// Move row `from` to position `to` (indices before the move). Refused when merged cells span
-    /// rows (the move would cut them) or when the move would take a row across a header/footer
-    /// boundary (`from` and `to` must be the same kind of row).
-    pub fn move_row(&mut self, from: usize, to: usize) -> Result<(), String> {
-        let (nr, nc) = (self.nrows(), self.ncols());
-        if from >= nr || to >= nr {
-            return Err("no such row".into());
-        }
-        if self.regions().iter().any(|r| r.2 > 1) {
-            return Err("unmerge cells that span rows first".into());
-        }
-        if self.rows[from].kind != self.rows[to].kind {
-            return Err("header and footer rows must stay first and last".into());
-        }
-        let row = self.rows.remove(from);
-        self.rows.insert(to, row);
-        let cells: Vec<Cell> = self.cells.drain(from * nc..(from + 1) * nc).collect();
-        let at = to * nc;
-        for (k, c) in cells.into_iter().enumerate() {
-            self.cells.insert(at + k, c);
-        }
-        Ok(())
-    }
-
-    /// Move column `from` to position `to`. Refused when merged cells span columns.
-    pub fn move_col(&mut self, from: usize, to: usize) -> Result<(), String> {
-        let (nr, nc) = (self.nrows(), self.ncols());
-        if from >= nc || to >= nc {
-            return Err("no such column".into());
-        }
-        if self.regions().iter().any(|r| r.3 > 1) {
-            return Err("unmerge cells that span columns first".into());
-        }
-        let col = self.columns.remove(from);
-        self.columns.insert(to, col);
-        for r in 0..nr {
-            let c = self.cells.remove(r * nc + from);
-            self.cells.insert(r * nc + to, c);
-        }
-        Ok(())
-    }
-
-    /// Mark the first `header` rows as header rows and the last `footer` rows as footer rows.
-    pub fn set_header_footer(&mut self, header: usize, footer: usize) {
-        let n = self.nrows();
-        let header = header.min(n.saturating_sub(1));
-        let footer = footer.min(n - header - 1);
-        for (i, r) in self.rows.iter_mut().enumerate() {
-            r.kind = if i < header {
-                RowKind::Header
-            } else if i >= n - footer {
-                RowKind::Footer
-            } else {
-                RowKind::Body
-            };
-        }
-    }
-
-    /// Header and footer row counts after Table ▸ Convert Rows turns rows `r0..=r1` into `kind`
-    /// rows. Header rows grow from the top and footer rows from the bottom, so the rows must
-    /// touch the table's edge or the rows already converted; back to body, they must touch the
-    /// body. One body row stays, and no merged cell may straddle a moved boundary.
-    pub fn convert_rows_counts(&self, r0: usize, r1: usize, kind: RowKind) -> Result<(usize, usize), String> {
-        let (r0, r1) = (r0.min(r1), r0.max(r1));
-        let n = self.nrows();
-        if r1 >= n {
-            return Err("row out of range".into());
-        }
-        let (h, f) = (self.header_rows(), self.footer_rows());
-        let body_end = n - f;
-        let (nh, nf) = match kind {
-            RowKind::Header if r0 > h => return Err("select rows at the top of the table or right after its header rows".into()),
-            RowKind::Header if r1 >= body_end => return Err("footer rows can't become header rows".into()),
-            RowKind::Header => (h.max(r1 + 1), f),
-            RowKind::Footer if r1 + 1 < body_end => return Err("select rows at the bottom of the table or right before its footer rows".into()),
-            RowKind::Footer if r0 < h => return Err("header rows can't become footer rows".into()),
-            RowKind::Footer => (h, f.max(n - r0)),
-            RowKind::Body => {
-                if (r0 < h && r1 + 1 < h) || (r1 >= body_end && r0 > body_end) {
-                    return Err("select the header or footer rows next to the body".into());
-                }
-                (if r0 < h { r0 } else { h }, if r1 >= body_end { n - 1 - r1 } else { f })
-            }
-        };
-        if (nh, nf) == (h, f) {
-            return Err("the rows already are of that kind".into());
-        }
-        if nh + nf >= n {
-            return Err("a table keeps at least one body row".into());
-        }
-        let owners = self.owners();
-        let nc = self.ncols();
-        let straddled = |b: usize| (0..nc).any(|c| owners.get(b * nc + c).is_some_and(|o| o.0 < b));
-        if (nh != h && straddled(nh)) || (nf != f && straddled(n - nf)) {
-            return Err("unmerge the cells that span header, body and footer rows first".into());
-        }
-        Ok((nh, nf))
-    }
-
-    /// Cell texts, rows separated by `\n`, cells by `\t` (Convert Table to Text, search, agents).
-    pub fn plain_text(&self) -> String {
-        let mut out = String::new();
-        for r in 0..self.nrows() {
-            if r > 0 {
-                out.push('\n');
-            }
-            for c in 0..self.ncols() {
-                if c > 0 {
-                    out.push('\t');
-                }
-                if let Some(cell) = self.cell(r, c) {
-                    out.push_str(&cell.text.text.replace('\n', " "));
-                }
-            }
-        }
-        out
-    }
-
-    pub fn check(&self) -> Result<(), String> {
-        if self.rows.is_empty() || self.columns.is_empty() {
-            return Err(format!("table {}: no rows or columns", self.id));
-        }
-        if self.cells.len() != self.nrows() * self.ncols() {
-            return Err(format!("table {}: {} cells for {}×{}", self.id, self.cells.len(), self.nrows(), self.ncols()));
-        }
-        // Header rows first, footer rows last.
-        let (h, f) = (self.header_rows(), self.footer_rows());
-        if self.rows[h..self.nrows() - f].iter().any(|r| r.kind != RowKind::Body) {
-            return Err(format!("table {}: header/footer rows out of order", self.id));
-        }
-        self.check_spans()?;
-        for cell in &self.cells {
-            cell.text.check()?;
-        }
-        Ok(())
-    }
-
-    /// Every merged cell stays inside the grid and no two merged cells overlap.
-    fn check_spans(&self) -> Result<(), String> {
-        let mut seen = vec![false; self.cells.len()];
-        for r in 0..self.nrows() {
-            for c in 0..self.ncols() {
-                let cell = &self.cells[r * self.ncols() + c];
-                if cell.row_span == 0 || cell.col_span == 0 {
-                    return Err(format!("table {}: zero span at {r},{c}", self.id));
-                }
-                if cell.row_span == 1 && cell.col_span == 1 {
-                    continue;
-                }
-                if r + cell.row_span as usize > self.nrows() || c + cell.col_span as usize > self.ncols() {
-                    return Err(format!("table {}: span out of bounds at {r},{c}", self.id));
-                }
-                for rr in r..r + cell.row_span as usize {
-                    for cc in c..c + cell.col_span as usize {
-                        let i = rr * self.ncols() + cc;
-                        if seen[i] {
-                            return Err(format!("table {}: overlapping merged cells at {rr},{cc}", self.id));
-                        }
-                        seen[i] = true;
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-/// Append `other` to `s` as new paragraphs.
-fn append_story(s: &mut Story, other: &Story) {
-    if s.is_empty() {
-        *s = Story { id: s.id, ..other.clone() };
-        s.rev = s.rev.wrapping_add(1);
-        return;
-    }
-    let base = s.len();
-    s.insert(base, "\n");
-    // Copy other's runs with their formats.
-    for (r, f) in other.runs() {
-        let at = s.len();
-        s.insert_with(at, &other.text[r], f.clone());
-    }
-    let first_new = s.paras.len() - other.paras.len();
-    for (k, p) in other.paras.iter().enumerate() {
-        if let Some(dst) = s.paras.get_mut(first_new + k) {
-            *dst = p.clone();
-        }
-    }
-}
-
-// ---------- tables in stories ----------
-
-impl crate::Document {
-    /// The story text edits go to: a cell's story when `cell` is set, else the story itself.
-    pub fn text_story(&self, story: StoryId, cell: Option<crate::CellAddr>) -> Option<&Story> {
-        let st = self.story(story)?;
-        match cell {
-            Some(c) if c.table == crate::FOOTNOTE_TABLE => st.note(c.row as u64).map(|n| &n.text),
-            Some(c) => st.tables.get(&c.table)?.cell(c.row, c.col).map(|x| &x.text),
-            None => Some(st),
-        }
-    }
-
-    /// Mutable [`Document::text_story`] (a cell edit bumps the containing story's revision).
-    pub fn text_story_mut(&mut self, story: StoryId, cell: Option<crate::CellAddr>) -> Option<&mut Story> {
-        let st = self.story_mut(story)?;
-        match cell {
-            Some(c) if c.table == crate::FOOTNOTE_TABLE => st.note_mut(c.row as u64).map(|n| &mut n.text),
-            Some(c) => st.table_mut(c.table)?.cell_mut(c.row, c.col).map(|x| &mut x.text),
-            None => Some(st),
-        }
-    }
-}
-
-impl Story {
-    /// Visit this story and every text inside it (table cells, footnotes), mutably.
-    pub fn for_each_text_mut(&mut self, f: &mut impl FnMut(&mut Story)) {
-        f(self);
-        for t in self.tables.values_mut() {
-            for c in &mut std::sync::Arc::make_mut(t).cells {
-                c.text.for_each_text_mut(f);
-            }
-        }
-        for n in &mut self.notes {
-            std::sync::Arc::make_mut(n).text.for_each_text_mut(f);
-        }
-    }
-
-    /// The table whose anchor paragraph is `pi`.
-    pub fn para_table(&self, pi: usize) -> Option<&Arc<Table>> {
-        self.tables.get(&self.paras.get(pi)?.table?)
-    }
-
-    /// Byte offset of a table's anchor character.
-    pub fn table_anchor(&self, id: u64) -> Option<usize> {
-        let pi = self.paras.iter().position(|p| p.table == Some(id))?;
-        let r = self.para_ranges().get(pi)?.clone();
-        self.text[r.clone()].find(TABLE_ANCHOR).map(|k| r.start + k)
-    }
-
-    /// The table anchored at or right before byte `pos` (a caret next to the anchor).
-    pub fn table_at(&self, pos: usize) -> Option<u64> {
-        let pi = self.para_at(pos);
-        self.paras.get(pi)?.table
-    }
-
-    /// Mutable table (copy-on-write); bumps the story revision.
-    pub fn table_mut(&mut self, id: u64) -> Option<&mut Table> {
-        let t = self.tables.get_mut(&id)?;
-        self.rev = self.rev.wrapping_add(1);
-        Some(Arc::make_mut(t))
-    }
-
-    /// Insert `table` at `pos`, giving its anchor its own paragraph. Returns the anchor's byte offset.
-    pub fn insert_table(&mut self, pos: usize, table: Table) -> usize {
-        let pos = crate::story::floor_char_boundary(&self.text, pos.min(self.len()));
-        let pi = self.para_at(pos);
-        let pstart = self.para_ranges()[pi].start;
-        let mut s = String::new();
-        if pos > pstart {
-            s.push('\n');
-        }
-        let anchor = pos + s.len();
-        s.push(TABLE_ANCHOR);
-        if !self.text[pos..].starts_with('\n') {
-            s.push('\n');
-        }
-        let id = table.id;
-        self.tables.insert(id, Arc::new(table));
-        // Insert the text first (fix-up would drop an unreferenced table), then point the paragraph at it.
-        self.insert_raw(pos, &s);
-        let api = self.para_at(anchor);
-        self.paras[api].table = Some(id);
-        self.fix_tables();
-        self.rev = self.rev.wrapping_add(1);
-        anchor
-    }
-
-    /// Keep paragraphs and tables consistent after an edit: a paragraph keeps its table only if it
-    /// still contains an anchor character, every table is referenced once, and tables nobody
-    /// references are dropped. An anchor that shares a table's paragraph with another anchor gets
-    /// a paragraph of its own again, so a table paragraph always holds exactly one anchor.
-    pub(crate) fn fix_tables(&mut self) {
-        self.fix_tables_with(&[]);
-    }
-
-    /// [`Story::fix_tables`] for an edit that knows which table an anchor belongs to: `claims` are
-    /// `(anchor byte offset, table id)` pairs that win over the paragraphs' table ids (a paragraph
-    /// names one table, so merging two anchor paragraphs would otherwise lose one). Every other
-    /// table takes the first unclaimed anchor of its paragraph. Returns the byte offsets, before
-    /// the fix-up, where it inserted paragraph returns.
-    pub(crate) fn fix_tables_with(&mut self, claims: &[(usize, u64)]) -> Vec<usize> {
-        if self.tables.is_empty() && self.paras.iter().all(|p| p.table.is_none()) {
-            return Vec::new();
-        }
-        let mut owner = std::collections::BTreeMap::new();
-        let mut used = std::collections::HashSet::new();
-        for &(at, id) in claims {
-            if self.text.get(at..).is_some_and(|t| t.starts_with(TABLE_ANCHOR))
-                && self.tables.contains_key(&id)
-                && !owner.contains_key(&at)
-                && used.insert(id)
-            {
-                owner.insert(at, id);
-            }
-        }
-        let ranges = self.para_ranges();
-        for (p, r) in self.paras.iter().zip(&ranges) {
-            let Some(id) = p.table.filter(|id| self.tables.contains_key(id) && !used.contains(id)) else { continue };
-            let free = self.text[r.clone()].match_indices(TABLE_ANCHOR).map(|(k, _)| r.start + k).find(|at| !owner.contains_key(at));
-            if let Some(at) = free {
-                used.insert(id);
-                owner.insert(at, id);
-            }
-        }
-        // A paragraph holding a table's anchor and other anchors is split before each later anchor.
-        let mut splits = Vec::new();
-        for r in &ranges {
-            let anchors: Vec<usize> = self.text[r.clone()].match_indices(TABLE_ANCHOR).map(|(k, _)| r.start + k).collect();
-            if anchors.len() > 1 && anchors.iter().any(|at| owner.contains_key(at)) {
-                splits.extend(anchors.into_iter().skip(1));
-            }
-        }
-        for &at in splits.iter().rev() {
-            self.insert_raw(at, "\n");
-        }
-        // Each owned anchor, moved past the returns inserted before it, names its paragraph's table.
-        let owner: std::collections::BTreeMap<usize, u64> =
-            owner.into_iter().map(|(at, id)| (at + splits.partition_point(|&s| s <= at), id)).collect();
-        let ranges = self.para_ranges();
-        for (p, r) in self.paras.iter_mut().zip(ranges) {
-            p.table = owner.range(r).next().map(|(_, &id)| id);
-        }
-        self.tables.retain(|id, _| used.contains(id));
-        splits
-    }
-
-    /// Check table invariants (part of [`Story::check`]).
-    pub(crate) fn check_tables(&self) -> Result<(), String> {
-        let ranges = self.para_ranges();
-        let mut used = std::collections::HashSet::new();
-        for (pi, p) in self.paras.iter().enumerate() {
-            let Some(id) = p.table else { continue };
-            let t = self.tables.get(&id).ok_or_else(|| format!("story {}: paragraph {pi} points at missing table {id}", self.id.0))?;
-            if t.id != id {
-                return Err(format!("story {}: table key {id} != id {}", self.id.0, t.id));
-            }
-            if self.text[ranges[pi].clone()].matches(TABLE_ANCHOR).count() != 1 {
-                return Err(format!("story {}: table {id} paragraph must hold exactly one anchor", self.id.0));
-            }
-            if !used.insert(id) {
-                return Err(format!("story {}: table {id} anchored twice", self.id.0));
-            }
-            t.check()?;
-        }
-        if used.len() != self.tables.len() {
-            return Err(format!("story {}: {} tables but {} anchored", self.id.0, self.tables.len(), used.len()));
-        }
-        Ok(())
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1510,115 +279,3 @@ mod tests {
         assert_eq!(back.blank_like().border_overrides, explicit.border_overrides);
     }
 }
-
-#[cfg(test)]
-mod split_tests {
-    use super::*;
-
-    #[test]
-    fn split_single_and_merged_cells() {
-        let mut t = Table::new(1, 2, 2, 0, 0, 100.0);
-        t.split_cell(0, 0, true);
-        assert_eq!((t.nrows(), t.ncols()), (3, 2));
-        // The cell beside the split one spans both new rows.
-        assert_eq!(t.cell(0, 1).unwrap().row_span, 2);
-        assert_eq!(t.owner(1, 1), (0, 1));
-        assert_eq!(t.owner(1, 0), (1, 0), "the new half is its own cell");
-        t.split_cell(2, 1, false);
-        assert_eq!(t.ncols(), 3);
-        assert_eq!(t.cell(0, 0).unwrap().col_span, 1);
-        assert_eq!(t.owner(2, 2), (2, 2));
-        assert_eq!(t.owner(0, 2), (0, 1), "the merged cell above widens");
-        // A merged cell splits its own span instead of adding rows.
-        let mut m = Table::new(1, 4, 1, 0, 0, 100.0);
-        m.merge(CellRange { r0: 0, c0: 0, r1: 3, c1: 0 }).unwrap();
-        m.split_cell(0, 0, true);
-        assert_eq!(m.nrows(), 4);
-        assert_eq!((m.cell(0, 0).unwrap().row_span, m.cell(2, 0).unwrap().row_span), (2, 2));
-    }
-
-    #[test]
-    fn split_range_keeps_original_merged_cut_when_neighbor_tracks_are_refined() {
-        for horizontal in [true, false] {
-            let mut t = Table::new(1, 4, 4, 0, 0, 280.0);
-            for (i, size) in [40.0, 60.0, 80.0, 100.0].into_iter().enumerate() {
-                t.rows[i].mode = RowHeightMode::Exactly;
-                t.rows[i].height = if horizontal { size } else { 70.0 };
-                t.columns[i].width = if horizontal { 70.0 } else { size };
-            }
-            for r in 0..4 {
-                for c in 0..4 {
-                    let cell = t.cell_mut(r, c).unwrap();
-                    cell.text.insert(0, &format!("{r},{c}"));
-                    cell.style = format!("style-{r}-{c}");
-                    cell.insets = [r as f64 + c as f64 + 1.0; 4];
-                }
-            }
-            let (merged, selected, owner, lower, neighbor, moved_neighbor) = if horizontal {
-                (CellRange::new(0, 1, 2, 1), CellRange::new(0, 0, 2, 1), (0, 1), (4, 1), (3, 3), (6, 3))
-            } else {
-                (CellRange::new(1, 0, 1, 2), CellRange::new(0, 0, 1, 2), (1, 0), (1, 4), (3, 3), (3, 6))
-            };
-            t.merge(merged).unwrap();
-            let original = t.clone();
-            t.split_cells(selected, horizontal).unwrap();
-            t.check().unwrap();
-            assert_eq!((t.nrows(), t.ncols()), if horizontal { (7, 4) } else { (4, 7) });
-            let sizes: Vec<_> = if horizontal { t.rows.iter().map(|r| r.height).collect() } else { t.columns.iter().map(|c| c.width).collect() };
-            assert_eq!(sizes, [20.0, 20.0, 30.0, 30.0, 40.0, 40.0, 100.0]);
-            let first = t.cell(owner.0, owner.1).unwrap();
-            let second = t.cell(lower.0, lower.1).unwrap();
-            // The original three-track merge divides after its second original track,
-            // regardless of which of those tracks a neighboring selected cell subdivides.
-            assert_eq!(if horizontal { first.row_span } else { first.col_span }, 4);
-            assert_eq!(if horizontal { second.row_span } else { second.col_span }, 2);
-            assert_eq!(first.text, original.cell(owner.0, owner.1).unwrap().text);
-            assert!(second.text.is_empty());
-            assert_eq!(second.style, first.style);
-            assert_eq!(second.insets, first.insets);
-            assert_eq!(t.cell(moved_neighbor.0, moved_neighbor.1), original.cell(neighbor.0, neighbor.1));
-            let owners = t.owners();
-            assert_eq!(owners.iter().copied().collect::<std::collections::BTreeSet<_>>().len(), 18, "four original selected owners split once each");
-            let mut before_text: Vec<_> = original.cells.iter().filter(|c| !c.text.is_empty()).map(|c| c.text.text.clone()).collect();
-            let mut after_text: Vec<_> = t.cells.iter().filter(|c| !c.text.is_empty()).map(|c| c.text.text.clone()).collect();
-            before_text.sort();
-            after_text.sort();
-            assert_eq!(after_text, before_text, "no original text is copied or lost");
-        }
-    }
-
-    #[test]
-    fn split_range_resolves_covered_positions_without_expanding_selection() {
-        for horizontal in [true, false] {
-            let mut t = Table::new(1, 3, 3, 0, 0, 180.0);
-            t.merge(CellRange::new(0, 0, 1, 1)).unwrap();
-            let selected = if horizontal { CellRange::new(1, 1, 1, 2) } else { CellRange::new(1, 1, 2, 1) };
-            t.split_cells(selected, horizontal).unwrap();
-            t.check().unwrap();
-            let owners = t.owners();
-            assert_eq!(owners.iter().copied().collect::<std::collections::BTreeSet<_>>().len(), 8, "only the two touched owners split");
-            assert_eq!((t.nrows(), t.ncols()), if horizontal { (4, 3) } else { (3, 4) });
-            assert_eq!(t.owner(0, 0), (0, 0));
-            assert_eq!(if horizontal { t.owner(1, 0) } else { t.owner(0, 1) }, if horizontal { (1, 0) } else { (0, 1) });
-        }
-    }
-
-    #[test]
-    fn split_header_row_keeps_its_height_mode_and_role() {
-        let mut t = Table::new(1, 1, 2, 1, 1, 180.0);
-        t.rows[0].height = 60.0;
-        t.rows[0].mode = RowHeightMode::Exactly;
-        let body = t.rows[1].clone();
-        let footer = t.rows[2].clone();
-        t.split_cells(CellRange::new(0, 0, 0, 1), true).unwrap();
-        t.check().unwrap();
-        assert_eq!(t.header_rows(), 2);
-        for row in &t.rows[..2] {
-            assert_eq!(row.height, 30.0);
-            assert_eq!(row.mode, RowHeightMode::Exactly);
-            assert_eq!(row.kind, RowKind::Header);
-        }
-        assert_eq!(t.rows[2], body);
-        assert_eq!(t.rows[3], footer);
-    }
-}
diff --git a/crates/doc/src/table/cell.rs b/crates/doc/src/table/cell.rs
new file mode 100644
index 000000000..ac022a7a8
--- /dev/null
+++ b/crates/doc/src/table/cell.rs
@@ -0,0 +1,348 @@
+use super::{Deserialize, FirstBaseline, ParaFormat, Serialize, Story, StoryId, StrokeType, VerticalJustification};
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum RowHeightMode {
+    /// Grows with the content (the height is a minimum).
+    #[default]
+    AtLeast,
+    Exactly,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum RowKind {
+    Header,
+    #[default]
+    Body,
+    Footer,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct Row {
+    pub height: f64,
+    pub mode: RowHeightMode,
+    pub kind: RowKind,
+}
+
+impl Default for Row {
+    fn default() -> Self {
+        Row { height: 3.0, mode: RowHeightMode::AtLeast, kind: RowKind::Body }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Column {
+    pub width: f64,
+}
+
+/// One cell edge or the table border.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct CellStroke {
+    pub weight: f64,
+    pub color: String,
+    pub tint: f32,
+    pub kind: StrokeType,
+    /// Painted in the gaps of dashed, dotted and striped types.
+    #[serde(skip_serializing_if = "is_no_swatch")]
+    pub gap_color: String,
+    #[serde(skip_serializing_if = "is_full")]
+    pub gap_tint: f32,
+}
+
+fn is_no_swatch(s: &str) -> bool {
+    s == designcraft_color::swatch::NONE
+}
+
+fn is_full(t: &f32) -> bool {
+    *t == 1.0
+}
+
+impl Default for CellStroke {
+    fn default() -> Self {
+        CellStroke {
+            weight: 1.0,
+            color: designcraft_color::swatch::BLACK.into(),
+            tint: 1.0,
+            kind: StrokeType::Solid,
+            gap_color: designcraft_color::swatch::NONE.into(),
+            gap_tint: 1.0,
+        }
+    }
+}
+
+impl CellStroke {
+    pub fn none() -> Self {
+        CellStroke { weight: 0.0, ..Default::default() }
+    }
+    pub fn is_visible(&self) -> bool {
+        self.weight > 0.0 && self.color != designcraft_color::swatch::NONE
+    }
+}
+
+/// Table-level alternating row/column strokes. Retained independently of cell formatting
+/// so an explicit cell style or local edge continues to take precedence.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct AltStrokes {
+    pub first: u32,
+    pub next: u32,
+    pub first_stroke: CellStroke,
+    pub next_stroke: CellStroke,
+    pub skip_first: u32,
+    pub skip_last: u32,
+}
+
+impl Default for AltStrokes {
+    fn default() -> Self {
+        Self {
+            first: 0,
+            next: 0,
+            first_stroke: CellStroke::default(),
+            next_stroke: CellStroke { weight: 0.25, ..Default::default() },
+            skip_first: 0,
+            skip_last: 0,
+        }
+    }
+}
+
+impl AltStrokes {
+    /// A phase-independent stroke for unskipped, visually uniform patterns. Unequal
+    /// patterns and skip settings are preserved for round trips until their boundary
+    /// phase is supported; they must not be rendered with a guessed phase.
+    pub fn uniform_stroke(&self) -> Option<&CellStroke> {
+        if self.skip_first > 0 || self.skip_last > 0 {
+            return None;
+        }
+        match (self.first > 0, self.next > 0) {
+            (true, false) => Some(&self.first_stroke),
+            (false, true) => Some(&self.next_stroke),
+            (true, true) if self.first_stroke == self.next_stroke || (!self.first_stroke.is_visible() && !self.next_stroke.is_visible()) => {
+                Some(&self.first_stroke)
+            }
+            _ => None,
+        }
+    }
+}
+
+fn no_flags(flags: &[bool; 4]) -> bool {
+    !flags.iter().any(|v| *v)
+}
+
+fn no_priorities(priorities: &[i32; 4]) -> bool {
+    priorities.iter().all(|v| *v == 0)
+}
+
+fn one() -> u32 {
+    1
+}
+
+fn full() -> f32 {
+    1.0
+}
+
+fn no_fill() -> String {
+    designcraft_color::swatch::NONE.into()
+}
+
+fn is_ascent(f: &FirstBaseline) -> bool {
+    *f == FirstBaseline::Ascent
+}
+
+fn is_zero_min(v: &f64) -> bool {
+    *v == 0.0
+}
+
+fn default_insets() -> [f64; 4] {
+    [4.0; 4]
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Cell {
+    #[serde(default = "one")]
+    pub row_span: u32,
+    #[serde(default = "one")]
+    pub col_span: u32,
+    /// Cell content (a frameless story).
+    pub text: Story,
+    #[serde(default = "no_fill")]
+    pub fill: String,
+    #[serde(default = "full")]
+    pub fill_tint: f32,
+    /// Top, left, bottom, right.
+    #[serde(default = "default_insets")]
+    pub insets: [f64; 4],
+    #[serde(default)]
+    pub vj: VerticalJustification,
+    /// Cell Options › Text › First Baseline: how far the first line's baseline sits below the
+    /// top inset (IDML `FirstBaselineOffset`), and its minimum (`MinimumFirstBaselineOffset`).
+    #[serde(default, skip_serializing_if = "is_ascent")]
+    pub first_baseline: FirstBaseline,
+    #[serde(default, skip_serializing_if = "is_zero_min")]
+    pub first_baseline_min: f64,
+    /// Text rotation in degrees (only 0 is composed for now).
+    #[serde(default)]
+    pub rotation: f64,
+    /// Edge strokes: top, left, bottom, right.
+    #[serde(default)]
+    pub strokes: [CellStroke; 4],
+    /// Explicit cell-edge formatting takes precedence over the table border, in the same
+    /// top, left, bottom, right order as `strokes`. Older documents keep their table border.
+    #[serde(default)]
+    pub border_overrides: [bool; 4],
+    /// Whether an edge has supplied cell/style attributes, independently of perimeter priority.
+    #[serde(default, skip_serializing_if = "no_flags")]
+    pub stroke_defined: [bool; 4],
+    /// IDML edge-conflict priorities, in top, left, bottom, right order.
+    #[serde(default, skip_serializing_if = "no_priorities")]
+    pub stroke_priorities: [i32; 4],
+    /// Applied cell style ("" = [None]).
+    #[serde(default, skip_serializing_if = "String::is_empty")]
+    pub style: String,
+    /// Graphic cell: an image in the cell instead of text (its `xf` maps into the cell's
+    /// content box, origin at the box's top left).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub graphic: Option<crate::Graphic>,
+}
+
+impl Default for Cell {
+    fn default() -> Self {
+        Cell {
+            row_span: 1,
+            col_span: 1,
+            text: Story::new(StoryId(0)),
+            fill: no_fill(),
+            fill_tint: 1.0,
+            insets: default_insets(),
+            vj: VerticalJustification::Top,
+            first_baseline: FirstBaseline::Ascent,
+            first_baseline_min: 0.0,
+            rotation: 0.0,
+            strokes: Default::default(),
+            border_overrides: [false; 4],
+            stroke_priorities: [0; 4],
+            stroke_defined: [false; 4],
+            style: String::new(),
+            graphic: None,
+        }
+    }
+}
+
+impl Cell {
+    pub fn with_text(text: &str, para: ParaFormat) -> Cell {
+        Cell { text: Story::with_text(StoryId(0), text, para), ..Default::default() }
+    }
+    /// A cell with this cell's formatting and no text (new rows / columns, unmerged cells).
+    pub fn blank_like(&self) -> Cell {
+        let mut c = Cell { row_span: 1, col_span: 1, ..self.clone() };
+        let para = self.text.paras.first().cloned().map(|p| ParaFormat { table: None, ..p }).unwrap_or_default();
+        let fmt = self.text.chars.first().map(|r| r.format.clone()).unwrap_or_default();
+        c.text = Story::new(StoryId(0));
+        c.text.paras[0] = para;
+        c.text.chars[0].format = fmt;
+        c
+    }
+    pub fn has_fill(&self) -> bool {
+        self.fill != designcraft_color::swatch::NONE
+    }
+}
+
+/// Table → Table Options → Fills (alternating pattern).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct AltFills {
+    pub first: u32,
+    pub first_color: String,
+    pub first_tint: f32,
+    pub next: u32,
+    pub next_color: String,
+    pub next_tint: f32,
+    pub skip_first: u32,
+    pub skip_last: u32,
+}
+
+impl Default for AltFills {
+    fn default() -> Self {
+        AltFills {
+            first: 1,
+            first_color: designcraft_color::swatch::BLACK.into(),
+            first_tint: 0.2,
+            next: 1,
+            next_color: designcraft_color::swatch::NONE.into(),
+            next_tint: 1.0,
+            skip_first: 0,
+            skip_last: 0,
+        }
+    }
+}
+
+impl AltFills {
+    /// Fill for the `i`-th of `n` body rows/columns, if the pattern paints it.
+    pub fn fill_for(&self, i: usize, n: usize) -> Option<(&str, f32)> {
+        let (sf, sl) = (self.skip_first as usize, self.skip_last as usize);
+        if i < sf || i >= n.saturating_sub(sl) {
+            return None;
+        }
+        let period = (u64::from(self.first) + u64::from(self.next)).max(1);
+        let k = (i - sf) as u64 % period;
+        let (c, t) = if k < u64::from(self.first) { (&self.first_color, self.first_tint) } else { (&self.next_color, self.next_tint) };
+        (c != designcraft_color::swatch::NONE).then_some((c.as_str(), t))
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase", default)]
+pub struct TableOptions {
+    /// Logical column zero is drawn at the right edge for RTL tables.
+    pub direction: crate::TextDirection,
+    /// Outer border (overrides the outer cell edges).
+    pub border: CellStroke,
+    /// Per-side borders; absent sides use the legacy uniform `border`.
+    #[serde(skip_serializing_if = "no_borders")]
+    pub borders: [Option<CellStroke>; 4],
+    pub space_before: f64,
+    pub space_after: f64,
+    /// Header rows repeat at the top of every text column / frame the table continues into.
+    pub repeat_header: bool,
+    pub repeat_footer: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub alt_rows: Option<AltFills>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub alt_cols: Option<AltFills>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub row_strokes: Option<AltStrokes>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub column_strokes: Option<AltStrokes>,
+}
+
+fn no_borders(borders: &[Option<CellStroke>; 4]) -> bool {
+    borders.iter().all(Option::is_none)
+}
+
+impl TableOptions {
+    pub fn border_for(&self, side: usize) -> &CellStroke {
+        self.borders.get(side).and_then(Option::as_ref).unwrap_or(&self.border)
+    }
+}
+
+impl Default for TableOptions {
+    fn default() -> Self {
+        TableOptions {
+            direction: crate::TextDirection::LeftToRight,
+            border: CellStroke::default(),
+            borders: Default::default(),
+            space_before: 4.0,
+            space_after: -4.0,
+            repeat_header: true,
+            repeat_footer: true,
+            alt_rows: None,
+            alt_cols: None,
+            row_strokes: None,
+            column_strokes: None,
+        }
+    }
+}
diff --git a/crates/doc/src/table/edit.rs b/crates/doc/src/table/edit.rs
new file mode 100644
index 000000000..8b140fde1
--- /dev/null
+++ b/crates/doc/src/table/edit.rs
@@ -0,0 +1,260 @@
+use super::Table;
+use super::cell::{Cell, Column, RowKind};
+
+impl Table {
+    /// Insert `n` rows before row `at` (formatted like the neighbouring row).
+    pub fn insert_rows(&mut self, at: usize, n: usize) {
+        let at = at.min(self.nrows());
+        if n == 0 {
+            return;
+        }
+        let nc = self.ncols();
+        let src = if at < self.nrows() { at } else { at.saturating_sub(1) };
+        let mut row = self.rows.get(src).cloned().unwrap_or_default();
+        // A row inserted between body rows (or after the last header / before the first footer) is a body row.
+        if at > 0 && at < self.nrows() && self.rows[at - 1].kind != self.rows[at].kind {
+            row.kind = RowKind::Body;
+        }
+        if at == self.nrows() && row.kind == RowKind::Header {
+            row.kind = RowKind::Body;
+        }
+        if at == 0 && row.kind == RowKind::Footer {
+            row.kind = RowKind::Body;
+        }
+        let template: Vec<Cell> = (0..nc).map(|c| self.cell(src, c).map(Cell::blank_like).unwrap_or_default()).collect();
+        let regions: Vec<_> = self
+            .regions()
+            .into_iter()
+            .map(|(r, c, rs, cs)| {
+                if r >= at {
+                    (r + n, c, rs, cs)
+                } else if r + rs > at {
+                    (r, c, rs + n, cs)
+                } else {
+                    (r, c, rs, cs)
+                }
+            })
+            .collect();
+        for k in 0..n {
+            self.rows.insert(at + k, row.clone());
+            let i = (at + k) * nc;
+            for (c, cell) in template.iter().enumerate() {
+                self.cells.insert(i + c, cell.clone());
+            }
+        }
+        self.set_regions(&regions);
+    }
+
+    /// Delete rows `at..at+n` (at least one row always remains).
+    pub fn delete_rows(&mut self, at: usize, n: usize) {
+        let nr = self.nrows();
+        let at = at.min(nr);
+        let n = n.min(nr - at).min(nr.saturating_sub(1));
+        if n == 0 {
+            return;
+        }
+        let nc = self.ncols();
+        let end = at + n;
+        let mut regions = Vec::new();
+        for (r, c, rs, cs) in self.regions() {
+            let r1 = r + rs;
+            if r >= at && r1 <= end {
+                continue; // removed entirely
+            }
+            let new_rs = rs - (r1.min(end).saturating_sub(r.max(at)));
+            if r >= at && r < end {
+                // The owner row goes away: move its content to the first surviving row.
+                let content = self.cells[r * nc + c].clone();
+                self.cells[end * nc + c] = content;
+                regions.push((at, c, new_rs, cs));
+            } else if r < at {
+                regions.push((r, c, new_rs, cs));
+            } else {
+                regions.push((r - n, c, rs, cs));
+            }
+        }
+        self.rows.drain(at..end);
+        self.cells.drain(at * nc..end * nc);
+        self.set_regions(&regions);
+    }
+
+    /// Insert `n` columns of `width` before column `at`.
+    pub fn insert_cols(&mut self, at: usize, n: usize, width: f64) {
+        let at = at.min(self.ncols());
+        if n == 0 {
+            return;
+        }
+        let nc = self.ncols();
+        let src = if at < nc { at } else { at.saturating_sub(1) };
+        let regions: Vec<_> = self
+            .regions()
+            .into_iter()
+            .map(|(r, c, rs, cs)| {
+                if c >= at {
+                    (r, c + n, rs, cs)
+                } else if c + cs > at {
+                    (r, c, rs, cs + n)
+                } else {
+                    (r, c, rs, cs)
+                }
+            })
+            .collect();
+        let mut cells = Vec::with_capacity(self.nrows() * (nc + n));
+        for r in 0..self.nrows() {
+            for c in 0..nc {
+                if c == at {
+                    let t = self.cells[r * nc + src].blank_like();
+                    cells.extend(std::iter::repeat_n(t, n));
+                }
+                cells.push(self.cells[r * nc + c].clone());
+            }
+            if at == nc {
+                let t = self.cells[r * nc + src].blank_like();
+                cells.extend(std::iter::repeat_n(t, n));
+            }
+        }
+        self.cells = cells;
+        for k in 0..n {
+            self.columns.insert(at + k, Column { width });
+        }
+        self.set_regions(&regions);
+    }
+
+    /// Delete columns `at..at+n` (at least one column always remains).
+    pub fn delete_cols(&mut self, at: usize, n: usize) {
+        let nc = self.ncols();
+        let at = at.min(nc);
+        let n = n.min(nc - at).min(nc.saturating_sub(1));
+        if n == 0 {
+            return;
+        }
+        let end = at + n;
+        let mut regions = Vec::new();
+        for (r, c, rs, cs) in self.regions() {
+            let c1 = c + cs;
+            if c >= at && c1 <= end {
+                continue;
+            }
+            let new_cs = cs - (c1.min(end).saturating_sub(c.max(at)));
+            if c >= at && c < end {
+                let content = self.cells[r * nc + c].clone();
+                self.cells[r * nc + end] = content;
+                regions.push((r, at, rs, new_cs));
+            } else if c < at {
+                regions.push((r, c, rs, new_cs));
+            } else {
+                regions.push((r, c - n, rs, cs));
+            }
+        }
+        let mut cells = Vec::with_capacity(self.nrows() * (nc - n));
+        for r in 0..self.nrows() {
+            for c in 0..nc {
+                if c < at || c >= end {
+                    cells.push(self.cells[r * nc + c].clone());
+                }
+            }
+        }
+        self.cells = cells;
+        self.columns.drain(at..end);
+        self.set_regions(&regions);
+    }
+
+    /// Move row `from` to position `to` (indices before the move). Refused when merged cells span
+    /// rows (the move would cut them) or when the move would take a row across a header/footer
+    /// boundary (`from` and `to` must be the same kind of row).
+    pub fn move_row(&mut self, from: usize, to: usize) -> Result<(), String> {
+        let (nr, nc) = (self.nrows(), self.ncols());
+        if from >= nr || to >= nr {
+            return Err("no such row".into());
+        }
+        if self.regions().iter().any(|r| r.2 > 1) {
+            return Err("unmerge cells that span rows first".into());
+        }
+        if self.rows[from].kind != self.rows[to].kind {
+            return Err("header and footer rows must stay first and last".into());
+        }
+        let row = self.rows.remove(from);
+        self.rows.insert(to, row);
+        let cells: Vec<Cell> = self.cells.drain(from * nc..(from + 1) * nc).collect();
+        let at = to * nc;
+        for (k, c) in cells.into_iter().enumerate() {
+            self.cells.insert(at + k, c);
+        }
+        Ok(())
+    }
+
+    /// Move column `from` to position `to`. Refused when merged cells span columns.
+    pub fn move_col(&mut self, from: usize, to: usize) -> Result<(), String> {
+        let (nr, nc) = (self.nrows(), self.ncols());
+        if from >= nc || to >= nc {
+            return Err("no such column".into());
+        }
+        if self.regions().iter().any(|r| r.3 > 1) {
+            return Err("unmerge cells that span columns first".into());
+        }
+        let col = self.columns.remove(from);
+        self.columns.insert(to, col);
+        for r in 0..nr {
+            let c = self.cells.remove(r * nc + from);
+            self.cells.insert(r * nc + to, c);
+        }
+        Ok(())
+    }
+
+    /// Mark the first `header` rows as header rows and the last `footer` rows as footer rows.
+    pub fn set_header_footer(&mut self, header: usize, footer: usize) {
+        let n = self.nrows();
+        let header = header.min(n.saturating_sub(1));
+        let footer = footer.min(n - header - 1);
+        for (i, r) in self.rows.iter_mut().enumerate() {
+            r.kind = if i < header {
+                RowKind::Header
+            } else if i >= n - footer {
+                RowKind::Footer
+            } else {
+                RowKind::Body
+            };
+        }
+    }
+
+    /// Header and footer row counts after Table ▸ Convert Rows turns rows `r0..=r1` into `kind`
+    /// rows. Header rows grow from the top and footer rows from the bottom, so the rows must
+    /// touch the table's edge or the rows already converted; back to body, they must touch the
+    /// body. One body row stays, and no merged cell may straddle a moved boundary.
+    pub fn convert_rows_counts(&self, r0: usize, r1: usize, kind: RowKind) -> Result<(usize, usize), String> {
+        let (r0, r1) = (r0.min(r1), r0.max(r1));
+        let n = self.nrows();
+        if r1 >= n {
+            return Err("row out of range".into());
+        }
+        let (h, f) = (self.header_rows(), self.footer_rows());
+        let body_end = n - f;
+        let (nh, nf) = match kind {
+            RowKind::Header if r0 > h => return Err("select rows at the top of the table or right after its header rows".into()),
+            RowKind::Header if r1 >= body_end => return Err("footer rows can't become header rows".into()),
+            RowKind::Header => (h.max(r1 + 1), f),
+            RowKind::Footer if r1 + 1 < body_end => return Err("select rows at the bottom of the table or right before its footer rows".into()),
+            RowKind::Footer if r0 < h => return Err("header rows can't become footer rows".into()),
+            RowKind::Footer => (h, f.max(n - r0)),
+            RowKind::Body => {
+                if (r0 < h && r1 + 1 < h) || (r1 >= body_end && r0 > body_end) {
+                    return Err("select the header or footer rows next to the body".into());
+                }
+                (if r0 < h { r0 } else { h }, if r1 >= body_end { n - 1 - r1 } else { f })
+            }
+        };
+        if (nh, nf) == (h, f) {
+            return Err("the rows already are of that kind".into());
+        }
+        if nh + nf >= n {
+            return Err("a table keeps at least one body row".into());
+        }
+        let owners = self.owners();
+        let nc = self.ncols();
+        let straddled = |b: usize| (0..nc).any(|c| owners.get(b * nc + c).is_some_and(|o| o.0 < b));
+        if (nh != h && straddled(nh)) || (nf != f && straddled(n - nf)) {
+            return Err("unmerge the cells that span header, body and footer rows first".into());
+        }
+        Ok((nh, nf))
+    }
+}
diff --git a/crates/doc/src/table/grid.rs b/crates/doc/src/table/grid.rs
new file mode 100644
index 000000000..a64f2cd99
--- /dev/null
+++ b/crates/doc/src/table/grid.rs
@@ -0,0 +1,239 @@
+use super::cell::{Cell, Column, Row, RowKind, TableOptions};
+use super::{CharFormat, Deserialize, ParaFormat, Serialize, Story, StoryId, Table};
+
+/// A rectangular range of cells (inclusive).
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CellRange {
+    pub r0: usize,
+    pub c0: usize,
+    pub r1: usize,
+    pub c1: usize,
+}
+
+impl CellRange {
+    pub fn cell(r: usize, c: usize) -> Self {
+        CellRange { r0: r, c0: c, r1: r, c1: c }
+    }
+    pub fn new(ra: usize, ca: usize, rb: usize, cb: usize) -> Self {
+        CellRange { r0: ra.min(rb), c0: ca.min(cb), r1: ra.max(rb), c1: ca.max(cb) }
+    }
+    pub fn contains(&self, r: usize, c: usize) -> bool {
+        r >= self.r0 && r <= self.r1 && c >= self.c0 && c <= self.c1
+    }
+}
+
+impl Table {
+    /// A `rows × cols` table (`header` + body + `footer` rows) whose columns share `width`.
+    pub fn new(id: u64, body_rows: usize, cols: usize, header: usize, footer: usize, width: f64) -> Table {
+        let cols = cols.max(1);
+        let mut rows = Vec::new();
+        rows.extend((0..header).map(|_| Row { kind: RowKind::Header, ..Default::default() }));
+        rows.extend((0..body_rows.max(1)).map(|_| Row::default()));
+        rows.extend((0..footer).map(|_| Row { kind: RowKind::Footer, ..Default::default() }));
+        let w = (width / cols as f64).max(3.0);
+        let n = rows.len() * cols;
+        Table {
+            id,
+            rows,
+            columns: vec![Column { width: w }; cols],
+            cells: vec![Cell::default(); n],
+            options: TableOptions::default(),
+            style: String::new(),
+        }
+    }
+
+    /// A table from rows of cell strings (Convert Text to Table). Short rows are padded.
+    pub fn from_strings(id: u64, data: &[Vec<String>], width: f64, para: &ParaFormat, fmt: &CharFormat) -> Table {
+        let cols = data.iter().map(Vec::len).max().unwrap_or(1).max(1);
+        let mut t = Table::new(id, data.len().max(1), cols, 0, 0, width);
+        for (r, row) in data.iter().enumerate() {
+            for (c, s) in row.iter().enumerate() {
+                let Some(cell) = t.cell_mut(r, c) else { continue };
+                cell.text = Story::with_text(StoryId(0), "", ParaFormat { table: None, ..para.clone() });
+                cell.text.chars[0].format = fmt.clone();
+                cell.text.insert(0, s);
+            }
+        }
+        t
+    }
+
+    pub fn nrows(&self) -> usize {
+        self.rows.len()
+    }
+
+    pub fn ncols(&self) -> usize {
+        self.columns.len()
+    }
+
+    pub fn width(&self) -> f64 {
+        self.columns.iter().map(|c| c.width).sum()
+    }
+
+    fn idx(&self, r: usize, c: usize) -> Option<usize> {
+        (r < self.nrows() && c < self.ncols()).then(|| r * self.ncols() + c)
+    }
+
+    pub fn cell(&self, r: usize, c: usize) -> Option<&Cell> {
+        self.cells.get(self.idx(r, c)?)
+    }
+
+    pub fn cell_mut(&mut self, r: usize, c: usize) -> Option<&mut Cell> {
+        let i = self.idx(r, c)?;
+        self.cells.get_mut(i)
+    }
+
+    pub fn header_rows(&self) -> usize {
+        self.rows.iter().take_while(|r| r.kind == RowKind::Header).count()
+    }
+
+    pub fn footer_rows(&self) -> usize {
+        self.rows.iter().rev().take_while(|r| r.kind == RowKind::Footer).count()
+    }
+
+    pub fn body_rows(&self) -> std::ops::Range<usize> {
+        self.header_rows()..self.nrows() - self.footer_rows()
+    }
+
+    /// For every grid position, the (row, col) of the cell that owns it.
+    pub fn owners(&self) -> Vec<(usize, usize)> {
+        let (nr, nc) = (self.nrows(), self.ncols());
+        let mut v: Vec<(usize, usize)> = (0..nr * nc).map(|i| (i / nc.max(1), i % nc.max(1))).collect();
+        for r in 0..nr {
+            for c in 0..nc {
+                let cell = &self.cells[r * nc + c];
+                if v[r * nc + c] != (r, c) {
+                    continue;
+                }
+                for rr in r..(r + cell.row_span.max(1) as usize).min(nr) {
+                    for cc in c..(c + cell.col_span.max(1) as usize).min(nc) {
+                        v[rr * nc + cc] = (r, c);
+                    }
+                }
+            }
+        }
+        v
+    }
+
+    /// Owning cells touched by the range, once each in row-major order. Bounds are clipped
+    /// to the grid; resolving covered positions does not expand the selection rectangle.
+    pub fn selected_owners(&self, range: CellRange) -> Vec<(usize, usize)> {
+        let (nr, nc) = (self.nrows(), self.ncols());
+        if range.r0 >= nr || range.c0 >= nc || range.r0 > range.r1 || range.c0 > range.c1 {
+            return Vec::new();
+        }
+        let owners = self.owners();
+        let mut selected = std::collections::BTreeSet::new();
+        for r in range.r0..=range.r1.min(nr - 1) {
+            for c in range.c0..=range.c1.min(nc - 1) {
+                if let Some(&owner) = owners.get(r * nc + c) {
+                    selected.insert(owner);
+                }
+            }
+        }
+        selected.into_iter().collect()
+    }
+
+    /// The owning (top-left) cell address of grid position (r, c).
+    pub fn owner(&self, r: usize, c: usize) -> (usize, usize) {
+        self.owners().get(r * self.ncols() + c).copied().unwrap_or((r, c))
+    }
+
+    /// Merged regions `(r, c, row_span, col_span)` (span > 1 in some direction).
+    pub fn regions(&self) -> Vec<(usize, usize, usize, usize)> {
+        let owners = self.owners();
+        let mut v = Vec::new();
+        for r in 0..self.nrows() {
+            for c in 0..self.ncols() {
+                let cell = &self.cells[r * self.ncols() + c];
+                if owners[r * self.ncols() + c] == (r, c) && (cell.row_span > 1 || cell.col_span > 1) {
+                    v.push((r, c, cell.row_span as usize, cell.col_span as usize));
+                }
+            }
+        }
+        v
+    }
+
+    pub(super) fn set_regions(&mut self, regions: &[(usize, usize, usize, usize)]) {
+        for c in &mut self.cells {
+            c.row_span = 1;
+            c.col_span = 1;
+        }
+        for &(r, c, rs, cs) in regions {
+            if rs == 0 || cs == 0 {
+                continue;
+            }
+            if let Some(cell) = self.cell_mut(r, c) {
+                cell.row_span = rs as u32;
+                cell.col_span = cs as u32;
+            }
+        }
+    }
+
+    /// Cell texts, rows separated by `\n`, cells by `\t` (Convert Table to Text, search, agents).
+    pub fn plain_text(&self) -> String {
+        let mut out = String::new();
+        for r in 0..self.nrows() {
+            if r > 0 {
+                out.push('\n');
+            }
+            for c in 0..self.ncols() {
+                if c > 0 {
+                    out.push('\t');
+                }
+                if let Some(cell) = self.cell(r, c) {
+                    out.push_str(&cell.text.text.replace('\n', " "));
+                }
+            }
+        }
+        out
+    }
+
+    pub fn check(&self) -> Result<(), String> {
+        if self.rows.is_empty() || self.columns.is_empty() {
+            return Err(format!("table {}: no rows or columns", self.id));
+        }
+        if self.cells.len() != self.nrows() * self.ncols() {
+            return Err(format!("table {}: {} cells for {}×{}", self.id, self.cells.len(), self.nrows(), self.ncols()));
+        }
+        // Header rows first, footer rows last.
+        let (h, f) = (self.header_rows(), self.footer_rows());
+        if self.rows[h..self.nrows() - f].iter().any(|r| r.kind != RowKind::Body) {
+            return Err(format!("table {}: header/footer rows out of order", self.id));
+        }
+        self.check_spans()?;
+        for cell in &self.cells {
+            cell.text.check()?;
+        }
+        Ok(())
+    }
+
+    /// Every merged cell stays inside the grid and no two merged cells overlap.
+    fn check_spans(&self) -> Result<(), String> {
+        let mut seen = vec![false; self.cells.len()];
+        for r in 0..self.nrows() {
+            for c in 0..self.ncols() {
+                let cell = &self.cells[r * self.ncols() + c];
+                if cell.row_span == 0 || cell.col_span == 0 {
+                    return Err(format!("table {}: zero span at {r},{c}", self.id));
+                }
+                if cell.row_span == 1 && cell.col_span == 1 {
+                    continue;
+                }
+                if r + cell.row_span as usize > self.nrows() || c + cell.col_span as usize > self.ncols() {
+                    return Err(format!("table {}: span out of bounds at {r},{c}", self.id));
+                }
+                for rr in r..r + cell.row_span as usize {
+                    for cc in c..c + cell.col_span as usize {
+                        let i = rr * self.ncols() + cc;
+                        if seen[i] {
+                            return Err(format!("table {}: overlapping merged cells at {rr},{cc}", self.id));
+                        }
+                        seen[i] = true;
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/crates/doc/src/table/merge.rs b/crates/doc/src/table/merge.rs
new file mode 100644
index 000000000..7f3faecfe
--- /dev/null
+++ b/crates/doc/src/table/merge.rs
@@ -0,0 +1,341 @@
+use super::cell::Row;
+#[cfg(test)]
+use super::cell::{RowHeightMode, RowKind};
+use super::grid::CellRange;
+use super::story::append_story;
+use super::{Story, Table};
+
+impl Table {
+    /// The smallest range containing `r` that doesn't cut through a merged region.
+    pub fn expand_range(&self, mut r: CellRange) -> CellRange {
+        loop {
+            let mut grown = r;
+            for (rr, cc, rs, cs) in self.regions() {
+                let (re, ce) = (rr + rs - 1, cc + cs - 1);
+                let overlaps = rr <= r.r1 && re >= r.r0 && cc <= r.c1 && ce >= r.c0;
+                if overlaps {
+                    grown = CellRange { r0: grown.r0.min(rr), c0: grown.c0.min(cc), r1: grown.r1.max(re), c1: grown.c1.max(ce) };
+                }
+            }
+            if grown == r {
+                return r;
+            }
+            r = grown;
+        }
+    }
+
+    /// Merge a range into its top-left cell; the other cells' text is appended as paragraphs.
+    pub fn merge(&mut self, range: CellRange) -> Result<(), String> {
+        if range.r1 >= self.nrows() || range.c1 >= self.ncols() {
+            return Err("cell range out of bounds".into());
+        }
+        let range = self.expand_range(range);
+        if range.r0 == range.r1 && range.c0 == range.c1 {
+            return Ok(());
+        }
+        let owners = self.owners();
+        let nc = self.ncols();
+        let mut regions: Vec<_> = self.regions().into_iter().filter(|&(r, c, _, _)| !range.contains(r, c)).collect();
+        let mut extra: Vec<Story> = Vec::new();
+        for r in range.r0..=range.r1 {
+            for c in range.c0..=range.c1 {
+                if (r, c) != (range.r0, range.c0) && owners[r * nc + c] == (r, c) {
+                    let t = std::mem::take(&mut self.cells[r * nc + c]);
+                    self.cells[r * nc + c] = t.blank_like();
+                    if !t.text.is_empty() {
+                        extra.push(t.text);
+                    }
+                }
+            }
+        }
+        let owner = &mut self.cells[range.r0 * nc + range.c0];
+        for s in extra {
+            append_story(&mut owner.text, &s);
+        }
+        regions.push((range.r0, range.c0, range.r1 - range.r0 + 1, range.c1 - range.c0 + 1));
+        self.set_regions(&regions);
+        Ok(())
+    }
+
+    /// Unmerge the merged cell covering (r, c).
+    pub fn unmerge(&mut self, r: usize, c: usize) {
+        let (or, oc) = self.owner(r, c);
+        let regions: Vec<_> = self.regions().into_iter().filter(|&(rr, cc, _, _)| (rr, cc) != (or, oc)).collect();
+        self.set_regions(&regions);
+    }
+
+    /// Split each original owner touched by `range` once. Remember merged-cell cuts in the
+    /// original grid: a neighboring split may refine that grid before we reach the owner.
+    pub fn split_cells(&mut self, range: CellRange, horizontal: bool) -> Result<(), String> {
+        if range.r0 > range.r1 || range.c0 > range.c1 || range.r1 >= self.nrows() || range.c1 >= self.ncols() {
+            return Err("cell range out of bounds".into());
+        }
+        let owners = self.owners();
+        let mut selected = std::collections::BTreeSet::new();
+        for r in range.r0..=range.r1 {
+            for c in range.c0..=range.c1 {
+                let owner = owners.get(r * self.ncols() + c).ok_or("missing cell owner")?;
+                selected.insert(*owner);
+            }
+        }
+        let mut targets = Vec::new();
+        for (r, c) in selected {
+            let cell = self.cell(r, c).ok_or("missing split cell")?;
+            let span = if horizontal { cell.row_span } else { cell.col_span } as usize;
+            let start = if horizontal { r } else { c };
+            let cut = if span > 1 { Some(start.checked_add(span.div_ceil(2)).ok_or("invalid split boundary")?) } else { None };
+            targets.push((r, c, cut));
+        }
+        for i in 0..targets.len() {
+            let (r, c, cut) = *targets.get(i).ok_or("missing split target")?;
+            let cell = self.cell(r, c).ok_or("missing split cell")?;
+            let (rs, cs) = (cell.row_span as usize, cell.col_span as usize);
+            let mut blank = cell.blank_like();
+            // Splitting creates an empty half, not a duplicate of graphic-cell content.
+            blank.graphic = None;
+            let before = if horizontal { self.nrows() } else { self.ncols() };
+            if let Some(cut) = cut {
+                let (start, span) = if horizontal { (r, rs) } else { (c, cs) };
+                let first = cut.checked_sub(start).filter(|n| *n > 0 && *n < span).ok_or("invalid split boundary")?;
+                let mut regions: Vec<_> = self.regions().into_iter().filter(|&(rr, cc, _, _)| (rr, cc) != (r, c)).collect();
+                if horizontal {
+                    regions.push((r, c, first, cs));
+                    regions.push((cut, c, rs - first, cs));
+                } else {
+                    regions.push((r, c, rs, first));
+                    regions.push((r, cut, rs, cs - first));
+                }
+                self.set_regions(&regions);
+            } else {
+                // An originally single-track cell may now span two tracks inserted for its
+                // neighbor. split_cell divides that span instead of inserting another track.
+                self.split_cell(r, c, horizontal);
+            }
+            let first = self.cell(r, c).ok_or("missing split half")?;
+            let second = if horizontal { (r + first.row_span as usize, c) } else { (r, c + first.col_span as usize) };
+            let second = self.cell_mut(second.0, second.1).ok_or("missing split half")?;
+            blank.row_span = second.row_span;
+            blank.col_span = second.col_span;
+            *second = blank;
+            let after = if horizontal { self.nrows() } else { self.ncols() };
+            if after > before {
+                let at = if horizontal { r + 1 } else { c + 1 };
+                let added = after - before;
+                for (row, col, cut) in targets.iter_mut().skip(i + 1) {
+                    let axis = if horizontal { row } else { col };
+                    if *axis >= at {
+                        *axis += added;
+                    }
+                    if let Some(cut) = cut
+                        && *cut >= at
+                    {
+                        *cut += added;
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// Split the cell covering (r, c) in two: `horizontal` stacks the halves (Split Cell
+    /// Horizontally), otherwise side by side. A merged cell splits its span; a single cell gets a
+    /// new row (column) that the cells beside it span, the row height (column width) shared.
+    pub fn split_cell(&mut self, r: usize, c: usize, horizontal: bool) {
+        if r >= self.nrows() || c >= self.ncols() {
+            return;
+        }
+        let (or, oc) = self.owner(r, c);
+        let (rs, cs) = self.cell(or, oc).map_or((1, 1), |x| (x.row_span as usize, x.col_span as usize));
+        let mut regions: Vec<_> = self.regions().into_iter().filter(|&(rr, cc, _, _)| (rr, cc) != (or, oc)).collect();
+        let span = if horizontal { rs } else { cs };
+        if span > 1 {
+            let a = span.div_ceil(2);
+            if horizontal {
+                regions.push((or, oc, a, cs));
+                regions.push((or + a, oc, rs - a, cs));
+            } else {
+                regions.push((or, oc, rs, a));
+                regions.push((or, oc + a, rs, cs - a));
+            }
+            self.set_regions(&regions);
+            return;
+        }
+        if horizontal {
+            let row = self.rows[or].clone();
+            self.insert_rows(or + 1, 1);
+            self.rows[or].height = row.height / 2.0;
+            // Both halves keep the split row's height mode and header/body/footer role.
+            self.rows[or + 1] = Row { height: row.height / 2.0, ..row };
+            // insert_rows doesn't grow regions that end at the split row; everything else on it
+            // spans the new row now.
+            let mut regions: Vec<_> = self.regions();
+            let (nr, nc) = (self.nrows(), self.ncols());
+            let mut covered = vec![false; nr * nc];
+            for &(rr, cc, rrs, ccs) in &regions {
+                for y in rr..rr + rrs {
+                    for x in cc..cc + ccs {
+                        covered[y * nc + x] = true;
+                    }
+                }
+            }
+            for reg in regions.iter_mut() {
+                let (rr, cc, rrs, ccs) = *reg;
+                if rr + rrs == or + 1 && !(cc <= oc && oc < cc + ccs) {
+                    *reg = (rr, cc, rrs + 1, ccs);
+                }
+            }
+            for x in 0..nc {
+                if (oc..oc + cs).contains(&x) || covered[or * nc + x] {
+                    continue;
+                }
+                regions.push((or, x, 2, 1));
+            }
+            if cs > 1 {
+                regions.push((or + 1, oc, 1, cs));
+            }
+            self.set_regions(&regions);
+        } else {
+            let w = self.columns[oc].width;
+            self.insert_cols(oc + 1, 1, w / 2.0);
+            self.columns[oc].width = w / 2.0;
+            let mut regions: Vec<_> = self.regions();
+            let (nr, nc) = (self.nrows(), self.ncols());
+            let mut covered = vec![false; nr * nc];
+            for &(rr, cc, rrs, ccs) in &regions {
+                for y in rr..rr + rrs {
+                    for x in cc..cc + ccs {
+                        covered[y * nc + x] = true;
+                    }
+                }
+            }
+            for reg in regions.iter_mut() {
+                let (rr, cc, rrs, ccs) = *reg;
+                if cc + ccs == oc + 1 && !(rr <= or && or < rr + rrs) {
+                    *reg = (rr, cc, rrs, ccs + 1);
+                }
+            }
+            for y in 0..nr {
+                if (or..or + rs).contains(&y) || covered[y * nc + oc] {
+                    continue;
+                }
+                regions.push((y, oc, 1, 2));
+            }
+            if rs > 1 {
+                regions.push((or, oc + 1, rs, 1));
+            }
+            self.set_regions(&regions);
+        }
+    }
+}
+
+#[cfg(test)]
+mod split_tests {
+    use super::*;
+
+    #[test]
+    fn split_single_and_merged_cells() {
+        let mut t = Table::new(1, 2, 2, 0, 0, 100.0);
+        t.split_cell(0, 0, true);
+        assert_eq!((t.nrows(), t.ncols()), (3, 2));
+        // The cell beside the split one spans both new rows.
+        assert_eq!(t.cell(0, 1).unwrap().row_span, 2);
+        assert_eq!(t.owner(1, 1), (0, 1));
+        assert_eq!(t.owner(1, 0), (1, 0), "the new half is its own cell");
+        t.split_cell(2, 1, false);
+        assert_eq!(t.ncols(), 3);
+        assert_eq!(t.cell(0, 0).unwrap().col_span, 1);
+        assert_eq!(t.owner(2, 2), (2, 2));
+        assert_eq!(t.owner(0, 2), (0, 1), "the merged cell above widens");
+        // A merged cell splits its own span instead of adding rows.
+        let mut m = Table::new(1, 4, 1, 0, 0, 100.0);
+        m.merge(CellRange { r0: 0, c0: 0, r1: 3, c1: 0 }).unwrap();
+        m.split_cell(0, 0, true);
+        assert_eq!(m.nrows(), 4);
+        assert_eq!((m.cell(0, 0).unwrap().row_span, m.cell(2, 0).unwrap().row_span), (2, 2));
+    }
+
+    #[test]
+    fn split_range_keeps_original_merged_cut_when_neighbor_tracks_are_refined() {
+        for horizontal in [true, false] {
+            let mut t = Table::new(1, 4, 4, 0, 0, 280.0);
+            for (i, size) in [40.0, 60.0, 80.0, 100.0].into_iter().enumerate() {
+                t.rows[i].mode = RowHeightMode::Exactly;
+                t.rows[i].height = if horizontal { size } else { 70.0 };
+                t.columns[i].width = if horizontal { 70.0 } else { size };
+            }
+            for r in 0..4 {
+                for c in 0..4 {
+                    let cell = t.cell_mut(r, c).unwrap();
+                    cell.text.insert(0, &format!("{r},{c}"));
+                    cell.style = format!("style-{r}-{c}");
+                    cell.insets = [r as f64 + c as f64 + 1.0; 4];
+                }
+            }
+            let (merged, selected, owner, lower, neighbor, moved_neighbor) = if horizontal {
+                (CellRange::new(0, 1, 2, 1), CellRange::new(0, 0, 2, 1), (0, 1), (4, 1), (3, 3), (6, 3))
+            } else {
+                (CellRange::new(1, 0, 1, 2), CellRange::new(0, 0, 1, 2), (1, 0), (1, 4), (3, 3), (3, 6))
+            };
+            t.merge(merged).unwrap();
+            let original = t.clone();
+            t.split_cells(selected, horizontal).unwrap();
+            t.check().unwrap();
+            assert_eq!((t.nrows(), t.ncols()), if horizontal { (7, 4) } else { (4, 7) });
+            let sizes: Vec<_> = if horizontal { t.rows.iter().map(|r| r.height).collect() } else { t.columns.iter().map(|c| c.width).collect() };
+            assert_eq!(sizes, [20.0, 20.0, 30.0, 30.0, 40.0, 40.0, 100.0]);
+            let first = t.cell(owner.0, owner.1).unwrap();
+            let second = t.cell(lower.0, lower.1).unwrap();
+            // The original three-track merge divides after its second original track,
+            // regardless of which of those tracks a neighboring selected cell subdivides.
+            assert_eq!(if horizontal { first.row_span } else { first.col_span }, 4);
+            assert_eq!(if horizontal { second.row_span } else { second.col_span }, 2);
+            assert_eq!(first.text, original.cell(owner.0, owner.1).unwrap().text);
+            assert!(second.text.is_empty());
+            assert_eq!(second.style, first.style);
+            assert_eq!(second.insets, first.insets);
+            assert_eq!(t.cell(moved_neighbor.0, moved_neighbor.1), original.cell(neighbor.0, neighbor.1));
+            let owners = t.owners();
+            assert_eq!(owners.iter().copied().collect::<std::collections::BTreeSet<_>>().len(), 18, "four original selected owners split once each");
+            let mut before_text: Vec<_> = original.cells.iter().filter(|c| !c.text.is_empty()).map(|c| c.text.text.clone()).collect();
+            let mut after_text: Vec<_> = t.cells.iter().filter(|c| !c.text.is_empty()).map(|c| c.text.text.clone()).collect();
+            before_text.sort();
+            after_text.sort();
+            assert_eq!(after_text, before_text, "no original text is copied or lost");
+        }
+    }
+
+    #[test]
+    fn split_range_resolves_covered_positions_without_expanding_selection() {
+        for horizontal in [true, false] {
+            let mut t = Table::new(1, 3, 3, 0, 0, 180.0);
+            t.merge(CellRange::new(0, 0, 1, 1)).unwrap();
+            let selected = if horizontal { CellRange::new(1, 1, 1, 2) } else { CellRange::new(1, 1, 2, 1) };
+            t.split_cells(selected, horizontal).unwrap();
+            t.check().unwrap();
+            let owners = t.owners();
+            assert_eq!(owners.iter().copied().collect::<std::collections::BTreeSet<_>>().len(), 8, "only the two touched owners split");
+            assert_eq!((t.nrows(), t.ncols()), if horizontal { (4, 3) } else { (3, 4) });
+            assert_eq!(t.owner(0, 0), (0, 0));
+            assert_eq!(if horizontal { t.owner(1, 0) } else { t.owner(0, 1) }, if horizontal { (1, 0) } else { (0, 1) });
+        }
+    }
+
+    #[test]
+    fn split_header_row_keeps_its_height_mode_and_role() {
+        let mut t = Table::new(1, 1, 2, 1, 1, 180.0);
+        t.rows[0].height = 60.0;
+        t.rows[0].mode = RowHeightMode::Exactly;
+        let body = t.rows[1].clone();
+        let footer = t.rows[2].clone();
+        t.split_cells(CellRange::new(0, 0, 0, 1), true).unwrap();
+        t.check().unwrap();
+        assert_eq!(t.header_rows(), 2);
+        for row in &t.rows[..2] {
+            assert_eq!(row.height, 30.0);
+            assert_eq!(row.mode, RowHeightMode::Exactly);
+            assert_eq!(row.kind, RowKind::Header);
+        }
+        assert_eq!(t.rows[2], body);
+        assert_eq!(t.rows[3], footer);
+    }
+}
diff --git a/crates/doc/src/table/story.rs b/crates/doc/src/table/story.rs
new file mode 100644
index 000000000..1e69a3738
--- /dev/null
+++ b/crates/doc/src/table/story.rs
@@ -0,0 +1,195 @@
+use super::{Arc, Story, StoryId, TABLE_ANCHOR, Table};
+
+/// Append `other` to `s` as new paragraphs.
+pub(super) fn append_story(s: &mut Story, other: &Story) {
+    if s.is_empty() {
+        *s = Story { id: s.id, ..other.clone() };
+        s.rev = s.rev.wrapping_add(1);
+        return;
+    }
+    let base = s.len();
+    s.insert(base, "\n");
+    // Copy other's runs with their formats.
+    for (r, f) in other.runs() {
+        let at = s.len();
+        s.insert_with(at, &other.text[r], f.clone());
+    }
+    let first_new = s.paras.len() - other.paras.len();
+    for (k, p) in other.paras.iter().enumerate() {
+        if let Some(dst) = s.paras.get_mut(first_new + k) {
+            *dst = p.clone();
+        }
+    }
+}
+
+// ---------- tables in stories ----------
+
+impl crate::Document {
+    /// The story text edits go to: a cell's story when `cell` is set, else the story itself.
+    pub fn text_story(&self, story: StoryId, cell: Option<crate::CellAddr>) -> Option<&Story> {
+        let st = self.story(story)?;
+        match cell {
+            Some(c) if c.table == crate::FOOTNOTE_TABLE => st.note(c.row as u64).map(|n| &n.text),
+            Some(c) => st.tables.get(&c.table)?.cell(c.row, c.col).map(|x| &x.text),
+            None => Some(st),
+        }
+    }
+
+    /// Mutable [`Document::text_story`] (a cell edit bumps the containing story's revision).
+    pub fn text_story_mut(&mut self, story: StoryId, cell: Option<crate::CellAddr>) -> Option<&mut Story> {
+        let st = self.story_mut(story)?;
+        match cell {
+            Some(c) if c.table == crate::FOOTNOTE_TABLE => st.note_mut(c.row as u64).map(|n| &mut n.text),
+            Some(c) => st.table_mut(c.table)?.cell_mut(c.row, c.col).map(|x| &mut x.text),
+            None => Some(st),
+        }
+    }
+}
+
+impl Story {
+    /// Visit this story and every text inside it (table cells, footnotes), mutably.
+    pub fn for_each_text_mut(&mut self, f: &mut impl FnMut(&mut Story)) {
+        f(self);
+        for t in self.tables.values_mut() {
+            for c in &mut std::sync::Arc::make_mut(t).cells {
+                c.text.for_each_text_mut(f);
+            }
+        }
+        for n in &mut self.notes {
+            std::sync::Arc::make_mut(n).text.for_each_text_mut(f);
+        }
+    }
+
+    /// The table whose anchor paragraph is `pi`.
+    pub fn para_table(&self, pi: usize) -> Option<&Arc<Table>> {
+        self.tables.get(&self.paras.get(pi)?.table?)
+    }
+
+    /// Byte offset of a table's anchor character.
+    pub fn table_anchor(&self, id: u64) -> Option<usize> {
+        let pi = self.paras.iter().position(|p| p.table == Some(id))?;
+        let r = self.para_ranges().get(pi)?.clone();
+        self.text[r.clone()].find(TABLE_ANCHOR).map(|k| r.start + k)
+    }
+
+    /// The table anchored at or right before byte `pos` (a caret next to the anchor).
+    pub fn table_at(&self, pos: usize) -> Option<u64> {
+        let pi = self.para_at(pos);
+        self.paras.get(pi)?.table
+    }
+
+    /// Mutable table (copy-on-write); bumps the story revision.
+    pub fn table_mut(&mut self, id: u64) -> Option<&mut Table> {
+        let t = self.tables.get_mut(&id)?;
+        self.rev = self.rev.wrapping_add(1);
+        Some(Arc::make_mut(t))
+    }
+
+    /// Insert `table` at `pos`, giving its anchor its own paragraph. Returns the anchor's byte offset.
+    pub fn insert_table(&mut self, pos: usize, table: Table) -> usize {
+        let pos = crate::story::floor_char_boundary(&self.text, pos.min(self.len()));
+        let pi = self.para_at(pos);
+        let pstart = self.para_ranges()[pi].start;
+        let mut s = String::new();
+        if pos > pstart {
+            s.push('\n');
+        }
+        let anchor = pos + s.len();
+        s.push(TABLE_ANCHOR);
+        if !self.text[pos..].starts_with('\n') {
+            s.push('\n');
+        }
+        let id = table.id;
+        self.tables.insert(id, Arc::new(table));
+        // Insert the text first (fix-up would drop an unreferenced table), then point the paragraph at it.
+        self.insert_raw(pos, &s);
+        let api = self.para_at(anchor);
+        self.paras[api].table = Some(id);
+        self.fix_tables();
+        self.rev = self.rev.wrapping_add(1);
+        anchor
+    }
+
+    /// Keep paragraphs and tables consistent after an edit: a paragraph keeps its table only if it
+    /// still contains an anchor character, every table is referenced once, and tables nobody
+    /// references are dropped. An anchor that shares a table's paragraph with another anchor gets
+    /// a paragraph of its own again, so a table paragraph always holds exactly one anchor.
+    pub(crate) fn fix_tables(&mut self) {
+        self.fix_tables_with(&[]);
+    }
+
+    /// [`Story::fix_tables`] for an edit that knows which table an anchor belongs to: `claims` are
+    /// `(anchor byte offset, table id)` pairs that win over the paragraphs' table ids (a paragraph
+    /// names one table, so merging two anchor paragraphs would otherwise lose one). Every other
+    /// table takes the first unclaimed anchor of its paragraph. Returns the byte offsets, before
+    /// the fix-up, where it inserted paragraph returns.
+    pub(crate) fn fix_tables_with(&mut self, claims: &[(usize, u64)]) -> Vec<usize> {
+        if self.tables.is_empty() && self.paras.iter().all(|p| p.table.is_none()) {
+            return Vec::new();
+        }
+        let mut owner = std::collections::BTreeMap::new();
+        let mut used = std::collections::HashSet::new();
+        for &(at, id) in claims {
+            if self.text.get(at..).is_some_and(|t| t.starts_with(TABLE_ANCHOR))
+                && self.tables.contains_key(&id)
+                && !owner.contains_key(&at)
+                && used.insert(id)
+            {
+                owner.insert(at, id);
+            }
+        }
+        let ranges = self.para_ranges();
+        for (p, r) in self.paras.iter().zip(&ranges) {
+            let Some(id) = p.table.filter(|id| self.tables.contains_key(id) && !used.contains(id)) else { continue };
+            let free = self.text[r.clone()].match_indices(TABLE_ANCHOR).map(|(k, _)| r.start + k).find(|at| !owner.contains_key(at));
+            if let Some(at) = free {
+                used.insert(id);
+                owner.insert(at, id);
+            }
+        }
+        // A paragraph holding a table's anchor and other anchors is split before each later anchor.
+        let mut splits = Vec::new();
+        for r in &ranges {
+            let anchors: Vec<usize> = self.text[r.clone()].match_indices(TABLE_ANCHOR).map(|(k, _)| r.start + k).collect();
+            if anchors.len() > 1 && anchors.iter().any(|at| owner.contains_key(at)) {
+                splits.extend(anchors.into_iter().skip(1));
+            }
+        }
+        for &at in splits.iter().rev() {
+            self.insert_raw(at, "\n");
+        }
+        // Each owned anchor, moved past the returns inserted before it, names its paragraph's table.
+        let owner: std::collections::BTreeMap<usize, u64> =
+            owner.into_iter().map(|(at, id)| (at + splits.partition_point(|&s| s <= at), id)).collect();
+        let ranges = self.para_ranges();
+        for (p, r) in self.paras.iter_mut().zip(ranges) {
+            p.table = owner.range(r).next().map(|(_, &id)| id);
+        }
+        self.tables.retain(|id, _| used.contains(id));
+        splits
+    }
+
+    /// Check table invariants (part of [`Story::check`]).
+    pub(crate) fn check_tables(&self) -> Result<(), String> {
+        let ranges = self.para_ranges();
+        let mut used = std::collections::HashSet::new();
+        for (pi, p) in self.paras.iter().enumerate() {
+            let Some(id) = p.table else { continue };
+            let t = self.tables.get(&id).ok_or_else(|| format!("story {}: paragraph {pi} points at missing table {id}", self.id.0))?;
+            if t.id != id {
+                return Err(format!("story {}: table key {id} != id {}", self.id.0, t.id));
+            }
+            if self.text[ranges[pi].clone()].matches(TABLE_ANCHOR).count() != 1 {
+                return Err(format!("story {}: table {id} paragraph must hold exactly one anchor", self.id.0));
+            }
+            if !used.insert(id) {
+                return Err(format!("story {}: table {id} anchored twice", self.id.0));
+            }
+            t.check()?;
+        }
+        if used.len() != self.tables.len() {
+            return Err(format!("story {}: {} tables but {} anchored", self.id.0, self.tables.len(), used.len()));
+        }
+        Ok(())
+    }
+}
diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml
index 69e0e8d50..c1c0f1d33 100644
--- a/crates/engine/Cargo.toml
+++ b/crates/engine/Cargo.toml
@@ -23,6 +23,7 @@ designcraft-epub = { workspace = true }
 designcraft-pptx = { workspace = true }
 designcraft-textimport = { workspace = true }
 designcraft-pdf = { workspace = true }
+craft-prepress = { workspace = true }
 designcraft-tools = { workspace = true }
 designcraft-idml = { workspace = true }
 indd = { workspace = true }
diff --git a/crates/engine/src/cmd/mod.rs b/crates/engine/src/cmd.rs
similarity index 98%
rename from crates/engine/src/cmd/mod.rs
rename to crates/engine/src/cmd.rs
index 1d6294ea6..1a75d7ece 100644
--- a/crates/engine/src/cmd/mod.rs
+++ b/crates/engine/src/cmd.rs
@@ -6,7 +6,7 @@ mod articles;
 pub mod book;
 mod buttons;
 pub(crate) mod captions;
-mod changes;
+pub(crate) mod changes;
 mod color_theme;
 mod colorsettings;
 mod conditions;
@@ -15,7 +15,9 @@ mod edit;
 mod editorial;
 mod endnotes;
 mod export;
+pub(crate) use export::print_pdf;
 mod file;
+mod file_info;
 pub(crate) mod find;
 pub use edit::copied_objects_text;
 pub use find::same_find_domain;
@@ -47,6 +49,7 @@ mod pdflayers;
 mod place_text;
 pub mod preflight;
 mod prefs;
+mod prepress;
 mod print;
 mod qr;
 mod rulers;
@@ -169,6 +172,7 @@ pub fn command_specs() -> &'static [CommandSpec] {
     SPECS.get_or_init(|| {
         let mut v = Vec::new();
         v.extend(file::specs());
+        v.extend(file_info::specs());
         v.extend(interchange::specs());
         v.extend(export::specs());
         v.extend(edit::specs());
@@ -208,6 +212,7 @@ pub fn command_specs() -> &'static [CommandSpec] {
         v.extend(thread::specs());
         v.extend(tabs::specs());
         v.extend(style::specs());
+        v.extend(prepress::specs());
         v.extend(load_styles::specs());
         v.extend(table::specs());
         v.extend(layout::specs());
diff --git a/crates/engine/src/cmd/anchors.rs b/crates/engine/src/cmd/anchors.rs
index 72b2f085b..fec81de4b 100644
--- a/crates/engine/src/cmd/anchors.rs
+++ b/crates/engine/src/cmd/anchors.rs
@@ -78,6 +78,70 @@ pub fn specs() -> Vec<CommandSpec> {
     ]
 }
 
+/// The first open subpath (two anchors or more) of an item.
+fn first_open_subpath(d: &Document, id: ItemId) -> Option<usize> {
+    d.item(id).and_then(|it| it.path.subpaths.iter().position(|sp| !sp.closed && sp.anchors.len() > 1))
+}
+
+/// Close every open subpath of one path.
+fn close_open_subpaths(d: &mut Document, id: ItemId) -> Result<Value> {
+    let it = d.item_mut(id).ok_or(designcraft_doc::DocError::NoItem(id))?;
+    let mut closed = 0;
+    for sp in it.path.subpaths.iter_mut().filter(|sp| !sp.closed && sp.anchors.len() > 1) {
+        sp.closed = true;
+        closed += 1;
+    }
+    if closed == 0 {
+        return Err(bad("path.join", "the path is already closed"));
+    }
+    as_path(&mut it.shape);
+    Ok(json!({"id": id.0, "closed": closed}))
+}
+
+/// Join the open subpaths of two paths at their nearest ends, into the first path.
+fn join_open_pair(d: &mut Document, sel: &mut designcraft_doc::Selection, a: ItemId, b: ItemId) -> Result<Value> {
+    let (Some(sa), Some(sb)) = (first_open_subpath(d, a), first_open_subpath(d, b)) else {
+        return Err(bad("path.join", "select two open paths"));
+    };
+    // b's path in a's space.
+    let inv_a = to_inner(d, a).ok_or(designcraft_doc::DocError::NoItem(a))?;
+    let xf_b = to_inner(d, b).ok_or(designcraft_doc::DocError::NoItem(b))?.inverse();
+    let m = inv_a * xf_b;
+    let mut pb = d.item(b).and_then(|it| it.path.subpaths.get(sb).cloned()).ok_or(designcraft_doc::DocError::NoItem(b))?;
+    for an in &mut pb.anchors {
+        *an = Anchor { p: m * an.p, h_in: m * an.h_in, h_out: m * an.h_out, kind: an.kind };
+    }
+    let ita = d.item_mut(a).ok_or(designcraft_doc::DocError::NoItem(a))?;
+    let pa = ita.path.subpaths.get_mut(sa).ok_or_else(|| bad("path.join", "no such subpath"))?;
+    // The pair of ends nearest each other; then a's end meets b's start.
+    let ends = |sp: &designcraft_geom::SubPath| (sp.anchors.first().map(|x| x.p), sp.anchors.last().map(|x| x.p));
+    let ((Some(a0), Some(a1)), (Some(b0), Some(b1))) = (ends(pa), ends(&pb)) else {
+        return Err(bad("path.join", "select two open paths"));
+    };
+    let pairs = [(a1, b0, false, false), (a1, b1, false, true), (a0, b0, true, false), (a0, b1, true, true)];
+    let Some(&(_, _, rev_a, rev_b)) = pairs.iter().min_by(|x, y| (x.0 - x.1).hypot().total_cmp(&(y.0 - y.1).hypot())) else {
+        return Err(bad("path.join", "select two open paths"));
+    };
+    if rev_a {
+        pa.reverse();
+    }
+    if rev_b {
+        pb.reverse();
+    }
+    let mut rest = pb.anchors.into_iter();
+    if let Some(first) = rest.next() {
+        match pa.anchors.last_mut() {
+            Some(last) if (last.p - first.p).hypot() < 0.01 => *last = Anchor::with_handles(last.p, last.h_in, first.h_out),
+            _ => pa.anchors.push(first),
+        }
+    }
+    pa.anchors.extend(rest);
+    as_path(&mut ita.shape);
+    d.remove_item(b)?;
+    *sel = designcraft_doc::Selection::items(vec![a]);
+    Ok(json!({"id": a.0}))
+}
+
 /// Join Path: close one open path, or join two open paths at their nearest ends.
 fn join_paths(s: &mut Session, p: &Value) -> Result<Value> {
     let ids = super::targets(s, p)?;
@@ -90,63 +154,9 @@ fn join_paths(s: &mut Session, p: &Value) -> Result<Value> {
                 path_editable(d, *id, "path.join")?;
             }
         }
-        let open = |d: &Document, id: ItemId| d.item(id).and_then(|it| it.path.subpaths.iter().position(|sp| !sp.closed && sp.anchors.len() > 1));
         match ids.as_slice() {
-            [id] => {
-                let it = d.item_mut(*id).ok_or(designcraft_doc::DocError::NoItem(*id))?;
-                let mut closed = 0;
-                for sp in it.path.subpaths.iter_mut().filter(|sp| !sp.closed && sp.anchors.len() > 1) {
-                    sp.closed = true;
-                    closed += 1;
-                }
-                if closed == 0 {
-                    return Err(bad("path.join", "the path is already closed"));
-                }
-                as_path(&mut it.shape);
-                Ok(json!({"id": id.0, "closed": closed}))
-            }
-            [a, b] => {
-                let (Some(sa), Some(sb)) = (open(d, *a), open(d, *b)) else {
-                    return Err(bad("path.join", "select two open paths"));
-                };
-                // b's path in a's space.
-                let inv_a = to_inner(d, *a).ok_or(designcraft_doc::DocError::NoItem(*a))?;
-                let xf_b = to_inner(d, *b).ok_or(designcraft_doc::DocError::NoItem(*b))?.inverse();
-                let m = inv_a * xf_b;
-                let mut pb = d.item(*b).and_then(|it| it.path.subpaths.get(sb).cloned()).ok_or(designcraft_doc::DocError::NoItem(*b))?;
-                for an in &mut pb.anchors {
-                    *an = Anchor { p: m * an.p, h_in: m * an.h_in, h_out: m * an.h_out, kind: an.kind };
-                }
-                let ita = d.item_mut(*a).ok_or(designcraft_doc::DocError::NoItem(*a))?;
-                let pa = ita.path.subpaths.get_mut(sa).ok_or_else(|| bad("path.join", "no such subpath"))?;
-                // The pair of ends nearest each other; then a's end meets b's start.
-                let ends = |sp: &designcraft_geom::SubPath| (sp.anchors.first().map(|x| x.p), sp.anchors.last().map(|x| x.p));
-                let ((Some(a0), Some(a1)), (Some(b0), Some(b1))) = (ends(pa), ends(&pb)) else {
-                    return Err(bad("path.join", "select two open paths"));
-                };
-                let pairs = [(a1, b0, false, false), (a1, b1, false, true), (a0, b0, true, false), (a0, b1, true, true)];
-                let Some(&(_, _, rev_a, rev_b)) = pairs.iter().min_by(|x, y| (x.0 - x.1).hypot().total_cmp(&(y.0 - y.1).hypot())) else {
-                    return Err(bad("path.join", "select two open paths"));
-                };
-                if rev_a {
-                    pa.reverse();
-                }
-                if rev_b {
-                    pb.reverse();
-                }
-                let mut rest = pb.anchors.into_iter();
-                if let Some(first) = rest.next() {
-                    match pa.anchors.last_mut() {
-                        Some(last) if (last.p - first.p).hypot() < 0.01 => *last = Anchor::with_handles(last.p, last.h_in, first.h_out),
-                        _ => pa.anchors.push(first),
-                    }
-                }
-                pa.anchors.extend(rest);
-                as_path(&mut ita.shape);
-                d.remove_item(*b)?;
-                *sel = designcraft_doc::Selection::items(vec![*a]);
-                Ok(json!({"id": a.0}))
-            }
+            [id] => close_open_subpaths(d, *id),
+            [a, b] => join_open_pair(d, sel, *a, *b),
             _ => Err(bad("path.join", "select one or two open paths")),
         }
     })
diff --git a/crates/engine/src/cmd/datamerge/mod.rs b/crates/engine/src/cmd/datamerge.rs
similarity index 93%
rename from crates/engine/src/cmd/datamerge/mod.rs
rename to crates/engine/src/cmd/datamerge.rs
index c07e2fff4..e96feb9fb 100644
--- a/crates/engine/src/cmd/datamerge/mod.rs
+++ b/crates/engine/src/cmd/datamerge.rs
@@ -18,7 +18,7 @@ use serde_json::{Value, json};
 
 use super::{CommandSpec, bad, cmd, has_doc, id_param, ok, str_param};
 use crate::{DocState, Result, Session};
-use fill::{FillReport, Maps, MissingImage, copy_item, fill_row, identity_map};
+use fill::{FillReport, Maps, MissingImage, Sources, copy_item, fill_row, identity_map};
 use parse::{
     Table, TileInput, extension, fingerprint_of, relative_between, select_records, status_of, table_from_bytes, table_from_grid, table_from_objects,
     tile,
@@ -210,7 +210,8 @@ fn preview_cmd(s: &mut Session, p: &Value) -> Result<Value> {
     let row = source.rows.get((record as usize).saturating_sub(1)).cloned().unwrap_or_default();
     let data_dir = source_file(&source, st.path.as_deref().map(Path::new)).as_deref().and_then(Path::parent).map(Path::to_path_buf);
     let doc_dir = st.path.as_deref().and_then(parent_dir);
-    fill_row(&mut doc, &source.fields, &row, record as u32, &options, &maps, data_dir.as_deref(), doc_dir.as_deref());
+    let sources = Sources { options: &options, data_dir: data_dir.as_deref(), doc_dir: doc_dir.as_deref() };
+    fill_row(&mut doc, &source.fields, &row, record as u32, &maps, &sources);
     st.doc = Arc::new(doc);
     st.preview_record = Some(record as u32);
     st.bump_revision();
@@ -245,10 +246,12 @@ fn merge_cmd(s: &mut Session, p: &Value) -> Result<Value> {
     warnings.extend(table.warnings.iter().cloned());
     let mut merged = src.clone();
     let mut missing = Vec::new();
+    let sources = Sources { options: &options, data_dir: data_dir.as_deref(), doc_dir: doc_dir.as_deref() };
+    let mut sink = Sink { warnings: &mut warnings, missing: &mut missing, parent: false };
     if options.per_page == "multiple" {
-        tile_records(&mut merged, &src, &table, &selected, &options, data_dir.as_deref(), doc_dir.as_deref(), &mut warnings, &mut missing)?;
+        tile_records(&mut merged, &src, &table, &selected, &sources, &mut sink)?;
     } else {
-        copy_records(&mut merged, &src, &table, &selected, &options, data_dir.as_deref(), doc_dir.as_deref(), &mut warnings, &mut missing)?;
+        copy_records(&mut merged, &src, &table, &selected, &sources, &mut sink)?;
     }
     // Status is written only after every error return. The new document then becomes active,
     // so this template edit does not push an undo step. The fingerprint stays the last read.
@@ -272,25 +275,14 @@ fn merge_cmd(s: &mut Session, p: &Value) -> Result<Value> {
     }))
 }
 
-fn copy_records(
-    dst: &mut Document,
-    src: &Document,
-    table: &Table,
-    selected: &[usize],
-    options: &MergeOptions,
-    data_dir: Option<&Path>,
-    doc_dir: Option<&Path>,
-    warnings: &mut Vec<String>,
-    missing: &mut Vec<MissingImage>,
-) -> Result<()> {
-    let mut parent = false;
+fn copy_records(dst: &mut Document, src: &Document, table: &Table, selected: &[usize], sources: &Sources, sink: &mut Sink) -> Result<()> {
     if let Some(&idx) = selected.first() {
         let maps = identity_map(dst);
-        fill_at(dst, table, idx, options, &maps, data_dir, doc_dir, warnings, missing, &mut parent);
+        fill_at(dst, table, idx, sources, &maps, sink);
     }
     for &idx in selected.iter().skip(1) {
         let maps = append_copy(dst, src)?;
-        fill_at(dst, table, idx, options, &maps, data_dir, doc_dir, warnings, missing, &mut parent);
+        fill_at(dst, table, idx, sources, &maps, sink);
     }
     Ok(())
 }
@@ -320,17 +312,8 @@ fn append_copy(dst: &mut Document, src: &Document) -> Result<Maps> {
     Ok(maps)
 }
 
-fn tile_records(
-    dst: &mut Document,
-    src: &Document,
-    table: &Table,
-    selected: &[usize],
-    options: &MergeOptions,
-    data_dir: Option<&Path>,
-    doc_dir: Option<&Path>,
-    warnings: &mut Vec<String>,
-    missing: &mut Vec<MissingImage>,
-) -> Result<()> {
+fn tile_records(dst: &mut Document, src: &Document, table: &Table, selected: &[usize], sources: &Sources, sink: &mut Sink) -> Result<()> {
+    let options = sources.options;
     let (block, ids) = block_of(src);
     let (width, height) = src.page(0).map(|p| (p.width, p.height)).unwrap_or((612.0, 792.0));
     let plan = tile(&TileInput {
@@ -344,7 +327,7 @@ fn tile_records(
         count: selected.len(),
     });
     if plan.one_per_page {
-        warnings.push("Only one record fits on the page, so each record has its own page.".into());
+        sink.warnings.push("Only one record fits on the page, so each record has its own page.".into());
     }
     if plan.pages > 1 {
         let parent = src.page(0).and_then(|p| p.parent);
@@ -356,12 +339,11 @@ fn tile_records(
             }
         }
     }
-    let mut parent = false;
     for hit in plan.hits {
         let Some(&idx) = selected.get(hit.index) else { continue };
         if hit.index == 0 && hit.page == 0 && hit.col == 0 && hit.row == 0 {
             let maps = identity_map(dst);
-            fill_at(dst, table, idx, options, &maps, data_dir, doc_dir, warnings, missing, &mut parent);
+            fill_at(dst, table, idx, sources, &maps, sink);
             continue;
         }
         let Some((dsi, _)) = dst.page_loc(hit.page) else { continue };
@@ -370,39 +352,37 @@ fn tile_records(
             let Some(it) = src.item(*id) else { continue };
             copy_item(dst, src, it, SpreadRef::Doc(dsi), Vec2::new(hit.dx, hit.dy), &mut maps)?;
         }
-        fill_at(dst, table, idx, options, &maps, data_dir, doc_dir, warnings, missing, &mut parent);
+        fill_at(dst, table, idx, sources, &maps, sink);
     }
     Ok(())
 }
 
-fn fill_at(
-    doc: &mut Document,
-    table: &Table,
-    idx: usize,
-    options: &MergeOptions,
-    maps: &Maps,
-    data_dir: Option<&Path>,
-    doc_dir: Option<&Path>,
-    warnings: &mut Vec<String>,
-    missing: &mut Vec<MissingImage>,
-    parent: &mut bool,
-) {
+fn fill_at(doc: &mut Document, table: &Table, idx: usize, sources: &Sources, maps: &Maps, sink: &mut Sink) {
     let Some(row) = table.rows.get(idx) else { return };
-    let report = fill_row(doc, &table.fields, row, (idx as u32).saturating_add(1), options, maps, data_dir, doc_dir);
-    absorb(report, warnings, missing, parent);
+    let report = fill_row(doc, &table.fields, row, (idx as u32).saturating_add(1), maps, sources);
+    sink.absorb(report);
 }
 
-fn absorb(report: FillReport, warnings: &mut Vec<String>, missing: &mut Vec<MissingImage>, parent: &mut bool) {
-    for w in report.warnings {
-        if w == PARENT_WARNING {
-            if *parent {
-                continue;
+/// Warnings and missing images collected across every record, with the parent-page warning kept to one.
+struct Sink<'a> {
+    warnings: &'a mut Vec<String>,
+    missing: &'a mut Vec<MissingImage>,
+    parent: bool,
+}
+
+impl Sink<'_> {
+    fn absorb(&mut self, report: FillReport) {
+        for w in report.warnings {
+            if w == PARENT_WARNING {
+                if self.parent {
+                    continue;
+                }
+                self.parent = true;
             }
-            *parent = true;
+            self.warnings.push(w);
         }
-        warnings.push(w);
+        self.missing.extend(report.missing);
     }
-    missing.extend(report.missing);
 }
 
 fn block_of(doc: &Document) -> (Rect, Vec<ItemId>) {
diff --git a/crates/engine/src/cmd/datamerge/fill.rs b/crates/engine/src/cmd/datamerge/fill.rs
index d4b2235e9..629258d6d 100644
--- a/crates/engine/src/cmd/datamerge/fill.rs
+++ b/crates/engine/src/cmd/datamerge/fill.rs
@@ -128,21 +128,33 @@ struct Rep {
     text: String,
 }
 
+/// Where `fill_row` looks for linked images: the merge options and the two search folders.
+#[derive(Clone, Copy)]
+pub struct Sources<'a> {
+    pub options: &'a MergeOptions,
+    pub data_dir: Option<&'a Path>,
+    pub doc_dir: Option<&'a Path>,
+}
+
+/// Replacements and hyperlinks collected while walking the placeholders of one record.
+#[derive(Default)]
+struct Pending {
+    reps: Vec<Rep>,
+    links: Vec<(PlaceholderAnchor, HyperlinkDest, String)>,
+    parent: bool,
+    report: FillReport,
+}
+
 /// Fill `row` (0-based) into the items `maps` points at. `record` is the 1-based source row.
 pub fn fill_row(
     doc: &mut designcraft_doc::Document,
     fields: &[DataField],
     row: &[String],
     record: u32,
-    options: &MergeOptions,
     maps: &Maps,
-    data_dir: Option<&Path>,
-    doc_dir: Option<&Path>,
+    sources: &Sources,
 ) -> FillReport {
-    let mut report = FillReport::default();
-    let mut parent = false;
-    let mut reps: Vec<Rep> = Vec::new();
-    let mut links: Vec<(PlaceholderAnchor, HyperlinkDest, String)> = Vec::new();
+    let mut pending = Pending::default();
     let placeholders = doc.data_merge.placeholders.clone();
     for ph in &placeholders {
         if !fields.iter().any(|f| f.name == ph.field) {
@@ -150,43 +162,11 @@ pub fn fill_row(
         }
         let cell = cell_of(fields, row, &ph.field).to_string();
         match &ph.anchor {
-            PlaceholderAnchor::Text { story, start, end } => {
-                let Some(&mapped) = maps.stories.get(story) else {
-                    if anchor_is_parent(doc, &ph.anchor) {
-                        parent = true;
-                    }
-                    continue;
-                };
-                match ph.role {
-                    PlaceholderRole::Text => reps.push(Rep { story: mapped, start: *start, end: *end, text: cell }),
-                    PlaceholderRole::Hyperlink => {
-                        if let Some(dest) = classify_link(&cell) {
-                            links.push((PlaceholderAnchor::Text { story: mapped, start: *start, end: *end }, dest, ph.field.clone()));
-                        }
-                    }
-                    PlaceholderRole::Image | PlaceholderRole::Qr => {}
-                }
-            }
-            PlaceholderAnchor::Item { id } => {
-                let Some(&mapped) = maps.items.get(id) else {
-                    if anchor_is_parent(doc, &ph.anchor) {
-                        parent = true;
-                    }
-                    continue;
-                };
-                match ph.role {
-                    PlaceholderRole::Image => place_image(doc, mapped, &ph.field, &cell, record, options, data_dir, doc_dir, &mut report),
-                    PlaceholderRole::Qr => place_qr(doc, mapped, &ph.field, &cell, record, &mut report),
-                    PlaceholderRole::Hyperlink => {
-                        if let Some(dest) = classify_link(&cell) {
-                            links.push((PlaceholderAnchor::Item { id: mapped }, dest, ph.field.clone()));
-                        }
-                    }
-                    PlaceholderRole::Text => {}
-                }
-            }
+            PlaceholderAnchor::Text { story, start, end } => plan_text(doc, maps, ph, (*story, *start, *end), cell, &mut pending),
+            PlaceholderAnchor::Item { .. } => plan_item(doc, maps, ph, &cell, record, sources, &mut pending),
         }
     }
+    let Pending { mut reps, links, parent, mut report } = pending;
     typed_reps(doc, fields, row, maps, &placeholders, &mut reps);
     apply_reps(doc, &reps);
     for (anchor, dest, field) in links {
@@ -207,6 +187,59 @@ pub fn fill_row(
     report
 }
 
+fn plan_text(
+    doc: &designcraft_doc::Document,
+    maps: &Maps,
+    ph: &designcraft_doc::Placeholder,
+    (story, start, end): (StoryId, usize, usize),
+    cell: String,
+    pending: &mut Pending,
+) {
+    let Some(&mapped) = maps.stories.get(&story) else {
+        if anchor_is_parent(doc, &ph.anchor) {
+            pending.parent = true;
+        }
+        return;
+    };
+    match ph.role {
+        PlaceholderRole::Text => pending.reps.push(Rep { story: mapped, start, end, text: cell }),
+        PlaceholderRole::Hyperlink => {
+            if let Some(dest) = classify_link(&cell) {
+                pending.links.push((PlaceholderAnchor::Text { story: mapped, start, end }, dest, ph.field.clone()));
+            }
+        }
+        PlaceholderRole::Image | PlaceholderRole::Qr => {}
+    }
+}
+
+fn plan_item(
+    doc: &mut designcraft_doc::Document,
+    maps: &Maps,
+    ph: &designcraft_doc::Placeholder,
+    cell: &str,
+    record: u32,
+    sources: &Sources,
+    pending: &mut Pending,
+) {
+    let PlaceholderAnchor::Item { id } = &ph.anchor else { return };
+    let Some(&mapped) = maps.items.get(id) else {
+        if anchor_is_parent(doc, &ph.anchor) {
+            pending.parent = true;
+        }
+        return;
+    };
+    match ph.role {
+        PlaceholderRole::Image => place_image(doc, mapped, &ph.field, cell, record, sources, &mut pending.report),
+        PlaceholderRole::Qr => place_qr(doc, mapped, &ph.field, cell, record, &mut pending.report),
+        PlaceholderRole::Hyperlink => {
+            if let Some(dest) = classify_link(cell) {
+                pending.links.push((PlaceholderAnchor::Item { id: mapped }, dest, ph.field.clone()));
+            }
+        }
+        PlaceholderRole::Text => {}
+    }
+}
+
 fn typed_reps(
     doc: &designcraft_doc::Document,
     fields: &[DataField],
@@ -326,17 +359,8 @@ fn create_link(doc: &mut designcraft_doc::Document, anchor: PlaceholderAnchor, d
     true
 }
 
-fn place_image(
-    doc: &mut designcraft_doc::Document,
-    item: ItemId,
-    field: &str,
-    cell: &str,
-    record: u32,
-    options: &MergeOptions,
-    data_dir: Option<&Path>,
-    doc_dir: Option<&Path>,
-    report: &mut FillReport,
-) {
+fn place_image(doc: &mut designcraft_doc::Document, item: ItemId, field: &str, cell: &str, record: u32, sources: &Sources, report: &mut FillReport) {
+    let Sources { options, data_dir, doc_dir } = *sources;
     let cands = image_candidates(cell, data_dir, doc_dir);
     let found = cands.iter().find_map(|p| {
         // Refuse huge files before reading them; a too-large image counts as missing.
@@ -369,6 +393,7 @@ fn place_image(
     };
     let mode = fitting_of(&options.fitting);
     let mut g = Graphic {
+        layer_options: None,
         asset: AssetId(0),
         size: (nw, nh),
         xf: Affine::translate((inner.x0, inner.y0)),
diff --git a/crates/engine/src/cmd/datamerge/parse.rs b/crates/engine/src/cmd/datamerge/parse.rs
index c76c37f1e..6cc838c3c 100644
--- a/crates/engine/src/cmd/datamerge/parse.rs
+++ b/crates/engine/src/cmd/datamerge/parse.rs
@@ -128,7 +128,7 @@ pub fn table_from_objects(rows: &[Value]) -> Result<Table, String> {
                 warnings.push(format!("Row {} has an extra field \"{key}\". It was ignored.", i + 1));
             }
         }
-        if cells.iter().all(|c| c.is_empty()) {
+        if cells.iter().all(String::is_empty) {
             continue;
         }
         out.push(cells);
@@ -159,38 +159,7 @@ pub fn select_records(count: usize, records: &str, one: u32, range: &str, limit:
             let i = record_index(one, count)?;
             idx.push(i);
         }
-        "range" => {
-            if range.trim().is_empty() {
-                return Err("no records".into());
-            }
-            for token in range.split(',') {
-                let token = token.trim();
-                if token.is_empty() {
-                    continue;
-                }
-                if let Some((a, b)) = token.split_once('-') {
-                    let a = parse_record_no(a.trim())?;
-                    let b = parse_record_no(b.trim())?;
-                    if a > b {
-                        return Err(format!("range {a}-{b} is reversed"));
-                    }
-                    let mut n = a;
-                    while n <= b {
-                        let i = record_index(n, count)?;
-                        if seen.insert(i) {
-                            idx.push(i);
-                        }
-                        n = n.saturating_add(1);
-                    }
-                } else {
-                    let n = parse_record_no(token)?;
-                    let i = record_index(n, count)?;
-                    if seen.insert(i) {
-                        idx.push(i);
-                    }
-                }
-            }
-        }
+        "range" => select_range(range, count, &mut idx, &mut seen)?,
         other => return Err(format!("unknown records value \"{other}\"")),
     }
     if let Some(limit) = limit {
@@ -205,6 +174,41 @@ pub fn select_records(count: usize, records: &str, one: u32, range: &str, limit:
     Ok(idx)
 }
 
+/// Expand a comma-separated list of record numbers and `a-b` ranges into `idx`, skipping repeats.
+fn select_range(range: &str, count: usize, idx: &mut Vec<usize>, seen: &mut std::collections::HashSet<usize>) -> Result<(), String> {
+    if range.trim().is_empty() {
+        return Err("no records".into());
+    }
+    for token in range.split(',') {
+        let token = token.trim();
+        if token.is_empty() {
+            continue;
+        }
+        let (a, b) = match token.split_once('-') {
+            Some((a, b)) => (parse_record_no(a.trim())?, parse_record_no(b.trim())?),
+            None => {
+                let n = parse_record_no(token)?;
+                (n, n)
+            }
+        };
+        if a > b {
+            return Err(format!("range {a}-{b} is reversed"));
+        }
+        let mut n = a;
+        while n <= b {
+            let i = record_index(n, count)?;
+            if seen.insert(i) {
+                idx.push(i);
+            }
+            if n == b {
+                break;
+            }
+            n += 1;
+        }
+    }
+    Ok(())
+}
+
 fn parse_record_no(s: &str) -> Result<u32, String> {
     s.parse::<u32>().map_err(|_| format!("bad record \"{s}\""))
 }
diff --git a/crates/engine/src/cmd/datamerge/tests.rs b/crates/engine/src/cmd/datamerge/tests.rs
index 98849eae1..79e16027e 100644
--- a/crates/engine/src/cmd/datamerge/tests.rs
+++ b/crates/engine/src/cmd/datamerge/tests.rs
@@ -2,7 +2,7 @@
 
 use std::path::{Path, PathBuf};
 
-use designcraft_doc::{Content, DataField, DataFieldKind, DataSource, Delimiter, HyperlinkDest, SourceStatus};
+use designcraft_doc::{Content, DataField, DataFieldKind, DataSource, Delimiter, HyperlinkDest, Selection, SourceStatus, StoryId, TextSel};
 use serde_json::{Value, json};
 
 use super::parse::{self, parse_csv};
@@ -790,30 +790,31 @@ fn tiling_rows_first_bottom_inset_and_refusals() {
     assert_eq!(s.documents().len(), before);
 }
 
+/// An IME delete-surrounding while a record is previewed edits the template, not the filled
+/// record, and its undo step restores the template.
 #[test]
-fn update_remove_preview_inline_rows_and_old_files() {
-    let dir = scratch("update");
-    let csv = dir.join("people.csv");
-    write(&csv, "Name\nAda\nGrace\n");
+fn an_ime_delete_ends_a_preview_and_edits_the_template() {
     let mut s = Session::new();
     new_doc(&mut s, 1);
-    text_frame(&mut s, [36.0, 36.0, 240.0, 80.0], "", None);
-    exec(&mut s, "data.source.select", json!({"path": csv}));
-    let id = exec(&mut s, "data.placeholder.add", json!({"field": "Name"}))["id"].clone();
-    let undo = s.documents()[0].history.undo.len();
-    let fingerprint = s.documents()[0].doc.data_merge.sources[0].fingerprint;
-    let mut body = std::fs::read(&csv).unwrap();
-    body.extend_from_slice(b"Kai\n");
-    std::fs::write(&csv, &body).unwrap();
-    let r = exec(&mut s, "data.merge", json!({}));
-    assert_eq!(r["records"], 2);
-    assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap_or("").contains("changed")));
-    assert_eq!(texts(&s), vec!["Ada".to_string(), "Grace".to_string()]);
-    assert_eq!(s.documents()[0].doc.data_merge.sources[0].status, SourceStatus::Modified);
-    assert_eq!(s.documents()[0].doc.data_merge.sources[0].fingerprint, fingerprint);
-    assert_eq!(s.documents()[0].history.undo.len(), undo);
-    assert_eq!(s.documents()[s.active_index().unwrap()].doc.data_merge.sources[0].status, SourceStatus::Modified);
+    let f = text_frame(&mut s, [36.0, 36.0, 240.0, 80.0], "", None);
+    let sid = StoryId(f["story"].as_u64().unwrap());
+    select_csv(&mut s, "Name\nAda\nGrace\n");
+    exec(&mut s, "data.placeholder.add", json!({"field": "Name"}));
+    assert_eq!(texts(&s), vec!["<<Name>>".to_string()]);
+    exec(&mut s, "data.preview", json!({"record": 2}));
+    assert_eq!(texts(&s), vec!["Grace".to_string()], "the preview shows the record");
+    // The caret was placed in the preview, at the end of the filled text.
+    s.doc_mut().unwrap().selection = Selection::text(TextSel { story: sid, anchor: 5, focus: 5, frame: None, cell: None });
+    let m = s.ime_delete_surrounding(1, 0, false).unwrap().expect("the delete changed the template");
+    assert!(m.inserted.is_empty());
+    assert!(s.doc().unwrap().preview_stash.is_none(), "the preview ended before the edit");
+    assert_eq!(texts(&s), vec!["<<Nae>>".to_string()], "the template lost the character, not the filled record");
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(texts(&s), vec!["<<Name>>".to_string()], "Undo restores the template, never the preview record");
+    assert!(s.doc().unwrap().preview_stash.is_none());
+}
 
+fn check_missing_merge_source(dir: &Path) {
     let gone = dir.join("gone.csv");
     write(&gone, "Name\nAda\nGrace\n");
     let mut missing = Session::new();
@@ -829,7 +830,9 @@ fn update_remove_preview_inline_rows_and_old_files() {
     assert_eq!(texts(&missing), vec!["Ada".to_string(), "Grace".to_string()]);
     assert_eq!(missing.documents()[0].doc.data_merge.sources[0].status, SourceStatus::Missing);
     assert_eq!(missing.documents()[0].history.undo.len(), missing_undo);
+}
 
+fn check_refused_facing_page_merge(dir: &Path) {
     let refuse = dir.join("refuse.csv");
     write(&refuse, "Name\nAda\nGrace\n");
     let mut refused = Session::new();
@@ -846,49 +849,56 @@ fn update_remove_preview_inline_rows_and_old_files() {
     assert_eq!(refused.documents().len(), 1);
     assert_eq!(refused.documents()[0].doc.data_merge.sources[0].status, SourceStatus::Ok);
     assert_eq!(refused.documents()[0].history.undo.len(), refuse_undo);
+}
 
-    exec(&mut s, "file.activate", json!({"index": 0}));
-    exec(&mut s, "data.source.update", json!({}));
-    let r = exec(&mut s, "data.merge", json!({}));
+fn check_preview_update_save(session: &mut Session, dir: &Path, csv: &Path, id: &Value) {
+    exec(session, "file.activate", json!({"index": 0}));
+    exec(session, "data.source.update", json!({}));
+    let r = exec(session, "data.merge", json!({}));
     assert_eq!(r["records"], 3);
-    assert!(texts(&s).iter().any(|t| t == "Kai"));
+    assert!(texts(session).iter().any(|t| t == "Kai"));
 
-    exec(&mut s, "file.activate", json!({"index": 0}));
-    exec(&mut s, "data.source.remove", json!({}));
-    assert!(s.documents()[0].doc.data_merge.sources.is_empty());
-    assert!(s.documents()[0].doc.data_merge.placeholders.iter().any(|ph| ph.id == id.as_u64().unwrap()));
-    assert_eq!(exec(&mut s, "data.fields", json!({})), json!([]));
+    exec(session, "file.activate", json!({"index": 0}));
+    exec(session, "data.source.remove", json!({}));
+    assert!(session.documents()[0].doc.data_merge.sources.is_empty());
+    assert!(session.documents()[0].doc.data_merge.placeholders.iter().any(|ph| ph.id == id.as_u64().unwrap()));
+    assert_eq!(exec(session, "data.fields", json!({})), json!([]));
 
-    select_csv(&mut s, "Name\nAda\nGrace\n");
-    exec(&mut s, "data.preview", json!({"record": 2}));
-    assert!(texts(&s).iter().any(|t| t.contains("Grace")));
-    assert!(!texts(&s).iter().any(|t| t.contains("<<Name>>")));
-    let ser = exec(&mut s, "file.serialize", json!({}));
+    select_csv(session, "Name\nAda\nGrace\n");
+    exec(session, "data.preview", json!({"record": 2}));
+    assert!(texts(session).iter().any(|t| t.contains("Grace")));
+    assert!(!texts(session).iter().any(|t| t.contains("<<Name>>")));
+    let ser = exec(session, "file.serialize", json!({}));
     let saved = crate::cmd::from_bytes(&crate::cmd::base64_decode(ser["base64"].as_str().unwrap())).unwrap();
     assert!(saved.stories.values().any(|st| st.text.contains("<<Name>>")));
     assert!(!saved.stories.values().any(|st| st.text.contains("Grace")));
-    exec(&mut s, "data.preview.stop", json!({}));
-    assert!(texts(&s).iter().any(|t| t.contains("<<Name>>")));
+    exec(session, "data.preview.stop", json!({}));
+    assert!(texts(session).iter().any(|t| t.contains("<<Name>>")));
 
-    exec(&mut s, "data.preview", json!({"record": 2}));
+    exec(session, "data.preview", json!({"record": 2}));
     let path = dir.join("saved.designcraft");
-    exec(&mut s, "file.save", json!({"path": path}));
+    exec(session, "file.save", json!({"path": path}));
     let saved = crate::cmd::from_bytes(&std::fs::read(&path).unwrap()).unwrap();
     assert!(!saved.stories.values().any(|st| st.text.contains("Grace")));
     assert!(saved.stories.values().any(|st| st.text.contains("<<Name>>")));
 
-    exec(&mut s, "data.preview", json!({"record": 2}));
+    exec(session, "data.preview", json!({"record": 2}));
     let rec = dir.join("recovery");
-    s.recovery_dir = Some(rec.clone());
-    crate::recovery::save(&s, &rec).unwrap();
-    let uid = s.documents()[0].uid;
+    session.recovery_dir = Some(rec.clone());
+    crate::recovery::save(session, &rec).unwrap();
+    let uid = session.documents()[0].uid;
     let recovered = crate::cmd::from_bytes(&std::fs::read(rec.join(format!("{uid}.designcraft"))).unwrap()).unwrap();
     assert!(!recovered.stories.values().any(|st| st.text.contains("Grace")));
-    assert!(texts(&s).iter().any(|t| t.contains("Grace")), "recovery writes the stash and leaves the preview on screen");
-    exec(&mut s, "file.new", json!({}));
-    exec(&mut s, "file.activate", json!({"index": 0}));
-    assert!(texts(&s).iter().any(|t| t.contains("<<Name>>")));
+    assert!(texts(session).iter().any(|t| t.contains("Grace")), "recovery writes the stash and leaves the preview on screen");
+    exec(session, "file.new", json!({}));
+    exec(session, "file.activate", json!({"index": 0}));
+    assert!(texts(session).iter().any(|t| t.contains("<<Name>>")));
 
+    check_inline_rows_and_invalid_requests();
+    check_saved_relative_source(dir, csv);
+}
+
+fn check_inline_rows_and_invalid_requests() {
     let mut s = Session::new();
     new_doc(&mut s, 1);
     text_frame(&mut s, [36.0, 36.0, 300.0, 80.0], "<<Name>> <<Qty>>", None);
@@ -916,7 +926,9 @@ fn update_remove_preview_inline_rows_and_old_files() {
     let msg = err(&mut s, "data.merge", json!({"csv": "Name\nAda\n", "limit": 4_294_967_296u64}));
     assert!(msg.contains("too large"), "{msg}");
     assert_eq!(s.documents().len(), before);
+}
 
+fn check_saved_relative_source(dir: &Path, csv: &Path) {
     let fresh = dir.join("fresh.designcraft");
     let mut s = Session::new();
     new_doc(&mut s, 1);
@@ -929,6 +941,35 @@ fn update_remove_preview_inline_rows_and_old_files() {
     assert_eq!(opened.data_merge.sources[0].relative_path.as_deref(), Some("people.csv"));
 }
 
+#[test]
+fn update_remove_preview_inline_rows_and_old_files() {
+    let dir = scratch("update");
+    let csv = dir.join("people.csv");
+    write(&csv, "Name\nAda\nGrace\n");
+    let mut s = Session::new();
+    new_doc(&mut s, 1);
+    text_frame(&mut s, [36.0, 36.0, 240.0, 80.0], "", None);
+    exec(&mut s, "data.source.select", json!({"path": csv}));
+    let id = exec(&mut s, "data.placeholder.add", json!({"field": "Name"}))["id"].clone();
+    let undo = s.documents()[0].history.undo.len();
+    let fingerprint = s.documents()[0].doc.data_merge.sources[0].fingerprint;
+    let mut body = std::fs::read(&csv).unwrap();
+    body.extend_from_slice(b"Kai\n");
+    std::fs::write(&csv, &body).unwrap();
+    let r = exec(&mut s, "data.merge", json!({}));
+    assert_eq!(r["records"], 2);
+    assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap_or("").contains("changed")));
+    assert_eq!(texts(&s), vec!["Ada".to_string(), "Grace".to_string()]);
+    assert_eq!(s.documents()[0].doc.data_merge.sources[0].status, SourceStatus::Modified);
+    assert_eq!(s.documents()[0].doc.data_merge.sources[0].fingerprint, fingerprint);
+    assert_eq!(s.documents()[0].history.undo.len(), undo);
+    assert_eq!(s.documents()[s.active_index().unwrap()].doc.data_merge.sources[0].status, SourceStatus::Modified);
+
+    check_missing_merge_source(&dir);
+    check_refused_facing_page_merge(&dir);
+    check_preview_update_save(&mut s, &dir, &csv, &id);
+}
+
 #[test]
 fn parent_placeholder_is_copied_unfilled() {
     let mut s = Session::new();
diff --git a/crates/engine/src/cmd/edit.rs b/crates/engine/src/cmd/edit.rs
index a10e9ae2f..890974f32 100644
--- a/crates/engine/src/cmd/edit.rs
+++ b/crates/engine/src/cmd/edit.rs
@@ -550,343 +550,7 @@ fn graphic_alone(frame: &designcraft_doc::Item, g: &designcraft_doc::Graphic, pa
 }
 
 #[cfg(test)]
-mod text_clipboard_tests {
-    use super::*;
-
-    fn frame(s: &mut Session, text: &str) -> designcraft_doc::StoryId {
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": text})).unwrap();
-        s.doc().unwrap().doc.item(ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story
-    }
-
-    #[test]
-    fn paste_text_with_no_insertion_point_makes_a_text_frame() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let items = |s: &Session| s.doc().unwrap().doc.spreads[0].items.len();
-        // Text from another app, nothing copied here: a new, selected text frame.
-        let r = s.execute("edit.paste", &json!({"text": "From elsewhere\r\nSecond line"})).unwrap();
-        let id = ItemId(r["id"].as_u64().unwrap());
-        let d = s.doc().unwrap();
-        assert_eq!(d.selection.items, vec![id]);
-        assert!(d.selection.text.is_none(), "selected as an object");
-        let it = d.doc.item(id).unwrap();
-        assert_eq!(d.doc.story(it.text_frame().unwrap().story).unwrap().text, "From elsewhere\nSecond line");
-        let page = &d.doc.spreads[0].pages[0];
-        let (b, m) = (it.bounds(), page.margin_rect());
-        assert!((b.width() - page.column_rects()[0].width()).abs() < 1e-6, "{b:?}");
-        assert!(b.height() < m.height() / 2.0, "fits two lines: {b:?}");
-        assert!((b.center().y - m.center().y).abs() < 1e-6, "{b:?}");
-        assert!(!s.cache.get(&d.doc, it.text_frame().unwrap().story, None).is_overset());
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(items(&s), 0, "one undo removes it");
-        // Centred on `at`; hostile numbers are clamped.
-        let r = s.execute("edit.paste", &json!({"text": "Here", "at": [200.0, 300.0]})).unwrap();
-        let b = s.doc().unwrap().doc.item(ItemId(r["id"].as_u64().unwrap())).unwrap().bounds();
-        assert!((b.center().x - 200.0).abs() < 1e-6 && (b.center().y - 300.0).abs() < 1e-6, "{b:?}");
-        assert!(s.execute("edit.paste", &json!({"text": "Far", "at": [1e300, -1e300], "spread": 99})).is_err());
-        s.execute("edit.paste", &json!({"text": "Far", "at": [1e300, -1e300]})).unwrap();
-        // Copied objects paste when no text is given.
-        s.execute("edit.deselectAll", &json!({})).unwrap();
-        let rect = s.execute("frame.create", &json!({"rect": [72, 72, 200, 160]})).unwrap()["id"].clone();
-        s.execute("selection.set", &json!({"ids": [rect]})).unwrap();
-        s.execute("edit.copy", &json!({})).unwrap();
-        let n = items(&s);
-        let r = s.execute("edit.paste", &json!({})).unwrap();
-        assert_eq!(r["ids"].as_array().unwrap().len(), 1);
-        assert_eq!(items(&s), n + 1);
-        assert!(s.doc().unwrap().doc.item(ItemId(r["ids"][0].as_u64().unwrap())).unwrap().text_frame().is_none());
-        s.doc().unwrap().doc.check().unwrap();
-    }
-
-    /// Copying a rectangle, then text in another app, pasted the rectangle into the text (#212).
-    #[test]
-    fn paste_at_a_caret_prefers_other_apps_text_to_copied_objects() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let story = frame(&mut s, "ab");
-        let rect = s.execute("frame.create", &json!({"rect": [72, 400, 200, 480]})).unwrap()["id"].clone();
-        s.execute("selection.set", &json!({"ids": [rect]})).unwrap();
-        s.execute("edit.copy", &json!({})).unwrap();
-        let marker = copied_objects_text(&s);
-        s.execute("text.select", &json!({"story": story.0, "anchor": 2, "focus": 2})).unwrap();
-        let r = s.execute("edit.paste", &json!({"text": "From elsewhere"})).unwrap();
-        assert!(r.get("anchored").is_none(), "{r}");
-        assert_eq!(s.doc().unwrap().doc.story(story).unwrap().text, "abFrom elsewhere");
-        // What the object copy put on the system clipboard still pastes the objects.
-        assert_eq!(s.execute("edit.paste", &json!({"text": marker})).unwrap()["anchored"], 1);
-        // With no insertion point too: the rectangle, not a text frame holding the marker.
-        s.execute("edit.deselectAll", &json!({})).unwrap();
-        let r = s.execute("edit.paste", &json!({"text": marker})).unwrap();
-        let id = ItemId(r["ids"][0].as_u64().unwrap());
-        assert!(s.doc().unwrap().doc.item(id).unwrap().text_frame().is_none());
-        s.doc().unwrap().doc.check().unwrap();
-        // Paste without Formatting inserts the text given; empty text is no text.
-        s.execute("text.select", &json!({"story": story.0, "anchor": 0, "focus": 0})).unwrap();
-        assert!(s.execute("edit.pasteWithoutFormatting", &json!({"text": ""})).is_err());
-    }
-
-    /// Text frames, and groups holding one, can't be anchored: at a caret their copy pastes as text.
-    #[test]
-    fn copied_text_frames_paste_at_a_caret_as_their_text() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let target = frame(&mut s, "ab");
-        let copy_and_paste = |s: &mut Session, ids: Value, text: Value| {
-            s.execute("selection.set", &json!({"ids": ids})).unwrap();
-            s.execute("edit.copy", &json!({})).unwrap();
-            s.execute("text.select", &json!({"story": target.0, "anchor": 0, "focus": 0})).unwrap();
-            s.execute("edit.paste", &json!({"text": text})).unwrap()
-        };
-        let chapter = s.execute("frame.create", &json!({"rect": [72, 400, 300, 480], "content": "text", "text": "Chapter 1"})).unwrap()["id"].clone();
-        // The same text copied in another app, and the system clipboard read back as absent.
-        let r = copy_and_paste(&mut s, json!([chapter]), json!("Chapter 1"));
-        assert!(r.get("anchored").is_none(), "{r}");
-        s.execute("edit.paste", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(target).unwrap().text, "Chapter 1Chapter 1ab");
-        // A group with a text frame inside, its own placeholder on the system clipboard.
-        let rect = s.execute("frame.create", &json!({"rect": [72, 500, 200, 560]})).unwrap()["id"].clone();
-        let group = s.execute("object.group", &json!({"ids": [chapter, rect]})).unwrap()["id"].clone();
-        let r = copy_and_paste(&mut s, json!([group]), Value::Null);
-        assert!(r.get("anchored").is_none(), "{r}");
-        assert_eq!(s.doc().unwrap().doc.story(target).unwrap().text, "Chapter 1Chapter 1Chapter 1ab");
-        s.doc().unwrap().doc.check().unwrap();
-    }
-
-    #[test]
-    fn outside_text_never_pastes_markers() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        // Private-use characters from another app would read as footnote, table or variable markers.
-        let dirty = "a\u{E00A}b\u{E009}c\u{E1FF}d\u{E200}";
-        let r = s.execute("edit.paste", &json!({"text": dirty})).unwrap();
-        let st = s.doc().unwrap().doc.item(ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-        assert_eq!(s.doc().unwrap().doc.story(st).unwrap().text, "abcd\u{E200}");
-        s.doc().unwrap().doc.check().unwrap();
-        let b = frame(&mut s, "Target");
-        s.execute("text.select", &json!({"story": b.0, "anchor": 6, "focus": 6})).unwrap();
-        s.execute("edit.paste", &json!({"text": dirty})).unwrap();
-        s.execute("edit.pasteWithoutFormatting", &json!({"text": dirty})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(b).unwrap().text, "Targetabcd\u{E200}abcd\u{E200}");
-        assert!(s.execute("edit.paste", &json!({"text": "\u{E00A}"})).is_err());
-        s.doc().unwrap().doc.check().unwrap();
-    }
-
-    #[test]
-    fn copied_text_pasted_with_no_insertion_point_keeps_its_formatting() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let a = frame(&mut s, "Bold words\nSecond");
-        s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": 4})).unwrap();
-        s.execute("type.bold", &json!({})).unwrap();
-        s.execute("text.select", &json!({"story": a.0, "anchor": 11, "focus": 17})).unwrap();
-        s.execute("type.para", &json!({"attrs": {"align": "center"}})).unwrap();
-        s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": 17})).unwrap();
-        let copied = s.execute("edit.copy", &json!({})).unwrap()["text"].as_str().unwrap().to_string();
-        s.execute("edit.deselectAll", &json!({})).unwrap();
-        let r = s.execute("edit.paste", &json!({"text": copied})).unwrap();
-        let d = s.doc().unwrap();
-        let st = d.doc.story(d.doc.item(ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story).unwrap();
-        assert_eq!(st.text, "Bold words\nSecond");
-        assert_eq!(st.char_format_at(2).over.font_style.as_deref(), Some("Bold"));
-        assert_eq!(st.char_format_at(7).over.font_style, None);
-        assert_eq!(st.paras[1], d.doc.story(a).unwrap().paras[1]);
-        d.doc.check().unwrap();
-    }
-
-    #[test]
-    fn formatted_copy_paste_and_plain_paste() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let a = frame(&mut s, "Bold words here.");
-        let b = frame(&mut s, "Target: .");
-        s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": 4})).unwrap();
-        s.execute("type.bold", &json!({})).unwrap();
-        // A footnote inside the copied range travels with it.
-        s.execute("text.select", &json!({"story": a.0, "anchor": 4, "focus": 4})).unwrap();
-        s.execute("footnote.insert", &json!({"text": "n"})).unwrap();
-        let fl = designcraft_doc::FOOTNOTE_REF.len_utf8();
-        s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": 10 + fl})).unwrap();
-        let r = s.execute("edit.copy", &json!({})).unwrap();
-        assert_eq!(r["text"], "Bold words");
-        // Formatted paste when the system clipboard matches.
-        s.execute("text.select", &json!({"story": b.0, "anchor": 8, "focus": 8})).unwrap();
-        s.execute("edit.paste", &json!({"text": "Bold words"})).unwrap();
-        let st = s.doc().unwrap().doc.story(b).unwrap().clone();
-        assert_eq!(st.text, format!("Target: Bold{} words.", designcraft_doc::FOOTNOTE_REF));
-        assert_eq!(st.char_format_at(9).over.font_style.as_deref(), Some("Bold"));
-        assert_eq!(st.notes.len(), 1);
-        assert_eq!(st.notes[0].text.text, "n");
-        // Other text on the system clipboard pastes as plain text.
-        s.execute("edit.paste", &json!({"text": "\"x\""})).unwrap();
-        assert!(s.doc().unwrap().doc.story(b).unwrap().text.contains("\"x\""), "no smart quotes on paste");
-        // Paste without formatting takes the insertion format.
-        s.execute("text.select", &json!({"story": b.0, "anchor": 0, "focus": 0})).unwrap();
-        s.execute("edit.pasteWithoutFormatting", &json!({})).unwrap();
-        let st = s.doc().unwrap().doc.story(b).unwrap().clone();
-        assert!(st.text.starts_with("Bold wordsTarget"), "{:?}", st.text);
-        assert_eq!(st.char_format_at(1).over.font_style, None);
-        // Cut removes and copies.
-        s.execute("text.select", &json!({"story": b.0, "anchor": 0, "focus": 4})).unwrap();
-        assert_eq!(s.execute("edit.cut", &json!({})).unwrap()["text"], "Bold");
-        assert!(s.doc().unwrap().doc.story(b).unwrap().text.starts_with(" wordsTarget"));
-        s.doc().unwrap().doc.check().unwrap();
-    }
-
-    fn note_clipboard_session() -> (Session, designcraft_doc::StoryId) {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let source = frame(&mut s, "aéz");
-        s.execute("text.select", &json!({"story": source.0, "anchor": 1, "focus": 1})).unwrap();
-        s.execute("endnote.insert", &json!({"text": "Citation A"})).unwrap();
-        s.execute("note.new", &json!({"text": "Memo A", "author": "Ed"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(source).unwrap().text, "a\u{E00F}\u{E010}éz");
-        s.execute("text.select", &json!({"story": source.0, "anchor": 0, "focus": 10})).unwrap();
-        s.execute("type.char", &json!({"attrs": {"fontStyle": "Bold"}})).unwrap();
-        assert_eq!(s.execute("edit.copy", &json!({})).unwrap(), json!({"text": "aéz"}));
-        (s, source)
-    }
-
-    fn assert_child_note_paste(
-        s: &mut Session,
-        source: designcraft_doc::StoryId,
-        parent: designcraft_doc::StoryId,
-        cell: designcraft_doc::CellAddr,
-        endpoints: (usize, usize),
-    ) {
-        let before = s.doc().unwrap().doc.clone();
-        let selected = s.doc().unwrap().selection.text.unwrap();
-        assert_eq!((selected.story, selected.cell, selected.anchor, selected.focus), (parent, Some(cell), endpoints.0, endpoints.1));
-        assert_eq!(selected.frame, None);
-        let before_child = before.text_story(parent, Some(cell)).unwrap();
-        assert_eq!(before_child.text, "L----R");
-        let clipboard = s.text_clipboard.clone();
-        let history = s.execute("document.history", &json!({})).unwrap();
-        assert_eq!(history["redo"], json!([]));
-
-        let result = s.execute("edit.paste", &json!({})).unwrap();
-        let after = s.doc().unwrap().doc.clone();
-        let child = after.text_story(parent, Some(cell)).unwrap();
-        assert_eq!(child.text, "LaézR", "root-only note markers must not enter child text");
-        assert_eq!(child.len(), 6);
-        assert_eq!(result, json!({"pos": 5, "formatted": true}));
-        assert_eq!(s.doc().unwrap().selection, Selection::text(designcraft_doc::TextSel { anchor: 5, focus: 5, ..selected }));
-        assert!(child.endnotes.is_empty() && child.editorial.is_empty());
-        for pos in [1, 2, 4] {
-            let (_, format) = child.runs().find(|(range, _)| range.contains(&pos)).unwrap();
-            assert_eq!(format.over.font_style.as_deref(), Some("Bold"));
-        }
-        // Inspect actual run coverage: char_format_at at a run boundary means the preceding run.
-        for pos in [0, 5] {
-            let (_, old_format) = before_child.runs().find(|(range, _)| range.contains(&pos)).unwrap();
-            let (_, new_format) = child.runs().find(|(range, _)| range.contains(&pos)).unwrap();
-            assert_eq!(new_format, old_format);
-        }
-        assert_eq!(after.story(parent).unwrap().text, before.story(parent).unwrap().text);
-        assert_eq!(after.story(parent).unwrap().chars, before.story(parent).unwrap().chars);
-        assert_eq!(after.story(source), before.story(source));
-        assert_eq!(s.text_clipboard, clipboard);
-
-        let mut pasted_history = history.clone();
-        pasted_history["undo"].as_array_mut().unwrap().push(json!("Paste"));
-        assert_eq!(s.execute("document.history", &json!({})).unwrap(), pasted_history);
-        assert_eq!(s.execute("edit.undo", &json!({})).unwrap(), json!({"undone": "Paste"}));
-        assert_eq!(s.doc().unwrap().doc, before);
-        let mut undone_history = history;
-        undone_history["redo"] = json!(["Paste"]);
-        assert_eq!(s.execute("document.history", &json!({})).unwrap(), undone_history);
-        // This filter does not change which selection Undo restores.
-        assert_eq!(s.execute("edit.redo", &json!({})).unwrap(), json!({"redone": "Paste"}));
-        assert_eq!(s.doc().unwrap().doc, after);
-        assert_eq!(s.execute("document.history", &json!({})).unwrap(), pasted_history);
-    }
-
-    #[test]
-    fn formatted_child_paste_filters_endnotes_and_editorial_in_cells() {
-        let (mut s, source) = note_clipboard_session();
-        let parent = frame(&mut s, "PZ");
-        s.execute("text.select", &json!({"story": parent.0, "anchor": 1, "focus": 1})).unwrap();
-        let table_id = s.execute("table.insert", &json!({"rows": 1, "cols": 2})).unwrap()["table"].as_u64().unwrap();
-        s.execute("text.insert", &json!({"text": "L----R"})).unwrap();
-        s.execute("table.nextCell", &json!({})).unwrap();
-        s.execute("text.insert", &json!({"text": "NEIGHBOR"})).unwrap();
-        s.execute("table.prevCell", &json!({})).unwrap();
-        s.execute("text.move", &json!({"dir": "storyStart"})).unwrap();
-        s.execute("text.move", &json!({"dir": "right"})).unwrap();
-        for _ in 0..4 {
-            s.execute("text.move", &json!({"dir": "right", "extend": true})).unwrap();
-        }
-        let before_table = s.doc().unwrap().doc.story(parent).unwrap().tables[&table_id].clone();
-        let cell = designcraft_doc::CellAddr { table: table_id, row: 0, col: 0 };
-        assert_child_note_paste(&mut s, source, parent, cell, (1, 5));
-        let table = &s.doc().unwrap().doc.story(parent).unwrap().tables[&table_id];
-        assert_eq!(table.cell(0, 1).unwrap().text.text, "NEIGHBOR");
-        let mut expected_table = (*before_table).clone();
-        expected_table.cells[0].text = table.cells[0].text.clone();
-        assert_eq!(table.as_ref(), &expected_table);
-
-        // The same clipboard must still retain both markers when pasted into an ordinary root story.
-        let root = frame(&mut s, "L----R");
-        s.execute("text.select", &json!({"story": root.0, "anchor": 1, "focus": 5})).unwrap();
-        assert_eq!(s.execute("edit.paste", &json!({})).unwrap(), json!({"pos": 11, "formatted": true}));
-        assert_eq!(s.doc().unwrap().doc.story(root).unwrap().text, "La\u{E00F}\u{E010}ézR");
-    }
-
-    #[test]
-    fn formatted_child_paste_filters_endnotes_and_editorial_in_footnotes() {
-        let (mut s, source) = note_clipboard_session();
-        let parent = frame(&mut s, "PZ");
-        let neighbor = s.execute("footnote.insert", &json!({"text": "NEIGHBOR"})).unwrap()["id"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": parent.0, "anchor": 1, "focus": 1})).unwrap();
-        let target = s.execute("footnote.insert", &json!({"text": "L----R"})).unwrap()["id"].as_u64().unwrap();
-        s.execute("text.move", &json!({"dir": "left"})).unwrap();
-        for _ in 0..4 {
-            s.execute("text.move", &json!({"dir": "left", "extend": true})).unwrap();
-        }
-        let before = s.doc().unwrap().doc.story(parent).unwrap().clone();
-        assert_child_note_paste(&mut s, source, parent, designcraft_doc::CellAddr::footnote(target), (5, 1));
-        let after = s.doc().unwrap().doc.story(parent).unwrap();
-        assert_eq!(after.note(neighbor).unwrap().text.text, "NEIGHBOR");
-        assert_eq!(after.note(neighbor), before.note(neighbor));
-        assert_eq!(after.notes.iter().map(|note| note.id).collect::<Vec<_>>(), before.notes.iter().map(|note| note.id).collect::<Vec<_>>());
-    }
-
-    #[test]
-    fn change_case_keeps_runs() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let a = frame(&mut s, "the quick brown fox. jumps over straße");
-        s.execute("text.select", &json!({"story": a.0, "anchor": 4, "focus": 9})).unwrap();
-        s.execute("type.italic", &json!({})).unwrap();
-        let len = s.doc().unwrap().doc.story(a).unwrap().len();
-        s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": len})).unwrap();
-        s.execute("type.changeCase", &json!({"case": "title"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(a).unwrap().text, "The Quick Brown Fox. Jumps Over Straße");
-        s.execute("type.changeCase", &json!({"case": "sentence"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(a).unwrap().text, "The quick brown fox. Jumps over straße");
-        s.execute("type.changeCase", &json!({"case": "upper"})).unwrap();
-        let st = s.doc().unwrap().doc.story(a).unwrap().clone();
-        assert_eq!(st.text, "THE QUICK BROWN FOX. JUMPS OVER STRASSE");
-        assert_eq!(st.char_format_at(5).over.font_style.as_deref(), Some("Italic"));
-        assert_eq!(s.doc().unwrap().selection.text.unwrap().range(), 0..st.len());
-        st.check().unwrap();
-    }
-
-    #[test]
-    fn change_case_leaves_georgian_without_initial_capitals() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let a = frame(&mut s, "ᲒᲐᲛᲐᲠᲯᲝᲑᲐ ᲛᲡᲝᲤᲚᲘᲝ. ᲐᲮᲐᲚᲘ word");
-        let len = s.doc().unwrap().doc.story(a).unwrap().len();
-        s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": len})).unwrap();
-        // Georgian has no title or sentence capitals: Mtavruli is only for all-caps text.
-        s.execute("type.changeCase", &json!({"case": "title"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(a).unwrap().text, "გამარჯობა მსოფლიო. ახალი Word");
-        s.execute("type.changeCase", &json!({"case": "sentence"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(a).unwrap().text, "გამარჯობა მსოფლიო. ახალი word");
-        s.execute("type.changeCase", &json!({"case": "upper"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(a).unwrap().text, "ᲒᲐᲛᲐᲠᲯᲝᲑᲐ ᲛᲡᲝᲤᲚᲘᲝ. ᲐᲮᲐᲚᲘ WORD");
-    }
-}
+mod text_clipboard_tests;
 
 fn paste_into(s: &mut Session, p: &Value) -> Result<Value> {
     use super::object::RemoveKeep;
diff --git a/crates/engine/src/cmd/edit/text_clipboard_tests.rs b/crates/engine/src/cmd/edit/text_clipboard_tests.rs
new file mode 100644
index 000000000..d947105cd
--- /dev/null
+++ b/crates/engine/src/cmd/edit/text_clipboard_tests.rs
@@ -0,0 +1,335 @@
+use super::*;
+
+fn frame(s: &mut Session, text: &str) -> designcraft_doc::StoryId {
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": text})).unwrap();
+    s.doc().unwrap().doc.item(ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story
+}
+
+#[test]
+fn paste_text_with_no_insertion_point_makes_a_text_frame() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let items = |s: &Session| s.doc().unwrap().doc.spreads[0].items.len();
+    // Text from another app, nothing copied here: a new, selected text frame.
+    let r = s.execute("edit.paste", &json!({"text": "From elsewhere\r\nSecond line"})).unwrap();
+    let id = ItemId(r["id"].as_u64().unwrap());
+    let d = s.doc().unwrap();
+    assert_eq!(d.selection.items, vec![id]);
+    assert!(d.selection.text.is_none(), "selected as an object");
+    let it = d.doc.item(id).unwrap();
+    assert_eq!(d.doc.story(it.text_frame().unwrap().story).unwrap().text, "From elsewhere\nSecond line");
+    let page = &d.doc.spreads[0].pages[0];
+    let (b, m) = (it.bounds(), page.margin_rect());
+    assert!((b.width() - page.column_rects()[0].width()).abs() < 1e-6, "{b:?}");
+    assert!(b.height() < m.height() / 2.0, "fits two lines: {b:?}");
+    assert!((b.center().y - m.center().y).abs() < 1e-6, "{b:?}");
+    assert!(!s.cache.get(&d.doc, it.text_frame().unwrap().story, None).is_overset());
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(items(&s), 0, "one undo removes it");
+    // Centred on `at`; hostile numbers are clamped.
+    let r = s.execute("edit.paste", &json!({"text": "Here", "at": [200.0, 300.0]})).unwrap();
+    let b = s.doc().unwrap().doc.item(ItemId(r["id"].as_u64().unwrap())).unwrap().bounds();
+    assert!((b.center().x - 200.0).abs() < 1e-6 && (b.center().y - 300.0).abs() < 1e-6, "{b:?}");
+    assert!(s.execute("edit.paste", &json!({"text": "Far", "at": [1e300, -1e300], "spread": 99})).is_err());
+    s.execute("edit.paste", &json!({"text": "Far", "at": [1e300, -1e300]})).unwrap();
+    // Copied objects paste when no text is given.
+    s.execute("edit.deselectAll", &json!({})).unwrap();
+    let rect = s.execute("frame.create", &json!({"rect": [72, 72, 200, 160]})).unwrap()["id"].clone();
+    s.execute("selection.set", &json!({"ids": [rect]})).unwrap();
+    s.execute("edit.copy", &json!({})).unwrap();
+    let n = items(&s);
+    let r = s.execute("edit.paste", &json!({})).unwrap();
+    assert_eq!(r["ids"].as_array().unwrap().len(), 1);
+    assert_eq!(items(&s), n + 1);
+    assert!(s.doc().unwrap().doc.item(ItemId(r["ids"][0].as_u64().unwrap())).unwrap().text_frame().is_none());
+    s.doc().unwrap().doc.check().unwrap();
+}
+
+/// Copying a rectangle, then text in another app, pasted the rectangle into the text (#212).
+#[test]
+fn paste_at_a_caret_prefers_other_apps_text_to_copied_objects() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let story = frame(&mut s, "ab");
+    let rect = s.execute("frame.create", &json!({"rect": [72, 400, 200, 480]})).unwrap()["id"].clone();
+    s.execute("selection.set", &json!({"ids": [rect]})).unwrap();
+    s.execute("edit.copy", &json!({})).unwrap();
+    let marker = copied_objects_text(&s);
+    s.execute("text.select", &json!({"story": story.0, "anchor": 2, "focus": 2})).unwrap();
+    let r = s.execute("edit.paste", &json!({"text": "From elsewhere"})).unwrap();
+    assert!(r.get("anchored").is_none(), "{r}");
+    assert_eq!(s.doc().unwrap().doc.story(story).unwrap().text, "abFrom elsewhere");
+    // What the object copy put on the system clipboard still pastes the objects.
+    assert_eq!(s.execute("edit.paste", &json!({"text": marker})).unwrap()["anchored"], 1);
+    // With no insertion point too: the rectangle, not a text frame holding the marker.
+    s.execute("edit.deselectAll", &json!({})).unwrap();
+    let r = s.execute("edit.paste", &json!({"text": marker})).unwrap();
+    let id = ItemId(r["ids"][0].as_u64().unwrap());
+    assert!(s.doc().unwrap().doc.item(id).unwrap().text_frame().is_none());
+    s.doc().unwrap().doc.check().unwrap();
+    // Paste without Formatting inserts the text given; empty text is no text.
+    s.execute("text.select", &json!({"story": story.0, "anchor": 0, "focus": 0})).unwrap();
+    assert!(s.execute("edit.pasteWithoutFormatting", &json!({"text": ""})).is_err());
+}
+
+/// Text frames, and groups holding one, can't be anchored: at a caret their copy pastes as text.
+#[test]
+fn copied_text_frames_paste_at_a_caret_as_their_text() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let target = frame(&mut s, "ab");
+    let copy_and_paste = |s: &mut Session, ids: Value, text: Value| {
+        s.execute("selection.set", &json!({"ids": ids})).unwrap();
+        s.execute("edit.copy", &json!({})).unwrap();
+        s.execute("text.select", &json!({"story": target.0, "anchor": 0, "focus": 0})).unwrap();
+        s.execute("edit.paste", &json!({"text": text})).unwrap()
+    };
+    let chapter = s.execute("frame.create", &json!({"rect": [72, 400, 300, 480], "content": "text", "text": "Chapter 1"})).unwrap()["id"].clone();
+    // The same text copied in another app, and the system clipboard read back as absent.
+    let r = copy_and_paste(&mut s, json!([chapter]), json!("Chapter 1"));
+    assert!(r.get("anchored").is_none(), "{r}");
+    s.execute("edit.paste", &json!({})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(target).unwrap().text, "Chapter 1Chapter 1ab");
+    // A group with a text frame inside, its own placeholder on the system clipboard.
+    let rect = s.execute("frame.create", &json!({"rect": [72, 500, 200, 560]})).unwrap()["id"].clone();
+    let group = s.execute("object.group", &json!({"ids": [chapter, rect]})).unwrap()["id"].clone();
+    let r = copy_and_paste(&mut s, json!([group]), Value::Null);
+    assert!(r.get("anchored").is_none(), "{r}");
+    assert_eq!(s.doc().unwrap().doc.story(target).unwrap().text, "Chapter 1Chapter 1Chapter 1ab");
+    s.doc().unwrap().doc.check().unwrap();
+}
+
+#[test]
+fn outside_text_never_pastes_markers() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    // Private-use characters from another app would read as footnote, table or variable markers.
+    let dirty = "a\u{E00A}b\u{E009}c\u{E1FF}d\u{E200}";
+    let r = s.execute("edit.paste", &json!({"text": dirty})).unwrap();
+    let st = s.doc().unwrap().doc.item(ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+    assert_eq!(s.doc().unwrap().doc.story(st).unwrap().text, "abcd\u{E200}");
+    s.doc().unwrap().doc.check().unwrap();
+    let b = frame(&mut s, "Target");
+    s.execute("text.select", &json!({"story": b.0, "anchor": 6, "focus": 6})).unwrap();
+    s.execute("edit.paste", &json!({"text": dirty})).unwrap();
+    s.execute("edit.pasteWithoutFormatting", &json!({"text": dirty})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(b).unwrap().text, "Targetabcd\u{E200}abcd\u{E200}");
+    assert!(s.execute("edit.paste", &json!({"text": "\u{E00A}"})).is_err());
+    s.doc().unwrap().doc.check().unwrap();
+}
+
+#[test]
+fn copied_text_pasted_with_no_insertion_point_keeps_its_formatting() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let a = frame(&mut s, "Bold words\nSecond");
+    s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": 4})).unwrap();
+    s.execute("type.bold", &json!({})).unwrap();
+    s.execute("text.select", &json!({"story": a.0, "anchor": 11, "focus": 17})).unwrap();
+    s.execute("type.para", &json!({"attrs": {"align": "center"}})).unwrap();
+    s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": 17})).unwrap();
+    let copied = s.execute("edit.copy", &json!({})).unwrap()["text"].as_str().unwrap().to_string();
+    s.execute("edit.deselectAll", &json!({})).unwrap();
+    let r = s.execute("edit.paste", &json!({"text": copied})).unwrap();
+    let d = s.doc().unwrap();
+    let st = d.doc.story(d.doc.item(ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story).unwrap();
+    assert_eq!(st.text, "Bold words\nSecond");
+    assert_eq!(st.char_format_at(2).over.font_style.as_deref(), Some("Bold"));
+    assert_eq!(st.char_format_at(7).over.font_style, None);
+    assert_eq!(st.paras[1], d.doc.story(a).unwrap().paras[1]);
+    d.doc.check().unwrap();
+}
+
+#[test]
+fn formatted_copy_paste_and_plain_paste() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let a = frame(&mut s, "Bold words here.");
+    let b = frame(&mut s, "Target: .");
+    s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": 4})).unwrap();
+    s.execute("type.bold", &json!({})).unwrap();
+    // A footnote inside the copied range travels with it.
+    s.execute("text.select", &json!({"story": a.0, "anchor": 4, "focus": 4})).unwrap();
+    s.execute("footnote.insert", &json!({"text": "n"})).unwrap();
+    let fl = designcraft_doc::FOOTNOTE_REF.len_utf8();
+    s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": 10 + fl})).unwrap();
+    let r = s.execute("edit.copy", &json!({})).unwrap();
+    assert_eq!(r["text"], "Bold words");
+    // Formatted paste when the system clipboard matches.
+    s.execute("text.select", &json!({"story": b.0, "anchor": 8, "focus": 8})).unwrap();
+    s.execute("edit.paste", &json!({"text": "Bold words"})).unwrap();
+    let st = s.doc().unwrap().doc.story(b).unwrap().clone();
+    assert_eq!(st.text, format!("Target: Bold{} words.", designcraft_doc::FOOTNOTE_REF));
+    assert_eq!(st.char_format_at(9).over.font_style.as_deref(), Some("Bold"));
+    assert_eq!(st.notes.len(), 1);
+    assert_eq!(st.notes[0].text.text, "n");
+    // Other text on the system clipboard pastes as plain text.
+    s.execute("edit.paste", &json!({"text": "\"x\""})).unwrap();
+    assert!(s.doc().unwrap().doc.story(b).unwrap().text.contains("\"x\""), "no smart quotes on paste");
+    // Paste without formatting takes the insertion format.
+    s.execute("text.select", &json!({"story": b.0, "anchor": 0, "focus": 0})).unwrap();
+    s.execute("edit.pasteWithoutFormatting", &json!({})).unwrap();
+    let st = s.doc().unwrap().doc.story(b).unwrap().clone();
+    assert!(st.text.starts_with("Bold wordsTarget"), "{:?}", st.text);
+    assert_eq!(st.char_format_at(1).over.font_style, None);
+    // Cut removes and copies.
+    s.execute("text.select", &json!({"story": b.0, "anchor": 0, "focus": 4})).unwrap();
+    assert_eq!(s.execute("edit.cut", &json!({})).unwrap()["text"], "Bold");
+    assert!(s.doc().unwrap().doc.story(b).unwrap().text.starts_with(" wordsTarget"));
+    s.doc().unwrap().doc.check().unwrap();
+}
+
+fn note_clipboard_session() -> (Session, designcraft_doc::StoryId) {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let source = frame(&mut s, "aéz");
+    s.execute("text.select", &json!({"story": source.0, "anchor": 1, "focus": 1})).unwrap();
+    s.execute("endnote.insert", &json!({"text": "Citation A"})).unwrap();
+    s.execute("note.new", &json!({"text": "Memo A", "author": "Ed"})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(source).unwrap().text, "a\u{E00F}\u{E010}éz");
+    s.execute("text.select", &json!({"story": source.0, "anchor": 0, "focus": 10})).unwrap();
+    s.execute("type.char", &json!({"attrs": {"fontStyle": "Bold"}})).unwrap();
+    assert_eq!(s.execute("edit.copy", &json!({})).unwrap(), json!({"text": "aéz"}));
+    (s, source)
+}
+
+fn assert_child_note_paste(
+    s: &mut Session,
+    source: designcraft_doc::StoryId,
+    parent: designcraft_doc::StoryId,
+    cell: designcraft_doc::CellAddr,
+    endpoints: (usize, usize),
+) {
+    let before = s.doc().unwrap().doc.clone();
+    let selected = s.doc().unwrap().selection.text.unwrap();
+    assert_eq!((selected.story, selected.cell, selected.anchor, selected.focus), (parent, Some(cell), endpoints.0, endpoints.1));
+    assert_eq!(selected.frame, None);
+    let before_child = before.text_story(parent, Some(cell)).unwrap();
+    assert_eq!(before_child.text, "L----R");
+    let clipboard = s.text_clipboard.clone();
+    let history = s.execute("document.history", &json!({})).unwrap();
+    assert_eq!(history["redo"], json!([]));
+
+    let result = s.execute("edit.paste", &json!({})).unwrap();
+    let after = s.doc().unwrap().doc.clone();
+    let child = after.text_story(parent, Some(cell)).unwrap();
+    assert_eq!(child.text, "LaézR", "root-only note markers must not enter child text");
+    assert_eq!(child.len(), 6);
+    assert_eq!(result, json!({"pos": 5, "formatted": true}));
+    assert_eq!(s.doc().unwrap().selection, Selection::text(designcraft_doc::TextSel { anchor: 5, focus: 5, ..selected }));
+    assert!(child.endnotes.is_empty() && child.editorial.is_empty());
+    for pos in [1, 2, 4] {
+        let (_, format) = child.runs().find(|(range, _)| range.contains(&pos)).unwrap();
+        assert_eq!(format.over.font_style.as_deref(), Some("Bold"));
+    }
+    // Inspect actual run coverage: char_format_at at a run boundary means the preceding run.
+    for pos in [0, 5] {
+        let (_, old_format) = before_child.runs().find(|(range, _)| range.contains(&pos)).unwrap();
+        let (_, new_format) = child.runs().find(|(range, _)| range.contains(&pos)).unwrap();
+        assert_eq!(new_format, old_format);
+    }
+    assert_eq!(after.story(parent).unwrap().text, before.story(parent).unwrap().text);
+    assert_eq!(after.story(parent).unwrap().chars, before.story(parent).unwrap().chars);
+    assert_eq!(after.story(source), before.story(source));
+    assert_eq!(s.text_clipboard, clipboard);
+
+    let mut pasted_history = history.clone();
+    pasted_history["undo"].as_array_mut().unwrap().push(json!("Paste"));
+    assert_eq!(s.execute("document.history", &json!({})).unwrap(), pasted_history);
+    assert_eq!(s.execute("edit.undo", &json!({})).unwrap(), json!({"undone": "Paste"}));
+    assert_eq!(s.doc().unwrap().doc, before);
+    let mut undone_history = history;
+    undone_history["redo"] = json!(["Paste"]);
+    assert_eq!(s.execute("document.history", &json!({})).unwrap(), undone_history);
+    // This filter does not change which selection Undo restores.
+    assert_eq!(s.execute("edit.redo", &json!({})).unwrap(), json!({"redone": "Paste"}));
+    assert_eq!(s.doc().unwrap().doc, after);
+    assert_eq!(s.execute("document.history", &json!({})).unwrap(), pasted_history);
+}
+
+#[test]
+fn formatted_child_paste_filters_endnotes_and_editorial_in_cells() {
+    let (mut s, source) = note_clipboard_session();
+    let parent = frame(&mut s, "PZ");
+    s.execute("text.select", &json!({"story": parent.0, "anchor": 1, "focus": 1})).unwrap();
+    let table_id = s.execute("table.insert", &json!({"rows": 1, "cols": 2})).unwrap()["table"].as_u64().unwrap();
+    s.execute("text.insert", &json!({"text": "L----R"})).unwrap();
+    s.execute("table.nextCell", &json!({})).unwrap();
+    s.execute("text.insert", &json!({"text": "NEIGHBOR"})).unwrap();
+    s.execute("table.prevCell", &json!({})).unwrap();
+    s.execute("text.move", &json!({"dir": "storyStart"})).unwrap();
+    s.execute("text.move", &json!({"dir": "right"})).unwrap();
+    for _ in 0..4 {
+        s.execute("text.move", &json!({"dir": "right", "extend": true})).unwrap();
+    }
+    let before_table = s.doc().unwrap().doc.story(parent).unwrap().tables[&table_id].clone();
+    let cell = designcraft_doc::CellAddr { table: table_id, row: 0, col: 0 };
+    assert_child_note_paste(&mut s, source, parent, cell, (1, 5));
+    let table = &s.doc().unwrap().doc.story(parent).unwrap().tables[&table_id];
+    assert_eq!(table.cell(0, 1).unwrap().text.text, "NEIGHBOR");
+    let mut expected_table = (*before_table).clone();
+    expected_table.cells[0].text = table.cells[0].text.clone();
+    assert_eq!(table.as_ref(), &expected_table);
+
+    // The same clipboard must still retain both markers when pasted into an ordinary root story.
+    let root = frame(&mut s, "L----R");
+    s.execute("text.select", &json!({"story": root.0, "anchor": 1, "focus": 5})).unwrap();
+    assert_eq!(s.execute("edit.paste", &json!({})).unwrap(), json!({"pos": 11, "formatted": true}));
+    assert_eq!(s.doc().unwrap().doc.story(root).unwrap().text, "La\u{E00F}\u{E010}ézR");
+}
+
+#[test]
+fn formatted_child_paste_filters_endnotes_and_editorial_in_footnotes() {
+    let (mut s, source) = note_clipboard_session();
+    let parent = frame(&mut s, "PZ");
+    let neighbor = s.execute("footnote.insert", &json!({"text": "NEIGHBOR"})).unwrap()["id"].as_u64().unwrap();
+    s.execute("text.select", &json!({"story": parent.0, "anchor": 1, "focus": 1})).unwrap();
+    let target = s.execute("footnote.insert", &json!({"text": "L----R"})).unwrap()["id"].as_u64().unwrap();
+    s.execute("text.move", &json!({"dir": "left"})).unwrap();
+    for _ in 0..4 {
+        s.execute("text.move", &json!({"dir": "left", "extend": true})).unwrap();
+    }
+    let before = s.doc().unwrap().doc.story(parent).unwrap().clone();
+    assert_child_note_paste(&mut s, source, parent, designcraft_doc::CellAddr::footnote(target), (5, 1));
+    let after = s.doc().unwrap().doc.story(parent).unwrap();
+    assert_eq!(after.note(neighbor).unwrap().text.text, "NEIGHBOR");
+    assert_eq!(after.note(neighbor), before.note(neighbor));
+    assert_eq!(after.notes.iter().map(|note| note.id).collect::<Vec<_>>(), before.notes.iter().map(|note| note.id).collect::<Vec<_>>());
+}
+
+#[test]
+fn change_case_keeps_runs() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let a = frame(&mut s, "the quick brown fox. jumps over straße");
+    s.execute("text.select", &json!({"story": a.0, "anchor": 4, "focus": 9})).unwrap();
+    s.execute("type.italic", &json!({})).unwrap();
+    let len = s.doc().unwrap().doc.story(a).unwrap().len();
+    s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": len})).unwrap();
+    s.execute("type.changeCase", &json!({"case": "title"})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(a).unwrap().text, "The Quick Brown Fox. Jumps Over Straße");
+    s.execute("type.changeCase", &json!({"case": "sentence"})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(a).unwrap().text, "The quick brown fox. Jumps over straße");
+    s.execute("type.changeCase", &json!({"case": "upper"})).unwrap();
+    let st = s.doc().unwrap().doc.story(a).unwrap().clone();
+    assert_eq!(st.text, "THE QUICK BROWN FOX. JUMPS OVER STRASSE");
+    assert_eq!(st.char_format_at(5).over.font_style.as_deref(), Some("Italic"));
+    assert_eq!(s.doc().unwrap().selection.text.unwrap().range(), 0..st.len());
+    st.check().unwrap();
+}
+
+#[test]
+fn change_case_leaves_georgian_without_initial_capitals() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let a = frame(&mut s, "ᲒᲐᲛᲐᲠᲯᲝᲑᲐ ᲛᲡᲝᲤᲚᲘᲝ. ᲐᲮᲐᲚᲘ word");
+    let len = s.doc().unwrap().doc.story(a).unwrap().len();
+    s.execute("text.select", &json!({"story": a.0, "anchor": 0, "focus": len})).unwrap();
+    // Georgian has no title or sentence capitals: Mtavruli is only for all-caps text.
+    s.execute("type.changeCase", &json!({"case": "title"})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(a).unwrap().text, "გამარჯობა მსოფლიო. ახალი Word");
+    s.execute("type.changeCase", &json!({"case": "sentence"})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(a).unwrap().text, "გამარჯობა მსოფლიო. ახალი word");
+    s.execute("type.changeCase", &json!({"case": "upper"})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(a).unwrap().text, "ᲒᲐᲛᲐᲠᲯᲝᲑᲐ ᲛᲡᲝᲤᲚᲘᲝ. ᲐᲮᲐᲚᲘ WORD");
+}
diff --git a/crates/engine/src/cmd/editorial.rs b/crates/engine/src/cmd/editorial.rs
index 5b210da90..5b09cbcb6 100644
--- a/crates/engine/src/cmd/editorial.rs
+++ b/crates/engine/src/cmd/editorial.rs
@@ -2,11 +2,11 @@
 
 use std::sync::Arc;
 
-use designcraft_doc::{EditorialNote, NOTE_MARK, StoryId};
+use designcraft_doc::{ANCHOR_MARK, ENDNOTE_REF, EditorialNote, FOOTNOTE_REF, INDEX_MARK, NOTE_MARK, OBJECT_MARK, StoryId, TABLE_ANCHOR, XREF_MARK};
 use serde_json::{Value, json};
 
 use super::{CommandSpec, bad, cmd, has_doc, has_text, ok, str_param};
-use crate::Result;
+use crate::{Result, Session};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![
@@ -37,6 +37,15 @@ pub fn specs() -> Vec<CommandSpec> {
                 Ok(json!({"story": ts.story.0, "id": id}))
             })
         }),
+        cmd!(
+            "note.convertFromText",
+            "Convert to Note",
+            ["Type", "Notes"],
+            None,
+            "{author?} → {story, id}. The selected text moves into a new note anchored where it was.",
+            has_text_range,
+            convert_from_text
+        ),
         cmd!("note.edit", "Edit Note", [], None, "{story, id, text?, author?}", has_doc, |s, p| {
             let (sid, id) = target(p)?;
             let (text, author) = (str_param(p, "text").map(|_| super::text_param(p, "text")), str_param(p, "author").map(str::to_string));
@@ -56,9 +65,10 @@ pub fn specs() -> Vec<CommandSpec> {
         }),
         cmd!("note.delete", "Delete Note", ["Type", "Notes"], None, "{story, id}", has_doc, |s, p| {
             let (sid, id) = target(p)?;
-            s.edit(|d, _| {
+            s.edit(|d, sel| {
                 let st = d.story_mut(sid).ok_or_else(|| bad("note.delete", "no such story"))?;
                 let at = anchor(st, id).ok_or_else(|| bad("note.delete", format!("no note {id}")))?;
+                follow_replace(sel, sid, at..at + NOTE_MARK.len_utf8(), 0);
                 st.delete(at..at + NOTE_MARK.len_utf8());
                 ok()
             })
@@ -72,15 +82,25 @@ pub fn specs() -> Vec<CommandSpec> {
             has_doc,
             |s, p| {
                 let (sid, id) = target(p)?;
-                s.edit(|d, _| {
+                s.edit(|d, sel| {
                     let st = d.story_mut(sid).ok_or_else(|| bad("note.convertToText", "no such story"))?;
                     let at = anchor(st, id).ok_or_else(|| bad("note.convertToText", format!("no note {id}")))?;
                     let text = st.editorial.iter().find(|n| n.id == id).map(|n| n.text.clone()).unwrap_or_default();
+                    follow_replace(sel, sid, at..at + NOTE_MARK.len_utf8(), text.len());
                     st.replace(at..at + NOTE_MARK.len_utf8(), &text);
                     ok()
                 })
             }
         ),
+        cmd!(
+            "note.split",
+            "Split Note",
+            ["Type", "Notes"],
+            None,
+            "{story, id, at} → {story, id}. The note's text from byte `at` on moves into a new note anchored right after it.",
+            has_doc,
+            split
+        ),
         cmd!(query "note.list", "Notes", [], None, "{} → [{story, id, at, author, text}] in story order", has_doc, |s, _| {
             let d = &s.doc()?.doc;
             let mut out = Vec::new();
@@ -93,9 +113,112 @@ pub fn specs() -> Vec<CommandSpec> {
             }
             Ok(Value::Array(out))
         }),
+        cmd!(
+            noundo "note.previous",
+            "Previous Note",
+            ["Type", "Notes"],
+            None,
+            "{} → {story, id, pos}. The caret moves after the anchor of the story's previous note.",
+            has_previous,
+            |s, _| go_to(s, false)
+        ),
+        cmd!(
+            noundo "note.next",
+            "Next Note",
+            ["Type", "Notes"],
+            None,
+            "{} → {story, id, pos}. The caret moves after the anchor of the story's next note.",
+            has_next,
+            |s, _| go_to(s, true)
+        ),
     ]
 }
 
+/// Characters whose payload lives outside the story text: a note made from text that holds one
+/// would lose it.
+const MARKS: [char; 8] = [NOTE_MARK, ENDNOTE_REF, FOOTNOTE_REF, OBJECT_MARK, INDEX_MARK, ANCHOR_MARK, XREF_MARK, TABLE_ANCHOR];
+
+fn has_text_range(s: &Session) -> std::result::Result<(), String> {
+    has_text(s)?;
+    match s.active().and_then(|d| d.selection.text) {
+        Some(t) if t.cell.is_some() => Err("notes go in story text".into()),
+        Some(t) if t.is_caret() => Err("select the text to convert".into()),
+        _ => Ok(()),
+    }
+}
+
+/// Type › Notes › Convert to Note: the selected text leaves the story and becomes the text of a
+/// new note, whose anchor takes the text's place.
+fn convert_from_text(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "note.convertFromText";
+    let ts = s.doc()?.selection.text.ok_or_else(|| bad(ID, "select the text to convert"))?;
+    if ts.cell.is_some() {
+        return Err(bad(ID, "notes go in story text"));
+    }
+    let r = ts.range();
+    if r.is_empty() {
+        return Err(bad(ID, "select the text to convert"));
+    }
+    let author = str_param(p, "author").unwrap_or("").to_string();
+    s.edit(|d, sel| {
+        let story = d.story_mut(ts.story).ok_or_else(|| bad(ID, "no such story"))?;
+        let text = story.text.get(r.clone()).ok_or_else(|| bad(ID, "the selection is outside the story"))?.to_string();
+        if text.contains(MARKS) {
+            return Err(bad(ID, "the selection holds a table, an anchored object, a note, a footnote, an endnote or a marker"));
+        }
+        let fmt = story.format_after(r.start).clone();
+        story.delete(r.clone());
+        story.insert_with(r.start, &NOTE_MARK.to_string(), fmt);
+        story.fix_marks();
+        let k = story.text[..r.start].matches(NOTE_MARK).count();
+        let n = story.editorial.get_mut(k).ok_or_else(|| bad(ID, "the story's notes don't match their anchors"))?;
+        let n = Arc::make_mut(n);
+        (n.text, n.author) = (text, author);
+        let id = n.id;
+        if let Some(t) = &mut sel.text {
+            let c = r.start + NOTE_MARK.len_utf8();
+            (t.anchor, t.focus) = (c, c);
+        }
+        Ok(json!({"story": ts.story.0, "id": id}))
+    })
+}
+
+/// Split Note (the Notes panel's Split Note button): the text after the split point leaves the note
+/// and becomes the text of a new note by the same author, whose anchor directly follows the note's anchor.
+fn split(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "note.split";
+    let (sid, id) = target(p)?;
+    let at = p.get("at").and_then(Value::as_u64).ok_or_else(|| bad(ID, "`at` required"))?;
+    s.edit(|d, sel| {
+        let story = d.story_mut(sid).ok_or_else(|| bad(ID, "no such story"))?;
+        let pos = anchor(story, id).ok_or_else(|| bad(ID, format!("no note {id}")))?;
+        let note = story.editorial.iter().find(|n| n.id == id).cloned().ok_or_else(|| bad(ID, format!("no note {id}")))?;
+        let at = usize::try_from(at).ok().filter(|&a| a > 0 && a < note.text.len() && note.text.is_char_boundary(a));
+        let at = at.ok_or_else(|| bad(ID, "place the split point inside the note's text"))?;
+        let (head, tail) = note.text.split_at(at);
+        let (head, tail) = (head.to_string(), tail.to_string());
+        let ins = pos + NOTE_MARK.len_utf8();
+        let fmt = story.char_format_at(pos).clone();
+        story.insert_with(ins, &NOTE_MARK.to_string(), fmt);
+        story.fix_marks();
+        let k = story.text[..ins].matches(NOTE_MARK).count();
+        let first = story.editorial.get_mut(k - 1).ok_or_else(|| bad(ID, "the story's notes don't match their anchors"))?;
+        Arc::make_mut(first).text = head;
+        let n = story.editorial.get_mut(k).ok_or_else(|| bad(ID, "the story's notes don't match their anchors"))?;
+        let n = Arc::make_mut(n);
+        (n.text, n.author) = (tail, note.author.clone());
+        let new = n.id;
+        if let Some(t) = sel.text.as_mut().filter(|t| t.story == sid && t.cell.is_none()) {
+            for c in [&mut t.anchor, &mut t.focus] {
+                if *c >= ins {
+                    *c += NOTE_MARK.len_utf8();
+                }
+            }
+        }
+        Ok(json!({"story": sid.0, "id": new}))
+    })
+}
+
 fn target(p: &Value) -> Result<(StoryId, u64)> {
     let sid = p.get("story").and_then(Value::as_u64).ok_or_else(|| bad("note", "`story` required"))?;
     let id = p.get("id").and_then(Value::as_u64).ok_or_else(|| bad("note", "`id` required"))?;
@@ -108,6 +231,63 @@ fn anchor(st: &designcraft_doc::Story, id: u64) -> Option<usize> {
     st.text.match_indices(NOTE_MARK).nth(k).map(|(i, _)| i)
 }
 
+/// Keeps a caret or selection in story `sid`'s own text (not a cell) on the same characters when `range` is replaced
+/// by `len` bytes: an end after the range moves by the change in length, and an end inside it moves to its start.
+fn follow_replace(sel: &mut designcraft_doc::Selection, sid: StoryId, range: std::ops::Range<usize>, len: usize) {
+    if let Some(t) = sel.text.as_mut().filter(|t| t.story == sid && t.cell.is_none()) {
+        let follow = |i: usize| if i >= range.end { i - range.len() + len } else { i.min(range.start) };
+        t.anchor = follow(t.anchor);
+        t.focus = follow(t.focus);
+    }
+}
+
+/// The anchor offset and id of the note before or after the selection `t` in its story. Going
+/// back skips the note whose anchor the caret directly follows, so repeated steps reach every note.
+fn neighbor(st: &designcraft_doc::Story, t: &designcraft_doc::TextSel, forward: bool) -> Option<(usize, u64)> {
+    let r = t.range();
+    let mut anchors = st.text.match_indices(NOTE_MARK).enumerate().map(|(k, (i, _))| (k, i));
+    let (k, at) = if forward { anchors.find(|&(_, i)| i >= r.end) } else { anchors.filter(|&(_, i)| i + NOTE_MARK.len_utf8() < r.start).last() }?;
+    Some((at, st.editorial.get(k)?.id))
+}
+
+fn has_note(s: &crate::Session, forward: bool) -> std::result::Result<(), String> {
+    has_text(s)?;
+    match s.active().and_then(|d| Some((d, d.selection.text?))) {
+        Some((_, t)) if t.cell.is_some() => Err("notes go in story text".into()),
+        Some((d, t)) if d.doc.story(t.story).and_then(|st| neighbor(st, &t, forward)).is_some() => Ok(()),
+        _ => Err(no_note(forward).into()),
+    }
+}
+
+fn has_previous(s: &crate::Session) -> std::result::Result<(), String> {
+    has_note(s, false)
+}
+
+fn has_next(s: &crate::Session) -> std::result::Result<(), String> {
+    has_note(s, true)
+}
+
+fn no_note(forward: bool) -> &'static str {
+    if forward { "no later note in this story" } else { "no earlier note in this story" }
+}
+
+/// Type › Notes › Previous Note and Next Note: from the insertion point, the caret moves after
+/// the anchor of the story's previous or next note.
+fn go_to(s: &mut crate::Session, forward: bool) -> Result<Value> {
+    let id = if forward { "note.next" } else { "note.previous" };
+    let st = s.doc_mut()?;
+    let t = st.selection.text.ok_or_else(|| bad(id, "place the insertion point in text"))?;
+    if t.cell.is_some() {
+        return Err(bad(id, "notes go in story text"));
+    }
+    let (at, note) = st.doc.story(t.story).and_then(|x| neighbor(x, &t, forward)).ok_or_else(|| bad(id, no_note(forward)))?;
+    let pos = at + NOTE_MARK.len_utf8();
+    st.selection.text = Some(designcraft_doc::TextSel::caret(t.story, pos));
+    st.bump_revision();
+    s.typing_format = None;
+    Ok(json!({"story": t.story.0, "id": note, "pos": pos}))
+}
+
 #[cfg(test)]
 mod tests {
     use serde_json::json;
@@ -136,6 +316,46 @@ mod tests {
         assert!(s.doc().unwrap().doc.stories[&sid].editorial.is_empty());
     }
 
+    #[test]
+    fn previous_and_next_note_step_through_the_story_s_notes() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "One two three."})).unwrap();
+        let len = designcraft_doc::NOTE_MARK.len_utf8();
+        let caret = |s: &mut Session, at: usize| s.execute("text.select", &json!({"story": r["story"], "anchor": at, "focus": at})).unwrap();
+        caret(&mut s, 3);
+        let first = s.execute("note.new", &json!({"text": "a"})).unwrap();
+        caret(&mut s, 7 + len);
+        let second = s.execute("note.new", &json!({"text": "b"})).unwrap();
+        caret(&mut s, 0);
+        let disabled = |s: &mut Session, id: &str| matches!(s.execute(id, &json!({})), Err(crate::EngineError::Disabled(..)));
+        assert!(disabled(&mut s, "note.previous"), "no note before the start");
+        let n = s.execute("note.next", &json!({})).unwrap();
+        assert_eq!((n["id"].clone(), n["pos"].clone()), (first["id"].clone(), json!(3 + len)));
+        let n = s.execute("note.next", &json!({})).unwrap();
+        assert_eq!((n["id"].clone(), n["pos"].clone()), (second["id"].clone(), json!(7 + 2 * len)));
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!((t.anchor, t.focus), (7 + 2 * len, 7 + 2 * len), "the caret follows the anchor");
+        assert!(disabled(&mut s, "note.next"), "no note after the last");
+        // From just after the second anchor, Previous Note goes to the first one.
+        let n = s.execute("note.previous", &json!({})).unwrap();
+        assert_eq!(n["id"], first["id"]);
+        assert!(disabled(&mut s, "note.previous"));
+        // From the middle of the story, each direction finds its neighbor.
+        caret(&mut s, 5 + len);
+        assert_eq!(s.execute("note.previous", &json!({})).unwrap()["id"], first["id"]);
+        caret(&mut s, 5 + len);
+        assert_eq!(s.execute("note.next", &json!({})).unwrap()["id"], second["id"]);
+        // Formatting set at the insertion point does not survive the move.
+        s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
+        assert!(s.typing_format.is_some());
+        s.execute("note.previous", &json!({})).unwrap();
+        assert!(s.typing_format.is_none(), "note.previous");
+        s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
+        s.execute("note.next", &json!({})).unwrap();
+        assert!(s.typing_format.is_none(), "note.next");
+    }
+
     #[test]
     fn notes_insert_into_a_story_whose_markers_lack_payloads() {
         let mut s = Session::new();
@@ -159,4 +379,129 @@ mod tests {
         assert_eq!(st.endnotes[1].text.text, "An endnote.");
         assert_eq!(st.notes[1].text.text, "A footnote.");
     }
+
+    #[test]
+    fn selected_text_converts_to_a_note_at_its_place() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "One two\nthree four."})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let mark = designcraft_doc::NOTE_MARK.len_utf8();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 3, "focus": 3})).unwrap();
+        s.execute("note.new", &json!({"text": "earlier"})).unwrap();
+        // "two\nthree " across the paragraph return, selected backwards.
+        let (a, b) = (3 + mark + 1, 3 + mark + 1 + "two\nthree ".len());
+        s.execute("text.select", &json!({"story": r["story"], "anchor": b, "focus": a})).unwrap();
+        let n = s.execute("note.convertFromText", &json!({"author": "Ed"})).unwrap();
+        let st = &s.doc().unwrap().doc.stories[&sid];
+        st.check().unwrap();
+        assert_eq!(st.text, format!("One{m} {m}four.", m = designcraft_doc::NOTE_MARK));
+        assert_eq!(st.paras.len(), 1, "the paragraph return went into the note");
+        let list = s.execute("note.list", &json!({})).unwrap();
+        assert_eq!(list[0]["text"], "earlier");
+        assert_eq!((list[1]["id"].clone(), list[1]["at"].clone()), (n["id"].clone(), json!(a)));
+        assert_eq!((list[1]["text"].as_str(), list[1]["author"].as_str()), (Some("two\nthree "), Some("Ed")));
+        let caret = s.doc().unwrap().selection.text.map(|t| (t.anchor, t.focus));
+        assert_eq!(caret, Some((a + mark, a + mark)), "the insertion point follows the anchor");
+        s.execute("note.convertToText", &json!({"story": n["story"], "id": n["id"]})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.stories[&sid].text, format!("One{} two\nthree four.", designcraft_doc::NOTE_MARK));
+        s.execute("edit.undo", &json!({})).unwrap();
+        s.execute("edit.undo", &json!({})).unwrap();
+        let st = &s.doc().unwrap().doc.stories[&sid];
+        assert_eq!((st.text.as_str(), st.editorial.len()), (format!("One{} two\nthree four.", designcraft_doc::NOTE_MARK).as_str(), 1));
+    }
+
+    #[test]
+    fn split_note_moves_the_text_after_the_split_point_into_a_new_note() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Draft copy."})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let mark = designcraft_doc::NOTE_MARK.len_utf8();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 5, "focus": 5})).unwrap();
+        let n = s.execute("note.new", &json!({"text": "check this", "author": "Ed"})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 9 + mark, "focus": 9 + mark})).unwrap();
+        let later = s.execute("note.new", &json!({"text": "later"})).unwrap();
+        // The caret sits after "Draft" and its anchor, before " copy".
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 5 + mark, "focus": 5 + mark})).unwrap();
+        let before = s.doc().unwrap().doc.stories[&sid].clone();
+        let split = |s: &mut Session, at: u64| s.execute("note.split", &json!({"story": n["story"], "id": n["id"], "at": at}));
+        for at in [0, 10, 11, 99] {
+            assert!(matches!(split(&mut s, at), Err(crate::EngineError::BadParams { .. })), "split point {at}");
+        }
+        assert_eq!(s.doc().unwrap().doc.stories[&sid], before);
+        let m = split(&mut s, 6).unwrap();
+        let st = &s.doc().unwrap().doc.stories[&sid];
+        st.check().unwrap();
+        assert_eq!(st.text, format!("Draft{m}{m} cop{m}y.", m = designcraft_doc::NOTE_MARK));
+        let list = s.execute("note.list", &json!({})).unwrap();
+        let row = |k: usize| (list[k]["id"].clone(), list[k]["at"].clone(), list[k]["text"].clone(), list[k]["author"].clone());
+        assert_eq!(row(0), (n["id"].clone(), json!(5), json!("check "), json!("Ed")));
+        assert_eq!(row(1), (m["id"].clone(), json!(5 + mark), json!("this"), json!("Ed")), "the new note follows the first");
+        assert_eq!(row(2).0, later["id"], "the later note keeps its text");
+        assert_eq!(list[2]["text"], "later");
+        let caret = s.doc().unwrap().selection.text.map(|t| (t.anchor, t.focus));
+        assert_eq!(caret, Some((5 + 2 * mark, 5 + 2 * mark)), "the caret stays before \" copy\"");
+        // Multibyte text splits on character boundaries only.
+        let e = s.execute("note.new", &json!({"text": "été"})).unwrap();
+        let refused = s.execute("note.split", &json!({"story": e["story"], "id": e["id"], "at": 1}));
+        assert!(matches!(refused, Err(crate::EngineError::BadParams { .. })), "inside a character");
+        s.execute("note.split", &json!({"story": e["story"], "id": e["id"], "at": 2})).unwrap();
+        s.execute("edit.undo", &json!({})).unwrap();
+        s.execute("edit.undo", &json!({})).unwrap();
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.stories[&sid], before, "undo restores the one note");
+    }
+
+    #[test]
+    fn convert_to_note_needs_selected_story_text_without_objects() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Draft copy."})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 5, "focus": 5})).unwrap();
+        let disabled = |r| matches!(r, Err(crate::EngineError::Disabled(..)));
+        assert!(disabled(s.execute("note.convertFromText", &json!({}))), "an insertion point selects no text");
+        s.execute("note.new", &json!({"text": "keep"})).unwrap();
+        let before = s.doc().unwrap().doc.stories[&sid].clone();
+        let all = before.len();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": all})).unwrap();
+        let refused = s.execute("note.convertFromText", &json!({}));
+        assert!(matches!(refused, Err(crate::EngineError::BadParams { .. })), "a note inside the selection would be lost");
+        assert_eq!(s.doc().unwrap().doc.stories[&sid], before);
+        s.execute("text.select", &json!({"story": r["story"], "anchor": all, "focus": all})).unwrap();
+        s.execute("table.insert", &json!({"rows": 1, "cols": 1})).unwrap();
+        s.execute("text.insert", &json!({"text": "cell", "raw": true})).unwrap();
+        s.execute("text.move", &json!({"dir": "left", "extend": true})).unwrap();
+        assert!(s.doc().unwrap().selection.text.is_some_and(|t| t.cell.is_some() && !t.is_caret()));
+        assert!(disabled(s.execute("note.convertFromText", &json!({}))), "notes go in story text");
+    }
+
+    #[test]
+    fn deleting_or_converting_a_note_keeps_the_caret_on_its_character() {
+        let m = designcraft_doc::NOTE_MARK.len_utf8();
+        // (anchor, focus) in "Draft{note} copy." before the command, then (anchor, focus) and the selected text after
+        // Delete Note and after Convert Note to Text with the note's text "ab".
+        let cases = [
+            ((6 + m, 10 + m), ((6, 10), "copy"), ((8, 12), "copy")),
+            ((0, 10 + m), ((0, 10), "Draft copy"), ((0, 12), "Draftab copy")),
+            ((2, 4), ((2, 4), "af"), ((2, 4), "af")),
+            ((5 + m, 5 + m), ((5, 5), ""), ((7, 7), "")),
+        ];
+        for (before, deleted, converted) in cases {
+            for (cmd, (after, selected)) in [("note.delete", deleted), ("note.convertToText", converted)] {
+                let mut s = Session::new();
+                s.execute("file.new", &json!({})).unwrap();
+                let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Draft copy."})).unwrap();
+                let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+                s.execute("text.select", &json!({"story": r["story"], "anchor": 5, "focus": 5})).unwrap();
+                let n = s.execute("note.new", &json!({"text": "ab"})).unwrap();
+                s.execute("text.select", &json!({"story": r["story"], "anchor": before.0, "focus": before.1})).unwrap();
+                s.execute(cmd, &json!({"story": n["story"], "id": n["id"]})).unwrap();
+                let t = s.doc().unwrap().selection.text.unwrap();
+                assert_eq!((t.anchor, t.focus), after, "{cmd} with {before:?} selected");
+                assert_eq!(&s.doc().unwrap().doc.stories[&sid].text[t.anchor..t.focus], selected, "{cmd} with {before:?} selected");
+            }
+        }
+    }
 }
diff --git a/crates/engine/src/cmd/endnotes.rs b/crates/engine/src/cmd/endnotes.rs
index 7bcae744b..9b02d2c87 100644
--- a/crates/engine/src/cmd/endnotes.rs
+++ b/crates/engine/src/cmd/endnotes.rs
@@ -31,7 +31,7 @@ pub fn specs() -> Vec<CommandSpec> {
         }),
         cmd!("endnote.delete", "Delete Endnote", [], None, "{story, id} — removes the reference and its text", has_doc, |s, p| {
             let (sid, id) = target(p)?;
-            s.edit(|d, _| {
+            s.edit(|d, sel| {
                 let st = d.story_mut(sid).ok_or_else(|| bad("endnote.delete", "no such story"))?;
                 let k = st.endnotes.iter().position(|n| n.id == id).ok_or_else(|| bad("endnote.delete", format!("no endnote {id}")))?;
                 let at = st
@@ -40,6 +40,7 @@ pub fn specs() -> Vec<CommandSpec> {
                     .nth(k)
                     .map(|(i, _)| i)
                     .ok_or_else(|| bad("endnote.delete", format!("endnote {id} has no reference in the text")))?;
+                super::notes::follow_delete(sel, sid, at..at + designcraft_doc::ENDNOTE_REF.len_utf8());
                 st.delete(at..at + designcraft_doc::ENDNOTE_REF.len_utf8());
                 ok()
             })
@@ -50,7 +51,7 @@ pub fn specs() -> Vec<CommandSpec> {
             for st in d.stories.values().filter(|st| !st.endnotes.is_empty()) {
                 let first = d.endnote_start(st.id);
                 for (k, n) in st.endnotes.iter().enumerate() {
-                    out.push(json!({"story": st.id.0, "id": n.id, "number": first + k as u32, "text": n.text.text}));
+                    out.push(json!({"story": st.id.0, "id": n.id, "number": first.saturating_add(k as u32), "text": n.text.text}));
                 }
             }
             out.sort_by_key(|v| v["number"].as_u64());
@@ -172,4 +173,21 @@ mod tests {
         s.execute("edit.undo", &json!({})).unwrap();
         assert_eq!(s.doc().unwrap().doc.stories[&esid].text, "Notes\ni\tEarlier.\nii\tEdited.");
     }
+
+    #[test]
+    fn deleting_an_endnote_keeps_the_caret_on_its_character() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 1})).unwrap();
+        let a = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Alpha beta."})).unwrap();
+        let sid = designcraft_doc::StoryId(a["story"].as_u64().unwrap());
+        s.execute("text.select", &json!({"story": a["story"], "anchor": 5, "focus": 5})).unwrap();
+        let r = s.execute("endnote.insert", &json!({"text": "Source."})).unwrap();
+        let n = designcraft_doc::ENDNOTE_REF.len_utf8();
+        // "beta" is selected after the reference.
+        s.execute("text.select", &json!({"story": a["story"], "anchor": 6 + n, "focus": 10 + n})).unwrap();
+        s.execute("endnote.delete", &json!({"story": r["story"], "id": r["id"]})).unwrap();
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!((t.anchor, t.focus), (6, 10));
+        assert_eq!(&s.doc().unwrap().doc.stories[&sid].text[t.anchor..t.focus], "beta");
+    }
 }
diff --git a/crates/engine/src/cmd/export.rs b/crates/engine/src/cmd/export.rs
index 551dd7484..a4ee73ce4 100644
--- a/crates/engine/src/cmd/export.rs
+++ b/crates/engine/src/cmd/export.rs
@@ -7,1381 +7,17 @@ use std::{borrow::Cow, sync::Arc};
 use super::{CommandSpec, bad, cmd, has_doc, str_param};
 use crate::{EngineError, Result, Session};
 
-pub fn specs() -> Vec<CommandSpec> {
-    vec![
-        cmd!(noundo "file.exportPdf", "Export PDF…", ["File"], None,
-        "{path?, pages?: \"1-3,5\" | [1,3] (1-based positions; default all), flatten?: high|medium|low|ppi (Transparency Flattener: spreads with transparency are rasterised), spreads?: bool, fullScreen?: bool, bookmarksPanel?: bool, pageLayout?: single|continuous|twoUp|twoUpCover|twoUpContinuous, view?: fitPage|fitWidth|actual, advanceSeconds?: number (interactive PDF), bleed?: bool (document bleed), marks?: bool | {crop?, bleed?, pageInfo?, weight?, offset?}, standard?: \"none\"|\"x4\"|\"a2b\", compressImages?: bool, tagged?: bool (structure tree: stories as paragraphs, figures with alt text), media?: bool (interactive: embed placed video and sound), title?, author?, created?: int (creation date in Unix seconds; default now, for reproducible files)} → {path, bytes, pages, warnings} (no path: {base64, …})",
-        has_doc, export_pdf),
-        cmd!(noundo "file.exportEpub", "Export EPUB (Reflowable)…", ["File"], None,
-        "{path?, title?, author?, language?: \"en\", identifier?: str (dc:identifier; a stable urn:uuid by default), coverImage?: path (a PNG or JPEG as the cover), tocTitle?: str (the table of contents' title; from the language by default), cover?: bool (the first page as the cover image), embedFonts?: bool (package the stylesheet's fonts whose licence allows it, whole files), fixedLayout?: bool (pre-paginated: each page as an image with its text)} → {path, bytes, warnings} (no path: {base64, bytes, warnings}); warnings name images without alt text, exported as decorative, and fonts that could not be embedded",
-        has_doc, export_epub),
-        cmd!(noundo "file.exportFixedEpub", "Export EPUB (Fixed Layout)…", ["File"], None,
-        "{path?, title?, author?, language?} — pre-paginated EPUB → {path, bytes} (no path: {base64, bytes})",
-        has_doc, |s, p| {
-            export_epub(s, &super::with_param(p, "fixedLayout", serde_json::json!(true)))
-        }),
-        cmd!(noundo "file.printBooklet", "Print Booklet…", ["File"], None,
-        "{path?, type?: saddleStitch|twoUpConsecutive, spaceBetween? (pt)} — printer spreads as PDF (pages imposed in booklet order) → {path, bytes, sheets} (no path: {base64, …})",
-        has_doc, print_booklet),
-        cmd!(noundo "file.exportHtml", "Export HTML…", ["File"], None,
-        "{path?, title?, language?} — one self-contained page (styles inline, images embedded), stories and graphics in reading order → {path, bytes, warnings} (no path: {text, bytes, warnings})",
-        has_doc, export_html),
-        cmd!(noundo "file.exportPptx", "Export PowerPoint…", ["File"], None,
-        "{path?, pages?: \"1-3,5\" | [1,3] (1-based positions; default all), lineBreaks?: keep|reflow (keep: DesignCraft's lines, spacing and leading; reflow: one box per frame, PowerPoint sets the lines), rasterize?: bool (default true: objects PowerPoint can't show — placed PDF/EPS, type on a path, some effects — go in as 300 ppi images), embedFonts?: bool (default true: the TrueType fonts whose licences allow it), title?, author?} — every page as a slide of editable shapes, pictures, text boxes and tables → {path, bytes, slides, warnings} (no path: {base64, …})",
-        has_doc, export_pptx),
-        cmd!(noundo "file.exportText", "Export Text…", ["File"], None,
-        "{path?, format?: \"txt\"|\"rtf\"|\"tagged\" (Tagged Text; default from the path, else txt), story?, frame?} — the story being edited or of the selected frame → {path, bytes} (no path: {text, bytes})",
-        has_story_target, export_text),
-    ]
-}
-
-fn print_booklet(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "file.printBooklet";
-    let kind = match str_param(p, "type").unwrap_or("saddleStitch") {
-        "saddleStitch" => designcraft_pdf::BookletKind::SaddleStitch,
-        "twoUpConsecutive" | "twoUp" => designcraft_pdf::BookletKind::TwoUpConsecutive,
-        t => return Err(bad(ID, format!("unknown type `{t}` (saddleStitch, twoUpConsecutive)"))),
-    };
-    let opts = designcraft_pdf::BookletOptions { kind, space_between: p.get("spaceBetween").and_then(Value::as_f64).unwrap_or(0.0), title: None };
-    let st = s.doc()?;
-    let r = designcraft_pdf::export_booklet(&super::interchange::with_pdf_boxes(&st.doc), &s.cache, &opts)
-        .map_err(|e| EngineError::Other(e.to_string()))?;
-    match str_param(p, "path") {
-        Some(path) => {
-            #[cfg(not(target_arch = "wasm32"))]
-            crate::io::write_file(path, &r.bytes).map_err(EngineError::Other)?;
-            Ok(json!({"path": path, "bytes": r.bytes.len(), "sheets": r.pages, "warnings": r.warnings}))
-        }
-        None => Ok(json!({"base64": super::file::base64_encode(&r.bytes), "bytes": r.bytes.len(), "sheets": r.pages, "warnings": r.warnings})),
-    }
-}
-
-/// HTML and reflowable EPUB embed the EPS preview; keep the session's source bytes intact.
-fn eps_previews(d: &designcraft_doc::Document) -> (Cow<'_, designcraft_doc::Document>, Vec<String>) {
-    // Match the exporter's reading order (including Article exclusions), not every asset
-    // in the document: unused or hidden graphics must not prevent an export.
-    let mut used = std::collections::BTreeSet::new();
-    for block in designcraft_epub::reading_order(d) {
-        let designcraft_epub::Block::Image(id) = block else { continue };
-        let Some(it) = d.item(id) else { continue };
-        let designcraft_doc::Content::Graphic(g) = &it.content else { continue };
-        used.insert(g.asset);
-        if d.assets.get(&g.asset).is_some_and(|a| designcraft_doc::media_kind(&a.mime).is_some())
-            && let Some(poster) = it.media.as_ref().and_then(|m| m.poster)
-        {
-            used.insert(poster);
-        }
-    }
-    let mut out = Cow::Borrowed(d);
-    let mut warnings = Vec::new();
-    for id in used {
-        let Some(a) = d.assets.get(&id).filter(|a| designcraft_images::is_eps(&a.data)) else { continue };
-        let png = designcraft_images::eps_png(&a.data);
-        if png.is_none() {
-            warnings.push(format!("{}: unusable EPS preview; graphic omitted", a.name));
-        }
-        if let Some(a) = out.to_mut().assets.get_mut(&id) {
-            let a = Arc::make_mut(a);
-            a.mime = "image/png".into();
-            a.data = Arc::new(png.unwrap_or_default());
-        }
-    }
-    (out, warnings)
-}
-
-fn export_html(s: &mut Session, p: &Value) -> Result<Value> {
-    let st = s.doc()?;
-    let opts = designcraft_epub::HtmlOptions {
-        title: str_param(p, "title").map(str::to_string),
-        language: str_param(p, "language").map(str::to_string),
-        generic_families: generic_families(&st.doc),
-    };
-    let (doc, warnings) = eps_previews(&st.doc);
-    let text = designcraft_epub::export_html(&doc, &opts);
-    match str_param(p, "path") {
-        Some(path) => {
-            #[cfg(not(target_arch = "wasm32"))]
-            crate::io::write_file(path, text.as_bytes()).map_err(EngineError::Other)?;
-            Ok(json!({"path": path, "bytes": text.len(), "warnings": warnings}))
-        }
-        None => Ok(json!({"bytes": text.len(), "text": text, "warnings": warnings})),
-    }
-}
-
-fn export_pptx(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "file.exportPptx";
-    let st = s.doc()?;
-    let line_breaks = match str_param(p, "lineBreaks") {
-        None | Some("keep") => designcraft_pptx::LineBreaks::Keep,
-        Some("reflow") => designcraft_pptx::LineBreaks::Reflow,
-        Some(x) => return Err(bad(ID, format!("unknown lineBreaks `{x}` (keep, reflow)"))),
-    };
-    let opts = designcraft_pptx::PptxOptions {
-        pages: pages_param(ID, p, st.doc.page_count())?,
-        line_breaks,
-        title: str_param(p, "title").map(str::to_string),
-        author: str_param(p, "author").map(str::to_string),
-        created: None,
-        embed_fonts: p.get("embedFonts").and_then(Value::as_bool).unwrap_or(true),
-    };
-    // Object Export Options › Rasterize, and what PowerPoint has no objects for (a threaded frame
-    // stays text: a picture of it would drop the rest of its story).
-    let auto = p.get("rasterize").and_then(Value::as_bool).unwrap_or(true);
-    let (raster, rasterized) = rasterize_where(&st.doc, &s.cache, 300.0, true, |it| {
-        !threaded(&st.doc, it) && (it.export_options.rasterize || (auto && designcraft_pptx::needs_raster(&st.doc, it)))
-    });
-    let doc: &designcraft_doc::Document = raster.as_ref().unwrap_or(&st.doc);
-    let mut r = designcraft_pptx::export_pptx(doc, &s.cache, &opts).map_err(|e| EngineError::Other(e.to_string()))?;
-    if rasterized > 0 {
-        r.warnings.push(format!("{rasterized} object(s) went in as images"));
-    }
-    match str_param(p, "path") {
-        Some(path) => {
-            #[cfg(not(target_arch = "wasm32"))]
-            crate::io::write_file(path, &r.bytes).map_err(EngineError::Other)?;
-            Ok(json!({"path": path, "bytes": r.bytes.len(), "slides": r.slides, "warnings": r.warnings}))
-        }
-        None => Ok(json!({"base64": super::file::base64_encode(&r.bytes), "bytes": r.bytes.len(), "slides": r.slides, "warnings": r.warnings})),
-    }
-}
-
-fn has_story_target(s: &Session) -> std::result::Result<(), String> {
-    super::text::story_of(s, &Value::Null).map(|_| ()).ok_or_else(|| "edit text or select a text frame".into())
-}
-
-fn export_text(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "file.exportText";
-    let sid = super::text::story_of(s, p).ok_or_else(|| bad(ID, "edit text or select a text frame"))?;
-    let doc = &s.doc()?.doc;
-    let story = doc.stories.get(&sid).ok_or_else(|| bad(ID, format!("no story {}", sid.0)))?;
-    let path = str_param(p, "path");
-    let format = match str_param(p, "format") {
-        Some(f @ ("rtf" | "tagged")) => f,
-        Some("txt") | Some("text") => "txt",
-        Some(f) => return Err(bad(ID, format!("unknown format `{f}` (txt, rtf, tagged)"))),
-        None if path.is_some_and(|x| x.to_ascii_lowercase().ends_with(".rtf")) => "rtf",
-        None => "txt",
-    };
-    let text = match format {
-        "rtf" => designcraft_textimport::export::rtf(doc, story),
-        "tagged" => designcraft_textimport::tagged::tagged_text(doc, story),
-        _ => designcraft_textimport::export::plain_text(story),
-    };
-    match path {
-        Some(path) => {
-            #[cfg(not(target_arch = "wasm32"))]
-            crate::io::write_file(path, text.as_bytes()).map_err(EngineError::Other)?;
-            Ok(json!({"path": path, "bytes": text.len()}))
-        }
-        None => Ok(json!({"bytes": text.len(), "text": text})),
-    }
-}
-
-/// Text of the frames on page `abs`, in line order (for fixed-layout pages).
-fn page_text(d: &designcraft_doc::Document, cache: &designcraft_compose::Cache, abs: usize) -> String {
-    let mut out = String::new();
-    for st in d.stories.values() {
-        let cs = cache.get(d, st.id, None);
-        for ft in &cs.frames {
-            if d.page_of_item(ft.frame) != Some(abs) {
-                continue;
-            }
-            for l in &ft.lines {
-                let r = l.range.start.min(st.text.len())..l.range.end.min(st.text.len());
-                let t: String = st.text[r].chars().filter(|c| !('\u{E000}'..='\u{F8FF}').contains(c)).collect();
-                if !t.trim().is_empty() {
-                    out.push_str(t.trim_end_matches('\n'));
-                    out.push('\n');
-                }
-            }
-        }
-    }
-    out
-}
-
-/// The CSS generic family of each font family the EPUB/HTML stylesheet names, from the fonts'
-/// classification (PANOSE, OS/2 class, name), for the `font-family` fallbacks.
-fn generic_families(d: &designcraft_doc::Document) -> std::collections::BTreeMap<String, String> {
-    use designcraft_fonts::FontClass;
-    let db = designcraft_fonts::FontDb::global().scoped(d.font_scope);
-    let mut out = std::collections::BTreeMap::new();
-    for (family, _) in designcraft_epub::stylesheet_fonts(d) {
-        if out.contains_key(&family) {
-            continue;
-        }
-        let generic = match db.family_kind(&family).map(|(k, _)| k.class) {
-            Some(FontClass::Serif | FontClass::SlabSerif) => "serif",
-            Some(FontClass::SansSerif) => "sans-serif",
-            Some(FontClass::Monospaced) => "monospace",
-            Some(FontClass::Script) => "cursive",
-            Some(FontClass::Decorative) => "fantasy",
-            Some(FontClass::Symbol | FontClass::Other) | None => continue,
-        };
-        out.insert(family, generic.to_string());
-    }
-    out
-}
-
-/// The faces the EPUB stylesheet names, to package with it; `warnings` gets the ones left out
-/// (not available, a licence that forbids embedding, or part of a font collection).
-fn embedded_fonts(d: &designcraft_doc::Document, warnings: &mut Vec<String>) -> Vec<designcraft_epub::EmbeddedFont> {
-    let db = designcraft_fonts::FontDb::global().scoped(d.font_scope);
-    let mut out = Vec::new();
-    for (family, style) in designcraft_epub::stylesheet_fonts(d) {
-        let face = db.face(&family, &style);
-        if !face.family.eq_ignore_ascii_case(&family) {
-            warnings.push(format!("font `{family} {style}` is not available; not embedded"));
-        } else if face.restricted_licence() || face.bitmap_only() {
-            warnings.push(format!("font `{family} {style}`: its licence doesn't allow embedding; not embedded"));
-        } else if face.data().starts_with(b"ttcf") {
-            warnings.push(format!("font `{family} {style}` is part of a font collection; not embedded"));
-        } else {
-            out.push(designcraft_epub::EmbeddedFont { family, style: face.style.clone(), data: face.data().to_vec() });
-        }
-    }
-    out
-}
-
-fn export_epub(s: &mut Session, p: &Value) -> Result<Value> {
-    let st = s.doc()?;
-    // Object Export Options › Rasterize: those objects go in as images.
-    let (raster, _) = rasterize_where(&st.doc, &s.cache, 144.0, false, |it| it.export_options.rasterize && !threaded(&st.doc, it));
-    let epub_doc: &designcraft_doc::Document = raster.as_ref().unwrap_or(&st.doc);
-    let fixed = p.get("fixedLayout").and_then(Value::as_bool).unwrap_or(false);
-    let want_cover = p.get("cover").and_then(Value::as_bool).unwrap_or(false);
-    let mut rr = designcraft_render::Renderer::new();
-    rr.threads = designcraft_render::default_threads();
-    let ropts = designcraft_render::RenderOptions { printing_only: true, ..Default::default() };
-    let mut warnings: Vec<String> = Vec::new();
-    // A cover image file (PNG or JPEG), else the first page rendered when `cover` asks for it.
-    let cover = match p.get("coverImage").and_then(Value::as_str).filter(|_| !fixed) {
-        Some(path) => Some(super::datamerge::read_path_capped(path, super::datamerge::MAX_IMAGE_FILE_BYTES).map_err(crate::EngineError::Other)?),
-        None => (want_cover && !fixed).then(|| rr.render_page(&st.doc, &s.cache, 0, 2.0, false, &ropts).map(|img| img.to_png())).flatten(),
-    };
-    if let Some(c) = &cover
-        && !(c.starts_with(b"\x89PNG") || c.starts_with(&[0xFF, 0xD8, 0xFF]))
-    {
-        return Err(crate::EngineError::Other("the cover image must be a PNG or JPEG file".into()));
-    }
-    let opts = designcraft_epub::EpubOptions {
-        title: p.get("title").and_then(Value::as_str).map(str::to_string),
-        author: p.get("author").and_then(Value::as_str).map(str::to_string),
-        language: p.get("language").and_then(Value::as_str).unwrap_or("en").to_string(),
-        identifier: p.get("identifier").and_then(Value::as_str).map(str::to_string),
-        cover,
-        toc_title: p.get("tocTitle").and_then(Value::as_str).map(str::to_string),
-        generic_families: generic_families(&st.doc),
-        fonts: if p.get("embedFonts").and_then(Value::as_bool).unwrap_or(false) && !fixed {
-            embedded_fonts(&st.doc, &mut warnings)
-        } else {
-            Vec::new()
-        },
-        // The export time; on the web the document's own save time stands in.
-        #[cfg(not(target_arch = "wasm32"))]
-        modified: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).ok().and_then(|d| i64::try_from(d.as_secs()).ok()),
-        #[cfg(target_arch = "wasm32")]
-        modified: None,
-    };
-    if fixed {
-        let d = &st.doc;
-        let mut pages = Vec::new();
-        for i in 0..d.page_count() {
-            let Some((si, pi)) = d.page_loc(i) else { continue };
-            let b = d.spreads[si].pages[pi].bounds();
-            let Some(img) = rr.render_page(d, &s.cache, i, 2.0, false, &ropts) else { continue };
-            pages.push(designcraft_epub::FixedPage { png: img.to_png(), width: b.width(), height: b.height(), text: page_text(d, &s.cache, i) });
-        }
-        let bytes = designcraft_epub::export_fixed_epub(d, &pages, &opts).map_err(|e| crate::EngineError::Other(e.to_string()))?;
-        return match p.get("path").and_then(Value::as_str) {
-            Some(path) => {
-                write_file(path, &bytes)?;
-                Ok(serde_json::json!({"path": path, "bytes": bytes.len(), "pages": pages.len()}))
-            }
-            None => Ok(serde_json::json!({"base64": super::base64_encode(&bytes), "bytes": bytes.len(), "pages": pages.len()})),
-        };
-    }
-    let (epub_doc, eps_warnings) = eps_previews(epub_doc);
-    warnings.extend(eps_warnings);
-    let bytes = designcraft_epub::export_epub(&epub_doc, &opts).map_err(|e| crate::EngineError::Other(e.to_string()))?;
-    warnings.extend(
-        designcraft_epub::images_without_alt(&epub_doc)
-            .into_iter()
-            .map(|name| format!("{name}: no alt text (Object Export Options); exported as decorative (alt=\"\")")),
-    );
-    match p.get("path").and_then(Value::as_str) {
-        Some(path) => {
-            #[cfg(not(target_arch = "wasm32"))]
-            crate::io::write_file(path, &bytes).map_err(crate::EngineError::Other)?;
-            Ok(serde_json::json!({"path": path, "bytes": bytes.len(), "warnings": warnings}))
-        }
-        None => Ok(serde_json::json!({"base64": super::file::base64_encode(&bytes), "bytes": bytes.len(), "warnings": warnings})),
-    }
-}
-
-/// The `pages` parameter: a range string ("1-3,5"), a list or a number of 1-based positions.
-fn pages_param(id: &str, p: &Value, page_count: usize) -> Result<Option<Vec<usize>>> {
-    Ok(match p.get("pages") {
-        None | Some(Value::Null) => None,
-        Some(Value::String(s)) => Some(designcraft_pdf::parse_page_range(s, page_count).map_err(|e| bad(id, e.to_string()))?),
-        Some(Value::Array(a)) => {
-            let mut v = Vec::new();
-            for x in a {
-                let n = x
-                    .as_u64()
-                    .and_then(|n| usize::try_from(n).ok())
-                    .filter(|n| *n >= 1 && *n <= page_count)
-                    .ok_or_else(|| bad(id, format!("bad page {x}")))?;
-                // A page named twice is one page, as `"2,2"` already is: the list says which
-                // pages to export, not how many times. `[2, 2]` exported two copies of page 2
-                // while `"2,2"` exported one.
-                if !v.contains(&(n - 1)) {
-                    v.push(n - 1);
-                }
-            }
-            Some(v)
-        }
-        Some(Value::Number(n)) => {
-            let n = n
-                .as_u64()
-                .and_then(|n| usize::try_from(n).ok())
-                .filter(|n| *n >= 1 && *n <= page_count)
-                .ok_or_else(|| bad(id, format!("bad page {n}")))?;
-            Some(vec![n - 1])
-        }
-        Some(v) => return Err(bad(id, format!("bad `pages`: {v}"))),
-    })
-}
-
-pub(crate) fn options(p: &Value, page_count: usize) -> Result<PdfOptions> {
-    const ID: &str = "file.exportPdf";
-
-    let pages = pages_param(ID, p, page_count)?;
-    let spreads = p.get("spreads").and_then(Value::as_bool).unwrap_or(false);
-    let bleed = p.get("bleed").and_then(Value::as_bool).unwrap_or(false);
-    let marks = match p.get("marks") {
-        Some(Value::Bool(true)) => Marks::ALL,
-        Some(Value::Object(m)) => {
-            let b = |k: &str| m.get(k).and_then(Value::as_bool).unwrap_or(false);
-            Marks {
-                crop: b("crop"),
-                bleed: b("bleed"),
-                page_info: b("pageInfo"),
-                weight: m.get("weight").and_then(Value::as_f64).unwrap_or(0.25),
-                offset: m.get("offset").and_then(Value::as_f64).unwrap_or(6.0),
-            }
-        }
-        _ => Marks::NONE,
-    };
-    let standard = match str_param(p, "standard") {
-        Some(s) => Standard::parse(s).ok_or_else(|| bad(ID, format!("unknown standard `{s}` (none, x4, a2b)")))?,
-        None => Standard::None,
-    };
-    let created = match p.get("created") {
-        None | Some(Value::Null) => None,
-        Some(v) => Some(v.as_i64().ok_or_else(|| bad(ID, "`created`: Unix seconds, an integer"))?),
-    };
-    Ok(PdfOptions {
-        pages,
-        spreads,
-        bleed,
-        marks,
-        standard,
-        compress_images: p.get("compressImages").and_then(Value::as_bool).unwrap_or(false),
-        title: str_param(p, "title").map(str::to_string),
-        author: str_param(p, "author").map(str::to_string),
-        tagged: p.get("tagged").and_then(Value::as_bool).unwrap_or(false),
-        media: p.get("media").and_then(Value::as_bool).unwrap_or(false),
-        created,
-        ..PdfOptions::default()
-    })
-}
-
-/// Does this object (or anything in it) need the transparency flattener?
-fn transparent(it: &designcraft_doc::Item) -> bool {
-    it.involves_transparency()
-}
-
-/// Transparency Flattener: each object involving transparency becomes an opaque image of its
-/// area as it looks over what's beneath it (so the rest stays vector); spreads whose parent items
-/// involve transparency are rasterised whole. Works on a copy of the document made for export.
-/// Returns the copy and the number of rasterised regions.
-fn flatten(d: &designcraft_doc::Document, cache: &designcraft_compose::Cache, ppi: f64) -> (designcraft_doc::Document, usize) {
-    use designcraft_doc::{Asset, AssetId, Content, Graphic, Item, ItemId, Shape, SpreadRef};
-    let mut out = d.clone();
-    let mut n = 0;
-    let mut rr = designcraft_render::Renderer::new();
-    rr.threads = designcraft_render::default_threads();
-    let k = ppi / 72.0;
-    let parent_transparent = |pid: Option<designcraft_doc::SpreadId>| {
-        pid.and_then(|id| d.parent_index(id))
-            .is_some_and(|pi| d.parent_chain(pi).iter().filter_map(|&i| d.parents.get(i)).any(|p| p.items.iter().any(|it| transparent(it))))
-    };
-    // An opaque image item showing `img` over `r`.
-    let image_item =
-        |out: &mut designcraft_doc::Document, r: designcraft_geom::Rect, img: designcraft_render::Rendered, layer: designcraft_doc::LayerId| {
-            let (w, h) = (img.width, img.height);
-            let aid = AssetId(out.alloc());
-            out.assets.insert(
-                aid,
-                std::sync::Arc::new(Asset {
-                    id: aid,
-                    name: format!("flattened-{}.png", aid.0),
-                    mime: "image/png".into(),
-                    data: std::sync::Arc::new(img.to_png()),
-                    pixels: Some((w, h)),
-                    ..Default::default()
-                }),
-            );
-            let mut it = Item::new(ItemId(out.alloc()), layer, Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
-            it.content = Content::Graphic(Graphic {
-                asset: aid,
-                size: (w as f64, h as f64),
-                xf: designcraft_geom::Affine::translate((r.x0, r.y0))
-                    * designcraft_geom::Affine::scale_non_uniform(r.width() / w as f64, r.height() / h as f64),
-                clip: None,
-                auto_fit: Default::default(),
-                fit_align: 4,
-                crop: [0.0; 4],
-                wrap: Default::default(),
-                fill: Default::default(),
-            });
-            it.stroke.weight = 0.0;
-            it
-        };
-    for (si, sp) in d.spreads.iter().enumerate() {
-        let whole = sp.pages.iter().any(|pg| pg.show_parent_items && parent_transparent(pg.parent));
-        if whole {
-            // Parent items involve transparency: every page of the spread as one image.
-            let first = d.first_page_of_spread(si);
-            let lid = out.default_layer();
-            let mut images = Vec::new();
-            for (pi, pg) in sp.pages.iter().enumerate() {
-                if let Some(img) = rr.render_page(d, cache, first + pi, k, false, &Default::default()) {
-                    images.push((pg.bounds(), img));
-                }
-            }
-            let osp = std::sync::Arc::make_mut(&mut out.spreads[si]);
-            osp.items.clear();
-            for pg in &mut osp.pages {
-                pg.show_parent_items = false;
-            }
-            for (b, img) in images {
-                let it = image_item(&mut out, b, img, lid);
-                let _ = out.insert_item(SpreadRef::Doc(si), it, None);
-                n += 1;
-            }
-            continue;
-        }
-        // Region by region, bottom to top.
-        for (idx, it) in sp.items.iter().enumerate() {
-            if it.hidden || !transparent(it) {
-                continue;
-            }
-            let reach = it.bounds().inflate(
-                designcraft_render::effect_outset(it) + it.stroke.extent() + 1.0,
-                designcraft_render::effect_outset(it) + it.stroke.extent() + 1.0,
-            );
-            // Only the part on the spread's pages and pasteboard that prints.
-            let (w, h) = ((reach.width() * k).ceil().max(1.0) as u32, (reach.height() * k).ceil().max(1.0) as u32);
-            if w as u64 * h as u64 > 80_000_000 {
-                continue;
-            }
-            // The stack up to and including this object.
-            let mut below = d.clone();
-            std::sync::Arc::make_mut(&mut below.spreads[si]).items.truncate(idx + 1);
-            let view = designcraft_geom::Affine::scale(k) * designcraft_geom::Affine::translate((-reach.x0, -reach.y0));
-            let opts = designcraft_render::RenderOptions { printing_only: true, ..Default::default() };
-            let img = rr.render(
-                &below,
-                cache,
-                &[designcraft_render::Placed { spread: SpreadRef::Doc(si), xf: designcraft_geom::Affine::translate(designcraft_geom::Vec2::ZERO) }],
-                w,
-                h,
-                view,
-                &opts,
-            );
-            let new = image_item(&mut out, reach, img, it.layer);
-            let osp = std::sync::Arc::make_mut(&mut out.spreads[si]);
-            let Some(pos) = osp.items.iter().position(|x| x.id == it.id) else { continue };
-            if threaded(d, it) {
-                // Keep the frame (its story flows on) under the image.
-                osp.items.insert(pos + 1, std::sync::Arc::new(new));
-            } else {
-                osp.items[pos] = std::sync::Arc::new(new);
-            }
-            n += 1;
-        }
-    }
-    (out, n)
-}
-
-/// A text frame in a story that runs through other frames (replacing it would reflow the story).
-fn threaded(d: &designcraft_doc::Document, it: &designcraft_doc::Item) -> bool {
-    it.text_frame().and_then(|t| d.story(t.story)).is_some_and(|st| st.frames.len() > 1)
-}
-
-/// Soft effects other than the gradient feather (which PDF export draws itself).
-fn raster_effects(it: &designcraft_doc::Item) -> bool {
-    let e = &it.effects;
-    // Knockout groups too: PDF output here has no knockout transparency groups.
-    it.knockout
-        || e.drop_shadow.on
-        || e.feather > 0.0
-        || e.inner_shadow.on
-        || e.outer_glow.on
-        || e.inner_glow.on
-        || e.bevel.on
-        || e.satin.on
-        || e.directional_feather.on
-}
-
-/// A copy of `d` where spread-level objects with soft effects are 300 ppi images of their whole
-/// appearance (transparent around them, so they composite over what's behind).
-fn rasterize_effects(d: &designcraft_doc::Document, cache: &designcraft_compose::Cache) -> (Option<designcraft_doc::Document>, usize) {
-    rasterize_where(d, cache, 300.0, true, |it| raster_effects(it) && !threaded(d, it))
-}
-
-/// A copy of `d` where the spread-level objects `pred` picks are images of their appearance at
-/// `ppi` (transparent around them). With `keep_wrap`, each object also stays behind as a
-/// nonprinting [`wrap_stand_in`], so text wraps around it as before.
-fn rasterize_where(
-    d: &designcraft_doc::Document,
-    cache: &designcraft_compose::Cache,
-    ppi: f64,
-    keep_wrap: bool,
-    pred: impl Fn(&designcraft_doc::Item) -> bool,
-) -> (Option<designcraft_doc::Document>, usize) {
-    use designcraft_doc::{Asset, AssetId, Content, Graphic, Item, ItemId, Shape, SpreadRef};
-    let todo: Vec<(usize, ItemId)> =
-        d.spreads.iter().enumerate().flat_map(|(si, sp)| sp.items.iter().filter(|it| !it.hidden && pred(it)).map(move |it| (si, it.id))).collect();
-    if todo.is_empty() {
-        return (None, 0);
-    }
-    let mut out = d.clone();
-    let mut rr = designcraft_render::Renderer::new();
-    rr.threads = designcraft_render::default_threads();
-    let k = ppi / 72.0;
-    let mut n = 0;
-    for (si, id) in todo {
-        let Some(it) = d.item(id) else { continue };
-        let reach = it.bounds().inflate(
-            designcraft_render::effect_outset(it) + it.stroke.extent() + 2.0,
-            designcraft_render::effect_outset(it) + it.stroke.extent() + 2.0,
-        );
-        // Just this object on its spread, no paper.
-        let mut solo = d.clone();
-        let sp = std::sync::Arc::make_mut(&mut solo.spreads[si]);
-        sp.items.retain(|x| x.id == id);
-        for pg in &mut sp.pages {
-            pg.show_parent_items = false;
-        }
-        let (w, h) = ((reach.width() * k).ceil().max(1.0) as u32, (reach.height() * k).ceil().max(1.0) as u32);
-        if w as u64 * h as u64 > 60_000_000 {
-            continue;
-        }
-        let view = designcraft_geom::Affine::scale(k) * designcraft_geom::Affine::translate((-reach.x0, -reach.y0));
-        let opts = designcraft_render::RenderOptions { paper: false, background: None, printing_only: true, ..Default::default() };
-        let img = rr.render(
-            &solo,
-            cache,
-            &[designcraft_render::Placed { spread: SpreadRef::Doc(si), xf: designcraft_geom::Affine::translate(designcraft_geom::Vec2::ZERO) }],
-            w,
-            h,
-            view,
-            &opts,
-        );
-        let aid = AssetId(out.alloc());
-        out.assets.insert(
-            aid,
-            std::sync::Arc::new(Asset {
-                id: aid,
-                name: format!("effects-{}.png", id.0),
-                mime: "image/png".into(),
-                data: std::sync::Arc::new(img.to_png()),
-                pixels: Some((w, h)),
-                ..Default::default()
-            }),
-        );
-        let mut img_item = Item::new(ItemId(out.alloc()), it.layer, Shape::Rectangle, designcraft_geom::shapes::rectangle(reach));
-        img_item.content = Content::Graphic(Graphic {
-            asset: aid,
-            size: (w as f64, h as f64),
-            xf: designcraft_geom::Affine::translate((reach.x0, reach.y0)) * designcraft_geom::Affine::scale(1.0 / k),
-            clip: None,
-            auto_fit: Default::default(),
-            fit_align: 4,
-            crop: [0.0; 4],
-            wrap: Default::default(),
-            fill: Default::default(),
-        });
-        img_item.stroke.weight = 0.0;
-        img_item.alt_text = it.alt_text.clone();
-        img_item.export_options = it.export_options.clone();
-        // Same place in the stacking order.
-        let osp = std::sync::Arc::make_mut(&mut out.spreads[si]);
-        if let Some(pos) = osp.items.iter().position(|x| x.id == id) {
-            osp.items[pos] = std::sync::Arc::new(img_item);
-            if keep_wrap && has_wrap(it, 0) {
-                osp.items.insert(pos, std::sync::Arc::new(wrap_stand_in(it, 0)));
-            }
-            n += 1;
-        }
-    }
-    (Some(out), n)
-}
-
-/// Whether `it`, its placed graphic or an item in it wraps text.
-fn has_wrap(it: &designcraft_doc::Item, depth: usize) -> bool {
-    use designcraft_doc::{Content, WrapMode};
-    if depth > MAX_STAND_IN_DEPTH {
-        return false;
-    }
-    it.wrap.mode != WrapMode::None
-        || match &it.content {
-            Content::Graphic(g) => g.wrap.mode != WrapMode::None,
-            Content::Group { items } => items.iter().any(|c| has_wrap(c, depth + 1)),
-            _ => false,
-        }
-}
-
-/// Nesting depth past which groups inside a rasterised object keep no wrap stand-ins.
-const MAX_STAND_IN_DEPTH: usize = 64;
-
-/// A nonprinting copy of `it` that keeps its text wrap (and its graphic's and its items') and
-/// nothing else that reaches the PDF: no text, form field, button or media. The image of the
-/// object stands in for all of that, as it does without the copy.
-fn wrap_stand_in(it: &designcraft_doc::Item, depth: usize) -> designcraft_doc::Item {
-    use designcraft_doc::Content;
-    let mut c = it.clone();
-    c.nonprinting = true;
-    c.form_field = None;
-    c.button = None;
-    c.media = None;
-    c.content = match &it.content {
-        Content::Text(_) => Content::Unassigned,
-        Content::Group { items } if depth < MAX_STAND_IN_DEPTH => {
-            Content::Group { items: items.iter().map(|i| std::sync::Arc::new(wrap_stand_in(i, depth + 1))).collect() }
-        }
-        Content::Group { .. } => Content::Group { items: Vec::new() },
-        other => other.clone(),
-    };
-    c
-}
-
-/// A copy of `d` where placed PDFs with Object Layer Options hidden layers are 300 ppi images.
-fn rasterize_layered(d: &designcraft_doc::Document) -> Result<(Option<designcraft_doc::Document>, usize)> {
-    let ids: Vec<designcraft_doc::ItemId> =
-        d.all_items().into_iter().filter(|id| d.item(*id).is_some_and(|it| !it.pdf_hidden_layers.is_empty() && it.graphic().is_some())).collect();
-    if ids.is_empty() {
-        return Ok((None, 0));
-    }
-    let mut out = d.clone();
-    let mut n = 0;
-    for id in ids {
-        let Some((g, hidden)) = out.item(id).and_then(|it| Some((it.graphic()?.clone(), it.pdf_hidden_layers.clone()))) else { continue };
-        let Some(a) = out.assets.get(&g.asset).cloned() else { continue };
-        if !designcraft_render::is_pdf(&a.data) {
-            continue;
-        }
-        // The whole page at 300 ppi (the graphic may show only a box of it).
-        let shown = designcraft_render::shown_box(&a);
-        let [l, t, r, b] = shown.unwrap_or([0.0, 0.0, 1.0, 1.0]);
-        let page_side = (g.size.0 / (r - l)).max(g.size.1 / (b - t));
-        let side = (page_side * 300.0 / 72.0).clamp(64.0, 8000.0) as u32;
-        let png = designcraft_render::pdf_page_png_checked(&a.data, a.page as usize, side, &hidden, shown)
-            .map_err(|e| EngineError::Other(format!("{}: {e}", a.name)))?;
-        let px = designcraft_render::image_size(&png);
-        let aid = designcraft_doc::AssetId(out.alloc());
-        out.assets.insert(
-            aid,
-            std::sync::Arc::new(designcraft_doc::Asset {
-                id: aid,
-                name: format!("{}.png", a.name),
-                mime: "image/png".into(),
-                data: std::sync::Arc::new(png),
-                pixels: px,
-                ..Default::default()
-            }),
-        );
-        if let Some(designcraft_doc::Content::Graphic(gg)) = out.item_mut(id).map(|it| &mut it.content) {
-            gg.asset = aid;
-        }
-        n += 1;
-    }
-    Ok((Some(out), n))
-}
-
-/// Object number of the first page of a PDF (its page tree's first kid).
-fn first_page_ref(pdf: &[u8]) -> Option<usize> {
-    let s = String::from_utf8_lossy(pdf);
-    let i = s.find("/Kids[")? + 6;
-    s[i..].split_whitespace().next()?.parse().ok()
-}
-
-fn export_pdf(s: &mut Session, p: &Value) -> Result<Value> {
-    let st = s.doc()?;
-    let opts = options(p, st.doc.page_count())?;
-    // Transparency Flattener presets: High / Medium / Low Resolution, or a ppi.
-    let ppi = match p.get("flatten") {
-        None | Some(Value::Null) | Some(Value::Bool(false)) => None,
-        Some(Value::String(s)) if s == "high" => Some(300.0),
-        Some(Value::String(s)) if s == "medium" => Some(150.0),
-        Some(Value::String(s)) if s == "low" => Some(72.0),
-        Some(Value::Bool(true)) => Some(300.0),
-        Some(v) => Some(
-            v.as_f64().filter(|v| (36.0..=1200.0).contains(v)).ok_or_else(|| bad("file.exportPdf", "`flatten`: high|medium|low or 36–1200 ppi"))?,
-        ),
-    };
-    let flattened = ppi.map(|ppi| flatten(&st.doc, &s.cache, ppi));
-    // Placed PDFs with hidden layers go out as images showing just their visible layers.
-    let base: &designcraft_doc::Document = flattened.as_ref().map_or(&st.doc, |f| &f.0);
-    let (layered, layer_count) = rasterize_layered(base)?;
-    let base2: &designcraft_doc::Document = layered.as_ref().unwrap_or(base);
-    let (fx_doc, fx_count) = rasterize_effects(base2, &s.cache);
-    let doc: &designcraft_doc::Document = fx_doc.as_ref().unwrap_or(base2);
-    let boxed = super::interchange::with_pdf_boxes(doc);
-    let doc: &designcraft_doc::Document = &boxed;
-    let r = designcraft_pdf::export_pdf_with_report(doc, &s.cache, &opts).map_err(|e| EngineError::Other(e.to_string()))?;
-    let mut r = r;
-    // Transparency Blend Space: the page group of pages with transparency.
-    let spreads = designcraft_pdf::sheet_spreads(doc, &opts);
-    let blended: Vec<bool> = spreads.iter().map(|si| doc.spreads.get(*si).is_some_and(|sp| sp.items.iter().any(|it| transparent(it)))).collect();
-    if blended.iter().any(|b| *b) {
-        match designcraft_pdf::add_blend_space(&r.bytes, &blended, doc.settings.blend_space == designcraft_doc::BlendSpace::Cmyk) {
-            Some(b) => r.bytes = b,
-            None => r.warnings.push("the transparency blend space couldn't be set".into()),
-        }
-    }
-    // Interactive PDF view options.
-    let mut cat = String::new();
-    if p.get("fullScreen").and_then(Value::as_bool) == Some(true) {
-        cat.push_str("/PageMode/FullScreen");
-    } else if p.get("bookmarksPanel").and_then(Value::as_bool) == Some(true) {
-        cat.push_str("/PageMode/UseOutlines");
-    }
-    match str_param(p, "pageLayout") {
-        Some("single") => cat.push_str("/PageLayout/SinglePage"),
-        Some("continuous") => cat.push_str("/PageLayout/OneColumn"),
-        Some("twoUp") => cat.push_str("/PageLayout/TwoPageLeft"),
-        Some("twoUpCover") => cat.push_str("/PageLayout/TwoPageRight"),
-        Some("twoUpContinuous") => cat.push_str("/PageLayout/TwoColumnRight"),
-        Some(o) => return Err(bad("file.exportPdf", format!("unknown pageLayout `{o}`"))),
-        None => {}
-    }
-    if let Some(v) = str_param(p, "view") {
-        // The first page opens with this view (pages are objects in order, so refer by index 0).
-        let dest = match v {
-            "fitPage" => "/Fit",
-            "fitWidth" => "/FitH null",
-            "actual" => "/XYZ null null 1",
-            o => return Err(bad("file.exportPdf", format!("unknown view `{o}` (fitPage, fitWidth, actual)"))),
-        };
-        if let Some(first) = first_page_ref(&r.bytes) {
-            cat.push_str(&format!("/OpenAction[{first} 0 R{dest}]"));
-        }
-    }
-    if !cat.is_empty() {
-        match designcraft_pdf::add_catalog_entries(&r.bytes, &cat) {
-            Some(b) => r.bytes = b,
-            None => r.warnings.push("the PDF view options couldn't be set".into()),
-        }
-    }
-    // Flip pages every N seconds (presentation).
-    if let Some(secs) = p.get("advanceSeconds").and_then(Value::as_f64).filter(|s| *s > 0.0) {
-        let n = designcraft_pdf::sheet_spreads(doc, &opts).len();
-        let dur: Vec<Option<String>> = (0..n).map(|_| Some(format!("/Dur {secs:.2}"))).collect();
-        match designcraft_pdf::add_page_entries(&r.bytes, &dur) {
-            Some(b) => r.bytes = b,
-            None => r.warnings.push("page timings couldn't be set".into()),
-        }
-    }
-    // Page transitions (each spread's first page holds them).
-    let trans: Vec<Option<designcraft_doc::PageTransition>> =
-        spreads.into_iter().map(|si| doc.spreads.get(si).and_then(|sp| sp.pages.first()).and_then(|pg| pg.transition)).collect();
-    if trans.iter().any(Option::is_some) {
-        match designcraft_pdf::add_transitions(&r.bytes, &trans) {
-            Some(b) => r.bytes = b,
-            None => r.warnings.push("page transitions couldn't be added to this PDF".into()),
-        }
-    }
-    if fx_count > 0 {
-        r.warnings.push(format!("{fx_count} object(s) with soft effects (shadows, glows, feathers, bevels) or knockout groups exported as images"));
-    }
-    if layer_count > 0 {
-        r.warnings.push(format!("{layer_count} placed PDF(s) with hidden layers exported as images"));
-    }
-    if let Some((_, n)) = &flattened
-        && *n > 0
-    {
-        r.warnings.push(format!("transparency flattened: {n} region(s) rasterised"));
-    }
-    match str_param(p, "path") {
-        Some(path) => {
-            write_file(path, &r.bytes)?;
-            Ok(json!({"path": path, "bytes": r.bytes.len(), "pages": r.pages, "warnings": r.warnings}))
-        }
-        None => Ok(json!({"base64": super::base64_encode(&r.bytes), "bytes": r.bytes.len(), "pages": r.pages, "warnings": r.warnings})),
-    }
-}
+mod flatten;
+mod formats;
+mod pdf;
+mod registry;
 
+#[cfg(test)]
+use flatten::{rasterize_effects, shadow_coverage};
 #[cfg(not(target_arch = "wasm32"))]
-fn write_file(path: &str, bytes: &[u8]) -> Result<()> {
-    crate::io::write_file(path, bytes).map_err(EngineError::Other)
-}
-#[cfg(target_arch = "wasm32")]
-fn write_file(path: &str, _bytes: &[u8]) -> Result<()> {
-    Err(EngineError::Other(format!("{path}: no file system on the web; omit `path` to get the bytes")))
-}
+pub(crate) use pdf::pdf_export;
+pub(crate) use pdf::{flatten_ppi, options, print_pdf};
+pub use registry::specs;
 
 #[cfg(test)]
-mod text_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    fn unzip(b64: &str) -> zip::ZipArchive<std::io::Cursor<Vec<u8>>> {
-        zip::ZipArchive::new(std::io::Cursor::new(super::super::file::base64_decode(b64))).unwrap()
-    }
-
-    fn read(z: &mut zip::ZipArchive<std::io::Cursor<Vec<u8>>>, name: &str) -> String {
-        let mut s = String::new();
-        std::io::Read::read_to_string(&mut z.by_name(name).unwrap(), &mut s).unwrap();
-        s
-    }
-
-    #[test]
-    fn object_export_options() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        // A plain rectangle rasterised for EPUB, centred, after a page break.
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 200, 200], "shape": "ellipse"})).unwrap();
-        s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [r["id"]]})).unwrap();
-        s.execute(
-            "object.exportOptions",
-            &json!({"ids": [r["id"]], "rasterize": true, "align": "center", "pageBreakBefore": true, "altText": "A dot"}),
-        )
-        .unwrap();
-        let e = s.execute("file.exportEpub", &json!({})).unwrap();
-        let mut z = unzip(e["base64"].as_str().unwrap());
-        let x = read(&mut z, "OEBPS/content.xhtml");
-        assert!(
-            x.contains("<figure style=\"text-align:center;page-break-before:always;break-before:page;\"><img") && x.contains("alt=\"A dot\""),
-            "{x}"
-        );
-        // Tagged PDF: an artifact object adds no figure.
-        let pdf = |s: &mut Session| {
-            String::from_utf8_lossy(&super::super::file::base64_decode(
-                s.execute("file.exportPdf", &json!({"tagged": true})).unwrap()["base64"].as_str().unwrap(),
-            ))
-            .matches("/S/Figure")
-            .count()
-        };
-        let figures = pdf(&mut s);
-        s.execute("object.exportOptions", &json!({"ids": [r["id"]], "artifact": true})).unwrap();
-        assert!(pdf(&mut s) < figures);
-    }
-
-    #[test]
-    fn epub_cover_and_fixed_layout() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 2})).unwrap();
-        s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Page one words", "caret": false})).unwrap();
-        let r = s.execute("file.exportEpub", &json!({"cover": true})).unwrap();
-        assert_eq!(r["warnings"], json!([]), "no images, nothing to report");
-        let mut z = unzip(r["base64"].as_str().unwrap());
-        let opf = read(&mut z, "OEBPS/content.opf");
-        assert!(opf.contains("cover-image") && opf.contains("<itemref idref=\"cover\"/>"));
-        assert!(z.by_name("OEBPS/images/cover.png").is_ok());
-        let r = s.execute("file.exportFixedEpub", &json!({})).unwrap();
-        assert_eq!(r["pages"], 2);
-        let mut z = unzip(r["base64"].as_str().unwrap());
-        let opf = read(&mut z, "OEBPS/content.opf");
-        assert!(opf.contains("rendition:layout\">pre-paginated") && opf.contains("page2.xhtml"));
-        let p1 = read(&mut z, "OEBPS/page1.xhtml");
-        assert!(p1.contains("width=612, height=792") && p1.contains("Page one words"), "{p1}");
-    }
-
-    /// #775: the fallback follows the font's class, and embedFonts packages the stylesheet's fonts
-    /// (and reports those it can't).
-    #[test]
-    fn epub_font_fallbacks_and_embedding() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 1})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Sans", "chars": {"fontFamily": "Source Sans 3", "fontStyle": "Regular"}})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Gone", "chars": {"fontFamily": "No Such Font Family", "fontStyle": "Regular"}}))
-            .unwrap();
-        s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Words", "caret": false})).unwrap();
-        let r = s.execute("file.exportEpub", &json!({})).unwrap();
-        let mut z = unzip(r["base64"].as_str().unwrap());
-        let css = read(&mut z, "OEBPS/style.css");
-        assert!(css.contains("font-family: \"Source Sans 3\", sans-serif;"), "{css}");
-        assert!(!css.contains("@font-face") && r["warnings"] == json!([]), "nothing embedded unless asked");
-        let r = s.execute("file.exportEpub", &json!({"embedFonts": true})).unwrap();
-        let mut z = unzip(r["base64"].as_str().unwrap());
-        let css = read(&mut z, "OEBPS/style.css");
-        assert!(css.contains("@font-face { font-family: \"Source Sans 3\"; src: url(\"fonts/"), "{css}");
-        let opf = read(&mut z, "OEBPS/content.opf");
-        let font = opf.split("href=\"fonts/").nth(1).and_then(|r| r.split('"').next()).map(|n| format!("OEBPS/fonts/{n}"));
-        assert!(font.as_ref().is_some_and(|f| z.by_name(f).is_ok_and(|e| e.size() > 1000)), "{opf}");
-        let warnings = r["warnings"].as_array().unwrap();
-        assert!(warnings.iter().any(|w| w.as_str().unwrap().contains("No Such Font Family")), "{warnings:?}");
-        let html = s.execute("file.exportHtml", &json!({})).unwrap()["text"].as_str().unwrap().to_string();
-        assert!(html.contains("\"Source Sans 3\", sans-serif;"));
-    }
-
-    /// A font whose licence allows embedding bitmaps only (fsType bit 9) is not packaged whole,
-    /// and a Semibold style asks for the Semibold face's weight, not Bold's.
-    #[test]
-    fn epub_embedding_follows_bitmap_only_licences_and_weights() {
-        use designcraft_fonts::testing::{font_with, with_fs_type};
-        const BITMAP: &str = "DocFont Epub Bitmap Only";
-        for fs_type in [0x0200, 0x0208] {
-            designcraft_fonts::FontDb::global()
-                .add_font(with_fs_type(font_with(&format!("{BITMAP} {fs_type:04x}"), &['W']).unwrap(), fs_type).unwrap());
-        }
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 1})).unwrap();
-        for fs_type in [0x0200, 0x0208] {
-            let family = format!("{BITMAP} {fs_type:04x}");
-            s.execute("style.paragraph.create", &json!({"name": family, "chars": {"fontFamily": family, "fontStyle": "Regular"}})).unwrap();
-        }
-        s.execute("style.paragraph.create", &json!({"name": "Semi", "chars": {"fontFamily": "Source Sans 3", "fontStyle": "Semibold"}})).unwrap();
-        s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Words", "caret": false})).unwrap();
-        let r = s.execute("file.exportEpub", &json!({"embedFonts": true})).unwrap();
-        let mut z = unzip(r["base64"].as_str().unwrap());
-        let css = read(&mut z, "OEBPS/style.css");
-        assert!(!css.contains(&format!("@font-face {{ font-family: \"{BITMAP}")), "{css}");
-        let warnings = r["warnings"].to_string();
-        for fs_type in [0x0200, 0x0208] {
-            assert!(warnings.contains(&format!("{BITMAP} {fs_type:04x} Regular`: its licence doesn't allow embedding")), "{warnings}");
-        }
-        let semi = css.lines().find(|l| l.contains(".semi {")).unwrap_or_default();
-        assert!(semi.contains("font-weight: 600;"), "{css}");
-    }
-
-    /// #771, #773: a cover image file and an identifier through the command; the package's
-    /// modified time is the export's.
-    #[test]
-    fn epub_cover_image_file_and_identifier() {
-        let dir = std::env::temp_dir().join(format!("dc-epub-cover-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let jpg = dir.join("cover.jpg");
-        std::fs::write(&jpg, [0xFF, 0xD8, 0xFF, 0xE0, 0, 16]).unwrap();
-        let bad = dir.join("cover.txt");
-        std::fs::write(&bad, b"not an image").unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 1})).unwrap();
-        s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Words", "caret": false})).unwrap();
-        let r = s.execute("file.exportEpub", &json!({"coverImage": jpg.to_str().unwrap(), "identifier": "urn:isbn:9780000000002"})).unwrap();
-        let mut z = unzip(r["base64"].as_str().unwrap());
-        let opf = read(&mut z, "OEBPS/content.opf");
-        assert!(opf.contains("<dc:identifier id=\"bookid\">urn:isbn:9780000000002</dc:identifier>"), "{opf}");
-        assert!(opf.contains("href=\"images/cover.jpg\" media-type=\"image/jpeg\""), "{opf}");
-        assert!(!opf.contains("2026-01-01T00:00:00Z"), "the export time, not a fixed date: {opf}");
-        assert!(z.by_name("OEBPS/images/cover.jpg").is_ok());
-        assert!(s.execute("file.exportEpub", &json!({"coverImage": bad.to_str().unwrap()})).is_err());
-        std::fs::remove_dir_all(&dir).ok();
-    }
-
-    #[test]
-    fn flattener_rasterises_spreads_with_transparency() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 3})).unwrap();
-        let id = s.execute("frame.create", &json!({"rect": [100, 100, 300, 300]})).unwrap()["id"].clone();
-        s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [id]})).unwrap();
-        // Opaque: nothing to flatten.
-        let r = s.execute("file.exportPdf", &json!({"flatten": "low"})).unwrap();
-        assert!(r["warnings"].as_array().unwrap().iter().all(|w| !w.as_str().unwrap().contains("flattened")));
-        s.execute("object.opacity", &json!({"ids": [id], "opacity": 0.5})).unwrap();
-        // Text away from the transparency stays live text.
-        s.execute("frame.create", &json!({"rect": [72, 400, 400, 450], "content": "text", "text": "Still vector", "caret": false})).unwrap();
-        let r = s.execute("file.exportPdf", &json!({"flatten": "low"})).unwrap();
-        let pdf = super::super::file::base64_decode(r["base64"].as_str().unwrap());
-        assert!(String::from_utf8_lossy(&pdf).contains("/FontFile"), "the text is still text");
-        assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("flattened: 1 ")), "{r}");
-        assert_eq!(r["pages"], 3);
-        let bytes = super::super::file::base64_decode(r["base64"].as_str().unwrap());
-        assert_eq!(designcraft_render::pdf_page_count(&bytes), Some(3));
-        // The document itself is untouched.
-        assert!(s.doc().unwrap().doc.item(designcraft_doc::ItemId(id.as_u64().unwrap())).is_some());
-        assert!(s.execute("file.exportPdf", &json!({"flatten": 5})).is_err());
-        // Interactive view options land in the catalog and on the pages.
-        let r = s.execute("file.exportPdf", &json!({"fullScreen": true, "pageLayout": "single", "view": "fitPage", "advanceSeconds": 5})).unwrap();
-        let t = String::from_utf8_lossy(&super::super::file::base64_decode(r["base64"].as_str().unwrap())).to_string();
-        assert!(
-            t.contains("/PageMode/FullScreen") && t.contains("/PageLayout/SinglePage") && t.contains("/OpenAction[") && t.contains("/Dur 5.00"),
-            "view options"
-        );
-        assert!(s.execute("file.exportPdf", &json!({"pageLayout": "sideways"})).is_err());
-        // Unflattened, the page blends in the document's blend space (CMYK for print).
-        let r = s.execute("file.exportPdf", &json!({})).unwrap();
-        let text = String::from_utf8_lossy(&super::super::file::base64_decode(r["base64"].as_str().unwrap())).to_string();
-        assert_eq!(text.matches("/S/Transparency/CS/DeviceCMYK").count(), 1, "only the page with transparency");
-    }
-
-    #[test]
-    fn objects_with_soft_effects_keep_their_text_wrap_in_pdf() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let text = "Words wrap around the objects on this page. ".repeat(60);
-        let t = s.execute("frame.create", &json!({"rect": [36, 36, 576, 756], "content": "text", "text": text, "caret": false})).unwrap()["id"]
-            .as_u64()
-            .unwrap();
-        // A feathered frame with a contour wrap of the frame itself.
-        let a = s.execute("frame.create", &json!({"rect": [100, 100, 200, 200]})).unwrap()["id"].clone();
-        s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [a]})).unwrap();
-        s.execute("object.textWrap", &json!({"ids": [a], "mode": "contour", "contour": "sameAsClipping", "offset": 6})).unwrap();
-        // A feathered frame whose placed graphic has a bounding-box wrap.
-        let png = designcraft_render::Rendered { width: 40, height: 40, pixels: vec![90; 40 * 40 * 4] }.to_png();
-        let b = s.execute("frame.create", &json!({"rect": [300, 400, 400, 500]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("file.place", &json!({"base64": super::super::file::base64_encode(&png), "name": "a.png", "frame": b})).unwrap();
-        s.execute("object.textWrap", &json!({"ids": [b], "content": true, "mode": "boundingBox", "offset": 6})).unwrap();
-        s.execute("object.feather", &json!({"ids": [a, b], "width": 14})).unwrap();
-
-        let d = &s.doc().unwrap().doc;
-        let sid = d.item(designcraft_doc::ItemId(t)).and_then(|it| it.text_frame()).unwrap().story;
-        let before = designcraft_compose::frame_specs(d, sid)[0].exclusions.clone();
-        assert_eq!(before.len(), 2);
-        let (fx, n) = super::rasterize_effects(d, &s.cache);
-        assert_eq!(n, 2);
-        let fx = fx.unwrap();
-        assert_eq!(designcraft_compose::frame_specs(&fx, sid)[0].exclusions, before);
-        // The objects that keep the wrap don't print; their images do.
-        let sp = &fx.spreads[0];
-        assert_eq!(sp.items.iter().filter(|it| it.nonprinting).count(), 2);
-        assert_eq!(sp.items.iter().filter(|it| !it.nonprinting && it.graphic().is_some()).count(), 2);
-    }
-
-    #[test]
-    fn export_story_as_text_and_rtf() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "One\nTwo"})).unwrap();
-        assert!(s.execute("file.exportText", &json!({"frame": r["id"]})).unwrap()["text"] == "One\r\nTwo");
-        let html = s.execute("file.exportHtml", &json!({})).unwrap();
-        assert!(html["text"].as_str().unwrap().contains("One</p>"));
-        let tagged = s.execute("file.exportText", &json!({"frame": r["id"], "format": "tagged"})).unwrap();
-        assert!(tagged["text"].as_str().unwrap().contains("<ParaStyle:"));
-        let rtf = s.execute("file.exportText", &json!({"frame": r["id"], "format": "rtf"})).unwrap();
-        assert!(rtf["text"].as_str().unwrap().starts_with("{\\rtf1"));
-        let dir = std::env::temp_dir().join(format!("dc-export-text-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("story.rtf");
-        s.execute("file.exportText", &json!({"frame": r["id"], "path": path.to_string_lossy()})).unwrap();
-        assert!(std::fs::read_to_string(&path).unwrap().starts_with("{\\rtf1"));
-        std::fs::remove_dir_all(&dir).ok();
-    }
-}
-
-#[cfg(test)]
-mod tagged_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn tagged_pdf_has_structure_and_alt_text() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Hello"})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 320, 200, 420]})).unwrap();
-        s.execute("object.altText", &json!({"text": "A plain box", "ids": [r["id"]]})).unwrap();
-        let pdf = |s: &mut Session, tagged: bool| {
-            let b64 = s.execute("file.exportPdf", &json!({"tagged": tagged})).unwrap()["base64"].as_str().unwrap().to_string();
-            String::from_utf8_lossy(&super::super::file::base64_decode(&b64)).into_owned()
-        };
-        let t = pdf(&mut s, true);
-        assert!(t.contains("/StructTreeRoot") && t.contains("/Figure") && t.contains("A plain box"), "tagged");
-        assert!(t.contains("/P") && t.contains("/MarkInfo"));
-        assert!(!pdf(&mut s, false).contains("/StructTreeRoot"));
-    }
-}
-
-#[cfg(test)]
-mod variable_font_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn variable_font_instance_exports_to_pdf() {
-        let Ok(data) = std::fs::read("/System/Library/Fonts/Supplemental/Skia.ttf") else { return };
-        designcraft_fonts::FontDb::global().add_font(data);
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Variable"})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 8})).unwrap();
-        s.execute("type.char", &json!({"fontFamily": "Skia", "fontStyle": "Black"})).unwrap();
-        let out = s.execute("file.exportPdf", &json!({})).unwrap();
-        assert!(out["bytes"].as_u64().unwrap() > 1000);
-        let fonts = s.execute("font.list", &json!({})).unwrap();
-        assert!(fonts.to_string().contains("Black"), "{fonts}");
-    }
-}
-
-#[cfg(test)]
-mod booklet_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn booklet_imposes_pages_in_pairs() {
-        use designcraft_pdf::{BookletKind, booklet_pairs};
-        assert_eq!(booklet_pairs(8, BookletKind::SaddleStitch), [(Some(7), Some(0)), (Some(1), Some(6)), (Some(5), Some(2)), (Some(3), Some(4))]);
-        assert_eq!(booklet_pairs(6, BookletKind::SaddleStitch)[0], (None, Some(0)), "padded with blanks");
-        assert_eq!(booklet_pairs(3, BookletKind::TwoUpConsecutive), [(Some(0), Some(1)), (Some(2), None)]);
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 4})).unwrap();
-        let r = s.execute("file.printBooklet", &json!({"spaceBetween": 18})).unwrap();
-        assert_eq!(r["sheets"], 2);
-        let pdf = String::from_utf8_lossy(&super::super::file::base64_decode(r["base64"].as_str().unwrap())).into_owned();
-        let mb = pdf.find("/MediaBox").map(|i| pdf[i..i + 40].to_string()).unwrap_or_default();
-        assert!(mb.contains("1242"), "two 612 pt pages and an 18 pt gap: {mb}");
-        assert!(s.execute("file.printBooklet", &json!({"type": "perfectBound"})).is_err());
-        // Page 1's black box lands on the right half of the first sheet (page 4 is on the left).
-        let id = s.execute("frame.create", &json!({"rect": [100, 100, 300, 300]})).unwrap()["id"].clone();
-        s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [id]})).unwrap();
-        let r = s.execute("file.printBooklet", &json!({})).unwrap();
-        let bytes = super::super::file::base64_decode(r["base64"].as_str().unwrap());
-        let px = designcraft_render::decode_pixmap_page(&bytes, 0).expect("rasterised");
-        let (w, h) = (px.width() as f64, px.height() as f64);
-        let at = |x: f64, y: f64| px.sample((x / 1224.0 * w) as u16, (y / 792.0 * h) as u16);
-        let (ink, blank) = (at(612.0 + 200.0, 200.0), at(200.0, 200.0));
-        assert!(ink.a > 200 && ink.r < 60, "right half has page 1: {ink:?}");
-        assert!(blank.a < 30 || blank.r > 200, "left half (page 4) is empty: {blank:?}");
-    }
-}
-
-#[cfg(test)]
-mod placed_pdf_print_tests {
-    use serde_json::json;
-
-    use crate::Session;
-    use crate::cmd::{base64_decode, base64_encode};
-
-    /// A one-page PDF 1.7 with a black box, as VectorCraft writes a logo.
-    fn logo() -> Vec<u8> {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"width": 100, "height": 50})).unwrap();
-        s.execute("frame.create", &json!({"rect": [10, 10, 90, 40]})).unwrap();
-        s.execute("object.fill", &json!({"swatch": "[Black]"})).unwrap();
-        let r = s.execute("file.exportPdf", &json!({})).unwrap();
-        base64_decode(r["base64"].as_str().unwrap())
-    }
-
-    fn page_with(pdf: &[u8]) -> Session {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("file.place", &json!({"base64": base64_encode(pdf), "name": "logo.pdf", "x": 72, "y": 72})).unwrap();
-        s
-    }
-
-    /// A placed PDF 1.7 failed the PDF/X-4 (PDF 1.6) export with
-    /// "PDF writer error: Pdf(PdfDocument(PdfDocumentRepr { .. }), VersionMismatch(Pdf17), None)".
-    #[test]
-    fn pdf_17_placed_in_pdfx4() {
-        let logo = logo();
-        assert!(logo.starts_with(b"%PDF-1.7"));
-        let mut s = page_with(&logo);
-        let r = s.execute("file.exportPdf", &json!({"standard": "x4"})).unwrap();
-        assert!(r["warnings"].to_string().contains("logo.pdf: a PDF 1.7 placed in a PDF 1.6 file"), "{}", r["warnings"]);
-        assert!(base64_decode(r["base64"].as_str().unwrap()).starts_with(b"%PDF-1.6"));
-        // PDF 2.0 can't simply be relabelled: the export fails and names the file.
-        let mut v20 = logo.clone();
-        v20[5..8].copy_from_slice(b"2.0");
-        let mut s = page_with(&v20);
-        let e = s.execute("file.exportPdf", &json!({"standard": "x4"})).unwrap_err().to_string();
-        assert!(e.contains("logo.pdf is PDF 2.0") && e.contains("PDF 1.6"), "{e}");
-    }
-
-    /// A one-page PDF with a black box whose catalog says `/Version /1.7`, as TCPDF writes it.
-    fn catalog_v17(header: &str) -> Vec<u8> {
-        let content = "0 0 0 1 k 0 0 200 200 re f";
-        let mut pdf = format!("{header}\n").into_bytes();
-        let mut offsets = Vec::new();
-        for body in [
-            "<</Type/Catalog/Pages 2 0 R/Version /1.7>>".to_owned(),
-            "<</Type/Pages/Kids[3 0 R]/Count 1>>".to_owned(),
-            "<</Type/Page/Parent 2 0 R/MediaBox[0 0 200 200]/Contents 4 0 R/Resources<<>>>>".to_owned(),
-            format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
-        ] {
-            offsets.push(pdf.len());
-            pdf.extend_from_slice(format!("{} 0 obj\n{body}\nendobj\n", offsets.len()).as_bytes());
-        }
-        let xref = pdf.len();
-        pdf.extend_from_slice(b"xref\n0 5\n0000000000 65535 f\r\n");
-        for offset in offsets {
-            pdf.extend_from_slice(format!("{offset:010} 00000 n\r\n").as_bytes());
-        }
-        pdf.extend_from_slice(format!("trailer\n<</Size 5/Root 1 0 R>>\nstartxref\n{xref}\n%%EOF\n").as_bytes());
-        pdf
-    }
-
-    /// A placed PDF whose catalog `/Version /1.7` overrides its header failed the PDF/X-4 export
-    /// with "logo.pdf is PDF 1.7", though a 1.7 header alone is relabelled (#907).
-    #[test]
-    fn catalog_version_17_placed_in_pdfx4() {
-        for header in ["%PDF-1.7", "%PDF-1.4"] {
-            let pdf = catalog_v17(header);
-            assert_eq!(hayro_syntax::Pdf::new(pdf.clone()).unwrap().version(), hayro_syntax::PdfVersion::Pdf17);
-            let mut s = page_with(&pdf);
-            let r = s.execute("file.exportPdf", &json!({"standard": "x4"})).unwrap_or_else(|e| panic!("{header}: {e}"));
-            assert!(r["warnings"].to_string().contains("logo.pdf: a PDF 1.7 placed in a PDF 1.6 file"), "{}", r["warnings"]);
-            let out = base64_decode(r["base64"].as_str().unwrap());
-            assert!(out.starts_with(b"%PDF-1.6"));
-            assert_eq!(hayro_syntax::Pdf::new(out).unwrap().version(), hayro_syntax::PdfVersion::Pdf16);
-        }
-    }
-}
-
-#[cfg(test)]
-mod print_group_tests {
-    use serde_json::json;
-
-    use crate::Session;
-    use crate::cmd::{base64_decode, base64_encode};
-
-    /// A one-page PDF 1.7 with a black box, as VectorCraft writes a logo.
-    fn logo() -> Vec<u8> {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"width": 100, "height": 50})).unwrap();
-        s.execute("frame.create", &json!({"rect": [10, 10, 90, 40]})).unwrap();
-        s.execute("object.fill", &json!({"swatch": "[Black]"})).unwrap();
-        let r = s.execute("file.exportPdf", &json!({})).unwrap();
-        base64_decode(r["base64"].as_str().unwrap())
-    }
-
-    fn page_with(pdf: &[u8]) -> Session {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("file.place", &json!({"base64": base64_encode(pdf), "name": "logo.pdf", "x": 72, "y": 72})).unwrap();
-        s
-    }
-
-    /// The placed PDF's transparency group blended in DeviceRGB in a print document
-    /// (`/Group<</Type/Group/S/Transparency/I true/CS/DeviceRGB>>`).
-    #[test]
-    fn print_transparency_groups_blend_in_cmyk() {
-        let mut s = page_with(&logo());
-        let text = |s: &mut Session| {
-            let r = s.execute("file.exportPdf", &json!({"compressImages": false})).unwrap();
-            String::from_utf8_lossy(&base64_decode(r["base64"].as_str().unwrap())).into_owned()
-        };
-        let t = text(&mut s);
-        assert!(t.contains("/S/Transparency/I true/CS/DeviceCMYK>>"), "CMYK group");
-        assert!(!t.contains("DeviceRGB"), "no RGB left");
-        assert!(!designcraft_pdf::has_rgb_groups(t.as_bytes()));
-        // The file still reads, with the same page.
-        let r = s.execute("file.exportPdf", &json!({})).unwrap();
-        let bytes = base64_decode(r["base64"].as_str().unwrap());
-        assert_eq!(hayro_syntax::Pdf::new(bytes).unwrap().pages().len(), 1);
-        // An RGB blend space keeps RGB groups.
-        s.execute("edit.transparencyBlendSpace", &json!({"space": "rgb"})).unwrap();
-        let t = text(&mut s);
-        assert!(t.contains("/CS/DeviceRGB") && designcraft_pdf::has_rgb_groups(t.as_bytes()));
-    }
-}
-
-#[cfg(test)]
-mod pptx_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    fn unzip(b64: &str) -> zip::ZipArchive<std::io::Cursor<Vec<u8>>> {
-        zip::ZipArchive::new(std::io::Cursor::new(super::super::file::base64_decode(b64))).unwrap()
-    }
-
-    fn read(z: &mut zip::ZipArchive<std::io::Cursor<Vec<u8>>>, name: &str) -> String {
-        let mut s = String::new();
-        std::io::Read::read_to_string(&mut z.by_name(name).unwrap(), &mut s).unwrap();
-        s
-    }
-
-    #[test]
-    fn sample_exports_editable_slides() {
-        let mut s = Session::new();
-        s.execute("file.newSample", &json!({})).unwrap();
-        let r = s.execute("file.exportPptx", &json!({})).unwrap();
-        assert_eq!(r["slides"], 4);
-        let mut z = unzip(r["base64"].as_str().unwrap());
-        // The swatch table is a PowerPoint table; the cover picture is embedded; text is text.
-        assert!(read(&mut z, "ppt/slides/slide4.xml").contains("<a:tbl>"));
-        assert!(read(&mut z, "ppt/slides/slide1.xml").contains("<p:pic>"));
-        let text: String = read(&mut z, "ppt/slides/slide2.xml").split("<a:t>").skip(1).filter_map(|t| t.split("</a:t>").next()).collect();
-        assert!(text.contains("Notes on the Grid"), "{text}");
-        assert!(read(&mut z, "ppt/presentation.xml").contains("<p:embeddedFontLst>"));
-
-        let r = s.execute("file.exportPptx", &json!({"pages": "2-3", "embedFonts": false, "lineBreaks": "reflow"})).unwrap();
-        assert_eq!(r["slides"], 2);
-        assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("fonts are not embedded")));
-        assert!(s.execute("file.exportPptx", &json!({"lineBreaks": "wrap"})).is_err());
-        assert!(s.execute("file.exportPptx", &json!({"pages": [9]})).is_err());
-    }
-
-    #[test]
-    fn rasterize_option_places_a_picture() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 200, 200], "shape": "ellipse"})).unwrap();
-        s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [r["id"]]})).unwrap();
-        let shapes = |s: &mut Session| {
-            let r = s.execute("file.exportPptx", &json!({})).unwrap();
-            read(&mut unzip(r["base64"].as_str().unwrap()), "ppt/slides/slide1.xml")
-        };
-        assert!(shapes(&mut s).contains("prst=\"ellipse\""));
-        s.execute("object.exportOptions", &json!({"ids": [r["id"]], "rasterize": true})).unwrap();
-        let x = shapes(&mut s);
-        assert!(x.contains("<p:pic>") && !x.contains("prst=\"ellipse\""), "{x}");
-    }
-}
-
-#[cfg(test)]
-mod page_list_tests {
-    use serde_json::{Value, json};
-
-    use crate::Session;
-
-    fn doc(pages: u64) -> Session {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"width": 200, "height": 200, "pages": pages, "facingPages": false, "margins": 0})).unwrap();
-        s
-    }
-
-    /// The same selection written two ways exported different files: `"2,2"` is one page, because
-    /// `parse_page_range` keeps the first of a repeat, while `[2, 2]` was two copies of page 2.
-    /// The list says which pages to export, not how many times.
-    #[test]
-    fn a_page_named_twice_is_exported_once_either_way() {
-        let mut s = doc(4);
-        for (pages, want) in [
-            (json!("2,2"), 1),
-            (json!([2, 2]), 1),
-            (json!([2, 2, 2]), 1),
-            (json!("2-2,2"), 1),
-            (json!([1, 2, 1]), 2),
-            (json!("1,2,1"), 2),
-            (json!([4, 1]), 2),
-            (json!("4,1"), 2),
-            (json!("all"), 4),
-        ] {
-            let r = s.execute("file.exportPdf", &json!({"pages": pages.clone()})).unwrap();
-            assert_eq!(r["pages"].as_u64(), Some(want), "pdf {pages}");
-            let r = s.execute("file.exportPptx", &json!({"pages": pages.clone()})).unwrap();
-            assert_eq!(r["slides"].as_u64(), Some(want), "pptx {pages}");
-        }
-        // The two forms now agree byte for byte, and the pages come out in the document's order
-        // whichever order the list names them in (which is how the export already behaved).
-        let mut file = |pages: Value| {
-            let r = s.execute("file.exportPdf", &json!({"pages": pages})).unwrap();
-            r["base64"].as_str().unwrap_or_default().to_string()
-        };
-        assert_eq!(file(json!([4, 1])), file(json!("4,1")), "the array and the string agree");
-        assert_eq!(file(json!([4, 1])), file(json!([1, 4])), "pages 1 and 4, in the document's order");
-        assert_eq!(file(json!([2, 2])), file(json!("2")), "a repeat is the single page");
-        // A page that does not exist is still refused, and an empty list still exports nothing.
-        assert!(s.execute("file.exportPdf", &json!({"pages": [5]})).is_err());
-        assert!(s.execute("file.exportPdf", &json!({"pages": []})).is_err());
-    }
-}
+mod text_tests;
diff --git a/crates/engine/src/cmd/export/flatten.rs b/crates/engine/src/cmd/export/flatten.rs
new file mode 100644
index 000000000..b32d54383
--- /dev/null
+++ b/crates/engine/src/cmd/export/flatten.rs
@@ -0,0 +1,608 @@
+use super::{EngineError, Result};
+
+/// Does this object (or anything in it) need the transparency flattener?
+pub(super) fn transparent(it: &designcraft_doc::Item) -> bool {
+    it.involves_transparency()
+}
+
+/// Transparency Flattener: each object involving transparency becomes an opaque image of its
+/// area as it looks over what's beneath it (so the rest stays vector); spreads whose parent items
+/// involve transparency are rasterised whole. Works on a copy of the document made for export.
+/// Returns the copy and the number of rasterised regions.
+pub(super) fn flatten(d: &designcraft_doc::Document, cache: &designcraft_compose::Cache, ppi: f64) -> (designcraft_doc::Document, usize) {
+    use designcraft_doc::{Asset, AssetId, Content, Graphic, Item, ItemId, Shape, SpreadRef};
+    let mut out = d.clone();
+    let mut n = 0;
+    let mut rr = designcraft_render::Renderer::new();
+    rr.threads = designcraft_render::default_threads();
+    let k = ppi / 72.0;
+    let parent_transparent = |pid: Option<designcraft_doc::SpreadId>| {
+        pid.and_then(|id| d.parent_index(id))
+            .is_some_and(|pi| d.parent_chain(pi).iter().filter_map(|&i| d.parents.get(i)).any(|p| p.items.iter().any(|it| transparent(it))))
+    };
+    // An opaque image item showing `img` over `r`.
+    let image_item =
+        |out: &mut designcraft_doc::Document, r: designcraft_geom::Rect, img: designcraft_render::Rendered, layer: designcraft_doc::LayerId| {
+            let (w, h) = (img.width, img.height);
+            let aid = AssetId(out.alloc());
+            out.assets.insert(
+                aid,
+                std::sync::Arc::new(Asset {
+                    id: aid,
+                    name: format!("flattened-{}.png", aid.0),
+                    mime: "image/png".into(),
+                    data: std::sync::Arc::new(img.to_png()),
+                    pixels: Some((w, h)),
+                    ..Default::default()
+                }),
+            );
+            let mut it = Item::new(ItemId(out.alloc()), layer, Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
+            it.content = Content::Graphic(Graphic {
+                layer_options: None,
+                asset: aid,
+                size: (w as f64, h as f64),
+                xf: designcraft_geom::Affine::translate((r.x0, r.y0))
+                    * designcraft_geom::Affine::scale_non_uniform(r.width() / w as f64, r.height() / h as f64),
+                clip: None,
+                auto_fit: Default::default(),
+                fit_align: 4,
+                crop: [0.0; 4],
+                wrap: Default::default(),
+                fill: Default::default(),
+            });
+            it.stroke.weight = 0.0;
+            it
+        };
+    for (si, sp) in d.spreads.iter().enumerate() {
+        let whole = sp.pages.iter().any(|pg| pg.show_parent_items && parent_transparent(pg.parent));
+        if whole {
+            // Parent items involve transparency: every page of the spread as one image.
+            let first = d.first_page_of_spread(si);
+            let lid = out.default_layer();
+            let mut images = Vec::new();
+            for (pi, pg) in sp.pages.iter().enumerate() {
+                if let Some(img) = rr.render_page(d, cache, first + pi, k, false, &Default::default()) {
+                    images.push((pg.bounds(), img));
+                }
+            }
+            let osp = std::sync::Arc::make_mut(&mut out.spreads[si]);
+            osp.items.clear();
+            for pg in &mut osp.pages {
+                pg.show_parent_items = false;
+            }
+            for (b, img) in images {
+                let it = image_item(&mut out, b, img, lid);
+                let _ = out.insert_item(SpreadRef::Doc(si), it, None);
+                n += 1;
+            }
+            continue;
+        }
+        // Region by region, bottom to top.
+        for (idx, it) in sp.items.iter().enumerate() {
+            if it.hidden || !transparent(it) {
+                continue;
+            }
+            let reach = it.bounds().inflate(
+                designcraft_render::effect_outset(it) + it.stroke.extent() + 1.0,
+                designcraft_render::effect_outset(it) + it.stroke.extent() + 1.0,
+            );
+            // Only the part on the spread's pages and pasteboard that prints.
+            let (w, h) = ((reach.width() * k).ceil().max(1.0) as u32, (reach.height() * k).ceil().max(1.0) as u32);
+            if w as u64 * h as u64 > 80_000_000 {
+                continue;
+            }
+            // The stack up to and including this object.
+            let mut below = d.clone();
+            std::sync::Arc::make_mut(&mut below.spreads[si]).items.truncate(idx + 1);
+            let view = designcraft_geom::Affine::scale(k) * designcraft_geom::Affine::translate((-reach.x0, -reach.y0));
+            let opts = designcraft_render::RenderOptions { printing_only: true, ..Default::default() };
+            let img = rr.render(
+                &below,
+                cache,
+                &[designcraft_render::Placed { spread: SpreadRef::Doc(si), xf: designcraft_geom::Affine::translate(designcraft_geom::Vec2::ZERO) }],
+                (w, h),
+                view,
+                &opts,
+            );
+            let new = image_item(&mut out, reach, img, it.layer);
+            let osp = std::sync::Arc::make_mut(&mut out.spreads[si]);
+            let Some(pos) = osp.items.iter().position(|x| x.id == it.id) else {
+                continue;
+            };
+            if threaded(d, it) {
+                // Keep the frame (its story flows on) under the image.
+                osp.items.insert(pos + 1, std::sync::Arc::new(new));
+            } else {
+                osp.items[pos] = std::sync::Arc::new(new);
+            }
+            n += 1;
+        }
+    }
+    (out, n)
+}
+
+/// A text frame in a story that runs through other frames (replacing it would reflow the story).
+pub(super) fn threaded(d: &designcraft_doc::Document, it: &designcraft_doc::Item) -> bool {
+    it.text_frame().and_then(|t| d.story(t.story)).is_some_and(|st| st.frames.len() > 1)
+}
+
+/// Soft effects other than the gradient feather (which PDF export draws itself).
+fn raster_effects(it: &designcraft_doc::Item) -> bool {
+    let e = &it.effects;
+    e.drop_shadow.on
+        || e.feather > 0.0
+        || e.inner_shadow.on
+        || e.outer_glow.on
+        || e.inner_glow.on
+        || e.bevel.on
+        || e.satin.on
+        || e.directional_feather.on
+}
+
+/// A copy of `d` where spread-level objects with soft effects are 300 ppi images of their whole
+/// appearance (transparent around them, so they composite over what's behind). Objects in `skip`
+/// stay as they are.
+pub(super) fn rasterize_effects(
+    d: &designcraft_doc::Document,
+    cache: &designcraft_compose::Cache,
+    skip: &std::collections::HashMap<designcraft_doc::ItemId, designcraft_pdf::ShadowMask>,
+) -> (Option<designcraft_doc::Document>, usize) {
+    rasterize_where(d, cache, 300.0, true, |it| raster_effects(it) && !threaded(d, it) && !skip.contains_key(&it.id))
+}
+
+/// A drop shadow is the object's only soft effect, and the PDF writer draws its shadow itself
+/// (a leaf object, not a group or a frame with items pasted into it).
+fn shadow_only(it: &designcraft_doc::Item) -> bool {
+    let e = &it.effects;
+    e.drop_shadow.on
+        && !(e.feather > 0.0
+            || e.inner_shadow.on
+            || e.outer_glow.on
+            || e.inner_glow.on
+            || e.bevel.on
+            || e.satin.on
+            || e.directional_feather.on
+            || e.gradient_feather.on)
+        && it.children().is_empty()
+        && !it.has_nested_items()
+}
+
+/// For PDF/X-1a: the coverage of each spread object's soft drop shadow at `ppi`, so the PDF draws
+/// the shadow in its own swatch's inks through a mask (which craft-prepress flattens per ink)
+/// instead of an RGB image of the object. Objects whose only soft effect is the drop shadow.
+///
+/// The coverage comes from the object drawn alone, at full opacity and Normal blending, with its
+/// shadow and without it ([`shadow_coverage`]): the shadow's own alpha, its opacity included. The
+/// object's own opacity and blend mode stay on the object's group in the PDF.
+pub(super) fn shadow_masks(
+    d: &designcraft_doc::Document,
+    cache: &designcraft_compose::Cache,
+    ppi: f64,
+) -> std::collections::HashMap<designcraft_doc::ItemId, designcraft_pdf::ShadowMask> {
+    use designcraft_doc::SpreadRef;
+    let mut out = std::collections::HashMap::new();
+    let todo: Vec<(usize, designcraft_doc::ItemId)> = d
+        .spreads
+        .iter()
+        .enumerate()
+        .flat_map(|(si, sp)| sp.items.iter().filter(|it| !it.hidden && shadow_only(it)).map(move |it| (si, it.id)))
+        .collect();
+    if todo.is_empty() {
+        return out;
+    }
+    let mut rr = designcraft_render::Renderer::new();
+    rr.threads = designcraft_render::default_threads();
+    let k = ppi.clamp(36.0, 1200.0) / 72.0;
+    for (si, id) in todo {
+        let Some(it) = d.item(id) else { continue };
+        let grow = designcraft_render::effect_outset(it) + it.stroke.extent() + 2.0;
+        let reach = it.bounds().inflate(grow, grow);
+        let (w, h) = ((reach.width() * k).ceil().max(1.0), (reach.height() * k).ceil().max(1.0));
+        if !(w.is_finite() && h.is_finite()) || w * h > 60_000_000.0 {
+            continue;
+        }
+        let (w, h) = (w as u32, h as u32);
+        let mut alpha = |shadow: bool| {
+            let mut solo = d.clone();
+            let Some(sp) = solo.spreads.get_mut(si) else { return Vec::new() };
+            let sp = std::sync::Arc::make_mut(sp);
+            sp.items.retain(|x| x.id == id);
+            for pg in &mut sp.pages {
+                pg.show_parent_items = false;
+            }
+            if let Some(x) = sp.items.first_mut() {
+                let x = std::sync::Arc::make_mut(x);
+                x.opacity = 1.0;
+                x.blend = Default::default();
+                x.effects.drop_shadow.on = shadow;
+            }
+            let view = designcraft_geom::Affine::scale(k) * designcraft_geom::Affine::translate((-reach.x0, -reach.y0));
+            let opts = designcraft_render::RenderOptions { paper: false, background: None, printing_only: true, ..Default::default() };
+            let placed = [designcraft_render::Placed { spread: SpreadRef::Doc(si), xf: designcraft_geom::Affine::IDENTITY }];
+            rr.render(&solo, cache, &placed, (w, h), view, &opts).pixels.as_chunks::<4>().0.iter().map(|px| px[3]).collect::<Vec<u8>>()
+        };
+        let (with, without) = (alpha(true), alpha(false));
+        let n = w as usize * h as usize;
+        if with.len() != n || without.len() != n {
+            continue;
+        }
+        let coverage: Vec<u8> = with.iter().zip(&without).map(|(a, b)| shadow_coverage(*a, *b)).collect();
+        out.insert(id, designcraft_pdf::ShadowMask { rect: reach, width: w, height: h, coverage: std::sync::Arc::new(coverage) });
+    }
+    out
+}
+
+/// The shadow's alpha `s` at a pixel where the object alone has alpha `without` and the object
+/// over its shadow `with`: `with = a + s(1 − a)` for the object's alpha `a`, so the PDF, which
+/// draws the object over the shadow, gets the same pixel back. 0 where the object is opaque.
+pub(super) fn shadow_coverage(with: u8, without: u8) -> u8 {
+    let rest = 255 - u32::from(without);
+    if rest == 0 {
+        return 0;
+    }
+    let shown = u32::from(with.saturating_sub(without));
+    u8::try_from(((shown * 255 + rest / 2) / rest).min(255)).unwrap_or(u8::MAX)
+}
+
+/// A copy of `d` where the spread-level objects `pred` picks are images of their appearance at
+/// `ppi` (transparent around them). With `keep_wrap`, each object also stays behind as a
+/// nonprinting [`wrap_stand_in`], so text wraps around it as before.
+pub(super) fn rasterize_where(
+    d: &designcraft_doc::Document,
+    cache: &designcraft_compose::Cache,
+    ppi: f64,
+    keep_wrap: bool,
+    pred: impl Fn(&designcraft_doc::Item) -> bool,
+) -> (Option<designcraft_doc::Document>, usize) {
+    use designcraft_doc::{Asset, AssetId, Content, Graphic, Item, ItemId, Shape, SpreadRef};
+    let todo: Vec<(usize, ItemId)> =
+        d.spreads.iter().enumerate().flat_map(|(si, sp)| sp.items.iter().filter(|it| !it.hidden && pred(it)).map(move |it| (si, it.id))).collect();
+    if todo.is_empty() {
+        return (None, 0);
+    }
+    let mut out = d.clone();
+    let mut rr = designcraft_render::Renderer::new();
+    rr.threads = designcraft_render::default_threads();
+    let k = ppi / 72.0;
+    let mut n = 0;
+    for (si, id) in todo {
+        let Some(it) = d.item(id) else { continue };
+        let reach = it.bounds().inflate(
+            designcraft_render::effect_outset(it) + it.stroke.extent() + 2.0,
+            designcraft_render::effect_outset(it) + it.stroke.extent() + 2.0,
+        );
+        // Just this object on its spread, no paper.
+        let mut solo = d.clone();
+        let sp = std::sync::Arc::make_mut(&mut solo.spreads[si]);
+        sp.items.retain(|x| x.id == id);
+        for pg in &mut sp.pages {
+            pg.show_parent_items = false;
+        }
+        let (w, h) = ((reach.width() * k).ceil().max(1.0) as u32, (reach.height() * k).ceil().max(1.0) as u32);
+        if w as u64 * h as u64 > 60_000_000 {
+            continue;
+        }
+        let view = designcraft_geom::Affine::scale(k) * designcraft_geom::Affine::translate((-reach.x0, -reach.y0));
+        let opts = designcraft_render::RenderOptions { paper: false, background: None, printing_only: true, ..Default::default() };
+        let img = rr.render(
+            &solo,
+            cache,
+            &[designcraft_render::Placed { spread: SpreadRef::Doc(si), xf: designcraft_geom::Affine::translate(designcraft_geom::Vec2::ZERO) }],
+            (w, h),
+            view,
+            &opts,
+        );
+        let aid = AssetId(out.alloc());
+        out.assets.insert(
+            aid,
+            std::sync::Arc::new(Asset {
+                id: aid,
+                name: format!("effects-{}.png", id.0),
+                mime: "image/png".into(),
+                data: std::sync::Arc::new(img.to_png()),
+                pixels: Some((w, h)),
+                ..Default::default()
+            }),
+        );
+        let mut img_item = Item::new(ItemId(out.alloc()), it.layer, Shape::Rectangle, designcraft_geom::shapes::rectangle(reach));
+        img_item.content = Content::Graphic(Graphic {
+            layer_options: None,
+            asset: aid,
+            size: (w as f64, h as f64),
+            xf: designcraft_geom::Affine::translate((reach.x0, reach.y0)) * designcraft_geom::Affine::scale(1.0 / k),
+            clip: None,
+            auto_fit: Default::default(),
+            fit_align: 4,
+            crop: [0.0; 4],
+            wrap: Default::default(),
+            fill: Default::default(),
+        });
+        img_item.stroke.weight = 0.0;
+        img_item.alt_text = it.alt_text.clone();
+        img_item.export_options = it.export_options.clone();
+        // Same place in the stacking order.
+        let osp = std::sync::Arc::make_mut(&mut out.spreads[si]);
+        if let Some(pos) = osp.items.iter().position(|x| x.id == id) {
+            osp.items[pos] = std::sync::Arc::new(img_item);
+            if keep_wrap && has_wrap(it, 0) {
+                osp.items.insert(pos, std::sync::Arc::new(wrap_stand_in(it, 0)));
+            }
+            n += 1;
+        }
+    }
+    (Some(out), n)
+}
+
+/// Whether `it`, its placed graphic or an item in it wraps text.
+fn has_wrap(it: &designcraft_doc::Item, depth: usize) -> bool {
+    use designcraft_doc::{Content, WrapMode};
+    if depth > MAX_STAND_IN_DEPTH {
+        return false;
+    }
+    it.wrap.mode != WrapMode::None
+        || match &it.content {
+            Content::Graphic(g) => g.wrap.mode != WrapMode::None,
+            Content::Group { items } => items.iter().any(|c| has_wrap(c, depth + 1)),
+            _ => false,
+        }
+}
+
+/// Nesting depth past which groups inside a rasterised object keep no wrap stand-ins.
+const MAX_STAND_IN_DEPTH: usize = 64;
+
+/// A nonprinting copy of `it` that keeps its text wrap (and its graphic's and its items') and
+/// nothing else that reaches the PDF: no text, form field, button or media. The image of the
+/// object stands in for all of that, as it does without the copy.
+fn wrap_stand_in(it: &designcraft_doc::Item, depth: usize) -> designcraft_doc::Item {
+    use designcraft_doc::Content;
+    let mut c = it.clone();
+    c.nonprinting = true;
+    c.form_field = None;
+    c.button = None;
+    c.media = None;
+    c.content = match &it.content {
+        Content::Text(_) => Content::Unassigned,
+        Content::Group { items } if depth < MAX_STAND_IN_DEPTH => {
+            Content::Group { items: items.iter().map(|i| std::sync::Arc::new(wrap_stand_in(i, depth + 1))).collect() }
+        }
+        Content::Group { .. } => Content::Group { items: Vec::new() },
+        other => other.clone(),
+    };
+    c
+}
+
+/// A copy of `d` where placed PDFs with Object Layer Options hidden layers are 300 ppi images.
+///
+/// Parent-page and anchored placements count too, including anchors inside table-cell,
+/// footnote and endnote text. Only the export copy is rewritten.
+pub(super) fn rasterize_layered(d: &designcraft_doc::Document) -> Result<(Option<designcraft_doc::Document>, usize)> {
+    let choices: Vec<_> = d
+        .placed_items()
+        .into_iter()
+        .filter(|it| it.has_pdf_layer_override())
+        .filter_map(|it| {
+            let g = it.graphic()?;
+            let a = d.assets.get(&g.asset).filter(|a| designcraft_render::is_pdf(&a.data))?;
+            Some((it.id, g.clone(), a.clone(), it.pdf_hidden_layers.clone()))
+        })
+        .collect();
+    if choices.is_empty() {
+        return Ok((None, 0));
+    }
+    let mut out = d.clone();
+    let mut images = std::collections::HashMap::new();
+    let mut n = 0;
+    for (id, g, a, hidden) in choices {
+        // The whole page at 300 ppi (the graphic may show only a box of it).
+        let shown = designcraft_render::shown_box(&a);
+        let [l, t, r, b] = shown.unwrap_or([0.0, 0.0, 1.0, 1.0]);
+        let page_side = (g.size.0 / (r - l)).max(g.size.1 / (b - t));
+        let side = (page_side * 300.0 / 72.0).clamp(64.0, 8000.0) as u32;
+        let png = designcraft_render::pdf_page_png_options_checked(&a.data, a.page as usize, side, Some(&hidden), shown)
+            .map_err(|e| EngineError::Other(format!("{}: {e}", a.name)))?;
+        let px = designcraft_render::image_size(&png);
+        let aid = designcraft_doc::AssetId(out.alloc());
+        out.assets.insert(
+            aid,
+            std::sync::Arc::new(designcraft_doc::Asset {
+                id: aid,
+                name: format!("{}.png", a.name),
+                mime: "image/png".into(),
+                data: std::sync::Arc::new(png),
+                pixels: px,
+                ..Default::default()
+            }),
+        );
+        images.insert(id, aid);
+        n += 1;
+    }
+    out.update_placed_items(
+        |it| images.contains_key(&it.id),
+        |it| {
+            if let designcraft_doc::Content::Graphic(gg) = &mut it.content
+                && let Some(aid) = images.get(&it.id)
+            {
+                gg.asset = *aid;
+            }
+        },
+    );
+    Ok((Some(out), n))
+}
+
+#[cfg(test)]
+mod placed_layer_tests {
+    use std::sync::Arc;
+
+    use designcraft_doc::{AnchoredObject, Document, Item, ItemId, SpreadRef, StoryId, Table};
+    use designcraft_geom::Rect;
+    use serde_json::json;
+
+    use crate::Session;
+
+    fn two_layer_pdf() -> Vec<u8> {
+        let content = "/OC /a BDC 0 0 1 rg 0 0 50 100 re f EMC /OC /b BDC 1 0 0 rg 50 0 50 100 re f EMC";
+        let objs = [
+            "<</Type/Catalog/Lang(en-GB)/Pages 2 0 R/OCProperties<</OCGs[5 0 R 6 0 R]/D<</Order[5 0 R 6 0 R]/Name(Default)/Locked[5 0 R]>>>>>>"
+                .to_string(),
+            "<</Type/Pages/Kids[3 0 R]/Count 1>>".to_string(),
+            "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<</Properties<</a 5 0 R/b 6 0 R>>>>/Contents 4 0 R>>".to_string(),
+            format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
+            "<</Type/OCG/Name(Blue)>>".to_string(),
+            "<</Type/OCG/Name(Red)>>".to_string(),
+        ];
+        let mut out = b"%PDF-1.7\n".to_vec();
+        let mut offs = Vec::new();
+        for (i, o) in objs.iter().enumerate() {
+            offs.push(out.len());
+            out.extend_from_slice(format!("{} 0 obj\n{}\nendobj\n", i + 1, o).as_bytes());
+        }
+        let x = out.len();
+        let mut t = format!("xref\n0 {}\n0000000000 65535 f\r\n", objs.len() + 1);
+        for o in offs {
+            t.push_str(&format!("{o:010} 00000 n\r\n"));
+        }
+        t.push_str(&format!("trailer\n<</Size {}/Root 1 0 R>>\nstartxref\n{x}\n%%EOF\n", objs.len() + 1));
+        out.extend_from_slice(t.as_bytes());
+        out
+    }
+
+    fn placement<'a>(d: &'a Document, location: &str, id: ItemId, sid: StoryId) -> &'a Item {
+        match location {
+            "cell" => &d.story(sid).unwrap().tables.values().next().unwrap().cells[0].text.objects[0].item,
+            "footnote" => &d.story(sid).unwrap().notes[0].text.objects[0].item,
+            "endnote" => &d.story(sid).unwrap().endnotes[0].text.objects[0].item,
+            "anchor" => &d.story(sid).unwrap().objects[0].item,
+            _ => d.item(id).unwrap(),
+        }
+    }
+
+    #[test]
+    fn stale_layer_fields_on_non_pdf_placements_do_not_block_pdf_a() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let result = s
+            .execute(
+                "file.place",
+                &json!({
+                    "base64": crate::cmd::file::base64_encode(&two_layer_pdf()), "name": "layers.pdf",
+                }),
+            )
+            .unwrap();
+        let id = ItemId(result["id"].as_u64().unwrap());
+        s.execute("object.layerOptions", &json!({"ids": [id.0], "hidden": ["Blue"]})).unwrap();
+        // Relinking to an ordinary image can leave legacy fields on the placement.
+        // They are not an actionable placed-PDF override and must not fail closed.
+        let d = Arc::make_mut(&mut s.doc_mut().unwrap().doc);
+        let aid = d.item(id).unwrap().graphic().unwrap().asset;
+        let asset = Arc::make_mut(d.assets.get_mut(&aid).unwrap());
+        asset.mime = "image/png".into();
+        asset.data = Arc::new(designcraft_render::Rendered { width: 1, height: 1, pixels: vec![0, 0, 0, 0] }.to_png());
+        let (copy, count) = super::rasterize_layered(d).unwrap();
+        assert_eq!(count, 0);
+        assert!(copy.is_none());
+        s.execute("file.exportPdf", &json!({"standard": "a2b"})).unwrap();
+    }
+
+    fn check_placement(location: &str) {
+        for all_on in [false, true] {
+            check_choice(location, all_on);
+        }
+    }
+
+    fn check_choice(location: &str, all_on: bool) {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 100, "height": 100, "pages": 1})).unwrap();
+        let placed = s
+            .execute(
+                "file.place",
+                &json!({
+                    "base64": crate::cmd::file::base64_encode(&two_layer_pdf()), "name": "layers.pdf",
+                    "x": 0, "y": 0, "width": 100,
+                    "spread": {"kind": if location == "parent" { "parent" } else { "doc" }, "index": 0}
+                }),
+            )
+            .unwrap();
+        let id = ItemId(placed["id"].as_u64().unwrap());
+        let hidden = if all_on { vec![] } else { vec!["Blue"] };
+        s.execute("object.layerOptions", &json!({"ids": [id.0], "hidden": hidden, "useDefaults": false})).unwrap();
+        let sid = {
+            let d = Arc::make_mut(&mut s.doc_mut().unwrap().doc);
+            let layer = d.default_layer();
+            let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 0.0, 80.0, 80.0), layer, "Body", Default::default()).unwrap();
+            if !matches!(location, "doc" | "parent") {
+                let item = (**d.spreads[0].items.iter().find(|it| it.id == id).unwrap()).clone();
+                Arc::make_mut(&mut d.spreads[0]).items.retain(|it| it.id != id);
+                let object = AnchoredObject { item, position: Default::default() };
+                let story = d.story_mut(sid).unwrap();
+                match location {
+                    "cell" => {
+                        let mut table = Table::new(1, 1, 1, 0, 0, 20.0);
+                        table.cells[0].text.insert_object(0, object);
+                        story.insert_table(0, table);
+                    }
+                    "footnote" => {
+                        story.insert_note(0, "Note", Default::default()).unwrap();
+                        Arc::make_mut(&mut story.notes[0]).text.insert_object(0, object);
+                    }
+                    "endnote" => {
+                        story.insert_endnote(0, "Endnote", Default::default()).unwrap();
+                        Arc::make_mut(&mut story.endnotes[0]).text.insert_object(0, object);
+                    }
+                    "anchor" => story.insert_object(0, object),
+                    _ => assert!(matches!(location, "doc" | "parent")),
+                }
+            }
+            sid
+        };
+        // Exercise the real export command for each location, not just the traversal helper.
+        let result = s.execute("file.exportPdf", &json!({"standard": "a2b"})).unwrap();
+        assert!(
+            result["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("1 placed PDF(s)")),
+            "{location}: {}",
+            result["warnings"]
+        );
+        // Check the rewritten placement, including its pixels. Counting a placement without
+        // updating the nested object would still export the file's default layer visibility.
+        let source = &s.doc().unwrap().doc;
+        let (copy, count) = super::rasterize_layered(source).unwrap();
+        assert_eq!(count, 1, "{location}");
+        let copy = copy.unwrap();
+        let item = placement(&copy, location, id, sid);
+        let asset = &copy.assets[&item.graphic().unwrap().asset];
+        assert_eq!(asset.mime, "image/png", "{location}");
+        let image = designcraft_render::images::decoded(&asset.data, 0);
+        let image = image.unwrap();
+        let pixel = image.data()[usize::from(image.height()) / 2 * usize::from(image.width()) + usize::from(image.width()) / 4];
+        assert_eq!(pixel.a, if all_on { 255 } else { 0 }, "Blue visibility at {location}, all_on={all_on}");
+        // Export preparation must not change the open document's placement or source asset.
+        let original = placement(source, location, id, sid);
+        assert_eq!(original.pdf_hidden_layers, hidden);
+        assert!(original.pdf_layer_override);
+        assert_eq!(source.assets[&original.graphic().unwrap().asset].mime, "application/pdf");
+    }
+
+    #[test]
+    fn layered_pdf_a_document_placement() {
+        check_placement("doc");
+    }
+    #[test]
+    fn layered_pdf_a_parent_placement() {
+        check_placement("parent");
+    }
+    #[test]
+    fn layered_pdf_a_story_anchor() {
+        check_placement("anchor");
+    }
+    #[test]
+    fn layered_pdf_a_table_cell_anchor() {
+        check_placement("cell");
+    }
+    #[test]
+    fn layered_pdf_a_footnote_anchor() {
+        check_placement("footnote");
+    }
+    #[test]
+    fn layered_pdf_a_endnote_anchor() {
+        check_placement("endnote");
+    }
+}
diff --git a/crates/engine/src/cmd/export/formats.rs b/crates/engine/src/cmd/export/formats.rs
new file mode 100644
index 000000000..31885bee2
--- /dev/null
+++ b/crates/engine/src/cmd/export/formats.rs
@@ -0,0 +1,413 @@
+use super::flatten::{rasterize_where, threaded};
+use super::pdf::pages_param;
+use super::{Arc, Cow, EngineError, Result, Session, Value, bad, json, str_param};
+
+pub(super) fn print_booklet(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "file.printBooklet";
+    let kind = match str_param(p, "type").unwrap_or("saddleStitch") {
+        "saddleStitch" => designcraft_pdf::BookletKind::SaddleStitch,
+        "twoUpConsecutive" | "twoUp" => designcraft_pdf::BookletKind::TwoUpConsecutive,
+        t => {
+            return Err(bad(ID, format!("unknown type `{t}` (saddleStitch, twoUpConsecutive)")));
+        }
+    };
+    let opts = designcraft_pdf::BookletOptions { kind, space_between: p.get("spaceBetween").and_then(Value::as_f64).unwrap_or(0.0), title: None };
+    let st = s.doc()?;
+    let r = designcraft_pdf::export_booklet(&crate::cmd::interchange::with_pdf_boxes(&st.doc), &s.cache, &opts)
+        .map_err(|e| EngineError::Other(e.to_string()))?;
+    match str_param(p, "path") {
+        Some(path) => {
+            #[cfg(not(target_arch = "wasm32"))]
+            crate::io::write_file(path, &r.bytes).map_err(EngineError::Other)?;
+            Ok(json!({"path": path, "bytes": r.bytes.len(), "sheets": r.pages, "warnings": r.warnings}))
+        }
+        None => Ok(json!({"base64": crate::cmd::file::base64_encode(&r.bytes), "bytes": r.bytes.len(), "sheets": r.pages, "warnings": r.warnings})),
+    }
+}
+
+/// HTML and reflowable EPUB embed the EPS preview; keep the session's source bytes intact.
+fn eps_previews(d: &designcraft_doc::Document) -> (Cow<'_, designcraft_doc::Document>, Vec<String>) {
+    // Match the exporter's reading order (including Article exclusions), not every asset
+    // in the document: unused or hidden graphics must not prevent an export.
+    let mut used = std::collections::BTreeSet::new();
+    for block in designcraft_epub::reading_order(d) {
+        let designcraft_epub::Block::Image(id) = block else {
+            continue;
+        };
+        let Some(it) = d.item(id) else { continue };
+        let designcraft_doc::Content::Graphic(g) = &it.content else {
+            continue;
+        };
+        used.insert(g.asset);
+        if d.assets.get(&g.asset).is_some_and(|a| designcraft_doc::media_kind(&a.mime).is_some())
+            && let Some(poster) = it.media.as_ref().and_then(|m| m.poster)
+        {
+            used.insert(poster);
+        }
+    }
+    let mut out = Cow::Borrowed(d);
+    let mut warnings = Vec::new();
+    for id in used {
+        let Some(a) = d.assets.get(&id).filter(|a| designcraft_images::is_eps(&a.data)) else {
+            continue;
+        };
+        let png = designcraft_images::eps_png(&a.data);
+        if png.is_none() {
+            warnings.push(format!("{}: unusable EPS preview; graphic omitted", a.name));
+        }
+        if let Some(a) = out.to_mut().assets.get_mut(&id) {
+            let a = Arc::make_mut(a);
+            a.mime = "image/png".into();
+            a.data = Arc::new(png.unwrap_or_default());
+        }
+    }
+    (out, warnings)
+}
+
+pub(super) fn export_html(s: &mut Session, p: &Value) -> Result<Value> {
+    let st = s.doc()?;
+    let opts = designcraft_epub::HtmlOptions {
+        title: str_param(p, "title").map(str::to_string),
+        language: str_param(p, "language").map(str::to_string),
+        generic_families: generic_families(&st.doc),
+    };
+    let (doc, warnings) = eps_previews(&st.doc);
+    let text = designcraft_epub::export_html(&doc, &opts);
+    match str_param(p, "path") {
+        Some(path) => {
+            #[cfg(not(target_arch = "wasm32"))]
+            crate::io::write_file(path, text.as_bytes()).map_err(EngineError::Other)?;
+            Ok(json!({"path": path, "bytes": text.len(), "warnings": warnings}))
+        }
+        None => Ok(json!({"bytes": text.len(), "text": text, "warnings": warnings})),
+    }
+}
+
+pub(super) fn export_pptx(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "file.exportPptx";
+    let st = s.doc()?;
+    let line_breaks = match str_param(p, "lineBreaks") {
+        None | Some("keep") => designcraft_pptx::LineBreaks::Keep,
+        Some("reflow") => designcraft_pptx::LineBreaks::Reflow,
+        Some(x) => return Err(bad(ID, format!("unknown lineBreaks `{x}` (keep, reflow)"))),
+    };
+    let opts = designcraft_pptx::PptxOptions {
+        pages: pages_param(ID, p, st.doc.page_count())?,
+        line_breaks,
+        title: str_param(p, "title").map(str::to_string),
+        author: str_param(p, "author").map(str::to_string),
+        created: None,
+        embed_fonts: p.get("embedFonts").and_then(Value::as_bool).unwrap_or(true),
+    };
+    // Object Export Options › Rasterize, and what PowerPoint has no objects for (a threaded frame
+    // stays text: a picture of it would drop the rest of its story).
+    let auto = p.get("rasterize").and_then(Value::as_bool).unwrap_or(true);
+    let (raster, rasterized) = rasterize_where(&st.doc, &s.cache, 300.0, true, |it| {
+        !threaded(&st.doc, it) && (it.export_options.rasterize || (auto && designcraft_pptx::needs_raster(&st.doc, it)))
+    });
+    let doc: &designcraft_doc::Document = raster.as_ref().unwrap_or(&st.doc);
+    let mut r = designcraft_pptx::export_pptx(doc, &s.cache, &opts).map_err(|e| EngineError::Other(e.to_string()))?;
+    if rasterized > 0 {
+        r.warnings.push(format!("{rasterized} object(s) went in as images"));
+    }
+    match str_param(p, "path") {
+        Some(path) => {
+            #[cfg(not(target_arch = "wasm32"))]
+            crate::io::write_file(path, &r.bytes).map_err(EngineError::Other)?;
+            Ok(json!({"path": path, "bytes": r.bytes.len(), "slides": r.slides, "warnings": r.warnings}))
+        }
+        None => Ok(json!({"base64": crate::cmd::file::base64_encode(&r.bytes), "bytes": r.bytes.len(), "slides": r.slides, "warnings": r.warnings})),
+    }
+}
+
+pub(super) fn has_story_target(s: &Session) -> std::result::Result<(), String> {
+    crate::cmd::text::story_of(s, &Value::Null).map(|_| ()).ok_or_else(|| "edit text or select a text frame".into())
+}
+
+pub(super) fn export_text(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "file.exportText";
+    let sid = crate::cmd::text::story_of(s, p).ok_or_else(|| bad(ID, "edit text or select a text frame"))?;
+    let doc = &s.doc()?.doc;
+    let story = doc.stories.get(&sid).ok_or_else(|| bad(ID, format!("no story {}", sid.0)))?;
+    let path = str_param(p, "path");
+    let format = match str_param(p, "format") {
+        Some(f @ ("rtf" | "tagged")) => f,
+        Some("txt") | Some("text") => "txt",
+        Some(f) => return Err(bad(ID, format!("unknown format `{f}` (txt, rtf, tagged)"))),
+        None if path.is_some_and(|x| x.to_ascii_lowercase().ends_with(".rtf")) => "rtf",
+        None => "txt",
+    };
+    let text = match format {
+        "rtf" => designcraft_textimport::export::rtf(doc, story),
+        "tagged" => designcraft_textimport::tagged::tagged_text(doc, story),
+        _ => designcraft_textimport::export::plain_text(story),
+    };
+    match path {
+        Some(path) => {
+            #[cfg(not(target_arch = "wasm32"))]
+            crate::io::write_file(path, text.as_bytes()).map_err(EngineError::Other)?;
+            Ok(json!({"path": path, "bytes": text.len()}))
+        }
+        None => Ok(json!({"bytes": text.len(), "text": text})),
+    }
+}
+
+/// Text of the frames on page `abs`, in line order (for fixed-layout pages).
+fn page_text(d: &designcraft_doc::Document, cache: &designcraft_compose::Cache, abs: usize) -> String {
+    let mut out = String::new();
+    for st in d.stories.values() {
+        let cs = cache.get(d, st.id, None);
+        for ft in &cs.frames {
+            if d.page_of_item(ft.frame) != Some(abs) {
+                continue;
+            }
+            for l in &ft.lines {
+                let r = l.range.start.min(st.text.len())..l.range.end.min(st.text.len());
+                let t: String = st.text[r].chars().filter(|c| !('\u{E000}'..='\u{F8FF}').contains(c)).collect();
+                if !t.trim().is_empty() {
+                    out.push_str(t.trim_end_matches('\n'));
+                    out.push('\n');
+                }
+            }
+        }
+    }
+    out
+}
+
+/// The CSS generic family of each font family the EPUB/HTML stylesheet names, from the fonts'
+/// classification (PANOSE, OS/2 class, name), for the `font-family` fallbacks.
+fn generic_families(d: &designcraft_doc::Document) -> std::collections::BTreeMap<String, String> {
+    use designcraft_fonts::FontClass;
+    let db = designcraft_fonts::FontDb::global().scoped(d.font_scope);
+    let mut out = std::collections::BTreeMap::new();
+    for (family, _) in designcraft_epub::stylesheet_fonts(d) {
+        if out.contains_key(&family) {
+            continue;
+        }
+        let generic = match db.family_kind(&family).map(|(k, _)| k.class) {
+            Some(FontClass::Serif | FontClass::SlabSerif) => "serif",
+            Some(FontClass::SansSerif) => "sans-serif",
+            Some(FontClass::Monospaced) => "monospace",
+            Some(FontClass::Script) => "cursive",
+            Some(FontClass::Decorative) => "fantasy",
+            Some(FontClass::Symbol | FontClass::Other) | None => continue,
+        };
+        out.insert(family, generic.to_string());
+    }
+    out
+}
+
+/// The faces the EPUB stylesheet names, to package with it; `warnings` gets the ones left out
+/// (not available, a licence that forbids embedding, or part of a font collection).
+fn embedded_fonts(d: &designcraft_doc::Document, warnings: &mut Vec<String>) -> Vec<designcraft_epub::EmbeddedFont> {
+    let db = designcraft_fonts::FontDb::global().scoped(d.font_scope);
+    let mut out = Vec::new();
+    for (family, style) in designcraft_epub::stylesheet_fonts(d) {
+        let face = db.face(&family, &style);
+        if !face.family.eq_ignore_ascii_case(&family) {
+            warnings.push(format!("font `{family} {style}` is not available; not embedded"));
+        } else if face.restricted_licence() || face.bitmap_only() {
+            warnings.push(format!("font `{family} {style}`: its licence doesn't allow embedding; not embedded"));
+        } else if face.data().starts_with(b"ttcf") {
+            warnings.push(format!("font `{family} {style}` is part of a font collection; not embedded"));
+        } else {
+            out.push(designcraft_epub::EmbeddedFont { family, style: face.style.clone(), data: face.data().to_vec() });
+        }
+    }
+    out
+}
+
+/// A Split Document setting (`"off"`, `"exportTags"` or `{"style": name}`), naming a paragraph
+/// style the document has.
+pub(crate) fn epub_split_param(id: &str, doc: &designcraft_doc::Document, v: &Value) -> Result<designcraft_doc::EpubSplit> {
+    let split: designcraft_doc::EpubSplit =
+        serde_json::from_value(v.clone()).map_err(|_| bad(id, "`split`: \"off\", \"exportTags\" or {\"style\": name}"))?;
+    if let designcraft_doc::EpubSplit::Style(name) = &split
+        && doc.styles.para(name).is_none()
+    {
+        return Err(bad(id, format!("no paragraph style `{name}`")));
+    }
+    Ok(split)
+}
+
+pub(super) fn export_epub(s: &mut Session, p: &Value) -> Result<Value> {
+    let st = s.doc()?;
+    let split = p.get("split").map(|v| epub_split_param("file.exportEpub", &st.doc, v)).transpose()?;
+    // Object Export Options › Rasterize: those objects go in as images.
+    let (raster, _) = rasterize_where(&st.doc, &s.cache, 144.0, false, |it| it.export_options.rasterize && !threaded(&st.doc, it));
+    let epub_doc: &designcraft_doc::Document = raster.as_ref().unwrap_or(&st.doc);
+    let fixed = p.get("fixedLayout").and_then(Value::as_bool).unwrap_or(false);
+    let want_cover = p.get("cover").and_then(Value::as_bool).unwrap_or(false);
+    let mut rr = designcraft_render::Renderer::new();
+    rr.threads = designcraft_render::default_threads();
+    let ropts = designcraft_render::RenderOptions { printing_only: true, ..Default::default() };
+    let mut warnings: Vec<String> = Vec::new();
+    // A cover image file (PNG or JPEG), else the first page rendered when `cover` asks for it.
+    let cover = match p.get("coverImage").and_then(Value::as_str).filter(|_| !fixed) {
+        Some(path) => {
+            Some(crate::cmd::datamerge::read_path_capped(path, crate::cmd::datamerge::MAX_IMAGE_FILE_BYTES).map_err(crate::EngineError::Other)?)
+        }
+        None => (want_cover && !fixed).then(|| rr.render_page(&st.doc, &s.cache, 0, 2.0, false, &ropts).map(|img| img.to_png())).flatten(),
+    };
+    if let Some(c) = &cover
+        && !(c.starts_with(b"\x89PNG") || c.starts_with(&[0xFF, 0xD8, 0xFF]))
+    {
+        return Err(crate::EngineError::Other("the cover image must be a PNG or JPEG file".into()));
+    }
+    let opts = designcraft_epub::EpubOptions {
+        title: p.get("title").and_then(Value::as_str).map(str::to_string),
+        author: p.get("author").and_then(Value::as_str).map(str::to_string),
+        language: p.get("language").and_then(Value::as_str).unwrap_or("en").to_string(),
+        identifier: p.get("identifier").and_then(Value::as_str).map(str::to_string),
+        cover,
+        toc_title: p.get("tocTitle").and_then(Value::as_str).map(str::to_string),
+        split,
+        generic_families: generic_families(&st.doc),
+        fonts: if p.get("embedFonts").and_then(Value::as_bool).unwrap_or(false) && !fixed {
+            embedded_fonts(&st.doc, &mut warnings)
+        } else {
+            Vec::new()
+        },
+        // The export time; on the web the document's own save time stands in.
+        #[cfg(not(target_arch = "wasm32"))]
+        modified: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).ok().and_then(|d| i64::try_from(d.as_secs()).ok()),
+        #[cfg(target_arch = "wasm32")]
+        modified: None,
+    };
+    if fixed {
+        let d = &st.doc;
+        let mut pages = Vec::new();
+        for i in 0..d.page_count() {
+            let Some((si, pi)) = d.page_loc(i) else {
+                continue;
+            };
+            let b = d.spreads[si].pages[pi].bounds();
+            let Some(img) = rr.render_page(d, &s.cache, i, 2.0, false, &ropts) else {
+                continue;
+            };
+            pages.push(designcraft_epub::FixedPage { png: img.to_png(), width: b.width(), height: b.height(), text: page_text(d, &s.cache, i) });
+        }
+        let bytes = designcraft_epub::export_fixed_epub(d, &pages, &opts).map_err(|e| crate::EngineError::Other(e.to_string()))?;
+        return match p.get("path").and_then(Value::as_str) {
+            Some(path) => {
+                write_file(path, &bytes)?;
+                Ok(serde_json::json!({"path": path, "bytes": bytes.len(), "pages": pages.len()}))
+            }
+            None => Ok(serde_json::json!({"base64": crate::cmd::base64_encode(&bytes), "bytes": bytes.len(), "pages": pages.len()})),
+        };
+    }
+    let (epub_doc, eps_warnings) = eps_previews(epub_doc);
+    warnings.extend(eps_warnings);
+    let bytes = designcraft_epub::export_epub(&epub_doc, &opts).map_err(|e| crate::EngineError::Other(e.to_string()))?;
+    warnings.extend(
+        designcraft_epub::images_without_alt(&epub_doc)
+            .into_iter()
+            .map(|name| format!("{name}: no alt text (Object Export Options); exported as decorative (alt=\"\")")),
+    );
+    match p.get("path").and_then(Value::as_str) {
+        Some(path) => {
+            #[cfg(not(target_arch = "wasm32"))]
+            crate::io::write_file(path, &bytes).map_err(crate::EngineError::Other)?;
+            Ok(serde_json::json!({"path": path, "bytes": bytes.len(), "warnings": warnings}))
+        }
+        None => Ok(serde_json::json!({"base64": crate::cmd::file::base64_encode(&bytes), "bytes": bytes.len(), "warnings": warnings})),
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) fn write_file(path: &str, bytes: &[u8]) -> Result<()> {
+    crate::io::write_file(path, bytes).map_err(EngineError::Other)
+}
+
+#[cfg(target_arch = "wasm32")]
+pub(super) fn write_file(path: &str, _bytes: &[u8]) -> Result<()> {
+    Err(EngineError::Other(format!("{path}: no file system on the web; omit `path` to get the bytes")))
+}
+
+#[cfg(test)]
+mod booklet_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn booklet_imposes_pages_in_pairs() {
+        use designcraft_pdf::{BookletKind, booklet_pairs};
+        assert_eq!(booklet_pairs(8, BookletKind::SaddleStitch), [(Some(7), Some(0)), (Some(1), Some(6)), (Some(5), Some(2)), (Some(3), Some(4))]);
+        assert_eq!(booklet_pairs(6, BookletKind::SaddleStitch)[0], (None, Some(0)), "padded with blanks");
+        assert_eq!(booklet_pairs(3, BookletKind::TwoUpConsecutive), [(Some(0), Some(1)), (Some(2), None)]);
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 4})).unwrap();
+        let r = s.execute("file.printBooklet", &json!({"spaceBetween": 18})).unwrap();
+        assert_eq!(r["sheets"], 2);
+        let pdf = String::from_utf8_lossy(&crate::cmd::file::base64_decode(r["base64"].as_str().unwrap())).into_owned();
+        let mb = pdf.find("/MediaBox").map(|i| pdf[i..i + 40].to_string()).unwrap_or_default();
+        assert!(mb.contains("1242"), "two 612 pt pages and an 18 pt gap: {mb}");
+        assert!(s.execute("file.printBooklet", &json!({"type": "perfectBound"})).is_err());
+        // Page 1's black box lands on the right half of the first sheet (page 4 is on the left).
+        let id = s.execute("frame.create", &json!({"rect": [100, 100, 300, 300]})).unwrap()["id"].clone();
+        s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [id]})).unwrap();
+        let r = s.execute("file.printBooklet", &json!({})).unwrap();
+        let bytes = crate::cmd::file::base64_decode(r["base64"].as_str().unwrap());
+        let px = designcraft_render::decode_pixmap_page(&bytes, 0).expect("rasterised");
+        let (w, h) = (px.width() as f64, px.height() as f64);
+        let at = |x: f64, y: f64| px.sample((x / 1224.0 * w) as u16, (y / 792.0 * h) as u16);
+        let (ink, blank) = (at(612.0 + 200.0, 200.0), at(200.0, 200.0));
+        assert!(ink.a > 200 && ink.r < 60, "right half has page 1: {ink:?}");
+        assert!(blank.a < 30 || blank.r > 200, "left half (page 4) is empty: {blank:?}");
+    }
+}
+
+#[cfg(test)]
+mod pptx_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    fn unzip(b64: &str) -> zip::ZipArchive<std::io::Cursor<Vec<u8>>> {
+        zip::ZipArchive::new(std::io::Cursor::new(crate::cmd::file::base64_decode(b64))).unwrap()
+    }
+
+    fn read(z: &mut zip::ZipArchive<std::io::Cursor<Vec<u8>>>, name: &str) -> String {
+        let mut s = String::new();
+        std::io::Read::read_to_string(&mut z.by_name(name).unwrap(), &mut s).unwrap();
+        s
+    }
+
+    #[test]
+    fn sample_exports_editable_slides() {
+        let mut s = Session::new();
+        s.execute("file.newSample", &json!({})).unwrap();
+        let r = s.execute("file.exportPptx", &json!({})).unwrap();
+        assert_eq!(r["slides"], 4);
+        let mut z = unzip(r["base64"].as_str().unwrap());
+        // The swatch table is a PowerPoint table; the cover picture is embedded; text is text.
+        assert!(read(&mut z, "ppt/slides/slide4.xml").contains("<a:tbl>"));
+        assert!(read(&mut z, "ppt/slides/slide1.xml").contains("<p:pic>"));
+        let text: String = read(&mut z, "ppt/slides/slide2.xml").split("<a:t>").skip(1).filter_map(|t| t.split("</a:t>").next()).collect();
+        assert!(text.contains("Notes on the Grid"), "{text}");
+        assert!(read(&mut z, "ppt/presentation.xml").contains("<p:embeddedFontLst>"));
+
+        let r = s.execute("file.exportPptx", &json!({"pages": "2-3", "embedFonts": false, "lineBreaks": "reflow"})).unwrap();
+        assert_eq!(r["slides"], 2);
+        assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("fonts are not embedded")));
+        assert!(s.execute("file.exportPptx", &json!({"lineBreaks": "wrap"})).is_err());
+        assert!(s.execute("file.exportPptx", &json!({"pages": [9]})).is_err());
+    }
+
+    #[test]
+    fn rasterize_option_places_a_picture() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 200, 200], "shape": "ellipse"})).unwrap();
+        s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [r["id"]]})).unwrap();
+        let shapes = |s: &mut Session| {
+            let r = s.execute("file.exportPptx", &json!({})).unwrap();
+            read(&mut unzip(r["base64"].as_str().unwrap()), "ppt/slides/slide1.xml")
+        };
+        assert!(shapes(&mut s).contains("prst=\"ellipse\""));
+        s.execute("object.exportOptions", &json!({"ids": [r["id"]], "rasterize": true})).unwrap();
+        let x = shapes(&mut s);
+        assert!(x.contains("<p:pic>") && !x.contains("prst=\"ellipse\""), "{x}");
+    }
+}
diff --git a/crates/engine/src/cmd/export/pdf.rs b/crates/engine/src/cmd/export/pdf.rs
new file mode 100644
index 000000000..903639ff9
--- /dev/null
+++ b/crates/engine/src/cmd/export/pdf.rs
@@ -0,0 +1,463 @@
+use super::flatten::{flatten, rasterize_effects, rasterize_layered, shadow_masks, transparent};
+use super::formats::write_file;
+use super::{EngineError, Marks, PdfOptions, Result, Session, Standard, Value, bad, json, str_param};
+
+/// The `pages` parameter: a range string ("1-3,5"), a list or a number of 1-based positions.
+pub(super) fn pages_param(id: &str, p: &Value, page_count: usize) -> Result<Option<Vec<usize>>> {
+    Ok(match p.get("pages") {
+        None | Some(Value::Null) => None,
+        Some(Value::String(s)) => Some(designcraft_pdf::parse_page_range(s, page_count).map_err(|e| bad(id, e.to_string()))?),
+        Some(Value::Array(a)) => {
+            let mut v = Vec::new();
+            for x in a {
+                let n = x
+                    .as_u64()
+                    .and_then(|n| usize::try_from(n).ok())
+                    .filter(|n| *n >= 1 && *n <= page_count)
+                    .ok_or_else(|| bad(id, format!("bad page {x}")))?;
+                // A page named twice is one page, as `"2,2"` already is: the list says which
+                // pages to export, not how many times. `[2, 2]` exported two copies of page 2
+                // while `"2,2"` exported one.
+                if !v.contains(&(n - 1)) {
+                    v.push(n - 1);
+                }
+            }
+            Some(v)
+        }
+        Some(Value::Number(n)) => {
+            let n = n
+                .as_u64()
+                .and_then(|n| usize::try_from(n).ok())
+                .filter(|n| *n >= 1 && *n <= page_count)
+                .ok_or_else(|| bad(id, format!("bad page {n}")))?;
+            Some(vec![n - 1])
+        }
+        Some(v) => return Err(bad(id, format!("bad `pages`: {v}"))),
+    })
+}
+
+pub(crate) fn options(p: &Value, page_count: usize) -> Result<PdfOptions> {
+    const ID: &str = "file.exportPdf";
+
+    let pages = pages_param(ID, p, page_count)?;
+    let spreads = p.get("spreads").and_then(Value::as_bool).unwrap_or(false);
+    let bleed = p.get("bleed").and_then(Value::as_bool).unwrap_or(false);
+    let marks = match p.get("marks") {
+        Some(Value::Bool(true)) => Marks::ALL,
+        Some(Value::Object(m)) => {
+            let b = |k: &str| m.get(k).and_then(Value::as_bool).unwrap_or(false);
+            Marks {
+                crop: b("crop"),
+                bleed: b("bleed"),
+                page_info: b("pageInfo"),
+                weight: m.get("weight").and_then(Value::as_f64).unwrap_or(0.25),
+                offset: m.get("offset").and_then(Value::as_f64).unwrap_or(6.0),
+            }
+        }
+        _ => Marks::NONE,
+    };
+    let standard = match str_param(p, "standard") {
+        Some(s) => Standard::parse(s).ok_or_else(|| bad(ID, format!("unknown standard `{s}` (none, x4, x1a, a2b)")))?,
+        None => Standard::None,
+    };
+    let created = match p.get("created") {
+        None | Some(Value::Null) => None,
+        Some(v) => Some(v.as_i64().ok_or_else(|| bad(ID, "`created`: Unix seconds, an integer"))?),
+    };
+    Ok(PdfOptions {
+        pages,
+        spreads,
+        bleed,
+        marks,
+        standard,
+        compress_images: p.get("compressImages").and_then(Value::as_bool).unwrap_or(false),
+        title: str_param(p, "title").map(str::to_string),
+        author: str_param(p, "author").map(str::to_string),
+        tagged: p.get("tagged").and_then(Value::as_bool).unwrap_or(false),
+        media: p.get("media").and_then(Value::as_bool).unwrap_or(false),
+        created,
+        ..PdfOptions::default()
+    })
+}
+
+/// Object number of the first page of a PDF (its page tree's first kid).
+fn first_page_ref(pdf: &[u8]) -> Option<usize> {
+    let s = String::from_utf8_lossy(pdf);
+    let i = s.find("/Kids[")? + 6;
+    s[i..].split_whitespace().next()?.parse().ok()
+}
+
+pub(super) fn export_pdf(s: &mut Session, p: &Value) -> Result<Value> {
+    let r = pdf_export(s, p)?;
+    match str_param(p, "path") {
+        Some(path) => {
+            write_file(path, &r.bytes)?;
+            Ok(json!({"path": path, "bytes": r.bytes.len(), "pages": r.pages, "warnings": r.warnings}))
+        }
+        None => Ok(json!({"base64": crate::cmd::base64_encode(&r.bytes), "bytes": r.bytes.len(), "pages": r.pages, "warnings": r.warnings})),
+    }
+}
+
+/// Transparency Flattener presets (`flatten`): High / Medium / Low Resolution, or a ppi.
+pub(crate) fn flatten_ppi(id: &str, p: &Value) -> Result<Option<f64>> {
+    Ok(match p.get("flatten") {
+        None | Some(Value::Null) | Some(Value::Bool(false)) => None,
+        Some(Value::String(s)) if s == "high" => Some(300.0),
+        Some(Value::String(s)) if s == "medium" => Some(150.0),
+        Some(Value::String(s)) if s == "low" => Some(72.0),
+        Some(Value::Bool(true)) => Some(300.0),
+        Some(v) => Some(v.as_f64().filter(|v| (36.0..=1200.0).contains(v)).ok_or_else(|| bad(id, "`flatten`: high|medium|low or 36–1200 ppi"))?),
+    })
+}
+
+/// The print PDF of `opts`' pages: the transparency flattener at `ppi` (if any), placed PDFs
+/// with hidden layers and soft effects as images, the PDF boxes of placed graphics, the PDF
+/// itself and its transparency blend space. Export PDF and File › Print add their view options
+/// to it ([`pdf_export`]); Separations Preview separates it as it is.
+pub(crate) fn print_pdf(
+    d: &designcraft_doc::Document,
+    cache: &designcraft_compose::Cache,
+    opts: &PdfOptions,
+    ppi: Option<f64>,
+) -> Result<designcraft_pdf::ExportReport> {
+    // PDF/X-1a: craft-prepress flattens the PDF in its inks; `ppi` sets its resolution.
+    let x1a = opts.standard == Standard::PdfX1a;
+    let mut opts = opts.clone();
+    if x1a {
+        opts.flatten_dpi = ppi.unwrap_or(300.0) as f32;
+    }
+    let flattened = if x1a { None } else { ppi.map(|ppi| flatten(d, cache, ppi)) };
+    let base: &designcraft_doc::Document = flattened.as_ref().map_or(d, |f| &f.0);
+    let (layered, layer_count) = if opts.standard == Standard::PdfA2b { rasterize_layered(base)? } else { (None, 0) };
+    let base2: &designcraft_doc::Document = layered.as_ref().unwrap_or(base);
+    let shadows = if x1a { shadow_masks(base2, cache, f64::from(opts.flatten_dpi)) } else { Default::default() };
+    let (fx_doc, fx_count) = rasterize_effects(base2, cache, &shadows);
+    opts.shadows = std::sync::Arc::new(shadows);
+    let opts = &opts;
+    let doc: &designcraft_doc::Document = fx_doc.as_ref().unwrap_or(base2);
+    let boxed = crate::cmd::interchange::with_pdf_boxes(doc);
+    let doc: &designcraft_doc::Document = &boxed;
+    let mut r = designcraft_pdf::export_pdf_with_report(doc, cache, opts).map_err(|e| EngineError::Other(e.to_string()))?;
+    // Flattening and effect rasterization replace placements, so inspect the source too.
+    if d.has_graphic_layer_visibility_overrides() && !r.warnings.iter().any(|w| w == designcraft_doc::GRAPHIC_LAYER_RENDERING_WARNING) {
+        r.warnings.push(designcraft_doc::GRAPHIC_LAYER_RENDERING_WARNING.into());
+    }
+    // Transparency Blend Space: the page group of pages with transparency. CMYK print output
+    // gets its CMYK page groups from the writer.
+    let spreads = designcraft_pdf::sheet_spreads(doc, opts);
+    let blended: Vec<bool> = spreads.iter().map(|si| doc.spreads.get(*si).is_some_and(|sp| sp.items.iter().any(|it| transparent(it)))).collect();
+    if !designcraft_pdf::print_color(doc, opts) && blended.iter().any(|b| *b) {
+        match designcraft_pdf::add_blend_space(&r.bytes, &blended, doc.settings.blend_space == designcraft_doc::BlendSpace::Cmyk) {
+            Some(b) => r.bytes = b,
+            None => r.warnings.push("the transparency blend space couldn't be set".into()),
+        }
+    }
+    if fx_count > 0 {
+        r.warnings.push(format!("{fx_count} object(s) with soft effects (shadows, glows, feathers, bevels) exported as images"));
+    }
+    if layer_count > 0 {
+        r.warnings.push(format!("{layer_count} placed PDF(s) with hidden layers exported as images"));
+    }
+    if let Some((_, n)) = &flattened
+        && *n > 0
+    {
+        r.warnings.push(format!("transparency flattened: {n} region(s) rasterised"));
+    }
+    Ok(r)
+}
+
+/// The PDF that File › Export PDF writes for `p`, with its warnings: the print PDF
+/// ([`print_pdf`]) with its view options, timings and transitions. File › Print prints it.
+pub(crate) fn pdf_export(s: &Session, p: &Value) -> Result<designcraft_pdf::ExportReport> {
+    let st = s.doc()?;
+    let opts = options(p, st.doc.page_count())?;
+    let ppi = flatten_ppi("file.exportPdf", p)?;
+    let mut r = print_pdf(&st.doc, &s.cache, &opts, ppi)?;
+    let doc: &designcraft_doc::Document = &st.doc;
+    let spreads = designcraft_pdf::sheet_spreads(doc, &opts);
+    // Interactive PDF view options.
+    let mut cat = String::new();
+    if p.get("fullScreen").and_then(Value::as_bool) == Some(true) {
+        cat.push_str("/PageMode/FullScreen");
+    } else if p.get("bookmarksPanel").and_then(Value::as_bool) == Some(true) {
+        cat.push_str("/PageMode/UseOutlines");
+    }
+    match str_param(p, "pageLayout") {
+        Some("single") => cat.push_str("/PageLayout/SinglePage"),
+        Some("continuous") => cat.push_str("/PageLayout/OneColumn"),
+        Some("twoUp") => cat.push_str("/PageLayout/TwoPageLeft"),
+        Some("twoUpCover") => cat.push_str("/PageLayout/TwoPageRight"),
+        Some("twoUpContinuous") => cat.push_str("/PageLayout/TwoColumnRight"),
+        Some(o) => return Err(bad("file.exportPdf", format!("unknown pageLayout `{o}`"))),
+        None => {}
+    }
+    if let Some(v) = str_param(p, "view") {
+        // The first page opens with this view (pages are objects in order, so refer by index 0).
+        let dest = match v {
+            "fitPage" => "/Fit",
+            "fitWidth" => "/FitH null",
+            "actual" => "/XYZ null null 1",
+            o => {
+                return Err(bad("file.exportPdf", format!("unknown view `{o}` (fitPage, fitWidth, actual)")));
+            }
+        };
+        if let Some(first) = first_page_ref(&r.bytes) {
+            cat.push_str(&format!("/OpenAction[{first} 0 R{dest}]"));
+        }
+    }
+    if !cat.is_empty() {
+        match designcraft_pdf::add_catalog_entries(&r.bytes, &cat) {
+            Some(b) => r.bytes = b,
+            None => r.warnings.push("the PDF view options couldn't be set".into()),
+        }
+    }
+    // Flip pages every N seconds (presentation).
+    if let Some(secs) = p.get("advanceSeconds").and_then(Value::as_f64).filter(|s| *s > 0.0) {
+        let n = designcraft_pdf::sheet_spreads(doc, &opts).len();
+        let dur: Vec<Option<String>> = (0..n).map(|_| Some(format!("/Dur {secs:.2}"))).collect();
+        match designcraft_pdf::add_page_entries(&r.bytes, &dur) {
+            Some(b) => r.bytes = b,
+            None => r.warnings.push("page timings couldn't be set".into()),
+        }
+    }
+    // Page transitions (each spread's first page holds them).
+    let trans: Vec<Option<designcraft_doc::PageTransition>> =
+        spreads.into_iter().map(|si| doc.spreads.get(si).and_then(|sp| sp.pages.first()).and_then(|pg| pg.transition)).collect();
+    if trans.iter().any(Option::is_some) {
+        match designcraft_pdf::add_transitions(&r.bytes, &trans) {
+            Some(b) => r.bytes = b,
+            None => r.warnings.push("page transitions couldn't be added to this PDF".into()),
+        }
+    }
+    Ok(r)
+}
+
+#[cfg(test)]
+mod tagged_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn tagged_pdf_has_structure_and_alt_text() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Hello"})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 320, 200, 420]})).unwrap();
+        s.execute("object.altText", &json!({"text": "A plain box", "ids": [r["id"]]})).unwrap();
+        let pdf = |s: &mut Session, tagged: bool| {
+            let b64 = s.execute("file.exportPdf", &json!({"tagged": tagged})).unwrap()["base64"].as_str().unwrap().to_string();
+            String::from_utf8_lossy(&crate::cmd::file::base64_decode(&b64)).into_owned()
+        };
+        let t = pdf(&mut s, true);
+        assert!(t.contains("/StructTreeRoot") && t.contains("/Figure") && t.contains("A plain box"), "tagged");
+        assert!(t.contains("/P") && t.contains("/MarkInfo"));
+        assert!(!pdf(&mut s, false).contains("/StructTreeRoot"));
+    }
+}
+
+#[cfg(test)]
+mod variable_font_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn variable_font_instance_exports_to_pdf() {
+        let Ok(data) = std::fs::read("/System/Library/Fonts/Supplemental/Skia.ttf") else {
+            return;
+        };
+        designcraft_fonts::FontDb::global().add_font(data);
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Variable"})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 8})).unwrap();
+        s.execute("type.char", &json!({"fontFamily": "Skia", "fontStyle": "Black"})).unwrap();
+        let out = s.execute("file.exportPdf", &json!({})).unwrap();
+        assert!(out["bytes"].as_u64().unwrap() > 1000);
+        let fonts = s.execute("font.list", &json!({})).unwrap();
+        assert!(fonts.to_string().contains("Black"), "{fonts}");
+    }
+}
+
+#[cfg(test)]
+mod placed_pdf_print_tests {
+    use serde_json::json;
+
+    use crate::Session;
+    use crate::cmd::{base64_decode, base64_encode};
+
+    /// A one-page PDF 1.7 with a black box, as VectorCraft writes a logo.
+    fn logo() -> Vec<u8> {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 100, "height": 50})).unwrap();
+        s.execute("frame.create", &json!({"rect": [10, 10, 90, 40]})).unwrap();
+        s.execute("object.fill", &json!({"swatch": "[Black]"})).unwrap();
+        let r = s.execute("file.exportPdf", &json!({})).unwrap();
+        base64_decode(r["base64"].as_str().unwrap())
+    }
+
+    fn page_with(pdf: &[u8]) -> Session {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("file.place", &json!({"base64": base64_encode(pdf), "name": "logo.pdf", "x": 72, "y": 72})).unwrap();
+        s
+    }
+
+    /// A placed PDF 1.7 failed the PDF/X-4 (PDF 1.6) export with
+    /// "PDF writer error: Pdf(PdfDocument(PdfDocumentRepr { .. }), VersionMismatch(Pdf17), None)".
+    #[test]
+    fn pdf_17_placed_in_pdfx4() {
+        let logo = logo();
+        assert!(logo.starts_with(b"%PDF-1.7"));
+        let mut s = page_with(&logo);
+        let r = s.execute("file.exportPdf", &json!({"standard": "x4"})).unwrap();
+        assert!(r["warnings"].to_string().contains("logo.pdf: a PDF 1.7 placed in a PDF 1.6 file"), "{}", r["warnings"]);
+        assert!(base64_decode(r["base64"].as_str().unwrap()).starts_with(b"%PDF-1.6"));
+        // PDF 2.0 can't simply be relabelled: the export fails and names the file.
+        let mut v20 = logo.clone();
+        v20[5..8].copy_from_slice(b"2.0");
+        let mut s = page_with(&v20);
+        let e = s.execute("file.exportPdf", &json!({"standard": "x4"})).unwrap_err().to_string();
+        assert!(e.contains("logo.pdf is PDF 2.0") && e.contains("PDF 1.6"), "{e}");
+    }
+
+    /// A one-page PDF with a black box whose catalog says `/Version /1.7`, as TCPDF writes it.
+    fn catalog_v17(header: &str) -> Vec<u8> {
+        let content = "0 0 0 1 k 0 0 200 200 re f";
+        let mut pdf = format!("{header}\n").into_bytes();
+        let mut offsets = Vec::new();
+        for body in [
+            "<</Type/Catalog/Pages 2 0 R/Version /1.7>>".to_owned(),
+            "<</Type/Pages/Kids[3 0 R]/Count 1>>".to_owned(),
+            "<</Type/Page/Parent 2 0 R/MediaBox[0 0 200 200]/Contents 4 0 R/Resources<<>>>>".to_owned(),
+            format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
+        ] {
+            offsets.push(pdf.len());
+            pdf.extend_from_slice(format!("{} 0 obj\n{body}\nendobj\n", offsets.len()).as_bytes());
+        }
+        let xref = pdf.len();
+        pdf.extend_from_slice(b"xref\n0 5\n0000000000 65535 f\r\n");
+        for offset in offsets {
+            pdf.extend_from_slice(format!("{offset:010} 00000 n\r\n").as_bytes());
+        }
+        pdf.extend_from_slice(format!("trailer\n<</Size 5/Root 1 0 R>>\nstartxref\n{xref}\n%%EOF\n").as_bytes());
+        pdf
+    }
+
+    /// A placed PDF whose catalog `/Version /1.7` overrides its header failed the PDF/X-4 export
+    /// with "logo.pdf is PDF 1.7", though a 1.7 header alone is relabelled (#907).
+    #[test]
+    fn catalog_version_17_placed_in_pdfx4() {
+        for header in ["%PDF-1.7", "%PDF-1.4"] {
+            let pdf = catalog_v17(header);
+            assert_eq!(hayro_syntax::Pdf::new(pdf.clone()).unwrap().version(), hayro_syntax::PdfVersion::Pdf17);
+            let mut s = page_with(&pdf);
+            let r = s.execute("file.exportPdf", &json!({"standard": "x4"})).unwrap_or_else(|e| panic!("{header}: {e}"));
+            assert!(r["warnings"].to_string().contains("logo.pdf: a PDF 1.7 placed in a PDF 1.6 file"), "{}", r["warnings"]);
+            let out = base64_decode(r["base64"].as_str().unwrap());
+            assert!(out.starts_with(b"%PDF-1.6"));
+            assert_eq!(hayro_syntax::Pdf::new(out).unwrap().version(), hayro_syntax::PdfVersion::Pdf16);
+        }
+    }
+}
+
+#[cfg(test)]
+mod print_group_tests {
+    use serde_json::json;
+
+    use crate::Session;
+    use crate::cmd::{base64_decode, base64_encode};
+
+    /// A one-page PDF 1.7 with a black box, as VectorCraft writes a logo.
+    fn logo() -> Vec<u8> {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 100, "height": 50})).unwrap();
+        s.execute("frame.create", &json!({"rect": [10, 10, 90, 40]})).unwrap();
+        s.execute("object.fill", &json!({"swatch": "[Black]"})).unwrap();
+        let r = s.execute("file.exportPdf", &json!({})).unwrap();
+        base64_decode(r["base64"].as_str().unwrap())
+    }
+
+    fn page_with(pdf: &[u8]) -> Session {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("file.place", &json!({"base64": base64_encode(pdf), "name": "logo.pdf", "x": 72, "y": 72})).unwrap();
+        s
+    }
+
+    /// A placed PDF's transparency group blends in CMYK in a print document and in RGB in a
+    /// screen one.
+    #[test]
+    fn print_transparency_groups_blend_in_cmyk() {
+        let mut s = page_with(&logo());
+        let text = |s: &mut Session| {
+            let r = s.execute("file.exportPdf", &json!({"compressImages": false})).unwrap();
+            String::from_utf8_lossy(&base64_decode(r["base64"].as_str().unwrap())).into_owned()
+        };
+        let t = text(&mut s);
+        // The placed page's group inherits the page group, which blends in CMYK.
+        assert!(t.contains("/Group<</Type/Group/S/Transparency/I true>>"), "placed page group without a blending space");
+        assert!(t.contains("/Group<</Type/Group/S/Transparency/CS/DeviceCMYK>>"), "CMYK page group");
+        assert!(!t.contains("DeviceRGB"), "no RGB left");
+        assert!(!designcraft_pdf::has_rgb_groups(t.as_bytes()));
+        // The file still reads, with the same page.
+        let r = s.execute("file.exportPdf", &json!({})).unwrap();
+        let bytes = base64_decode(r["base64"].as_str().unwrap());
+        assert_eq!(hayro_syntax::Pdf::new(bytes).unwrap().pages().len(), 1);
+        // An RGB blend space keeps RGB groups.
+        s.execute("edit.transparencyBlendSpace", &json!({"space": "rgb"})).unwrap();
+        let t = text(&mut s);
+        assert!(t.contains("/CS/DeviceRGB") && designcraft_pdf::has_rgb_groups(t.as_bytes()));
+    }
+}
+
+#[cfg(test)]
+mod page_list_tests {
+    use serde_json::{Value, json};
+
+    use crate::Session;
+
+    fn doc(pages: u64) -> Session {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 200, "height": 200, "pages": pages, "facingPages": false, "margins": 0})).unwrap();
+        s
+    }
+
+    /// The same selection written two ways exported different files: `"2,2"` is one page, because
+    /// `parse_page_range` keeps the first of a repeat, while `[2, 2]` was two copies of page 2.
+    /// The list says which pages to export, not how many times.
+    #[test]
+    fn a_page_named_twice_is_exported_once_either_way() {
+        let mut s = doc(4);
+        for (pages, want) in [
+            (json!("2,2"), 1),
+            (json!([2, 2]), 1),
+            (json!([2, 2, 2]), 1),
+            (json!("2-2,2"), 1),
+            (json!([1, 2, 1]), 2),
+            (json!("1,2,1"), 2),
+            (json!([4, 1]), 2),
+            (json!("4,1"), 2),
+            (json!("all"), 4),
+        ] {
+            let r = s.execute("file.exportPdf", &json!({"pages": pages.clone()})).unwrap();
+            assert_eq!(r["pages"].as_u64(), Some(want), "pdf {pages}");
+            let r = s.execute("file.exportPptx", &json!({"pages": pages.clone()})).unwrap();
+            assert_eq!(r["slides"].as_u64(), Some(want), "pptx {pages}");
+        }
+        // The two forms now agree byte for byte, and the pages come out in the document's order
+        // whichever order the list names them in (which is how the export already behaved).
+        // A fixed creation time: exports a second apart would differ in their dates.
+        let mut file = |pages: Value| {
+            let r = s.execute("file.exportPdf", &json!({"pages": pages, "created": 0})).unwrap();
+            r["base64"].as_str().unwrap_or_default().to_string()
+        };
+        assert_eq!(file(json!([4, 1])), file(json!("4,1")), "the array and the string agree");
+        assert_eq!(file(json!([4, 1])), file(json!([1, 4])), "pages 1 and 4, in the document's order");
+        assert_eq!(file(json!([2, 2])), file(json!("2")), "a repeat is the single page");
+        // A page that does not exist is still refused, and an empty list still exports nothing.
+        assert!(s.execute("file.exportPdf", &json!({"pages": [5]})).is_err());
+        assert!(s.execute("file.exportPdf", &json!({"pages": []})).is_err());
+    }
+}
diff --git a/crates/engine/src/cmd/export/registry.rs b/crates/engine/src/cmd/export/registry.rs
new file mode 100644
index 000000000..5f7f1d013
--- /dev/null
+++ b/crates/engine/src/cmd/export/registry.rs
@@ -0,0 +1,53 @@
+use super::formats::{epub_split_param, export_epub, export_html, export_pptx, export_text, has_story_target, print_booklet};
+use super::pdf::export_pdf;
+use super::{CommandSpec, Value, cmd, has_doc, json};
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        cmd!(noundo "file.exportPdf", "Export PDF…", ["File"], None,
+        "{path?, pages?: \"1-3,5\" | [1,3] (1-based positions; default all), flatten?: high|medium|low|ppi (Transparency Flattener: spreads with transparency are rasterised; with standard x1a, the resolution complex transparent regions are rasterized at: high 300, medium 150, low 72, default 300), spreads?: bool, fullScreen?: bool, bookmarksPanel?: bool, pageLayout?: single|continuous|twoUp|twoUpCover|twoUpContinuous, view?: fitPage|fitWidth|actual, advanceSeconds?: number (interactive PDF), bleed?: bool (document bleed), marks?: bool | {crop?, bleed?, pageInfo?, weight?, offset?}, standard?: \"none\"|\"x4\"|\"x1a\"|\"a2b\" (x1a: PDF/X-1a:2003, the PDF/X-4 file flattened in its inks by craft-prepress: no transparency, only CMYK, gray and spot color), compressImages?: bool, tagged?: bool (structure tree: stories as paragraphs, figures with alt text), media?: bool (interactive: embed placed video and sound), title?, author?, created?: int (creation date in Unix seconds; default now, for reproducible files)} → {path, bytes, pages, warnings} (no path: {base64, …})",
+        has_doc, export_pdf),
+        cmd!(noundo "file.exportEpub", "Export EPUB (Reflowable)…", ["File"], None,
+        "{path?, title?, author?, language?: \"en\", identifier?: str (dc:identifier; a stable urn:uuid by default), coverImage?: path (a PNG or JPEG as the cover), tocTitle?: str (the table of contents' title; from the language by default), cover?: bool (the first page as the cover image), embedFonts?: bool (package the stylesheet's fonts whose licence allows it, whole files), split?: \"off\"|\"exportTags\"|{style: name} (Split Document for this export, not stored; the document's `document.epubSplit` by default), fixedLayout?: bool (pre-paginated: each page as an image with its text)} → {path, bytes, warnings} (no path: {base64, bytes, warnings}); warnings name images without alt text, exported as decorative, and fonts that could not be embedded",
+        has_doc, export_epub),
+        cmd!(
+            "document.epubSplit",
+            "EPUB Split Document",
+            [],
+            None,
+            "{split?: \"off\"|\"exportTags\"|{style: name}} — EPUB Export Options › Split Document, stored with the document: one content file (off, the default), a file before each paragraph whose style has Export Tagging › Split Document on (exportTags), or before each paragraph of one style → {split}",
+            has_doc,
+            |s, p| {
+                const ID: &str = "document.epubSplit";
+                let cur = s.doc()?.doc.settings.epub_split.clone();
+                let Some(v) = p.get("split") else { return Ok(json!({"split": cur})) };
+                let split = epub_split_param(ID, &s.doc()?.doc, v)?;
+                if split != cur {
+                    let stored = split.clone();
+                    s.edit(move |d, _| {
+                        d.settings.epub_split = stored;
+                        Ok(Value::Null)
+                    })?;
+                }
+                Ok(json!({"split": split}))
+            }
+        ),
+        cmd!(noundo "file.exportFixedEpub", "Export EPUB (Fixed Layout)…", ["File"], None,
+        "{path?, title?, author?, language?} — pre-paginated EPUB → {path, bytes} (no path: {base64, bytes})",
+        has_doc, |s, p| {
+            export_epub(s, &crate::cmd::with_param(p, "fixedLayout", serde_json::json!(true)))
+        }),
+        cmd!(noundo "file.printBooklet", "Print Booklet…", ["File"], None,
+        "{path?, type?: saddleStitch|twoUpConsecutive, spaceBetween? (pt)} — printer spreads as PDF (pages imposed in booklet order) → {path, bytes, sheets} (no path: {base64, …})",
+        has_doc, print_booklet),
+        cmd!(noundo "file.exportHtml", "Export HTML…", ["File"], None,
+        "{path?, title?, language?} — one self-contained page (styles inline, images embedded), stories and graphics in reading order → {path, bytes, warnings} (no path: {text, bytes, warnings})",
+        has_doc, export_html),
+        cmd!(noundo "file.exportPptx", "Export PowerPoint…", ["File"], None,
+        "{path?, pages?: \"1-3,5\" | [1,3] (1-based positions; default all), lineBreaks?: keep|reflow (keep: DesignCraft's lines, spacing and leading; reflow: one box per frame, PowerPoint sets the lines), rasterize?: bool (default true: objects PowerPoint can't show — placed PDF/EPS, type on a path, some effects — go in as 300 ppi images), embedFonts?: bool (default true: the TrueType fonts whose licences allow it), title?, author?} — every page as a slide of editable shapes, pictures, text boxes and tables → {path, bytes, slides, warnings} (no path: {base64, …})",
+        has_doc, export_pptx),
+        cmd!(noundo "file.exportText", "Export Text…", ["File"], None,
+        "{path?, format?: \"txt\"|\"rtf\"|\"tagged\" (Tagged Text; default from the path, else txt), story?, frame?} — the story being edited or of the selected frame → {path, bytes} (no path: {text, bytes})",
+        has_story_target, export_text),
+    ]
+}
diff --git a/crates/engine/src/cmd/export/text_tests.rs b/crates/engine/src/cmd/export/text_tests.rs
new file mode 100644
index 000000000..e533320f8
--- /dev/null
+++ b/crates/engine/src/cmd/export/text_tests.rs
@@ -0,0 +1,378 @@
+use serde_json::json;
+
+use crate::Session;
+
+fn unzip(b64: &str) -> zip::ZipArchive<std::io::Cursor<Vec<u8>>> {
+    zip::ZipArchive::new(std::io::Cursor::new(super::super::file::base64_decode(b64))).unwrap()
+}
+
+fn read(z: &mut zip::ZipArchive<std::io::Cursor<Vec<u8>>>, name: &str) -> String {
+    let mut s = String::new();
+    std::io::Read::read_to_string(&mut z.by_name(name).unwrap(), &mut s).unwrap();
+    s
+}
+
+/// Split Document is stored with the document as one undo step, follows a renamed style, and
+/// an export can override it without storing its own.
+#[test]
+fn epub_split_document_setting() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "One\nText\nTwo\nMore"})).unwrap();
+    let sid = r["story"].as_u64().unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Chapter"})).unwrap();
+    for at in [0, 9] {
+        s.execute("text.select", &json!({"story": sid, "anchor": at, "focus": at})).unwrap();
+        s.execute("style.paragraph.apply", &json!({"name": "Chapter"})).unwrap();
+    }
+    let files = |s: &mut Session, p: serde_json::Value| {
+        let mut z = unzip(s.execute("file.exportEpub", &p).unwrap()["base64"].as_str().unwrap());
+        (1..).take_while(|n| z.by_name(&if *n == 1 { "OEBPS/content.xhtml".into() } else { format!("OEBPS/content{n}.xhtml") }).is_ok()).count()
+    };
+    assert_eq!(s.execute("document.epubSplit", &json!({})).unwrap()["split"], "off");
+    assert_eq!(files(&mut s, json!({})), 1, "one content file by default");
+    assert!(s.execute("document.epubSplit", &json!({"split": {"style": "Nope"}})).is_err());
+    assert!(s.execute("document.epubSplit", &json!({"split": "h1"})).is_err());
+    assert!(s.execute("file.exportEpub", &json!({"split": {"style": "Nope"}})).is_err());
+    assert_eq!(s.execute("document.epubSplit", &json!({"split": {"style": "Chapter"}})).unwrap()["split"], json!({"style": "Chapter"}));
+    assert_eq!(files(&mut s, json!({})), 2);
+    assert_eq!(files(&mut s, json!({"split": "off"})), 1);
+    assert_eq!(s.doc().unwrap().doc.settings.epub_split, designcraft_doc::EpubSplit::Style("Chapter".into()), "the override isn't stored");
+    s.execute("style.paragraph.edit", &json!({"name": "Chapter", "rename": "Part"})).unwrap();
+    assert_eq!(s.execute("document.epubSplit", &json!({})).unwrap()["split"], json!({"style": "Part"}));
+    assert_eq!(files(&mut s, json!({})), 2);
+    s.execute("edit.undo", &json!({})).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(s.execute("document.epubSplit", &json!({})).unwrap()["split"], "off");
+}
+
+#[test]
+fn object_export_options() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    // A plain rectangle rasterised for EPUB, centred, after a page break.
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 200, 200], "shape": "ellipse"})).unwrap();
+    s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [r["id"]]})).unwrap();
+    s.execute("object.exportOptions", &json!({"ids": [r["id"]], "rasterize": true, "align": "center", "pageBreakBefore": true, "altText": "A dot"}))
+        .unwrap();
+    let e = s.execute("file.exportEpub", &json!({})).unwrap();
+    let mut z = unzip(e["base64"].as_str().unwrap());
+    let x = read(&mut z, "OEBPS/content.xhtml");
+    assert!(x.contains("<figure style=\"text-align:center;page-break-before:always;break-before:page;\"><img") && x.contains("alt=\"A dot\""), "{x}");
+    // Tagged PDF: an artifact object adds no figure.
+    let pdf = |s: &mut Session| {
+        String::from_utf8_lossy(&super::super::file::base64_decode(
+            s.execute("file.exportPdf", &json!({"tagged": true})).unwrap()["base64"].as_str().unwrap(),
+        ))
+        .matches("/S/Figure")
+        .count()
+    };
+    let figures = pdf(&mut s);
+    s.execute("object.exportOptions", &json!({"ids": [r["id"]], "artifact": true})).unwrap();
+    assert!(pdf(&mut s) < figures);
+}
+
+#[test]
+fn epub_cover_and_fixed_layout() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 2})).unwrap();
+    s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Page one words", "caret": false})).unwrap();
+    let r = s.execute("file.exportEpub", &json!({"cover": true})).unwrap();
+    assert_eq!(r["warnings"], json!([]), "no images, nothing to report");
+    let mut z = unzip(r["base64"].as_str().unwrap());
+    let opf = read(&mut z, "OEBPS/content.opf");
+    assert!(opf.contains("cover-image") && opf.contains("<itemref idref=\"cover\"/>"));
+    assert!(z.by_name("OEBPS/images/cover.png").is_ok());
+    let r = s.execute("file.exportFixedEpub", &json!({})).unwrap();
+    assert_eq!(r["pages"], 2);
+    let mut z = unzip(r["base64"].as_str().unwrap());
+    let opf = read(&mut z, "OEBPS/content.opf");
+    assert!(opf.contains("rendition:layout\">pre-paginated") && opf.contains("page2.xhtml"));
+    let p1 = read(&mut z, "OEBPS/page1.xhtml");
+    assert!(p1.contains("width=612, height=792") && p1.contains("Page one words"), "{p1}");
+}
+
+/// #775: the fallback follows the font's class, and embedFonts packages the stylesheet's fonts
+/// (and reports those it can't).
+#[test]
+fn epub_font_fallbacks_and_embedding() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 1})).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Sans", "chars": {"fontFamily": "Source Sans 3", "fontStyle": "Regular"}})).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Gone", "chars": {"fontFamily": "No Such Font Family", "fontStyle": "Regular"}})).unwrap();
+    s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Words", "caret": false})).unwrap();
+    let r = s.execute("file.exportEpub", &json!({})).unwrap();
+    let mut z = unzip(r["base64"].as_str().unwrap());
+    let css = read(&mut z, "OEBPS/style.css");
+    assert!(css.contains("font-family: \"Source Sans 3\", sans-serif;"), "{css}");
+    assert!(!css.contains("@font-face") && r["warnings"] == json!([]), "nothing embedded unless asked");
+    let r = s.execute("file.exportEpub", &json!({"embedFonts": true})).unwrap();
+    let mut z = unzip(r["base64"].as_str().unwrap());
+    let css = read(&mut z, "OEBPS/style.css");
+    assert!(css.contains("@font-face { font-family: \"Source Sans 3\"; src: url(\"fonts/"), "{css}");
+    let opf = read(&mut z, "OEBPS/content.opf");
+    let font = opf.split("href=\"fonts/").nth(1).and_then(|r| r.split('"').next()).map(|n| format!("OEBPS/fonts/{n}"));
+    assert!(font.as_ref().is_some_and(|f| z.by_name(f).is_ok_and(|e| e.size() > 1000)), "{opf}");
+    let warnings = r["warnings"].as_array().unwrap();
+    assert!(warnings.iter().any(|w| w.as_str().unwrap().contains("No Such Font Family")), "{warnings:?}");
+    let html = s.execute("file.exportHtml", &json!({})).unwrap()["text"].as_str().unwrap().to_string();
+    assert!(html.contains("\"Source Sans 3\", sans-serif;"));
+}
+
+/// A font whose licence allows embedding bitmaps only (fsType bit 9) is not packaged whole,
+/// and a Semibold style asks for the Semibold face's weight, not Bold's.
+#[test]
+fn epub_embedding_follows_bitmap_only_licences_and_weights() {
+    use designcraft_fonts::testing::{font_with, with_fs_type};
+    const BITMAP: &str = "DocFont Epub Bitmap Only";
+    for fs_type in [0x0200, 0x0208] {
+        designcraft_fonts::FontDb::global().add_font(with_fs_type(font_with(&format!("{BITMAP} {fs_type:04x}"), &['W']).unwrap(), fs_type).unwrap());
+    }
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 1})).unwrap();
+    for fs_type in [0x0200, 0x0208] {
+        let family = format!("{BITMAP} {fs_type:04x}");
+        s.execute("style.paragraph.create", &json!({"name": family, "chars": {"fontFamily": family, "fontStyle": "Regular"}})).unwrap();
+    }
+    s.execute("style.paragraph.create", &json!({"name": "Semi", "chars": {"fontFamily": "Source Sans 3", "fontStyle": "Semibold"}})).unwrap();
+    s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Words", "caret": false})).unwrap();
+    let r = s.execute("file.exportEpub", &json!({"embedFonts": true})).unwrap();
+    let mut z = unzip(r["base64"].as_str().unwrap());
+    let css = read(&mut z, "OEBPS/style.css");
+    assert!(!css.contains(&format!("@font-face {{ font-family: \"{BITMAP}")), "{css}");
+    let warnings = r["warnings"].to_string();
+    for fs_type in [0x0200, 0x0208] {
+        assert!(warnings.contains(&format!("{BITMAP} {fs_type:04x} Regular`: its licence doesn't allow embedding")), "{warnings}");
+    }
+    let semi = css.lines().find(|l| l.contains(".semi {")).unwrap_or_default();
+    assert!(semi.contains("font-weight: 600;"), "{css}");
+}
+
+/// #771, #773: a cover image file and an identifier through the command; the package's
+/// modified time is the export's.
+#[test]
+fn epub_cover_image_file_and_identifier() {
+    let dir = std::env::temp_dir().join(format!("dc-epub-cover-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let jpg = dir.join("cover.jpg");
+    std::fs::write(&jpg, [0xFF, 0xD8, 0xFF, 0xE0, 0, 16]).unwrap();
+    let bad = dir.join("cover.txt");
+    std::fs::write(&bad, b"not an image").unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 1})).unwrap();
+    s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Words", "caret": false})).unwrap();
+    let r = s.execute("file.exportEpub", &json!({"coverImage": jpg.to_str().unwrap(), "identifier": "urn:isbn:9780000000002"})).unwrap();
+    let mut z = unzip(r["base64"].as_str().unwrap());
+    let opf = read(&mut z, "OEBPS/content.opf");
+    assert!(opf.contains("<dc:identifier id=\"bookid\">urn:isbn:9780000000002</dc:identifier>"), "{opf}");
+    assert!(opf.contains("href=\"images/cover.jpg\" media-type=\"image/jpeg\""), "{opf}");
+    assert!(!opf.contains("2026-01-01T00:00:00Z"), "the export time, not a fixed date: {opf}");
+    assert!(z.by_name("OEBPS/images/cover.jpg").is_ok());
+    assert!(s.execute("file.exportEpub", &json!({"coverImage": bad.to_str().unwrap()})).is_err());
+    std::fs::remove_dir_all(&dir).ok();
+}
+
+/// The color spaces of every image XObject in `pdf`, as the families and colorant names.
+fn image_spaces(pdf: &[u8]) -> Vec<String> {
+    use hayro_syntax::object::{Name, Object};
+    let file = hayro_syntax::Pdf::new(pdf.to_vec()).unwrap();
+    file.objects()
+        .into_iter()
+        .filter_map(|o| o.into_stream())
+        .filter(|s| s.dict().get::<Name<'_>>(b"Subtype").is_some_and(|n| n.as_ref() == b"Image"))
+        .filter_map(|s| match s.dict().get::<Object<'_>>(b"ColorSpace")? {
+            Object::Name(n) => Some(n.as_str().to_string()),
+            Object::Array(a) => {
+                let mut it = a.iter::<Object<'_>>();
+                let family = it.next()?.into_name()?.as_str().to_string();
+                let names = match it.next() {
+                    Some(Object::Array(n)) => n.iter::<Name<'_>>().map(|n| n.as_str().to_string()).collect::<Vec<_>>().join(" "),
+                    Some(Object::Name(n)) => n.as_str().to_string(),
+                    _ => String::new(),
+                };
+                Some(format!("{family} {names}"))
+            }
+            _ => None,
+        })
+        .collect()
+}
+
+/// The (Black, Gold) samples of every flattened DeviceN image that has both colorants.
+fn black_and_gold(pdf: &[u8]) -> Vec<(u8, u8)> {
+    use hayro_syntax::object::{Array, Name, Object};
+    let file = hayro_syntax::Pdf::new(pdf.to_vec()).unwrap();
+    let mut out = Vec::new();
+    for st in file.objects().into_iter().filter_map(|o| o.into_stream()) {
+        let d = st.dict();
+        if !d.get::<Name<'_>>(b"Subtype").is_some_and(|n| n.as_ref() == b"Image") || d.get::<i32>(b"BitsPerComponent") != Some(8) {
+            continue;
+        }
+        let Some(cs) = d.get::<Array<'_>>(b"ColorSpace") else { continue };
+        let mut it = cs.iter::<Object<'_>>();
+        if !it.next().and_then(|o| o.into_name()).is_some_and(|n| n.as_ref() == b"DeviceN") {
+            continue;
+        }
+        let Some(Object::Array(names)) = it.next() else { continue };
+        let names: Vec<String> = names.iter::<Name<'_>>().map(|n| n.as_str().to_string()).collect();
+        let (Some(k), Some(g)) = (names.iter().position(|n| n == "Black"), names.iter().position(|n| n == "Gold")) else { continue };
+        let data = st.decoded().unwrap();
+        out.extend(data.chunks(names.len()).filter(|px| px.len() == names.len()).map(|px| (px[k], px[g])));
+    }
+    out
+}
+
+/// The shadow coverage gives the rendered pixel back when the PDF draws the object over the
+/// shadow, also under a partly transparent object (an anti-aliased edge, a soft-alpha image).
+#[test]
+fn shadow_coverage_composites_back() {
+    for a in (0..=255u32).step_by(15) {
+        for s in (0..=255u32).step_by(15) {
+            let over = |c: u32| a + (c * (255 - a) + 127) / 255;
+            let with = over(s) as u8;
+            let c = u32::from(super::shadow_coverage(with, a as u8));
+            assert!(over(c).abs_diff(u32::from(with)) <= 1, "object {a}, shadow {s}: coverage {c}");
+        }
+    }
+    assert_eq!(super::shadow_coverage(255, 255), 0);
+    assert_eq!(super::shadow_coverage(10, 20), 0);
+}
+
+/// PDF/X-1a through craft-prepress: a soft drop shadow over a spot, a 50% object and a
+/// knockout group leave no transparency and no RGB; the shadow is flattened in the page's
+/// inks (Black over the spot), not exported as an RGB image of the object; text stays text and
+/// overprint stays `/op`; `flatten` sets the resolution.
+#[test]
+fn x1a_export_flattens_in_inks() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 1})).unwrap();
+    s.execute("swatch.create", &json!({"name": "Gold", "color": {"c": 0, "m": 30, "y": 90, "k": 10}, "spot": true})).unwrap();
+    let bg = s.execute("frame.create", &json!({"rect": [36, 36, 576, 756]})).unwrap()["id"].clone();
+    s.execute("object.fill", &json!({"ids": [bg], "swatch": "Gold"})).unwrap();
+    let shadowed = s.execute("frame.create", &json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].clone();
+    s.execute("object.fill", &json!({"ids": [shadowed], "swatch": "C=0 M=100 Y=0 K=0"})).unwrap();
+    s.execute("object.dropShadow", &json!({"ids": [shadowed], "on": true, "distance": 8, "size": 6})).unwrap();
+    let half = s.execute("frame.create", &json!({"rect": [300, 72, 400, 172]})).unwrap()["id"].clone();
+    s.execute("object.fill", &json!({"ids": [half], "swatch": "C=100 M=0 Y=0 K=0"})).unwrap();
+    s.execute("object.opacity", &json!({"ids": [half], "opacity": 0.5})).unwrap();
+    let a = s.execute("frame.create", &json!({"rect": [72, 300, 172, 400]})).unwrap()["id"].clone();
+    let b = s.execute("frame.create", &json!({"rect": [122, 350, 222, 450]})).unwrap()["id"].clone();
+    s.execute("object.fill", &json!({"ids": [a, b], "swatch": "C=0 M=0 Y=100 K=0"})).unwrap();
+    s.execute("object.opacity", &json!({"ids": [a, b], "opacity": 0.5})).unwrap();
+    let g = s.execute("object.group", &json!({"ids": [a, b]})).unwrap()["id"].clone();
+    s.execute("object.transparencyGroup", &json!({"ids": [g], "knockout": true})).unwrap();
+    let op = s.execute("frame.create", &json!({"rect": [300, 300, 400, 400]})).unwrap()["id"].clone();
+    s.execute("object.fill", &json!({"ids": [op], "swatch": "C=0 M=100 Y=0 K=0"})).unwrap();
+    s.execute("object.attributes", &json!({"ids": [op], "overprintFill": true})).unwrap();
+    s.execute("frame.create", &json!({"rect": [72, 500, 400, 560], "content": "text", "text": "Live text", "caret": false})).unwrap();
+
+    let r = s.execute("file.exportPdf", &json!({"standard": "x1a", "flatten": "low"})).unwrap();
+    let pdf = super::super::file::base64_decode(r["base64"].as_str().unwrap());
+    let text = String::from_utf8_lossy(&pdf).to_string();
+    assert_eq!(designcraft_pdf::check_pdfx1a(&pdf), Vec::<String>::new());
+    assert!(pdf.starts_with(b"%PDF-1.4") && text.contains("/GTS_PDFXVersion(PDF/X-1:2003)") && text.contains("/S/GTS_PDFX"));
+    assert!(text.contains("/GTS_PDFXConformance(PDF/X-1a:2003)"), "the conformance level");
+    let warnings = r["warnings"].to_string();
+    assert!(!warnings.contains("soft effects"), "the shadow isn't an RGB image of the object: {warnings}");
+    assert!(warnings.contains("at 72 ppi"), "{warnings}");
+    let spaces = image_spaces(&pdf);
+    assert!(spaces.iter().all(|cs| !cs.contains("RGB") && !cs.contains("ICC")), "{spaces:?}");
+    assert!(spaces.iter().any(|cs| cs.starts_with("DeviceN") && cs.contains("Black") && cs.contains("Gold")), "the shadow over the spot: {spaces:?}");
+    // The shadow multiplies: the spot stays at 100% where the shadow's black is.
+    let shadowed: Vec<(u8, u8)> = black_and_gold(&pdf).into_iter().filter(|(k, _)| *k > 100).collect();
+    assert!(!shadowed.is_empty(), "no shadow pixels");
+    assert!(shadowed.iter().all(|(_, gold)| *gold >= 250), "the spot under the shadow: {:?}", &shadowed[..shadowed.len().min(8)]);
+    assert!(text.contains("/op true") && text.contains("/OPM 1"), "overprint");
+    assert!(text.contains("/FontFile"), "the text is still text");
+    // The default resolution.
+    let r = s.execute("file.exportPdf", &json!({"standard": "x1a"})).unwrap();
+    assert!(r["warnings"].to_string().contains("at 300 ppi"), "{}", r["warnings"]);
+}
+
+#[test]
+fn flattener_rasterises_spreads_with_transparency() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 3})).unwrap();
+    let id = s.execute("frame.create", &json!({"rect": [100, 100, 300, 300]})).unwrap()["id"].clone();
+    s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [id]})).unwrap();
+    // Opaque: nothing to flatten.
+    let r = s.execute("file.exportPdf", &json!({"flatten": "low"})).unwrap();
+    assert!(r["warnings"].as_array().unwrap().iter().all(|w| !w.as_str().unwrap().contains("flattened")));
+    s.execute("object.opacity", &json!({"ids": [id], "opacity": 0.5})).unwrap();
+    // Text away from the transparency stays live text.
+    s.execute("frame.create", &json!({"rect": [72, 400, 400, 450], "content": "text", "text": "Still vector", "caret": false})).unwrap();
+    let r = s.execute("file.exportPdf", &json!({"flatten": "low"})).unwrap();
+    let pdf = super::super::file::base64_decode(r["base64"].as_str().unwrap());
+    assert!(String::from_utf8_lossy(&pdf).contains("/FontFile"), "the text is still text");
+    assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("flattened: 1 ")), "{r}");
+    assert_eq!(r["pages"], 3);
+    let bytes = super::super::file::base64_decode(r["base64"].as_str().unwrap());
+    assert_eq!(designcraft_render::pdf_page_count(&bytes), Some(3));
+    // The document itself is untouched.
+    assert!(s.doc().unwrap().doc.item(designcraft_doc::ItemId(id.as_u64().unwrap())).is_some());
+    assert!(s.execute("file.exportPdf", &json!({"flatten": 5})).is_err());
+    // Interactive view options land in the catalog and on the pages.
+    let r = s.execute("file.exportPdf", &json!({"fullScreen": true, "pageLayout": "single", "view": "fitPage", "advanceSeconds": 5})).unwrap();
+    let t = String::from_utf8_lossy(&super::super::file::base64_decode(r["base64"].as_str().unwrap())).to_string();
+    assert!(
+        t.contains("/PageMode/FullScreen") && t.contains("/PageLayout/SinglePage") && t.contains("/OpenAction[") && t.contains("/Dur 5.00"),
+        "view options"
+    );
+    assert!(s.execute("file.exportPdf", &json!({"pageLayout": "sideways"})).is_err());
+    // Unflattened, the page blends in the document's blend space (CMYK for print).
+    let r = s.execute("file.exportPdf", &json!({})).unwrap();
+    let text = String::from_utf8_lossy(&super::super::file::base64_decode(r["base64"].as_str().unwrap())).to_string();
+    assert_eq!(text.matches("/S/Transparency/CS/DeviceCMYK").count(), 1, "only the page with transparency");
+}
+
+#[test]
+fn objects_with_soft_effects_keep_their_text_wrap_in_pdf() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let text = "Words wrap around the objects on this page. ".repeat(60);
+    let t = s.execute("frame.create", &json!({"rect": [36, 36, 576, 756], "content": "text", "text": text, "caret": false})).unwrap()["id"]
+        .as_u64()
+        .unwrap();
+    // A feathered frame with a contour wrap of the frame itself.
+    let a = s.execute("frame.create", &json!({"rect": [100, 100, 200, 200]})).unwrap()["id"].clone();
+    s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [a]})).unwrap();
+    s.execute("object.textWrap", &json!({"ids": [a], "mode": "contour", "contour": "sameAsClipping", "offset": 6})).unwrap();
+    // A feathered frame whose placed graphic has a bounding-box wrap.
+    let png = designcraft_render::Rendered { width: 40, height: 40, pixels: vec![90; 40 * 40 * 4] }.to_png();
+    let b = s.execute("frame.create", &json!({"rect": [300, 400, 400, 500]})).unwrap()["id"].as_u64().unwrap();
+    s.execute("file.place", &json!({"base64": super::super::file::base64_encode(&png), "name": "a.png", "frame": b})).unwrap();
+    s.execute("object.textWrap", &json!({"ids": [b], "content": true, "mode": "boundingBox", "offset": 6})).unwrap();
+    s.execute("object.feather", &json!({"ids": [a, b], "width": 14})).unwrap();
+
+    let d = &s.doc().unwrap().doc;
+    let sid = d.item(designcraft_doc::ItemId(t)).and_then(|it| it.text_frame()).unwrap().story;
+    let before = designcraft_compose::frame_specs(d, sid)[0].exclusions.clone();
+    assert_eq!(before.len(), 2);
+    let (fx, n) = super::rasterize_effects(d, &s.cache, &Default::default());
+    assert_eq!(n, 2);
+    let fx = fx.unwrap();
+    assert_eq!(designcraft_compose::frame_specs(&fx, sid)[0].exclusions, before);
+    // The objects that keep the wrap don't print; their images do.
+    let sp = &fx.spreads[0];
+    assert_eq!(sp.items.iter().filter(|it| it.nonprinting).count(), 2);
+    assert_eq!(sp.items.iter().filter(|it| !it.nonprinting && it.graphic().is_some()).count(), 2);
+}
+
+#[test]
+fn export_story_as_text_and_rtf() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "One\nTwo"})).unwrap();
+    assert!(s.execute("file.exportText", &json!({"frame": r["id"]})).unwrap()["text"] == "One\r\nTwo");
+    let html = s.execute("file.exportHtml", &json!({})).unwrap();
+    assert!(html["text"].as_str().unwrap().contains("One</p>"));
+    let tagged = s.execute("file.exportText", &json!({"frame": r["id"], "format": "tagged"})).unwrap();
+    assert!(tagged["text"].as_str().unwrap().contains("<ParaStyle:"));
+    let rtf = s.execute("file.exportText", &json!({"frame": r["id"], "format": "rtf"})).unwrap();
+    assert!(rtf["text"].as_str().unwrap().starts_with("{\\rtf1"));
+    let dir = std::env::temp_dir().join(format!("dc-export-text-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("story.rtf");
+    s.execute("file.exportText", &json!({"frame": r["id"], "path": path.to_string_lossy()})).unwrap();
+    assert!(std::fs::read_to_string(&path).unwrap().starts_with("{\\rtf1"));
+    std::fs::remove_dir_all(&dir).ok();
+}
diff --git a/crates/engine/src/cmd/file.rs b/crates/engine/src/cmd/file.rs
index 33cea7ed0..44aaa85b7 100644
--- a/crates/engine/src/cmd/file.rs
+++ b/crates/engine/src/cmd/file.rs
@@ -10,137 +10,20 @@ use serde_json::{Value, json};
 use super::{CommandSpec, always, bad, cmd, f64_or, has_doc, ok, str_param};
 use crate::{DocState, EngineError, Result, Session};
 
-pub fn specs() -> Vec<CommandSpec> {
-    vec![
-        cmd!(noundo "file.new", "Document…", ["File", "New"], Some("Cmd+N"),
-            "{preset?: \"Letter\"|\"A4\"|… or a saved preset (file.savePreset), intent?: print|web|mobile, units?: points|picas|millimeters|…, width?, height?, pages?, startPage?, facingPages?, columns?, gutter?, margins?: number|{top,bottom,inside,outside}, bleed?, slug?: n | [top, bottom, inside, outside], title?, primaryTextFrame?: bool}",
-            always, file_new),
-        cmd!(noundo "file.newSample", "Sample Document", ["Help"], None, "{} — a multi-page magazine sample", always, file_sample),
-        cmd!(query "file.presets", "Document Presets", [], None, "{} → the built-in presets [{name, intent, width, height, units}], then the saved ones (with `saved: true`)", always, |s, _| {
-            let mut presets: Vec<Value> = PRESETS.iter().map(|p| serde_json::to_value(p).unwrap_or_default()).collect();
-            presets.extend(
-                s.prefs
-                    .document_presets
-                    .iter()
-                    .map(|p| json!({"name": p.title, "intent": p.intent, "width": p.width, "height": p.height, "units": p.units, "saved": true})),
-            );
-            Ok(Value::Array(presets))
-        }),
-        cmd!(noundo "file.savePreset", "Save Document Preset", [], None,
-            "{name, …the settings as file.new} — kept with the preferences; `file.new {preset: name}` uses it. A saved preset of that name is replaced; built-in names are refused",
-            always, save_preset),
-        cmd!(noundo "file.deletePreset", "Delete Document Preset", [], None, "{name} — a saved document preset", always, |s, p| {
-            let name = str_param(p, "name").unwrap_or_default().trim().to_string();
-            let before = s.prefs.document_presets.len();
-            s.prefs.document_presets.retain(|x| !x.title.eq_ignore_ascii_case(&name));
-            if s.prefs.document_presets.len() == before {
-                return Err(bad("file.deletePreset", format!("no saved preset `{name}`")));
-            }
-            ok()
-        }),
-        cmd!(noundo "file.open", "Open…", ["File"], Some("Cmd+O"),
-            "{path} — a DesignCraft or IDML file (recognised by its content, so the extension may be missing), or an InDesign .indd/.indt (recognised by its signature or extension, converted to IDML; its conversion warnings join `warnings`); the fonts in a `Document Fonts` folder beside it load first → {index, documentFonts: faces loaded, warnings: font files skipped, GREP styles whose pattern can't compile, Based on Parent links cleared and, for IDML and InDesign files, package parts missing}",
-            always, file_open),
-        cmd!(noundo "file.openBytes", "Open Bytes", [], None, "{name, base64} — DesignCraft JSON, an IDML package or an InDesign .indd/.indt → {index, warnings}", always, file_open_bytes),
-        cmd!(noundo "file.openRecent", "Open Recent File", [], None,
-            "{index} — reopen entry `index` of File › Open Recent (as file.open); a file that is gone is an error and stays listed",
-            has_recent, file_open_recent),
-        cmd!(query "file.recentFiles", "Recent Files", [], None, "{} → [{path, name, exists}] File › Open Recent, most recent first", always, |s, _| {
-            Ok(Value::Array(s.prefs.recent_files.iter().map(|p| recent_entry(p)).collect()))
-        }),
-        cmd!(noundo "file.clearRecent", "Clear Recent Files", ["File", "Open Recent"], None, "{} — empty File › Open Recent", has_recent, |s, _| {
-            s.prefs.recent_files.clear();
-            ok()
-        }),
-        cmd!(noundo "file.save", "Save", ["File"], Some("Cmd+S"), "{path?} — a `path` without the .designcraft extension gets it → {path: the file written, bytes}", has_doc, file_save),
-        cmd!(noundo "file.saveAs", "Save As…", ["File"], Some("Cmd+Shift+S"), "{path} — a path without the .designcraft extension gets it → {path: the file written, bytes}", has_doc, file_save),
-        cmd!(noundo "file.saveACopy", "Save a Copy…", ["File"], None, "{path} — writes the document without changing which file it is or its unsaved state; a path without the .designcraft extension gets it → {path: the file written, bytes}", has_doc, |s, p| {
-            let path = str_param(p, "path").ok_or_else(|| bad("file.saveACopy", "missing `path`"))?;
-            let path = with_document_extension(path);
-            let mut copy = (*s.doc()?.doc).clone();
-            super::datamerge::refresh_relative_paths(&mut copy, std::path::Path::new(&path));
-            let bytes = to_bytes_with_preview(&copy, &s.cache)?;
-            #[cfg(not(target_arch = "wasm32"))]
-            crate::io::write_file(&path, &bytes).map_err(EngineError::Other)?;
-            Ok(json!({"path": path, "bytes": bytes.len()}))
-        }),
-        cmd!(noundo "file.revert", "Revert", ["File"], None, "{} — back to the last saved version (not undoable)", can_revert, file_revert),
-        cmd!(query "file.recovery.list", "Recovery Data", [], None, "{dir?} → [{uid, path, title, saved}] unsaved documents left by a crash (default: the session's recovery folder)", always, |s, p| {
-            let dir = recovery_dir(s, p, FolderAccess::Read)?;
-            Ok(Value::Array(crate::recovery::list(&dir).into_iter().map(|(uid, mut m)| { m["uid"] = json!(uid); m }).collect()))
-        }),
-        cmd!(noundo "file.recovery.save", "Save Recovery Data", [], None, "{dir?} — write every unsaved document to the recovery folder (the app does this on a timer)", always, |s, p| {
-            let dir = recovery_dir(s, p, FolderAccess::Write)?;
-            Ok(json!({"saved": crate::recovery::save_tracked(s, &dir)?}))
-        }),
-        cmd!(noundo "file.recovery.open", "Recover Documents", [], None, "{dir?} — reopen documents left in the recovery folder (unsaved)", always, |s, p| {
-            // Reopening removes the entries it read.
-            let dir = recovery_dir(s, p, FolderAccess::ReadWrite)?;
-            Ok(json!({"opened": crate::recovery::open(s, &dir)?}))
-        }),
-        cmd!(query "file.serialize", "Serialize", [], None, "{} → {base64, bytes} the .designcraft file", has_doc, |s, _| {
-            let st = s.doc()?;
-            // Preview fill is session state. Serialize the unfilled template.
-            let doc = st.preview_stash.as_deref().unwrap_or(st.doc.as_ref());
-            let bytes = to_bytes(doc)?;
-            Ok(json!({"base64": base64_encode(&bytes), "bytes": bytes.len()}))
-        }),
-        cmd!(noundo "file.close", "Close", ["File"], Some("Cmd+W"), "{index?}", has_doc, |s, p| {
-            let i = p.get("index").and_then(Value::as_u64).map(|v| v as usize).or(s.active_index()).unwrap_or(0);
-            s.close_document(i);
-            ok()
-        }),
-        cmd!(noundo "file.activate", "Activate Document", [], None, "{index}", has_doc, |s, p| {
-            s.set_active(p.get("index").and_then(Value::as_u64).unwrap_or(0) as usize);
-            ok()
-        }),
-        cmd!(query "snippet.export", "Export Selection as Snippet", ["File", "Export"], None,
-            "{path?} — the selected items (with their stories, styles and images) as a .designcraft snippet; no path: {base64}", super::has_selection, snippet_export),
-        cmd!(query "place.styles", "Import Options: Styles", [], None,
-        "{path | base64, name} → {paragraph: [name], character: [name], conflicts: [name]} — the styles a Word/RTF file brings (for styleMap / styleConflicts)",
-        has_doc, |s, p| {
-            let (bytes, name, _) = read_source(p)?;
-            let imp = designcraft_textimport::import(&name, &bytes).map_err(|e| bad("place.styles", e.to_string()))?;
-            let st = &s.doc()?.doc.styles;
-            let conflicts: Vec<&str> = imp
-                .para_styles
-                .iter()
-                .filter(|x| st.para(&x.name).is_some())
-                .chain(imp.char_styles.iter().filter(|x| st.char_style(&x.name).is_some()))
-                .map(|x| x.name.as_str())
-                .collect();
-            Ok(json!({"paragraph": imp.para_styles.iter().map(|x| &x.name).collect::<Vec<_>>(), "character": imp.char_styles.iter().map(|x| &x.name).collect::<Vec<_>>(), "conflicts": conflicts}))
-        }),
-        cmd!(
-            "snippet.place",
-            "Place Snippet",
-            [],
-            None,
-            "{path | base64, spread?, x?, y?} — items keep their positions unless x/y given (top-left)",
-            has_doc,
-            snippet_place
-        ),
-        cmd!(
-            "place.load",
-            "Load Place Cursor",
-            [],
-            None,
-            "{path | base64, name?} — load a graphic into the place cursor (then click/drag with the placeGun tool)",
-            has_doc,
-            place_load
-        ),
-        cmd!("place.drop", "Place Loaded Graphic", [], None, "{spread?, x, y, rect?: [x0,y0,x1,y1], frame?: id}", has_doc, place_drop),
-        cmd!(
-            "file.place",
-            "Place…",
-            ["File"],
-            Some("Cmd+D"),
-            "{path?|base64?, name?, frame?: id (place into), spread?, x?, y?, width?: finite number > 0 (null: absent), height? (video/audio), pdfPage?: n (1-based, Image Import Options), pdfCrop?: crop|art|trim|bleed|media|contentVisible|contentAll (the box the graphic shows; `width` is the whole page's), loadCursor? (with no frame to fill and no x/y, an image loads into the place cursor, as File › Place), layoutPage?: n (IDML / .designcraft: that page's objects as a group), page?, rect?: [x0,y0,x1,y1] (text: a new frame there), autoflow? (threads one frame per page column from the first frame on, adding pages until the text fits), removeStyles?, styleMap?: {imported name: document style}, styleConflicts?: useExisting|redefine|autoRename, link? (keep the file linked in the Links panel; default: the linkTextFiles preference)} — places an image into `frame` when given; otherwise any explicit x/y/spread/width creates a new frame; otherwise uses the selected empty or graphic frame, or creates a new frame; text files (.txt, .docx, .rtf, .md) and Excel workbooks (.xlsx, as a table) go into the insertion point, the selected frame or a new frame on `page`/`rect`",
-            has_doc,
-            file_place
-        ),
-    ]
-}
+mod bytes;
+mod new;
+mod open;
+mod place;
+mod registry;
+mod save;
+mod snippets;
+
+pub use bytes::{DOCUMENT_SNIFF_BYTES, base64_decode, base64_encode, from_bytes, is_document, to_bytes, with_document_extension};
+pub(crate) use open::load_document_fonts;
+pub use open::{RecentPreview, recent_preview};
+pub(crate) use place::{crop_pdf, read_source, validate_placement};
+pub use registry::specs;
+pub(crate) use snippets::{snippet_bytes, snippet_place};
 
 #[cfg(test)]
 thread_local! {
@@ -148,2024 +31,5 @@ thread_local! {
     pub(crate) static FAIL_TO_BYTES: std::cell::Cell<bool> = const { std::cell::Cell::new(false) };
 }
 
-/// The document as `.designcraft` bytes, or an error when it can't be written; never an empty file.
-pub fn to_bytes(d: &Document) -> Result<Vec<u8>> {
-    save_bytes(d, None)
-}
-
-/// [`to_bytes`] with `preview` (PNG bytes) stored as the file's first-page picture.
-fn save_bytes(d: &Document, preview: Option<&[u8]>) -> Result<Vec<u8>> {
-    #[cfg(test)]
-    if FAIL_TO_BYTES.with(std::cell::Cell::get) {
-        return Err(EngineError::Other("could not write the document: injected failure".into()));
-    }
-    designcraft_format::save_with_preview(d, preview).map_err(|e| EngineError::Other(format!("could not write the document: {e}")))
-}
-
-/// `path` ending in `.designcraft`: the extension is added when it is missing or another one, so
-/// the file opens from the file manager. A path without a file name is left for the write to fail.
-pub fn with_document_extension(path: &str) -> String {
-    let p = std::path::Path::new(path);
-    let ext = p.extension().and_then(std::ffi::OsStr::to_str);
-    if p.file_name().is_none() || ext.is_some_and(|e| e.eq_ignore_ascii_case(designcraft_format::EXTENSION)) {
-        return path.to_string();
-    }
-    format!("{path}.{}", designcraft_format::EXTENSION)
-}
-
-/// Whether `bytes` are a document `file.open` reads: a DesignCraft package or an IDML package.
-/// The first [`DOCUMENT_SNIFF_BYTES`] of a file are enough for packages that start with their
-/// `mimetype` entry, as both formats write them.
-pub fn is_document(bytes: &[u8]) -> bool {
-    designcraft_idml::is_idml(bytes) || designcraft_format::starts_designcraft(bytes) || designcraft_format::is_designcraft(bytes)
-}
-
-/// How much of a file [`is_document`] needs to recognise a package by its `mimetype` entry.
-pub const DOCUMENT_SNIFF_BYTES: u64 = 64 << 10;
-
-/// The longer side of the first-page picture saved in the file, in pixels.
-const PREVIEW_PX: f64 = 320.0;
-
-/// [`to_bytes`] with a picture of the first page, which the start screen shows next to the file
-/// in its recent files. A page that can't be drawn just leaves the picture out.
-fn to_bytes_with_preview(d: &Document, cache: &crate::Cache) -> Result<Vec<u8>> {
-    let preview = d.page_loc(0).and_then(|(si, pi)| {
-        let b = d.spreads.get(si)?.pages.get(pi)?.bounds();
-        let side = b.width().max(b.height());
-        (side.is_finite() && side > 0.0).then_some(PREVIEW_PX / side)
-    });
-    let png =
-        preview.and_then(|scale| designcraft_render::Renderer::new().render_page(d, cache, 0, scale, false, &Default::default())).map(|r| r.to_png());
-    save_bytes(d, png.as_deref())
-}
-
-pub fn from_bytes(b: &[u8]) -> Result<Document> {
-    load_bytes(b).map(|(d, _)| d)
-}
-
-/// Read `.designcraft` bytes and repair what a hand-edited file can get wrong without failing the
-/// open, with a warning for each repair.
-fn load_bytes(b: &[u8]) -> Result<(Document, Vec<String>)> {
-    let mut d = designcraft_format::load(b).map_err(|e| EngineError::Other(e.to_string()))?;
-    let warnings = d.fix_parent_bases();
-    Ok((d, warnings))
-}
-
-/// The longest saved preset name, and how many presets are kept.
-const MAX_PRESET_NAME: usize = 100;
-const MAX_PRESETS: usize = 500;
-
-/// A built-in document preset or a saved one, by name (case ignored).
-fn find_preset(s: &Session, name: &str) -> Option<NewDocument> {
-    NewDocument::from_preset(name).or_else(|| s.prefs.document_presets.iter().find(|p| p.title.eq_ignore_ascii_case(name.trim())).cloned())
-}
-
-/// The settings `file.new` makes a document with for `p`: its preset, then the settings over it.
-fn new_document_settings(s: &Session, p: &Value) -> Result<NewDocument> {
-    let mut nd = match str_param(p, "preset") {
-        Some(name) => find_preset(s, name).ok_or_else(|| bad("file.new", format!("unknown preset `{name}`")))?,
-        None => NewDocument::default(),
-    };
-    apply_settings(&mut nd, p);
-    check_size("file.new", &nd)?;
-    Ok(nd)
-}
-
-/// A document as `file.new` makes it. Its Basic Paragraph doesn't hyphenate capitalized words, a
-/// paragraph's last word or across a column. Opened and imported files keep their own values,
-/// which is why `ParaProps` keeps the IDML defaults (on).
-fn new_document(nd: &NewDocument) -> Document {
-    let mut d = Document::new(nd);
-    if let Some(st) = Arc::make_mut(&mut d.styles).para_mut(designcraft_doc::BASIC_PARAGRAPH) {
-        st.para.hyph_capitalized = Some(false);
-        st.para.hyph_last_word = Some(false);
-        st.para.hyph_across_column = Some(false);
-    }
-    d
-}
-
-fn file_new(s: &mut Session, p: &Value) -> Result<Value> {
-    let mut nd = new_document_settings(s, p)?;
-    s.untitled += 1;
-    nd.title = str_param(p, "title").map(str::to_string).unwrap_or_else(|| format!("Untitled-{}", s.untitled));
-    let d = new_document(&nd);
-    let i = s.add_document(DocState::new(d, None));
-    Ok(json!({"index": i}))
-}
-
-impl Session {
-    /// New Document's Preview: a document made as `file.new` would make it with `p`, shown while
-    /// the New Document window is open. It replaces the previous preview document in its tab and
-    /// takes no Untitled number, no undo step and no recovery entry. Settings `file.new` refuses
-    /// leave the previous preview as it was. Returns the preview document's uid.
-    pub fn preview_new_document(&mut self, p: &Value) -> Result<u64> {
-        let mut nd = new_document_settings(self, p)?;
-        let previous = match self.new_document_preview {
-            Some((_, previous)) => previous,
-            None => self.active().map(|d| d.uid),
-        };
-        let shown = self.new_document_preview.and_then(|(old, _)| self.docs.iter().position(|d| d.uid == old));
-        // A preview edited or saved by a menu or script while the window is open has become a
-        // document of its own: it stays, and the preview gets a tab of its own.
-        let replace = shown.filter(|&i| self.docs.get(i).is_some_and(|d| !d.is_dirty() && d.path.is_none()));
-        if replace.is_none() && shown.is_some() {
-            self.untitled += 1;
-        }
-        nd.title = str_param(p, "title").map(str::to_string).unwrap_or_else(|| self.next_untitled_title());
-        let st = DocState::new(new_document(&nd), None);
-        let uid = st.uid;
-        match replace.and_then(|i| self.docs.get_mut(i).map(|d| (i, d))) {
-            Some((i, d)) => {
-                *d = st;
-                self.active = Some(i);
-            }
-            None => {
-                // Pushed without `add_document`: the document that was active stays as it is.
-                self.docs.push(st);
-                self.active = Some(self.docs.len() - 1);
-            }
-        }
-        self.new_document_preview = Some((uid, previous));
-        Ok(uid)
-    }
-
-    /// The uid of New Document's preview document, while one is shown.
-    pub fn new_document_preview(&self) -> Option<u64> {
-        self.new_document_preview.map(|(uid, _)| uid)
-    }
-
-    /// End New Document's preview. Its document goes, and if it was still the active document,
-    /// the one that was active before it is active again. A preview that a menu or script has
-    /// edited or saved stays open as a document, with an Untitled number. Returns the uid of the
-    /// document removed. Without a preview it does nothing.
-    pub fn end_new_document_preview(&mut self) -> Option<u64> {
-        let (uid, previous) = self.new_document_preview.take()?;
-        let i = self.docs.iter().position(|d| d.uid == uid)?;
-        let d = self.docs.get(i)?;
-        if d.is_dirty() || d.path.is_some() {
-            self.untitled += 1;
-            return None;
-        }
-        self.docs.remove(i);
-        self.active = match self.active {
-            Some(a) if a == i => previous.and_then(|p| self.docs.iter().position(|d| d.uid == p)).or_else(|| self.docs.len().checked_sub(1)),
-            Some(a) if a > i => Some(a - 1),
-            a => a,
-        };
-        Some(uid)
-    }
-
-    /// Create in the New Document window, with the settings the preview shows: the preview
-    /// document becomes the new document, as `file.new` would make it (the next Untitled number,
-    /// no undo history). Returns its index, or `None` when there is no unedited preview to keep.
-    pub fn keep_new_document_preview(&mut self) -> Option<usize> {
-        let (uid, _) = self.new_document_preview?;
-        let i = self.docs.iter().position(|d| d.uid == uid && !d.is_dirty() && d.path.is_none())?;
-        self.new_document_preview = None;
-        self.untitled += 1;
-        if let Some(d) = self.docs.get_mut(i) {
-            d.history.undo.clear();
-            d.history.redo.clear();
-        }
-        self.active = Some(i);
-        Some(i)
-    }
-}
-
-fn save_preset(s: &mut Session, p: &Value) -> Result<Value> {
-    let name = str_param(p, "name").map(str::trim).filter(|n| !n.is_empty()).ok_or_else(|| bad("file.savePreset", "missing `name`"))?.to_string();
-    if name.chars().count() > MAX_PRESET_NAME {
-        return Err(bad("file.savePreset", format!("a preset name has at most {MAX_PRESET_NAME} characters")));
-    }
-    if NewDocument::from_preset(&name).is_some() {
-        return Err(bad("file.savePreset", format!("`{name}` is a built-in preset")));
-    }
-    let mut nd = NewDocument::default();
-    apply_settings(&mut nd, p);
-    check_size("file.savePreset", &nd)?;
-    nd.title = name.clone();
-    let presets = &mut s.prefs.document_presets;
-    presets.retain(|x| !x.title.eq_ignore_ascii_case(&name));
-    if presets.len() >= MAX_PRESETS {
-        return Err(bad("file.savePreset", format!("at most {MAX_PRESETS} saved presets")));
-    }
-    presets.push(nd);
-    Ok(json!({"name": name}))
-}
-
-fn check_size(cmd: &str, nd: &NewDocument) -> Result<()> {
-    if !(nd.width > 0.0 && nd.height > 0.0 && nd.width <= 15552.0 && nd.height <= 15552.0) {
-        return Err(bad(cmd, "page size out of range (0 < size ≤ 216 in)"));
-    }
-    Ok(())
-}
-
-/// The document settings in `p` (as file.new takes them) over `nd`.
-fn apply_settings(nd: &mut NewDocument, p: &Value) {
-    if let Some(intent) = p.get("intent").and_then(|v| serde_json::from_value(v.clone()).ok()) {
-        nd.intent = intent;
-    }
-    if let Some(units) = p.get("units").and_then(|v| serde_json::from_value(v.clone()).ok()) {
-        nd.units = units;
-    }
-    nd.width = f64_or(p, "width", nd.width);
-    nd.height = f64_or(p, "height", nd.height);
-    nd.pages = p.get("pages").and_then(Value::as_u64).map(|v| v as usize).unwrap_or(nd.pages).clamp(1, 9999);
-    nd.start_page = p.get("startPage").and_then(Value::as_u64).map(|v| v.clamp(1, 99_999) as u32).unwrap_or(nd.start_page);
-    nd.facing_pages = p.get("facingPages").and_then(Value::as_bool).unwrap_or(nd.facing_pages);
-    nd.columns = p.get("columns").and_then(Value::as_u64).map(|v| v.clamp(1, 216) as u32).unwrap_or(nd.columns);
-    nd.gutter = f64_or(p, "gutter", nd.gutter);
-    nd.primary_text_frame = p.get("primaryTextFrame").and_then(Value::as_bool).unwrap_or(nd.primary_text_frame);
-    match p.get("margins") {
-        Some(Value::Number(n)) => nd.margins = designcraft_doc::Margins::uniform(n.as_f64().unwrap_or(36.0)),
-        Some(v @ Value::Object(_)) => {
-            if let Ok(m) = serde_json::from_value(v.clone()) {
-                nd.margins = m;
-            }
-        }
-        _ => {}
-    }
-    if let Some(b) = edges(p, "bleed") {
-        nd.bleed = b;
-    }
-    if let Some(b) = edges(p, "slug") {
-        nd.slug = b;
-    }
-}
-
-/// A bleed or slug parameter: one width for every edge, or [top, bottom, inside, outside].
-fn edges(p: &Value, key: &str) -> Option<[f64; 4]> {
-    let clean = |v: f64| if v.is_finite() { v.clamp(0.0, 1296.0) } else { 0.0 };
-    match p.get(key)? {
-        Value::Array(a) => match a.iter().map(Value::as_f64).collect::<Option<Vec<f64>>>()?.as_slice() {
-            [t, b, i, o] => Some([clean(*t), clean(*b), clean(*i), clean(*o)]),
-            _ => None,
-        },
-        v => v.as_f64().map(|b| [clean(b); 4]),
-    }
-}
-
-fn file_sample(s: &mut Session, _p: &Value) -> Result<Value> {
-    let d = crate::sample::magazine();
-    let i = s.add_document(DocState::new(d, None));
-    Ok(json!({"index": i}))
-}
-
-fn has_recent(s: &Session) -> std::result::Result<(), String> {
-    if s.prefs.recent_files.is_empty() { Err("no recent files".into()) } else { Ok(()) }
-}
-
-/// A recent file's first-page picture as straight RGBA, for the start screen.
-pub struct RecentPreview {
-    pub width: u32,
-    pub height: u32,
-    pub rgba: Vec<u8>,
-}
-
-/// The picture a `.designcraft` file saved of its first page; None when the file is gone, isn't
-/// ours, or was saved before files had one (it gets one when saved again).
-pub fn recent_preview(path: &str) -> Option<RecentPreview> {
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        // Only the zip directory and the preview entry are read, not the whole document.
-        let png = designcraft_format::read_preview(std::io::BufReader::new(crate::io::open(path).ok()?))?;
-        let img = designcraft_images::decode_rgba(&png)?;
-        let (width, height) = img.dimensions();
-        Some(RecentPreview { width, height, rgba: img.into_raw() })
-    }
-    #[cfg(target_arch = "wasm32")]
-    {
-        let _ = path;
-        None
-    }
-}
-
-/// One File › Open Recent row: the path, its file name and whether it is still there.
-fn recent_entry(path: &str) -> Value {
-    let name = std::path::Path::new(path).file_name().map_or_else(|| path.to_string(), |n| n.to_string_lossy().to_string());
-    #[cfg(not(target_arch = "wasm32"))]
-    let exists = crate::io::is_file(path);
-    #[cfg(target_arch = "wasm32")]
-    let exists = false;
-    json!({"path": path, "name": name, "exists": exists})
-}
-
-fn file_open_recent(s: &mut Session, p: &Value) -> Result<Value> {
-    let index =
-        p.get("index").and_then(Value::as_u64).and_then(|i| usize::try_from(i).ok()).ok_or_else(|| bad("file.openRecent", "missing `index`"))?;
-    let path = s
-        .prefs
-        .recent_files
-        .get(index)
-        .cloned()
-        .ok_or_else(|| bad("file.openRecent", format!("no recent file {index} (the list has {})", s.prefs.recent_files.len())))?;
-    #[cfg(not(target_arch = "wasm32"))]
-    if !crate::io::is_file(&path) {
-        return Err(EngineError::Other(format!("{path} can't be found: it was moved, renamed or deleted, or its disk isn't connected")));
-    }
-    file_open(s, &json!({"path": path}))
-}
-
-/// `file.open`: the document opens and moves to the front of File › Open Recent.
-fn file_open(s: &mut Session, p: &Value) -> Result<Value> {
-    let r = open_path(s, p)?;
-    if let Some(path) = str_param(p, "path") {
-        s.prefs.note_recent_file(path);
-    }
-    Ok(r)
-}
-
-fn open_path(s: &mut Session, p: &Value) -> Result<Value> {
-    let path = str_param(p, "path").ok_or_else(|| bad("file.open", "missing `path`"))?;
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        let bytes = crate::io::read_file(path).map_err(EngineError::Other)?;
-        // The content decides first: a file's extension may be missing or wrong. The extension
-        // then routes files whose content isn't recognised to the reader that explains why.
-        let ext = std::path::Path::new(path).extension().and_then(std::ffi::OsStr::to_str).unwrap_or_default().to_ascii_lowercase();
-        let native = designcraft_format::is_designcraft(&bytes) || bytes.trim_ascii_start().starts_with(b"{");
-        if designcraft_idml::is_idml(&bytes) || (!native && (super::interchange::is_indd(path, &bytes) || ext == "idml")) {
-            return super::interchange::open_idml(s, p);
-        }
-        if !native && ext != designcraft_format::EXTENSION {
-            return Err(bad("file.open", format!("{path}: not a DesignCraft or IDML file")));
-        }
-        let (mut d, mut warnings) = load_bytes(&bytes)?;
-        super::interchange::resolve_packaged_links(&mut d, Some(std::path::Path::new(path)));
-        super::datamerge::resolve_sources_on_open(&mut d, Some(std::path::Path::new(path)));
-        let (fonts, faces, font_warnings) = load_document_fonts(&mut d, path);
-        warnings.extend(font_warnings);
-        warnings.extend(super::style::grep_style_warnings(&d));
-        let mut st = DocState::new(d, Some(path.to_string()));
-        st.fonts = fonts;
-        let i = s.add_document(st);
-        Ok(json!({"index": i, "documentFonts": faces, "warnings": warnings}))
-    }
-    #[cfg(target_arch = "wasm32")]
-    {
-        let _ = (s, path);
-        Err(EngineError::Other("use file.openBytes on the web".into()))
-    }
-}
-
-/// Load the fonts in the `Document Fonts` folder beside the document file at `path` for `d` alone
-/// (`d.font_scope`) → (the scope, for the document's state to hold; faces; a warning for each
-/// font file skipped). Nothing on the web (no folders).
-pub(crate) fn load_document_fonts(d: &mut Document, path: &str) -> (Option<Arc<crate::FontScope>>, usize, Vec<String>) {
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        use designcraft_fonts::DOCUMENT_FONTS_FOLDER;
-        let Some(folder) = std::path::Path::new(path).parent().map(document_fonts_folder) else { return (None, 0, Vec::new()) };
-        // A document's folder is the agent's to name (a recovery entry or a book lists paths too):
-        // the fonts crate asks the automation roots about the folder and each font file, so fonts
-        // outside the read root stay unloaded.
-        let r = designcraft_fonts::FontDb::global().load_document_fonts(&folder, &|p| crate::file_access::check_read(p));
-        d.font_scope = r.scope;
-        let scope = (r.scope != 0).then(|| Arc::new(crate::FontScope(r.scope)));
-        (scope, r.faces, r.skipped.into_iter().map(|s| format!("{DOCUMENT_FONTS_FOLDER}: {s}")).collect())
-    }
-    #[cfg(target_arch = "wasm32")]
-    {
-        let _ = (d, path);
-        (None, 0, Vec::new())
-    }
-}
-
-/// The `Document Fonts` folder in `dir`, matched without regard to case: packages name it
-/// `Document fonts`, and file systems on Linux are case-sensitive. The exact name wins.
-#[cfg(not(target_arch = "wasm32"))]
-fn document_fonts_folder(dir: &std::path::Path) -> std::path::PathBuf {
-    use designcraft_fonts::DOCUMENT_FONTS_FOLDER;
-    let exact = dir.join(DOCUMENT_FONTS_FOLDER);
-    if crate::io::is_dir(&exact) {
-        return exact;
-    }
-    crate::io::read_dir(dir)
-        .into_iter()
-        .flatten()
-        .flatten()
-        .find(|e| e.file_name().to_str().is_some_and(|n| n.eq_ignore_ascii_case(DOCUMENT_FONTS_FOLDER)) && crate::io::is_dir(e.path()))
-        .map_or(exact, |e| e.path())
-}
-
-fn file_open_bytes(s: &mut Session, p: &Value) -> Result<Value> {
-    let b = base64_decode(str_param(p, "base64").unwrap_or(""));
-    // IDML packages are recognised by their stored `mimetype` first entry, INDD files by their
-    // signature (or their name).
-    if designcraft_idml::is_idml(&b) || super::interchange::is_indd(str_param(p, "name").unwrap_or_default(), &b) {
-        return super::interchange::open_idml(s, p);
-    }
-    let (mut d, warnings) = load_bytes(&b)?;
-    super::datamerge::resolve_sources_on_open(&mut d, None);
-    if let Some(n) = str_param(p, "name") {
-        d.title = n.to_string();
-    }
-    let i = s.add_document(DocState::new(d, None));
-    Ok(json!({"index": i, "warnings": warnings}))
-}
-
-fn file_save(s: &mut Session, p: &Value) -> Result<Value> {
-    let st = s.doc_mut()?;
-    // Saving to the document's own file keeps its name, even one opened without the extension.
-    let path = str_param(p, "path")
-        .map(with_document_extension)
-        .or_else(|| st.path.clone())
-        .ok_or_else(|| bad("file.save", "missing `path` (document has never been saved)"))?;
-    // Before anything about the document changes: a refused save leaves it as it was.
-    crate::file_access::check_write(&path).map_err(EngineError::Other)?;
-    // Prepare paths for the destination without changing the live document until persistence succeeds.
-    let mut saved = (*st.doc).clone();
-    super::datamerge::refresh_relative_paths(&mut saved, std::path::Path::new(&path));
-    let paths_changed = saved.data_merge != st.doc.data_merge;
-    let saved = if paths_changed { Arc::new(saved) } else { st.doc.clone() };
-    let bytes = to_bytes_with_preview(&saved, &s.cache)?;
-    #[cfg(not(target_arch = "wasm32"))]
-    crate::io::write_file(&path, &bytes).map_err(EngineError::Other)?;
-    let st = s.doc_mut()?;
-    if paths_changed {
-        st.doc = saved;
-        st.bump_revision();
-    }
-    st.path = Some(path.clone());
-    st.saved_revision = st.revision;
-    st.saved_doc = st.doc.clone();
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        let recovery_dir = s.recovery_dir.clone();
-        let index = s.active_index().ok_or(EngineError::NoDocument)?;
-        crate::recovery::discard_document(s, index, recovery_dir.as_deref());
-        s.prefs.note_recent_file(&path);
-    }
-    Ok(json!({"path": path, "bytes": bytes.len()}))
-}
-
-fn file_place(s: &mut Session, p: &Value) -> Result<Value> {
-    // The file's size and time before it is read (a linked text file remembers them).
-    let mut before = None;
-    let (bytes, name, link) = if let Some(b) = str_param(p, "base64") {
-        (base64_decode(b), str_param(p, "name").unwrap_or("image").to_string(), None)
-    } else if let Some(path) = str_param(p, "path") {
-        before = super::datamerge::fingerprint_from_path(path);
-        #[cfg(not(target_arch = "wasm32"))]
-        let b = crate::io::read_file(path).map_err(EngineError::Other)?;
-        #[cfg(target_arch = "wasm32")]
-        let b: Vec<u8> = vec![];
-        let name = std::path::Path::new(path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| path.into());
-        (b, name, Some(path.to_string()))
-    } else {
-        s.ui_requests.push(crate::UiRequest::Pick { purpose: "place".into(), params: json!({}) });
-        return ok();
-    };
-    // A page of another layout (IDML or DesignCraft): its objects, as one group.
-    let lname = name.to_lowercase();
-    if lname.ends_with(".idml") || lname.ends_with(".designcraft") {
-        return place_layout_page(s, p, &name, &bytes);
-    }
-    // Keep the EPS source for link comparison; rendering uses its preview at the bounding box size.
-    let eps_size = eps_size(&bytes, "file.place")?;
-    // Video and sound: a media frame (Window › Interactive › Media).
-    if let Some(mime) = designcraft_doc::media_mime(&name) {
-        return super::media::place_media(s, p, name, mime, bytes, link);
-    }
-    // Text files (plain, Word, RTF) flow into frames.
-    if designcraft_textimport::is_text_file(&name) {
-        return super::place_text::place_text(s, p, &name, &bytes, link, before);
-    }
-    let want_w = p
-        .get("width")
-        .filter(|value| !value.is_null())
-        .map(|value| {
-            value
-                .as_f64()
-                .filter(|width| width.is_finite() && *width > 0.0)
-                .ok_or_else(|| bad("file.place", "`width` must be a finite number greater than zero"))
-        })
-        .transpose()?;
-    // Image Import Options: which page of a PDF (1-based).
-    if designcraft_render::is_pdf(&bytes) {
-        designcraft_render::check_pdf_input_size(bytes.len()).map_err(|e| bad("file.place", e.to_string()))?;
-    }
-    let pdf_page = match p.get("pdfPage").and_then(Value::as_u64) {
-        Some(n) if designcraft_render::is_pdf(&bytes) => {
-            let count = designcraft_render::pdf_page_count(&bytes).unwrap_or(1);
-            let invalid_page = || bad("file.place", format!("the PDF has {count} page(s)"));
-            let one_based = usize::try_from(n).map_err(|_| invalid_page())?;
-            if one_based == 0 || one_based > count {
-                return Err(invalid_page());
-            }
-            let zero_based = one_based.checked_sub(1).ok_or_else(invalid_page)?;
-            u32::try_from(zero_based).map_err(|_| invalid_page())?
-        }
-        _ => 0,
-    };
-    let (pw, ph) = match pdf_page {
-        0 => designcraft_render::image_size(&bytes).ok_or_else(|| bad("file.place", "unsupported or corrupt image"))?,
-        n => designcraft_render::pdf_page_size(&bytes, n as usize)
-            .map(|(w, h)| (w.round().max(1.0) as u32, h.round().max(1.0) as u32))
-            .ok_or_else(|| bad("file.place", "can't read that PDF page"))?,
-    };
-    // 72 ppi by default unless the file says otherwise; scale so it fits the page when huge. PDF pages
-    // and SVGs keep their exact size: rounding it to whole points would stretch them unevenly.
-    let (nw, nh) = eps_size.or_else(|| designcraft_render::natural_size(&bytes, pdf_page as usize)).unwrap_or((pw as f64, ph as f64));
-    // Image Import Options › Crop to: the graphic spans that box of the PDF page.
-    let is_pdf = designcraft_render::is_pdf(&bytes);
-    let pdf_crop = match str_param(p, "pdfCrop") {
-        Some(k) if is_pdf => PdfCrop::from_name(k)
-            .ok_or_else(|| bad("file.place", format!("unknown pdfCrop `{k}` (crop, art, trim, bleed, media, contentVisible, contentAll)")))?,
-        _ => PdfCrop::Crop,
-    };
-    let mime = designcraft_render::image_mime(&bytes).to_string();
-    let mut asset = Asset { page: pdf_page, name, mime, link, data: Arc::new(bytes), pixels: Some((pw, ph)), pdf_crop, ..Default::default() };
-    // The graphic's natural size: the box in points (the whole page when the box can't be found,
-    // and then the document says so).
-    let (bw, bh) = match crop_pdf(&mut asset) {
-        Some(size) => size,
-        None => {
-            asset.pdf_crop = PdfCrop::Crop;
-            (nw, nh)
-        }
-    };
-    let target_frame = super::id_param(p, "frame").or_else(|| {
-        if ["x", "y", "spread", "width"].iter().any(|key| p.get(*key).is_some_and(|value| !value.is_null())) {
-            return None;
-        }
-        let st = s.active()?;
-        st.selection.items.iter().copied().find(|i| st.doc.item(*i).is_some_and(|it| matches!(it.content, Content::Unassigned | Content::Graphic(_))))
-    });
-    // `"spread": null` counts as omitted, like the other placement parameters.
-    let spread = match p.get("spread") {
-        Some(Value::Null) => designcraft_doc::SpreadRef::Doc(0),
-        _ => super::spread_param(p, "file.place")?,
-    };
-    let lid = s.doc()?.active_layer;
-    let px = p.get("x").and_then(Value::as_f64);
-    let py = p.get("y").and_then(Value::as_f64);
-    if target_frame.is_none() && px.is_none() && py.is_none() && p.get("loadCursor").and_then(Value::as_bool) == Some(true) {
-        return load_cursor(s, asset, (bw, bh));
-    }
-    s.edit(|d, sel| {
-        let fresh = AssetId(d.alloc());
-        let aid = d.add_asset(Asset { id: fresh, ..asset });
-        // The width the whole page (or image) gets; the height follows the proportions.
-        let w = match want_w {
-            Some(w) => w,
-            None => {
-                let page_w = d.settings.page_width * 0.6;
-                nw.min(page_w)
-            }
-        };
-        let id = if let Some(fid) = target_frame {
-            let it = d.item_mut(fid).ok_or(designcraft_doc::DocError::NoItem(fid))?;
-            let r = it.inner_bounds();
-            // Fill the frame proportionally once. Auto-Fit stays off, so resizing the frame crops.
-            let k = (r.width() / bw).max(r.height() / bh);
-            let (gw, gh) = (bw * k, bh * k);
-            let xf = Affine::translate((r.x0 + (r.width() - gw) / 2.0, r.y0 + (r.height() - gh) / 2.0)) * Affine::scale(k);
-            validate_placement((bw, bh), r, xf, "file.place")?;
-            it.content = Content::Graphic(Graphic {
-                asset: aid,
-                size: (bw, bh),
-                xf,
-                clip: None,
-                auto_fit: Default::default(),
-                fit_align: 4,
-                crop: [0.0; 4],
-                wrap: Default::default(),
-                fill: Default::default(),
-            });
-            fid
-        } else {
-            let sp = d.spread(spread).ok_or_else(|| bad("file.place", "no such spread"))?;
-            let pr = sp.pages.first().map(|pg| pg.margin_rect()).unwrap_or(Rect::new(36.0, 36.0, 300.0, 300.0));
-            let (x, y) = (px.unwrap_or(pr.x0), py.unwrap_or(pr.y0));
-            let id = ItemId(d.alloc());
-            let k = w / nw;
-            let r = super::finite_rect("file.place", Rect::new(x, y, x + bw * k, y + bh * k))?;
-            let xf = Affine::translate((x, y)) * Affine::scale(k);
-            validate_placement((bw, bh), r, xf, "file.place")?;
-            let mut it = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(r));
-            it.object_style = d.styles.default_graphic_frame.clone();
-            if let Some(e) = d.styles.object_effects(&it.object_style) {
-                it.effects = e.clone();
-            }
-            it.content = Content::Graphic(Graphic {
-                asset: aid,
-                size: (bw, bh),
-                xf,
-                clip: None,
-                auto_fit: Default::default(),
-                fit_align: 4,
-                crop: [0.0; 4],
-                wrap: Default::default(),
-                fill: Default::default(),
-            });
-            d.insert_item(spread, it, None)?;
-            id
-        };
-        *sel = Selection::items(vec![id]);
-        Ok(json!({"id": id.0, "asset": aid.0}))
-    })
-}
-
-const B64: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-pub fn base64_encode(data: &[u8]) -> String {
-    let mut out = String::with_capacity(data.len().div_ceil(3) * 4);
-    for c in data.chunks(3) {
-        let n = (c[0] as u32) << 16 | (*c.get(1).unwrap_or(&0) as u32) << 8 | *c.get(2).unwrap_or(&0) as u32;
-        out.push(B64[(n >> 18) as usize & 63] as char);
-        out.push(B64[(n >> 12) as usize & 63] as char);
-        out.push(if c.len() > 1 { B64[(n >> 6) as usize & 63] as char } else { '=' });
-        out.push(if c.len() > 2 { B64[n as usize & 63] as char } else { '=' });
-    }
-    out
-}
-
-pub fn base64_decode(s: &str) -> Vec<u8> {
-    let mut out = Vec::with_capacity(s.len() * 3 / 4);
-    let mut buf = 0u32;
-    let mut bits = 0;
-    for b in s.bytes() {
-        let v = match b {
-            b'A'..=b'Z' => b - b'A',
-            b'a'..=b'z' => b - b'a' + 26,
-            b'0'..=b'9' => b - b'0' + 52,
-            b'+' | b'-' => 62,
-            b'/' | b'_' => 63,
-            _ => continue,
-        } as u32;
-        buf = buf << 6 | v;
-        bits += 6;
-        if bits >= 8 {
-            bits -= 8;
-            out.push((buf >> bits) as u8);
-        }
-    }
-    out
-}
-
-/// Sets `a.pdf_box` to where its `pdf_crop` box sits on its page and returns the box's size in
-/// points. The crop box is the whole page and has none; nor has a page that can't be read, which
-/// keeps its crop choice (a missing link relinked later gets its box then).
-pub(crate) fn crop_pdf(a: &mut Asset) -> Option<(f64, f64)> {
-    a.pdf_box = None;
-    if a.pdf_crop == PdfCrop::Crop || !designcraft_render::is_pdf(&a.data) {
-        return None;
-    }
-    let (frac, size) = designcraft_render::pdf_crop_box(&a.data, a.page as usize, a.pdf_crop)?;
-    a.pdf_box = Some(frac);
-    Some(size)
-}
-
-pub(crate) fn read_source(p: &Value) -> Result<(Vec<u8>, String, Option<String>)> {
-    if let Some(b) = str_param(p, "base64") {
-        return Ok((base64_decode(b), str_param(p, "name").unwrap_or("image").to_string(), None));
-    }
-    let path = str_param(p, "path").ok_or_else(|| bad("place", "missing `path` or `base64`"))?;
-    #[cfg(not(target_arch = "wasm32"))]
-    let b = crate::io::read_file(path).map_err(EngineError::Other)?;
-    #[cfg(target_arch = "wasm32")]
-    let b: Vec<u8> = vec![];
-    let name = std::path::Path::new(path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| path.into());
-    Ok((b, name, Some(path.to_string())))
-}
-
-fn eps_size(bytes: &[u8], command: &str) -> Result<Option<(f64, f64)>> {
-    if !designcraft_images::is_eps(bytes) {
-        return Ok(None);
-    }
-    designcraft_images::eps_size(bytes)
-        .map(Some)
-        .ok_or_else(|| bad(command, "the EPS has a missing or invalid bounding box (dimensions must be 0.001–20,000 points)"))
-}
-
-/// Fitting can overflow even with finite inputs. Never persist NaN/Inf as JSON nulls.
-pub(crate) fn validate_placement(size: (f64, f64), frame: Rect, xf: Affine, command: &str) -> Result<()> {
-    let valid_rect = |r: Rect| [r.x0, r.y0, r.x1, r.y1, r.width(), r.height()].iter().all(|n| n.is_finite()) && r.width() >= 0.0 && r.height() >= 0.0;
-    if !size.0.is_finite()
-        || !size.1.is_finite()
-        || size.0 <= 0.0
-        || size.1 <= 0.0
-        || !valid_rect(frame)
-        || !xf.as_coeffs().iter().all(|n| n.is_finite())
-        || !valid_rect(xf.transform_rect_bbox(Rect::new(0.0, 0.0, size.0, size.1)))
-    {
-        return Err(bad(command, "image placement exceeds finite geometry limits"));
-    }
-    Ok(())
-}
-
-fn place_load(s: &mut Session, p: &Value) -> Result<Value> {
-    let (bytes, name, link) = read_source(p)?;
-    let (pw, ph) = designcraft_render::image_size(&bytes).ok_or_else(|| bad("place.load", "unsupported or corrupt image"))?;
-    let natural = eps_size(&bytes, "place.load")?.or_else(|| designcraft_render::natural_size(&bytes, 0)).unwrap_or((pw as f64, ph as f64));
-    let mime = designcraft_render::image_mime(&bytes).to_string();
-    let asset = Asset { name, mime, link, data: Arc::new(bytes), pixels: Some((pw, ph)), ..Default::default() };
-    load_cursor(s, asset, natural)
-}
-
-/// Adds `asset` to the document (with a fresh id) and loads it into the place cursor.
-fn load_cursor(s: &mut Session, mut asset: Asset, size: (f64, f64)) -> Result<Value> {
-    let name = asset.name.clone();
-    let (pw, ph) = asset.pixels.unwrap_or_default();
-    let aid = s.edit(|d, _| {
-        asset.id = AssetId(d.alloc());
-        Ok(d.add_asset(asset))
-    })?;
-    s.loaded = Some(crate::LoadedGraphic { asset: aid, size });
-    s.set_tool("placeGun");
-    Ok(json!({"asset": aid.0, "name": name, "width": pw, "height": ph, "loaded": true}))
-}
-
-fn place_drop(s: &mut Session, p: &Value) -> Result<Value> {
-    let crate::LoadedGraphic { asset: aid, size: (nw, nh) } = s.loaded.ok_or_else(|| bad("place.drop", "nothing loaded in the place cursor"))?;
-    // Undo can remove the loaded graphic's asset.
-    if !s.doc()?.doc.assets.contains_key(&aid) {
-        s.loaded = None;
-        return Err(bad("place.drop", "the loaded graphic is no longer in the document"));
-    }
-    let sr = super::spread_param(p, "place.drop")?;
-    let lid = s.doc()?.active_layer;
-    let frame = super::id_param(p, "frame");
-    let rect = super::rect_param(p, "rect");
-    let (x, y) = (super::f64_or(p, "x", 0.0), super::f64_or(p, "y", 0.0));
-    let d = &s.doc()?.doc;
-    let (frame_rect, xf, auto_fit) = if let Some(fid) = frame {
-        let r = d.item(fid).ok_or(designcraft_doc::DocError::NoItem(fid))?.inner_bounds();
-        let k = (r.width() / nw).max(r.height() / nh);
-        let xf = Affine::translate((r.x0 + (r.width() - nw * k) / 2.0, r.y0 + (r.height() - nh * k) / 2.0)) * Affine::scale(k);
-        // Fill the frame proportionally once. Auto-Fit stays off, so resizing the frame crops.
-        (r, xf, Default::default())
-    } else {
-        if d.spread(sr).is_none() {
-            return Err(bad("place.drop", "no such spread"));
-        }
-        // Drag: fit proportionally; click: actual size at the point.
-        let (r, k) = match rect {
-            Some(r) if r.width() > 2.0 && r.height() > 2.0 => {
-                let k = (r.width() / nw).min(r.height() / nh);
-                (Rect::new(r.x0, r.y0, r.x0 + nw * k, r.y0 + nh * k), k)
-            }
-            _ => (Rect::new(x, y, x + nw, y + nh), 1.0),
-        };
-        (r, Affine::translate((r.x0, r.y0)) * Affine::scale(k), Default::default())
-    };
-    validate_placement((nw, nh), frame_rect, xf, "place.drop")?;
-    let r = s.edit(|d, sel| {
-        let graphic = Content::Graphic(Graphic {
-            asset: aid,
-            size: (nw, nh),
-            xf,
-            clip: None,
-            auto_fit,
-            fit_align: 4,
-            crop: [0.0; 4],
-            wrap: Default::default(),
-            fill: Default::default(),
-        });
-        let id = if let Some(fid) = frame {
-            d.item_mut(fid).ok_or(designcraft_doc::DocError::NoItem(fid))?.content = graphic;
-            fid
-        } else {
-            let id = ItemId(d.alloc());
-            let mut it = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(frame_rect));
-            it.object_style = d.styles.default_graphic_frame.clone();
-            if let Some(e) = d.styles.object_effects(&it.object_style) {
-                it.effects = e.clone();
-            }
-            it.content = graphic;
-            d.insert_item(sr, it, None)?;
-            id
-        };
-        *sel = Selection::items(vec![id]);
-        Ok(json!({"id": id.0}))
-    })?;
-    s.loaded = None;
-    s.set_tool("selection");
-    Ok(r)
-}
-
-/// The selection as `.designcraft` snippet bytes.
-pub(crate) fn snippet_bytes(s: &mut Session) -> Result<Vec<u8>> {
-    to_bytes(&super::edit::clip_doc(s)?)
-}
-
-fn snippet_export(s: &mut Session, p: &Value) -> Result<Value> {
-    let d = super::edit::clip_doc(s)?;
-    let bytes = to_bytes(&d)?;
-    match str_param(p, "path") {
-        Some(path) => {
-            #[cfg(not(target_arch = "wasm32"))]
-            crate::io::write_file(path, &bytes).map_err(EngineError::Other)?;
-            Ok(json!({"path": path, "bytes": bytes.len(), "items": d.spreads.first().map(|s| s.items.len()).unwrap_or(0)}))
-        }
-        None => Ok(json!({"base64": base64_encode(&bytes), "bytes": bytes.len()})),
-    }
-}
-
-/// File › Place of an IDML or DesignCraft document: the objects of one page (`layoutPage`,
-/// 1-based) grouped, top-left at x/y (default: the source position on the first page).
-fn place_layout_page(s: &mut Session, p: &Value, name: &str, bytes: &[u8]) -> Result<Value> {
-    const ID: &str = "file.place";
-    let src = if name.to_lowercase().ends_with(".idml") {
-        super::interchange::import_idml_confined(bytes, str_param(p, "path").map(std::path::Path::new)).map_err(|e| bad(ID, e.to_string()))?
-    } else {
-        from_bytes(bytes)?
-    };
-    let n = src.page_count();
-    let page = p.get("layoutPage").and_then(Value::as_u64).unwrap_or(1) as usize;
-    if page == 0 || page > n {
-        return Err(bad(ID, format!("the document has {n} page(s)")));
-    }
-    let (si, pi) = src.page_loc(page - 1).ok_or_else(|| bad(ID, "no such page"))?;
-    let sp = &src.spreads[si];
-    let pr = sp.pages[pi].bounds();
-    let ids: Vec<ItemId> = sp.items.iter().filter(|it| !it.hidden && sp.page_at_x(it.bounds().center().x) == Some(pi)).map(|it| it.id).collect();
-    if ids.is_empty() {
-        return Err(bad(ID, format!("page {page} has no objects")));
-    }
-    let to = super::spread_param(p, ID)?;
-    let off = match (p.get("x").and_then(Value::as_f64), p.get("y").and_then(Value::as_f64)) {
-        (Some(x), Some(y)) => designcraft_geom::Vec2::new(x - pr.x0, y - pr.y0),
-        _ => designcraft_geom::Vec2::new(-pr.x0, -pr.y0),
-    };
-    let placed = s.edit(|d, sel| {
-        for sw in &src.swatches {
-            if d.swatch(&sw.name).is_none() {
-                d.swatches.push(sw.clone());
-            }
-        }
-        let missing_p: Vec<_> = src.styles.paragraph.iter().filter(|ps| d.styles.para(&ps.name).is_none()).cloned().collect();
-        let missing_c: Vec<_> = src.styles.character.iter().filter(|cs| d.styles.char_style(&cs.name).is_none()).cloned().collect();
-        if !missing_p.is_empty() || !missing_c.is_empty() {
-            let st = d.styles_mut();
-            st.paragraph.extend(missing_p);
-            st.character.extend(missing_c);
-        }
-        let new = super::object::duplicate_from(d, &src, &ids, to, off)?;
-        *sel = Selection::items(new.clone());
-        Ok(new)
-    })?;
-    if placed.len() > 1 {
-        let g = s.execute("object.group", &json!({"ids": placed.iter().map(|i| i.0).collect::<Vec<_>>()}))?;
-        return Ok(json!({"id": g["id"], "items": placed.len()}));
-    }
-    Ok(json!({"id": placed[0].0, "items": 1}))
-}
-
-pub(crate) fn snippet_place(s: &mut Session, p: &Value) -> Result<Value> {
-    let (bytes, _, _) = read_source(p)?;
-    let src = from_bytes(&bytes)?;
-    let ids: Vec<ItemId> = src.spreads.first().map(|sp| sp.items.iter().map(|i| i.id).collect()).unwrap_or_default();
-    if ids.is_empty() {
-        return Err(bad("snippet.place", "the snippet is empty"));
-    }
-    let sr = super::spread_param(p, "snippet.place")?;
-    let bounds = ids.iter().filter_map(|i| src.item(*i).map(|it| it.bounds())).reduce(|a, b| a.union(b)).unwrap_or(Rect::ZERO);
-    let off = match (p.get("x").and_then(Value::as_f64), p.get("y").and_then(Value::as_f64)) {
-        (Some(x), Some(y)) => designcraft_geom::Vec2::new(x - bounds.x0, y - bounds.y0),
-        _ => designcraft_geom::Vec2::ZERO,
-    };
-    s.edit(|d, sel| {
-        // Bring over styles and swatches the snippet uses that this document lacks.
-        for sw in &src.swatches {
-            if d.swatch(&sw.name).is_none() {
-                d.swatches.push(sw.clone());
-            }
-        }
-        let missing_p: Vec<_> = src.styles.paragraph.iter().filter(|ps| d.styles.para(&ps.name).is_none()).cloned().collect();
-        let missing_c: Vec<_> = src.styles.character.iter().filter(|cs| d.styles.char_style(&cs.name).is_none()).cloned().collect();
-        if !missing_p.is_empty() || !missing_c.is_empty() {
-            let st = d.styles_mut();
-            st.paragraph.extend(missing_p);
-            st.character.extend(missing_c);
-        }
-        let new = super::object::duplicate_from(d, &src, &ids, sr, off)?;
-        *sel = Selection::items(new.clone());
-        Ok(json!({"ids": new.iter().map(|i| i.0).collect::<Vec<_>>()}))
-    })
-}
-
-/// Which access a recovery command needs to the folder it is given.
-#[derive(Clone, Copy)]
-enum FolderAccess {
-    Read,
-    Write,
-    ReadWrite,
-}
-
-/// The recovery folder: `dir` when the command names one, else the session's own (set by the
-/// host application, so not the automation roots' business). A named folder is checked against
-/// the roots for `access`.
-fn recovery_dir(s: &Session, p: &Value, access: FolderAccess) -> Result<std::path::PathBuf> {
-    #[cfg(target_arch = "wasm32")]
-    {
-        let _ = (s, p, access);
-        Err(EngineError::Other("no recovery folder on the web".into()))
-    }
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        let Some(named) = str_param(p, "dir") else {
-            return s.recovery_dir.clone().ok_or_else(|| bad("file.recovery", "no recovery folder (give `dir`)"));
-        };
-        if matches!(access, FolderAccess::Read | FolderAccess::ReadWrite) {
-            crate::file_access::check_read(named).map_err(EngineError::Other)?;
-        }
-        if matches!(access, FolderAccess::Write | FolderAccess::ReadWrite) {
-            crate::file_access::check_write(named).map_err(EngineError::Other)?;
-        }
-        Ok(std::path::PathBuf::from(named))
-    }
-}
-
-fn can_revert(s: &Session) -> std::result::Result<(), String> {
-    match s.active() {
-        Some(d) if d.path.is_some() && d.is_dirty() => Ok(()),
-        Some(d) if d.path.is_none() => Err("the document has never been saved".into()),
-        Some(_) => Err("no changes since the last save".into()),
-        None => Err("no document open".into()),
-    }
-}
-
-fn file_revert(s: &mut Session, _: &Value) -> Result<Value> {
-    let path = s.doc()?.path.clone().ok_or_else(|| bad("file.revert", "the document has never been saved"))?;
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        let mut d = if path.to_ascii_lowercase().ends_with(".idml") {
-            let bytes = crate::io::read_file(&path).map_err(EngineError::Other)?;
-            super::interchange::import_idml_confined(&bytes, Some(std::path::Path::new(&path))).map_err(|e| EngineError::Other(e.to_string()))?
-        } else {
-            from_bytes(&crate::io::read_file(&path).map_err(EngineError::Other)?)?
-        };
-        // As opened again: the fonts beside it now (unchanged files are shared, not read again).
-        let (fonts, _, _) = load_document_fonts(&mut d, &path);
-        let uid = s.doc()?.uid;
-        let recovery_dir = s.recovery_dir.clone();
-        let index = s.active_index().ok_or(EngineError::NoDocument)?;
-        let mut fresh = DocState::new(d, Some(path.clone()));
-        fresh.fonts = fonts;
-        fresh.uid = uid;
-        // A new state has a revision no state had before, so caches don't show the old document.
-        crate::recovery::discard_document(s, index, recovery_dir.as_deref());
-        *s.doc_mut()? = fresh;
-        Ok(json!({"path": path}))
-    }
-    #[cfg(target_arch = "wasm32")]
-    {
-        let _ = (s, path);
-        Err(EngineError::Other("revert isn't available on the web".into()))
-    }
-}
-
-#[cfg(all(test, not(target_arch = "wasm32")))]
-mod image_place_tests {
-    use designcraft_doc::{Content, ItemId};
-    use designcraft_geom::Rect;
-    use serde_json::{Value, json};
-
-    use crate::Session;
-
-    pub(super) fn image_file() -> std::io::Result<tempfile::NamedTempFile> {
-        image_file_with_color(30)
-    }
-
-    fn image_file_with_color(red: u8) -> std::io::Result<tempfile::NamedTempFile> {
-        let file = tempfile::Builder::new().suffix(".png").tempfile()?;
-        let png = designcraft_render::Rendered { width: 40, height: 20, pixels: [red, 90, 180, 255].repeat(800) }.to_png();
-        std::fs::write(file.path(), png)?;
-        Ok(file)
-    }
-
-    #[test]
-    fn consecutive_path_placements_create_distinct_graphics() {
-        let images = [image_file_with_color(30).unwrap(), image_file_with_color(31).unwrap(), image_file_with_color(32).unwrap()];
-        let mut session = Session::new();
-        session.execute("file.new", &json!({"pages": 3, "facingPages": false})).unwrap();
-        let mut placements = Vec::new();
-        let mut originals = Vec::new();
-
-        for ((spread, x, y), image) in [(0, 0.0, 0.0), (1, 70.0, 90.0), (2, 150.0, 210.0)].into_iter().zip(&images) {
-            let placed = session.execute("file.place", &json!({"path": image.path(), "spread": spread, "x": x, "y": y})).unwrap();
-            let id = ItemId(placed["id"].as_u64().unwrap());
-            assert!(
-                placements.iter().all(|previous: &Value| previous["id"] != placed["id"]),
-                "each explicit placement needs a distinct frame: {placed}"
-            );
-            let document = &session.doc().unwrap().doc;
-            let item = document.item(id).unwrap();
-            assert_eq!(item.bounds(), Rect::new(x, y, x + 40.0, y + 20.0));
-            assert!(document.spreads[spread].items.iter().any(|item| item.id == id));
-            originals.push(serde_json::to_value(item).unwrap());
-            placements.push(placed);
-        }
-
-        let document = &session.doc().unwrap().doc;
-        assert_eq!(document.spreads.iter().flat_map(|spread| &spread.items).filter(|item| matches!(item.content, Content::Graphic(_))).count(), 3);
-        assert_eq!(document.assets.len(), 3);
-        for (placed, original) in placements.iter().zip(originals) {
-            assert_eq!(serde_json::to_value(document.item(ItemId(placed["id"].as_u64().unwrap())).unwrap()).unwrap(), original);
-        }
-        let links = session.execute("links.list", &json!({})).unwrap();
-        assert_eq!(links.as_array().unwrap().len(), 3);
-        for (placed, image) in placements.into_iter().zip(&images) {
-            let row = links.as_array().unwrap().iter().find(|row| row["asset"] == placed["asset"]).unwrap();
-            assert_eq!(row["path"], json!(image.path()));
-            assert_eq!(row["uses"].as_array().unwrap().len(), 1);
-            assert_eq!(row["uses"][0]["id"], placed["id"]);
-        }
-    }
-
-    #[test]
-    fn individual_placement_parameters_bypass_selected_frames() {
-        let image = image_file().unwrap();
-        for graphic in [false, true] {
-            for (key, value, expected) in [
-                ("x", 0, Rect::new(0.0, 36.0, 40.0, 56.0)),
-                ("y", 0, Rect::new(36.0, 0.0, 76.0, 20.0)),
-                ("spread", 0, Rect::new(36.0, 36.0, 76.0, 56.0)),
-                ("width", 0, Rect::ZERO),
-                ("width", 80, Rect::new(36.0, 36.0, 116.0, 76.0)),
-            ] {
-                let mut session = Session::new();
-                session.execute("file.new", &json!({})).unwrap();
-                let selected = session.execute("frame.create", &json!({"rect": [100, 120, 200, 220]})).unwrap();
-                if graphic {
-                    session.execute("file.place", &json!({"path": image.path()})).unwrap();
-                }
-                let id = ItemId(selected["id"].as_u64().unwrap());
-                let original = serde_json::to_value(session.doc().unwrap().doc.item(id).unwrap()).unwrap();
-                let mut params = json!({"path": image.path()});
-                params[key] = json!(value);
-
-                let result = session.execute("file.place", &params);
-                if key == "width" && value == 0 {
-                    assert!(result.is_err(), "zero width must be rejected, graphic={graphic}");
-                    continue;
-                }
-                let placed = result.unwrap();
-
-                assert_ne!(placed["id"], selected["id"], "{key}={value}, graphic={graphic}");
-                let document = &session.doc().unwrap().doc;
-                assert_eq!(serde_json::to_value(document.item(id).unwrap()).unwrap(), original);
-                let item = document.item(ItemId(placed["id"].as_u64().unwrap())).unwrap();
-                assert_eq!(item.bounds(), expected);
-                let Content::Graphic(content) = &item.content else { panic!("placed frame must be graphic") };
-                let [scale_x, _, _, scale_y, _, _] = content.xf.as_coeffs();
-                assert!(scale_x > 0.0 && scale_y > 0.0);
-            }
-        }
-    }
-
-    #[test]
-    fn explicit_frame_wins_over_placement_and_selection() {
-        let image = image_file().unwrap();
-        let mut session = Session::new();
-        session.execute("file.new", &json!({})).unwrap();
-        let target = session.execute("frame.create", &json!({"rect": [100, 120, 200, 220]})).unwrap();
-        let selected = session.execute("frame.create", &json!({"rect": [300, 320, 400, 420]})).unwrap();
-
-        let placed =
-            session.execute("file.place", &json!({"path": image.path(), "frame": target["id"], "x": 0, "y": 0, "spread": 99, "width": 80})).unwrap();
-
-        assert_eq!(placed["id"], target["id"]);
-        let document = &session.doc().unwrap().doc;
-        let item = document.item(ItemId(target["id"].as_u64().unwrap())).unwrap();
-        assert_eq!(item.bounds(), Rect::new(100.0, 120.0, 200.0, 220.0));
-        assert!(matches!(item.content, Content::Graphic(_)));
-        assert!(matches!(document.item(ItemId(selected["id"].as_u64().unwrap())).unwrap().content, Content::Unassigned));
-        assert_eq!(document.spreads[0].items.len(), 2);
-    }
-
-    fn assert_width_rejected(width: Value) -> std::result::Result<(), Box<dyn std::error::Error>> {
-        let image = image_file()?;
-        for graphic in [false, true] {
-            for explicit_frame in [false, true] {
-                let mut session = Session::new();
-                session.execute("file.new", &json!({}))?;
-                let target = session.execute("frame.create", &json!({"rect": [100, 120, 200, 220]}))?;
-                if graphic {
-                    session.execute("file.place", &json!({"path": image.path()}))?;
-                }
-                let mut params = json!({"path": image.path(), "width": width});
-                if explicit_frame {
-                    params["frame"] = target["id"].clone();
-                    session.execute("frame.create", &json!({"rect": [300, 320, 400, 420]}))?;
-                }
-                let before = session.doc()?;
-                let document = before.doc.clone();
-                let selection = before.selection.clone();
-                let revision = before.revision;
-                let assets = document.assets.len();
-
-                let result = session.execute("file.place", &params);
-
-                assert!(
-                    matches!(&result, Err(crate::EngineError::BadParams { .. })),
-                    "width={width}, graphic={graphic}, explicit_frame={explicit_frame}: expected BadParams, got {result:?}"
-                );
-                let error = result.err().ok_or_else(|| crate::EngineError::Other("expected placement error".into()))?;
-                let crate::EngineError::BadParams { cmd, msg } = error else { return Err(error.into()) };
-                assert_eq!(cmd, "file.place");
-                assert!(msg.contains("width") && msg.contains("finite") && msg.contains("greater than zero"), "{msg}");
-                let after = session.doc()?;
-                assert!(std::sync::Arc::ptr_eq(&document, &after.doc));
-                assert_eq!(after.selection, selection);
-                assert_eq!(after.revision, revision);
-                assert_eq!(after.doc.assets.len(), assets);
-            }
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn width_rejected_when_zero() {
-        assert_width_rejected(json!(0)).unwrap();
-    }
-
-    #[test]
-    fn width_rejected_when_negative() {
-        assert_width_rejected(json!(-80)).unwrap();
-    }
-
-    #[test]
-    fn width_rejected_when_non_numeric() {
-        for width in [json!("80"), json!(true), json!([80]), json!({"value": 80})] {
-            assert_width_rejected(width).unwrap();
-        }
-    }
-
-    fn assert_null_placement_uses_selection(keys: &[&str]) -> std::result::Result<(), Box<dyn std::error::Error>> {
-        let image = image_file()?;
-        let previous_image = image_file_with_color(31)?;
-        for graphic in [false, true] {
-            let mut session = Session::new();
-            session.execute("file.new", &json!({}))?;
-            let selected = session.execute("frame.create", &json!({"rect": [100, 120, 200, 220]}))?;
-            let previous = graphic.then(|| session.execute("file.place", &json!({"path": previous_image.path()}))).transpose()?;
-            let mut params = json!({"path": image.path()});
-            for key in keys {
-                params[*key] = Value::Null;
-            }
-
-            let placed = session.execute("file.place", &params)?;
-
-            assert_eq!(placed["id"], selected["id"], "keys={keys:?}, graphic={graphic}");
-            if let Some(previous) = previous {
-                assert_ne!(placed["asset"], previous["asset"]);
-            }
-            let document = &session.doc()?.doc;
-            let id = ItemId(selected["id"].as_u64().ok_or_else(|| crate::EngineError::Other("frame.create returned no numeric id".into()))?);
-            let item = document.item(id).ok_or(designcraft_doc::DocError::NoItem(id))?;
-            assert_eq!(item.bounds(), Rect::new(100.0, 120.0, 200.0, 220.0));
-            assert!(matches!(&item.content, Content::Graphic(_)), "placed frame must be graphic");
-            let Content::Graphic(content) = &item.content else {
-                return Err(crate::EngineError::Other("placed frame must be graphic".into()).into());
-            };
-            assert_eq!(json!(content.asset.0), placed["asset"]);
-            assert_eq!(document.spreads[0].items.len(), 1);
-        }
-        Ok(())
-    }
-
-    #[test]
-    fn selection_used_when_x_null() {
-        assert_null_placement_uses_selection(&["x"]).unwrap();
-    }
-
-    #[test]
-    fn selection_used_when_y_null() {
-        assert_null_placement_uses_selection(&["y"]).unwrap();
-    }
-
-    #[test]
-    fn selection_used_when_spread_null() {
-        assert_null_placement_uses_selection(&["spread"]).unwrap();
-    }
-
-    #[test]
-    fn selection_used_when_width_null() {
-        assert_null_placement_uses_selection(&["width"]).unwrap();
-    }
-
-    #[test]
-    fn selection_used_when_all_placement_parameters_null() {
-        assert_null_placement_uses_selection(&["x", "y", "spread", "width"]).unwrap();
-    }
-
-    #[test]
-    fn implicit_placement_fills_empty_and_replaces_graphic_selection() {
-        let image = image_file().unwrap();
-        let previous_image = image_file_with_color(31).unwrap();
-        for graphic in [false, true] {
-            let mut session = Session::new();
-            session.execute("file.new", &json!({})).unwrap();
-            let selected = session.execute("frame.create", &json!({"rect": [100, 120, 200, 220]})).unwrap();
-            let previous = graphic.then(|| session.execute("file.place", &json!({"path": previous_image.path()})).unwrap());
-
-            let placed = session.execute("file.place", &json!({"path": image.path()})).unwrap();
-
-            assert_eq!(placed["id"], selected["id"]);
-            if let Some(previous) = previous {
-                assert_ne!(placed["asset"], previous["asset"]);
-            }
-            let document = &session.doc().unwrap().doc;
-            let item = document.item(ItemId(placed["id"].as_u64().unwrap())).unwrap();
-            assert_eq!(item.bounds(), Rect::new(100.0, 120.0, 200.0, 220.0));
-            let Content::Graphic(content) = &item.content else { panic!("placed frame must be graphic") };
-            assert_eq!(json!(content.asset.0), placed["asset"]);
-            assert_eq!(document.spreads[0].items.len(), 1);
-        }
-    }
-}
-
-#[cfg(test)]
-mod new_document_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn saved_presets_make_documents_by_name() {
-        let mut s = Session::new();
-        let newsletter = json!({"name": "Newsletter", "units": "millimeters", "width": 595.2755905511812, "height": 841.8897637795277,
-            "pages": 8, "facingPages": false, "columns": 3, "margins": {"top": 20, "bottom": 30, "inside": 40, "outside": 50},
-            "bleed": [9, 9, 0, 9], "primaryTextFrame": true});
-        assert_eq!(s.execute("file.savePreset", &newsletter).unwrap()["name"], "Newsletter");
-        let listed = s.execute("file.presets", &json!({})).unwrap();
-        let saved: Vec<_> = listed.as_array().unwrap().iter().filter(|p| p["saved"] == true).collect();
-        assert_eq!(saved.len(), 1);
-        assert_eq!((&saved[0]["name"], &saved[0]["units"]), (&json!("Newsletter"), &json!("millimeters")));
-        // By name, case ignored; parameters still override the preset.
-        s.execute("file.new", &json!({"preset": "newsletter", "pages": 4})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        assert_eq!(d.page_count(), 4);
-        assert!(!d.settings.facing_pages && d.settings.primary_text_frame);
-        assert_eq!(d.settings.horizontal_units, designcraft_geom::Unit::Millimeters);
-        assert_eq!(d.settings.bleed, [9.0, 9.0, 0.0, 9.0]);
-        assert_eq!(d.page(0).unwrap().margins.outside, 50.0);
-        assert!(d.title.starts_with("Untitled-"), "the preset's name isn't the document's");
-        // The same name replaces it.
-        s.execute("file.savePreset", &json!({"name": "NEWSLETTER", "pages": 2})).unwrap();
-        assert_eq!(s.prefs.document_presets.len(), 1);
-        s.execute("file.new", &json!({"preset": "Newsletter"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.page_count(), 2);
-        // Built-in names, empty and overlong names and impossible sizes are refused.
-        for bad in [json!({"name": "a4"}), json!({"name": "  "}), json!({}), json!({"name": "x".repeat(101)}), json!({"name": "Huge", "width": 1e9})]
-        {
-            assert!(s.execute("file.savePreset", &bad).is_err(), "{bad}");
-        }
-        s.execute("file.deletePreset", &json!({"name": "newsletter"})).unwrap();
-        assert!(s.execute("file.deletePreset", &json!({"name": "newsletter"})).is_err());
-        assert!(s.execute("file.new", &json!({"preset": "Newsletter"})).is_err());
-    }
-
-    #[test]
-    fn new_document_takes_intent_units_start_page_bleed_and_slug() {
-        let mut s = Session::new();
-        let p = json!({"preset": "A4", "intent": "web", "units": "pixels", "startPage": 4, "bleed": [9, 0, 3, 6], "slug": 18});
-        s.execute("file.new", &p).unwrap();
-        let d = &s.doc().unwrap().doc;
-        assert_eq!(d.settings.intent, designcraft_doc::Intent::Web);
-        assert_eq!(d.settings.horizontal_units, designcraft_geom::Unit::Pixels);
-        assert_eq!(d.settings.bleed, [9.0, 0.0, 3.0, 6.0]);
-        assert_eq!(d.settings.slug, [18.0; 4]);
-        assert_eq!(d.page_name(0), "4");
-        // Malformed edges are ignored, hostile ones bounded.
-        s.execute("file.new", &json!({"bleed": [1, 2], "slug": [-5, 1e12, 0, 0]})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        assert_eq!(d.settings.bleed, [0.0; 4]);
-        assert_eq!(d.settings.slug, [0.0, 1296.0, 0.0, 0.0]);
-    }
-
-    #[test]
-    fn a_new_document_preview_replaces_itself_and_leaves_the_session_as_it_was() {
-        let dir = std::env::temp_dir().join(format!("dc-new-doc-preview-{}", std::process::id()));
-        let mut s = Session::new();
-        s.recovery_dir = Some(dir.clone());
-        s.execute("file.new", &json!({})).unwrap();
-        let first = s.doc().unwrap().uid;
-        let a = s.preview_new_document(&json!({"width": 300})).unwrap();
-        assert_eq!((s.doc().unwrap().uid, s.doc().unwrap().doc.title.as_str()), (a, "Untitled-2"));
-        let b = s.preview_new_document(&json!({"width": 400, "columns": 3})).unwrap();
-        assert_eq!(s.documents().len(), 2, "the preview replaces itself");
-        assert!(s.preview_new_document(&json!({"width": 0})).is_err());
-        let d = s.doc().unwrap();
-        assert_eq!((d.uid, d.doc.settings.page_width, d.doc.page(0).unwrap().columns.count), (b, 400.0, 3), "a refused size keeps it");
-        let listed = s.execute("document.list", &json!({})).unwrap();
-        assert_eq!((listed[0].get("preview"), &listed[1]["preview"]), (None, &json!(true)));
-        assert_eq!(s.end_new_document_preview(), Some(b));
-        let d = s.doc().unwrap();
-        assert_eq!((s.documents().len(), d.uid, d.is_dirty(), d.history.undo.len()), (1, first, false, 0));
-        assert_eq!(s.end_new_document_preview(), None, "without a preview it does nothing");
-        // Edited by a script while shown, it writes no recovery data while it is a preview, and
-        // stays as a document when the window closes, with its Untitled number.
-        let c = s.preview_new_document(&json!({})).unwrap();
-        s.execute("frame.create", &json!({"rect": [10, 10, 100, 100]})).unwrap();
-        assert_eq!(crate::recovery::save(&s, &dir).unwrap(), 0);
-        // The app's timer saves through the command.
-        assert_eq!(s.execute("file.recovery.save", &json!({})).unwrap()["saved"], 0);
-        assert!(crate::recovery::list(&dir).is_empty());
-        assert_eq!(s.end_new_document_preview(), None);
-        assert_eq!((s.documents().len(), s.doc().unwrap().uid, s.doc().unwrap().doc.title.as_str()), (2, c, "Untitled-2"));
-        s.execute("file.new", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.title, "Untitled-3");
-        // Create with the previewed settings keeps the preview as the document.
-        let d = s.preview_new_document(&json!({"pages": 2})).unwrap();
-        assert_eq!(s.keep_new_document_preview(), Some(3));
-        let st = s.doc().unwrap();
-        assert_eq!((st.uid, st.doc.title.as_str(), s.new_document_preview()), (d, "Untitled-4", None));
-        s.execute("file.new", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.title, "Untitled-5");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-}
-
 #[cfg(test)]
 pub(crate) mod eps_place_tests;
-
-#[cfg(test)]
-mod pdf_crop_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn place_pdf_cropped_to_its_trim_box() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("layout.documentSetup", &json!({"bleed": 9})).unwrap();
-        let b64 = s.execute("file.exportPdf", &json!({"bleed": true})).unwrap()["base64"].as_str().unwrap().to_string();
-        let mut t = Session::new();
-        t.execute("file.new", &json!({})).unwrap();
-        let size = |t: &mut Session, crop: &str| {
-            t.execute("edit.deselectAll", &json!({})).unwrap();
-            let r = t.execute("file.place", &json!({"base64": b64, "name": "a.pdf", "pdfCrop": crop, "width": 630, "x": 0, "y": 0})).unwrap();
-            let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
-            t.doc().unwrap().doc.item(id).unwrap().bounds()
-        };
-        let full = size(&mut t, "crop");
-        let trim = size(&mut t, "trim");
-        assert!((full.width() - 630.0).abs() < 1e-6, "{full:?}");
-        assert!((trim.width() - 612.0).abs() < 1e-3 && (trim.height() - 792.0).abs() < 1e-3, "{trim:?}");
-        assert!(t.execute("file.place", &json!({"base64": b64, "name": "a.pdf", "pdfCrop": "nope"})).is_err());
-    }
-
-    /// Placing with `trim` stores the choice; the graphic spans the trim box and draws only it,
-    /// even in a frame larger than the graphic.
-    #[test]
-    fn a_pdf_placed_with_its_trim_box_stores_and_draws_that_box() {
-        // Letter with a 9 pt bleed: black in the bleed's top-left corner and a black square inside.
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("layout.documentSetup", &json!({"bleed": 9})).unwrap();
-        for rect in [[-9, -9, 0, 0], [10, 10, 30, 30]] {
-            let id = s.execute("frame.create", &json!({"rect": rect})).unwrap()["id"].clone();
-            s.execute("object.fill", &json!({"ids": [id], "swatch": "[Black]"})).unwrap();
-        }
-        let b64 = s.execute("file.exportPdf", &json!({"bleed": true})).unwrap()["base64"].as_str().unwrap().to_string();
-
-        let mut t = Session::new();
-        t.execute("file.new", &json!({})).unwrap();
-        // `width` is the whole page's (630 pt with its bleed): half size.
-        let r = t.execute("file.place", &json!({"base64": b64, "name": "a.pdf", "pdfCrop": "trim", "width": 315, "x": 100, "y": 100})).unwrap();
-        let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
-        let d = t.doc().unwrap().doc.clone();
-        let it = d.item(id).unwrap();
-        let g = it.graphic().unwrap().clone();
-        let a = &d.assets[&g.asset];
-        assert_eq!(a.pdf_crop, designcraft_doc::PdfCrop::Trim);
-        let b = a.shown_box().unwrap();
-        let want = [9.0 / 630.0, 9.0 / 810.0, 621.0 / 630.0, 801.0 / 810.0];
-        assert!(b.iter().zip(want).all(|(x, y)| (x - y).abs() < 1e-4), "{b:?}");
-        assert!((g.size.0 - 612.0).abs() < 1e-3 && (g.size.1 - 792.0).abs() < 1e-3, "{:?}", g.size);
-        let shown = (it.xf * g.xf).transform_rect_bbox(designcraft_geom::Rect::new(0.0, 0.0, g.size.0, g.size.1));
-        let fb = it.bounds();
-        for (x, y) in [(shown.x0, 100.0), (shown.y0, 100.0), (shown.x1, 406.0), (shown.y1, 496.0), (fb.x1, 406.0), (fb.y1, 496.0)] {
-            assert!((x - y).abs() < 1e-3, "{shown:?} {fb:?}");
-        }
-
-        // A frame larger than the graphic still shows only the trim box.
-        t.edit(|d, _| {
-            d.item_mut(id).unwrap().path = designcraft_geom::shapes::rectangle(designcraft_geom::Rect::new(90.0, 90.0, 416.0, 506.0));
-            Ok(())
-        })
-        .unwrap();
-        let d = t.doc().unwrap().doc.clone();
-        let mut rr = designcraft_render::Renderer::new();
-        rr.threads = 0;
-        let img = rr.render_page(&d, &t.cache, 0, 1.0, false, &Default::default()).unwrap();
-        let dark = |x: u32, y: u32| img.pixel(x, y)[0] < 60;
-        // The page sits at 95.5: its bleed corner (95.5–100) is cut off, the square (105–115) shows
-        // where it is on the page.
-        assert!(!dark(97, 97), "the bleed is outside the trim box");
-        assert!(!dark(103, 103), "the page is offset by its bleed");
-        assert!(dark(110, 110), "the square inside the trim box");
-    }
-
-    #[test]
-    fn placed_pdf_keeps_its_exact_page_size() {
-        // A 100.4 x 50.4 pt page placed 100.4 pt wide is 50.4 pt tall, not stretched to whole points.
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"width": 100.4, "height": 50.4, "pages": 1})).unwrap();
-        let b64 = s.execute("file.exportPdf", &json!({})).unwrap()["base64"].as_str().unwrap().to_string();
-        let mut t = Session::new();
-        t.execute("file.new", &json!({})).unwrap();
-        let r = t.execute("file.place", &json!({"base64": b64, "name": "a.pdf", "width": 100.4, "x": 0, "y": 0})).unwrap();
-        let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
-        let d = &t.doc().unwrap().doc;
-        let it = d.item(id).unwrap();
-        let b = it.bounds();
-        assert!((b.width() - 100.4).abs() < 1e-3 && (b.height() - 50.4).abs() < 1e-3, "{b:?}");
-        let designcraft_doc::Content::Graphic(g) = &it.content else { panic!("not a graphic") };
-        assert!((g.size.0 - 100.4).abs() < 1e-3 && (g.size.1 - 50.4).abs() < 1e-3, "{:?}", g.size);
-    }
-}
-
-#[cfg(test)]
-mod layout_place_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn place_a_page_of_an_idml_file_as_a_group() {
-        let mut a = Session::new();
-        a.execute("file.new", &json!({"pages": 2})).unwrap();
-        a.execute("frame.create", &json!({"rect": [100, 100, 200, 150], "content": "text", "text": "From page one", "caret": false})).unwrap();
-        a.execute("frame.create", &json!({"rect": [300, 400, 350, 450]})).unwrap();
-        let idml = designcraft_idml::export_idml(&a.doc().unwrap().doc);
-        let b64 = super::base64_encode(&idml);
-        let mut b = Session::new();
-        b.execute("file.new", &json!({})).unwrap();
-        let r = b.execute("file.place", &json!({"base64": b64, "name": "src.idml", "layoutPage": 1, "x": 0, "y": 0})).unwrap();
-        assert_eq!(r["items"], 2);
-        let d = &b.doc().unwrap().doc;
-        let g = d.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap();
-        assert_eq!(g.children().len(), 2, "one group");
-        let bb = g.bounds();
-        assert!((bb.x0 - 100.0).abs() < 1e-6 && (bb.y0 - 100.0).abs() < 1e-6, "page top-left at 0,0: {bb:?}");
-        assert!(d.stories.values().any(|st| st.text == "From page one"), "stories come along");
-        assert!(b.execute("file.place", &json!({"base64": b64, "name": "src.idml", "layoutPage": 2})).is_err(), "page 2 is empty");
-    }
-}
-
-#[cfg(test)]
-mod save_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// Saving over an existing document replaces it whole and leaves nothing beside it.
-    #[test]
-    fn save_replaces_the_existing_file_without_leftovers() {
-        let dir = std::env::temp_dir().join(format!("dc-save-atomic-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("doc.designcraft");
-        std::fs::write(&path, vec![b'x'; 1 << 20]).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Saved whole", "caret": false})).unwrap();
-        s.execute("file.save", &json!({"path": path.to_string_lossy()})).unwrap();
-        s.execute("file.saveACopy", &json!({"path": path.to_string_lossy()})).unwrap();
-        let saved = super::from_bytes(&std::fs::read(&path).unwrap()).unwrap();
-        assert!(saved.stories.values().any(|st| st.text == "Saved whole"));
-        let names: Vec<_> = std::fs::read_dir(&dir).unwrap().map(|e| e.unwrap().file_name()).collect();
-        assert_eq!(names, ["doc.designcraft"], "no temporary file is left");
-        // A folder that doesn't exist: an error naming the path.
-        let missing = dir.join("missing").join("doc.designcraft");
-        let e = s.execute("file.save", &json!({"path": missing.to_string_lossy()})).unwrap_err();
-        assert!(e.to_string().contains("missing"), "{e}");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    /// A document that can't be written is an error: the file on disk, the unsaved state and the
-    /// recovery checkpoint all stay as they were.
-    #[test]
-    fn a_save_that_cannot_write_the_document_changes_nothing() {
-        let dir = std::env::temp_dir().join(format!("dc-save-fails-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("doc.designcraft");
-        let recovery = dir.join("recovery");
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("file.save", &json!({"path": path.to_string_lossy()})).unwrap();
-        let before = std::fs::read(&path).unwrap();
-        s.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Unsaved", "caret": false})).unwrap();
-        s.execute("file.recovery.save", &json!({"dir": recovery.to_string_lossy()})).unwrap();
-        let checkpoint = recovery.join(format!("{}.designcraft", s.doc().unwrap().uid));
-        assert!(checkpoint.exists());
-
-        super::FAIL_TO_BYTES.with(|f| f.set(true));
-        let save = s.execute("file.save", &json!({}));
-        let copy = s.execute("file.saveACopy", &json!({"path": dir.join("copy.designcraft").to_string_lossy()}));
-        let save_as = s.execute("file.saveAs", &json!({"path": dir.join("other.designcraft").to_string_lossy()}));
-        let serialized = s.execute("file.serialize", &json!({}));
-        super::FAIL_TO_BYTES.with(|f| f.set(false));
-
-        let e = save.unwrap_err();
-        assert!(e.to_string().contains("could not write the document"), "{e}");
-        assert!(copy.is_err() && serialized.is_err(), "no empty copy and no empty download");
-        assert_eq!(std::fs::read(&path).unwrap(), before, "the saved file is untouched");
-        assert!(!dir.join("copy.designcraft").exists());
-        assert!(save_as.is_err() && !dir.join("other.designcraft").exists());
-        assert!(!s.prefs.recent_files.iter().any(|p| p.ends_with("other.designcraft")), "a failed Save As isn't a recent file");
-        assert!(s.doc().unwrap().is_dirty(), "the document still has unsaved changes");
-        assert!(checkpoint.exists(), "the recovery checkpoint stays");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    /// #1050: a placement whose coordinates overflow to infinity is refused, and Save refuses a
-    /// document holding a non-finite rect anyway, leaving the file on disk as it was.
-    #[test]
-    fn non_finite_coordinates_are_refused_and_never_saved() {
-        let image = super::image_place_tests::image_file().unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let e = s.execute("file.place", &json!({"path": image.path(), "x": 1e308, "width": 1e308})).unwrap_err();
-        assert!(e.to_string().contains("finite"), "{e}");
-        assert!(s.doc().unwrap().doc.all_items().is_empty(), "nothing is placed");
-
-        let dir = std::env::temp_dir().join(format!("dc-save-non-finite-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("doc.designcraft");
-        s.execute("file.save", &json!({"path": path.to_string_lossy()})).unwrap();
-        let before = std::fs::read(&path).unwrap();
-        let id = designcraft_doc::ItemId(s.execute("frame.create", &json!({"rect": [36, 36, 300, 200]})).unwrap()["id"].as_u64().unwrap());
-        let st = s.doc_mut().unwrap();
-        let infinite = designcraft_geom::Rect::new(36.0, 36.0, f64::INFINITY, 200.0);
-        std::sync::Arc::make_mut(&mut st.doc).item_mut(id).unwrap().path = designcraft_geom::shapes::rectangle(infinite);
-        let e = s.execute("file.save", &json!({})).unwrap_err();
-        assert!(e.to_string().contains("not a finite number"), "{e}");
-        assert_eq!(std::fs::read(&path).unwrap(), before, "the saved file is untouched");
-        assert!(s.doc().unwrap().is_dirty());
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-}
-
-#[cfg(test)]
-mod document_fonts_tests {
-    use std::path::{Path, PathBuf};
-
-    use designcraft_fonts::testing::font_with;
-    use designcraft_fonts::{DOCUMENT_FONTS_FOLDER, FaceRef, FontDb, FontSource};
-    use serde_json::{Value, json};
-
-    use crate::Session;
-
-    fn temp_dir(name: &str) -> PathBuf {
-        let dir = std::env::temp_dir().join(format!("dc-open-docfonts-{name}-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(dir.join(DOCUMENT_FONTS_FOLDER)).unwrap();
-        dir
-    }
-
-    /// A new document in `s` with a text frame holding `text` set in `family`.
-    fn new_document(s: &mut Session, family: &str, text: &str) {
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": text})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": text.len()})).unwrap();
-        s.execute("type.char", &json!({"fontFamily": family, "fontStyle": "Regular"})).unwrap();
-    }
-
-    /// A document whose text ("Hello") is set in `family`, written to `path` (`.idml`: as IDML).
-    fn write_document(path: &Path, family: &str) {
-        write_document_with(path, family, "Hello");
-    }
-
-    fn write_document_with(path: &Path, family: &str, text: &str) {
-        let mut s = Session::new();
-        new_document(&mut s, family, text);
-        if path.extension().is_some_and(|e| e == "idml") {
-            std::fs::write(path, designcraft_idml::export_idml(&s.doc().unwrap().doc)).unwrap();
-        } else {
-            s.execute("file.save", &json!({"path": path.to_string_lossy()})).unwrap();
-        }
-    }
-
-    fn font_entry(s: &mut Session, family: &str) -> Value {
-        let l = s.execute("font.list", &json!({})).unwrap();
-        l.as_array().unwrap().iter().find(|f| f["family"] == family).cloned().unwrap_or_else(|| panic!("{family} in {l}"))
-    }
-
-    /// Each character of the active document's text with the face it is drawn in.
-    fn glyph_faces(s: &Session) -> Vec<(char, FaceRef)> {
-        let st = s.doc().unwrap();
-        let mut out = Vec::new();
-        for (sid, story) in &st.doc.stories {
-            let cs = s.cache.get(&st.doc, *sid, None);
-            for g in cs.frames.iter().flat_map(|ft| &ft.lines).flat_map(|l| &l.glyphs).filter(|g| g.visible && g.len > 0) {
-                out.push((story.text[g.byte..].chars().next().unwrap(), g.face));
-            }
-        }
-        out
-    }
-
-    fn open(s: &mut Session, path: &Path) -> Value {
-        s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap()
-    }
-
-    #[test]
-    fn opening_a_document_loads_its_document_fonts() {
-        const FAMILY: &str = "DocFont Open Test";
-        let dir = temp_dir("designcraft");
-        let fonts = dir.join(DOCUMENT_FONTS_FOLDER);
-        std::fs::write(fonts.join("open.ttf"), font_with(FAMILY, &['H', 'e', 'l', 'o']).unwrap()).unwrap();
-        std::fs::write(fonts.join("broken.otf"), b"not a font").unwrap();
-        let path = dir.join("Brochure.designcraft");
-        write_document(&path, FAMILY);
-        assert!(!FontDb::global().has_family(FAMILY));
-
-        let mut s = Session::new();
-        let r = s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap();
-        assert_eq!(r["documentFonts"], 1, "{r}");
-        assert!(r["warnings"].to_string().contains("broken.otf"), "a damaged font is reported, not fatal: {r}");
-        let f = font_entry(&mut s, FAMILY);
-        assert_eq!((f["missing"].clone(), f["source"].clone()), (json!(false), json!("document")), "{f}");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn opening_an_idml_file_loads_its_document_fonts() {
-        const FAMILY: &str = "DocFont IDML Test";
-        let dir = temp_dir("idml");
-        std::fs::write(dir.join(DOCUMENT_FONTS_FOLDER).join("idml.ttf"), font_with(FAMILY, &['H']).unwrap()).unwrap();
-        let path = dir.join("Brochure.idml");
-        write_document(&path, FAMILY);
-
-        let mut s = Session::new();
-        let r = s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap();
-        assert_eq!(r["documentFonts"], 1, "{r}");
-        assert_eq!(font_entry(&mut s, FAMILY)["missing"], false);
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn an_indesign_file_says_how_to_bring_it_over() {
-        // The extension decides (any case), not the bytes: no InDesign-made file is needed.
-        let dir = temp_dir("indd");
-        let path = dir.join("Brochure.INDD");
-        std::fs::write(&path, b"not a DesignCraft document").unwrap();
-        let mut s = Session::new();
-        let e = s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap_err().to_string();
-        assert!(e.contains("InDesign Markup (IDML)") && !e.contains("expected value"), "{e}");
-        let e = s.execute("file.openBytes", &json!({"name": "Brochure.indt", "base64": ""})).unwrap_err().to_string();
-        assert!(e.contains("InDesign Markup (IDML)"), "{e}");
-        assert!(s.doc().is_err(), "nothing was opened");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn the_document_fonts_folder_is_found_whatever_its_case() {
-        const FAMILY: &str = "DocFont Case Test";
-        let dir = std::env::temp_dir().join(format!("dc-open-docfonts-case-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        let fonts = dir.join("Document fonts");
-        std::fs::create_dir_all(&fonts).unwrap();
-        std::fs::write(fonts.join("case.ttf"), font_with(FAMILY, &['H']).unwrap()).unwrap();
-        let path = dir.join("Brochure.idml");
-        write_document(&path, FAMILY);
-
-        let mut s = Session::new();
-        let r = open(&mut s, &path);
-        assert_eq!(r["documentFonts"], 1, "{r}");
-        assert_eq!(font_entry(&mut s, FAMILY)["missing"], false);
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn a_document_without_the_folder_opens_as_before() {
-        let dir = std::env::temp_dir().join(format!("dc-open-docfonts-none-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("Plain.designcraft");
-        write_document(&path, designcraft_fonts::DEFAULT_FAMILY);
-        let r = Session::new().execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap();
-        assert_eq!((r["documentFonts"].clone(), r["warnings"].clone()), (json!(0), json!([])), "{r}");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-    #[test]
-    fn document_fonts_belong_to_their_document() {
-        const FAMILY: &str = "DocFont Scoped";
-        let (a, b) = (temp_dir("scoped-a"), temp_dir("scoped-b"));
-        std::fs::write(a.join(DOCUMENT_FONTS_FOLDER).join("scoped.ttf"), font_with(FAMILY, &['H', 'e', 'l', 'o']).unwrap()).unwrap();
-        write_document(&a.join("A.designcraft"), FAMILY);
-        write_document(&b.join("B.designcraft"), FAMILY);
-
-        let mut s = Session::new();
-        assert_eq!(open(&mut s, &a.join("A.designcraft"))["documentFonts"], 1);
-        assert_eq!(open(&mut s, &b.join("B.designcraft"))["documentFonts"], 0);
-        // B, open at the same time, doesn't have A's font.
-        assert_eq!(font_entry(&mut s, FAMILY)["missing"], true);
-        assert!(glyph_faces(&s).iter().all(|(_, f)| f.family != FAMILY), "{:?}", glyph_faces(&s));
-        s.execute("file.activate", &json!({"index": 0})).unwrap();
-        assert_eq!(font_entry(&mut s, FAMILY)["source"], "document");
-        assert!(glyph_faces(&s).iter().all(|(_, f)| f.family == FAMILY), "{:?}", glyph_faces(&s));
-        let _ = std::fs::remove_dir_all(&a);
-        let _ = std::fs::remove_dir_all(&b);
-    }
-
-    #[test]
-    fn each_document_sets_its_own_font_of_a_name() {
-        const FAMILY: &str = "DocFont Same";
-        let (a, b) = (temp_dir("same-a"), temp_dir("same-b"));
-        let (a_font, b_font) = (a.join(DOCUMENT_FONTS_FOLDER).join("same.ttf"), b.join(DOCUMENT_FONTS_FOLDER).join("same.ttf"));
-        // A's font has both letters, B's only `b`.
-        std::fs::write(&a_font, font_with(FAMILY, &['a', 'b']).unwrap()).unwrap();
-        std::fs::write(&b_font, font_with(FAMILY, &['b']).unwrap()).unwrap();
-        // The same words in both: the word cache must not hand one document's shaping to the other.
-        write_document_with(&a.join("A.designcraft"), FAMILY, "ab ab ab");
-        write_document_with(&b.join("B.designcraft"), FAMILY, "ab ab ab");
-
-        let mut s = Session::new();
-        open(&mut s, &a.join("A.designcraft"));
-        open(&mut s, &b.join("B.designcraft"));
-        // Fallback fonts for the `a` B's font lacks: never A's font.
-        s.execute("document.preferences", &json!({"glyphFallback": true})).unwrap();
-        let in_b = glyph_faces(&s);
-        s.execute("file.activate", &json!({"index": 0})).unwrap();
-        let in_a = glyph_faces(&s);
-        assert_eq!((in_a.len(), in_b.len()), (8, 8), "{in_a:?} {in_b:?}");
-        for (c, f) in &in_a {
-            assert_eq!(f.source, FontSource::Document(a_font.clone()), "`{c}` in A");
-        }
-        for (c, f) in &in_b {
-            match c {
-                'a' => assert!(f.family != FAMILY, "B's font lacks `a`, and A's isn't B's: {f:?}"),
-                _ => assert_eq!(f.source, FontSource::Document(b_font.clone()), "`{c}` in B"),
-            }
-        }
-        let _ = std::fs::remove_dir_all(&a);
-        let _ = std::fs::remove_dir_all(&b);
-    }
-
-    #[test]
-    fn closing_a_document_forgets_its_fonts_and_reopening_reuses_them() {
-        const FAMILY: &str = "DocFont Closed";
-        let dir = temp_dir("closed");
-        std::fs::write(dir.join(DOCUMENT_FONTS_FOLDER).join("closed.ttf"), font_with(FAMILY, &['H', 'e', 'l', 'o']).unwrap()).unwrap();
-        let path = dir.join("Closed.designcraft");
-        write_document(&path, FAMILY);
-
-        let mut s = Session::new();
-        open(&mut s, &path);
-        let first = glyph_faces(&s)[0].1;
-        assert_eq!(first.family, FAMILY);
-        s.execute("file.close", &json!({})).unwrap();
-        // A new document can't use the closed document's font.
-        new_document(&mut s, FAMILY, "Hello");
-        assert_eq!(font_entry(&mut s, FAMILY)["missing"], true);
-        assert!(glyph_faces(&s).iter().all(|(_, f)| f.family != FAMILY));
-        // Reopened, the document has its font again: the face loaded the first time.
-        assert_eq!(open(&mut s, &path)["documentFonts"], 1);
-        assert!(glyph_faces(&s).iter().all(|(_, f)| *f == first), "{:?}", glyph_faces(&s));
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn a_reverted_document_keeps_its_fonts() {
-        const FAMILY: &str = "DocFont Reverted";
-        let dir = temp_dir("revert");
-        std::fs::write(dir.join(DOCUMENT_FONTS_FOLDER).join("revert.ttf"), font_with(FAMILY, &['H', 'e', 'l', 'o']).unwrap()).unwrap();
-        let path = dir.join("Revert.designcraft");
-        write_document(&path, FAMILY);
-
-        let mut s = Session::new();
-        open(&mut s, &path);
-        s.execute("frame.create", &json!({"rect": [72, 400, 200, 500], "content": "text", "text": "x"})).unwrap();
-        s.execute("file.revert", &json!({})).unwrap();
-        assert_eq!(font_entry(&mut s, FAMILY)["source"], "document");
-        assert!(glyph_faces(&s).iter().all(|(_, f)| f.family == FAMILY));
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn bold_and_italic_link_the_document_fonts_styles() {
-        const FAMILY: &str = "DocFont Linked";
-        let dir = temp_dir("linked");
-        std::fs::write(dir.join(DOCUMENT_FONTS_FOLDER).join("linked.ttf"), font_with(FAMILY, &['H', 'e', 'l', 'o']).unwrap()).unwrap();
-        let path = dir.join("Linked.designcraft");
-        write_document(&path, FAMILY);
-
-        let mut s = Session::new();
-        open(&mut s, &path);
-        let sid = *s.doc().unwrap().doc.stories.keys().next().unwrap();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
-        // The family is the document's alone: its Regular is the style without bold or italic.
-        let r = s.execute("type.bold", &json!({"on": false})).unwrap();
-        assert_eq!(r["fontStyle"], "Regular", "{r}");
-        let r = s.execute("type.italic", &json!({"on": false})).unwrap();
-        assert_eq!(r["fontStyle"], "Regular", "{r}");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-}
-
-#[cfg(all(test, not(target_arch = "wasm32")))]
-mod extension_tests {
-    use serde_json::json;
-
-    use super::{is_document, with_document_extension};
-    use crate::Session;
-
-    #[test]
-    fn the_document_extension_is_added_when_missing_or_different() {
-        assert_eq!(with_document_extension("/a/Brochure"), "/a/Brochure.designcraft");
-        assert_eq!(with_document_extension("/a/Brochure.idml"), "/a/Brochure.idml.designcraft");
-        assert_eq!(with_document_extension("/a/v1.2 Brochure"), "/a/v1.2 Brochure.designcraft");
-        assert_eq!(with_document_extension("/a/Brochure.DesignCraft"), "/a/Brochure.DesignCraft");
-        assert_eq!(with_document_extension("/a/.."), "/a/..");
-    }
-
-    #[test]
-    fn save_adds_the_extension_and_open_recognises_files_by_content() {
-        let dir = std::env::temp_dir().join(format!("dc-file-extension-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-
-        let bare = dir.join("Brochure");
-        let written = dir.join("Brochure.designcraft");
-        let r = s.execute("file.saveAs", &json!({"path": bare.to_string_lossy()})).unwrap();
-        assert_eq!(r["path"], json!(written.to_string_lossy()), "{r}");
-        assert!(written.is_file() && !bare.exists());
-        assert_eq!(s.doc().unwrap().path.as_deref(), written.to_str());
-        let r = s.execute("file.saveACopy", &json!({"path": dir.join("Copy").to_string_lossy()})).unwrap();
-        assert_eq!(r["path"], json!(dir.join("Copy.designcraft").to_string_lossy()), "{r}");
-
-        // A native file without the extension opens, and Save writes back to that same file.
-        std::fs::rename(&written, &bare).unwrap();
-        let mut t = Session::new();
-        t.execute("file.open", &json!({"path": bare.to_string_lossy()})).unwrap();
-        let r = t.execute("file.save", &json!({})).unwrap();
-        assert_eq!(r["path"], json!(bare.to_string_lossy()), "{r}");
-        assert!(!written.exists());
-
-        // An IDML package without the extension opens as IDML, unsaved.
-        let idml = dir.join("Package");
-        std::fs::write(&idml, designcraft_idml::export_idml(&s.doc().unwrap().doc)).unwrap();
-        assert!(is_document(&std::fs::read(&idml).unwrap()) && is_document(&std::fs::read(&bare).unwrap()));
-        // The start of the file is enough.
-        for path in [&idml, &bare] {
-            let bytes = std::fs::read(path).unwrap();
-            assert!(is_document(&bytes[..bytes.len().min(128)]), "{path:?}");
-        }
-        t.execute("file.open", &json!({"path": idml.to_string_lossy()})).unwrap();
-        assert_eq!(t.doc().unwrap().path, None);
-
-        let notes = dir.join("Notes");
-        std::fs::write(&notes, b"plain text").unwrap();
-        assert!(!is_document(b"plain text"));
-        let e = t.execute("file.open", &json!({"path": notes.to_string_lossy()})).unwrap_err();
-        assert!(e.to_string().contains("not a DesignCraft or IDML file"), "{e}");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-}
-
-#[cfg(test)]
-mod recent_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    fn temp_dir(name: &str) -> std::path::PathBuf {
-        let dir = std::env::temp_dir().join(format!("dc-recent-{name}-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        dir
-    }
-
-    fn saved(s: &mut Session, path: &std::path::Path) -> String {
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
-        path.to_string_lossy().to_string()
-    }
-
-    /// Opening and saving put a file at the front once; Save a Copy doesn't count.
-    #[test]
-    fn open_and_save_order_the_list_without_duplicates() {
-        let dir = temp_dir("order");
-        let mut s = Session::new();
-        let a = saved(&mut s, &dir.join("a.designcraft"));
-        let b = saved(&mut s, &dir.join("b.designcraft"));
-        assert_eq!(s.prefs.recent_files, [b.clone(), a.clone()]);
-        s.execute("file.open", &json!({"path": a})).unwrap();
-        assert_eq!(s.prefs.recent_files, [a.clone(), b.clone()], "reopening moves it to the front, once");
-        s.execute("file.saveACopy", &json!({"path": dir.join("copy.designcraft").to_string_lossy()})).unwrap();
-        assert_eq!(s.prefs.recent_files, [a.clone(), b.clone()], "a copy isn't a recent file");
-        let rows = s.execute("file.recentFiles", &json!({})).unwrap();
-        assert_eq!(rows[0], json!({"path": a, "name": "a.designcraft", "exists": true}));
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn open_recent_reopens_and_a_missing_file_is_an_error_that_keeps_it_listed() {
-        let dir = temp_dir("open");
-        let mut s = Session::new();
-        let a = saved(&mut s, &dir.join("a.designcraft"));
-        let b = saved(&mut s, &dir.join("b.designcraft"));
-        let r = s.execute("file.openRecent", &json!({"index": 1})).unwrap();
-        assert_eq!(s.documents()[r["index"].as_u64().unwrap() as usize].path.as_deref(), Some(a.as_str()));
-        assert_eq!(s.prefs.recent_files, [a.clone(), b.clone()]);
-        std::fs::remove_file(&b).unwrap();
-        let e = s.execute("file.openRecent", &json!({"index": 1})).unwrap_err();
-        assert!(e.to_string().contains("can't be found"), "{e}");
-        assert_eq!(s.prefs.recent_files, [a.clone(), b.clone()], "a disk that isn't connected comes back");
-        assert_eq!(s.execute("file.recentFiles", &json!({})).unwrap()[1]["exists"], false);
-        // Hostile indices are errors, never panics.
-        for index in [json!(2), json!(u64::MAX), json!(-1), json!("0"), json!(null)] {
-            assert!(s.execute("file.openRecent", &json!({"index": index})).is_err(), "{index}");
-        }
-        s.execute("file.clearRecent", &json!({})).unwrap();
-        assert!(s.prefs.recent_files.is_empty());
-        assert!(s.execute("file.openRecent", &json!({"index": 0})).is_err(), "disabled when empty");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    /// Saving puts a small picture of the first page in the file, which the start screen reads
-    /// without opening the document.
-    #[test]
-    fn saved_files_carry_a_first_page_preview() {
-        let dir = temp_dir("preview");
-        let mut s = Session::new();
-        let a = saved(&mut s, &dir.join("a.designcraft"));
-        let p = super::recent_preview(&a).expect("a preview");
-        assert_eq!(p.width.max(p.height), super::PREVIEW_PX as u32);
-        assert_eq!(p.rgba.len(), (p.width * p.height * 4) as usize);
-        assert!(p.rgba.as_chunks::<4>().0.iter().any(|px| px[3] == 255), "the page is drawn, not left transparent");
-        let copy = dir.join("copy.designcraft");
-        s.execute("file.saveACopy", &json!({"path": copy.to_string_lossy()})).unwrap();
-        assert!(super::recent_preview(&copy.to_string_lossy()).is_some(), "Save a Copy has one too");
-        // Files without one (saved before previews), missing files and other files have none.
-        let old = dir.join("old.designcraft");
-        std::fs::write(&old, super::to_bytes(&s.doc().unwrap().doc).unwrap()).unwrap();
-        for path in [old, dir.join("gone.designcraft"), dir.clone()] {
-            assert!(super::recent_preview(&path.to_string_lossy()).is_none(), "{path:?}");
-        }
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn the_list_keeps_at_most_the_preferred_count() {
-        let mut s = Session::new();
-        for i in 0..30 {
-            s.prefs.note_recent_file(&format!("/work/{i}.designcraft"));
-        }
-        assert_eq!(s.prefs.recent_files.len(), 20, "default: 20");
-        assert_eq!(s.prefs.recent_files[0], "/work/29.designcraft");
-        s.execute("prefs.set", &json!({"recentFilesMax": 3})).unwrap();
-        assert_eq!(s.prefs.recent_files, ["/work/29.designcraft", "/work/28.designcraft", "/work/27.designcraft"]);
-        assert_eq!(s.execute("prefs.set", &json!({"recentFilesMax": 4_000_000_000u64})).unwrap()["recentFilesMax"], crate::MAX_RECENT_FILES);
-        assert!(s.execute("prefs.set", &json!({"recentFilesMax": -1})).is_err());
-        s.execute("prefs.set", &json!({"recentFilesMax": 0})).unwrap();
-        s.prefs.note_recent_file("/work/new.designcraft");
-        assert!(s.prefs.recent_files.is_empty(), "0 keeps no list");
-    }
-
-    /// The list is a preference: it survives the round trip through prefs.json.
-    #[test]
-    fn the_list_survives_a_restart() {
-        let mut s = Session::new();
-        s.prefs.note_recent_file("/work/a.designcraft");
-        let saved = serde_json::to_vec(&s.prefs).unwrap();
-        let back: crate::Prefs = serde_json::from_slice(&saved).unwrap();
-        assert_eq!(back.recent_files, ["/work/a.designcraft"]);
-        assert_eq!(back.recent_files_max, 20);
-        let old: crate::Prefs = serde_json::from_slice(br#"{"recoveryMinutes": 2.0}"#).unwrap();
-        assert!(old.recent_files.is_empty(), "older prefs.json without the list still load");
-    }
-}
-
-#[cfg(test)]
-mod hyphenation_default_tests {
-    use std::sync::Arc;
-
-    use designcraft_doc::BASIC_PARAGRAPH;
-    use designcraft_doc::build::NewDocument;
-    use serde_json::json;
-
-    use crate::Session;
-
-    fn hyph_flags(d: &designcraft_doc::Document) -> (bool, bool, bool) {
-        let (pp, _) = d.styles.resolve_para(&designcraft_doc::ParaFormat::default());
-        (pp.hyph_capitalized, pp.hyph_last_word, pp.hyph_across_column)
-    }
-
-    #[test]
-    fn new_documents_hyphenate_no_capitalized_last_or_column_end_words_and_imports_keep_theirs() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        assert_eq!(hyph_flags(&s.doc().unwrap().doc), (false, false, false));
-
-        let mut d = designcraft_doc::Document::new(&NewDocument::default());
-        let st = Arc::make_mut(&mut d.styles).para_mut(BASIC_PARAGRAPH).unwrap();
-        st.para.hyph_capitalized = Some(true);
-        st.para.hyph_last_word = Some(true);
-        st.para.hyph_across_column = Some(true);
-        let b64 = super::base64_encode(&designcraft_idml::export_idml(&d));
-        s.execute("file.openIdml", &json!({"base64": b64, "name": "in.idml"})).unwrap();
-        assert_eq!(hyph_flags(&s.doc().unwrap().doc), (true, true, true));
-    }
-}
diff --git a/crates/engine/src/cmd/file/bytes.rs b/crates/engine/src/cmd/file/bytes.rs
new file mode 100644
index 000000000..0946205a8
--- /dev/null
+++ b/crates/engine/src/cmd/file/bytes.rs
@@ -0,0 +1,165 @@
+#[cfg(test)]
+use super::FAIL_TO_BYTES;
+use super::{Document, EngineError, Result};
+
+/// The document as `.designcraft` bytes, or an error when it can't be written; never an empty file.
+pub fn to_bytes(d: &Document) -> Result<Vec<u8>> {
+    save_bytes(d, None)
+}
+
+/// [`to_bytes`] with `preview` (PNG bytes) stored as the file's first-page picture.
+fn save_bytes(d: &Document, preview: Option<&[u8]>) -> Result<Vec<u8>> {
+    #[cfg(test)]
+    if FAIL_TO_BYTES.with(std::cell::Cell::get) {
+        return Err(EngineError::Other("could not write the document: injected failure".into()));
+    }
+    designcraft_format::save_with_preview(d, preview).map_err(|e| EngineError::Other(format!("could not write the document: {e}")))
+}
+
+/// `path` ending in `.designcraft`: the extension is added when it is missing or another one, so
+/// the file opens from the file manager. A path without a file name is left for the write to fail.
+pub fn with_document_extension(path: &str) -> String {
+    let p = std::path::Path::new(path);
+    let ext = p.extension().and_then(std::ffi::OsStr::to_str);
+    if p.file_name().is_none() || ext.is_some_and(|e| e.eq_ignore_ascii_case(designcraft_format::EXTENSION)) {
+        return path.to_string();
+    }
+    format!("{path}.{}", designcraft_format::EXTENSION)
+}
+
+/// Whether `bytes` are a document `file.open` reads: a DesignCraft package or an IDML package.
+/// The first [`DOCUMENT_SNIFF_BYTES`] of a file are enough for packages that start with their
+/// `mimetype` entry, as both formats write them.
+pub fn is_document(bytes: &[u8]) -> bool {
+    designcraft_idml::is_idml(bytes) || designcraft_format::starts_designcraft(bytes) || designcraft_format::is_designcraft(bytes)
+}
+
+/// How much of a file [`is_document`] needs to recognise a package by its `mimetype` entry.
+pub const DOCUMENT_SNIFF_BYTES: u64 = 64 << 10;
+
+/// The longer side of the first-page picture saved in the file, in pixels.
+pub(super) const PREVIEW_PX: f64 = 320.0;
+
+/// [`to_bytes`] with a picture of the first page, which the start screen shows next to the file
+/// in its recent files. A page that can't be drawn just leaves the picture out.
+pub(super) fn to_bytes_with_preview(d: &Document, cache: &crate::Cache) -> Result<Vec<u8>> {
+    let preview = d.page_loc(0).and_then(|(si, pi)| {
+        let b = d.spreads.get(si)?.pages.get(pi)?.bounds();
+        let side = b.width().max(b.height());
+        (side.is_finite() && side > 0.0).then_some(PREVIEW_PX / side)
+    });
+    let png =
+        preview.and_then(|scale| designcraft_render::Renderer::new().render_page(d, cache, 0, scale, false, &Default::default())).map(|r| r.to_png());
+    save_bytes(d, png.as_deref())
+}
+
+pub fn from_bytes(b: &[u8]) -> Result<Document> {
+    load_bytes(b).map(|(d, _)| d)
+}
+
+/// Read `.designcraft` bytes and repair what a hand-edited file can get wrong without failing the
+/// open, with a warning for each repair.
+pub(super) fn load_bytes(b: &[u8]) -> Result<(Document, Vec<String>)> {
+    let mut d = designcraft_format::load(b).map_err(|e| EngineError::Other(e.to_string()))?;
+    let warnings = d.fix_parent_bases();
+    Ok((d, warnings))
+}
+
+const B64: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+pub fn base64_encode(data: &[u8]) -> String {
+    let mut out = String::with_capacity(data.len().div_ceil(3) * 4);
+    for c in data.chunks(3) {
+        let n = (c[0] as u32) << 16 | (*c.get(1).unwrap_or(&0) as u32) << 8 | *c.get(2).unwrap_or(&0) as u32;
+        out.push(B64[(n >> 18) as usize & 63] as char);
+        out.push(B64[(n >> 12) as usize & 63] as char);
+        out.push(if c.len() > 1 { B64[(n >> 6) as usize & 63] as char } else { '=' });
+        out.push(if c.len() > 2 { B64[n as usize & 63] as char } else { '=' });
+    }
+    out
+}
+
+pub fn base64_decode(s: &str) -> Vec<u8> {
+    let mut out = Vec::with_capacity(s.len() * 3 / 4);
+    let mut buf = 0u32;
+    let mut bits = 0;
+    for b in s.bytes() {
+        let v = match b {
+            b'A'..=b'Z' => b - b'A',
+            b'a'..=b'z' => b - b'a' + 26,
+            b'0'..=b'9' => b - b'0' + 52,
+            b'+' | b'-' => 62,
+            b'/' | b'_' => 63,
+            _ => continue,
+        } as u32;
+        buf = buf << 6 | v;
+        bits += 6;
+        if bits >= 8 {
+            bits -= 8;
+            out.push((buf >> bits) as u8);
+        }
+    }
+    out
+}
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+mod extension_tests {
+    use serde_json::json;
+
+    use super::{is_document, with_document_extension};
+    use crate::Session;
+
+    #[test]
+    fn the_document_extension_is_added_when_missing_or_different() {
+        assert_eq!(with_document_extension("/a/Brochure"), "/a/Brochure.designcraft");
+        assert_eq!(with_document_extension("/a/Brochure.idml"), "/a/Brochure.idml.designcraft");
+        assert_eq!(with_document_extension("/a/v1.2 Brochure"), "/a/v1.2 Brochure.designcraft");
+        assert_eq!(with_document_extension("/a/Brochure.DesignCraft"), "/a/Brochure.DesignCraft");
+        assert_eq!(with_document_extension("/a/.."), "/a/..");
+    }
+
+    #[test]
+    fn save_adds_the_extension_and_open_recognises_files_by_content() {
+        let dir = std::env::temp_dir().join(format!("dc-file-extension-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&dir);
+        std::fs::create_dir_all(&dir).unwrap();
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+
+        let bare = dir.join("Brochure");
+        let written = dir.join("Brochure.designcraft");
+        let r = s.execute("file.saveAs", &json!({"path": bare.to_string_lossy()})).unwrap();
+        assert_eq!(r["path"], json!(written.to_string_lossy()), "{r}");
+        assert!(written.is_file() && !bare.exists());
+        assert_eq!(s.doc().unwrap().path.as_deref(), written.to_str());
+        let r = s.execute("file.saveACopy", &json!({"path": dir.join("Copy").to_string_lossy()})).unwrap();
+        assert_eq!(r["path"], json!(dir.join("Copy.designcraft").to_string_lossy()), "{r}");
+
+        // A native file without the extension opens, and Save writes back to that same file.
+        std::fs::rename(&written, &bare).unwrap();
+        let mut t = Session::new();
+        t.execute("file.open", &json!({"path": bare.to_string_lossy()})).unwrap();
+        let r = t.execute("file.save", &json!({})).unwrap();
+        assert_eq!(r["path"], json!(bare.to_string_lossy()), "{r}");
+        assert!(!written.exists());
+
+        // An IDML package without the extension opens as IDML, unsaved.
+        let idml = dir.join("Package");
+        std::fs::write(&idml, designcraft_idml::export_idml(&s.doc().unwrap().doc)).unwrap();
+        assert!(is_document(&std::fs::read(&idml).unwrap()) && is_document(&std::fs::read(&bare).unwrap()));
+        // The start of the file is enough.
+        for path in [&idml, &bare] {
+            let bytes = std::fs::read(path).unwrap();
+            assert!(is_document(&bytes[..bytes.len().min(128)]), "{path:?}");
+        }
+        t.execute("file.open", &json!({"path": idml.to_string_lossy()})).unwrap();
+        assert_eq!(t.doc().unwrap().path, None);
+
+        let notes = dir.join("Notes");
+        std::fs::write(&notes, b"plain text").unwrap();
+        assert!(!is_document(b"plain text"));
+        let e = t.execute("file.open", &json!({"path": notes.to_string_lossy()})).unwrap_err();
+        assert!(e.to_string().contains("not a DesignCraft or IDML file"), "{e}");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+}
diff --git a/crates/engine/src/cmd/file/eps_place_tests.rs b/crates/engine/src/cmd/file/eps_place_tests.rs
index 9b2c89da9..2501a31d3 100644
--- a/crates/engine/src/cmd/file/eps_place_tests.rs
+++ b/crates/engine/src/cmd/file/eps_place_tests.rs
@@ -1,9 +1,9 @@
 //! Placing EPS artwork: the source is kept and only the preview is rasterised.
 //!
 //! These helpers write real files, so they live in their own `_tests.rs` file: the
-//! file-system guard in `tests_file_guard.rs` checks `src` files but exempts test ones.
+//! file-system guard in `tests/file_guard.rs` checks `src` files but exempts test ones.
 
-use super::*;
+use super::{Arc, AssetId, Content, ItemId, Session, base64_encode, json};
 
 pub(crate) fn tiff_eps() -> Vec<u8> {
     let mut tiff = b"II".to_vec();
diff --git a/crates/engine/src/cmd/file/new.rs b/crates/engine/src/cmd/file/new.rs
new file mode 100644
index 000000000..6614a2323
--- /dev/null
+++ b/crates/engine/src/cmd/file/new.rs
@@ -0,0 +1,338 @@
+#[cfg(test)]
+use super::bytes::base64_encode;
+use super::{Arc, DocState, Document, NewDocument, Result, Session, Value, bad, f64_or, json, str_param};
+
+/// The longest saved preset name, and how many presets are kept.
+const MAX_PRESET_NAME: usize = 100;
+
+const MAX_PRESETS: usize = 500;
+
+/// A built-in document preset or a saved one, by name (case ignored).
+fn find_preset(s: &Session, name: &str) -> Option<NewDocument> {
+    NewDocument::from_preset(name).or_else(|| s.prefs.document_presets.iter().find(|p| p.title.eq_ignore_ascii_case(name.trim())).cloned())
+}
+
+/// The settings `file.new` makes a document with for `p`: its preset, then the settings over it.
+fn new_document_settings(s: &Session, p: &Value) -> Result<NewDocument> {
+    let mut nd = match str_param(p, "preset") {
+        Some(name) => find_preset(s, name).ok_or_else(|| bad("file.new", format!("unknown preset `{name}`")))?,
+        None => NewDocument::default(),
+    };
+    apply_settings(&mut nd, p);
+    check_size("file.new", &nd)?;
+    Ok(nd)
+}
+
+/// A document as `file.new` makes it. Its Basic Paragraph doesn't hyphenate capitalized words, a
+/// paragraph's last word or across a column. Opened and imported files keep their own values,
+/// which is why `ParaProps` keeps the IDML defaults (on).
+fn new_document(nd: &NewDocument) -> Document {
+    let mut d = Document::new(nd);
+    if let Some(st) = Arc::make_mut(&mut d.styles).para_mut(designcraft_doc::BASIC_PARAGRAPH) {
+        st.para.hyph_capitalized = Some(false);
+        st.para.hyph_last_word = Some(false);
+        st.para.hyph_across_column = Some(false);
+    }
+    d
+}
+
+pub(super) fn file_new(s: &mut Session, p: &Value) -> Result<Value> {
+    let mut nd = new_document_settings(s, p)?;
+    s.untitled += 1;
+    nd.title = str_param(p, "title").map(str::to_string).unwrap_or_else(|| format!("Untitled-{}", s.untitled));
+    let d = new_document(&nd);
+    let i = s.add_document(DocState::new(d, None));
+    Ok(json!({"index": i}))
+}
+
+impl Session {
+    /// New Document's Preview: a document made as `file.new` would make it with `p`, shown while
+    /// the New Document window is open. It replaces the previous preview document in its tab and
+    /// takes no Untitled number, no undo step and no recovery entry. Settings `file.new` refuses
+    /// leave the previous preview as it was. Returns the preview document's uid.
+    pub fn preview_new_document(&mut self, p: &Value) -> Result<u64> {
+        let mut nd = new_document_settings(self, p)?;
+        let previous = match self.new_document_preview {
+            Some((_, previous)) => previous,
+            None => self.active().map(|d| d.uid),
+        };
+        let shown = self.new_document_preview.and_then(|(old, _)| self.docs.iter().position(|d| d.uid == old));
+        // A preview edited or saved by a menu or script while the window is open has become a
+        // document of its own: it stays, and the preview gets a tab of its own.
+        let replace = shown.filter(|&i| self.docs.get(i).is_some_and(|d| !d.is_dirty() && d.path.is_none()));
+        if replace.is_none() && shown.is_some() {
+            self.untitled += 1;
+        }
+        nd.title = str_param(p, "title").map(str::to_string).unwrap_or_else(|| self.next_untitled_title());
+        let st = DocState::new(new_document(&nd), None);
+        let uid = st.uid;
+        match replace.and_then(|i| self.docs.get_mut(i).map(|d| (i, d))) {
+            Some((i, d)) => {
+                *d = st;
+                self.active = Some(i);
+            }
+            None => {
+                // Pushed without `add_document`: the document that was active stays as it is.
+                self.docs.push(st);
+                self.active = Some(self.docs.len() - 1);
+            }
+        }
+        self.new_document_preview = Some((uid, previous));
+        Ok(uid)
+    }
+
+    /// The uid of New Document's preview document, while one is shown.
+    pub fn new_document_preview(&self) -> Option<u64> {
+        self.new_document_preview.map(|(uid, _)| uid)
+    }
+
+    /// End New Document's preview. Its document goes, and if it was still the active document,
+    /// the one that was active before it is active again. A preview that a menu or script has
+    /// edited or saved stays open as a document, with an Untitled number. Returns the uid of the
+    /// document removed. Without a preview it does nothing.
+    pub fn end_new_document_preview(&mut self) -> Option<u64> {
+        let (uid, previous) = self.new_document_preview.take()?;
+        let i = self.docs.iter().position(|d| d.uid == uid)?;
+        let d = self.docs.get(i)?;
+        if d.is_dirty() || d.path.is_some() {
+            self.untitled += 1;
+            return None;
+        }
+        self.docs.remove(i);
+        self.active = match self.active {
+            Some(a) if a == i => previous.and_then(|p| self.docs.iter().position(|d| d.uid == p)).or_else(|| self.docs.len().checked_sub(1)),
+            Some(a) if a > i => Some(a - 1),
+            a => a,
+        };
+        Some(uid)
+    }
+
+    /// Create in the New Document window, with the settings the preview shows: the preview
+    /// document becomes the new document, as `file.new` would make it (the next Untitled number,
+    /// no undo history). Returns its index, or `None` when there is no unedited preview to keep.
+    pub fn keep_new_document_preview(&mut self) -> Option<usize> {
+        let (uid, _) = self.new_document_preview?;
+        let i = self.docs.iter().position(|d| d.uid == uid && !d.is_dirty() && d.path.is_none())?;
+        self.new_document_preview = None;
+        self.untitled += 1;
+        if let Some(d) = self.docs.get_mut(i) {
+            d.history.undo.clear();
+            d.history.redo.clear();
+        }
+        self.active = Some(i);
+        Some(i)
+    }
+}
+
+pub(super) fn save_preset(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = str_param(p, "name").map(str::trim).filter(|n| !n.is_empty()).ok_or_else(|| bad("file.savePreset", "missing `name`"))?.to_string();
+    if name.chars().count() > MAX_PRESET_NAME {
+        return Err(bad("file.savePreset", format!("a preset name has at most {MAX_PRESET_NAME} characters")));
+    }
+    if NewDocument::from_preset(&name).is_some() {
+        return Err(bad("file.savePreset", format!("`{name}` is a built-in preset")));
+    }
+    let mut nd = NewDocument::default();
+    apply_settings(&mut nd, p);
+    check_size("file.savePreset", &nd)?;
+    nd.title = name.clone();
+    let presets = &mut s.prefs.document_presets;
+    presets.retain(|x| !x.title.eq_ignore_ascii_case(&name));
+    if presets.len() >= MAX_PRESETS {
+        return Err(bad("file.savePreset", format!("at most {MAX_PRESETS} saved presets")));
+    }
+    presets.push(nd);
+    Ok(json!({"name": name}))
+}
+
+fn check_size(cmd: &str, nd: &NewDocument) -> Result<()> {
+    if !(nd.width > 0.0 && nd.height > 0.0 && nd.width <= 15552.0 && nd.height <= 15552.0) {
+        return Err(bad(cmd, "page size out of range (0 < size ≤ 216 in)"));
+    }
+    Ok(())
+}
+
+/// The document settings in `p` (as file.new takes them) over `nd`.
+fn apply_settings(nd: &mut NewDocument, p: &Value) {
+    if let Some(intent) = p.get("intent").and_then(|v| serde_json::from_value(v.clone()).ok()) {
+        nd.intent = intent;
+    }
+    if let Some(units) = p.get("units").and_then(|v| serde_json::from_value(v.clone()).ok()) {
+        nd.units = units;
+    }
+    nd.width = f64_or(p, "width", nd.width);
+    nd.height = f64_or(p, "height", nd.height);
+    nd.pages = p.get("pages").and_then(Value::as_u64).map(|v| v as usize).unwrap_or(nd.pages).clamp(1, 9999);
+    nd.start_page = p.get("startPage").and_then(Value::as_u64).map(|v| v.clamp(1, 99_999) as u32).unwrap_or(nd.start_page);
+    nd.facing_pages = p.get("facingPages").and_then(Value::as_bool).unwrap_or(nd.facing_pages);
+    nd.columns = p.get("columns").and_then(Value::as_u64).map(|v| v.clamp(1, 216) as u32).unwrap_or(nd.columns);
+    nd.gutter = f64_or(p, "gutter", nd.gutter);
+    nd.primary_text_frame = p.get("primaryTextFrame").and_then(Value::as_bool).unwrap_or(nd.primary_text_frame);
+    match p.get("margins") {
+        Some(Value::Number(n)) => nd.margins = designcraft_doc::Margins::uniform(n.as_f64().unwrap_or(36.0)),
+        Some(v @ Value::Object(_)) => {
+            if let Ok(m) = serde_json::from_value(v.clone()) {
+                nd.margins = m;
+            }
+        }
+        _ => {}
+    }
+    if let Some(b) = edges(p, "bleed") {
+        nd.bleed = b;
+    }
+    if let Some(b) = edges(p, "slug") {
+        nd.slug = b;
+    }
+}
+
+/// A bleed or slug parameter: one width for every edge, or [top, bottom, inside, outside].
+fn edges(p: &Value, key: &str) -> Option<[f64; 4]> {
+    let clean = |v: f64| if v.is_finite() { v.clamp(0.0, 1296.0) } else { 0.0 };
+    match p.get(key)? {
+        Value::Array(a) => match a.iter().map(Value::as_f64).collect::<Option<Vec<f64>>>()?.as_slice() {
+            [t, b, i, o] => Some([clean(*t), clean(*b), clean(*i), clean(*o)]),
+            _ => None,
+        },
+        v => v.as_f64().map(|b| [clean(b); 4]),
+    }
+}
+
+pub(super) fn file_sample(s: &mut Session, _p: &Value) -> Result<Value> {
+    let d = crate::sample::magazine();
+    let i = s.add_document(DocState::new(d, None));
+    Ok(json!({"index": i}))
+}
+
+#[cfg(test)]
+mod new_document_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn saved_presets_make_documents_by_name() {
+        let mut s = Session::new();
+        let newsletter = json!({"name": "Newsletter", "units": "millimeters", "width": 595.2755905511812, "height": 841.8897637795277,
+            "pages": 8, "facingPages": false, "columns": 3, "margins": {"top": 20, "bottom": 30, "inside": 40, "outside": 50},
+            "bleed": [9, 9, 0, 9], "primaryTextFrame": true});
+        assert_eq!(s.execute("file.savePreset", &newsletter).unwrap()["name"], "Newsletter");
+        let listed = s.execute("file.presets", &json!({})).unwrap();
+        let saved: Vec<_> = listed.as_array().unwrap().iter().filter(|p| p["saved"] == true).collect();
+        assert_eq!(saved.len(), 1);
+        assert_eq!((&saved[0]["name"], &saved[0]["units"]), (&json!("Newsletter"), &json!("millimeters")));
+        // By name, case ignored; parameters still override the preset.
+        s.execute("file.new", &json!({"preset": "newsletter", "pages": 4})).unwrap();
+        let d = &s.doc().unwrap().doc;
+        assert_eq!(d.page_count(), 4);
+        assert!(!d.settings.facing_pages && d.settings.primary_text_frame);
+        assert_eq!(d.settings.horizontal_units, designcraft_geom::Unit::Millimeters);
+        assert_eq!(d.settings.bleed, [9.0, 9.0, 0.0, 9.0]);
+        assert_eq!(d.page(0).unwrap().margins.outside, 50.0);
+        assert!(d.title.starts_with("Untitled-"), "the preset's name isn't the document's");
+        // The same name replaces it.
+        s.execute("file.savePreset", &json!({"name": "NEWSLETTER", "pages": 2})).unwrap();
+        assert_eq!(s.prefs.document_presets.len(), 1);
+        s.execute("file.new", &json!({"preset": "Newsletter"})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.page_count(), 2);
+        // Built-in names, empty and overlong names and impossible sizes are refused.
+        for bad in [json!({"name": "a4"}), json!({"name": "  "}), json!({}), json!({"name": "x".repeat(101)}), json!({"name": "Huge", "width": 1e9})]
+        {
+            assert!(s.execute("file.savePreset", &bad).is_err(), "{bad}");
+        }
+        s.execute("file.deletePreset", &json!({"name": "newsletter"})).unwrap();
+        assert!(s.execute("file.deletePreset", &json!({"name": "newsletter"})).is_err());
+        assert!(s.execute("file.new", &json!({"preset": "Newsletter"})).is_err());
+    }
+
+    #[test]
+    fn new_document_takes_intent_units_start_page_bleed_and_slug() {
+        let mut s = Session::new();
+        let p = json!({"preset": "A4", "intent": "web", "units": "pixels", "startPage": 4, "bleed": [9, 0, 3, 6], "slug": 18});
+        s.execute("file.new", &p).unwrap();
+        let d = &s.doc().unwrap().doc;
+        assert_eq!(d.settings.intent, designcraft_doc::Intent::Web);
+        assert_eq!(d.settings.horizontal_units, designcraft_geom::Unit::Pixels);
+        assert_eq!(d.settings.bleed, [9.0, 0.0, 3.0, 6.0]);
+        assert_eq!(d.settings.slug, [18.0; 4]);
+        assert_eq!(d.page_name(0), "4");
+        // Malformed edges are ignored, hostile ones bounded.
+        s.execute("file.new", &json!({"bleed": [1, 2], "slug": [-5, 1e12, 0, 0]})).unwrap();
+        let d = &s.doc().unwrap().doc;
+        assert_eq!(d.settings.bleed, [0.0; 4]);
+        assert_eq!(d.settings.slug, [0.0, 1296.0, 0.0, 0.0]);
+    }
+
+    #[test]
+    fn a_new_document_preview_replaces_itself_and_leaves_the_session_as_it_was() {
+        let dir = std::env::temp_dir().join(format!("dc-new-doc-preview-{}", std::process::id()));
+        let mut s = Session::new();
+        s.recovery_dir = Some(dir.clone());
+        s.execute("file.new", &json!({})).unwrap();
+        let first = s.doc().unwrap().uid;
+        let a = s.preview_new_document(&json!({"width": 300})).unwrap();
+        assert_eq!((s.doc().unwrap().uid, s.doc().unwrap().doc.title.as_str()), (a, "Untitled-2"));
+        let b = s.preview_new_document(&json!({"width": 400, "columns": 3})).unwrap();
+        assert_eq!(s.documents().len(), 2, "the preview replaces itself");
+        assert!(s.preview_new_document(&json!({"width": 0})).is_err());
+        let d = s.doc().unwrap();
+        assert_eq!((d.uid, d.doc.settings.page_width, d.doc.page(0).unwrap().columns.count), (b, 400.0, 3), "a refused size keeps it");
+        let listed = s.execute("document.list", &json!({})).unwrap();
+        assert_eq!((listed[0].get("preview"), &listed[1]["preview"]), (None, &json!(true)));
+        assert_eq!(s.end_new_document_preview(), Some(b));
+        let d = s.doc().unwrap();
+        assert_eq!((s.documents().len(), d.uid, d.is_dirty(), d.history.undo.len()), (1, first, false, 0));
+        assert_eq!(s.end_new_document_preview(), None, "without a preview it does nothing");
+        // Edited by a script while shown, it writes no recovery data while it is a preview, and
+        // stays as a document when the window closes, with its Untitled number.
+        let c = s.preview_new_document(&json!({})).unwrap();
+        s.execute("frame.create", &json!({"rect": [10, 10, 100, 100]})).unwrap();
+        assert_eq!(crate::recovery::save(&s, &dir).unwrap(), 0);
+        // The app's timer saves through the command.
+        assert_eq!(s.execute("file.recovery.save", &json!({})).unwrap()["saved"], 0);
+        assert!(crate::recovery::list(&dir).is_empty());
+        assert_eq!(s.end_new_document_preview(), None);
+        assert_eq!((s.documents().len(), s.doc().unwrap().uid, s.doc().unwrap().doc.title.as_str()), (2, c, "Untitled-2"));
+        s.execute("file.new", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.title, "Untitled-3");
+        // Create with the previewed settings keeps the preview as the document.
+        let d = s.preview_new_document(&json!({"pages": 2})).unwrap();
+        assert_eq!(s.keep_new_document_preview(), Some(3));
+        let st = s.doc().unwrap();
+        assert_eq!((st.uid, st.doc.title.as_str(), s.new_document_preview()), (d, "Untitled-4", None));
+        s.execute("file.new", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.title, "Untitled-5");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+}
+
+#[cfg(test)]
+mod hyphenation_default_tests {
+    use std::sync::Arc;
+
+    use designcraft_doc::BASIC_PARAGRAPH;
+    use designcraft_doc::build::NewDocument;
+    use serde_json::json;
+
+    use crate::Session;
+
+    fn hyph_flags(d: &designcraft_doc::Document) -> (bool, bool, bool) {
+        let (pp, _) = d.styles.resolve_para(&designcraft_doc::ParaFormat::default());
+        (pp.hyph_capitalized, pp.hyph_last_word, pp.hyph_across_column)
+    }
+
+    #[test]
+    fn new_documents_hyphenate_no_capitalized_last_or_column_end_words_and_imports_keep_theirs() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        assert_eq!(hyph_flags(&s.doc().unwrap().doc), (false, false, false));
+
+        let mut d = designcraft_doc::Document::new(&NewDocument::default());
+        let st = Arc::make_mut(&mut d.styles).para_mut(BASIC_PARAGRAPH).unwrap();
+        st.para.hyph_capitalized = Some(true);
+        st.para.hyph_last_word = Some(true);
+        st.para.hyph_across_column = Some(true);
+        let b64 = super::base64_encode(&designcraft_idml::export_idml(&d));
+        s.execute("file.openIdml", &json!({"base64": b64, "name": "in.idml"})).unwrap();
+        assert_eq!(hyph_flags(&s.doc().unwrap().doc), (true, true, true));
+    }
+}
diff --git a/crates/engine/src/cmd/file/open.rs b/crates/engine/src/cmd/file/open.rs
new file mode 100644
index 000000000..75a7ce627
--- /dev/null
+++ b/crates/engine/src/cmd/file/open.rs
@@ -0,0 +1,528 @@
+#[cfg(test)]
+use super::bytes::{PREVIEW_PX, to_bytes};
+use super::bytes::{base64_decode, load_bytes};
+use super::{Arc, DocState, Document, EngineError, Result, Session, Value, bad, json, str_param};
+
+pub(super) fn has_recent(s: &Session) -> std::result::Result<(), String> {
+    if s.prefs.recent_files.is_empty() { Err("no recent files".into()) } else { Ok(()) }
+}
+
+/// A recent file's first-page picture as straight RGBA, for the start screen.
+pub struct RecentPreview {
+    pub width: u32,
+    pub height: u32,
+    pub rgba: Vec<u8>,
+}
+
+/// The picture a `.designcraft` file saved of its first page; None when the file is gone, isn't
+/// ours, or was saved before files had one (it gets one when saved again).
+pub fn recent_preview(path: &str) -> Option<RecentPreview> {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        // Only the zip directory and the preview entry are read, not the whole document.
+        let png = designcraft_format::read_preview(std::io::BufReader::new(crate::io::open(path).ok()?))?;
+        let img = designcraft_images::decode_rgba(&png)?;
+        let (width, height) = img.dimensions();
+        Some(RecentPreview { width, height, rgba: img.into_raw() })
+    }
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = path;
+        None
+    }
+}
+
+/// One File › Open Recent row: the path, its file name and whether it is still there.
+pub(super) fn recent_entry(path: &str) -> Value {
+    let name = std::path::Path::new(path).file_name().map_or_else(|| path.to_string(), |n| n.to_string_lossy().to_string());
+    #[cfg(not(target_arch = "wasm32"))]
+    let exists = crate::io::is_file(path);
+    #[cfg(target_arch = "wasm32")]
+    let exists = false;
+    json!({"path": path, "name": name, "exists": exists})
+}
+
+pub(super) fn file_open_recent(s: &mut Session, p: &Value) -> Result<Value> {
+    let index =
+        p.get("index").and_then(Value::as_u64).and_then(|i| usize::try_from(i).ok()).ok_or_else(|| bad("file.openRecent", "missing `index`"))?;
+    let path = s
+        .prefs
+        .recent_files
+        .get(index)
+        .cloned()
+        .ok_or_else(|| bad("file.openRecent", format!("no recent file {index} (the list has {})", s.prefs.recent_files.len())))?;
+    #[cfg(not(target_arch = "wasm32"))]
+    if !crate::io::is_file(&path) {
+        return Err(EngineError::Other(format!("{path} can't be found: it was moved, renamed or deleted, or its disk isn't connected")));
+    }
+    file_open(s, &json!({"path": path}))
+}
+
+/// `file.open`: the document opens and moves to the front of File › Open Recent.
+pub(super) fn file_open(s: &mut Session, p: &Value) -> Result<Value> {
+    let r = open_path(s, p)?;
+    if let Some(path) = str_param(p, "path") {
+        s.prefs.note_recent_file(path);
+    }
+    Ok(r)
+}
+
+fn open_path(s: &mut Session, p: &Value) -> Result<Value> {
+    let path = str_param(p, "path").ok_or_else(|| bad("file.open", "missing `path`"))?;
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let bytes = crate::io::read_file(path).map_err(EngineError::Other)?;
+        // The content decides first: a file's extension may be missing or wrong. The extension
+        // then routes files whose content isn't recognised to the reader that explains why.
+        let ext = std::path::Path::new(path).extension().and_then(std::ffi::OsStr::to_str).unwrap_or_default().to_ascii_lowercase();
+        let native = designcraft_format::is_designcraft(&bytes) || bytes.trim_ascii_start().starts_with(b"{");
+        if designcraft_idml::is_idml(&bytes) || (!native && (crate::cmd::interchange::is_indd(path, &bytes) || ext == "idml")) {
+            return crate::cmd::interchange::open_idml(s, p);
+        }
+        if !native && ext != designcraft_format::EXTENSION {
+            return Err(bad("file.open", format!("{path}: not a DesignCraft or IDML file")));
+        }
+        let (mut d, mut warnings) = load_bytes(&bytes)?;
+        crate::cmd::interchange::resolve_packaged_links(&mut d, Some(std::path::Path::new(path)));
+        crate::cmd::datamerge::resolve_sources_on_open(&mut d, Some(std::path::Path::new(path)));
+        let (fonts, faces, font_warnings) = load_document_fonts(&mut d, path);
+        warnings.extend(font_warnings);
+        warnings.extend(crate::cmd::style::grep_style_warnings(&d));
+        let mut st = DocState::new(d, Some(path.to_string()));
+        st.fonts = fonts;
+        let i = s.add_document(st);
+        Ok(json!({"index": i, "documentFonts": faces, "warnings": warnings}))
+    }
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = (s, path);
+        Err(EngineError::Other("use file.openBytes on the web".into()))
+    }
+}
+
+/// Load the fonts in the `Document Fonts` folder beside the document file at `path` for `d` alone
+/// (`d.font_scope`) → (the scope, for the document's state to hold; faces; a warning for each
+/// font file skipped). Nothing on the web (no folders).
+pub(crate) fn load_document_fonts(d: &mut Document, path: &str) -> (Option<Arc<crate::FontScope>>, usize, Vec<String>) {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        use designcraft_fonts::DOCUMENT_FONTS_FOLDER;
+        let Some(folder) = std::path::Path::new(path).parent().map(document_fonts_folder) else { return (None, 0, Vec::new()) };
+        // A document's folder is the agent's to name (a recovery entry or a book lists paths too):
+        // the fonts crate asks the automation roots about the folder and each font file, so fonts
+        // outside the read root stay unloaded.
+        let r = designcraft_fonts::FontDb::global().load_document_fonts(&folder, &|p| crate::file_access::check_read(p));
+        d.font_scope = r.scope;
+        let scope = (r.scope != 0).then(|| Arc::new(crate::FontScope(r.scope)));
+        (scope, r.faces, r.skipped.into_iter().map(|s| format!("{DOCUMENT_FONTS_FOLDER}: {s}")).collect())
+    }
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = (d, path);
+        (None, 0, Vec::new())
+    }
+}
+
+/// The `Document Fonts` folder in `dir`, matched without regard to case: packages name it
+/// `Document fonts`, and file systems on Linux are case-sensitive. The exact name wins.
+#[cfg(not(target_arch = "wasm32"))]
+fn document_fonts_folder(dir: &std::path::Path) -> std::path::PathBuf {
+    use designcraft_fonts::DOCUMENT_FONTS_FOLDER;
+    let exact = dir.join(DOCUMENT_FONTS_FOLDER);
+    if crate::io::is_dir(&exact) {
+        return exact;
+    }
+    crate::io::read_dir(dir)
+        .into_iter()
+        .flatten()
+        .flatten()
+        .find(|e| e.file_name().to_str().is_some_and(|n| n.eq_ignore_ascii_case(DOCUMENT_FONTS_FOLDER)) && crate::io::is_dir(e.path()))
+        .map_or(exact, |e| e.path())
+}
+
+pub(super) fn file_open_bytes(s: &mut Session, p: &Value) -> Result<Value> {
+    let b = base64_decode(str_param(p, "base64").unwrap_or(""));
+    // IDML packages are recognised by their stored `mimetype` first entry, INDD files by their
+    // signature (or their name).
+    if designcraft_idml::is_idml(&b) || crate::cmd::interchange::is_indd(str_param(p, "name").unwrap_or_default(), &b) {
+        return crate::cmd::interchange::open_idml(s, p);
+    }
+    let (mut d, warnings) = load_bytes(&b)?;
+    crate::cmd::datamerge::resolve_sources_on_open(&mut d, None);
+    if let Some(n) = str_param(p, "name") {
+        d.title = n.to_string();
+    }
+    let i = s.add_document(DocState::new(d, None));
+    Ok(json!({"index": i, "warnings": warnings}))
+}
+
+#[cfg(test)]
+mod document_fonts_tests {
+    use std::path::{Path, PathBuf};
+
+    use designcraft_fonts::testing::font_with;
+    use designcraft_fonts::{DOCUMENT_FONTS_FOLDER, FaceRef, FontDb, FontSource};
+    use serde_json::{Value, json};
+
+    use crate::Session;
+
+    fn temp_dir(name: &str) -> PathBuf {
+        let dir = std::env::temp_dir().join(format!("dc-open-docfonts-{name}-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&dir);
+        std::fs::create_dir_all(dir.join(DOCUMENT_FONTS_FOLDER)).unwrap();
+        dir
+    }
+
+    /// A new document in `s` with a text frame holding `text` set in `family`.
+    fn new_document(s: &mut Session, family: &str, text: &str) {
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": text})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": text.len()})).unwrap();
+        s.execute("type.char", &json!({"fontFamily": family, "fontStyle": "Regular"})).unwrap();
+    }
+
+    /// A document whose text ("Hello") is set in `family`, written to `path` (`.idml`: as IDML).
+    fn write_document(path: &Path, family: &str) {
+        write_document_with(path, family, "Hello");
+    }
+
+    fn write_document_with(path: &Path, family: &str, text: &str) {
+        let mut s = Session::new();
+        new_document(&mut s, family, text);
+        if path.extension().is_some_and(|e| e == "idml") {
+            std::fs::write(path, designcraft_idml::export_idml(&s.doc().unwrap().doc)).unwrap();
+        } else {
+            s.execute("file.save", &json!({"path": path.to_string_lossy()})).unwrap();
+        }
+    }
+
+    fn font_entry(s: &mut Session, family: &str) -> Value {
+        let l = s.execute("font.list", &json!({})).unwrap();
+        l.as_array().unwrap().iter().find(|f| f["family"] == family).cloned().unwrap_or_else(|| panic!("{family} in {l}"))
+    }
+
+    /// Each character of the active document's text with the face it is drawn in.
+    fn glyph_faces(s: &Session) -> Vec<(char, FaceRef)> {
+        let st = s.doc().unwrap();
+        let mut out = Vec::new();
+        for (sid, story) in &st.doc.stories {
+            let cs = s.cache.get(&st.doc, *sid, None);
+            for g in cs.frames.iter().flat_map(|ft| &ft.lines).flat_map(|l| &l.glyphs).filter(|g| g.visible && g.len > 0) {
+                out.push((story.text[g.byte..].chars().next().unwrap(), g.face));
+            }
+        }
+        out
+    }
+
+    fn open(s: &mut Session, path: &Path) -> Value {
+        s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap()
+    }
+
+    #[test]
+    fn opening_a_document_loads_its_document_fonts() {
+        const FAMILY: &str = "DocFont Open Test";
+        let dir = temp_dir("designcraft");
+        let fonts = dir.join(DOCUMENT_FONTS_FOLDER);
+        std::fs::write(fonts.join("open.ttf"), font_with(FAMILY, &['H', 'e', 'l', 'o']).unwrap()).unwrap();
+        std::fs::write(fonts.join("broken.otf"), b"not a font").unwrap();
+        let path = dir.join("Brochure.designcraft");
+        write_document(&path, FAMILY);
+        assert!(!FontDb::global().has_family(FAMILY));
+
+        let mut s = Session::new();
+        let r = s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap();
+        assert_eq!(r["documentFonts"], 1, "{r}");
+        assert!(r["warnings"].to_string().contains("broken.otf"), "a damaged font is reported, not fatal: {r}");
+        let f = font_entry(&mut s, FAMILY);
+        assert_eq!((f["missing"].clone(), f["source"].clone()), (json!(false), json!("document")), "{f}");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn opening_an_idml_file_loads_its_document_fonts() {
+        const FAMILY: &str = "DocFont IDML Test";
+        let dir = temp_dir("idml");
+        std::fs::write(dir.join(DOCUMENT_FONTS_FOLDER).join("idml.ttf"), font_with(FAMILY, &['H']).unwrap()).unwrap();
+        let path = dir.join("Brochure.idml");
+        write_document(&path, FAMILY);
+
+        let mut s = Session::new();
+        let r = s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap();
+        assert_eq!(r["documentFonts"], 1, "{r}");
+        assert_eq!(font_entry(&mut s, FAMILY)["missing"], false);
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn an_indesign_file_says_how_to_bring_it_over() {
+        // The extension decides (any case), not the bytes: no InDesign-made file is needed.
+        let dir = temp_dir("indd");
+        let path = dir.join("Brochure.INDD");
+        std::fs::write(&path, b"not a DesignCraft document").unwrap();
+        let mut s = Session::new();
+        let e = s.execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap_err().to_string();
+        assert!(e.contains("InDesign Markup (IDML)") && !e.contains("expected value"), "{e}");
+        let e = s.execute("file.openBytes", &json!({"name": "Brochure.indt", "base64": ""})).unwrap_err().to_string();
+        assert!(e.contains("InDesign Markup (IDML)"), "{e}");
+        assert!(s.doc().is_err(), "nothing was opened");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn the_document_fonts_folder_is_found_whatever_its_case() {
+        const FAMILY: &str = "DocFont Case Test";
+        let dir = std::env::temp_dir().join(format!("dc-open-docfonts-case-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&dir);
+        let fonts = dir.join("Document fonts");
+        std::fs::create_dir_all(&fonts).unwrap();
+        std::fs::write(fonts.join("case.ttf"), font_with(FAMILY, &['H']).unwrap()).unwrap();
+        let path = dir.join("Brochure.idml");
+        write_document(&path, FAMILY);
+
+        let mut s = Session::new();
+        let r = open(&mut s, &path);
+        assert_eq!(r["documentFonts"], 1, "{r}");
+        assert_eq!(font_entry(&mut s, FAMILY)["missing"], false);
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn a_document_without_the_folder_opens_as_before() {
+        let dir = std::env::temp_dir().join(format!("dc-open-docfonts-none-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&dir);
+        std::fs::create_dir_all(&dir).unwrap();
+        let path = dir.join("Plain.designcraft");
+        write_document(&path, designcraft_fonts::DEFAULT_FAMILY);
+        let r = Session::new().execute("file.open", &json!({"path": path.to_string_lossy()})).unwrap();
+        assert_eq!((r["documentFonts"].clone(), r["warnings"].clone()), (json!(0), json!([])), "{r}");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+    #[test]
+    fn document_fonts_belong_to_their_document() {
+        const FAMILY: &str = "DocFont Scoped";
+        let (a, b) = (temp_dir("scoped-a"), temp_dir("scoped-b"));
+        std::fs::write(a.join(DOCUMENT_FONTS_FOLDER).join("scoped.ttf"), font_with(FAMILY, &['H', 'e', 'l', 'o']).unwrap()).unwrap();
+        write_document(&a.join("A.designcraft"), FAMILY);
+        write_document(&b.join("B.designcraft"), FAMILY);
+
+        let mut s = Session::new();
+        assert_eq!(open(&mut s, &a.join("A.designcraft"))["documentFonts"], 1);
+        assert_eq!(open(&mut s, &b.join("B.designcraft"))["documentFonts"], 0);
+        // B, open at the same time, doesn't have A's font.
+        assert_eq!(font_entry(&mut s, FAMILY)["missing"], true);
+        assert!(glyph_faces(&s).iter().all(|(_, f)| f.family != FAMILY), "{:?}", glyph_faces(&s));
+        s.execute("file.activate", &json!({"index": 0})).unwrap();
+        assert_eq!(font_entry(&mut s, FAMILY)["source"], "document");
+        assert!(glyph_faces(&s).iter().all(|(_, f)| f.family == FAMILY), "{:?}", glyph_faces(&s));
+        let _ = std::fs::remove_dir_all(&a);
+        let _ = std::fs::remove_dir_all(&b);
+    }
+
+    #[test]
+    fn each_document_sets_its_own_font_of_a_name() {
+        const FAMILY: &str = "DocFont Same";
+        let (a, b) = (temp_dir("same-a"), temp_dir("same-b"));
+        let (a_font, b_font) = (a.join(DOCUMENT_FONTS_FOLDER).join("same.ttf"), b.join(DOCUMENT_FONTS_FOLDER).join("same.ttf"));
+        // A's font has both letters, B's only `b`.
+        std::fs::write(&a_font, font_with(FAMILY, &['a', 'b']).unwrap()).unwrap();
+        std::fs::write(&b_font, font_with(FAMILY, &['b']).unwrap()).unwrap();
+        // The same words in both: the word cache must not hand one document's shaping to the other.
+        write_document_with(&a.join("A.designcraft"), FAMILY, "ab ab ab");
+        write_document_with(&b.join("B.designcraft"), FAMILY, "ab ab ab");
+
+        let mut s = Session::new();
+        open(&mut s, &a.join("A.designcraft"));
+        open(&mut s, &b.join("B.designcraft"));
+        // Fallback fonts for the `a` B's font lacks: never A's font.
+        s.execute("document.preferences", &json!({"glyphFallback": true})).unwrap();
+        let in_b = glyph_faces(&s);
+        s.execute("file.activate", &json!({"index": 0})).unwrap();
+        let in_a = glyph_faces(&s);
+        assert_eq!((in_a.len(), in_b.len()), (8, 8), "{in_a:?} {in_b:?}");
+        for (c, f) in &in_a {
+            assert_eq!(f.source, FontSource::Document(a_font.clone()), "`{c}` in A");
+        }
+        for (c, f) in &in_b {
+            match c {
+                'a' => assert!(f.family != FAMILY, "B's font lacks `a`, and A's isn't B's: {f:?}"),
+                _ => assert_eq!(f.source, FontSource::Document(b_font.clone()), "`{c}` in B"),
+            }
+        }
+        let _ = std::fs::remove_dir_all(&a);
+        let _ = std::fs::remove_dir_all(&b);
+    }
+
+    #[test]
+    fn closing_a_document_forgets_its_fonts_and_reopening_reuses_them() {
+        const FAMILY: &str = "DocFont Closed";
+        let dir = temp_dir("closed");
+        std::fs::write(dir.join(DOCUMENT_FONTS_FOLDER).join("closed.ttf"), font_with(FAMILY, &['H', 'e', 'l', 'o']).unwrap()).unwrap();
+        let path = dir.join("Closed.designcraft");
+        write_document(&path, FAMILY);
+
+        let mut s = Session::new();
+        open(&mut s, &path);
+        let first = glyph_faces(&s)[0].1;
+        assert_eq!(first.family, FAMILY);
+        s.execute("file.close", &json!({})).unwrap();
+        // A new document can't use the closed document's font.
+        new_document(&mut s, FAMILY, "Hello");
+        assert_eq!(font_entry(&mut s, FAMILY)["missing"], true);
+        assert!(glyph_faces(&s).iter().all(|(_, f)| f.family != FAMILY));
+        // Reopened, the document has its font again: the face loaded the first time.
+        assert_eq!(open(&mut s, &path)["documentFonts"], 1);
+        assert!(glyph_faces(&s).iter().all(|(_, f)| *f == first), "{:?}", glyph_faces(&s));
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn a_reverted_document_keeps_its_fonts() {
+        const FAMILY: &str = "DocFont Reverted";
+        let dir = temp_dir("revert");
+        std::fs::write(dir.join(DOCUMENT_FONTS_FOLDER).join("revert.ttf"), font_with(FAMILY, &['H', 'e', 'l', 'o']).unwrap()).unwrap();
+        let path = dir.join("Revert.designcraft");
+        write_document(&path, FAMILY);
+
+        let mut s = Session::new();
+        open(&mut s, &path);
+        s.execute("frame.create", &json!({"rect": [72, 400, 200, 500], "content": "text", "text": "x"})).unwrap();
+        s.execute("file.revert", &json!({})).unwrap();
+        assert_eq!(font_entry(&mut s, FAMILY)["source"], "document");
+        assert!(glyph_faces(&s).iter().all(|(_, f)| f.family == FAMILY));
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn bold_and_italic_link_the_document_fonts_styles() {
+        const FAMILY: &str = "DocFont Linked";
+        let dir = temp_dir("linked");
+        std::fs::write(dir.join(DOCUMENT_FONTS_FOLDER).join("linked.ttf"), font_with(FAMILY, &['H', 'e', 'l', 'o']).unwrap()).unwrap();
+        let path = dir.join("Linked.designcraft");
+        write_document(&path, FAMILY);
+
+        let mut s = Session::new();
+        open(&mut s, &path);
+        let sid = *s.doc().unwrap().doc.stories.keys().next().unwrap();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
+        // The family is the document's alone: its Regular is the style without bold or italic.
+        let r = s.execute("type.bold", &json!({"on": false})).unwrap();
+        assert_eq!(r["fontStyle"], "Regular", "{r}");
+        let r = s.execute("type.italic", &json!({"on": false})).unwrap();
+        assert_eq!(r["fontStyle"], "Regular", "{r}");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+}
+
+#[cfg(test)]
+mod recent_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    fn temp_dir(name: &str) -> std::path::PathBuf {
+        let dir = std::env::temp_dir().join(format!("dc-recent-{name}-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&dir);
+        std::fs::create_dir_all(&dir).unwrap();
+        dir
+    }
+
+    fn saved(s: &mut Session, path: &std::path::Path) -> String {
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
+        path.to_string_lossy().to_string()
+    }
+
+    /// Opening and saving put a file at the front once; Save a Copy doesn't count.
+    #[test]
+    fn open_and_save_order_the_list_without_duplicates() {
+        let dir = temp_dir("order");
+        let mut s = Session::new();
+        let a = saved(&mut s, &dir.join("a.designcraft"));
+        let b = saved(&mut s, &dir.join("b.designcraft"));
+        assert_eq!(s.prefs.recent_files, [b.clone(), a.clone()]);
+        s.execute("file.open", &json!({"path": a})).unwrap();
+        assert_eq!(s.prefs.recent_files, [a.clone(), b.clone()], "reopening moves it to the front, once");
+        s.execute("file.saveACopy", &json!({"path": dir.join("copy.designcraft").to_string_lossy()})).unwrap();
+        assert_eq!(s.prefs.recent_files, [a.clone(), b.clone()], "a copy isn't a recent file");
+        let rows = s.execute("file.recentFiles", &json!({})).unwrap();
+        assert_eq!(rows[0], json!({"path": a, "name": "a.designcraft", "exists": true}));
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn open_recent_reopens_and_a_missing_file_is_an_error_that_keeps_it_listed() {
+        let dir = temp_dir("open");
+        let mut s = Session::new();
+        let a = saved(&mut s, &dir.join("a.designcraft"));
+        let b = saved(&mut s, &dir.join("b.designcraft"));
+        let r = s.execute("file.openRecent", &json!({"index": 1})).unwrap();
+        assert_eq!(s.documents()[r["index"].as_u64().unwrap() as usize].path.as_deref(), Some(a.as_str()));
+        assert_eq!(s.prefs.recent_files, [a.clone(), b.clone()]);
+        std::fs::remove_file(&b).unwrap();
+        let e = s.execute("file.openRecent", &json!({"index": 1})).unwrap_err();
+        assert!(e.to_string().contains("can't be found"), "{e}");
+        assert_eq!(s.prefs.recent_files, [a.clone(), b.clone()], "a disk that isn't connected comes back");
+        assert_eq!(s.execute("file.recentFiles", &json!({})).unwrap()[1]["exists"], false);
+        // Hostile indices are errors, never panics.
+        for index in [json!(2), json!(u64::MAX), json!(-1), json!("0"), json!(null)] {
+            assert!(s.execute("file.openRecent", &json!({"index": index})).is_err(), "{index}");
+        }
+        s.execute("file.clearRecent", &json!({})).unwrap();
+        assert!(s.prefs.recent_files.is_empty());
+        assert!(s.execute("file.openRecent", &json!({"index": 0})).is_err(), "disabled when empty");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    /// Saving puts a small picture of the first page in the file, which the start screen reads
+    /// without opening the document.
+    #[test]
+    fn saved_files_carry_a_first_page_preview() {
+        let dir = temp_dir("preview");
+        let mut s = Session::new();
+        let a = saved(&mut s, &dir.join("a.designcraft"));
+        let p = super::recent_preview(&a).expect("a preview");
+        assert_eq!(p.width.max(p.height), super::PREVIEW_PX as u32);
+        assert_eq!(p.rgba.len(), (p.width * p.height * 4) as usize);
+        assert!(p.rgba.as_chunks::<4>().0.iter().any(|px| px[3] == 255), "the page is drawn, not left transparent");
+        let copy = dir.join("copy.designcraft");
+        s.execute("file.saveACopy", &json!({"path": copy.to_string_lossy()})).unwrap();
+        assert!(super::recent_preview(&copy.to_string_lossy()).is_some(), "Save a Copy has one too");
+        // Files without one (saved before previews), missing files and other files have none.
+        let old = dir.join("old.designcraft");
+        std::fs::write(&old, super::to_bytes(&s.doc().unwrap().doc).unwrap()).unwrap();
+        for path in [old, dir.join("gone.designcraft"), dir.clone()] {
+            assert!(super::recent_preview(&path.to_string_lossy()).is_none(), "{path:?}");
+        }
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn the_list_keeps_at_most_the_preferred_count() {
+        let mut s = Session::new();
+        for i in 0..30 {
+            s.prefs.note_recent_file(&format!("/work/{i}.designcraft"));
+        }
+        assert_eq!(s.prefs.recent_files.len(), 20, "default: 20");
+        assert_eq!(s.prefs.recent_files[0], "/work/29.designcraft");
+        s.execute("prefs.set", &json!({"recentFilesMax": 3})).unwrap();
+        assert_eq!(s.prefs.recent_files, ["/work/29.designcraft", "/work/28.designcraft", "/work/27.designcraft"]);
+        assert_eq!(s.execute("prefs.set", &json!({"recentFilesMax": 4_000_000_000u64})).unwrap()["recentFilesMax"], crate::MAX_RECENT_FILES);
+        assert!(s.execute("prefs.set", &json!({"recentFilesMax": -1})).is_err());
+        s.execute("prefs.set", &json!({"recentFilesMax": 0})).unwrap();
+        s.prefs.note_recent_file("/work/new.designcraft");
+        assert!(s.prefs.recent_files.is_empty(), "0 keeps no list");
+    }
+
+    /// The list is a preference: it survives the round trip through prefs.json.
+    #[test]
+    fn the_list_survives_a_restart() {
+        let mut s = Session::new();
+        s.prefs.note_recent_file("/work/a.designcraft");
+        let saved = serde_json::to_vec(&s.prefs).unwrap();
+        let back: crate::Prefs = serde_json::from_slice(&saved).unwrap();
+        assert_eq!(back.recent_files, ["/work/a.designcraft"]);
+        assert_eq!(back.recent_files_max, 20);
+        let old: crate::Prefs = serde_json::from_slice(br#"{"recoveryMinutes": 2.0}"#).unwrap();
+        assert!(old.recent_files.is_empty(), "older prefs.json without the list still load");
+    }
+}
diff --git a/crates/engine/src/cmd/file/place.rs b/crates/engine/src/cmd/file/place.rs
new file mode 100644
index 000000000..44f993a64
--- /dev/null
+++ b/crates/engine/src/cmd/file/place.rs
@@ -0,0 +1,758 @@
+#[cfg(not(target_arch = "wasm32"))]
+use super::EngineError;
+#[cfg(test)]
+use super::bytes::base64_encode;
+use super::bytes::{base64_decode, from_bytes};
+use super::{
+    Affine, Arc, Asset, AssetId, Content, Graphic, Item, ItemId, PdfCrop, Rect, Result, Selection, Session, Shape, Value, bad, json, ok, shapes,
+    str_param,
+};
+
+pub(super) fn file_place(s: &mut Session, p: &Value) -> Result<Value> {
+    // The file's size and time before it is read (a linked text file remembers them).
+    let mut before = None;
+    let (bytes, name, link) = if let Some(b) = str_param(p, "base64") {
+        (base64_decode(b), str_param(p, "name").unwrap_or("image").to_string(), None)
+    } else if let Some(path) = str_param(p, "path") {
+        before = crate::cmd::datamerge::fingerprint_from_path(path);
+        #[cfg(not(target_arch = "wasm32"))]
+        let b = crate::io::read_file(path).map_err(EngineError::Other)?;
+        #[cfg(target_arch = "wasm32")]
+        let b: Vec<u8> = vec![];
+        let name = std::path::Path::new(path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| path.into());
+        (b, name, Some(path.to_string()))
+    } else {
+        s.ui_requests.push(crate::UiRequest::Pick { purpose: "place".into(), params: json!({}) });
+        return ok();
+    };
+    // A page of another layout (IDML or DesignCraft): its objects, as one group.
+    let lname = name.to_lowercase();
+    if lname.ends_with(".idml") || lname.ends_with(".designcraft") {
+        return place_layout_page(s, p, &name, &bytes);
+    }
+    // Keep the EPS source for link comparison; rendering uses its preview at the bounding box size.
+    let eps_size = eps_size(&bytes, "file.place")?;
+    // Video and sound: a media frame (Window › Interactive › Media).
+    if let Some(mime) = designcraft_doc::media_mime(&name) {
+        return crate::cmd::media::place_media(s, p, name, mime, bytes, link);
+    }
+    // Text files (plain, Word, RTF) flow into frames.
+    if designcraft_textimport::is_text_file(&name) {
+        return crate::cmd::place_text::place_text(s, p, &name, &bytes, link, before);
+    }
+    let want_w = p
+        .get("width")
+        .filter(|value| !value.is_null())
+        .map(|value| {
+            value
+                .as_f64()
+                .filter(|width| width.is_finite() && *width > 0.0)
+                .ok_or_else(|| bad("file.place", "`width` must be a finite number greater than zero"))
+        })
+        .transpose()?;
+    // Image Import Options: which page of a PDF (1-based).
+    if designcraft_render::is_pdf(&bytes) {
+        designcraft_render::check_pdf_input_size(bytes.len()).map_err(|e| bad("file.place", e.to_string()))?;
+    }
+    let pdf_page = match p.get("pdfPage").and_then(Value::as_u64) {
+        Some(n) if designcraft_render::is_pdf(&bytes) => {
+            let count = designcraft_render::pdf_page_count(&bytes).unwrap_or(1);
+            let invalid_page = || bad("file.place", format!("the PDF has {count} page(s)"));
+            let one_based = usize::try_from(n).map_err(|_| invalid_page())?;
+            if one_based == 0 || one_based > count {
+                return Err(invalid_page());
+            }
+            let zero_based = one_based.checked_sub(1).ok_or_else(invalid_page)?;
+            u32::try_from(zero_based).map_err(|_| invalid_page())?
+        }
+        _ => 0,
+    };
+    let (pw, ph) = match pdf_page {
+        0 => designcraft_render::image_size(&bytes).ok_or_else(|| bad("file.place", "unsupported or corrupt image"))?,
+        n => designcraft_render::pdf_page_size(&bytes, n as usize)
+            .map(|(w, h)| (w.round().max(1.0) as u32, h.round().max(1.0) as u32))
+            .ok_or_else(|| bad("file.place", "can't read that PDF page"))?,
+    };
+    // 72 ppi by default unless the file says otherwise; scale so it fits the page when huge. PDF pages
+    // and SVGs keep their exact size: rounding it to whole points would stretch them unevenly.
+    let (nw, nh) = eps_size.or_else(|| designcraft_render::natural_size(&bytes, pdf_page as usize)).unwrap_or((pw as f64, ph as f64));
+    // Image Import Options › Crop to: the graphic spans that box of the PDF page.
+    let is_pdf = designcraft_render::is_pdf(&bytes);
+    let pdf_crop = match str_param(p, "pdfCrop") {
+        Some(k) if is_pdf => PdfCrop::from_name(k)
+            .ok_or_else(|| bad("file.place", format!("unknown pdfCrop `{k}` (crop, art, trim, bleed, media, contentVisible, contentAll)")))?,
+        _ => PdfCrop::Crop,
+    };
+    let mime = designcraft_render::image_mime(&bytes).to_string();
+    let mut asset = Asset { page: pdf_page, name, mime, link, data: Arc::new(bytes), pixels: Some((pw, ph)), pdf_crop, ..Default::default() };
+    // The graphic's natural size: the box in points (the whole page when the box can't be found,
+    // and then the document says so).
+    let (bw, bh) = match crop_pdf(&mut asset) {
+        Some(size) => size,
+        None => {
+            asset.pdf_crop = PdfCrop::Crop;
+            (nw, nh)
+        }
+    };
+    let target_frame = crate::cmd::id_param(p, "frame").or_else(|| {
+        if ["x", "y", "spread", "width"].iter().any(|key| p.get(*key).is_some_and(|value| !value.is_null())) {
+            return None;
+        }
+        let st = s.active()?;
+        st.selection.items.iter().copied().find(|i| st.doc.item(*i).is_some_and(|it| matches!(it.content, Content::Unassigned | Content::Graphic(_))))
+    });
+    // `"spread": null` counts as omitted, like the other placement parameters.
+    let spread = match p.get("spread") {
+        Some(Value::Null) => designcraft_doc::SpreadRef::Doc(0),
+        _ => crate::cmd::spread_param(p, "file.place")?,
+    };
+    let lid = s.doc()?.active_layer;
+    let px = p.get("x").and_then(Value::as_f64);
+    let py = p.get("y").and_then(Value::as_f64);
+    if target_frame.is_none() && px.is_none() && py.is_none() && p.get("loadCursor").and_then(Value::as_bool) == Some(true) {
+        return load_cursor(s, asset, (bw, bh));
+    }
+    s.edit(|d, sel| {
+        let fresh = AssetId(d.alloc());
+        let aid = d.add_asset(Asset { id: fresh, ..asset });
+        // The width the whole page (or image) gets; the height follows the proportions.
+        let w = match want_w {
+            Some(w) => w,
+            None => {
+                let page_w = d.settings.page_width * 0.6;
+                nw.min(page_w)
+            }
+        };
+        let id = if let Some(fid) = target_frame {
+            let it = d.item_mut(fid).ok_or(designcraft_doc::DocError::NoItem(fid))?;
+            let r = it.inner_bounds();
+            // Fill the frame proportionally once. Auto-Fit stays off, so resizing the frame crops.
+            let k = (r.width() / bw).max(r.height() / bh);
+            let (gw, gh) = (bw * k, bh * k);
+            let xf = Affine::translate((r.x0 + (r.width() - gw) / 2.0, r.y0 + (r.height() - gh) / 2.0)) * Affine::scale(k);
+            validate_placement((bw, bh), r, xf, "file.place")?;
+            it.content = Content::Graphic(Graphic {
+                layer_options: None,
+                asset: aid,
+                size: (bw, bh),
+                xf,
+                clip: None,
+                auto_fit: Default::default(),
+                fit_align: 4,
+                crop: [0.0; 4],
+                wrap: Default::default(),
+                fill: Default::default(),
+            });
+            fid
+        } else {
+            let sp = d.spread(spread).ok_or_else(|| bad("file.place", "no such spread"))?;
+            let pr = sp.pages.first().map(|pg| pg.margin_rect()).unwrap_or(Rect::new(36.0, 36.0, 300.0, 300.0));
+            let (x, y) = (px.unwrap_or(pr.x0), py.unwrap_or(pr.y0));
+            let id = ItemId(d.alloc());
+            let k = w / nw;
+            let r = crate::cmd::finite_rect("file.place", Rect::new(x, y, x + bw * k, y + bh * k))?;
+            let xf = Affine::translate((x, y)) * Affine::scale(k);
+            validate_placement((bw, bh), r, xf, "file.place")?;
+            let mut it = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(r));
+            it.object_style = d.styles.default_graphic_frame.clone();
+            if let Some(e) = d.styles.object_effects(&it.object_style) {
+                it.effects = e.clone();
+            }
+            it.content = Content::Graphic(Graphic {
+                layer_options: None,
+                asset: aid,
+                size: (bw, bh),
+                xf,
+                clip: None,
+                auto_fit: Default::default(),
+                fit_align: 4,
+                crop: [0.0; 4],
+                wrap: Default::default(),
+                fill: Default::default(),
+            });
+            d.insert_item(spread, it, None)?;
+            id
+        };
+        *sel = Selection::items(vec![id]);
+        Ok(json!({"id": id.0, "asset": aid.0}))
+    })
+}
+
+/// Sets `a.pdf_box` to where its `pdf_crop` box sits on its page and returns the box's size in
+/// points. The crop box is the whole page and has none; nor has a page that can't be read, which
+/// keeps its crop choice (a missing link relinked later gets its box then).
+pub(crate) fn crop_pdf(a: &mut Asset) -> Option<(f64, f64)> {
+    a.pdf_box = None;
+    if a.pdf_crop == PdfCrop::Crop || !designcraft_render::is_pdf(&a.data) {
+        return None;
+    }
+    let (frac, size) = designcraft_render::pdf_crop_box(&a.data, a.page as usize, a.pdf_crop)?;
+    a.pdf_box = Some(frac);
+    Some(size)
+}
+
+pub(crate) fn read_source(p: &Value) -> Result<(Vec<u8>, String, Option<String>)> {
+    if let Some(b) = str_param(p, "base64") {
+        return Ok((base64_decode(b), str_param(p, "name").unwrap_or("image").to_string(), None));
+    }
+    let path = str_param(p, "path").ok_or_else(|| bad("place", "missing `path` or `base64`"))?;
+    #[cfg(not(target_arch = "wasm32"))]
+    let b = crate::io::read_file(path).map_err(EngineError::Other)?;
+    #[cfg(target_arch = "wasm32")]
+    let b: Vec<u8> = vec![];
+    let name = std::path::Path::new(path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| path.into());
+    Ok((b, name, Some(path.to_string())))
+}
+
+fn eps_size(bytes: &[u8], command: &str) -> Result<Option<(f64, f64)>> {
+    if !designcraft_images::is_eps(bytes) {
+        return Ok(None);
+    }
+    designcraft_images::eps_size(bytes)
+        .map(Some)
+        .ok_or_else(|| bad(command, "the EPS has a missing or invalid bounding box (dimensions must be 0.001–20,000 points)"))
+}
+
+/// Fitting can overflow even with finite inputs. Never persist NaN/Inf as JSON nulls.
+pub(crate) fn validate_placement(size: (f64, f64), frame: Rect, xf: Affine, command: &str) -> Result<()> {
+    let valid_rect = |r: Rect| [r.x0, r.y0, r.x1, r.y1, r.width(), r.height()].iter().all(|n| n.is_finite()) && r.width() >= 0.0 && r.height() >= 0.0;
+    if !size.0.is_finite()
+        || !size.1.is_finite()
+        || size.0 <= 0.0
+        || size.1 <= 0.0
+        || !valid_rect(frame)
+        || !xf.as_coeffs().iter().all(|n| n.is_finite())
+        || !valid_rect(xf.transform_rect_bbox(Rect::new(0.0, 0.0, size.0, size.1)))
+    {
+        return Err(bad(command, "image placement exceeds finite geometry limits"));
+    }
+    Ok(())
+}
+
+pub(super) fn place_load(s: &mut Session, p: &Value) -> Result<Value> {
+    let (bytes, name, link) = read_source(p)?;
+    let (pw, ph) = designcraft_render::image_size(&bytes).ok_or_else(|| bad("place.load", "unsupported or corrupt image"))?;
+    let natural = eps_size(&bytes, "place.load")?.or_else(|| designcraft_render::natural_size(&bytes, 0)).unwrap_or((pw as f64, ph as f64));
+    let mime = designcraft_render::image_mime(&bytes).to_string();
+    let asset = Asset { name, mime, link, data: Arc::new(bytes), pixels: Some((pw, ph)), ..Default::default() };
+    load_cursor(s, asset, natural)
+}
+
+/// Adds `asset` to the document (with a fresh id) and loads it into the place cursor.
+fn load_cursor(s: &mut Session, mut asset: Asset, size: (f64, f64)) -> Result<Value> {
+    let name = asset.name.clone();
+    let (pw, ph) = asset.pixels.unwrap_or_default();
+    let aid = s.edit(|d, _| {
+        asset.id = AssetId(d.alloc());
+        Ok(d.add_asset(asset))
+    })?;
+    s.loaded = Some(crate::LoadedGraphic { asset: aid, size });
+    s.set_tool("placeGun");
+    Ok(json!({"asset": aid.0, "name": name, "width": pw, "height": ph, "loaded": true}))
+}
+
+pub(super) fn place_drop(s: &mut Session, p: &Value) -> Result<Value> {
+    let crate::LoadedGraphic { asset: aid, size: (nw, nh) } = s.loaded.ok_or_else(|| bad("place.drop", "nothing loaded in the place cursor"))?;
+    // Undo can remove the loaded graphic's asset.
+    if !s.doc()?.doc.assets.contains_key(&aid) {
+        s.loaded = None;
+        return Err(bad("place.drop", "the loaded graphic is no longer in the document"));
+    }
+    let sr = crate::cmd::spread_param(p, "place.drop")?;
+    let lid = s.doc()?.active_layer;
+    let frame = crate::cmd::id_param(p, "frame");
+    let rect = crate::cmd::rect_param(p, "rect");
+    let (x, y) = (crate::cmd::f64_or(p, "x", 0.0), crate::cmd::f64_or(p, "y", 0.0));
+    let d = &s.doc()?.doc;
+    let (frame_rect, xf, auto_fit) = if let Some(fid) = frame {
+        let r = d.item(fid).ok_or(designcraft_doc::DocError::NoItem(fid))?.inner_bounds();
+        let k = (r.width() / nw).max(r.height() / nh);
+        let xf = Affine::translate((r.x0 + (r.width() - nw * k) / 2.0, r.y0 + (r.height() - nh * k) / 2.0)) * Affine::scale(k);
+        // Fill the frame proportionally once. Auto-Fit stays off, so resizing the frame crops.
+        (r, xf, Default::default())
+    } else {
+        if d.spread(sr).is_none() {
+            return Err(bad("place.drop", "no such spread"));
+        }
+        // Drag: fit proportionally; click: actual size at the point.
+        let (r, k) = match rect {
+            Some(r) if r.width() > 2.0 && r.height() > 2.0 => {
+                let k = (r.width() / nw).min(r.height() / nh);
+                (Rect::new(r.x0, r.y0, r.x0 + nw * k, r.y0 + nh * k), k)
+            }
+            _ => (Rect::new(x, y, x + nw, y + nh), 1.0),
+        };
+        (r, Affine::translate((r.x0, r.y0)) * Affine::scale(k), Default::default())
+    };
+    validate_placement((nw, nh), frame_rect, xf, "place.drop")?;
+    let r = s.edit(|d, sel| {
+        let graphic = Content::Graphic(Graphic {
+            layer_options: None,
+            asset: aid,
+            size: (nw, nh),
+            xf,
+            clip: None,
+            auto_fit,
+            fit_align: 4,
+            crop: [0.0; 4],
+            wrap: Default::default(),
+            fill: Default::default(),
+        });
+        let id = if let Some(fid) = frame {
+            d.item_mut(fid).ok_or(designcraft_doc::DocError::NoItem(fid))?.content = graphic;
+            fid
+        } else {
+            let id = ItemId(d.alloc());
+            let mut it = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(frame_rect));
+            it.object_style = d.styles.default_graphic_frame.clone();
+            if let Some(e) = d.styles.object_effects(&it.object_style) {
+                it.effects = e.clone();
+            }
+            it.content = graphic;
+            d.insert_item(sr, it, None)?;
+            id
+        };
+        *sel = Selection::items(vec![id]);
+        Ok(json!({"id": id.0}))
+    })?;
+    s.loaded = None;
+    s.set_tool("selection");
+    Ok(r)
+}
+
+/// File › Place of an IDML or DesignCraft document: the objects of one page (`layoutPage`,
+/// 1-based) grouped, top-left at x/y (default: the source position on the first page).
+fn place_layout_page(s: &mut Session, p: &Value, name: &str, bytes: &[u8]) -> Result<Value> {
+    const ID: &str = "file.place";
+    let src = if name.to_lowercase().ends_with(".idml") {
+        crate::cmd::interchange::import_idml_confined(bytes, str_param(p, "path").map(std::path::Path::new)).map_err(|e| bad(ID, e.to_string()))?
+    } else {
+        from_bytes(bytes)?
+    };
+    let n = src.page_count();
+    let page = p.get("layoutPage").and_then(Value::as_u64).unwrap_or(1) as usize;
+    if page == 0 || page > n {
+        return Err(bad(ID, format!("the document has {n} page(s)")));
+    }
+    let (si, pi) = src.page_loc(page - 1).ok_or_else(|| bad(ID, "no such page"))?;
+    let sp = &src.spreads[si];
+    let pr = sp.pages[pi].bounds();
+    let ids: Vec<ItemId> = sp.items.iter().filter(|it| !it.hidden && sp.page_at_x(it.bounds().center().x) == Some(pi)).map(|it| it.id).collect();
+    if ids.is_empty() {
+        return Err(bad(ID, format!("page {page} has no objects")));
+    }
+    let to = crate::cmd::spread_param(p, ID)?;
+    let off = match (p.get("x").and_then(Value::as_f64), p.get("y").and_then(Value::as_f64)) {
+        (Some(x), Some(y)) => designcraft_geom::Vec2::new(x - pr.x0, y - pr.y0),
+        _ => designcraft_geom::Vec2::new(-pr.x0, -pr.y0),
+    };
+    let placed = s.edit(|d, sel| {
+        for sw in &src.swatches {
+            if d.swatch(&sw.name).is_none() {
+                d.swatches.push(sw.clone());
+            }
+        }
+        let missing_p: Vec<_> = src.styles.paragraph.iter().filter(|ps| d.styles.para(&ps.name).is_none()).cloned().collect();
+        let missing_c: Vec<_> = src.styles.character.iter().filter(|cs| d.styles.char_style(&cs.name).is_none()).cloned().collect();
+        if !missing_p.is_empty() || !missing_c.is_empty() {
+            let st = d.styles_mut();
+            st.paragraph.extend(missing_p);
+            st.character.extend(missing_c);
+        }
+        let new = crate::cmd::object::duplicate_from(d, &src, &ids, to, off)?;
+        *sel = Selection::items(new.clone());
+        Ok(new)
+    })?;
+    if placed.len() > 1 {
+        let g = s.execute("object.group", &json!({"ids": placed.iter().map(|i| i.0).collect::<Vec<_>>()}))?;
+        return Ok(json!({"id": g["id"], "items": placed.len()}));
+    }
+    Ok(json!({"id": placed[0].0, "items": 1}))
+}
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+pub(super) mod image_place_tests {
+    use designcraft_doc::{Content, ItemId};
+    use designcraft_geom::Rect;
+    use serde_json::{Value, json};
+
+    use crate::Session;
+
+    pub(in crate::cmd::file) fn image_file() -> std::io::Result<tempfile::NamedTempFile> {
+        image_file_with_color(30)
+    }
+
+    fn image_file_with_color(red: u8) -> std::io::Result<tempfile::NamedTempFile> {
+        let file = tempfile::Builder::new().suffix(".png").tempfile()?;
+        let png = designcraft_render::Rendered { width: 40, height: 20, pixels: [red, 90, 180, 255].repeat(800) }.to_png();
+        std::fs::write(file.path(), png)?;
+        Ok(file)
+    }
+
+    #[test]
+    fn consecutive_path_placements_create_distinct_graphics() {
+        let images = [image_file_with_color(30).unwrap(), image_file_with_color(31).unwrap(), image_file_with_color(32).unwrap()];
+        let mut session = Session::new();
+        session.execute("file.new", &json!({"pages": 3, "facingPages": false})).unwrap();
+        let mut placements = Vec::new();
+        let mut originals = Vec::new();
+
+        for ((spread, x, y), image) in [(0, 0.0, 0.0), (1, 70.0, 90.0), (2, 150.0, 210.0)].into_iter().zip(&images) {
+            let placed = session.execute("file.place", &json!({"path": image.path(), "spread": spread, "x": x, "y": y})).unwrap();
+            let id = ItemId(placed["id"].as_u64().unwrap());
+            assert!(
+                placements.iter().all(|previous: &Value| previous["id"] != placed["id"]),
+                "each explicit placement needs a distinct frame: {placed}"
+            );
+            let document = &session.doc().unwrap().doc;
+            let item = document.item(id).unwrap();
+            assert_eq!(item.bounds(), Rect::new(x, y, x + 40.0, y + 20.0));
+            assert!(document.spreads[spread].items.iter().any(|item| item.id == id));
+            originals.push(serde_json::to_value(item).unwrap());
+            placements.push(placed);
+        }
+
+        let document = &session.doc().unwrap().doc;
+        assert_eq!(document.spreads.iter().flat_map(|spread| &spread.items).filter(|item| matches!(item.content, Content::Graphic(_))).count(), 3);
+        assert_eq!(document.assets.len(), 3);
+        for (placed, original) in placements.iter().zip(originals) {
+            assert_eq!(serde_json::to_value(document.item(ItemId(placed["id"].as_u64().unwrap())).unwrap()).unwrap(), original);
+        }
+        let links = session.execute("links.list", &json!({})).unwrap();
+        assert_eq!(links.as_array().unwrap().len(), 3);
+        for (placed, image) in placements.into_iter().zip(&images) {
+            let row = links.as_array().unwrap().iter().find(|row| row["asset"] == placed["asset"]).unwrap();
+            assert_eq!(row["path"], json!(image.path()));
+            assert_eq!(row["uses"].as_array().unwrap().len(), 1);
+            assert_eq!(row["uses"][0]["id"], placed["id"]);
+        }
+    }
+
+    #[test]
+    fn individual_placement_parameters_bypass_selected_frames() {
+        let image = image_file().unwrap();
+        for graphic in [false, true] {
+            for (key, value, expected) in [
+                ("x", 0, Rect::new(0.0, 36.0, 40.0, 56.0)),
+                ("y", 0, Rect::new(36.0, 0.0, 76.0, 20.0)),
+                ("spread", 0, Rect::new(36.0, 36.0, 76.0, 56.0)),
+                ("width", 0, Rect::ZERO),
+                ("width", 80, Rect::new(36.0, 36.0, 116.0, 76.0)),
+            ] {
+                let mut session = Session::new();
+                session.execute("file.new", &json!({})).unwrap();
+                let selected = session.execute("frame.create", &json!({"rect": [100, 120, 200, 220]})).unwrap();
+                if graphic {
+                    session.execute("file.place", &json!({"path": image.path()})).unwrap();
+                }
+                let id = ItemId(selected["id"].as_u64().unwrap());
+                let original = serde_json::to_value(session.doc().unwrap().doc.item(id).unwrap()).unwrap();
+                let mut params = json!({"path": image.path()});
+                params[key] = json!(value);
+
+                let result = session.execute("file.place", &params);
+                if key == "width" && value == 0 {
+                    assert!(result.is_err(), "zero width must be rejected, graphic={graphic}");
+                    continue;
+                }
+                let placed = result.unwrap();
+
+                assert_ne!(placed["id"], selected["id"], "{key}={value}, graphic={graphic}");
+                let document = &session.doc().unwrap().doc;
+                assert_eq!(serde_json::to_value(document.item(id).unwrap()).unwrap(), original);
+                let item = document.item(ItemId(placed["id"].as_u64().unwrap())).unwrap();
+                assert_eq!(item.bounds(), expected);
+                let Content::Graphic(content) = &item.content else { panic!("placed frame must be graphic") };
+                let [scale_x, _, _, scale_y, _, _] = content.xf.as_coeffs();
+                assert!(scale_x > 0.0 && scale_y > 0.0);
+            }
+        }
+    }
+
+    #[test]
+    fn explicit_frame_wins_over_placement_and_selection() {
+        let image = image_file().unwrap();
+        let mut session = Session::new();
+        session.execute("file.new", &json!({})).unwrap();
+        let target = session.execute("frame.create", &json!({"rect": [100, 120, 200, 220]})).unwrap();
+        let selected = session.execute("frame.create", &json!({"rect": [300, 320, 400, 420]})).unwrap();
+
+        let placed =
+            session.execute("file.place", &json!({"path": image.path(), "frame": target["id"], "x": 0, "y": 0, "spread": 99, "width": 80})).unwrap();
+
+        assert_eq!(placed["id"], target["id"]);
+        let document = &session.doc().unwrap().doc;
+        let item = document.item(ItemId(target["id"].as_u64().unwrap())).unwrap();
+        assert_eq!(item.bounds(), Rect::new(100.0, 120.0, 200.0, 220.0));
+        assert!(matches!(item.content, Content::Graphic(_)));
+        assert!(matches!(document.item(ItemId(selected["id"].as_u64().unwrap())).unwrap().content, Content::Unassigned));
+        assert_eq!(document.spreads[0].items.len(), 2);
+    }
+
+    fn assert_width_rejected(width: Value) -> std::result::Result<(), Box<dyn std::error::Error>> {
+        let image = image_file()?;
+        for graphic in [false, true] {
+            for explicit_frame in [false, true] {
+                let mut session = Session::new();
+                session.execute("file.new", &json!({}))?;
+                let target = session.execute("frame.create", &json!({"rect": [100, 120, 200, 220]}))?;
+                if graphic {
+                    session.execute("file.place", &json!({"path": image.path()}))?;
+                }
+                let mut params = json!({"path": image.path(), "width": width});
+                if explicit_frame {
+                    params["frame"] = target["id"].clone();
+                    session.execute("frame.create", &json!({"rect": [300, 320, 400, 420]}))?;
+                }
+                let before = session.doc()?;
+                let document = before.doc.clone();
+                let selection = before.selection.clone();
+                let revision = before.revision;
+                let assets = document.assets.len();
+
+                let result = session.execute("file.place", &params);
+
+                assert!(
+                    matches!(&result, Err(crate::EngineError::BadParams { .. })),
+                    "width={width}, graphic={graphic}, explicit_frame={explicit_frame}: expected BadParams, got {result:?}"
+                );
+                let error = result.err().ok_or_else(|| crate::EngineError::Other("expected placement error".into()))?;
+                let crate::EngineError::BadParams { cmd, msg } = error else { return Err(error.into()) };
+                assert_eq!(cmd, "file.place");
+                assert!(msg.contains("width") && msg.contains("finite") && msg.contains("greater than zero"), "{msg}");
+                let after = session.doc()?;
+                assert!(std::sync::Arc::ptr_eq(&document, &after.doc));
+                assert_eq!(after.selection, selection);
+                assert_eq!(after.revision, revision);
+                assert_eq!(after.doc.assets.len(), assets);
+            }
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn width_rejected_when_zero() {
+        assert_width_rejected(json!(0)).unwrap();
+    }
+
+    #[test]
+    fn width_rejected_when_negative() {
+        assert_width_rejected(json!(-80)).unwrap();
+    }
+
+    #[test]
+    fn width_rejected_when_non_numeric() {
+        for width in [json!("80"), json!(true), json!([80]), json!({"value": 80})] {
+            assert_width_rejected(width).unwrap();
+        }
+    }
+
+    fn assert_null_placement_uses_selection(keys: &[&str]) -> std::result::Result<(), Box<dyn std::error::Error>> {
+        let image = image_file()?;
+        let previous_image = image_file_with_color(31)?;
+        for graphic in [false, true] {
+            let mut session = Session::new();
+            session.execute("file.new", &json!({}))?;
+            let selected = session.execute("frame.create", &json!({"rect": [100, 120, 200, 220]}))?;
+            let previous = graphic.then(|| session.execute("file.place", &json!({"path": previous_image.path()}))).transpose()?;
+            let mut params = json!({"path": image.path()});
+            for key in keys {
+                params[*key] = Value::Null;
+            }
+
+            let placed = session.execute("file.place", &params)?;
+
+            assert_eq!(placed["id"], selected["id"], "keys={keys:?}, graphic={graphic}");
+            if let Some(previous) = previous {
+                assert_ne!(placed["asset"], previous["asset"]);
+            }
+            let document = &session.doc()?.doc;
+            let id = ItemId(selected["id"].as_u64().ok_or_else(|| crate::EngineError::Other("frame.create returned no numeric id".into()))?);
+            let item = document.item(id).ok_or(designcraft_doc::DocError::NoItem(id))?;
+            assert_eq!(item.bounds(), Rect::new(100.0, 120.0, 200.0, 220.0));
+            assert!(matches!(&item.content, Content::Graphic(_)), "placed frame must be graphic");
+            let Content::Graphic(content) = &item.content else {
+                return Err(crate::EngineError::Other("placed frame must be graphic".into()).into());
+            };
+            assert_eq!(json!(content.asset.0), placed["asset"]);
+            assert_eq!(document.spreads[0].items.len(), 1);
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn selection_used_when_x_null() {
+        assert_null_placement_uses_selection(&["x"]).unwrap();
+    }
+
+    #[test]
+    fn selection_used_when_y_null() {
+        assert_null_placement_uses_selection(&["y"]).unwrap();
+    }
+
+    #[test]
+    fn selection_used_when_spread_null() {
+        assert_null_placement_uses_selection(&["spread"]).unwrap();
+    }
+
+    #[test]
+    fn selection_used_when_width_null() {
+        assert_null_placement_uses_selection(&["width"]).unwrap();
+    }
+
+    #[test]
+    fn selection_used_when_all_placement_parameters_null() {
+        assert_null_placement_uses_selection(&["x", "y", "spread", "width"]).unwrap();
+    }
+
+    #[test]
+    fn implicit_placement_fills_empty_and_replaces_graphic_selection() {
+        let image = image_file().unwrap();
+        let previous_image = image_file_with_color(31).unwrap();
+        for graphic in [false, true] {
+            let mut session = Session::new();
+            session.execute("file.new", &json!({})).unwrap();
+            let selected = session.execute("frame.create", &json!({"rect": [100, 120, 200, 220]})).unwrap();
+            let previous = graphic.then(|| session.execute("file.place", &json!({"path": previous_image.path()})).unwrap());
+
+            let placed = session.execute("file.place", &json!({"path": image.path()})).unwrap();
+
+            assert_eq!(placed["id"], selected["id"]);
+            if let Some(previous) = previous {
+                assert_ne!(placed["asset"], previous["asset"]);
+            }
+            let document = &session.doc().unwrap().doc;
+            let item = document.item(ItemId(placed["id"].as_u64().unwrap())).unwrap();
+            assert_eq!(item.bounds(), Rect::new(100.0, 120.0, 200.0, 220.0));
+            let Content::Graphic(content) = &item.content else { panic!("placed frame must be graphic") };
+            assert_eq!(json!(content.asset.0), placed["asset"]);
+            assert_eq!(document.spreads[0].items.len(), 1);
+        }
+    }
+}
+
+#[cfg(test)]
+mod pdf_crop_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn place_pdf_cropped_to_its_trim_box() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("layout.documentSetup", &json!({"bleed": 9})).unwrap();
+        let b64 = s.execute("file.exportPdf", &json!({"bleed": true})).unwrap()["base64"].as_str().unwrap().to_string();
+        let mut t = Session::new();
+        t.execute("file.new", &json!({})).unwrap();
+        let size = |t: &mut Session, crop: &str| {
+            t.execute("edit.deselectAll", &json!({})).unwrap();
+            let r = t.execute("file.place", &json!({"base64": b64, "name": "a.pdf", "pdfCrop": crop, "width": 630, "x": 0, "y": 0})).unwrap();
+            let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
+            t.doc().unwrap().doc.item(id).unwrap().bounds()
+        };
+        let full = size(&mut t, "crop");
+        let trim = size(&mut t, "trim");
+        assert!((full.width() - 630.0).abs() < 1e-6, "{full:?}");
+        assert!((trim.width() - 612.0).abs() < 1e-3 && (trim.height() - 792.0).abs() < 1e-3, "{trim:?}");
+        assert!(t.execute("file.place", &json!({"base64": b64, "name": "a.pdf", "pdfCrop": "nope"})).is_err());
+    }
+
+    /// Placing with `trim` stores the choice; the graphic spans the trim box and draws only it,
+    /// even in a frame larger than the graphic.
+    #[test]
+    fn a_pdf_placed_with_its_trim_box_stores_and_draws_that_box() {
+        // Letter with a 9 pt bleed: black in the bleed's top-left corner and a black square inside.
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("layout.documentSetup", &json!({"bleed": 9})).unwrap();
+        for rect in [[-9, -9, 0, 0], [10, 10, 30, 30]] {
+            let id = s.execute("frame.create", &json!({"rect": rect})).unwrap()["id"].clone();
+            s.execute("object.fill", &json!({"ids": [id], "swatch": "[Black]"})).unwrap();
+        }
+        let b64 = s.execute("file.exportPdf", &json!({"bleed": true})).unwrap()["base64"].as_str().unwrap().to_string();
+
+        let mut t = Session::new();
+        t.execute("file.new", &json!({})).unwrap();
+        // `width` is the whole page's (630 pt with its bleed): half size.
+        let r = t.execute("file.place", &json!({"base64": b64, "name": "a.pdf", "pdfCrop": "trim", "width": 315, "x": 100, "y": 100})).unwrap();
+        let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
+        let d = t.doc().unwrap().doc.clone();
+        let it = d.item(id).unwrap();
+        let g = it.graphic().unwrap().clone();
+        let a = &d.assets[&g.asset];
+        assert_eq!(a.pdf_crop, designcraft_doc::PdfCrop::Trim);
+        let b = a.shown_box().unwrap();
+        let want = [9.0 / 630.0, 9.0 / 810.0, 621.0 / 630.0, 801.0 / 810.0];
+        assert!(b.iter().zip(want).all(|(x, y)| (x - y).abs() < 1e-4), "{b:?}");
+        assert!((g.size.0 - 612.0).abs() < 1e-3 && (g.size.1 - 792.0).abs() < 1e-3, "{:?}", g.size);
+        let shown = (it.xf * g.xf).transform_rect_bbox(designcraft_geom::Rect::new(0.0, 0.0, g.size.0, g.size.1));
+        let fb = it.bounds();
+        for (x, y) in [(shown.x0, 100.0), (shown.y0, 100.0), (shown.x1, 406.0), (shown.y1, 496.0), (fb.x1, 406.0), (fb.y1, 496.0)] {
+            assert!((x - y).abs() < 1e-3, "{shown:?} {fb:?}");
+        }
+
+        // A frame larger than the graphic still shows only the trim box.
+        t.edit(|d, _| {
+            d.item_mut(id).unwrap().path = designcraft_geom::shapes::rectangle(designcraft_geom::Rect::new(90.0, 90.0, 416.0, 506.0));
+            Ok(())
+        })
+        .unwrap();
+        let d = t.doc().unwrap().doc.clone();
+        let mut rr = designcraft_render::Renderer::new();
+        rr.threads = 0;
+        let img = rr.render_page(&d, &t.cache, 0, 1.0, false, &Default::default()).unwrap();
+        let dark = |x: u32, y: u32| img.pixel(x, y)[0] < 60;
+        // The page sits at 95.5: its bleed corner (95.5–100) is cut off, the square (105–115) shows
+        // where it is on the page.
+        assert!(!dark(97, 97), "the bleed is outside the trim box");
+        assert!(!dark(103, 103), "the page is offset by its bleed");
+        assert!(dark(110, 110), "the square inside the trim box");
+    }
+
+    #[test]
+    fn placed_pdf_keeps_its_exact_page_size() {
+        // A 100.4 x 50.4 pt page placed 100.4 pt wide is 50.4 pt tall, not stretched to whole points.
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 100.4, "height": 50.4, "pages": 1})).unwrap();
+        let b64 = s.execute("file.exportPdf", &json!({})).unwrap()["base64"].as_str().unwrap().to_string();
+        let mut t = Session::new();
+        t.execute("file.new", &json!({})).unwrap();
+        let r = t.execute("file.place", &json!({"base64": b64, "name": "a.pdf", "width": 100.4, "x": 0, "y": 0})).unwrap();
+        let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
+        let d = &t.doc().unwrap().doc;
+        let it = d.item(id).unwrap();
+        let b = it.bounds();
+        assert!((b.width() - 100.4).abs() < 1e-3 && (b.height() - 50.4).abs() < 1e-3, "{b:?}");
+        let designcraft_doc::Content::Graphic(g) = &it.content else { panic!("not a graphic") };
+        assert!((g.size.0 - 100.4).abs() < 1e-3 && (g.size.1 - 50.4).abs() < 1e-3, "{:?}", g.size);
+    }
+}
+
+#[cfg(test)]
+mod layout_place_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn place_a_page_of_an_idml_file_as_a_group() {
+        let mut a = Session::new();
+        a.execute("file.new", &json!({"pages": 2})).unwrap();
+        a.execute("frame.create", &json!({"rect": [100, 100, 200, 150], "content": "text", "text": "From page one", "caret": false})).unwrap();
+        a.execute("frame.create", &json!({"rect": [300, 400, 350, 450]})).unwrap();
+        let idml = designcraft_idml::export_idml(&a.doc().unwrap().doc);
+        let b64 = super::base64_encode(&idml);
+        let mut b = Session::new();
+        b.execute("file.new", &json!({})).unwrap();
+        let r = b.execute("file.place", &json!({"base64": b64, "name": "src.idml", "layoutPage": 1, "x": 0, "y": 0})).unwrap();
+        assert_eq!(r["items"], 2);
+        let d = &b.doc().unwrap().doc;
+        let g = d.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap();
+        assert_eq!(g.children().len(), 2, "one group");
+        let bb = g.bounds();
+        assert!((bb.x0 - 100.0).abs() < 1e-6 && (bb.y0 - 100.0).abs() < 1e-6, "page top-left at 0,0: {bb:?}");
+        assert!(d.stories.values().any(|st| st.text == "From page one"), "stories come along");
+        assert!(b.execute("file.place", &json!({"base64": b64, "name": "src.idml", "layoutPage": 2})).is_err(), "page 2 is empty");
+    }
+}
diff --git a/crates/engine/src/cmd/file/registry.rs b/crates/engine/src/cmd/file/registry.rs
new file mode 100644
index 000000000..216f12bdb
--- /dev/null
+++ b/crates/engine/src/cmd/file/registry.rs
@@ -0,0 +1,141 @@
+#[cfg(not(target_arch = "wasm32"))]
+use super::EngineError;
+use super::bytes::{base64_encode, to_bytes, to_bytes_with_preview, with_document_extension};
+use super::new::{file_new, file_sample, save_preset};
+use super::open::{file_open, file_open_bytes, file_open_recent, has_recent, recent_entry};
+use super::place::{file_place, place_drop, place_load, read_source};
+use super::save::{FolderAccess, can_revert, file_revert, file_save, recovery_dir};
+use super::snippets::{snippet_export, snippet_place};
+use super::{CommandSpec, PRESETS, Value, always, bad, cmd, has_doc, json, ok, str_param};
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        cmd!(noundo "file.new", "Document…", ["File", "New"], Some("Cmd+N"),
+            "{preset?: \"Letter\"|\"A4\"|… or a saved preset (file.savePreset), intent?: print|web|mobile, units?: points|picas|millimeters|…, width?, height?, pages?, startPage?, facingPages?, columns?, gutter?, margins?: number|{top,bottom,inside,outside}, bleed?, slug?: n | [top, bottom, inside, outside], title?, primaryTextFrame?: bool}",
+            always, file_new),
+        cmd!(noundo "file.newSample", "Sample Document", ["Help"], None, "{} — a multi-page magazine sample", always, file_sample),
+        cmd!(query "file.presets", "Document Presets", [], None, "{} → the built-in presets [{name, intent, width, height, units}], then the saved ones (with `saved: true`)", always, |s, _| {
+            let mut presets: Vec<Value> = PRESETS.iter().map(|p| serde_json::to_value(p).unwrap_or_default()).collect();
+            presets.extend(
+                s.prefs
+                    .document_presets
+                    .iter()
+                    .map(|p| json!({"name": p.title, "intent": p.intent, "width": p.width, "height": p.height, "units": p.units, "saved": true})),
+            );
+            Ok(Value::Array(presets))
+        }),
+        cmd!(noundo "file.savePreset", "Save Document Preset", [], None,
+            "{name, …the settings as file.new} — kept with the preferences; `file.new {preset: name}` uses it. A saved preset of that name is replaced; built-in names are refused",
+            always, save_preset),
+        cmd!(noundo "file.deletePreset", "Delete Document Preset", [], None, "{name} — a saved document preset", always, |s, p| {
+            let name = str_param(p, "name").unwrap_or_default().trim().to_string();
+            let before = s.prefs.document_presets.len();
+            s.prefs.document_presets.retain(|x| !x.title.eq_ignore_ascii_case(&name));
+            if s.prefs.document_presets.len() == before {
+                return Err(bad("file.deletePreset", format!("no saved preset `{name}`")));
+            }
+            ok()
+        }),
+        cmd!(noundo "file.open", "Open…", ["File"], Some("Cmd+O"),
+            "{path} — a DesignCraft or IDML file (recognised by its content, so the extension may be missing), or an InDesign .indd/.indt (recognised by its signature or extension, converted to IDML; its conversion warnings join `warnings`); the fonts in a `Document Fonts` folder beside it load first → {index, documentFonts: faces loaded, warnings: font files skipped, GREP styles whose pattern can't compile, Based on Parent links cleared and, for IDML and InDesign files, package parts missing}",
+            always, file_open),
+        cmd!(noundo "file.openBytes", "Open Bytes", [], None, "{name, base64} — DesignCraft JSON, an IDML package or an InDesign .indd/.indt → {index, warnings}", always, file_open_bytes),
+        cmd!(noundo "file.openRecent", "Open Recent File", [], None,
+            "{index} — reopen entry `index` of File › Open Recent (as file.open); a file that is gone is an error and stays listed",
+            has_recent, file_open_recent),
+        cmd!(query "file.recentFiles", "Recent Files", [], None, "{} → [{path, name, exists}] File › Open Recent, most recent first", always, |s, _| {
+            Ok(Value::Array(s.prefs.recent_files.iter().map(|p| recent_entry(p)).collect()))
+        }),
+        cmd!(noundo "file.clearRecent", "Clear Recent Files", ["File", "Open Recent"], None, "{} — empty File › Open Recent", has_recent, |s, _| {
+            s.prefs.recent_files.clear();
+            ok()
+        }),
+        cmd!(noundo "file.save", "Save", ["File"], Some("Cmd+S"), "{path?} — a `path` without the .designcraft extension gets it → {path: the file written, bytes}", has_doc, file_save),
+        cmd!(noundo "file.saveAs", "Save As…", ["File"], Some("Cmd+Shift+S"), "{path} — a path without the .designcraft extension gets it → {path: the file written, bytes}", has_doc, file_save),
+        cmd!(noundo "file.saveACopy", "Save a Copy…", ["File"], None, "{path} — writes the document without changing which file it is or its unsaved state; a path without the .designcraft extension gets it → {path: the file written, bytes}", has_doc, |s, p| {
+            let path = str_param(p, "path").ok_or_else(|| bad("file.saveACopy", "missing `path`"))?;
+            let path = with_document_extension(path);
+            let mut copy = (*s.doc()?.doc).clone();
+            crate::cmd::datamerge::refresh_relative_paths(&mut copy, std::path::Path::new(&path));
+            let bytes = to_bytes_with_preview(&copy, &s.cache)?;
+            #[cfg(not(target_arch = "wasm32"))]
+            crate::io::write_file(&path, &bytes).map_err(EngineError::Other)?;
+            Ok(json!({"path": path, "bytes": bytes.len()}))
+        }),
+        cmd!(noundo "file.revert", "Revert", ["File"], None, "{} — back to the last saved version (not undoable)", can_revert, file_revert),
+        cmd!(query "file.recovery.list", "Recovery Data", [], None, "{dir?} → [{uid, path, title, saved}] unsaved documents left by a crash (default: the session's recovery folder)", always, |s, p| {
+            let dir = recovery_dir(s, p, FolderAccess::Read)?;
+            Ok(Value::Array(crate::recovery::list(&dir).into_iter().map(|(uid, mut m)| { m["uid"] = json!(uid); m }).collect()))
+        }),
+        cmd!(noundo "file.recovery.save", "Save Recovery Data", [], None, "{dir?} — write every unsaved document to the recovery folder (the app does this on a timer)", always, |s, p| {
+            let dir = recovery_dir(s, p, FolderAccess::Write)?;
+            Ok(json!({"saved": crate::recovery::save_tracked(s, &dir)?}))
+        }),
+        cmd!(noundo "file.recovery.open", "Recover Documents", [], None, "{dir?} — reopen documents left in the recovery folder (unsaved)", always, |s, p| {
+            // Reopening removes the entries it read.
+            let dir = recovery_dir(s, p, FolderAccess::ReadWrite)?;
+            Ok(json!({"opened": crate::recovery::open(s, &dir)?}))
+        }),
+        cmd!(query "file.serialize", "Serialize", [], None, "{} → {base64, bytes} the .designcraft file", has_doc, |s, _| {
+            let st = s.doc()?;
+            // Preview fill is session state. Serialize the unfilled template.
+            let doc = st.preview_stash.as_deref().unwrap_or(st.doc.as_ref());
+            let bytes = to_bytes(doc)?;
+            Ok(json!({"base64": base64_encode(&bytes), "bytes": bytes.len()}))
+        }),
+        cmd!(noundo "file.close", "Close", ["File"], Some("Cmd+W"), "{index?}", has_doc, |s, p| {
+            let i = p.get("index").and_then(Value::as_u64).map(|v| v as usize).or(s.active_index()).unwrap_or(0);
+            s.close_document(i);
+            ok()
+        }),
+        cmd!(noundo "file.activate", "Activate Document", [], None, "{index}", has_doc, |s, p| {
+            s.set_active(p.get("index").and_then(Value::as_u64).unwrap_or(0) as usize);
+            ok()
+        }),
+        cmd!(query "snippet.export", "Export Selection as Snippet", ["File", "Export"], None,
+            "{path?} — the selected items (with their stories, styles and images) as a .designcraft snippet; no path: {base64}", crate::cmd::has_selection, snippet_export),
+        cmd!(query "place.styles", "Import Options: Styles", [], None,
+        "{path | base64, name} → {paragraph: [name], character: [name], conflicts: [name]} — the styles a Word/RTF file brings (for styleMap / styleConflicts)",
+        has_doc, |s, p| {
+            let (bytes, name, _) = read_source(p)?;
+            let imp = designcraft_textimport::import(&name, &bytes).map_err(|e| bad("place.styles", e.to_string()))?;
+            let st = &s.doc()?.doc.styles;
+            let conflicts: Vec<&str> = imp
+                .para_styles
+                .iter()
+                .filter(|x| st.para(&x.name).is_some())
+                .chain(imp.char_styles.iter().filter(|x| st.char_style(&x.name).is_some()))
+                .map(|x| x.name.as_str())
+                .collect();
+            Ok(json!({"paragraph": imp.para_styles.iter().map(|x| &x.name).collect::<Vec<_>>(), "character": imp.char_styles.iter().map(|x| &x.name).collect::<Vec<_>>(), "conflicts": conflicts}))
+        }),
+        cmd!(
+            "snippet.place",
+            "Place Snippet",
+            [],
+            None,
+            "{path | base64, spread?, x?, y?} — items keep their positions unless x/y given (top-left)",
+            has_doc,
+            snippet_place
+        ),
+        cmd!(
+            "place.load",
+            "Load Place Cursor",
+            [],
+            None,
+            "{path | base64, name?} — load a graphic into the place cursor (then click/drag with the placeGun tool)",
+            has_doc,
+            place_load
+        ),
+        cmd!("place.drop", "Place Loaded Graphic", [], None, "{spread?, x, y, rect?: [x0,y0,x1,y1], frame?: id}", has_doc, place_drop),
+        cmd!(
+            "file.place",
+            "Place…",
+            ["File"],
+            Some("Cmd+D"),
+            "{path?|base64?, name?, frame?: id (place into), spread?, x?, y?, width?: finite number > 0 (null: absent), height? (video/audio), pdfPage?: n (1-based, Image Import Options), pdfCrop?: crop|art|trim|bleed|media|contentVisible|contentAll (the box the graphic shows; `width` is the whole page's), loadCursor? (with no frame to fill and no x/y, an image loads into the place cursor, as File › Place), layoutPage?: n (IDML / .designcraft: that page's objects as a group), page?, rect?: [x0,y0,x1,y1] (text: a new frame there), autoflow? (threads one frame per page column from the first frame on, adding pages until the text fits), removeStyles?, styleMap?: {imported name: document style}, styleConflicts?: useExisting|redefine|autoRename, link? (keep the file linked in the Links panel; default: the linkTextFiles preference)} — places an image into `frame` when given; otherwise any explicit x/y/spread/width creates a new frame; otherwise uses the selected empty or graphic frame, or creates a new frame; text files (.txt, .docx, .rtf, .md) and Excel workbooks (.xlsx, as a table) go into the insertion point, the selected frame or a new frame on `page`/`rect`",
+            has_doc,
+            file_place
+        ),
+    ]
+}
diff --git a/crates/engine/src/cmd/file/save.rs b/crates/engine/src/cmd/file/save.rs
new file mode 100644
index 000000000..d94a02ab9
--- /dev/null
+++ b/crates/engine/src/cmd/file/save.rs
@@ -0,0 +1,213 @@
+#[cfg(not(target_arch = "wasm32"))]
+use super::DocState;
+#[cfg(not(target_arch = "wasm32"))]
+use super::bytes::from_bytes;
+use super::bytes::{to_bytes_with_preview, with_document_extension};
+#[cfg(not(target_arch = "wasm32"))]
+use super::open::load_document_fonts;
+#[cfg(test)]
+use super::place::image_place_tests;
+use super::{Arc, EngineError, Result, Session, Value, bad, json, str_param};
+
+pub(super) fn file_save(s: &mut Session, p: &Value) -> Result<Value> {
+    let st = s.doc_mut()?;
+    // Saving to the document's own file keeps its name, even one opened without the extension.
+    let path = str_param(p, "path")
+        .map(with_document_extension)
+        .or_else(|| st.path.clone())
+        .ok_or_else(|| bad("file.save", "missing `path` (document has never been saved)"))?;
+    // Before anything about the document changes: a refused save leaves it as it was.
+    crate::file_access::check_write(&path).map_err(EngineError::Other)?;
+    // Prepare paths for the destination without changing the live document until persistence succeeds.
+    let mut saved = (*st.doc).clone();
+    crate::cmd::datamerge::refresh_relative_paths(&mut saved, std::path::Path::new(&path));
+    let paths_changed = saved.data_merge != st.doc.data_merge;
+    let saved = if paths_changed { Arc::new(saved) } else { st.doc.clone() };
+    let bytes = to_bytes_with_preview(&saved, &s.cache)?;
+    #[cfg(not(target_arch = "wasm32"))]
+    crate::io::write_file(&path, &bytes).map_err(EngineError::Other)?;
+    let st = s.doc_mut()?;
+    if paths_changed {
+        st.doc = saved;
+        st.bump_revision();
+    }
+    st.path = Some(path.clone());
+    st.saved_revision = st.revision;
+    st.saved_doc = st.doc.clone();
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let recovery_dir = s.recovery_dir.clone();
+        let index = s.active_index().ok_or(EngineError::NoDocument)?;
+        crate::recovery::discard_document(s, index, recovery_dir.as_deref());
+        s.prefs.note_recent_file(&path);
+    }
+    Ok(json!({"path": path, "bytes": bytes.len()}))
+}
+
+/// Which access a recovery command needs to the folder it is given.
+#[derive(Clone, Copy)]
+pub(super) enum FolderAccess {
+    Read,
+    Write,
+    ReadWrite,
+}
+
+/// The recovery folder: `dir` when the command names one, else the session's own (set by the
+/// host application, so not the automation roots' business). A named folder is checked against
+/// the roots for `access`.
+pub(super) fn recovery_dir(s: &Session, p: &Value, access: FolderAccess) -> Result<std::path::PathBuf> {
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = (s, p, access);
+        Err(EngineError::Other("no recovery folder on the web".into()))
+    }
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let Some(named) = str_param(p, "dir") else {
+            return s.recovery_dir.clone().ok_or_else(|| bad("file.recovery", "no recovery folder (give `dir`)"));
+        };
+        if matches!(access, FolderAccess::Read | FolderAccess::ReadWrite) {
+            crate::file_access::check_read(named).map_err(EngineError::Other)?;
+        }
+        if matches!(access, FolderAccess::Write | FolderAccess::ReadWrite) {
+            crate::file_access::check_write(named).map_err(EngineError::Other)?;
+        }
+        Ok(std::path::PathBuf::from(named))
+    }
+}
+
+pub(super) fn can_revert(s: &Session) -> std::result::Result<(), String> {
+    match s.active() {
+        Some(d) if d.path.is_some() && d.is_dirty() => Ok(()),
+        Some(d) if d.path.is_none() => Err("the document has never been saved".into()),
+        Some(_) => Err("no changes since the last save".into()),
+        None => Err("no document open".into()),
+    }
+}
+
+pub(super) fn file_revert(s: &mut Session, _: &Value) -> Result<Value> {
+    let path = s.doc()?.path.clone().ok_or_else(|| bad("file.revert", "the document has never been saved"))?;
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let mut d = if path.to_ascii_lowercase().ends_with(".idml") {
+            let bytes = crate::io::read_file(&path).map_err(EngineError::Other)?;
+            crate::cmd::interchange::import_idml_confined(&bytes, Some(std::path::Path::new(&path))).map_err(|e| EngineError::Other(e.to_string()))?
+        } else {
+            from_bytes(&crate::io::read_file(&path).map_err(EngineError::Other)?)?
+        };
+        // As opened again: the fonts beside it now (unchanged files are shared, not read again).
+        let (fonts, _, _) = load_document_fonts(&mut d, &path);
+        let uid = s.doc()?.uid;
+        let recovery_dir = s.recovery_dir.clone();
+        let index = s.active_index().ok_or(EngineError::NoDocument)?;
+        let mut fresh = DocState::new(d, Some(path.clone()));
+        fresh.fonts = fonts;
+        fresh.uid = uid;
+        // A new state has a revision no state had before, so caches don't show the old document.
+        crate::recovery::discard_document(s, index, recovery_dir.as_deref());
+        *s.doc_mut()? = fresh;
+        Ok(json!({"path": path}))
+    }
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = (s, path);
+        Err(EngineError::Other("revert isn't available on the web".into()))
+    }
+}
+
+#[cfg(test)]
+mod save_tests {
+    use serde_json::json;
+
+    use crate::Session;
+    use crate::cmd::file::FAIL_TO_BYTES;
+
+    /// Saving over an existing document replaces it whole and leaves nothing beside it.
+    #[test]
+    fn save_replaces_the_existing_file_without_leftovers() {
+        let dir = std::env::temp_dir().join(format!("dc-save-atomic-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&dir);
+        std::fs::create_dir_all(&dir).unwrap();
+        let path = dir.join("doc.designcraft");
+        std::fs::write(&path, vec![b'x'; 1 << 20]).unwrap();
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Saved whole", "caret": false})).unwrap();
+        s.execute("file.save", &json!({"path": path.to_string_lossy()})).unwrap();
+        s.execute("file.saveACopy", &json!({"path": path.to_string_lossy()})).unwrap();
+        let saved = super::from_bytes(&std::fs::read(&path).unwrap()).unwrap();
+        assert!(saved.stories.values().any(|st| st.text == "Saved whole"));
+        let names: Vec<_> = std::fs::read_dir(&dir).unwrap().map(|e| e.unwrap().file_name()).collect();
+        assert_eq!(names, ["doc.designcraft"], "no temporary file is left");
+        // A folder that doesn't exist: an error naming the path.
+        let missing = dir.join("missing").join("doc.designcraft");
+        let e = s.execute("file.save", &json!({"path": missing.to_string_lossy()})).unwrap_err();
+        assert!(e.to_string().contains("missing"), "{e}");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    /// A document that can't be written is an error: the file on disk, the unsaved state and the
+    /// recovery checkpoint all stay as they were.
+    #[test]
+    fn a_save_that_cannot_write_the_document_changes_nothing() {
+        let dir = std::env::temp_dir().join(format!("dc-save-fails-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&dir);
+        std::fs::create_dir_all(&dir).unwrap();
+        let path = dir.join("doc.designcraft");
+        let recovery = dir.join("recovery");
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("file.save", &json!({"path": path.to_string_lossy()})).unwrap();
+        let before = std::fs::read(&path).unwrap();
+        s.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Unsaved", "caret": false})).unwrap();
+        s.execute("file.recovery.save", &json!({"dir": recovery.to_string_lossy()})).unwrap();
+        let checkpoint = recovery.join(format!("{}.designcraft", s.doc().unwrap().uid));
+        assert!(checkpoint.exists());
+
+        FAIL_TO_BYTES.with(|f| f.set(true));
+        let save = s.execute("file.save", &json!({}));
+        let copy = s.execute("file.saveACopy", &json!({"path": dir.join("copy.designcraft").to_string_lossy()}));
+        let save_as = s.execute("file.saveAs", &json!({"path": dir.join("other.designcraft").to_string_lossy()}));
+        let serialized = s.execute("file.serialize", &json!({}));
+        FAIL_TO_BYTES.with(|f| f.set(false));
+
+        let e = save.unwrap_err();
+        assert!(e.to_string().contains("could not write the document"), "{e}");
+        assert!(copy.is_err() && serialized.is_err(), "no empty copy and no empty download");
+        assert_eq!(std::fs::read(&path).unwrap(), before, "the saved file is untouched");
+        assert!(!dir.join("copy.designcraft").exists());
+        assert!(save_as.is_err() && !dir.join("other.designcraft").exists());
+        assert!(!s.prefs.recent_files.iter().any(|p| p.ends_with("other.designcraft")), "a failed Save As isn't a recent file");
+        assert!(s.doc().unwrap().is_dirty(), "the document still has unsaved changes");
+        assert!(checkpoint.exists(), "the recovery checkpoint stays");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    /// #1050: a placement whose coordinates overflow to infinity is refused, and Save refuses a
+    /// document holding a non-finite rect anyway, leaving the file on disk as it was.
+    #[test]
+    fn non_finite_coordinates_are_refused_and_never_saved() {
+        let image = super::image_place_tests::image_file().unwrap();
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let e = s.execute("file.place", &json!({"path": image.path(), "x": 1e308, "width": 1e308})).unwrap_err();
+        assert!(e.to_string().contains("finite"), "{e}");
+        assert!(s.doc().unwrap().doc.all_items().is_empty(), "nothing is placed");
+
+        let dir = std::env::temp_dir().join(format!("dc-save-non-finite-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&dir);
+        std::fs::create_dir_all(&dir).unwrap();
+        let path = dir.join("doc.designcraft");
+        s.execute("file.save", &json!({"path": path.to_string_lossy()})).unwrap();
+        let before = std::fs::read(&path).unwrap();
+        let id = designcraft_doc::ItemId(s.execute("frame.create", &json!({"rect": [36, 36, 300, 200]})).unwrap()["id"].as_u64().unwrap());
+        let st = s.doc_mut().unwrap();
+        let infinite = designcraft_geom::Rect::new(36.0, 36.0, f64::INFINITY, 200.0);
+        std::sync::Arc::make_mut(&mut st.doc).item_mut(id).unwrap().path = designcraft_geom::shapes::rectangle(infinite);
+        let e = s.execute("file.save", &json!({})).unwrap_err();
+        assert!(e.to_string().contains("not a finite number"), "{e}");
+        assert_eq!(std::fs::read(&path).unwrap(), before, "the saved file is untouched");
+        assert!(s.doc().unwrap().is_dirty());
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+}
diff --git a/crates/engine/src/cmd/file/snippets.rs b/crates/engine/src/cmd/file/snippets.rs
new file mode 100644
index 000000000..5ff1f3795
--- /dev/null
+++ b/crates/engine/src/cmd/file/snippets.rs
@@ -0,0 +1,56 @@
+#[cfg(not(target_arch = "wasm32"))]
+use super::EngineError;
+use super::bytes::{base64_encode, from_bytes, to_bytes};
+use super::place::read_source;
+use super::{ItemId, Rect, Result, Selection, Session, Value, bad, json, str_param};
+
+/// The selection as `.designcraft` snippet bytes.
+pub(crate) fn snippet_bytes(s: &mut Session) -> Result<Vec<u8>> {
+    to_bytes(&crate::cmd::edit::clip_doc(s)?)
+}
+
+pub(super) fn snippet_export(s: &mut Session, p: &Value) -> Result<Value> {
+    let d = crate::cmd::edit::clip_doc(s)?;
+    let bytes = to_bytes(&d)?;
+    match str_param(p, "path") {
+        Some(path) => {
+            #[cfg(not(target_arch = "wasm32"))]
+            crate::io::write_file(path, &bytes).map_err(EngineError::Other)?;
+            Ok(json!({"path": path, "bytes": bytes.len(), "items": d.spreads.first().map(|s| s.items.len()).unwrap_or(0)}))
+        }
+        None => Ok(json!({"base64": base64_encode(&bytes), "bytes": bytes.len()})),
+    }
+}
+
+pub(crate) fn snippet_place(s: &mut Session, p: &Value) -> Result<Value> {
+    let (bytes, _, _) = read_source(p)?;
+    let src = from_bytes(&bytes)?;
+    let ids: Vec<ItemId> = src.spreads.first().map(|sp| sp.items.iter().map(|i| i.id).collect()).unwrap_or_default();
+    if ids.is_empty() {
+        return Err(bad("snippet.place", "the snippet is empty"));
+    }
+    let sr = crate::cmd::spread_param(p, "snippet.place")?;
+    let bounds = ids.iter().filter_map(|i| src.item(*i).map(|it| it.bounds())).reduce(|a, b| a.union(b)).unwrap_or(Rect::ZERO);
+    let off = match (p.get("x").and_then(Value::as_f64), p.get("y").and_then(Value::as_f64)) {
+        (Some(x), Some(y)) => designcraft_geom::Vec2::new(x - bounds.x0, y - bounds.y0),
+        _ => designcraft_geom::Vec2::ZERO,
+    };
+    s.edit(|d, sel| {
+        // Bring over styles and swatches the snippet uses that this document lacks.
+        for sw in &src.swatches {
+            if d.swatch(&sw.name).is_none() {
+                d.swatches.push(sw.clone());
+            }
+        }
+        let missing_p: Vec<_> = src.styles.paragraph.iter().filter(|ps| d.styles.para(&ps.name).is_none()).cloned().collect();
+        let missing_c: Vec<_> = src.styles.character.iter().filter(|cs| d.styles.char_style(&cs.name).is_none()).cloned().collect();
+        if !missing_p.is_empty() || !missing_c.is_empty() {
+            let st = d.styles_mut();
+            st.paragraph.extend(missing_p);
+            st.character.extend(missing_c);
+        }
+        let new = crate::cmd::object::duplicate_from(d, &src, &ids, sr, off)?;
+        *sel = Selection::items(new.clone());
+        Ok(json!({"ids": new.iter().map(|i| i.0).collect::<Vec<_>>()}))
+    })
+}
diff --git a/crates/engine/src/cmd/file_info.rs b/crates/engine/src/cmd/file_info.rs
new file mode 100644
index 000000000..bc6f88ba6
--- /dev/null
+++ b/crates/engine/src/cmd/file_info.rs
@@ -0,0 +1,201 @@
+//! File › File Info: the document's title, author, description, keywords and copyright. PDF
+//! export writes the title, author, description and keywords into the file's metadata, and EPUB
+//! export writes the title and author.
+
+use designcraft_doc::FileInfo;
+use designcraft_doc::file_info::{clean_keywords, parse_keywords};
+use serde_json::{Map, Value, json};
+
+use super::{CommandSpec, bad, cmd, has_doc};
+use crate::{Result, Session};
+
+const ID: &str = "file.info";
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        cmd!(
+            "file.info",
+            "File Info…",
+            ["File"],
+            None,
+            "{documentTitle?, author?, description?, keywords?: [\"a\", \"b\"] | \"a; b\", copyrightNotice?, copyrightInfoUrl?}: each field given replaces the stored one (\"\" or null clears it) → the file info",
+            has_doc,
+            file_info
+        ),
+        cmd!(query "file.info.get", "File Info", [], None, "{} → the file info, without changing the document", has_doc, |s, _| Ok(to_json(
+            &s.doc()?.doc.file_info
+        ))),
+    ]
+}
+
+fn file_info(s: &mut Session, p: &Value) -> Result<Value> {
+    let cur = s.doc()?.doc.file_info.clone();
+    let o = match p {
+        Value::Null => return Ok(to_json(&cur)),
+        Value::Object(o) if o.is_empty() => return Ok(to_json(&cur)),
+        Value::Object(o) => o,
+        _ => return Err(bad(ID, "the parameters must be an object of fields")),
+    };
+    let next = apply(&cur, o)?;
+    if next == cur {
+        return Ok(to_json(&cur));
+    }
+    s.edit(|d, _| {
+        d.file_info = next;
+        Ok(to_json(&d.file_info))
+    })
+}
+
+/// `cur` with the fields of `o` applied.
+fn apply(cur: &FileInfo, o: &Map<String, Value>) -> Result<FileInfo> {
+    let mut f = cur.clone();
+    for (key, v) in o {
+        let field = match key.as_str() {
+            "documentTitle" => &mut f.document_title,
+            "author" => &mut f.author,
+            "description" => &mut f.description,
+            "copyrightNotice" => &mut f.copyright_notice,
+            "copyrightInfoUrl" => &mut f.copyright_info_url,
+            "keywords" => {
+                f.keywords = match v {
+                    Value::Null => Vec::new(),
+                    Value::String(t) => parse_keywords(t),
+                    Value::Array(a) => {
+                        let words: Option<Vec<&str>> = a.iter().map(Value::as_str).collect();
+                        clean_keywords(words.ok_or_else(|| bad(ID, "`keywords` must be strings"))?)
+                    }
+                    _ => return Err(bad(ID, "`keywords` must be a list of strings or one string")),
+                };
+                continue;
+            }
+            other => return Err(bad(ID, format!("unknown field `{other}`"))),
+        };
+        *field = match v {
+            Value::Null => String::new(),
+            Value::String(t) => t.trim().to_string(),
+            _ => return Err(bad(ID, format!("`{key}` must be a string"))),
+        };
+    }
+    Ok(f)
+}
+
+fn to_json(f: &FileInfo) -> Value {
+    json!({
+        "documentTitle": f.document_title,
+        "author": f.author,
+        "description": f.description,
+        "keywords": f.keywords,
+        "copyrightNotice": f.copyright_notice,
+        "copyrightInfoUrl": f.copyright_info_url,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    fn session() -> Session {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 1, "title": "flyer-v3"})).unwrap();
+        s
+    }
+
+    #[test]
+    fn file_info_sets_reads_and_clears_the_fields() {
+        let mut s = session();
+        let empty = s.execute("file.info", &json!({})).unwrap();
+        assert_eq!(empty["documentTitle"], "");
+        assert_eq!(empty["keywords"], json!([]));
+        let r = s
+            .execute(
+                "file.info",
+                &json!({"documentTitle": " Spring Catalog ", "author": "Ana Ruiz", "description": "Shoes", "keywords": "spring; shoes, spring",
+                    "copyrightNotice": "© 2026 Ana Ruiz", "copyrightInfoUrl": "https://example.com/rights"}),
+            )
+            .unwrap();
+        assert_eq!(r["documentTitle"], "Spring Catalog");
+        assert_eq!(r["keywords"], json!(["spring", "shoes"]));
+        assert_eq!(s.execute("file.info", &json!({})).unwrap(), r, "a read returns what was set");
+        let info = &s.doc().unwrap().doc.file_info;
+        assert_eq!((info.author.as_str(), info.copyright_info_url.as_str()), ("Ana Ruiz", "https://example.com/rights"));
+        assert_eq!(s.doc().unwrap().doc.title, "flyer-v3", "the document's name stays");
+        // Only the fields given change; "" and null clear one.
+        let r = s.execute("file.info", &json!({"author": "", "keywords": ["  catalog ", ""], "description": null})).unwrap();
+        assert_eq!((r["author"].as_str(), r["description"].as_str(), r["documentTitle"].as_str()), (Some(""), Some(""), Some("Spring Catalog")));
+        assert_eq!(r["keywords"], json!(["catalog"]));
+    }
+
+    #[test]
+    fn file_info_is_one_undo_step_and_survives_a_save() {
+        let mut s = session();
+        let steps = |s: &Session| s.doc().unwrap().history.undo.len();
+        let before = steps(&s);
+        s.execute("file.info", &json!({"documentTitle": "Spring Catalog", "keywords": ["spring"]})).unwrap();
+        assert_eq!(steps(&s), before + 1);
+        s.execute("file.info", &json!({"documentTitle": "Spring Catalog"})).unwrap();
+        s.execute("file.info", &json!({})).unwrap();
+        assert_eq!(steps(&s), before + 1, "no change, no undo step");
+        let saved = s.execute("file.serialize", &json!({})).unwrap();
+        let mut t = Session::new();
+        t.execute("file.openBytes", &json!({"name": "a.designcraft", "base64": saved["base64"]})).unwrap();
+        assert_eq!(t.doc().unwrap().doc.file_info.document_title, "Spring Catalog", "saved with the document");
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert!(s.doc().unwrap().doc.file_info.is_empty());
+    }
+
+    #[test]
+    fn file_info_get_leaves_a_data_merge_preview_on() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let frame = s.execute("frame.create", &json!({"rect": [36, 36, 100, 100], "content": "text", "text": ""})).unwrap();
+        let story = frame["story"].as_u64().unwrap();
+        s.execute("data.source.select", &json!({"bytes": crate::cmd::base64_encode(b"x\nAda\n"), "name": "people.csv"})).unwrap();
+        s.execute("data.placeholder.add", &json!({"field": "x", "story": story, "at": 0})).unwrap();
+        s.execute("file.info", &json!({"author": "Ana Ruiz"})).unwrap();
+        s.execute("data.preview", &json!({"record": 1})).unwrap();
+        let r = s.execute("file.info.get", &json!({})).unwrap();
+        assert_eq!(r["author"], "Ana Ruiz");
+        assert!(s.doc().unwrap().preview_stash.is_some(), "the preview stays on");
+        s.execute("file.info", &json!({})).unwrap();
+        assert!(s.doc().unwrap().preview_stash.is_none(), "file.info is an edit, so it ends the preview");
+    }
+
+    #[test]
+    fn file_info_refuses_bad_fields() {
+        let mut s = session();
+        for p in [json!({"title": "x"}), json!({"author": 3}), json!({"keywords": [1]}), json!({"keywords": {"a": 1}})] {
+            assert!(s.execute("file.info", &p).is_err(), "{p}");
+        }
+        assert!(s.doc().unwrap().doc.file_info.is_empty(), "a refused call changes nothing");
+        // Parameters that are not an object are refused; null reads like {}.
+        s.execute("file.info", &json!({"author": "Ana Ruiz"})).unwrap();
+        for p in [json!(3), json!("author"), json!(true), json!(["author"])] {
+            let e = s.execute("file.info", &p).unwrap_err().to_string();
+            assert!(e.contains("must be an object"), "{p}: {e}");
+        }
+        assert_eq!(s.execute("file.info", &serde_json::Value::Null).unwrap()["author"], "Ana Ruiz");
+    }
+
+    #[test]
+    fn pdf_and_epub_export_take_the_file_info() {
+        let mut s = session();
+        s.execute("file.info", &json!({"documentTitle": "Spring Catalog", "author": "Ana Ruiz", "keywords": ["spring", "shoes"]})).unwrap();
+        let r = s.execute("file.exportPdf", &json!({})).unwrap();
+        let pdf = crate::cmd::base64_decode(r["base64"].as_str().unwrap());
+        let text = String::from_utf8_lossy(&pdf);
+        assert!(text.contains("/Title(Spring Catalog)") && text.contains("/Author(Ana Ruiz)"), "PDF metadata");
+        let r = s.execute("file.exportPdf", &json!({"title": "Proof"})).unwrap();
+        let pdf = crate::cmd::base64_decode(r["base64"].as_str().unwrap());
+        assert!(String::from_utf8_lossy(&pdf).contains("/Title(Proof)"), "a title given to the export wins");
+        for (cmd, opf_path) in [("file.exportEpub", "OEBPS/content.opf"), ("file.exportFixedEpub", "OEBPS/content.opf")] {
+            let r = s.execute(cmd, &json!({})).unwrap();
+            let epub = crate::cmd::base64_decode(r["base64"].as_str().unwrap());
+            let mut z = zip::ZipArchive::new(std::io::Cursor::new(epub)).unwrap();
+            let mut opf = String::new();
+            std::io::Read::read_to_string(&mut z.by_name(opf_path).unwrap(), &mut opf).unwrap();
+            assert!(opf.contains("<dc:title>Spring Catalog</dc:title>") && opf.contains("<dc:creator>Ana Ruiz</dc:creator>"), "{cmd}: {opf}");
+        }
+    }
+}
diff --git a/crates/engine/src/cmd/find.rs b/crates/engine/src/cmd/find.rs
index a40e8da51..8d7c68632 100644
--- a/crates/engine/src/cmd/find.rs
+++ b/crates/engine/src/cmd/find.rs
@@ -323,18 +323,38 @@ fn replacement(p: &Value) -> String {
     if bool_or(p, "grep", false) { translate_replacement(c) } else { metachars(c) }
 }
 
+/// Repair byte validity of a text selection once against the final story, without remapping valid offsets.
+fn repair_selection(t: &mut designcraft_doc::TextSel, st: &designcraft_doc::Story) {
+    let range = t.range();
+    let start = floor_char_boundary(&st.text, range.start);
+    let mut end = range.end.min(st.len());
+    if t.is_caret() {
+        end = start;
+    } else if !st.text.is_char_boundary(end) {
+        let floor = floor_char_boundary(&st.text, end);
+        end = st.text.get(floor..).and_then(|rest| rest.chars().next()).map_or(floor, |ch| floor + ch.len_utf8());
+    }
+    (t.anchor, t.focus) = if t.anchor <= t.focus { (start, end) } else { (end, start) };
+}
+
+/// The character overrides a Change applies to every replacement, from its `attrs` object.
+fn char_overrides(attrs: Option<&Value>) -> Result<designcraft_doc::CharAttrs> {
+    let mut over = designcraft_doc::CharAttrs::default();
+    if let Some(o) = attrs.and_then(Value::as_object) {
+        for (k, v) in o {
+            over.set_json(k, v).map_err(|e| bad("find.change", e))?;
+        }
+    }
+    Ok(over)
+}
+
 fn change(s: &mut Session, p: &Value) -> Result<Value> {
     let re = build(p)?;
     let grep = bool_or(p, "grep", false);
     let rep = replacement(p);
     let first_only = bool_or(p, "first", false);
     let attrs = p.get("attrs").cloned();
-    let mut over = designcraft_doc::CharAttrs::default();
-    if let Some(o) = attrs.as_ref().and_then(Value::as_object) {
-        for (k, v) in o {
-            over.set_json(k, v).map_err(|e| bad("find.change", e))?;
-        }
-    }
+    let over = char_overrides(attrs.as_ref())?;
     super::text::validate_char_fill(&s.doc()?.doc, &over, "find.change")?;
     let targets = scope(s, p)?.targets;
     s.edit(|d, sel| {
@@ -361,17 +381,7 @@ fn change(s: &mut Session, p: &Value) -> Result<Value> {
                 count += 1;
             }
             if let Some(t) = sel.text.as_mut().filter(|t| t.story == sid && t.cell == cell) {
-                // Repair byte validity once against the final story, without remapping valid offsets.
-                let range = t.range();
-                let start = floor_char_boundary(&st.text, range.start);
-                let mut end = range.end.min(st.len());
-                if t.is_caret() {
-                    end = start;
-                } else if !st.text.is_char_boundary(end) {
-                    let floor = floor_char_boundary(&st.text, end);
-                    end = st.text.get(floor..).and_then(|rest| rest.chars().next()).map_or(floor, |ch| floor + ch.len_utf8());
-                }
-                (t.anchor, t.focus) = if t.anchor <= t.focus { (start, end) } else { (end, start) };
+                repair_selection(t, st);
             }
             // `first` is the first match of the whole search, not of each story.
             if first_only && count > 0 {
@@ -431,757 +441,7 @@ fn find_next(s: &mut Session, p: &Value) -> Result<Value> {
 }
 
 #[cfg(test)]
-mod tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn find_and_change_text_and_grep() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("frame.create", &json!({"rect": [36, 36, 300, 300], "content": "text", "text": "Call 555-1234 or 555-9876.\nColour and colour."}))
-            .unwrap();
-        let m = s.execute("find.find", &json!({"find": "colour"})).unwrap();
-        assert_eq!(m.as_array().unwrap().len(), 2);
-        let m = s.execute("find.find", &json!({"find": "colour", "caseSensitive": true})).unwrap();
-        assert_eq!(m.as_array().unwrap().len(), 1);
-        let r = s.execute("find.change", &json!({"find": r"(\d{3})-(\d{4})", "change": "($1) $2", "grep": true})).unwrap();
-        assert_eq!(r["count"], 2);
-        let r = s.execute("find.change", &json!({"find": "colour", "change": "color", "attrs": {"fontStyle": "Italic"}})).unwrap();
-        assert_eq!(r["count"], 2);
-        let d = s.execute("document.inspect", &json!({})).unwrap();
-        let sid = d["stories"][0]["id"].as_u64().unwrap();
-        let text = s.execute("story.get", &json!({"story": sid})).unwrap()["text"].as_str().unwrap().to_string();
-        assert_eq!(text, "Call (555) 1234 or (555) 9876.\ncolor and color.");
-        // Paragraph metacharacter in text mode.
-        assert_eq!(s.execute("find.find", &json!({"find": ".^pc"})).unwrap().as_array().unwrap().len(), 1);
-        s.execute("find.next", &json!({"find": "or"})).unwrap();
-        assert!(s.doc().unwrap().selection.text.is_some());
-    }
-
-    #[test]
-    fn change_first_changes_one_match_in_the_whole_document() {
-        for grep in [false, true] {
-            let mut s = Session::new();
-            s.execute("file.new", &json!({})).unwrap();
-            for y in [36, 336] {
-                s.execute("frame.create", &json!({"rect": [36, y, 300, y + 200], "content": "text", "text": "red and red"})).unwrap();
-            }
-            let r = s.execute("find.change", &json!({"find": "red", "change": "blue", "first": true, "grep": grep})).unwrap();
-            assert_eq!(r["count"], 1);
-            assert_eq!(s.execute("find.find", &json!({"find": "blue"})).unwrap().as_array().unwrap().len(), 1);
-            assert_eq!(s.execute("find.find", &json!({"find": "red"})).unwrap().as_array().unwrap().len(), 3);
-        }
-    }
-
-    fn scope_session(text: &str) -> (Session, designcraft_doc::StoryId) {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let frame = s.execute("frame.create", &json!({"rect": [36, 36, 100, 100], "content": "text", "text": text})).unwrap();
-        (s, designcraft_doc::StoryId(frame["story"].as_u64().unwrap()))
-    }
-
-    fn scope_select(s: &mut Session, sid: designcraft_doc::StoryId, a: usize, b: usize) {
-        s.execute("text.select", &json!({"story": sid.0, "anchor": a, "focus": b})).unwrap();
-    }
-
-    fn scope_hit(s: &mut Session, p: &serde_json::Value, sid: designcraft_doc::StoryId, a: usize, b: usize) {
-        assert_eq!(s.execute("find.next", p).unwrap(), json!({"story": sid.0, "start": a, "end": b}));
-        let selected = s.doc().unwrap().selection.text.unwrap();
-        assert_eq!((selected.story, selected.range(), selected.cell), (sid, a..b, None));
-    }
-
-    #[test]
-    fn find_scope_first_change_stops_after_first_matching_story_and_repairs_selection() {
-        for (texts, first, explicit, grep, expected, count) in [
-            (vec!["red red", "red"], Some(true), false, false, vec!["blue red", "red"], 1),
-            (vec!["keep", "red red", "red"], Some(true), false, false, vec!["keep", "blue red", "red"], 1),
-            (vec!["keep", "other"], Some(true), false, false, vec!["keep", "other"], 0),
-            (vec!["red red", "red"], Some(false), false, false, vec!["blue blue", "blue"], 3),
-            (vec!["red red", "red"], None, false, false, vec!["blue blue", "blue"], 3),
-            (vec!["red red", "red"], Some(true), true, false, vec!["blue red", "red"], 1),
-            (vec!["red red", "red"], Some(false), true, false, vec!["blue blue", "red"], 2),
-            (vec!["", "é🙂"], Some(true), false, true, vec!["X", "é🙂"], 1),
-            (vec!["é", "🙂"], Some(false), false, true, vec!["XéX", "X🙂X"], 4),
-        ] {
-            let (mut s, sid) = scope_session(texts[0]);
-            let mut sids = vec![sid];
-            for text in texts.iter().skip(1) {
-                let frame = s.execute("frame.create", &json!({"rect": [120, 36, 200, 100], "content": "text", "text": text})).unwrap();
-                sids.push(designcraft_doc::StoryId(frame["story"].as_u64().unwrap()));
-            }
-            assert_eq!(s.doc().unwrap().doc.stories.keys().copied().collect::<Vec<_>>(), sids);
-            // Document Change keeps canonical target order even with a later story current.
-            scope_select(&mut s, *sids.last().unwrap(), 0, 0);
-            let before = s.doc().unwrap().doc.clone();
-            let mut p = json!({
-                "find": if grep { "(?:)" } else { "red" },
-                "change": if grep { "X" } else { "blue" },
-                "scope": "document", "grep": grep
-            });
-            if let Some(first) = first {
-                p["first"] = json!(first);
-            }
-            if explicit {
-                p["story"] = json!(sid.0);
-                p["scope"] = json!("selection");
-            }
-            if first == Some(true) && !explicit && !grep && texts.last() == Some(&"red") {
-                let last = *sids.last().unwrap();
-                scope_hit(&mut s, &p, last, 0, 3);
-                let first_hit = sids[if texts.len() == 2 { 0 } else { 1 }];
-                assert_eq!(
-                    s.execute("find.find", &p).unwrap(),
-                    json!([
-                        {"story": first_hit.0, "start": 0, "end": 3, "text": "red"},
-                        {"story": first_hit.0, "start": 4, "end": 7, "text": "red"},
-                        {"story": last.0, "start": 0, "end": 3, "text": "red"}
-                    ]),
-                    "Count remains canonical after Next paints the later story"
-                );
-            }
-            let selection = s.doc().unwrap().selection.clone();
-            assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": count}));
-            let st = s.doc().unwrap();
-            assert_eq!(st.selection, selection);
-            for (i, sid) in sids.iter().enumerate() {
-                assert_eq!(st.doc.story(*sid).unwrap().text, expected[i]);
-                if texts[i] == expected[i] {
-                    assert_eq!(st.doc.story(*sid), before.story(*sid), "untouched story {i} stays entirely unchanged");
-                }
-            }
-            st.doc.check().unwrap();
-        }
-
-        // Identical replacement is still one counted match, not a reason to visit another story.
-        let (mut s, sid) = scope_session("red red");
-        let other = s.execute("frame.create", &json!({"rect": [120, 36, 200, 100], "content": "text", "text": "red"})).unwrap();
-        let other_sid = designcraft_doc::StoryId(other["story"].as_u64().unwrap());
-        scope_select(&mut s, other_sid, 0, 3);
-        let before = s.doc().unwrap().doc.clone();
-        let selection = s.doc().unwrap().selection.clone();
-        assert_eq!(
-            s.execute("find.change", &json!({"find": "red", "change": "red", "scope": "document", "first": true})).unwrap(),
-            json!({"count": 1})
-        );
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "red red");
-        assert_eq!(s.doc().unwrap().doc.story(other_sid), before.story(other_sid));
-        assert_eq!(s.doc().unwrap().selection, selection);
-        s.doc().unwrap().doc.check().unwrap();
-
-        for reverse in [false, true] {
-            let (mut s, sid) = scope_session("éX X");
-            let other = s.execute("frame.create", &json!({"rect": [120, 36, 200, 100], "content": "text", "text": "X"})).unwrap();
-            let other_sid = designcraft_doc::StoryId(other["story"].as_u64().unwrap());
-            scope_select(&mut s, sid, if reverse { 3 } else { 2 }, if reverse { 2 } else { 3 });
-            let before = s.doc().unwrap().doc.clone();
-            let mut selection = s.doc().unwrap().selection.clone();
-            let t = selection.text.as_mut().unwrap();
-            (t.anchor, t.focus) = if reverse { (6, 2) } else { (2, 6) };
-            let p = json!({"find": "X", "change": "🙂", "scope": "document", "first": true});
-            assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 3);
-            assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 1}));
-            let st = s.doc().unwrap();
-            assert_eq!(st.doc.story(sid).unwrap().text, "é🙂 X");
-            assert_eq!(st.doc.story(other_sid), before.story(other_sid));
-            assert_eq!(st.selection, selection, "first-match exit must follow final UTF-8 repair");
-            st.doc.check().unwrap();
-            assert_eq!(
-                s.execute("find.find", &json!({"find": "🙂", "scope": "selection"})).unwrap(),
-                json!([{"story": sid.0, "start": 2, "end": 6, "text": "🙂"}])
-            );
-        }
-    }
-
-    #[test]
-    fn grep_in_the_documents_dialect() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("frame.create", &json!({"rect": [36, 36, 300, 300], "content": "text", "text": "Москва and Paris, 1\u{2013}2 days.\nok"})).unwrap();
-        // `\u` uppercase, `\l` lowercase letter.
-        let m = s.execute("find.find", &json!({"find": r"\u\l+", "grep": true, "caseSensitive": true})).unwrap();
-        let words: Vec<&str> = m.as_array().unwrap().iter().map(|x| x["text"].as_str().unwrap()).collect();
-        assert_eq!(words, ["Москва", "Paris"]);
-        // `~=` en dash, `\h` space, `\r` paragraph end; the change uses groups, `~S` and `\r`.
-        let r = s.execute("find.change", &json!({"find": r"(\d)~=(\d)\h(\l+)\.\r", "change": r"$1~=$2~S$3!\r", "grep": true})).unwrap();
-        assert_eq!(r["count"], 1);
-        let sid = s.execute("document.inspect", &json!({})).unwrap()["stories"][0]["id"].as_u64().unwrap();
-        let text = s.execute("story.get", &json!({"story": sid})).unwrap()["text"].as_str().unwrap().to_string();
-        assert!(text.starts_with("Москва and Paris, 1\u{2013}2\u{A0}days!\nok"), "{text:?}");
-        // A pattern that doesn't compile is an error, not a silent no-op.
-        assert!(s.execute("find.find", &json!({"find": "[[:nope:]]", "grep": true})).is_err());
-        assert!(s.execute("find.change", &json!({"find": "(", "change": "", "grep": true})).is_err());
-    }
-
-    #[test]
-    fn find_scope_exact_baseline_count_next_change() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let frame = s
-            .execute(
-                "frame.create",
-                &json!({
-                    "rect": [36, 36, 300, 200], "content": "text", "text": "red red"
-                }),
-            )
-            .unwrap();
-        let sid = frame["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 3})).unwrap();
-        assert_eq!(
-            s.execute("find.find", &json!({"find": "red", "scope": "selection"})).unwrap(),
-            json!([{"story": sid, "start": 0, "end": 3, "text": "red"}])
-        );
-        assert_eq!(s.execute("find.next", &json!({"find": "red", "scope": "selection"})).unwrap(), json!({"story": sid, "start": 0, "end": 3}));
-        assert_eq!(s.execute("find.change", &json!({"find": "red", "change": "blue", "scope": "selection"})).unwrap(), json!({"count": 1}));
-        assert_eq!(s.execute("story.get", &json!({"story": sid})).unwrap()["text"], "blue red");
-    }
-
-    #[test]
-    fn find_scope_change_growth_preserves_direction_and_full_scalar_hits() {
-        for (text, find, change, changed, start, old_end, new_end) in [("a", "a", "é", "é", 0, 1, 2), ("éX", "X", "🙂", "é🙂", 2, 3, 6)] {
-            for reverse in [false, true] {
-                let (mut s, sid) = scope_session(text);
-                // Real caret movement keeps the frame identity, unlike text.select.
-                s.execute("text.move", &json!({"dir": "left", "extend": reverse})).unwrap();
-                if !reverse {
-                    s.execute("text.move", &json!({"dir": "right", "extend": true})).unwrap();
-                }
-                let selected = s.doc().unwrap().selection.text.unwrap();
-                assert_eq!((selected.anchor, selected.focus), if reverse { (old_end, start) } else { (start, old_end) });
-                assert!(selected.frame.is_some());
-                let mut expected = s.doc().unwrap().selection.clone();
-                let t = expected.text.as_mut().unwrap();
-                (t.anchor, t.focus) = if reverse { (new_end, start) } else { (start, new_end) };
-                let p = json!({"find": find, "change": change, "scope": "selection"});
-                assert_eq!(s.execute("find.find", &p).unwrap(), json!([{"story": sid.0, "start": start, "end": old_end, "text": find}]));
-                assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 1}));
-                let st = s.doc().unwrap();
-                assert_eq!(st.doc.story(sid).unwrap().text, changed);
-                assert_eq!(st.selection, expected);
-                let t = st.selection.text.unwrap();
-                assert!(changed.is_char_boundary(t.anchor) && changed.is_char_boundary(t.focus));
-                assert!(s.find_context.is_none());
-                let p = json!({"find": change, "scope": "selection"});
-                assert_eq!(s.execute("find.find", &p).unwrap(), json!([{"story": sid.0, "start": start, "end": new_end, "text": change}]));
-                scope_hit(&mut s, &p, sid, start, new_end);
-                assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
-            }
-        }
-    }
-
-    #[test]
-    fn find_scope_change_repairs_final_boundaries_without_remapping_valid_offsets() {
-        for (text, (a, b), find, change, changed, (after_a, after_b), count) in [
-            ("aX", (1, 1), "a", "é", "éX", (0, 0), 1),     // A caret stays collapsed and floors.
-            ("aX", (2, 2), "a", "é", "éX", (2, 2), 1),     // A valid caret stays at its byte offset.
-            ("abc", (1, 2), "abc", "🙂", "🙂", (0, 4), 1), // Both endpoints need repair.
-            ("abc", (2, 1), "abc", "🙂", "🙂", (4, 0), 1),
-            ("é🙂", (2, 6), "🙂", "X", "éX", (2, 3), 1), // Existing shortening behavior.
-            ("é🙂", (6, 2), "🙂", "X", "éX", (3, 2), 1),
-            ("red", (0, 3), "red", "blue", "blue", (0, 3), 1), // Do not extend a valid upper bound.
-            ("aX", (1, 2), "a", "zz", "zzX", (1, 2), 1),       // Do not track the original X.
-            ("aaX", (1, 2), "a", "é", "ééX", (0, 2), 2),       // Per-edit repair would wrongly yield 0..4.
-            ("aaX", (2, 3), "a", "é", "ééX", (2, 4), 2),
-            ("abc", (1, 3), "abc", "", "", (0, 0), 1),
-            ("abc", (2, 3), "abc", "é", "é", (2, 2), 1), // EOF clamp may collapse a nonempty range.
-        ] {
-            let (mut s, sid) = scope_session(text);
-            scope_select(&mut s, sid, a, b);
-            let mut expected = s.doc().unwrap().selection.clone();
-            let t = expected.text.as_mut().unwrap();
-            (t.anchor, t.focus) = (after_a, after_b);
-            assert_eq!(s.execute("find.change", &json!({"find": find, "change": change, "scope": "document"})).unwrap(), json!({"count": count}));
-            let st = s.doc().unwrap();
-            assert_eq!(st.doc.story(sid).unwrap().text, changed, "{text} {a}->{b}");
-            assert_eq!(st.selection, expected, "{text} {a}->{b}");
-            assert!(changed.is_char_boundary(after_a) && changed.is_char_boundary(after_b));
-            if after_a == after_b {
-                assert_eq!(
-                    s.execute("find.find", &json!({"find": "(?:)", "grep": true, "scope": "selection"})).unwrap(),
-                    json!([{"story": sid.0, "start": after_a, "end": after_a, "text": ""}])
-                );
-            }
-        }
-    }
-
-    #[test]
-    fn find_scope_change_other_story_and_no_hits_preserve_selection() {
-        for explicit in [false, true] {
-            let (mut s, sid) = scope_session("éX");
-            let frame = s.doc().unwrap().selection.text.unwrap().frame.unwrap();
-            let other = s.execute("frame.create", &json!({"rect": [120, 36, 200, 100], "content": "text", "text": "a"})).unwrap();
-            let other_sid = designcraft_doc::StoryId(other["story"].as_u64().unwrap());
-            scope_select(&mut s, sid, 3, 2);
-            let before = s.doc().unwrap().selection.clone();
-            let mut p = json!({"find": "a", "change": "🙂", "scope": "document"});
-            if explicit {
-                p["story"] = json!(other_sid.0);
-            }
-            assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 1}));
-            assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "éX");
-            assert_eq!(s.doc().unwrap().doc.story(other_sid).unwrap().text, "🙂");
-            assert_eq!(s.doc().unwrap().selection, before);
-            assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 0}));
-            assert_eq!(s.doc().unwrap().selection, before);
-            assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "éX");
-            assert_eq!(s.doc().unwrap().doc.story(other_sid).unwrap().text, "🙂");
-
-            s.execute("selection.set", &json!({"ids": [frame.0]})).unwrap();
-            let before = s.doc().unwrap().selection.clone();
-            assert!(before.text.is_none());
-            p["find"] = json!("🙂");
-            p["change"] = json!("é");
-            assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 1}));
-            assert_eq!(s.doc().unwrap().selection, before);
-            assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "éX");
-            assert_eq!(s.doc().unwrap().doc.story(other_sid).unwrap().text, "é");
-        }
-    }
-
-    #[test]
-    fn find_scope_mixed_grep_matches_count_next_and_change() {
-        for (text, pattern, expected, changed) in [
-            ("a", "a*", vec![(0, 1)], "X"),
-            ("aa", "a|(?:)", vec![(0, 1), (1, 2)], "XX"),
-            ("ab", "a*", vec![(0, 1), (2, 2)], "XbX"),
-            ("éa", "é|(?:)", vec![(0, 2), (3, 3)], "XaX"),
-        ] {
-            let (mut s, sid) = scope_session(text);
-            scope_select(&mut s, sid, 0, text.len());
-            let p = json!({"find": pattern, "grep": true, "scope": "selection", "change": "X"});
-            let counted = s.execute("find.find", &p).unwrap();
-            let ranges: Vec<_> =
-                counted.as_array().unwrap().iter().map(|m| (m["start"].as_u64().unwrap() as usize, m["end"].as_u64().unwrap() as usize)).collect();
-            assert_eq!(ranges, expected, "{pattern} on {text}");
-            for (a, b) in &expected {
-                scope_hit(&mut s, &p, sid, *a, *b);
-            }
-            for _ in 0..2 {
-                assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null, "{pattern} on {text}");
-            }
-            assert_eq!(s.execute("find.find", &p).unwrap(), counted);
-            assert_eq!(s.execute("find.change", &p).unwrap()["count"], expected.len());
-            assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, changed);
-        }
-    }
-
-    #[test]
-    fn find_scope_capture_replacement_and_first_keep_original_domain() {
-        let (mut s, sid) = scope_session("a1 a2 | a3");
-        scope_select(&mut s, sid, 0, 5);
-        let p = json!({"find": r"a(\d)", "grep": true, "scope": "selection", "change": "b$1", "first": true});
-        scope_hit(&mut s, &p, sid, 0, 2);
-        scope_hit(&mut s, &p, sid, 3, 5);
-        assert_eq!(s.execute("find.change", &p).unwrap()["count"], 1);
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "b1 a2 | a3");
-    }
-
-    #[test]
-    fn find_scope_selection_retains_nonempty_hits_count_change_and_native_text() {
-        for (a, b) in [(0, 7), (7, 0)] {
-            let (mut s, sid) = scope_session("red red | red");
-            scope_select(&mut s, sid, a, b);
-            let p = json!({"find": "red", "change": "blue", "scope": "selection", "attrs": {"fontStyle": "Italic"}});
-            let before = s.doc().unwrap().doc.clone();
-            let selection = s.doc().unwrap().selection.clone();
-            let revision = s.doc().unwrap().revision;
-            let history = s.doc().unwrap().history.undo.len();
-            let strong = std::sync::Arc::strong_count(&before);
-            assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 2);
-            assert_eq!(s.doc().unwrap().selection, selection);
-            assert_eq!(s.doc().unwrap().revision, revision);
-            assert_eq!(std::sync::Arc::strong_count(&before), strong, "search stores weak document identity");
-            scope_hit(&mut s, &p, sid, 0, 3);
-            scope_hit(&mut s, &p, sid, 4, 7);
-            assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
-            assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
-            assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 2);
-            assert!(std::sync::Arc::ptr_eq(&before, &s.doc().unwrap().doc));
-            assert_eq!(s.doc().unwrap().history.undo.len(), history);
-            assert_eq!(s.execute("find.change", &p).unwrap()["count"], 2);
-            let changed = s.doc().unwrap().doc.story(sid).unwrap().clone();
-            assert_eq!(changed.text, "blue blue | red");
-            assert_eq!(changed.char_format_at(0).over.font_style.as_deref(), Some("Italic"));
-            assert_eq!(s.doc().unwrap().history.undo.len(), history + 1);
-            assert!(s.find_context.is_none());
-            s.execute("edit.undo", &json!({})).unwrap();
-            assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
-            assert!(s.find_context.is_none());
-            s.execute("edit.redo", &json!({})).unwrap();
-            assert_eq!(s.doc().unwrap().doc.story(sid).unwrap(), &changed);
-            let native = s.execute("file.serialize", &json!({})).unwrap();
-            s.execute("file.openBytes", &json!({"name": "scope.designcraft", "base64": native["base64"]})).unwrap();
-            assert_eq!(serde_json::to_value(s.doc().unwrap().doc.story(sid).unwrap()).unwrap(), serde_json::to_value(&changed).unwrap());
-            assert!(s.find_context.is_none());
-        }
-    }
-
-    #[test]
-    fn find_scope_matcher_restart_replacement_continuation_and_external_reselection() {
-        let (mut s, sid) = scope_session("red blue red | blue red");
-        scope_select(&mut s, sid, 0, 12);
-        let mut p = json!({"find": "red", "scope": "selection", "change": "one"});
-        scope_hit(&mut s, &p, sid, 0, 3);
-        p["change"] = json!("two");
-        p["attrs"] = json!({"fontStyle": "Italic"});
-        scope_hit(&mut s, &p, sid, 9, 12);
-        p["find"] = json!("blue");
-        scope_hit(&mut s, &p, sid, 4, 8);
-        p["find"] = json!("red");
-        scope_hit(&mut s, &p, sid, 0, 3);
-        p["caseSensitive"] = json!(true);
-        scope_hit(&mut s, &p, sid, 0, 3);
-        p["grep"] = json!(true);
-        scope_hit(&mut s, &p, sid, 0, 3); // GREP alone changes matcher identity.
-        p["find"] = json!("r.d");
-        scope_hit(&mut s, &p, sid, 0, 3);
-        p["wholeWord"] = json!(true);
-        scope_hit(&mut s, &p, sid, 0, 3);
-        let hit = s.doc().unwrap().selection.text.unwrap();
-        scope_select(&mut s, sid, hit.anchor, hit.focus);
-        assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 1, "same-range external reselection starts a new domain");
-        scope_hit(&mut s, &p, sid, 0, 3);
-        assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
-        scope_select(&mut s, sid, 20, 23);
-        p["find"] = json!("red");
-        scope_hit(&mut s, &p, sid, 20, 23);
-    }
-
-    #[test]
-    fn find_scope_word_reselection_at_same_hit_recaptures_bounds() {
-        let (mut s, sid) = scope_session("red red | red");
-        scope_select(&mut s, sid, 0, 7);
-        let p = json!({"find": "red", "change": "blue", "scope": "selection"});
-        assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 2);
-        scope_hit(&mut s, &p, sid, 0, 3);
-        let selected = s.doc().unwrap().selection.clone();
-        let frame = selected.text.unwrap().frame.unwrap();
-        let point = {
-            let st = s.doc().unwrap();
-            let cs = s.cache.get(&st.doc, sid, None);
-            let (fi, x, baseline, ascent, _) = designcraft_compose::caret(&cs, 1).unwrap();
-            let inner = designcraft_geom::Point::new(x, baseline - ascent * 0.5);
-            assert_eq!(cs.frames[fi].frame, frame);
-            assert_eq!(designcraft_compose::hit(&cs, fi, inner), Some(1), "real point lies inside the current hit");
-            let loc = st.doc.find(frame).unwrap();
-            st.doc.parent_xf(&loc) * st.doc.text_xf(st.doc.item(frame).unwrap()) * inner
-        };
-        let before = s.doc().unwrap().doc.clone();
-        let revision = s.doc().unwrap().revision;
-        let history = s.doc().unwrap().history.undo.len();
-        s.execute("text.selectWord", &json!({"frame": frame.0, "point": [point.x, point.y]})).unwrap();
-        assert!(!s.text_drag, "explicit word reselection does not start a text drag");
-        assert_eq!(s.doc().unwrap().selection, selected, "same full selection, including frame");
-        assert!(s.doc().unwrap().revision > revision, "a new revision");
-        assert!(std::sync::Arc::ptr_eq(&before, &s.doc().unwrap().doc));
-        assert_eq!(s.doc().unwrap().history.undo.len(), history);
-        assert!(s.find_context.is_none());
-        assert_eq!(s.execute("find.find", &p).unwrap(), json!([{"story": sid.0, "start": 0, "end": 3, "text": "red"}]));
-        assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 1}));
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
-        assert_eq!(s.doc().unwrap().history.undo.len(), history + 1);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
-        s.execute("edit.redo", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
-    }
-
-    #[test]
-    fn find_scope_story_explicit_story_document_order_and_scope_changes() {
-        let (mut s, a) = scope_session("black red");
-        let other = s.execute("frame.create", &json!({"rect": [150, 36, 100, 100], "content": "text", "text": "red"})).unwrap();
-        let b = designcraft_doc::StoryId(other["story"].as_u64().unwrap());
-        scope_select(&mut s, a, 0, 9);
-        let story = json!({"find": "red", "scope": "story"});
-        assert_eq!(s.execute("find.next", &story).unwrap(), serde_json::Value::Null, "Story does not enter B or wrap to its prefix");
-        scope_select(&mut s, b, 0, 0);
-        let explicit = json!({"find": "black", "story": a.0, "scope": "selection"});
-        scope_hit(&mut s, &explicit, a, 0, 5);
-        let selection = s.doc().unwrap().selection.clone();
-        assert!(s.execute("find.next", &json!({"find": "red", "story": u64::MAX})).is_err());
-        assert_eq!(s.doc().unwrap().selection, selection);
-        scope_select(&mut s, a, 0, 9);
-        scope_hit(&mut s, &json!({"find": "red"}), b, 0, 3);
-        let counted = s.execute("find.find", &json!({"find": "red"})).unwrap();
-        assert_eq!(counted[0]["story"], a.0, "Count retains canonical story order");
-        assert_eq!(counted[1]["story"], b.0);
-        scope_select(&mut s, a, 0, 9);
-        scope_hit(&mut s, &json!({"find": "red", "scope": "selection"}), a, 6, 9);
-        assert_eq!(s.execute("find.next", &story).unwrap(), serde_json::Value::Null, "scope change uses the current caret");
-        s.execute("selection.set", &json!({"ids": []})).unwrap();
-        for command in ["find.find", "find.next", "find.change"] {
-            assert!(s.execute(command, &json!({"find": "red", "change": "blue", "scope": "selection"})).is_err());
-        }
-    }
-
-    #[test]
-    fn find_scope_substring_context_utf8_zero_width_and_invalid_ranges() {
-        let (mut s, sid) = scope_session("scat é🙂 red");
-        scope_select(&mut s, sid, 1, 4);
-        let p = json!({"find": "cat", "wholeWord": true, "scope": "selection"});
-        scope_hit(&mut s, &p, sid, 1, 4);
-        assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 1);
-        scope_select(&mut s, sid, 1, 4);
-        let p = json!({"find": "^c|^a", "grep": true, "scope": "selection"});
-        scope_hit(&mut s, &p, sid, 1, 2);
-        assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null, "cursor does not redefine ^");
-        scope_select(&mut s, sid, 5, 11);
-        let empty = json!({"find": "(?:)", "grep": true, "scope": "selection"});
-        for pos in [5, 7, 11] {
-            scope_hit(&mut s, &empty, sid, pos, pos);
-        }
-        for _ in 0..2 {
-            assert_eq!(s.execute("find.next", &empty).unwrap(), serde_json::Value::Null);
-        }
-        assert_eq!(s.execute("find.find", &empty).unwrap().as_array().unwrap().len(), 3);
-        scope_select(&mut s, sid, 7, 7);
-        scope_hit(&mut s, &empty, sid, 7, 7);
-        assert_eq!(s.execute("find.next", &empty).unwrap(), serde_json::Value::Null);
-        scope_select(&mut s, sid, 12, 15);
-        let nonempty = json!({"find": "red", "change": "blue", "scope": "selection"});
-        scope_hit(&mut s, &nonempty, sid, 12, 15);
-        assert_eq!(s.execute("find.change", &nonempty).unwrap()["count"], 1);
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "scat é🙂 blue");
-        for range in [6..7, 0..usize::MAX] {
-            let st = s.doc_mut().unwrap();
-            st.selection = designcraft_doc::Selection::text(designcraft_doc::TextSel {
-                story: sid,
-                anchor: range.start,
-                focus: range.end,
-                frame: None,
-                cell: None,
-            });
-            st.bump_revision();
-            for command in ["find.find", "find.next", "find.change"] {
-                let before = s.doc().unwrap().doc.clone();
-                let err = s.execute(command, &json!({"find": "x", "change": "y", "scope": "selection"})).unwrap_err();
-                assert!(matches!(err, crate::EngineError::BadParams { .. }), "{err}");
-                assert!(std::sync::Arc::ptr_eq(&before, &s.doc().unwrap().doc));
-            }
-        }
-    }
-
-    #[test]
-    fn find_scope_invalid_query_keeps_continuation_and_cross_boundary_nonmatches() {
-        let (mut s, sid) = scope_session("red red | red");
-        scope_select(&mut s, sid, 0, 7);
-        let p = json!({"find": "red", "scope": "selection"});
-        scope_hit(&mut s, &p, sid, 0, 3);
-        let selected = s.doc().unwrap().selection.clone();
-        assert!(s.execute("find.next", &json!({"find": "[", "grep": true, "scope": "selection"})).is_err());
-        assert_eq!(s.doc().unwrap().selection, selected);
-        scope_hit(&mut s, &p, sid, 4, 7);
-        assert_eq!(s.execute("find.find", &json!({"find": "red |", "scope": "selection"})).unwrap(), json!([]));
-    }
-
-    #[test]
-    fn find_scope_document_switch_edit_and_reset() {
-        let (mut s, sid) = scope_session("red red | red");
-        scope_select(&mut s, sid, 0, 7);
-        let p = json!({"find": "red", "scope": "selection"});
-        scope_hit(&mut s, &p, sid, 0, 3);
-        s.execute("file.new", &json!({})).unwrap();
-        s.set_active(0);
-        assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 1);
-        scope_select(&mut s, sid, 0, 7);
-        scope_hit(&mut s, &p, sid, 0, 3);
-        s.execute("story.setText", &json!({"story": sid.0, "text": "red"})).unwrap();
-        assert!(s.find_context.is_none());
-        assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 1);
-        s.reset_find_scope();
-        assert!(s.find_context.is_none());
-    }
-
-    #[test]
-    fn find_scope_real_preview_restores_before_resolving_bounds() {
-        let (mut s, sid) = scope_session("");
-        s.execute(
-            "data.source.select",
-            &json!({
-                "bytes": crate::cmd::base64_encode(b"x\nred red | red\n"), "name": "scope.csv"
-            }),
-        )
-        .unwrap();
-        s.execute("data.placeholder.add", &json!({"field": "x", "story": sid.0, "at": 0})).unwrap();
-        let template = s.doc().unwrap().doc.clone();
-        assert_eq!(template.story(sid).unwrap().text, "<<x>>");
-        s.execute("data.preview", &json!({"record": 1})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
-        // Install a viewport selection in the real preview. text.select is journaled
-        // and would itself restore the template before selecting.
-        let st = s.doc_mut().unwrap();
-        st.selection = designcraft_doc::Selection::text(designcraft_doc::TextSel { story: sid, anchor: 0, focus: 7, frame: None, cell: None });
-        st.bump_revision();
-        let p = json!({"find": "red", "change": "blue", "scope": "selection"});
-        assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 2);
-        let history = s.doc().unwrap().history.undo.len();
-        let err = s.execute("find.change", &p).unwrap_err();
-        assert!(matches!(err, crate::EngineError::BadParams { .. }), "{err}");
-        assert!(std::sync::Arc::ptr_eq(&template, &s.doc().unwrap().doc));
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "<<x>>");
-        assert_eq!(s.doc().unwrap().history.undo.len(), history);
-        assert!(s.doc().unwrap().preview_stash.is_none());
-        assert!(s.find_context.is_none());
-        // Valid fresh bounds are allowed after restoration; no cached preview range
-        // survives. A document query can see the preview, but Next sees the template.
-        s.execute("data.preview", &json!({"record": 1})).unwrap();
-        let document = json!({"find": "red"});
-        assert_eq!(s.execute("find.find", &document).unwrap().as_array().unwrap().len(), 3);
-        assert_eq!(s.execute("find.next", &document).unwrap(), serde_json::Value::Null);
-        assert!(std::sync::Arc::ptr_eq(&template, &s.doc().unwrap().doc));
-        assert_eq!(s.execute("find.find", &document).unwrap(), json!([]));
-        assert_eq!(s.doc().unwrap().history.undo.len(), history);
-    }
-
-    #[test]
-    fn document_scope_searches_and_changes_table_cells() {
-        let (mut s, sid) = scope_session("Ore 12.15 here");
-        scope_select(&mut s, sid, 0, 0);
-        let table = s.execute("table.insert", &json!({"rows": 1, "cols": 2})).unwrap()["table"].as_u64().unwrap();
-        s.execute("table.setCell", &json!({"row": 0, "col": 1, "text": "Ore 12.15"})).unwrap();
-        // The caret sits in the first cell, so Find Next goes to the second cell, then the story.
-        let p = json!({"find": "Ore 12.15", "scope": "document"});
-        let cell = designcraft_doc::CellAddr { table, row: 0, col: 1 };
-        assert_eq!(s.execute("find.next", &p).unwrap(), json!({"story": sid.0, "start": 0, "end": 9, "cell": {"table": table, "row": 0, "col": 1}}));
-        assert_eq!(s.doc().unwrap().selection.text.map(|t| (t.story, t.range(), t.cell)), Some((sid, 0..9, Some(cell))));
-        let next = s.execute("find.next", &p).unwrap();
-        assert!(next.get("start").is_some() && next.get("cell").is_none(), "{next}");
-        let hits = s.execute("find.find", &p).unwrap();
-        let hits = hits.as_array().unwrap();
-        assert_eq!(hits.len(), 2);
-        let in_cell: Vec<_> = hits.iter().filter(|h| h.get("cell").is_some()).collect();
-        assert_eq!(in_cell.len(), 1);
-        assert_eq!((in_cell[0]["cell"]["row"].as_u64(), in_cell[0]["cell"]["col"].as_u64()), (Some(0), Some(1)));
-        let n = s.execute("find.change", &json!({"find": "Ore 12.15", "change": "Ore 13.00", "scope": "document"})).unwrap();
-        assert_eq!(n["count"], 2);
-        assert!(s.execute("find.find", &json!({"find": "12.15", "scope": "document"})).unwrap().as_array().unwrap().is_empty());
-        assert_eq!(s.execute("find.find", &json!({"find": "13.00", "scope": "document"})).unwrap().as_array().unwrap().len(), 2);
-    }
-
-    fn child_scope_session(note: bool, child: &str) -> (Session, designcraft_doc::StoryId, designcraft_doc::TextSel) {
-        let (mut s, sid) = scope_session("red");
-        scope_select(&mut s, sid, 3, 3);
-        if note {
-            s.execute("footnote.insert", &json!({"text": child})).unwrap();
-        } else {
-            s.execute("table.insert", &json!({"rows": 1, "cols": 1})).unwrap();
-            s.execute("text.insert", &json!({"text": child, "raw": true})).unwrap();
-        }
-        let selected = s.doc().unwrap().selection.text.unwrap();
-        (s, sid, selected)
-    }
-
-    #[test]
-    fn find_scope_children_error_atomically_and_parent_requests_stay_top_level() {
-        for note in [false, true] {
-            for child in ["red", "red x", "é red red red red red"] {
-                let (mut s, sid, mut selected) = child_scope_session(note, child);
-                selected.anchor = 0;
-                selected.focus = child.len();
-                s.doc_mut().unwrap().selection = designcraft_doc::Selection::text(selected);
-                let before = s.doc().unwrap().doc.clone();
-                let selection = s.doc().unwrap().selection.clone();
-                let history = s.doc().unwrap().history.undo.len();
-                let revision = s.doc().unwrap().revision;
-                let journal = s.journal.clone();
-                for scope in ["story", "selection"] {
-                    for command in ["find.find", "find.next", "find.change"] {
-                        let err = s.execute(command, &json!({"find": "red", "change": "blue", "scope": scope})).unwrap_err();
-                        assert!(matches!(err, crate::EngineError::BadParams { .. }), "{err}");
-                        assert!(err.to_string().contains("not supported"));
-                        assert!(std::sync::Arc::ptr_eq(&before, &s.doc().unwrap().doc));
-                        assert_eq!(s.doc().unwrap().selection, selection);
-                        assert_eq!(s.doc().unwrap().history.undo.len(), history);
-                        assert_eq!(s.doc().unwrap().revision, revision);
-                        assert_eq!(s.journal, journal);
-                    }
-                }
-                for explicit in [false, true] {
-                    let mut p = json!({"find": "red", "change": "blue"});
-                    if explicit {
-                        p["story"] = json!(sid.0);
-                        p["scope"] = json!("selection");
-                    }
-                    // Document scope also covers table cells (#1624); an explicit story and footnotes stay top-level.
-                    let in_cell = if explicit || note { 0 } else { child.matches("red").count() };
-                    let changed = if in_cell > 0 { child.replace("red", "blue") } else { child.to_string() };
-                    s.doc_mut().unwrap().selection = selection.clone();
-                    assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 1 + in_cell);
-                    scope_hit(&mut s, &p, sid, 0, 3);
-                    s.doc_mut().unwrap().selection = selection.clone();
-                    assert_eq!(s.execute("find.change", &p).unwrap()["count"], 1 + in_cell);
-                    assert_eq!(s.doc().unwrap().doc.text_story(sid, selected.cell).unwrap().text, changed);
-                    assert_eq!(s.doc().unwrap().selection, selection, "parent replacement does not clamp child offsets");
-                    p["find"] = json!("blue");
-                    p["change"] = json!("red");
-                    s.execute("find.change", &p).unwrap();
-                }
-            }
-        }
-        let (mut s, _, _) = child_scope_session(false, "red");
-        s.execute("table.selectTable", &json!({})).unwrap();
-        for scope in ["story", "selection"] {
-            for command in ["find.find", "find.next", "find.change"] {
-                assert!(
-                    s.execute(command, &json!({"find": "red", "change": "blue", "scope": scope})).unwrap_err().to_string().contains("not supported")
-                );
-            }
-        }
-    }
-
-    #[test]
-    fn find_scope_threaded_overset_story_uses_logical_offsets() {
-        let text = format!("{}red", "word ".repeat(100));
-        let (mut s, sid) = scope_session(&text);
-        let a = s.doc().unwrap().doc.story(sid).unwrap().frames[0];
-        let next = s.execute("frame.create", &json!({"rect": [150, 36, 20, 1], "content": "text"})).unwrap();
-        let b = designcraft_doc::ItemId(next["id"].as_u64().unwrap());
-        s.edit(|d, _| Ok(d.thread(a, b)?)).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().frames.len(), 2);
-        scope_select(&mut s, sid, 0, 0);
-        scope_hit(&mut s, &json!({"find": "red", "scope": "story"}), sid, 500, 503);
-        assert_eq!(s.execute("find.next", &json!({"find": "red", "scope": "story"})).unwrap(), serde_json::Value::Null);
-    }
-
-    #[test]
-    fn find_scope_zero_width_story_explicit_and_document_endpoints_terminate() {
-        for scope in ["story", "explicit", "document"] {
-            let (mut s, sid) = scope_session("é🙂");
-            scope_select(&mut s, sid, 0, 0);
-            let mut p = json!({"find": "(?:)", "grep": true, "scope": scope});
-            if scope == "explicit" {
-                p["story"] = json!(sid.0);
-            }
-            for pos in [0, 2, 6] {
-                scope_hit(&mut s, &p, sid, pos, pos);
-            }
-            assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
-            assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
-        }
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    #[test]
-    fn find_scope_revert_releases_context_with_same_document_uid() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("scope.designcraft");
-        let (mut s, sid) = scope_session("red red | red");
-        s.execute("file.save", &json!({"path": path.to_string_lossy()})).unwrap();
-        scope_select(&mut s, sid, 0, 7);
-        let p = json!({"find": "red", "scope": "selection"});
-        scope_hit(&mut s, &p, sid, 0, 3);
-        let uid = s.doc().unwrap().uid;
-        s.execute("story.setText", &json!({"story": sid.0, "text": "red red"})).unwrap();
-        scope_select(&mut s, sid, 0, 7);
-        scope_hit(&mut s, &p, sid, 0, 3);
-        s.execute("file.revert", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().uid, uid);
-        assert!(s.find_context.is_none());
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
-        assert!(s.execute("find.find", &p).is_err(), "revert's empty selection cannot inherit a previous range");
-    }
-}
+mod tests;
 
 /// Objects matching Find/Change › Object criteria, in document order (nested ones included).
 fn find_objects(d: &designcraft_doc::Document, p: &Value) -> Vec<designcraft_doc::ItemId> {
diff --git a/crates/engine/src/cmd/find/tests.rs b/crates/engine/src/cmd/find/tests.rs
new file mode 100644
index 000000000..5914c2e51
--- /dev/null
+++ b/crates/engine/src/cmd/find/tests.rs
@@ -0,0 +1,749 @@
+use serde_json::json;
+
+use crate::Session;
+
+#[test]
+fn find_and_change_text_and_grep() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("frame.create", &json!({"rect": [36, 36, 300, 300], "content": "text", "text": "Call 555-1234 or 555-9876.\nColour and colour."}))
+        .unwrap();
+    let m = s.execute("find.find", &json!({"find": "colour"})).unwrap();
+    assert_eq!(m.as_array().unwrap().len(), 2);
+    let m = s.execute("find.find", &json!({"find": "colour", "caseSensitive": true})).unwrap();
+    assert_eq!(m.as_array().unwrap().len(), 1);
+    let r = s.execute("find.change", &json!({"find": r"(\d{3})-(\d{4})", "change": "($1) $2", "grep": true})).unwrap();
+    assert_eq!(r["count"], 2);
+    let r = s.execute("find.change", &json!({"find": "colour", "change": "color", "attrs": {"fontStyle": "Italic"}})).unwrap();
+    assert_eq!(r["count"], 2);
+    let d = s.execute("document.inspect", &json!({})).unwrap();
+    let sid = d["stories"][0]["id"].as_u64().unwrap();
+    let text = s.execute("story.get", &json!({"story": sid})).unwrap()["text"].as_str().unwrap().to_string();
+    assert_eq!(text, "Call (555) 1234 or (555) 9876.\ncolor and color.");
+    // Paragraph metacharacter in text mode.
+    assert_eq!(s.execute("find.find", &json!({"find": ".^pc"})).unwrap().as_array().unwrap().len(), 1);
+    s.execute("find.next", &json!({"find": "or"})).unwrap();
+    assert!(s.doc().unwrap().selection.text.is_some());
+}
+
+#[test]
+fn change_first_changes_one_match_in_the_whole_document() {
+    for grep in [false, true] {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        for y in [36, 336] {
+            s.execute("frame.create", &json!({"rect": [36, y, 300, y + 200], "content": "text", "text": "red and red"})).unwrap();
+        }
+        let r = s.execute("find.change", &json!({"find": "red", "change": "blue", "first": true, "grep": grep})).unwrap();
+        assert_eq!(r["count"], 1);
+        assert_eq!(s.execute("find.find", &json!({"find": "blue"})).unwrap().as_array().unwrap().len(), 1);
+        assert_eq!(s.execute("find.find", &json!({"find": "red"})).unwrap().as_array().unwrap().len(), 3);
+    }
+}
+
+fn scope_session(text: &str) -> (Session, designcraft_doc::StoryId) {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let frame = s.execute("frame.create", &json!({"rect": [36, 36, 100, 100], "content": "text", "text": text})).unwrap();
+    (s, designcraft_doc::StoryId(frame["story"].as_u64().unwrap()))
+}
+
+fn scope_select(s: &mut Session, sid: designcraft_doc::StoryId, a: usize, b: usize) {
+    s.execute("text.select", &json!({"story": sid.0, "anchor": a, "focus": b})).unwrap();
+}
+
+fn scope_hit(s: &mut Session, p: &serde_json::Value, sid: designcraft_doc::StoryId, a: usize, b: usize) {
+    assert_eq!(s.execute("find.next", p).unwrap(), json!({"story": sid.0, "start": a, "end": b}));
+    let selected = s.doc().unwrap().selection.text.unwrap();
+    assert_eq!((selected.story, selected.range(), selected.cell), (sid, a..b, None));
+}
+
+fn assert_document_change_scenarios() {
+    for (texts, first, explicit, grep, expected, count) in [
+        (vec!["red red", "red"], Some(true), false, false, vec!["blue red", "red"], 1),
+        (vec!["keep", "red red", "red"], Some(true), false, false, vec!["keep", "blue red", "red"], 1),
+        (vec!["keep", "other"], Some(true), false, false, vec!["keep", "other"], 0),
+        (vec!["red red", "red"], Some(false), false, false, vec!["blue blue", "blue"], 3),
+        (vec!["red red", "red"], None, false, false, vec!["blue blue", "blue"], 3),
+        (vec!["red red", "red"], Some(true), true, false, vec!["blue red", "red"], 1),
+        (vec!["red red", "red"], Some(false), true, false, vec!["blue blue", "red"], 2),
+        (vec!["", "é🙂"], Some(true), false, true, vec!["X", "é🙂"], 1),
+        (vec!["é", "🙂"], Some(false), false, true, vec!["XéX", "X🙂X"], 4),
+    ] {
+        let (mut s, sid) = scope_session(texts[0]);
+        let mut sids = vec![sid];
+        for text in texts.iter().skip(1) {
+            let frame = s.execute("frame.create", &json!({"rect": [120, 36, 200, 100], "content": "text", "text": text})).unwrap();
+            sids.push(designcraft_doc::StoryId(frame["story"].as_u64().unwrap()));
+        }
+        assert_eq!(s.doc().unwrap().doc.stories.keys().copied().collect::<Vec<_>>(), sids);
+        // Document Change keeps canonical target order even with a later story current.
+        scope_select(&mut s, *sids.last().unwrap(), 0, 0);
+        let before = s.doc().unwrap().doc.clone();
+        let mut p = json!({
+            "find": if grep { "(?:)" } else { "red" },
+            "change": if grep { "X" } else { "blue" },
+            "scope": "document", "grep": grep
+        });
+        if let Some(first) = first {
+            p["first"] = json!(first);
+        }
+        if explicit {
+            p["story"] = json!(sid.0);
+            p["scope"] = json!("selection");
+        }
+        if first == Some(true) && !explicit && !grep && texts.last() == Some(&"red") {
+            let last = *sids.last().unwrap();
+            scope_hit(&mut s, &p, last, 0, 3);
+            let first_hit = sids[if texts.len() == 2 { 0 } else { 1 }];
+            assert_eq!(
+                s.execute("find.find", &p).unwrap(),
+                json!([
+                    {"story": first_hit.0, "start": 0, "end": 3, "text": "red"},
+                    {"story": first_hit.0, "start": 4, "end": 7, "text": "red"},
+                    {"story": last.0, "start": 0, "end": 3, "text": "red"}
+                ]),
+                "Count remains canonical after Next paints the later story"
+            );
+        }
+        let selection = s.doc().unwrap().selection.clone();
+        assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": count}));
+        let st = s.doc().unwrap();
+        assert_eq!(st.selection, selection);
+        for (i, sid) in sids.iter().enumerate() {
+            assert_eq!(st.doc.story(*sid).unwrap().text, expected[i]);
+            if texts[i] == expected[i] {
+                assert_eq!(st.doc.story(*sid), before.story(*sid), "untouched story {i} stays entirely unchanged");
+            }
+        }
+        st.doc.check().unwrap();
+    }
+}
+
+#[test]
+fn find_scope_first_change_stops_after_first_matching_story_and_repairs_selection() {
+    assert_document_change_scenarios();
+
+    // Identical replacement is still one counted match, not a reason to visit another story.
+    let (mut s, sid) = scope_session("red red");
+    let other = s.execute("frame.create", &json!({"rect": [120, 36, 200, 100], "content": "text", "text": "red"})).unwrap();
+    let other_sid = designcraft_doc::StoryId(other["story"].as_u64().unwrap());
+    scope_select(&mut s, other_sid, 0, 3);
+    let before = s.doc().unwrap().doc.clone();
+    let selection = s.doc().unwrap().selection.clone();
+    assert_eq!(s.execute("find.change", &json!({"find": "red", "change": "red", "scope": "document", "first": true})).unwrap(), json!({"count": 1}));
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "red red");
+    assert_eq!(s.doc().unwrap().doc.story(other_sid), before.story(other_sid));
+    assert_eq!(s.doc().unwrap().selection, selection);
+    s.doc().unwrap().doc.check().unwrap();
+
+    for reverse in [false, true] {
+        let (mut s, sid) = scope_session("éX X");
+        let other = s.execute("frame.create", &json!({"rect": [120, 36, 200, 100], "content": "text", "text": "X"})).unwrap();
+        let other_sid = designcraft_doc::StoryId(other["story"].as_u64().unwrap());
+        scope_select(&mut s, sid, if reverse { 3 } else { 2 }, if reverse { 2 } else { 3 });
+        let before = s.doc().unwrap().doc.clone();
+        let mut selection = s.doc().unwrap().selection.clone();
+        let t = selection.text.as_mut().unwrap();
+        (t.anchor, t.focus) = if reverse { (6, 2) } else { (2, 6) };
+        let p = json!({"find": "X", "change": "🙂", "scope": "document", "first": true});
+        assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 3);
+        assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 1}));
+        let st = s.doc().unwrap();
+        assert_eq!(st.doc.story(sid).unwrap().text, "é🙂 X");
+        assert_eq!(st.doc.story(other_sid), before.story(other_sid));
+        assert_eq!(st.selection, selection, "first-match exit must follow final UTF-8 repair");
+        st.doc.check().unwrap();
+        assert_eq!(
+            s.execute("find.find", &json!({"find": "🙂", "scope": "selection"})).unwrap(),
+            json!([{"story": sid.0, "start": 2, "end": 6, "text": "🙂"}])
+        );
+    }
+}
+
+#[test]
+fn grep_in_the_documents_dialect() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("frame.create", &json!({"rect": [36, 36, 300, 300], "content": "text", "text": "Москва and Paris, 1\u{2013}2 days.\nok"})).unwrap();
+    // `\u` uppercase, `\l` lowercase letter.
+    let m = s.execute("find.find", &json!({"find": r"\u\l+", "grep": true, "caseSensitive": true})).unwrap();
+    let words: Vec<&str> = m.as_array().unwrap().iter().map(|x| x["text"].as_str().unwrap()).collect();
+    assert_eq!(words, ["Москва", "Paris"]);
+    // `~=` en dash, `\h` space, `\r` paragraph end; the change uses groups, `~S` and `\r`.
+    let r = s.execute("find.change", &json!({"find": r"(\d)~=(\d)\h(\l+)\.\r", "change": r"$1~=$2~S$3!\r", "grep": true})).unwrap();
+    assert_eq!(r["count"], 1);
+    let sid = s.execute("document.inspect", &json!({})).unwrap()["stories"][0]["id"].as_u64().unwrap();
+    let text = s.execute("story.get", &json!({"story": sid})).unwrap()["text"].as_str().unwrap().to_string();
+    assert!(text.starts_with("Москва and Paris, 1\u{2013}2\u{A0}days!\nok"), "{text:?}");
+    // A pattern that doesn't compile is an error, not a silent no-op.
+    assert!(s.execute("find.find", &json!({"find": "[[:nope:]]", "grep": true})).is_err());
+    assert!(s.execute("find.change", &json!({"find": "(", "change": "", "grep": true})).is_err());
+}
+
+#[test]
+fn find_scope_exact_baseline_count_next_change() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let frame = s
+        .execute(
+            "frame.create",
+            &json!({
+                "rect": [36, 36, 300, 200], "content": "text", "text": "red red"
+            }),
+        )
+        .unwrap();
+    let sid = frame["story"].as_u64().unwrap();
+    s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 3})).unwrap();
+    assert_eq!(
+        s.execute("find.find", &json!({"find": "red", "scope": "selection"})).unwrap(),
+        json!([{"story": sid, "start": 0, "end": 3, "text": "red"}])
+    );
+    assert_eq!(s.execute("find.next", &json!({"find": "red", "scope": "selection"})).unwrap(), json!({"story": sid, "start": 0, "end": 3}));
+    assert_eq!(s.execute("find.change", &json!({"find": "red", "change": "blue", "scope": "selection"})).unwrap(), json!({"count": 1}));
+    assert_eq!(s.execute("story.get", &json!({"story": sid})).unwrap()["text"], "blue red");
+}
+
+#[test]
+fn find_scope_change_growth_preserves_direction_and_full_scalar_hits() {
+    for (text, find, change, changed, start, old_end, new_end) in [("a", "a", "é", "é", 0, 1, 2), ("éX", "X", "🙂", "é🙂", 2, 3, 6)] {
+        for reverse in [false, true] {
+            let (mut s, sid) = scope_session(text);
+            // Real caret movement keeps the frame identity, unlike text.select.
+            s.execute("text.move", &json!({"dir": "left", "extend": reverse})).unwrap();
+            if !reverse {
+                s.execute("text.move", &json!({"dir": "right", "extend": true})).unwrap();
+            }
+            let selected = s.doc().unwrap().selection.text.unwrap();
+            assert_eq!((selected.anchor, selected.focus), if reverse { (old_end, start) } else { (start, old_end) });
+            assert!(selected.frame.is_some());
+            let mut expected = s.doc().unwrap().selection.clone();
+            let t = expected.text.as_mut().unwrap();
+            (t.anchor, t.focus) = if reverse { (new_end, start) } else { (start, new_end) };
+            let p = json!({"find": find, "change": change, "scope": "selection"});
+            assert_eq!(s.execute("find.find", &p).unwrap(), json!([{"story": sid.0, "start": start, "end": old_end, "text": find}]));
+            assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 1}));
+            let st = s.doc().unwrap();
+            assert_eq!(st.doc.story(sid).unwrap().text, changed);
+            assert_eq!(st.selection, expected);
+            let t = st.selection.text.unwrap();
+            assert!(changed.is_char_boundary(t.anchor) && changed.is_char_boundary(t.focus));
+            assert!(s.find_context.is_none());
+            let p = json!({"find": change, "scope": "selection"});
+            assert_eq!(s.execute("find.find", &p).unwrap(), json!([{"story": sid.0, "start": start, "end": new_end, "text": change}]));
+            scope_hit(&mut s, &p, sid, start, new_end);
+            assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
+        }
+    }
+}
+
+#[test]
+fn find_scope_change_repairs_final_boundaries_without_remapping_valid_offsets() {
+    for (text, (a, b), find, change, changed, (after_a, after_b), count) in [
+        ("aX", (1, 1), "a", "é", "éX", (0, 0), 1),     // A caret stays collapsed and floors.
+        ("aX", (2, 2), "a", "é", "éX", (2, 2), 1),     // A valid caret stays at its byte offset.
+        ("abc", (1, 2), "abc", "🙂", "🙂", (0, 4), 1), // Both endpoints need repair.
+        ("abc", (2, 1), "abc", "🙂", "🙂", (4, 0), 1),
+        ("é🙂", (2, 6), "🙂", "X", "éX", (2, 3), 1), // Existing shortening behavior.
+        ("é🙂", (6, 2), "🙂", "X", "éX", (3, 2), 1),
+        ("red", (0, 3), "red", "blue", "blue", (0, 3), 1), // Do not extend a valid upper bound.
+        ("aX", (1, 2), "a", "zz", "zzX", (1, 2), 1),       // Do not track the original X.
+        ("aaX", (1, 2), "a", "é", "ééX", (0, 2), 2),       // Per-edit repair would wrongly yield 0..4.
+        ("aaX", (2, 3), "a", "é", "ééX", (2, 4), 2),
+        ("abc", (1, 3), "abc", "", "", (0, 0), 1),
+        ("abc", (2, 3), "abc", "é", "é", (2, 2), 1), // EOF clamp may collapse a nonempty range.
+    ] {
+        let (mut s, sid) = scope_session(text);
+        scope_select(&mut s, sid, a, b);
+        let mut expected = s.doc().unwrap().selection.clone();
+        let t = expected.text.as_mut().unwrap();
+        (t.anchor, t.focus) = (after_a, after_b);
+        assert_eq!(s.execute("find.change", &json!({"find": find, "change": change, "scope": "document"})).unwrap(), json!({"count": count}));
+        let st = s.doc().unwrap();
+        assert_eq!(st.doc.story(sid).unwrap().text, changed, "{text} {a}->{b}");
+        assert_eq!(st.selection, expected, "{text} {a}->{b}");
+        assert!(changed.is_char_boundary(after_a) && changed.is_char_boundary(after_b));
+        if after_a == after_b {
+            assert_eq!(
+                s.execute("find.find", &json!({"find": "(?:)", "grep": true, "scope": "selection"})).unwrap(),
+                json!([{"story": sid.0, "start": after_a, "end": after_a, "text": ""}])
+            );
+        }
+    }
+}
+
+#[test]
+fn find_scope_change_other_story_and_no_hits_preserve_selection() {
+    for explicit in [false, true] {
+        let (mut s, sid) = scope_session("éX");
+        let frame = s.doc().unwrap().selection.text.unwrap().frame.unwrap();
+        let other = s.execute("frame.create", &json!({"rect": [120, 36, 200, 100], "content": "text", "text": "a"})).unwrap();
+        let other_sid = designcraft_doc::StoryId(other["story"].as_u64().unwrap());
+        scope_select(&mut s, sid, 3, 2);
+        let before = s.doc().unwrap().selection.clone();
+        let mut p = json!({"find": "a", "change": "🙂", "scope": "document"});
+        if explicit {
+            p["story"] = json!(other_sid.0);
+        }
+        assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 1}));
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "éX");
+        assert_eq!(s.doc().unwrap().doc.story(other_sid).unwrap().text, "🙂");
+        assert_eq!(s.doc().unwrap().selection, before);
+        assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 0}));
+        assert_eq!(s.doc().unwrap().selection, before);
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "éX");
+        assert_eq!(s.doc().unwrap().doc.story(other_sid).unwrap().text, "🙂");
+
+        s.execute("selection.set", &json!({"ids": [frame.0]})).unwrap();
+        let before = s.doc().unwrap().selection.clone();
+        assert!(before.text.is_none());
+        p["find"] = json!("🙂");
+        p["change"] = json!("é");
+        assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 1}));
+        assert_eq!(s.doc().unwrap().selection, before);
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "éX");
+        assert_eq!(s.doc().unwrap().doc.story(other_sid).unwrap().text, "é");
+    }
+}
+
+#[test]
+fn find_scope_mixed_grep_matches_count_next_and_change() {
+    for (text, pattern, expected, changed) in [
+        ("a", "a*", vec![(0, 1)], "X"),
+        ("aa", "a|(?:)", vec![(0, 1), (1, 2)], "XX"),
+        ("ab", "a*", vec![(0, 1), (2, 2)], "XbX"),
+        ("éa", "é|(?:)", vec![(0, 2), (3, 3)], "XaX"),
+    ] {
+        let (mut s, sid) = scope_session(text);
+        scope_select(&mut s, sid, 0, text.len());
+        let p = json!({"find": pattern, "grep": true, "scope": "selection", "change": "X"});
+        let counted = s.execute("find.find", &p).unwrap();
+        let ranges: Vec<_> =
+            counted.as_array().unwrap().iter().map(|m| (m["start"].as_u64().unwrap() as usize, m["end"].as_u64().unwrap() as usize)).collect();
+        assert_eq!(ranges, expected, "{pattern} on {text}");
+        for (a, b) in &expected {
+            scope_hit(&mut s, &p, sid, *a, *b);
+        }
+        for _ in 0..2 {
+            assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null, "{pattern} on {text}");
+        }
+        assert_eq!(s.execute("find.find", &p).unwrap(), counted);
+        assert_eq!(s.execute("find.change", &p).unwrap()["count"], expected.len());
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, changed);
+    }
+}
+
+#[test]
+fn find_scope_capture_replacement_and_first_keep_original_domain() {
+    let (mut s, sid) = scope_session("a1 a2 | a3");
+    scope_select(&mut s, sid, 0, 5);
+    let p = json!({"find": r"a(\d)", "grep": true, "scope": "selection", "change": "b$1", "first": true});
+    scope_hit(&mut s, &p, sid, 0, 2);
+    scope_hit(&mut s, &p, sid, 3, 5);
+    assert_eq!(s.execute("find.change", &p).unwrap()["count"], 1);
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "b1 a2 | a3");
+}
+
+#[test]
+fn find_scope_selection_retains_nonempty_hits_count_change_and_native_text() {
+    for (a, b) in [(0, 7), (7, 0)] {
+        let (mut s, sid) = scope_session("red red | red");
+        scope_select(&mut s, sid, a, b);
+        let p = json!({"find": "red", "change": "blue", "scope": "selection", "attrs": {"fontStyle": "Italic"}});
+        let before = s.doc().unwrap().doc.clone();
+        let selection = s.doc().unwrap().selection.clone();
+        let revision = s.doc().unwrap().revision;
+        let history = s.doc().unwrap().history.undo.len();
+        let strong = std::sync::Arc::strong_count(&before);
+        assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 2);
+        assert_eq!(s.doc().unwrap().selection, selection);
+        assert_eq!(s.doc().unwrap().revision, revision);
+        assert_eq!(std::sync::Arc::strong_count(&before), strong, "search stores weak document identity");
+        scope_hit(&mut s, &p, sid, 0, 3);
+        scope_hit(&mut s, &p, sid, 4, 7);
+        assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
+        assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
+        assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 2);
+        assert!(std::sync::Arc::ptr_eq(&before, &s.doc().unwrap().doc));
+        assert_eq!(s.doc().unwrap().history.undo.len(), history);
+        assert_eq!(s.execute("find.change", &p).unwrap()["count"], 2);
+        let changed = s.doc().unwrap().doc.story(sid).unwrap().clone();
+        assert_eq!(changed.text, "blue blue | red");
+        assert_eq!(changed.char_format_at(0).over.font_style.as_deref(), Some("Italic"));
+        assert_eq!(s.doc().unwrap().history.undo.len(), history + 1);
+        assert!(s.find_context.is_none());
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
+        assert!(s.find_context.is_none());
+        s.execute("edit.redo", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap(), &changed);
+        let native = s.execute("file.serialize", &json!({})).unwrap();
+        s.execute("file.openBytes", &json!({"name": "scope.designcraft", "base64": native["base64"]})).unwrap();
+        assert_eq!(serde_json::to_value(s.doc().unwrap().doc.story(sid).unwrap()).unwrap(), serde_json::to_value(&changed).unwrap());
+        assert!(s.find_context.is_none());
+    }
+}
+
+#[test]
+fn find_scope_matcher_restart_replacement_continuation_and_external_reselection() {
+    let (mut s, sid) = scope_session("red blue red | blue red");
+    scope_select(&mut s, sid, 0, 12);
+    let mut p = json!({"find": "red", "scope": "selection", "change": "one"});
+    scope_hit(&mut s, &p, sid, 0, 3);
+    p["change"] = json!("two");
+    p["attrs"] = json!({"fontStyle": "Italic"});
+    scope_hit(&mut s, &p, sid, 9, 12);
+    p["find"] = json!("blue");
+    scope_hit(&mut s, &p, sid, 4, 8);
+    p["find"] = json!("red");
+    scope_hit(&mut s, &p, sid, 0, 3);
+    p["caseSensitive"] = json!(true);
+    scope_hit(&mut s, &p, sid, 0, 3);
+    p["grep"] = json!(true);
+    scope_hit(&mut s, &p, sid, 0, 3); // GREP alone changes matcher identity.
+    p["find"] = json!("r.d");
+    scope_hit(&mut s, &p, sid, 0, 3);
+    p["wholeWord"] = json!(true);
+    scope_hit(&mut s, &p, sid, 0, 3);
+    let hit = s.doc().unwrap().selection.text.unwrap();
+    scope_select(&mut s, sid, hit.anchor, hit.focus);
+    assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 1, "same-range external reselection starts a new domain");
+    scope_hit(&mut s, &p, sid, 0, 3);
+    assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
+    scope_select(&mut s, sid, 20, 23);
+    p["find"] = json!("red");
+    scope_hit(&mut s, &p, sid, 20, 23);
+}
+
+#[test]
+fn find_scope_word_reselection_at_same_hit_recaptures_bounds() {
+    let (mut s, sid) = scope_session("red red | red");
+    scope_select(&mut s, sid, 0, 7);
+    let p = json!({"find": "red", "change": "blue", "scope": "selection"});
+    assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 2);
+    scope_hit(&mut s, &p, sid, 0, 3);
+    let selected = s.doc().unwrap().selection.clone();
+    let frame = selected.text.unwrap().frame.unwrap();
+    let point = {
+        let st = s.doc().unwrap();
+        let cs = s.cache.get(&st.doc, sid, None);
+        let (fi, x, baseline, ascent, _) = designcraft_compose::caret(&cs, 1).unwrap();
+        let inner = designcraft_geom::Point::new(x, baseline - ascent * 0.5);
+        assert_eq!(cs.frames[fi].frame, frame);
+        assert_eq!(designcraft_compose::hit(&cs, fi, inner), Some(1), "real point lies inside the current hit");
+        let loc = st.doc.find(frame).unwrap();
+        st.doc.parent_xf(&loc) * st.doc.text_xf(st.doc.item(frame).unwrap()) * inner
+    };
+    let before = s.doc().unwrap().doc.clone();
+    let revision = s.doc().unwrap().revision;
+    let history = s.doc().unwrap().history.undo.len();
+    s.execute("text.selectWord", &json!({"frame": frame.0, "point": [point.x, point.y]})).unwrap();
+    assert!(!s.text_drag, "explicit word reselection does not start a text drag");
+    assert_eq!(s.doc().unwrap().selection, selected, "same full selection, including frame");
+    assert!(s.doc().unwrap().revision > revision, "a new revision");
+    assert!(std::sync::Arc::ptr_eq(&before, &s.doc().unwrap().doc));
+    assert_eq!(s.doc().unwrap().history.undo.len(), history);
+    assert!(s.find_context.is_none());
+    assert_eq!(s.execute("find.find", &p).unwrap(), json!([{"story": sid.0, "start": 0, "end": 3, "text": "red"}]));
+    assert_eq!(s.execute("find.change", &p).unwrap(), json!({"count": 1}));
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
+    assert_eq!(s.doc().unwrap().history.undo.len(), history + 1);
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
+}
+
+#[test]
+fn find_scope_story_explicit_story_document_order_and_scope_changes() {
+    let (mut s, a) = scope_session("black red");
+    let other = s.execute("frame.create", &json!({"rect": [150, 36, 100, 100], "content": "text", "text": "red"})).unwrap();
+    let b = designcraft_doc::StoryId(other["story"].as_u64().unwrap());
+    scope_select(&mut s, a, 0, 9);
+    let story = json!({"find": "red", "scope": "story"});
+    assert_eq!(s.execute("find.next", &story).unwrap(), serde_json::Value::Null, "Story does not enter B or wrap to its prefix");
+    scope_select(&mut s, b, 0, 0);
+    let explicit = json!({"find": "black", "story": a.0, "scope": "selection"});
+    scope_hit(&mut s, &explicit, a, 0, 5);
+    let selection = s.doc().unwrap().selection.clone();
+    assert!(s.execute("find.next", &json!({"find": "red", "story": u64::MAX})).is_err());
+    assert_eq!(s.doc().unwrap().selection, selection);
+    scope_select(&mut s, a, 0, 9);
+    scope_hit(&mut s, &json!({"find": "red"}), b, 0, 3);
+    let counted = s.execute("find.find", &json!({"find": "red"})).unwrap();
+    assert_eq!(counted[0]["story"], a.0, "Count retains canonical story order");
+    assert_eq!(counted[1]["story"], b.0);
+    scope_select(&mut s, a, 0, 9);
+    scope_hit(&mut s, &json!({"find": "red", "scope": "selection"}), a, 6, 9);
+    assert_eq!(s.execute("find.next", &story).unwrap(), serde_json::Value::Null, "scope change uses the current caret");
+    s.execute("selection.set", &json!({"ids": []})).unwrap();
+    for command in ["find.find", "find.next", "find.change"] {
+        assert!(s.execute(command, &json!({"find": "red", "change": "blue", "scope": "selection"})).is_err());
+    }
+}
+
+#[test]
+fn find_scope_substring_context_utf8_zero_width_and_invalid_ranges() {
+    let (mut s, sid) = scope_session("scat é🙂 red");
+    scope_select(&mut s, sid, 1, 4);
+    let p = json!({"find": "cat", "wholeWord": true, "scope": "selection"});
+    scope_hit(&mut s, &p, sid, 1, 4);
+    assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 1);
+    scope_select(&mut s, sid, 1, 4);
+    let p = json!({"find": "^c|^a", "grep": true, "scope": "selection"});
+    scope_hit(&mut s, &p, sid, 1, 2);
+    assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null, "cursor does not redefine ^");
+    scope_select(&mut s, sid, 5, 11);
+    let empty = json!({"find": "(?:)", "grep": true, "scope": "selection"});
+    for pos in [5, 7, 11] {
+        scope_hit(&mut s, &empty, sid, pos, pos);
+    }
+    for _ in 0..2 {
+        assert_eq!(s.execute("find.next", &empty).unwrap(), serde_json::Value::Null);
+    }
+    assert_eq!(s.execute("find.find", &empty).unwrap().as_array().unwrap().len(), 3);
+    scope_select(&mut s, sid, 7, 7);
+    scope_hit(&mut s, &empty, sid, 7, 7);
+    assert_eq!(s.execute("find.next", &empty).unwrap(), serde_json::Value::Null);
+    scope_select(&mut s, sid, 12, 15);
+    let nonempty = json!({"find": "red", "change": "blue", "scope": "selection"});
+    scope_hit(&mut s, &nonempty, sid, 12, 15);
+    assert_eq!(s.execute("find.change", &nonempty).unwrap()["count"], 1);
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "scat é🙂 blue");
+    for range in [6..7, 0..usize::MAX] {
+        let st = s.doc_mut().unwrap();
+        st.selection =
+            designcraft_doc::Selection::text(designcraft_doc::TextSel { story: sid, anchor: range.start, focus: range.end, frame: None, cell: None });
+        st.bump_revision();
+        for command in ["find.find", "find.next", "find.change"] {
+            let before = s.doc().unwrap().doc.clone();
+            let err = s.execute(command, &json!({"find": "x", "change": "y", "scope": "selection"})).unwrap_err();
+            assert!(matches!(err, crate::EngineError::BadParams { .. }), "{err}");
+            assert!(std::sync::Arc::ptr_eq(&before, &s.doc().unwrap().doc));
+        }
+    }
+}
+
+#[test]
+fn find_scope_invalid_query_keeps_continuation_and_cross_boundary_nonmatches() {
+    let (mut s, sid) = scope_session("red red | red");
+    scope_select(&mut s, sid, 0, 7);
+    let p = json!({"find": "red", "scope": "selection"});
+    scope_hit(&mut s, &p, sid, 0, 3);
+    let selected = s.doc().unwrap().selection.clone();
+    assert!(s.execute("find.next", &json!({"find": "[", "grep": true, "scope": "selection"})).is_err());
+    assert_eq!(s.doc().unwrap().selection, selected);
+    scope_hit(&mut s, &p, sid, 4, 7);
+    assert_eq!(s.execute("find.find", &json!({"find": "red |", "scope": "selection"})).unwrap(), json!([]));
+}
+
+#[test]
+fn find_scope_document_switch_edit_and_reset() {
+    let (mut s, sid) = scope_session("red red | red");
+    scope_select(&mut s, sid, 0, 7);
+    let p = json!({"find": "red", "scope": "selection"});
+    scope_hit(&mut s, &p, sid, 0, 3);
+    s.execute("file.new", &json!({})).unwrap();
+    s.set_active(0);
+    assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 1);
+    scope_select(&mut s, sid, 0, 7);
+    scope_hit(&mut s, &p, sid, 0, 3);
+    s.execute("story.setText", &json!({"story": sid.0, "text": "red"})).unwrap();
+    assert!(s.find_context.is_none());
+    assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 1);
+    s.reset_find_scope();
+    assert!(s.find_context.is_none());
+}
+
+#[test]
+fn find_scope_real_preview_restores_before_resolving_bounds() {
+    let (mut s, sid) = scope_session("");
+    s.execute(
+        "data.source.select",
+        &json!({
+            "bytes": crate::cmd::base64_encode(b"x\nred red | red\n"), "name": "scope.csv"
+        }),
+    )
+    .unwrap();
+    s.execute("data.placeholder.add", &json!({"field": "x", "story": sid.0, "at": 0})).unwrap();
+    let template = s.doc().unwrap().doc.clone();
+    assert_eq!(template.story(sid).unwrap().text, "<<x>>");
+    s.execute("data.preview", &json!({"record": 1})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
+    // Install a viewport selection in the real preview. text.select is journaled
+    // and would itself restore the template before selecting.
+    let st = s.doc_mut().unwrap();
+    st.selection = designcraft_doc::Selection::text(designcraft_doc::TextSel { story: sid, anchor: 0, focus: 7, frame: None, cell: None });
+    st.bump_revision();
+    let p = json!({"find": "red", "change": "blue", "scope": "selection"});
+    assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 2);
+    let history = s.doc().unwrap().history.undo.len();
+    let err = s.execute("find.change", &p).unwrap_err();
+    assert!(matches!(err, crate::EngineError::BadParams { .. }), "{err}");
+    assert!(std::sync::Arc::ptr_eq(&template, &s.doc().unwrap().doc));
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "<<x>>");
+    assert_eq!(s.doc().unwrap().history.undo.len(), history);
+    assert!(s.doc().unwrap().preview_stash.is_none());
+    assert!(s.find_context.is_none());
+    // Valid fresh bounds are allowed after restoration; no cached preview range
+    // survives. A document query can see the preview, but Next sees the template.
+    s.execute("data.preview", &json!({"record": 1})).unwrap();
+    let document = json!({"find": "red"});
+    assert_eq!(s.execute("find.find", &document).unwrap().as_array().unwrap().len(), 3);
+    assert_eq!(s.execute("find.next", &document).unwrap(), serde_json::Value::Null);
+    assert!(std::sync::Arc::ptr_eq(&template, &s.doc().unwrap().doc));
+    assert_eq!(s.execute("find.find", &document).unwrap(), json!([]));
+    assert_eq!(s.doc().unwrap().history.undo.len(), history);
+}
+
+#[test]
+fn document_scope_searches_and_changes_table_cells() {
+    let (mut s, sid) = scope_session("Ore 12.15 here");
+    scope_select(&mut s, sid, 0, 0);
+    let table = s.execute("table.insert", &json!({"rows": 1, "cols": 2})).unwrap()["table"].as_u64().unwrap();
+    s.execute("table.setCell", &json!({"row": 0, "col": 1, "text": "Ore 12.15"})).unwrap();
+    // The caret sits in the first cell, so Find Next goes to the second cell, then the story.
+    let p = json!({"find": "Ore 12.15", "scope": "document"});
+    let cell = designcraft_doc::CellAddr { table, row: 0, col: 1 };
+    assert_eq!(s.execute("find.next", &p).unwrap(), json!({"story": sid.0, "start": 0, "end": 9, "cell": {"table": table, "row": 0, "col": 1}}));
+    assert_eq!(s.doc().unwrap().selection.text.map(|t| (t.story, t.range(), t.cell)), Some((sid, 0..9, Some(cell))));
+    let next = s.execute("find.next", &p).unwrap();
+    assert!(next.get("start").is_some() && next.get("cell").is_none(), "{next}");
+    let hits = s.execute("find.find", &p).unwrap();
+    let hits = hits.as_array().unwrap();
+    assert_eq!(hits.len(), 2);
+    let in_cell: Vec<_> = hits.iter().filter(|h| h.get("cell").is_some()).collect();
+    assert_eq!(in_cell.len(), 1);
+    assert_eq!((in_cell[0]["cell"]["row"].as_u64(), in_cell[0]["cell"]["col"].as_u64()), (Some(0), Some(1)));
+    let n = s.execute("find.change", &json!({"find": "Ore 12.15", "change": "Ore 13.00", "scope": "document"})).unwrap();
+    assert_eq!(n["count"], 2);
+    assert!(s.execute("find.find", &json!({"find": "12.15", "scope": "document"})).unwrap().as_array().unwrap().is_empty());
+    assert_eq!(s.execute("find.find", &json!({"find": "13.00", "scope": "document"})).unwrap().as_array().unwrap().len(), 2);
+}
+
+fn child_scope_session(note: bool, child: &str) -> (Session, designcraft_doc::StoryId, designcraft_doc::TextSel) {
+    let (mut s, sid) = scope_session("red");
+    scope_select(&mut s, sid, 3, 3);
+    if note {
+        s.execute("footnote.insert", &json!({"text": child})).unwrap();
+    } else {
+        s.execute("table.insert", &json!({"rows": 1, "cols": 1})).unwrap();
+        s.execute("text.insert", &json!({"text": child, "raw": true})).unwrap();
+    }
+    let selected = s.doc().unwrap().selection.text.unwrap();
+    (s, sid, selected)
+}
+
+/// Child-story scopes are rejected by every find command, leaving the document untouched.
+fn assert_child_scope_requests_rejected(s: &mut Session) {
+    let before = s.doc().unwrap().doc.clone();
+    let selection = s.doc().unwrap().selection.clone();
+    let history = s.doc().unwrap().history.undo.len();
+    let revision = s.doc().unwrap().revision;
+    let journal = s.journal.clone();
+    for scope in ["story", "selection"] {
+        for command in ["find.find", "find.next", "find.change"] {
+            let err = s.execute(command, &json!({"find": "red", "change": "blue", "scope": scope})).unwrap_err();
+            assert!(matches!(err, crate::EngineError::BadParams { .. }), "{err}");
+            assert!(err.to_string().contains("not supported"));
+            assert!(std::sync::Arc::ptr_eq(&before, &s.doc().unwrap().doc));
+            assert_eq!(s.doc().unwrap().selection, selection);
+            assert_eq!(s.doc().unwrap().history.undo.len(), history);
+            assert_eq!(s.doc().unwrap().revision, revision);
+            assert_eq!(s.journal, journal);
+        }
+    }
+}
+
+#[test]
+fn find_scope_children_error_atomically_and_parent_requests_stay_top_level() {
+    for note in [false, true] {
+        for child in ["red", "red x", "é red red red red red"] {
+            let (mut s, sid, mut selected) = child_scope_session(note, child);
+            selected.anchor = 0;
+            selected.focus = child.len();
+            s.doc_mut().unwrap().selection = designcraft_doc::Selection::text(selected);
+            assert_child_scope_requests_rejected(&mut s);
+            let selection = s.doc().unwrap().selection.clone();
+            for explicit in [false, true] {
+                let mut p = json!({"find": "red", "change": "blue"});
+                if explicit {
+                    p["story"] = json!(sid.0);
+                    p["scope"] = json!("selection");
+                }
+                // Document scope also covers table cells (#1624); an explicit story and footnotes stay top-level.
+                let in_cell = if explicit || note { 0 } else { child.matches("red").count() };
+                let changed = if in_cell > 0 { child.replace("red", "blue") } else { child.to_string() };
+                s.doc_mut().unwrap().selection = selection.clone();
+                assert_eq!(s.execute("find.find", &p).unwrap().as_array().unwrap().len(), 1 + in_cell);
+                scope_hit(&mut s, &p, sid, 0, 3);
+                s.doc_mut().unwrap().selection = selection.clone();
+                assert_eq!(s.execute("find.change", &p).unwrap()["count"], 1 + in_cell);
+                assert_eq!(s.doc().unwrap().doc.text_story(sid, selected.cell).unwrap().text, changed);
+                assert_eq!(s.doc().unwrap().selection, selection, "parent replacement does not clamp child offsets");
+                p["find"] = json!("blue");
+                p["change"] = json!("red");
+                s.execute("find.change", &p).unwrap();
+            }
+        }
+    }
+    let (mut s, _, _) = child_scope_session(false, "red");
+    s.execute("table.selectTable", &json!({})).unwrap();
+    for scope in ["story", "selection"] {
+        for command in ["find.find", "find.next", "find.change"] {
+            assert!(s.execute(command, &json!({"find": "red", "change": "blue", "scope": scope})).unwrap_err().to_string().contains("not supported"));
+        }
+    }
+}
+
+#[test]
+fn find_scope_threaded_overset_story_uses_logical_offsets() {
+    let text = format!("{}red", "word ".repeat(100));
+    let (mut s, sid) = scope_session(&text);
+    let a = s.doc().unwrap().doc.story(sid).unwrap().frames[0];
+    let next = s.execute("frame.create", &json!({"rect": [150, 36, 20, 1], "content": "text"})).unwrap();
+    let b = designcraft_doc::ItemId(next["id"].as_u64().unwrap());
+    s.edit(|d, _| Ok(d.thread(a, b)?)).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().frames.len(), 2);
+    scope_select(&mut s, sid, 0, 0);
+    scope_hit(&mut s, &json!({"find": "red", "scope": "story"}), sid, 500, 503);
+    assert_eq!(s.execute("find.next", &json!({"find": "red", "scope": "story"})).unwrap(), serde_json::Value::Null);
+}
+
+#[test]
+fn find_scope_zero_width_story_explicit_and_document_endpoints_terminate() {
+    for scope in ["story", "explicit", "document"] {
+        let (mut s, sid) = scope_session("é🙂");
+        scope_select(&mut s, sid, 0, 0);
+        let mut p = json!({"find": "(?:)", "grep": true, "scope": scope});
+        if scope == "explicit" {
+            p["story"] = json!(sid.0);
+        }
+        for pos in [0, 2, 6] {
+            scope_hit(&mut s, &p, sid, pos, pos);
+        }
+        assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
+        assert_eq!(s.execute("find.next", &p).unwrap(), serde_json::Value::Null);
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn find_scope_revert_releases_context_with_same_document_uid() {
+    let dir = tempfile::tempdir().unwrap();
+    let path = dir.path().join("scope.designcraft");
+    let (mut s, sid) = scope_session("red red | red");
+    s.execute("file.save", &json!({"path": path.to_string_lossy()})).unwrap();
+    scope_select(&mut s, sid, 0, 7);
+    let p = json!({"find": "red", "scope": "selection"});
+    scope_hit(&mut s, &p, sid, 0, 3);
+    let uid = s.doc().unwrap().uid;
+    s.execute("story.setText", &json!({"story": sid.0, "text": "red red"})).unwrap();
+    scope_select(&mut s, sid, 0, 7);
+    scope_hit(&mut s, &p, sid, 0, 3);
+    s.execute("file.revert", &json!({})).unwrap();
+    assert_eq!(s.doc().unwrap().uid, uid);
+    assert!(s.find_context.is_none());
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
+    assert!(s.execute("find.find", &p).is_err(), "revert's empty selection cannot inherit a previous range");
+}
diff --git a/crates/engine/src/cmd/fonts.rs b/crates/engine/src/cmd/fonts.rs
index b1577400c..ee80eb914 100644
--- a/crates/engine/src/cmd/fonts.rs
+++ b/crates/engine/src/cmd/fonts.rs
@@ -81,36 +81,41 @@ fn list(d: &Document) -> Vec<Value> {
     used_fonts(d).into_iter().map(|font| json!(font)).collect()
 }
 
-pub(super) fn used_fonts(d: &Document) -> Vec<UsedFont> {
-    let db = designcraft_fonts::FontDb::global().scoped(d.font_scope);
-    let mut used: BTreeMap<(String, String), (usize, std::collections::BTreeSet<char>)> = BTreeMap::new();
-    for_each_story(d, &mut |st| {
-        let ranges = st.para_ranges();
-        for (pi, r) in ranges.iter().enumerate() {
-            let (_, base) = d.styles.resolve_para(&st.paras[pi]);
-            for (rr, fmt) in st.runs() {
-                let n = st.text[rr.start.max(r.start)..rr.end.min(r.end).max(rr.start.max(r.start))].chars().count();
-                if n == 0 && !(r.is_empty() && rr.contains(&r.start)) {
-                    continue;
-                }
-                let p = d.styles.resolve_char(&base, fmt);
-                if let Some(f) = d.styles.composite_font(&p.font_family) {
-                    let text = st.text.get(rr.start.max(r.start)..rr.end.min(r.end).max(rr.start.max(r.start))).unwrap_or("");
-                    for c in text.chars() {
-                        if let Some(e) = f.entry(c) {
-                            let entry = used.entry((e.family.clone(), e.style.clone())).or_default();
-                            entry.0 += 1;
-                            entry.1.insert(c);
-                        }
+type FontTally = BTreeMap<(String, String), (usize, std::collections::BTreeSet<char>)>;
+
+/// Count the characters of every run of one story against the font each resolves to.
+fn tally_story(d: &Document, st: &Story, used: &mut FontTally) {
+    let ranges = st.para_ranges();
+    for (pi, r) in ranges.iter().enumerate() {
+        let (_, base) = d.styles.resolve_para(&st.paras[pi]);
+        for (rr, fmt) in st.runs() {
+            let n = st.text[rr.start.max(r.start)..rr.end.min(r.end).max(rr.start.max(r.start))].chars().count();
+            if n == 0 && !(r.is_empty() && rr.contains(&r.start)) {
+                continue;
+            }
+            let p = d.styles.resolve_char(&base, fmt);
+            if let Some(f) = d.styles.composite_font(&p.font_family) {
+                let text = st.text.get(rr.start.max(r.start)..rr.end.min(r.end).max(rr.start.max(r.start))).unwrap_or("");
+                for c in text.chars() {
+                    if let Some(e) = f.entry(c) {
+                        let entry = used.entry((e.family.clone(), e.style.clone())).or_default();
+                        entry.0 += 1;
+                        entry.1.insert(c);
                     }
-                } else {
-                    let entry = used.entry((p.font_family, p.font_style)).or_default();
-                    entry.0 += n;
-                    entry.1.extend(st.text.get(rr.start.max(r.start)..rr.end.min(r.end).max(rr.start.max(r.start))).unwrap_or("").chars());
                 }
+            } else {
+                let entry = used.entry((p.font_family, p.font_style)).or_default();
+                entry.0 += n;
+                entry.1.extend(st.text.get(rr.start.max(r.start)..rr.end.min(r.end).max(rr.start.max(r.start))).unwrap_or("").chars());
             }
         }
-    });
+    }
+}
+
+pub(super) fn used_fonts(d: &Document) -> Vec<UsedFont> {
+    let db = designcraft_fonts::FontDb::global().scoped(d.font_scope);
+    let mut used = FontTally::new();
+    for_each_story(d, &mut |st| tally_story(d, st, &mut used));
     let mut out: Vec<UsedFont> = used
         .into_iter()
         .map(|((family, style), (n, characters))| {
diff --git a/crates/engine/src/cmd/interchange.rs b/crates/engine/src/cmd/interchange.rs
index bf0e011a0..0ddb6a1aa 100644
--- a/crates/engine/src/cmd/interchange.rs
+++ b/crates/engine/src/cmd/interchange.rs
@@ -28,7 +28,8 @@ pub fn specs() -> Vec<CommandSpec> {
 fn export_idml(s: &mut Session, p: &Value) -> Result<Value> {
     let st = s.doc()?;
     let opts = designcraft_idml::ExportOptions { embed_images: p.get("embedImages").and_then(Value::as_bool).unwrap_or(true) };
-    let bytes = designcraft_idml::export_idml_with(&st.doc, &opts);
+    let layer_doc = with_pdf_layer_variants(&st.doc, opts.embed_images)?;
+    let bytes = designcraft_idml::export_idml_with(layer_doc.as_ref().unwrap_or(&st.doc), &opts);
     match str_param(p, "path") {
         Some(path) => {
             #[cfg(not(target_arch = "wasm32"))]
@@ -39,6 +40,99 @@ fn export_idml(s: &mut Session, p: &Value) -> Result<Value> {
     }
 }
 
+/// Whether a placement holds an Object Layer Options choice an export can still apply: a graphic
+/// whose asset is a PDF. A choice left on an item that is no longer a placed PDF (its link was
+/// replaced with another format) is not one, so the package report does not name it.
+pub(crate) fn has_applicable_pdf_layer_overrides(doc: &Document) -> bool {
+    doc.placed_items().into_iter().any(|it| {
+        it.has_pdf_layer_override() && it.graphic().and_then(|g| doc.assets.get(&g.asset)).is_some_and(|a| designcraft_render::is_pdf(&a.data))
+    })
+}
+
+/// Each placement gets its own embedded variant so two frames sharing a PDF can
+/// choose different layers. The live document and original linked bytes stay untouched.
+///
+/// Parent-page and anchored placements count too, so a page that inherits the placement does not
+/// quietly fall back to the file's defaults. Read and write walks also reach table-cell and
+/// note text. Endnote variants are prepared too, but IDML endnote structures/artwork are not
+/// serialized yet (see `docs/pdf-layer-visibility.md`).
+fn with_pdf_layer_variants(doc: &Document, embed: bool) -> Result<Option<Document>> {
+    let choices: Vec<_> = doc
+        .placed_items()
+        .into_iter()
+        .filter(|it| it.has_pdf_layer_override())
+        .filter_map(|it| {
+            let asset = it.graphic().and_then(|g| doc.assets.get(&g.asset)).filter(|a| designcraft_render::is_pdf(&a.data))?;
+            Some((it.id, asset, it.pdf_hidden_layers.clone(), it.pdf_layer_override))
+        })
+        .collect();
+    if choices.is_empty() {
+        return Ok(None);
+    }
+    if !embed {
+        return Err(EngineError::Other("PDF layer choices require embedded images in IDML export".into()));
+    }
+    let mut out = doc.clone();
+    let mut variants = std::collections::HashMap::new();
+    // Duplicated anchors can share an id. Reuse a variant only when source and choice agree.
+    let mut expected = std::collections::HashMap::new();
+    for (id, asset, hidden, overridden) in choices {
+        let signature = (asset.id, hidden.clone(), overridden);
+        if let Some(previous) = expected.get(&id) {
+            if previous != &signature {
+                return Err(EngineError::Other(format!("PDF layer choices: placements sharing id {id} have different sources or layer choices")));
+            }
+            continue;
+        }
+        expected.insert(id, signature);
+        let bytes = designcraft_render::pdf_hide_layers(&asset.data, &hidden)
+            .ok_or_else(|| EngineError::Other(format!("{}: PDF layer choices could not be applied", asset.name)))?;
+        let mut variant = (**asset).clone();
+        variant.id = designcraft_doc::AssetId(out.alloc());
+        variant.data = std::sync::Arc::new(bytes);
+        variant.link = None;
+        let aid = variant.id;
+        out.assets.insert(aid, std::sync::Arc::new(variant));
+        variants.insert(id, aid);
+    }
+    // Anchored objects live in stories, and parent pages outside the document-spread walk, so
+    // the choice is cleared where the placement actually is.
+    // Count distinct ids, allowing identical duplicated anchors, but check every hit against
+    // the original source and choice before rewriting (including placements using defaults).
+    let mut reached = std::collections::HashSet::new();
+    let mut conflicting_id = None;
+    out.update_placed_items(
+        |it| variants.contains_key(&it.id),
+        |it| {
+            reached.insert(it.id);
+            if let Some((asset, hidden, overridden)) = expected.get(&it.id)
+                && (it.graphic().map(|g| g.asset) != Some(*asset) || &it.pdf_hidden_layers != hidden || it.pdf_layer_override != *overridden)
+            {
+                conflicting_id = Some(it.id);
+                return;
+            }
+            if let designcraft_doc::Content::Graphic(g) = &mut it.content
+                && let Some(aid) = variants.get(&it.id)
+            {
+                g.asset = *aid;
+            }
+            it.pdf_layer_override = false;
+            it.pdf_hidden_layers.clear();
+        },
+    );
+    if let Some(id) = conflicting_id {
+        return Err(EngineError::Other(format!("PDF layer choices: placements sharing id {id} have different sources or layer choices")));
+    }
+    if reached.len() != variants.len() {
+        return Err(EngineError::Other(format!(
+            "PDF layer choices could not be applied to every placement (reached {} of {})",
+            reached.len(),
+            variants.len()
+        )));
+    }
+    Ok(Some(out))
+}
+
 /// [`designcraft_idml::import_idml`] with the linked images read through [`crate::io`] from
 /// beside `package` (the package's file, if it has one), so the automation read root applies to
 /// the paths the package names, and its PDF crops resolved.
@@ -511,8 +605,10 @@ mod tests {
         for link in links {
             let (idml, _) = linked_idml(link, false).unwrap();
             let (doc, seen) = crate::io::touched(|| import(&idml, Some(&package)).unwrap());
-            // Beside the package, and the link itself where it is on this computer.
-            assert!(seen.iter().all(|p| p.starts_with(&dir) || p == std::path::Path::new(link)), "{link}: {seen:?}");
+            // Beside the package, and the link itself where it is on this computer (on Windows,
+            // `/dev/zero` is `\dev\zero` on the package's drive).
+            let itself = crate::io::document_path(link, Some(&package)).ok();
+            assert!(seen.iter().all(|p| p.starts_with(&dir) || itself.as_ref() == Some(p)), "{link}: {seen:?}");
             let asset = doc.assets.values().next().unwrap();
             assert!(asset.data.is_empty(), "{link}");
             assert_eq!(super::super::links::status(asset, None), "missing", "{link}");
@@ -558,3 +654,290 @@ mod tests {
         assert_eq!(without_document_extension("notes.txt"), "notes.txt");
     }
 }
+
+#[cfg(test)]
+mod nested_layer_tests {
+    use std::{io::Read, sync::Arc};
+
+    use designcraft_doc::{AnchoredObject, ItemId, SpreadRef, Story, StoryId, Table};
+    use designcraft_geom::Rect;
+
+    use super::*;
+
+    // One default placement and two nested placements share bytes. The latter use a legacy
+    // nonempty hidden list and explicit all-on, so each needs a different embedded variant.
+    fn fixture(location: &str) -> (Session, ItemId, [ItemId; 2]) {
+        let pdf = designcraft_render::pdf_hide_layers(&super::super::pdflayers::tests::two_layer_pdf(), &["Red".into()]).unwrap();
+        let mut session = Session::new();
+        session.execute("file.new", &json!({})).unwrap();
+        let placed = session.execute("file.place", &json!({"base64": base64_encode(&pdf), "name": "layers.pdf"})).unwrap();
+        let control = ItemId(placed["id"].as_u64().unwrap());
+        let ids = {
+            let doc = Arc::make_mut(&mut session.doc_mut().unwrap().doc);
+            let original = doc.item(control).unwrap().clone();
+            let aid = original.graphic().unwrap().asset;
+            Arc::make_mut(doc.assets.get_mut(&aid).unwrap()).link = Some("/synthetic/layers.pdf".into());
+            let mut hidden = original.clone();
+            hidden.id = ItemId(doc.alloc());
+            hidden.pdf_hidden_layers = vec!["Blue".into()];
+            let mut all_on = original;
+            all_on.id = ItemId(doc.alloc());
+            all_on.pdf_layer_override = true;
+            let ids = [hidden.id, all_on.id];
+            let mut nested = Story::new(StoryId(0));
+            for item in [hidden, all_on] {
+                nested.insert_object(nested.len(), AnchoredObject { item, position: Default::default() });
+            }
+            let layer = doc.default_layer();
+            let (_, sid) = doc.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 0.0, 200.0, 200.0), layer, "Body", Default::default()).unwrap();
+            let story = doc.story_mut(sid).unwrap();
+            match location {
+                "cell" => {
+                    let mut table = Table::new(1, 1, 1, 0, 0, 100.0);
+                    table.cells[0].text = nested;
+                    story.insert_table(0, table);
+                }
+                "footnote" => {
+                    story.insert_note(0, "Note", Default::default()).unwrap();
+                    Arc::make_mut(&mut story.notes[0]).text = nested;
+                }
+                _ => {
+                    assert_eq!(location, "endnote");
+                    story.insert_endnote(0, "Endnote", Default::default()).unwrap();
+                    Arc::make_mut(&mut story.endnotes[0]).text = nested;
+                }
+            }
+            ids
+        };
+        (session, control, ids)
+    }
+
+    fn states(blue: bool, red: bool) -> Vec<(String, bool)> {
+        vec![("Blue".into(), blue), ("Red".into(), red)]
+    }
+
+    fn prepared(location: &str) {
+        let (session, control, ids) = fixture(location);
+        let source = &session.doc().unwrap().doc;
+        let original_asset = source.item(control).unwrap().graphic().unwrap().asset;
+        let copy = with_pdf_layer_variants(source, true).unwrap().unwrap();
+        for (id, expected) in ids.into_iter().zip([states(false, true), states(true, true)]) {
+            let item = copy.placed_items().into_iter().find(|i| i.id == id).unwrap();
+            let asset = &copy.assets[&item.graphic().unwrap().asset];
+            assert_eq!(designcraft_render::pdf_layers(&asset.data), expected, "{location}: placement {id}");
+            assert_ne!(asset.id, original_asset);
+            assert!(asset.link.is_none());
+            assert!(!item.pdf_layer_override && item.pdf_hidden_layers.is_empty());
+        }
+        assert_eq!(copy.item(control).unwrap().graphic().unwrap().asset, original_asset);
+        assert!(Arc::ptr_eq(&copy.assets[&original_asset], &source.assets[&original_asset]));
+        assert_eq!(designcraft_render::pdf_layers(&source.assets[&original_asset].data), states(true, false));
+        assert!(source.placed_items().into_iter().filter(|i| ids.contains(&i.id)).all(|i| i.has_pdf_layer_override()));
+    }
+
+    fn embedded(location: &str) {
+        let (mut session, _, _) = fixture(location);
+        let original = session.doc().unwrap().doc.clone();
+        let result = session.execute("file.exportIdml", &json!({})).unwrap();
+        let bytes = base64_decode(result["base64"].as_str().unwrap());
+        let imported = designcraft_idml::import_idml(&bytes).unwrap();
+        let mut roundtrip: Vec<_> =
+            imported.assets.values().filter(|a| designcraft_render::is_pdf(&a.data)).map(|a| designcraft_render::pdf_layers(&a.data)).collect();
+        let mut expected = vec![states(true, false), states(false, true), states(true, true)];
+        roundtrip.sort();
+        expected.sort();
+        assert_eq!(roundtrip, expected, "{location}: reopened IDML keeps each choice");
+        let mut package = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
+        let mut actual = Vec::new();
+        for index in 0..package.len() {
+            let mut entry = package.by_index(index).unwrap();
+            if !entry.name().ends_with(".xml") {
+                continue;
+            }
+            let mut xml = String::new();
+            entry.read_to_string(&mut xml).unwrap();
+            for cdata in xml.split("<![CDATA[").skip(1) {
+                let data = base64_decode(cdata.split("]]>").next().unwrap());
+                if designcraft_render::is_pdf(&data) {
+                    actual.push(designcraft_render::pdf_layers(&data));
+                }
+            }
+        }
+        actual.sort();
+        assert_eq!(actual, expected, "{location}: each placement embeds its own visibility state");
+        assert!(Arc::ptr_eq(&original, &session.doc().unwrap().doc), "export must not edit the live document");
+    }
+
+    fn external(location: &str) {
+        let (mut session, _, ids) = fixture(location);
+        // Each choice alone must reject the export, including a legacy nonempty hidden list.
+        for active in ids {
+            let original = session.doc().unwrap().doc.clone();
+            let mut one = (*original).clone();
+            one.update_placed_items(
+                |i| ids.contains(&i.id) && i.id != active,
+                |i| {
+                    i.pdf_layer_override = false;
+                    i.pdf_hidden_layers.clear();
+                },
+            );
+            let mut single = Session::new();
+            single.add_document(DocState::new(one, None));
+            let before = single.doc().unwrap().doc.clone();
+            let err = single.execute("file.exportIdml", &json!({"embedImages": false})).unwrap_err().to_string();
+            assert!(err.contains("embedded images"), "{location}: {err}");
+            assert!(Arc::ptr_eq(&before, &single.doc().unwrap().doc));
+        }
+        Arc::make_mut(&mut session.doc_mut().unwrap().doc).update_placed_items(
+            |i| ids.contains(&i.id),
+            |i| {
+                i.pdf_layer_override = false;
+                i.pdf_hidden_layers.clear();
+            },
+        );
+        session.execute("file.exportIdml", &json!({"embedImages": false})).unwrap();
+    }
+
+    // Duplicating a text frame that holds an anchored placed PDF leaves two placements sharing
+    // one ItemId (renumber gap, tracked separately). Export must still apply the choice to both.
+    #[test]
+    fn duplicated_frame_keeps_its_anchored_pdf_choice_in_idml() {
+        let pdf = designcraft_render::pdf_hide_layers(&super::super::pdflayers::tests::two_layer_pdf(), &["Red".into()]).unwrap();
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let placed = s.execute("file.place", &json!({"base64": base64_encode(&pdf), "name": "layers.pdf"})).unwrap();
+        let control = ItemId(placed["id"].as_u64().unwrap());
+        let (frame, chosen) = {
+            let doc = Arc::make_mut(&mut s.doc_mut().unwrap().doc);
+            let mut item = doc.item(control).unwrap().clone();
+            item.id = ItemId(doc.alloc());
+            item.pdf_hidden_layers = vec!["Blue".into()];
+            let chosen = item.id;
+            let layer = doc.default_layer();
+            let (frame, sid) = doc.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 0.0, 200.0, 200.0), layer, "Body", Default::default()).unwrap();
+            doc.story_mut(sid).unwrap().insert_object(0, AnchoredObject { item, position: Default::default() });
+            (frame, chosen)
+        };
+        s.execute("transform.move", &json!({"ids": [frame.0], "dx": 10, "dy": 10, "copy": true})).unwrap();
+        let doc = s.doc().unwrap().doc.clone();
+        let with_choice: Vec<_> = doc.placed_items().into_iter().filter(|i| i.has_pdf_layer_override()).map(|i| i.id).collect();
+        assert_eq!(with_choice, [chosen, chosen], "both placements share one id");
+        assert!(doc.check().unwrap_err().to_string().contains(&format!("duplicate item id {chosen}")));
+        let result = s.execute("file.exportIdml", &json!({})).unwrap();
+        let imported = designcraft_idml::import_idml(&base64_decode(result["base64"].as_str().unwrap())).unwrap();
+        let mut layers: Vec<_> =
+            imported.assets.values().filter(|a| designcraft_render::is_pdf(&a.data)).map(|a| designcraft_render::pdf_layers(&a.data)).collect();
+        layers.sort();
+        assert_eq!(layers, vec![states(false, true), states(true, false)]);
+    }
+
+    // Shared anchored ids are a pre-existing duplication gap. Conflicting choices must not
+    // silently select one variant; this fixture changes only the copied anchor's choice.
+    #[test]
+    fn shared_id_with_divergent_pdf_choices_is_rejected() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let pdf = designcraft_render::pdf_hide_layers(&super::super::pdflayers::tests::two_layer_pdf(), &["Red".into()]).unwrap();
+        let placed = s.execute("file.place", &json!({"base64": base64_encode(&pdf), "name": "layers.pdf"})).unwrap();
+        let control = ItemId(placed["id"].as_u64().unwrap());
+        let frame = {
+            let doc = Arc::make_mut(&mut s.doc_mut().unwrap().doc);
+            let mut item = doc.item(control).unwrap().clone();
+            item.id = ItemId(doc.alloc());
+            item.pdf_hidden_layers = vec!["Blue".into()];
+            let layer = doc.default_layer();
+            let (frame, sid) = doc.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 0.0, 200.0, 200.0), layer, "Body", Default::default()).unwrap();
+            doc.story_mut(sid).unwrap().insert_object(0, AnchoredObject { item, position: Default::default() });
+            frame
+        };
+        s.execute("transform.move", &json!({"ids": [frame.0], "dx": 10, "dy": 10, "copy": true})).unwrap();
+        // Change ONLY the copy in the newest story to explicit all-on.
+        {
+            let doc = Arc::make_mut(&mut s.doc_mut().unwrap().doc);
+            let (_, st) = doc.stories.iter_mut().filter(|(_, st)| !st.objects.is_empty()).last().unwrap();
+            let o = &mut Arc::make_mut(st).objects[0];
+            let it = &mut Arc::make_mut(o).item;
+            it.pdf_hidden_layers.clear();
+            it.pdf_layer_override = true;
+        }
+        let before = s.doc().unwrap().doc.clone();
+        let chosen: Vec<_> = before.placed_items().into_iter().filter(|i| i.has_pdf_layer_override()).collect();
+        assert_eq!(chosen.len(), 2);
+        assert_eq!(chosen[0].id, chosen[1].id);
+        assert_eq!(chosen[0].graphic().unwrap().asset, chosen[1].graphic().unwrap().asset);
+        assert_ne!(chosen[0].pdf_hidden_layers, chosen[1].pdf_hidden_layers);
+        let err = s.execute("file.exportIdml", &json!({})).unwrap_err().to_string();
+        assert!(err.contains("placements sharing id") && err.contains("different sources or layer choices"), "{err}");
+        assert!(Arc::ptr_eq(&before, &s.doc().unwrap().doc));
+    }
+
+    // Cross-document paste: the pasted frame's anchored placement keeps its source id,
+    // which can collide with an unrelated placement in the destination.
+    #[test]
+    fn shared_id_with_different_pdf_assets_is_rejected() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let pdf = designcraft_render::pdf_hide_layers(&super::super::pdflayers::tests::two_layer_pdf(), &["Red".into()]).unwrap();
+        let a = s.execute("file.place", &json!({"base64": base64_encode(&pdf), "name": "a.pdf"})).unwrap()["id"].as_u64().unwrap();
+        s.execute("object.layerOptions", &json!({"ids": [a], "hidden": ["Blue"]})).unwrap();
+        let f = s.execute("frame.create", &json!({"rect": [72, 72, 400, 400], "content": "text", "text": "Hello"})).unwrap()["id"].as_u64().unwrap();
+        let sid = s.doc().unwrap().doc.item(ItemId(f)).unwrap().text_frame().unwrap().story;
+        s.execute("anchored.insert", &json!({"ids": [a], "story": sid.0, "pos": 0})).unwrap();
+        s.execute("selection.set", &json!({"ids": [f]})).unwrap();
+        s.execute("edit.copy", &json!({})).unwrap();
+        s.execute("file.new", &json!({})).unwrap();
+        // A different, unrelated PDF placement in the destination (no choice).
+        let b = s
+            .execute("file.place", &json!({"base64": base64_encode(&super::super::pdflayers::tests::two_layer_pdf()), "name": "b.pdf"}))
+            .unwrap()["id"]
+            .as_u64()
+            .unwrap();
+        s.execute("edit.paste", &json!({})).unwrap();
+        assert_eq!(a, b, "fresh documents allocate the same first placement id");
+        let before = s.doc().unwrap().doc.clone();
+        let graphics: Vec<_> = before.placed_items().into_iter().filter(|i| i.graphic().is_some()).collect();
+        assert_eq!(graphics.len(), 2);
+        assert_eq!(graphics[0].id, graphics[1].id);
+        assert_ne!(graphics[0].graphic().unwrap().asset, graphics[1].graphic().unwrap().asset);
+        assert!(!graphics[0].has_pdf_layer_override(), "destination placement uses file defaults");
+        assert!(graphics[1].has_pdf_layer_override());
+        let err = s.execute("file.exportIdml", &json!({})).unwrap_err().to_string();
+        assert!(err.contains("placements sharing id") && err.contains("different sources or layer choices"), "{err}");
+        assert!(Arc::ptr_eq(&before, &s.doc().unwrap().doc));
+    }
+
+    #[test]
+    fn nested_idml_cell_variants_are_applied() {
+        prepared("cell");
+    }
+    #[test]
+    fn nested_idml_footnote_variants_are_applied() {
+        prepared("footnote");
+    }
+    // Endnote structures/artwork are not serialized by IDML yet. Check preparation without
+    // mistaking a correct export-only variant for endnote-artwork serialization support.
+    #[test]
+    fn nested_idml_endnote_variants_are_prepared() {
+        prepared("endnote");
+    }
+    #[test]
+    fn nested_idml_cell_embedded_choices() {
+        embedded("cell");
+    }
+    #[test]
+    fn nested_idml_footnote_embedded_choices() {
+        embedded("footnote");
+    }
+    #[test]
+    fn nested_idml_cell_external_choices_are_rejected() {
+        external("cell");
+    }
+    #[test]
+    fn nested_idml_footnote_external_choices_are_rejected() {
+        external("footnote");
+    }
+    #[test]
+    fn nested_idml_endnote_external_choices_are_rejected() {
+        external("endnote");
+    }
+}
diff --git a/crates/engine/src/cmd/layout.rs b/crates/engine/src/cmd/layout.rs
index d67f469f0..5ec6abb4d 100644
--- a/crates/engine/src/cmd/layout.rs
+++ b/crates/engine/src/cmd/layout.rs
@@ -6,2536 +6,17 @@ use serde_json::{Value, json};
 use super::{CommandSpec, bad, cmd, has_doc, ok, str_param};
 use crate::{Result, Session};
 
-/// A start page number parameter: a whole number in 1..=[`designcraft_doc::MAX_PAGE_NUMBER`].
-fn start_number(cmd: &str, key: &str, v: &Value) -> Result<u32> {
-    v.as_u64()
-        .and_then(|n| u32::try_from(n).ok())
-        .filter(|n| (1..=designcraft_doc::MAX_PAGE_NUMBER).contains(n))
-        .ok_or_else(|| bad(cmd, format!("`{key}` must be a whole number from 1 to {}", designcraft_doc::MAX_PAGE_NUMBER)))
-}
-
-/// Each page's margin box, by spread and page id.
-fn margin_boxes(d: &designcraft_doc::Document) -> Vec<(designcraft_doc::SpreadRef, designcraft_doc::PageId, designcraft_geom::Rect)> {
-    d.spread_refs()
-        .filter_map(|r| d.spread(r).map(|sp| (r, sp)))
-        .flat_map(|(r, sp)| sp.pages.iter().map(move |pg| (r, pg.id, pg.margin_rect())))
-        .collect()
-}
-
-/// Layout Adjustment: objects on each page move and resize from its old margin box to its new
-/// one (content keeps its size; frames that auto-fit refit).
-fn adjust_layout(d: &mut designcraft_doc::Document, before: &[(designcraft_doc::SpreadRef, designcraft_doc::PageId, designcraft_geom::Rect)]) {
-    use designcraft_geom::Affine;
-    let after = margin_boxes(d);
-    for (r, pid, old) in before {
-        let Some((_, _, new)) = after.iter().find(|(r2, p2, _)| r2 == r && p2 == pid) else { continue };
-        if old == new || old.width() < 1e-6 || old.height() < 1e-6 {
-            continue;
-        }
-        let m = Affine::translate((new.x0, new.y0))
-            * Affine::scale_non_uniform(new.width() / old.width(), new.height() / old.height())
-            * Affine::translate((-old.x0, -old.y0));
-        let Some(sp) = d.spread(*r) else { continue };
-        // The page's objects (by centre, measured against the old boxes).
-        let ids: Vec<designcraft_doc::ItemId> = sp
-            .items
-            .iter()
-            .filter(|it| {
-                let c = it.bounds().center();
-                // Pages share a spread side by side: the margin box's page is the one under the centre's x.
-                before
-                    .iter()
-                    .filter(|(r2, _, _)| r2 == r)
-                    .min_by(|a, b| dist(a.2, c.x).total_cmp(&dist(b.2, c.x)))
-                    .is_some_and(|(_, p2, _)| p2 == pid)
-            })
-            .map(|it| it.id)
-            .collect();
-        for id in ids {
-            let Some(it) = d.item_mut(id) else { continue };
-            if matches!(it.content, designcraft_doc::Content::Group { .. }) {
-                it.xf = m * it.xf;
-            } else {
-                let inner = it.xf.inverse() * m * it.xf;
-                it.path.transform(inner);
-                if let Some(w) = &mut it.wrap.path {
-                    w.transform(inner);
-                }
-                let ib = it.inner_bounds();
-                if let designcraft_doc::Content::Graphic(g) = &mut it.content {
-                    // Content keeps its size but moves with the frame; auto-fit refits.
-                    let o = inner * designcraft_geom::Point::ZERO;
-                    g.xf = Affine::translate(o.to_vec2()) * g.xf;
-                    if let Some(xf) = g.fitted(ib, g.auto_fit) {
-                        g.xf = xf;
-                    }
-                }
-            }
-        }
-    }
-}
-
-/// Horizontal distance from `x` to a margin box (0 inside).
-fn dist(r: designcraft_geom::Rect, x: f64) -> f64 {
-    if x < r.x0 {
-        r.x0 - x
-    } else if x > r.x1 {
-        x - r.x1
-    } else {
-        0.0
-    }
-}
-
-/// Apply the `margins`, `columns` and `gutter` params of `layout.marginsAndColumns` to one page.
-fn set_margins_columns(pg: &mut designcraft_doc::Page, p: &Value) {
-    let width_before = pg.margin_rect().width();
-    match p.get("margins") {
-        Some(Value::Number(n)) => pg.margins = Margins::uniform(n.as_f64().unwrap_or(36.0)),
-        Some(v @ Value::Object(_)) => {
-            if let Ok(m) = serde_json::from_value(v.clone()) {
-                pg.margins = m;
-            }
-        }
-        _ => {}
-    }
-    scale_columns(pg, width_before);
-    // A new count or gutter re-divides the columns evenly: dragged column positions are what
-    // the new value replaces. The dialog always sends both, so an unchanged value keeps them.
-    if let Some(c) = p.get("columns").and_then(Value::as_u64) {
-        let c = u32::try_from(c).unwrap_or(u32::MAX).clamp(1, 216);
-        if c != pg.columns.count {
-            pg.columns.count = c;
-            pg.columns.positions = None;
-        }
-    }
-    if let Some(g) = p.get("gutter").and_then(Value::as_f64).filter(|g| g.is_finite()) {
-        let g = g.max(0.0);
-        if (g - pg.columns.gutter).abs() > GUTTER_TOLERANCE {
-            pg.columns.gutter = g;
-            pg.columns.positions = None;
-        }
-    }
-}
-
-/// Dragged column positions are measured across the margin box. When the box was
-/// `width_before` wide and now has another width, they scale with it, as InDesign's do; a set
-/// that doesn't scale into a valid one goes back to the even split rather than stay hidden.
-fn scale_columns(pg: &mut designcraft_doc::Page, width_before: f64) {
-    let width = pg.margin_rect().width();
-    if (width - width_before).abs() <= GUTTER_TOLERANCE {
-        return;
-    }
-    let Some(positions) = pg.columns.positions.as_mut() else { return };
-    let factor = width / width_before;
-    if factor.is_finite() && factor > 0.0 {
-        positions.iter_mut().for_each(|p| *p *= factor);
-        // The ends sit exactly on the margins whatever the rounding.
-        if let Some(first) = positions.first_mut() {
-            *first = 0.0;
-        }
-        if let Some(last) = positions.last_mut() {
-            *last = width;
-        }
-    }
-    if pg.columns.valid_positions(width).is_none() {
-        pg.columns.positions = None;
-    }
-}
-
-/// Gives `pg` the page width `width`, scaling its dragged columns with the margin box.
-fn set_page_width(pg: &mut designcraft_doc::Page, width: f64) {
-    let before = pg.margin_rect().width();
-    pg.width = width;
-    scale_columns(pg, before);
-}
-
-/// How far a gutter may differ from the page's and still count as unchanged, in points. The
-/// dialog shows the gutter in the ruler unit, rounded (inches to four decimals: up to 0.0036 pt
-/// off), so an OK that leaves the field alone sends back a slightly different number.
-const GUTTER_TOLERANCE: f64 = 0.01;
-
-pub fn specs() -> Vec<CommandSpec> {
-    vec![
-        cmd!(
-            "layout.pages.insert",
-            "Insert Pages…",
-            ["Layout", "Pages"],
-            Some("Cmd+Shift+P"),
-            "{count?: 1 (1 to 9999), after?: 0-based page index (default: the last page), parent?: id|\"A-Parent\"|\"A\"|null}",
-            has_doc,
-            |s, p| {
-                const ID: &str = "layout.pages.insert";
-                // A count that is given but is not a number of pages used to insert one page:
-                // `0`, `-1` and `1.5` all came out as 1, and 10000 was quietly capped.
-                let count = match p.get("count").filter(|v| !v.is_null()) {
-                    None => 1,
-                    Some(v) => match v.as_u64().filter(|n| (1..=9999).contains(n)).map(|n| n as usize) {
-                        Some(n) => n,
-                        None => return Err(bad(ID, format!("count {v}: 1 to 9999 pages"))),
-                    },
-                };
-                let st = s.doc()?;
-                let n = st.doc.page_count();
-                // An `after` past the last page appends, which `insert_after_u64_max_appends_at_the_end`
-                // pins deliberately.
-                let after = p.get("after").and_then(Value::as_u64).map(|v| usize::try_from(v).unwrap_or(usize::MAX)).unwrap_or(n.saturating_sub(1));
-                let parent = parent_ref(ID, &st.doc, p.get("parent"))?.unwrap_or_else(|| st.doc.parents.first().map(|x| x.id));
-                s.edit(|d, _| {
-                    let ids = d.insert_pages(Some(after), count, parent)?;
-                    Ok(json!({"pages": ids.len(), "total": d.page_count()}))
-                })
-            }
-        ),
-        cmd!(
-            "layout.rotateSpreadView",
-            "Rotate Spread",
-            [],
-            None,
-            "{spread?: index (0), angle: 90 (clockwise) | -90 | 180 | 0 (clear)} — turn one spread on screen (output is unaffected)",
-            has_doc,
-            |s, p| {
-                let si = p.get("spread").and_then(Value::as_u64).unwrap_or(0) as usize;
-                let angle = match p.get("angle") {
-                    None => 90,
-                    Some(v) => v.as_i64().ok_or_else(|| bad("layout.rotateSpreadView", "angle must be an integer multiple of 90 degrees"))?,
-                };
-                if angle % 90 != 0 {
-                    return Err(bad("layout.rotateSpreadView", "angle must be an integer multiple of 90 degrees"));
-                }
-                s.edit(|d, _| {
-                    let sp = d.spreads.get_mut(si).ok_or_else(|| bad("layout.rotateSpreadView", "no such spread"))?;
-                    let pg = std::sync::Arc::make_mut(sp).pages.first_mut().ok_or_else(|| bad("layout.rotateSpreadView", "empty spread"))?;
-                    pg.view_rotation = if angle == 0 { 0 } else { ((pg.view_rotation as i64 + angle.div_euclid(90)).rem_euclid(4)) as u8 };
-                    Ok(json!({"rotation": pg.view_rotation as u32 * 90}))
-                })
-            }
-        ),
-        cmd!("layout.pages.delete", "Delete Pages", ["Layout", "Pages"], None, "{pages: [index]}", has_doc, |s, p| {
-            let pages: Vec<usize> = p
-                .get("pages")
-                .and_then(Value::as_array)
-                .map(|a| a.iter().filter_map(Value::as_u64).map(|v| v as usize).collect())
-                .unwrap_or_default();
-            s.edit(|d, sel| {
-                d.delete_pages(&pages)?;
-                sel.items.retain(|i| d.item(*i).is_some());
-                sel.text = sel.text.filter(|t| d.story(t.story).is_some());
-                ok()
-            })
-        }),
-        cmd!("layout.pages.move", "Move Pages…", ["Layout", "Pages"], None, "{from, to}", has_doc, |s, p| {
-            let from = p.get("from").and_then(Value::as_u64).ok_or_else(|| bad("layout.pages.move", "missing from"))? as usize;
-            let to = p.get("to").and_then(Value::as_u64).ok_or_else(|| bad("layout.pages.move", "missing to"))? as usize;
-            s.edit(|d, _| {
-                d.move_page(from, to)?;
-                ok()
-            })
-        }),
-        cmd!(
-            "layout.pages.duplicateSpread",
-            "Duplicate Spread",
-            ["Layout", "Pages"],
-            None,
-            "{spread, atEnd?: bool (Duplicate Spread at End of Document; the Pages panel's New Page button takes a dropped page there), to?: page index the copied pages move to in the same undo step (the Pages panel's Alt-drag)} → {page: the copy's first page (0-based)} — the spread's pages (size, margins, columns, guides, liquid rule) and items",
-            has_doc,
-            |s, p| {
-                let si = p.get("spread").and_then(Value::as_u64).unwrap_or(0) as usize;
-                let at_end = p.get("atEnd").and_then(Value::as_bool).unwrap_or(false);
-                let to = p.get("to").and_then(Value::as_u64).map(|t| t as usize);
-                s.edit(|d, _| {
-                    let sp = d.spreads.get(si).cloned().ok_or_else(|| bad("layout.pages.duplicateSpread", "no such spread"))?;
-                    // The copies land at `to`..`to + n` of the document with them in it.
-                    if to.is_some_and(|t| t > d.page_count()) {
-                        return Err(bad("layout.pages.duplicateSpread", "no such page"));
-                    }
-                    let after = if at_end { d.page_count() - 1 } else { d.first_page_of_spread(si) + sp.pages.len() - 1 };
-                    let parent = sp.pages.first().and_then(|p| p.parent);
-                    d.insert_pages(Some(after), sp.pages.len(), parent)?;
-                    // The copies are the pages they copy: size, margins, columns, guides, liquid rule.
-                    for (k, src) in sp.pages.iter().enumerate() {
-                        let Some((nsi, npi)) = d.page_loc(after + 1 + k) else { continue };
-                        let nsp = std::sync::Arc::make_mut(&mut d.spreads[nsi]);
-                        let pg = &mut nsp.pages[npi];
-                        let dx = pg.x - src.x;
-                        // A copy on the other side of the spine has its dragged columns mirrored.
-                        let columns = pg.columns_from(src);
-                        (pg.width, pg.height, pg.margins, pg.columns, pg.liquid) = (src.width, src.height, src.margins, columns, src.liquid);
-                        pg.guides = src.guides.clone();
-                        for g in pg.guides.iter_mut().filter(|g| g.orientation == designcraft_doc::Orientation::Vertical) {
-                            g.position += dx;
-                        }
-                        nsp.relayout();
-                    }
-                    // Copy items onto the new spread(s) at the same positions.
-                    let src = d.clone();
-                    let ids: Vec<_> = sp.items.iter().map(|i| i.id).collect();
-                    let (nsi, _) = d.page_loc(after + 1).ok_or_else(|| bad("layout.pages.duplicateSpread", "insert failed"))?;
-                    super::object::duplicate_from(d, &src, &ids, designcraft_doc::SpreadRef::Doc(nsi), designcraft_geom::Vec2::ZERO)?;
-                    let first = after + 1;
-                    let Some(to) = to else { return Ok(json!({"page": first})) };
-                    // Moving a page shifts the ones between; order the moves so each copy keeps
-                    // its place among the others.
-                    let n = sp.pages.len();
-                    if first < to {
-                        for k in (0..n).rev() {
-                            d.move_page(first + k, to + k)?;
-                        }
-                    } else {
-                        for k in 0..n {
-                            d.move_page(first + k, to + k)?;
-                        }
-                    }
-                    Ok(json!({"page": to}))
-                })
-            }
-        ),
-        cmd!(
-            "layout.pages.applyParent",
-            "Apply Parent to Pages…",
-            ["Layout", "Pages"],
-            None,
-            "{pages: [index], parent: id|\"A-Parent\"|\"A\"|null (null or \"[None]\" clears)}",
-            has_doc,
-            |s, p| {
-                let pages: Vec<usize> = p
-                    .get("pages")
-                    .and_then(Value::as_array)
-                    .map(|a| a.iter().filter_map(Value::as_u64).map(|v| v as usize).collect())
-                    .unwrap_or_default();
-                let parent = parent_ref("layout.pages.applyParent", &s.doc()?.doc, p.get("parent"))?.unwrap_or(None);
-                s.edit(|d, _| {
-                    d.apply_parent(&pages, parent)?;
-                    ok()
-                })
-            }
-        ),
-        cmd!("layout.parents.new", "New Parent…", ["Layout", "Pages"], None, "{prefix?, name?: \"Parent\"}", has_doc, |s, p| {
-            let name = str_param(p, "name").unwrap_or("Parent").to_string();
-            s.edit(|d, _| {
-                let prefix = str_param(p, "prefix").map(str::to_string).unwrap_or_else(|| d.next_parent_prefix());
-                let src = d.page(0).cloned();
-                let (columns, margins) =
-                    src.as_ref().map_or_else(|| (designcraft_doc::Columns::default(), Margins::uniform(36.0)), |p| (p.columns.clone(), p.margins));
-                let id = d.add_parent(&prefix, &name, columns.count, columns.gutter, margins);
-                // Dragged column guides carry over to the parent pages they still fit, mirrored
-                // on the parent page across the spine from the first page.
-                if let (Some(src), Some(sp)) = (&src, d.parents.iter_mut().find(|x| x.id == id)) {
-                    for pg in &mut std::sync::Arc::make_mut(sp).pages {
-                        let columns = pg.columns_from(src);
-                        if columns.valid_positions(pg.margin_rect().width()).is_some() {
-                            pg.columns.positions = columns.positions;
-                        }
-                    }
-                }
-                Ok(json!({"id": id.0, "prefix": prefix}))
-            })
-        }),
-        cmd!(
-            "layout.parents.delete",
-            "Delete Parent",
-            [],
-            None,
-            "{id: parent spread id} — unapply the parent and keep local overrides as ordinary items",
-            has_doc,
-            |s, p| {
-                let id = p.get("id").and_then(Value::as_u64).map(SpreadId).ok_or_else(|| bad("layout.parents.delete", "missing parent id"))?;
-                s.edit(|d, sel| {
-                    d.delete_parent(id)?;
-                    *sel = Default::default();
-                    ok()
-                })?;
-                let st = s.doc_mut()?;
-                if st.doc.parents.is_empty() {
-                    st.editing_parents = false;
-                }
-                ok()
-            }
-        ),
-        cmd!(
-            noundo "layout.parents.edit",
-            "Edit Parents",
-            [],
-            None,
-            "{on?: bool, parent?: id|\"A-Parent\"|\"A\"} — show parent spreads on the canvas; `parent` shows that parent (and implies on). Turning on without `parent` shows the first parent",
-            has_doc,
-            |s, p| {
-                const ID: &str = "layout.parents.edit";
-                let doc = s.doc()?.doc.clone();
-                let parent = match p.get("parent") {
-                    None | Some(Value::Null) => None,
-                    v => match parent_ref(ID, &doc, v)? {
-                        Some(Some(id)) => Some(id),
-                        _ => return Err(bad(ID, "`parent` names a parent to show")),
-                    },
-                };
-                let st = s.doc_mut()?;
-                let was = st.editing_parents;
-                let on = p.get("on").and_then(Value::as_bool).unwrap_or(parent.is_some() || !was);
-                st.editing_parents = on;
-                st.selection = Default::default();
-                st.bump_revision();
-                // The parent to show: the one asked for, or the first when editing starts.
-                let index = match parent {
-                    Some(id) => doc.parent_index(id),
-                    None if !was && !doc.parents.is_empty() => Some(0),
-                    None => None,
-                };
-                let shown = index.filter(|_| on);
-                if let Some(i) = shown {
-                    s.ui_requests.push(crate::UiRequest::View { params: json!({"showSpread": designcraft_doc::SpreadRef::Parent(i)}) });
-                }
-                Ok(json!({"on": on, "parent": shown.and_then(|i| doc.parents.get(i)).map(|x| x.id.0)}))
-            }
-        ),
-        cmd!(
-            "layout.parents.options",
-            "Parent Options…",
-            [],
-            None,
-            "{parent: id|\"B-Parent\"|\"B\", basedOn: id|\"A-Parent\"|\"A\"|null (= [None])} — the parent shows its base's items under its own, and so do the pages that use it → {parent, basedOn}",
-            has_doc,
-            parent_options
-        ),
-        cmd!(
-            "layout.marginsAndColumns",
-            "Margins and Columns…",
-            ["Layout"],
-            None,
-            "{pages?: [index] (default all), margins?: number|{top,bottom,inside,outside}, columns?, gutter?, adjustLayout?: bool (objects follow the margins), parent? (a parent's prefix, label or index)} — document pages take these as their own margins; with `parent` the parent's pages change instead (`pages` then indexes them), and so do the document pages without their own",
-            has_doc,
-            |s, p| {
-                let pages: Option<Vec<usize>> =
-                    p.get("pages").and_then(Value::as_array).map(|a| a.iter().filter_map(Value::as_u64).map(|v| v as usize).collect());
-                let parent = match p.get("parent") {
-                    None | Some(Value::Null) => None,
-                    Some(v) => Some(parent_spread_index(&s.doc()?.doc, v).ok_or_else(|| bad("layout.marginsAndColumns", "no such parent"))?),
-                };
-                let p = p.clone();
-                let adjust = p.get("adjustLayout").and_then(Value::as_bool).unwrap_or(false);
-                s.edit(|d, _| {
-                    let before = adjust.then(|| margin_boxes(d));
-                    if let Some(pi) = parent {
-                        let n = d.parents.get(pi).map_or(0, |sp| sp.pages.len());
-                        let sp = d.parents.get_mut(pi).map(std::sync::Arc::make_mut);
-                        if let Some(sp) = sp {
-                            for qi in pages.clone().unwrap_or_else(|| (0..n).collect()) {
-                                if let Some(pg) = sp.pages.get_mut(qi) {
-                                    set_margins_columns(pg, &p);
-                                }
-                            }
-                        }
-                        d.sync_parent_margins();
-                    } else {
-                        let all: Vec<usize> = pages.clone().unwrap_or_else(|| (0..d.page_count()).collect());
-                        for abs in all {
-                            let Some((si, pi)) = d.page_loc(abs) else { continue };
-                            let Some(pg) = d.spreads.get_mut(si).map(std::sync::Arc::make_mut).and_then(|sp| sp.pages.get_mut(pi)) else { continue };
-                            set_margins_columns(pg, &p);
-                            pg.local_margins = true;
-                        }
-                    }
-                    if let Some(b) = before {
-                        adjust_layout(d, &b);
-                    }
-                    ok()
-                })
-            }
-        ),
-        cmd!(
-            "layout.moveColumnGuide",
-            "Move Column Guide",
-            [],
-            None,
-            "{spread?, parent? (a parent's prefix, label or index: its spread instead of `spread`), page (index in the spread), gutter (0 = between the first two columns), position (the gutter's new left edge, spread x)} → {positions (each column's left and right edge from the margin box's left edge), left (where the gutter's left edge went, spread x)} — both guides of the gutter move, keeping its width, and stop at the neighbouring guides and the margins; a document page takes the result as its own columns, a parent page passes it to the pages that follow it; refused while column guides are locked",
-            column_guides_unlocked,
-            move_column_guide
-        ),
-        cmd!(
-            "layout.documentSetup",
-            "Document Setup…",
-            ["File"],
-            Some("Cmd+Alt+P"),
-            "{width?, height?, pages?: count, startPage?: n, facingPages?, binding?: leftToRight|rightToLeft, intent?: print|web|mobile, margins?: n | {top, bottom, inside, outside} (every page and parent page), bleed?, slug?: n | [top, bottom, inside, outside], adjustLayout?: bool (objects follow the new page size and margins)} → the document setup (margins: the first page's)",
-            has_doc,
-            |s, p| {
-                let p = p.clone();
-                if p.as_object().is_none_or(|o| o.is_empty()) {
-                    return Ok(document_setup(&s.doc()?.doc));
-                }
-                let edges = |k: &str| -> Option<[f64; 4]> {
-                    match p.get(k)? {
-                        Value::Array(a) if a.len() == 4 => {
-                            let v: Vec<f64> = a.iter().filter_map(Value::as_f64).map(|v| v.max(0.0)).collect();
-                            (v.len() == 4).then(|| [v[0], v[1], v[2], v[3]])
-                        }
-                        v => v.as_f64().map(|b| [b.max(0.0); 4]),
-                    }
-                };
-                let (bleed, slug) = (edges("bleed"), edges("slug"));
-                for k in ["width", "height"] {
-                    if let Some(v) = p.get(k)
-                        && !v.as_f64().is_some_and(|x| x > 0.0 && x <= 15552.0)
-                    {
-                        return Err(bad("layout.documentSetup", format!("{k}: page size out of range (0 < size ≤ 216 in)")));
-                    }
-                }
-                let margins: Option<Margins> = match p.get("margins") {
-                    None => None,
-                    Some(Value::Number(n)) => n.as_f64().map(Margins::uniform),
-                    Some(v) => serde_json::from_value(v.clone()).ok(),
-                };
-                if margins.is_some_and(|m| ![m.top, m.bottom, m.inside, m.outside].iter().all(|v| v.is_finite() && (0.0..=15552.0).contains(v))) {
-                    return Err(bad("layout.documentSetup", "margins: 0 to 216 in"));
-                }
-                if p.get("margins").is_some() && margins.is_none() {
-                    return Err(bad("layout.documentSetup", "margins: a number or {top, bottom, inside, outside}"));
-                }
-                let intent: Option<designcraft_doc::Intent> = p.get("intent").and_then(|v| serde_json::from_value(v.clone()).ok());
-                let pages = p.get("pages").and_then(Value::as_u64).map(|n| n.clamp(1, 9999) as usize);
-                let adjust = p.get("adjustLayout").and_then(Value::as_bool).unwrap_or(false);
-                s.edit(|d, _| {
-                    let before = adjust.then(|| margin_boxes(d));
-                    if let Some(f) = p.get("facingPages").and_then(Value::as_bool) {
-                        d.settings.facing_pages = f;
-                    }
-                    if let Some(b) = p.get("binding").and_then(Value::as_str) {
-                        d.settings.right_to_left_binding = b == "rightToLeft";
-                        d.order_parent_pages();
-                    }
-                    if let Some(b) = bleed {
-                        d.settings.bleed = b;
-                    }
-                    if let Some(b) = slug {
-                        d.settings.slug = b;
-                    }
-                    if let Some(i) = intent {
-                        d.settings.intent = i;
-                    }
-                    if let Some(n) = p.get("startPage").map(|v| start_number("layout.documentSetup", "startPage", v)).transpose()? {
-                        if !d.sections.iter().any(|x| x.start == 0) {
-                            d.sections.insert(
-                                0,
-                                designcraft_doc::Section {
-                                    start: 0,
-                                    start_number: None,
-                                    style: Default::default(),
-                                    prefix: String::new(),
-                                    marker: String::new(),
-                                    include_prefix: false,
-                                },
-                            );
-                        }
-                        if let Some(first) = d.sections.iter_mut().find(|x| x.start == 0) {
-                            first.start_number = Some(n);
-                        }
-                    }
-                    // Number of Pages: add at the end (with the last page's parent) or remove from the end.
-                    if let Some(n) = pages {
-                        let have = d.page_count();
-                        if n > have {
-                            let parent = d.page_loc(have - 1).and_then(|(si, pi)| d.spreads[si].pages[pi].parent);
-                            d.insert_pages(Some(have - 1), n - have, parent)?;
-                        } else if n < have {
-                            d.delete_pages(&(n..have).collect::<Vec<_>>())?;
-                        }
-                    }
-                    let w = p.get("width").and_then(Value::as_f64);
-                    let h = p.get("height").and_then(Value::as_f64);
-                    // Pages with a liquid rule re-flow their objects (Adjust Layout aside).
-                    let liquid_before: Vec<(usize, usize, designcraft_geom::Rect)> = if adjust {
-                        vec![]
-                    } else {
-                        d.spreads
-                            .iter()
-                            .enumerate()
-                            .flat_map(|(si, sp)| {
-                                sp.pages.iter().enumerate().filter(|(_, pg)| !pg.liquid.is_off()).map(move |(pi, pg)| (si, pi, pg.bounds()))
-                            })
-                            .collect()
-                    };
-                    if w.is_some() || h.is_some() {
-                        d.settings.page_width = w.unwrap_or(d.settings.page_width);
-                        d.settings.page_height = h.unwrap_or(d.settings.page_height);
-                        for sp in d.spreads.iter_mut().chain(d.parents.iter_mut()) {
-                            let sp = std::sync::Arc::make_mut(sp);
-                            for pg in &mut sp.pages {
-                                set_page_width(pg, d.settings.page_width);
-                                pg.height = d.settings.page_height;
-                            }
-                            sp.relayout();
-                        }
-                    }
-                    if let Some(m) = margins {
-                        for sp in d.spreads.iter_mut().chain(d.parents.iter_mut()) {
-                            for pg in &mut std::sync::Arc::make_mut(sp).pages {
-                                pg.margins = m;
-                            }
-                        }
-                        // Pages that now match their parent page follow its later changes; local
-                        // columns stay local.
-                        d.unmark_matching_local_margins();
-                        d.sync_parent_margins();
-                    }
-                    d.repaginate();
-                    if let Some(b) = before {
-                        adjust_layout(d, &b);
-                    }
-                    for (si, pi, old) in liquid_before {
-                        super::liquid::apply(d, designcraft_doc::SpreadRef::Doc(si), pi, old);
-                    }
-                    Ok(document_setup(d))
-                })
-            }
-        ),
-        cmd!(
-            "layout.pages.toSpread",
-            "Add Page to Spread",
-            ["Layout", "Pages"],
-            None,
-            "{page (1-based), spread (0-based)} — the page joins that spread (up to 10 pages; the spread stops shuffling)",
-            has_doc,
-            |s, p| {
-                let page =
-                    p.get("page").and_then(Value::as_u64).filter(|n| *n >= 1).ok_or_else(|| bad("layout.pages.toSpread", "missing page"))? as usize;
-                let spread = p.get("spread").and_then(Value::as_u64).ok_or_else(|| bad("layout.pages.toSpread", "missing spread"))? as usize;
-                s.edit(|d, _| {
-                    d.page_to_spread(page - 1, spread)?;
-                    Ok(json!({"spreads": d.spreads.len()}))
-                })
-            }
-        ),
-        cmd!(
-            "layout.spreadShuffle",
-            "Allow Selected Spread to Shuffle",
-            ["Layout", "Pages"],
-            None,
-            "{spread (0-based), allow: bool} — off keeps the spread's pages together when pages are added or removed",
-            has_doc,
-            |s, p| {
-                let si = p.get("spread").and_then(Value::as_u64).unwrap_or(0) as usize;
-                let allow = p.get("allow").and_then(Value::as_bool).unwrap_or(true);
-                s.edit(|d, _| {
-                    let sp = d.spreads.get_mut(si).ok_or_else(|| bad("layout.spreadShuffle", "no such spread"))?;
-                    std::sync::Arc::make_mut(sp).allow_shuffle = allow;
-                    if allow {
-                        d.repaginate();
-                    }
-                    ok()
-                })
-            }
-        ),
-        cmd!(
-            "layout.pageSize",
-            "Page Size",
-            [],
-            None,
-            "{pages: [1-based page numbers], width?, height?, preset?: \"A4\"|\"Letter\"|…, anchor?: 0–8 (reference point that stays put, row-major from the top-left; default 0)} — pages of their own size (Page tool); objects keep their place relative to the anchor, or follow the page's liquid rule",
-            has_doc,
-            page_size
-        ),
-        cmd!(
-            "layout.pageOptions",
-            "Page Options",
-            [],
-            None,
-            "{pages: [1-based], showParentOverlay?: bool} — Page tool options (Show Parent Page Overlay: the parent page's size drawn over the page)",
-            has_doc,
-            page_options
-        ),
-        cmd!(
-            noundo "layout.selectPage",
-            "Select Page",
-            [],
-            None,
-            "{page: 1-based | null, ids?: [item ids] (objects selected with it: the Page tool on an object-based page)} — the page the Page tool selects (its handles, the Control panel)",
-            has_doc,
-            |s, p| {
-            let n = s.doc()?.doc.page_count();
-            let page = match p.get("page") {
-                None | Some(Value::Null) => None,
-                Some(v) => Some(v.as_u64().filter(|v| *v >= 1 && *v as usize <= n).ok_or_else(|| bad("layout.selectPage", format!("`page`: 1–{n}")))? as usize - 1),
-            };
-            let ids: Vec<designcraft_doc::ItemId> = {
-                let d = &s.doc()?.doc;
-                p.get("ids")
-                    .and_then(Value::as_array)
-                    .map(|a| a.iter().filter_map(Value::as_u64).map(designcraft_doc::ItemId).filter(|id| d.item(*id).is_some()).collect())
-                    .unwrap_or_default()
-            };
-            let st = s.doc_mut()?;
-            if page.is_some() {
-                st.selection = designcraft_doc::Selection::items(ids);
-            }
-            st.selection.page = page;
-            st.bump_revision();
-            Ok(json!({"page": page.map(|p| p + 1)}))
-        }
-        ),
-        cmd!(
-            "layout.section",
-            "Numbering & Section Options…",
-            ["Layout"],
-            None,
-            "{page (1-based; starts a section there), startNumber?: n (1–99999)|null (continue), style?: arabic|upperRoman|lowerRoman|upperLetters|lowerLetters|arabicLeadingZero|arabicThreeDigits|arabicFourDigits|kanji, prefix? (up to 8 characters; no + or comma), includePrefix?, marker?, remove?: bool}",
-            has_doc,
-            |s, p| {
-                let edit = SectionEdit::parse("layout.section", s, p)?;
-                s.edit(|d, _| {
-                    edit.apply(d);
-                    Ok(json!({"names": (0..d.page_count()).map(|i| d.page_name(i)).collect::<Vec<_>>()}))
-                })
-            }
-        ),
-        cmd!(
-            "layout.chapterNumbering",
-            "Document Chapter Numbering",
-            [],
-            None,
-            "{style?: arabic|upperRoman|lowerRoman|upperLetters|lowerLetters|arabicLeadingZero|arabicThreeDigits|arabicFourDigits, start?: n (Start Chapter Numbering at), source?: automatic|userDefined|sameAsPrevious} → {chapterNumber, label, style, source, book: the open book holding the document, or null}; no parameters reports the setting",
-            has_doc,
-            |s, p| {
-                if p.as_object().is_none_or(|o| o.is_empty()) {
-                    return chapter_numbering(s);
-                }
-                let edit = ChapterEdit::parse("layout.chapterNumbering", p)?;
-                s.edit(|d, _| {
-                    edit.apply(d);
-                    ok()
-                })?;
-                chapter_numbering(s)
-            }
-        ),
-        cmd!(
-            "layout.numberingOptions",
-            "Apply Numbering & Section Options",
-            [],
-            None,
-            "{page, …the settings as layout.section, chapter?: {…the settings as layout.chapterNumbering}} — the section and the document's chapter numbering in one undo step; if either is refused nothing changes",
-            has_doc,
-            |s, p| {
-                let section = SectionEdit::parse("layout.numberingOptions", s, p)?;
-                let chapter = match p.get("chapter") {
-                    Some(c) => Some(ChapterEdit::parse("layout.numberingOptions", c)?),
-                    None => None,
-                };
-                s.edit(|d, _| {
-                    section.apply(d);
-                    if let Some(chapter) = &chapter {
-                        chapter.apply(d);
-                    }
-                    Ok(json!({"names": (0..d.page_count()).map(|i| d.page_name(i)).collect::<Vec<_>>(), "chapter": d.chapter_label()}))
-                })
-            }
-        ),
-        cmd!("layer.move", "Move Layer", [], None, "{id, to: index (0 = top/frontmost)}", has_doc, |s, p| {
-            let id = LayerId(p.get("id").and_then(Value::as_u64).ok_or_else(|| bad("layer.move", "missing id"))?);
-            let to = p.get("to").and_then(Value::as_u64).ok_or_else(|| bad("layer.move", "missing to"))?;
-            s.edit(|d, _| {
-                let i = d.layers.iter().position(|l| l.id == id).ok_or_else(|| bad("layer.move", "no such layer"))?;
-                let to = usize::try_from(to).ok().filter(|t| *t < d.layers.len()).ok_or_else(|| bad("layer.move", "to out of range"))?;
-                let l = d.layers.remove(i);
-                d.layers.insert(to, l);
-                ok()
-            })
-        }),
-        cmd!(noundo "layer.selectItems", "Select All on Layer", [], None, "{id}", has_doc, |s, p| {
-            let id = LayerId(p.get("id").and_then(Value::as_u64).unwrap_or(0));
-            let st = s.doc_mut()?;
-            let ids: Vec<_> = st.doc.spreads.iter().flat_map(|sp| sp.items.iter().filter(|i| i.layer == id && !i.locked).map(|i| i.id)).collect();
-            st.selection = designcraft_doc::Selection::items(ids);
-            st.bump_revision();
-            ok()
-        }),
-        cmd!("layer.new", "New Layer…", [], None, "{name?}", has_doc, |s, p| {
-            let name = str_param(p, "name").map(str::to_string);
-            let r = s.edit(|d, _| {
-                let id = LayerId(d.alloc());
-                let n = d.layers.len();
-                let name = name.clone().unwrap_or_else(|| format!("Layer {}", n + 1));
-                d.layers.insert(
-                    0,
-                    Layer {
-                        id,
-                        name,
-                        color: LAYER_COLORS[n % LAYER_COLORS.len()].1,
-                        visible: true,
-                        locked: false,
-                        printable: true,
-                        show_guides: true,
-                        suppress_wrap_when_hidden: false,
-                    },
-                );
-                Ok(id)
-            })?;
-            s.doc_mut()?.active_layer = r;
-            Ok(json!({"id": r.0}))
-        }),
-        cmd!(
-            "layer.set",
-            "Layer Options…",
-            [],
-            None,
-            "{id, name?, color?: [r,g,b] | layer colour name (\"Light Blue\", \"Red\", …), visible?, locked?, printable?, showGuides?, suppressWrapWhenHidden?} — names are unique and not empty",
-            has_doc,
-            set_layer
-        ),
-        cmd!("layer.delete", "Delete Layer", [], None, "{id}", has_doc, |s, p| {
-            let id = LayerId(p.get("id").and_then(Value::as_u64).unwrap_or(0));
-            s.edit(|d, sel| {
-                if d.layers.len() < 2 {
-                    return Err(bad("layer.delete", "a document needs at least one layer"));
-                }
-                let doomed: Vec<_> =
-                    d.spreads.iter().chain(d.parents.iter()).flat_map(|sp| sp.items.iter().filter(|i| i.layer == id).map(|i| i.id)).collect();
-                for i in doomed {
-                    let _ = d.remove_item(i);
-                }
-                d.layers.retain(|l| l.id != id);
-                *sel = Default::default();
-                ok()
-            })
-        }),
-        cmd!(
-            "layer.merge",
-            "Merge Layers",
-            [],
-            None,
-            "{ids: [layer ids], into?: layer id (default: the first)} — their objects move to `into`, the other layers are deleted",
-            has_doc,
-            |s, p| {
-                let ids: Vec<LayerId> =
-                    p.get("ids").and_then(Value::as_array).map(|a| a.iter().filter_map(Value::as_u64).map(LayerId).collect()).unwrap_or_default();
-                let into = p
-                    .get("into")
-                    .and_then(Value::as_u64)
-                    .map(LayerId)
-                    .or_else(|| ids.first().copied())
-                    .ok_or_else(|| bad("layer.merge", "no layers"))?;
-                s.edit(|d, _| {
-                    if d.layer(into).is_none() || ids.iter().any(|l| d.layer(*l).is_none()) {
-                        return Err(bad("layer.merge", "no such layer"));
-                    }
-                    let gone: Vec<LayerId> = ids.iter().copied().filter(|l| *l != into).collect();
-                    for sp in d.spreads.iter_mut().chain(d.parents.iter_mut()) {
-                        if !sp.items.iter().any(|i| gone.contains(&i.layer)) {
-                            continue;
-                        }
-                        for it in &mut std::sync::Arc::make_mut(sp).items {
-                            if gone.contains(&it.layer) {
-                                std::sync::Arc::make_mut(it).layer = into;
-                            }
-                        }
-                    }
-                    d.layers.retain(|l| !gone.contains(&l.id));
-                    Ok(json!({"merged": gone.len()}))
-                })
-            }
-        ),
-        cmd!("layer.deleteUnused", "Delete Unused Layers", [], None, "{} — layers without objects (one layer always stays)", has_doc, |s, _| {
-            s.edit(|d, _| {
-                let used: std::collections::HashSet<LayerId> =
-                    d.spreads.iter().chain(d.parents.iter()).flat_map(|sp| sp.items.iter().map(|i| i.layer)).collect();
-                let before = d.layers.len();
-                if used.is_empty() {
-                    // Nothing anywhere: keep the first layer.
-                    d.layers.truncate(1);
-                } else {
-                    d.layers.retain(|l| used.contains(&l.id));
-                }
-                Ok(json!({"deleted": before - d.layers.len()}))
-            })
-        }),
-        cmd!(
-            "layer.others",
-            "Hide/Lock Others",
-            [],
-            None,
-            "{id, hide?: bool, lock?: bool, show?: true (Show All Layers), unlock?: true (Unlock All Layers)} — Hide Others / Lock Others act on every layer but `id`",
-            has_doc,
-            |s, p| {
-                let id = LayerId(p.get("id").and_then(Value::as_u64).unwrap_or(0));
-                let f = |k: &str| p.get(k).and_then(Value::as_bool).unwrap_or(false);
-                let (hide, lock, show, unlock) = (f("hide"), f("lock"), f("show"), f("unlock"));
-                s.edit(|d, _| {
-                    for l in &mut d.layers {
-                        if show {
-                            l.visible = true;
-                        }
-                        if unlock {
-                            l.locked = false;
-                        }
-                        if l.id != id {
-                            if hide {
-                                l.visible = false;
-                            }
-                            if lock {
-                                l.locked = true;
-                            }
-                        }
-                    }
-                    ok()
-                })
-            }
-        ),
-        cmd!(noundo "layer.activate", "Set Active Layer", [], None, "{id}", has_doc, |s, p| {
-            let id = LayerId(p.get("id").and_then(Value::as_u64).unwrap_or(0));
-            let st = s.doc_mut()?;
-            if st.doc.layer(id).is_none() {
-                return Err(bad("layer.activate", "no such layer"));
-            }
-            st.active_layer = id;
-            st.bump_revision();
-            ok()
-        }),
-    ]
-}
-
-/// Column guides can be dragged: a document is open and View › Grids & Guides › Lock Column
-/// Guides is off.
-fn column_guides_unlocked(s: &Session) -> std::result::Result<(), String> {
-    has_doc(s)?;
-    match s.active() {
-        Some(st) if st.doc.settings.column_guides_locked => Err("column guides are locked (View › Grids & Guides › Lock Column Guides)".into()),
-        _ => Ok(()),
-    }
-}
-
-/// A column guide dragged with the Selection tool: gutter `gutter` of a page moves to `position`.
-fn move_column_guide(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "layout.moveColumnGuide";
-    let index = |key: &str| -> Result<usize> {
-        let v = p.get(key).ok_or_else(|| bad(CMD, format!("missing `{key}`")))?;
-        v.as_u64().and_then(|n| usize::try_from(n).ok()).ok_or_else(|| bad(CMD, format!("`{key}` must be a non-negative integer")))
-    };
-    let (page, gutter) = (index("page")?, index("gutter")?);
-    let position =
-        p.get("position").and_then(Value::as_f64).filter(|v| v.is_finite()).ok_or_else(|| bad(CMD, "`position` must be a finite number"))?;
-    let r = match p.get("parent") {
-        None | Some(Value::Null) => super::spread_param(p, CMD)?,
-        Some(v) => designcraft_doc::SpreadRef::Parent(parent_spread_index(&s.doc()?.doc, v).ok_or_else(|| bad(CMD, "no such parent"))?),
-    };
-    s.edit(|d, _| {
-        if d.settings.column_guides_locked {
-            return Err(bad(CMD, "column guides are locked"));
-        }
-        let pg = d.spread_mut(r).ok_or_else(|| bad(CMD, "no such spread"))?.pages.get_mut(page).ok_or_else(|| bad(CMD, "no such page"))?;
-        let m = pg.margin_rect();
-        let count = pg.columns.count;
-        if gutter.checked_add(1).is_none_or(|g| g >= count as usize) {
-            return Err(bad(CMD, format!("the page has {} gutters", count.saturating_sub(1))));
-        }
-        let positions =
-            pg.columns.with_gutter_moved(m.width(), gutter, position - m.x0).ok_or_else(|| bad(CMD, "the columns cannot take that position"))?;
-        let left = positions.get(gutter * 2 + 1).map_or(position, |v| m.x0 + v);
-        pg.columns.positions = Some(positions.clone());
-        match r {
-            designcraft_doc::SpreadRef::Doc(_) => pg.local_margins = true,
-            designcraft_doc::SpreadRef::Parent(_) => d.sync_parent_margins(),
-        }
-        Ok(json!({"positions": positions, "left": left}))
-    })
-}
-
-/// A parent spread named by prefix, label (`A-Parent`) or index.
-fn parent_spread_index(d: &designcraft_doc::Document, v: &Value) -> Option<usize> {
-    match v {
-        Value::Number(n) => n.as_u64().and_then(|i| usize::try_from(i).ok()).filter(|i| *i < d.parents.len()),
-        Value::String(s) => d.parents.iter().position(|p| p.parent.as_ref().is_some_and(|i| i.prefix == *s || i.label() == *s)),
-        _ => None,
-    }
-}
-
-/// A parent named by a command parameter: its id (a number), its full label (`"A-Parent"`), or
-/// its prefix (`"A"`) when only one parent has it. `null` or `"[None]"` → `Some(None)` (no parent);
-/// missing → `None` (the command's default). Unknown or ambiguous names are errors, so a typo never
-/// clears a page's parent.
-fn parent_ref(cmd: &str, d: &designcraft_doc::Document, v: Option<&Value>) -> Result<Option<Option<SpreadId>>> {
-    let Some(v) = v else { return Ok(None) };
-    match v {
-        Value::Null => Ok(Some(None)),
-        Value::String(s) if s == "[None]" => Ok(Some(None)),
-        Value::Number(n) => {
-            let id = n.as_u64().ok_or_else(|| bad(cmd, format!("no parent with id {n}")))?;
-            d.parents.iter().find(|p| p.id.0 == id).map(|p| Some(Some(p.id))).ok_or_else(|| bad(cmd, format!("no parent with id {id}")))
-        }
-        Value::String(s) => {
-            let by = |f: &dyn Fn(&designcraft_doc::ParentInfo) -> bool| -> Vec<SpreadId> {
-                d.parents.iter().filter(|p| p.parent.as_ref().is_some_and(f)).map(|p| p.id).collect()
-            };
-            let mut hits = by(&|i| i.label() == *s);
-            if hits.is_empty() {
-                hits = by(&|i| i.prefix == *s);
-            }
-            match hits.as_slice() {
-                [id] => Ok(Some(Some(*id))),
-                [] => Err(bad(cmd, format!("no parent named `{s}`"))),
-                _ => Err(bad(cmd, format!("more than one parent is named `{s}`: give its id"))),
-            }
-        }
-        _ => Err(bad(cmd, "`parent` is a parent id, a parent name or null")),
-    }
-}
-
-/// Layout › Pages › Parent Options: Based on Parent. A base that would make a cycle is refused.
-fn parent_options(s: &mut crate::Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "layout.parents.options";
-    let d = &s.doc()?.doc;
-    let Some(Some(id)) = parent_ref(CMD, d, p.get("parent"))? else { return Err(bad(CMD, "`parent` names the parent to change")) };
-    let pi = d.parent_index(id).ok_or_else(|| bad(CMD, format!("no parent with id {}", id.0)))?;
-    let base = parent_ref(CMD, d, p.get("basedOn"))?.ok_or_else(|| bad(CMD, "missing `basedOn` (a parent, or null for [None])"))?;
-    let label = |d: &designcraft_doc::Document, i: usize| d.parents.get(i).and_then(|x| x.parent.as_ref()).map(|i| i.label());
-    if let Some(b) = base
-        && d.parent_base_cycles(pi, b)
-    {
-        let (name, b) = (label(d, pi).unwrap_or_default(), d.parent_index(b).and_then(|i| label(d, i)).unwrap_or_default());
-        return Err(bad(CMD, format!("{name} cannot be based on {b}: that would make a cycle")));
-    }
-    let out = json!({"parent": label(d, pi), "basedOn": base.and_then(|b| d.parent_index(b)).and_then(|i| label(d, i))});
-    if d.parents.get(pi).and_then(|x| x.parent.as_ref()).and_then(|i| i.based_on) == base {
-        return Ok(out);
-    }
-    s.edit(|d, _| {
-        let info = d.parents.get_mut(pi).map(std::sync::Arc::make_mut).and_then(|x| x.parent.as_mut()).ok_or_else(|| bad(CMD, "no such parent"))?;
-        info.based_on = base;
-        Ok(out)
-    })
-}
-
-#[allow(dead_code)]
-fn _r(_: Result<()>) {}
-
-/// Layout › Page Size (the Page tool): resize pages one by one. Left pages grow to the left
-/// (the spine stays put); objects move with their page.
-fn page_size(s: &mut crate::Session, p: &Value) -> Result<Value> {
-    let pages: Vec<usize> =
-        p.get("pages").and_then(Value::as_array).map(|a| a.iter().filter_map(Value::as_u64).map(|n| n as usize).collect()).unwrap_or_default();
-    let n = s.doc()?.doc.page_count();
-    if pages.is_empty() || pages.iter().any(|x| *x == 0 || *x > n) {
-        return Err(bad("layout.pageSize", "give `pages` (1-based)"));
-    }
-    let (mut w, mut h) = (p.get("width").and_then(Value::as_f64), p.get("height").and_then(Value::as_f64));
-    if let Some(name) = str_param(p, "preset") {
-        let pr = designcraft_doc::build::PRESETS
-            .iter()
-            .find(|x| x.name.eq_ignore_ascii_case(name))
-            .ok_or_else(|| bad("layout.pageSize", format!("no preset `{name}`")))?;
-        w = Some(pr.width);
-        h = Some(pr.height);
-    }
-    let anchor = match p.get("anchor") {
-        None | Some(Value::Null) => 0,
-        Some(v) => v.as_u64().filter(|a| *a <= 8).ok_or_else(|| bad("layout.pageSize", "`anchor`: 0–8"))? as usize,
-    };
-    s.edit(|d, _| {
-        resize_pages_from(d, &pages, w, h, anchor);
-        Ok(json!({"pages": pages.len()}))
-    })
-}
-
-fn page_options(s: &mut crate::Session, p: &Value) -> Result<Value> {
-    let pages: Vec<usize> =
-        p.get("pages").and_then(Value::as_array).map(|a| a.iter().filter_map(Value::as_u64).map(|n| n as usize).collect()).unwrap_or_default();
-    let n = s.doc()?.doc.page_count();
-    if pages.is_empty() || pages.iter().any(|x| *x == 0 || *x > n) {
-        return Err(bad("layout.pageOptions", "give `pages` (1-based)"));
-    }
-    let overlay = p.get("showParentOverlay").and_then(Value::as_bool);
-    s.edit(|d, _| {
-        for page in &pages {
-            let Some((si, pi)) = d.page_loc(page - 1) else { continue };
-            let pg = &mut std::sync::Arc::make_mut(&mut d.spreads[si]).pages[pi];
-            if let Some(v) = overlay {
-                pg.show_parent_overlay = v;
-            }
-        }
-        Ok(json!({"pages": pages.len()}))
-    })
-}
-
-/// Give `pages` (1-based) their own size. Objects stay on their page; pages with a liquid rule
-/// re-flow their objects by it.
-pub(crate) fn resize_pages(d: &mut designcraft_doc::Document, pages: &[usize], w: Option<f64>, h: Option<f64>) {
-    resize_pages_from(d, pages, w, h, 0);
-}
-
-/// [`resize_pages`] keeping reference point `anchor` (0–8, row-major from the top-left) in place:
-/// the page grows away from it, so objects keep their place relative to it.
-pub(crate) fn resize_pages_from(d: &mut designcraft_doc::Document, pages: &[usize], w: Option<f64>, h: Option<f64>, anchor: usize) {
-    let (fx, fy) = ((anchor % 3) as f64 / 2.0, (anchor / 3).min(2) as f64 / 2.0);
-    {
-        for page in pages {
-            let Some((si, pi)) = d.page_loc(page - 1) else { continue };
-            let sp = std::sync::Arc::make_mut(&mut d.spreads[si]);
-            let old: Vec<f64> = sp.pages.iter().map(|x| x.x).collect();
-            let old_bounds = sp.pages[pi].bounds();
-            // The page's own objects (outer pages take the pasteboard beside them).
-            let last = sp.pages.len() - 1;
-            let (lo, hi) = (if pi == 0 { f64::NEG_INFINITY } else { old_bounds.x0 }, if pi == last { f64::INFINITY } else { old_bounds.x1 });
-            let own: Vec<usize> = sp
-                .items
-                .iter()
-                .enumerate()
-                .filter(|(_, it)| {
-                    let c = it.bounds().center().x;
-                    c >= lo && c < hi
-                })
-                .map(|(i, _)| i)
-                .collect();
-            let pg = &mut sp.pages[pi];
-            let dw = w.map_or(0.0, |w| w.max(1.0) - pg.width);
-            let dh = h.map_or(0.0, |h| h.max(1.0) - pg.height);
-            if let Some(w) = w {
-                set_page_width(pg, w.max(1.0));
-            }
-            if let Some(h) = h {
-                pg.height = h.max(1.0);
-            }
-            let left = pg.side == designcraft_doc::PageSide::Left;
-            sp.relayout();
-            // Keep the spine: shift the whole spread back when a left page grows.
-            if left && dw != 0.0 {
-                for q in &mut sp.pages {
-                    q.x -= dw;
-                }
-            }
-            let new: Vec<f64> = sp.pages.iter().map(|x| x.x).collect();
-            // Objects follow their page.
-            let shifts: Vec<(f64, f64, f64)> =
-                sp.pages.iter().enumerate().map(|(k, q)| (old[k], old[k] + q.width - if k == pi { dw } else { 0.0 }, new[k] - old[k])).collect();
-            for it in &mut sp.items {
-                let cx = it.bounds().center().x;
-                if let Some((_, _, dx)) = shifts.iter().find(|(a, b, _)| cx >= *a && cx < *b)
-                    && *dx != 0.0
-                {
-                    let it = std::sync::Arc::make_mut(it);
-                    it.xf = designcraft_geom::Affine::translate((*dx, 0.0)) * it.xf;
-                }
-            }
-            // Page guides move with their page.
-            for (k, q) in sp.pages.iter_mut().enumerate() {
-                let dx = new[k] - old[k];
-                if dx != 0.0 {
-                    for g in q.guides.iter_mut().filter(|g| g.orientation == designcraft_doc::Orientation::Vertical) {
-                        g.position += dx;
-                    }
-                }
-            }
-            // Growing away from the anchor: the page's objects and guides keep their place
-            // relative to it.
-            let shift = designcraft_geom::Vec2::new(fx * dw, fy * dh);
-            if shift != designcraft_geom::Vec2::ZERO {
-                for i in &own {
-                    if let Some(it) = sp.items.get_mut(*i) {
-                        let it = std::sync::Arc::make_mut(it);
-                        it.xf = designcraft_geom::Affine::translate(shift) * it.xf;
-                    }
-                }
-                for g in &mut sp.pages[pi].guides {
-                    g.position += if g.orientation == designcraft_doc::Orientation::Vertical { shift.x } else { shift.y };
-                }
-            }
-            // Liquid rules: objects were carried along with the page's left edge (and the anchor).
-            let moved = old_bounds + designcraft_geom::Vec2::new(new[pi] - old[pi], 0.0) + shift;
-            super::liquid::apply(d, designcraft_doc::SpreadRef::Doc(si), pi, moved);
-        }
-    }
-}
-
-/// File › Document Setup values.
-fn document_setup(d: &designcraft_doc::Document) -> Value {
-    let st = &d.settings;
-    let start = d.sections.iter().find(|x| x.start == 0).and_then(|x| x.start_number).unwrap_or(1);
-    json!({"width": st.page_width, "height": st.page_height, "pages": d.page_count(), "startPage": start, "facingPages": st.facing_pages,
-        "binding": if st.right_to_left_binding { "rightToLeft" } else { "leftToRight" }, "intent": st.intent, "bleed": st.bleed, "slug": st.slug,
-        "margins": d.page(0).map(|p| p.margins), "primaryTextFrame": st.primary_text_frame})
-}
-
-/// The largest chapter number (as for page numbers).
-const MAX_CHAPTER: u64 = designcraft_doc::MAX_PAGE_NUMBER as u64;
-
-/// A `layout.section` edit, checked before the document changes.
-struct SectionEdit {
-    /// Absolute index of the section's first page.
-    start: usize,
-    remove: bool,
-    /// Some(None): continue from the previous section.
-    start_number: Option<Option<u32>>,
-    style: Option<designcraft_doc::NumberStyle>,
-    prefix: Option<String>,
-    include_prefix: Option<bool>,
-    marker: Option<String>,
-}
-
-impl SectionEdit {
-    fn parse(cmd: &str, s: &Session, p: &Value) -> Result<Self> {
-        let page = p.get("page").and_then(Value::as_u64).ok_or_else(|| bad(cmd, "missing page"))?;
-        let n = s.doc()?.doc.page_count() as u64;
-        if page == 0 || page > n {
-            return Err(bad(cmd, format!("no page {page}")));
-        }
-        let prefix = p.get("prefix").and_then(Value::as_str).map(str::to_string);
-        if prefix.as_ref().is_some_and(|x| x.chars().count() > 8 || x.contains(['+', ','])) {
-            return Err(bad(cmd, "section prefix: up to 8 characters, without + or ,"));
-        }
-        let start_number = match p.get("startNumber") {
-            None => None,
-            Some(Value::Null) => Some(None),
-            Some(v) => Some(Some(start_number(cmd, "startNumber", v)?)),
-        };
-        let style = match p.get("style") {
-            None => None,
-            Some(v) => match serde_json::from_value(v.clone()) {
-                Ok(designcraft_doc::NumberStyle::Symbols) => return Err(bad(cmd, "symbols don't number pages")),
-                Ok(style) => Some(style),
-                Err(e) => return Err(bad(cmd, e.to_string())),
-            },
-        };
-        Ok(SectionEdit {
-            start: (page - 1) as usize,
-            remove: p.get("remove").and_then(Value::as_bool).unwrap_or(false),
-            start_number,
-            style,
-            prefix,
-            include_prefix: p.get("includePrefix").and_then(Value::as_bool),
-            marker: p.get("marker").and_then(Value::as_str).map(str::to_string),
-        })
-    }
-
-    fn apply(&self, d: &mut designcraft_doc::Document) {
-        let start = self.start;
-        // Page 1 always starts a section.
-        if self.remove && start != 0 {
-            d.sections.retain(|x| x.start != start);
-            // The pages after it follow the previous section's numbers again.
-            d.repaginate();
-            return;
-        }
-        let mut sec = d.sections.iter().find(|x| x.start == start).cloned().unwrap_or(designcraft_doc::Section {
-            start,
-            start_number: None,
-            style: Default::default(),
-            prefix: String::new(),
-            marker: String::new(),
-            include_prefix: false,
-        });
-        if let Some(n) = self.start_number {
-            sec.start_number = n;
-        }
-        if let Some(style) = self.style {
-            sec.style = style;
-        }
-        if let Some(prefix) = &self.prefix {
-            sec.prefix = prefix.clone();
-        }
-        if let Some(on) = self.include_prefix {
-            sec.include_prefix = on;
-        }
-        if let Some(marker) = &self.marker {
-            sec.marker = marker.clone();
-        }
-        d.sections.retain(|x| x.start != start);
-        d.sections.push(sec);
-        d.sections.sort_by_key(|x| x.start);
-        // Facing pages take their sides from their numbers: odd on the right.
-        d.repaginate();
-    }
-}
-
-/// A `layout.chapterNumbering` edit, checked before the document changes.
-struct ChapterEdit {
-    style: Option<designcraft_doc::NumberStyle>,
-    source: Option<designcraft_doc::ChapterSource>,
-    start: Option<u32>,
-}
-
-impl ChapterEdit {
-    fn parse(cmd: &str, p: &Value) -> Result<Self> {
-        let style = match p.get("style") {
-            Some(v) => match serde_json::from_value::<designcraft_doc::NumberStyle>(v.clone()) {
-                Ok(designcraft_doc::NumberStyle::Symbols) | Err(_) => return Err(bad(cmd, format!("unknown chapter style {v}"))),
-                Ok(style) => Some(style),
-            },
-            None => None,
-        };
-        let mut source = match p.get("source") {
-            Some(v) => Some(
-                serde_json::from_value::<designcraft_doc::ChapterSource>(v.clone())
-                    .map_err(|_| bad(cmd, format!("unknown chapter number source {v}")))?,
-            ),
-            None => None,
-        };
-        let start = match p.get("start") {
-            Some(v) => {
-                Some(v.as_u64().filter(|n| (1..=MAX_CHAPTER).contains(n)).ok_or_else(|| bad(cmd, format!("chapter start: 1 to {MAX_CHAPTER}")))?
-                    as u32)
-            }
-            None => None,
-        };
-        // A start number alone means Start Chapter Numbering at.
-        if start.is_some() && source.is_none() {
-            source = Some(designcraft_doc::ChapterSource::UserDefined);
-        }
-        Ok(ChapterEdit { style, source, start })
-    }
-
-    fn apply(&self, d: &mut designcraft_doc::Document) {
-        if let Some(style) = self.style {
-            d.settings.chapter_style = style;
-        }
-        if let Some(source) = self.source {
-            d.settings.chapter_source = source;
-        }
-        if let Some(n) = self.start {
-            d.settings.chapter_number = n;
-        }
-    }
-}
-
-/// The active document's chapter numbering, and the open book that holds it (what
-/// `layout.chapterNumbering {}` reports, read without running a command).
-pub fn chapter_numbering(s: &Session) -> Result<Value> {
-    let st = s.doc()?;
-    let set = &st.doc.settings;
-    let book = s
-        .book
-        .as_ref()
-        .filter(|b| st.path.as_deref().is_some_and(|p| b.documents.iter().any(|d| std::path::Path::new(d) == std::path::Path::new(p))))
-        .map(|b| std::path::Path::new(&b.path).file_stem().map_or_else(|| b.path.clone(), |n| n.to_string_lossy().to_string()));
-    Ok(
-        json!({"chapterNumber": set.chapter_number.max(1), "label": st.doc.chapter_label(), "style": set.chapter_style, "source": set.chapter_source, "book": book}),
-    )
-}
-
-/// Layer Options: every field in one undo step; a bad name or colour changes nothing.
-fn set_layer(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "layer.set";
-    let id = LayerId(p.get("id").and_then(Value::as_u64).ok_or_else(|| bad(ID, "missing id"))?);
-    let name = match p.get("name") {
-        Some(v) => Some(v.as_str().map(str::trim).filter(|n| !n.is_empty()).ok_or_else(|| bad(ID, "a layer needs a name"))?.to_string()),
-        None => None,
-    };
-    let color: Option<[u8; 3]> = match p.get("color") {
-        None => None,
-        Some(Value::String(n)) => Some(
-            LAYER_COLORS
-                .iter()
-                .find(|(k, _)| k.eq_ignore_ascii_case(n))
-                .map(|(_, c)| *c)
-                .ok_or_else(|| bad(ID, format!("unknown layer colour `{n}`")))?,
-        ),
-        Some(v) => Some(serde_json::from_value(v.clone()).map_err(|_| bad(ID, "color is [r,g,b] (0–255) or a layer colour name"))?),
-    };
-    let flag = |k: &str| match p.get(k) {
-        None => Ok(None),
-        Some(v) => v.as_bool().map(Some).ok_or_else(|| bad(ID, format!("`{k}` is true or false"))),
-    };
-    let (visible, locked, printable) = (flag("visible")?, flag("locked")?, flag("printable")?);
-    let (guides, wrap) = (flag("showGuides")?, flag("suppressWrapWhenHidden")?);
-    s.edit(|d, _| {
-        if let Some(n) = &name
-            && d.layers.iter().any(|l| l.id != id && l.name == *n)
-        {
-            return Err(bad(ID, format!("a layer named `{n}` exists")));
-        }
-        let l = d.layer_mut(id).ok_or_else(|| bad(ID, "no such layer"))?;
-        if let Some(n) = name {
-            l.name = n;
-        }
-        if let Some(c) = color {
-            l.color = c;
-        }
-        for (slot, v) in [
-            (&mut l.visible, visible),
-            (&mut l.locked, locked),
-            (&mut l.printable, printable),
-            (&mut l.show_guides, guides),
-            (&mut l.suppress_wrap_when_hidden, wrap),
-        ] {
-            if let Some(v) = v {
-                *slot = v;
-            }
-        }
-        ok()
-    })
-}
-
-#[cfg(test)]
-mod setup_tests {
-    use serde_json::json;
-
-    #[test]
-    fn chapter_numbering_sets_style_and_start() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("layout.chapterNumbering", &json!({})).unwrap();
-        assert_eq!(r, json!({"chapterNumber": 1, "label": "1", "style": "arabic", "source": "automatic", "book": null}));
-        let r = s.execute("layout.chapterNumbering", &json!({"start": 4, "style": "upperRoman"})).unwrap();
-        assert_eq!((&r["label"], &r["source"]), (&json!("IV"), &json!("userDefined")), "a start number means Start Chapter Numbering at");
-        s.execute("variables.define", &json!({"name": "Chapter", "type": "chapterNumber"})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let chapter = d.variable("Chapter").unwrap();
-        assert_eq!(d.variable_value(chapter, Some(0)).as_deref(), Some("IV"), "the Chapter Number variable uses the style");
-        for bad in [json!({"style": "symbols"}), json!({"start": 0}), json!({"start": 100_000}), json!({"source": "nextBook"})] {
-            assert!(s.execute("layout.chapterNumbering", &bad).is_err(), "{bad}");
-        }
-        s.execute("layout.chapterNumbering", &json!({"source": "sameAsPrevious"})).unwrap();
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(s.execute("layout.chapterNumbering", &json!({})).unwrap()["source"], "userDefined", "undoable");
-    }
-
-    #[test]
-    fn document_setup_sets_every_pages_margins_in_one_step() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 3, "margins": 36})).unwrap();
-        let f = s.execute("frame.create", &json!({"rect": [36, 36, 576, 756], "content": "text"})).unwrap();
-        let r = s.execute("layout.documentSetup", &json!({})).unwrap();
-        assert_eq!(r["margins"], json!({"top": 36.0, "bottom": 36.0, "inside": 36.0, "outside": 36.0}));
-        let m = json!({"top": 72, "bottom": 54, "inside": 72, "outside": 72});
-        let r = s.execute("layout.documentSetup", &json!({"margins": m, "bleed": 9, "adjustLayout": true})).unwrap();
-        assert_eq!(r["margins"]["bottom"], 54.0);
-        let d = &s.doc().unwrap().doc;
-        assert!(
-            d.spreads.iter().chain(&d.parents).flat_map(|sp| &sp.pages).all(|pg| pg.margins.top == 72.0 && pg.margins.bottom == 54.0),
-            "every page and parent page"
-        );
-        let b = d.item(designcraft_doc::ItemId(f["id"].as_u64().unwrap())).unwrap().bounds();
-        assert!((b.y0 - 72.0).abs() < 1e-6, "Adjust Layout: the frame follows the margins ({b:?})");
-        // One step: undo brings back the margins and the bleed.
-        s.execute("edit.undo", &json!({})).unwrap();
-        let r = s.execute("layout.documentSetup", &json!({})).unwrap();
-        assert_eq!((r["margins"]["top"].clone(), r["bleed"][0].clone()), (json!(36.0), json!(0.0)));
-        for bad in [
-            json!({"width": 0}),
-            json!({"height": -5}),
-            json!({"width": 1e9}),
-            json!({"width": "wide"}),
-            json!({"margins": -1}),
-            json!({"margins": {"top": 1}}),
-        ] {
-            assert!(s.execute("layout.documentSetup", &bad).is_err(), "{bad}");
-        }
-        assert_eq!(s.execute("layout.documentSetup", &json!({})).unwrap()["width"], 612.0, "refused values change nothing");
-    }
-
-    #[test]
-    fn document_setup_pages_start_bleed_slug() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 2})).unwrap();
-        let r = s.execute("layout.documentSetup", &json!({})).unwrap();
-        assert_eq!(r["pages"], 2);
-        assert_eq!(r["startPage"], 1);
-        let r = s.execute("layout.documentSetup", &json!({"pages": 5, "startPage": 2, "bleed": 9, "slug": [0, 18, 0, 0], "intent": "web"})).unwrap();
-        assert_eq!(r["pages"], 5);
-        assert_eq!(r["startPage"], 2);
-        assert_eq!(r["bleed"], json!([9.0, 9.0, 9.0, 9.0]));
-        assert_eq!(r["slug"], json!([0.0, 18.0, 0.0, 0.0]));
-        assert_eq!(r["intent"], "web");
-        let d = &s.doc().unwrap().doc;
-        assert_eq!(d.page_name(0), "2");
-        assert_eq!(d.page(0).unwrap().side, designcraft_doc::PageSide::Left);
-        assert_eq!(d.spreads[0].pages.len(), 2, "pages 2–3 form the first spread");
-        let r = s.execute("layout.documentSetup", &json!({"pages": 3})).unwrap();
-        assert_eq!(r["pages"], 3);
-        s.doc().unwrap().doc.check().unwrap();
-    }
-
-    #[test]
-    fn right_to_left_binding_reverses_spreads() {
-        use designcraft_doc::PageSide::{Left, Right};
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 4})).unwrap();
-        // A frame on page 2 stays on page 2.
-        let w = s.doc().unwrap().doc.settings.page_width;
-        let f = s.execute("frame.create", &json!({"rect": [w + 72.0, 72, w + 200.0, 200], "content": "text", "text": "two"})).unwrap();
-        let r = s.execute("layout.documentSetup", &json!({"binding": "rightToLeft"})).unwrap();
-        assert_eq!(r["binding"], "rightToLeft");
-        let d = &s.doc().unwrap().doc;
-        let shape: Vec<Vec<(designcraft_doc::PageSide, f64)>> = d.spreads.iter().map(|sp| sp.pages.iter().map(|p| (p.side, p.x)).collect()).collect();
-        // Page 1 alone on the left; pages 2–3 with 2 on the right; page 4 alone on the right.
-        assert_eq!(shape, vec![vec![(Left, 0.0)], vec![(Right, w), (Left, 0.0)], vec![(Right, 0.0)]]);
-        let (si, _) = d.page_loc(1).unwrap();
-        assert_eq!(si, 1);
-        let it = d.item(designcraft_doc::ItemId(f["id"].as_u64().unwrap())).unwrap();
-        assert_eq!(d.spreads[si].page_at_x(it.bounds().center().x), Some(0), "the frame is still on page 2");
-        assert!(it.bounds().x0 >= w, "page 2 is the right page now");
-        d.check().unwrap();
-        // And back.
-        s.execute("layout.documentSetup", &json!({"binding": "leftToRight"})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        assert_eq!(d.spreads[1].pages.iter().map(|p| (p.side, p.x)).collect::<Vec<_>>(), vec![(Left, 0.0), (Right, w)]);
-    }
-
-    /// Bound right to left, a parent spread lists its right page first; each document page still
-    /// shows the parent page on its own side, at its own position, also after an IDML round trip.
-    #[test]
-    fn right_to_left_binding_shows_the_parent_page_of_the_same_side() {
-        use designcraft_doc::PageSide::{Left, Right};
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 4})).unwrap();
-        s.execute("layout.documentSetup", &json!({"binding": "rightToLeft"})).unwrap();
-        let w = s.doc().unwrap().doc.settings.page_width;
-        let parent = json!({"kind": "parent", "index": 0});
-        for (rect, text) in [(json!([72, 36, 200, 60]), "left head"), (json!([w + 72.0, 36, w + 200.0, 60]), "right head")] {
-            s.execute("frame.create", &json!({"spread": parent, "rect": rect, "content": "text", "text": text})).unwrap();
-        }
-        let d = s.doc().unwrap().doc.clone();
-        assert_eq!(d.parents[0].pages.iter().map(|p| (p.side, p.x)).collect::<Vec<_>>(), vec![(Right, w), (Left, 0.0)]);
-        let docs = [(*d).clone(), designcraft_idml::import_idml(&designcraft_idml::export_idml(&d)).unwrap()];
-        for d in docs {
-            let mut s = crate::Session::new();
-            s.add_document(crate::DocState::new(d, None));
-            for (page, side, text) in [(0, Left, "left head"), (1, Right, "right head"), (2, Left, "left head"), (3, Right, "right head")] {
-                let r = s.execute("layout.overrideParentItems", &json!({"page": page})).unwrap();
-                let d = &s.doc().unwrap().doc;
-                let ids = r["ids"].as_array().unwrap();
-                assert_eq!(ids.len(), 1, "page {}", page + 1);
-                let it = d.item(designcraft_doc::ItemId(ids[0].as_u64().unwrap())).unwrap();
-                let story = d.story(it.text_frame().unwrap().story).unwrap();
-                assert_eq!((d.page(page).unwrap().side, story.text.trim_end()), (side, text), "page {}", page + 1);
-                assert_eq!(d.page_of_item(it.id), Some(page), "page {}", page + 1);
-            }
-        }
-    }
-
-    /// Multi-column frames filled the left column first in a right-to-left document (#100):
-    /// stories made in a right-to-left-bound document start their columns on the right.
-    #[test]
-    fn new_stories_follow_the_binding_direction() {
-        use designcraft_doc::TextDirection::{LeftToRight, RightToLeft};
-        let text = (1..=12).map(|i| format!("الفقرة {i}")).collect::<Vec<_>>().join("\n");
-        for (binding, expected) in [("rightToLeft", RightToLeft), ("leftToRight", LeftToRight)] {
-            let mut s = crate::Session::new();
-            s.execute("file.new", &json!({"preset": "A4", "pages": 1})).unwrap();
-            s.execute("layout.documentSetup", &json!({"binding": binding})).unwrap();
-            let f = s.execute("frame.create", &json!({"rect": [40, 170, 555, 260], "content": "text", "text": text})).unwrap();
-            s.execute("object.textFrameOptions", &json!({"ids": [f["id"]], "columns": 2, "gutter": 20})).unwrap();
-            let sid = designcraft_doc::StoryId(f["story"].as_u64().unwrap());
-            let st = s.doc().unwrap();
-            assert_eq!(st.doc.story(sid).unwrap().direction, expected, "{binding}");
-            let cs = s.cache.get(&st.doc, sid, None);
-            let fr = &cs.frames[0];
-            let (first, last) = (fr.lines.first().unwrap(), fr.lines.last().unwrap());
-            assert!(fr.columns.len() == 2 && first.x0 != last.x0, "the text fills both columns: {:?}", fr.columns);
-            assert_eq!(first.x0 > last.x0, expected == RightToLeft, "{binding}: the first line is in the first column");
-            // An empty frame given text content starts a story too.
-            let g = s.execute("frame.create", &json!({"rect": [40, 400, 555, 500]})).unwrap();
-            s.execute("object.content", &json!({"ids": [g["id"]], "type": "text"})).unwrap();
-            let d = &s.doc().unwrap().doc;
-            let tf = d.item(designcraft_doc::ItemId(g["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-            assert_eq!(d.story(tf).unwrap().direction, expected, "{binding}: object.content");
-        }
-    }
-}
-
-#[cfg(test)]
-mod layer_tests {
-    use serde_json::json;
-
-    #[test]
-    fn layer_move_reorders_and_rejects_bad_input() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let l1 = s.doc().unwrap().doc.layers[0].id.0;
-        let l2 = s.execute("layer.new", &json!({})).unwrap()["id"].as_u64().unwrap();
-        let order = |s: &crate::Session| s.doc().unwrap().doc.layers.iter().map(|l| l.id.0).collect::<Vec<_>>();
-        assert_eq!(order(&s), [l2, l1]);
-        for bad in [json!({"id": l1, "to": 2}), json!({"id": 999, "to": 0}), json!({"id": l1}), json!({"to": 0})] {
-            assert!(s.execute("layer.move", &bad).is_err(), "{bad}");
-            assert_eq!(order(&s), [l2, l1]);
-        }
-        s.execute("layer.move", &json!({"id": l1, "to": 0})).unwrap();
-        assert_eq!(order(&s), [l1, l2]);
-    }
-
-    #[test]
-    fn merge_delete_unused_hide_and_lock_others() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let l1 = s.doc().unwrap().doc.layers[0].id.0;
-        let l2 = s.execute("layer.new", &json!({"name": "Art"})).unwrap()["id"].as_u64().unwrap();
-        let l3 = s.execute("layer.new", &json!({"name": "Empty"})).unwrap()["id"].as_u64().unwrap();
-        s.execute("layer.activate", &json!({"id": l2})).unwrap();
-        let f = s.execute("frame.create", &json!({"rect": [0, 0, 10, 10]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("layer.others", &json!({"id": l2, "hide": true, "lock": true})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        assert!(d.layers.iter().all(|l| (l.id.0 == l2) == l.visible && (l.id.0 != l2) == l.locked));
-        s.execute("layer.others", &json!({"id": l2, "show": true, "unlock": true})).unwrap();
-        assert!(s.doc().unwrap().doc.layers.iter().all(|l| l.visible && !l.locked));
-        let r = s.execute("layer.deleteUnused", &json!({})).unwrap();
-        assert_eq!(r["deleted"], 2, "the empty default layer and Empty");
-        let _ = (l1, l3);
-        let l4 = s.execute("layer.new", &json!({"name": "Into"})).unwrap()["id"].as_u64().unwrap();
-        s.execute("layer.merge", &json!({"ids": [l4, l2]})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        assert_eq!(d.layers.len(), 1);
-        assert_eq!(d.item(designcraft_doc::ItemId(f)).unwrap().layer.0, l4);
-    }
-}
-
-#[cfg(test)]
-mod page_size_tests {
-    use serde_json::json;
-
-    #[test]
-    fn page_size_per_page_keeps_objects_on_their_page() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 3})).unwrap();
-        // Page 3 is the right page of spread 2 (pages 2–3); an object on it.
-        let d = s.doc().unwrap().doc.clone();
-        let (si, pi) = d.page_loc(2).unwrap();
-        let x0 = d.spreads[si].pages[pi].x;
-        let id = s.execute("frame.create", &json!({"spread": si, "rect": [x0 + 100.0, 100, x0 + 200.0, 200]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("layout.pageSize", &json!({"pages": [2], "width": 300, "height": 500})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let left = &d.spreads[si].pages[0];
-        assert_eq!((left.width, left.height), (300.0, 500.0));
-        assert_eq!(d.spreads[si].pages[1].x, x0, "the spine stays");
-        let it = d.item(designcraft_doc::ItemId(id)).unwrap();
-        assert_eq!(it.bounds().x0, x0 + 100.0);
-        assert_eq!(d.page_of_item(it.id), Some(2));
-        s.execute("layout.pageSize", &json!({"pages": [3], "preset": "A4"})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        assert!((d.spreads[si].pages[1].width - 595.276).abs() < 0.01);
-        assert!(s.execute("layout.pageSize", &json!({"pages": [9], "width": 100})).is_err());
-    }
-}
-
-#[cfg(test)]
-mod spread_tests {
-    use serde_json::json;
-
-    #[test]
-    fn three_page_spread_survives_page_inserts() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 5})).unwrap();
-        // [1] [2 3] [4 5]: page 4 joins spread 1 → [1] [2 3 4] [5].
-        let d = s.doc().unwrap().doc.clone();
-        let (si, pi) = d.page_loc(3).unwrap();
-        let x = d.spreads[si].pages[pi].x;
-        let id = s.execute("frame.create", &json!({"spread": si, "rect": [x + 50.0, 50, x + 150.0, 150]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("layout.pages.toSpread", &json!({"page": 4, "spread": 1})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        assert_eq!(d.spreads[1].pages.len(), 3);
-        assert!(!d.spreads[1].allow_shuffle);
-        assert_eq!(d.page_of_item(designcraft_doc::ItemId(id)), Some(3), "the object went with its page");
-        // Adding a page at the start reshuffles the others but keeps the 3-page spread.
-        s.execute("layout.pages.insert", &json!({"after": 0, "count": 1})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        assert!(d.spreads.iter().any(|sp| sp.pages.len() == 3 && !sp.allow_shuffle));
-        assert_eq!(d.page_count(), 6);
-        d.check().unwrap();
-    }
-}
-
-#[cfg(test)]
-mod page_numbering_view_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn section_and_absolute_page_numbering_view() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 4})).unwrap();
-        s.execute("layout.section", &json!({"page": 1, "startNumber": 1, "style": "lowerRoman"})).unwrap();
-        s.execute("layout.section", &json!({"page": 3, "startNumber": 1})).unwrap();
-        assert_eq!((0..4).map(|i| s.page_label(i)).collect::<Vec<_>>(), ["i", "ii", "1", "2"]);
-        assert_eq!(s.resolve_page("ii"), Some(1));
-        assert_eq!(s.resolve_page("1"), Some(2), "section name first");
-        assert_eq!(s.resolve_page("+1"), Some(0), "+n is a position");
-        s.execute("prefs.set", &json!({"absolutePageNumbers": true})).unwrap();
-        assert_eq!((0..4).map(|i| s.page_label(i)).collect::<Vec<_>>(), ["1", "2", "3", "4"]);
-        assert_eq!(s.resolve_page("1"), Some(0));
-        assert_eq!(s.resolve_page("9"), None);
-    }
-
-    #[test]
-    fn section_start_numbers_are_bounded() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 2})).unwrap();
-        for n in [json!(0), json!(100_000), json!(u32::MAX), json!(u64::from(u32::MAX) + 2), json!(-1), json!(2.5), json!("7")] {
-            let e = s.execute("layout.section", &json!({"page": 1, "startNumber": n})).unwrap_err().to_string();
-            assert!(e.contains("startNumber"), "{n}: {e}");
-            assert!(s.execute("layout.documentSetup", &json!({"startPage": n})).is_err(), "{n}");
-        }
-        assert_eq!((0..2).map(|i| s.page_label(i)).collect::<Vec<_>>(), ["1", "2"]);
-        let r = s.execute("layout.section", &json!({"page": 1, "startNumber": 99_999})).unwrap();
-        assert_eq!(r["names"], json!(["99999", "100000"]));
-    }
-
-    #[test]
-    fn numbering_options_apply_in_one_undo_step_or_not_at_all() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 4})).unwrap();
-        let names = |s: &crate::Session| (0..4).map(|i| s.doc().unwrap().doc.page_name(i)).collect::<Vec<_>>();
-        let r = s
-            .execute(
-                "layout.numberingOptions",
-                &json!({"page": 3, "startNumber": 5, "style": "lowerRoman", "prefix": "A-", "includePrefix": true, "chapter": {"start": 4, "style": "upperRoman"}}),
-            )
-            .unwrap();
-        assert_eq!((r["names"].clone(), r["chapter"].clone()), (json!(["1", "2", "A-v", "A-vi"]), json!("IV")));
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(names(&s), ["1", "2", "3", "4"], "one undo reverts the section…");
-        assert_eq!(s.doc().unwrap().doc.chapter_label(), "1", "…and the chapter numbering");
-        // A refused part leaves the other undone too.
-        for bad in [
-            json!({"page": 3, "startNumber": 5, "chapter": {"start": 100_000}}),
-            json!({"page": 3, "startNumber": 4_294_967_295u64, "chapter": {"start": 2}}),
-            json!({"page": 3, "prefix": "A+B", "chapter": {"start": 2}}),
-            json!({"page": 9, "chapter": {"start": 2}}),
-        ] {
-            assert!(s.execute("layout.numberingOptions", &bad).is_err(), "{bad}");
-            assert_eq!(names(&s), ["1", "2", "3", "4"], "{bad}");
-            assert_eq!(s.doc().unwrap().doc.settings.chapter_source, designcraft_doc::ChapterSource::Automatic, "{bad}");
-        }
-        // Removing a section keeps the chapter part.
-        s.execute("layout.section", &json!({"page": 3, "startNumber": 1})).unwrap();
-        s.execute("layout.numberingOptions", &json!({"page": 3, "remove": true, "chapter": {"source": "userDefined", "start": 2}})).unwrap();
-        assert_eq!(names(&s), ["1", "2", "3", "4"]);
-        assert_eq!(s.doc().unwrap().doc.chapter_label(), "2");
-    }
-
-    #[test]
-    fn section_prefixes_are_short_and_avoid_plus_and_comma() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 2})).unwrap();
-        for prefix in ["A-", "Appendix", "§ 1"] {
-            s.execute("layout.section", &json!({"page": 2, "prefix": prefix})).unwrap();
-        }
-        for prefix in ["Appendix1", "A+", "1,2"] {
-            assert!(s.execute("layout.section", &json!({"page": 2, "prefix": prefix})).is_err(), "{prefix}");
-        }
-        assert!(s.execute("layout.section", &json!({"page": 2, "style": "symbols"})).is_err());
-        assert_eq!(s.doc().unwrap().doc.sections.iter().find(|x| x.start == 1).unwrap().prefix, "§ 1", "a refused prefix changes nothing");
-    }
-
-    /// `layout.section` edits one named setting; the others stay as the section was (#717).
-    #[test]
-    fn updating_a_section_keeps_settings_the_command_does_not_name() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 4})).unwrap();
-        s.execute(
-            "layout.section",
-            &json!({"page": 2, "startNumber": 1, "style": "lowerRoman", "prefix": "A-", "includePrefix": true, "marker": "First"}),
-        )
-        .unwrap();
-        assert_eq!(s.page_label(1), "A-i");
-        s.execute("layout.section", &json!({"page": 2, "marker": "Second"})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let sec = d.sections.iter().find(|x| x.start == 1).expect("the page-2 section is still the only one there");
-        assert_eq!(sec.marker, "Second");
-        assert_eq!(sec.start_number, Some(1), "startNumber is kept");
-        assert_eq!(sec.style, designcraft_doc::NumberStyle::LowerRoman, "style is kept");
-        assert_eq!(sec.prefix, "A-", "prefix is kept");
-        assert!(sec.include_prefix, "includePrefix is kept");
-        assert_eq!(s.page_label(1), "A-i");
-    }
-}
-
-#[cfg(test)]
-mod adjust_tests {
-    use designcraft_doc::Margins;
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn adjust_layout_follows_the_new_page_size_and_margins() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
-        // Letter, 36 pt margins: a frame filling the left half of the margin box.
-        let id = s.execute("frame.create", &json!({"rect": [36, 36, 306, 756]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("layout.documentSetup", &json!({"width": 1224, "adjustLayout": true})).unwrap();
-        let b = s.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().bounds();
-        assert!((b.x0 - 36.0).abs() < 1e-6 && (b.x1 - 612.0).abs() < 1e-6, "half of the wider margin box: {b:?}");
-        s.execute("layout.marginsAndColumns", &json!({"margins": 72, "adjustLayout": true})).unwrap();
-        let b = s.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().bounds();
-        assert!((b.x0 - 72.0).abs() < 1e-6 && (b.y0 - 72.0).abs() < 1e-6 && (b.y1 - 720.0).abs() < 1e-6, "{b:?}");
-        // Without the option objects stay put.
-        s.execute("layout.marginsAndColumns", &json!({"margins": 36})).unwrap();
-        let b2 = s.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().bounds();
-        assert_eq!(b, b2);
-    }
-
-    #[test]
-    fn parent_margins_change_the_parent_and_follow_unoverridden_pages() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 3, "facingPages": false})).unwrap();
-        // Page 3 has its own margins (an override); pages 1 and 2 still follow the parent.
-        s.execute("layout.marginsAndColumns", &json!({"pages": [2], "margins": 100})).unwrap();
-        let parent_before = s.doc().unwrap().doc.parents[0].pages[0].margins;
-        assert_eq!(parent_before, Margins::uniform(36.0));
-        s.execute("layout.marginsAndColumns", &json!({"parent": 0, "margins": 60, "columns": 2})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        // The parent page itself changed (this is what was drawn on screen).
-        assert_eq!(d.parents[0].pages[0].margins, Margins::uniform(60.0));
-        assert_eq!(d.parents[0].pages[0].columns.count, 2);
-        // Pages without their own margins follow; the page given its own keeps them.
-        assert_eq!(d.page(0).unwrap().margins, Margins::uniform(60.0));
-        assert_eq!(d.page(1).unwrap().margins, Margins::uniform(60.0));
-        assert_eq!(d.page(2).unwrap().margins, Margins::uniform(100.0));
-        // An unknown parent is an error, not a silent no-op.
-        assert!(s.execute("layout.marginsAndColumns", &json!({"parent": 9, "margins": 10})).is_err());
-    }
-
-    /// Margins and Columns re-divides the columns: a new count or gutter replaces column guides
-    /// that were dragged (an imported Custom columns page), rather than being ignored by them.
-    #[test]
-    fn a_new_column_count_replaces_dragged_column_positions() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
-        // There is no command for dragging a column guide yet, so set what an import would leave.
-        let drag = |s: &mut Session| {
-            s.edit(|d, _| {
-                let pg = &mut std::sync::Arc::make_mut(&mut d.spreads[0]).pages[0];
-                pg.columns = designcraft_doc::Columns { count: 2, gutter: 12.0, positions: Some(vec![0.0, 100.0, 130.0, 540.0]) };
-                Ok(())
-            })
-            .unwrap();
-        };
-
-        drag(&mut s);
-        let dragged = s.doc().unwrap().doc.page(0).unwrap().column_rects();
-        assert_eq!(dragged.len(), 2);
-        assert!((dragged[0].x1 - dragged[0].x0 - 100.0).abs() < 1e-6, "the dragged gutter is in use: {dragged:?}");
-
-        // A new count: evenly divided again, and the stale positions are gone.
-        s.execute("layout.marginsAndColumns", &json!({"columns": 3})).unwrap();
-        let pg = s.doc().unwrap().doc.page(0).unwrap().clone();
-        assert_eq!((pg.columns.count, pg.columns.positions.clone()), (3, None));
-        assert_eq!(pg.column_rects().len(), 3);
-
-        // So does a new gutter on its own.
-        drag(&mut s);
-        s.execute("layout.marginsAndColumns", &json!({"gutter": 24})).unwrap();
-        let pg = s.doc().unwrap().doc.page(0).unwrap().clone();
-        assert_eq!(pg.columns.positions, None);
-        assert!((pg.column_rects()[1].x0 - pg.column_rects()[0].x1 - 24.0).abs() < 1e-6);
-
-        // Margins that keep the margin box's width leave them alone; a new width scales them.
-        drag(&mut s);
-        s.execute("layout.marginsAndColumns", &json!({"margins": {"top": 72, "bottom": 72, "inside": 36, "outside": 36}})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.page(0).unwrap().columns.positions, Some(vec![0.0, 100.0, 130.0, 540.0]));
-        s.execute("layout.marginsAndColumns", &json!({"margins": 72})).unwrap();
-        assert_scaled(s.doc().unwrap().doc.page(0).unwrap().columns.positions.clone(), 468.0);
-    }
-
-    /// The params the Margins and Columns dialog sends on OK: every margin, the count and the
-    /// gutter, whether or not the user changed them.
-    fn dialog_params(margin: f64, columns: u32, gutter: f64) -> serde_json::Value {
-        json!({"margins": {"top": margin, "bottom": margin, "inside": margin, "outside": margin},
-            "columns": columns, "gutter": gutter, "adjustLayout": false})
-    }
-
-    const DRAGGED: [f64; 4] = [0.0, 100.0, 130.0, 540.0];
-
-    fn dragged() -> designcraft_doc::Columns {
-        designcraft_doc::Columns { count: 2, gutter: 12.0, positions: Some(DRAGGED.to_vec()) }
-    }
-
-    /// `positions` are [`DRAGGED`] scaled from its 540 pt margin box to one `width` wide.
-    #[track_caller]
-    fn assert_scaled(positions: Option<Vec<f64>>, width: f64) {
-        let want: Vec<f64> = DRAGGED.iter().map(|p| p * width / 540.0).collect();
-        let got = positions.unwrap_or_default();
-        assert!(got.len() == want.len() && got.iter().zip(&want).all(|(g, w)| (g - w).abs() < 1e-6), "{got:?} ≠ {want:?}");
-    }
-
-    /// An OK in the dialog keeps dragged columns unless the count or gutter it sends differs.
-    #[test]
-    fn the_dialog_keeps_dragged_columns_unless_the_count_or_gutter_changes() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
-        let drag = |s: &mut Session| {
-            s.edit(|d, _| {
-                std::sync::Arc::make_mut(&mut d.spreads[0]).pages[0].columns = dragged();
-                Ok(())
-            })
-            .unwrap();
-        };
-        let positions = |s: &Session| s.doc().unwrap().doc.page(0).unwrap().columns.positions.clone();
-
-        // The same count and gutter (the gutter as an inch field rounds it) keep them in use.
-        drag(&mut s);
-        s.execute("layout.marginsAndColumns", &dialog_params(36.0, 2, 12.0)).unwrap();
-        assert_eq!(positions(&s), Some(DRAGGED.to_vec()));
-        s.execute("layout.marginsAndColumns", &dialog_params(36.0, 2, 0.1667 * 72.0)).unwrap();
-        assert_eq!(positions(&s), Some(DRAGGED.to_vec()));
-        let rects = s.doc().unwrap().doc.page(0).unwrap().column_rects();
-        assert!((rects[0].x1 - rects[0].x0 - 100.0).abs() < 1e-6, "the dragged columns are in use: {rects:?}");
-
-        // Top and bottom margins leave the margin box's width alone, and the columns with it.
-        let mut taller = dialog_params(36.0, 2, 12.0);
-        taller["margins"]["top"] = json!(72.0);
-        taller["margins"]["bottom"] = json!(72.0);
-        s.execute("layout.marginsAndColumns", &taller).unwrap();
-        assert_eq!(positions(&s), Some(DRAGGED.to_vec()));
-
-        // A new width scales them with the margin box, and the old width scales them back.
-        s.execute("layout.marginsAndColumns", &dialog_params(72.0, 2, 12.0)).unwrap();
-        assert_scaled(positions(&s), 468.0);
-        let rects = s.doc().unwrap().doc.page(0).unwrap().column_rects();
-        assert!((rects[0].x1 - rects[0].x0 - 100.0 * 468.0 / 540.0).abs() < 1e-6, "the scaled columns are in use: {rects:?}");
-        s.execute("layout.marginsAndColumns", &dialog_params(36.0, 2, 12.0)).unwrap();
-        assert_scaled(positions(&s), 540.0);
-
-        // A new count resets them.
-        drag(&mut s);
-        s.execute("layout.marginsAndColumns", &dialog_params(36.0, 3, 12.0)).unwrap();
-        let pg = s.doc().unwrap().doc.page(0).unwrap().clone();
-        assert_eq!((pg.columns.count, pg.columns.positions), (3, None));
-
-        // So does a new gutter.
-        drag(&mut s);
-        s.execute("layout.marginsAndColumns", &dialog_params(36.0, 2, 18.0)).unwrap();
-        let pg = s.doc().unwrap().doc.page(0).unwrap().clone();
-        assert_eq!((pg.columns.gutter, pg.columns.positions), (18.0, None));
-    }
-
-    /// A page of another width (Page Size, Document Setup) scales its dragged columns.
-    #[test]
-    fn a_new_page_width_scales_dragged_columns() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
-        let drag = |s: &mut Session| {
-            s.edit(|d, _| {
-                // A dragged page's columns are its own (`local_margins`), as the drag will make them.
-                let pg = &mut std::sync::Arc::make_mut(&mut d.spreads[0]).pages[0];
-                pg.columns = dragged();
-                pg.local_margins = true;
-                Ok(())
-            })
-            .unwrap();
-        };
-        let positions = |s: &Session| s.doc().unwrap().doc.page(0).unwrap().columns.positions.clone();
-
-        drag(&mut s);
-        s.execute("layout.pageSize", &json!({"pages": [1], "height": 900})).unwrap();
-        assert_eq!(positions(&s), Some(DRAGGED.to_vec()), "a new height keeps them");
-        s.execute("layout.pageSize", &json!({"pages": [1], "width": 700})).unwrap();
-        assert_scaled(positions(&s), 628.0);
-        s.execute("layout.pageSize", &json!({"pages": [1], "width": 612})).unwrap();
-        assert_scaled(positions(&s), 540.0);
-
-        drag(&mut s);
-        s.execute("layout.documentSetup", &json!({"width": 700})).unwrap();
-        assert_scaled(positions(&s), 628.0);
-    }
-
-    /// Parent pages follow the same rule, and the document pages that follow them see it.
-    #[test]
-    fn the_dialog_keeps_a_parents_dragged_columns_unless_the_count_or_gutter_changes() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
-        let drag = |s: &mut Session| {
-            s.edit(|d, _| {
-                std::sync::Arc::make_mut(&mut d.parents[0]).pages[0].columns = dragged();
-                d.sync_parent_margins();
-                Ok(())
-            })
-            .unwrap();
-        };
-        let positions = |s: &Session| {
-            let d = &s.doc().unwrap().doc;
-            (d.parents[0].pages[0].columns.positions.clone(), d.page(0).unwrap().columns.positions.clone())
-        };
-        let on_parent = |m: f64, c: u32, g: f64| {
-            let mut p = dialog_params(m, c, g);
-            p["parent"] = json!(0);
-            p
-        };
-
-        drag(&mut s);
-        assert_eq!(positions(&s), (Some(DRAGGED.to_vec()), Some(DRAGGED.to_vec())));
-        s.execute("layout.marginsAndColumns", &on_parent(36.0, 2, 12.0)).unwrap();
-        assert_eq!(positions(&s), (Some(DRAGGED.to_vec()), Some(DRAGGED.to_vec())));
-        s.execute("layout.marginsAndColumns", &on_parent(48.0, 2, 12.0)).unwrap();
-        let (parent, follower) = positions(&s);
-        assert_scaled(parent, 516.0);
-        assert_scaled(follower, 516.0);
-
-        drag(&mut s);
-        s.execute("layout.marginsAndColumns", &on_parent(36.0, 3, 12.0)).unwrap();
-        assert_eq!(positions(&s), (None, None));
-
-        drag(&mut s);
-        s.execute("layout.marginsAndColumns", &on_parent(36.0, 2, 24.0)).unwrap();
-        assert_eq!(positions(&s), (None, None));
-    }
-}
-
-#[cfg(test)]
-mod section_side_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// Each spread's pages as (name, side), side `L`, `R` or `S`.
-    fn spreads(s: &Session) -> Vec<Vec<(String, char)>> {
-        let d = &s.doc().unwrap().doc;
-        let mut abs = 0;
-        d.spreads
-            .iter()
-            .map(|sp| {
-                sp.pages
-                    .iter()
-                    .map(|p| {
-                        let side = match p.side {
-                            designcraft_doc::PageSide::Left => 'L',
-                            designcraft_doc::PageSide::Right => 'R',
-                            designcraft_doc::PageSide::Single => 'S',
-                        };
-                        abs += 1;
-                        (d.page_name(abs - 1), side)
-                    })
-                    .collect()
-            })
-            .collect()
-    }
-
-    fn pages(v: &[&[(&str, char)]]) -> Vec<Vec<(String, char)>> {
-        v.iter().map(|sp| sp.iter().map(|(n, c)| (n.to_string(), *c)).collect()).collect()
-    }
-
-    #[test]
-    fn a_section_starting_at_one_on_a_left_page_moves_it_to_the_right() {
-        // Chris Nielsen's "Numbering Page Sections" (7:03): with the spread 8–9 selected, the
-        // section starts on page 8, which becomes a lone right-hand page 1; the pages after it
-        // shuffle and their objects go with them. Undo puts them back.
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"width": 612, "height": 792, "facingPages": true, "pages": 10})).unwrap();
-        let id = s.execute("frame.create", &json!({"spread": 4, "rect": [700, 100, 800, 200], "content": "text", "text": "TOPIC"})).unwrap()["id"]
-            .as_u64()
-            .unwrap();
-        let page_of = |s: &Session| {
-            let d = &s.doc().unwrap().doc;
-            d.page_of_item(designcraft_doc::ItemId(id)).unwrap()
-        };
-        assert_eq!(page_of(&s), 8, "page 9, the right page of the spread 8–9");
-        let before = spreads(&s);
-        s.execute("layout.section", &json!({"page": 8, "startNumber": 1})).unwrap();
-        assert_eq!(
-            spreads(&s),
-            pages(&[
-                &[("1", 'R')],
-                &[("2", 'L'), ("3", 'R')],
-                &[("4", 'L'), ("5", 'R')],
-                &[("6", 'L'), ("7", 'R')],
-                &[("1", 'R')],
-                &[("2", 'L'), ("3", 'R')],
-            ])
-        );
-        assert_eq!(page_of(&s), 8, "the object stays on its page, now the left page of a spread");
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(spreads(&s), before);
-        // On a right page (the video's page 9) nothing moves; an even start on a right page moves
-        // it to the left.
-        s.execute("layout.section", &json!({"page": 9, "startNumber": 1})).unwrap();
-        assert_eq!(spreads(&s)[4], pages(&[&[("8", 'L'), ("1", 'R')]])[0]);
-        s.execute("layout.section", &json!({"page": 9, "startNumber": 2})).unwrap();
-        assert_eq!(spreads(&s)[4..], pages(&[&[("8", 'L')], &[("2", 'L'), ("3", 'R')]]));
-        // Removing the section numbers the pages on from 9 again.
-        s.execute("layout.section", &json!({"page": 9, "remove": true})).unwrap();
-        assert_eq!(spreads(&s), before);
-    }
-
-    #[test]
-    fn single_sided_documents_keep_their_pages() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"facingPages": false, "pages": 4})).unwrap();
-        s.execute("layout.section", &json!({"page": 2, "startNumber": 1})).unwrap();
-        let sp = spreads(&s);
-        assert_eq!(sp.len(), 4);
-        assert!(sp.iter().all(|p| p.len() == 1 && p[0].1 == 'S'), "{sp:?}");
-    }
-}
-
-#[cfg(test)]
-mod spread_rotation_input_tests {
-    use serde_json::json;
-
-    #[test]
-    fn quarter_turns_work_and_other_angles_are_rejected_without_mutation() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let rotation = |s: &crate::Session| s.doc().unwrap().doc.spreads[0].pages[0].view_rotation;
-        for bad in [json!(45), json!(-45), json!(91), json!("90"), json!(0.5)] {
-            assert!(s.execute("layout.rotateSpreadView", &json!({"angle": bad})).is_err(), "{bad}");
-            assert_eq!(rotation(&s), 0, "invalid input must not change the view");
-        }
-        s.execute("layout.rotateSpreadView", &json!({"angle": 90})).unwrap();
-        assert_eq!(rotation(&s), 1);
-        s.execute("layout.rotateSpreadView", &json!({"angle": -90})).unwrap();
-        assert_eq!(rotation(&s), 0);
-        s.execute("layout.rotateSpreadView", &json!({"angle": 180})).unwrap();
-        assert_eq!(rotation(&s), 2);
-        s.execute("layout.rotateSpreadView", &json!({"angle": 0})).unwrap();
-        assert_eq!(rotation(&s), 0, "zero resets the spread view");
-    }
-}
-
-#[cfg(test)]
-mod layer_options_tests {
-    use serde_json::json;
-
-    #[test]
-    fn layer_set_sets_every_field_and_rejects_bad_names() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let first = s.doc().unwrap().doc.layers[0].id.0;
-        let id = s.execute("layer.new", &json!({"name": "Art"})).unwrap()["id"].as_u64().unwrap();
-        let all = json!({"id": id, "name": "  Artwork ", "color": "Gold", "visible": false, "locked": true, "printable": false,
-            "showGuides": false, "suppressWrapWhenHidden": true});
-        s.execute("layer.set", &all).unwrap();
-        let l = s.doc().unwrap().doc.layer(designcraft_doc::LayerId(id)).cloned().unwrap();
-        assert_eq!(l.name, "Artwork");
-        assert_eq!(l.color, [255, 153, 0]);
-        assert!(!l.visible && l.locked && !l.printable && !l.show_guides && l.suppress_wrap_when_hidden);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.layer(designcraft_doc::LayerId(id)).unwrap().name, "Art", "one undo step");
-        let first_name = s.doc().unwrap().doc.layers.iter().find(|l| l.id.0 == first).unwrap().name.clone();
-        let before = s.doc().unwrap().doc.layers.clone();
-        for p in [
-            json!({"id": id, "name": ""}),
-            json!({"id": id, "name": "   "}),
-            json!({"id": id, "name": first_name}),
-            json!({"id": id, "name": "Fine", "color": "Plaid"}),
-            json!({"id": id, "color": [300, 0, 0]}),
-            json!({"id": id, "visible": "yes"}),
-            json!({"id": 999_999, "name": "Ghost"}),
-        ] {
-            assert!(s.execute("layer.set", &p).is_err(), "{p}");
-        }
-        assert_eq!(s.doc().unwrap().doc.layers, before);
-        // Keeping its own name is fine.
-        s.execute("layer.set", &json!({"id": id, "name": "Art", "color": [1, 2, 3]})).unwrap();
-    }
-}
-
-#[cfg(test)]
-mod parent_margin_tests {
-    use designcraft_doc::{Document, Margins};
-    use serde_json::json;
-
-    use crate::Session;
-
-    fn margins(d: &Document) -> Vec<(Margins, u32, bool)> {
-        (0..d.page_count()).filter_map(|i| d.page(i)).map(|p| (p.margins, p.columns.count, p.local_margins)).collect()
-    }
-
-    #[test]
-    fn document_setup_margins_let_pages_follow_their_parent_page_again() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 3})).unwrap();
-        s.execute("layout.marginsAndColumns", &json!({"pages": [1], "margins": 100})).unwrap();
-        s.execute("layout.marginsAndColumns", &json!({"pages": [2], "margins": 100, "columns": 3})).unwrap();
-        s.execute("layout.documentSetup", &json!({"margins": 20})).unwrap();
-        let m = margins(&s.doc().unwrap().doc);
-        let twenty = Margins::uniform(20.0);
-        assert_eq!(m, vec![(twenty, 1, false), (twenty, 1, false), (twenty, 3, true)], "own columns stay local");
-        s.execute("layout.marginsAndColumns", &json!({"parent": "A", "margins": 50})).unwrap();
-        let m = margins(&s.doc().unwrap().doc);
-        assert_eq!(m[1], (Margins::uniform(50.0), 1, false), "page 2 follows the parent page again");
-        assert_eq!(m[2], (twenty, 3, true));
-    }
-
-    #[test]
-    fn pages_follow_their_parent_pages_margins_unless_set_locally() {
-        let mut s = Session::new();
-        // Facing: [1] [2 3]; page 3 gets its own margins.
-        s.execute("file.new", &json!({"pages": 3})).unwrap();
-        s.execute("layout.marginsAndColumns", &json!({"pages": [2], "margins": 100})).unwrap();
-        // A's left page: only the left document page follows.
-        let left = json!({"top": 10, "bottom": 20, "inside": 30, "outside": 40});
-        s.execute("layout.marginsAndColumns", &json!({"parent": "A", "pages": [0], "margins": left, "columns": 2})).unwrap();
-        let l = Margins { top: 10.0, bottom: 20.0, inside: 30.0, outside: 40.0 };
-        let m = margins(&s.doc().unwrap().doc);
-        assert_eq!(m, vec![(Margins::uniform(36.0), 1, false), (l, 2, false), (Margins::uniform(100.0), 1, true)]);
-        // A's right page: page 1 follows, page 3 keeps its own.
-        s.execute("layout.marginsAndColumns", &json!({"parent": "A-Parent", "pages": [1], "margins": 50})).unwrap();
-        let m = margins(&s.doc().unwrap().doc);
-        assert_eq!(m, vec![(Margins::uniform(50.0), 1, false), (l, 2, false), (Margins::uniform(100.0), 1, true)]);
-        // A page inserted after page 1 pushes page 2 to the right: it takes the right parent page's.
-        s.execute("layout.pages.insert", &json!({"after": 0, "count": 1, "parent": "A"})).unwrap();
-        let m = margins(&s.doc().unwrap().doc);
-        assert_eq!(m[1], (l, 2, false), "the new left page");
-        assert_eq!(m[2], (Margins::uniform(50.0), 1, false), "old page 2, now a right page");
-        assert_eq!(m[3], (Margins::uniform(100.0), 1, true));
-        assert!(s.execute("layout.marginsAndColumns", &json!({"parent": "Z", "margins": 10})).is_err());
-    }
-
-    #[test]
-    fn applying_a_parent_gives_its_margins_and_local_margins_stay_local() {
-        let mut s = Session::new();
-        // Facing: [1] [2 3].
-        s.execute("file.new", &json!({"pages": 3})).unwrap();
-        s.execute("layout.parents.new", &json!({"prefix": "B"})).unwrap();
-        s.execute("layout.marginsAndColumns", &json!({"parent": "B", "margins": 70, "columns": 3})).unwrap();
-        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "B"})).unwrap();
-        let m = margins(&s.doc().unwrap().doc);
-        assert_eq!(m[1], (Margins::uniform(70.0), 3, false), "the page takes B's margins");
-        // Page 3 is given margins equal to A's: they are its own all the same.
-        s.execute("layout.marginsAndColumns", &json!({"pages": [2], "margins": 36})).unwrap();
-        s.execute("layout.marginsAndColumns", &json!({"parent": "A", "margins": 20})).unwrap();
-        let m = margins(&s.doc().unwrap().doc);
-        assert_eq!(m[0], (Margins::uniform(20.0), 1, false));
-        assert_eq!(m[1], (Margins::uniform(70.0), 3, false), "B's page is not A's");
-        assert_eq!(m[2], (Margins::uniform(36.0), 1, true));
-        // Back to A: page 2 follows A again.
-        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "A"})).unwrap();
-        assert_eq!(margins(&s.doc().unwrap().doc)[1], (Margins::uniform(20.0), 1, false));
-    }
-
-    #[test]
-    fn parent_guides_show_on_pages_but_stay_on_the_parent() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 2})).unwrap();
-        // A vertical guide 100 pt into A's right page (x = 612 in the parent spread).
-        s.execute("guide.add", &json!({"spread": {"kind": "parent", "index": 0}, "page": 1, "orientation": "vertical", "position": 712})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let right = d.page(0).unwrap();
-        let shown: Vec<f64> = d.parent_guides(right).map(|g| g.position).collect();
-        assert_eq!(shown, vec![100.0], "moved to the document page's place");
-        assert_eq!(d.parent_guides(d.page(1).unwrap()).count(), 0, "the left page shows A's left page's guides");
-        // Not the document page's own: not listed, moved or deleted from there.
-        assert_eq!(s.execute("guide.list", &json!({"spread": 0})).unwrap(), json!([]));
-        assert!(s.execute("guide.move", &json!({"spread": 0, "page": 0, "index": 0, "position": 50})).is_err());
-        assert!(s.execute("guide.delete", &json!({"spread": 0, "page": 0, "index": 0})).is_err());
-    }
-}
-
-#[cfg(test)]
-mod parent_tests {
-    use serde_json::json;
-
-    fn parent_of(s: &crate::Session, page: usize) -> Option<u64> {
-        s.doc().unwrap().doc.page(page).unwrap().parent.map(|p| p.0)
-    }
-
-    #[test]
-    fn parents_with_one_prefix_stay_distinct() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 2})).unwrap();
-        let a = s.execute("layout.parents.new", &json!({"prefix": "IMG", "name": "Parent"})).unwrap()["id"].as_u64().unwrap();
-        let b = s.execute("layout.parents.new", &json!({"prefix": "IMG", "name": "Half"})).unwrap()["id"].as_u64().unwrap();
-        s.execute("layout.pages.applyParent", &json!({"pages": [0], "parent": b})).unwrap();
-        assert_eq!(parent_of(&s, 0), Some(b));
-        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "IMG-Half"})).unwrap();
-        assert_eq!(parent_of(&s, 1), Some(b));
-        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "IMG-Parent"})).unwrap();
-        assert_eq!(parent_of(&s, 1), Some(a));
-        // A prefix two parents share, or a name no parent has, is an error and changes nothing.
-        assert!(s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "IMG"})).is_err());
-        assert!(s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "Nope"})).is_err());
-        assert!(s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": 999_999})).is_err());
-        assert_eq!(parent_of(&s, 1), Some(a));
-        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "[None]"})).unwrap();
-        assert_eq!(parent_of(&s, 1), None);
-    }
-
-    #[test]
-    fn edit_parents_shows_the_named_parent() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let ids: Vec<u64> =
-            ["B", "C", "D"].iter().map(|p| s.execute("layout.parents.new", &json!({"prefix": p})).unwrap()["id"].as_u64().unwrap()).collect();
-        s.ui_requests.clear();
-        let r = s.execute("layout.parents.edit", &json!({"parent": ids[2]})).unwrap();
-        assert_eq!(r, json!({"on": true, "parent": ids[2]}));
-        assert!(s.doc().unwrap().editing_parents);
-        let n = s.doc().unwrap().doc.parent_index(designcraft_doc::SpreadId(ids[2])).unwrap();
-        let shown: Vec<_> = s
-            .ui_requests
-            .iter()
-            .filter_map(|r| match r {
-                crate::UiRequest::View { params } => params.get("showSpread").cloned(),
-                _ => None,
-            })
-            .collect();
-        assert_eq!(shown, vec![json!({"kind": "parent", "index": n})]);
-        let r = s.execute("layout.parents.edit", &json!({"on": true, "parent": "C-Parent"})).unwrap();
-        assert_eq!(r["parent"], ids[1]);
-        assert!(s.execute("layout.parents.edit", &json!({"parent": "Z-Parent"})).is_err());
-        let r = s.execute("layout.parents.edit", &json!({"on": false})).unwrap();
-        assert_eq!(r, json!({"on": false, "parent": null}));
-        assert!(!s.doc().unwrap().editing_parents);
-    }
-
-    /// A new parent takes the first page's columns, dragged column guides included: the right
-    /// parent page as the first (right) page has them, the left one mirrored across the spine.
-    /// `document.inspect` reports where those columns are.
-    #[test]
-    fn a_new_parent_keeps_dragged_columns() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 1})).unwrap();
-        let dragged = designcraft_doc::Columns { count: 2, gutter: 12.0, positions: Some(vec![0.0, 100.0, 130.0, 540.0]) };
-        // There is no command for dragging a column guide yet, so set what an import would leave.
-        s.edit(|d, _| {
-            let pg = &mut std::sync::Arc::make_mut(&mut d.spreads[0]).pages[0];
-            (pg.columns, pg.local_margins) = (dragged.clone(), true);
-            Ok(())
-        })
-        .unwrap();
-        let id = s.execute("layout.parents.new", &json!({"prefix": "B"})).unwrap()["id"].as_u64().unwrap();
-        let d = &s.doc().unwrap().doc;
-        let parent = d.parents.iter().find(|p| p.id.0 == id).unwrap();
-        assert_eq!(parent.pages.len(), 2);
-        let side = |s: designcraft_doc::PageSide| parent.pages.iter().find(|p| p.side == s).unwrap();
-        let (left, right) = (side(designcraft_doc::PageSide::Left), side(designcraft_doc::PageSide::Right));
-        assert_eq!(right.columns, dragged);
-        assert_eq!(right.column_rects().iter().map(|r| r.width()).collect::<Vec<_>>(), vec![100.0, 410.0]);
-        assert_eq!(left.columns.positions, Some(vec![0.0, 410.0, 440.0, 540.0]));
-        assert_eq!(left.column_rects().iter().map(|r| r.width()).collect::<Vec<_>>(), vec![410.0, 100.0]);
-
-        let inspect = s.execute("document.inspect", &json!({})).unwrap();
-        let page = &inspect["spreads"][0]["pages"][0];
-        assert_eq!((page["columns"].clone(), page["customColumns"].clone()), (json!(2), json!(true)), "{page}");
-        assert_eq!(page["columnRects"][0], json!([36.0, 36.0, 136.0, 756.0]), "{page}");
-    }
-
-    fn columns_of(s: &crate::Session, abs: usize) -> (Option<Vec<f64>>, bool) {
-        let pg = s.doc().unwrap().doc.page(abs).unwrap().clone();
-        (pg.columns.positions, pg.local_margins)
-    }
-
-    /// Three columns across a 540 pt margin box (36 pt margins), column guides unlocked.
-    fn three_columns(pages: u64) -> crate::Session {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": pages})).unwrap();
-        s.execute("layout.marginsAndColumns", &json!({"parent": "A", "columns": 3, "gutter": 12})).unwrap();
-        s.execute("view.lockColumnGuides", &json!({"on": false})).unwrap();
-        s
-    }
-
-    /// Dragging a column guide moves its gutter's two guides together, stops at the neighbouring
-    /// gutter and the margin, makes a following page's columns its own, and undoes in one step.
-    #[test]
-    fn move_column_guide_moves_the_gutter_pair_within_its_neighbours() {
-        let mut s = three_columns(1);
-        assert_eq!(columns_of(&s, 0), (None, false), "the page follows A");
-        let mv =
-            |s: &mut crate::Session, gutter: u64, x: f64| s.execute("layout.moveColumnGuide", &json!({"page": 0, "gutter": gutter, "position": x}));
-        let r = mv(&mut s, 0, 236.0).unwrap();
-        assert_eq!(r, json!({"positions": [0.0, 200.0, 212.0, 356.0, 368.0, 540.0], "left": 236.0}));
-        assert_eq!(columns_of(&s, 0), (Some(vec![0.0, 200.0, 212.0, 356.0, 368.0, 540.0]), true));
-        let inspect = s.execute("document.inspect", &json!({})).unwrap();
-        assert_eq!(inspect["spreads"][0]["pages"][0]["columnRects"][0], json!([36.0, 36.0, 236.0, 756.0]));
-        // Past the next gutter: it stops there, and the middle column has no width.
-        assert_eq!(mv(&mut s, 0, 1000.0).unwrap()["left"], json!(36.0 + 344.0));
-        // Past the right margin: the last gutter stops 12 pt (its width) inside it.
-        assert_eq!(mv(&mut s, 1, 1e12).unwrap()["positions"], json!([0.0, 344.0, 356.0, 528.0, 540.0, 540.0]));
-        // Past the left margin.
-        assert_eq!(mv(&mut s, 0, -1e12).unwrap()["positions"], json!([0.0, 0.0, 12.0, 528.0, 540.0, 540.0]));
-        for _ in 0..3 {
-            s.execute("edit.undo", &json!({})).unwrap();
-        }
-        assert_eq!(columns_of(&s, 0), (Some(vec![0.0, 200.0, 212.0, 356.0, 368.0, 540.0]), true));
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(columns_of(&s, 0), (None, false), "one undo step per drag");
-    }
-
-    /// On a parent page the drag changes the parent, and the document pages that follow it get
-    /// the new columns; a page with columns of its own keeps them.
-    #[test]
-    fn move_column_guide_on_a_parent_reaches_the_pages_that_follow_it() {
-        let mut s = three_columns(3);
-        // Page 1, the left page of spread 1, gets columns of its own.
-        let x = s.doc().unwrap().doc.spreads[1].pages[0].margin_rect().x0 + 300.0;
-        s.execute("layout.moveColumnGuide", &json!({"spread": 1, "page": 0, "gutter": 1, "position": x})).unwrap();
-        let own = columns_of(&s, 1);
-        assert!(own.1 && own.0.is_some());
-        let d = &s.doc().unwrap().doc;
-        // A's right page: the one page 0 (a right page) and page 2 follow.
-        let x0 = d.parents[0].pages[1].margin_rect().x0;
-        s.execute("layout.moveColumnGuide", &json!({"parent": "A", "page": 1, "gutter": 0, "position": x0 + 100.0})).unwrap();
-        let moved = vec![0.0, 100.0, 112.0, 356.0, 368.0, 540.0];
-        assert_eq!(s.doc().unwrap().doc.parents[0].pages[1].columns.positions, Some(moved.clone()));
-        assert_eq!(columns_of(&s, 0), (Some(moved.clone()), false));
-        assert_eq!(columns_of(&s, 2), (Some(moved), false));
-        assert_eq!(columns_of(&s, 1), own, "page 1's columns are its own");
-        // The same parent page by spread reference.
-        let spread = json!({"kind": "parent", "index": 0});
-        s.execute("layout.moveColumnGuide", &json!({"spread": spread, "page": 1, "gutter": 0, "position": x0 + 50.0})).unwrap();
-        assert_eq!(columns_of(&s, 0).0.unwrap()[1], 50.0);
-    }
-
-    /// A drag's preview in one document is put back there when another document became active.
-    #[test]
-    fn a_column_guide_preview_is_cancelled_in_its_own_document() {
-        let mut s = three_columns(1);
-        let uid = s.doc().unwrap().uid;
-        s.begin_interaction("Move Column Guide").unwrap();
-        s.preview("layout.moveColumnGuide", json!({"page": 0, "gutter": 0, "position": 236})).unwrap();
-        s.execute("file.new", &json!({})).unwrap();
-        s.cancel_interaction_of(uid);
-        s.set_active(0);
-        assert!(s.doc().unwrap().interaction.is_none());
-        assert_eq!(columns_of(&s, 0), (None, false));
-    }
-
-    #[test]
-    fn move_column_guide_refuses_while_locked_and_hostile_params() {
-        let mut s = three_columns(1);
-        s.execute("view.lockColumnGuides", &json!({"on": true})).unwrap();
-        assert!(s.execute("layout.moveColumnGuide", &json!({"page": 0, "gutter": 0, "position": 200})).is_err());
-        assert_eq!(columns_of(&s, 0), (None, false));
-        s.execute("view.lockColumnGuides", &json!({"on": false})).unwrap();
-        for p in [
-            json!({"page": 0, "gutter": 0}),
-            json!({"page": 0, "gutter": 0, "position": f64::NAN}),
-            json!({"page": 0, "gutter": 0, "position": "200"}),
-            json!({"page": 0, "gutter": 2, "position": 200}),
-            json!({"page": 0, "gutter": u64::MAX, "position": 200}),
-            json!({"page": 0, "gutter": -1, "position": 200}),
-            json!({"page": 0, "gutter": 0.5, "position": 200}),
-            json!({"page": 9, "gutter": 0, "position": 200}),
-            json!({"page": u64::MAX, "gutter": 0, "position": 200}),
-            json!({"gutter": 0, "position": 200}),
-            json!({"spread": 99, "page": 0, "gutter": 0, "position": 200}),
-            json!({"parent": "Z", "page": 0, "gutter": 0, "position": 200}),
-            json!({"page": 0, "gutter": 0, "position": f64::MAX}),
-        ] {
-            let r = s.execute("layout.moveColumnGuide", &p);
-            // A huge but finite position is clamped to the margin; everything else is refused.
-            assert!(r.is_err() || p["position"] == json!(f64::MAX), "{p}: {r:?}");
-        }
-    }
-}
-
-#[cfg(test)]
-mod parent_base_tests {
-    use serde_json::{Value, json};
-
-    fn rect(s: &mut crate::Session, spread: Value, r: [f64; 4], swatch: &str) -> u64 {
-        let id = s.execute("frame.create", &json!({"spread": spread, "rect": r, "content": "unassigned"})).unwrap()["id"].as_u64().unwrap();
-        s.execute("object.fill", &json!({"ids": [id], "swatch": swatch})).unwrap();
-        id
-    }
-
-    fn page(s: &crate::Session, abs: usize) -> designcraft_render::Rendered {
-        let mut rr = designcraft_render::Renderer::new();
-        rr.threads = 0;
-        rr.render_page(&s.doc().unwrap().doc, &s.cache, abs, 1.0, false, &Default::default()).unwrap()
-    }
-
-    /// Parent A (black), parent B based on A (cyan, half over A's square), and a page item (paper)
-    /// over B's: the page draws A, then B, then its own items.
-    #[test]
-    fn based_on_parent_draws_base_items_under_parent_items() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"width": 400, "height": 400, "pages": 2, "facingPages": false, "margins": 0})).unwrap();
-        s.execute("layout.parents.new", &json!({"prefix": "B", "name": "Opening"})).unwrap();
-        rect(&mut s, json!({"kind": "parent", "index": 0}), [0.0, 0.0, 200.0, 200.0], "[Black]");
-        rect(&mut s, json!({"kind": "parent", "index": 1}), [100.0, 0.0, 300.0, 200.0], "C=100 M=0 Y=0 K=0");
-        rect(&mut s, json!(1), [150.0, 0.0, 190.0, 40.0], "[Paper]");
-        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "B"})).unwrap();
-        let black = |p: [u8; 4]| p[0] < 80 && p[1] < 80 && p[2] < 80;
-        let cyan = |p: [u8; 4]| p[0] < 80 && p[1] > 120 && p[2] > 180;
-        let paper = |p: [u8; 4]| p[0] > 240 && p[1] > 240 && p[2] > 240;
-        assert!(paper(page(&s, 1).pixel(50, 100)), "B alone does not show A's items");
-
-        let r = s.execute("layout.parents.options", &json!({"parent": "B", "basedOn": "A"})).unwrap();
-        assert_eq!(r, json!({"parent": "B-Opening", "basedOn": "A-Parent"}));
-        let img = page(&s, 1);
-        assert!(black(img.pixel(50, 100)), "A's item: {:?}", img.pixel(50, 100));
-        assert!(cyan(img.pixel(150, 150)), "B's item over A's: {:?}", img.pixel(150, 150));
-        assert!(paper(img.pixel(170, 20)), "the page's item over B's: {:?}", img.pixel(170, 20));
-        assert!(black(page(&s, 0).pixel(50, 100)) && !cyan(page(&s, 0).pixel(250, 100)), "page 1 uses A only");
-        // Parent B itself shows A's items under its own.
-        let mut rr = designcraft_render::Renderer::new();
-        rr.threads = 0;
-        let placed = [designcraft_render::Placed { spread: designcraft_doc::SpreadRef::Parent(1), xf: designcraft_geom::Affine::IDENTITY }];
-        let opts = designcraft_render::RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
-        let img = rr.render(&s.doc().unwrap().doc, &s.cache, &placed, 400, 400, designcraft_geom::Affine::IDENTITY, &opts);
-        assert!(black(img.pixel(50, 100)) && cyan(img.pixel(150, 150)), "{:?} {:?}", img.pixel(50, 100), img.pixel(150, 150));
-        let inspect = s.execute("document.inspect", &json!({})).unwrap();
-        assert_eq!(inspect["parents"][1]["basedOn"], "A-Parent");
-        assert_eq!(inspect["parents"][0]["basedOn"], Value::Null);
-
-        // Cycles are refused.
-        assert!(s.execute("layout.parents.options", &json!({"parent": "A", "basedOn": "B"})).is_err());
-        assert!(s.execute("layout.parents.options", &json!({"parent": "B", "basedOn": "B-Opening"})).is_err());
-        assert!(s.execute("layout.parents.options", &json!({"parent": "B", "basedOn": "Z"})).is_err());
-
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert!(paper(page(&s, 1).pixel(50, 100)), "undo clears Based on Parent");
-        s.execute("edit.redo", &json!({})).unwrap();
-        s.execute("layout.parents.options", &json!({"parent": "B", "basedOn": null})).unwrap();
-        assert_eq!(s.execute("document.inspect", &json!({})).unwrap()["parents"][1]["basedOn"], Value::Null);
-    }
-
-    /// A's page-number marker shown on parent XYZ (based on A) reads XYZ, as markers on XYZ's own items do.
-    #[test]
-    fn base_parent_markers_read_the_showing_parent() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
-        s.execute("layout.parents.new", &json!({"prefix": "XYZ"})).unwrap();
-        s.execute("layout.parents.options", &json!({"parent": "XYZ", "basedOn": "A"})).unwrap();
-        let marker = designcraft_doc::story::PAGE_NUMBER.to_string();
-        let r = s
-            .execute("frame.create", &json!({"spread": {"kind": "parent", "index": 0}, "rect": [72, 30, 500, 60], "content": "text", "text": marker}))
-            .unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let sid = d.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-        let glyphs = |on| -> usize {
-            let cs = s.cache.get_on(&d, sid, on);
-            cs.frames.iter().flat_map(|f| f.lines.iter()).map(|l| l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0).count()).sum()
-        };
-        assert_eq!(glyphs(designcraft_compose::ShownOn::Own), 1, "A");
-        assert_eq!(glyphs(designcraft_compose::ShownOn::Parent(1)), 3, "XYZ");
-    }
-
-    /// A file whose parents are based on each other opens, with the cycle broken and reported.
-    #[test]
-    fn opening_a_parent_cycle_breaks_it_with_a_warning() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"pages": 1})).unwrap();
-        s.execute("layout.parents.new", &json!({"prefix": "B"})).unwrap();
-        let mut d = s.doc().unwrap().doc.as_ref().clone();
-        let (a, b) = (d.parents[0].id, d.parents[1].id);
-        std::sync::Arc::make_mut(&mut d.parents[0]).parent.as_mut().unwrap().based_on = Some(b);
-        std::sync::Arc::make_mut(&mut d.parents[1]).parent.as_mut().unwrap().based_on = Some(a);
-        let b64 = crate::cmd::base64_encode(&crate::cmd::to_bytes(&d).unwrap());
-        let r = s.execute("file.openBytes", &json!({"name": "cycle", "base64": b64})).unwrap();
-        assert!(r["warnings"].to_string().contains("cycle"), "{r}");
-        let d = &s.doc().unwrap().doc;
-        assert_eq!(d.parents[0].parent.as_ref().unwrap().based_on, None);
-        assert_eq!(d.parents[1].parent.as_ref().unwrap().based_on, Some(a));
-    }
-}
+mod layers;
+mod margins;
+mod pages;
+mod parents;
+mod registry;
+mod sections;
+
+pub(crate) use pages::resize_pages;
+pub use registry::specs;
+pub use sections::chapter_numbering;
 
 #[cfg(test)]
 #[path = "parent_delete_tests.rs"]
 mod parent_delete_tests;
-
-#[cfg(test)]
-mod insert_count_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// A count that is given but is not a number of pages used to insert one page anyway:
-    /// `{"count": 0}` added a page, `-1` and `1.5` added one each, and `10000` was quietly capped
-    /// to 9999. A position past the last page appends, which is deliberate.
-    #[test]
-    fn a_page_count_insert_pages_cannot_mean_is_refused() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 2, "facingPages": false})).unwrap();
-        let total = |s: &mut Session| s.execute("layout.pages.insert", &json!({"count": 1})).unwrap()["total"].as_u64().unwrap();
-        assert_eq!(total(&mut s), 3, "one page added");
-
-        for params in [json!({"count": 0}), json!({"count": -1}), json!({"count": 1.5}), json!({"count": 10000}), json!({"count": "two"})] {
-            let e = s.execute("layout.pages.insert", &params).expect_err("refused").to_string();
-            assert!(e.contains("1 to 9999 pages"), "{params}: {e}");
-        }
-        // Nothing was inserted by any of those.
-        assert_eq!(s.doc().unwrap().doc.page_count(), 3);
-        // A position past the last page still appends, which `insert_pages_bounds.rs` pins.
-        let r = s.execute("layout.pages.insert", &json!({"after": 99})).unwrap();
-        assert_eq!((r["pages"].as_u64(), r["total"].as_u64()), (Some(1), Some(4)));
-        // The positions it does have still work: after the first page of three.
-        let r = s.execute("layout.pages.insert", &json!({"count": 2, "after": 0})).unwrap();
-        assert_eq!((r["pages"].as_u64(), r["total"].as_u64()), (Some(2), Some(6)));
-    }
-}
diff --git a/crates/engine/src/cmd/layout/layers.rs b/crates/engine/src/cmd/layout/layers.rs
new file mode 100644
index 000000000..80fbc9d28
--- /dev/null
+++ b/crates/engine/src/cmd/layout/layers.rs
@@ -0,0 +1,137 @@
+use super::{LAYER_COLORS, LayerId, Result, Session, Value, bad, ok};
+
+/// Layer Options: every field in one undo step; a bad name or colour changes nothing.
+pub(super) fn set_layer(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "layer.set";
+    let id = LayerId(p.get("id").and_then(Value::as_u64).ok_or_else(|| bad(ID, "missing id"))?);
+    let name = match p.get("name") {
+        Some(v) => Some(v.as_str().map(str::trim).filter(|n| !n.is_empty()).ok_or_else(|| bad(ID, "a layer needs a name"))?.to_string()),
+        None => None,
+    };
+    let color: Option<[u8; 3]> = match p.get("color") {
+        None => None,
+        Some(Value::String(n)) => Some(
+            LAYER_COLORS
+                .iter()
+                .find(|(k, _)| k.eq_ignore_ascii_case(n))
+                .map(|(_, c)| *c)
+                .ok_or_else(|| bad(ID, format!("unknown layer colour `{n}`")))?,
+        ),
+        Some(v) => Some(serde_json::from_value(v.clone()).map_err(|_| bad(ID, "color is [r,g,b] (0–255) or a layer colour name"))?),
+    };
+    let flag = |k: &str| match p.get(k) {
+        None => Ok(None),
+        Some(v) => v.as_bool().map(Some).ok_or_else(|| bad(ID, format!("`{k}` is true or false"))),
+    };
+    let (visible, locked, printable) = (flag("visible")?, flag("locked")?, flag("printable")?);
+    let (guides, wrap) = (flag("showGuides")?, flag("suppressWrapWhenHidden")?);
+    s.edit(|d, _| {
+        if let Some(n) = &name
+            && d.layers.iter().any(|l| l.id != id && l.name == *n)
+        {
+            return Err(bad(ID, format!("a layer named `{n}` exists")));
+        }
+        let l = d.layer_mut(id).ok_or_else(|| bad(ID, "no such layer"))?;
+        if let Some(n) = name {
+            l.name = n;
+        }
+        if let Some(c) = color {
+            l.color = c;
+        }
+        for (slot, v) in [
+            (&mut l.visible, visible),
+            (&mut l.locked, locked),
+            (&mut l.printable, printable),
+            (&mut l.show_guides, guides),
+            (&mut l.suppress_wrap_when_hidden, wrap),
+        ] {
+            if let Some(v) = v {
+                *slot = v;
+            }
+        }
+        ok()
+    })
+}
+
+#[cfg(test)]
+mod layer_tests {
+    use serde_json::json;
+
+    #[test]
+    fn layer_move_reorders_and_rejects_bad_input() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let l1 = s.doc().unwrap().doc.layers[0].id.0;
+        let l2 = s.execute("layer.new", &json!({})).unwrap()["id"].as_u64().unwrap();
+        let order = |s: &crate::Session| s.doc().unwrap().doc.layers.iter().map(|l| l.id.0).collect::<Vec<_>>();
+        assert_eq!(order(&s), [l2, l1]);
+        for bad in [json!({"id": l1, "to": 2}), json!({"id": 999, "to": 0}), json!({"id": l1}), json!({"to": 0})] {
+            assert!(s.execute("layer.move", &bad).is_err(), "{bad}");
+            assert_eq!(order(&s), [l2, l1]);
+        }
+        s.execute("layer.move", &json!({"id": l1, "to": 0})).unwrap();
+        assert_eq!(order(&s), [l1, l2]);
+    }
+
+    #[test]
+    fn merge_delete_unused_hide_and_lock_others() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let l1 = s.doc().unwrap().doc.layers[0].id.0;
+        let l2 = s.execute("layer.new", &json!({"name": "Art"})).unwrap()["id"].as_u64().unwrap();
+        let l3 = s.execute("layer.new", &json!({"name": "Empty"})).unwrap()["id"].as_u64().unwrap();
+        s.execute("layer.activate", &json!({"id": l2})).unwrap();
+        let f = s.execute("frame.create", &json!({"rect": [0, 0, 10, 10]})).unwrap()["id"].as_u64().unwrap();
+        s.execute("layer.others", &json!({"id": l2, "hide": true, "lock": true})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        assert!(d.layers.iter().all(|l| (l.id.0 == l2) == l.visible && (l.id.0 != l2) == l.locked));
+        s.execute("layer.others", &json!({"id": l2, "show": true, "unlock": true})).unwrap();
+        assert!(s.doc().unwrap().doc.layers.iter().all(|l| l.visible && !l.locked));
+        let r = s.execute("layer.deleteUnused", &json!({})).unwrap();
+        assert_eq!(r["deleted"], 2, "the empty default layer and Empty");
+        let _ = (l1, l3);
+        let l4 = s.execute("layer.new", &json!({"name": "Into"})).unwrap()["id"].as_u64().unwrap();
+        s.execute("layer.merge", &json!({"ids": [l4, l2]})).unwrap();
+        let d = &s.doc().unwrap().doc;
+        assert_eq!(d.layers.len(), 1);
+        assert_eq!(d.item(designcraft_doc::ItemId(f)).unwrap().layer.0, l4);
+    }
+}
+
+#[cfg(test)]
+mod layer_options_tests {
+    use serde_json::json;
+
+    #[test]
+    fn layer_set_sets_every_field_and_rejects_bad_names() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let first = s.doc().unwrap().doc.layers[0].id.0;
+        let id = s.execute("layer.new", &json!({"name": "Art"})).unwrap()["id"].as_u64().unwrap();
+        let all = json!({"id": id, "name": "  Artwork ", "color": "Gold", "visible": false, "locked": true, "printable": false,
+            "showGuides": false, "suppressWrapWhenHidden": true});
+        s.execute("layer.set", &all).unwrap();
+        let l = s.doc().unwrap().doc.layer(designcraft_doc::LayerId(id)).cloned().unwrap();
+        assert_eq!(l.name, "Artwork");
+        assert_eq!(l.color, [255, 153, 0]);
+        assert!(!l.visible && l.locked && !l.printable && !l.show_guides && l.suppress_wrap_when_hidden);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.layer(designcraft_doc::LayerId(id)).unwrap().name, "Art", "one undo step");
+        let first_name = s.doc().unwrap().doc.layers.iter().find(|l| l.id.0 == first).unwrap().name.clone();
+        let before = s.doc().unwrap().doc.layers.clone();
+        for p in [
+            json!({"id": id, "name": ""}),
+            json!({"id": id, "name": "   "}),
+            json!({"id": id, "name": first_name}),
+            json!({"id": id, "name": "Fine", "color": "Plaid"}),
+            json!({"id": id, "color": [300, 0, 0]}),
+            json!({"id": id, "visible": "yes"}),
+            json!({"id": 999_999, "name": "Ghost"}),
+        ] {
+            assert!(s.execute("layer.set", &p).is_err(), "{p}");
+        }
+        assert_eq!(s.doc().unwrap().doc.layers, before);
+        // Keeping its own name is fine.
+        s.execute("layer.set", &json!({"id": id, "name": "Art", "color": [1, 2, 3]})).unwrap();
+    }
+}
diff --git a/crates/engine/src/cmd/layout/margins.rs b/crates/engine/src/cmd/layout/margins.rs
new file mode 100644
index 000000000..bcfa6c431
--- /dev/null
+++ b/crates/engine/src/cmd/layout/margins.rs
@@ -0,0 +1,423 @@
+use super::parents::parent_spread_index;
+use super::{Margins, Result, Session, Value, bad, has_doc, json};
+
+/// Each page's margin box, by spread and page id.
+pub(super) fn margin_boxes(d: &designcraft_doc::Document) -> Vec<(designcraft_doc::SpreadRef, designcraft_doc::PageId, designcraft_geom::Rect)> {
+    d.spread_refs()
+        .filter_map(|r| d.spread(r).map(|sp| (r, sp)))
+        .flat_map(|(r, sp)| sp.pages.iter().map(move |pg| (r, pg.id, pg.margin_rect())))
+        .collect()
+}
+
+/// Layout Adjustment: objects on each page move and resize from its old margin box to its new
+/// one (content keeps its size; frames that auto-fit refit).
+pub(super) fn adjust_layout(
+    d: &mut designcraft_doc::Document,
+    before: &[(designcraft_doc::SpreadRef, designcraft_doc::PageId, designcraft_geom::Rect)],
+) {
+    use designcraft_geom::Affine;
+    let after = margin_boxes(d);
+    for (r, pid, old) in before {
+        let Some((_, _, new)) = after.iter().find(|(r2, p2, _)| r2 == r && p2 == pid) else { continue };
+        if old == new || old.width() < 1e-6 || old.height() < 1e-6 {
+            continue;
+        }
+        let m = Affine::translate((new.x0, new.y0))
+            * Affine::scale_non_uniform(new.width() / old.width(), new.height() / old.height())
+            * Affine::translate((-old.x0, -old.y0));
+        let Some(sp) = d.spread(*r) else { continue };
+        // The page's objects (by centre, measured against the old boxes).
+        let ids: Vec<designcraft_doc::ItemId> = sp
+            .items
+            .iter()
+            .filter(|it| {
+                let c = it.bounds().center();
+                // Pages share a spread side by side: the margin box's page is the one under the centre's x.
+                before
+                    .iter()
+                    .filter(|(r2, _, _)| r2 == r)
+                    .min_by(|a, b| dist(a.2, c.x).total_cmp(&dist(b.2, c.x)))
+                    .is_some_and(|(_, p2, _)| p2 == pid)
+            })
+            .map(|it| it.id)
+            .collect();
+        for id in ids {
+            let Some(it) = d.item_mut(id) else { continue };
+            if matches!(it.content, designcraft_doc::Content::Group { .. }) {
+                it.xf = m * it.xf;
+            } else {
+                let inner = it.xf.inverse() * m * it.xf;
+                it.path.transform(inner);
+                if let Some(w) = &mut it.wrap.path {
+                    w.transform(inner);
+                }
+                let ib = it.inner_bounds();
+                if let designcraft_doc::Content::Graphic(g) = &mut it.content {
+                    // Content keeps its size but moves with the frame; auto-fit refits.
+                    let o = inner * designcraft_geom::Point::ZERO;
+                    g.xf = Affine::translate(o.to_vec2()) * g.xf;
+                    if let Some(xf) = g.fitted(ib, g.auto_fit) {
+                        g.xf = xf;
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Horizontal distance from `x` to a margin box (0 inside).
+fn dist(r: designcraft_geom::Rect, x: f64) -> f64 {
+    if x < r.x0 {
+        r.x0 - x
+    } else if x > r.x1 {
+        x - r.x1
+    } else {
+        0.0
+    }
+}
+
+/// Apply the `margins`, `columns` and `gutter` params of `layout.marginsAndColumns` to one page.
+pub(super) fn set_margins_columns(pg: &mut designcraft_doc::Page, p: &Value) {
+    let width_before = pg.margin_rect().width();
+    match p.get("margins") {
+        Some(Value::Number(n)) => pg.margins = Margins::uniform(n.as_f64().unwrap_or(36.0)),
+        Some(v @ Value::Object(_)) => {
+            if let Ok(m) = serde_json::from_value(v.clone()) {
+                pg.margins = m;
+            }
+        }
+        _ => {}
+    }
+    scale_columns(pg, width_before);
+    // A new count or gutter re-divides the columns evenly: dragged column positions are what
+    // the new value replaces. The dialog always sends both, so an unchanged value keeps them.
+    if let Some(c) = p.get("columns").and_then(Value::as_u64) {
+        let c = u32::try_from(c).unwrap_or(u32::MAX).clamp(1, 216);
+        if c != pg.columns.count {
+            pg.columns.count = c;
+            pg.columns.positions = None;
+        }
+    }
+    if let Some(g) = p.get("gutter").and_then(Value::as_f64).filter(|g| g.is_finite()) {
+        let g = g.max(0.0);
+        if (g - pg.columns.gutter).abs() > GUTTER_TOLERANCE {
+            pg.columns.gutter = g;
+            pg.columns.positions = None;
+        }
+    }
+}
+
+/// Dragged column positions are measured across the margin box. When the box was
+/// `width_before` wide and now has another width, they scale with it, as InDesign's do; a set
+/// that doesn't scale into a valid one goes back to the even split rather than stay hidden.
+fn scale_columns(pg: &mut designcraft_doc::Page, width_before: f64) {
+    let width = pg.margin_rect().width();
+    if (width - width_before).abs() <= GUTTER_TOLERANCE {
+        return;
+    }
+    let Some(positions) = pg.columns.positions.as_mut() else { return };
+    let factor = width / width_before;
+    if factor.is_finite() && factor > 0.0 {
+        positions.iter_mut().for_each(|p| *p *= factor);
+        // The ends sit exactly on the margins whatever the rounding.
+        if let Some(first) = positions.first_mut() {
+            *first = 0.0;
+        }
+        if let Some(last) = positions.last_mut() {
+            *last = width;
+        }
+    }
+    if pg.columns.valid_positions(width).is_none() {
+        pg.columns.positions = None;
+    }
+}
+
+/// Gives `pg` the page width `width`, scaling its dragged columns with the margin box.
+pub(super) fn set_page_width(pg: &mut designcraft_doc::Page, width: f64) {
+    let before = pg.margin_rect().width();
+    pg.width = width;
+    scale_columns(pg, before);
+}
+
+/// How far a gutter may differ from the page's and still count as unchanged, in points. The
+/// dialog shows the gutter in the ruler unit, rounded (inches to four decimals: up to 0.0036 pt
+/// off), so an OK that leaves the field alone sends back a slightly different number.
+const GUTTER_TOLERANCE: f64 = 0.01;
+
+/// Column guides can be dragged: a document is open and View › Grids & Guides › Lock Column
+/// Guides is off.
+pub(super) fn column_guides_unlocked(s: &Session) -> std::result::Result<(), String> {
+    has_doc(s)?;
+    match s.active() {
+        Some(st) if st.doc.settings.column_guides_locked => Err("column guides are locked (View › Grids & Guides › Lock Column Guides)".into()),
+        _ => Ok(()),
+    }
+}
+
+/// A column guide dragged with the Selection tool: gutter `gutter` of a page moves to `position`.
+pub(super) fn move_column_guide(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "layout.moveColumnGuide";
+    let index = |key: &str| -> Result<usize> {
+        let v = p.get(key).ok_or_else(|| bad(CMD, format!("missing `{key}`")))?;
+        v.as_u64().and_then(|n| usize::try_from(n).ok()).ok_or_else(|| bad(CMD, format!("`{key}` must be a non-negative integer")))
+    };
+    let (page, gutter) = (index("page")?, index("gutter")?);
+    let position =
+        p.get("position").and_then(Value::as_f64).filter(|v| v.is_finite()).ok_or_else(|| bad(CMD, "`position` must be a finite number"))?;
+    let r = match p.get("parent") {
+        None | Some(Value::Null) => crate::cmd::spread_param(p, CMD)?,
+        Some(v) => designcraft_doc::SpreadRef::Parent(parent_spread_index(&s.doc()?.doc, v).ok_or_else(|| bad(CMD, "no such parent"))?),
+    };
+    s.edit(|d, _| {
+        if d.settings.column_guides_locked {
+            return Err(bad(CMD, "column guides are locked"));
+        }
+        let pg = d.spread_mut(r).ok_or_else(|| bad(CMD, "no such spread"))?.pages.get_mut(page).ok_or_else(|| bad(CMD, "no such page"))?;
+        let m = pg.margin_rect();
+        let count = pg.columns.count;
+        if gutter.checked_add(1).is_none_or(|g| g >= count as usize) {
+            return Err(bad(CMD, format!("the page has {} gutters", count.saturating_sub(1))));
+        }
+        let positions =
+            pg.columns.with_gutter_moved(m.width(), gutter, position - m.x0).ok_or_else(|| bad(CMD, "the columns cannot take that position"))?;
+        let left = positions.get(gutter * 2 + 1).map_or(position, |v| m.x0 + v);
+        pg.columns.positions = Some(positions.clone());
+        match r {
+            designcraft_doc::SpreadRef::Doc(_) => pg.local_margins = true,
+            designcraft_doc::SpreadRef::Parent(_) => d.sync_parent_margins(),
+        }
+        Ok(json!({"positions": positions, "left": left}))
+    })
+}
+
+#[cfg(test)]
+mod adjust_tests {
+    use designcraft_doc::Margins;
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn adjust_layout_follows_the_new_page_size_and_margins() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
+        // Letter, 36 pt margins: a frame filling the left half of the margin box.
+        let id = s.execute("frame.create", &json!({"rect": [36, 36, 306, 756]})).unwrap()["id"].as_u64().unwrap();
+        s.execute("layout.documentSetup", &json!({"width": 1224, "adjustLayout": true})).unwrap();
+        let b = s.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().bounds();
+        assert!((b.x0 - 36.0).abs() < 1e-6 && (b.x1 - 612.0).abs() < 1e-6, "half of the wider margin box: {b:?}");
+        s.execute("layout.marginsAndColumns", &json!({"margins": 72, "adjustLayout": true})).unwrap();
+        let b = s.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().bounds();
+        assert!((b.x0 - 72.0).abs() < 1e-6 && (b.y0 - 72.0).abs() < 1e-6 && (b.y1 - 720.0).abs() < 1e-6, "{b:?}");
+        // Without the option objects stay put.
+        s.execute("layout.marginsAndColumns", &json!({"margins": 36})).unwrap();
+        let b2 = s.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().bounds();
+        assert_eq!(b, b2);
+    }
+
+    #[test]
+    fn parent_margins_change_the_parent_and_follow_unoverridden_pages() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 3, "facingPages": false})).unwrap();
+        // Page 3 has its own margins (an override); pages 1 and 2 still follow the parent.
+        s.execute("layout.marginsAndColumns", &json!({"pages": [2], "margins": 100})).unwrap();
+        let parent_before = s.doc().unwrap().doc.parents[0].pages[0].margins;
+        assert_eq!(parent_before, Margins::uniform(36.0));
+        s.execute("layout.marginsAndColumns", &json!({"parent": 0, "margins": 60, "columns": 2})).unwrap();
+        let d = &s.doc().unwrap().doc;
+        // The parent page itself changed (this is what was drawn on screen).
+        assert_eq!(d.parents[0].pages[0].margins, Margins::uniform(60.0));
+        assert_eq!(d.parents[0].pages[0].columns.count, 2);
+        // Pages without their own margins follow; the page given its own keeps them.
+        assert_eq!(d.page(0).unwrap().margins, Margins::uniform(60.0));
+        assert_eq!(d.page(1).unwrap().margins, Margins::uniform(60.0));
+        assert_eq!(d.page(2).unwrap().margins, Margins::uniform(100.0));
+        // An unknown parent is an error, not a silent no-op.
+        assert!(s.execute("layout.marginsAndColumns", &json!({"parent": 9, "margins": 10})).is_err());
+    }
+
+    /// Margins and Columns re-divides the columns: a new count or gutter replaces column guides
+    /// that were dragged (an imported Custom columns page), rather than being ignored by them.
+    #[test]
+    fn a_new_column_count_replaces_dragged_column_positions() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
+        // There is no command for dragging a column guide yet, so set what an import would leave.
+        let drag = |s: &mut Session| {
+            s.edit(|d, _| {
+                let pg = &mut std::sync::Arc::make_mut(&mut d.spreads[0]).pages[0];
+                pg.columns = designcraft_doc::Columns { count: 2, gutter: 12.0, positions: Some(vec![0.0, 100.0, 130.0, 540.0]) };
+                Ok(())
+            })
+            .unwrap();
+        };
+
+        drag(&mut s);
+        let dragged = s.doc().unwrap().doc.page(0).unwrap().column_rects();
+        assert_eq!(dragged.len(), 2);
+        assert!((dragged[0].x1 - dragged[0].x0 - 100.0).abs() < 1e-6, "the dragged gutter is in use: {dragged:?}");
+
+        // A new count: evenly divided again, and the stale positions are gone.
+        s.execute("layout.marginsAndColumns", &json!({"columns": 3})).unwrap();
+        let pg = s.doc().unwrap().doc.page(0).unwrap().clone();
+        assert_eq!((pg.columns.count, pg.columns.positions.clone()), (3, None));
+        assert_eq!(pg.column_rects().len(), 3);
+
+        // So does a new gutter on its own.
+        drag(&mut s);
+        s.execute("layout.marginsAndColumns", &json!({"gutter": 24})).unwrap();
+        let pg = s.doc().unwrap().doc.page(0).unwrap().clone();
+        assert_eq!(pg.columns.positions, None);
+        assert!((pg.column_rects()[1].x0 - pg.column_rects()[0].x1 - 24.0).abs() < 1e-6);
+
+        // Margins that keep the margin box's width leave them alone; a new width scales them.
+        drag(&mut s);
+        s.execute("layout.marginsAndColumns", &json!({"margins": {"top": 72, "bottom": 72, "inside": 36, "outside": 36}})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.page(0).unwrap().columns.positions, Some(vec![0.0, 100.0, 130.0, 540.0]));
+        s.execute("layout.marginsAndColumns", &json!({"margins": 72})).unwrap();
+        assert_scaled(s.doc().unwrap().doc.page(0).unwrap().columns.positions.clone(), 468.0);
+    }
+
+    /// The params the Margins and Columns dialog sends on OK: every margin, the count and the
+    /// gutter, whether or not the user changed them.
+    fn dialog_params(margin: f64, columns: u32, gutter: f64) -> serde_json::Value {
+        json!({"margins": {"top": margin, "bottom": margin, "inside": margin, "outside": margin},
+            "columns": columns, "gutter": gutter, "adjustLayout": false})
+    }
+
+    const DRAGGED: [f64; 4] = [0.0, 100.0, 130.0, 540.0];
+
+    fn dragged() -> designcraft_doc::Columns {
+        designcraft_doc::Columns { count: 2, gutter: 12.0, positions: Some(DRAGGED.to_vec()) }
+    }
+
+    /// `positions` are [`DRAGGED`] scaled from its 540 pt margin box to one `width` wide.
+    #[track_caller]
+    fn assert_scaled(positions: Option<Vec<f64>>, width: f64) {
+        let want: Vec<f64> = DRAGGED.iter().map(|p| p * width / 540.0).collect();
+        let got = positions.unwrap_or_default();
+        assert!(got.len() == want.len() && got.iter().zip(&want).all(|(g, w)| (g - w).abs() < 1e-6), "{got:?} ≠ {want:?}");
+    }
+
+    /// An OK in the dialog keeps dragged columns unless the count or gutter it sends differs.
+    #[test]
+    fn the_dialog_keeps_dragged_columns_unless_the_count_or_gutter_changes() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
+        let drag = |s: &mut Session| {
+            s.edit(|d, _| {
+                std::sync::Arc::make_mut(&mut d.spreads[0]).pages[0].columns = dragged();
+                Ok(())
+            })
+            .unwrap();
+        };
+        let positions = |s: &Session| s.doc().unwrap().doc.page(0).unwrap().columns.positions.clone();
+
+        // The same count and gutter (the gutter as an inch field rounds it) keep them in use.
+        drag(&mut s);
+        s.execute("layout.marginsAndColumns", &dialog_params(36.0, 2, 12.0)).unwrap();
+        assert_eq!(positions(&s), Some(DRAGGED.to_vec()));
+        s.execute("layout.marginsAndColumns", &dialog_params(36.0, 2, 0.1667 * 72.0)).unwrap();
+        assert_eq!(positions(&s), Some(DRAGGED.to_vec()));
+        let rects = s.doc().unwrap().doc.page(0).unwrap().column_rects();
+        assert!((rects[0].x1 - rects[0].x0 - 100.0).abs() < 1e-6, "the dragged columns are in use: {rects:?}");
+
+        // Top and bottom margins leave the margin box's width alone, and the columns with it.
+        let mut taller = dialog_params(36.0, 2, 12.0);
+        taller["margins"]["top"] = json!(72.0);
+        taller["margins"]["bottom"] = json!(72.0);
+        s.execute("layout.marginsAndColumns", &taller).unwrap();
+        assert_eq!(positions(&s), Some(DRAGGED.to_vec()));
+
+        // A new width scales them with the margin box, and the old width scales them back.
+        s.execute("layout.marginsAndColumns", &dialog_params(72.0, 2, 12.0)).unwrap();
+        assert_scaled(positions(&s), 468.0);
+        let rects = s.doc().unwrap().doc.page(0).unwrap().column_rects();
+        assert!((rects[0].x1 - rects[0].x0 - 100.0 * 468.0 / 540.0).abs() < 1e-6, "the scaled columns are in use: {rects:?}");
+        s.execute("layout.marginsAndColumns", &dialog_params(36.0, 2, 12.0)).unwrap();
+        assert_scaled(positions(&s), 540.0);
+
+        // A new count resets them.
+        drag(&mut s);
+        s.execute("layout.marginsAndColumns", &dialog_params(36.0, 3, 12.0)).unwrap();
+        let pg = s.doc().unwrap().doc.page(0).unwrap().clone();
+        assert_eq!((pg.columns.count, pg.columns.positions), (3, None));
+
+        // So does a new gutter.
+        drag(&mut s);
+        s.execute("layout.marginsAndColumns", &dialog_params(36.0, 2, 18.0)).unwrap();
+        let pg = s.doc().unwrap().doc.page(0).unwrap().clone();
+        assert_eq!((pg.columns.gutter, pg.columns.positions), (18.0, None));
+    }
+
+    /// A page of another width (Page Size, Document Setup) scales its dragged columns.
+    #[test]
+    fn a_new_page_width_scales_dragged_columns() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
+        let drag = |s: &mut Session| {
+            s.edit(|d, _| {
+                // A dragged page's columns are its own (`local_margins`), as the drag will make them.
+                let pg = &mut std::sync::Arc::make_mut(&mut d.spreads[0]).pages[0];
+                pg.columns = dragged();
+                pg.local_margins = true;
+                Ok(())
+            })
+            .unwrap();
+        };
+        let positions = |s: &Session| s.doc().unwrap().doc.page(0).unwrap().columns.positions.clone();
+
+        drag(&mut s);
+        s.execute("layout.pageSize", &json!({"pages": [1], "height": 900})).unwrap();
+        assert_eq!(positions(&s), Some(DRAGGED.to_vec()), "a new height keeps them");
+        s.execute("layout.pageSize", &json!({"pages": [1], "width": 700})).unwrap();
+        assert_scaled(positions(&s), 628.0);
+        s.execute("layout.pageSize", &json!({"pages": [1], "width": 612})).unwrap();
+        assert_scaled(positions(&s), 540.0);
+
+        drag(&mut s);
+        s.execute("layout.documentSetup", &json!({"width": 700})).unwrap();
+        assert_scaled(positions(&s), 628.0);
+    }
+
+    /// Parent pages follow the same rule, and the document pages that follow them see it.
+    #[test]
+    fn the_dialog_keeps_a_parents_dragged_columns_unless_the_count_or_gutter_changes() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
+        let drag = |s: &mut Session| {
+            s.edit(|d, _| {
+                std::sync::Arc::make_mut(&mut d.parents[0]).pages[0].columns = dragged();
+                d.sync_parent_margins();
+                Ok(())
+            })
+            .unwrap();
+        };
+        let positions = |s: &Session| {
+            let d = &s.doc().unwrap().doc;
+            (d.parents[0].pages[0].columns.positions.clone(), d.page(0).unwrap().columns.positions.clone())
+        };
+        let on_parent = |m: f64, c: u32, g: f64| {
+            let mut p = dialog_params(m, c, g);
+            p["parent"] = json!(0);
+            p
+        };
+
+        drag(&mut s);
+        assert_eq!(positions(&s), (Some(DRAGGED.to_vec()), Some(DRAGGED.to_vec())));
+        s.execute("layout.marginsAndColumns", &on_parent(36.0, 2, 12.0)).unwrap();
+        assert_eq!(positions(&s), (Some(DRAGGED.to_vec()), Some(DRAGGED.to_vec())));
+        s.execute("layout.marginsAndColumns", &on_parent(48.0, 2, 12.0)).unwrap();
+        let (parent, follower) = positions(&s);
+        assert_scaled(parent, 516.0);
+        assert_scaled(follower, 516.0);
+
+        drag(&mut s);
+        s.execute("layout.marginsAndColumns", &on_parent(36.0, 3, 12.0)).unwrap();
+        assert_eq!(positions(&s), (None, None));
+
+        drag(&mut s);
+        s.execute("layout.marginsAndColumns", &on_parent(36.0, 2, 24.0)).unwrap();
+        assert_eq!(positions(&s), (None, None));
+    }
+}
diff --git a/crates/engine/src/cmd/layout/pages.rs b/crates/engine/src/cmd/layout/pages.rs
new file mode 100644
index 000000000..0417f1ff6
--- /dev/null
+++ b/crates/engine/src/cmd/layout/pages.rs
@@ -0,0 +1,535 @@
+use super::margins::set_page_width;
+use super::{Result, Value, bad, json, str_param};
+
+#[allow(dead_code)]
+fn _r(_: Result<()>) {}
+
+/// Layout › Page Size (the Page tool): resize pages one by one. Left pages grow to the left
+/// (the spine stays put); objects move with their page.
+pub(super) fn page_size(s: &mut crate::Session, p: &Value) -> Result<Value> {
+    let pages: Vec<usize> =
+        p.get("pages").and_then(Value::as_array).map(|a| a.iter().filter_map(Value::as_u64).map(|n| n as usize).collect()).unwrap_or_default();
+    let n = s.doc()?.doc.page_count();
+    if pages.is_empty() || pages.iter().any(|x| *x == 0 || *x > n) {
+        return Err(bad("layout.pageSize", "give `pages` (1-based)"));
+    }
+    let (mut w, mut h) = (p.get("width").and_then(Value::as_f64), p.get("height").and_then(Value::as_f64));
+    if let Some(name) = str_param(p, "preset") {
+        let pr = designcraft_doc::build::PRESETS
+            .iter()
+            .find(|x| x.name.eq_ignore_ascii_case(name))
+            .ok_or_else(|| bad("layout.pageSize", format!("no preset `{name}`")))?;
+        w = Some(pr.width);
+        h = Some(pr.height);
+    }
+    let anchor = match p.get("anchor") {
+        None | Some(Value::Null) => 0,
+        Some(v) => v.as_u64().filter(|a| *a <= 8).ok_or_else(|| bad("layout.pageSize", "`anchor`: 0–8"))? as usize,
+    };
+    s.edit(|d, _| {
+        resize_pages_from(d, &pages, w, h, anchor);
+        Ok(json!({"pages": pages.len()}))
+    })
+}
+
+pub(super) fn page_options(s: &mut crate::Session, p: &Value) -> Result<Value> {
+    let pages: Vec<usize> =
+        p.get("pages").and_then(Value::as_array).map(|a| a.iter().filter_map(Value::as_u64).map(|n| n as usize).collect()).unwrap_or_default();
+    let n = s.doc()?.doc.page_count();
+    if pages.is_empty() || pages.iter().any(|x| *x == 0 || *x > n) {
+        return Err(bad("layout.pageOptions", "give `pages` (1-based)"));
+    }
+    let overlay = p.get("showParentOverlay").and_then(Value::as_bool);
+    s.edit(|d, _| {
+        for page in &pages {
+            let Some((si, pi)) = d.page_loc(page - 1) else { continue };
+            let pg = &mut std::sync::Arc::make_mut(&mut d.spreads[si]).pages[pi];
+            if let Some(v) = overlay {
+                pg.show_parent_overlay = v;
+            }
+        }
+        Ok(json!({"pages": pages.len()}))
+    })
+}
+
+/// Give `pages` (1-based) their own size. Objects stay on their page; pages with a liquid rule
+/// re-flow their objects by it.
+pub(crate) fn resize_pages(d: &mut designcraft_doc::Document, pages: &[usize], w: Option<f64>, h: Option<f64>) {
+    resize_pages_from(d, pages, w, h, 0);
+}
+
+/// [`resize_pages`] keeping reference point `anchor` (0–8, row-major from the top-left) in place:
+/// the page grows away from it, so objects keep their place relative to it.
+pub(crate) fn resize_pages_from(d: &mut designcraft_doc::Document, pages: &[usize], w: Option<f64>, h: Option<f64>, anchor: usize) {
+    let (fx, fy) = ((anchor % 3) as f64 / 2.0, (anchor / 3).min(2) as f64 / 2.0);
+    {
+        for page in pages {
+            let Some((si, pi)) = d.page_loc(page - 1) else { continue };
+            let sp = std::sync::Arc::make_mut(&mut d.spreads[si]);
+            let old: Vec<f64> = sp.pages.iter().map(|x| x.x).collect();
+            let old_bounds = sp.pages[pi].bounds();
+            // The page's own objects (outer pages take the pasteboard beside them).
+            let last = sp.pages.len() - 1;
+            let (lo, hi) = (if pi == 0 { f64::NEG_INFINITY } else { old_bounds.x0 }, if pi == last { f64::INFINITY } else { old_bounds.x1 });
+            let own: Vec<usize> = sp
+                .items
+                .iter()
+                .enumerate()
+                .filter(|(_, it)| {
+                    let c = it.bounds().center().x;
+                    c >= lo && c < hi
+                })
+                .map(|(i, _)| i)
+                .collect();
+            let pg = &mut sp.pages[pi];
+            let dw = w.map_or(0.0, |w| w.max(1.0) - pg.width);
+            let dh = h.map_or(0.0, |h| h.max(1.0) - pg.height);
+            if let Some(w) = w {
+                set_page_width(pg, w.max(1.0));
+            }
+            if let Some(h) = h {
+                pg.height = h.max(1.0);
+            }
+            let left = pg.side == designcraft_doc::PageSide::Left;
+            sp.relayout();
+            // Keep the spine: shift the whole spread back when a left page grows.
+            if left && dw != 0.0 {
+                for q in &mut sp.pages {
+                    q.x -= dw;
+                }
+            }
+            let new: Vec<f64> = sp.pages.iter().map(|x| x.x).collect();
+            // Objects follow their page.
+            let shifts: Vec<(f64, f64, f64)> =
+                sp.pages.iter().enumerate().map(|(k, q)| (old[k], old[k] + q.width - if k == pi { dw } else { 0.0 }, new[k] - old[k])).collect();
+            for it in &mut sp.items {
+                let cx = it.bounds().center().x;
+                if let Some((_, _, dx)) = shifts.iter().find(|(a, b, _)| cx >= *a && cx < *b)
+                    && *dx != 0.0
+                {
+                    let it = std::sync::Arc::make_mut(it);
+                    it.xf = designcraft_geom::Affine::translate((*dx, 0.0)) * it.xf;
+                }
+            }
+            // Page guides move with their page.
+            for (k, q) in sp.pages.iter_mut().enumerate() {
+                let dx = new[k] - old[k];
+                if dx != 0.0 {
+                    for g in q.guides.iter_mut().filter(|g| g.orientation == designcraft_doc::Orientation::Vertical) {
+                        g.position += dx;
+                    }
+                }
+            }
+            // Growing away from the anchor: the page's objects and guides keep their place
+            // relative to it.
+            let shift = designcraft_geom::Vec2::new(fx * dw, fy * dh);
+            if shift != designcraft_geom::Vec2::ZERO {
+                for i in &own {
+                    if let Some(it) = sp.items.get_mut(*i) {
+                        let it = std::sync::Arc::make_mut(it);
+                        it.xf = designcraft_geom::Affine::translate(shift) * it.xf;
+                    }
+                }
+                for g in &mut sp.pages[pi].guides {
+                    g.position += if g.orientation == designcraft_doc::Orientation::Vertical { shift.x } else { shift.y };
+                }
+            }
+            // Liquid rules: objects were carried along with the page's left edge (and the anchor).
+            let moved = old_bounds + designcraft_geom::Vec2::new(new[pi] - old[pi], 0.0) + shift;
+            crate::cmd::liquid::apply(d, designcraft_doc::SpreadRef::Doc(si), pi, moved);
+        }
+    }
+}
+
+/// File › Document Setup values.
+pub(super) fn document_setup(d: &designcraft_doc::Document) -> Value {
+    let st = &d.settings;
+    let start = d.sections.iter().find(|x| x.start == 0).and_then(|x| x.start_number).unwrap_or(1);
+    json!({"width": st.page_width, "height": st.page_height, "pages": d.page_count(), "startPage": start, "facingPages": st.facing_pages,
+        "binding": if st.right_to_left_binding { "rightToLeft" } else { "leftToRight" }, "intent": st.intent, "bleed": st.bleed, "slug": st.slug,
+        "margins": d.page(0).map(|p| p.margins), "primaryTextFrame": st.primary_text_frame})
+}
+
+#[cfg(test)]
+mod setup_tests {
+    use serde_json::json;
+
+    #[test]
+    fn chapter_numbering_sets_style_and_start() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("layout.chapterNumbering", &json!({})).unwrap();
+        assert_eq!(r, json!({"chapterNumber": 1, "label": "1", "style": "arabic", "source": "automatic", "book": null}));
+        let r = s.execute("layout.chapterNumbering", &json!({"start": 4, "style": "upperRoman"})).unwrap();
+        assert_eq!((&r["label"], &r["source"]), (&json!("IV"), &json!("userDefined")), "a start number means Start Chapter Numbering at");
+        s.execute("variables.define", &json!({"name": "Chapter", "type": "chapterNumber"})).unwrap();
+        let d = &s.doc().unwrap().doc;
+        let chapter = d.variable("Chapter").unwrap();
+        assert_eq!(d.variable_value(chapter, Some(0)).as_deref(), Some("IV"), "the Chapter Number variable uses the style");
+        for bad in [json!({"style": "symbols"}), json!({"start": 0}), json!({"start": 100_000}), json!({"source": "nextBook"})] {
+            assert!(s.execute("layout.chapterNumbering", &bad).is_err(), "{bad}");
+        }
+        s.execute("layout.chapterNumbering", &json!({"source": "sameAsPrevious"})).unwrap();
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.execute("layout.chapterNumbering", &json!({})).unwrap()["source"], "userDefined", "undoable");
+    }
+
+    #[test]
+    fn document_setup_sets_every_pages_margins_in_one_step() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 3, "margins": 36})).unwrap();
+        let f = s.execute("frame.create", &json!({"rect": [36, 36, 576, 756], "content": "text"})).unwrap();
+        let r = s.execute("layout.documentSetup", &json!({})).unwrap();
+        assert_eq!(r["margins"], json!({"top": 36.0, "bottom": 36.0, "inside": 36.0, "outside": 36.0}));
+        let m = json!({"top": 72, "bottom": 54, "inside": 72, "outside": 72});
+        let r = s.execute("layout.documentSetup", &json!({"margins": m, "bleed": 9, "adjustLayout": true})).unwrap();
+        assert_eq!(r["margins"]["bottom"], 54.0);
+        let d = &s.doc().unwrap().doc;
+        assert!(
+            d.spreads.iter().chain(&d.parents).flat_map(|sp| &sp.pages).all(|pg| pg.margins.top == 72.0 && pg.margins.bottom == 54.0),
+            "every page and parent page"
+        );
+        let b = d.item(designcraft_doc::ItemId(f["id"].as_u64().unwrap())).unwrap().bounds();
+        assert!((b.y0 - 72.0).abs() < 1e-6, "Adjust Layout: the frame follows the margins ({b:?})");
+        // One step: undo brings back the margins and the bleed.
+        s.execute("edit.undo", &json!({})).unwrap();
+        let r = s.execute("layout.documentSetup", &json!({})).unwrap();
+        assert_eq!((r["margins"]["top"].clone(), r["bleed"][0].clone()), (json!(36.0), json!(0.0)));
+        for bad in [
+            json!({"width": 0}),
+            json!({"height": -5}),
+            json!({"width": 1e9}),
+            json!({"width": "wide"}),
+            json!({"margins": -1}),
+            json!({"margins": {"top": 1}}),
+        ] {
+            assert!(s.execute("layout.documentSetup", &bad).is_err(), "{bad}");
+        }
+        assert_eq!(s.execute("layout.documentSetup", &json!({})).unwrap()["width"], 612.0, "refused values change nothing");
+    }
+
+    #[test]
+    fn document_setup_pages_start_bleed_slug() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 2})).unwrap();
+        let r = s.execute("layout.documentSetup", &json!({})).unwrap();
+        assert_eq!(r["pages"], 2);
+        assert_eq!(r["startPage"], 1);
+        let r = s.execute("layout.documentSetup", &json!({"pages": 5, "startPage": 2, "bleed": 9, "slug": [0, 18, 0, 0], "intent": "web"})).unwrap();
+        assert_eq!(r["pages"], 5);
+        assert_eq!(r["startPage"], 2);
+        assert_eq!(r["bleed"], json!([9.0, 9.0, 9.0, 9.0]));
+        assert_eq!(r["slug"], json!([0.0, 18.0, 0.0, 0.0]));
+        assert_eq!(r["intent"], "web");
+        let d = &s.doc().unwrap().doc;
+        assert_eq!(d.page_name(0), "2");
+        assert_eq!(d.page(0).unwrap().side, designcraft_doc::PageSide::Left);
+        assert_eq!(d.spreads[0].pages.len(), 2, "pages 2–3 form the first spread");
+        let r = s.execute("layout.documentSetup", &json!({"pages": 3})).unwrap();
+        assert_eq!(r["pages"], 3);
+        s.doc().unwrap().doc.check().unwrap();
+    }
+
+    #[test]
+    fn right_to_left_binding_reverses_spreads() {
+        use designcraft_doc::PageSide::{Left, Right};
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 4})).unwrap();
+        // A frame on page 2 stays on page 2.
+        let w = s.doc().unwrap().doc.settings.page_width;
+        let f = s.execute("frame.create", &json!({"rect": [w + 72.0, 72, w + 200.0, 200], "content": "text", "text": "two"})).unwrap();
+        let r = s.execute("layout.documentSetup", &json!({"binding": "rightToLeft"})).unwrap();
+        assert_eq!(r["binding"], "rightToLeft");
+        let d = &s.doc().unwrap().doc;
+        let shape: Vec<Vec<(designcraft_doc::PageSide, f64)>> = d.spreads.iter().map(|sp| sp.pages.iter().map(|p| (p.side, p.x)).collect()).collect();
+        // Page 1 alone on the left; pages 2–3 with 2 on the right; page 4 alone on the right.
+        assert_eq!(shape, vec![vec![(Left, 0.0)], vec![(Right, w), (Left, 0.0)], vec![(Right, 0.0)]]);
+        let (si, _) = d.page_loc(1).unwrap();
+        assert_eq!(si, 1);
+        let it = d.item(designcraft_doc::ItemId(f["id"].as_u64().unwrap())).unwrap();
+        assert_eq!(d.spreads[si].page_at_x(it.bounds().center().x), Some(0), "the frame is still on page 2");
+        assert!(it.bounds().x0 >= w, "page 2 is the right page now");
+        d.check().unwrap();
+        // And back.
+        s.execute("layout.documentSetup", &json!({"binding": "leftToRight"})).unwrap();
+        let d = &s.doc().unwrap().doc;
+        assert_eq!(d.spreads[1].pages.iter().map(|p| (p.side, p.x)).collect::<Vec<_>>(), vec![(Left, 0.0), (Right, w)]);
+    }
+
+    /// Bound right to left, a parent spread lists its right page first; each document page still
+    /// shows the parent page on its own side, at its own position, also after an IDML round trip.
+    #[test]
+    fn right_to_left_binding_shows_the_parent_page_of_the_same_side() {
+        use designcraft_doc::PageSide::{Left, Right};
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 4})).unwrap();
+        s.execute("layout.documentSetup", &json!({"binding": "rightToLeft"})).unwrap();
+        let w = s.doc().unwrap().doc.settings.page_width;
+        let parent = json!({"kind": "parent", "index": 0});
+        for (rect, text) in [(json!([72, 36, 200, 60]), "left head"), (json!([w + 72.0, 36, w + 200.0, 60]), "right head")] {
+            s.execute("frame.create", &json!({"spread": parent, "rect": rect, "content": "text", "text": text})).unwrap();
+        }
+        let d = s.doc().unwrap().doc.clone();
+        assert_eq!(d.parents[0].pages.iter().map(|p| (p.side, p.x)).collect::<Vec<_>>(), vec![(Right, w), (Left, 0.0)]);
+        let docs = [(*d).clone(), designcraft_idml::import_idml(&designcraft_idml::export_idml(&d)).unwrap()];
+        for d in docs {
+            let mut s = crate::Session::new();
+            s.add_document(crate::DocState::new(d, None));
+            for (page, side, text) in [(0, Left, "left head"), (1, Right, "right head"), (2, Left, "left head"), (3, Right, "right head")] {
+                let r = s.execute("layout.overrideParentItems", &json!({"page": page})).unwrap();
+                let d = &s.doc().unwrap().doc;
+                let ids = r["ids"].as_array().unwrap();
+                assert_eq!(ids.len(), 1, "page {}", page + 1);
+                let it = d.item(designcraft_doc::ItemId(ids[0].as_u64().unwrap())).unwrap();
+                let story = d.story(it.text_frame().unwrap().story).unwrap();
+                assert_eq!((d.page(page).unwrap().side, story.text.trim_end()), (side, text), "page {}", page + 1);
+                assert_eq!(d.page_of_item(it.id), Some(page), "page {}", page + 1);
+            }
+        }
+    }
+
+    /// Multi-column frames filled the left column first in a right-to-left document (#100):
+    /// stories made in a right-to-left-bound document start their columns on the right.
+    #[test]
+    fn new_stories_follow_the_binding_direction() {
+        use designcraft_doc::TextDirection::{LeftToRight, RightToLeft};
+        let text = (1..=12).map(|i| format!("الفقرة {i}")).collect::<Vec<_>>().join("\n");
+        for (binding, expected) in [("rightToLeft", RightToLeft), ("leftToRight", LeftToRight)] {
+            let mut s = crate::Session::new();
+            s.execute("file.new", &json!({"preset": "A4", "pages": 1})).unwrap();
+            s.execute("layout.documentSetup", &json!({"binding": binding})).unwrap();
+            let f = s.execute("frame.create", &json!({"rect": [40, 170, 555, 260], "content": "text", "text": text})).unwrap();
+            s.execute("object.textFrameOptions", &json!({"ids": [f["id"]], "columns": 2, "gutter": 20})).unwrap();
+            let sid = designcraft_doc::StoryId(f["story"].as_u64().unwrap());
+            let st = s.doc().unwrap();
+            assert_eq!(st.doc.story(sid).unwrap().direction, expected, "{binding}");
+            let cs = s.cache.get(&st.doc, sid, None);
+            let fr = &cs.frames[0];
+            let (first, last) = (fr.lines.first().unwrap(), fr.lines.last().unwrap());
+            assert!(fr.columns.len() == 2 && first.x0 != last.x0, "the text fills both columns: {:?}", fr.columns);
+            assert_eq!(first.x0 > last.x0, expected == RightToLeft, "{binding}: the first line is in the first column");
+            // An empty frame given text content starts a story too.
+            let g = s.execute("frame.create", &json!({"rect": [40, 400, 555, 500]})).unwrap();
+            s.execute("object.content", &json!({"ids": [g["id"]], "type": "text"})).unwrap();
+            let d = &s.doc().unwrap().doc;
+            let tf = d.item(designcraft_doc::ItemId(g["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+            assert_eq!(d.story(tf).unwrap().direction, expected, "{binding}: object.content");
+        }
+    }
+}
+
+#[cfg(test)]
+mod page_size_tests {
+    use serde_json::json;
+
+    #[test]
+    fn page_size_per_page_keeps_objects_on_their_page() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 3})).unwrap();
+        // Page 3 is the right page of spread 2 (pages 2–3); an object on it.
+        let d = s.doc().unwrap().doc.clone();
+        let (si, pi) = d.page_loc(2).unwrap();
+        let x0 = d.spreads[si].pages[pi].x;
+        let id = s.execute("frame.create", &json!({"spread": si, "rect": [x0 + 100.0, 100, x0 + 200.0, 200]})).unwrap()["id"].as_u64().unwrap();
+        s.execute("layout.pageSize", &json!({"pages": [2], "width": 300, "height": 500})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        let left = &d.spreads[si].pages[0];
+        assert_eq!((left.width, left.height), (300.0, 500.0));
+        assert_eq!(d.spreads[si].pages[1].x, x0, "the spine stays");
+        let it = d.item(designcraft_doc::ItemId(id)).unwrap();
+        assert_eq!(it.bounds().x0, x0 + 100.0);
+        assert_eq!(d.page_of_item(it.id), Some(2));
+        s.execute("layout.pageSize", &json!({"pages": [3], "preset": "A4"})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        assert!((d.spreads[si].pages[1].width - 595.276).abs() < 0.01);
+        assert!(s.execute("layout.pageSize", &json!({"pages": [9], "width": 100})).is_err());
+    }
+}
+
+#[cfg(test)]
+mod spread_tests {
+    use serde_json::json;
+
+    #[test]
+    fn three_page_spread_survives_page_inserts() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 5})).unwrap();
+        // [1] [2 3] [4 5]: page 4 joins spread 1 → [1] [2 3 4] [5].
+        let d = s.doc().unwrap().doc.clone();
+        let (si, pi) = d.page_loc(3).unwrap();
+        let x = d.spreads[si].pages[pi].x;
+        let id = s.execute("frame.create", &json!({"spread": si, "rect": [x + 50.0, 50, x + 150.0, 150]})).unwrap()["id"].as_u64().unwrap();
+        s.execute("layout.pages.toSpread", &json!({"page": 4, "spread": 1})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        assert_eq!(d.spreads[1].pages.len(), 3);
+        assert!(!d.spreads[1].allow_shuffle);
+        assert_eq!(d.page_of_item(designcraft_doc::ItemId(id)), Some(3), "the object went with its page");
+        // Adding a page at the start reshuffles the others but keeps the 3-page spread.
+        s.execute("layout.pages.insert", &json!({"after": 0, "count": 1})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        assert!(d.spreads.iter().any(|sp| sp.pages.len() == 3 && !sp.allow_shuffle));
+        assert_eq!(d.page_count(), 6);
+        d.check().unwrap();
+    }
+}
+
+#[cfg(test)]
+mod page_numbering_view_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn section_and_absolute_page_numbering_view() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 4})).unwrap();
+        s.execute("layout.section", &json!({"page": 1, "startNumber": 1, "style": "lowerRoman"})).unwrap();
+        s.execute("layout.section", &json!({"page": 3, "startNumber": 1})).unwrap();
+        assert_eq!((0..4).map(|i| s.page_label(i)).collect::<Vec<_>>(), ["i", "ii", "1", "2"]);
+        assert_eq!(s.resolve_page("ii"), Some(1));
+        assert_eq!(s.resolve_page("1"), Some(2), "section name first");
+        assert_eq!(s.resolve_page("+1"), Some(0), "+n is a position");
+        s.execute("prefs.set", &json!({"absolutePageNumbers": true})).unwrap();
+        assert_eq!((0..4).map(|i| s.page_label(i)).collect::<Vec<_>>(), ["1", "2", "3", "4"]);
+        assert_eq!(s.resolve_page("1"), Some(0));
+        assert_eq!(s.resolve_page("9"), None);
+    }
+
+    #[test]
+    fn section_start_numbers_are_bounded() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 2})).unwrap();
+        for n in [json!(0), json!(100_000), json!(u32::MAX), json!(u64::from(u32::MAX) + 2), json!(-1), json!(2.5), json!("7")] {
+            let e = s.execute("layout.section", &json!({"page": 1, "startNumber": n})).unwrap_err().to_string();
+            assert!(e.contains("startNumber"), "{n}: {e}");
+            assert!(s.execute("layout.documentSetup", &json!({"startPage": n})).is_err(), "{n}");
+        }
+        assert_eq!((0..2).map(|i| s.page_label(i)).collect::<Vec<_>>(), ["1", "2"]);
+        let r = s.execute("layout.section", &json!({"page": 1, "startNumber": 99_999})).unwrap();
+        assert_eq!(r["names"], json!(["99999", "100000"]));
+    }
+
+    #[test]
+    fn numbering_options_apply_in_one_undo_step_or_not_at_all() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 4})).unwrap();
+        let names = |s: &crate::Session| (0..4).map(|i| s.doc().unwrap().doc.page_name(i)).collect::<Vec<_>>();
+        let r = s
+            .execute(
+                "layout.numberingOptions",
+                &json!({"page": 3, "startNumber": 5, "style": "lowerRoman", "prefix": "A-", "includePrefix": true, "chapter": {"start": 4, "style": "upperRoman"}}),
+            )
+            .unwrap();
+        assert_eq!((r["names"].clone(), r["chapter"].clone()), (json!(["1", "2", "A-v", "A-vi"]), json!("IV")));
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(names(&s), ["1", "2", "3", "4"], "one undo reverts the section…");
+        assert_eq!(s.doc().unwrap().doc.chapter_label(), "1", "…and the chapter numbering");
+        // A refused part leaves the other undone too.
+        for bad in [
+            json!({"page": 3, "startNumber": 5, "chapter": {"start": 100_000}}),
+            json!({"page": 3, "startNumber": 4_294_967_295u64, "chapter": {"start": 2}}),
+            json!({"page": 3, "prefix": "A+B", "chapter": {"start": 2}}),
+            json!({"page": 9, "chapter": {"start": 2}}),
+        ] {
+            assert!(s.execute("layout.numberingOptions", &bad).is_err(), "{bad}");
+            assert_eq!(names(&s), ["1", "2", "3", "4"], "{bad}");
+            assert_eq!(s.doc().unwrap().doc.settings.chapter_source, designcraft_doc::ChapterSource::Automatic, "{bad}");
+        }
+        // Removing a section keeps the chapter part.
+        s.execute("layout.section", &json!({"page": 3, "startNumber": 1})).unwrap();
+        s.execute("layout.numberingOptions", &json!({"page": 3, "remove": true, "chapter": {"source": "userDefined", "start": 2}})).unwrap();
+        assert_eq!(names(&s), ["1", "2", "3", "4"]);
+        assert_eq!(s.doc().unwrap().doc.chapter_label(), "2");
+    }
+
+    #[test]
+    fn section_prefixes_are_short_and_avoid_plus_and_comma() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 2})).unwrap();
+        for prefix in ["A-", "Appendix", "§ 1"] {
+            s.execute("layout.section", &json!({"page": 2, "prefix": prefix})).unwrap();
+        }
+        for prefix in ["Appendix1", "A+", "1,2"] {
+            assert!(s.execute("layout.section", &json!({"page": 2, "prefix": prefix})).is_err(), "{prefix}");
+        }
+        assert!(s.execute("layout.section", &json!({"page": 2, "style": "symbols"})).is_err());
+        assert_eq!(s.doc().unwrap().doc.sections.iter().find(|x| x.start == 1).unwrap().prefix, "§ 1", "a refused prefix changes nothing");
+    }
+
+    /// `layout.section` edits one named setting; the others stay as the section was (#717).
+    #[test]
+    fn updating_a_section_keeps_settings_the_command_does_not_name() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 4})).unwrap();
+        s.execute(
+            "layout.section",
+            &json!({"page": 2, "startNumber": 1, "style": "lowerRoman", "prefix": "A-", "includePrefix": true, "marker": "First"}),
+        )
+        .unwrap();
+        assert_eq!(s.page_label(1), "A-i");
+        s.execute("layout.section", &json!({"page": 2, "marker": "Second"})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        let sec = d.sections.iter().find(|x| x.start == 1).expect("the page-2 section is still the only one there");
+        assert_eq!(sec.marker, "Second");
+        assert_eq!(sec.start_number, Some(1), "startNumber is kept");
+        assert_eq!(sec.style, designcraft_doc::NumberStyle::LowerRoman, "style is kept");
+        assert_eq!(sec.prefix, "A-", "prefix is kept");
+        assert!(sec.include_prefix, "includePrefix is kept");
+        assert_eq!(s.page_label(1), "A-i");
+    }
+}
+
+#[cfg(test)]
+mod spread_rotation_input_tests {
+    use serde_json::json;
+
+    #[test]
+    fn quarter_turns_work_and_other_angles_are_rejected_without_mutation() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let rotation = |s: &crate::Session| s.doc().unwrap().doc.spreads[0].pages[0].view_rotation;
+        for bad in [json!(45), json!(-45), json!(91), json!("90"), json!(0.5)] {
+            assert!(s.execute("layout.rotateSpreadView", &json!({"angle": bad})).is_err(), "{bad}");
+            assert_eq!(rotation(&s), 0, "invalid input must not change the view");
+        }
+        s.execute("layout.rotateSpreadView", &json!({"angle": 90})).unwrap();
+        assert_eq!(rotation(&s), 1);
+        s.execute("layout.rotateSpreadView", &json!({"angle": -90})).unwrap();
+        assert_eq!(rotation(&s), 0);
+        s.execute("layout.rotateSpreadView", &json!({"angle": 180})).unwrap();
+        assert_eq!(rotation(&s), 2);
+        s.execute("layout.rotateSpreadView", &json!({"angle": 0})).unwrap();
+        assert_eq!(rotation(&s), 0, "zero resets the spread view");
+    }
+}
+
+#[cfg(test)]
+mod insert_count_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// A count that is given but is not a number of pages used to insert one page anyway:
+    /// `{"count": 0}` added a page, `-1` and `1.5` added one each, and `10000` was quietly capped
+    /// to 9999. A position past the last page appends, which is deliberate.
+    #[test]
+    fn a_page_count_insert_pages_cannot_mean_is_refused() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 2, "facingPages": false})).unwrap();
+        let total = |s: &mut Session| s.execute("layout.pages.insert", &json!({"count": 1})).unwrap()["total"].as_u64().unwrap();
+        assert_eq!(total(&mut s), 3, "one page added");
+
+        for params in [json!({"count": 0}), json!({"count": -1}), json!({"count": 1.5}), json!({"count": 10000}), json!({"count": "two"})] {
+            let e = s.execute("layout.pages.insert", &params).expect_err("refused").to_string();
+            assert!(e.contains("1 to 9999 pages"), "{params}: {e}");
+        }
+        // Nothing was inserted by any of those.
+        assert_eq!(s.doc().unwrap().doc.page_count(), 3);
+        // A position past the last page still appends, which `insert_pages_bounds.rs` pins.
+        let r = s.execute("layout.pages.insert", &json!({"after": 99})).unwrap();
+        assert_eq!((r["pages"].as_u64(), r["total"].as_u64()), (Some(1), Some(4)));
+        // The positions it does have still work: after the first page of three.
+        let r = s.execute("layout.pages.insert", &json!({"count": 2, "after": 0})).unwrap();
+        assert_eq!((r["pages"].as_u64(), r["total"].as_u64()), (Some(2), Some(6)));
+    }
+}
diff --git a/crates/engine/src/cmd/layout/parents.rs b/crates/engine/src/cmd/layout/parents.rs
new file mode 100644
index 000000000..f53d774f4
--- /dev/null
+++ b/crates/engine/src/cmd/layout/parents.rs
@@ -0,0 +1,458 @@
+use super::{Result, SpreadId, Value, bad, json};
+
+/// A parent spread named by prefix, label (`A-Parent`) or index.
+pub(super) fn parent_spread_index(d: &designcraft_doc::Document, v: &Value) -> Option<usize> {
+    match v {
+        Value::Number(n) => n.as_u64().and_then(|i| usize::try_from(i).ok()).filter(|i| *i < d.parents.len()),
+        Value::String(s) => d.parents.iter().position(|p| p.parent.as_ref().is_some_and(|i| i.prefix == *s || i.label() == *s)),
+        _ => None,
+    }
+}
+
+/// A parent named by a command parameter: its id (a number), its full label (`"A-Parent"`), or
+/// its prefix (`"A"`) when only one parent has it. `null` or `"[None]"` → `Some(None)` (no parent);
+/// missing → `None` (the command's default). Unknown or ambiguous names are errors, so a typo never
+/// clears a page's parent.
+pub(super) fn parent_ref(cmd: &str, d: &designcraft_doc::Document, v: Option<&Value>) -> Result<Option<Option<SpreadId>>> {
+    let Some(v) = v else { return Ok(None) };
+    match v {
+        Value::Null => Ok(Some(None)),
+        Value::String(s) if s == "[None]" => Ok(Some(None)),
+        Value::Number(n) => {
+            let id = n.as_u64().ok_or_else(|| bad(cmd, format!("no parent with id {n}")))?;
+            d.parents.iter().find(|p| p.id.0 == id).map(|p| Some(Some(p.id))).ok_or_else(|| bad(cmd, format!("no parent with id {id}")))
+        }
+        Value::String(s) => {
+            let by = |f: &dyn Fn(&designcraft_doc::ParentInfo) -> bool| -> Vec<SpreadId> {
+                d.parents.iter().filter(|p| p.parent.as_ref().is_some_and(f)).map(|p| p.id).collect()
+            };
+            let mut hits = by(&|i| i.label() == *s);
+            if hits.is_empty() {
+                hits = by(&|i| i.prefix == *s);
+            }
+            match hits.as_slice() {
+                [id] => Ok(Some(Some(*id))),
+                [] => Err(bad(cmd, format!("no parent named `{s}`"))),
+                _ => Err(bad(cmd, format!("more than one parent is named `{s}`: give its id"))),
+            }
+        }
+        _ => Err(bad(cmd, "`parent` is a parent id, a parent name or null")),
+    }
+}
+
+/// Layout › Pages › Parent Options: Based on Parent. A base that would make a cycle is refused.
+pub(super) fn parent_options(s: &mut crate::Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "layout.parents.options";
+    let d = &s.doc()?.doc;
+    let Some(Some(id)) = parent_ref(CMD, d, p.get("parent"))? else { return Err(bad(CMD, "`parent` names the parent to change")) };
+    let pi = d.parent_index(id).ok_or_else(|| bad(CMD, format!("no parent with id {}", id.0)))?;
+    let base = parent_ref(CMD, d, p.get("basedOn"))?.ok_or_else(|| bad(CMD, "missing `basedOn` (a parent, or null for [None])"))?;
+    let label = |d: &designcraft_doc::Document, i: usize| d.parents.get(i).and_then(|x| x.parent.as_ref()).map(|i| i.label());
+    if let Some(b) = base
+        && d.parent_base_cycles(pi, b)
+    {
+        let (name, b) = (label(d, pi).unwrap_or_default(), d.parent_index(b).and_then(|i| label(d, i)).unwrap_or_default());
+        return Err(bad(CMD, format!("{name} cannot be based on {b}: that would make a cycle")));
+    }
+    let out = json!({"parent": label(d, pi), "basedOn": base.and_then(|b| d.parent_index(b)).and_then(|i| label(d, i))});
+    if d.parents.get(pi).and_then(|x| x.parent.as_ref()).and_then(|i| i.based_on) == base {
+        return Ok(out);
+    }
+    s.edit(|d, _| {
+        let info = d.parents.get_mut(pi).map(std::sync::Arc::make_mut).and_then(|x| x.parent.as_mut()).ok_or_else(|| bad(CMD, "no such parent"))?;
+        info.based_on = base;
+        Ok(out)
+    })
+}
+
+#[cfg(test)]
+mod parent_margin_tests {
+    use designcraft_doc::{Document, Margins};
+    use serde_json::json;
+
+    use crate::Session;
+
+    fn margins(d: &Document) -> Vec<(Margins, u32, bool)> {
+        (0..d.page_count()).filter_map(|i| d.page(i)).map(|p| (p.margins, p.columns.count, p.local_margins)).collect()
+    }
+
+    #[test]
+    fn document_setup_margins_let_pages_follow_their_parent_page_again() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 3})).unwrap();
+        s.execute("layout.marginsAndColumns", &json!({"pages": [1], "margins": 100})).unwrap();
+        s.execute("layout.marginsAndColumns", &json!({"pages": [2], "margins": 100, "columns": 3})).unwrap();
+        s.execute("layout.documentSetup", &json!({"margins": 20})).unwrap();
+        let m = margins(&s.doc().unwrap().doc);
+        let twenty = Margins::uniform(20.0);
+        assert_eq!(m, vec![(twenty, 1, false), (twenty, 1, false), (twenty, 3, true)], "own columns stay local");
+        s.execute("layout.marginsAndColumns", &json!({"parent": "A", "margins": 50})).unwrap();
+        let m = margins(&s.doc().unwrap().doc);
+        assert_eq!(m[1], (Margins::uniform(50.0), 1, false), "page 2 follows the parent page again");
+        assert_eq!(m[2], (twenty, 3, true));
+    }
+
+    #[test]
+    fn pages_follow_their_parent_pages_margins_unless_set_locally() {
+        let mut s = Session::new();
+        // Facing: [1] [2 3]; page 3 gets its own margins.
+        s.execute("file.new", &json!({"pages": 3})).unwrap();
+        s.execute("layout.marginsAndColumns", &json!({"pages": [2], "margins": 100})).unwrap();
+        // A's left page: only the left document page follows.
+        let left = json!({"top": 10, "bottom": 20, "inside": 30, "outside": 40});
+        s.execute("layout.marginsAndColumns", &json!({"parent": "A", "pages": [0], "margins": left, "columns": 2})).unwrap();
+        let l = Margins { top: 10.0, bottom: 20.0, inside: 30.0, outside: 40.0 };
+        let m = margins(&s.doc().unwrap().doc);
+        assert_eq!(m, vec![(Margins::uniform(36.0), 1, false), (l, 2, false), (Margins::uniform(100.0), 1, true)]);
+        // A's right page: page 1 follows, page 3 keeps its own.
+        s.execute("layout.marginsAndColumns", &json!({"parent": "A-Parent", "pages": [1], "margins": 50})).unwrap();
+        let m = margins(&s.doc().unwrap().doc);
+        assert_eq!(m, vec![(Margins::uniform(50.0), 1, false), (l, 2, false), (Margins::uniform(100.0), 1, true)]);
+        // A page inserted after page 1 pushes page 2 to the right: it takes the right parent page's.
+        s.execute("layout.pages.insert", &json!({"after": 0, "count": 1, "parent": "A"})).unwrap();
+        let m = margins(&s.doc().unwrap().doc);
+        assert_eq!(m[1], (l, 2, false), "the new left page");
+        assert_eq!(m[2], (Margins::uniform(50.0), 1, false), "old page 2, now a right page");
+        assert_eq!(m[3], (Margins::uniform(100.0), 1, true));
+        assert!(s.execute("layout.marginsAndColumns", &json!({"parent": "Z", "margins": 10})).is_err());
+    }
+
+    #[test]
+    fn applying_a_parent_gives_its_margins_and_local_margins_stay_local() {
+        let mut s = Session::new();
+        // Facing: [1] [2 3].
+        s.execute("file.new", &json!({"pages": 3})).unwrap();
+        s.execute("layout.parents.new", &json!({"prefix": "B"})).unwrap();
+        s.execute("layout.marginsAndColumns", &json!({"parent": "B", "margins": 70, "columns": 3})).unwrap();
+        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "B"})).unwrap();
+        let m = margins(&s.doc().unwrap().doc);
+        assert_eq!(m[1], (Margins::uniform(70.0), 3, false), "the page takes B's margins");
+        // Page 3 is given margins equal to A's: they are its own all the same.
+        s.execute("layout.marginsAndColumns", &json!({"pages": [2], "margins": 36})).unwrap();
+        s.execute("layout.marginsAndColumns", &json!({"parent": "A", "margins": 20})).unwrap();
+        let m = margins(&s.doc().unwrap().doc);
+        assert_eq!(m[0], (Margins::uniform(20.0), 1, false));
+        assert_eq!(m[1], (Margins::uniform(70.0), 3, false), "B's page is not A's");
+        assert_eq!(m[2], (Margins::uniform(36.0), 1, true));
+        // Back to A: page 2 follows A again.
+        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "A"})).unwrap();
+        assert_eq!(margins(&s.doc().unwrap().doc)[1], (Margins::uniform(20.0), 1, false));
+    }
+
+    #[test]
+    fn parent_guides_show_on_pages_but_stay_on_the_parent() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 2})).unwrap();
+        // A vertical guide 100 pt into A's right page (x = 612 in the parent spread).
+        s.execute("guide.add", &json!({"spread": {"kind": "parent", "index": 0}, "page": 1, "orientation": "vertical", "position": 712})).unwrap();
+        let d = &s.doc().unwrap().doc;
+        let right = d.page(0).unwrap();
+        let shown: Vec<f64> = d.parent_guides(right).map(|g| g.position).collect();
+        assert_eq!(shown, vec![100.0], "moved to the document page's place");
+        assert_eq!(d.parent_guides(d.page(1).unwrap()).count(), 0, "the left page shows A's left page's guides");
+        // Not the document page's own: not listed, moved or deleted from there.
+        assert_eq!(s.execute("guide.list", &json!({"spread": 0})).unwrap(), json!([]));
+        assert!(s.execute("guide.move", &json!({"spread": 0, "page": 0, "index": 0, "position": 50})).is_err());
+        assert!(s.execute("guide.delete", &json!({"spread": 0, "page": 0, "index": 0})).is_err());
+    }
+}
+
+#[cfg(test)]
+mod parent_tests {
+    use serde_json::json;
+
+    fn parent_of(s: &crate::Session, page: usize) -> Option<u64> {
+        s.doc().unwrap().doc.page(page).unwrap().parent.map(|p| p.0)
+    }
+
+    #[test]
+    fn parents_with_one_prefix_stay_distinct() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 2})).unwrap();
+        let a = s.execute("layout.parents.new", &json!({"prefix": "IMG", "name": "Parent"})).unwrap()["id"].as_u64().unwrap();
+        let b = s.execute("layout.parents.new", &json!({"prefix": "IMG", "name": "Half"})).unwrap()["id"].as_u64().unwrap();
+        s.execute("layout.pages.applyParent", &json!({"pages": [0], "parent": b})).unwrap();
+        assert_eq!(parent_of(&s, 0), Some(b));
+        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "IMG-Half"})).unwrap();
+        assert_eq!(parent_of(&s, 1), Some(b));
+        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "IMG-Parent"})).unwrap();
+        assert_eq!(parent_of(&s, 1), Some(a));
+        // A prefix two parents share, or a name no parent has, is an error and changes nothing.
+        assert!(s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "IMG"})).is_err());
+        assert!(s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "Nope"})).is_err());
+        assert!(s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": 999_999})).is_err());
+        assert_eq!(parent_of(&s, 1), Some(a));
+        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "[None]"})).unwrap();
+        assert_eq!(parent_of(&s, 1), None);
+    }
+
+    #[test]
+    fn edit_parents_shows_the_named_parent() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let ids: Vec<u64> =
+            ["B", "C", "D"].iter().map(|p| s.execute("layout.parents.new", &json!({"prefix": p})).unwrap()["id"].as_u64().unwrap()).collect();
+        s.ui_requests.clear();
+        let r = s.execute("layout.parents.edit", &json!({"parent": ids[2]})).unwrap();
+        assert_eq!(r, json!({"on": true, "parent": ids[2]}));
+        assert!(s.doc().unwrap().editing_parents);
+        let n = s.doc().unwrap().doc.parent_index(designcraft_doc::SpreadId(ids[2])).unwrap();
+        let shown: Vec<_> = s
+            .ui_requests
+            .iter()
+            .filter_map(|r| match r {
+                crate::UiRequest::View { params } => params.get("showSpread").cloned(),
+                _ => None,
+            })
+            .collect();
+        assert_eq!(shown, vec![json!({"kind": "parent", "index": n})]);
+        let r = s.execute("layout.parents.edit", &json!({"on": true, "parent": "C-Parent"})).unwrap();
+        assert_eq!(r["parent"], ids[1]);
+        assert!(s.execute("layout.parents.edit", &json!({"parent": "Z-Parent"})).is_err());
+        let r = s.execute("layout.parents.edit", &json!({"on": false})).unwrap();
+        assert_eq!(r, json!({"on": false, "parent": null}));
+        assert!(!s.doc().unwrap().editing_parents);
+    }
+
+    /// A new parent takes the first page's columns, dragged column guides included: the right
+    /// parent page as the first (right) page has them, the left one mirrored across the spine.
+    /// `document.inspect` reports where those columns are.
+    #[test]
+    fn a_new_parent_keeps_dragged_columns() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 1})).unwrap();
+        let dragged = designcraft_doc::Columns { count: 2, gutter: 12.0, positions: Some(vec![0.0, 100.0, 130.0, 540.0]) };
+        // There is no command for dragging a column guide yet, so set what an import would leave.
+        s.edit(|d, _| {
+            let pg = &mut std::sync::Arc::make_mut(&mut d.spreads[0]).pages[0];
+            (pg.columns, pg.local_margins) = (dragged.clone(), true);
+            Ok(())
+        })
+        .unwrap();
+        let id = s.execute("layout.parents.new", &json!({"prefix": "B"})).unwrap()["id"].as_u64().unwrap();
+        let d = &s.doc().unwrap().doc;
+        let parent = d.parents.iter().find(|p| p.id.0 == id).unwrap();
+        assert_eq!(parent.pages.len(), 2);
+        let side = |s: designcraft_doc::PageSide| parent.pages.iter().find(|p| p.side == s).unwrap();
+        let (left, right) = (side(designcraft_doc::PageSide::Left), side(designcraft_doc::PageSide::Right));
+        assert_eq!(right.columns, dragged);
+        assert_eq!(right.column_rects().iter().map(|r| r.width()).collect::<Vec<_>>(), vec![100.0, 410.0]);
+        assert_eq!(left.columns.positions, Some(vec![0.0, 410.0, 440.0, 540.0]));
+        assert_eq!(left.column_rects().iter().map(|r| r.width()).collect::<Vec<_>>(), vec![410.0, 100.0]);
+
+        let inspect = s.execute("document.inspect", &json!({})).unwrap();
+        let page = &inspect["spreads"][0]["pages"][0];
+        assert_eq!((page["columns"].clone(), page["customColumns"].clone()), (json!(2), json!(true)), "{page}");
+        assert_eq!(page["columnRects"][0], json!([36.0, 36.0, 136.0, 756.0]), "{page}");
+    }
+
+    fn columns_of(s: &crate::Session, abs: usize) -> (Option<Vec<f64>>, bool) {
+        let pg = s.doc().unwrap().doc.page(abs).unwrap().clone();
+        (pg.columns.positions, pg.local_margins)
+    }
+
+    /// Three columns across a 540 pt margin box (36 pt margins), column guides unlocked.
+    fn three_columns(pages: u64) -> crate::Session {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": pages})).unwrap();
+        s.execute("layout.marginsAndColumns", &json!({"parent": "A", "columns": 3, "gutter": 12})).unwrap();
+        s.execute("view.lockColumnGuides", &json!({"on": false})).unwrap();
+        s
+    }
+
+    /// Dragging a column guide moves its gutter's two guides together, stops at the neighbouring
+    /// gutter and the margin, makes a following page's columns its own, and undoes in one step.
+    #[test]
+    fn move_column_guide_moves_the_gutter_pair_within_its_neighbours() {
+        let mut s = three_columns(1);
+        assert_eq!(columns_of(&s, 0), (None, false), "the page follows A");
+        let mv =
+            |s: &mut crate::Session, gutter: u64, x: f64| s.execute("layout.moveColumnGuide", &json!({"page": 0, "gutter": gutter, "position": x}));
+        let r = mv(&mut s, 0, 236.0).unwrap();
+        assert_eq!(r, json!({"positions": [0.0, 200.0, 212.0, 356.0, 368.0, 540.0], "left": 236.0}));
+        assert_eq!(columns_of(&s, 0), (Some(vec![0.0, 200.0, 212.0, 356.0, 368.0, 540.0]), true));
+        let inspect = s.execute("document.inspect", &json!({})).unwrap();
+        assert_eq!(inspect["spreads"][0]["pages"][0]["columnRects"][0], json!([36.0, 36.0, 236.0, 756.0]));
+        // Past the next gutter: it stops there, and the middle column has no width.
+        assert_eq!(mv(&mut s, 0, 1000.0).unwrap()["left"], json!(36.0 + 344.0));
+        // Past the right margin: the last gutter stops 12 pt (its width) inside it.
+        assert_eq!(mv(&mut s, 1, 1e12).unwrap()["positions"], json!([0.0, 344.0, 356.0, 528.0, 540.0, 540.0]));
+        // Past the left margin.
+        assert_eq!(mv(&mut s, 0, -1e12).unwrap()["positions"], json!([0.0, 0.0, 12.0, 528.0, 540.0, 540.0]));
+        for _ in 0..3 {
+            s.execute("edit.undo", &json!({})).unwrap();
+        }
+        assert_eq!(columns_of(&s, 0), (Some(vec![0.0, 200.0, 212.0, 356.0, 368.0, 540.0]), true));
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(columns_of(&s, 0), (None, false), "one undo step per drag");
+    }
+
+    /// On a parent page the drag changes the parent, and the document pages that follow it get
+    /// the new columns; a page with columns of its own keeps them.
+    #[test]
+    fn move_column_guide_on_a_parent_reaches_the_pages_that_follow_it() {
+        let mut s = three_columns(3);
+        // Page 1, the left page of spread 1, gets columns of its own.
+        let x = s.doc().unwrap().doc.spreads[1].pages[0].margin_rect().x0 + 300.0;
+        s.execute("layout.moveColumnGuide", &json!({"spread": 1, "page": 0, "gutter": 1, "position": x})).unwrap();
+        let own = columns_of(&s, 1);
+        assert!(own.1 && own.0.is_some());
+        let d = &s.doc().unwrap().doc;
+        // A's right page: the one page 0 (a right page) and page 2 follow.
+        let x0 = d.parents[0].pages[1].margin_rect().x0;
+        s.execute("layout.moveColumnGuide", &json!({"parent": "A", "page": 1, "gutter": 0, "position": x0 + 100.0})).unwrap();
+        let moved = vec![0.0, 100.0, 112.0, 356.0, 368.0, 540.0];
+        assert_eq!(s.doc().unwrap().doc.parents[0].pages[1].columns.positions, Some(moved.clone()));
+        assert_eq!(columns_of(&s, 0), (Some(moved.clone()), false));
+        assert_eq!(columns_of(&s, 2), (Some(moved), false));
+        assert_eq!(columns_of(&s, 1), own, "page 1's columns are its own");
+        // The same parent page by spread reference.
+        let spread = json!({"kind": "parent", "index": 0});
+        s.execute("layout.moveColumnGuide", &json!({"spread": spread, "page": 1, "gutter": 0, "position": x0 + 50.0})).unwrap();
+        assert_eq!(columns_of(&s, 0).0.unwrap()[1], 50.0);
+    }
+
+    /// A drag's preview in one document is put back there when another document became active.
+    #[test]
+    fn a_column_guide_preview_is_cancelled_in_its_own_document() {
+        let mut s = three_columns(1);
+        let uid = s.doc().unwrap().uid;
+        s.begin_interaction("Move Column Guide").unwrap();
+        s.preview("layout.moveColumnGuide", json!({"page": 0, "gutter": 0, "position": 236})).unwrap();
+        s.execute("file.new", &json!({})).unwrap();
+        s.cancel_interaction_of(uid);
+        s.set_active(0);
+        assert!(s.doc().unwrap().interaction.is_none());
+        assert_eq!(columns_of(&s, 0), (None, false));
+    }
+
+    #[test]
+    fn move_column_guide_refuses_while_locked_and_hostile_params() {
+        let mut s = three_columns(1);
+        s.execute("view.lockColumnGuides", &json!({"on": true})).unwrap();
+        assert!(s.execute("layout.moveColumnGuide", &json!({"page": 0, "gutter": 0, "position": 200})).is_err());
+        assert_eq!(columns_of(&s, 0), (None, false));
+        s.execute("view.lockColumnGuides", &json!({"on": false})).unwrap();
+        for p in [
+            json!({"page": 0, "gutter": 0}),
+            json!({"page": 0, "gutter": 0, "position": f64::NAN}),
+            json!({"page": 0, "gutter": 0, "position": "200"}),
+            json!({"page": 0, "gutter": 2, "position": 200}),
+            json!({"page": 0, "gutter": u64::MAX, "position": 200}),
+            json!({"page": 0, "gutter": -1, "position": 200}),
+            json!({"page": 0, "gutter": 0.5, "position": 200}),
+            json!({"page": 9, "gutter": 0, "position": 200}),
+            json!({"page": u64::MAX, "gutter": 0, "position": 200}),
+            json!({"gutter": 0, "position": 200}),
+            json!({"spread": 99, "page": 0, "gutter": 0, "position": 200}),
+            json!({"parent": "Z", "page": 0, "gutter": 0, "position": 200}),
+            json!({"page": 0, "gutter": 0, "position": f64::MAX}),
+        ] {
+            let r = s.execute("layout.moveColumnGuide", &p);
+            // A huge but finite position is clamped to the margin; everything else is refused.
+            assert!(r.is_err() || p["position"] == json!(f64::MAX), "{p}: {r:?}");
+        }
+    }
+}
+
+#[cfg(test)]
+mod parent_base_tests {
+    use serde_json::{Value, json};
+
+    fn rect(s: &mut crate::Session, spread: Value, r: [f64; 4], swatch: &str) -> u64 {
+        let id = s.execute("frame.create", &json!({"spread": spread, "rect": r, "content": "unassigned"})).unwrap()["id"].as_u64().unwrap();
+        s.execute("object.fill", &json!({"ids": [id], "swatch": swatch})).unwrap();
+        id
+    }
+
+    fn page(s: &crate::Session, abs: usize) -> designcraft_render::Rendered {
+        let mut rr = designcraft_render::Renderer::new();
+        rr.threads = 0;
+        rr.render_page(&s.doc().unwrap().doc, &s.cache, abs, 1.0, false, &Default::default()).unwrap()
+    }
+
+    /// Parent A (black), parent B based on A (cyan, half over A's square), and a page item (paper)
+    /// over B's: the page draws A, then B, then its own items.
+    #[test]
+    fn based_on_parent_draws_base_items_under_parent_items() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"width": 400, "height": 400, "pages": 2, "facingPages": false, "margins": 0})).unwrap();
+        s.execute("layout.parents.new", &json!({"prefix": "B", "name": "Opening"})).unwrap();
+        rect(&mut s, json!({"kind": "parent", "index": 0}), [0.0, 0.0, 200.0, 200.0], "[Black]");
+        rect(&mut s, json!({"kind": "parent", "index": 1}), [100.0, 0.0, 300.0, 200.0], "C=100 M=0 Y=0 K=0");
+        rect(&mut s, json!(1), [150.0, 0.0, 190.0, 40.0], "[Paper]");
+        s.execute("layout.pages.applyParent", &json!({"pages": [1], "parent": "B"})).unwrap();
+        let black = |p: [u8; 4]| p[0] < 80 && p[1] < 80 && p[2] < 80;
+        let cyan = |p: [u8; 4]| p[0] < 80 && p[1] > 120 && p[2] > 180;
+        let paper = |p: [u8; 4]| p[0] > 240 && p[1] > 240 && p[2] > 240;
+        assert!(paper(page(&s, 1).pixel(50, 100)), "B alone does not show A's items");
+
+        let r = s.execute("layout.parents.options", &json!({"parent": "B", "basedOn": "A"})).unwrap();
+        assert_eq!(r, json!({"parent": "B-Opening", "basedOn": "A-Parent"}));
+        let img = page(&s, 1);
+        assert!(black(img.pixel(50, 100)), "A's item: {:?}", img.pixel(50, 100));
+        assert!(cyan(img.pixel(150, 150)), "B's item over A's: {:?}", img.pixel(150, 150));
+        assert!(paper(img.pixel(170, 20)), "the page's item over B's: {:?}", img.pixel(170, 20));
+        assert!(black(page(&s, 0).pixel(50, 100)) && !cyan(page(&s, 0).pixel(250, 100)), "page 1 uses A only");
+        // Parent B itself shows A's items under its own.
+        let mut rr = designcraft_render::Renderer::new();
+        rr.threads = 0;
+        let placed = [designcraft_render::Placed { spread: designcraft_doc::SpreadRef::Parent(1), xf: designcraft_geom::Affine::IDENTITY }];
+        let opts = designcraft_render::RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
+        let img = rr.render(&s.doc().unwrap().doc, &s.cache, &placed, (400, 400), designcraft_geom::Affine::IDENTITY, &opts);
+        assert!(black(img.pixel(50, 100)) && cyan(img.pixel(150, 150)), "{:?} {:?}", img.pixel(50, 100), img.pixel(150, 150));
+        let inspect = s.execute("document.inspect", &json!({})).unwrap();
+        assert_eq!(inspect["parents"][1]["basedOn"], "A-Parent");
+        assert_eq!(inspect["parents"][0]["basedOn"], Value::Null);
+
+        // Cycles are refused.
+        assert!(s.execute("layout.parents.options", &json!({"parent": "A", "basedOn": "B"})).is_err());
+        assert!(s.execute("layout.parents.options", &json!({"parent": "B", "basedOn": "B-Opening"})).is_err());
+        assert!(s.execute("layout.parents.options", &json!({"parent": "B", "basedOn": "Z"})).is_err());
+
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert!(paper(page(&s, 1).pixel(50, 100)), "undo clears Based on Parent");
+        s.execute("edit.redo", &json!({})).unwrap();
+        s.execute("layout.parents.options", &json!({"parent": "B", "basedOn": null})).unwrap();
+        assert_eq!(s.execute("document.inspect", &json!({})).unwrap()["parents"][1]["basedOn"], Value::Null);
+    }
+
+    /// A's page-number marker shown on parent XYZ (based on A) reads XYZ, as markers on XYZ's own items do.
+    #[test]
+    fn base_parent_markers_read_the_showing_parent() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 1, "facingPages": false})).unwrap();
+        s.execute("layout.parents.new", &json!({"prefix": "XYZ"})).unwrap();
+        s.execute("layout.parents.options", &json!({"parent": "XYZ", "basedOn": "A"})).unwrap();
+        let marker = designcraft_doc::story::PAGE_NUMBER.to_string();
+        let r = s
+            .execute("frame.create", &json!({"spread": {"kind": "parent", "index": 0}, "rect": [72, 30, 500, 60], "content": "text", "text": marker}))
+            .unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        let sid = d.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+        let glyphs = |on| -> usize {
+            let cs = s.cache.get_on(&d, sid, on);
+            cs.frames.iter().flat_map(|f| f.lines.iter()).map(|l| l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0).count()).sum()
+        };
+        assert_eq!(glyphs(designcraft_compose::ShownOn::Own), 1, "A");
+        assert_eq!(glyphs(designcraft_compose::ShownOn::Parent(1)), 3, "XYZ");
+    }
+
+    /// A file whose parents are based on each other opens, with the cycle broken and reported.
+    #[test]
+    fn opening_a_parent_cycle_breaks_it_with_a_warning() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"pages": 1})).unwrap();
+        s.execute("layout.parents.new", &json!({"prefix": "B"})).unwrap();
+        let mut d = s.doc().unwrap().doc.as_ref().clone();
+        let (a, b) = (d.parents[0].id, d.parents[1].id);
+        std::sync::Arc::make_mut(&mut d.parents[0]).parent.as_mut().unwrap().based_on = Some(b);
+        std::sync::Arc::make_mut(&mut d.parents[1]).parent.as_mut().unwrap().based_on = Some(a);
+        let b64 = crate::cmd::base64_encode(&crate::cmd::to_bytes(&d).unwrap());
+        let r = s.execute("file.openBytes", &json!({"name": "cycle", "base64": b64})).unwrap();
+        assert!(r["warnings"].to_string().contains("cycle"), "{r}");
+        let d = &s.doc().unwrap().doc;
+        assert_eq!(d.parents[0].parent.as_ref().unwrap().based_on, None);
+        assert_eq!(d.parents[1].parent.as_ref().unwrap().based_on, Some(a));
+    }
+}
diff --git a/crates/engine/src/cmd/layout/registry.rs b/crates/engine/src/cmd/layout/registry.rs
new file mode 100644
index 000000000..4826f9273
--- /dev/null
+++ b/crates/engine/src/cmd/layout/registry.rs
@@ -0,0 +1,742 @@
+use super::layers::set_layer;
+use super::margins::{adjust_layout, column_guides_unlocked, margin_boxes, move_column_guide, set_margins_columns, set_page_width};
+use super::pages::{document_setup, page_options, page_size};
+use super::parents::{parent_options, parent_ref, parent_spread_index};
+use super::sections::{ChapterEdit, SectionEdit, chapter_numbering, start_number};
+use super::{CommandSpec, LAYER_COLORS, Layer, LayerId, Margins, SpreadId, Value, bad, cmd, has_doc, json, ok, str_param};
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        cmd!(
+            "layout.pages.insert",
+            "Insert Pages…",
+            ["Layout", "Pages"],
+            Some("Cmd+Shift+P"),
+            "{count?: 1 (1 to 9999), after?: 0-based page index (default: the last page), parent?: id|\"A-Parent\"|\"A\"|null}",
+            has_doc,
+            |s, p| {
+                const ID: &str = "layout.pages.insert";
+                // A count that is given but is not a number of pages used to insert one page:
+                // `0`, `-1` and `1.5` all came out as 1, and 10000 was quietly capped.
+                let count = match p.get("count").filter(|v| !v.is_null()) {
+                    None => 1,
+                    Some(v) => match v.as_u64().filter(|n| (1..=9999).contains(n)).map(|n| n as usize) {
+                        Some(n) => n,
+                        None => return Err(bad(ID, format!("count {v}: 1 to 9999 pages"))),
+                    },
+                };
+                let st = s.doc()?;
+                let n = st.doc.page_count();
+                // An `after` past the last page appends, which `insert_after_u64_max_appends_at_the_end`
+                // pins deliberately.
+                let after = p.get("after").and_then(Value::as_u64).map(|v| usize::try_from(v).unwrap_or(usize::MAX)).unwrap_or(n.saturating_sub(1));
+                let parent = parent_ref(ID, &st.doc, p.get("parent"))?.unwrap_or_else(|| st.doc.parents.first().map(|x| x.id));
+                s.edit(|d, _| {
+                    let ids = d.insert_pages(Some(after), count, parent)?;
+                    Ok(json!({"pages": ids.len(), "total": d.page_count()}))
+                })
+            }
+        ),
+        cmd!(
+            "layout.rotateSpreadView",
+            "Rotate Spread",
+            [],
+            None,
+            "{spread?: index (0), angle: 90 (clockwise) | -90 | 180 | 0 (clear)} — turn one spread on screen (output is unaffected)",
+            has_doc,
+            |s, p| {
+                let si = p.get("spread").and_then(Value::as_u64).unwrap_or(0) as usize;
+                let angle = match p.get("angle") {
+                    None => 90,
+                    Some(v) => v.as_i64().ok_or_else(|| bad("layout.rotateSpreadView", "angle must be an integer multiple of 90 degrees"))?,
+                };
+                if angle % 90 != 0 {
+                    return Err(bad("layout.rotateSpreadView", "angle must be an integer multiple of 90 degrees"));
+                }
+                s.edit(|d, _| {
+                    let sp = d.spreads.get_mut(si).ok_or_else(|| bad("layout.rotateSpreadView", "no such spread"))?;
+                    let pg = std::sync::Arc::make_mut(sp).pages.first_mut().ok_or_else(|| bad("layout.rotateSpreadView", "empty spread"))?;
+                    pg.view_rotation = if angle == 0 { 0 } else { ((pg.view_rotation as i64 + angle.div_euclid(90)).rem_euclid(4)) as u8 };
+                    Ok(json!({"rotation": pg.view_rotation as u32 * 90}))
+                })
+            }
+        ),
+        cmd!("layout.pages.delete", "Delete Pages", ["Layout", "Pages"], None, "{pages: [index]}", has_doc, |s, p| {
+            let pages: Vec<usize> = p
+                .get("pages")
+                .and_then(Value::as_array)
+                .map(|a| a.iter().filter_map(Value::as_u64).map(|v| v as usize).collect())
+                .unwrap_or_default();
+            s.edit(|d, sel| {
+                d.delete_pages(&pages)?;
+                sel.items.retain(|i| d.item(*i).is_some());
+                sel.text = sel.text.filter(|t| d.story(t.story).is_some());
+                ok()
+            })
+        }),
+        cmd!("layout.pages.move", "Move Pages…", ["Layout", "Pages"], None, "{from, to}", has_doc, |s, p| {
+            let from = p.get("from").and_then(Value::as_u64).ok_or_else(|| bad("layout.pages.move", "missing from"))? as usize;
+            let to = p.get("to").and_then(Value::as_u64).ok_or_else(|| bad("layout.pages.move", "missing to"))? as usize;
+            s.edit(|d, _| {
+                d.move_page(from, to)?;
+                ok()
+            })
+        }),
+        cmd!(
+            "layout.pages.duplicateSpread",
+            "Duplicate Spread",
+            ["Layout", "Pages"],
+            None,
+            "{spread, atEnd?: bool (Duplicate Spread at End of Document; the Pages panel's New Page button takes a dropped page there), to?: page index the copied pages move to in the same undo step (the Pages panel's Alt-drag)} → {page: the copy's first page (0-based)} — the spread's pages (size, margins, columns, guides, liquid rule) and items",
+            has_doc,
+            |s, p| {
+                let si = p.get("spread").and_then(Value::as_u64).unwrap_or(0) as usize;
+                let at_end = p.get("atEnd").and_then(Value::as_bool).unwrap_or(false);
+                let to = p.get("to").and_then(Value::as_u64).map(|t| t as usize);
+                s.edit(|d, _| {
+                    let sp = d.spreads.get(si).cloned().ok_or_else(|| bad("layout.pages.duplicateSpread", "no such spread"))?;
+                    // The copies land at `to`..`to + n` of the document with them in it.
+                    if to.is_some_and(|t| t > d.page_count()) {
+                        return Err(bad("layout.pages.duplicateSpread", "no such page"));
+                    }
+                    let after = if at_end { d.page_count() - 1 } else { d.first_page_of_spread(si) + sp.pages.len() - 1 };
+                    let parent = sp.pages.first().and_then(|p| p.parent);
+                    d.insert_pages(Some(after), sp.pages.len(), parent)?;
+                    // The copies are the pages they copy: size, margins, columns, guides, liquid rule.
+                    for (k, src) in sp.pages.iter().enumerate() {
+                        let Some((nsi, npi)) = d.page_loc(after + 1 + k) else { continue };
+                        let nsp = std::sync::Arc::make_mut(&mut d.spreads[nsi]);
+                        let pg = &mut nsp.pages[npi];
+                        let dx = pg.x - src.x;
+                        // A copy on the other side of the spine has its dragged columns mirrored.
+                        let columns = pg.columns_from(src);
+                        (pg.width, pg.height, pg.margins, pg.columns, pg.liquid) = (src.width, src.height, src.margins, columns, src.liquid);
+                        pg.guides = src.guides.clone();
+                        for g in pg.guides.iter_mut().filter(|g| g.orientation == designcraft_doc::Orientation::Vertical) {
+                            g.position += dx;
+                        }
+                        nsp.relayout();
+                    }
+                    // Copy items onto the new spread(s) at the same positions.
+                    let src = d.clone();
+                    let ids: Vec<_> = sp.items.iter().map(|i| i.id).collect();
+                    let (nsi, _) = d.page_loc(after + 1).ok_or_else(|| bad("layout.pages.duplicateSpread", "insert failed"))?;
+                    crate::cmd::object::duplicate_from(d, &src, &ids, designcraft_doc::SpreadRef::Doc(nsi), designcraft_geom::Vec2::ZERO)?;
+                    let first = after + 1;
+                    let Some(to) = to else { return Ok(json!({"page": first})) };
+                    // Moving a page shifts the ones between; order the moves so each copy keeps
+                    // its place among the others.
+                    let n = sp.pages.len();
+                    if first < to {
+                        for k in (0..n).rev() {
+                            d.move_page(first + k, to + k)?;
+                        }
+                    } else {
+                        for k in 0..n {
+                            d.move_page(first + k, to + k)?;
+                        }
+                    }
+                    Ok(json!({"page": to}))
+                })
+            }
+        ),
+        cmd!(
+            "layout.pages.applyParent",
+            "Apply Parent to Pages…",
+            ["Layout", "Pages"],
+            None,
+            "{pages: [index], parent: id|\"A-Parent\"|\"A\"|null (null or \"[None]\" clears)}",
+            has_doc,
+            |s, p| {
+                let pages: Vec<usize> = p
+                    .get("pages")
+                    .and_then(Value::as_array)
+                    .map(|a| a.iter().filter_map(Value::as_u64).map(|v| v as usize).collect())
+                    .unwrap_or_default();
+                let parent = parent_ref("layout.pages.applyParent", &s.doc()?.doc, p.get("parent"))?.unwrap_or(None);
+                s.edit(|d, _| {
+                    d.apply_parent(&pages, parent)?;
+                    ok()
+                })
+            }
+        ),
+        cmd!("layout.parents.new", "New Parent…", ["Layout", "Pages"], None, "{prefix?, name?: \"Parent\"}", has_doc, |s, p| {
+            let name = str_param(p, "name").unwrap_or("Parent").to_string();
+            s.edit(|d, _| {
+                let prefix = str_param(p, "prefix").map(str::to_string).unwrap_or_else(|| d.next_parent_prefix());
+                let src = d.page(0).cloned();
+                let (columns, margins) =
+                    src.as_ref().map_or_else(|| (designcraft_doc::Columns::default(), Margins::uniform(36.0)), |p| (p.columns.clone(), p.margins));
+                let id = d.add_parent(&prefix, &name, columns.count, columns.gutter, margins);
+                // Dragged column guides carry over to the parent pages they still fit, mirrored
+                // on the parent page across the spine from the first page.
+                if let (Some(src), Some(sp)) = (&src, d.parents.iter_mut().find(|x| x.id == id)) {
+                    for pg in &mut std::sync::Arc::make_mut(sp).pages {
+                        let columns = pg.columns_from(src);
+                        if columns.valid_positions(pg.margin_rect().width()).is_some() {
+                            pg.columns.positions = columns.positions;
+                        }
+                    }
+                }
+                Ok(json!({"id": id.0, "prefix": prefix}))
+            })
+        }),
+        cmd!(
+            "layout.parents.delete",
+            "Delete Parent",
+            [],
+            None,
+            "{id: parent spread id} — unapply the parent and keep local overrides as ordinary items",
+            has_doc,
+            |s, p| {
+                let id = p.get("id").and_then(Value::as_u64).map(SpreadId).ok_or_else(|| bad("layout.parents.delete", "missing parent id"))?;
+                s.edit(|d, sel| {
+                    d.delete_parent(id)?;
+                    *sel = Default::default();
+                    ok()
+                })?;
+                let st = s.doc_mut()?;
+                if st.doc.parents.is_empty() {
+                    st.editing_parents = false;
+                }
+                ok()
+            }
+        ),
+        cmd!(
+            noundo "layout.parents.edit",
+            "Edit Parents",
+            [],
+            None,
+            "{on?: bool, parent?: id|\"A-Parent\"|\"A\"} — show parent spreads on the canvas; `parent` shows that parent (and implies on). Turning on without `parent` shows the first parent",
+            has_doc,
+            |s, p| {
+                const ID: &str = "layout.parents.edit";
+                let doc = s.doc()?.doc.clone();
+                let parent = match p.get("parent") {
+                    None | Some(Value::Null) => None,
+                    v => match parent_ref(ID, &doc, v)? {
+                        Some(Some(id)) => Some(id),
+                        _ => return Err(bad(ID, "`parent` names a parent to show")),
+                    },
+                };
+                let st = s.doc_mut()?;
+                let was = st.editing_parents;
+                let on = p.get("on").and_then(Value::as_bool).unwrap_or(parent.is_some() || !was);
+                st.editing_parents = on;
+                st.selection = Default::default();
+                st.bump_revision();
+                // The parent to show: the one asked for, or the first when editing starts.
+                let index = match parent {
+                    Some(id) => doc.parent_index(id),
+                    None if !was && !doc.parents.is_empty() => Some(0),
+                    None => None,
+                };
+                let shown = index.filter(|_| on);
+                if let Some(i) = shown {
+                    s.ui_requests.push(crate::UiRequest::View { params: json!({"showSpread": designcraft_doc::SpreadRef::Parent(i)}) });
+                }
+                Ok(json!({"on": on, "parent": shown.and_then(|i| doc.parents.get(i)).map(|x| x.id.0)}))
+            }
+        ),
+        cmd!(
+            "layout.parents.options",
+            "Parent Options…",
+            [],
+            None,
+            "{parent: id|\"B-Parent\"|\"B\", basedOn: id|\"A-Parent\"|\"A\"|null (= [None])} — the parent shows its base's items under its own, and so do the pages that use it → {parent, basedOn}",
+            has_doc,
+            parent_options
+        ),
+        cmd!(
+            "layout.marginsAndColumns",
+            "Margins and Columns…",
+            ["Layout"],
+            None,
+            "{pages?: [index] (default all), margins?: number|{top,bottom,inside,outside}, columns?, gutter?, adjustLayout?: bool (objects follow the margins), parent? (a parent's prefix, label or index)} — document pages take these as their own margins; with `parent` the parent's pages change instead (`pages` then indexes them), and so do the document pages without their own",
+            has_doc,
+            |s, p| {
+                let pages: Option<Vec<usize>> =
+                    p.get("pages").and_then(Value::as_array).map(|a| a.iter().filter_map(Value::as_u64).map(|v| v as usize).collect());
+                let parent = match p.get("parent") {
+                    None | Some(Value::Null) => None,
+                    Some(v) => Some(parent_spread_index(&s.doc()?.doc, v).ok_or_else(|| bad("layout.marginsAndColumns", "no such parent"))?),
+                };
+                let p = p.clone();
+                let adjust = p.get("adjustLayout").and_then(Value::as_bool).unwrap_or(false);
+                s.edit(|d, _| {
+                    let before = adjust.then(|| margin_boxes(d));
+                    if let Some(pi) = parent {
+                        let n = d.parents.get(pi).map_or(0, |sp| sp.pages.len());
+                        let sp = d.parents.get_mut(pi).map(std::sync::Arc::make_mut);
+                        if let Some(sp) = sp {
+                            for qi in pages.clone().unwrap_or_else(|| (0..n).collect()) {
+                                if let Some(pg) = sp.pages.get_mut(qi) {
+                                    set_margins_columns(pg, &p);
+                                }
+                            }
+                        }
+                        d.sync_parent_margins();
+                    } else {
+                        let all: Vec<usize> = pages.clone().unwrap_or_else(|| (0..d.page_count()).collect());
+                        for abs in all {
+                            let Some((si, pi)) = d.page_loc(abs) else { continue };
+                            let Some(pg) = d.spreads.get_mut(si).map(std::sync::Arc::make_mut).and_then(|sp| sp.pages.get_mut(pi)) else { continue };
+                            set_margins_columns(pg, &p);
+                            pg.local_margins = true;
+                        }
+                    }
+                    if let Some(b) = before {
+                        adjust_layout(d, &b);
+                    }
+                    ok()
+                })
+            }
+        ),
+        cmd!(
+            "layout.moveColumnGuide",
+            "Move Column Guide",
+            [],
+            None,
+            "{spread?, parent? (a parent's prefix, label or index: its spread instead of `spread`), page (index in the spread), gutter (0 = between the first two columns), position (the gutter's new left edge, spread x)} → {positions (each column's left and right edge from the margin box's left edge), left (where the gutter's left edge went, spread x)} — both guides of the gutter move, keeping its width, and stop at the neighbouring guides and the margins; a document page takes the result as its own columns, a parent page passes it to the pages that follow it; refused while column guides are locked",
+            column_guides_unlocked,
+            move_column_guide
+        ),
+        cmd!(
+            "layout.documentSetup",
+            "Document Setup…",
+            ["File"],
+            Some("Cmd+Alt+P"),
+            "{width?, height?, pages?: count, startPage?: n, facingPages?, binding?: leftToRight|rightToLeft, intent?: print|web|mobile, margins?: n | {top, bottom, inside, outside} (every page and parent page), bleed?, slug?: n | [top, bottom, inside, outside], adjustLayout?: bool (objects follow the new page size and margins)} → the document setup (margins: the first page's)",
+            has_doc,
+            |s, p| {
+                let p = p.clone();
+                if p.as_object().is_none_or(|o| o.is_empty()) {
+                    return Ok(document_setup(&s.doc()?.doc));
+                }
+                let edges = |k: &str| -> Option<[f64; 4]> {
+                    match p.get(k)? {
+                        Value::Array(a) if a.len() == 4 => {
+                            let v: Vec<f64> = a.iter().filter_map(Value::as_f64).map(|v| v.max(0.0)).collect();
+                            (v.len() == 4).then(|| [v[0], v[1], v[2], v[3]])
+                        }
+                        v => v.as_f64().map(|b| [b.max(0.0); 4]),
+                    }
+                };
+                let (bleed, slug) = (edges("bleed"), edges("slug"));
+                for k in ["width", "height"] {
+                    if let Some(v) = p.get(k)
+                        && !v.as_f64().is_some_and(|x| x > 0.0 && x <= 15552.0)
+                    {
+                        return Err(bad("layout.documentSetup", format!("{k}: page size out of range (0 < size ≤ 216 in)")));
+                    }
+                }
+                let margins: Option<Margins> = match p.get("margins") {
+                    None => None,
+                    Some(Value::Number(n)) => n.as_f64().map(Margins::uniform),
+                    Some(v) => serde_json::from_value(v.clone()).ok(),
+                };
+                if margins.is_some_and(|m| ![m.top, m.bottom, m.inside, m.outside].iter().all(|v| v.is_finite() && (0.0..=15552.0).contains(v))) {
+                    return Err(bad("layout.documentSetup", "margins: 0 to 216 in"));
+                }
+                if p.get("margins").is_some() && margins.is_none() {
+                    return Err(bad("layout.documentSetup", "margins: a number or {top, bottom, inside, outside}"));
+                }
+                let intent: Option<designcraft_doc::Intent> = p.get("intent").and_then(|v| serde_json::from_value(v.clone()).ok());
+                let pages = p.get("pages").and_then(Value::as_u64).map(|n| n.clamp(1, 9999) as usize);
+                let adjust = p.get("adjustLayout").and_then(Value::as_bool).unwrap_or(false);
+                s.edit(|d, _| {
+                    let before = adjust.then(|| margin_boxes(d));
+                    if let Some(f) = p.get("facingPages").and_then(Value::as_bool) {
+                        d.settings.facing_pages = f;
+                    }
+                    if let Some(b) = p.get("binding").and_then(Value::as_str) {
+                        d.settings.right_to_left_binding = b == "rightToLeft";
+                        d.order_parent_pages();
+                    }
+                    if let Some(b) = bleed {
+                        d.settings.bleed = b;
+                    }
+                    if let Some(b) = slug {
+                        d.settings.slug = b;
+                    }
+                    if let Some(i) = intent {
+                        d.settings.intent = i;
+                    }
+                    if let Some(n) = p.get("startPage").map(|v| start_number("layout.documentSetup", "startPage", v)).transpose()? {
+                        if !d.sections.iter().any(|x| x.start == 0) {
+                            d.sections.insert(
+                                0,
+                                designcraft_doc::Section {
+                                    start: 0,
+                                    start_number: None,
+                                    style: Default::default(),
+                                    prefix: String::new(),
+                                    marker: String::new(),
+                                    include_prefix: false,
+                                },
+                            );
+                        }
+                        if let Some(first) = d.sections.iter_mut().find(|x| x.start == 0) {
+                            first.start_number = Some(n);
+                        }
+                    }
+                    // Number of Pages: add at the end (with the last page's parent) or remove from the end.
+                    if let Some(n) = pages {
+                        let have = d.page_count();
+                        if n > have {
+                            let parent = d.page_loc(have - 1).and_then(|(si, pi)| d.spreads[si].pages[pi].parent);
+                            d.insert_pages(Some(have - 1), n - have, parent)?;
+                        } else if n < have {
+                            d.delete_pages(&(n..have).collect::<Vec<_>>())?;
+                        }
+                    }
+                    let w = p.get("width").and_then(Value::as_f64);
+                    let h = p.get("height").and_then(Value::as_f64);
+                    // Pages with a liquid rule re-flow their objects (Adjust Layout aside).
+                    let liquid_before: Vec<(usize, usize, designcraft_geom::Rect)> = if adjust {
+                        vec![]
+                    } else {
+                        d.spreads
+                            .iter()
+                            .enumerate()
+                            .flat_map(|(si, sp)| {
+                                sp.pages.iter().enumerate().filter(|(_, pg)| !pg.liquid.is_off()).map(move |(pi, pg)| (si, pi, pg.bounds()))
+                            })
+                            .collect()
+                    };
+                    if w.is_some() || h.is_some() {
+                        d.settings.page_width = w.unwrap_or(d.settings.page_width);
+                        d.settings.page_height = h.unwrap_or(d.settings.page_height);
+                        for sp in d.spreads.iter_mut().chain(d.parents.iter_mut()) {
+                            let sp = std::sync::Arc::make_mut(sp);
+                            for pg in &mut sp.pages {
+                                set_page_width(pg, d.settings.page_width);
+                                pg.height = d.settings.page_height;
+                            }
+                            sp.relayout();
+                        }
+                    }
+                    if let Some(m) = margins {
+                        for sp in d.spreads.iter_mut().chain(d.parents.iter_mut()) {
+                            for pg in &mut std::sync::Arc::make_mut(sp).pages {
+                                pg.margins = m;
+                            }
+                        }
+                        // Pages that now match their parent page follow its later changes; local
+                        // columns stay local.
+                        d.unmark_matching_local_margins();
+                        d.sync_parent_margins();
+                    }
+                    d.repaginate();
+                    if let Some(b) = before {
+                        adjust_layout(d, &b);
+                    }
+                    for (si, pi, old) in liquid_before {
+                        crate::cmd::liquid::apply(d, designcraft_doc::SpreadRef::Doc(si), pi, old);
+                    }
+                    Ok(document_setup(d))
+                })
+            }
+        ),
+        cmd!(
+            "layout.pages.toSpread",
+            "Add Page to Spread",
+            ["Layout", "Pages"],
+            None,
+            "{page (1-based), spread (0-based)} — the page joins that spread (up to 10 pages; the spread stops shuffling)",
+            has_doc,
+            |s, p| {
+                let page =
+                    p.get("page").and_then(Value::as_u64).filter(|n| *n >= 1).ok_or_else(|| bad("layout.pages.toSpread", "missing page"))? as usize;
+                let spread = p.get("spread").and_then(Value::as_u64).ok_or_else(|| bad("layout.pages.toSpread", "missing spread"))? as usize;
+                s.edit(|d, _| {
+                    d.page_to_spread(page - 1, spread)?;
+                    Ok(json!({"spreads": d.spreads.len()}))
+                })
+            }
+        ),
+        cmd!(
+            "layout.spreadShuffle",
+            "Allow Selected Spread to Shuffle",
+            ["Layout", "Pages"],
+            None,
+            "{spread (0-based), allow: bool} — off keeps the spread's pages together when pages are added or removed",
+            has_doc,
+            |s, p| {
+                let si = p.get("spread").and_then(Value::as_u64).unwrap_or(0) as usize;
+                let allow = p.get("allow").and_then(Value::as_bool).unwrap_or(true);
+                s.edit(|d, _| {
+                    let sp = d.spreads.get_mut(si).ok_or_else(|| bad("layout.spreadShuffle", "no such spread"))?;
+                    std::sync::Arc::make_mut(sp).allow_shuffle = allow;
+                    if allow {
+                        d.repaginate();
+                    }
+                    ok()
+                })
+            }
+        ),
+        cmd!(
+            "layout.pageSize",
+            "Page Size",
+            [],
+            None,
+            "{pages: [1-based page numbers], width?, height?, preset?: \"A4\"|\"Letter\"|…, anchor?: 0–8 (reference point that stays put, row-major from the top-left; default 0)} — pages of their own size (Page tool); objects keep their place relative to the anchor, or follow the page's liquid rule",
+            has_doc,
+            page_size
+        ),
+        cmd!(
+            "layout.pageOptions",
+            "Page Options",
+            [],
+            None,
+            "{pages: [1-based], showParentOverlay?: bool} — Page tool options (Show Parent Page Overlay: the parent page's size drawn over the page)",
+            has_doc,
+            page_options
+        ),
+        cmd!(
+            noundo "layout.selectPage",
+            "Select Page",
+            [],
+            None,
+            "{page: 1-based | null, ids?: [item ids] (objects selected with it: the Page tool on an object-based page)} — the page the Page tool selects (its handles, the Control panel)",
+            has_doc,
+            |s, p| {
+            let n = s.doc()?.doc.page_count();
+            let page = match p.get("page") {
+                None | Some(Value::Null) => None,
+                Some(v) => Some(v.as_u64().filter(|v| *v >= 1 && *v as usize <= n).ok_or_else(|| bad("layout.selectPage", format!("`page`: 1–{n}")))? as usize - 1),
+            };
+            let ids: Vec<designcraft_doc::ItemId> = {
+                let d = &s.doc()?.doc;
+                p.get("ids")
+                    .and_then(Value::as_array)
+                    .map(|a| a.iter().filter_map(Value::as_u64).map(designcraft_doc::ItemId).filter(|id| d.item(*id).is_some()).collect())
+                    .unwrap_or_default()
+            };
+            let st = s.doc_mut()?;
+            if page.is_some() {
+                st.selection = designcraft_doc::Selection::items(ids);
+            }
+            st.selection.page = page;
+            st.bump_revision();
+            Ok(json!({"page": page.map(|p| p + 1)}))
+        }
+        ),
+        cmd!(
+            "layout.section",
+            "Numbering & Section Options…",
+            ["Layout"],
+            None,
+            "{page (1-based; starts a section there), startNumber?: n (1–99999)|null (continue), style?: arabic|upperRoman|lowerRoman|upperLetters|lowerLetters|arabicLeadingZero|arabicThreeDigits|arabicFourDigits|kanji, prefix? (up to 8 characters; no + or comma), includePrefix?, marker?, remove?: bool}",
+            has_doc,
+            |s, p| {
+                let edit = SectionEdit::parse("layout.section", s, p)?;
+                s.edit(|d, _| {
+                    edit.apply(d);
+                    Ok(json!({"names": (0..d.page_count()).map(|i| d.page_name(i)).collect::<Vec<_>>()}))
+                })
+            }
+        ),
+        cmd!(
+            "layout.chapterNumbering",
+            "Document Chapter Numbering",
+            [],
+            None,
+            "{style?: arabic|upperRoman|lowerRoman|upperLetters|lowerLetters|arabicLeadingZero|arabicThreeDigits|arabicFourDigits, start?: n (Start Chapter Numbering at), source?: automatic|userDefined|sameAsPrevious} → {chapterNumber, label, style, source, book: the open book holding the document, or null}; no parameters reports the setting",
+            has_doc,
+            |s, p| {
+                if p.as_object().is_none_or(|o| o.is_empty()) {
+                    return chapter_numbering(s);
+                }
+                let edit = ChapterEdit::parse("layout.chapterNumbering", p)?;
+                s.edit(|d, _| {
+                    edit.apply(d);
+                    ok()
+                })?;
+                chapter_numbering(s)
+            }
+        ),
+        cmd!(
+            "layout.numberingOptions",
+            "Apply Numbering & Section Options",
+            [],
+            None,
+            "{page, …the settings as layout.section, chapter?: {…the settings as layout.chapterNumbering}} — the section and the document's chapter numbering in one undo step; if either is refused nothing changes",
+            has_doc,
+            |s, p| {
+                let section = SectionEdit::parse("layout.numberingOptions", s, p)?;
+                let chapter = match p.get("chapter") {
+                    Some(c) => Some(ChapterEdit::parse("layout.numberingOptions", c)?),
+                    None => None,
+                };
+                s.edit(|d, _| {
+                    section.apply(d);
+                    if let Some(chapter) = &chapter {
+                        chapter.apply(d);
+                    }
+                    Ok(json!({"names": (0..d.page_count()).map(|i| d.page_name(i)).collect::<Vec<_>>(), "chapter": d.chapter_label()}))
+                })
+            }
+        ),
+        cmd!("layer.move", "Move Layer", [], None, "{id, to: index (0 = top/frontmost)}", has_doc, |s, p| {
+            let id = LayerId(p.get("id").and_then(Value::as_u64).ok_or_else(|| bad("layer.move", "missing id"))?);
+            let to = p.get("to").and_then(Value::as_u64).ok_or_else(|| bad("layer.move", "missing to"))?;
+            s.edit(|d, _| {
+                let i = d.layers.iter().position(|l| l.id == id).ok_or_else(|| bad("layer.move", "no such layer"))?;
+                let to = usize::try_from(to).ok().filter(|t| *t < d.layers.len()).ok_or_else(|| bad("layer.move", "to out of range"))?;
+                let l = d.layers.remove(i);
+                d.layers.insert(to, l);
+                ok()
+            })
+        }),
+        cmd!(noundo "layer.selectItems", "Select All on Layer", [], None, "{id}", has_doc, |s, p| {
+            let id = LayerId(p.get("id").and_then(Value::as_u64).unwrap_or(0));
+            let st = s.doc_mut()?;
+            let ids: Vec<_> = st.doc.spreads.iter().flat_map(|sp| sp.items.iter().filter(|i| i.layer == id && !i.locked).map(|i| i.id)).collect();
+            st.selection = designcraft_doc::Selection::items(ids);
+            st.bump_revision();
+            ok()
+        }),
+        cmd!("layer.new", "New Layer…", [], None, "{name?}", has_doc, |s, p| {
+            let name = str_param(p, "name").map(str::to_string);
+            let r = s.edit(|d, _| {
+                let id = LayerId(d.alloc());
+                let n = d.layers.len();
+                let name = name.clone().unwrap_or_else(|| format!("Layer {}", n + 1));
+                d.layers.insert(
+                    0,
+                    Layer {
+                        id,
+                        name,
+                        color: LAYER_COLORS[n % LAYER_COLORS.len()].1,
+                        visible: true,
+                        locked: false,
+                        printable: true,
+                        show_guides: true,
+                        suppress_wrap_when_hidden: false,
+                    },
+                );
+                Ok(id)
+            })?;
+            s.doc_mut()?.active_layer = r;
+            Ok(json!({"id": r.0}))
+        }),
+        cmd!(
+            "layer.set",
+            "Layer Options…",
+            [],
+            None,
+            "{id, name?, color?: [r,g,b] | layer colour name (\"Light Blue\", \"Red\", …), visible?, locked?, printable?, showGuides?, suppressWrapWhenHidden?} — names are unique and not empty",
+            has_doc,
+            set_layer
+        ),
+        cmd!("layer.delete", "Delete Layer", [], None, "{id}", has_doc, |s, p| {
+            let id = LayerId(p.get("id").and_then(Value::as_u64).unwrap_or(0));
+            s.edit(|d, sel| {
+                if d.layers.len() < 2 {
+                    return Err(bad("layer.delete", "a document needs at least one layer"));
+                }
+                let doomed: Vec<_> =
+                    d.spreads.iter().chain(d.parents.iter()).flat_map(|sp| sp.items.iter().filter(|i| i.layer == id).map(|i| i.id)).collect();
+                for i in doomed {
+                    let _ = d.remove_item(i);
+                }
+                d.layers.retain(|l| l.id != id);
+                *sel = Default::default();
+                ok()
+            })
+        }),
+        cmd!(
+            "layer.merge",
+            "Merge Layers",
+            [],
+            None,
+            "{ids: [layer ids], into?: layer id (default: the first)} — their objects move to `into`, the other layers are deleted",
+            has_doc,
+            |s, p| {
+                let ids: Vec<LayerId> =
+                    p.get("ids").and_then(Value::as_array).map(|a| a.iter().filter_map(Value::as_u64).map(LayerId).collect()).unwrap_or_default();
+                let into = p
+                    .get("into")
+                    .and_then(Value::as_u64)
+                    .map(LayerId)
+                    .or_else(|| ids.first().copied())
+                    .ok_or_else(|| bad("layer.merge", "no layers"))?;
+                s.edit(|d, _| {
+                    if d.layer(into).is_none() || ids.iter().any(|l| d.layer(*l).is_none()) {
+                        return Err(bad("layer.merge", "no such layer"));
+                    }
+                    let gone: Vec<LayerId> = ids.iter().copied().filter(|l| *l != into).collect();
+                    for sp in d.spreads.iter_mut().chain(d.parents.iter_mut()) {
+                        if !sp.items.iter().any(|i| gone.contains(&i.layer)) {
+                            continue;
+                        }
+                        for it in &mut std::sync::Arc::make_mut(sp).items {
+                            if gone.contains(&it.layer) {
+                                std::sync::Arc::make_mut(it).layer = into;
+                            }
+                        }
+                    }
+                    d.layers.retain(|l| !gone.contains(&l.id));
+                    Ok(json!({"merged": gone.len()}))
+                })
+            }
+        ),
+        cmd!("layer.deleteUnused", "Delete Unused Layers", [], None, "{} — layers without objects (one layer always stays)", has_doc, |s, _| {
+            s.edit(|d, _| {
+                let used: std::collections::HashSet<LayerId> =
+                    d.spreads.iter().chain(d.parents.iter()).flat_map(|sp| sp.items.iter().map(|i| i.layer)).collect();
+                let before = d.layers.len();
+                if used.is_empty() {
+                    // Nothing anywhere: keep the first layer.
+                    d.layers.truncate(1);
+                } else {
+                    d.layers.retain(|l| used.contains(&l.id));
+                }
+                Ok(json!({"deleted": before - d.layers.len()}))
+            })
+        }),
+        cmd!(
+            "layer.others",
+            "Hide/Lock Others",
+            [],
+            None,
+            "{id, hide?: bool, lock?: bool, show?: true (Show All Layers), unlock?: true (Unlock All Layers)} — Hide Others / Lock Others act on every layer but `id`",
+            has_doc,
+            |s, p| {
+                let id = LayerId(p.get("id").and_then(Value::as_u64).unwrap_or(0));
+                let f = |k: &str| p.get(k).and_then(Value::as_bool).unwrap_or(false);
+                let (hide, lock, show, unlock) = (f("hide"), f("lock"), f("show"), f("unlock"));
+                s.edit(|d, _| {
+                    for l in &mut d.layers {
+                        if show {
+                            l.visible = true;
+                        }
+                        if unlock {
+                            l.locked = false;
+                        }
+                        if l.id != id {
+                            if hide {
+                                l.visible = false;
+                            }
+                            if lock {
+                                l.locked = true;
+                            }
+                        }
+                    }
+                    ok()
+                })
+            }
+        ),
+        cmd!(noundo "layer.activate", "Set Active Layer", [], None, "{id}", has_doc, |s, p| {
+            let id = LayerId(p.get("id").and_then(Value::as_u64).unwrap_or(0));
+            let st = s.doc_mut()?;
+            if st.doc.layer(id).is_none() {
+                return Err(bad("layer.activate", "no such layer"));
+            }
+            st.active_layer = id;
+            st.bump_revision();
+            ok()
+        }),
+    ]
+}
diff --git a/crates/engine/src/cmd/layout/sections.rs b/crates/engine/src/cmd/layout/sections.rs
new file mode 100644
index 000000000..3a388743d
--- /dev/null
+++ b/crates/engine/src/cmd/layout/sections.rs
@@ -0,0 +1,251 @@
+use super::{Result, Session, Value, bad, json};
+
+/// A start page number parameter: a whole number in 1..=[`designcraft_doc::MAX_PAGE_NUMBER`].
+pub(super) fn start_number(cmd: &str, key: &str, v: &Value) -> Result<u32> {
+    v.as_u64()
+        .and_then(|n| u32::try_from(n).ok())
+        .filter(|n| (1..=designcraft_doc::MAX_PAGE_NUMBER).contains(n))
+        .ok_or_else(|| bad(cmd, format!("`{key}` must be a whole number from 1 to {}", designcraft_doc::MAX_PAGE_NUMBER)))
+}
+
+/// The largest chapter number (as for page numbers).
+const MAX_CHAPTER: u64 = designcraft_doc::MAX_PAGE_NUMBER as u64;
+
+/// A `layout.section` edit, checked before the document changes.
+pub(super) struct SectionEdit {
+    /// Absolute index of the section's first page.
+    start: usize,
+    remove: bool,
+    /// Some(None): continue from the previous section.
+    start_number: Option<Option<u32>>,
+    style: Option<designcraft_doc::NumberStyle>,
+    prefix: Option<String>,
+    include_prefix: Option<bool>,
+    marker: Option<String>,
+}
+
+impl SectionEdit {
+    pub(super) fn parse(cmd: &str, s: &Session, p: &Value) -> Result<Self> {
+        let page = p.get("page").and_then(Value::as_u64).ok_or_else(|| bad(cmd, "missing page"))?;
+        let n = s.doc()?.doc.page_count() as u64;
+        if page == 0 || page > n {
+            return Err(bad(cmd, format!("no page {page}")));
+        }
+        let prefix = p.get("prefix").and_then(Value::as_str).map(str::to_string);
+        if prefix.as_ref().is_some_and(|x| x.chars().count() > 8 || x.contains(['+', ','])) {
+            return Err(bad(cmd, "section prefix: up to 8 characters, without + or ,"));
+        }
+        let start_number = match p.get("startNumber") {
+            None => None,
+            Some(Value::Null) => Some(None),
+            Some(v) => Some(Some(start_number(cmd, "startNumber", v)?)),
+        };
+        let style = match p.get("style") {
+            None => None,
+            Some(v) => match serde_json::from_value(v.clone()) {
+                Ok(designcraft_doc::NumberStyle::Symbols) => return Err(bad(cmd, "symbols don't number pages")),
+                Ok(style) => Some(style),
+                Err(e) => return Err(bad(cmd, e.to_string())),
+            },
+        };
+        Ok(SectionEdit {
+            start: (page - 1) as usize,
+            remove: p.get("remove").and_then(Value::as_bool).unwrap_or(false),
+            start_number,
+            style,
+            prefix,
+            include_prefix: p.get("includePrefix").and_then(Value::as_bool),
+            marker: p.get("marker").and_then(Value::as_str).map(str::to_string),
+        })
+    }
+
+    pub(super) fn apply(&self, d: &mut designcraft_doc::Document) {
+        let start = self.start;
+        // Page 1 always starts a section.
+        if self.remove && start != 0 {
+            d.sections.retain(|x| x.start != start);
+            // The pages after it follow the previous section's numbers again.
+            d.repaginate();
+            return;
+        }
+        let mut sec = d.sections.iter().find(|x| x.start == start).cloned().unwrap_or(designcraft_doc::Section {
+            start,
+            start_number: None,
+            style: Default::default(),
+            prefix: String::new(),
+            marker: String::new(),
+            include_prefix: false,
+        });
+        if let Some(n) = self.start_number {
+            sec.start_number = n;
+        }
+        if let Some(style) = self.style {
+            sec.style = style;
+        }
+        if let Some(prefix) = &self.prefix {
+            sec.prefix = prefix.clone();
+        }
+        if let Some(on) = self.include_prefix {
+            sec.include_prefix = on;
+        }
+        if let Some(marker) = &self.marker {
+            sec.marker = marker.clone();
+        }
+        d.sections.retain(|x| x.start != start);
+        d.sections.push(sec);
+        d.sections.sort_by_key(|x| x.start);
+        // Facing pages take their sides from their numbers: odd on the right.
+        d.repaginate();
+    }
+}
+
+/// A `layout.chapterNumbering` edit, checked before the document changes.
+pub(super) struct ChapterEdit {
+    style: Option<designcraft_doc::NumberStyle>,
+    source: Option<designcraft_doc::ChapterSource>,
+    start: Option<u32>,
+}
+
+impl ChapterEdit {
+    pub(super) fn parse(cmd: &str, p: &Value) -> Result<Self> {
+        let style = match p.get("style") {
+            Some(v) => match serde_json::from_value::<designcraft_doc::NumberStyle>(v.clone()) {
+                Ok(designcraft_doc::NumberStyle::Symbols) | Err(_) => return Err(bad(cmd, format!("unknown chapter style {v}"))),
+                Ok(style) => Some(style),
+            },
+            None => None,
+        };
+        let mut source = match p.get("source") {
+            Some(v) => Some(
+                serde_json::from_value::<designcraft_doc::ChapterSource>(v.clone())
+                    .map_err(|_| bad(cmd, format!("unknown chapter number source {v}")))?,
+            ),
+            None => None,
+        };
+        let start = match p.get("start") {
+            Some(v) => {
+                Some(v.as_u64().filter(|n| (1..=MAX_CHAPTER).contains(n)).ok_or_else(|| bad(cmd, format!("chapter start: 1 to {MAX_CHAPTER}")))?
+                    as u32)
+            }
+            None => None,
+        };
+        // A start number alone means Start Chapter Numbering at.
+        if start.is_some() && source.is_none() {
+            source = Some(designcraft_doc::ChapterSource::UserDefined);
+        }
+        Ok(ChapterEdit { style, source, start })
+    }
+
+    pub(super) fn apply(&self, d: &mut designcraft_doc::Document) {
+        if let Some(style) = self.style {
+            d.settings.chapter_style = style;
+        }
+        if let Some(source) = self.source {
+            d.settings.chapter_source = source;
+        }
+        if let Some(n) = self.start {
+            d.settings.chapter_number = n;
+        }
+    }
+}
+
+/// The active document's chapter numbering, and the open book that holds it (what
+/// `layout.chapterNumbering {}` reports, read without running a command).
+pub fn chapter_numbering(s: &Session) -> Result<Value> {
+    let st = s.doc()?;
+    let set = &st.doc.settings;
+    let book = s
+        .book
+        .as_ref()
+        .filter(|b| st.path.as_deref().is_some_and(|p| b.documents.iter().any(|d| std::path::Path::new(d) == std::path::Path::new(p))))
+        .map(|b| std::path::Path::new(&b.path).file_stem().map_or_else(|| b.path.clone(), |n| n.to_string_lossy().to_string()));
+    Ok(
+        json!({"chapterNumber": set.chapter_number.max(1), "label": st.doc.chapter_label(), "style": set.chapter_style, "source": set.chapter_source, "book": book}),
+    )
+}
+
+#[cfg(test)]
+mod section_side_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// Each spread's pages as (name, side), side `L`, `R` or `S`.
+    fn spreads(s: &Session) -> Vec<Vec<(String, char)>> {
+        let d = &s.doc().unwrap().doc;
+        let mut abs = 0;
+        d.spreads
+            .iter()
+            .map(|sp| {
+                sp.pages
+                    .iter()
+                    .map(|p| {
+                        let side = match p.side {
+                            designcraft_doc::PageSide::Left => 'L',
+                            designcraft_doc::PageSide::Right => 'R',
+                            designcraft_doc::PageSide::Single => 'S',
+                        };
+                        abs += 1;
+                        (d.page_name(abs - 1), side)
+                    })
+                    .collect()
+            })
+            .collect()
+    }
+
+    fn pages(v: &[&[(&str, char)]]) -> Vec<Vec<(String, char)>> {
+        v.iter().map(|sp| sp.iter().map(|(n, c)| (n.to_string(), *c)).collect()).collect()
+    }
+
+    #[test]
+    fn a_section_starting_at_one_on_a_left_page_moves_it_to_the_right() {
+        // Chris Nielsen's "Numbering Page Sections" (7:03): with the spread 8–9 selected, the
+        // section starts on page 8, which becomes a lone right-hand page 1; the pages after it
+        // shuffle and their objects go with them. Undo puts them back.
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 612, "height": 792, "facingPages": true, "pages": 10})).unwrap();
+        let id = s.execute("frame.create", &json!({"spread": 4, "rect": [700, 100, 800, 200], "content": "text", "text": "TOPIC"})).unwrap()["id"]
+            .as_u64()
+            .unwrap();
+        let page_of = |s: &Session| {
+            let d = &s.doc().unwrap().doc;
+            d.page_of_item(designcraft_doc::ItemId(id)).unwrap()
+        };
+        assert_eq!(page_of(&s), 8, "page 9, the right page of the spread 8–9");
+        let before = spreads(&s);
+        s.execute("layout.section", &json!({"page": 8, "startNumber": 1})).unwrap();
+        assert_eq!(
+            spreads(&s),
+            pages(&[
+                &[("1", 'R')],
+                &[("2", 'L'), ("3", 'R')],
+                &[("4", 'L'), ("5", 'R')],
+                &[("6", 'L'), ("7", 'R')],
+                &[("1", 'R')],
+                &[("2", 'L'), ("3", 'R')],
+            ])
+        );
+        assert_eq!(page_of(&s), 8, "the object stays on its page, now the left page of a spread");
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(spreads(&s), before);
+        // On a right page (the video's page 9) nothing moves; an even start on a right page moves
+        // it to the left.
+        s.execute("layout.section", &json!({"page": 9, "startNumber": 1})).unwrap();
+        assert_eq!(spreads(&s)[4], pages(&[&[("8", 'L'), ("1", 'R')]])[0]);
+        s.execute("layout.section", &json!({"page": 9, "startNumber": 2})).unwrap();
+        assert_eq!(spreads(&s)[4..], pages(&[&[("8", 'L')], &[("2", 'L'), ("3", 'R')]]));
+        // Removing the section numbers the pages on from 9 again.
+        s.execute("layout.section", &json!({"page": 9, "remove": true})).unwrap();
+        assert_eq!(spreads(&s), before);
+    }
+
+    #[test]
+    fn single_sided_documents_keep_their_pages() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"facingPages": false, "pages": 4})).unwrap();
+        s.execute("layout.section", &json!({"page": 2, "startNumber": 1})).unwrap();
+        let sp = spreads(&s);
+        assert_eq!(sp.len(), 4);
+        assert!(sp.iter().all(|p| p.len() == 1 && p[0].1 == 'S'), "{sp:?}");
+    }
+}
diff --git a/crates/engine/src/cmd/links.rs b/crates/engine/src/cmd/links.rs
index c39e05668..3fc67f822 100644
--- a/crates/engine/src/cmd/links.rs
+++ b/crates/engine/src/cmd/links.rs
@@ -396,8 +396,23 @@ fn reimport(d: &mut Document, sid: StoryId, path: &str, bytes: &[u8], before: Fi
 
 #[cfg(not(target_arch = "wasm32"))]
 fn reload(path: impl AsRef<Path>) -> Result<(Vec<u8>, (u32, u32))> {
+    reload_capped(path, super::interchange::MAX_LINKED_FILE_BYTES)
+}
+
+/// A linked graphic read again from disk, and its pixel size, reading at most `cap` bytes.
+///
+/// How large a linked file is belongs to whoever wrote the document, not to whoever opens it: the
+/// path comes out of the document, and Update, Relink and Relink Folder all follow it. An
+/// unbounded `read` of a link pointing at a multi-GB file exhausted memory (#1596). The cap is
+/// the one packaging already applies to a linked file, and a file over it is refused by name
+/// rather than read.
+#[cfg(not(target_arch = "wasm32"))]
+fn reload_capped(path: impl AsRef<Path>, cap: u64) -> Result<(Vec<u8>, (u32, u32))> {
     let path = path.as_ref();
-    let b = crate::io::read_file(path).map_err(EngineError::Other)?;
+    let b = crate::io::read_capped(path, cap).map_err(|e| EngineError::Other(format!("{}: {e}", path.display())))?;
+    if b.len() as u64 > cap {
+        return Err(bad("links", format!("{}: the linked file is larger than {} MB", path.display(), cap / (1024 * 1024))));
+    }
     if designcraft_render::is_pdf(&b) {
         designcraft_render::check_pdf_input_size(b.len()).map_err(|e| bad("links", format!("{}: {e}", path.display())))?;
     }
@@ -577,358 +592,7 @@ fn update(s: &mut Session, p: &Value) -> Result<Value> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn png(w: u32, h: u32) -> Vec<u8> {
-        designcraft_render::Rendered { width: w, height: h, pixels: vec![200u8; (w * h * 4) as usize] }.to_png()
-    }
-
-    fn pdf(sizes: &[(u32, u32)]) -> Vec<u8> {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": sizes.len(), "facingPages": false})).unwrap();
-        for (i, (width, height)) in sizes.iter().enumerate() {
-            s.execute("layout.pageSize", &json!({"pages": [i + 1], "width": width, "height": height})).unwrap();
-        }
-        let result = s.execute("file.exportPdf", &json!({})).unwrap();
-        super::super::file::base64_decode(result["base64"].as_str().unwrap())
-    }
-
-    #[test]
-    fn anchored_image_lists_its_page_and_resolution() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 2, "facingPages": false})).unwrap();
-        let r = s
-            .execute("frame.create", &json!({"spread": 1, "rect": [72, 72, 400, 400], "content": "text", "text": "Before after and more words."}))
-            .unwrap();
-        let sid = s.doc().unwrap().doc.item(ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-        let placed = s
-            .execute(
-                "file.place",
-                &json!({"base64": super::super::file::base64_encode(&png(10, 10)), "name": "dot.png", "x": 450, "y": 450, "width": 36}),
-            )
-            .unwrap();
-        let id = placed["id"].as_u64().unwrap();
-        let before = s.execute("links.list", &json!({})).unwrap();
-        assert_eq!(before[0]["uses"][0]["ppi"], 20.0);
-        s.execute("anchored.insert", &json!({"ids": [id], "story": sid.0, "pos": 7})).unwrap();
-        let list = s.execute("links.list", &json!({})).unwrap();
-        let uses = list[0]["uses"].as_array().unwrap();
-        assert_eq!(uses.len(), 1, "anchored image must have one use: {list}");
-        assert_eq!(uses[0]["page"], "2");
-        assert_eq!(uses[0]["ppi"], 20.0);
-    }
-
-    #[test]
-    fn eps_web_exports_convert_tiff_and_skip_bad_used_assets() {
-        use std::io::Read;
-        let bytes = super::super::file::eps_place_tests::tiff_eps();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let placed = s.execute("file.place", &json!({"base64":super::super::file::base64_encode(&bytes),"name":"logo.eps"})).unwrap();
-        let aid = AssetId(placed["asset"].as_u64().unwrap());
-        let before = s.doc().unwrap().doc.clone();
-        let html = s.execute("file.exportHtml", &json!({})).unwrap();
-        let encoded = html["text"].as_str().unwrap().split("data:image/png;base64,").nth(1).unwrap().split('"').next().unwrap();
-        let png = super::super::file::base64_decode(encoded);
-        assert!(png.starts_with(b"\x89PNG"));
-        assert_eq!(designcraft_render::image_size(&png), Some((2, 2)));
-        assert_eq!(designcraft_render::decode_pixmap(&png).unwrap().data()[0], designcraft_render::decode_pixmap(&bytes).unwrap().data()[0]);
-        let result = s.execute("file.exportEpub", &json!({})).unwrap();
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(super::super::file::base64_decode(result["base64"].as_str().unwrap()))).unwrap();
-        let mut image = Vec::new();
-        z.by_name(&format!("OEBPS/images/logo-{}.png", aid.0)).unwrap().read_to_end(&mut image).unwrap();
-        assert_eq!(image, png);
-        let mut opf = String::new();
-        z.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut opf).unwrap();
-        assert!(opf.contains("media-type=\"image/png\""));
-        assert!(!opf.contains("image/tiff"));
-        assert!(Arc::ptr_eq(&before, &s.doc().unwrap().doc));
-        s.edit(|d, _| {
-            Arc::make_mut(d.assets.get_mut(&aid).unwrap()).data = Arc::new(b"%!PS-Adobe-3.0 EPSF-3.0\n%%EOF\n".to_vec());
-            Ok(())
-        })
-        .unwrap();
-        let before = s.doc().unwrap().doc.clone();
-        for command in ["file.exportHtml", "file.exportEpub"] {
-            let result = s.execute(command, &json!({})).unwrap();
-            assert_eq!(result["warnings"].as_array().unwrap().len(), 1, "{command}");
-            if command == "file.exportHtml" {
-                assert!(!result["text"].as_str().unwrap().contains("<img "));
-            }
-        }
-        assert!(Arc::ptr_eq(&before, &s.doc().unwrap().doc));
-        s.execute("edit.clear", &json!({})).unwrap();
-        assert!(s.doc().unwrap().doc.assets.contains_key(&aid));
-        for command in ["file.exportHtml", "file.exportEpub"] {
-            let result = s.execute(command, &json!({})).unwrap();
-            assert!(result["warnings"].as_array().unwrap().is_empty(), "unused EPS: {command}");
-        }
-    }
-
-    #[test]
-    fn eps_status_tracks_source_bytes_across_save_update_relink_and_embed() {
-        let dir = std::env::temp_dir().join(format!("dc-eps-status-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("logo.eps");
-        let first = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n0 0 0 setrgbcolor\n%%EOF\n";
-        let changed = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n1 0 0 setrgbcolor\n%%EOF\n";
-        assert_eq!(first.len(), changed.len());
-        assert_eq!(designcraft_images::eps_proxy(first), designcraft_images::eps_proxy(changed), "same preview, different source");
-        std::fs::write(&path, first).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let aid = AssetId(s.execute("file.place", &json!({"path": path.to_string_lossy()})).unwrap()["asset"].as_u64().unwrap());
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
-        let before = s.doc().unwrap().doc.clone();
-        assert_eq!(s.execute("links.update", &json!({})).unwrap()["updated"], 0);
-        assert!(Arc::ptr_eq(&s.doc().unwrap().doc, &before), "unchanged EPS must not create an edit");
-        let saved = designcraft_format::save(&before).unwrap();
-        let reopened = designcraft_format::load(&saved).unwrap();
-        assert_eq!(reopened.assets[&aid].data.as_slice(), first);
-        let mut s = Session::new();
-        s.add_document(crate::DocState::new(reopened, None));
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
-        std::fs::write(&path, changed).unwrap();
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "modified");
-        assert_eq!(s.execute("links.update", &json!({})).unwrap()["updated"], 1);
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
-        assert_eq!(s.doc().unwrap().doc.assets[&aid].data.as_slice(), changed);
-        std::fs::remove_file(&path).unwrap();
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "missing");
-        let replacement = dir.join("replacement.eps");
-        std::fs::write(&replacement, changed).unwrap();
-        s.execute("links.relink", &json!({"asset": aid.0, "path": replacement.to_string_lossy()})).unwrap();
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "missing");
-        s.execute("edit.redo", &json!({})).unwrap();
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
-        s.execute("links.embed", &json!({"asset": aid.0})).unwrap();
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "embedded");
-        std::fs::remove_file(&replacement).unwrap();
-        let embedded = designcraft_format::load(&designcraft_format::save(&s.doc().unwrap().doc).unwrap()).unwrap();
-        // The asset is embedded, so no link is followed and the document is irrelevant.
-        assert_eq!(status(&embedded.assets[&aid], None), "embedded");
-        assert_eq!(embedded.assets[&aid].data.as_slice(), changed);
-        assert!(designcraft_render::decode_pixmap(&embedded.assets[&aid].data).is_some());
-        let _ = std::fs::remove_dir_all(dir);
-    }
-
-    #[test]
-    fn eps_legacy_preview_document_is_upgraded_by_update() {
-        let dir = std::env::temp_dir().join(format!("dc-eps-legacy-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("logo.eps");
-        let source = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n%%EOF\n";
-        std::fs::write(&path, source).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let aid = AssetId(s.execute("file.place", &json!({"path": path.to_string_lossy()})).unwrap()["asset"].as_u64().unwrap());
-        let proxy = designcraft_images::eps_proxy(source).unwrap().0;
-        s.edit(|d, _| {
-            let a = Arc::make_mut(d.assets.get_mut(&aid).unwrap());
-            a.data = Arc::new(proxy);
-            a.mime = "image/png".into();
-            Ok(())
-        })
-        .unwrap();
-        let old = designcraft_format::load(&designcraft_format::save(&s.doc().unwrap().doc).unwrap()).unwrap();
-        let mut s = Session::new();
-        s.add_document(crate::DocState::new(old, None));
-        assert_eq!(s.execute("links.update", &json!({})).unwrap()["updated"], 1);
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
-        assert_eq!(s.doc().unwrap().doc.assets[&aid].data.as_slice(), source);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert!(designcraft_render::decode_pixmap(&s.doc().unwrap().doc.assets[&aid].data).is_some(), "old preview remains renderable");
-        s.execute("edit.redo", &json!({})).unwrap();
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
-        let _ = std::fs::remove_dir_all(dir);
-    }
-
-    #[test]
-    fn eps_source_exports_preview_to_pdf_html_and_epub_without_editing_document() {
-        use hayro_syntax::object::Name;
-        use std::io::Read;
-
-        let source = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n%%EOF\n";
-        let proxy = designcraft_images::eps_proxy(source).unwrap().0;
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let aid = AssetId(
-            s.execute("file.place", &json!({"base64": super::super::file::base64_encode(source), "name": "logo.eps"})).unwrap()["asset"]
-                .as_u64()
-                .unwrap(),
-        );
-        // A document retaining the original EPS rather than the legacy preview-only asset.
-        s.edit(|d, _| {
-            let a = Arc::make_mut(d.assets.get_mut(&aid).unwrap());
-            a.data = Arc::new(source.to_vec());
-            a.mime = "application/postscript".into();
-            Ok(())
-        })
-        .unwrap();
-        let before = s.doc().unwrap().doc.clone();
-        let result = s.execute("file.exportPdf", &json!({})).unwrap();
-        assert!(result["warnings"].as_array().unwrap().is_empty(), "{:?}", result["warnings"]);
-        let pdf = hayro_syntax::Pdf::new(super::super::file::base64_decode(result["base64"].as_str().unwrap())).unwrap();
-        assert_eq!(
-            pdf.objects()
-                .into_iter()
-                .filter_map(|o| o.into_stream())
-                .filter(|st| st.dict().get::<Name>("Subtype").is_some_and(|n| n.as_str() == "Image"))
-                .count(),
-            1
-        );
-        let result = s.execute("file.exportHtml", &json!({})).unwrap();
-        let encoded = result["text"].as_str().unwrap().split("data:image/png;base64,").nth(1).unwrap().split('"').next().unwrap();
-        assert_eq!(super::super::file::base64_decode(encoded), proxy);
-        let result = s.execute("file.exportEpub", &json!({})).unwrap();
-        let bytes = super::super::file::base64_decode(result["base64"].as_str().unwrap());
-        let mut archive = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
-        let mut image = Vec::new();
-        archive.by_name(&format!("OEBPS/images/logo-{}.png", aid.0)).unwrap().read_to_end(&mut image).unwrap();
-        assert_eq!(image, proxy);
-        let mut opf = String::new();
-        archive.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut opf).unwrap();
-        assert!(opf.contains("media-type=\"image/png\""));
-        assert!(!opf.contains("application/postscript"));
-        assert!(Arc::ptr_eq(&s.doc().unwrap().doc, &before), "exports must leave the source document intact");
-        assert_eq!(before.assets[&aid].data.as_slice(), source);
-    }
-
-    #[test]
-    fn eps_relink_update_and_folder_relink_retain_source() {
-        let dir = std::env::temp_dir().join(format!("dc-links-eps-{}", std::process::id()));
-        std::fs::create_dir_all(dir.join("new")).unwrap();
-        let eps = |w: u32| format!("%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 {w} 10\n%%EOF\n");
-        let original = dir.join("original.eps");
-        let replacement = dir.join("replacement.eps");
-        std::fs::write(&original, eps(10)).unwrap();
-        std::fs::write(&replacement, eps(30)).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("file.place", &json!({"path": original.to_string_lossy()})).unwrap();
-        let aid = s.doc().unwrap().doc.assets.keys().next().copied().unwrap();
-        std::fs::write(&original, eps(20)).unwrap();
-        assert_eq!(s.execute("links.update", &json!({})).unwrap()["updated"], 1);
-        assert_eq!(s.doc().unwrap().doc.assets[&aid].pixels, Some((40, 20)));
-        s.execute("links.relink", &json!({"asset": aid.0, "path": replacement.to_string_lossy()})).unwrap();
-        let a = &s.doc().unwrap().doc.assets[&aid];
-        assert_eq!(a.pixels, Some((60, 20)));
-        assert_eq!(a.mime, "application/postscript");
-        assert_eq!(a.data.as_slice(), eps(30).as_bytes());
-        let moved = dir.join("new/replacement.eps");
-        std::fs::rename(&replacement, &moved).unwrap();
-        assert_eq!(s.execute("links.relinkFolder", &json!({"dir": dir.join("new").to_string_lossy()})).unwrap()["relinked"], 1);
-        assert_eq!(s.doc().unwrap().doc.assets[&aid].link.as_deref(), moved.to_str());
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
-        let _ = std::fs::remove_dir_all(dir);
-    }
-
-    #[test]
-    fn pdf_relink_and_update_preserve_selected_page_size() {
-        let dir = std::env::temp_dir().join(format!("dc-links-pdf-size-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let original = dir.join("original.pdf");
-        let replacement = dir.join("replacement.pdf");
-        std::fs::write(&original, pdf(&[(10, 10), (20, 30)])).unwrap();
-        std::fs::write(&replacement, pdf(&[(40, 40), (50, 60)])).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("file.place", &json!({"path": original.to_string_lossy(), "pdfPage": 2})).unwrap();
-        let aid = s.doc().unwrap().doc.assets.keys().next().copied().unwrap();
-        s.execute("links.relink", &json!({"asset": aid.0, "path": replacement.to_string_lossy()})).unwrap();
-        let a = &s.doc().unwrap().doc.assets[&aid];
-        assert_eq!(a.page, 1);
-        assert_eq!(a.pixels, Some((50, 60)));
-        assert!(designcraft_render::render_pdf_page(&a.data, a.page as usize, 64).is_some());
-        std::fs::write(&replacement, pdf(&[(70, 70), (80, 90)])).unwrap();
-        assert_eq!(s.execute("links.update", &json!({})).unwrap()["updated"], 1);
-        assert_eq!(s.doc().unwrap().doc.assets[&aid].pixels, Some((80, 90)));
-        let raster = dir.join("replacement.png");
-        std::fs::write(&raster, png(4, 5)).unwrap();
-        s.execute("links.relink", &json!({"asset": aid.0, "path": raster.to_string_lossy()})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.assets[&aid].page, 0);
-        let _ = std::fs::remove_dir_all(dir);
-    }
-
-    #[test]
-    fn pdf_reload_rejects_missing_page_without_edit() {
-        let full = pdf(&[(10, 10), (20, 30)]);
-        let short = pdf(&[(10, 10)]);
-        let dir = std::env::temp_dir().join(format!("dc-links-pdf-page-{}", std::process::id()));
-        std::fs::create_dir_all(dir.join("new")).unwrap();
-        let original = dir.join("book.pdf");
-        let replacement = dir.join("new/book.pdf");
-        std::fs::write(&replacement, short.clone()).unwrap();
-        for command in ["links.relink", "links.relinkFolder", "links.update"] {
-            std::fs::write(&original, &full).unwrap();
-            let mut s = Session::new();
-            s.execute("file.new", &json!({})).unwrap();
-            s.execute("file.place", &json!({"path": original.to_string_lossy(), "pdfPage": 2})).unwrap();
-            let aid = s.doc().unwrap().doc.assets.keys().next().copied().unwrap();
-            if command == "links.update" {
-                std::fs::write(&original, &short).unwrap();
-            }
-            let st = s.doc().unwrap();
-            let before = st.doc.clone();
-            let revision = st.revision;
-            let undo = st.history.undo.len();
-            let journal = s.journal.len();
-            let params = match command {
-                "links.relinkFolder" => json!({"dir": dir.join("new").to_string_lossy(), "missingOnly": false}),
-                "links.update" => json!({"asset": aid.0}),
-                _ => json!({"asset": aid.0, "path": replacement.to_string_lossy()}),
-            };
-            let err = s.execute(command, &params).unwrap_err();
-            assert!(err.to_string().contains("PDF page 2"), "{command}: {err}");
-            let st = s.doc().unwrap();
-            assert!(Arc::ptr_eq(&st.doc, &before), "{command}");
-            assert_eq!(st.revision, revision);
-            assert_eq!(st.history.undo.len(), undo);
-            assert_eq!(s.journal.len(), journal);
-            assert!(designcraft_render::render_pdf_page(&st.doc.assets[&aid].data, 1, 64).is_some());
-        }
-        let _ = std::fs::remove_dir_all(dir);
-    }
-
-    #[test]
-    fn link_status_relink_update_embed() {
-        let dir = std::env::temp_dir().join(format!("dc-links-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let a = dir.join("a.png");
-        let b = dir.join("b.png");
-        std::fs::write(&a, png(10, 10)).unwrap();
-        std::fs::write(&b, png(20, 10)).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("file.place", &json!({"path": a.to_string_lossy(), "x": 72, "y": 72, "width": 72})).unwrap();
-        let l = s.execute("links.list", &json!({})).unwrap();
-        assert_eq!(l[0]["status"], "ok");
-        assert_eq!(l[0]["uses"][0]["ppi"], 10.0, "10 px over 1 inch");
-        let aid = l[0]["asset"].as_u64().unwrap();
-        // The file changes on disk.
-        std::fs::write(&a, png(30, 10)).unwrap();
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "modified");
-        s.execute("links.update", &json!({})).unwrap();
-        let l = s.execute("links.list", &json!({})).unwrap();
-        assert_eq!(l[0]["status"], "ok");
-        assert_eq!(l[0]["pixels"], json!([30, 10]));
-        // Missing, then relinked.
-        std::fs::remove_file(&a).unwrap();
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "missing");
-        s.execute("links.relink", &json!({"asset": aid, "path": b.to_string_lossy()})).unwrap();
-        let l = s.execute("links.list", &json!({})).unwrap();
-        assert_eq!((l[0]["status"].as_str(), l[0]["name"].as_str()), (Some("ok"), Some("b.png")));
-        // Go to selects the frame; embed forgets the file.
-        let r = s.execute("links.goTo", &json!({"asset": aid})).unwrap();
-        assert_eq!(r["ids"].as_array().unwrap().len(), 1);
-        s.execute("links.embed", &json!({"asset": aid})).unwrap();
-        assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "embedded");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-}
+mod tests;
 
 #[cfg(test)]
 mod relink_folder_tests {
@@ -1128,6 +792,7 @@ mod shared_asset_tests {
             designcraft_geom::shapes::rectangle(designcraft_geom::Rect::new(0.0, 0.0, 9.0, 9.0)),
         );
         it.content = Content::Graphic(Graphic {
+            layer_options: None,
             asset: sid,
             size: (4.0, 4.0),
             xf: designcraft_geom::Affine::IDENTITY,
@@ -1173,6 +838,7 @@ mod shared_asset_tests {
             designcraft_geom::shapes::rectangle(designcraft_geom::Rect::new(0.0, 0.0, 9.0, 9.0)),
         );
         it.content = Content::Graphic(Graphic {
+            layer_options: None,
             asset: missing,
             size: (4.0, 4.0),
             xf: designcraft_geom::Affine::IDENTITY,
@@ -1209,6 +875,7 @@ mod shared_asset_tests {
             designcraft_geom::shapes::rectangle(designcraft_geom::Rect::new(0.0, 0.0, 9.0, 9.0)),
         );
         it.content = Content::Graphic(Graphic {
+            layer_options: None,
             asset: missing,
             size: (4.0, 4.0),
             xf: designcraft_geom::Affine::IDENTITY,
@@ -1267,6 +934,47 @@ mod text_link_tests {
         st.paras.iter().map(|p| p.style.clone()).collect()
     }
 
+    fn assert_link_update_replaces_and_warns(s: &mut Session, path: &std::path::Path, sid: StoryId, a: u64, b: u64) {
+        // The file changes (with tracked changes): Modified; Update imports it as if accepted, with
+        // the saved style map, into the same frames, without new renamed styles.
+        std::fs::write(
+            path,
+            docx(r#"<w:r><w:t xml:space="preserve">Second </w:t></w:r><w:ins w:id="1" w:author="A"><w:r><w:t>revised </w:t></w:r></w:ins><w:del w:id="2" w:author="A"><w:r><w:delText>old </w:delText></w:r></w:del><w:r><w:t>draft.</w:t></w:r>"#),
+        )
+        .unwrap();
+        assert_eq!(text_rows(s)[0]["status"], "modified");
+        let r = s.execute("links.update", &json!({"story": sid.0})).unwrap();
+        assert_eq!(r["updated"], 1);
+        assert_eq!(r["warnings"], json!([]), "no edits in the layout to replace");
+        let updated = story(s, sid);
+        assert_eq!(updated.text, "Head\nSecond revised draft.");
+        assert_eq!(styles(&updated), ["Headline", "Body_wrd_1"]);
+        assert_eq!(updated.frames, [ItemId(a), ItemId(b)], "frames and thread kept");
+        assert!(s.doc().unwrap().doc.styles.para("Body_wrd_2").is_none());
+        assert!(s.doc().unwrap().doc.styles.para("Title").is_none(), "mapped styles aren't imported");
+        assert_eq!(text_rows(s)[0]["status"], "ok");
+
+        // An edit in the layout, then the file changes again: Update replaces the edit and warns.
+        s.execute("story.setText", &json!({"story": sid.0, "text": "Fixed in layout"})).unwrap();
+        assert_eq!(text_rows(s)[0]["edited"], true);
+        std::fs::write(path, docx("<w:r><w:t>Third draft.</w:t></w:r>")).unwrap();
+        let r = s.execute("links.update", &json!({})).unwrap();
+        assert_eq!(r["updated"], 1);
+        let w = r["warnings"][0].as_str().unwrap();
+        assert!(w.contains("chapter.docx") && w.contains("replaced"), "{w}");
+        assert_eq!(story(s, sid).text, "Head\nThird draft.");
+        assert_eq!(text_rows(s)[0]["edited"], false);
+        // Undo brings the edit back.
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(story(s, sid).text, "Fixed in layout");
+        s.execute("edit.redo", &json!({})).unwrap();
+
+        // Saved and opened again: the link and its options are kept.
+        let back = designcraft_format::load(&designcraft_format::save(&s.doc().unwrap().doc).unwrap()).unwrap();
+        assert_eq!(back.story(sid).unwrap().file_link, story(s, sid).file_link);
+        assert_eq!(super::text_status(back.story(sid).unwrap().file_link.as_ref().unwrap(), &mut Default::default(), None), "ok");
+    }
+
     #[test]
     fn linked_word_file_status_update_relink_and_unlink() {
         let dir = std::env::temp_dir().join(format!("dc-text-link-{}", std::process::id()));
@@ -1306,44 +1014,7 @@ mod text_link_tests {
         assert_eq!((rows[0]["status"].as_str(), rows[0]["edited"].as_bool()), (Some("ok"), Some(false)));
         assert_eq!(rows[0]["uses"].as_array().unwrap().len(), 2, "both threaded frames");
 
-        // The file changes (with tracked changes): Modified; Update imports it as if accepted, with
-        // the saved style map, into the same frames, without new renamed styles.
-        std::fs::write(
-            &path,
-            docx(r#"<w:r><w:t xml:space="preserve">Second </w:t></w:r><w:ins w:id="1" w:author="A"><w:r><w:t>revised </w:t></w:r></w:ins><w:del w:id="2" w:author="A"><w:r><w:delText>old </w:delText></w:r></w:del><w:r><w:t>draft.</w:t></w:r>"#),
-        )
-        .unwrap();
-        assert_eq!(text_rows(&mut s)[0]["status"], "modified");
-        let r = s.execute("links.update", &json!({"story": sid.0})).unwrap();
-        assert_eq!(r["updated"], 1);
-        assert_eq!(r["warnings"], json!([]), "no edits in the layout to replace");
-        let updated = story(&s, sid);
-        assert_eq!(updated.text, "Head\nSecond revised draft.");
-        assert_eq!(styles(&updated), ["Headline", "Body_wrd_1"]);
-        assert_eq!(updated.frames, [ItemId(a), ItemId(b)], "frames and thread kept");
-        assert!(s.doc().unwrap().doc.styles.para("Body_wrd_2").is_none());
-        assert!(s.doc().unwrap().doc.styles.para("Title").is_none(), "mapped styles aren't imported");
-        assert_eq!(text_rows(&mut s)[0]["status"], "ok");
-
-        // An edit in the layout, then the file changes again: Update replaces the edit and warns.
-        s.execute("story.setText", &json!({"story": sid.0, "text": "Fixed in layout"})).unwrap();
-        assert_eq!(text_rows(&mut s)[0]["edited"], true);
-        std::fs::write(&path, docx("<w:r><w:t>Third draft.</w:t></w:r>")).unwrap();
-        let r = s.execute("links.update", &json!({})).unwrap();
-        assert_eq!(r["updated"], 1);
-        let w = r["warnings"][0].as_str().unwrap();
-        assert!(w.contains("chapter.docx") && w.contains("replaced"), "{w}");
-        assert_eq!(story(&s, sid).text, "Head\nThird draft.");
-        assert_eq!(text_rows(&mut s)[0]["edited"], false);
-        // Undo brings the edit back.
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(story(&s, sid).text, "Fixed in layout");
-        s.execute("edit.redo", &json!({})).unwrap();
-
-        // Saved and opened again: the link and its options are kept.
-        let back = designcraft_format::load(&designcraft_format::save(&s.doc().unwrap().doc).unwrap()).unwrap();
-        assert_eq!(back.story(sid).unwrap().file_link, story(&s, sid).file_link);
-        assert_eq!(super::text_status(back.story(sid).unwrap().file_link.as_ref().unwrap(), &mut Default::default(), None), "ok");
+        assert_link_update_replaces_and_warns(&mut s, &path, sid, a, b);
 
         // The file moves: Missing; Relink to it imports it into the story.
         let moved = dir.join("moved").join("chapter.docx");
diff --git a/crates/engine/src/cmd/links/tests.rs b/crates/engine/src/cmd/links/tests.rs
new file mode 100644
index 000000000..8089b24ce
--- /dev/null
+++ b/crates/engine/src/cmd/links/tests.rs
@@ -0,0 +1,375 @@
+use super::*;
+
+fn png(w: u32, h: u32) -> Vec<u8> {
+    designcraft_render::Rendered { width: w, height: h, pixels: vec![200u8; (w * h * 4) as usize] }.to_png()
+}
+
+/// A linked file's size is the document's choice, so a link is read under a cap (#1596).
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn a_linked_file_over_the_cap_is_refused_instead_of_read() {
+    let dir = std::env::temp_dir().join(format!("dc-link-cap-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("big.png");
+    let bytes = png(40, 40);
+    std::fs::write(&path, &bytes).unwrap();
+
+    // Under the cap the file is read and measured as before.
+    let (read, px) = reload_capped(&path, bytes.len() as u64).expect("a file within the cap is read");
+    assert_eq!((read.len(), px), (bytes.len(), (40, 40)));
+
+    // Over it the file is refused by name, and the error says what the limit is.
+    let err = reload_capped(&path, (bytes.len() - 1) as u64).expect_err("a file over the cap is refused");
+    let msg = err.to_string();
+    assert!(msg.contains("big.png") && msg.contains("larger than"), "the error names the file and the limit: {msg}");
+
+    // The real cap is the one packaging uses, so an ordinary graphic still loads.
+    assert!(reload(&path).is_ok(), "a normal linked graphic is unaffected");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+fn pdf(sizes: &[(u32, u32)]) -> Vec<u8> {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": sizes.len(), "facingPages": false})).unwrap();
+    for (i, (width, height)) in sizes.iter().enumerate() {
+        s.execute("layout.pageSize", &json!({"pages": [i + 1], "width": width, "height": height})).unwrap();
+    }
+    let result = s.execute("file.exportPdf", &json!({})).unwrap();
+    super::super::file::base64_decode(result["base64"].as_str().unwrap())
+}
+
+#[test]
+fn anchored_image_lists_its_page_and_resolution() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 2, "facingPages": false})).unwrap();
+    let r = s
+        .execute("frame.create", &json!({"spread": 1, "rect": [72, 72, 400, 400], "content": "text", "text": "Before after and more words."}))
+        .unwrap();
+    let sid = s.doc().unwrap().doc.item(ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+    let placed = s
+        .execute(
+            "file.place",
+            &json!({"base64": super::super::file::base64_encode(&png(10, 10)), "name": "dot.png", "x": 450, "y": 450, "width": 36}),
+        )
+        .unwrap();
+    let id = placed["id"].as_u64().unwrap();
+    let before = s.execute("links.list", &json!({})).unwrap();
+    assert_eq!(before[0]["uses"][0]["ppi"], 20.0);
+    s.execute("anchored.insert", &json!({"ids": [id], "story": sid.0, "pos": 7})).unwrap();
+    let list = s.execute("links.list", &json!({})).unwrap();
+    let uses = list[0]["uses"].as_array().unwrap();
+    assert_eq!(uses.len(), 1, "anchored image must have one use: {list}");
+    assert_eq!(uses[0]["page"], "2");
+    assert_eq!(uses[0]["ppi"], 20.0);
+}
+
+#[test]
+fn eps_web_exports_convert_tiff_and_skip_bad_used_assets() {
+    use std::io::Read;
+    let bytes = super::super::file::eps_place_tests::tiff_eps();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let placed = s.execute("file.place", &json!({"base64":super::super::file::base64_encode(&bytes),"name":"logo.eps"})).unwrap();
+    let aid = AssetId(placed["asset"].as_u64().unwrap());
+    let before = s.doc().unwrap().doc.clone();
+    let html = s.execute("file.exportHtml", &json!({})).unwrap();
+    let encoded = html["text"].as_str().unwrap().split("data:image/png;base64,").nth(1).unwrap().split('"').next().unwrap();
+    let png = super::super::file::base64_decode(encoded);
+    assert!(png.starts_with(b"\x89PNG"));
+    assert_eq!(designcraft_render::image_size(&png), Some((2, 2)));
+    assert_eq!(designcraft_render::decode_pixmap(&png).unwrap().data()[0], designcraft_render::decode_pixmap(&bytes).unwrap().data()[0]);
+    let result = s.execute("file.exportEpub", &json!({})).unwrap();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(super::super::file::base64_decode(result["base64"].as_str().unwrap()))).unwrap();
+    let mut image = Vec::new();
+    z.by_name(&format!("OEBPS/images/logo-{}.png", aid.0)).unwrap().read_to_end(&mut image).unwrap();
+    assert_eq!(image, png);
+    let mut opf = String::new();
+    z.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut opf).unwrap();
+    assert!(opf.contains("media-type=\"image/png\""));
+    assert!(!opf.contains("image/tiff"));
+    assert!(Arc::ptr_eq(&before, &s.doc().unwrap().doc));
+    s.edit(|d, _| {
+        Arc::make_mut(d.assets.get_mut(&aid).unwrap()).data = Arc::new(b"%!PS-Adobe-3.0 EPSF-3.0\n%%EOF\n".to_vec());
+        Ok(())
+    })
+    .unwrap();
+    let before = s.doc().unwrap().doc.clone();
+    for command in ["file.exportHtml", "file.exportEpub"] {
+        let result = s.execute(command, &json!({})).unwrap();
+        assert_eq!(result["warnings"].as_array().unwrap().len(), 1, "{command}");
+        if command == "file.exportHtml" {
+            assert!(!result["text"].as_str().unwrap().contains("<img "));
+        }
+    }
+    assert!(Arc::ptr_eq(&before, &s.doc().unwrap().doc));
+    s.execute("edit.clear", &json!({})).unwrap();
+    assert!(s.doc().unwrap().doc.assets.contains_key(&aid));
+    for command in ["file.exportHtml", "file.exportEpub"] {
+        let result = s.execute(command, &json!({})).unwrap();
+        assert!(result["warnings"].as_array().unwrap().is_empty(), "unused EPS: {command}");
+    }
+}
+
+#[test]
+fn eps_status_tracks_source_bytes_across_save_update_relink_and_embed() {
+    let dir = std::env::temp_dir().join(format!("dc-eps-status-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("logo.eps");
+    let first = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n0 0 0 setrgbcolor\n%%EOF\n";
+    let changed = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n1 0 0 setrgbcolor\n%%EOF\n";
+    assert_eq!(first.len(), changed.len());
+    assert_eq!(designcraft_images::eps_proxy(first), designcraft_images::eps_proxy(changed), "same preview, different source");
+    std::fs::write(&path, first).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let aid = AssetId(s.execute("file.place", &json!({"path": path.to_string_lossy()})).unwrap()["asset"].as_u64().unwrap());
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
+    let before = s.doc().unwrap().doc.clone();
+    assert_eq!(s.execute("links.update", &json!({})).unwrap()["updated"], 0);
+    assert!(Arc::ptr_eq(&s.doc().unwrap().doc, &before), "unchanged EPS must not create an edit");
+    let saved = designcraft_format::save(&before).unwrap();
+    let reopened = designcraft_format::load(&saved).unwrap();
+    assert_eq!(reopened.assets[&aid].data.as_slice(), first);
+    let mut s = Session::new();
+    s.add_document(crate::DocState::new(reopened, None));
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
+    std::fs::write(&path, changed).unwrap();
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "modified");
+    assert_eq!(s.execute("links.update", &json!({})).unwrap()["updated"], 1);
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
+    assert_eq!(s.doc().unwrap().doc.assets[&aid].data.as_slice(), changed);
+    std::fs::remove_file(&path).unwrap();
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "missing");
+    let replacement = dir.join("replacement.eps");
+    std::fs::write(&replacement, changed).unwrap();
+    s.execute("links.relink", &json!({"asset": aid.0, "path": replacement.to_string_lossy()})).unwrap();
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "missing");
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
+    s.execute("links.embed", &json!({"asset": aid.0})).unwrap();
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "embedded");
+    std::fs::remove_file(&replacement).unwrap();
+    let embedded = designcraft_format::load(&designcraft_format::save(&s.doc().unwrap().doc).unwrap()).unwrap();
+    // The asset is embedded, so no link is followed and the document is irrelevant.
+    assert_eq!(status(&embedded.assets[&aid], None), "embedded");
+    assert_eq!(embedded.assets[&aid].data.as_slice(), changed);
+    assert!(designcraft_render::decode_pixmap(&embedded.assets[&aid].data).is_some());
+    let _ = std::fs::remove_dir_all(dir);
+}
+
+#[test]
+fn eps_legacy_preview_document_is_upgraded_by_update() {
+    let dir = std::env::temp_dir().join(format!("dc-eps-legacy-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("logo.eps");
+    let source = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n%%EOF\n";
+    std::fs::write(&path, source).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let aid = AssetId(s.execute("file.place", &json!({"path": path.to_string_lossy()})).unwrap()["asset"].as_u64().unwrap());
+    let proxy = designcraft_images::eps_proxy(source).unwrap().0;
+    s.edit(|d, _| {
+        let a = Arc::make_mut(d.assets.get_mut(&aid).unwrap());
+        a.data = Arc::new(proxy);
+        a.mime = "image/png".into();
+        Ok(())
+    })
+    .unwrap();
+    let old = designcraft_format::load(&designcraft_format::save(&s.doc().unwrap().doc).unwrap()).unwrap();
+    let mut s = Session::new();
+    s.add_document(crate::DocState::new(old, None));
+    assert_eq!(s.execute("links.update", &json!({})).unwrap()["updated"], 1);
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
+    assert_eq!(s.doc().unwrap().doc.assets[&aid].data.as_slice(), source);
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert!(designcraft_render::decode_pixmap(&s.doc().unwrap().doc.assets[&aid].data).is_some(), "old preview remains renderable");
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
+    let _ = std::fs::remove_dir_all(dir);
+}
+
+#[test]
+fn eps_source_exports_preview_to_pdf_html_and_epub_without_editing_document() {
+    use hayro_syntax::object::Name;
+    use std::io::Read;
+
+    let source = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n%%EOF\n";
+    let proxy = designcraft_images::eps_proxy(source).unwrap().0;
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let aid = AssetId(
+        s.execute("file.place", &json!({"base64": super::super::file::base64_encode(source), "name": "logo.eps"})).unwrap()["asset"]
+            .as_u64()
+            .unwrap(),
+    );
+    // A document retaining the original EPS rather than the legacy preview-only asset.
+    s.edit(|d, _| {
+        let a = Arc::make_mut(d.assets.get_mut(&aid).unwrap());
+        a.data = Arc::new(source.to_vec());
+        a.mime = "application/postscript".into();
+        Ok(())
+    })
+    .unwrap();
+    let before = s.doc().unwrap().doc.clone();
+    let result = s.execute("file.exportPdf", &json!({})).unwrap();
+    assert!(result["warnings"].as_array().unwrap().is_empty(), "{:?}", result["warnings"]);
+    let pdf = hayro_syntax::Pdf::new(super::super::file::base64_decode(result["base64"].as_str().unwrap())).unwrap();
+    assert_eq!(
+        pdf.objects()
+            .into_iter()
+            .filter_map(|o| o.into_stream())
+            .filter(|st| st.dict().get::<Name>("Subtype").is_some_and(|n| n.as_str() == "Image"))
+            .count(),
+        1
+    );
+    let result = s.execute("file.exportHtml", &json!({})).unwrap();
+    let encoded = result["text"].as_str().unwrap().split("data:image/png;base64,").nth(1).unwrap().split('"').next().unwrap();
+    assert_eq!(super::super::file::base64_decode(encoded), proxy);
+    let result = s.execute("file.exportEpub", &json!({})).unwrap();
+    let bytes = super::super::file::base64_decode(result["base64"].as_str().unwrap());
+    let mut archive = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
+    let mut image = Vec::new();
+    archive.by_name(&format!("OEBPS/images/logo-{}.png", aid.0)).unwrap().read_to_end(&mut image).unwrap();
+    assert_eq!(image, proxy);
+    let mut opf = String::new();
+    archive.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut opf).unwrap();
+    assert!(opf.contains("media-type=\"image/png\""));
+    assert!(!opf.contains("application/postscript"));
+    assert!(Arc::ptr_eq(&s.doc().unwrap().doc, &before), "exports must leave the source document intact");
+    assert_eq!(before.assets[&aid].data.as_slice(), source);
+}
+
+#[test]
+fn eps_relink_update_and_folder_relink_retain_source() {
+    let dir = std::env::temp_dir().join(format!("dc-links-eps-{}", std::process::id()));
+    std::fs::create_dir_all(dir.join("new")).unwrap();
+    let eps = |w: u32| format!("%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 {w} 10\n%%EOF\n");
+    let original = dir.join("original.eps");
+    let replacement = dir.join("replacement.eps");
+    std::fs::write(&original, eps(10)).unwrap();
+    std::fs::write(&replacement, eps(30)).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("file.place", &json!({"path": original.to_string_lossy()})).unwrap();
+    let aid = s.doc().unwrap().doc.assets.keys().next().copied().unwrap();
+    std::fs::write(&original, eps(20)).unwrap();
+    assert_eq!(s.execute("links.update", &json!({})).unwrap()["updated"], 1);
+    assert_eq!(s.doc().unwrap().doc.assets[&aid].pixels, Some((40, 20)));
+    s.execute("links.relink", &json!({"asset": aid.0, "path": replacement.to_string_lossy()})).unwrap();
+    let a = &s.doc().unwrap().doc.assets[&aid];
+    assert_eq!(a.pixels, Some((60, 20)));
+    assert_eq!(a.mime, "application/postscript");
+    assert_eq!(a.data.as_slice(), eps(30).as_bytes());
+    let moved = dir.join("new").join("replacement.eps");
+    std::fs::rename(&replacement, &moved).unwrap();
+    assert_eq!(s.execute("links.relinkFolder", &json!({"dir": dir.join("new").to_string_lossy()})).unwrap()["relinked"], 1);
+    assert_eq!(s.doc().unwrap().doc.assets[&aid].link.as_deref(), moved.to_str());
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "ok");
+    let _ = std::fs::remove_dir_all(dir);
+}
+
+#[test]
+fn pdf_relink_and_update_preserve_selected_page_size() {
+    let dir = std::env::temp_dir().join(format!("dc-links-pdf-size-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let original = dir.join("original.pdf");
+    let replacement = dir.join("replacement.pdf");
+    std::fs::write(&original, pdf(&[(10, 10), (20, 30)])).unwrap();
+    std::fs::write(&replacement, pdf(&[(40, 40), (50, 60)])).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("file.place", &json!({"path": original.to_string_lossy(), "pdfPage": 2})).unwrap();
+    let aid = s.doc().unwrap().doc.assets.keys().next().copied().unwrap();
+    s.execute("links.relink", &json!({"asset": aid.0, "path": replacement.to_string_lossy()})).unwrap();
+    let a = &s.doc().unwrap().doc.assets[&aid];
+    assert_eq!(a.page, 1);
+    assert_eq!(a.pixels, Some((50, 60)));
+    assert!(designcraft_render::render_pdf_page(&a.data, a.page as usize, 64).is_some());
+    std::fs::write(&replacement, pdf(&[(70, 70), (80, 90)])).unwrap();
+    assert_eq!(s.execute("links.update", &json!({})).unwrap()["updated"], 1);
+    assert_eq!(s.doc().unwrap().doc.assets[&aid].pixels, Some((80, 90)));
+    let raster = dir.join("replacement.png");
+    std::fs::write(&raster, png(4, 5)).unwrap();
+    s.execute("links.relink", &json!({"asset": aid.0, "path": raster.to_string_lossy()})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.assets[&aid].page, 0);
+    let _ = std::fs::remove_dir_all(dir);
+}
+
+#[test]
+fn pdf_reload_rejects_missing_page_without_edit() {
+    let full = pdf(&[(10, 10), (20, 30)]);
+    let short = pdf(&[(10, 10)]);
+    let dir = std::env::temp_dir().join(format!("dc-links-pdf-page-{}", std::process::id()));
+    std::fs::create_dir_all(dir.join("new")).unwrap();
+    let original = dir.join("book.pdf");
+    let replacement = dir.join("new/book.pdf");
+    std::fs::write(&replacement, short.clone()).unwrap();
+    for command in ["links.relink", "links.relinkFolder", "links.update"] {
+        std::fs::write(&original, &full).unwrap();
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("file.place", &json!({"path": original.to_string_lossy(), "pdfPage": 2})).unwrap();
+        let aid = s.doc().unwrap().doc.assets.keys().next().copied().unwrap();
+        if command == "links.update" {
+            std::fs::write(&original, &short).unwrap();
+        }
+        let st = s.doc().unwrap();
+        let before = st.doc.clone();
+        let revision = st.revision;
+        let undo = st.history.undo.len();
+        let journal = s.journal.len();
+        let params = match command {
+            "links.relinkFolder" => json!({"dir": dir.join("new").to_string_lossy(), "missingOnly": false}),
+            "links.update" => json!({"asset": aid.0}),
+            _ => json!({"asset": aid.0, "path": replacement.to_string_lossy()}),
+        };
+        let err = s.execute(command, &params).unwrap_err();
+        assert!(err.to_string().contains("PDF page 2"), "{command}: {err}");
+        let st = s.doc().unwrap();
+        assert!(Arc::ptr_eq(&st.doc, &before), "{command}");
+        assert_eq!(st.revision, revision);
+        assert_eq!(st.history.undo.len(), undo);
+        assert_eq!(s.journal.len(), journal);
+        assert!(designcraft_render::render_pdf_page(&st.doc.assets[&aid].data, 1, 64).is_some());
+    }
+    let _ = std::fs::remove_dir_all(dir);
+}
+
+#[test]
+fn link_status_relink_update_embed() {
+    let dir = std::env::temp_dir().join(format!("dc-links-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let a = dir.join("a.png");
+    let b = dir.join("b.png");
+    std::fs::write(&a, png(10, 10)).unwrap();
+    std::fs::write(&b, png(20, 10)).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("file.place", &json!({"path": a.to_string_lossy(), "x": 72, "y": 72, "width": 72})).unwrap();
+    let l = s.execute("links.list", &json!({})).unwrap();
+    assert_eq!(l[0]["status"], "ok");
+    assert_eq!(l[0]["uses"][0]["ppi"], 10.0, "10 px over 1 inch");
+    let aid = l[0]["asset"].as_u64().unwrap();
+    // The file changes on disk.
+    std::fs::write(&a, png(30, 10)).unwrap();
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "modified");
+    s.execute("links.update", &json!({})).unwrap();
+    let l = s.execute("links.list", &json!({})).unwrap();
+    assert_eq!(l[0]["status"], "ok");
+    assert_eq!(l[0]["pixels"], json!([30, 10]));
+    // Missing, then relinked.
+    std::fs::remove_file(&a).unwrap();
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "missing");
+    s.execute("links.relink", &json!({"asset": aid, "path": b.to_string_lossy()})).unwrap();
+    let l = s.execute("links.list", &json!({})).unwrap();
+    assert_eq!((l[0]["status"].as_str(), l[0]["name"].as_str()), (Some("ok"), Some("b.png")));
+    // Go to selects the frame; embed forgets the file.
+    let r = s.execute("links.goTo", &json!({"asset": aid})).unwrap();
+    assert_eq!(r["ids"].as_array().unwrap().len(), 1);
+    s.execute("links.embed", &json!({"asset": aid})).unwrap();
+    assert_eq!(s.execute("links.list", &json!({})).unwrap()[0]["status"], "embedded");
+    let _ = std::fs::remove_dir_all(&dir);
+}
diff --git a/crates/engine/src/cmd/lists.rs b/crates/engine/src/cmd/lists.rs
index 74570f3fd..97c920309 100644
--- a/crates/engine/src/cmd/lists.rs
+++ b/crates/engine/src/cmd/lists.rs
@@ -92,40 +92,43 @@ fn apply_list(s: &mut Session, p: &Value, kind: ListType) -> Result<Value> {
         for t in &targets {
             let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
             let span = para_span(&st.text, &t.range);
-            st.format_paras(span, |pf| {
-                let (now, _) = styles.resolve_para(pf);
-                // Off takes away this list only: a paragraph with the other list keeps it.
-                if !on && now.list_type != kind {
-                    return;
-                }
-                let (style, _) = styles.resolve_para_style(&pf.style);
-                // The hanging indent this button set (and nothing has changed since).
-                let own_hang = pf.para.list_hang == Some(true) && now.left_indent == LIST_HANG && now.first_line_indent == -LIST_HANG;
-                // A value: left to the style when it gives the same, else set here.
-                let mut set = |key: &str, v: Value, same: bool| {
-                    let _ = pf.para.set_json(key, if same { &Value::Null } else { &v });
-                };
-                let list = if on { kind } else { ListType::None };
-                set("listType", serde_json::to_value(list).unwrap_or(Value::Null), style.list_type == list);
-                if on && now.left_indent == 0.0 && now.first_line_indent == 0.0 {
-                    set("leftIndent", json!(LIST_HANG), style.left_indent == LIST_HANG);
-                    set("firstLineIndent", json!(-LIST_HANG), style.first_line_indent == -LIST_HANG);
-                    set("listHang", json!(true), false);
-                } else if !on && now.list_type == kind {
-                    // Only the hanging indent set here: one the paragraph had before, or its style
-                    // gives, stays.
-                    if own_hang {
-                        set("leftIndent", json!(0.0), style.left_indent == 0.0);
-                        set("firstLineIndent", json!(0.0), style.first_line_indent == 0.0);
-                    }
-                    set("listHang", Value::Null, true);
-                }
-            });
+            st.format_paras(span, |pf| set_para_list(pf, &styles, on, kind));
         }
         Ok(json!({"on": on}))
     })
 }
 
+/// One paragraph's share of [`apply_list`]: turns the list on or off, setting only the values the
+/// style does not already give.
+fn set_para_list(pf: &mut designcraft_doc::ParaFormat, styles: &designcraft_doc::Styles, on: bool, kind: ListType) {
+    let (now, _) = styles.resolve_para(pf);
+    // Off takes away this list only: a paragraph with the other list keeps it.
+    if !on && now.list_type != kind {
+        return;
+    }
+    let (style, _) = styles.resolve_para_style(&pf.style);
+    // The hanging indent this button set (and nothing has changed since).
+    let own_hang = pf.para.list_hang == Some(true) && now.left_indent == LIST_HANG && now.first_line_indent == -LIST_HANG;
+    // A value: left to the style when it gives the same, else set here.
+    let mut set = |key: &str, v: Value, same: bool| {
+        let _ = pf.para.set_json(key, if same { &Value::Null } else { &v });
+    };
+    let list = if on { kind } else { ListType::None };
+    set("listType", serde_json::to_value(list).unwrap_or(Value::Null), style.list_type == list);
+    if on && now.left_indent == 0.0 && now.first_line_indent == 0.0 {
+        set("leftIndent", json!(LIST_HANG), style.left_indent == LIST_HANG);
+        set("firstLineIndent", json!(-LIST_HANG), style.first_line_indent == -LIST_HANG);
+        set("listHang", json!(true), false);
+    } else if !on && now.list_type == kind {
+        // Only the hanging indent set here: one the paragraph had before, or its style gives, stays.
+        if own_hang {
+            set("leftIndent", json!(0.0), style.left_indent == 0.0);
+            set("firstLineIndent", json!(0.0), style.first_line_indent == 0.0);
+        }
+        set("listHang", Value::Null, true);
+    }
+}
+
 /// The range whose paragraphs a list applies to: a selection ending where a paragraph starts (after
 /// a return) doesn't reach into that paragraph. The story's last paragraph, empty after a final
 /// return, stays in when the range runs to the end (a whole frame).
diff --git a/crates/engine/src/cmd/load_styles.rs b/crates/engine/src/cmd/load_styles.rs
index b89b42fa5..762f7b1fc 100644
--- a/crates/engine/src/cmd/load_styles.rs
+++ b/crates/engine/src/cmd/load_styles.rs
@@ -350,358 +350,4 @@ fn list(s: &mut Session, p: &Value) -> Result<Value> {
 }
 
 #[cfg(test)]
-mod tests {
-    use designcraft_color::{Color, Swatch, SwatchValue};
-    use designcraft_doc::{CharAttrs, CharacterStyle, ExportTag, GrepStyle, NumberedList, ParaAttrs, ParagraphStyle, Rule, Styles};
-    use serde_json::{Value, json};
-
-    use crate::Session;
-
-    const BASIC: &str = "[Basic Paragraph]";
-
-    fn para(name: &str, based_on: Option<&str>, size: f64) -> ParagraphStyle {
-        ParagraphStyle {
-            name: name.into(),
-            based_on: based_on.map(str::to_string),
-            next_style: None,
-            para: ParaAttrs::default(),
-            chars: CharAttrs { size: Some(size), ..Default::default() },
-            shortcut: String::new(),
-        }
-    }
-
-    fn chars(name: &str, based_on: Option<&str>, size: f64) -> CharacterStyle {
-        CharacterStyle {
-            name: name.into(),
-            based_on: based_on.map(str::to_string),
-            chars: CharAttrs { size: Some(size), ..Default::default() },
-            shortcut: String::new(),
-        }
-    }
-
-    fn new_doc() -> Session {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s
-    }
-
-    fn file_of(s: &Session) -> String {
-        super::super::file::base64_encode(&super::super::file::to_bytes(&s.doc().unwrap().doc).unwrap())
-    }
-
-    /// A client's document: Body in the brand colour with a GREP style, Head and Quote based on
-    /// it, Small characters based on Lead, an 11 pt [Basic Paragraph], and a swatch no style uses.
-    fn client() -> Session {
-        let mut s = new_doc();
-        s.edit(|d, _| {
-            d.swatches.push(Swatch::color("Brand Teal", Color::cmyk(0.9, 0.0, 0.4, 0.2)));
-            d.swatches.push(Swatch {
-                name: "Brand Teal 40%".into(),
-                value: SwatchValue::Tint { base: "Brand Teal".into(), tint: 0.4 },
-                locked: false,
-                named: true,
-                hidden: false,
-            });
-            d.swatches.push(Swatch::color("Unused Red", Color::cmyk(0.0, 1.0, 1.0, 0.0)));
-            let st = d.styles_mut();
-            st.para_mut(BASIC).unwrap().chars.size = Some(11.0);
-            st.character.push(chars("Lead", None, 9.0));
-            st.character.push(chars("Small", Some("Lead"), 7.0));
-            let mut body = para("Body", Some(BASIC), 10.0);
-            body.chars.fill = Some("Brand Teal".into());
-            body.para.grep_styles = Some(vec![GrepStyle { style: "Small".into(), pattern: r"\d+".into() }]);
-            st.paragraph.push(body);
-            let mut head = para("Head", Some("Body"), 20.0);
-            head.next_style = Some("Body".into());
-            st.paragraph.push(head);
-            let mut quote = para("Quote", Some("Body"), 12.0);
-            quote.para.rule_above = Some(Rule { on: true, color: "Brand Teal 40%".into(), ..Default::default() });
-            st.paragraph.push(quote);
-            Ok(())
-        })
-        .unwrap();
-        s
-    }
-
-    fn styles(s: &Session) -> Styles {
-        (*s.doc().unwrap().doc.styles).clone()
-    }
-
-    #[test]
-    fn every_style_of_the_file_loads_with_the_swatches_it_uses() {
-        let mut s = new_doc();
-        let r = s.execute("style.load", &json!({"base64": file_of(&client())})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let head = d.styles.para("Head").unwrap();
-        assert_eq!((head.based_on.as_deref(), head.next_style.as_deref(), head.chars.size), (Some("Body"), Some("Body"), Some(20.0)));
-        assert_eq!(d.styles.para("Body").unwrap().chars.fill.as_deref(), Some("Brand Teal"));
-        assert_eq!(d.styles.char_style("Small").unwrap().based_on.as_deref(), Some("Lead"));
-        assert_eq!(d.swatch("Brand Teal"), client().doc().unwrap().doc.swatch("Brand Teal"));
-        assert!(d.swatch("Brand Teal 40%").is_some());
-        assert!(d.swatch("Unused Red").is_none(), "a swatch no loaded style uses stays behind");
-        assert_eq!(r["paragraph"]["added"], json!(["Body", "Head", "Quote"]));
-        assert_eq!(r["character"]["added"], json!(["Lead", "Small"]));
-        assert_eq!(r["swatches"], json!(["Brand Teal", "Brand Teal 40%"]));
-    }
-
-    #[test]
-    fn basic_paragraph_takes_the_definition_of_the_file() {
-        let mut s = new_doc();
-        let r = s.execute("style.load", &json!({"base64": file_of(&client())})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.styles.para(BASIC).unwrap().chars.size, Some(11.0));
-        assert_eq!(r["paragraph"]["replaced"], json!([BASIC]));
-    }
-
-    #[test]
-    fn a_named_style_brings_the_styles_it_names() {
-        let mut s = new_doc();
-        let r = s.execute("style.load", &json!({"base64": file_of(&client()), "paragraph": ["Head"], "character": []})).unwrap();
-        let st = styles(&s);
-        assert_eq!(r["paragraph"]["added"], json!(["Body", "Head"]), "Head is based on Body");
-        assert_eq!(r["character"]["added"], json!(["Lead", "Small"]), "Body's GREP style names Small, which is based on Lead");
-        assert!(st.para("Quote").is_none());
-        assert_eq!(st.para(BASIC).unwrap().chars.size, None, "a style the document has is only replaced when it was asked for");
-        assert_eq!(r["paragraph"]["replaced"], json!([]));
-        assert_eq!(r["swatches"], json!(["Brand Teal"]));
-    }
-
-    /// The document already has a Body and a Lead of its own.
-    fn doc_with_body_and_lead() -> Session {
-        let mut s = new_doc();
-        s.edit(|d, _| {
-            let st = d.styles_mut();
-            st.paragraph.push(para("Body", None, 8.0));
-            st.character.push(chars("Lead", None, 5.0));
-            Ok(())
-        })
-        .unwrap();
-        s
-    }
-
-    #[test]
-    fn a_style_of_the_same_name_takes_the_loaded_definition() {
-        let mut s = doc_with_body_and_lead();
-        let r = s.execute("style.load", &json!({"base64": file_of(&client())})).unwrap();
-        let st = styles(&s);
-        assert_eq!((st.para("Body").unwrap().chars.size, st.char_style("Lead").unwrap().chars.size), (Some(10.0), Some(9.0)));
-        assert_eq!(r["paragraph"]["replaced"], json!([BASIC, "Body"]));
-        assert_eq!(r["character"]["replaced"], json!(["Lead"]));
-        assert_eq!(st.paragraph.iter().filter(|p| p.name == "Body").count(), 1);
-    }
-
-    #[test]
-    fn use_existing_keeps_the_styles_of_the_document() {
-        let mut s = doc_with_body_and_lead();
-        let r = s.execute("style.load", &json!({"base64": file_of(&client()), "conflicts": "useExisting"})).unwrap();
-        let st = styles(&s);
-        assert_eq!((st.para("Body").unwrap().chars.size, st.char_style("Lead").unwrap().chars.size), (Some(8.0), Some(5.0)));
-        assert_eq!(st.para(BASIC).unwrap().chars.size, None);
-        assert_eq!(st.para("Head").unwrap().based_on.as_deref(), Some("Body"));
-        assert_eq!((&r["paragraph"]["added"], &r["paragraph"]["replaced"]), (&json!(["Head", "Quote"]), &json!([])));
-    }
-
-    #[test]
-    fn auto_rename_loads_a_clashing_style_under_a_new_name() {
-        let mut s = doc_with_body_and_lead();
-        let r = s.execute("style.load", &json!({"base64": file_of(&client()), "conflicts": "autoRename"})).unwrap();
-        let st = styles(&s);
-        assert_eq!((st.para("Body").unwrap().chars.size, st.para("Body 2").unwrap().chars.size), (Some(8.0), Some(10.0)));
-        assert_eq!((st.char_style("Lead").unwrap().chars.size, st.char_style("Lead 2").unwrap().chars.size), (Some(5.0), Some(9.0)));
-        let head = st.para("Head").unwrap();
-        assert_eq!(
-            (head.based_on.as_deref(), head.next_style.as_deref()),
-            (Some("Body 2"), Some("Body 2")),
-            "the loaded Head follows the loaded Body"
-        );
-        assert_eq!(st.char_style("Small").unwrap().based_on.as_deref(), Some("Lead 2"));
-        assert_eq!(st.para("Body 2").unwrap().based_on.as_deref(), Some("Basic Paragraph"));
-        assert_eq!(st.para("Basic Paragraph").unwrap().chars.size, Some(11.0), "a built-in style comes in without its brackets");
-        assert_eq!(st.para(BASIC).unwrap().chars.size, None);
-        assert_eq!(r["paragraph"]["renamed"], json!({"[Basic Paragraph]": "Basic Paragraph", "Body": "Body 2"}));
-        assert_eq!(r["character"]["renamed"], json!({"Lead": "Lead 2"}));
-        assert_eq!(r["paragraph"]["replaced"], json!([]));
-    }
-
-    #[test]
-    fn a_style_that_is_the_same_in_both_is_no_conflict() {
-        let mut s = new_doc();
-        let file = file_of(&client());
-        s.execute("style.load", &json!({"base64": file})).unwrap();
-        let loaded = styles(&s);
-        for conflicts in ["redefine", "autoRename"] {
-            let r = s.execute("style.load", &json!({"base64": file, "conflicts": conflicts})).unwrap();
-            let none = json!({"added": [], "replaced": [], "renamed": {}});
-            assert_eq!(r, json!({"paragraph": none, "character": none, "swatches": []}), "{conflicts}");
-        }
-        assert_eq!(styles(&s), loaded);
-        // Loading nothing leaves no undo step: one Undo takes back the first load.
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert!(styles(&s).para("Head").is_none());
-    }
-
-    #[test]
-    fn loading_is_one_undo_step() {
-        let mut s = doc_with_body_and_lead();
-        let (before, swatches) = (styles(&s), s.doc().unwrap().doc.swatches.clone());
-        s.execute("style.load", &json!({"base64": file_of(&client())})).unwrap();
-        assert_ne!(styles(&s), before);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(styles(&s), before);
-        assert_eq!(s.doc().unwrap().doc.swatches, swatches);
-    }
-
-    #[test]
-    fn a_swatch_of_the_document_wins_over_the_one_in_the_file() {
-        let mut s = new_doc();
-        s.execute("swatch.create", &json!({"name": "Brand Teal", "color": "#ff0000"})).unwrap();
-        let mine = s.doc().unwrap().doc.swatch("Brand Teal").cloned();
-        let r = s.execute("style.load", &json!({"base64": file_of(&client())})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.swatch("Brand Teal").cloned(), mine);
-        assert_eq!(r["swatches"], json!(["Brand Teal 40%"]));
-    }
-
-    #[test]
-    fn a_tint_swatch_brings_its_base_colour() {
-        let mut src = client();
-        src.edit(|d, _| {
-            let mut ruled = para("Ruled", None, 9.0);
-            ruled.para.rule_below = Some(Rule { on: true, color: "Brand Teal 40%".into(), ..Default::default() });
-            d.styles_mut().paragraph.push(ruled);
-            Ok(())
-        })
-        .unwrap();
-        let mut s = new_doc();
-        let r = s.execute("style.load", &json!({"base64": file_of(&src), "paragraph": ["Ruled"], "character": []})).unwrap();
-        assert_eq!(r["paragraph"]["added"], json!(["Ruled"]));
-        assert_eq!(r["swatches"], json!(["Brand Teal", "Brand Teal 40%"]));
-    }
-
-    #[test]
-    fn export_tags_and_named_lists_come_with_their_styles() {
-        let mut src = client();
-        src.edit(|d, _| {
-            d.settings.lists.push(NumberedList { name: "Steps".into(), continue_across_stories: false });
-            d.settings.lists.push(NumberedList { name: "Unused".into(), ..Default::default() });
-            let st = d.styles_mut();
-            st.export_tags.insert("p:Head".into(), ExportTag { tag: "h1".into(), class: "title".into() });
-            st.export_tags.insert("c:Lead".into(), ExportTag { tag: "em".into(), class: String::new() });
-            st.para_mut("Quote").unwrap().para.list_name = Some("Steps".into());
-            Ok(())
-        })
-        .unwrap();
-        let mut s = doc_with_body_and_lead();
-        s.execute("style.load", &json!({"base64": file_of(&src), "conflicts": "autoRename"})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        assert_eq!(d.styles.export_tag("Head", false).map(|t| t.tag.as_str()), Some("h1"));
-        assert_eq!(d.styles.export_tag("Lead 2", true).map(|t| t.tag.as_str()), Some("em"), "the tag follows the new name");
-        assert_eq!(d.styles.export_tag("Lead", true), None);
-        assert_eq!(d.settings.lists.iter().map(|l| (l.name.as_str(), l.continue_across_stories)).collect::<Vec<_>>(), [("Steps", false)]);
-    }
-
-    #[test]
-    fn styles_load_from_an_idml_file() {
-        let idml = client().execute("file.exportIdml", &json!({})).unwrap()["base64"].as_str().unwrap().to_string();
-        let mut s = new_doc();
-        let r = s.execute("style.load", &json!({"base64": idml, "name": "Client.IDML", "paragraph": ["Head"]})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let head = d.styles.para("Head").unwrap();
-        assert_eq!((head.based_on.as_deref(), head.chars.size), (Some("Body"), Some(20.0)));
-        assert_eq!(d.styles.para("Body").unwrap().chars.fill.as_deref(), Some("Brand Teal"));
-        assert!(d.swatch("Brand Teal").is_some());
-        assert_eq!(r["paragraph"]["added"], json!(["Body", "Head"]));
-    }
-
-    #[test]
-    fn styles_load_from_a_path() {
-        let path = std::env::temp_dir().join(format!("dc-load-styles-{}.designcraft", std::process::id()));
-        std::fs::write(&path, super::super::file::to_bytes(&client().doc().unwrap().doc).unwrap()).unwrap();
-        let mut s = new_doc();
-        let r = s.execute("style.load", &json!({"path": path.to_str().unwrap(), "paragraph": [], "character": ["Small"]}));
-        std::fs::remove_file(&path).unwrap();
-        assert_eq!(r.unwrap()["character"]["added"], json!(["Lead", "Small"]));
-        assert!(styles(&s).para("Head").is_none());
-    }
-
-    #[test]
-    fn the_file_lists_its_styles_and_which_ones_clash() {
-        let mut s = doc_with_body_and_lead();
-        let file = file_of(&client());
-        let name = |n: &str, conflict: bool| json!({"name": n, "conflict": conflict});
-        let r = s.execute("style.load.list", &json!({"base64": file})).unwrap();
-        assert_eq!(r["paragraph"], json!([name(BASIC, true), name("Body", true), name("Head", false), name("Quote", false)]));
-        assert_eq!(r["character"], json!([name("Lead", true), name("Small", false)]));
-        s.execute("style.load", &json!({"base64": file})).unwrap();
-        let r = s.execute("style.load.list", &json!({"base64": file})).unwrap();
-        assert!(r["paragraph"].as_array().unwrap().iter().all(|p| p["conflict"] == false), "the same definition is no clash: {r}");
-    }
-
-    fn unchanged_after(s: &mut Session, params: Value, why: &str) {
-        let before = s.doc().unwrap().doc.clone();
-        let e = s.execute("style.load", &params).unwrap_err().to_string();
-        assert!(e.contains(why), "{e}");
-        assert_eq!(s.doc().unwrap().doc, before);
-    }
-
-    #[test]
-    fn what_cannot_be_loaded_is_an_error_and_changes_nothing() {
-        let mut s = doc_with_body_and_lead();
-        let file = file_of(&client());
-        unchanged_after(&mut s, json!({}), "`path` or `base64`");
-        unchanged_after(&mut s, json!({"base64": "AAAA"}), "");
-        unchanged_after(&mut s, json!({"base64": "AAAA", "name": "a.idml"}), "");
-        unchanged_after(&mut s, json!({"base64": file, "paragraph": ["Head", "Nope"]}), "no paragraph style `Nope`");
-        unchanged_after(&mut s, json!({"base64": file, "character": ["[None]"]}), "no character style `[None]`");
-        unchanged_after(&mut s, json!({"base64": file, "paragraph": ["[No Paragraph Style]"]}), "no paragraph style");
-        unchanged_after(&mut s, json!({"base64": file, "paragraph": "Head"}), "`paragraph` must be a list of style names");
-        unchanged_after(&mut s, json!({"base64": file, "character": [1]}), "`character` must be a list of style names");
-        unchanged_after(&mut s, json!({"base64": file, "conflicts": "merge"}), "`conflicts`");
-    }
-
-    #[test]
-    fn a_style_that_would_be_based_on_itself_is_refused() {
-        // In the file B is based on A; in the document A is based on B.
-        let mut src = new_doc();
-        src.edit(|d, _| {
-            let st = d.styles_mut();
-            st.paragraph.push(para("A", None, 9.0));
-            st.paragraph.push(para("B", Some("A"), 9.0));
-            st.character.push(chars("X", None, 9.0));
-            st.character.push(chars("Y", Some("X"), 9.0));
-            Ok(())
-        })
-        .unwrap();
-        let mut s = new_doc();
-        s.edit(|d, _| {
-            let st = d.styles_mut();
-            st.paragraph.push(para("B", None, 9.0));
-            st.paragraph.push(para("A", Some("B"), 9.0));
-            st.character.push(chars("Y", None, 9.0));
-            st.character.push(chars("X", Some("Y"), 9.0));
-            Ok(())
-        })
-        .unwrap();
-        unchanged_after(&mut s, json!({"base64": file_of(&src), "paragraph": ["B"], "character": []}), "`B` would be based on itself");
-        unchanged_after(&mut s, json!({"base64": file_of(&src), "paragraph": [], "character": ["Y"]}), "`Y` would be based on itself");
-        // With A loaded as well both take the file's order.
-        s.execute("style.load", &json!({"base64": file_of(&src), "character": []})).unwrap();
-        assert_eq!((styles(&s).para("A").unwrap().based_on.clone(), styles(&s).para("B").unwrap().based_on.clone()), (None, Some("A".to_string())));
-    }
-
-    #[test]
-    fn a_file_with_a_based_on_loop_of_its_own_does_not_hang() {
-        let mut src = new_doc();
-        src.edit(|d, _| {
-            let st = d.styles_mut();
-            st.paragraph.push(para("A", Some("B"), 9.0));
-            st.paragraph.push(para("B", Some("A"), 9.0));
-            st.paragraph.push(para("Next", None, 9.0));
-            st.para_mut("Next").unwrap().next_style = Some("Next".into());
-            Ok(())
-        })
-        .unwrap();
-        let mut s = new_doc();
-        unchanged_after(&mut s, json!({"base64": file_of(&src), "paragraph": ["A"]}), "would be based on itself");
-        let r = s.execute("style.load", &json!({"base64": file_of(&src), "paragraph": ["Next"]})).unwrap();
-        assert_eq!(r["paragraph"]["added"], json!(["Next"]));
-    }
-}
+mod tests;
diff --git a/crates/engine/src/cmd/load_styles/tests.rs b/crates/engine/src/cmd/load_styles/tests.rs
new file mode 100644
index 000000000..9b9db72ed
--- /dev/null
+++ b/crates/engine/src/cmd/load_styles/tests.rs
@@ -0,0 +1,349 @@
+use designcraft_color::{Color, Swatch, SwatchValue};
+use designcraft_doc::{CharAttrs, CharacterStyle, ExportTag, GrepStyle, NumberedList, ParaAttrs, ParagraphStyle, Rule, Styles};
+use serde_json::{Value, json};
+
+use crate::Session;
+
+const BASIC: &str = "[Basic Paragraph]";
+
+fn para(name: &str, based_on: Option<&str>, size: f64) -> ParagraphStyle {
+    ParagraphStyle {
+        name: name.into(),
+        based_on: based_on.map(str::to_string),
+        next_style: None,
+        para: ParaAttrs::default(),
+        chars: CharAttrs { size: Some(size), ..Default::default() },
+        shortcut: String::new(),
+    }
+}
+
+fn chars(name: &str, based_on: Option<&str>, size: f64) -> CharacterStyle {
+    CharacterStyle {
+        name: name.into(),
+        based_on: based_on.map(str::to_string),
+        chars: CharAttrs { size: Some(size), ..Default::default() },
+        shortcut: String::new(),
+    }
+}
+
+fn new_doc() -> Session {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s
+}
+
+fn file_of(s: &Session) -> String {
+    super::super::file::base64_encode(&super::super::file::to_bytes(&s.doc().unwrap().doc).unwrap())
+}
+
+/// A client's document: Body in the brand colour with a GREP style, Head and Quote based on
+/// it, Small characters based on Lead, an 11 pt [Basic Paragraph], and a swatch no style uses.
+fn client() -> Session {
+    let mut s = new_doc();
+    s.edit(|d, _| {
+        d.swatches.push(Swatch::color("Brand Teal", Color::cmyk(0.9, 0.0, 0.4, 0.2)));
+        d.swatches.push(Swatch {
+            name: "Brand Teal 40%".into(),
+            value: SwatchValue::Tint { base: "Brand Teal".into(), tint: 0.4 },
+            locked: false,
+            named: true,
+            hidden: false,
+        });
+        d.swatches.push(Swatch::color("Unused Red", Color::cmyk(0.0, 1.0, 1.0, 0.0)));
+        let st = d.styles_mut();
+        st.para_mut(BASIC).unwrap().chars.size = Some(11.0);
+        st.character.push(chars("Lead", None, 9.0));
+        st.character.push(chars("Small", Some("Lead"), 7.0));
+        let mut body = para("Body", Some(BASIC), 10.0);
+        body.chars.fill = Some("Brand Teal".into());
+        body.para.grep_styles = Some(vec![GrepStyle { style: "Small".into(), pattern: r"\d+".into() }]);
+        st.paragraph.push(body);
+        let mut head = para("Head", Some("Body"), 20.0);
+        head.next_style = Some("Body".into());
+        st.paragraph.push(head);
+        let mut quote = para("Quote", Some("Body"), 12.0);
+        quote.para.rule_above = Some(Rule { on: true, color: "Brand Teal 40%".into(), ..Default::default() });
+        st.paragraph.push(quote);
+        Ok(())
+    })
+    .unwrap();
+    s
+}
+
+fn styles(s: &Session) -> Styles {
+    (*s.doc().unwrap().doc.styles).clone()
+}
+
+#[test]
+fn every_style_of_the_file_loads_with_the_swatches_it_uses() {
+    let mut s = new_doc();
+    let r = s.execute("style.load", &json!({"base64": file_of(&client())})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    let head = d.styles.para("Head").unwrap();
+    assert_eq!((head.based_on.as_deref(), head.next_style.as_deref(), head.chars.size), (Some("Body"), Some("Body"), Some(20.0)));
+    assert_eq!(d.styles.para("Body").unwrap().chars.fill.as_deref(), Some("Brand Teal"));
+    assert_eq!(d.styles.char_style("Small").unwrap().based_on.as_deref(), Some("Lead"));
+    assert_eq!(d.swatch("Brand Teal"), client().doc().unwrap().doc.swatch("Brand Teal"));
+    assert!(d.swatch("Brand Teal 40%").is_some());
+    assert!(d.swatch("Unused Red").is_none(), "a swatch no loaded style uses stays behind");
+    assert_eq!(r["paragraph"]["added"], json!(["Body", "Head", "Quote"]));
+    assert_eq!(r["character"]["added"], json!(["Lead", "Small"]));
+    assert_eq!(r["swatches"], json!(["Brand Teal", "Brand Teal 40%"]));
+}
+
+#[test]
+fn basic_paragraph_takes_the_definition_of_the_file() {
+    let mut s = new_doc();
+    let r = s.execute("style.load", &json!({"base64": file_of(&client())})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.styles.para(BASIC).unwrap().chars.size, Some(11.0));
+    assert_eq!(r["paragraph"]["replaced"], json!([BASIC]));
+}
+
+#[test]
+fn a_named_style_brings_the_styles_it_names() {
+    let mut s = new_doc();
+    let r = s.execute("style.load", &json!({"base64": file_of(&client()), "paragraph": ["Head"], "character": []})).unwrap();
+    let st = styles(&s);
+    assert_eq!(r["paragraph"]["added"], json!(["Body", "Head"]), "Head is based on Body");
+    assert_eq!(r["character"]["added"], json!(["Lead", "Small"]), "Body's GREP style names Small, which is based on Lead");
+    assert!(st.para("Quote").is_none());
+    assert_eq!(st.para(BASIC).unwrap().chars.size, None, "a style the document has is only replaced when it was asked for");
+    assert_eq!(r["paragraph"]["replaced"], json!([]));
+    assert_eq!(r["swatches"], json!(["Brand Teal"]));
+}
+
+/// The document already has a Body and a Lead of its own.
+fn doc_with_body_and_lead() -> Session {
+    let mut s = new_doc();
+    s.edit(|d, _| {
+        let st = d.styles_mut();
+        st.paragraph.push(para("Body", None, 8.0));
+        st.character.push(chars("Lead", None, 5.0));
+        Ok(())
+    })
+    .unwrap();
+    s
+}
+
+#[test]
+fn a_style_of_the_same_name_takes_the_loaded_definition() {
+    let mut s = doc_with_body_and_lead();
+    let r = s.execute("style.load", &json!({"base64": file_of(&client())})).unwrap();
+    let st = styles(&s);
+    assert_eq!((st.para("Body").unwrap().chars.size, st.char_style("Lead").unwrap().chars.size), (Some(10.0), Some(9.0)));
+    assert_eq!(r["paragraph"]["replaced"], json!([BASIC, "Body"]));
+    assert_eq!(r["character"]["replaced"], json!(["Lead"]));
+    assert_eq!(st.paragraph.iter().filter(|p| p.name == "Body").count(), 1);
+}
+
+#[test]
+fn use_existing_keeps_the_styles_of_the_document() {
+    let mut s = doc_with_body_and_lead();
+    let r = s.execute("style.load", &json!({"base64": file_of(&client()), "conflicts": "useExisting"})).unwrap();
+    let st = styles(&s);
+    assert_eq!((st.para("Body").unwrap().chars.size, st.char_style("Lead").unwrap().chars.size), (Some(8.0), Some(5.0)));
+    assert_eq!(st.para(BASIC).unwrap().chars.size, None);
+    assert_eq!(st.para("Head").unwrap().based_on.as_deref(), Some("Body"));
+    assert_eq!((&r["paragraph"]["added"], &r["paragraph"]["replaced"]), (&json!(["Head", "Quote"]), &json!([])));
+}
+
+#[test]
+fn auto_rename_loads_a_clashing_style_under_a_new_name() {
+    let mut s = doc_with_body_and_lead();
+    let r = s.execute("style.load", &json!({"base64": file_of(&client()), "conflicts": "autoRename"})).unwrap();
+    let st = styles(&s);
+    assert_eq!((st.para("Body").unwrap().chars.size, st.para("Body 2").unwrap().chars.size), (Some(8.0), Some(10.0)));
+    assert_eq!((st.char_style("Lead").unwrap().chars.size, st.char_style("Lead 2").unwrap().chars.size), (Some(5.0), Some(9.0)));
+    let head = st.para("Head").unwrap();
+    assert_eq!((head.based_on.as_deref(), head.next_style.as_deref()), (Some("Body 2"), Some("Body 2")), "the loaded Head follows the loaded Body");
+    assert_eq!(st.char_style("Small").unwrap().based_on.as_deref(), Some("Lead 2"));
+    assert_eq!(st.para("Body 2").unwrap().based_on.as_deref(), Some("Basic Paragraph"));
+    assert_eq!(st.para("Basic Paragraph").unwrap().chars.size, Some(11.0), "a built-in style comes in without its brackets");
+    assert_eq!(st.para(BASIC).unwrap().chars.size, None);
+    assert_eq!(r["paragraph"]["renamed"], json!({"[Basic Paragraph]": "Basic Paragraph", "Body": "Body 2"}));
+    assert_eq!(r["character"]["renamed"], json!({"Lead": "Lead 2"}));
+    assert_eq!(r["paragraph"]["replaced"], json!([]));
+}
+
+#[test]
+fn a_style_that_is_the_same_in_both_is_no_conflict() {
+    let mut s = new_doc();
+    let file = file_of(&client());
+    s.execute("style.load", &json!({"base64": file})).unwrap();
+    let loaded = styles(&s);
+    for conflicts in ["redefine", "autoRename"] {
+        let r = s.execute("style.load", &json!({"base64": file, "conflicts": conflicts})).unwrap();
+        let none = json!({"added": [], "replaced": [], "renamed": {}});
+        assert_eq!(r, json!({"paragraph": none, "character": none, "swatches": []}), "{conflicts}");
+    }
+    assert_eq!(styles(&s), loaded);
+    // Loading nothing leaves no undo step: one Undo takes back the first load.
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert!(styles(&s).para("Head").is_none());
+}
+
+#[test]
+fn loading_is_one_undo_step() {
+    let mut s = doc_with_body_and_lead();
+    let (before, swatches) = (styles(&s), s.doc().unwrap().doc.swatches.clone());
+    s.execute("style.load", &json!({"base64": file_of(&client())})).unwrap();
+    assert_ne!(styles(&s), before);
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(styles(&s), before);
+    assert_eq!(s.doc().unwrap().doc.swatches, swatches);
+}
+
+#[test]
+fn a_swatch_of_the_document_wins_over_the_one_in_the_file() {
+    let mut s = new_doc();
+    s.execute("swatch.create", &json!({"name": "Brand Teal", "color": "#ff0000"})).unwrap();
+    let mine = s.doc().unwrap().doc.swatch("Brand Teal").cloned();
+    let r = s.execute("style.load", &json!({"base64": file_of(&client())})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.swatch("Brand Teal").cloned(), mine);
+    assert_eq!(r["swatches"], json!(["Brand Teal 40%"]));
+}
+
+#[test]
+fn a_tint_swatch_brings_its_base_colour() {
+    let mut src = client();
+    src.edit(|d, _| {
+        let mut ruled = para("Ruled", None, 9.0);
+        ruled.para.rule_below = Some(Rule { on: true, color: "Brand Teal 40%".into(), ..Default::default() });
+        d.styles_mut().paragraph.push(ruled);
+        Ok(())
+    })
+    .unwrap();
+    let mut s = new_doc();
+    let r = s.execute("style.load", &json!({"base64": file_of(&src), "paragraph": ["Ruled"], "character": []})).unwrap();
+    assert_eq!(r["paragraph"]["added"], json!(["Ruled"]));
+    assert_eq!(r["swatches"], json!(["Brand Teal", "Brand Teal 40%"]));
+}
+
+#[test]
+fn export_tags_and_named_lists_come_with_their_styles() {
+    let mut src = client();
+    src.edit(|d, _| {
+        d.settings.lists.push(NumberedList { name: "Steps".into(), continue_across_stories: false });
+        d.settings.lists.push(NumberedList { name: "Unused".into(), ..Default::default() });
+        let st = d.styles_mut();
+        st.export_tags.insert("p:Head".into(), ExportTag { tag: "h1".into(), class: "title".into(), split: true });
+        st.export_tags.insert("c:Lead".into(), ExportTag { tag: "em".into(), class: String::new(), ..Default::default() });
+        st.para_mut("Quote").unwrap().para.list_name = Some("Steps".into());
+        Ok(())
+    })
+    .unwrap();
+    let mut s = doc_with_body_and_lead();
+    s.execute("style.load", &json!({"base64": file_of(&src), "conflicts": "autoRename"})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    assert_eq!(d.styles.export_tag("Head", false).map(|t| (t.tag.as_str(), t.split)), Some(("h1", true)), "Split Document comes along");
+    assert_eq!(d.styles.export_tag("Lead 2", true).map(|t| t.tag.as_str()), Some("em"), "the tag follows the new name");
+    assert_eq!(d.styles.export_tag("Lead", true), None);
+    assert_eq!(d.settings.lists.iter().map(|l| (l.name.as_str(), l.continue_across_stories)).collect::<Vec<_>>(), [("Steps", false)]);
+}
+
+#[test]
+fn styles_load_from_an_idml_file() {
+    let idml = client().execute("file.exportIdml", &json!({})).unwrap()["base64"].as_str().unwrap().to_string();
+    let mut s = new_doc();
+    let r = s.execute("style.load", &json!({"base64": idml, "name": "Client.IDML", "paragraph": ["Head"]})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    let head = d.styles.para("Head").unwrap();
+    assert_eq!((head.based_on.as_deref(), head.chars.size), (Some("Body"), Some(20.0)));
+    assert_eq!(d.styles.para("Body").unwrap().chars.fill.as_deref(), Some("Brand Teal"));
+    assert!(d.swatch("Brand Teal").is_some());
+    assert_eq!(r["paragraph"]["added"], json!(["Body", "Head"]));
+}
+
+#[test]
+fn styles_load_from_a_path() {
+    let path = std::env::temp_dir().join(format!("dc-load-styles-{}.designcraft", std::process::id()));
+    std::fs::write(&path, super::super::file::to_bytes(&client().doc().unwrap().doc).unwrap()).unwrap();
+    let mut s = new_doc();
+    let r = s.execute("style.load", &json!({"path": path.to_str().unwrap(), "paragraph": [], "character": ["Small"]}));
+    std::fs::remove_file(&path).unwrap();
+    assert_eq!(r.unwrap()["character"]["added"], json!(["Lead", "Small"]));
+    assert!(styles(&s).para("Head").is_none());
+}
+
+#[test]
+fn the_file_lists_its_styles_and_which_ones_clash() {
+    let mut s = doc_with_body_and_lead();
+    let file = file_of(&client());
+    let name = |n: &str, conflict: bool| json!({"name": n, "conflict": conflict});
+    let r = s.execute("style.load.list", &json!({"base64": file})).unwrap();
+    assert_eq!(r["paragraph"], json!([name(BASIC, true), name("Body", true), name("Head", false), name("Quote", false)]));
+    assert_eq!(r["character"], json!([name("Lead", true), name("Small", false)]));
+    s.execute("style.load", &json!({"base64": file})).unwrap();
+    let r = s.execute("style.load.list", &json!({"base64": file})).unwrap();
+    assert!(r["paragraph"].as_array().unwrap().iter().all(|p| p["conflict"] == false), "the same definition is no clash: {r}");
+}
+
+fn unchanged_after(s: &mut Session, params: Value, why: &str) {
+    let before = s.doc().unwrap().doc.clone();
+    let e = s.execute("style.load", &params).unwrap_err().to_string();
+    assert!(e.contains(why), "{e}");
+    assert_eq!(s.doc().unwrap().doc, before);
+}
+
+#[test]
+fn what_cannot_be_loaded_is_an_error_and_changes_nothing() {
+    let mut s = doc_with_body_and_lead();
+    let file = file_of(&client());
+    unchanged_after(&mut s, json!({}), "`path` or `base64`");
+    unchanged_after(&mut s, json!({"base64": "AAAA"}), "");
+    unchanged_after(&mut s, json!({"base64": "AAAA", "name": "a.idml"}), "");
+    unchanged_after(&mut s, json!({"base64": file, "paragraph": ["Head", "Nope"]}), "no paragraph style `Nope`");
+    unchanged_after(&mut s, json!({"base64": file, "character": ["[None]"]}), "no character style `[None]`");
+    unchanged_after(&mut s, json!({"base64": file, "paragraph": ["[No Paragraph Style]"]}), "no paragraph style");
+    unchanged_after(&mut s, json!({"base64": file, "paragraph": "Head"}), "`paragraph` must be a list of style names");
+    unchanged_after(&mut s, json!({"base64": file, "character": [1]}), "`character` must be a list of style names");
+    unchanged_after(&mut s, json!({"base64": file, "conflicts": "merge"}), "`conflicts`");
+}
+
+#[test]
+fn a_style_that_would_be_based_on_itself_is_refused() {
+    // In the file B is based on A; in the document A is based on B.
+    let mut src = new_doc();
+    src.edit(|d, _| {
+        let st = d.styles_mut();
+        st.paragraph.push(para("A", None, 9.0));
+        st.paragraph.push(para("B", Some("A"), 9.0));
+        st.character.push(chars("X", None, 9.0));
+        st.character.push(chars("Y", Some("X"), 9.0));
+        Ok(())
+    })
+    .unwrap();
+    let mut s = new_doc();
+    s.edit(|d, _| {
+        let st = d.styles_mut();
+        st.paragraph.push(para("B", None, 9.0));
+        st.paragraph.push(para("A", Some("B"), 9.0));
+        st.character.push(chars("Y", None, 9.0));
+        st.character.push(chars("X", Some("Y"), 9.0));
+        Ok(())
+    })
+    .unwrap();
+    unchanged_after(&mut s, json!({"base64": file_of(&src), "paragraph": ["B"], "character": []}), "`B` would be based on itself");
+    unchanged_after(&mut s, json!({"base64": file_of(&src), "paragraph": [], "character": ["Y"]}), "`Y` would be based on itself");
+    // With A loaded as well both take the file's order.
+    s.execute("style.load", &json!({"base64": file_of(&src), "character": []})).unwrap();
+    assert_eq!((styles(&s).para("A").unwrap().based_on.clone(), styles(&s).para("B").unwrap().based_on.clone()), (None, Some("A".to_string())));
+}
+
+#[test]
+fn a_file_with_a_based_on_loop_of_its_own_does_not_hang() {
+    let mut src = new_doc();
+    src.edit(|d, _| {
+        let st = d.styles_mut();
+        st.paragraph.push(para("A", Some("B"), 9.0));
+        st.paragraph.push(para("B", Some("A"), 9.0));
+        st.paragraph.push(para("Next", None, 9.0));
+        st.para_mut("Next").unwrap().next_style = Some("Next".into());
+        Ok(())
+    })
+    .unwrap();
+    let mut s = new_doc();
+    unchanged_after(&mut s, json!({"base64": file_of(&src), "paragraph": ["A"]}), "would be based on itself");
+    let r = s.execute("style.load", &json!({"base64": file_of(&src), "paragraph": ["Next"]})).unwrap();
+    assert_eq!(r["paragraph"]["added"], json!(["Next"]));
+}
diff --git a/crates/engine/src/cmd/mathexpr.rs b/crates/engine/src/cmd/mathexpr.rs
index b684f2457..e5342f79c 100644
--- a/crates/engine/src/cmd/mathexpr.rs
+++ b/crates/engine/src/cmd/mathexpr.rs
@@ -19,6 +19,7 @@ fn math_item(d: &mut designcraft_doc::Document, latex: &str, size: f64, lid: des
     let r = Rect::new(at.0, at.1, at.0 + w, at.1 + h);
     let mut it = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(r));
     it.content = Content::Graphic(Graphic {
+        layer_options: None,
         asset: aid,
         size: (w, h),
         xf: Affine::translate(at),
diff --git a/crates/engine/src/cmd/media.rs b/crates/engine/src/cmd/media.rs
index 9e26fb0b4..a4e3f5ae6 100644
--- a/crates/engine/src/cmd/media.rs
+++ b/crates/engine/src/cmd/media.rs
@@ -32,6 +32,7 @@ pub(crate) fn place_media(s: &mut Session, p: &Value, name: String, mime: &str,
                 let it = d.item_mut(fid).ok_or(designcraft_doc::DocError::NoItem(fid))?;
                 let r = it.inner_bounds();
                 it.content = Content::Graphic(Graphic {
+                    layer_options: None,
                     asset: aid,
                     size: (r.width(), r.height()),
                     xf: Affine::translate((r.x0, r.y0)),
@@ -52,6 +53,7 @@ pub(crate) fn place_media(s: &mut Session, p: &Value, name: String, mime: &str,
                 let r = super::finite_rect("file.place", Rect::new(x, y, x + w, y + h))?;
                 let mut it = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(r));
                 it.content = Content::Graphic(Graphic {
+                    layer_options: None,
                     asset: aid,
                     size: (w, h),
                     xf: Affine::translate((x, y)),
diff --git a/crates/engine/src/cmd/notes.rs b/crates/engine/src/cmd/notes.rs
index 9318458de..008f0a98f 100644
--- a/crates/engine/src/cmd/notes.rs
+++ b/crates/engine/src/cmd/notes.rs
@@ -59,7 +59,7 @@ fn in_note(s: &Session) -> std::result::Result<(), String> {
 
 fn insert(s: &mut Session, p: &Value) -> Result<Value> {
     let text = super::text_param(p, "text");
-    s.edit(|d, sel| {
+    let r = s.edit(|d, sel| {
         let t = sel.text.ok_or_else(|| bad("footnote.insert", "no insertion point"))?;
         let para = ParaFormat { style: d.footnote_options.para_style.clone(), ..Default::default() };
         let st = d.story_mut(t.story).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
@@ -69,7 +69,9 @@ fn insert(s: &mut Session, p: &Value) -> Result<Value> {
         let id = st.insert_note(r.start, &text, para).ok_or_else(|| bad("footnote.insert", "the story's footnotes don't match their references"))?;
         sel.text = Some(TextSel { story: t.story, anchor: text.len(), focus: text.len(), frame: t.frame, cell: Some(CellAddr::footnote(id)) });
         Ok(json!({"story": t.story.0, "id": id}))
-    })
+    })?;
+    s.typing_format = None;
+    Ok(r)
 }
 
 /// Overlay `p` onto `base` (objects merge key by key).
@@ -115,6 +117,16 @@ fn note_id(p: &Value, cmd: &str) -> Result<u64> {
     p.get("id").and_then(Value::as_u64).ok_or_else(|| bad(cmd, "missing id"))
 }
 
+/// Moves a caret or selection in story `sid`'s own text (not a cell or note) back by the length of `range` when it lies
+/// after `range.start`, or to `range.start` when it lies inside `range`.
+pub(super) fn follow_delete(sel: &mut designcraft_doc::Selection, sid: StoryId, range: std::ops::Range<usize>) {
+    if let Some(t) = sel.text.as_mut().filter(|t| t.story == sid && t.cell.is_none()) {
+        let back = |i: usize| if i > range.start { i - (i - range.start).min(range.len()) } else { i };
+        t.anchor = back(t.anchor);
+        t.focus = back(t.focus);
+    }
+}
+
 fn list(s: &mut Session, p: &Value) -> Result<Value> {
     let d = &s.doc()?.doc;
     let only = p.get("story").and_then(Value::as_u64).map(StoryId);
@@ -131,11 +143,15 @@ fn set_text(s: &mut Session, p: &Value) -> Result<Value> {
     let sid = story_id(p, "footnote.setText")?;
     let id = note_id(p, "footnote.setText")?;
     let text = super::text_param(p, "text");
-    s.edit(|d, _| {
+    s.edit(|d, sel| {
         let st = d.story_mut(sid).ok_or(designcraft_doc::DocError::NoStory(sid))?;
         let n = st.note_mut(id).ok_or_else(|| bad("footnote.setText", format!("no footnote {id}")))?;
         let len = n.text.len();
         n.text.replace(0..len, &text);
+        // A caret in the replaced text goes to its end.
+        if let Some(t) = sel.text.as_mut().filter(|t| t.story == sid && t.cell == Some(CellAddr::footnote(id))) {
+            (t.anchor, t.focus) = (n.text.len(), n.text.len());
+        }
         Ok(Value::Null)
     })
 }
@@ -143,15 +159,21 @@ fn set_text(s: &mut Session, p: &Value) -> Result<Value> {
 fn delete(s: &mut Session, p: &Value) -> Result<Value> {
     let sid = story_id(p, "footnote.delete")?;
     let id = note_id(p, "footnote.delete")?;
-    s.edit(|d, sel| {
+    let moved = s.edit(|d, sel| {
         let st = d.story_mut(sid).ok_or(designcraft_doc::DocError::NoStory(sid))?;
         let at = st.note_anchor(id).ok_or_else(|| bad("footnote.delete", format!("no footnote {id}")))?;
+        follow_delete(sel, sid, at..at + designcraft_doc::FOOTNOTE_REF.len_utf8());
         st.delete(at..at + designcraft_doc::FOOTNOTE_REF.len_utf8());
-        if sel.text.is_some_and(|t| t.story == sid && t.cell == Some(CellAddr::footnote(id))) {
+        let moved = sel.text.is_some_and(|t| t.story == sid && t.cell == Some(CellAddr::footnote(id)));
+        if moved {
             sel.text = Some(TextSel::caret(sid, at));
         }
-        Ok(Value::Null)
-    })
+        Ok(moved)
+    })?;
+    if moved {
+        s.typing_format = None;
+    }
+    Ok(Value::Null)
 }
 
 fn go_to_reference(s: &mut Session, _: &Value) -> Result<Value> {
@@ -162,6 +184,7 @@ fn go_to_reference(s: &mut Session, _: &Value) -> Result<Value> {
     let pos = at + designcraft_doc::FOOTNOTE_REF.len_utf8();
     st.selection.text = Some(TextSel { anchor: pos, focus: pos, cell: None, ..t });
     st.bump_revision();
+    s.typing_format = None;
     Ok(json!({"story": t.story.0, "pos": pos}))
 }
 
@@ -213,6 +236,36 @@ mod tests {
         assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().notes.len(), 1);
     }
 
+    #[test]
+    fn footnote_caret_moves_drop_the_pending_typing_format() {
+        let (mut s, sid) = session_with_text();
+        let pending = |s: &mut Session| {
+            s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
+            assert!(s.typing_format.is_some());
+        };
+        // Formatting chosen in footnote text, then away to the reference and back to the same caret (a new
+        // footnote takes the deleted one's id): typing there is in the footnote text's own format.
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 16, "focus": 16})).unwrap();
+        let id = s.execute("footnote.insert", &json!({"text": "A source."})).unwrap()["id"].as_u64().unwrap();
+        pending(&mut s);
+        s.execute("footnote.goToReference", &json!({})).unwrap();
+        s.execute("footnote.delete", &json!({"story": sid.0, "id": id})).unwrap();
+        let again = s.execute("footnote.insert", &json!({"text": "A source."})).unwrap()["id"].as_u64().unwrap();
+        assert_eq!(again, id);
+        s.execute("text.insert", &json!({"text": "x"})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().notes[0].text.char_format_at(10).over.size, None);
+        // Each command that moves the caret drops it.
+        pending(&mut s);
+        s.execute("footnote.goToReference", &json!({})).unwrap();
+        assert!(s.typing_format.is_none(), "footnote.goToReference");
+        pending(&mut s);
+        let id = s.execute("footnote.insert", &json!({"text": "y"})).unwrap()["id"].as_u64().unwrap();
+        assert!(s.typing_format.is_none(), "footnote.insert");
+        pending(&mut s);
+        s.execute("footnote.delete", &json!({"story": sid.0, "id": id})).unwrap();
+        assert!(s.typing_format.is_none(), "footnote.delete");
+    }
+
     #[test]
     fn not_in_cells() {
         let (mut s, sid) = session_with_text();
@@ -221,4 +274,46 @@ mod tests {
         // Caret is now in footnote text: no nested footnotes.
         assert!(s.execute("footnote.insert", &json!({})).is_err());
     }
+
+    #[test]
+    fn huge_start_at_does_not_overflow() {
+        let (mut s, sid) = session_with_text();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 16, "focus": 16})).unwrap();
+        s.execute("footnote.insert", &json!({"text": "x"})).unwrap();
+        s.execute("footnote.options", &json!({"startAt": 4294967295u32})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        let cs = s.cache.get(&d, sid, None);
+        assert_eq!(cs.frames[0].notes.len(), 1);
+    }
+
+    #[test]
+    fn deleting_a_footnote_keeps_the_caret_on_its_character() {
+        let n = designcraft_doc::FOOTNOTE_REF.len_utf8();
+        // (anchor, focus) in the story text before the delete, then after it.
+        for (before, after) in [((17 + n, 21 + n), (17, 21)), ((5, 21 + n), (5, 21)), ((5, 5), (5, 5)), ((16 + n, 16 + n), (16, 16))] {
+            let (mut s, sid) = session_with_text();
+            s.execute("text.select", &json!({"story": sid.0, "anchor": 16, "focus": 16})).unwrap();
+            let id = s.execute("footnote.insert", &json!({"text": "x"})).unwrap()["id"].as_u64().unwrap();
+            s.execute("text.select", &json!({"story": sid.0, "anchor": before.0, "focus": before.1})).unwrap();
+            s.execute("footnote.delete", &json!({"story": sid.0, "id": id})).unwrap();
+            let t = s.doc().unwrap().selection.text.unwrap();
+            assert_eq!((t.anchor, t.focus), after, "selected {before:?}");
+        }
+    }
+
+    #[test]
+    fn replacing_footnote_text_puts_its_caret_at_the_end() {
+        let (mut s, sid) = session_with_text();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 16, "focus": 16})).unwrap();
+        let id = s.execute("footnote.insert", &json!({"text": "abcd"})).unwrap()["id"].as_u64().unwrap();
+        // The caret between "c" and "d" is inside the second "é" of the new text.
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!(t.cell, Some(CellAddr::footnote(id)));
+        s.doc_mut().unwrap().selection.text = Some(TextSel { anchor: 3, focus: 3, ..t });
+        s.execute("footnote.setText", &json!({"story": sid.0, "id": id, "text": "éé"})).unwrap();
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!((t.anchor, t.focus), (4, 4));
+        s.execute("text.delete", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().notes[0].text.text, "é");
+    }
 }
diff --git a/crates/engine/src/cmd/object.rs b/crates/engine/src/cmd/object.rs
index 9bb4c5604..9cff3ac51 100644
--- a/crates/engine/src/cmd/object.rs
+++ b/crates/engine/src/cmd/object.rs
@@ -596,7 +596,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Effects",
             [],
             None,
-            "{effects?: {dropShadow?: {on?, color?, opacity?, angle?, globalLight?, distance?, size?, spread?}, innerShadow?, outerGlow?, innerGlow? {on?, color?, opacity?, size?, choke?, center?, mode? (blend mode: Screen, Multiply, …; Screen by default), technique?: softer|precise}, bevel?, satin?, feather? (width), featherOptions? {choke? (%), corners?: sharp|rounded|diffused}, directionalFeather?, gradientFeather?} (the fields given replace the object's, as the Effects dialog sets them), opacity?: 0..1, blend?, ids?} — every effect at once, one undo step",
+            "{effects?: {dropShadow?: {on?, color?, opacity?, angle?, globalLight?, distance?, size?, spread?}, innerShadow?, outerGlow?, innerGlow? {on?, color?, opacity?, size?, choke?, center?, mode? (blend mode: Screen, Multiply, …; Screen by default), technique?: softer|precise}, bevel?, satin?, feather? (width), featherOptions? {choke? (%), corners?: sharp|rounded|diffused}, directionalFeather?, gradientFeather?} (the fields given replace the object's, as the Effects dialog sets them), opacity?: 0..1, blend?, globalLight? (the document's global light angle, as an Angle field with Use Global Light sets it), ids?} — every effect at once, one undo step",
             has_selection,
             effects_all
         ),
@@ -610,7 +610,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Text Frame Options…",
             ["Object"],
             Some("Cmd+B"),
-            "{columns?, gutter?, inset?: number|[t,l,b,r] (null keeps that side), verticalJustification?: top|center|bottom|justify, columnsKind?: fixedNumber|fixedWidth, columnWidth? (pt, Fixed Width), firstBaseline?: ascent|capHeight|leading|xHeight|emboxHeight|fixed, firstBaselineMin? (pt), autoSize?: off|heightOnly|widthOnly|heightAndWidth|heightAndWidthProportionally, autoSizeReference?: topLeft|topCenter|topRight|leftCenter|center|rightCenter|bottomLeft|bottomCenter|bottomRight (the point that stays put), useMinimumHeight?: bool, minimumHeight? (pt), useMinimumWidth?: bool, minimumWidth? (pt), noLineBreaks?: bool, ignoreWrap?, balanceColumns?, columnRule?: bool, columnRuleWeight? (pt), columnRuleColor? (swatch name), columnRuleTint? (0..1), columnRuleOffset? (pt, horizontal), columnRuleTopInset? (pt), columnRuleBottomInset? (pt), vertical?: bool (sets the story direction of the frames' stories, as Type ▸ Story Direction), ids?}",
+            "{columns?, gutter?, inset?: number|[t,l,b,r] (null keeps that side), verticalJustification?: top|center|bottom|justify, columnsKind?: fixedNumber|fixedWidth, columnWidth? (pt, Fixed Width), firstBaseline?: ascent|capHeight|leading|xHeight|emboxHeight|fixed, firstBaselineMin? (pt), autoSize?: off|heightOnly|widthOnly|heightAndWidth|heightAndWidthProportionally, autoSizeReference?: topLeft|topCenter|topRight|leftCenter|center|rightCenter|bottomLeft|bottomCenter|bottomRight (the point that stays put), useMinimumHeight?: bool, minimumHeight? (pt), useMinimumWidth?: bool, minimumWidth? (pt), noLineBreaks?: bool, ignoreWrap?, balanceColumns?, columnRule?: bool, columnRuleWeight? (pt), columnRuleColor? (swatch name), columnRuleTint? (0..1), columnRuleOffset? (pt, horizontal), columnRuleTopInset? (pt), columnRuleBottomInset? (pt), baselineGrid?: {start? (pt), increment? (pt), relativeTo?: page|margin|frame|inset} (the frame's custom baseline grid; fields not given keep the frame's, or come from the document grid; null turns it off), vertical?: bool (sets the story direction of the frames' stories, as Type ▸ Story Direction), ids?}",
             has_selection,
             text_frame_options
         ),
@@ -2305,8 +2305,16 @@ fn effects_all(s: &mut Session, p: &Value) -> Result<Value> {
             Some(BlendMode::parse(raw).ok_or_else(|| bad(ID, format!("unknown blend mode `{raw}`")))?)
         }
     };
+    // The document's global light angle, changed from an Angle field with Use Global Light on.
+    let global_light = match p.get("globalLight") {
+        None | Some(Value::Null) => None,
+        Some(v) => Some(v.as_f64().filter(|a| a.is_finite()).ok_or_else(|| bad(ID, "globalLight must be a number"))?),
+    };
     let ids = targets(s, p)?;
     s.edit(|d, _| {
+        if let Some(a) = global_light {
+            d.settings.global_light = (a + 180.0).rem_euclid(360.0) - 180.0;
+        }
         let mut changed = 0;
         for id in &ids {
             let Some(it) = d.item_mut(*id) else { continue };
@@ -2518,6 +2526,41 @@ fn text_frame_options(s: &mut Session, p: &Value) -> Result<Value> {
                 as u8,
         ),
     };
+    // `Some(None)` turns the frame's custom baseline grid off.
+    let custom_grid = match p.get("baselineGrid") {
+        None => None,
+        Some(Value::Null) => Some(None),
+        Some(Value::Object(g)) => {
+            let num = |key: &str, lo: f64, hi: f64| match g.get(key) {
+                None | Some(Value::Null) => Ok(None),
+                Some(v) => match v.as_f64() {
+                    Some(x) if x.is_finite() && (lo..=hi).contains(&x) => Ok(Some(x)),
+                    _ => Err(bad(ID, format!("baselineGrid.{key} must be a number of points from {lo} to {hi}, not {v}"))),
+                },
+            };
+            let start = num("start", -15552.0, 15552.0)?;
+            let increment = num("increment", 0.0, 15552.0)?;
+            let relative_to = match g.get("relativeTo") {
+                None | Some(Value::Null) => None,
+                Some(v) => Some(
+                    v.as_str()
+                        .and_then(designcraft_doc::FrameGridRelative::from_name)
+                        .ok_or_else(|| bad(ID, format!("baselineGrid.relativeTo must be page|margin|frame|inset, not {v}")))?,
+                ),
+            };
+            Some(Some((start, increment, relative_to)))
+        }
+        Some(v) => return Err(bad(ID, format!("baselineGrid must be an object or null, not {v}"))),
+    };
+    // A frame without a custom grid starts from the document's.
+    let doc_grid = {
+        let g = &st.doc.settings.baseline_grid;
+        let relative_to = match g.relative_to {
+            designcraft_doc::GridRelative::TopOfPage => designcraft_doc::FrameGridRelative::TopOfPage,
+            designcraft_doc::GridRelative::TopMargin => designcraft_doc::FrameGridRelative::TopMargin,
+        };
+        designcraft_doc::FrameBaselineGrid { start: g.start, increment: g.increment, relative_to }
+    };
     let rule_color = match p.get("columnRuleColor") {
         None | Some(Value::Null) => None,
         Some(Value::String(c)) if st.doc.swatch(c).is_some() => Some(c.clone()),
@@ -2608,6 +2651,7 @@ fn text_frame_options(s: &mut Session, p: &Value) -> Result<Value> {
             if let Some(v) = rule_bottom {
                 o.column_rule_bottom_inset = v;
             }
+            apply_custom_frame_grid(o, custom_grid, doc_grid);
             // Fixed Width columns set the frame's width: n columns, the gutters between them and
             // the left and right insets.
             let fixed_width = o.columns_kind == designcraft_doc::ColumnsKind::FixedWidth && o.column_width > 0.0;
@@ -2629,6 +2673,24 @@ fn text_frame_options(s: &mut Session, p: &Value) -> Result<Value> {
     })
 }
 
+fn apply_custom_frame_grid(
+    options: &mut TextFrameOptions,
+    custom: Option<Option<(Option<f64>, Option<f64>, Option<designcraft_doc::FrameGridRelative>)>>,
+    document_grid: designcraft_doc::FrameBaselineGrid,
+) {
+    match custom {
+        Some(Some((start, increment, relative_to))) => {
+            let mut grid = options.baseline_grid.unwrap_or(document_grid);
+            grid.start = start.unwrap_or(grid.start);
+            grid.increment = increment.unwrap_or(grid.increment);
+            grid.relative_to = relative_to.unwrap_or(grid.relative_to);
+            options.baseline_grid = Some(grid);
+        }
+        Some(None) => options.baseline_grid = None,
+        None => {}
+    }
+}
+
 /// The gap at `p` on spread `sr`: (vertical gap?, edge a, edge b, ids ending at a, ids starting at b).
 pub(crate) fn find_gap(d: &Document, sr: designcraft_doc::SpreadRef, p: Point) -> Option<(bool, f64, f64, Vec<ItemId>, Vec<ItemId>)> {
     let sp = d.spread(sr)?;
@@ -4150,6 +4212,26 @@ mod light_tests {
         s.execute("edit.undo", &json!({})).unwrap();
         assert_eq!(angle(&s), 45.0);
     }
+
+    /// The Effects dialog's Angle with Use Global Light on changes the global light, with the
+    /// effects, in one undo step.
+    #[test]
+    fn effects_sets_the_global_light_with_the_effects() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let a = s.execute("frame.create", &json!({"rect": [10, 10, 50, 50]})).unwrap()["id"].as_u64().unwrap();
+        let b = s.execute("frame.create", &json!({"rect": [60, 10, 90, 50]})).unwrap()["id"].as_u64().unwrap();
+        s.execute("object.dropShadow", &json!({"on": true, "globalLight": true, "ids": [b]})).unwrap();
+        let before = s.doc().unwrap().doc.settings.global_light;
+        s.execute("object.effects", &json!({"ids": [a], "effects": {"dropShadow": {"on": true, "globalLight": true}}, "globalLight": 30})).unwrap();
+        let d = &s.doc().unwrap().doc;
+        assert_eq!(d.settings.global_light, 30.0);
+        let other = &d.item(ItemId(b)).unwrap().effects.drop_shadow;
+        assert_eq!(d.light_angle(other.angle, other.global_light), 30.0, "every shadow on Global Light follows");
+        assert!(s.execute("object.effects", &json!({"ids": [a], "globalLight": "up"})).is_err());
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.settings.global_light, before, "one undo step");
+    }
 }
 
 #[cfg(test)]
@@ -4212,27 +4294,6 @@ mod attributes_tests {
 mod fitting_tests {
     use super::*;
 
-    #[test]
-    fn separations_come_from_source_colours() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let c = s.execute("frame.create", &json!({"rect": [100, 100, 200, 200]})).unwrap()["id"].clone();
-        s.execute("object.fill", &json!({"swatch": "C=100 M=0 Y=0 K=0", "ids": [c]})).unwrap();
-        let k = s.execute("frame.create", &json!({"rect": [300, 100, 400, 200]})).unwrap()["id"].clone();
-        s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [k]})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let plate = |p: u8| {
-            let mut rr = designcraft_render::Renderer::new();
-            rr.threads = 0;
-            rr.render_page(&d, &s.cache, 0, 1.0, false, &designcraft_render::RenderOptions { plate: Some(p), ..Default::default() }).unwrap()
-        };
-        let (cyan, black) = (plate(0), plate(3));
-        // Cyan ink only on the cyan frame; black ink only on the black one (no rich-black guess).
-        assert!(cyan.pixel(150, 150)[0] < 10 && cyan.pixel(350, 150)[0] > 245, "{:?} {:?}", cyan.pixel(150, 150), cyan.pixel(350, 150));
-        assert!(black.pixel(350, 150)[0] < 10 && black.pixel(150, 150)[0] > 245);
-        assert!(cyan.pixel(20, 20)[0] > 245, "paper has no ink");
-    }
-
     #[test]
     fn inner_glow_bevel_and_satin_change_the_inside() {
         let mut s = Session::new();
@@ -4272,13 +4333,14 @@ mod fitting_tests {
         let df = shot(&s);
         assert!(df.pixel(102, 200)[0] > 200, "left edge faded to paper: {:?}", df.pixel(102, 200));
         assert_eq!(df.pixel(298, 200), plain.pixel(298, 200), "right edge untouched");
-        // A knockout group exports as an image too.
+        // A knockout group stays vector, as a knockout transparency group.
         let other = s.execute("frame.create", &json!({"rect": [400, 100, 450, 150]})).unwrap()["id"].clone();
         let other2 = s.execute("frame.create", &json!({"rect": [420, 120, 470, 170]})).unwrap()["id"].clone();
         let g = s.execute("object.group", &json!({"ids": [other, other2]})).unwrap()["id"].clone();
         s.execute("object.transparencyGroup", &json!({"ids": [g], "knockout": true})).unwrap();
         let r = s.execute("file.exportPdf", &json!({})).unwrap();
-        assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("2 object(s)")), "{r}");
+        assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("1 object(s)")), "{r}");
+        assert!(String::from_utf8_lossy(&super::super::file::base64_decode(r["base64"].as_str().unwrap())).contains("/K true"));
         // PDF export carries effects (as an image of the object).
         let r = s.execute("file.exportPdf", &json!({})).unwrap();
         assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("soft effects")), "{r}");
@@ -5660,3 +5722,33 @@ mod fill_tint_tests {
         assert!(stroke_of(&s, b).is_none());
     }
 }
+
+#[cfg(test)]
+mod frame_baseline_grid_tests {
+    use super::*;
+    use designcraft_doc::{FrameBaselineGrid, FrameGridRelative};
+
+    #[test]
+    fn text_frame_options_set_a_custom_baseline_grid_relative_to() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [36, 36, 300, 300], "content": "text", "text": "Hello"})).unwrap();
+        let id = ItemId(r["id"].as_u64().unwrap());
+        let grid = |s: &Session| s.doc().unwrap().doc.item(id).and_then(|i| i.text_frame()).and_then(|t| t.options.baseline_grid);
+        // Turning it on with only Relative To takes the document grid's start and increment.
+        let doc = s.doc().unwrap().doc.settings.baseline_grid.clone();
+        s.execute("object.textFrameOptions", &json!({"ids": [id.0], "baselineGrid": {"relativeTo": "frame"}})).unwrap();
+        assert_eq!(grid(&s), Some(FrameBaselineGrid { start: doc.start, increment: doc.increment, relative_to: FrameGridRelative::TopOfFrame }));
+        s.execute("object.textFrameOptions", &json!({"ids": [id.0], "baselineGrid": {"start": 10, "increment": 13, "relativeTo": "inset"}})).unwrap();
+        assert_eq!(grid(&s), Some(FrameBaselineGrid { start: 10.0, increment: 13.0, relative_to: FrameGridRelative::TopInset }));
+        // Fields not given keep the frame's.
+        s.execute("object.textFrameOptions", &json!({"ids": [id.0], "baselineGrid": {"relativeTo": "margin"}})).unwrap();
+        assert_eq!(grid(&s), Some(FrameBaselineGrid { start: 10.0, increment: 13.0, relative_to: FrameGridRelative::TopMargin }));
+        for bad in [json!({"relativeTo": "spine"}), json!({"start": f64::MAX}), json!({"increment": -1}), json!(3)] {
+            assert!(s.execute("object.textFrameOptions", &json!({"ids": [id.0], "baselineGrid": bad})).is_err(), "{bad}");
+        }
+        assert_eq!(grid(&s).map(|g| g.relative_to), Some(FrameGridRelative::TopMargin));
+        s.execute("object.textFrameOptions", &json!({"ids": [id.0], "baselineGrid": null})).unwrap();
+        assert_eq!(grid(&s), None);
+    }
+}
diff --git a/crates/engine/src/cmd/package.rs b/crates/engine/src/cmd/package.rs
index d0ed58b03..a6946be4f 100644
--- a/crates/engine/src/cmd/package.rs
+++ b/crates/engine/src/cmd/package.rs
@@ -427,12 +427,19 @@ fn package(s: &mut Session, p: &Value) -> Result<Value> {
         .iter()
         .map(|f| format!("  {} {}{}\n", f.family, f.style, copy_font(&root, f, &fonts_dir, &mut copied, &mut taken, &mut files)))
         .collect();
+    // The IDML copy links the placed files, so a per-placement PDF layer choice cannot travel in
+    // it (an external-only IDML export rejects one for the same reason). Say so in the report
+    // instead of leaving a silent difference between the package's copies.
+    let mut idml_layer_note = "";
     if p.get("idml").and_then(Value::as_bool).unwrap_or(true) {
         let path = package_output_path(&dir, &title, "idml")?;
         // The images are in Links/ beside it: link them there, without embedded copies.
         let opts = designcraft_idml::ExportOptions { embed_images: false };
         root.write(&path, &designcraft_idml::export_idml_with(&packed, &opts))?;
         files.push(path);
+        if super::interchange::has_applicable_pdf_layer_overrides(&packed) {
+            idml_layer_note = "\nPlaced PDF layers\nThe IDML copy links the placed PDFs, so it shows their file defaults. The DesignCraft document keeps each placement's Object Layer Options choice.\n";
+        }
     }
     if p.get("pdf").and_then(Value::as_bool).unwrap_or(false) {
         let path = package_output_path(&dir, &title, "pdf")?;
@@ -456,6 +463,7 @@ fn package(s: &mut Session, p: &Value) -> Result<Value> {
     for l in links.as_array().into_iter().flatten() {
         r += &format!("  {} ({})\n", l["name"].as_str().unwrap_or(""), l["status"].as_str().unwrap_or(""));
     }
+    r += idml_layer_note;
     if let Some(issues) = pre.get("issues").and_then(Value::as_array) {
         r += &format!("\nPreflight: {} issue(s)\n", issues.len());
         for i in issues {
@@ -482,444 +490,4 @@ fn copy_links(s: &mut Session, p: &Value) -> Result<Value> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn relocated_packages_rebind_embedded_image_links_on_open() {
-        let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
-        let dir = std::env::temp_dir().join(format!("dc-package-relocation-{}-{nonce}", std::process::id()));
-        let original = dir.join("original");
-        let moved = dir.join("moved");
-        let png = designcraft_render::Rendered { width: 4, height: 3, pixels: [30, 90, 180, 255].repeat(12) }.to_png();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"title": "OwnedPackage", "width": 72, "height": 72})).unwrap();
-        s.execute("file.place", &json!({"base64": super::super::base64_encode(&png), "name": "owned.png", "x": 5, "y": 5, "width": 16})).unwrap();
-        s.execute("file.package", &json!({"dir": original.to_string_lossy(), "idml": true, "pdf": false})).unwrap();
-        std::fs::rename(&original, &moved).unwrap();
-        let expected = std::path::absolute(moved.join("Links").join("owned.png")).unwrap();
-        for (command, extension) in [("file.open", "designcraft"), ("file.openIdml", "idml")] {
-            let mut opened = Session::new();
-            opened.execute(command, &json!({"path": moved.join(format!("OwnedPackage.{extension}")).to_string_lossy()})).unwrap();
-            let asset = opened.doc().unwrap().doc.assets.values().next().unwrap();
-            assert_eq!(*asset.data, png, "{extension}: the packaged pixels");
-            assert_eq!(asset.link.as_deref(), expected.to_str(), "{extension}: use the relocated Links file");
-            let links = opened.execute("links.list", &json!({})).unwrap();
-            assert_eq!(links[0]["status"], "ok", "{extension}");
-        }
-        std::fs::remove_dir_all(dir).unwrap();
-    }
-
-    /// The package's IDML links its images to the files in the package's Links folder and embeds
-    /// no copies of them.
-    #[test]
-    fn package_idml_links_the_links_folder_and_embeds_nothing() {
-        let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
-        let dir = std::env::temp_dir().join(format!("dc-package-idml-links-{}-{nonce}", std::process::id()));
-        let png = designcraft_render::Rendered { width: 4, height: 3, pixels: [30, 90, 180, 255].repeat(12) }.to_png();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"title": "LinkedPackage", "width": 72, "height": 72})).unwrap();
-        s.execute("file.place", &json!({"base64": super::super::base64_encode(&png), "name": "my photo.png", "x": 5, "y": 5, "width": 16})).unwrap();
-        s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": true, "pdf": false})).unwrap();
-        let idml = std::fs::read(dir.join("LinkedPackage.idml")).unwrap();
-        let mut zip = zip::ZipArchive::new(std::io::Cursor::new(idml.as_slice())).unwrap();
-        let mut spreads = String::new();
-        for i in 0..zip.len() {
-            let mut f = zip.by_index(i).unwrap();
-            if f.name().starts_with("Spreads/") {
-                std::io::Read::read_to_string(&mut f, &mut spreads).unwrap();
-            }
-        }
-        // Relative to the package: no path from the machine that made it (#340).
-        let uri = "file:Links/my%20photo.png";
-        let folder = dir.file_name().unwrap().to_string_lossy().into_owned();
-        assert!(!spreads.contains(&folder), "the package's own folder is not written: {spreads}");
-        assert!(spreads.contains(&format!(r#"LinkResourceURI="{uri}""#)), "{spreads}");
-        assert!(!spreads.contains("<Contents") && !spreads.contains(r#"StoredState="Embedded""#), "no image is embedded");
-        let back = designcraft_idml::import_idml_with(&idml, &|_| None).unwrap();
-        let asset = back.assets.values().next().unwrap();
-        assert!(asset.data.is_empty(), "no image is embedded");
-        assert_eq!(asset.link.as_deref(), Some("Links/my photo.png"));
-        assert!(dir.join("Links").join("my photo.png").exists());
-    }
-
-    /// A link whose file is gone has no bytes to copy: the package leaves it out of Links/, the
-    /// report lists it as missing, and the packaged document keeps it missing (#908).
-    #[test]
-    fn package_leaves_missing_links_missing() {
-        let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
-        let dir = std::env::temp_dir().join(format!("dc-package-missing-{}-{nonce}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let svg = r##"<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40"><rect width="40" height="40"/></svg>"##;
-        let (gone, kept) = (dir.join("gone.svg"), dir.join("kept.svg"));
-        std::fs::write(&gone, svg).unwrap();
-        std::fs::write(&kept, svg.replace("<rect", "<circle r=\"9\"/><rect")).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"title": "TwoLinks"})).unwrap();
-        s.execute("file.place", &json!({"path": gone.to_string_lossy(), "x": 10, "y": 10})).unwrap();
-        s.execute("edit.deselectAll", &json!({})).unwrap();
-        s.execute("file.place", &json!({"path": kept.to_string_lossy(), "x": 10, "y": 200})).unwrap();
-        let idml = dir.join("TwoLinks.idml");
-        s.execute("file.exportIdml", &json!({"path": idml.to_string_lossy(), "embedImages": false})).unwrap();
-        std::fs::remove_file(&gone).unwrap();
-        let mut s = Session::new();
-        s.execute("file.openIdml", &json!({"path": idml.to_string_lossy()})).unwrap();
-        let status = |s: &mut Session, name: &str| {
-            let links = s.execute("links.list", &json!({})).unwrap();
-            links.as_array().unwrap().iter().find(|l| l["name"] == name).map(|l| l["status"].clone())
-        };
-        assert_eq!(status(&mut s, "gone.svg"), Some(json!("missing")));
-
-        let out = dir.join("Pkg");
-        let r = s.execute("file.package", &json!({"dir": out.to_string_lossy(), "idml": true})).unwrap();
-        assert!(!out.join("Links").join("gone.svg").exists(), "a missing link is not copied");
-        assert!(out.join("Links").join("kept.svg").exists());
-        assert!(!r["files"].to_string().contains("gone.svg"), "{}", r["files"]);
-        let report = r["report"].as_str().unwrap();
-        assert!(report.contains("gone.svg (missing)"), "{report}");
-        for (command, extension) in [("file.open", "designcraft"), ("file.openIdml", "idml")] {
-            let mut opened = Session::new();
-            opened.execute(command, &json!({"path": out.join(format!("TwoLinks.{extension}")).to_string_lossy()})).unwrap();
-            assert_eq!(status(&mut opened, "gone.svg"), Some(json!("missing")), "{extension}");
-            assert_eq!(status(&mut opened, "kept.svg"), Some(json!("ok")), "{extension}");
-        }
-        std::fs::remove_dir_all(dir).unwrap();
-    }
-
-    /// A package holds no path from the machine that made it: the document and the IDML link the
-    /// copies in `Links/` by relative names, and they still open as linked after the move (#340).
-    #[test]
-    fn package_documents_hold_relative_links_only() {
-        let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
-        let dir = std::env::temp_dir().join(format!("dc-package-relative-{}-{nonce}", std::process::id()));
-        let folder = dir.file_name().unwrap().to_string_lossy().into_owned();
-        let png = designcraft_render::Rendered { width: 4, height: 3, pixels: [30, 90, 180, 255].repeat(12) }.to_png();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"title": "RelativePackage", "width": 72, "height": 72})).unwrap();
-        s.execute("file.place", &json!({"base64": super::super::base64_encode(&png), "name": "owned.png", "x": 5, "y": 5, "width": 16})).unwrap();
-        s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": true, "pdf": false})).unwrap();
-        let packed = super::super::from_bytes(&std::fs::read(dir.join("RelativePackage.designcraft")).unwrap()).unwrap();
-        let link = packed.assets.values().next().unwrap().link.clone().unwrap();
-        assert_eq!(link, "Links/owned.png");
-        assert!(!link.contains(&folder));
-        // Copy Link(s) To is unchanged: it relinks the open document by full path.
-        s.execute("links.copyTo", &json!({"dir": dir.join("Copies").to_string_lossy()})).unwrap();
-        let copied = s.doc().unwrap().doc.assets.values().next().unwrap().link.clone().unwrap();
-        assert!(std::path::Path::new(&copied).is_absolute(), "{copied}");
-        std::fs::remove_dir_all(dir).unwrap();
-    }
-
-    #[test]
-    fn package_writes_document_links_and_report() {
-        let dir = std::env::temp_dir().join(format!("dc-package-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let svg = dir.join("logo.svg");
-        std::fs::write(&svg, r##"<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40"><rect width="40" height="40"/></svg>"##).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("file.place", &json!({"path": svg.to_string_lossy(), "x": 100, "y": 100})).unwrap();
-        s.execute("frame.create", &json!({"rect": [72, 300, 400, 400], "content": "text", "text": "Hello"})).unwrap();
-        let out = dir.join("Pkg");
-        let r = s.execute("file.package", &json!({"dir": out.to_string_lossy(), "pdf": true, "instructions": "Print on matte."})).unwrap();
-        let files: Vec<String> = r["files"].as_array().unwrap().iter().map(|f| f.as_str().unwrap().to_string()).collect();
-        assert!(files.iter().any(|f| f.ends_with(".designcraft")));
-        assert!(files.iter().any(|f| f.ends_with(".idml")));
-        assert!(files.iter().any(|f| f.ends_with(".pdf")));
-        assert!(out.join("Links").join("logo.svg").exists());
-        let report = std::fs::read_to_string(out.join("Instructions.txt")).unwrap();
-        assert!(report.contains("Print on matte.") && report.contains("logo.svg"), "{report}");
-        assert!(report.contains("Preflight:"), "{report}");
-        // The packaged document links to its Links folder.
-        let doc_file = files.iter().find(|f| f.ends_with(".designcraft")).unwrap();
-        let packed = super::super::from_bytes(&std::fs::read(doc_file).unwrap()).unwrap();
-        let link = packed.assets.values().next().unwrap().link.clone().unwrap();
-        assert!(link.contains("Links"), "{link}");
-        // Copy Links To relinks the open document.
-        let r = s.execute("links.copyTo", &json!({"dir": dir.join("Copies").to_string_lossy()})).unwrap();
-        assert_eq!(r["copied"], 1);
-        assert!(s.doc().unwrap().doc.assets.values().next().unwrap().link.as_deref().unwrap().contains("Copies"));
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn package_copies_the_fonts_their_licences_allow() {
-        use designcraft_fonts::DOCUMENT_FONTS_FOLDER;
-        use designcraft_fonts::testing::{font_with, with_fs_type};
-        const FREE: &str = "DocFont Package Free";
-        const RESTRICTED: &str = "DocFont Package Restricted";
-        let dir = std::env::temp_dir().join(format!("dc-package-fonts-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        let fonts = dir.join("src").join(DOCUMENT_FONTS_FOLDER);
-        std::fs::create_dir_all(&fonts).unwrap();
-        std::fs::write(fonts.join("free.ttf"), font_with(FREE, &['F']).unwrap()).unwrap();
-        std::fs::write(fonts.join("restricted.otf"), with_fs_type(font_with(RESTRICTED, &['R']).unwrap(), 0x0002).unwrap()).unwrap();
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-
-            std::fs::set_permissions(fonts.join("free.ttf"), std::fs::Permissions::from_mode(0o640)).unwrap();
-        }
-        // Text in both fonts, and in the bundled default font.
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Free Restricted Default"})).unwrap();
-        for (a, b, family) in [(0, 4, FREE), (5, 15, RESTRICTED)] {
-            s.execute("text.select", &json!({"story": r["story"], "anchor": a, "focus": b})).unwrap();
-            s.execute("type.char", &json!({"fontFamily": family, "fontStyle": "Regular"})).unwrap();
-        }
-        let src = dir.join("src").join("Fonts.designcraft");
-        s.execute("file.save", &json!({"path": src.to_string_lossy()})).unwrap();
-        let mut s = Session::new();
-        assert_eq!(s.execute("file.open", &json!({"path": src.to_string_lossy()})).unwrap()["documentFonts"], 2);
-
-        let out = dir.join("Pkg");
-        let r = s.execute("file.package", &json!({"dir": out.to_string_lossy(), "idml": false})).unwrap();
-        let packed_fonts = out.join(DOCUMENT_FONTS_FOLDER);
-        assert!(packed_fonts.join("free.ttf").exists());
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-
-            assert_eq!(
-                std::fs::metadata(packed_fonts.join("free.ttf")).unwrap().permissions().mode() & 0o777,
-                std::fs::metadata(fonts.join("free.ttf")).unwrap().permissions().mode() & 0o777
-            );
-        }
-        assert!(!packed_fonts.join("restricted.otf").exists(), "a restricted licence keeps the font out");
-        assert!(r["files"].to_string().contains("free.ttf"), "{}", r["files"]);
-        let report = r["report"].as_str().unwrap();
-        assert!(report.contains(&format!("{RESTRICTED} Regular — not copied: its licence doesn't allow it")), "{report}");
-        assert!(report.contains(&format!("{FREE} Regular\n")), "{report}");
-        assert!(report.contains(&format!("{} Regular — included with DesignCraft", designcraft_fonts::DEFAULT_FAMILY)), "{report}");
-        // The packaged document opens with its fonts.
-        let doc = r["files"][0].as_str().unwrap().to_string();
-        assert_eq!(Session::new().execute("file.open", &json!({"path": doc})).unwrap()["documentFonts"], 1);
-        // Packaging into the folder the fonts come from leaves them whole.
-        let len = std::fs::metadata(fonts.join("free.ttf")).unwrap().len();
-        s.execute("file.package", &json!({"dir": dir.join("src").to_string_lossy(), "idml": false})).unwrap();
-        assert_eq!(std::fs::metadata(fonts.join("free.ttf")).unwrap().len(), len);
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn package_copies_the_fallback_fonts_that_draw_text() {
-        use designcraft_fonts::DOCUMENT_FONTS_FOLDER;
-        use designcraft_fonts::testing::{font_with, with_fs_type};
-        const NAMED: &str = "DocFont Fallback Named";
-        const HELPER: &str = "DocFont Fallback Helper";
-        const RESTRICTED: &str = "DocFont Fallback Restricted";
-        // Characters no other font has: the named font lacks both, the document's other fonts
-        // draw them.
-        let (helped, restricted) = ('\u{F0A41}', '\u{F0A42}');
-        let dir = std::env::temp_dir().join(format!("dc-package-fallback-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        let fonts = dir.join("src").join(DOCUMENT_FONTS_FOLDER);
-        std::fs::create_dir_all(&fonts).unwrap();
-        std::fs::write(fonts.join("named.ttf"), font_with(NAMED, &['N']).unwrap()).unwrap();
-        std::fs::write(fonts.join("helper.ttf"), font_with(HELPER, &[helped]).unwrap()).unwrap();
-        std::fs::write(fonts.join("restricted.otf"), with_fs_type(font_with(RESTRICTED, &[restricted]).unwrap(), 0x0002).unwrap()).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("document.preferences", &json!({"glyphFallback": true})).unwrap();
-        let text = format!("N{helped}{restricted}");
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": text})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": text.len()})).unwrap();
-        s.execute("type.char", &json!({"fontFamily": NAMED, "fontStyle": "Regular"})).unwrap();
-        let src = dir.join("src").join("Fallback.designcraft");
-        // Written without File › Save's preview: drawing it before the document's fonts load would
-        // pull in a system font that covers these characters (Unifont CSUR does) and draws them
-        // ahead of the document's own fonts in this process.
-        std::fs::write(&src, crate::cmd::to_bytes(&s.doc().unwrap().doc).unwrap()).unwrap();
-        let mut s = Session::new();
-        assert_eq!(s.execute("file.open", &json!({"path": src.to_string_lossy()})).unwrap()["documentFonts"], 3);
-
-        let out = dir.join("Pkg");
-        let r = s.execute("file.package", &json!({"dir": out.to_string_lossy(), "idml": false})).unwrap();
-        let packed_fonts = out.join(DOCUMENT_FONTS_FOLDER);
-        assert!(packed_fonts.join("named.ttf").exists());
-        assert!(packed_fonts.join("helper.ttf").exists(), "the fallback font that draws text is copied");
-        assert!(!packed_fonts.join("restricted.otf").exists(), "a restricted licence keeps a fallback font out too");
-        let report = r["report"].as_str().unwrap();
-        let fallback = report.split("Fallback fonts").nth(1).unwrap_or_else(|| panic!("{report}"));
-        assert!(fallback.contains(&format!("{HELPER} Regular\n")), "{report}");
-        assert!(fallback.contains(&format!("{RESTRICTED} Regular — not copied: its licence doesn't allow it")), "{report}");
-        assert!(!fallback.contains(NAMED), "{report}");
-        // The packaged document draws the same text with its fonts.
-        let doc = r["files"][0].as_str().unwrap().to_string();
-        assert_eq!(Session::new().execute("file.open", &json!({"path": doc})).unwrap()["documentFonts"], 2);
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn packaged_fonts_keep_a_font_extension() {
-        use designcraft_fonts::DOCUMENT_FONTS_FOLDER;
-        use designcraft_fonts::testing::{font_with, installed_face};
-        // A font service's file without an extension is copied under a name the reopened
-        // package loads.
-        let dir = std::env::temp_dir().join(format!("dc-package-font-ext-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let from = dir.join(".12345");
-        let bytes = font_with("DocFont Package Extensionless", &['E']).unwrap();
-        std::fs::write(&from, &bytes).unwrap();
-        let face = installed_face(bytes, from).unwrap();
-        let root = OutputRoot::new(dir.clone()).unwrap();
-        let fonts = dir.join("Pkg").join(DOCUMENT_FONTS_FOLDER);
-        std::fs::create_dir_all(&fonts).unwrap();
-        let (mut copied, mut taken, mut files) = (Vec::new(), Vec::new(), Vec::new());
-        assert_eq!(copy_font(&root, &face, &fonts, &mut copied, &mut taken, &mut files), "");
-        assert_eq!(files, [fonts.join("12345.ttf")]);
-        let db = designcraft_fonts::FontDb::global();
-        let loaded = db.load_document_fonts(&fonts, &|_| Ok(()));
-        assert_eq!((loaded.faces, loaded.skipped.len()), (1, 0), "{:?}", loaded.skipped);
-        db.close_scope(loaded.scope);
-        // The first four bytes name the kind; a font extension or an unknown kind stays.
-        assert_eq!(font_file_name("Face".into(), b"OTTO...."), "Face.otf");
-        assert_eq!(font_file_name("Faces".into(), b"ttcf...."), "Faces.ttc");
-        assert_eq!(font_file_name("Mac".into(), b"true...."), "Mac.ttf");
-        assert_eq!(font_file_name("..".into(), &[0, 1, 0, 0]), "font.ttf");
-        assert_eq!(font_file_name("Face.OTF".into(), b"ttcf"), "Face.OTF");
-        assert_eq!(font_file_name("Face.dfont".into(), b"\0\0\x01\0"), "Face.dfont");
-        assert_eq!(font_file_name("short".into(), b"OT"), "short");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn package_uses_portable_names_inside_the_selected_directory() {
-        assert_eq!(safe_component("Archive/Annual: Review", "Untitled"), "Annual_ Review");
-        assert_eq!(safe_component(".", "Untitled"), "Untitled");
-        assert_eq!(safe_component("CON", "Untitled"), "_CON");
-        assert_eq!(safe_component("COM¹.txt", "Untitled"), "_COM¹.txt");
-        assert_eq!(safe_component("LPT³", "Untitled"), "_LPT³");
-        for name in ["COM¹", "COM²", "COM³", "LPT¹", "LPT²", "LPT³"] {
-            assert!(is_reserved_windows_name(name), "{name}");
-        }
-        let mut taken = Vec::new();
-        assert_eq!(unique_name("Logo.svg".into(), &mut taken), "Logo.svg");
-        assert_eq!(unique_name("logo.svg".into(), &mut taken), "logo 2.svg");
-        assert_eq!(unique_name("Résumé.pdf".into(), &mut taken), "Résumé.pdf");
-        assert_eq!(unique_name("Re\u{301}sume\u{301}.pdf".into(), &mut taken), "Re\u{301}sume\u{301} 2.pdf");
-        assert_eq!(unique_name("ΟΣ.txt".into(), &mut taken), "ΟΣ.txt");
-        assert_eq!(unique_name("ος.txt".into(), &mut taken), "ος 2.txt");
-
-        let dir = std::env::temp_dir().join(format!("dc-package-safe-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"title": "Archive/Annual: Review"})).unwrap();
-        let r = s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": false})).unwrap();
-        let files = r["files"].as_array().unwrap();
-        assert!(files.iter().all(|path| Path::new(path.as_str().unwrap()).starts_with(&dir)));
-        assert!(dir.join("Annual_ Review.designcraft").is_file());
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn package_overwrites_existing_regular_outputs() {
-        let dir = std::env::temp_dir().join(format!("dc-package-overwrite-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let document = dir.join("Annual.designcraft");
-        std::fs::write(&document, b"previous package").unwrap();
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-
-            std::fs::set_permissions(&document, std::fs::Permissions::from_mode(0o640)).unwrap();
-        }
-
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"title": "Annual"})).unwrap();
-        s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": false})).unwrap();
-        s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": false})).unwrap();
-        assert!(super::super::from_bytes(&std::fs::read(&document).unwrap()).is_ok());
-        assert!(!dir.join(designcraft_fonts::DOCUMENT_FONTS_FOLDER).exists());
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-
-            assert_eq!(std::fs::metadata(&document).unwrap().permissions().mode() & 0o777, 0o640);
-        }
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn package_accepts_a_relative_destination() {
-        let dir = PathBuf::from(format!(".dc-package-relative-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"title": "Relative"})).unwrap();
-        s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": false})).unwrap();
-        assert!(dir.join("Relative.designcraft").is_file());
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn package_refuses_redirected_destinations() {
-        use std::os::unix::fs::symlink;
-
-        let base = std::env::temp_dir().join(format!("dc-package-redirects-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&base);
-        std::fs::create_dir_all(&base).unwrap();
-        let outside = base.join("separate");
-        std::fs::create_dir_all(&outside).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"title": "Annual"})).unwrap();
-
-        let redirected_root = base.join("redirected-package");
-        symlink(&outside, &redirected_root).unwrap();
-        assert!(s.execute("file.package", &json!({"dir": redirected_root.to_string_lossy(), "idml": false})).is_err());
-        assert!(!outside.join("Annual.designcraft").exists());
-        std::fs::remove_file(&redirected_root).unwrap();
-
-        // A linked folder above the package is followed, as `/tmp` is on macOS.
-        let linked_parent = base.join("linked-parent");
-        symlink(&outside, &linked_parent).unwrap();
-        let nested_package = linked_parent.join("nested").join("Package");
-        s.execute("file.package", &json!({"dir": nested_package.to_string_lossy(), "idml": false})).unwrap();
-        assert!(outside.join("nested").join("Package").join("Annual.designcraft").is_file());
-        std::fs::remove_file(&linked_parent).unwrap();
-
-        let package = base.join("Package");
-        std::fs::create_dir_all(&package).unwrap();
-        symlink(&outside, package.join("Links")).unwrap();
-        assert!(s.execute("file.package", &json!({"dir": package.to_string_lossy(), "idml": false})).is_err());
-        assert!(!outside.join("Annual.designcraft").exists());
-        std::fs::remove_file(package.join("Links")).unwrap();
-        std::fs::create_dir(package.join("Links")).unwrap();
-
-        let kept = outside.join("kept.designcraft");
-        std::fs::write(&kept, b"kept").unwrap();
-        symlink(&kept, package.join("Annual.designcraft")).unwrap();
-        assert!(s.execute("file.package", &json!({"dir": package.to_string_lossy(), "idml": false})).is_err());
-        assert_eq!(std::fs::read(&kept).unwrap(), b"kept");
-        let _ = std::fs::remove_dir_all(&base);
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn package_refuses_windows_directory_redirects() {
-        use std::os::windows::fs::symlink_dir;
-
-        let base = std::env::temp_dir().join(format!("dc-package-windows-redirect-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&base);
-        let outside = base.join("separate");
-        std::fs::create_dir_all(&outside).unwrap();
-        let redirected = base.join("Package");
-        match symlink_dir(&outside, &redirected) {
-            Ok(()) => {}
-            Err(e) if e.kind() == std::io::ErrorKind::PermissionDenied => {
-                let _ = std::fs::remove_dir_all(&base);
-                return;
-            }
-            Err(e) => panic!("could not create directory redirect: {e}"),
-        }
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"title": "Annual"})).unwrap();
-        assert!(s.execute("file.package", &json!({"dir": redirected.to_string_lossy(), "idml": false})).is_err());
-        assert!(!outside.join("Annual.designcraft").exists());
-        std::fs::remove_dir(&redirected).unwrap();
-        let _ = std::fs::remove_dir_all(&base);
-    }
-}
+mod tests;
diff --git a/crates/engine/src/cmd/package/tests.rs b/crates/engine/src/cmd/package/tests.rs
new file mode 100644
index 000000000..acc6d657f
--- /dev/null
+++ b/crates/engine/src/cmd/package/tests.rs
@@ -0,0 +1,476 @@
+use super::*;
+
+#[test]
+fn relocated_packages_rebind_embedded_image_links_on_open() {
+    let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+    let dir = std::env::temp_dir().join(format!("dc-package-relocation-{}-{nonce}", std::process::id()));
+    let original = dir.join("original");
+    let moved = dir.join("moved");
+    let png = designcraft_render::Rendered { width: 4, height: 3, pixels: [30, 90, 180, 255].repeat(12) }.to_png();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"title": "OwnedPackage", "width": 72, "height": 72})).unwrap();
+    s.execute("file.place", &json!({"base64": super::super::base64_encode(&png), "name": "owned.png", "x": 5, "y": 5, "width": 16})).unwrap();
+    s.execute("file.package", &json!({"dir": original.to_string_lossy(), "idml": true, "pdf": false})).unwrap();
+    std::fs::rename(&original, &moved).unwrap();
+    let expected = std::path::absolute(moved.join("Links").join("owned.png")).unwrap();
+    for (command, extension) in [("file.open", "designcraft"), ("file.openIdml", "idml")] {
+        let mut opened = Session::new();
+        opened.execute(command, &json!({"path": moved.join(format!("OwnedPackage.{extension}")).to_string_lossy()})).unwrap();
+        let asset = opened.doc().unwrap().doc.assets.values().next().unwrap();
+        assert_eq!(*asset.data, png, "{extension}: the packaged pixels");
+        assert_eq!(asset.link.as_deref(), expected.to_str(), "{extension}: use the relocated Links file");
+        let links = opened.execute("links.list", &json!({})).unwrap();
+        assert_eq!(links[0]["status"], "ok", "{extension}");
+    }
+    std::fs::remove_dir_all(dir).unwrap();
+}
+
+/// A per-placement PDF layer choice cannot travel in an IDML copy that links its files, so the
+/// report says the copies differ instead of leaving it to be discovered.
+#[test]
+fn package_report_names_placed_pdf_layer_choices() {
+    let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+    let dir = std::env::temp_dir().join(format!("dc-package-pdf-layers-{}-{nonce}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let pdf = super::super::pdflayers::tests::two_layer_pdf();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"title": "LayeredPackage", "width": 100, "height": 100})).unwrap();
+    let id = s.execute("file.place", &json!({"base64": super::super::base64_encode(&pdf), "name": "art.pdf", "x": 0, "y": 0, "width": 100})).unwrap()
+        ["id"]
+        .clone();
+    s.execute("object.layerOptions", &json!({"ids": [id], "hidden": ["Red"]})).unwrap();
+    let r = s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": true, "pdf": false})).unwrap();
+    let report = r["report"].as_str().unwrap();
+    assert!(report.contains("Placed PDF layers"), "{report}");
+    // The DesignCraft copy keeps the choice; only the linked IDML copy shows file defaults.
+    let packed = super::super::from_bytes(&std::fs::read(dir.join("LayeredPackage.designcraft")).unwrap()).unwrap();
+    let item = packed.item(designcraft_doc::ItemId(id.as_u64().unwrap())).unwrap();
+    assert_eq!(item.pdf_hidden_layers, vec!["Red".to_string()]);
+    assert!(item.has_pdf_layer_override());
+    std::fs::remove_dir_all(dir).unwrap();
+}
+
+/// The package's IDML links its images to the files in the package's Links folder and embeds
+/// no copies of them.
+#[test]
+fn package_idml_links_the_links_folder_and_embeds_nothing() {
+    let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+    let dir = std::env::temp_dir().join(format!("dc-package-idml-links-{}-{nonce}", std::process::id()));
+    let png = designcraft_render::Rendered { width: 4, height: 3, pixels: [30, 90, 180, 255].repeat(12) }.to_png();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"title": "LinkedPackage", "width": 72, "height": 72})).unwrap();
+    s.execute("file.place", &json!({"base64": super::super::base64_encode(&png), "name": "my photo.png", "x": 5, "y": 5, "width": 16})).unwrap();
+    s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": true, "pdf": false})).unwrap();
+    let idml = std::fs::read(dir.join("LinkedPackage.idml")).unwrap();
+    let mut zip = zip::ZipArchive::new(std::io::Cursor::new(idml.as_slice())).unwrap();
+    let mut spreads = String::new();
+    for i in 0..zip.len() {
+        let mut f = zip.by_index(i).unwrap();
+        if f.name().starts_with("Spreads/") {
+            std::io::Read::read_to_string(&mut f, &mut spreads).unwrap();
+        }
+    }
+    // Relative to the package: no path from the machine that made it (#340).
+    let uri = "file:Links/my%20photo.png";
+    let folder = dir.file_name().unwrap().to_string_lossy().into_owned();
+    assert!(!spreads.contains(&folder), "the package's own folder is not written: {spreads}");
+    assert!(spreads.contains(&format!(r#"LinkResourceURI="{uri}""#)), "{spreads}");
+    assert!(!spreads.contains("<Contents") && !spreads.contains(r#"StoredState="Embedded""#), "no image is embedded");
+    let back = designcraft_idml::import_idml_with(&idml, &|_| None).unwrap();
+    let asset = back.assets.values().next().unwrap();
+    assert!(asset.data.is_empty(), "no image is embedded");
+    assert_eq!(asset.link.as_deref(), Some("Links/my photo.png"));
+    assert!(dir.join("Links").join("my photo.png").exists());
+}
+
+/// A link whose file is gone has no bytes to copy: the package leaves it out of Links/, the
+/// report lists it as missing, and the packaged document keeps it missing (#908).
+#[test]
+fn package_leaves_missing_links_missing() {
+    let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+    let dir = std::env::temp_dir().join(format!("dc-package-missing-{}-{nonce}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let svg = r##"<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40"><rect width="40" height="40"/></svg>"##;
+    let (gone, kept) = (dir.join("gone.svg"), dir.join("kept.svg"));
+    std::fs::write(&gone, svg).unwrap();
+    std::fs::write(&kept, svg.replace("<rect", "<circle r=\"9\"/><rect")).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"title": "TwoLinks"})).unwrap();
+    s.execute("file.place", &json!({"path": gone.to_string_lossy(), "x": 10, "y": 10})).unwrap();
+    s.execute("edit.deselectAll", &json!({})).unwrap();
+    s.execute("file.place", &json!({"path": kept.to_string_lossy(), "x": 10, "y": 200})).unwrap();
+    let idml = dir.join("TwoLinks.idml");
+    s.execute("file.exportIdml", &json!({"path": idml.to_string_lossy(), "embedImages": false})).unwrap();
+    std::fs::remove_file(&gone).unwrap();
+    let mut s = Session::new();
+    s.execute("file.openIdml", &json!({"path": idml.to_string_lossy()})).unwrap();
+    let status = |s: &mut Session, name: &str| {
+        let links = s.execute("links.list", &json!({})).unwrap();
+        links.as_array().unwrap().iter().find(|l| l["name"] == name).map(|l| l["status"].clone())
+    };
+    assert_eq!(status(&mut s, "gone.svg"), Some(json!("missing")));
+
+    let out = dir.join("Pkg");
+    let r = s.execute("file.package", &json!({"dir": out.to_string_lossy(), "idml": true})).unwrap();
+    assert!(!out.join("Links").join("gone.svg").exists(), "a missing link is not copied");
+    assert!(out.join("Links").join("kept.svg").exists());
+    assert!(!r["files"].to_string().contains("gone.svg"), "{}", r["files"]);
+    let report = r["report"].as_str().unwrap();
+    assert!(report.contains("gone.svg (missing)"), "{report}");
+    for (command, extension) in [("file.open", "designcraft"), ("file.openIdml", "idml")] {
+        let mut opened = Session::new();
+        opened.execute(command, &json!({"path": out.join(format!("TwoLinks.{extension}")).to_string_lossy()})).unwrap();
+        assert_eq!(status(&mut opened, "gone.svg"), Some(json!("missing")), "{extension}");
+        assert_eq!(status(&mut opened, "kept.svg"), Some(json!("ok")), "{extension}");
+    }
+    std::fs::remove_dir_all(dir).unwrap();
+}
+
+/// A package holds no path from the machine that made it: the document and the IDML link the
+/// copies in `Links/` by relative names, and they still open as linked after the move (#340).
+#[test]
+fn package_documents_hold_relative_links_only() {
+    let nonce = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos();
+    let dir = std::env::temp_dir().join(format!("dc-package-relative-{}-{nonce}", std::process::id()));
+    let folder = dir.file_name().unwrap().to_string_lossy().into_owned();
+    let png = designcraft_render::Rendered { width: 4, height: 3, pixels: [30, 90, 180, 255].repeat(12) }.to_png();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"title": "RelativePackage", "width": 72, "height": 72})).unwrap();
+    s.execute("file.place", &json!({"base64": super::super::base64_encode(&png), "name": "owned.png", "x": 5, "y": 5, "width": 16})).unwrap();
+    s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": true, "pdf": false})).unwrap();
+    let packed = super::super::from_bytes(&std::fs::read(dir.join("RelativePackage.designcraft")).unwrap()).unwrap();
+    let link = packed.assets.values().next().unwrap().link.clone().unwrap();
+    assert_eq!(link, "Links/owned.png");
+    assert!(!link.contains(&folder));
+    // Copy Link(s) To is unchanged: it relinks the open document by full path.
+    s.execute("links.copyTo", &json!({"dir": dir.join("Copies").to_string_lossy()})).unwrap();
+    let copied = s.doc().unwrap().doc.assets.values().next().unwrap().link.clone().unwrap();
+    assert!(std::path::Path::new(&copied).is_absolute(), "{copied}");
+    std::fs::remove_dir_all(dir).unwrap();
+}
+
+#[test]
+fn package_writes_document_links_and_report() {
+    let dir = std::env::temp_dir().join(format!("dc-package-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    let svg = dir.join("logo.svg");
+    std::fs::write(&svg, r##"<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40"><rect width="40" height="40"/></svg>"##).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("file.place", &json!({"path": svg.to_string_lossy(), "x": 100, "y": 100})).unwrap();
+    s.execute("frame.create", &json!({"rect": [72, 300, 400, 400], "content": "text", "text": "Hello"})).unwrap();
+    let out = dir.join("Pkg");
+    let r = s.execute("file.package", &json!({"dir": out.to_string_lossy(), "pdf": true, "instructions": "Print on matte."})).unwrap();
+    let files: Vec<String> = r["files"].as_array().unwrap().iter().map(|f| f.as_str().unwrap().to_string()).collect();
+    assert!(files.iter().any(|f| f.ends_with(".designcraft")));
+    assert!(files.iter().any(|f| f.ends_with(".idml")));
+    assert!(files.iter().any(|f| f.ends_with(".pdf")));
+    assert!(out.join("Links").join("logo.svg").exists());
+    let report = std::fs::read_to_string(out.join("Instructions.txt")).unwrap();
+    assert!(report.contains("Print on matte.") && report.contains("logo.svg"), "{report}");
+    assert!(report.contains("Preflight:"), "{report}");
+    // The packaged document links to its Links folder.
+    let doc_file = files.iter().find(|f| f.ends_with(".designcraft")).unwrap();
+    let packed = super::super::from_bytes(&std::fs::read(doc_file).unwrap()).unwrap();
+    let link = packed.assets.values().next().unwrap().link.clone().unwrap();
+    assert!(link.contains("Links"), "{link}");
+    // Copy Links To relinks the open document.
+    let r = s.execute("links.copyTo", &json!({"dir": dir.join("Copies").to_string_lossy()})).unwrap();
+    assert_eq!(r["copied"], 1);
+    assert!(s.doc().unwrap().doc.assets.values().next().unwrap().link.as_deref().unwrap().contains("Copies"));
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn package_copies_the_fonts_their_licences_allow() {
+    use designcraft_fonts::DOCUMENT_FONTS_FOLDER;
+    use designcraft_fonts::testing::{font_with, with_fs_type};
+    const FREE: &str = "DocFont Package Free";
+    const RESTRICTED: &str = "DocFont Package Restricted";
+    let dir = std::env::temp_dir().join(format!("dc-package-fonts-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    let fonts = dir.join("src").join(DOCUMENT_FONTS_FOLDER);
+    std::fs::create_dir_all(&fonts).unwrap();
+    std::fs::write(fonts.join("free.ttf"), font_with(FREE, &['F']).unwrap()).unwrap();
+    std::fs::write(fonts.join("restricted.otf"), with_fs_type(font_with(RESTRICTED, &['R']).unwrap(), 0x0002).unwrap()).unwrap();
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+
+        std::fs::set_permissions(fonts.join("free.ttf"), std::fs::Permissions::from_mode(0o640)).unwrap();
+    }
+    // Text in both fonts, and in the bundled default font.
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Free Restricted Default"})).unwrap();
+    for (a, b, family) in [(0, 4, FREE), (5, 15, RESTRICTED)] {
+        s.execute("text.select", &json!({"story": r["story"], "anchor": a, "focus": b})).unwrap();
+        s.execute("type.char", &json!({"fontFamily": family, "fontStyle": "Regular"})).unwrap();
+    }
+    let src = dir.join("src").join("Fonts.designcraft");
+    s.execute("file.save", &json!({"path": src.to_string_lossy()})).unwrap();
+    let mut s = Session::new();
+    assert_eq!(s.execute("file.open", &json!({"path": src.to_string_lossy()})).unwrap()["documentFonts"], 2);
+
+    let out = dir.join("Pkg");
+    let r = s.execute("file.package", &json!({"dir": out.to_string_lossy(), "idml": false})).unwrap();
+    let packed_fonts = out.join(DOCUMENT_FONTS_FOLDER);
+    assert!(packed_fonts.join("free.ttf").exists());
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+
+        assert_eq!(
+            std::fs::metadata(packed_fonts.join("free.ttf")).unwrap().permissions().mode() & 0o777,
+            std::fs::metadata(fonts.join("free.ttf")).unwrap().permissions().mode() & 0o777
+        );
+    }
+    assert!(!packed_fonts.join("restricted.otf").exists(), "a restricted licence keeps the font out");
+    assert!(r["files"].to_string().contains("free.ttf"), "{}", r["files"]);
+    let report = r["report"].as_str().unwrap();
+    assert!(report.contains(&format!("{RESTRICTED} Regular — not copied: its licence doesn't allow it")), "{report}");
+    assert!(report.contains(&format!("{FREE} Regular\n")), "{report}");
+    assert!(report.contains(&format!("{} Regular — included with DesignCraft", designcraft_fonts::DEFAULT_FAMILY)), "{report}");
+    // The packaged document opens with its fonts.
+    let doc = r["files"][0].as_str().unwrap().to_string();
+    assert_eq!(Session::new().execute("file.open", &json!({"path": doc})).unwrap()["documentFonts"], 1);
+    // Packaging into the folder the fonts come from leaves them whole.
+    let len = std::fs::metadata(fonts.join("free.ttf")).unwrap().len();
+    s.execute("file.package", &json!({"dir": dir.join("src").to_string_lossy(), "idml": false})).unwrap();
+    assert_eq!(std::fs::metadata(fonts.join("free.ttf")).unwrap().len(), len);
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn package_copies_the_fallback_fonts_that_draw_text() {
+    use designcraft_fonts::DOCUMENT_FONTS_FOLDER;
+    use designcraft_fonts::testing::{font_with, with_fs_type};
+    const NAMED: &str = "DocFont Fallback Named";
+    const HELPER: &str = "DocFont Fallback Helper";
+    const RESTRICTED: &str = "DocFont Fallback Restricted";
+    // Characters no other font has: the named font lacks both, the document's other fonts
+    // draw them.
+    let (helped, restricted) = ('\u{F0A41}', '\u{F0A42}');
+    let dir = std::env::temp_dir().join(format!("dc-package-fallback-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    let fonts = dir.join("src").join(DOCUMENT_FONTS_FOLDER);
+    std::fs::create_dir_all(&fonts).unwrap();
+    std::fs::write(fonts.join("named.ttf"), font_with(NAMED, &['N']).unwrap()).unwrap();
+    std::fs::write(fonts.join("helper.ttf"), font_with(HELPER, &[helped]).unwrap()).unwrap();
+    std::fs::write(fonts.join("restricted.otf"), with_fs_type(font_with(RESTRICTED, &[restricted]).unwrap(), 0x0002).unwrap()).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("document.preferences", &json!({"glyphFallback": true})).unwrap();
+    let text = format!("N{helped}{restricted}");
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": text})).unwrap();
+    s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": text.len()})).unwrap();
+    s.execute("type.char", &json!({"fontFamily": NAMED, "fontStyle": "Regular"})).unwrap();
+    let src = dir.join("src").join("Fallback.designcraft");
+    // Written without File › Save's preview: drawing it before the document's fonts load would
+    // pull in a system font that covers these characters (Unifont CSUR does) and draws them
+    // ahead of the document's own fonts in this process.
+    std::fs::write(&src, crate::cmd::to_bytes(&s.doc().unwrap().doc).unwrap()).unwrap();
+    let mut s = Session::new();
+    assert_eq!(s.execute("file.open", &json!({"path": src.to_string_lossy()})).unwrap()["documentFonts"], 3);
+
+    let out = dir.join("Pkg");
+    let r = s.execute("file.package", &json!({"dir": out.to_string_lossy(), "idml": false})).unwrap();
+    let packed_fonts = out.join(DOCUMENT_FONTS_FOLDER);
+    assert!(packed_fonts.join("named.ttf").exists());
+    assert!(packed_fonts.join("helper.ttf").exists(), "the fallback font that draws text is copied");
+    assert!(!packed_fonts.join("restricted.otf").exists(), "a restricted licence keeps a fallback font out too");
+    let report = r["report"].as_str().unwrap();
+    let fallback = report.split("Fallback fonts").nth(1).unwrap_or_else(|| panic!("{report}"));
+    assert!(fallback.contains(&format!("{HELPER} Regular\n")), "{report}");
+    assert!(fallback.contains(&format!("{RESTRICTED} Regular — not copied: its licence doesn't allow it")), "{report}");
+    assert!(!fallback.contains(NAMED), "{report}");
+    // The packaged document draws the same text with its fonts.
+    let doc = r["files"][0].as_str().unwrap().to_string();
+    assert_eq!(Session::new().execute("file.open", &json!({"path": doc})).unwrap()["documentFonts"], 2);
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn packaged_fonts_keep_a_font_extension() {
+    use designcraft_fonts::DOCUMENT_FONTS_FOLDER;
+    use designcraft_fonts::testing::{font_with, installed_face};
+    // A font service's file without an extension is copied under a name the reopened
+    // package loads.
+    let dir = std::env::temp_dir().join(format!("dc-package-font-ext-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    let from = dir.join(".12345");
+    let bytes = font_with("DocFont Package Extensionless", &['E']).unwrap();
+    std::fs::write(&from, &bytes).unwrap();
+    let face = installed_face(bytes, from).unwrap();
+    let root = OutputRoot::new(dir.clone()).unwrap();
+    let fonts = dir.join("Pkg").join(DOCUMENT_FONTS_FOLDER);
+    std::fs::create_dir_all(&fonts).unwrap();
+    let (mut copied, mut taken, mut files) = (Vec::new(), Vec::new(), Vec::new());
+    assert_eq!(copy_font(&root, &face, &fonts, &mut copied, &mut taken, &mut files), "");
+    assert_eq!(files, [fonts.join("12345.ttf")]);
+    let db = designcraft_fonts::FontDb::global();
+    let loaded = db.load_document_fonts(&fonts, &|_| Ok(()));
+    assert_eq!((loaded.faces, loaded.skipped.len()), (1, 0), "{:?}", loaded.skipped);
+    db.close_scope(loaded.scope);
+    // The first four bytes name the kind; a font extension or an unknown kind stays.
+    assert_eq!(font_file_name("Face".into(), b"OTTO...."), "Face.otf");
+    assert_eq!(font_file_name("Faces".into(), b"ttcf...."), "Faces.ttc");
+    assert_eq!(font_file_name("Mac".into(), b"true...."), "Mac.ttf");
+    assert_eq!(font_file_name("..".into(), &[0, 1, 0, 0]), "font.ttf");
+    assert_eq!(font_file_name("Face.OTF".into(), b"ttcf"), "Face.OTF");
+    assert_eq!(font_file_name("Face.dfont".into(), b"\0\0\x01\0"), "Face.dfont");
+    assert_eq!(font_file_name("short".into(), b"OT"), "short");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn package_uses_portable_names_inside_the_selected_directory() {
+    assert_eq!(safe_component("Archive/Annual: Review", "Untitled"), "Annual_ Review");
+    assert_eq!(safe_component(".", "Untitled"), "Untitled");
+    assert_eq!(safe_component("CON", "Untitled"), "_CON");
+    assert_eq!(safe_component("COM¹.txt", "Untitled"), "_COM¹.txt");
+    assert_eq!(safe_component("LPT³", "Untitled"), "_LPT³");
+    for name in ["COM¹", "COM²", "COM³", "LPT¹", "LPT²", "LPT³"] {
+        assert!(is_reserved_windows_name(name), "{name}");
+    }
+    let mut taken = Vec::new();
+    assert_eq!(unique_name("Logo.svg".into(), &mut taken), "Logo.svg");
+    assert_eq!(unique_name("logo.svg".into(), &mut taken), "logo 2.svg");
+    assert_eq!(unique_name("Résumé.pdf".into(), &mut taken), "Résumé.pdf");
+    assert_eq!(unique_name("Re\u{301}sume\u{301}.pdf".into(), &mut taken), "Re\u{301}sume\u{301} 2.pdf");
+    assert_eq!(unique_name("ΟΣ.txt".into(), &mut taken), "ΟΣ.txt");
+    assert_eq!(unique_name("ος.txt".into(), &mut taken), "ος 2.txt");
+
+    let dir = std::env::temp_dir().join(format!("dc-package-safe-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"title": "Archive/Annual: Review"})).unwrap();
+    let r = s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": false})).unwrap();
+    let files = r["files"].as_array().unwrap();
+    assert!(files.iter().all(|path| Path::new(path.as_str().unwrap()).starts_with(&dir)));
+    assert!(dir.join("Annual_ Review.designcraft").is_file());
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn package_overwrites_existing_regular_outputs() {
+    let dir = std::env::temp_dir().join(format!("dc-package-overwrite-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    let document = dir.join("Annual.designcraft");
+    std::fs::write(&document, b"previous package").unwrap();
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+
+        std::fs::set_permissions(&document, std::fs::Permissions::from_mode(0o640)).unwrap();
+    }
+
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"title": "Annual"})).unwrap();
+    s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": false})).unwrap();
+    s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": false})).unwrap();
+    assert!(super::super::from_bytes(&std::fs::read(&document).unwrap()).is_ok());
+    assert!(!dir.join(designcraft_fonts::DOCUMENT_FONTS_FOLDER).exists());
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+
+        assert_eq!(std::fs::metadata(&document).unwrap().permissions().mode() & 0o777, 0o640);
+    }
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn package_accepts_a_relative_destination() {
+    let dir = PathBuf::from(format!(".dc-package-relative-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"title": "Relative"})).unwrap();
+    s.execute("file.package", &json!({"dir": dir.to_string_lossy(), "idml": false})).unwrap();
+    assert!(dir.join("Relative.designcraft").is_file());
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[cfg(unix)]
+#[test]
+fn package_refuses_redirected_destinations() {
+    use std::os::unix::fs::symlink;
+
+    let base = std::env::temp_dir().join(format!("dc-package-redirects-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&base);
+    std::fs::create_dir_all(&base).unwrap();
+    let outside = base.join("separate");
+    std::fs::create_dir_all(&outside).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"title": "Annual"})).unwrap();
+
+    let redirected_root = base.join("redirected-package");
+    symlink(&outside, &redirected_root).unwrap();
+    assert!(s.execute("file.package", &json!({"dir": redirected_root.to_string_lossy(), "idml": false})).is_err());
+    assert!(!outside.join("Annual.designcraft").exists());
+    std::fs::remove_file(&redirected_root).unwrap();
+
+    // A linked folder above the package is followed, as `/tmp` is on macOS.
+    let linked_parent = base.join("linked-parent");
+    symlink(&outside, &linked_parent).unwrap();
+    let nested_package = linked_parent.join("nested").join("Package");
+    s.execute("file.package", &json!({"dir": nested_package.to_string_lossy(), "idml": false})).unwrap();
+    assert!(outside.join("nested").join("Package").join("Annual.designcraft").is_file());
+    std::fs::remove_file(&linked_parent).unwrap();
+
+    let package = base.join("Package");
+    std::fs::create_dir_all(&package).unwrap();
+    symlink(&outside, package.join("Links")).unwrap();
+    assert!(s.execute("file.package", &json!({"dir": package.to_string_lossy(), "idml": false})).is_err());
+    assert!(!outside.join("Annual.designcraft").exists());
+    std::fs::remove_file(package.join("Links")).unwrap();
+    std::fs::create_dir(package.join("Links")).unwrap();
+
+    let kept = outside.join("kept.designcraft");
+    std::fs::write(&kept, b"kept").unwrap();
+    symlink(&kept, package.join("Annual.designcraft")).unwrap();
+    assert!(s.execute("file.package", &json!({"dir": package.to_string_lossy(), "idml": false})).is_err());
+    assert_eq!(std::fs::read(&kept).unwrap(), b"kept");
+    let _ = std::fs::remove_dir_all(&base);
+}
+
+#[cfg(windows)]
+#[test]
+fn package_refuses_windows_directory_redirects() {
+    use std::os::windows::fs::symlink_dir;
+
+    let base = std::env::temp_dir().join(format!("dc-package-windows-redirect-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&base);
+    let outside = base.join("separate");
+    std::fs::create_dir_all(&outside).unwrap();
+    let redirected = base.join("Package");
+    // A symbolic link needs Developer Mode or elevation (os error 1314 without them); a
+    // directory junction needs neither, and `is_redirect` treats both as redirects.
+    if symlink_dir(&outside, &redirected).is_err() && !make_junction(&outside, &redirected) {
+        eprintln!("skipped: directory redirects can't be made here");
+        let _ = std::fs::remove_dir_all(&base);
+        return;
+    }
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"title": "Annual"})).unwrap();
+    assert!(s.execute("file.package", &json!({"dir": redirected.to_string_lossy(), "idml": false})).is_err());
+    assert!(!outside.join("Annual.designcraft").exists());
+    std::fs::remove_dir(&redirected).unwrap();
+    let _ = std::fs::remove_dir_all(&base);
+}
+
+/// Makes `link` a directory junction to `target` with `mklink /J`, and reports whether it was made.
+#[cfg(windows)]
+fn make_junction(target: &Path, link: &Path) -> bool {
+    use std::os::windows::process::CommandExt;
+
+    // Windows paths can't hold `"`, so quoting each one keeps `&` and spaces in it literal for cmd.
+    std::process::Command::new("cmd")
+        .args(["/D", "/C"])
+        .raw_arg(format!("mklink /J \"{}\" \"{}\"", link.display(), target.display()))
+        .output()
+        .is_ok_and(|output| output.status.success())
+}
diff --git a/crates/engine/src/cmd/paste_svg.rs b/crates/engine/src/cmd/paste_svg.rs
index 54513be53..a5d738cef 100644
--- a/crates/engine/src/cmd/paste_svg.rs
+++ b/crates/engine/src/cmd/paste_svg.rs
@@ -8,7 +8,7 @@ use designcraft_geom::{Affine, BezPath, PathData, Point, Rect};
 use designcraft_images::usvg;
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, Result, Session, bad, cmd, has_doc, spread_param, str_param};
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![cmd!(
@@ -27,7 +27,7 @@ pub fn is_svg_markup(text: &str) -> bool {
     designcraft_images::is_svg(text.as_bytes())
 }
 
-/// Nesting deeper than this is flattened into its parent (hostile input can't exhaust the stack).
+/// Cap conversion nesting too; the shared image parser bounds XML before usvg runs.
 const MAX_DEPTH: usize = 64;
 
 /// A converted SVG node, in points.
@@ -426,13 +426,16 @@ mod tests {
     #[test]
     fn deeply_nested_groups_do_not_exhaust_the_stack() {
         let mut s = session();
+        let before = serde_json::to_value(&s.doc().unwrap().doc).unwrap();
+        let undo = s.doc().unwrap().history.undo.len();
         let depth = 2000;
         let svg = format!(
             r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">{}<rect width="10" height="10"/>{}</svg>"#,
             "<g opacity=\"0.99\">".repeat(depth),
             "</g>".repeat(depth)
         );
-        // usvg itself may refuse a document this deep; either way, no crash.
-        let _ = s.execute("edit.pasteSvg", &json!({"svg": svg}));
+        assert!(s.execute("edit.pasteSvg", &json!({"svg": svg})).is_err());
+        assert_eq!(serde_json::to_value(&s.doc().unwrap().doc).unwrap(), before);
+        assert_eq!(s.doc().unwrap().history.undo.len(), undo);
     }
 }
diff --git a/crates/engine/src/cmd/pdflayers.rs b/crates/engine/src/cmd/pdflayers.rs
index 937fe81c0..75e573b56 100644
--- a/crates/engine/src/cmd/pdflayers.rs
+++ b/crates/engine/src/cmd/pdflayers.rs
@@ -15,13 +15,15 @@ fn placed_pdf(s: &Session, id: designcraft_doc::ItemId) -> Option<std::sync::Arc
 pub fn specs() -> Vec<CommandSpec> {
     vec![
         cmd!(query "object.pdfLayers", "Object Layers", [], None, "{id?} → [{name, visible, default}] — the layers of the selected placed PDF", has_selection, |s, p| {
-            let id = super::id_param(p, "id").or_else(|| s.active().and_then(|d| d.selection.items.first().copied())).ok_or_else(|| bad("object.pdfLayers", "no selection"))?;
+            let id = super::id_param(p, "id").or_else(|| s.active().and_then(|d| d.selection.items.iter().copied().find(|id| placed_pdf(s, *id).is_some()))).ok_or_else(|| bad("object.pdfLayers", "no selection"))?;
             let data = placed_pdf(s, id).ok_or_else(|| bad("object.pdfLayers", "not a placed PDF"))?;
-            let hidden = s.doc()?.doc.item(id).map(|i| i.pdf_hidden_layers.clone()).unwrap_or_default();
+            let item = s.doc()?.doc.item(id);
+            let hidden = item.map(|i| i.pdf_hidden_layers.clone()).unwrap_or_default();
+            let overridden = item.is_some_and(|i| i.has_pdf_layer_override());
             Ok(Value::Array(
                 designcraft_render::pdf_layers(&data)
                     .into_iter()
-                    .map(|(name, on)| json!({"visible": if hidden.is_empty() { on } else { !hidden.contains(&name) }, "name": name, "default": on}))
+                    .map(|(name, on)| json!({"visible": if overridden { !hidden.contains(&name) } else { on }, "name": name, "default": on, "overridden": overridden}))
                     .collect(),
             ))
         }),
@@ -30,30 +32,39 @@ pub fn specs() -> Vec<CommandSpec> {
             "Object Layer Options…",
             ["Object"],
             None,
-            "{ids?, hidden: [layer name]} — layers of placed PDFs to hide ([] = the file's own settings)",
+            "{ids?, hidden: [layer name], useDefaults?: bool} — hide layers; useDefaults:false makes [] explicitly all on; legacy [] restores file defaults",
             has_selection,
             |s, p| {
-                let ids = targets(s, p)?;
+                let ids: Vec<_> = targets(s, p)?.into_iter().filter(|id| placed_pdf(s, *id).is_some()).collect();
                 let hidden: Vec<String> = p
                     .get("hidden")
                     .and_then(Value::as_array)
                     .map(|a| a.iter().filter_map(Value::as_str).map(str::to_string).collect())
                     .unwrap_or_default();
-                if ids.iter().all(|id| placed_pdf(s, *id).is_none()) {
+                let use_defaults = match p.get("useDefaults") {
+                    None => hidden.is_empty(),
+                    Some(v) => v.as_bool().ok_or_else(|| bad("object.layerOptions", "useDefaults must be a boolean"))?,
+                };
+                if use_defaults && !hidden.is_empty() {
+                    return Err(bad("object.layerOptions", "useDefaults cannot be combined with hidden layers"));
+                }
+                if ids.is_empty() {
                     return Err(bad("object.layerOptions", "select a placed PDF"));
                 }
-                // Validate every selected PDF before editing any item or recording undo.
-                // Repeated placements of the same source need only one rewrite check.
-                if !hidden.is_empty() {
+                // Validate every selected PDF before editing any item or recording undo, so a
+                // mixed request stays atomic. Any explicit choice, including all-on
+                // (useDefaults:false with no hidden names), needs one actual rewrite per distinct
+                // source: a PDF can list readable layers and still fail the rewrite, and a
+                // layerless PDF cannot be rewritten at all. Resetting to the file defaults needs no
+                // variant and is always allowed.
+                if !use_defaults {
                     let mut checked = std::collections::HashSet::new();
                     for id in &ids {
-                        if let Some(data) = placed_pdf(s, *id)
-                            && checked.insert(std::sync::Arc::as_ptr(&data))
-                            && designcraft_render::pdf_hide_layers(&data, &hidden).is_none()
-                        {
+                        let Some(data) = placed_pdf(s, *id) else { continue };
+                        if checked.insert(std::sync::Arc::as_ptr(&data)) && designcraft_render::pdf_hide_layers(&data, &hidden).is_none() {
                             return Err(bad(
                                 "object.layerOptions",
-                                "the selected PDF layers could not be hidden; use the file defaults or replace the unsupported PDF",
+                                "the selected PDF layers could not be changed (no readable optional-content layers, or an unsupported file); use the file defaults or replace the PDF",
                             ));
                         }
                     }
@@ -62,9 +73,10 @@ pub fn specs() -> Vec<CommandSpec> {
                     for id in &ids {
                         if let Some(it) = d.item_mut(*id) {
                             it.pdf_hidden_layers = hidden.clone();
+                            it.pdf_layer_override = !use_defaults;
                         }
                     }
-                    Ok(json!({"hidden": hidden}))
+                    Ok(json!({"hidden": hidden, "useDefaults": use_defaults}))
                 })
             }
         ),
@@ -72,310 +84,4 @@ pub fn specs() -> Vec<CommandSpec> {
 }
 
 #[cfg(test)]
-pub(crate) mod tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// A one-page PDF (100×100 pt) with two layers: "Blue" (left half) and "Red" (right half).
-    pub(crate) fn two_layer_pdf() -> Vec<u8> {
-        two_layer_pdf_generation(0)
-    }
-
-    fn two_layer_pdf_generation(generation: i32) -> Vec<u8> {
-        two_layer_pdf_options(generation, "", "")
-    }
-
-    fn two_layer_pdf_options(generation: i32, config: &str, trailer: &str) -> Vec<u8> {
-        let content = "/OC /a BDC 0 0 1 rg 0 0 50 100 re f EMC /OC /b BDC 1 0 0 rg 50 0 50 100 re f EMC";
-        let objs = [
-            format!(
-                "<</Type/Catalog/Lang(en-GB)/Metadata 7 0 R/OutputIntents[8 0 R]/Pages 2 0 R/OCProperties<</OCGs[5 0 R 6 0 R]/D<</Order[5 0 R 6 0 R]/Name(Default)/Locked[5 0 R]{config}>>>>>>"
-            ),
-            "<</Type/Pages/Kids[3 0 R]/Count 1>>".to_string(),
-            "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<</Properties<</a 5 0 R/b 6 0 R>>>>/Contents 4 0 R>>".to_string(),
-            format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
-            "<</Type/OCG/Name(Blue)>>".to_string(),
-            "<</Type/OCG/Name(Red)>>".to_string(),
-            "<</Type/Metadata/Subtype/XML/Length 4>>\nstream\n<x/>\nendstream".to_string(),
-            "<</Type/OutputIntent/S/GTS_PDFX/OutputConditionIdentifier(Test)>>".to_string(),
-        ];
-        let mut out = b"%PDF-1.7\n".to_vec();
-        let mut offs = Vec::new();
-        for (i, o) in objs.iter().enumerate() {
-            offs.push(out.len());
-            out.extend_from_slice(format!("{} {generation} obj\n{}\nendobj\n", i + 1, o.replace(" 0 R", &format!(" {generation} R"))).as_bytes());
-        }
-        let x = out.len();
-        let mut t = format!("xref\n0 {}\n0000000000 65535 f\r\n", objs.len() + 1);
-        for o in offs {
-            t.push_str(&format!("{o:010} {generation:05} n\r\n"));
-        }
-        t.push_str(&format!("trailer\n<</Size {}/Root 1 {generation} R{trailer}>>\nstartxref\n{x}\n%%EOF\n", objs.len() + 1));
-        out.extend_from_slice(t.as_bytes());
-        out
-    }
-
-    #[test]
-    fn pdf_layer_update_preserves_catalog_configuration_and_generations() {
-        for generation in [0, 1] {
-            let original = two_layer_pdf_generation(generation);
-            let updated = designcraft_render::pdf_hide_layers(&original, &["Red".into()]).unwrap();
-            assert_eq!(designcraft_render::pdf_layers(&updated), vec![("Blue".into(), true), ("Red".into(), false)]);
-            let appended = std::str::from_utf8(&updated[original.len()..]).unwrap();
-            for token in [
-                "/Lang(en-GB)".to_string(),
-                format!("/Metadata 7 {generation} R"),
-                format!("/OutputIntents[8 {generation} R]"),
-                format!("/Locked[5 {generation} R]"),
-                "/Name(Default)".into(),
-                format!("/Root 1 {generation} R"),
-            ] {
-                assert!(appended.contains(&token), "missing {token}: {appended}");
-            }
-            assert!(!appended.contains("9999000"));
-            let all_on = designcraft_render::pdf_hide_layers(&updated, &[]).unwrap();
-            assert!(designcraft_render::pdf_layers(&all_on).iter().all(|(_, visible)| *visible));
-        }
-    }
-
-    #[test]
-    fn pdf_layer_update_accepts_xref_streams_and_rejects_unsupported_updates() {
-        let original = two_layer_pdf();
-        let text = std::str::from_utf8(&original).unwrap();
-        let offset: usize = text.rsplit_once("startxref").unwrap().1.split_whitespace().next().unwrap().parse().unwrap();
-        let mut stream_pdf = original[..offset].to_vec();
-        let mut entries = vec![0, 0, 0, 0, 0, 255, 255];
-        for number in 1..=9 {
-            let at = if number == 9 { offset } else { text.find(&format!("{number} 0 obj")).unwrap() };
-            entries.push(1);
-            entries.extend_from_slice(&u32::try_from(at).unwrap().to_be_bytes());
-            entries.extend_from_slice(&[0, 0]);
-        }
-        stream_pdf.extend_from_slice(format!("9 0 obj\n<</Type/XRef/Size 10/Root 1 0 R/W[1 4 2]/Length {}>>\nstream\n", entries.len()).as_bytes());
-        stream_pdf.extend_from_slice(&entries);
-        stream_pdf.extend_from_slice(format!("\nendstream\nendobj\nstartxref\n{offset}\n%%EOF\n").as_bytes());
-        let updated = designcraft_render::pdf_hide_layers(&stream_pdf, &["Red".into()]).unwrap();
-        assert_eq!(designcraft_render::pdf_layers(&updated), vec![("Blue".into(), true), ("Red".into(), false)]);
-        for unsupported in ["/Encrypt 7 0 R", "/Encrypt << /Filter /Standard >>", "/XRefStm 0"] {
-            let altered = text.replace("/Size 9", &format!("{unsupported}/Size 9"));
-            assert!(designcraft_render::pdf_hide_layers(altered.as_bytes(), &["Red".into()]).is_none());
-        }
-    }
-
-    #[test]
-    fn pdf_layer_update_follows_forward_prev_and_rejects_cycles() {
-        let original = two_layer_pdf();
-        let text = std::str::from_utf8(&original).unwrap();
-        let first = original.len();
-        let link = |prev: usize| format!("xref\n0 1\n0000000000 65535 f\ntrailer<</Size 9/Root 1 0 R/Prev {prev:010}>>\n");
-        let main = first + link(0).len();
-        let mut forward = original.clone();
-        forward.extend_from_slice(link(main).as_bytes());
-        let old: usize = text.rsplit_once("startxref").unwrap().1.split_whitespace().next().unwrap().parse().unwrap();
-        forward.extend_from_slice(text[old..].split("startxref").next().unwrap().as_bytes());
-        forward.extend_from_slice(format!("startxref\n{first}\n%%EOF\n").as_bytes());
-        let updated = designcraft_render::pdf_hide_layers(&forward, &["Red".into()]).unwrap();
-        assert_eq!(designcraft_render::pdf_layers(&updated), vec![("Blue".into(), true), ("Red".into(), false)]);
-        let mut cyclic = original;
-        cyclic.extend_from_slice(link(first).as_bytes());
-        cyclic.extend_from_slice(format!("startxref\n{first}\n%%EOF\n").as_bytes());
-        assert!(designcraft_render::pdf_hide_layers(&cyclic, &[]).is_none());
-    }
-
-    fn add_pdf_revision(bytes: &mut Vec<u8>) {
-        let text = std::str::from_utf8(bytes).unwrap();
-        let prev: usize = text.rsplit_once("startxref").unwrap().1.split_whitespace().next().unwrap().parse().unwrap();
-        let xref = bytes.len();
-        bytes.extend_from_slice(
-            format!("xref\n0 1\n0000000000 65535 f\r\ntrailer\n<</Size 9/Root 1 0 R/Prev {prev}>>\nstartxref\n{xref}\n%%EOF\n").as_bytes(),
-        );
-    }
-
-    fn place(s: &mut Session, bytes: &[u8], x: f64) -> serde_json::Value {
-        s.execute("file.place", &json!({"base64": super::super::file::base64_encode(bytes), "name": "layers.pdf", "x": x, "y": 0, "width": 100}))
-            .unwrap()["id"]
-            .clone()
-    }
-
-    fn pixel(s: &Session, x: u32) -> [u8; 4] {
-        let mut renderer = designcraft_render::Renderer::new();
-        renderer.threads = 0;
-        renderer.render_page(&s.doc().unwrap().doc, &s.cache, 0, 1.0, false, &Default::default()).unwrap().pixel(x, 50)
-    }
-
-    #[test]
-    fn null_encryption_entry_keeps_layer_editing_rendering_and_export_working() {
-        for generation in [0, 1] {
-            let bytes = two_layer_pdf_options(generation, "", "/Encrypt null");
-            let mut s = Session::new();
-            s.execute("file.new", &json!({"width": 100, "height": 100, "pages": 1})).unwrap();
-            let id = place(&mut s, &bytes, 0.0);
-            s.execute("object.layerOptions", &json!({"ids": [id], "hidden": ["Red"]})).unwrap();
-            assert_eq!(s.execute("object.pdfLayers", &json!({"id": id})).unwrap()[1]["visible"], false);
-            assert_eq!(pixel(&s, 25), [0, 0, 255, 255]);
-            assert_eq!(pixel(&s, 75), [255, 255, 255, 255]);
-            s.execute("file.exportPdf", &json!({})).unwrap();
-            s.execute("edit.undo", &json!({})).unwrap();
-            assert_eq!(pixel(&s, 75), [255, 0, 0, 255]);
-            s.execute("edit.redo", &json!({})).unwrap();
-            assert_eq!(pixel(&s, 75), [255, 255, 255, 255]);
-        }
-    }
-
-    #[test]
-    fn unrewritable_layer_choices_are_rejected_atomically_without_an_undo_step() {
-        let mut unsupported = two_layer_pdf();
-        for _ in 0..32 {
-            add_pdf_revision(&mut unsupported);
-        }
-        assert_eq!(designcraft_render::pdf_layers(&unsupported).len(), 2);
-        assert!(designcraft_render::pdf_hide_layers(&unsupported, &["Red".into()]).is_none());
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"width": 200, "height": 100, "pages": 1})).unwrap();
-        let good = place(&mut s, &two_layer_pdf(), 0.0);
-        let bad = place(&mut s, &unsupported, 100.0);
-        s.execute("object.layerOptions", &json!({"ids": [good], "hidden": ["Blue"]})).unwrap();
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert!(!s.doc().unwrap().history.redo.is_empty());
-        let before = s.execute("file.serialize", &json!({})).unwrap();
-        let undo = s.doc().unwrap().history.undo.len();
-        let redo = s.doc().unwrap().history.redo.len();
-        for ids in [json!([good, bad]), json!([bad, good])] {
-            let err = s.execute("object.layerOptions", &json!({"ids": ids, "hidden": ["Red"]})).unwrap_err();
-            assert!(err.to_string().contains("could not be hidden"));
-            assert_eq!(s.execute("file.serialize", &json!({})).unwrap(), before);
-            assert_eq!(s.doc().unwrap().history.undo.len(), undo);
-            assert_eq!(s.doc().unwrap().history.redo.len(), redo);
-            for id in [&good, &bad] {
-                assert_eq!(s.execute("object.pdfLayers", &json!({"id": id})).unwrap()[1]["visible"], true);
-            }
-        }
-        assert_eq!(pixel(&s, 75), [255, 0, 0, 255]);
-        assert_eq!(pixel(&s, 175), [255, 0, 0, 255]);
-        // A persisted/relinked choice can be unrewritable. Reset must still work.
-        let bad_id = serde_json::from_value(bad.clone()).unwrap();
-        std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc).item_mut(bad_id).unwrap().pdf_hidden_layers = vec!["Red".into()];
-        assert_eq!(pixel(&s, 175), [255, 255, 255, 255], "stale hidden content must not reappear on canvas");
-        assert!(s.execute("file.exportPdf", &json!({})).is_err());
-        s.execute("object.layerOptions", &json!({"ids": [good, bad], "hidden": []})).unwrap();
-        assert_eq!(s.execute("object.pdfLayers", &json!({"id": bad})).unwrap()[1]["visible"], true);
-        s.execute("file.exportPdf", &json!({})).unwrap();
-    }
-
-    #[test]
-    fn unreadable_non_null_prev_entries_refuse_layer_rewrites() {
-        for prev in ["7 0 R", "-1", "false", "<<>>", "[]", "/Unknown", "(unknown)"] {
-            let bytes = two_layer_pdf_options(0, "", &format!("/Prev {prev}"));
-            assert_eq!(designcraft_render::pdf_layers(&bytes).len(), 2, "reader control: {prev}");
-            assert!(designcraft_render::pdf_hide_layers(&bytes, &["Red".into()]).is_none(), "must not truncate unknown history: {prev}");
-        }
-        for trailer in ["", "/Prev null"] {
-            let bytes = two_layer_pdf_options(0, "", trailer);
-            assert!(designcraft_render::pdf_hide_layers(&bytes, &["Red".into()]).is_some(), "end-of-chain control: {trailer}");
-        }
-        let mut revised = two_layer_pdf();
-        let prev =
-            std::str::from_utf8(&revised).unwrap().rsplit_once("startxref").unwrap().1.split_whitespace().next().unwrap().parse::<usize>().unwrap();
-        add_pdf_revision(&mut revised);
-        let real_prev = std::str::from_utf8(&revised).unwrap().replace(&format!("/Prev {prev}>>"), &format!("/Prev {prev}.0>>"));
-        assert!(real_prev.contains(&format!("/Prev {prev}.0>>")));
-        for bytes in [revised, real_prev.into_bytes()] {
-            assert!(designcraft_render::pdf_hide_layers(&bytes, &["Red".into()]).is_some(), "readable integer/real history must still work");
-        }
-    }
-
-    #[test]
-    fn fake_null_trailer_cannot_bypass_hybrid_rejection() {
-        for real_guard in ["", "/XRefStm 0"] {
-            let bytes = two_layer_pdf_options(0, "", real_guard);
-            let text = std::str::from_utf8(&bytes).unwrap();
-            for fake in ["/Encrypt null", ""] {
-                let comment = format!("% trailer <</Size 9/Root 1 0 R{fake}>>\n");
-                let inside = text.replacen("xref\n", &format!("xref\n{comment}"), 1);
-                assert!(inside.contains(&format!("xref\n{comment}")));
-                // Repair-only comments inside a table are always refused, guard or not.
-                assert_eq!(designcraft_render::pdf_layers(inside.as_bytes()).len(), 2);
-                assert!(designcraft_render::pdf_hide_layers(inside.as_bytes(), &["Red".into()]).is_none());
-                // Before xref or after the dictionary, the real trailer decides.
-                let leading = text.replacen("xref\n", &format!("{comment}xref\n"), 1);
-                let trailing = text.replacen("startxref\n", &format!("{comment}startxref\n"), 1);
-                for source in [leading, trailing] {
-                    assert_eq!(designcraft_render::pdf_layers(source.as_bytes()).len(), 2);
-                    assert_eq!(designcraft_render::pdf_hide_layers(source.as_bytes(), &["Red".into()]).is_some(), real_guard.is_empty());
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn content_all_still_measures_layerless_and_stub_properties() {
-        use designcraft_doc::PdfCrop;
-        for props in ["", "/OCProperties null", "/OCProperties<<>>", "/OCProperties<</OCGs[]/D<<>>>>"] {
-            let content = "0 0 1 rg 0 0 50 100 re f";
-            let objs = [
-                format!("<</Type/Catalog/Pages 2 0 R{props}>>"),
-                "<</Type/Pages/Kids[3 0 R]/Count 1>>".into(),
-                "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Contents 4 0 R>>".into(),
-                format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
-            ];
-            let mut bytes = b"%PDF-1.7\n".to_vec();
-            let mut offsets = Vec::new();
-            for (i, body) in objs.iter().enumerate() {
-                offsets.push(bytes.len());
-                bytes.extend_from_slice(format!("{} 0 obj\n{body}\nendobj\n", i + 1).as_bytes());
-            }
-            let xref = bytes.len();
-            bytes.extend_from_slice(b"xref\n0 5\n0000000000 65535 f\r\n");
-            for at in offsets {
-                bytes.extend_from_slice(format!("{at:010} 00000 n\r\n").as_bytes());
-            }
-            bytes.extend_from_slice(format!("trailer\n<</Size 5/Root 1 0 R>>\nstartxref\n{xref}\n%%EOF\n").as_bytes());
-            assert!(designcraft_render::pdf_layers(&bytes).is_empty());
-            assert_eq!(designcraft_render::pdf_crop_box(&bytes, 0, PdfCrop::ContentAll).unwrap().1, (50.0, 100.0), "{props}");
-        }
-    }
-
-    #[test]
-    fn content_all_keeps_the_whole_page_when_layer_rewriting_is_unsupported() {
-        use designcraft_doc::PdfCrop;
-        let mut bytes = two_layer_pdf_options(0, "/BaseState/OFF/ON[5 0 R]", "");
-        assert_eq!(designcraft_render::pdf_crop_box(&bytes, 0, PdfCrop::ContentVisible).unwrap().1, (50.0, 100.0));
-        assert_eq!(designcraft_render::pdf_crop_box(&bytes, 0, PdfCrop::ContentAll).unwrap().1, (100.0, 100.0));
-        for _ in 0..32 {
-            add_pdf_revision(&mut bytes);
-        }
-        assert!(designcraft_render::pdf_hide_layers(&bytes, &[]).is_none());
-        assert_eq!(designcraft_render::pdf_crop_box(&bytes, 0, PdfCrop::ContentVisible).unwrap().1, (50.0, 100.0));
-        assert_eq!(designcraft_render::pdf_crop_box(&bytes, 0, PdfCrop::ContentAll).unwrap(), ([0.0, 0.0, 1.0, 1.0], (100.0, 100.0)));
-    }
-
-    #[test]
-    fn placed_pdf_layers_hide() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let pdf = two_layer_pdf();
-        let r = s
-            .execute("file.place", &json!({"base64": super::super::file::base64_encode(&pdf), "name": "art.pdf", "x": 100, "y": 100, "width": 100}))
-            .unwrap();
-        let id = r["id"].clone();
-        let l = s.execute("object.pdfLayers", &json!({"id": id})).unwrap();
-        assert_eq!(l.as_array().unwrap().len(), 2);
-        assert_eq!(l[0]["name"], "Blue");
-        let px = |s: &Session, x: u32| {
-            let d = s.doc().unwrap().doc.clone();
-            let mut rr = designcraft_render::Renderer::new();
-            rr.threads = 0;
-            rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap().pixel(x, 150)
-        };
-        assert!(px(&s, 125)[2] > 200 && px(&s, 175)[0] > 200, "both layers show");
-        s.execute("object.layerOptions", &json!({"ids": [id], "hidden": ["Red"]})).unwrap();
-        let right = px(&s, 175);
-        assert!(right[0] > 200 && right[1] > 200 && right[2] > 200, "the red layer is hidden: {right:?}");
-        assert!(px(&s, 125)[2] > 200, "blue still shows");
-        assert_eq!(s.execute("object.pdfLayers", &json!({"id": id})).unwrap()[1]["visible"], false);
-        // PDF export carries the choice (the graphic goes out as an image).
-        let r = s.execute("file.exportPdf", &json!({})).unwrap();
-        assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("layer")), "{r}");
-    }
-}
+pub(crate) mod tests;
diff --git a/crates/engine/src/cmd/pdflayers/tests.rs b/crates/engine/src/cmd/pdflayers/tests.rs
new file mode 100644
index 000000000..8612303e2
--- /dev/null
+++ b/crates/engine/src/cmd/pdflayers/tests.rs
@@ -0,0 +1,540 @@
+use serde_json::json;
+
+use crate::Session;
+
+/// A one-page PDF (100×100 pt) with two layers: "Blue" (left half) and "Red" (right half).
+pub(crate) fn two_layer_pdf() -> Vec<u8> {
+    two_layer_pdf_generation(0)
+}
+
+fn two_layer_pdf_generation(generation: i32) -> Vec<u8> {
+    two_layer_pdf_options(generation, "", "")
+}
+
+fn two_layer_pdf_options(generation: i32, config: &str, trailer: &str) -> Vec<u8> {
+    let content = "/OC /a BDC 0 0 1 rg 0 0 50 100 re f EMC /OC /b BDC 1 0 0 rg 50 0 50 100 re f EMC";
+    let objs = [
+        format!(
+            "<</Type/Catalog/Lang(en-GB)/Metadata 7 0 R/OutputIntents[8 0 R]/Pages 2 0 R/OCProperties<</OCGs[5 0 R 6 0 R]/D<</Order[5 0 R 6 0 R]/Name(Default)/Locked[5 0 R]{config}>>>>>>"
+        ),
+        "<</Type/Pages/Kids[3 0 R]/Count 1>>".to_string(),
+        "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<</Properties<</a 5 0 R/b 6 0 R>>>>/Contents 4 0 R>>".to_string(),
+        format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
+        "<</Type/OCG/Name(Blue)>>".to_string(),
+        "<</Type/OCG/Name(Red)>>".to_string(),
+        "<</Type/Metadata/Subtype/XML/Length 4>>\nstream\n<x/>\nendstream".to_string(),
+        "<</Type/OutputIntent/S/GTS_PDFX/OutputConditionIdentifier(Test)>>".to_string(),
+    ];
+    let mut out = b"%PDF-1.7\n".to_vec();
+    let mut offs = Vec::new();
+    for (i, o) in objs.iter().enumerate() {
+        offs.push(out.len());
+        out.extend_from_slice(format!("{} {generation} obj\n{}\nendobj\n", i + 1, o.replace(" 0 R", &format!(" {generation} R"))).as_bytes());
+    }
+    let x = out.len();
+    let mut t = format!("xref\n0 {}\n0000000000 65535 f\r\n", objs.len() + 1);
+    for o in offs {
+        t.push_str(&format!("{o:010} {generation:05} n\r\n"));
+    }
+    t.push_str(&format!("trailer\n<</Size {}/Root 1 {generation} R{trailer}>>\nstartxref\n{x}\n%%EOF\n", objs.len() + 1));
+    out.extend_from_slice(t.as_bytes());
+    out
+}
+
+#[test]
+fn pdf_layer_update_preserves_catalog_configuration_and_generations() {
+    for generation in [0, 1] {
+        let original = two_layer_pdf_generation(generation);
+        let updated = designcraft_render::pdf_hide_layers(&original, &["Red".into()]).unwrap();
+        assert_eq!(designcraft_render::pdf_layers(&updated), vec![("Blue".into(), true), ("Red".into(), false)]);
+        let appended = std::str::from_utf8(&updated[original.len()..]).unwrap();
+        for token in [
+            "/Lang(en-GB)".to_string(),
+            format!("/Metadata 7 {generation} R"),
+            format!("/OutputIntents[8 {generation} R]"),
+            format!("/Locked[5 {generation} R]"),
+            "/Name(Default)".into(),
+            format!("/Root 1 {generation} R"),
+        ] {
+            assert!(appended.contains(&token), "missing {token}: {appended}");
+        }
+        assert!(!appended.contains("9999000"));
+        let all_on = designcraft_render::pdf_hide_layers(&updated, &[]).unwrap();
+        assert!(designcraft_render::pdf_layers(&all_on).iter().all(|(_, visible)| *visible));
+    }
+}
+
+#[test]
+fn pdf_layer_update_accepts_xref_streams_and_rejects_unsupported_updates() {
+    let original = two_layer_pdf();
+    let text = std::str::from_utf8(&original).unwrap();
+    let offset: usize = text.rsplit_once("startxref").unwrap().1.split_whitespace().next().unwrap().parse().unwrap();
+    let mut stream_pdf = original[..offset].to_vec();
+    let mut entries = vec![0, 0, 0, 0, 0, 255, 255];
+    for number in 1..=9 {
+        let at = if number == 9 { offset } else { text.find(&format!("{number} 0 obj")).unwrap() };
+        entries.push(1);
+        entries.extend_from_slice(&u32::try_from(at).unwrap().to_be_bytes());
+        entries.extend_from_slice(&[0, 0]);
+    }
+    stream_pdf.extend_from_slice(format!("9 0 obj\n<</Type/XRef/Size 10/Root 1 0 R/W[1 4 2]/Length {}>>\nstream\n", entries.len()).as_bytes());
+    stream_pdf.extend_from_slice(&entries);
+    stream_pdf.extend_from_slice(format!("\nendstream\nendobj\nstartxref\n{offset}\n%%EOF\n").as_bytes());
+    let updated = designcraft_render::pdf_hide_layers(&stream_pdf, &["Red".into()]).unwrap();
+    assert_eq!(designcraft_render::pdf_layers(&updated), vec![("Blue".into(), true), ("Red".into(), false)]);
+    for unsupported in ["/Encrypt 7 0 R", "/Encrypt << /Filter /Standard >>", "/XRefStm 0"] {
+        let altered = text.replace("/Size 9", &format!("{unsupported}/Size 9"));
+        assert!(designcraft_render::pdf_hide_layers(altered.as_bytes(), &["Red".into()]).is_none());
+    }
+}
+
+#[test]
+fn pdf_layer_update_follows_forward_prev_and_rejects_cycles() {
+    let original = two_layer_pdf();
+    let text = std::str::from_utf8(&original).unwrap();
+    let first = original.len();
+    let link = |prev: usize| format!("xref\n0 1\n0000000000 65535 f\ntrailer<</Size 9/Root 1 0 R/Prev {prev:010}>>\n");
+    let main = first + link(0).len();
+    let mut forward = original.clone();
+    forward.extend_from_slice(link(main).as_bytes());
+    let old: usize = text.rsplit_once("startxref").unwrap().1.split_whitespace().next().unwrap().parse().unwrap();
+    forward.extend_from_slice(text[old..].split("startxref").next().unwrap().as_bytes());
+    forward.extend_from_slice(format!("startxref\n{first}\n%%EOF\n").as_bytes());
+    let updated = designcraft_render::pdf_hide_layers(&forward, &["Red".into()]).unwrap();
+    assert_eq!(designcraft_render::pdf_layers(&updated), vec![("Blue".into(), true), ("Red".into(), false)]);
+    let mut cyclic = original;
+    cyclic.extend_from_slice(link(first).as_bytes());
+    cyclic.extend_from_slice(format!("startxref\n{first}\n%%EOF\n").as_bytes());
+    assert!(designcraft_render::pdf_hide_layers(&cyclic, &[]).is_none());
+}
+
+fn add_pdf_revision(bytes: &mut Vec<u8>) {
+    let text = std::str::from_utf8(bytes).unwrap();
+    let prev: usize = text.rsplit_once("startxref").unwrap().1.split_whitespace().next().unwrap().parse().unwrap();
+    let xref = bytes.len();
+    bytes.extend_from_slice(
+        format!("xref\n0 1\n0000000000 65535 f\r\ntrailer\n<</Size 9/Root 1 0 R/Prev {prev}>>\nstartxref\n{xref}\n%%EOF\n").as_bytes(),
+    );
+}
+
+fn place(s: &mut Session, bytes: &[u8], x: f64) -> serde_json::Value {
+    s.execute("file.place", &json!({"base64": super::super::file::base64_encode(bytes), "name": "layers.pdf", "x": x, "y": 0, "width": 100})).unwrap()
+        ["id"]
+        .clone()
+}
+
+fn pixel(s: &Session, x: u32) -> [u8; 4] {
+    let mut renderer = designcraft_render::Renderer::new();
+    renderer.threads = 0;
+    renderer.render_page(&s.doc().unwrap().doc, &s.cache, 0, 1.0, false, &Default::default()).unwrap().pixel(x, 50)
+}
+
+#[test]
+fn null_encryption_entry_keeps_layer_editing_rendering_and_export_working() {
+    for generation in [0, 1] {
+        let bytes = two_layer_pdf_options(generation, "", "/Encrypt null");
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 100, "height": 100, "pages": 1})).unwrap();
+        let id = place(&mut s, &bytes, 0.0);
+        s.execute("object.layerOptions", &json!({"ids": [id], "hidden": ["Red"]})).unwrap();
+        assert_eq!(s.execute("object.pdfLayers", &json!({"id": id})).unwrap()[1]["visible"], false);
+        assert_eq!(pixel(&s, 25), [0, 0, 255, 255]);
+        assert_eq!(pixel(&s, 75), [255, 255, 255, 255]);
+        s.execute("file.exportPdf", &json!({})).unwrap();
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(pixel(&s, 75), [255, 0, 0, 255]);
+        s.execute("edit.redo", &json!({})).unwrap();
+        assert_eq!(pixel(&s, 75), [255, 255, 255, 255]);
+    }
+}
+
+#[test]
+fn unrewritable_layer_choices_are_rejected_atomically_without_an_undo_step() {
+    let mut unsupported = two_layer_pdf();
+    for _ in 0..32 {
+        add_pdf_revision(&mut unsupported);
+    }
+    assert_eq!(designcraft_render::pdf_layers(&unsupported).len(), 2);
+    assert!(designcraft_render::pdf_hide_layers(&unsupported, &["Red".into()]).is_none());
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 200, "height": 100, "pages": 1})).unwrap();
+    let good = place(&mut s, &two_layer_pdf(), 0.0);
+    let bad = place(&mut s, &unsupported, 100.0);
+    s.execute("object.layerOptions", &json!({"ids": [good], "hidden": ["Blue"]})).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert!(!s.doc().unwrap().history.redo.is_empty());
+    let before = s.execute("file.serialize", &json!({})).unwrap();
+    let undo = s.doc().unwrap().history.undo.len();
+    let redo = s.doc().unwrap().history.redo.len();
+    for ids in [json!([good, bad]), json!([bad, good])] {
+        let err = s.execute("object.layerOptions", &json!({"ids": ids, "hidden": ["Red"]})).unwrap_err();
+        assert!(err.to_string().contains("could not be changed"));
+        assert_eq!(s.execute("file.serialize", &json!({})).unwrap(), before);
+        assert_eq!(s.doc().unwrap().history.undo.len(), undo);
+        assert_eq!(s.doc().unwrap().history.redo.len(), redo);
+        for id in [&good, &bad] {
+            assert_eq!(s.execute("object.pdfLayers", &json!({"id": id})).unwrap()[1]["visible"], true);
+        }
+    }
+    assert_eq!(pixel(&s, 75), [255, 0, 0, 255]);
+    assert_eq!(pixel(&s, 175), [255, 0, 0, 255]);
+    // A persisted/relinked choice can be unrewritable. Reset must still work.
+    let bad_id = serde_json::from_value(bad.clone()).unwrap();
+    std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc).item_mut(bad_id).unwrap().pdf_hidden_layers = vec!["Red".into()];
+    assert_eq!(pixel(&s, 175), [255, 255, 255, 255], "stale hidden content must not reappear on canvas");
+    assert!(s.execute("file.exportPdf", &json!({})).is_err());
+    s.execute("object.layerOptions", &json!({"ids": [good, bad], "hidden": []})).unwrap();
+    assert_eq!(s.execute("object.pdfLayers", &json!({"id": bad})).unwrap()[1]["visible"], true);
+    s.execute("file.exportPdf", &json!({})).unwrap();
+}
+
+#[test]
+fn explicit_all_on_validates_an_actual_rewrite_before_editing() {
+    // 33 xref sections: the layers stay readable, but the visibility rewrite refuses the history.
+    let mut unsupported = two_layer_pdf();
+    for _ in 0..32 {
+        add_pdf_revision(&mut unsupported);
+    }
+    assert_eq!(designcraft_render::pdf_layers(&unsupported).len(), 2);
+    assert!(designcraft_render::pdf_hide_layers(&unsupported, &[]).is_none());
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 200, "height": 100, "pages": 1})).unwrap();
+    let good = place(&mut s, &two_layer_pdf(), 0.0);
+    let bad = place(&mut s, &unsupported, 100.0);
+    let before = s.execute("file.serialize", &json!({})).unwrap();
+    let undo = s.doc().unwrap().history.undo.len();
+    for ids in [json!([good, bad]), json!([bad, good]), json!([bad])] {
+        let err = s.execute("object.layerOptions", &json!({"ids": ids, "hidden": [], "useDefaults": false})).unwrap_err();
+        assert!(err.to_string().contains("could not be changed"), "{err}");
+        assert_eq!(s.execute("file.serialize", &json!({})).unwrap(), before, "rejected all-on must not edit any target");
+        assert_eq!(s.doc().unwrap().history.undo.len(), undo);
+    }
+    assert_eq!(pixel(&s, 175), [255, 0, 0, 255], "the unsupported source keeps showing its file defaults");
+    s.execute("file.exportPdf", &json!({})).unwrap();
+    // The supported source alone still accepts the explicit all-on choice.
+    s.execute("object.layerOptions", &json!({"ids": [good], "hidden": [], "useDefaults": false})).unwrap();
+    assert_eq!(s.execute("object.pdfLayers", &json!({"id": good})).unwrap()[1]["overridden"], true);
+    // Resetting to file defaults needs no variant, so it bypasses the rewrite check.
+    for reset in [json!({"ids": [good, bad], "hidden": []}), json!({"ids": [good, bad], "useDefaults": true})] {
+        s.execute("object.layerOptions", &reset).unwrap();
+        for id in [&good, &bad] {
+            assert_eq!(s.execute("object.pdfLayers", &json!({"id": id})).unwrap()[1]["overridden"], false);
+        }
+    }
+    // A stale explicit all-on choice that outlived its rewritable source still fails closed.
+    let bad_id = serde_json::from_value(bad.clone()).unwrap();
+    std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc).item_mut(bad_id).unwrap().pdf_layer_override = true;
+    assert_eq!(pixel(&s, 175), [255, 255, 255, 255], "unrewritable explicit choice must not draw the unmodified source");
+    assert!(s.execute("file.exportPdf", &json!({})).is_err());
+}
+
+#[test]
+fn unreadable_non_null_prev_entries_refuse_layer_rewrites() {
+    for prev in ["7 0 R", "-1", "false", "<<>>", "[]", "/Unknown", "(unknown)"] {
+        let bytes = two_layer_pdf_options(0, "", &format!("/Prev {prev}"));
+        assert_eq!(designcraft_render::pdf_layers(&bytes).len(), 2, "reader control: {prev}");
+        assert!(designcraft_render::pdf_hide_layers(&bytes, &["Red".into()]).is_none(), "must not truncate unknown history: {prev}");
+    }
+    for trailer in ["", "/Prev null"] {
+        let bytes = two_layer_pdf_options(0, "", trailer);
+        assert!(designcraft_render::pdf_hide_layers(&bytes, &["Red".into()]).is_some(), "end-of-chain control: {trailer}");
+    }
+    let mut revised = two_layer_pdf();
+    let prev =
+        std::str::from_utf8(&revised).unwrap().rsplit_once("startxref").unwrap().1.split_whitespace().next().unwrap().parse::<usize>().unwrap();
+    add_pdf_revision(&mut revised);
+    let real_prev = std::str::from_utf8(&revised).unwrap().replace(&format!("/Prev {prev}>>"), &format!("/Prev {prev}.0>>"));
+    assert!(real_prev.contains(&format!("/Prev {prev}.0>>")));
+    for bytes in [revised, real_prev.into_bytes()] {
+        assert!(designcraft_render::pdf_hide_layers(&bytes, &["Red".into()]).is_some(), "readable integer/real history must still work");
+    }
+}
+
+#[test]
+fn fake_null_trailer_cannot_bypass_hybrid_rejection() {
+    for real_guard in ["", "/XRefStm 0"] {
+        let bytes = two_layer_pdf_options(0, "", real_guard);
+        let text = std::str::from_utf8(&bytes).unwrap();
+        for fake in ["/Encrypt null", ""] {
+            let comment = format!("% trailer <</Size 9/Root 1 0 R{fake}>>\n");
+            let inside = text.replacen("xref\n", &format!("xref\n{comment}"), 1);
+            assert!(inside.contains(&format!("xref\n{comment}")));
+            // Repair-only comments inside a table are always refused, guard or not.
+            assert_eq!(designcraft_render::pdf_layers(inside.as_bytes()).len(), 2);
+            assert!(designcraft_render::pdf_hide_layers(inside.as_bytes(), &["Red".into()]).is_none());
+            // Before xref or after the dictionary, the real trailer decides.
+            let leading = text.replacen("xref\n", &format!("{comment}xref\n"), 1);
+            let trailing = text.replacen("startxref\n", &format!("{comment}startxref\n"), 1);
+            for source in [leading, trailing] {
+                assert_eq!(designcraft_render::pdf_layers(source.as_bytes()).len(), 2);
+                assert_eq!(designcraft_render::pdf_hide_layers(source.as_bytes(), &["Red".into()]).is_some(), real_guard.is_empty());
+            }
+        }
+    }
+}
+
+#[test]
+fn content_all_still_measures_layerless_and_stub_properties() {
+    use designcraft_doc::PdfCrop;
+    for props in ["", "/OCProperties null", "/OCProperties<<>>", "/OCProperties<</OCGs[]/D<<>>>>"] {
+        let content = "0 0 1 rg 0 0 50 100 re f";
+        let objs = [
+            format!("<</Type/Catalog/Pages 2 0 R{props}>>"),
+            "<</Type/Pages/Kids[3 0 R]/Count 1>>".into(),
+            "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Contents 4 0 R>>".into(),
+            format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
+        ];
+        let mut bytes = b"%PDF-1.7\n".to_vec();
+        let mut offsets = Vec::new();
+        for (i, body) in objs.iter().enumerate() {
+            offsets.push(bytes.len());
+            bytes.extend_from_slice(format!("{} 0 obj\n{body}\nendobj\n", i + 1).as_bytes());
+        }
+        let xref = bytes.len();
+        bytes.extend_from_slice(b"xref\n0 5\n0000000000 65535 f\r\n");
+        for at in offsets {
+            bytes.extend_from_slice(format!("{at:010} 00000 n\r\n").as_bytes());
+        }
+        bytes.extend_from_slice(format!("trailer\n<</Size 5/Root 1 0 R>>\nstartxref\n{xref}\n%%EOF\n").as_bytes());
+        assert!(designcraft_render::pdf_layers(&bytes).is_empty());
+        assert_eq!(designcraft_render::pdf_crop_box(&bytes, 0, PdfCrop::ContentAll).unwrap().1, (50.0, 100.0), "{props}");
+    }
+}
+
+#[test]
+fn content_all_keeps_the_whole_page_when_layer_rewriting_is_unsupported() {
+    use designcraft_doc::PdfCrop;
+    let mut bytes = two_layer_pdf_options(0, "/BaseState/OFF/ON[5 0 R]", "");
+    assert_eq!(designcraft_render::pdf_crop_box(&bytes, 0, PdfCrop::ContentVisible).unwrap().1, (50.0, 100.0));
+    assert_eq!(designcraft_render::pdf_crop_box(&bytes, 0, PdfCrop::ContentAll).unwrap().1, (100.0, 100.0));
+    for _ in 0..32 {
+        add_pdf_revision(&mut bytes);
+    }
+    assert!(designcraft_render::pdf_hide_layers(&bytes, &[]).is_none());
+    assert_eq!(designcraft_render::pdf_crop_box(&bytes, 0, PdfCrop::ContentVisible).unwrap().1, (50.0, 100.0));
+    assert_eq!(designcraft_render::pdf_crop_box(&bytes, 0, PdfCrop::ContentAll).unwrap(), ([0.0, 0.0, 1.0, 1.0], (100.0, 100.0)));
+}
+
+#[test]
+fn placed_pdf_layers_hide() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let pdf = two_layer_pdf();
+    let r = s
+        .execute("file.place", &json!({"base64": super::super::file::base64_encode(&pdf), "name": "art.pdf", "x": 100, "y": 100, "width": 100}))
+        .unwrap();
+    let id = r["id"].clone();
+    let l = s.execute("object.pdfLayers", &json!({"id": id})).unwrap();
+    assert_eq!(l.as_array().unwrap().len(), 2);
+    assert_eq!(l[0]["name"], "Blue");
+    let px = |s: &Session, x: u32| {
+        let d = s.doc().unwrap().doc.clone();
+        let mut rr = designcraft_render::Renderer::new();
+        rr.threads = 0;
+        rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap().pixel(x, 150)
+    };
+    assert!(px(&s, 125)[2] > 200 && px(&s, 175)[0] > 200, "both layers show");
+    s.execute("object.layerOptions", &json!({"ids": [id], "hidden": ["Red"]})).unwrap();
+    let right = px(&s, 175);
+    assert!(right[0] > 200 && right[1] > 200 && right[2] > 200, "the red layer is hidden: {right:?}");
+    assert!(px(&s, 125)[2] > 200, "blue still shows");
+    assert_eq!(s.execute("object.pdfLayers", &json!({"id": id})).unwrap()[1]["visible"], false);
+    let r = s.execute("file.exportPdf", &json!({})).unwrap();
+    assert!(r["warnings"].as_array().unwrap().is_empty(), "{r}");
+    let bytes = super::super::file::base64_decode(r["base64"].as_str().unwrap());
+    let image = designcraft_render::render_pdf_page(&bytes, 0, 792).unwrap();
+    let width = usize::from(image.width());
+    assert!(image.data()[150 * width + 125].a > 200);
+    assert_eq!(image.data()[150 * width + 175].a, 0);
+}
+#[test]
+fn placed_pdf_all_on_is_distinct_from_defaults_and_survives_exports() {
+    let pdf = designcraft_render::pdf_hide_layers(&two_layer_pdf(), &["Red".into()]).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let id = s
+        .execute("file.place", &json!({"base64": super::super::file::base64_encode(&pdf), "name":"off.pdf", "x":100,"y":100,"width":100}))
+        .unwrap()["id"]
+        .clone();
+    let visible = |s: &mut Session| s.execute("object.pdfLayers", &json!({"id": id})).unwrap()[1]["visible"].as_bool().unwrap();
+    let pixel = |s: &Session| {
+        let mut rr = designcraft_render::Renderer::new();
+        rr.threads = 0;
+        rr.render_page(&s.doc().unwrap().doc, &s.cache, 0, 1.0, false, &Default::default()).unwrap().pixel(175, 150)
+    };
+    assert!(!visible(&mut s));
+    assert!(pixel(&s)[1] > 200, "red hidden by default");
+    s.execute("object.layerOptions", &json!({"ids":[id], "hidden":[], "useDefaults":false})).unwrap();
+    assert!(visible(&mut s));
+    assert!(pixel(&s)[0] > 200 && pixel(&s)[1] < 40, "all-on renders red");
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert!(!visible(&mut s));
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert!(visible(&mut s));
+    let bytes = designcraft_format::save(&s.doc().unwrap().doc).unwrap();
+    let roundtrip = designcraft_format::load(&bytes).unwrap();
+    let item = roundtrip.item(designcraft_doc::ItemId(id.as_u64().unwrap())).unwrap();
+    assert!(item.pdf_layer_override && item.pdf_hidden_layers.is_empty());
+    let exported = s.execute("file.exportPdf", &json!({})).unwrap();
+    let bytes = super::super::file::base64_decode(exported["base64"].as_str().unwrap());
+    let raster = designcraft_render::render_pdf_page(&bytes, 0, 842).unwrap();
+    let px = raster.data().get(150 * usize::from(raster.width()) + 175).unwrap();
+    assert!(px.r > 200 && px.g < 40, "PDF export retains red: {px:?}");
+    let idml = s.execute("file.exportIdml", &json!({})).unwrap();
+    let bytes = super::super::file::base64_decode(idml["base64"].as_str().unwrap());
+    let imported = designcraft_idml::import_idml(&bytes).unwrap();
+    let pdf_asset = imported.assets.values().find(|a| designcraft_render::is_pdf(&a.data)).unwrap();
+    assert!(designcraft_render::pdf_layers(&pdf_asset.data).iter().all(|(_, on)| *on));
+    assert!(s.execute("file.exportIdml", &json!({"embedImages":false})).is_err());
+    assert_eq!(s.doc().unwrap().doc.assets.values().find(|a| a.name == "off.pdf").unwrap().data.as_slice(), pdf);
+    s.execute("object.layerOptions", &json!({"ids":[id],"hidden":[]})).unwrap();
+    assert!(!visible(&mut s), "legacy empty list still resets defaults");
+    s.execute("object.layerOptions", &json!({"ids":[id],"hidden":[],"useDefaults":false})).unwrap();
+    s.execute("object.layerOptions", &json!({"ids":[id],"useDefaults":true})).unwrap();
+    assert!(!visible(&mut s), "explicit reset restores defaults");
+}
+#[test]
+fn parent_page_choices_reach_idml_variants_and_raster_export() {
+    // Red is hidden by the file itself, so "show every layer" is a visible difference.
+    let pdf = designcraft_render::pdf_hide_layers(&two_layer_pdf(), &["Red".into()]).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 100, "height": 100, "pages": 1})).unwrap();
+    let id = s
+        .execute(
+            "file.place",
+            &json!({"base64": super::super::file::base64_encode(&pdf), "name": "on-parent.pdf", "spread": {"kind": "parent", "index": 0}, "x": 0.0, "y": 0.0, "width": 100}),
+        )
+        .unwrap()["id"]
+        .clone();
+    let item = designcraft_doc::ItemId(id.as_u64().unwrap());
+    assert!(matches!(s.doc().unwrap().doc.find(item).unwrap().spread, designcraft_doc::SpreadRef::Parent(0)), "the placement sits on a parent page");
+    s.execute("object.layerOptions", &json!({"ids": [id], "hidden": [], "useDefaults": false})).unwrap();
+    // Embedded IDML: the parent-page placement gets its own variant, like a document one.
+    let idml = s.execute("file.exportIdml", &json!({})).unwrap();
+    let imported = designcraft_idml::import_idml(&super::super::file::base64_decode(idml["base64"].as_str().unwrap())).unwrap();
+    let asset = imported.assets.values().find(|a| designcraft_render::is_pdf(&a.data)).unwrap();
+    assert!(designcraft_render::pdf_layers(&asset.data).iter().all(|(_, on)| *on), "the embedded copy shows every layer");
+    // An external-only copy would keep the original file's defaults: the choice is rejected.
+    let err = s.execute("file.exportIdml", &json!({"embedImages": false})).unwrap_err().to_string();
+    assert!(err.contains("embedded images"), "{err}");
+    // PDF/A-2b rasterises a parent-page placement with a choice, warnings included.
+    let a2b = s.execute("file.exportPdf", &json!({"standard": "a2b"})).unwrap();
+    assert!(a2b["warnings"].as_array().unwrap().iter().any(|w| w.as_str().is_some_and(|w| w.contains("exported as images"))), "{a2b}");
+}
+
+/// An object anchored in a story is a placement too: the IDML copy gets a variant that shows
+/// every layer, an external-only copy is refused, and PDF/A-2b rasterises it, rather than each
+/// quietly falling back to the file's defaults.
+#[test]
+fn an_anchored_placement_keeps_its_layer_choice_in_saves_and_exports() {
+    use designcraft_doc::{AnchoredObject, Content, Graphic, Item, Shape, SpreadRef};
+    use designcraft_geom::{Affine, Rect, shapes};
+
+    let pdf = designcraft_render::pdf_hide_layers(&two_layer_pdf(), &["Red".into()]).unwrap();
+    let mut d = designcraft_doc::Document::new(&Default::default());
+    let asset = designcraft_doc::AssetId(d.alloc());
+    d.add_asset(designcraft_doc::Asset {
+        id: asset,
+        name: "anchored.pdf".into(),
+        mime: "application/pdf".into(),
+        data: std::sync::Arc::new(pdf),
+        ..Default::default()
+    });
+    let mut item =
+        Item::new(designcraft_doc::ItemId(d.alloc()), d.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 100.0, 100.0)));
+    item.pdf_layer_override = true;
+    item.content = Content::Graphic(Graphic {
+        asset,
+        size: (100.0, 100.0),
+        xf: Affine::IDENTITY,
+        clip: None,
+        auto_fit: Default::default(),
+        fit_align: 4,
+        crop: [0.0; 4],
+        wrap: Default::default(),
+        fill: Default::default(),
+        layer_options: None,
+    });
+    let layer = d.default_layer();
+    let (_, story) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(0.0, 0.0, 80.0, 80.0), layer, "Body", Default::default()).unwrap();
+    d.story_mut(story).unwrap().insert_object(0, AnchoredObject { item, position: Default::default() });
+    assert!(d.has_pdf_layer_overrides(), "the anchored placement carries the choice");
+    let mut s = Session::new();
+    s.add_document(crate::DocState::new(d, None));
+    // Embedded IDML carries a variant that shows every layer.
+    let idml = s.execute("file.exportIdml", &json!({})).unwrap();
+    let imported = designcraft_idml::import_idml(&super::super::file::base64_decode(idml["base64"].as_str().unwrap())).unwrap();
+    let copies: Vec<_> = imported.assets.values().filter(|a| designcraft_render::is_pdf(&a.data)).collect();
+    assert!(!copies.is_empty(), "the anchored placement is exported");
+    assert!(
+        copies.iter().all(|a| designcraft_render::pdf_layers(&a.data).iter().all(|(_, on)| *on)),
+        "the embedded copy must not fall back to the file's defaults"
+    );
+    // An external-only copy would keep the original file's defaults.
+    assert!(s.execute("file.exportIdml", &json!({"embedImages": false})).is_err());
+    // PDF/A-2b rasterises a placement with a choice, warnings included.
+    let a2b = s.execute("file.exportPdf", &json!({"standard": "a2b"})).unwrap();
+    assert!(a2b["warnings"].as_array().unwrap().iter().any(|w| w.as_str().is_some_and(|w| w.contains("exported as images"))), "{a2b}");
+}
+
+/// Relinking a placed PDF to an image leaves the item's layer fields behind. They are no longer a
+/// placed-PDF choice: the package report asks for a graphic whose asset is a PDF, the same thing
+/// the export walks ask for, so it does not name the stale field, and exports run unaffected.
+#[test]
+fn a_stale_choice_on_a_non_pdf_placement_is_not_a_placed_pdf_choice() {
+    let png = designcraft_render::Rendered { width: 4, height: 3, pixels: [30, 90, 180, 255].repeat(12) }.to_png();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 200, "height": 200})).unwrap();
+    let id = s
+        .execute("file.place", &json!({"base64": super::super::file::base64_encode(&png), "name": "photo.png", "x": 0, "y": 0, "width": 100}))
+        .unwrap()["id"]
+        .clone();
+    let item = designcraft_doc::ItemId(id.as_u64().unwrap());
+    // The state a relink from a PDF leaves behind: fields set, asset no longer a PDF.
+    std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc).item_mut(item).unwrap().pdf_hidden_layers = vec!["Red".into()];
+    let d = &s.doc().unwrap().doc;
+    assert!(d.item(item).unwrap().has_pdf_layer_override(), "the stale field is on the item");
+    assert!(d.has_pdf_layer_overrides(), "the field is there");
+    assert!(!super::super::interchange::has_applicable_pdf_layer_overrides(d), "but it is not a placed-PDF choice");
+    // Nothing is dropped: the field is not a choice any export applies.
+    s.execute("file.exportIdml", &json!({})).unwrap();
+    s.execute("file.exportPdf", &json!({"standard": "a2b"})).unwrap();
+    s.execute("file.exportPdf", &json!({})).unwrap();
+}
+
+#[test]
+fn layerless_pdf_rejects_overrides_without_breaking_idml_export() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let pdf = s.execute("file.exportPdf", &json!({})).unwrap()["base64"].clone();
+    let id = s.execute("file.place", &json!({"base64":pdf,"name":"plain.pdf","x":0,"y":0,"width":100})).unwrap()["id"].clone();
+    let layered = s
+        .execute("file.place", &json!({"base64":super::super::file::base64_encode(&two_layer_pdf()),"name":"layered.pdf","x":120,"y":0,"width":100}))
+        .unwrap()["id"]
+        .clone();
+    let before = serde_json::to_value(&*s.doc().unwrap().doc).unwrap();
+    assert!(s.execute("object.layerOptions", &json!({"ids":[layered,id],"hidden":[],"useDefaults":false})).is_err());
+    assert_eq!(serde_json::to_value(&*s.doc().unwrap().doc).unwrap(), before);
+    assert!(s.execute("file.exportIdml", &json!({})).is_ok());
+    s.execute("object.layerOptions", &json!({"ids":[id],"hidden":[],"useDefaults":true})).unwrap();
+    assert!(!s.doc().unwrap().doc.item(designcraft_doc::ItemId(id.as_u64().unwrap())).unwrap().has_pdf_layer_override());
+}
+
+#[test]
+fn pdf_layer_options_ignore_non_pdf_targets_in_mixed_selection() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let placed = s
+        .execute("file.place", &json!({"base64": super::super::file::base64_encode(&two_layer_pdf()), "name":"art.pdf", "x":100,"y":100,"width":100}))
+        .unwrap();
+    let other = s.execute("frame.create", &json!({"rect":[0,0,20,20]})).unwrap();
+    for ids in [json!([other["id"], placed["id"]]), json!([placed["id"], other["id"]])] {
+        s.execute("selection.set", &json!({"ids":ids})).unwrap();
+        assert_eq!(s.execute("object.pdfLayers", &json!({})).unwrap().as_array().unwrap().len(), 2);
+    }
+    assert!(s.execute("object.pdfLayers", &json!({"id":other["id"]})).is_err(), "explicit non-PDF id remains an error");
+    s.execute("object.layerOptions", &json!({"ids":[placed["id"],other["id"]],"hidden":[],"useDefaults":false})).unwrap();
+    assert!(!s.doc().unwrap().doc.item(designcraft_doc::ItemId(other["id"].as_u64().unwrap())).unwrap().has_pdf_layer_override());
+    assert!(s.execute("object.layerOptions", &json!({"ids":[placed["id"]],"hidden":["Red"],"useDefaults":true})).is_err());
+    assert!(s.execute("object.layerOptions", &json!({"ids":[placed["id"]],"useDefaults":"false"})).is_err());
+}
diff --git a/crates/engine/src/cmd/place_text.rs b/crates/engine/src/cmd/place_text.rs
index 1053fafc0..4f9aaf1aa 100644
--- a/crates/engine/src/cmd/place_text.rs
+++ b/crates/engine/src/cmd/place_text.rs
@@ -464,318 +464,7 @@ pub(super) fn place_text(
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn place_text_file_with_autoflow() {
-        let dir = std::env::temp_dir().join(format!("dc-place-text-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("long.txt");
-        let para = "The quick brown fox jumps over the lazy dog, again and again, to fill the page. ".repeat(12);
-        std::fs::write(&path, vec![para.as_str(); 60].join("\n")).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 1})).unwrap();
-        let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "autoflow": true})).unwrap();
-        assert!(r["pagesAdded"].as_u64().unwrap() >= 2, "{r}");
-        assert_eq!(r["overset"], false);
-        let d = &s.doc().unwrap().doc;
-        let sid = StoryId(r["story"].as_u64().unwrap());
-        assert_eq!(d.story(sid).unwrap().frames.len(), d.page_count());
-        assert_eq!(d.story(sid).unwrap().paras.len(), 60);
-        // Into the insertion point of another frame.
-        let fr = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Start  end"})).unwrap();
-        let sid2 = fr["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid2, "anchor": 6, "focus": 6})).unwrap();
-        let small = dir.join("small.rtf");
-        std::fs::write(&small, br"{\rtf1 {\b middle}}").unwrap();
-        s.execute("file.place", &json!({"path": small.to_string_lossy()})).unwrap();
-        let st = s.doc().unwrap().doc.story(StoryId(sid2)).unwrap().clone();
-        assert_eq!(st.text, "Start middle end");
-        assert_eq!(st.format_after(6).over.font_style.as_deref(), Some("Bold"));
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn autoflow_sets_one_frame_per_column() {
-        // Regression (#625): autoflow set one frame across the margins, over the gutter.
-        let dir = std::env::temp_dir().join(format!("dc-place-columns-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("long.txt");
-        let para = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12);
-        std::fs::write(&path, vec![para.as_str(); 40].join("\n")).unwrap();
-        for binding in ["leftToRight", "rightToLeft"] {
-            let mut s = Session::new();
-            s.execute("file.new", &json!({"preset": "Letter", "pages": 1, "columns": 2, "gutter": 18, "margins": 54})).unwrap();
-            s.execute("layout.documentSetup", &json!({"binding": binding})).unwrap();
-            let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "page": 1, "autoflow": true})).unwrap();
-            assert_eq!(r["overset"], false, "{r}");
-            let d = &s.doc().unwrap().doc;
-            let frames = &d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames;
-            assert!(d.page_count() >= 3, "{binding}: {r}");
-            // Two frames on every page but maybe the last, in column order, each on its column.
-            assert!(frames.len() > 2 * (d.page_count() - 1), "{binding}: {} frames", frames.len());
-            for (i, f) in frames.iter().enumerate() {
-                let page = d.page_of_item(*f).unwrap();
-                assert_eq!(page, i / 2, "{binding}: frame {i}");
-                let mut cols = d.page(page).unwrap().column_rects();
-                if binding == "rightToLeft" {
-                    cols.reverse();
-                }
-                assert_eq!(d.item(*f).unwrap().bounds(), cols[i % 2], "{binding}: frame {i}");
-            }
-        }
-        // One column: one frame on the live area per page, as before.
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"preset": "Letter", "pages": 1, "margins": 54})).unwrap();
-        let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "page": 1, "autoflow": true})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let frames = &d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames;
-        assert_eq!(frames.len(), d.page_count());
-        for f in frames {
-            assert_eq!(d.item(*f).unwrap().bounds(), d.page(d.page_of_item(*f).unwrap()).unwrap().margin_rect());
-        }
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    /// Autoflow follows dragged column guides: one frame per dragged column, on the first page and
-    /// on every page it adds.
-    #[test]
-    fn autoflow_sets_frames_on_dragged_columns() {
-        let dir = std::env::temp_dir().join(format!("dc-place-dragged-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("long.txt");
-        std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 40].join("\n")).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"preset": "Letter", "pages": 1, "columns": 2, "gutter": 18, "margins": 54})).unwrap();
-        // The margin box is 504 pt wide; the gutter is dragged left. There is no command for
-        // dragging a column guide yet, so set what an import would leave, on the parent.
-        let dragged = designcraft_doc::Columns { count: 2, gutter: 18.0, positions: Some(vec![0.0, 150.0, 170.0, 504.0]) };
-        s.edit(|d, _| {
-            for pg in &mut std::sync::Arc::make_mut(&mut d.parents[0]).pages {
-                pg.columns = dragged.clone();
-            }
-            d.sync_parent_margins();
-            Ok(())
-        })
-        .unwrap();
-        let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "page": 1, "autoflow": true})).unwrap();
-        assert_eq!(r["overset"], false, "{r}");
-        let d = &s.doc().unwrap().doc;
-        assert!(d.page_count() >= 3, "{r}");
-        let frames = &d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames;
-        assert!(frames.len() > 2 * (d.page_count() - 1), "{} frames", frames.len());
-        for (i, f) in frames.iter().enumerate() {
-            let page = d.page_of_item(*f).unwrap();
-            assert_eq!(page, i / 2, "frame {i}");
-            let m = d.page(page).unwrap().margin_rect();
-            let (x0, x1) = [(0.0, 150.0), (170.0, 504.0)][i % 2];
-            assert_eq!(d.item(*f).unwrap().bounds(), Rect::new(m.x0 + x0, m.y0, m.x0 + x1, m.y1), "frame {i}");
-        }
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn autoflow_keeps_the_frame_the_user_drew() {
-        let dir = std::env::temp_dir().join(format!("dc-place-drawn-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("long.txt");
-        std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 30].join("\n")).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"preset": "Letter", "pages": 1, "columns": 2, "gutter": 18, "margins": 54})).unwrap();
-        let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "rect": [100, 100, 400, 300], "autoflow": true})).unwrap();
-        assert_eq!(r["overset"], false, "{r}");
-        let d = &s.doc().unwrap().doc;
-        let frames = &d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames;
-        assert_eq!(d.item(frames[0]).unwrap().bounds(), Rect::new(100.0, 100.0, 400.0, 300.0));
-        let cols = d.page(1).unwrap().column_rects();
-        assert_eq!(d.page_of_item(frames[1]), Some(1));
-        assert_eq!(d.item(frames[1]).unwrap().bounds(), cols[0]);
-        assert_eq!(d.item(frames[2]).unwrap().bounds(), cols[1]);
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    /// A facing-pages document with two columns, its inside margin wider than the outside one, so
-    /// left and right pages have their columns in different places. A graphic frame sits on the
-    /// page `marker` (0-based). Returns the session and the marker's id.
-    fn facing_document(pages: usize, marker: usize) -> (Session, u64) {
-        let mut s = Session::new();
-        let margins = json!({"top": 54, "bottom": 54, "inside": 72, "outside": 36});
-        s.execute("file.new", &json!({"preset": "Letter", "pages": pages, "facingPages": true, "columns": 2, "gutter": 18, "margins": margins}))
-            .unwrap();
-        let d = &s.doc().unwrap().doc;
-        let (si, _) = d.page_loc(marker).unwrap();
-        let m = d.page(marker).unwrap().margin_rect();
-        let rect = [m.x0 + 20.0, m.y0 + 20.0, m.x0 + 120.0, m.y0 + 120.0];
-        let id = s.execute("frame.create", &json!({"rect": rect, "spread": si, "content": "unassigned"})).unwrap()["id"].as_u64().unwrap();
-        // Selected, an empty frame would take the placed text.
-        s.execute("edit.deselectAll", &json!({})).unwrap();
-        (s, id)
-    }
-
-    /// Every frame of the story on the column of its page, the story running through the pages in
-    /// order, two frames a page.
-    fn assert_frames_in_columns(d: &Document, frames: &[designcraft_doc::ItemId]) {
-        for (i, f) in frames.iter().enumerate() {
-            let page = d.page_of_item(*f).unwrap();
-            assert_eq!(page, i / 2, "frame {i}");
-            assert_eq!(d.item(*f).unwrap().bounds(), d.page(page).unwrap().column_rects()[i % 2], "frame {i}");
-        }
-    }
-
-    #[test]
-    fn autoflow_fills_the_pages_that_follow_before_adding_any() {
-        // Gap 26: autoflow inserted pages after the first frame's page, in front of the empty
-        // pages the document already had. InDesign threads frames on those first.
-        let dir = std::env::temp_dir().join(format!("dc-place-following-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("long.txt");
-        std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 24].join("\n")).unwrap();
-        let (mut s, marker) = facing_document(6, 2);
-        let ids: Vec<_> = (0..6).map(|i| s.doc().unwrap().doc.page(i).unwrap().id).collect();
-        let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "page": 1, "autoflow": true})).unwrap();
-        assert_eq!(r["overset"], false, "{r}");
-        assert_eq!(r["pagesAdded"], 0, "{r}");
-        let d = &s.doc().unwrap().doc;
-        assert_eq!((0..d.page_count()).map(|i| d.page(i).unwrap().id).collect::<Vec<_>>(), ids);
-        let sid = StoryId(r["story"].as_u64().unwrap());
-        let frames = d.story(sid).unwrap().frames.clone();
-        // Past page 3, which holds the marker: frames go on a page whatever else it holds.
-        assert!(d.page_of_item(*frames.last().unwrap()).unwrap() > 2, "{} frames", frames.len());
-        assert_frames_in_columns(d, &frames);
-        // The text ends before the document does: no empty frame after it.
-        let cs = designcraft_compose::compose_story(d, sid, &Default::default());
-        assert!(frames.iter().all(|f| cs.frame(*f).is_some_and(|ft| !ft.range.is_empty())));
-        assert!(d.page_of_item(*frames.last().unwrap()).unwrap() < 5);
-        assert_eq!(d.page_of_item(designcraft_doc::ItemId(marker)), Some(2));
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn autoflow_adds_pages_at_the_end_of_the_document() {
-        let dir = std::env::temp_dir().join(format!("dc-place-end-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("long.txt");
-        std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 60].join("\n")).unwrap();
-        let (mut s, marker) = facing_document(3, 2);
-        let ids: Vec<_> = (0..3).map(|i| s.doc().unwrap().doc.page(i).unwrap().id).collect();
-        let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "page": 1, "autoflow": true})).unwrap();
-        assert_eq!(r["overset"], false, "{r}");
-        let d = &s.doc().unwrap().doc;
-        assert!(d.page_count() > 4, "{r}");
-        assert_eq!(r["pagesAdded"].as_u64(), Some(d.page_count() as u64 - 3), "{r}");
-        // The document's own pages come first, the added ones after the last of them.
-        assert_eq!((0..3).map(|i| d.page(i).unwrap().id).collect::<Vec<_>>(), ids);
-        assert_eq!(d.page_of_item(designcraft_doc::ItemId(marker)), Some(2));
-        let frames = d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames.clone();
-        assert_frames_in_columns(d, &frames);
-        assert_eq!(d.page_of_item(*frames.last().unwrap()), Some(d.page_count() - 1));
-        // One undo step takes the frames, the pages and the story away.
-        s.execute("edit.undo", &json!({})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        assert_eq!((0..d.page_count()).map(|i| d.page(i).unwrap().id).collect::<Vec<_>>(), ids);
-        assert!(d.story(StoryId(r["story"].as_u64().unwrap())).is_none());
-        assert_eq!(d.spreads.iter().map(|sp| sp.items.len()).sum::<usize>(), 1);
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn autoflow_fills_every_column_of_a_following_page() {
-        // A first frame across the whole live area holds twice what a column does, so autoflow
-        // asks for half the frames it needs. Asked page by page, it left the later columns of a
-        // page out of the thread and went on to the next page.
-        let dir = std::env::temp_dir().join(format!("dc-place-under-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("long.txt");
-        std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 30].join("\n")).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"preset": "Letter", "pages": 6, "facingPages": false, "columns": 2, "gutter": 18, "margins": 54})).unwrap();
-        let m = s.doc().unwrap().doc.page(0).unwrap().margin_rect();
-        let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "rect": [m.x0, m.y0, m.x1, m.y1], "autoflow": true})).unwrap();
-        assert_eq!(r["overset"], false, "{r}");
-        assert_eq!(r["pagesAdded"], 0, "{r}");
-        let d = &s.doc().unwrap().doc;
-        let frames = &d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames;
-        assert_eq!(d.item(frames[0]).unwrap().bounds(), m);
-        assert!(d.page_of_item(*frames.last().unwrap()).unwrap() >= 3, "{} frames", frames.len());
-        for (k, f) in frames[1..].iter().enumerate() {
-            let page = d.page_of_item(*f).unwrap();
-            assert_eq!(page, 1 + k / 2, "frame {}", k + 1);
-            assert_eq!(d.item(*f).unwrap().bounds(), d.page(page).unwrap().column_rects()[k % 2], "frame {}", k + 1);
-        }
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn autoflow_leaves_no_empty_frame_on_the_pages_that_follow() {
-        // A small first frame makes autoflow ask for more frames than the columns need; the ones
-        // it set on the following pages past the end of the text go again, the pages stay.
-        let dir = std::env::temp_dir().join(format!("dc-place-small-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("long.txt");
-        std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 12].join("\n")).unwrap();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"preset": "Letter", "pages": 8, "facingPages": false, "margins": 54})).unwrap();
-        let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "rect": [100, 100, 200, 130], "autoflow": true})).unwrap();
-        assert_eq!(r["overset"], false, "{r}");
-        assert_eq!(r["pagesAdded"], 0, "{r}");
-        let d = &s.doc().unwrap().doc;
-        assert_eq!(d.page_count(), 8);
-        let sid = StoryId(r["story"].as_u64().unwrap());
-        let frames = &d.story(sid).unwrap().frames;
-        assert!(frames.len() >= 2, "{r}");
-        let cs = designcraft_compose::compose_story(d, sid, &Default::default());
-        assert!(frames.iter().all(|f| cs.frame(*f).is_some_and(|ft| !ft.range.is_empty())), "{} frames", frames.len());
-        assert_eq!(d.spreads.iter().map(|sp| sp.items.len()).sum::<usize>(), frames.len());
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn autoflow_adds_only_the_pages_breaks_ask_for() {
-        // Regression (#262): a frame a break ends early made autoflow take it for a frame that
-        // holds a few characters, and add a page per few characters left (33 for this text).
-        let dir = std::env::temp_dir().join(format!("dc-place-breaks-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        for (name, rtf, pages) in [
-            ("lead.rtf", r"{\rtf1 \page\par A Short Heading\par First short paragraph.\par Second short paragraph.\par}", 2),
-            ("each.rtf", r"{\rtf1 One\par\page\par Two\par\page\par Three\par\page\par Four\par}", 4),
-        ] {
-            let path = dir.join(name);
-            std::fs::write(&path, rtf).unwrap();
-            let mut s = Session::new();
-            s.execute("file.new", &json!({"pages": 1})).unwrap();
-            let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "autoflow": true})).unwrap();
-            assert_eq!(r["overset"], false, "{name}: {r}");
-            let d = &s.doc().unwrap().doc;
-            assert_eq!(d.page_count(), pages, "{name}: {r}");
-            assert_eq!(d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames.len(), pages, "{name}");
-        }
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn autoflow_adds_the_pages_odd_and_even_page_breaks_ask_for() {
-        // From page 1, an odd page break needs pages 2 and 3 (2 stays empty), an even one page 2.
-        // A frame such a break ends early holds few characters; taken for a full frame, it made
-        // autoflow add a page per few characters left.
-        use designcraft_doc::{EVEN_PAGE_BREAK, ODD_PAGE_BREAK, build::NewDocument};
-        for (brk, added) in [(ODD_PAGE_BREAK, 2), (EVEN_PAGE_BREAK, 1)] {
-            let mut d = Document::new(&NewDocument { pages: 1, facing_pages: false, primary_text_frame: true, ..Default::default() });
-            let sid = d.settings.primary_story.unwrap();
-            d.story_mut(sid).unwrap().insert(
-                0,
-                &format!(
-                    "a{brk}
-{}",
-                    "word ".repeat(200)
-                ),
-            );
-            assert_eq!(autoflow(&mut d, sid, 50, "file.place", false).unwrap(), added, "{brk:?}");
-            assert_eq!(d.page_count(), added + 1, "{brk:?}");
-            assert_eq!(designcraft_compose::compose_story(&d, sid, &Default::default()).overset_at, None, "{brk:?}");
-        }
-    }
-}
+mod tests;
 
 #[cfg(test)]
 mod place_pdf_tests {
diff --git a/crates/engine/src/cmd/place_text/tests.rs b/crates/engine/src/cmd/place_text/tests.rs
new file mode 100644
index 000000000..006762ab2
--- /dev/null
+++ b/crates/engine/src/cmd/place_text/tests.rs
@@ -0,0 +1,309 @@
+use super::*;
+
+#[test]
+fn place_text_file_with_autoflow() {
+    let dir = std::env::temp_dir().join(format!("dc-place-text-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("long.txt");
+    let para = "The quick brown fox jumps over the lazy dog, again and again, to fill the page. ".repeat(12);
+    std::fs::write(&path, vec![para.as_str(); 60].join("\n")).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 1})).unwrap();
+    let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "autoflow": true})).unwrap();
+    assert!(r["pagesAdded"].as_u64().unwrap() >= 2, "{r}");
+    assert_eq!(r["overset"], false);
+    let d = &s.doc().unwrap().doc;
+    let sid = StoryId(r["story"].as_u64().unwrap());
+    assert_eq!(d.story(sid).unwrap().frames.len(), d.page_count());
+    assert_eq!(d.story(sid).unwrap().paras.len(), 60);
+    // Into the insertion point of another frame.
+    let fr = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Start  end"})).unwrap();
+    let sid2 = fr["story"].as_u64().unwrap();
+    s.execute("text.select", &json!({"story": sid2, "anchor": 6, "focus": 6})).unwrap();
+    let small = dir.join("small.rtf");
+    std::fs::write(&small, br"{\rtf1 {\b middle}}").unwrap();
+    s.execute("file.place", &json!({"path": small.to_string_lossy()})).unwrap();
+    let st = s.doc().unwrap().doc.story(StoryId(sid2)).unwrap().clone();
+    assert_eq!(st.text, "Start middle end");
+    assert_eq!(st.format_after(6).over.font_style.as_deref(), Some("Bold"));
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn autoflow_sets_one_frame_per_column() {
+    // Regression (#625): autoflow set one frame across the margins, over the gutter.
+    let dir = std::env::temp_dir().join(format!("dc-place-columns-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("long.txt");
+    let para = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12);
+    std::fs::write(&path, vec![para.as_str(); 40].join("\n")).unwrap();
+    for binding in ["leftToRight", "rightToLeft"] {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"preset": "Letter", "pages": 1, "columns": 2, "gutter": 18, "margins": 54})).unwrap();
+        s.execute("layout.documentSetup", &json!({"binding": binding})).unwrap();
+        let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "page": 1, "autoflow": true})).unwrap();
+        assert_eq!(r["overset"], false, "{r}");
+        let d = &s.doc().unwrap().doc;
+        let frames = &d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames;
+        assert!(d.page_count() >= 3, "{binding}: {r}");
+        // Two frames on every page but maybe the last, in column order, each on its column.
+        assert!(frames.len() > 2 * (d.page_count() - 1), "{binding}: {} frames", frames.len());
+        for (i, f) in frames.iter().enumerate() {
+            let page = d.page_of_item(*f).unwrap();
+            assert_eq!(page, i / 2, "{binding}: frame {i}");
+            let mut cols = d.page(page).unwrap().column_rects();
+            if binding == "rightToLeft" {
+                cols.reverse();
+            }
+            assert_eq!(d.item(*f).unwrap().bounds(), cols[i % 2], "{binding}: frame {i}");
+        }
+    }
+    // One column: one frame on the live area per page, as before.
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"preset": "Letter", "pages": 1, "margins": 54})).unwrap();
+    let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "page": 1, "autoflow": true})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    let frames = &d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames;
+    assert_eq!(frames.len(), d.page_count());
+    for f in frames {
+        assert_eq!(d.item(*f).unwrap().bounds(), d.page(d.page_of_item(*f).unwrap()).unwrap().margin_rect());
+    }
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// Autoflow follows dragged column guides: one frame per dragged column, on the first page and
+/// on every page it adds.
+#[test]
+fn autoflow_sets_frames_on_dragged_columns() {
+    let dir = std::env::temp_dir().join(format!("dc-place-dragged-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("long.txt");
+    std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 40].join("\n")).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"preset": "Letter", "pages": 1, "columns": 2, "gutter": 18, "margins": 54})).unwrap();
+    // The margin box is 504 pt wide; the gutter is dragged left. There is no command for
+    // dragging a column guide yet, so set what an import would leave, on the parent.
+    let dragged = designcraft_doc::Columns { count: 2, gutter: 18.0, positions: Some(vec![0.0, 150.0, 170.0, 504.0]) };
+    s.edit(|d, _| {
+        for pg in &mut std::sync::Arc::make_mut(&mut d.parents[0]).pages {
+            pg.columns = dragged.clone();
+        }
+        d.sync_parent_margins();
+        Ok(())
+    })
+    .unwrap();
+    let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "page": 1, "autoflow": true})).unwrap();
+    assert_eq!(r["overset"], false, "{r}");
+    let d = &s.doc().unwrap().doc;
+    assert!(d.page_count() >= 3, "{r}");
+    let frames = &d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames;
+    assert!(frames.len() > 2 * (d.page_count() - 1), "{} frames", frames.len());
+    for (i, f) in frames.iter().enumerate() {
+        let page = d.page_of_item(*f).unwrap();
+        assert_eq!(page, i / 2, "frame {i}");
+        let m = d.page(page).unwrap().margin_rect();
+        let (x0, x1) = [(0.0, 150.0), (170.0, 504.0)][i % 2];
+        assert_eq!(d.item(*f).unwrap().bounds(), Rect::new(m.x0 + x0, m.y0, m.x0 + x1, m.y1), "frame {i}");
+    }
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn autoflow_keeps_the_frame_the_user_drew() {
+    let dir = std::env::temp_dir().join(format!("dc-place-drawn-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("long.txt");
+    std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 30].join("\n")).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"preset": "Letter", "pages": 1, "columns": 2, "gutter": 18, "margins": 54})).unwrap();
+    let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "rect": [100, 100, 400, 300], "autoflow": true})).unwrap();
+    assert_eq!(r["overset"], false, "{r}");
+    let d = &s.doc().unwrap().doc;
+    let frames = &d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames;
+    assert_eq!(d.item(frames[0]).unwrap().bounds(), Rect::new(100.0, 100.0, 400.0, 300.0));
+    let cols = d.page(1).unwrap().column_rects();
+    assert_eq!(d.page_of_item(frames[1]), Some(1));
+    assert_eq!(d.item(frames[1]).unwrap().bounds(), cols[0]);
+    assert_eq!(d.item(frames[2]).unwrap().bounds(), cols[1]);
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// A facing-pages document with two columns, its inside margin wider than the outside one, so
+/// left and right pages have their columns in different places. A graphic frame sits on the
+/// page `marker` (0-based). Returns the session and the marker's id.
+fn facing_document(pages: usize, marker: usize) -> (Session, u64) {
+    let mut s = Session::new();
+    let margins = json!({"top": 54, "bottom": 54, "inside": 72, "outside": 36});
+    s.execute("file.new", &json!({"preset": "Letter", "pages": pages, "facingPages": true, "columns": 2, "gutter": 18, "margins": margins})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    let (si, _) = d.page_loc(marker).unwrap();
+    let m = d.page(marker).unwrap().margin_rect();
+    let rect = [m.x0 + 20.0, m.y0 + 20.0, m.x0 + 120.0, m.y0 + 120.0];
+    let id = s.execute("frame.create", &json!({"rect": rect, "spread": si, "content": "unassigned"})).unwrap()["id"].as_u64().unwrap();
+    // Selected, an empty frame would take the placed text.
+    s.execute("edit.deselectAll", &json!({})).unwrap();
+    (s, id)
+}
+
+/// Every frame of the story on the column of its page, the story running through the pages in
+/// order, two frames a page.
+fn assert_frames_in_columns(d: &Document, frames: &[designcraft_doc::ItemId]) {
+    for (i, f) in frames.iter().enumerate() {
+        let page = d.page_of_item(*f).unwrap();
+        assert_eq!(page, i / 2, "frame {i}");
+        assert_eq!(d.item(*f).unwrap().bounds(), d.page(page).unwrap().column_rects()[i % 2], "frame {i}");
+    }
+}
+
+#[test]
+fn autoflow_fills_the_pages_that_follow_before_adding_any() {
+    // Gap 26: autoflow inserted pages after the first frame's page, in front of the empty
+    // pages the document already had. InDesign threads frames on those first.
+    let dir = std::env::temp_dir().join(format!("dc-place-following-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("long.txt");
+    std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 24].join("\n")).unwrap();
+    let (mut s, marker) = facing_document(6, 2);
+    let ids: Vec<_> = (0..6).map(|i| s.doc().unwrap().doc.page(i).unwrap().id).collect();
+    let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "page": 1, "autoflow": true})).unwrap();
+    assert_eq!(r["overset"], false, "{r}");
+    assert_eq!(r["pagesAdded"], 0, "{r}");
+    let d = &s.doc().unwrap().doc;
+    assert_eq!((0..d.page_count()).map(|i| d.page(i).unwrap().id).collect::<Vec<_>>(), ids);
+    let sid = StoryId(r["story"].as_u64().unwrap());
+    let frames = d.story(sid).unwrap().frames.clone();
+    // Past page 3, which holds the marker: frames go on a page whatever else it holds.
+    assert!(d.page_of_item(*frames.last().unwrap()).unwrap() > 2, "{} frames", frames.len());
+    assert_frames_in_columns(d, &frames);
+    // The text ends before the document does: no empty frame after it.
+    let cs = designcraft_compose::compose_story(d, sid, &Default::default());
+    assert!(frames.iter().all(|f| cs.frame(*f).is_some_and(|ft| !ft.range.is_empty())));
+    assert!(d.page_of_item(*frames.last().unwrap()).unwrap() < 5);
+    assert_eq!(d.page_of_item(designcraft_doc::ItemId(marker)), Some(2));
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn autoflow_adds_pages_at_the_end_of_the_document() {
+    let dir = std::env::temp_dir().join(format!("dc-place-end-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("long.txt");
+    std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 60].join("\n")).unwrap();
+    let (mut s, marker) = facing_document(3, 2);
+    let ids: Vec<_> = (0..3).map(|i| s.doc().unwrap().doc.page(i).unwrap().id).collect();
+    let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "page": 1, "autoflow": true})).unwrap();
+    assert_eq!(r["overset"], false, "{r}");
+    let d = &s.doc().unwrap().doc;
+    assert!(d.page_count() > 4, "{r}");
+    assert_eq!(r["pagesAdded"].as_u64(), Some(d.page_count() as u64 - 3), "{r}");
+    // The document's own pages come first, the added ones after the last of them.
+    assert_eq!((0..3).map(|i| d.page(i).unwrap().id).collect::<Vec<_>>(), ids);
+    assert_eq!(d.page_of_item(designcraft_doc::ItemId(marker)), Some(2));
+    let frames = d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames.clone();
+    assert_frames_in_columns(d, &frames);
+    assert_eq!(d.page_of_item(*frames.last().unwrap()), Some(d.page_count() - 1));
+    // One undo step takes the frames, the pages and the story away.
+    s.execute("edit.undo", &json!({})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    assert_eq!((0..d.page_count()).map(|i| d.page(i).unwrap().id).collect::<Vec<_>>(), ids);
+    assert!(d.story(StoryId(r["story"].as_u64().unwrap())).is_none());
+    assert_eq!(d.spreads.iter().map(|sp| sp.items.len()).sum::<usize>(), 1);
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn autoflow_fills_every_column_of_a_following_page() {
+    // A first frame across the whole live area holds twice what a column does, so autoflow
+    // asks for half the frames it needs. Asked page by page, it left the later columns of a
+    // page out of the thread and went on to the next page.
+    let dir = std::env::temp_dir().join(format!("dc-place-under-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("long.txt");
+    std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 30].join("\n")).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"preset": "Letter", "pages": 6, "facingPages": false, "columns": 2, "gutter": 18, "margins": 54})).unwrap();
+    let m = s.doc().unwrap().doc.page(0).unwrap().margin_rect();
+    let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "rect": [m.x0, m.y0, m.x1, m.y1], "autoflow": true})).unwrap();
+    assert_eq!(r["overset"], false, "{r}");
+    assert_eq!(r["pagesAdded"], 0, "{r}");
+    let d = &s.doc().unwrap().doc;
+    let frames = &d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames;
+    assert_eq!(d.item(frames[0]).unwrap().bounds(), m);
+    assert!(d.page_of_item(*frames.last().unwrap()).unwrap() >= 3, "{} frames", frames.len());
+    for (k, f) in frames[1..].iter().enumerate() {
+        let page = d.page_of_item(*f).unwrap();
+        assert_eq!(page, 1 + k / 2, "frame {}", k + 1);
+        assert_eq!(d.item(*f).unwrap().bounds(), d.page(page).unwrap().column_rects()[k % 2], "frame {}", k + 1);
+    }
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn autoflow_leaves_no_empty_frame_on_the_pages_that_follow() {
+    // A small first frame makes autoflow ask for more frames than the columns need; the ones
+    // it set on the following pages past the end of the text go again, the pages stay.
+    let dir = std::env::temp_dir().join(format!("dc-place-small-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("long.txt");
+    std::fs::write(&path, vec!["Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(12); 12].join("\n")).unwrap();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"preset": "Letter", "pages": 8, "facingPages": false, "margins": 54})).unwrap();
+    let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "rect": [100, 100, 200, 130], "autoflow": true})).unwrap();
+    assert_eq!(r["overset"], false, "{r}");
+    assert_eq!(r["pagesAdded"], 0, "{r}");
+    let d = &s.doc().unwrap().doc;
+    assert_eq!(d.page_count(), 8);
+    let sid = StoryId(r["story"].as_u64().unwrap());
+    let frames = &d.story(sid).unwrap().frames;
+    assert!(frames.len() >= 2, "{r}");
+    let cs = designcraft_compose::compose_story(d, sid, &Default::default());
+    assert!(frames.iter().all(|f| cs.frame(*f).is_some_and(|ft| !ft.range.is_empty())), "{} frames", frames.len());
+    assert_eq!(d.spreads.iter().map(|sp| sp.items.len()).sum::<usize>(), frames.len());
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn autoflow_adds_only_the_pages_breaks_ask_for() {
+    // Regression (#262): a frame a break ends early made autoflow take it for a frame that
+    // holds a few characters, and add a page per few characters left (33 for this text).
+    let dir = std::env::temp_dir().join(format!("dc-place-breaks-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    for (name, rtf, pages) in [
+        ("lead.rtf", r"{\rtf1 \page\par A Short Heading\par First short paragraph.\par Second short paragraph.\par}", 2),
+        ("each.rtf", r"{\rtf1 One\par\page\par Two\par\page\par Three\par\page\par Four\par}", 4),
+    ] {
+        let path = dir.join(name);
+        std::fs::write(&path, rtf).unwrap();
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 1})).unwrap();
+        let r = s.execute("file.place", &json!({"path": path.to_string_lossy(), "autoflow": true})).unwrap();
+        assert_eq!(r["overset"], false, "{name}: {r}");
+        let d = &s.doc().unwrap().doc;
+        assert_eq!(d.page_count(), pages, "{name}: {r}");
+        assert_eq!(d.story(StoryId(r["story"].as_u64().unwrap())).unwrap().frames.len(), pages, "{name}");
+    }
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn autoflow_adds_the_pages_odd_and_even_page_breaks_ask_for() {
+    // From page 1, an odd page break needs pages 2 and 3 (2 stays empty), an even one page 2.
+    // A frame such a break ends early holds few characters; taken for a full frame, it made
+    // autoflow add a page per few characters left.
+    use designcraft_doc::{EVEN_PAGE_BREAK, ODD_PAGE_BREAK, build::NewDocument};
+    for (brk, added) in [(ODD_PAGE_BREAK, 2), (EVEN_PAGE_BREAK, 1)] {
+        let mut d = Document::new(&NewDocument { pages: 1, facing_pages: false, primary_text_frame: true, ..Default::default() });
+        let sid = d.settings.primary_story.unwrap();
+        d.story_mut(sid).unwrap().insert(
+            0,
+            &format!(
+                "a{brk}
+{}",
+                "word ".repeat(200)
+            ),
+        );
+        assert_eq!(autoflow(&mut d, sid, 50, "file.place", false).unwrap(), added, "{brk:?}");
+        assert_eq!(d.page_count(), added + 1, "{brk:?}");
+        assert_eq!(designcraft_compose::compose_story(&d, sid, &Default::default()).overset_at, None, "{brk:?}");
+    }
+}
diff --git a/crates/engine/src/cmd/preflight.rs b/crates/engine/src/cmd/preflight.rs
index 19d64c1fc..390dc7118 100644
--- a/crates/engine/src/cmd/preflight.rs
+++ b/crates/engine/src/cmd/preflight.rs
@@ -249,6 +249,17 @@ pub fn check(s: &Session, min_ppi: f64) -> Vec<Issue> {
             let xf = parent * it.xf;
             pending.extend(it.children().iter().rev().map(|child| (child.as_ref(), xf)));
             let page = page_of(d, SpreadRef::Doc(si), it, parent);
+            if let Content::Graphic(g) = &it.content
+                && g.layer_options.as_ref().is_some_and(designcraft_doc::GraphicLayerOptions::has_visibility_overrides)
+            {
+                out.push(Issue {
+                    severity: "warning",
+                    kind: "unsupportedGraphicLayers",
+                    message: designcraft_doc::GRAPHIC_LAYER_RENDERING_WARNING.into(),
+                    item: Some(it.id.0),
+                    page,
+                });
+            }
             match &it.content {
                 Content::Graphic(g) => match d.assets.get(&g.asset) {
                     None => out.push(Issue { severity: "error", kind: "missingLink", message: "Missing graphic".into(), item: Some(it.id.0), page }),
@@ -307,6 +318,17 @@ pub fn check(s: &Session, min_ppi: f64) -> Vec<Issue> {
             }
         }
     }
+    // Nested graphic cells and anchored/parent items may not have a page frame
+    // in the walk above. Keep the warning visible after a native save/reopen.
+    if d.has_unwalked_graphic_layer_visibility_overrides() {
+        out.push(Issue {
+            severity: "warning",
+            kind: "unsupportedGraphicLayers",
+            message: designcraft_doc::GRAPHIC_LAYER_RENDERING_WARNING.into(),
+            item: None,
+            page: None,
+        });
+    }
     out
 }
 
@@ -354,11 +376,16 @@ mod placed_vector_tests {
         s.execute("file.place", &json!({"base64": base64_encode(&png), "name": "photo.jpg", "x": 72, "y": 72, "width": 20})).unwrap();
         let doc = std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc);
         let asset = doc.assets.values_mut().next().unwrap();
-        std::sync::Arc::make_mut(asset).link = Some("/definitely/missing dir/photo.jpg".into());
+        // On Windows, `/x` names no drive, so `document_path` refuses it when the document has no path. `TMPDIR` can be
+        // relative on macOS and Linux, so the temporary folder is made absolute.
+        let temp = std::path::absolute(std::env::temp_dir()).unwrap();
+        let link = temp.join(format!("dc-preflight-missing-{} dir", std::process::id())).join("photo.jpg");
+        let link = link.to_string_lossy().into_owned();
+        std::sync::Arc::make_mut(asset).link = Some(link.clone());
         let r = s.execute("preflight.run", &json!({})).unwrap();
         let missing: Vec<&str> =
             r["issues"].as_array().unwrap().iter().filter(|i| i["kind"] == "missingLink").map(|i| i["message"].as_str().unwrap()).collect();
-        assert_eq!(missing, ["Missing link: /definitely/missing dir/photo.jpg"]);
+        assert_eq!(missing, [format!("Missing link: {link}")]);
     }
 }
 
diff --git a/crates/engine/src/cmd/prepress.rs b/crates/engine/src/cmd/prepress.rs
new file mode 100644
index 000000000..4eb15a6eb
--- /dev/null
+++ b/crates/engine/src/cmd/prepress.rs
@@ -0,0 +1,96 @@
+//! Window › Output › Separations Preview, for automation: the plates a spread's print PDF
+//! prints, with ink coverage and the areas over an ink limit.
+
+use serde_json::{Value, json};
+
+use super::{CommandSpec, bad, cmd, has_doc};
+use crate::{Result, Session};
+
+const ID: &str = "ink.separations";
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![cmd!(query "ink.separations", "Separations Preview", [], None,
+        "{page?: 1-based page position (default 1; its spread is separated), dpi?: 9–300 (default 72), inkLimit?: percent, standard?: none|x4|a2b, compressImages?: bool, flatten?: high|medium|low|ppi (as file.exportPdf)} — the spread exported as Export PDF prints it and separated → {spread, dpi, width, height, conversion, inks: [{name, spot, max, mean, area} (percent)], unseparated: [spot names past 32], maxTotal, maxTotalAt?: [x, y] (pt, spread), overLimit?: {limit, pixels, regions: [{x, y, width, height}] (pt, spread)}, warnings}",
+        has_doc, separations)]
+}
+
+fn separations(s: &mut Session, p: &Value) -> Result<Value> {
+    let st = s.doc()?;
+    let d = &st.doc;
+    let page = match p.get("page") {
+        None | Some(Value::Null) => 0,
+        Some(v) => v
+            .as_u64()
+            .and_then(|n| usize::try_from(n).ok())
+            .filter(|n| (1..=d.page_count()).contains(n))
+            .map(|n| n - 1)
+            .ok_or_else(|| bad(ID, format!("bad page {v}")))?,
+    };
+    let (si, _) = d.page_loc(page).ok_or_else(|| bad(ID, "the document has no pages"))?;
+    let dpi = match p.get("dpi") {
+        None | Some(Value::Null) => 72.0,
+        Some(v) => v
+            .as_f64()
+            .filter(|v| (f64::from(crate::separations::MIN_DPI)..=f64::from(crate::separations::MAX_DPI)).contains(v))
+            .ok_or_else(|| bad(ID, "`dpi`: 9–300"))? as f32,
+    };
+    let limit = match p.get("inkLimit") {
+        None | Some(Value::Null) => None,
+        Some(v) => Some(v.as_f64().filter(|v| v.is_finite() && *v >= 0.0).ok_or_else(|| bad(ID, "`inkLimit`: a percentage"))? as f32),
+    };
+    let standard = match super::str_param(p, "standard") {
+        Some(v) => designcraft_pdf::Standard::parse(v).ok_or_else(|| bad(ID, format!("unknown standard `{v}` (none, x4, a2b)")))?,
+        None => designcraft_pdf::Standard::None,
+    };
+    let print = crate::separations::Print {
+        standard,
+        compress_images: p.get("compressImages").and_then(Value::as_bool).unwrap_or(false),
+        flatten: super::export::flatten_ppi(ID, p)?,
+    };
+    let sheet = crate::separations::separate(d, &s.cache, si, dpi, &print)?;
+    let pl = &sheet.plates;
+    let stats = pl.stats(&[]);
+    let inks: Vec<Value> = pl
+        .inks
+        .iter()
+        .zip(&stats.inks)
+        .map(|((_, ink), st)| json!({"name": ink.name(), "spot": ink.is_spot(), "max": st.max, "mean": st.mean, "area": st.area}))
+        .collect();
+    let conversion = match &pl.conversion {
+        craft_prepress::Conversion::OutputIntent { profile, .. } => format!("output intent: {profile}"),
+        craft_prepress::Conversion::Fallback { profile } => profile.clone(),
+        craft_prepress::Conversion::DeviceFormulas => "device formulas".into(),
+        // `Conversion` is non-exhaustive; a later craft-prepress conversion reports its debug form.
+        other => format!("{other:?}"),
+    };
+    let pt = |x: u32, y: u32| {
+        let p = sheet.to_spread(x, y);
+        [p.x, p.y]
+    };
+    let mut out = json!({
+        "spread": si,
+        "dpi": pl.dpi,
+        "width": pl.width,
+        "height": pl.height,
+        "conversion": conversion,
+        "inks": inks,
+        "unseparated": pl.unseparated,
+        "maxTotal": stats.max_total,
+        "maxTotalAt": stats.max_total_at.map(|(x, y)| pt(x, y)),
+        "warnings": sheet.warnings,
+    });
+    if let Some(limit) = limit {
+        let above = pl.above(limit, &[]);
+        let k = 72.0 / f64::from(pl.dpi.max(f32::MIN_POSITIVE));
+        let regions: Vec<Value> = above
+            .regions()
+            .iter()
+            .map(|r| {
+                let [x, y] = pt(r.x, r.y);
+                json!({"x": x, "y": y, "width": f64::from(r.width) * k, "height": f64::from(r.height) * k})
+            })
+            .collect();
+        out["overLimit"] = json!({"limit": limit, "pixels": above.count, "regions": regions});
+    }
+    Ok(out)
+}
diff --git a/crates/engine/src/cmd/print.rs b/crates/engine/src/cmd/print.rs
index 0bb280780..e71c230de 100644
--- a/crates/engine/src/cmd/print.rs
+++ b/crates/engine/src/cmd/print.rs
@@ -5,8 +5,6 @@ use serde_json::{Value, json};
 #[cfg(not(target_arch = "wasm32"))]
 use super::str_param;
 use super::{CommandSpec, bad, cmd, has_doc};
-#[cfg(not(target_arch = "wasm32"))]
-use crate::EngineError;
 use crate::{Result, Session};
 
 pub fn specs() -> Vec<CommandSpec> {
@@ -17,7 +15,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Print…",
             ["File"],
             Some("Cmd+P"),
-            "{printer?, copies?: 1, pages?: \"1-3,5\", spreads?, marks?, bleed?, dryRun?: bool (export and preview submission without printing), created?: int (Unix seconds, as file.exportPdf)} → {printer, copies, pages, command, bytes}",
+            "{printer?, copies?: 1, pages?: \"1-3,5\", dryRun?: bool (export and preview submission without printing), …the PDF settings of file.exportPdf (the PDF it writes is what prints)} → {printer, copies, pages, command, bytes, warnings}",
             has_doc,
             print
         ),
@@ -58,12 +56,14 @@ fn print_with(
         ..craft_print::Job::default()
     };
     let dry = p.get("dryRun").and_then(Value::as_bool).unwrap_or(false);
-    let pdf = designcraft_pdf::export_pdf(&super::interchange::with_pdf_boxes(d), &s.cache, &opts).map_err(|e| EngineError::Other(e.to_string()))?;
-    let command = craft_print::command_preview(&job).map_err(|e| bad("file.print", e.to_string()))?;
     let pages = opts.pages.as_ref().map_or(d.page_count(), |v| v.len());
-    let out = json!({"printer": job.printer, "copies": copies, "pages": pages, "command": command, "bytes": pdf.len()});
+    // The PDF that Export PDF writes with these settings.
+    let pdf = super::export::pdf_export(s, p)?;
+    let command = craft_print::command_preview(&job).map_err(|e| bad("file.print", e.to_string()))?;
+    let out =
+        json!({"printer": job.printer, "copies": copies, "pages": pages, "command": command, "bytes": pdf.bytes.len(), "warnings": pdf.warnings});
     if !dry {
-        submit(&pdf, &job).map_err(|e| bad("file.print", e.to_string()))?;
+        submit(&pdf.bytes, &job).map_err(|e| bad("file.print", e.to_string()))?;
     }
     Ok(out)
 }
@@ -84,7 +84,10 @@ mod tests {
             assert!(command.contains(&"print-scaling=auto-fit"));
             assert!(!command.iter().any(|a| a.starts_with("sides=")));
         } else {
-            assert_eq!(command[0], "powershell");
+            assert_eq!(
+                command,
+                ["xps-print", "printer=Office", "copies=2", "collate=true", "duplex=(queue default)", "scaling=shrink-to-fit", "color=color"]
+            );
         }
         assert!(r["bytes"].as_u64().unwrap() > 500);
         assert!(s.execute("file.print", &json!({"pages": "9", "dryRun": true})).is_err());
@@ -97,11 +100,7 @@ mod tests {
         s.execute("file.new", &json!({"pages": 4})).unwrap();
         // A fixed creation date: both exports would otherwise take the clock's second.
         let params = json!({"printer": "Office (east)", "copies": 2, "pages": "2-3", "marks": true, "bleed": true, "created": 1_700_000_000});
-        let expected = {
-            let d = &s.doc().unwrap().doc;
-            let options = super::super::export::options(&params, d.page_count()).unwrap();
-            designcraft_pdf::export_pdf(&super::super::interchange::with_pdf_boxes(d), &s.cache, &options).unwrap()
-        };
+        let expected = super::super::export::pdf_export(&s, &params).unwrap().bytes;
         let r = print_with(&mut s, &params, |pdf, job| {
             // The production export options and full bytes reach the shared spooler boundary.
             assert_eq!(pdf, expected);
@@ -121,4 +120,34 @@ mod tests {
         assert!(print_with(&mut s, &json!({"pages": "9"}), |_, _| panic!("invalid ranges must not spool")).is_err());
         assert!(print_with(&mut s, &json!({"created": "today"}), |_, _| panic!("an invalid date must not spool")).is_err());
     }
+
+    /// File › Print spools the PDF that File › Export PDF writes with the same settings: soft
+    /// effects as images, CMYK print color, the same warnings.
+    #[test]
+    fn print_spools_what_export_pdf_writes() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let id = s.execute("frame.create", &json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].clone();
+        s.execute("object.fill", &json!({"ids": [id], "swatch": "C=100 M=0 Y=0 K=0"})).unwrap();
+        s.execute("object.dropShadow", &json!({"ids": [id], "on": true, "distance": 8, "size": 6})).unwrap();
+        let params = json!({"standard": "x4"});
+        // The creation date is in whole seconds: an attempt can straddle a second boundary.
+        let mut matched = false;
+        for _ in 0..3 {
+            let exported = s.execute("file.exportPdf", &params).unwrap();
+            let mut printed = Vec::new();
+            let r = print_with(&mut s, &params, |pdf, _| {
+                printed = pdf.to_vec();
+                Ok("request id is Office-1".into())
+            })
+            .unwrap();
+            assert_eq!(r["warnings"], exported["warnings"]);
+            assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("soft effects")), "{r}");
+            if printed == super::super::file::base64_decode(exported["base64"].as_str().unwrap()) {
+                matched = true;
+                break;
+            }
+        }
+        assert!(matched, "File › Print spools Export PDF's bytes");
+    }
 }
diff --git a/crates/engine/src/cmd/style.rs b/crates/engine/src/cmd/style.rs
index d1bd06ad0..4cc8a5894 100644
--- a/crates/engine/src/cmd/style.rs
+++ b/crates/engine/src/cmd/style.rs
@@ -1,203 +1,5 @@
 //! Paragraph / character styles and swatches.
 
-#[cfg(test)]
-mod redefine_tests {
-    use super::*;
-
-    fn sample() -> (Session, Value, Value) {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let a = s.execute("frame.create", &json!({"rect":[36,36,300,200],"content":"text","text":"First header"})).unwrap();
-        let b = s.execute("frame.create", &json!({"rect":[36,240,300,400],"content":"text","text":"Second header"})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name":"Header","chars":{"size":18,"fill":"[Paper]"}})).unwrap();
-        for story in [&a["story"], &b["story"]] {
-            s.execute("text.select", &json!({"story":story,"anchor":0,"focus":5})).unwrap();
-            s.execute("style.paragraph.apply", &json!({"name":"Header"})).unwrap();
-        }
-        s.execute("text.select", &json!({"story":a["story"],"anchor":0,"focus":5})).unwrap();
-        (s, a["story"].clone(), b["story"].clone())
-    }
-
-    #[test]
-    fn redefine_paragraph_updates_other_stories_and_clears_the_source_overrides() {
-        let (mut s, a, b) = sample();
-        s.execute("style.character.create", &json!({"name":"Emphasis","chars":{"underline":true}})).unwrap();
-        s.execute("style.character.apply", &json!({"name":"Emphasis"})).unwrap();
-        s.execute("type.char", &json!({"size":20,"fill":"[Black]"})).unwrap();
-        s.execute("type.para", &json!({"spaceAfter":9})).unwrap();
-        let before = s.doc().unwrap().doc.clone();
-        let undo = s.doc().unwrap().history.undo.len();
-        s.execute("style.paragraph.redefine", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1);
-        assert!(s.doc().unwrap().doc.styles.para("Header").unwrap().chars.underline.is_none());
-        for story in [&a, &b] {
-            s.execute("text.select", &json!({"story":story,"anchor":0,"focus":5})).unwrap();
-            let attrs = s.execute("type.selectionAttrs", &json!({})).unwrap();
-            assert_eq!(attrs["chars"]["size"], 20.0);
-            assert_eq!(attrs["chars"]["fill"], "[Black]");
-            assert_eq!(attrs["para"]["spaceAfter"], 9.0);
-            assert_eq!(attrs["chars"]["underline"], story == &a);
-        }
-        s.execute("style.paragraph.edit", &json!({"name":"Header","chars":{"size":22}})).unwrap();
-        s.execute("text.select", &json!({"story":a,"anchor":0,"focus":5})).unwrap();
-        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["size"], 22.0);
-        s.execute("edit.undo", &json!({})).unwrap();
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().doc, before);
-    }
-
-    #[test]
-    fn redefine_character_does_not_capture_paragraph_font_size() {
-        let (mut s, a, b) = sample();
-        s.execute("style.character.create", &json!({"name":"Underline","chars":{"underline":true}})).unwrap();
-        for story in [&a, &b] {
-            s.execute("text.select", &json!({"story":story,"anchor":0,"focus":5})).unwrap();
-            s.execute("style.character.apply", &json!({"name":"Underline"})).unwrap();
-        }
-        s.execute("type.char", &json!({"fill":"[Black]"})).unwrap();
-        s.execute("style.character.redefine", &json!({"name":"Underline"})).unwrap();
-        let style = s.doc().unwrap().doc.styles.char_style("Underline").unwrap();
-        assert!(style.chars.size.is_none());
-        assert_eq!(style.chars.underline, Some(true));
-        for story in [&a, &b] {
-            s.execute("text.select", &json!({"story":story,"anchor":0,"focus":5})).unwrap();
-            assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fill"], "[Black]");
-        }
-    }
-
-    #[test]
-    fn redefine_rejects_the_wrong_style_and_the_none_entry_atomically() {
-        let (mut s, _, _) = sample();
-        let before = s.doc().unwrap().doc.clone();
-        let undo = s.doc().unwrap().history.undo.len();
-        assert!(s.execute("style.paragraph.redefine", &json!({"name":"Other"})).is_err());
-        assert!(s.execute("style.character.redefine", &json!({})).is_err());
-        assert_eq!(s.doc().unwrap().doc, before);
-        assert_eq!(s.doc().unwrap().history.undo.len(), undo);
-    }
-
-    #[test]
-    fn redefine_character_at_a_caret_cleans_the_source_run_but_keeps_other_overrides() {
-        let (mut s, story, _) = sample();
-        s.execute("style.character.create", &json!({"name":"Emphasis","chars":{"underline":true}})).unwrap();
-        for (start, end, size) in [(0, 5, 24), (6, 12, 32)] {
-            s.execute("text.select", &json!({"story":story,"anchor":start,"focus":end})).unwrap();
-            s.execute("style.character.apply", &json!({"name":"Emphasis"})).unwrap();
-            s.execute("type.char", &json!({"size":size})).unwrap();
-        }
-        let before = s.doc().unwrap().doc.clone();
-        s.execute("text.select", &json!({"story":story,"anchor":2,"focus":2})).unwrap();
-        s.execute("style.character.redefine", &json!({"name":"Emphasis"})).unwrap();
-        s.execute("style.character.edit", &json!({"name":"Emphasis","chars":{"size":30}})).unwrap();
-        for (start, end, size) in [(0, 5, 30.0), (6, 12, 32.0)] {
-            s.execute("text.select", &json!({"story":story,"anchor":start,"focus":end})).unwrap();
-            assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["size"], size);
-        }
-        s.execute("edit.undo", &json!({})).unwrap();
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().doc, before);
-    }
-}
-
-#[cfg(test)]
-mod application_inheritance_tests {
-    use super::*;
-
-    fn setup(text: &str) -> (Session, Value) {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let f = s.execute("frame.create", &json!({"rect": [36,36,300,300], "content": "text", "text": text})).unwrap();
-        (s, f["story"].clone())
-    }
-    fn select(s: &mut Session, story: &Value, start: usize, end: usize) {
-        s.execute("text.select", &json!({"story": story, "anchor": start, "focus": end})).unwrap();
-    }
-    fn attrs(s: &mut Session) -> Value {
-        s.execute("type.selectionAttrs", &json!({})).unwrap()
-    }
-
-    #[test]
-    fn paragraph_capture_source_follows_later_style_edits_and_undo() {
-        let (mut s, story) = setup("First\nSecond");
-        select(&mut s, &story, 0, 5);
-        s.execute("type.char", &json!({"size": 18, "fill": "[Paper]"})).unwrap();
-        s.execute("type.para", &json!({"spaceAfter": 6})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Header", "fromSelection": true})).unwrap();
-        let before = s.doc().unwrap().doc.clone();
-        let undo = s.doc().unwrap().history.undo.len();
-        s.execute("style.paragraph.apply", &json!({"name": "Header"})).unwrap();
-        assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().doc, before);
-        s.execute("edit.redo", &json!({})).unwrap();
-        select(&mut s, &story, 6, 6);
-        s.execute("style.paragraph.apply", &json!({"name": "Header"})).unwrap();
-        s.execute("style.paragraph.edit", &json!({"name": "Header", "chars": {"size": 20, "fill": "[Black]"}, "para": {"spaceAfter": 12}})).unwrap();
-        for pos in [0, 6] {
-            select(&mut s, &story, pos, pos + 1);
-            let a = attrs(&mut s);
-            assert_eq!(a["chars"]["size"], 20.0);
-            assert_eq!(a["chars"]["fill"], "[Black]");
-            assert_eq!(a["para"]["spaceAfter"], 12.0);
-        }
-    }
-
-    #[test]
-    fn applying_styles_keeps_different_overrides_and_named_character_styles() {
-        let (mut s, story) = setup("First\nSecond");
-        select(&mut s, &story, 0, 5);
-        s.execute("type.char", &json!({"size": 14})).unwrap();
-        s.execute("type.para", &json!({"spaceAfter": 9})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Emphasis", "chars": {"underline": true}})).unwrap();
-        s.execute("style.character.apply", &json!({"name": "Emphasis"})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Body", "chars": {"size": 10}, "para": {"spaceAfter": 6}})).unwrap();
-        s.execute("style.paragraph.apply", &json!({"name": "Body"})).unwrap();
-        let a = attrs(&mut s);
-        assert_eq!(a["chars"]["size"], 14.0);
-        assert_eq!(a["para"]["spaceAfter"], 9.0);
-        assert_eq!(a["characterStyle"], "Emphasis");
-        assert_eq!(a["chars"]["underline"], true);
-    }
-
-    #[test]
-    fn character_capture_source_remains_sparse_and_follows_style_edits() {
-        let (mut s, story) = setup("First\nSecond");
-        select(&mut s, &story, 0, 5);
-        s.execute("type.char", &json!({"underline": true})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Emphasis", "fromSelection": true})).unwrap();
-        s.execute("style.character.apply", &json!({"name": "Emphasis"})).unwrap();
-        s.execute("style.character.edit", &json!({"name": "Emphasis", "chars": {"underline": false}})).unwrap();
-        assert_eq!(attrs(&mut s)["chars"]["underline"], false);
-        assert!(s.doc().unwrap().doc.styles.char_style("Emphasis").unwrap().chars.size.is_none());
-        s.execute("style.paragraph.edit", &json!({"name": designcraft_doc::BASIC_PARAGRAPH, "chars": {"size": 20}})).unwrap();
-        assert_eq!(attrs(&mut s)["chars"]["size"], 20.0);
-    }
-
-    #[test]
-    fn paragraph_selection_excludes_the_next_paragraph_at_its_start() {
-        let (mut s, story) = setup("é\nNext");
-        select(&mut s, &story, 0, 3);
-        s.execute("style.paragraph.create", &json!({"name": "Header"})).unwrap();
-        s.execute("style.paragraph.apply", &json!({"name": "Header", "clearOverrides": true})).unwrap();
-        select(&mut s, &story, 3, 4);
-        assert_eq!(attrs(&mut s)["paragraphStyle"], designcraft_doc::BASIC_PARAGRAPH);
-        select(&mut s, &story, 0, 2);
-        assert_eq!(attrs(&mut s)["paragraphStyle"], "Header");
-    }
-
-    #[test]
-    fn clearing_a_partial_selection_preserves_character_overrides_outside_it() {
-        let (mut s, story) = setup("First Second");
-        select(&mut s, &story, 0, 12);
-        s.execute("type.char", &json!({"size": 18})).unwrap();
-        select(&mut s, &story, 0, 5);
-        s.execute("style.paragraph.apply", &json!({"name": designcraft_doc::BASIC_PARAGRAPH, "clearOverrides": true})).unwrap();
-        assert_ne!(attrs(&mut s)["chars"]["size"], 18.0);
-        select(&mut s, &story, 6, 12);
-        assert_eq!(attrs(&mut s)["chars"]["size"], 18.0);
-    }
-}
-
 use designcraft_color::{Swatch, SwatchValue};
 use designcraft_doc::{CharAttrs, CharacterStyle, Effects, Item, ObjectStyle, ParaAttrs, ParagraphStyle, Styles};
 use serde_json::{Value, json};
@@ -205,6 +7,20 @@ use serde_json::{Value, json};
 use super::{CommandSpec, bad, cmd, has_doc, has_text_or_frames, ok, str_param};
 use crate::{Result, Session};
 
+mod color;
+mod object;
+mod paragraph;
+mod swatches;
+
+use color::{apply_color, apply_gradient, has_text_or_selection, sample_color};
+use object::{apply_object, clear_object_overrides, create_object, edit_object};
+use paragraph::{
+    apply_char, apply_para, create_char, create_para, delete_char, delete_para, edit_char, edit_para, export_tag_key, group_styles, redefine,
+};
+pub(crate) use paragraph::{check_grep_styles, grep_style_warnings};
+pub use swatches::parse_color;
+use swatches::{add_to_swatches, create_swatch, load_swatches, new_swatch, save_swatches, swatch_options};
+
 pub fn specs() -> Vec<CommandSpec> {
     vec![
         cmd!(query "style.compositeFont.list", "List Composite Fonts", [], None, "{} → composite font definitions", has_doc, |s, _| {
@@ -249,7 +65,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Export Tagging",
             [],
             None,
-            "{style, character?: bool, tag?: p|h1…h6|blockquote|pre|li|… (span|em|strong|code|sup|sub… for characters; \"\" = automatic), class?} → the tagging",
+            "{style, character?: bool, tag?: p|h1…h6|blockquote|pre|li|… (span|em|strong|code|sup|sub… for characters; \"\" = automatic), class?, split?: bool (paragraphs: Split Document, EPUB only)} → the tagging",
             has_doc,
             |s, p| {
                 let name = str_param(p, "style").ok_or_else(|| bad("style.exportTag", "`style` required"))?.to_string();
@@ -258,8 +74,12 @@ pub fn specs() -> Vec<CommandSpec> {
                 if !exists {
                     return Err(bad("style.exportTag", format!("no style `{name}`")));
                 }
-                let key = format!("{}:{name}", if character { "c" } else { "p" });
+                let key = export_tag_key(!character, &name);
                 let (tag, class) = (str_param(p, "tag").map(str::to_string), str_param(p, "class").map(str::to_string));
+                let split = p.get("split").and_then(Value::as_bool);
+                if character && split == Some(true) {
+                    return Err(bad("style.exportTag", "`split` is for paragraph styles"));
+                }
                 s.edit(|d, _| {
                     let st = d.styles_mut();
                     let e = st.export_tags.entry(key.clone()).or_default();
@@ -269,8 +89,11 @@ pub fn specs() -> Vec<CommandSpec> {
                     if let Some(c) = class.clone() {
                         e.class = c;
                     }
+                    if let Some(v) = split {
+                        e.split = v;
+                    }
                     let out = serde_json::to_value(&*e).unwrap_or_default();
-                    if e.tag.is_empty() && e.class.is_empty() {
+                    if *e == designcraft_doc::ExportTag::default() {
                         st.export_tags.remove(&key);
                     }
                     Ok(out)
@@ -302,7 +125,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "New Paragraph Style…",
             [],
             None,
-            "{name, basedOn?, nextStyle?, para?: {paragraph attributes, as type.para names them: align, leftIndent, firstLineIndent, spaceBefore, spaceAfter, …; startAt?: null = continue numbering; grepStyles?: [{style, pattern}]: a pattern that can't compile is an error}, chars?: {character attributes, as type.char names them: fontFamily, fontStyle, size, leading, tracking, fill, …}, fromSelection?: bool}",
+            "{name, basedOn?, nextStyle?, para?: {paragraph attributes, as type.para names them: align, leftIndent, firstLineIndent, spaceBefore, spaceAfter, ignoreOpticalMargin, …; startAt?: null = continue numbering; grepStyles?: [{style, pattern}]: a pattern that can't compile is an error}, chars?: {character attributes, as type.char names them: fontFamily, fontStyle, size, leading, tracking, fill, …}, fromSelection?: bool}",
             has_doc,
             create_para
         ),
@@ -311,7 +134,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Paragraph Style Options…",
             [],
             None,
-            "{name, rename?, basedOn?, nextStyle?, para?: {paragraph attributes, as type.para names them: align, leftIndent, spaceBefore, …; ruleAbove?/ruleBelow?: only the named rule fields change; startAt?: null = continue numbering; kinsoku?: set | null (default rules); a grepStyles pattern that can't compile is an error}, chars?: {character attributes, as type.char names them: fontFamily, fontStyle, size, leading, tracking, fill, …}}",
+            "{name, rename?, basedOn?, nextStyle?, para?: {paragraph attributes, as type.para names them: align, leftIndent, spaceBefore, ignoreOpticalMargin, …; ruleAbove?/ruleBelow?: only the named rule fields change; startAt?: null = continue numbering; kinsoku?: set | null (default rules); a grepStyles pattern that can't compile is an error}, chars?: {character attributes, as type.char names them: fontFamily, fontStyle, size, leading, tracking, fill, …}}",
             has_doc,
             edit_para
         ),
@@ -404,7 +227,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Gradient",
             [],
             None,
-            "{kind?: linear|radial, stops?: [{location: 0–100, color: \"#rrggbb\"|{c,m,y,k}(0..100)|[r,g,b](0..255)|{model: rgb|cmyk|gray, …}(0..1) | swatch: name (its colour, as dropped on the Gradient panel), opacity?: 0–100, midpoint?: 13–87}], reverse?: bool, angle?: degrees, from?: [x,y], to?: [x,y] (spread coords: the Gradient Swatch tool's drag), target?: fill|stroke, ids?} → {swatch, kind, stops} — edits the fill's (or the stroke's) gradient (an unnamed gradient unless it equals a gradient swatch)",
+            "{kind?: linear|radial, stops?: [{location: 0–100, color: \"#rrggbb\"|{c,m,y,k}(0..100)|[r,g,b](0..255)|{model: rgb|cmyk|gray, …}(0..1) | swatch: a color swatch's name (as dropped on the Gradient panel: its color on screen, its inks in print), opacity?: 0–100, midpoint?: 13–87}], reverse?: bool, angle?: degrees, from?: [x,y], to?: [x,y] (spread coords: the Gradient Swatch tool's drag), target?: fill|stroke, ids?} → {swatch, kind, stops: [{location, color, swatch?, opacity, midpoint}]} — edits the fill's (or the stroke's) gradient (an unnamed gradient unless it equals a gradient swatch)",
             super::has_selection,
             apply_gradient
         ),
@@ -490,6 +313,7 @@ pub fn specs() -> Vec<CommandSpec> {
                     return Err(bad("swatch.delete", "special swatches can't be deleted"));
                 }
                 d.swatches.retain(|w| w.name != name);
+                d.forget_gradient_stop_swatch(&name);
                 for g in &mut d.color_groups {
                     g.swatches.retain(|w| *w != name);
                 }
@@ -498,13 +322,14 @@ pub fn specs() -> Vec<CommandSpec> {
         }),
         cmd!(query "ink.list", "Ink Manager", [], None, "{} → {allToProcess, inks: [{name, process: bool (printed as process), alias?}]} — the spot inks", has_doc, |s, _| {
             let d = &s.doc()?.doc;
+            let inks = designcraft_pdf::inks::ink_set(d);
             let inks: Vec<Value> = d
                 .swatches
                 .iter()
                 .filter(|w| matches!(w.value, designcraft_color::swatch::SwatchValue::Color { color_type: designcraft_color::swatch::ColorType::Spot, .. }))
                 .map(|w| {
                     let alias = d.inks.aliases.iter().find(|(a, _)| *a == w.name).map(|(_, t)| t.clone());
-                    json!({"name": w.name, "process": d.inks.resolve(&w.name).1, "alias": alias})
+                    json!({"name": w.name, "process": designcraft_pdf::inks::spot_output(d, &inks, &w.name).1, "alias": alias})
                 })
                 .collect();
             Ok(json!({"allToProcess": d.inks.all_to_process, "inks": inks}))
@@ -550,6 +375,13 @@ pub fn specs() -> Vec<CommandSpec> {
                         }
                         match alias {
                             Some(Value::String(to)) => {
+                                let mut set = designcraft_pdf::inks::ink_set(d);
+                                let ids = (set.lookup(name), set.lookup(&to));
+                                if let (Some(from), Some(target)) = ids
+                                    && !set.alias(from, target)
+                                {
+                                    return Err(bad("ink.options", format!("aliasing `{name}` to `{to}` would make a loop")));
+                                }
                                 d.inks.aliases.retain(|(a, _)| a != name);
                                 d.inks.aliases.push((name.clone(), to));
                             }
@@ -649,2921 +481,8 @@ pub fn specs() -> Vec<CommandSpec> {
     ]
 }
 
-/// The `group` (`chars`, `para`) object of command `cmd`'s params as attributes; a bad attribute
-/// is that command's parameter error, naming the group.
-fn attrs<T: Default>(cmd: &str, group: &str, p: &Value, set: impl Fn(&mut T, &str, &Value) -> std::result::Result<(), String>) -> Result<T> {
-    let mut a = T::default();
-    match p.get(group) {
-        None | Some(Value::Null) => {}
-        Some(Value::Object(o)) => {
-            for (k, v) in o {
-                set(&mut a, k, v).map_err(|e| bad(cmd, format!("{group}: {e}")))?;
-            }
-        }
-        Some(_) => return Err(bad(cmd, format!("{group} must be an object of attributes"))),
-    }
-    Ok(a)
-}
-
-fn redefine(s: &mut Session, p: &Value, paragraph: bool) -> Result<Value> {
-    let command = if paragraph { "style.paragraph.redefine" } else { "style.character.redefine" };
-    let targets = super::text::format_targets_pub(s);
-    let target = targets.first().ok_or_else(|| bad(command, "select text using the style to redefine"))?;
-    let state = s.doc()?;
-    let story = state.doc.text_story(target.story, target.cell).ok_or(designcraft_doc::DocError::NoStory(target.story))?;
-    let pf = story.paras.get(story.para_at(target.range.start)).ok_or_else(|| bad(command, "no paragraph at the selection"))?;
-    let cf = super::text::effective_char_format(s, target)?;
-    let selected = if paragraph { &pf.style } else { &cf.style };
-    let name = str_param(p, "name").unwrap_or(selected).to_string();
-    if name != *selected || name == if paragraph { designcraft_doc::NO_PARA_STYLE } else { designcraft_doc::NO_CHAR_STYLE } {
-        return Err(bad(command, "select text using the named style; the no-style entry cannot be redefined"));
-    }
-    let (base_para, base_chars) = state.doc.styles.resolve_para_style(&pf.style);
-    let (resolved_para, paragraph_chars) = state.doc.styles.resolve_para(pf);
-    let para_changes = base_para.delta(&resolved_para);
-    let mut current = if paragraph {
-        paragraph_chars.clone()
-    } else {
-        state.doc.styles.resolve_char(&paragraph_chars, &designcraft_doc::CharFormat { style: name.clone(), over: CharAttrs::default() })
-    };
-    let inherited = if paragraph { base_chars } else { current.clone() };
-    // A named character style is an intentional layer, not a paragraph override to absorb.
-    current.apply(&cf.over);
-    let char_changes = inherited.delta(&current);
-    let result = s.edit(|d, _| {
-        if paragraph {
-            let style = d.styles_mut().para_mut(&name).ok_or_else(|| bad(command, "paragraph style no longer exists"))?;
-            style.para.merge(&para_changes);
-            style.chars.merge(&char_changes);
-        } else {
-            let style =
-                d.styles_mut().character.iter_mut().find(|st| st.name == name).ok_or_else(|| bad(command, "character style no longer exists"))?;
-            style.chars.merge(&char_changes);
-        }
-        let styles = d.styles.clone();
-        for target in &targets {
-            let Some(story) = d.text_story_mut(target.story, target.cell) else { continue };
-            // At a character-style caret, the sampled format belongs to the containing run
-            // (the preceding run at a boundary). Normalize that source run too, otherwise its
-            // old local values would mask the next edit of the redefined style.
-            let mut selected_range = target.range.clone();
-            if !paragraph && selected_range.is_empty() {
-                let caret = selected_range.start;
-                let mut start = 0usize;
-                for run in &story.chars {
-                    let end = start.saturating_add(run.len).min(story.len());
-                    if caret < end || (caret == end && caret > start) {
-                        selected_range = start..end;
-                        break;
-                    }
-                    start = end;
-                }
-            }
-            let end = if selected_range.is_empty() { selected_range.start } else { selected_range.end.saturating_sub(1) };
-            let (first, last) = (story.para_at(selected_range.start), story.para_at(end));
-            for (index, range) in story.para_ranges().into_iter().enumerate().take(last.saturating_add(1)).skip(first) {
-                let Some(pf) = story.paras.get_mut(index) else { continue };
-                if paragraph && pf.style != name {
-                    continue;
-                }
-                if paragraph {
-                    let (pp, cp) = styles.resolve_para(pf);
-                    let (base_p, base_c) = styles.resolve_para_style(&name);
-                    pf.para = base_p.delta(&pp);
-                    pf.chars = base_c.delta(&cp);
-                }
-                let (_, base) = styles.resolve_para(pf);
-                let end = range.end.saturating_add(1).min(story.len());
-                let range = if paragraph { range.start..end } else { range.start.max(selected_range.start)..end.min(selected_range.end) };
-                story.format_chars(range, |format| {
-                    if !paragraph && format.style != name {
-                        return;
-                    }
-                    let mut inherited = base.clone();
-                    inherited.apply(&styles.char_style_attrs(&format.style));
-                    let resolved = styles.resolve_char(&base, format);
-                    format.over = inherited.delta(&resolved);
-                });
-            }
-        }
-        Ok(json!({"name":name}))
-    });
-    if result.is_ok() {
-        s.typing_format = None;
-    }
-    result
-}
-
-fn apply_para(s: &mut Session, p: &Value) -> Result<Value> {
-    let name = str_param(p, "name").ok_or_else(|| bad("style.paragraph.apply", "missing name"))?.to_string();
-    let clear = p.get("clearOverrides").and_then(Value::as_bool).unwrap_or(false);
-    if s.doc()?.doc.styles.para(&name).is_none() {
-        return Err(bad("style.paragraph.apply", format!("no paragraph style `{name}`")));
-    }
-    let targets = super::text::format_targets_pub(s);
-    s.edit(|d, _| {
-        let styles = d.styles.clone();
-        let (style_para, style_chars) = styles.resolve_para_style(&name);
-        for t in &targets {
-            let r = &t.range;
-            if let Some(st) = d.text_story_mut(t.story, t.cell) {
-                // Text selections are half-open: a selection ending at the next paragraph's
-                // start must not apply a style to that paragraph too.
-                let end = if r.is_empty() { r.start } else { r.end.saturating_sub(1) };
-                let (first, last) = (st.para_at(r.start), st.para_at(end));
-                st.format_paras(r.start..end, |f| {
-                    f.style = name.clone();
-                    if clear {
-                        f.para = ParaAttrs::default();
-                        f.chars = CharAttrs::default();
-                    } else {
-                        f.para.retain_differences(&style_para);
-                        f.chars.retain_differences(&style_chars);
-                    }
-                });
-                for (pi, range) in st.para_ranges().into_iter().enumerate().take(last.saturating_add(1)).skip(first) {
-                    let Some(pf) = st.paras.get(pi) else { continue };
-                    let (_, base) = styles.resolve_para(pf);
-                    let end = range.end.saturating_add(1).min(st.len());
-                    let range = if clear && !r.is_empty() { range.start.max(r.start)..end.min(r.end) } else { range.start..end };
-                    st.format_chars(range, |f| {
-                        if clear {
-                            f.over = CharAttrs::default();
-                        } else {
-                            let mut inherited = base.clone();
-                            inherited.apply(&styles.char_style_attrs(&f.style));
-                            f.over.retain_differences(&inherited);
-                        }
-                    });
-                }
-            }
-        }
-        ok()
-    })
-}
-
-fn apply_char(s: &mut Session, p: &Value) -> Result<Value> {
-    let name = str_param(p, "name").ok_or_else(|| bad("style.character.apply", "missing name"))?.to_string();
-    if s.doc()?.doc.styles.char_style(&name).is_none() {
-        return Err(bad("style.character.apply", format!("no character style `{name}`")));
-    }
-    let targets = super::text::format_targets_pub(s);
-    s.edit(|d, _| {
-        let styles = d.styles.clone();
-        for t in &targets {
-            if let Some(st) = d.text_story_mut(t.story, t.cell) {
-                for (pi, range) in st.para_ranges().into_iter().enumerate() {
-                    let range = range.start.max(t.range.start)..range.end.saturating_add(1).min(st.len()).min(t.range.end);
-                    if range.is_empty() {
-                        continue;
-                    }
-                    let Some(pf) = st.paras.get(pi) else { continue };
-                    let (_, mut inherited) = styles.resolve_para(pf);
-                    inherited.apply(&styles.char_style_attrs(&name));
-                    st.format_chars(range, |f| {
-                        f.style = name.clone();
-                        f.over.retain_differences(&inherited);
-                    });
-                }
-            }
-        }
-        ok()
-    })
-}
-
-/// In a style, `startAt: null` is Continue from Previous Number: it is stored as an explicit
-/// "continue" so it also overrides a Start At the style would inherit.
-fn continue_numbering(p: Option<&Value>, para: &mut ParaAttrs) {
-    let explicit =
-        p.and_then(Value::as_object).is_some_and(|o| o.iter().any(|(k, v)| v.is_null() && k.replace('_', "").eq_ignore_ascii_case("startAt")));
-    if explicit {
-        para.start_at = Some(None);
-    }
-}
-
-fn create_para(s: &mut Session, p: &Value) -> Result<Value> {
-    let base = str_param(p, "name").unwrap_or("Paragraph Style 1").to_string();
-    let mut para: ParaAttrs =
-        attrs("style.paragraph.create", "para", p, |a: &mut ParaAttrs, k, v| a.set_json_over(k, v, &designcraft_doc::ParaProps::default()))?;
-    continue_numbering(p.get("para"), &mut para);
-    explicit_default_kinsoku(&mut para, p.get("para"));
-    check_grep_styles("style.paragraph.create", &para)?;
-    let mut chars: CharAttrs = attrs("style.paragraph.create", "chars", p, |a: &mut CharAttrs, k, v| a.set_json(k, v))?;
-    // Validate caller-supplied fills, not selection fills retained after a swatch is deleted.
-    super::text::validate_char_fill(&s.doc()?.doc, &chars, "style.paragraph.create")?;
-    if p.get("fromSelection").and_then(Value::as_bool).unwrap_or(false)
-        && let Ok(cur) = s.execute("type.selectionAttrs", &json!({}))
-        && !cur.is_null()
-    {
-        if let Ok(pp) = serde_json::from_value::<designcraft_doc::ParaProps>(cur["para"].clone()) {
-            let mut full = ParaProps_to_attrs(&pp);
-            full.merge(&para);
-            para = full;
-        }
-        if let Ok(cp) = serde_json::from_value::<designcraft_doc::CharProps>(cur["chars"].clone()) {
-            let mut full = CharProps_to_attrs(&cp);
-            full.merge(&chars);
-            chars = full;
-        }
-    }
-    let based_on = str_param(p, "basedOn").map(str::to_string);
-    let next = str_param(p, "nextStyle").map(str::to_string);
-    s.edit(|d, _| {
-        let name = Styles::unique_name(|n| d.styles.para(n).is_some(), &base);
-        if let Some(b) = &based_on
-            && d.styles.para(b).is_none()
-        {
-            return Err(bad("style.paragraph.create", format!("no style `{b}`")));
-        }
-        d.styles_mut().paragraph.push(ParagraphStyle { name: name.clone(), based_on, next_style: next, para, chars, shortcut: String::new() });
-        Ok(json!({"name": name}))
-    })
-}
-
-/// `kinsoku: null` sets the composer's default kinsoku rules, also over a Based On style's set.
-/// For the other attributes `null` leaves the style's value as it is.
-fn explicit_default_kinsoku(para: &mut ParaAttrs, given: Option<&Value>) {
-    if given.and_then(|o| o.get("kinsoku")).is_some_and(Value::is_null) {
-        para.kinsoku = Some(None);
-    }
-}
-
-/// The compile error of the first GREP style in `a` whose pattern can't compile.
-pub(crate) fn grep_style_error(a: &ParaAttrs) -> Option<String> {
-    a.grep_styles
-        .iter()
-        .flatten()
-        .filter(|g| !g.pattern.is_empty())
-        .find_map(|g| designcraft_compose::grep::Grep::new(&g.pattern, Default::default()).err().map(|e| format!("{e} (pattern {:?})", g.pattern)))
-}
-
-/// Rejects GREP styles a command would set with a pattern that can't compile.
-pub(crate) fn check_grep_styles(cmd: &str, a: &ParaAttrs) -> Result<()> {
-    grep_style_error(a).map_or(Ok(()), |e| Err(bad(cmd, e)))
-}
-
-/// One warning for each paragraph style or paragraph whose GREP style pattern can't compile.
-/// Such a GREP style stays in the document and composition skips it.
-pub(crate) fn grep_style_warnings(d: &designcraft_doc::Document) -> Vec<String> {
-    let mut out: Vec<String> = d
-        .styles
-        .paragraph
-        .iter()
-        .filter_map(|st| grep_style_error(&st.para).map(|e| format!("paragraph style {:?}: GREP style not applied: {e}", st.name)))
-        .collect();
-    for st in d.stories.values() {
-        for (i, pf) in st.paras.iter().enumerate() {
-            if let Some(e) = grep_style_error(&pf.para) {
-                out.push(format!("story {} paragraph {}: GREP style not applied: {e}", st.id.0, i + 1));
-            }
-        }
-    }
-    out
-}
-
-#[allow(non_snake_case)]
-fn ParaProps_to_attrs(p: &designcraft_doc::ParaProps) -> ParaAttrs {
-    designcraft_doc::ParaProps::common([p])
-}
-#[allow(non_snake_case)]
-fn CharProps_to_attrs(p: &designcraft_doc::CharProps) -> CharAttrs {
-    designcraft_doc::CharProps::common([p])
-}
-
-fn edit_para(s: &mut Session, p: &Value) -> Result<Value> {
-    let name = str_param(p, "name").ok_or_else(|| bad("style.paragraph.edit", "missing name"))?.to_string();
-    let chars: CharAttrs = attrs("style.paragraph.edit", "chars", p, |a: &mut CharAttrs, k, v| a.set_json(k, v))?;
-    super::text::validate_char_fill(&s.doc()?.doc, &chars, "style.paragraph.edit")?;
-    let rename = str_param(p, "rename").map(str::to_string);
-    let based = p.get("basedOn").cloned();
-    s.edit(|d, _| {
-        if let Some(Value::String(b)) = &based
-            && d.styles.para_based_on_cycles(&name, b)
-        {
-            return Err(bad("style.paragraph.edit", "based-on would create a cycle"));
-        }
-        // A rule object changes only the rule fields it names, over the style's resolved rule.
-        let (current, _) = d.styles.resolve_para_style(&name);
-        let mut para: ParaAttrs = attrs("style.paragraph.edit", "para", p, |a: &mut ParaAttrs, k, v| a.set_json_over(k, v, &current))?;
-        continue_numbering(p.get("para"), &mut para);
-        explicit_default_kinsoku(&mut para, p.get("para"));
-        check_grep_styles("style.paragraph.edit", &para)?;
-        let st = d.styles_mut().para_mut(&name).ok_or_else(|| bad("style.paragraph.edit", format!("no style `{name}`")))?;
-        st.para.merge(&para);
-        st.chars.merge(&chars);
-        match based {
-            Some(Value::String(b)) => st.based_on = Some(b),
-            Some(Value::Null) => st.based_on = None,
-            _ => {}
-        }
-        if let Some(n) = rename.clone() {
-            // Every use: other styles, stories, table cells, footnotes, object styles.
-            rename_style(d, true, &name, &n);
-        }
-        ok()
-    })
-}
-
-/// Rename a paragraph or character style everywhere it's used.
-fn rename_style(d: &mut designcraft_doc::Document, para: bool, from: &str, to: &str) {
-    if para {
-        for s in &mut d.styles_mut().paragraph {
-            if s.name == from {
-                s.name = to.to_string();
-            }
-        }
-    } else {
-        for s in &mut d.styles_mut().character {
-            if s.name == from {
-                s.name = to.to_string();
-            }
-        }
-    }
-    redirect_style_refs(d, para, from, to);
-}
-
-/// Point every reference to style `from` at `to`, except the style's own registry entry (its
-/// `name` field) — shared by renaming (which also updates the entry's name) and deletion (which
-/// instead removes the entry, after its former uses point at the replacement).
-fn redirect_style_refs(d: &mut designcraft_doc::Document, para: bool, from: &str, to: &str) {
-    let rename = |r: &mut String| {
-        if r == from {
-            *r = to.to_string();
-        }
-    };
-    let st = d.styles_mut();
-    // A style is never based on itself: when `to` was based on `from`, it takes `from`'s parent.
-    let parent_of = |based_on: Option<&String>| based_on.filter(|b| b.as_str() != to).cloned();
-    if para {
-        let from_parent = parent_of(st.paragraph.iter().find(|x| x.name == from).and_then(|x| x.based_on.as_ref()));
-        for s in &mut st.paragraph {
-            if s.based_on.as_deref() == Some(from) {
-                s.based_on = if s.name == to { from_parent.clone() } else { Some(to.to_string()) };
-            }
-            if s.next_style.as_deref() == Some(from) {
-                s.next_style = Some(to.to_string());
-            }
-        }
-        let objects = st.object.iter_mut().map(|o| &mut o.paragraph_style);
-        for r in objects.chain(st.cell.iter_mut().map(|c| &mut c.paragraph_style)) {
-            if r.as_deref() == Some(from) {
-                *r = Some(to.to_string());
-            }
-        }
-        rename(&mut st.default_paragraph);
-        let (fo, eo) = (&mut d.footnote_options, &mut d.endnote_options);
-        [&mut fo.para_style, &mut eo.para_style, &mut eo.heading_style].into_iter().for_each(rename);
-        d.toc.iter_mut().flat_map(|t| t.entries.iter_mut().map(|e| &mut e.style)).for_each(rename);
-        for t in d.toc.iter_mut() {
-            let formats = t.entries.iter_mut().map(|e| &mut e.entry_style).chain([&mut t.title_style]);
-            for r in formats.filter(|r| r.as_deref() == Some(from)) {
-                *r = Some(to.to_string());
-            }
-        }
-    } else {
-        let from_parent = parent_of(st.character.iter().find(|x| x.name == from).and_then(|x| x.based_on.as_ref()));
-        for s in &mut st.character {
-            if s.based_on.as_deref() == Some(from) {
-                s.based_on = if s.name == to { from_parent.clone() } else { Some(to.to_string()) };
-            }
-        }
-        for s in &mut st.paragraph {
-            rename_char_refs(&mut s.para, from, to);
-        }
-        rename(&mut st.default_character);
-        rename(&mut d.footnote_options.ref_char_style);
-    }
-    // The table of contents' character styles ([None] is stored as no style).
-    if !para && let Some(toc) = d.toc.as_mut() {
-        for e in &mut toc.entries {
-            for n in [&mut e.page_number_style, &mut e.separator_style] {
-                if n.as_deref() == Some(from) {
-                    *n = Some(to.to_string()).filter(|t| t != designcraft_doc::NO_CHAR_STYLE);
-                }
-            }
-        }
-    }
-    for sid in d.stories.keys().copied().collect::<Vec<_>>() {
-        let Some(story) = d.story_mut(sid) else { continue };
-        story.for_each_text_mut(&mut |st| {
-            if para {
-                for f in st.paras.iter_mut().filter(|f| f.style == from) {
-                    f.style = to.to_string();
-                }
-            } else {
-                for r in st.chars.iter_mut().filter(|r| r.format.style == from) {
-                    r.format.style = to.to_string();
-                }
-                for f in &mut st.paras {
-                    rename_char_refs(&mut f.para, from, to);
-                }
-            }
-            st.rev = st.rev.wrapping_add(1);
-        });
-    }
-}
-
-/// Point the nested, nested line and GREP styles, and the drop cap style, of paragraph
-/// attributes at a renamed (or deleted, pointed at its replacement) character style.
-fn rename_char_refs(p: &mut ParaAttrs, from: &str, to: &str) {
-    let names = p.nested_styles.iter_mut().flatten().map(|n| &mut n.style);
-    let names = names.chain(p.nested_line_styles.iter_mut().flatten().map(|n| &mut n.style));
-    let names = names.chain(p.drop_cap_style.iter_mut());
-    for n in names.chain(p.grep_styles.iter_mut().flatten().map(|g| &mut g.style)) {
-        if n == from {
-            *n = to.to_string();
-        }
-    }
-}
-
-fn group_styles(s: &mut Session, p: &Value) -> Result<Value> {
-    let para = match str_param(p, "kind").unwrap_or("paragraph") {
-        "paragraph" => true,
-        "character" => false,
-        k => return Err(bad("style.group", format!("unknown kind `{k}`"))),
-    };
-    let names: Vec<String> =
-        p.get("names").and_then(Value::as_array).map(|a| a.iter().filter_map(|v| v.as_str().map(str::to_string)).collect()).unwrap_or_default();
-    let group = str_param(p, "group").unwrap_or("").trim_matches('/').to_string();
-    s.edit(|d, _| {
-        let mut renamed = serde_json::Map::new();
-        for n in &names {
-            if n.starts_with('[') {
-                return Err(bad("style.group", format!("`{n}` is built in")));
-            }
-            let exists = if para { d.styles.para(n).is_some() } else { d.styles.character.iter().any(|c| c.name == *n) };
-            if !exists {
-                return Err(bad("style.group", format!("no style `{n}`")));
-            }
-            let base = n.rsplit('/').next().unwrap_or(n);
-            let mut to = if group.is_empty() { base.to_string() } else { format!("{group}/{base}") };
-            let taken = |d: &designcraft_doc::Document, x: &str| {
-                if para { d.styles.para(x).is_some() } else { d.styles.character.iter().any(|c| c.name == x) }
-            };
-            if to != *n {
-                to = Styles::unique_name(|x| taken(d, x), &to);
-                rename_style(d, para, n, &to);
-                renamed.insert(n.clone(), json!(to));
-            }
-        }
-        Ok(json!({"renamed": renamed}))
-    })
-}
-
-fn delete_para(s: &mut Session, p: &Value) -> Result<Value> {
-    delete_style(s, p, true)
-}
-
-fn delete_char(s: &mut Session, p: &Value) -> Result<Value> {
-    delete_style(s, p, false)
-}
-
-/// Delete a paragraph (`para`) or character style; everything that used it uses `replaceWith`
-/// (default [Basic Paragraph] or [None]) instead, in one undo step.
-fn delete_style(s: &mut Session, p: &Value, para: bool) -> Result<Value> {
-    let (id, default) =
-        if para { ("style.paragraph.delete", designcraft_doc::BASIC_PARAGRAPH) } else { ("style.character.delete", designcraft_doc::NO_CHAR_STYLE) };
-    let name = str_param(p, "name").filter(|n| !n.is_empty()).ok_or_else(|| bad(id, "missing name"))?.to_string();
-    let repl = str_param(p, "replaceWith").unwrap_or(default).to_string();
-    if name.starts_with('[') {
-        return Err(bad(id, "built-in styles can't be deleted"));
-    }
-    if repl == name {
-        return Err(bad(id, "`replaceWith` can't be the deleted style"));
-    }
-    s.edit(|d, _| {
-        let st = &d.styles;
-        let exists = |n: &str| if para { st.para(n).is_some() } else { n == designcraft_doc::NO_CHAR_STYLE || st.char_style(n).is_some() };
-        if !exists(&name) {
-            return Err(bad(id, format!("no style `{name}`")));
-        }
-        if !exists(&repl) {
-            return Err(bad(id, format!("no style `{repl}` to replace it with")));
-        }
-        // The deleted style's children are based on the replacement, or on the deleted style's
-        // own parent when the replacement descends from it (so no based-on chain loops).
-        let (own_parent, descends) = if para {
-            (st.para(&name).and_then(|x| x.based_on.clone()), st.para_based_on_cycles(&name, &repl))
-        } else {
-            (st.char_style(&name).and_then(|x| x.based_on.clone()), st.char_based_on_cycles(&name, &repl))
-        };
-        let parent = if descends {
-            own_parent.filter(|b| *b != name)
-        } else if repl == designcraft_doc::NO_CHAR_STYLE || repl == designcraft_doc::NO_PARA_STYLE {
-            None
-        } else {
-            Some(repl.clone())
-        };
-        let st = d.styles_mut();
-        let based = if para {
-            st.paragraph.retain(|x| x.name != name);
-            st.paragraph.iter_mut().map(|x| &mut x.based_on).collect::<Vec<_>>()
-        } else {
-            st.character.retain(|x| x.name != name);
-            st.character.iter_mut().map(|x| &mut x.based_on).collect()
-        };
-        for b in based.into_iter().filter(|b| b.as_deref() == Some(name.as_str())) {
-            *b = parent.clone();
-        }
-        // Every other use: styles, stories, table cells, nested and GREP styles, notes, defaults.
-        rename_style(d, para, &name, &repl);
-        ok()
-    })
-}
-
-fn create_char(s: &mut Session, p: &Value) -> Result<Value> {
-    let base = str_param(p, "name").unwrap_or("Character Style 1").to_string();
-    let mut chars: CharAttrs = attrs("style.character.create", "chars", p, |a: &mut CharAttrs, k, v| a.set_json(k, v))?;
-    // Validate caller-supplied fills; captured formatting may retain a deleted swatch name.
-    super::text::validate_char_fill(&s.doc()?.doc, &chars, "style.character.create")?;
-    if p.get("fromSelection").and_then(Value::as_bool).unwrap_or(false)
-        && let Some(target) = super::text::format_targets_pub(s).first()
-    {
-        let st = s.doc()?;
-        // Match paragraph fromSelection's first-character/caret policy, but keep paragraph
-        // attributes inherited instead of freezing the fully resolved character properties.
-        let format = super::text::effective_char_format(s, target)?;
-        let mut captured = st.doc.styles.char_style_attrs(&format.style);
-        captured.merge(&format.over);
-        // Replay the explicit fields so null clears a captured value rather than looking absent.
-        if let Some(overrides) = p.get("chars").and_then(Value::as_object) {
-            for (key, value) in overrides {
-                captured.set_json(key, value).map_err(|e| bad("style.character.create", format!("chars: {e}")))?;
-            }
-        }
-        chars = captured;
-    }
-    // Based on [None] is based on nothing.
-    let based_on = str_param(p, "basedOn").filter(|b| *b != designcraft_doc::NO_CHAR_STYLE).map(str::to_string);
-    s.edit(|d, _| {
-        if let Some(b) = &based_on
-            && d.styles.char_style(b).is_none()
-        {
-            return Err(bad("style.character.create", format!("no character style `{b}`")));
-        }
-        let name = Styles::unique_name(|n| d.styles.char_style(n).is_some(), &base);
-        d.styles_mut().character.push(CharacterStyle { name: name.clone(), based_on, chars, shortcut: String::new() });
-        Ok(json!({"name": name}))
-    })
-}
-
-fn edit_char(s: &mut Session, p: &Value) -> Result<Value> {
-    let name = str_param(p, "name").ok_or_else(|| bad("style.character.edit", "missing name"))?.to_string();
-    if name == designcraft_doc::NO_CHAR_STYLE {
-        return Err(bad("style.character.edit", "[None] can't be edited"));
-    }
-    let chars: CharAttrs = attrs("style.character.edit", "chars", p, |a: &mut CharAttrs, k, v| a.set_json(k, v))?;
-    super::text::validate_char_fill(&s.doc()?.doc, &chars, "style.character.edit")?;
-    // `null` unsets an attribute (the style no longer sets it).
-    let unset: Vec<String> = p
-        .get("chars")
-        .and_then(Value::as_object)
-        .map(|o| o.iter().filter(|(_, v)| v.is_null()).map(|(k, _)| k.clone()).collect())
-        .unwrap_or_default();
-    let rename = str_param(p, "rename").filter(|n| *n != name).map(|n| n.trim().to_string());
-    let based: Option<Option<String>> = match p.get("basedOn") {
-        None => None,
-        Some(Value::Null) => Some(None),
-        Some(Value::String(b)) if b == designcraft_doc::NO_CHAR_STYLE => Some(None),
-        Some(Value::String(b)) => Some(Some(b.clone())),
-        Some(_) => return Err(bad("style.character.edit", "`basedOn` is a style name or null")),
-    };
-    s.edit(|d, _| {
-        if let Some(Some(b)) = &based {
-            if d.styles.char_style(b).is_none() {
-                return Err(bad("style.character.edit", format!("no character style `{b}`")));
-            }
-            if d.styles.char_based_on_cycles(&name, b) {
-                return Err(bad("style.character.edit", "based-on would create a cycle"));
-            }
-        }
-        if let Some(n) = &rename
-            && (n.is_empty() || n.starts_with('[') || d.styles.char_style(n).is_some())
-        {
-            return Err(bad("style.character.edit", format!("can't rename to `{n}`")));
-        }
-        let st = d.styles_mut().char_style_mut(&name).ok_or_else(|| bad("style.character.edit", format!("no character style `{name}`")))?;
-        st.chars.merge(&chars);
-        for k in &unset {
-            st.chars.set_json(k, &Value::Null).map_err(|e| bad("style.character.edit", e))?;
-        }
-        if let Some(b) = based.clone() {
-            st.based_on = b;
-        }
-        if let Some(n) = &rename {
-            // Every use: other styles, stories, table cells, nested and GREP styles, footnotes.
-            rename_style(d, false, &name, n);
-        }
-        ok()
-    })
-}
-
-fn create_swatch(s: &mut Session, p: &Value) -> Result<Value> {
-    if let Some(g) = p.get("gradient") {
-        return create_gradient_swatch(s, p, g);
-    }
-    let c = p.get("color").ok_or_else(|| bad("swatch.create", "missing color (or gradient)"))?;
-    let color = parse_color(c).ok_or_else(|| bad("swatch.create", "bad color"))?;
-    let spot = p.get("spot").and_then(Value::as_bool).unwrap_or(false);
-    let name = str_param(p, "name").map(str::to_string).unwrap_or_else(|| value_name(color));
-    s.edit(|d, _| {
-        let name = Styles::unique_name(|n| d.swatch(n).is_some(), &name);
-        d.swatches.push(Swatch {
-            name: name.clone(),
-            value: SwatchValue::Color {
-                color,
-                color_type: if spot { designcraft_color::ColorType::Spot } else { designcraft_color::ColorType::Process },
-            },
-            locked: false,
-            named: true,
-            hidden: false,
-        });
-        Ok(json!({"name": name}))
-    })
-}
-
-/// `swatch.create {gradient}`: a named gradient swatch. Stops take a colour swatch by name (as a
-/// swatch dragged onto the Gradient panel's stop) or a colour.
-fn create_gradient_swatch(s: &mut Session, p: &Value, g: &Value) -> Result<Value> {
-    use designcraft_color::{Gradient, GradientKind, GradientStop};
-    const ID: &str = "swatch.create";
-    let kind = match g.get("kind").and_then(Value::as_str) {
-        None | Some("linear") => GradientKind::Linear,
-        Some("radial") => GradientKind::Radial,
-        Some(k) => return Err(bad(ID, format!("unknown gradient kind {k}"))),
-    };
-    let doc = &s.doc()?.doc;
-    let mut stops = Vec::new();
-    for st in g.get("stops").and_then(Value::as_array).ok_or_else(|| bad(ID, "a gradient needs stops"))? {
-        let color = match (st.get("swatch").and_then(Value::as_str), st.get("color")) {
-            (Some(n), _) => match doc.swatch(n).map(|w| &w.value) {
-                Some(SwatchValue::Gradient { .. }) => return Err(bad(ID, format!("`{n}` is a gradient; a stop takes a colour"))),
-                Some(_) => doc.resolve_color(n, 1.0).ok_or_else(|| bad(ID, format!("`{n}` has no colour")))?,
-                None => return Err(bad(ID, format!("no swatch named `{n}`"))),
-            },
-            (None, Some(c)) => parse_color(c).ok_or_else(|| bad(ID, "a stop has a bad color"))?,
-            (None, None) => return Err(bad(ID, "a stop needs a swatch or a color")),
-        };
-        let pct = |k: &str, d: f64| st.get(k).and_then(Value::as_f64).filter(|v| v.is_finite()).unwrap_or(d).clamp(0.0, 100.0) as f32 / 100.0;
-        stops.push(GradientStop {
-            offset: pct("location", 0.0),
-            color,
-            opacity: pct("opacity", 100.0),
-            midpoint: pct("midpoint", 50.0).clamp(0.13, 0.87),
-        });
-    }
-    if stops.len() < 2 {
-        return Err(bad(ID, "a gradient needs at least two stops"));
-    }
-    let mut gradient = Gradient { kind, stops };
-    gradient.sort();
-    let name = str_param(p, "name").unwrap_or("New Gradient Swatch").to_string();
-    s.edit(|d, _| {
-        let name = Styles::unique_name(|n| d.swatch(n).is_some(), &name);
-        d.swatches.push(Swatch { name: name.clone(), value: SwatchValue::Gradient { gradient }, locked: false, named: true, hidden: false });
-        Ok(json!({"name": name}))
-    })
-}
-
-/// `swatch.new`: InDesign's New Swatch. An unnamed colour or gradient (the selection's, or
-/// `swatch`) is added to the swatches under a name, and stays applied; a named swatch is
-/// duplicated as "<name> copy".
-fn new_swatch(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "swatch.new";
-    let st = s.doc()?;
-    let name = match str_param(p, "swatch") {
-        Some(n) => n.to_string(),
-        None => {
-            let Some(id) = st.selection.items.first().copied() else {
-                // Nothing selected: a new colour swatch.
-                return create_swatch(s, &json!({"color": {"c": 0, "m": 50, "y": 100, "k": 0}}));
-            };
-            let it = st.doc.item(id).ok_or_else(|| bad(ID, "no such item"))?;
-            if str_param(p, "target") == Some("stroke") { it.stroke.swatch.clone() } else { it.fill.swatch.clone() }
-        }
-    };
-    let w = st.doc.swatch(&name).cloned().ok_or_else(|| bad(ID, format!("no swatch named `{name}`")))?;
-    if matches!(w.value, SwatchValue::None | SwatchValue::Registration) {
-        return Err(bad(ID, format!("`{name}` can't be made a new swatch")));
-    }
-    if w.hidden {
-        // An unnamed gradient takes InDesign's "New Gradient Swatch"; an unnamed colour its values.
-        let new = match w.value {
-            SwatchValue::Gradient { .. } => Styles::unique_name(|n| st.doc.swatch(n).is_some(), "New Gradient Swatch"),
-            _ => name.clone(),
-        };
-        return add_to_swatches(s, &json!({"swatch": name, "name": new}));
-    }
-    s.edit(|d, _| {
-        let copy = Styles::unique_name(|n| d.swatch(n).is_some(), &format!("{name} copy"));
-        d.swatches.push(Swatch { name: copy.clone(), locked: false, named: true, hidden: false, ..w.clone() });
-        Ok(json!({"name": copy}))
-    })
-}
-
-pub fn parse_color(v: &Value) -> Option<designcraft_color::Color> {
-    use designcraft_color::Color;
-    match v {
-        Value::String(s) => Color::from_hex(s),
-        // `{model, …}` is the colour's own form (as `color.convert` takes it): fractions, never guessed.
-        Value::Object(o) if o.contains_key("model") => model_color(v),
-        // One scale per colour, not per component: [1, 128, 255] is 0..255. Only an RGB array whose
-        // components are all within 0..1 is read as fractions (the older form).
-        Value::Array(a) if a.len() >= 3 => {
-            let v = [a[0].as_f64()?, a[1].as_f64()?, a[2].as_f64()?];
-            let scale = if v.iter().any(|&x| x > 1.0) { 255.0 } else { 1.0 };
-            Some(Color::rgb((v[0] / scale) as f32, (v[1] / scale) as f32, (v[2] / scale) as f32))
-        }
-        // Bare CMYK is always 0..100, as documented: C 1 % is a real tint, so values of 1 or less can't
-        // mean fractions (#910).
-        Value::Object(o) => {
-            if o.contains_key("gray") {
-                let gray = o.get("gray").and_then(Value::as_f64)?;
-                return Some(Color::gray(if gray > 1.0 { gray / 100.0 } else { gray } as f32));
-            }
-            let g = |k: &str| o.get(k).and_then(Value::as_f64).map(|x| (x / 100.0) as f32);
-            Some(Color::cmyk(g("c")?, g("m")?, g("y")?, g("k")?))
-        }
-        _ => None,
-    }
-}
-
-/// `{model: rgb|cmyk|gray, …}` with every component in 0..=1; anything else is not a colour.
-fn model_color(v: &Value) -> Option<designcraft_color::Color> {
-    use designcraft_color::Color;
-    let color: Color = serde_json::from_value(v.clone()).ok()?;
-    // A float's last bit (100.0 / 100.0 ≠ 1.0 after an f32 round trip) is not out of range.
-    let unit = |x: f32| x.is_finite() && (-1e-4..=1.0 + 1e-4).contains(&x);
-    let q = |x: f32| x.clamp(0.0, 1.0);
-    match color {
-        Color::Rgb { r, g, b } => [r, g, b].into_iter().all(unit).then(|| Color::rgb(q(r), q(g), q(b))),
-        Color::Cmyk { c, m, y, k } => [c, m, y, k].into_iter().all(unit).then(|| Color::cmyk(q(c), q(m), q(y), q(k))),
-        Color::Gray { k } => unit(k).then_some(Color::Gray { k: q(k) }),
-    }
-}
-
-fn apply_object(s: &mut Session, p: &Value) -> Result<Value> {
-    let name = str_param(p, "name").ok_or_else(|| bad("style.object.apply", "missing name"))?.to_string();
-    let os = s.doc()?.doc.styles.object_style(&name).cloned().ok_or_else(|| bad("style.object.apply", format!("no object style `{name}`")))?;
-    let ids = super::targets(s, p)?;
-    s.edit(|d, _| {
-        let mut stories = Vec::new();
-        for id in &ids {
-            let Some(it) = d.item_mut(*id) else { continue };
-            it.object_style = name.clone();
-            os.apply_to(it);
-            if let Some(tf) = it.text_frame() {
-                stories.push(tf.story);
-            }
-        }
-        if let Some(ps) = &os.paragraph_style {
-            for sid in stories {
-                if let Some(st) = d.story_mut(sid) {
-                    let len = st.len();
-                    st.format_paras(0..len, |f| f.style = ps.clone());
-                }
-            }
-        }
-        Ok(Value::Null)
-    })
-}
-
-fn clear_object_overrides(s: &mut Session, p: &Value) -> Result<Value> {
-    let ids = super::targets(s, p)?;
-    // Each target with its style's attributes applied, kept only where that changes the item.
-    let d = &s.doc()?.doc;
-    let changed: Vec<Item> = ids
-        .iter()
-        .filter_map(|id| {
-            let it = d.item(*id)?;
-            let mut next = it.clone();
-            d.styles.object_style(&it.object_style)?.apply_to(&mut next);
-            (next != *it).then_some(next)
-        })
-        .collect();
-    if changed.is_empty() {
-        return Ok(json!({"changed": 0}));
-    }
-    s.edit(|d, _| {
-        for next in &changed {
-            if let Some(it) = d.item_mut(next.id) {
-                *it = next.clone();
-            }
-        }
-        Ok(json!({"changed": changed.len()}))
-    })
-}
-
-/// Effect keys accepted at the top level of `style.object.create` / `edit` as shorthand for
-/// `effects.<key>`.
-const EFFECT_KEYS: [&str; 9] =
-    ["dropShadow", "feather", "innerShadow", "outerGlow", "innerGlow", "bevel", "satin", "gradientFeather", "directionalFeather"];
-
-/// The effects `p` gives (`effects`, then the top-level effect keys) merged field by field over
-/// `base`, or `None` when `p` names no effect.
-fn effects_param(cmd: &str, p: &Value, base: &Effects) -> Result<Option<Effects>> {
-    let mut patch = serde_json::Map::new();
-    match p.get("effects") {
-        None | Some(Value::Null) => {}
-        Some(Value::Object(o)) => patch.extend(o.iter().map(|(k, v)| (k.clone(), v.clone()))),
-        Some(_) => return Err(bad(cmd, "`effects` must be an object or null")),
-    }
-    for k in EFFECT_KEYS {
-        if let Some(v) = p.get(k) {
-            patch.insert(k.to_string(), v.clone());
-        }
-    }
-    if patch.is_empty() {
-        return Ok(None);
-    }
-    let mut v = serde_json::to_value(base).map_err(|e| bad(cmd, e.to_string()))?;
-    merge_json(&mut v, Value::Object(patch), 0);
-    let e: Effects = serde_json::from_value(v).map_err(|e| bad(cmd, format!("effects: {e}")))?;
-    e.sanitized().map(Some).map_err(|m| bad(cmd, m))
-}
-
-/// Merges `top` into `base`: objects key by key, anything else replaced.
-fn merge_json(base: &mut Value, top: Value, depth: usize) {
-    match (base, top) {
-        (Value::Object(b), Value::Object(t)) if depth < 8 => {
-            for (k, v) in t {
-                match b.get_mut(&k) {
-                    Some(slot) => merge_json(slot, v, depth + 1),
-                    None => {
-                        b.insert(k, v);
-                    }
-                }
-            }
-        }
-        (b, t) => *b = t,
-    }
-}
-
-fn create_object(s: &mut Session, p: &Value) -> Result<Value> {
-    let base = str_param(p, "name").unwrap_or("Object Style 1").to_string();
-    let from_sel = p.get("fromSelection").and_then(Value::as_bool).unwrap_or(true);
-    let src = if from_sel { s.doc()?.selection.items.first().and_then(|i| s.doc().ok()?.doc.item(*i).cloned()) } else { None };
-    let mut os = ObjectStyle::default();
-    if let Some(it) = &src {
-        os.fill = Some(it.fill.clone());
-        os.stroke = Some(it.stroke.clone());
-        os.text_frame = it.text_frame().map(|t| t.options.clone());
-        os.effects = Some(it.effects.clone());
-    }
-    if let Some(sw) = str_param(p, "fill") {
-        os.fill = Some(designcraft_doc::Fill::swatch(sw));
-    }
-    if let Some(ps) = str_param(p, "paragraphStyle") {
-        os.paragraph_style = Some(ps.to_string());
-    }
-    if let Some(e) = effects_param("style.object.create", p, os.effects.as_ref().unwrap_or(&Effects::default()))? {
-        os.effects = Some(e);
-    }
-    s.edit(|d, _| {
-        let name = Styles::unique_name(|n| d.styles.object_style(n).is_some(), &base);
-        os.name = name.clone();
-        d.styles_mut().object.push(os.clone());
-        Ok(json!({"name": name}))
-    })
-}
-
-fn edit_object(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "style.object.edit";
-    let name = str_param(p, "name").ok_or_else(|| bad(CMD, "missing name"))?.to_string();
-    if name == designcraft_doc::NO_OBJECT_STYLE {
-        return Err(bad(CMD, format!("`{name}` can't be edited")));
-    }
-    let old = s.doc()?.doc.styles.object_style(&name).cloned().ok_or_else(|| bad(CMD, format!("no object style `{name}`")))?;
-    let effects = if p.get("effects").is_some_and(Value::is_null) {
-        if EFFECT_KEYS.iter().any(|k| p.get(k).is_some()) {
-            return Err(bad(CMD, "`effects: null` can't be combined with effect settings"));
-        }
-        None
-    } else {
-        match effects_param(CMD, p, old.effects.as_ref().unwrap_or(&Effects::default()))? {
-            Some(e) => Some(e),
-            None => return Ok(json!({"name": name, "updated": 0})),
-        }
-    };
-    if effects == old.effects {
-        return Ok(json!({"name": name, "updated": 0}));
-    }
-    s.edit(|d, _| {
-        let Some(os) = d.styles_mut().object.iter_mut().find(|o| o.name == name) else {
-            return Err(bad(CMD, format!("no object style `{name}`")));
-        };
-        os.effects = effects.clone();
-        // An item follows the style while its effects are the style's. When the style didn't set
-        // effects before, only items without effects of their own follow (the default styles are
-        // on most frames).
-        let follows = old.effects.clone().unwrap_or_default();
-        let updated = match &effects {
-            Some(new) => d.update_items(|it| it.object_style == name && it.effects == follows, |it| it.effects = new.clone()),
-            None => 0,
-        };
-        Ok(json!({"name": name, "updated": updated}))
-    })
-}
-
-/// The swatch name of a colour value ("C=… M=… Y=… K=…" / "R=… G=… B=…").
-fn value_name(color: designcraft_color::Color) -> String {
-    designcraft_color::swatch::value_name(color)
-}
-
-fn load_swatches(s: &mut Session, p: &Value) -> Result<Value> {
-    let bytes = match (str_param(p, "path"), str_param(p, "base64")) {
-        (_, Some(b)) => super::file::base64_decode(b),
-        (Some(path), None) => crate::io::read_file(path).map_err(|e| bad("swatch.load", e))?,
-        _ => return Err(bad("swatch.load", "give `path` or `base64`")),
-    };
-    let incoming = designcraft_color::ase::read(&bytes).map_err(|e| bad("swatch.load", e.to_string()))?;
-    let replace = p.get("replace").and_then(Value::as_bool).unwrap_or(false);
-    s.edit(|d, _| {
-        // The position of the first swatch with each name, kept up to date as the file's colors are added.
-        let mut at: std::collections::HashMap<String, usize> = std::collections::HashMap::new();
-        for (i, x) in d.swatches.iter().enumerate() {
-            at.entry(x.name.clone()).or_insert(i);
-        }
-        let mut names = FileNames::default();
-        let (mut added, mut replaced) = (0, 0);
-        for mut w in incoming {
-            // An unnamed color is named by its value, and a name the file already gave gets a number.
-            if w.name.is_empty()
-                && let SwatchValue::Color { color, .. } = w.value
-            {
-                w.name = value_name(color);
-                w.named = false;
-            }
-            w.name = names.unique(std::mem::take(&mut w.name));
-            match at.get(&w.name).and_then(|&i| d.swatches.get_mut(i)) {
-                Some(x) if x.locked => {}
-                Some(x) => {
-                    if replace {
-                        x.value = w.value;
-                        x.hidden = false;
-                        replaced += 1;
-                    }
-                }
-                None => {
-                    at.insert(w.name.clone(), d.swatches.len());
-                    d.swatches.push(w);
-                    added += 1;
-                }
-            }
-        }
-        Ok(json!({"added": added, "replaced": replaced}))
-    })
-}
-
-/// The swatch names one `.ase` file has given. A name already given gets the first free number
-/// ("Red 2"), as [`Styles::unique_name`] numbers names.
-#[derive(Default)]
-struct FileNames {
-    taken: std::collections::HashSet<String>,
-    /// The last number tried for each repeated name.
-    last: std::collections::HashMap<String, usize>,
-}
-
-impl FileNames {
-    fn unique(&mut self, base: String) -> String {
-        if self.taken.insert(base.clone()) {
-            return base;
-        }
-        // Each pass tries the next number, and only finitely many names are taken.
-        let n = self.last.entry(base.clone()).or_insert(1);
-        loop {
-            *n += 1;
-            let name = format!("{base} {n}");
-            if self.taken.insert(name.clone()) {
-                return name;
-            }
-        }
-    }
-}
-
-fn save_swatches(s: &mut Session, p: &Value) -> Result<Value> {
-    let d = &s.doc()?.doc;
-    let names: Option<Vec<String>> =
-        p.get("names").and_then(Value::as_array).map(|a| a.iter().filter_map(|v| v.as_str().map(str::to_string)).collect());
-    let chosen: Vec<Swatch> = d.swatches.iter().filter(|w| names.as_ref().is_none_or(|n| n.contains(&w.name))).cloned().collect();
-    let bytes = designcraft_color::ase::write(&chosen);
-    match str_param(p, "path") {
-        Some(path) => {
-            crate::io::write_file(path, &bytes).map_err(|e| bad("swatch.save", e))?;
-            Ok(json!({"path": path, "bytes": bytes.len()}))
-        }
-        None => Ok(json!({"base64": super::file::base64_encode(&bytes)})),
-    }
-}
-
-fn gradient_json(name: &str, g: &designcraft_color::Gradient) -> Value {
-    let stops: Vec<Value> = g
-        .stops
-        .iter()
-        .map(|s| json!({"location": (s.offset as f64 * 1000.0).round() / 10.0, "color": s.color.to_hex(), "opacity": (s.opacity * 100.0).round(), "midpoint": (s.midpoint * 100.0).round()}))
-        .collect();
-    json!({"swatch": name, "kind": if g.kind == designcraft_color::GradientKind::Radial { "radial" } else { "linear" }, "stops": stops})
-}
-
-fn apply_gradient(s: &mut Session, p: &Value) -> Result<Value> {
-    use designcraft_color::{GradientKind, GradientStop};
-    let kind = match str_param(p, "kind") {
-        Some("radial") => Some(GradientKind::Radial),
-        Some("linear") => Some(GradientKind::Linear),
-        Some(k) => return Err(bad("object.gradient", format!("unknown kind {k}"))),
-        None => None,
-    };
-    let stops = match p.get("stops").and_then(Value::as_array) {
-        Some(a) => {
-            let doc = &s.doc()?.doc;
-            let mut v = Vec::new();
-            for st in a {
-                // A swatch dropped on a stop gives it the swatch's colour (a tint's mixed in).
-                let color = match st.get("swatch").and_then(Value::as_str) {
-                    Some(name) => doc
-                        .resolve_color(name, 1.0)
-                        .filter(|_| designcraft_color::swatch::resolve_gradient(&doc.swatches, name).is_none())
-                        .ok_or_else(|| bad("object.gradient", format!("`{name}` isn't a colour swatch")))?,
-                    None => st.get("color").and_then(parse_color).ok_or_else(|| bad("object.gradient", "a stop needs a color or a swatch"))?,
-                };
-                let pct = |k: &str, d: f64| st.get(k).and_then(Value::as_f64).unwrap_or(d).clamp(0.0, 100.0) as f32 / 100.0;
-                v.push(GradientStop {
-                    offset: pct("location", 0.0),
-                    color,
-                    opacity: pct("opacity", 100.0),
-                    midpoint: pct("midpoint", 50.0).clamp(0.13, 0.87),
-                });
-            }
-            if v.len() < 2 {
-                return Err(bad("object.gradient", "a gradient needs at least two stops"));
-            }
-            Some(v)
-        }
-        None => None,
-    };
-    let reverse = p.get("reverse").and_then(Value::as_bool).unwrap_or(false);
-    let angle = p.get("angle").and_then(Value::as_f64);
-    let stroke = match str_param(p, "target") {
-        None | Some("fill") => false,
-        Some("stroke") => true,
-        Some(t) => return Err(bad("object.gradient", format!("unknown target {t}"))),
-    };
-    let (from, to) = (super::point_param(p, "from"), super::point_param(p, "to"));
-    let ids = super::targets(s, p)?;
-    s.edit(|d, _| {
-        let mut out = Value::Null;
-        for id in &ids {
-            let Some(it) = d.item(*id) else { continue };
-            let cur_name = if stroke { it.stroke.swatch.clone() } else { it.fill.swatch.clone() };
-            let cur = designcraft_color::swatch::resolve_gradient(&d.swatches, &cur_name).cloned();
-            let mut g = cur.clone().unwrap_or_default();
-            if let Some(k) = kind {
-                g.kind = k;
-            }
-            if let Some(st) = &stops {
-                g.stops = st.clone();
-                g.sort();
-            }
-            if reverse {
-                g.reverse();
-            }
-            // Keep the swatch while the gradient is unchanged, else reuse an equal gradient swatch
-            // or add an unnamed one.
-            let name = if cur.as_ref() == Some(&g) {
-                cur_name
-            } else if let Some(w) = d.swatches.iter().find(|w| matches!(&w.value, SwatchValue::Gradient { gradient } if *gradient == g)) {
-                w.name.clone()
-            } else {
-                let name = Styles::unique_name(|n| d.swatch(n).is_some(), "Gradient");
-                d.swatches.push(Swatch {
-                    name: name.clone(),
-                    value: SwatchValue::Gradient { gradient: g.clone() },
-                    locked: false,
-                    named: false,
-                    hidden: true,
-                });
-                name
-            };
-            let inv = d.find(*id).map(|l| d.parent_xf(&l)).zip(d.item(*id).map(|i| i.xf)).map(|(pxf, xf)| (pxf * xf).inverse());
-            let Some(it) = d.item_mut(*id) else { continue };
-            // The fill's or the stroke's paint: swatch, tint, angle, vector.
-            let (swatch, tint, g_angle, g_vector) = if stroke {
-                (&mut it.stroke.swatch, &mut it.stroke.tint, &mut it.stroke.gradient_angle, &mut it.stroke.gradient_vector)
-            } else {
-                (&mut it.fill.swatch, &mut it.fill.tint, &mut it.fill.gradient_angle, &mut it.fill.gradient_vector)
-            };
-            *swatch = name.clone();
-            *tint = 1.0;
-            if let Some(a) = angle {
-                *g_angle = Some(a);
-                *g_vector = None;
-            }
-            if let (Some(a), Some(b), Some(inv)) = (from, to, inv) {
-                let (a, b) = (inv * a, inv * b);
-                if (b - a).hypot() > 1e-6 {
-                    *g_vector = Some([a.x, a.y, b.x, b.y]);
-                }
-            }
-            if out.is_null() {
-                out = gradient_json(&name, &g);
-            }
-        }
-        Ok(out)
-    })
-}
-
-fn apply_color(s: &mut Session, p: &Value) -> Result<Value> {
-    let color = p.get("color").and_then(parse_color).ok_or_else(|| bad("object.color", "missing or bad color"))?;
-    let stroke = str_param(p, "target") == Some("stroke");
-    let named = p.get("ids").is_some() || p.get("id").is_some();
-    let text = !named
-        && (p.get("text").and_then(Value::as_bool).unwrap_or(false) || s.doc()?.selection.text.is_some() || s.doc()?.selection.cells.is_some());
-    // Nothing selected: the colour of new shapes (InDesign's document defaults).
-    if !text && super::object::nothing_targeted(s, p)? {
-        return s.edit(|d, _| {
-            let name = color_swatch(d, color);
-            let c = &mut d.settings.new_object;
-            if stroke {
-                (c.stroke, c.stroke_tint) = (name.clone(), 1.0);
-            } else {
-                (c.fill, c.fill_tint) = (name.clone(), 1.0);
-            }
-            Ok(json!({"swatch": name, "newObject": true}))
-        });
-    }
-    let (ids, texts) = if text { (vec![], super::text::format_targets_pub(s)) } else { (super::targets(s, p)?, vec![]) };
-    if text && texts.is_empty() {
-        return Err(bad("object.color", "select the text to colour"));
-    }
-    // A caret: the colour is for the next typing (once the swatch exists).
-    let caret = matches!(texts.as_slice(), [t] if t.range.is_empty());
-    let r = s.edit(|d, _| {
-        let name = color_swatch(d, color);
-        color_items(d, &ids, &name, stroke);
-        if !caret {
-            let a = if stroke {
-                CharAttrs { stroke: Some(name.clone()), stroke_tint: Some(1.0), ..Default::default() }
-            } else {
-                CharAttrs { fill: Some(name.clone()), fill_tint: Some(1.0), ..Default::default() }
-            };
-            super::text::apply_char_attrs(d, &texts, &a, &[]);
-        }
-        Ok(json!({"swatch": name}))
-    })?;
-    if caret && let Some(name) = r.get("swatch").cloned() {
-        let attrs = if stroke { json!({"stroke": name, "strokeTint": 1.0}) } else { json!({"fill": name, "fillTint": 1.0}) };
-        super::text::format_chars(s, &attrs)?;
-    }
-    Ok(r)
-}
-
-/// A process swatch holding this colour to the precision its name shows (whole CMYK percents,
-/// 0-255 RGB), else a new unnamed one (hidden from the Swatches panel until Add to Swatches):
-/// values a fraction of a percent apart would otherwise add hidden "C=0 M=50 Y=100 K=0 2" twins.
-fn color_swatch(d: &mut designcraft_doc::Document, color: designcraft_color::Color) -> String {
-    let shown = value_name(color);
-    let process = |w: &&Swatch| match &w.value {
-        SwatchValue::Color { color: c, color_type: designcraft_color::ColorType::Process } => Some(*c),
-        _ => None,
-    };
-    let existing = d
-        .swatches
-        .iter()
-        .find(|w| process(w) == Some(color))
-        .or_else(|| {
-            d.swatches
-                .iter()
-                .find(|w| process(w).is_some_and(|c| std::mem::discriminant(&c) == std::mem::discriminant(&color) && value_name(c) == shown))
-        })
-        .map(|w| w.name.clone());
-    if let Some(n) = existing {
-        return n;
-    }
-    let name = Styles::unique_name(|n| d.swatch(n).is_some(), &shown);
-    d.swatches.push(Swatch {
-        name: name.clone(),
-        value: SwatchValue::Color { color, color_type: designcraft_color::ColorType::Process },
-        locked: false,
-        named: false,
-        hidden: true,
-    });
-    name
-}
-
-fn color_items(d: &mut designcraft_doc::Document, ids: &[designcraft_doc::ItemId], name: &str, stroke: bool) {
-    for id in ids {
-        if let Some(it) = d.item_mut(*id) {
-            if stroke {
-                it.stroke.swatch = name.to_string();
-                it.stroke.tint = 1.0;
-            } else {
-                it.fill.swatch = name.to_string();
-                it.fill.tint = 1.0;
-            }
-        }
-    }
-}
-
-fn has_text_or_selection(s: &Session) -> std::result::Result<(), String> {
-    has_doc(s)?;
-    if s.active().is_some_and(|d| d.selection.text.is_some() || d.selection.cells.is_some()) { Ok(()) } else { super::has_selection(s) }
-}
-
-/// The Eyedropper on a placed image (InDesign samples the pixel under the pointer): that colour,
-/// as an unnamed colour, fills the selected text (characters), or the selected objects.
-fn sample_color(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "color.sample";
-    let at = super::point_param(p, "at").ok_or_else(|| bad(ID, "missing at"))?;
-    let sr = super::spread_param(p, ID)?;
-    let st = s.doc()?;
-    let Some((from, color)) = image_color_at(&st.doc, sr, at) else {
-        // No opaque image pixel there (an empty part of an image frame, a transparent pixel): the
-        // Eyedropper applies the clicked object's attributes instead.
-        return match p.get("matchFrom") {
-            Some(from) => {
-                let mut params = p.clone();
-                params["from"] = from.clone();
-                super::object::match_attributes(s, &params)
-            }
-            None => Err(bad(ID, "no placed image under the point")),
-        };
-    };
-    let hex = color.to_hex();
-    let mut params = p.clone();
-    params["color"] = json!(hex);
-    let mut result = apply_color(s, &params)?;
-    result["color"] = json!(hex);
-    result["from"] = json!(from.0);
-    Ok(result)
-}
-
-/// The colour of the placed raster image at `at` on spread `sr`: the frontmost visible image whose
-/// frame shows that point (locked ones too, as sampling changes nothing). (image frame, colour);
-/// None over no image, a transparent pixel, or a graphic that is not a raster (PDF, EPS).
-pub(crate) fn image_color_at(
-    d: &designcraft_doc::Document,
-    sr: designcraft_doc::SpreadRef,
-    at: designcraft_geom::Point,
-) -> Option<(designcraft_doc::ItemId, designcraft_color::Color)> {
-    let sp = d.spread(sr)?;
-    let mut items: Vec<&designcraft_doc::Item> = sp.items.iter().map(|i| &**i).collect();
-    items.sort_by_key(|i| d.layer_rank(i.layer));
-    items
-        .into_iter()
-        .rev()
-        .filter(|it| d.layer(it.layer).is_none_or(|l| l.visible))
-        .find_map(|it| sample_item(d, it, designcraft_geom::Affine::IDENTITY, at, 0))
-}
-
-fn sample_item(
-    d: &designcraft_doc::Document,
-    it: &designcraft_doc::Item,
-    outer: designcraft_geom::Affine,
-    at: designcraft_geom::Point,
-    depth: usize,
-) -> Option<(designcraft_doc::ItemId, designcraft_color::Color)> {
-    use designcraft_doc::Content;
-    if it.hidden || depth > 64 {
-        return None;
-    }
-    let xf = outer * it.xf;
-    match &it.content {
-        // Only the active state of a multi-state object shows.
-        Content::Group { .. } => {
-            let shown: Vec<_> = it.shown_children().collect();
-            shown.into_iter().rev().find_map(|c| sample_item(d, c, xf, at, depth + 1))
-        }
-        Content::Graphic(g) => {
-            let inner = xf.inverse() * at;
-            if !designcraft_geom::hit::fill_contains(&it.path.to_bezpath(), designcraft_geom::FillRule::NonZero, inner) {
-                return None;
-            }
-            // A clipping path hides the image outside it.
-            if let Some((region, even_odd)) = g.clip_region() {
-                let rule = if even_odd { designcraft_geom::FillRule::EvenOdd } else { designcraft_geom::FillRule::NonZero };
-                if !designcraft_geom::hit::fill_contains(&region, rule, inner) {
-                    return None;
-                }
-            }
-            let gp = g.xf.inverse() * inner;
-            let (w, h) = g.size;
-            // Written so that NaN (a degenerate transform) is outside too.
-            if !(w > 0.0 && h > 0.0 && gp.x >= 0.0 && gp.y >= 0.0 && gp.x < w && gp.y < h) {
-                return None;
-            }
-            let asset = d.assets.get(&g.asset).filter(|a| a.is_raster())?;
-            let img = designcraft_images::decode_rgba(&asset.data)?;
-            let (pw, ph) = img.dimensions();
-            let px = ((gp.x / w * f64::from(pw)) as u32).min(pw.checked_sub(1)?);
-            let py = ((gp.y / h * f64::from(ph)) as u32).min(ph.checked_sub(1)?);
-            let [r, gr, b, a] = img.get_pixel_checked(px, py)?.0;
-            (a > 0).then(|| (it.id, designcraft_color::Color::rgb8(r, gr, b)))
-        }
-        _ => None,
-    }
-}
-
-fn add_to_swatches(s: &mut Session, p: &Value) -> Result<Value> {
-    let st = s.doc()?;
-    let name = match str_param(p, "swatch") {
-        Some(n) => n.to_string(),
-        None => {
-            let id = st.selection.items.first().copied().ok_or_else(|| bad("swatch.addToSwatches", "select an object or give `swatch`"))?;
-            let it = st.doc.item(id).ok_or_else(|| bad("swatch.addToSwatches", "no such item"))?;
-            if str_param(p, "target") == Some("stroke") { it.stroke.swatch.clone() } else { it.fill.swatch.clone() }
-        }
-    };
-    let rename = str_param(p, "name").map(str::to_string);
-    let result = s.edit(|d, _| {
-        let w = d.swatches.iter_mut().find(|w| w.name == name).ok_or_else(|| bad("swatch.addToSwatches", format!("no swatch `{name}`")))?;
-        if w.locked {
-            return Err(bad("swatch.addToSwatches", "special swatches are already listed"));
-        }
-        w.hidden = false;
-        let Some(new) = rename.filter(|n| *n != name) else { return Ok(json!({"name": name})) };
-        if d.swatches.iter().any(|w| w.name == new) {
-            return Err(bad("swatch.addToSwatches", format!("a swatch named `{new}` exists")));
-        }
-        check_text_nesting(d, "swatch.addToSwatches")?;
-        let w = d.swatches.iter_mut().find(|w| w.name == name).ok_or_else(|| bad("swatch.addToSwatches", format!("no swatch `{name}`")))?;
-        w.name = new.clone();
-        w.named = true;
-        d.rename_swatch_refs(&name, &new);
-        Ok(json!({"name": new}))
-    })?;
-    if let Some(new) = result.get("name").and_then(Value::as_str) {
-        super::text::rename_typing_swatch(s, &name, new);
-    }
-    Ok(result)
-}
-
-/// Renaming a swatch walks every text inside a story (table cells, notes): refuse the whole edit
-/// for nesting deeper than 32 levels rather than leave deeper references at a removed name.
-fn check_text_nesting(d: &designcraft_doc::Document, id: &str) -> Result<()> {
-    fn within(st: &designcraft_doc::Story, depth: usize) -> bool {
-        depth <= 32
-            && st.tables.values().all(|t| t.cells.iter().all(|c| within(&c.text, depth + 1)))
-            && st.notes.iter().chain(&st.endnotes).all(|n| within(&n.text, depth + 1))
-    }
-    if d.stories.values().all(|st| within(st, 0)) { Ok(()) } else { Err(bad(id, "story nesting exceeds 32 levels")) }
-}
-
-/// Swatch Options: rename, Name with Color Value, colour type and value, a tint swatch's tint
-/// and base — one undo step. Every use of the swatch follows a rename.
-fn swatch_options(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "swatch.options";
-    let name = str_param(p, "name").ok_or_else(|| bad(ID, "missing name"))?.to_string();
-    let to = str_param(p, "to").map(|n| n.trim().to_string());
-    let with_value = p.get("nameWithValue").and_then(Value::as_bool);
-    let color = match p.get("color") {
-        Some(c) => Some(parse_color(c).ok_or_else(|| bad(ID, "bad color"))?),
-        None => None,
-    };
-    let spot = p.get("spot").and_then(Value::as_bool);
-    let tint = match p.get("tint") {
-        Some(v) => Some(v.as_f64().filter(|t| t.is_finite() && (0.0..=1.0).contains(t)).ok_or_else(|| bad(ID, "tint is 0–1"))? as f32),
-        None => None,
-    };
-    let base = str_param(p, "base").map(str::to_string);
-    let result = s.edit(|d, _| {
-        let w = d.swatch(&name).cloned().ok_or_else(|| bad(ID, format!("no swatch `{name}`")))?;
-        let mut w2 = w.clone();
-        if w.locked {
-            if to.as_ref().is_some_and(|t| *t != name) || with_value == Some(true) {
-                return Err(bad(ID, format!("`{name}` can't be renamed")));
-            }
-            match (&mut w2.value, color) {
-                (_, None) => {}
-                (SwatchValue::Paper { color: c }, Some(new)) => *c = new,
-                _ => return Err(bad(ID, format!("`{name}` can't be edited"))),
-            }
-            if spot.is_some() || tint.is_some() || base.is_some() {
-                return Err(bad(ID, format!("`{name}` can't be edited")));
-            }
-        } else {
-            match &mut w2.value {
-                SwatchValue::Color { color: c, color_type } => {
-                    if let Some(new) = color {
-                        *c = new;
-                    }
-                    if let Some(sp) = spot {
-                        *color_type = if sp { designcraft_color::ColorType::Spot } else { designcraft_color::ColorType::Process };
-                    }
-                    if tint.is_some() || base.is_some() {
-                        return Err(bad(ID, "only tint swatches have a tint"));
-                    }
-                }
-                SwatchValue::Tint { base: b, tint: t } => {
-                    if color.is_some() || spot.is_some() {
-                        return Err(bad(ID, "a tint swatch takes its colour from its base"));
-                    }
-                    if let Some(v) = tint {
-                        *t = v;
-                    }
-                    if let Some(nb) = &base {
-                        if !d.swatch(nb).is_some_and(|x| matches!(x.value, SwatchValue::Color { .. })) || *nb == name {
-                            return Err(bad(ID, format!("`{nb}` isn't a colour swatch")));
-                        }
-                        *b = nb.clone();
-                    }
-                }
-                _ => {
-                    if color.is_some() || spot.is_some() || tint.is_some() || base.is_some() {
-                        return Err(bad(ID, format!("`{name}` only takes a name here")));
-                    }
-                }
-            }
-            // Name with Color Value: the name is the colour's values and tracks later edits.
-            let auto = with_value.unwrap_or(!w.named && to.as_ref().is_none_or(|t| *t == name));
-            let derived = match (&w2.value, auto) {
-                (SwatchValue::Color { color, .. }, true) => Some(value_name(*color)),
-                _ => None,
-            };
-            match derived {
-                Some(n) => {
-                    w2.name = n;
-                    w2.named = false;
-                }
-                None => {
-                    if let Some(t) = &to {
-                        if t.is_empty() {
-                            return Err(bad(ID, "a swatch needs a name"));
-                        }
-                        w2.name = t.clone();
-                    }
-                    if with_value == Some(false) || w2.name != name {
-                        w2.named = true;
-                    }
-                }
-            }
-            if w2.name != name && d.swatch(&w2.name).is_some() {
-                return Err(bad(ID, format!("a swatch named `{}` exists", w2.name)));
-            }
-        }
-        let new = w2.name.clone();
-        if new != name {
-            check_text_nesting(d, ID)?;
-        }
-        let slot = d.swatches.iter_mut().find(|x| x.name == name).ok_or_else(|| bad(ID, format!("no swatch `{name}`")))?;
-        *slot = w2;
-        d.rename_swatch_refs(&name, &new);
-        Ok(json!({"name": new}))
-    })?;
-    if let Some(new) = result.get("name").and_then(Value::as_str) {
-        super::text::rename_typing_swatch(s, &name, new);
-    }
-    Ok(result)
-}
-
-/// #777: the params descriptions name the attributes, and a wrong one is the command's error.
 #[cfg(test)]
-mod attribute_error_tests {
-    use super::*;
-    use crate::cmd::find_command;
-
-    #[test]
-    fn a_wrong_attribute_names_the_command_and_the_right_attribute() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let err = |s: &mut Session, id: &str, p: Value| s.execute(id, &p).unwrap_err().to_string();
-        assert_eq!(
-            err(&mut s, "style.paragraph.create", json!({"name": "H", "chars": {"font": "Source Sans 3"}})),
-            "invalid parameters for `style.paragraph.create`: chars: unknown attribute `font`; did you mean `fontFamily`?"
-        );
-        assert_eq!(
-            err(&mut s, "style.paragraph.create", json!({"name": "H", "para": {"spaceBefor": 6}})),
-            "invalid parameters for `style.paragraph.create`: para: unknown attribute `spaceBefor`; did you mean `spaceBefore`?"
-        );
-        assert!(
-            err(&mut s, "style.character.create", json!({"name": "C", "chars": {"font": "X"}}))
-                .starts_with("invalid parameters for `style.character.create`: chars:")
-        );
-        assert!(err(&mut s, "style.paragraph.create", json!({"name": "H", "chars": "bold"})).contains("chars must be an object of attributes"));
-        s.execute("style.paragraph.create", &json!({"name": "H", "chars": {"fontFamily": "Source Sans 3", "size": 14}})).unwrap();
-        assert!(
-            err(&mut s, "style.paragraph.edit", json!({"name": "H", "chars": {"font": "X"}}))
-                .starts_with("invalid parameters for `style.paragraph.edit`: chars:")
-        );
-        s.execute("style.character.create", &json!({"name": "C", "chars": {"fontStyle": "Bold"}})).unwrap();
-        assert!(
-            err(&mut s, "style.character.edit", json!({"name": "C", "chars": {"font": "X"}}))
-                .starts_with("invalid parameters for `style.character.edit`: chars:")
-        );
-        for id in ["style.paragraph.create", "style.paragraph.edit", "style.character.create", "style.character.edit"] {
-            let doc = find_command(id).unwrap().params;
-            assert!(doc.contains("as type.char names them: fontFamily"), "{id}: {doc}");
-        }
-        assert!(find_command("style.paragraph.create").unwrap().params.contains("as type.para names them: align"));
-    }
-}
-
-#[cfg(test)]
-mod color_tests {
-    use super::*;
-
-    fn fill_session() -> Session {
-        let mut session = Session::new();
-        session.execute("file.new", &json!({})).unwrap();
-        let frame = session.execute("frame.create", &json!({"rect": [0, 0, 200, 100], "content": "text", "text": "Hi"})).unwrap();
-        session.execute("text.select", &json!({"story": frame["story"], "anchor": 0, "focus": 2})).unwrap();
-        session.execute("style.paragraph.create", &json!({"name": "Existing"})).unwrap();
-        session.execute("style.character.create", &json!({"name": "Existing"})).unwrap();
-        session.execute("type.char", &json!({"size": 18})).unwrap();
-        session.execute("edit.undo", &json!({})).unwrap();
-        session
-    }
-
-    fn assert_fill_rejected(session: &mut Session, command: &str, params: Value) {
-        let before = session.doc().unwrap().clone();
-        let journal = session.journal.clone();
-        let fill = params
-            .pointer("/chars/fill")
-            .or_else(|| params.pointer("/attrs/fill"))
-            .or_else(|| params.get("fill"))
-            .and_then(Value::as_str)
-            .unwrap_or("Missing Ink");
-
-        let result = session.execute(command, &params);
-
-        match result {
-            Err(crate::EngineError::BadParams { cmd, msg }) => {
-                assert_eq!(cmd, command);
-                assert!(msg.contains(fill), "{msg}");
-                assert!(msg.contains("swatch.create") && msg.contains("returned name"), "{msg}");
-            }
-            other => panic!("expected BadParams for {command}, got {other:?}"),
-        }
-        let after = session.doc().unwrap();
-        assert!(std::sync::Arc::ptr_eq(&before.doc, &after.doc));
-        assert_eq!(before.selection, after.selection);
-        assert_eq!(before.revision, after.revision);
-        assert_eq!(format!("{:?}", before.history), format!("{:?}", after.history));
-        assert_eq!(journal, session.journal);
-    }
-
-    #[test]
-    fn char_fill_rejects_unknown_flat_and_nested_names_when_formatting() {
-        for fill in ["Missing Ink", "#ff0000", "[black]", " [Black]"] {
-            for params in [json!({"fill": fill, "size": 24}), json!({"attrs": {"fill": fill, "size": 24}})] {
-                let mut session = fill_session();
-                assert_fill_rejected(&mut session, "type.char", params);
-            }
-        }
-    }
-
-    #[test]
-    fn char_fill_rejects_unknown_names_when_creating_or_editing_styles() {
-        for command in ["style.paragraph.create", "style.paragraph.edit", "style.character.create", "style.character.edit"] {
-            for fill in ["Missing Ink", "#ff0000"] {
-                let mut session = fill_session();
-                session.execute("style.paragraph.apply", &json!({"name": "Existing"})).unwrap();
-                session.execute("style.character.apply", &json!({"name": "Existing"})).unwrap();
-                let mut params = json!({"name": "Existing", "chars": {"fill": fill, "size": 24}});
-                // Only the edit commands take `rename`.
-                if command.ends_with(".edit") {
-                    params["rename"] = json!("Renamed");
-                }
-                assert_fill_rejected(&mut session, command, params);
-            }
-        }
-    }
-
-    #[test]
-    fn char_fill_preserves_deleted_swatch_when_creating_from_selection() {
-        for params in
-            [json!({"name": "Inherited", "fromSelection": true}), json!({"name": "Inherited", "fromSelection": true, "chars": {"size": 24}})]
-        {
-            let mut session = fill_session();
-            let swatch = session.execute("swatch.create", &json!({"name": "Deleted Ink", "color": "#108080"})).unwrap();
-            let fill = swatch["name"].as_str().unwrap();
-            session.execute("type.char", &json!({"fill": fill})).unwrap();
-            session.execute("swatch.delete", &json!({"name": fill})).unwrap();
-            assert_eq!(session.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fill"], fill);
-
-            session.execute("style.paragraph.create", &params).unwrap();
-
-            let chars = &session.doc().unwrap().doc.styles.para("Inherited").unwrap().chars;
-            assert_eq!(chars.fill.as_deref(), Some(fill));
-            if params.get("chars").is_some() {
-                assert_eq!(chars.size, Some(24.0));
-            }
-        }
-    }
-
-    #[test]
-    fn char_fill_rejects_explicit_unknown_name_when_creating_from_selection() {
-        for fill in ["Missing Ink", "#ff0000"] {
-            let mut session = fill_session();
-
-            assert_fill_rejected(
-                &mut session,
-                "style.paragraph.create",
-                json!({"name": "Explicit", "fromSelection": true, "chars": {"fill": fill, "size": 24}}),
-            );
-        }
-    }
-
-    #[test]
-    fn char_fill_accepts_valid_override_when_selection_has_unknown_name() {
-        let mut session = fill_session();
-        session
-            .edit(|document, selection| {
-                let selected = selection.text.unwrap();
-                document.story_mut(selected.story).unwrap().format_chars(selected.range(), |format| format.over.fill = Some("Missing Ink".into()));
-                Ok(())
-            })
-            .unwrap();
-
-        session.execute("style.paragraph.create", &json!({"name": "Override", "fromSelection": true, "chars": {"fill": "[Paper]"}})).unwrap();
-
-        assert_eq!(session.doc().unwrap().doc.styles.para("Override").unwrap().chars.fill.as_deref(), Some("[Paper]"));
-    }
-
-    #[test]
-    fn char_fill_rejects_unknown_name_when_changing_text_even_without_output() {
-        for (find, change) in [("Hi", "Bye"), ("Hi", ""), ("Absent", "Bye")] {
-            for fill in ["Missing Ink", "#ff0000"] {
-                let mut session = fill_session();
-                assert_fill_rejected(&mut session, "find.change", json!({"find": find, "change": change, "attrs": {"fill": fill}}));
-            }
-        }
-    }
-
-    #[test]
-    fn char_fill_preserves_exact_registered_names_when_used_at_all_boundaries() {
-        for fill in ["Brand Ink", "#ff0000", "[None]", "[Black]"] {
-            let mut session = fill_session();
-            if !fill.starts_with('[') {
-                let created = session.execute("swatch.create", &json!({"name": fill, "color": "#108080"})).unwrap();
-                assert_eq!(created["name"], fill);
-            }
-            for params in [json!({"fill": fill}), json!({"attrs": {"fill": fill}})] {
-                session.execute("type.char", &params).unwrap();
-                assert_eq!(session.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fill"], fill);
-            }
-            for kind in ["paragraph", "character"] {
-                session.execute(&format!("style.{kind}.create"), &json!({"name": "Colored", "chars": {"fill": fill}})).unwrap();
-                session.execute(&format!("style.{kind}.edit"), &json!({"name": "Existing", "chars": {"fill": fill}})).unwrap();
-                let document = &session.doc().unwrap().doc;
-                for name in ["Colored", "Existing"] {
-                    let attrs = if kind == "paragraph" {
-                        &document.styles.para(name).unwrap().chars
-                    } else {
-                        &document.styles.char_style(name).unwrap().chars
-                    };
-                    assert_eq!(attrs.fill.as_deref(), Some(fill));
-                }
-            }
-            assert_eq!(session.execute("find.change", &json!({"find": "Hi", "change": "Bye", "attrs": {"fill": fill}})).unwrap()["count"], 1);
-            let selected = session.doc().unwrap().selection.text.unwrap();
-            let story = session.doc().unwrap().doc.story(selected.story).unwrap();
-            assert_eq!(story.text, "Bye");
-            assert_eq!(story.format_after(0).over.fill.as_deref(), Some(fill));
-        }
-    }
-
-    #[test]
-    fn char_fill_accepts_omitted_and_null_attributes_when_used_at_all_boundaries() {
-        for chars in [json!({"size": 18}), json!({"fill": null})] {
-            let mut session = fill_session();
-            session.execute("type.char", &json!({"attrs": chars})).unwrap();
-            for kind in ["paragraph", "character"] {
-                session.execute(&format!("style.{kind}.create"), &json!({"name": "Nullable", "chars": chars})).unwrap();
-                session.execute(&format!("style.{kind}.edit"), &json!({"name": "Existing", "chars": chars})).unwrap();
-            }
-            assert_eq!(session.execute("find.change", &json!({"find": "Hi", "change": "Bye", "attrs": chars})).unwrap()["count"], 1);
-        }
-    }
-
-    #[test]
-    fn percent_components_at_most_one_stay_percent() {
-        use designcraft_color::Color;
-        // {"c": 0.7, ..., "y": 12.2} is a pale cream (C 0.7 %, Y 12.2 %), not C 70 %.
-        let Some(Color::Cmyk { c, m, y, k }) = parse_color(&json!({"c": 0.7, "m": 0, "y": 12.2, "k": 0})) else { panic!("not CMYK") };
-        assert!((c - 0.007).abs() < 1e-6 && m == 0.0 && (y - 0.122).abs() < 1e-6 && k == 0.0, "got {c} {m} {y} {k}");
-        // Fractions take the colour's own form, with its model.
-        let Some(Color::Cmyk { c, k, .. }) = parse_color(&json!({"model": "cmyk", "c": 0.5, "m": 0, "y": 0, "k": 1})) else { panic!("not CMYK") };
-        assert!((c - 0.5).abs() < 1e-6 && (k - 1.0).abs() < 1e-6);
-        // RGB arrays follow the same rule: [1, 128, 255] is 0..255.
-        let Some(Color::Rgb { r, g, b }) = parse_color(&json!([1, 128, 255])) else { panic!("not RGB") };
-        assert!((r - 1.0 / 255.0).abs() < 1e-6 && (g - 128.0 / 255.0).abs() < 1e-6 && (b - 1.0).abs() < 1e-6);
-    }
-
-    /// #910: `{c: 1, m: 0, y: 0, k: 0}` is a 1 % cyan tint, not solid cyan, though every component is within 0..1.
-    #[test]
-    fn cmyk_percentages_of_one_or_less_stay_percent() {
-        use designcraft_color::Color;
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let id = s.execute("frame.create", &json!({"rect": [0, 0, 50, 50]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("swatch.create", &json!({"name": "Tint1", "color": {"c": 1, "m": 0, "y": 0, "k": 0}})).unwrap();
-        s.execute("object.fill", &json!({"ids": [id], "swatch": "Tint1"})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let Some(Color::Cmyk { c, m, y, k }) = d.resolve_color("Tint1", 1.0) else { panic!("not CMYK") };
-        assert!((c - 0.01).abs() < 1e-6 && m == 0.0 && y == 0.0 && k == 0.0, "got {c} {m} {y} {k}");
-        let pdf = designcraft_pdf::export_pdf(d, &s.cache, &designcraft_pdf::PdfOptions { compress: false, ..Default::default() }).unwrap();
-        let text = String::from_utf8_lossy(&pdf);
-        // Operands of every `k` (DeviceCMYK fill), last first: [k, y, m, c]. Inks are written in 1/255 steps (C 1 % is 3/255).
-        let fills: Vec<Vec<f32>> =
-            text.split(" k ").filter_map(|before| before.rsplit(' ').take(4).map(|x| x.parse().ok()).collect::<Option<Vec<f32>>>()).collect();
-        let cyan = |want: f32| fills.iter().any(|f| (f[3] - want).abs() < 0.5 / 255.0 + 1e-6 && f[..3] == [0.0; 3]);
-        assert!(cyan(0.01), "C 1 % in the PDF: {fills:?}");
-        assert!(!cyan(1.0), "no solid cyan: {fills:?}");
-        // A light tint whose components are all 1 or less, through object.color.
-        s.execute("selection.set", &json!({"ids": [id]})).unwrap();
-        s.execute("object.color", &json!({"color": {"c": 0.5, "m": 0.5, "y": 0, "k": 0}})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let fill = &d.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch;
-        let Some(Color::Cmyk { c, m, .. }) = d.resolve_color(fill, 1.0) else { panic!("not CMYK") };
-        assert!((c - 0.005).abs() < 1e-6 && (m - 0.005).abs() < 1e-6, "got {c} {m}");
-    }
-
-    #[test]
-    fn a_colour_with_a_model_is_read_as_fractions_without_guessing() {
-        use designcraft_color::Color;
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let id = s.execute("frame.create", &json!({"rect": [0, 0, 50, 50]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("selection.set", &json!({"ids": [id]})).unwrap();
-        let fill = |s: &Session| {
-            let d = &s.doc().unwrap().doc;
-            d.resolve_color(&d.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch, 1.0).unwrap()
-        };
-        // M 1 % from the Color panel: not M 100 % (magenta), though every component is within 0..1.
-        s.execute("object.color", &json!({"color": {"model": "cmyk", "c": 0, "m": 0.01, "y": 0, "k": 0}})).unwrap();
-        let Color::Cmyk { c, m, y, k } = fill(&s) else { panic!("not CMYK") };
-        assert!(c == 0.0 && (m - 0.01).abs() < 1e-6 && y == 0.0 && k == 0.0, "got {c} {m} {y} {k}");
-        // R 1 of 255 is a near black, not pure red.
-        s.execute("object.color", &json!({"color": {"model": "rgb", "r": 1.0 / 255.0, "g": 0, "b": 0}})).unwrap();
-        let Color::Rgb { r, g, b } = fill(&s) else { panic!("not RGB") };
-        assert!((r - 1.0 / 255.0).abs() < 1e-6 && g == 0.0 && b == 0.0, "got {r} {g} {b}");
-        // Out of range or not a model: refused rather than guessed.
-        assert!(s.execute("object.color", &json!({"color": {"model": "cmyk", "c": 0, "m": 50, "y": 0, "k": 0}})).is_err());
-        assert!(s.execute("object.color", &json!({"color": {"model": "hsb", "h": 0, "s": 0, "b": 0}})).is_err());
-    }
-
-    #[test]
-    fn colours_that_round_to_the_same_name_share_one_swatch() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let id = s.execute("frame.create", &json!({"rect": [0, 0, 50, 50]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("selection.set", &json!({"ids": [id]})).unwrap();
-        let n = |s: &Session| s.doc().unwrap().doc.swatches.len();
-        let first = s.execute("object.color", &json!({"color": {"model": "cmyk", "c": 0.1, "m": 0.5, "y": 1, "k": 0}})).unwrap();
-        let before = n(&s);
-        for m in [0.501, 0.499, 0.5041] {
-            let r = s.execute("object.color", &json!({"color": {"model": "cmyk", "c": 0.1, "m": m, "y": 1, "k": 0}})).unwrap();
-            assert_eq!(r["swatch"], first["swatch"], "M {m}");
-        }
-        s.execute("object.color", &json!({"color": {"model": "rgb", "r": 0.5, "g": 0.25, "b": 0}})).unwrap();
-        s.execute("object.color", &json!({"color": {"model": "rgb", "r": 0.5005, "g": 0.25, "b": 0}})).unwrap();
-        assert_eq!(n(&s), before + 1, "no hidden twins for values a fraction of a step apart");
-        // A whole percent apart is a different colour.
-        let r = s.execute("object.color", &json!({"color": {"model": "cmyk", "c": 0.1, "m": 0.51, "y": 1, "k": 0}})).unwrap();
-        assert_eq!(r["swatch"], "C=10 M=51 Y=100 K=0");
-    }
-
-    #[test]
-    fn style_groups_rename_every_use() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Head"})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Sub", "basedOn": "Head"})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hi"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 2})).unwrap();
-        s.execute("style.paragraph.apply", &json!({"name": "Head"})).unwrap();
-        let r = s.execute("style.group", &json!({"kind": "paragraph", "names": ["Head", "Sub"], "group": "Titles"})).unwrap();
-        assert_eq!(r["renamed"]["Head"], "Titles/Head");
-        let d = s.doc().unwrap().doc.clone();
-        assert_eq!(d.story(designcraft_doc::StoryId(sid)).unwrap().paras[0].style, "Titles/Head");
-        assert_eq!(d.styles.para("Titles/Sub").unwrap().based_on.as_deref(), Some("Titles/Head"));
-        // Out of the group again.
-        s.execute("style.group", &json!({"kind": "paragraph", "names": ["Titles/Head"], "group": ""})).unwrap();
-        assert!(s.doc().unwrap().doc.styles.para("Head").is_some());
-        assert!(s.execute("style.group", &json!({"names": ["[Basic Paragraph]"], "group": "X"})).is_err());
-    }
-
-    #[test]
-    fn character_style_edit_sets_unsets_rebases_and_renames_every_use() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Base", "chars": {"fontStyle": "Bold"}})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Emphasis", "chars": {"fontStyle": "Italic", "tracking": 20}})).unwrap();
-        s.execute(
-            "style.paragraph.create",
-            &json!({"name": "Lead", "para": {
-                "nestedStyles": [{"style": "Emphasis", "through": true, "count": 1, "until": {"kind": "words"}}],
-                "grepStyles": [{"style": "Emphasis", "pattern": "\\d+"}],
-                "nestedLineStyles": [{"style": "Emphasis", "lines": 1}]}}),
-        )
-        .unwrap();
-        s.execute("footnote.options", &json!({"refCharStyle": "Emphasis"})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hi there"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 2})).unwrap();
-        s.execute("style.character.apply", &json!({"name": "Emphasis"})).unwrap();
-
-        s.execute(
-            "style.character.edit",
-            &json!({"name": "Emphasis", "rename": "Strong", "basedOn": "Base", "chars": {"size": 14, "fill": "[Paper]", "fontStyle": null}}),
-        )
-        .unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        assert!(d.styles.char_style("Emphasis").is_none());
-        let st = d.styles.char_style("Strong").unwrap();
-        assert_eq!(st.based_on.as_deref(), Some("Base"));
-        // Exactly the attributes set: `null` unset the font style, the rest stayed unset.
-        assert_eq!(st.chars, CharAttrs { size: Some(14.0), fill: Some("[Paper]".into()), tracking: Some(20.0), ..Default::default() });
-        let story = d.story(designcraft_doc::StoryId(sid)).unwrap();
-        assert!(story.chars.iter().any(|r| r.format.style == "Strong"));
-        assert!(story.chars.iter().all(|r| r.format.style != "Emphasis"));
-        let lead = d.styles.para("Lead").unwrap();
-        assert_eq!(lead.para.nested_styles.as_ref().unwrap()[0].style, "Strong");
-        assert_eq!(lead.para.grep_styles.as_ref().unwrap()[0].style, "Strong");
-        assert_eq!(lead.para.nested_line_styles.as_ref().unwrap()[0].style, "Strong");
-        assert_eq!(d.footnote_options.ref_char_style, "Strong");
-
-        // Based On [None] (null or the name) clears it.
-        s.execute("style.character.edit", &json!({"name": "Strong", "basedOn": null})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.styles.char_style("Strong").unwrap().based_on, None);
-        s.execute("style.character.edit", &json!({"name": "Strong", "basedOn": "Base"})).unwrap();
-        s.execute("style.character.edit", &json!({"name": "Strong", "basedOn": "[None]"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.styles.char_style("Strong").unwrap().based_on, None);
-
-        // Refused: a based-on cycle, an unknown parent, a taken or empty name, editing [None].
-        s.execute("style.character.edit", &json!({"name": "Strong", "basedOn": "Base"})).unwrap();
-        assert!(s.execute("style.character.edit", &json!({"name": "Base", "basedOn": "Strong"})).is_err());
-        assert!(s.execute("style.character.edit", &json!({"name": "Strong", "basedOn": "Nope"})).is_err());
-        assert!(s.execute("style.character.edit", &json!({"name": "Strong", "rename": "Base"})).is_err());
-        assert!(s.execute("style.character.edit", &json!({"name": "Strong", "rename": "  "})).is_err());
-        assert!(s.execute("style.character.edit", &json!({"name": "[None]", "chars": {"size": 9}})).is_err());
-        assert!(s.doc().unwrap().doc.styles.char_style("[None]").unwrap().chars.is_empty());
-    }
-
-    #[test]
-    fn continue_numbering_in_a_style_overrides_an_inherited_start_at() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Steps", "para": {"listType": "numbers", "startAt": 5}})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "More Steps", "basedOn": "Steps"})).unwrap();
-        let start = |s: &Session, name: &str| s.doc().unwrap().doc.styles.resolve_para_style(name).0.start_at;
-        assert_eq!(start(&s, "More Steps"), Some(5), "inherited");
-        s.execute("style.paragraph.edit", &json!({"name": "More Steps", "para": {"startAt": null}})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.styles.para("More Steps").unwrap().para.start_at, Some(None));
-        assert_eq!(start(&s, "More Steps"), None, "continues");
-        assert_eq!(start(&s, "Steps"), Some(5), "the parent keeps its Start At");
-        s.execute("style.paragraph.edit", &json!({"name": "Steps", "para": {"startAt": null}})).unwrap();
-        assert_eq!(start(&s, "Steps"), None);
-        s.execute("style.paragraph.create", &json!({"name": "Fresh", "basedOn": "More Steps", "para": {"start_at": null}})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.styles.para("Fresh").unwrap().para.start_at, Some(None));
-    }
-
-    #[test]
-    fn null_kinsoku_sets_the_default_rules_over_a_based_on_set() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let hard = serde_json::to_value(designcraft_doc::cjk::Kinsoku::named("HardKinsoku").unwrap()).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Base", "para": {"kinsoku": hard}})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Body", "basedOn": "Base", "para": {"kinsoku": hard}})).unwrap();
-        s.execute("style.paragraph.edit", &json!({"name": "Body", "para": {"kinsoku": null}})).unwrap();
-        let styles = s.doc().unwrap().doc.styles.clone();
-        assert_eq!(styles.para("Body").unwrap().para.kinsoku, Some(None));
-        assert_eq!(styles.resolve_para_style("Body").0.kinsoku, None, "Base's set no longer applies");
-        // An edit without the attribute keeps it.
-        s.execute("style.paragraph.edit", &json!({"name": "Body", "para": {"rensuuji": false}})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.styles.para("Body").unwrap().para.kinsoku, Some(None));
-    }
-
-    #[test]
-    fn new_character_style_checks_its_based_on() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        assert!(s.execute("style.character.create", &json!({"name": "Orphan", "basedOn": "Nope"})).is_err());
-        s.execute("style.character.create", &json!({"name": "Plain", "basedOn": "[None]", "chars": {"size": 9}})).unwrap();
-        let st = s.doc().unwrap().doc.styles.char_style("Plain").cloned().unwrap();
-        assert_eq!((st.based_on, st.chars), (None, CharAttrs { size: Some(9.0), ..Default::default() }));
-    }
-
-    #[test]
-    fn swatches_save_and_load_ase() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("swatch.create", &json!({"name": "Brand Teal", "color": "#108080"})).unwrap();
-        let b64 = s.execute("swatch.save", &json!({"names": ["Brand Teal"]})).unwrap()["base64"].as_str().unwrap().to_string();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("swatch.load", &json!({"base64": b64})).unwrap();
-        assert_eq!(r["added"], 1);
-        assert!(s.doc().unwrap().doc.swatch("Brand Teal").is_some());
-        let r = s.execute("swatch.load", &json!({"base64": b64})).unwrap();
-        assert_eq!((r["added"].as_u64(), r["replaced"].as_u64()), (Some(0), Some(0)));
-        assert!(s.execute("swatch.load", &json!({"base64": "AAAA"})).is_err());
-    }
-
-    #[test]
-    fn loading_swatches_matches_the_first_swatch_of_each_name() {
-        use designcraft_color::{Color, ColorType};
-        let ink = |k: f32| SwatchValue::Color { color: Color::cmyk(0.0, 0.0, 0.0, k), color_type: ColorType::Process };
-        let sw = |name: &str, k: f32| Swatch { name: name.into(), value: ink(k), locked: false, named: true, hidden: false };
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        // Two swatches share a name, and an unnamed color is hidden.
-        s.edit(|d, _| {
-            d.swatches.extend([sw("Twin", 0.1), sw("Twin", 0.2), Swatch { named: false, hidden: true, ..sw("Unnamed", 0.3) }]);
-            Ok(())
-        })
-        .unwrap();
-        let file = designcraft_color::ase::write(&[sw("New", 0.4), sw("New", 0.5), sw("Twin", 0.6), sw("Unnamed", 0.7), sw("[Black]", 0.8)]);
-        let b64 = crate::cmd::base64_encode(&file);
-        let named = |s: &Session, name: &str| -> Vec<(SwatchValue, bool)> {
-            s.doc().unwrap().doc.swatches.iter().filter(|w| w.name == name).map(|w| (w.value.clone(), w.hidden)).collect()
-        };
-        // With `replace`, the file's second "New" is added as "New 2", only the first "Twin" changes, the hidden
-        // swatch becomes visible, and the locked [Black] stays.
-        let r = s.execute("swatch.load", &json!({"base64": b64, "replace": true})).unwrap();
-        assert_eq!((r["added"].as_u64(), r["replaced"].as_u64()), (Some(2), Some(2)));
-        assert_eq!(named(&s, "New"), [(ink(0.4), false)]);
-        assert_eq!(named(&s, "New 2"), [(ink(0.5), false)]);
-        assert_eq!(named(&s, "Twin"), [(ink(0.6), false), (ink(0.2), false)]);
-        assert_eq!(named(&s, "Unnamed"), [(ink(0.7), false)]);
-        assert_eq!(named(&s, "[Black]"), [(ink(1.0), false)]);
-        // Without it, every name is already there and nothing changes.
-        let before = s.doc().unwrap().doc.swatches.clone();
-        let r = s.execute("swatch.load", &json!({"base64": b64})).unwrap();
-        assert_eq!((r["added"].as_u64(), r["replaced"].as_u64()), (Some(0), Some(0)));
-        assert_eq!(s.doc().unwrap().doc.swatches, before);
-    }
-
-    #[test]
-    fn loading_swatches_numbers_repeated_names_and_names_unnamed_colors() {
-        use designcraft_color::{Color, ColorType};
-        let ink = |k: f32| SwatchValue::Color { color: Color::cmyk(0.0, 0.0, 0.0, k), color_type: ColorType::Process };
-        let sw = |name: &str, k: f32| Swatch { name: name.into(), value: ink(k), locked: false, named: true, hidden: false };
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.edit(|d, _| {
-            d.swatches.push(sw("Kept", 0.1));
-            Ok(())
-        })
-        .unwrap();
-        // "Red 2" comes before the second "Red", which takes "Red 3". Two unnamed colors share a value.
-        let file = designcraft_color::ase::write(&[
-            sw("Red", 0.2),
-            sw("Red 2", 0.3),
-            sw("Red", 0.4),
-            sw("", 0.55),
-            sw("", 0.55),
-            sw("", 0.65),
-            sw("Kept", 0.7),
-        ]);
-        let b64 = crate::cmd::base64_encode(&file);
-        let named = |s: &Session, name: &str| -> Vec<(SwatchValue, bool)> {
-            s.doc().unwrap().doc.swatches.iter().filter(|w| w.name == name).map(|w| (w.value.clone(), w.named)).collect()
-        };
-        // Names already in the document are kept.
-        let r = s.execute("swatch.load", &json!({"base64": b64})).unwrap();
-        assert_eq!((r["added"].as_u64(), r["replaced"].as_u64()), (Some(6), Some(0)));
-        assert_eq!(named(&s, "Red"), [(ink(0.2), true)]);
-        assert_eq!(named(&s, "Red 2"), [(ink(0.3), true)]);
-        assert_eq!(named(&s, "Red 3"), [(ink(0.4), true)]);
-        assert_eq!(named(&s, "C=0 M=0 Y=0 K=55"), [(ink(0.55), false)]);
-        assert_eq!(named(&s, "C=0 M=0 Y=0 K=55 2"), [(ink(0.55), false)]);
-        assert_eq!(named(&s, "C=0 M=0 Y=0 K=65"), [(ink(0.65), false)]);
-        assert_eq!(named(&s, "Kept"), [(ink(0.1), true)]);
-        assert!(named(&s, "").is_empty());
-        // With `replace`, the same file again replaces each of its colors once.
-        let r = s.execute("swatch.load", &json!({"base64": b64, "replace": true})).unwrap();
-        assert_eq!((r["added"].as_u64(), r["replaced"].as_u64()), (Some(0), Some(7)));
-        assert_eq!(named(&s, "Red"), [(ink(0.2), true)]);
-        assert_eq!(named(&s, "Red 3"), [(ink(0.4), true)]);
-        assert_eq!(named(&s, "Kept"), [(ink(0.7), true)]);
-    }
-
-    #[test]
-    fn unnamed_colors_then_add_to_swatches() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let id = s.execute("frame.create", &json!({"rect": [0, 0, 50, 50]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("selection.set", &json!({"ids": [id]})).unwrap();
-        let listed = |s: &Session| s.doc().unwrap().doc.swatches.iter().filter(|w| !w.hidden).count();
-        let before = listed(&s);
-        let r = s.execute("object.color", &json!({"color": {"c": 10, "m": 20, "y": 30, "k": 0}})).unwrap();
-        assert_eq!(r["swatch"], "C=10 M=20 Y=30 K=0");
-        assert_eq!(listed(&s), before, "unnamed: not in the Swatches panel");
-        // The same colour again reuses it; the stroke target works too.
-        let n = s.doc().unwrap().doc.swatches.len();
-        s.execute("object.color", &json!({"color": {"c": 10, "m": 20, "y": 30, "k": 0}, "target": "stroke"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.swatches.len(), n);
-        let d = &s.doc().unwrap().doc;
-        let it = d.item(designcraft_doc::ItemId(id)).unwrap();
-        assert_eq!(it.fill.swatch, it.stroke.swatch);
-        // Add to Swatches with a name: listed, and the object follows the rename.
-        s.execute("swatch.addToSwatches", &json!({"name": "Sand"})).unwrap();
-        assert_eq!(listed(&s), before + 1);
-        let d = &s.doc().unwrap().doc;
-        assert_eq!(d.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch, "Sand");
-        // A colour equal to an existing swatch applies that swatch.
-        s.execute("object.color", &json!({"color": {"c": 10, "m": 20, "y": 30, "k": 0}})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch, "Sand");
-    }
-
-    #[test]
-    fn add_to_swatches_renames_the_colour_in_text_cells_and_notes() {
-        use std::sync::Arc;
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Hello world"})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 11})).unwrap();
-        s.execute("endnote.insert", &json!({"text": "end"})).unwrap();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 11})).unwrap();
-        s.execute("footnote.insert", &json!({"text": "note"})).unwrap();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 1, "cols": 1})).unwrap();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 1, "focus": 4})).unwrap();
-        let old = s.execute("object.color", &json!({"color": {"c": 10, "m": 20, "y": 30, "k": 0}})).unwrap()["swatch"].as_str().unwrap().to_string();
-        // The same unnamed colour on a cell, the cell's text and the footnote's text.
-        s.edit(|d, _| {
-            let st = d.story_mut(sid).unwrap();
-            let t = Arc::make_mut(st.tables.values_mut().next().unwrap());
-            t.cells[0].fill = old.clone();
-            t.cells[0].text.chars[0].format.over.fill = Some(old.clone());
-            Arc::make_mut(&mut st.notes[0]).text.chars[0].format.over.stroke = Some(old.clone());
-            Arc::make_mut(&mut st.endnotes[0]).text.chars[0].format.over.underline_color = Some(old.clone());
-            Ok(())
-        })
-        .unwrap();
-        s.execute("swatch.addToSwatches", &json!({"swatch": old, "name": "Sand"})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let st = d.story(sid).unwrap();
-        assert_eq!(st.char_format_at(2).over.fill.as_deref(), Some("Sand"));
-        let cell = &st.tables.values().next().unwrap().cells[0];
-        assert_eq!(cell.fill, "Sand");
-        assert_eq!(cell.text.chars[0].format.over.fill.as_deref(), Some("Sand"));
-        assert_eq!(st.notes[0].text.chars[0].format.over.stroke.as_deref(), Some("Sand"));
-        assert_eq!(st.endnotes[0].text.chars[0].format.over.underline_color.as_deref(), Some("Sand"));
-        d.check().unwrap();
-    }
-}
-
-#[cfg(test)]
-mod group_sample_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// Grouping the sample's table styles keeps its table cells styled (no missing styles).
-    #[test]
-    fn grouping_reaches_table_cells() {
-        let mut s = Session::new();
-        s.execute("file.newSample", &json!({})).unwrap();
-        let before = s.execute("preflight.run", &json!({})).unwrap()["errors"].as_u64().unwrap();
-        s.execute("style.group", &json!({"kind": "paragraph", "names": ["Table Head", "Table Body"], "group": "Tables"})).unwrap();
-        let after = s.execute("preflight.run", &json!({})).unwrap();
-        assert_eq!(after["errors"].as_u64().unwrap(), before, "{after}");
-    }
-}
-
-#[cfg(test)]
-mod color_group_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn color_groups_hold_swatches_and_round_trip() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let a = s.execute("swatch.create", &json!({"name": "Brand Red", "color": {"c": 0, "m": 100, "y": 100, "k": 0}})).unwrap()["name"]
-            .as_str()
-            .unwrap()
-            .to_string();
-        let b = s.execute("swatch.create", &json!({"name": "Brand Blue", "color": {"c": 100, "m": 60, "y": 0, "k": 0}})).unwrap()["name"]
-            .as_str()
-            .unwrap()
-            .to_string();
-        let g = s.execute("swatch.newColorGroup", &json!({"name": "Brand", "swatches": [a]})).unwrap();
-        assert_eq!(g["name"], "Brand");
-        assert!(s.execute("swatch.newColorGroup", &json!({"swatches": ["[Black]"]})).is_err(), "special swatches stay at the top");
-        s.execute("swatch.moveToGroup", &json!({"swatches": [b], "group": "Brand"})).unwrap();
-        let groups = |s: &Session| s.doc().unwrap().doc.color_groups.clone();
-        assert_eq!(groups(&s)[0].swatches, [a.clone(), b.clone()]);
-        let bytes = designcraft_idml::export_idml(&s.doc().unwrap().doc);
-        let back = designcraft_idml::import_idml(&bytes).unwrap();
-        assert_eq!(back.color_groups, groups(&s), "IDML ColorGroup");
-        s.execute("swatch.delete", &json!({"name": b})).unwrap();
-        assert_eq!(groups(&s)[0].swatches, [a.as_str()]);
-        s.execute("swatch.renameColorGroup", &json!({"name": "Brand", "to": "Identity"})).unwrap();
-        s.execute("swatch.ungroupColorGroup", &json!({"name": "Identity"})).unwrap();
-        assert!(groups(&s).is_empty());
-        assert!(s.doc().unwrap().doc.swatch(&a).is_some(), "ungrouping keeps the swatches");
-    }
-}
-
-#[cfg(test)]
-mod ink_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn ink_manager_converts_and_aliases_spots_in_pdf() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        for (n, c) in [("Pantone A", [0, 50, 100, 0]), ("Pantone B", [100, 0, 0, 0])] {
-            s.execute("swatch.create", &json!({"name": n, "spot": true, "color": {"c": c[0], "m": c[1], "y": c[2], "k": c[3]}})).unwrap();
-        }
-        let id = s.execute("frame.create", &json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].clone();
-        s.execute("object.fill", &json!({"swatch": "Pantone A", "ids": [id]})).unwrap();
-        let pdf = |s: &mut Session| {
-            let b = s.execute("file.exportPdf", &json!({})).unwrap()["base64"].as_str().unwrap().to_string();
-            String::from_utf8_lossy(&super::super::file::base64_decode(&b)).into_owned()
-        };
-        assert!(pdf(&mut s).contains("Pantone"), "a separation");
-        s.execute("ink.options", &json!({"ink": "Pantone A", "alias": "Pantone B"})).unwrap();
-        let p = pdf(&mut s);
-        assert!(p.contains("Pantone#20B") || p.contains("Pantone B"), "aliased onto B");
-        assert!(!p.contains("Pantone#20A") && !p.contains("/Pantone A"));
-        s.execute("ink.options", &json!({"allToProcess": true})).unwrap();
-        assert!(!pdf(&mut s).contains("Pantone"), "all spots to process");
-        let l = s.execute("ink.list", &json!({})).unwrap();
-        assert_eq!(l["inks"][0]["alias"], "Pantone B");
-        let back = designcraft_idml::import_idml(&designcraft_idml::export_idml(&s.doc().unwrap().doc)).unwrap();
-        assert!(back.inks.resolve("Pantone A").1, "IDML ConvertToProcess");
-        assert!(back.inks.aliases.iter().any(|(a, b)| a == "Pantone A" && b == "Pantone B"), "IDML AliasInkName");
-        assert!(s.execute("ink.options", &json!({"ink": "[Black]", "toProcess": true})).is_err());
-    }
-}
-
-#[cfg(test)]
-mod export_tag_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn export_tagging_shapes_epub_markup() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Chapter Title", "chars": {"size": 24}})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Key Term", "chars": {"fontStyle": "Bold"}})).unwrap();
-        s.execute("style.exportTag", &json!({"style": "Chapter Title", "tag": "h1", "class": "chapter"})).unwrap();
-        s.execute("style.exportTag", &json!({"style": "Key Term", "character": true, "tag": "strong"})).unwrap();
-        assert!(s.execute("style.exportTag", &json!({"style": "Nope"})).is_err());
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Origins\nA word"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
-        s.execute("style.paragraph.apply", &json!({"name": "Chapter Title"})).unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 10, "focus": 14})).unwrap();
-        s.execute("style.character.apply", &json!({"name": "Key Term"})).unwrap();
-        let html = s.execute("file.exportHtml", &json!({})).unwrap()["text"].as_str().unwrap().to_string();
-        assert!(html.contains("<h1 class=\"chapter\">Origins</h1>"), "{html}");
-        assert!(html.contains("<strong class=\"key-term\">word</strong>"), "{html}");
-        // Tagged PDF: a heading element and a paragraph element.
-        let r = s.execute("file.exportPdf", &json!({"tagged": true, "compressImages": false})).unwrap();
-        let pdf = super::super::file::base64_decode(r["base64"].as_str().unwrap());
-        let text = String::from_utf8_lossy(&pdf);
-        assert!(text.contains("/S/H1") && text.contains("/S/P"), "structure elements");
-        assert!(designcraft_render::pdf_page_count(&pdf) == Some(1));
-    }
-}
-
-#[cfg(test)]
-mod cjk_tests {
-    use super::*;
-    #[test]
-    fn cjk_composite_font_command_invalidates_layout_and_undo_restores_it() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 150], "content": "text", "text": "AB"})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        let definition = |scale| json!({"name": "Mixed", "entries": [{"family": "Source Serif 4", "relativeSize": scale}]});
-        s.execute("style.compositeFont.set", &definition(1.0)).unwrap();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 2})).unwrap();
-        s.execute("type.char", &json!({"fontFamily": "Mixed", "leadingAki": 0.25, "jidori": 4})).unwrap();
-        let old = s.cache.get(&s.doc().unwrap().doc, sid, None);
-        s.execute("style.compositeFont.set", &definition(2.0)).unwrap();
-        let new = s.cache.get(&s.doc().unwrap().doc, sid, None);
-        assert!(!std::sync::Arc::ptr_eq(&old, &new));
-        assert!(new.frames[0].lines[0].end_x > old.frames[0].lines[0].end_x);
-        s.execute("edit.undo", &json!({})).unwrap();
-        let restored = s.cache.get(&s.doc().unwrap().doc, sid, None);
-        assert_eq!(old.frames[0].lines[0].end_x, restored.frames[0].lines[0].end_x);
-        assert!(s.execute("style.compositeFont.set", &definition(-1.0)).is_err());
-    }
-}
-
-#[cfg(test)]
-mod delete_tests {
-    use designcraft_doc::{CellStyle, ObjectStyle, StoryId, Toc, TocEntry};
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// Is `name` still named anywhere in the document?
-    fn named(s: &Session, name: &str) -> bool {
-        serde_json::to_string(&*s.doc().unwrap().doc).unwrap().contains(&format!("\"{name}\""))
-    }
-
-    fn char_doc() -> (Session, u64) {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Base", "chars": {"fontStyle": "Bold"}})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Emphasis", "basedOn": "Base", "chars": {"tracking": 20}})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Child", "basedOn": "Emphasis"})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Strong", "chars": {"size": 14}})).unwrap();
-        let refs = json!({
-            "nestedStyles": [{"style": "Emphasis", "through": true, "count": 1, "until": {"kind": "words"}}],
-            "grepStyles": [{"style": "Emphasis", "pattern": "\\d+"}],
-            "nestedLineStyles": [{"style": "Emphasis", "lines": 1}],
-            "dropCapLines": 2, "dropCapChars": 1, "dropCapStyle": "Emphasis"});
-        s.execute("style.paragraph.create", &json!({"name": "Lead", "para": refs})).unwrap();
-        s.execute("footnote.options", &json!({"refCharStyle": "Emphasis"})).unwrap();
-        let sid = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hi there"})).unwrap()["story"]
-            .as_u64()
-            .unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 2})).unwrap();
-        s.execute("style.character.apply", &json!({"name": "Emphasis"})).unwrap();
-        // Local paragraph overrides name it too.
-        s.execute("type.para", &json!({"attrs": refs})).unwrap();
-        s.edit(|d, _| {
-            d.styles_mut().default_character = "Emphasis".into();
-            Ok(())
-        })
-        .unwrap();
-        assert!(named(&s, "Emphasis"));
-        (s, sid)
-    }
-
-    #[test]
-    fn deleting_a_character_style_points_every_use_at_the_replacement() {
-        let (mut s, sid) = char_doc();
-        let undo = s.doc().unwrap().history.undo.len();
-        s.execute("style.character.delete", &json!({"name": "Emphasis", "replaceWith": "Strong"})).unwrap();
-        assert!(!named(&s, "Emphasis"), "no dangling reference");
-        let d = s.doc().unwrap().doc.clone();
-        assert_eq!(d.styles.char_style("Child").unwrap().based_on.as_deref(), Some("Strong"));
-        assert_eq!(d.story(StoryId(sid)).unwrap().chars[0].format.style, "Strong");
-        let lead = &d.styles.para("Lead").unwrap().para;
-        assert_eq!(lead.nested_styles.as_ref().unwrap()[0].style, "Strong");
-        assert_eq!(lead.grep_styles.as_ref().unwrap()[0].style, "Strong");
-        assert_eq!(lead.nested_line_styles.as_ref().unwrap()[0].style, "Strong");
-        assert_eq!(lead.drop_cap_style.as_deref(), Some("Strong"));
-        assert_eq!(d.footnote_options.ref_char_style, "Strong");
-        assert_eq!(d.styles.default_character, "Strong");
-        // One undo step brings the style and every use back.
-        assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert!(s.doc().unwrap().doc.styles.char_style("Emphasis").is_some());
-        assert_eq!(s.doc().unwrap().doc.story(StoryId(sid)).unwrap().chars[0].format.style, "Emphasis");
-    }
-
-    #[test]
-    fn deleting_a_character_style_for_none_unsets_based_on() {
-        let (mut s, _) = char_doc();
-        s.execute("style.character.delete", &json!({"name": "Emphasis"})).unwrap();
-        assert!(!named(&s, "Emphasis"), "no dangling reference");
-        let d = s.doc().unwrap().doc.clone();
-        assert_eq!(d.styles.char_style("Child").unwrap().based_on, None);
-        assert_eq!(d.footnote_options.ref_char_style, designcraft_doc::NO_CHAR_STYLE);
-    }
-
-    /// Replacing a style with its own descendant rebases the deleted style's children on its
-    /// parent, so no based-on chain becomes a cycle.
-    #[test]
-    fn replacing_a_style_with_its_child_makes_no_cycle() {
-        let (mut s, _) = char_doc();
-        s.execute("style.character.create", &json!({"name": "Grandchild", "basedOn": "Child"})).unwrap();
-        s.execute("style.character.delete", &json!({"name": "Emphasis", "replaceWith": "Grandchild"})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        assert_eq!(d.styles.char_style("Child").unwrap().based_on.as_deref(), Some("Base"));
-        assert_eq!(d.styles.char_style("Grandchild").unwrap().based_on.as_deref(), Some("Child"));
-        assert!(!named(&s, "Emphasis"));
-    }
-
-    #[test]
-    fn bad_style_deletes_are_errors_and_change_nothing() {
-        let (mut s, _) = char_doc();
-        s.execute("style.paragraph.create", &json!({"name": "Head"})).unwrap();
-        let before = s.doc().unwrap().doc.clone();
-        let undo = s.doc().unwrap().history.undo.len();
-        for (id, p) in [
-            ("style.character.delete", json!({})),
-            ("style.character.delete", json!({"name": ""})),
-            ("style.character.delete", json!({"name": "Nope"})),
-            ("style.character.delete", json!({"name": "[None]"})),
-            ("style.character.delete", json!({"name": "Emphasis", "replaceWith": "Nope"})),
-            ("style.character.delete", json!({"name": "Emphasis", "replaceWith": "Emphasis"})),
-            ("style.paragraph.delete", json!({})),
-            ("style.paragraph.delete", json!({"name": ""})),
-            ("style.paragraph.delete", json!({"name": "Nope"})),
-            ("style.paragraph.delete", json!({"name": "[Basic Paragraph]"})),
-            ("style.paragraph.delete", json!({"name": "Head", "replaceWith": "Nope"})),
-            ("style.paragraph.delete", json!({"name": "Head", "replaceWith": "Head"})),
-        ] {
-            assert!(s.execute(id, &p).is_err(), "{id} {p}");
-        }
-        assert_eq!(*s.doc().unwrap().doc, *before);
-        assert_eq!(s.doc().unwrap().history.undo.len(), undo);
-    }
-
-    #[test]
-    fn deleting_a_paragraph_style_points_every_use_at_the_replacement() {
-        let mut s = Session::new();
-        s.execute("file.newSample", &json!({})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Sub", "basedOn": "Table Body", "nextStyle": "Table Body"})).unwrap();
-        s.edit(|d, _| {
-            let story = *d.stories.keys().next().ok_or(crate::EngineError::NoDocument)?;
-            let st = d.styles_mut();
-            st.default_paragraph = "Table Body".into();
-            st.object.push(ObjectStyle { name: "Boxed".into(), paragraph_style: Some("Table Body".into()), ..Default::default() });
-            st.cell.push(CellStyle { name: "Body Cell".into(), paragraph_style: Some("Table Body".into()), ..Default::default() });
-            d.footnote_options.para_style = "Table Body".into();
-            d.endnote_options.para_style = "Table Body".into();
-            d.endnote_options.heading_style = "Table Body".into();
-            d.toc = Some(Toc {
-                story,
-                title: "Contents".into(),
-                entries: vec![TocEntry { entry_style: Some("Table Body".into()), ..TocEntry::new("Table Body", 1) }],
-                page_numbers: false,
-                title_style: Some("Table Body".into()),
-            });
-            Ok(())
-        })
-        .unwrap();
-        assert!(named(&s, "Table Body"));
-        s.execute("style.paragraph.delete", &json!({"name": "Table Body", "replaceWith": "Body"})).unwrap();
-        assert!(!named(&s, "Table Body"), "no dangling reference");
-        let d = s.doc().unwrap().doc.clone();
-        let sub = d.styles.para("Sub").unwrap();
-        assert_eq!((sub.based_on.as_deref(), sub.next_style.as_deref()), (Some("Body"), Some("Body")));
-        assert_eq!(d.styles.default_paragraph, "Body");
-        assert_eq!(d.endnote_options.heading_style, "Body");
-        let after = s.execute("preflight.run", &json!({})).unwrap();
-        assert!(!after.to_string().contains("Table Body"), "{after}");
-    }
-}
-
-#[cfg(test)]
-mod swatch_options_tests {
-    use designcraft_color::SwatchValue;
-    use designcraft_doc::{ItemId, StoryId};
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// A document whose frame, text, styles, tint swatch and colour group all use "Brand".
-    fn brand_doc() -> (Session, u64, u64) {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("swatch.create", &json!({"name": "Brand", "color": {"c": 0, "m": 80, "y": 100, "k": 0}})).unwrap();
-        s.execute("swatch.create", &json!({"name": "Other", "color": "#108080"})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hello"})).unwrap();
-        let (id, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
-        s.execute("object.fill", &json!({"swatch": "Brand", "ids": [id]})).unwrap();
-        s.execute("object.stroke", &json!({"swatch": "Brand", "ids": [id]})).unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 3})).unwrap();
-        s.execute("type.char", &json!({"attrs": {"fill": "Brand"}})).unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 5, "focus": 5})).unwrap();
-        s.execute("table.insert", &json!({"rows": 2, "cols": 2})).unwrap();
-        s.execute("table.select", &json!({"what": "table"})).unwrap();
-        s.execute("table.setCell", &json!({"stroke": {"weight": 2, "type": "dashed", "gapColor": "Brand", "edges": ["all"]}})).unwrap();
-        s.execute("swatch.newColorGroup", &json!({"name": "Brand Colors", "swatches": ["Brand"]})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Accent"})).unwrap();
-        s.edit(|d, _| {
-            d.swatches.push(designcraft_color::Swatch {
-                name: "Brand 50%".into(),
-                value: SwatchValue::Tint { base: "Brand".into(), tint: 0.5 },
-                locked: false,
-                named: true,
-                hidden: false,
-            });
-            let st = d.styles_mut();
-            if let Some(p) = st.para_mut(designcraft_doc::BASIC_PARAGRAPH) {
-                p.chars.underline_color = Some("Brand".into());
-                p.para.shading_color = Some("Brand".into());
-                p.para.border_gap_color = Some("Brand".into());
-                p.chars.ruby_stroke = Some("Brand".into());
-            }
-            if let Some(c) = st.char_style_mut("Accent") {
-                c.chars.fill = Some("Brand".into());
-                c.chars.kenten_fill = Some("Brand".into());
-            }
-            Ok(())
-        })
-        .unwrap();
-        (s, id, sid)
-    }
-
-    fn uses(s: &Session, id: u64, sid: u64, name: &str) -> Vec<bool> {
-        let d = &s.doc().unwrap().doc;
-        let it = d.item(ItemId(id)).unwrap();
-        let story = d.story(StoryId(sid)).unwrap();
-        let basic = d.styles.para(designcraft_doc::BASIC_PARAGRAPH).unwrap();
-        vec![
-            it.fill.swatch == name,
-            it.stroke.swatch == name,
-            story.chars.iter().any(|r| r.format.over.fill.as_deref() == Some(name)),
-            basic.chars.underline_color.as_deref() == Some(name),
-            basic.para.shading_color.as_deref() == Some(name),
-            d.styles.char_style("Accent").unwrap().chars.fill.as_deref() == Some(name),
-            matches!(&d.swatch("Brand 50%").unwrap().value, SwatchValue::Tint { base, .. } if base == name),
-            d.color_groups[0].swatches == [name],
-            basic.para.border_gap_color.as_deref() == Some(name),
-            basic.chars.ruby_stroke.as_deref() == Some(name),
-            d.styles.char_style("Accent").unwrap().chars.kenten_fill.as_deref() == Some(name),
-            story.tables.values().any(|t| t.cells.iter().all(|c| c.strokes.iter().all(|e| e.gap_color == name))),
-        ]
-    }
-
-    #[test]
-    fn renaming_a_swatch_renames_every_use_in_one_undo_step() {
-        let (mut s, id, sid) = brand_doc();
-        assert!(uses(&s, id, sid, "Brand").iter().all(|u| *u));
-        let r = s.execute("swatch.options", &json!({"name": "Brand", "to": "Signal Orange", "spot": true})).unwrap();
-        assert_eq!(r["name"], "Signal Orange");
-        let d = &s.doc().unwrap().doc;
-        assert!(d.swatch("Brand").is_none());
-        assert!(matches!(d.swatch("Signal Orange").unwrap().value, SwatchValue::Color { color_type: designcraft_color::ColorType::Spot, .. }));
-        assert_eq!(uses(&s, id, sid, "Signal Orange"), vec![true; 12]);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert!(s.doc().unwrap().doc.swatch("Brand").is_some());
-        assert_eq!(uses(&s, id, sid, "Brand"), vec![true; 12]);
-    }
-
-    #[test]
-    fn bad_swatch_renames_change_nothing() {
-        let (mut s, id, sid) = brand_doc();
-        let before = s.doc().unwrap().doc.clone();
-        for p in [
-            json!({"name": "Brand", "to": "Other"}),
-            json!({"name": "Brand", "to": "  "}),
-            json!({"name": "Brand", "to": "[Paper]"}),
-            json!({"name": "[Black]", "to": "Ink"}),
-            json!({"name": "[Registration]", "to": "Reg"}),
-            json!({"name": "[None]", "to": "Nothing"}),
-            json!({"name": "[Black]", "color": "#ff0000"}),
-            json!({"name": "Brand 50%", "color": "#ff0000"}),
-            json!({"name": "Missing", "to": "X"}),
-        ] {
-            assert!(s.execute("swatch.options", &p).is_err(), "{p}");
-        }
-        assert_eq!(s.doc().unwrap().doc.swatches, before.swatches);
-        assert_eq!(uses(&s, id, sid, "Brand"), vec![true; 12]);
-        // [Paper]'s colour can change; its name can't.
-        s.execute("swatch.options", &json!({"name": "[Paper]", "to": "[Paper]", "color": "#fff8e0"})).unwrap();
-    }
-
-    #[test]
-    fn name_with_color_value_tracks_the_colour() {
-        let (mut s, id, sid) = brand_doc();
-        let r = s.execute("swatch.options", &json!({"name": "Brand", "nameWithValue": true, "color": {"c": 10, "m": 20, "y": 30, "k": 40}})).unwrap();
-        assert_eq!(r["name"], "C=10 M=20 Y=30 K=40");
-        assert_eq!(uses(&s, id, sid, "C=10 M=20 Y=30 K=40"), vec![true; 12]);
-        // Later colour edits keep the name in step until the swatch is named by hand.
-        let r = s.execute("swatch.options", &json!({"name": "C=10 M=20 Y=30 K=40", "color": {"c": 0, "m": 0, "y": 0, "k": 50}})).unwrap();
-        assert_eq!(r["name"], "C=0 M=0 Y=0 K=50");
-        let r = s.execute("swatch.options", &json!({"name": "C=0 M=0 Y=0 K=50", "to": "Warm Gray"})).unwrap();
-        assert_eq!(r["name"], "Warm Gray");
-        assert!(s.doc().unwrap().doc.swatch("Warm Gray").unwrap().named);
-    }
-}
-
-#[cfg(test)]
-mod grep_style_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn grep_style_pattern_that_cannot_compile_is_rejected() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Keep"})).unwrap();
-        let bad = json!([{"style": "Keep", "pattern": "(\\d+"}]);
-        let e = s.execute("style.paragraph.create", &json!({"name": "Broken", "para": {"grepStyles": bad}})).unwrap_err().to_string();
-        assert!(e.contains("bad GREP") && e.contains("(\\\\d+"), "{e}");
-        assert!(s.doc().unwrap().doc.styles.para("Broken").is_none());
-
-        // The lookbehind dialect compiles.
-        let good = json!([{"style": "Keep", "pattern": "(?<=\\s)[aiouwzAIOUWZ]\\s"}]);
-        s.execute("style.paragraph.create", &json!({"name": "Polish", "para": {"grepStyles": good}})).unwrap();
-        let e = s.execute("style.paragraph.edit", &json!({"name": "Polish", "para": {"grepStyles": bad, "spaceAfter": 6}})).unwrap_err().to_string();
-        assert!(e.contains("bad GREP"), "{e}");
-        let st = s.doc().unwrap().doc.styles.para("Polish").unwrap().clone();
-        assert_eq!(st.para.grep_styles.unwrap()[0].pattern, "(?<=\\s)[aiouwzAIOUWZ]\\s");
-        assert_eq!(st.para.space_after, None, "nothing changes");
-
-        // A paragraph override too.
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Ala i kot"})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        let e = s.execute("type.para", &json!({"grepStyles": bad})).unwrap_err().to_string();
-        assert!(e.contains("bad GREP"), "{e}");
-    }
-
-    #[test]
-    fn idml_import_keeps_a_broken_grep_style_and_warns() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Keep"})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Broken"})).unwrap();
-        // Written past the command, as another application could.
-        s.edit(|d, _| {
-            if let Some(st) = d.styles_mut().para_mut("Broken") {
-                st.para.grep_styles = Some(vec![designcraft_doc::GrepStyle { style: "Keep".into(), pattern: "[a-".into() }]);
-            }
-            Ok(())
-        })
-        .unwrap();
-        let b64 = s.execute("file.exportIdml", &json!({})).unwrap()["base64"].as_str().unwrap().to_string();
-        let r = s.execute("file.openIdml", &json!({"base64": b64})).unwrap();
-        let warnings = r["warnings"].to_string();
-        assert!(warnings.contains("Broken") && warnings.contains("[a-") && warnings.contains("bad GREP"), "{warnings}");
-        let st = s.doc().unwrap().doc.styles.para("Broken").unwrap().clone();
-        assert_eq!(st.para.grep_styles.unwrap()[0].pattern, "[a-", "the style opens with its pattern");
-    }
-}
-
-#[cfg(test)]
-mod sample_color_tests {
-    use designcraft_color::{Color, SwatchValue};
-    use designcraft_doc::ItemId;
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// A 2×1 image, red then blue, placed 144 pt wide at (72, 72): each pixel is 72 pt.
-    fn session_with_image() -> (Session, u64) {
-        let png = designcraft_render::Rendered { width: 2, height: 1, pixels: vec![255, 0, 0, 255, 0, 0, 255, 255] }.to_png();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let b64 = super::super::file::base64_encode(&png);
-        let r = s.execute("file.place", &json!({"base64": b64, "name": "rb.png", "x": 72, "y": 72, "width": 144})).unwrap();
-        (s, r["id"].as_u64().unwrap())
-    }
-
-    fn swatch_color(s: &Session, name: &str) -> Color {
-        match &s.doc().unwrap().doc.swatch(name).unwrap().value {
-            SwatchValue::Color { color, .. } => *color,
-            other => panic!("{other:?}"),
-        }
-    }
-
-    #[test]
-    fn the_eyedropper_colours_selected_text_with_the_image_under_it() {
-        let (mut s, image) = session_with_image();
-        let f = s.execute("frame.create", &json!({"rect": [300, 300, 500, 360], "content": "text", "text": "Elevate."})).unwrap();
-        let fid = ItemId(f["id"].as_u64().unwrap());
-        let story = s.doc().unwrap().doc.item(fid).unwrap().text_frame().unwrap().story;
-        s.execute("text.select", &json!({"story": story.0, "anchor": 0, "focus": 7})).unwrap();
-        let undo = s.doc().unwrap().history.undo.len();
-        let r = s.execute("color.sample", &json!({"at": [180, 100]})).unwrap();
-        assert_eq!((r["color"].as_str(), r["from"].as_u64()), (Some("#0000ff"), Some(image)), "{r}");
-        assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1, "one undo step");
-        let name = r["swatch"].as_str().unwrap().to_string();
-        assert_eq!(swatch_color(&s, &name), Color::rgb8(0, 0, 255));
-        assert!(s.doc().unwrap().doc.swatch(&name).unwrap().hidden, "an unnamed colour");
-        let st = s.doc().unwrap().doc.story(story).unwrap().clone();
-        assert_eq!(st.format_after(0).over.fill.as_deref(), Some(name.as_str()));
-        assert_eq!(st.format_after(7).over.fill, None, "the full stop keeps its colour");
-        // The frame itself is not coloured.
-        assert!(s.doc().unwrap().doc.item(fid).unwrap().fill.is_none());
-    }
-
-    #[test]
-    fn the_eyedropper_fills_selected_objects_and_samples_locked_images() {
-        let (mut s, _) = session_with_image();
-        let lid = s.doc().unwrap().doc.layers[0].id.0;
-        s.execute("layer.set", &json!({"id": lid, "locked": true})).unwrap();
-        s.execute("layer.new", &json!({"name": "TEXT"})).unwrap();
-        let rect = s.execute("frame.create", &json!({"rect": [300, 300, 400, 400]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("selection.set", &json!({"ids": [rect]})).unwrap();
-        let r = s.execute("color.sample", &json!({"at": [100, 100], "target": "stroke"})).unwrap();
-        assert_eq!(r["color"], "#ff0000", "{r}");
-        let it = s.doc().unwrap().doc.item(ItemId(rect)).unwrap().clone();
-        assert_eq!(swatch_color(&s, &it.stroke.swatch), Color::rgb8(255, 0, 0));
-        // Sampling the same colour again reuses its swatch.
-        let again = s.execute("color.sample", &json!({"at": [90, 90]})).unwrap();
-        assert_eq!(again["swatch"], r["swatch"]);
-    }
-
-    #[test]
-    fn a_caret_takes_the_sample_for_typing_and_nothing_to_sample_is_refused() {
-        let (mut s, _) = session_with_image();
-        let f = s.execute("frame.create", &json!({"rect": [300, 300, 500, 360], "content": "text", "text": "Hi"})).unwrap();
-        let fid = ItemId(f["id"].as_u64().unwrap());
-        let story = s.doc().unwrap().doc.item(fid).unwrap().text_frame().unwrap().story;
-        s.execute("text.select", &json!({"story": story.0, "anchor": 1, "focus": 1})).unwrap();
-        // A caret: the sampled colour is for the next typing.
-        let r = s.execute("color.sample", &json!({"at": [100, 100]})).unwrap();
-        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fill"], r["swatch"]);
-        assert_eq!(s.doc().unwrap().doc.story(story).unwrap().text, "Hi", "caret color waits for typing");
-        s.execute("text.insert", &json!({"text": "X"})).unwrap();
-        let st = s.doc().unwrap().doc.story(story).unwrap().clone();
-        assert_eq!(st.format_after(1).over.fill.as_deref(), r["swatch"].as_str(), "{r}");
-        assert_eq!(st.format_after(0).over.fill, None, "the text before the caret keeps its colour");
-        let undo = s.doc().unwrap().history.undo.len();
-        s.execute("text.select", &json!({"story": story.0, "anchor": 0, "focus": 2})).unwrap();
-        let none = s.execute("color.sample", &json!({"at": [600, 600]})).unwrap_err().to_string();
-        assert!(none.contains("no placed image"), "{none}");
-        // Just past the image's right edge.
-        assert!(s.execute("color.sample", &json!({"at": [216.5, 100]})).is_err());
-        assert_eq!(s.doc().unwrap().history.undo.len(), undo);
-    }
-
-    #[test]
-    fn where_no_image_pixel_shows_the_clicked_frame_is_matched_instead() {
-        let (mut s, image) = session_with_image();
-        let rect = s.execute("frame.create", &json!({"rect": [300, 300, 400, 400]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [image]})).unwrap();
-        // The frame reaches 72 pt below its image, and a clipping path shows the left (red) pixel only.
-        s.edit(|d, _| {
-            let it = d.item_mut(ItemId(image)).ok_or(crate::EngineError::NoDocument)?;
-            let b = it.inner_bounds();
-            it.path = designcraft_geom::shapes::rectangle(designcraft_geom::Rect::new(b.x0, b.y0, b.x1, b.y1 + 72.0));
-            let designcraft_doc::Content::Graphic(g) = &mut it.content else { return Err(crate::EngineError::NoDocument) };
-            let left = designcraft_geom::shapes::rectangle(designcraft_geom::Rect::new(0.0, 0.0, g.size.0 / 2.0, g.size.1));
-            g.clip = Some(std::sync::Arc::new(designcraft_doc::ClippingPath::new(designcraft_doc::ClippingKind::PhotoshopPath, left)));
-            Ok(())
-        })
-        .unwrap();
-        s.execute("selection.set", &json!({"ids": [rect]})).unwrap();
-        let r = s.execute("color.sample", &json!({"at": [100, 100], "matchFrom": image})).unwrap();
-        assert_eq!(r["color"], "#ff0000", "inside the clipping path the image is sampled");
-        // The clipped-out blue pixel and the empty frame below the image: nothing to sample, so the
-        // frame's attributes apply.
-        for at in [[180, 100], [100, 180]] {
-            assert!(s.execute("color.sample", &json!({"at": at})).is_err(), "{at:?}");
-            s.execute("object.fill", &json!({"swatch": "[Paper]", "ids": [rect]})).unwrap();
-            s.execute("color.sample", &json!({"at": at, "matchFrom": image})).unwrap();
-            assert_eq!(s.doc().unwrap().doc.item(ItemId(rect)).unwrap().fill.swatch, "[Black]", "{at:?}");
-        }
-    }
-
-    #[test]
-    fn sampling_and_explicit_colour_use_the_same_text_application_path() {
-        for command in ["color.sample", "object.color"] {
-            // Each command gets its own key: the eyedropper samples at `at`, object.color takes `color`.
-            let params = |at: [f64; 2], color: &str, extra: serde_json::Value| {
-                let mut p = if command == "color.sample" { json!({"at": at}) } else { json!({"color": color}) };
-                if let (Some(p), Some(extra)) = (p.as_object_mut(), extra.as_object()) {
-                    p.extend(extra.clone());
-                }
-                p
-            };
-            let (mut s, _) = session_with_image();
-            let f = s.execute("frame.create", &json!({"rect": [300, 300, 500, 360], "content": "text"})).unwrap();
-            let story = designcraft_doc::StoryId(f["story"].as_u64().unwrap());
-            s.execute("text.select", &json!({"story": story.0, "anchor": 0})).unwrap();
-            let undo = s.doc().unwrap().history.undo.len();
-            let r = s.execute(command, &params([100.0, 100.0], "#ff0000", json!({}))).unwrap();
-            assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1, "{command}");
-            s.execute("text.insert", &json!({"text": "Hi"})).unwrap();
-            let text = s.doc().unwrap().doc.story(story).unwrap();
-            assert_eq!(text.format_after(0).over.fill.as_deref(), r["swatch"].as_str(), "empty-story typing: {command}");
-            // Explicit ids override text targeting, including with a text selection active.
-            let fid = ItemId(f["id"].as_u64().unwrap());
-            s.execute("text.select", &json!({"story": story.0, "anchor": 0, "focus": 2})).unwrap();
-            let r = s.execute(command, &params([180.0, 100.0], "#0000ff", json!({"id": fid.0}))).unwrap();
-            assert_eq!(s.doc().unwrap().doc.item(fid).unwrap().fill.swatch, r["swatch"].as_str().unwrap());
-            let text = s.doc().unwrap().doc.story(story).unwrap();
-            assert_ne!(text.format_after(0).over.fill.as_deref(), r["swatch"].as_str(), "text unchanged: {command}");
-            let r = s.execute(command, &params([180.0, 100.0], "#0000ff", json!({"target": "stroke"}))).unwrap();
-            let text = s.doc().unwrap().doc.story(story).unwrap();
-            assert_eq!(text.format_after(0).over.stroke.as_deref(), r["swatch"].as_str(), "selected text stroke: {command}");
-        }
-    }
-
-    #[test]
-    fn sampling_with_the_stroke_in_front_colours_a_lines_stroke() {
-        let (mut s, _) = session_with_image();
-        let line = s.execute("line.create", &json!({"a": [300, 300], "b": [500, 300]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("selection.set", &json!({"ids": [line]})).unwrap();
-        let r = s.execute("color.sample", &json!({"at": [100, 100], "target": "stroke"})).unwrap();
-        let it = s.doc().unwrap().doc.item(ItemId(line)).unwrap().clone();
-        assert_eq!(it.stroke.swatch, r["swatch"].as_str().unwrap(), "{r}");
-        assert!(it.fill.is_none(), "the fill stays empty");
-    }
-}
-
-#[cfg(test)]
-mod radial_gradient_tests {
-    use serde_json::json;
-
-    /// White at the side and the top of a 100×200 radial (black → white) rectangle at (50, 20) on
-    /// a 200×240 page, rendered at 1 px/pt.
-    fn sides(img: &designcraft_render::Rendered) -> (u8, u8, u8) {
-        (img.pixel(100, 120)[0], img.pixel(52, 120)[0], img.pixel(100, 22)[0])
-    }
-
-    #[test]
-    fn a_radial_gradient_is_the_objects_ellipse_on_screen_and_in_pdf() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"width": 200, "height": 240, "facingPages": false})).unwrap();
-        let id = s.execute("frame.create", &json!({"rect": [50, 20, 150, 220], "content": "unassigned"})).unwrap()["id"].as_u64().unwrap();
-        s.execute("object.stroke", &json!({"ids": [id], "swatch": "[None]"})).unwrap();
-        s.execute(
-            "object.gradient",
-            &json!({"ids": [id], "kind": "radial", "stops": [{"location": 0, "color": "#000000"}, {"location": 100, "color": "#ffffff"}]}),
-        )
-        .unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let mut r = designcraft_render::Renderer::new();
-        let (c, side, top) = sides(&r.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap());
-        assert!(c < 30 && side > 220 && top > 220, "screen: centre {c}, side {side}, top {top}");
-        // The PDF, placed back and drawn: the same ellipse.
-        let pdf = designcraft_pdf::export_pdf(&d, &s.cache, &Default::default()).unwrap();
-        let mut p = crate::Session::new();
-        p.execute("file.new", &json!({"width": 200, "height": 240, "facingPages": false})).unwrap();
-        p.execute("file.place", &json!({"base64": crate::cmd::file::base64_encode(&pdf), "name": "radial.pdf", "x": 0, "y": 0, "width": 200}))
-            .unwrap();
-        let d = p.doc().unwrap().doc.clone();
-        let (c, side, top) = sides(&r.render_page(&d, &p.cache, 0, 1.0, false, &Default::default()).unwrap());
-        assert!(c < 30 && side > 220 && top > 220, "pdf: centre {c}, side {side}, top {top}");
-    }
-
-    #[test]
-    fn a_box_with_no_height_or_width_has_a_circle_across_its_length() {
-        let f = designcraft_doc::Fill::swatch("g");
-        let line = designcraft_geom::Rect::new(20.0, 60.0, 180.0, 60.0);
-        let (c, rx, ry) = f.radial_ellipse(line);
-        assert_eq!((c.x, c.y, rx, ry), (100.0, 60.0, 80.0, 80.0));
-        let (_, rx, ry) = f.radial_ellipse(designcraft_geom::Rect::new(10.0, 0.0, 10.0, 50.0));
-        assert_eq!((rx, ry), (25.0, 25.0));
-        // A point: a tiny circle, never a zero radius.
-        let (_, rx, ry) = f.radial_ellipse(designcraft_geom::Rect::new(5.0, 5.0, 5.0, 5.0));
-        assert!(rx > 0.0 && rx == ry);
-        // A box keeps its ellipse.
-        let (_, rx, ry) = f.radial_ellipse(designcraft_geom::Rect::new(0.0, 0.0, 100.0, 200.0));
-        assert_eq!((rx, ry), (50.0, 100.0));
-    }
-}
-
-#[cfg(test)]
-mod gradient_swatch_tests {
-    use designcraft_color::SwatchValue;
-    use serde_json::json;
-
-    fn doc() -> crate::Session {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s
-    }
-
-    #[test]
-    fn a_gradient_swatch_from_colour_swatches() {
-        let mut s = doc();
-        // As the Gradient panel's stops take swatches dragged onto them.
-        let r = s
-            .execute(
-                "swatch.create",
-                &json!({"gradient": {"stops": [{"location": 100, "swatch": "C=100 M=0 Y=0 K=0"}, {"location": 0, "swatch": "C=0 M=100 Y=0 K=0"}]}}),
-            )
-            .unwrap();
-        assert_eq!(r["name"], "New Gradient Swatch");
-        let d = &s.doc().unwrap().doc;
-        let w = d.swatch("New Gradient Swatch").unwrap();
-        assert!(w.named && !w.hidden);
-        let SwatchValue::Gradient { gradient } = &w.value else { panic!("{w:?}") };
-        assert_eq!(gradient.stops[0].color, d.resolve_color("C=0 M=100 Y=0 K=0", 1.0).unwrap(), "sorted: magenta first");
-        assert_eq!(gradient.stops[1].color, d.resolve_color("C=100 M=0 Y=0 K=0", 1.0).unwrap());
-        // A second one gets its own name; bad stops are refused.
-        let r = s
-            .execute(
-                "swatch.create",
-                &json!({"gradient": {"kind": "radial", "stops": [{"color": "#ff0000"}, {"location": 100, "color": "#0000ff"}]}}),
-            )
-            .unwrap();
-        assert_eq!(r["name"], "New Gradient Swatch 2");
-        for bad in [
-            json!({"stops": [{"swatch": "C=0 M=100 Y=0 K=0"}]}),
-            json!({"stops": [{"swatch": "Nope"}, {"swatch": "[Black]"}]}),
-            json!({"stops": [{"swatch": "New Gradient Swatch"}, {"swatch": "[Black]"}]}),
-            json!({"kind": "conic", "stops": [{"color": "#000000"}, {"color": "#ffffff"}]}),
-        ] {
-            assert!(s.execute("swatch.create", &json!({"gradient": bad})).is_err(), "{bad}");
-        }
-    }
-
-    #[test]
-    fn new_swatch_names_the_selections_gradient_or_duplicates_a_swatch() {
-        let mut s = doc();
-        let id = s.execute("frame.create", &json!({"rect": [0, 0, 100, 100], "content": "unassigned"})).unwrap()["id"].as_u64().unwrap();
-        // A gradient made in the Gradient panel is unnamed (and not listed) …
-        s.execute("object.gradient", &json!({"ids": [id], "stops": [{"location": 0, "color": {"c": 0, "m": 100, "y": 0, "k": 0}}, {"location": 100, "color": {"c": 100, "m": 0, "y": 0, "k": 0}}]})).unwrap();
-        let fill = |s: &crate::Session| s.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch.clone();
-        assert!(s.doc().unwrap().doc.swatch(&fill(&s)).unwrap().hidden);
-        // … until New Swatch: "New Gradient Swatch", listed, still the object's fill.
-        s.execute("selection.set", &json!({"ids": [id]})).unwrap();
-        assert_eq!(s.execute("swatch.new", &json!({})).unwrap()["name"], "New Gradient Swatch");
-        assert_eq!(fill(&s), "New Gradient Swatch");
-        let w = s.doc().unwrap().doc.swatch("New Gradient Swatch").unwrap().clone();
-        assert!(w.named && !w.hidden && matches!(w.value, SwatchValue::Gradient { .. }));
-        // A named swatch: a copy.
-        assert_eq!(s.execute("swatch.new", &json!({})).unwrap()["name"], "New Gradient Swatch copy");
-        assert_eq!(s.execute("swatch.new", &json!({"swatch": "C=100 M=0 Y=0 K=0"})).unwrap()["name"], "C=100 M=0 Y=0 K=0 copy");
-        assert!(s.execute("swatch.new", &json!({"swatch": "[None]"})).is_err());
-        // The stroke in front: the stroke's swatch.
-        s.execute("object.stroke", &json!({"ids": [id], "swatch": "C=100 M=0 Y=0 K=0"})).unwrap();
-        assert_eq!(s.execute("swatch.new", &json!({"target": "stroke"})).unwrap()["name"], "C=100 M=0 Y=0 K=0 copy 2");
-        // Nothing selected, no swatch given: a new colour swatch.
-        s.execute("edit.deselectAll", &json!({})).unwrap();
-        let n = s.execute("swatch.new", &json!({})).unwrap()["name"].as_str().unwrap().to_string();
-        let w = s.doc().unwrap().doc.swatch(&n).unwrap();
-        assert!(w.named && !w.hidden && matches!(w.value, SwatchValue::Color { .. }), "{w:?}");
-    }
-}
-
-#[cfg(test)]
-mod gradient_stroke_tests {
-    use serde_json::json;
-
-    /// Grey along a 20 pt line from (20, 60) to (180, 60): near its start, middle and end.
-    fn along(img: &designcraft_render::Rendered) -> (u8, u8, u8) {
-        (img.pixel(26, 60)[0], img.pixel(100, 60)[0], img.pixel(174, 60)[0])
-    }
-
-    #[test]
-    fn a_gradient_on_a_stroke_runs_across_the_path_on_screen_and_in_pdf() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"width": 200, "height": 120, "facingPages": false})).unwrap();
-        let id = s.execute("line.create", &json!({"a": [20, 60], "b": [180, 60]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("object.stroke", &json!({"ids": [id], "weight": 20})).unwrap();
-        let r = s
-            .execute(
-                "object.gradient",
-                &json!({"ids": [id], "target": "stroke", "stops": [{"location": 0, "color": "#000000"}, {"location": 100, "color": "#ffffff"}]}),
-            )
-            .unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let it = d.item(designcraft_doc::ItemId(id)).unwrap();
-        assert_eq!(it.stroke.swatch, r["swatch"].as_str().unwrap());
-        assert_eq!(it.fill.swatch, designcraft_color::swatch::NONE, "the fill is left alone");
-        let mut rr = designcraft_render::Renderer::new();
-        let (a, m, b) = along(&rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap());
-        assert!(a < 40 && (90..170).contains(&m) && b > 215, "screen: {a} {m} {b}");
-        // The PDF, placed back and drawn: the same.
-        let pdf = designcraft_pdf::export_pdf(&d, &s.cache, &Default::default()).unwrap();
-        let mut p = crate::Session::new();
-        p.execute("file.new", &json!({"width": 200, "height": 120, "facingPages": false})).unwrap();
-        p.execute("file.place", &json!({"base64": crate::cmd::file::base64_encode(&pdf), "name": "stroke.pdf", "x": 0, "y": 0, "width": 200}))
-            .unwrap();
-        let pd = p.doc().unwrap().doc.clone();
-        let (a, m, b) = along(&rr.render_page(&pd, &p.cache, 0, 1.0, false, &Default::default()).unwrap());
-        assert!(a < 40 && (90..170).contains(&m) && b > 215, "pdf: {a} {m} {b}");
-        // The Gradient Swatch tool's drag on the stroke: reversed by dragging right to left.
-        s.execute("object.gradient", &json!({"ids": [id], "target": "stroke", "from": [180, 60], "to": [20, 60]})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let (a, _, b) = along(&rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap());
-        assert!(a > 215 && b < 40, "dragged: {a} {b}");
-        assert!(s.execute("object.gradient", &json!({"ids": [id], "target": "gap"})).is_err());
-    }
-
-    /// A 20 pt horizontal line with a gradient on its stroke, drawn on screen and from its PDF.
-    fn line_with_stroke_gradient(g: serde_json::Value) -> (designcraft_render::Rendered, designcraft_render::Rendered) {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"width": 200, "height": 120, "facingPages": false})).unwrap();
-        let id = s.execute("line.create", &json!({"a": [20, 60], "b": [180, 60]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("object.stroke", &json!({"ids": [id], "weight": 20})).unwrap();
-        let mut g = g;
-        g["ids"] = json!([id]);
-        g["target"] = json!("stroke");
-        s.execute("object.gradient", &g).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let mut rr = designcraft_render::Renderer::new();
-        let screen = rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap();
-        let pdf = designcraft_pdf::export_pdf(&d, &s.cache, &Default::default()).unwrap();
-        let mut p = crate::Session::new();
-        p.execute("file.new", &json!({"width": 200, "height": 120, "facingPages": false})).unwrap();
-        p.execute("file.place", &json!({"base64": crate::cmd::file::base64_encode(&pdf), "name": "line.pdf", "x": 0, "y": 0, "width": 200})).unwrap();
-        let pd = p.doc().unwrap().doc.clone();
-        let placed = rr.render_page(&pd, &p.cache, 0, 1.0, false, &Default::default()).unwrap();
-        (screen, placed)
-    }
-
-    #[test]
-    fn a_radial_gradient_on_a_straight_lines_stroke_shows_all_its_stops() {
-        // The line's box has no height: the gradient is a circle across the line's length.
-        let (screen, pdf) = line_with_stroke_gradient(
-            json!({"kind": "radial", "stops": [{"location": 0, "color": "#000000"}, {"location": 100, "color": "#ffffff"}]}),
-        );
-        for (what, img) in [("screen", &screen), ("pdf", &pdf)] {
-            let (a, m, b) = along(img);
-            assert!(m < 40 && a > 180 && b > 180, "{what}: {a} {m} {b}");
-        }
-    }
-
-    #[test]
-    fn a_linear_gradient_across_a_straight_line_paints_its_stroke_alike_on_screen_and_in_pdf() {
-        let (screen, pdf) =
-            line_with_stroke_gradient(json!({"angle": 90, "stops": [{"location": 0, "color": "#ff0000"}, {"location": 100, "color": "#0000ff"}]}));
-        let (s, p) = (screen.pixel(100, 60), pdf.pixel(100, 60));
-        // The line's box has no height: the gradient runs across the line's length, so the stroke
-        // shows its middle.
-        assert!(s[1] < 60 && s[0] > 80 && s[2] > 80, "screen: the stroke is painted, {s:?}");
-        assert!((0..3).all(|i| s[i].abs_diff(p[i]) < 40), "screen {s:?}, pdf {p:?}");
-    }
-}
+mod color_tests;
 
 #[cfg(test)]
 #[path = "text_color_tests.rs"]
diff --git a/crates/engine/src/cmd/style/color.rs b/crates/engine/src/cmd/style/color.rs
new file mode 100644
index 000000000..e212bd3b6
--- /dev/null
+++ b/crates/engine/src/cmd/style/color.rs
@@ -0,0 +1,332 @@
+use super::swatches::{parse_color, value_name};
+use super::{CharAttrs, Result, Session, Styles, Swatch, SwatchValue, Value, bad, has_doc, json, str_param};
+
+fn gradient_json(name: &str, g: &designcraft_color::Gradient) -> Value {
+    let stops: Vec<Value> = g
+        .stops
+        .iter()
+        .map(|s| {
+            let mut v = json!({"location": (s.offset as f64 * 1000.0).round() / 10.0, "color": s.color.to_hex(), "opacity": (s.opacity * 100.0).round(), "midpoint": (s.midpoint * 100.0).round()});
+            if let (Some(o), Some(w)) = (v.as_object_mut(), &s.swatch) {
+                o.insert("swatch".into(), json!(w));
+            }
+            v
+        })
+        .collect();
+    json!({"swatch": name, "kind": if g.kind == designcraft_color::GradientKind::Radial { "radial" } else { "linear" }, "stops": stops})
+}
+
+pub(super) fn apply_gradient(s: &mut Session, p: &Value) -> Result<Value> {
+    use designcraft_color::{GradientKind, GradientStop};
+    let kind = match str_param(p, "kind") {
+        Some("radial") => Some(GradientKind::Radial),
+        Some("linear") => Some(GradientKind::Linear),
+        Some(k) => return Err(bad("object.gradient", format!("unknown kind {k}"))),
+        None => None,
+    };
+    let stops = match p.get("stops").and_then(Value::as_array) {
+        Some(a) => {
+            let doc = &s.doc()?.doc;
+            let mut v = Vec::new();
+            for st in a {
+                // A swatch dropped on a stop gives it the swatch's color (a tint's mixed in) and
+                // its inks for print.
+                // A stop naming a swatch that's gone keeps the color given with it.
+                let color = st.get("color").and_then(parse_color);
+                let (color, swatch) = match st.get("swatch").and_then(Value::as_str) {
+                    Some(name) => {
+                        match doc.resolve_color(name, 1.0).filter(|_| designcraft_color::swatch::resolve_gradient(&doc.swatches, name).is_none()) {
+                            Some(c) => (c, Some(name.to_string())),
+                            None => (color.ok_or_else(|| bad("object.gradient", format!("`{name}` isn't a color swatch")))?, None),
+                        }
+                    }
+                    None => (color.ok_or_else(|| bad("object.gradient", "a stop needs a color or a swatch"))?, None),
+                };
+                let pct = |k: &str, d: f64| st.get(k).and_then(Value::as_f64).unwrap_or(d).clamp(0.0, 100.0) as f32 / 100.0;
+                v.push(GradientStop {
+                    offset: pct("location", 0.0),
+                    color,
+                    opacity: pct("opacity", 100.0),
+                    midpoint: pct("midpoint", 50.0).clamp(0.13, 0.87),
+                    swatch,
+                });
+            }
+            if v.len() < 2 {
+                return Err(bad("object.gradient", "a gradient needs at least two stops"));
+            }
+            Some(v)
+        }
+        None => None,
+    };
+    let reverse = p.get("reverse").and_then(Value::as_bool).unwrap_or(false);
+    let angle = p.get("angle").and_then(Value::as_f64);
+    let stroke = match str_param(p, "target") {
+        None | Some("fill") => false,
+        Some("stroke") => true,
+        Some(t) => return Err(bad("object.gradient", format!("unknown target {t}"))),
+    };
+    let (from, to) = (crate::cmd::point_param(p, "from"), crate::cmd::point_param(p, "to"));
+    let ids = crate::cmd::targets(s, p)?;
+    s.edit(|d, _| {
+        let mut out = Value::Null;
+        for id in &ids {
+            let Some(it) = d.item(*id) else { continue };
+            let cur_name = if stroke { it.stroke.swatch.clone() } else { it.fill.swatch.clone() };
+            let cur = designcraft_color::swatch::resolve_gradient(&d.swatches, &cur_name).cloned();
+            let mut g = cur.clone().unwrap_or_default();
+            if let Some(k) = kind {
+                g.kind = k;
+            }
+            if let Some(st) = &stops {
+                g.stops = st.clone();
+                g.sort();
+            }
+            if reverse {
+                g.reverse();
+            }
+            // Keep the swatch while the gradient is unchanged, else reuse an equal gradient swatch
+            // or add an unnamed one.
+            let name = if cur.as_ref() == Some(&g) {
+                cur_name
+            } else if let Some(w) = d.swatches.iter().find(|w| matches!(&w.value, SwatchValue::Gradient { gradient } if *gradient == g)) {
+                w.name.clone()
+            } else {
+                let name = Styles::unique_name(|n| d.swatch(n).is_some(), "Gradient");
+                d.swatches.push(Swatch {
+                    name: name.clone(),
+                    value: SwatchValue::Gradient { gradient: g.clone() },
+                    locked: false,
+                    named: false,
+                    hidden: true,
+                });
+                name
+            };
+            let inv = d.find(*id).map(|l| d.parent_xf(&l)).zip(d.item(*id).map(|i| i.xf)).map(|(pxf, xf)| (pxf * xf).inverse());
+            let Some(it) = d.item_mut(*id) else { continue };
+            // The fill's or the stroke's paint: swatch, tint, angle, vector.
+            let (swatch, tint, g_angle, g_vector) = if stroke {
+                (&mut it.stroke.swatch, &mut it.stroke.tint, &mut it.stroke.gradient_angle, &mut it.stroke.gradient_vector)
+            } else {
+                (&mut it.fill.swatch, &mut it.fill.tint, &mut it.fill.gradient_angle, &mut it.fill.gradient_vector)
+            };
+            *swatch = name.clone();
+            *tint = 1.0;
+            if let Some(a) = angle {
+                *g_angle = Some(a);
+                *g_vector = None;
+            }
+            if let (Some(a), Some(b), Some(inv)) = (from, to, inv) {
+                let (a, b) = (inv * a, inv * b);
+                if (b - a).hypot() > 1e-6 {
+                    *g_vector = Some([a.x, a.y, b.x, b.y]);
+                }
+            }
+            if out.is_null() {
+                out = gradient_json(&name, &g);
+            }
+        }
+        Ok(out)
+    })
+}
+
+pub(super) fn apply_color(s: &mut Session, p: &Value) -> Result<Value> {
+    let color = p.get("color").and_then(parse_color).ok_or_else(|| bad("object.color", "missing or bad color"))?;
+    let stroke = str_param(p, "target") == Some("stroke");
+    let named = p.get("ids").is_some() || p.get("id").is_some();
+    let text = !named
+        && (p.get("text").and_then(Value::as_bool).unwrap_or(false) || s.doc()?.selection.text.is_some() || s.doc()?.selection.cells.is_some());
+    // Nothing selected: the colour of new shapes (InDesign's document defaults).
+    if !text && crate::cmd::object::nothing_targeted(s, p)? {
+        return s.edit(|d, _| {
+            let name = color_swatch(d, color);
+            let c = &mut d.settings.new_object;
+            if stroke {
+                (c.stroke, c.stroke_tint) = (name.clone(), 1.0);
+            } else {
+                (c.fill, c.fill_tint) = (name.clone(), 1.0);
+            }
+            Ok(json!({"swatch": name, "newObject": true}))
+        });
+    }
+    let (ids, texts) = if text { (vec![], crate::cmd::text::format_targets_pub(s)) } else { (crate::cmd::targets(s, p)?, vec![]) };
+    if text && texts.is_empty() {
+        return Err(bad("object.color", "select the text to colour"));
+    }
+    // A caret: the colour is for the next typing (once the swatch exists).
+    let caret = matches!(texts.as_slice(), [t] if t.range.is_empty());
+    let r = s.edit(|d, _| {
+        let name = color_swatch(d, color);
+        color_items(d, &ids, &name, stroke);
+        if !caret {
+            let a = if stroke {
+                CharAttrs { stroke: Some(name.clone()), stroke_tint: Some(1.0), ..Default::default() }
+            } else {
+                CharAttrs { fill: Some(name.clone()), fill_tint: Some(1.0), ..Default::default() }
+            };
+            crate::cmd::text::apply_char_attrs(d, &texts, &a, &[]);
+        }
+        Ok(json!({"swatch": name}))
+    })?;
+    if caret && let Some(name) = r.get("swatch").cloned() {
+        let attrs = if stroke { json!({"stroke": name, "strokeTint": 1.0}) } else { json!({"fill": name, "fillTint": 1.0}) };
+        crate::cmd::text::format_chars(s, &attrs)?;
+    }
+    Ok(r)
+}
+
+/// A process swatch holding this colour to the precision its name shows (whole CMYK percents,
+/// 0-255 RGB), else a new unnamed one (hidden from the Swatches panel until Add to Swatches):
+/// values a fraction of a percent apart would otherwise add hidden "C=0 M=50 Y=100 K=0 2" twins.
+fn color_swatch(d: &mut designcraft_doc::Document, color: designcraft_color::Color) -> String {
+    let shown = value_name(color);
+    let process = |w: &&Swatch| match &w.value {
+        SwatchValue::Color { color: c, color_type: designcraft_color::ColorType::Process } => Some(*c),
+        _ => None,
+    };
+    let existing = d
+        .swatches
+        .iter()
+        .find(|w| process(w) == Some(color))
+        .or_else(|| {
+            d.swatches
+                .iter()
+                .find(|w| process(w).is_some_and(|c| std::mem::discriminant(&c) == std::mem::discriminant(&color) && value_name(c) == shown))
+        })
+        .map(|w| w.name.clone());
+    if let Some(n) = existing {
+        return n;
+    }
+    let name = Styles::unique_name(|n| d.swatch(n).is_some(), &shown);
+    d.swatches.push(Swatch {
+        name: name.clone(),
+        value: SwatchValue::Color { color, color_type: designcraft_color::ColorType::Process },
+        locked: false,
+        named: false,
+        hidden: true,
+    });
+    name
+}
+
+fn color_items(d: &mut designcraft_doc::Document, ids: &[designcraft_doc::ItemId], name: &str, stroke: bool) {
+    for id in ids {
+        if let Some(it) = d.item_mut(*id) {
+            if stroke {
+                it.stroke.swatch = name.to_string();
+                it.stroke.tint = 1.0;
+            } else {
+                it.fill.swatch = name.to_string();
+                it.fill.tint = 1.0;
+            }
+        }
+    }
+}
+
+pub(super) fn has_text_or_selection(s: &Session) -> std::result::Result<(), String> {
+    has_doc(s)?;
+    if s.active().is_some_and(|d| d.selection.text.is_some() || d.selection.cells.is_some()) { Ok(()) } else { crate::cmd::has_selection(s) }
+}
+
+/// The Eyedropper on a placed image (InDesign samples the pixel under the pointer): that colour,
+/// as an unnamed colour, fills the selected text (characters), or the selected objects.
+pub(super) fn sample_color(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "color.sample";
+    let at = crate::cmd::point_param(p, "at").ok_or_else(|| bad(ID, "missing at"))?;
+    let sr = crate::cmd::spread_param(p, ID)?;
+    let st = s.doc()?;
+    let Some((from, color)) = image_color_at(&st.doc, sr, at) else {
+        // No opaque image pixel there (an empty part of an image frame, a transparent pixel): the
+        // Eyedropper applies the clicked object's attributes instead.
+        return match p.get("matchFrom") {
+            Some(from) => {
+                let mut params = p.clone();
+                params["from"] = from.clone();
+                crate::cmd::object::match_attributes(s, &params)
+            }
+            None => Err(bad(ID, "no placed image under the point")),
+        };
+    };
+    let hex = color.to_hex();
+    let mut params = p.clone();
+    params["color"] = json!(hex);
+    let mut result = apply_color(s, &params)?;
+    result["color"] = json!(hex);
+    result["from"] = json!(from.0);
+    Ok(result)
+}
+
+/// The colour of the placed raster image at `at` on spread `sr`: the frontmost visible image whose
+/// frame shows that point (locked ones too, as sampling changes nothing). (image frame, colour);
+/// None over no image, a transparent pixel, or a graphic that is not a raster (PDF, EPS).
+pub(crate) fn image_color_at(
+    d: &designcraft_doc::Document,
+    sr: designcraft_doc::SpreadRef,
+    at: designcraft_geom::Point,
+) -> Option<(designcraft_doc::ItemId, designcraft_color::Color)> {
+    let sp = d.spread(sr)?;
+    let mut items: Vec<&designcraft_doc::Item> = sp.items.iter().map(|i| &**i).collect();
+    items.sort_by_key(|i| d.layer_rank(i.layer));
+    items
+        .into_iter()
+        .rev()
+        .filter(|it| d.layer(it.layer).is_none_or(|l| l.visible))
+        .find_map(|it| sample_item(d, it, designcraft_geom::Affine::IDENTITY, at, 0))
+}
+
+fn sample_item(
+    d: &designcraft_doc::Document,
+    it: &designcraft_doc::Item,
+    outer: designcraft_geom::Affine,
+    at: designcraft_geom::Point,
+    depth: usize,
+) -> Option<(designcraft_doc::ItemId, designcraft_color::Color)> {
+    use designcraft_doc::Content;
+    if it.hidden || depth > 64 {
+        return None;
+    }
+    let xf = outer * it.xf;
+    match &it.content {
+        // Only the active state of a multi-state object shows.
+        Content::Group { .. } => {
+            let shown: Vec<_> = it.shown_children().collect();
+            shown.into_iter().rev().find_map(|c| sample_item(d, c, xf, at, depth + 1))
+        }
+        Content::Graphic(g) => {
+            let inner = xf.inverse() * at;
+            if !designcraft_geom::hit::fill_contains(&it.path.to_bezpath(), designcraft_geom::FillRule::NonZero, inner) {
+                return None;
+            }
+            // A clipping path hides the image outside it.
+            if let Some((region, even_odd)) = g.clip_region() {
+                let rule = if even_odd { designcraft_geom::FillRule::EvenOdd } else { designcraft_geom::FillRule::NonZero };
+                if !designcraft_geom::hit::fill_contains(&region, rule, inner) {
+                    return None;
+                }
+            }
+            let gp = g.xf.inverse() * inner;
+            let (w, h) = g.size;
+            // Written so that NaN (a degenerate transform) is outside too.
+            if !(w > 0.0 && h > 0.0 && gp.x >= 0.0 && gp.y >= 0.0 && gp.x < w && gp.y < h) {
+                return None;
+            }
+            let asset = d.assets.get(&g.asset).filter(|a| a.is_raster())?;
+            let img = designcraft_images::decode_rgba(&asset.data)?;
+            let (pw, ph) = img.dimensions();
+            let px = ((gp.x / w * f64::from(pw)) as u32).min(pw.checked_sub(1)?);
+            let py = ((gp.y / h * f64::from(ph)) as u32).min(ph.checked_sub(1)?);
+            let [r, gr, b, a] = img.get_pixel_checked(px, py)?.0;
+            (a > 0).then(|| (it.id, designcraft_color::Color::rgb8(r, gr, b)))
+        }
+        _ => None,
+    }
+}
+
+/// Renaming a swatch walks every text inside a story (table cells, notes): refuse the whole edit
+/// for nesting deeper than 32 levels rather than leave deeper references at a removed name.
+pub(super) fn check_text_nesting(d: &designcraft_doc::Document, id: &str) -> Result<()> {
+    fn within(st: &designcraft_doc::Story, depth: usize) -> bool {
+        depth <= 32
+            && st.tables.values().all(|t| t.cells.iter().all(|c| within(&c.text, depth + 1)))
+            && st.notes.iter().chain(&st.endnotes).all(|n| within(&n.text, depth + 1))
+    }
+    if d.stories.values().all(|st| within(st, 0)) { Ok(()) } else { Err(bad(id, "story nesting exceeds 32 levels")) }
+}
diff --git a/crates/engine/src/cmd/style/color_tests.rs b/crates/engine/src/cmd/style/color_tests.rs
new file mode 100644
index 000000000..499f985d2
--- /dev/null
+++ b/crates/engine/src/cmd/style/color_tests.rs
@@ -0,0 +1,533 @@
+use super::*;
+
+fn fill_session() -> Session {
+    let mut session = Session::new();
+    session.execute("file.new", &json!({})).unwrap();
+    let frame = session.execute("frame.create", &json!({"rect": [0, 0, 200, 100], "content": "text", "text": "Hi"})).unwrap();
+    session.execute("text.select", &json!({"story": frame["story"], "anchor": 0, "focus": 2})).unwrap();
+    session.execute("style.paragraph.create", &json!({"name": "Existing"})).unwrap();
+    session.execute("style.character.create", &json!({"name": "Existing"})).unwrap();
+    session.execute("type.char", &json!({"size": 18})).unwrap();
+    session.execute("edit.undo", &json!({})).unwrap();
+    session
+}
+
+fn assert_fill_rejected(session: &mut Session, command: &str, params: Value) {
+    let before = session.doc().unwrap().clone();
+    let journal = session.journal.clone();
+    let fill = params
+        .pointer("/chars/fill")
+        .or_else(|| params.pointer("/attrs/fill"))
+        .or_else(|| params.get("fill"))
+        .and_then(Value::as_str)
+        .unwrap_or("Missing Ink");
+
+    let result = session.execute(command, &params);
+
+    match result {
+        Err(crate::EngineError::BadParams { cmd, msg }) => {
+            assert_eq!(cmd, command);
+            assert!(msg.contains(fill), "{msg}");
+            assert!(msg.contains("swatch.create") && msg.contains("returned name"), "{msg}");
+        }
+        other => panic!("expected BadParams for {command}, got {other:?}"),
+    }
+    let after = session.doc().unwrap();
+    assert!(std::sync::Arc::ptr_eq(&before.doc, &after.doc));
+    assert_eq!(before.selection, after.selection);
+    assert_eq!(before.revision, after.revision);
+    assert_eq!(format!("{:?}", before.history), format!("{:?}", after.history));
+    assert_eq!(journal, session.journal);
+}
+
+#[test]
+fn char_fill_rejects_unknown_flat_and_nested_names_when_formatting() {
+    for fill in ["Missing Ink", "#ff0000", "[black]", " [Black]"] {
+        for params in [json!({"fill": fill, "size": 24}), json!({"attrs": {"fill": fill, "size": 24}})] {
+            let mut session = fill_session();
+            assert_fill_rejected(&mut session, "type.char", params);
+        }
+    }
+}
+
+#[test]
+fn char_fill_rejects_unknown_names_when_creating_or_editing_styles() {
+    for command in ["style.paragraph.create", "style.paragraph.edit", "style.character.create", "style.character.edit"] {
+        for fill in ["Missing Ink", "#ff0000"] {
+            let mut session = fill_session();
+            session.execute("style.paragraph.apply", &json!({"name": "Existing"})).unwrap();
+            session.execute("style.character.apply", &json!({"name": "Existing"})).unwrap();
+            let mut params = json!({"name": "Existing", "chars": {"fill": fill, "size": 24}});
+            // Only the edit commands take `rename`.
+            if command.ends_with(".edit") {
+                params["rename"] = json!("Renamed");
+            }
+            assert_fill_rejected(&mut session, command, params);
+        }
+    }
+}
+
+#[test]
+fn char_fill_preserves_deleted_swatch_when_creating_from_selection() {
+    for params in [json!({"name": "Inherited", "fromSelection": true}), json!({"name": "Inherited", "fromSelection": true, "chars": {"size": 24}})] {
+        let mut session = fill_session();
+        let swatch = session.execute("swatch.create", &json!({"name": "Deleted Ink", "color": "#108080"})).unwrap();
+        let fill = swatch["name"].as_str().unwrap();
+        session.execute("type.char", &json!({"fill": fill})).unwrap();
+        session.execute("swatch.delete", &json!({"name": fill})).unwrap();
+        assert_eq!(session.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fill"], fill);
+
+        session.execute("style.paragraph.create", &params).unwrap();
+
+        let chars = &session.doc().unwrap().doc.styles.para("Inherited").unwrap().chars;
+        assert_eq!(chars.fill.as_deref(), Some(fill));
+        if params.get("chars").is_some() {
+            assert_eq!(chars.size, Some(24.0));
+        }
+    }
+}
+
+#[test]
+fn char_fill_rejects_explicit_unknown_name_when_creating_from_selection() {
+    for fill in ["Missing Ink", "#ff0000"] {
+        let mut session = fill_session();
+
+        assert_fill_rejected(
+            &mut session,
+            "style.paragraph.create",
+            json!({"name": "Explicit", "fromSelection": true, "chars": {"fill": fill, "size": 24}}),
+        );
+    }
+}
+
+#[test]
+fn char_fill_accepts_valid_override_when_selection_has_unknown_name() {
+    let mut session = fill_session();
+    session
+        .edit(|document, selection| {
+            let selected = selection.text.unwrap();
+            document.story_mut(selected.story).unwrap().format_chars(selected.range(), |format| format.over.fill = Some("Missing Ink".into()));
+            Ok(())
+        })
+        .unwrap();
+
+    session.execute("style.paragraph.create", &json!({"name": "Override", "fromSelection": true, "chars": {"fill": "[Paper]"}})).unwrap();
+
+    assert_eq!(session.doc().unwrap().doc.styles.para("Override").unwrap().chars.fill.as_deref(), Some("[Paper]"));
+}
+
+#[test]
+fn char_fill_rejects_unknown_name_when_changing_text_even_without_output() {
+    for (find, change) in [("Hi", "Bye"), ("Hi", ""), ("Absent", "Bye")] {
+        for fill in ["Missing Ink", "#ff0000"] {
+            let mut session = fill_session();
+            assert_fill_rejected(&mut session, "find.change", json!({"find": find, "change": change, "attrs": {"fill": fill}}));
+        }
+    }
+}
+
+#[test]
+fn char_fill_preserves_exact_registered_names_when_used_at_all_boundaries() {
+    for fill in ["Brand Ink", "#ff0000", "[None]", "[Black]"] {
+        let mut session = fill_session();
+        if !fill.starts_with('[') {
+            let created = session.execute("swatch.create", &json!({"name": fill, "color": "#108080"})).unwrap();
+            assert_eq!(created["name"], fill);
+        }
+        for params in [json!({"fill": fill}), json!({"attrs": {"fill": fill}})] {
+            session.execute("type.char", &params).unwrap();
+            assert_eq!(session.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fill"], fill);
+        }
+        for kind in ["paragraph", "character"] {
+            session.execute(&format!("style.{kind}.create"), &json!({"name": "Colored", "chars": {"fill": fill}})).unwrap();
+            session.execute(&format!("style.{kind}.edit"), &json!({"name": "Existing", "chars": {"fill": fill}})).unwrap();
+            let document = &session.doc().unwrap().doc;
+            for name in ["Colored", "Existing"] {
+                let attrs =
+                    if kind == "paragraph" { &document.styles.para(name).unwrap().chars } else { &document.styles.char_style(name).unwrap().chars };
+                assert_eq!(attrs.fill.as_deref(), Some(fill));
+            }
+        }
+        assert_eq!(session.execute("find.change", &json!({"find": "Hi", "change": "Bye", "attrs": {"fill": fill}})).unwrap()["count"], 1);
+        let selected = session.doc().unwrap().selection.text.unwrap();
+        let story = session.doc().unwrap().doc.story(selected.story).unwrap();
+        assert_eq!(story.text, "Bye");
+        assert_eq!(story.format_after(0).over.fill.as_deref(), Some(fill));
+    }
+}
+
+#[test]
+fn char_fill_accepts_omitted_and_null_attributes_when_used_at_all_boundaries() {
+    for chars in [json!({"size": 18}), json!({"fill": null})] {
+        let mut session = fill_session();
+        session.execute("type.char", &json!({"attrs": chars})).unwrap();
+        for kind in ["paragraph", "character"] {
+            session.execute(&format!("style.{kind}.create"), &json!({"name": "Nullable", "chars": chars})).unwrap();
+            session.execute(&format!("style.{kind}.edit"), &json!({"name": "Existing", "chars": chars})).unwrap();
+        }
+        assert_eq!(session.execute("find.change", &json!({"find": "Hi", "change": "Bye", "attrs": chars})).unwrap()["count"], 1);
+    }
+}
+
+#[test]
+fn percent_components_at_most_one_stay_percent() {
+    use designcraft_color::Color;
+    // {"c": 0.7, ..., "y": 12.2} is a pale cream (C 0.7 %, Y 12.2 %), not C 70 %.
+    let Some(Color::Cmyk { c, m, y, k }) = parse_color(&json!({"c": 0.7, "m": 0, "y": 12.2, "k": 0})) else { panic!("not CMYK") };
+    assert!((c - 0.007).abs() < 1e-6 && m == 0.0 && (y - 0.122).abs() < 1e-6 && k == 0.0, "got {c} {m} {y} {k}");
+    // Fractions take the colour's own form, with its model.
+    let Some(Color::Cmyk { c, k, .. }) = parse_color(&json!({"model": "cmyk", "c": 0.5, "m": 0, "y": 0, "k": 1})) else { panic!("not CMYK") };
+    assert!((c - 0.5).abs() < 1e-6 && (k - 1.0).abs() < 1e-6);
+    // RGB arrays follow the same rule: [1, 128, 255] is 0..255.
+    let Some(Color::Rgb { r, g, b }) = parse_color(&json!([1, 128, 255])) else { panic!("not RGB") };
+    assert!((r - 1.0 / 255.0).abs() < 1e-6 && (g - 128.0 / 255.0).abs() < 1e-6 && (b - 1.0).abs() < 1e-6);
+}
+
+/// #910: `{c: 1, m: 0, y: 0, k: 0}` is a 1 % cyan tint, not solid cyan, though every component is within 0..1.
+#[test]
+fn cmyk_percentages_of_one_or_less_stay_percent() {
+    use designcraft_color::Color;
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let id = s.execute("frame.create", &json!({"rect": [0, 0, 50, 50]})).unwrap()["id"].as_u64().unwrap();
+    s.execute("swatch.create", &json!({"name": "Tint1", "color": {"c": 1, "m": 0, "y": 0, "k": 0}})).unwrap();
+    s.execute("object.fill", &json!({"ids": [id], "swatch": "Tint1"})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    let Some(Color::Cmyk { c, m, y, k }) = d.resolve_color("Tint1", 1.0) else { panic!("not CMYK") };
+    assert!((c - 0.01).abs() < 1e-6 && m == 0.0 && y == 0.0 && k == 0.0, "got {c} {m} {y} {k}");
+    let pdf = designcraft_pdf::export_pdf(d, &s.cache, &designcraft_pdf::PdfOptions { compress: false, ..Default::default() }).unwrap();
+    let text = String::from_utf8_lossy(&pdf);
+    // Operands of every `k` (DeviceCMYK fill), last first: [k, y, m, c]. Inks are written in 1/255 steps (C 1 % is 3/255).
+    let fills: Vec<Vec<f32>> =
+        text.split(" k ").filter_map(|before| before.rsplit(' ').take(4).map(|x| x.parse().ok()).collect::<Option<Vec<f32>>>()).collect();
+    let cyan = |want: f32| fills.iter().any(|f| (f[3] - want).abs() < 0.5 / 255.0 + 1e-6 && f[..3] == [0.0; 3]);
+    assert!(cyan(0.01), "C 1 % in the PDF: {fills:?}");
+    assert!(!cyan(1.0), "no solid cyan: {fills:?}");
+    // A light tint whose components are all 1 or less, through object.color.
+    s.execute("selection.set", &json!({"ids": [id]})).unwrap();
+    s.execute("object.color", &json!({"color": {"c": 0.5, "m": 0.5, "y": 0, "k": 0}})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    let fill = &d.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch;
+    let Some(Color::Cmyk { c, m, .. }) = d.resolve_color(fill, 1.0) else { panic!("not CMYK") };
+    assert!((c - 0.005).abs() < 1e-6 && (m - 0.005).abs() < 1e-6, "got {c} {m}");
+}
+
+#[test]
+fn a_colour_with_a_model_is_read_as_fractions_without_guessing() {
+    use designcraft_color::Color;
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let id = s.execute("frame.create", &json!({"rect": [0, 0, 50, 50]})).unwrap()["id"].as_u64().unwrap();
+    s.execute("selection.set", &json!({"ids": [id]})).unwrap();
+    let fill = |s: &Session| {
+        let d = &s.doc().unwrap().doc;
+        d.resolve_color(&d.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch, 1.0).unwrap()
+    };
+    // M 1 % from the Color panel: not M 100 % (magenta), though every component is within 0..1.
+    s.execute("object.color", &json!({"color": {"model": "cmyk", "c": 0, "m": 0.01, "y": 0, "k": 0}})).unwrap();
+    let Color::Cmyk { c, m, y, k } = fill(&s) else { panic!("not CMYK") };
+    assert!(c == 0.0 && (m - 0.01).abs() < 1e-6 && y == 0.0 && k == 0.0, "got {c} {m} {y} {k}");
+    // R 1 of 255 is a near black, not pure red.
+    s.execute("object.color", &json!({"color": {"model": "rgb", "r": 1.0 / 255.0, "g": 0, "b": 0}})).unwrap();
+    let Color::Rgb { r, g, b } = fill(&s) else { panic!("not RGB") };
+    assert!((r - 1.0 / 255.0).abs() < 1e-6 && g == 0.0 && b == 0.0, "got {r} {g} {b}");
+    // Out of range or not a model: refused rather than guessed.
+    assert!(s.execute("object.color", &json!({"color": {"model": "cmyk", "c": 0, "m": 50, "y": 0, "k": 0}})).is_err());
+    assert!(s.execute("object.color", &json!({"color": {"model": "hsb", "h": 0, "s": 0, "b": 0}})).is_err());
+}
+
+#[test]
+fn colours_that_round_to_the_same_name_share_one_swatch() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let id = s.execute("frame.create", &json!({"rect": [0, 0, 50, 50]})).unwrap()["id"].as_u64().unwrap();
+    s.execute("selection.set", &json!({"ids": [id]})).unwrap();
+    let n = |s: &Session| s.doc().unwrap().doc.swatches.len();
+    let first = s.execute("object.color", &json!({"color": {"model": "cmyk", "c": 0.1, "m": 0.5, "y": 1, "k": 0}})).unwrap();
+    let before = n(&s);
+    for m in [0.501, 0.499, 0.5041] {
+        let r = s.execute("object.color", &json!({"color": {"model": "cmyk", "c": 0.1, "m": m, "y": 1, "k": 0}})).unwrap();
+        assert_eq!(r["swatch"], first["swatch"], "M {m}");
+    }
+    s.execute("object.color", &json!({"color": {"model": "rgb", "r": 0.5, "g": 0.25, "b": 0}})).unwrap();
+    s.execute("object.color", &json!({"color": {"model": "rgb", "r": 0.5005, "g": 0.25, "b": 0}})).unwrap();
+    assert_eq!(n(&s), before + 1, "no hidden twins for values a fraction of a step apart");
+    // A whole percent apart is a different colour.
+    let r = s.execute("object.color", &json!({"color": {"model": "cmyk", "c": 0.1, "m": 0.51, "y": 1, "k": 0}})).unwrap();
+    assert_eq!(r["swatch"], "C=10 M=51 Y=100 K=0");
+}
+
+#[test]
+fn style_groups_rename_every_use() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Head"})).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Sub", "basedOn": "Head"})).unwrap();
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hi"})).unwrap();
+    let sid = r["story"].as_u64().unwrap();
+    s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 2})).unwrap();
+    s.execute("style.paragraph.apply", &json!({"name": "Head"})).unwrap();
+    let r = s.execute("style.group", &json!({"kind": "paragraph", "names": ["Head", "Sub"], "group": "Titles"})).unwrap();
+    assert_eq!(r["renamed"]["Head"], "Titles/Head");
+    let d = s.doc().unwrap().doc.clone();
+    assert_eq!(d.story(designcraft_doc::StoryId(sid)).unwrap().paras[0].style, "Titles/Head");
+    assert_eq!(d.styles.para("Titles/Sub").unwrap().based_on.as_deref(), Some("Titles/Head"));
+    // Out of the group again.
+    s.execute("style.group", &json!({"kind": "paragraph", "names": ["Titles/Head"], "group": ""})).unwrap();
+    assert!(s.doc().unwrap().doc.styles.para("Head").is_some());
+    assert!(s.execute("style.group", &json!({"names": ["[Basic Paragraph]"], "group": "X"})).is_err());
+}
+
+#[test]
+fn character_style_edit_sets_unsets_rebases_and_renames_every_use() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("style.character.create", &json!({"name": "Base", "chars": {"fontStyle": "Bold"}})).unwrap();
+    s.execute("style.character.create", &json!({"name": "Emphasis", "chars": {"fontStyle": "Italic", "tracking": 20}})).unwrap();
+    s.execute(
+        "style.paragraph.create",
+        &json!({"name": "Lead", "para": {
+            "nestedStyles": [{"style": "Emphasis", "through": true, "count": 1, "until": {"kind": "words"}}],
+            "grepStyles": [{"style": "Emphasis", "pattern": "\\d+"}],
+            "nestedLineStyles": [{"style": "Emphasis", "lines": 1}]}}),
+    )
+    .unwrap();
+    s.execute("footnote.options", &json!({"refCharStyle": "Emphasis"})).unwrap();
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hi there"})).unwrap();
+    let sid = r["story"].as_u64().unwrap();
+    s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 2})).unwrap();
+    s.execute("style.character.apply", &json!({"name": "Emphasis"})).unwrap();
+
+    s.execute(
+        "style.character.edit",
+        &json!({"name": "Emphasis", "rename": "Strong", "basedOn": "Base", "chars": {"size": 14, "fill": "[Paper]", "fontStyle": null}}),
+    )
+    .unwrap();
+    let d = s.doc().unwrap().doc.clone();
+    assert!(d.styles.char_style("Emphasis").is_none());
+    let st = d.styles.char_style("Strong").unwrap();
+    assert_eq!(st.based_on.as_deref(), Some("Base"));
+    // Exactly the attributes set: `null` unset the font style, the rest stayed unset.
+    assert_eq!(st.chars, CharAttrs { size: Some(14.0), fill: Some("[Paper]".into()), tracking: Some(20.0), ..Default::default() });
+    let story = d.story(designcraft_doc::StoryId(sid)).unwrap();
+    assert!(story.chars.iter().any(|r| r.format.style == "Strong"));
+    assert!(story.chars.iter().all(|r| r.format.style != "Emphasis"));
+    let lead = d.styles.para("Lead").unwrap();
+    assert_eq!(lead.para.nested_styles.as_ref().unwrap()[0].style, "Strong");
+    assert_eq!(lead.para.grep_styles.as_ref().unwrap()[0].style, "Strong");
+    assert_eq!(lead.para.nested_line_styles.as_ref().unwrap()[0].style, "Strong");
+    assert_eq!(d.footnote_options.ref_char_style, "Strong");
+
+    // Based On [None] (null or the name) clears it.
+    s.execute("style.character.edit", &json!({"name": "Strong", "basedOn": null})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.styles.char_style("Strong").unwrap().based_on, None);
+    s.execute("style.character.edit", &json!({"name": "Strong", "basedOn": "Base"})).unwrap();
+    s.execute("style.character.edit", &json!({"name": "Strong", "basedOn": "[None]"})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.styles.char_style("Strong").unwrap().based_on, None);
+
+    // Refused: a based-on cycle, an unknown parent, a taken or empty name, editing [None].
+    s.execute("style.character.edit", &json!({"name": "Strong", "basedOn": "Base"})).unwrap();
+    assert!(s.execute("style.character.edit", &json!({"name": "Base", "basedOn": "Strong"})).is_err());
+    assert!(s.execute("style.character.edit", &json!({"name": "Strong", "basedOn": "Nope"})).is_err());
+    assert!(s.execute("style.character.edit", &json!({"name": "Strong", "rename": "Base"})).is_err());
+    assert!(s.execute("style.character.edit", &json!({"name": "Strong", "rename": "  "})).is_err());
+    assert!(s.execute("style.character.edit", &json!({"name": "[None]", "chars": {"size": 9}})).is_err());
+    assert!(s.doc().unwrap().doc.styles.char_style("[None]").unwrap().chars.is_empty());
+}
+
+#[test]
+fn continue_numbering_in_a_style_overrides_an_inherited_start_at() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Steps", "para": {"listType": "numbers", "startAt": 5}})).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "More Steps", "basedOn": "Steps"})).unwrap();
+    let start = |s: &Session, name: &str| s.doc().unwrap().doc.styles.resolve_para_style(name).0.start_at;
+    assert_eq!(start(&s, "More Steps"), Some(5), "inherited");
+    s.execute("style.paragraph.edit", &json!({"name": "More Steps", "para": {"startAt": null}})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.styles.para("More Steps").unwrap().para.start_at, Some(None));
+    assert_eq!(start(&s, "More Steps"), None, "continues");
+    assert_eq!(start(&s, "Steps"), Some(5), "the parent keeps its Start At");
+    s.execute("style.paragraph.edit", &json!({"name": "Steps", "para": {"startAt": null}})).unwrap();
+    assert_eq!(start(&s, "Steps"), None);
+    s.execute("style.paragraph.create", &json!({"name": "Fresh", "basedOn": "More Steps", "para": {"start_at": null}})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.styles.para("Fresh").unwrap().para.start_at, Some(None));
+}
+
+#[test]
+fn null_kinsoku_sets_the_default_rules_over_a_based_on_set() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let hard = serde_json::to_value(designcraft_doc::cjk::Kinsoku::named("HardKinsoku").unwrap()).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Base", "para": {"kinsoku": hard}})).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Body", "basedOn": "Base", "para": {"kinsoku": hard}})).unwrap();
+    s.execute("style.paragraph.edit", &json!({"name": "Body", "para": {"kinsoku": null}})).unwrap();
+    let styles = s.doc().unwrap().doc.styles.clone();
+    assert_eq!(styles.para("Body").unwrap().para.kinsoku, Some(None));
+    assert_eq!(styles.resolve_para_style("Body").0.kinsoku, None, "Base's set no longer applies");
+    // An edit without the attribute keeps it.
+    s.execute("style.paragraph.edit", &json!({"name": "Body", "para": {"rensuuji": false}})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.styles.para("Body").unwrap().para.kinsoku, Some(None));
+}
+
+#[test]
+fn new_character_style_checks_its_based_on() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    assert!(s.execute("style.character.create", &json!({"name": "Orphan", "basedOn": "Nope"})).is_err());
+    s.execute("style.character.create", &json!({"name": "Plain", "basedOn": "[None]", "chars": {"size": 9}})).unwrap();
+    let st = s.doc().unwrap().doc.styles.char_style("Plain").cloned().unwrap();
+    assert_eq!((st.based_on, st.chars), (None, CharAttrs { size: Some(9.0), ..Default::default() }));
+}
+
+#[test]
+fn swatches_save_and_load_ase() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("swatch.create", &json!({"name": "Brand Teal", "color": "#108080"})).unwrap();
+    let b64 = s.execute("swatch.save", &json!({"names": ["Brand Teal"]})).unwrap()["base64"].as_str().unwrap().to_string();
+    s.execute("file.new", &json!({})).unwrap();
+    let r = s.execute("swatch.load", &json!({"base64": b64})).unwrap();
+    assert_eq!(r["added"], 1);
+    assert!(s.doc().unwrap().doc.swatch("Brand Teal").is_some());
+    let r = s.execute("swatch.load", &json!({"base64": b64})).unwrap();
+    assert_eq!((r["added"].as_u64(), r["replaced"].as_u64()), (Some(0), Some(0)));
+    assert!(s.execute("swatch.load", &json!({"base64": "AAAA"})).is_err());
+}
+
+#[test]
+fn loading_swatches_matches_the_first_swatch_of_each_name() {
+    use designcraft_color::{Color, ColorType};
+    let ink = |k: f32| SwatchValue::Color { color: Color::cmyk(0.0, 0.0, 0.0, k), color_type: ColorType::Process };
+    let sw = |name: &str, k: f32| Swatch { name: name.into(), value: ink(k), locked: false, named: true, hidden: false };
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    // Two swatches share a name, and an unnamed color is hidden.
+    s.edit(|d, _| {
+        d.swatches.extend([sw("Twin", 0.1), sw("Twin", 0.2), Swatch { named: false, hidden: true, ..sw("Unnamed", 0.3) }]);
+        Ok(())
+    })
+    .unwrap();
+    let file = designcraft_color::ase::write(&[sw("New", 0.4), sw("New", 0.5), sw("Twin", 0.6), sw("Unnamed", 0.7), sw("[Black]", 0.8)]);
+    let b64 = crate::cmd::base64_encode(&file);
+    let named = |s: &Session, name: &str| -> Vec<(SwatchValue, bool)> {
+        s.doc().unwrap().doc.swatches.iter().filter(|w| w.name == name).map(|w| (w.value.clone(), w.hidden)).collect()
+    };
+    // With `replace`, the file's second "New" is added as "New 2", only the first "Twin" changes, the hidden
+    // swatch becomes visible, and the locked [Black] stays.
+    let r = s.execute("swatch.load", &json!({"base64": b64, "replace": true})).unwrap();
+    assert_eq!((r["added"].as_u64(), r["replaced"].as_u64()), (Some(2), Some(2)));
+    assert_eq!(named(&s, "New"), [(ink(0.4), false)]);
+    assert_eq!(named(&s, "New 2"), [(ink(0.5), false)]);
+    assert_eq!(named(&s, "Twin"), [(ink(0.6), false), (ink(0.2), false)]);
+    assert_eq!(named(&s, "Unnamed"), [(ink(0.7), false)]);
+    assert_eq!(named(&s, "[Black]"), [(ink(1.0), false)]);
+    // Without it, every name is already there and nothing changes.
+    let before = s.doc().unwrap().doc.swatches.clone();
+    let r = s.execute("swatch.load", &json!({"base64": b64})).unwrap();
+    assert_eq!((r["added"].as_u64(), r["replaced"].as_u64()), (Some(0), Some(0)));
+    assert_eq!(s.doc().unwrap().doc.swatches, before);
+}
+
+#[test]
+fn loading_swatches_numbers_repeated_names_and_names_unnamed_colors() {
+    use designcraft_color::{Color, ColorType};
+    let ink = |k: f32| SwatchValue::Color { color: Color::cmyk(0.0, 0.0, 0.0, k), color_type: ColorType::Process };
+    let sw = |name: &str, k: f32| Swatch { name: name.into(), value: ink(k), locked: false, named: true, hidden: false };
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.edit(|d, _| {
+        d.swatches.push(sw("Kept", 0.1));
+        Ok(())
+    })
+    .unwrap();
+    // "Red 2" comes before the second "Red", which takes "Red 3". Two unnamed colors share a value.
+    let file =
+        designcraft_color::ase::write(&[sw("Red", 0.2), sw("Red 2", 0.3), sw("Red", 0.4), sw("", 0.55), sw("", 0.55), sw("", 0.65), sw("Kept", 0.7)]);
+    let b64 = crate::cmd::base64_encode(&file);
+    let named = |s: &Session, name: &str| -> Vec<(SwatchValue, bool)> {
+        s.doc().unwrap().doc.swatches.iter().filter(|w| w.name == name).map(|w| (w.value.clone(), w.named)).collect()
+    };
+    // Names already in the document are kept.
+    let r = s.execute("swatch.load", &json!({"base64": b64})).unwrap();
+    assert_eq!((r["added"].as_u64(), r["replaced"].as_u64()), (Some(6), Some(0)));
+    assert_eq!(named(&s, "Red"), [(ink(0.2), true)]);
+    assert_eq!(named(&s, "Red 2"), [(ink(0.3), true)]);
+    assert_eq!(named(&s, "Red 3"), [(ink(0.4), true)]);
+    assert_eq!(named(&s, "C=0 M=0 Y=0 K=55"), [(ink(0.55), false)]);
+    assert_eq!(named(&s, "C=0 M=0 Y=0 K=55 2"), [(ink(0.55), false)]);
+    assert_eq!(named(&s, "C=0 M=0 Y=0 K=65"), [(ink(0.65), false)]);
+    assert_eq!(named(&s, "Kept"), [(ink(0.1), true)]);
+    assert!(named(&s, "").is_empty());
+    // With `replace`, the same file again replaces each of its colors once.
+    let r = s.execute("swatch.load", &json!({"base64": b64, "replace": true})).unwrap();
+    assert_eq!((r["added"].as_u64(), r["replaced"].as_u64()), (Some(0), Some(7)));
+    assert_eq!(named(&s, "Red"), [(ink(0.2), true)]);
+    assert_eq!(named(&s, "Red 3"), [(ink(0.4), true)]);
+    assert_eq!(named(&s, "Kept"), [(ink(0.7), true)]);
+}
+
+#[test]
+fn unnamed_colors_then_add_to_swatches() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let id = s.execute("frame.create", &json!({"rect": [0, 0, 50, 50]})).unwrap()["id"].as_u64().unwrap();
+    s.execute("selection.set", &json!({"ids": [id]})).unwrap();
+    let listed = |s: &Session| s.doc().unwrap().doc.swatches.iter().filter(|w| !w.hidden).count();
+    let before = listed(&s);
+    let r = s.execute("object.color", &json!({"color": {"c": 10, "m": 20, "y": 30, "k": 0}})).unwrap();
+    assert_eq!(r["swatch"], "C=10 M=20 Y=30 K=0");
+    assert_eq!(listed(&s), before, "unnamed: not in the Swatches panel");
+    // The same colour again reuses it; the stroke target works too.
+    let n = s.doc().unwrap().doc.swatches.len();
+    s.execute("object.color", &json!({"color": {"c": 10, "m": 20, "y": 30, "k": 0}, "target": "stroke"})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.swatches.len(), n);
+    let d = &s.doc().unwrap().doc;
+    let it = d.item(designcraft_doc::ItemId(id)).unwrap();
+    assert_eq!(it.fill.swatch, it.stroke.swatch);
+    // Add to Swatches with a name: listed, and the object follows the rename.
+    s.execute("swatch.addToSwatches", &json!({"name": "Sand"})).unwrap();
+    assert_eq!(listed(&s), before + 1);
+    let d = &s.doc().unwrap().doc;
+    assert_eq!(d.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch, "Sand");
+    // A colour equal to an existing swatch applies that swatch.
+    s.execute("object.color", &json!({"color": {"c": 10, "m": 20, "y": 30, "k": 0}})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch, "Sand");
+}
+
+#[test]
+fn add_to_swatches_renames_the_colour_in_text_cells_and_notes() {
+    use std::sync::Arc;
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Hello world"})).unwrap();
+    let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+    s.execute("text.select", &json!({"story": sid.0, "anchor": 11})).unwrap();
+    s.execute("endnote.insert", &json!({"text": "end"})).unwrap();
+    s.execute("text.select", &json!({"story": sid.0, "anchor": 11})).unwrap();
+    s.execute("footnote.insert", &json!({"text": "note"})).unwrap();
+    s.execute("text.select", &json!({"story": sid.0, "anchor": 0})).unwrap();
+    s.execute("table.insert", &json!({"rows": 1, "cols": 1})).unwrap();
+    s.execute("text.select", &json!({"story": sid.0, "anchor": 1, "focus": 4})).unwrap();
+    let old = s.execute("object.color", &json!({"color": {"c": 10, "m": 20, "y": 30, "k": 0}})).unwrap()["swatch"].as_str().unwrap().to_string();
+    // The same unnamed colour on a cell, the cell's text and the footnote's text.
+    s.edit(|d, _| {
+        let st = d.story_mut(sid).unwrap();
+        let t = Arc::make_mut(st.tables.values_mut().next().unwrap());
+        t.cells[0].fill = old.clone();
+        t.cells[0].text.chars[0].format.over.fill = Some(old.clone());
+        Arc::make_mut(&mut st.notes[0]).text.chars[0].format.over.stroke = Some(old.clone());
+        Arc::make_mut(&mut st.endnotes[0]).text.chars[0].format.over.underline_color = Some(old.clone());
+        Ok(())
+    })
+    .unwrap();
+    s.execute("swatch.addToSwatches", &json!({"swatch": old, "name": "Sand"})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    let st = d.story(sid).unwrap();
+    assert_eq!(st.char_format_at(2).over.fill.as_deref(), Some("Sand"));
+    let cell = &st.tables.values().next().unwrap().cells[0];
+    assert_eq!(cell.fill, "Sand");
+    assert_eq!(cell.text.chars[0].format.over.fill.as_deref(), Some("Sand"));
+    assert_eq!(st.notes[0].text.chars[0].format.over.stroke.as_deref(), Some("Sand"));
+    assert_eq!(st.endnotes[0].text.chars[0].format.over.underline_color.as_deref(), Some("Sand"));
+    d.check().unwrap();
+}
diff --git a/crates/engine/src/cmd/style/object.rs b/crates/engine/src/cmd/style/object.rs
new file mode 100644
index 000000000..0eebe1748
--- /dev/null
+++ b/crates/engine/src/cmd/style/object.rs
@@ -0,0 +1,164 @@
+use super::{Effects, Item, ObjectStyle, Result, Session, Styles, Value, bad, json, str_param};
+
+pub(super) fn apply_object(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = str_param(p, "name").ok_or_else(|| bad("style.object.apply", "missing name"))?.to_string();
+    let os = s.doc()?.doc.styles.object_style(&name).cloned().ok_or_else(|| bad("style.object.apply", format!("no object style `{name}`")))?;
+    let ids = crate::cmd::targets(s, p)?;
+    s.edit(|d, _| {
+        let mut stories = Vec::new();
+        for id in &ids {
+            let Some(it) = d.item_mut(*id) else { continue };
+            it.object_style = name.clone();
+            os.apply_to(it);
+            if let Some(tf) = it.text_frame() {
+                stories.push(tf.story);
+            }
+        }
+        if let Some(ps) = &os.paragraph_style {
+            for sid in stories {
+                if let Some(st) = d.story_mut(sid) {
+                    let len = st.len();
+                    st.format_paras(0..len, |f| f.style = ps.clone());
+                }
+            }
+        }
+        Ok(Value::Null)
+    })
+}
+
+pub(super) fn clear_object_overrides(s: &mut Session, p: &Value) -> Result<Value> {
+    let ids = crate::cmd::targets(s, p)?;
+    // Each target with its style's attributes applied, kept only where that changes the item.
+    let d = &s.doc()?.doc;
+    let changed: Vec<Item> = ids
+        .iter()
+        .filter_map(|id| {
+            let it = d.item(*id)?;
+            let mut next = it.clone();
+            d.styles.object_style(&it.object_style)?.apply_to(&mut next);
+            (next != *it).then_some(next)
+        })
+        .collect();
+    if changed.is_empty() {
+        return Ok(json!({"changed": 0}));
+    }
+    s.edit(|d, _| {
+        for next in &changed {
+            if let Some(it) = d.item_mut(next.id) {
+                *it = next.clone();
+            }
+        }
+        Ok(json!({"changed": changed.len()}))
+    })
+}
+
+/// Effect keys accepted at the top level of `style.object.create` / `edit` as shorthand for
+/// `effects.<key>`.
+const EFFECT_KEYS: [&str; 9] =
+    ["dropShadow", "feather", "innerShadow", "outerGlow", "innerGlow", "bevel", "satin", "gradientFeather", "directionalFeather"];
+
+/// The effects `p` gives (`effects`, then the top-level effect keys) merged field by field over
+/// `base`, or `None` when `p` names no effect.
+fn effects_param(cmd: &str, p: &Value, base: &Effects) -> Result<Option<Effects>> {
+    let mut patch = serde_json::Map::new();
+    match p.get("effects") {
+        None | Some(Value::Null) => {}
+        Some(Value::Object(o)) => patch.extend(o.iter().map(|(k, v)| (k.clone(), v.clone()))),
+        Some(_) => return Err(bad(cmd, "`effects` must be an object or null")),
+    }
+    for k in EFFECT_KEYS {
+        if let Some(v) = p.get(k) {
+            patch.insert(k.to_string(), v.clone());
+        }
+    }
+    if patch.is_empty() {
+        return Ok(None);
+    }
+    let mut v = serde_json::to_value(base).map_err(|e| bad(cmd, e.to_string()))?;
+    merge_json(&mut v, Value::Object(patch), 0);
+    let e: Effects = serde_json::from_value(v).map_err(|e| bad(cmd, format!("effects: {e}")))?;
+    e.sanitized().map(Some).map_err(|m| bad(cmd, m))
+}
+
+/// Merges `top` into `base`: objects key by key, anything else replaced.
+fn merge_json(base: &mut Value, top: Value, depth: usize) {
+    match (base, top) {
+        (Value::Object(b), Value::Object(t)) if depth < 8 => {
+            for (k, v) in t {
+                match b.get_mut(&k) {
+                    Some(slot) => merge_json(slot, v, depth + 1),
+                    None => {
+                        b.insert(k, v);
+                    }
+                }
+            }
+        }
+        (b, t) => *b = t,
+    }
+}
+
+pub(super) fn create_object(s: &mut Session, p: &Value) -> Result<Value> {
+    let base = str_param(p, "name").unwrap_or("Object Style 1").to_string();
+    let from_sel = p.get("fromSelection").and_then(Value::as_bool).unwrap_or(true);
+    let src = if from_sel { s.doc()?.selection.items.first().and_then(|i| s.doc().ok()?.doc.item(*i).cloned()) } else { None };
+    let mut os = ObjectStyle::default();
+    if let Some(it) = &src {
+        os.fill = Some(it.fill.clone());
+        os.stroke = Some(it.stroke.clone());
+        os.text_frame = it.text_frame().map(|t| t.options.clone());
+        os.effects = Some(it.effects.clone());
+    }
+    if let Some(sw) = str_param(p, "fill") {
+        os.fill = Some(designcraft_doc::Fill::swatch(sw));
+    }
+    if let Some(ps) = str_param(p, "paragraphStyle") {
+        os.paragraph_style = Some(ps.to_string());
+    }
+    if let Some(e) = effects_param("style.object.create", p, os.effects.as_ref().unwrap_or(&Effects::default()))? {
+        os.effects = Some(e);
+    }
+    s.edit(|d, _| {
+        let name = Styles::unique_name(|n| d.styles.object_style(n).is_some(), &base);
+        os.name = name.clone();
+        d.styles_mut().object.push(os.clone());
+        Ok(json!({"name": name}))
+    })
+}
+
+pub(super) fn edit_object(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "style.object.edit";
+    let name = str_param(p, "name").ok_or_else(|| bad(CMD, "missing name"))?.to_string();
+    if name == designcraft_doc::NO_OBJECT_STYLE {
+        return Err(bad(CMD, format!("`{name}` can't be edited")));
+    }
+    let old = s.doc()?.doc.styles.object_style(&name).cloned().ok_or_else(|| bad(CMD, format!("no object style `{name}`")))?;
+    let effects = if p.get("effects").is_some_and(Value::is_null) {
+        if EFFECT_KEYS.iter().any(|k| p.get(k).is_some()) {
+            return Err(bad(CMD, "`effects: null` can't be combined with effect settings"));
+        }
+        None
+    } else {
+        match effects_param(CMD, p, old.effects.as_ref().unwrap_or(&Effects::default()))? {
+            Some(e) => Some(e),
+            None => return Ok(json!({"name": name, "updated": 0})),
+        }
+    };
+    if effects == old.effects {
+        return Ok(json!({"name": name, "updated": 0}));
+    }
+    s.edit(|d, _| {
+        let Some(os) = d.styles_mut().object.iter_mut().find(|o| o.name == name) else {
+            return Err(bad(CMD, format!("no object style `{name}`")));
+        };
+        os.effects = effects.clone();
+        // An item follows the style while its effects are the style's. When the style didn't set
+        // effects before, only items without effects of their own follow (the default styles are
+        // on most frames).
+        let follows = old.effects.clone().unwrap_or_default();
+        let updated = match &effects {
+            Some(new) => d.update_items(|it| it.object_style == name && it.effects == follows, |it| it.effects = new.clone()),
+            None => 0,
+        };
+        Ok(json!({"name": name, "updated": updated}))
+    })
+}
diff --git a/crates/engine/src/cmd/style/paragraph.rs b/crates/engine/src/cmd/style/paragraph.rs
new file mode 100644
index 000000000..81711ff10
--- /dev/null
+++ b/crates/engine/src/cmd/style/paragraph.rs
@@ -0,0 +1,1236 @@
+use super::{CharAttrs, CharacterStyle, ParaAttrs, ParagraphStyle, Result, Session, Styles, Value, bad, json, ok, str_param};
+
+#[cfg(test)]
+mod redefine_tests {
+    use super::*;
+
+    fn sample() -> (Session, Value, Value) {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let a = s.execute("frame.create", &json!({"rect":[36,36,300,200],"content":"text","text":"First header"})).unwrap();
+        let b = s.execute("frame.create", &json!({"rect":[36,240,300,400],"content":"text","text":"Second header"})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name":"Header","chars":{"size":18,"fill":"[Paper]"}})).unwrap();
+        for story in [&a["story"], &b["story"]] {
+            s.execute("text.select", &json!({"story":story,"anchor":0,"focus":5})).unwrap();
+            s.execute("style.paragraph.apply", &json!({"name":"Header"})).unwrap();
+        }
+        s.execute("text.select", &json!({"story":a["story"],"anchor":0,"focus":5})).unwrap();
+        (s, a["story"].clone(), b["story"].clone())
+    }
+
+    #[test]
+    fn redefine_paragraph_updates_other_stories_and_clears_the_source_overrides() {
+        let (mut s, a, b) = sample();
+        s.execute("style.character.create", &json!({"name":"Emphasis","chars":{"underline":true}})).unwrap();
+        s.execute("style.character.apply", &json!({"name":"Emphasis"})).unwrap();
+        s.execute("type.char", &json!({"size":20,"fill":"[Black]"})).unwrap();
+        s.execute("type.para", &json!({"spaceAfter":9})).unwrap();
+        let before = s.doc().unwrap().doc.clone();
+        let undo = s.doc().unwrap().history.undo.len();
+        s.execute("style.paragraph.redefine", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1);
+        assert!(s.doc().unwrap().doc.styles.para("Header").unwrap().chars.underline.is_none());
+        for story in [&a, &b] {
+            s.execute("text.select", &json!({"story":story,"anchor":0,"focus":5})).unwrap();
+            let attrs = s.execute("type.selectionAttrs", &json!({})).unwrap();
+            assert_eq!(attrs["chars"]["size"], 20.0);
+            assert_eq!(attrs["chars"]["fill"], "[Black]");
+            assert_eq!(attrs["para"]["spaceAfter"], 9.0);
+            assert_eq!(attrs["chars"]["underline"], story == &a);
+        }
+        s.execute("style.paragraph.edit", &json!({"name":"Header","chars":{"size":22}})).unwrap();
+        s.execute("text.select", &json!({"story":a,"anchor":0,"focus":5})).unwrap();
+        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["size"], 22.0);
+        s.execute("edit.undo", &json!({})).unwrap();
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc, before);
+    }
+
+    #[test]
+    fn redefine_character_does_not_capture_paragraph_font_size() {
+        let (mut s, a, b) = sample();
+        s.execute("style.character.create", &json!({"name":"Underline","chars":{"underline":true}})).unwrap();
+        for story in [&a, &b] {
+            s.execute("text.select", &json!({"story":story,"anchor":0,"focus":5})).unwrap();
+            s.execute("style.character.apply", &json!({"name":"Underline"})).unwrap();
+        }
+        s.execute("type.char", &json!({"fill":"[Black]"})).unwrap();
+        s.execute("style.character.redefine", &json!({"name":"Underline"})).unwrap();
+        let style = s.doc().unwrap().doc.styles.char_style("Underline").unwrap();
+        assert!(style.chars.size.is_none());
+        assert_eq!(style.chars.underline, Some(true));
+        for story in [&a, &b] {
+            s.execute("text.select", &json!({"story":story,"anchor":0,"focus":5})).unwrap();
+            assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fill"], "[Black]");
+        }
+    }
+
+    #[test]
+    fn redefine_rejects_the_wrong_style_and_the_none_entry_atomically() {
+        let (mut s, _, _) = sample();
+        let before = s.doc().unwrap().doc.clone();
+        let undo = s.doc().unwrap().history.undo.len();
+        assert!(s.execute("style.paragraph.redefine", &json!({"name":"Other"})).is_err());
+        assert!(s.execute("style.character.redefine", &json!({})).is_err());
+        assert_eq!(s.doc().unwrap().doc, before);
+        assert_eq!(s.doc().unwrap().history.undo.len(), undo);
+    }
+
+    #[test]
+    fn redefine_character_at_a_caret_cleans_the_source_run_but_keeps_other_overrides() {
+        let (mut s, story, _) = sample();
+        s.execute("style.character.create", &json!({"name":"Emphasis","chars":{"underline":true}})).unwrap();
+        for (start, end, size) in [(0, 5, 24), (6, 12, 32)] {
+            s.execute("text.select", &json!({"story":story,"anchor":start,"focus":end})).unwrap();
+            s.execute("style.character.apply", &json!({"name":"Emphasis"})).unwrap();
+            s.execute("type.char", &json!({"size":size})).unwrap();
+        }
+        let before = s.doc().unwrap().doc.clone();
+        s.execute("text.select", &json!({"story":story,"anchor":2,"focus":2})).unwrap();
+        s.execute("style.character.redefine", &json!({"name":"Emphasis"})).unwrap();
+        s.execute("style.character.edit", &json!({"name":"Emphasis","chars":{"size":30}})).unwrap();
+        for (start, end, size) in [(0, 5, 30.0), (6, 12, 32.0)] {
+            s.execute("text.select", &json!({"story":story,"anchor":start,"focus":end})).unwrap();
+            assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["size"], size);
+        }
+        s.execute("edit.undo", &json!({})).unwrap();
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc, before);
+    }
+}
+
+#[cfg(test)]
+mod application_inheritance_tests {
+    use super::*;
+
+    fn setup(text: &str) -> (Session, Value) {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let f = s.execute("frame.create", &json!({"rect": [36,36,300,300], "content": "text", "text": text})).unwrap();
+        (s, f["story"].clone())
+    }
+    fn select(s: &mut Session, story: &Value, start: usize, end: usize) {
+        s.execute("text.select", &json!({"story": story, "anchor": start, "focus": end})).unwrap();
+    }
+    fn attrs(s: &mut Session) -> Value {
+        s.execute("type.selectionAttrs", &json!({})).unwrap()
+    }
+
+    #[test]
+    fn paragraph_capture_source_follows_later_style_edits_and_undo() {
+        let (mut s, story) = setup("First\nSecond");
+        select(&mut s, &story, 0, 5);
+        s.execute("type.char", &json!({"size": 18, "fill": "[Paper]"})).unwrap();
+        s.execute("type.para", &json!({"spaceAfter": 6})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Header", "fromSelection": true})).unwrap();
+        let before = s.doc().unwrap().doc.clone();
+        let undo = s.doc().unwrap().history.undo.len();
+        s.execute("style.paragraph.apply", &json!({"name": "Header"})).unwrap();
+        assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc, before);
+        s.execute("edit.redo", &json!({})).unwrap();
+        select(&mut s, &story, 6, 6);
+        s.execute("style.paragraph.apply", &json!({"name": "Header"})).unwrap();
+        s.execute("style.paragraph.edit", &json!({"name": "Header", "chars": {"size": 20, "fill": "[Black]"}, "para": {"spaceAfter": 12}})).unwrap();
+        for pos in [0, 6] {
+            select(&mut s, &story, pos, pos + 1);
+            let a = attrs(&mut s);
+            assert_eq!(a["chars"]["size"], 20.0);
+            assert_eq!(a["chars"]["fill"], "[Black]");
+            assert_eq!(a["para"]["spaceAfter"], 12.0);
+        }
+    }
+
+    #[test]
+    fn applying_styles_keeps_different_overrides_and_named_character_styles() {
+        let (mut s, story) = setup("First\nSecond");
+        select(&mut s, &story, 0, 5);
+        s.execute("type.char", &json!({"size": 14})).unwrap();
+        s.execute("type.para", &json!({"spaceAfter": 9})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Emphasis", "chars": {"underline": true}})).unwrap();
+        s.execute("style.character.apply", &json!({"name": "Emphasis"})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Body", "chars": {"size": 10}, "para": {"spaceAfter": 6}})).unwrap();
+        s.execute("style.paragraph.apply", &json!({"name": "Body"})).unwrap();
+        let a = attrs(&mut s);
+        assert_eq!(a["chars"]["size"], 14.0);
+        assert_eq!(a["para"]["spaceAfter"], 9.0);
+        assert_eq!(a["characterStyle"], "Emphasis");
+        assert_eq!(a["chars"]["underline"], true);
+    }
+
+    #[test]
+    fn character_capture_source_remains_sparse_and_follows_style_edits() {
+        let (mut s, story) = setup("First\nSecond");
+        select(&mut s, &story, 0, 5);
+        s.execute("type.char", &json!({"underline": true})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Emphasis", "fromSelection": true})).unwrap();
+        s.execute("style.character.apply", &json!({"name": "Emphasis"})).unwrap();
+        s.execute("style.character.edit", &json!({"name": "Emphasis", "chars": {"underline": false}})).unwrap();
+        assert_eq!(attrs(&mut s)["chars"]["underline"], false);
+        assert!(s.doc().unwrap().doc.styles.char_style("Emphasis").unwrap().chars.size.is_none());
+        s.execute("style.paragraph.edit", &json!({"name": designcraft_doc::BASIC_PARAGRAPH, "chars": {"size": 20}})).unwrap();
+        assert_eq!(attrs(&mut s)["chars"]["size"], 20.0);
+    }
+
+    #[test]
+    fn paragraph_selection_excludes_the_next_paragraph_at_its_start() {
+        let (mut s, story) = setup("é\nNext");
+        select(&mut s, &story, 0, 3);
+        s.execute("style.paragraph.create", &json!({"name": "Header"})).unwrap();
+        s.execute("style.paragraph.apply", &json!({"name": "Header", "clearOverrides": true})).unwrap();
+        select(&mut s, &story, 3, 4);
+        assert_eq!(attrs(&mut s)["paragraphStyle"], designcraft_doc::BASIC_PARAGRAPH);
+        select(&mut s, &story, 0, 2);
+        assert_eq!(attrs(&mut s)["paragraphStyle"], "Header");
+    }
+
+    #[test]
+    fn clearing_a_partial_selection_preserves_character_overrides_outside_it() {
+        let (mut s, story) = setup("First Second");
+        select(&mut s, &story, 0, 12);
+        s.execute("type.char", &json!({"size": 18})).unwrap();
+        select(&mut s, &story, 0, 5);
+        s.execute("style.paragraph.apply", &json!({"name": designcraft_doc::BASIC_PARAGRAPH, "clearOverrides": true})).unwrap();
+        assert_ne!(attrs(&mut s)["chars"]["size"], 18.0);
+        select(&mut s, &story, 6, 12);
+        assert_eq!(attrs(&mut s)["chars"]["size"], 18.0);
+    }
+}
+
+/// The `group` (`chars`, `para`) object of command `cmd`'s params as attributes; a bad attribute
+/// is that command's parameter error, naming the group.
+fn attrs<T: Default>(cmd: &str, group: &str, p: &Value, set: impl Fn(&mut T, &str, &Value) -> std::result::Result<(), String>) -> Result<T> {
+    let mut a = T::default();
+    match p.get(group) {
+        None | Some(Value::Null) => {}
+        Some(Value::Object(o)) => {
+            for (k, v) in o {
+                set(&mut a, k, v).map_err(|e| bad(cmd, format!("{group}: {e}")))?;
+            }
+        }
+        Some(_) => return Err(bad(cmd, format!("{group} must be an object of attributes"))),
+    }
+    Ok(a)
+}
+
+pub(super) fn redefine(s: &mut Session, p: &Value, paragraph: bool) -> Result<Value> {
+    let command = if paragraph { "style.paragraph.redefine" } else { "style.character.redefine" };
+    let targets = crate::cmd::text::format_targets_pub(s);
+    let target = targets.first().ok_or_else(|| bad(command, "select text using the style to redefine"))?;
+    let state = s.doc()?;
+    let story = state.doc.text_story(target.story, target.cell).ok_or(designcraft_doc::DocError::NoStory(target.story))?;
+    let pf = story.paras.get(story.para_at(target.range.start)).ok_or_else(|| bad(command, "no paragraph at the selection"))?;
+    let cf = crate::cmd::text::effective_char_format(s, target)?;
+    let selected = if paragraph { &pf.style } else { &cf.style };
+    let name = str_param(p, "name").unwrap_or(selected).to_string();
+    if name != *selected || name == if paragraph { designcraft_doc::NO_PARA_STYLE } else { designcraft_doc::NO_CHAR_STYLE } {
+        return Err(bad(command, "select text using the named style; the no-style entry cannot be redefined"));
+    }
+    let (base_para, base_chars) = state.doc.styles.resolve_para_style(&pf.style);
+    let (resolved_para, paragraph_chars) = state.doc.styles.resolve_para(pf);
+    let para_changes = base_para.delta(&resolved_para);
+    let mut current = if paragraph {
+        paragraph_chars.clone()
+    } else {
+        state.doc.styles.resolve_char(&paragraph_chars, &designcraft_doc::CharFormat { style: name.clone(), over: CharAttrs::default() })
+    };
+    let inherited = if paragraph { base_chars } else { current.clone() };
+    // A named character style is an intentional layer, not a paragraph override to absorb.
+    current.apply(&cf.over);
+    let char_changes = inherited.delta(&current);
+    let result = s.edit(|d, _| {
+        if paragraph {
+            let style = d.styles_mut().para_mut(&name).ok_or_else(|| bad(command, "paragraph style no longer exists"))?;
+            style.para.merge(&para_changes);
+            style.chars.merge(&char_changes);
+        } else {
+            let style =
+                d.styles_mut().character.iter_mut().find(|st| st.name == name).ok_or_else(|| bad(command, "character style no longer exists"))?;
+            style.chars.merge(&char_changes);
+        }
+        let styles = d.styles.clone();
+        for target in &targets {
+            let Some(story) = d.text_story_mut(target.story, target.cell) else { continue };
+            // At a character-style caret, the sampled format belongs to the containing run
+            // (the preceding run at a boundary). Normalize that source run too, otherwise its
+            // old local values would mask the next edit of the redefined style.
+            let mut selected_range = target.range.clone();
+            if !paragraph && selected_range.is_empty() {
+                let caret = selected_range.start;
+                let mut start = 0usize;
+                for run in &story.chars {
+                    let end = start.saturating_add(run.len).min(story.len());
+                    if caret < end || (caret == end && caret > start) {
+                        selected_range = start..end;
+                        break;
+                    }
+                    start = end;
+                }
+            }
+            let end = if selected_range.is_empty() { selected_range.start } else { selected_range.end.saturating_sub(1) };
+            let (first, last) = (story.para_at(selected_range.start), story.para_at(end));
+            for (index, range) in story.para_ranges().into_iter().enumerate().take(last.saturating_add(1)).skip(first) {
+                let Some(pf) = story.paras.get_mut(index) else { continue };
+                if paragraph && pf.style != name {
+                    continue;
+                }
+                if paragraph {
+                    let (pp, cp) = styles.resolve_para(pf);
+                    let (base_p, base_c) = styles.resolve_para_style(&name);
+                    pf.para = base_p.delta(&pp);
+                    pf.chars = base_c.delta(&cp);
+                }
+                let (_, base) = styles.resolve_para(pf);
+                let end = range.end.saturating_add(1).min(story.len());
+                let range = if paragraph { range.start..end } else { range.start.max(selected_range.start)..end.min(selected_range.end) };
+                story.format_chars(range, |format| {
+                    if !paragraph && format.style != name {
+                        return;
+                    }
+                    let mut inherited = base.clone();
+                    inherited.apply(&styles.char_style_attrs(&format.style));
+                    let resolved = styles.resolve_char(&base, format);
+                    format.over = inherited.delta(&resolved);
+                });
+            }
+        }
+        Ok(json!({"name":name}))
+    });
+    if result.is_ok() {
+        s.typing_format = None;
+    }
+    result
+}
+
+/// Apply paragraph style `name` over `r` in one story; `clear` drops overrides instead of keeping
+/// only those that differ from the style (`resolved` is the style's paragraph and character attributes).
+fn apply_para_in_story(
+    st: &mut designcraft_doc::Story,
+    r: &std::ops::Range<usize>,
+    name: &str,
+    clear: bool,
+    resolved: (&designcraft_doc::ParaProps, &designcraft_doc::CharProps),
+    styles: &designcraft_doc::Styles,
+) {
+    let (style_para, style_chars) = resolved;
+    // Text selections are half-open: a selection ending at the next paragraph's
+    // start must not apply a style to that paragraph too.
+    let end = if r.is_empty() { r.start } else { r.end.saturating_sub(1) };
+    let (first, last) = (st.para_at(r.start), st.para_at(end));
+    st.format_paras(r.start..end, |f| {
+        f.style = name.to_string();
+        if clear {
+            f.para = ParaAttrs::default();
+            f.chars = CharAttrs::default();
+        } else {
+            f.para.retain_differences(style_para);
+            f.chars.retain_differences(style_chars);
+        }
+    });
+    for (pi, range) in st.para_ranges().into_iter().enumerate().take(last.saturating_add(1)).skip(first) {
+        let Some(pf) = st.paras.get(pi) else { continue };
+        let (_, base) = styles.resolve_para(pf);
+        let end = range.end.saturating_add(1).min(st.len());
+        let range = if clear && !r.is_empty() { range.start.max(r.start)..end.min(r.end) } else { range.start..end };
+        st.format_chars(range, |f| {
+            if clear {
+                f.over = CharAttrs::default();
+            } else {
+                let mut inherited = base.clone();
+                inherited.apply(&styles.char_style_attrs(&f.style));
+                f.over.retain_differences(&inherited);
+            }
+        });
+    }
+}
+
+pub(super) fn apply_para(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = str_param(p, "name").ok_or_else(|| bad("style.paragraph.apply", "missing name"))?.to_string();
+    let clear = p.get("clearOverrides").and_then(Value::as_bool).unwrap_or(false);
+    if s.doc()?.doc.styles.para(&name).is_none() {
+        return Err(bad("style.paragraph.apply", format!("no paragraph style `{name}`")));
+    }
+    let targets = crate::cmd::text::format_targets_pub(s);
+    s.edit(|d, _| {
+        let styles = d.styles.clone();
+        let (style_para, style_chars) = styles.resolve_para_style(&name);
+        for t in &targets {
+            if let Some(st) = d.text_story_mut(t.story, t.cell) {
+                apply_para_in_story(st, &t.range, &name, clear, (&style_para, &style_chars), &styles);
+            }
+        }
+        ok()
+    })
+}
+
+pub(super) fn apply_char(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = str_param(p, "name").ok_or_else(|| bad("style.character.apply", "missing name"))?.to_string();
+    if s.doc()?.doc.styles.char_style(&name).is_none() {
+        return Err(bad("style.character.apply", format!("no character style `{name}`")));
+    }
+    let targets = crate::cmd::text::format_targets_pub(s);
+    s.edit(|d, _| {
+        let styles = d.styles.clone();
+        for t in &targets {
+            if let Some(st) = d.text_story_mut(t.story, t.cell) {
+                for (pi, range) in st.para_ranges().into_iter().enumerate() {
+                    let range = range.start.max(t.range.start)..range.end.saturating_add(1).min(st.len()).min(t.range.end);
+                    if range.is_empty() {
+                        continue;
+                    }
+                    let Some(pf) = st.paras.get(pi) else { continue };
+                    let (_, mut inherited) = styles.resolve_para(pf);
+                    inherited.apply(&styles.char_style_attrs(&name));
+                    st.format_chars(range, |f| {
+                        f.style = name.clone();
+                        f.over.retain_differences(&inherited);
+                    });
+                }
+            }
+        }
+        ok()
+    })
+}
+
+/// In a style, `startAt: null` is Continue from Previous Number: it is stored as an explicit
+/// "continue" so it also overrides a Start At the style would inherit.
+fn continue_numbering(p: Option<&Value>, para: &mut ParaAttrs) {
+    let explicit =
+        p.and_then(Value::as_object).is_some_and(|o| o.iter().any(|(k, v)| v.is_null() && k.replace('_', "").eq_ignore_ascii_case("startAt")));
+    if explicit {
+        para.start_at = Some(None);
+    }
+}
+
+pub(super) fn create_para(s: &mut Session, p: &Value) -> Result<Value> {
+    let base = str_param(p, "name").unwrap_or("Paragraph Style 1").to_string();
+    let mut para: ParaAttrs =
+        attrs("style.paragraph.create", "para", p, |a: &mut ParaAttrs, k, v| a.set_json_over(k, v, &designcraft_doc::ParaProps::default()))?;
+    continue_numbering(p.get("para"), &mut para);
+    explicit_default_kinsoku(&mut para, p.get("para"));
+    check_grep_styles("style.paragraph.create", &para)?;
+    let mut chars: CharAttrs = attrs("style.paragraph.create", "chars", p, |a: &mut CharAttrs, k, v| a.set_json(k, v))?;
+    // Validate caller-supplied fills, not selection fills retained after a swatch is deleted.
+    crate::cmd::text::validate_char_fill(&s.doc()?.doc, &chars, "style.paragraph.create")?;
+    if p.get("fromSelection").and_then(Value::as_bool).unwrap_or(false)
+        && let Ok(cur) = s.execute("type.selectionAttrs", &json!({}))
+        && !cur.is_null()
+    {
+        if let Ok(pp) = serde_json::from_value::<designcraft_doc::ParaProps>(cur["para"].clone()) {
+            let mut full = ParaProps_to_attrs(&pp);
+            full.merge(&para);
+            para = full;
+        }
+        if let Ok(cp) = serde_json::from_value::<designcraft_doc::CharProps>(cur["chars"].clone()) {
+            let mut full = CharProps_to_attrs(&cp);
+            full.merge(&chars);
+            chars = full;
+        }
+    }
+    let based_on = str_param(p, "basedOn").map(str::to_string);
+    let next = str_param(p, "nextStyle").map(str::to_string);
+    s.edit(|d, _| {
+        let name = Styles::unique_name(|n| d.styles.para(n).is_some(), &base);
+        if let Some(b) = &based_on
+            && d.styles.para(b).is_none()
+        {
+            return Err(bad("style.paragraph.create", format!("no style `{b}`")));
+        }
+        d.styles_mut().paragraph.push(ParagraphStyle { name: name.clone(), based_on, next_style: next, para, chars, shortcut: String::new() });
+        Ok(json!({"name": name}))
+    })
+}
+
+/// `kinsoku: null` sets the composer's default kinsoku rules, also over a Based On style's set.
+/// For the other attributes `null` leaves the style's value as it is.
+fn explicit_default_kinsoku(para: &mut ParaAttrs, given: Option<&Value>) {
+    if given.and_then(|o| o.get("kinsoku")).is_some_and(Value::is_null) {
+        para.kinsoku = Some(None);
+    }
+}
+
+/// The compile error of the first GREP style in `a` whose pattern can't compile.
+pub(crate) fn grep_style_error(a: &ParaAttrs) -> Option<String> {
+    a.grep_styles
+        .iter()
+        .flatten()
+        .filter(|g| !g.pattern.is_empty())
+        .find_map(|g| designcraft_compose::grep::Grep::new(&g.pattern, Default::default()).err().map(|e| format!("{e} (pattern {:?})", g.pattern)))
+}
+
+/// Rejects GREP styles a command would set with a pattern that can't compile.
+pub(crate) fn check_grep_styles(cmd: &str, a: &ParaAttrs) -> Result<()> {
+    grep_style_error(a).map_or(Ok(()), |e| Err(bad(cmd, e)))
+}
+
+/// One warning for each paragraph style or paragraph whose GREP style pattern can't compile.
+/// Such a GREP style stays in the document and composition skips it.
+pub(crate) fn grep_style_warnings(d: &designcraft_doc::Document) -> Vec<String> {
+    let mut out: Vec<String> = d
+        .styles
+        .paragraph
+        .iter()
+        .filter_map(|st| grep_style_error(&st.para).map(|e| format!("paragraph style {:?}: GREP style not applied: {e}", st.name)))
+        .collect();
+    for st in d.stories.values() {
+        for (i, pf) in st.paras.iter().enumerate() {
+            if let Some(e) = grep_style_error(&pf.para) {
+                out.push(format!("story {} paragraph {}: GREP style not applied: {e}", st.id.0, i + 1));
+            }
+        }
+    }
+    out
+}
+
+#[allow(non_snake_case)]
+fn ParaProps_to_attrs(p: &designcraft_doc::ParaProps) -> ParaAttrs {
+    designcraft_doc::ParaProps::common([p])
+}
+
+#[allow(non_snake_case)]
+fn CharProps_to_attrs(p: &designcraft_doc::CharProps) -> CharAttrs {
+    designcraft_doc::CharProps::common([p])
+}
+
+pub(super) fn edit_para(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = str_param(p, "name").ok_or_else(|| bad("style.paragraph.edit", "missing name"))?.to_string();
+    let chars: CharAttrs = attrs("style.paragraph.edit", "chars", p, |a: &mut CharAttrs, k, v| a.set_json(k, v))?;
+    crate::cmd::text::validate_char_fill(&s.doc()?.doc, &chars, "style.paragraph.edit")?;
+    let rename = str_param(p, "rename").map(str::trim).filter(|n| *n != name).map(str::to_string);
+    let based = p.get("basedOn").cloned();
+    s.edit(|d, _| {
+        if let Some(Value::String(b)) = &based
+            && d.styles.para_based_on_cycles(&name, b)
+        {
+            return Err(bad("style.paragraph.edit", "based-on would create a cycle"));
+        }
+        if let Some(n) = &rename {
+            if n.is_empty() || n.starts_with('[') {
+                return Err(bad("style.paragraph.edit", format!("can't rename to `{n}`")));
+            }
+            if d.styles.para(n).is_some() {
+                return Err(bad("style.paragraph.edit", format!("a paragraph style named `{n}` already exists")));
+            }
+        }
+        // A rule object changes only the rule fields it names, over the style's resolved rule.
+        let (current, _) = d.styles.resolve_para_style(&name);
+        let mut para: ParaAttrs = attrs("style.paragraph.edit", "para", p, |a: &mut ParaAttrs, k, v| a.set_json_over(k, v, &current))?;
+        continue_numbering(p.get("para"), &mut para);
+        explicit_default_kinsoku(&mut para, p.get("para"));
+        check_grep_styles("style.paragraph.edit", &para)?;
+        let st = d.styles_mut().para_mut(&name).ok_or_else(|| bad("style.paragraph.edit", format!("no style `{name}`")))?;
+        st.para.merge(&para);
+        st.chars.merge(&chars);
+        match based {
+            Some(Value::String(b)) => st.based_on = Some(b),
+            Some(Value::Null) => st.based_on = None,
+            _ => {}
+        }
+        if let Some(n) = rename.clone() {
+            // Every use: other styles, stories, table cells, footnotes, object styles.
+            rename_style(d, true, &name, &n);
+        }
+        ok()
+    })
+}
+
+/// Rename a paragraph or character style everywhere it's used; its Export Tagging follows.
+fn rename_style(d: &mut designcraft_doc::Document, para: bool, from: &str, to: &str) {
+    let st = d.styles_mut();
+    if para {
+        for s in &mut st.paragraph {
+            if s.name == from {
+                s.name = to.to_string();
+            }
+        }
+    } else {
+        for s in &mut st.character {
+            if s.name == from {
+                s.name = to.to_string();
+            }
+        }
+    }
+    // An entry already under `to` belongs to no style (names are unique), so it never survives.
+    st.export_tags.remove(&export_tag_key(para, to));
+    if let Some(tag) = st.export_tags.remove(&export_tag_key(para, from)) {
+        st.export_tags.insert(export_tag_key(para, to), tag);
+    }
+    redirect_style_refs(d, para, from, to);
+}
+
+/// The `Styles::export_tags` key of a paragraph (`para`) or character style.
+pub(super) fn export_tag_key(para: bool, name: &str) -> String {
+    format!("{}:{name}", if para { "p" } else { "c" })
+}
+
+/// Point every reference to style `from` at `to`, except the style's own registry entry (its
+/// `name` field) — shared by renaming (which also updates the entry's name) and deletion (which
+/// instead removes the entry, after its former uses point at the replacement).
+fn redirect_style_refs(d: &mut designcraft_doc::Document, para: bool, from: &str, to: &str) {
+    let rename = |r: &mut String| {
+        if r == from {
+            *r = to.to_string();
+        }
+    };
+    let st = d.styles_mut();
+    // A style is never based on itself: when `to` was based on `from`, it takes `from`'s parent.
+    let parent_of = |based_on: Option<&String>| based_on.filter(|b| b.as_str() != to).cloned();
+    if para {
+        let from_parent = parent_of(st.paragraph.iter().find(|x| x.name == from).and_then(|x| x.based_on.as_ref()));
+        for s in &mut st.paragraph {
+            if s.based_on.as_deref() == Some(from) {
+                s.based_on = if s.name == to { from_parent.clone() } else { Some(to.to_string()) };
+            }
+            if s.next_style.as_deref() == Some(from) {
+                s.next_style = Some(to.to_string());
+            }
+        }
+        let objects = st.object.iter_mut().map(|o| &mut o.paragraph_style);
+        for r in objects.chain(st.cell.iter_mut().map(|c| &mut c.paragraph_style)) {
+            if r.as_deref() == Some(from) {
+                *r = Some(to.to_string());
+            }
+        }
+        rename(&mut st.default_paragraph);
+        let (fo, eo) = (&mut d.footnote_options, &mut d.endnote_options);
+        [&mut fo.para_style, &mut eo.para_style, &mut eo.heading_style].into_iter().for_each(rename);
+        d.toc.iter_mut().flat_map(|t| t.entries.iter_mut().map(|e| &mut e.style)).for_each(rename);
+        for t in d.toc.iter_mut() {
+            let formats = t.entries.iter_mut().map(|e| &mut e.entry_style).chain([&mut t.title_style]);
+            for r in formats.filter(|r| r.as_deref() == Some(from)) {
+                *r = Some(to.to_string());
+            }
+        }
+        if let designcraft_doc::EpubSplit::Style(n) = &mut d.settings.epub_split {
+            rename(n);
+        }
+    } else {
+        let from_parent = parent_of(st.character.iter().find(|x| x.name == from).and_then(|x| x.based_on.as_ref()));
+        for s in &mut st.character {
+            if s.based_on.as_deref() == Some(from) {
+                s.based_on = if s.name == to { from_parent.clone() } else { Some(to.to_string()) };
+            }
+        }
+        for s in &mut st.paragraph {
+            rename_char_refs(&mut s.para, from, to);
+        }
+        rename(&mut st.default_character);
+        rename(&mut d.footnote_options.ref_char_style);
+    }
+    // The table of contents' character styles ([None] is stored as no style).
+    if !para && let Some(toc) = d.toc.as_mut() {
+        for e in &mut toc.entries {
+            for n in [&mut e.page_number_style, &mut e.separator_style] {
+                if n.as_deref() == Some(from) {
+                    *n = Some(to.to_string()).filter(|t| t != designcraft_doc::NO_CHAR_STYLE);
+                }
+            }
+        }
+    }
+    for sid in d.stories.keys().copied().collect::<Vec<_>>() {
+        let Some(story) = d.story_mut(sid) else { continue };
+        story.for_each_text_mut(&mut |st| {
+            if para {
+                for f in st.paras.iter_mut().filter(|f| f.style == from) {
+                    f.style = to.to_string();
+                }
+            } else {
+                for r in st.chars.iter_mut().filter(|r| r.format.style == from) {
+                    r.format.style = to.to_string();
+                }
+                for f in &mut st.paras {
+                    rename_char_refs(&mut f.para, from, to);
+                }
+            }
+            st.rev = st.rev.wrapping_add(1);
+        });
+    }
+}
+
+/// Point the nested, nested line and GREP styles, and the drop cap style, of paragraph
+/// attributes at a renamed (or deleted, pointed at its replacement) character style.
+fn rename_char_refs(p: &mut ParaAttrs, from: &str, to: &str) {
+    let names = p.nested_styles.iter_mut().flatten().map(|n| &mut n.style);
+    let names = names.chain(p.nested_line_styles.iter_mut().flatten().map(|n| &mut n.style));
+    let names = names.chain(p.drop_cap_style.iter_mut());
+    for n in names.chain(p.grep_styles.iter_mut().flatten().map(|g| &mut g.style)) {
+        if n == from {
+            *n = to.to_string();
+        }
+    }
+}
+
+pub(super) fn group_styles(s: &mut Session, p: &Value) -> Result<Value> {
+    let para = match str_param(p, "kind").unwrap_or("paragraph") {
+        "paragraph" => true,
+        "character" => false,
+        k => return Err(bad("style.group", format!("unknown kind `{k}`"))),
+    };
+    let names: Vec<String> =
+        p.get("names").and_then(Value::as_array).map(|a| a.iter().filter_map(|v| v.as_str().map(str::to_string)).collect()).unwrap_or_default();
+    let group = str_param(p, "group").unwrap_or("").trim_matches('/').to_string();
+    s.edit(|d, _| {
+        let mut renamed = serde_json::Map::new();
+        for n in &names {
+            if n.starts_with('[') {
+                return Err(bad("style.group", format!("`{n}` is built in")));
+            }
+            let exists = if para { d.styles.para(n).is_some() } else { d.styles.character.iter().any(|c| c.name == *n) };
+            if !exists {
+                return Err(bad("style.group", format!("no style `{n}`")));
+            }
+            let base = n.rsplit('/').next().unwrap_or(n);
+            let mut to = if group.is_empty() { base.to_string() } else { format!("{group}/{base}") };
+            let taken = |d: &designcraft_doc::Document, x: &str| {
+                if para { d.styles.para(x).is_some() } else { d.styles.character.iter().any(|c| c.name == x) }
+            };
+            if to != *n {
+                to = Styles::unique_name(|x| taken(d, x), &to);
+                rename_style(d, para, n, &to);
+                renamed.insert(n.clone(), json!(to));
+            }
+        }
+        Ok(json!({"renamed": renamed}))
+    })
+}
+
+pub(super) fn delete_para(s: &mut Session, p: &Value) -> Result<Value> {
+    delete_style(s, p, true)
+}
+
+pub(super) fn delete_char(s: &mut Session, p: &Value) -> Result<Value> {
+    delete_style(s, p, false)
+}
+
+/// Delete a paragraph (`para`) or character style; everything that used it uses `replaceWith`
+/// (default [Basic Paragraph] or [None]) instead, in one undo step.
+fn delete_style(s: &mut Session, p: &Value, para: bool) -> Result<Value> {
+    let (id, default) =
+        if para { ("style.paragraph.delete", designcraft_doc::BASIC_PARAGRAPH) } else { ("style.character.delete", designcraft_doc::NO_CHAR_STYLE) };
+    let name = str_param(p, "name").filter(|n| !n.is_empty()).ok_or_else(|| bad(id, "missing name"))?.to_string();
+    let repl = str_param(p, "replaceWith").unwrap_or(default).to_string();
+    if name.starts_with('[') {
+        return Err(bad(id, "built-in styles can't be deleted"));
+    }
+    if repl == name {
+        return Err(bad(id, "`replaceWith` can't be the deleted style"));
+    }
+    s.edit(|d, _| {
+        let st = &d.styles;
+        let exists = |n: &str| if para { st.para(n).is_some() } else { n == designcraft_doc::NO_CHAR_STYLE || st.char_style(n).is_some() };
+        if !exists(&name) {
+            return Err(bad(id, format!("no style `{name}`")));
+        }
+        if !exists(&repl) {
+            return Err(bad(id, format!("no style `{repl}` to replace it with")));
+        }
+        // The deleted style's children are based on the replacement, or on the deleted style's
+        // own parent when the replacement descends from it (so no based-on chain loops).
+        let (own_parent, descends) = if para {
+            (st.para(&name).and_then(|x| x.based_on.clone()), st.para_based_on_cycles(&name, &repl))
+        } else {
+            (st.char_style(&name).and_then(|x| x.based_on.clone()), st.char_based_on_cycles(&name, &repl))
+        };
+        let parent = if descends {
+            own_parent.filter(|b| *b != name)
+        } else if repl == designcraft_doc::NO_CHAR_STYLE || repl == designcraft_doc::NO_PARA_STYLE {
+            None
+        } else {
+            Some(repl.clone())
+        };
+        let st = d.styles_mut();
+        let based = if para {
+            st.paragraph.retain(|x| x.name != name);
+            st.paragraph.iter_mut().map(|x| &mut x.based_on).collect::<Vec<_>>()
+        } else {
+            st.character.retain(|x| x.name != name);
+            st.character.iter_mut().map(|x| &mut x.based_on).collect()
+        };
+        for b in based.into_iter().filter(|b| b.as_deref() == Some(name.as_str())) {
+            *b = parent.clone();
+        }
+        // The replacement keeps its own Export Tagging.
+        st.export_tags.remove(&export_tag_key(para, &name));
+        // Every other use: styles, stories, table cells, nested and GREP styles, notes, defaults.
+        redirect_style_refs(d, para, &name, &repl);
+        ok()
+    })
+}
+
+pub(super) fn create_char(s: &mut Session, p: &Value) -> Result<Value> {
+    let base = str_param(p, "name").unwrap_or("Character Style 1").to_string();
+    let mut chars: CharAttrs = attrs("style.character.create", "chars", p, |a: &mut CharAttrs, k, v| a.set_json(k, v))?;
+    // Validate caller-supplied fills; captured formatting may retain a deleted swatch name.
+    crate::cmd::text::validate_char_fill(&s.doc()?.doc, &chars, "style.character.create")?;
+    if p.get("fromSelection").and_then(Value::as_bool).unwrap_or(false)
+        && let Some(target) = crate::cmd::text::format_targets_pub(s).first()
+    {
+        let st = s.doc()?;
+        // Match paragraph fromSelection's first-character/caret policy, but keep paragraph
+        // attributes inherited instead of freezing the fully resolved character properties.
+        let format = crate::cmd::text::effective_char_format(s, target)?;
+        let mut captured = st.doc.styles.char_style_attrs(&format.style);
+        captured.merge(&format.over);
+        // Replay the explicit fields so null clears a captured value rather than looking absent.
+        if let Some(overrides) = p.get("chars").and_then(Value::as_object) {
+            for (key, value) in overrides {
+                captured.set_json(key, value).map_err(|e| bad("style.character.create", format!("chars: {e}")))?;
+            }
+        }
+        chars = captured;
+    }
+    // Based on [None] is based on nothing.
+    let based_on = str_param(p, "basedOn").filter(|b| *b != designcraft_doc::NO_CHAR_STYLE).map(str::to_string);
+    s.edit(|d, _| {
+        if let Some(b) = &based_on
+            && d.styles.char_style(b).is_none()
+        {
+            return Err(bad("style.character.create", format!("no character style `{b}`")));
+        }
+        let name = Styles::unique_name(|n| d.styles.char_style(n).is_some(), &base);
+        d.styles_mut().character.push(CharacterStyle { name: name.clone(), based_on, chars, shortcut: String::new() });
+        Ok(json!({"name": name}))
+    })
+}
+
+pub(super) fn edit_char(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = str_param(p, "name").ok_or_else(|| bad("style.character.edit", "missing name"))?.to_string();
+    if name == designcraft_doc::NO_CHAR_STYLE {
+        return Err(bad("style.character.edit", "[None] can't be edited"));
+    }
+    let chars: CharAttrs = attrs("style.character.edit", "chars", p, |a: &mut CharAttrs, k, v| a.set_json(k, v))?;
+    crate::cmd::text::validate_char_fill(&s.doc()?.doc, &chars, "style.character.edit")?;
+    // `null` unsets an attribute (the style no longer sets it).
+    let unset: Vec<String> = p
+        .get("chars")
+        .and_then(Value::as_object)
+        .map(|o| o.iter().filter(|(_, v)| v.is_null()).map(|(k, _)| k.clone()).collect())
+        .unwrap_or_default();
+    let rename = str_param(p, "rename").map(str::trim).filter(|n| *n != name).map(str::to_string);
+    let based: Option<Option<String>> = match p.get("basedOn") {
+        None => None,
+        Some(Value::Null) => Some(None),
+        Some(Value::String(b)) if b == designcraft_doc::NO_CHAR_STYLE => Some(None),
+        Some(Value::String(b)) => Some(Some(b.clone())),
+        Some(_) => return Err(bad("style.character.edit", "`basedOn` is a style name or null")),
+    };
+    s.edit(|d, _| {
+        if let Some(Some(b)) = &based {
+            if d.styles.char_style(b).is_none() {
+                return Err(bad("style.character.edit", format!("no character style `{b}`")));
+            }
+            if d.styles.char_based_on_cycles(&name, b) {
+                return Err(bad("style.character.edit", "based-on would create a cycle"));
+            }
+        }
+        if let Some(n) = &rename {
+            if n.is_empty() || n.starts_with('[') {
+                return Err(bad("style.character.edit", format!("can't rename to `{n}`")));
+            }
+            if d.styles.char_style(n).is_some() {
+                return Err(bad("style.character.edit", format!("a character style named `{n}` already exists")));
+            }
+        }
+        let st = d.styles_mut().char_style_mut(&name).ok_or_else(|| bad("style.character.edit", format!("no character style `{name}`")))?;
+        st.chars.merge(&chars);
+        for k in &unset {
+            st.chars.set_json(k, &Value::Null).map_err(|e| bad("style.character.edit", e))?;
+        }
+        if let Some(b) = based.clone() {
+            st.based_on = b;
+        }
+        if let Some(n) = &rename {
+            // Every use: other styles, stories, table cells, nested and GREP styles, footnotes.
+            rename_style(d, false, &name, n);
+        }
+        ok()
+    })
+}
+
+/// #777: the params descriptions name the attributes, and a wrong one is the command's error.
+#[cfg(test)]
+mod attribute_error_tests {
+    use super::*;
+    use crate::cmd::find_command;
+
+    #[test]
+    fn a_wrong_attribute_names_the_command_and_the_right_attribute() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let err = |s: &mut Session, id: &str, p: Value| s.execute(id, &p).unwrap_err().to_string();
+        assert_eq!(
+            err(&mut s, "style.paragraph.create", json!({"name": "H", "chars": {"font": "Source Sans 3"}})),
+            "invalid parameters for `style.paragraph.create`: chars: unknown attribute `font`; did you mean `fontFamily`?"
+        );
+        assert_eq!(
+            err(&mut s, "style.paragraph.create", json!({"name": "H", "para": {"spaceBefor": 6}})),
+            "invalid parameters for `style.paragraph.create`: para: unknown attribute `spaceBefor`; did you mean `spaceBefore`?"
+        );
+        assert!(
+            err(&mut s, "style.character.create", json!({"name": "C", "chars": {"font": "X"}}))
+                .starts_with("invalid parameters for `style.character.create`: chars:")
+        );
+        assert!(err(&mut s, "style.paragraph.create", json!({"name": "H", "chars": "bold"})).contains("chars must be an object of attributes"));
+        s.execute("style.paragraph.create", &json!({"name": "H", "chars": {"fontFamily": "Source Sans 3", "size": 14}})).unwrap();
+        assert!(
+            err(&mut s, "style.paragraph.edit", json!({"name": "H", "chars": {"font": "X"}}))
+                .starts_with("invalid parameters for `style.paragraph.edit`: chars:")
+        );
+        s.execute("style.character.create", &json!({"name": "C", "chars": {"fontStyle": "Bold"}})).unwrap();
+        assert!(
+            err(&mut s, "style.character.edit", json!({"name": "C", "chars": {"font": "X"}}))
+                .starts_with("invalid parameters for `style.character.edit`: chars:")
+        );
+        for id in ["style.paragraph.create", "style.paragraph.edit", "style.character.create", "style.character.edit"] {
+            let doc = find_command(id).unwrap().params;
+            assert!(doc.contains("as type.char names them: fontFamily"), "{id}: {doc}");
+        }
+        assert!(find_command("style.paragraph.create").unwrap().params.contains("as type.para names them: align"));
+    }
+}
+
+#[cfg(test)]
+mod export_tag_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn export_tagging_shapes_epub_markup() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Chapter Title", "chars": {"size": 24}})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Key Term", "chars": {"fontStyle": "Bold"}})).unwrap();
+        s.execute("style.exportTag", &json!({"style": "Chapter Title", "tag": "h1", "class": "chapter"})).unwrap();
+        s.execute("style.exportTag", &json!({"style": "Key Term", "character": true, "tag": "strong"})).unwrap();
+        assert!(s.execute("style.exportTag", &json!({"style": "Nope"})).is_err());
+        // Split Document is for paragraph styles; it alone keeps the tagging.
+        assert!(s.execute("style.exportTag", &json!({"style": "Key Term", "character": true, "split": true})).is_err());
+        s.execute("style.paragraph.create", &json!({"name": "Part"})).unwrap();
+        assert_eq!(s.execute("style.exportTag", &json!({"style": "Part", "split": true})).unwrap()["split"], true);
+        assert!(s.doc().unwrap().doc.styles.export_tag("Part", false).is_some_and(|t| t.split));
+        s.execute("style.exportTag", &json!({"style": "Part", "split": false})).unwrap();
+        assert!(s.doc().unwrap().doc.styles.export_tag("Part", false).is_none(), "an untouched tagging goes");
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Origins\nA word"})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
+        s.execute("style.paragraph.apply", &json!({"name": "Chapter Title"})).unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 10, "focus": 14})).unwrap();
+        s.execute("style.character.apply", &json!({"name": "Key Term"})).unwrap();
+        let html = s.execute("file.exportHtml", &json!({})).unwrap()["text"].as_str().unwrap().to_string();
+        assert!(html.contains("<h1 class=\"chapter\">Origins</h1>"), "{html}");
+        assert!(html.contains("<strong class=\"key-term\">word</strong>"), "{html}");
+        // Tagged PDF: a heading element and a paragraph element.
+        let r = s.execute("file.exportPdf", &json!({"tagged": true, "compressImages": false})).unwrap();
+        let pdf = crate::cmd::file::base64_decode(r["base64"].as_str().unwrap());
+        let text = String::from_utf8_lossy(&pdf);
+        assert!(text.contains("/S/H1") && text.contains("/S/P"), "structure elements");
+        assert!(designcraft_render::pdf_page_count(&pdf) == Some(1));
+    }
+
+    #[test]
+    fn export_tagging_follows_a_renamed_style_and_goes_with_a_deleted_one() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Head"})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Body"})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Term"})).unwrap();
+        s.execute("style.exportTag", &json!({"style": "Head", "tag": "h2", "class": "head"})).unwrap();
+        s.execute("style.exportTag", &json!({"style": "Body", "tag": "p", "class": "body"})).unwrap();
+        s.execute("style.exportTag", &json!({"style": "Term", "character": true, "tag": "em", "class": "term"})).unwrap();
+        let tag = |s: &Session, name: &str, character: bool| {
+            s.doc().unwrap().doc.styles.export_tag(name, character).map(|t| (t.tag.clone(), t.class.clone()))
+        };
+        let pair = |t: &str, c: &str| Some((t.to_string(), c.to_string()));
+        // A rename onto another style's name is refused, so neither tagging is lost.
+        assert!(s.execute("style.paragraph.edit", &json!({"name": "Head", "rename": "Body"})).is_err());
+        assert_eq!((tag(&s, "Head", false), tag(&s, "Body", false)), (pair("h2", "head"), pair("p", "body")));
+
+        s.execute("style.paragraph.edit", &json!({"name": "Head", "rename": "Title"})).unwrap();
+        s.execute("style.character.edit", &json!({"name": "Term", "rename": "Word"})).unwrap();
+        assert_eq!(tag(&s, "Title", false), pair("h2", "head"));
+        assert_eq!(tag(&s, "Head", false), None);
+        assert_eq!(tag(&s, "Word", true), pair("em", "term"));
+        assert_eq!(tag(&s, "Term", true), None);
+        // Moving a style into a group renames it to Group/Name.
+        s.execute("style.group", &json!({"kind": "paragraph", "names": ["Title"], "group": "Heads"})).unwrap();
+        assert_eq!(tag(&s, "Heads/Title", false), pair("h2", "head"));
+        assert_eq!(tag(&s, "Title", false), None);
+
+        for _ in 0..3 {
+            s.execute("edit.undo", &json!({})).unwrap();
+        }
+        assert_eq!(tag(&s, "Head", false), pair("h2", "head"));
+        assert_eq!(tag(&s, "Title", false), None);
+        assert_eq!(tag(&s, "Term", true), pair("em", "term"));
+        assert_eq!(tag(&s, "Word", true), None);
+
+        // Deleting drops the deleted style's tagging; the replacement keeps its own.
+        s.execute("style.paragraph.delete", &json!({"name": "Head", "replaceWith": "Body"})).unwrap();
+        assert_eq!(tag(&s, "Head", false), None);
+        assert_eq!(tag(&s, "Body", false), pair("p", "body"));
+        s.execute("style.character.delete", &json!({"name": "Term"})).unwrap();
+        assert_eq!(tag(&s, "Term", true), None);
+        assert!(s.doc().unwrap().doc.styles.export_tags.keys().all(|k| k == "p:Body"));
+    }
+
+    #[test]
+    fn a_rename_onto_a_taken_name_says_so_and_a_trimmed_rename_drops_a_stale_tag() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        for (kind, a, b) in [("paragraph", "Head", "Body"), ("character", "Term", "Word")] {
+            s.execute(&format!("style.{kind}.create"), &json!({"name": a})).unwrap();
+            s.execute(&format!("style.{kind}.create"), &json!({"name": b})).unwrap();
+            let e = s.execute(&format!("style.{kind}.edit"), &json!({"name": a, "rename": b})).unwrap_err().to_string();
+            assert!(e.contains(&format!("a {kind} style named `{b}` already exists")), "{e}");
+            let e = s.execute(&format!("style.{kind}.edit"), &json!({"name": a, "rename": "[None]"})).unwrap_err().to_string();
+            assert!(e.contains("can't rename to `[None]`"), "{e}");
+        }
+        // An entry left under a name no style has doesn't attach to a style renamed onto it.
+        s.edit(|d, _| {
+            d.styles_mut()
+                .export_tags
+                .insert("p:Title".into(), designcraft_doc::ExportTag { tag: "h6".into(), class: "stale".into(), ..Default::default() });
+            Ok(())
+        })
+        .unwrap();
+        s.execute("style.paragraph.edit", &json!({"name": "Head", "rename": "  Title "})).unwrap();
+        let st = &s.doc().unwrap().doc.styles;
+        assert!(st.para("Title").is_some(), "the new name is trimmed");
+        assert_eq!(st.export_tag("Title", false), None);
+    }
+}
+
+#[cfg(test)]
+mod cjk_tests {
+    use super::*;
+    #[test]
+    fn cjk_composite_font_command_invalidates_layout_and_undo_restores_it() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 150], "content": "text", "text": "AB"})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let definition = |scale| json!({"name": "Mixed", "entries": [{"family": "Source Serif 4", "relativeSize": scale}]});
+        s.execute("style.compositeFont.set", &definition(1.0)).unwrap();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 2})).unwrap();
+        s.execute("type.char", &json!({"fontFamily": "Mixed", "leadingAki": 0.25, "jidori": 4})).unwrap();
+        let old = s.cache.get(&s.doc().unwrap().doc, sid, None);
+        s.execute("style.compositeFont.set", &definition(2.0)).unwrap();
+        let new = s.cache.get(&s.doc().unwrap().doc, sid, None);
+        assert!(!std::sync::Arc::ptr_eq(&old, &new));
+        assert!(new.frames[0].lines[0].end_x > old.frames[0].lines[0].end_x);
+        s.execute("edit.undo", &json!({})).unwrap();
+        let restored = s.cache.get(&s.doc().unwrap().doc, sid, None);
+        assert_eq!(old.frames[0].lines[0].end_x, restored.frames[0].lines[0].end_x);
+        assert!(s.execute("style.compositeFont.set", &definition(-1.0)).is_err());
+    }
+}
+
+#[cfg(test)]
+mod delete_tests {
+    use designcraft_doc::{CellStyle, ObjectStyle, StoryId, Toc, TocEntry};
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// Is `name` still named anywhere in the document?
+    fn named(s: &Session, name: &str) -> bool {
+        serde_json::to_string(&*s.doc().unwrap().doc).unwrap().contains(&format!("\"{name}\""))
+    }
+
+    fn char_doc() -> (Session, u64) {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Base", "chars": {"fontStyle": "Bold"}})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Emphasis", "basedOn": "Base", "chars": {"tracking": 20}})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Child", "basedOn": "Emphasis"})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Strong", "chars": {"size": 14}})).unwrap();
+        let refs = json!({
+            "nestedStyles": [{"style": "Emphasis", "through": true, "count": 1, "until": {"kind": "words"}}],
+            "grepStyles": [{"style": "Emphasis", "pattern": "\\d+"}],
+            "nestedLineStyles": [{"style": "Emphasis", "lines": 1}],
+            "dropCapLines": 2, "dropCapChars": 1, "dropCapStyle": "Emphasis"});
+        s.execute("style.paragraph.create", &json!({"name": "Lead", "para": refs})).unwrap();
+        s.execute("footnote.options", &json!({"refCharStyle": "Emphasis"})).unwrap();
+        let sid = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hi there"})).unwrap()["story"]
+            .as_u64()
+            .unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 2})).unwrap();
+        s.execute("style.character.apply", &json!({"name": "Emphasis"})).unwrap();
+        // Local paragraph overrides name it too.
+        s.execute("type.para", &json!({"attrs": refs})).unwrap();
+        s.edit(|d, _| {
+            d.styles_mut().default_character = "Emphasis".into();
+            Ok(())
+        })
+        .unwrap();
+        assert!(named(&s, "Emphasis"));
+        (s, sid)
+    }
+
+    #[test]
+    fn deleting_a_character_style_points_every_use_at_the_replacement() {
+        let (mut s, sid) = char_doc();
+        let undo = s.doc().unwrap().history.undo.len();
+        s.execute("style.character.delete", &json!({"name": "Emphasis", "replaceWith": "Strong"})).unwrap();
+        assert!(!named(&s, "Emphasis"), "no dangling reference");
+        let d = s.doc().unwrap().doc.clone();
+        assert_eq!(d.styles.char_style("Child").unwrap().based_on.as_deref(), Some("Strong"));
+        assert_eq!(d.story(StoryId(sid)).unwrap().chars[0].format.style, "Strong");
+        let lead = &d.styles.para("Lead").unwrap().para;
+        assert_eq!(lead.nested_styles.as_ref().unwrap()[0].style, "Strong");
+        assert_eq!(lead.grep_styles.as_ref().unwrap()[0].style, "Strong");
+        assert_eq!(lead.nested_line_styles.as_ref().unwrap()[0].style, "Strong");
+        assert_eq!(lead.drop_cap_style.as_deref(), Some("Strong"));
+        assert_eq!(d.footnote_options.ref_char_style, "Strong");
+        assert_eq!(d.styles.default_character, "Strong");
+        // One undo step brings the style and every use back.
+        assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert!(s.doc().unwrap().doc.styles.char_style("Emphasis").is_some());
+        assert_eq!(s.doc().unwrap().doc.story(StoryId(sid)).unwrap().chars[0].format.style, "Emphasis");
+    }
+
+    #[test]
+    fn deleting_a_character_style_for_none_unsets_based_on() {
+        let (mut s, _) = char_doc();
+        s.execute("style.character.delete", &json!({"name": "Emphasis"})).unwrap();
+        assert!(!named(&s, "Emphasis"), "no dangling reference");
+        let d = s.doc().unwrap().doc.clone();
+        assert_eq!(d.styles.char_style("Child").unwrap().based_on, None);
+        assert_eq!(d.footnote_options.ref_char_style, designcraft_doc::NO_CHAR_STYLE);
+    }
+
+    /// Replacing a style with its own descendant rebases the deleted style's children on its
+    /// parent, so no based-on chain becomes a cycle.
+    #[test]
+    fn replacing_a_style_with_its_child_makes_no_cycle() {
+        let (mut s, _) = char_doc();
+        s.execute("style.character.create", &json!({"name": "Grandchild", "basedOn": "Child"})).unwrap();
+        s.execute("style.character.delete", &json!({"name": "Emphasis", "replaceWith": "Grandchild"})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        assert_eq!(d.styles.char_style("Child").unwrap().based_on.as_deref(), Some("Base"));
+        assert_eq!(d.styles.char_style("Grandchild").unwrap().based_on.as_deref(), Some("Child"));
+        assert!(!named(&s, "Emphasis"));
+    }
+
+    #[test]
+    fn bad_style_deletes_are_errors_and_change_nothing() {
+        let (mut s, _) = char_doc();
+        s.execute("style.paragraph.create", &json!({"name": "Head"})).unwrap();
+        let before = s.doc().unwrap().doc.clone();
+        let undo = s.doc().unwrap().history.undo.len();
+        for (id, p) in [
+            ("style.character.delete", json!({})),
+            ("style.character.delete", json!({"name": ""})),
+            ("style.character.delete", json!({"name": "Nope"})),
+            ("style.character.delete", json!({"name": "[None]"})),
+            ("style.character.delete", json!({"name": "Emphasis", "replaceWith": "Nope"})),
+            ("style.character.delete", json!({"name": "Emphasis", "replaceWith": "Emphasis"})),
+            ("style.paragraph.delete", json!({})),
+            ("style.paragraph.delete", json!({"name": ""})),
+            ("style.paragraph.delete", json!({"name": "Nope"})),
+            ("style.paragraph.delete", json!({"name": "[Basic Paragraph]"})),
+            ("style.paragraph.delete", json!({"name": "Head", "replaceWith": "Nope"})),
+            ("style.paragraph.delete", json!({"name": "Head", "replaceWith": "Head"})),
+        ] {
+            assert!(s.execute(id, &p).is_err(), "{id} {p}");
+        }
+        assert_eq!(*s.doc().unwrap().doc, *before);
+        assert_eq!(s.doc().unwrap().history.undo.len(), undo);
+    }
+
+    #[test]
+    fn deleting_a_paragraph_style_points_every_use_at_the_replacement() {
+        let mut s = Session::new();
+        s.execute("file.newSample", &json!({})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Sub", "basedOn": "Table Body", "nextStyle": "Table Body"})).unwrap();
+        s.edit(|d, _| {
+            let story = *d.stories.keys().next().ok_or(crate::EngineError::NoDocument)?;
+            let st = d.styles_mut();
+            st.default_paragraph = "Table Body".into();
+            st.object.push(ObjectStyle { name: "Boxed".into(), paragraph_style: Some("Table Body".into()), ..Default::default() });
+            st.cell.push(CellStyle { name: "Body Cell".into(), paragraph_style: Some("Table Body".into()), ..Default::default() });
+            d.footnote_options.para_style = "Table Body".into();
+            d.endnote_options.para_style = "Table Body".into();
+            d.endnote_options.heading_style = "Table Body".into();
+            d.settings.epub_split = designcraft_doc::EpubSplit::Style("Table Body".into());
+            d.toc = Some(Toc {
+                story,
+                title: "Contents".into(),
+                entries: vec![TocEntry { entry_style: Some("Table Body".into()), ..TocEntry::new("Table Body", 1) }],
+                page_numbers: false,
+                title_style: Some("Table Body".into()),
+            });
+            Ok(())
+        })
+        .unwrap();
+        assert!(named(&s, "Table Body"));
+        s.execute("style.paragraph.delete", &json!({"name": "Table Body", "replaceWith": "Body"})).unwrap();
+        assert!(!named(&s, "Table Body"), "no dangling reference");
+        let d = s.doc().unwrap().doc.clone();
+        let sub = d.styles.para("Sub").unwrap();
+        assert_eq!((sub.based_on.as_deref(), sub.next_style.as_deref()), (Some("Body"), Some("Body")));
+        assert_eq!(d.styles.default_paragraph, "Body");
+        assert_eq!(d.endnote_options.heading_style, "Body");
+        assert_eq!(d.settings.epub_split, designcraft_doc::EpubSplit::Style("Body".into()), "EPUB Split Document follows the replacement");
+        let after = s.execute("preflight.run", &json!({})).unwrap();
+        assert!(!after.to_string().contains("Table Body"), "{after}");
+    }
+}
+
+#[cfg(test)]
+mod grep_style_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn grep_style_pattern_that_cannot_compile_is_rejected() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Keep"})).unwrap();
+        let bad = json!([{"style": "Keep", "pattern": "(\\d+"}]);
+        let e = s.execute("style.paragraph.create", &json!({"name": "Broken", "para": {"grepStyles": bad}})).unwrap_err().to_string();
+        assert!(e.contains("bad GREP") && e.contains("(\\\\d+"), "{e}");
+        assert!(s.doc().unwrap().doc.styles.para("Broken").is_none());
+
+        // The lookbehind dialect compiles.
+        let good = json!([{"style": "Keep", "pattern": "(?<=\\s)[aiouwzAIOUWZ]\\s"}]);
+        s.execute("style.paragraph.create", &json!({"name": "Polish", "para": {"grepStyles": good}})).unwrap();
+        let e = s.execute("style.paragraph.edit", &json!({"name": "Polish", "para": {"grepStyles": bad, "spaceAfter": 6}})).unwrap_err().to_string();
+        assert!(e.contains("bad GREP"), "{e}");
+        let st = s.doc().unwrap().doc.styles.para("Polish").unwrap().clone();
+        assert_eq!(st.para.grep_styles.unwrap()[0].pattern, "(?<=\\s)[aiouwzAIOUWZ]\\s");
+        assert_eq!(st.para.space_after, None, "nothing changes");
+
+        // A paragraph override too.
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Ala i kot"})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        let e = s.execute("type.para", &json!({"grepStyles": bad})).unwrap_err().to_string();
+        assert!(e.contains("bad GREP"), "{e}");
+    }
+
+    #[test]
+    fn idml_import_keeps_a_broken_grep_style_and_warns() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Keep"})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Broken"})).unwrap();
+        // Written past the command, as another application could.
+        s.edit(|d, _| {
+            if let Some(st) = d.styles_mut().para_mut("Broken") {
+                st.para.grep_styles = Some(vec![designcraft_doc::GrepStyle { style: "Keep".into(), pattern: "[a-".into() }]);
+            }
+            Ok(())
+        })
+        .unwrap();
+        let b64 = s.execute("file.exportIdml", &json!({})).unwrap()["base64"].as_str().unwrap().to_string();
+        let r = s.execute("file.openIdml", &json!({"base64": b64})).unwrap();
+        let warnings = r["warnings"].to_string();
+        assert!(warnings.contains("Broken") && warnings.contains("[a-") && warnings.contains("bad GREP"), "{warnings}");
+        let st = s.doc().unwrap().doc.styles.para("Broken").unwrap().clone();
+        assert_eq!(st.para.grep_styles.unwrap()[0].pattern, "[a-", "the style opens with its pattern");
+    }
+}
diff --git a/crates/engine/src/cmd/style/swatches.rs b/crates/engine/src/cmd/style/swatches.rs
new file mode 100644
index 000000000..3b73138f9
--- /dev/null
+++ b/crates/engine/src/cmd/style/swatches.rs
@@ -0,0 +1,1002 @@
+use super::color::check_text_nesting;
+use super::{Result, Session, Styles, Swatch, SwatchValue, Value, bad, json, str_param};
+
+pub(super) fn create_swatch(s: &mut Session, p: &Value) -> Result<Value> {
+    if let Some(g) = p.get("gradient") {
+        return create_gradient_swatch(s, p, g);
+    }
+    let c = p.get("color").ok_or_else(|| bad("swatch.create", "missing color (or gradient)"))?;
+    let color = parse_color(c).ok_or_else(|| bad("swatch.create", "bad color"))?;
+    let spot = p.get("spot").and_then(Value::as_bool).unwrap_or(false);
+    let name = str_param(p, "name").map(str::to_string).unwrap_or_else(|| value_name(color));
+    s.edit(|d, _| {
+        let name = Styles::unique_name(|n| d.swatch(n).is_some(), &name);
+        d.swatches.push(Swatch {
+            name: name.clone(),
+            value: SwatchValue::Color {
+                color,
+                color_type: if spot { designcraft_color::ColorType::Spot } else { designcraft_color::ColorType::Process },
+            },
+            locked: false,
+            named: true,
+            hidden: false,
+        });
+        Ok(json!({"name": name}))
+    })
+}
+
+/// `swatch.create {gradient}`: a named gradient swatch. Stops take a colour swatch by name (as a
+/// swatch dragged onto the Gradient panel's stop) or a colour.
+fn create_gradient_swatch(s: &mut Session, p: &Value, g: &Value) -> Result<Value> {
+    use designcraft_color::{Gradient, GradientKind, GradientStop};
+    const ID: &str = "swatch.create";
+    let kind = match g.get("kind").and_then(Value::as_str) {
+        None | Some("linear") => GradientKind::Linear,
+        Some("radial") => GradientKind::Radial,
+        Some(k) => return Err(bad(ID, format!("unknown gradient kind {k}"))),
+    };
+    let doc = &s.doc()?.doc;
+    let mut stops = Vec::new();
+    for st in g.get("stops").and_then(Value::as_array).ok_or_else(|| bad(ID, "a gradient needs stops"))? {
+        // The stop keeps the swatch, so print export writes it in that swatch's inks.
+        let (color, swatch) = match (st.get("swatch").and_then(Value::as_str), st.get("color")) {
+            (Some(n), _) => match doc.swatch(n).map(|w| &w.value) {
+                Some(SwatchValue::Gradient { .. }) => return Err(bad(ID, format!("`{n}` is a gradient; a stop takes a colour"))),
+                Some(_) => (doc.resolve_color(n, 1.0).ok_or_else(|| bad(ID, format!("`{n}` has no color")))?, Some(n.to_string())),
+                None => return Err(bad(ID, format!("no swatch named `{n}`"))),
+            },
+            (None, Some(c)) => (parse_color(c).ok_or_else(|| bad(ID, "a stop has a bad color"))?, None),
+            (None, None) => return Err(bad(ID, "a stop needs a swatch or a color")),
+        };
+        let pct = |k: &str, d: f64| st.get(k).and_then(Value::as_f64).filter(|v| v.is_finite()).unwrap_or(d).clamp(0.0, 100.0) as f32 / 100.0;
+        stops.push(GradientStop {
+            offset: pct("location", 0.0),
+            color,
+            opacity: pct("opacity", 100.0),
+            midpoint: pct("midpoint", 50.0).clamp(0.13, 0.87),
+            swatch,
+        });
+    }
+    if stops.len() < 2 {
+        return Err(bad(ID, "a gradient needs at least two stops"));
+    }
+    let mut gradient = Gradient { kind, stops };
+    gradient.sort();
+    let name = str_param(p, "name").unwrap_or("New Gradient Swatch").to_string();
+    s.edit(|d, _| {
+        let name = Styles::unique_name(|n| d.swatch(n).is_some(), &name);
+        d.swatches.push(Swatch { name: name.clone(), value: SwatchValue::Gradient { gradient }, locked: false, named: true, hidden: false });
+        Ok(json!({"name": name}))
+    })
+}
+
+/// `swatch.new`: InDesign's New Swatch. An unnamed colour or gradient (the selection's, or
+/// `swatch`) is added to the swatches under a name, and stays applied; a named swatch is
+/// duplicated as "<name> copy".
+pub(super) fn new_swatch(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "swatch.new";
+    let st = s.doc()?;
+    let name = match str_param(p, "swatch") {
+        Some(n) => n.to_string(),
+        None => {
+            let Some(id) = st.selection.items.first().copied() else {
+                // Nothing selected: a new colour swatch.
+                return create_swatch(s, &json!({"color": {"c": 0, "m": 50, "y": 100, "k": 0}}));
+            };
+            let it = st.doc.item(id).ok_or_else(|| bad(ID, "no such item"))?;
+            if str_param(p, "target") == Some("stroke") { it.stroke.swatch.clone() } else { it.fill.swatch.clone() }
+        }
+    };
+    let w = st.doc.swatch(&name).cloned().ok_or_else(|| bad(ID, format!("no swatch named `{name}`")))?;
+    if matches!(w.value, SwatchValue::None | SwatchValue::Registration) {
+        return Err(bad(ID, format!("`{name}` can't be made a new swatch")));
+    }
+    if w.hidden {
+        // An unnamed gradient takes InDesign's "New Gradient Swatch"; an unnamed colour its values.
+        let new = match w.value {
+            SwatchValue::Gradient { .. } => Styles::unique_name(|n| st.doc.swatch(n).is_some(), "New Gradient Swatch"),
+            _ => name.clone(),
+        };
+        return add_to_swatches(s, &json!({"swatch": name, "name": new}));
+    }
+    s.edit(|d, _| {
+        let copy = Styles::unique_name(|n| d.swatch(n).is_some(), &format!("{name} copy"));
+        d.swatches.push(Swatch { name: copy.clone(), locked: false, named: true, hidden: false, ..w.clone() });
+        Ok(json!({"name": copy}))
+    })
+}
+
+pub fn parse_color(v: &Value) -> Option<designcraft_color::Color> {
+    use designcraft_color::Color;
+    match v {
+        Value::String(s) => Color::from_hex(s),
+        // `{model, …}` is the colour's own form (as `color.convert` takes it): fractions, never guessed.
+        Value::Object(o) if o.contains_key("model") => model_color(v),
+        // One scale per colour, not per component: [1, 128, 255] is 0..255. Only an RGB array whose
+        // components are all within 0..1 is read as fractions (the older form).
+        Value::Array(a) if a.len() >= 3 => {
+            let v = [a[0].as_f64()?, a[1].as_f64()?, a[2].as_f64()?];
+            let scale = if v.iter().any(|&x| x > 1.0) { 255.0 } else { 1.0 };
+            Some(Color::rgb((v[0] / scale) as f32, (v[1] / scale) as f32, (v[2] / scale) as f32))
+        }
+        // Bare CMYK is always 0..100, as documented: C 1 % is a real tint, so values of 1 or less can't
+        // mean fractions (#910).
+        Value::Object(o) => {
+            if o.contains_key("gray") {
+                let gray = o.get("gray").and_then(Value::as_f64)?;
+                return Some(Color::gray(if gray > 1.0 { gray / 100.0 } else { gray } as f32));
+            }
+            let g = |k: &str| o.get(k).and_then(Value::as_f64).map(|x| (x / 100.0) as f32);
+            Some(Color::cmyk(g("c")?, g("m")?, g("y")?, g("k")?))
+        }
+        _ => None,
+    }
+}
+
+/// `{model: rgb|cmyk|gray, …}` with every component in 0..=1; anything else is not a colour.
+fn model_color(v: &Value) -> Option<designcraft_color::Color> {
+    use designcraft_color::Color;
+    let color: Color = serde_json::from_value(v.clone()).ok()?;
+    // A float's last bit (100.0 / 100.0 ≠ 1.0 after an f32 round trip) is not out of range.
+    let unit = |x: f32| x.is_finite() && (-1e-4..=1.0 + 1e-4).contains(&x);
+    let q = |x: f32| x.clamp(0.0, 1.0);
+    match color {
+        Color::Rgb { r, g, b } => [r, g, b].into_iter().all(unit).then(|| Color::rgb(q(r), q(g), q(b))),
+        Color::Cmyk { c, m, y, k } => [c, m, y, k].into_iter().all(unit).then(|| Color::cmyk(q(c), q(m), q(y), q(k))),
+        Color::Gray { k } => unit(k).then_some(Color::Gray { k: q(k) }),
+    }
+}
+
+/// The swatch name of a colour value ("C=… M=… Y=… K=…" / "R=… G=… B=…").
+pub(super) fn value_name(color: designcraft_color::Color) -> String {
+    designcraft_color::swatch::value_name(color)
+}
+
+pub(super) fn load_swatches(s: &mut Session, p: &Value) -> Result<Value> {
+    let bytes = match (str_param(p, "path"), str_param(p, "base64")) {
+        (_, Some(b)) => crate::cmd::file::base64_decode(b),
+        (Some(path), None) => crate::io::read_file(path).map_err(|e| bad("swatch.load", e))?,
+        _ => return Err(bad("swatch.load", "give `path` or `base64`")),
+    };
+    let incoming = designcraft_color::ase::read(&bytes).map_err(|e| bad("swatch.load", e.to_string()))?;
+    let replace = p.get("replace").and_then(Value::as_bool).unwrap_or(false);
+    s.edit(|d, _| {
+        // The position of the first swatch with each name, kept up to date as the file's colors are added.
+        let mut at: std::collections::HashMap<String, usize> = std::collections::HashMap::new();
+        for (i, x) in d.swatches.iter().enumerate() {
+            at.entry(x.name.clone()).or_insert(i);
+        }
+        let mut names = FileNames::default();
+        let (mut added, mut replaced) = (0, 0);
+        for mut w in incoming {
+            // An unnamed color is named by its value, and a name the file already gave gets a number.
+            if w.name.is_empty()
+                && let SwatchValue::Color { color, .. } = w.value
+            {
+                w.name = value_name(color);
+                w.named = false;
+            }
+            w.name = names.unique(std::mem::take(&mut w.name));
+            match at.get(&w.name).and_then(|&i| d.swatches.get_mut(i)) {
+                Some(x) if x.locked => {}
+                Some(x) => {
+                    if replace {
+                        x.value = w.value;
+                        x.hidden = false;
+                        replaced += 1;
+                    }
+                }
+                None => {
+                    at.insert(w.name.clone(), d.swatches.len());
+                    d.swatches.push(w);
+                    added += 1;
+                }
+            }
+        }
+        Ok(json!({"added": added, "replaced": replaced}))
+    })
+}
+
+/// The swatch names one `.ase` file has given. A name already given gets the first free number
+/// ("Red 2"), as [`Styles::unique_name`] numbers names.
+#[derive(Default)]
+struct FileNames {
+    taken: std::collections::HashSet<String>,
+    /// The last number tried for each repeated name.
+    last: std::collections::HashMap<String, usize>,
+}
+
+impl FileNames {
+    fn unique(&mut self, base: String) -> String {
+        if self.taken.insert(base.clone()) {
+            return base;
+        }
+        // Each pass tries the next number, and only finitely many names are taken.
+        let n = self.last.entry(base.clone()).or_insert(1);
+        loop {
+            *n += 1;
+            let name = format!("{base} {n}");
+            if self.taken.insert(name.clone()) {
+                return name;
+            }
+        }
+    }
+}
+
+pub(super) fn save_swatches(s: &mut Session, p: &Value) -> Result<Value> {
+    let d = &s.doc()?.doc;
+    let names: Option<Vec<String>> =
+        p.get("names").and_then(Value::as_array).map(|a| a.iter().filter_map(|v| v.as_str().map(str::to_string)).collect());
+    let chosen: Vec<Swatch> = d.swatches.iter().filter(|w| names.as_ref().is_none_or(|n| n.contains(&w.name))).cloned().collect();
+    let bytes = designcraft_color::ase::write(&chosen);
+    match str_param(p, "path") {
+        Some(path) => {
+            crate::io::write_file(path, &bytes).map_err(|e| bad("swatch.save", e))?;
+            Ok(json!({"path": path, "bytes": bytes.len()}))
+        }
+        None => Ok(json!({"base64": crate::cmd::file::base64_encode(&bytes)})),
+    }
+}
+
+pub(super) fn add_to_swatches(s: &mut Session, p: &Value) -> Result<Value> {
+    let st = s.doc()?;
+    let name = match str_param(p, "swatch") {
+        Some(n) => n.to_string(),
+        None => {
+            let id = st.selection.items.first().copied().ok_or_else(|| bad("swatch.addToSwatches", "select an object or give `swatch`"))?;
+            let it = st.doc.item(id).ok_or_else(|| bad("swatch.addToSwatches", "no such item"))?;
+            if str_param(p, "target") == Some("stroke") { it.stroke.swatch.clone() } else { it.fill.swatch.clone() }
+        }
+    };
+    let rename = str_param(p, "name").map(str::to_string);
+    let result = s.edit(|d, _| {
+        let w = d.swatches.iter_mut().find(|w| w.name == name).ok_or_else(|| bad("swatch.addToSwatches", format!("no swatch `{name}`")))?;
+        if w.locked {
+            return Err(bad("swatch.addToSwatches", "special swatches are already listed"));
+        }
+        w.hidden = false;
+        let Some(new) = rename.filter(|n| *n != name) else { return Ok(json!({"name": name})) };
+        if d.swatches.iter().any(|w| w.name == new) {
+            return Err(bad("swatch.addToSwatches", format!("a swatch named `{new}` exists")));
+        }
+        check_text_nesting(d, "swatch.addToSwatches")?;
+        let w = d.swatches.iter_mut().find(|w| w.name == name).ok_or_else(|| bad("swatch.addToSwatches", format!("no swatch `{name}`")))?;
+        w.name = new.clone();
+        w.named = true;
+        d.rename_swatch_refs(&name, &new);
+        Ok(json!({"name": new}))
+    })?;
+    if let Some(new) = result.get("name").and_then(Value::as_str) {
+        crate::cmd::text::rename_typing_swatch(s, &name, new);
+    }
+    Ok(result)
+}
+
+/// Swatch Options: rename, Name with Color Value, colour type and value, a tint swatch's tint
+/// and base — one undo step. Every use of the swatch follows a rename.
+pub(super) fn swatch_options(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "swatch.options";
+    let name = str_param(p, "name").ok_or_else(|| bad(ID, "missing name"))?.to_string();
+    let to = str_param(p, "to").map(|n| n.trim().to_string());
+    let with_value = p.get("nameWithValue").and_then(Value::as_bool);
+    let color = match p.get("color") {
+        Some(c) => Some(parse_color(c).ok_or_else(|| bad(ID, "bad color"))?),
+        None => None,
+    };
+    let spot = p.get("spot").and_then(Value::as_bool);
+    let tint = match p.get("tint") {
+        Some(v) => Some(v.as_f64().filter(|t| t.is_finite() && (0.0..=1.0).contains(t)).ok_or_else(|| bad(ID, "tint is 0–1"))? as f32),
+        None => None,
+    };
+    let base = str_param(p, "base").map(str::to_string);
+    let result = s.edit(|d, _| {
+        let w = d.swatch(&name).cloned().ok_or_else(|| bad(ID, format!("no swatch `{name}`")))?;
+        let mut w2 = w.clone();
+        if w.locked {
+            if to.as_ref().is_some_and(|t| *t != name) || with_value == Some(true) {
+                return Err(bad(ID, format!("`{name}` can't be renamed")));
+            }
+            match (&mut w2.value, color) {
+                (_, None) => {}
+                (SwatchValue::Paper { color: c }, Some(new)) => *c = new,
+                _ => return Err(bad(ID, format!("`{name}` can't be edited"))),
+            }
+            if spot.is_some() || tint.is_some() || base.is_some() {
+                return Err(bad(ID, format!("`{name}` can't be edited")));
+            }
+        } else {
+            match &mut w2.value {
+                SwatchValue::Color { color: c, color_type } => {
+                    if let Some(new) = color {
+                        *c = new;
+                    }
+                    if let Some(sp) = spot {
+                        *color_type = if sp { designcraft_color::ColorType::Spot } else { designcraft_color::ColorType::Process };
+                    }
+                    if tint.is_some() || base.is_some() {
+                        return Err(bad(ID, "only tint swatches have a tint"));
+                    }
+                }
+                SwatchValue::Tint { base: b, tint: t } => {
+                    if color.is_some() || spot.is_some() {
+                        return Err(bad(ID, "a tint swatch takes its colour from its base"));
+                    }
+                    if let Some(v) = tint {
+                        *t = v;
+                    }
+                    if let Some(nb) = &base {
+                        if !d.swatch(nb).is_some_and(|x| matches!(x.value, SwatchValue::Color { .. })) || *nb == name {
+                            return Err(bad(ID, format!("`{nb}` isn't a color swatch")));
+                        }
+                        *b = nb.clone();
+                    }
+                }
+                _ => {
+                    if color.is_some() || spot.is_some() || tint.is_some() || base.is_some() {
+                        return Err(bad(ID, format!("`{name}` only takes a name here")));
+                    }
+                }
+            }
+            // Name with Color Value: the name is the colour's values and tracks later edits.
+            let auto = with_value.unwrap_or(!w.named && to.as_ref().is_none_or(|t| *t == name));
+            let derived = match (&w2.value, auto) {
+                (SwatchValue::Color { color, .. }, true) => Some(value_name(*color)),
+                _ => None,
+            };
+            match derived {
+                Some(n) => {
+                    w2.name = n;
+                    w2.named = false;
+                }
+                None => {
+                    if let Some(t) = &to {
+                        if t.is_empty() {
+                            return Err(bad(ID, "a swatch needs a name"));
+                        }
+                        w2.name = t.clone();
+                    }
+                    if with_value == Some(false) || w2.name != name {
+                        w2.named = true;
+                    }
+                }
+            }
+            if w2.name != name && d.swatch(&w2.name).is_some() {
+                return Err(bad(ID, format!("a swatch named `{}` exists", w2.name)));
+            }
+        }
+        let new = w2.name.clone();
+        if new != name {
+            check_text_nesting(d, ID)?;
+        }
+        let slot = d.swatches.iter_mut().find(|x| x.name == name).ok_or_else(|| bad(ID, format!("no swatch `{name}`")))?;
+        *slot = w2;
+        d.rename_swatch_refs(&name, &new);
+        d.refresh_gradient_stops();
+        Ok(json!({"name": new}))
+    })?;
+    if let Some(new) = result.get("name").and_then(Value::as_str) {
+        crate::cmd::text::rename_typing_swatch(s, &name, new);
+    }
+    Ok(result)
+}
+
+#[cfg(test)]
+mod group_sample_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// Grouping the sample's table styles keeps its table cells styled (no missing styles).
+    #[test]
+    fn grouping_reaches_table_cells() {
+        let mut s = Session::new();
+        s.execute("file.newSample", &json!({})).unwrap();
+        let before = s.execute("preflight.run", &json!({})).unwrap()["errors"].as_u64().unwrap();
+        s.execute("style.group", &json!({"kind": "paragraph", "names": ["Table Head", "Table Body"], "group": "Tables"})).unwrap();
+        let after = s.execute("preflight.run", &json!({})).unwrap();
+        assert_eq!(after["errors"].as_u64().unwrap(), before, "{after}");
+    }
+}
+
+#[cfg(test)]
+mod color_group_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn color_groups_hold_swatches_and_round_trip() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let a = s.execute("swatch.create", &json!({"name": "Brand Red", "color": {"c": 0, "m": 100, "y": 100, "k": 0}})).unwrap()["name"]
+            .as_str()
+            .unwrap()
+            .to_string();
+        let b = s.execute("swatch.create", &json!({"name": "Brand Blue", "color": {"c": 100, "m": 60, "y": 0, "k": 0}})).unwrap()["name"]
+            .as_str()
+            .unwrap()
+            .to_string();
+        let g = s.execute("swatch.newColorGroup", &json!({"name": "Brand", "swatches": [a]})).unwrap();
+        assert_eq!(g["name"], "Brand");
+        assert!(s.execute("swatch.newColorGroup", &json!({"swatches": ["[Black]"]})).is_err(), "special swatches stay at the top");
+        s.execute("swatch.moveToGroup", &json!({"swatches": [b], "group": "Brand"})).unwrap();
+        let groups = |s: &Session| s.doc().unwrap().doc.color_groups.clone();
+        assert_eq!(groups(&s)[0].swatches, [a.clone(), b.clone()]);
+        let bytes = designcraft_idml::export_idml(&s.doc().unwrap().doc);
+        let back = designcraft_idml::import_idml(&bytes).unwrap();
+        assert_eq!(back.color_groups, groups(&s), "IDML ColorGroup");
+        s.execute("swatch.delete", &json!({"name": b})).unwrap();
+        assert_eq!(groups(&s)[0].swatches, [a.as_str()]);
+        s.execute("swatch.renameColorGroup", &json!({"name": "Brand", "to": "Identity"})).unwrap();
+        s.execute("swatch.ungroupColorGroup", &json!({"name": "Identity"})).unwrap();
+        assert!(groups(&s).is_empty());
+        assert!(s.doc().unwrap().doc.swatch(&a).is_some(), "ungrouping keeps the swatches");
+    }
+}
+
+#[cfg(test)]
+mod ink_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn ink_manager_converts_and_aliases_spots_in_pdf() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        for (n, c) in [("Pantone A", [0, 50, 100, 0]), ("Pantone B", [100, 0, 0, 0])] {
+            s.execute("swatch.create", &json!({"name": n, "spot": true, "color": {"c": c[0], "m": c[1], "y": c[2], "k": c[3]}})).unwrap();
+        }
+        let id = s.execute("frame.create", &json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].clone();
+        s.execute("object.fill", &json!({"swatch": "Pantone A", "ids": [id]})).unwrap();
+        let pdf = |s: &mut Session| {
+            let b = s.execute("file.exportPdf", &json!({})).unwrap()["base64"].as_str().unwrap().to_string();
+            String::from_utf8_lossy(&crate::cmd::file::base64_decode(&b)).into_owned()
+        };
+        assert!(pdf(&mut s).contains("Pantone"), "a separation");
+        s.execute("ink.options", &json!({"ink": "Pantone A", "alias": "Pantone B"})).unwrap();
+        let p = pdf(&mut s);
+        assert!(p.contains("Pantone#20B") || p.contains("Pantone B"), "aliased onto B");
+        assert!(!p.contains("Pantone#20A") && !p.contains("/Pantone A"));
+        s.execute("ink.options", &json!({"allToProcess": true})).unwrap();
+        assert!(!pdf(&mut s).contains("Pantone"), "all spots to process");
+        let l = s.execute("ink.list", &json!({})).unwrap();
+        assert_eq!(l["inks"][0]["alias"], "Pantone B");
+        let back = designcraft_idml::import_idml(&designcraft_idml::export_idml(&s.doc().unwrap().doc)).unwrap();
+        assert!(designcraft_pdf::inks::spot_output(&back, &designcraft_pdf::inks::ink_set(&back), "Pantone A").1, "IDML ConvertToProcess");
+        assert!(back.inks.aliases.iter().any(|(a, b)| a == "Pantone A" && b == "Pantone B"), "IDML AliasInkName");
+        assert!(s.execute("ink.options", &json!({"ink": "[Black]", "toProcess": true})).is_err());
+        assert!(s.execute("ink.options", &json!({"ink": "Pantone B", "alias": "Pantone A"})).is_err(), "an alias loop is refused");
+    }
+}
+
+#[cfg(test)]
+mod swatch_options_tests {
+    use designcraft_color::SwatchValue;
+    use designcraft_doc::{ItemId, StoryId};
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// A document whose frame, text, styles, tint swatch and colour group all use "Brand".
+    fn brand_doc() -> (Session, u64, u64) {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("swatch.create", &json!({"name": "Brand", "color": {"c": 0, "m": 80, "y": 100, "k": 0}})).unwrap();
+        s.execute("swatch.create", &json!({"name": "Other", "color": "#108080"})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hello"})).unwrap();
+        let (id, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
+        s.execute("object.fill", &json!({"swatch": "Brand", "ids": [id]})).unwrap();
+        s.execute("object.stroke", &json!({"swatch": "Brand", "ids": [id]})).unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 3})).unwrap();
+        s.execute("type.char", &json!({"attrs": {"fill": "Brand"}})).unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 5, "focus": 5})).unwrap();
+        s.execute("table.insert", &json!({"rows": 2, "cols": 2})).unwrap();
+        s.execute("table.select", &json!({"what": "table"})).unwrap();
+        s.execute("table.setCell", &json!({"stroke": {"weight": 2, "type": "dashed", "gapColor": "Brand", "edges": ["all"]}})).unwrap();
+        s.execute("swatch.newColorGroup", &json!({"name": "Brand Colors", "swatches": ["Brand"]})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Accent"})).unwrap();
+        s.edit(|d, _| {
+            d.swatches.push(designcraft_color::Swatch {
+                name: "Brand 50%".into(),
+                value: SwatchValue::Tint { base: "Brand".into(), tint: 0.5 },
+                locked: false,
+                named: true,
+                hidden: false,
+            });
+            let st = d.styles_mut();
+            if let Some(p) = st.para_mut(designcraft_doc::BASIC_PARAGRAPH) {
+                p.chars.underline_color = Some("Brand".into());
+                p.para.shading_color = Some("Brand".into());
+                p.para.border_gap_color = Some("Brand".into());
+                p.chars.ruby_stroke = Some("Brand".into());
+            }
+            if let Some(c) = st.char_style_mut("Accent") {
+                c.chars.fill = Some("Brand".into());
+                c.chars.kenten_fill = Some("Brand".into());
+            }
+            Ok(())
+        })
+        .unwrap();
+        (s, id, sid)
+    }
+
+    fn uses(s: &Session, id: u64, sid: u64, name: &str) -> Vec<bool> {
+        let d = &s.doc().unwrap().doc;
+        let it = d.item(ItemId(id)).unwrap();
+        let story = d.story(StoryId(sid)).unwrap();
+        let basic = d.styles.para(designcraft_doc::BASIC_PARAGRAPH).unwrap();
+        vec![
+            it.fill.swatch == name,
+            it.stroke.swatch == name,
+            story.chars.iter().any(|r| r.format.over.fill.as_deref() == Some(name)),
+            basic.chars.underline_color.as_deref() == Some(name),
+            basic.para.shading_color.as_deref() == Some(name),
+            d.styles.char_style("Accent").unwrap().chars.fill.as_deref() == Some(name),
+            matches!(&d.swatch("Brand 50%").unwrap().value, SwatchValue::Tint { base, .. } if base == name),
+            d.color_groups[0].swatches == [name],
+            basic.para.border_gap_color.as_deref() == Some(name),
+            basic.chars.ruby_stroke.as_deref() == Some(name),
+            d.styles.char_style("Accent").unwrap().chars.kenten_fill.as_deref() == Some(name),
+            story.tables.values().any(|t| t.cells.iter().all(|c| c.strokes.iter().all(|e| e.gap_color == name))),
+        ]
+    }
+
+    #[test]
+    fn renaming_a_swatch_renames_every_use_in_one_undo_step() {
+        let (mut s, id, sid) = brand_doc();
+        assert!(uses(&s, id, sid, "Brand").iter().all(|u| *u));
+        let r = s.execute("swatch.options", &json!({"name": "Brand", "to": "Signal Orange", "spot": true})).unwrap();
+        assert_eq!(r["name"], "Signal Orange");
+        let d = &s.doc().unwrap().doc;
+        assert!(d.swatch("Brand").is_none());
+        assert!(matches!(d.swatch("Signal Orange").unwrap().value, SwatchValue::Color { color_type: designcraft_color::ColorType::Spot, .. }));
+        assert_eq!(uses(&s, id, sid, "Signal Orange"), vec![true; 12]);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert!(s.doc().unwrap().doc.swatch("Brand").is_some());
+        assert_eq!(uses(&s, id, sid, "Brand"), vec![true; 12]);
+    }
+
+    #[test]
+    fn bad_swatch_renames_change_nothing() {
+        let (mut s, id, sid) = brand_doc();
+        let before = s.doc().unwrap().doc.clone();
+        for p in [
+            json!({"name": "Brand", "to": "Other"}),
+            json!({"name": "Brand", "to": "  "}),
+            json!({"name": "Brand", "to": "[Paper]"}),
+            json!({"name": "[Black]", "to": "Ink"}),
+            json!({"name": "[Registration]", "to": "Reg"}),
+            json!({"name": "[None]", "to": "Nothing"}),
+            json!({"name": "[Black]", "color": "#ff0000"}),
+            json!({"name": "Brand 50%", "color": "#ff0000"}),
+            json!({"name": "Missing", "to": "X"}),
+        ] {
+            assert!(s.execute("swatch.options", &p).is_err(), "{p}");
+        }
+        assert_eq!(s.doc().unwrap().doc.swatches, before.swatches);
+        assert_eq!(uses(&s, id, sid, "Brand"), vec![true; 12]);
+        // [Paper]'s colour can change; its name can't.
+        s.execute("swatch.options", &json!({"name": "[Paper]", "to": "[Paper]", "color": "#fff8e0"})).unwrap();
+    }
+
+    #[test]
+    fn name_with_color_value_tracks_the_colour() {
+        let (mut s, id, sid) = brand_doc();
+        let r = s.execute("swatch.options", &json!({"name": "Brand", "nameWithValue": true, "color": {"c": 10, "m": 20, "y": 30, "k": 40}})).unwrap();
+        assert_eq!(r["name"], "C=10 M=20 Y=30 K=40");
+        assert_eq!(uses(&s, id, sid, "C=10 M=20 Y=30 K=40"), vec![true; 12]);
+        // Later colour edits keep the name in step until the swatch is named by hand.
+        let r = s.execute("swatch.options", &json!({"name": "C=10 M=20 Y=30 K=40", "color": {"c": 0, "m": 0, "y": 0, "k": 50}})).unwrap();
+        assert_eq!(r["name"], "C=0 M=0 Y=0 K=50");
+        let r = s.execute("swatch.options", &json!({"name": "C=0 M=0 Y=0 K=50", "to": "Warm Gray"})).unwrap();
+        assert_eq!(r["name"], "Warm Gray");
+        assert!(s.doc().unwrap().doc.swatch("Warm Gray").unwrap().named);
+    }
+}
+
+#[cfg(test)]
+mod sample_color_tests {
+    use designcraft_color::{Color, SwatchValue};
+    use designcraft_doc::ItemId;
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// A 2×1 image, red then blue, placed 144 pt wide at (72, 72): each pixel is 72 pt.
+    fn session_with_image() -> (Session, u64) {
+        let png = designcraft_render::Rendered { width: 2, height: 1, pixels: vec![255, 0, 0, 255, 0, 0, 255, 255] }.to_png();
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let b64 = crate::cmd::file::base64_encode(&png);
+        let r = s.execute("file.place", &json!({"base64": b64, "name": "rb.png", "x": 72, "y": 72, "width": 144})).unwrap();
+        (s, r["id"].as_u64().unwrap())
+    }
+
+    fn swatch_color(s: &Session, name: &str) -> Color {
+        match &s.doc().unwrap().doc.swatch(name).unwrap().value {
+            SwatchValue::Color { color, .. } => *color,
+            other => panic!("{other:?}"),
+        }
+    }
+
+    #[test]
+    fn the_eyedropper_colours_selected_text_with_the_image_under_it() {
+        let (mut s, image) = session_with_image();
+        let f = s.execute("frame.create", &json!({"rect": [300, 300, 500, 360], "content": "text", "text": "Elevate."})).unwrap();
+        let fid = ItemId(f["id"].as_u64().unwrap());
+        let story = s.doc().unwrap().doc.item(fid).unwrap().text_frame().unwrap().story;
+        s.execute("text.select", &json!({"story": story.0, "anchor": 0, "focus": 7})).unwrap();
+        let undo = s.doc().unwrap().history.undo.len();
+        let r = s.execute("color.sample", &json!({"at": [180, 100]})).unwrap();
+        assert_eq!((r["color"].as_str(), r["from"].as_u64()), (Some("#0000ff"), Some(image)), "{r}");
+        assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1, "one undo step");
+        let name = r["swatch"].as_str().unwrap().to_string();
+        assert_eq!(swatch_color(&s, &name), Color::rgb8(0, 0, 255));
+        assert!(s.doc().unwrap().doc.swatch(&name).unwrap().hidden, "an unnamed colour");
+        let st = s.doc().unwrap().doc.story(story).unwrap().clone();
+        assert_eq!(st.format_after(0).over.fill.as_deref(), Some(name.as_str()));
+        assert_eq!(st.format_after(7).over.fill, None, "the full stop keeps its colour");
+        // The frame itself is not coloured.
+        assert!(s.doc().unwrap().doc.item(fid).unwrap().fill.is_none());
+    }
+
+    #[test]
+    fn the_eyedropper_fills_selected_objects_and_samples_locked_images() {
+        let (mut s, _) = session_with_image();
+        let lid = s.doc().unwrap().doc.layers[0].id.0;
+        s.execute("layer.set", &json!({"id": lid, "locked": true})).unwrap();
+        s.execute("layer.new", &json!({"name": "TEXT"})).unwrap();
+        let rect = s.execute("frame.create", &json!({"rect": [300, 300, 400, 400]})).unwrap()["id"].as_u64().unwrap();
+        s.execute("selection.set", &json!({"ids": [rect]})).unwrap();
+        let r = s.execute("color.sample", &json!({"at": [100, 100], "target": "stroke"})).unwrap();
+        assert_eq!(r["color"], "#ff0000", "{r}");
+        let it = s.doc().unwrap().doc.item(ItemId(rect)).unwrap().clone();
+        assert_eq!(swatch_color(&s, &it.stroke.swatch), Color::rgb8(255, 0, 0));
+        // Sampling the same colour again reuses its swatch.
+        let again = s.execute("color.sample", &json!({"at": [90, 90]})).unwrap();
+        assert_eq!(again["swatch"], r["swatch"]);
+    }
+
+    #[test]
+    fn a_caret_takes_the_sample_for_typing_and_nothing_to_sample_is_refused() {
+        let (mut s, _) = session_with_image();
+        let f = s.execute("frame.create", &json!({"rect": [300, 300, 500, 360], "content": "text", "text": "Hi"})).unwrap();
+        let fid = ItemId(f["id"].as_u64().unwrap());
+        let story = s.doc().unwrap().doc.item(fid).unwrap().text_frame().unwrap().story;
+        s.execute("text.select", &json!({"story": story.0, "anchor": 1, "focus": 1})).unwrap();
+        // A caret: the sampled colour is for the next typing.
+        let r = s.execute("color.sample", &json!({"at": [100, 100]})).unwrap();
+        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fill"], r["swatch"]);
+        assert_eq!(s.doc().unwrap().doc.story(story).unwrap().text, "Hi", "caret color waits for typing");
+        s.execute("text.insert", &json!({"text": "X"})).unwrap();
+        let st = s.doc().unwrap().doc.story(story).unwrap().clone();
+        assert_eq!(st.format_after(1).over.fill.as_deref(), r["swatch"].as_str(), "{r}");
+        assert_eq!(st.format_after(0).over.fill, None, "the text before the caret keeps its colour");
+        let undo = s.doc().unwrap().history.undo.len();
+        s.execute("text.select", &json!({"story": story.0, "anchor": 0, "focus": 2})).unwrap();
+        let none = s.execute("color.sample", &json!({"at": [600, 600]})).unwrap_err().to_string();
+        assert!(none.contains("no placed image"), "{none}");
+        // Just past the image's right edge.
+        assert!(s.execute("color.sample", &json!({"at": [216.5, 100]})).is_err());
+        assert_eq!(s.doc().unwrap().history.undo.len(), undo);
+    }
+
+    #[test]
+    fn where_no_image_pixel_shows_the_clicked_frame_is_matched_instead() {
+        let (mut s, image) = session_with_image();
+        let rect = s.execute("frame.create", &json!({"rect": [300, 300, 400, 400]})).unwrap()["id"].as_u64().unwrap();
+        s.execute("object.fill", &json!({"swatch": "[Black]", "ids": [image]})).unwrap();
+        // The frame reaches 72 pt below its image, and a clipping path shows the left (red) pixel only.
+        s.edit(|d, _| {
+            let it = d.item_mut(ItemId(image)).ok_or(crate::EngineError::NoDocument)?;
+            let b = it.inner_bounds();
+            it.path = designcraft_geom::shapes::rectangle(designcraft_geom::Rect::new(b.x0, b.y0, b.x1, b.y1 + 72.0));
+            let designcraft_doc::Content::Graphic(g) = &mut it.content else { return Err(crate::EngineError::NoDocument) };
+            let left = designcraft_geom::shapes::rectangle(designcraft_geom::Rect::new(0.0, 0.0, g.size.0 / 2.0, g.size.1));
+            g.clip = Some(std::sync::Arc::new(designcraft_doc::ClippingPath::new(designcraft_doc::ClippingKind::PhotoshopPath, left)));
+            Ok(())
+        })
+        .unwrap();
+        s.execute("selection.set", &json!({"ids": [rect]})).unwrap();
+        let r = s.execute("color.sample", &json!({"at": [100, 100], "matchFrom": image})).unwrap();
+        assert_eq!(r["color"], "#ff0000", "inside the clipping path the image is sampled");
+        // The clipped-out blue pixel and the empty frame below the image: nothing to sample, so the
+        // frame's attributes apply.
+        for at in [[180, 100], [100, 180]] {
+            assert!(s.execute("color.sample", &json!({"at": at})).is_err(), "{at:?}");
+            s.execute("object.fill", &json!({"swatch": "[Paper]", "ids": [rect]})).unwrap();
+            s.execute("color.sample", &json!({"at": at, "matchFrom": image})).unwrap();
+            assert_eq!(s.doc().unwrap().doc.item(ItemId(rect)).unwrap().fill.swatch, "[Black]", "{at:?}");
+        }
+    }
+
+    #[test]
+    fn sampling_and_explicit_colour_use_the_same_text_application_path() {
+        for command in ["color.sample", "object.color"] {
+            // Each command gets its own key: the eyedropper samples at `at`, object.color takes `color`.
+            let params = |at: [f64; 2], color: &str, extra: serde_json::Value| {
+                let mut p = if command == "color.sample" { json!({"at": at}) } else { json!({"color": color}) };
+                if let (Some(p), Some(extra)) = (p.as_object_mut(), extra.as_object()) {
+                    p.extend(extra.clone());
+                }
+                p
+            };
+            let (mut s, _) = session_with_image();
+            let f = s.execute("frame.create", &json!({"rect": [300, 300, 500, 360], "content": "text"})).unwrap();
+            let story = designcraft_doc::StoryId(f["story"].as_u64().unwrap());
+            s.execute("text.select", &json!({"story": story.0, "anchor": 0})).unwrap();
+            let undo = s.doc().unwrap().history.undo.len();
+            let r = s.execute(command, &params([100.0, 100.0], "#ff0000", json!({}))).unwrap();
+            assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1, "{command}");
+            s.execute("text.insert", &json!({"text": "Hi"})).unwrap();
+            let text = s.doc().unwrap().doc.story(story).unwrap();
+            assert_eq!(text.format_after(0).over.fill.as_deref(), r["swatch"].as_str(), "empty-story typing: {command}");
+            // Explicit ids override text targeting, including with a text selection active.
+            let fid = ItemId(f["id"].as_u64().unwrap());
+            s.execute("text.select", &json!({"story": story.0, "anchor": 0, "focus": 2})).unwrap();
+            let r = s.execute(command, &params([180.0, 100.0], "#0000ff", json!({"id": fid.0}))).unwrap();
+            assert_eq!(s.doc().unwrap().doc.item(fid).unwrap().fill.swatch, r["swatch"].as_str().unwrap());
+            let text = s.doc().unwrap().doc.story(story).unwrap();
+            assert_ne!(text.format_after(0).over.fill.as_deref(), r["swatch"].as_str(), "text unchanged: {command}");
+            let r = s.execute(command, &params([180.0, 100.0], "#0000ff", json!({"target": "stroke"}))).unwrap();
+            let text = s.doc().unwrap().doc.story(story).unwrap();
+            assert_eq!(text.format_after(0).over.stroke.as_deref(), r["swatch"].as_str(), "selected text stroke: {command}");
+        }
+    }
+
+    #[test]
+    fn sampling_with_the_stroke_in_front_colours_a_lines_stroke() {
+        let (mut s, _) = session_with_image();
+        let line = s.execute("line.create", &json!({"a": [300, 300], "b": [500, 300]})).unwrap()["id"].as_u64().unwrap();
+        s.execute("selection.set", &json!({"ids": [line]})).unwrap();
+        let r = s.execute("color.sample", &json!({"at": [100, 100], "target": "stroke"})).unwrap();
+        let it = s.doc().unwrap().doc.item(ItemId(line)).unwrap().clone();
+        assert_eq!(it.stroke.swatch, r["swatch"].as_str().unwrap(), "{r}");
+        assert!(it.fill.is_none(), "the fill stays empty");
+    }
+}
+
+#[cfg(test)]
+mod radial_gradient_tests {
+    use serde_json::json;
+
+    /// White at the side and the top of a 100×200 radial (black → white) rectangle at (50, 20) on
+    /// a 200×240 page, rendered at 1 px/pt.
+    fn sides(img: &designcraft_render::Rendered) -> (u8, u8, u8) {
+        (img.pixel(100, 120)[0], img.pixel(52, 120)[0], img.pixel(100, 22)[0])
+    }
+
+    #[test]
+    fn a_radial_gradient_is_the_objects_ellipse_on_screen_and_in_pdf() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"width": 200, "height": 240, "facingPages": false})).unwrap();
+        let id = s.execute("frame.create", &json!({"rect": [50, 20, 150, 220], "content": "unassigned"})).unwrap()["id"].as_u64().unwrap();
+        s.execute("object.stroke", &json!({"ids": [id], "swatch": "[None]"})).unwrap();
+        s.execute(
+            "object.gradient",
+            &json!({"ids": [id], "kind": "radial", "stops": [{"location": 0, "color": "#000000"}, {"location": 100, "color": "#ffffff"}]}),
+        )
+        .unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        let mut r = designcraft_render::Renderer::new();
+        let (c, side, top) = sides(&r.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap());
+        assert!(c < 30 && side > 220 && top > 220, "screen: centre {c}, side {side}, top {top}");
+        // The PDF, placed back and drawn: the same ellipse.
+        let pdf = designcraft_pdf::export_pdf(&d, &s.cache, &Default::default()).unwrap();
+        let mut p = crate::Session::new();
+        p.execute("file.new", &json!({"width": 200, "height": 240, "facingPages": false})).unwrap();
+        p.execute("file.place", &json!({"base64": crate::cmd::file::base64_encode(&pdf), "name": "radial.pdf", "x": 0, "y": 0, "width": 200}))
+            .unwrap();
+        let d = p.doc().unwrap().doc.clone();
+        let (c, side, top) = sides(&r.render_page(&d, &p.cache, 0, 1.0, false, &Default::default()).unwrap());
+        assert!(c < 30 && side > 220 && top > 220, "pdf: centre {c}, side {side}, top {top}");
+    }
+
+    #[test]
+    fn a_box_with_no_height_or_width_has_a_circle_across_its_length() {
+        let f = designcraft_doc::Fill::swatch("g");
+        let line = designcraft_geom::Rect::new(20.0, 60.0, 180.0, 60.0);
+        let (c, rx, ry) = f.radial_ellipse(line);
+        assert_eq!((c.x, c.y, rx, ry), (100.0, 60.0, 80.0, 80.0));
+        let (_, rx, ry) = f.radial_ellipse(designcraft_geom::Rect::new(10.0, 0.0, 10.0, 50.0));
+        assert_eq!((rx, ry), (25.0, 25.0));
+        // A point: a tiny circle, never a zero radius.
+        let (_, rx, ry) = f.radial_ellipse(designcraft_geom::Rect::new(5.0, 5.0, 5.0, 5.0));
+        assert!(rx > 0.0 && rx == ry);
+        // A box keeps its ellipse.
+        let (_, rx, ry) = f.radial_ellipse(designcraft_geom::Rect::new(0.0, 0.0, 100.0, 200.0));
+        assert_eq!((rx, ry), (50.0, 100.0));
+    }
+}
+
+#[cfg(test)]
+mod gradient_swatch_tests {
+    use designcraft_color::SwatchValue;
+    use serde_json::json;
+
+    fn doc() -> crate::Session {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s
+    }
+
+    #[test]
+    fn a_gradient_swatch_from_colour_swatches() {
+        let mut s = doc();
+        // As the Gradient panel's stops take swatches dragged onto them.
+        let r = s
+            .execute(
+                "swatch.create",
+                &json!({"gradient": {"stops": [{"location": 100, "swatch": "C=100 M=0 Y=0 K=0"}, {"location": 0, "swatch": "C=0 M=100 Y=0 K=0"}]}}),
+            )
+            .unwrap();
+        assert_eq!(r["name"], "New Gradient Swatch");
+        let d = &s.doc().unwrap().doc;
+        let w = d.swatch("New Gradient Swatch").unwrap();
+        assert!(w.named && !w.hidden);
+        let SwatchValue::Gradient { gradient } = &w.value else { panic!("{w:?}") };
+        assert_eq!(gradient.stops[0].color, d.resolve_color("C=0 M=100 Y=0 K=0", 1.0).unwrap(), "sorted: magenta first");
+        assert_eq!(gradient.stops[1].color, d.resolve_color("C=100 M=0 Y=0 K=0", 1.0).unwrap());
+        // A second one gets its own name; bad stops are refused.
+        let r = s
+            .execute(
+                "swatch.create",
+                &json!({"gradient": {"kind": "radial", "stops": [{"color": "#ff0000"}, {"location": 100, "color": "#0000ff"}]}}),
+            )
+            .unwrap();
+        assert_eq!(r["name"], "New Gradient Swatch 2");
+        for bad in [
+            json!({"stops": [{"swatch": "C=0 M=100 Y=0 K=0"}]}),
+            json!({"stops": [{"swatch": "Nope"}, {"swatch": "[Black]"}]}),
+            json!({"stops": [{"swatch": "New Gradient Swatch"}, {"swatch": "[Black]"}]}),
+            json!({"kind": "conic", "stops": [{"color": "#000000"}, {"color": "#ffffff"}]}),
+        ] {
+            assert!(s.execute("swatch.create", &json!({"gradient": bad})).is_err(), "{bad}");
+        }
+    }
+
+    #[test]
+    fn gradient_stops_follow_their_swatch() {
+        let mut s = doc();
+        s.execute("swatch.create", &json!({"name": "Gold", "color": {"c": 0, "m": 30, "y": 90, "k": 10}, "spot": true})).unwrap();
+        s.execute(
+            "swatch.create",
+            &json!({"name": "G", "gradient": {"stops": [{"location": 0, "swatch": "Gold"}, {"location": 100, "swatch": "[Paper]"}]}}),
+        )
+        .unwrap();
+        let stops = |s: &crate::Session| match &s.doc().unwrap().doc.swatch("G").unwrap().value {
+            SwatchValue::Gradient { gradient } => gradient.stops.clone(),
+            v => panic!("{v:?}"),
+        };
+        assert_eq!(stops(&s)[0].swatch.as_deref(), Some("Gold"));
+        assert_eq!(stops(&s)[1].swatch.as_deref(), Some("[Paper]"));
+        // Renamed and edited: the stop names the new name and shows the new color.
+        s.execute("swatch.options", &json!({"name": "Gold", "to": "Gold 871", "color": {"c": 0, "m": 20, "y": 80, "k": 20}})).unwrap();
+        assert_eq!(stops(&s)[0].swatch.as_deref(), Some("Gold 871"));
+        assert_eq!(stops(&s)[0].color, designcraft_color::Color::cmyk(0.0, 0.2, 0.8, 0.2));
+        // Deleted: the stop keeps its color as a plain one.
+        s.execute("swatch.delete", &json!({"name": "Gold 871"})).unwrap();
+        assert_eq!(stops(&s)[0].swatch, None);
+        assert_eq!(stops(&s)[0].color, designcraft_color::Color::cmyk(0.0, 0.2, 0.8, 0.2));
+    }
+
+    #[test]
+    fn new_swatch_names_the_selections_gradient_or_duplicates_a_swatch() {
+        let mut s = doc();
+        let id = s.execute("frame.create", &json!({"rect": [0, 0, 100, 100], "content": "unassigned"})).unwrap()["id"].as_u64().unwrap();
+        // A gradient made in the Gradient panel is unnamed (and not listed) …
+        s.execute("object.gradient", &json!({"ids": [id], "stops": [{"location": 0, "color": {"c": 0, "m": 100, "y": 0, "k": 0}}, {"location": 100, "color": {"c": 100, "m": 0, "y": 0, "k": 0}}]})).unwrap();
+        let fill = |s: &crate::Session| s.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch.clone();
+        assert!(s.doc().unwrap().doc.swatch(&fill(&s)).unwrap().hidden);
+        // … until New Swatch: "New Gradient Swatch", listed, still the object's fill.
+        s.execute("selection.set", &json!({"ids": [id]})).unwrap();
+        assert_eq!(s.execute("swatch.new", &json!({})).unwrap()["name"], "New Gradient Swatch");
+        assert_eq!(fill(&s), "New Gradient Swatch");
+        let w = s.doc().unwrap().doc.swatch("New Gradient Swatch").unwrap().clone();
+        assert!(w.named && !w.hidden && matches!(w.value, SwatchValue::Gradient { .. }));
+        // A named swatch: a copy.
+        assert_eq!(s.execute("swatch.new", &json!({})).unwrap()["name"], "New Gradient Swatch copy");
+        assert_eq!(s.execute("swatch.new", &json!({"swatch": "C=100 M=0 Y=0 K=0"})).unwrap()["name"], "C=100 M=0 Y=0 K=0 copy");
+        assert!(s.execute("swatch.new", &json!({"swatch": "[None]"})).is_err());
+        // The stroke in front: the stroke's swatch.
+        s.execute("object.stroke", &json!({"ids": [id], "swatch": "C=100 M=0 Y=0 K=0"})).unwrap();
+        assert_eq!(s.execute("swatch.new", &json!({"target": "stroke"})).unwrap()["name"], "C=100 M=0 Y=0 K=0 copy 2");
+        // Nothing selected, no swatch given: a new colour swatch.
+        s.execute("edit.deselectAll", &json!({})).unwrap();
+        let n = s.execute("swatch.new", &json!({})).unwrap()["name"].as_str().unwrap().to_string();
+        let w = s.doc().unwrap().doc.swatch(&n).unwrap();
+        assert!(w.named && !w.hidden && matches!(w.value, SwatchValue::Color { .. }), "{w:?}");
+    }
+}
+
+#[cfg(test)]
+mod gradient_stroke_tests {
+    use serde_json::json;
+
+    /// Grey along a 20 pt line from (20, 60) to (180, 60): near its start, middle and end.
+    fn along(img: &designcraft_render::Rendered) -> (u8, u8, u8) {
+        (img.pixel(26, 60)[0], img.pixel(100, 60)[0], img.pixel(174, 60)[0])
+    }
+
+    #[test]
+    fn a_gradient_on_a_stroke_runs_across_the_path_on_screen_and_in_pdf() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"width": 200, "height": 120, "facingPages": false})).unwrap();
+        let id = s.execute("line.create", &json!({"a": [20, 60], "b": [180, 60]})).unwrap()["id"].as_u64().unwrap();
+        s.execute("object.stroke", &json!({"ids": [id], "weight": 20})).unwrap();
+        let r = s
+            .execute(
+                "object.gradient",
+                &json!({"ids": [id], "target": "stroke", "stops": [{"location": 0, "color": "#000000"}, {"location": 100, "color": "#ffffff"}]}),
+            )
+            .unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        let it = d.item(designcraft_doc::ItemId(id)).unwrap();
+        assert_eq!(it.stroke.swatch, r["swatch"].as_str().unwrap());
+        assert_eq!(it.fill.swatch, designcraft_color::swatch::NONE, "the fill is left alone");
+        let mut rr = designcraft_render::Renderer::new();
+        let (a, m, b) = along(&rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap());
+        assert!(a < 40 && (90..170).contains(&m) && b > 215, "screen: {a} {m} {b}");
+        // The PDF, placed back and drawn: the same.
+        let pdf = designcraft_pdf::export_pdf(&d, &s.cache, &Default::default()).unwrap();
+        let mut p = crate::Session::new();
+        p.execute("file.new", &json!({"width": 200, "height": 120, "facingPages": false})).unwrap();
+        p.execute("file.place", &json!({"base64": crate::cmd::file::base64_encode(&pdf), "name": "stroke.pdf", "x": 0, "y": 0, "width": 200}))
+            .unwrap();
+        let pd = p.doc().unwrap().doc.clone();
+        let (a, m, b) = along(&rr.render_page(&pd, &p.cache, 0, 1.0, false, &Default::default()).unwrap());
+        assert!(a < 40 && (90..170).contains(&m) && b > 215, "pdf: {a} {m} {b}");
+        // The Gradient Swatch tool's drag on the stroke: reversed by dragging right to left.
+        s.execute("object.gradient", &json!({"ids": [id], "target": "stroke", "from": [180, 60], "to": [20, 60]})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        let (a, _, b) = along(&rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap());
+        assert!(a > 215 && b < 40, "dragged: {a} {b}");
+        assert!(s.execute("object.gradient", &json!({"ids": [id], "target": "gap"})).is_err());
+    }
+
+    /// A 20 pt horizontal line with a gradient on its stroke, drawn on screen and from its PDF.
+    fn line_with_stroke_gradient(g: serde_json::Value) -> (designcraft_render::Rendered, designcraft_render::Rendered) {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"width": 200, "height": 120, "facingPages": false})).unwrap();
+        let id = s.execute("line.create", &json!({"a": [20, 60], "b": [180, 60]})).unwrap()["id"].as_u64().unwrap();
+        s.execute("object.stroke", &json!({"ids": [id], "weight": 20})).unwrap();
+        let mut g = g;
+        g["ids"] = json!([id]);
+        g["target"] = json!("stroke");
+        s.execute("object.gradient", &g).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        let mut rr = designcraft_render::Renderer::new();
+        let screen = rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap();
+        let pdf = designcraft_pdf::export_pdf(&d, &s.cache, &Default::default()).unwrap();
+        let mut p = crate::Session::new();
+        p.execute("file.new", &json!({"width": 200, "height": 120, "facingPages": false})).unwrap();
+        p.execute("file.place", &json!({"base64": crate::cmd::file::base64_encode(&pdf), "name": "line.pdf", "x": 0, "y": 0, "width": 200})).unwrap();
+        let pd = p.doc().unwrap().doc.clone();
+        let placed = rr.render_page(&pd, &p.cache, 0, 1.0, false, &Default::default()).unwrap();
+        (screen, placed)
+    }
+
+    #[test]
+    fn a_radial_gradient_on_a_straight_lines_stroke_shows_all_its_stops() {
+        // The line's box has no height: the gradient is a circle across the line's length.
+        let (screen, pdf) = line_with_stroke_gradient(
+            json!({"kind": "radial", "stops": [{"location": 0, "color": "#000000"}, {"location": 100, "color": "#ffffff"}]}),
+        );
+        for (what, img) in [("screen", &screen), ("pdf", &pdf)] {
+            let (a, m, b) = along(img);
+            assert!(m < 40 && a > 180 && b > 180, "{what}: {a} {m} {b}");
+        }
+    }
+
+    #[test]
+    fn a_linear_gradient_across_a_straight_line_paints_its_stroke_alike_on_screen_and_in_pdf() {
+        let (screen, pdf) =
+            line_with_stroke_gradient(json!({"angle": 90, "stops": [{"location": 0, "color": "#ff0000"}, {"location": 100, "color": "#0000ff"}]}));
+        let (s, p) = (screen.pixel(100, 60), pdf.pixel(100, 60));
+        // The line's box has no height: the gradient runs across the line's length, so the stroke
+        // shows its middle.
+        assert!(s[1] < 60 && s[0] > 80 && s[2] > 80, "screen: the stroke is painted, {s:?}");
+        assert!((0..3).all(|i| s[i].abs_diff(p[i]) < 40), "screen {s:?}, pdf {p:?}");
+    }
+}
diff --git a/crates/engine/src/cmd/table.rs b/crates/engine/src/cmd/table.rs
index 776dd5e82..2a124e7a9 100644
--- a/crates/engine/src/cmd/table.rs
+++ b/crates/engine/src/cmd/table.rs
@@ -17,2466 +17,15 @@ use serde_json::{Value, json};
 use super::{CommandSpec, bad, cmd, f64_or, has_doc, has_text, ok, str_param};
 use crate::{Result, Session};
 
-pub fn specs() -> Vec<CommandSpec> {
-    let mut v = style_specs();
-    v.extend(table_specs());
-    v
-}
-
-fn style_specs() -> Vec<CommandSpec> {
-    vec![
-        cmd!(
-            "style.cell.create",
-            "New Cell Style…",
-            [],
-            None,
-            "{name, fromSelection?: bool (the target cell's look), fill?, tint?, insets?: n|[t,l,b,r], vj?: top|center|bottom|justify, firstBaseline?: ascent|capHeight|leading|xHeight|fixed|emboxHeight, firstBaselineMin?: pt, stroke?: {weight?, color?, tint?, type?, gapColor?, gapTint?} (all four edges; values as table.setCell's stroke), paragraphStyle?, basedOn?: cell style name, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} → {name}",
-            has_doc,
-            |s, p| cell_style_create(s, p)
-        ),
-        cmd!(
-            "style.cell.apply",
-            "Apply Cell Style",
-            [],
-            None,
-            "{name, story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?} — the target cells (the whole table when the cursor is in it)",
-            in_table,
-            cell_style_apply
-        ),
-        cmd!(
-            "style.cell.edit",
-            "Cell Style Options…",
-            [],
-            None,
-            "{name, …same as style.cell.create} — cells using the style follow",
-            has_doc,
-            cell_style_edit
-        ),
-        cmd!(
-            "style.table.create",
-            "New Table Style…",
-            [],
-            None,
-            "{name, basedOn?: table style name, header?, body?, footer?, leftColumn?, rightColumn?: cell style names, border?: {weight?, color?, tint?, type?, gapColor?, gapTint?}, altRows?: {first, firstColor, next, nextColor}, spaceBefore?, spaceAfter?} → {name}",
-            has_doc,
-            table_style_create
-        ),
-        cmd!(
-            "style.table.apply",
-            "Apply Table Style",
-            [],
-            None,
-            "{name, story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?}",
-            in_table,
-            table_style_apply
-        ),
-        cmd!(
-            "style.table.edit",
-            "Table Style Options…",
-            [],
-            None,
-            "{name, …same as style.table.create} — tables using the style follow",
-            has_doc,
-            table_style_edit
-        ),
-    ]
-}
-
-fn table_specs() -> Vec<CommandSpec> {
-    vec![
-        cmd!(
-            "table.insert",
-            "Create Table",
-            [],
-            Some("Cmd+Alt+Shift+T"),
-            "{rows?: body rows (4), cols? | columns? (4), headerRows? (0), footerRows? (0), width?} — at the text insertion point",
-            has_text,
-            insert
-        ),
-        cmd!(
-            "table.convertFromText",
-            "Convert Text to Table",
-            ["Table"],
-            None,
-            "{columnSeparator?: tab|comma, width?: table width (default: the column)} — selected paragraphs become rows",
-            has_text,
-            convert_from_text
-        ),
-        cmd!(
-            "table.convertToText",
-            "Convert Table to Text",
-            ["Table"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — cells separated by tabs, rows by paragraphs",
-            in_table,
-            convert_to_text
-        ),
-        cmd!(
-            "table.insertRow",
-            "Insert Row",
-            [],
-            None,
-            "{where?: above|below, count? (1), story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            |s, p| insert_row(s, p, None)
-        ),
-        cmd!(
-            "table.insertRowAbove",
-            "Insert Row Above",
-            ["Table", "Insert"],
-            None,
-            "{count?, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            |s, p| insert_row(s, p, Some(true))
-        ),
-        cmd!(
-            "table.insertRowBelow",
-            "Insert Row Below",
-            ["Table", "Insert"],
-            None,
-            "{count?, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            |s, p| insert_row(s, p, Some(false))
-        ),
-        cmd!(
-            "table.insertColumn",
-            "Insert Column",
-            [],
-            None,
-            "{where?: left|right, count? (1), width?, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            |s, p| insert_col(s, p, None)
-        ),
-        cmd!(
-            "table.insertColumnLeft",
-            "Insert Column Left",
-            ["Table", "Insert"],
-            None,
-            "{count?, width?, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            |s, p| insert_col(s, p, Some(true))
-        ),
-        cmd!(
-            "table.insertColumnRight",
-            "Insert Column Right",
-            ["Table", "Insert"],
-            None,
-            "{count?, width?, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            |s, p| insert_col(s, p, Some(false))
-        ),
-        cmd!(
-            "table.deleteRow",
-            "Delete Row",
-            ["Table", "Delete"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — the rows of the target cells",
-            in_table,
-            delete_rows
-        ),
-        cmd!(
-            "table.deleteColumn",
-            "Delete Column",
-            ["Table", "Delete"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — the columns of the target cells",
-            in_table,
-            delete_cols
-        ),
-        cmd!(
-            "table.delete",
-            "Delete Table",
-            ["Table", "Delete"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            delete_table
-        ),
-        cmd!(
-            "table.merge",
-            "Merge Cells",
-            ["Table"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — merge the target cell range",
-            in_table,
-            merge
-        ),
-        cmd!(
-            "table.dropCells",
-            "Drag Rows or Columns",
-            [],
-            None,
-            "{frame, from: [x, y], to: [x, y]} — selected whole rows (or columns) dragged from `from` move to the row (column) at `to`; otherwise a text drag",
-            has_doc,
-            drop_cells
-        ),
-        cmd!(
-            "table.placeGraphic",
-            "Convert Cell to Graphic Cell",
-            ["Table", "Convert Cell Type"],
-            None,
-            "{path? | base64?, name?: with base64, fit?: proportional|fill (default proportional), story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — an image in the target cell (its text is kept but hidden)",
-            in_table,
-            place_graphic
-        ),
-        cmd!(
-            "table.textCell",
-            "Convert Cell to Text Cell",
-            ["Table", "Convert Cell Type"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — drop the target cells' graphics",
-            in_table,
-            |s, p| {
-                let g = target(s, p, "table.textCell")?;
-                edit_table(s, &g, "table.textCell", |t| {
-                    for (r, c) in t.selected_owners(g.range) {
-                        if let Some(cell) = t.cell_mut(r, c) {
-                            cell.graphic = None;
-                        }
-                    }
-                    ok()
-                })
-            }
-        ),
-        cmd!(
-            "table.moveRow",
-            "Move Row",
-            [],
-            None,
-            "{from?, to, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} (0-based; from defaults to the target row) — like dragging a row",
-            in_table,
-            |s, p| move_rc(s, p, true)
-        ),
-        cmd!(
-            "table.moveColumn",
-            "Move Column",
-            [],
-            None,
-            "{from?, to, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} (0-based; from defaults to the target column)",
-            in_table,
-            |s, p| move_rc(s, p, false)
-        ),
-        cmd!(
-            "table.sortRows",
-            "Sort",
-            ["Table"],
-            None,
-            "{column?: 0-based (default: the target cell's), descending?: bool, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — body rows by that column's text (numbers numerically)",
-            in_table,
-            sort_rows
-        ),
-        cmd!(
-            "table.unmerge",
-            "Unmerge Cells",
-            ["Table"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            unmerge
-        ),
-        cmd!(
-            "table.splitHorizontally",
-            "Split Cell Horizontally",
-            ["Table"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — each target cell becomes two, one above the other",
-            in_table,
-            |s, p| split(s, p, true)
-        ),
-        cmd!(
-            "table.splitVertically",
-            "Split Cell Vertically",
-            ["Table"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — each target cell becomes two, side by side",
-            in_table,
-            |s, p| split(s, p, false)
-        ),
-        cmd!(
-            "table.setCell",
-            "Cell Options",
-            [],
-            None,
-            "{fill?: swatch, tint?: 0..1, insets?: n | [t,l,b,r], vj? | verticalJustification?: top|center|bottom|justify, firstBaseline?: ascent|capHeight|leading|xHeight|fixed|emboxHeight, firstBaselineMin?: pt, rotation?: 0|90|180|270 (Cell Options › Text › Rotation; kept and written back to IDML, composed horizontally for now), text?, stroke?: {weight?, color?: swatch, tint?: 0..1, type?: solid|dashed|dotted|thickThin|thinThick|thinThin|thickThick|thinThickThin|thickThinThick|wavy|hashed | {kind:…}, gapColor?: swatch, gapTint?: 0..1, edges?: name | [names] (all|outer|inner|top|left|bottom|right|innerHorizontal|innerVertical; default all)}, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — top/left/bottom/right are the target range's outer sides, innerHorizontal/innerVertical the lines between its rows/columns",
-            in_table,
-            set_cell
-        ),
-        cmd!(
-            query "table.getCellStroke",
-            "Get Cell Stroke",
-            [],
-            None,
-            "{story?, table?, rows?, cols?, edges?} → {weight, color, tint, type, gapColor, gapTint, fill, fillTint, edges: count} of the chosen edges of the target cells; a value that differs between them is null",
-            in_table_or_ids,
-            get_cell_stroke
-        ),
-        cmd!(
-            "table.setRowHeight",
-            "Row Height",
-            [],
-            None,
-            "{height, mode?: atLeast|exactly, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            set_row_height
-        ),
-        cmd!(
-            "table.setColumnWidth",
-            "Column Width",
-            [],
-            None,
-            "{width, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            set_col_width
-        ),
-        cmd!(
-            "table.resizeBorder",
-            "Resize Row or Column",
-            [],
-            None,
-            "{story?, table?, frame?, axis: column|row, index, delta? | size?, keepTableSize?: bool} — moves the border after column/row `index` by `delta` (or makes that column/row `size` wide/high); later columns/rows move along. The last index is the table's end/bottom edge. keepTableSize: on an inner border the next column/row gives or takes the change; on the edge all columns/rows scale proportionally. A dragged row becomes At Least. Refuses a locked `frame`",
-            in_table_or_ids,
-            resize_border
-        ),
-        cmd!(
-            "table.distributeColumns",
-            "Distribute Columns Evenly",
-            ["Table"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            distribute_cols
-        ),
-        cmd!(
-            "table.distributeRows",
-            "Distribute Rows Evenly",
-            ["Table"],
-            None,
-            "{story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?} — equal fixed heights preserving the selected rows' composed total height; may overset cell text; unmerge row-spanning cells first",
-            in_table,
-            distribute_rows
-        ),
-        cmd!(
-            "table.options",
-            "Table Options",
-            [],
-            None,
-            "{direction?: leftToRight|rightToLeft, border?: {weight?, color?, tint?, type?, gapColor?, gapTint?}, spaceBefore?, spaceAfter?, headerRows?, footerRows?, repeatHeader?, repeatFooter?, altRows?: {first, firstColor, firstTint, next, nextColor, nextTint, skipFirst, skipLast} | null, altCols?: … | null, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
-            in_table,
-            options
-        ),
-        cmd!(
-            "table.convertRowsToHeader",
-            "To Header",
-            ["Table", "Convert Rows"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — the target rows, at the top of the table or right after its header rows",
-            |s| can_convert_rows(s, RowKind::Header),
-            |s, p| convert_rows(s, p, RowKind::Header)
-        ),
-        cmd!(
-            "table.convertRowsToBody",
-            "To Body",
-            ["Table", "Convert Rows"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — the target header rows next to the body, footer rows next to it, or both",
-            |s| can_convert_rows(s, RowKind::Body),
-            |s, p| convert_rows(s, p, RowKind::Body)
-        ),
-        cmd!(
-            "table.convertRowsToFooter",
-            "To Footer",
-            ["Table", "Convert Rows"],
-            None,
-            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — the target rows, at the bottom of the table or right before its footer rows",
-            |s| can_convert_rows(s, RowKind::Footer),
-            |s, p| convert_rows(s, p, RowKind::Footer)
-        ),
-        cmd!(noundo "table.select", "Select Cells", [], None, "{story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?, what?: cell|row|column|table}", in_table_or_ids, select),
-        cmd!(noundo "table.selectTable", "Select Table", ["Table", "Select"], None, "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}", in_table, |s, p| {
-            select(s, &super::with_param(p, "what", json!("table")))
-        }),
-        cmd!(noundo "table.selectRow", "Select Row", ["Table", "Select"], None, "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}", in_table, |s, p| {
-            select(s, &super::with_param(p, "what", json!("row")))
-        }),
-        cmd!(noundo "table.selectColumn", "Select Column", ["Table", "Select"], None, "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}", in_table, |s, p| {
-            select(s, &super::with_param(p, "what", json!("column")))
-        }),
-        cmd!(noundo "table.nextCell", "Next Cell", [], None, "{}", in_cell, |s, _| step_cell(s, true)),
-        cmd!(noundo "table.prevCell", "Previous Cell", [], None, "{}", in_cell, |s, _| step_cell(s, false)),
-        cmd!(query "table.get", "Get Table", [], None, "{story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?} → rows, columns, cells (text, spans, fill), options", in_table_or_ids, get),
-    ]
-}
-
-// ---------- enablement and targeting ----------
-
-fn in_table(s: &Session) -> std::result::Result<(), String> {
-    has_doc(s)?;
-    let st = s.active().ok_or("no document open")?;
-    if st.selection.cells.is_some() || st.selection.text.is_some_and(|t| t.cell.is_some()) {
-        return Ok(());
-    }
-    if let Some(t) = st.selection.text
-        && st.doc.story(t.story).is_some_and(|x| x.table_at(t.focus).is_some())
-    {
-        return Ok(());
-    }
-    Err("place the insertion point in a table".into())
-}
-
-fn in_table_or_ids(s: &Session) -> std::result::Result<(), String> {
-    has_doc(s)
-}
-
-fn in_cell(s: &Session) -> std::result::Result<(), String> {
-    has_doc(s)?;
-    if s.active().is_some_and(|d| d.selection.text.is_some_and(|t| t.cell.is_some())) { Ok(()) } else { Err("not in a table cell".into()) }
-}
-
-/// The table a command acts on and its target cell range.
-struct Tgt {
-    story: StoryId,
-    table: u64,
-    range: CellRange,
-}
-
-fn find_table(doc: &Document, id: u64) -> Option<StoryId> {
-    doc.stories.iter().find(|(_, s)| s.tables.contains_key(&id)).map(|(k, _)| *k)
-}
-
-fn pair(p: &Value, many: &str, one: &str) -> Option<(usize, usize)> {
-    if let Some(a) = p.get(many).and_then(Value::as_array) {
-        let a0 = a.first()?.as_u64()? as usize;
-        let a1 = a.get(1).and_then(Value::as_u64).map_or(a0, |v| v as usize);
-        return Some((a0.min(a1), a0.max(a1)));
-    }
-    p.get(one).and_then(Value::as_u64).map(|v| (v as usize, v as usize))
-}
-
-fn target(s: &Session, p: &Value, cmd: &str) -> Result<Tgt> {
-    let st = s.doc()?;
-    let doc = &st.doc;
-    let explicit_table = p.get("table").and_then(Value::as_u64);
-    let explicit_story = p.get("story").and_then(Value::as_u64).map(StoryId);
-    let (story, table, range) = if let Some(tid) = explicit_table {
-        let sid = explicit_story.or_else(|| find_table(doc, tid)).ok_or_else(|| bad(cmd, format!("no table {tid}")))?;
-        (sid, tid, None)
-    } else if let Some(c) = st.selection.cells {
-        (c.story, c.table, Some(c.range))
-    } else if let Some(t) = st.selection.text {
-        match t.cell {
-            Some(c) => (t.story, c.table, Some(CellRange::cell(c.row, c.col))),
-            None => {
-                let tid = doc.story(t.story).and_then(|x| x.table_at(t.focus)).ok_or_else(|| bad(cmd, "the insertion point is not in a table"))?;
-                (t.story, tid, None)
-            }
-        }
-    } else {
-        return Err(bad(cmd, "place the insertion point in a table"));
-    };
-    let t = doc.story(story).and_then(|x| x.tables.get(&table)).ok_or_else(|| bad(cmd, format!("no table {table}")))?;
-    let (nr, nc) = (t.nrows(), t.ncols());
-    let mut range = range.unwrap_or(CellRange { r0: 0, c0: 0, r1: nr - 1, c1: nc - 1 });
-    if let Some((a, b)) = pair(p, "rows", "row") {
-        range.r0 = a;
-        range.r1 = b;
-    }
-    if let Some((a, b)) = pair(p, "cols", "col") {
-        range.c0 = a;
-        range.c1 = b;
-    }
-    if range.r1 >= nr || range.c1 >= nc {
-        return Err(bad(cmd, format!("cell range out of bounds ({nr}×{nc} table)")));
-    }
-    Ok(Tgt { story, table, range })
-}
-
-/// Edit the target table; afterwards selections pointing into it are clamped to its new shape.
-fn edit_table<T>(s: &mut Session, g: &Tgt, cmd: &str, f: impl FnOnce(&mut Table) -> Result<T>) -> Result<T> {
-    let cmd = cmd.to_string();
-    s.edit(|d, sel| {
-        let st = d.story_mut(g.story).ok_or_else(|| bad(&cmd, "no story"))?;
-        let t = st.table_mut(g.table).ok_or_else(|| bad(&cmd, "no table"))?;
-        let r = f(t)?;
-        clamp_selection(d, sel);
-        Ok(r)
-    })
-}
-
-/// Keep text/cell selections valid after the table changed shape (or disappeared).
-fn clamp_selection(d: &Document, sel: &mut Selection) {
-    if let Some(ts) = sel.cells {
-        match d.story(ts.story).and_then(|x| x.tables.get(&ts.table)) {
-            Some(t) => {
-                let (mr, mc) = (t.nrows() - 1, t.ncols() - 1);
-                let r = ts.range;
-                sel.cells = Some(TableSel { range: CellRange::new(r.r0.min(mr), r.c0.min(mc), r.r1.min(mr), r.c1.min(mc)), ..ts });
-            }
-            None => sel.cells = None,
-        }
-    }
-    if let Some(t) = sel.text
-        && let Some(c) = t.cell
-    {
-        let story = d.story(t.story);
-        match story.and_then(|x| x.tables.get(&c.table)) {
-            Some(tb) => {
-                let (r, col) = tb.owner(c.row.min(tb.nrows() - 1), c.col.min(tb.ncols() - 1));
-                let text = tb.cell(r, col).map_or("", |x| x.text.text.as_str());
-                sel.text = Some(TextSel {
-                    anchor: floor_char_boundary(text, t.anchor),
-                    focus: floor_char_boundary(text, t.focus),
-                    cell: Some(CellAddr { table: c.table, row: r, col }),
-                    ..t
-                });
-            }
-            None => {
-                let pos = story.map_or(0, |x| floor_char_boundary(&x.text, t.anchor));
-                sel.text = Some(TextSel { anchor: pos, focus: pos, cell: None, ..t });
-            }
-        }
-    }
-}
-
-fn count(p: &Value) -> usize {
-    p.get("count").and_then(Value::as_u64).unwrap_or(1).clamp(1, 1000) as usize
-}
-
-fn color_param(p: &Value, key: &str) -> Option<String> {
-    str_param(p, key).map(str::to_string)
-}
-
-// ---------- create / convert ----------
-
-/// Width of the text column at the caret (the new table spans it).
-fn column_width(s: &Session, t: &TextSel) -> f64 {
-    let Some(st) = s.active() else { return 300.0 };
-    let specs = compose::frame_specs(&st.doc, t.story);
-    let spec = t.frame.and_then(|f| specs.iter().find(|x| x.id == f)).or(specs.first());
-    spec.and_then(|f| f.columns().first().map(|c| c.width())).unwrap_or(300.0)
-}
-
-/// The direction of the paragraph at `offset` in `story`, as composition resolves it (its style
-/// chain, then local overrides). A table created there takes it.
-fn para_direction(d: &Document, story: StoryId, offset: usize) -> designcraft_doc::TextDirection {
-    d.story(story)
-        .and_then(|st| st.paras.get(st.para_at(offset)))
-        .map_or(designcraft_doc::TextDirection::LeftToRight, |pf| d.styles.resolve_para(pf).0.direction)
-}
-
-fn insert(s: &mut Session, p: &Value) -> Result<Value> {
-    let t = s.doc()?.selection.text.ok_or_else(|| bad("table.insert", "no insertion point"))?;
-    if t.cell.is_some() {
-        return Err(bad("table.insert", "tables can't be nested in cells"));
-    }
-    let rows = p.get("rows").and_then(Value::as_u64).unwrap_or(4).clamp(1, 500) as usize;
-    let cols = p.get("cols").or_else(|| p.get("columns")).and_then(Value::as_u64).unwrap_or(4).clamp(1, 200) as usize;
-    let header = p.get("headerRows").and_then(Value::as_u64).unwrap_or(0).min(100) as usize;
-    let footer = p.get("footerRows").and_then(Value::as_u64).unwrap_or(0).min(100) as usize;
-    let width = p.get("width").and_then(Value::as_f64).unwrap_or_else(|| column_width(s, &t));
-    s.edit(|d, sel| {
-        let id = d.alloc();
-        let mut table = Table::new(id, rows, cols, header, footer, width);
-        table.options.direction = para_direction(d, t.story, t.range().start);
-        let st = d.story_mut(t.story).ok_or_else(|| bad("table.insert", "no story"))?;
-        // Cells start with the paragraph format at the caret.
-        let pf = st.paras[st.para_at(t.range().start)].clone();
-        let cf = st.char_format_at(t.range().start).clone();
-        for c in &mut table.cells {
-            c.text.paras[0] = designcraft_doc::ParaFormat { table: None, ..pf.clone() };
-            c.text.chars[0].format = cf.clone();
-        }
-        let r = t.range();
-        st.delete(r.clone());
-        st.insert_table(r.start, table);
-        *sel = Selection::text(TextSel { story: t.story, anchor: 0, focus: 0, frame: t.frame, cell: Some(CellAddr { table: id, row: 0, col: 0 }) });
-        Ok(json!({"story": t.story.0, "table": id}))
-    })
-}
-
-fn convert_from_text(s: &mut Session, p: &Value) -> Result<Value> {
-    let t = s.doc()?.selection.text.ok_or_else(|| bad("table.convertFromText", "no text selected"))?;
-    if t.cell.is_some() {
-        return Err(bad("table.convertFromText", "select text outside tables"));
-    }
-    let sep = if str_param(p, "columnSeparator") == Some("comma") { ',' } else { '\t' };
-    let width = p.get("width").and_then(Value::as_f64).unwrap_or_else(|| column_width(s, &t));
-    s.edit(|d, sel| {
-        let id = d.alloc();
-        let direction = para_direction(d, t.story, t.range().start);
-        let st = d.story_mut(t.story).ok_or_else(|| bad("table.convertFromText", "no story"))?;
-        let ranges = st.para_ranges();
-        let (pa, pb) = (st.para_at(t.range().start), st.para_at(t.range().end));
-        if (pa..=pb).any(|i| st.paras[i].table.is_some()) {
-            return Err(bad("table.convertFromText", "the selection contains a table"));
-        }
-        let (a, b) = (ranges[pa].start, ranges[pb].end);
-        let data: Vec<Vec<String>> = st.text[a..b].split('\n').map(|line| line.split(sep).map(|c| c.trim().to_string()).collect()).collect();
-        let pf = st.paras[pa].clone();
-        let cf = st.format_after(a).clone();
-        let mut table = Table::from_strings(id, &data, width, &pf, &cf);
-        table.options.direction = direction;
-        st.delete(a..b);
-        let anchor = st.insert_table(a, table);
-        *sel = Selection::text(TextSel::caret(t.story, anchor));
-        Ok(json!({"table": id, "rows": data.len()}))
-    })
-}
-
-fn convert_to_text(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.convertToText")?;
-    s.edit(|d, sel| {
-        let st = d.story_mut(g.story).ok_or_else(|| bad("table.convertToText", "no story"))?;
-        let text = st.tables.get(&g.table).map(|t| t.plain_text()).unwrap_or_default();
-        let a = st.table_anchor(g.table).ok_or_else(|| bad("table.convertToText", "no anchor"))?;
-        st.replace(a..a + designcraft_doc::TABLE_ANCHOR.len_utf8(), &text);
-        *sel = Selection::text(TextSel::caret(g.story, a + text.len()));
-        ok()
-    })
-}
-
-fn delete_table(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.delete")?;
-    s.edit(|d, sel| {
-        let st = d.story_mut(g.story).ok_or_else(|| bad("table.delete", "no story"))?;
-        let a = st.table_anchor(g.table).ok_or_else(|| bad("table.delete", "no anchor"))?;
-        // Remove the anchor paragraph (with one separator) so no empty paragraph is left behind.
-        let end = a + designcraft_doc::TABLE_ANCHOR.len_utf8();
-        let r = if &st.text[end..] == "\n" && a > 0 && st.text[..a].ends_with('\n') {
-            // Inserted at the end of the story: remove the empty paragraph after it too.
-            a - 1..end + 1
-        } else if st.text[end..].starts_with('\n') {
-            a..end + 1
-        } else if a > 0 && st.text[..a].ends_with('\n') {
-            a - 1..end
-        } else {
-            a..end
-        };
-        st.delete(r.clone());
-        *sel = Selection::text(TextSel::caret(g.story, r.start.min(st.len())));
-        ok()
-    })
-}
-
-// ---------- rows and columns ----------
-
-fn insert_row(s: &mut Session, p: &Value, above: Option<bool>) -> Result<Value> {
-    let g = target(s, p, "table.insertRow")?;
-    let above = above.unwrap_or(str_param(p, "where") == Some("above"));
-    let n = count(p);
-    let at = if above { g.range.r0 } else { g.range.r1 + 1 };
-    let r = edit_table(s, &g, "table.insertRow", |t| {
-        t.insert_rows(at, n);
-        Ok(json!({"rows": t.nrows()}))
-    })?;
-    shift_selection(s, g.table, at, n, true);
-    Ok(r)
-}
-
-/// After inserting rows/columns at `at`, selections at or after it follow their cells.
-fn shift_selection(s: &mut Session, table: u64, at: usize, n: usize, rows: bool) {
-    let Ok(st) = s.doc_mut() else { return };
-    if let Some(t) = st.selection.text.as_mut()
-        && let Some(c) = t.cell.as_mut()
-        && c.table == table
-    {
-        let v = if rows { &mut c.row } else { &mut c.col };
-        if *v >= at {
-            *v += n;
-        }
-    }
-    if let Some(ts) = st.selection.cells.as_mut()
-        && ts.table == table
-    {
-        let (a, b) = if rows { (&mut ts.range.r0, &mut ts.range.r1) } else { (&mut ts.range.c0, &mut ts.range.c1) };
-        if *a >= at {
-            *a += n;
-        }
-        if *b >= at {
-            *b += n;
-        }
-    }
-}
-
-fn insert_col(s: &mut Session, p: &Value, left: Option<bool>) -> Result<Value> {
-    let g = target(s, p, "table.insertColumn")?;
-    let left = left.unwrap_or(str_param(p, "where") == Some("left"));
-    let rtl = s
-        .doc()?
-        .doc
-        .story(g.story)
-        .and_then(|st| st.tables.get(&g.table))
-        .is_some_and(|t| t.options.direction == designcraft_doc::TextDirection::RightToLeft);
-    let n = count(p);
-    let at = if left != rtl { g.range.c0 } else { g.range.c1 + 1 };
-    let width = p.get("width").and_then(Value::as_f64);
-    let r = edit_table(s, &g, "table.insertColumn", |t| {
-        let w = width.unwrap_or_else(|| t.columns[g.range.c0.min(t.ncols() - 1)].width);
-        t.insert_cols(at, n, w);
-        Ok(json!({"columns": t.ncols()}))
-    })?;
-    shift_selection(s, g.table, at, n, false);
-    Ok(r)
-}
-
-fn delete_rows(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.deleteRow")?;
-    let all = s.doc()?.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).is_some_and(|t| g.range.r0 == 0 && g.range.r1 + 1 >= t.nrows());
-    if all {
-        return delete_table(s, p);
-    }
-    edit_table(s, &g, "table.deleteRow", |t| {
-        t.delete_rows(g.range.r0, g.range.r1 - g.range.r0 + 1);
-        Ok(json!({"rows": t.nrows()}))
-    })
-}
-
-fn delete_cols(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.deleteColumn")?;
-    let all = s.doc()?.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).is_some_and(|t| g.range.c0 == 0 && g.range.c1 + 1 >= t.ncols());
-    if all {
-        return delete_table(s, p);
-    }
-    edit_table(s, &g, "table.deleteColumn", |t| {
-        t.delete_cols(g.range.c0, g.range.c1 - g.range.c0 + 1);
-        Ok(json!({"columns": t.ncols()}))
-    })
-}
-
-fn merge(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.merge")?;
-    let r = edit_table(s, &g, "table.merge", |t| {
-        t.merge(g.range).map_err(|e| bad("table.merge", e))?;
-        Ok(t.expand_range(g.range))
-    })?;
-    // The caret goes to the merged cell.
-    let st = s.doc_mut()?;
-    st.selection = Selection::text(TextSel {
-        story: g.story,
-        anchor: 0,
-        focus: 0,
-        frame: st.selection.text.and_then(|t| t.frame),
-        cell: Some(CellAddr { table: g.table, row: r.r0, col: r.c0 }),
-    });
-    ok()
-}
-
-fn split(s: &mut Session, p: &Value, horizontal: bool) -> Result<Value> {
-    let g = target(s, p, "table.split")?;
-    edit_table(s, &g, "table.split", |t| {
-        t.split_cells(g.range, horizontal).map_err(|e| bad("table.split", e))?;
-        Ok(json!({"rows": t.nrows(), "cols": t.ncols()}))
-    })
-}
-
-fn unmerge(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.unmerge")?;
-    edit_table(s, &g, "table.unmerge", |t| {
-        for r in g.range.r0..=g.range.r1 {
-            for c in g.range.c0..=g.range.c1 {
-                t.unmerge(r, c);
-            }
-        }
-        ok()
-    })
-}
-
-/// Cell edges chosen for a stroke edit: the target range's four outer sides (physical left and
-/// right) and the lines between its rows and columns.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-struct EdgeSel {
-    top: bool,
-    left: bool,
-    bottom: bool,
-    right: bool,
-    inner_h: bool,
-    inner_v: bool,
-}
-
-impl EdgeSel {
-    const ALL: EdgeSel = EdgeSel { top: true, left: true, bottom: true, right: true, inner_h: true, inner_v: true };
-
-    fn parse(v: Option<&Value>, cmd: &str) -> Result<EdgeSel> {
-        let names: Vec<&Value> = match v {
-            None | Some(Value::Null) => return Ok(EdgeSel::ALL),
-            Some(Value::Array(a)) => a.iter().collect(),
-            Some(v) => vec![v],
-        };
-        let mut e = EdgeSel::default();
-        for n in names {
-            match n.as_str() {
-                Some("all") => e = EdgeSel::ALL,
-                Some("outer") => (e.top, e.left, e.bottom, e.right) = (true, true, true, true),
-                Some("inner") => (e.inner_h, e.inner_v) = (true, true),
-                Some("top") => e.top = true,
-                Some("left") => e.left = true,
-                Some("bottom") => e.bottom = true,
-                Some("right") => e.right = true,
-                Some("innerHorizontal") => e.inner_h = true,
-                Some("innerVertical") => e.inner_v = true,
-                _ => return Err(bad(cmd, format!("unknown edge {n}; use all|outer|inner|top|left|bottom|right|innerHorizontal|innerVertical"))),
-            }
-        }
-        if e == EdgeSel::default() {
-            return Err(bad(cmd, "no edges chosen"));
-        }
-        Ok(e)
-    }
-
-    /// Which sides (top, left, bottom, right) of the cell at `(r, c)` with `spans` are chosen
-    /// within `rg`. Left and right are physical sides, also in RTL tables.
-    fn sides(&self, rg: CellRange, (r, c): (usize, usize), spans: (u32, u32), rtl: bool) -> [bool; 4] {
-        let last_row = r.saturating_add((spans.0.max(1) - 1) as usize);
-        let last_col = c.saturating_add((spans.1.max(1) - 1) as usize);
-        let (start, end) = (c <= rg.c0, last_col >= rg.c1);
-        let (left_outer, right_outer) = if rtl { (end, start) } else { (start, end) };
-        [
-            if r <= rg.r0 { self.top } else { self.inner_h },
-            if left_outer { self.left } else { self.inner_v },
-            if last_row >= rg.r1 { self.bottom } else { self.inner_h },
-            if right_outer { self.right } else { self.inner_v },
-        ]
-    }
-}
-
-/// A finite number in `lo..=hi`, or an error naming `key`.
-fn num_in(v: &Value, key: &str, lo: f64, hi: f64, cmd: &str) -> Result<Option<f64>> {
-    match v.get(key) {
-        None | Some(Value::Null) => Ok(None),
-        Some(x) => match x.as_f64() {
-            Some(n) if n.is_finite() && (lo..=hi).contains(&n) => Ok(Some(n)),
-            _ => Err(bad(cmd, format!("{key} must be a number from {lo} to {hi}"))),
-        },
-    }
-}
-
-/// A swatch of the document (or [None]), or an error naming `key`.
-fn swatch_in(doc: &Document, v: &Value, keys: &[&str], cmd: &str) -> Result<Option<String>> {
-    let Some((key, x)) = keys.iter().find_map(|k| v.get(*k).filter(|x| !x.is_null()).map(|x| (*k, x))) else { return Ok(None) };
-    let name = x.as_str().ok_or_else(|| bad(cmd, format!("{key} must be a swatch name")))?;
-    if name != designcraft_color::swatch::NONE && doc.swatch(name).is_none() {
-        return Err(bad(cmd, format!("no swatch `{name}`")));
-    }
-    Ok(Some(name.to_string()))
-}
-
-/// The cell stroke type names of `type`.
-const CELL_STROKE_TYPES: &[&str] =
-    &["solid", "dashed", "dotted", "thickThin", "thinThick", "thinThin", "thickThick", "thinThickThin", "thickThinThick", "wavy", "hashed"];
-
-/// The attributes a stroke edit sets. A plain `"dashed"` gets a pattern scaled to the
-/// resulting weight of each edge.
-struct StrokeEdit {
-    attrs: designcraft_doc::CellStrokeAttrs,
-    scaled_dashes: bool,
-}
-
-impl StrokeEdit {
-    fn parse(doc: &Document, v: &Value, cmd: &str) -> Result<StrokeEdit> {
-        if !v.is_object() {
-            return Err(bad(cmd, "stroke must be an object"));
-        }
-        let mut attrs = designcraft_doc::CellStrokeAttrs {
-            weight: num_in(v, "weight", 0.0, 1000.0, cmd)?,
-            color: swatch_in(doc, v, &["color"], cmd)?,
-            tint: num_in(v, "tint", 0.0, 1.0, cmd)?.map(|t| t as f32),
-            gap_color: swatch_in(doc, v, &["gapColor", "gapSwatch"], cmd)?,
-            gap_tint: num_in(v, "gapTint", 0.0, 1.0, cmd)?.map(|t| t as f32),
-            kind: None,
-        };
-        let mut scaled_dashes = false;
-        match v.get("type") {
-            None | Some(Value::Null) => {}
-            Some(Value::String(name)) if name == "dashed" => {
-                scaled_dashes = true;
-                attrs.kind = Some(StrokeType::Dashed { pattern: Vec::new() });
-            }
-            Some(Value::String(name)) if CELL_STROKE_TYPES.contains(&name.as_str()) => {
-                attrs.kind = Some(serde_json::from_value(json!({"kind": name})).map_err(|e| bad(cmd, e.to_string()))?);
-            }
-            Some(t @ Value::Object(_)) => {
-                let kind: StrokeType = serde_json::from_value(t.clone()).map_err(|e| bad(cmd, format!("bad stroke type: {e}")))?;
-                let finite = |v: &[f64]| v.len() <= 64 && v.iter().all(|x| x.is_finite() && *x >= 0.0);
-                match &kind {
-                    StrokeType::Dashed { pattern } if !StrokeType::valid_dash_pattern(pattern) => {
-                        return Err(bad(cmd, "a dash pattern needs 1 to 64 lengths, each 0 or 0.1 to 10000 pt, not all 0"));
-                    }
-                    StrokeType::Stripes { bands } if bands.len() > 64 || !bands.iter().all(|(a, b)| finite(&[*a, *b])) => {
-                        return Err(bad(cmd, "stripes need up to 64 bands of non-negative numbers"));
-                    }
-                    StrokeType::Style { name } if !doc.stroke_styles.iter().any(|s| s.name == *name) => {
-                        return Err(bad(cmd, format!("no stroke style `{name}`")));
-                    }
-                    _ => {}
-                }
-                attrs.kind = Some(kind);
-            }
-            Some(other) => return Err(bad(cmd, format!("unknown stroke type {other}"))),
-        }
-        Ok(StrokeEdit { attrs, scaled_dashes })
-    }
-
-    fn apply(&self, mut base: CellStroke) -> CellStroke {
-        self.attrs.apply_to(&mut base);
-        if self.scaled_dashes {
-            let w = base.weight.max(1.0);
-            base.kind = StrokeType::Dashed { pattern: vec![w * 3.0, w * 2.0] };
-        }
-        base
-    }
-}
-
-/// The stroke drawn on side `side` of the owner cell at `(r, c)` (where that side meets its
-/// first neighbour), as rendering resolves it; the cell's own copy if the side has no stretch.
-fn drawn_side(t: &Table, owners: &[(usize, usize)], (r, c): (usize, usize), side: usize) -> Option<CellStroke> {
-    let drawn = compose::table::cell_side_strokes(t, owners, (r, c), side).first().map(|s| s.stroke.clone());
-    drawn.or_else(|| t.cell(r, c).and_then(|cell| cell.strokes.get(side).cloned()))
-}
-
-/// Cell Options › Text › First Baseline: `firstBaseline` (offset method) and `firstBaselineMin` (pt).
-fn first_baseline_params(p: &Value, id: &str) -> Result<(Option<designcraft_doc::FirstBaseline>, Option<f64>)> {
-    let fb = match p.get("firstBaseline").filter(|v| !v.is_null()) {
-        Some(v) => Some(serde_json::from_value(v.clone()).map_err(|e| bad(id, format!("firstBaseline: {e}")))?),
-        None => None,
-    };
-    let min = match p.get("firstBaselineMin").filter(|v| !v.is_null()) {
-        Some(v) => match v.as_f64().filter(|m| m.is_finite() && (0.0..=8640.0).contains(m)) {
-            Some(m) => Some(m),
-            None => return Err(bad(id, "firstBaselineMin: a number of points from 0 to 8640")),
-        },
-        None => None,
-    };
-    Ok((fb, min))
-}
-
-fn set_cell(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "table.setCell";
-    let g = target(s, p, ID)?;
-    let doc = &s.doc()?.doc;
-    let fill = swatch_in(doc, p, &["fill"], ID)?;
-    let tint = num_in(p, "tint", 0.0, 1.0, ID)?.map(|t| t as f32);
-    let insets: Option<[f64; 4]> = match p.get("insets") {
-        Some(Value::Number(n)) => n.as_f64().map(|v| [v.max(0.0); 4]),
-        Some(Value::Array(a)) if a.len() == 4 => {
-            let v: Vec<f64> = a.iter().map(|x| x.as_f64().unwrap_or(0.0).max(0.0)).collect();
-            Some([v[0], v[1], v[2], v[3]])
-        }
-        _ => None,
-    };
-    let vj = match str_param(p, "vj").or_else(|| str_param(p, "verticalJustification")) {
-        Some("top") => Some(VerticalJustification::Top),
-        Some("center") => Some(VerticalJustification::Center),
-        Some("bottom") => Some(VerticalJustification::Bottom),
-        Some("justify") => Some(VerticalJustification::Justify),
-        Some(o) => return Err(bad(ID, format!("unknown vj `{o}`"))),
-        None => None,
-    };
-    let (first_baseline, first_baseline_min) = first_baseline_params(p, ID)?;
-    // Cell Options › Text › Rotation. The value is kept and written back to IDML; only 0 is
-    // composed so far, which the IDML import reports (#1468).
-    let rotation = match p.get("rotation").filter(|v| !v.is_null()) {
-        Some(v) => match v.as_f64().map(|d| d.rem_euclid(360.0)) {
-            Some(d) if d == 0.0 || d == 90.0 || d == 180.0 || d == 270.0 => Some(d),
-            _ => return Err(bad(ID, "rotation: 0, 90, 180 or 270 degrees")),
-        },
-        None => None,
-    };
-    let text = str_param(p, "text").map(|_| super::text_param(p, "text"));
-    let stroke = match p.get("stroke").filter(|v| !v.is_null()) {
-        Some(sv) => Some((StrokeEdit::parse(doc, sv, ID)?, EdgeSel::parse(sv.get("edges"), ID)?)),
-        None => None,
-    };
-    edit_table(s, &g, ID, |t| {
-        let owners = t.owners();
-        let nc = t.ncols();
-        let nr = t.nrows();
-        let rtl = t.options.direction == designcraft_doc::TextDirection::RightToLeft;
-        // Local edits outrank previously imported edges, including explicit zero/None.
-        let priority = if stroke.is_some() { next_cell_stroke_priority(t) } else { 0 };
-        let rg = g.range;
-        // Edges are inner or outer within the selection grown to whole merged cells, so a
-        // merged cell selected through one of its grid positions keeps its own outline.
-        let outline = t.expand_range(rg);
-        // Each chosen edge starts from the stroke drawn there, which both copies of a shared
-        // edge then take, so the edit changes only the attributes it names.
-        let mut bases = std::collections::HashMap::new();
-        if let Some((_, edges)) = &stroke {
-            for (r, c) in t.selected_owners(rg) {
-                let Some(cell) = t.cell(r, c) else { continue };
-                for (i, on) in edges.sides(outline, (r, c), (cell.row_span, cell.col_span), rtl).into_iter().enumerate() {
-                    if let Some(base) = drawn_side(t, &owners, (r, c), i).filter(|_| on) {
-                        bases.insert((r, c, i), base);
-                    }
-                }
-            }
-        }
-        let mut edited = std::collections::HashSet::new();
-        for (r, c) in t.selected_owners(rg) {
-            let Some(cell) = t.cell_mut(r, c) else { continue };
-            if let Some(f) = &fill {
-                cell.fill = f.clone();
-            }
-            if let Some(ti) = tint {
-                cell.fill_tint = ti;
-            }
-            if let Some(i) = insets {
-                cell.insets = i;
-            }
-            if let Some(v) = vj {
-                cell.vj = v;
-            }
-            if let Some(v) = first_baseline {
-                cell.first_baseline = v;
-            }
-            if let Some(v) = first_baseline_min {
-                cell.first_baseline_min = v;
-            }
-            if let Some(v) = rotation {
-                cell.rotation = v;
-            }
-            if let Some(tx) = &text {
-                let len = cell.text.len();
-                cell.text.replace(0..len, tx);
-            }
-            if let Some((edit, _)) = &stroke {
-                for i in 0..4 {
-                    if let Some(base) = bases.remove(&(r, c, i)) {
-                        edited.insert((r, c, i));
-                        cell.strokes[i] = edit.apply(base);
-                        cell.stroke_defined[i] = true;
-                        cell.stroke_priorities[i] = priority;
-                        cell.border_overrides[i] = true;
-                    }
-                }
-            }
-        }
-        // Keep both copies of unmerged shared boundaries consistent: each edited edge is
-        // copied to its neighbour. Left/right name physical sides, also in RTL tables.
-        let mirror = |t: &mut Table, from: (usize, usize), edge: usize, to: (usize, usize), opposite: usize| {
-            if edited.contains(&(from.0, from.1, edge)) {
-                mirror_cell_edge(t, &owners, from, edge, to, opposite);
-            }
-        };
-        if let Some((_, edges)) = &stroke {
-            if edges.top
-                && let Some(row) = rg.r0.checked_sub(1)
-            {
-                for c in rg.c0..=rg.c1 {
-                    mirror(t, (rg.r0, c), 0, (row, c), 2);
-                }
-            }
-            if edges.bottom && rg.r1.saturating_add(1) < nr {
-                for c in rg.c0..=rg.c1 {
-                    mirror(t, (rg.r1, c), 2, (rg.r1 + 1, c), 0);
-                }
-            }
-            if (if rtl { edges.right } else { edges.left })
-                && let Some(col) = rg.c0.checked_sub(1)
-            {
-                for r in rg.r0..=rg.r1 {
-                    mirror(t, (r, rg.c0), if rtl { 3 } else { 1 }, (r, col), if rtl { 1 } else { 3 });
-                }
-            }
-            if (if rtl { edges.left } else { edges.right }) && rg.c1.saturating_add(1) < nc {
-                for r in rg.r0..=rg.r1 {
-                    mirror(t, (r, rg.c1), if rtl { 1 } else { 3 }, (r, rg.c1 + 1), if rtl { 3 } else { 1 });
-                }
-            }
-        }
-        ok()
-    })
-}
-
-/// The shown stroke attributes of the chosen edges of the target cells, and their fill; values
-/// that differ are null.
-fn get_cell_stroke(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "table.getCellStroke";
-    let g = target(s, p, ID)?;
-    let edges = EdgeSel::parse(p.get("edges"), ID)?;
-    let st = s.doc()?;
-    let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or_else(|| bad(ID, "no table"))?;
-    let owners = t.owners();
-    let outline = t.expand_range(g.range);
-    let rtl = t.options.direction == designcraft_doc::TextDirection::RightToLeft;
-    // One value per key, or null once two edges (cells) disagree.
-    fn merge(slot: &mut Option<Value>, v: Value) {
-        match slot {
-            None => *slot = Some(v),
-            Some(cur) if *cur != v => *cur = Value::Null,
-            _ => {}
-        }
-    }
-    let keys = ["weight", "color", "tint", "type", "gapColor", "gapTint"];
-    let mut stroke: [Option<Value>; 6] = Default::default();
-    let (mut fill, mut fill_tint) = (None, None);
-    // Each drawn edge once: a shared edge is a side of both its cells.
-    let mut seen = std::collections::HashSet::new();
-    for (r, c) in t.selected_owners(g.range) {
-        let Some(cell) = t.cell(r, c) else { continue };
-        merge(&mut fill, json!(cell.fill));
-        merge(&mut fill_tint, json!(cell.fill_tint));
-        for (i, on) in edges.sides(outline, (r, c), (cell.row_span, cell.col_span), rtl).into_iter().enumerate() {
-            if !on {
-                continue;
-            }
-            for side in compose::table::cell_side_strokes(t, &owners, (r, c), i) {
-                let (x, y) = (Some((r, c)), side.neighbor);
-                if !seen.insert((i % 2, side.boundary, x.min(y), x.max(y))) {
-                    continue;
-                }
-                let e = side.stroke;
-                let values = [json!(e.weight), json!(e.color), json!(e.tint), json!(e.kind), json!(e.gap_color), json!(e.gap_tint)];
-                for (slot, v) in stroke.iter_mut().zip(values) {
-                    merge(slot, v);
-                }
-            }
-        }
-    }
-    let mut out = serde_json::Map::new();
-    for (k, v) in keys.iter().zip(stroke) {
-        out.insert((*k).into(), v.unwrap_or(Value::Null));
-    }
-    out.insert("fill".into(), fill.unwrap_or(Value::Null));
-    out.insert("fillTint".into(), fill_tint.unwrap_or(Value::Null));
-    out.insert("edges".into(), json!(seen.len()));
-    Ok(Value::Object(out))
-}
-
-/// Only saturation needs rebasing. Preserve every distinct priority's order and keep
-/// zero/negative priorities untouched; the work is bounded by the table's edges.
-fn next_cell_stroke_priority(t: &mut Table) -> i32 {
-    let highest = t.cells.iter().flat_map(|cell| cell.stroke_priorities).max().unwrap_or(0).max(0);
-    if highest < i32::MAX {
-        return highest + 1;
-    }
-    let values: std::collections::BTreeSet<_> = t.cells.iter().flat_map(|cell| cell.stroke_priorities).filter(|p| *p > 0).collect();
-    let mut ranks = std::collections::BTreeMap::new();
-    let mut highest = 0i32;
-    for value in values {
-        highest = highest.saturating_add(1);
-        ranks.insert(value, highest);
-    }
-    for cell in &mut t.cells {
-        for priority in &mut cell.stroke_priorities {
-            if let Some(rank) = ranks.get(priority) {
-                *priority = *rank;
-            }
-        }
-    }
-    highest.saturating_add(1)
-}
-
-fn mirror_cell_edge(t: &mut Table, owners: &[(usize, usize)], from: (usize, usize), edge: usize, to: (usize, usize), opposite: usize) {
-    let owner = |pos: (usize, usize)| owners.get(pos.0.checked_mul(t.ncols())?.checked_add(pos.1)?).copied();
-    if owner(from) != Some(from) || owner(to) != Some(to) {
-        return;
-    }
-    // A merged cell's edge may border several separately editable cells. Mirroring
-    // a segment onto that whole edge would change unselected neighbors; priorities
-    // instead resolve each segment without altering the merged cell's formatting.
-    let merged = |cell: &designcraft_doc::Cell| cell.row_span > 1 || cell.col_span > 1;
-    if t.cell(from.0, from.1).is_some_and(merged) || t.cell(to.0, to.1).is_some_and(merged) {
-        return;
-    }
-    let source = t
-        .cell(from.0, from.1)
-        .map(|cell| (cell.strokes[edge].clone(), cell.stroke_defined[edge], cell.stroke_priorities[edge], cell.border_overrides[edge]));
-    if let (Some((stroke, defined, priority, border_override)), Some(neighbor)) = (source, t.cell_mut(to.0, to.1)) {
-        neighbor.strokes[opposite] = stroke;
-        neighbor.stroke_defined[opposite] = defined;
-        neighbor.stroke_priorities[opposite] = priority;
-        neighbor.border_overrides[opposite] = border_override;
-    }
-}
-
-fn set_row_height(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.setRowHeight")?;
-    let h = p.get("height").and_then(Value::as_f64).map(|h| h.clamp(0.0, 10000.0));
-    let mode = match str_param(p, "mode") {
-        Some("exactly") => Some(RowHeightMode::Exactly),
-        Some("atLeast") => Some(RowHeightMode::AtLeast),
-        Some(o) => return Err(bad("table.setRowHeight", format!("unknown mode `{o}`"))),
-        None => None,
-    };
-    if h.is_none() && mode.is_none() {
-        return Err(bad("table.setRowHeight", "missing height"));
-    }
-    edit_table(s, &g, "table.setRowHeight", |t| {
-        for row in &mut t.rows[g.range.r0..=g.range.r1] {
-            if let Some(h) = h {
-                row.height = h;
-            }
-            if let Some(m) = mode {
-                row.mode = m;
-            }
-        }
-        ok()
-    })
-}
-
-fn set_col_width(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.setColumnWidth")?;
-    let w = p.get("width").and_then(Value::as_f64).ok_or_else(|| bad("table.setColumnWidth", "missing width"))?.clamp(3.0, 10000.0);
-    edit_table(s, &g, "table.setColumnWidth", |t| {
-        for c in &mut t.columns[g.range.c0..=g.range.c1] {
-            c.width = w;
-        }
-        ok()
-    })
-}
-
-/// Smallest column width and row height a border drag leaves.
-const MIN_TRACK: f64 = 3.0;
-const MAX_TRACK: f64 = 10000.0;
-
-/// Composed height of `row` (laid out from cells that span only that row), else its model height.
-fn composed_row_height(cs: &compose::ComposedStory, t: &Table, row: usize) -> Option<f64> {
-    let laid_out = cs
-        .frames
-        .iter()
-        .flat_map(|f| &f.tables)
-        .filter(|f| f.table == t.id)
-        .flat_map(|f| &f.cells)
-        .filter(|c| c.row == row && t.cell(c.row, c.col).is_some_and(|x| x.row_span <= 1))
-        .map(|c| c.rect.height())
-        .filter(|h| h.is_finite() && *h > 0.0)
-        .reduce(f64::max);
-    laid_out.or_else(|| t.rows.get(row).map(|r| r.height))
-}
-
-/// Move the border after `index` among `sizes` by `delta`. Returns the new sizes.
-fn resize_track(sizes: &[f64], index: usize, delta: f64, keep: bool) -> Option<Vec<f64>> {
-    let mut out = sizes.to_vec();
-    let cur = *sizes.get(index)?;
-    let last = index + 1 == sizes.len();
-    if keep && last {
-        // Scale every track so the table edge moves by `delta`.
-        let total: f64 = sizes.iter().sum();
-        let smallest = sizes.iter().copied().fold(f64::INFINITY, f64::min);
-        let largest = sizes.iter().copied().fold(0.0, f64::max);
-        if !(total > 0.0 && smallest > 0.0 && largest > 0.0) {
-            return None;
-        }
-        let lo = (MIN_TRACK / smallest).min(1.0);
-        let hi = (MAX_TRACK / largest).max(1.0);
-        let f = ((total + delta) / total).clamp(lo, hi);
-        out.iter_mut().for_each(|v| *v *= f);
-    } else if keep {
-        let next = *sizes.get(index + 1)?;
-        let pair = cur + next;
-        let a = (cur + delta).clamp(MIN_TRACK, (pair - MIN_TRACK).max(MIN_TRACK));
-        let [this, after] = out.get_mut(index..index + 2)? else { return None };
-        *this = a;
-        *after = (pair - a).max(MIN_TRACK);
-    } else {
-        *out.get_mut(index)? = (cur + delta).clamp(MIN_TRACK, MAX_TRACK);
-    }
-    out.iter().all(|v| v.is_finite()).then_some(out)
-}
-
-/// The frame a border drag names must hold the table's story and be editable.
-fn check_border_frame(st: &crate::DocState, p: &Value, story: designcraft_doc::StoryId) -> Result<()> {
-    const ID: &str = "table.resizeBorder";
-    if let Some(fid) = super::id_param(p, "frame") {
-        let it = st.doc.item(fid).ok_or_else(|| bad(ID, format!("no frame {}", fid.0)))?;
-        if it.text_frame().map(|f| f.story) != Some(story) {
-            return Err(bad(ID, "the table is not in that frame's story"));
-        }
-        if it.locked || st.doc.layer(it.layer).is_some_and(|l| l.locked) {
-            return Err(bad(ID, "the frame or its layer is locked"));
-        }
-    }
-    Ok(())
-}
-
-/// The change in track size: `delta`, or `size` measured from the current size `cur`.
-fn border_delta(p: &Value, cur: f64) -> Result<f64> {
-    const ID: &str = "table.resizeBorder";
-    let delta = match (p.get("delta").and_then(Value::as_f64), p.get("size").and_then(Value::as_f64)) {
-        (Some(d), _) => d,
-        (None, Some(sz)) => sz - cur,
-        (None, None) => return Err(bad(ID, "`delta` or `size` required")),
-    };
-    if !delta.is_finite() {
-        return Err(bad(ID, "`delta`/`size` must be a finite number"));
-    }
-    Ok(delta)
-}
-
-fn resize_border(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "table.resizeBorder";
-    let column = match str_param(p, "axis") {
-        Some("column") => true,
-        Some("row") => false,
-        _ => return Err(bad(ID, "axis must be `column` or `row`")),
-    };
-    let index = p.get("index").and_then(Value::as_u64).and_then(|v| usize::try_from(v).ok()).ok_or_else(|| bad(ID, "`index` required"))?;
-    let keep = p.get("keepTableSize").and_then(Value::as_bool).unwrap_or(false);
-    let g = target(s, p, ID)?;
-    let st = s.doc()?;
-    check_border_frame(st, p, g.story)?;
-    let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or_else(|| bad(ID, "no table"))?;
-    let sizes: Vec<f64> = if column {
-        t.columns.iter().map(|c| c.width).collect()
-    } else {
-        let cs = s.cache.get(&st.doc, g.story, None);
-        (0..t.nrows()).map(|r| composed_row_height(&cs, t, r).unwrap_or(MIN_TRACK)).collect()
-    };
-    let cur = *sizes.get(index).ok_or_else(|| bad(ID, format!("index {index} out of range")))?;
-    let delta = border_delta(p, cur)?;
-    let new = resize_track(&sizes, index, delta, keep).ok_or_else(|| bad(ID, "invalid table geometry"))?;
-    let size = new.get(index).copied().unwrap_or(cur);
-    let scaled = keep && index + 1 == sizes.len();
-    edit_table(s, &g, ID, |t| {
-        if column {
-            for (c, w) in t.columns.iter_mut().zip(&new) {
-                c.width = *w;
-            }
-        } else {
-            for (i, (r, h)) in t.rows.iter_mut().zip(&new).enumerate() {
-                // Only the rows the drag changed take the new height.
-                if scaled || i == index || (keep && i == index + 1) {
-                    r.height = *h;
-                }
-                if i == index && !scaled {
-                    r.mode = RowHeightMode::AtLeast;
-                }
-            }
-        }
-        Ok(json!({"axis": if column { "column" } else { "row" }, "index": index, "size": size}))
-    })
-}
-
-fn distribute_rows(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "table.distributeRows";
-    if !p.is_object() {
-        return Err(bad(ID, "parameters must be an object"));
-    }
-    if let Some(rows) = p.get("rows") {
-        let valid = rows.as_array().is_some_and(|a| a.len() == 2 && a.iter().all(|v| v.as_u64().is_some_and(|n| usize::try_from(n).is_ok())));
-        if !valid {
-            return Err(bad(ID, "rows must be two non-negative row indices"));
-        }
-    }
-    for key in ["row", "story", "table"] {
-        if let Some(v) = p.get(key)
-            && v.as_u64().is_none_or(|n| usize::try_from(n).is_err())
-        {
-            return Err(bad(ID, format!("{key} must be a non-negative integer")));
-        }
-    }
-    let g = target(s, p, ID)?;
-    let st = s.doc()?;
-    let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or_else(|| bad(ID, "no table"))?;
-    if t.cells.iter().any(|c| c.row_span > 1) {
-        return Err(bad(ID, "unmerge cells that span rows first"));
-    }
-    let cs = s.cache.get(&st.doc, g.story, None);
-    let mut total = 0.0;
-    for row in g.range.r0..=g.range.r1 {
-        let height = cs
-            .frames
-            .iter()
-            .flat_map(|f| &f.tables)
-            .filter(|f| f.table == g.table)
-            .flat_map(|f| &f.cells)
-            .filter(|c| c.row == row)
-            .map(|c| c.rect.height())
-            .reduce(f64::max)
-            .ok_or_else(|| bad(ID, "all selected rows must be laid out; enlarge or thread the text frame first"))?;
-        if !height.is_finite() || height <= 0.0 {
-            return Err(bad(ID, "invalid composed row height"));
-        }
-        total += height;
-    }
-    let count = g.range.r1 - g.range.r0 + 1;
-    let height = total / count as f64;
-    if !height.is_finite() {
-        return Err(bad(ID, "invalid total row height"));
-    }
-    edit_table(s, &g, ID, |t| {
-        let rows = t.rows.get_mut(g.range.r0..=g.range.r1).ok_or_else(|| bad(ID, "invalid row range"))?;
-        for row in rows {
-            row.height = height;
-            row.mode = RowHeightMode::Exactly;
-        }
-        Ok(json!({"rows": count, "height": height}))
-    })
-}
-
-fn distribute_cols(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.distributeColumns")?;
-    edit_table(s, &g, "table.distributeColumns", |t| {
-        let cols = &mut t.columns[g.range.c0..=g.range.c1];
-        let avg = cols.iter().map(|c| c.width).sum::<f64>() / cols.len() as f64;
-        cols.iter_mut().for_each(|c| c.width = avg);
-        ok()
-    })
-}
-
-fn parse_alt(v: &Value) -> Option<AltFills> {
-    if v.is_null() {
-        return None;
-    }
-    let d = AltFills::default();
-    Some(AltFills {
-        first: v.get("first").and_then(Value::as_u64).map_or(d.first, |x| u32::try_from(x).unwrap_or(u32::MAX)),
-        first_color: color_param(v, "firstColor").unwrap_or(d.first_color),
-        first_tint: v.get("firstTint").and_then(Value::as_f64).map_or(d.first_tint, |x| x as f32),
-        next: v.get("next").and_then(Value::as_u64).map_or(d.next, |x| u32::try_from(x).unwrap_or(u32::MAX)),
-        next_color: color_param(v, "nextColor").unwrap_or(d.next_color),
-        next_tint: v.get("nextTint").and_then(Value::as_f64).map_or(d.next_tint, |x| x as f32),
-        skip_first: v.get("skipFirst").and_then(Value::as_u64).map_or(0, |x| u32::try_from(x).unwrap_or(u32::MAX)),
-        skip_last: v.get("skipLast").and_then(Value::as_u64).map_or(0, |x| u32::try_from(x).unwrap_or(u32::MAX)),
-    })
-}
-
-fn options(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.options")?;
-    let border = match p.get("border").filter(|v| !v.is_null()) {
-        Some(b) => Some(StrokeEdit::parse(&s.doc()?.doc, b, "table.options")?),
-        None => None,
-    };
-    let p = p.clone();
-    edit_table(s, &g, "table.options", |t| {
-        let o = &mut t.options;
-        if let Some(v) = p.get("direction") {
-            o.direction = serde_json::from_value(v.clone()).map_err(|e| bad("table.options", e.to_string()))?;
-        }
-        if let Some(b) = &border {
-            o.border = b.apply(o.border.clone());
-            o.borders = Default::default();
-        }
-        o.space_before = f64_or(&p, "spaceBefore", o.space_before);
-        o.space_after = f64_or(&p, "spaceAfter", o.space_after);
-        if let Some(b) = p.get("repeatHeader").and_then(Value::as_bool) {
-            o.repeat_header = b;
-        }
-        if let Some(b) = p.get("repeatFooter").and_then(Value::as_bool) {
-            o.repeat_footer = b;
-        }
-        if let Some(v) = p.get("altRows") {
-            o.alt_rows = parse_alt(v);
-        }
-        if let Some(v) = p.get("altCols") {
-            o.alt_cols = parse_alt(v);
-        }
-        // At most 100 of each, as in `table.insert`: the rows the table lacks are added below.
-        let h = p.get("headerRows").and_then(Value::as_u64).map(|v| v.min(100) as usize);
-        let f = p.get("footerRows").and_then(Value::as_u64).map(|v| v.min(100) as usize);
-        if h.is_some() || f.is_some() {
-            let (h, f) = (h.unwrap_or(t.header_rows()), f.unwrap_or(t.footer_rows()));
-            // Add rows when there aren't enough for the requested header/footer plus one body row.
-            let need = h + f + 1;
-            if t.nrows() < need {
-                let at = t.nrows();
-                t.insert_rows(at, need - at);
-            }
-            t.set_header_footer(h, f);
-        }
-        Ok(json!({"options": t.options}))
-    })
-}
-
-/// Convert Rows is greyed out unless the selected cells (or the caret's cell) can change kind.
-fn can_convert_rows(s: &Session, kind: RowKind) -> std::result::Result<(), String> {
-    let st = s.active().ok_or("no document open")?;
-    if st.selection.cells.is_none() {
-        in_cell(s)?;
-    }
-    let g = target(s, &Value::Null, "table.convertRows").map_err(|e| e.to_string())?;
-    let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or("no table")?;
-    t.convert_rows_counts(g.range.r0, g.range.r1, kind).map(|_| ())
-}
-
-fn convert_rows(s: &mut Session, p: &Value, kind: RowKind) -> Result<Value> {
-    const ID: &str = "table.convertRows";
-    let g = target(s, p, ID)?;
-    edit_table(s, &g, ID, |t| {
-        let (h, f) = t.convert_rows_counts(g.range.r0, g.range.r1, kind).map_err(|e| bad(ID, e))?;
-        t.set_header_footer(h, f);
-        Ok(json!({"headerRows": h, "footerRows": f}))
-    })
-}
-
-// ---------- selection ----------
-
-fn select(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.select")?;
-    let (nr, nc) = {
-        let st = s.doc()?;
-        let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or_else(|| bad("table.select", "no table"))?;
-        (t.nrows(), t.ncols())
-    };
-    let mut r = g.range;
-    match str_param(p, "what") {
-        Some("table") => r = CellRange { r0: 0, c0: 0, r1: nr - 1, c1: nc - 1 },
-        Some("row") => {
-            r.c0 = 0;
-            r.c1 = nc - 1;
-        }
-        Some("column") => {
-            r.r0 = 0;
-            r.r1 = nr - 1;
-        }
-        _ => {}
-    }
-    let st = s.doc_mut()?;
-    let frame = st.selection.text.and_then(|t| t.frame);
-    st.selection = Selection {
-        cells: Some(TableSel { story: g.story, table: g.table, range: r }),
-        text: Some(TextSel { story: g.story, anchor: 0, focus: 0, frame, cell: Some(CellAddr { table: g.table, row: r.r0, col: r.c0 }) }),
-        ..Default::default()
-    };
-    st.bump_revision();
-    Ok(json!({"story": g.story.0, "table": g.table, "range": r}))
-}
-
-/// Move the caret to the next/previous cell (Tab / Shift-Tab), selecting its text. Tab in the last
-/// cell adds a row.
-pub(crate) fn step_cell(s: &mut Session, forward: bool) -> Result<Value> {
-    let t = s.doc()?.selection.text.ok_or_else(|| bad("table.nextCell", "no caret"))?;
-    let c = t.cell.ok_or_else(|| bad("table.nextCell", "not in a cell"))?;
-    let (owners, nr, nc) = {
-        let st = s.doc()?;
-        let tb = st.doc.story(t.story).and_then(|x| x.tables.get(&c.table)).ok_or_else(|| bad("table.nextCell", "no table"))?;
-        (tb.owners(), tb.nrows(), tb.ncols())
-    };
-    let cur = c.row * nc + c.col;
-    let next =
-        if forward { (cur + 1..nr * nc).find(|&i| owners[i] == (i / nc, i % nc)) } else { (0..cur).rev().find(|&i| owners[i] == (i / nc, i % nc)) };
-    let (row, col) = match next {
-        Some(i) => (i / nc, i % nc),
-        None if forward => {
-            let g = Tgt { story: t.story, table: c.table, range: CellRange::cell(nr - 1, 0) };
-            edit_table(s, &g, "table.nextCell", |tb| {
-                tb.insert_rows(nr, 1);
-                ok()
-            })?;
-            (nr, 0)
-        }
-        None => return ok(),
-    };
-    let st = s.doc_mut()?;
-    let len = st.doc.text_story(t.story, Some(CellAddr { table: c.table, row, col })).map_or(0, |x| x.len());
-    st.selection = Selection::text(TextSel { anchor: 0, focus: len, cell: Some(CellAddr { table: c.table, row, col }), ..t });
-    st.bump_revision();
-    Ok(json!({"row": row, "col": col}))
-}
-
-fn get(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.get")?;
-    let st = s.doc()?;
-    let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or_else(|| bad("table.get", "no table"))?;
-    let owners = t.owners();
-    let cells: Vec<Value> = (0..t.nrows())
-        .flat_map(|r| (0..t.ncols()).map(move |c| (r, c)))
-        .filter(|&(r, c)| owners[r * t.ncols() + c] == (r, c))
-        .filter_map(|(r, c)| {
-            let cell = t.cell(r, c)?;
-            Some(json!({"row": r, "col": c, "rowSpan": cell.row_span, "colSpan": cell.col_span, "text": cell.text.text, "fill": cell.fill,
-                "insets": cell.insets, "vj": cell.vj, "firstBaseline": cell.first_baseline, "firstBaselineMin": cell.first_baseline_min, "rotation": cell.rotation, "style": cell.style}))
-        })
-        .collect();
-    Ok(json!({
-        "story": g.story.0, "table": g.table, "anchor": st.doc.story(g.story).and_then(|x| x.table_anchor(g.table)),
-        "rows": t.rows, "columns": t.columns, "headerRows": t.header_rows(), "footerRows": t.footer_rows(),
-        "cells": cells, "options": t.options, "range": g.range, "style": t.style,
-    }))
-}
-
-// ---------- cell and table styles ----------
-
-/// A style's uniform edge stroke from `stroke`/`border`: the given values over the default
-/// edge, validated like `table.setCell`'s stroke.
-fn stroke_param(s: &Session, v: Option<&Value>, cmd: &str) -> Result<Option<CellStroke>> {
-    match v.filter(|v| !v.is_null()) {
-        Some(v) => Ok(Some(StrokeEdit::parse(&s.doc()?.doc, v, cmd)?.apply(CellStroke::default()))),
-        None => Ok(None),
-    }
-}
-
-/// Fill in the cell style fields given in `p`.
-fn cell_style_fields(cs: &mut designcraft_doc::CellStyle, p: &Value, stroke: Option<CellStroke>, cmd: &str) -> Result<()> {
-    if let Some(v) = p.get("basedOn") {
-        cs.based_on = v.as_str().map(str::to_string);
-    }
-    if let Some(f) = color_param(p, "fill") {
-        cs.fill = Some(f);
-    }
-    if let Some(t) = p.get("tint").and_then(Value::as_f64) {
-        cs.fill_tint = Some(t.clamp(0.0, 1.0) as f32);
-    }
-    match p.get("insets") {
-        Some(Value::Number(n)) => {
-            cs.insets = n.as_f64().map(|v| [v.max(0.0); 4]);
-            cs.inset_overrides = Default::default();
-        }
-        Some(Value::Array(a)) if a.len() == 4 => {
-            let v: Vec<f64> = a.iter().map(|x| x.as_f64().unwrap_or(0.0).max(0.0)).collect();
-            cs.insets = Some([v[0], v[1], v[2], v[3]]);
-            cs.inset_overrides = Default::default();
-        }
-        _ => {}
-    }
-    if let Some(v) = p.get("vj") {
-        cs.vj = Some(serde_json::from_value(v.clone()).map_err(|e| bad(cmd, format!("vj: {e}")))?);
-    }
-    let (first_baseline, first_baseline_min) = first_baseline_params(p, cmd)?;
-    if first_baseline.is_some() {
-        cs.first_baseline = first_baseline;
-    }
-    if first_baseline_min.is_some() {
-        cs.first_baseline_min = first_baseline_min;
-    }
-    if let Some(st) = stroke {
-        cs.stroke = Some(st);
-        cs.strokes = Default::default();
-    }
-    if let Some(ps) = str_param(p, "paragraphStyle") {
-        cs.paragraph_style = Some(ps.to_string());
-    }
-    Ok(())
-}
-
-fn cell_style_create(s: &mut Session, p: &Value) -> Result<Value> {
-    let base = str_param(p, "name").unwrap_or("Cell Style 1").to_string();
-    let mut cs = designcraft_doc::CellStyle::default();
-    if p.get("fromSelection").and_then(Value::as_bool).unwrap_or(false) {
-        let g = target(s, p, "style.cell.create")?;
-        let d = &s.doc()?.doc;
-        let cell = d
-            .story(g.story)
-            .and_then(|st| st.tables.get(&g.table))
-            .and_then(|t| {
-                let (r, c) = t.owner(g.range.r0, g.range.c0);
-                t.cell(r, c)
-            })
-            .ok_or_else(|| bad("style.cell.create", "no cell"))?;
-        cs.fill = Some(cell.fill.clone());
-        cs.fill_tint = Some(cell.fill_tint);
-        cs.insets = Some(cell.insets);
-        cs.vj = Some(cell.vj);
-        cs.first_baseline = Some(cell.first_baseline);
-        cs.first_baseline_min = Some(cell.first_baseline_min);
-        cs.stroke = Some(cell.strokes[0].clone());
-        cs.paragraph_style = cell.text.paras.first().map(|p| p.style.clone());
-    }
-    let stroke = stroke_param(s, p.get("stroke"), "style.cell.create")?;
-    cell_style_fields(&mut cs, p, stroke, "style.cell.create")?;
-    s.edit(|d, _| {
-        let name = designcraft_doc::Styles::unique_name(|n| d.styles.cell.iter().any(|c| c.name == n), &base);
-        cs.name = name.clone();
-        d.styles_mut().cell.push(cs);
-        Ok(json!({"name": name}))
-    })
-}
-
-fn cell_style_apply(s: &mut Session, p: &Value) -> Result<Value> {
-    let name = str_param(p, "name").ok_or_else(|| bad("style.cell.apply", "missing name"))?.to_string();
-    let styles = &s.doc()?.doc.styles.cell;
-    if !styles.iter().any(|c| c.name == name) {
-        return Err(bad("style.cell.apply", format!("no cell style `{name}`")));
-    }
-    let cs = designcraft_doc::resolve_cell_style(styles, &name);
-    let g = target(s, p, "style.cell.apply")?;
-    edit_table(s, &g, "style.cell.apply", |t| {
-        let mut n = 0;
-        for (r, c) in t.selected_owners(g.range) {
-            if let Some(cell) = t.cell_mut(r, c) {
-                cs.apply_to(cell);
-                n += 1;
-            }
-        }
-        Ok(json!({"cells": n}))
-    })
-}
-
-/// Re-apply cell styles named in `names` to every cell using them (after a style edit).
-fn reapply_cell_styles(d: &mut Document, names: &[String]) {
-    let styles: Vec<_> = names.iter().map(|name| designcraft_doc::resolve_cell_style(&d.styles.cell, name)).collect();
-    for sid in d.stories.keys().copied().collect::<Vec<_>>() {
-        let Some(st) = d.story_mut(sid) else { continue };
-        for t in st.tables.values_mut() {
-            if !t.cells.iter().any(|c| names.contains(&c.style)) {
-                continue;
-            }
-            for cell in &mut std::sync::Arc::make_mut(t).cells {
-                if names.contains(&cell.style)
-                    && let Some(cs) = styles.iter().find(|x| x.name == cell.style)
-                {
-                    cs.apply_to(cell);
-                }
-            }
-        }
-        st.rev = st.rev.wrapping_add(1);
-    }
-}
-
-/// Include descendants when editing an inherited style, with the resolver's depth limit.
-fn dependent_styles<'a>(name: &str, styles: impl Iterator<Item = (&'a str, Option<&'a str>)>) -> Vec<String> {
-    let styles: Vec<_> = styles.collect();
-    styles
-        .iter()
-        .filter(|(candidate, _)| {
-            let mut current = Some(*candidate);
-            for _ in 0..32 {
-                let Some(current_name) = current else { return false };
-                if current_name == name {
-                    return true;
-                }
-                current = styles.iter().find(|(n, _)| *n == current_name).and_then(|(_, base)| *base);
-            }
-            false
-        })
-        .map(|(name, _)| (*name).to_string())
-        .collect()
-}
-
-fn cell_style_edit(s: &mut Session, p: &Value) -> Result<Value> {
-    let name = str_param(p, "name").ok_or_else(|| bad("style.cell.edit", "missing name"))?.to_string();
-    let stroke = stroke_param(s, p.get("stroke"), "style.cell.edit")?;
-    let p = p.clone();
-    s.edit(|d, _| {
-        let cs = d.styles_mut().cell.iter_mut().find(|c| c.name == name).ok_or_else(|| bad("style.cell.edit", format!("no cell style `{name}`")))?;
-        cell_style_fields(cs, &p, stroke, "style.cell.edit")?;
-        let names = dependent_styles(&name, d.styles.cell.iter().map(|cs| (cs.name.as_str(), cs.based_on.as_deref())));
-        reapply_cell_styles(d, &names);
-        ok()
-    })
-}
-
-fn table_style_fields(ts: &mut designcraft_doc::TableStyle, p: &Value, border: Option<CellStroke>) {
-    if let Some(v) = p.get("basedOn") {
-        ts.based_on = v.as_str().map(str::to_string);
-    }
-    for (k, f) in [
-        ("header", &mut ts.header),
-        ("body", &mut ts.body),
-        ("footer", &mut ts.footer),
-        ("leftColumn", &mut ts.left_column),
-        ("rightColumn", &mut ts.right_column),
-    ] {
-        if let Some(v) = p.get(k) {
-            *f = v.as_str().map(str::to_string);
-        }
-    }
-    if let Some(b) = border {
-        ts.border = Some(b);
-        ts.borders = Default::default();
-    }
-    if let Some(a) = p.get("altRows").and_then(Value::as_object) {
-        let n = |k: &str, d: u32| a.get(k).and_then(Value::as_u64).map_or(d, |v| v as u32);
-        let c = |k: &str| a.get(k).and_then(Value::as_str).unwrap_or(designcraft_color::swatch::NONE).to_string();
-        let t = |k: &str| a.get(k).and_then(Value::as_f64).map_or(1.0, |v| v.clamp(0.0, 1.0) as f32);
-        ts.alt_rows = Some(designcraft_doc::AltFills {
-            first: n("first", 1),
-            first_color: c("firstColor"),
-            first_tint: t("firstTint"),
-            next: n("next", 1),
-            next_color: c("nextColor"),
-            next_tint: t("nextTint"),
-            skip_first: n("skipFirst", 0),
-            skip_last: n("skipLast", 0),
-        });
-    }
-    if let Some(v) = p.get("spaceBefore").and_then(Value::as_f64) {
-        ts.space_before = Some(v);
-    }
-    if let Some(v) = p.get("spaceAfter").and_then(Value::as_f64) {
-        ts.space_after = Some(v);
-    }
-}
-
-fn table_style_create(s: &mut Session, p: &Value) -> Result<Value> {
-    let base = str_param(p, "name").unwrap_or("Table Style 1").to_string();
-    let mut ts = designcraft_doc::TableStyle::default();
-    let border = stroke_param(s, p.get("border"), "style.table.create")?;
-    table_style_fields(&mut ts, p, border);
-    s.edit(|d, _| {
-        let name = designcraft_doc::Styles::unique_name(|n| d.styles.table.iter().any(|c| c.name == n), &base);
-        ts.name = name.clone();
-        d.styles_mut().table.push(ts);
-        Ok(json!({"name": name}))
-    })
-}
-
-fn table_style_apply(s: &mut Session, p: &Value) -> Result<Value> {
-    let name = str_param(p, "name").ok_or_else(|| bad("style.table.apply", "missing name"))?.to_string();
-    let doc = &s.doc()?.doc;
-    if !doc.styles.table.iter().any(|c| c.name == name) {
-        return Err(bad("style.table.apply", format!("no table style `{name}`")));
-    }
-    let ts = doc.styles.resolve_table_style(&name);
-    let cells = doc.styles.cell.clone();
-    let g = target(s, p, "style.table.apply")?;
-    edit_table(s, &g, "style.table.apply", |t| {
-        ts.apply_to(t, &cells);
-        ok()
-    })
-}
-
-fn table_style_edit(s: &mut Session, p: &Value) -> Result<Value> {
-    let name = str_param(p, "name").ok_or_else(|| bad("style.table.edit", "missing name"))?.to_string();
-    let border = stroke_param(s, p.get("border"), "style.table.edit")?;
-    let p = p.clone();
-    s.edit(|d, _| {
-        let ts =
-            d.styles_mut().table.iter_mut().find(|c| c.name == name).ok_or_else(|| bad("style.table.edit", format!("no table style `{name}`")))?;
-        table_style_fields(ts, &p, border);
-        let names = dependent_styles(&name, d.styles.table.iter().map(|ts| (ts.name.as_str(), ts.based_on.as_deref())));
-        let styles: Vec<_> = names.iter().map(|name| d.styles.resolve_table_style(name)).collect();
-        let cells = d.styles.cell.clone();
-        for sid in d.stories.keys().copied().collect::<Vec<_>>() {
-            let Some(st) = d.story_mut(sid) else { continue };
-            for t in st.tables.values_mut() {
-                if let Some(ts) = styles.iter().find(|ts| ts.name == t.style) {
-                    ts.apply_to(std::sync::Arc::make_mut(t), &cells);
-                }
-            }
-            st.rev = st.rev.wrapping_add(1);
-        }
-        ok()
-    })
-}
-
-#[cfg(test)]
-mod style_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn cell_first_baseline_is_a_cell_option_and_a_cell_style_attribute() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 2, "cols": 2})).unwrap();
-        s.execute("table.setCell", &json!({"row": 0, "col": 0, "firstBaseline": "capHeight", "firstBaselineMin": 3})).unwrap();
-        let got = s.execute("table.get", &json!({})).unwrap();
-        let cell = got["cells"].as_array().unwrap().iter().find(|c| c["row"] == 0 && c["col"] == 0).unwrap().clone();
-        assert_eq!((cell["firstBaseline"].as_str(), cell["firstBaselineMin"].as_f64()), (Some("capHeight"), Some(3.0)));
-        assert!(s.execute("table.setCell", &json!({"row": 0, "col": 0, "firstBaseline": "middle"})).is_err());
-        // Cell Options › Text › Rotation: carried and written back, composed horizontally so far,
-        // which the IDML import reports (#1468).
-        for (given, want) in [(90, 90.0), (270, 270.0), (0, 0.0), (-90, 270.0), (450, 90.0)] {
-            s.execute("table.setCell", &json!({"row": 0, "col": 0, "rotation": given})).unwrap_or_else(|e| panic!("{given}: {e}"));
-            let cell = s.execute("table.get", &json!({})).unwrap()["cells"][0].clone();
-            assert_eq!(cell["rotation"].as_f64(), Some(want), "{given}");
-        }
-        for bad in [45, 1, 100] {
-            assert!(s.execute("table.setCell", &json!({"row": 0, "col": 0, "rotation": bad})).is_err(), "{bad}");
-        }
-        assert!(s.execute("table.setCell", &json!({"row": 0, "col": 0, "firstBaselineMin": -1})).is_err());
-        s.execute("style.cell.create", &json!({"name": "Leading", "firstBaseline": "leading"})).unwrap();
-        s.execute("style.cell.apply", &json!({"name": "Leading", "row": 1, "col": 1})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let t = d.story(designcraft_doc::StoryId(sid)).unwrap().tables.values().next().unwrap();
-        assert_eq!(t.cell(1, 1).unwrap().first_baseline, designcraft_doc::FirstBaseline::Leading);
-        assert_eq!(t.cell(1, 0).unwrap().first_baseline, designcraft_doc::FirstBaseline::Ascent);
-    }
-
-    #[test]
-    fn cell_and_table_styles_apply_and_follow_edits() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 3, "cols": 2, "headerRows": 1})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Cell Head"})).unwrap();
-        s.execute("style.cell.create", &json!({"name": "Head", "fill": "[Black]", "paragraphStyle": "Cell Head", "insets": 6})).unwrap();
-        s.execute("style.cell.create", &json!({"name": "Body", "fill": "[Paper]"})).unwrap();
-        s.execute("style.table.create", &json!({"name": "Data", "header": "Head", "body": "Body", "border": {"weight": 2, "color": "[Black]"}}))
-            .unwrap();
-        s.execute("style.table.apply", &json!({"name": "Data"})).unwrap();
-        let t = |s: &Session| -> designcraft_doc::Table {
-            let d = &s.doc().unwrap().doc;
-            (**d.story(designcraft_doc::StoryId(sid)).unwrap().tables.values().next().unwrap()).clone()
-        };
-        let tb = t(&s);
-        assert_eq!(tb.style, "Data");
-        assert_eq!(tb.options.border.weight, 2.0);
-        let head = tb.cell(0, 0).unwrap();
-        assert_eq!((head.fill.as_str(), head.style.as_str(), head.insets), ("[Black]", "Head", [6.0; 4]));
-        assert_eq!(head.text.paras[0].style, "Cell Head");
-        assert_eq!(tb.cell(1, 1).unwrap().style, "Body");
-        // Editing the cell style updates its cells.
-        s.execute("style.cell.edit", &json!({"name": "Head", "fill": "C=100 M=0 Y=0 K=0"})).unwrap();
-        assert_eq!(t(&s).cell(0, 1).unwrap().fill, "C=100 M=0 Y=0 K=0");
-        // Editing the table style re-applies it.
-        s.execute("style.table.edit", &json!({"name": "Data", "border": {"weight": 4}})).unwrap();
-        assert_eq!(t(&s).options.border.weight, 4.0);
-        assert!(s.execute("style.cell.apply", &json!({"name": "Nope"})).is_err());
-    }
-}
-
-/// The table cell under spread point `pt` in text frame `frame`: (story, table, row, col).
-fn cell_at(s: &Session, frame: designcraft_doc::ItemId, pt: designcraft_geom::Point) -> Option<(StoryId, u64, usize, usize)> {
-    let st = s.active()?;
-    let loc = st.doc.find(frame)?;
-    let it = st.doc.item_at(&loc)?;
-    let sid = it.text_frame()?.story;
-    let inner = (st.doc.parent_xf(&loc) * st.doc.text_xf(it)).inverse() * pt;
-    let cs = s.cache.get(&st.doc, sid, None);
-    let fi = cs.frames.iter().position(|f| f.frame == frame)?;
-    let (table, row, col, _) = designcraft_compose::hit_cell(&cs, fi, inner)?;
-    Some((sid, table, row, col))
-}
-
-fn drop_cells(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "table.dropCells";
-    let frame = super::id_param(p, "frame").ok_or_else(|| bad(ID, "`frame` required"))?;
-    let pt = |k: &str| -> Result<designcraft_geom::Point> {
-        let a = p.get(k).and_then(Value::as_array).ok_or_else(|| bad(ID, format!("`{k}` required")))?;
-        Ok(designcraft_geom::Point::new(a.first().and_then(Value::as_f64).unwrap_or(0.0), a.get(1).and_then(Value::as_f64).unwrap_or(0.0)))
-    };
-    let (from, to) = (pt("from")?, pt("to")?);
-    let sel = s.doc()?.selection.cells;
-    let hit_from = cell_at(s, frame, from);
-    let hit_to = cell_at(s, frame, to);
-    if let (Some(ts), Some((sid, tid, fr, fc)), Some((_, tid2, tr, tc))) = (sel, hit_from, hit_to)
-        && ts.story == sid
-        && ts.table == tid
-        && tid2 == tid
-        && s.doc()?.doc.story(sid).and_then(|st| st.tables.get(&tid)).is_some_and(|t| t.selected_owners(ts.range).binary_search(&(fr, fc)).is_ok())
-    {
-        let (nr, nc) = {
-            let t = s.doc()?.doc.story(sid).and_then(|st| st.tables.get(&tid)).ok_or_else(|| bad(ID, "no table"))?;
-            (t.nrows(), t.ncols())
-        };
-        let r = ts.range;
-        let rows = r.c0 == 0 && r.c1 + 1 == nc;
-        let cols = r.r0 == 0 && r.r1 + 1 == nr;
-        if rows || cols {
-            let (lo, hi, target) = if rows { (r.r0, r.r1, tr) } else { (r.c0, r.c1, tc) };
-            if target >= lo && target <= hi {
-                return Ok(json!({"moved": 0}));
-            }
-            let n = hi - lo + 1;
-            let r2 = s.edit(|d, selm| {
-                let t = d.story_mut(sid).and_then(|st| st.table_mut(tid)).ok_or_else(|| bad(ID, "no table"))?;
-                let mv = |t: &mut designcraft_doc::Table, a: usize, b: usize| if rows { t.move_row(a, b) } else { t.move_col(a, b) };
-                let new_lo = if target > hi {
-                    for _ in 0..n {
-                        mv(t, lo, target).map_err(|e| bad(ID, e))?;
-                    }
-                    target + 1 - n
-                } else {
-                    for k in 0..n {
-                        mv(t, lo + k, target + k).map_err(|e| bad(ID, e))?;
-                    }
-                    target
-                };
-                let range =
-                    if rows { CellRange::new(new_lo, r.c0, new_lo + n - 1, r.c1) } else { CellRange::new(r.r0, new_lo, r.r1, new_lo + n - 1) };
-                selm.cells = Some(TableSel { range, ..ts });
-                Ok(json!({"moved": n, "to": new_lo}))
-            })?;
-            return Ok(r2);
-        }
-    }
-    // Not a row/column drag: select text from the press to the release.
-    s.execute("text.placeCaret", &json!({"frame": frame.0, "point": [from.x, from.y]}))?;
-    s.execute("text.extendTo", &json!({"frame": frame.0, "point": [to.x, to.y]}))
-}
-
-fn place_graphic(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "table.placeGraphic";
-    let g = target(s, p, ID)?;
-    let (bytes, name, link) = super::file::read_source(p)?;
-    let (pw, ph) = designcraft_render::image_size(&bytes).ok_or_else(|| bad(ID, "unsupported or corrupt image"))?;
-    let (nw, nh) = designcraft_render::natural_size(&bytes, 0).ok_or_else(|| bad(ID, "invalid image dimensions"))?;
-    let fill = p.get("fit").and_then(Value::as_str) == Some("fill");
-    // Compute fitting before the edit: a small EPS can overflow in a huge cell.
-    let t = s.doc()?.doc.story(g.story).and_then(|st| st.tables.get(&g.table)).ok_or_else(|| bad(ID, "no table"))?;
-    let (r, c) = t.owner(g.range.r0, g.range.c0);
-    let cell = t.cell(r, c).ok_or_else(|| bad(ID, "no cell"))?;
-    let (rs, cs) = (cell.row_span.max(1) as usize, cell.col_span.max(1) as usize);
-    let w: f64 = t.columns.get(c..c.saturating_add(cs).min(t.ncols())).ok_or_else(|| bad(ID, "invalid cell span"))?.iter().map(|x| x.width).sum();
-    let h: f64 = t.rows.get(r..r.saturating_add(rs).min(t.nrows())).ok_or_else(|| bad(ID, "invalid cell span"))?.iter().map(|x| x.height).sum();
-    let ins = cell.insets;
-    let (bw, bh) = ((w - ins[1] - ins[3]).max(1.0), (h - ins[0] - ins[2]).max(1.0));
-    let k = if fill { (bw / nw).max(bh / nh) } else { (bw / nw).min(bh / nh) };
-    let xf = designcraft_geom::Affine::translate(((bw - nw * k) / 2.0, (bh - nh * k) / 2.0)) * designcraft_geom::Affine::scale(k);
-    super::file::validate_placement((nw, nh), designcraft_geom::Rect::new(0.0, 0.0, bw, bh), xf, ID)?;
-    s.edit(|d, sel| {
-        let fresh = designcraft_doc::AssetId(d.alloc());
-        let mime = designcraft_render::image_mime(&bytes).to_string();
-        let aid = d.add_asset(designcraft_doc::Asset {
-            id: fresh,
-            name,
-            mime,
-            link,
-            data: std::sync::Arc::new(bytes),
-            pixels: Some((pw, ph)),
-            ..Default::default()
-        });
-        let st = d.story_mut(g.story).ok_or_else(|| bad(ID, "no story"))?;
-        let t = st.table_mut(g.table).ok_or_else(|| bad(ID, "no table"))?;
-        let cell = t.cell_mut(r, c).ok_or_else(|| bad(ID, format!("no cell {r},{c}")))?;
-        cell.graphic = Some(designcraft_doc::Graphic {
-            asset: aid,
-            size: (nw, nh),
-            xf,
-            clip: None,
-            auto_fit: if fill { designcraft_doc::Fitting::FillProportionally } else { designcraft_doc::Fitting::FitProportionally },
-            fit_align: 4,
-            crop: [0.0; 4],
-            wrap: Default::default(),
-            fill: Default::default(),
-        });
-        clamp_selection(d, sel);
-        Ok(json!({"asset": aid.0, "row": r, "col": c}))
-    })
-}
-
-fn move_rc(s: &mut Session, p: &Value, rows: bool) -> Result<Value> {
-    const ID: &str = "table.move";
-    let g = target(s, p, ID)?;
-    let from = p.get("from").and_then(Value::as_u64).map_or(if rows { g.range.r0 } else { g.range.c0 }, |v| v as usize);
-    let to = p.get("to").and_then(Value::as_u64).ok_or_else(|| bad(ID, "`to` required"))? as usize;
-    edit_table(s, &g, ID, |t| {
-        if rows { t.move_row(from, to) } else { t.move_col(from, to) }.map_err(|e| bad(ID, e))?;
-        Ok(json!({"from": from, "to": to}))
-    })
-}
-
-fn sort_rows(s: &mut Session, p: &Value) -> Result<Value> {
-    let g = target(s, p, "table.sortRows")?;
-    let col = p.get("column").and_then(Value::as_u64).map_or(g.range.c0, |c| c as usize);
-    let desc = p.get("descending").and_then(Value::as_bool).unwrap_or(false);
-    edit_table(s, &g, "table.sortRows", |t| {
-        let (nr, nc) = (t.nrows(), t.ncols());
-        if col >= nc {
-            return Err(bad("table.sortRows", format!("no column {col}")));
-        }
-        if t.cells.iter().any(|c| c.row_span > 1) {
-            return Err(bad("table.sortRows", "unmerge cells that span rows first"));
-        }
-        let (h, f) = (t.header_rows(), t.footer_rows());
-        let body: Vec<usize> = (h..nr - f).collect();
-        let key = |r: usize| t.cell(r, col).map(|c| c.text.text.trim().to_string()).unwrap_or_default();
-        let mut order = body.clone();
-        order.sort_by(|a, b| {
-            let (ka, kb) = (key(*a), key(*b));
-            let o = match (ka.replace(',', "").parse::<f64>(), kb.replace(',', "").parse::<f64>()) {
-                (Ok(x), Ok(y)) => x.total_cmp(&y),
-                _ => ka.to_lowercase().cmp(&kb.to_lowercase()),
-            };
-            if desc { o.reverse() } else { o }
-        });
-        let rows = t.rows.clone();
-        let cells = t.cells.clone();
-        for (k, src) in order.iter().enumerate() {
-            let dst = body[k];
-            t.rows[dst] = rows[*src].clone();
-            for c in 0..nc {
-                t.cells[dst * nc + c] = cells[src * nc + c].clone();
-            }
-        }
-        Ok(json!({"sorted": body.len()}))
-    })
-}
-
-#[cfg(test)]
-mod sort_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    fn distribution_session() -> Session {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 700], "content": "text", "text": ""})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 3, "cols": 2, "headerRows": 1})).unwrap();
-        for (row, height) in [(0, 25), (1, 40), (2, 80), (3, 30)] {
-            s.execute("table.setRowHeight", &json!({"row": row, "height": height, "mode": "exactly"})).unwrap();
-            s.execute("table.setCell", &json!({"row": row, "col": 0, "text": format!("row {row}")})).unwrap();
-        }
-        s
-    }
-
-    fn table(s: &Session) -> designcraft_doc::Table {
-        (**s.doc().unwrap().doc.stories.values().flat_map(|st| st.tables.values()).next().unwrap()).clone()
-    }
-
-    #[test]
-    fn distribute_selected_rows_preserves_height_content_and_undo() {
-        let mut s = distribution_session();
-        s.execute("table.select", &json!({"rows": [1, 2], "what": "row"})).unwrap();
-        let before = table(&s);
-        let selection = s.doc().unwrap().selection.cells;
-        let result = s.execute("table.distributeRows", &json!({})).unwrap();
-        assert_eq!(result, json!({"rows": 2, "height": 60.0}));
-        let after = table(&s);
-        assert_eq!(after.rows.iter().map(|r| r.height).collect::<Vec<_>>(), [25.0, 60.0, 60.0, 30.0]);
-        assert_eq!(after.cells, before.cells);
-        assert_eq!(after.rows[0].kind, before.rows[0].kind);
-        assert_eq!(s.doc().unwrap().selection.cells, selection);
-        let st = s.doc().unwrap();
-        let sid = st.doc.stories.values().find(|st| !st.tables.is_empty()).unwrap().id;
-        let cs = s.cache.get(&st.doc, sid, None);
-        let heights: Vec<_> =
-            cs.frames.iter().flat_map(|f| &f.tables).flat_map(|f| &f.cells).filter(|c| c.col == 0).map(|c| c.rect.height()).collect();
-        assert_eq!(heights, [25.0, 60.0, 60.0, 30.0]);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(table(&s), before);
-        s.execute("edit.redo", &json!({})).unwrap();
-        assert_eq!(table(&s), after);
-    }
-
-    #[test]
-    fn distribution_uses_content_grown_heights_and_explicit_table() {
-        let mut s = distribution_session();
-        s.execute("table.setRowHeight", &json!({"rows": [1, 2], "height": 3, "mode": "atLeast"})).unwrap();
-        s.execute("table.setCell", &json!({"row": 2, "col": 0, "text": "one\ntwo\nthree"})).unwrap();
-        let st = s.doc().unwrap();
-        let story = st.doc.stories.values().find(|st| !st.tables.is_empty()).unwrap();
-        let (sid, tid) = (story.id, *story.tables.keys().next().unwrap());
-        let cs = s.cache.get(&st.doc, sid, None);
-        let total: f64 = cs
-            .frames
-            .iter()
-            .flat_map(|f| &f.tables)
-            .flat_map(|f| &f.cells)
-            .filter(|c| c.col == 0 && (1..=2).contains(&c.row))
-            .map(|c| c.rect.height())
-            .sum();
-        let result = s.execute("table.distributeRows", &json!({"story": sid.0, "table": tid, "rows": [1, 2]})).unwrap();
-        assert!((result["height"].as_f64().unwrap() * 2.0 - total).abs() < 1e-6);
-        assert!(table(&s).rows[1].height > 3.0);
-        assert_eq!(table(&s).rows[1].mode, designcraft_doc::RowHeightMode::Exactly);
-    }
-
-    #[test]
-    fn distribution_keeps_column_spans_and_caret() {
-        let mut s = distribution_session();
-        s.execute("table.merge", &json!({"rows": [1, 1], "cols": [0, 1]})).unwrap();
-        let before = table(&s);
-        let caret = s.doc().unwrap().selection.text;
-        let result = s.execute("table.distributeRows", &json!({"rows": [2, 1]})).unwrap();
-        assert_eq!(result["height"], 60.0);
-        assert_eq!(table(&s).cell(1, 0).unwrap().col_span, 2);
-        assert_eq!(table(&s).cells, before.cells);
-        assert_eq!(s.doc().unwrap().selection.text, caret);
-    }
-
-    #[test]
-    fn distribution_rejects_merges_and_missing_rows_without_changes() {
-        let mut s = distribution_session();
-        s.execute("table.merge", &json!({"rows": [1, 2], "cols": [0, 0]})).unwrap();
-        let before = table(&s);
-        assert!(s.execute("table.distributeRows", &json!({"rows": [1, 2]})).is_err());
-        assert_eq!(table(&s), before);
-        s.execute("edit.undo", &json!({})).unwrap();
-        s.execute("table.setRowHeight", &json!({"rows": [0, 3], "height": 10000, "mode": "exactly"})).unwrap();
-        let before = table(&s);
-        assert!(s.execute("table.distributeRows", &json!({"rows": [0, 3]})).is_err());
-        assert_eq!(table(&s), before);
-        assert!(s.execute("table.distributeRows", &json!({"rows": [0, 99]})).is_err());
-        for params in
-            [json!({"rows": "all"}), json!({"rows": [0]}), json!({"rows": [-1, 2]}), json!({"row": 1.5}), json!({"table": "bad"}), json!([])]
-        {
-            assert!(s.execute("table.distributeRows", &params).is_err(), "{params}");
-            assert_eq!(table(&s), before);
-        }
-    }
-
-    #[test]
-    fn sort_body_rows_by_a_column() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 3, "cols": 2, "headerRows": 1})).unwrap();
-        let cells = [("Name", "Qty"), ("pear", "10"), ("Apple", "9"), ("fig", "100")];
-        for (r, (a, b)) in cells.iter().enumerate() {
-            s.execute("table.setCell", &json!({"rows": [r, r], "cols": [0, 0], "text": a})).unwrap();
-            s.execute("table.setCell", &json!({"rows": [r, r], "cols": [1, 1], "text": b})).unwrap();
-        }
-        let col = |s: &Session, c: usize| -> Vec<String> {
-            let d = &s.doc().unwrap().doc;
-            let t = d.stories.values().flat_map(|st| st.tables.values()).next().unwrap();
-            (0..t.nrows()).map(|r| t.cell(r, c).unwrap().text.text.clone()).collect()
-        };
-        s.execute("table.sortRows", &json!({"column": 0})).unwrap();
-        assert_eq!(col(&s, 0), ["Name", "Apple", "fig", "pear"], "header stays; case-insensitive");
-        s.execute("table.sortRows", &json!({"column": 1, "descending": true})).unwrap();
-        assert_eq!(col(&s, 1), ["Qty", "100", "10", "9"], "numbers by value");
-        s.execute("table.splitVertically", &json!({"rows": [1, 1], "cols": [0, 0]})).unwrap();
-        let r = s.execute("table.splitHorizontally", &json!({"rows": [0, 0], "cols": [1, 1]})).unwrap();
-        assert_eq!((r["rows"].as_u64(), r["cols"].as_u64()), (Some(5), Some(3)));
-    }
-
-    #[test]
-    fn graphic_cells_draw_their_image() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 2, "cols": 2})).unwrap();
-        s.execute("table.rowHeight", &json!({"height": 100})).ok();
-        // A red image into the first cell.
-        let px: Vec<u8> = (0..40 * 40).flat_map(|_| [255, 0, 0, 255]).collect();
-        let png = designcraft_render::Rendered { width: 40, height: 40, pixels: px }.to_png();
-        s.execute("table.setCell", &json!({"rows": [0, 0], "cols": [0, 0], "text": ""})).ok();
-        let g = s.execute("table.placeGraphic", &json!({"base64": super::super::file::base64_encode(&png), "name": "r.png", "fit": "fill"})).unwrap();
-        assert_eq!((g["row"].as_u64(), g["col"].as_u64()), (Some(0), Some(0)));
-        let d = s.doc().unwrap().doc.clone();
-        let st = d.stories.values().find(|st| !st.tables.is_empty()).unwrap();
-        let t = st.tables.values().next().unwrap();
-        let cs = s.cache.get(&d, st.id, None);
-        let cell = cs.frames[0].tables[0].cells.iter().find(|c| c.row == 0 && c.col == 0).unwrap().clone();
-        let fx = d.item(cs.frames[0].frame).unwrap().xf;
-        let centre = fx * cell.clip.center();
-        let mut rr = designcraft_render::Renderer::new();
-        rr.threads = 0;
-        let img = rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap();
-        let p = img.pixel(centre.x as u32, centre.y as u32);
-        assert!(p[0] > 200 && p[1] < 60, "red in the graphic cell: {p:?}");
-        assert!(t.cell(0, 0).unwrap().graphic.is_some());
-        s.execute("table.textCell", &json!({})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        assert!(d.stories.values().flat_map(|st| st.tables.values()).all(|t| t.cell(0, 0).unwrap().graphic.is_none()));
-    }
-
-    #[test]
-    fn move_rows_and_columns() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 3, "cols": 2})).unwrap();
-        for (r, c, t) in [(0, 0, "a"), (1, 0, "b"), (2, 0, "c"), (0, 1, "x")] {
-            s.execute("table.setCell", &json!({"rows": [r, r], "cols": [c, c], "text": t})).unwrap();
-        }
-        let cell = |s: &Session, r: usize, c: usize| {
-            let d = &s.doc().unwrap().doc;
-            let t = d.stories.values().flat_map(|st| st.tables.values()).next().unwrap();
-            t.cell(r, c).unwrap().text.text.clone()
-        };
-        // Dragging a selected row onto the last row moves it there.
-        let d = s.doc().unwrap().doc.clone();
-        let (sid, tid) = d.stories.values().find_map(|st| st.tables.keys().next().map(|k| (st.id, *k))).unwrap();
-        let fid = d.stories[&sid].frames[0];
-        let cs = s.cache.get(&d, sid, None);
-        let cells = &cs.frames[0].tables[0].cells;
-        let centre = |r: usize| {
-            let c = cells.iter().find(|c| c.row == r && c.col == 0).unwrap().rect.center();
-            d.text_xf(d.item(fid).unwrap()) * c
-        };
-        let (from, to) = (centre(0), centre(2));
-        s.execute("table.select", &json!({"story": sid.0, "table": tid, "rows": [0, 0], "what": "row"})).unwrap();
-        let r2 = s.execute("table.dropCells", &json!({"frame": fid.0, "from": [from.x, from.y], "to": [to.x, to.y]})).unwrap();
-        assert_eq!(r2["moved"], 1);
-        assert_eq!([cell(&s, 0, 0), cell(&s, 1, 0), cell(&s, 2, 0)], ["b", "c", "a"]);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!([cell(&s, 0, 0), cell(&s, 1, 0), cell(&s, 2, 0)], ["a", "b", "c"]);
-        s.execute("table.moveRow", &json!({"from": 0, "to": 2})).unwrap();
-        assert_eq!([cell(&s, 0, 0), cell(&s, 1, 0), cell(&s, 2, 0)], ["b", "c", "a"]);
-        s.execute("table.moveColumn", &json!({"from": 1, "to": 0})).unwrap();
-        assert_eq!((cell(&s, 2, 0), cell(&s, 2, 1)), ("x".to_string(), "a".to_string()));
-    }
-
-    #[test]
-    fn move_row_cannot_move_a_header_row_out_of_place() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 3, "cols": 2, "headerRows": 1})).unwrap();
-        assert!(s.execute("table.moveRow", &json!({"from": 0, "to": 2})).is_err());
-        s.doc().unwrap().doc.check().unwrap();
-        // Dragging the selected header row onto the last body row is refused too.
-        let d = s.doc().unwrap().doc.clone();
-        let (sid, tid) = d.stories.values().find_map(|st| st.tables.keys().next().map(|k| (st.id, *k))).unwrap();
-        let fid = d.stories[&sid].frames[0];
-        let cs = s.cache.get(&d, sid, None);
-        let cells = &cs.frames[0].tables[0].cells;
-        let centre = |r: usize| {
-            let c = cells.iter().find(|c| c.row == r && c.col == 0).unwrap().rect.center();
-            d.text_xf(d.item(fid).unwrap()) * c
-        };
-        let (from, to) = (centre(0), centre(2));
-        s.execute("table.select", &json!({"story": sid.0, "table": tid, "rows": [0, 0], "what": "row"})).unwrap();
-        assert!(s.execute("table.dropCells", &json!({"frame": fid.0, "from": [from.x, from.y], "to": [to.x, to.y]})).is_err());
-        s.doc().unwrap().doc.check().unwrap();
-    }
-
-    #[test]
-    fn table_options_limits_header_and_footer_rows() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 700], "content": "text", "text": ""})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 2, "cols": 2})).unwrap();
-        // The limit `table.insert` has: the table used to grow by as many rows as were asked for.
-        s.execute("table.options", &json!({"headerRows": 5000, "footerRows": 5000})).unwrap();
-        let t = table(&s);
-        assert_eq!((t.header_rows(), t.footer_rows(), t.nrows()), (100, 100, 201));
-    }
-}
-
-#[cfg(test)]
-mod arabic_tests {
-    use super::*;
-    #[test]
-    fn arabic_table_direction_and_physical_left_insertion_support_undo() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [0, 0, 400, 300], "content": "text", "text": ""})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 1, "cols": 2})).unwrap();
-        s.execute("table.setCell", &json!({"rows": [0, 0], "cols": [0, 0], "text": "Right"})).unwrap();
-        s.execute("table.options", &json!({"direction": "rightToLeft"})).unwrap();
-        s.execute("table.select", &json!({"rows": [0, 0], "cols": [0, 0]})).unwrap();
-        s.execute("table.insertColumnLeft", &json!({})).unwrap();
-        let t = s.doc().unwrap().doc.stories.values().flat_map(|st| st.tables.values()).next().unwrap();
-        assert_eq!(t.ncols(), 3);
-        assert_eq!(t.cell(0, 0).unwrap().text.text, "Right");
-        assert!(t.cell(0, 1).unwrap().text.text.is_empty());
-        s.execute("edit.undo", &json!({})).unwrap();
-        let t = s.doc().unwrap().doc.stories.values().flat_map(|st| st.tables.values()).next().unwrap();
-        assert_eq!(t.ncols(), 2);
-        assert_eq!(t.options.direction, designcraft_doc::TextDirection::RightToLeft);
-    }
-
-    /// A text frame whose paragraphs have a paragraph style with `direction`, with the story's
-    /// text selected. Returns the session and the story id.
-    fn styled_frame(direction: &str, text: &str) -> (Session, u64) {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"preset": "A4", "pages": 1})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Dir", "para": {"direction": direction}})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [40, 330, 555, 420], "content": "text", "text": text, "caret": true})).unwrap();
-        s.execute("edit.selectAll", &json!({})).unwrap();
-        s.execute("style.paragraph.apply", &json!({"name": "Dir"})).unwrap();
-        s.execute("edit.selectAll", &json!({})).unwrap();
-        (s, r["story"].as_u64().unwrap())
-    }
-
-    fn only_table(s: &Session) -> std::sync::Arc<designcraft_doc::Table> {
-        s.doc().unwrap().doc.stories.values().flat_map(|st| st.tables.values()).next().unwrap().clone()
-    }
-
-    /// Text converted to a table in a right-to-left paragraph laid its columns out left to right
-    /// (#100): the first column belongs on the right.
-    #[test]
-    fn tables_take_the_direction_of_their_paragraph() {
-        use designcraft_doc::TextDirection::{LeftToRight, RightToLeft};
-        let (mut s, sid) = styled_frame("rightToLeft", "١\t٢\t٣\nأ\tب\tج");
-        s.execute("table.convertFromText", &json!({"columnSeparator": "tab"})).unwrap();
-        assert_eq!(only_table(&s).options.direction, RightToLeft);
-        let st = s.doc().unwrap();
-        let cs = s.cache.get(&st.doc, designcraft_doc::StoryId(sid), None);
-        let placed = &cs.frames[0].tables[0];
-        let (first, last) = (placed.cell(0, 0).unwrap().rect, placed.cell(0, 2).unwrap().rect);
-        assert!(first.x0 > last.x0, "cell ١ is the rightmost: {first:?} {last:?}");
-
-        let (mut s, _) = styled_frame("leftToRight", "1\t2\t3\na\tb\tc");
-        s.execute("table.convertFromText", &json!({"columnSeparator": "tab"})).unwrap();
-        assert_eq!(only_table(&s).options.direction, LeftToRight);
-
-        for (direction, expected) in [("rightToLeft", RightToLeft), ("leftToRight", LeftToRight)] {
-            let (mut s, _) = styled_frame(direction, "x");
-            s.execute("table.insert", &json!({"rows": 1, "cols": 2})).unwrap();
-            assert_eq!(only_table(&s).options.direction, expected, "table.insert in a {direction} paragraph");
-        }
-    }
-}
-
-#[cfg(test)]
-mod resize_border_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// A 3×3 table of 80 pt columns; returns the session, frame id, story and table ids.
-    fn session() -> (Session, u64, u64, u64) {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 472, 600], "content": "text", "text": ""})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        let t = s.execute("table.insert", &json!({"rows": 3, "cols": 3, "width": 240})).unwrap();
-        (s, r["id"].as_u64().unwrap(), t["story"].as_u64().unwrap(), t["table"].as_u64().unwrap())
-    }
-
-    fn table(s: &Session) -> designcraft_doc::Table {
-        (**s.doc().unwrap().doc.stories.values().flat_map(|st| st.tables.values()).next().unwrap()).clone()
-    }
-
-    fn widths(s: &Session) -> Vec<f64> {
-        table(s).columns.iter().map(|c| c.width).collect()
-    }
-
-    /// Composed cell rects of column 0, top to bottom.
-    fn rows(s: &Session) -> Vec<designcraft_geom::Rect> {
-        let st = s.doc().unwrap();
-        let sid = st.doc.stories.values().find(|x| !x.tables.is_empty()).unwrap().id;
-        let cs = s.cache.get(&st.doc, sid, None);
-        cs.frames.iter().flat_map(|f| &f.tables).flat_map(|f| &f.cells).filter(|c| c.col == 0).map(|c| c.rect).collect()
-    }
-
-    fn resize(s: &mut Session, ids: (u64, u64, u64), mut p: serde_json::Value) {
-        p["frame"] = json!(ids.0);
-        p["story"] = json!(ids.1);
-        p["table"] = json!(ids.2);
-        s.execute("table.resizeBorder", &p).unwrap();
-    }
-
-    #[test]
-    fn column_border_drags_widen_the_table_or_keep_its_width() {
-        let (mut s, f, st, t) = session();
-        resize(&mut s, (f, st, t), json!({"axis": "column", "index": 0, "delta": 20}));
-        assert_eq!(widths(&s), [100.0, 80.0, 80.0]);
-        resize(&mut s, (f, st, t), json!({"axis": "column", "index": 1, "delta": 30, "keepTableSize": true}));
-        assert_eq!(widths(&s), [100.0, 110.0, 50.0]);
-        // Clamped at the minimum; the neighbour takes only what is left.
-        resize(&mut s, (f, st, t), json!({"axis": "column", "index": 1, "delta": 500, "keepTableSize": true}));
-        assert_eq!(widths(&s), [100.0, 157.0, 3.0]);
-        resize(&mut s, (f, st, t), json!({"axis": "column", "index": 0, "delta": -1000}));
-        assert_eq!(widths(&s), [3.0, 157.0, 3.0]);
-        // Shift on the end edge scales every column.
-        resize(&mut s, (f, st, t), json!({"axis": "column", "index": 2, "size": 166, "keepTableSize": true}));
-        let w = widths(&s);
-        assert!((w.iter().sum::<f64>() - 326.0).abs() < 1e-9, "{w:?}");
-        assert!((w[1] / w[0] - 157.0 / 3.0).abs() < 1e-9, "{w:?}");
-        assert!(s.execute("table.resizeBorder", &json!({"table": t, "axis": "column", "index": 3, "delta": 1})).is_err());
-        assert!(s.execute("table.resizeBorder", &json!({"table": t, "axis": "column", "index": 0})).is_err());
-    }
-
-    #[test]
-    fn row_drag_sets_at_least_and_moves_later_rows() {
-        let (mut s, f, st, t) = session();
-        s.execute("table.setRowHeight", &json!({"table": t, "row": 0, "height": 30, "mode": "exactly"})).unwrap();
-        let before = rows(&s);
-        resize(&mut s, (f, st, t), json!({"axis": "row", "index": 0, "delta": 12}));
-        let row = &table(&s).rows[0];
-        assert_eq!((row.height, row.mode), (42.0, designcraft_doc::RowHeightMode::AtLeast));
-        let after = rows(&s);
-        assert!((after[0].height() - 42.0).abs() < 1e-9);
-        assert!((after[1].y0 - before[1].y0 - 12.0).abs() < 1e-9 && (after[1].height() - before[1].height()).abs() < 1e-9);
-        // Below the minimum: clamped, never negative.
-        resize(&mut s, (f, st, t), json!({"axis": "row", "index": 0, "delta": -1000}));
-        assert_eq!(table(&s).rows[0].height, 3.0);
-    }
-
-    #[test]
-    fn a_drag_is_one_undo_step_and_locked_frames_refuse() {
-        let (mut s, f, st, t) = session();
-        let before = table(&s);
-        s.begin_interaction("Resize Column").unwrap();
-        for d in [5.0, 15.0, 25.0] {
-            let p = json!({"frame": f, "story": st, "table": t, "axis": "column", "index": 0, "delta": d});
-            s.preview("table.resizeBorder", p).unwrap();
-        }
-        s.commit_interaction().unwrap();
-        assert_eq!(widths(&s), [105.0, 80.0, 80.0]);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(table(&s), before);
-        s.execute("object.setFlags", &json!({"ids": [f], "locked": true})).unwrap();
-        assert!(s.execute("table.resizeBorder", &json!({"frame": f, "table": t, "axis": "column", "index": 0, "delta": 5})).is_err());
-    }
-}
+mod cell;
+mod content;
+mod options;
+mod registry;
+mod selection;
+mod sizing;
+mod structure;
+mod styles;
+mod target;
+
+pub use registry::specs;
+pub(crate) use selection::step_cell;
diff --git a/crates/engine/src/cmd/table/cell.rs b/crates/engine/src/cmd/table/cell.rs
new file mode 100644
index 000000000..93a1f3dab
--- /dev/null
+++ b/crates/engine/src/cmd/table/cell.rs
@@ -0,0 +1,487 @@
+use super::target::{edit_table, target};
+use super::{CellRange, CellStroke, Document, Result, Session, StrokeType, Table, Value, VerticalJustification, bad, compose, json, ok, str_param};
+
+/// Cell edges chosen for a stroke edit: the target range's four outer sides (physical left and
+/// right) and the lines between its rows and columns.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+struct EdgeSel {
+    top: bool,
+    left: bool,
+    bottom: bool,
+    right: bool,
+    inner_h: bool,
+    inner_v: bool,
+}
+
+impl EdgeSel {
+    const ALL: EdgeSel = EdgeSel { top: true, left: true, bottom: true, right: true, inner_h: true, inner_v: true };
+
+    fn parse(v: Option<&Value>, cmd: &str) -> Result<EdgeSel> {
+        let names: Vec<&Value> = match v {
+            None | Some(Value::Null) => return Ok(EdgeSel::ALL),
+            Some(Value::Array(a)) => a.iter().collect(),
+            Some(v) => vec![v],
+        };
+        let mut e = EdgeSel::default();
+        for n in names {
+            match n.as_str() {
+                Some("all") => e = EdgeSel::ALL,
+                Some("outer") => (e.top, e.left, e.bottom, e.right) = (true, true, true, true),
+                Some("inner") => (e.inner_h, e.inner_v) = (true, true),
+                Some("top") => e.top = true,
+                Some("left") => e.left = true,
+                Some("bottom") => e.bottom = true,
+                Some("right") => e.right = true,
+                Some("innerHorizontal") => e.inner_h = true,
+                Some("innerVertical") => e.inner_v = true,
+                _ => return Err(bad(cmd, format!("unknown edge {n}; use all|outer|inner|top|left|bottom|right|innerHorizontal|innerVertical"))),
+            }
+        }
+        if e == EdgeSel::default() {
+            return Err(bad(cmd, "no edges chosen"));
+        }
+        Ok(e)
+    }
+
+    /// Which sides (top, left, bottom, right) of the cell at `(r, c)` with `spans` are chosen
+    /// within `rg`. Left and right are physical sides, also in RTL tables.
+    fn sides(&self, rg: CellRange, (r, c): (usize, usize), spans: (u32, u32), rtl: bool) -> [bool; 4] {
+        let last_row = r.saturating_add((spans.0.max(1) - 1) as usize);
+        let last_col = c.saturating_add((spans.1.max(1) - 1) as usize);
+        let (start, end) = (c <= rg.c0, last_col >= rg.c1);
+        let (left_outer, right_outer) = if rtl { (end, start) } else { (start, end) };
+        [
+            if r <= rg.r0 { self.top } else { self.inner_h },
+            if left_outer { self.left } else { self.inner_v },
+            if last_row >= rg.r1 { self.bottom } else { self.inner_h },
+            if right_outer { self.right } else { self.inner_v },
+        ]
+    }
+}
+
+/// A finite number in `lo..=hi`, or an error naming `key`.
+fn num_in(v: &Value, key: &str, lo: f64, hi: f64, cmd: &str) -> Result<Option<f64>> {
+    match v.get(key) {
+        None | Some(Value::Null) => Ok(None),
+        Some(x) => match x.as_f64() {
+            Some(n) if n.is_finite() && (lo..=hi).contains(&n) => Ok(Some(n)),
+            _ => Err(bad(cmd, format!("{key} must be a number from {lo} to {hi}"))),
+        },
+    }
+}
+
+/// A swatch of the document (or [None]), or an error naming `key`.
+fn swatch_in(doc: &Document, v: &Value, keys: &[&str], cmd: &str) -> Result<Option<String>> {
+    let Some((key, x)) = keys.iter().find_map(|k| v.get(*k).filter(|x| !x.is_null()).map(|x| (*k, x))) else { return Ok(None) };
+    let name = x.as_str().ok_or_else(|| bad(cmd, format!("{key} must be a swatch name")))?;
+    if name != designcraft_color::swatch::NONE && doc.swatch(name).is_none() {
+        return Err(bad(cmd, format!("no swatch `{name}`")));
+    }
+    Ok(Some(name.to_string()))
+}
+
+/// The cell stroke type names of `type`.
+const CELL_STROKE_TYPES: &[&str] =
+    &["solid", "dashed", "dotted", "thickThin", "thinThick", "thinThin", "thickThick", "thinThickThin", "thickThinThick", "wavy", "hashed"];
+
+/// The attributes a stroke edit sets. A plain `"dashed"` gets a pattern scaled to the
+/// resulting weight of each edge.
+pub(super) struct StrokeEdit {
+    attrs: designcraft_doc::CellStrokeAttrs,
+    scaled_dashes: bool,
+}
+
+impl StrokeEdit {
+    pub(super) fn parse(doc: &Document, v: &Value, cmd: &str) -> Result<StrokeEdit> {
+        if !v.is_object() {
+            return Err(bad(cmd, "stroke must be an object"));
+        }
+        let mut attrs = designcraft_doc::CellStrokeAttrs {
+            weight: num_in(v, "weight", 0.0, 1000.0, cmd)?,
+            color: swatch_in(doc, v, &["color"], cmd)?,
+            tint: num_in(v, "tint", 0.0, 1.0, cmd)?.map(|t| t as f32),
+            gap_color: swatch_in(doc, v, &["gapColor", "gapSwatch"], cmd)?,
+            gap_tint: num_in(v, "gapTint", 0.0, 1.0, cmd)?.map(|t| t as f32),
+            kind: None,
+        };
+        let mut scaled_dashes = false;
+        match v.get("type") {
+            None | Some(Value::Null) => {}
+            Some(Value::String(name)) if name == "dashed" => {
+                scaled_dashes = true;
+                attrs.kind = Some(StrokeType::Dashed { pattern: Vec::new() });
+            }
+            Some(Value::String(name)) if CELL_STROKE_TYPES.contains(&name.as_str()) => {
+                attrs.kind = Some(serde_json::from_value(json!({"kind": name})).map_err(|e| bad(cmd, e.to_string()))?);
+            }
+            Some(t @ Value::Object(_)) => {
+                let kind: StrokeType = serde_json::from_value(t.clone()).map_err(|e| bad(cmd, format!("bad stroke type: {e}")))?;
+                let finite = |v: &[f64]| v.len() <= 64 && v.iter().all(|x| x.is_finite() && *x >= 0.0);
+                match &kind {
+                    StrokeType::Dashed { pattern } if !StrokeType::valid_dash_pattern(pattern) => {
+                        return Err(bad(cmd, "a dash pattern needs 1 to 64 lengths, each 0 or 0.1 to 10000 pt, not all 0"));
+                    }
+                    StrokeType::Stripes { bands } if bands.len() > 64 || !bands.iter().all(|(a, b)| finite(&[*a, *b])) => {
+                        return Err(bad(cmd, "stripes need up to 64 bands of non-negative numbers"));
+                    }
+                    StrokeType::Style { name } if !doc.stroke_styles.iter().any(|s| s.name == *name) => {
+                        return Err(bad(cmd, format!("no stroke style `{name}`")));
+                    }
+                    _ => {}
+                }
+                attrs.kind = Some(kind);
+            }
+            Some(other) => return Err(bad(cmd, format!("unknown stroke type {other}"))),
+        }
+        Ok(StrokeEdit { attrs, scaled_dashes })
+    }
+
+    pub(super) fn apply(&self, mut base: CellStroke) -> CellStroke {
+        self.attrs.apply_to(&mut base);
+        if self.scaled_dashes {
+            let w = base.weight.max(1.0);
+            base.kind = StrokeType::Dashed { pattern: vec![w * 3.0, w * 2.0] };
+        }
+        base
+    }
+}
+
+/// The stroke drawn on side `side` of the owner cell at `(r, c)` (where that side meets its
+/// first neighbour), as rendering resolves it; the cell's own copy if the side has no stretch.
+fn drawn_side(t: &Table, owners: &[(usize, usize)], (r, c): (usize, usize), side: usize) -> Option<CellStroke> {
+    let drawn = compose::table::cell_side_strokes(t, owners, (r, c), side).first().map(|s| s.stroke.clone());
+    drawn.or_else(|| t.cell(r, c).and_then(|cell| cell.strokes.get(side).cloned()))
+}
+
+/// Cell Options › Text › First Baseline: `firstBaseline` (offset method) and `firstBaselineMin` (pt).
+pub(super) fn first_baseline_params(p: &Value, id: &str) -> Result<(Option<designcraft_doc::FirstBaseline>, Option<f64>)> {
+    let fb = match p.get("firstBaseline").filter(|v| !v.is_null()) {
+        Some(v) => Some(serde_json::from_value(v.clone()).map_err(|e| bad(id, format!("firstBaseline: {e}")))?),
+        None => None,
+    };
+    let min = match p.get("firstBaselineMin").filter(|v| !v.is_null()) {
+        Some(v) => match v.as_f64().filter(|m| m.is_finite() && (0.0..=8640.0).contains(m)) {
+            Some(m) => Some(m),
+            None => return Err(bad(id, "firstBaselineMin: a number of points from 0 to 8640")),
+        },
+        None => None,
+    };
+    Ok((fb, min))
+}
+
+fn mirror_edited_cell_edges(
+    table: &mut Table,
+    range: CellRange,
+    table_size: (usize, usize, bool),
+    stroke: Option<&(StrokeEdit, EdgeSel)>,
+    edited: &std::collections::HashSet<(usize, usize, usize)>,
+    owners: &[(usize, usize)],
+) {
+    let (rows, columns, rtl) = table_size;
+    let mirror = |table: &mut Table, from: (usize, usize), edge: usize, to: (usize, usize), opposite: usize| {
+        if edited.contains(&(from.0, from.1, edge)) {
+            mirror_cell_edge(table, owners, from, edge, to, opposite);
+        }
+    };
+    let Some((_, edges)) = stroke else { return };
+    if edges.top
+        && let Some(row) = range.r0.checked_sub(1)
+    {
+        for column in range.c0..=range.c1 {
+            mirror(table, (range.r0, column), 0, (row, column), 2);
+        }
+    }
+    if edges.bottom && range.r1.saturating_add(1) < rows {
+        for column in range.c0..=range.c1 {
+            mirror(table, (range.r1, column), 2, (range.r1 + 1, column), 0);
+        }
+    }
+    if (if rtl { edges.right } else { edges.left })
+        && let Some(column) = range.c0.checked_sub(1)
+    {
+        for row in range.r0..=range.r1 {
+            mirror(table, (row, range.c0), if rtl { 3 } else { 1 }, (row, column), if rtl { 1 } else { 3 });
+        }
+    }
+    if (if rtl { edges.left } else { edges.right }) && range.c1.saturating_add(1) < columns {
+        for row in range.r0..=range.r1 {
+            mirror(table, (row, range.c1), if rtl { 1 } else { 3 }, (row, range.c1 + 1), if rtl { 3 } else { 1 });
+        }
+    }
+}
+
+pub(super) fn set_cell(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "table.setCell";
+    let g = target(s, p, ID)?;
+    let doc = &s.doc()?.doc;
+    let fill = swatch_in(doc, p, &["fill"], ID)?;
+    let tint = num_in(p, "tint", 0.0, 1.0, ID)?.map(|t| t as f32);
+    let insets: Option<[f64; 4]> = match p.get("insets") {
+        Some(Value::Number(n)) => n.as_f64().map(|v| [v.max(0.0); 4]),
+        Some(Value::Array(a)) if a.len() == 4 => {
+            let v: Vec<f64> = a.iter().map(|x| x.as_f64().unwrap_or(0.0).max(0.0)).collect();
+            Some([v[0], v[1], v[2], v[3]])
+        }
+        _ => None,
+    };
+    let vj = match str_param(p, "vj").or_else(|| str_param(p, "verticalJustification")) {
+        Some("top") => Some(VerticalJustification::Top),
+        Some("center") => Some(VerticalJustification::Center),
+        Some("bottom") => Some(VerticalJustification::Bottom),
+        Some("justify") => Some(VerticalJustification::Justify),
+        Some(o) => return Err(bad(ID, format!("unknown vj `{o}`"))),
+        None => None,
+    };
+    let (first_baseline, first_baseline_min) = first_baseline_params(p, ID)?;
+    // Cell Options › Text › Rotation. The value is kept and written back to IDML; only 0 is
+    // composed so far, which the IDML import reports (#1468).
+    let rotation = match p.get("rotation").filter(|v| !v.is_null()) {
+        Some(v) => match v.as_f64().map(|d| d.rem_euclid(360.0)) {
+            Some(d) if d == 0.0 || d == 90.0 || d == 180.0 || d == 270.0 => Some(d),
+            _ => return Err(bad(ID, "rotation: 0, 90, 180 or 270 degrees")),
+        },
+        None => None,
+    };
+    let text = str_param(p, "text").map(|_| crate::cmd::text_param(p, "text"));
+    let stroke = match p.get("stroke").filter(|v| !v.is_null()) {
+        Some(sv) => Some((StrokeEdit::parse(doc, sv, ID)?, EdgeSel::parse(sv.get("edges"), ID)?)),
+        None => None,
+    };
+    edit_table(s, &g, ID, |t| {
+        let owners = t.owners();
+        let nc = t.ncols();
+        let nr = t.nrows();
+        let rtl = t.options.direction == designcraft_doc::TextDirection::RightToLeft;
+        // Local edits outrank previously imported edges, including explicit zero/None.
+        let priority = if stroke.is_some() { next_cell_stroke_priority(t) } else { 0 };
+        let rg = g.range;
+        // Edges are inner or outer within the selection grown to whole merged cells, so a
+        // merged cell selected through one of its grid positions keeps its own outline.
+        let outline = t.expand_range(rg);
+        // Each chosen edge starts from the stroke drawn there, which both copies of a shared
+        // edge then take, so the edit changes only the attributes it names.
+        let mut bases = std::collections::HashMap::new();
+        if let Some((_, edges)) = &stroke {
+            for (r, c) in t.selected_owners(rg) {
+                let Some(cell) = t.cell(r, c) else { continue };
+                for (i, on) in edges.sides(outline, (r, c), (cell.row_span, cell.col_span), rtl).into_iter().enumerate() {
+                    if let Some(base) = drawn_side(t, &owners, (r, c), i).filter(|_| on) {
+                        bases.insert((r, c, i), base);
+                    }
+                }
+            }
+        }
+        let mut edited = std::collections::HashSet::new();
+        for (r, c) in t.selected_owners(rg) {
+            let Some(cell) = t.cell_mut(r, c) else { continue };
+            if let Some(f) = &fill {
+                cell.fill = f.clone();
+            }
+            if let Some(ti) = tint {
+                cell.fill_tint = ti;
+            }
+            if let Some(i) = insets {
+                cell.insets = i;
+            }
+            if let Some(v) = vj {
+                cell.vj = v;
+            }
+            if let Some(v) = first_baseline {
+                cell.first_baseline = v;
+            }
+            if let Some(v) = first_baseline_min {
+                cell.first_baseline_min = v;
+            }
+            if let Some(v) = rotation {
+                cell.rotation = v;
+            }
+            if let Some(tx) = &text {
+                let len = cell.text.len();
+                cell.text.replace(0..len, tx);
+            }
+            if let Some((edit, _)) = &stroke {
+                for i in 0..4 {
+                    if let Some(base) = bases.remove(&(r, c, i)) {
+                        edited.insert((r, c, i));
+                        cell.strokes[i] = edit.apply(base);
+                        cell.stroke_defined[i] = true;
+                        cell.stroke_priorities[i] = priority;
+                        cell.border_overrides[i] = true;
+                    }
+                }
+            }
+        }
+        // Keep both copies of unmerged shared boundaries consistent, including in RTL tables.
+        mirror_edited_cell_edges(t, rg, (nr, nc, rtl), stroke.as_ref(), &edited, &owners);
+        ok()
+    })
+}
+
+/// The shown stroke attributes of the chosen edges of the target cells, and their fill; values
+/// that differ are null.
+pub(super) fn get_cell_stroke(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "table.getCellStroke";
+    let g = target(s, p, ID)?;
+    let edges = EdgeSel::parse(p.get("edges"), ID)?;
+    let st = s.doc()?;
+    let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or_else(|| bad(ID, "no table"))?;
+    let owners = t.owners();
+    let outline = t.expand_range(g.range);
+    let rtl = t.options.direction == designcraft_doc::TextDirection::RightToLeft;
+    // One value per key, or null once two edges (cells) disagree.
+    fn merge(slot: &mut Option<Value>, v: Value) {
+        match slot {
+            None => *slot = Some(v),
+            Some(cur) if *cur != v => *cur = Value::Null,
+            _ => {}
+        }
+    }
+    let keys = ["weight", "color", "tint", "type", "gapColor", "gapTint"];
+    let mut stroke: [Option<Value>; 6] = Default::default();
+    let (mut fill, mut fill_tint) = (None, None);
+    // Each drawn edge once: a shared edge is a side of both its cells.
+    let mut seen = std::collections::HashSet::new();
+    for (r, c) in t.selected_owners(g.range) {
+        let Some(cell) = t.cell(r, c) else { continue };
+        merge(&mut fill, json!(cell.fill));
+        merge(&mut fill_tint, json!(cell.fill_tint));
+        for (i, on) in edges.sides(outline, (r, c), (cell.row_span, cell.col_span), rtl).into_iter().enumerate() {
+            if !on {
+                continue;
+            }
+            for side in compose::table::cell_side_strokes(t, &owners, (r, c), i) {
+                let (x, y) = (Some((r, c)), side.neighbor);
+                if !seen.insert((i % 2, side.boundary, x.min(y), x.max(y))) {
+                    continue;
+                }
+                let e = side.stroke;
+                let values = [json!(e.weight), json!(e.color), json!(e.tint), json!(e.kind), json!(e.gap_color), json!(e.gap_tint)];
+                for (slot, v) in stroke.iter_mut().zip(values) {
+                    merge(slot, v);
+                }
+            }
+        }
+    }
+    let mut out = serde_json::Map::new();
+    for (k, v) in keys.iter().zip(stroke) {
+        out.insert((*k).into(), v.unwrap_or(Value::Null));
+    }
+    out.insert("fill".into(), fill.unwrap_or(Value::Null));
+    out.insert("fillTint".into(), fill_tint.unwrap_or(Value::Null));
+    out.insert("edges".into(), json!(seen.len()));
+    Ok(Value::Object(out))
+}
+
+/// Only saturation needs rebasing. Preserve every distinct priority's order and keep
+/// zero/negative priorities untouched; the work is bounded by the table's edges.
+fn next_cell_stroke_priority(t: &mut Table) -> i32 {
+    let highest = t.cells.iter().flat_map(|cell| cell.stroke_priorities).max().unwrap_or(0).max(0);
+    if highest < i32::MAX {
+        return highest + 1;
+    }
+    let values: std::collections::BTreeSet<_> = t.cells.iter().flat_map(|cell| cell.stroke_priorities).filter(|p| *p > 0).collect();
+    let mut ranks = std::collections::BTreeMap::new();
+    let mut highest = 0i32;
+    for value in values {
+        highest = highest.saturating_add(1);
+        ranks.insert(value, highest);
+    }
+    for cell in &mut t.cells {
+        for priority in &mut cell.stroke_priorities {
+            if let Some(rank) = ranks.get(priority) {
+                *priority = *rank;
+            }
+        }
+    }
+    highest.saturating_add(1)
+}
+
+fn mirror_cell_edge(t: &mut Table, owners: &[(usize, usize)], from: (usize, usize), edge: usize, to: (usize, usize), opposite: usize) {
+    let owner = |pos: (usize, usize)| owners.get(pos.0.checked_mul(t.ncols())?.checked_add(pos.1)?).copied();
+    if owner(from) != Some(from) || owner(to) != Some(to) {
+        return;
+    }
+    // A merged cell's edge may border several separately editable cells. Mirroring
+    // a segment onto that whole edge would change unselected neighbors; priorities
+    // instead resolve each segment without altering the merged cell's formatting.
+    let merged = |cell: &designcraft_doc::Cell| cell.row_span > 1 || cell.col_span > 1;
+    if t.cell(from.0, from.1).is_some_and(merged) || t.cell(to.0, to.1).is_some_and(merged) {
+        return;
+    }
+    let source = t
+        .cell(from.0, from.1)
+        .map(|cell| (cell.strokes[edge].clone(), cell.stroke_defined[edge], cell.stroke_priorities[edge], cell.border_overrides[edge]));
+    if let (Some((stroke, defined, priority, border_override)), Some(neighbor)) = (source, t.cell_mut(to.0, to.1)) {
+        neighbor.strokes[opposite] = stroke;
+        neighbor.stroke_defined[opposite] = defined;
+        neighbor.stroke_priorities[opposite] = priority;
+        neighbor.border_overrides[opposite] = border_override;
+    }
+}
+
+#[cfg(test)]
+mod arabic_tests {
+    use super::*;
+    #[test]
+    fn arabic_table_direction_and_physical_left_insertion_support_undo() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [0, 0, 400, 300], "content": "text", "text": ""})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("table.insert", &json!({"rows": 1, "cols": 2})).unwrap();
+        s.execute("table.setCell", &json!({"rows": [0, 0], "cols": [0, 0], "text": "Right"})).unwrap();
+        s.execute("table.options", &json!({"direction": "rightToLeft"})).unwrap();
+        s.execute("table.select", &json!({"rows": [0, 0], "cols": [0, 0]})).unwrap();
+        s.execute("table.insertColumnLeft", &json!({})).unwrap();
+        let t = s.doc().unwrap().doc.stories.values().flat_map(|st| st.tables.values()).next().unwrap();
+        assert_eq!(t.ncols(), 3);
+        assert_eq!(t.cell(0, 0).unwrap().text.text, "Right");
+        assert!(t.cell(0, 1).unwrap().text.text.is_empty());
+        s.execute("edit.undo", &json!({})).unwrap();
+        let t = s.doc().unwrap().doc.stories.values().flat_map(|st| st.tables.values()).next().unwrap();
+        assert_eq!(t.ncols(), 2);
+        assert_eq!(t.options.direction, designcraft_doc::TextDirection::RightToLeft);
+    }
+
+    /// A text frame whose paragraphs have a paragraph style with `direction`, with the story's
+    /// text selected. Returns the session and the story id.
+    fn styled_frame(direction: &str, text: &str) -> (Session, u64) {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"preset": "A4", "pages": 1})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Dir", "para": {"direction": direction}})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [40, 330, 555, 420], "content": "text", "text": text, "caret": true})).unwrap();
+        s.execute("edit.selectAll", &json!({})).unwrap();
+        s.execute("style.paragraph.apply", &json!({"name": "Dir"})).unwrap();
+        s.execute("edit.selectAll", &json!({})).unwrap();
+        (s, r["story"].as_u64().unwrap())
+    }
+
+    fn only_table(s: &Session) -> std::sync::Arc<designcraft_doc::Table> {
+        s.doc().unwrap().doc.stories.values().flat_map(|st| st.tables.values()).next().unwrap().clone()
+    }
+
+    /// Text converted to a table in a right-to-left paragraph laid its columns out left to right
+    /// (#100): the first column belongs on the right.
+    #[test]
+    fn tables_take_the_direction_of_their_paragraph() {
+        use designcraft_doc::TextDirection::{LeftToRight, RightToLeft};
+        let (mut s, sid) = styled_frame("rightToLeft", "١\t٢\t٣\nأ\tب\tج");
+        s.execute("table.convertFromText", &json!({"columnSeparator": "tab"})).unwrap();
+        assert_eq!(only_table(&s).options.direction, RightToLeft);
+        let st = s.doc().unwrap();
+        let cs = s.cache.get(&st.doc, designcraft_doc::StoryId(sid), None);
+        let placed = &cs.frames[0].tables[0];
+        let (first, last) = (placed.cell(0, 0).unwrap().rect, placed.cell(0, 2).unwrap().rect);
+        assert!(first.x0 > last.x0, "cell ١ is the rightmost: {first:?} {last:?}");
+
+        let (mut s, _) = styled_frame("leftToRight", "1\t2\t3\na\tb\tc");
+        s.execute("table.convertFromText", &json!({"columnSeparator": "tab"})).unwrap();
+        assert_eq!(only_table(&s).options.direction, LeftToRight);
+
+        for (direction, expected) in [("rightToLeft", RightToLeft), ("leftToRight", LeftToRight)] {
+            let (mut s, _) = styled_frame(direction, "x");
+            s.execute("table.insert", &json!({"rows": 1, "cols": 2})).unwrap();
+            assert_eq!(only_table(&s).options.direction, expected, "table.insert in a {direction} paragraph");
+        }
+    }
+}
diff --git a/crates/engine/src/cmd/table/content.rs b/crates/engine/src/cmd/table/content.rs
new file mode 100644
index 000000000..2d306c811
--- /dev/null
+++ b/crates/engine/src/cmd/table/content.rs
@@ -0,0 +1,388 @@
+use super::selection::cell_at;
+use super::target::{clamp_selection, edit_table, target};
+use super::{CellRange, Result, Session, TableSel, Value, bad, json};
+
+pub(super) fn drop_cells(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "table.dropCells";
+    let frame = crate::cmd::id_param(p, "frame").ok_or_else(|| bad(ID, "`frame` required"))?;
+    let pt = |k: &str| -> Result<designcraft_geom::Point> {
+        let a = p.get(k).and_then(Value::as_array).ok_or_else(|| bad(ID, format!("`{k}` required")))?;
+        Ok(designcraft_geom::Point::new(a.first().and_then(Value::as_f64).unwrap_or(0.0), a.get(1).and_then(Value::as_f64).unwrap_or(0.0)))
+    };
+    let (from, to) = (pt("from")?, pt("to")?);
+    let sel = s.doc()?.selection.cells;
+    let hit_from = cell_at(s, frame, from);
+    let hit_to = cell_at(s, frame, to);
+    if let (Some(ts), Some((sid, tid, fr, fc)), Some((_, tid2, tr, tc))) = (sel, hit_from, hit_to)
+        && ts.story == sid
+        && ts.table == tid
+        && tid2 == tid
+        && s.doc()?.doc.story(sid).and_then(|st| st.tables.get(&tid)).is_some_and(|t| t.selected_owners(ts.range).binary_search(&(fr, fc)).is_ok())
+    {
+        let (nr, nc) = {
+            let t = s.doc()?.doc.story(sid).and_then(|st| st.tables.get(&tid)).ok_or_else(|| bad(ID, "no table"))?;
+            (t.nrows(), t.ncols())
+        };
+        let r = ts.range;
+        let rows = r.c0 == 0 && r.c1 + 1 == nc;
+        let cols = r.r0 == 0 && r.r1 + 1 == nr;
+        if rows || cols {
+            let (lo, hi, target) = if rows { (r.r0, r.r1, tr) } else { (r.c0, r.c1, tc) };
+            if target >= lo && target <= hi {
+                return Ok(json!({"moved": 0}));
+            }
+            let n = hi - lo + 1;
+            let r2 = s.edit(|d, selm| {
+                let t = d.story_mut(sid).and_then(|st| st.table_mut(tid)).ok_or_else(|| bad(ID, "no table"))?;
+                let mv = |t: &mut designcraft_doc::Table, a: usize, b: usize| if rows { t.move_row(a, b) } else { t.move_col(a, b) };
+                let new_lo = if target > hi {
+                    for _ in 0..n {
+                        mv(t, lo, target).map_err(|e| bad(ID, e))?;
+                    }
+                    target + 1 - n
+                } else {
+                    for k in 0..n {
+                        mv(t, lo + k, target + k).map_err(|e| bad(ID, e))?;
+                    }
+                    target
+                };
+                let range =
+                    if rows { CellRange::new(new_lo, r.c0, new_lo + n - 1, r.c1) } else { CellRange::new(r.r0, new_lo, r.r1, new_lo + n - 1) };
+                selm.cells = Some(TableSel { range, ..ts });
+                Ok(json!({"moved": n, "to": new_lo}))
+            })?;
+            return Ok(r2);
+        }
+    }
+    // Not a row/column drag: select text from the press to the release.
+    s.execute("text.placeCaret", &json!({"frame": frame.0, "point": [from.x, from.y]}))?;
+    s.execute("text.extendTo", &json!({"frame": frame.0, "point": [to.x, to.y]}))
+}
+
+pub(super) fn place_graphic(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "table.placeGraphic";
+    let g = target(s, p, ID)?;
+    let (bytes, name, link) = crate::cmd::file::read_source(p)?;
+    let (pw, ph) = designcraft_render::image_size(&bytes).ok_or_else(|| bad(ID, "unsupported or corrupt image"))?;
+    let (nw, nh) = designcraft_render::natural_size(&bytes, 0).ok_or_else(|| bad(ID, "invalid image dimensions"))?;
+    let fill = p.get("fit").and_then(Value::as_str) == Some("fill");
+    // Compute fitting before the edit: a small EPS can overflow in a huge cell.
+    let t = s.doc()?.doc.story(g.story).and_then(|st| st.tables.get(&g.table)).ok_or_else(|| bad(ID, "no table"))?;
+    let (r, c) = t.owner(g.range.r0, g.range.c0);
+    let cell = t.cell(r, c).ok_or_else(|| bad(ID, "no cell"))?;
+    let (rs, cs) = (cell.row_span.max(1) as usize, cell.col_span.max(1) as usize);
+    let w: f64 = t.columns.get(c..c.saturating_add(cs).min(t.ncols())).ok_or_else(|| bad(ID, "invalid cell span"))?.iter().map(|x| x.width).sum();
+    let h: f64 = t.rows.get(r..r.saturating_add(rs).min(t.nrows())).ok_or_else(|| bad(ID, "invalid cell span"))?.iter().map(|x| x.height).sum();
+    let ins = cell.insets;
+    let (bw, bh) = ((w - ins[1] - ins[3]).max(1.0), (h - ins[0] - ins[2]).max(1.0));
+    let k = if fill { (bw / nw).max(bh / nh) } else { (bw / nw).min(bh / nh) };
+    let xf = designcraft_geom::Affine::translate(((bw - nw * k) / 2.0, (bh - nh * k) / 2.0)) * designcraft_geom::Affine::scale(k);
+    crate::cmd::file::validate_placement((nw, nh), designcraft_geom::Rect::new(0.0, 0.0, bw, bh), xf, ID)?;
+    s.edit(|d, sel| {
+        let fresh = designcraft_doc::AssetId(d.alloc());
+        let mime = designcraft_render::image_mime(&bytes).to_string();
+        let aid = d.add_asset(designcraft_doc::Asset {
+            id: fresh,
+            name,
+            mime,
+            link,
+            data: std::sync::Arc::new(bytes),
+            pixels: Some((pw, ph)),
+            ..Default::default()
+        });
+        let st = d.story_mut(g.story).ok_or_else(|| bad(ID, "no story"))?;
+        let t = st.table_mut(g.table).ok_or_else(|| bad(ID, "no table"))?;
+        let cell = t.cell_mut(r, c).ok_or_else(|| bad(ID, format!("no cell {r},{c}")))?;
+        cell.graphic = Some(designcraft_doc::Graphic {
+            layer_options: None,
+            asset: aid,
+            size: (nw, nh),
+            xf,
+            clip: None,
+            auto_fit: if fill { designcraft_doc::Fitting::FillProportionally } else { designcraft_doc::Fitting::FitProportionally },
+            fit_align: 4,
+            crop: [0.0; 4],
+            wrap: Default::default(),
+            fill: Default::default(),
+        });
+        clamp_selection(d, sel);
+        Ok(json!({"asset": aid.0, "row": r, "col": c}))
+    })
+}
+
+pub(super) fn sort_rows(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.sortRows")?;
+    let col = p.get("column").and_then(Value::as_u64).map_or(g.range.c0, |c| c as usize);
+    let desc = p.get("descending").and_then(Value::as_bool).unwrap_or(false);
+    edit_table(s, &g, "table.sortRows", |t| {
+        let (nr, nc) = (t.nrows(), t.ncols());
+        if col >= nc {
+            return Err(bad("table.sortRows", format!("no column {col}")));
+        }
+        if t.cells.iter().any(|c| c.row_span > 1) {
+            return Err(bad("table.sortRows", "unmerge cells that span rows first"));
+        }
+        let (h, f) = (t.header_rows(), t.footer_rows());
+        let body: Vec<usize> = (h..nr - f).collect();
+        let key = |r: usize| t.cell(r, col).map(|c| c.text.text.trim().to_string()).unwrap_or_default();
+        let mut order = body.clone();
+        order.sort_by(|a, b| {
+            let (ka, kb) = (key(*a), key(*b));
+            let o = match (ka.replace(',', "").parse::<f64>(), kb.replace(',', "").parse::<f64>()) {
+                (Ok(x), Ok(y)) => x.total_cmp(&y),
+                _ => ka.to_lowercase().cmp(&kb.to_lowercase()),
+            };
+            if desc { o.reverse() } else { o }
+        });
+        let rows = t.rows.clone();
+        let cells = t.cells.clone();
+        for (k, src) in order.iter().enumerate() {
+            let dst = body[k];
+            t.rows[dst] = rows[*src].clone();
+            for c in 0..nc {
+                t.cells[dst * nc + c] = cells[src * nc + c].clone();
+            }
+        }
+        Ok(json!({"sorted": body.len()}))
+    })
+}
+
+#[cfg(test)]
+mod sort_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    fn distribution_session() -> Session {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 700], "content": "text", "text": ""})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("table.insert", &json!({"rows": 3, "cols": 2, "headerRows": 1})).unwrap();
+        for (row, height) in [(0, 25), (1, 40), (2, 80), (3, 30)] {
+            s.execute("table.setRowHeight", &json!({"row": row, "height": height, "mode": "exactly"})).unwrap();
+            s.execute("table.setCell", &json!({"row": row, "col": 0, "text": format!("row {row}")})).unwrap();
+        }
+        s
+    }
+
+    fn table(s: &Session) -> designcraft_doc::Table {
+        (**s.doc().unwrap().doc.stories.values().flat_map(|st| st.tables.values()).next().unwrap()).clone()
+    }
+
+    #[test]
+    fn distribute_selected_rows_preserves_height_content_and_undo() {
+        let mut s = distribution_session();
+        s.execute("table.select", &json!({"rows": [1, 2], "what": "row"})).unwrap();
+        let before = table(&s);
+        let selection = s.doc().unwrap().selection.cells;
+        let result = s.execute("table.distributeRows", &json!({})).unwrap();
+        assert_eq!(result, json!({"rows": 2, "height": 60.0}));
+        let after = table(&s);
+        assert_eq!(after.rows.iter().map(|r| r.height).collect::<Vec<_>>(), [25.0, 60.0, 60.0, 30.0]);
+        assert_eq!(after.cells, before.cells);
+        assert_eq!(after.rows[0].kind, before.rows[0].kind);
+        assert_eq!(s.doc().unwrap().selection.cells, selection);
+        let st = s.doc().unwrap();
+        let sid = st.doc.stories.values().find(|st| !st.tables.is_empty()).unwrap().id;
+        let cs = s.cache.get(&st.doc, sid, None);
+        let heights: Vec<_> =
+            cs.frames.iter().flat_map(|f| &f.tables).flat_map(|f| &f.cells).filter(|c| c.col == 0).map(|c| c.rect.height()).collect();
+        assert_eq!(heights, [25.0, 60.0, 60.0, 30.0]);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(table(&s), before);
+        s.execute("edit.redo", &json!({})).unwrap();
+        assert_eq!(table(&s), after);
+    }
+
+    #[test]
+    fn distribution_uses_content_grown_heights_and_explicit_table() {
+        let mut s = distribution_session();
+        s.execute("table.setRowHeight", &json!({"rows": [1, 2], "height": 3, "mode": "atLeast"})).unwrap();
+        s.execute("table.setCell", &json!({"row": 2, "col": 0, "text": "one\ntwo\nthree"})).unwrap();
+        let st = s.doc().unwrap();
+        let story = st.doc.stories.values().find(|st| !st.tables.is_empty()).unwrap();
+        let (sid, tid) = (story.id, *story.tables.keys().next().unwrap());
+        let cs = s.cache.get(&st.doc, sid, None);
+        let total: f64 = cs
+            .frames
+            .iter()
+            .flat_map(|f| &f.tables)
+            .flat_map(|f| &f.cells)
+            .filter(|c| c.col == 0 && (1..=2).contains(&c.row))
+            .map(|c| c.rect.height())
+            .sum();
+        let result = s.execute("table.distributeRows", &json!({"story": sid.0, "table": tid, "rows": [1, 2]})).unwrap();
+        assert!((result["height"].as_f64().unwrap() * 2.0 - total).abs() < 1e-6);
+        assert!(table(&s).rows[1].height > 3.0);
+        assert_eq!(table(&s).rows[1].mode, designcraft_doc::RowHeightMode::Exactly);
+    }
+
+    #[test]
+    fn distribution_keeps_column_spans_and_caret() {
+        let mut s = distribution_session();
+        s.execute("table.merge", &json!({"rows": [1, 1], "cols": [0, 1]})).unwrap();
+        let before = table(&s);
+        let caret = s.doc().unwrap().selection.text;
+        let result = s.execute("table.distributeRows", &json!({"rows": [2, 1]})).unwrap();
+        assert_eq!(result["height"], 60.0);
+        assert_eq!(table(&s).cell(1, 0).unwrap().col_span, 2);
+        assert_eq!(table(&s).cells, before.cells);
+        assert_eq!(s.doc().unwrap().selection.text, caret);
+    }
+
+    #[test]
+    fn distribution_rejects_merges_and_missing_rows_without_changes() {
+        let mut s = distribution_session();
+        s.execute("table.merge", &json!({"rows": [1, 2], "cols": [0, 0]})).unwrap();
+        let before = table(&s);
+        assert!(s.execute("table.distributeRows", &json!({"rows": [1, 2]})).is_err());
+        assert_eq!(table(&s), before);
+        s.execute("edit.undo", &json!({})).unwrap();
+        s.execute("table.setRowHeight", &json!({"rows": [0, 3], "height": 10000, "mode": "exactly"})).unwrap();
+        let before = table(&s);
+        assert!(s.execute("table.distributeRows", &json!({"rows": [0, 3]})).is_err());
+        assert_eq!(table(&s), before);
+        assert!(s.execute("table.distributeRows", &json!({"rows": [0, 99]})).is_err());
+        for params in
+            [json!({"rows": "all"}), json!({"rows": [0]}), json!({"rows": [-1, 2]}), json!({"row": 1.5}), json!({"table": "bad"}), json!([])]
+        {
+            assert!(s.execute("table.distributeRows", &params).is_err(), "{params}");
+            assert_eq!(table(&s), before);
+        }
+    }
+
+    #[test]
+    fn sort_body_rows_by_a_column() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("table.insert", &json!({"rows": 3, "cols": 2, "headerRows": 1})).unwrap();
+        let cells = [("Name", "Qty"), ("pear", "10"), ("Apple", "9"), ("fig", "100")];
+        for (r, (a, b)) in cells.iter().enumerate() {
+            s.execute("table.setCell", &json!({"rows": [r, r], "cols": [0, 0], "text": a})).unwrap();
+            s.execute("table.setCell", &json!({"rows": [r, r], "cols": [1, 1], "text": b})).unwrap();
+        }
+        let col = |s: &Session, c: usize| -> Vec<String> {
+            let d = &s.doc().unwrap().doc;
+            let t = d.stories.values().flat_map(|st| st.tables.values()).next().unwrap();
+            (0..t.nrows()).map(|r| t.cell(r, c).unwrap().text.text.clone()).collect()
+        };
+        s.execute("table.sortRows", &json!({"column": 0})).unwrap();
+        assert_eq!(col(&s, 0), ["Name", "Apple", "fig", "pear"], "header stays; case-insensitive");
+        s.execute("table.sortRows", &json!({"column": 1, "descending": true})).unwrap();
+        assert_eq!(col(&s, 1), ["Qty", "100", "10", "9"], "numbers by value");
+        s.execute("table.splitVertically", &json!({"rows": [1, 1], "cols": [0, 0]})).unwrap();
+        let r = s.execute("table.splitHorizontally", &json!({"rows": [0, 0], "cols": [1, 1]})).unwrap();
+        assert_eq!((r["rows"].as_u64(), r["cols"].as_u64()), (Some(5), Some(3)));
+    }
+
+    #[test]
+    fn graphic_cells_draw_their_image() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("table.insert", &json!({"rows": 2, "cols": 2})).unwrap();
+        s.execute("table.rowHeight", &json!({"height": 100})).ok();
+        // A red image into the first cell.
+        let px: Vec<u8> = (0..40 * 40).flat_map(|_| [255, 0, 0, 255]).collect();
+        let png = designcraft_render::Rendered { width: 40, height: 40, pixels: px }.to_png();
+        s.execute("table.setCell", &json!({"rows": [0, 0], "cols": [0, 0], "text": ""})).ok();
+        let g = s.execute("table.placeGraphic", &json!({"base64": crate::cmd::file::base64_encode(&png), "name": "r.png", "fit": "fill"})).unwrap();
+        assert_eq!((g["row"].as_u64(), g["col"].as_u64()), (Some(0), Some(0)));
+        let d = s.doc().unwrap().doc.clone();
+        let st = d.stories.values().find(|st| !st.tables.is_empty()).unwrap();
+        let t = st.tables.values().next().unwrap();
+        let cs = s.cache.get(&d, st.id, None);
+        let cell = cs.frames[0].tables[0].cells.iter().find(|c| c.row == 0 && c.col == 0).unwrap().clone();
+        let fx = d.item(cs.frames[0].frame).unwrap().xf;
+        let centre = fx * cell.clip.center();
+        let mut rr = designcraft_render::Renderer::new();
+        rr.threads = 0;
+        let img = rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap();
+        let p = img.pixel(centre.x as u32, centre.y as u32);
+        assert!(p[0] > 200 && p[1] < 60, "red in the graphic cell: {p:?}");
+        assert!(t.cell(0, 0).unwrap().graphic.is_some());
+        s.execute("table.textCell", &json!({})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        assert!(d.stories.values().flat_map(|st| st.tables.values()).all(|t| t.cell(0, 0).unwrap().graphic.is_none()));
+    }
+
+    #[test]
+    fn move_rows_and_columns() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("table.insert", &json!({"rows": 3, "cols": 2})).unwrap();
+        for (r, c, t) in [(0, 0, "a"), (1, 0, "b"), (2, 0, "c"), (0, 1, "x")] {
+            s.execute("table.setCell", &json!({"rows": [r, r], "cols": [c, c], "text": t})).unwrap();
+        }
+        let cell = |s: &Session, r: usize, c: usize| {
+            let d = &s.doc().unwrap().doc;
+            let t = d.stories.values().flat_map(|st| st.tables.values()).next().unwrap();
+            t.cell(r, c).unwrap().text.text.clone()
+        };
+        // Dragging a selected row onto the last row moves it there.
+        let d = s.doc().unwrap().doc.clone();
+        let (sid, tid) = d.stories.values().find_map(|st| st.tables.keys().next().map(|k| (st.id, *k))).unwrap();
+        let fid = d.stories[&sid].frames[0];
+        let cs = s.cache.get(&d, sid, None);
+        let cells = &cs.frames[0].tables[0].cells;
+        let centre = |r: usize| {
+            let c = cells.iter().find(|c| c.row == r && c.col == 0).unwrap().rect.center();
+            d.text_xf(d.item(fid).unwrap()) * c
+        };
+        let (from, to) = (centre(0), centre(2));
+        s.execute("table.select", &json!({"story": sid.0, "table": tid, "rows": [0, 0], "what": "row"})).unwrap();
+        let r2 = s.execute("table.dropCells", &json!({"frame": fid.0, "from": [from.x, from.y], "to": [to.x, to.y]})).unwrap();
+        assert_eq!(r2["moved"], 1);
+        assert_eq!([cell(&s, 0, 0), cell(&s, 1, 0), cell(&s, 2, 0)], ["b", "c", "a"]);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!([cell(&s, 0, 0), cell(&s, 1, 0), cell(&s, 2, 0)], ["a", "b", "c"]);
+        s.execute("table.moveRow", &json!({"from": 0, "to": 2})).unwrap();
+        assert_eq!([cell(&s, 0, 0), cell(&s, 1, 0), cell(&s, 2, 0)], ["b", "c", "a"]);
+        s.execute("table.moveColumn", &json!({"from": 1, "to": 0})).unwrap();
+        assert_eq!((cell(&s, 2, 0), cell(&s, 2, 1)), ("x".to_string(), "a".to_string()));
+    }
+
+    #[test]
+    fn move_row_cannot_move_a_header_row_out_of_place() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("table.insert", &json!({"rows": 3, "cols": 2, "headerRows": 1})).unwrap();
+        assert!(s.execute("table.moveRow", &json!({"from": 0, "to": 2})).is_err());
+        s.doc().unwrap().doc.check().unwrap();
+        // Dragging the selected header row onto the last body row is refused too.
+        let d = s.doc().unwrap().doc.clone();
+        let (sid, tid) = d.stories.values().find_map(|st| st.tables.keys().next().map(|k| (st.id, *k))).unwrap();
+        let fid = d.stories[&sid].frames[0];
+        let cs = s.cache.get(&d, sid, None);
+        let cells = &cs.frames[0].tables[0].cells;
+        let centre = |r: usize| {
+            let c = cells.iter().find(|c| c.row == r && c.col == 0).unwrap().rect.center();
+            d.text_xf(d.item(fid).unwrap()) * c
+        };
+        let (from, to) = (centre(0), centre(2));
+        s.execute("table.select", &json!({"story": sid.0, "table": tid, "rows": [0, 0], "what": "row"})).unwrap();
+        assert!(s.execute("table.dropCells", &json!({"frame": fid.0, "from": [from.x, from.y], "to": [to.x, to.y]})).is_err());
+        s.doc().unwrap().doc.check().unwrap();
+    }
+
+    #[test]
+    fn table_options_limits_header_and_footer_rows() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 700], "content": "text", "text": ""})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("table.insert", &json!({"rows": 2, "cols": 2})).unwrap();
+        // The limit `table.insert` has: the table used to grow by as many rows as were asked for.
+        s.execute("table.options", &json!({"headerRows": 5000, "footerRows": 5000})).unwrap();
+        let t = table(&s);
+        assert_eq!((t.header_rows(), t.footer_rows(), t.nrows()), (100, 100, 201));
+    }
+}
diff --git a/crates/engine/src/cmd/table/options.rs b/crates/engine/src/cmd/table/options.rs
new file mode 100644
index 000000000..7f9ed7786
--- /dev/null
+++ b/crates/engine/src/cmd/table/options.rs
@@ -0,0 +1,88 @@
+use super::cell::StrokeEdit;
+use super::target::{color_param, edit_table, target};
+use super::{AltFills, Result, Session, Value, bad, f64_or, json};
+
+fn parse_alt(v: &Value) -> Option<AltFills> {
+    if v.is_null() {
+        return None;
+    }
+    let d = AltFills::default();
+    Some(AltFills {
+        first: v.get("first").and_then(Value::as_u64).map_or(d.first, |x| u32::try_from(x).unwrap_or(u32::MAX)),
+        first_color: color_param(v, "firstColor").unwrap_or(d.first_color),
+        first_tint: v.get("firstTint").and_then(Value::as_f64).map_or(d.first_tint, |x| x as f32),
+        next: v.get("next").and_then(Value::as_u64).map_or(d.next, |x| u32::try_from(x).unwrap_or(u32::MAX)),
+        next_color: color_param(v, "nextColor").unwrap_or(d.next_color),
+        next_tint: v.get("nextTint").and_then(Value::as_f64).map_or(d.next_tint, |x| x as f32),
+        skip_first: v.get("skipFirst").and_then(Value::as_u64).map_or(0, |x| u32::try_from(x).unwrap_or(u32::MAX)),
+        skip_last: v.get("skipLast").and_then(Value::as_u64).map_or(0, |x| u32::try_from(x).unwrap_or(u32::MAX)),
+    })
+}
+
+pub(super) fn options(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.options")?;
+    let border = match p.get("border").filter(|v| !v.is_null()) {
+        Some(b) => Some(StrokeEdit::parse(&s.doc()?.doc, b, "table.options")?),
+        None => None,
+    };
+    let p = p.clone();
+    edit_table(s, &g, "table.options", |t| {
+        let o = &mut t.options;
+        if let Some(v) = p.get("direction") {
+            o.direction = serde_json::from_value(v.clone()).map_err(|e| bad("table.options", e.to_string()))?;
+        }
+        if let Some(b) = &border {
+            o.border = b.apply(o.border.clone());
+            o.borders = Default::default();
+        }
+        o.space_before = f64_or(&p, "spaceBefore", o.space_before);
+        o.space_after = f64_or(&p, "spaceAfter", o.space_after);
+        if let Some(b) = p.get("repeatHeader").and_then(Value::as_bool) {
+            o.repeat_header = b;
+        }
+        if let Some(b) = p.get("repeatFooter").and_then(Value::as_bool) {
+            o.repeat_footer = b;
+        }
+        if let Some(v) = p.get("altRows") {
+            o.alt_rows = parse_alt(v);
+        }
+        if let Some(v) = p.get("altCols") {
+            o.alt_cols = parse_alt(v);
+        }
+        // At most 100 of each, as in `table.insert`: the rows the table lacks are added below.
+        let h = p.get("headerRows").and_then(Value::as_u64).map(|v| v.min(100) as usize);
+        let f = p.get("footerRows").and_then(Value::as_u64).map(|v| v.min(100) as usize);
+        if h.is_some() || f.is_some() {
+            let (h, f) = (h.unwrap_or(t.header_rows()), f.unwrap_or(t.footer_rows()));
+            // Add rows when there aren't enough for the requested header/footer plus one body row.
+            let need = h + f + 1;
+            if t.nrows() < need {
+                let at = t.nrows();
+                t.insert_rows(at, need - at);
+            }
+            t.set_header_footer(h, f);
+        }
+        Ok(json!({"options": t.options}))
+    })
+}
+
+pub(super) fn get(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.get")?;
+    let st = s.doc()?;
+    let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or_else(|| bad("table.get", "no table"))?;
+    let owners = t.owners();
+    let cells: Vec<Value> = (0..t.nrows())
+        .flat_map(|r| (0..t.ncols()).map(move |c| (r, c)))
+        .filter(|&(r, c)| owners[r * t.ncols() + c] == (r, c))
+        .filter_map(|(r, c)| {
+            let cell = t.cell(r, c)?;
+            Some(json!({"row": r, "col": c, "rowSpan": cell.row_span, "colSpan": cell.col_span, "text": cell.text.text, "fill": cell.fill,
+                "insets": cell.insets, "vj": cell.vj, "firstBaseline": cell.first_baseline, "firstBaselineMin": cell.first_baseline_min, "rotation": cell.rotation, "style": cell.style}))
+        })
+        .collect();
+    Ok(json!({
+        "story": g.story.0, "table": g.table, "anchor": st.doc.story(g.story).and_then(|x| x.table_anchor(g.table)),
+        "rows": t.rows, "columns": t.columns, "headerRows": t.header_rows(), "footerRows": t.footer_rows(),
+        "cells": cells, "options": t.options, "range": g.range, "style": t.style,
+    }))
+}
diff --git a/crates/engine/src/cmd/table/registry.rs b/crates/engine/src/cmd/table/registry.rs
new file mode 100644
index 000000000..28d451ced
--- /dev/null
+++ b/crates/engine/src/cmd/table/registry.rs
@@ -0,0 +1,402 @@
+use super::cell::{get_cell_stroke, set_cell};
+use super::content::{drop_cells, place_graphic, sort_rows};
+use super::options::{get, options};
+use super::selection::{move_rc, select, step_cell};
+use super::sizing::{distribute_cols, distribute_rows, resize_border, set_col_width, set_row_height};
+use super::structure::{
+    can_convert_rows, convert_from_text, convert_rows, convert_to_text, delete_cols, delete_rows, delete_table, insert, insert_col, insert_row,
+    merge, split, unmerge,
+};
+use super::styles::{cell_style_apply, cell_style_create, cell_style_edit, table_style_apply, table_style_create, table_style_edit};
+use super::target::{edit_table, in_cell, in_table, in_table_or_ids, target};
+use super::{CommandSpec, RowKind, cmd, has_doc, has_text, json, ok};
+
+pub fn specs() -> Vec<CommandSpec> {
+    let mut v = style_specs();
+    v.extend(table_specs());
+    v
+}
+
+fn style_specs() -> Vec<CommandSpec> {
+    vec![
+        cmd!(
+            "style.cell.create",
+            "New Cell Style…",
+            [],
+            None,
+            "{name, fromSelection?: bool (the target cell's look), fill?, tint?, insets?: n|[t,l,b,r], vj?: top|center|bottom|justify, firstBaseline?: ascent|capHeight|leading|xHeight|fixed|emboxHeight, firstBaselineMin?: pt, stroke?: {weight?, color?, tint?, type?, gapColor?, gapTint?} (all four edges; values as table.setCell's stroke), paragraphStyle?, basedOn?: cell style name, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} → {name}",
+            has_doc,
+            |s, p| cell_style_create(s, p)
+        ),
+        cmd!(
+            "style.cell.apply",
+            "Apply Cell Style",
+            [],
+            None,
+            "{name, story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?} — the target cells (the whole table when the cursor is in it)",
+            in_table,
+            cell_style_apply
+        ),
+        cmd!(
+            "style.cell.edit",
+            "Cell Style Options…",
+            [],
+            None,
+            "{name, …same as style.cell.create} — cells using the style follow",
+            has_doc,
+            cell_style_edit
+        ),
+        cmd!(
+            "style.table.create",
+            "New Table Style…",
+            [],
+            None,
+            "{name, basedOn?: table style name, header?, body?, footer?, leftColumn?, rightColumn?: cell style names, border?: {weight?, color?, tint?, type?, gapColor?, gapTint?}, altRows?: {first, firstColor, next, nextColor}, spaceBefore?, spaceAfter?} → {name}",
+            has_doc,
+            table_style_create
+        ),
+        cmd!(
+            "style.table.apply",
+            "Apply Table Style",
+            [],
+            None,
+            "{name, story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?}",
+            in_table,
+            table_style_apply
+        ),
+        cmd!(
+            "style.table.edit",
+            "Table Style Options…",
+            [],
+            None,
+            "{name, …same as style.table.create} — tables using the style follow",
+            has_doc,
+            table_style_edit
+        ),
+    ]
+}
+
+fn table_specs() -> Vec<CommandSpec> {
+    vec![
+        cmd!(
+            "table.insert",
+            "Create Table",
+            [],
+            Some("Cmd+Alt+Shift+T"),
+            "{rows?: body rows (4), cols? | columns? (4), headerRows? (0), footerRows? (0), width?} — at the text insertion point",
+            has_text,
+            insert
+        ),
+        cmd!(
+            "table.convertFromText",
+            "Convert Text to Table",
+            ["Table"],
+            None,
+            "{columnSeparator?: tab|comma, width?: table width (default: the column)} — selected paragraphs become rows",
+            has_text,
+            convert_from_text
+        ),
+        cmd!(
+            "table.convertToText",
+            "Convert Table to Text",
+            ["Table"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — cells separated by tabs, rows by paragraphs",
+            in_table,
+            convert_to_text
+        ),
+        cmd!(
+            "table.insertRow",
+            "Insert Row",
+            [],
+            None,
+            "{where?: above|below, count? (1), story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            |s, p| insert_row(s, p, None)
+        ),
+        cmd!(
+            "table.insertRowAbove",
+            "Insert Row Above",
+            ["Table", "Insert"],
+            None,
+            "{count?, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            |s, p| insert_row(s, p, Some(true))
+        ),
+        cmd!(
+            "table.insertRowBelow",
+            "Insert Row Below",
+            ["Table", "Insert"],
+            None,
+            "{count?, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            |s, p| insert_row(s, p, Some(false))
+        ),
+        cmd!(
+            "table.insertColumn",
+            "Insert Column",
+            [],
+            None,
+            "{where?: left|right, count? (1), width?, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            |s, p| insert_col(s, p, None)
+        ),
+        cmd!(
+            "table.insertColumnLeft",
+            "Insert Column Left",
+            ["Table", "Insert"],
+            None,
+            "{count?, width?, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            |s, p| insert_col(s, p, Some(true))
+        ),
+        cmd!(
+            "table.insertColumnRight",
+            "Insert Column Right",
+            ["Table", "Insert"],
+            None,
+            "{count?, width?, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            |s, p| insert_col(s, p, Some(false))
+        ),
+        cmd!(
+            "table.deleteRow",
+            "Delete Row",
+            ["Table", "Delete"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — the rows of the target cells",
+            in_table,
+            delete_rows
+        ),
+        cmd!(
+            "table.deleteColumn",
+            "Delete Column",
+            ["Table", "Delete"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — the columns of the target cells",
+            in_table,
+            delete_cols
+        ),
+        cmd!(
+            "table.delete",
+            "Delete Table",
+            ["Table", "Delete"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            delete_table
+        ),
+        cmd!(
+            "table.merge",
+            "Merge Cells",
+            ["Table"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — merge the target cell range",
+            in_table,
+            merge
+        ),
+        cmd!(
+            "table.dropCells",
+            "Drag Rows or Columns",
+            [],
+            None,
+            "{frame, from: [x, y], to: [x, y]} — selected whole rows (or columns) dragged from `from` move to the row (column) at `to`; otherwise a text drag",
+            has_doc,
+            drop_cells
+        ),
+        cmd!(
+            "table.placeGraphic",
+            "Convert Cell to Graphic Cell",
+            ["Table", "Convert Cell Type"],
+            None,
+            "{path? | base64?, name?: with base64, fit?: proportional|fill (default proportional), story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — an image in the target cell (its text is kept but hidden)",
+            in_table,
+            place_graphic
+        ),
+        cmd!(
+            "table.textCell",
+            "Convert Cell to Text Cell",
+            ["Table", "Convert Cell Type"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — drop the target cells' graphics",
+            in_table,
+            |s, p| {
+                let g = target(s, p, "table.textCell")?;
+                edit_table(s, &g, "table.textCell", |t| {
+                    for (r, c) in t.selected_owners(g.range) {
+                        if let Some(cell) = t.cell_mut(r, c) {
+                            cell.graphic = None;
+                        }
+                    }
+                    ok()
+                })
+            }
+        ),
+        cmd!(
+            "table.moveRow",
+            "Move Row",
+            [],
+            None,
+            "{from?, to, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} (0-based; from defaults to the target row) — like dragging a row",
+            in_table,
+            |s, p| move_rc(s, p, true)
+        ),
+        cmd!(
+            "table.moveColumn",
+            "Move Column",
+            [],
+            None,
+            "{from?, to, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} (0-based; from defaults to the target column)",
+            in_table,
+            |s, p| move_rc(s, p, false)
+        ),
+        cmd!(
+            "table.sortRows",
+            "Sort",
+            ["Table"],
+            None,
+            "{column?: 0-based (default: the target cell's), descending?: bool, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — body rows by that column's text (numbers numerically)",
+            in_table,
+            sort_rows
+        ),
+        cmd!(
+            "table.unmerge",
+            "Unmerge Cells",
+            ["Table"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            unmerge
+        ),
+        cmd!(
+            "table.splitHorizontally",
+            "Split Cell Horizontally",
+            ["Table"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — each target cell becomes two, one above the other",
+            in_table,
+            |s, p| split(s, p, true)
+        ),
+        cmd!(
+            "table.splitVertically",
+            "Split Cell Vertically",
+            ["Table"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — each target cell becomes two, side by side",
+            in_table,
+            |s, p| split(s, p, false)
+        ),
+        cmd!(
+            "table.setCell",
+            "Cell Options",
+            [],
+            None,
+            "{fill?: swatch, tint?: 0..1, insets?: n | [t,l,b,r], vj? | verticalJustification?: top|center|bottom|justify, firstBaseline?: ascent|capHeight|leading|xHeight|fixed|emboxHeight, firstBaselineMin?: pt, rotation?: 0|90|180|270 (Cell Options › Text › Rotation; kept and written back to IDML, composed horizontally for now), text?, stroke?: {weight?, color?: swatch, tint?: 0..1, type?: solid|dashed|dotted|thickThin|thinThick|thinThin|thickThick|thinThickThin|thickThinThick|wavy|hashed | {kind:…}, gapColor?: swatch, gapTint?: 0..1, edges?: name | [names] (all|outer|inner|top|left|bottom|right|innerHorizontal|innerVertical; default all)}, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — top/left/bottom/right are the target range's outer sides, innerHorizontal/innerVertical the lines between its rows/columns",
+            in_table,
+            set_cell
+        ),
+        cmd!(
+            query "table.getCellStroke",
+            "Get Cell Stroke",
+            [],
+            None,
+            "{story?, table?, rows?, cols?, edges?} → {weight, color, tint, type, gapColor, gapTint, fill, fillTint, edges: count} of the chosen edges of the target cells; a value that differs between them is null",
+            in_table_or_ids,
+            get_cell_stroke
+        ),
+        cmd!(
+            "table.setRowHeight",
+            "Row Height",
+            [],
+            None,
+            "{height, mode?: atLeast|exactly, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            set_row_height
+        ),
+        cmd!(
+            "table.setColumnWidth",
+            "Column Width",
+            [],
+            None,
+            "{width, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            set_col_width
+        ),
+        cmd!(
+            "table.resizeBorder",
+            "Resize Row or Column",
+            [],
+            None,
+            "{story?, table?, frame?, axis: column|row, index, delta? | size?, keepTableSize?: bool} — moves the border after column/row `index` by `delta` (or makes that column/row `size` wide/high); later columns/rows move along. The last index is the table's end/bottom edge. keepTableSize: on an inner border the next column/row gives or takes the change; on the edge all columns/rows scale proportionally. A dragged row becomes At Least. Refuses a locked `frame`",
+            in_table_or_ids,
+            resize_border
+        ),
+        cmd!(
+            "table.distributeColumns",
+            "Distribute Columns Evenly",
+            ["Table"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            distribute_cols
+        ),
+        cmd!(
+            "table.distributeRows",
+            "Distribute Rows Evenly",
+            ["Table"],
+            None,
+            "{story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?} — equal fixed heights preserving the selected rows' composed total height; may overset cell text; unmerge row-spanning cells first",
+            in_table,
+            distribute_rows
+        ),
+        cmd!(
+            "table.options",
+            "Table Options",
+            [],
+            None,
+            "{direction?: leftToRight|rightToLeft, border?: {weight?, color?, tint?, type?, gapColor?, gapTint?}, spaceBefore?, spaceAfter?, headerRows?, footerRows?, repeatHeader?, repeatFooter?, altRows?: {first, firstColor, firstTint, next, nextColor, nextTint, skipFirst, skipLast} | null, altCols?: … | null, story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}",
+            in_table,
+            options
+        ),
+        cmd!(
+            "table.convertRowsToHeader",
+            "To Header",
+            ["Table", "Convert Rows"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — the target rows, at the top of the table or right after its header rows",
+            |s| can_convert_rows(s, RowKind::Header),
+            |s, p| convert_rows(s, p, RowKind::Header)
+        ),
+        cmd!(
+            "table.convertRowsToBody",
+            "To Body",
+            ["Table", "Convert Rows"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — the target header rows next to the body, footer rows next to it, or both",
+            |s| can_convert_rows(s, RowKind::Body),
+            |s, p| convert_rows(s, p, RowKind::Body)
+        ),
+        cmd!(
+            "table.convertRowsToFooter",
+            "To Footer",
+            ["Table", "Convert Rows"],
+            None,
+            "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)} — the target rows, at the bottom of the table or right before its footer rows",
+            |s| can_convert_rows(s, RowKind::Footer),
+            |s, p| convert_rows(s, p, RowKind::Footer)
+        ),
+        cmd!(noundo "table.select", "Select Cells", [], None, "{story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?, what?: cell|row|column|table}", in_table_or_ids, select),
+        cmd!(noundo "table.selectTable", "Select Table", ["Table", "Select"], None, "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}", in_table, |s, p| {
+            select(s, &crate::cmd::with_param(p, "what", json!("table")))
+        }),
+        cmd!(noundo "table.selectRow", "Select Row", ["Table", "Select"], None, "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}", in_table, |s, p| {
+            select(s, &crate::cmd::with_param(p, "what", json!("row")))
+        }),
+        cmd!(noundo "table.selectColumn", "Select Column", ["Table", "Select"], None, "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}", in_table, |s, p| {
+            select(s, &crate::cmd::with_param(p, "what", json!("column")))
+        }),
+        cmd!(noundo "table.nextCell", "Next Cell", [], None, "{}", in_cell, |s, _| step_cell(s, true)),
+        cmd!(noundo "table.prevCell", "Previous Cell", [], None, "{}", in_cell, |s, _| step_cell(s, false)),
+        cmd!(query "table.get", "Get Table", [], None, "{story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?} → rows, columns, cells (text, spans, fill), options", in_table_or_ids, get),
+    ]
+}
diff --git a/crates/engine/src/cmd/table/selection.rs b/crates/engine/src/cmd/table/selection.rs
new file mode 100644
index 000000000..9e0a11d0e
--- /dev/null
+++ b/crates/engine/src/cmd/table/selection.rs
@@ -0,0 +1,91 @@
+use super::target::{Tgt, edit_table, target};
+use super::{CellAddr, CellRange, Result, Selection, Session, StoryId, TableSel, TextSel, Value, bad, json, ok, str_param};
+
+// ---------- selection ----------
+
+pub(super) fn select(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.select")?;
+    let (nr, nc) = {
+        let st = s.doc()?;
+        let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or_else(|| bad("table.select", "no table"))?;
+        (t.nrows(), t.ncols())
+    };
+    let mut r = g.range;
+    match str_param(p, "what") {
+        Some("table") => r = CellRange { r0: 0, c0: 0, r1: nr - 1, c1: nc - 1 },
+        Some("row") => {
+            r.c0 = 0;
+            r.c1 = nc - 1;
+        }
+        Some("column") => {
+            r.r0 = 0;
+            r.r1 = nr - 1;
+        }
+        _ => {}
+    }
+    let st = s.doc_mut()?;
+    let frame = st.selection.text.and_then(|t| t.frame);
+    st.selection = Selection {
+        cells: Some(TableSel { story: g.story, table: g.table, range: r }),
+        text: Some(TextSel { story: g.story, anchor: 0, focus: 0, frame, cell: Some(CellAddr { table: g.table, row: r.r0, col: r.c0 }) }),
+        ..Default::default()
+    };
+    st.bump_revision();
+    Ok(json!({"story": g.story.0, "table": g.table, "range": r}))
+}
+
+/// Move the caret to the next/previous cell (Tab / Shift-Tab), selecting its text. Tab in the last
+/// cell adds a row.
+pub(crate) fn step_cell(s: &mut Session, forward: bool) -> Result<Value> {
+    let t = s.doc()?.selection.text.ok_or_else(|| bad("table.nextCell", "no caret"))?;
+    let c = t.cell.ok_or_else(|| bad("table.nextCell", "not in a cell"))?;
+    let (owners, nr, nc) = {
+        let st = s.doc()?;
+        let tb = st.doc.story(t.story).and_then(|x| x.tables.get(&c.table)).ok_or_else(|| bad("table.nextCell", "no table"))?;
+        (tb.owners(), tb.nrows(), tb.ncols())
+    };
+    let cur = c.row * nc + c.col;
+    let next =
+        if forward { (cur + 1..nr * nc).find(|&i| owners[i] == (i / nc, i % nc)) } else { (0..cur).rev().find(|&i| owners[i] == (i / nc, i % nc)) };
+    let (row, col) = match next {
+        Some(i) => (i / nc, i % nc),
+        None if forward => {
+            let g = Tgt { story: t.story, table: c.table, range: CellRange::cell(nr - 1, 0) };
+            edit_table(s, &g, "table.nextCell", |tb| {
+                tb.insert_rows(nr, 1);
+                ok()
+            })?;
+            (nr, 0)
+        }
+        None => return ok(),
+    };
+    let st = s.doc_mut()?;
+    let len = st.doc.text_story(t.story, Some(CellAddr { table: c.table, row, col })).map_or(0, |x| x.len());
+    st.selection = Selection::text(TextSel { anchor: 0, focus: len, cell: Some(CellAddr { table: c.table, row, col }), ..t });
+    st.bump_revision();
+    Ok(json!({"row": row, "col": col}))
+}
+
+/// The table cell under spread point `pt` in text frame `frame`: (story, table, row, col).
+pub(super) fn cell_at(s: &Session, frame: designcraft_doc::ItemId, pt: designcraft_geom::Point) -> Option<(StoryId, u64, usize, usize)> {
+    let st = s.active()?;
+    let loc = st.doc.find(frame)?;
+    let it = st.doc.item_at(&loc)?;
+    let sid = it.text_frame()?.story;
+    let inner = (st.doc.parent_xf(&loc) * st.doc.text_xf(it)).inverse() * pt;
+    let cs = s.cache.get(&st.doc, sid, None);
+    let fi = cs.frames.iter().position(|f| f.frame == frame)?;
+    let (table, row, col, _) = designcraft_compose::hit_cell(&cs, fi, inner)?;
+    Some((sid, table, row, col))
+}
+
+pub(super) fn move_rc(s: &mut Session, p: &Value, rows: bool) -> Result<Value> {
+    const ID: &str = "table.move";
+    let g = target(s, p, ID)?;
+    let from = p.get("from").and_then(Value::as_u64).map_or(if rows { g.range.r0 } else { g.range.c0 }, |v| v as usize);
+    let to = p.get("to").and_then(Value::as_u64).ok_or_else(|| bad(ID, "`to` required"))? as usize;
+    edit_table(s, &g, ID, |t| {
+        if rows { t.move_row(from, to) } else { t.move_col(from, to) }.map_err(|e| bad(ID, e))?;
+        Ok(json!({"from": from, "to": to}))
+    })
+}
diff --git a/crates/engine/src/cmd/table/sizing.rs b/crates/engine/src/cmd/table/sizing.rs
new file mode 100644
index 000000000..b097af87f
--- /dev/null
+++ b/crates/engine/src/cmd/table/sizing.rs
@@ -0,0 +1,322 @@
+use super::target::{edit_table, target};
+use super::{Result, RowHeightMode, Session, Table, Value, bad, compose, json, ok, str_param};
+
+pub(super) fn set_row_height(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.setRowHeight")?;
+    let h = p.get("height").and_then(Value::as_f64).map(|h| h.clamp(0.0, 10000.0));
+    let mode = match str_param(p, "mode") {
+        Some("exactly") => Some(RowHeightMode::Exactly),
+        Some("atLeast") => Some(RowHeightMode::AtLeast),
+        Some(o) => return Err(bad("table.setRowHeight", format!("unknown mode `{o}`"))),
+        None => None,
+    };
+    if h.is_none() && mode.is_none() {
+        return Err(bad("table.setRowHeight", "missing height"));
+    }
+    edit_table(s, &g, "table.setRowHeight", |t| {
+        for row in &mut t.rows[g.range.r0..=g.range.r1] {
+            if let Some(h) = h {
+                row.height = h;
+            }
+            if let Some(m) = mode {
+                row.mode = m;
+            }
+        }
+        ok()
+    })
+}
+
+pub(super) fn set_col_width(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.setColumnWidth")?;
+    let w = p.get("width").and_then(Value::as_f64).ok_or_else(|| bad("table.setColumnWidth", "missing width"))?.clamp(3.0, 10000.0);
+    edit_table(s, &g, "table.setColumnWidth", |t| {
+        for c in &mut t.columns[g.range.c0..=g.range.c1] {
+            c.width = w;
+        }
+        ok()
+    })
+}
+
+/// Smallest column width and row height a border drag leaves.
+const MIN_TRACK: f64 = 3.0;
+
+const MAX_TRACK: f64 = 10000.0;
+
+/// Composed height of `row` (laid out from cells that span only that row), else its model height.
+fn composed_row_height(cs: &compose::ComposedStory, t: &Table, row: usize) -> Option<f64> {
+    let laid_out = cs
+        .frames
+        .iter()
+        .flat_map(|f| &f.tables)
+        .filter(|f| f.table == t.id)
+        .flat_map(|f| &f.cells)
+        .filter(|c| c.row == row && t.cell(c.row, c.col).is_some_and(|x| x.row_span <= 1))
+        .map(|c| c.rect.height())
+        .filter(|h| h.is_finite() && *h > 0.0)
+        .reduce(f64::max);
+    laid_out.or_else(|| t.rows.get(row).map(|r| r.height))
+}
+
+/// Move the border after `index` among `sizes` by `delta`. Returns the new sizes.
+fn resize_track(sizes: &[f64], index: usize, delta: f64, keep: bool) -> Option<Vec<f64>> {
+    let mut out = sizes.to_vec();
+    let cur = *sizes.get(index)?;
+    let last = index + 1 == sizes.len();
+    if keep && last {
+        // Scale every track so the table edge moves by `delta`.
+        let total: f64 = sizes.iter().sum();
+        let smallest = sizes.iter().copied().fold(f64::INFINITY, f64::min);
+        let largest = sizes.iter().copied().fold(0.0, f64::max);
+        if !(total > 0.0 && smallest > 0.0 && largest > 0.0) {
+            return None;
+        }
+        let lo = (MIN_TRACK / smallest).min(1.0);
+        let hi = (MAX_TRACK / largest).max(1.0);
+        let f = ((total + delta) / total).clamp(lo, hi);
+        out.iter_mut().for_each(|v| *v *= f);
+    } else if keep {
+        let next = *sizes.get(index + 1)?;
+        let pair = cur + next;
+        let a = (cur + delta).clamp(MIN_TRACK, (pair - MIN_TRACK).max(MIN_TRACK));
+        let [this, after] = out.get_mut(index..index + 2)? else { return None };
+        *this = a;
+        *after = (pair - a).max(MIN_TRACK);
+    } else {
+        *out.get_mut(index)? = (cur + delta).clamp(MIN_TRACK, MAX_TRACK);
+    }
+    out.iter().all(|v| v.is_finite()).then_some(out)
+}
+
+/// The frame a border drag names must hold the table's story and be editable.
+fn check_border_frame(st: &crate::DocState, p: &Value, story: designcraft_doc::StoryId) -> Result<()> {
+    const ID: &str = "table.resizeBorder";
+    if let Some(fid) = crate::cmd::id_param(p, "frame") {
+        let it = st.doc.item(fid).ok_or_else(|| bad(ID, format!("no frame {}", fid.0)))?;
+        if it.text_frame().map(|f| f.story) != Some(story) {
+            return Err(bad(ID, "the table is not in that frame's story"));
+        }
+        if it.locked || st.doc.layer(it.layer).is_some_and(|l| l.locked) {
+            return Err(bad(ID, "the frame or its layer is locked"));
+        }
+    }
+    Ok(())
+}
+
+/// The change in track size: `delta`, or `size` measured from the current size `cur`.
+fn border_delta(p: &Value, cur: f64) -> Result<f64> {
+    const ID: &str = "table.resizeBorder";
+    let delta = match (p.get("delta").and_then(Value::as_f64), p.get("size").and_then(Value::as_f64)) {
+        (Some(d), _) => d,
+        (None, Some(sz)) => sz - cur,
+        (None, None) => return Err(bad(ID, "`delta` or `size` required")),
+    };
+    if !delta.is_finite() {
+        return Err(bad(ID, "`delta`/`size` must be a finite number"));
+    }
+    Ok(delta)
+}
+
+pub(super) fn resize_border(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "table.resizeBorder";
+    let column = match str_param(p, "axis") {
+        Some("column") => true,
+        Some("row") => false,
+        _ => return Err(bad(ID, "axis must be `column` or `row`")),
+    };
+    let index = p.get("index").and_then(Value::as_u64).and_then(|v| usize::try_from(v).ok()).ok_or_else(|| bad(ID, "`index` required"))?;
+    let keep = p.get("keepTableSize").and_then(Value::as_bool).unwrap_or(false);
+    let g = target(s, p, ID)?;
+    let st = s.doc()?;
+    check_border_frame(st, p, g.story)?;
+    let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or_else(|| bad(ID, "no table"))?;
+    let sizes: Vec<f64> = if column {
+        t.columns.iter().map(|c| c.width).collect()
+    } else {
+        let cs = s.cache.get(&st.doc, g.story, None);
+        (0..t.nrows()).map(|r| composed_row_height(&cs, t, r).unwrap_or(MIN_TRACK)).collect()
+    };
+    let cur = *sizes.get(index).ok_or_else(|| bad(ID, format!("index {index} out of range")))?;
+    let delta = border_delta(p, cur)?;
+    let new = resize_track(&sizes, index, delta, keep).ok_or_else(|| bad(ID, "invalid table geometry"))?;
+    let size = new.get(index).copied().unwrap_or(cur);
+    let scaled = keep && index + 1 == sizes.len();
+    edit_table(s, &g, ID, |t| {
+        if column {
+            for (c, w) in t.columns.iter_mut().zip(&new) {
+                c.width = *w;
+            }
+        } else {
+            for (i, (r, h)) in t.rows.iter_mut().zip(&new).enumerate() {
+                // Only the rows the drag changed take the new height.
+                if scaled || i == index || (keep && i == index + 1) {
+                    r.height = *h;
+                }
+                if i == index && !scaled {
+                    r.mode = RowHeightMode::AtLeast;
+                }
+            }
+        }
+        Ok(json!({"axis": if column { "column" } else { "row" }, "index": index, "size": size}))
+    })
+}
+
+pub(super) fn distribute_rows(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "table.distributeRows";
+    if !p.is_object() {
+        return Err(bad(ID, "parameters must be an object"));
+    }
+    if let Some(rows) = p.get("rows") {
+        let valid = rows.as_array().is_some_and(|a| a.len() == 2 && a.iter().all(|v| v.as_u64().is_some_and(|n| usize::try_from(n).is_ok())));
+        if !valid {
+            return Err(bad(ID, "rows must be two non-negative row indices"));
+        }
+    }
+    for key in ["row", "story", "table"] {
+        if let Some(v) = p.get(key)
+            && v.as_u64().is_none_or(|n| usize::try_from(n).is_err())
+        {
+            return Err(bad(ID, format!("{key} must be a non-negative integer")));
+        }
+    }
+    let g = target(s, p, ID)?;
+    let st = s.doc()?;
+    let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or_else(|| bad(ID, "no table"))?;
+    if t.cells.iter().any(|c| c.row_span > 1) {
+        return Err(bad(ID, "unmerge cells that span rows first"));
+    }
+    let cs = s.cache.get(&st.doc, g.story, None);
+    let mut total = 0.0;
+    for row in g.range.r0..=g.range.r1 {
+        let height = cs
+            .frames
+            .iter()
+            .flat_map(|f| &f.tables)
+            .filter(|f| f.table == g.table)
+            .flat_map(|f| &f.cells)
+            .filter(|c| c.row == row)
+            .map(|c| c.rect.height())
+            .reduce(f64::max)
+            .ok_or_else(|| bad(ID, "all selected rows must be laid out; enlarge or thread the text frame first"))?;
+        if !height.is_finite() || height <= 0.0 {
+            return Err(bad(ID, "invalid composed row height"));
+        }
+        total += height;
+    }
+    let count = g.range.r1 - g.range.r0 + 1;
+    let height = total / count as f64;
+    if !height.is_finite() {
+        return Err(bad(ID, "invalid total row height"));
+    }
+    edit_table(s, &g, ID, |t| {
+        let rows = t.rows.get_mut(g.range.r0..=g.range.r1).ok_or_else(|| bad(ID, "invalid row range"))?;
+        for row in rows {
+            row.height = height;
+            row.mode = RowHeightMode::Exactly;
+        }
+        Ok(json!({"rows": count, "height": height}))
+    })
+}
+
+pub(super) fn distribute_cols(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.distributeColumns")?;
+    edit_table(s, &g, "table.distributeColumns", |t| {
+        let cols = &mut t.columns[g.range.c0..=g.range.c1];
+        let avg = cols.iter().map(|c| c.width).sum::<f64>() / cols.len() as f64;
+        cols.iter_mut().for_each(|c| c.width = avg);
+        ok()
+    })
+}
+
+#[cfg(test)]
+mod resize_border_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// A 3×3 table of 80 pt columns; returns the session, frame id, story and table ids.
+    fn session() -> (Session, u64, u64, u64) {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 472, 600], "content": "text", "text": ""})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        let t = s.execute("table.insert", &json!({"rows": 3, "cols": 3, "width": 240})).unwrap();
+        (s, r["id"].as_u64().unwrap(), t["story"].as_u64().unwrap(), t["table"].as_u64().unwrap())
+    }
+
+    fn table(s: &Session) -> designcraft_doc::Table {
+        (**s.doc().unwrap().doc.stories.values().flat_map(|st| st.tables.values()).next().unwrap()).clone()
+    }
+
+    fn widths(s: &Session) -> Vec<f64> {
+        table(s).columns.iter().map(|c| c.width).collect()
+    }
+
+    /// Composed cell rects of column 0, top to bottom.
+    fn rows(s: &Session) -> Vec<designcraft_geom::Rect> {
+        let st = s.doc().unwrap();
+        let sid = st.doc.stories.values().find(|x| !x.tables.is_empty()).unwrap().id;
+        let cs = s.cache.get(&st.doc, sid, None);
+        cs.frames.iter().flat_map(|f| &f.tables).flat_map(|f| &f.cells).filter(|c| c.col == 0).map(|c| c.rect).collect()
+    }
+
+    fn resize(s: &mut Session, ids: (u64, u64, u64), mut p: serde_json::Value) {
+        p["frame"] = json!(ids.0);
+        p["story"] = json!(ids.1);
+        p["table"] = json!(ids.2);
+        s.execute("table.resizeBorder", &p).unwrap();
+    }
+
+    #[test]
+    fn column_border_drags_widen_the_table_or_keep_its_width() {
+        let (mut s, f, st, t) = session();
+        resize(&mut s, (f, st, t), json!({"axis": "column", "index": 0, "delta": 20}));
+        assert_eq!(widths(&s), [100.0, 80.0, 80.0]);
+        resize(&mut s, (f, st, t), json!({"axis": "column", "index": 1, "delta": 30, "keepTableSize": true}));
+        assert_eq!(widths(&s), [100.0, 110.0, 50.0]);
+        // Clamped at the minimum; the neighbour takes only what is left.
+        resize(&mut s, (f, st, t), json!({"axis": "column", "index": 1, "delta": 500, "keepTableSize": true}));
+        assert_eq!(widths(&s), [100.0, 157.0, 3.0]);
+        resize(&mut s, (f, st, t), json!({"axis": "column", "index": 0, "delta": -1000}));
+        assert_eq!(widths(&s), [3.0, 157.0, 3.0]);
+        // Shift on the end edge scales every column.
+        resize(&mut s, (f, st, t), json!({"axis": "column", "index": 2, "size": 166, "keepTableSize": true}));
+        let w = widths(&s);
+        assert!((w.iter().sum::<f64>() - 326.0).abs() < 1e-9, "{w:?}");
+        assert!((w[1] / w[0] - 157.0 / 3.0).abs() < 1e-9, "{w:?}");
+        assert!(s.execute("table.resizeBorder", &json!({"table": t, "axis": "column", "index": 3, "delta": 1})).is_err());
+        assert!(s.execute("table.resizeBorder", &json!({"table": t, "axis": "column", "index": 0})).is_err());
+    }
+
+    #[test]
+    fn row_drag_sets_at_least_and_moves_later_rows() {
+        let (mut s, f, st, t) = session();
+        s.execute("table.setRowHeight", &json!({"table": t, "row": 0, "height": 30, "mode": "exactly"})).unwrap();
+        let before = rows(&s);
+        resize(&mut s, (f, st, t), json!({"axis": "row", "index": 0, "delta": 12}));
+        let row = &table(&s).rows[0];
+        assert_eq!((row.height, row.mode), (42.0, designcraft_doc::RowHeightMode::AtLeast));
+        let after = rows(&s);
+        assert!((after[0].height() - 42.0).abs() < 1e-9);
+        assert!((after[1].y0 - before[1].y0 - 12.0).abs() < 1e-9 && (after[1].height() - before[1].height()).abs() < 1e-9);
+        // Below the minimum: clamped, never negative.
+        resize(&mut s, (f, st, t), json!({"axis": "row", "index": 0, "delta": -1000}));
+        assert_eq!(table(&s).rows[0].height, 3.0);
+    }
+
+    #[test]
+    fn a_drag_is_one_undo_step_and_locked_frames_refuse() {
+        let (mut s, f, st, t) = session();
+        let before = table(&s);
+        s.begin_interaction("Resize Column").unwrap();
+        for d in [5.0, 15.0, 25.0] {
+            let p = json!({"frame": f, "story": st, "table": t, "axis": "column", "index": 0, "delta": d});
+            s.preview("table.resizeBorder", p).unwrap();
+        }
+        s.commit_interaction().unwrap();
+        assert_eq!(widths(&s), [105.0, 80.0, 80.0]);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(table(&s), before);
+        s.execute("object.setFlags", &json!({"ids": [f], "locked": true})).unwrap();
+        assert!(s.execute("table.resizeBorder", &json!({"frame": f, "table": t, "axis": "column", "index": 0, "delta": 5})).is_err());
+    }
+}
diff --git a/crates/engine/src/cmd/table/structure.rs b/crates/engine/src/cmd/table/structure.rs
new file mode 100644
index 000000000..174704c4a
--- /dev/null
+++ b/crates/engine/src/cmd/table/structure.rs
@@ -0,0 +1,240 @@
+use super::target::{column_width, count, edit_table, in_cell, para_direction, target};
+use super::{CellAddr, Result, RowKind, Selection, Session, Table, TextSel, Value, bad, json, ok, str_param};
+
+pub(super) fn insert(s: &mut Session, p: &Value) -> Result<Value> {
+    let t = s.doc()?.selection.text.ok_or_else(|| bad("table.insert", "no insertion point"))?;
+    if t.cell.is_some() {
+        return Err(bad("table.insert", "tables can't be nested in cells"));
+    }
+    let rows = p.get("rows").and_then(Value::as_u64).unwrap_or(4).clamp(1, 500) as usize;
+    let cols = p.get("cols").or_else(|| p.get("columns")).and_then(Value::as_u64).unwrap_or(4).clamp(1, 200) as usize;
+    let header = p.get("headerRows").and_then(Value::as_u64).unwrap_or(0).min(100) as usize;
+    let footer = p.get("footerRows").and_then(Value::as_u64).unwrap_or(0).min(100) as usize;
+    let width = p.get("width").and_then(Value::as_f64).unwrap_or_else(|| column_width(s, &t));
+    s.edit(|d, sel| {
+        let id = d.alloc();
+        let mut table = Table::new(id, rows, cols, header, footer, width);
+        table.options.direction = para_direction(d, t.story, t.range().start);
+        let st = d.story_mut(t.story).ok_or_else(|| bad("table.insert", "no story"))?;
+        // Cells start with the paragraph format at the caret.
+        let pf = st.paras[st.para_at(t.range().start)].clone();
+        let cf = st.char_format_at(t.range().start).clone();
+        for c in &mut table.cells {
+            c.text.paras[0] = designcraft_doc::ParaFormat { table: None, ..pf.clone() };
+            c.text.chars[0].format = cf.clone();
+        }
+        let r = t.range();
+        st.delete(r.clone());
+        st.insert_table(r.start, table);
+        *sel = Selection::text(TextSel { story: t.story, anchor: 0, focus: 0, frame: t.frame, cell: Some(CellAddr { table: id, row: 0, col: 0 }) });
+        Ok(json!({"story": t.story.0, "table": id}))
+    })
+}
+
+pub(super) fn convert_from_text(s: &mut Session, p: &Value) -> Result<Value> {
+    let t = s.doc()?.selection.text.ok_or_else(|| bad("table.convertFromText", "no text selected"))?;
+    if t.cell.is_some() {
+        return Err(bad("table.convertFromText", "select text outside tables"));
+    }
+    let sep = if str_param(p, "columnSeparator") == Some("comma") { ',' } else { '\t' };
+    let width = p.get("width").and_then(Value::as_f64).unwrap_or_else(|| column_width(s, &t));
+    s.edit(|d, sel| {
+        let id = d.alloc();
+        let direction = para_direction(d, t.story, t.range().start);
+        let st = d.story_mut(t.story).ok_or_else(|| bad("table.convertFromText", "no story"))?;
+        let ranges = st.para_ranges();
+        let (pa, pb) = (st.para_at(t.range().start), st.para_at(t.range().end));
+        if (pa..=pb).any(|i| st.paras[i].table.is_some()) {
+            return Err(bad("table.convertFromText", "the selection contains a table"));
+        }
+        let (a, b) = (ranges[pa].start, ranges[pb].end);
+        let data: Vec<Vec<String>> = st.text[a..b].split('\n').map(|line| line.split(sep).map(|c| c.trim().to_string()).collect()).collect();
+        let pf = st.paras[pa].clone();
+        let cf = st.format_after(a).clone();
+        let mut table = Table::from_strings(id, &data, width, &pf, &cf);
+        table.options.direction = direction;
+        st.delete(a..b);
+        let anchor = st.insert_table(a, table);
+        *sel = Selection::text(TextSel::caret(t.story, anchor));
+        Ok(json!({"table": id, "rows": data.len()}))
+    })
+}
+
+pub(super) fn convert_to_text(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.convertToText")?;
+    s.edit(|d, sel| {
+        let st = d.story_mut(g.story).ok_or_else(|| bad("table.convertToText", "no story"))?;
+        let text = st.tables.get(&g.table).map(|t| t.plain_text()).unwrap_or_default();
+        let a = st.table_anchor(g.table).ok_or_else(|| bad("table.convertToText", "no anchor"))?;
+        st.replace(a..a + designcraft_doc::TABLE_ANCHOR.len_utf8(), &text);
+        *sel = Selection::text(TextSel::caret(g.story, a + text.len()));
+        ok()
+    })
+}
+
+pub(super) fn delete_table(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.delete")?;
+    s.edit(|d, sel| {
+        let st = d.story_mut(g.story).ok_or_else(|| bad("table.delete", "no story"))?;
+        let a = st.table_anchor(g.table).ok_or_else(|| bad("table.delete", "no anchor"))?;
+        // Remove the anchor paragraph (with one separator) so no empty paragraph is left behind.
+        let end = a + designcraft_doc::TABLE_ANCHOR.len_utf8();
+        let r = if &st.text[end..] == "\n" && a > 0 && st.text[..a].ends_with('\n') {
+            // Inserted at the end of the story: remove the empty paragraph after it too.
+            a - 1..end + 1
+        } else if st.text[end..].starts_with('\n') {
+            a..end + 1
+        } else if a > 0 && st.text[..a].ends_with('\n') {
+            a - 1..end
+        } else {
+            a..end
+        };
+        st.delete(r.clone());
+        *sel = Selection::text(TextSel::caret(g.story, r.start.min(st.len())));
+        ok()
+    })
+}
+
+// ---------- rows and columns ----------
+
+pub(super) fn insert_row(s: &mut Session, p: &Value, above: Option<bool>) -> Result<Value> {
+    let g = target(s, p, "table.insertRow")?;
+    let above = above.unwrap_or(str_param(p, "where") == Some("above"));
+    let n = count(p);
+    let at = if above { g.range.r0 } else { g.range.r1 + 1 };
+    let r = edit_table(s, &g, "table.insertRow", |t| {
+        t.insert_rows(at, n);
+        Ok(json!({"rows": t.nrows()}))
+    })?;
+    shift_selection(s, g.table, at, n, true);
+    Ok(r)
+}
+
+/// After inserting rows/columns at `at`, selections at or after it follow their cells.
+fn shift_selection(s: &mut Session, table: u64, at: usize, n: usize, rows: bool) {
+    let Ok(st) = s.doc_mut() else { return };
+    if let Some(t) = st.selection.text.as_mut()
+        && let Some(c) = t.cell.as_mut()
+        && c.table == table
+    {
+        let v = if rows { &mut c.row } else { &mut c.col };
+        if *v >= at {
+            *v += n;
+        }
+    }
+    if let Some(ts) = st.selection.cells.as_mut()
+        && ts.table == table
+    {
+        let (a, b) = if rows { (&mut ts.range.r0, &mut ts.range.r1) } else { (&mut ts.range.c0, &mut ts.range.c1) };
+        if *a >= at {
+            *a += n;
+        }
+        if *b >= at {
+            *b += n;
+        }
+    }
+}
+
+pub(super) fn insert_col(s: &mut Session, p: &Value, left: Option<bool>) -> Result<Value> {
+    let g = target(s, p, "table.insertColumn")?;
+    let left = left.unwrap_or(str_param(p, "where") == Some("left"));
+    let rtl = s
+        .doc()?
+        .doc
+        .story(g.story)
+        .and_then(|st| st.tables.get(&g.table))
+        .is_some_and(|t| t.options.direction == designcraft_doc::TextDirection::RightToLeft);
+    let n = count(p);
+    let at = if left != rtl { g.range.c0 } else { g.range.c1 + 1 };
+    let width = p.get("width").and_then(Value::as_f64);
+    let r = edit_table(s, &g, "table.insertColumn", |t| {
+        let w = width.unwrap_or_else(|| t.columns[g.range.c0.min(t.ncols() - 1)].width);
+        t.insert_cols(at, n, w);
+        Ok(json!({"columns": t.ncols()}))
+    })?;
+    shift_selection(s, g.table, at, n, false);
+    Ok(r)
+}
+
+pub(super) fn delete_rows(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.deleteRow")?;
+    let all = s.doc()?.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).is_some_and(|t| g.range.r0 == 0 && g.range.r1 + 1 >= t.nrows());
+    if all {
+        return delete_table(s, p);
+    }
+    edit_table(s, &g, "table.deleteRow", |t| {
+        t.delete_rows(g.range.r0, g.range.r1 - g.range.r0 + 1);
+        Ok(json!({"rows": t.nrows()}))
+    })
+}
+
+pub(super) fn delete_cols(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.deleteColumn")?;
+    let all = s.doc()?.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).is_some_and(|t| g.range.c0 == 0 && g.range.c1 + 1 >= t.ncols());
+    if all {
+        return delete_table(s, p);
+    }
+    edit_table(s, &g, "table.deleteColumn", |t| {
+        t.delete_cols(g.range.c0, g.range.c1 - g.range.c0 + 1);
+        Ok(json!({"columns": t.ncols()}))
+    })
+}
+
+pub(super) fn merge(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.merge")?;
+    let r = edit_table(s, &g, "table.merge", |t| {
+        t.merge(g.range).map_err(|e| bad("table.merge", e))?;
+        Ok(t.expand_range(g.range))
+    })?;
+    // The caret goes to the merged cell.
+    let st = s.doc_mut()?;
+    st.selection = Selection::text(TextSel {
+        story: g.story,
+        anchor: 0,
+        focus: 0,
+        frame: st.selection.text.and_then(|t| t.frame),
+        cell: Some(CellAddr { table: g.table, row: r.r0, col: r.c0 }),
+    });
+    ok()
+}
+
+pub(super) fn split(s: &mut Session, p: &Value, horizontal: bool) -> Result<Value> {
+    let g = target(s, p, "table.split")?;
+    edit_table(s, &g, "table.split", |t| {
+        t.split_cells(g.range, horizontal).map_err(|e| bad("table.split", e))?;
+        Ok(json!({"rows": t.nrows(), "cols": t.ncols()}))
+    })
+}
+
+pub(super) fn unmerge(s: &mut Session, p: &Value) -> Result<Value> {
+    let g = target(s, p, "table.unmerge")?;
+    edit_table(s, &g, "table.unmerge", |t| {
+        for r in g.range.r0..=g.range.r1 {
+            for c in g.range.c0..=g.range.c1 {
+                t.unmerge(r, c);
+            }
+        }
+        ok()
+    })
+}
+
+/// Convert Rows is greyed out unless the selected cells (or the caret's cell) can change kind.
+pub(super) fn can_convert_rows(s: &Session, kind: RowKind) -> std::result::Result<(), String> {
+    let st = s.active().ok_or("no document open")?;
+    if st.selection.cells.is_none() {
+        in_cell(s)?;
+    }
+    let g = target(s, &Value::Null, "table.convertRows").map_err(|e| e.to_string())?;
+    let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or("no table")?;
+    t.convert_rows_counts(g.range.r0, g.range.r1, kind).map(|_| ())
+}
+
+pub(super) fn convert_rows(s: &mut Session, p: &Value, kind: RowKind) -> Result<Value> {
+    const ID: &str = "table.convertRows";
+    let g = target(s, p, ID)?;
+    edit_table(s, &g, ID, |t| {
+        let (h, f) = t.convert_rows_counts(g.range.r0, g.range.r1, kind).map_err(|e| bad(ID, e))?;
+        t.set_header_footer(h, f);
+        Ok(json!({"headerRows": h, "footerRows": f}))
+    })
+}
diff --git a/crates/engine/src/cmd/table/styles.rs b/crates/engine/src/cmd/table/styles.rs
new file mode 100644
index 000000000..fa3717977
--- /dev/null
+++ b/crates/engine/src/cmd/table/styles.rs
@@ -0,0 +1,350 @@
+use super::cell::{StrokeEdit, first_baseline_params};
+use super::target::{color_param, edit_table, target};
+use super::{CellStroke, Document, Result, Session, Value, bad, json, ok, str_param};
+
+// ---------- cell and table styles ----------
+
+/// A style's uniform edge stroke from `stroke`/`border`: the given values over the default
+/// edge, validated like `table.setCell`'s stroke.
+fn stroke_param(s: &Session, v: Option<&Value>, cmd: &str) -> Result<Option<CellStroke>> {
+    match v.filter(|v| !v.is_null()) {
+        Some(v) => Ok(Some(StrokeEdit::parse(&s.doc()?.doc, v, cmd)?.apply(CellStroke::default()))),
+        None => Ok(None),
+    }
+}
+
+/// Fill in the cell style fields given in `p`.
+fn cell_style_fields(cs: &mut designcraft_doc::CellStyle, p: &Value, stroke: Option<CellStroke>, cmd: &str) -> Result<()> {
+    if let Some(v) = p.get("basedOn") {
+        cs.based_on = v.as_str().map(str::to_string);
+    }
+    if let Some(f) = color_param(p, "fill") {
+        cs.fill = Some(f);
+    }
+    if let Some(t) = p.get("tint").and_then(Value::as_f64) {
+        cs.fill_tint = Some(t.clamp(0.0, 1.0) as f32);
+    }
+    match p.get("insets") {
+        Some(Value::Number(n)) => {
+            cs.insets = n.as_f64().map(|v| [v.max(0.0); 4]);
+            cs.inset_overrides = Default::default();
+        }
+        Some(Value::Array(a)) if a.len() == 4 => {
+            let v: Vec<f64> = a.iter().map(|x| x.as_f64().unwrap_or(0.0).max(0.0)).collect();
+            cs.insets = Some([v[0], v[1], v[2], v[3]]);
+            cs.inset_overrides = Default::default();
+        }
+        _ => {}
+    }
+    if let Some(v) = p.get("vj") {
+        cs.vj = Some(serde_json::from_value(v.clone()).map_err(|e| bad(cmd, format!("vj: {e}")))?);
+    }
+    let (first_baseline, first_baseline_min) = first_baseline_params(p, cmd)?;
+    if first_baseline.is_some() {
+        cs.first_baseline = first_baseline;
+    }
+    if first_baseline_min.is_some() {
+        cs.first_baseline_min = first_baseline_min;
+    }
+    if let Some(st) = stroke {
+        cs.stroke = Some(st);
+        cs.strokes = Default::default();
+    }
+    if let Some(ps) = str_param(p, "paragraphStyle") {
+        cs.paragraph_style = Some(ps.to_string());
+    }
+    Ok(())
+}
+
+pub(super) fn cell_style_create(s: &mut Session, p: &Value) -> Result<Value> {
+    let base = str_param(p, "name").unwrap_or("Cell Style 1").to_string();
+    let mut cs = designcraft_doc::CellStyle::default();
+    if p.get("fromSelection").and_then(Value::as_bool).unwrap_or(false) {
+        let g = target(s, p, "style.cell.create")?;
+        let d = &s.doc()?.doc;
+        let cell = d
+            .story(g.story)
+            .and_then(|st| st.tables.get(&g.table))
+            .and_then(|t| {
+                let (r, c) = t.owner(g.range.r0, g.range.c0);
+                t.cell(r, c)
+            })
+            .ok_or_else(|| bad("style.cell.create", "no cell"))?;
+        cs.fill = Some(cell.fill.clone());
+        cs.fill_tint = Some(cell.fill_tint);
+        cs.insets = Some(cell.insets);
+        cs.vj = Some(cell.vj);
+        cs.first_baseline = Some(cell.first_baseline);
+        cs.first_baseline_min = Some(cell.first_baseline_min);
+        cs.stroke = Some(cell.strokes[0].clone());
+        cs.paragraph_style = cell.text.paras.first().map(|p| p.style.clone());
+    }
+    let stroke = stroke_param(s, p.get("stroke"), "style.cell.create")?;
+    cell_style_fields(&mut cs, p, stroke, "style.cell.create")?;
+    s.edit(|d, _| {
+        let name = designcraft_doc::Styles::unique_name(|n| d.styles.cell.iter().any(|c| c.name == n), &base);
+        cs.name = name.clone();
+        d.styles_mut().cell.push(cs);
+        Ok(json!({"name": name}))
+    })
+}
+
+pub(super) fn cell_style_apply(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = str_param(p, "name").ok_or_else(|| bad("style.cell.apply", "missing name"))?.to_string();
+    let styles = &s.doc()?.doc.styles.cell;
+    if !styles.iter().any(|c| c.name == name) {
+        return Err(bad("style.cell.apply", format!("no cell style `{name}`")));
+    }
+    let cs = designcraft_doc::resolve_cell_style(styles, &name);
+    let g = target(s, p, "style.cell.apply")?;
+    edit_table(s, &g, "style.cell.apply", |t| {
+        let mut n = 0;
+        for (r, c) in t.selected_owners(g.range) {
+            if let Some(cell) = t.cell_mut(r, c) {
+                cs.apply_to(cell);
+                n += 1;
+            }
+        }
+        Ok(json!({"cells": n}))
+    })
+}
+
+/// Re-apply cell styles named in `names` to every cell using them (after a style edit).
+fn reapply_cell_styles(d: &mut Document, names: &[String]) {
+    let styles: Vec<_> = names.iter().map(|name| designcraft_doc::resolve_cell_style(&d.styles.cell, name)).collect();
+    for sid in d.stories.keys().copied().collect::<Vec<_>>() {
+        let Some(st) = d.story_mut(sid) else { continue };
+        for t in st.tables.values_mut() {
+            if !t.cells.iter().any(|c| names.contains(&c.style)) {
+                continue;
+            }
+            for cell in &mut std::sync::Arc::make_mut(t).cells {
+                if names.contains(&cell.style)
+                    && let Some(cs) = styles.iter().find(|x| x.name == cell.style)
+                {
+                    cs.apply_to(cell);
+                }
+            }
+        }
+        st.rev = st.rev.wrapping_add(1);
+    }
+}
+
+/// Include descendants when editing an inherited style, with the resolver's depth limit.
+fn dependent_styles<'a>(name: &str, styles: impl Iterator<Item = (&'a str, Option<&'a str>)>) -> Vec<String> {
+    let styles: Vec<_> = styles.collect();
+    styles
+        .iter()
+        .filter(|(candidate, _)| {
+            let mut current = Some(*candidate);
+            for _ in 0..32 {
+                let Some(current_name) = current else { return false };
+                if current_name == name {
+                    return true;
+                }
+                current = styles.iter().find(|(n, _)| *n == current_name).and_then(|(_, base)| *base);
+            }
+            false
+        })
+        .map(|(name, _)| (*name).to_string())
+        .collect()
+}
+
+pub(super) fn cell_style_edit(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = str_param(p, "name").ok_or_else(|| bad("style.cell.edit", "missing name"))?.to_string();
+    let stroke = stroke_param(s, p.get("stroke"), "style.cell.edit")?;
+    let p = p.clone();
+    s.edit(|d, _| {
+        let cs = d.styles_mut().cell.iter_mut().find(|c| c.name == name).ok_or_else(|| bad("style.cell.edit", format!("no cell style `{name}`")))?;
+        cell_style_fields(cs, &p, stroke, "style.cell.edit")?;
+        let names = dependent_styles(&name, d.styles.cell.iter().map(|cs| (cs.name.as_str(), cs.based_on.as_deref())));
+        reapply_cell_styles(d, &names);
+        ok()
+    })
+}
+
+fn table_style_fields(ts: &mut designcraft_doc::TableStyle, p: &Value, border: Option<CellStroke>) {
+    if let Some(v) = p.get("basedOn") {
+        ts.based_on = v.as_str().map(str::to_string);
+    }
+    for (k, f) in [
+        ("header", &mut ts.header),
+        ("body", &mut ts.body),
+        ("footer", &mut ts.footer),
+        ("leftColumn", &mut ts.left_column),
+        ("rightColumn", &mut ts.right_column),
+    ] {
+        if let Some(v) = p.get(k) {
+            *f = v.as_str().map(str::to_string);
+        }
+    }
+    if let Some(b) = border {
+        ts.border = Some(b);
+        ts.borders = Default::default();
+    }
+    if let Some(a) = p.get("altRows").and_then(Value::as_object) {
+        let n = |k: &str, d: u32| a.get(k).and_then(Value::as_u64).map_or(d, |v| u32::try_from(v).unwrap_or(u32::MAX));
+        let c = |k: &str| a.get(k).and_then(Value::as_str).unwrap_or(designcraft_color::swatch::NONE).to_string();
+        let t = |k: &str| a.get(k).and_then(Value::as_f64).map_or(1.0, |v| v.clamp(0.0, 1.0) as f32);
+        ts.alt_rows = Some(designcraft_doc::AltFills {
+            first: n("first", 1),
+            first_color: c("firstColor"),
+            first_tint: t("firstTint"),
+            next: n("next", 1),
+            next_color: c("nextColor"),
+            next_tint: t("nextTint"),
+            skip_first: n("skipFirst", 0),
+            skip_last: n("skipLast", 0),
+        });
+    }
+    if let Some(v) = p.get("spaceBefore").and_then(Value::as_f64) {
+        ts.space_before = Some(v);
+    }
+    if let Some(v) = p.get("spaceAfter").and_then(Value::as_f64) {
+        ts.space_after = Some(v);
+    }
+}
+
+pub(super) fn table_style_create(s: &mut Session, p: &Value) -> Result<Value> {
+    let base = str_param(p, "name").unwrap_or("Table Style 1").to_string();
+    let mut ts = designcraft_doc::TableStyle::default();
+    let border = stroke_param(s, p.get("border"), "style.table.create")?;
+    table_style_fields(&mut ts, p, border);
+    s.edit(|d, _| {
+        let name = designcraft_doc::Styles::unique_name(|n| d.styles.table.iter().any(|c| c.name == n), &base);
+        ts.name = name.clone();
+        d.styles_mut().table.push(ts);
+        Ok(json!({"name": name}))
+    })
+}
+
+pub(super) fn table_style_apply(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = str_param(p, "name").ok_or_else(|| bad("style.table.apply", "missing name"))?.to_string();
+    let doc = &s.doc()?.doc;
+    if !doc.styles.table.iter().any(|c| c.name == name) {
+        return Err(bad("style.table.apply", format!("no table style `{name}`")));
+    }
+    let ts = doc.styles.resolve_table_style(&name);
+    let cells = doc.styles.cell.clone();
+    let g = target(s, p, "style.table.apply")?;
+    edit_table(s, &g, "style.table.apply", |t| {
+        ts.apply_to(t, &cells);
+        ok()
+    })
+}
+
+pub(super) fn table_style_edit(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = str_param(p, "name").ok_or_else(|| bad("style.table.edit", "missing name"))?.to_string();
+    let border = stroke_param(s, p.get("border"), "style.table.edit")?;
+    let p = p.clone();
+    s.edit(|d, _| {
+        let ts =
+            d.styles_mut().table.iter_mut().find(|c| c.name == name).ok_or_else(|| bad("style.table.edit", format!("no table style `{name}`")))?;
+        table_style_fields(ts, &p, border);
+        let names = dependent_styles(&name, d.styles.table.iter().map(|ts| (ts.name.as_str(), ts.based_on.as_deref())));
+        let styles: Vec<_> = names.iter().map(|name| d.styles.resolve_table_style(name)).collect();
+        let cells = d.styles.cell.clone();
+        for sid in d.stories.keys().copied().collect::<Vec<_>>() {
+            let Some(st) = d.story_mut(sid) else { continue };
+            for t in st.tables.values_mut() {
+                if let Some(ts) = styles.iter().find(|ts| ts.name == t.style) {
+                    ts.apply_to(std::sync::Arc::make_mut(t), &cells);
+                }
+            }
+            st.rev = st.rev.wrapping_add(1);
+        }
+        ok()
+    })
+}
+
+#[cfg(test)]
+mod style_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn cell_first_baseline_is_a_cell_option_and_a_cell_style_attribute() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
+        s.execute("table.insert", &json!({"rows": 2, "cols": 2})).unwrap();
+        s.execute("table.setCell", &json!({"row": 0, "col": 0, "firstBaseline": "capHeight", "firstBaselineMin": 3})).unwrap();
+        let got = s.execute("table.get", &json!({})).unwrap();
+        let cell = got["cells"].as_array().unwrap().iter().find(|c| c["row"] == 0 && c["col"] == 0).unwrap().clone();
+        assert_eq!((cell["firstBaseline"].as_str(), cell["firstBaselineMin"].as_f64()), (Some("capHeight"), Some(3.0)));
+        assert!(s.execute("table.setCell", &json!({"row": 0, "col": 0, "firstBaseline": "middle"})).is_err());
+        // Cell Options › Text › Rotation: carried and written back, composed horizontally so far,
+        // which the IDML import reports (#1468).
+        for (given, want) in [(90, 90.0), (270, 270.0), (0, 0.0), (-90, 270.0), (450, 90.0)] {
+            s.execute("table.setCell", &json!({"row": 0, "col": 0, "rotation": given})).unwrap_or_else(|e| panic!("{given}: {e}"));
+            let cell = s.execute("table.get", &json!({})).unwrap()["cells"][0].clone();
+            assert_eq!(cell["rotation"].as_f64(), Some(want), "{given}");
+        }
+        for bad in [45, 1, 100] {
+            assert!(s.execute("table.setCell", &json!({"row": 0, "col": 0, "rotation": bad})).is_err(), "{bad}");
+        }
+        assert!(s.execute("table.setCell", &json!({"row": 0, "col": 0, "firstBaselineMin": -1})).is_err());
+        s.execute("style.cell.create", &json!({"name": "Leading", "firstBaseline": "leading"})).unwrap();
+        s.execute("style.cell.apply", &json!({"name": "Leading", "row": 1, "col": 1})).unwrap();
+        let d = &s.doc().unwrap().doc;
+        let t = d.story(designcraft_doc::StoryId(sid)).unwrap().tables.values().next().unwrap();
+        assert_eq!(t.cell(1, 1).unwrap().first_baseline, designcraft_doc::FirstBaseline::Leading);
+        assert_eq!(t.cell(1, 0).unwrap().first_baseline, designcraft_doc::FirstBaseline::Ascent);
+    }
+
+    #[test]
+    fn cell_and_table_styles_apply_and_follow_edits() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 400], "content": "text", "text": ""})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
+        s.execute("table.insert", &json!({"rows": 3, "cols": 2, "headerRows": 1})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Cell Head"})).unwrap();
+        s.execute("style.cell.create", &json!({"name": "Head", "fill": "[Black]", "paragraphStyle": "Cell Head", "insets": 6})).unwrap();
+        s.execute("style.cell.create", &json!({"name": "Body", "fill": "[Paper]"})).unwrap();
+        s.execute("style.table.create", &json!({"name": "Data", "header": "Head", "body": "Body", "border": {"weight": 2, "color": "[Black]"}}))
+            .unwrap();
+        s.execute("style.table.apply", &json!({"name": "Data"})).unwrap();
+        let t = |s: &Session| -> designcraft_doc::Table {
+            let d = &s.doc().unwrap().doc;
+            (**d.story(designcraft_doc::StoryId(sid)).unwrap().tables.values().next().unwrap()).clone()
+        };
+        let tb = t(&s);
+        assert_eq!(tb.style, "Data");
+        assert_eq!(tb.options.border.weight, 2.0);
+        let head = tb.cell(0, 0).unwrap();
+        assert_eq!((head.fill.as_str(), head.style.as_str(), head.insets), ("[Black]", "Head", [6.0; 4]));
+        assert_eq!(head.text.paras[0].style, "Cell Head");
+        assert_eq!(tb.cell(1, 1).unwrap().style, "Body");
+        // Editing the cell style updates its cells.
+        s.execute("style.cell.edit", &json!({"name": "Head", "fill": "C=100 M=0 Y=0 K=0"})).unwrap();
+        assert_eq!(t(&s).cell(0, 1).unwrap().fill, "C=100 M=0 Y=0 K=0");
+        // Editing the table style re-applies it.
+        s.execute("style.table.edit", &json!({"name": "Data", "border": {"weight": 4}})).unwrap();
+        assert_eq!(t(&s).options.border.weight, 4.0);
+        assert!(s.execute("style.cell.apply", &json!({"name": "Nope"})).is_err());
+    }
+}
+
+#[cfg(test)]
+mod style_alt_rows_tests {
+    use serde_json::json;
+
+    use super::table_style_fields;
+
+    #[test]
+    fn style_alt_rows_counts_saturate() {
+        let mut ts = designcraft_doc::TableStyle::default();
+        let p = json!({"altRows": {"first": 4294967297u64, "next": 4294967296u64, "skipFirst": 4294967295u64, "skipLast": 3}});
+        table_style_fields(&mut ts, &p, None);
+        let a = ts.alt_rows.unwrap();
+        assert_eq!(a.first, u32::MAX, "first");
+        assert_eq!(a.next, u32::MAX, "next");
+        assert_eq!(a.skip_first, u32::MAX, "skip_first");
+        assert_eq!(a.skip_last, 3, "skip_last");
+    }
+}
diff --git a/crates/engine/src/cmd/table/target.rs b/crates/engine/src/cmd/table/target.rs
new file mode 100644
index 000000000..beaa1c8b0
--- /dev/null
+++ b/crates/engine/src/cmd/table/target.rs
@@ -0,0 +1,160 @@
+use super::{
+    CellAddr, CellRange, Document, Result, Selection, Session, StoryId, Table, TableSel, TextSel, Value, bad, compose, floor_char_boundary, has_doc,
+    str_param,
+};
+
+// ---------- enablement and targeting ----------
+
+pub(super) fn in_table(s: &Session) -> std::result::Result<(), String> {
+    has_doc(s)?;
+    let st = s.active().ok_or("no document open")?;
+    if st.selection.cells.is_some() || st.selection.text.is_some_and(|t| t.cell.is_some()) {
+        return Ok(());
+    }
+    if let Some(t) = st.selection.text
+        && st.doc.story(t.story).is_some_and(|x| x.table_at(t.focus).is_some())
+    {
+        return Ok(());
+    }
+    Err("place the insertion point in a table".into())
+}
+
+pub(super) fn in_table_or_ids(s: &Session) -> std::result::Result<(), String> {
+    has_doc(s)
+}
+
+pub(super) fn in_cell(s: &Session) -> std::result::Result<(), String> {
+    has_doc(s)?;
+    if s.active().is_some_and(|d| d.selection.text.is_some_and(|t| t.cell.is_some())) { Ok(()) } else { Err("not in a table cell".into()) }
+}
+
+/// The table a command acts on and its target cell range.
+pub(super) struct Tgt {
+    pub(super) story: StoryId,
+    pub(super) table: u64,
+    pub(super) range: CellRange,
+}
+
+fn find_table(doc: &Document, id: u64) -> Option<StoryId> {
+    doc.stories.iter().find(|(_, s)| s.tables.contains_key(&id)).map(|(k, _)| *k)
+}
+
+fn pair(p: &Value, many: &str, one: &str) -> Option<(usize, usize)> {
+    if let Some(a) = p.get(many).and_then(Value::as_array) {
+        let a0 = a.first()?.as_u64()? as usize;
+        let a1 = a.get(1).and_then(Value::as_u64).map_or(a0, |v| v as usize);
+        return Some((a0.min(a1), a0.max(a1)));
+    }
+    p.get(one).and_then(Value::as_u64).map(|v| (v as usize, v as usize))
+}
+
+pub(super) fn target(s: &Session, p: &Value, cmd: &str) -> Result<Tgt> {
+    let st = s.doc()?;
+    let doc = &st.doc;
+    let explicit_table = p.get("table").and_then(Value::as_u64);
+    let explicit_story = p.get("story").and_then(Value::as_u64).map(StoryId);
+    let (story, table, range) = if let Some(tid) = explicit_table {
+        let sid = explicit_story.or_else(|| find_table(doc, tid)).ok_or_else(|| bad(cmd, format!("no table {tid}")))?;
+        (sid, tid, None)
+    } else if let Some(c) = st.selection.cells {
+        (c.story, c.table, Some(c.range))
+    } else if let Some(t) = st.selection.text {
+        match t.cell {
+            Some(c) => (t.story, c.table, Some(CellRange::cell(c.row, c.col))),
+            None => {
+                let tid = doc.story(t.story).and_then(|x| x.table_at(t.focus)).ok_or_else(|| bad(cmd, "the insertion point is not in a table"))?;
+                (t.story, tid, None)
+            }
+        }
+    } else {
+        return Err(bad(cmd, "place the insertion point in a table"));
+    };
+    let t = doc.story(story).and_then(|x| x.tables.get(&table)).ok_or_else(|| bad(cmd, format!("no table {table}")))?;
+    let (nr, nc) = (t.nrows(), t.ncols());
+    let mut range = range.unwrap_or(CellRange { r0: 0, c0: 0, r1: nr - 1, c1: nc - 1 });
+    if let Some((a, b)) = pair(p, "rows", "row") {
+        range.r0 = a;
+        range.r1 = b;
+    }
+    if let Some((a, b)) = pair(p, "cols", "col") {
+        range.c0 = a;
+        range.c1 = b;
+    }
+    if range.r1 >= nr || range.c1 >= nc {
+        return Err(bad(cmd, format!("cell range out of bounds ({nr}×{nc} table)")));
+    }
+    Ok(Tgt { story, table, range })
+}
+
+/// Edit the target table; afterwards selections pointing into it are clamped to its new shape.
+pub(super) fn edit_table<T>(s: &mut Session, g: &Tgt, cmd: &str, f: impl FnOnce(&mut Table) -> Result<T>) -> Result<T> {
+    let cmd = cmd.to_string();
+    s.edit(|d, sel| {
+        let st = d.story_mut(g.story).ok_or_else(|| bad(&cmd, "no story"))?;
+        let t = st.table_mut(g.table).ok_or_else(|| bad(&cmd, "no table"))?;
+        let r = f(t)?;
+        clamp_selection(d, sel);
+        Ok(r)
+    })
+}
+
+/// Keep text/cell selections valid after the table changed shape (or disappeared).
+pub(super) fn clamp_selection(d: &Document, sel: &mut Selection) {
+    if let Some(ts) = sel.cells {
+        match d.story(ts.story).and_then(|x| x.tables.get(&ts.table)) {
+            Some(t) => {
+                let (mr, mc) = (t.nrows() - 1, t.ncols() - 1);
+                let r = ts.range;
+                sel.cells = Some(TableSel { range: CellRange::new(r.r0.min(mr), r.c0.min(mc), r.r1.min(mr), r.c1.min(mc)), ..ts });
+            }
+            None => sel.cells = None,
+        }
+    }
+    if let Some(t) = sel.text
+        && let Some(c) = t.cell
+    {
+        let story = d.story(t.story);
+        match story.and_then(|x| x.tables.get(&c.table)) {
+            Some(tb) => {
+                let (r, col) = tb.owner(c.row.min(tb.nrows() - 1), c.col.min(tb.ncols() - 1));
+                let text = tb.cell(r, col).map_or("", |x| x.text.text.as_str());
+                sel.text = Some(TextSel {
+                    anchor: floor_char_boundary(text, t.anchor),
+                    focus: floor_char_boundary(text, t.focus),
+                    cell: Some(CellAddr { table: c.table, row: r, col }),
+                    ..t
+                });
+            }
+            None => {
+                let pos = story.map_or(0, |x| floor_char_boundary(&x.text, t.anchor));
+                sel.text = Some(TextSel { anchor: pos, focus: pos, cell: None, ..t });
+            }
+        }
+    }
+}
+
+pub(super) fn count(p: &Value) -> usize {
+    p.get("count").and_then(Value::as_u64).unwrap_or(1).clamp(1, 1000) as usize
+}
+
+pub(super) fn color_param(p: &Value, key: &str) -> Option<String> {
+    str_param(p, key).map(str::to_string)
+}
+
+// ---------- create / convert ----------
+
+/// Width of the text column at the caret (the new table spans it).
+pub(super) fn column_width(s: &Session, t: &TextSel) -> f64 {
+    let Some(st) = s.active() else { return 300.0 };
+    let specs = compose::frame_specs(&st.doc, t.story);
+    let spec = t.frame.and_then(|f| specs.iter().find(|x| x.id == f)).or(specs.first());
+    spec.and_then(|f| f.columns().first().map(|c| c.width())).unwrap_or(300.0)
+}
+
+/// The direction of the paragraph at `offset` in `story`, as composition resolves it (its style
+/// chain, then local overrides). A table created there takes it.
+pub(super) fn para_direction(d: &Document, story: StoryId, offset: usize) -> designcraft_doc::TextDirection {
+    d.story(story)
+        .and_then(|st| st.paras.get(st.para_at(offset)))
+        .map_or(designcraft_doc::TextDirection::LeftToRight, |pf| d.styles.resolve_para(pf).0.direction)
+}
diff --git a/crates/engine/src/cmd/text.rs b/crates/engine/src/cmd/text.rs
index 3a40844be..8e6038741 100644
--- a/crates/engine/src/cmd/text.rs
+++ b/crates/engine/src/cmd/text.rs
@@ -9,6 +9,30 @@ use serde_json::{Value, json};
 use super::{CommandSpec, bad, bool_or, cmd, has_doc, has_text, has_text_or_frames, id_param, ok, point_param, str_param};
 use crate::{Result, Session};
 
+mod asian;
+mod caret;
+mod edit;
+mod format;
+mod opentype;
+mod story;
+
+use asian::{auto_tcy_cmd, grid_settings_cmd, kenten_cmd, ruby_cmd, shatai_cmd, warichu_cmd};
+pub(crate) use caret::story_of;
+use caret::{move_caret, para_bounds, place, release, select_around, select_at, sentence_bounds};
+pub use caret::{next_char, next_word, prev_char, prev_word};
+pub(crate) use edit::delete_selection;
+pub use edit::{PLACEHOLDER, quote_marks};
+use edit::{change_case, delete, delete_surrounding, fill_placeholder, insert};
+pub(crate) use format::{
+    Target, TypingFormat, apply_char_attrs, effective_char_format, format_chars, format_paras, format_targets, format_targets_pub,
+    rename_typing_swatch, validate_char_fill,
+};
+use format::{break_link, kern_pair, kern_step, link_style, para_toggle, pick_up_format, step_size, swap_fill_stroke};
+use opentype::{open_type, open_type_features, set_features};
+pub(crate) use story::set_story_direction;
+use story::{selection_attrs, story_direction, story_options};
+
+/// Build the text command registry: caret/selection movement, insertion/deletion, release, text and paragraph formatting, story queries, ruby and OpenType commands, with their parameters and enabled predicates.
 pub fn specs() -> Vec<CommandSpec> {
     vec![
         cmd!(noundo "text.placeCaret", "Place Caret", [], None, "{frame, point: [x,y] (spread coords)} — converts empty frames to text frames", has_doc, |s, p| place(s, p, false)),
@@ -72,6 +96,15 @@ pub fn specs() -> Vec<CommandSpec> {
             ok()
         }),
         cmd!("text.insert", "Type", [], None, "{text, raw?: bool (no typographer's quotes)} — replaces the selected text", has_text, insert),
+        cmd!(
+            "text.deleteSurrounding",
+            "Delete Surrounding Text",
+            [],
+            None,
+            "{before?: int, after?: int, bytes?: bool, commit?: string} — removes the text around the selection (an input method's delete-surrounding), keeps the selection and its direction, and with `commit` types that text over it: one undo step",
+            has_text,
+            delete_surrounding
+        ),
         cmd!("text.delete", "Delete Text", [], None, "{forward?: bool, word?: bool}", has_text, delete),
         cmd!(noundo "text.move", "Move Caret", [], None, "{dir: left|right|up|down|lineStart|lineEnd|storyStart|storyEnd, extend?, word?}", has_text, move_caret),
         cmd!(noundo "text.exitToFrame", "Select Frame", [], None, "{}", has_doc, |s, _| {
@@ -104,6 +137,15 @@ pub fn specs() -> Vec<CommandSpec> {
                 })
             }
         ),
+        cmd!(
+            "story.options",
+            "Story Options",
+            [],
+            None,
+            "{story?, frame?: a text frame of the story (default: the stories of the text selection or the selected frames), opticalMargin?: bool — Optical Margin Alignment: punctuation and letter edges hang outside the frame in every paragraph of the story except those with ignoreOpticalMargin, opticalMarginSize?: pt (0.1–1296, default 12) — the type size the hang amounts are set for} → {stories}",
+            has_doc,
+            story_options
+        ),
         cmd!("story.setText", "Set Story Text", [], None, "{story, text} — replace a story's whole text", has_doc, |s, p| {
             let sid = StoryId(p.get("story").and_then(Value::as_u64).ok_or_else(|| bad("story.setText", "missing story"))?);
             let text = super::text_param(p, "text");
@@ -182,7 +224,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Paragraph Formatting",
             [],
             None,
-            "{attrs: {align?, leftIndent?, firstLineIndent?, spaceBefore?, spaceAfter?, dropCapLines?, dropCapChars?, dropCapStyle?, dropCapAlignLeft?, dropCapScaleDescenders?, hyphenate?: bool (default true), composer?, tabs?, ruleAbove?/ruleBelow?: {on?, weight?, color?, tint?, columnWidth?, offset?, leftIndent?, rightIndent?} (only the named rule fields change), …}}",
+            "{attrs: {align?, leftIndent?, firstLineIndent?, spaceBefore?, spaceAfter?, dropCapLines?, dropCapChars?, dropCapStyle?, dropCapAlignLeft?, dropCapScaleDescenders?, hyphenate?: bool (default true), composer?, opticalMargin?: bool (hang at each character's own size; a story with story.options opticalMargin overrides it), ignoreOpticalMargin?: bool (no hang in the paragraph), tabs?, ruleAbove?/ruleBelow?: {on?, weight?, color?, tint?, columnWidth?, offset?, leftIndent?, rightIndent?} (only the named rule fields change), …}}",
             has_text_or_frames,
             |s, p| format_paras(s, p.get("attrs").unwrap_or(p))
         ),
@@ -374,7 +416,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Selection Attributes",
             [],
             None,
-            "{mixed?: bool} → resolved character/paragraph attributes at the text selection; with mixed, paraMixed lists the paragraph attributes that differ across the selected paragraphs; the selection's start as `selectedText` (one line, up to 60 characters)",
+            "{mixed?: bool} → resolved character/paragraph attributes at the text selection; with mixed, paraMixed lists the paragraph attributes that differ across the selected paragraphs; the selection's start as `selectedText` (one line, up to 60 characters); `storyOptions` {opticalMargin, opticalMarginSize} of the stories story.options would change (null where they differ)",
             has_doc,
             selection_attrs
         ),
@@ -390,3580 +432,3 @@ pub fn specs() -> Vec<CommandSpec> {
         ),
     ]
 }
-
-pub(crate) fn story_of(s: &Session, p: &Value) -> Option<StoryId> {
-    let st = s.active()?;
-    if let Some(v) = p.get("story").and_then(Value::as_u64) {
-        return Some(StoryId(v));
-    }
-    let frame = id_param(p, "frame").or_else(|| st.selection.items.first().copied());
-    if let Some(f) = frame {
-        return st.doc.item(f).and_then(|i| i.text_frame()).map(|t| t.story);
-    }
-    st.selection.text.map(|t| t.story)
-}
-
-/// Story byte at spread point `pt` in text frame `frame` (in a table cell's story when the point is in a cell).
-fn hit_byte(s: &Session, frame: ItemId, pt: Point) -> Option<(StoryId, usize, Option<CellAddr>)> {
-    hit_byte_with(s, frame, pt, compose::hit)
-}
-
-/// [`hit_byte`] with the hit test: [`compose::hit`] (caret position) or [`compose::hit_char`]
-/// (the character under the point).
-fn hit_byte_with(
-    s: &Session,
-    frame: ItemId,
-    pt: Point,
-    hit: fn(&compose::ComposedStory, usize, Point) -> Option<usize>,
-) -> Option<(StoryId, usize, Option<CellAddr>)> {
-    let st = s.active()?;
-    let loc = st.doc.find(frame)?;
-    let it = st.doc.item_at(&loc)?;
-    let sid = it.text_frame()?.story;
-    let xf = st.doc.parent_xf(&loc) * st.doc.text_xf(it);
-    let inner = xf.inverse() * pt;
-    let cs = s.cache.get(&st.doc, sid, None);
-    let fi = cs.frames.iter().position(|f| f.frame == frame)?;
-    // Map path-text hits along the curve before choosing the character unit.
-    let inner = cs.frames.get(fi).and_then(|ft| compose::PathTextMap::new(it, ft)).map_or(inner, |m| m.to_line(inner));
-    if let Some((table, row, col, b)) = compose::hit_cell_with(&cs, fi, inner, hit) {
-        return Some((sid, b, Some(CellAddr { table, row, col })));
-    }
-    if let Some((id, b)) = compose::hit_note_with(&cs, fi, inner, hit) {
-        return Some((sid, b, Some(CellAddr::footnote(id))));
-    }
-    let b = hit(&cs, fi, inner).unwrap_or(0);
-    Some((sid, b, None))
-}
-
-/// The Eyedropper with text selected: the formatting of the text under `point` in `frame` goes to
-/// the selection, as InDesign's does (character style and overrides on the selected characters,
-/// paragraph style and overrides on their paragraphs).
-fn pick_up_format(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "type.pickUpFormat";
-    let frame = id_param(p, "frame").ok_or_else(|| bad(ID, "missing frame"))?;
-    let pt = point_param(p, "point").ok_or_else(|| bad(ID, "missing point"))?;
-    let (sid, b, cell) = hit_byte_with(s, frame, pt, compose::hit_char).ok_or_else(|| bad(ID, "not a text frame"))?;
-    let st = s.doc()?;
-    let sel = st.selection.text.ok_or_else(|| bad(ID, "select the text to format"))?;
-    let src = st.doc.text_story(sid, cell).ok_or(designcraft_doc::DocError::NoStory(sid))?;
-    let b = floor_char_boundary(&src.text, b);
-    // The character under the pointer (at the end of a line, the one before it).
-    let at = if b >= src.text.len() || src.text[b..].starts_with('\n') { b.saturating_sub(1) } else { b };
-    let at = floor_char_boundary(&src.text, at);
-    let chars = src.char_format_at(at).clone();
-    let para = src.paras.get(src.para_at(at)).cloned().ok_or(designcraft_doc::DocError::NoStory(sid))?;
-    let (a, e) = (sel.anchor.min(sel.focus), sel.anchor.max(sel.focus));
-    s.typing_format = None;
-    s.edit(|d, _| {
-        let story = d.text_story_mut(sel.story, sel.cell).ok_or(designcraft_doc::DocError::NoStory(sel.story))?;
-        if e > a {
-            story.format_chars(a..e, |f| *f = chars.clone());
-        }
-        story.format_paras(a..e, |f| {
-            f.style = para.style.clone();
-            f.para = para.para.clone();
-        });
-        Ok(json!({"style": chars.style, "paragraphStyle": para.style}))
-    })
-}
-
-/// Select the word, line, paragraph or story at `point` in `frame` (multiple clicks).
-fn select_at(s: &mut Session, p: &Value, unit: &str) -> Result<Value> {
-    const ID: &str = "text.selectAt";
-    let frame = id_param(p, "frame").ok_or_else(|| bad(ID, "missing frame"))?;
-    let pt = point_param(p, "point").ok_or_else(|| bad(ID, "missing point"))?;
-    let (sid, b, cell) = hit_byte_with(s, frame, pt, compose::hit_char).ok_or_else(|| bad(ID, "not a text frame"))?;
-    let (a, e) = unit_at(s, sid, cell, b, unit, ID)?;
-    s.text_drag = false;
-    s.typing_format = None;
-    let sel = TextSel { story: sid, anchor: a, focus: e, frame: Some(frame), cell };
-    s.text_unit = Some(sel);
-    let st = s.doc_mut()?;
-    st.selection = Selection::text(sel);
-    // Explicit reselection invalidates the Find scope even when the range is unchanged.
-    st.bump_revision();
-    Ok(json!({"story": sid.0, "anchor": a, "focus": e}))
-}
-
-/// The `unit` (word, line, paragraph or story) around byte `b` of story `sid` (a cell's story
-/// with `cell`), as the multiple clicks select it.
-fn unit_at(s: &Session, sid: StoryId, cell: Option<CellAddr>, b: usize, unit: &str, cmd: &str) -> Result<(usize, usize)> {
-    let st = s.doc()?;
-    let story = st.doc.text_story(sid, cell).ok_or(designcraft_doc::DocError::NoStory(sid))?;
-    let text = story.text.as_str();
-    let b = floor_char_boundary(text, b);
-    Ok(match unit {
-        "word" => word_or_spaces_at(text, b),
-        "line" => {
-            let cs = s.cache.get(&st.doc, sid, None);
-            line_at(&text_composition(cs, cell), b).unwrap_or((b, b))
-        }
-        // The paragraph with its return (the last paragraph has none).
-        "paragraph" => story.para_ranges().get(story.para_at(b)).map_or((b, b), |r| (r.start, (r.end + 1).min(text.len()))),
-        "story" => (0, text.len()),
-        other => return Err(bad(cmd, format!("unknown unit `{other}` (word, line, paragraph or story)"))),
-    })
-}
-
-/// The word at byte `i`; on spaces the run of spaces; on anything else that one character
-/// (grapheme cluster). At the end of a paragraph, what ends it. Grapheme clusters are never split:
-/// combining marks, viramas, variation selectors and emoji ZWJ sequences stay with their base.
-fn word_or_spaces_at(s: &str, i: usize) -> (usize, usize) {
-    use unicode_segmentation::UnicodeSegmentation;
-    let i = floor_char_boundary(s, i.min(s.len()));
-    // Clusters never span a paragraph return, so the paragraph is enough.
-    let ps = s[..i].rfind('\n').map_or(0, |k| k + 1);
-    let pe = s[i..].find('\n').map_or(s.len(), |k| i + k);
-    let g: Vec<(usize, &str)> = s[ps..pe].grapheme_indices(true).collect();
-    let Some(k) = g.iter().rposition(|(o, _)| ps + o <= i) else { return (i, i) };
-    let kind = |c: &str| match c.chars().next() {
-        Some(c) if is_word(c) => 1,
-        Some(c) if c.is_whitespace() => 2,
-        _ => 0,
-    };
-    let span = |a: usize, e: usize| g.get(a).zip(g.get(e)).map_or((i, i), |((oa, _), (oe, ge))| (ps + oa, ps + oe + ge.len()));
-    let kd = g.get(k).map_or(0, |(_, c)| kind(c));
-    if kd == 0 {
-        return span(k, k);
-    }
-    let mut a = k;
-    while a > 0 && g.get(a - 1).is_some_and(|(_, c)| kind(c) == kd) {
-        a -= 1;
-    }
-    let mut e = k;
-    while g.get(e + 1).is_some_and(|(_, c)| kind(c) == kd) {
-        e += 1;
-    }
-    span(a, e)
-}
-
-/// The composition whose lines hold a story's text: the story's own, a table cell's or a footnote's.
-fn text_composition(cs: std::sync::Arc<compose::ComposedStory>, cell: Option<CellAddr>) -> std::sync::Arc<compose::ComposedStory> {
-    match cell {
-        Some(c) if c.footnote_id().is_some() => compose::find_note(&cs, c.row as u64).map(|(_, n)| n.text.clone()).unwrap_or(cs),
-        Some(c) => compose::find_cell(&cs, c.table, c.row, c.col).map(|(_, _, pc)| pc.text.clone()).unwrap_or(cs),
-        None => cs,
-    }
-}
-
-/// The composed line holding the character at byte `pos`.
-fn line_at(cs: &compose::ComposedStory, pos: usize) -> Option<(usize, usize)> {
-    let lines = || cs.frames.iter().flat_map(|f| f.lines.iter());
-    lines().find(|l| l.range.contains(&pos)).map(|l| (l.range.start, l.range.end)).or_else(|| line_of(cs, pos))
-}
-
-fn place(s: &mut Session, p: &Value, extend: bool) -> Result<Value> {
-    let frame = id_param(p, "frame").ok_or_else(|| bad("text.placeCaret", "missing frame"))?;
-    let pt = point_param(p, "point").unwrap_or(Point::ZERO);
-    // Empty frames become text frames; a locked one stays as it is.
-    let st = s.doc()?;
-    let locked = st.doc.item(frame).is_some_and(|i| i.locked || st.doc.layer(i.layer).is_some_and(|l| l.locked));
-    let needs_convert = st.doc.item(frame).is_some_and(|i| matches!(i.content, Content::Unassigned));
-    if needs_convert && locked {
-        return Err(bad("text.placeCaret", "the frame is locked"));
-    }
-    if needs_convert {
-        s.execute("object.content", &json!({"ids": [frame.0], "type": "text"}))?;
-    }
-    let (sid, b, cell) = hit_byte(s, frame, pt).ok_or_else(|| bad("text.placeCaret", "not a text frame"))?;
-    // A drag after several clicks: whole units from the one first selected, in either direction.
-    if extend
-        && let Some(unit) = str_param(p, "unit")
-        && let Some(u) = s.text_unit.filter(|u| u.story == sid && u.cell == cell)
-    {
-        // The remembered unit may predate edits that shortened the text.
-        let text = s.doc()?.doc.text_story(sid, cell).map_or("", |t| t.text.as_str());
-        let (ua, ue) = (floor_char_boundary(text, u.anchor.min(u.focus)), floor_char_boundary(text, u.anchor.max(u.focus)));
-        let (na, ne) = unit_at(s, sid, cell, b, unit, "text.extendTo")?;
-        let (anchor, focus) = if na < ua { (ue, na) } else { (ua, ne.max(ue)) };
-        s.typing_format = None;
-        let st = s.doc_mut()?;
-        st.selection = Selection::text(TextSel { story: sid, anchor, focus, frame: Some(frame), cell });
-        st.bump_revision();
-        return Ok(json!({"story": sid.0, "anchor": anchor, "focus": focus}));
-    }
-    // Drag and drop: a press inside the selected text keeps it (to be dragged).
-    if !extend {
-        s.text_drag = s.doc()?.selection.text.is_some_and(|t| t.story == sid && t.cell == cell && !t.range().is_empty() && t.range().contains(&b));
-        if s.text_drag {
-            return Ok(json!({"story": sid.0, "dragging": true}));
-        }
-    } else if s.text_drag {
-        return Ok(json!({"story": sid.0, "dragging": true}));
-    }
-    s.typing_format = None;
-    let st = s.doc_mut()?;
-    // Dragging from one cell into another selects cells.
-    if extend
-        && let (Some(t), Some(c)) = (st.selection.text, cell)
-        && let Some(a) = t.cell
-        && t.story == sid
-        && a.table == c.table
-        && (a.row, a.col) != (c.row, c.col)
-    {
-        let range = designcraft_doc::CellRange::new(a.row, a.col, c.row, c.col);
-        st.selection.cells = Some(designcraft_doc::TableSel { story: sid, table: c.table, range });
-        st.bump_revision();
-        return Ok(json!({"story": sid.0, "cells": range}));
-    }
-    let t = match (extend, st.selection.text) {
-        (true, Some(t)) if t.story == sid && t.cell == cell => TextSel { focus: b, frame: Some(frame), ..t },
-        _ => TextSel { story: sid, anchor: b, focus: b, frame: Some(frame), cell },
-    };
-    st.selection = Selection::text(t);
-    st.bump_revision();
-    Ok(json!({"story": sid.0, "pos": b, "cell": cell}))
-}
-
-fn release(s: &mut Session, p: &Value) -> Result<Value> {
-    if !std::mem::take(&mut s.text_drag) {
-        return ok();
-    }
-    let frame = id_param(p, "frame").ok_or_else(|| bad("text.release", "missing frame"))?;
-    let pt = point_param(p, "point").unwrap_or(Point::ZERO);
-    if !p.get("moved").and_then(Value::as_bool).unwrap_or(false) {
-        // A click in the selection: the caret goes there.
-        s.doc_mut()?.selection.text = None;
-        return place(s, &json!({"frame": frame.0, "point": [pt.x, pt.y]}), false);
-    }
-    let copy = p.get("copy").and_then(Value::as_bool).unwrap_or(false);
-    let Some(t) = s.doc()?.selection.text else { return ok() };
-    let Some((sid, b, cell)) = hit_byte(s, frame, pt) else { return ok() };
-    let r = t.range();
-    if sid != t.story || cell != t.cell || (r.contains(&b) && !copy) {
-        return ok();
-    }
-    s.edit(|d, sel| {
-        let st = d.text_story_mut(sid, cell).ok_or(designcraft_doc::DocError::NoStory(sid))?;
-        let piece = st.extract(r.clone());
-        let mut at = b;
-        if !copy {
-            st.delete(r.clone());
-            if at > r.start {
-                at -= r.len().min(at - r.start);
-            }
-        }
-        let end = st.insert_story(at, &piece);
-        sel.text = Some(TextSel { story: sid, anchor: at, focus: end, frame: Some(frame), cell });
-        Ok(json!({"moved": piece.text.len(), "at": at}))
-    })
-}
-
-// Each command edits a copy-on-write Story snapshot. Reserving its known final text growth
-// avoids retaining geometric String spare capacity in every independent undo snapshot.
-// General Story insertion keeps its existing amortized-growth policy for mutable builders.
-fn reserve_command_text(st: &mut designcraft_doc::Story, additional: usize) -> Result<()> {
-    st.text.try_reserve_exact(additional).map_err(|e| crate::EngineError::Other(format!("could not reserve text insertion: {e}")))
-}
-
-fn insert(s: &mut Session, p: &Value) -> Result<Value> {
-    let text = super::text_param(p, "text");
-    // Tab in a table cell moves to the next cell (Shift-Tab: `table.prevCell`).
-    if text == "\t" && s.doc()?.selection.text.is_some_and(|t| t.cell.is_some()) {
-        return super::table::step_cell(s, true);
-    }
-    let raw = p.get("raw").and_then(Value::as_bool).unwrap_or(false);
-    let text = if s.prefs.typographers_quotes && !raw { smart_quotes(s, &text) } else { text };
-    let tracking = s.doc()?.doc.settings.track_changes;
-    let autocorrect = (s.prefs.autocorrect && !tracking && !raw).then(|| s.prefs.autocorrect_list.clone());
-    let typing = typing_format(s).cloned();
-    let result = s.edit(|d, sel| {
-        let t = sel.text.ok_or_else(|| bad("text.insert", "no insertion point"))?;
-        let st = d.text_story_mut(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
-        let r = t.range();
-        let mut r = r.start.min(st.len())..r.end.min(st.len());
-        // Between a break character and its return is the end of that paragraph: typing there goes
-        // to the start of the next one.
-        if r.is_empty()
-            && st.text.get(r.start..).is_some_and(|t| t.starts_with('\n'))
-            && st.text.get(..r.start).and_then(|t| t.chars().next_back()).is_some_and(designcraft_doc::is_break_char)
-        {
-            r = r.start + 1..r.start + 1;
-        }
-        // Autocorrect: a word ended by a space or punctuation is looked up.
-        if let Some(list) = &autocorrect
-            && r.is_empty()
-            && text.chars().count() == 1
-            && text.chars().all(|c| c.is_whitespace() || c.is_ascii_punctuation())
-        {
-            let before = &st.text[..r.start];
-            let ws = before.char_indices().rev().take_while(|(_, c)| c.is_alphabetic()).last().map(|(i, _)| i);
-            if let Some(ws) = ws {
-                let word = &before[ws..];
-                if let Some((_, to)) = list.iter().find(|(from, _)| from.eq_ignore_ascii_case(word)) {
-                    let to = if word.chars().next().is_some_and(char::is_uppercase) {
-                        let mut c = to.chars();
-                        c.next().map(|f| f.to_uppercase().chain(c).collect()).unwrap_or_default()
-                    } else {
-                        to.clone()
-                    };
-                    st.replace(ws..r.start, &to);
-                    r = ws + to.len()..ws + to.len();
-                }
-            }
-        }
-        // A column, frame or page break ends its paragraph.
-        let mut text = if text.contains(designcraft_doc::is_break_char) {
-            designcraft_doc::end_paragraphs_at_breaks(&text, st.text.get(r.end..).and_then(|t| t.chars().next()))
-        } else {
-            text.clone()
-        };
-        // Typing next to a table anchor starts a paragraph of its own.
-        let mut trail = 0;
-        if t.cell.is_none() && !text.is_empty() && st.table_at(r.start).is_some() {
-            let pi = st.para_at(r.start);
-            let pr = st.para_ranges()[pi].clone();
-            let anchor_at = pr.start + st.text[pr.clone()].find(designcraft_doc::TABLE_ANCHOR).unwrap_or(0);
-            if r.start <= anchor_at {
-                if !text.ends_with('\n') {
-                    text.push('\n');
-                    trail = 1;
-                }
-            } else if !text.starts_with('\n') {
-                text.insert(0, '\n');
-            }
-        }
-        if tracking && t.cell.is_none() {
-            // Track Changes: the replaced text is marked deleted, the typing inserted after it.
-            let at = super::changes::mark_deleted(st, r.clone());
-            reserve_command_text(st, text.len())?;
-            let mut fmt = st.insert_format_at(at).clone();
-            if let Some(f) = &typing {
-                apply_typing_format(&mut fmt, f);
-            }
-            fmt.over.change = Some(designcraft_doc::ChangeMark::Inserted);
-            st.insert_with(at, &text, fmt);
-            let pos = at + text.len() - trail;
-            sel.text = Some(TextSel { anchor: pos, focus: pos, ..t });
-            return Ok(json!({"pos": pos}));
-        }
-        let a = floor_char_boundary(&st.text, r.start.min(st.len()));
-        let b = floor_char_boundary(&st.text, r.end.min(st.len())).max(a);
-        reserve_command_text(st, text.len().saturating_sub(b - a))?;
-        st.replace(r.clone(), &text);
-        if let Some(f) = &typing
-            && !text.is_empty()
-        {
-            st.format_chars(r.start..r.start + text.len(), |fmt| apply_typing_format(fmt, f));
-        }
-        let pos = r.start + text.len() - trail;
-        sel.text = Some(TextSel { anchor: pos, focus: pos, ..t });
-        Ok(json!({"pos": pos}))
-    });
-    // A preview (IME marked text) leaves the typing format to the text typed in the end.
-    if result.is_ok() && s.active().is_none_or(|d| d.interaction.is_none()) {
-        s.typing_format = None;
-    }
-    result
-}
-
-fn smart_quotes(s: &Session, text: &str) -> String {
-    if !text.contains(['"', '\'']) {
-        return text.to_string();
-    }
-    let prev = s
-        .active()
-        .and_then(|st| {
-            let t = st.selection.text?;
-            let story = st.doc.text_story(t.story, t.cell)?;
-            story.text[..t.range().start.min(story.len())].chars().last()
-        })
-        .unwrap_or(' ');
-    // The language at the insertion point picks the quote marks.
-    let language = s
-        .active()
-        .and_then(|st| {
-            let t = st.selection.text?;
-            let story = st.doc.text_story(t.story, t.cell)?;
-            let pos = t.range().start.min(story.len());
-            let pi = story.para_at(pos).min(story.paras.len().saturating_sub(1));
-            let base = st.doc.styles.resolve_para(story.paras.get(pi)?).1;
-            Some(st.doc.styles.resolve_char(&base, story.char_format_at(pos)).language)
-        })
-        .unwrap_or_default();
-    let [dq_open, dq_close, sq_open, sq_close] = quote_marks(&language);
-    let mut out = String::with_capacity(text.len());
-    let mut last = prev;
-    for c in text.chars() {
-        let open = last.is_whitespace() || matches!(last, '(' | '[' | '{' | '\u{2014}' | '\u{2013}');
-        let r = match c {
-            '"' => {
-                if open {
-                    dq_open
-                } else {
-                    dq_close
-                }
-            }
-            '\'' => {
-                if open {
-                    sq_open
-                } else {
-                    // An apostrophe inside a word stays an apostrophe.
-                    if last.is_alphanumeric() { '\u{2019}' } else { sq_close }
-                }
-            }
-            c => c,
-        };
-        out.push(r);
-        last = c;
-    }
-    out
-}
-
-/// Typographer's quotes of a language (a name or locale code, see
-/// [`designcraft_doc::language_tag`]): [double open, double close, single open, single close].
-pub fn quote_marks(language: &str) -> [char; 4] {
-    const ENGLISH: [char; 4] = ['\u{201C}', '\u{201D}', '\u{2018}', '\u{2019}'];
-    let Some(tag) = designcraft_doc::language_tag(language) else { return ENGLISH };
-    // Swiss German, French and Italian use guillemets.
-    if tag.ends_with("-CH") {
-        return ['\u{00AB}', '\u{00BB}', '\u{2039}', '\u{203A}'];
-    }
-    match tag {
-        "zh-Hans" => return ENGLISH,
-        "zh" | "zh-Hant" => return ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}'],
-        _ => {}
-    }
-    match designcraft_doc::language_subtag(tag) {
-        "de" | "cs" | "sk" | "bg" | "lt" => ['\u{201E}', '\u{201C}', '\u{201A}', '\u{2018}'],
-        "fr" | "ru" | "uk" | "no" | "nb" | "nn" | "el" => ['\u{00AB}', '\u{00BB}', '\u{2039}', '\u{203A}'],
-        "es" | "it" | "pt" | "ca" => ['\u{00AB}', '\u{00BB}', '\u{201C}', '\u{201D}'],
-        "nl" | "pl" | "ro" | "hu" | "hr" => ['\u{201E}', '\u{201D}', '\u{201A}', '\u{2019}'],
-        "sv" | "fi" => ['\u{201D}', '\u{201D}', '\u{2019}', '\u{2019}'],
-        "da" => ['\u{00BB}', '\u{00AB}', '\u{203A}', '\u{2039}'],
-        "ja" => ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}'],
-        _ => ENGLISH,
-    }
-}
-
-pub(crate) fn delete_selection(s: &mut Session) -> Result<Value> {
-    let tracking = s.doc()?.doc.settings.track_changes;
-    s.edit(|d, sel| {
-        let t = sel.text.ok_or_else(|| bad("text.delete", "no text"))?;
-        let r = t.range();
-        if let Some(st) = d.text_story_mut(t.story, t.cell) {
-            if tracking && t.cell.is_none() {
-                super::changes::mark_deleted(st, r.clone());
-            } else {
-                st.delete(r.clone());
-            }
-        }
-        sel.text = Some(TextSel { anchor: r.start, focus: r.start, ..t });
-        ok()
-    })
-}
-
-fn delete(s: &mut Session, p: &Value) -> Result<Value> {
-    let forward = bool_or(p, "forward", false);
-    let word = bool_or(p, "word", false);
-    let tracking = s.doc()?.doc.settings.track_changes;
-    s.edit(|d, sel| {
-        let t = sel.text.ok_or_else(|| bad("text.delete", "no text"))?;
-        let st = d.text_story_mut(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
-        let r = t.range();
-        let r = if !r.is_empty() {
-            r
-        } else if forward {
-            let end = if word { next_word(&st.text, r.start) } else { next_char(&st.text, r.start) };
-            r.start..end
-        } else {
-            let start = if word { prev_word(&st.text, r.start) } else { prev_char(&st.text, r.start) };
-            start..r.start
-        };
-        let r = with_break_pair(&st.text, r);
-        if tracking && t.cell.is_none() {
-            // Marked, not removed: the caret steps over the deleted text.
-            let at = super::changes::mark_deleted(st, r.clone());
-            let pos = if forward { at.max(r.end.min(st.len())) } else { r.start.min(at) };
-            sel.text = Some(TextSel { anchor: pos, focus: pos, ..t });
-            return ok();
-        }
-        st.delete(r.clone());
-        sel.text = Some(TextSel { anchor: r.start, focus: r.start, ..t });
-        ok()
-    })
-}
-
-/// A break character and the return after it end one paragraph: deleting either deletes both.
-fn with_break_pair(text: &str, r: std::ops::Range<usize>) -> std::ops::Range<usize> {
-    let Some(del) = text.get(r.clone()) else { return r };
-    let mut chars = del.chars();
-    match (chars.next(), chars.next()) {
-        (Some('\n'), None) => match text.get(..r.start).and_then(|t| t.chars().next_back()) {
-            Some(b) if designcraft_doc::is_break_char(b) => r.start.saturating_sub(b.len_utf8())..r.end,
-            _ => r,
-        },
-        (Some(b), None) if designcraft_doc::is_break_char(b) && text.get(r.end..).is_some_and(|t| t.starts_with('\n')) => r.start..r.end + 1,
-        _ => r,
-    }
-}
-
-pub fn next_char(s: &str, i: usize) -> usize {
-    s[i.min(s.len())..].chars().next().map(|c| i + c.len_utf8()).unwrap_or(s.len())
-}
-pub fn prev_char(s: &str, i: usize) -> usize {
-    s[..i.min(s.len())].chars().next_back().map(|c| i - c.len_utf8()).unwrap_or(0)
-}
-fn is_word(c: char) -> bool {
-    c.is_alphanumeric() || c == '\'' || c == '’'
-}
-pub fn next_word(s: &str, i: usize) -> usize {
-    let mut j = i;
-    let mut seen = false;
-    for (k, c) in s[i..].char_indices() {
-        if is_word(c) {
-            seen = true;
-        } else if seen {
-            return i + k;
-        }
-        j = i + k + c.len_utf8();
-    }
-    j
-}
-pub fn prev_word(s: &str, i: usize) -> usize {
-    let mut seen = false;
-    for (k, c) in s[..i].char_indices().rev() {
-        if is_word(c) {
-            seen = true;
-        } else if seen {
-            return k + c.len_utf8();
-        }
-    }
-    0
-}
-/// Selects `bounds(text, byte)` around the byte under `point` in `frame`. Unlike a caret
-/// placement, a press inside the current selection is no start of a text drag here: it is the
-/// third or later click of a row, which lands in the word or sentence just selected.
-fn select_around(s: &mut Session, p: &Value, id: &str, bounds: fn(&str, usize) -> (usize, usize)) -> Result<Value> {
-    let frame = id_param(p, "frame").ok_or_else(|| bad(id, "missing frame"))?;
-    let pt = point_param(p, "point").unwrap_or(Point::ZERO);
-    let (sid, b, cell) = hit_byte(s, frame, pt).ok_or_else(|| bad(id, "not a text frame"))?;
-    let st = s.doc_mut()?;
-    let text = st.doc.text_story(sid, cell).map(|x| x.text.clone()).unwrap_or_default();
-    let (anchor, focus) = bounds(&text, floor_char_boundary(&text, b));
-    s.text_drag = false;
-    s.typing_format = None;
-    let st = s.doc_mut()?;
-    st.selection = Selection::text(TextSel { story: sid, anchor, focus, frame: Some(frame), cell });
-    st.bump_revision();
-    Ok(json!({"story": sid.0, "anchor": anchor, "focus": focus}))
-}
-
-/// The paragraph around byte `i`, without its `\n`.
-fn para_bounds(s: &str, i: usize) -> (usize, usize) {
-    let i = i.min(s.len());
-    let a = s.get(..i).and_then(|t| t.rfind('\n')).map_or(0, |k| k + 1);
-    let b = s.get(i..).and_then(|t| t.find('\n')).map_or(s.len(), |k| i + k);
-    (a, b)
-}
-
-/// The sentence around byte `i`, within its paragraph: it ends after `.`, `!`, `?` or `…` (and
-/// any closing quotes or brackets) followed by a space or the paragraph end, or after a CJK full
-/// stop, and takes the spaces after it, as deleting a sentence should leave none behind.
-fn sentence_bounds(s: &str, i: usize) -> (usize, usize) {
-    let (pa, pb) = para_bounds(s, i);
-    let para = s.get(pa..pb).unwrap_or("");
-    let mut start = 0;
-    let mut it = para.char_indices().peekable();
-    while let Some((_, c)) = it.next() {
-        let cjk = matches!(c, '。' | '！' | '？');
-        if !cjk && !matches!(c, '.' | '!' | '?' | '…') {
-            continue;
-        }
-        while it.peek().is_some_and(|&(_, c)| {
-            matches!(c, '.' | '!' | '?' | '…' | '。' | '！' | '？' | '"' | '\'' | '”' | '’' | '»' | '›' | ')' | ']' | '」' | '』' | '）')
-        }) {
-            it.next();
-        }
-        if !cjk && it.peek().is_some_and(|&(_, c)| !c.is_whitespace()) {
-            continue;
-        }
-        while it.peek().is_some_and(|&(_, c)| c.is_whitespace()) {
-            it.next();
-        }
-        let end = it.peek().map_or(para.len(), |&(k, _)| k);
-        if pa + end > i || end == para.len() {
-            return (pa + start, pa + end);
-        }
-        start = end;
-    }
-    (pa + start, pb)
-}
-
-/// Type ▸ Story Direction.
-fn story_direction(s: &mut Session, p: &Value) -> Result<Value> {
-    let vertical = p.get("vertical").and_then(Value::as_bool).ok_or_else(|| bad("type.storyDirection", "missing vertical"))?;
-    let st = s.doc()?;
-    let mut stories: Vec<StoryId> = st.selection.text.map(|t| t.story).into_iter().chain(st.selection.cells.map(|c| c.story)).collect();
-    for id in &st.selection.items {
-        if let Some(tf) = st.doc.item(*id).and_then(|i| i.text_frame())
-            && !stories.contains(&tf.story)
-        {
-            stories.push(tf.story);
-        }
-    }
-    s.edit(|d, _| {
-        set_story_direction(d, &stories, vertical);
-        Ok(json!({"stories": stories.len()}))
-    })
-}
-
-/// Set the direction of `stories` (all their frames turn together).
-pub(crate) fn set_story_direction(d: &mut designcraft_doc::Document, stories: &[StoryId], vertical: bool) {
-    for sid in stories {
-        if let Some(st) = d.story_mut(*sid)
-            && st.vertical != vertical
-        {
-            st.vertical = vertical;
-            st.rev = st.rev.wrapping_add(1);
-        }
-    }
-}
-
-fn move_caret(s: &mut Session, p: &Value) -> Result<Value> {
-    let dir = str_param(p, "dir").unwrap_or("right").to_string();
-    let extend = bool_or(p, "extend", false);
-    let word = bool_or(p, "word", false);
-    let st = s.doc()?;
-    let t = st.selection.text.ok_or_else(|| bad("text.move", "no caret"))?;
-    let story = st.doc.text_story(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
-    let text = story.text.clone();
-    // In a cell, lines come from the cell's own composition.
-    let cs = text_composition(s.cache.get(&st.doc, t.story, None), t.cell);
-    let pos = t.focus.min(text.len());
-    // Vertical lines run top to bottom and follow each other right to left: Down and Up move along
-    // the line (Right and Left of horizontal text), Left and Right to the next and previous line.
-    let vertical_text = compose::caret(&cs, pos).and_then(|(fi, ..)| cs.frames.get(fi)).is_some_and(|f| f.vertical);
-    let dir = match (vertical_text, dir.as_str()) {
-        (true, "down") => "right",
-        (true, "up") => "left",
-        (true, "left") => "down",
-        (true, "right") => "up",
-        (_, d) => d,
-    };
-    let collapse_to = |left: bool| if left { t.range().start } else { t.range().end };
-    let new = match dir {
-        "left" if !extend && !t.is_caret() => collapse_to(true),
-        "right" if !extend && !t.is_caret() => collapse_to(false),
-        "left" | "right" => {
-            // Lines with right-to-left text move as drawn; at a line's edge, or by words, a
-            // right-to-left line's "left" is forward in the text.
-            let left = dir == "left";
-            let visual = if word { None } else { compose::visual_step(&cs, pos, left) };
-            match visual {
-                Some(p) => p,
-                None => {
-                    let forward = left == compose::line_rtl(&cs, pos);
-                    match (forward, word) {
-                        (true, true) => next_word(&text, pos),
-                        (true, false) => next_char(&text, pos),
-                        (false, true) => prev_word(&text, pos),
-                        (false, false) => prev_char(&text, pos),
-                    }
-                }
-            }
-        }
-        "up" | "down" => vertical(&cs, pos, dir == "up").unwrap_or(pos),
-        "lineStart" => line_of(&cs, pos).map(|l| l.0).unwrap_or(0),
-        "lineEnd" => line_of(&cs, pos).map(|l| l.1).unwrap_or(text.len()),
-        "storyStart" => 0,
-        "storyEnd" => text.len(),
-        other => return Err(bad("text.move", format!("unknown dir `{other}`"))),
-    };
-    s.typing_format = None;
-    let stm = s.doc_mut()?;
-    stm.selection.text = Some(if extend { TextSel { focus: new, ..t } } else { TextSel { anchor: new, focus: new, ..t } });
-    stm.bump_revision();
-    Ok(json!({"pos": new}))
-}
-
-fn line_of(cs: &compose::ComposedStory, pos: usize) -> Option<(usize, usize)> {
-    cs.frames.iter().flat_map(|f| f.lines.iter()).find(|l| pos >= l.range.start && pos <= l.range.end).map(|l| (l.range.start, l.range.end))
-}
-
-fn vertical(cs: &compose::ComposedStory, pos: usize, up: bool) -> Option<usize> {
-    let (fi, x, caret_y, _, _) = compose::caret(cs, pos)?;
-    let lines: Vec<(usize, &compose::Line)> = cs.frames.iter().enumerate().flat_map(|(i, f)| f.lines.iter().map(move |l| (i, l))).collect();
-    // Match the line by the bytes it owns. A warichu caret sits on a small-line baseline, so it
-    // does not equal the parent line's baseline.
-    let cur = lines.iter().position(|(i, l)| *i == fi && pos >= l.range.start && pos <= l.range.end && (pos < l.range.end || l.last_in_para))?;
-    let (_, l) = lines.get(cur)?;
-    if let Some(y) = compose::adjacent_row(l, x, caret_y, up)
-        && let Some(p) = compose::hit(cs, fi, Point::new(x, y))
-        && p != pos
-    {
-        return Some(p);
-    }
-    // The next row: segments of the same line (beside a wrap object) share its baseline.
-    let other_row = |(i, t): &&(usize, &compose::Line)| *i != fi || (t.baseline - l.baseline).abs() > 1e-6;
-    let (tf, tl) = if up { lines.get(..cur)?.iter().rfind(other_row)? } else { lines.get(cur + 1..)?.iter().find(other_row)? };
-    compose::hit(cs, *tf, Point::new(x, tl.baseline - 1.0))
-}
-
-/// Where a formatting command applies: a story (or a table cell's story) and a byte range.
-#[derive(Clone, Debug)]
-pub(crate) struct Target {
-    pub story: StoryId,
-    pub cell: Option<CellAddr>,
-    pub range: std::ops::Range<usize>,
-}
-
-/// Ranges and stories a formatting command applies to: selected table cells (whole cells), the
-/// text selection, or whole stories of the selected text frames.
-pub(crate) fn format_targets(s: &Session) -> Vec<Target> {
-    let Some(st) = s.active() else { return vec![] };
-    if let Some(ts) = st.selection.cells
-        && let Some(t) = st.doc.story(ts.story).and_then(|x| x.tables.get(&ts.table))
-    {
-        let mut v = Vec::new();
-        for (r, c) in t.selected_owners(ts.range) {
-            let len = t.cell(r, c).map_or(0, |x| x.text.len());
-            v.push(Target { story: ts.story, cell: Some(CellAddr { table: ts.table, row: r, col: c }), range: 0..len });
-        }
-        return v;
-    }
-    if let Some(t) = st.selection.text {
-        return vec![Target { story: t.story, cell: t.cell, range: t.range() }];
-    }
-    let mut v: Vec<Target> = Vec::new();
-    for id in &st.selection.items {
-        if let Some(tf) = st.doc.item(*id).and_then(|i| i.text_frame()) {
-            let len = st.doc.story(tf.story).map(|x| x.len()).unwrap_or(0);
-            if !v.iter().any(|t| t.story == tf.story) {
-                v.push(Target { story: tf.story, cell: None, range: 0..len });
-            }
-        }
-    }
-    v
-}
-
-/// Character formatting chosen at a bare caret in text: applied to what is typed there next.
-#[derive(Clone, Debug)]
-pub(crate) struct TypingFormat {
-    doc: u64,
-    at: TextSel,
-    attrs: CharAttrs,
-    /// Overrides removed (`null` in `type.char`).
-    cleared: Vec<String>,
-}
-
-/// The typing format for the active document's caret, if it was chosen at this caret.
-fn typing_format(s: &Session) -> Option<&TypingFormat> {
-    let st = s.active()?;
-    let t = st.selection.text?;
-    s.typing_format.as_ref().filter(|f| f.doc == st.uid && f.at.story == t.story && f.at.cell == t.cell && f.at.range() == t.range())
-}
-
-fn warichu_cmd(s: &mut Session, p: &Value) -> Result<Value> {
-    let has_opts = ["lines", "size", "lineSpacing", "align", "charsBeforeBreak", "charsAfterBreak"].iter().any(|k| p.get(k).is_some());
-    let on = match p.get("on").and_then(Value::as_bool) {
-        Some(v) => v,
-        None if has_opts => true,
-        None => !format_targets(s).first().is_some_and(|t| {
-            s.doc()
-                .ok()
-                .and_then(|d| d.doc.text_story(t.story, t.cell))
-                .is_some_and(|st| st.char_format_at(if t.range.is_empty() { t.range.start } else { t.range.start + 1 }).over.warichu == Some(true))
-        }),
-    };
-    let mut body = serde_json::Map::new();
-    body.insert("warichu".into(), json!(on));
-    if on {
-        if let Some(v) = p.get("lines").and_then(Value::as_u64) {
-            body.insert("warichuLines".into(), json!(v.clamp(2, 16)));
-        }
-        if let Some(v) = p.get("size").and_then(Value::as_f64).filter(|v| v.is_finite()) {
-            body.insert("warichuSize".into(), json!(v.clamp(1.0, 1000.0)));
-        }
-        if let Some(v) = p.get("lineSpacing").and_then(Value::as_f64).filter(|v| v.is_finite()) {
-            body.insert("warichuLineSpacing".into(), json!(v.clamp(-10_000.0, 10_000.0)));
-        }
-        if let Some(v) = p.get("align").and_then(Value::as_str) {
-            body.insert("warichuAlignment".into(), json!(v));
-        }
-        if let Some(v) = p.get("charsBeforeBreak").and_then(Value::as_u64) {
-            body.insert("warichuCharsBeforeBreak".into(), json!(v.min(100)));
-        }
-        if let Some(v) = p.get("charsAfterBreak").and_then(Value::as_u64) {
-            body.insert("warichuCharsAfterBreak".into(), json!(v.min(100)));
-        }
-    }
-    format_chars(s, &Value::Object(body))
-}
-
-// Kenten, shatai, auto tate-chu-yoko and grid settings: validated settings for the CJK commands.
-
-/// Longest font, style or swatch name taken from parameters, in characters.
-const NAME_MAX_CHARS: usize = 256;
-
-/// A number parameter: absent or `null` → `None`; anything but a finite number is an error.
-fn finite_param(p: &Value, key: &str, cmd: &str) -> Result<Option<f64>> {
-    match p.get(key) {
-        None | Some(Value::Null) => Ok(None),
-        Some(v) => v.as_f64().filter(|v| v.is_finite()).map(Some).ok_or_else(|| bad(cmd, format!("`{key}` must be a finite number"))),
-    }
-}
-
-/// A text parameter, cut to `max` characters: absent or `null` → `None`; not text is an error.
-fn text_param(p: &Value, key: &str, cmd: &str, max: usize) -> Result<Option<String>> {
-    match p.get(key) {
-        None | Some(Value::Null) => Ok(None),
-        Some(Value::String(t)) => Ok(Some(t.chars().take(max).collect())),
-        Some(_) => Err(bad(cmd, format!("`{key}` must be text"))),
-    }
-}
-
-/// A boolean parameter: absent or `null` → `None`; not a boolean is an error.
-fn bool_param(p: &Value, key: &str, cmd: &str) -> Result<Option<bool>> {
-    match p.get(key) {
-        None | Some(Value::Null) => Ok(None),
-        Some(v) => v.as_bool().map(Some).ok_or_else(|| bad(cmd, format!("`{key}` must be true or false"))),
-    }
-}
-
-/// An enumeration parameter checked against `T`, as its JSON value.
-fn enum_param<T: serde::de::DeserializeOwned + serde::Serialize>(p: &Value, key: &str, cmd: &str) -> Result<Option<Value>> {
-    match p.get(key) {
-        None | Some(Value::Null) => Ok(None),
-        Some(v) => {
-            let t: T = serde_json::from_value(v.clone()).map_err(|e| bad(cmd, format!("`{key}`: {e}")))?;
-            serde_json::to_value(t).map(Some).map_err(|e| bad(cmd, format!("`{key}`: {e}")))
-        }
-    }
-}
-
-/// A ruby enum parameter, checked against its type.
-fn ruby_enum<T: serde::de::DeserializeOwned>(p: &Value, key: &str) -> Result<Option<Value>> {
-    let Some(v) = p.get(key) else { return Ok(None) };
-    serde_json::from_value::<T>(v.clone()).map_err(|e| bad("type.ruby", format!("{key}: {e}")))?;
-    Ok(Some(v.clone()))
-}
-
-/// A ruby number parameter clamped to `lo..=hi`, then divided by `div` (100 for percentages);
-/// `null` gives `Value::Null` (automatic).
-fn ruby_num(p: &Value, key: &str, lo: f64, hi: f64, div: f64) -> Result<Option<Value>> {
-    match p.get(key) {
-        None => Ok(None),
-        Some(Value::Null) => Ok(Some(Value::Null)),
-        Some(v) => {
-            let x = v.as_f64().filter(|x| x.is_finite()).ok_or_else(|| bad("type.ruby", format!("{key}: expected a finite number")))?;
-            Ok(Some(json!(x.clamp(lo, hi) / div)))
-        }
-    }
-}
-
-/// Is `flag` on in the character format at the start of the first formatting target?
-fn char_flag_on(s: &Session, flag: impl Fn(&CharAttrs) -> Option<bool>) -> bool {
-    format_targets(s).first().is_some_and(|t| {
-        s.doc()
-            .ok()
-            .and_then(|d| d.doc.text_story(t.story, t.cell))
-            .is_some_and(|st| flag(&st.char_format_at(if t.range.is_empty() { t.range.start } else { t.range.start + 1 }).over) == Some(true))
-    })
-}
-
-fn kenten_cmd(s: &mut Session, p: &Value) -> Result<Value> {
-    use designcraft_doc::cjk_settings::{AdornmentOverprint, KENTEN_MARK_MAX_CHARS, KentenAlignment, KentenKind, KentenPosition};
-    const CMD: &str = "type.kenten";
-    let mut body = serde_json::Map::new();
-    let mut set = |k: &str, v: Value| {
-        body.insert(k.to_string(), v);
-    };
-    // Validate every setting first, so a bad one changes nothing.
-    if let Some(v) = enum_param::<KentenKind>(p, "kind", CMD)? {
-        // A preset stores its mark as the character too, as IDML import does, so a custom
-        // character left from before isn't drawn in its place.
-        if let Some(mark) = serde_json::from_value::<KentenKind>(v.clone()).ok().and_then(KentenKind::mark) {
-            set("kentenCharacter", json!(mark));
-        }
-        set("kentenKind", v);
-    }
-    if let Some(c) = text_param(p, "character", CMD, KENTEN_MARK_MAX_CHARS)? {
-        set("kentenCharacter", json!(c.chars().filter(|c| !c.is_control()).collect::<String>()));
-    }
-    for (key, attr) in [("font", "kentenFont"), ("fontStyle", "kentenFontStyle"), ("fill", "kentenFill"), ("stroke", "kentenStroke")] {
-        if let Some(t) = text_param(p, key, CMD, NAME_MAX_CHARS)? {
-            set(attr, json!(t));
-        }
-    }
-    if let Some(v) = finite_param(p, "size", CMD)? {
-        set("kentenSize", json!(v.clamp(0.1, 1296.0)));
-    }
-    if let Some(v) = finite_param(p, "distance", CMD)? {
-        set("kentenDistance", json!(v.clamp(-1296.0, 1296.0)));
-    }
-    for (key, attr) in [("xScale", "kentenXScale"), ("yScale", "kentenYScale")] {
-        if let Some(v) = finite_param(p, key, CMD)? {
-            set(attr, json!(v.clamp(1.0, 1000.0) / 100.0));
-        }
-    }
-    for (key, attr) in [("fillTint", "kentenFillTint"), ("strokeTint", "kentenStrokeTint")] {
-        if let Some(v) = finite_param(p, key, CMD)? {
-            set(attr, json!(v.clamp(0.0, 100.0) / 100.0));
-        }
-    }
-    if let Some(v) = finite_param(p, "strokeWeight", CMD)? {
-        set("kentenStrokeWeight", json!(v.clamp(0.0, 1000.0)));
-    }
-    if let Some(v) = enum_param::<KentenPosition>(p, "position", CMD)? {
-        set("kentenPosition", v);
-    }
-    if let Some(v) = enum_param::<KentenAlignment>(p, "alignment", CMD)? {
-        set("kentenAlignment", v);
-    }
-    for (key, attr) in [("overprintFill", "kentenOverprintFill"), ("overprintStroke", "kentenOverprintStroke")] {
-        if let Some(v) = enum_param::<AdornmentOverprint>(p, key, CMD)? {
-            set(attr, v);
-        }
-    }
-    // `null` returns a setting to the style's (size: half the text size by default).
-    for (key, attr) in
-        [("size", "kentenSize"), ("fillTint", "kentenFillTint"), ("strokeTint", "kentenStrokeTint"), ("strokeWeight", "kentenStrokeWeight")]
-    {
-        if p.get(key).is_some_and(Value::is_null) {
-            set(attr, Value::Null);
-        }
-    }
-    let on = match bool_param(p, "on", CMD)? {
-        Some(v) => v,
-        None if !body.is_empty() => true,
-        None => !char_flag_on(s, |f| f.kenten),
-    };
-    if !on {
-        // Off keeps the settings for the next time kenten are switched on.
-        body = serde_json::Map::new();
-    }
-    body.insert("kenten".into(), json!(on));
-    format_chars(s, &Value::Object(body))
-}
-
-fn shatai_cmd(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "type.shatai";
-    let mut body = serde_json::Map::new();
-    if let Some(v) = finite_param(p, "magnification", CMD)? {
-        body.insert("shataiMagnification".into(), json!(v.clamp(0.0, 90.0)));
-    }
-    if let Some(v) = finite_param(p, "angle", CMD)? {
-        body.insert("shataiAngle".into(), json!(v.rem_euclid(180.0)));
-    }
-    if let Some(v) = bool_param(p, "adjustRotation", CMD)? {
-        body.insert("shataiAdjustRotation".into(), json!(v));
-    }
-    if let Some(v) = bool_param(p, "adjustTsume", CMD)? {
-        body.insert("shataiAdjustTsume".into(), json!(v));
-    }
-    if body.is_empty() {
-        return Err(bad(CMD, "nothing to set: magnification, angle, adjustRotation or adjustTsume"));
-    }
-    format_chars(s, &Value::Object(body))
-}
-
-fn auto_tcy_cmd(s: &mut Session, p: &Value) -> Result<Value> {
-    const CMD: &str = "type.autoTateChuYoko";
-    let mut body = serde_json::Map::new();
-    if let Some(v) = finite_param(p, "digits", CMD)? {
-        let max = f64::from(designcraft_compose::shape::AUTO_TCY_MAX);
-        body.insert("autoTcy".into(), json!(v.round().clamp(0.0, max) as u32));
-    }
-    if let Some(v) = bool_param(p, "includeRoman", CMD)? {
-        body.insert("autoTcyIncludeRoman".into(), json!(v));
-    }
-    if body.is_empty() {
-        return Err(bad(CMD, "nothing to set: digits or includeRoman"));
-    }
-    format_paras(s, &Value::Object(body))
-}
-
-fn grid_settings_cmd(s: &mut Session, p: &Value) -> Result<Value> {
-    use designcraft_doc::cjk::CharacterAlignment as R;
-    const CMD: &str = "type.gridSettings";
-    let mut body = serde_json::Map::new();
-    let first_only = bool_param(p, "firstLineOnly", CMD)?;
-    match text_param(p, "alignment", CMD, 32)?.as_deref() {
-        None => {
-            if let Some(f) = first_only {
-                body.insert("gridAlign".into(), json!(if f { "firstLineOnly" } else { "allLines" }));
-            }
-        }
-        Some("none") => {
-            body.insert("gridAlign".into(), json!("none"));
-        }
-        Some(name) => {
-            let reference = match name {
-                "romanBaseline" | "baseline" => R::Baseline,
-                "emTop" => R::EmTop,
-                "emCenter" => R::EmCenter,
-                "emBottom" => R::EmBottom,
-                "icfTop" => R::IcfTop,
-                "icfBottom" => R::IcfBottom,
-                other => return Err(bad(CMD, format!("unknown alignment `{other}`"))),
-            };
-            body.insert("gridAlign".into(), json!(if first_only == Some(true) { "firstLineOnly" } else { "allLines" }));
-            body.insert("gridReference".into(), json!(reference));
-        }
-    }
-    if let Some(v) = finite_param(p, "gyoudori", CMD)? {
-        let max = 100.0;
-        body.insert("gridGyoudori".into(), json!(v.round().clamp(0.0, max) as u32));
-    }
-    if let Some(v) = bool_param(p, "paragraphGyoudori", CMD)? {
-        body.insert("paragraphGyoudori".into(), json!(v));
-    }
-    if body.is_empty() {
-        return Err(bad(CMD, "nothing to set: alignment, firstLineOnly, gyoudori or paragraphGyoudori"));
-    }
-    format_paras(s, &Value::Object(body))
-}
-
-/// Switch a paragraph attribute of the selected paragraphs: `on`, else the opposite of the
-/// first one's.
-fn para_toggle(s: &mut Session, p: &Value, cmd: &str, attr: &str, get: impl Fn(&designcraft_doc::ParaProps) -> bool) -> Result<Value> {
-    let on = match bool_param(p, "on", cmd)? {
-        Some(v) => v,
-        None => !format_targets(s).first().is_some_and(|t| {
-            s.doc().ok().is_some_and(|d| {
-                d.doc
-                    .text_story(t.story, t.cell)
-                    .and_then(|st| st.paras.get(st.para_at(t.range.start)))
-                    .is_some_and(|pf| get(&d.doc.styles.resolve_para(pf).0))
-            })
-        }),
-    };
-    let mut body = serde_json::Map::new();
-    body.insert(attr.to_string(), json!(on));
-    format_paras(s, &Value::Object(body))
-}
-
-fn ruby_text<'a>(p: &'a Value, key: &str) -> Result<Option<&'a str>> {
-    let Some(v) = p.get(key) else { return Ok(None) };
-    let t = v.as_str().ok_or_else(|| bad("type.ruby", format!("{key}: expected a string")))?;
-    if t.chars().count() > designcraft_doc::ruby::MAX_RUBY_CHARS {
-        return Err(bad("type.ruby", format!("{key}: longer than {} characters", designcraft_doc::ruby::MAX_RUBY_CHARS)));
-    }
-    Ok(Some(t))
-}
-
-fn ruby_cmd(s: &mut Session, p: &Value) -> Result<Value> {
-    use designcraft_doc::cjk_settings::AdornmentOverprint;
-    use designcraft_doc::ruby::{RubyAlignment, RubyOverhang, RubyParentSpacing, RubyPosition, RubyType};
-    let mut body = serde_json::Map::new();
-    let mut put = |attr: &str, v: Option<Value>| {
-        if let Some(v) = v {
-            body.insert(attr.into(), v);
-        }
-    };
-    put("ruby", ruby_text(p, "text")?.map(|t| json!(t)));
-    put("rubyType", ruby_enum::<RubyType>(p, "type")?);
-    put("rubyAlignment", ruby_enum::<RubyAlignment>(p, "alignment")?);
-    put("rubyPosition", ruby_enum::<RubyPosition>(p, "position")?);
-    put("rubyOverhangAmount", ruby_enum::<RubyOverhang>(p, "overhang")?);
-    put("rubyParentSpacing", ruby_enum::<RubyParentSpacing>(p, "parentSpacing")?);
-    put("rubyOverprintFill", ruby_enum::<AdornmentOverprint>(p, "overprintFill")?);
-    put("rubyOverprintStroke", ruby_enum::<AdornmentOverprint>(p, "overprintStroke")?);
-    put("rubyXOffset", ruby_num(p, "xOffset", -1000.0, 1000.0, 1.0)?.filter(|v| !v.is_null()));
-    put("rubyYOffset", ruby_num(p, "yOffset", -1000.0, 1000.0, 1.0)?.filter(|v| !v.is_null()));
-    put("rubyFontSize", ruby_num(p, "size", 0.1, 1296.0, 1.0)?);
-    put("rubyXScale", ruby_num(p, "xScale", 1.0, 1000.0, 100.0)?.filter(|v| !v.is_null()));
-    put("rubyYScale", ruby_num(p, "yScale", 1.0, 1000.0, 100.0)?.filter(|v| !v.is_null()));
-    put("rubyScalingMin", ruby_num(p, "scalingPercent", 10.0, 100.0, 100.0)?.filter(|v| !v.is_null()));
-    put("rubyFillTint", ruby_num(p, "fillTint", 0.0, 100.0, 100.0)?);
-    put("rubyStrokeTint", ruby_num(p, "strokeTint", 0.0, 100.0, 100.0)?);
-    put("rubyStrokeWeight", ruby_num(p, "strokeWeight", 0.0, 800.0, 1.0)?);
-    put(
-        "rubyAutoTcyDigits",
-        ruby_num(p, "autoTcyDigits", 0.0, 9.0, 1.0)?.filter(|v| !v.is_null()).and_then(|v| v.as_f64()).map(|v| json!(v.round() as u32)),
-    );
-    for (key, attr) in [
-        ("openTypePro", "rubyOpenTypePro"),
-        ("autoTcyIncludeRoman", "rubyAutoTcyIncludeRoman"),
-        ("autoTcyAutoScale", "rubyAutoTcyAutoScale"),
-        ("autoAlign", "rubyAutoAlign"),
-        ("autoScaling", "rubyAutoScaling"),
-    ] {
-        if let Some(v) = p.get(key) {
-            let b = v.as_bool().ok_or_else(|| bad("type.ruby", format!("{key}: expected true or false")))?;
-            put(attr, Some(json!(b)));
-        }
-    }
-    put("rubyFont", ruby_text(p, "font")?.map(|t| json!(t)));
-    put("rubyFontStyle", ruby_text(p, "fontStyle")?.map(|t| json!(t)));
-    for (key, attr) in [("fill", "rubyFill"), ("stroke", "rubyStroke")] {
-        if let Some(name) = ruby_text(p, key)? {
-            let known = name.is_empty() || name == designcraft_doc::color::swatch::NONE || s.doc()?.doc.swatch(name).is_some();
-            if !known {
-                return Err(bad("type.ruby", format!("{key}: no swatch `{name}`")));
-            }
-            put(attr, Some(json!(name)));
-        }
-    }
-    format_chars(s, &Value::Object(body))
-}
-
-/// A character fill must name a swatch of the document.
-pub(crate) fn validate_char_fill(document: &designcraft_doc::Document, attrs: &CharAttrs, command_id: &str) -> Result<()> {
-    validate_char_size(attrs, command_id)?;
-    match &attrs.fill {
-        Some(fill) => super::object::known_swatch(document, fill, command_id, "fill"),
-        None => Ok(()),
-    }
-}
-
-/// Type size is 0.1 to 1296 pt, the range this engine already applies to a ruby annotation's
-/// size. Nothing checked it for ordinary text, so `{"size": 0}` set type with no size, a negative
-/// size was accepted as well, and 1e9 pt asked the composer for a line a million times the page.
-pub(crate) fn validate_char_size(attrs: &CharAttrs, command_id: &str) -> Result<()> {
-    match attrs.size {
-        Some(size) if !(MIN_TYPE_SIZE..=MAX_TYPE_SIZE).contains(&size) => {
-            Err(bad(command_id, format!("size {size}: {MIN_TYPE_SIZE} to {MAX_TYPE_SIZE} pt")))
-        }
-        _ => Ok(()),
-    }
-}
-
-/// Type size limits (InDesign's, and the ones `type.ruby` already uses).
-pub(crate) const MIN_TYPE_SIZE: f64 = 0.1;
-pub(crate) const MAX_TYPE_SIZE: f64 = 1296.0;
-
-/// Byte `pos` is the hidden paragraph mark of an *empty* paragraph: the only character on that
-/// line, and so the one a line-affecting attribute like leading can land on right away instead of
-/// waiting for the next typed character (otherwise an empty line could never get its own leading).
-fn empty_para_mark(story: &designcraft_doc::Story, pos: usize) -> bool {
-    let ranges = story.para_ranges();
-    ranges.get(story.para_at(pos)).is_some_and(|r| r.start == pos && r.end == pos) && story.text.as_bytes().get(pos) == Some(&b'\n')
-}
-
-pub(crate) fn format_chars(s: &mut Session, attrs: &Value) -> Result<Value> {
-    let mut a = CharAttrs::default();
-    if let Some(o) = attrs.as_object() {
-        for (k, v) in o {
-            a.set_json(k, v).map_err(|e| bad("type.char", e))?;
-        }
-    }
-    validate_char_fill(&s.doc()?.doc, &a, "type.char")?;
-    let cleared: Vec<String> = attrs.as_object().map(|o| o.iter().filter(|(_, v)| v.is_null()).map(|(k, _)| k.clone()).collect()).unwrap_or_default();
-    let targets = format_targets(s);
-    // A caret in text: the format is for the next typing. On an empty paragraph's hidden mark it
-    // also formats the mark right away, since the mark alone sets that line's height; typing there
-    // still needs the typing format, as new text takes the format of the run before the caret
-    // (the previous paragraph's mark).
-    if let [t] = targets.as_slice()
-        && t.range.is_empty()
-        && let Some(at) = s.doc()?.selection.text
-        && let Some(on_mark) = s.doc()?.doc.text_story(t.story, t.cell).filter(|st| !st.is_empty()).map(|st| empty_para_mark(st, t.range.start))
-    {
-        let doc = s.doc()?.uid;
-        let mut f = typing_format(s).cloned().unwrap_or(TypingFormat { doc, at, attrs: CharAttrs::default(), cleared: vec![] });
-        f.attrs.merge(&a);
-        f.cleared.retain(|k| attrs.get(k).is_none_or(|v| v.is_null()) && !cleared.contains(k));
-        f.cleared.extend(cleared.iter().cloned());
-        if on_mark {
-            s.edit(|d, _| {
-                apply_char_attrs(d, &targets, &a, &cleared);
-                ok()
-            })?;
-        }
-        s.typing_format = Some(f);
-        return ok();
-    }
-    s.edit(|d, _| {
-        apply_char_attrs(d, &targets, &a, &cleared);
-        ok()
-    })
-}
-
-/// Kerning spaces a character from the next one, so the pair at a caret is kerned through the
-/// character before it. With no such pair (story or paragraph start, a selection) this is
-/// `type.char`.
-fn kern_pair(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "type.kernPair";
-    let kerning = p.get("kerning").ok_or_else(|| bad(ID, "missing `kerning`"))?;
-    let targets = format_targets(s);
-    if let [t] = targets.as_slice()
-        && t.range.is_empty()
-        && s.doc()?.selection.text.is_some()
-        && let Some(start) = s.doc()?.doc.text_story(t.story, t.cell).and_then(|st| pair_start(&st.text, t.range.start))
-    {
-        let mut a = CharAttrs::default();
-        a.set_json("kerning", kerning).map_err(|e| bad(ID, e))?;
-        let cleared = if kerning.is_null() { vec!["kerning".to_string()] } else { vec![] };
-        let pair = Target { story: t.story, cell: t.cell, range: start..t.range.start };
-        // Kerning chosen earlier for typing at this caret would hide the pair's value.
-        if typing_format(s).is_some()
-            && let Some(f) = &mut s.typing_format
-        {
-            f.attrs.kerning = None;
-            f.cleared.retain(|k| k != "kerning");
-        }
-        return s.edit(|d, _| {
-            apply_char_attrs(d, &[pair], &a, &cleared);
-            ok()
-        });
-    }
-    format_chars(s, &json!({ "kerning": kerning }))
-}
-
-/// Byte offset of the character before `pos` when it starts a kerning pair with the character at
-/// `pos`: both exist and neither is a paragraph or line break.
-fn pair_start(text: &str, pos: usize) -> Option<usize> {
-    let is_text = |c: &char| !matches!(*c, '\n' | designcraft_doc::story::FORCED_LINE_BREAK);
-    text.get(pos..)?.chars().next().filter(is_text)?;
-    let c = text.get(..pos)?.chars().next_back().filter(is_text)?;
-    pos.checked_sub(c.len_utf8())
-}
-
-/// Character attributes `a` (and the overrides `cleared` removed) over each target's text.
-pub(crate) fn apply_char_attrs(d: &mut designcraft_doc::Document, targets: &[Target], a: &CharAttrs, cleared: &[String]) {
-    for t in targets {
-        let r = &t.range;
-        let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
-        if r.is_empty() {
-            if st.is_empty() {
-                // An empty story: its one (empty) run is the format typing takes.
-                if let Some(run) = st.chars.first_mut() {
-                    run.format.over.merge(a);
-                    st.rev = st.rev.wrapping_add(1);
-                }
-            } else if empty_para_mark(st, r.start) {
-                // An empty paragraph elsewhere in the story: its hidden paragraph mark is its only
-                // character, and the one that carries line-affecting attributes like leading.
-                st.format_chars(r.start..r.start + 1, |f| {
-                    f.over.merge(a);
-                    for k in cleared {
-                        let _ = f.over.set_json(k, &Value::Null);
-                    }
-                });
-            }
-            continue;
-        }
-        st.format_chars(r.clone(), |f| {
-            f.over.merge(a);
-            for k in cleared {
-                let _ = f.over.set_json(k, &Value::Null);
-            }
-        });
-    }
-}
-
-pub(crate) fn format_paras(s: &mut Session, attrs: &Value) -> Result<Value> {
-    let empty = serde_json::Map::new();
-    let obj = attrs.as_object().unwrap_or(&empty);
-    // A rule object changes only the rule fields it names, so each paragraph gets its own attrs
-    // over its resolved rule; this pass validates them.
-    let mut a = ParaAttrs::default();
-    for (k, v) in obj {
-        a.set_json_over(k, v, &designcraft_doc::ParaProps::default()).map_err(|e| bad("type.para", e))?;
-    }
-    super::style::check_grep_styles("type.para", &a)?;
-    // `null` removes the override (back to the style's value).
-    let cleared: Vec<String> = obj.iter().filter(|(_, v)| v.is_null()).map(|(k, _)| k.clone()).collect();
-    let targets = format_targets(s);
-    s.edit(|d, _| {
-        let styles = d.styles.clone();
-        for t in &targets {
-            if let Some(st) = d.text_story_mut(t.story, t.cell) {
-                st.format_paras(t.range.clone(), |p| {
-                    let (current, _) = styles.resolve_para(p);
-                    let mut a = a.clone();
-                    for (k, v) in obj {
-                        let _ = a.set_json_over(k, v, &current);
-                    }
-                    p.para.merge(&a);
-                    for k in &cleared {
-                        let _ = p.para.set_json(k, &Value::Null);
-                    }
-                });
-            }
-        }
-        ok()
-    })
-}
-
-/// Alt+Left/Right in text: kerning at a caret, tracking of a selection, by the Kerning/Tracking
-/// increment.
-fn kern_step(s: &mut Session, p: &Value) -> Result<Value> {
-    use designcraft_doc::Kerning;
-    let inc = s.doc()?.doc.settings.kerning_increment;
-    let inc = if inc.is_finite() { inc.clamp(1.0, 1000.0) } else { 20.0 };
-    let amount = match p.get("amount").and_then(Value::as_f64) {
-        Some(a) => a,
-        None => p.get("steps").and_then(Value::as_f64).unwrap_or(1.0) * inc,
-    };
-    if !amount.is_finite() {
-        return Err(bad("type.kernStep", "`amount` must be a number"));
-    }
-    let amount = amount.clamp(-11000.0, 11000.0);
-    // Kerning and tracking range, in 1/1000 em.
-    let clamp = |v: f64| v.clamp(-1000.0, 10000.0);
-    let targets = format_targets(s);
-    s.edit(|d, _| {
-        let styles = d.styles.clone();
-        let mut out = json!({});
-        for t in &targets {
-            let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
-            if t.range.is_empty() {
-                // Manual kerning sits on the character before the caret (it applies after it).
-                let pos = t.range.start;
-                let Some(c) = st.text.get(..pos).and_then(|before| before.chars().next_back()) else { continue };
-                let at = pos - c.len_utf8();
-                let para = st.paras.get(st.para_at(at)).cloned().unwrap_or_default();
-                let current = styles.resolve_char(&styles.resolve_para(&para).1, st.format_after(at)).kerning;
-                // The font's metrics or optical value isn't known here: those start from 0.
-                let v = clamp(if let Kerning::Manual(v) = current { v } else { 0.0 } + amount);
-                st.format_chars(at..pos, |f| f.over.kerning = Some(Kerning::Manual(v)));
-                out = json!({"kerning": v});
-            } else {
-                for (i, pr) in st.para_ranges().into_iter().enumerate() {
-                    let r = pr.start.max(t.range.start)..pr.end.min(t.range.end);
-                    let Some(para) = st.paras.get(i).cloned() else { break };
-                    if r.is_empty() {
-                        continue;
-                    }
-                    let pc = styles.resolve_para(&para).1;
-                    st.format_chars(r, |f| {
-                        let v = clamp(styles.resolve_char(&pc, f).tracking + amount);
-                        f.over.tracking = Some(v);
-                        out = json!({"tracking": v});
-                    });
-                }
-            }
-        }
-        Ok(out)
-    })
-}
-
-fn step_size(s: &mut Session, delta: f64) -> Result<Value> {
-    let cur = selection_attrs(s, &json!({}))?;
-    let size = cur["chars"]["size"].as_f64().unwrap_or(12.0);
-    format_chars(s, &json!({"size": (size + delta).clamp(0.1, 1296.0)}))
-}
-
-fn break_link(s: &mut Session, p: &Value) -> Result<Value> {
-    use designcraft_doc::{CharFormat, CharProps, ParaProps};
-    let para = match p.get("kind").and_then(Value::as_str).unwrap_or("paragraph") {
-        "paragraph" => true,
-        "character" => false,
-        k => return Err(bad("style.breakLink", format!("unknown kind `{k}`"))),
-    };
-    let targets = format_targets(s);
-    s.edit(|d, _| {
-        let styles = d.styles.clone();
-        for t in &targets {
-            let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
-            let r = t.range.clone();
-            if para {
-                st.format_paras(r, |pf| {
-                    let (pp, pc) = styles.resolve_para(pf);
-                    pf.style = designcraft_doc::styles::NO_PARA_STYLE.into();
-                    pf.para = ParaProps::default().delta(&pp);
-                    pf.chars = CharProps::default().delta(&pc);
-                });
-            } else {
-                let ranges = st.para_ranges();
-                for (pi, pr) in ranges.into_iter().enumerate() {
-                    let (a, b) = (pr.start.max(r.start), pr.end.min(r.end));
-                    if a >= b {
-                        continue;
-                    }
-                    let (_, pc) = styles.resolve_para(&st.paras[pi]);
-                    st.format_chars(a..b, |f| {
-                        let cp = styles.resolve_char(&pc, f);
-                        *f = CharFormat { style: designcraft_doc::story::NO_CHAR_STYLE.into(), over: pc.delta(&cp) };
-                    });
-                }
-            }
-        }
-        ok()
-    })
-}
-
-fn open_type(s: &mut Session, p: &Value) -> Result<Value> {
-    use designcraft_doc::otf;
-    let cur = selection_attrs(s, &json!({}))?;
-    let mut list: Vec<String> =
-        cur["chars"]["otfFeatures"].as_array().map(|a| a.iter().filter_map(|v| v.as_str().map(str::to_string)).collect()).unwrap_or_default();
-    if let Some(tag) = p.get("feature").and_then(Value::as_str) {
-        if tag.is_empty() || tag.len() > 4 || !tag.chars().all(|c| c.is_ascii_alphanumeric()) {
-            return Err(bad("type.openType", format!("bad feature tag `{tag}`")));
-        }
-        let on = p.get("on").and_then(Value::as_bool).unwrap_or(!otf::is_on(&list, tag));
-        otf::set(&mut list, tag, on);
-    }
-    if let Some(f) = p.get("figures").and_then(Value::as_str)
-        && !otf::set_figures(&mut list, f)
-    {
-        return Err(bad("type.openType", format!("unknown figure style `{f}`")));
-    }
-    if let Some(sets) = p.get("stylisticSets").and_then(Value::as_array) {
-        let mask = sets.iter().filter_map(Value::as_u64).filter(|n| (1..=20).contains(n)).fold(0u32, |m, n| m | 1 << (n - 1));
-        otf::set_stylistic_sets(&mut list, mask);
-    }
-    format_chars(s, &json!({"otfFeatures": list}))?;
-    Ok(json!({"features": list, "figures": otf::figures(&list)}))
-}
-
-/// How much of the selected text `type.selectionAttrs` reports.
-const SELECTED_TEXT_CHARS: usize = 60;
-
-fn selected_text_preview(chars: impl Iterator<Item = char>) -> String {
-    chars
-        .map(|c| if c.is_control() || c == designcraft_doc::OBJECT_MARK { ' ' } else { c })
-        .skip_while(|c| c.is_whitespace())
-        .take(SELECTED_TEXT_CHARS)
-        .collect()
-}
-
-fn selection_attrs(s: &mut Session, p: &Value) -> Result<Value> {
-    let st = s.doc()?;
-    let targets = format_targets(s);
-    let Some(Target { story: sid, cell, range: r }) = targets.first().cloned() else { return Ok(Value::Null) };
-    let story = st.doc.text_story(sid, cell).ok_or(designcraft_doc::DocError::NoStory(sid))?;
-    let pi = story.para_at(r.start);
-    let pf = &story.paras[pi];
-    let (pp, base) = st.doc.styles.resolve_para(pf);
-    let cf = effective_char_format(s, &Target { story: sid, cell, range: r.clone() })?;
-    let cp = st.doc.styles.resolve_char(&base, &cf);
-    let (style_para, style_chars) = st.doc.styles.resolve_para_style(&pf.style);
-    let mut character_base = base.clone();
-    let character_style = st.doc.styles.char_style_attrs(&cf.style);
-    character_base.apply(&character_style);
-    let char_delta = character_base.delta(&cp);
-    let style_keys = character_style.keys();
-    let character_style_overrides = char_delta.keys().iter().filter(|key| style_keys.contains(key)).count();
-    // The selected text (its start, on one line), for previews such as the font menu's.
-    let selected = selected_text_preview(story.text.get(r.start..r.end).unwrap_or_default().chars());
-    let mut out = json!({"story": sid.0, "paragraphStyle": pf.style, "characterStyle": cf.style, "para": pp, "chars": cp,
-        "paraOverrides": style_para.delta(&pp).count() + style_chars.delta(&base).count(),
-        "charOverrides": char_delta.count(), "characterStyleOverrides": character_style_overrides,
-        "selectedText": selected.trim()});
-    if bool_or(p, "mixed", false) {
-        out["paraMixed"] = json!(mixed_para_attrs(&st.doc, &targets));
-    }
-    Ok(out)
-}
-
-/// The paragraph attributes whose resolved values differ across the paragraphs of `targets`.
-fn mixed_para_attrs(doc: &designcraft_doc::Document, targets: &[Target]) -> Vec<String> {
-    let mut first: Option<serde_json::Map<String, Value>> = None;
-    let mut mixed = std::collections::BTreeSet::new();
-    for t in targets {
-        let Some(story) = doc.text_story(t.story, t.cell) else { continue };
-        let a = story.para_at(t.range.start);
-        let b = story.para_at(t.range.end.max(t.range.start));
-        for pf in story.paras.get(a..=b).unwrap_or(&[]) {
-            let Ok(Value::Object(v)) = serde_json::to_value(doc.styles.resolve_para(pf).0) else { continue };
-            match &first {
-                None => first = Some(v),
-                Some(f) => mixed.extend(v.into_iter().filter(|(k, x)| f.get(k) != Some(x)).map(|(k, _)| k)),
-            }
-        }
-    }
-    mixed.into_iter().collect()
-}
-
-/// The first target character, with any pending caret overrides. Keep character-style
-/// inheritance separate from paragraph defaults for style creation from the selection.
-pub(crate) fn effective_char_format(s: &Session, target: &Target) -> Result<designcraft_doc::CharFormat> {
-    let story = s.doc()?.doc.text_story(target.story, target.cell).ok_or(designcraft_doc::DocError::NoStory(target.story))?;
-    let mut format =
-        if target.range.is_empty() { story.insert_format_at(target.range.start) } else { story.format_after(target.range.start) }.clone();
-    if let Some(pending) = typing_format(s)
-        && target.story == pending.at.story
-        && target.cell == pending.at.cell
-        && target.range == pending.at.range()
-    {
-        apply_typing_format(&mut format, pending);
-    }
-    Ok(format)
-}
-
-/// A swatch promoted to a named color keeps any not-yet-inserted text pointing at it.
-pub(crate) fn rename_typing_swatch(s: &mut Session, from: &str, to: &str) {
-    let Some(uid) = s.active().map(|st| st.uid) else { return };
-    if let Some(pending) = &mut s.typing_format
-        && pending.doc == uid
-    {
-        for name in [&mut pending.attrs.fill, &mut pending.attrs.stroke, &mut pending.attrs.underline_color, &mut pending.attrs.strikethrough_color]
-            .into_iter()
-            .flatten()
-        {
-            if name == from {
-                *name = to.to_string();
-            }
-        }
-    }
-}
-
-fn swapped_colors(cp: &designcraft_doc::CharProps) -> CharAttrs {
-    CharAttrs {
-        fill: Some(cp.stroke.clone()),
-        fill_tint: Some(cp.stroke_tint),
-        stroke: Some(cp.fill.clone()),
-        stroke_tint: Some(cp.fill_tint),
-        ..Default::default()
-    }
-}
-
-/// Resolve each paragraph/run before editing: a mixed selection must not take the first run's colors.
-fn swap_fill_stroke(s: &mut Session, _p: &Value) -> Result<Value> {
-    const ID: &str = "type.swapFillStroke";
-    let targets = format_targets(s);
-    if let [target] = targets.as_slice()
-        && target.range.is_empty()
-        && s.doc()?.selection.text.is_some()
-    {
-        let st = s.doc()?;
-        let story = st.doc.text_story(target.story, target.cell).ok_or(designcraft_doc::DocError::NoStory(target.story))?;
-        let pf = story.paras.get(story.para_at(target.range.start)).ok_or_else(|| bad(ID, "missing paragraph"))?;
-        let (_, base) = st.doc.styles.resolve_para(pf);
-        let cp = st.doc.styles.resolve_char(&base, &effective_char_format(s, target)?);
-        return format_chars(s, &json!({"fill": cp.stroke, "fillTint": cp.stroke_tint, "stroke": cp.fill, "strokeTint": cp.fill_tint}));
-    }
-    let mut edits = Vec::new();
-    let d = &s.doc()?.doc;
-    for target in targets {
-        let story = d.text_story(target.story, target.cell).ok_or(designcraft_doc::DocError::NoStory(target.story))?;
-        if story.is_empty() {
-            let pf = story.paras.first().ok_or_else(|| bad(ID, "missing paragraph"))?;
-            let (_, base) = d.styles.resolve_para(pf);
-            let attrs = swapped_colors(&d.styles.resolve_char(&base, story.char_format_at(0)));
-            validate_char_fill(d, &attrs, ID)?;
-            edits.push((target, attrs));
-            continue;
-        }
-        let mut runs = story.runs().peekable();
-        for (pi, para) in story.para_ranges().into_iter().enumerate() {
-            let start = para.start.max(target.range.start);
-            let end = para.end.saturating_add(1).min(story.len()).min(target.range.end);
-            if start >= end {
-                continue;
-            }
-            let pf = story.paras.get(pi).ok_or_else(|| bad(ID, "missing paragraph"))?;
-            let (_, base) = d.styles.resolve_para(pf);
-            while let Some((range, format)) = runs.peek() {
-                if range.end <= start {
-                    runs.next();
-                    continue;
-                }
-                if range.start >= end {
-                    break;
-                }
-                let attrs = swapped_colors(&d.styles.resolve_char(&base, format));
-                validate_char_fill(d, &attrs, ID)?;
-                edits.push((Target { range: start.max(range.start)..end.min(range.end), ..target.clone() }, attrs));
-                if range.end > end {
-                    break;
-                }
-                runs.next();
-            }
-        }
-    }
-    s.edit(|d, _| {
-        for (target, attrs) in &edits {
-            apply_char_attrs(d, std::slice::from_ref(target), attrs, &[]);
-        }
-        ok()
-    })
-}
-
-fn apply_typing_format(cf: &mut designcraft_doc::CharFormat, f: &TypingFormat) {
-    cf.over.merge(&f.attrs);
-    for k in &f.cleared {
-        let _ = cf.over.set_json(k, &Value::Null);
-    }
-}
-
-/// Bold (`bold`) or italic from the font family (style linking), per run of the selection: on or
-/// off as asked, else the opposite of the first selected character.
-fn link_style(s: &mut Session, p: &Value, bold: bool) -> Result<Value> {
-    let id = if bold { "type.bold" } else { "type.italic" };
-    let cur = selection_attrs(s, &json!({}))?;
-    let family = cur["chars"]["fontFamily"].as_str().unwrap_or_default().to_string();
-    let style = cur["chars"]["fontStyle"].as_str().unwrap_or_default().to_string();
-    // The document's own fonts count too.
-    let db = designcraft_fonts::FontDb::global().scoped(s.doc()?.doc.font_scope);
-    let (weight, italic) = db.traits_of(&family, &style);
-    let on = p.get("on").and_then(Value::as_bool).unwrap_or(if bold { weight < 650.0 } else { !italic });
-    let (want_bold, want_italic) = if bold { (Some(on), None) } else { (None, Some(on)) };
-    let targets = format_targets(s);
-    // A caret: the linked style of the format there, for the next typing.
-    if let [t] = targets.as_slice()
-        && t.range.is_empty()
-    {
-        let linked = db.linked_style(&family, &style, want_bold, want_italic).ok_or_else(|| bad(id, format!("{family} has no style for that")))?;
-        format_chars(s, &json!({"fontStyle": linked}))?;
-        return Ok(json!({"on": on, "fontStyle": linked}));
-    }
-    let mut changed = 0;
-    let r = s.edit(|d, _| {
-        let styles = d.styles.clone();
-        for t in &targets {
-            let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
-            for (pi, pr) in st.para_ranges().into_iter().enumerate() {
-                let (a, b) = (pr.start.max(t.range.start), pr.end.min(t.range.end));
-                if a >= b {
-                    continue;
-                }
-                let Some(pf) = st.paras.get(pi) else { continue };
-                let (_, pc) = styles.resolve_para(pf);
-                st.format_chars(a..b, |f| {
-                    let cp = styles.resolve_char(&pc, f);
-                    if let Some(linked) = db.linked_style(&cp.font_family, &cp.font_style, want_bold, want_italic)
-                        && linked != cp.font_style
-                    {
-                        f.over.font_style = Some(linked);
-                        changed += 1;
-                    }
-                });
-            }
-        }
-        // No undo step for nothing.
-        if changed == 0 {
-            return Err(bad(id, "nothing to change"));
-        }
-        ok()
-    });
-    r?;
-    Ok(json!({"on": on, "changed": changed}))
-}
-
-/// One stretch of the selection: its length in bytes, the font it is set in and its features.
-struct FeatureSegment {
-    len: usize,
-    font: (String, String),
-    applied: Vec<String>,
-    ligatures: bool,
-}
-
-/// The OpenType features of the fonts in the selection, with how much of the selection each one is
-/// applied to and how much of it the fonts offer. A caret counts as one byte. `state` is `none`,
-/// `some` or `all`.
-fn open_type_features(s: &mut Session, _p: &Value) -> Result<Value> {
-    let st = s.doc()?;
-    let mut segments: Vec<FeatureSegment> = Vec::new();
-    for Target { story: sid, cell, range: r } in format_targets(s) {
-        let Some(story) = st.doc.text_story(sid, cell) else { continue };
-        let covered: Vec<(usize, usize, designcraft_doc::story::CharFormat)> = if r.is_empty() {
-            vec![(r.start, 1, story.format_after(r.start).clone())]
-        } else {
-            story
-                .runs()
-                .filter(|(run, _)| run.start < r.end && run.end > r.start)
-                .map(|(run, f)| (run.start, run.end.min(r.end).saturating_sub(run.start.max(r.start)), f.clone()))
-                .collect()
-        };
-        for (pos, len, cf) in covered {
-            let Some(para) = story.paras.get(story.para_at(pos)) else { continue };
-            let (_, base) = st.doc.styles.resolve_para(para);
-            let cp = st.doc.styles.resolve_char(&base, &cf);
-            segments.push(FeatureSegment { len, font: (cp.font_family, cp.font_style), applied: cp.otf_features, ligatures: cp.ligatures });
-        }
-    }
-    if segments.is_empty() {
-        let (_, base) = st.doc.styles.resolve_para_style(designcraft_doc::story::BASIC_PARAGRAPH);
-        let cp = st.doc.styles.resolve_char(&base, &designcraft_doc::story::CharFormat::default());
-        segments.push(FeatureSegment { len: 1, font: (cp.font_family, cp.font_style), applied: cp.otf_features, ligatures: cp.ligatures });
-    }
-    let db = designcraft_fonts::FontDb::global();
-    let mut fonts: std::collections::BTreeMap<(String, String), designcraft_fonts::FontFeatures> = std::collections::BTreeMap::new();
-    for seg in &segments {
-        fonts.entry(seg.font.clone()).or_insert_with(|| designcraft_fonts::font_features(&db.face(&seg.font.0, &seg.font.1)));
-    }
-    let total: usize = segments.iter().map(|seg| seg.len).sum::<usize>().max(1);
-    let state = |covered: usize| match covered {
-        0 => "none",
-        n if n >= total => "all",
-        _ => "some",
-    };
-    // Bytes the feature is applied to, and bytes whose font offers it.
-    let measure = |tag: &str| {
-        let (mut applied, mut available) = (0, 0);
-        for seg in &segments {
-            // Standard ligatures are the `ligatures` attribute, which shaping reads, unless the
-            // feature list turns `liga` off.
-            let on = designcraft_doc::otf::is_on(&seg.applied, tag) && (tag != "liga" || seg.ligatures);
-            if on {
-                applied += seg.len;
-            }
-            if fonts.get(&seg.font).is_some_and(|f| f.tags.contains(tag)) {
-                available += seg.len;
-            }
-        }
-        (state(applied), state(available))
-    };
-    let tags: std::collections::BTreeSet<String> = fonts.values().flat_map(|f| f.tags.iter().cloned()).collect();
-    let mut features = Vec::new();
-    for tag in tags.iter().filter(|t| !(t.len() == 4 && t.starts_with("ss") && t[2..].parse::<u32>().is_ok())) {
-        let (applied, available) = measure(tag);
-        features.push(json!({"tag": tag, "applied": applied, "available": available}));
-    }
-    // A stylistic set's name is shared when every font that offers it gives it the same name.
-    let mut sets = Vec::new();
-    for set in 1..=20u32 {
-        let tag = format!("ss{set:02}");
-        if !tags.contains(&tag) {
-            continue;
-        }
-        let names: std::collections::BTreeSet<&String> = fonts.values().filter_map(|f| f.stylistic_sets.get(&set)).collect();
-        let name = if names.len() == 1 { names.first().map(ToString::to_string) } else { None };
-        let (applied, available) = measure(&tag);
-        sets.push(json!({"set": set, "tag": tag, "name": name, "applied": applied, "available": available}));
-    }
-    let used: Vec<Value> = fonts.keys().map(|(family, style)| json!({"family": family, "style": style})).collect();
-    Ok(json!({"fonts": used, "features": features, "stylisticSets": sets}))
-}
-
-/// Turns OpenType features on or off across the selected text: `features` maps tags to whether they
-/// are on. Each run keeps its other features, whichever font it is set in, and the change is one
-/// undo step.
-fn set_features(s: &mut Session, p: &Value) -> Result<Value> {
-    const ID: &str = "type.feature";
-    let changes: Vec<(String, bool)> = p
-        .get("features")
-        .and_then(Value::as_object)
-        .ok_or_else(|| bad(ID, "missing features: a map of tags to true or false"))?
-        .iter()
-        .map(|(tag, on)| Ok((tag.clone(), on.as_bool().ok_or_else(|| bad(ID, format!("`{tag}` needs true or false")))?)))
-        .collect::<Result<_>>()?;
-    let targets: Vec<Target> = format_targets(s).into_iter().filter(|t| !t.range.is_empty()).collect();
-    if targets.is_empty() {
-        return Err(bad(ID, "select text"));
-    }
-    let styles = s.doc()?.doc.styles.clone();
-    s.edit(|d, _| {
-        for t in &targets {
-            let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
-            let runs: Vec<(std::ops::Range<usize>, designcraft_doc::story::CharFormat)> =
-                st.runs().filter(|(run, _)| run.start < t.range.end && run.end > t.range.start).map(|(run, f)| (run.clone(), f.clone())).collect();
-            for (run, format) in runs {
-                let Some(para) = st.paras.get(st.para_at(run.start)).cloned() else { continue };
-                let (_, base) = styles.resolve_para(&para);
-                let mut list = styles.resolve_char(&base, &format).otf_features;
-                for (tag, on) in &changes {
-                    designcraft_doc::otf::set(&mut list, tag, *on);
-                }
-                let range = run.start.max(t.range.start)..run.end.min(t.range.end);
-                st.format_chars(range, |f| f.over.otf_features = Some(list.clone()));
-            }
-        }
-        ok()
-    })
-}
-
-/// Our own filler text (not Adobe's).
-pub const PLACEHOLDER: &str = "Ovid ellum quisque arcet velut tempora sint, ne veriora pareant laudemque fieri. Lorem novum strata ponet amicos, \
-et tamen uti ferrum caelo tempus mollit. Quisque sinat oppida retro, nec tenuere longas animi semper vias. \
-Sic erat, ut nostris ceperunt pectora verbis, mitescunt flamma solidos campos venti. Moventur iam nubes, aequora pontus, \
-dum sidera fulgent tacito per inane meatu. Arbore sub magna ludunt pueri, linquunt aurea litora fluctus. \
-Iamque tibi rursus ponet nova carmina vates, et longas umbras quaerit sub tegmine fagi. Omnia mutantur, nihil interit.";
-
-fn fill_placeholder(s: &mut Session, p: &Value) -> Result<Value> {
-    let st = s.doc()?;
-    let frame = id_param(p, "frame").or_else(|| st.selection.items.first().copied()).or_else(|| st.selection.text.and_then(|t| t.frame));
-    let sid = match frame.and_then(|f| st.doc.item(f)).and_then(|i| i.text_frame()) {
-        Some(t) => t.story,
-        None => {
-            if let Some(f) = frame {
-                s.execute("object.content", &json!({"ids": [f.0], "type": "text"}))?;
-            }
-            story_of(s, p).ok_or_else(|| bad("type.fillWithPlaceholder", "select a text frame"))?
-        }
-    };
-    // Fill until overset with paragraphs of two to five sentences, as InDesign's placeholder text
-    // comes (so a paragraph can be styled on its own).
-    const SENTENCES_PER_PARAGRAPH: [usize; 7] = [2, 2, 3, 3, 5, 2, 4];
-    let mut text = String::new();
-    let sentences: Vec<&str> = PLACEHOLDER.split_inclusive(". ").map(str::trim_end).collect();
-    let doc = s.doc()?.doc.clone();
-    let mut d2 = (*doc).clone();
-    let (mut paragraph, mut in_paragraph) = (0, 0);
-    for i in 0..400 {
-        text.push_str(sentences[i % sentences.len()]);
-        in_paragraph += 1;
-        if in_paragraph >= SENTENCES_PER_PARAGRAPH[paragraph % SENTENCES_PER_PARAGRAPH.len()] {
-            text.push('\n');
-            (paragraph, in_paragraph) = (paragraph + 1, 0);
-        } else {
-            text.push(' ');
-        }
-        if i % 3 == 2 {
-            d2.set_story_text(sid, &text)?;
-            let cs = compose::compose_story(&d2, sid, &compose::ComposeOptions::default());
-            if cs.is_overset() {
-                // Trim to the last sentence that fits.
-                let cut = cs.overset_at.unwrap_or(text.len()).min(text.len());
-                let keep = text.get(..cut).and_then(|t| t.rfind('.')).map(|k| k + 1).unwrap_or(cut);
-                text.truncate(keep);
-                break;
-            }
-        }
-    }
-    s.edit(|d, _| {
-        d.set_story_text(sid, text.trim_end())?;
-        ok()
-    })
-}
-
-pub(crate) fn format_targets_pub(s: &Session) -> Vec<Target> {
-    format_targets(s)
-}
-
-/// The case-changed text of `src`, char by char (a char may map to several, e.g. ß → SS).
-pub(crate) fn case_map(src: &str, case: &str) -> Vec<String> {
-    let mut out = Vec::with_capacity(src.len());
-    let mut prev = ' ';
-    let mut sentence_start = true;
-    for c in src.chars() {
-        let word_start = !(prev.is_alphanumeric() || matches!(prev, '\'' | '\u{2019}'));
-        let up = |c: char| c.to_uppercase().collect::<String>();
-        let low = |c: char| c.to_lowercase().collect::<String>();
-        // Title and sentence case capitalize only scripts with initial capitals (not Georgian).
-        let cap = |c: char| if designcraft_doc::capitalizes(c) { up(c) } else { low(c) };
-        let m = match case {
-            "upper" => up(c),
-            "lower" => low(c),
-            "title" => {
-                if word_start {
-                    cap(c)
-                } else {
-                    low(c)
-                }
-            }
-            _ => {
-                if sentence_start && c.is_alphanumeric() {
-                    cap(c)
-                } else {
-                    low(c)
-                }
-            }
-        };
-        if c.is_alphanumeric() {
-            sentence_start = false;
-        } else if matches!(c, '.' | '!' | '?' | '\n' | '\u{2028}') {
-            sentence_start = true;
-        }
-        out.push(m);
-        prev = c;
-    }
-    out
-}
-
-fn change_case(s: &mut Session, p: &Value) -> Result<Value> {
-    let case = str_param(p, "case").unwrap_or("upper").to_string();
-    if !matches!(case.as_str(), "upper" | "lower" | "title" | "sentence") {
-        return Err(bad("type.changeCase", format!("unknown case `{case}`")));
-    }
-    let targets = format_targets(s);
-    s.edit(|d, sel| {
-        for t in &targets {
-            let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
-            let r = t.range.start.min(st.len())..t.range.end.min(st.len());
-            let mapped = case_map(st.slice(r.clone()), &case);
-            // Replace run by run (from the end) so every run keeps its formatting.
-            let segs: Vec<std::ops::Range<usize>> =
-                st.runs().map(|(rr, _)| rr.start.max(r.start)..rr.end.min(r.end)).filter(|x| x.start < x.end).collect();
-            let starts: Vec<usize> = st.slice(r.clone()).char_indices().map(|(i, _)| r.start + i).collect();
-            let mut delta: isize = 0;
-            for seg in segs.iter().rev() {
-                let old = st.slice(seg.clone()).to_string();
-                let new: String = starts.iter().zip(&mapped).filter(|(b, _)| seg.contains(b)).map(|(_, m)| m.as_str()).collect();
-                if new != old {
-                    delta += new.len() as isize - old.len() as isize;
-                    st.replace(seg.clone(), &new);
-                }
-            }
-            if let Some(ts) = sel.text.as_mut().filter(|ts| ts.story == t.story && ts.cell == t.cell && !ts.is_caret()) {
-                let end = (r.end as isize + delta).max(r.start as isize) as usize;
-                if ts.anchor <= ts.focus {
-                    ts.focus = end;
-                } else {
-                    ts.anchor = end;
-                }
-            }
-        }
-        Ok(Value::Null)
-    })
-}
-
-#[cfg(test)]
-mod open_type_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn text_selection_stays_on_utf8_boundaries() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [0, 0, 200, 100], "content": "text", "text": "é漢🙂x"})).unwrap();
-        let sid = r["story"].clone();
-        s.execute("text.select", &json!({"story": sid, "anchor": 1, "focus": 4})).unwrap();
-        let t = s.doc().unwrap().selection.text.unwrap();
-        assert_eq!((t.anchor, t.focus), (0, 2));
-        s.execute("text.select", &json!({"story": sid, "anchor": 4})).unwrap();
-        s.execute("text.delete", &json!({"forward": true})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(t.story).unwrap().text, "é🙂x");
-        s.execute("text.select", &json!({"story": sid, "anchor": 2})).unwrap();
-        s.execute("story.setText", &json!({"story": sid, "text": "漢字"})).unwrap();
-        let t = s.doc().unwrap().selection.text.unwrap();
-        assert_eq!((t.anchor, t.focus), (0, 0));
-        s.execute("text.move", &json!({"dir": "right"})).unwrap();
-        assert_eq!(s.doc().unwrap().selection.text.unwrap().focus, 3);
-    }
-
-    #[test]
-    fn replacing_a_range_stays_on_utf8_boundaries() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [0, 0, 200, 100], "content": "text", "text": "é漢🙂x"})).unwrap();
-        let sid = r["story"].clone();
-        let story = designcraft_doc::StoryId(sid.as_u64().unwrap());
-        // Offsets inside 漢 (2..5) and 🙂 (5..9), past the end, or reversed are refused and change nothing.
-        for (start, end) in [(3, 6), (2, 4), (0, 99), (5, 2)] {
-            let r = s.execute("story.replaceRange", &json!({"story": sid, "start": start, "end": end, "text": "字"}));
-            assert!(r.is_err_and(|e| e.to_string().contains("10 bytes")), "{start}..{end}");
-            assert_eq!(s.doc().unwrap().doc.story(story).unwrap().text, "é漢🙂x");
-        }
-        s.execute("story.replaceRange", &json!({"story": sid, "start": 2, "end": 5, "text": "字"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(story).unwrap().text, "é字🙂x");
-        // A caret before 🙂 (byte 5) would land inside it once é (2 bytes) is gone.
-        s.execute("text.select", &json!({"story": sid, "anchor": 5})).unwrap();
-        s.execute("story.replaceRange", &json!({"story": sid, "start": 0, "end": 2, "text": ""})).unwrap();
-        let st = s.doc().unwrap();
-        let t = st.selection.text.unwrap();
-        let text = &st.doc.story(t.story).unwrap().text;
-        assert_eq!(text, "字🙂x");
-        assert!(text.is_char_boundary(t.anchor) && text.is_char_boundary(t.focus), "caret {t:?} in {text:?}");
-        s.execute("text.move", &json!({"dir": "right"})).unwrap();
-    }
-
-    #[test]
-    fn selected_text_preview_stops_at_its_character_budget() {
-        let read = std::cell::Cell::new(0usize);
-        let prefix = ['\t', '\u{2003}', designcraft_doc::OBJECT_MARK];
-        let chars = prefix.into_iter().chain(std::iter::repeat_n('字', 100_000)).inspect(|_| read.set(read.get() + 1));
-        let preview = super::selected_text_preview(chars);
-        assert_eq!(preview, "字".repeat(super::SELECTED_TEXT_CHARS));
-        assert_eq!(read.get(), prefix.len() + super::SELECTED_TEXT_CHARS, "the rest of a large selection is never copied or scanned");
-        assert_eq!(super::selected_text_preview("A\nB".chars()), "A B");
-    }
-
-    #[test]
-    fn selection_attrs_report_the_selected_text() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s
-            .execute(
-                "frame.create",
-                &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Spring issue
-What's new in typography this season, and why it matters to every designer"}),
-            )
-            .unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 13})).unwrap();
-        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["selectedText"], "Spring issue", "on one line, trimmed");
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 13, "focus": 200})).unwrap();
-        let long = s.execute("type.selectionAttrs", &json!({})).unwrap()["selectedText"].as_str().unwrap().to_string();
-        assert!(long.starts_with("What's new") && (55..=60).contains(&long.chars().count()), "the line break skipped, capped: {long}");
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 3, "focus": 3})).unwrap();
-        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["selectedText"], "", "a caret selects nothing");
-    }
-
-    #[test]
-    fn open_type_toggles_reach_the_text() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Office 1/2 0"})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 12})).unwrap();
-        let r = s.execute("type.openType", &json!({"feature": "dlig"})).unwrap();
-        assert_eq!(r["features"], json!(["dlig"]));
-        let r = s.execute("type.openType", &json!({"feature": "dlig"})).unwrap();
-        assert_eq!(r["features"], json!([]), "toggles off");
-        let r = s.execute("type.openType", &json!({"figures": "proportionalOldstyle", "stylisticSets": [1, 2]})).unwrap();
-        assert_eq!(r["figures"], "proportionalOldstyle");
-        let a = s.execute("type.selectionAttrs", &json!({})).unwrap();
-        let f: Vec<&str> = a["chars"]["otfFeatures"].as_array().unwrap().iter().filter_map(|v| v.as_str()).collect();
-        assert!(f.contains(&"onum") && f.contains(&"ss02"), "{f:?}");
-        assert!(s.execute("type.openType", &json!({"feature": "bad tag!"})).is_err());
-    }
-
-    #[test]
-    fn break_link_to_paragraph_and_character_styles() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Head", "para": {"spaceBefore": 6}, "chars": {"size": 24}})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Em", "chars": {"fontStyle": "Italic"}})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Title here"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 10})).unwrap();
-        s.execute("style.paragraph.apply", &json!({"name": "Head"})).unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 5})).unwrap();
-        s.execute("style.character.apply", &json!({"name": "Em"})).unwrap();
-        let before = s.execute("type.selectionAttrs", &json!({})).unwrap();
-        s.execute("style.breakLink", &json!({"kind": "character"})).unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 10})).unwrap();
-        s.execute("style.breakLink", &json!({"kind": "paragraph"})).unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 5})).unwrap();
-        let after = s.execute("type.selectionAttrs", &json!({})).unwrap();
-        assert_eq!(after["paragraphStyle"], "[No Paragraph Style]");
-        assert_eq!(after["characterStyle"], "[None]");
-        assert_eq!(after["chars"], before["chars"], "same look");
-        assert_eq!(after["para"], before["para"]);
-    }
-
-    /// Old-style figures shape to other glyphs than the default lining ones (Source Serif 4).
-    #[test]
-    fn oldstyle_figures_change_the_glyphs() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "2024"})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        let gids = |s: &Session| {
-            let d = &s.doc().unwrap().doc;
-            let cs = designcraft_compose::compose_story(d, sid, &Default::default());
-            cs.frames[0].lines[0].glyphs.iter().map(|g| g.gid).collect::<Vec<_>>()
-        };
-        let lining = gids(&s);
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 4})).unwrap();
-        s.execute("type.openType", &json!({"figures": "proportionalOldstyle"})).unwrap();
-        assert_ne!(gids(&s), lining);
-    }
-
-    /// A blank line (an empty paragraph) has no characters to select, but its hidden paragraph
-    /// mark can still take a leading change right away: otherwise there'd be no way to adjust the
-    /// line height of a blank line at all.
-    #[test]
-    fn leading_applies_to_an_empty_lines_hidden_paragraph_mark() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let text = "Para one\n\nPara two";
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": text})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        // The blank line between the two paragraphs: a collapsed caret, since it has no text.
-        let blank = text.find("\n\n").unwrap() + 1;
-        s.execute("text.select", &json!({"story": sid.0, "anchor": blank})).unwrap();
-        s.execute("type.char", &json!({"attrs": {"leading": {"kind": "points", "value": 40.0}}})).unwrap();
-        let st = s.doc().unwrap().doc.story(sid).unwrap();
-        // `char_format_at` resolves a boundary to the *preceding* run (new typing's format), so
-        // check just past the mark's own one-byte run, which the mark alone occupies.
-        assert_eq!(st.char_format_at(blank + 1).over.leading, Some(designcraft_doc::Leading::Points(40.0)));
-        let d = s.doc().unwrap().doc.clone();
-        let cs = designcraft_compose::compose_story(&d, sid, &Default::default());
-        let blank_line = cs.frames[0].lines.iter().find(|l| l.range == (blank..blank)).unwrap();
-        assert_eq!(blank_line.leading, 40.0, "the blank line's own height changed");
-    }
-
-    /// Formatting chosen on a blank line is also what gets typed there, not the format of the
-    /// previous paragraph's mark that new text would otherwise take.
-    #[test]
-    fn text_typed_on_a_blank_line_takes_the_format_set_there() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let text = "Para one\n\nPara two";
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": text})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        let blank = text.find("\n\n").unwrap() + 1;
-        s.execute("text.select", &json!({"story": sid.0, "anchor": blank})).unwrap();
-        s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
-        s.execute("text.insert", &json!({"text": "Middle"})).unwrap();
-        let st = s.doc().unwrap().doc.story(sid).unwrap();
-        assert_eq!(st.text, "Para one\nMiddle\nPara two");
-        for b in blank..blank + "Middle\n".len() {
-            assert_eq!(st.format_after(b).over.size, Some(30.0), "byte {b}");
-        }
-        assert_eq!(st.format_after(blank - 1).over.size, None, "the first paragraph's mark keeps its size");
-    }
-
-    /// A blank line keeps its format for typing after the caret has left it: text typed on it
-    /// takes its paragraph mark's format, with no pending typing format.
-    #[test]
-    fn a_blank_lines_mark_format_is_typed_after_the_caret_returns() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let text = "Para one\n\nPara two";
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": text})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        let blank = text.find("\n\n").unwrap() + 1;
-        s.execute("text.select", &json!({"story": sid.0, "anchor": blank})).unwrap();
-        s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 2})).unwrap();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": blank})).unwrap();
-        assert!(s.typing_format.is_none());
-        s.execute("text.insert", &json!({"text": "Middle"})).unwrap();
-        let st = s.doc().unwrap().doc.story(sid).unwrap();
-        assert_eq!(st.text, "Para one\nMiddle\nPara two");
-        assert_eq!(st.format_after(blank).over.size, Some(30.0));
-        assert_eq!(st.format_after(blank - 1).over.size, None, "the first paragraph's mark keeps its size");
-        assert_eq!(st.format_after(2).over.size, None);
-    }
-}
-
-#[cfg(test)]
-mod nested_style_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn nested_and_grep_styles_colour_the_text() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Lead", "chars": {"fill": "C=100 M=0 Y=0 K=0"}})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Num", "chars": {"fill": "C=0 M=100 Y=0 K=0"}})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Opening words then 2026 here"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 3})).unwrap();
-        s.execute(
-            "type.para",
-            &json!({"attrs": {
-                "nestedStyles": [{"style": "Lead", "through": true, "count": 2, "until": {"kind": "words"}}],
-                "grepStyles": [{"style": "Num", "pattern": "\\d+"}]
-            }}),
-        )
-        .unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let cs = designcraft_compose::compose_story(&d, designcraft_doc::StoryId(sid), &Default::default());
-        let text = &d.story(designcraft_doc::StoryId(sid)).unwrap().text;
-        let fill_at = |byte: usize| {
-            let g = cs.frames[0].lines.iter().flat_map(|l| &l.glyphs).find(|g| g.byte == byte).unwrap();
-            cs.styles[g.style as usize].fill.clone()
-        };
-        assert_eq!(fill_at(0), "C=100 M=0 Y=0 K=0", "nested: first two words");
-        assert_eq!(fill_at(text.find("words").unwrap()), "C=100 M=0 Y=0 K=0");
-        assert_eq!(fill_at(text.find("then").unwrap()), "[Black]");
-        assert_eq!(fill_at(text.find("2026").unwrap()), "C=0 M=100 Y=0 K=0", "GREP: digits");
-    }
-}
-
-#[cfg(test)]
-mod multi_click_tests {
-    use serde_json::{Value, json};
-
-    use crate::Session;
-
-    #[test]
-    fn moving_the_caret_drops_the_pending_typing_format() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": "Hello world"})).unwrap();
-        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
-        let size_at = |s: &Session, b: usize| s.doc().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().char_format_at(b).over.size;
-        let pending = |s: &mut Session| {
-            s.execute("text.select", &json!({"story": sid, "anchor": 5})).unwrap();
-            s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
-        };
-        // Away and back by arrow keys, by a click, by selecting and by double-clicking: typing at the
-        // same caret is in the text's own format.
-        let moves: Vec<Box<dyn Fn(&mut Session)>> = vec![
-            Box::new(|s| {
-                s.execute("text.move", &json!({"dir": "right"})).unwrap();
-                s.execute("text.move", &json!({"dir": "left"})).unwrap();
-            }),
-            Box::new(|s| {
-                s.execute("text.placeCaret", &json!({"frame": fid, "point": [80, 80]})).unwrap();
-                s.execute("text.select", &json!({"story": sid, "anchor": 5})).unwrap();
-            }),
-            Box::new(|s| {
-                s.execute("text.selectAt", &json!({"frame": fid, "point": [80, 80], "unit": "story"})).unwrap();
-                s.execute("text.select", &json!({"story": sid, "anchor": 5})).unwrap();
-            }),
-        ];
-        for m in &moves {
-            pending(&mut s);
-            m(&mut s);
-            s.execute("text.insert", &json!({"text": "x"})).unwrap();
-            assert_eq!(size_at(&s, 6), None);
-            s.execute("edit.undo", &json!({})).unwrap();
-        }
-        // Without a move it applies.
-        pending(&mut s);
-        s.execute("text.insert", &json!({"text": "x"})).unwrap();
-        assert_eq!(size_at(&s, 6), Some(30.0));
-        // Selecting a sentence or paragraph around a point drops it too.
-        for id in ["text.selectSentence", "text.selectParagraph"] {
-            pending(&mut s);
-            assert!(s.typing_format.is_some());
-            s.execute(id, &json!({"frame": fid, "point": [80, 80]})).unwrap();
-            assert!(s.typing_format.is_none(), "{id}");
-        }
-    }
-
-    #[test]
-    fn word_selection_keeps_grapheme_clusters_whole() {
-        use super::word_or_spaces_at as word;
-        // Decomposed "café": the combining acute belongs to the word, wherever the click lands.
-        let s = "un cafe\u{301} noir";
-        let cafe = (3, 3 + "cafe\u{301}".len());
-        assert_eq!(word(s, 4), cafe);
-        assert_eq!(word(s, 7), cafe, "on the combining mark");
-        // Devanagari with a virama (U+094D) and a dependent vowel sign.
-        let s = "\u{928}\u{92E}\u{938}\u{94D}\u{924}\u{947} x";
-        let w = "\u{928}\u{92E}\u{938}\u{94D}\u{924}\u{947}".len();
-        assert_eq!(word(s, 0), (0, w));
-        assert_eq!(word(s, 9), (0, w), "on the virama");
-        // An emoji ZWJ sequence and a variation selector stay one character.
-        let s = "a \u{1F469}\u{200D}\u{1F4BB} b \u{263A}\u{FE0F}";
-        let e = (2, 2 + "\u{1F469}\u{200D}\u{1F4BB}".len());
-        assert_eq!(word(s, 2), e);
-        assert_eq!(word(s, 6), e, "on the joiner");
-        assert_eq!(word(s, s.len() - 1), (s.len() - 6, s.len()), "at the end: the last character whole");
-        // Empty paragraphs select nothing.
-        assert_eq!(word("a\n\nb", 2), (2, 2));
-    }
-
-    /// Issue #981: holding the button after a double, triple or quadruple click and moving extends
-    /// the selection a word, line or paragraph at a time, from the unit first selected, either way.
-    #[test]
-    fn a_drag_after_several_clicks_extends_the_selection_by_units() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let text = "Hello  brave world.\nSecond paragraph here.";
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": text})).unwrap();
-        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
-        let at = |s: &Session, b: usize| {
-            let d = &s.doc().unwrap().doc;
-            let cs = designcraft_compose::compose_story(d, designcraft_doc::StoryId(sid), &Default::default());
-            let (l, g) = cs.frames[0].lines.iter().find_map(|l| l.glyphs.iter().find(|g| g.byte == b && g.len > 0).map(|g| (l, g))).unwrap();
-            json!([g.x + g.adv * 0.75, l.baseline - 3.0])
-        };
-        let sel = |s: &Session| s.doc().unwrap().selection.text.map(|t| (t.anchor, t.focus)).unwrap();
-        let extend = |s: &mut Session, b: usize, unit: &str| {
-            let p = at(s, b);
-            s.execute("text.extendTo", &json!({"frame": fid, "point": p, "unit": unit})).unwrap();
-            sel(s)
-        };
-        // Double-click "brave", drag into "world.": whole words, anchored at the start of "brave".
-        s.execute("text.selectAt", &json!({"frame": fid, "point": at(&s, 8), "unit": "word"})).unwrap();
-        assert_eq!(sel(&s), (7, 12));
-        assert_eq!(extend(&mut s, 14, "word"), (7, 18), "forward: through \"world\"");
-        assert_eq!(extend(&mut s, 9, "word"), (7, 12), "back inside the word: just the word");
-        assert_eq!(extend(&mut s, 1, "word"), (12, 0), "backward: from \"Hello\" to the end of \"brave\"");
-        assert_eq!(&text[0..12], "Hello  brave");
-        // Triple-click the first line, drag into the second: both lines.
-        s.execute("text.selectAt", &json!({"frame": fid, "point": at(&s, 8), "unit": "line"})).unwrap();
-        assert_eq!(sel(&s), (0, 19));
-        assert_eq!(extend(&mut s, 22, "line"), (0, text.len()));
-        // Without `unit` a drag still moves the focus a character at a time.
-        s.execute("text.selectAt", &json!({"frame": fid, "point": at(&s, 8), "unit": "word"})).unwrap();
-        s.execute("text.extendTo", &json!({"frame": fid, "point": at(&s, 14)})).unwrap();
-        assert_eq!(sel(&s).0, 7);
-        assert!(sel(&s).1 > 12 && sel(&s).1 < 18, "{:?}", sel(&s));
-        assert!(s.execute("text.extendTo", &json!({"frame": fid, "point": at(&s, 14), "unit": "sentence"})).is_err());
-        // A unit remembered before the text was deleted stays inside what is left.
-        s.execute("text.selectAt", &json!({"frame": fid, "point": at(&s, 14), "unit": "word"})).unwrap();
-        s.execute("story.setText", &json!({"story": sid, "text": ""})).unwrap();
-        s.execute("text.extendTo", &json!({"frame": fid, "point": [100, 90], "unit": "word"})).unwrap();
-        assert_eq!(sel(&s), (0, 0));
-    }
-
-    #[test]
-    fn clicks_select_words_spaces_lines_paragraphs_and_the_story() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let text = "Hello  brave world.\nSecond paragraph here.";
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": text})).unwrap();
-        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
-        // Spread point over the right half of the glyph at byte `b`.
-        let at = |s: &Session, b: usize| {
-            let d = &s.doc().unwrap().doc;
-            let cs = designcraft_compose::compose_story(d, designcraft_doc::StoryId(sid), &Default::default());
-            let (l, g) = cs.frames[0].lines.iter().find_map(|l| l.glyphs.iter().find(|g| g.byte == b && g.len > 0).map(|g| (l, g))).unwrap();
-            json!([g.x + g.adv * 0.75, l.baseline - 3.0])
-        };
-        let mut select = |unit: &str, b: usize| {
-            let p = at(&s, b);
-            let r: Value = s.execute("text.selectAt", &json!({"frame": fid, "point": p, "unit": unit})).unwrap();
-            (r["anchor"].as_u64().unwrap() as usize, r["focus"].as_u64().unwrap() as usize)
-        };
-        assert_eq!(select("word", 1), (0, 5), "inside a word");
-        assert_eq!(select("word", 4), (0, 5), "its last letter");
-        assert_eq!(select("word", 5), (5, 7), "the run of spaces after it");
-        assert_eq!(select("word", 18), (18, 19), "punctuation alone");
-        assert_eq!(select("line", 9), (0, 19));
-        assert_eq!(select("paragraph", 9), (0, 20), "with its return");
-        assert_eq!(select("paragraph", 22), (20, text.len()));
-        assert_eq!(select("story", 9), (0, text.len()));
-        // A second click inside the selected word selects again rather than starting a text drag.
-        s.execute("text.select", &json!({"story": sid, "anchor": 7, "focus": 12})).unwrap();
-        let p = at(&s, 9);
-        s.execute("text.selectAt", &json!({"frame": fid, "point": p, "unit": "line"})).unwrap();
-        let t = s.doc().unwrap().selection.text.unwrap();
-        assert_eq!((t.anchor, t.focus), (0, 19));
-        s.execute("text.release", &json!({"frame": fid, "point": p, "moved": false})).unwrap();
-        let t = s.doc().unwrap().selection.text.unwrap();
-        assert_eq!((t.anchor, t.focus), (0, 19), "releasing keeps it");
-        // The older word command agrees.
-        let p = at(&s, 8);
-        s.execute("text.selectWord", &json!({"frame": fid, "point": p})).unwrap();
-        let t = s.doc().unwrap().selection.text.unwrap();
-        assert_eq!((t.anchor, t.focus), (7, 12));
-        assert!(s.execute("text.selectAt", &json!({"frame": fid, "point": p, "unit": "sentence"})).is_err());
-        assert!(s.execute("text.selectAt", &json!({"frame": fid, "unit": "word"})).is_err(), "no point");
-    }
-}
-
-#[cfg(test)]
-mod style_link_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn bold_and_italic_follow_the_family_and_toggle() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": "plain words here"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        let style_at = |s: &mut Session, b: usize| {
-            s.execute("text.select", &json!({"story": sid, "anchor": b, "focus": b + 1})).unwrap();
-            s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fontStyle"].as_str().unwrap().to_string()
-        };
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 5})).unwrap();
-        s.execute("type.italic", &json!({})).unwrap();
-        assert_eq!(style_at(&mut s, 0), "Italic");
-        // Bold over italic and plain text: each run takes its own linked style.
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 11})).unwrap();
-        s.execute("type.bold", &json!({})).unwrap();
-        assert_eq!(style_at(&mut s, 0), "Bold Italic");
-        assert_eq!(style_at(&mut s, 7), "Bold");
-        // Again: off, back to each run's regular weight.
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 11})).unwrap();
-        s.execute("type.bold", &json!({})).unwrap();
-        assert_eq!(style_at(&mut s, 0), "Italic");
-        assert_eq!(style_at(&mut s, 7), "Regular");
-        // Nothing to change: an error and no undo step.
-        s.execute("text.select", &json!({"story": sid, "anchor": 6, "focus": 11})).unwrap();
-        let steps = s.doc().unwrap().history.undo.len();
-        assert!(s.execute("type.bold", &json!({"on": false})).is_err());
-        assert_eq!(s.doc().unwrap().history.undo.len(), steps);
-        // At a caret the style is for what is typed next.
-        let end = "plain words here".len();
-        s.execute("text.select", &json!({"story": sid, "anchor": end, "focus": end})).unwrap();
-        s.execute("type.bold", &json!({})).unwrap();
-        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fontStyle"], "Bold");
-        s.execute("text.insert", &json!({"text": " now"})).unwrap();
-        assert_eq!(style_at(&mut s, end + 1), "Bold");
-        assert_eq!(style_at(&mut s, end - 1), "Regular", "text before the caret is unchanged");
-        // Moving the caret forgets it.
-        s.execute("text.select", &json!({"story": sid, "anchor": 2, "focus": 2})).unwrap();
-        s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 3, "focus": 3})).unwrap();
-        s.execute("text.insert", &json!({"text": "x"})).unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 3, "focus": 4})).unwrap();
-        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["size"], 12.0);
-    }
-}
-
-#[cfg(test)]
-mod text_color_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn unnamed_colours_go_to_text_when_asked() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "colour me", "caret": false})).unwrap();
-        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
-        s.execute("selection.set", &json!({"ids": [fid]})).unwrap();
-        let fill_of_frame = |s: &Session| s.doc().unwrap().doc.item(designcraft_doc::ItemId(fid)).unwrap().fill.swatch.clone();
-        let before = fill_of_frame(&s);
-        let r = s.execute("object.color", &json!({"color": "#ff0000", "text": true})).unwrap();
-        let red = r["swatch"].as_str().unwrap().to_string();
-        assert_eq!(fill_of_frame(&s), before, "the frame keeps its fill");
-        let story = s.doc().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().clone();
-        assert_eq!(story.char_format_at(3).over.fill.as_deref(), Some(red.as_str()));
-        // A text selection takes it without asking.
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 3})).unwrap();
-        let r = s.execute("object.color", &json!({"color": "#00ff00", "target": "stroke"})).unwrap();
-        let story = s.doc().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().clone();
-        assert_eq!(story.format_after(0).over.stroke.as_deref(), r["swatch"].as_str());
-        assert_eq!(s.doc().unwrap().history.undo.len(), 3, "the frame, then one undo step per colour");
-    }
-}
-
-#[cfg(test)]
-mod drag_text_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn drag_selected_text_to_move_or_copy_it() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": "Hello brave world"})).unwrap();
-        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
-        // Spread point of the glyph at byte `b`.
-        let at = |s: &Session, b: usize| {
-            let d = &s.doc().unwrap().doc;
-            let cs = designcraft_compose::compose_story(d, designcraft_doc::StoryId(sid), &Default::default());
-            let l = &cs.frames[0].lines[0];
-            let g = l.glyphs.iter().find(|g| g.byte == b).unwrap();
-            json!([g.x + g.adv * 0.25, l.baseline - 3.0])
-        };
-        let end = |s: &Session| {
-            let d = &s.doc().unwrap().doc;
-            let cs = designcraft_compose::compose_story(d, designcraft_doc::StoryId(sid), &Default::default());
-            let l = &cs.frames[0].lines[0];
-            json!([l.end_x + 2.0, l.baseline - 3.0])
-        };
-        s.execute("text.select", &json!({"story": sid, "anchor": 6, "focus": 12})).unwrap();
-        let r = s.execute("text.placeCaret", &json!({"frame": fid, "point": at(&s, 8)})).unwrap();
-        assert_eq!(r["dragging"], true);
-        s.execute("text.extendTo", &json!({"frame": fid, "point": end(&s)})).unwrap();
-        s.execute("text.release", &json!({"frame": fid, "point": end(&s), "moved": true})).unwrap();
-        let text = |s: &Session| s.doc().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().text.clone();
-        assert_eq!(text(&s), "Hello worldbrave ");
-        // Alt-drag copies (the moved text is still selected).
-        s.execute("text.placeCaret", &json!({"frame": fid, "point": at(&s, 12)})).unwrap();
-        s.execute("text.release", &json!({"frame": fid, "point": at(&s, 0), "moved": true, "copy": true})).unwrap();
-        assert_eq!(text(&s), "brave Hello worldbrave ");
-        // A click inside the selection just places the caret.
-        s.execute("text.placeCaret", &json!({"frame": fid, "point": at(&s, 2)})).unwrap();
-        s.execute("text.release", &json!({"frame": fid, "point": at(&s, 2), "moved": false})).unwrap();
-        let t = s.doc().unwrap().selection.text.unwrap();
-        assert_eq!(t.anchor, t.focus);
-    }
-}
-
-#[cfg(test)]
-mod nested_line_style_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn first_line_takes_the_nested_line_style() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Lead", "chars": {"size": 18}})).unwrap();
-        let text = "The opening line of this paragraph reads larger, and the lines after it return to the body size again.";
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 400], "content": "text", "text": text})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("type.para", &json!({"nestedLineStyles": [{"style": "Lead", "lines": 1}]})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        let cs = s.cache.get(&s.doc().unwrap().doc, sid, None);
-        let lines = &cs.frames[0].lines;
-        assert!(lines.len() >= 3);
-        let size_of = |l: usize| cs.styles[lines[l].glyphs.iter().find(|g| g.visible).unwrap().style as usize].size;
-        assert_eq!(size_of(0), 18.0, "the first line");
-        assert!(
-            lines[0].glyphs.iter().filter(|g| g.visible && g.adv > 0.0).all(|g| cs.styles[g.style as usize].size == 18.0),
-            "the whole first line"
-        );
-        assert_eq!(size_of(1), 12.0, "the next lines");
-        let back = designcraft_idml::import_idml(&designcraft_idml::export_idml(&s.doc().unwrap().doc)).unwrap();
-        let st = back.stories.values().find(|st| st.text.starts_with("The opening")).unwrap();
-        let nl = st.paras[0].para.nested_line_styles.clone().unwrap_or_default();
-        assert_eq!((nl.len(), nl.first().map(|n| n.lines)), (1, Some(1)), "IDML AllNestedLineStyles");
-        assert_eq!(nl[0].style, "Lead");
-    }
-}
-
-#[cfg(test)]
-mod rule_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn a_partial_rule_edit_keeps_the_other_fields() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let rule = json!({"on": true, "weight": 3.0, "color": "[Black]", "tint": 0.5, "columnWidth": false, "offset": 4.0, "leftIndent": 6.0, "rightIndent": 2.0});
-        s.execute("style.paragraph.create", &json!({"name": "Ruled", "para": {"ruleBelow": rule}})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 400], "content": "text", "text": "One\nTwo"})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("style.paragraph.apply", &json!({"name": "Ruled"})).unwrap();
-        // Local: only the colour changes; the rest is inherited from the style.
-        s.execute("type.para", &json!({"attrs": {"ruleBelow": {"color": "[Registration]"}}})).unwrap();
-        let attrs = s.execute("type.selectionAttrs", &json!({})).unwrap();
-        let mut want = rule.clone();
-        want["color"] = json!("[Registration]");
-        assert_eq!(attrs["para"]["ruleBelow"], want);
-        assert_eq!(attrs["para"]["ruleAbove"]["on"], false, "the other rule is untouched");
-        // Style: only the weight changes.
-        s.execute("style.paragraph.edit", &json!({"name": "Ruled", "para": {"ruleBelow": {"weight": 1.5}}})).unwrap();
-        let st = s.doc().unwrap().doc.styles.para("Ruled").cloned().unwrap();
-        let below = serde_json::to_value(st.para.rule_below.unwrap()).unwrap();
-        let mut want = rule.clone();
-        want["weight"] = json!(1.5);
-        assert_eq!(below, want);
-        assert!(s.execute("type.para", &json!({"attrs": {"ruleBelow": {"thickness": 2}}})).is_err(), "unknown rule field");
-    }
-
-    #[test]
-    fn rule_above_width_follows_column_or_text() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 400], "content": "text", "text": "Short"})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        let mut widths = vec![];
-        for column in [true, false] {
-            s.execute("type.para", &json!({"ruleAbove": {"on": true, "columnWidth": column}})).unwrap();
-            let cs = s.cache.get(&s.doc().unwrap().doc, sid, None);
-            widths.push(cs.frames[0].decos[0].rect.width());
-        }
-        assert!((widths[0] - 328.0).abs() < 1e-6, "column: {widths:?}");
-        assert!(widths[1] < 100.0, "text: {widths:?}");
-    }
-}
-
-#[cfg(test)]
-mod border_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn paragraph_border_and_shading_follow_each_column() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let text = "word ".repeat(80);
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 160], "content": "text", "text": text, "caret": false})).unwrap();
-        s.execute("object.textFrameOptions", &json!({"ids": [r["id"]], "columns": 2})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("type.para", &json!({"borderOn": true, "borderWeights": [2, 1, 2, 1], "borderOffsets": [4, 4, 4, 4], "borderColor": "[Black]", "shadingOn": true, "shadingOffsets": [4, 4, 4, 4]})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        let cs = s.cache.get(&s.doc().unwrap().doc, sid, None);
-        let decos = &cs.frames[0].decos;
-        let shading: Vec<_> = decos.iter().filter(|d| d.tint < 0.5).collect();
-        assert_eq!(shading.len(), 2, "one shaded box per column");
-        let edges = decos.len() - shading.len();
-        assert_eq!(edges, 6, "top on the first part, bottom on the last, sides on both");
-        let top = decos.iter().filter(|d| d.tint >= 0.5).map(|d| d.rect).fold(f64::MAX, |a, r| a.min(r.y0));
-        let first_line = &cs.frames[0].lines[0];
-        assert!((top - (first_line.baseline - first_line.ascent - 4.0 - 2.0)).abs() < 1e-6, "offset 4 + weight 2 above the text");
-        let back = designcraft_idml::import_idml(&designcraft_idml::export_idml(&s.doc().unwrap().doc)).unwrap();
-        let p = &back.stories.values().find(|st| st.text.starts_with("word")).unwrap().paras[0].para;
-        assert_eq!(
-            (p.border_on, p.border_weights, p.shading_offsets),
-            (Some(true), Some([2.0, 1.0, 2.0, 1.0]), Some([4.0; 4])),
-            "IDML paragraph border"
-        );
-    }
-}
-
-#[cfg(test)]
-mod autocorrect_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn autocorrect_fixes_the_word_before_a_space() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": ""})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
-        let text = |s: &Session| s.doc().unwrap().doc.stories[&sid].text.clone();
-        // Off by default.
-        for c in ["t", "e", "h", " "] {
-            s.execute("text.insert", &json!({"text": c})).unwrap();
-        }
-        assert_eq!(text(&s), "teh ");
-        s.execute("prefs.set", &json!({"autocorrect": true})).unwrap();
-        for c in ["T", "e", "h", " ", "c", "a", "t", "."] {
-            s.execute("text.insert", &json!({"text": c})).unwrap();
-        }
-        assert_eq!(text(&s), "teh The cat.");
-        // The caret ends after the inserted punctuation.
-        assert_eq!(s.doc().unwrap().selection.text.unwrap().focus, "teh The cat.".len());
-    }
-}
-
-#[cfg(test)]
-mod break_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// Type › Insert Break Character: the break ends its paragraph, the caret starts the next one.
-    #[test]
-    fn inserted_break_ends_its_paragraph() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "OneTwo\nThree"})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        let story = |s: &Session| s.doc().unwrap().doc.stories[&sid].clone();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 3, "focus": 3})).unwrap();
-        s.execute("text.insert", &json!({"text": "\u{e011}", "raw": true})).unwrap();
-        assert_eq!(story(&s).text, "One\u{e011}\nTwo\nThree");
-        assert_eq!(s.doc().unwrap().selection.text.unwrap().focus, "One\u{e011}\n".len());
-        // At the end of a paragraph the break takes the place of its return.
-        let at = story(&s).text.find("\nThree").unwrap();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": at, "focus": at})).unwrap();
-        s.execute("text.insert", &json!({"text": "\u{e002}", "raw": true})).unwrap();
-        let st = story(&s);
-        assert_eq!(st.text, "One\u{e011}\nTwo\u{e002}\nThree");
-        assert_eq!(st.paras.len(), 3);
-        st.check().unwrap();
-        // Typing after the break goes to the next paragraph; deleting the break or its return
-        // removes both.
-        let at = "One\u{e011}".len();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": at, "focus": at})).unwrap();
-        s.execute("text.insert", &json!({"text": "x"})).unwrap();
-        assert_eq!(story(&s).text, "One\u{e011}\nxTwo\u{e002}\nThree");
-        s.execute("text.select", &json!({"story": sid.0, "anchor": at + 1, "focus": at + 1})).unwrap();
-        s.execute("text.delete", &json!({})).unwrap();
-        assert_eq!(story(&s).text, "OnexTwo\u{e002}\nThree");
-        s.execute("text.select", &json!({"story": sid.0, "anchor": "OnexTwo".len(), "focus": "OnexTwo".len()})).unwrap();
-        s.execute("text.delete", &json!({"forward": true})).unwrap();
-        assert_eq!(story(&s).text, "OnexTwoThree");
-    }
-}
-
-#[cfg(test)]
-mod language_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn language_sets_quotes_spelling_and_hyphenation() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": ""})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("type.char", &json!({"attrs": {"language": "German: 2006 Reform"}})).unwrap();
-        s.execute("text.insert", &json!({"text": "\"Wort\" ist's"})).unwrap();
-        let text = s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].text.clone();
-        assert_eq!(text, "\u{201E}Wort\u{201C} ist\u{2019}s");
-        // German words aren't English misspellings.
-        let st = s.execute("spelling.check", &json!({"story": sid})).unwrap();
-        assert!(st.as_array().unwrap().is_empty(), "{st}");
-    }
-
-    #[test]
-    fn cjk_languages_have_their_quotes_and_no_english_rules() {
-        use super::quote_marks;
-        assert_eq!(quote_marks("Chinese: Simplified"), ['\u{201C}', '\u{201D}', '\u{2018}', '\u{2019}']);
-        assert_eq!(quote_marks("Chinese: Traditional"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
-        assert_eq!(quote_marks("Chinese"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
-        assert_eq!(quote_marks("Japanese"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
-        // Other spellings of the language names take the same quotes.
-        assert_eq!(quote_marks("Simplified Chinese"), ['\u{201C}', '\u{201D}', '\u{2018}', '\u{2019}']);
-        assert_eq!(quote_marks("zh_CN"), ['\u{201C}', '\u{201D}', '\u{2018}', '\u{2019}']);
-        assert_eq!(quote_marks("Chinese (Traditional)"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
-        assert_eq!(quote_marks("zh-TW"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
-        assert_eq!(quote_marks("ja_JP"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
-        for l in ["Japanese", "Korean", "Chinese", "Chinese: Simplified", "Chinese: Traditional"] {
-            assert!(!designcraft_compose::is_english(l), "{l}: no English hyphenation or spelling");
-        }
-    }
-
-    #[test]
-    fn locale_coded_languages_take_their_quotes_and_rules() {
-        use super::quote_marks;
-        const GERMAN: [char; 4] = ['\u{201E}', '\u{201C}', '\u{201A}', '\u{2018}'];
-        const DUTCH: [char; 4] = ['\u{201E}', '\u{201D}', '\u{201A}', '\u{2019}'];
-        const GUILLEMETS: [char; 4] = ['\u{00AB}', '\u{00BB}', '\u{2039}', '\u{203A}'];
-        const SPANISH: [char; 4] = ['\u{00AB}', '\u{00BB}', '\u{201C}', '\u{201D}'];
-        const ENGLISH: [char; 4] = ['\u{201C}', '\u{201D}', '\u{2018}', '\u{2019}'];
-        const CORNERS: [char; 4] = ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}'];
-        for (language, quotes, english) in [
-            ("de_DE_2006", GERMAN, false),
-            ("German: 2006 Reform", GERMAN, false),
-            ("de_CH_2006", GUILLEMETS, false),
-            ("German: Swiss 2006 Reform", GUILLEMETS, false),
-            ("nl_NL_2005", DUTCH, false),
-            ("Dutch: 2005 Reform", DUTCH, false),
-            ("English: USA", ENGLISH, true),
-            ("English: UK", ENGLISH, true),
-            ("en_GB", ENGLISH, true),
-            ("Spanish: Castilian", SPANISH, false),
-            ("es_ES", SPANISH, false),
-            ("French", GUILLEMETS, false),
-            ("fr_FR", GUILLEMETS, false),
-            ("nb_NO", GUILLEMETS, false),
-            ("ja_JP", CORNERS, false),
-            ("[No Language]", ENGLISH, false),
-        ] {
-            assert_eq!(quote_marks(language), quotes, "{language}");
-            assert_eq!(designcraft_compose::is_english(language), english, "{language}");
-        }
-    }
-
-    #[test]
-    fn idml_language_names_keep_their_spelling_and_pick_the_language() {
-        use std::io::Read;
-        // A stand-in for Songti SC (first in the Simplified Chinese chain; the real one when installed).
-        designcraft_fonts::FontDb::global().add_font(designcraft_fonts::testing::font_with("Songti SC", &['直']).unwrap());
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "直"})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 3})).unwrap();
-        s.execute("type.char", &json!({"attrs": {"language": "Simplified Chinese"}})).unwrap();
-        let idml = designcraft_idml::export_idml(&s.doc().unwrap().doc);
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(idml.clone())).unwrap();
-        let stories: String = (0..z.len())
-            .map(|i| {
-                let mut f = z.by_index(i).unwrap();
-                let mut x = String::new();
-                if f.name().starts_with("Stories/") {
-                    f.read_to_string(&mut x).unwrap();
-                }
-                x
-            })
-            .collect();
-        assert!(stories.contains(r#"AppliedLanguage="$ID/Simplified Chinese""#), "{stories}");
-        // The name comes back as written and sets the text as Simplified Chinese.
-        let mut back = designcraft_idml::import_idml(&idml).unwrap();
-        back.settings.glyph_fallback = true;
-        let st = back.stories.values().find(|st| st.text.contains('直')).unwrap();
-        let (_, base) = back.styles.resolve_para(&st.paras[0]);
-        assert_eq!(back.styles.resolve_char(&base, st.char_format_at(0)).language, "Simplified Chinese");
-        let cs = designcraft_compose::compose_story(&back, st.id, &Default::default());
-        let face = cs.frames[0].lines[0].glyphs.iter().find(|g| g.byte == 0).unwrap().face;
-        assert_eq!(face.family, "Songti SC");
-    }
-}
-
-#[cfg(test)]
-mod tcy_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn tate_chu_yoko_toggles_on_the_selection() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 200, 400], "content": "text", "text": "令和12年", "vertical": true})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        let at = "令和".len();
-        s.execute("text.select", &json!({"story": sid, "anchor": at, "focus": at + 2})).unwrap();
-        let get = |s: &Session| s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].char_format_at(at + 1).over.tate_chu_yoko;
-        s.execute("type.tateChuYoko", &json!({})).unwrap();
-        assert_eq!(get(&s), Some(true));
-        s.execute("type.tateChuYoko", &json!({})).unwrap();
-        assert_eq!(get(&s), Some(false));
-        s.execute("type.tateChuYoko", &json!({"on": true})).unwrap();
-        assert_eq!(get(&s), Some(true));
-    }
-
-    #[test]
-    fn ruby_and_kenten_on_the_selection() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "漢字です"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": "漢字".len()})).unwrap();
-        s.execute("type.ruby", &json!({"text": "かんじ"})).unwrap();
-        s.execute("type.kenten", &json!({})).unwrap();
-        let f = |s: &Session| s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].char_format_at(1).over.clone();
-        assert_eq!(f(&s).ruby.as_deref(), Some("かんじ"));
-        assert_eq!(f(&s).kenten, Some(true));
-        s.execute("type.kenten", &json!({})).unwrap();
-        s.execute("type.ruby", &json!({"text": ""})).unwrap();
-        assert_eq!(f(&s).kenten, Some(false));
-        assert_eq!(f(&s).ruby.as_deref(), Some(""));
-    }
-
-    #[test]
-    fn ruby_options_are_checked_and_clamped() {
-        use designcraft_doc::ruby::{RubyAlignment, RubyPosition, RubyType};
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "漢字です"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": "漢字".len()})).unwrap();
-        let f = |s: &Session| s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].char_format_at(1).over.clone();
-        s.execute(
-            "type.ruby",
-            &json!({"text": "かん\u{3000}じ", "type": "perCharacter", "alignment": "oneAki", "position": "belowLeft", "size": 1e9, "xScale": -50, "scalingPercent": 5, "autoTcyDigits": 99, "fillTint": 250, "yOffset": -1e12, "fill": "[Black]"}),
-        )
-        .unwrap();
-        let a = f(&s);
-        assert_eq!(
-            (a.ruby.as_deref(), a.ruby_type, a.ruby_position),
-            (Some("かん\u{3000}じ"), Some(RubyType::PerCharacter), Some(RubyPosition::BelowLeft))
-        );
-        assert_eq!(a.ruby_font_size, Some(Some(1296.0)));
-        assert_eq!(a.ruby_x_scale, Some(0.01));
-        assert_eq!(a.ruby_scaling_min, Some(0.1));
-        assert_eq!(a.ruby_auto_tcy_digits, Some(9));
-        assert_eq!(a.ruby_fill_tint, Some(Some(1.0)));
-        assert_eq!(a.ruby_y_offset, Some(-1000.0));
-        // Options alone keep the reading.
-        s.execute("type.ruby", &json!({"alignment": "center"})).unwrap();
-        assert_eq!((f(&s).ruby, f(&s).ruby_alignment), (a.ruby.clone(), Some(RubyAlignment::Center)));
-        // Refused, and nothing changes: unknown names, non-numbers, overlong text, unknown swatches.
-        let long = "あ".repeat(designcraft_doc::ruby::MAX_RUBY_CHARS + 1);
-        for p in [
-            json!({"alignment": "sideways"}),
-            json!({"size": "big"}),
-            json!({"text": long}),
-            json!({"fill": "Nope"}),
-            json!({"autoAlign": 1}),
-            json!({"text": 5}),
-        ] {
-            assert!(s.execute("type.ruby", &p).is_err(), "{p}");
-        }
-        assert_eq!(f(&s).ruby_alignment, Some(RubyAlignment::Center));
-        assert_eq!(f(&s).ruby, a.ruby);
-    }
-
-    #[test]
-    fn warichu_toggles_on_the_selection_and_undoes() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "注釈です"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        let n = "注釈".len();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": n})).unwrap();
-        s.execute("type.warichu", &json!({"lines": 2, "size": 40, "align": "left", "lineSpacing": 1, "charsBeforeBreak": 2, "charsAfterBreak": 2}))
-            .unwrap();
-        let f = |s: &Session| s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].char_format_at(1).over.clone();
-        let a = f(&s);
-        assert_eq!(a.warichu, Some(true));
-        assert_eq!(a.warichu_lines, Some(2));
-        assert_eq!(a.warichu_size, Some(40.0));
-        assert_eq!(a.warichu_line_spacing, Some(1.0));
-        assert_eq!(a.warichu_alignment, Some(designcraft_doc::cjk::WarichuAlignment::Left));
-        assert_eq!(a.warichu_chars_before_break, Some(2));
-        assert_eq!(a.warichu_chars_after_break, Some(2));
-        // The characters after the selection are not part of the note.
-        assert_eq!(s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].char_format_at(n + 1).over.warichu, None);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(f(&s).warichu, None);
-        s.execute("edit.redo", &json!({})).unwrap();
-        assert_eq!(f(&s).warichu, Some(true));
-        s.execute("type.warichu", &json!({})).unwrap();
-        assert_eq!(f(&s).warichu, Some(false));
-    }
-
-    #[test]
-    fn warichu_up_and_down_move_between_the_rows() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": "ABCDEFGHZ"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 8})).unwrap();
-        s.execute("type.warichu", &json!({"lines": 2, "align": "left"})).unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
-        let down = s.execute("text.move", &json!({"dir": "down"})).unwrap()["pos"].as_u64().unwrap() as usize;
-        assert!((4..8).contains(&down), "down enters the second row: {down}");
-        let up = s.execute("text.move", &json!({"dir": "up"})).unwrap()["pos"].as_u64().unwrap() as usize;
-        assert!(up < 4, "up returns to the first row: {up}");
-        s.execute("text.select", &json!({"story": sid, "anchor": 8, "focus": 8})).unwrap();
-        let stayed = s.execute("text.move", &json!({"dir": "down"})).unwrap()["pos"].as_u64().unwrap() as usize;
-        assert_eq!(stayed, 8, "down from the character after the note does not fall back into a row");
-    }
-}
-
-#[cfg(test)]
-mod bidi_caret_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn arrow_keys_in_a_right_to_left_paragraph() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "سلام عليكم"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        s.execute("type.para", &json!({"attrs": {"direction": "rightToLeft"}})).unwrap();
-        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
-        // Left moves forward through right-to-left text, Right back.
-        let p = s.execute("text.move", &json!({"dir": "left"})).unwrap()["pos"].as_u64().unwrap();
-        assert_eq!(p, 'س'.len_utf8() as u64);
-        let p = s.execute("text.move", &json!({"dir": "right"})).unwrap()["pos"].as_u64().unwrap();
-        assert_eq!(p, 0);
-        // By words too.
-        let p = s.execute("text.move", &json!({"dir": "left", "word": true})).unwrap()["pos"].as_u64().unwrap();
-        assert!(p >= "سلام".len() as u64, "{p}");
-    }
-}
-
-#[cfg(test)]
-mod arabic_tests {
-    use super::*;
-    #[test]
-    fn arabic_story_direction_command_validates_and_supports_undo() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 200], "content": "text", "text": "abc"})).unwrap();
-        let sid = StoryId(r["story"].as_u64().unwrap());
-        let before = s.cache.get(&s.doc().unwrap().doc, sid, None);
-        s.execute("story.setDirection", &json!({"story": sid.0, "direction": "rightToLeft"})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().direction, designcraft_doc::TextDirection::RightToLeft);
-        let after = s.cache.get(&s.doc().unwrap().doc, sid, None);
-        assert!(!std::sync::Arc::ptr_eq(&before, &after));
-        assert!(s.execute("story.setDirection", &json!({"story": sid.0, "direction": "unknown"})).is_err());
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().direction, designcraft_doc::TextDirection::LeftToRight);
-    }
-}
-
-#[cfg(test)]
-mod korean_breaks_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    #[test]
-    fn korean_character_breaks_are_a_paragraph_attribute() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "한국어 문장"})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        s.execute("type.para", &json!({"attrs": {"koreanCharBreaks": true}})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().paras[0].para.korean_char_breaks, Some(true));
-        s.execute("style.paragraph.create", &json!({"name": "Korean", "para": {"koreanCharBreaks": true}})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.styles.para("Korean").unwrap().para.korean_char_breaks, Some(true));
-    }
-}
-
-#[cfg(test)]
-mod story_direction_tests {
-    use designcraft_doc::{ItemId, StoryId};
-    use serde_json::json;
-
-    use crate::Session;
-
-    fn frame(s: &mut Session, rect: [f64; 4], text: &str, vertical: bool) -> (ItemId, StoryId) {
-        let r = s.execute("frame.create", &json!({"rect": rect, "content": "text", "text": text, "caret": false, "vertical": vertical})).unwrap();
-        (ItemId(r["id"].as_u64().unwrap()), StoryId(r["story"].as_u64().unwrap()))
-    }
-
-    /// Which frames of the story are composed vertically, in thread order.
-    fn composed(s: &Session, sid: StoryId) -> Vec<bool> {
-        s.cache.get(&s.doc().unwrap().doc, sid, None).frames.iter().map(|f| f.vertical).collect()
-    }
-
-    #[test]
-    fn story_direction_turns_every_frame_of_the_story() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let (a, sid) = frame(&mut s, [72.0, 72.0, 200.0, 400.0], "縦書きの文章です。", false);
-        let (b, _) = frame(&mut s, [300.0, 72.0, 428.0, 400.0], "", false);
-        s.edit(|d, _| Ok(d.thread(a, b)?)).unwrap();
-        assert_eq!(composed(&s, sid), [false, false]);
-        // From the second frame selected, through Type ▸ Story Direction.
-        s.execute("selection.set", &json!({"ids": [b.0]})).unwrap();
-        s.execute("type.storyDirection", &json!({"vertical": true})).unwrap();
-        assert_eq!(composed(&s, sid), [true, true]);
-        // From a caret in the text.
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
-        s.execute("type.storyDirection", &json!({"vertical": false})).unwrap();
-        assert_eq!(composed(&s, sid), [false, false]);
-        // The frame option sets the frame's story.
-        s.execute("object.textFrameOptions", &json!({"ids": [a.0], "vertical": true})).unwrap();
-        assert_eq!(composed(&s, sid), [true, true]);
-        // Undo puts it back.
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(composed(&s, sid), [false, false]);
-    }
-
-    #[test]
-    fn a_frame_threaded_onto_a_vertical_story_turns_vertical() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let (a, sid) = frame(&mut s, [72.0, 72.0, 200.0, 400.0], "縦書きの文章です。", true);
-        let (b, _) = frame(&mut s, [300.0, 72.0, 428.0, 400.0], "", false);
-        let c = s.execute("frame.create", &json!({"rect": [450, 72, 550, 400]})).unwrap();
-        let c = ItemId(c["id"].as_u64().unwrap());
-        s.edit(|d, _| {
-            d.thread(a, b)?;
-            Ok(d.thread(b, c)?)
-        })
-        .unwrap();
-        assert_eq!(composed(&s, sid), [true, true, true]);
-    }
-}
-
-#[cfg(test)]
-mod vertical_caret_tests {
-    use designcraft_doc::StoryId;
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// A story set in three or more lines; returns its id.
-    fn story(s: &mut Session, vertical: bool) -> StoryId {
-        s.execute("file.new", &json!({})).unwrap();
-        let text = "一二三四五六七八九十".repeat(8);
-        let rect = if vertical { [72, 72, 200, 400] } else { [72, 72, 400, 200] };
-        let r = s.execute("frame.create", &json!({"rect": rect, "content": "text", "text": text, "vertical": vertical})).unwrap();
-        StoryId(r["story"].as_u64().unwrap())
-    }
-
-    fn mv(s: &mut Session, dir: &str, extend: bool, word: bool) -> usize {
-        s.execute("text.move", &json!({"dir": dir, "extend": extend, "word": word})).unwrap()["pos"].as_u64().unwrap() as usize
-    }
-
-    /// (line index, position along the line) of the caret at `pos`.
-    fn place(s: &Session, sid: StoryId, pos: usize) -> (usize, f64) {
-        let cs = s.cache.get(&s.doc().unwrap().doc, sid, None);
-        let (_, x, baseline, _, _) = crate::compose::caret(&cs, pos).unwrap();
-        let line = cs.frames[0].lines.iter().position(|l| (l.baseline - baseline).abs() < 0.01).unwrap();
-        (line, x)
-    }
-
-    #[test]
-    fn arrow_keys_follow_vertical_lines() {
-        let mut s = Session::new();
-        let sid = story(&mut s, true);
-        assert!(s.cache.get(&s.doc().unwrap().doc, sid, None).frames[0].lines.len() >= 3);
-        let c = '一'.len_utf8();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 3 * c, "focus": 3 * c})).unwrap();
-        // Down and Up move along the line, a character at a time.
-        assert_eq!(mv(&mut s, "down", false, false), 4 * c);
-        assert_eq!(mv(&mut s, "up", false, false), 3 * c);
-        // Left moves to the next line (lines follow each other right to left), keeping the
-        // position along the line; Right comes back.
-        let (line, x) = place(&s, sid, 3 * c);
-        let next = mv(&mut s, "left", false, false);
-        let (nline, nx) = place(&s, sid, next);
-        assert_eq!(nline, line + 1);
-        assert!((nx - x).abs() < 0.5, "{x} {nx}");
-        assert_eq!(mv(&mut s, "right", false, false), 3 * c);
-        // Shift extends.
-        assert_eq!(mv(&mut s, "down", true, false), 4 * c);
-        let t = s.doc().unwrap().selection.text.unwrap();
-        assert_eq!((t.anchor, t.focus), (3 * c, 4 * c));
-        let p = mv(&mut s, "left", true, false);
-        let t = s.doc().unwrap().selection.text.unwrap();
-        assert_eq!((t.anchor, t.focus), (3 * c, p));
-        assert_eq!(place(&s, sid, p).0, line + 1);
-        // With a selection, Up collapses it to its start.
-        assert_eq!(mv(&mut s, "up", false, false), 3 * c);
-        // By words: Alt+Down is the vertical Alt+Right.
-        let text = s.doc().unwrap().doc.story(sid).unwrap().text.clone();
-        assert_eq!(mv(&mut s, "down", false, true), super::next_word(&text, 3 * c));
-    }
-
-    #[test]
-    fn arrow_keys_in_horizontal_lines() {
-        let mut s = Session::new();
-        let sid = story(&mut s, false);
-        let c = '一'.len_utf8();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 3 * c, "focus": 3 * c})).unwrap();
-        assert_eq!(mv(&mut s, "right", false, false), 4 * c);
-        assert_eq!(mv(&mut s, "left", false, false), 3 * c);
-        let (line, x) = place(&s, sid, 3 * c);
-        let next = mv(&mut s, "down", false, false);
-        let (nline, nx) = place(&s, sid, next);
-        assert_eq!(nline, line + 1);
-        assert!((nx - x).abs() < 0.5, "{x} {nx}");
-        assert_eq!(mv(&mut s, "up", false, false), 3 * c);
-    }
-}
-
-#[cfg(test)]
-mod story_query_contract_tests {
-    use serde_json::json;
-    #[test]
-    fn missing_story_errors_but_valid_empty_and_selected_stories_succeed() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        assert!(s.execute("story.get", &json!({"story":999})).unwrap_err().to_string().contains("no such story"));
-        let f = s.execute("frame.create", &json!({"rect":[36,36,300,200],"content":"text"})).unwrap();
-        assert_eq!(s.execute("story.get", &json!({"story":f["story"]})).unwrap()["text"], "");
-        assert_eq!(s.execute("story.get", &json!({"frame":f["id"]})).unwrap()["text"], "");
-        s.execute("text.select", &json!({"story":f["story"],"anchor":0})).unwrap();
-        assert_eq!(s.execute("story.get", &json!({})).unwrap()["text"], "");
-    }
-
-    #[test]
-    fn kenten_shatai_auto_tcy_and_grid_settings_take_checked_values() {
-        use designcraft_doc::cjk::CharacterAlignment;
-        use designcraft_doc::cjk_settings::{KentenKind, KentenPosition};
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 200, 400], "content": "text", "text": "縦書き12年", "vertical": true})).unwrap();
-        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": "縦書き".len()})).unwrap();
-        let chars = |s: &crate::Session| s.doc().unwrap().doc.stories[&sid].char_format_at(1).over.clone();
-        let para = |s: &crate::Session| s.doc().unwrap().doc.stories[&sid].paras[0].para.clone();
-        // Any setting turns kenten on; values are clamped and text is capped.
-        let long = "★".repeat(10_000);
-        s.execute(
-            "type.kenten",
-            &json!({"kind": "custom", "character": long, "size": 1e300, "distance": -1e300, "xScale": 0, "fillTint": 250, "position": "belowLeft"}),
-        )
-        .unwrap();
-        let a = chars(&s);
-        assert_eq!((a.kenten, a.kenten_kind, a.kenten_position), (Some(true), Some(KentenKind::Custom), Some(KentenPosition::BelowLeft)));
-        assert_eq!(a.kenten_character.as_ref().map(|c| c.chars().count()), Some(designcraft_doc::cjk_settings::KENTEN_MARK_MAX_CHARS));
-        assert_eq!(
-            (a.kenten_size, a.kenten_distance, a.kenten_x_scale, a.kenten_fill_tint),
-            (Some(Some(1296.0)), Some(-1296.0), Some(0.01), Some(Some(1.0)))
-        );
-        // Bad values change nothing.
-        for bad in [json!({"kind": "sparkle"}), json!({"size": "big"}), json!({"character": 5}), json!({"on": "yes"}), json!({"overprintFill": 1})] {
-            assert!(s.execute("type.kenten", &bad).is_err(), "{bad}");
-        }
-        assert_eq!(chars(&s), a);
-        s.execute("type.kenten", &json!({"on": false})).unwrap();
-        assert_eq!((chars(&s).kenten, chars(&s).kenten_kind), (Some(false), Some(KentenKind::Custom)), "off keeps the settings");
-        // Shatai.
-        s.execute("type.shatai", &json!({"magnification": 1e9, "angle": -30, "adjustRotation": true})).unwrap();
-        let a = chars(&s);
-        assert_eq!((a.shatai_magnification, a.shatai_angle, a.shatai_adjust_rotation), (Some(90.0), Some(150.0), Some(true)));
-        assert!(s.execute("type.shatai", &json!({})).is_err());
-        assert!(s.execute("type.shatai", &json!({"angle": [45]})).is_err());
-        // Paragraph settings.
-        s.execute("type.autoTateChuYoko", &json!({"digits": 1e12, "includeRoman": true})).unwrap();
-        assert_eq!((para(&s).auto_tcy, para(&s).auto_tcy_include_roman), (Some(designcraft_compose::shape::AUTO_TCY_MAX), Some(true)));
-        s.execute("type.gridSettings", &json!({"alignment": "emCenter", "firstLineOnly": true, "gyoudori": 1e12, "paragraphGyoudori": true}))
-            .unwrap();
-        let p = para(&s);
-        assert_eq!((p.grid_align, p.grid_reference), (Some(designcraft_doc::GridAlign::FirstLineOnly), Some(CharacterAlignment::EmCenter)));
-        assert_eq!((p.grid_gyoudori, p.paragraph_gyoudori), (Some(100), Some(true)));
-        assert!(s.execute("type.gridSettings", &json!({"alignment": "middle"})).is_err());
-        s.execute("type.gridSettings", &json!({"alignment": "none"})).unwrap();
-        assert_eq!(para(&s).grid_align, Some(designcraft_doc::GridAlign::None));
-        s.execute("type.rotateRoman", &json!({})).unwrap();
-        assert_eq!(para(&s).rotate_roman, Some(true));
-        s.execute("type.rotateRoman", &json!({})).unwrap();
-        assert_eq!(para(&s).rotate_roman, Some(false));
-        s.execute("type.romanWordBreak", &json!({"on": true})).unwrap();
-        assert_eq!(para(&s).roman_word_break, Some(true));
-        // The story still composes with every setting at its limit.
-        let cs = designcraft_compose::compose_story(&s.doc().unwrap().doc, sid, &Default::default());
-        assert!(!cs.frames.is_empty());
-    }
-}
-
-#[cfg(test)]
-mod sentence_selection_tests {
-    use super::{para_bounds, sentence_bounds};
-
-    fn sentence(s: &str, at: &str) -> String {
-        let i = s.find(at).unwrap();
-        let (a, b) = sentence_bounds(s, i);
-        s[a..b].to_string()
-    }
-
-    #[test]
-    fn sentences_end_at_a_stop_before_a_space_or_the_paragraph_end() {
-        let s = "It costs 3.5 euros. \u{201C}Really?\u{201D} (Twice!) Yes\u{2026} fine.\nNext one. Last";
-        assert_eq!(sentence(s, "costs"), "It costs 3.5 euros. ");
-        assert_eq!(sentence(s, "Really"), "\u{201C}Really?\u{201D} ");
-        assert_eq!(sentence(s, "Twice"), "(Twice!) ");
-        assert_eq!(sentence(s, "Yes"), "Yes\u{2026} ");
-        assert_eq!(sentence(s, "fine"), "fine.");
-        assert_eq!(sentence(s, "one"), "Next one. ");
-        assert_eq!(sentence(s, "Last"), "Last");
-        // The caret at the very end of a paragraph is in its last sentence.
-        let end = s.find('\n').unwrap();
-        assert_eq!(sentence_bounds(s, end), (s.find("fine").unwrap(), end));
-    }
-
-    #[test]
-    fn cjk_full_stops_end_sentences_without_a_space() {
-        let s = "これは文です。次の文！最後";
-        assert_eq!(sentence(s, "次"), "次の文！");
-        assert_eq!(sentence(s, "最後"), "最後");
-    }
-
-    #[test]
-    fn paragraphs_stop_at_returns() {
-        let s = "One.\nTwo two.\n";
-        assert_eq!(para_bounds(s, 6), (5, 13));
-        assert_eq!(para_bounds(s, 0), (0, 4));
-        assert_eq!(para_bounds(s, s.len()), (s.len(), s.len()));
-    }
-}
-
-#[cfg(test)]
-mod reserve_tests {
-    use super::*;
-
-    #[test]
-    fn failed_reservation_rolls_back_the_edit_even_after_local_text_was_removed() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let result = s.execute("frame.create", &json!({"rect":[36,36,300,300],"content":"text","text":"Keep this text."})).unwrap();
-        let sid = StoryId(result["story"].as_u64().unwrap());
-        s.execute("text.select", &json!({"story":sid.0,"anchor":1,"focus":4})).unwrap();
-        let before = s.doc().unwrap().clone();
-        assert!(before.selection.text.is_some_and(|t| !t.range().is_empty()));
-        let journal = s.journal.clone();
-        let error = s
-            .edit(|d, sel| {
-                let st = d.story_mut(sid).unwrap();
-                st.format_chars(5..9, |f| f.over.change = Some(designcraft_doc::ChangeMark::Inserted));
-                let at = super::super::changes::mark_deleted(st, 0..9);
-                assert_eq!(at, 5);
-                assert_eq!(st.text, "Keep  text.");
-                assert_eq!(st.format_after(0).over.change, Some(designcraft_doc::ChangeMark::Deleted));
-                sel.text = None;
-                reserve_command_text(st, usize::MAX)?;
-                ok()
-            })
-            .unwrap_err();
-        assert!(error.to_string().contains("could not reserve text insertion"));
-        let after = s.doc().unwrap();
-        assert!(std::sync::Arc::ptr_eq(&after.doc, &before.doc));
-        assert_eq!(after.selection, before.selection);
-        assert_eq!(after.revision, before.revision);
-        assert_eq!(after.history.undo.len(), before.history.undo.len());
-        assert_eq!(after.history.redo.len(), before.history.redo.len());
-        assert_eq!(s.journal, journal);
-    }
-}
-
-#[cfg(test)]
-mod open_type_features_tests {
-    use serde_json::{Value, json};
-
-    use crate::Session;
-
-    fn feature<'a>(v: &'a Value, tag: &str) -> &'a Value {
-        v["features"].as_array().unwrap().iter().find(|f| f["tag"] == tag).unwrap_or(&Value::Null)
-    }
-
-    #[test]
-    fn the_selected_fonts_features_are_listed_with_their_state() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Hello fi"})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 8})).unwrap();
-        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
-        assert_eq!(v["fonts"][0]["family"], "Source Serif 4", "{v}");
-        assert_eq!(feature(&v, "liga")["applied"], "all", "liga is on by default: {v}");
-        assert_eq!(feature(&v, "kern")["available"], "all", "{v}");
-    }
-
-    #[test]
-    fn a_feature_on_part_of_the_selection_is_some_and_on_all_of_it_is_all() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Hello world"})).unwrap();
-        let story = r["story"].clone();
-        s.execute("text.select", &json!({"story": story, "anchor": 0, "focus": 5})).unwrap();
-        s.execute("type.feature", &json!({"features": {"lnum": true}})).unwrap();
-        s.execute("text.select", &json!({"story": story, "anchor": 0, "focus": 11})).unwrap();
-        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
-        assert_eq!(feature(&v, "lnum")["applied"], "some", "{v}");
-        s.execute("text.select", &json!({"story": story, "anchor": 0, "focus": 5})).unwrap();
-        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
-        assert_eq!(feature(&v, "lnum")["applied"], "all", "{v}");
-        s.execute("type.feature", &json!({"features": {"lnum": false}})).unwrap();
-        s.execute("text.select", &json!({"story": story, "anchor": 0, "focus": 11})).unwrap();
-        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
-        assert_eq!(feature(&v, "lnum")["applied"], "none", "{v}");
-    }
-
-    #[test]
-    fn standard_ligatures_follow_the_ligatures_attribute() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "office"})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 6})).unwrap();
-        s.execute("type.char", &json!({"attrs": {"ligatures": false}})).unwrap();
-        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
-        assert_eq!(feature(&v, "liga")["applied"], "none", "Character › Ligatures off: {v}");
-        s.execute("type.char", &json!({"attrs": {"ligatures": true}})).unwrap();
-        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
-        assert_eq!(feature(&v, "liga")["applied"], "all", "{v}");
-        s.execute("type.feature", &json!({"features": {"liga": false}})).unwrap();
-        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
-        assert_eq!(feature(&v, "liga")["applied"], "none", "-liga in the feature list: {v}");
-    }
-}
-
-#[cfg(test)]
-mod gradient_text_tests {
-    use serde_json::json;
-
-    /// Mean red and blue of the ink (pixels whose green is low: red → blue has none) in columns
-    /// `x0..x1`.
-    fn ink(img: &designcraft_render::Rendered, x0: u32, x1: u32) -> (f64, f64) {
-        let (mut r, mut b, mut n) = (0.0, 0.0, 0.0);
-        for x in x0..x1 {
-            for y in 0..img.height {
-                let p = img.pixel(x, y);
-                if p[1] < 100 {
-                    (r, b, n) = (r + p[0] as f64, b + p[2] as f64, n + 1.0);
-                }
-            }
-        }
-        assert!(n > 50.0, "no ink in {x0}..{x1}");
-        (r / n, b / n)
-    }
-
-    /// Red ink at the frame's left, blue at its right.
-    fn check(img: &designcraft_render::Rendered, what: &str) {
-        let (lr, lb) = ink(img, 0, 60);
-        let (rr, rb) = ink(img, 200, 300);
-        assert!(lr > lb + 80.0, "{what}: the left ink is red ({lr:.0}, {lb:.0})");
-        assert!(rb > rr + 80.0, "{what}: the right ink is blue ({rr:.0}, {rb:.0})");
-    }
-
-    #[test]
-    fn a_gradient_on_text_spans_its_frame_on_screen_and_in_pdf() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"width": 300, "height": 120, "facingPages": false, "margins": 0})).unwrap();
-        // A gradient swatch (an off-page object's unnamed one), red → blue.
-        let shape = s.execute("frame.create", &json!({"rect": [-60, 0, -50, 10], "content": "unassigned"})).unwrap()["id"].clone();
-        s.execute("object.gradient", &json!({"ids": [shape], "stops": [{"location": 0, "color": "#ff0000"}, {"location": 100, "color": "#0000ff"}]}))
-            .unwrap();
-        let id = designcraft_doc::ItemId(shape.as_u64().unwrap());
-        let swatch = s.doc().unwrap().doc.item(id).unwrap().fill.swatch.clone();
-        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 120], "content": "text", "text": "IIIIIIIIIIIIIIIIIIIIIIIIIIIIII"})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 30})).unwrap();
-        s.execute("type.char", &json!({"size": 60, "tracking": 0, "fill": swatch})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let mut rr = designcraft_render::Renderer::new();
-        check(&rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap(), "screen");
-        // The PDF, placed back and drawn: the same gradient.
-        let pdf = designcraft_pdf::export_pdf(&d, &s.cache, &Default::default()).unwrap();
-        let mut p = crate::Session::new();
-        p.execute("file.new", &json!({"width": 300, "height": 120, "facingPages": false})).unwrap();
-        p.execute("file.place", &json!({"base64": super::super::file::base64_encode(&pdf), "name": "text.pdf", "x": 0, "y": 0, "width": 300}))
-            .unwrap();
-        let d = p.doc().unwrap().doc.clone();
-        check(&rr.render_page(&d, &p.cache, 0, 1.0, false, &Default::default()).unwrap(), "pdf");
-    }
-
-    /// The columns the red → blue ink spans (black table edges left out).
-    fn ink_span(img: &designcraft_render::Rendered) -> (u32, u32) {
-        let cols: Vec<u32> = (0..img.width)
-            .filter(|&x| {
-                (0..img.height).any(|y| {
-                    let p = img.pixel(x, y);
-                    p[1] < 100 && p[0].max(p[2]) > 100
-                })
-            })
-            .collect();
-        (*cols.first().unwrap(), *cols.last().unwrap())
-    }
-
-    /// Mean red and blue of the red → blue ink in columns `x0..x1`.
-    fn coloured_ink(img: &designcraft_render::Rendered, x0: u32, x1: u32) -> (f64, f64) {
-        let (mut r, mut b, mut n) = (0.0, 0.0, 0.0);
-        for x in x0..x1 {
-            for y in 0..img.height {
-                let p = img.pixel(x, y);
-                if p[1] < 100 && p[0].max(p[2]) > 100 {
-                    (r, b, n) = (r + p[0] as f64, b + p[2] as f64, n + 1.0);
-                }
-            }
-        }
-        assert!(n > 20.0, "no ink in {x0}..{x1}");
-        (r / n, b / n)
-    }
-
-    #[test]
-    fn a_gradient_on_table_cell_text_spans_the_cells_text_in_pdf_as_on_screen() {
-        let mut s = crate::Session::new();
-        s.execute("file.new", &json!({"width": 300, "height": 120, "facingPages": false, "margins": 0})).unwrap();
-        let g = s
-            .execute("swatch.create", &json!({"gradient": {"stops": [{"location": 0, "color": "#ff0000"}, {"location": 100, "color": "#0000ff"}]}}))
-            .unwrap()["name"]
-            .as_str()
-            .unwrap()
-            .to_string();
-        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 120], "content": "text", "text": ""})).unwrap();
-        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 1, "cols": 3})).unwrap();
-        // A third of the frame's width: the cell's text, red → blue.
-        let mut d: designcraft_doc::Document = (*s.doc().unwrap().doc).clone();
-        let sid = d.stories.values().find(|st| !st.tables.is_empty()).unwrap().id;
-        let t = std::sync::Arc::make_mut(d.story_mut(sid).unwrap().tables.values_mut().next().unwrap());
-        let text = &mut t.cell_mut(0, 0).unwrap().text;
-        text.insert(0, "HHHH");
-        text.format_chars(0..4, |f| {
-            f.over.fill = Some(g.clone());
-            f.over.size = Some(24.0);
-        });
-        let mut rr = designcraft_render::Renderer::new();
-        let cache = designcraft_compose::Cache::new();
-        let screen = rr.render_page(&d, &cache, 0, 1.0, false, &Default::default()).unwrap();
-        let pdf = designcraft_pdf::export_pdf(&d, &cache, &Default::default()).unwrap();
-        let mut p = crate::Session::new();
-        p.execute("file.new", &json!({"width": 300, "height": 120, "facingPages": false})).unwrap();
-        p.execute("file.place", &json!({"base64": super::super::file::base64_encode(&pdf), "name": "cell.pdf", "x": 0, "y": 0, "width": 300}))
-            .unwrap();
-        let placed = rr.render_page(&p.doc().unwrap().doc.clone(), &p.cache, 0, 1.0, false, &Default::default()).unwrap();
-        let (x0, x1) = ink_span(&screen);
-        assert!(x1 < 120, "the text stays in the first column: {x0}..{x1}");
-        let q = (x1 - x0) / 4;
-        for (what, img) in [("screen", &screen), ("pdf", &placed)] {
-            let (lr, lb) = coloured_ink(img, x0, x0 + q);
-            let (rr, rb) = coloured_ink(img, x1 + 1 - q, x1 + 1);
-            assert!(lr > lb + 50.0, "{what}: the left ink is red ({lr:.0}, {lb:.0})");
-            assert!(rb > rr + 50.0, "{what}: the right ink is blue ({rr:.0}, {rb:.0})");
-        }
-    }
-}
-
-#[cfg(test)]
-mod placeholder_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// Fill with Placeholder Text gives paragraphs of a few sentences, as InDesign's does (it was one
-    /// paragraph, and the filler ran sentences together: "interit.Ovid").
-    #[test]
-    fn placeholder_text_comes_in_paragraphs() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [36, 36, 336, 736], "content": "text", "text": ""})).unwrap();
-        s.execute("type.fillWithPlaceholder", &json!({"frame": r["id"]})).unwrap();
-        let st = s.execute("story.get", &json!({"story": r["story"]})).unwrap();
-        let text = st["text"].as_str().unwrap();
-        let paragraphs: Vec<&str> = text.split('\n').collect();
-        assert!(paragraphs.len() >= 4, "{} paragraphs", paragraphs.len());
-        for p in &paragraphs {
-            assert!(p.ends_with('.') && !p.starts_with(' '), "a paragraph of whole sentences: {p:?}");
-        }
-        assert!(!text.contains(".O") && !text.contains(".L"), "sentences are spaced: {text}");
-        assert!(st["overset"].is_null(), "nothing overset: {}", st["overset"]);
-        assert!(text.len() > 1500, "the frame is filled: {}", text.len());
-    }
-}
-
-#[cfg(test)]
-mod kern_pair_tests {
-    use designcraft_doc::{Kerning, StoryId};
-    use serde_json::json;
-
-    use crate::Session;
-
-    fn avatar() -> (Session, StoryId) {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "AVATAR"})).unwrap();
-        (s, StoryId(r["story"].as_u64().unwrap()))
-    }
-
-    fn kern_at(s: &Session, story: StoryId, pos: usize) -> Option<Kerning> {
-        s.doc().unwrap().doc.story(story).unwrap().format_after(pos).over.kerning
-    }
-
-    #[test]
-    fn kerning_at_a_caret_kerns_the_pair_in_one_undo_step() {
-        let (mut s, sid) = avatar();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 1, "focus": 1})).unwrap();
-        let steps = s.doc().unwrap().history.undo.len();
-        s.execute("type.kernPair", &json!({"kerning": {"kind": "manual", "value": -80}})).unwrap();
-        assert_eq!(kern_at(&s, sid, 0), Some(Kerning::Manual(-80.0)), "A, before the caret, spaces the A|V pair");
-        assert_eq!(kern_at(&s, sid, 1), None);
-        assert_eq!(s.doc().unwrap().history.undo.len(), steps + 1);
-        let shown = s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["kerning"].clone();
-        assert_eq!(shown, json!({"kind": "manual", "value": -80.0}), "the caret shows the pair's kerning");
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(kern_at(&s, sid, 0), None);
-    }
-
-    #[test]
-    fn kerning_a_selection_or_at_the_story_start_works_like_type_char() {
-        let (mut s, sid) = avatar();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 2, "focus": 4})).unwrap();
-        s.execute("type.kernPair", &json!({"kerning": {"kind": "manual", "value": 20}})).unwrap();
-        let kerned: Vec<_> = (0..6).map(|i| kern_at(&s, sid, i)).collect();
-        let m = Some(Kerning::Manual(20.0));
-        assert_eq!(kerned, [None, None, m, m, None, None]);
-        // No character before the caret: the value is for the next typing.
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
-        let steps = s.doc().unwrap().history.undo.len();
-        s.execute("type.kernPair", &json!({"kerning": {"kind": "none"}})).unwrap();
-        assert_eq!(s.doc().unwrap().history.undo.len(), steps);
-        assert_eq!(kern_at(&s, sid, 0), None);
-        s.execute("text.insert", &json!({"text": "X"})).unwrap();
-        assert_eq!(kern_at(&s, sid, 0), Some(Kerning::None));
-    }
-
-    #[test]
-    fn kerning_at_the_end_of_a_paragraph_or_story_leaves_the_text_alone() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "AV\nTA"})).unwrap();
-        let sid = StoryId(r["story"].as_u64().unwrap());
-        for caret in [2, 5] {
-            s.execute("text.select", &json!({"story": sid.0, "anchor": caret, "focus": caret})).unwrap();
-            let steps = s.doc().unwrap().history.undo.len();
-            s.execute("type.kernPair", &json!({"kerning": {"kind": "manual", "value": -80}})).unwrap();
-            assert_eq!(s.doc().unwrap().history.undo.len(), steps, "no pair at {caret}: nothing is edited");
-            assert_eq!((kern_at(&s, sid, 1), kern_at(&s, sid, 4)), (None, None), "caret {caret}");
-        }
-    }
-}
-
-#[cfg(test)]
-mod pick_up_format_tests {
-    use designcraft_doc::ItemId;
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// Typefool's video (12:04): select body text, Eyedropper, click the third header: the body
-    /// text takes the header's font, size and paragraph settings. DesignCraft copied the frame's
-    /// fill and stroke instead.
-    #[test]
-    fn the_eyedropper_copies_text_formatting_to_selected_text() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let head = s.execute("frame.create", &json!({"rect": [36, 36, 400, 100], "content": "text", "text": "Innovative Design"})).unwrap();
-        s.execute("text.select", &json!({"story": head["story"], "anchor": 0, "focus": 17})).unwrap();
-        s.execute("type.char", &json!({"attrs": {"fontStyle": "Bold", "size": 18, "tracking": 20}})).unwrap();
-        s.execute("type.para", &json!({"attrs": {"align": "center", "spaceAfter": 6}})).unwrap();
-        let body = s.execute("frame.create", &json!({"rect": [36, 200, 400, 300], "content": "text", "text": "Body copy here.\nSecond."})).unwrap();
-        s.execute("text.select", &json!({"story": body["story"], "anchor": 0, "focus": 4})).unwrap();
-        // Click the header's middle (the frame's text starts at its top left).
-        let r = s.execute("type.pickUpFormat", &json!({"frame": head["id"], "point": [100, 50]})).unwrap();
-        assert!(r.is_object(), "{r}");
-        s.execute("text.select", &json!({"story": body["story"], "anchor": 0, "focus": 4})).unwrap();
-        let a = s.execute("type.selectionAttrs", &json!({})).unwrap();
-        assert_eq!((&a["chars"]["fontStyle"], &a["chars"]["size"], &a["chars"]["tracking"]), (&json!("Bold"), &json!(18.0), &json!(20.0)), "{a}");
-        assert_eq!((&a["para"]["align"], &a["para"]["spaceAfter"]), (&json!("center"), &json!(6.0)));
-        // Only the selected characters change; the second paragraph keeps its own.
-        s.execute("text.select", &json!({"story": body["story"], "anchor": 6, "focus": 10})).unwrap();
-        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["size"], json!(12.0));
-        s.execute("text.select", &json!({"story": body["story"], "anchor": 17, "focus": 20})).unwrap();
-        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["para"]["align"], json!("left"));
-        // Not a text frame, or nothing selected: refused.
-        let rect = s.execute("frame.create", &json!({"rect": [500, 500, 520, 520]})).unwrap()["id"].as_u64().unwrap();
-        assert!(s.execute("type.pickUpFormat", &json!({"frame": rect, "point": [510, 510]})).is_err());
-        let _ = ItemId(rect);
-    }
-}
-
-#[cfg(test)]
-mod size_bounds_tests {
-    use serde_json::json;
-
-    use crate::Session;
-
-    /// Type size was not checked anywhere: `{"size": 0}` set type with no size at all, a negative
-    /// size was accepted the same way, and 1e9 pt asked the composer for a line a million times
-    /// the height of the page. The range is the one `type.ruby` already applies, 0.1 to 1296 pt.
-    #[test]
-    fn a_type_size_outside_the_range_is_refused() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 1})).unwrap();
-        let f = s.execute("frame.create", &json!({"rect": [20, 20, 400, 300], "content": "text", "text": "Hello world"})).unwrap();
-        let select = |s: &mut Session| {
-            s.execute("text.select", &json!({"story": f["story"].clone(), "anchor": 0, "focus": 5})).unwrap();
-        };
-        for size in [0.0, -12.0, 0.05, 1297.0, 1e9] {
-            select(&mut s);
-            let e = s.execute("type.char", &json!({"size": size})).expect_err("refused").to_string();
-            assert!(e.contains("0.1 to 1296 pt"), "{size}: {e}");
-        }
-        // The sizes in range still apply, including the ends.
-        for size in [0.1, 12.0, 1296.0] {
-            select(&mut s);
-            s.execute("type.char", &json!({"size": size})).unwrap_or_else(|e| panic!("{size}: {e}"));
-            assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["size"].as_f64(), Some(size));
-        }
-        // And the styles that carry character attributes are checked the same way.
-        for (command, params) in [
-            ("style.character.create", json!({"name": "Tiny", "chars": {"size": 0}})),
-            ("style.paragraph.create", json!({"name": "Huge", "chars": {"size": 2000}})),
-        ] {
-            let e = s.execute(command, &params).expect_err("refused").to_string();
-            assert!(e.contains("0.1 to 1296 pt"), "{command}: {e}");
-        }
-    }
-}
diff --git a/crates/engine/src/cmd/text/asian.rs b/crates/engine/src/cmd/text/asian.rs
new file mode 100644
index 000000000..8192bcad4
--- /dev/null
+++ b/crates/engine/src/cmd/text/asian.rs
@@ -0,0 +1,451 @@
+use super::format::{char_flag_on, format_chars, format_paras, format_targets};
+use super::{Result, Session, Value, bad, json};
+
+pub(super) fn warichu_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    let has_opts = ["lines", "size", "lineSpacing", "align", "charsBeforeBreak", "charsAfterBreak"].iter().any(|k| p.get(k).is_some());
+    let on = match p.get("on").and_then(Value::as_bool) {
+        Some(v) => v,
+        None if has_opts => true,
+        None => !format_targets(s).first().is_some_and(|t| {
+            s.doc()
+                .ok()
+                .and_then(|d| d.doc.text_story(t.story, t.cell))
+                .is_some_and(|st| st.char_format_at(if t.range.is_empty() { t.range.start } else { t.range.start + 1 }).over.warichu == Some(true))
+        }),
+    };
+    let mut body = serde_json::Map::new();
+    body.insert("warichu".into(), json!(on));
+    if on {
+        if let Some(v) = p.get("lines").and_then(Value::as_u64) {
+            body.insert("warichuLines".into(), json!(v.clamp(2, 16)));
+        }
+        if let Some(v) = p.get("size").and_then(Value::as_f64).filter(|v| v.is_finite()) {
+            body.insert("warichuSize".into(), json!(v.clamp(1.0, 1000.0)));
+        }
+        if let Some(v) = p.get("lineSpacing").and_then(Value::as_f64).filter(|v| v.is_finite()) {
+            body.insert("warichuLineSpacing".into(), json!(v.clamp(-10_000.0, 10_000.0)));
+        }
+        if let Some(v) = p.get("align").and_then(Value::as_str) {
+            body.insert("warichuAlignment".into(), json!(v));
+        }
+        if let Some(v) = p.get("charsBeforeBreak").and_then(Value::as_u64) {
+            body.insert("warichuCharsBeforeBreak".into(), json!(v.min(100)));
+        }
+        if let Some(v) = p.get("charsAfterBreak").and_then(Value::as_u64) {
+            body.insert("warichuCharsAfterBreak".into(), json!(v.min(100)));
+        }
+    }
+    format_chars(s, &Value::Object(body))
+}
+
+// Kenten, shatai, auto tate-chu-yoko and grid settings: validated settings for the CJK commands.
+
+/// Longest font, style or swatch name taken from parameters, in characters.
+const NAME_MAX_CHARS: usize = 256;
+
+/// A number parameter: absent or `null` → `None`; anything but a finite number is an error.
+fn finite_param(p: &Value, key: &str, cmd: &str) -> Result<Option<f64>> {
+    match p.get(key) {
+        None | Some(Value::Null) => Ok(None),
+        Some(v) => v.as_f64().filter(|v| v.is_finite()).map(Some).ok_or_else(|| bad(cmd, format!("`{key}` must be a finite number"))),
+    }
+}
+
+/// A text parameter, cut to `max` characters: absent or `null` → `None`; not text is an error.
+fn text_param(p: &Value, key: &str, cmd: &str, max: usize) -> Result<Option<String>> {
+    match p.get(key) {
+        None | Some(Value::Null) => Ok(None),
+        Some(Value::String(t)) => Ok(Some(t.chars().take(max).collect())),
+        Some(_) => Err(bad(cmd, format!("`{key}` must be text"))),
+    }
+}
+
+/// A boolean parameter: absent or `null` → `None`; not a boolean is an error.
+pub(super) fn bool_param(p: &Value, key: &str, cmd: &str) -> Result<Option<bool>> {
+    match p.get(key) {
+        None | Some(Value::Null) => Ok(None),
+        Some(v) => v.as_bool().map(Some).ok_or_else(|| bad(cmd, format!("`{key}` must be true or false"))),
+    }
+}
+
+/// An enumeration parameter checked against `T`, as its JSON value.
+fn enum_param<T: serde::de::DeserializeOwned + serde::Serialize>(p: &Value, key: &str, cmd: &str) -> Result<Option<Value>> {
+    match p.get(key) {
+        None | Some(Value::Null) => Ok(None),
+        Some(v) => {
+            let t: T = serde_json::from_value(v.clone()).map_err(|e| bad(cmd, format!("`{key}`: {e}")))?;
+            serde_json::to_value(t).map(Some).map_err(|e| bad(cmd, format!("`{key}`: {e}")))
+        }
+    }
+}
+
+/// A ruby enum parameter, checked against its type.
+fn ruby_enum<T: serde::de::DeserializeOwned>(p: &Value, key: &str) -> Result<Option<Value>> {
+    let Some(v) = p.get(key) else { return Ok(None) };
+    serde_json::from_value::<T>(v.clone()).map_err(|e| bad("type.ruby", format!("{key}: {e}")))?;
+    Ok(Some(v.clone()))
+}
+
+/// A ruby number parameter clamped to `lo..=hi`, then divided by `div` (100 for percentages);
+/// `null` gives `Value::Null` (automatic).
+fn ruby_num(p: &Value, key: &str, lo: f64, hi: f64, div: f64) -> Result<Option<Value>> {
+    match p.get(key) {
+        None => Ok(None),
+        Some(Value::Null) => Ok(Some(Value::Null)),
+        Some(v) => {
+            let x = v.as_f64().filter(|x| x.is_finite()).ok_or_else(|| bad("type.ruby", format!("{key}: expected a finite number")))?;
+            Ok(Some(json!(x.clamp(lo, hi) / div)))
+        }
+    }
+}
+
+pub(super) fn kenten_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    use designcraft_doc::cjk_settings::{AdornmentOverprint, KENTEN_MARK_MAX_CHARS, KentenAlignment, KentenKind, KentenPosition};
+    const CMD: &str = "type.kenten";
+    let mut body = serde_json::Map::new();
+    let mut set = |k: &str, v: Value| {
+        body.insert(k.to_string(), v);
+    };
+    // Validate every setting first, so a bad one changes nothing.
+    if let Some(v) = enum_param::<KentenKind>(p, "kind", CMD)? {
+        // A preset stores its mark as the character too, as IDML import does, so a custom
+        // character left from before isn't drawn in its place.
+        if let Some(mark) = serde_json::from_value::<KentenKind>(v.clone()).ok().and_then(KentenKind::mark) {
+            set("kentenCharacter", json!(mark));
+        }
+        set("kentenKind", v);
+    }
+    if let Some(c) = text_param(p, "character", CMD, KENTEN_MARK_MAX_CHARS)? {
+        set("kentenCharacter", json!(c.chars().filter(|c| !c.is_control()).collect::<String>()));
+    }
+    for (key, attr) in [("font", "kentenFont"), ("fontStyle", "kentenFontStyle"), ("fill", "kentenFill"), ("stroke", "kentenStroke")] {
+        if let Some(t) = text_param(p, key, CMD, NAME_MAX_CHARS)? {
+            set(attr, json!(t));
+        }
+    }
+    if let Some(v) = finite_param(p, "size", CMD)? {
+        set("kentenSize", json!(v.clamp(0.1, 1296.0)));
+    }
+    if let Some(v) = finite_param(p, "distance", CMD)? {
+        set("kentenDistance", json!(v.clamp(-1296.0, 1296.0)));
+    }
+    for (key, attr) in [("xScale", "kentenXScale"), ("yScale", "kentenYScale")] {
+        if let Some(v) = finite_param(p, key, CMD)? {
+            set(attr, json!(v.clamp(1.0, 1000.0) / 100.0));
+        }
+    }
+    for (key, attr) in [("fillTint", "kentenFillTint"), ("strokeTint", "kentenStrokeTint")] {
+        if let Some(v) = finite_param(p, key, CMD)? {
+            set(attr, json!(v.clamp(0.0, 100.0) / 100.0));
+        }
+    }
+    if let Some(v) = finite_param(p, "strokeWeight", CMD)? {
+        set("kentenStrokeWeight", json!(v.clamp(0.0, 1000.0)));
+    }
+    if let Some(v) = enum_param::<KentenPosition>(p, "position", CMD)? {
+        set("kentenPosition", v);
+    }
+    if let Some(v) = enum_param::<KentenAlignment>(p, "alignment", CMD)? {
+        set("kentenAlignment", v);
+    }
+    for (key, attr) in [("overprintFill", "kentenOverprintFill"), ("overprintStroke", "kentenOverprintStroke")] {
+        if let Some(v) = enum_param::<AdornmentOverprint>(p, key, CMD)? {
+            set(attr, v);
+        }
+    }
+    // `null` returns a setting to the style's (size: half the text size by default).
+    for (key, attr) in
+        [("size", "kentenSize"), ("fillTint", "kentenFillTint"), ("strokeTint", "kentenStrokeTint"), ("strokeWeight", "kentenStrokeWeight")]
+    {
+        if p.get(key).is_some_and(Value::is_null) {
+            set(attr, Value::Null);
+        }
+    }
+    let on = match bool_param(p, "on", CMD)? {
+        Some(v) => v,
+        None if !body.is_empty() => true,
+        None => !char_flag_on(s, |f| f.kenten),
+    };
+    if !on {
+        // Off keeps the settings for the next time kenten are switched on.
+        body = serde_json::Map::new();
+    }
+    body.insert("kenten".into(), json!(on));
+    format_chars(s, &Value::Object(body))
+}
+
+pub(super) fn shatai_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "type.shatai";
+    let mut body = serde_json::Map::new();
+    if let Some(v) = finite_param(p, "magnification", CMD)? {
+        body.insert("shataiMagnification".into(), json!(v.clamp(0.0, 90.0)));
+    }
+    if let Some(v) = finite_param(p, "angle", CMD)? {
+        body.insert("shataiAngle".into(), json!(v.rem_euclid(180.0)));
+    }
+    if let Some(v) = bool_param(p, "adjustRotation", CMD)? {
+        body.insert("shataiAdjustRotation".into(), json!(v));
+    }
+    if let Some(v) = bool_param(p, "adjustTsume", CMD)? {
+        body.insert("shataiAdjustTsume".into(), json!(v));
+    }
+    if body.is_empty() {
+        return Err(bad(CMD, "nothing to set: magnification, angle, adjustRotation or adjustTsume"));
+    }
+    format_chars(s, &Value::Object(body))
+}
+
+pub(super) fn auto_tcy_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "type.autoTateChuYoko";
+    let mut body = serde_json::Map::new();
+    if let Some(v) = finite_param(p, "digits", CMD)? {
+        let max = f64::from(designcraft_compose::shape::AUTO_TCY_MAX);
+        body.insert("autoTcy".into(), json!(v.round().clamp(0.0, max) as u32));
+    }
+    if let Some(v) = bool_param(p, "includeRoman", CMD)? {
+        body.insert("autoTcyIncludeRoman".into(), json!(v));
+    }
+    if body.is_empty() {
+        return Err(bad(CMD, "nothing to set: digits or includeRoman"));
+    }
+    format_paras(s, &Value::Object(body))
+}
+
+pub(super) fn grid_settings_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    use designcraft_doc::cjk::CharacterAlignment as R;
+    const CMD: &str = "type.gridSettings";
+    let mut body = serde_json::Map::new();
+    let first_only = bool_param(p, "firstLineOnly", CMD)?;
+    match text_param(p, "alignment", CMD, 32)?.as_deref() {
+        None => {
+            if let Some(f) = first_only {
+                body.insert("gridAlign".into(), json!(if f { "firstLineOnly" } else { "allLines" }));
+            }
+        }
+        Some("none") => {
+            body.insert("gridAlign".into(), json!("none"));
+        }
+        Some(name) => {
+            let reference = match name {
+                "romanBaseline" | "baseline" => R::Baseline,
+                "emTop" => R::EmTop,
+                "emCenter" => R::EmCenter,
+                "emBottom" => R::EmBottom,
+                "icfTop" => R::IcfTop,
+                "icfBottom" => R::IcfBottom,
+                other => return Err(bad(CMD, format!("unknown alignment `{other}`"))),
+            };
+            body.insert("gridAlign".into(), json!(if first_only == Some(true) { "firstLineOnly" } else { "allLines" }));
+            body.insert("gridReference".into(), json!(reference));
+        }
+    }
+    if let Some(v) = finite_param(p, "gyoudori", CMD)? {
+        let max = 100.0;
+        body.insert("gridGyoudori".into(), json!(v.round().clamp(0.0, max) as u32));
+    }
+    if let Some(v) = bool_param(p, "paragraphGyoudori", CMD)? {
+        body.insert("paragraphGyoudori".into(), json!(v));
+    }
+    if body.is_empty() {
+        return Err(bad(CMD, "nothing to set: alignment, firstLineOnly, gyoudori or paragraphGyoudori"));
+    }
+    format_paras(s, &Value::Object(body))
+}
+
+fn ruby_text<'a>(p: &'a Value, key: &str) -> Result<Option<&'a str>> {
+    let Some(v) = p.get(key) else { return Ok(None) };
+    let t = v.as_str().ok_or_else(|| bad("type.ruby", format!("{key}: expected a string")))?;
+    if t.chars().count() > designcraft_doc::ruby::MAX_RUBY_CHARS {
+        return Err(bad("type.ruby", format!("{key}: longer than {} characters", designcraft_doc::ruby::MAX_RUBY_CHARS)));
+    }
+    Ok(Some(t))
+}
+
+pub(super) fn ruby_cmd(s: &mut Session, p: &Value) -> Result<Value> {
+    use designcraft_doc::cjk_settings::AdornmentOverprint;
+    use designcraft_doc::ruby::{RubyAlignment, RubyOverhang, RubyParentSpacing, RubyPosition, RubyType};
+    let mut body = serde_json::Map::new();
+    let mut put = |attr: &str, v: Option<Value>| {
+        if let Some(v) = v {
+            body.insert(attr.into(), v);
+        }
+    };
+    put("ruby", ruby_text(p, "text")?.map(|t| json!(t)));
+    put("rubyType", ruby_enum::<RubyType>(p, "type")?);
+    put("rubyAlignment", ruby_enum::<RubyAlignment>(p, "alignment")?);
+    put("rubyPosition", ruby_enum::<RubyPosition>(p, "position")?);
+    put("rubyOverhangAmount", ruby_enum::<RubyOverhang>(p, "overhang")?);
+    put("rubyParentSpacing", ruby_enum::<RubyParentSpacing>(p, "parentSpacing")?);
+    put("rubyOverprintFill", ruby_enum::<AdornmentOverprint>(p, "overprintFill")?);
+    put("rubyOverprintStroke", ruby_enum::<AdornmentOverprint>(p, "overprintStroke")?);
+    put("rubyXOffset", ruby_num(p, "xOffset", -1000.0, 1000.0, 1.0)?.filter(|v| !v.is_null()));
+    put("rubyYOffset", ruby_num(p, "yOffset", -1000.0, 1000.0, 1.0)?.filter(|v| !v.is_null()));
+    put("rubyFontSize", ruby_num(p, "size", 0.1, 1296.0, 1.0)?);
+    put("rubyXScale", ruby_num(p, "xScale", 1.0, 1000.0, 100.0)?.filter(|v| !v.is_null()));
+    put("rubyYScale", ruby_num(p, "yScale", 1.0, 1000.0, 100.0)?.filter(|v| !v.is_null()));
+    put("rubyScalingMin", ruby_num(p, "scalingPercent", 10.0, 100.0, 100.0)?.filter(|v| !v.is_null()));
+    put("rubyFillTint", ruby_num(p, "fillTint", 0.0, 100.0, 100.0)?);
+    put("rubyStrokeTint", ruby_num(p, "strokeTint", 0.0, 100.0, 100.0)?);
+    put("rubyStrokeWeight", ruby_num(p, "strokeWeight", 0.0, 800.0, 1.0)?);
+    put(
+        "rubyAutoTcyDigits",
+        ruby_num(p, "autoTcyDigits", 0.0, 9.0, 1.0)?.filter(|v| !v.is_null()).and_then(|v| v.as_f64()).map(|v| json!(v.round() as u32)),
+    );
+    for (key, attr) in [
+        ("openTypePro", "rubyOpenTypePro"),
+        ("autoTcyIncludeRoman", "rubyAutoTcyIncludeRoman"),
+        ("autoTcyAutoScale", "rubyAutoTcyAutoScale"),
+        ("autoAlign", "rubyAutoAlign"),
+        ("autoScaling", "rubyAutoScaling"),
+    ] {
+        if let Some(v) = p.get(key) {
+            let b = v.as_bool().ok_or_else(|| bad("type.ruby", format!("{key}: expected true or false")))?;
+            put(attr, Some(json!(b)));
+        }
+    }
+    put("rubyFont", ruby_text(p, "font")?.map(|t| json!(t)));
+    put("rubyFontStyle", ruby_text(p, "fontStyle")?.map(|t| json!(t)));
+    for (key, attr) in [("fill", "rubyFill"), ("stroke", "rubyStroke")] {
+        if let Some(name) = ruby_text(p, key)? {
+            let known = name.is_empty() || name == designcraft_doc::color::swatch::NONE || s.doc()?.doc.swatch(name).is_some();
+            if !known {
+                return Err(bad("type.ruby", format!("{key}: no swatch `{name}`")));
+            }
+            put(attr, Some(json!(name)));
+        }
+    }
+    format_chars(s, &Value::Object(body))
+}
+
+#[cfg(test)]
+mod tcy_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn tate_chu_yoko_toggles_on_the_selection() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 200, 400], "content": "text", "text": "令和12年", "vertical": true})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        let at = "令和".len();
+        s.execute("text.select", &json!({"story": sid, "anchor": at, "focus": at + 2})).unwrap();
+        let get = |s: &Session| s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].char_format_at(at + 1).over.tate_chu_yoko;
+        s.execute("type.tateChuYoko", &json!({})).unwrap();
+        assert_eq!(get(&s), Some(true));
+        s.execute("type.tateChuYoko", &json!({})).unwrap();
+        assert_eq!(get(&s), Some(false));
+        s.execute("type.tateChuYoko", &json!({"on": true})).unwrap();
+        assert_eq!(get(&s), Some(true));
+    }
+
+    #[test]
+    fn ruby_and_kenten_on_the_selection() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "漢字です"})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": "漢字".len()})).unwrap();
+        s.execute("type.ruby", &json!({"text": "かんじ"})).unwrap();
+        s.execute("type.kenten", &json!({})).unwrap();
+        let f = |s: &Session| s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].char_format_at(1).over.clone();
+        assert_eq!(f(&s).ruby.as_deref(), Some("かんじ"));
+        assert_eq!(f(&s).kenten, Some(true));
+        s.execute("type.kenten", &json!({})).unwrap();
+        s.execute("type.ruby", &json!({"text": ""})).unwrap();
+        assert_eq!(f(&s).kenten, Some(false));
+        assert_eq!(f(&s).ruby.as_deref(), Some(""));
+    }
+
+    #[test]
+    fn ruby_options_are_checked_and_clamped() {
+        use designcraft_doc::ruby::{RubyAlignment, RubyPosition, RubyType};
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "漢字です"})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": "漢字".len()})).unwrap();
+        let f = |s: &Session| s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].char_format_at(1).over.clone();
+        s.execute(
+            "type.ruby",
+            &json!({"text": "かん\u{3000}じ", "type": "perCharacter", "alignment": "oneAki", "position": "belowLeft", "size": 1e9, "xScale": -50, "scalingPercent": 5, "autoTcyDigits": 99, "fillTint": 250, "yOffset": -1e12, "fill": "[Black]"}),
+        )
+        .unwrap();
+        let a = f(&s);
+        assert_eq!(
+            (a.ruby.as_deref(), a.ruby_type, a.ruby_position),
+            (Some("かん\u{3000}じ"), Some(RubyType::PerCharacter), Some(RubyPosition::BelowLeft))
+        );
+        assert_eq!(a.ruby_font_size, Some(Some(1296.0)));
+        assert_eq!(a.ruby_x_scale, Some(0.01));
+        assert_eq!(a.ruby_scaling_min, Some(0.1));
+        assert_eq!(a.ruby_auto_tcy_digits, Some(9));
+        assert_eq!(a.ruby_fill_tint, Some(Some(1.0)));
+        assert_eq!(a.ruby_y_offset, Some(-1000.0));
+        // Options alone keep the reading.
+        s.execute("type.ruby", &json!({"alignment": "center"})).unwrap();
+        assert_eq!((f(&s).ruby, f(&s).ruby_alignment), (a.ruby.clone(), Some(RubyAlignment::Center)));
+        // Refused, and nothing changes: unknown names, non-numbers, overlong text, unknown swatches.
+        let long = "あ".repeat(designcraft_doc::ruby::MAX_RUBY_CHARS + 1);
+        for p in [
+            json!({"alignment": "sideways"}),
+            json!({"size": "big"}),
+            json!({"text": long}),
+            json!({"fill": "Nope"}),
+            json!({"autoAlign": 1}),
+            json!({"text": 5}),
+        ] {
+            assert!(s.execute("type.ruby", &p).is_err(), "{p}");
+        }
+        assert_eq!(f(&s).ruby_alignment, Some(RubyAlignment::Center));
+        assert_eq!(f(&s).ruby, a.ruby);
+    }
+
+    #[test]
+    fn warichu_toggles_on_the_selection_and_undoes() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "注釈です"})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        let n = "注釈".len();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": n})).unwrap();
+        s.execute("type.warichu", &json!({"lines": 2, "size": 40, "align": "left", "lineSpacing": 1, "charsBeforeBreak": 2, "charsAfterBreak": 2}))
+            .unwrap();
+        let f = |s: &Session| s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].char_format_at(1).over.clone();
+        let a = f(&s);
+        assert_eq!(a.warichu, Some(true));
+        assert_eq!(a.warichu_lines, Some(2));
+        assert_eq!(a.warichu_size, Some(40.0));
+        assert_eq!(a.warichu_line_spacing, Some(1.0));
+        assert_eq!(a.warichu_alignment, Some(designcraft_doc::cjk::WarichuAlignment::Left));
+        assert_eq!(a.warichu_chars_before_break, Some(2));
+        assert_eq!(a.warichu_chars_after_break, Some(2));
+        // The characters after the selection are not part of the note.
+        assert_eq!(s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].char_format_at(n + 1).over.warichu, None);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(f(&s).warichu, None);
+        s.execute("edit.redo", &json!({})).unwrap();
+        assert_eq!(f(&s).warichu, Some(true));
+        s.execute("type.warichu", &json!({})).unwrap();
+        assert_eq!(f(&s).warichu, Some(false));
+    }
+
+    #[test]
+    fn warichu_up_and_down_move_between_the_rows() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": "ABCDEFGHZ"})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 8})).unwrap();
+        s.execute("type.warichu", &json!({"lines": 2, "align": "left"})).unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
+        let down = s.execute("text.move", &json!({"dir": "down"})).unwrap()["pos"].as_u64().unwrap() as usize;
+        assert!((4..8).contains(&down), "down enters the second row: {down}");
+        let up = s.execute("text.move", &json!({"dir": "up"})).unwrap()["pos"].as_u64().unwrap() as usize;
+        assert!(up < 4, "up returns to the first row: {up}");
+        s.execute("text.select", &json!({"story": sid, "anchor": 8, "focus": 8})).unwrap();
+        let stayed = s.execute("text.move", &json!({"dir": "down"})).unwrap()["pos"].as_u64().unwrap() as usize;
+        assert_eq!(stayed, 8, "down from the character after the note does not fall back into a row");
+    }
+}
diff --git a/crates/engine/src/cmd/text/caret.rs b/crates/engine/src/cmd/text/caret.rs
new file mode 100644
index 000000000..670de4049
--- /dev/null
+++ b/crates/engine/src/cmd/text/caret.rs
@@ -0,0 +1,764 @@
+use super::{
+    CellAddr, Content, ItemId, Point, Result, Selection, Session, StoryId, TextSel, Value, bad, bool_or, compose, floor_char_boundary, id_param,
+    json, ok, point_param, str_param,
+};
+
+pub(crate) fn story_of(s: &Session, p: &Value) -> Option<StoryId> {
+    let st = s.active()?;
+    if let Some(v) = p.get("story").and_then(Value::as_u64) {
+        return Some(StoryId(v));
+    }
+    let frame = id_param(p, "frame").or_else(|| st.selection.items.first().copied());
+    if let Some(f) = frame {
+        return st.doc.item(f).and_then(|i| i.text_frame()).map(|t| t.story);
+    }
+    st.selection.text.map(|t| t.story)
+}
+
+/// Story byte at spread point `pt` in text frame `frame` (in a table cell's story when the point is in a cell).
+fn hit_byte(s: &Session, frame: ItemId, pt: Point) -> Option<(StoryId, usize, Option<CellAddr>)> {
+    hit_byte_with(s, frame, pt, compose::hit)
+}
+
+/// [`hit_byte`] with the hit test: [`compose::hit`] (caret position) or [`compose::hit_char`]
+/// (the character under the point).
+pub(super) fn hit_byte_with(
+    s: &Session,
+    frame: ItemId,
+    pt: Point,
+    hit: fn(&compose::ComposedStory, usize, Point) -> Option<usize>,
+) -> Option<(StoryId, usize, Option<CellAddr>)> {
+    let st = s.active()?;
+    let loc = st.doc.find(frame)?;
+    let it = st.doc.item_at(&loc)?;
+    let sid = it.text_frame()?.story;
+    let xf = st.doc.parent_xf(&loc) * st.doc.text_xf(it);
+    let inner = xf.inverse() * pt;
+    let cs = s.cache.get(&st.doc, sid, None);
+    let fi = cs.frames.iter().position(|f| f.frame == frame)?;
+    // Map path-text hits along the curve before choosing the character unit.
+    let inner = cs.frames.get(fi).and_then(|ft| compose::PathTextMap::new(it, ft)).map_or(inner, |m| m.to_line(inner));
+    if let Some((table, row, col, b)) = compose::hit_cell_with(&cs, fi, inner, hit) {
+        return Some((sid, b, Some(CellAddr { table, row, col })));
+    }
+    if let Some((id, b)) = compose::hit_note_with(&cs, fi, inner, hit) {
+        return Some((sid, b, Some(CellAddr::footnote(id))));
+    }
+    let b = hit(&cs, fi, inner).unwrap_or(0);
+    Some((sid, b, None))
+}
+
+/// Select the word, line, paragraph or story at `point` in `frame` (multiple clicks).
+pub(super) fn select_at(s: &mut Session, p: &Value, unit: &str) -> Result<Value> {
+    const ID: &str = "text.selectAt";
+    let frame = id_param(p, "frame").ok_or_else(|| bad(ID, "missing frame"))?;
+    let pt = point_param(p, "point").ok_or_else(|| bad(ID, "missing point"))?;
+    let (sid, b, cell) = hit_byte_with(s, frame, pt, compose::hit_char).ok_or_else(|| bad(ID, "not a text frame"))?;
+    let (a, e) = unit_at(s, sid, cell, b, unit, ID)?;
+    s.text_drag = false;
+    s.typing_format = None;
+    let sel = TextSel { story: sid, anchor: a, focus: e, frame: Some(frame), cell };
+    s.text_unit = Some(sel);
+    let st = s.doc_mut()?;
+    st.selection = Selection::text(sel);
+    // Explicit reselection invalidates the Find scope even when the range is unchanged.
+    st.bump_revision();
+    Ok(json!({"story": sid.0, "anchor": a, "focus": e}))
+}
+
+/// The `unit` (word, line, paragraph or story) around byte `b` of story `sid` (a cell's story
+/// with `cell`), as the multiple clicks select it.
+fn unit_at(s: &Session, sid: StoryId, cell: Option<CellAddr>, b: usize, unit: &str, cmd: &str) -> Result<(usize, usize)> {
+    let st = s.doc()?;
+    let story = st.doc.text_story(sid, cell).ok_or(designcraft_doc::DocError::NoStory(sid))?;
+    let text = story.text.as_str();
+    let b = floor_char_boundary(text, b);
+    Ok(match unit {
+        "word" => word_or_spaces_at(text, b),
+        "line" => {
+            let cs = s.cache.get(&st.doc, sid, None);
+            line_at(&text_composition(cs, cell), b).unwrap_or((b, b))
+        }
+        // The paragraph with its return (the last paragraph has none).
+        "paragraph" => story.para_ranges().get(story.para_at(b)).map_or((b, b), |r| (r.start, (r.end + 1).min(text.len()))),
+        "story" => (0, text.len()),
+        other => return Err(bad(cmd, format!("unknown unit `{other}` (word, line, paragraph or story)"))),
+    })
+}
+
+/// The word at byte `i`; on spaces the run of spaces; on anything else that one character
+/// (grapheme cluster). At the end of a paragraph, what ends it. Grapheme clusters are never split:
+/// combining marks, viramas, variation selectors and emoji ZWJ sequences stay with their base.
+fn word_or_spaces_at(s: &str, i: usize) -> (usize, usize) {
+    use unicode_segmentation::UnicodeSegmentation;
+    let i = floor_char_boundary(s, i.min(s.len()));
+    // Clusters never span a paragraph return, so the paragraph is enough.
+    let ps = s[..i].rfind('\n').map_or(0, |k| k + 1);
+    let pe = s[i..].find('\n').map_or(s.len(), |k| i + k);
+    let g: Vec<(usize, &str)> = s[ps..pe].grapheme_indices(true).collect();
+    let Some(k) = g.iter().rposition(|(o, _)| ps + o <= i) else { return (i, i) };
+    let kind = |c: &str| match c.chars().next() {
+        Some(c) if is_word(c) => 1,
+        Some(c) if c.is_whitespace() => 2,
+        _ => 0,
+    };
+    let span = |a: usize, e: usize| g.get(a).zip(g.get(e)).map_or((i, i), |((oa, _), (oe, ge))| (ps + oa, ps + oe + ge.len()));
+    let kd = g.get(k).map_or(0, |(_, c)| kind(c));
+    if kd == 0 {
+        return span(k, k);
+    }
+    let mut a = k;
+    while a > 0 && g.get(a - 1).is_some_and(|(_, c)| kind(c) == kd) {
+        a -= 1;
+    }
+    let mut e = k;
+    while g.get(e + 1).is_some_and(|(_, c)| kind(c) == kd) {
+        e += 1;
+    }
+    span(a, e)
+}
+
+/// The composition whose lines hold a story's text: the story's own, a table cell's or a footnote's.
+fn text_composition(cs: std::sync::Arc<compose::ComposedStory>, cell: Option<CellAddr>) -> std::sync::Arc<compose::ComposedStory> {
+    match cell {
+        Some(c) if c.footnote_id().is_some() => compose::find_note(&cs, c.row as u64).map(|(_, n)| n.text.clone()).unwrap_or(cs),
+        Some(c) => compose::find_cell(&cs, c.table, c.row, c.col).map(|(_, _, pc)| pc.text.clone()).unwrap_or(cs),
+        None => cs,
+    }
+}
+
+/// The composed line holding the character at byte `pos`.
+fn line_at(cs: &compose::ComposedStory, pos: usize) -> Option<(usize, usize)> {
+    let lines = || cs.frames.iter().flat_map(|f| f.lines.iter());
+    lines().find(|l| l.range.contains(&pos)).map(|l| (l.range.start, l.range.end)).or_else(|| line_of(cs, pos))
+}
+
+pub(super) fn place(s: &mut Session, p: &Value, extend: bool) -> Result<Value> {
+    let frame = id_param(p, "frame").ok_or_else(|| bad("text.placeCaret", "missing frame"))?;
+    let pt = point_param(p, "point").unwrap_or(Point::ZERO);
+    // Empty frames become text frames; a locked one stays as it is.
+    let st = s.doc()?;
+    let locked = st.doc.item(frame).is_some_and(|i| i.locked || st.doc.layer(i.layer).is_some_and(|l| l.locked));
+    let needs_convert = st.doc.item(frame).is_some_and(|i| matches!(i.content, Content::Unassigned));
+    if needs_convert && locked {
+        return Err(bad("text.placeCaret", "the frame is locked"));
+    }
+    if needs_convert {
+        s.execute("object.content", &json!({"ids": [frame.0], "type": "text"}))?;
+    }
+    let (sid, b, cell) = hit_byte(s, frame, pt).ok_or_else(|| bad("text.placeCaret", "not a text frame"))?;
+    // A drag after several clicks: whole units from the one first selected, in either direction.
+    if extend
+        && let Some(unit) = str_param(p, "unit")
+        && let Some(u) = s.text_unit.filter(|u| u.story == sid && u.cell == cell)
+    {
+        // The remembered unit may predate edits that shortened the text.
+        let text = s.doc()?.doc.text_story(sid, cell).map_or("", |t| t.text.as_str());
+        let (ua, ue) = (floor_char_boundary(text, u.anchor.min(u.focus)), floor_char_boundary(text, u.anchor.max(u.focus)));
+        let (na, ne) = unit_at(s, sid, cell, b, unit, "text.extendTo")?;
+        let (anchor, focus) = if na < ua { (ue, na) } else { (ua, ne.max(ue)) };
+        s.typing_format = None;
+        let st = s.doc_mut()?;
+        st.selection = Selection::text(TextSel { story: sid, anchor, focus, frame: Some(frame), cell });
+        st.bump_revision();
+        return Ok(json!({"story": sid.0, "anchor": anchor, "focus": focus}));
+    }
+    // Drag and drop: a press inside the selected text keeps it (to be dragged).
+    if !extend {
+        s.text_drag = s.doc()?.selection.text.is_some_and(|t| t.story == sid && t.cell == cell && !t.range().is_empty() && t.range().contains(&b));
+        if s.text_drag {
+            return Ok(json!({"story": sid.0, "dragging": true}));
+        }
+    } else if s.text_drag {
+        return Ok(json!({"story": sid.0, "dragging": true}));
+    }
+    s.typing_format = None;
+    let st = s.doc_mut()?;
+    // Dragging from one cell into another selects cells.
+    if extend
+        && let (Some(t), Some(c)) = (st.selection.text, cell)
+        && let Some(a) = t.cell
+        && t.story == sid
+        && a.table == c.table
+        && (a.row, a.col) != (c.row, c.col)
+    {
+        let range = designcraft_doc::CellRange::new(a.row, a.col, c.row, c.col);
+        st.selection.cells = Some(designcraft_doc::TableSel { story: sid, table: c.table, range });
+        st.bump_revision();
+        return Ok(json!({"story": sid.0, "cells": range}));
+    }
+    let t = match (extend, st.selection.text) {
+        (true, Some(t)) if t.story == sid && t.cell == cell => TextSel { focus: b, frame: Some(frame), ..t },
+        _ => TextSel { story: sid, anchor: b, focus: b, frame: Some(frame), cell },
+    };
+    st.selection = Selection::text(t);
+    st.bump_revision();
+    Ok(json!({"story": sid.0, "pos": b, "cell": cell}))
+}
+
+pub(super) fn release(s: &mut Session, p: &Value) -> Result<Value> {
+    if !std::mem::take(&mut s.text_drag) {
+        return ok();
+    }
+    let frame = id_param(p, "frame").ok_or_else(|| bad("text.release", "missing frame"))?;
+    let pt = point_param(p, "point").unwrap_or(Point::ZERO);
+    if !p.get("moved").and_then(Value::as_bool).unwrap_or(false) {
+        // A click in the selection: the caret goes there.
+        s.doc_mut()?.selection.text = None;
+        return place(s, &json!({"frame": frame.0, "point": [pt.x, pt.y]}), false);
+    }
+    let copy = p.get("copy").and_then(Value::as_bool).unwrap_or(false);
+    let Some(t) = s.doc()?.selection.text else { return ok() };
+    let Some((sid, b, cell)) = hit_byte(s, frame, pt) else { return ok() };
+    let r = t.range();
+    if sid != t.story || cell != t.cell || (r.contains(&b) && !copy) {
+        return ok();
+    }
+    s.edit(|d, sel| {
+        let st = d.text_story_mut(sid, cell).ok_or(designcraft_doc::DocError::NoStory(sid))?;
+        let piece = st.extract(r.clone());
+        let mut at = b;
+        if !copy {
+            st.delete(r.clone());
+            if at > r.start {
+                at -= r.len().min(at - r.start);
+            }
+        }
+        let end = st.insert_story(at, &piece);
+        sel.text = Some(TextSel { story: sid, anchor: at, focus: end, frame: Some(frame), cell });
+        Ok(json!({"moved": piece.text.len(), "at": at}))
+    })
+}
+
+pub fn next_char(s: &str, i: usize) -> usize {
+    s[i.min(s.len())..].chars().next().map(|c| i + c.len_utf8()).unwrap_or(s.len())
+}
+
+pub fn prev_char(s: &str, i: usize) -> usize {
+    s[..i.min(s.len())].chars().next_back().map(|c| i - c.len_utf8()).unwrap_or(0)
+}
+
+fn is_word(c: char) -> bool {
+    c.is_alphanumeric() || c == '\'' || c == '’'
+}
+
+pub fn next_word(s: &str, i: usize) -> usize {
+    let mut j = i;
+    let mut seen = false;
+    for (k, c) in s[i..].char_indices() {
+        if is_word(c) {
+            seen = true;
+        } else if seen {
+            return i + k;
+        }
+        j = i + k + c.len_utf8();
+    }
+    j
+}
+
+pub fn prev_word(s: &str, i: usize) -> usize {
+    let mut seen = false;
+    for (k, c) in s[..i].char_indices().rev() {
+        if is_word(c) {
+            seen = true;
+        } else if seen {
+            return k + c.len_utf8();
+        }
+    }
+    0
+}
+
+/// Selects `bounds(text, byte)` around the byte under `point` in `frame`. Unlike a caret
+/// placement, a press inside the current selection is no start of a text drag here: it is the
+/// third or later click of a row, which lands in the word or sentence just selected.
+pub(super) fn select_around(s: &mut Session, p: &Value, id: &str, bounds: fn(&str, usize) -> (usize, usize)) -> Result<Value> {
+    let frame = id_param(p, "frame").ok_or_else(|| bad(id, "missing frame"))?;
+    let pt = point_param(p, "point").unwrap_or(Point::ZERO);
+    let (sid, b, cell) = hit_byte(s, frame, pt).ok_or_else(|| bad(id, "not a text frame"))?;
+    let st = s.doc_mut()?;
+    let text = st.doc.text_story(sid, cell).map(|x| x.text.clone()).unwrap_or_default();
+    let (anchor, focus) = bounds(&text, floor_char_boundary(&text, b));
+    s.text_drag = false;
+    s.typing_format = None;
+    let st = s.doc_mut()?;
+    st.selection = Selection::text(TextSel { story: sid, anchor, focus, frame: Some(frame), cell });
+    st.bump_revision();
+    Ok(json!({"story": sid.0, "anchor": anchor, "focus": focus}))
+}
+
+/// The paragraph around byte `i`, without its `\n`.
+pub(super) fn para_bounds(s: &str, i: usize) -> (usize, usize) {
+    let i = i.min(s.len());
+    let a = s.get(..i).and_then(|t| t.rfind('\n')).map_or(0, |k| k + 1);
+    let b = s.get(i..).and_then(|t| t.find('\n')).map_or(s.len(), |k| i + k);
+    (a, b)
+}
+
+/// The sentence around byte `i`, within its paragraph: it ends after `.`, `!`, `?` or `…` (and
+/// any closing quotes or brackets) followed by a space or the paragraph end, or after a CJK full
+/// stop, and takes the spaces after it, as deleting a sentence should leave none behind.
+pub(super) fn sentence_bounds(s: &str, i: usize) -> (usize, usize) {
+    let (pa, pb) = para_bounds(s, i);
+    let para = s.get(pa..pb).unwrap_or("");
+    let mut start = 0;
+    let mut it = para.char_indices().peekable();
+    while let Some((_, c)) = it.next() {
+        let cjk = matches!(c, '。' | '！' | '？');
+        if !cjk && !matches!(c, '.' | '!' | '?' | '…') {
+            continue;
+        }
+        while it.peek().is_some_and(|&(_, c)| {
+            matches!(c, '.' | '!' | '?' | '…' | '。' | '！' | '？' | '"' | '\'' | '”' | '’' | '»' | '›' | ')' | ']' | '」' | '』' | '）')
+        }) {
+            it.next();
+        }
+        if !cjk && it.peek().is_some_and(|&(_, c)| !c.is_whitespace()) {
+            continue;
+        }
+        while it.peek().is_some_and(|&(_, c)| c.is_whitespace()) {
+            it.next();
+        }
+        let end = it.peek().map_or(para.len(), |&(k, _)| k);
+        if pa + end > i || end == para.len() {
+            return (pa + start, pa + end);
+        }
+        start = end;
+    }
+    (pa + start, pb)
+}
+
+pub(super) fn move_caret(s: &mut Session, p: &Value) -> Result<Value> {
+    let dir = str_param(p, "dir").unwrap_or("right").to_string();
+    let extend = bool_or(p, "extend", false);
+    let word = bool_or(p, "word", false);
+    let st = s.doc()?;
+    let t = st.selection.text.ok_or_else(|| bad("text.move", "no caret"))?;
+    let story = st.doc.text_story(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
+    let text = story.text.clone();
+    // In a cell, lines come from the cell's own composition.
+    let cs = text_composition(s.cache.get(&st.doc, t.story, None), t.cell);
+    let pos = t.focus.min(text.len());
+    // Vertical lines run top to bottom and follow each other right to left: Down and Up move along
+    // the line (Right and Left of horizontal text), Left and Right to the next and previous line.
+    let vertical_text = compose::caret(&cs, pos).and_then(|(fi, ..)| cs.frames.get(fi)).is_some_and(|f| f.vertical);
+    let dir = match (vertical_text, dir.as_str()) {
+        (true, "down") => "right",
+        (true, "up") => "left",
+        (true, "left") => "down",
+        (true, "right") => "up",
+        (_, d) => d,
+    };
+    let collapse_to = |left: bool| if left { t.range().start } else { t.range().end };
+    let new = match dir {
+        "left" if !extend && !t.is_caret() => collapse_to(true),
+        "right" if !extend && !t.is_caret() => collapse_to(false),
+        "left" | "right" => {
+            // Lines with right-to-left text move as drawn; at a line's edge, or by words, a
+            // right-to-left line's "left" is forward in the text.
+            let left = dir == "left";
+            let visual = if word { None } else { compose::visual_step(&cs, pos, left) };
+            match visual {
+                Some(p) => p,
+                None => {
+                    let forward = left == compose::line_rtl(&cs, pos);
+                    match (forward, word) {
+                        (true, true) => next_word(&text, pos),
+                        (true, false) => next_char(&text, pos),
+                        (false, true) => prev_word(&text, pos),
+                        (false, false) => prev_char(&text, pos),
+                    }
+                }
+            }
+        }
+        "up" | "down" => vertical(&cs, pos, dir == "up").unwrap_or(pos),
+        "lineStart" => line_of(&cs, pos).map(|l| l.0).unwrap_or(0),
+        "lineEnd" => line_of(&cs, pos).map(|l| l.1).unwrap_or(text.len()),
+        "storyStart" => 0,
+        "storyEnd" => text.len(),
+        other => return Err(bad("text.move", format!("unknown dir `{other}`"))),
+    };
+    s.typing_format = None;
+    let stm = s.doc_mut()?;
+    stm.selection.text = Some(if extend { TextSel { focus: new, ..t } } else { TextSel { anchor: new, focus: new, ..t } });
+    stm.bump_revision();
+    Ok(json!({"pos": new}))
+}
+
+fn line_of(cs: &compose::ComposedStory, pos: usize) -> Option<(usize, usize)> {
+    cs.frames.iter().flat_map(|f| f.lines.iter()).find(|l| pos >= l.range.start && pos <= l.range.end).map(|l| (l.range.start, l.range.end))
+}
+
+fn vertical(cs: &compose::ComposedStory, pos: usize, up: bool) -> Option<usize> {
+    let (fi, x, caret_y, _, _) = compose::caret(cs, pos)?;
+    let lines: Vec<(usize, &compose::Line)> = cs.frames.iter().enumerate().flat_map(|(i, f)| f.lines.iter().map(move |l| (i, l))).collect();
+    // Match the line by the bytes it owns. A warichu caret sits on a small-line baseline, so it
+    // does not equal the parent line's baseline.
+    let cur = lines.iter().position(|(i, l)| *i == fi && pos >= l.range.start && pos <= l.range.end && (pos < l.range.end || l.last_in_para))?;
+    let (_, l) = lines.get(cur)?;
+    if let Some(y) = compose::adjacent_row(l, x, caret_y, up)
+        && let Some(p) = compose::hit(cs, fi, Point::new(x, y))
+        && p != pos
+    {
+        return Some(p);
+    }
+    // The next row: segments of the same line (beside a wrap object) share its baseline.
+    let other_row = |(i, t): &&(usize, &compose::Line)| *i != fi || (t.baseline - l.baseline).abs() > 1e-6;
+    let (tf, tl) = if up { lines.get(..cur)?.iter().rfind(other_row)? } else { lines.get(cur + 1..)?.iter().find(other_row)? };
+    compose::hit(cs, *tf, Point::new(x, tl.baseline - 1.0))
+}
+
+#[cfg(test)]
+mod multi_click_tests {
+    use serde_json::{Value, json};
+
+    use crate::Session;
+
+    #[test]
+    fn moving_the_caret_drops_the_pending_typing_format() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": "Hello world"})).unwrap();
+        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
+        let size_at = |s: &Session, b: usize| s.doc().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().char_format_at(b).over.size;
+        let pending = |s: &mut Session| {
+            s.execute("text.select", &json!({"story": sid, "anchor": 5})).unwrap();
+            s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
+        };
+        // Away and back by arrow keys, by a click, by selecting and by double-clicking: typing at the
+        // same caret is in the text's own format.
+        let moves: Vec<Box<dyn Fn(&mut Session)>> = vec![
+            Box::new(|s| {
+                s.execute("text.move", &json!({"dir": "right"})).unwrap();
+                s.execute("text.move", &json!({"dir": "left"})).unwrap();
+            }),
+            Box::new(|s| {
+                s.execute("text.placeCaret", &json!({"frame": fid, "point": [80, 80]})).unwrap();
+                s.execute("text.select", &json!({"story": sid, "anchor": 5})).unwrap();
+            }),
+            Box::new(|s| {
+                s.execute("text.selectAt", &json!({"frame": fid, "point": [80, 80], "unit": "story"})).unwrap();
+                s.execute("text.select", &json!({"story": sid, "anchor": 5})).unwrap();
+            }),
+        ];
+        for m in &moves {
+            pending(&mut s);
+            m(&mut s);
+            s.execute("text.insert", &json!({"text": "x"})).unwrap();
+            assert_eq!(size_at(&s, 6), None);
+            s.execute("edit.undo", &json!({})).unwrap();
+        }
+        // Without a move it applies.
+        pending(&mut s);
+        s.execute("text.insert", &json!({"text": "x"})).unwrap();
+        assert_eq!(size_at(&s, 6), Some(30.0));
+        // Selecting a sentence or paragraph around a point drops it too.
+        for id in ["text.selectSentence", "text.selectParagraph"] {
+            pending(&mut s);
+            assert!(s.typing_format.is_some());
+            s.execute(id, &json!({"frame": fid, "point": [80, 80]})).unwrap();
+            assert!(s.typing_format.is_none(), "{id}");
+        }
+    }
+
+    #[test]
+    fn word_selection_keeps_grapheme_clusters_whole() {
+        use super::word_or_spaces_at as word;
+        // Decomposed "café": the combining acute belongs to the word, wherever the click lands.
+        let s = "un cafe\u{301} noir";
+        let cafe = (3, 3 + "cafe\u{301}".len());
+        assert_eq!(word(s, 4), cafe);
+        assert_eq!(word(s, 7), cafe, "on the combining mark");
+        // Devanagari with a virama (U+094D) and a dependent vowel sign.
+        let s = "\u{928}\u{92E}\u{938}\u{94D}\u{924}\u{947} x";
+        let w = "\u{928}\u{92E}\u{938}\u{94D}\u{924}\u{947}".len();
+        assert_eq!(word(s, 0), (0, w));
+        assert_eq!(word(s, 9), (0, w), "on the virama");
+        // An emoji ZWJ sequence and a variation selector stay one character.
+        let s = "a \u{1F469}\u{200D}\u{1F4BB} b \u{263A}\u{FE0F}";
+        let e = (2, 2 + "\u{1F469}\u{200D}\u{1F4BB}".len());
+        assert_eq!(word(s, 2), e);
+        assert_eq!(word(s, 6), e, "on the joiner");
+        assert_eq!(word(s, s.len() - 1), (s.len() - 6, s.len()), "at the end: the last character whole");
+        // Empty paragraphs select nothing.
+        assert_eq!(word("a\n\nb", 2), (2, 2));
+    }
+
+    /// Issue #981: holding the button after a double, triple or quadruple click and moving extends
+    /// the selection a word, line or paragraph at a time, from the unit first selected, either way.
+    #[test]
+    fn a_drag_after_several_clicks_extends_the_selection_by_units() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let text = "Hello  brave world.\nSecond paragraph here.";
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": text})).unwrap();
+        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
+        let at = |s: &Session, b: usize| {
+            let d = &s.doc().unwrap().doc;
+            let cs = designcraft_compose::compose_story(d, designcraft_doc::StoryId(sid), &Default::default());
+            let (l, g) = cs.frames[0].lines.iter().find_map(|l| l.glyphs.iter().find(|g| g.byte == b && g.len > 0).map(|g| (l, g))).unwrap();
+            json!([g.x + g.adv * 0.75, l.baseline - 3.0])
+        };
+        let sel = |s: &Session| s.doc().unwrap().selection.text.map(|t| (t.anchor, t.focus)).unwrap();
+        let extend = |s: &mut Session, b: usize, unit: &str| {
+            let p = at(s, b);
+            s.execute("text.extendTo", &json!({"frame": fid, "point": p, "unit": unit})).unwrap();
+            sel(s)
+        };
+        // Double-click "brave", drag into "world.": whole words, anchored at the start of "brave".
+        s.execute("text.selectAt", &json!({"frame": fid, "point": at(&s, 8), "unit": "word"})).unwrap();
+        assert_eq!(sel(&s), (7, 12));
+        assert_eq!(extend(&mut s, 14, "word"), (7, 18), "forward: through \"world\"");
+        assert_eq!(extend(&mut s, 9, "word"), (7, 12), "back inside the word: just the word");
+        assert_eq!(extend(&mut s, 1, "word"), (12, 0), "backward: from \"Hello\" to the end of \"brave\"");
+        assert_eq!(&text[0..12], "Hello  brave");
+        // Triple-click the first line, drag into the second: both lines.
+        s.execute("text.selectAt", &json!({"frame": fid, "point": at(&s, 8), "unit": "line"})).unwrap();
+        assert_eq!(sel(&s), (0, 19));
+        assert_eq!(extend(&mut s, 22, "line"), (0, text.len()));
+        // Without `unit` a drag still moves the focus a character at a time.
+        s.execute("text.selectAt", &json!({"frame": fid, "point": at(&s, 8), "unit": "word"})).unwrap();
+        s.execute("text.extendTo", &json!({"frame": fid, "point": at(&s, 14)})).unwrap();
+        assert_eq!(sel(&s).0, 7);
+        assert!(sel(&s).1 > 12 && sel(&s).1 < 18, "{:?}", sel(&s));
+        assert!(s.execute("text.extendTo", &json!({"frame": fid, "point": at(&s, 14), "unit": "sentence"})).is_err());
+        // A unit remembered before the text was deleted stays inside what is left.
+        s.execute("text.selectAt", &json!({"frame": fid, "point": at(&s, 14), "unit": "word"})).unwrap();
+        s.execute("story.setText", &json!({"story": sid, "text": ""})).unwrap();
+        s.execute("text.extendTo", &json!({"frame": fid, "point": [100, 90], "unit": "word"})).unwrap();
+        assert_eq!(sel(&s), (0, 0));
+    }
+
+    #[test]
+    fn clicks_select_words_spaces_lines_paragraphs_and_the_story() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let text = "Hello  brave world.\nSecond paragraph here.";
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": text})).unwrap();
+        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
+        // Spread point over the right half of the glyph at byte `b`.
+        let at = |s: &Session, b: usize| {
+            let d = &s.doc().unwrap().doc;
+            let cs = designcraft_compose::compose_story(d, designcraft_doc::StoryId(sid), &Default::default());
+            let (l, g) = cs.frames[0].lines.iter().find_map(|l| l.glyphs.iter().find(|g| g.byte == b && g.len > 0).map(|g| (l, g))).unwrap();
+            json!([g.x + g.adv * 0.75, l.baseline - 3.0])
+        };
+        let mut select = |unit: &str, b: usize| {
+            let p = at(&s, b);
+            let r: Value = s.execute("text.selectAt", &json!({"frame": fid, "point": p, "unit": unit})).unwrap();
+            (r["anchor"].as_u64().unwrap() as usize, r["focus"].as_u64().unwrap() as usize)
+        };
+        assert_eq!(select("word", 1), (0, 5), "inside a word");
+        assert_eq!(select("word", 4), (0, 5), "its last letter");
+        assert_eq!(select("word", 5), (5, 7), "the run of spaces after it");
+        assert_eq!(select("word", 18), (18, 19), "punctuation alone");
+        assert_eq!(select("line", 9), (0, 19));
+        assert_eq!(select("paragraph", 9), (0, 20), "with its return");
+        assert_eq!(select("paragraph", 22), (20, text.len()));
+        assert_eq!(select("story", 9), (0, text.len()));
+        // A second click inside the selected word selects again rather than starting a text drag.
+        s.execute("text.select", &json!({"story": sid, "anchor": 7, "focus": 12})).unwrap();
+        let p = at(&s, 9);
+        s.execute("text.selectAt", &json!({"frame": fid, "point": p, "unit": "line"})).unwrap();
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!((t.anchor, t.focus), (0, 19));
+        s.execute("text.release", &json!({"frame": fid, "point": p, "moved": false})).unwrap();
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!((t.anchor, t.focus), (0, 19), "releasing keeps it");
+        // The older word command agrees.
+        let p = at(&s, 8);
+        s.execute("text.selectWord", &json!({"frame": fid, "point": p})).unwrap();
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!((t.anchor, t.focus), (7, 12));
+        assert!(s.execute("text.selectAt", &json!({"frame": fid, "point": p, "unit": "sentence"})).is_err());
+        assert!(s.execute("text.selectAt", &json!({"frame": fid, "unit": "word"})).is_err(), "no point");
+    }
+}
+
+#[cfg(test)]
+mod drag_text_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn drag_selected_text_to_move_or_copy_it() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": "Hello brave world"})).unwrap();
+        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
+        // Spread point of the glyph at byte `b`.
+        let at = |s: &Session, b: usize| {
+            let d = &s.doc().unwrap().doc;
+            let cs = designcraft_compose::compose_story(d, designcraft_doc::StoryId(sid), &Default::default());
+            let l = &cs.frames[0].lines[0];
+            let g = l.glyphs.iter().find(|g| g.byte == b).unwrap();
+            json!([g.x + g.adv * 0.25, l.baseline - 3.0])
+        };
+        let end = |s: &Session| {
+            let d = &s.doc().unwrap().doc;
+            let cs = designcraft_compose::compose_story(d, designcraft_doc::StoryId(sid), &Default::default());
+            let l = &cs.frames[0].lines[0];
+            json!([l.end_x + 2.0, l.baseline - 3.0])
+        };
+        s.execute("text.select", &json!({"story": sid, "anchor": 6, "focus": 12})).unwrap();
+        let r = s.execute("text.placeCaret", &json!({"frame": fid, "point": at(&s, 8)})).unwrap();
+        assert_eq!(r["dragging"], true);
+        s.execute("text.extendTo", &json!({"frame": fid, "point": end(&s)})).unwrap();
+        s.execute("text.release", &json!({"frame": fid, "point": end(&s), "moved": true})).unwrap();
+        let text = |s: &Session| s.doc().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().text.clone();
+        assert_eq!(text(&s), "Hello worldbrave ");
+        // Alt-drag copies (the moved text is still selected).
+        s.execute("text.placeCaret", &json!({"frame": fid, "point": at(&s, 12)})).unwrap();
+        s.execute("text.release", &json!({"frame": fid, "point": at(&s, 0), "moved": true, "copy": true})).unwrap();
+        assert_eq!(text(&s), "brave Hello worldbrave ");
+        // A click inside the selection just places the caret.
+        s.execute("text.placeCaret", &json!({"frame": fid, "point": at(&s, 2)})).unwrap();
+        s.execute("text.release", &json!({"frame": fid, "point": at(&s, 2), "moved": false})).unwrap();
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!(t.anchor, t.focus);
+    }
+}
+
+#[cfg(test)]
+mod bidi_caret_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn arrow_keys_in_a_right_to_left_paragraph() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "سلام عليكم"})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        s.execute("type.para", &json!({"attrs": {"direction": "rightToLeft"}})).unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
+        // Left moves forward through right-to-left text, Right back.
+        let p = s.execute("text.move", &json!({"dir": "left"})).unwrap()["pos"].as_u64().unwrap();
+        assert_eq!(p, 'س'.len_utf8() as u64);
+        let p = s.execute("text.move", &json!({"dir": "right"})).unwrap()["pos"].as_u64().unwrap();
+        assert_eq!(p, 0);
+        // By words too.
+        let p = s.execute("text.move", &json!({"dir": "left", "word": true})).unwrap()["pos"].as_u64().unwrap();
+        assert!(p >= "سلام".len() as u64, "{p}");
+    }
+}
+
+#[cfg(test)]
+mod vertical_caret_tests {
+    use designcraft_doc::StoryId;
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// A story set in three or more lines; returns its id.
+    fn story(s: &mut Session, vertical: bool) -> StoryId {
+        s.execute("file.new", &json!({})).unwrap();
+        let text = "一二三四五六七八九十".repeat(8);
+        let rect = if vertical { [72, 72, 200, 400] } else { [72, 72, 400, 200] };
+        let r = s.execute("frame.create", &json!({"rect": rect, "content": "text", "text": text, "vertical": vertical})).unwrap();
+        StoryId(r["story"].as_u64().unwrap())
+    }
+
+    fn mv(s: &mut Session, dir: &str, extend: bool, word: bool) -> usize {
+        s.execute("text.move", &json!({"dir": dir, "extend": extend, "word": word})).unwrap()["pos"].as_u64().unwrap() as usize
+    }
+
+    /// (line index, position along the line) of the caret at `pos`.
+    fn place(s: &Session, sid: StoryId, pos: usize) -> (usize, f64) {
+        let cs = s.cache.get(&s.doc().unwrap().doc, sid, None);
+        let (_, x, baseline, _, _) = crate::compose::caret(&cs, pos).unwrap();
+        let line = cs.frames[0].lines.iter().position(|l| (l.baseline - baseline).abs() < 0.01).unwrap();
+        (line, x)
+    }
+
+    #[test]
+    fn arrow_keys_follow_vertical_lines() {
+        let mut s = Session::new();
+        let sid = story(&mut s, true);
+        assert!(s.cache.get(&s.doc().unwrap().doc, sid, None).frames[0].lines.len() >= 3);
+        let c = '一'.len_utf8();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 3 * c, "focus": 3 * c})).unwrap();
+        // Down and Up move along the line, a character at a time.
+        assert_eq!(mv(&mut s, "down", false, false), 4 * c);
+        assert_eq!(mv(&mut s, "up", false, false), 3 * c);
+        // Left moves to the next line (lines follow each other right to left), keeping the
+        // position along the line; Right comes back.
+        let (line, x) = place(&s, sid, 3 * c);
+        let next = mv(&mut s, "left", false, false);
+        let (nline, nx) = place(&s, sid, next);
+        assert_eq!(nline, line + 1);
+        assert!((nx - x).abs() < 0.5, "{x} {nx}");
+        assert_eq!(mv(&mut s, "right", false, false), 3 * c);
+        // Shift extends.
+        assert_eq!(mv(&mut s, "down", true, false), 4 * c);
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!((t.anchor, t.focus), (3 * c, 4 * c));
+        let p = mv(&mut s, "left", true, false);
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!((t.anchor, t.focus), (3 * c, p));
+        assert_eq!(place(&s, sid, p).0, line + 1);
+        // With a selection, Up collapses it to its start.
+        assert_eq!(mv(&mut s, "up", false, false), 3 * c);
+        // By words: Alt+Down is the vertical Alt+Right.
+        let text = s.doc().unwrap().doc.story(sid).unwrap().text.clone();
+        assert_eq!(mv(&mut s, "down", false, true), super::next_word(&text, 3 * c));
+    }
+
+    #[test]
+    fn arrow_keys_in_horizontal_lines() {
+        let mut s = Session::new();
+        let sid = story(&mut s, false);
+        let c = '一'.len_utf8();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 3 * c, "focus": 3 * c})).unwrap();
+        assert_eq!(mv(&mut s, "right", false, false), 4 * c);
+        assert_eq!(mv(&mut s, "left", false, false), 3 * c);
+        let (line, x) = place(&s, sid, 3 * c);
+        let next = mv(&mut s, "down", false, false);
+        let (nline, nx) = place(&s, sid, next);
+        assert_eq!(nline, line + 1);
+        assert!((nx - x).abs() < 0.5, "{x} {nx}");
+        assert_eq!(mv(&mut s, "up", false, false), 3 * c);
+    }
+}
+
+#[cfg(test)]
+mod sentence_selection_tests {
+    use super::{para_bounds, sentence_bounds};
+
+    fn sentence(s: &str, at: &str) -> String {
+        let i = s.find(at).unwrap();
+        let (a, b) = sentence_bounds(s, i);
+        s[a..b].to_string()
+    }
+
+    #[test]
+    fn sentences_end_at_a_stop_before_a_space_or_the_paragraph_end() {
+        let s = "It costs 3.5 euros. \u{201C}Really?\u{201D} (Twice!) Yes\u{2026} fine.\nNext one. Last";
+        assert_eq!(sentence(s, "costs"), "It costs 3.5 euros. ");
+        assert_eq!(sentence(s, "Really"), "\u{201C}Really?\u{201D} ");
+        assert_eq!(sentence(s, "Twice"), "(Twice!) ");
+        assert_eq!(sentence(s, "Yes"), "Yes\u{2026} ");
+        assert_eq!(sentence(s, "fine"), "fine.");
+        assert_eq!(sentence(s, "one"), "Next one. ");
+        assert_eq!(sentence(s, "Last"), "Last");
+        // The caret at the very end of a paragraph is in its last sentence.
+        let end = s.find('\n').unwrap();
+        assert_eq!(sentence_bounds(s, end), (s.find("fine").unwrap(), end));
+    }
+
+    #[test]
+    fn cjk_full_stops_end_sentences_without_a_space() {
+        let s = "これは文です。次の文！最後";
+        assert_eq!(sentence(s, "次"), "次の文！");
+        assert_eq!(sentence(s, "最後"), "最後");
+    }
+
+    #[test]
+    fn paragraphs_stop_at_returns() {
+        let s = "One.\nTwo two.\n";
+        assert_eq!(para_bounds(s, 6), (5, 13));
+        assert_eq!(para_bounds(s, 0), (0, 4));
+        assert_eq!(para_bounds(s, s.len()), (s.len(), s.len()));
+    }
+}
diff --git a/crates/engine/src/cmd/text/edit.rs b/crates/engine/src/cmd/text/edit.rs
new file mode 100644
index 000000000..fc3f5dddf
--- /dev/null
+++ b/crates/engine/src/cmd/text/edit.rs
@@ -0,0 +1,730 @@
+use super::caret::{next_char, next_word, prev_char, prev_word, story_of};
+use super::format::{apply_typing_format, format_targets, typing_format};
+use super::{Result, Session, TextSel, Value, bad, bool_or, compose, floor_char_boundary, id_param, json, ok, str_param};
+#[cfg(test)]
+use designcraft_doc::StoryId;
+
+// Each command edits a copy-on-write Story snapshot. Reserving its known final text growth
+// avoids retaining geometric String spare capacity in every independent undo snapshot.
+// General Story insertion keeps its existing amortized-growth policy for mutable builders.
+fn reserve_command_text(st: &mut designcraft_doc::Story, additional: usize) -> Result<()> {
+    st.text.try_reserve_exact(additional).map_err(|e| crate::EngineError::Other(format!("could not reserve text insertion: {e}")))
+}
+
+pub(super) fn insert(s: &mut Session, p: &Value) -> Result<Value> {
+    let text = crate::cmd::text_param(p, "text");
+    // Tab in a table cell moves to the next cell (Shift-Tab: `table.prevCell`).
+    if text == "\t" && s.doc()?.selection.text.is_some_and(|t| t.cell.is_some()) {
+        return crate::cmd::table::step_cell(s, true);
+    }
+    let raw = p.get("raw").and_then(Value::as_bool).unwrap_or(false);
+    let text = if s.prefs.typographers_quotes && !raw { smart_quotes(s, &text) } else { text };
+    let tracking = s.doc()?.doc.settings.track_changes;
+    let autocorrect = (s.prefs.autocorrect && !tracking && !raw).then(|| s.prefs.autocorrect_list.clone());
+    let typing = typing_format(s).cloned();
+    let result = s.edit(|d, sel| {
+        let t = sel.text.ok_or_else(|| bad("text.insert", "no insertion point"))?;
+        let st = d.text_story_mut(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
+        let r = t.range();
+        let mut r = r.start.min(st.len())..r.end.min(st.len());
+        // Between a break character and its return is the end of that paragraph: typing there goes
+        // to the start of the next one.
+        if r.is_empty()
+            && st.text.get(r.start..).is_some_and(|t| t.starts_with('\n'))
+            && st.text.get(..r.start).and_then(|t| t.chars().next_back()).is_some_and(designcraft_doc::is_break_char)
+        {
+            r = r.start + 1..r.start + 1;
+        }
+        // Autocorrect: a word ended by a space or punctuation is looked up.
+        if let Some(list) = &autocorrect
+            && r.is_empty()
+            && text.chars().count() == 1
+            && text.chars().all(|c| c.is_whitespace() || c.is_ascii_punctuation())
+        {
+            let before = &st.text[..r.start];
+            let ws = before.char_indices().rev().take_while(|(_, c)| c.is_alphabetic()).last().map(|(i, _)| i);
+            if let Some(ws) = ws {
+                let word = &before[ws..];
+                if let Some((_, to)) = list.iter().find(|(from, _)| from.eq_ignore_ascii_case(word)) {
+                    let to = if word.chars().next().is_some_and(char::is_uppercase) {
+                        let mut c = to.chars();
+                        c.next().map(|f| f.to_uppercase().chain(c).collect()).unwrap_or_default()
+                    } else {
+                        to.clone()
+                    };
+                    st.replace(ws..r.start, &to);
+                    r = ws + to.len()..ws + to.len();
+                }
+            }
+        }
+        // A column, frame or page break ends its paragraph.
+        let mut text = if text.contains(designcraft_doc::is_break_char) {
+            designcraft_doc::end_paragraphs_at_breaks(&text, st.text.get(r.end..).and_then(|t| t.chars().next()))
+        } else {
+            text.clone()
+        };
+        // Typing next to a table anchor starts a paragraph of its own.
+        let mut trail = 0;
+        if t.cell.is_none() && !text.is_empty() && st.table_at(r.start).is_some() {
+            let pi = st.para_at(r.start);
+            let pr = st.para_ranges()[pi].clone();
+            let anchor_at = pr.start + st.text[pr.clone()].find(designcraft_doc::TABLE_ANCHOR).unwrap_or(0);
+            if r.start <= anchor_at {
+                if !text.ends_with('\n') {
+                    text.push('\n');
+                    trail = 1;
+                }
+            } else if !text.starts_with('\n') {
+                text.insert(0, '\n');
+            }
+        }
+        if tracking && t.cell.is_none() {
+            // Track Changes: the replaced text is marked deleted, the typing inserted after it.
+            let at = crate::cmd::changes::mark_deleted(st, r.clone());
+            reserve_command_text(st, text.len())?;
+            let mut fmt = st.insert_format_at(at).clone();
+            if let Some(f) = &typing {
+                apply_typing_format(&mut fmt, f);
+            }
+            fmt.over.change = Some(designcraft_doc::ChangeMark::Inserted);
+            st.insert_with(at, &text, fmt);
+            let pos = at + text.len() - trail;
+            sel.text = Some(TextSel { anchor: pos, focus: pos, ..t });
+            return Ok(json!({"pos": pos}));
+        }
+        let a = floor_char_boundary(&st.text, r.start.min(st.len()));
+        let b = floor_char_boundary(&st.text, r.end.min(st.len())).max(a);
+        reserve_command_text(st, text.len().saturating_sub(b - a))?;
+        st.replace(r.clone(), &text);
+        if let Some(f) = &typing
+            && !text.is_empty()
+        {
+            st.format_chars(r.start..r.start + text.len(), |fmt| apply_typing_format(fmt, f));
+        }
+        let pos = r.start + text.len() - trail;
+        sel.text = Some(TextSel { anchor: pos, focus: pos, ..t });
+        Ok(json!({"pos": pos}))
+    });
+    // A preview (IME marked text) leaves the typing format to the text typed in the end.
+    if result.is_ok() && s.active().is_none_or(|d| d.interaction.is_none()) {
+        s.typing_format = None;
+    }
+    result
+}
+
+/// The input method's delete-surrounding: remove `before`/`after` characters (or bytes) around
+/// the selection, keeping the selection itself and its direction, then optionally type `commit`
+/// over it. One undo step for the whole batch, through the normal command pipeline (preview
+/// restoration, panic guard, undo, auto-size and the journal), unlike a private edit.
+pub(super) fn delete_surrounding(s: &mut Session, p: &Value) -> Result<Value> {
+    let count = |key: &str| -> Result<usize> {
+        match p.get(key).and_then(Value::as_u64) {
+            Some(v) => usize::try_from(v).map_err(|_| bad("text.deleteSurrounding", format!("{key} is out of range"))),
+            None => Ok(0),
+        }
+    };
+    let before = count("before")?;
+    let after = count("after")?;
+    let bytes = p.get("bytes").and_then(Value::as_bool).unwrap_or(false);
+    let commit = designcraft_tools::ime_commit_text(p.get("commit").and_then(Value::as_str).unwrap_or(""));
+    // What the request removes, from the committed text as it is now: the ranges exclude the
+    // selection and any pre-edit (a pre-edit is only a preview, never in the story).
+    let (before_range, after_range, tracking, length_before) = {
+        let st = s.doc()?;
+        let t = st.selection.text.ok_or_else(|| bad("text.deleteSurrounding", "no text insertion point"))?;
+        let story = st.doc.text_story(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
+        let (before_range, after_range) = crate::ime_delete_ranges(&story.text, t.anchor, t.focus, before, after, bytes)
+            .ok_or_else(|| bad("text.deleteSurrounding", "the IME text selection is not on character boundaries"))?;
+        (before_range, after_range, st.doc.settings.track_changes && t.cell.is_none(), story.text.len())
+    };
+    s.edit(|d, sel| {
+        let t = sel.text.ok_or_else(|| bad("text.deleteSurrounding", "no text insertion point"))?;
+        let story = d.text_story_mut(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
+        if !after_range.is_empty() {
+            if tracking {
+                crate::cmd::changes::mark_deleted(story, after_range.clone());
+            } else {
+                story.delete(after_range.clone());
+            }
+        }
+        let mut shift = 0usize;
+        if !before_range.is_empty() {
+            if tracking {
+                // Tracked changes keep the text and mark it deleted: the selection does not move.
+                let new_end = crate::cmd::changes::mark_deleted(story, before_range.clone());
+                shift = before_range.end.saturating_sub(new_end);
+            } else {
+                shift = before_range.len();
+                story.delete(before_range.clone());
+            }
+        }
+        sel.text = Some(TextSel { anchor: t.anchor.saturating_sub(shift), focus: t.focus.saturating_sub(shift), ..t });
+        Ok(())
+    })?;
+    if !commit.is_empty() {
+        insert(s, &json!({"text": commit}))?;
+    }
+    let st = s.doc()?;
+    let (anchor, focus) = st.selection.text.map_or((0, 0), |t| (t.anchor, t.focus));
+    let length_after = st.selection.text.and_then(|t| st.doc.text_story(t.story, t.cell)).map_or(0, |story| story.text.len());
+    Ok(json!({
+        "deletedBefore": [before_range.start, before_range.end],
+        "deletedAfter": [after_range.start, after_range.end],
+        "lengthBefore": length_before,
+        "lengthAfter": length_after,
+        "anchor": anchor,
+        "focus": focus,
+    }))
+}
+
+fn smart_quotes(s: &Session, text: &str) -> String {
+    if !text.contains(['"', '\'']) {
+        return text.to_string();
+    }
+    let prev = s
+        .active()
+        .and_then(|st| {
+            let t = st.selection.text?;
+            let story = st.doc.text_story(t.story, t.cell)?;
+            story.text[..t.range().start.min(story.len())].chars().last()
+        })
+        .unwrap_or(' ');
+    // The language at the insertion point picks the quote marks.
+    let language = s
+        .active()
+        .and_then(|st| {
+            let t = st.selection.text?;
+            let story = st.doc.text_story(t.story, t.cell)?;
+            let pos = t.range().start.min(story.len());
+            let pi = story.para_at(pos).min(story.paras.len().saturating_sub(1));
+            let base = st.doc.styles.resolve_para(story.paras.get(pi)?).1;
+            Some(st.doc.styles.resolve_char(&base, story.char_format_at(pos)).language)
+        })
+        .unwrap_or_default();
+    let [dq_open, dq_close, sq_open, sq_close] = quote_marks(&language);
+    let mut out = String::with_capacity(text.len());
+    let mut last = prev;
+    for c in text.chars() {
+        let open = last.is_whitespace() || matches!(last, '(' | '[' | '{' | '\u{2014}' | '\u{2013}');
+        let r = match c {
+            '"' => {
+                if open {
+                    dq_open
+                } else {
+                    dq_close
+                }
+            }
+            '\'' => {
+                if open {
+                    sq_open
+                } else {
+                    // An apostrophe inside a word stays an apostrophe.
+                    if last.is_alphanumeric() { '\u{2019}' } else { sq_close }
+                }
+            }
+            c => c,
+        };
+        out.push(r);
+        last = c;
+    }
+    out
+}
+
+/// Typographer's quotes of a language (a name or locale code, see
+/// [`designcraft_doc::language_tag`]): [double open, double close, single open, single close].
+pub fn quote_marks(language: &str) -> [char; 4] {
+    const ENGLISH: [char; 4] = ['\u{201C}', '\u{201D}', '\u{2018}', '\u{2019}'];
+    let Some(tag) = designcraft_doc::language_tag(language) else { return ENGLISH };
+    // Swiss German, French and Italian use guillemets.
+    if tag.ends_with("-CH") {
+        return ['\u{00AB}', '\u{00BB}', '\u{2039}', '\u{203A}'];
+    }
+    match tag {
+        "zh-Hans" => return ENGLISH,
+        "zh" | "zh-Hant" => return ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}'],
+        _ => {}
+    }
+    match designcraft_doc::language_subtag(tag) {
+        "de" | "cs" | "sk" | "bg" | "lt" => ['\u{201E}', '\u{201C}', '\u{201A}', '\u{2018}'],
+        "fr" | "ru" | "uk" | "no" | "nb" | "nn" | "el" => ['\u{00AB}', '\u{00BB}', '\u{2039}', '\u{203A}'],
+        "es" | "it" | "pt" | "ca" => ['\u{00AB}', '\u{00BB}', '\u{201C}', '\u{201D}'],
+        "nl" | "pl" | "ro" | "hu" | "hr" => ['\u{201E}', '\u{201D}', '\u{201A}', '\u{2019}'],
+        "sv" | "fi" => ['\u{201D}', '\u{201D}', '\u{2019}', '\u{2019}'],
+        "da" => ['\u{00BB}', '\u{00AB}', '\u{203A}', '\u{2039}'],
+        "ja" => ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}'],
+        _ => ENGLISH,
+    }
+}
+
+pub(crate) fn delete_selection(s: &mut Session) -> Result<Value> {
+    let tracking = s.doc()?.doc.settings.track_changes;
+    s.edit(|d, sel| {
+        let t = sel.text.ok_or_else(|| bad("text.delete", "no text"))?;
+        let r = t.range();
+        if let Some(st) = d.text_story_mut(t.story, t.cell) {
+            if tracking && t.cell.is_none() {
+                crate::cmd::changes::mark_deleted(st, r.clone());
+            } else {
+                st.delete(r.clone());
+            }
+        }
+        sel.text = Some(TextSel { anchor: r.start, focus: r.start, ..t });
+        ok()
+    })
+}
+
+pub(super) fn delete(s: &mut Session, p: &Value) -> Result<Value> {
+    let forward = bool_or(p, "forward", false);
+    let word = bool_or(p, "word", false);
+    let tracking = s.doc()?.doc.settings.track_changes;
+    s.edit(|d, sel| {
+        let t = sel.text.ok_or_else(|| bad("text.delete", "no text"))?;
+        let st = d.text_story_mut(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
+        let r = t.range();
+        let r = if !r.is_empty() {
+            r
+        } else if forward {
+            let end = if word { next_word(&st.text, r.start) } else { next_char(&st.text, r.start) };
+            r.start..end
+        } else {
+            let start = if word { prev_word(&st.text, r.start) } else { prev_char(&st.text, r.start) };
+            start..r.start
+        };
+        let r = with_break_pair(&st.text, r);
+        if tracking && t.cell.is_none() {
+            // Marked, not removed: the caret steps over the deleted text.
+            let at = crate::cmd::changes::mark_deleted(st, r.clone());
+            let pos = if forward { at.max(r.end.min(st.len())) } else { r.start.min(at) };
+            sel.text = Some(TextSel { anchor: pos, focus: pos, ..t });
+            return ok();
+        }
+        st.delete(r.clone());
+        sel.text = Some(TextSel { anchor: r.start, focus: r.start, ..t });
+        ok()
+    })
+}
+
+/// A break character and the return after it end one paragraph: deleting either deletes both.
+fn with_break_pair(text: &str, r: std::ops::Range<usize>) -> std::ops::Range<usize> {
+    let Some(del) = text.get(r.clone()) else { return r };
+    let mut chars = del.chars();
+    match (chars.next(), chars.next()) {
+        (Some('\n'), None) => match text.get(..r.start).and_then(|t| t.chars().next_back()) {
+            Some(b) if designcraft_doc::is_break_char(b) => r.start.saturating_sub(b.len_utf8())..r.end,
+            _ => r,
+        },
+        (Some(b), None) if designcraft_doc::is_break_char(b) && text.get(r.end..).is_some_and(|t| t.starts_with('\n')) => r.start..r.end + 1,
+        _ => r,
+    }
+}
+
+/// Our own filler text (not Adobe's).
+pub const PLACEHOLDER: &str = "Ovid ellum quisque arcet velut tempora sint, ne veriora pareant laudemque fieri. Lorem novum strata ponet amicos, \
+et tamen uti ferrum caelo tempus mollit. Quisque sinat oppida retro, nec tenuere longas animi semper vias. \
+Sic erat, ut nostris ceperunt pectora verbis, mitescunt flamma solidos campos venti. Moventur iam nubes, aequora pontus, \
+dum sidera fulgent tacito per inane meatu. Arbore sub magna ludunt pueri, linquunt aurea litora fluctus. \
+Iamque tibi rursus ponet nova carmina vates, et longas umbras quaerit sub tegmine fagi. Omnia mutantur, nihil interit.";
+
+pub(super) fn fill_placeholder(s: &mut Session, p: &Value) -> Result<Value> {
+    let st = s.doc()?;
+    let frame = id_param(p, "frame").or_else(|| st.selection.items.first().copied()).or_else(|| st.selection.text.and_then(|t| t.frame));
+    let sid = match frame.and_then(|f| st.doc.item(f)).and_then(|i| i.text_frame()) {
+        Some(t) => t.story,
+        None => {
+            if let Some(f) = frame {
+                s.execute("object.content", &json!({"ids": [f.0], "type": "text"}))?;
+            }
+            story_of(s, p).ok_or_else(|| bad("type.fillWithPlaceholder", "select a text frame"))?
+        }
+    };
+    // Fill until overset with paragraphs of two to five sentences, as InDesign's placeholder text
+    // comes (so a paragraph can be styled on its own).
+    const SENTENCES_PER_PARAGRAPH: [usize; 7] = [2, 2, 3, 3, 5, 2, 4];
+    let mut text = String::new();
+    let sentences: Vec<&str> = PLACEHOLDER.split_inclusive(". ").map(str::trim_end).collect();
+    let doc = s.doc()?.doc.clone();
+    let mut d2 = (*doc).clone();
+    let (mut paragraph, mut in_paragraph) = (0, 0);
+    for i in 0..400 {
+        text.push_str(sentences[i % sentences.len()]);
+        in_paragraph += 1;
+        if in_paragraph >= SENTENCES_PER_PARAGRAPH[paragraph % SENTENCES_PER_PARAGRAPH.len()] {
+            text.push('\n');
+            (paragraph, in_paragraph) = (paragraph + 1, 0);
+        } else {
+            text.push(' ');
+        }
+        if i % 3 == 2 {
+            d2.set_story_text(sid, &text)?;
+            let cs = compose::compose_story(&d2, sid, &compose::ComposeOptions::default());
+            if cs.is_overset() {
+                // Trim to the last sentence that fits.
+                let cut = cs.overset_at.unwrap_or(text.len()).min(text.len());
+                let keep = text.get(..cut).and_then(|t| t.rfind('.')).map(|k| k + 1).unwrap_or(cut);
+                text.truncate(keep);
+                break;
+            }
+        }
+    }
+    s.edit(|d, _| {
+        d.set_story_text(sid, text.trim_end())?;
+        ok()
+    })
+}
+
+/// The case-changed text of `src`, char by char (a char may map to several, e.g. ß → SS).
+pub(crate) fn case_map(src: &str, case: &str) -> Vec<String> {
+    let mut out = Vec::with_capacity(src.len());
+    let mut prev = ' ';
+    let mut sentence_start = true;
+    for c in src.chars() {
+        let word_start = !(prev.is_alphanumeric() || matches!(prev, '\'' | '\u{2019}'));
+        let up = |c: char| c.to_uppercase().collect::<String>();
+        let low = |c: char| c.to_lowercase().collect::<String>();
+        // Title and sentence case capitalize only scripts with initial capitals (not Georgian).
+        let cap = |c: char| if designcraft_doc::capitalizes(c) { up(c) } else { low(c) };
+        let m = match case {
+            "upper" => up(c),
+            "lower" => low(c),
+            "title" => {
+                if word_start {
+                    cap(c)
+                } else {
+                    low(c)
+                }
+            }
+            _ => {
+                if sentence_start && c.is_alphanumeric() {
+                    cap(c)
+                } else {
+                    low(c)
+                }
+            }
+        };
+        if c.is_alphanumeric() {
+            sentence_start = false;
+        } else if matches!(c, '.' | '!' | '?' | '\n' | '\u{2028}') {
+            sentence_start = true;
+        }
+        out.push(m);
+        prev = c;
+    }
+    out
+}
+
+pub(super) fn change_case(s: &mut Session, p: &Value) -> Result<Value> {
+    let case = str_param(p, "case").unwrap_or("upper").to_string();
+    if !matches!(case.as_str(), "upper" | "lower" | "title" | "sentence") {
+        return Err(bad("type.changeCase", format!("unknown case `{case}`")));
+    }
+    let targets = format_targets(s);
+    s.edit(|d, sel| {
+        for t in &targets {
+            let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
+            let r = t.range.start.min(st.len())..t.range.end.min(st.len());
+            let mapped = case_map(st.slice(r.clone()), &case);
+            // Replace run by run (from the end) so every run keeps its formatting.
+            let segs: Vec<std::ops::Range<usize>> =
+                st.runs().map(|(rr, _)| rr.start.max(r.start)..rr.end.min(r.end)).filter(|x| x.start < x.end).collect();
+            let starts: Vec<usize> = st.slice(r.clone()).char_indices().map(|(i, _)| r.start + i).collect();
+            let mut delta: isize = 0;
+            for seg in segs.iter().rev() {
+                let old = st.slice(seg.clone()).to_string();
+                let new: String = starts.iter().zip(&mapped).filter(|(b, _)| seg.contains(b)).map(|(_, m)| m.as_str()).collect();
+                if new != old {
+                    delta += new.len() as isize - old.len() as isize;
+                    st.replace(seg.clone(), &new);
+                }
+            }
+            if let Some(ts) = sel.text.as_mut().filter(|ts| ts.story == t.story && ts.cell == t.cell && !ts.is_caret()) {
+                let end = (r.end as isize + delta).max(r.start as isize) as usize;
+                if ts.anchor <= ts.focus {
+                    ts.focus = end;
+                } else {
+                    ts.anchor = end;
+                }
+            }
+        }
+        Ok(Value::Null)
+    })
+}
+
+#[cfg(test)]
+mod autocorrect_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn autocorrect_fixes_the_word_before_a_space() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": ""})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
+        let text = |s: &Session| s.doc().unwrap().doc.stories[&sid].text.clone();
+        // Off by default.
+        for c in ["t", "e", "h", " "] {
+            s.execute("text.insert", &json!({"text": c})).unwrap();
+        }
+        assert_eq!(text(&s), "teh ");
+        s.execute("prefs.set", &json!({"autocorrect": true})).unwrap();
+        for c in ["T", "e", "h", " ", "c", "a", "t", "."] {
+            s.execute("text.insert", &json!({"text": c})).unwrap();
+        }
+        assert_eq!(text(&s), "teh The cat.");
+        // The caret ends after the inserted punctuation.
+        assert_eq!(s.doc().unwrap().selection.text.unwrap().focus, "teh The cat.".len());
+    }
+}
+
+#[cfg(test)]
+mod break_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// Type › Insert Break Character: the break ends its paragraph, the caret starts the next one.
+    #[test]
+    fn inserted_break_ends_its_paragraph() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "OneTwo\nThree"})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let story = |s: &Session| s.doc().unwrap().doc.stories[&sid].clone();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 3, "focus": 3})).unwrap();
+        s.execute("text.insert", &json!({"text": "\u{e011}", "raw": true})).unwrap();
+        assert_eq!(story(&s).text, "One\u{e011}\nTwo\nThree");
+        assert_eq!(s.doc().unwrap().selection.text.unwrap().focus, "One\u{e011}\n".len());
+        // At the end of a paragraph the break takes the place of its return.
+        let at = story(&s).text.find("\nThree").unwrap();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": at, "focus": at})).unwrap();
+        s.execute("text.insert", &json!({"text": "\u{e002}", "raw": true})).unwrap();
+        let st = story(&s);
+        assert_eq!(st.text, "One\u{e011}\nTwo\u{e002}\nThree");
+        assert_eq!(st.paras.len(), 3);
+        st.check().unwrap();
+        // Typing after the break goes to the next paragraph; deleting the break or its return
+        // removes both.
+        let at = "One\u{e011}".len();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": at, "focus": at})).unwrap();
+        s.execute("text.insert", &json!({"text": "x"})).unwrap();
+        assert_eq!(story(&s).text, "One\u{e011}\nxTwo\u{e002}\nThree");
+        s.execute("text.select", &json!({"story": sid.0, "anchor": at + 1, "focus": at + 1})).unwrap();
+        s.execute("text.delete", &json!({})).unwrap();
+        assert_eq!(story(&s).text, "OnexTwo\u{e002}\nThree");
+        s.execute("text.select", &json!({"story": sid.0, "anchor": "OnexTwo".len(), "focus": "OnexTwo".len()})).unwrap();
+        s.execute("text.delete", &json!({"forward": true})).unwrap();
+        assert_eq!(story(&s).text, "OnexTwoThree");
+    }
+}
+
+#[cfg(test)]
+mod language_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn language_sets_quotes_spelling_and_hyphenation() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": ""})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        s.execute("type.char", &json!({"attrs": {"language": "German: 2006 Reform"}})).unwrap();
+        s.execute("text.insert", &json!({"text": "\"Wort\" ist's"})).unwrap();
+        let text = s.doc().unwrap().doc.stories[&designcraft_doc::StoryId(sid)].text.clone();
+        assert_eq!(text, "\u{201E}Wort\u{201C} ist\u{2019}s");
+        // German words aren't English misspellings.
+        let st = s.execute("spelling.check", &json!({"story": sid})).unwrap();
+        assert!(st.as_array().unwrap().is_empty(), "{st}");
+    }
+
+    #[test]
+    fn cjk_languages_have_their_quotes_and_no_english_rules() {
+        use super::quote_marks;
+        assert_eq!(quote_marks("Chinese: Simplified"), ['\u{201C}', '\u{201D}', '\u{2018}', '\u{2019}']);
+        assert_eq!(quote_marks("Chinese: Traditional"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
+        assert_eq!(quote_marks("Chinese"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
+        assert_eq!(quote_marks("Japanese"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
+        // Other spellings of the language names take the same quotes.
+        assert_eq!(quote_marks("Simplified Chinese"), ['\u{201C}', '\u{201D}', '\u{2018}', '\u{2019}']);
+        assert_eq!(quote_marks("zh_CN"), ['\u{201C}', '\u{201D}', '\u{2018}', '\u{2019}']);
+        assert_eq!(quote_marks("Chinese (Traditional)"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
+        assert_eq!(quote_marks("zh-TW"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
+        assert_eq!(quote_marks("ja_JP"), ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}']);
+        for l in ["Japanese", "Korean", "Chinese", "Chinese: Simplified", "Chinese: Traditional"] {
+            assert!(!designcraft_compose::is_english(l), "{l}: no English hyphenation or spelling");
+        }
+    }
+
+    #[test]
+    fn locale_coded_languages_take_their_quotes_and_rules() {
+        use super::quote_marks;
+        const GERMAN: [char; 4] = ['\u{201E}', '\u{201C}', '\u{201A}', '\u{2018}'];
+        const DUTCH: [char; 4] = ['\u{201E}', '\u{201D}', '\u{201A}', '\u{2019}'];
+        const GUILLEMETS: [char; 4] = ['\u{00AB}', '\u{00BB}', '\u{2039}', '\u{203A}'];
+        const SPANISH: [char; 4] = ['\u{00AB}', '\u{00BB}', '\u{201C}', '\u{201D}'];
+        const ENGLISH: [char; 4] = ['\u{201C}', '\u{201D}', '\u{2018}', '\u{2019}'];
+        const CORNERS: [char; 4] = ['\u{300C}', '\u{300D}', '\u{300E}', '\u{300F}'];
+        for (language, quotes, english) in [
+            ("de_DE_2006", GERMAN, false),
+            ("German: 2006 Reform", GERMAN, false),
+            ("de_CH_2006", GUILLEMETS, false),
+            ("German: Swiss 2006 Reform", GUILLEMETS, false),
+            ("nl_NL_2005", DUTCH, false),
+            ("Dutch: 2005 Reform", DUTCH, false),
+            ("English: USA", ENGLISH, true),
+            ("English: UK", ENGLISH, true),
+            ("en_GB", ENGLISH, true),
+            ("Spanish: Castilian", SPANISH, false),
+            ("es_ES", SPANISH, false),
+            ("French", GUILLEMETS, false),
+            ("fr_FR", GUILLEMETS, false),
+            ("nb_NO", GUILLEMETS, false),
+            ("ja_JP", CORNERS, false),
+            ("[No Language]", ENGLISH, false),
+        ] {
+            assert_eq!(quote_marks(language), quotes, "{language}");
+            assert_eq!(designcraft_compose::is_english(language), english, "{language}");
+        }
+    }
+
+    #[test]
+    fn idml_language_names_keep_their_spelling_and_pick_the_language() {
+        use std::io::Read;
+        // A stand-in for Songti SC (first in the Simplified Chinese chain; the real one when installed).
+        designcraft_fonts::FontDb::global().add_font(designcraft_fonts::testing::font_with("Songti SC", &['直']).unwrap());
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "直"})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 3})).unwrap();
+        s.execute("type.char", &json!({"attrs": {"language": "Simplified Chinese"}})).unwrap();
+        let idml = designcraft_idml::export_idml(&s.doc().unwrap().doc);
+        let mut z = zip::ZipArchive::new(std::io::Cursor::new(idml.clone())).unwrap();
+        let stories: String = (0..z.len())
+            .map(|i| {
+                let mut f = z.by_index(i).unwrap();
+                let mut x = String::new();
+                if f.name().starts_with("Stories/") {
+                    f.read_to_string(&mut x).unwrap();
+                }
+                x
+            })
+            .collect();
+        assert!(stories.contains(r#"AppliedLanguage="$ID/Simplified Chinese""#), "{stories}");
+        // The name comes back as written and sets the text as Simplified Chinese.
+        let mut back = designcraft_idml::import_idml(&idml).unwrap();
+        back.settings.glyph_fallback = true;
+        let st = back.stories.values().find(|st| st.text.contains('直')).unwrap();
+        let (_, base) = back.styles.resolve_para(&st.paras[0]);
+        assert_eq!(back.styles.resolve_char(&base, st.char_format_at(0)).language, "Simplified Chinese");
+        let cs = designcraft_compose::compose_story(&back, st.id, &Default::default());
+        let face = cs.frames[0].lines[0].glyphs.iter().find(|g| g.byte == 0).unwrap().face;
+        assert_eq!(face.family, "Songti SC");
+    }
+}
+
+#[cfg(test)]
+mod arabic_tests {
+    use super::*;
+    #[test]
+    fn arabic_story_direction_command_validates_and_supports_undo() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 200], "content": "text", "text": "abc"})).unwrap();
+        let sid = StoryId(r["story"].as_u64().unwrap());
+        let before = s.cache.get(&s.doc().unwrap().doc, sid, None);
+        s.execute("story.setDirection", &json!({"story": sid.0, "direction": "rightToLeft"})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().direction, designcraft_doc::TextDirection::RightToLeft);
+        let after = s.cache.get(&s.doc().unwrap().doc, sid, None);
+        assert!(!std::sync::Arc::ptr_eq(&before, &after));
+        assert!(s.execute("story.setDirection", &json!({"story": sid.0, "direction": "unknown"})).is_err());
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().direction, designcraft_doc::TextDirection::LeftToRight);
+    }
+}
+
+#[cfg(test)]
+mod korean_breaks_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn korean_character_breaks_are_a_paragraph_attribute() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "한국어 문장"})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        s.execute("type.para", &json!({"attrs": {"koreanCharBreaks": true}})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().paras[0].para.korean_char_breaks, Some(true));
+        s.execute("style.paragraph.create", &json!({"name": "Korean", "para": {"koreanCharBreaks": true}})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.styles.para("Korean").unwrap().para.korean_char_breaks, Some(true));
+    }
+}
+
+#[cfg(test)]
+mod reserve_tests {
+    use super::*;
+
+    #[test]
+    fn failed_reservation_rolls_back_the_edit_even_after_local_text_was_removed() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let result = s.execute("frame.create", &json!({"rect":[36,36,300,300],"content":"text","text":"Keep this text."})).unwrap();
+        let sid = StoryId(result["story"].as_u64().unwrap());
+        s.execute("text.select", &json!({"story":sid.0,"anchor":1,"focus":4})).unwrap();
+        let before = s.doc().unwrap().clone();
+        assert!(before.selection.text.is_some_and(|t| !t.range().is_empty()));
+        let journal = s.journal.clone();
+        let error = s
+            .edit(|d, sel| {
+                let st = d.story_mut(sid).unwrap();
+                st.format_chars(5..9, |f| f.over.change = Some(designcraft_doc::ChangeMark::Inserted));
+                let at = crate::cmd::changes::mark_deleted(st, 0..9);
+                assert_eq!(at, 5);
+                assert_eq!(st.text, "Keep  text.");
+                assert_eq!(st.format_after(0).over.change, Some(designcraft_doc::ChangeMark::Deleted));
+                sel.text = None;
+                reserve_command_text(st, usize::MAX)?;
+                ok()
+            })
+            .unwrap_err();
+        assert!(error.to_string().contains("could not reserve text insertion"));
+        let after = s.doc().unwrap();
+        assert!(std::sync::Arc::ptr_eq(&after.doc, &before.doc));
+        assert_eq!(after.selection, before.selection);
+        assert_eq!(after.revision, before.revision);
+        assert_eq!(after.history.undo.len(), before.history.undo.len());
+        assert_eq!(after.history.redo.len(), before.history.redo.len());
+        assert_eq!(s.journal, journal);
+    }
+}
+
+#[cfg(test)]
+mod placeholder_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// Fill with Placeholder Text gives paragraphs of a few sentences, as InDesign's does (it was one
+    /// paragraph, and the filler ran sentences together: "interit.Ovid").
+    #[test]
+    fn placeholder_text_comes_in_paragraphs() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [36, 36, 336, 736], "content": "text", "text": ""})).unwrap();
+        s.execute("type.fillWithPlaceholder", &json!({"frame": r["id"]})).unwrap();
+        let st = s.execute("story.get", &json!({"story": r["story"]})).unwrap();
+        let text = st["text"].as_str().unwrap();
+        let paragraphs: Vec<&str> = text.split('\n').collect();
+        assert!(paragraphs.len() >= 4, "{} paragraphs", paragraphs.len());
+        for p in &paragraphs {
+            assert!(p.ends_with('.') && !p.starts_with(' '), "a paragraph of whole sentences: {p:?}");
+        }
+        assert!(!text.contains(".O") && !text.contains(".L"), "sentences are spaced: {text}");
+        assert!(st["overset"].is_null(), "nothing overset: {}", st["overset"]);
+        assert!(text.len() > 1500, "the frame is filled: {}", text.len());
+    }
+}
diff --git a/crates/engine/src/cmd/text/format.rs b/crates/engine/src/cmd/text/format.rs
new file mode 100644
index 000000000..7e1833c0a
--- /dev/null
+++ b/crates/engine/src/cmd/text/format.rs
@@ -0,0 +1,1075 @@
+use super::asian::bool_param;
+use super::caret::hit_byte_with;
+use super::story::selection_attrs;
+use super::{
+    CellAddr, CharAttrs, ParaAttrs, Result, Session, StoryId, TextSel, Value, bad, compose, floor_char_boundary, id_param, json, ok, point_param,
+};
+
+/// The Eyedropper with text selected: the formatting of the text under `point` in `frame` goes to
+/// the selection, as InDesign's does (character style and overrides on the selected characters,
+/// paragraph style and overrides on their paragraphs).
+pub(super) fn pick_up_format(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "type.pickUpFormat";
+    let frame = id_param(p, "frame").ok_or_else(|| bad(ID, "missing frame"))?;
+    let pt = point_param(p, "point").ok_or_else(|| bad(ID, "missing point"))?;
+    let (sid, b, cell) = hit_byte_with(s, frame, pt, compose::hit_char).ok_or_else(|| bad(ID, "not a text frame"))?;
+    let st = s.doc()?;
+    let sel = st.selection.text.ok_or_else(|| bad(ID, "select the text to format"))?;
+    let src = st.doc.text_story(sid, cell).ok_or(designcraft_doc::DocError::NoStory(sid))?;
+    let b = floor_char_boundary(&src.text, b);
+    // The character under the pointer (at the end of a line, the one before it).
+    let at = if b >= src.text.len() || src.text[b..].starts_with('\n') { b.saturating_sub(1) } else { b };
+    let at = floor_char_boundary(&src.text, at);
+    let chars = src.char_format_at(at).clone();
+    let para = src.paras.get(src.para_at(at)).cloned().ok_or(designcraft_doc::DocError::NoStory(sid))?;
+    let (a, e) = (sel.anchor.min(sel.focus), sel.anchor.max(sel.focus));
+    s.typing_format = None;
+    s.edit(|d, _| {
+        let story = d.text_story_mut(sel.story, sel.cell).ok_or(designcraft_doc::DocError::NoStory(sel.story))?;
+        if e > a {
+            story.format_chars(a..e, |f| *f = chars.clone());
+        }
+        story.format_paras(a..e, |f| {
+            f.style = para.style.clone();
+            f.para = para.para.clone();
+        });
+        Ok(json!({"style": chars.style, "paragraphStyle": para.style}))
+    })
+}
+
+/// Where a formatting command applies: a story (or a table cell's story) and a byte range.
+#[derive(Clone, Debug)]
+pub(crate) struct Target {
+    pub story: StoryId,
+    pub cell: Option<CellAddr>,
+    pub range: std::ops::Range<usize>,
+}
+
+/// Ranges and stories a formatting command applies to: selected table cells (whole cells), the
+/// text selection, or whole stories of the selected text frames.
+pub(crate) fn format_targets(s: &Session) -> Vec<Target> {
+    let Some(st) = s.active() else { return vec![] };
+    if let Some(ts) = st.selection.cells
+        && let Some(t) = st.doc.story(ts.story).and_then(|x| x.tables.get(&ts.table))
+    {
+        let mut v = Vec::new();
+        for (r, c) in t.selected_owners(ts.range) {
+            let len = t.cell(r, c).map_or(0, |x| x.text.len());
+            v.push(Target { story: ts.story, cell: Some(CellAddr { table: ts.table, row: r, col: c }), range: 0..len });
+        }
+        return v;
+    }
+    if let Some(t) = st.selection.text {
+        return vec![Target { story: t.story, cell: t.cell, range: t.range() }];
+    }
+    let mut v: Vec<Target> = Vec::new();
+    for id in &st.selection.items {
+        if let Some(tf) = st.doc.item(*id).and_then(|i| i.text_frame()) {
+            let len = st.doc.story(tf.story).map(|x| x.len()).unwrap_or(0);
+            if !v.iter().any(|t| t.story == tf.story) {
+                v.push(Target { story: tf.story, cell: None, range: 0..len });
+            }
+        }
+    }
+    v
+}
+
+/// Character formatting chosen at a bare caret in text: applied to what is typed there next.
+#[derive(Clone, Debug)]
+pub(crate) struct TypingFormat {
+    doc: u64,
+    at: TextSel,
+    attrs: CharAttrs,
+    /// Overrides removed (`null` in `type.char`).
+    cleared: Vec<String>,
+}
+
+/// The typing format for the active document's caret, if it was chosen at this caret.
+pub(super) fn typing_format(s: &Session) -> Option<&TypingFormat> {
+    let st = s.active()?;
+    let t = st.selection.text?;
+    s.typing_format.as_ref().filter(|f| f.doc == st.uid && f.at.story == t.story && f.at.cell == t.cell && f.at.range() == t.range())
+}
+
+/// Is `flag` on in the character format at the start of the first formatting target?
+pub(super) fn char_flag_on(s: &Session, flag: impl Fn(&CharAttrs) -> Option<bool>) -> bool {
+    format_targets(s).first().is_some_and(|t| {
+        s.doc()
+            .ok()
+            .and_then(|d| d.doc.text_story(t.story, t.cell))
+            .is_some_and(|st| flag(&st.char_format_at(if t.range.is_empty() { t.range.start } else { t.range.start + 1 }).over) == Some(true))
+    })
+}
+
+/// Switch a paragraph attribute of the selected paragraphs: `on`, else the opposite of the
+/// first one's.
+pub(super) fn para_toggle(s: &mut Session, p: &Value, cmd: &str, attr: &str, get: impl Fn(&designcraft_doc::ParaProps) -> bool) -> Result<Value> {
+    let on = match bool_param(p, "on", cmd)? {
+        Some(v) => v,
+        None => !format_targets(s).first().is_some_and(|t| {
+            s.doc().ok().is_some_and(|d| {
+                d.doc
+                    .text_story(t.story, t.cell)
+                    .and_then(|st| st.paras.get(st.para_at(t.range.start)))
+                    .is_some_and(|pf| get(&d.doc.styles.resolve_para(pf).0))
+            })
+        }),
+    };
+    let mut body = serde_json::Map::new();
+    body.insert(attr.to_string(), json!(on));
+    format_paras(s, &Value::Object(body))
+}
+
+/// A character fill must name a swatch of the document.
+pub(crate) fn validate_char_fill(document: &designcraft_doc::Document, attrs: &CharAttrs, command_id: &str) -> Result<()> {
+    validate_char_size(attrs, command_id)?;
+    match &attrs.fill {
+        Some(fill) => crate::cmd::object::known_swatch(document, fill, command_id, "fill"),
+        None => Ok(()),
+    }
+}
+
+/// Type size is 0.1 to 1296 pt, the range this engine already applies to a ruby annotation's
+/// size. Nothing checked it for ordinary text, so `{"size": 0}` set type with no size, a negative
+/// size was accepted as well, and 1e9 pt asked the composer for a line a million times the page.
+pub(crate) fn validate_char_size(attrs: &CharAttrs, command_id: &str) -> Result<()> {
+    match attrs.size {
+        Some(size) if !(MIN_TYPE_SIZE..=MAX_TYPE_SIZE).contains(&size) => {
+            Err(bad(command_id, format!("size {size}: {MIN_TYPE_SIZE} to {MAX_TYPE_SIZE} pt")))
+        }
+        _ => Ok(()),
+    }
+}
+
+/// Type size limits (InDesign's, and the ones `type.ruby` already uses).
+pub(crate) const MIN_TYPE_SIZE: f64 = 0.1;
+
+pub(crate) const MAX_TYPE_SIZE: f64 = 1296.0;
+
+/// Byte `pos` is the hidden paragraph mark of an *empty* paragraph: the only character on that
+/// line, and so the one a line-affecting attribute like leading can land on right away instead of
+/// waiting for the next typed character (otherwise an empty line could never get its own leading).
+fn empty_para_mark(story: &designcraft_doc::Story, pos: usize) -> bool {
+    let ranges = story.para_ranges();
+    ranges.get(story.para_at(pos)).is_some_and(|r| r.start == pos && r.end == pos) && story.text.as_bytes().get(pos) == Some(&b'\n')
+}
+
+pub(crate) fn format_chars(s: &mut Session, attrs: &Value) -> Result<Value> {
+    let mut a = CharAttrs::default();
+    if let Some(o) = attrs.as_object() {
+        for (k, v) in o {
+            a.set_json(k, v).map_err(|e| bad("type.char", e))?;
+        }
+    }
+    validate_char_fill(&s.doc()?.doc, &a, "type.char")?;
+    let cleared: Vec<String> = attrs.as_object().map(|o| o.iter().filter(|(_, v)| v.is_null()).map(|(k, _)| k.clone()).collect()).unwrap_or_default();
+    let targets = format_targets(s);
+    // A caret in text: the format is for the next typing. On an empty paragraph's hidden mark it
+    // also formats the mark right away, since the mark alone sets that line's height; typing there
+    // still needs the typing format, as new text takes the format of the run before the caret
+    // (the previous paragraph's mark).
+    if let [t] = targets.as_slice()
+        && t.range.is_empty()
+        && let Some(at) = s.doc()?.selection.text
+        && let Some(on_mark) = s.doc()?.doc.text_story(t.story, t.cell).filter(|st| !st.is_empty()).map(|st| empty_para_mark(st, t.range.start))
+    {
+        let doc = s.doc()?.uid;
+        let mut f = typing_format(s).cloned().unwrap_or(TypingFormat { doc, at, attrs: CharAttrs::default(), cleared: vec![] });
+        f.attrs.merge(&a);
+        f.cleared.retain(|k| attrs.get(k).is_none_or(|v| v.is_null()) && !cleared.contains(k));
+        f.cleared.extend(cleared.iter().cloned());
+        if on_mark {
+            s.edit(|d, _| {
+                apply_char_attrs(d, &targets, &a, &cleared);
+                ok()
+            })?;
+        }
+        s.typing_format = Some(f);
+        return ok();
+    }
+    s.edit(|d, _| {
+        apply_char_attrs(d, &targets, &a, &cleared);
+        ok()
+    })
+}
+
+/// Kerning spaces a character from the next one, so the pair at a caret is kerned through the
+/// character before it. With no such pair (story or paragraph start, a selection) this is
+/// `type.char`.
+pub(super) fn kern_pair(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "type.kernPair";
+    let kerning = p.get("kerning").ok_or_else(|| bad(ID, "missing `kerning`"))?;
+    let targets = format_targets(s);
+    if let [t] = targets.as_slice()
+        && t.range.is_empty()
+        && s.doc()?.selection.text.is_some()
+        && let Some(start) = s.doc()?.doc.text_story(t.story, t.cell).and_then(|st| pair_start(&st.text, t.range.start))
+    {
+        let mut a = CharAttrs::default();
+        a.set_json("kerning", kerning).map_err(|e| bad(ID, e))?;
+        let cleared = if kerning.is_null() { vec!["kerning".to_string()] } else { vec![] };
+        let pair = Target { story: t.story, cell: t.cell, range: start..t.range.start };
+        // Kerning chosen earlier for typing at this caret would hide the pair's value.
+        if typing_format(s).is_some()
+            && let Some(f) = &mut s.typing_format
+        {
+            f.attrs.kerning = None;
+            f.cleared.retain(|k| k != "kerning");
+        }
+        return s.edit(|d, _| {
+            apply_char_attrs(d, &[pair], &a, &cleared);
+            ok()
+        });
+    }
+    format_chars(s, &json!({ "kerning": kerning }))
+}
+
+/// Byte offset of the character before `pos` when it starts a kerning pair with the character at
+/// `pos`: both exist and neither is a paragraph or line break.
+fn pair_start(text: &str, pos: usize) -> Option<usize> {
+    let is_text = |c: &char| !matches!(*c, '\n' | designcraft_doc::story::FORCED_LINE_BREAK);
+    text.get(pos..)?.chars().next().filter(is_text)?;
+    let c = text.get(..pos)?.chars().next_back().filter(is_text)?;
+    pos.checked_sub(c.len_utf8())
+}
+
+/// Character attributes `a` (and the overrides `cleared` removed) over each target's text.
+pub(crate) fn apply_char_attrs(d: &mut designcraft_doc::Document, targets: &[Target], a: &CharAttrs, cleared: &[String]) {
+    for t in targets {
+        let r = &t.range;
+        let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
+        if r.is_empty() {
+            if st.is_empty() {
+                // An empty story: its one (empty) run is the format typing takes.
+                if let Some(run) = st.chars.first_mut() {
+                    run.format.over.merge(a);
+                    st.rev = st.rev.wrapping_add(1);
+                }
+            } else if empty_para_mark(st, r.start) {
+                // An empty paragraph elsewhere in the story: its hidden paragraph mark is its only
+                // character, and the one that carries line-affecting attributes like leading.
+                st.format_chars(r.start..r.start + 1, |f| {
+                    f.over.merge(a);
+                    for k in cleared {
+                        let _ = f.over.set_json(k, &Value::Null);
+                    }
+                });
+            }
+            continue;
+        }
+        st.format_chars(r.clone(), |f| {
+            f.over.merge(a);
+            for k in cleared {
+                let _ = f.over.set_json(k, &Value::Null);
+            }
+        });
+    }
+}
+
+pub(crate) fn format_paras(s: &mut Session, attrs: &Value) -> Result<Value> {
+    let empty = serde_json::Map::new();
+    let obj = attrs.as_object().unwrap_or(&empty);
+    // A rule object changes only the rule fields it names, so each paragraph gets its own attrs
+    // over its resolved rule; this pass validates them.
+    let mut a = ParaAttrs::default();
+    for (k, v) in obj {
+        a.set_json_over(k, v, &designcraft_doc::ParaProps::default()).map_err(|e| bad("type.para", e))?;
+    }
+    crate::cmd::style::check_grep_styles("type.para", &a)?;
+    // `null` removes the override (back to the style's value).
+    let cleared: Vec<String> = obj.iter().filter(|(_, v)| v.is_null()).map(|(k, _)| k.clone()).collect();
+    let targets = format_targets(s);
+    s.edit(|d, _| {
+        let styles = d.styles.clone();
+        for t in &targets {
+            if let Some(st) = d.text_story_mut(t.story, t.cell) {
+                st.format_paras(t.range.clone(), |p| {
+                    let (current, _) = styles.resolve_para(p);
+                    let mut a = a.clone();
+                    for (k, v) in obj {
+                        let _ = a.set_json_over(k, v, &current);
+                    }
+                    p.para.merge(&a);
+                    for k in &cleared {
+                        let _ = p.para.set_json(k, &Value::Null);
+                    }
+                });
+            }
+        }
+        ok()
+    })
+}
+
+/// Alt+Left/Right in text: kerning at a caret, tracking of a selection, by the Kerning/Tracking
+/// increment.
+pub(super) fn kern_step(s: &mut Session, p: &Value) -> Result<Value> {
+    use designcraft_doc::Kerning;
+    let inc = s.doc()?.doc.settings.kerning_increment;
+    let inc = if inc.is_finite() { inc.clamp(1.0, 1000.0) } else { 20.0 };
+    let amount = match p.get("amount").and_then(Value::as_f64) {
+        Some(a) => a,
+        None => p.get("steps").and_then(Value::as_f64).unwrap_or(1.0) * inc,
+    };
+    if !amount.is_finite() {
+        return Err(bad("type.kernStep", "`amount` must be a number"));
+    }
+    let amount = amount.clamp(-11000.0, 11000.0);
+    // Kerning and tracking range, in 1/1000 em.
+    let clamp = |v: f64| v.clamp(-1000.0, 10000.0);
+    let targets = format_targets(s);
+    s.edit(|d, _| {
+        let styles = d.styles.clone();
+        let mut out = json!({});
+        for t in &targets {
+            let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
+            if t.range.is_empty() {
+                // Manual kerning sits on the character before the caret (it applies after it).
+                let pos = t.range.start;
+                let Some(c) = st.text.get(..pos).and_then(|before| before.chars().next_back()) else { continue };
+                let at = pos - c.len_utf8();
+                let para = st.paras.get(st.para_at(at)).cloned().unwrap_or_default();
+                let current = styles.resolve_char(&styles.resolve_para(&para).1, st.format_after(at)).kerning;
+                // The font's metrics or optical value isn't known here: those start from 0.
+                let v = clamp(if let Kerning::Manual(v) = current { v } else { 0.0 } + amount);
+                st.format_chars(at..pos, |f| f.over.kerning = Some(Kerning::Manual(v)));
+                out = json!({"kerning": v});
+            } else {
+                for (i, pr) in st.para_ranges().into_iter().enumerate() {
+                    let r = pr.start.max(t.range.start)..pr.end.min(t.range.end);
+                    let Some(para) = st.paras.get(i).cloned() else { break };
+                    if r.is_empty() {
+                        continue;
+                    }
+                    let pc = styles.resolve_para(&para).1;
+                    st.format_chars(r, |f| {
+                        let v = clamp(styles.resolve_char(&pc, f).tracking + amount);
+                        f.over.tracking = Some(v);
+                        out = json!({"tracking": v});
+                    });
+                }
+            }
+        }
+        Ok(out)
+    })
+}
+
+pub(super) fn step_size(s: &mut Session, delta: f64) -> Result<Value> {
+    let cur = selection_attrs(s, &json!({}))?;
+    let size = cur["chars"]["size"].as_f64().unwrap_or(12.0);
+    format_chars(s, &json!({"size": (size + delta).clamp(0.1, 1296.0)}))
+}
+
+pub(super) fn break_link(s: &mut Session, p: &Value) -> Result<Value> {
+    use designcraft_doc::{CharFormat, CharProps, ParaProps};
+    let para = match p.get("kind").and_then(Value::as_str).unwrap_or("paragraph") {
+        "paragraph" => true,
+        "character" => false,
+        k => return Err(bad("style.breakLink", format!("unknown kind `{k}`"))),
+    };
+    let targets = format_targets(s);
+    s.edit(|d, _| {
+        let styles = d.styles.clone();
+        for t in &targets {
+            let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
+            let r = t.range.clone();
+            if para {
+                st.format_paras(r, |pf| {
+                    let (pp, pc) = styles.resolve_para(pf);
+                    pf.style = designcraft_doc::styles::NO_PARA_STYLE.into();
+                    pf.para = ParaProps::default().delta(&pp);
+                    pf.chars = CharProps::default().delta(&pc);
+                });
+            } else {
+                let ranges = st.para_ranges();
+                for (pi, pr) in ranges.into_iter().enumerate() {
+                    let (a, b) = (pr.start.max(r.start), pr.end.min(r.end));
+                    if a >= b {
+                        continue;
+                    }
+                    let (_, pc) = styles.resolve_para(&st.paras[pi]);
+                    st.format_chars(a..b, |f| {
+                        let cp = styles.resolve_char(&pc, f);
+                        *f = CharFormat { style: designcraft_doc::story::NO_CHAR_STYLE.into(), over: pc.delta(&cp) };
+                    });
+                }
+            }
+        }
+        ok()
+    })
+}
+
+/// The first target character, with any pending caret overrides. Keep character-style
+/// inheritance separate from paragraph defaults for style creation from the selection.
+pub(crate) fn effective_char_format(s: &Session, target: &Target) -> Result<designcraft_doc::CharFormat> {
+    let story = s.doc()?.doc.text_story(target.story, target.cell).ok_or(designcraft_doc::DocError::NoStory(target.story))?;
+    let mut format =
+        if target.range.is_empty() { story.insert_format_at(target.range.start) } else { story.format_after(target.range.start) }.clone();
+    if let Some(pending) = typing_format(s)
+        && target.story == pending.at.story
+        && target.cell == pending.at.cell
+        && target.range == pending.at.range()
+    {
+        apply_typing_format(&mut format, pending);
+    }
+    Ok(format)
+}
+
+/// A swatch promoted to a named color keeps any not-yet-inserted text pointing at it.
+pub(crate) fn rename_typing_swatch(s: &mut Session, from: &str, to: &str) {
+    let Some(uid) = s.active().map(|st| st.uid) else { return };
+    if let Some(pending) = &mut s.typing_format
+        && pending.doc == uid
+    {
+        for name in [&mut pending.attrs.fill, &mut pending.attrs.stroke, &mut pending.attrs.underline_color, &mut pending.attrs.strikethrough_color]
+            .into_iter()
+            .flatten()
+        {
+            if name == from {
+                *name = to.to_string();
+            }
+        }
+    }
+}
+
+fn swapped_colors(cp: &designcraft_doc::CharProps) -> CharAttrs {
+    CharAttrs {
+        fill: Some(cp.stroke.clone()),
+        fill_tint: Some(cp.stroke_tint),
+        stroke: Some(cp.fill.clone()),
+        stroke_tint: Some(cp.fill_tint),
+        ..Default::default()
+    }
+}
+
+/// Resolve each paragraph/run before editing: a mixed selection must not take the first run's colors.
+pub(super) fn swap_fill_stroke(s: &mut Session, _p: &Value) -> Result<Value> {
+    const ID: &str = "type.swapFillStroke";
+    let targets = format_targets(s);
+    if let [target] = targets.as_slice()
+        && target.range.is_empty()
+        && s.doc()?.selection.text.is_some()
+    {
+        let st = s.doc()?;
+        let story = st.doc.text_story(target.story, target.cell).ok_or(designcraft_doc::DocError::NoStory(target.story))?;
+        let pf = story.paras.get(story.para_at(target.range.start)).ok_or_else(|| bad(ID, "missing paragraph"))?;
+        let (_, base) = st.doc.styles.resolve_para(pf);
+        let cp = st.doc.styles.resolve_char(&base, &effective_char_format(s, target)?);
+        return format_chars(s, &json!({"fill": cp.stroke, "fillTint": cp.stroke_tint, "stroke": cp.fill, "strokeTint": cp.fill_tint}));
+    }
+    let mut edits = Vec::new();
+    let d = &s.doc()?.doc;
+    for target in targets {
+        let story = d.text_story(target.story, target.cell).ok_or(designcraft_doc::DocError::NoStory(target.story))?;
+        if story.is_empty() {
+            let pf = story.paras.first().ok_or_else(|| bad(ID, "missing paragraph"))?;
+            let (_, base) = d.styles.resolve_para(pf);
+            let attrs = swapped_colors(&d.styles.resolve_char(&base, story.char_format_at(0)));
+            validate_char_fill(d, &attrs, ID)?;
+            edits.push((target, attrs));
+            continue;
+        }
+        let mut runs = story.runs().peekable();
+        for (pi, para) in story.para_ranges().into_iter().enumerate() {
+            let start = para.start.max(target.range.start);
+            let end = para.end.saturating_add(1).min(story.len()).min(target.range.end);
+            if start >= end {
+                continue;
+            }
+            let pf = story.paras.get(pi).ok_or_else(|| bad(ID, "missing paragraph"))?;
+            let (_, base) = d.styles.resolve_para(pf);
+            while let Some((range, format)) = runs.peek() {
+                if range.end <= start {
+                    runs.next();
+                    continue;
+                }
+                if range.start >= end {
+                    break;
+                }
+                let attrs = swapped_colors(&d.styles.resolve_char(&base, format));
+                validate_char_fill(d, &attrs, ID)?;
+                edits.push((Target { range: start.max(range.start)..end.min(range.end), ..target.clone() }, attrs));
+                if range.end > end {
+                    break;
+                }
+                runs.next();
+            }
+        }
+    }
+    s.edit(|d, _| {
+        for (target, attrs) in &edits {
+            apply_char_attrs(d, std::slice::from_ref(target), attrs, &[]);
+        }
+        ok()
+    })
+}
+
+pub(super) fn apply_typing_format(cf: &mut designcraft_doc::CharFormat, f: &TypingFormat) {
+    cf.over.merge(&f.attrs);
+    for k in &f.cleared {
+        let _ = cf.over.set_json(k, &Value::Null);
+    }
+}
+
+/// Bold (`bold`) or italic from the font family (style linking), per run of the selection: on or
+/// off as asked, else the opposite of the first selected character.
+pub(super) fn link_style(s: &mut Session, p: &Value, bold: bool) -> Result<Value> {
+    let id = if bold { "type.bold" } else { "type.italic" };
+    let cur = selection_attrs(s, &json!({}))?;
+    let family = cur["chars"]["fontFamily"].as_str().unwrap_or_default().to_string();
+    let style = cur["chars"]["fontStyle"].as_str().unwrap_or_default().to_string();
+    // The document's own fonts count too.
+    let db = designcraft_fonts::FontDb::global().scoped(s.doc()?.doc.font_scope);
+    let (weight, italic) = db.traits_of(&family, &style);
+    let on = p.get("on").and_then(Value::as_bool).unwrap_or(if bold { weight < 650.0 } else { !italic });
+    let (want_bold, want_italic) = if bold { (Some(on), None) } else { (None, Some(on)) };
+    let targets = format_targets(s);
+    // A caret: the linked style of the format there, for the next typing.
+    if let [t] = targets.as_slice()
+        && t.range.is_empty()
+    {
+        let linked = db.linked_style(&family, &style, want_bold, want_italic).ok_or_else(|| bad(id, format!("{family} has no style for that")))?;
+        format_chars(s, &json!({"fontStyle": linked}))?;
+        return Ok(json!({"on": on, "fontStyle": linked}));
+    }
+    let mut changed = 0;
+    let r = s.edit(|d, _| {
+        let styles = d.styles.clone();
+        for t in &targets {
+            let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
+            for (pi, pr) in st.para_ranges().into_iter().enumerate() {
+                let (a, b) = (pr.start.max(t.range.start), pr.end.min(t.range.end));
+                if a >= b {
+                    continue;
+                }
+                let Some(pf) = st.paras.get(pi) else { continue };
+                let (_, pc) = styles.resolve_para(pf);
+                st.format_chars(a..b, |f| {
+                    let cp = styles.resolve_char(&pc, f);
+                    if let Some(linked) = db.linked_style(&cp.font_family, &cp.font_style, want_bold, want_italic)
+                        && linked != cp.font_style
+                    {
+                        f.over.font_style = Some(linked);
+                        changed += 1;
+                    }
+                });
+            }
+        }
+        // No undo step for nothing.
+        if changed == 0 {
+            return Err(bad(id, "nothing to change"));
+        }
+        ok()
+    });
+    r?;
+    Ok(json!({"on": on, "changed": changed}))
+}
+
+pub(crate) fn format_targets_pub(s: &Session) -> Vec<Target> {
+    format_targets(s)
+}
+
+#[cfg(test)]
+mod nested_style_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn nested_and_grep_styles_colour_the_text() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Lead", "chars": {"fill": "C=100 M=0 Y=0 K=0"}})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Num", "chars": {"fill": "C=0 M=100 Y=0 K=0"}})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Opening words then 2026 here"})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 3})).unwrap();
+        s.execute(
+            "type.para",
+            &json!({"attrs": {
+                "nestedStyles": [{"style": "Lead", "through": true, "count": 2, "until": {"kind": "words"}}],
+                "grepStyles": [{"style": "Num", "pattern": "\\d+"}]
+            }}),
+        )
+        .unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        let cs = designcraft_compose::compose_story(&d, designcraft_doc::StoryId(sid), &Default::default());
+        let text = &d.story(designcraft_doc::StoryId(sid)).unwrap().text;
+        let fill_at = |byte: usize| {
+            let g = cs.frames[0].lines.iter().flat_map(|l| &l.glyphs).find(|g| g.byte == byte).unwrap();
+            cs.styles[g.style as usize].fill.clone()
+        };
+        assert_eq!(fill_at(0), "C=100 M=0 Y=0 K=0", "nested: first two words");
+        assert_eq!(fill_at(text.find("words").unwrap()), "C=100 M=0 Y=0 K=0");
+        assert_eq!(fill_at(text.find("then").unwrap()), "[Black]");
+        assert_eq!(fill_at(text.find("2026").unwrap()), "C=0 M=100 Y=0 K=0", "GREP: digits");
+    }
+}
+
+#[cfg(test)]
+mod style_link_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn bold_and_italic_follow_the_family_and_toggle() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 500, 200], "content": "text", "text": "plain words here"})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        let style_at = |s: &mut Session, b: usize| {
+            s.execute("text.select", &json!({"story": sid, "anchor": b, "focus": b + 1})).unwrap();
+            s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fontStyle"].as_str().unwrap().to_string()
+        };
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 5})).unwrap();
+        s.execute("type.italic", &json!({})).unwrap();
+        assert_eq!(style_at(&mut s, 0), "Italic");
+        // Bold over italic and plain text: each run takes its own linked style.
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 11})).unwrap();
+        s.execute("type.bold", &json!({})).unwrap();
+        assert_eq!(style_at(&mut s, 0), "Bold Italic");
+        assert_eq!(style_at(&mut s, 7), "Bold");
+        // Again: off, back to each run's regular weight.
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 11})).unwrap();
+        s.execute("type.bold", &json!({})).unwrap();
+        assert_eq!(style_at(&mut s, 0), "Italic");
+        assert_eq!(style_at(&mut s, 7), "Regular");
+        // Nothing to change: an error and no undo step.
+        s.execute("text.select", &json!({"story": sid, "anchor": 6, "focus": 11})).unwrap();
+        let steps = s.doc().unwrap().history.undo.len();
+        assert!(s.execute("type.bold", &json!({"on": false})).is_err());
+        assert_eq!(s.doc().unwrap().history.undo.len(), steps);
+        // At a caret the style is for what is typed next.
+        let end = "plain words here".len();
+        s.execute("text.select", &json!({"story": sid, "anchor": end, "focus": end})).unwrap();
+        s.execute("type.bold", &json!({})).unwrap();
+        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["fontStyle"], "Bold");
+        s.execute("text.insert", &json!({"text": " now"})).unwrap();
+        assert_eq!(style_at(&mut s, end + 1), "Bold");
+        assert_eq!(style_at(&mut s, end - 1), "Regular", "text before the caret is unchanged");
+        // Moving the caret forgets it.
+        s.execute("text.select", &json!({"story": sid, "anchor": 2, "focus": 2})).unwrap();
+        s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 3, "focus": 3})).unwrap();
+        s.execute("text.insert", &json!({"text": "x"})).unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 3, "focus": 4})).unwrap();
+        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["size"], 12.0);
+    }
+}
+
+#[cfg(test)]
+mod text_color_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn unnamed_colours_go_to_text_when_asked() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "colour me", "caret": false})).unwrap();
+        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
+        s.execute("selection.set", &json!({"ids": [fid]})).unwrap();
+        let fill_of_frame = |s: &Session| s.doc().unwrap().doc.item(designcraft_doc::ItemId(fid)).unwrap().fill.swatch.clone();
+        let before = fill_of_frame(&s);
+        let r = s.execute("object.color", &json!({"color": "#ff0000", "text": true})).unwrap();
+        let red = r["swatch"].as_str().unwrap().to_string();
+        assert_eq!(fill_of_frame(&s), before, "the frame keeps its fill");
+        let story = s.doc().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().clone();
+        assert_eq!(story.char_format_at(3).over.fill.as_deref(), Some(red.as_str()));
+        // A text selection takes it without asking.
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 3})).unwrap();
+        let r = s.execute("object.color", &json!({"color": "#00ff00", "target": "stroke"})).unwrap();
+        let story = s.doc().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().clone();
+        assert_eq!(story.format_after(0).over.stroke.as_deref(), r["swatch"].as_str());
+        assert_eq!(s.doc().unwrap().history.undo.len(), 3, "the frame, then one undo step per colour");
+    }
+}
+
+#[cfg(test)]
+mod nested_line_style_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn first_line_takes_the_nested_line_style() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Lead", "chars": {"size": 18}})).unwrap();
+        let text = "The opening line of this paragraph reads larger, and the lines after it return to the body size again.";
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 400], "content": "text", "text": text})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("type.para", &json!({"nestedLineStyles": [{"style": "Lead", "lines": 1}]})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let cs = s.cache.get(&s.doc().unwrap().doc, sid, None);
+        let lines = &cs.frames[0].lines;
+        assert!(lines.len() >= 3);
+        let size_of = |l: usize| cs.styles[lines[l].glyphs.iter().find(|g| g.visible).unwrap().style as usize].size;
+        assert_eq!(size_of(0), 18.0, "the first line");
+        assert!(
+            lines[0].glyphs.iter().filter(|g| g.visible && g.adv > 0.0).all(|g| cs.styles[g.style as usize].size == 18.0),
+            "the whole first line"
+        );
+        assert_eq!(size_of(1), 12.0, "the next lines");
+        let back = designcraft_idml::import_idml(&designcraft_idml::export_idml(&s.doc().unwrap().doc)).unwrap();
+        let st = back.stories.values().find(|st| st.text.starts_with("The opening")).unwrap();
+        let nl = st.paras[0].para.nested_line_styles.clone().unwrap_or_default();
+        assert_eq!((nl.len(), nl.first().map(|n| n.lines)), (1, Some(1)), "IDML AllNestedLineStyles");
+        assert_eq!(nl[0].style, "Lead");
+    }
+}
+
+#[cfg(test)]
+mod rule_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn a_partial_rule_edit_keeps_the_other_fields() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let rule = json!({"on": true, "weight": 3.0, "color": "[Black]", "tint": 0.5, "columnWidth": false, "offset": 4.0, "leftIndent": 6.0, "rightIndent": 2.0});
+        s.execute("style.paragraph.create", &json!({"name": "Ruled", "para": {"ruleBelow": rule}})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 400], "content": "text", "text": "One\nTwo"})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("style.paragraph.apply", &json!({"name": "Ruled"})).unwrap();
+        // Local: only the colour changes; the rest is inherited from the style.
+        s.execute("type.para", &json!({"attrs": {"ruleBelow": {"color": "[Registration]"}}})).unwrap();
+        let attrs = s.execute("type.selectionAttrs", &json!({})).unwrap();
+        let mut want = rule.clone();
+        want["color"] = json!("[Registration]");
+        assert_eq!(attrs["para"]["ruleBelow"], want);
+        assert_eq!(attrs["para"]["ruleAbove"]["on"], false, "the other rule is untouched");
+        // Style: only the weight changes.
+        s.execute("style.paragraph.edit", &json!({"name": "Ruled", "para": {"ruleBelow": {"weight": 1.5}}})).unwrap();
+        let st = s.doc().unwrap().doc.styles.para("Ruled").cloned().unwrap();
+        let below = serde_json::to_value(st.para.rule_below.unwrap()).unwrap();
+        let mut want = rule.clone();
+        want["weight"] = json!(1.5);
+        assert_eq!(below, want);
+        assert!(s.execute("type.para", &json!({"attrs": {"ruleBelow": {"thickness": 2}}})).is_err(), "unknown rule field");
+    }
+
+    #[test]
+    fn rule_above_width_follows_column_or_text() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 400], "content": "text", "text": "Short"})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let mut widths = vec![];
+        for column in [true, false] {
+            s.execute("type.para", &json!({"ruleAbove": {"on": true, "columnWidth": column}})).unwrap();
+            let cs = s.cache.get(&s.doc().unwrap().doc, sid, None);
+            widths.push(cs.frames[0].decos[0].rect.width());
+        }
+        assert!((widths[0] - 328.0).abs() < 1e-6, "column: {widths:?}");
+        assert!(widths[1] < 100.0, "text: {widths:?}");
+    }
+}
+
+#[cfg(test)]
+mod border_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn paragraph_border_and_shading_follow_each_column() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let text = "word ".repeat(80);
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 160], "content": "text", "text": text, "caret": false})).unwrap();
+        s.execute("object.textFrameOptions", &json!({"ids": [r["id"]], "columns": 2})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("type.para", &json!({"borderOn": true, "borderWeights": [2, 1, 2, 1], "borderOffsets": [4, 4, 4, 4], "borderColor": "[Black]", "shadingOn": true, "shadingOffsets": [4, 4, 4, 4]})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let cs = s.cache.get(&s.doc().unwrap().doc, sid, None);
+        let decos = &cs.frames[0].decos;
+        let shading: Vec<_> = decos.iter().filter(|d| d.tint < 0.5).collect();
+        assert_eq!(shading.len(), 2, "one shaded box per column");
+        let edges = decos.len() - shading.len();
+        assert_eq!(edges, 6, "top on the first part, bottom on the last, sides on both");
+        let top = decos.iter().filter(|d| d.tint >= 0.5).map(|d| d.rect).fold(f64::MAX, |a, r| a.min(r.y0));
+        let first_line = &cs.frames[0].lines[0];
+        assert!((top - (first_line.baseline - first_line.ascent - 4.0 - 2.0)).abs() < 1e-6, "offset 4 + weight 2 above the text");
+        let back = designcraft_idml::import_idml(&designcraft_idml::export_idml(&s.doc().unwrap().doc)).unwrap();
+        let p = &back.stories.values().find(|st| st.text.starts_with("word")).unwrap().paras[0].para;
+        assert_eq!(
+            (p.border_on, p.border_weights, p.shading_offsets),
+            (Some(true), Some([2.0, 1.0, 2.0, 1.0]), Some([4.0; 4])),
+            "IDML paragraph border"
+        );
+    }
+}
+
+#[cfg(test)]
+mod gradient_text_tests {
+    use serde_json::json;
+
+    /// Mean red and blue of the ink (pixels whose green is low: red → blue has none) in columns
+    /// `x0..x1`.
+    fn ink(img: &designcraft_render::Rendered, x0: u32, x1: u32) -> (f64, f64) {
+        let (mut r, mut b, mut n) = (0.0, 0.0, 0.0);
+        for x in x0..x1 {
+            for y in 0..img.height {
+                let p = img.pixel(x, y);
+                if p[1] < 100 {
+                    (r, b, n) = (r + p[0] as f64, b + p[2] as f64, n + 1.0);
+                }
+            }
+        }
+        assert!(n > 50.0, "no ink in {x0}..{x1}");
+        (r / n, b / n)
+    }
+
+    /// Red ink at the frame's left, blue at its right.
+    fn check(img: &designcraft_render::Rendered, what: &str) {
+        let (lr, lb) = ink(img, 0, 60);
+        let (rr, rb) = ink(img, 200, 300);
+        assert!(lr > lb + 80.0, "{what}: the left ink is red ({lr:.0}, {lb:.0})");
+        assert!(rb > rr + 80.0, "{what}: the right ink is blue ({rr:.0}, {rb:.0})");
+    }
+
+    #[test]
+    fn a_gradient_on_text_spans_its_frame_on_screen_and_in_pdf() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"width": 300, "height": 120, "facingPages": false, "margins": 0})).unwrap();
+        // A gradient swatch (an off-page object's unnamed one), red → blue.
+        let shape = s.execute("frame.create", &json!({"rect": [-60, 0, -50, 10], "content": "unassigned"})).unwrap()["id"].clone();
+        s.execute("object.gradient", &json!({"ids": [shape], "stops": [{"location": 0, "color": "#ff0000"}, {"location": 100, "color": "#0000ff"}]}))
+            .unwrap();
+        let id = designcraft_doc::ItemId(shape.as_u64().unwrap());
+        let swatch = s.doc().unwrap().doc.item(id).unwrap().fill.swatch.clone();
+        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 120], "content": "text", "text": "IIIIIIIIIIIIIIIIIIIIIIIIIIIIII"})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 30})).unwrap();
+        s.execute("type.char", &json!({"size": 60, "tracking": 0, "fill": swatch})).unwrap();
+        let d = s.doc().unwrap().doc.clone();
+        let mut rr = designcraft_render::Renderer::new();
+        check(&rr.render_page(&d, &s.cache, 0, 1.0, false, &Default::default()).unwrap(), "screen");
+        // The PDF, placed back and drawn: the same gradient.
+        let pdf = designcraft_pdf::export_pdf(&d, &s.cache, &Default::default()).unwrap();
+        let mut p = crate::Session::new();
+        p.execute("file.new", &json!({"width": 300, "height": 120, "facingPages": false})).unwrap();
+        p.execute("file.place", &json!({"base64": crate::cmd::file::base64_encode(&pdf), "name": "text.pdf", "x": 0, "y": 0, "width": 300})).unwrap();
+        let d = p.doc().unwrap().doc.clone();
+        check(&rr.render_page(&d, &p.cache, 0, 1.0, false, &Default::default()).unwrap(), "pdf");
+    }
+
+    /// The columns the red → blue ink spans (black table edges left out).
+    fn ink_span(img: &designcraft_render::Rendered) -> (u32, u32) {
+        let cols: Vec<u32> = (0..img.width)
+            .filter(|&x| {
+                (0..img.height).any(|y| {
+                    let p = img.pixel(x, y);
+                    p[1] < 100 && p[0].max(p[2]) > 100
+                })
+            })
+            .collect();
+        (*cols.first().unwrap(), *cols.last().unwrap())
+    }
+
+    /// Mean red and blue of the red → blue ink in columns `x0..x1`.
+    fn coloured_ink(img: &designcraft_render::Rendered, x0: u32, x1: u32) -> (f64, f64) {
+        let (mut r, mut b, mut n) = (0.0, 0.0, 0.0);
+        for x in x0..x1 {
+            for y in 0..img.height {
+                let p = img.pixel(x, y);
+                if p[1] < 100 && p[0].max(p[2]) > 100 {
+                    (r, b, n) = (r + p[0] as f64, b + p[2] as f64, n + 1.0);
+                }
+            }
+        }
+        assert!(n > 20.0, "no ink in {x0}..{x1}");
+        (r / n, b / n)
+    }
+
+    #[test]
+    fn a_gradient_on_table_cell_text_spans_the_cells_text_in_pdf_as_on_screen() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({"width": 300, "height": 120, "facingPages": false, "margins": 0})).unwrap();
+        let g = s
+            .execute("swatch.create", &json!({"gradient": {"stops": [{"location": 0, "color": "#ff0000"}, {"location": 100, "color": "#0000ff"}]}}))
+            .unwrap()["name"]
+            .as_str()
+            .unwrap()
+            .to_string();
+        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 120], "content": "text", "text": ""})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+        s.execute("table.insert", &json!({"rows": 1, "cols": 3})).unwrap();
+        // A third of the frame's width: the cell's text, red → blue.
+        let mut d: designcraft_doc::Document = (*s.doc().unwrap().doc).clone();
+        let sid = d.stories.values().find(|st| !st.tables.is_empty()).unwrap().id;
+        let t = std::sync::Arc::make_mut(d.story_mut(sid).unwrap().tables.values_mut().next().unwrap());
+        let text = &mut t.cell_mut(0, 0).unwrap().text;
+        text.insert(0, "HHHH");
+        text.format_chars(0..4, |f| {
+            f.over.fill = Some(g.clone());
+            f.over.size = Some(24.0);
+        });
+        let mut rr = designcraft_render::Renderer::new();
+        let cache = designcraft_compose::Cache::new();
+        let screen = rr.render_page(&d, &cache, 0, 1.0, false, &Default::default()).unwrap();
+        let pdf = designcraft_pdf::export_pdf(&d, &cache, &Default::default()).unwrap();
+        let mut p = crate::Session::new();
+        p.execute("file.new", &json!({"width": 300, "height": 120, "facingPages": false})).unwrap();
+        p.execute("file.place", &json!({"base64": crate::cmd::file::base64_encode(&pdf), "name": "cell.pdf", "x": 0, "y": 0, "width": 300})).unwrap();
+        let placed = rr.render_page(&p.doc().unwrap().doc.clone(), &p.cache, 0, 1.0, false, &Default::default()).unwrap();
+        let (x0, x1) = ink_span(&screen);
+        assert!(x1 < 120, "the text stays in the first column: {x0}..{x1}");
+        let q = (x1 - x0) / 4;
+        for (what, img) in [("screen", &screen), ("pdf", &placed)] {
+            let (lr, lb) = coloured_ink(img, x0, x0 + q);
+            let (rr, rb) = coloured_ink(img, x1 + 1 - q, x1 + 1);
+            assert!(lr > lb + 50.0, "{what}: the left ink is red ({lr:.0}, {lb:.0})");
+            assert!(rb > rr + 50.0, "{what}: the right ink is blue ({rr:.0}, {rb:.0})");
+        }
+    }
+}
+
+#[cfg(test)]
+mod kern_pair_tests {
+    use designcraft_doc::{Kerning, StoryId};
+    use serde_json::json;
+
+    use crate::Session;
+
+    fn avatar() -> (Session, StoryId) {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "AVATAR"})).unwrap();
+        (s, StoryId(r["story"].as_u64().unwrap()))
+    }
+
+    fn kern_at(s: &Session, story: StoryId, pos: usize) -> Option<Kerning> {
+        s.doc().unwrap().doc.story(story).unwrap().format_after(pos).over.kerning
+    }
+
+    #[test]
+    fn kerning_at_a_caret_kerns_the_pair_in_one_undo_step() {
+        let (mut s, sid) = avatar();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 1, "focus": 1})).unwrap();
+        let steps = s.doc().unwrap().history.undo.len();
+        s.execute("type.kernPair", &json!({"kerning": {"kind": "manual", "value": -80}})).unwrap();
+        assert_eq!(kern_at(&s, sid, 0), Some(Kerning::Manual(-80.0)), "A, before the caret, spaces the A|V pair");
+        assert_eq!(kern_at(&s, sid, 1), None);
+        assert_eq!(s.doc().unwrap().history.undo.len(), steps + 1);
+        let shown = s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["kerning"].clone();
+        assert_eq!(shown, json!({"kind": "manual", "value": -80.0}), "the caret shows the pair's kerning");
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(kern_at(&s, sid, 0), None);
+    }
+
+    #[test]
+    fn kerning_a_selection_or_at_the_story_start_works_like_type_char() {
+        let (mut s, sid) = avatar();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 2, "focus": 4})).unwrap();
+        s.execute("type.kernPair", &json!({"kerning": {"kind": "manual", "value": 20}})).unwrap();
+        let kerned: Vec<_> = (0..6).map(|i| kern_at(&s, sid, i)).collect();
+        let m = Some(Kerning::Manual(20.0));
+        assert_eq!(kerned, [None, None, m, m, None, None]);
+        // No character before the caret: the value is for the next typing.
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
+        let steps = s.doc().unwrap().history.undo.len();
+        s.execute("type.kernPair", &json!({"kerning": {"kind": "none"}})).unwrap();
+        assert_eq!(s.doc().unwrap().history.undo.len(), steps);
+        assert_eq!(kern_at(&s, sid, 0), None);
+        s.execute("text.insert", &json!({"text": "X"})).unwrap();
+        assert_eq!(kern_at(&s, sid, 0), Some(Kerning::None));
+    }
+
+    #[test]
+    fn kerning_at_the_end_of_a_paragraph_or_story_leaves_the_text_alone() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "AV\nTA"})).unwrap();
+        let sid = StoryId(r["story"].as_u64().unwrap());
+        for caret in [2, 5] {
+            s.execute("text.select", &json!({"story": sid.0, "anchor": caret, "focus": caret})).unwrap();
+            let steps = s.doc().unwrap().history.undo.len();
+            s.execute("type.kernPair", &json!({"kerning": {"kind": "manual", "value": -80}})).unwrap();
+            assert_eq!(s.doc().unwrap().history.undo.len(), steps, "no pair at {caret}: nothing is edited");
+            assert_eq!((kern_at(&s, sid, 1), kern_at(&s, sid, 4)), (None, None), "caret {caret}");
+        }
+    }
+}
+
+#[cfg(test)]
+mod pick_up_format_tests {
+    use designcraft_doc::ItemId;
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// Typefool's video (12:04): select body text, Eyedropper, click the third header: the body
+    /// text takes the header's font, size and paragraph settings. DesignCraft copied the frame's
+    /// fill and stroke instead.
+    #[test]
+    fn the_eyedropper_copies_text_formatting_to_selected_text() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let head = s.execute("frame.create", &json!({"rect": [36, 36, 400, 100], "content": "text", "text": "Innovative Design"})).unwrap();
+        s.execute("text.select", &json!({"story": head["story"], "anchor": 0, "focus": 17})).unwrap();
+        s.execute("type.char", &json!({"attrs": {"fontStyle": "Bold", "size": 18, "tracking": 20}})).unwrap();
+        s.execute("type.para", &json!({"attrs": {"align": "center", "spaceAfter": 6}})).unwrap();
+        let body = s.execute("frame.create", &json!({"rect": [36, 200, 400, 300], "content": "text", "text": "Body copy here.\nSecond."})).unwrap();
+        s.execute("text.select", &json!({"story": body["story"], "anchor": 0, "focus": 4})).unwrap();
+        // Click the header's middle (the frame's text starts at its top left).
+        let r = s.execute("type.pickUpFormat", &json!({"frame": head["id"], "point": [100, 50]})).unwrap();
+        assert!(r.is_object(), "{r}");
+        s.execute("text.select", &json!({"story": body["story"], "anchor": 0, "focus": 4})).unwrap();
+        let a = s.execute("type.selectionAttrs", &json!({})).unwrap();
+        assert_eq!((&a["chars"]["fontStyle"], &a["chars"]["size"], &a["chars"]["tracking"]), (&json!("Bold"), &json!(18.0), &json!(20.0)), "{a}");
+        assert_eq!((&a["para"]["align"], &a["para"]["spaceAfter"]), (&json!("center"), &json!(6.0)));
+        // Only the selected characters change; the second paragraph keeps its own.
+        s.execute("text.select", &json!({"story": body["story"], "anchor": 6, "focus": 10})).unwrap();
+        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["size"], json!(12.0));
+        s.execute("text.select", &json!({"story": body["story"], "anchor": 17, "focus": 20})).unwrap();
+        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["para"]["align"], json!("left"));
+        // Not a text frame, or nothing selected: refused.
+        let rect = s.execute("frame.create", &json!({"rect": [500, 500, 520, 520]})).unwrap()["id"].as_u64().unwrap();
+        assert!(s.execute("type.pickUpFormat", &json!({"frame": rect, "point": [510, 510]})).is_err());
+        let _ = ItemId(rect);
+    }
+}
+
+#[cfg(test)]
+mod size_bounds_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    /// Type size was not checked anywhere: `{"size": 0}` set type with no size at all, a negative
+    /// size was accepted the same way, and 1e9 pt asked the composer for a line a million times
+    /// the height of the page. The range is the one `type.ruby` already applies, 0.1 to 1296 pt.
+    #[test]
+    fn a_type_size_outside_the_range_is_refused() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"pages": 1})).unwrap();
+        let f = s.execute("frame.create", &json!({"rect": [20, 20, 400, 300], "content": "text", "text": "Hello world"})).unwrap();
+        let select = |s: &mut Session| {
+            s.execute("text.select", &json!({"story": f["story"].clone(), "anchor": 0, "focus": 5})).unwrap();
+        };
+        for size in [0.0, -12.0, 0.05, 1297.0, 1e9] {
+            select(&mut s);
+            let e = s.execute("type.char", &json!({"size": size})).expect_err("refused").to_string();
+            assert!(e.contains("0.1 to 1296 pt"), "{size}: {e}");
+        }
+        // The sizes in range still apply, including the ends.
+        for size in [0.1, 12.0, 1296.0] {
+            select(&mut s);
+            s.execute("type.char", &json!({"size": size})).unwrap_or_else(|e| panic!("{size}: {e}"));
+            assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["chars"]["size"].as_f64(), Some(size));
+        }
+        // And the styles that carry character attributes are checked the same way.
+        for (command, params) in [
+            ("style.character.create", json!({"name": "Tiny", "chars": {"size": 0}})),
+            ("style.paragraph.create", json!({"name": "Huge", "chars": {"size": 2000}})),
+        ] {
+            let e = s.execute(command, &params).expect_err("refused").to_string();
+            assert!(e.contains("0.1 to 1296 pt"), "{command}: {e}");
+        }
+    }
+}
diff --git a/crates/engine/src/cmd/text/opentype.rs b/crates/engine/src/cmd/text/opentype.rs
new file mode 100644
index 000000000..f918c1cfe
--- /dev/null
+++ b/crates/engine/src/cmd/text/opentype.rs
@@ -0,0 +1,425 @@
+use super::format::{Target, format_chars, format_targets};
+use super::story::selection_attrs;
+#[cfg(test)]
+use super::story::{SELECTED_TEXT_CHARS, selected_text_preview};
+use super::{Result, Session, Value, bad, json, ok};
+
+pub(super) fn open_type(s: &mut Session, p: &Value) -> Result<Value> {
+    use designcraft_doc::otf;
+    let cur = selection_attrs(s, &json!({}))?;
+    let mut list: Vec<String> =
+        cur["chars"]["otfFeatures"].as_array().map(|a| a.iter().filter_map(|v| v.as_str().map(str::to_string)).collect()).unwrap_or_default();
+    if let Some(tag) = p.get("feature").and_then(Value::as_str) {
+        if tag.is_empty() || tag.len() > 4 || !tag.chars().all(|c| c.is_ascii_alphanumeric()) {
+            return Err(bad("type.openType", format!("bad feature tag `{tag}`")));
+        }
+        let on = p.get("on").and_then(Value::as_bool).unwrap_or(!otf::is_on(&list, tag));
+        otf::set(&mut list, tag, on);
+    }
+    if let Some(f) = p.get("figures").and_then(Value::as_str)
+        && !otf::set_figures(&mut list, f)
+    {
+        return Err(bad("type.openType", format!("unknown figure style `{f}`")));
+    }
+    if let Some(sets) = p.get("stylisticSets").and_then(Value::as_array) {
+        let mask = sets.iter().filter_map(Value::as_u64).filter(|n| (1..=20).contains(n)).fold(0u32, |m, n| m | 1 << (n - 1));
+        otf::set_stylistic_sets(&mut list, mask);
+    }
+    format_chars(s, &json!({"otfFeatures": list}))?;
+    Ok(json!({"features": list, "figures": otf::figures(&list)}))
+}
+
+/// One stretch of the selection: its length in bytes, the font it is set in and its features.
+struct FeatureSegment {
+    len: usize,
+    font: (String, String),
+    applied: Vec<String>,
+    ligatures: bool,
+}
+
+/// The OpenType features of the fonts in the selection, with how much of the selection each one is
+/// applied to and how much of it the fonts offer. A caret counts as one byte. `state` is `none`,
+/// `some` or `all`.
+pub(super) fn open_type_features(s: &mut Session, _p: &Value) -> Result<Value> {
+    let st = s.doc()?;
+    let mut segments: Vec<FeatureSegment> = Vec::new();
+    for Target { story: sid, cell, range: r } in format_targets(s) {
+        let Some(story) = st.doc.text_story(sid, cell) else { continue };
+        let covered: Vec<(usize, usize, designcraft_doc::story::CharFormat)> = if r.is_empty() {
+            vec![(r.start, 1, story.format_after(r.start).clone())]
+        } else {
+            story
+                .runs()
+                .filter(|(run, _)| run.start < r.end && run.end > r.start)
+                .map(|(run, f)| (run.start, run.end.min(r.end).saturating_sub(run.start.max(r.start)), f.clone()))
+                .collect()
+        };
+        for (pos, len, cf) in covered {
+            let Some(para) = story.paras.get(story.para_at(pos)) else { continue };
+            let (_, base) = st.doc.styles.resolve_para(para);
+            let cp = st.doc.styles.resolve_char(&base, &cf);
+            segments.push(FeatureSegment { len, font: (cp.font_family, cp.font_style), applied: cp.otf_features, ligatures: cp.ligatures });
+        }
+    }
+    if segments.is_empty() {
+        let (_, base) = st.doc.styles.resolve_para_style(designcraft_doc::story::BASIC_PARAGRAPH);
+        let cp = st.doc.styles.resolve_char(&base, &designcraft_doc::story::CharFormat::default());
+        segments.push(FeatureSegment { len: 1, font: (cp.font_family, cp.font_style), applied: cp.otf_features, ligatures: cp.ligatures });
+    }
+    let db = designcraft_fonts::FontDb::global();
+    let mut fonts: std::collections::BTreeMap<(String, String), designcraft_fonts::FontFeatures> = std::collections::BTreeMap::new();
+    for seg in &segments {
+        fonts.entry(seg.font.clone()).or_insert_with(|| designcraft_fonts::font_features(&db.face(&seg.font.0, &seg.font.1)));
+    }
+    let total: usize = segments.iter().map(|seg| seg.len).sum::<usize>().max(1);
+    let state = |covered: usize| match covered {
+        0 => "none",
+        n if n >= total => "all",
+        _ => "some",
+    };
+    // Bytes the feature is applied to, and bytes whose font offers it.
+    let measure = |tag: &str| {
+        let (mut applied, mut available) = (0, 0);
+        for seg in &segments {
+            // Standard ligatures are the `ligatures` attribute, which shaping reads, unless the
+            // feature list turns `liga` off.
+            let on = designcraft_doc::otf::is_on(&seg.applied, tag) && (tag != "liga" || seg.ligatures);
+            if on {
+                applied += seg.len;
+            }
+            if fonts.get(&seg.font).is_some_and(|f| f.tags.contains(tag)) {
+                available += seg.len;
+            }
+        }
+        (state(applied), state(available))
+    };
+    let tags: std::collections::BTreeSet<String> = fonts.values().flat_map(|f| f.tags.iter().cloned()).collect();
+    let mut features = Vec::new();
+    for tag in tags.iter().filter(|t| !(t.len() == 4 && t.starts_with("ss") && t[2..].parse::<u32>().is_ok())) {
+        let (applied, available) = measure(tag);
+        features.push(json!({"tag": tag, "applied": applied, "available": available}));
+    }
+    // A stylistic set's name is shared when every font that offers it gives it the same name.
+    let mut sets = Vec::new();
+    for set in 1..=20u32 {
+        let tag = format!("ss{set:02}");
+        if !tags.contains(&tag) {
+            continue;
+        }
+        let names: std::collections::BTreeSet<&String> = fonts.values().filter_map(|f| f.stylistic_sets.get(&set)).collect();
+        let name = if names.len() == 1 { names.first().map(ToString::to_string) } else { None };
+        let (applied, available) = measure(&tag);
+        sets.push(json!({"set": set, "tag": tag, "name": name, "applied": applied, "available": available}));
+    }
+    let used: Vec<Value> = fonts.keys().map(|(family, style)| json!({"family": family, "style": style})).collect();
+    Ok(json!({"fonts": used, "features": features, "stylisticSets": sets}))
+}
+
+/// Turns OpenType features on or off across the selected text: `features` maps tags to whether they
+/// are on. Each run keeps its other features, whichever font it is set in, and the change is one
+/// undo step.
+pub(super) fn set_features(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "type.feature";
+    let changes: Vec<(String, bool)> = p
+        .get("features")
+        .and_then(Value::as_object)
+        .ok_or_else(|| bad(ID, "missing features: a map of tags to true or false"))?
+        .iter()
+        .map(|(tag, on)| Ok((tag.clone(), on.as_bool().ok_or_else(|| bad(ID, format!("`{tag}` needs true or false")))?)))
+        .collect::<Result<_>>()?;
+    let targets: Vec<Target> = format_targets(s).into_iter().filter(|t| !t.range.is_empty()).collect();
+    if targets.is_empty() {
+        return Err(bad(ID, "select text"));
+    }
+    let styles = s.doc()?.doc.styles.clone();
+    s.edit(|d, _| {
+        for t in &targets {
+            let Some(st) = d.text_story_mut(t.story, t.cell) else { continue };
+            let runs: Vec<(std::ops::Range<usize>, designcraft_doc::story::CharFormat)> =
+                st.runs().filter(|(run, _)| run.start < t.range.end && run.end > t.range.start).map(|(run, f)| (run.clone(), f.clone())).collect();
+            for (run, format) in runs {
+                let Some(para) = st.paras.get(st.para_at(run.start)).cloned() else { continue };
+                let (_, base) = styles.resolve_para(&para);
+                let mut list = styles.resolve_char(&base, &format).otf_features;
+                for (tag, on) in &changes {
+                    designcraft_doc::otf::set(&mut list, tag, *on);
+                }
+                let range = run.start.max(t.range.start)..run.end.min(t.range.end);
+                st.format_chars(range, |f| f.over.otf_features = Some(list.clone()));
+            }
+        }
+        ok()
+    })
+}
+
+#[cfg(test)]
+mod open_type_tests {
+    use serde_json::json;
+
+    use crate::Session;
+
+    #[test]
+    fn text_selection_stays_on_utf8_boundaries() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [0, 0, 200, 100], "content": "text", "text": "é漢🙂x"})).unwrap();
+        let sid = r["story"].clone();
+        s.execute("text.select", &json!({"story": sid, "anchor": 1, "focus": 4})).unwrap();
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!((t.anchor, t.focus), (0, 2));
+        s.execute("text.select", &json!({"story": sid, "anchor": 4})).unwrap();
+        s.execute("text.delete", &json!({"forward": true})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.story(t.story).unwrap().text, "é🙂x");
+        s.execute("text.select", &json!({"story": sid, "anchor": 2})).unwrap();
+        s.execute("story.setText", &json!({"story": sid, "text": "漢字"})).unwrap();
+        let t = s.doc().unwrap().selection.text.unwrap();
+        assert_eq!((t.anchor, t.focus), (0, 0));
+        s.execute("text.move", &json!({"dir": "right"})).unwrap();
+        assert_eq!(s.doc().unwrap().selection.text.unwrap().focus, 3);
+    }
+
+    #[test]
+    fn replacing_a_range_stays_on_utf8_boundaries() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [0, 0, 200, 100], "content": "text", "text": "é漢🙂x"})).unwrap();
+        let sid = r["story"].clone();
+        let story = designcraft_doc::StoryId(sid.as_u64().unwrap());
+        // Offsets inside 漢 (2..5) and 🙂 (5..9), past the end, or reversed are refused and change nothing.
+        for (start, end) in [(3, 6), (2, 4), (0, 99), (5, 2)] {
+            let r = s.execute("story.replaceRange", &json!({"story": sid, "start": start, "end": end, "text": "字"}));
+            assert!(r.is_err_and(|e| e.to_string().contains("10 bytes")), "{start}..{end}");
+            assert_eq!(s.doc().unwrap().doc.story(story).unwrap().text, "é漢🙂x");
+        }
+        s.execute("story.replaceRange", &json!({"story": sid, "start": 2, "end": 5, "text": "字"})).unwrap();
+        assert_eq!(s.doc().unwrap().doc.story(story).unwrap().text, "é字🙂x");
+        // A caret before 🙂 (byte 5) would land inside it once é (2 bytes) is gone.
+        s.execute("text.select", &json!({"story": sid, "anchor": 5})).unwrap();
+        s.execute("story.replaceRange", &json!({"story": sid, "start": 0, "end": 2, "text": ""})).unwrap();
+        let st = s.doc().unwrap();
+        let t = st.selection.text.unwrap();
+        let text = &st.doc.story(t.story).unwrap().text;
+        assert_eq!(text, "字🙂x");
+        assert!(text.is_char_boundary(t.anchor) && text.is_char_boundary(t.focus), "caret {t:?} in {text:?}");
+        s.execute("text.move", &json!({"dir": "right"})).unwrap();
+    }
+
+    #[test]
+    fn selected_text_preview_stops_at_its_character_budget() {
+        let read = std::cell::Cell::new(0usize);
+        let prefix = ['\t', '\u{2003}', designcraft_doc::OBJECT_MARK];
+        let chars = prefix.into_iter().chain(std::iter::repeat_n('字', 100_000)).inspect(|_| read.set(read.get() + 1));
+        let preview = super::selected_text_preview(chars);
+        assert_eq!(preview, "字".repeat(super::SELECTED_TEXT_CHARS));
+        assert_eq!(read.get(), prefix.len() + super::SELECTED_TEXT_CHARS, "the rest of a large selection is never copied or scanned");
+        assert_eq!(super::selected_text_preview("A\nB".chars()), "A B");
+    }
+
+    #[test]
+    fn selection_attrs_report_the_selected_text() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s
+            .execute(
+                "frame.create",
+                &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Spring issue
+What's new in typography this season, and why it matters to every designer"}),
+            )
+            .unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 13})).unwrap();
+        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["selectedText"], "Spring issue", "on one line, trimmed");
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 13, "focus": 200})).unwrap();
+        let long = s.execute("type.selectionAttrs", &json!({})).unwrap()["selectedText"].as_str().unwrap().to_string();
+        assert!(long.starts_with("What's new") && (55..=60).contains(&long.chars().count()), "the line break skipped, capped: {long}");
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 3, "focus": 3})).unwrap();
+        assert_eq!(s.execute("type.selectionAttrs", &json!({})).unwrap()["selectedText"], "", "a caret selects nothing");
+    }
+
+    #[test]
+    fn open_type_toggles_reach_the_text() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Office 1/2 0"})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 12})).unwrap();
+        let r = s.execute("type.openType", &json!({"feature": "dlig"})).unwrap();
+        assert_eq!(r["features"], json!(["dlig"]));
+        let r = s.execute("type.openType", &json!({"feature": "dlig"})).unwrap();
+        assert_eq!(r["features"], json!([]), "toggles off");
+        let r = s.execute("type.openType", &json!({"figures": "proportionalOldstyle", "stylisticSets": [1, 2]})).unwrap();
+        assert_eq!(r["figures"], "proportionalOldstyle");
+        let a = s.execute("type.selectionAttrs", &json!({})).unwrap();
+        let f: Vec<&str> = a["chars"]["otfFeatures"].as_array().unwrap().iter().filter_map(|v| v.as_str()).collect();
+        assert!(f.contains(&"onum") && f.contains(&"ss02"), "{f:?}");
+        assert!(s.execute("type.openType", &json!({"feature": "bad tag!"})).is_err());
+    }
+
+    #[test]
+    fn break_link_to_paragraph_and_character_styles() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Head", "para": {"spaceBefore": 6}, "chars": {"size": 24}})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Em", "chars": {"fontStyle": "Italic"}})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Title here"})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 10})).unwrap();
+        s.execute("style.paragraph.apply", &json!({"name": "Head"})).unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 5})).unwrap();
+        s.execute("style.character.apply", &json!({"name": "Em"})).unwrap();
+        let before = s.execute("type.selectionAttrs", &json!({})).unwrap();
+        s.execute("style.breakLink", &json!({"kind": "character"})).unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 10})).unwrap();
+        s.execute("style.breakLink", &json!({"kind": "paragraph"})).unwrap();
+        s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 5})).unwrap();
+        let after = s.execute("type.selectionAttrs", &json!({})).unwrap();
+        assert_eq!(after["paragraphStyle"], "[No Paragraph Style]");
+        assert_eq!(after["characterStyle"], "[None]");
+        assert_eq!(after["chars"], before["chars"], "same look");
+        assert_eq!(after["para"], before["para"]);
+    }
+
+    /// Old-style figures shape to other glyphs than the default lining ones (Source Serif 4).
+    #[test]
+    fn oldstyle_figures_change_the_glyphs() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": "2024"})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let gids = |s: &Session| {
+            let d = &s.doc().unwrap().doc;
+            let cs = designcraft_compose::compose_story(d, sid, &Default::default());
+            cs.frames[0].lines[0].glyphs.iter().map(|g| g.gid).collect::<Vec<_>>()
+        };
+        let lining = gids(&s);
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 4})).unwrap();
+        s.execute("type.openType", &json!({"figures": "proportionalOldstyle"})).unwrap();
+        assert_ne!(gids(&s), lining);
+    }
+
+    /// A blank line (an empty paragraph) has no characters to select, but its hidden paragraph
+    /// mark can still take a leading change right away: otherwise there'd be no way to adjust the
+    /// line height of a blank line at all.
+    #[test]
+    fn leading_applies_to_an_empty_lines_hidden_paragraph_mark() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let text = "Para one\n\nPara two";
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": text})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        // The blank line between the two paragraphs: a collapsed caret, since it has no text.
+        let blank = text.find("\n\n").unwrap() + 1;
+        s.execute("text.select", &json!({"story": sid.0, "anchor": blank})).unwrap();
+        s.execute("type.char", &json!({"attrs": {"leading": {"kind": "points", "value": 40.0}}})).unwrap();
+        let st = s.doc().unwrap().doc.story(sid).unwrap();
+        // `char_format_at` resolves a boundary to the *preceding* run (new typing's format), so
+        // check just past the mark's own one-byte run, which the mark alone occupies.
+        assert_eq!(st.char_format_at(blank + 1).over.leading, Some(designcraft_doc::Leading::Points(40.0)));
+        let d = s.doc().unwrap().doc.clone();
+        let cs = designcraft_compose::compose_story(&d, sid, &Default::default());
+        let blank_line = cs.frames[0].lines.iter().find(|l| l.range == (blank..blank)).unwrap();
+        assert_eq!(blank_line.leading, 40.0, "the blank line's own height changed");
+    }
+
+    /// Formatting chosen on a blank line is also what gets typed there, not the format of the
+    /// previous paragraph's mark that new text would otherwise take.
+    #[test]
+    fn text_typed_on_a_blank_line_takes_the_format_set_there() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let text = "Para one\n\nPara two";
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": text})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let blank = text.find("\n\n").unwrap() + 1;
+        s.execute("text.select", &json!({"story": sid.0, "anchor": blank})).unwrap();
+        s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
+        s.execute("text.insert", &json!({"text": "Middle"})).unwrap();
+        let st = s.doc().unwrap().doc.story(sid).unwrap();
+        assert_eq!(st.text, "Para one\nMiddle\nPara two");
+        for b in blank..blank + "Middle\n".len() {
+            assert_eq!(st.format_after(b).over.size, Some(30.0), "byte {b}");
+        }
+        assert_eq!(st.format_after(blank - 1).over.size, None, "the first paragraph's mark keeps its size");
+    }
+
+    /// A blank line keeps its format for typing after the caret has left it: text typed on it
+    /// takes its paragraph mark's format, with no pending typing format.
+    #[test]
+    fn a_blank_lines_mark_format_is_typed_after_the_caret_returns() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let text = "Para one\n\nPara two";
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 300, 200], "content": "text", "text": text})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let blank = text.find("\n\n").unwrap() + 1;
+        s.execute("text.select", &json!({"story": sid.0, "anchor": blank})).unwrap();
+        s.execute("type.char", &json!({"attrs": {"size": 30}})).unwrap();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 2})).unwrap();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": blank})).unwrap();
+        assert!(s.typing_format.is_none());
+        s.execute("text.insert", &json!({"text": "Middle"})).unwrap();
+        let st = s.doc().unwrap().doc.story(sid).unwrap();
+        assert_eq!(st.text, "Para one\nMiddle\nPara two");
+        assert_eq!(st.format_after(blank).over.size, Some(30.0));
+        assert_eq!(st.format_after(blank - 1).over.size, None, "the first paragraph's mark keeps its size");
+        assert_eq!(st.format_after(2).over.size, None);
+    }
+}
+
+#[cfg(test)]
+mod open_type_features_tests {
+    use serde_json::{Value, json};
+
+    use crate::Session;
+
+    fn feature<'a>(v: &'a Value, tag: &str) -> &'a Value {
+        v["features"].as_array().unwrap().iter().find(|f| f["tag"] == tag).unwrap_or(&Value::Null)
+    }
+
+    #[test]
+    fn the_selected_fonts_features_are_listed_with_their_state() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Hello fi"})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 8})).unwrap();
+        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
+        assert_eq!(v["fonts"][0]["family"], "Source Serif 4", "{v}");
+        assert_eq!(feature(&v, "liga")["applied"], "all", "liga is on by default: {v}");
+        assert_eq!(feature(&v, "kern")["available"], "all", "{v}");
+    }
+
+    #[test]
+    fn a_feature_on_part_of_the_selection_is_some_and_on_all_of_it_is_all() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "Hello world"})).unwrap();
+        let story = r["story"].clone();
+        s.execute("text.select", &json!({"story": story, "anchor": 0, "focus": 5})).unwrap();
+        s.execute("type.feature", &json!({"features": {"lnum": true}})).unwrap();
+        s.execute("text.select", &json!({"story": story, "anchor": 0, "focus": 11})).unwrap();
+        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
+        assert_eq!(feature(&v, "lnum")["applied"], "some", "{v}");
+        s.execute("text.select", &json!({"story": story, "anchor": 0, "focus": 5})).unwrap();
+        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
+        assert_eq!(feature(&v, "lnum")["applied"], "all", "{v}");
+        s.execute("type.feature", &json!({"features": {"lnum": false}})).unwrap();
+        s.execute("text.select", &json!({"story": story, "anchor": 0, "focus": 11})).unwrap();
+        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
+        assert_eq!(feature(&v, "lnum")["applied"], "none", "{v}");
+    }
+
+    #[test]
+    fn standard_ligatures_follow_the_ligatures_attribute() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 200], "content": "text", "text": "office"})).unwrap();
+        s.execute("text.select", &json!({"story": r["story"], "anchor": 0, "focus": 6})).unwrap();
+        s.execute("type.char", &json!({"attrs": {"ligatures": false}})).unwrap();
+        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
+        assert_eq!(feature(&v, "liga")["applied"], "none", "Character › Ligatures off: {v}");
+        s.execute("type.char", &json!({"attrs": {"ligatures": true}})).unwrap();
+        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
+        assert_eq!(feature(&v, "liga")["applied"], "all", "{v}");
+        s.execute("type.feature", &json!({"features": {"liga": false}})).unwrap();
+        let v = s.execute("type.openTypeFeatures", &json!({})).unwrap();
+        assert_eq!(feature(&v, "liga")["applied"], "none", "-liga in the feature list: {v}");
+    }
+}
diff --git a/crates/engine/src/cmd/text/story.rs b/crates/engine/src/cmd/text/story.rs
new file mode 100644
index 000000000..e3547f88d
--- /dev/null
+++ b/crates/engine/src/cmd/text/story.rs
@@ -0,0 +1,455 @@
+use super::caret::story_of;
+use super::format::{Target, effective_char_format, format_targets};
+use super::{ItemId, Result, Session, StoryId, Value, bad, bool_or, json};
+
+/// The stories of the text selection, the selected cells and the selected text frames.
+fn selected_stories(s: &Session) -> Result<Vec<StoryId>> {
+    let st = s.doc()?;
+    let mut stories: Vec<StoryId> = st.selection.text.map(|t| t.story).into_iter().chain(st.selection.cells.map(|c| c.story)).collect();
+    stories.dedup();
+    for id in &st.selection.items {
+        if let Some(tf) = st.doc.item(*id).and_then(|i| i.text_frame())
+            && !stories.contains(&tf.story)
+        {
+            stories.push(tf.story);
+        }
+    }
+    Ok(stories)
+}
+
+/// Type ▸ Story: the story-wide options (Optical Margin Alignment and its size).
+pub(super) fn story_options(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "story.options";
+    let on = match p.get("opticalMargin") {
+        None => None,
+        Some(v) => Some(v.as_bool().ok_or_else(|| bad(CMD, "`opticalMargin` must be a bool"))?),
+    };
+    let size = match p.get("opticalMarginSize") {
+        None => None,
+        Some(v) => Some(
+            v.as_f64()
+                .and_then(designcraft_doc::OpticalMargin::clamp_size)
+                .ok_or_else(|| bad(CMD, "`opticalMarginSize` must be a finite number of points"))?,
+        ),
+    };
+    if on.is_none() && size.is_none() {
+        return Err(bad(CMD, "nothing to set: give opticalMargin or opticalMarginSize"));
+    }
+    let explicit = |key| p.get(key).filter(|v| !v.is_null());
+    let stories = if explicit("story").is_some() || explicit("frame").is_some() {
+        // Explicit targets must not silently fall back to the current selection.
+        let doc = &s.doc()?.doc;
+        for key in ["story", "frame"] {
+            if let Some(value) = explicit(key) {
+                let id = value.as_u64().ok_or_else(|| bad(CMD, format!("`{key}` must be an unsigned integer")))?;
+                let sid = if key == "story" {
+                    StoryId(id)
+                } else {
+                    let item = doc.item(ItemId(id)).ok_or_else(|| bad(CMD, format!("no such frame {id}")))?;
+                    item.text_frame().ok_or_else(|| bad(CMD, format!("frame {id} holds no text")))?.story
+                };
+                if doc.story(sid).is_none() {
+                    return Err(bad(CMD, format!("no such story {}", sid.0)));
+                }
+            }
+        }
+        vec![story_of(s, p).ok_or_else(|| bad(CMD, "no such story"))?]
+    } else {
+        selected_stories(s)?
+    };
+    if stories.is_empty() {
+        return Err(bad(CMD, "no story: select text or a text frame, or give story or frame"));
+    }
+    s.edit(|d, _| {
+        for sid in &stories {
+            let st = d.story_mut(*sid).ok_or(designcraft_doc::DocError::NoStory(*sid))?;
+            let mut om = st.optical_margin;
+            om.on = on.unwrap_or(om.on);
+            om.size = size.unwrap_or(om.size);
+            if om != st.optical_margin {
+                st.optical_margin = om;
+                st.rev = st.rev.wrapping_add(1);
+            }
+        }
+        Ok(json!({"stories": stories.len()}))
+    })
+}
+
+/// Type ▸ Story Direction.
+pub(super) fn story_direction(s: &mut Session, p: &Value) -> Result<Value> {
+    let vertical = p.get("vertical").and_then(Value::as_bool).ok_or_else(|| bad("type.storyDirection", "missing vertical"))?;
+    let stories = selected_stories(s)?;
+    s.edit(|d, _| {
+        set_story_direction(d, &stories, vertical);
+        Ok(json!({"stories": stories.len()}))
+    })
+}
+
+/// Set the direction of `stories` (all their frames turn together).
+pub(crate) fn set_story_direction(d: &mut designcraft_doc::Document, stories: &[StoryId], vertical: bool) {
+    for sid in stories {
+        if let Some(st) = d.story_mut(*sid)
+            && st.vertical != vertical
+        {
+            st.vertical = vertical;
+            st.rev = st.rev.wrapping_add(1);
+        }
+    }
+}
+
+/// How much of the selected text `type.selectionAttrs` reports.
+pub(super) const SELECTED_TEXT_CHARS: usize = 60;
+
+pub(super) fn selected_text_preview(chars: impl Iterator<Item = char>) -> String {
+    chars
+        .map(|c| if c.is_control() || c == designcraft_doc::OBJECT_MARK { ' ' } else { c })
+        .skip_while(|c| c.is_whitespace())
+        .take(SELECTED_TEXT_CHARS)
+        .collect()
+}
+
+pub(super) fn selection_attrs(s: &mut Session, p: &Value) -> Result<Value> {
+    let st = s.doc()?;
+    let targets = format_targets(s);
+    let Some(Target { story: sid, cell, range: r }) = targets.first().cloned() else { return Ok(Value::Null) };
+    let story = st.doc.text_story(sid, cell).ok_or(designcraft_doc::DocError::NoStory(sid))?;
+    let pi = story.para_at(r.start);
+    let pf = &story.paras[pi];
+    let (pp, base) = st.doc.styles.resolve_para(pf);
+    let cf = effective_char_format(s, &Target { story: sid, cell, range: r.clone() })?;
+    let cp = st.doc.styles.resolve_char(&base, &cf);
+    let (style_para, style_chars) = st.doc.styles.resolve_para_style(&pf.style);
+    let mut character_base = base.clone();
+    let character_style = st.doc.styles.char_style_attrs(&cf.style);
+    character_base.apply(&character_style);
+    let char_delta = character_base.delta(&cp);
+    let style_keys = character_style.keys();
+    let character_style_overrides = char_delta.keys().iter().filter(|key| style_keys.contains(key)).count();
+    // The selected text (its start, on one line), for previews such as the font menu's.
+    let selected = selected_text_preview(story.text.get(r.start..r.end).unwrap_or_default().chars());
+    let mut out = json!({"story": sid.0, "paragraphStyle": pf.style, "characterStyle": cf.style, "para": pp, "chars": cp,
+        "paraOverrides": style_para.delta(&pp).count() + style_chars.delta(&base).count(),
+        "charOverrides": char_delta.count(), "characterStyleOverrides": character_style_overrides,
+        "selectedText": selected.trim()});
+    let mut stories = selected_stories(s)?;
+    if stories.is_empty() {
+        stories.push(sid);
+    }
+    out["storyOptions"] = story_options_of(&st.doc, &stories);
+    if bool_or(p, "mixed", false) {
+        out["paraMixed"] = json!(mixed_para_attrs(&st.doc, &targets));
+    }
+    Ok(out)
+}
+
+/// The story options of `stories`, as story.options names them; a value that differs between
+/// the stories is null.
+fn story_options_of(doc: &designcraft_doc::Document, stories: &[StoryId]) -> Value {
+    let mut values = stories.iter().filter_map(|sid| doc.story(*sid)).map(|st| st.optical_margin);
+    let Some(first) = values.next() else { return json!({"opticalMargin": null, "opticalMarginSize": null}) };
+    let (mut on, mut size) = (Some(first.on), Some(first.size));
+    for om in values {
+        on = on.filter(|v| *v == om.on);
+        size = size.filter(|v| *v == om.size);
+    }
+    json!({"opticalMargin": on, "opticalMarginSize": size})
+}
+
+/// The paragraph attributes whose resolved values differ across the paragraphs of `targets`.
+fn mixed_para_attrs(doc: &designcraft_doc::Document, targets: &[Target]) -> Vec<String> {
+    let mut first: Option<serde_json::Map<String, Value>> = None;
+    let mut mixed = std::collections::BTreeSet::new();
+    for t in targets {
+        let Some(story) = doc.text_story(t.story, t.cell) else { continue };
+        let a = story.para_at(t.range.start);
+        let b = story.para_at(t.range.end.max(t.range.start));
+        for pf in story.paras.get(a..=b).unwrap_or(&[]) {
+            let Ok(Value::Object(v)) = serde_json::to_value(doc.styles.resolve_para(pf).0) else { continue };
+            match &first {
+                None => first = Some(v),
+                Some(f) => mixed.extend(v.into_iter().filter(|(k, x)| f.get(k) != Some(x)).map(|(k, _)| k)),
+            }
+        }
+    }
+    mixed.into_iter().collect()
+}
+
+#[cfg(test)]
+mod story_options_tests {
+    use super::*;
+
+    #[test]
+    fn malformed_explicit_story_targets_do_not_change_the_selection() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 200], "content": "text", "text": "Selected"})).unwrap();
+        let sid = StoryId(r["story"].as_u64().unwrap());
+        for target in ["story", "frame"] {
+            for invalid in [json!("invalid"), json!(-1), json!(1.5), json!(true), json!({}), json!([]), json!(999_999)] {
+                let mut params = json!({"opticalMargin": true});
+                params[target] = invalid;
+                assert!(s.execute("story.options", &params).is_err(), "{params}");
+                assert!(!story(&s, sid).on, "{params} changed the selected story");
+            }
+        }
+        // Selection fallback still works when neither explicit target is supplied.
+        s.execute("story.options", &json!({"opticalMargin": true})).unwrap();
+        assert!(story(&s, sid).on);
+        s.execute("story.options", &json!({"frame": r["id"], "opticalMargin": false})).unwrap();
+        assert!(!story(&s, sid).on);
+    }
+
+    #[test]
+    fn story_options_treat_null_targets_as_absent_and_validate_both_explicit_ids() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let a = s.execute("frame.create", &json!({"rect": [0, 0, 300, 200], "content": "text", "text": "Explicit"})).unwrap();
+        let b = s.execute("frame.create", &json!({"rect": [0, 300, 300, 500], "content": "text", "text": "Selected"})).unwrap();
+        let aid = StoryId(a["story"].as_u64().unwrap());
+        let bid = StoryId(b["story"].as_u64().unwrap());
+        for targets in [json!({"story": null}), json!({"frame": null}), json!({"story": null, "frame": null})] {
+            let mut p = targets;
+            p["opticalMargin"] = json!(true);
+            s.execute("story.options", &p).unwrap();
+            assert!(story(&s, bid).on);
+            assert!(!story(&s, aid).on);
+            s.execute("edit.undo", &json!({})).unwrap();
+            assert!(!story(&s, bid).on);
+        }
+        for targets in [json!({"story": null, "frame": a["id"]}), json!({"story": a["story"], "frame": null})] {
+            let mut p = targets;
+            p["opticalMargin"] = json!(true);
+            s.execute("story.options", &p).unwrap();
+            assert!(story(&s, aid).on);
+            assert!(!story(&s, bid).on);
+            s.execute("edit.undo", &json!({})).unwrap();
+        }
+        // Even a frame ignored by story precedence must be valid when explicitly supplied.
+        let non_text = s.execute("frame.create", &json!({"rect": [400, 0, 500, 100]})).unwrap();
+        for (targets, message) in [
+            (json!({"frame": 999_999}), "no such frame 999999".to_string()),
+            (json!({"frame": non_text["id"]}), format!("frame {} holds no text", non_text["id"])),
+            (json!({"story": 999_999}), "no such story 999999".to_string()),
+            (json!({"story": a["story"], "frame": 999_999}), "no such frame 999999".to_string()),
+        ] {
+            let mut p = targets;
+            p["opticalMargin"] = json!(true);
+            assert!(s.execute("story.options", &p).unwrap_err().to_string().contains(&message), "{p}: expected {message}");
+            assert!(!story(&s, aid).on);
+            assert!(!story(&s, bid).on);
+        }
+    }
+
+    fn first_x(s: &Session, sid: StoryId) -> f64 {
+        let cs = s.cache.get(&s.doc().unwrap().doc, sid, None);
+        cs.frames[0].lines[0].glyphs[0].x
+    }
+
+    fn story(s: &Session, sid: StoryId) -> designcraft_doc::OpticalMargin {
+        s.doc().unwrap().doc.story(sid).unwrap().optical_margin
+    }
+
+    #[test]
+    fn story_options_set_optical_margin_with_one_undo_step_each() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 200], "content": "text", "text": "“Hung” words."})).unwrap();
+        let sid = StoryId(r["story"].as_u64().unwrap());
+        let flush = first_x(&s, sid);
+        // The selected frame's story.
+        s.execute("story.options", &json!({"opticalMargin": true})).unwrap();
+        assert_eq!(story(&s, sid), designcraft_doc::OpticalMargin { on: true, size: 12.0 });
+        let hung = first_x(&s, sid);
+        assert!(hung < flush - 1.0, "{hung} {flush}");
+        s.execute("story.options", &json!({"story": sid.0, "opticalMarginSize": 24})).unwrap();
+        assert_eq!(story(&s, sid).size, 24.0);
+        assert!(first_x(&s, sid) < hung - 1.0);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(story(&s, sid), designcraft_doc::OpticalMargin { on: true, size: 12.0 });
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert!(!story(&s, sid).on);
+        assert_eq!(first_x(&s, sid), flush);
+        // Hostile sizes.
+        s.execute("story.options", &json!({"story": sid.0, "opticalMarginSize": 1e9})).unwrap();
+        assert_eq!(story(&s, sid).size, designcraft_doc::OpticalMargin::MAX_SIZE);
+        for bad in [json!({"opticalMarginSize": "big"}), json!({"opticalMargin": 1}), json!({}), json!({"story": 999_999, "opticalMargin": true})] {
+            assert!(s.execute("story.options", &bad).is_err(), "{bad}");
+        }
+    }
+
+    #[test]
+    fn ignore_optical_margin_through_type_para_and_paragraph_styles() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [0, 0, 300, 200], "content": "text", "text": "“Hung” words."})).unwrap();
+        let sid = StoryId(r["story"].as_u64().unwrap());
+        let flush = first_x(&s, sid);
+        s.execute("story.options", &json!({"opticalMargin": true})).unwrap();
+        assert!(first_x(&s, sid) < flush - 1.0);
+        let ignored = |s: &Session| s.doc().unwrap().doc.story(sid).unwrap().paras[0].para.ignore_optical_margin;
+        s.execute("type.para", &json!({"attrs": {"ignoreOpticalMargin": true}})).unwrap();
+        assert_eq!(ignored(&s), Some(true));
+        assert_eq!(first_x(&s, sid), flush);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(ignored(&s), None);
+        s.execute("style.paragraph.create", &json!({"name": "Flush", "para": {"ignoreOpticalMargin": true}})).unwrap();
+        let resolved = |s: &Session| s.doc().unwrap().doc.styles.resolve_para_style("Flush").0.ignore_optical_margin;
+        assert!(resolved(&s));
+        s.execute("style.paragraph.edit", &json!({"name": "Flush", "para": {"ignoreOpticalMargin": false}})).unwrap();
+        assert!(!resolved(&s));
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert!(resolved(&s));
+        s.execute("style.paragraph.apply", &json!({"name": "Flush"})).unwrap();
+        assert_eq!(first_x(&s, sid), flush);
+    }
+
+    #[test]
+    fn selection_attrs_report_the_story_options_with_differences_as_null() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let a = s.execute("frame.create", &json!({"rect": [0, 0, 300, 200], "content": "text", "text": "One"})).unwrap();
+        let b = s.execute("frame.create", &json!({"rect": [0, 300, 300, 500], "content": "text", "text": "Two"})).unwrap();
+        let options = |s: &mut Session| s.execute("type.selectionAttrs", &json!({})).unwrap()["storyOptions"].clone();
+        assert_eq!(options(&mut s), json!({"opticalMargin": false, "opticalMarginSize": 12.0}));
+        s.execute("story.options", &json!({"story": b["story"], "opticalMargin": true, "opticalMarginSize": 18})).unwrap();
+        assert_eq!(options(&mut s), json!({"opticalMargin": true, "opticalMarginSize": 18.0}), "the selected frame's story");
+        s.execute("selection.set", &json!({"ids": [a["id"], b["id"]]})).unwrap();
+        assert_eq!(options(&mut s), json!({"opticalMargin": null, "opticalMarginSize": null}));
+        s.execute("story.options", &json!({"opticalMarginSize": 18})).unwrap();
+        assert_eq!(options(&mut s), json!({"opticalMargin": null, "opticalMarginSize": 18.0}));
+    }
+}
+
+#[cfg(test)]
+mod story_direction_tests {
+    use designcraft_doc::{ItemId, StoryId};
+    use serde_json::json;
+
+    use crate::Session;
+
+    fn frame(s: &mut Session, rect: [f64; 4], text: &str, vertical: bool) -> (ItemId, StoryId) {
+        let r = s.execute("frame.create", &json!({"rect": rect, "content": "text", "text": text, "caret": false, "vertical": vertical})).unwrap();
+        (ItemId(r["id"].as_u64().unwrap()), StoryId(r["story"].as_u64().unwrap()))
+    }
+
+    /// Which frames of the story are composed vertically, in thread order.
+    fn composed(s: &Session, sid: StoryId) -> Vec<bool> {
+        s.cache.get(&s.doc().unwrap().doc, sid, None).frames.iter().map(|f| f.vertical).collect()
+    }
+
+    #[test]
+    fn story_direction_turns_every_frame_of_the_story() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let (a, sid) = frame(&mut s, [72.0, 72.0, 200.0, 400.0], "縦書きの文章です。", false);
+        let (b, _) = frame(&mut s, [300.0, 72.0, 428.0, 400.0], "", false);
+        s.edit(|d, _| Ok(d.thread(a, b)?)).unwrap();
+        assert_eq!(composed(&s, sid), [false, false]);
+        // From the second frame selected, through Type ▸ Story Direction.
+        s.execute("selection.set", &json!({"ids": [b.0]})).unwrap();
+        s.execute("type.storyDirection", &json!({"vertical": true})).unwrap();
+        assert_eq!(composed(&s, sid), [true, true]);
+        // From a caret in the text.
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
+        s.execute("type.storyDirection", &json!({"vertical": false})).unwrap();
+        assert_eq!(composed(&s, sid), [false, false]);
+        // The frame option sets the frame's story.
+        s.execute("object.textFrameOptions", &json!({"ids": [a.0], "vertical": true})).unwrap();
+        assert_eq!(composed(&s, sid), [true, true]);
+        // Undo puts it back.
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(composed(&s, sid), [false, false]);
+    }
+
+    #[test]
+    fn a_frame_threaded_onto_a_vertical_story_turns_vertical() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let (a, sid) = frame(&mut s, [72.0, 72.0, 200.0, 400.0], "縦書きの文章です。", true);
+        let (b, _) = frame(&mut s, [300.0, 72.0, 428.0, 400.0], "", false);
+        let c = s.execute("frame.create", &json!({"rect": [450, 72, 550, 400]})).unwrap();
+        let c = ItemId(c["id"].as_u64().unwrap());
+        s.edit(|d, _| {
+            d.thread(a, b)?;
+            Ok(d.thread(b, c)?)
+        })
+        .unwrap();
+        assert_eq!(composed(&s, sid), [true, true, true]);
+    }
+}
+
+#[cfg(test)]
+mod story_query_contract_tests {
+    use serde_json::json;
+    #[test]
+    fn missing_story_errors_but_valid_empty_and_selected_stories_succeed() {
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        assert!(s.execute("story.get", &json!({"story":999})).unwrap_err().to_string().contains("no such story"));
+        let f = s.execute("frame.create", &json!({"rect":[36,36,300,200],"content":"text"})).unwrap();
+        assert_eq!(s.execute("story.get", &json!({"story":f["story"]})).unwrap()["text"], "");
+        assert_eq!(s.execute("story.get", &json!({"frame":f["id"]})).unwrap()["text"], "");
+        s.execute("text.select", &json!({"story":f["story"],"anchor":0})).unwrap();
+        assert_eq!(s.execute("story.get", &json!({})).unwrap()["text"], "");
+    }
+
+    #[test]
+    fn kenten_shatai_auto_tcy_and_grid_settings_take_checked_values() {
+        use designcraft_doc::cjk::CharacterAlignment;
+        use designcraft_doc::cjk_settings::{KentenKind, KentenPosition};
+        let mut s = crate::Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("frame.create", &json!({"rect": [72, 72, 200, 400], "content": "text", "text": "縦書き12年", "vertical": true})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": "縦書き".len()})).unwrap();
+        let chars = |s: &crate::Session| s.doc().unwrap().doc.stories[&sid].char_format_at(1).over.clone();
+        let para = |s: &crate::Session| s.doc().unwrap().doc.stories[&sid].paras[0].para.clone();
+        // Any setting turns kenten on; values are clamped and text is capped.
+        let long = "★".repeat(10_000);
+        s.execute(
+            "type.kenten",
+            &json!({"kind": "custom", "character": long, "size": 1e300, "distance": -1e300, "xScale": 0, "fillTint": 250, "position": "belowLeft"}),
+        )
+        .unwrap();
+        let a = chars(&s);
+        assert_eq!((a.kenten, a.kenten_kind, a.kenten_position), (Some(true), Some(KentenKind::Custom), Some(KentenPosition::BelowLeft)));
+        assert_eq!(a.kenten_character.as_ref().map(|c| c.chars().count()), Some(designcraft_doc::cjk_settings::KENTEN_MARK_MAX_CHARS));
+        assert_eq!(
+            (a.kenten_size, a.kenten_distance, a.kenten_x_scale, a.kenten_fill_tint),
+            (Some(Some(1296.0)), Some(-1296.0), Some(0.01), Some(Some(1.0)))
+        );
+        // Bad values change nothing.
+        for bad in [json!({"kind": "sparkle"}), json!({"size": "big"}), json!({"character": 5}), json!({"on": "yes"}), json!({"overprintFill": 1})] {
+            assert!(s.execute("type.kenten", &bad).is_err(), "{bad}");
+        }
+        assert_eq!(chars(&s), a);
+        s.execute("type.kenten", &json!({"on": false})).unwrap();
+        assert_eq!((chars(&s).kenten, chars(&s).kenten_kind), (Some(false), Some(KentenKind::Custom)), "off keeps the settings");
+        // Shatai.
+        s.execute("type.shatai", &json!({"magnification": 1e9, "angle": -30, "adjustRotation": true})).unwrap();
+        let a = chars(&s);
+        assert_eq!((a.shatai_magnification, a.shatai_angle, a.shatai_adjust_rotation), (Some(90.0), Some(150.0), Some(true)));
+        assert!(s.execute("type.shatai", &json!({})).is_err());
+        assert!(s.execute("type.shatai", &json!({"angle": [45]})).is_err());
+        // Paragraph settings.
+        s.execute("type.autoTateChuYoko", &json!({"digits": 1e12, "includeRoman": true})).unwrap();
+        assert_eq!((para(&s).auto_tcy, para(&s).auto_tcy_include_roman), (Some(designcraft_compose::shape::AUTO_TCY_MAX), Some(true)));
+        s.execute("type.gridSettings", &json!({"alignment": "emCenter", "firstLineOnly": true, "gyoudori": 1e12, "paragraphGyoudori": true}))
+            .unwrap();
+        let p = para(&s);
+        assert_eq!((p.grid_align, p.grid_reference), (Some(designcraft_doc::GridAlign::FirstLineOnly), Some(CharacterAlignment::EmCenter)));
+        assert_eq!((p.grid_gyoudori, p.paragraph_gyoudori), (Some(100), Some(true)));
+        assert!(s.execute("type.gridSettings", &json!({"alignment": "middle"})).is_err());
+        s.execute("type.gridSettings", &json!({"alignment": "none"})).unwrap();
+        assert_eq!(para(&s).grid_align, Some(designcraft_doc::GridAlign::None));
+        s.execute("type.rotateRoman", &json!({})).unwrap();
+        assert_eq!(para(&s).rotate_roman, Some(true));
+        s.execute("type.rotateRoman", &json!({})).unwrap();
+        assert_eq!(para(&s).rotate_roman, Some(false));
+        s.execute("type.romanWordBreak", &json!({"on": true})).unwrap();
+        assert_eq!(para(&s).roman_word_break, Some(true));
+        // The story still composes with every setting at its limit.
+        let cs = designcraft_compose::compose_story(&s.doc().unwrap().doc, sid, &Default::default());
+        assert!(!cs.frames.is_empty());
+    }
+}
diff --git a/crates/engine/src/cmd/variables.rs b/crates/engine/src/cmd/variables.rs
index d2e513430..682ccebde 100644
--- a/crates/engine/src/cmd/variables.rs
+++ b/crates/engine/src/cmd/variables.rs
@@ -73,9 +73,267 @@ pub fn specs() -> Vec<CommandSpec> {
                 s.execute("text.insert", &json!({"text": c.to_string()}))
             }
         ),
+        cmd!(
+            "variables.convertToText",
+            "Convert Variable to Text",
+            ["Type", "Text Variables"],
+            None,
+            "{} — the variable instances in the selected text become plain text of the value each shows on its page; the variables stay defined",
+            has_selected_instance,
+            convert_selection
+        ),
+        cmd!(
+            "variables.convertAllToText",
+            "Convert to Text",
+            [],
+            None,
+            "{name} — every instance of the variable in the document becomes plain text of the value it shows on its page (Text Variables › Convert to Text); the variable stays defined",
+            has_doc,
+            convert_all
+        ),
     ]
 }
 
+/// The selected text holds a variable instance (InDesign: select the variable, then Convert
+/// Variable to Text). The endnote story is rebuilt from the stories' endnotes, so an edit there
+/// would not last.
+fn has_selected_instance(s: &Session) -> std::result::Result<(), String> {
+    has_doc(s)?;
+    let st = s.active().ok_or("no document")?;
+    let t = st.selection.text.ok_or("no text selected")?;
+    let held = st.doc.endnote_story != Some(t.story)
+        && st
+            .doc
+            .text_story(t.story, t.cell)
+            .and_then(|x| x.text.get(t.range()))
+            .is_some_and(|x| x.chars().any(|c| designcraft_doc::vars::var_index(c).is_some()));
+    if held { Ok(()) } else { Err("no text variable selected".into()) }
+}
+
+/// The page story byte `pos` is shown on, which a variable's value depends on: overset text takes
+/// the page of the story's last frame; parent pages and the pasteboard have none.
+fn shown_page(d: &designcraft_doc::Document, cs: &designcraft_compose::ComposedStory, pos: usize) -> Option<usize> {
+    designcraft_compose::vars::page_of(d, cs, pos).or_else(|| cs.frames.last().and_then(|f| d.page_of_item(f.frame)))
+}
+
+/// Values of every variable on the pages asked for, as composition shows them (running headers
+/// included), computed once per page.
+struct PageValues<'a> {
+    doc: &'a designcraft_doc::Document,
+    running: std::sync::Arc<designcraft_compose::vars::RunningIndex>,
+    pages: std::collections::HashMap<Option<usize>, Vec<String>>,
+}
+
+impl PageValues<'_> {
+    fn get(&mut self, i: usize, page: Option<usize>) -> String {
+        let (doc, running) = (self.doc, &self.running);
+        let v = self.pages.entry(page).or_insert_with(|| designcraft_compose::vars::values(doc, page, Some(running)));
+        v.get(i).cloned().unwrap_or_default()
+    }
+}
+
+/// Byte offsets of the variable instances in `range` of `text` (of variable `which`, or any),
+/// with their variable index.
+fn instances(text: &str, range: std::ops::Range<usize>, which: Option<usize>) -> Vec<(usize, usize)> {
+    let Some(t) = text.get(range.clone()) else { return Vec::new() };
+    t.char_indices()
+        .filter_map(|(k, c)| designcraft_doc::vars::var_index(c).filter(|i| which.is_none_or(|w| w == *i)).map(|i| (range.start + k, i)))
+        .collect()
+}
+
+/// Replaces the instances at `at` (byte, variable) in `st` with `value(byte)`, last first so the
+/// earlier offsets hold. Returns the change in length before each replaced byte, in text order.
+fn replace_instances(st: &mut designcraft_doc::Story, at: &[(usize, usize)], value: &dyn Fn(usize) -> String) -> Vec<(usize, isize)> {
+    let mut grown = Vec::new();
+    for &(pos, i) in at.iter().rev() {
+        let len = var_char(i).map_or(0, char::len_utf8);
+        let v = value(pos);
+        st.replace(pos..pos + len, &v);
+        grown.push((pos, v.len() as isize - len as isize));
+    }
+    grown.reverse();
+    grown
+}
+
+/// Moves byte `b` of a story by the growth of the instances replaced before it.
+fn shifted(b: usize, grown: &[(usize, isize)]) -> usize {
+    let d: isize = grown.iter().filter(|(pos, _)| *pos < b).map(|(_, g)| g).sum();
+    b.saturating_add_signed(d)
+}
+
+/// Replaces every instance of variable `i` in `st`, its table cells and its notes with `value`.
+/// Returns the growth of `st`'s own text, as [`replace_instances`].
+fn replace_nested(st: &mut designcraft_doc::Story, i: usize, value: &str, depth: usize) -> Vec<(usize, isize)> {
+    if depth > MAX_DEPTH {
+        return Vec::new();
+    }
+    let at = instances(&st.text, 0..st.text.len(), Some(i));
+    let grown = replace_instances(st, &at, &|_| value.to_string());
+    let mut nested = false;
+    for t in st.tables.values_mut() {
+        if t.cells.iter().any(|c| holds(&c.text, i, depth + 1)) {
+            for c in &mut std::sync::Arc::make_mut(t).cells {
+                replace_nested(&mut c.text, i, value, depth + 1);
+            }
+            nested = true;
+        }
+    }
+    for note in st.notes.iter_mut().chain(st.endnotes.iter_mut()) {
+        if holds(&note.text, i, depth + 1) {
+            replace_nested(&mut std::sync::Arc::make_mut(note).text, i, value, depth + 1);
+            nested = true;
+        }
+    }
+    if nested {
+        st.rev = st.rev.wrapping_add(1);
+    }
+    grown
+}
+
+/// Whether `st` or text nested in it holds an instance of variable `i`.
+fn holds(st: &designcraft_doc::Story, i: usize, depth: usize) -> bool {
+    depth <= MAX_DEPTH
+        && (st.text.chars().any(|c| designcraft_doc::vars::var_index(c) == Some(i))
+            || st.tables.values().any(|t| t.cells.iter().any(|c| holds(&c.text, i, depth + 1)))
+            || st.notes.iter().chain(st.endnotes.iter()).any(|n| holds(&n.text, i, depth + 1)))
+}
+
+/// Byte offset in `st` of the anchor of table `id`.
+fn table_anchor(st: &designcraft_doc::Story, id: u64) -> Option<usize> {
+    let (pi, _) = st.paras.iter().enumerate().find(|(_, p)| p.table == Some(id))?;
+    let r = st.para_ranges().into_iter().nth(pi)?;
+    Some(r.start + st.text.get(r)?.find(designcraft_doc::story::TABLE_ANCHOR)?)
+}
+
+fn convert_selection(s: &mut Session, _: &Value) -> Result<Value> {
+    const ID: &str = "variables.convertToText";
+    let t = s.doc()?.selection.text.ok_or_else(|| bad(ID, "no text selected"))?;
+    let range = t.range();
+    let (at, values) = {
+        let d = &s.doc()?.doc;
+        let st = d.story(t.story).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
+        let text = d.text_story(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
+        // Text in a cell or a footnote is on the page of its table's or note's anchor.
+        let anchor = match t.cell {
+            None => None,
+            Some(c) if c.table == designcraft_doc::FOOTNOTE_TABLE => st.note_anchor(c.row as u64),
+            Some(c) => table_anchor(st, c.table),
+        };
+        let cs = s.cache.get(d, t.story, None);
+        let mut pv = PageValues { doc: d, running: s.cache.running_index(d), pages: Default::default() };
+        let at = instances(&text.text, range.clone(), None);
+        let values: std::collections::HashMap<usize, String> =
+            at.iter().map(|&(pos, i)| (pos, pv.get(i, shown_page(d, &cs, anchor.unwrap_or(pos))))).collect();
+        (at, values)
+    };
+    if at.is_empty() {
+        return Err(bad(ID, "no text variable selected"));
+    }
+    s.edit(|d, sel| {
+        let st = d.text_story_mut(t.story, t.cell).ok_or(designcraft_doc::DocError::NoStory(t.story))?;
+        let grown = replace_instances(st, &at, &|pos| values.get(&pos).cloned().unwrap_or_default());
+        // The converted text stays selected.
+        sel.text = Some(designcraft_doc::TextSel { anchor: range.start, focus: shifted(range.end, &grown), ..t });
+        Ok(json!({"converted": at.len()}))
+    })
+}
+
+/// What converting one story's instances of a variable writes: the value for each instance in
+/// its own text, and for the text of each table (by id), footnote and endnote, the value on the
+/// page of its anchor.
+struct StoryPlan {
+    sid: designcraft_doc::StoryId,
+    own: Vec<(usize, String)>,
+    tables: Vec<(u64, String)>,
+    notes: Vec<String>,
+    endnotes: Vec<String>,
+}
+
+fn convert_all(s: &mut Session, p: &Value) -> Result<Value> {
+    const ID: &str = "variables.convertAllToText";
+    let name = str_param(p, "name").ok_or_else(|| bad(ID, "missing name"))?;
+    let (i, plans) = {
+        let d = &s.doc()?.doc;
+        let i = d.variable(name).ok_or_else(|| bad(ID, format!("no variable `{name}`")))?;
+        let mut pv = PageValues { doc: d, running: s.cache.running_index(d), pages: Default::default() };
+        let mut plans = Vec::new();
+        for (sid, st) in &d.stories {
+            if Some(*sid) == d.endnote_story || !holds(st, i, 0) {
+                continue;
+            }
+            let cs = s.cache.get(d, *sid, None);
+            let mut value = |pos: usize| pv.get(i, shown_page(d, &cs, pos));
+            let own = instances(&st.text, 0..st.text.len(), Some(i)).into_iter().map(|(pos, _)| (pos, value(pos))).collect();
+            let tables = st.tables.keys().map(|id| (*id, table_anchor(st, *id).map(&mut value).unwrap_or_default())).collect();
+            let notes = st.text.match_indices(designcraft_doc::FOOTNOTE_REF).map(|(k, _)| value(k)).collect();
+            let endnotes = st.text.match_indices(designcraft_doc::ENDNOTE_REF).map(|(k, _)| value(k)).collect();
+            plans.push(StoryPlan { sid: *sid, own, tables, notes, endnotes });
+        }
+        (i, plans)
+    };
+    s.edit(|d, sel| {
+        for plan in &plans {
+            convert_plan(d, sel, i, plan)?;
+        }
+        Ok(Value::Null)
+    })
+}
+
+/// Converts one story's instances of variable `i` as planned, keeping the selection in place.
+fn convert_plan(d: &mut designcraft_doc::Document, sel: &mut designcraft_doc::Selection, i: usize, plan: &StoryPlan) -> Result<()> {
+    // A selection in a table cell or a footnote keeps its place in that text: it is
+    // converted first, so the loop below finds nothing left there.
+    if let Some(t) = sel.text.as_mut().filter(|t| t.story == plan.sid)
+        && let Some(c) = t.cell
+    {
+        let value = match c.footnote_id() {
+            Some(id) => d.story(plan.sid).and_then(|st| st.notes.iter().position(|n| n.id == id)).and_then(|k| plan.notes.get(k)),
+            None => plan.tables.iter().find(|(id, _)| *id == c.table).map(|(_, v)| v),
+        };
+        if let Some(v) = value
+            && let Some(text) = d.text_story_mut(plan.sid, Some(c))
+        {
+            let grown = replace_nested(text, i, v, 1);
+            t.anchor = shifted(t.anchor, &grown);
+            t.focus = shifted(t.focus, &grown);
+        }
+    }
+    let st = d.story_mut(plan.sid).ok_or(designcraft_doc::DocError::NoStory(plan.sid))?;
+    let at: Vec<(usize, usize)> = plan.own.iter().map(|(pos, _)| (*pos, i)).collect();
+    let grown = replace_instances(st, &at, &|pos| plan.own.iter().find(|(k, _)| *k == pos).map(|(_, v)| v.clone()).unwrap_or_default());
+    if replace_in_tables_and_notes(st, i, plan) {
+        st.rev = st.rev.wrapping_add(1);
+    }
+    // A selection in the story keeps its place in the text.
+    if let Some(t) = sel.text.as_mut().filter(|t| t.story == plan.sid && t.cell.is_none()) {
+        t.anchor = shifted(t.anchor, &grown);
+        t.focus = shifted(t.focus, &grown);
+    }
+    Ok(())
+}
+
+/// Replaces variable `i` in the tables and foot/endnotes of `st` that hold it. Returns whether any did.
+fn replace_in_tables_and_notes(st: &mut designcraft_doc::Story, i: usize, plan: &StoryPlan) -> bool {
+    let mut nested = false;
+    for (id, v) in &plan.tables {
+        if let Some(t) = st.tables.get_mut(id)
+            && t.cells.iter().any(|c| holds(&c.text, i, 1))
+        {
+            for c in &mut std::sync::Arc::make_mut(t).cells {
+                replace_nested(&mut c.text, i, v, 1);
+            }
+            nested = true;
+        }
+    }
+    for (note, v) in st.notes.iter_mut().zip(&plan.notes).chain(st.endnotes.iter_mut().zip(&plan.endnotes)) {
+        if holds(&note.text, i, 1) {
+            replace_nested(&mut std::sync::Arc::make_mut(note).text, i, v, 1);
+            nested = true;
+        }
+    }
+    nested
+}
+
 /// Nesting limit for tables in cells and notes (hostile documents).
 const MAX_DEPTH: usize = 32;
 
@@ -173,187 +431,4 @@ fn define(s: &mut Session, p: &Value) -> Result<Value> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// A parent-page page-number marker follows Numbering & Section Options: changing a section's
-    /// start number renames its pages without changing their index or the number of sections, and
-    /// the marker composed for a page shows the new name.
-    #[test]
-    fn parent_page_number_follows_section_renumbering() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 3, "facingPages": false})).unwrap();
-        let marker = designcraft_doc::story::PAGE_NUMBER.to_string();
-        let r = s
-            .execute("frame.create", &json!({"spread": {"kind": "parent", "index": 0}, "rect": [72, 30, 500, 60], "content": "text", "text": marker}))
-            .unwrap();
-        let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-        assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, marker);
-        let shown = |s: &Session, page: usize| -> usize {
-            let d = s.doc().unwrap().doc.clone();
-            let cs = s.cache.get(&d, sid, Some(page));
-            cs.frames.iter().flat_map(|f| f.lines.iter()).map(|l| l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0).count()).sum()
-        };
-        assert_eq!(shown(&s, 2), 1, "page 3");
-        s.execute("layout.section", &json!({"page": 1, "startNumber": 100})).unwrap();
-        assert_eq!(s.doc().unwrap().doc.page_name(2), "102");
-        assert_eq!(shown(&s, 2), 3, "page 102 after renumbering");
-    }
-
-    /// A section marker character shows the marker text of the section of the page it is composed
-    /// for: on each document page a parent-page frame is shown on, and in a frame on a document
-    /// page. A section without marker text shows nothing; the parent page itself shows "Section".
-    #[test]
-    fn section_marker_shows_the_pages_section_marker() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 4, "facingPages": false})).unwrap();
-        s.execute("layout.section", &json!({"page": 3, "startNumber": 1, "marker": "Intro"})).unwrap();
-        let marker = designcraft_doc::story::SECTION_MARKER.to_string();
-        let r = s
-            .execute("frame.create", &json!({"spread": {"kind": "parent", "index": 0}, "rect": [72, 30, 500, 60], "content": "text", "text": marker}))
-            .unwrap();
-        let parent = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-        let sp = s.doc().unwrap().doc.page_loc(3).unwrap().0;
-        let r = s.execute("frame.create", &json!({"spread": sp, "rect": [72, 200, 400, 260], "content": "text", "text": marker})).unwrap();
-        let own = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-        let shown = |s: &Session, sid, page: Option<usize>| -> usize {
-            let d = s.doc().unwrap().doc.clone();
-            let cs = s.cache.get(&d, sid, page);
-            cs.frames.iter().flat_map(|f| f.lines.iter()).map(|l| l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0).count()).sum()
-        };
-        assert_eq!(shown(&s, parent, Some(0)), 0, "the first section has no marker");
-        assert_eq!(shown(&s, parent, Some(2)), "Intro".len());
-        assert_eq!(shown(&s, parent, Some(3)), "Intro".len());
-        assert_eq!(shown(&s, own, None), "Intro".len(), "a frame on a document page");
-        assert_eq!(shown(&s, parent, None), "Section".len(), "the parent page itself");
-        // Editing the marker recomposes.
-        s.execute("layout.section", &json!({"page": 3, "marker": "Appendix"})).unwrap();
-        assert_eq!(shown(&s, parent, Some(2)), "Appendix".len());
-        assert_eq!(shown(&s, own, None), "Appendix".len());
-    }
-
-    /// Two sections that both number from 1 repeat page names ("1, 2, 1, 2"). A parent-page running
-    /// header is composed for the page it is shown on, not the first page with that name.
-    #[test]
-    fn running_header_on_parent_page_with_repeated_page_numbers() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 4, "facingPages": false})).unwrap();
-        s.execute("layout.section", &json!({"page": 3, "startNumber": 1})).unwrap();
-        let names: Vec<String> = (0..4).map(|i| s.doc().unwrap().doc.page_name(i)).collect();
-        assert_eq!(names, ["1", "2", "1", "2"]);
-        s.execute("style.paragraph.create", &json!({"name": "Heading"})).ok();
-        // The only heading is on the third page (the second section's page 1).
-        let sp = s.doc().unwrap().doc.page_loc(2).unwrap().0;
-        let r = s.execute("frame.create", &json!({"spread": sp, "rect": [72, 200, 400, 260], "content": "text", "text": "Epsilon"})).unwrap();
-        let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 1})).unwrap();
-        s.execute("style.paragraph.apply", &json!({"name": "Heading"})).unwrap();
-        s.execute("variables.define", &json!({"name": "Chapter Head", "type": "runningHeader", "style": "Heading"})).unwrap();
-        let r = s
-            .execute("frame.create", &json!({"spread": {"kind": "parent", "index": 0}, "rect": [72, 30, 500, 60], "content": "text", "text": ""}))
-            .unwrap();
-        let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
-        s.execute("variables.insert", &json!({"name": "Chapter Head"})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        let shown = |page: usize| -> usize {
-            let cs = s.cache.get(&d, sid, Some(page));
-            cs.frames.iter().flat_map(|f| f.lines.iter()).map(|l| l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0).count()).sum()
-        };
-        assert_eq!(shown(0), 0, "no heading on or before the first page");
-        assert_eq!(shown(2), "Epsilon".len(), "the third page (named 1) shows its own heading");
-        assert_eq!(shown(3), "Epsilon".len(), "the fourth page (named 2) carries it");
-    }
-
-    /// Deleting a variable flattens its instances in table cells too and moves the instances of
-    /// later variables down, so cells keep showing the same text.
-    #[test]
-    fn delete_variable_reaches_table_cells() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("variables.define", &json!({"name": "A", "type": "custom", "text": "Alpha"})).unwrap();
-        let b = s.execute("variables.define", &json!({"name": "B", "type": "custom", "text": "Beta"})).unwrap()["index"].as_u64().unwrap() as usize;
-        let a = s.doc().unwrap().doc.variable("A").unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": ""})).unwrap();
-        let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
-        s.execute("table.insert", &json!({"rows": 1, "cols": 2})).unwrap();
-        let text = format!("{}|{}", var_char(a).unwrap(), var_char(b).unwrap());
-        s.execute("table.setCell", &json!({"row": 0, "col": 0, "text": text})).unwrap();
-        s.execute("variables.delete", &json!({"name": "A"})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let t = d.story(sid).unwrap().tables.values().next().unwrap();
-        let nb = d.variable("B").unwrap();
-        assert_eq!(t.cells[0].text.text, format!("Alpha|{}", var_char(nb).unwrap()));
-    }
-
-    /// Deleting a variable flattens its instances in footnotes and endnotes too and moves the
-    /// instances of later variables down.
-    #[test]
-    fn delete_variable_reaches_notes() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("variables.define", &json!({"name": "A", "type": "custom", "text": "Alpha"})).unwrap();
-        let b = s.execute("variables.define", &json!({"name": "B", "type": "custom", "text": "Beta"})).unwrap()["index"].as_u64().unwrap() as usize;
-        let a = s.doc().unwrap().doc.variable("A").unwrap();
-        let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "x"})).unwrap();
-        let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-        let text = format!("{}|{}", var_char(a).unwrap(), var_char(b).unwrap());
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 1, "focus": 1})).unwrap();
-        s.execute("footnote.insert", &json!({"text": text})).unwrap();
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
-        s.execute("endnote.insert", &json!({"text": text})).unwrap();
-        s.execute("variables.delete", &json!({"name": "A"})).unwrap();
-        let d = &s.doc().unwrap().doc;
-        let st = d.story(sid).unwrap();
-        let want = format!("Alpha|{}", var_char(d.variable("B").unwrap()).unwrap());
-        assert_eq!(st.notes[0].text.text, want);
-        assert_eq!(st.endnotes[0].text.text, want);
-    }
-
-    #[test]
-    fn running_header_on_parent_page_follows_headings() {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"pages": 3, "facingPages": false})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Heading"})).ok();
-        // Headings on pages 1 and 3 (page 2 carries page 1's).
-        for (page, text) in [(0, "Alpha"), (2, "Epsilon")] {
-            let sp = s.doc().unwrap().doc.page_loc(page).unwrap().0;
-            let r = s.execute("frame.create", &json!({"spread": sp, "rect": [72, 200, 400, 260], "content": "text", "text": text})).unwrap();
-            let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
-            s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 1})).unwrap();
-            s.execute("style.paragraph.apply", &json!({"name": "Heading"})).unwrap();
-        }
-        s.execute("variables.define", &json!({"name": "Chapter Head", "type": "runningHeader", "style": "Heading"})).unwrap();
-        s.execute("variables.define", &json!({"name": "Total", "type": "custom", "text": "of "})).unwrap();
-        // A header frame on the parent with "<running header> · <page> / <last page>".
-        let r = s
-            .execute("frame.create", &json!({"spread": {"kind": "parent", "index": 0}, "rect": [72, 30, 500, 60], "content": "text", "text": ""}))
-            .unwrap();
-        let fid = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
-        let sid = s.doc().unwrap().doc.item(fid).unwrap().text_frame().unwrap().story;
-        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
-        s.execute("variables.insert", &json!({"name": "Chapter Head"})).unwrap();
-        s.execute("text.insert", &json!({"text": " · "})).unwrap();
-        s.execute("variables.insert", &json!({"name": "Last Page Number"})).unwrap();
-        let d = s.doc().unwrap().doc.clone();
-        assert!(matches!(d.find(fid).unwrap().spread, designcraft_doc::SpreadRef::Parent(0)));
-        // Visible glyphs of the header composed for each page: "Alpha · 3" vs "Epsilon · 3".
-        let shown = |page: usize| -> usize {
-            let cs = s.cache.get(&d, sid, Some(page));
-            cs.frames.iter().flat_map(|f| f.lines.iter()).map(|l| l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0).count()).sum()
-        };
-        let (p1, p2, p3) = (shown(0), shown(1), shown(2));
-        assert_eq!(p1, p2, "page 2 carries page 1's header");
-        assert_eq!(p3, p1 + 2, "Epsilon is two letters longer than Alpha");
-        let idx = s.cache.running_index(&d);
-        assert_eq!(idx.value("Heading", false, Default::default(), 0), "Alpha");
-        assert_eq!(idx.value("Heading", false, Default::default(), 1), "Alpha");
-        assert_eq!(idx.value("Heading", false, Default::default(), 2), "Epsilon");
-        let list = s.execute("variables.list", &json!({})).unwrap();
-        assert!(list.as_array().unwrap().iter().any(|v| v["name"] == "Last Page Number" && v["value"] == "3"));
-        // Deleting a variable flattens its instances to text.
-        s.execute("variables.delete", &json!({"name": "Last Page Number"})).unwrap();
-        assert!(s.doc().unwrap().doc.story(sid).unwrap().text.ends_with(" · 3"));
-    }
-}
+mod tests;
diff --git a/crates/engine/src/cmd/variables/tests.rs b/crates/engine/src/cmd/variables/tests.rs
new file mode 100644
index 000000000..4a4832c84
--- /dev/null
+++ b/crates/engine/src/cmd/variables/tests.rs
@@ -0,0 +1,356 @@
+use super::*;
+
+/// A parent-page page-number marker follows Numbering & Section Options: changing a section's
+/// start number renames its pages without changing their index or the number of sections, and
+/// the marker composed for a page shows the new name.
+#[test]
+fn parent_page_number_follows_section_renumbering() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 3, "facingPages": false})).unwrap();
+    let marker = designcraft_doc::story::PAGE_NUMBER.to_string();
+    let r = s
+        .execute("frame.create", &json!({"spread": {"kind": "parent", "index": 0}, "rect": [72, 30, 500, 60], "content": "text", "text": marker}))
+        .unwrap();
+    let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+    assert_eq!(s.doc().unwrap().doc.story(sid).unwrap().text, marker);
+    let shown = |s: &Session, page: usize| -> usize {
+        let d = s.doc().unwrap().doc.clone();
+        let cs = s.cache.get(&d, sid, Some(page));
+        cs.frames.iter().flat_map(|f| f.lines.iter()).map(|l| l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0).count()).sum()
+    };
+    assert_eq!(shown(&s, 2), 1, "page 3");
+    s.execute("layout.section", &json!({"page": 1, "startNumber": 100})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.page_name(2), "102");
+    assert_eq!(shown(&s, 2), 3, "page 102 after renumbering");
+}
+
+/// A section marker character shows the marker text of the section of the page it is composed
+/// for: on each document page a parent-page frame is shown on, and in a frame on a document
+/// page. A section without marker text shows nothing; the parent page itself shows "Section".
+#[test]
+fn section_marker_shows_the_pages_section_marker() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 4, "facingPages": false})).unwrap();
+    s.execute("layout.section", &json!({"page": 3, "startNumber": 1, "marker": "Intro"})).unwrap();
+    let marker = designcraft_doc::story::SECTION_MARKER.to_string();
+    let r = s
+        .execute("frame.create", &json!({"spread": {"kind": "parent", "index": 0}, "rect": [72, 30, 500, 60], "content": "text", "text": marker}))
+        .unwrap();
+    let parent = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+    let sp = s.doc().unwrap().doc.page_loc(3).unwrap().0;
+    let r = s.execute("frame.create", &json!({"spread": sp, "rect": [72, 200, 400, 260], "content": "text", "text": marker})).unwrap();
+    let own = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+    let shown = |s: &Session, sid, page: Option<usize>| -> usize {
+        let d = s.doc().unwrap().doc.clone();
+        let cs = s.cache.get(&d, sid, page);
+        cs.frames.iter().flat_map(|f| f.lines.iter()).map(|l| l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0).count()).sum()
+    };
+    assert_eq!(shown(&s, parent, Some(0)), 0, "the first section has no marker");
+    assert_eq!(shown(&s, parent, Some(2)), "Intro".len());
+    assert_eq!(shown(&s, parent, Some(3)), "Intro".len());
+    assert_eq!(shown(&s, own, None), "Intro".len(), "a frame on a document page");
+    assert_eq!(shown(&s, parent, None), "Section".len(), "the parent page itself");
+    // Editing the marker recomposes.
+    s.execute("layout.section", &json!({"page": 3, "marker": "Appendix"})).unwrap();
+    assert_eq!(shown(&s, parent, Some(2)), "Appendix".len());
+    assert_eq!(shown(&s, own, None), "Appendix".len());
+}
+
+/// Two sections that both number from 1 repeat page names ("1, 2, 1, 2"). A parent-page running
+/// header is composed for the page it is shown on, not the first page with that name.
+#[test]
+fn running_header_on_parent_page_with_repeated_page_numbers() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 4, "facingPages": false})).unwrap();
+    s.execute("layout.section", &json!({"page": 3, "startNumber": 1})).unwrap();
+    let names: Vec<String> = (0..4).map(|i| s.doc().unwrap().doc.page_name(i)).collect();
+    assert_eq!(names, ["1", "2", "1", "2"]);
+    s.execute("style.paragraph.create", &json!({"name": "Heading"})).ok();
+    // The only heading is on the third page (the second section's page 1).
+    let sp = s.doc().unwrap().doc.page_loc(2).unwrap().0;
+    let r = s.execute("frame.create", &json!({"spread": sp, "rect": [72, 200, 400, 260], "content": "text", "text": "Epsilon"})).unwrap();
+    let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+    s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 1})).unwrap();
+    s.execute("style.paragraph.apply", &json!({"name": "Heading"})).unwrap();
+    s.execute("variables.define", &json!({"name": "Chapter Head", "type": "runningHeader", "style": "Heading"})).unwrap();
+    let r = s
+        .execute("frame.create", &json!({"spread": {"kind": "parent", "index": 0}, "rect": [72, 30, 500, 60], "content": "text", "text": ""}))
+        .unwrap();
+    let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+    s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
+    s.execute("variables.insert", &json!({"name": "Chapter Head"})).unwrap();
+    let d = s.doc().unwrap().doc.clone();
+    let shown = |page: usize| -> usize {
+        let cs = s.cache.get(&d, sid, Some(page));
+        cs.frames.iter().flat_map(|f| f.lines.iter()).map(|l| l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0).count()).sum()
+    };
+    assert_eq!(shown(0), 0, "no heading on or before the first page");
+    assert_eq!(shown(2), "Epsilon".len(), "the third page (named 1) shows its own heading");
+    assert_eq!(shown(3), "Epsilon".len(), "the fourth page (named 2) carries it");
+}
+
+/// Three pages with "Alpha" in the Heading style on page 1 and "Epsilon" on page 3, a
+/// `Chapter Head` running header on Heading, and a text frame on pages 1 and 3 that each hold
+/// "<head>|<head>" (two instances). Returns the two frames' stories.
+fn running_heads() -> (Session, designcraft_doc::StoryId, designcraft_doc::StoryId) {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 3, "facingPages": false})).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Heading"})).ok();
+    let frame = |s: &mut Session, page: usize, y: f64, text: &str| {
+        let sp = s.doc().unwrap().doc.page_loc(page).unwrap().0;
+        let r = s.execute("frame.create", &json!({"spread": sp, "rect": [72, y, 400, y + 60.0], "content": "text", "text": text})).unwrap();
+        s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story
+    };
+    for (page, text) in [(0, "Alpha"), (2, "Epsilon")] {
+        let sid = frame(&mut s, page, 200.0, text);
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 1})).unwrap();
+        s.execute("style.paragraph.apply", &json!({"name": "Heading"})).unwrap();
+    }
+    s.execute("variables.define", &json!({"name": "Chapter Head", "type": "runningHeader", "style": "Heading"})).unwrap();
+    let c = var_char(s.doc().unwrap().doc.variable("Chapter Head").unwrap()).unwrap();
+    let both = format!("{c}|{c}");
+    let (p1, p3) = (frame(&mut s, 0, 400.0, &both), frame(&mut s, 2, 400.0, &both));
+    (s, p1, p3)
+}
+
+/// Convert Variable to Text turns the selected instance into the value it shows on its own
+/// page (Epsilon on page 3, not page 1's Alpha); the other instance and the variable stay.
+#[test]
+fn convert_variable_to_text_uses_the_instances_page() {
+    let (mut s, p1, p3) = running_heads();
+    let c = var_char(s.doc().unwrap().doc.variable("Chapter Head").unwrap()).unwrap();
+    let second = c.len_utf8() + 1;
+    s.execute("text.select", &json!({"story": p3.0, "anchor": second, "focus": second + c.len_utf8()})).unwrap();
+    s.execute("variables.convertToText", &json!({})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    assert_eq!(d.story(p3).unwrap().text, format!("{c}|Epsilon"), "only the selected instance");
+    assert_eq!(d.story(p1).unwrap().text, format!("{c}|{c}"));
+    assert!(d.variable("Chapter Head").is_some(), "the variable stays defined");
+    let t = s.doc().unwrap().selection.text.unwrap();
+    assert_eq!((t.anchor, t.focus), (second, second + "Epsilon".len()), "the converted text stays selected");
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.story(p3).unwrap().text, format!("{c}|{c}"), "one undo step");
+}
+
+/// The menu item is enabled only for a selection that holds an instance: not a caret, not
+/// text without one.
+#[test]
+fn convert_variable_to_text_needs_a_selected_instance() {
+    let (mut s, p1, _) = running_heads();
+    let c = var_char(s.doc().unwrap().doc.variable("Chapter Head").unwrap()).unwrap();
+    let bar = c.len_utf8();
+    let enabled = |s: &Session| (crate::find_command("variables.convertToText").unwrap().enabled)(s).is_ok();
+    for (anchor, focus) in [(0, 0), (bar, bar + 1)] {
+        s.execute("text.select", &json!({"story": p1.0, "anchor": anchor, "focus": focus})).unwrap();
+        assert!(!enabled(&s), "{anchor}..{focus}");
+    }
+    s.execute("text.select", &json!({"story": p1.0, "anchor": 0, "focus": bar})).unwrap();
+    assert!(enabled(&s));
+}
+
+/// A story threaded from a frame on page 1, which holds only "Lead", to a frame on page 3,
+/// where the caret is left at the end of "Body". A cell's or a note's own byte 0 read in this
+/// story is on page 1, its anchor on page 3.
+fn threaded(s: &mut Session) -> designcraft_doc::StoryId {
+    let sp1 = s.doc().unwrap().doc.page_loc(0).unwrap().0;
+    let sp3 = s.doc().unwrap().doc.page_loc(2).unwrap().0;
+    let r = s.execute("frame.create", &json!({"spread": sp1, "rect": [72, 500, 400, 520], "content": "text", "text": "Lead\nBody"})).unwrap();
+    let from = r["id"].as_u64().unwrap();
+    s.execute("text.thread", &json!({"from": from, "rect": [72, 500, 400, 700], "spread": sp3})).unwrap();
+    let d = s.doc().unwrap().doc.clone();
+    let sid = d.item(designcraft_doc::ItemId(from)).unwrap().text_frame().unwrap().story;
+    let cs = s.cache.get(&d, sid, None);
+    let page = |pos| designcraft_compose::vars::page_of(&d, &cs, pos);
+    assert_eq!((page(0), page("Lead\nB".len())), (Some(0), Some(2)), "Lead on page 1, Body on page 3");
+    s.execute("text.select", &json!({"story": sid.0, "anchor": "Lead\nBody".len(), "focus": "Lead\nBody".len()})).unwrap();
+    sid
+}
+
+/// An instance selected in a table cell becomes the value on the page of the table's anchor.
+#[test]
+fn convert_variable_to_text_in_a_table_cell() {
+    let (mut s, ..) = running_heads();
+    let c = var_char(s.doc().unwrap().doc.variable("Chapter Head").unwrap()).unwrap();
+    let sid = threaded(&mut s);
+    s.execute("table.insert", &json!({"rows": 1, "cols": 1})).unwrap();
+    s.execute("table.setCell", &json!({"row": 0, "col": 0, "text": c.to_string()})).unwrap();
+    let table = *s.doc().unwrap().doc.story(sid).unwrap().tables.keys().next().unwrap();
+    let cell = designcraft_doc::CellAddr { table, row: 0, col: 0 };
+    s.doc_mut().unwrap().selection =
+        designcraft_doc::Selection::text(designcraft_doc::TextSel { story: sid, anchor: 0, focus: c.len_utf8(), frame: None, cell: Some(cell) });
+    s.execute("variables.convertToText", &json!({})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    assert_eq!(d.text_story(sid, Some(cell)).unwrap().text, "Epsilon");
+}
+
+/// An instance selected in a footnote becomes the value on the page of the note's reference.
+#[test]
+fn convert_variable_to_text_in_a_footnote() {
+    let (mut s, ..) = running_heads();
+    let c = var_char(s.doc().unwrap().doc.variable("Chapter Head").unwrap()).unwrap();
+    let sid = threaded(&mut s);
+    s.execute("footnote.insert", &json!({"text": c.to_string()})).unwrap();
+    let id = s.doc().unwrap().doc.story(sid).unwrap().notes[0].id;
+    let note = designcraft_doc::CellAddr::footnote(id);
+    let at = s.doc().unwrap().doc.text_story(sid, Some(note)).unwrap().text.find(c).unwrap();
+    s.doc_mut().unwrap().selection = designcraft_doc::Selection::text(designcraft_doc::TextSel {
+        story: sid,
+        anchor: at,
+        focus: at + c.len_utf8(),
+        frame: None,
+        cell: Some(note),
+    });
+    s.execute("variables.convertToText", &json!({})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    let text = &d.text_story(sid, Some(note)).unwrap().text;
+    assert!(!text.contains(c) && text.ends_with("Epsilon"), "{text:?}");
+}
+
+/// Text Variables › Convert to Text turns every instance of the variable into the value on
+/// its page, in table cells, footnotes and endnotes on the page of their anchor, and keeps the
+/// variable.
+#[test]
+fn convert_all_instances_to_text() {
+    let (mut s, p1, p3) = running_heads();
+    let c = var_char(s.doc().unwrap().doc.variable("Chapter Head").unwrap()).unwrap();
+    let sid = threaded(&mut s);
+    let at_end = |s: &mut Session| {
+        let n = s.doc().unwrap().doc.story(sid).unwrap().len();
+        s.execute("text.select", &json!({"story": sid.0, "anchor": n, "focus": n})).unwrap();
+    };
+    s.execute("footnote.insert", &json!({"text": c.to_string()})).unwrap();
+    at_end(&mut s);
+    s.execute("endnote.insert", &json!({"text": c.to_string()})).unwrap();
+    at_end(&mut s);
+    s.execute("table.insert", &json!({"rows": 1, "cols": 1})).unwrap();
+    s.execute("table.setCell", &json!({"row": 0, "col": 0, "text": c.to_string()})).unwrap();
+    s.execute("variables.convertAllToText", &json!({"name": "Chapter Head"})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    assert_eq!(d.story(p1).unwrap().text, "Alpha|Alpha");
+    assert_eq!(d.story(p3).unwrap().text, "Epsilon|Epsilon");
+    let st = d.story(sid).unwrap();
+    assert_eq!(st.tables.values().next().unwrap().cells[0].text.text, "Epsilon", "table cell");
+    assert!(st.notes[0].text.text.ends_with("Epsilon"), "footnote: {:?}", st.notes[0].text.text);
+    assert!(st.endnotes[0].text.text.ends_with("Epsilon"), "endnote: {:?}", st.endnotes[0].text.text);
+    assert!(d.variable("Chapter Head").is_some(), "the variable stays defined");
+}
+
+/// A caret in a table cell or a footnote after an instance stays after the value Convert to
+/// Text writes there, so typing lands after it.
+#[test]
+fn convert_all_keeps_the_caret_in_a_cell_or_a_footnote() {
+    for footnote in [false, true] {
+        let (mut s, ..) = running_heads();
+        let c = var_char(s.doc().unwrap().doc.variable("Chapter Head").unwrap()).unwrap();
+        let sid = threaded(&mut s);
+        let text = format!("{c}|");
+        let at = if footnote {
+            s.execute("footnote.insert", &json!({"text": text})).unwrap();
+            designcraft_doc::CellAddr::footnote(s.doc().unwrap().doc.story(sid).unwrap().notes[0].id)
+        } else {
+            s.execute("table.insert", &json!({"rows": 1, "cols": 1})).unwrap();
+            s.execute("table.setCell", &json!({"row": 0, "col": 0, "text": text})).unwrap();
+            let table = *s.doc().unwrap().doc.story(sid).unwrap().tables.keys().next().unwrap();
+            designcraft_doc::CellAddr { table, row: 0, col: 0 }
+        };
+        let n = s.doc().unwrap().doc.text_story(sid, Some(at)).unwrap().text.len();
+        s.doc_mut().unwrap().selection =
+            designcraft_doc::Selection::text(designcraft_doc::TextSel { story: sid, anchor: n, focus: n, frame: None, cell: Some(at) });
+        s.execute("variables.convertAllToText", &json!({"name": "Chapter Head"})).unwrap();
+        s.execute("text.insert", &json!({"text": "x"})).unwrap();
+        let text = &s.doc().unwrap().doc.text_story(sid, Some(at)).unwrap().text;
+        assert!(text.ends_with("Epsilon|x"), "footnote {footnote}: {text:?}");
+    }
+}
+
+/// Deleting a variable flattens its instances in table cells too and moves the instances of
+/// later variables down, so cells keep showing the same text.
+#[test]
+fn delete_variable_reaches_table_cells() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("variables.define", &json!({"name": "A", "type": "custom", "text": "Alpha"})).unwrap();
+    let b = s.execute("variables.define", &json!({"name": "B", "type": "custom", "text": "Beta"})).unwrap()["index"].as_u64().unwrap() as usize;
+    let a = s.doc().unwrap().doc.variable("A").unwrap();
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": ""})).unwrap();
+    let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+    s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
+    s.execute("table.insert", &json!({"rows": 1, "cols": 2})).unwrap();
+    let text = format!("{}|{}", var_char(a).unwrap(), var_char(b).unwrap());
+    s.execute("table.setCell", &json!({"row": 0, "col": 0, "text": text})).unwrap();
+    s.execute("variables.delete", &json!({"name": "A"})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    let t = d.story(sid).unwrap().tables.values().next().unwrap();
+    let nb = d.variable("B").unwrap();
+    assert_eq!(t.cells[0].text.text, format!("Alpha|{}", var_char(nb).unwrap()));
+}
+
+/// Deleting a variable flattens its instances in footnotes and endnotes too and moves the
+/// instances of later variables down.
+#[test]
+fn delete_variable_reaches_notes() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("variables.define", &json!({"name": "A", "type": "custom", "text": "Alpha"})).unwrap();
+    let b = s.execute("variables.define", &json!({"name": "B", "type": "custom", "text": "Beta"})).unwrap()["index"].as_u64().unwrap() as usize;
+    let a = s.doc().unwrap().doc.variable("A").unwrap();
+    let r = s.execute("frame.create", &json!({"rect": [72, 72, 400, 300], "content": "text", "text": "x"})).unwrap();
+    let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+    let text = format!("{}|{}", var_char(a).unwrap(), var_char(b).unwrap());
+    s.execute("text.select", &json!({"story": sid.0, "anchor": 1, "focus": 1})).unwrap();
+    s.execute("footnote.insert", &json!({"text": text})).unwrap();
+    s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
+    s.execute("endnote.insert", &json!({"text": text})).unwrap();
+    s.execute("variables.delete", &json!({"name": "A"})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    let st = d.story(sid).unwrap();
+    let want = format!("Alpha|{}", var_char(d.variable("B").unwrap()).unwrap());
+    assert_eq!(st.notes[0].text.text, want);
+    assert_eq!(st.endnotes[0].text.text, want);
+}
+
+#[test]
+fn running_header_on_parent_page_follows_headings() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"pages": 3, "facingPages": false})).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Heading"})).ok();
+    // Headings on pages 1 and 3 (page 2 carries page 1's).
+    for (page, text) in [(0, "Alpha"), (2, "Epsilon")] {
+        let sp = s.doc().unwrap().doc.page_loc(page).unwrap().0;
+        let r = s.execute("frame.create", &json!({"spread": sp, "rect": [72, 200, 400, 260], "content": "text", "text": text})).unwrap();
+        let sid = s.doc().unwrap().doc.item(designcraft_doc::ItemId(r["id"].as_u64().unwrap())).unwrap().text_frame().unwrap().story;
+        s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 1})).unwrap();
+        s.execute("style.paragraph.apply", &json!({"name": "Heading"})).unwrap();
+    }
+    s.execute("variables.define", &json!({"name": "Chapter Head", "type": "runningHeader", "style": "Heading"})).unwrap();
+    s.execute("variables.define", &json!({"name": "Total", "type": "custom", "text": "of "})).unwrap();
+    // A header frame on the parent with "<running header> · <page> / <last page>".
+    let r = s
+        .execute("frame.create", &json!({"spread": {"kind": "parent", "index": 0}, "rect": [72, 30, 500, 60], "content": "text", "text": ""}))
+        .unwrap();
+    let fid = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
+    let sid = s.doc().unwrap().doc.item(fid).unwrap().text_frame().unwrap().story;
+    s.execute("text.select", &json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
+    s.execute("variables.insert", &json!({"name": "Chapter Head"})).unwrap();
+    s.execute("text.insert", &json!({"text": " · "})).unwrap();
+    s.execute("variables.insert", &json!({"name": "Last Page Number"})).unwrap();
+    let d = s.doc().unwrap().doc.clone();
+    assert!(matches!(d.find(fid).unwrap().spread, designcraft_doc::SpreadRef::Parent(0)));
+    // Visible glyphs of the header composed for each page: "Alpha · 3" vs "Epsilon · 3".
+    let shown = |page: usize| -> usize {
+        let cs = s.cache.get(&d, sid, Some(page));
+        cs.frames.iter().flat_map(|f| f.lines.iter()).map(|l| l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0).count()).sum()
+    };
+    let (p1, p2, p3) = (shown(0), shown(1), shown(2));
+    assert_eq!(p1, p2, "page 2 carries page 1's header");
+    assert_eq!(p3, p1 + 2, "Epsilon is two letters longer than Alpha");
+    let idx = s.cache.running_index(&d);
+    assert_eq!(idx.value("Heading", false, Default::default(), 0), "Alpha");
+    assert_eq!(idx.value("Heading", false, Default::default(), 1), "Alpha");
+    assert_eq!(idx.value("Heading", false, Default::default(), 2), "Epsilon");
+    let list = s.execute("variables.list", &json!({})).unwrap();
+    assert!(list.as_array().unwrap().iter().any(|v| v["name"] == "Last Page Number" && v["value"] == "3"));
+    // Deleting a variable flattens its instances to text.
+    s.execute("variables.delete", &json!({"name": "Last Page Number"})).unwrap();
+    assert!(s.doc().unwrap().doc.story(sid).unwrap().text.ends_with(" · 3"));
+}
diff --git a/crates/engine/src/file_access.rs b/crates/engine/src/file_access.rs
index 4f9a17c6f..d26e0ef8f 100644
--- a/crates/engine/src/file_access.rs
+++ b/crates/engine/src/file_access.rs
@@ -1,15 +1,17 @@
 //! The folders automation may read and write.
 //!
 //! `designcraft-cli mcp --automation-read-root <dir> --automation-write-root <dir>` confines the
-//! files an agent's commands reach. [`AutomationRoots`] holds the two folders. While they are in force, every path a command
-//! reads goes through [`check_read`] and every path it writes through [`check_write`]:
+//! files an agent's commands reach; each flag may be given more than once (#1552). [`AutomationRoots`]
+//! holds the folders of each kind. While they are in force, every path a command reads goes through
+//! [`check_read`] and every path it writes through [`check_write`]:
 //!
 //! - The path is made absolute against the working directory, as the file system reads it. Its
 //!   links are followed: for a file that doesn't exist yet, the links of its nearest existing
 //!   folder, the rest of the path being plain names (`..` below a missing folder is refused, and so
 //!   is a link that leads nowhere).
-//! - The result must lie inside the root, compared by whole components (`/work2` isn't inside
-//!   `/work`), without regard to case on Windows.
+//! - The result must lie inside one of the roots of its kind, compared by whole components
+//!   (`/work2` isn't inside `/work`), without regard to case on Windows. Two roots don't make their
+//!   common parent one.
 //! - Read and write access are separate: a root given alone grants only its own kind of access.
 //!
 //! Roots are in force on a thread inside [`confine`], and in the whole process after
@@ -32,11 +34,11 @@ pub enum Access {
     Write,
 }
 
-/// The folders automation may read and write; a root left out grants no access of its kind.
+/// The folders automation may read and write; a kind with no root grants no access of its kind.
 #[derive(Debug)]
 pub struct AutomationRoots {
-    read: Option<Root>,
-    write: Option<Root>,
+    read: Vec<Root>,
+    write: Vec<Root>,
 }
 
 #[derive(Debug)]
@@ -62,47 +64,61 @@ impl Root {
 }
 
 impl AutomationRoots {
-    /// The roots `read` and `write`, which must be existing folders; `None` when neither is given
-    /// (nothing is confined then).
-    pub fn new(read: Option<&Path>, write: Option<&Path>) -> Result<Option<Arc<Self>>, String> {
-        if read.is_none() && write.is_none() {
+    /// The roots `read` and `write`, which must be existing folders (one given twice counts once);
+    /// `None` when neither kind has any (nothing is confined then).
+    pub fn new(read: &[&Path], write: &[&Path]) -> Result<Option<Arc<Self>>, String> {
+        if read.is_empty() && write.is_empty() {
             return Ok(None);
         }
-        let read = read.map(|p| Root::open(p, Access::Read)).transpose()?;
-        let write = write.map(|p| Root::open(p, Access::Write)).transpose()?;
-        Ok(Some(Arc::new(Self { read, write })))
+        let open = |paths: &[&Path], access: Access| -> Result<Vec<Root>, String> {
+            let mut roots: Vec<Root> = Vec::with_capacity(paths.len());
+            for path in paths {
+                let root = Root::open(path, access)?;
+                if !roots.iter().any(|r| r.resolved == root.resolved) {
+                    roots.push(root);
+                }
+            }
+            Ok(roots)
+        };
+        Ok(Some(Arc::new(Self { read: open(read, Access::Read)?, write: open(write, Access::Write)? })))
     }
 
-    /// The read root, absolute with its links followed.
-    pub fn read_root(&self) -> Option<&Path> {
-        self.read.as_ref().map(|r| r.shown.as_path())
+    /// The roots for people: `read A, B; write C` (`none` for a kind without any), absolute with
+    /// their links followed.
+    pub fn describe(&self) -> String {
+        let list = |roots: &[Root]| {
+            if roots.is_empty() {
+                return "none".to_string();
+            }
+            roots.iter().map(|r| r.shown.display().to_string()).collect::<Vec<_>>().join(", ")
+        };
+        format!("read {}; write {}", list(&self.read), list(&self.write))
     }
 
-    /// The write root, absolute with its links followed.
-    pub fn write_root(&self) -> Option<&Path> {
-        self.write.as_ref().map(|r| r.shown.as_path())
-    }
-
-    /// May the file or folder at `path` be read (or written)? `Err` says why not.
+    /// May the file or folder at `path` be read (or written)? It must lie inside one of the roots
+    /// of that kind. `Err` says why not.
     pub fn check(&self, path: impl AsRef<Path>, access: Access) -> Result<(), String> {
         let path = path.as_ref();
-        let root = match access {
-            Access::Read => self.read.as_ref(),
-            Access::Write => self.write.as_ref(),
+        let roots = match access {
+            Access::Read => &self.read,
+            Access::Write => &self.write,
         };
-        let Some(Root { resolved: folder, shown }) = root else {
+        if roots.is_empty() {
             return match access {
                 Access::Read => Err(format!("automation filesystem access is not granted: read authority is absent: {}", path.display())),
                 Access::Write => Err(format!("automation filesystem access is not granted: write authority is absent: {}", path.display())),
             };
-        };
-        if inside(&resolve(path)?, folder) {
+        }
+        let resolved = resolve(path)?;
+        if roots.iter().any(|r| inside(&resolved, &r.resolved)) {
             return Ok(());
         }
-        let root = shown.display();
-        match access {
-            Access::Read => Err(format!("automation path rejected: outside the read root {root}: {}", path.display())),
-            Access::Write => Err(format!("automation path rejected: outside the write root {root}: {}", path.display())),
+        let shown: Vec<String> = roots.iter().map(|r| r.shown.display().to_string()).collect();
+        match (shown.as_slice(), access) {
+            ([root], Access::Read) => Err(format!("automation path rejected: outside the read root {root}: {}", path.display())),
+            ([root], Access::Write) => Err(format!("automation path rejected: outside the write root {root}: {}", path.display())),
+            (_, Access::Read) => Err(format!("automation path rejected: outside the read roots {}: {}", shown.join(", "), path.display())),
+            (_, Access::Write) => Err(format!("automation path rejected: outside the write roots {}: {}", shown.join(", "), path.display())),
         }
     }
 }
@@ -279,12 +295,24 @@ mod tests {
         }
         std::fs::write(base.join("in/a.designcraft"), "x").unwrap();
         std::fs::write(base.join("outside/secret.designcraft"), "x").unwrap();
-        let roots = AutomationRoots::new(Some(&base.join("in")), Some(&base.join("out"))).unwrap().unwrap();
+        let roots = AutomationRoots::new(&[&base.join("in")], &[&base.join("out")]).unwrap().unwrap();
         (base, roots)
     }
 
     fn s(p: PathBuf) -> String {
-        p.to_string_lossy().into_owned()
+        let text = p.to_string_lossy();
+        if !cfg!(windows) {
+            return text.into_owned();
+        }
+        // A canonical path on Windows has a `\\?\` prefix, under which `..` is not a name:
+        // send ordinary paths, as the roots show them.
+        if let Some(rest) = text.strip_prefix(r"\\?\UNC\") {
+            return format!(r"\\{rest}");
+        }
+        match text.strip_prefix(r"\\?\") {
+            Some(rest) => rest.to_owned(),
+            None => text.into_owned(),
+        }
     }
 
     #[test]
@@ -339,18 +367,18 @@ mod tests {
     #[test]
     fn a_missing_root_is_an_error_and_none_is_no_confinement() {
         let (base, _) = folders("missing");
-        let e = AutomationRoots::new(Some(&base.join("nope")), None).unwrap_err();
+        let e = AutomationRoots::new(&[&base.join("nope")], &[]).unwrap_err();
         assert!(e.starts_with("cannot open the automation read root"), "{e}");
-        let e = AutomationRoots::new(None, Some(&base.join("in/a.designcraft"))).unwrap_err();
+        let e = AutomationRoots::new(&[], &[&base.join("in/a.designcraft")]).unwrap_err();
         assert!(
             e.starts_with("cannot open the automation write root")
                 && e.ends_with(&std::io::Error::from(std::io::ErrorKind::NotADirectory).to_string()),
             "{e}"
         );
-        assert!(AutomationRoots::new(Some(Path::new("")), None).unwrap_err().starts_with("cannot open the automation read root ``"));
-        assert!(AutomationRoots::new(None, None).unwrap().is_none());
+        assert!(AutomationRoots::new(&[Path::new("")], &[]).unwrap_err().starts_with("cannot open the automation read root ``"));
+        assert!(AutomationRoots::new(&[], &[]).unwrap().is_none());
         // One root alone grants only its own access.
-        let read_only = AutomationRoots::new(Some(&base.join("in")), None).unwrap().unwrap();
+        let read_only = AutomationRoots::new(&[&base.join("in")], &[]).unwrap().unwrap();
         let e = read_only.check(s(base.join("in/x.designcraft")), Access::Write).unwrap_err();
         assert!(e.contains("write authority is absent"), "{e}");
         let _ = std::fs::remove_dir_all(base);
@@ -387,11 +415,127 @@ mod tests {
         assert_eq!(roots.check(s(base.join("in/alias/x.designcraft")), Access::Read), Ok(()));
         // A root given through a link is the folder it leads to.
         assert!(made(&base.join("in"), &base.join("in-link")));
-        let linked = AutomationRoots::new(Some(&base.join("in-link")), None).unwrap().unwrap();
+        let linked = AutomationRoots::new(&[&base.join("in-link")], &[]).unwrap().unwrap();
         assert_eq!(linked.check(s(base.join("in/a.designcraft")), Access::Read), Ok(()));
         let _ = std::fs::remove_dir_all(base);
     }
 
+    /// `in` and `shared` (read roots), `out` and `scratch` (write roots) beside `outside`, the
+    /// siblings `in2` and `scratch2` whose names start like a root's, and a file in their parent.
+    /// The folder is returned resolved (`/var` is `/private/var` on macOS), as the roots show it, so
+    /// a path that passes only because it was resolved is the case being tested and nothing else.
+    /// It has no `\\?\` prefix on Windows, where the roots are shown without it and `..` is not
+    /// resolved in a path that has it.
+    fn several(name: &str) -> (PathBuf, Arc<AutomationRoots>) {
+        let (base, _) = folders(name);
+        let base = plain(std::fs::canonicalize(base).unwrap());
+        for d in ["shared", "scratch", "scratch2"] {
+            std::fs::create_dir_all(base.join(d)).unwrap();
+        }
+        for f in ["shared/b.designcraft", "in2/c.designcraft", "parent.designcraft"] {
+            std::fs::write(base.join(f), "x").unwrap();
+        }
+        let roots = AutomationRoots::new(&[&base.join("in"), &base.join("shared")], &[&base.join("out"), &base.join("scratch")]).unwrap().unwrap();
+        (base, roots)
+    }
+
+    /// #1552: several roots of a kind: a path inside any of them passes, one inside none is refused
+    /// naming them all, and read and write stay separate.
+    #[test]
+    fn several_roots_of_a_kind_each_grant_their_access() {
+        let (base, roots) = several("several");
+        assert_eq!(roots.check(s(base.join("in/a.designcraft")), Access::Read), Ok(()));
+        assert_eq!(roots.check(s(base.join("shared/b.designcraft")), Access::Read), Ok(()));
+        assert_eq!(roots.check(s(base.join("out/x.png")), Access::Write), Ok(()));
+        assert_eq!(roots.check(s(base.join("scratch/new/x.png")), Access::Write), Ok(()));
+        let e = roots.check(s(base.join("outside/secret.designcraft")), Access::Read).unwrap_err();
+        let listed = format!("outside the read roots {}, {}: ", s(base.join("in")), s(base.join("shared")));
+        assert!(e.starts_with("automation path rejected: ") && e.contains(&listed), "{e}");
+        assert!(roots.check(s(base.join("outside/x.png")), Access::Write).unwrap_err().contains("outside the write roots"));
+        // Two sibling roots don't make their parent a root.
+        assert!(roots.check(s(base.join("parent.designcraft")), Access::Read).unwrap_err().contains("outside the read roots"));
+        assert!(roots.check(s(base.clone()), Access::Read).is_err());
+        assert!(roots.check(s(base.join("x.png")), Access::Write).unwrap_err().contains("outside the write roots"));
+        // Read and write stay separate: a read root is not a write root, nor the other way round.
+        assert!(roots.check(s(base.join("shared/b.designcraft")), Access::Write).unwrap_err().contains("outside the write roots"));
+        assert!(roots.check(s(base.join("in/x.png")), Access::Write).is_err());
+        assert!(roots.check(s(base.join("scratch/x.png")), Access::Read).unwrap_err().contains("outside the read roots"));
+        assert!(roots.check(s(base.join("out")), Access::Read).is_err());
+        let _ = std::fs::remove_dir_all(base);
+    }
+
+    #[test]
+    fn several_roots_compare_whole_folder_names() {
+        let (base, roots) = several("several-prefix");
+        assert!(roots.check(s(base.join("in2/c.designcraft")), Access::Read).unwrap_err().contains("outside the read roots"), "in2 is not inside in");
+        assert!(roots.check(format!("{}2/x.designcraft", s(base.join("shared"))), Access::Read).is_err());
+        assert!(
+            roots.check(s(base.join("scratch2/x.png")), Access::Write).unwrap_err().contains("outside the write roots"),
+            "scratch2 is not inside scratch"
+        );
+        let _ = std::fs::remove_dir_all(base);
+    }
+
+    #[test]
+    fn parent_traversal_between_several_roots() {
+        let (base, roots) = several("several-dotdot");
+        let sep = std::path::MAIN_SEPARATOR;
+        let up = |root: &str, rest: &str| format!("{}{sep}..{sep}{rest}", s(base.join(root)));
+        // `..` out of one root is outside, also when it lands next to another root.
+        assert!(roots.check(up("shared", &format!("outside{sep}secret.designcraft")), Access::Read).unwrap_err().contains("outside the read roots"));
+        assert!(roots.check(up("shared", "parent.designcraft"), Access::Read).is_err());
+        assert!(roots.check(up("scratch", &format!("outside{sep}x.png")), Access::Write).unwrap_err().contains("outside the write roots"));
+        // `..` from one root into another of the same kind stays inside.
+        assert_eq!(roots.check(up("shared", &format!("in{sep}a.designcraft")), Access::Read), Ok(()));
+        assert_eq!(roots.check(up("scratch", &format!("out{sep}x.png")), Access::Write), Ok(()));
+        // ...but not into a root of the other kind.
+        assert!(roots.check(up("scratch", &format!("in{sep}x.png")), Access::Write).unwrap_err().contains("outside the write roots"));
+        assert!(roots.check(up("shared", &format!("out{sep}x.png")), Access::Read).unwrap_err().contains("outside the read roots"));
+        let _ = std::fs::remove_dir_all(base);
+    }
+
+    #[test]
+    fn several_roots_are_each_checked_and_counted_once() {
+        let (base, _) = folders("several-open");
+        // A missing folder among several is an error, wherever it stands.
+        for read in [[base.join("in"), base.join("nope")], [base.join("nope"), base.join("in")]] {
+            let e = AutomationRoots::new(&[&read[0], &read[1]], &[]).unwrap_err();
+            assert!(e.starts_with("cannot open the automation read root") && e.contains("nope"), "{e}");
+        }
+        let e = AutomationRoots::new(&[&base.join("in")], &[&base.join("out"), &base.join("in/a.designcraft")]).unwrap_err();
+        assert!(e.starts_with("cannot open the automation write root"), "{e}");
+        // A folder given twice (here once through `..`) counts once.
+        let twice = AutomationRoots::new(&[&base.join("in"), &base.join("in/sub/.."), &base.join("in")], &[]).unwrap().unwrap();
+        let real = plain(std::fs::canonicalize(&base).unwrap());
+        assert_eq!(twice.describe(), format!("read {}; write none", s(real.join("in"))));
+        let e = twice.check(s(base.join("outside/x")), Access::Read).unwrap_err();
+        assert!(e.contains("outside the read root ") && !e.contains("roots"), "{e}");
+        let _ = std::fs::remove_dir_all(base);
+    }
+
+    /// A link inside one root that leads into another root of the same kind stays inside; one that
+    /// leads out of all of them, or into a root of the other kind, is outside.
+    #[cfg(unix)]
+    #[test]
+    fn links_between_several_roots() {
+        let (base, roots) = several("several-links");
+        let link = |target: &str, at: &str| std::os::unix::fs::symlink(base.join(target), base.join(at)).unwrap();
+        link("shared/b.designcraft", "in/to-shared.designcraft");
+        link("outside/secret.designcraft", "shared/leak.designcraft");
+        link("", "shared/up");
+        link("out", "in/to-out");
+        link("outside", "scratch/away");
+        link("in", "scratch/to-in");
+        assert_eq!(roots.check(s(base.join("in/to-shared.designcraft")), Access::Read), Ok(()));
+        assert!(roots.check(s(base.join("shared/leak.designcraft")), Access::Read).unwrap_err().contains("outside the read roots"));
+        assert!(roots.check(s(base.join("shared/up/outside/secret.designcraft")), Access::Read).unwrap_err().contains("outside the read roots"));
+        assert!(roots.check(s(base.join("shared/up/parent.designcraft")), Access::Read).is_err());
+        assert!(roots.check(s(base.join("in/to-out/x.png")), Access::Read).unwrap_err().contains("outside the read roots"));
+        assert!(roots.check(s(base.join("scratch/away/x.png")), Access::Write).unwrap_err().contains("outside the write roots"));
+        assert!(roots.check(s(base.join("scratch/to-in/x.png")), Access::Write).unwrap_err().contains("outside the write roots"));
+        let _ = std::fs::remove_dir_all(base);
+    }
+
     #[cfg(windows)]
     #[test]
     fn windows_ignores_case_and_refuses_devices() {
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index 545c3fac3..58301e9e6 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -20,6 +20,7 @@ pub mod math;
 pub mod recovery;
 pub mod sample;
 pub mod script;
+pub mod separations;
 mod tooling;
 
 use std::sync::Arc;
@@ -33,7 +34,7 @@ pub use cmd::{CommandInfo, CommandSpec, command_specs, find_command};
 pub use designcraft_compose as compose;
 pub use designcraft_doc as doc;
 pub use designcraft_tools as tools;
-pub use tooling::{SnapView, UiRequest, ViewInfo};
+pub use tooling::{ImeMutation, ImeTextContext, SnapView, UiRequest, ViewInfo, ime_delete_ranges};
 
 #[derive(Debug, thiserror::Error)]
 pub enum EngineError {
@@ -101,6 +102,9 @@ pub struct DocState {
     /// Editing parent spreads (Pages panel double-click on a parent).
     pub editing_parents: bool,
     pub uid: u64,
+    /// Changes whenever this document state is recreated, even if [`Self::uid`] is preserved
+    /// (File › Revert keeps the uid for recovery but replaces the document).
+    pub identity_epoch: u64,
     /// Recovery entries this state actually opened or published, for repeated-open and cleanup.
     /// Bounded, deduplicated checkpoint addresses; never inferred from uid alone.
     pub(crate) recovery_entries: Vec<(std::path::PathBuf, u64)>,
@@ -141,10 +145,12 @@ fn next_revision() -> u64 {
 }
 
 impl DocState {
+    /// Initialize saved/live document identity, revision, epoch, active default layer, empty history with limit 1,000 and the initial path.
     pub fn new(doc: Document, path: Option<String>) -> Self {
         let active_layer = doc.default_layer();
         let doc = Arc::new(doc);
         let revision = next_revision();
+        let identity_epoch = NEXT_UID.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
         DocState {
             saved_doc: doc.clone(),
             doc,
@@ -156,7 +162,8 @@ impl DocState {
             active_layer,
             interaction: None,
             editing_parents: false,
-            uid: NEXT_UID.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
+            uid: identity_epoch,
+            identity_epoch,
             recovery_entries: Vec::new(),
             preview_stash: None,
             preview_record: None,
@@ -756,19 +763,3 @@ pub(crate) use push_undo as record_undo;
 
 #[cfg(test)]
 mod tests;
-#[cfg(test)]
-mod tests_autosize;
-#[cfg(test)]
-mod tests_file_guard;
-#[cfg(test)]
-mod tests_idml;
-#[cfg(test)]
-mod tests_ime;
-#[cfg(test)]
-mod tests_linked_paths;
-#[cfg(test)]
-mod tests_params;
-#[cfg(test)]
-mod tests_roots;
-#[cfg(test)]
-mod tests_table;
diff --git a/crates/engine/src/math.rs b/crates/engine/src/math.rs
index 16ef7e234..468ce1c5a 100644
--- a/crates/engine/src/math.rs
+++ b/crates/engine/src/math.rs
@@ -59,7 +59,7 @@ impl MBox {
     }
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[cfg_attr(test, derive(Debug, PartialEq))]
 enum Node {
     /// A character run: identifiers italic, numbers and symbols upright.
     Sym(String, Class),
@@ -79,6 +79,54 @@ enum Node {
     Fenced(String, Box<Node>, String),
 }
 
+// Empty a node before field drop glue can follow its children recursively. This also covers
+// replaced scripts and partially built parser continuations during unwinding.
+impl Node {
+    /// Move every child link into `pending`, draining `Group` children and replacing boxed children with empty groups, so field drop glue never walks a deep subtree.
+    fn detach_children(&mut self, pending: &mut Vec<Node>) {
+        /// Detach one child into `pending`, leaving an empty group in its slot.
+        fn detach(child: &mut Node, pending: &mut Vec<Node>) {
+            pending.push(std::mem::replace(child, Node::Group(Vec::new())));
+        }
+        match self {
+            Self::Group(nodes) => pending.append(nodes),
+            Self::Frac(a, b) => {
+                detach(a, pending);
+                detach(b, pending);
+            }
+            Self::Sqrt(index, body) => {
+                if let Some(index) = index {
+                    detach(index, pending);
+                }
+                detach(body, pending);
+            }
+            Self::Scripts { base, sup, sub } => {
+                detach(base, pending);
+                if let Some(sup) = sup {
+                    detach(sup, pending);
+                }
+                if let Some(sub) = sub {
+                    detach(sub, pending);
+                }
+            }
+            Self::Fenced(_, body, _) => detach(body, pending),
+            Self::Sym(_, _) | Self::Text(_) | Self::Space(_) | Self::Big(_) => {}
+        }
+    }
+}
+
+impl Drop for Node {
+    /// Drain an explicit worklist, emptying each node before normal drop glue, so deep or replaced ASTs drop without stack overflow.
+    fn drop(&mut self) {
+        let mut pending = Vec::new();
+        self.detach_children(&mut pending);
+        while let Some(mut node) = pending.pop() {
+            node.detach_children(&mut pending);
+            // Its own Drop and boxed field glue now see only empty leaves, never this subtree.
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug, PartialEq)]
 enum Class {
     Ident,
@@ -160,15 +208,13 @@ fn big_op(name: &str) -> Option<&'static str> {
     })
 }
 
-/// Deepest expression nesting parsed. Recursive descent must not overflow the stack on hostile
-/// input (`\frac\frac…`, `{{{{…`, `\left(\left(…`); past the cap groups stop descending.
+/// Deepest logical expression nesting parsed. Heap continuations keep this full budget safe on
+/// the default native thread stack; past the cap groups retain their existing empty result.
 const MAX_NESTING: usize = 256;
 
 struct Parser<'a> {
     s: &'a [char],
     i: usize,
-    /// Enclosing group depth, at most [`MAX_NESTING`].
-    depth: usize,
 }
 
 impl Parser<'_> {
@@ -225,21 +271,6 @@ impl Parser<'_> {
         }
         out
     }
-    fn arg(&mut self) -> Node {
-        if self.depth >= MAX_NESTING {
-            return Node::Group(Vec::new());
-        }
-        self.depth += 1;
-        self.skip_ws();
-        let n = if self.peek() == Some('{') {
-            self.i += 1;
-            Node::Group(self.list(Some('}')))
-        } else {
-            self.atom().unwrap_or(Node::Group(vec![]))
-        };
-        self.depth -= 1;
-        n
-    }
     fn delimiter(&mut self) -> String {
         self.skip_ws();
         match self.peek() {
@@ -265,166 +296,297 @@ impl Parser<'_> {
             None => String::new(),
         }
     }
-    fn atom(&mut self) -> Option<Node> {
-        self.skip_ws();
-        let c = self.peek()?;
-        self.i += 1;
-        Some(match c {
-            '{' => Node::Group(self.list(Some('}'))),
-            '\\' => {
-                let name = self.command();
-                match name.as_str() {
-                    "frac" | "dfrac" | "tfrac" => {
-                        let a = self.arg();
-                        let b = self.arg();
-                        Node::Frac(Box::new(a), Box::new(b))
-                    }
-                    "sqrt" => {
-                        self.skip_ws();
-                        let idx = (self.peek() == Some('[')).then(|| {
-                            self.i += 1;
-                            let mut s = String::new();
-                            while let Some(c) = self.peek() {
-                                self.i += 1;
-                                if c == ']' {
-                                    break;
-                                }
-                                s.push(c);
-                            }
-                            Box::new(parse_at(&s, self.depth + 1))
-                        });
-                        let a = self.arg();
-                        Node::Sqrt(idx, Box::new(a))
-                    }
-                    "text" | "mathrm" | "textrm" | "operatorname" => Node::Text(self.raw_group()),
-                    "sin" | "cos" | "tan" | "log" | "ln" | "exp" | "lim" | "max" | "min" => Node::Text(name),
-                    "," => Node::Space(3.0 / 18.0),
-                    ":" | ">" => Node::Space(4.0 / 18.0),
-                    ";" => Node::Space(5.0 / 18.0),
-                    "quad" => Node::Space(1.0),
-                    "qquad" => Node::Space(2.0),
-                    "!" => Node::Space(-3.0 / 18.0),
-                    " " => Node::Space(0.25),
-                    "left" => {
-                        let open = self.delimiter();
-                        let body = self.list_until_right();
-                        let close = self.delimiter();
-                        Node::Fenced(open, Box::new(Node::Group(body)), close)
-                    }
-                    "{" => Node::Sym("{".into(), Class::Punct),
-                    "}" => Node::Sym("}".into(), Class::Punct),
-                    "%" | "$" | "#" | "&" | "_" => Node::Sym(name, Class::Plain),
-                    n => match (big_op(n), symbol(n)) {
-                        (Some(op), _) => Node::Big(op.into()),
-                        (None, Some((s, cl))) => Node::Sym(s.into(), cl),
-                        _ => Node::Text(format!("\\{n}")),
-                    },
-                }
+}
+
+/// Continuations carry parser state on the heap instead of in native call frames.
+enum ParseWork<'a> {
+    List { end: Option<char>, depth: usize },
+    Sequence { kind: SequenceKind, depth: usize, out: Vec<Node> },
+    Append { kind: SequenceKind, depth: usize, out: Vec<Node>, group: bool },
+    Arg { depth: usize },
+    Atom { depth: usize },
+    Script { kind: SequenceKind, depth: usize, out: Vec<Node>, up: bool },
+    FractionNumerator { depth: usize },
+    FractionDenominator { numerator: Node },
+    SqrtIndex { outer: Parser<'a>, depth: usize },
+    SqrtArgument { index: Option<Box<Node>> },
+    Fence { open: String },
+    UntilRight { depth: usize },
+    One { depth: usize },
+    OneAtom { depth: usize },
+}
+
+#[derive(Clone, Copy)]
+enum SequenceKind {
+    List(Option<char>),
+    Fence,
+    One,
+}
+
+/// Repeated scripts replace only their own slot, preserving the base and the opposite slot.
+fn attach_script(mut base: Node, argument: Node, up: bool) -> Node {
+    if let Node::Scripts { sup, sub, .. } = &mut base {
+        let slot = if up { sup } else { sub };
+        *slot = Some(Box::new(argument));
+        base
+    } else if up {
+        Node::Scripts { base: Box::new(base), sup: Some(Box::new(argument)), sub: None }
+    } else {
+        Node::Scripts { base: Box::new(base), sup: None, sub: Some(Box::new(argument)) }
+    }
+}
+
+impl<'a> Parser<'a> {
+    /// Run the parser as a heap worklist from a root `List`, so input nesting does not consume native stack.
+    fn parse(&mut self, depth: usize) -> Node {
+        let mut work = vec![ParseWork::List { end: None, depth }];
+        let mut value = Node::Group(Vec::new());
+        while let Some(next) = work.pop() {
+            match next {
+                ParseWork::List { end, depth } => Self::step_list(&mut work, &mut value, end, depth),
+                ParseWork::Sequence { kind, depth, out } => self.step_sequence(&mut work, &mut value, kind, depth, out),
+                ParseWork::Append { kind, depth, out, group } => Self::step_append(&mut work, &mut value, kind, depth, out, group),
+                ParseWork::Arg { depth } => self.step_arg(&mut work, &mut value, depth),
+                ParseWork::Atom { depth } => self.step_atom(&mut work, &mut value, depth),
+                ParseWork::Script { kind, depth, out, up } => Self::step_script(&mut work, &mut value, kind, depth, out, up),
+                ParseWork::FractionNumerator { depth } => Self::step_fraction_numerator(&mut work, &mut value, depth),
+                ParseWork::FractionDenominator { numerator } => Self::step_fraction_denominator(&mut value, numerator),
+                ParseWork::SqrtIndex { outer, depth } => self.step_sqrt_index(&mut work, &mut value, outer, depth),
+                ParseWork::SqrtArgument { index } => Self::step_sqrt_argument(&mut value, index),
+                ParseWork::Fence { open } => self.step_fence(&mut value, open),
+                ParseWork::UntilRight { depth } => Self::step_until_right(&mut work, &mut value, depth),
+                ParseWork::One { depth } => Self::step_one(&mut work, depth),
+                ParseWork::OneAtom { depth } => Self::step_one_atom(&mut work, &mut value, depth),
             }
+        }
+        value
+    }
+
+    /// Start a list sequence, or yield an empty group when `depth` has reached `MAX_NESTING`.
+    fn step_list(work: &mut Vec<ParseWork<'a>>, value: &mut Node, end: Option<char>, depth: usize) {
+        if depth >= MAX_NESTING {
+            *value = Node::Group(Vec::new());
+        } else {
+            work.push(ParseWork::Sequence { kind: SequenceKind::List(end), depth: depth + 1, out: Vec::new() });
+        }
+    }
+
+    /// Consume list/fence terminators, route `^`/`_` to script attachment, append the next atom for list and fence sequences, or finish a `One` sequence after its single atom; fence sequences stop only at a real `\right`.
+    fn step_sequence(&mut self, work: &mut Vec<ParseWork<'a>>, value: &mut Node, kind: SequenceKind, depth: usize, mut out: Vec<Node>) {
+        self.skip_ws();
+        let Some(c) = self.peek() else {
+            *value = Node::Group(out);
+            return;
+        };
+        if let SequenceKind::List(Some(end)) = kind
+            && c == end
+        {
+            self.i += 1;
+            *value = Node::Group(out);
+            return;
+        }
+        if matches!(kind, SequenceKind::Fence)
+            && self.s.get(self.i..).is_some_and(|s| s.starts_with(&['\\', 'r', 'i', 'g', 'h', 't']))
+            && !self.s.get(self.i + 6).is_some_and(char::is_ascii_alphabetic)
+        {
+            self.i += 6;
+            *value = Node::Group(out);
+            return;
+        }
+        if (c == '^' || c == '_') && !matches!(kind, SequenceKind::Fence) {
+            self.i += 1;
+            work.push(ParseWork::Script { kind, depth, out, up: c == '^' });
+            work.push(ParseWork::Arg { depth });
+        } else if matches!(kind, SequenceKind::One) {
+            *value = Node::Group(out);
+        } else {
+            let group = matches!(kind, SequenceKind::Fence);
+            work.push(ParseWork::Append { kind, depth, out: std::mem::take(&mut out), group });
+            work.push(if group { ParseWork::One { depth: depth + 1 } } else { ParseWork::Atom { depth } });
+        }
+    }
+
+    /// Commit the completed atom or fence group into the pending sequence and resume it.
+    fn step_append(work: &mut Vec<ParseWork<'a>>, value: &mut Node, kind: SequenceKind, depth: usize, mut out: Vec<Node>, group: bool) {
+        if group {
+            if let Node::Group(nodes) = &mut *value {
+                out.append(nodes);
+            }
+        } else {
+            out.push(std::mem::replace(value, Node::Group(Vec::new())));
+        }
+        work.push(ParseWork::Sequence { kind, depth, out });
+    }
+
+    /// Parse a braced list or one atom at `depth + 1`; a capped argument becomes an empty group.
+    fn step_arg(&mut self, work: &mut Vec<ParseWork<'a>>, value: &mut Node, depth: usize) {
+        if depth >= MAX_NESTING {
+            *value = Node::Group(Vec::new());
+            return;
+        }
+        self.skip_ws();
+        if self.peek() == Some('{') {
+            self.i += 1;
+            work.push(ParseWork::List { end: Some('}'), depth: depth + 1 });
+        } else {
+            work.push(ParseWork::Atom { depth: depth + 1 });
+        }
+    }
+
+    /// Attach the completed argument as superscript or subscript, preserving the opposite slot of an existing script node.
+    fn step_script(work: &mut Vec<ParseWork<'a>>, value: &mut Node, kind: SequenceKind, depth: usize, mut out: Vec<Node>, up: bool) {
+        let argument = std::mem::replace(value, Node::Group(Vec::new()));
+        let base = out.pop().unwrap_or(Node::Group(Vec::new()));
+        out.push(attach_script(base, argument, up));
+        work.push(ParseWork::Sequence { kind, depth, out });
+    }
+
+    /// Save the parsed numerator and queue the denominator argument.
+    fn step_fraction_numerator(work: &mut Vec<ParseWork<'a>>, value: &mut Node, depth: usize) {
+        let numerator = std::mem::replace(value, Node::Group(Vec::new()));
+        work.push(ParseWork::FractionDenominator { numerator });
+        work.push(ParseWork::Arg { depth });
+    }
+
+    /// Build `Frac` from the saved numerator and the completed denominator.
+    fn step_fraction_denominator(value: &mut Node, numerator: Node) {
+        *value = Node::Frac(Box::new(numerator), Box::new(std::mem::replace(value, Node::Group(Vec::new()))));
+    }
+
+    /// Restore the outer parser after the root-index subparse and queue the radicand argument.
+    fn step_sqrt_index(&mut self, work: &mut Vec<ParseWork<'a>>, value: &mut Node, outer: Parser<'a>, depth: usize) {
+        *self = outer;
+        let index = Some(Box::new(std::mem::replace(value, Node::Group(Vec::new()))));
+        work.push(ParseWork::SqrtArgument { index });
+        work.push(ParseWork::Arg { depth });
+    }
+
+    /// Build `Sqrt`, retaining the optional root index.
+    fn step_sqrt_argument(value: &mut Node, index: Option<Box<Node>>) {
+        *value = Node::Sqrt(index, Box::new(std::mem::replace(value, Node::Group(Vec::new()))));
+    }
+
+    /// Wrap the completed body in `Fenced` with the opening and resolved closing delimiter.
+    fn step_fence(&mut self, value: &mut Node, open: String) {
+        let close = self.delimiter();
+        *value = Node::Fenced(open, Box::new(std::mem::replace(value, Node::Group(Vec::new()))), close);
+    }
+
+    /// Start a fence-body sequence that stops at a real `\right`, or an empty group at the nesting cap.
+    fn step_until_right(work: &mut Vec<ParseWork<'a>>, value: &mut Node, depth: usize) {
+        if depth >= MAX_NESTING {
+            *value = Node::Group(Vec::new());
+        } else {
+            work.push(ParseWork::Sequence { kind: SequenceKind::Fence, depth, out: Vec::new() });
+        }
+    }
+
+    /// Queue one atom and its one-item sequence collector.
+    fn step_one(work: &mut Vec<ParseWork<'a>>, depth: usize) {
+        work.push(ParseWork::OneAtom { depth });
+        work.push(ParseWork::Atom { depth });
+    }
+
+    /// Wrap the completed atom in a `Group` and continue the `One` sequence.
+    fn step_one_atom(work: &mut Vec<ParseWork<'a>>, value: &mut Node, depth: usize) {
+        let out = vec![std::mem::replace(value, Node::Group(Vec::new()))];
+        work.push(ParseWork::Sequence { kind: SequenceKind::One, depth, out });
+    }
+
+    /// Parse a number, identifier, operator, punctuation mark or symbol with its spacing class, dispatching braces and commands.
+    fn step_atom(&mut self, work: &mut Vec<ParseWork<'a>>, value: &mut Node, depth: usize) {
+        self.skip_ws();
+        let Some(c) = self.peek() else {
+            *value = Node::Group(Vec::new());
+            return;
+        };
+        self.i += 1;
+        match c {
+            '{' => work.push(ParseWork::List { end: Some('}'), depth }),
+            '\\' => self.step_command(work, value, depth),
             c if c.is_ascii_digit() || c == '.' => {
                 let mut s = c.to_string();
                 while let Some(d) = self.peek().filter(|d| d.is_ascii_digit() || *d == '.') {
                     s.push(d);
                     self.i += 1;
                 }
-                Node::Sym(s, Class::Number)
+                *value = Node::Sym(s, Class::Number);
             }
-            c if c.is_alphabetic() => Node::Sym(c.to_string(), Class::Ident),
-            '+' => Node::Sym("+".into(), Class::Bin),
-            '-' => Node::Sym("−".into(), Class::Bin),
-            '*' => Node::Sym("∗".into(), Class::Bin),
-            '<'..='>' => Node::Sym(c.to_string(), Class::Rel),
-            ',' | ';' => Node::Sym(c.to_string(), Class::Punct),
-            '\'' => Node::Sym("′".into(), Class::Plain),
-            c => Node::Sym(c.to_string(), Class::Plain),
-        })
-    }
-    fn list(&mut self, end: Option<char>) -> Vec<Node> {
-        if self.depth >= MAX_NESTING {
-            return Vec::new();
+            c if c.is_alphabetic() => *value = Node::Sym(c.to_string(), Class::Ident),
+            '+' => *value = Node::Sym("+".into(), Class::Bin),
+            '-' => *value = Node::Sym("−".into(), Class::Bin),
+            '*' => *value = Node::Sym("∗".into(), Class::Bin),
+            '<'..='>' => *value = Node::Sym(c.to_string(), Class::Rel),
+            ',' | ';' => *value = Node::Sym(c.to_string(), Class::Punct),
+            '\'' => *value = Node::Sym("′".into(), Class::Plain),
+            c => *value = Node::Sym(c.to_string(), Class::Plain),
         }
-        self.depth += 1;
-        let mut out: Vec<Node> = Vec::new();
-        loop {
-            self.skip_ws();
-            match self.peek() {
-                None => break,
-                Some(c) if Some(c) == end => {
-                    self.i += 1;
+    }
+
+    /// Dispatch fractions, roots, fences, raw-text commands and named symbols/operators.
+    fn step_command(&mut self, work: &mut Vec<ParseWork<'a>>, value: &mut Node, depth: usize) {
+        let name = self.command();
+        match name.as_str() {
+            "frac" | "dfrac" | "tfrac" => {
+                work.push(ParseWork::FractionNumerator { depth });
+                work.push(ParseWork::Arg { depth });
+            }
+            "sqrt" => self.push_sqrt(work, depth),
+            "left" => {
+                let open = self.delimiter();
+                work.push(ParseWork::Fence { open });
+                work.push(ParseWork::UntilRight { depth });
+            }
+            "text" | "mathrm" | "textrm" | "operatorname" => *value = Node::Text(self.raw_group()),
+            n => *value = command_atom(n),
+        }
+    }
+
+    /// Parse an optional bracketed root index with the existing first-`]` grammar, otherwise queue a braced or atomic radicand.
+    fn push_sqrt(&mut self, work: &mut Vec<ParseWork<'a>>, depth: usize) {
+        self.skip_ws();
+        if self.peek() == Some('[') {
+            self.i += 1;
+            let start = self.i;
+            let mut end = start;
+            // Keep the existing first-']' index grammar, including EOF.
+            while let Some(c) = self.peek() {
+                self.i += 1;
+                if c == ']' {
                     break;
                 }
-                Some('^') | Some('_') => {
-                    let up = self.peek() == Some('^');
-                    self.i += 1;
-                    let a = self.arg();
-                    let base = out.pop().unwrap_or(Node::Group(vec![]));
-                    let node = match base {
-                        Node::Scripts { base, sup, sub } => {
-                            if up {
-                                Node::Scripts { base, sup: Some(Box::new(a)), sub }
-                            } else {
-                                Node::Scripts { base, sup, sub: Some(Box::new(a)) }
-                            }
-                        }
-                        b => Node::Scripts { base: Box::new(b), sup: up.then(|| Box::new(a.clone())), sub: (!up).then(|| Box::new(a)) },
-                    };
-                    out.push(node);
-                }
-                Some(_) => {
-                    if let Some(a) = self.atom() {
-                        out.push(a);
-                    }
-                }
+                end = self.i;
             }
+            let inner = self.s.get(start..end).unwrap_or_default();
+            let outer = std::mem::replace(self, Parser { s: inner, i: 0 });
+            work.push(ParseWork::SqrtIndex { outer, depth });
+            work.push(ParseWork::List { end: None, depth: depth + 1 });
+        } else {
+            work.push(ParseWork::SqrtArgument { index: None });
+            work.push(ParseWork::Arg { depth });
         }
-        self.depth -= 1;
-        out
     }
-    fn list_until_right(&mut self) -> Vec<Node> {
-        if self.depth >= MAX_NESTING {
-            return Vec::new();
-        }
-        let mut out = Vec::new();
-        loop {
-            self.skip_ws();
-            if self.peek().is_none() {
-                break;
-            }
-            if self.s[self.i..].starts_with(&['\\', 'r', 'i', 'g', 'h', 't']) && !self.s.get(self.i + 6).is_some_and(char::is_ascii_alphabetic) {
-                self.i += 6;
-                break;
-            }
-            let mut p = Parser { s: self.s, i: self.i, depth: self.depth + 1 };
-            let one = p.list_one();
-            self.i = p.i;
-            out.extend(one);
-        }
-        out
-    }
-    /// One atom plus any scripts on it.
-    fn list_one(&mut self) -> Vec<Node> {
-        let mut out = Vec::new();
-        if let Some(a) = self.atom() {
-            out.push(a);
-        }
-        loop {
-            self.skip_ws();
-            match self.peek() {
-                Some('^') | Some('_') => {
-                    let up = self.peek() == Some('^');
-                    self.i += 1;
-                    let a = self.arg();
-                    let base = out.pop().unwrap_or(Node::Group(vec![]));
-                    out.push(match base {
-                        Node::Scripts { base, sub, .. } if up => Node::Scripts { base, sup: Some(Box::new(a)), sub },
-                        Node::Scripts { base, sup, .. } => Node::Scripts { base, sup, sub: Some(Box::new(a)) },
-                        b => Node::Scripts { base: Box::new(b), sup: up.then(|| Box::new(a.clone())), sub: (!up).then(|| Box::new(a)) },
-                    });
-                }
-                _ => break,
-            }
-        }
-        out
+}
+
+/// Map function names, spacing commands, escaped punctuation, big operators and symbols; an unknown command becomes literal `\name` text.
+fn command_atom(name: &str) -> Node {
+    match name {
+        "sin" | "cos" | "tan" | "log" | "ln" | "exp" | "lim" | "max" | "min" => Node::Text(name.to_owned()),
+        "," => Node::Space(3.0 / 18.0),
+        ":" | ">" => Node::Space(4.0 / 18.0),
+        ";" => Node::Space(5.0 / 18.0),
+        "quad" => Node::Space(1.0),
+        "qquad" => Node::Space(2.0),
+        "!" => Node::Space(-3.0 / 18.0),
+        " " => Node::Space(0.25),
+        "{" => Node::Sym("{".into(), Class::Punct),
+        "}" => Node::Sym("}".into(), Class::Punct),
+        "%" | "$" | "#" | "&" | "_" => Node::Sym(name.to_owned(), Class::Plain),
+        n => match (big_op(n), symbol(n)) {
+            (Some(op), _) => Node::Big(op.into()),
+            (None, Some((s, cl))) => Node::Sym(s.into(), cl),
+            _ => Node::Text(format!("\\{n}")),
+        },
     }
 }
 
@@ -432,10 +594,10 @@ fn parse(src: &str) -> Node {
     parse_at(src, 0)
 }
 
+/// Collect the input into chars and start parsing at the supplied depth.
 fn parse_at(src: &str, depth: usize) -> Node {
     let chars: Vec<char> = src.chars().collect();
-    let mut p = Parser { s: &chars, i: 0, depth };
-    Node::Group(p.list(None))
+    Parser { s: &chars, i: 0 }.parse(depth)
 }
 
 /// Typesetting fonts and metrics.
@@ -484,174 +646,254 @@ fn hbox(parts: Vec<(MBox, f64)>) -> MBox {
     out
 }
 
-fn layout(f: &Fonts, n: &Node, size: f64) -> MBox {
-    let axis = size * 0.25;
-    match n {
-        Node::Sym(s, cl) => text_box(f, s, size, *cl == Class::Ident),
-        Node::Text(s) => text_box(f, s, size, false),
-        Node::Space(em) => MBox { w: em * size, ..Default::default() },
-        Node::Group(list) => {
-            let mut parts = Vec::new();
-            let mut prev: Option<Class> = None;
-            for (k, item) in list.iter().enumerate() {
-                let cl = match item {
-                    Node::Sym(_, c) => Some(*c),
-                    Node::Scripts { base, .. } => match &**base {
-                        Node::Sym(_, c) => Some(*c),
-                        _ => None,
-                    },
-                    _ => None,
-                };
-                // A leading + or − (or after another operator) is a sign, not a binary operator.
-                let cl = if cl == Some(Class::Bin) && (k == 0 || matches!(prev, Some(Class::Bin | Class::Rel | Class::Punct))) {
-                    Some(Class::Plain)
-                } else {
-                    cl
-                };
-                let gap = |c: Option<Class>| match c {
-                    Some(Class::Bin) => size * 4.0 / 18.0,
-                    Some(Class::Rel) => size * 5.0 / 18.0,
-                    _ => 0.0,
-                };
-                let mut before = gap(cl).max(gap(prev));
-                if k == 0 {
-                    before = 0.0;
-                }
-                if prev == Some(Class::Punct) {
-                    before = before.max(size * 3.0 / 18.0);
-                }
-                parts.push((layout(f, item, size), before));
-                prev = cl;
-            }
-            hbox(parts)
-        }
-        Node::Frac(a, b) => {
-            let s2 = size * 0.85;
-            let (na, nb) = (layout(f, a, s2), layout(f, b, s2));
-            let w = na.w.max(nb.w) + size * 0.2;
-            let t = (size * 0.06).max(0.4);
-            let gap = size * 0.15;
-            let num_base = -(axis + t / 2.0 + gap + na.desc);
-            let den_base = -axis + t / 2.0 + gap + nb.asc;
-            let mut out = MBox { w, asc: -num_base + na.asc, desc: den_base + nb.desc, els: Vec::new() };
-            out.els.push(Elem::Rule { x: 0.0, y: -axis - t / 2.0, w, h: t });
-            let (wa, wb) = (na.w, nb.w);
-            out.els.extend(na.shifted((w - wa) / 2.0, num_base));
-            out.els.extend(nb.shifted((w - wb) / 2.0, den_base));
-            out
-        }
-        Node::Sqrt(idx, a) => {
-            let inner = layout(f, a, size);
-            let t = (size * 0.05).max(0.4);
-            let gap = size * 0.12;
-            let top = inner.asc + gap + t;
-            let bottom = inner.desc;
-            let hook = size * 0.55;
-            let mut out = MBox { w: hook + inner.w + size * 0.1, asc: top, desc: bottom, els: Vec::new() };
-            // The radical: a short rise, the long stroke down, then up to the bar.
-            out.els.push(Elem::Line {
-                pts: vec![(0.0, -axis * 0.6), (hook * 0.25, -axis), (hook * 0.55, bottom), (hook, -top + t / 2.0), (out.w, -top + t / 2.0)],
-                w: t,
-            });
-            let iw = inner.w;
-            let _ = iw;
-            out.els.extend(inner.shifted(hook, 0.0));
-            if let Some(i) = idx {
-                let ib = layout(f, i, size * 0.55);
-                let (ia, iw2) = (ib.asc, ib.w);
-                out.els.extend(ib.shifted((hook * 0.3 - iw2).max(0.0) - 0.0, -axis - size * 0.1));
-                out.asc = out.asc.max(axis + size * 0.1 + ia);
-            }
-            out
-        }
-        Node::Big(op) => {
-            let mut b = text_box(f, op, size * 1.5, false);
-            b.asc = size * 1.05;
-            b.desc = size * 0.35;
-            for e in &mut b.els {
-                if let Elem::Text { y, .. } = e {
-                    // Centre the glyph on the math axis.
-                    *y = size * 0.32;
-                }
-            }
-            b
-        }
-        Node::Scripts { base, sup, sub } => {
-            let big = matches!(&**base, Node::Big(_));
-            let b = layout(f, base, size);
-            let s2 = size * 0.7;
-            let (bw, basc, bdesc) = (b.w, b.asc, b.desc);
-            let mut out = MBox { w: bw, asc: basc, desc: bdesc, els: b.els };
-            if big {
-                // Limits above and below.
-                let mut w = bw;
-                if let Some(sp) = sup {
-                    let sb = layout(f, sp, s2);
-                    let y = -basc - size * 0.1 - sb.desc;
-                    w = w.max(sb.w);
-                    let (sw, sa) = (sb.w, sb.asc);
-                    out.els.extend(sb.shifted((bw - sw) / 2.0, y));
-                    out.asc = out.asc.max(-y + sa);
-                }
-                if let Some(sbn) = sub {
-                    let sb = layout(f, sbn, s2);
-                    let y = bdesc + size * 0.1 + sb.asc;
-                    w = w.max(sb.w);
-                    let (sw, sd) = (sb.w, sb.desc);
-                    out.els.extend(sb.shifted((bw - sw) / 2.0, y));
-                    out.desc = out.desc.max(y + sd);
-                }
-                // Centre the operator over the widest limit.
-                let dx = (w - bw) / 2.0;
-                let els = std::mem::take(&mut out.els);
-                out = MBox { w, asc: out.asc, desc: out.desc, els: MBox { els, ..Default::default() }.shifted(dx, 0.0) };
-                return out;
-            }
-            let mut w = bw;
-            if let Some(sp) = sup {
-                let sb = layout(f, sp, s2);
-                let y = -(size * 0.42).max(basc - sb.asc * 0.6);
-                w = w.max(bw + sb.w + size * 0.05);
-                let sa = sb.asc;
-                out.els.extend(sb.shifted(bw + size * 0.05, y));
-                out.asc = out.asc.max(-y + sa);
-            }
-            if let Some(sbn) = sub {
-                let sb = layout(f, sbn, s2);
-                let y = (size * 0.2).max(bdesc * 0.8);
-                w = w.max(bw + sb.w + size * 0.05);
-                let sd = sb.desc;
-                out.els.extend(sb.shifted(bw + size * 0.05, y));
-                out.desc = out.desc.max(y + sd);
-            }
-            out.w = w;
-            out
-        }
-        Node::Fenced(open, body, close) => {
-            let inner = layout(f, body, size);
-            let h = (inner.asc + inner.desc).max(size);
-            let k = h / size;
-            let ds = size * k.max(1.0);
-            let mk = |s: &str| -> MBox {
-                if s.is_empty() {
-                    return MBox::default();
-                }
-                let mut b = text_box(f, s, ds, false);
-                // Scaled delimiters centred on the content.
-                let mid = (inner.desc - inner.asc) / 2.0;
-                for e in &mut b.els {
-                    if let Elem::Text { y, .. } = e {
-                        *y = mid + ds * 0.25;
-                    }
-                }
-                b.asc = inner.asc.max(size * 0.72);
-                b.desc = inner.desc.max(size * 0.22);
-                b
-            };
-            let (l, r) = (mk(open), mk(close));
-            hbox(vec![(l, 0.0), (inner, size * 0.05), (r, size * 0.05)])
+struct GroupLayout<'a> {
+    items: std::iter::Enumerate<std::slice::Iter<'a, Node>>,
+    parts: Vec<(MBox, f64)>,
+    prev: Option<Class>,
+    size: f64,
+}
+
+struct ScriptLayout {
+    out: MBox,
+    bw: f64,
+    basc: f64,
+    bdesc: f64,
+    big: bool,
+    size: f64,
+}
+
+impl ScriptLayout {
+    /// Seed script layout with the base box width and metrics, the big-operator flag and the size.
+    fn new(base: MBox, big: bool, size: f64) -> Self {
+        Self { bw: base.w, basc: base.asc, bdesc: base.desc, out: base, big, size }
+    }
+    /// Place a superscript, subscript or big-operator limit and expand the aggregate width, ascent and descent.
+    fn add(&mut self, script: MBox, up: bool) {
+        let Self { out, bw, basc, bdesc, big, size } = self;
+        let y = if *big {
+            if up { -*basc - *size * 0.1 - script.desc } else { *bdesc + *size * 0.1 + script.asc }
+        } else if up {
+            -(*size * 0.42).max(*basc - script.asc * 0.6)
+        } else {
+            (*size * 0.2).max(*bdesc * 0.8)
+        };
+        out.w = out.w.max(if *big { script.w } else { *bw + script.w + *size * 0.05 });
+        let (sa, sd) = (script.asc, script.desc);
+        let x = if *big { (*bw - script.w) / 2.0 } else { *bw + *size * 0.05 };
+        out.els.extend(script.shifted(x, y));
+        if up {
+            out.asc = out.asc.max(-y + sa);
+        } else {
+            out.desc = out.desc.max(y + sd);
         }
     }
+    /// For big operators, recentre the operator over the widest limit.
+    fn finish(mut self) -> MBox {
+        if self.big {
+            let dx = (self.out.w - self.bw) / 2.0;
+            let els = std::mem::take(&mut self.out.els);
+            self.out.els = MBox { els, ..Default::default() }.shifted(dx, 0.0);
+        }
+        self.out
+    }
+}
+
+enum LayoutWork<'a> {
+    Visit(&'a Node, f64),
+    GroupNext(GroupLayout<'a>),
+    GroupAppend(GroupLayout<'a>, f64),
+    FractionNumerator(&'a Node, f64),
+    FractionDenominator(MBox, f64),
+    SqrtBody(Option<&'a Node>, f64),
+    SqrtIndex(MBox, f64),
+    ScriptBase { sup: Option<&'a Node>, sub: Option<&'a Node>, big: bool, size: f64 },
+    ScriptSup { state: ScriptLayout, sub: Option<&'a Node> },
+    ScriptSub(ScriptLayout),
+    Fence(&'a str, &'a str, f64),
+}
+
+/// Postorder evaluation moves each child's box into its parent before visiting the next child.
+/// No ancestor retains a second flattened copy, and native stack use is independent of nesting.
+fn layout(f: &Fonts, n: &Node, size: f64) -> MBox {
+    let mut work = vec![LayoutWork::Visit(n, size)];
+    let mut value = MBox::default();
+    while let Some(next) = work.pop() {
+        match next {
+            LayoutWork::Visit(node, size) => match node {
+                Node::Sym(s, cl) => value = text_box(f, s, size, *cl == Class::Ident),
+                Node::Text(s) => value = text_box(f, s, size, false),
+                Node::Space(em) => value = MBox { w: em * size, ..Default::default() },
+                Node::Group(list) => {
+                    work.push(LayoutWork::GroupNext(GroupLayout { items: list.iter().enumerate(), parts: Vec::new(), prev: None, size }))
+                }
+                Node::Frac(a, b) => {
+                    work.push(LayoutWork::FractionNumerator(b, size));
+                    work.push(LayoutWork::Visit(a, size * 0.85));
+                }
+                Node::Sqrt(index, body) => {
+                    work.push(LayoutWork::SqrtBody(index.as_deref(), size));
+                    work.push(LayoutWork::Visit(body, size));
+                }
+                Node::Scripts { base, sup, sub } => {
+                    work.push(LayoutWork::ScriptBase { sup: sup.as_deref(), sub: sub.as_deref(), big: matches!(&**base, Node::Big(_)), size });
+                    work.push(LayoutWork::Visit(base, size));
+                }
+                Node::Big(op) => {
+                    let mut b = text_box(f, op, size * 1.5, false);
+                    b.asc = size * 1.05;
+                    b.desc = size * 0.35;
+                    for e in &mut b.els {
+                        if let Elem::Text { y, .. } = e {
+                            *y = size * 0.32;
+                        }
+                    }
+                    value = b;
+                }
+                Node::Fenced(open, body, close) => {
+                    work.push(LayoutWork::Fence(open, close, size));
+                    work.push(LayoutWork::Visit(body, size));
+                }
+            },
+            LayoutWork::GroupNext(mut group) => {
+                if let Some((k, item)) = group.items.next() {
+                    let cl = match item {
+                        Node::Sym(_, c) => Some(*c),
+                        Node::Scripts { base, .. } => match &**base {
+                            Node::Sym(_, c) => Some(*c),
+                            _ => None,
+                        },
+                        _ => None,
+                    };
+                    let cl = if cl == Some(Class::Bin) && (k == 0 || matches!(group.prev, Some(Class::Bin | Class::Rel | Class::Punct))) {
+                        Some(Class::Plain)
+                    } else {
+                        cl
+                    };
+                    let gap = |c: Option<Class>| match c {
+                        Some(Class::Bin) => group.size * 4.0 / 18.0,
+                        Some(Class::Rel) => group.size * 5.0 / 18.0,
+                        _ => 0.0,
+                    };
+                    let mut before = gap(cl).max(gap(group.prev));
+                    if k == 0 {
+                        before = 0.0;
+                    }
+                    if group.prev == Some(Class::Punct) {
+                        before = before.max(group.size * 3.0 / 18.0);
+                    }
+                    group.prev = cl;
+                    let size = group.size;
+                    work.push(LayoutWork::GroupAppend(group, before));
+                    work.push(LayoutWork::Visit(item, size));
+                } else {
+                    value = hbox(group.parts);
+                }
+            }
+            LayoutWork::GroupAppend(mut group, before) => {
+                group.parts.push((std::mem::take(&mut value), before));
+                work.push(LayoutWork::GroupNext(group));
+            }
+            LayoutWork::FractionNumerator(denominator, size) => {
+                work.push(LayoutWork::FractionDenominator(std::mem::take(&mut value), size));
+                work.push(LayoutWork::Visit(denominator, size * 0.85));
+            }
+            LayoutWork::FractionDenominator(na, size) => {
+                let nb = std::mem::take(&mut value);
+                let axis = size * 0.25;
+                let w = na.w.max(nb.w) + size * 0.2;
+                let t = (size * 0.06).max(0.4);
+                let gap = size * 0.15;
+                let num_base = -(axis + t / 2.0 + gap + na.desc);
+                let den_base = -axis + t / 2.0 + gap + nb.asc;
+                let mut out = MBox { w, asc: -num_base + na.asc, desc: den_base + nb.desc, els: Vec::new() };
+                out.els.push(Elem::Rule { x: 0.0, y: -axis - t / 2.0, w, h: t });
+                let (wa, wb) = (na.w, nb.w);
+                out.els.extend(na.shifted((w - wa) / 2.0, num_base));
+                out.els.extend(nb.shifted((w - wb) / 2.0, den_base));
+                value = out;
+            }
+            LayoutWork::SqrtBody(index, size) => {
+                let inner = std::mem::take(&mut value);
+                let axis = size * 0.25;
+                let t = (size * 0.05).max(0.4);
+                let gap = size * 0.12;
+                let top = inner.asc + gap + t;
+                let bottom = inner.desc;
+                let hook = size * 0.55;
+                let mut out = MBox { w: hook + inner.w + size * 0.1, asc: top, desc: bottom, els: Vec::new() };
+                out.els.push(Elem::Line {
+                    pts: vec![(0.0, -axis * 0.6), (hook * 0.25, -axis), (hook * 0.55, bottom), (hook, -top + t / 2.0), (out.w, -top + t / 2.0)],
+                    w: t,
+                });
+                out.els.extend(inner.shifted(hook, 0.0));
+                if let Some(index) = index {
+                    work.push(LayoutWork::SqrtIndex(out, size));
+                    work.push(LayoutWork::Visit(index, size * 0.55));
+                } else {
+                    value = out;
+                }
+            }
+            LayoutWork::SqrtIndex(mut out, size) => {
+                let ib = std::mem::take(&mut value);
+                let (ia, iw) = (ib.asc, ib.w);
+                let axis = size * 0.25;
+                let hook = size * 0.55;
+                out.els.extend(ib.shifted((hook * 0.3 - iw).max(0.0) - 0.0, -axis - size * 0.1));
+                out.asc = out.asc.max(axis + size * 0.1 + ia);
+                value = out;
+            }
+            LayoutWork::ScriptBase { sup, sub, big, size } => {
+                let state = ScriptLayout::new(std::mem::take(&mut value), big, size);
+                if let Some(sup) = sup {
+                    work.push(LayoutWork::ScriptSup { state, sub });
+                    work.push(LayoutWork::Visit(sup, size * 0.7));
+                } else if let Some(sub) = sub {
+                    work.push(LayoutWork::ScriptSub(state));
+                    work.push(LayoutWork::Visit(sub, size * 0.7));
+                } else {
+                    value = state.finish();
+                }
+            }
+            LayoutWork::ScriptSup { mut state, sub } => {
+                state.add(std::mem::take(&mut value), true);
+                if let Some(sub) = sub {
+                    let size = state.size;
+                    work.push(LayoutWork::ScriptSub(state));
+                    work.push(LayoutWork::Visit(sub, size * 0.7));
+                } else {
+                    value = state.finish();
+                }
+            }
+            LayoutWork::ScriptSub(mut state) => {
+                state.add(std::mem::take(&mut value), false);
+                value = state.finish();
+            }
+            LayoutWork::Fence(open, close, size) => {
+                let inner = std::mem::take(&mut value);
+                let h = (inner.asc + inner.desc).max(size);
+                let k = h / size;
+                let ds = size * k.max(1.0);
+                let mk = |s: &str| -> MBox {
+                    if s.is_empty() {
+                        return MBox::default();
+                    }
+                    let mut b = text_box(f, s, ds, false);
+                    let mid = (inner.desc - inner.asc) / 2.0;
+                    for e in &mut b.els {
+                        if let Elem::Text { y, .. } = e {
+                            *y = mid + ds * 0.25;
+                        }
+                    }
+                    b.asc = inner.asc.max(size * 0.72);
+                    b.desc = inner.desc.max(size * 0.22);
+                    b
+                };
+                let (l, r) = (mk(open), mk(close));
+                value = hbox(vec![(l, 0.0), (inner, size * 0.05), (r, size * 0.05)]);
+            }
+        }
+    }
+    value
 }
 
 /// Typeset `latex` at `size` points: SVG bytes and the size in points.
@@ -703,73 +945,4 @@ pub fn to_svg(latex: &str, size: f64) -> (Vec<u8>, (f64, f64)) {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn parses_the_common_constructs() {
-        let n = parse(r"\frac{a^2+b}{\sqrt[3]{x}}");
-        let Node::Group(v) = n else { panic!() };
-        assert!(matches!(&v[0], Node::Frac(_, _)));
-        let n = parse(r"\sum_{i=1}^{n} i^2 \le \alpha");
-        let Node::Group(v) = n else { panic!() };
-        assert!(matches!(&v[0], Node::Scripts { base, sup: Some(_), sub: Some(_) } if matches!(**base, Node::Big(_))));
-        assert!(v.iter().any(|x| *x == Node::Sym("≤".into(), Class::Rel)));
-        assert!(v.iter().any(|x| *x == Node::Sym("α".into(), Class::Ident)));
-        let n = parse(r"\left( \frac{1}{2} \right) + \text{if } x");
-        let Node::Group(v) = n else { panic!() };
-        assert!(matches!(&v[0], Node::Fenced(o, _, c) if o == "(" && c == ")"));
-        assert!(v.contains(&Node::Text("if ".into())));
-    }
-
-    /// A command that merely starts with "right" (`\rightarrow`) must not close a `\left` fence.
-    #[test]
-    fn right_prefixed_commands_do_not_close_a_fence() {
-        let n = parse(r"\left( x \rightarrow y \right)");
-        let Node::Group(v) = n else { panic!() };
-        assert_eq!(v.len(), 1, "{v:?}");
-        let Node::Fenced(o, body, c) = &v[0] else { panic!("{v:?}") };
-        assert!(o == "(" && c == ")", "{v:?}");
-        let Node::Group(b) = &**body else { panic!("{v:?}") };
-        assert_eq!(*b, vec![Node::Sym("x".into(), Class::Ident), Node::Sym("→".into(), Class::Rel), Node::Sym("y".into(), Class::Ident)]);
-        // An unknown `\right…` command stays inside the fence too.
-        let Node::Group(v) = parse(r"\left[ \rightfoo \right]") else { panic!() };
-        assert_eq!(v.len(), 1, "{v:?}");
-        assert!(matches!(&v[0], Node::Fenced(o, _, c) if o == "[" && c == "]"), "{v:?}");
-        // Real closers still close it.
-        for (src, close) in [(r"\left( x \right)", ")"), (r"\left( x \right.", ""), (r"\left( x \right)y", ")")] {
-            let Node::Group(v) = parse(src) else { panic!() };
-            assert!(matches!(&v[0], Node::Fenced(_, _, c) if c == close), "{src}: {v:?}");
-        }
-    }
-
-    #[test]
-    fn layout_sizes_and_svg() {
-        let (svg, (w, h)) = to_svg(r"E = mc^2", 12.0);
-        let s = String::from_utf8(svg).unwrap();
-        assert!(s.starts_with("<svg") && s.contains("font-style=\"italic\">E<") && s.contains(">2<"));
-        assert!(w > 30.0 && h > 10.0, "{w} {h}");
-        // A fraction is taller than its numerator alone; a big operator with limits taller still.
-        let (_, (_, h1)) = to_svg("x", 12.0);
-        let (_, (_, h2)) = to_svg(r"\frac{x}{y}", 12.0);
-        let (_, (_, h3)) = to_svg(r"\sum_{i=0}^{n}", 12.0);
-        assert!(h2 > h1 * 1.4 && h3 > h2, "{h1} {h2} {h3}");
-        // The SVG parses and rasterises.
-        let (svg, _) = to_svg(r"\sqrt{a^2+b^2} \ne \pi", 14.0);
-        assert!(designcraft_images::svg_tree(&svg).is_some());
-    }
-
-    /// Hostile input must not overflow the stack: nesting past the cap stops descending instead
-    /// of recursing once per group (100k levels used to abort the process).
-    #[test]
-    fn an_over_deep_expression_is_bounded() {
-        for latex in [
-            format!("{}x{}", "{".repeat(100_000), "}".repeat(100_000)),
-            format!("{}x", r"\frac".repeat(100_000)),
-            format!("{}x", r"\left(".repeat(100_000)),
-        ] {
-            let (svg, _) = to_svg(&latex, 12.0);
-            assert!(!svg.is_empty());
-        }
-    }
-}
+mod tests;
diff --git a/crates/engine/src/math/tests.rs b/crates/engine/src/math/tests.rs
new file mode 100644
index 000000000..9d1e75884
--- /dev/null
+++ b/crates/engine/src/math/tests.rs
@@ -0,0 +1,476 @@
+use super::*;
+
+// Frozen pre-repair arithmetic; called only for shallow fixtures, never deep input.
+/// Frozen recursive layout oracle for shallow test fixtures only, never deep input.
+fn recursive_layout_reference(f: &Fonts, n: &Node, size: f64) -> MBox {
+    match n {
+        Node::Sym(s, cl) => text_box(f, s, size, *cl == Class::Ident),
+        Node::Text(s) => text_box(f, s, size, false),
+        Node::Space(em) => MBox { w: em * size, ..Default::default() },
+        Node::Group(list) => recursive_group_reference(f, list, size),
+        Node::Frac(a, b) => recursive_fraction_reference(f, a, b, size),
+        Node::Sqrt(idx, a) => recursive_sqrt_reference(f, idx, a, size),
+        Node::Big(op) => recursive_big_reference(f, op, size),
+        Node::Scripts { base, sup, sub } => recursive_scripts_reference(f, base, sup, sub, size),
+        Node::Fenced(open, body, close) => recursive_fenced_reference(f, open, body, close, size),
+    }
+}
+
+/// Oracle for operator spacing, leading-sign treatment and punctuation gaps.
+fn recursive_group_reference(f: &Fonts, list: &[Node], size: f64) -> MBox {
+    let mut parts = Vec::new();
+    let mut prev: Option<Class> = None;
+    for (k, item) in list.iter().enumerate() {
+        let cl = match item {
+            Node::Sym(_, c) => Some(*c),
+            Node::Scripts { base, .. } => match &**base {
+                Node::Sym(_, c) => Some(*c),
+                _ => None,
+            },
+            _ => None,
+        };
+        // A leading + or − (or after another operator) is a sign, not a binary operator.
+        let cl =
+            if cl == Some(Class::Bin) && (k == 0 || matches!(prev, Some(Class::Bin | Class::Rel | Class::Punct))) { Some(Class::Plain) } else { cl };
+        let gap = |c: Option<Class>| match c {
+            Some(Class::Bin) => size * 4.0 / 18.0,
+            Some(Class::Rel) => size * 5.0 / 18.0,
+            _ => 0.0,
+        };
+        let mut before = gap(cl).max(gap(prev));
+        if k == 0 {
+            before = 0.0;
+        }
+        if prev == Some(Class::Punct) {
+            before = before.max(size * 3.0 / 18.0);
+        }
+        parts.push((recursive_layout_reference(f, item, size), before));
+        prev = cl;
+    }
+    hbox(parts)
+}
+
+/// Oracle for fraction rule, child scale, math axis, gaps and bounds.
+fn recursive_fraction_reference(f: &Fonts, a: &Node, b: &Node, size: f64) -> MBox {
+    let axis = size * 0.25;
+    let s2 = size * 0.85;
+    let (na, nb) = (recursive_layout_reference(f, a, s2), recursive_layout_reference(f, b, s2));
+    let w = na.w.max(nb.w) + size * 0.2;
+    let t = (size * 0.06).max(0.4);
+    let gap = size * 0.15;
+    let num_base = -(axis + t / 2.0 + gap + na.desc);
+    let den_base = -axis + t / 2.0 + gap + nb.asc;
+    let mut out = MBox { w, asc: -num_base + na.asc, desc: den_base + nb.desc, els: Vec::new() };
+    out.els.push(Elem::Rule { x: 0.0, y: -axis - t / 2.0, w, h: t });
+    let (wa, wb) = (na.w, nb.w);
+    out.els.extend(na.shifted((w - wa) / 2.0, num_base));
+    out.els.extend(nb.shifted((w - wb) / 2.0, den_base));
+    out
+}
+
+/// Oracle for radical geometry, body offset and optional root index.
+fn recursive_sqrt_reference(f: &Fonts, idx: &Option<Box<Node>>, a: &Node, size: f64) -> MBox {
+    let axis = size * 0.25;
+    let inner = recursive_layout_reference(f, a, size);
+    let t = (size * 0.05).max(0.4);
+    let gap = size * 0.12;
+    let top = inner.asc + gap + t;
+    let bottom = inner.desc;
+    let hook = size * 0.55;
+    let mut out = MBox { w: hook + inner.w + size * 0.1, asc: top, desc: bottom, els: Vec::new() };
+    // The radical: a short rise, the long stroke down, then up to the bar.
+    out.els.push(Elem::Line {
+        pts: vec![(0.0, -axis * 0.6), (hook * 0.25, -axis), (hook * 0.55, bottom), (hook, -top + t / 2.0), (out.w, -top + t / 2.0)],
+        w: t,
+    });
+    let iw = inner.w;
+    let _ = iw;
+    out.els.extend(inner.shifted(hook, 0.0));
+    if let Some(i) = idx {
+        let ib = recursive_layout_reference(f, i, size * 0.55);
+        let (ia, iw2) = (ib.asc, ib.w);
+        out.els.extend(ib.shifted((hook * 0.3 - iw2).max(0.0) - 0.0, -axis - size * 0.1));
+        out.asc = out.asc.max(axis + size * 0.1 + ia);
+    }
+    out
+}
+
+/// Oracle for enlarged, math-axis-centred big operators.
+fn recursive_big_reference(f: &Fonts, op: &str, size: f64) -> MBox {
+    let mut b = text_box(f, op, size * 1.5, false);
+    b.asc = size * 1.05;
+    b.desc = size * 0.35;
+    for e in &mut b.els {
+        if let Elem::Text { y, .. } = e {
+            // Centre the glyph on the math axis.
+            *y = size * 0.32;
+        }
+    }
+    b
+}
+
+/// Oracle for ordinary sup/sub placement and big-operator limits above and below.
+fn recursive_scripts_reference(f: &Fonts, base: &Node, sup: &Option<Box<Node>>, sub: &Option<Box<Node>>, size: f64) -> MBox {
+    let big = matches!(base, Node::Big(_));
+    let b = recursive_layout_reference(f, base, size);
+    let s2 = size * 0.7;
+    let (bw, basc, bdesc) = (b.w, b.asc, b.desc);
+    let mut out = MBox { w: bw, asc: basc, desc: bdesc, els: b.els };
+    if big {
+        // Limits above and below.
+        let mut w = bw;
+        if let Some(sp) = sup {
+            let sb = recursive_layout_reference(f, sp, s2);
+            let y = -basc - size * 0.1 - sb.desc;
+            w = w.max(sb.w);
+            let (sw, sa) = (sb.w, sb.asc);
+            out.els.extend(sb.shifted((bw - sw) / 2.0, y));
+            out.asc = out.asc.max(-y + sa);
+        }
+        if let Some(sbn) = sub {
+            let sb = recursive_layout_reference(f, sbn, s2);
+            let y = bdesc + size * 0.1 + sb.asc;
+            w = w.max(sb.w);
+            let (sw, sd) = (sb.w, sb.desc);
+            out.els.extend(sb.shifted((bw - sw) / 2.0, y));
+            out.desc = out.desc.max(y + sd);
+        }
+        // Centre the operator over the widest limit.
+        let dx = (w - bw) / 2.0;
+        let els = std::mem::take(&mut out.els);
+        return MBox { w, asc: out.asc, desc: out.desc, els: MBox { els, ..Default::default() }.shifted(dx, 0.0) };
+    }
+    let mut w = bw;
+    if let Some(sp) = sup {
+        let sb = recursive_layout_reference(f, sp, s2);
+        let y = -(size * 0.42).max(basc - sb.asc * 0.6);
+        w = w.max(bw + sb.w + size * 0.05);
+        let sa = sb.asc;
+        out.els.extend(sb.shifted(bw + size * 0.05, y));
+        out.asc = out.asc.max(-y + sa);
+    }
+    if let Some(sbn) = sub {
+        let sb = recursive_layout_reference(f, sbn, s2);
+        let y = (size * 0.2).max(bdesc * 0.8);
+        w = w.max(bw + sb.w + size * 0.05);
+        let sd = sb.desc;
+        out.els.extend(sb.shifted(bw + size * 0.05, y));
+        out.desc = out.desc.max(y + sd);
+    }
+    out.w = w;
+    out
+}
+
+/// Oracle for content-scaled, centred delimiters.
+fn recursive_fenced_reference(f: &Fonts, open: &str, body: &Node, close: &str, size: f64) -> MBox {
+    let inner = recursive_layout_reference(f, body, size);
+    let h = (inner.asc + inner.desc).max(size);
+    let k = h / size;
+    let ds = size * k.max(1.0);
+    let mk = |s: &str| -> MBox {
+        if s.is_empty() {
+            return MBox::default();
+        }
+        let mut b = text_box(f, s, ds, false);
+        // Scaled delimiters centred on the content.
+        let mid = (inner.desc - inner.asc) / 2.0;
+        for e in &mut b.els {
+            if let Elem::Text { y, .. } = e {
+                *y = mid + ds * 0.25;
+            }
+        }
+        b.asc = inner.asc.max(size * 0.72);
+        b.desc = inner.desc.max(size * 0.22);
+        b
+    };
+    let (l, r) = (mk(open), mk(close));
+    hbox(vec![(l, 0.0), (inner, size * 0.05), (r, size * 0.05)])
+}
+
+/// Asserts fraction/nested-root, big scripts, relation, symbol, fence and raw `\text` parse shapes.
+#[test]
+fn parses_the_common_constructs() {
+    let n = parse(r"\frac{a^2+b}{\sqrt[3]{x}}");
+    let Node::Group(v) = &n else { panic!() };
+    assert!(matches!(&v[0], Node::Frac(_, _)));
+    let n = parse(r"\sum_{i=1}^{n} i^2 \le \alpha");
+    let Node::Group(v) = &n else { panic!() };
+    assert!(matches!(&v[0], Node::Scripts { base, sup: Some(_), sub: Some(_) } if matches!(**base, Node::Big(_))));
+    assert!(v.iter().any(|x| *x == Node::Sym("≤".into(), Class::Rel)));
+    assert!(v.iter().any(|x| *x == Node::Sym("α".into(), Class::Ident)));
+    let n = parse(r"\left( \frac{1}{2} \right) + \text{if } x");
+    let Node::Group(v) = &n else { panic!() };
+    assert!(matches!(&v[0], Node::Fenced(o, _, c) if o == "(" && c == ")"));
+    assert!(v.contains(&Node::Text("if ".into())));
+}
+
+/// A command that merely starts with "right" (`\rightarrow`) must not close a `\left` fence.
+#[test]
+fn right_prefixed_commands_do_not_close_a_fence() {
+    let n = parse(r"\left( x \rightarrow y \right)");
+    let Node::Group(v) = &n else { panic!() };
+    assert_eq!(v.len(), 1, "{v:?}");
+    let Node::Fenced(o, body, c) = &v[0] else { panic!("{v:?}") };
+    assert!(o == "(" && c == ")", "{v:?}");
+    let Node::Group(b) = &**body else { panic!("{v:?}") };
+    assert_eq!(*b, vec![Node::Sym("x".into(), Class::Ident), Node::Sym("→".into(), Class::Rel), Node::Sym("y".into(), Class::Ident)]);
+    // An unknown `\right…` command stays inside the fence too.
+    let Node::Group(v) = &parse(r"\left[ \rightfoo \right]") else { panic!() };
+    assert_eq!(v.len(), 1, "{v:?}");
+    assert!(matches!(&v[0], Node::Fenced(o, _, c) if o == "[" && c == "]"), "{v:?}");
+    // Real closers still close it.
+    for (src, close) in [(r"\left( x \right)", ")"), (r"\left( x \right.", ""), (r"\left( x \right)y", ")")] {
+        let Node::Group(v) = &parse(src) else { panic!() };
+        assert!(matches!(&v[0], Node::Fenced(_, _, c) if c == close), "{src}: {v:?}");
+    }
+}
+
+#[test]
+fn layout_sizes_and_svg() {
+    let (svg, (w, h)) = to_svg(r"E = mc^2", 12.0);
+    let s = String::from_utf8(svg).unwrap();
+    assert!(s.starts_with("<svg") && s.contains("font-style=\"italic\">E<") && s.contains(">2<"));
+    assert!(w > 30.0 && h > 10.0, "{w} {h}");
+    // A fraction is taller than its numerator alone; a big operator with limits taller still.
+    let (_, (_, h1)) = to_svg("x", 12.0);
+    let (_, (_, h2)) = to_svg(r"\frac{x}{y}", 12.0);
+    let (_, (_, h3)) = to_svg(r"\sum_{i=0}^{n}", 12.0);
+    assert!(h2 > h1 * 1.4 && h3 > h2, "{h1} {h2} {h3}");
+    // The SVG parses and rasterises.
+    let (svg, _) = to_svg(r"\sqrt{a^2+b^2} \ne \pi", 14.0);
+    assert!(designcraft_images::svg_tree(&svg).is_some());
+}
+
+/// Hostile input must not overflow the stack: nesting past the cap stops descending instead
+/// of recursing once per group (100k levels used to abort the process).
+#[test]
+fn an_over_deep_expression_is_bounded() {
+    for latex in [
+        format!("{}x{}", "{".repeat(100_000), "}".repeat(100_000)),
+        format!("{}x", r"\frac".repeat(100_000)),
+        format!("{}x", r"\left(".repeat(100_000)),
+        format!("{}z{}", r"\sqrt{".repeat(1_024), "}".repeat(1_024)),
+        format!("{}z{}", "x^{".repeat(1_024), "}".repeat(1_024)),
+    ] {
+        let (svg, (w, h)) = to_svg(&latex, 12.0);
+        assert!(!svg.is_empty());
+        assert!(w.is_finite() && h.is_finite() && w > 0.0 && h > 0.0, "{w} {h}");
+    }
+}
+/// Count actual tree shape without recursively comparing or formatting a deep AST.
+fn shape(root: &Node) -> ([usize; 6], usize) {
+    let mut counts = [0; 6]; // groups, fractions, roots, fences, scripts, sentinel z
+    let mut deepest = 0;
+    let mut work = vec![(root, 1)];
+    while let Some((node, depth)) = work.pop() {
+        deepest = deepest.max(depth);
+        match node {
+            Node::Group(nodes) => {
+                counts[0] += 1;
+                work.extend(nodes.iter().map(|node| (node, depth + 1)));
+            }
+            Node::Frac(a, b) => {
+                counts[1] += 1;
+                work.extend([(a.as_ref(), depth + 1), (b.as_ref(), depth + 1)]);
+            }
+            Node::Sqrt(index, body) => {
+                counts[2] += 1;
+                work.push((body, depth + 1));
+                if let Some(index) = index {
+                    work.push((index, depth + 1));
+                }
+            }
+            Node::Fenced(_, body, _) => {
+                counts[3] += 1;
+                work.push((body, depth + 1));
+            }
+            Node::Scripts { base, sup, sub } => {
+                counts[4] += 1;
+                work.push((base, depth + 1));
+                if let Some(sup) = sup {
+                    work.push((sup, depth + 1));
+                }
+                if let Some(sub) = sub {
+                    work.push((sub, depth + 1));
+                }
+            }
+            Node::Sym(s, _) if s == "z" => counts[5] += 1,
+            _ => {}
+        }
+    }
+    (counts, deepest)
+}
+
+/// With `MAX_NESTING == 256`, all supported 255-level constructs stay nested and still render their sentinel.
+#[test]
+fn the_full_256_budget_keeps_deep_valid_formulas_intact() {
+    assert_eq!(MAX_NESTING, 256, "preserve the existing expression capability");
+    let groups = MAX_NESTING - 1;
+    let arguments = (MAX_NESTING - 1) / 2;
+    let index_groups = MAX_NESTING - 3;
+    let cases = [
+        (format!("{}z{}", "{".repeat(groups), "}".repeat(groups)), [groups + 1, 0, 0, 0, 0, 1], groups + 2),
+        (format!("{}z{}", r"\left(".repeat(groups), r"\right)".repeat(groups)), [groups + 1, 0, 0, groups, 0, 1], groups * 2 + 2),
+        (format!("{}z{}", r"\frac{".repeat(arguments), "}{y}".repeat(arguments)), [arguments * 2 + 1, arguments, 0, 0, 0, 1], arguments * 2 + 2),
+        (format!("{}z{}", r"\sqrt{".repeat(arguments), "}".repeat(arguments)), [arguments + 1, 0, arguments, 0, 0, 1], arguments * 2 + 2),
+        (format!("{}z{}", "x^{".repeat(arguments), "}".repeat(arguments)), [arguments + 1, 0, 0, 0, arguments, 1], arguments * 2 + 2),
+        (format!("{}z{}", "x_{".repeat(arguments), "}".repeat(arguments)), [arguments + 1, 0, 0, 0, arguments, 1], arguments * 2 + 2),
+        (format!(r"\sqrt[{}z{}]{{y}}", "{".repeat(index_groups), "}".repeat(index_groups)), [index_groups + 3, 0, 1, 0, 0, 1], index_groups + 4),
+    ];
+    for (latex, counts, depth) in cases {
+        assert_eq!(shape(&parse(&latex)), (counts, depth), "all constructs must remain nested, not flatten into siblings");
+        let (svg, (w, h)) = to_svg(&latex, 12.0);
+        assert!(w.is_finite() && h.is_finite() && w > 0.0 && h > 0.0, "{w} {h}");
+        assert!(String::from_utf8(svg).unwrap().contains(">z<"), "the innermost content must render");
+    }
+}
+
+/// A capped list consumes nothing; capped root-index/body cursor behavior and the permissive first-`]` grammar remain unchanged.
+#[test]
+fn cap_and_index_returns_preserve_their_exact_cursor_semantics() {
+    let chars: Vec<_> = "x".chars().collect();
+    let mut p = Parser { s: &chars, i: 0 };
+    assert_eq!(p.parse(MAX_NESTING - 1), Node::Group(vec![Node::Sym("x".into(), Class::Ident)]));
+    assert_eq!(p.i, 1);
+    let mut p = Parser { s: &chars, i: 0 };
+    assert_eq!(p.parse(MAX_NESTING), Node::Group(vec![]));
+    assert_eq!(p.i, 0, "a capped List does not consume its input");
+    // Both the index subparse and radicand still have their entire old depth allowance.
+    let source = r"\sqrt[x]{y}z";
+    assert_eq!(
+        parse_at(source, MAX_NESTING - 4),
+        Node::Group(vec![
+            Node::Sqrt(
+                Some(Box::new(Node::Group(vec![Node::Sym("x".into(), Class::Ident)]))),
+                Box::new(Node::Group(vec![Node::Sym("y".into(), Class::Ident)]))
+            ),
+            Node::Sym("z".into(), Class::Ident),
+        ])
+    );
+    // At this starting depth the index and braced body are capped. The outer cursor is
+    // restored after ']', then the old non-consuming body cap leaves y/}/z as siblings.
+    let chars: Vec<_> = source.chars().collect();
+    let mut p = Parser { s: &chars, i: 0 };
+    assert_eq!(
+        p.parse(MAX_NESTING - 2),
+        Node::Group(vec![
+            Node::Sqrt(Some(Box::new(Node::Group(vec![]))), Box::new(Node::Group(vec![]))),
+            Node::Sym("y".into(), Class::Ident),
+            Node::Sym("}".into(), Class::Plain),
+            Node::Sym("z".into(), Class::Ident),
+        ])
+    );
+    assert_eq!(p.i, chars.len());
+    // Do not change the permissive first-']' index grammar into balanced bracket parsing.
+    assert_eq!(
+        parse(r"\sqrt[x[y]z]q"),
+        Node::Group(vec![
+            Node::Sqrt(
+                Some(Box::new(Node::Group(vec![
+                    Node::Sym("x".into(), Class::Ident),
+                    Node::Sym("[".into(), Class::Plain),
+                    Node::Sym("y".into(), Class::Ident)
+                ]))),
+                Box::new(Node::Sym("z".into(), Class::Ident))
+            ),
+            Node::Sym("]".into(), Class::Plain),
+            Node::Sym("q".into(), Class::Ident),
+        ])
+    );
+}
+
+/// Repeated scripts replace slots; a fence `^` stays literal; incomplete fractions, escaped braces and unknown commands retain the prior grammar.
+#[test]
+fn heap_continuations_preserve_small_grammar_and_script_precedence() {
+    let sym = |s: &str| Node::Sym(s.into(), Class::Ident);
+    assert_eq!(
+        parse("x^{a}_{b}^{c}_{d}"),
+        Node::Group(vec![Node::Scripts {
+            base: Box::new(sym("x")),
+            sup: Some(Box::new(Node::Group(vec![sym("c")]))),
+            sub: Some(Box::new(Node::Group(vec![sym("d")]))),
+        }])
+    );
+    assert_eq!(
+        parse(r"\left( ^x \right)"),
+        Node::Group(vec![Node::Fenced("(".into(), Box::new(Node::Group(vec![Node::Sym("^".into(), Class::Plain), sym("x")])), ")".into())])
+    );
+    assert_eq!(parse(r"\frac{x"), Node::Group(vec![Node::Frac(Box::new(Node::Group(vec![sym("x")])), Box::new(Node::Group(vec![])))]));
+    assert_eq!(
+        parse(r"\text{a{b}}\{\}\_\unknown"),
+        Node::Group(vec![
+            Node::Text("a{b}".into()),
+            Node::Sym("{".into(), Class::Punct),
+            Node::Sym("}".into(), Class::Punct),
+            Node::Sym("_".into(), Class::Plain),
+            Node::Text(r"\unknown".into())
+        ])
+    );
+}
+
+/// Iterative layout equals the frozen recursive oracle for representative formulas, including malformed inputs.
+#[test]
+fn heap_layout_preserves_the_existing_element_order_and_geometry() {
+    let db = FontDb::global();
+    let f = Fonts { upright: db.face(FAMILY, "Regular"), italic: db.face(FAMILY, "Italic"), fallback: db.face(FALLBACK, "Regular") };
+    for latex in [
+        "E = mc^2",
+        "x^{a}_{b}^{c}_{d}",
+        r"\frac{a^2+b}{\sqrt[3]{x}}",
+        r"\sum_{i=0}^{n} i^2",
+        r"\int_a^b x",
+        r"\left( x \rightarrow y \right) + \text{if } x",
+        r"\left. x \right]",
+        r"-x,+y;\quad z",
+        r"\sqrt[x[y]z]q",
+        r"\frac{x",
+        r"\left( ^x \right)",
+    ] {
+        let tree = parse(latex);
+        let actual = layout(&f, &tree, 12.0);
+        let expected = recursive_layout_reference(&f, &tree, 12.0);
+        assert_eq!((actual.w, actual.asc, actual.desc, actual.els), (expected.w, expected.asc, expected.desc, expected.els), "{latex}");
+    }
+}
+
+/// Build a deep five-way alternating AST for destructor stress tests.
+fn mixed_chain(depth: usize) -> Node {
+    let mut node = Node::Sym("z".into(), Class::Ident);
+    for i in 0..depth {
+        node = match i % 5 {
+            0 => Node::Group(vec![node]),
+            1 => Node::Frac(Box::new(node), Box::new(Node::Text("d".into()))),
+            2 => Node::Sqrt(Some(Box::new(Node::Text("3".into()))), Box::new(node)),
+            3 => Node::Scripts { base: Box::new(node), sup: Some(Box::new(Node::Text("p".into()))), sub: Some(Box::new(Node::Text("q".into()))) },
+            _ => Node::Fenced("(".into(), Box::new(node), ")".into()),
+        };
+    }
+    node
+}
+
+/// Drops 50k-node chains, replaces one script slot, and unwinds parser continuations while preserving the retained slot.
+#[test]
+fn deep_nodes_drop_when_replaced_or_owned_by_unwinding_continuations() {
+    // Far beyond the parser budget: this directly proves the private destructor's traversal.
+    drop(mixed_chain(50_000));
+    for up in [false, true] {
+        let old = Box::new(mixed_chain(50_000));
+        let other = Box::new(Node::Text("other".into()));
+        let (sup, sub) = if up { (Some(old), Some(other)) } else { (Some(other), Some(old)) };
+        let root = attach_script(Node::Scripts { base: Box::new(Node::Big("∑".into())), sup, sub }, Node::Text("new".into()), up);
+        let Node::Scripts { base, sup, sub } = &root else { panic!("script wrapper") };
+        assert!(matches!(&**base, Node::Big(s) if s == "∑"));
+        let (replaced, retained) = if up { (sup, sub) } else { (sub, sup) };
+        assert!(matches!(replaced.as_deref(), Some(Node::Text(s)) if s == "new"));
+        assert!(matches!(retained.as_deref(), Some(Node::Text(s)) if s == "other"));
+    }
+    let result = std::panic::catch_unwind(|| {
+        // Actual continuation variants own completed children while awaiting later input.
+        let _partial = [
+            ParseWork::FractionDenominator { numerator: mixed_chain(25_000) },
+            ParseWork::SqrtArgument { index: Some(Box::new(mixed_chain(25_000))) },
+        ];
+        panic!("exercise partial-parser-state unwinding");
+    });
+    assert!(result.is_err(), "the intentional panic must actually unwind the owned frames");
+}
diff --git a/crates/engine/src/recovery.rs b/crates/engine/src/recovery.rs
index 7ec62d073..eb6d99886 100644
--- a/crates/engine/src/recovery.rs
+++ b/crates/engine/src/recovery.rs
@@ -858,841 +858,7 @@ fn open_with_publisher(s: &mut Session, dir: &Path, mut publish: impl FnMut(&Pat
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn dirty_session() -> Session {
-        let mut session = Session::new();
-        session.execute("file.new", &json!({})).unwrap();
-        session.execute("frame.create", &json!({"rect": [10, 10, 100, 100]})).unwrap();
-        session
-    }
-
-    #[test]
-    fn recovers_unsaved_documents() {
-        let dir = std::env::temp_dir().join(format!("dc-recovery-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("file.new", &json!({})).unwrap();
-        // Only the edited document is written.
-        s.execute("frame.create", &json!({"rect": [10, 10, 100, 100]})).unwrap();
-        assert_eq!(save(&s, &dir).unwrap(), 1);
-        assert_eq!(list(&dir).len(), 1);
-        // "Crash": a new session reopens it, unsaved, with the item.
-        let mut s2 = Session::new();
-        let opened = open(&mut s2, &dir).unwrap();
-        assert_eq!(opened.len(), 1);
-        let st = s2.doc().unwrap();
-        assert!(st.is_dirty());
-        assert_eq!(st.doc.spreads[0].items.len(), 1);
-        // The entry moved to the reopened document: a session that ends before its first
-        // recovery save (a restart, another crash) still leaves it to recover.
-        let entries = list(&dir);
-        assert_eq!(entries.iter().map(|e| e.0).collect::<Vec<_>>(), [st.uid]);
-        let mut s3 = Session::new();
-        assert_eq!(open(&mut s3, &dir).unwrap().len(), 1);
-        assert_eq!(s3.doc().unwrap().doc.spreads[0].items.len(), 1);
-        assert!(s3.doc().unwrap().is_dirty());
-        assert_eq!(list(&dir).len(), 1, "recovering twice never duplicates an entry");
-        discard(&dir, s3.doc().unwrap().uid);
-        // Saving a document drops its entry.
-        s.recovery_dir = Some(dir.clone());
-        assert_eq!(save(&s, &dir).unwrap(), 1);
-        let path = dir.join("saved.designcraft");
-        s.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
-        assert!(list(&dir).is_empty());
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn a_recovered_document_survives_a_second_crash_before_autosave() {
-        let dir = tempfile::tempdir().unwrap();
-        let original = unsaved("edits preserved after a second crash");
-        assert_eq!(save(&original, dir.path()).unwrap(), 1);
-        let mut reopened = Session::new();
-        assert_eq!(open(&mut reopened, dir.path()).unwrap().len(), 1);
-        drop(reopened);
-        let mut recovered_again = Session::new();
-        assert_eq!(open(&mut recovered_again, dir.path()).unwrap().len(), 1);
-        assert_eq!(texts(&recovered_again), ["edits preserved after a second crash"]);
-        assert!(recovered_again.documents().iter().all(DocState::is_dirty));
-        assert_eq!(list(dir.path()).len(), 1);
-    }
-
-    #[test]
-    fn opening_recovery_again_does_not_duplicate_live_documents() {
-        let dir = tempfile::tempdir().unwrap();
-        assert_eq!(save(&unsaved("one recovered document"), dir.path()).unwrap(), 1);
-        let mut reopened = Session::new();
-        reopened.recovery_dir = Some(dir.path().to_path_buf());
-        assert_eq!(open(&mut reopened, dir.path()).unwrap().len(), 1);
-        assert!(open(&mut reopened, dir.path()).unwrap().is_empty());
-        assert_eq!(texts(&reopened), ["one recovered document"]);
-        assert_eq!(list(dir.path()).len(), 1);
-    }
-
-    /// Directory collisions fail even for privileged runners. Creating the blocker in the
-    /// publisher occurs after UID reservation, which would otherwise skip an occupied path.
-    fn open_with_failed_republication(s: &mut Session, dir: &Path) -> Result<Vec<usize>> {
-        let mut attempts = 0;
-        let opened = open_with_publisher(s, dir, |path, bytes| {
-            assert_eq!(path.extension().and_then(|extension| extension.to_str()), Some("designcraft"));
-            std::fs::create_dir(path).unwrap();
-            let result = publish_recovery_file(path, bytes, false);
-            std::fs::remove_dir(path).unwrap();
-            assert!(result.is_err(), "a directory must obstruct actual recovery publication");
-            attempts += 1;
-            result
-        });
-        assert_eq!(attempts, 1, "the fixture must exercise the actual failed publication");
-        opened
-    }
-
-    #[test]
-    fn a_failed_recovery_rewrite_preserves_the_original() {
-        let dir = tempfile::tempdir().unwrap();
-        assert_eq!(save(&unsaved("keep the original"), dir.path()).unwrap(), 1);
-        let entries = list(dir.path());
-        let original = files(dir.path(), entries[0].0).0;
-        let bytes = std::fs::read(&original).unwrap();
-        let mut reopened = Session::new();
-        let result = open_with_failed_republication(&mut reopened, dir.path());
-        assert_eq!(result.unwrap().len(), 1);
-        assert_eq!(texts(&reopened), ["keep the original"]);
-        assert_eq!(std::fs::read(original).unwrap(), bytes);
-        assert_eq!(list(dir.path()).len(), 1);
-        // Its source uid differs from the reopened uid, but explicit Close still discards it.
-        assert!(open(&mut reopened, dir.path()).unwrap().is_empty());
-        reopened.close_document(0);
-        assert!(list(dir.path()).is_empty());
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn recovery_data_is_private_to_the_user() {
-        use std::os::unix::fs::PermissionsExt;
-
-        let root = tempfile::tempdir().unwrap();
-        let dir = root.path().join("recovery");
-        let s = dirty_session();
-        assert_eq!(save(&s, &dir).unwrap(), 1);
-
-        assert_eq!(std::fs::metadata(&dir).unwrap().permissions().mode() & 0o777, 0o700);
-        let entries: Vec<_> = std::fs::read_dir(&dir).unwrap().collect();
-        assert_eq!(entries.len(), 2);
-        for entry in entries {
-            let entry = entry.unwrap();
-            assert_eq!(entry.metadata().unwrap().permissions().mode() & 0o777, 0o600);
-        }
-    }
-
-    #[test]
-    fn existing_recovery_directory_is_used() {
-        let root = tempfile::tempdir().unwrap();
-        let dir = root.path().join("recovery");
-        std::fs::create_dir(&dir).unwrap();
-
-        assert_eq!(save(&dirty_session(), &dir).unwrap(), 1);
-        assert_eq!(list(&dir).len(), 1);
-        assert!(std::fs::symlink_metadata(&dir).unwrap().file_type().is_dir());
-    }
-
-    #[test]
-    fn non_directory_recovery_path_is_rejected() {
-        let root = tempfile::tempdir().unwrap();
-        let path = root.path().join("recovery");
-        std::fs::write(&path, b"not a directory").unwrap();
-
-        assert!(save(&dirty_session(), &path).is_err());
-        assert_eq!(std::fs::read(&path).unwrap(), b"not a directory");
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn existing_recovery_directory_permissions_are_preserved() {
-        use std::os::unix::fs::PermissionsExt;
-
-        let root = tempfile::tempdir().unwrap();
-        let dir = root.path().join("recovery");
-        std::fs::create_dir(&dir).unwrap();
-        std::fs::set_permissions(&dir, std::fs::Permissions::from_mode(0o750)).unwrap();
-
-        assert_eq!(save(&dirty_session(), &dir).unwrap(), 1);
-        assert_eq!(std::fs::metadata(&dir).unwrap().permissions().mode() & 0o777, 0o750);
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn symlink_recovery_directory_is_rejected() {
-        use std::os::unix::fs::symlink;
-
-        let root = tempfile::tempdir().unwrap();
-        let destination = root.path().join("destination");
-        let link = root.path().join("recovery");
-        std::fs::create_dir(&destination).unwrap();
-        symlink(&destination, &link).unwrap();
-
-        assert!(save(&dirty_session(), &link).is_err());
-        assert!(std::fs::read_dir(&destination).unwrap().next().is_none());
-        std::fs::write(destination.join("7.designcraft"), b"unchanged").unwrap();
-        std::fs::write(destination.join("7.json"), b"{}").unwrap();
-        assert!(list(&link).is_empty());
-        discard(&link, 7);
-        assert_eq!(std::fs::read(destination.join("7.designcraft")).unwrap(), b"unchanged");
-        assert!(open(&mut Session::new(), &link).is_err());
-        assert!(std::fs::symlink_metadata(&link).unwrap().file_type().is_symlink());
-    }
-
-    #[test]
-    fn a_run_has_a_locked_folder_of_its_own() {
-        let root = tempfile::tempdir().unwrap();
-        let dir = root.path().join("recovery");
-        let own = run_dir(&dir).unwrap();
-        assert_eq!(own.parent(), Some(dir.as_path()));
-        assert_eq!(run_dir(&dir).unwrap(), own, "one for the whole run");
-        let lock = std::fs::File::open(own.join(LOCK)).unwrap();
-        assert!(matches!(lock.try_lock(), Err(std::fs::TryLockError::WouldBlock)), "held while the run lives");
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-            assert_eq!(std::fs::metadata(&own).unwrap().permissions().mode() & 0o777, 0o700);
-            assert_eq!(std::fs::metadata(own.join(LOCK)).unwrap().permissions().mode() & 0o777, 0o600);
-        }
-    }
-
-    fn failed_republication_session() -> (Session, tempfile::TempDir, u64) {
-        let root = tempfile::tempdir().unwrap();
-        let mut session = Session::new();
-        session.execute("file.new", &json!({})).unwrap();
-        let live_uid = session.docs[0].uid;
-        let mut original = unsaved("retained old work");
-        original.docs[0].uid = live_uid;
-        save(&original, root.path()).unwrap();
-        session.recovery_dir = Some(root.path().to_path_buf());
-        let recovered = open_with_failed_republication(&mut session, root.path());
-        assert_eq!(recovered.unwrap().len(), 1);
-        assert_ne!(session.docs[1].uid, live_uid);
-        (session, root, live_uid)
-    }
-
-    #[test]
-    fn retained_source_survives_a_coincident_live_uid_checkpoint_failure() {
-        let (mut session, root, live_uid) = failed_republication_session();
-        let original = std::fs::read(files(root.path(), live_uid).0).unwrap();
-        let recovered_uid = session.docs[1].uid;
-        std::fs::create_dir(files(root.path(), recovered_uid).0).unwrap();
-        session.execute("file.activate", &json!({"index": 0})).unwrap();
-        session.execute("frame.create", &json!({"rect": [0,0,100,100], "content": "text", "text": "other live work"})).unwrap();
-        assert!(session.execute("file.recovery.save", &json!({"dir": root.path().to_string_lossy()})).is_err());
-        assert_eq!(std::fs::read(files(root.path(), live_uid).0).unwrap(), original);
-    }
-
-    #[test]
-    fn clean_autosave_preserves_another_documents_retained_source() {
-        let (mut session, root, live_uid) = failed_republication_session();
-        let checkpoint = files(root.path(), live_uid).0;
-        let original = std::fs::read(&checkpoint).unwrap();
-        assert!(!session.docs[0].is_dirty());
-        assert!(session.docs[1].is_dirty());
-        assert!(session.execute("file.recovery.save", &json!({})).is_err());
-        assert_eq!(std::fs::read(checkpoint).unwrap(), original);
-    }
-
-    #[test]
-    fn closing_a_coincident_document_preserves_another_documents_retained_source() {
-        let (mut session, root, live_uid) = failed_republication_session();
-        let checkpoint = files(root.path(), live_uid).0;
-        let original = std::fs::read(&checkpoint).unwrap();
-        session.execute("file.close", &json!({"index": 0})).unwrap();
-        assert_eq!(std::fs::read(checkpoint).unwrap(), original);
-    }
-
-    #[test]
-    fn saving_a_coincident_document_preserves_another_documents_retained_source() {
-        let (mut session, root, live_uid) = failed_republication_session();
-        let checkpoint = files(root.path(), live_uid).0;
-        let original = std::fs::read(&checkpoint).unwrap();
-        session.execute("file.activate", &json!({"index": 0})).unwrap();
-        session.execute("file.saveAs", &json!({"path": root.path().join("saved-other.designcraft").to_string_lossy()})).unwrap();
-        assert_eq!(std::fs::read(checkpoint).unwrap(), original);
-    }
-
-    #[test]
-    fn reverting_a_coincident_document_preserves_another_documents_retained_source() {
-        let (mut session, root, live_uid) = failed_republication_session();
-        let checkpoint = files(root.path(), live_uid).0;
-        let original = std::fs::read(&checkpoint).unwrap();
-        let saved = root.path().join("saved-other.designcraft");
-        std::fs::write(&saved, designcraft_format::save(&session.docs[0].doc).unwrap()).unwrap();
-        session.docs[0].path = Some(saved.to_string_lossy().into_owned());
-        session.execute("file.activate", &json!({"index": 0})).unwrap();
-        session.execute("frame.create", &json!({"rect": [0,0,100,100]})).unwrap();
-        session.execute("file.revert", &json!({})).unwrap();
-        assert_eq!(std::fs::read(checkpoint).unwrap(), original);
-    }
-
-    #[test]
-    fn retained_source_provenance_is_consumed_before_its_uid_is_reused() {
-        let (mut session, root, live_uid) = failed_republication_session();
-        session.execute("file.saveAs", &json!({"path": root.path().join("saved.designcraft").to_string_lossy()})).unwrap();
-        session.execute("file.activate", &json!({"index": 0})).unwrap();
-        session.execute("frame.create", &json!({"rect": [0,0,100,100], "content": "text", "text": "other live work"})).unwrap();
-        session.execute("file.recovery.save", &json!({"dir": root.path().to_string_lossy()})).unwrap();
-        let checkpoint = files(root.path(), live_uid).0;
-        let expected = std::fs::read(&checkpoint).unwrap();
-        session.execute("file.close", &json!({"index": 1})).unwrap();
-        assert_eq!(
-            std::fs::read(checkpoint).unwrap(),
-            expected,
-            "closing the saved recovered document must not delete another document's checkpoint"
-        );
-    }
-
-    #[test]
-    fn explicit_checkpoint_tracking_is_bounded_and_deduplicated_before_writes() {
-        let root = tempfile::tempdir().unwrap();
-        let mut session = unsaved("bounded checkpoints");
-        for n in 0..MAX_RECOVERY_ENTRIES {
-            session.execute("file.recovery.save", &json!({"dir": root.path().join(n.to_string()).to_string_lossy()})).unwrap();
-        }
-        let excess = root.path().join("excess");
-        assert!(session.execute("file.recovery.save", &json!({"dir": excess.to_string_lossy()})).is_err());
-        assert!(!excess.exists(), "reject before creating or writing the next directory");
-        let first_alias = root.path().join("0").join(".");
-        session.execute("file.recovery.save", &json!({"dir": first_alias.to_string_lossy()})).unwrap();
-        for n in 0..MAX_RECOVERY_ENTRIES {
-            assert_eq!(persisted_texts(&root.path().join(n.to_string())), ["bounded checkpoints"]);
-        }
-        assert!(session.recovery_dir.is_none());
-        session.execute("file.close", &json!({})).unwrap();
-        for n in 0..MAX_RECOVERY_ENTRIES {
-            assert!(list(&root.path().join(n.to_string())).is_empty());
-        }
-    }
-
-    fn restart_fixture() -> tempfile::TempDir {
-        let root = tempfile::tempdir().unwrap();
-        let mut first = unsaved("restart first");
-        first.docs[0].uid = 1;
-        save(&first, root.path()).unwrap();
-        let mut second = unsaved("restart second");
-        second.docs[0].uid = 2;
-        save(&second, root.path()).unwrap();
-        root
-    }
-
-    fn persisted_texts(dir: &Path) -> Vec<String> {
-        let mut result = Vec::new();
-        for (uid, _) in list(dir) {
-            let doc = crate::cmd::from_bytes(&std::fs::read(files(dir, uid).0).unwrap()).unwrap();
-            result.extend(doc.stories.values().map(|story| story.text.clone()));
-        }
-        result.sort();
-        result
-    }
-
-    #[test]
-    #[ignore = "subprocess helper, executed by the restart recovery regression tests"]
-    fn restart_recovery_child() {
-        let source = PathBuf::from(std::env::var("DESIGNCRAFT_TEST_RECOVERY_SOURCE").unwrap());
-        let mode = std::env::var("DESIGNCRAFT_TEST_RECOVERY_MODE").unwrap();
-        if mode == "occupied_destination" {
-            let owned_root = tempfile::tempdir().unwrap();
-            let destination = run_dir(owned_root.path()).unwrap();
-            let mut existing = unsaved("already in destination");
-            existing.docs[0].uid = 3;
-            save(&existing, &destination).unwrap();
-            let (existing_doc, existing_meta) = files(&destination, 3);
-            let doc_bytes = std::fs::read(&existing_doc).unwrap();
-            let meta_bytes = std::fs::read(&existing_meta).unwrap();
-            let mut session = Session::new();
-            session.recovery_dir = Some(destination.clone());
-            let opened = open(&mut session, &source).unwrap();
-            assert_eq!(opened.len(), 2);
-            assert_eq!(texts(&session), ["restart first", "restart second"]);
-            assert!(session.docs.iter().all(|document| document.uid != 3));
-            assert_eq!(persisted_texts(&destination), ["already in destination", "restart first", "restart second"]);
-            assert!(list(&source).is_empty());
-            session.execute("file.saveAs", &json!({"path": source.join("saved.designcraft").to_string_lossy()})).unwrap();
-            session.execute("file.close", &json!({"index": opened[0]})).unwrap();
-            assert_eq!(list(&destination).len(), 1);
-            assert_eq!(std::fs::read(existing_doc).unwrap(), doc_bytes);
-            assert_eq!(std::fs::read(existing_meta).unwrap(), meta_bytes);
-            return;
-        }
-        let mut session = Session::new();
-        if mode == "advance" || mode == "coincident_live" {
-            session.execute("file.new", &json!({})).unwrap();
-            assert_eq!(session.docs[0].uid, 1);
-        }
-        let owned_root;
-        let destination = match mode.as_str() {
-            "cross_dir" => {
-                owned_root = tempfile::tempdir().unwrap();
-                let own = run_dir(owned_root.path()).unwrap();
-                session.recovery_dir = Some(own.clone());
-                own
-            }
-            "alias" => {
-                let alias = source.join(".");
-                session.recovery_dir = Some(alias.clone());
-                alias
-            }
-            "coincident_live" => {
-                session.recovery_dir = Some(source.clone());
-                source.clone()
-            }
-            _ => source.clone(),
-        };
-        let opened = open(&mut session, &source).unwrap();
-        assert_eq!(opened.len(), 2);
-        assert_eq!(texts(&session), ["restart first", "restart second"]);
-        assert_eq!(persisted_texts(&destination), ["restart first", "restart second"]);
-        assert!(session.docs.iter().all(|d| d.uid > 0 && d.uid < u64::MAX));
-        if matches!(mode.as_str(), "cross_dir" | "manual" | "alias" | "revert") {
-            let was_disabled = session.recovery_dir.is_none();
-            if mode == "cross_dir" {
-                assert!(list(&source).is_empty());
-            }
-            // A copy does not consume recovery. A successful Save and a Close do.
-            session.execute("file.saveACopy", &json!({"path": source.join("copy.designcraft").to_string_lossy()})).unwrap();
-            assert_eq!(list(&destination).len(), 2);
-            session.execute("file.saveAs", &json!({"path": source.join("saved.designcraft").to_string_lossy()})).unwrap();
-            assert_eq!(list(&destination).len(), 1);
-            if mode == "revert" {
-                session.execute("frame.create", &json!({"rect": [0, 0, 100, 100], "content": "text", "text": "after saving"})).unwrap();
-                session.execute("file.recovery.save", &json!({"dir": destination.to_string_lossy()})).unwrap();
-                assert_eq!(list(&destination).len(), 2);
-                session.execute("file.revert", &json!({})).unwrap();
-                assert_eq!(list(&destination).len(), 1);
-            }
-            session.execute("file.close", &json!({"index": opened[0]})).unwrap();
-            assert!(list(&destination).is_empty());
-            assert!(list(&source).is_empty());
-            assert_eq!(session.recovery_dir.is_none(), was_disabled, "manual recovery must not configure autosave");
-        }
-    }
-
-    fn run_restart_case(mode: &str) {
-        let source = restart_fixture();
-        if mode == "max_uid" {
-            let (doc, meta) = files(source.path(), 2);
-            let (max_doc, max_meta) = files(source.path(), u64::MAX);
-            std::fs::rename(doc, max_doc).unwrap();
-            std::fs::rename(meta, max_meta).unwrap();
-        }
-        let output = std::process::Command::new(std::env::current_exe().unwrap())
-            .args(["--exact", "recovery::tests::restart_recovery_child", "--ignored", "--nocapture"])
-            .env("DESIGNCRAFT_TEST_RECOVERY_SOURCE", source.path())
-            .env("DESIGNCRAFT_TEST_RECOVERY_MODE", mode)
-            .output()
-            .unwrap();
-        assert!(
-            output.status.success(),
-            "fresh child failed: {}{}",
-            String::from_utf8_lossy(&output.stdout),
-            String::from_utf8_lossy(&output.stderr)
-        );
-        let child_stdout = String::from_utf8_lossy(&output.stdout);
-        assert!(child_stdout.contains("test result: ok. 1 passed; 0 failed;"), "the fresh-process helper did not run exactly once: {child_stdout}");
-    }
-
-    #[test]
-    fn restart_uid_collision_cannot_delete_the_new_snapshot() {
-        run_restart_case("fresh");
-    }
-    #[test]
-    fn restart_uid_collision_cannot_overwrite_an_unopened_entry() {
-        run_restart_case("advance");
-    }
-    #[test]
-    fn cross_directory_recovery_uses_the_configured_destination() {
-        run_restart_case("cross_dir");
-    }
-    #[test]
-    fn cross_directory_recovery_preserves_occupied_destination_entries() {
-        run_restart_case("occupied_destination");
-    }
-    #[test]
-    fn manual_recovery_save_and_close_clean_up_without_enabling_autosave() {
-        run_restart_case("manual");
-    }
-    #[test]
-    fn recovery_directory_aliases_do_not_delete_new_snapshots() {
-        run_restart_case("alias");
-    }
-    #[test]
-    fn a_maximum_source_uid_does_not_advance_or_overflow_the_allocator() {
-        run_restart_case("max_uid");
-    }
-    #[test]
-    fn a_coincident_live_uid_is_not_recovered_entry_provenance() {
-        run_restart_case("coincident_live");
-    }
-    #[test]
-    fn manual_recovery_revert_removes_its_previous_checkpoint() {
-        run_restart_case("revert");
-    }
-
-    /// The recovery folder was cleared while the app runs: the next save makes the run's folder
-    /// again, and its lock with it.
-    #[cfg(unix)]
-    #[test]
-    fn a_removed_run_folder_is_made_again_with_its_lock() {
-        let root = tempfile::tempdir().unwrap();
-        let own = run_dir(root.path()).unwrap();
-        std::fs::remove_dir_all(&own).unwrap();
-        assert_eq!(save(&dirty_session(), &own).unwrap(), 1);
-        let lock = std::fs::File::open(own.join(LOCK)).unwrap();
-        assert!(matches!(lock.try_lock(), Err(std::fs::TryLockError::WouldBlock)));
-    }
-
-    /// Replacing the name of a live run's lock must not authorize writes under the old handle.
-    #[cfg(unix)]
-    #[test]
-    fn save_rejects_a_run_whose_lock_was_replaced() {
-        let root = tempfile::tempdir().unwrap();
-        let own = run_dir(root.path()).unwrap();
-        std::fs::remove_file(own.join(LOCK)).unwrap();
-        let replacement = new_lock(&own).unwrap();
-        replacement.try_lock().unwrap();
-        assert!(save(&dirty_session(), &own).is_err());
-        assert!(list(&own).is_empty(), "another owner's folder must not receive our recovery data");
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn an_exclusively_locked_windows_recovery_file_validates() {
-        let root = tempfile::tempdir().unwrap();
-        let lock = new_lock(root.path()).unwrap();
-        lock.try_lock().unwrap();
-        validate_lock(root.path(), &lock).unwrap();
-        let named = std::fs::File::open(root.path().join(LOCK)).unwrap();
-        assert!(matches!(named.try_lock(), Err(std::fs::TryLockError::WouldBlock)), "validation must retain the exclusive lock");
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn windows_recovery_rejects_a_replacement_with_the_same_marker() {
-        let root = tempfile::tempdir().unwrap();
-        let lock = new_lock(root.path()).unwrap();
-        let marker = std::fs::read(root.path().join(LOCK)).unwrap();
-        lock.try_lock().unwrap();
-        let moved = root.path().join("original-lock");
-        std::fs::rename(root.path().join(LOCK), &moved).unwrap();
-        std::fs::write(root.path().join(LOCK), marker).unwrap();
-        assert!(validate_lock(root.path(), &lock).is_err(), "matching marker bytes do not make another file our lock");
-        std::fs::remove_file(root.path().join(LOCK)).unwrap();
-        assert!(validate_lock(root.path(), &lock).is_err(), "a missing lock must not validate");
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn windows_recovery_does_not_write_or_discard_a_replacement_runs_entries() {
-        let root = tempfile::tempdir().unwrap();
-        let own = run_dir(root.path()).unwrap();
-        std::fs::rename(own.join(LOCK), own.join("original-lock")).unwrap();
-        let replacement = new_lock(&own).unwrap();
-        replacement.try_lock().unwrap();
-        let session = dirty_session();
-        let (doc, meta) = files(&own, session.docs[0].uid);
-        std::fs::write(&doc, b"another owner's document").unwrap();
-        std::fs::write(&meta, b"{}").unwrap();
-        assert!(save(&session, &own).is_err());
-        discard(&own, session.docs[0].uid);
-        assert_eq!(std::fs::read(&doc).unwrap(), b"another owner's document");
-        assert_eq!(std::fs::read(&meta).unwrap(), b"{}");
-    }
-
-    /// A blocked attempt to recreate a run's lock must stop the save before it writes documents.
-    #[cfg(unix)]
-    #[test]
-    fn save_rejects_a_run_whose_lock_cannot_be_recreated() {
-        let root = tempfile::tempdir().unwrap();
-        let own = run_dir(root.path()).unwrap();
-        std::fs::remove_file(own.join(LOCK)).unwrap();
-        std::fs::create_dir(own.join(LOCK)).unwrap();
-        assert!(save(&dirty_session(), &own).is_err());
-        assert!(list(&own).is_empty());
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn discarding_a_document_does_not_touch_a_replaced_runs_entries() {
-        let root = tempfile::tempdir().unwrap();
-        let own = run_dir(root.path()).unwrap();
-        std::fs::remove_file(own.join(LOCK)).unwrap();
-        let replacement = new_lock(&own).unwrap();
-        replacement.try_lock().unwrap();
-        let (doc, meta) = files(&own, 1);
-        std::fs::write(&doc, b"the replacement owner's document").unwrap();
-        std::fs::write(&meta, b"{}").unwrap();
-        discard(&own, 1);
-        assert_eq!(std::fs::read(doc).unwrap(), b"the replacement owner's document");
-        assert!(meta.exists());
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn saving_a_run_rejects_a_symlinked_lock() {
-        let root = tempfile::tempdir().unwrap();
-        let own = run_dir(root.path()).unwrap();
-        std::fs::remove_file(own.join(LOCK)).unwrap();
-        let unrelated = root.path().join("unrelated");
-        std::fs::write(&unrelated, b"unrelated file").unwrap();
-        std::os::unix::fs::symlink(&unrelated, own.join(LOCK)).unwrap();
-        assert!(save(&dirty_session(), &own).is_err());
-        assert_eq!(std::fs::read(unrelated).unwrap(), b"unrelated file");
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn a_replaced_run_directory_is_not_claimed_or_overwritten() {
-        let root = tempfile::tempdir().unwrap();
-        let own = run_dir(root.path()).unwrap();
-        let session = dirty_session();
-        let uid = session.docs[0].uid;
-        std::fs::remove_dir_all(&own).unwrap();
-        std::fs::create_dir(&own).unwrap();
-        let (doc, _) = files(&own, uid);
-        std::fs::write(&doc, b"another owner's document").unwrap();
-        assert!(save(&session, &own).is_err());
-        assert_eq!(std::fs::read(doc).unwrap(), b"another owner's document");
-        assert!(!own.join(LOCK).exists());
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn a_run_gets_no_folder_in_a_symlinked_recovery_folder() {
-        use std::os::unix::fs::symlink;
-
-        let root = tempfile::tempdir().unwrap();
-        let destination = root.path().join("destination");
-        let link = root.path().join("recovery");
-        std::fs::create_dir(&destination).unwrap();
-        symlink(&destination, &link).unwrap();
-
-        assert!(run_dir(&link).is_err());
-        assert!(std::fs::read_dir(&destination).unwrap().next().is_none());
-    }
-
-    fn unsaved(text: &str) -> Session {
-        let mut session = Session::new();
-        session.execute("file.new", &json!({})).unwrap();
-        session.execute("frame.create", &json!({"rect": [10, 10, 100, 100], "content": "text", "text": text})).unwrap();
-        session
-    }
-
-    fn texts(s: &Session) -> Vec<String> {
-        let mut texts: Vec<String> = s.documents().iter().flat_map(|d| d.doc.stories.values().map(|st| st.text.clone())).collect();
-        texts.sort();
-        texts
-    }
-
-    /// What a run that has ended leaves: its folder with its lock, free now, and the entry of
-    /// one unsaved document, numbered `uid` as that process numbered it.
-    fn run_left(root: &Path, name: &str, text: &str, uid: u64) -> PathBuf {
-        let dir = root.join(name);
-        std::fs::create_dir_all(&dir).unwrap();
-        std::fs::write(dir.join(LOCK), b"").unwrap();
-        let mut s = unsaved(text);
-        s.docs[0].uid = uid;
-        assert_eq!(save(&s, &dir).unwrap(), 1);
-        dir
-    }
-
-    /// Every process numbers its first document 1: two running apps both wrote `1.designcraft`
-    /// into the one recovery folder, and only the document written last was recovered.
-    #[test]
-    fn documents_of_two_apps_that_ended_are_both_recovered() {
-        let root = tempfile::tempdir().unwrap();
-        let first = run_left(root.path(), "run-7-0", "first app", 1);
-        let second = run_left(root.path(), "run-8-0", "second app", 1);
-        let own = run_dir(root.path()).unwrap();
-        let mut s = Session::new();
-        assert_eq!(open(&mut s, &own).unwrap().len(), 2);
-        assert_eq!(texts(&s), ["first app", "second app"]);
-        assert!(s.documents().iter().all(DocState::is_dirty));
-        assert!(!first.exists() && !second.exists(), "nothing is left of the runs that ended");
-    }
-
-    /// An app that started reopened the unsaved documents of one still running, and removed
-    /// its entries.
-    #[test]
-    fn a_running_apps_recovery_data_is_left_alone() {
-        let root = tempfile::tempdir().unwrap();
-        let running = run_left(root.path(), "run-7-0", "still open", 1);
-        let lock = std::fs::File::open(running.join(LOCK)).unwrap();
-        lock.try_lock().unwrap();
-        let own = run_dir(root.path()).unwrap();
-        let mut s = Session::new();
-        assert!(open(&mut s, &own).unwrap().is_empty());
-        assert_eq!(list(&running).len(), 1);
-        // Once it has ended, its document is recovered.
-        drop(lock);
-        assert_eq!(open(&mut s, &own).unwrap().len(), 1);
-        assert_eq!(texts(&s), ["still open"]);
-        assert!(!running.exists());
-    }
-
-    /// A process id comes round again: the folder a run left under it is not this run's.
-    #[test]
-    fn a_folder_left_under_this_process_id_is_not_reused() {
-        let root = tempfile::tempdir().unwrap();
-        let left = run_left(root.path(), &format!("run-{}-0", std::process::id()), "left behind", 1);
-        let own = run_dir(root.path()).unwrap();
-        assert_ne!(own, left);
-        let mut s = Session::new();
-        assert_eq!(open(&mut s, &own).unwrap().len(), 1);
-        assert_eq!(texts(&s), ["left behind"]);
-    }
-
-    /// Entries written straight into the recovery folder, as before runs had folders.
-    #[test]
-    fn recovery_data_of_an_earlier_version_is_recovered() {
-        let root = tempfile::tempdir().unwrap();
-        assert_eq!(save(&unsaved("earlier version"), root.path()).unwrap(), 1);
-        let own = run_dir(root.path()).unwrap();
-        let mut s = Session::new();
-        assert_eq!(open(&mut s, &own).unwrap().len(), 1);
-        assert_eq!(texts(&s), ["earlier version"]);
-        assert!(list(root.path()).is_empty());
-    }
-
-    /// An entry that can't be opened stays on disk, in this run's folder now.
-    #[test]
-    fn an_unreadable_entry_of_a_run_that_ended_is_kept() {
-        let root = tempfile::tempdir().unwrap();
-        let left = run_left(root.path(), "run-7-0", "readable", 1);
-        std::fs::write(left.join("2.designcraft"), b"not a document").unwrap();
-        let own = run_dir(root.path()).unwrap();
-        let mut s = Session::new();
-        assert_eq!(open(&mut s, &own).unwrap().len(), 1);
-        assert!(list(&own).iter().any(|e| std::fs::read(files(&own, e.0).0).unwrap() == b"not a document"));
-        assert!(!left.exists());
-    }
-
-    /// Only a folder named as a run's, with a lock that is free, is a run that ended.
-    #[test]
-    fn what_is_no_run_that_ended_is_passed_over() {
-        let root = tempfile::tempdir().unwrap();
-        std::fs::write(root.path().join("run-1-0"), b"a file").unwrap();
-        // An app that is starting has made its folder and not yet its lock.
-        let starting = root.path().join("run-2-0");
-        std::fs::create_dir(&starting).unwrap();
-        let other = run_left(root.path(), "backup", "not a run", 1);
-        #[cfg(unix)]
-        let (_elsewhere, linked) = {
-            let elsewhere = tempfile::tempdir().unwrap();
-            let linked = run_left(elsewhere.path(), "run-3-0", "behind a link", 1);
-            std::os::unix::fs::symlink(&linked, root.path().join("run-3-0")).unwrap();
-            (elsewhere, linked)
-        };
-        let own = run_dir(root.path()).unwrap();
-        let mut s = Session::new();
-        assert!(open(&mut s, &own).unwrap().is_empty());
-        assert!(starting.exists());
-        assert_eq!(list(&other).len(), 1);
-        #[cfg(unix)]
-        assert!(list(&linked).len() == 1 && root.path().join("run-3-0").is_symlink());
-    }
-
-    /// The metadata goes with its document: a document taken over remembers its file.
-    #[test]
-    fn a_document_taken_over_remembers_its_file() {
-        let root = tempfile::tempdir().unwrap();
-        let file = root.path().join("layout.designcraft");
-        let recovery = root.path().join("recovery");
-        let left = recovery.join("run-7-0");
-        std::fs::create_dir_all(&left).unwrap();
-        std::fs::write(left.join(LOCK), b"").unwrap();
-        let mut a = unsaved("saved once");
-        a.execute("file.saveAs", &json!({"path": file.to_string_lossy()})).unwrap();
-        a.execute("frame.create", &json!({"rect": [10, 10, 100, 100]})).unwrap();
-        assert_eq!(save(&a, &left).unwrap(), 1);
-        let own = run_dir(&recovery).unwrap();
-        let mut s = Session::new();
-        assert_eq!(open(&mut s, &own).unwrap().len(), 1);
-        assert_eq!(s.doc().unwrap().path.as_deref(), Some(file.to_string_lossy().as_ref()));
-    }
-
-    /// The folder of a run that ended goes with what the app left in it. A file the app did not
-    /// write keeps the folder, and is not deleted.
-    #[test]
-    fn only_what_the_app_left_goes_with_the_folder_of_a_run_that_ended() {
-        let root = tempfile::tempdir().unwrap();
-        let emptied = run_left(root.path(), "run-7-0", "moved", 1);
-        std::fs::write(emptied.join("9.json"), b"{}").unwrap();
-        std::fs::write(emptied.join(".designcraft-recovery-abc.tmp"), b"half written").unwrap();
-        let kept = run_left(root.path(), "run-8-0", "moved too", 1);
-        std::fs::write(kept.join("copy.designcraft"), b"a copy someone put here").unwrap();
-        let own = run_dir(root.path()).unwrap();
-        let mut s = Session::new();
-        assert_eq!(open(&mut s, &own).unwrap().len(), 2);
-        assert!(!emptied.exists());
-        assert_eq!(std::fs::read(kept.join("copy.designcraft")).unwrap(), b"a copy someone put here");
-        assert!(kept.join(LOCK).exists(), "still the folder of a run that ended");
-    }
-
-    /// A folder that is there is another app's or was left behind, lock or no lock: a run's own
-    /// is one it made itself.
-    #[test]
-    fn a_folder_that_is_there_is_not_made_this_runs() {
-        let root = tempfile::tempdir().unwrap();
-        let left = root.path().join(format!("run-{}-0", std::process::id()));
-        std::fs::create_dir(&left).unwrap();
-        std::fs::write(left.join("1.designcraft"), b"left with no lock").unwrap();
-        let own = run_dir(root.path()).unwrap();
-        assert_ne!(own, left);
-        assert!(!left.join(LOCK).exists());
-        assert_eq!(std::fs::read(left.join("1.designcraft")).unwrap(), b"left with no lock");
-    }
-
-    /// Another run's entry under uid 7 in a chosen folder, with a document of this run numbered
-    /// 7 too: document uids start at 1 in every process.
-    fn chosen_folder_with_another_runs_entry() -> (tempfile::TempDir, PathBuf, PathBuf) {
-        let root = tempfile::tempdir().unwrap();
-        let (doc, meta) = files(root.path(), 7);
-        std::fs::write(&doc, b"another run's document").unwrap();
-        std::fs::write(&meta, b"{\"title\": \"theirs\"}").unwrap();
-        (root, doc, meta)
-    }
-
-    #[test]
-    fn a_clean_document_leaves_another_runs_entry_in_a_chosen_folder() {
-        let (root, doc, meta) = chosen_folder_with_another_runs_entry();
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.docs[0].uid = 7;
-        assert!(!s.docs[0].is_dirty());
-        s.execute("file.recovery.save", &json!({"dir": root.path().to_string_lossy()})).unwrap();
-        s.execute("file.close", &json!({})).unwrap();
-        assert_eq!(std::fs::read(doc).unwrap(), b"another run's document");
-        assert_eq!(std::fs::read(meta).unwrap(), b"{\"title\": \"theirs\"}");
-    }
-
-    #[test]
-    fn a_dirty_document_does_not_overwrite_another_runs_entry_in_a_chosen_folder() {
-        let (root, doc, meta) = chosen_folder_with_another_runs_entry();
-        let mut s = unsaved("this run's work");
-        s.docs[0].uid = 7;
-        assert!(s.execute("file.recovery.save", &json!({"dir": root.path().to_string_lossy()})).is_err());
-        assert!(save(&s, root.path()).is_err());
-        assert_eq!(std::fs::read(doc).unwrap(), b"another run's document");
-        assert_eq!(std::fs::read(meta).unwrap(), b"{\"title\": \"theirs\"}");
-    }
-
-    /// A chosen folder that is a running app's run folder is that app's.
-    #[test]
-    fn a_folder_another_running_app_holds_is_refused() {
-        let root = tempfile::tempdir().unwrap();
-        let held = new_lock(root.path()).unwrap();
-        held.try_lock().unwrap();
-        assert!(save(&dirty_session(), root.path()).is_err());
-        assert!(list(root.path()).is_empty());
-    }
-}
+mod tests;
 
 #[cfg(test)]
 mod file_tests {
diff --git a/crates/engine/src/recovery/tests.rs b/crates/engine/src/recovery/tests.rs
new file mode 100644
index 000000000..395e8385b
--- /dev/null
+++ b/crates/engine/src/recovery/tests.rs
@@ -0,0 +1,824 @@
+use super::*;
+
+fn dirty_session() -> Session {
+    let mut session = Session::new();
+    session.execute("file.new", &json!({})).unwrap();
+    session.execute("frame.create", &json!({"rect": [10, 10, 100, 100]})).unwrap();
+    session
+}
+
+#[test]
+fn recovers_unsaved_documents() {
+    let dir = std::env::temp_dir().join(format!("dc-recovery-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("file.new", &json!({})).unwrap();
+    // Only the edited document is written.
+    s.execute("frame.create", &json!({"rect": [10, 10, 100, 100]})).unwrap();
+    assert_eq!(save(&s, &dir).unwrap(), 1);
+    assert_eq!(list(&dir).len(), 1);
+    // "Crash": a new session reopens it, unsaved, with the item.
+    let mut s2 = Session::new();
+    let opened = open(&mut s2, &dir).unwrap();
+    assert_eq!(opened.len(), 1);
+    let st = s2.doc().unwrap();
+    assert!(st.is_dirty());
+    assert_eq!(st.doc.spreads[0].items.len(), 1);
+    // The entry moved to the reopened document: a session that ends before its first
+    // recovery save (a restart, another crash) still leaves it to recover.
+    let entries = list(&dir);
+    assert_eq!(entries.iter().map(|e| e.0).collect::<Vec<_>>(), [st.uid]);
+    let mut s3 = Session::new();
+    assert_eq!(open(&mut s3, &dir).unwrap().len(), 1);
+    assert_eq!(s3.doc().unwrap().doc.spreads[0].items.len(), 1);
+    assert!(s3.doc().unwrap().is_dirty());
+    assert_eq!(list(&dir).len(), 1, "recovering twice never duplicates an entry");
+    discard(&dir, s3.doc().unwrap().uid);
+    // Saving a document drops its entry.
+    s.recovery_dir = Some(dir.clone());
+    assert_eq!(save(&s, &dir).unwrap(), 1);
+    let path = dir.join("saved.designcraft");
+    s.execute("file.saveAs", &json!({"path": path.to_string_lossy()})).unwrap();
+    assert!(list(&dir).is_empty());
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn a_recovered_document_survives_a_second_crash_before_autosave() {
+    let dir = tempfile::tempdir().unwrap();
+    let original = unsaved("edits preserved after a second crash");
+    assert_eq!(save(&original, dir.path()).unwrap(), 1);
+    let mut reopened = Session::new();
+    assert_eq!(open(&mut reopened, dir.path()).unwrap().len(), 1);
+    drop(reopened);
+    let mut recovered_again = Session::new();
+    assert_eq!(open(&mut recovered_again, dir.path()).unwrap().len(), 1);
+    assert_eq!(texts(&recovered_again), ["edits preserved after a second crash"]);
+    assert!(recovered_again.documents().iter().all(DocState::is_dirty));
+    assert_eq!(list(dir.path()).len(), 1);
+}
+
+#[test]
+fn opening_recovery_again_does_not_duplicate_live_documents() {
+    let dir = tempfile::tempdir().unwrap();
+    assert_eq!(save(&unsaved("one recovered document"), dir.path()).unwrap(), 1);
+    let mut reopened = Session::new();
+    reopened.recovery_dir = Some(dir.path().to_path_buf());
+    assert_eq!(open(&mut reopened, dir.path()).unwrap().len(), 1);
+    assert!(open(&mut reopened, dir.path()).unwrap().is_empty());
+    assert_eq!(texts(&reopened), ["one recovered document"]);
+    assert_eq!(list(dir.path()).len(), 1);
+}
+
+/// Directory collisions fail even for privileged runners. Creating the blocker in the
+/// publisher occurs after UID reservation, which would otherwise skip an occupied path.
+fn open_with_failed_republication(s: &mut Session, dir: &Path) -> Result<Vec<usize>> {
+    let mut attempts = 0;
+    let opened = open_with_publisher(s, dir, |path, bytes| {
+        assert_eq!(path.extension().and_then(|extension| extension.to_str()), Some("designcraft"));
+        std::fs::create_dir(path).unwrap();
+        let result = publish_recovery_file(path, bytes, false);
+        std::fs::remove_dir(path).unwrap();
+        assert!(result.is_err(), "a directory must obstruct actual recovery publication");
+        attempts += 1;
+        result
+    });
+    assert_eq!(attempts, 1, "the fixture must exercise the actual failed publication");
+    opened
+}
+
+#[test]
+fn a_failed_recovery_rewrite_preserves_the_original() {
+    let dir = tempfile::tempdir().unwrap();
+    assert_eq!(save(&unsaved("keep the original"), dir.path()).unwrap(), 1);
+    let entries = list(dir.path());
+    let original = files(dir.path(), entries[0].0).0;
+    let bytes = std::fs::read(&original).unwrap();
+    let mut reopened = Session::new();
+    let result = open_with_failed_republication(&mut reopened, dir.path());
+    assert_eq!(result.unwrap().len(), 1);
+    assert_eq!(texts(&reopened), ["keep the original"]);
+    assert_eq!(std::fs::read(original).unwrap(), bytes);
+    assert_eq!(list(dir.path()).len(), 1);
+    // Its source uid differs from the reopened uid, but explicit Close still discards it.
+    assert!(open(&mut reopened, dir.path()).unwrap().is_empty());
+    reopened.close_document(0);
+    assert!(list(dir.path()).is_empty());
+}
+
+#[cfg(unix)]
+#[test]
+fn recovery_data_is_private_to_the_user() {
+    use std::os::unix::fs::PermissionsExt;
+
+    let root = tempfile::tempdir().unwrap();
+    let dir = root.path().join("recovery");
+    let s = dirty_session();
+    assert_eq!(save(&s, &dir).unwrap(), 1);
+
+    assert_eq!(std::fs::metadata(&dir).unwrap().permissions().mode() & 0o777, 0o700);
+    let entries: Vec<_> = std::fs::read_dir(&dir).unwrap().collect();
+    assert_eq!(entries.len(), 2);
+    for entry in entries {
+        let entry = entry.unwrap();
+        assert_eq!(entry.metadata().unwrap().permissions().mode() & 0o777, 0o600);
+    }
+}
+
+#[test]
+fn existing_recovery_directory_is_used() {
+    let root = tempfile::tempdir().unwrap();
+    let dir = root.path().join("recovery");
+    std::fs::create_dir(&dir).unwrap();
+
+    assert_eq!(save(&dirty_session(), &dir).unwrap(), 1);
+    assert_eq!(list(&dir).len(), 1);
+    assert!(std::fs::symlink_metadata(&dir).unwrap().file_type().is_dir());
+}
+
+#[test]
+fn non_directory_recovery_path_is_rejected() {
+    let root = tempfile::tempdir().unwrap();
+    let path = root.path().join("recovery");
+    std::fs::write(&path, b"not a directory").unwrap();
+
+    assert!(save(&dirty_session(), &path).is_err());
+    assert_eq!(std::fs::read(&path).unwrap(), b"not a directory");
+}
+
+#[cfg(unix)]
+#[test]
+fn existing_recovery_directory_permissions_are_preserved() {
+    use std::os::unix::fs::PermissionsExt;
+
+    let root = tempfile::tempdir().unwrap();
+    let dir = root.path().join("recovery");
+    std::fs::create_dir(&dir).unwrap();
+    std::fs::set_permissions(&dir, std::fs::Permissions::from_mode(0o750)).unwrap();
+
+    assert_eq!(save(&dirty_session(), &dir).unwrap(), 1);
+    assert_eq!(std::fs::metadata(&dir).unwrap().permissions().mode() & 0o777, 0o750);
+}
+
+#[cfg(unix)]
+#[test]
+fn symlink_recovery_directory_is_rejected() {
+    use std::os::unix::fs::symlink;
+
+    let root = tempfile::tempdir().unwrap();
+    let destination = root.path().join("destination");
+    let link = root.path().join("recovery");
+    std::fs::create_dir(&destination).unwrap();
+    symlink(&destination, &link).unwrap();
+
+    assert!(save(&dirty_session(), &link).is_err());
+    assert!(std::fs::read_dir(&destination).unwrap().next().is_none());
+    std::fs::write(destination.join("7.designcraft"), b"unchanged").unwrap();
+    std::fs::write(destination.join("7.json"), b"{}").unwrap();
+    assert!(list(&link).is_empty());
+    discard(&link, 7);
+    assert_eq!(std::fs::read(destination.join("7.designcraft")).unwrap(), b"unchanged");
+    assert!(open(&mut Session::new(), &link).is_err());
+    assert!(std::fs::symlink_metadata(&link).unwrap().file_type().is_symlink());
+}
+
+#[test]
+fn a_run_has_a_locked_folder_of_its_own() {
+    let root = tempfile::tempdir().unwrap();
+    let dir = root.path().join("recovery");
+    let own = run_dir(&dir).unwrap();
+    assert_eq!(own.parent(), Some(dir.as_path()));
+    assert_eq!(run_dir(&dir).unwrap(), own, "one for the whole run");
+    let lock = std::fs::File::open(own.join(LOCK)).unwrap();
+    assert!(matches!(lock.try_lock(), Err(std::fs::TryLockError::WouldBlock)), "held while the run lives");
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        assert_eq!(std::fs::metadata(&own).unwrap().permissions().mode() & 0o777, 0o700);
+        assert_eq!(std::fs::metadata(own.join(LOCK)).unwrap().permissions().mode() & 0o777, 0o600);
+    }
+}
+
+fn failed_republication_session() -> (Session, tempfile::TempDir, u64) {
+    let root = tempfile::tempdir().unwrap();
+    let mut session = Session::new();
+    session.execute("file.new", &json!({})).unwrap();
+    let live_uid = session.docs[0].uid;
+    let mut original = unsaved("retained old work");
+    original.docs[0].uid = live_uid;
+    save(&original, root.path()).unwrap();
+    session.recovery_dir = Some(root.path().to_path_buf());
+    let recovered = open_with_failed_republication(&mut session, root.path());
+    assert_eq!(recovered.unwrap().len(), 1);
+    assert_ne!(session.docs[1].uid, live_uid);
+    (session, root, live_uid)
+}
+
+#[test]
+fn retained_source_survives_a_coincident_live_uid_checkpoint_failure() {
+    let (mut session, root, live_uid) = failed_republication_session();
+    let original = std::fs::read(files(root.path(), live_uid).0).unwrap();
+    let recovered_uid = session.docs[1].uid;
+    std::fs::create_dir(files(root.path(), recovered_uid).0).unwrap();
+    session.execute("file.activate", &json!({"index": 0})).unwrap();
+    session.execute("frame.create", &json!({"rect": [0,0,100,100], "content": "text", "text": "other live work"})).unwrap();
+    assert!(session.execute("file.recovery.save", &json!({"dir": root.path().to_string_lossy()})).is_err());
+    assert_eq!(std::fs::read(files(root.path(), live_uid).0).unwrap(), original);
+}
+
+#[test]
+fn clean_autosave_preserves_another_documents_retained_source() {
+    let (mut session, root, live_uid) = failed_republication_session();
+    let checkpoint = files(root.path(), live_uid).0;
+    let original = std::fs::read(&checkpoint).unwrap();
+    assert!(!session.docs[0].is_dirty());
+    assert!(session.docs[1].is_dirty());
+    assert!(session.execute("file.recovery.save", &json!({})).is_err());
+    assert_eq!(std::fs::read(checkpoint).unwrap(), original);
+}
+
+#[test]
+fn closing_a_coincident_document_preserves_another_documents_retained_source() {
+    let (mut session, root, live_uid) = failed_republication_session();
+    let checkpoint = files(root.path(), live_uid).0;
+    let original = std::fs::read(&checkpoint).unwrap();
+    session.execute("file.close", &json!({"index": 0})).unwrap();
+    assert_eq!(std::fs::read(checkpoint).unwrap(), original);
+}
+
+#[test]
+fn saving_a_coincident_document_preserves_another_documents_retained_source() {
+    let (mut session, root, live_uid) = failed_republication_session();
+    let checkpoint = files(root.path(), live_uid).0;
+    let original = std::fs::read(&checkpoint).unwrap();
+    session.execute("file.activate", &json!({"index": 0})).unwrap();
+    session.execute("file.saveAs", &json!({"path": root.path().join("saved-other.designcraft").to_string_lossy()})).unwrap();
+    assert_eq!(std::fs::read(checkpoint).unwrap(), original);
+}
+
+#[test]
+fn reverting_a_coincident_document_preserves_another_documents_retained_source() {
+    let (mut session, root, live_uid) = failed_republication_session();
+    let checkpoint = files(root.path(), live_uid).0;
+    let original = std::fs::read(&checkpoint).unwrap();
+    let saved = root.path().join("saved-other.designcraft");
+    std::fs::write(&saved, designcraft_format::save(&session.docs[0].doc).unwrap()).unwrap();
+    session.docs[0].path = Some(saved.to_string_lossy().into_owned());
+    session.execute("file.activate", &json!({"index": 0})).unwrap();
+    session.execute("frame.create", &json!({"rect": [0,0,100,100]})).unwrap();
+    session.execute("file.revert", &json!({})).unwrap();
+    assert_eq!(std::fs::read(checkpoint).unwrap(), original);
+}
+
+#[test]
+fn retained_source_provenance_is_consumed_before_its_uid_is_reused() {
+    let (mut session, root, live_uid) = failed_republication_session();
+    session.execute("file.saveAs", &json!({"path": root.path().join("saved.designcraft").to_string_lossy()})).unwrap();
+    session.execute("file.activate", &json!({"index": 0})).unwrap();
+    session.execute("frame.create", &json!({"rect": [0,0,100,100], "content": "text", "text": "other live work"})).unwrap();
+    session.execute("file.recovery.save", &json!({"dir": root.path().to_string_lossy()})).unwrap();
+    let checkpoint = files(root.path(), live_uid).0;
+    let expected = std::fs::read(&checkpoint).unwrap();
+    session.execute("file.close", &json!({"index": 1})).unwrap();
+    assert_eq!(std::fs::read(checkpoint).unwrap(), expected, "closing the saved recovered document must not delete another document's checkpoint");
+}
+
+#[test]
+fn explicit_checkpoint_tracking_is_bounded_and_deduplicated_before_writes() {
+    let root = tempfile::tempdir().unwrap();
+    let mut session = unsaved("bounded checkpoints");
+    for n in 0..MAX_RECOVERY_ENTRIES {
+        session.execute("file.recovery.save", &json!({"dir": root.path().join(n.to_string()).to_string_lossy()})).unwrap();
+    }
+    let excess = root.path().join("excess");
+    assert!(session.execute("file.recovery.save", &json!({"dir": excess.to_string_lossy()})).is_err());
+    assert!(!excess.exists(), "reject before creating or writing the next directory");
+    let first_alias = root.path().join("0").join(".");
+    session.execute("file.recovery.save", &json!({"dir": first_alias.to_string_lossy()})).unwrap();
+    for n in 0..MAX_RECOVERY_ENTRIES {
+        assert_eq!(persisted_texts(&root.path().join(n.to_string())), ["bounded checkpoints"]);
+    }
+    assert!(session.recovery_dir.is_none());
+    session.execute("file.close", &json!({})).unwrap();
+    for n in 0..MAX_RECOVERY_ENTRIES {
+        assert!(list(&root.path().join(n.to_string())).is_empty());
+    }
+}
+
+fn restart_fixture() -> tempfile::TempDir {
+    let root = tempfile::tempdir().unwrap();
+    let mut first = unsaved("restart first");
+    first.docs[0].uid = 1;
+    save(&first, root.path()).unwrap();
+    let mut second = unsaved("restart second");
+    second.docs[0].uid = 2;
+    save(&second, root.path()).unwrap();
+    root
+}
+
+fn persisted_texts(dir: &Path) -> Vec<String> {
+    let mut result = Vec::new();
+    for (uid, _) in list(dir) {
+        let doc = crate::cmd::from_bytes(&std::fs::read(files(dir, uid).0).unwrap()).unwrap();
+        result.extend(doc.stories.values().map(|story| story.text.clone()));
+    }
+    result.sort();
+    result
+}
+
+#[test]
+#[ignore = "subprocess helper, executed by the restart recovery regression tests"]
+fn restart_recovery_child() {
+    let source = PathBuf::from(std::env::var("DESIGNCRAFT_TEST_RECOVERY_SOURCE").unwrap());
+    let mode = std::env::var("DESIGNCRAFT_TEST_RECOVERY_MODE").unwrap();
+    if mode == "occupied_destination" {
+        let owned_root = tempfile::tempdir().unwrap();
+        let destination = run_dir(owned_root.path()).unwrap();
+        let mut existing = unsaved("already in destination");
+        existing.docs[0].uid = 3;
+        save(&existing, &destination).unwrap();
+        let (existing_doc, existing_meta) = files(&destination, 3);
+        let doc_bytes = std::fs::read(&existing_doc).unwrap();
+        let meta_bytes = std::fs::read(&existing_meta).unwrap();
+        let mut session = Session::new();
+        session.recovery_dir = Some(destination.clone());
+        let opened = open(&mut session, &source).unwrap();
+        assert_eq!(opened.len(), 2);
+        assert_eq!(texts(&session), ["restart first", "restart second"]);
+        assert!(session.docs.iter().all(|document| document.uid != 3));
+        assert_eq!(persisted_texts(&destination), ["already in destination", "restart first", "restart second"]);
+        assert!(list(&source).is_empty());
+        session.execute("file.saveAs", &json!({"path": source.join("saved.designcraft").to_string_lossy()})).unwrap();
+        session.execute("file.close", &json!({"index": opened[0]})).unwrap();
+        assert_eq!(list(&destination).len(), 1);
+        assert_eq!(std::fs::read(existing_doc).unwrap(), doc_bytes);
+        assert_eq!(std::fs::read(existing_meta).unwrap(), meta_bytes);
+        return;
+    }
+    let mut session = Session::new();
+    if mode == "advance" || mode == "coincident_live" {
+        session.execute("file.new", &json!({})).unwrap();
+        assert_eq!(session.docs[0].uid, 1);
+    }
+    let owned_root;
+    let destination = match mode.as_str() {
+        "cross_dir" => {
+            owned_root = tempfile::tempdir().unwrap();
+            let own = run_dir(owned_root.path()).unwrap();
+            session.recovery_dir = Some(own.clone());
+            own
+        }
+        "alias" => {
+            let alias = source.join(".");
+            session.recovery_dir = Some(alias.clone());
+            alias
+        }
+        "coincident_live" => {
+            session.recovery_dir = Some(source.clone());
+            source.clone()
+        }
+        _ => source.clone(),
+    };
+    let opened = open(&mut session, &source).unwrap();
+    assert_eq!(opened.len(), 2);
+    assert_eq!(texts(&session), ["restart first", "restart second"]);
+    assert_eq!(persisted_texts(&destination), ["restart first", "restart second"]);
+    assert!(session.docs.iter().all(|d| d.uid > 0 && d.uid < u64::MAX));
+    if matches!(mode.as_str(), "cross_dir" | "manual" | "alias" | "revert") {
+        let was_disabled = session.recovery_dir.is_none();
+        if mode == "cross_dir" {
+            assert!(list(&source).is_empty());
+        }
+        // A copy does not consume recovery. A successful Save and a Close do.
+        session.execute("file.saveACopy", &json!({"path": source.join("copy.designcraft").to_string_lossy()})).unwrap();
+        assert_eq!(list(&destination).len(), 2);
+        session.execute("file.saveAs", &json!({"path": source.join("saved.designcraft").to_string_lossy()})).unwrap();
+        assert_eq!(list(&destination).len(), 1);
+        if mode == "revert" {
+            session.execute("frame.create", &json!({"rect": [0, 0, 100, 100], "content": "text", "text": "after saving"})).unwrap();
+            session.execute("file.recovery.save", &json!({"dir": destination.to_string_lossy()})).unwrap();
+            assert_eq!(list(&destination).len(), 2);
+            session.execute("file.revert", &json!({})).unwrap();
+            assert_eq!(list(&destination).len(), 1);
+        }
+        session.execute("file.close", &json!({"index": opened[0]})).unwrap();
+        assert!(list(&destination).is_empty());
+        assert!(list(&source).is_empty());
+        assert_eq!(session.recovery_dir.is_none(), was_disabled, "manual recovery must not configure autosave");
+    }
+}
+
+fn run_restart_case(mode: &str) {
+    let source = restart_fixture();
+    if mode == "max_uid" {
+        let (doc, meta) = files(source.path(), 2);
+        let (max_doc, max_meta) = files(source.path(), u64::MAX);
+        std::fs::rename(doc, max_doc).unwrap();
+        std::fs::rename(meta, max_meta).unwrap();
+    }
+    let output = std::process::Command::new(std::env::current_exe().unwrap())
+        .args(["--exact", "recovery::tests::restart_recovery_child", "--ignored", "--nocapture"])
+        .env("DESIGNCRAFT_TEST_RECOVERY_SOURCE", source.path())
+        .env("DESIGNCRAFT_TEST_RECOVERY_MODE", mode)
+        .output()
+        .unwrap();
+    assert!(output.status.success(), "fresh child failed: {}{}", String::from_utf8_lossy(&output.stdout), String::from_utf8_lossy(&output.stderr));
+    let child_stdout = String::from_utf8_lossy(&output.stdout);
+    assert!(child_stdout.contains("test result: ok. 1 passed; 0 failed;"), "the fresh-process helper did not run exactly once: {child_stdout}");
+}
+
+#[test]
+fn restart_uid_collision_cannot_delete_the_new_snapshot() {
+    run_restart_case("fresh");
+}
+#[test]
+fn restart_uid_collision_cannot_overwrite_an_unopened_entry() {
+    run_restart_case("advance");
+}
+#[test]
+fn cross_directory_recovery_uses_the_configured_destination() {
+    run_restart_case("cross_dir");
+}
+#[test]
+fn cross_directory_recovery_preserves_occupied_destination_entries() {
+    run_restart_case("occupied_destination");
+}
+#[test]
+fn manual_recovery_save_and_close_clean_up_without_enabling_autosave() {
+    run_restart_case("manual");
+}
+#[test]
+fn recovery_directory_aliases_do_not_delete_new_snapshots() {
+    run_restart_case("alias");
+}
+#[test]
+fn a_maximum_source_uid_does_not_advance_or_overflow_the_allocator() {
+    run_restart_case("max_uid");
+}
+#[test]
+fn a_coincident_live_uid_is_not_recovered_entry_provenance() {
+    run_restart_case("coincident_live");
+}
+#[test]
+fn manual_recovery_revert_removes_its_previous_checkpoint() {
+    run_restart_case("revert");
+}
+
+/// The recovery folder was cleared while the app runs: the next save makes the run's folder
+/// again, and its lock with it.
+#[cfg(unix)]
+#[test]
+fn a_removed_run_folder_is_made_again_with_its_lock() {
+    let root = tempfile::tempdir().unwrap();
+    let own = run_dir(root.path()).unwrap();
+    std::fs::remove_dir_all(&own).unwrap();
+    assert_eq!(save(&dirty_session(), &own).unwrap(), 1);
+    let lock = std::fs::File::open(own.join(LOCK)).unwrap();
+    assert!(matches!(lock.try_lock(), Err(std::fs::TryLockError::WouldBlock)));
+}
+
+/// Replacing the name of a live run's lock must not authorize writes under the old handle.
+#[cfg(unix)]
+#[test]
+fn save_rejects_a_run_whose_lock_was_replaced() {
+    let root = tempfile::tempdir().unwrap();
+    let own = run_dir(root.path()).unwrap();
+    std::fs::remove_file(own.join(LOCK)).unwrap();
+    let replacement = new_lock(&own).unwrap();
+    replacement.try_lock().unwrap();
+    assert!(save(&dirty_session(), &own).is_err());
+    assert!(list(&own).is_empty(), "another owner's folder must not receive our recovery data");
+}
+
+#[cfg(windows)]
+#[test]
+fn an_exclusively_locked_windows_recovery_file_validates() {
+    let root = tempfile::tempdir().unwrap();
+    let lock = new_lock(root.path()).unwrap();
+    lock.try_lock().unwrap();
+    validate_lock(root.path(), &lock).unwrap();
+    let named = std::fs::File::open(root.path().join(LOCK)).unwrap();
+    assert!(matches!(named.try_lock(), Err(std::fs::TryLockError::WouldBlock)), "validation must retain the exclusive lock");
+}
+
+#[cfg(windows)]
+#[test]
+fn windows_recovery_rejects_a_replacement_with_the_same_marker() {
+    let root = tempfile::tempdir().unwrap();
+    let lock = new_lock(root.path()).unwrap();
+    let marker = std::fs::read(root.path().join(LOCK)).unwrap();
+    lock.try_lock().unwrap();
+    let moved = root.path().join("original-lock");
+    std::fs::rename(root.path().join(LOCK), &moved).unwrap();
+    std::fs::write(root.path().join(LOCK), marker).unwrap();
+    assert!(validate_lock(root.path(), &lock).is_err(), "matching marker bytes do not make another file our lock");
+    std::fs::remove_file(root.path().join(LOCK)).unwrap();
+    assert!(validate_lock(root.path(), &lock).is_err(), "a missing lock must not validate");
+}
+
+#[cfg(windows)]
+#[test]
+fn windows_recovery_does_not_write_or_discard_a_replacement_runs_entries() {
+    let root = tempfile::tempdir().unwrap();
+    let own = run_dir(root.path()).unwrap();
+    std::fs::rename(own.join(LOCK), own.join("original-lock")).unwrap();
+    let replacement = new_lock(&own).unwrap();
+    replacement.try_lock().unwrap();
+    let session = dirty_session();
+    let (doc, meta) = files(&own, session.docs[0].uid);
+    std::fs::write(&doc, b"another owner's document").unwrap();
+    std::fs::write(&meta, b"{}").unwrap();
+    assert!(save(&session, &own).is_err());
+    discard(&own, session.docs[0].uid);
+    assert_eq!(std::fs::read(&doc).unwrap(), b"another owner's document");
+    assert_eq!(std::fs::read(&meta).unwrap(), b"{}");
+}
+
+/// A blocked attempt to recreate a run's lock must stop the save before it writes documents.
+#[cfg(unix)]
+#[test]
+fn save_rejects_a_run_whose_lock_cannot_be_recreated() {
+    let root = tempfile::tempdir().unwrap();
+    let own = run_dir(root.path()).unwrap();
+    std::fs::remove_file(own.join(LOCK)).unwrap();
+    std::fs::create_dir(own.join(LOCK)).unwrap();
+    assert!(save(&dirty_session(), &own).is_err());
+    assert!(list(&own).is_empty());
+}
+
+#[cfg(unix)]
+#[test]
+fn discarding_a_document_does_not_touch_a_replaced_runs_entries() {
+    let root = tempfile::tempdir().unwrap();
+    let own = run_dir(root.path()).unwrap();
+    std::fs::remove_file(own.join(LOCK)).unwrap();
+    let replacement = new_lock(&own).unwrap();
+    replacement.try_lock().unwrap();
+    let (doc, meta) = files(&own, 1);
+    std::fs::write(&doc, b"the replacement owner's document").unwrap();
+    std::fs::write(&meta, b"{}").unwrap();
+    discard(&own, 1);
+    assert_eq!(std::fs::read(doc).unwrap(), b"the replacement owner's document");
+    assert!(meta.exists());
+}
+
+#[cfg(unix)]
+#[test]
+fn saving_a_run_rejects_a_symlinked_lock() {
+    let root = tempfile::tempdir().unwrap();
+    let own = run_dir(root.path()).unwrap();
+    std::fs::remove_file(own.join(LOCK)).unwrap();
+    let unrelated = root.path().join("unrelated");
+    std::fs::write(&unrelated, b"unrelated file").unwrap();
+    std::os::unix::fs::symlink(&unrelated, own.join(LOCK)).unwrap();
+    assert!(save(&dirty_session(), &own).is_err());
+    assert_eq!(std::fs::read(unrelated).unwrap(), b"unrelated file");
+}
+
+#[cfg(unix)]
+#[test]
+fn a_replaced_run_directory_is_not_claimed_or_overwritten() {
+    let root = tempfile::tempdir().unwrap();
+    let own = run_dir(root.path()).unwrap();
+    let session = dirty_session();
+    let uid = session.docs[0].uid;
+    std::fs::remove_dir_all(&own).unwrap();
+    std::fs::create_dir(&own).unwrap();
+    let (doc, _) = files(&own, uid);
+    std::fs::write(&doc, b"another owner's document").unwrap();
+    assert!(save(&session, &own).is_err());
+    assert_eq!(std::fs::read(doc).unwrap(), b"another owner's document");
+    assert!(!own.join(LOCK).exists());
+}
+
+#[cfg(unix)]
+#[test]
+fn a_run_gets_no_folder_in_a_symlinked_recovery_folder() {
+    use std::os::unix::fs::symlink;
+
+    let root = tempfile::tempdir().unwrap();
+    let destination = root.path().join("destination");
+    let link = root.path().join("recovery");
+    std::fs::create_dir(&destination).unwrap();
+    symlink(&destination, &link).unwrap();
+
+    assert!(run_dir(&link).is_err());
+    assert!(std::fs::read_dir(&destination).unwrap().next().is_none());
+}
+
+fn unsaved(text: &str) -> Session {
+    let mut session = Session::new();
+    session.execute("file.new", &json!({})).unwrap();
+    session.execute("frame.create", &json!({"rect": [10, 10, 100, 100], "content": "text", "text": text})).unwrap();
+    session
+}
+
+fn texts(s: &Session) -> Vec<String> {
+    let mut texts: Vec<String> = s.documents().iter().flat_map(|d| d.doc.stories.values().map(|st| st.text.clone())).collect();
+    texts.sort();
+    texts
+}
+
+/// What a run that has ended leaves: its folder with its lock, free now, and the entry of
+/// one unsaved document, numbered `uid` as that process numbered it.
+fn run_left(root: &Path, name: &str, text: &str, uid: u64) -> PathBuf {
+    let dir = root.join(name);
+    std::fs::create_dir_all(&dir).unwrap();
+    std::fs::write(dir.join(LOCK), b"").unwrap();
+    let mut s = unsaved(text);
+    s.docs[0].uid = uid;
+    assert_eq!(save(&s, &dir).unwrap(), 1);
+    dir
+}
+
+/// Every process numbers its first document 1: two running apps both wrote `1.designcraft`
+/// into the one recovery folder, and only the document written last was recovered.
+#[test]
+fn documents_of_two_apps_that_ended_are_both_recovered() {
+    let root = tempfile::tempdir().unwrap();
+    let first = run_left(root.path(), "run-7-0", "first app", 1);
+    let second = run_left(root.path(), "run-8-0", "second app", 1);
+    let own = run_dir(root.path()).unwrap();
+    let mut s = Session::new();
+    assert_eq!(open(&mut s, &own).unwrap().len(), 2);
+    assert_eq!(texts(&s), ["first app", "second app"]);
+    assert!(s.documents().iter().all(DocState::is_dirty));
+    assert!(!first.exists() && !second.exists(), "nothing is left of the runs that ended");
+}
+
+/// An app that started reopened the unsaved documents of one still running, and removed
+/// its entries.
+#[test]
+fn a_running_apps_recovery_data_is_left_alone() {
+    let root = tempfile::tempdir().unwrap();
+    let running = run_left(root.path(), "run-7-0", "still open", 1);
+    let lock = std::fs::File::open(running.join(LOCK)).unwrap();
+    lock.try_lock().unwrap();
+    let own = run_dir(root.path()).unwrap();
+    let mut s = Session::new();
+    assert!(open(&mut s, &own).unwrap().is_empty());
+    assert_eq!(list(&running).len(), 1);
+    // Once it has ended, its document is recovered.
+    drop(lock);
+    assert_eq!(open(&mut s, &own).unwrap().len(), 1);
+    assert_eq!(texts(&s), ["still open"]);
+    assert!(!running.exists());
+}
+
+/// A process id comes round again: the folder a run left under it is not this run's.
+#[test]
+fn a_folder_left_under_this_process_id_is_not_reused() {
+    let root = tempfile::tempdir().unwrap();
+    let left = run_left(root.path(), &format!("run-{}-0", std::process::id()), "left behind", 1);
+    let own = run_dir(root.path()).unwrap();
+    assert_ne!(own, left);
+    let mut s = Session::new();
+    assert_eq!(open(&mut s, &own).unwrap().len(), 1);
+    assert_eq!(texts(&s), ["left behind"]);
+}
+
+/// Entries written straight into the recovery folder, as before runs had folders.
+#[test]
+fn recovery_data_of_an_earlier_version_is_recovered() {
+    let root = tempfile::tempdir().unwrap();
+    assert_eq!(save(&unsaved("earlier version"), root.path()).unwrap(), 1);
+    let own = run_dir(root.path()).unwrap();
+    let mut s = Session::new();
+    assert_eq!(open(&mut s, &own).unwrap().len(), 1);
+    assert_eq!(texts(&s), ["earlier version"]);
+    assert!(list(root.path()).is_empty());
+}
+
+/// An entry that can't be opened stays on disk, in this run's folder now.
+#[test]
+fn an_unreadable_entry_of_a_run_that_ended_is_kept() {
+    let root = tempfile::tempdir().unwrap();
+    let left = run_left(root.path(), "run-7-0", "readable", 1);
+    std::fs::write(left.join("2.designcraft"), b"not a document").unwrap();
+    let own = run_dir(root.path()).unwrap();
+    let mut s = Session::new();
+    assert_eq!(open(&mut s, &own).unwrap().len(), 1);
+    assert!(list(&own).iter().any(|e| std::fs::read(files(&own, e.0).0).unwrap() == b"not a document"));
+    assert!(!left.exists());
+}
+
+/// Only a folder named as a run's, with a lock that is free, is a run that ended.
+#[test]
+fn what_is_no_run_that_ended_is_passed_over() {
+    let root = tempfile::tempdir().unwrap();
+    std::fs::write(root.path().join("run-1-0"), b"a file").unwrap();
+    // An app that is starting has made its folder and not yet its lock.
+    let starting = root.path().join("run-2-0");
+    std::fs::create_dir(&starting).unwrap();
+    let other = run_left(root.path(), "backup", "not a run", 1);
+    #[cfg(unix)]
+    let (_elsewhere, linked) = {
+        let elsewhere = tempfile::tempdir().unwrap();
+        let linked = run_left(elsewhere.path(), "run-3-0", "behind a link", 1);
+        std::os::unix::fs::symlink(&linked, root.path().join("run-3-0")).unwrap();
+        (elsewhere, linked)
+    };
+    let own = run_dir(root.path()).unwrap();
+    let mut s = Session::new();
+    assert!(open(&mut s, &own).unwrap().is_empty());
+    assert!(starting.exists());
+    assert_eq!(list(&other).len(), 1);
+    #[cfg(unix)]
+    assert!(list(&linked).len() == 1 && root.path().join("run-3-0").is_symlink());
+}
+
+/// The metadata goes with its document: a document taken over remembers its file.
+#[test]
+fn a_document_taken_over_remembers_its_file() {
+    let root = tempfile::tempdir().unwrap();
+    let file = root.path().join("layout.designcraft");
+    let recovery = root.path().join("recovery");
+    let left = recovery.join("run-7-0");
+    std::fs::create_dir_all(&left).unwrap();
+    std::fs::write(left.join(LOCK), b"").unwrap();
+    let mut a = unsaved("saved once");
+    a.execute("file.saveAs", &json!({"path": file.to_string_lossy()})).unwrap();
+    a.execute("frame.create", &json!({"rect": [10, 10, 100, 100]})).unwrap();
+    assert_eq!(save(&a, &left).unwrap(), 1);
+    let own = run_dir(&recovery).unwrap();
+    let mut s = Session::new();
+    assert_eq!(open(&mut s, &own).unwrap().len(), 1);
+    assert_eq!(s.doc().unwrap().path.as_deref(), Some(file.to_string_lossy().as_ref()));
+}
+
+/// The folder of a run that ended goes with what the app left in it. A file the app did not
+/// write keeps the folder, and is not deleted.
+#[test]
+fn only_what_the_app_left_goes_with_the_folder_of_a_run_that_ended() {
+    let root = tempfile::tempdir().unwrap();
+    let emptied = run_left(root.path(), "run-7-0", "moved", 1);
+    std::fs::write(emptied.join("9.json"), b"{}").unwrap();
+    std::fs::write(emptied.join(".designcraft-recovery-abc.tmp"), b"half written").unwrap();
+    let kept = run_left(root.path(), "run-8-0", "moved too", 1);
+    std::fs::write(kept.join("copy.designcraft"), b"a copy someone put here").unwrap();
+    let own = run_dir(root.path()).unwrap();
+    let mut s = Session::new();
+    assert_eq!(open(&mut s, &own).unwrap().len(), 2);
+    assert!(!emptied.exists());
+    assert_eq!(std::fs::read(kept.join("copy.designcraft")).unwrap(), b"a copy someone put here");
+    assert!(kept.join(LOCK).exists(), "still the folder of a run that ended");
+}
+
+/// A folder that is there is another app's or was left behind, lock or no lock: a run's own
+/// is one it made itself.
+#[test]
+fn a_folder_that_is_there_is_not_made_this_runs() {
+    let root = tempfile::tempdir().unwrap();
+    let left = root.path().join(format!("run-{}-0", std::process::id()));
+    std::fs::create_dir(&left).unwrap();
+    std::fs::write(left.join("1.designcraft"), b"left with no lock").unwrap();
+    let own = run_dir(root.path()).unwrap();
+    assert_ne!(own, left);
+    assert!(!left.join(LOCK).exists());
+    assert_eq!(std::fs::read(left.join("1.designcraft")).unwrap(), b"left with no lock");
+}
+
+/// Another run's entry under uid 7 in a chosen folder, with a document of this run numbered
+/// 7 too: document uids start at 1 in every process.
+fn chosen_folder_with_another_runs_entry() -> (tempfile::TempDir, PathBuf, PathBuf) {
+    let root = tempfile::tempdir().unwrap();
+    let (doc, meta) = files(root.path(), 7);
+    std::fs::write(&doc, b"another run's document").unwrap();
+    std::fs::write(&meta, b"{\"title\": \"theirs\"}").unwrap();
+    (root, doc, meta)
+}
+
+#[test]
+fn a_clean_document_leaves_another_runs_entry_in_a_chosen_folder() {
+    let (root, doc, meta) = chosen_folder_with_another_runs_entry();
+    let mut s = Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.docs[0].uid = 7;
+    assert!(!s.docs[0].is_dirty());
+    s.execute("file.recovery.save", &json!({"dir": root.path().to_string_lossy()})).unwrap();
+    s.execute("file.close", &json!({})).unwrap();
+    assert_eq!(std::fs::read(doc).unwrap(), b"another run's document");
+    assert_eq!(std::fs::read(meta).unwrap(), b"{\"title\": \"theirs\"}");
+}
+
+#[test]
+fn a_dirty_document_does_not_overwrite_another_runs_entry_in_a_chosen_folder() {
+    let (root, doc, meta) = chosen_folder_with_another_runs_entry();
+    let mut s = unsaved("this run's work");
+    s.docs[0].uid = 7;
+    assert!(s.execute("file.recovery.save", &json!({"dir": root.path().to_string_lossy()})).is_err());
+    assert!(save(&s, root.path()).is_err());
+    assert_eq!(std::fs::read(doc).unwrap(), b"another run's document");
+    assert_eq!(std::fs::read(meta).unwrap(), b"{\"title\": \"theirs\"}");
+}
+
+/// A chosen folder that is a running app's run folder is that app's.
+#[test]
+fn a_folder_another_running_app_holds_is_refused() {
+    let root = tempfile::tempdir().unwrap();
+    let held = new_lock(root.path()).unwrap();
+    held.try_lock().unwrap();
+    assert!(save(&dirty_session(), root.path()).is_err());
+    assert!(list(root.path()).is_empty());
+}
diff --git a/crates/engine/src/sample.rs b/crates/engine/src/sample.rs
index 0009b4adb..79b51e40a 100644
--- a/crates/engine/src/sample.rs
+++ b/crates/engine/src/sample.rs
@@ -79,6 +79,7 @@ fn graphic_frame(d: &mut Document, sr: SpreadRef, r: Rect, asset: AssetId, px: (
     let (nw, nh) = (px.0 as f64, px.1 as f64);
     let k = (r.width() / nw).max(r.height() / nh);
     it.content = Content::Graphic(Graphic {
+        layer_options: None,
         asset,
         size: (nw, nh),
         xf: Affine::translate((r.x0 + (r.width() - nw * k) / 2.0, r.y0 + (r.height() - nh * k) / 2.0)) * Affine::scale(k),
@@ -128,8 +129,8 @@ fn build() -> designcraft_doc::Result<Document> {
             gradient: Gradient {
                 kind: GradientKind::Linear,
                 stops: vec![
-                    GradientStop { offset: 0.0, color: Color::cmyk(0.62, 0.95, 0.30, 0.25), opacity: 1.0, midpoint: 0.5 },
-                    GradientStop { offset: 1.0, color: Color::cmyk(0.0, 0.62, 0.78, 0.0), opacity: 1.0, midpoint: 0.5 },
+                    GradientStop { swatch: Some("Ink Plum".into()), ..GradientStop::new(0.0, Color::cmyk(0.62, 0.95, 0.30, 0.25)) },
+                    GradientStop { swatch: Some("Sunset".into()), ..GradientStop::new(1.0, Color::cmyk(0.0, 0.62, 0.78, 0.0)) },
                 ],
             },
         },
diff --git a/crates/engine/src/separations.rs b/crates/engine/src/separations.rs
new file mode 100644
index 000000000..a13b8af4f
--- /dev/null
+++ b/crates/engine/src/separations.rs
@@ -0,0 +1,251 @@
+//! Separations Preview: the plates the print PDF puts on film, read back from that PDF.
+//!
+//! A spread is exported as Export PDF writes it (one PDF page for the spread, with the
+//! document bleed) into memory, and `craft_prepress::plates` separates that page: one 8-bit
+//! plane per ink, the four process inks and every spot ink the page paints, after the Ink
+//! Manager's aliases and spots to process. The preview shows those plates, so it shows what
+//! the PDF prints, not what the document model intends.
+
+use std::sync::Arc;
+
+use craft_prepress::{CmsConversion, Fallback, InkId, Options, Plates, Process};
+use designcraft_compose::Cache;
+use designcraft_doc::{Document, PageSide};
+use designcraft_geom::Rect;
+use designcraft_pdf::PdfOptions;
+pub use designcraft_pdf::Standard;
+
+use crate::{EngineError, Result};
+
+/// The highest resolution a preview separates at, in pixels per inch. craft-prepress further
+/// lowers it to fit 4 megapixels per plate.
+pub const MAX_DPI: f32 = 300.0;
+/// The lowest resolution a preview separates at.
+pub const MIN_DPI: f32 = 9.0;
+/// The color over-limit areas show in, sRGB.
+pub const OVER_LIMIT: [u8; 3] = [230, 40, 40];
+
+/// A spread separated into plates.
+pub struct Sheet {
+    pub spread: usize,
+    /// The PDF page's area in spread coordinates: the spread's trim plus the document bleed.
+    pub area: Rect,
+    pub plates: Plates,
+    /// The printing condition the composite converts process plates through.
+    cms: CmsConversion,
+    /// Export warnings.
+    pub warnings: Vec<String>,
+}
+
+impl std::fmt::Debug for Sheet {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Sheet").field("spread", &self.spread).field("area", &self.area).field("plates", &self.plates).finish_non_exhaustive()
+    }
+}
+
+/// The area spread `si`'s print PDF page covers, in spread coordinates (the trim and the bleed,
+/// as the PDF writer lays out a spread sheet).
+fn sheet_area(doc: &Document, si: usize) -> Option<Rect> {
+    let sp = doc.spreads.get(si)?;
+    let b = doc.settings.bleed.map(|v| if v.is_finite() { v.max(0.0) } else { 0.0 });
+    // Bleed is top, bottom, inside, outside; single-sided pages read inside as left.
+    let lr = |side: PageSide| if side == PageSide::Left { (b[3], b[2]) } else { (b[2], b[3]) };
+    let outer = sp.outer_page_indices();
+    let l = outer.and_then(|(l, _)| sp.pages.get(l)).map_or(b[2], |p| lr(p.side).0);
+    let r = outer.and_then(|(_, r)| sp.pages.get(r)).map_or(b[3], |p| lr(p.side).1);
+    let trim = sp.bounds();
+    Some(Rect::new(trim.x0 - l, trim.y0 - b[0], trim.x1 + r, trim.y1 + b[1]))
+}
+
+/// The print profile: the working CMYK space's output intent, as PDF/X-4 export embeds it.
+fn printing_condition() -> (Fallback, CmsConversion) {
+    let Ok(intent) = designcraft_color::cms::active().output_intent() else { return (Fallback::Fogra39, CmsConversion::fogra39()) };
+    match CmsConversion::new(&intent.icc) {
+        Ok(cms) => (Fallback::Profile(Arc::from(intent.icc.as_ref())), cms),
+        Err(_) => (Fallback::Fogra39, CmsConversion::fogra39()),
+    }
+}
+
+/// The Export PDF settings that change what a page prints.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Print {
+    pub standard: Standard,
+    pub compress_images: bool,
+    /// The transparency flattener's resolution, in ppi.
+    pub flatten: Option<f64>,
+}
+
+/// Exports spread `si` as Export PDF prints it with `print` (one page for the spread, with
+/// the document bleed, without printer's marks) and separates it at `dpi`, clamped to
+/// [`MIN_DPI`]–[`MAX_DPI`].
+pub fn separate(doc: &Document, cache: &Cache, si: usize, dpi: f32, print: &Print) -> Result<Sheet> {
+    let sp = doc.spreads.get(si).ok_or_else(|| EngineError::Other(format!("spread {si} does not exist")))?;
+    let first = doc.first_page_of_spread(si);
+    let pages: Vec<usize> = (first..first.saturating_add(sp.pages.len())).collect();
+    let area = sheet_area(doc, si).ok_or_else(|| EngineError::Other(format!("spread {si} does not exist")))?;
+    let opts = PdfOptions {
+        pages: Some(pages),
+        spreads: true,
+        bleed: true,
+        standard: print.standard,
+        compress_images: print.compress_images,
+        ..PdfOptions::default()
+    };
+    let report = crate::cmd::print_pdf(doc, cache, &opts, print.flatten)?;
+    let dpi = if dpi.is_finite() { dpi.clamp(MIN_DPI, MAX_DPI) } else { MIN_DPI };
+    let (fallback, cms) = printing_condition();
+    let plates = craft_prepress::plates(&report.bytes, 0, dpi, &Options { overprint: true, fallback })
+        .map_err(|e| EngineError::Other(format!("separations: {e}")))?;
+    Ok(Sheet { spread: si, area, plates, cms, warnings: report.warnings })
+}
+
+impl Sheet {
+    /// The ink a plate name denotes: a process ink by its name in any case (`cyan`), or a spot
+    /// ink by name.
+    pub fn ink(&self, name: &str) -> Option<InkId> {
+        Process::ALL.into_iter().find(|p| p.name().eq_ignore_ascii_case(name)).map(InkId::process).or_else(|| self.plates.inks.lookup(name))
+    }
+
+    /// Every plate: name and whether it's a spot ink, process inks first.
+    pub fn inks(&self) -> Vec<(String, bool)> {
+        self.plates.inks.iter().map(|(_, ink)| (ink.name().to_string(), ink.is_spot())).collect()
+    }
+
+    /// The preview as opaque RGBA8 (`plates.width` × `plates.height`): every ink composited,
+    /// or with `plate` one ink alone as gray film (black is 100%). With `ink_limit` (percent of
+    /// total ink) the image is gray and the areas over the limit show in [`OVER_LIMIT`].
+    pub fn image(&self, plate: Option<InkId>, ink_limit: Option<f32>) -> Vec<u8> {
+        let p = &self.plates;
+        let mut rgb = match plate.and_then(|id| p.plane(id)) {
+            Some(plane) => plane.iter().flat_map(|t| [255 - t; 3]).collect(),
+            None => p.composite(&[], &self.cms),
+        };
+        if let Some(limit) = ink_limit.filter(|l| l.is_finite()) {
+            for px in rgb.as_chunks_mut::<3>().0 {
+                let [r, g, b] = px.map(u32::from);
+                let y = ((r * 77 + g * 150 + b * 29) >> 8) as u8;
+                *px = [y; 3];
+            }
+            p.above(limit, &[]).paint(&mut rgb, OVER_LIMIT);
+        }
+        rgb.as_chunks::<3>().0.iter().flat_map(|[r, g, b]| [*r, *g, *b, 255]).collect()
+    }
+
+    /// Converts a pixel position to spread coordinates.
+    pub fn to_spread(&self, x: u32, y: u32) -> designcraft_geom::Point {
+        let k = 72.0 / f64::from(self.plates.dpi.max(f32::MIN_POSITIVE));
+        designcraft_geom::Point::new(self.area.x0 + f64::from(x) * k, self.area.y0 + f64::from(y) * k)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+
+    use super::*;
+    use crate::Session;
+
+    /// A letter page with a Gold spot square at (72, 72), a cyan square at (300, 72) and a
+    /// 400% square at (72, 400), each 100 pt.
+    fn document() -> Session {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("swatch.create", &json!({"name": "Gold", "spot": true, "color": {"c": 0, "m": 20, "y": 80, "k": 10}})).unwrap();
+        s.execute("swatch.create", &json!({"name": "Rich", "color": {"c": 100, "m": 100, "y": 100, "k": 100}})).unwrap();
+        for (rect, swatch) in [([72, 72, 172, 172], "Gold"), ([300, 72, 400, 172], "C=100 M=0 Y=0 K=0"), ([72, 400, 172, 500], "Rich")] {
+            let id = s.execute("frame.create", &json!({"rect": rect})).unwrap()["id"].clone();
+            s.execute("object.fill", &json!({"swatch": swatch, "ids": [id]})).unwrap();
+        }
+        s
+    }
+
+    fn sheet(s: &Session) -> Sheet {
+        separate(&s.doc().unwrap().doc, &s.cache, 0, 36.0, &Print::default()).unwrap()
+    }
+
+    /// The tint of `ink` at spread point (`x`, `y`).
+    fn tint(sheet: &Sheet, ink: &str, x: f64, y: f64) -> u8 {
+        let k = f64::from(sheet.plates.dpi) / 72.0;
+        let (px, py) = (((x - sheet.area.x0) * k) as u32, ((y - sheet.area.y0) * k) as u32);
+        sheet.plates.tint(sheet.ink(ink).unwrap(), px, py).unwrap()
+    }
+
+    #[test]
+    fn the_plates_are_the_process_inks_and_the_spot_and_the_spot_plate_shows_only_the_spot() {
+        let s = document();
+        let sheet = sheet(&s);
+        let names: Vec<(String, bool)> = sheet.inks();
+        let expected: Vec<(String, bool)> =
+            [("Cyan", false), ("Magenta", false), ("Yellow", false), ("Black", false), ("Gold", true)].map(|(n, sp)| (n.to_string(), sp)).into();
+        assert_eq!(names, expected);
+        assert!(tint(&sheet, "Gold", 122.0, 122.0) > 250, "Gold under the Gold square");
+        assert_eq!(tint(&sheet, "Gold", 350.0, 122.0), 0, "no Gold under the cyan square");
+        assert_eq!(tint(&sheet, "Gold", 122.0, 450.0), 0, "no Gold under the 400% square");
+        assert_eq!(tint(&sheet, "cyan", 122.0, 122.0), 0, "the spot isn't separated into process");
+        assert!(tint(&sheet, "cyan", 350.0, 122.0) > 250);
+
+        // The Gold plate alone: film only where the Gold square is.
+        let img = sheet.image(sheet.ink("Gold"), None);
+        let at = |x: f64, y: f64| {
+            let k = f64::from(sheet.plates.dpi) / 72.0;
+            let i = (((y - sheet.area.y0) * k) as usize * sheet.plates.width as usize + ((x - sheet.area.x0) * k) as usize) * 4;
+            [img[i], img[i + 1], img[i + 2]]
+        };
+        assert!(at(122.0, 122.0).iter().all(|v| *v < 5), "{:?}", at(122.0, 122.0));
+        assert_eq!(at(350.0, 122.0), [255; 3]);
+        assert_eq!(at(122.0, 450.0), [255; 3]);
+        let inked = img.as_chunks::<4>().0.iter().filter(|px| px[0] < 128).count();
+        let square = (100.0 * f64::from(sheet.plates.dpi) / 72.0).powi(2);
+        assert!((inked as f64 - square).abs() < square * 0.1, "{inked} dark pixels, the square has {square}");
+    }
+
+    #[test]
+    fn ink_limit_flags_the_400_percent_area() {
+        let mut s = document();
+        let r = s.execute("ink.separations", &json!({"dpi": 36, "inkLimit": 300})).unwrap();
+        assert!(r["maxTotal"].as_f64().unwrap() > 399.0, "{r}");
+        let regions = r["overLimit"]["regions"].as_array().unwrap();
+        assert_eq!(regions.len(), 1, "{r}");
+        let (x, y) = (regions[0]["x"].as_f64().unwrap(), regions[0]["y"].as_f64().unwrap());
+        assert!((x - 72.0).abs() < 3.0 && (y - 400.0).abs() < 3.0, "the 400% square: {r}");
+        assert!(r["inks"].as_array().unwrap().iter().any(|i| i["name"] == "Gold" && i["spot"] == true));
+
+        let sheet = sheet(&s);
+        let img = sheet.image(None, Some(300.0));
+        let k = f64::from(sheet.plates.dpi) / 72.0;
+        let at = |x: f64, y: f64| {
+            let i = (((y - sheet.area.y0) * k) as usize * sheet.plates.width as usize + ((x - sheet.area.x0) * k) as usize) * 4;
+            [img[i], img[i + 1], img[i + 2]]
+        };
+        assert_eq!(at(122.0, 450.0), OVER_LIMIT);
+        let gray = at(350.0, 122.0);
+        assert!(gray[0] == gray[1] && gray[1] == gray[2], "under the limit the preview is gray: {gray:?}");
+    }
+
+    #[test]
+    fn a_spot_aliased_to_another_spot_prints_on_its_plate() {
+        let mut s = document();
+        s.execute("swatch.create", &json!({"name": "Silver", "spot": true, "color": {"c": 0, "m": 0, "y": 0, "k": 40}})).unwrap();
+        let id = s.execute("frame.create", &json!({"rect": [300, 400, 400, 500]})).unwrap()["id"].clone();
+        s.execute("object.fill", &json!({"swatch": "Silver", "ids": [id]})).unwrap();
+        assert!(sheet(&s).ink("Silver").is_some());
+        s.execute("ink.options", &json!({"ink": "Gold", "alias": "Silver"})).unwrap();
+        let sheet = sheet(&s);
+        assert!(sheet.ink("Gold").is_none(), "{:?}", sheet.inks());
+        assert!(tint(&sheet, "Silver", 122.0, 122.0) > 250, "Gold's square is on the Silver plate");
+        assert!(tint(&sheet, "Silver", 350.0, 450.0) > 250);
+    }
+
+    #[test]
+    fn a_saved_document_with_ink_settings_loads_and_its_preview_applies_them() {
+        let s = document();
+        let mut v = serde_json::to_value(&*s.doc().unwrap().doc).unwrap();
+        // Ink Manager settings as documents save them.
+        v["inks"] = json!({"allToProcess": false, "toProcess": ["Gold"], "aliases": []});
+        let doc: Document = serde_json::from_value(v).unwrap();
+        assert_eq!(doc.inks.to_process, ["Gold"]);
+        let sheet = separate(&doc, &s.cache, 0, 36.0, &Print::default()).unwrap();
+        assert!(sheet.ink("Gold").is_none(), "Gold prints as process: {:?}", sheet.inks());
+        assert!(tint(&sheet, "Yellow", 122.0, 122.0) > 150, "Gold's yellow");
+    }
+}
diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs
index b1792485d..6347b605f 100644
--- a/crates/engine/src/tests.rs
+++ b/crates/engine/src/tests.rs
@@ -2,6 +2,15 @@ use serde_json::json;
 
 use super::*;
 
+mod autosize;
+mod file_guard;
+mod idml;
+mod ime;
+mod linked_paths;
+mod params;
+mod roots;
+mod table;
+
 fn session() -> Session {
     let mut s = Session::new();
     s.execute("file.new", &json!({"pages": 2})).unwrap();
diff --git a/crates/engine/src/tests_autosize.rs b/crates/engine/src/tests/autosize.rs
similarity index 100%
rename from crates/engine/src/tests_autosize.rs
rename to crates/engine/src/tests/autosize.rs
diff --git a/crates/engine/src/tests_file_guard.rs b/crates/engine/src/tests/file_guard.rs
similarity index 88%
rename from crates/engine/src/tests_file_guard.rs
rename to crates/engine/src/tests/file_guard.rs
index 9f2af3c32..f62e5c338 100644
--- a/crates/engine/src/tests_file_guard.rs
+++ b/crates/engine/src/tests/file_guard.rs
@@ -31,9 +31,13 @@ const ALLOWED: &[(&str, &str)] = &[
         "`OutputRoot` checks the folder against the write root before it creates anything and then only writes inside it. Its reads are of the font files that draw the document's text (installed fonts and the `Document Fonts` folder), never of a path a command names",
     ),
     (
-        "fonts/src/fontdb.rs",
+        "fonts/src/fontdb/system.rs",
         "the installed-font scan reads the platform's fixed font folders (`system_font_dirs`: no command parameter or document field names one), and `load_document_fonts` asks the caller's `allow` check about its folder and each font file before opening either",
     ),
+    (
+        "ui-egui/src/app/file_dialogs.rs",
+        "the host's own file dialogs: it only tests whether a path the user picked in the system dialog exists (the replace-file question, the folder a Save dialog opens in), then re-runs the command with that path, which the engine checks as usual",
+    ),
     (
         "mcp/src/tools.rs",
         "`screenshot` reads back the PNG the connected app just wrote. Connected mode cannot be combined with the roots (the CLI refuses the pair), and the app's own engine checks the path it writes",
@@ -68,8 +72,8 @@ fn code_outside_tests(text: &str) -> Vec<(usize, &str)> {
     let mut i = 0;
     while i < lines.len() {
         let attr = lines[i].trim();
-        let module = lines.get(i + 1).map(|l| l.trim_start().trim_start_matches("pub "));
-        if attr.starts_with("#[cfg(") && attr.contains("test") && module.is_some_and(|m| m.starts_with("mod ")) {
+        let module = lines.get(i + 1).map(|l| without_visibility(l.trim_start()));
+        if attr.starts_with("#[cfg(") && attr.replace("not(test)", "").contains("test") && module.is_some_and(|m| m.starts_with("mod ")) {
             let header = lines[i + 1];
             i += 2;
             if header.trim_end().ends_with('{') {
@@ -88,6 +92,14 @@ fn code_outside_tests(text: &str) -> Vec<(usize, &str)> {
     code
 }
 
+/// `item` without a leading `pub`, `pub(crate)`, `pub(super)` or `pub(in …)`: a test module
+/// that sibling modules share is still a test module.
+fn without_visibility(item: &str) -> &str {
+    let Some(rest) = item.strip_prefix("pub") else { return item };
+    let rest = if rest.starts_with('(') { rest.find(')').map_or(rest, |close| &rest[close + 1..]) } else { rest };
+    if rest.starts_with(char::is_whitespace) { rest.trim_start() } else { item }
+}
+
 /// `line` without its `//` comment (a `//` inside a string or char is rare enough in this code
 /// to leave alone: it only hides the rest of that line from the scan).
 fn without_comment(line: &str) -> &str {
@@ -131,7 +143,7 @@ fn imports_fs(text: &str) -> Vec<usize> {
     for (n, line) in code_outside_tests(text) {
         let line = without_comment(line);
         if statement.is_empty() {
-            if !line.trim_start().starts_with("use ") && !line.trim_start().starts_with("pub use ") {
+            if !without_visibility(line.trim_start()).starts_with("use ") {
                 continue;
             }
             start = n;
@@ -247,4 +259,6 @@ fn the_scan_sees_every_spelling() {
     }
     assert!(imports_fs("use std::io::Read;\nuse std::path::Path;").is_empty());
     assert!(imports_fs("#[cfg(test)]\nmod tests {\n    use std::fs;\n}\n").is_empty(), "test modules are skipped");
+    assert!(imports_fs("#[cfg(test)]\npub(super) mod shared {\n    use std::fs;\n}\n").is_empty(), "shared test modules are skipped");
+    assert!(!imports_fs("#[cfg(not(test))]\npub(crate) mod real {\n    use std::fs;\n}\n").is_empty(), "cfg(not(test)) modules are scanned");
 }
diff --git a/crates/engine/src/tests_idml.rs b/crates/engine/src/tests/idml.rs
similarity index 98%
rename from crates/engine/src/tests_idml.rs
rename to crates/engine/src/tests/idml.rs
index 3a49168be..e8766d091 100644
--- a/crates/engine/src/tests_idml.rs
+++ b/crates/engine/src/tests/idml.rs
@@ -30,6 +30,13 @@ fn magazine_round_trips_through_idml() {
     assert_eq!(back.page_count(), d.page_count());
     assert_eq!(back.spreads.len(), d.spreads.len());
     assert_eq!(back.parents.len(), d.parents.len());
+    assert_magazine_stories(&d, &back);
+    assert_magazine_styles(&d, &back);
+    assert_magazine_geometry(&d, &back);
+    assert_magazine_assets(&d, &back);
+}
+
+fn assert_magazine_stories(d: &Document, back: &Document) {
     // Stories: same text in the same order, same styles applied.
     let ta: Vec<&str> = d.stories.values().map(|s| s.text.as_str()).collect();
     let tb: Vec<&str> = back.stories.values().map(|s| s.text.as_str()).collect();
@@ -48,6 +55,9 @@ fn magazine_round_trips_through_idml() {
             assert_eq!(pa.para, pb.para);
         }
     }
+}
+
+fn assert_magazine_styles(d: &Document, back: &Document) {
     // Styles and swatches by name.
     for s in &d.styles.paragraph {
         let b = back.styles.para(&s.name).unwrap_or_else(|| panic!("paragraph style {}", s.name));
@@ -64,6 +74,9 @@ fn magazine_round_trips_through_idml() {
         let b = back.swatch(&s.name).unwrap_or_else(|| panic!("swatch {}", s.name));
         assert_eq!(b.value, s.value, "{}", s.name);
     }
+}
+
+fn assert_magazine_geometry(d: &Document, back: &Document) {
     // Frame geometry (document and parent spreads), pages.
     for (sa, sb) in [(&d.spreads, &back.spreads), (&d.parents, &back.parents)] {
         let (ia, ib) = (items(sa), items(sb));
@@ -78,8 +91,11 @@ fn magazine_round_trips_through_idml() {
         }
     }
     // Threads: the same frames in the same order.
-    assert_eq!(positions(&d), positions(&back));
+    assert_eq!(positions(d), positions(back));
     assert!(back.stories.values().any(|s| s.frames.len() == 2));
+}
+
+fn assert_magazine_assets(d: &Document, back: &Document) {
     // Images are embedded.
     assert_eq!(back.assets.len(), d.assets.len());
     for (a, b) in d.assets.values().zip(back.assets.values()) {
@@ -87,7 +103,7 @@ fn magazine_round_trips_through_idml() {
         assert_eq!(a.pixels, b.pixels);
     }
     // A second round trip is stable.
-    let again = designcraft_idml::import_idml(&designcraft_idml::export_idml(&back)).unwrap();
+    let again = designcraft_idml::import_idml(&designcraft_idml::export_idml(back)).unwrap();
     assert_eq!(items(&again.spreads).len(), items(&back.spreads).len());
 }
 
diff --git a/crates/engine/src/tests_ime.rs b/crates/engine/src/tests/ime.rs
similarity index 74%
rename from crates/engine/src/tests_ime.rs
rename to crates/engine/src/tests/ime.rs
index 266470914..222142c80 100644
--- a/crates/engine/src/tests_ime.rs
+++ b/crates/engine/src/tests/ime.rs
@@ -4,7 +4,7 @@
 use designcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey};
 use serde_json::json;
 
-use super::*;
+use super::{Arc, Session, ViewInfo, ime_delete_ranges};
 
 fn session() -> Session {
     let mut s = Session::new();
@@ -30,6 +30,49 @@ fn steps(s: &Session) -> usize {
     s.doc().unwrap().history.undo.len()
 }
 
+/// Byte counts round inward to whole characters, cap at the text bounds, and scan from the requested count rather than the story start.
+#[test]
+fn ime_byte_deletion_rounds_inward_from_the_requested_count() {
+    // a: 0..1, é: 1..3, 😀: 3..7, b: 7..8.
+    let text = "aé😀b";
+    assert_eq!(ime_delete_ranges(text, 7, 7, 4, 0, true), Some((3..7, 7..7)), "the whole emoji");
+    assert_eq!(ime_delete_ranges(text, 7, 7, 6, 0, true), Some((1..7, 7..7)), "é and the emoji");
+    assert_eq!(ime_delete_ranges(text, 7, 7, 3, 0, true), Some((7..7, 7..7)), "a count starting inside the emoji leaves it");
+    assert_eq!(ime_delete_ranges(text, 7, 7, 100, 0, true), Some((0..7, 7..7)), "more bytes than the text takes it all");
+    // The scan starts at the requested count, not at the start of the story.
+    let long = format!("{}é", "x".repeat(20_000));
+    let end = long.len();
+    assert_eq!(ime_delete_ranges(&long, end, end, 3, 0, true), Some((end - 3..end, end..end)), "x and é");
+    assert_eq!(ime_delete_ranges(&long, end, end, 2, 0, true), Some((end - 2..end, end..end)), "the whole é");
+    assert_eq!(ime_delete_ranges(&long, end, end, 1, 0, true), Some((end..end, end..end)), "one byte inside é leaves it");
+}
+
+/// Reports exact before/after byte ranges, preserves and remaps the selection direction; no-op deletes report `None`.
+#[test]
+fn ime_delete_reports_the_ranges_it_applied() {
+    let mut s = session();
+    let sid = typing_into(&mut s, "aé😀b");
+    s.execute("text.select", &json!({"story": sid, "anchor": 1, "focus": 3})).unwrap();
+    let m = s.ime_delete_surrounding(2, 4, true).unwrap().expect("the delete changed the text");
+    assert_eq!(m.deleted_before, 0..1, "the byte before the selection");
+    assert_eq!(m.deleted_after, 3..7, "the emoji after it");
+    assert_eq!((m.anchor_before, m.focus_before), (1, 3));
+    assert_eq!((m.anchor_after, m.focus_after), (0, 2), "the selection stays selected, shifted left");
+    assert_eq!((m.text_len_before, m.text_len_after), (8, 3));
+    assert!(m.inserted.is_empty());
+    assert_eq!(text(&mut s, sid), "éb");
+    // A request that removes nothing is reported as no mutation at all.
+    s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
+    assert!(s.ime_delete_surrounding(0, 0, false).unwrap().is_none());
+    // A commit reports the text it typed and replaces the selection.
+    s.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 2})).unwrap();
+    let m = s.ime_commit("日", ViewInfo::default()).unwrap().expect("the commit changed the text");
+    assert_eq!(m.inserted, "日");
+    assert!(m.deleted_before.is_empty() && m.deleted_after.is_empty());
+    assert_eq!((m.anchor_after, m.focus_after), (3, 3));
+    assert_eq!(text(&mut s, sid), "日b");
+}
+
 #[test]
 fn ime_composition_shows_in_place_and_commits_as_one_step() {
     // Romaji → kana → conversion → commit, as the macOS Japanese IME sends it.
diff --git a/crates/engine/src/tests_linked_paths.rs b/crates/engine/src/tests/linked_paths.rs
similarity index 100%
rename from crates/engine/src/tests_linked_paths.rs
rename to crates/engine/src/tests/linked_paths.rs
diff --git a/crates/engine/src/tests_params.rs b/crates/engine/src/tests/params.rs
similarity index 100%
rename from crates/engine/src/tests_params.rs
rename to crates/engine/src/tests/params.rs
diff --git a/crates/engine/src/tests_roots.rs b/crates/engine/src/tests/roots.rs
similarity index 99%
rename from crates/engine/src/tests_roots.rs
rename to crates/engine/src/tests/roots.rs
index 39ab5e57d..0f9b9654e 100644
--- a/crates/engine/src/tests_roots.rs
+++ b/crates/engine/src/tests/roots.rs
@@ -23,7 +23,7 @@ fn folders(name: &str) -> (PathBuf, Arc<AutomationRoots>) {
     for d in ["in", "out", "outside"] {
         std::fs::create_dir_all(base.join(d)).unwrap();
     }
-    let roots = AutomationRoots::new(Some(&base.join("in")), Some(&base.join("out"))).unwrap().unwrap();
+    let roots = AutomationRoots::new(&[&base.join("in")], &[&base.join("out")]).unwrap().unwrap();
     (base, roots)
 }
 
diff --git a/crates/engine/src/tests_table.rs b/crates/engine/src/tests/table.rs
similarity index 89%
rename from crates/engine/src/tests_table.rs
rename to crates/engine/src/tests/table.rs
index 2fc4fd338..ecf0b9bbe 100644
--- a/crates/engine/src/tests_table.rs
+++ b/crates/engine/src/tests/table.rs
@@ -1,6 +1,6 @@
 use serde_json::json;
 
-use super::*;
+use super::{Session, doc};
 
 fn session_with_frame() -> (Session, u64, u64) {
     let mut s = Session::new();
@@ -911,100 +911,115 @@ fn split_selected_row_or_column_splits_both_cells() {
 fn split_selected_block_and_merged_cells_preserves_geometry_and_history() {
     for horizontal in [true, false] {
         for merged in [false, true] {
-            let (mut s, sid, _) = session_with_frame();
-            let tid = s.execute("table.insert", &json!({"rows": 4, "cols": 4, "width": 240})).unwrap()["table"].as_u64().unwrap();
-            s.execute("table.setRowHeight", &json!({"table": tid, "height": 60, "mode": "exactly"})).unwrap();
-            s.execute("style.cell.create", &json!({"name": "Neighbor", "fill": "[Paper]", "insets": 3})).unwrap();
-            s.execute("style.cell.create", &json!({"name": "Chosen", "fill": "[Black]", "tint": 0.15, "insets": 2})).unwrap();
-            s.execute("style.cell.apply", &json!({"table": tid, "name": "Neighbor"})).unwrap();
-            for r in 0..4 {
-                for c in 0..4 {
-                    s.execute("table.setCell", &json!({"row": r, "col": c, "text": format!("{r},{c}")})).unwrap();
-                }
-            }
-            let range = if !merged {
-                doc::CellRange::new(1, 1, 2, 2)
-            } else if horizontal {
-                doc::CellRange::new(0, 0, 2, 1)
-            } else {
-                doc::CellRange::new(0, 0, 1, 2)
-            };
-            let selection = json!({"rows": [range.r0, range.r1], "cols": [range.c0, range.c1]});
-            s.execute("table.select", &selection).unwrap();
-            s.execute("style.cell.apply", &json!({"name": "Chosen"})).unwrap();
-            if merged {
-                let merge = if horizontal { json!({"rows": [0, 2], "cols": [1, 1]}) } else { json!({"rows": [1, 1], "cols": [0, 2]}) };
-                s.execute("table.merge", &merge).unwrap();
-                s.execute("table.select", &selection).unwrap();
-            }
-            let before_doc = s.doc().unwrap().doc.clone();
-            let before_selection = s.doc().unwrap().selection.clone();
-            let before = table_for(&s, sid, tid).clone();
-            let before_layout = s.cache.get(&before_doc, doc::StoryId(sid), None);
-            let before_fragment = before_layout.frames.iter().flat_map(|f| &f.tables).find(|t| t.table == tid).unwrap();
-            let undo_len = s.doc().unwrap().history.undo.len();
-            let command = if horizontal { "table.splitHorizontally" } else { "table.splitVertically" };
-            s.execute(command, &json!({})).unwrap();
-            assert_eq!(s.doc().unwrap().history.undo.len(), undo_len + 1, "one split command creates one undo entry");
-            let after_doc = s.doc().unwrap().doc.clone();
-            let after_selection = s.doc().unwrap().selection.clone();
-            let after = table_for(&s, sid, tid).clone();
-            let after_layout = s.cache.get(&after_doc, doc::StoryId(sid), None);
-            let after_fragment = after_layout.frames.iter().flat_map(|f| &f.tables).find(|t| t.table == tid).unwrap();
-            assert_eq!(after_fragment.rect, before_fragment.rect, "splitting does not resize the table");
-            assert_eq!(after_fragment.cells.len(), before_fragment.cells.len() + 4, "four original owners split once");
-            for placed in &before_fragment.cells {
-                let original = before.cell(placed.row, placed.col).unwrap();
-                let matches: Vec<_> = after_fragment.cells.iter().filter(|c| c.source == placed.source).collect();
-                assert_eq!(matches.len(), 1, "original cell text survives once: {}", placed.source);
-                let surviving = matches[0];
-                let cell = after.cell(surviving.row, surviving.col).unwrap();
-                let mut normalized = cell.clone();
-                normalized.row_span = original.row_span;
-                normalized.col_span = original.col_span;
-                assert_eq!(&normalized, original, "existing cell text and formatting are preserved");
-                if !range.contains(placed.row, placed.col) {
-                    assert_eq!(surviving.rect, placed.rect, "unselected neighbor geometry is unchanged");
-                    continue;
-                }
-                let second_addr = if horizontal {
-                    (surviving.row + cell.row_span as usize, surviving.col)
-                } else {
-                    (surviving.row, surviving.col + cell.col_span as usize)
-                };
-                let second = after.cell(second_addr.0, second_addr.1).unwrap();
-                assert_eq!(after.owner(second_addr.0, second_addr.1), second_addr);
-                assert!(second.text.is_empty());
-                assert_eq!(second.style, original.style);
-                assert_eq!(second.insets, original.insets);
-                assert_eq!(second.fill, original.fill);
-                assert_eq!(second.fill_tint, original.fill_tint);
-                let second_rect = after_fragment.cell(second_addr.0, second_addr.1).unwrap().rect;
-                assert_eq!(surviving.rect.union(second_rect), placed.rect, "the halves exactly cover the original cell");
-                if horizontal {
-                    assert_eq!(surviving.rect.y1, second_rect.y0);
-                } else {
-                    assert_eq!(surviving.rect.x1, second_rect.x0);
-                }
-            }
-            let text = s.doc().unwrap().selection.text.unwrap();
-            let address = text.cell.unwrap();
-            assert_eq!(after.owner(address.row, address.col), (address.row, address.col));
-            assert!(text.focus <= after.cell(address.row, address.col).unwrap().text.len());
-            let cells = s.doc().unwrap().selection.cells.unwrap();
-            assert!(cells.range.r1 < after.nrows() && cells.range.c1 < after.ncols());
-            check(&s);
-            s.execute("edit.undo", &json!({})).unwrap();
-            assert!(std::sync::Arc::ptr_eq(&s.doc().unwrap().doc, &before_doc));
-            assert_eq!(s.doc().unwrap().selection, before_selection);
-            assert_eq!(s.doc().unwrap().history.undo.len(), undo_len);
-            s.execute("edit.redo", &json!({})).unwrap();
-            assert!(std::sync::Arc::ptr_eq(&s.doc().unwrap().doc, &after_doc));
-            assert_eq!(s.doc().unwrap().selection, after_selection);
-            let bytes = crate::cmd::file_bytes(&s.doc().unwrap().doc).unwrap();
-            let reopened = crate::cmd::file_from(&bytes).unwrap();
-            reopened.check().unwrap();
-            assert_eq!(reopened.story(doc::StoryId(sid)).unwrap().tables.get(&tid).unwrap().as_ref(), &after);
+            assert_split_case(horizontal, merged);
+        }
+    }
+}
+
+fn assert_split_case(horizontal: bool, merged: bool) {
+    let (mut s, sid, _) = session_with_frame();
+    let tid = s.execute("table.insert", &json!({"rows": 4, "cols": 4, "width": 240})).unwrap()["table"].as_u64().unwrap();
+    s.execute("table.setRowHeight", &json!({"table": tid, "height": 60, "mode": "exactly"})).unwrap();
+    s.execute("style.cell.create", &json!({"name": "Neighbor", "fill": "[Paper]", "insets": 3})).unwrap();
+    s.execute("style.cell.create", &json!({"name": "Chosen", "fill": "[Black]", "tint": 0.15, "insets": 2})).unwrap();
+    s.execute("style.cell.apply", &json!({"table": tid, "name": "Neighbor"})).unwrap();
+    for r in 0..4 {
+        for c in 0..4 {
+            s.execute("table.setCell", &json!({"row": r, "col": c, "text": format!("{r},{c}")})).unwrap();
+        }
+    }
+    let range = if !merged {
+        doc::CellRange::new(1, 1, 2, 2)
+    } else if horizontal {
+        doc::CellRange::new(0, 0, 2, 1)
+    } else {
+        doc::CellRange::new(0, 0, 1, 2)
+    };
+    let selection = json!({"rows": [range.r0, range.r1], "cols": [range.c0, range.c1]});
+    s.execute("table.select", &selection).unwrap();
+    s.execute("style.cell.apply", &json!({"name": "Chosen"})).unwrap();
+    if merged {
+        let merge = if horizontal { json!({"rows": [0, 2], "cols": [1, 1]}) } else { json!({"rows": [1, 1], "cols": [0, 2]}) };
+        s.execute("table.merge", &merge).unwrap();
+        s.execute("table.select", &selection).unwrap();
+    }
+    let before_doc = s.doc().unwrap().doc.clone();
+    let before_selection = s.doc().unwrap().selection.clone();
+    let before = table_for(&s, sid, tid).clone();
+    let before_layout = s.cache.get(&before_doc, doc::StoryId(sid), None);
+    let before_fragment = before_layout.frames.iter().flat_map(|f| &f.tables).find(|t| t.table == tid).unwrap();
+    let undo_len = s.doc().unwrap().history.undo.len();
+    let command = if horizontal { "table.splitHorizontally" } else { "table.splitVertically" };
+    s.execute(command, &json!({})).unwrap();
+    assert_eq!(s.doc().unwrap().history.undo.len(), undo_len + 1, "one split command creates one undo entry");
+    let after_doc = s.doc().unwrap().doc.clone();
+    let after_selection = s.doc().unwrap().selection.clone();
+    let after = table_for(&s, sid, tid).clone();
+    let after_layout = s.cache.get(&after_doc, doc::StoryId(sid), None);
+    let after_fragment = after_layout.frames.iter().flat_map(|f| &f.tables).find(|t| t.table == tid).unwrap();
+    assert_eq!(after_fragment.rect, before_fragment.rect, "splitting does not resize the table");
+    assert_eq!(after_fragment.cells.len(), before_fragment.cells.len() + 4, "four original owners split once");
+    assert_split_cells(&before, &after, before_fragment, after_fragment, range, horizontal);
+    let text = s.doc().unwrap().selection.text.unwrap();
+    let address = text.cell.unwrap();
+    assert_eq!(after.owner(address.row, address.col), (address.row, address.col));
+    assert!(text.focus <= after.cell(address.row, address.col).unwrap().text.len());
+    let cells = s.doc().unwrap().selection.cells.unwrap();
+    assert!(cells.range.r1 < after.nrows() && cells.range.c1 < after.ncols());
+    check(&s);
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert!(std::sync::Arc::ptr_eq(&s.doc().unwrap().doc, &before_doc));
+    assert_eq!(s.doc().unwrap().selection, before_selection);
+    assert_eq!(s.doc().unwrap().history.undo.len(), undo_len);
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert!(std::sync::Arc::ptr_eq(&s.doc().unwrap().doc, &after_doc));
+    assert_eq!(s.doc().unwrap().selection, after_selection);
+    let bytes = crate::cmd::file_bytes(&s.doc().unwrap().doc).unwrap();
+    let reopened = crate::cmd::file_from(&bytes).unwrap();
+    reopened.check().unwrap();
+    assert_eq!(reopened.story(doc::StoryId(sid)).unwrap().tables.get(&tid).unwrap().as_ref(), &after);
+}
+
+fn assert_split_cells(
+    before: &designcraft_doc::Table,
+    after: &designcraft_doc::Table,
+    before_fragment: &designcraft_compose::TableFrag,
+    after_fragment: &designcraft_compose::TableFrag,
+    range: doc::CellRange,
+    horizontal: bool,
+) {
+    for placed in &before_fragment.cells {
+        let original = before.cell(placed.row, placed.col).unwrap();
+        let matches: Vec<_> = after_fragment.cells.iter().filter(|c| c.source == placed.source).collect();
+        assert_eq!(matches.len(), 1, "original cell text survives once: {}", placed.source);
+        let surviving = matches[0];
+        let cell = after.cell(surviving.row, surviving.col).unwrap();
+        let mut normalized = cell.clone();
+        normalized.row_span = original.row_span;
+        normalized.col_span = original.col_span;
+        assert_eq!(&normalized, original, "existing cell text and formatting are preserved");
+        if !range.contains(placed.row, placed.col) {
+            assert_eq!(surviving.rect, placed.rect, "unselected neighbor geometry is unchanged");
+            continue;
+        }
+        let second_addr = if horizontal {
+            (surviving.row + cell.row_span as usize, surviving.col)
+        } else {
+            (surviving.row, surviving.col + cell.col_span as usize)
+        };
+        let second = after.cell(second_addr.0, second_addr.1).unwrap();
+        assert_eq!(after.owner(second_addr.0, second_addr.1), second_addr);
+        assert!(second.text.is_empty());
+        assert_eq!(second.style, original.style);
+        assert_eq!(second.insets, original.insets);
+        assert_eq!(second.fill, original.fill);
+        assert_eq!(second.fill_tint, original.fill_tint);
+        let second_rect = after_fragment.cell(second_addr.0, second_addr.1).unwrap().rect;
+        assert_eq!(surviving.rect.union(second_rect), placed.rect, "the halves exactly cover the original cell");
+        if horizontal {
+            assert_eq!(surviving.rect.y1, second_rect.y0);
+        } else {
+            assert_eq!(surviving.rect.x1, second_rect.x0);
         }
     }
 }
diff --git a/crates/engine/src/tooling.rs b/crates/engine/src/tooling.rs
index 65d069bac..c982cade7 100644
--- a/crates/engine/src/tooling.rs
+++ b/crates/engine/src/tooling.rs
@@ -1,12 +1,14 @@
 //! Tool hosting: the active tool receives pointer/key events and its actions are executed here.
 
+use std::ops::Range;
 use std::sync::Arc;
 
+use designcraft_doc::{CellAddr, StoryId};
 use designcraft_geom::Unit;
 pub use designcraft_tools::SnapView;
 use designcraft_tools::{Action, CanvasLayout, Cursor, Mods, Overlay, PointerEvent, PointerKind, ToolContext, ToolKey};
 use serde::Serialize;
-use serde_json::Value;
+use serde_json::{Value, json};
 
 use crate::{EngineError, HistoryEntry, Interaction, Result, Session, record_undo};
 
@@ -346,3 +348,307 @@ impl Session {
         }
     }
 }
+
+/// The committed text around the Type tool's IME caret.
+///
+/// While an IME composition is active the marked text is only an interaction preview, so this
+/// borrows the interaction's committed snapshot and selection instead of the previewed document.
+/// `anchor` and `focus` are UTF-8 byte offsets into `text`; `focus` is the primary caret end.
+#[derive(Clone, Copy, Debug)]
+pub struct ImeTextContext<'a> {
+    /// Stable document identity (a new document gets a new value).
+    pub document_uid: u64,
+    /// Document-state identity: changes when the state is recreated even if `document_uid` is
+    /// preserved (File › Revert).
+    pub document_epoch: u64,
+    /// Story being edited, or the story that owns the edited table cell.
+    pub story: StoryId,
+    /// Edited table cell, when the caret is in one.
+    pub cell: Option<CellAddr>,
+    /// Committed logical story text, without the current IME pre-edit.
+    pub text: &'a str,
+    /// Selection anchor (the end that stays put under Shift-arrow selection).
+    pub anchor: usize,
+    /// Primary selection end (the caret).
+    pub focus: usize,
+}
+
+/// What an accepted IME mutation applied to the committed story text.
+///
+/// The engine reports this from the whole story, not from the bounded outgoing IME window, so a
+/// successful mutation can be described exactly even when the deleted text lies outside that
+/// window. `deleted_before` and `deleted_after` are byte ranges of the text before the mutation;
+/// `inserted` is the text the mutation typed at the selection. Invalid or unreportable mutations
+/// return `None` rather than a guessed description.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ImeMutation {
+    /// Stable document identity of the mutation.
+    pub document_uid: u64,
+    /// Document-state identity (see [`ImeTextContext::document_epoch`]).
+    pub document_epoch: u64,
+    /// Story (or the story owning the edited cell) that changed.
+    pub story: StoryId,
+    /// Edited table cell, when the caret was in one.
+    pub cell: Option<CellAddr>,
+    /// Committed selection before and after the mutation (UTF-8 byte offsets).
+    pub anchor_before: usize,
+    pub focus_before: usize,
+    pub anchor_after: usize,
+    pub focus_after: usize,
+    /// Committed story text length before and after the mutation.
+    pub text_len_before: usize,
+    pub text_len_after: usize,
+    /// Text removed before and after the selection (empty when nothing was removed).
+    pub deleted_before: Range<usize>,
+    pub deleted_after: Range<usize>,
+    /// Text typed at the selection, after the commit normalization.
+    pub inserted: String,
+}
+
+/// The identity, committed selection and text length at the IME caret.
+#[derive(Clone, Copy, Debug)]
+struct ImeState {
+    document_uid: u64,
+    document_epoch: u64,
+    story: StoryId,
+    cell: Option<CellAddr>,
+    anchor: usize,
+    focus: usize,
+    text_len: usize,
+}
+
+/// The ranges a successful `text.deleteSurrounding` reports it removed.
+fn ime_ranges_from_command(r: &Value) -> Option<(Range<usize>, Range<usize>)> {
+    let range = |key: &str| {
+        let arr = r.get(key)?.as_array()?;
+        let start = usize::try_from(arr.first()?.as_u64()?).ok()?;
+        let end = usize::try_from(arr.get(1)?.as_u64()?).ok()?;
+        (start <= end).then_some(start..end)
+    };
+    Some((range("deletedBefore")?, range("deletedAfter")?))
+}
+
+/// The byte ranges an IME delete-surrounding request removes around a selection.
+///
+/// The returned pair is `(before_selection, after_selection)`. Counts exclude the selection
+/// itself and the current pre-edit. Character counts are Unicode scalar values. Byte counts
+/// round inward: a count that ends inside a character leaves that whole character. Invalid or
+/// non-boundary selection offsets return `None` rather than guessed ranges.
+pub fn ime_delete_ranges(text: &str, anchor: usize, focus: usize, before: usize, after: usize, bytes: bool) -> Option<(Range<usize>, Range<usize>)> {
+    let (min, max) = ime_selection_bounds(text, anchor, focus)?;
+    Some(if bytes { ime_byte_delete_ranges(text, min, max, before, after) } else { ime_character_delete_ranges(text, min, max, before, after) })
+}
+
+/// Validate the committed selection and return its lower and upper UTF-8 byte offsets.
+fn ime_selection_bounds(text: &str, anchor: usize, focus: usize) -> Option<(usize, usize)> {
+    if anchor > text.len() || focus > text.len() || !text.is_char_boundary(anchor) || !text.is_char_boundary(focus) {
+        return None;
+    }
+    Some((anchor.min(focus), anchor.max(focus)))
+}
+
+/// Byte-counted ranges around the selection, rounded inward to character boundaries.
+fn ime_byte_delete_ranges(text: &str, min: usize, max: usize, before: usize, after: usize) -> (Range<usize>, Range<usize>) {
+    // Start at the requested byte offset and step at most three bytes to the next character
+    // boundary: the scan is bounded by the count, not by the caret's offset in the story.
+    let from = min.saturating_sub(before).min(min);
+    let mut before_start = from;
+    while before_start < min && !text.is_char_boundary(before_start) {
+        before_start += 1;
+    }
+    let target = max.saturating_add(after).min(text.len());
+    let mut after_end = max;
+    for (i, c) in text[max..].char_indices() {
+        let end = max + i + c.len_utf8();
+        if end <= target {
+            after_end = end;
+        } else {
+            break;
+        }
+    }
+    (before_start..min, max..after_end)
+}
+
+/// Character-counted ranges around the selection, using Unicode scalar values.
+fn ime_character_delete_ranges(text: &str, min: usize, max: usize, before: usize, after: usize) -> (Range<usize>, Range<usize>) {
+    let before_start = if before == 0 {
+        min
+    } else {
+        let mut seen = 0usize;
+        let mut start = 0usize;
+        for (i, _) in text[..min].char_indices().rev() {
+            seen += 1;
+            start = i;
+            if seen == before {
+                break;
+            }
+        }
+        if seen < before { 0 } else { start }
+    };
+    let mut after_end = max;
+    if after > 0 {
+        let mut seen = 0usize;
+        for (i, c) in text[max..].char_indices() {
+            seen += 1;
+            after_end = max + i + c.len_utf8();
+            if seen == after {
+                break;
+            }
+        }
+    }
+    (before_start..min, max..after_end)
+}
+
+impl Session {
+    /// The committed text and selection at the Type tool's IME caret.
+    ///
+    /// Returns `None` without an insertion point, without a committed story, or while a
+    /// composition has no interaction snapshot to describe its committed text. The query never
+    /// copies the story.
+    pub fn ime_text_context(&self) -> Option<ImeTextContext<'_>> {
+        let st = self.active()?;
+        let (doc, ts) = if self.tool.composing() {
+            let it = st.interaction.as_ref()?;
+            (it.doc.as_ref(), it.selection.text?)
+        } else {
+            (st.doc.as_ref(), st.selection.text?)
+        };
+        let story = doc.text_story(ts.story, ts.cell)?;
+        if ts.anchor > story.text.len()
+            || ts.focus > story.text.len()
+            || !story.text.is_char_boundary(ts.anchor)
+            || !story.text.is_char_boundary(ts.focus)
+        {
+            // A stale or corrupt insertion point: report unavailable rather than inventing offsets.
+            return None;
+        }
+        Some(ImeTextContext {
+            document_uid: st.uid,
+            document_epoch: st.identity_epoch,
+            story: ts.story,
+            cell: ts.cell,
+            text: &story.text,
+            anchor: ts.anchor,
+            focus: ts.focus,
+        })
+    }
+
+    /// Delete the text an IME asked to remove around the selection, as one undo step.
+    ///
+    /// The mutation goes through the `text.deleteSurrounding` command, so it restores a Data Merge
+    /// preview, records undo, auto-sizes, journals and is panic-guarded like any other edit.
+    /// The selection itself and any current pre-edit are excluded. Character counts are scalar
+    /// values; byte counts round inward to whole characters. A selection keeps its direction and
+    /// is remapped past the deleted text.
+    pub fn ime_delete_surrounding(&mut self, before: usize, after: usize, bytes: bool) -> Result<Option<ImeMutation>> {
+        if !self.ime_deletion_changes_text(before, after, bytes)? {
+            return Ok(None);
+        }
+        let Some(pre) = self.ime_state() else { return Ok(None) };
+        self.end_preedit_without_typing()?;
+        let r = self.execute("text.deleteSurrounding", &json!({"before": before, "after": after, "bytes": bytes}))?;
+        Ok(self.ime_mutation_from_command(pre, &r, String::new()))
+    }
+
+    /// The IME committed `text`: one `text.insert`, reported as the mutation it applied.
+    pub fn ime_commit(&mut self, text: &str, view: ViewInfo) -> Result<Option<ImeMutation>> {
+        let Some(pre) = self.ime_state() else { return self.tool_ime_commit(text, view).map(|()| None) };
+        self.tool_ime_commit(text, view)?;
+        let inserted = designcraft_tools::ime_commit_text(text);
+        // A commit replaces the selection: the removed ranges are empty at its two ends.
+        let (start, end) = (pre.anchor.min(pre.focus), pre.anchor.max(pre.focus));
+        Ok(self.ime_mutation_from_states(pre, start..start, end..end, inserted))
+    }
+
+    /// Delete surrounding text and insert the IME commit in one undo step.
+    ///
+    /// This is the normal delete-surrounding-then-commit batch: both mutations are one
+    /// `text.deleteSurrounding` command, so one Undo restores the state before the batch.
+    pub fn ime_commit_after_delete(&mut self, text: &str, view: ViewInfo, before: usize, after: usize, bytes: bool) -> Result<Option<ImeMutation>> {
+        if !self.ime_deletion_changes_text(before, after, bytes)? {
+            return self.ime_commit(text, view);
+        }
+        let Some(pre) = self.ime_state() else { return Ok(None) };
+        self.end_preedit_without_typing()?;
+        let inserted = designcraft_tools::ime_commit_text(text);
+        let r = self.execute("text.deleteSurrounding", &json!({"before": before, "after": after, "bytes": bytes, "commit": inserted.clone()}))?;
+        Ok(self.ime_mutation_from_command(pre, &r, inserted))
+    }
+
+    /// The identity, committed selection and text length of the IME caret's story.
+    fn ime_state(&self) -> Option<ImeState> {
+        let context = self.ime_text_context()?;
+        Some(ImeState {
+            document_uid: context.document_uid,
+            document_epoch: context.document_epoch,
+            story: context.story,
+            cell: context.cell,
+            anchor: context.anchor,
+            focus: context.focus,
+            text_len: context.text.len(),
+        })
+    }
+
+    /// Report the mutation the delete command applied, from its ranges and the states around it.
+    fn ime_mutation_from_command(&self, before: ImeState, r: &Value, inserted: String) -> Option<ImeMutation> {
+        let (deleted_before, deleted_after) = ime_ranges_from_command(r)?;
+        self.ime_mutation_from_states(before, deleted_before, deleted_after, inserted)
+    }
+
+    /// Return a mutation only when the document uid/epoch, story and cell still match; otherwise report no mutation.
+    fn ime_mutation_from_states(
+        &self,
+        before: ImeState,
+        deleted_before: Range<usize>,
+        deleted_after: Range<usize>,
+        inserted: String,
+    ) -> Option<ImeMutation> {
+        let after = self.ime_state()?;
+        // The mutation must have stayed in the story it began in.
+        if after.document_uid != before.document_uid
+            || after.document_epoch != before.document_epoch
+            || after.story != before.story
+            || after.cell != before.cell
+        {
+            return None;
+        }
+        Some(ImeMutation {
+            document_uid: before.document_uid,
+            document_epoch: before.document_epoch,
+            story: before.story,
+            cell: before.cell,
+            anchor_before: before.anchor,
+            focus_before: before.focus,
+            anchor_after: after.anchor,
+            focus_after: after.focus,
+            text_len_before: before.text_len,
+            text_len_after: after.text_len,
+            deleted_before,
+            deleted_after,
+            inserted,
+        })
+    }
+
+    /// Clear an active pre-edit without inserting text; if no interaction snapshot exists, reset the tool.
+    fn end_preedit_without_typing(&mut self) -> Result<()> {
+        if !self.tool.composing() {
+            return Ok(());
+        }
+        match self.with_ctx(ViewInfo::default(), |s, cx| s.tool.ime_preedit(cx, "", None)) {
+            Some(actions) => self.run_actions(actions),
+            None => {
+                self.tool = designcraft_tools::create(self.tool.id());
+                Ok(())
+            }
+        }
+    }
+
+    /// Report false for no IME context or no-op ranges, and error when the selection is not on character boundaries.
+    fn ime_deletion_changes_text(&self, before: usize, after: usize, bytes: bool) -> Result<bool> {
+        let Some(context) = self.ime_text_context() else { return Ok(false) };
+        let Some((before_range, after_range)) = ime_delete_ranges(context.text, context.anchor, context.focus, before, after, bytes) else {
+            return Err(EngineError::Other("the IME text selection is not on character boundaries".into()));
+        };
+        Ok(!before_range.is_empty() || !after_range.is_empty())
+    }
+}
diff --git a/crates/engine/tests/graphic_layer_options.rs b/crates/engine/tests/graphic_layer_options.rs
new file mode 100644
index 000000000..44ddb8994
--- /dev/null
+++ b/crates/engine/tests/graphic_layer_options.rs
@@ -0,0 +1,128 @@
+//! Per-placement artwork layer metadata must survive native saves and stay visibly unsupported.
+use std::io::{Cursor, Read, Write};
+
+use designcraft_doc::{Content, GRAPHIC_LAYER_RENDERING_WARNING};
+use designcraft_engine::{DocState, Session};
+use serde_json::json;
+
+fn fixture() -> Vec<u8> {
+    let xml = r#"<Document><Layer Self="L" Name="Synthetic"/><Spread Self="sp"><Page Self="p" GeometricBounds="0 0 100 100"/>
+      <Rectangle Self="r" ItemLayer="L" ContentType="GraphicType"><Properties><PathGeometry><GeometryPathType PathOpen="false"><PathPointArray>
+      <PathPointType Anchor="0 0"/><PathPointType Anchor="0 20"/><PathPointType Anchor="20 20"/><PathPointType Anchor="20 0"/>
+      </PathPointArray></GeometryPathType></PathGeometry></Properties><Image Self="im">
+      <Properties><GraphicBounds Left="0" Top="0" Right="20" Bottom="20"/></Properties>
+      <Link Self="lk" LinkResourceURI="file:/definitely-missing/synthetic.psd"/>
+      <GraphicLayerOption UpdateLinkOption="KeepOverrides">
+        <GraphicLayer Self="g0" Id="0" Name="Group"><GraphicLayer Self="g1" Id="1" Name="Hidden" OriginalVisibility="true" CurrentVisibility="false"/></GraphicLayer>
+        <GraphicLayer Self="g2" Id="2" Name="Shown" OriginalVisibility="false" CurrentVisibility="true"/>
+      </GraphicLayerOption></Image></Rectangle></Spread></Document>"#;
+    let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
+    z.start_file("designmap.xml", zip::write::SimpleFileOptions::default()).unwrap();
+    z.write_all(xml.as_bytes()).unwrap();
+    z.finish().unwrap().into_inner()
+}
+
+#[test]
+fn graphic_layer_options_survive_native_reopen_and_report_unsupported_output() {
+    let imported = designcraft_idml::import_idml_report(&fixture(), &|_| None).unwrap();
+    assert!(imported.warnings.iter().any(|w| w.contains(GRAPHIC_LAYER_RENDERING_WARNING)));
+    let doc = imported.document;
+    let options = |d: &designcraft_doc::Document| {
+        d.spreads[0]
+            .items
+            .iter()
+            .filter_map(|i| match &i.content {
+                Content::Graphic(g) => g.layer_options.clone(),
+                _ => None,
+            })
+            .collect::<Vec<_>>()
+    };
+    let expected = options(&doc);
+    let saved = designcraft_format::save(&doc).unwrap();
+    let mut z = zip::ZipArchive::new(Cursor::new(&saved)).unwrap();
+    let mut meta = String::new();
+    z.by_name("meta.json").unwrap().read_to_string(&mut meta).unwrap();
+    assert_eq!(serde_json::from_str::<serde_json::Value>(&meta).unwrap()["version"], 4, "old readers must not silently drop the settings");
+    let reopened = designcraft_format::load(&saved).unwrap();
+    assert_eq!(options(&reopened), expected);
+    let mut s = Session::new();
+    s.add_document(DocState::new(reopened, None));
+    let preflight = s.execute("preflight.run", &json!({})).unwrap();
+    assert!(preflight["issues"].as_array().unwrap().iter().any(|i| i["kind"] == "unsupportedGraphicLayers"));
+    let pdf = s.execute("file.exportPdf", &json!({})).unwrap();
+    assert!(pdf["warnings"].as_array().unwrap().iter().any(|w| w == GRAPHIC_LAYER_RENDERING_WARNING));
+}
+
+#[test]
+fn graphic_layer_options_in_cells_require_the_new_native_reader() {
+    let mut doc = designcraft_idml::import_idml(&fixture()).unwrap();
+    let graphic = doc.spreads[0]
+        .items
+        .iter()
+        .find_map(|i| match &i.content {
+            Content::Graphic(g) => Some(g.clone()),
+            _ => None,
+        })
+        .unwrap();
+    // Keep the original spread graphic too: its warning must not hide the cell warning.
+    let layer = doc.default_layer();
+    let (_, story) = doc
+        .add_text_frame(designcraft_doc::SpreadRef::Doc(0), designcraft_geom::Rect::new(0.0, 0.0, 80.0, 80.0), layer, "Body", Default::default())
+        .unwrap();
+    let mut table = designcraft_doc::Table::new(1, 1, 1, 0, 0, 20.0);
+    table.cells[0].graphic = Some(graphic);
+    doc.story_mut(story).unwrap().insert_table(0, table);
+    assert!(doc.has_graphic_layer_options());
+    let reopened = designcraft_format::load(&designcraft_format::save(&doc).unwrap()).unwrap();
+    assert!(reopened.has_graphic_layer_visibility_overrides());
+    let mut s = Session::new();
+    s.add_document(DocState::new(reopened, None));
+    let preflight = s.execute("preflight.run", &json!({})).unwrap();
+    let warnings: Vec<_> = preflight["issues"].as_array().unwrap().iter().filter(|i| i["kind"] == "unsupportedGraphicLayers").collect();
+    assert!(warnings.iter().any(|i| i["item"].is_null()), "the cell needs an independent document-level warning");
+    assert!(warnings.iter().any(|i| !i["item"].is_null()), "the spread retains its item warning");
+}
+
+#[test]
+fn a_graphic_layer_cell_alone_still_requires_the_new_native_reader() {
+    // The cell is the only thing carrying the settings: a save that only looked at spread items
+    // would choose format 3 and drop them.
+    let mut doc = designcraft_idml::import_idml(&fixture()).unwrap();
+    let graphic = doc.spreads[0]
+        .items
+        .iter()
+        .find_map(|i| match &i.content {
+            Content::Graphic(g) => Some(g.clone()),
+            _ => None,
+        })
+        .unwrap();
+    let layer = doc.default_layer();
+    let (_, story) = doc
+        .add_text_frame(designcraft_doc::SpreadRef::Doc(0), designcraft_geom::Rect::new(0.0, 0.0, 80.0, 80.0), layer, "Body", Default::default())
+        .unwrap();
+    // Only the cell keeps them: the spread's own placed graphic goes away.
+    std::sync::Arc::make_mut(&mut doc.spreads[0]).items.retain(|i| i.graphic().is_none());
+    let mut table = designcraft_doc::Table::new(1, 1, 1, 0, 0, 20.0);
+    table.cells[0].graphic = Some(graphic);
+    doc.story_mut(story).unwrap().insert_table(0, table);
+    assert!(doc.has_graphic_layer_options(), "the cell alone carries the settings");
+    let saved = designcraft_format::save(&doc).unwrap();
+    let mut z = zip::ZipArchive::new(Cursor::new(&saved)).unwrap();
+    let mut meta = String::new();
+    z.by_name("meta.json").unwrap().read_to_string(&mut meta).unwrap();
+    assert_eq!(serde_json::from_str::<serde_json::Value>(&meta).unwrap()["version"], 4, "a cell-only save needs the newer reader");
+    assert!(designcraft_format::load(&saved).unwrap().has_graphic_layer_visibility_overrides());
+}
+
+#[test]
+fn pdf_layer_warning_survives_soft_effects_and_flattening() {
+    for flatten in [false, true] {
+        let doc = designcraft_idml::import_idml(&fixture()).unwrap();
+        let id = doc.spreads[0].items.iter().find(|i| i.graphic().is_some()).unwrap().id.0;
+        let mut session = Session::new();
+        session.add_document(DocState::new(doc, None));
+        session.execute("object.feather", &json!({"ids":[id], "width":2})).unwrap();
+        let out = session.execute("file.exportPdf", &json!({"flatten":flatten})).unwrap();
+        assert!(out["warnings"].as_array().unwrap().iter().any(|w| w == GRAPHIC_LAYER_RENDERING_WARNING), "{out}");
+    }
+}
diff --git a/crates/engine/tests/it/pdf_backend.rs b/crates/engine/tests/it/pdf_backend.rs
index 5344dc6f7..e68cbae81 100644
--- a/crates/engine/tests/it/pdf_backend.rs
+++ b/crates/engine/tests/it/pdf_backend.rs
@@ -118,11 +118,7 @@ fn exported(hidden: bool) -> Vec<u8> {
         session.execute("object.layerOptions", &json!({"ids": [placed["id"]], "hidden": ["Red"]})).unwrap();
     }
     let report = session.execute("file.exportPdf", &json!({"compress": false})).unwrap();
-    let bytes = base64_decode(report["base64"].as_str().unwrap());
-    if hidden {
-        assert!(report["warnings"].to_string().contains("hidden layers"));
-    }
-    bytes
+    base64_decode(report["base64"].as_str().unwrap())
 }
 
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@@ -185,7 +181,8 @@ fn oversized_image_does_not_silently_disappear_from_layered_export() {
         .unwrap();
     session.execute("object.layerOptions", &json!({"ids": [placed["id"]], "hidden": ["Blue"]})).unwrap();
     let before = session.execute("file.serialize", &json!({})).unwrap();
-    let result = session.execute("file.exportPdf", &json!({}));
+    // PDF/A-2b has no optional content: placed PDFs with hidden layers go out as images there.
+    let result = session.execute("file.exportPdf", &json!({"standard": "pdfa2b"}));
     assert!(result.is_err(), "export must report the image omitted by the backend's resource limit");
     assert_eq!(session.execute("file.serialize", &json!({})).unwrap(), before, "a failed export must leave the document unchanged");
     let error = result.unwrap_err().to_string();
@@ -317,7 +314,8 @@ fn failed_content_decode_aborts_layered_export_without_changing_the_document() {
             .unwrap();
         session.execute("object.layerOptions", &json!({"ids": [placed["id"]], "hidden": ["Blue"]})).unwrap();
         let before = session.execute("file.serialize", &json!({})).unwrap();
-        let error = session.execute("file.exportPdf", &json!({})).unwrap_err().to_string();
+        // PDF/A-2b has no optional content: placed PDFs with hidden layers go out as images there.
+        let error = session.execute("file.exportPdf", &json!({"standard": "pdfa2b"})).unwrap_err().to_string();
         assert!(error.contains("broken-content.pdf") && error.contains("content"), "{filter}: {error}");
         assert_eq!(session.execute("file.serialize", &json!({})).unwrap(), before, "{filter}");
     }
diff --git a/crates/engine/tests/it/text_decorations.rs b/crates/engine/tests/it/text_decorations.rs
index c49c1d2cb..205bc97fb 100644
--- a/crates/engine/tests/it/text_decorations.rs
+++ b/crates/engine/tests/it/text_decorations.rs
@@ -50,8 +50,8 @@ fn raster(d: &Document, threads: u16) -> Rendered {
     renderer.threads = threads;
     let placed = [Placed { spread: SpreadRef::Doc(0), xf: Affine::IDENTITY }];
     let options = RenderOptions { paper: false, background: Some([255; 4]), greek_below_px: 0.0, ..Default::default() };
-    let first = renderer.render(d, &cache, &placed, 480, 480, Affine::scale(2.0), &options);
-    let cached = renderer.render(d, &cache, &placed, 480, 480, Affine::scale(2.0), &options);
+    let first = renderer.render(d, &cache, &placed, (480, 480), Affine::scale(2.0), &options);
+    let cached = renderer.render(d, &cache, &placed, (480, 480), Affine::scale(2.0), &options);
     assert_eq!(first.pixels, cached.pixels, "decoration cache hits must retain paint order");
     first
 }
@@ -185,7 +185,7 @@ fn an_underline_has_no_seams_between_letters() {
     let options = RenderOptions { paper: false, background: Some([255; 4]), greek_below_px: 0.0, ..Default::default() };
     // A fractional scale puts the letters' edges between pixels.
     let (w, h) = (543u32, 163u32);
-    let img = renderer.render(&d, &Cache::new(), &placed, w, h, Affine::scale(1.3579), &options);
+    let img = renderer.render(&d, &Cache::new(), &placed, (w, h), Affine::scale(1.3579), &options);
     let px = |x: u32, y: u32| {
         let i = ((y * w + x) * 4) as usize;
         [img.pixels[i], img.pixels[i + 1], img.pixels[i + 2], img.pixels[i + 3]]
diff --git a/crates/engine/tests/pdf_optional_content.rs b/crates/engine/tests/pdf_optional_content.rs
new file mode 100644
index 000000000..e96e34915
--- /dev/null
+++ b/crates/engine/tests/pdf_optional_content.rs
@@ -0,0 +1,238 @@
+#[path = "support/optional_content.rs"]
+mod support;
+
+#[path = "support/optional_content_fallback.rs"]
+mod fallback;
+
+#[path = "support/optional_content_xref.rs"]
+mod xref;
+
+use designcraft_compose::Cache;
+use designcraft_pdf::{PdfOptions, Standard, export_pdf, export_pdf_with_report};
+use support::{catalog, document, fixture, painted};
+
+const DEFAULT: &str = "/BaseState/ON/OFF[6 3 R]";
+const USAGE_APPLICATIONS: &str = "/BaseState/ON/ON[5 0 R]/OFF[6 3 R]/AS[<</Event/View/Category[/View]/OCGs[5 0 R 6 3 R]>><</Event/Print/Category[/Print]/OCGs[5 0 R 6 3 R]>><</Event/Export/Category[/Export]/OCGs[5 0 R 6 3 R]>>]";
+
+#[test]
+fn source_layer_dictionaries_are_readable() {
+    let pdf = hayro_syntax::Pdf::new(fixture(DEFAULT, "Hidden")).unwrap();
+    for id in [(5, 0), (6, 3)] {
+        assert!(pdf.xref().get::<hayro_syntax::object::Dict<'_>>(hayro_syntax::object::ObjectIdentifier::new(id.0, id.1)).is_some(), "{id:?}");
+    }
+}
+
+fn exported(config: &str, standard: Standard) -> Vec<u8> {
+    let doc = document(fixture(config, "Hidden"), &[&[]]);
+    let report = export_pdf_with_report(&doc, &Cache::new(), &PdfOptions { standard, created: Some(0), ..Default::default() }).unwrap();
+    assert!(report.warnings.is_empty(), "{:?}", report.warnings);
+    report.bytes
+}
+
+#[test]
+fn source_default_off_renders_before_export() {
+    let bytes = fixture(DEFAULT, "Hidden");
+
+    painted(&bytes, &[true, false]);
+}
+
+#[test]
+fn plain_export_registers_default_off_layers() {
+    let bytes = exported(DEFAULT, Standard::None);
+
+    assert_eq!(catalog(&bytes), [("Hidden".into(), true), ("Shown".into(), false)]);
+}
+
+#[test]
+fn pdfx_export_preserves_default_off_catalog() {
+    let bytes = exported(DEFAULT, Standard::PdfX4);
+
+    assert_eq!(catalog(&bytes), [("Hidden".into(), true), ("Shown".into(), false)]);
+    assert!(designcraft_pdf::check_pdfx4(&bytes).is_empty());
+}
+
+#[test]
+fn plain_export_paints_only_the_shown_layer() {
+    let bytes = exported(DEFAULT, Standard::None);
+
+    painted(&bytes, &[true, false]);
+}
+
+#[test]
+fn pdfx_export_paints_only_the_shown_layer() {
+    let bytes = exported(DEFAULT, Standard::PdfX4);
+
+    painted(&bytes, &[true, false]);
+}
+
+#[test]
+fn plain_export_preserves_defaults_with_usage_applications() {
+    let bytes = exported(USAGE_APPLICATIONS, Standard::None);
+
+    assert_eq!(catalog(&bytes), [("Hidden".into(), true), ("Shown".into(), false)]);
+    assert_vector(&bytes);
+    painted(&bytes, &[true, false]);
+}
+
+#[test]
+fn pdfx_export_preserves_defaults_with_usage_applications() {
+    let bytes = exported(USAGE_APPLICATIONS, Standard::PdfX4);
+
+    assert_eq!(catalog(&bytes), [("Hidden".into(), true), ("Shown".into(), false)]);
+    assert!(designcraft_pdf::check_pdfx4(&bytes).is_empty());
+    assert_vector(&bytes);
+    painted(&bytes, &[true, false]);
+}
+
+#[test]
+fn plain_export_draws_groups_without_catalog_properties() {
+    let doc = document(support::orphaned_fixture(), &[&[]]);
+
+    let bytes = export_pdf(&doc, &Cache::new(), &PdfOptions::default()).unwrap();
+
+    assert_eq!(catalog(&bytes), [("Hidden".into(), false), ("Shown".into(), false)]);
+    assert_vector(&bytes);
+    painted(&bytes, &[true, true]);
+}
+
+#[test]
+fn pdfx_export_draws_groups_without_catalog_properties() {
+    let doc = document(support::orphaned_fixture(), &[&[]]);
+
+    let bytes = export_pdf(&doc, &Cache::new(), &PdfOptions { standard: Standard::PdfX4, ..Default::default() }).unwrap();
+
+    assert_eq!(catalog(&bytes), [("Hidden".into(), false), ("Shown".into(), false)]);
+    assert!(designcraft_pdf::check_pdfx4(&bytes).is_empty());
+    assert_vector(&bytes);
+    painted(&bytes, &[true, true]);
+}
+
+#[test]
+fn base_off_with_on_exception_is_preserved() {
+    let bytes = exported("/BaseState/OFF/ON[5 0 R]", Standard::None);
+
+    assert_eq!(catalog(&bytes), [("Hidden".into(), true), ("Shown".into(), false)]);
+    painted(&bytes, &[true, false]);
+}
+
+#[test]
+fn same_asset_placements_keep_opposing_layer_states() {
+    let doc = document(fixture(DEFAULT, "Hidden"), &[&[], &["Shown"]]);
+
+    let bytes = export_pdf(&doc, &Cache::new(), &PdfOptions::default()).unwrap();
+
+    assert_eq!(catalog(&bytes), [("Hidden".into(), false), ("Hidden".into(), true), ("Shown".into(), false), ("Shown".into(), true)]);
+    painted(&bytes, &[true, false, false, true]);
+}
+
+#[test]
+fn duplicate_names_with_distinct_generations_keep_default_states() {
+    let doc = document(fixture(DEFAULT, "Shown"), &[&[]]);
+
+    let bytes = export_pdf(&doc, &Cache::new(), &PdfOptions::default()).unwrap();
+
+    assert_eq!(catalog(&bytes), [("Shown".into(), false), ("Shown".into(), true)]);
+    painted(&bytes, &[true, false]);
+}
+
+#[test]
+fn unresolved_default_off_reference_fails_export() {
+    let doc = document(fixture("/OFF[99 0 R]", "Hidden"), &[&[]]);
+
+    let result = export_pdf(&doc, &Cache::new(), &PdfOptions::default());
+
+    assert!(result.is_err(), "an unreadable layer state must not print hidden artwork");
+}
+
+#[test]
+fn unlayered_pdf_stays_vector_without_optional_content() {
+    let doc = document(support::unlayered_fixture(), &[&[]]);
+
+    let bytes = export_pdf(&doc, &Cache::new(), &PdfOptions::default()).unwrap();
+
+    let pdf = hayro_syntax::Pdf::new(bytes.clone()).unwrap();
+    let root = pdf.xref().get::<hayro_syntax::object::Dict<'_>>(pdf.xref().root_id()).unwrap();
+    assert!(!root.contains_key(b"OCProperties"));
+    assert_vector(&bytes);
+    painted(&bytes, &[true, false]);
+}
+
+fn assert_vector(bytes: &[u8]) {
+    use hayro_syntax::object::{Name, Object};
+    let pdf = hayro_syntax::Pdf::new(bytes.to_vec()).unwrap();
+    for object in pdf.objects() {
+        if let Object::Stream(stream) = object {
+            assert_ne!(stream.dict().get::<Name<'_>>(b"Subtype").as_ref().map(AsRef::as_ref), Some(b"Image".as_slice()));
+        }
+    }
+}
+
+#[test]
+fn layer_options_command_preserves_vector_overrides_in_plain_and_pdfx() {
+    use designcraft_engine::{
+        Session,
+        cmd::{base64_decode, base64_encode},
+    };
+    use serde_json::json;
+    for standard in ["none", "x4"] {
+        let mut session = Session::new();
+        session.execute("file.new", &json!({"width": 100, "height": 100, "pages": 1, "facingPages": false, "margins": 0})).unwrap();
+        session
+            .execute("file.place", &json!({"base64": base64_encode(&fixture(DEFAULT, "Hidden")), "name": "layers.pdf", "x": 0, "y": 0, "width": 100}))
+            .unwrap();
+        session.execute("object.layerOptions", &json!({"hidden": ["Shown"]})).unwrap();
+
+        let result = session.execute("file.exportPdf", &json!({"standard": standard})).unwrap();
+
+        let bytes = base64_decode(result["base64"].as_str().unwrap());
+        assert_eq!(catalog(&bytes), [("Hidden".into(), false), ("Shown".into(), true)]);
+        assert_vector(&bytes);
+        painted(&bytes, &[false, true]);
+    }
+}
+
+#[test]
+fn exported_optional_content_survives_replacement_and_book_merge() {
+    let first = exported(DEFAULT, Standard::None);
+    let doc = document(first.clone(), &[&[]]);
+
+    let replaced = export_pdf(&doc, &Cache::new(), &PdfOptions::default()).unwrap();
+    let merged = designcraft_pdf::merge_pdfs(&[(first, vec![(100.0, 100.0)])], None).unwrap();
+
+    for bytes in [replaced, merged] {
+        assert_eq!(catalog(&bytes), [("Hidden".into(), true), ("Shown".into(), false)]);
+        painted(&bytes, &[true, false]);
+    }
+}
+
+#[test]
+fn booklet_export_preserves_optional_content() {
+    let doc = document(fixture(DEFAULT, "Hidden"), &[&[]]);
+    let options = designcraft_pdf::BookletOptions { kind: designcraft_pdf::BookletKind::TwoUpConsecutive, ..Default::default() };
+
+    let report = designcraft_pdf::export_booklet(&doc, &Cache::new(), &options).unwrap();
+
+    assert!(report.warnings.is_empty());
+    assert_eq!(catalog(&report.bytes), [("Hidden".into(), true), ("Shown".into(), false)]);
+    assert_vector(&report.bytes);
+    painted(&report.bytes, &[true, false, false, false]);
+}
+
+#[test]
+fn archival_export_still_rejects_unvalidated_placed_pdf() {
+    let doc = document(fixture(DEFAULT, "Hidden"), &[&[]]);
+
+    let error = export_pdf(&doc, &Cache::new(), &PdfOptions { standard: Standard::PdfA2b, ..Default::default() }).unwrap_err();
+
+    assert!(error.to_string().contains("EmbeddedPDF"), "{error}");
+}
+
+#[test]
+fn source_xref_stream_preserves_layer_states() {
+    let doc = document(support::stream_fixture(DEFAULT), &[&[]]);
+
+    let bytes = export_pdf(&doc, &Cache::new(), &PdfOptions::default()).unwrap();
+
+    assert_eq!(catalog(&bytes), [("Hidden".into(), true), ("Shown".into(), false)]);
+    painted(&bytes, &[true, false]);
+}
diff --git a/crates/engine/tests/support/optional_content.rs b/crates/engine/tests/support/optional_content.rs
new file mode 100644
index 000000000..b3acb3511
--- /dev/null
+++ b/crates/engine/tests/support/optional_content.rs
@@ -0,0 +1,174 @@
+use std::sync::Arc;
+
+use designcraft_doc::{Asset, AssetId, Content, Document, Graphic, Item, ItemId, Shape, SpreadRef, build::NewDocument};
+use designcraft_geom::{Affine, Rect, shapes};
+use hayro_syntax::{
+    Pdf,
+    object::{Array, Dict, Name, ObjectIdentifier},
+};
+
+pub fn fixture(config: &str, second_name: &str) -> Vec<u8> {
+    layered_fixture(Some(config), second_name)
+}
+
+pub fn orphaned_fixture() -> Vec<u8> {
+    layered_fixture(None, "Hidden")
+}
+
+fn layered_fixture(config: Option<&str>, second_name: &str) -> Vec<u8> {
+    let properties = config.map(|config| format!("/OCProperties<</OCGs[5 0 R 6 3 R]/D<<{config}>>>>")).unwrap_or_default();
+    properties_fixture(&properties, second_name)
+}
+
+pub fn properties_fixture(properties: &str, second_name: &str) -> Vec<u8> {
+    grouped_fixture(properties, Some(second_name))
+}
+
+pub fn nameless_fixture(config: &str) -> Vec<u8> {
+    grouped_fixture(&format!("/OCProperties<</OCGs[5 0 R 6 3 R]/D<<{config}>>>>"), None)
+}
+
+fn grouped_fixture(properties: &str, second_name: Option<&str>) -> Vec<u8> {
+    let content = "/OC /a BDC 1 0 0 0 k 0 0 50 100 re f EMC /OC /b BDC 0 1 0 0 k 50 0 50 100 re f EMC";
+    let name = second_name.map(|name| format!("/Name({name})")).unwrap_or_default();
+    let objects = [
+        format!("<</Type/Catalog/Pages 2 0 R{properties}>>"),
+        "<</Type/Pages/Kids[3 0 R]/Count 1>>".into(),
+        "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<</Properties<</a 5 0 R/b 6 3 R>>>>/Contents 4 0 R>>".into(),
+        format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
+        "<</Type/OCG/Name(Shown)/Intent[/View/Design]/Usage<</Print<</PrintState/ON>>>>/Custom(keep \\(this\\) >>)>>".into(),
+        format!("<</Type/OCG{name}/Intent[/View/Design]/Usage<</Print<</PrintState/ON>>>>/Custom<00ff80>>>"),
+    ];
+    assemble(&objects, &[2, 0, 0, 0, 0, 3])
+}
+
+pub fn unlayered_fixture() -> Vec<u8> {
+    let content = "1 0 0 0 k 0 0 50 100 re f";
+    assemble(
+        &[
+            "<</Type/Catalog/Pages 2 0 R>>".into(),
+            "<</Type/Pages/Kids[3 0 R]/Count 1>>".into(),
+            "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<<>>/Contents 4 0 R>>".into(),
+            format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
+        ],
+        &[2, 0, 0, 0],
+    )
+}
+
+pub fn stream_fixture(config: &str) -> Vec<u8> {
+    let mut bytes = fixture(config, "Hidden");
+    let tail = std::str::from_utf8(&bytes).unwrap();
+    let previous: usize = tail.rsplit("startxref").next().unwrap().split_whitespace().next().unwrap().parse().unwrap();
+    let offset = bytes.len();
+    let mut entry = vec![1];
+    entry.extend_from_slice(&u32::try_from(offset).unwrap().to_be_bytes());
+    entry.extend_from_slice(&0u16.to_be_bytes());
+    bytes.extend_from_slice(format!("7 0 obj\n<</Type/XRef/Size 8/Root 1 2 R/Prev {previous}/W[1 4 2]/Index[7 1]/Length 7>>\nstream\n").as_bytes());
+    bytes.extend_from_slice(&entry);
+    bytes.extend_from_slice(format!("\nendstream\nendobj\nstartxref\n{offset}\n%%EOF\n").as_bytes());
+    bytes
+}
+
+fn assemble(objects: &[String], generations: &[i32]) -> Vec<u8> {
+    let mut bytes = b"%PDF-1.5\n".to_vec();
+    let mut offsets = Vec::new();
+    for (index, body) in objects.iter().enumerate() {
+        offsets.push(bytes.len());
+        bytes.extend_from_slice(format!("{} {} obj\n{body}\nendobj\n", index + 1, generations[index]).as_bytes());
+    }
+    let xref = bytes.len();
+    bytes.extend_from_slice(format!("xref\n0 {}\n0000000000 65535 f\r\n", objects.len() + 1).as_bytes());
+    for (offset, generation) in offsets.iter().zip(generations) {
+        bytes.extend_from_slice(format!("{offset:010} {generation:05} n\r\n").as_bytes());
+    }
+    bytes.extend_from_slice(format!("trailer\n<</Size {}/Root 1 2 R>>\nstartxref\n{xref}\n%%EOF\n", objects.len() + 1).as_bytes());
+    bytes
+}
+
+pub fn document(bytes: Vec<u8>, hidden_sets: &[&[&str]]) -> Document {
+    let width = 100.0 * f64::from(u32::try_from(hidden_sets.len()).unwrap());
+    let mut doc = Document::new(&NewDocument { width, height: 100.0, facing_pages: false, ..Default::default() });
+    let asset = AssetId(doc.alloc());
+    doc.add_asset(Asset {
+        id: asset,
+        name: "layers.pdf".into(),
+        mime: "application/pdf".into(),
+        data: Arc::new(bytes),
+        link: None,
+        pixels: None,
+        page: 0,
+        pdf_crop: Default::default(),
+        pdf_box: None,
+    });
+    for (index, hidden) in hidden_sets.iter().enumerate() {
+        let x = 100.0 * f64::from(u32::try_from(index).unwrap());
+        let mut item = Item::new(ItemId(doc.alloc()), doc.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 100.0, 100.0)));
+        item.xf = Affine::translate((x, 0.0));
+        item.pdf_hidden_layers = hidden.iter().map(|name| (*name).to_owned()).collect();
+        item.content = Content::Graphic(Graphic {
+            asset,
+            size: (100.0, 100.0),
+            xf: Affine::IDENTITY,
+            clip: None,
+            auto_fit: Default::default(),
+            fit_align: 4,
+            crop: [0.0; 4],
+            wrap: Default::default(),
+            fill: Default::default(),
+            layer_options: None,
+        });
+        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    }
+    doc
+}
+
+pub fn refs(dict: &Dict<'_>, key: &[u8]) -> Vec<ObjectIdentifier> {
+    dict.get::<Array<'_>>(key).unwrap().raw_iter().map(|value| value.as_obj_ref().unwrap().into()).collect()
+}
+
+pub fn catalog(bytes: &[u8]) -> Vec<(String, bool)> {
+    let pdf = Pdf::new(bytes.to_vec()).unwrap();
+    let root = pdf.xref().get::<Dict<'_>>(pdf.xref().root_id()).unwrap();
+    let properties = root.get::<Dict<'_>>(b"OCProperties").expect("export must register its embedded OCGs");
+    let groups = refs(&properties, b"OCGs");
+    let defaults = properties.get::<Dict<'_>>(b"D").unwrap();
+    assert!(defaults.get::<hayro_syntax::object::String<'_>>(b"Name").is_some());
+    assert_eq!(defaults.get::<Name<'_>>(b"BaseState").unwrap().as_ref(), b"ON");
+    assert!(!defaults.contains_key(b"AS"));
+    assert_eq!(refs(&defaults, b"Order"), groups);
+    let off = refs(&defaults, b"OFF");
+    assert!(off.iter().all(|id| groups.contains(id)));
+    let mut unique = groups.clone();
+    unique.sort();
+    unique.dedup();
+    assert_eq!(unique.len(), groups.len());
+    let mut result = Vec::new();
+    for id in groups {
+        let group = pdf.xref().get::<Dict<'_>>(id).unwrap();
+        assert!(group.contains_key(b"Usage"));
+        assert!(group.contains_key(b"Intent"));
+        assert!(group.contains_key(b"Custom"));
+        let custom = group.get::<hayro_syntax::object::String<'_>>(b"Custom").unwrap();
+        assert!([b"keep (this) >>".as_slice(), &[0, 255, 128]].contains(&custom.as_bytes()));
+        let intent = group.get::<Array<'_>>(b"Intent").unwrap();
+        assert_eq!(intent.iter::<Name<'_>>().map(|name| name.as_ref().to_vec()).collect::<Vec<_>>(), [b"View".to_vec(), b"Design".to_vec()]);
+        let usage = group.get::<Dict<'_>>(b"Usage").unwrap().get::<Dict<'_>>(b"Print").unwrap();
+        assert_eq!(usage.get::<Name<'_>>(b"PrintState").unwrap().as_ref(), b"ON");
+        let name = group.get::<hayro_syntax::object::String<'_>>(b"Name").unwrap();
+        result.push((String::from_utf8(name.as_bytes().to_vec()).unwrap(), off.contains(&id)));
+    }
+    result.sort();
+    result
+}
+
+pub fn painted(bytes: &[u8], expected: &[bool]) {
+    let width = u32::try_from(expected.len()).unwrap() * 50;
+    let image = designcraft_render::render_pdf_page(bytes, 0, width.max(100)).unwrap();
+    for (index, painted) in expected.iter().enumerate() {
+        let image_width = usize::from(image.width());
+        let x = (2 * index + 1) * image_width / (2 * expected.len());
+        let y = usize::from(image.height()) / 2;
+        let pixel = image.data()[y * image_width + x];
+        assert_eq!(pixel.a > 200, *painted, "half {index}: {pixel:?}");
+    }
+}
diff --git a/crates/engine/tests/support/optional_content_fallback.rs b/crates/engine/tests/support/optional_content_fallback.rs
new file mode 100644
index 000000000..5a94bb7b1
--- /dev/null
+++ b/crates/engine/tests/support/optional_content_fallback.rs
@@ -0,0 +1,263 @@
+use super::support::{catalog, document, nameless_fixture, painted, properties_fixture};
+use designcraft_compose::Cache;
+use designcraft_engine::{Session, cmd::base64_encode};
+use designcraft_pdf::{PdfOptions, Standard, export_pdf, export_pdf_with_report};
+use serde_json::json;
+
+const CASES: &[&str] = &[
+    "/OCGs[5 0 R 6 3 R]",
+    "/OCGs[5 0 R 6 3 R]/D null",
+    "/OCGs[5 0 R 6 3 R]/D 42",
+    "/OCGs[5 0 R 6 3 R]/D 99 0 R",
+    "/OCGs[5 0 R 6 3 R]/D<</BaseState/Unchanged/OFF[6 3 R]>>",
+    "/OCGs[5 0 R 6 3 R]/D<</BaseState/Other/OFF[6 3 R]>>",
+    "/OCGs[5 0 R 6 3 R]/D<</BaseState 42/OFF[6 3 R]>>",
+    "/OCGs[5 0 R 6 3 R]/D<</BaseState/ON/ON 42>>",
+    "/OCGs[5 0 R 6 3 R]/D<</BaseState/ON/ON[null 5 0 R]>>",
+];
+
+fn incomplete_inventory(standard: &str, off: bool) {
+    let cases: &[&str] = if off {
+        &["/OCGs[5 0 R]/D<</BaseState/ON/OFF[6 3 R]>>", "/D<</ON[5 0 R]/OFF[6 3 R]>>"]
+    } else {
+        &["/OCGs[6 3 R]/D<</BaseState/OFF/ON[5 0 R]>>"]
+    };
+    for properties in cases {
+        let source = properties_fixture(&format!("/OCProperties<<{properties}>>"), "Hidden");
+        let mut session = Session::new();
+        session.execute("file.new", &json!({"width": 100, "height": 100, "pages": 1, "facingPages": false, "margins": 0})).unwrap();
+        session.execute("file.place", &json!({"base64": base64_encode(&source), "name": "incomplete.pdf", "x": 0, "y": 0, "width": 100})).unwrap();
+
+        let result = session.execute("file.exportPdf", &json!({"standard": standard})).unwrap();
+
+        let bytes = designcraft_engine::cmd::base64_decode(result["base64"].as_str().unwrap());
+        assert_eq!(catalog(&bytes), [("Hidden".into(), true), ("Shown".into(), false)]);
+        painted(&bytes, &[true, false]);
+        super::assert_vector(&bytes);
+        let warnings = result["warnings"].as_array().unwrap();
+        assert_eq!(warnings.len(), 1);
+        let warning = warnings[0].as_str().unwrap();
+        assert!(warning.contains("incomplete.pdf") && warning.contains("layer list incomplete"), "{warning}");
+        assert!(!warning.contains("layer state not readable"), "{warning}");
+        if standard == "x4" {
+            assert!(designcraft_pdf::check_pdfx4(&bytes).is_empty());
+        }
+    }
+}
+
+#[test]
+fn plain_incomplete_inventory_preserves_off() {
+    incomplete_inventory("none", true);
+}
+
+#[test]
+fn pdfx_incomplete_inventory_preserves_off() {
+    incomplete_inventory("x4", true);
+}
+
+#[test]
+fn plain_incomplete_inventory_preserves_on() {
+    incomplete_inventory("none", false);
+}
+
+#[test]
+fn pdfx_incomplete_inventory_preserves_on() {
+    incomplete_inventory("x4", false);
+}
+
+#[test]
+fn incomplete_inventory_reports_both_warnings_during_fallback() {
+    for standard in [Standard::None, Standard::PdfX4] {
+        let source = properties_fixture("/OCProperties<</OCGs[5 0 R]/D<</BaseState/Unchanged/OFF[6 3 R]>>>>", "Hidden");
+        let doc = document(source, &[&[]]);
+
+        let report = export_pdf_with_report(&doc, &Cache::new(), &PdfOptions { standard, ..Default::default() }).unwrap();
+
+        assert_eq!(report.warnings.len(), 1);
+        let warning = &report.warnings[0];
+        assert!(
+            warning.contains("layers.pdf") && warning.contains("layer list incomplete") && warning.contains("layer state not readable"),
+            "{warning}"
+        );
+        painted(&report.bytes, &[true, true]);
+        if standard == Standard::PdfX4 {
+            assert!(designcraft_pdf::check_pdfx4(&report.bytes).is_empty());
+        }
+    }
+}
+
+fn visible_recovery(source: Vec<u8>, standard: &str) {
+    let mut session = Session::new();
+    session.execute("file.new", &json!({"width": 100, "height": 100, "pages": 1, "facingPages": false, "margins": 0})).unwrap();
+    session.execute("file.place", &json!({"base64": base64_encode(&source), "name": "visible-recovery.pdf", "x": 0, "y": 0, "width": 100})).unwrap();
+
+    let result = session.execute("file.exportPdf", &json!({"standard": standard})).unwrap();
+
+    let warnings = result["warnings"].as_array().unwrap();
+    assert_eq!(warnings.len(), 1);
+    assert!(warnings[0].as_str().unwrap().contains("visible-recovery.pdf"));
+    let bytes = designcraft_engine::cmd::base64_decode(result["base64"].as_str().unwrap());
+    let groups = catalog(&bytes);
+    assert_eq!(groups.len(), 2);
+    assert!(groups.iter().all(|(name, hidden)| !name.is_empty() && !hidden));
+    super::assert_vector(&bytes);
+    painted(&bytes, &[true, true]);
+    if standard == "x4" {
+        assert!(designcraft_pdf::check_pdfx4(&bytes).is_empty());
+    }
+}
+
+#[test]
+fn plain_export_recovers_malformed_on_when_defaults_are_visible() {
+    visible_recovery(super::support::fixture("/BaseState/ON/ON 42", "Hidden"), "none");
+}
+
+#[test]
+fn pdfx_export_recovers_malformed_on_when_defaults_are_visible() {
+    visible_recovery(super::support::fixture("/BaseState/ON/ON 42", "Hidden"), "x4");
+}
+
+#[test]
+fn plain_export_names_visible_group_when_display_name_is_missing() {
+    visible_recovery(nameless_fixture("/BaseState/ON"), "none");
+}
+
+#[test]
+fn pdfx_export_names_visible_group_when_display_name_is_missing() {
+    visible_recovery(nameless_fixture("/BaseState/ON"), "x4");
+}
+
+#[test]
+fn missing_display_name_fails_when_an_override_could_match() {
+    for standard in [Standard::None, Standard::PdfX4] {
+        let doc = document(nameless_fixture("/BaseState/ON"), &[&["Shown"]]);
+
+        let result = export_pdf(&doc, &Cache::new(), &PdfOptions { standard, ..Default::default() });
+
+        assert!(result.is_err(), "a nameless group could match the explicit hidden name");
+    }
+}
+
+#[test]
+fn malformed_on_fails_when_base_state_can_hide_groups() {
+    for standard in [Standard::None, Standard::PdfX4] {
+        let doc = document(super::support::fixture("/BaseState/OFF/ON 42", "Hidden"), &[&[]]);
+
+        let result = export_pdf(&doc, &Cache::new(), &PdfOptions { standard, ..Default::default() });
+
+        assert!(result.is_err(), "all-ON recovery would expose groups hidden by BaseState OFF");
+    }
+}
+
+#[test]
+fn name_repair_preserves_readable_default_off_state() {
+    for standard in [Standard::None, Standard::PdfX4] {
+        let doc = document(nameless_fixture("/BaseState/ON/OFF[6 3 R]"), &[&[]]);
+
+        let report = export_pdf_with_report(&doc, &Cache::new(), &PdfOptions { standard, ..Default::default() }).unwrap();
+
+        assert_eq!(report.warnings.len(), 1);
+        assert!(report.warnings[0].contains("layers.pdf"));
+        assert_eq!(catalog(&report.bytes).iter().filter(|(_, hidden)| *hidden).count(), 1);
+        painted(&report.bytes, &[true, false]);
+        if standard == Standard::PdfX4 {
+            assert!(designcraft_pdf::check_pdfx4(&report.bytes).is_empty());
+        }
+    }
+}
+
+fn fallback_exports(standard: Standard) {
+    let mut failures = Vec::new();
+    for properties in CASES {
+        let source = properties_fixture(&format!("/OCProperties<<{properties}>>"), "Hidden");
+        let doc = document(source, &[&[], &["Shown"]]);
+
+        let report = match export_pdf_with_report(&doc, &Cache::new(), &PdfOptions { standard, created: Some(0), ..Default::default() }) {
+            Ok(report) => report,
+            Err(error) => {
+                failures.push(format!("{properties}: {error}"));
+                continue;
+            }
+        };
+
+        if report.warnings.len() != 1 {
+            failures.push(format!("{properties}: expected one fallback warning, got {:?}", report.warnings));
+            continue;
+        }
+        assert!(report.warnings[0].contains("layers.pdf"));
+        assert_eq!(catalog(&report.bytes), [("Hidden".into(), false), ("Hidden".into(), false), ("Shown".into(), false), ("Shown".into(), true)]);
+        super::assert_vector(&report.bytes);
+        painted(&report.bytes, &[true, true, false, true]);
+        if standard == Standard::PdfX4 {
+            assert!(designcraft_pdf::check_pdfx4(&report.bytes).is_empty());
+        }
+    }
+    assert!(failures.is_empty(), "fallback export failures: {failures:#?}");
+}
+
+#[test]
+fn plain_fallback_shows_all_layers_and_preserves_frame_overrides() {
+    fallback_exports(Standard::None);
+}
+
+#[test]
+fn pdfx_fallback_shows_all_layers_and_preserves_frame_overrides() {
+    fallback_exports(Standard::PdfX4);
+}
+
+#[test]
+fn file_export_reports_fallback_with_filename_and_preserves_overrides() {
+    for properties in CASES {
+        for standard in ["none", "x4"] {
+            for hidden in [false, true] {
+                let source = properties_fixture(&format!("/OCProperties<<{properties}>>"), "Hidden");
+                let mut session = Session::new();
+                session.execute("file.new", &json!({"width": 100, "height": 100, "pages": 1, "facingPages": false, "margins": 0})).unwrap();
+                session
+                    .execute("file.place", &json!({"base64": base64_encode(&source), "name": "fallback.pdf", "x": 0, "y": 0, "width": 100}))
+                    .unwrap();
+                if hidden {
+                    session.execute("object.layerOptions", &json!({"hidden": ["Shown"]})).unwrap();
+                }
+
+                let result = session.execute("file.exportPdf", &json!({"standard": standard})).unwrap();
+
+                let warnings = result["warnings"].as_array().unwrap();
+                assert_eq!(warnings.len(), 1, "{properties}: {result}");
+                assert!(warnings[0].as_str().unwrap().contains("fallback.pdf"));
+                let bytes = designcraft_engine::cmd::base64_decode(result["base64"].as_str().unwrap());
+                assert_eq!(catalog(&bytes), [("Hidden".into(), false), ("Shown".into(), hidden)]);
+                painted(&bytes, &[!hidden, true]);
+            }
+        }
+    }
+}
+
+#[test]
+fn contradictory_and_unresolved_states_fail_even_with_fallback_or_overrides() {
+    for properties in [
+        "/OCGs[5 0 R 6 3 R]/D<</ON[6 3 R]/OFF[6 3 R]>>",
+        "/OCGs[5 0 R]/D<</BaseState/Unchanged/ON[6 3 R]/OFF[6 3 R]>>",
+        "/OCGs[5 0 R 6 3 R]/D<</BaseState/Unchanged/OFF[99 0 R]>>",
+        "/OCGs[5 0 R 6 3 R]/D<</ON[99 0 R]>>",
+        "/OCGs[5 0 R 6 3 R 99 0 R]",
+        "/OCGs[5 0 R 6 3 R]/D<</OFF[2 0 R]>>",
+        "/OCGs[5 0 R 6 3 R]/D<</OFF[6 0 R]>>",
+        "/OCGs[5 0 R 6 3 R]/D<</OFF[null]>>",
+        "/OCGs[5 0 R 6 3 R]/D<</OFF 42>>",
+        "/OCGs[5 0 R 6 3 R]/D<</OFF 99 0 R>>",
+        "/OCGs[5 0 R 6 3 R]/D<</BaseState/ON/ON[null 99 0 R]>>",
+        "/OCGs[5 0 R 6 3 R]/D<</BaseState/ON/ON 99 0 R>>",
+        "/OCGs[5 0 R 6 3 R]/D<</BaseState/ON/ON 42/OFF[6 3 R]>>",
+    ] {
+        for standard in [Standard::None, Standard::PdfX4] {
+            for hidden in [&[][..], &["Shown"][..]] {
+                let doc = document(properties_fixture(&format!("/OCProperties<<{properties}>>"), "Hidden"), &[hidden]);
+
+                let result = export_pdf(&doc, &Cache::new(), &PdfOptions { standard, ..Default::default() });
+
+                assert!(result.is_err(), "unsafe state accepted: {properties}");
+            }
+        }
+    }
+}
diff --git a/crates/engine/tests/support/optional_content_xref.rs b/crates/engine/tests/support/optional_content_xref.rs
new file mode 100644
index 000000000..9730969e2
--- /dev/null
+++ b/crates/engine/tests/support/optional_content_xref.rs
@@ -0,0 +1,143 @@
+use super::support::{catalog, document, fixture, nameless_fixture, painted};
+use designcraft_compose::Cache;
+use designcraft_doc::{AssetId, Content};
+use designcraft_pdf::{BookletKind, BookletOptions, PdfOptions, Standard, export_booklet, export_pdf, export_pdf_with_report, merge_pdfs};
+use std::sync::Arc;
+
+fn broken_xref(bytes: Vec<u8>) -> Vec<u8> {
+    let text = String::from_utf8(bytes).unwrap();
+    let (body, _) = text.rsplit_once("startxref").unwrap();
+    let bytes = format!("{body}startxref\n1\n%%EOF\n").into_bytes();
+    let pdf = hayro_syntax::Pdf::new(bytes.clone()).expect("hayro must repair the synthetic broken xref");
+    assert_eq!(pdf.pages().len(), 1);
+    let root = pdf.xref().get::<hayro_syntax::object::Dict<'_>>(pdf.xref().root_id()).unwrap();
+    assert!(root.get::<hayro_syntax::object::Dict<'_>>(b"OCProperties").is_some());
+    bytes
+}
+
+fn all_visible(standard: Standard) {
+    let source = broken_xref(fixture("/BaseState/ON", "Hidden"));
+    painted(&source, &[true, true]);
+    let doc = document(source, &[&[]]);
+
+    let report = export_pdf_with_report(&doc, &Cache::new(), &PdfOptions { standard, ..Default::default() }).unwrap();
+
+    assert!(report.warnings.is_empty(), "{:?}", report.warnings);
+    assert_eq!(catalog(&report.bytes), [("Hidden".into(), false), ("Shown".into(), false)]);
+    super::assert_vector(&report.bytes);
+    painted(&report.bytes, &[true, true]);
+    if standard == Standard::PdfX4 {
+        assert!(designcraft_pdf::check_pdfx4(&report.bytes).is_empty());
+    }
+}
+
+#[test]
+fn plain_export_accepts_repaired_xref_when_all_layers_are_visible() {
+    all_visible(Standard::None);
+}
+
+#[test]
+fn pdfx_export_accepts_repaired_xref_when_all_layers_are_visible() {
+    all_visible(Standard::PdfX4);
+}
+
+#[test]
+fn booklet_accepts_repaired_xref_when_all_layers_are_visible() {
+    let doc = document(broken_xref(fixture("/BaseState/ON", "Hidden")), &[&[]]);
+    let options = BookletOptions { kind: BookletKind::TwoUpConsecutive, ..Default::default() };
+
+    let report = export_booklet(&doc, &Cache::new(), &options).unwrap();
+
+    assert!(report.warnings.is_empty());
+    assert_eq!(catalog(&report.bytes), [("Hidden".into(), false), ("Shown".into(), false)]);
+    super::assert_vector(&report.bytes);
+    painted(&report.bytes, &[true, true, false, false]);
+}
+
+#[test]
+fn book_merge_accepts_repaired_xref_when_all_layers_are_visible() {
+    let source = broken_xref(fixture("/BaseState/ON", "Hidden"));
+
+    let bytes = merge_pdfs(&[(source, vec![(100.0, 100.0)])], None).unwrap();
+
+    assert_eq!(catalog(&bytes), [("Hidden".into(), false), ("Shown".into(), false)]);
+    super::assert_vector(&bytes);
+    painted(&bytes, &[true, true]);
+}
+
+#[test]
+fn repaired_xref_with_default_off_fails_with_named_damage_error() {
+    let doc = document(broken_xref(fixture("/BaseState/ON/OFF[6 3 R]", "Hidden")), &[&[]]);
+
+    for standard in [Standard::None, Standard::PdfX4] {
+        let error = export_pdf(&doc, &Cache::new(), &PdfOptions { standard, ..Default::default() }).unwrap_err().to_string();
+        assert!(error.contains("layers.pdf"), "{error}");
+        assert!(error.contains("cross-reference table is damaged"), "{error}");
+        assert!(!error.contains("optional-content state"), "{error}");
+    }
+}
+
+#[test]
+fn repaired_xref_with_explicit_hidden_layer_fails_with_named_damage_error() {
+    let doc = document(broken_xref(fixture("/BaseState/ON", "Hidden")), &[&["Hidden"]]);
+
+    let error = export_pdf(&doc, &Cache::new(), &PdfOptions::default()).unwrap_err().to_string();
+
+    assert!(error.contains("layers.pdf") && error.contains("cross-reference table is damaged"), "{error}");
+}
+
+#[test]
+fn repaired_xref_needing_generated_name_fails_with_named_damage_error() {
+    let doc = document(broken_xref(nameless_fixture("/BaseState/ON")), &[&[]]);
+
+    let error = export_pdf(&doc, &Cache::new(), &PdfOptions::default()).unwrap_err().to_string();
+
+    assert!(error.contains("layers.pdf") && error.contains("cross-reference table is damaged"), "{error}");
+}
+
+fn two_assets(first: Vec<u8>, second: Vec<u8>) -> designcraft_doc::Document {
+    let mut doc = document(first, &[&[], &[]]);
+    let original = doc.assets.values().next().unwrap().as_ref().clone();
+    Arc::make_mut(doc.assets.values_mut().next().unwrap()).name = "first.pdf".into();
+    let id = AssetId(doc.alloc());
+    let mut other = original;
+    other.id = id;
+    other.name = "second.pdf".into();
+    other.data = Arc::new(second);
+    doc.add_asset(other);
+    let spread = Arc::make_mut(doc.spreads.first_mut().unwrap());
+    let item = Arc::make_mut(spread.items.last_mut().unwrap());
+    let Content::Graphic(graphic) = &mut item.content else { panic!("fixture must have a graphic") };
+    graphic.asset = id;
+    doc
+}
+
+#[test]
+fn error_identifies_unresolvable_pdf_among_two_placements() {
+    let doc = two_assets(fixture("/BaseState/ON", "Hidden"), fixture("/OFF[99 0 R]", "Hidden"));
+
+    let error = export_pdf(&doc, &Cache::new(), &PdfOptions::default()).unwrap_err().to_string();
+
+    assert_eq!(error, "PDF writer error: second.pdf: the placed PDF's optional-content state could not be preserved safely");
+}
+
+#[test]
+fn first_placement_error_is_not_overwritten() {
+    let doc = two_assets(fixture("/OFF[99 0 R]", "Hidden"), fixture("/OFF[98 0 R]", "Hidden"));
+
+    let error = export_pdf(&doc, &Cache::new(), &PdfOptions::default()).unwrap_err().to_string();
+
+    assert!(error.contains("first.pdf"), "{error}");
+    assert!(!error.contains("second.pdf"), "{error}");
+}
+
+#[test]
+fn repeated_recoverable_variant_reports_one_warning_and_paints_each_placement() {
+    let doc = document(fixture("/BaseState/Unchanged", "Hidden"), &[&[], &[]]);
+
+    let report = export_pdf_with_report(&doc, &Cache::new(), &PdfOptions::default()).unwrap();
+
+    assert_eq!(report.warnings.len(), 1);
+    assert!(report.warnings[0].contains("layers.pdf"));
+    painted(&report.bytes, &[true, true, true, true]);
+}
diff --git a/crates/epub/src/chapters.rs b/crates/epub/src/chapters.rs
new file mode 100644
index 000000000..ede96f390
--- /dev/null
+++ b/crates/epub/src/chapters.rs
@@ -0,0 +1,154 @@
+use super::css::{export_mapping, para_classes};
+use super::html::Block;
+use super::markup::xml_text;
+use super::*;
+
+/// Whether an EPUB chapter file starts before a paragraph of `style` (Split Document): never
+/// when it's off, before each paragraph of the one style it names, or before each paragraph of
+/// a style whose Export Tagging has Split Document on.
+pub(crate) fn starts_chapter(split: &EpubSplit, st: &Styles, style: &str) -> bool {
+    match split {
+        EpubSplit::Off => false,
+        EpubSplit::Style(name) => name == style,
+        EpubSplit::ExportTags => st.export_tag(style, false).is_some_and(|e| e.split),
+    }
+}
+
+/// Where the EPUB body splits into chapter files (see [`starts_chapter`]).
+pub(crate) const CHAPTER_MARK: &str = "<!--dc:chapter-->";
+
+/// The body split at its [`CHAPTER_MARK`]s into chapter bodies, each with its sections closed
+/// and the one a split goes through reopened in the next; a part with nothing but the start of a
+/// section (a story that opens with its `h1`) moves that start into the next part.
+pub(crate) fn split_chapters(body: &str) -> Vec<String> {
+    let mut out: Vec<String> = Vec::new();
+    let mut carry: Option<String> = None;
+    for piece in body.split(CHAPTER_MARK) {
+        let mut part = carry.take().unwrap_or_default();
+        part.push_str(piece);
+        if let Some(open) = part.rfind("<section").filter(|i| !part[*i..].contains("</section>")) {
+            let tag_end = part[open..].find('>').map_or(part.len(), |e| open + e + 1);
+            if part[tag_end..].trim().is_empty() {
+                carry = Some(part[open..].to_string());
+                part.truncate(open);
+            } else {
+                part.push_str("</section>\n");
+                carry = Some("<section>\n".to_string());
+            }
+        }
+        if !part.trim().is_empty() {
+            out.push(part);
+        }
+    }
+    if let Some(rest) = carry.filter(|c| !c.trim().is_empty())
+        && let Some(last) = out.last_mut()
+    {
+        // Only an opening tag can be left over; close it where it stands.
+        last.push_str(&rest);
+        last.push_str("</section>\n");
+    }
+    if out.is_empty() {
+        out.push(String::new());
+    }
+    out
+}
+
+/// `chapter` (the file `own`) with each in-document link (`href="#id"`) to an element in another
+/// chapter file pointed at that file.
+pub(crate) fn link_across_chapters(chapter: &str, own: &str, files: &BTreeMap<String, String>) -> String {
+    const HREF: &str = "href=\"#";
+    let mut out = String::with_capacity(chapter.len());
+    let mut rest = chapter;
+    while let Some(i) = rest.find(HREF) {
+        out.push_str(rest.get(..i).unwrap_or_default());
+        let tail = rest.get(i + HREF.len()..).unwrap_or_default();
+        let id = tail.split('"').next().unwrap_or_default();
+        match files.get(id) {
+            Some(file) if file != own => {
+                let _ = write!(out, "href=\"{file}#");
+            }
+            _ => out.push_str(HREF),
+        }
+        rest = tail;
+    }
+    out.push_str(rest);
+    out
+}
+
+/// The package file of chapter `k` (0-based): `content.xhtml`, then `content2.xhtml`, ….
+pub(crate) fn chapter_file(k: usize) -> String {
+    if k == 0 { "content.xhtml".to_string() } else { format!("content{}.xhtml", k + 1) }
+}
+
+/// The level of a heading element (`h1` → 1 … `h6` → 6).
+pub(crate) fn heading_level(tag: &str) -> Option<u8> {
+    tag.strip_prefix('h').and_then(|n| n.parse::<u8>().ok()).filter(|n| (1..=6).contains(n))
+}
+
+/// Table of contents entries (target, label, level): the `h1`–`h3` paragraphs of the stories in
+/// reading order, or, in a document without headings, each story's first paragraph (level 1).
+pub(crate) fn toc_entries(doc: &Document, order: &[Block]) -> Vec<(String, String, u8)> {
+    let pc = para_classes(&doc.styles);
+    let label = |t: &str| -> String { t.chars().filter(|c| !('\u{E000}'..='\u{E0FF}').contains(c)).take(80).collect::<String>().trim().to_string() };
+    let mut headings = Vec::new();
+    let mut firsts = Vec::new();
+    for (k, b) in order.iter().enumerate() {
+        let Block::Story(sid) = b else { continue };
+        // The endnote story isn't written (the endnotes section stands in for it).
+        if doc.endnote_story == Some(*sid) {
+            continue;
+        }
+        let Some(st) = doc.story(*sid) else { continue };
+        let first = label(st.text.split('\n').next().unwrap_or(""));
+        if !first.is_empty() {
+            firsts.push((format!("s{k}"), first, 1));
+        }
+        for (pi, r) in st.para_ranges().iter().enumerate() {
+            let Some(pf) = st.paras.get(pi) else { continue };
+            let (tag, _) = export_mapping(&doc.styles, &pf.style, false, &pc);
+            let Some(level) = heading_level(tag).filter(|l| *l <= 3) else { continue };
+            let text = label(st.text.get(r.clone()).unwrap_or(""));
+            if !text.is_empty() {
+                headings.push((format!("s{k}-p{pi}"), text, level));
+            }
+        }
+    }
+    if headings.is_empty() { firsts } else { headings }
+}
+
+/// The table of contents as nested `li`/`ol` items (the content of the navigation's outer
+/// `ol`): a deeper level goes into the previous item, skipped levels count as one.
+pub(crate) fn nav_list(entries: &[(String, String, u8)], files: &BTreeMap<String, String>) -> String {
+    let mut out = String::new();
+    let mut open: Vec<u8> = Vec::new();
+    for (target, label, level) in entries {
+        let file = files.get(target).map_or("content.xhtml", String::as_str);
+        let item = format!("<li><a href=\"{file}#{target}\">{}</a>", xml_text(label));
+        match open.last().copied() {
+            None => open.push(*level),
+            Some(top) if *level > top => {
+                out.push_str("<ol>");
+                open.push(*level);
+            }
+            Some(_) => {
+                // Close the levels whose parent is as deep as this entry or deeper.
+                while open.len() > 1 && open.len().checked_sub(2).and_then(|i| open.get(i)).is_some_and(|parent| *parent >= *level) {
+                    open.pop();
+                    out.push_str("</li></ol>");
+                }
+                out.push_str("</li>");
+                if let Some(t) = open.last_mut() {
+                    *t = (*t).min(*level);
+                }
+            }
+        }
+        out.push_str(&item);
+    }
+    for i in (0..open.len()).rev() {
+        out.push_str("</li>");
+        if i > 0 {
+            out.push_str("</ol>");
+        }
+    }
+    out
+}
diff --git a/crates/epub/src/css.rs b/crates/epub/src/css.rs
new file mode 100644
index 000000000..526b10a40
--- /dev/null
+++ b/crates/epub/src/css.rs
@@ -0,0 +1,226 @@
+use super::fonts::{EmbeddedFont, css_weight_style, font_file, generic_family};
+use super::markup::{css_string, slug, valid_xml_char};
+use super::*;
+
+/// Class names for `names`, in order: [`slug`]s made unique with a `-2`, `-3`… suffix, so styles
+/// whose names slug alike ("Body Text" / "Body-Text", or non-ASCII names) keep their own rules.
+fn class_names<'a>(names: impl Iterator<Item = &'a str>) -> BTreeMap<&'a str, String> {
+    let mut out = BTreeMap::new();
+    let mut used = std::collections::BTreeSet::new();
+    for name in names {
+        let base = slug(name);
+        let mut class = base.clone();
+        let mut n = 1;
+        while !used.insert(class.clone()) {
+            n += 1;
+            class = format!("{base}-{n}");
+        }
+        out.insert(name, class);
+    }
+    out
+}
+
+pub(crate) fn para_classes(st: &Styles) -> BTreeMap<&str, String> {
+    class_names(st.paragraph.iter().map(|s| s.name.as_str()))
+}
+
+pub(crate) fn char_classes(st: &Styles) -> BTreeMap<&str, String> {
+    class_names(st.character.iter().map(|s| s.name.as_str()))
+}
+
+fn hex(doc: &Document, swatch: &str, tint: f32) -> Option<String> {
+    let c = doc.resolve_color(swatch, tint)?;
+    let [r, g, b, _] = c.to_rgba8(1.0);
+    Some(format!("#{r:02x}{g:02x}{b:02x}"))
+}
+
+pub(crate) fn char_css(doc: &Document, c: &CharProps, base_size: f64, generics: &BTreeMap<String, String>, out: &mut String) {
+    let _ = write!(out, "font-family: \"{}\", {}; ", css_string(&c.font_family), generic_family(&c.font_family, generics));
+    // The face's own weight, so an embedded Semibold or Light face is the one chosen.
+    let (weight, style) = css_weight_style(&c.font_style);
+    let _ = write!(out, "font-weight: {weight}; font-style: {style}; ");
+    let _ = write!(out, "font-size: {:.3}em; ", c.size / base_size);
+    if c.tracking != 0.0 {
+        let _ = write!(out, "letter-spacing: {:.3}em; ", c.tracking / 1000.0);
+    }
+    match c.capitalization {
+        designcraft_doc::Capitalization::AllCaps => out.push_str("text-transform: uppercase; "),
+        designcraft_doc::Capitalization::SmallCaps | designcraft_doc::Capitalization::OpenTypeAllSmallCaps => {
+            out.push_str("font-variant: small-caps; ")
+        }
+        _ => {}
+    }
+    // One declaration: a later `text-decoration` would replace the earlier one.
+    match (c.underline, c.strikethrough) {
+        (true, true) => out.push_str("text-decoration: underline line-through; "),
+        (true, false) => out.push_str("text-decoration: underline; "),
+        (false, true) => out.push_str("text-decoration: line-through; "),
+        (false, false) => {}
+    }
+    if let Some(h) = hex(doc, &c.fill, c.fill_tint) {
+        let _ = write!(out, "color: {h}; ");
+    }
+}
+
+fn para_css(p: &ParaProps, base_size: f64, line_px: f64, out: &mut String) {
+    let align = match p.align {
+        Align::Left | Align::TowardsSpine => "left",
+        Align::Center => "center",
+        Align::Right | Align::AwayFromSpine => "right",
+        _ => "justify",
+    };
+    let _ = write!(out, "text-align: {align}; ");
+    let em = |v: f64| v / base_size;
+    let _ = write!(
+        out,
+        "margin: {:.3}em {:.3}em {:.3}em {:.3}em; text-indent: {:.3}em; line-height: {:.3}; ",
+        em(p.space_before),
+        em(p.right_indent),
+        em(p.space_after),
+        em(p.left_indent),
+        em(p.first_line_indent),
+        line_px
+    );
+    out.push_str(if p.hyphenate { "hyphens: auto; -webkit-hyphens: auto; " } else { "hyphens: manual; " });
+}
+
+/// The stylesheet for all paragraph and character styles.
+pub fn stylesheet(doc: &Document) -> String {
+    stylesheet_with(doc, &BTreeMap::new(), &[])
+}
+
+/// [`stylesheet`] with the generic families to fall back on and `@font-face` rules for the
+/// embedded fonts (packaged as [`font_file`] names them).
+pub(crate) fn stylesheet_with(doc: &Document, generics: &BTreeMap<String, String>, fonts: &[EmbeddedFont]) -> String {
+    let st: &Styles = &doc.styles;
+    let mut faces = String::new();
+    for (k, f) in fonts.iter().enumerate() {
+        let (path, _) = font_file(k, f);
+        let (weight, style) = css_weight_style(&f.style);
+        let _ = writeln!(
+            faces,
+            "@font-face {{ font-family: \"{}\"; src: url(\"{path}\"); font-weight: {weight}; font-style: {style}; }}",
+            css_string(&f.family)
+        );
+    }
+    let (_, basic) = st.resolve_para_style(story::BASIC_PARAGRAPH);
+    let base = basic.size.max(1.0);
+    let mut css = faces;
+    css.push_str(
+        "body { margin: 0 5%; font-size: 1em; }\nfigure { margin: 1em 0; text-align: center; }\nfigure img { max-width: 100%; }\nh1, h2, h3 { font-size: inherit; margin: 0; }\n",
+    );
+    let (pc, cc) = (para_classes(st), char_classes(st));
+    for ps in &st.paragraph {
+        if ps.name == designcraft_doc::NO_PARA_STYLE {
+            continue;
+        }
+        let (pp, cp) = st.resolve_para_style(&ps.name);
+        let lead = match cp.leading {
+            designcraft_doc::Leading::Auto => pp.auto_leading,
+            designcraft_doc::Leading::Points(v) => v / cp.size.max(1.0),
+        };
+        let mut rule = String::new();
+        para_css(&pp, base, lead, &mut rule);
+        char_css(doc, &cp, base, generics, &mut rule);
+        let (tag, class) = export_mapping(st, &ps.name, false, &pc);
+        if let Some(selector) = class_selector(tag, &class) {
+            let _ = writeln!(css, "{selector} {{ {rule}}}");
+        }
+    }
+    for cs in &st.character {
+        if cs.name == story::NO_CHAR_STYLE {
+            continue;
+        }
+        let mut rule = String::new();
+        let c = &cs.chars;
+        if let Some(f) = &c.font_style {
+            let f = f.to_lowercase();
+            if f.contains("bold") {
+                rule.push_str("font-weight: bold; ");
+            }
+            if f.contains("italic") {
+                rule.push_str("font-style: italic; ");
+            }
+        }
+        if let Some(fill) = &c.fill
+            && let Some(h) = hex(doc, fill, c.fill_tint.unwrap_or(1.0))
+        {
+            let _ = write!(rule, "color: {h}; ");
+        }
+        if let Some(sz) = c.size {
+            let _ = write!(rule, "font-size: {:.3}em; ", sz / base);
+        }
+        let (tag, class) = export_mapping(st, &cs.name, true, &cc);
+        if let Some(selector) = class_selector(tag, &class) {
+            let _ = writeln!(css, "{selector} {{ {rule}}}");
+        }
+    }
+    css
+}
+
+pub(crate) fn override_css(doc: &Document, o: &CharAttrs) -> String {
+    let mut s = String::new();
+    if let Some(f) = &o.font_style {
+        let f = f.to_lowercase();
+        if f.contains("bold") {
+            s.push_str("font-weight: bold; ");
+        }
+        if f.contains("italic") {
+            s.push_str("font-style: italic; ");
+        }
+    }
+    if let Some(fill) = &o.fill
+        && let Some(h) = hex(doc, fill, o.fill_tint.unwrap_or(1.0))
+    {
+        let _ = write!(s, "color: {h}; ");
+    }
+    if o.underline == Some(true) {
+        s.push_str("text-decoration: underline; ");
+    }
+    if o.capitalization == Some(designcraft_doc::Capitalization::AllCaps) {
+        s.push_str("text-transform: uppercase; ");
+    }
+    s.trim_end().to_string()
+}
+
+/// Elements Export Tagging may choose (paragraph or character level).
+fn is_tag(t: &str, character: bool) -> bool {
+    if character {
+        matches!(t, "span" | "em" | "strong" | "i" | "b" | "code" | "sup" | "sub" | "small" | "mark" | "cite" | "q")
+    } else {
+        matches!(t, "p" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "blockquote" | "pre" | "li" | "figcaption" | "aside" | "div")
+    }
+}
+
+/// Resolve Export Tagging once for both markup and its stylesheet. Keep the generated,
+/// collision-free class when no custom class was supplied, and the existing tag fallback.
+pub(crate) fn export_mapping<'a>(st: &'a Styles, name: &str, character: bool, classes: &BTreeMap<&str, String>) -> (&'a str, String) {
+    let et = st.export_tag(name, character);
+    let tag = et.map(|e| e.tag.as_str()).filter(|t| is_tag(t, character)).unwrap_or(if character { "span" } else { "p" });
+    let class = et.map(|e| e.class.clone()).filter(|c| !c.is_empty()).or_else(|| classes.get(name).cloned()).unwrap_or_else(|| slug(name));
+    // Match the characters xml_attr actually emits, before escaping either output context.
+    let class = class.chars().filter(|c| valid_xml_char(*c) && !('\u{E000}'..='\u{E1FF}').contains(c)).collect();
+    (tag, class)
+}
+
+/// Each class token must match on the same element. Escape CSS identifier punctuation and
+/// leading digits without changing the class written into XHTML.
+fn class_selector(tag: &str, class: &str) -> Option<String> {
+    let mut tokens = class.split_ascii_whitespace().peekable();
+    // A nonempty but whitespace-only custom class has no token to select. Never emit a bare
+    // element selector, which would apply this style to unrelated paragraphs or character runs.
+    tokens.peek()?;
+    let mut selector = tag.to_string();
+    for token in tokens {
+        selector.push('.');
+        for (i, c) in token.chars().enumerate() {
+            let leading_digit = c.is_ascii_digit() && (i == 0 || i == 1 && token.starts_with('-'));
+            if !leading_digit && token != "-" && (c.is_ascii_alphanumeric() || matches!(c, '-' | '_') || !c.is_ascii()) {
+                selector.push(c);
+            } else {
+                let _ = write!(selector, "\\{:x} ", c as u32);
+            }
+        }
+    }
+    Some(selector)
+}
diff --git a/crates/epub/src/fonts.rs b/crates/epub/src/fonts.rs
new file mode 100644
index 000000000..746781971
--- /dev/null
+++ b/crates/epub/src/fonts.rs
@@ -0,0 +1,83 @@
+use super::{BTreeMap, Document, Styles};
+
+/// A font file packaged with an EPUB: the face of `family` in `style` (`Bold Italic`…).
+#[derive(Clone, Debug)]
+pub struct EmbeddedFont {
+    pub family: String,
+    pub style: String,
+    pub data: Vec<u8>,
+}
+
+/// The `(family, style)` pairs the stylesheet names, one each, in style order: the fonts an
+/// export can embed.
+pub fn stylesheet_fonts(doc: &Document) -> Vec<(String, String)> {
+    let st: &Styles = &doc.styles;
+    let mut out: Vec<(String, String)> = Vec::new();
+    for ps in &st.paragraph {
+        if ps.name == designcraft_doc::NO_PARA_STYLE {
+            continue;
+        }
+        let (_, cp) = st.resolve_para_style(&ps.name);
+        let f = (cp.font_family.clone(), cp.font_style.clone());
+        if !f.0.is_empty() && !out.contains(&f) {
+            out.push(f);
+        }
+    }
+    out
+}
+
+/// The CSS generic family for `family`: the known one, else a guess from the name
+/// (`… Mono`/`Courier`/`… Code` → monospace, `… Sans`/`Gothic`/`Grotesk`/`Helvetica`/`Arial`/
+/// `Verdana` → sans-serif), else serif.
+pub(crate) fn generic_family<'a>(family: &str, known: &'a BTreeMap<String, String>) -> &'a str {
+    const GENERIC: [&str; 6] = ["serif", "sans-serif", "monospace", "cursive", "fantasy", "system-ui"];
+    if let Some(g) = known.get(family).and_then(|g| GENERIC.iter().find(|x| **x == g.as_str())) {
+        return g;
+    }
+    let f = family.to_lowercase();
+    let has = |words: &[&str]| words.iter().any(|w| f.contains(w));
+    if has(&["mono", "courier", " code", "consol"]) {
+        "monospace"
+    } else if has(&["sans", "gothic", "grotesk", "grotesque", "helvetica", "arial", "verdana"]) {
+        "sans-serif"
+    } else {
+        "serif"
+    }
+}
+
+/// CSS weight and style of a style name (`Semibold Italic` → 600, italic).
+pub(crate) fn css_weight_style(style: &str) -> (u16, &'static str) {
+    let s = style.to_lowercase().replace([' ', '-'], "");
+    let weight = [
+        ("thin", 100),
+        ("extralight", 200),
+        ("ultralight", 200),
+        ("light", 300),
+        ("medium", 500),
+        ("semibold", 600),
+        ("demibold", 600),
+        ("extrabold", 800),
+        ("ultrabold", 800),
+        ("bold", 700),
+        ("black", 900),
+        ("heavy", 900),
+    ]
+    .iter()
+    .find(|(n, _)| s.contains(n))
+    .map_or(400, |(_, w)| *w);
+    (weight, if s.contains("italic") || s.contains("oblique") { "italic" } else { "normal" })
+}
+
+/// Package path and media type of an embedded font (`fonts/{k}-{family}-{style}.{ext}`).
+pub(crate) fn font_file(k: usize, f: &EmbeddedFont) -> (String, &'static str) {
+    let (ext, mime) = match f.data.get(..4) {
+        Some(b"OTTO") => ("otf", "font/otf"),
+        Some(b"wOFF") => ("woff", "font/woff"),
+        Some(b"wOF2") => ("woff2", "font/woff2"),
+        _ => ("ttf", "font/ttf"),
+    };
+    let name: String =
+        format!("{}-{}", f.family, f.style).chars().map(|c| if c.is_ascii_alphanumeric() { c.to_ascii_lowercase() } else { '-' }).collect();
+    let name = name.split('-').filter(|p| !p.is_empty()).collect::<Vec<_>>().join("-");
+    (format!("fonts/{k}-{name}.{ext}"), mime)
+}
diff --git a/crates/epub/src/html.rs b/crates/epub/src/html.rs
new file mode 100644
index 000000000..ce9d7176c
--- /dev/null
+++ b/crates/epub/src/html.rs
@@ -0,0 +1,212 @@
+use super::chapters::toc_entries;
+use super::css::stylesheet_with;
+use super::markup::{language_tag, xml_attr, xml_text};
+use super::story_writer::StoryWriter;
+use super::*;
+
+/// Reading order of document content: (page, y, x) of each story's first frame and of graphics.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Block {
+    Story(StoryId),
+    Image(ItemId),
+}
+
+pub fn reading_order(doc: &Document) -> Vec<Block> {
+    // Articles, when there are any to export, decide the order (and what's included).
+    if doc.articles.iter().any(|a| a.export) {
+        let mut out = Vec::new();
+        let mut seen = Vec::new();
+        for a in doc.articles.iter().filter(|a| a.export) {
+            for id in &a.items {
+                let Some(top) = doc.item(*id) else { continue };
+                let mut push = |it: &Item| match &it.content {
+                    Content::Text(tf) if !seen.contains(&tf.story) => {
+                        seen.push(tf.story);
+                        out.push(Block::Story(tf.story));
+                    }
+                    Content::Graphic(_) => out.push(Block::Image(it.id)),
+                    _ => {}
+                };
+                top.walk(&mut |i| push(i));
+            }
+        }
+        return out;
+    }
+    let mut keyed: Vec<((usize, i64, i64), Block)> = Vec::new();
+    let mut seen_stories = Vec::new();
+    for (si, sp) in doc.spreads.iter().enumerate() {
+        let first = doc.first_page_of_spread(si);
+        // Preserve traversal order while carrying each group's transform to spread space.
+        // The iterator stack grows with nesting depth, without repeated document lookups.
+        let mut stack = vec![(sp.items.iter(), Affine::IDENTITY)];
+        while let Some((items, parent)) = stack.last_mut() {
+            let Some(it) = items.next() else {
+                stack.pop();
+                continue;
+            };
+            let xf = *parent * it.xf;
+            let children = it.children();
+            if !children.is_empty() {
+                stack.push((children.iter(), xf));
+            }
+            if it.hidden {
+                continue;
+            }
+            let block = match &it.content {
+                Content::Text(tf) => {
+                    let Some(story) = doc.story(tf.story) else { continue };
+                    // A story is placed where its first frame is.
+                    if story.frames.first() != Some(&it.id) || seen_stories.contains(&tf.story) || story.text.trim().is_empty() {
+                        continue;
+                    }
+                    seen_stories.push(tf.story);
+                    Block::Story(tf.story)
+                }
+                Content::Graphic(_) => Block::Image(it.id),
+                _ => continue,
+            };
+            // Transform the path once: rotating a local axis-aligned box again would
+            // enlarge it and give a different top-left from the actual spread geometry.
+            let b = it.path.transformed(xf).bounds().unwrap_or(Rect::ZERO);
+            let page = first + sp.page_at_x(b.center().x).unwrap_or(0);
+            let key = (page, (b.y0 * 10.0) as i64, (b.x0 * 10.0) as i64);
+            keyed.push((key, block));
+        }
+    }
+    let _ = SpreadRef::Doc(0);
+    keyed.sort_by_key(|(k, _)| *k);
+    keyed.into_iter().map(|(_, b)| b).collect()
+}
+
+/// Package path of an asset: `{dir}/{name}-{id}.{ext}`, the name from its original file name
+/// (lowercase ASCII, so the package stays readable) and the id keeping two assets of the same
+/// name apart.
+pub(crate) fn asset_path(dir: &str, a: &designcraft_doc::Asset, mime: &str) -> String {
+    let stem = a.name.rsplit(['/', '\\']).next().unwrap_or("");
+    let stem = stem.rsplit_once('.').map_or(stem, |(s, _)| s);
+    let name: String = stem.chars().map(|c| if c.is_ascii_alphanumeric() { c.to_ascii_lowercase() } else { '-' }).collect();
+    let name: String = name.split('-').filter(|p| !p.is_empty()).collect::<Vec<_>>().join("-").chars().take(40).collect();
+    if name.is_empty() { format!("{dir}/{}.{}", a.id.0, ext(mime)) } else { format!("{dir}/{name}-{}.{}", a.id.0, ext(mime)) }
+}
+
+fn ext(mime: &str) -> &'static str {
+    match mime {
+        "image/jpeg" => "jpg",
+        "image/gif" => "gif",
+        "image/webp" => "webp",
+        "image/svg+xml" => "svg",
+        "video/mp4" => "mp4",
+        "video/quicktime" => "mov",
+        "video/webm" => "webm",
+        "video/ogg" => "ogv",
+        "audio/mpeg" => "mp3",
+        "audio/mp4" => "m4a",
+        "audio/wav" => "wav",
+        "audio/ogg" => "ogg",
+        "audio/aac" => "aac",
+        _ => "png",
+    }
+}
+
+/// The document content as HTML, with the files it names.
+pub(crate) struct Body<'a> {
+    pub(crate) html: String,
+    /// Images, video and sound by package name: (media type, bytes).
+    pub(crate) images: BTreeMap<String, (&'a str, &'a [u8])>,
+    /// Table of contents: (element id, label, level).
+    pub(crate) toc: Vec<(String, String, u8)>,
+    /// Asset names of the images written without alt text.
+    no_alt: Vec<String>,
+}
+
+/// The content in reading order as HTML sections and figures; `img_src` names each image
+/// (a package path, or a data URI for single-file HTML).
+pub(crate) fn body_html<'a>(doc: &'a Document, epub: bool, split: Option<&EpubSplit>, img_src: &dyn Fn(&str, &str, &[u8]) -> String) -> Body<'a> {
+    let order = reading_order(doc);
+    let mut writer = StoryWriter::new(doc, epub, Some(img_src));
+    if let Some(split) = split {
+        writer.split = split.clone();
+    }
+    let mut body = String::new();
+    let mut toc = toc_entries(doc, &order);
+    for (k, b) in order.iter().enumerate() {
+        match b {
+            // The endnote frame's text is generated from the endnotes, which end the body as a
+            // linked section instead.
+            Block::Story(sid) if doc.endnote_story == Some(*sid) => {}
+            Block::Story(sid) => {
+                let anchor = format!("s{k}");
+                let _ = write!(body, "<section id=\"{anchor}\">\n{}</section>\n", writer.story(*sid, epub.then_some(anchor.as_str())));
+            }
+            Block::Image(iid) => {
+                let Some(it) = doc.item(*iid) else { continue };
+                let Some((markup, media)) = writer.graphic(it) else { continue };
+                if media {
+                    let _ = writeln!(body, "<figure>{markup}</figure>");
+                    continue;
+                }
+                // Object Export Options: alignment and a page break before.
+                let eo = &it.export_options;
+                let mut css = String::new();
+                if matches!(eo.align.as_str(), "left" | "center" | "right") {
+                    css.push_str(&format!("text-align:{};", eo.align));
+                }
+                if eo.page_break_before {
+                    css.push_str("page-break-before:always;break-before:page;");
+                }
+                let style = if css.is_empty() { String::new() } else { format!(" style=\"{}\"", xml_attr(&css)) };
+                let _ = writeln!(body, "<figure{style}>{markup}</figure>");
+            }
+        }
+    }
+    let endnotes = writer.endnotes_section();
+    if !endnotes.is_empty() {
+        let heading = &doc.endnote_options.heading;
+        if !heading.trim().is_empty() {
+            toc.push(("endnotes".into(), heading.clone(), 1));
+        }
+        body.push_str(&endnotes);
+    }
+    Body { html: body, images: writer.images, toc, no_alt: writer.no_alt }
+}
+
+/// Placed and anchored images (not video or sound) without alt text, by asset name: they are exported as
+/// decorative (`alt=""`), which an export can report.
+pub fn images_without_alt(doc: &Document) -> Vec<String> {
+    body_html(doc, true, None, &|name, _, _| name.to_string()).no_alt
+}
+
+/// Options for [`export_html`].
+#[derive(Clone, Debug, Default)]
+pub struct HtmlOptions {
+    pub title: Option<String>,
+    pub language: Option<String>,
+    /// Generic CSS family per font family (see [`EpubOptions::generic_families`]).
+    pub generic_families: BTreeMap<String, String>,
+}
+
+/// File › Export › HTML: one self-contained page (styles inline, images as data URIs) with the
+/// document's stories and graphics in reading order.
+pub fn export_html(doc: &Document, opts: &HtmlOptions) -> String {
+    let title = opts.title.clone().unwrap_or_else(|| doc.metadata_title().to_string());
+    let language = opts.language.as_deref().unwrap_or("en");
+    let lang = language_tag(language);
+    let body = body_html(doc, false, None, &|_, mime, data| format!("data:{mime};base64,{}", base64(data))).html;
+    format!(
+        "<!DOCTYPE html>\n<html lang=\"{lang}\">\n<head>\n<meta charset=\"utf-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<meta name=\"generator\" content=\"DesignCraft\">\n<title>{}</title>\n<style>\nbody {{ max-width: 40em; margin: 2em auto; padding: 0 1em; }}\nfigure {{ margin: 1em 0; }} figure img {{ max-width: 100%; height: auto; }}\n{}</style>\n</head>\n<body>\n{body}</body>\n</html>\n",
+        xml_text(&title),
+        stylesheet_with(doc, &opts.generic_families, &[])
+    )
+}
+
+pub(crate) fn base64(data: &[u8]) -> String {
+    const T: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    let mut out = String::with_capacity(data.len().div_ceil(3) * 4);
+    for c in data.chunks(3) {
+        let n = (c[0] as u32) << 16 | (*c.get(1).unwrap_or(&0) as u32) << 8 | *c.get(2).unwrap_or(&0) as u32;
+        for (i, shift) in [18, 12, 6, 0].into_iter().enumerate() {
+            out.push(if i <= c.len() { T[(n >> shift & 63) as usize] as char } else { '=' });
+        }
+    }
+    out
+}
diff --git a/crates/epub/src/lib.rs b/crates/epub/src/lib.rs
index 348b9c80e..c102a54fe 100644
--- a/crates/epub/src/lib.rs
+++ b/crates/epub/src/lib.rs
@@ -15,10 +15,35 @@ use std::io::Write;
 
 use designcraft_doc::geom::{Affine, Rect};
 use designcraft_doc::{
-    Align, AnchorPosition, AnchoredObject, CharAttrs, CharProps, Content, Document, ENDNOTE_REF, FOOTNOTE_REF, Item, ItemId, OBJECT_MARK, ParaProps,
-    SpreadRef, Story, StoryId, Styles, Table, story,
+    Align, AnchorPosition, AnchoredObject, CharAttrs, CharProps, Content, Document, ENDNOTE_REF, EpubSplit, FOOTNOTE_REF, Item, ItemId, OBJECT_MARK,
+    ParaProps, SpreadRef, Story, StoryId, Styles, Table, story,
 };
 
+mod chapters;
+mod css;
+mod fonts;
+mod html;
+mod markup;
+mod package;
+mod story_writer;
+
+#[cfg(test)]
+use chapters::{CHAPTER_MARK, link_across_chapters, nav_list, split_chapters};
+#[cfg(test)]
+use css::char_css;
+pub use css::stylesheet;
+pub use fonts::{EmbeddedFont, stylesheet_fonts};
+#[cfg(test)]
+use fonts::{css_weight_style, generic_family};
+#[cfg(test)]
+use html::base64;
+pub use html::{Block, HtmlOptions, export_html, images_without_alt, reading_order};
+pub use markup::{EpubError, slug};
+#[cfg(test)]
+use package::iso8601;
+pub use package::{FixedPage, contents_title, export_epub, export_fixed_epub};
+pub use story_writer::story_html;
+
 #[derive(Clone, Debug)]
 pub struct EpubOptions {
     pub title: Option<String>,
@@ -38,242 +63,8 @@ pub struct EpubOptions {
     pub modified: Option<i64>,
     /// Title of the navigation (table of contents); from `language` when absent.
     pub toc_title: Option<String>,
-}
-
-/// A font file packaged with an EPUB: the face of `family` in `style` (`Bold Italic`…).
-#[derive(Clone, Debug)]
-pub struct EmbeddedFont {
-    pub family: String,
-    pub style: String,
-    pub data: Vec<u8>,
-}
-
-/// The `(family, style)` pairs the stylesheet names, one each, in style order: the fonts an
-/// export can embed.
-pub fn stylesheet_fonts(doc: &Document) -> Vec<(String, String)> {
-    let st: &Styles = &doc.styles;
-    let mut out: Vec<(String, String)> = Vec::new();
-    for ps in &st.paragraph {
-        if ps.name == designcraft_doc::NO_PARA_STYLE {
-            continue;
-        }
-        let (_, cp) = st.resolve_para_style(&ps.name);
-        let f = (cp.font_family.clone(), cp.font_style.clone());
-        if !f.0.is_empty() && !out.contains(&f) {
-            out.push(f);
-        }
-    }
-    out
-}
-
-/// The CSS generic family for `family`: the known one, else a guess from the name
-/// (`… Mono`/`Courier`/`… Code` → monospace, `… Sans`/`Gothic`/`Grotesk`/`Helvetica`/`Arial`/
-/// `Verdana` → sans-serif), else serif.
-fn generic_family<'a>(family: &str, known: &'a BTreeMap<String, String>) -> &'a str {
-    const GENERIC: [&str; 6] = ["serif", "sans-serif", "monospace", "cursive", "fantasy", "system-ui"];
-    if let Some(g) = known.get(family).and_then(|g| GENERIC.iter().find(|x| **x == g.as_str())) {
-        return g;
-    }
-    let f = family.to_lowercase();
-    let has = |words: &[&str]| words.iter().any(|w| f.contains(w));
-    if has(&["mono", "courier", " code", "consol"]) {
-        "monospace"
-    } else if has(&["sans", "gothic", "grotesk", "grotesque", "helvetica", "arial", "verdana"]) {
-        "sans-serif"
-    } else {
-        "serif"
-    }
-}
-
-/// CSS weight and style of a style name (`Semibold Italic` → 600, italic).
-fn css_weight_style(style: &str) -> (u16, &'static str) {
-    let s = style.to_lowercase().replace([' ', '-'], "");
-    let weight = [
-        ("thin", 100),
-        ("extralight", 200),
-        ("ultralight", 200),
-        ("light", 300),
-        ("medium", 500),
-        ("semibold", 600),
-        ("demibold", 600),
-        ("extrabold", 800),
-        ("ultrabold", 800),
-        ("bold", 700),
-        ("black", 900),
-        ("heavy", 900),
-    ]
-    .iter()
-    .find(|(n, _)| s.contains(n))
-    .map_or(400, |(_, w)| *w);
-    (weight, if s.contains("italic") || s.contains("oblique") { "italic" } else { "normal" })
-}
-
-/// Package path and media type of an embedded font (`fonts/{k}-{family}-{style}.{ext}`).
-fn font_file(k: usize, f: &EmbeddedFont) -> (String, &'static str) {
-    let (ext, mime) = match f.data.get(..4) {
-        Some(b"OTTO") => ("otf", "font/otf"),
-        Some(b"wOFF") => ("woff", "font/woff"),
-        Some(b"wOF2") => ("woff2", "font/woff2"),
-        _ => ("ttf", "font/ttf"),
-    };
-    let name: String =
-        format!("{}-{}", f.family, f.style).chars().map(|c| if c.is_ascii_alphanumeric() { c.to_ascii_lowercase() } else { '-' }).collect();
-    let name = name.split('-').filter(|p| !p.is_empty()).collect::<Vec<_>>().join("-");
-    (format!("fonts/{k}-{name}.{ext}"), mime)
-}
-
-/// An ISO 8601 UTC timestamp (`2026-10-13T09:30:00Z`) for Unix seconds `t`.
-/// A time outside chrono's year range still converts: the calendar repeats every 400 years, so the
-/// instant is moved into range by whole cycles and only the year is carried (matches the old
-/// `civil_from_days`), rather than resetting to the epoch.
-fn iso8601(t: i64) -> String {
-    let (y, dt) = designcraft_doc::time::utc_parts(t, 0);
-    // `{:04}` rather than `%Y`, which writes a `+` before years past 9999.
-    format!("{y:04}-{}", dt.format("%m-%dT%H:%M:%SZ"))
-}
-
-/// The package's `dcterms:modified`: the given time, else the document's last save or creation.
-fn modified(doc: &Document, opts: &EpubOptions) -> String {
-    let t = opts.modified.or((doc.modified > 0).then_some(doc.modified)).or((doc.created > 0).then_some(doc.created));
-    t.map_or_else(|| "2026-01-01T00:00:00Z".to_string(), iso8601)
-}
-
-/// The book's identifier: the given one, else a `urn:uuid` derived from the title and the
-/// document's creation time, so a book keeps its identifier from export to export and two books
-/// with the same title don't share one.
-fn identifier(doc: &Document, opts: &EpubOptions, title: &str) -> String {
-    if let Some(id) = opts.identifier.clone().filter(|i| !i.trim().is_empty()) {
-        return id;
-    }
-    // Two FNV-1a 64-bit hashes (different offsets) as 128 bits, shaped as a version-5-style UUID.
-    let seed = format!("{title}\n{}", doc.created);
-    let fnv = |offset: u64| seed.bytes().fold(offset, |h, b| (h ^ u64::from(b)).wrapping_mul(0x0000_0100_0000_01b3));
-    let (a, b) = (fnv(0xcbf2_9ce4_8422_2325), fnv(0x84222325_cbf29ce4));
-    let hi = (a & 0xffff_ffff_ffff_0fff) | 0x5000;
-    let lo = (b & 0x3fff_ffff_ffff_ffff) | 0x8000_0000_0000_0000;
-    format!("urn:uuid:{:08x}-{:04x}-{:04x}-{:04x}-{:012x}", hi >> 32, (hi >> 16) & 0xffff, hi & 0xffff, lo >> 48, lo & 0xffff_ffff_ffff)
-}
-
-/// Package name and media type of a cover image: JPEG by its signature, else PNG.
-fn cover_file(data: &[u8]) -> (&'static str, &'static str) {
-    if data.starts_with(&[0xFF, 0xD8, 0xFF]) { ("images/cover.jpg", "image/jpeg") } else { ("images/cover.png", "image/png") }
-}
-
-/// The table of contents' title in `language` (a BCP 47 tag or a language name's code), English
-/// for languages without one here.
-pub fn contents_title(language: &str) -> &'static str {
-    let code = language.split(['-', '_']).next().unwrap_or("").to_ascii_lowercase();
-    match code.as_str() {
-        "nl" => "Inhoud",
-        "de" => "Inhalt",
-        "fr" => "Table des matières",
-        "es" | "pt" => "Índice",
-        "it" => "Indice",
-        "ja" => "目次",
-        "zh" => "目录",
-        _ => "Contents",
-    }
-}
-
-/// A page of a fixed-layout EPUB: its image (PNG), size in points and text (kept for search,
-/// read-aloud and accessibility).
-#[derive(Clone, Debug)]
-pub struct FixedPage {
-    pub png: Vec<u8>,
-    pub width: f64,
-    pub height: f64,
-    pub text: String,
-}
-
-/// A pre-paginated (fixed-layout) EPUB: one XHTML page per document page.
-pub fn export_fixed_epub(doc: &Document, pages: &[FixedPage], opts: &EpubOptions) -> Result<Vec<u8>, EpubError> {
-    let title = opts.title.clone().unwrap_or_else(|| doc.title.clone());
-    let lang = language_tag(&opts.language);
-    let id = identifier(doc, opts, &title);
-    let modified = modified(doc, opts);
-    let mut manifest = String::from("<item id=\"nav\" href=\"nav.xhtml\" media-type=\"application/xhtml+xml\" properties=\"nav\"/>\n");
-    let mut spine = String::new();
-    let mut files: Vec<(String, Vec<u8>)> = Vec::new();
-    let mut nav_items = String::new();
-    for (i, p) in pages.iter().enumerate() {
-        let n = i + 1;
-        let (w, h) = (p.width.round().max(1.0) as u32, p.height.round().max(1.0) as u32);
-        let xhtml = format!(
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"{lang}\" lang=\"{lang}\">\n<head><meta charset=\"utf-8\"/><meta name=\"viewport\" content=\"width={w}, height={h}\"/><title>{} — {n}</title>\n<style>body{{margin:0;width:{w}px;height:{h}px;position:relative}} img{{position:absolute;left:0;top:0;width:{w}px;height:{h}px}} .t{{position:absolute;left:0;top:0;width:{w}px;color:transparent;font-size:1px;overflow:hidden}}</style></head>\n<body><img src=\"pages/p{n}.png\" alt=\"\"/><div class=\"t\">{}</div></body>\n</html>\n",
-            xml_text(&title),
-            story_markup(&p.text).replace('\n', "<br/>")
-        );
-        let _ = writeln!(
-            manifest,
-            "<item id=\"page{n}\" href=\"page{n}.xhtml\" media-type=\"application/xhtml+xml\"/>\n<item id=\"pimg{n}\" href=\"pages/p{n}.png\" media-type=\"image/png\"{}/>",
-            if n == 1 { " properties=\"cover-image\"" } else { "" }
-        );
-        let _ = writeln!(spine, "<itemref idref=\"page{n}\"/>");
-        let _ = write!(nav_items, "<li><a href=\"page{n}.xhtml\">{n}</a></li>");
-        files.push((format!("OEBPS/page{n}.xhtml"), xhtml.into_bytes()));
-        files.push((format!("OEBPS/pages/p{n}.png"), p.png.clone()));
-    }
-    let (vw, vh) = pages.first().map_or((612, 792), |p| (p.width.round() as u32, p.height.round() as u32));
-    let nav = format!(
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\" xml:lang=\"{lang}\">\n<head><meta charset=\"utf-8\"/><title>{}</title></head>\n<body><nav epub:type=\"page-list\" id=\"toc\"><h1>Pages</h1><ol>{nav_items}</ol></nav></body>\n</html>\n",
-        xml_text(&title)
-    );
-    let rendition = format!(
-        "\n<meta property=\"rendition:layout\">pre-paginated</meta>\n<meta property=\"rendition:spread\">auto</meta>\n<meta name=\"original-resolution\" content=\"{vw}x{vh}\"/>"
-    );
-    let head = PackageHead { lang, id: &id, title: &title, author: opts.author.as_deref(), modified: &modified };
-    let opf = package_opf(&head, " prefix=\"rendition: http://www.idpf.org/vocab/rendition/#\"", &rendition, &manifest, &spine);
-    let entries = files.iter().map(|(name, data)| (name.clone(), data.as_slice(), name.ends_with(".png")));
-    write_package(&opf, &nav, entries)
-}
-
-/// The package metadata both EPUB flavours share.
-struct PackageHead<'a> {
-    lang: &'a str,
-    id: &'a str,
-    title: &'a str,
-    author: Option<&'a str>,
-    modified: &'a str,
-}
-
-/// The OPF package document. `prefix` goes on `<package>` (with its leading space), `meta` after
-/// `dcterms:modified` (with its leading newline); `manifest` and `spine` are the item lines.
-fn package_opf(h: &PackageHead, prefix: &str, meta: &str, manifest: &str, spine: &str) -> String {
-    let PackageHead { lang, id, title, author, modified } = h;
-    let author = author.map(|a| format!("<dc:creator>{}</dc:creator>", xml_text(a))).unwrap_or_default();
-    format!(
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<package xmlns=\"http://www.idpf.org/2007/opf\" version=\"3.0\" unique-identifier=\"bookid\" xml:lang=\"{lang}\"{prefix}>\n<metadata xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n<dc:identifier id=\"bookid\">{}</dc:identifier>\n<dc:title>{}</dc:title>\n<dc:language>{lang}</dc:language>{author}\n<meta property=\"dcterms:modified\">{modified}</meta>{meta}\n<meta name=\"generator\" content=\"DesignCraft\"/>\n</metadata>\n<manifest>\n{manifest}</manifest>\n<spine>\n{spine}</spine>\n</package>\n",
-        xml_text(id),
-        xml_text(title)
-    )
-}
-
-/// Zips an EPUB: the stored `mimetype`, `container.xml`, the OPF and nav, then `entries` in order
-/// as (path, bytes, stored uncompressed).
-fn write_package<'a>(opf: &str, nav: &str, entries: impl IntoIterator<Item = (String, &'a [u8], bool)>) -> Result<Vec<u8>, EpubError> {
-    let io = |e: std::io::Error| EpubError(e.to_string());
-    let zerr = |e: zip::result::ZipError| EpubError(e.to_string());
-    let container = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<container version=\"1.0\" xmlns=\"urn:oasis:names:tc:opendocument:xmlns:container\"><rootfiles><rootfile full-path=\"OEBPS/content.opf\" media-type=\"application/oebps-package+xml\"/></rootfiles></container>\n";
-    let mut buf = std::io::Cursor::new(Vec::new());
-    {
-        let mut z = zip::ZipWriter::new(&mut buf);
-        let stored = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
-        let deflate = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
-        z.start_file("mimetype", stored).map_err(zerr)?;
-        z.write_all(b"application/epub+zip").map_err(io)?;
-        for (name, data) in
-            [("META-INF/container.xml", container.as_bytes()), ("OEBPS/content.opf", opf.as_bytes()), ("OEBPS/nav.xhtml", nav.as_bytes())]
-        {
-            z.start_file(name, deflate).map_err(zerr)?;
-            z.write_all(data).map_err(io)?;
-        }
-        for (name, data, store) in entries {
-            z.start_file(name, if store { stored } else { deflate }).map_err(zerr)?;
-            z.write_all(data).map_err(io)?;
-        }
-        z.finish().map_err(zerr)?;
-    }
-    Ok(buf.into_inner())
+    /// Split Document: where content files start; the document's setting when absent.
+    pub split: Option<EpubSplit>,
 }
 
 impl Default for EpubOptions {
@@ -288,13 +79,11 @@ impl Default for EpubOptions {
             fonts: Vec::new(),
             modified: None,
             toc_title: None,
+            split: None,
         }
     }
 }
 
-#[derive(Debug)]
-pub struct EpubError(pub String);
-
 impl std::fmt::Display for EpubError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str(&self.0)
@@ -302,1933 +91,5 @@ impl std::fmt::Display for EpubError {
 }
 impl std::error::Error for EpubError {}
 
-fn valid_xml_char(c: char) -> bool {
-    matches!(c, '\u{9}' | '\u{A}' | '\u{D}' | '\u{20}'..='\u{D7FF}' | '\u{E000}'..='\u{FFFD}' | '\u{10000}'..='\u{10FFFF}')
-}
-
-fn escape_markup(s: &str, attr: bool, story_breaks: bool) -> String {
-    let mut o = String::with_capacity(s.len());
-    for c in s.chars() {
-        match c {
-            '&' => o.push_str("&amp;"),
-            '<' => o.push_str("&lt;"),
-            '>' => o.push_str("&gt;"),
-            '"' => o.push_str("&quot;"),
-            '\'' if attr => o.push_str("&apos;"),
-            '\u{E000}'..='\u{E1FF}' => {}
-            '\u{2028}' if story_breaks => o.push_str("<br/>"),
-            '\u{AD}' => o.push_str("&#173;"),
-            c if valid_xml_char(c) => o.push(c),
-            _ => {}
-        }
-    }
-    o
-}
-
-fn xml_text(s: &str) -> String {
-    escape_markup(s, false, false)
-}
-
-fn xml_attr(s: &str) -> String {
-    escape_markup(s, true, false)
-}
-
-/// Story content permits the document's discretionary line-separator marker to become markup.
-/// Other contexts always serialize it as ordinary text.
-fn story_markup(s: &str) -> String {
-    escape_markup(s, false, true)
-}
-
-/// A conservative BCP 47 subset suitable for both HTML and EPUB language attributes.
-fn language_tag(s: &str) -> &str {
-    if s.len() > 63 {
-        return "und";
-    }
-    let mut parts = s.split('-');
-    let Some(first) = parts.next() else { return "und" };
-    if !(2..=8).contains(&first.len()) || !first.bytes().all(|b| b.is_ascii_alphabetic()) {
-        return "und";
-    }
-    if parts.any(|p| p.is_empty() || p.len() > 8 || !p.bytes().all(|b| b.is_ascii_alphanumeric())) {
-        return "und";
-    }
-    s
-}
-
-/// Return a MIME type that is safe to place in an attribute and a data URL. Parameters are omitted
-/// because exported assets are always represented as their original binary bytes.
-fn safe_mime(mime: &str) -> &str {
-    fn token(s: &str) -> bool {
-        !s.is_empty() && s.bytes().all(|b| b.is_ascii_alphanumeric() || matches!(b, b'_' | b'.' | b'+' | b'-'))
-    }
-
-    let mime = mime.split_once(';').map_or(mime, |(essence, _)| essence).trim();
-    if mime.len() <= 127
-        && let Some((kind, subtype)) = mime.split_once('/')
-        && !subtype.contains('/')
-        && token(kind)
-        && token(subtype)
-    {
-        mime
-    } else {
-        "image/png"
-    }
-}
-
-/// Quote arbitrary document metadata as one CSS string token. Escaping `<` is important because
-/// HTML parses the contents of a `style` element before CSS parsing sees it.
-fn css_string(s: &str) -> String {
-    let mut out = String::with_capacity(s.len());
-    for c in s.chars() {
-        if matches!(c, '"' | '\\' | '<' | '>' | '&') || c.is_control() {
-            let _ = write!(out, "\\{:x} ", c as u32);
-        } else {
-            out.push(c);
-        }
-    }
-    out
-}
-
-/// CSS class name for a style name.
-pub fn slug(name: &str) -> String {
-    let s: String = name.chars().map(|c| if c.is_ascii_alphanumeric() { c.to_ascii_lowercase() } else { '-' }).collect();
-    let s = s.trim_matches('-').to_string();
-    if s.is_empty() {
-        "basic".into()
-    } else if s.starts_with(|c: char| c.is_ascii_digit()) {
-        format!("s-{s}")
-    } else {
-        s
-    }
-}
-
-/// Class names for `names`, in order: [`slug`]s made unique with a `-2`, `-3`… suffix, so styles
-/// whose names slug alike ("Body Text" / "Body-Text", or non-ASCII names) keep their own rules.
-fn class_names<'a>(names: impl Iterator<Item = &'a str>) -> BTreeMap<&'a str, String> {
-    let mut out = BTreeMap::new();
-    let mut used = std::collections::BTreeSet::new();
-    for name in names {
-        let base = slug(name);
-        let mut class = base.clone();
-        let mut n = 1;
-        while !used.insert(class.clone()) {
-            n += 1;
-            class = format!("{base}-{n}");
-        }
-        out.insert(name, class);
-    }
-    out
-}
-
-fn para_classes(st: &Styles) -> BTreeMap<&str, String> {
-    class_names(st.paragraph.iter().map(|s| s.name.as_str()))
-}
-
-fn char_classes(st: &Styles) -> BTreeMap<&str, String> {
-    class_names(st.character.iter().map(|s| s.name.as_str()))
-}
-
-fn hex(doc: &Document, swatch: &str, tint: f32) -> Option<String> {
-    let c = doc.resolve_color(swatch, tint)?;
-    let [r, g, b, _] = c.to_rgba8(1.0);
-    Some(format!("#{r:02x}{g:02x}{b:02x}"))
-}
-
-fn char_css(doc: &Document, c: &CharProps, base_size: f64, generics: &BTreeMap<String, String>, out: &mut String) {
-    let _ = write!(out, "font-family: \"{}\", {}; ", css_string(&c.font_family), generic_family(&c.font_family, generics));
-    // The face's own weight, so an embedded Semibold or Light face is the one chosen.
-    let (weight, style) = css_weight_style(&c.font_style);
-    let _ = write!(out, "font-weight: {weight}; font-style: {style}; ");
-    let _ = write!(out, "font-size: {:.3}em; ", c.size / base_size);
-    if c.tracking != 0.0 {
-        let _ = write!(out, "letter-spacing: {:.3}em; ", c.tracking / 1000.0);
-    }
-    match c.capitalization {
-        designcraft_doc::Capitalization::AllCaps => out.push_str("text-transform: uppercase; "),
-        designcraft_doc::Capitalization::SmallCaps | designcraft_doc::Capitalization::OpenTypeAllSmallCaps => {
-            out.push_str("font-variant: small-caps; ")
-        }
-        _ => {}
-    }
-    if c.underline {
-        out.push_str("text-decoration: underline; ");
-    }
-    if c.strikethrough {
-        out.push_str("text-decoration: line-through; ");
-    }
-    if let Some(h) = hex(doc, &c.fill, c.fill_tint) {
-        let _ = write!(out, "color: {h}; ");
-    }
-}
-
-fn para_css(p: &ParaProps, base_size: f64, line_px: f64, out: &mut String) {
-    let align = match p.align {
-        Align::Left | Align::TowardsSpine => "left",
-        Align::Center => "center",
-        Align::Right | Align::AwayFromSpine => "right",
-        _ => "justify",
-    };
-    let _ = write!(out, "text-align: {align}; ");
-    let em = |v: f64| v / base_size;
-    let _ = write!(
-        out,
-        "margin: {:.3}em {:.3}em {:.3}em {:.3}em; text-indent: {:.3}em; line-height: {:.3}; ",
-        em(p.space_before),
-        em(p.right_indent),
-        em(p.space_after),
-        em(p.left_indent),
-        em(p.first_line_indent),
-        line_px
-    );
-    out.push_str(if p.hyphenate { "hyphens: auto; -webkit-hyphens: auto; " } else { "hyphens: manual; " });
-}
-
-/// The stylesheet for all paragraph and character styles.
-pub fn stylesheet(doc: &Document) -> String {
-    stylesheet_with(doc, &BTreeMap::new(), &[])
-}
-
-/// [`stylesheet`] with the generic families to fall back on and `@font-face` rules for the
-/// embedded fonts (packaged as [`font_file`] names them).
-fn stylesheet_with(doc: &Document, generics: &BTreeMap<String, String>, fonts: &[EmbeddedFont]) -> String {
-    let st: &Styles = &doc.styles;
-    let mut faces = String::new();
-    for (k, f) in fonts.iter().enumerate() {
-        let (path, _) = font_file(k, f);
-        let (weight, style) = css_weight_style(&f.style);
-        let _ = writeln!(
-            faces,
-            "@font-face {{ font-family: \"{}\"; src: url(\"{path}\"); font-weight: {weight}; font-style: {style}; }}",
-            css_string(&f.family)
-        );
-    }
-    let (_, basic) = st.resolve_para_style(story::BASIC_PARAGRAPH);
-    let base = basic.size.max(1.0);
-    let mut css = faces;
-    css.push_str(
-        "body { margin: 0 5%; font-size: 1em; }\nfigure { margin: 1em 0; text-align: center; }\nfigure img { max-width: 100%; }\nh1, h2, h3 { font-size: inherit; margin: 0; }\n",
-    );
-    let (pc, cc) = (para_classes(st), char_classes(st));
-    for ps in &st.paragraph {
-        if ps.name == designcraft_doc::NO_PARA_STYLE {
-            continue;
-        }
-        let (pp, cp) = st.resolve_para_style(&ps.name);
-        let lead = match cp.leading {
-            designcraft_doc::Leading::Auto => pp.auto_leading,
-            designcraft_doc::Leading::Points(v) => v / cp.size.max(1.0),
-        };
-        let mut rule = String::new();
-        para_css(&pp, base, lead, &mut rule);
-        char_css(doc, &cp, base, generics, &mut rule);
-        let (tag, class) = export_mapping(st, &ps.name, false, &pc);
-        if let Some(selector) = class_selector(tag, &class) {
-            let _ = writeln!(css, "{selector} {{ {rule}}}");
-        }
-    }
-    for cs in &st.character {
-        if cs.name == story::NO_CHAR_STYLE {
-            continue;
-        }
-        let mut rule = String::new();
-        let c = &cs.chars;
-        if let Some(f) = &c.font_style {
-            let f = f.to_lowercase();
-            if f.contains("bold") {
-                rule.push_str("font-weight: bold; ");
-            }
-            if f.contains("italic") {
-                rule.push_str("font-style: italic; ");
-            }
-        }
-        if let Some(fill) = &c.fill
-            && let Some(h) = hex(doc, fill, c.fill_tint.unwrap_or(1.0))
-        {
-            let _ = write!(rule, "color: {h}; ");
-        }
-        if let Some(sz) = c.size {
-            let _ = write!(rule, "font-size: {:.3}em; ", sz / base);
-        }
-        let (tag, class) = export_mapping(st, &cs.name, true, &cc);
-        if let Some(selector) = class_selector(tag, &class) {
-            let _ = writeln!(css, "{selector} {{ {rule}}}");
-        }
-    }
-    css
-}
-
-fn override_css(doc: &Document, o: &CharAttrs) -> String {
-    let mut s = String::new();
-    if let Some(f) = &o.font_style {
-        let f = f.to_lowercase();
-        if f.contains("bold") {
-            s.push_str("font-weight: bold; ");
-        }
-        if f.contains("italic") {
-            s.push_str("font-style: italic; ");
-        }
-    }
-    if let Some(fill) = &o.fill
-        && let Some(h) = hex(doc, fill, o.fill_tint.unwrap_or(1.0))
-    {
-        let _ = write!(s, "color: {h}; ");
-    }
-    if o.underline == Some(true) {
-        s.push_str("text-decoration: underline; ");
-    }
-    if o.capitalization == Some(designcraft_doc::Capitalization::AllCaps) {
-        s.push_str("text-transform: uppercase; ");
-    }
-    s.trim_end().to_string()
-}
-
-/// Elements Export Tagging may choose (paragraph or character level).
-fn is_tag(t: &str, character: bool) -> bool {
-    if character {
-        matches!(t, "span" | "em" | "strong" | "i" | "b" | "code" | "sup" | "sub" | "small" | "mark" | "cite" | "q")
-    } else {
-        matches!(t, "p" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "blockquote" | "pre" | "li" | "figcaption" | "aside" | "div")
-    }
-}
-
-/// Resolve Export Tagging once for both markup and its stylesheet. Keep the generated,
-/// collision-free class when no custom class was supplied, and the existing tag fallback.
-fn export_mapping<'a>(st: &'a Styles, name: &str, character: bool, classes: &BTreeMap<&str, String>) -> (&'a str, String) {
-    let et = st.export_tag(name, character);
-    let tag = et.map(|e| e.tag.as_str()).filter(|t| is_tag(t, character)).unwrap_or(if character { "span" } else { "p" });
-    let class = et.map(|e| e.class.clone()).filter(|c| !c.is_empty()).or_else(|| classes.get(name).cloned()).unwrap_or_else(|| slug(name));
-    // Match the characters xml_attr actually emits, before escaping either output context.
-    let class = class.chars().filter(|c| valid_xml_char(*c) && !('\u{E000}'..='\u{E1FF}').contains(c)).collect();
-    (tag, class)
-}
-
-/// Each class token must match on the same element. Escape CSS identifier punctuation and
-/// leading digits without changing the class written into XHTML.
-fn class_selector(tag: &str, class: &str) -> Option<String> {
-    let mut tokens = class.split_ascii_whitespace().peekable();
-    // A nonempty but whitespace-only custom class has no token to select. Never emit a bare
-    // element selector, which would apply this style to unrelated paragraphs or character runs.
-    tokens.peek()?;
-    let mut selector = tag.to_string();
-    for token in tokens {
-        selector.push('.');
-        for (i, c) in token.chars().enumerate() {
-            let leading_digit = c.is_ascii_digit() && (i == 0 || i == 1 && token.starts_with('-'));
-            if !leading_digit && token != "-" && (c.is_ascii_alphanumeric() || matches!(c, '-' | '_') || !c.is_ascii()) {
-                selector.push(c);
-            } else {
-                let _ = write!(selector, "\\{:x} ", c as u32);
-            }
-        }
-    }
-    Some(selector)
-}
-
-/// Closes the open list, if any.
-fn close_list(list: &mut Option<&str>, out: &mut String) {
-    if let Some(l) = list.take() {
-        let _ = writeln!(out, "</{}>", l.split(' ').next().unwrap_or(l));
-    }
-}
-
-/// Closes the open preformatted block and list, if any.
-fn close_blocks(list: &mut Option<&str>, pre: &mut Option<(String, bool)>, out: &mut String) {
-    if pre.take().is_some() {
-        out.push_str("</pre>\n");
-    }
-    close_list(list, out);
-}
-
-/// Nesting limit for stories inside stories (table cells, footnotes, tables in cells), so a deeply
-/// nested or cyclic document can't recurse without bound.
-const MAX_DEPTH: usize = 8;
-
-/// Writes stories with their tables and notes, numbering notes across the stories of one export.
-struct StoryWriter<'a, 'f> {
-    doc: &'a Document,
-    pc: BTreeMap<&'a str, String>,
-    cc: BTreeMap<&'a str, String>,
-    /// EPUB structural semantics (`epub:type`); plain HTML doesn't declare the namespace.
-    epub: bool,
-    /// Notes written so far, for unique element ids.
-    footnote_ids: u32,
-    endnote_ids: u32,
-    /// Number shown on the next footnote and endnote of the current story.
-    next_footnote: u32,
-    next_endnote: u32,
-    /// Endnotes met so far: (number, list item markup).
-    endnotes: Vec<(u32, String)>,
-    /// Names each packaged file (a package path, or a data URI for single-file HTML). Without
-    /// it, anchored objects are left out.
-    img_src: Option<&'f dyn Fn(&str, &str, &[u8]) -> String>,
-    /// Images, video and sound met so far, by package name.
-    images: BTreeMap<String, (&'a str, &'a [u8])>,
-    /// Asset names of the images written without alt text (decorative).
-    no_alt: Vec<String>,
-    /// Prefix of the `id`s the current story's headings get (`{prefix}-p{paragraph index}`, the
-    /// targets of the table of contents); only top-level paragraphs get one.
-    heading_ids: Option<String>,
-}
-
-impl<'a, 'f> StoryWriter<'a, 'f> {
-    fn new(doc: &'a Document, epub: bool, img_src: Option<&'f dyn Fn(&str, &str, &[u8]) -> String>) -> Self {
-        StoryWriter {
-            doc,
-            pc: para_classes(&doc.styles),
-            cc: char_classes(&doc.styles),
-            epub,
-            footnote_ids: 0,
-            endnote_ids: 0,
-            next_footnote: 1,
-            next_endnote: 1,
-            endnotes: Vec::new(),
-            img_src,
-            images: BTreeMap::new(),
-            no_alt: Vec::new(),
-            heading_ids: None,
-        }
-    }
-
-    fn epub_type(&self, t: &str) -> String {
-        if self.epub { format!(" epub:type=\"{t}\"") } else { String::new() }
-    }
-
-    /// One document story: paragraphs, tables, and each footnote after the paragraph that refers
-    /// to it.
-    fn story(&mut self, sid: StoryId, heading_ids: Option<&str>) -> String {
-        let Some(st) = self.doc.story(sid) else { return String::new() };
-        self.heading_ids = heading_ids.map(str::to_string);
-        self.next_footnote = self.doc.footnote_start(sid);
-        self.next_endnote = self.doc.endnote_start(sid);
-        let mut out = String::new();
-        self.paragraphs(st, 0, "", &mut out);
-        out
-    }
-
-    /// `st`'s paragraphs. `lead` (a note's number) starts the first paragraph.
-    ///
-    /// Consecutive `li` paragraphs share one list (`ol` for a numbered style, `ul` for a bulleted
-    /// one, an unmarked `ul` when the style has no list type of its own, e.g. typed bullets), and
-    /// consecutive `pre` paragraphs of one style one block, their lines separated by newlines.
-    fn paragraphs(&mut self, st: &Story, depth: usize, lead: &str, out: &mut String) {
-        let doc = self.doc;
-        let mut lead = lead;
-        let mut list: Option<&str> = None;
-        let mut pre: Option<(String, bool)> = None;
-        for (pi, (r, pf)) in st.para_ranges().into_iter().zip(&st.paras).enumerate() {
-            let Some(text) = st.text.get(r.clone()) else { continue };
-            let table = pf.table.and_then(|id| st.tables.get(&id)).filter(|_| text.contains(story::TABLE_ANCHOR));
-            let only_table = table.is_some() && text.chars().all(|c| c == story::TABLE_ANCHOR || c.is_whitespace());
-            if !only_table || !lead.is_empty() {
-                // Export Tagging: the style's element and class.
-                let (tag, class) = export_mapping(&doc.styles, &pf.style, false, &self.pc);
-                let props = doc.styles.resolve_para(pf).0;
-                let rtl = props.direction == designcraft_doc::TextDirection::RightToLeft;
-                let continues_pre = tag == "pre" && pre.as_ref() == Some(&(class.clone(), rtl));
-                if !continues_pre && pre.take().is_some() {
-                    out.push_str("</pre>\n");
-                }
-                let list_tag = (tag == "li").then_some(match props.list_type {
-                    designcraft_doc::ListType::Numbers => "ol",
-                    designcraft_doc::ListType::Bullets => "ul",
-                    designcraft_doc::ListType::None => "ul style=\"list-style:none\"",
-                });
-                if list != list_tag {
-                    close_list(&mut list, out);
-                    if let Some(l) = list_tag {
-                        let _ = writeln!(out, "<{l}>");
-                    }
-                    list = list_tag;
-                }
-                // An EPUB chapter file starts before each top-level h1, outside any open list or
-                // preformatted block.
-                if depth == 0 && self.heading_ids.is_some() && heading_level(tag) == Some(1) {
-                    out.push_str(CHAPTER_MARK);
-                }
-                if continues_pre {
-                    out.push('\n');
-                } else {
-                    let id = match &self.heading_ids {
-                        Some(prefix) if depth == 0 && heading_level(tag).is_some() => format!(" id=\"{prefix}-p{pi}\""),
-                        _ => String::new(),
-                    };
-                    let _ = write!(out, "<{tag}{id} class=\"{}\"{}>", xml_attr(&class), if rtl { " dir=\"rtl\"" } else { "" });
-                }
-                out.push_str(lead);
-                if lead.is_empty() && text.trim().is_empty() {
-                    out.push_str("&#160;");
-                }
-                lead = "";
-                let mut after = String::new();
-                if !only_table {
-                    self.runs(st, r, depth, out, &mut after);
-                }
-                if tag == "pre" {
-                    // Closed when the next paragraph isn't a line of the same block.
-                    pre = Some((class, rtl));
-                } else {
-                    let _ = writeln!(out, "</{tag}>");
-                }
-                // Footnotes follow the paragraph outside any list or preformatted block.
-                if !after.is_empty() {
-                    close_blocks(&mut list, &mut pre, out);
-                    out.push_str(&after);
-                }
-            }
-            if let Some(t) = table
-                && depth < MAX_DEPTH
-            {
-                close_blocks(&mut list, &mut pre, out);
-                self.table(t, depth + 1, out);
-            }
-        }
-        close_blocks(&mut list, &mut pre, out);
-    }
-
-    /// The markup for one run's text `raw` (starting at byte `a` of the story): anchored objects
-    /// and notes where their marks are.
-    fn run_markup(&mut self, st: &Story, raw: &str, a: usize, depth: usize, after: &mut String) -> String {
-        let doc = self.doc;
-        let mut t = String::new();
-        let mut seg_start = 0;
-        // Index of the next anchored object: marks count from the story start, as
-        // `Story::object_at` counts them (counted once, at the run's first mark).
-        let mut mark: Option<usize> = None;
-        for (i, c) in raw.char_indices() {
-            if c != FOOTNOTE_REF && c != ENDNOTE_REF && c != OBJECT_MARK {
-                continue;
-            }
-            t.push_str(&run_text(doc, raw.get(seg_start..i).unwrap_or_default()));
-            seg_start = i + c.len_utf8();
-            if c == OBJECT_MARK {
-                let k = mark.unwrap_or_else(|| st.text.get(..a).map_or(0, |t| t.matches(OBJECT_MARK).count()));
-                mark = Some(k.saturating_add(1));
-                if let Some(o) = st.objects.get(k) {
-                    t.push_str(&self.object(o));
-                }
-            } else if depth < MAX_DEPTH {
-                if c == FOOTNOTE_REF {
-                    self.footnote(st, a + i, depth, &mut t, after);
-                } else {
-                    self.endnote(st, a + i, depth, &mut t);
-                }
-            }
-        }
-        t.push_str(&run_text(doc, raw.get(seg_start..).unwrap_or_default()));
-        t
-    }
-
-    /// The runs of paragraph `para` of `st`; footnotes go to `after`.
-    fn runs(&mut self, st: &Story, para: std::ops::Range<usize>, depth: usize, out: &mut String, after: &mut String) {
-        let doc = self.doc;
-        for (rr, f) in st.runs() {
-            let a = rr.start.max(para.start);
-            let b = rr.end.min(para.end);
-            if a >= b {
-                continue;
-            }
-            // Hidden conditional text isn't exported.
-            if f.over.conditions.as_deref().is_some_and(|c| doc.conditions_hide(c)) || f.over.change == Some(designcraft_doc::ChangeMark::Deleted) {
-                continue;
-            }
-            let Some(raw) = st.text.get(a..b) else { continue };
-            let t = self.run_markup(st, raw, a, depth, after);
-            let (ctag, cls) = if f.style != story::NO_CHAR_STYLE {
-                let (tag, class) = export_mapping(&doc.styles, &f.style, true, &self.cc);
-                (tag, format!(" class=\"{}\"", xml_attr(&class)))
-            } else {
-                ("span", String::new())
-            };
-            let style = override_css(doc, &f.over);
-            let style_attr = if style.is_empty() { String::new() } else { format!(" style=\"{}\"", xml_attr(&style)) };
-            if cls.is_empty() && style_attr.is_empty() {
-                out.push_str(&t);
-            } else {
-                let _ = write!(out, "<{ctag}{cls}{style_attr}>{t}</{ctag}>");
-            }
-        }
-    }
-
-    /// An anchored object where it is anchored: its graphics in the text, an above-line object as
-    /// a block of its own. Anchored text frames are left out.
-    fn object(&mut self, o: &AnchoredObject) -> String {
-        let mut out = String::new();
-        o.item.walk(&mut |it| {
-            if let Some((markup, _)) = self.graphic(it) {
-                out.push_str(&markup);
-            }
-        });
-        match &o.position {
-            AnchorPosition::AboveLine { align, .. } if !out.is_empty() => {
-                let align = match align {
-                    designcraft_doc::anchored::AnchorAlign::Left => "left",
-                    designcraft_doc::anchored::AnchorAlign::Center => "center",
-                    designcraft_doc::anchored::AnchorAlign::Right => "right",
-                };
-                format!("<span class=\"anchored\" style=\"display:block;text-align:{align}\">{out}</span>")
-            }
-            _ => out,
-        }
-    }
-
-    /// The markup for one graphic item: an `<img>`, or an HTML5 player for video and sound (with
-    /// `true`), its file registered in `images`. `None` for an item that isn't a graphic, whose
-    /// asset has no data, or when the writer names no files.
-    fn graphic(&mut self, it: &Item) -> Option<(String, bool)> {
-        let img_src = self.img_src?;
-        let doc = self.doc;
-        let Content::Graphic(g) = &it.content else { return None };
-        let a = doc.assets.get(&g.asset)?;
-        if a.data.is_empty() {
-            return None;
-        }
-        let mime = safe_mime(&a.mime);
-        // Video and sound: an HTML5 player (with the poster, when there is one).
-        if let Some(kind) = designcraft_doc::media_kind(mime) {
-            let name = asset_path("media", a, mime);
-            self.images.insert(name.clone(), (mime, a.data.as_slice()));
-            let m = it.media.clone().unwrap_or_default();
-            let mut attrs = String::new();
-            for (on, attr) in [(m.controls, " controls=\"controls\""), (m.play_on_page_load, " autoplay=\"autoplay\""), (m.looping, " loop=\"loop\"")]
-            {
-                if on {
-                    attrs.push_str(attr);
-                }
-            }
-            if let Some(pa) = m.poster.and_then(|p| doc.assets.get(&p)) {
-                let poster_mime = safe_mime(&pa.mime);
-                let pn = asset_path("images", pa, poster_mime);
-                self.images.insert(pn.clone(), (poster_mime, pa.data.as_slice()));
-                if kind == "video" {
-                    attrs.push_str(&format!(" poster=\"{}\"", xml_attr(&img_src(&pn, poster_mime, &pa.data))));
-                }
-            }
-            let markup = format!("<{kind} src=\"{}\"{attrs}>{}</{kind}>", xml_attr(&img_src(&name, mime, &a.data)), xml_text(&a.name));
-            return Some((markup, true));
-        }
-        let name = asset_path("images", a, mime);
-        self.images.insert(name.clone(), (mime, a.data.as_slice()));
-        // Alt text from Object Export Options; without one the image counts as decorative
-        // (`alt=""`): a file name read aloud helps nobody.
-        if it.alt_text.trim().is_empty() {
-            self.no_alt.push(a.name.clone());
-        }
-        Some((format!("<img src=\"{}\" alt=\"{}\"/>", xml_attr(&img_src(&name, mime, &a.data)), xml_attr(&it.alt_text)), false))
-    }
-
-    /// The footnote whose reference is at byte `pos` of `st`: a note reference in `out`, the note
-    /// itself in `after`.
-    fn footnote(&mut self, st: &Story, pos: usize, depth: usize, out: &mut String, after: &mut String) {
-        let Some(note) = st.notes.get(st.notes_before(pos)) else { return };
-        let doc = self.doc;
-        let o = &doc.footnote_options;
-        let n = self.next_footnote;
-        self.next_footnote = n.saturating_add(1);
-        self.footnote_ids = self.footnote_ids.saturating_add(1);
-        let id = self.footnote_ids;
-        let _ = write!(
-            out,
-            "<sup><a{} role=\"doc-noteref\" id=\"fnref-{id}\" href=\"#fn-{id}\">{}</a></sup>",
-            self.epub_type("noteref"),
-            xml_text(&o.label(n, false))
-        );
-        let lead = format!("<a href=\"#fnref-{id}\">{}</a> ", xml_text(&o.label(n, true)));
-        let mut body = String::new();
-        self.paragraphs(&note.text, depth + 1, &lead, &mut body);
-        let _ = write!(after, "<aside{} role=\"doc-footnote\" id=\"fn-{id}\">\n{body}</aside>\n", self.epub_type("footnote"));
-    }
-
-    /// The endnote whose reference is at byte `pos` of `st`: a note reference in `out`; the note
-    /// joins the endnotes section.
-    fn endnote(&mut self, st: &Story, pos: usize, depth: usize, out: &mut String) {
-        let Some(note) = st.endnotes.get(st.endnotes_before(pos)) else { return };
-        let n = self.next_endnote;
-        self.next_endnote = n.saturating_add(1);
-        self.endnote_ids = self.endnote_ids.saturating_add(1);
-        let id = self.endnote_ids;
-        let label = xml_text(&self.doc.endnote_options.label(n));
-        let _ = write!(out, "<sup><a{} role=\"doc-noteref\" id=\"enref-{id}\" href=\"#en-{id}\">{label}</a></sup>", self.epub_type("noteref"));
-        let mut body = String::new();
-        self.paragraphs(&note.text, depth + 1, &format!("<a href=\"#enref-{id}\">{label}</a> "), &mut body);
-        let item = format!("<li{} id=\"en-{id}\">\n{body}</li>\n", self.epub_type("endnote"));
-        self.endnotes.push((n, item));
-    }
-
-    /// The endnotes met so far, in number order, as one section (empty when there are none).
-    fn endnotes_section(&mut self) -> String {
-        if self.endnotes.is_empty() {
-            return String::new();
-        }
-        self.endnotes.sort_by_key(|(n, _)| *n);
-        let doc = self.doc;
-        let o = &doc.endnote_options;
-        let mut out = format!("<section{} role=\"doc-endnotes\" id=\"endnotes\">\n", self.epub_type("endnotes"));
-        if !o.heading.trim().is_empty() {
-            let (tag, class) = export_mapping(&doc.styles, &o.heading_style, false, &self.pc);
-            let _ = writeln!(out, "<{tag} class=\"{}\">{}</{tag}>", xml_attr(&class), xml_text(&o.heading));
-        }
-        out.push_str("<ol style=\"list-style: none; padding-left: 0\">\n");
-        for (_, item) in &self.endnotes {
-            out.push_str(item);
-        }
-        out.push_str("</ol>\n</section>\n");
-        out
-    }
-
-    /// A table: header rows as `thead`, footer rows as `tfoot`, merged cells as row and column
-    /// spans (kept within their row group).
-    fn table(&mut self, t: &Table, depth: usize, out: &mut String) {
-        let (nr, nc) = (t.nrows(), t.ncols());
-        if nr.checked_mul(nc) != Some(t.cells.len()) {
-            return;
-        }
-        let (h, f) = (t.header_rows(), t.footer_rows());
-        let body_end = nr.saturating_sub(f).max(h);
-        let mut covered = vec![false; t.cells.len()];
-        out.push_str("<table>\n");
-        for (rows, group, cell_tag) in [(0..h, "thead", "th"), (h..body_end, "tbody", "td"), (body_end..nr, "tfoot", "td")] {
-            if rows.is_empty() {
-                continue;
-            }
-            let _ = writeln!(out, "<{group}>");
-            for r in rows.clone() {
-                out.push_str("<tr>");
-                for c in 0..nc {
-                    let i = r * nc + c;
-                    if covered.get(i).copied().unwrap_or(true) {
-                        continue;
-                    }
-                    let Some(cell) = t.cells.get(i) else { continue };
-                    let rs = (cell.row_span.max(1) as usize).min(rows.end - r);
-                    let cs = (cell.col_span.max(1) as usize).min(nc - c);
-                    for rr in r..r + rs {
-                        for cc in c..c + cs {
-                            if let Some(slot) = covered.get_mut(rr * nc + cc) {
-                                *slot = true;
-                            }
-                        }
-                    }
-                    let _ = write!(out, "<{cell_tag}");
-                    if rs > 1 {
-                        let _ = write!(out, " rowspan=\"{rs}\"");
-                    }
-                    if cs > 1 {
-                        let _ = write!(out, " colspan=\"{cs}\"");
-                    }
-                    out.push('>');
-                    self.paragraphs(&cell.text, depth, "", out);
-                    let _ = writeln!(out, "</{cell_tag}>");
-                }
-                out.push_str("</tr>\n");
-            }
-            let _ = writeln!(out, "</{group}>");
-        }
-        out.push_str("</table>\n");
-    }
-}
-
-/// Run text with variables replaced by their values.
-fn run_text(doc: &Document, raw: &str) -> String {
-    if raw.chars().any(|c| designcraft_doc::vars::var_index(c).is_some()) {
-        let sub: String = raw
-            .chars()
-            .map(|c| match designcraft_doc::vars::var_index(c) {
-                Some(i) => doc.variable_value(i, None).unwrap_or_default(),
-                None => c.to_string(),
-            })
-            .collect();
-        story_markup(&sub)
-    } else {
-        story_markup(raw)
-    }
-}
-
-/// One story as XHTML: paragraphs, tables, and each footnote after the paragraph that refers to
-/// it. Endnote references link to the endnotes section that the full export ends with.
-pub fn story_html(doc: &Document, sid: StoryId) -> String {
-    StoryWriter::new(doc, true, None).story(sid, None)
-}
-
-/// Where the EPUB body splits into chapter files: before each `h1`.
-const CHAPTER_MARK: &str = "<!--dc:chapter-->";
-
-/// The body split at its [`CHAPTER_MARK`]s into chapter bodies, each with its sections closed
-/// and the one a split goes through reopened in the next; a part with nothing but the start of a
-/// section (a story that opens with its `h1`) moves that start into the next part.
-fn split_chapters(body: &str) -> Vec<String> {
-    let mut out: Vec<String> = Vec::new();
-    let mut carry: Option<String> = None;
-    for piece in body.split(CHAPTER_MARK) {
-        let mut part = carry.take().unwrap_or_default();
-        part.push_str(piece);
-        if let Some(open) = part.rfind("<section").filter(|i| !part[*i..].contains("</section>")) {
-            let tag_end = part[open..].find('>').map_or(part.len(), |e| open + e + 1);
-            if part[tag_end..].trim().is_empty() {
-                carry = Some(part[open..].to_string());
-                part.truncate(open);
-            } else {
-                part.push_str("</section>\n");
-                carry = Some("<section>\n".to_string());
-            }
-        }
-        if !part.trim().is_empty() {
-            out.push(part);
-        }
-    }
-    if let Some(rest) = carry.filter(|c| !c.trim().is_empty())
-        && let Some(last) = out.last_mut()
-    {
-        // Only an opening tag can be left over; close it where it stands.
-        last.push_str(&rest);
-        last.push_str("</section>\n");
-    }
-    if out.is_empty() {
-        out.push(String::new());
-    }
-    out
-}
-
-/// `chapter` (the file `own`) with each in-document link (`href="#id"`) to an element in another
-/// chapter file pointed at that file.
-fn link_across_chapters(chapter: &str, own: &str, files: &BTreeMap<String, String>) -> String {
-    const HREF: &str = "href=\"#";
-    let mut out = String::with_capacity(chapter.len());
-    let mut rest = chapter;
-    while let Some(i) = rest.find(HREF) {
-        out.push_str(rest.get(..i).unwrap_or_default());
-        let tail = rest.get(i + HREF.len()..).unwrap_or_default();
-        let id = tail.split('"').next().unwrap_or_default();
-        match files.get(id) {
-            Some(file) if file != own => {
-                let _ = write!(out, "href=\"{file}#");
-            }
-            _ => out.push_str(HREF),
-        }
-        rest = tail;
-    }
-    out.push_str(rest);
-    out
-}
-
-/// The package file of chapter `k` (0-based): `content.xhtml`, then `content2.xhtml`, ….
-fn chapter_file(k: usize) -> String {
-    if k == 0 { "content.xhtml".to_string() } else { format!("content{}.xhtml", k + 1) }
-}
-
-/// The level of a heading element (`h1` → 1 … `h6` → 6).
-fn heading_level(tag: &str) -> Option<u8> {
-    tag.strip_prefix('h').and_then(|n| n.parse::<u8>().ok()).filter(|n| (1..=6).contains(n))
-}
-
-/// Table of contents entries (target, label, level): the `h1`–`h3` paragraphs of the stories in
-/// reading order, or, in a document without headings, each story's first paragraph (level 1).
-fn toc_entries(doc: &Document, order: &[Block]) -> Vec<(String, String, u8)> {
-    let pc = para_classes(&doc.styles);
-    let label = |t: &str| -> String { t.chars().filter(|c| !('\u{E000}'..='\u{E0FF}').contains(c)).take(80).collect::<String>().trim().to_string() };
-    let mut headings = Vec::new();
-    let mut firsts = Vec::new();
-    for (k, b) in order.iter().enumerate() {
-        let Block::Story(sid) = b else { continue };
-        // The endnote story isn't written (the endnotes section stands in for it).
-        if doc.endnote_story == Some(*sid) {
-            continue;
-        }
-        let Some(st) = doc.story(*sid) else { continue };
-        let first = label(st.text.split('\n').next().unwrap_or(""));
-        if !first.is_empty() {
-            firsts.push((format!("s{k}"), first, 1));
-        }
-        for (pi, r) in st.para_ranges().iter().enumerate() {
-            let Some(pf) = st.paras.get(pi) else { continue };
-            let (tag, _) = export_mapping(&doc.styles, &pf.style, false, &pc);
-            let Some(level) = heading_level(tag).filter(|l| *l <= 3) else { continue };
-            let text = label(st.text.get(r.clone()).unwrap_or(""));
-            if !text.is_empty() {
-                headings.push((format!("s{k}-p{pi}"), text, level));
-            }
-        }
-    }
-    if headings.is_empty() { firsts } else { headings }
-}
-
-/// The table of contents as nested `li`/`ol` items (the content of the navigation's outer
-/// `ol`): a deeper level goes into the previous item, skipped levels count as one.
-fn nav_list(entries: &[(String, String, u8)], files: &BTreeMap<String, String>) -> String {
-    let mut out = String::new();
-    let mut open: Vec<u8> = Vec::new();
-    for (target, label, level) in entries {
-        let file = files.get(target).map_or("content.xhtml", String::as_str);
-        let item = format!("<li><a href=\"{file}#{target}\">{}</a>", xml_text(label));
-        match open.last().copied() {
-            None => open.push(*level),
-            Some(top) if *level > top => {
-                out.push_str("<ol>");
-                open.push(*level);
-            }
-            Some(_) => {
-                // Close the levels whose parent is as deep as this entry or deeper.
-                while open.len() > 1 && open.len().checked_sub(2).and_then(|i| open.get(i)).is_some_and(|parent| *parent >= *level) {
-                    open.pop();
-                    out.push_str("</li></ol>");
-                }
-                out.push_str("</li>");
-                if let Some(t) = open.last_mut() {
-                    *t = (*t).min(*level);
-                }
-            }
-        }
-        out.push_str(&item);
-    }
-    for i in (0..open.len()).rev() {
-        out.push_str("</li>");
-        if i > 0 {
-            out.push_str("</ol>");
-        }
-    }
-    out
-}
-
-/// Reading order of document content: (page, y, x) of each story's first frame and of graphics.
-#[derive(Debug, Clone, PartialEq)]
-pub enum Block {
-    Story(StoryId),
-    Image(ItemId),
-}
-
-pub fn reading_order(doc: &Document) -> Vec<Block> {
-    // Articles, when there are any to export, decide the order (and what's included).
-    if doc.articles.iter().any(|a| a.export) {
-        let mut out = Vec::new();
-        let mut seen = Vec::new();
-        for a in doc.articles.iter().filter(|a| a.export) {
-            for id in &a.items {
-                let Some(top) = doc.item(*id) else { continue };
-                let mut push = |it: &Item| match &it.content {
-                    Content::Text(tf) if !seen.contains(&tf.story) => {
-                        seen.push(tf.story);
-                        out.push(Block::Story(tf.story));
-                    }
-                    Content::Graphic(_) => out.push(Block::Image(it.id)),
-                    _ => {}
-                };
-                top.walk(&mut |i| push(i));
-            }
-        }
-        return out;
-    }
-    let mut keyed: Vec<((usize, i64, i64), Block)> = Vec::new();
-    let mut seen_stories = Vec::new();
-    for (si, sp) in doc.spreads.iter().enumerate() {
-        let first = doc.first_page_of_spread(si);
-        // Preserve traversal order while carrying each group's transform to spread space.
-        // The iterator stack grows with nesting depth, without repeated document lookups.
-        let mut stack = vec![(sp.items.iter(), Affine::IDENTITY)];
-        while let Some((items, parent)) = stack.last_mut() {
-            let Some(it) = items.next() else {
-                stack.pop();
-                continue;
-            };
-            let xf = *parent * it.xf;
-            let children = it.children();
-            if !children.is_empty() {
-                stack.push((children.iter(), xf));
-            }
-            if it.hidden {
-                continue;
-            }
-            let block = match &it.content {
-                Content::Text(tf) => {
-                    let Some(story) = doc.story(tf.story) else { continue };
-                    // A story is placed where its first frame is.
-                    if story.frames.first() != Some(&it.id) || seen_stories.contains(&tf.story) || story.text.trim().is_empty() {
-                        continue;
-                    }
-                    seen_stories.push(tf.story);
-                    Block::Story(tf.story)
-                }
-                Content::Graphic(_) => Block::Image(it.id),
-                _ => continue,
-            };
-            // Transform the path once: rotating a local axis-aligned box again would
-            // enlarge it and give a different top-left from the actual spread geometry.
-            let b = it.path.transformed(xf).bounds().unwrap_or(Rect::ZERO);
-            let page = first + sp.page_at_x(b.center().x).unwrap_or(0);
-            let key = (page, (b.y0 * 10.0) as i64, (b.x0 * 10.0) as i64);
-            keyed.push((key, block));
-        }
-    }
-    let _ = SpreadRef::Doc(0);
-    keyed.sort_by_key(|(k, _)| *k);
-    keyed.into_iter().map(|(_, b)| b).collect()
-}
-
-/// Package path of an asset: `{dir}/{name}-{id}.{ext}`, the name from its original file name
-/// (lowercase ASCII, so the package stays readable) and the id keeping two assets of the same
-/// name apart.
-fn asset_path(dir: &str, a: &designcraft_doc::Asset, mime: &str) -> String {
-    let stem = a.name.rsplit(['/', '\\']).next().unwrap_or("");
-    let stem = stem.rsplit_once('.').map_or(stem, |(s, _)| s);
-    let name: String = stem.chars().map(|c| if c.is_ascii_alphanumeric() { c.to_ascii_lowercase() } else { '-' }).collect();
-    let name: String = name.split('-').filter(|p| !p.is_empty()).collect::<Vec<_>>().join("-").chars().take(40).collect();
-    if name.is_empty() { format!("{dir}/{}.{}", a.id.0, ext(mime)) } else { format!("{dir}/{name}-{}.{}", a.id.0, ext(mime)) }
-}
-
-fn ext(mime: &str) -> &'static str {
-    match mime {
-        "image/jpeg" => "jpg",
-        "image/gif" => "gif",
-        "image/webp" => "webp",
-        "image/svg+xml" => "svg",
-        "video/mp4" => "mp4",
-        "video/quicktime" => "mov",
-        "video/webm" => "webm",
-        "video/ogg" => "ogv",
-        "audio/mpeg" => "mp3",
-        "audio/mp4" => "m4a",
-        "audio/wav" => "wav",
-        "audio/ogg" => "ogg",
-        "audio/aac" => "aac",
-        _ => "png",
-    }
-}
-
-/// The document content as HTML, with the files it names.
-struct Body<'a> {
-    html: String,
-    /// Images, video and sound by package name: (media type, bytes).
-    images: BTreeMap<String, (&'a str, &'a [u8])>,
-    /// Table of contents: (element id, label, level).
-    toc: Vec<(String, String, u8)>,
-    /// Asset names of the images written without alt text.
-    no_alt: Vec<String>,
-}
-
-/// The content in reading order as HTML sections and figures; `img_src` names each image
-/// (a package path, or a data URI for single-file HTML).
-fn body_html<'a>(doc: &'a Document, epub: bool, img_src: &dyn Fn(&str, &str, &[u8]) -> String) -> Body<'a> {
-    let order = reading_order(doc);
-    let mut writer = StoryWriter::new(doc, epub, Some(img_src));
-    let mut body = String::new();
-    let mut toc = toc_entries(doc, &order);
-    for (k, b) in order.iter().enumerate() {
-        match b {
-            // The endnote frame's text is generated from the endnotes, which end the body as a
-            // linked section instead.
-            Block::Story(sid) if doc.endnote_story == Some(*sid) => {}
-            Block::Story(sid) => {
-                let anchor = format!("s{k}");
-                let _ = write!(body, "<section id=\"{anchor}\">\n{}</section>\n", writer.story(*sid, epub.then_some(anchor.as_str())));
-            }
-            Block::Image(iid) => {
-                let Some(it) = doc.item(*iid) else { continue };
-                let Some((markup, media)) = writer.graphic(it) else { continue };
-                if media {
-                    let _ = writeln!(body, "<figure>{markup}</figure>");
-                    continue;
-                }
-                // Object Export Options: alignment and a page break before.
-                let eo = &it.export_options;
-                let mut css = String::new();
-                if matches!(eo.align.as_str(), "left" | "center" | "right") {
-                    css.push_str(&format!("text-align:{};", eo.align));
-                }
-                if eo.page_break_before {
-                    css.push_str("page-break-before:always;break-before:page;");
-                }
-                let style = if css.is_empty() { String::new() } else { format!(" style=\"{}\"", xml_attr(&css)) };
-                let _ = writeln!(body, "<figure{style}>{markup}</figure>");
-            }
-        }
-    }
-    let endnotes = writer.endnotes_section();
-    if !endnotes.is_empty() {
-        let heading = &doc.endnote_options.heading;
-        if !heading.trim().is_empty() {
-            toc.push(("endnotes".into(), heading.clone(), 1));
-        }
-        body.push_str(&endnotes);
-    }
-    Body { html: body, images: writer.images, toc, no_alt: writer.no_alt }
-}
-
-/// Placed and anchored images (not video or sound) without alt text, by asset name: they are exported as
-/// decorative (`alt=""`), which an export can report.
-pub fn images_without_alt(doc: &Document) -> Vec<String> {
-    body_html(doc, true, &|name, _, _| name.to_string()).no_alt
-}
-
-/// Options for [`export_html`].
-#[derive(Clone, Debug, Default)]
-pub struct HtmlOptions {
-    pub title: Option<String>,
-    pub language: Option<String>,
-    /// Generic CSS family per font family (see [`EpubOptions::generic_families`]).
-    pub generic_families: BTreeMap<String, String>,
-}
-
-/// File › Export › HTML: one self-contained page (styles inline, images as data URIs) with the
-/// document's stories and graphics in reading order.
-pub fn export_html(doc: &Document, opts: &HtmlOptions) -> String {
-    let title = opts.title.clone().unwrap_or_else(|| doc.title.clone());
-    let language = opts.language.as_deref().unwrap_or("en");
-    let lang = language_tag(language);
-    let body = body_html(doc, false, &|_, mime, data| format!("data:{mime};base64,{}", base64(data))).html;
-    format!(
-        "<!DOCTYPE html>\n<html lang=\"{lang}\">\n<head>\n<meta charset=\"utf-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<meta name=\"generator\" content=\"DesignCraft\">\n<title>{}</title>\n<style>\nbody {{ max-width: 40em; margin: 2em auto; padding: 0 1em; }}\nfigure {{ margin: 1em 0; }} figure img {{ max-width: 100%; height: auto; }}\n{}</style>\n</head>\n<body>\n{body}</body>\n</html>\n",
-        xml_text(&title),
-        stylesheet_with(doc, &opts.generic_families, &[])
-    )
-}
-
-fn base64(data: &[u8]) -> String {
-    const T: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-    let mut out = String::with_capacity(data.len().div_ceil(3) * 4);
-    for c in data.chunks(3) {
-        let n = (c[0] as u32) << 16 | (*c.get(1).unwrap_or(&0) as u32) << 8 | *c.get(2).unwrap_or(&0) as u32;
-        for (i, shift) in [18, 12, 6, 0].into_iter().enumerate() {
-            out.push(if i <= c.len() { T[(n >> shift & 63) as usize] as char } else { '=' });
-        }
-    }
-    out
-}
-
-/// Export the document as a reflowable EPUB 3.
-pub fn export_epub(doc: &Document, opts: &EpubOptions) -> Result<Vec<u8>, EpubError> {
-    let title = opts.title.clone().unwrap_or_else(|| doc.title.clone());
-    let id = identifier(doc, opts, &title);
-    let modified = modified(doc, opts);
-    let Body { html: body, images, toc, .. } = body_html(doc, true, &|name, _, _| name.to_string());
-    let lang = language_tag(&opts.language);
-    // One file per chapter (split before each h1), so e-readers needn't load the whole book.
-    let chapters: Vec<String> = split_chapters(&body)
-        .into_iter()
-        .map(|part| {
-            format!(
-                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\" xml:lang=\"{lang}\" lang=\"{lang}\">\n<head><meta charset=\"utf-8\"/><title>{}</title><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"/></head>\n<body>\n{part}</body>\n</html>\n",
-                xml_text(&title)
-            )
-        })
-        .collect();
-    // The file each navigation target (an element id) ended up in.
-    let mut files: BTreeMap<String, String> = BTreeMap::new();
-    for (k, c) in chapters.iter().enumerate() {
-        for rest in c.split(" id=\"").skip(1) {
-            if let Some(id) = rest.split('"').next() {
-                files.entry(id.to_string()).or_insert_with(|| chapter_file(k));
-            }
-        }
-    }
-    // Note links whose target ended up in another file (endnotes end the book) point at it.
-    let chapters: Vec<String> = chapters.iter().enumerate().map(|(k, c)| link_across_chapters(c, &chapter_file(k), &files)).collect();
-    let mut nav_items = nav_list(&toc, &files);
-    if nav_items.is_empty() {
-        nav_items = format!("<li><a href=\"content.xhtml\">{}</a></li>", xml_text(&title));
-    }
-    let nav = format!(
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\" xml:lang=\"{lang}\">\n<head><meta charset=\"utf-8\"/><title>{}</title></head>\n<body><nav epub:type=\"toc\" id=\"toc\"><h1>{}</h1><ol>{nav_items}</ol></nav></body>\n</html>\n",
-        xml_text(&title),
-        xml_text(opts.toc_title.as_deref().filter(|t| !t.trim().is_empty()).unwrap_or(contents_title(&opts.language)))
-    );
-    let mut manifest = String::from(
-        "<item id=\"nav\" href=\"nav.xhtml\" media-type=\"application/xhtml+xml\" properties=\"nav\"/>\n<item id=\"css\" href=\"style.css\" media-type=\"text/css\"/>\n",
-    );
-    let mut spine = String::new();
-    for k in 0..chapters.len() {
-        let item = if k == 0 { "content".to_string() } else { format!("content{}", k + 1) };
-        let _ = writeln!(manifest, "<item id=\"{item}\" href=\"{}\" media-type=\"application/xhtml+xml\"/>", chapter_file(k));
-        let _ = writeln!(spine, "<itemref idref=\"{item}\"/>");
-    }
-    for (k, (name, (mime, _))) in images.iter().enumerate() {
-        let _ = writeln!(manifest, "<item id=\"img{k}\" href=\"{}\" media-type=\"{}\"/>", xml_attr(name), xml_attr(mime));
-    }
-    for (k, f) in opts.fonts.iter().enumerate() {
-        let (name, mime) = font_file(k, f);
-        let _ = writeln!(manifest, "<item id=\"font{k}\" href=\"{}\" media-type=\"{mime}\"/>", xml_attr(&name));
-    }
-    // Cover: an image page first in reading order.
-    if let Some(c) = &opts.cover {
-        let (name, mime) = cover_file(c);
-        let _ = writeln!(
-            manifest,
-            "<item id=\"cover-img\" href=\"{name}\" media-type=\"{mime}\" properties=\"cover-image\"/>\n<item id=\"cover\" href=\"cover.xhtml\" media-type=\"application/xhtml+xml\"/>"
-        );
-    }
-    let cover_spine = if opts.cover.is_some() { "<itemref idref=\"cover\"/>\n" } else { "" };
-    let head = PackageHead { lang, id: &id, title: &title, author: opts.author.as_deref(), modified: &modified };
-    let opf = package_opf(&head, "", "", &manifest, &format!("{cover_spine}{spine}"));
-    let css = stylesheet_with(doc, &opts.generic_families, &opts.fonts);
-    let mut entries: Vec<(String, &[u8], bool)> = vec![("OEBPS/style.css".into(), css.as_bytes(), false)];
-    entries.extend(chapters.iter().enumerate().map(|(k, c)| (format!("OEBPS/{}", chapter_file(k)), c.as_bytes(), false)));
-    entries.extend(images.iter().map(|(name, (_, data))| (format!("OEBPS/{name}"), *data, true)));
-    entries.extend(opts.fonts.iter().enumerate().map(|(k, f)| (format!("OEBPS/{}", font_file(k, f).0), f.data.as_slice(), false)));
-    let cover_xhtml = opts.cover.as_ref().map(|c| {
-        format!(
-            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\" xml:lang=\"{lang}\">\n<head><meta charset=\"utf-8\"/><title>{}</title><style>body{{margin:0;text-align:center}} img{{max-width:100%;max-height:100vh}}</style></head>\n<body epub:type=\"cover\"><img src=\"{}\" alt=\"{}\"/></body>\n</html>\n",
-            xml_text(&title),
-            cover_file(c).0,
-            xml_attr(&title)
-        )
-    });
-    if let (Some(c), Some(xhtml)) = (&opts.cover, &cover_xhtml) {
-        entries.push((format!("OEBPS/{}", cover_file(c).0), c.as_slice(), true));
-        entries.push(("OEBPS/cover.xhtml".into(), xhtml.as_bytes(), false));
-    }
-    write_package(&opf, &nav, entries)
-}
-
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use designcraft_doc::build::NewDocument;
-    use designcraft_doc::geom::{Affine, Rect, shapes};
-    use designcraft_doc::{Asset, AssetId, Content, Graphic, Item, ItemId, ParaFormat, Shape, SpreadRef, Story, StoryId, Table};
-    use std::io::Read;
-    use std::sync::Arc;
-
-    #[test]
-    fn exports_valid_package_in_reading_order() {
-        let mut d = Document::new(&NewDocument { pages: 2, ..Default::default() });
-        let lid = d.default_layer();
-        d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 400.0, 300.0, 500.0), lid, "Second <b> & co", ParaFormat::default()).unwrap();
-        d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "First\nline two", ParaFormat::default()).unwrap();
-        let bytes = export_epub(&d, &EpubOptions::default()).unwrap();
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
-        assert_eq!(z.by_index(0).unwrap().name(), "mimetype");
-        let mut html = String::new();
-        z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut html).unwrap();
-        let a = html.find("First").unwrap();
-        let b = html.find("Second &lt;b&gt; &amp; co").unwrap();
-        assert!(a < b, "reading order");
-        assert!(html.contains("<p class=\"basic-paragraph\">"));
-        let mut css = String::new();
-        z.by_name("OEBPS/style.css").unwrap().read_to_string(&mut css).unwrap();
-        assert!(css.contains("p.basic-paragraph"));
-        assert!(z.by_name("OEBPS/nav.xhtml").is_ok());
-    }
-
-    /// #766: anchored graphics are exported where they are anchored (inline in the text, an
-    /// above-line object as a block of its own), and their images go into the package.
-    #[test]
-    fn anchored_objects_are_exported_in_place() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 200.0), lid, "AB\nCD", ParaFormat::default()).unwrap();
-        let aid = AssetId(d.alloc());
-        d.assets.insert(
-            aid,
-            Arc::new(Asset {
-                page: 0,
-                id: aid,
-                name: "dot.png".into(),
-                mime: "image/png".into(),
-                link: None,
-                data: Arc::new(vec![7]),
-                pixels: Some((1, 1)),
-                ..Default::default()
-            }),
-        );
-        let graphic = |d: &mut Document, alt: &str| {
-            let mut item = Item::new(ItemId(d.alloc()), lid, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)));
-            item.alt_text = alt.into();
-            item.content = Content::Graphic(Graphic {
-                asset: aid,
-                size: (1.0, 1.0),
-                xf: Affine::IDENTITY,
-                auto_fit: Default::default(),
-                fit_align: 4,
-                crop: [0.0; 4],
-                clip: None,
-                wrap: Default::default(),
-                fill: Default::default(),
-            });
-            item
-        };
-        let inline = designcraft_doc::AnchoredObject::new(graphic(&mut d, "inline"), designcraft_doc::AnchorPosition::Inline { y_offset: 0.0 });
-        let above = designcraft_doc::AnchoredObject::new(
-            graphic(&mut d, "above"),
-            designcraft_doc::AnchorPosition::AboveLine { align: designcraft_doc::anchored::AnchorAlign::Center, space_before: 0.0, space_after: 0.0 },
-        );
-        let st = d.story_mut(sid).unwrap();
-        st.insert_object(1, inline);
-        // Byte offsets: "A" (1), the mark (3), "B\nC" (3): the second object goes between C and D.
-        st.insert_object(7, above);
-        // An anchored image without alt text is decorative and reported, like a placed one.
-        let bare = designcraft_doc::AnchoredObject::new(graphic(&mut d, ""), designcraft_doc::AnchorPosition::Inline { y_offset: 0.0 });
-        let end = d.story(sid).unwrap().text.len();
-        d.story_mut(sid).unwrap().insert_object(end, bare);
-        assert_eq!(images_without_alt(&d), vec!["dot.png".to_string()]);
-        let bytes = export_epub(&d, &EpubOptions::default()).unwrap();
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
-        let mut html = String::new();
-        z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut html).unwrap();
-        let img = |alt: &str| format!("<img src=\"images/dot-{}.png\" alt=\"{alt}\"/>", aid.0);
-        assert!(html.contains(&format!("A{}B</p>", img("inline"))), "{html}");
-        assert!(html.contains(&format!("C<span class=\"anchored\" style=\"display:block;text-align:center\">{}</span>D", img("above"))), "{html}");
-        assert!(z.by_name(&format!("OEBPS/images/dot-{}.png", aid.0)).is_ok(), "the image is in the package");
-        let page = export_html(&d, &HtmlOptions::default());
-        assert!(page.contains("alt=\"inline\"") && page.contains("alt=\"above\""), "{page}");
-        // story_html on its own still leaves objects out.
-        assert!(!story_html(&d, sid).contains("<img"));
-    }
-
-    #[test]
-    fn iso8601_timestamps() {
-        for (t, want) in [
-            (0, "1970-01-01T00:00:00Z"),
-            (951_782_400, "2000-02-29T00:00:00Z"),
-            (1_791_891_000, "2026-10-13T11:30:00Z"),
-            (-86_400, "1969-12-31T00:00:00Z"),
-            // Years past 9999 keep the plain zero-padded year (no `+`).
-            (253_402_300_800, "10000-01-01T00:00:00Z"),
-            // Beyond chrono's range the old `civil_from_days` still converted; pin that output
-            // (never the epoch) in both directions and at the `i64` extremes.
-            (10_000_000_000_000, "318857-05-20T17:46:40Z"),
-            (-10_000_000_000_000, "-314918-08-13T06:13:20Z"),
-            (i64::MAX, "292277026596-12-04T15:30:07Z"),
-            (i64::MIN, "-292277022657-01-27T08:29:52Z"),
-        ] {
-            assert_eq!(iso8601(t), want);
-        }
-    }
-
-    /// #771, #773: dcterms:modified is a real time, the default identifier is a stable urn:uuid
-    /// that differs between documents with the same title, and a JPEG cover keeps its type.
-    #[test]
-    fn package_metadata_and_cover_image() {
-        let opf = |d: &Document, opts: &EpubOptions| {
-            let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(d, opts).unwrap())).unwrap();
-            let mut s = String::new();
-            z.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut s).unwrap();
-            let names: Vec<String> = z.file_names().map(str::to_string).collect();
-            (s, names)
-        };
-        let id_of = |opf: &str| opf.split("<dc:identifier id=\"bookid\">").nth(1).and_then(|r| r.split('<').next()).unwrap_or_default().to_string();
-        let mut a = Document::new(&NewDocument::default());
-        a.title = "Same".into();
-        a.created = 1_700_000_000;
-        let mut b = a.clone();
-        b.created = 1_700_000_001;
-        let (oa, _) = opf(&a, &EpubOptions::default());
-        let (oa2, _) = opf(&a, &EpubOptions::default());
-        let (ob, _) = opf(&b, &EpubOptions::default());
-        assert!(id_of(&oa).starts_with("urn:uuid:") && id_of(&oa).len() == 45, "{}", id_of(&oa));
-        assert_eq!(id_of(&oa), id_of(&oa2), "stable from export to export");
-        assert_ne!(id_of(&oa), id_of(&ob), "not shared by two books with the same title");
-        // Modified: the given time, else the document's save (or creation) time.
-        assert!(oa.contains("<meta property=\"dcterms:modified\">2023-11-14T22:13:20Z</meta>"), "{oa}");
-        let at = EpubOptions { modified: Some(1_791_891_000), ..Default::default() };
-        assert!(opf(&a, &at).0.contains("2026-10-13T11:30:00Z"));
-        // A JPEG cover is packaged as such.
-        let jpeg = EpubOptions { cover: Some(vec![0xFF, 0xD8, 0xFF, 0xE0, 1, 2]), ..Default::default() };
-        let (o, names) = opf(&a, &jpeg);
-        assert!(o.contains("href=\"images/cover.jpg\" media-type=\"image/jpeg\" properties=\"cover-image\""), "{o}");
-        assert!(names.contains(&"OEBPS/images/cover.jpg".to_string()), "{names:?}");
-    }
-
-    fn st_typed(d: &mut Document, sid: StoryId) {
-        if let Some(st) = d.story_mut(sid) {
-            st.paras[8].style = "Typed".into();
-        }
-    }
-
-    /// #767: consecutive `li` paragraphs share one list (`ol` for a numbered style), and
-    /// consecutive `pre` paragraphs of one style one block with their lines on separate lines.
-    #[test]
-    fn lists_and_preformatted_blocks_are_grouped() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        for (name, tag, list) in [
-            ("Bullet", "li", Some(designcraft_doc::ListType::Bullets)),
-            ("Number", "li", Some(designcraft_doc::ListType::Numbers)),
-            ("Typed", "li", None),
-            ("Code", "pre", None),
-        ] {
-            let para = designcraft_doc::ParaAttrs { list_type: list, ..Default::default() };
-            d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
-                name: name.into(),
-                based_on: None,
-                next_style: None,
-                para,
-                chars: CharAttrs::default(),
-                shortcut: String::new(),
-            });
-            d.styles_mut().export_tags.insert(format!("p:{name}"), designcraft_doc::ExportTag { tag: tag.into(), class: String::new() });
-        }
-        let text = "Intro\nfirst\nsecond\none\ntwo\nx = 1\ny = 2\nEnd\n• typed";
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 300.0), lid, text, ParaFormat::default()).unwrap();
-        let st = d.story_mut(sid).unwrap();
-        for (i, style) in ["Bullet", "Bullet", "Number", "Number", "Code", "Code"].into_iter().enumerate() {
-            st.paras[i + 1].style = style.into();
-        }
-        let html = story_html(&d, sid);
-        let li = |c: &str, t: &str| format!("<li class=\"{c}\">{t}</li>");
-        assert!(
-            html.contains(&format!(
-                "<ul>\n{}\n{}\n</ul>\n<ol>\n{}\n{}\n</ol>\n",
-                li("bullet", "first"),
-                li("bullet", "second"),
-                li("number", "one"),
-                li("number", "two")
-            )),
-            "{html}"
-        );
-        assert!(html.contains("<pre class=\"code\">x = 1\ny = 2</pre>\n<p class=\"basic-paragraph\">End</p>"), "{html}");
-        assert_eq!(html.matches("<pre").count(), 1, "{html}");
-        // A style without a list type of its own (typed bullets) gets no second marker.
-        st_typed(&mut d, sid);
-        let html = story_html(&d, sid);
-        assert!(html.contains("<ul style=\"list-style:none\">\n<li class=\"typed\">• typed</li>\n</ul>\n"), "{html}");
-    }
-
-    /// #769, #770: the navigation lists the h1–h3 headings (nested by level) and links to them,
-    /// with its title in the book's language; without headings, each story's first paragraph.
-    #[test]
-    fn navigation_follows_the_headings() {
-        let mut d = Document::new(&NewDocument { pages: 2, ..Default::default() });
-        let lid = d.default_layer();
-        for (name, tag) in [("Chapter", "h1"), ("Section", "h2")] {
-            d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
-                name: name.into(),
-                based_on: None,
-                next_style: None,
-                para: Default::default(),
-                chars: CharAttrs::default(),
-                shortcut: String::new(),
-            });
-            d.styles_mut().export_tags.insert(format!("p:{name}"), designcraft_doc::ExportTag { tag: tag.into(), class: String::new() });
-        }
-        let text = "One\nBody\nOne point one\nMore\nTwo\nText";
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 300.0), lid, text, ParaFormat::default()).unwrap();
-        let st = d.story_mut(sid).unwrap();
-        for (i, style) in [(0, "Chapter"), (2, "Section"), (4, "Chapter")] {
-            st.paras[i].style = style.into();
-        }
-        // A story that starts with body text adds nothing to the table of contents.
-        d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 400.0, 300.0, 500.0), lid, "Text after the figure.", ParaFormat::default()).unwrap();
-        let read = |d: &Document, opts: &EpubOptions, path: &str| {
-            let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(d, opts).unwrap())).unwrap();
-            let mut s = String::new();
-            z.by_name(path).unwrap().read_to_string(&mut s).unwrap();
-            s
-        };
-        let nl = EpubOptions { language: "nl".into(), ..Default::default() };
-        let nav = read(&d, &nl, "OEBPS/nav.xhtml");
-        let link = |f: &str, t: &str, l: &str| format!("<a href=\"{f}#{t}\">{l}</a>");
-        // Each h1 starts a chapter file (#768).
-        let want = format!(
-            "<h1>Inhoud</h1><ol><li>{}<ol><li>{}</li></ol></li><li>{}</li></ol>",
-            link("content.xhtml", "s0-p0", "One"),
-            link("content.xhtml", "s0-p2", "One point one"),
-            link("content2.xhtml", "s0-p4", "Two")
-        );
-        assert!(nav.contains(&want), "{nav}");
-        assert!(!nav.contains("Text after the figure"), "{nav}");
-        let content = read(&d, &nl, "OEBPS/content.xhtml");
-        assert!(content.contains("<h1 id=\"s0-p0\" class=\"chapter\">One</h1>") && content.contains("<h2 id=\"s0-p2\""), "{content}");
-        let custom = EpubOptions { toc_title: Some("In dit boek".into()), ..Default::default() };
-        assert!(read(&d, &custom, "OEBPS/nav.xhtml").contains("<h1>In dit boek</h1>"));
-        // Without headings: one entry per story, its first paragraph.
-        let mut plain = Document::new(&NewDocument::default());
-        let lid = plain.default_layer();
-        plain.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "Opening\nrest", ParaFormat::default()).unwrap();
-        let nav = read(&plain, &EpubOptions::default(), "OEBPS/nav.xhtml");
-        assert!(nav.contains(&format!("<h1>Contents</h1><ol><li>{}</li></ol>", link("content.xhtml", "s0", "Opening"))), "{nav}");
-        // A heading shallower than the one before it but deeper than its parent stays under the
-        // parent: h1 A, h3 B, h2 C nest B and C under A.
-        let files: BTreeMap<String, String> = "ABCD".chars().map(|c| (c.to_string(), c.to_string())).collect();
-        let e = |t: &str, l: u8| (t.to_string(), t.to_string(), l);
-        assert_eq!(
-            nav_list(&[e("A", 1), e("B", 3), e("C", 2), e("D", 1)], &files),
-            format!(
-                "<li>{}<ol><li>{}</li><li>{}</li></ol></li><li>{}</li>",
-                link("A", "A", "A"),
-                link("B", "B", "B"),
-                link("C", "C", "C"),
-                link("D", "D", "D")
-            )
-        );
-        assert_eq!(
-            nav_list(&[e("A", 1), e("B", 2), e("C", 3), e("D", 1)], &files),
-            format!(
-                "<li>{}<ol><li>{}<ol><li>{}</li></ol></li></ol></li><li>{}</li>",
-                link("A", "A", "A"),
-                link("B", "B", "B"),
-                link("C", "C", "C"),
-                link("D", "D", "D")
-            )
-        );
-    }
-
-    /// #768: the book is split into one file per chapter, before each h1, with well-formed
-    /// sections; the spine and manifest list the files in order.
-    #[test]
-    fn chapters_are_split_at_h1() {
-        let mut d = Document::new(&NewDocument { pages: 3, ..Default::default() });
-        let lid = d.default_layer();
-        d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
-            name: "Chapter".into(),
-            based_on: None,
-            next_style: None,
-            para: Default::default(),
-            chars: CharAttrs::default(),
-            shortcut: String::new(),
-        });
-        d.styles_mut().export_tags.insert("p:Chapter".into(), designcraft_doc::ExportTag { tag: "h1".into(), class: String::new() });
-        // A title page without a heading, then a story that opens with a chapter and has a
-        // second one in the middle.
-        d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "Title page", ParaFormat::default()).unwrap();
-        let (_, sid) = d
-            .add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 200.0, 300.0, 400.0), lid, "One\nFirst text\nTwo\nSecond text", ParaFormat::default())
-            .unwrap();
-        let st = d.story_mut(sid).unwrap();
-        st.paras[0].style = "Chapter".into();
-        st.paras[2].style = "Chapter".into();
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(&d, &EpubOptions::default()).unwrap())).unwrap();
-        let mut read = |path: &str| {
-            let mut s = String::new();
-            z.by_name(path).unwrap().read_to_string(&mut s).unwrap();
-            s
-        };
-        let (c1, c2, c3) = (read("OEBPS/content.xhtml"), read("OEBPS/content2.xhtml"), read("OEBPS/content3.xhtml"));
-        assert!(c1.contains("Title page") && !c1.contains("One"), "{c1}");
-        assert!(c2.contains("<section id=\"s1\">\n<h1 id=\"s1-p0\"") && c2.contains("First text") && !c2.contains("Two"), "{c2}");
-        assert!(c3.contains("<section>\n<h1 id=\"s1-p2\""), "{c3}");
-        for c in [&c1, &c2, &c3] {
-            assert_eq!(c.matches("<section").count(), c.matches("</section>").count(), "{c}");
-            assert!(!c.contains(CHAPTER_MARK));
-        }
-        let opf = read("OEBPS/content.opf");
-        assert!(opf.contains("<itemref idref=\"content\"/>\n<itemref idref=\"content2\"/>\n<itemref idref=\"content3\"/>\n</spine>"), "{opf}");
-        assert!(opf.contains("<item id=\"content3\" href=\"content3.xhtml\""), "{opf}");
-        let nav = read("OEBPS/nav.xhtml");
-        assert!(nav.contains("href=\"content2.xhtml#s1-p0\"") && nav.contains("href=\"content3.xhtml#s1-p2\""), "{nav}");
-        assert!(z.by_name("OEBPS/content4.xhtml").is_err());
-        // HTML stays one page, without the marks.
-        let html = export_html(&d, &HtmlOptions::default());
-        assert!(!html.contains(CHAPTER_MARK) && html.contains("Second text"));
-    }
-
-    /// Note links stay working across chapter files: endnotes end the book, in the last file.
-    #[test]
-    fn note_links_point_at_the_chapter_file_of_their_target() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
-            name: "Chapter".into(),
-            based_on: None,
-            next_style: None,
-            para: Default::default(),
-            chars: CharAttrs::default(),
-            shortcut: String::new(),
-        });
-        d.styles_mut().export_tags.insert("p:Chapter".into(), designcraft_doc::ExportTag { tag: "h1".into(), class: String::new() });
-        let (_, sid) = d
-            .add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 400.0), lid, "One\nFirst text\nTwo\nSecond text", ParaFormat::default())
-            .unwrap();
-        let st = d.story_mut(sid).unwrap();
-        st.paras[0].style = "Chapter".into();
-        st.paras[2].style = "Chapter".into();
-        // After "First": an endnote and a footnote.
-        st.insert_endnote(9, "End note", ParaFormat::default());
-        st.insert_note(9, "Foot note", ParaFormat::default());
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(&d, &EpubOptions::default()).unwrap())).unwrap();
-        let mut read = |path: &str| {
-            let mut s = String::new();
-            z.by_name(path).unwrap().read_to_string(&mut s).unwrap();
-            s
-        };
-        let (first, last) = (read("OEBPS/content.xhtml"), read("OEBPS/content2.xhtml"));
-        assert!(first.contains("id=\"enref-1\" href=\"content2.xhtml#en-1\""), "{first}");
-        assert!(first.contains("href=\"#fn-1\"") && first.contains("href=\"#fnref-1\""), "a footnote stays in its chapter: {first}");
-        assert!(last.contains("Second text") && last.contains("<a href=\"content.xhtml#enref-1\">"), "{last}");
-    }
-
-    #[test]
-    fn split_chapters_keeps_sections_well_formed() {
-        let m = CHAPTER_MARK;
-        assert_eq!(split_chapters("<section id=\"s0\">\n<p>a</p>\n</section>\n"), vec!["<section id=\"s0\">\n<p>a</p>\n</section>\n"]);
-        assert_eq!(
-            split_chapters(&format!("<section id=\"s0\">\n{m}<h1>A</h1>\n</section>\n")),
-            vec!["<section id=\"s0\">\n<h1>A</h1>\n</section>\n"]
-        );
-        assert_eq!(
-            split_chapters(&format!("<section id=\"s0\">\n<p>a</p>\n{m}<h1>B</h1>\n</section>\n")),
-            vec!["<section id=\"s0\">\n<p>a</p>\n</section>\n", "<section>\n<h1>B</h1>\n</section>\n"]
-        );
-        assert_eq!(split_chapters(""), vec![String::new()]);
-    }
-
-    #[test]
-    fn styles_whose_names_slug_alike_keep_their_own_classes() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        for (name, size) in [("見出し", 30.0), ("本文", 10.0), ("Body Text", 12.0), ("Body-Text", 20.0)] {
-            d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
-                name: name.into(),
-                based_on: None,
-                next_style: None,
-                para: Default::default(),
-                chars: CharAttrs { size: Some(size), ..Default::default() },
-                shortcut: String::new(),
-            });
-        }
-        for (k, name) in ["見出し", "本文", "Body Text", "Body-Text"].into_iter().enumerate() {
-            let y = 36.0 + 100.0 * k as f64;
-            let pf = ParaFormat { style: name.into(), ..Default::default() };
-            d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, y, 300.0, y + 50.0), lid, &format!("P{k}"), pf).unwrap();
-        }
-        let bytes = export_epub(&d, &EpubOptions::default()).unwrap();
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
-        let mut html = String::new();
-        z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut html).unwrap();
-        let mut css = String::new();
-        z.by_name("OEBPS/style.css").unwrap().read_to_string(&mut css).unwrap();
-        let class_of = |text: &str| {
-            let end = html.find(&format!("\">{text}</p>")).unwrap();
-            let start = html[..end].rfind("class=\"").unwrap() + 7;
-            html[start..end].to_string()
-        };
-        let classes: Vec<String> = (0..4).map(|k| class_of(&format!("P{k}"))).collect();
-        for (k, c) in classes.iter().enumerate() {
-            assert!(!classes[..k].contains(c), "class `{c}` shared: {classes:?}");
-            assert_eq!(css.matches(&format!("p.{c} {{")).count(), 1, "one rule for `{c}`:\n{css}");
-        }
-    }
-
-    #[test]
-    fn slugs() {
-        assert_eq!(slug("[Basic Paragraph]"), "basic-paragraph");
-        assert_eq!(slug("Body First"), "body-first");
-        assert_eq!(slug("1 Head"), "s-1-head");
-    }
-
-    #[test]
-    fn html_is_one_self_contained_page() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "Hello <web>", ParaFormat::default()).unwrap();
-        let html = export_html(&d, &HtmlOptions { title: Some("T".into()), language: None, ..Default::default() });
-        assert!(html.starts_with("<!DOCTYPE html>") && html.contains("<title>T</title>") && html.contains("Hello &lt;web&gt;"));
-        assert!(html.contains("p.basic-paragraph"), "styles inline");
-        assert_eq!(base64(b"Man"), "TWFu");
-        assert_eq!(base64(b"Ma"), "TWE=");
-        assert_eq!(base64(b"M"), "TQ==");
-    }
-
-    /// #774: an image without alt text is decorative (`alt=""`) and reported, and package names
-    /// come from the original file names.
-    #[test]
-    fn images_get_readable_names_and_no_file_name_alt() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let place = |d: &mut Document, name: &str, mime: &str, alt: &str, y: f64| {
-            let aid = AssetId(d.alloc());
-            d.assets.insert(
-                aid,
-                Arc::new(Asset {
-                    page: 0,
-                    id: aid,
-                    name: name.into(),
-                    mime: mime.into(),
-                    link: None,
-                    data: Arc::new(vec![1]),
-                    pixels: Some((1, 1)),
-                    ..Default::default()
-                }),
-            );
-            let mut item = Item::new(ItemId(d.alloc()), lid, Shape::Rectangle, shapes::rectangle(Rect::new(36.0, y, 72.0, y + 36.0)));
-            item.alt_text = alt.into();
-            item.content = Content::Graphic(Graphic {
-                asset: aid,
-                size: (1.0, 1.0),
-                xf: Affine::IDENTITY,
-                auto_fit: Default::default(),
-                fit_align: 4,
-                crop: [0.0; 4],
-                clip: None,
-                wrap: Default::default(),
-                fill: Default::default(),
-            });
-            d.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-            aid.0
-        };
-        let a = place(&mut d, "/tmp/Anim Frame (1).GIF", "image/gif", "", 36.0);
-        let b = place(&mut d, "photo.jpg", "image/jpeg", "A heron", 120.0);
-        let c = place(&mut d, "???.png", "image/png", "Mark", 200.0);
-        assert_eq!(images_without_alt(&d), vec!["/tmp/Anim Frame (1).GIF".to_string()]);
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(&d, &EpubOptions::default()).unwrap())).unwrap();
-        let mut x = String::new();
-        z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut x).unwrap();
-        assert!(x.contains(&format!("<img src=\"images/anim-frame-1-{a}.gif\" alt=\"\"/>")), "{x}");
-        assert!(x.contains(&format!("<img src=\"images/photo-{b}.jpg\" alt=\"A heron\"/>")), "{x}");
-        assert!(x.contains(&format!("<img src=\"images/{c}.png\" alt=\"Mark\"/>")), "{x}");
-        assert!(z.by_name(&format!("OEBPS/images/anim-frame-1-{a}.gif")).is_ok());
-    }
-
-    /// #775: the generic fallback follows the font, and embedded fonts are packaged and declared.
-    #[test]
-    fn generic_fallbacks_and_embedded_fonts() {
-        let none = BTreeMap::new();
-        for (family, want) in [
-            ("Source Serif 4", "serif"),
-            ("Source Sans 3", "sans-serif"),
-            ("Microsoft Sans Serif", "sans-serif"),
-            ("JetBrains Mono", "monospace"),
-            ("Courier New", "monospace"),
-            ("Franklin Gothic", "sans-serif"),
-            ("Garamond", "serif"),
-        ] {
-            assert_eq!(generic_family(family, &none), want, "{family}");
-        }
-        let known: BTreeMap<String, String> =
-            [("Montserrat".to_string(), "sans-serif".to_string()), ("Odd".to_string(), "nonsense".to_string())].into();
-        assert_eq!(generic_family("Montserrat", &known), "sans-serif");
-        assert_eq!(generic_family("Odd", &known), "serif", "only CSS generic families are used");
-        assert_eq!(css_weight_style("Semibold Italic"), (600, "italic"));
-        assert_eq!(css_weight_style("Bold"), (700, "normal"));
-        assert_eq!(css_weight_style("Extra Bold"), (800, "normal"));
-        assert_eq!(css_weight_style("Regular"), (400, "normal"));
-        assert_eq!(css_weight_style("Light"), (300, "normal"));
-        assert_eq!(css_weight_style("Thin Oblique"), (100, "italic"));
-        assert_eq!(css_weight_style("Black"), (900, "normal"));
-
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "Hello", ParaFormat::default()).unwrap();
-        if let Some(basic) = d.styles_mut().paragraph.iter_mut().find(|s| s.name == story::BASIC_PARAGRAPH) {
-            basic.chars.font_family = Some("Montserrat".into());
-            basic.chars.font_style = Some("Bold Italic".into());
-        }
-        assert_eq!(stylesheet_fonts(&d), vec![("Montserrat".to_string(), "Bold Italic".to_string())]);
-        let opts = EpubOptions {
-            generic_families: known,
-            fonts: vec![EmbeddedFont { family: "Montserrat".into(), style: "Bold Italic".into(), data: b"OTTO font".to_vec() }],
-            ..Default::default()
-        };
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(&d, &opts).unwrap())).unwrap();
-        let mut read = |path: &str| {
-            let mut s = String::new();
-            z.by_name(path).unwrap().read_to_string(&mut s).unwrap();
-            s
-        };
-        let css = read("OEBPS/style.css");
-        assert!(
-            css.starts_with(
-                "@font-face { font-family: \"Montserrat\"; src: url(\"fonts/0-montserrat-bold-italic.otf\"); font-weight: 700; font-style: italic; }"
-            ),
-            "{css}"
-        );
-        assert!(css.contains("font-family: \"Montserrat\", sans-serif;"), "{css}");
-        let opf = read("OEBPS/content.opf");
-        assert!(opf.contains("<item id=\"font0\" href=\"fonts/0-montserrat-bold-italic.otf\" media-type=\"font/otf\"/>"), "{opf}");
-        assert_eq!(read("OEBPS/fonts/0-montserrat-bold-italic.otf"), "OTTO font");
-        // HTML takes the generic families too, and embeds nothing.
-        let html = export_html(&d, &HtmlOptions { generic_families: opts.generic_families.clone(), ..Default::default() });
-        assert!(html.contains("\"Montserrat\", sans-serif;") && !html.contains("@font-face"), "{html}");
-    }
-
-    #[test]
-    fn metadata_is_serialized_for_its_output_context() {
-        let mut d = Document::new(&NewDocument::default());
-        d.title = "Field Notes & <Edition>".into();
-        let lid = d.default_layer();
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "A&B <C> \"D\"", ParaFormat::default()).unwrap();
-        d.styles_mut()
-            .export_tags
-            .insert(format!("p:{}", story::BASIC_PARAGRAPH), designcraft_doc::ExportTag { tag: "h2".into(), class: "Primary \"Copy\"".into() });
-        if let Some(basic) = d.styles_mut().paragraph.iter_mut().find(|s| s.name == story::BASIC_PARAGRAPH) {
-            basic.chars.font_family = Some("Quoted \"Serif\" <Alt>".into());
-        }
-
-        let aid = AssetId(d.alloc());
-        d.assets.insert(
-            aid,
-            Arc::new(Asset {
-                id: aid,
-                name: "Cover & Notes".into(),
-                mime: "image/png; profile=screen".into(),
-                data: Arc::new(vec![1]),
-                pixels: Some((1, 1)),
-                ..Default::default()
-            }),
-        );
-        let mut item = Item::new(ItemId(d.alloc()), lid, Shape::Rectangle, shapes::rectangle(Rect::new(36.0, 120.0, 72.0, 156.0)));
-        item.alt_text = "Cover \"A\" & B".into();
-        item.content = Content::Graphic(Graphic {
-            asset: aid,
-            size: (1.0, 1.0),
-            xf: Affine::IDENTITY,
-            clip: None,
-            auto_fit: Default::default(),
-            fit_align: 4,
-            crop: [0.0; 4],
-            wrap: Default::default(),
-            fill: Default::default(),
-        });
-        d.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-
-        let story = story_html(&d, sid);
-        assert!(story.contains("<h2 class=\"Primary &quot;Copy&quot;\">A&amp;B &lt;C&gt; &quot;D&quot;</h2>"));
-        let html = export_html(&d, &HtmlOptions { title: None, language: Some("English (US)".into()), ..Default::default() });
-        assert!(html.contains("<html lang=\"und\">"));
-        assert!(html.contains("<title>Field Notes &amp; &lt;Edition&gt;</title>"));
-        assert!(html.contains("alt=\"Cover &quot;A&quot; &amp; B\""));
-        assert!(html.contains("src=\"data:image/png;base64,AQ==\""));
-        assert!(!html.contains("image/png; profile=screen"));
-        assert!(!stylesheet(&d).contains("<Alt>"));
-        assert!(stylesheet(&d).contains("\\3c Alt\\3e "));
-
-        let bytes = export_epub(
-            &d,
-            &EpubOptions {
-                title: None,
-                author: Some("A & B".into()),
-                language: "English (US)".into(),
-                identifier: Some("notes&edition".into()),
-                cover: None,
-                ..Default::default()
-            },
-        )
-        .unwrap();
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
-        let mut opf = String::new();
-        z.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut opf).unwrap();
-        assert!(opf.contains("xml:lang=\"und\""));
-        assert!(opf.contains("<dc:identifier id=\"bookid\">notes&amp;edition</dc:identifier>"));
-        assert!(opf.contains("<dc:creator>A &amp; B</dc:creator>"));
-        assert!(opf.contains("media-type=\"image/png\""));
-    }
-
-    /// "Body¹ text", a 2×2 table, then "Closing" with an endnote.
-    fn tables_and_notes() -> Document {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 400.0), lid, "Body text", ParaFormat::default()).unwrap();
-        let st = d.story_mut(sid).unwrap();
-        st.insert_note(4, "Foot note text", ParaFormat::default());
-        let mut t = Table::new(1, 2, 2, 0, 0, 200.0);
-        for (r, c, s) in [(0, 0, "Cell A1"), (0, 1, "Cell B1"), (1, 0, "Cell A2"), (1, 1, "Cell B2")] {
-            t.cell_mut(r, c).unwrap().text = Story::with_text(StoryId(0), s, ParaFormat::default());
-        }
-        let end = st.len();
-        st.insert_table(end, t);
-        let end = st.len();
-        st.insert(end, "Closing");
-        let end = st.len();
-        st.insert_endnote(end, "End note text", ParaFormat::default());
-        d
-    }
-
-    #[test]
-    fn tables_footnotes_and_endnotes_are_exported() {
-        let d = tables_and_notes();
-        let bytes = export_epub(&d, &EpubOptions::default()).unwrap();
-        let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
-        let mut html = String::new();
-        z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut html).unwrap();
-        let (t0, t1) = (html.find("<table>").unwrap(), html.find("</table>").unwrap());
-        for cell in ["Cell A1", "Cell B1", "Cell A2", "Cell B2"] {
-            let at = html.find(&format!("<td><p class=\"basic-paragraph\">{cell}</p>\n</td>")).unwrap_or_else(|| panic!("{cell} in a cell:\n{html}"));
-            assert!(t0 < at && at < t1);
-        }
-        assert_eq!(html.matches("<tr>").count(), 2);
-
-        let noteref = "Body<sup><a epub:type=\"noteref\" role=\"doc-noteref\" id=\"fnref-1\" href=\"#fn-1\">1</a></sup> text";
-        assert!(html.contains(noteref), "footnote reference:\n{html}");
-        let aside = html.find("<aside epub:type=\"footnote\" role=\"doc-footnote\" id=\"fn-1\">").unwrap();
-        let aside_end = aside + html[aside..].find("</aside>").unwrap();
-        assert!(html[aside..aside_end].contains("<a href=\"#fnref-1\">1</a> Foot note text"));
-        assert!(aside < t0, "the footnote follows its paragraph");
-
-        assert!(html.contains("Closing<sup><a epub:type=\"noteref\" role=\"doc-noteref\" id=\"enref-1\" href=\"#en-1\">1</a></sup>"));
-        let section = html.find("<section epub:type=\"endnotes\" role=\"doc-endnotes\" id=\"endnotes\">").unwrap();
-        assert!(section > html.find("Closing").unwrap());
-        assert!(html[section..].contains("<li epub:type=\"endnote\" id=\"en-1\">"));
-        assert!(html[section..].contains("<a href=\"#enref-1\">1</a> End note text"));
-        let mut nav = String::new();
-        z.by_name("OEBPS/nav.xhtml").unwrap().read_to_string(&mut nav).unwrap();
-        assert!(nav.contains("href=\"content.xhtml#endnotes\""));
-
-        let page = export_html(&d, &HtmlOptions::default());
-        assert!(page.contains("<aside role=\"doc-footnote\" id=\"fn-1\">") && page.contains("Cell B2") && page.contains("End note text"));
-        assert!(!page.contains("epub:type"), "plain HTML has no EPUB namespace");
-    }
-
-    /// A footnote or a table after a list paragraph or a preformatted line closes the list or
-    /// block first: `aside` and `table` can't sit inside `ul` or `pre`.
-    #[test]
-    fn notes_and_tables_close_an_open_list_or_pre_block() {
-        for (tag, list, open, close) in [("li", Some(designcraft_doc::ListType::Bullets), "<ul>", "</ul>"), ("pre", None, "<pre", "</pre>")] {
-            let mut d = tables_and_notes();
-            let para = designcraft_doc::ParaAttrs { list_type: list, ..Default::default() };
-            d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
-                name: "Grouped".into(),
-                based_on: None,
-                next_style: None,
-                para,
-                chars: CharAttrs::default(),
-                shortcut: String::new(),
-            });
-            d.styles_mut().export_tags.insert("p:Grouped".into(), designcraft_doc::ExportTag { tag: tag.into(), class: String::new() });
-            let sid = d.stories.keys().copied().find(|sid| d.story(*sid).is_some_and(|st| !st.notes.is_empty())).unwrap();
-            for p in &mut d.story_mut(sid).unwrap().paras {
-                p.style = "Grouped".into();
-            }
-            let html = story_html(&d, sid);
-            let mut rest = html.as_str();
-            while let Some(at) = rest.find(open) {
-                let block = &rest[at..];
-                let end = block.find(close).unwrap_or_else(|| panic!("{open} is closed:\n{html}"));
-                assert!(!block[..end].contains("<aside") && !block[..end].contains("<table"), "{html}");
-                rest = &block[end..];
-            }
-            assert!(html.contains("<aside") && html.contains("<table>"), "{html}");
-        }
-    }
-
-    #[test]
-    fn table_rows_groups_and_merged_cells() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 400.0), lid, "", ParaFormat::default()).unwrap();
-        // One header row, two body rows, one footer row; the header spans both columns and the
-        // first body cell spans both body rows and runs into the footer.
-        let mut t = Table::new(1, 2, 2, 1, 1, 200.0);
-        for (r, c, s) in [(0, 0, "Head"), (1, 0, "Tall"), (1, 1, "B1"), (2, 1, "B2"), (3, 0, "F1"), (3, 1, "F2")] {
-            t.cell_mut(r, c).unwrap().text = Story::with_text(StoryId(0), s, ParaFormat::default());
-        }
-        t.cell_mut(0, 0).unwrap().col_span = 2;
-        t.cell_mut(1, 0).unwrap().row_span = 3;
-        d.story_mut(sid).unwrap().insert_table(0, t);
-        let html = story_html(&d, sid);
-        let p = |s: &str| format!("<p class=\"basic-paragraph\">{s}</p>\n");
-        let expected = format!(
-            "<table>\n<thead>\n<tr><th colspan=\"2\">{}</th>\n</tr>\n</thead>\n<tbody>\n<tr><td rowspan=\"2\">{}</td>\n<td>{}</td>\n</tr>\n<tr><td>{}</td>\n</tr>\n</tbody>\n<tfoot>\n<tr><td>{}</td>\n<td>{}</td>\n</tr>\n</tfoot>\n</table>\n",
-            p("Head"),
-            p("Tall"),
-            p("B1"),
-            p("B2"),
-            p("F1"),
-            p("F2")
-        );
-        assert!(html.contains(&expected), "{html}");
-    }
-
-    /// Note links stay working across chapter files: a link whose target ended up in another
-    /// file (endnotes end the book) names that file; one in its own file stays as it is.
-    #[test]
-    fn note_links_name_the_chapter_file_of_their_target() {
-        let files: BTreeMap<String, String> =
-            [("enref-1", "content.xhtml"), ("fn-1", "content.xhtml"), ("fnref-1", "content.xhtml"), ("en-1", "content2.xhtml")]
-                .into_iter()
-                .map(|(id, f)| (id.to_string(), f.to_string()))
-                .collect();
-        let first = "<p>First<a id=\"enref-1\" href=\"#en-1\">1</a><a id=\"fnref-1\" href=\"#fn-1\">*</a></p><aside id=\"fn-1\"><a href=\"#fnref-1\">*</a></aside><a href=\"#gone\">x</a>";
-        assert_eq!(
-            link_across_chapters(first, "content.xhtml", &files),
-            "<p>First<a id=\"enref-1\" href=\"content2.xhtml#en-1\">1</a><a id=\"fnref-1\" href=\"#fn-1\">*</a></p><aside id=\"fn-1\"><a href=\"#fnref-1\">*</a></aside><a href=\"#gone\">x</a>"
-        );
-        let last = "<li id=\"en-1\"><a href=\"#enref-1\">1</a> End note</li>";
-        assert_eq!(link_across_chapters(last, "content2.xhtml", &files), "<li id=\"en-1\"><a href=\"content.xhtml#enref-1\">1</a> End note</li>");
-    }
-}
+mod tests;
diff --git a/crates/epub/src/markup.rs b/crates/epub/src/markup.rs
new file mode 100644
index 000000000..3697c458f
--- /dev/null
+++ b/crates/epub/src/markup.rs
@@ -0,0 +1,104 @@
+use std::fmt::Write as _;
+
+#[derive(Debug)]
+pub struct EpubError(pub String);
+
+pub(crate) fn valid_xml_char(c: char) -> bool {
+    matches!(c, '\u{9}' | '\u{A}' | '\u{D}' | '\u{20}'..='\u{D7FF}' | '\u{E000}'..='\u{FFFD}' | '\u{10000}'..='\u{10FFFF}')
+}
+
+fn escape_markup(s: &str, attr: bool, story_breaks: bool) -> String {
+    let mut o = String::with_capacity(s.len());
+    for c in s.chars() {
+        match c {
+            '&' => o.push_str("&amp;"),
+            '<' => o.push_str("&lt;"),
+            '>' => o.push_str("&gt;"),
+            '"' => o.push_str("&quot;"),
+            '\'' if attr => o.push_str("&apos;"),
+            '\u{E000}'..='\u{E1FF}' => {}
+            '\u{2028}' if story_breaks => o.push_str("<br/>"),
+            '\u{AD}' => o.push_str("&#173;"),
+            c if valid_xml_char(c) => o.push(c),
+            _ => {}
+        }
+    }
+    o
+}
+
+pub(crate) fn xml_text(s: &str) -> String {
+    escape_markup(s, false, false)
+}
+
+pub(crate) fn xml_attr(s: &str) -> String {
+    escape_markup(s, true, false)
+}
+
+/// Story content permits the document's discretionary line-separator marker to become markup.
+/// Other contexts always serialize it as ordinary text.
+pub(crate) fn story_markup(s: &str) -> String {
+    escape_markup(s, false, true)
+}
+
+/// A conservative BCP 47 subset suitable for both HTML and EPUB language attributes.
+pub(crate) fn language_tag(s: &str) -> &str {
+    if s.len() > 63 {
+        return "und";
+    }
+    let mut parts = s.split('-');
+    let Some(first) = parts.next() else { return "und" };
+    if !(2..=8).contains(&first.len()) || !first.bytes().all(|b| b.is_ascii_alphabetic()) {
+        return "und";
+    }
+    if parts.any(|p| p.is_empty() || p.len() > 8 || !p.bytes().all(|b| b.is_ascii_alphanumeric())) {
+        return "und";
+    }
+    s
+}
+
+/// Return a MIME type that is safe to place in an attribute and a data URL. Parameters are omitted
+/// because exported assets are always represented as their original binary bytes.
+pub(crate) fn safe_mime(mime: &str) -> &str {
+    fn token(s: &str) -> bool {
+        !s.is_empty() && s.bytes().all(|b| b.is_ascii_alphanumeric() || matches!(b, b'_' | b'.' | b'+' | b'-'))
+    }
+
+    let mime = mime.split_once(';').map_or(mime, |(essence, _)| essence).trim();
+    if mime.len() <= 127
+        && let Some((kind, subtype)) = mime.split_once('/')
+        && !subtype.contains('/')
+        && token(kind)
+        && token(subtype)
+    {
+        mime
+    } else {
+        "image/png"
+    }
+}
+
+/// Quote arbitrary document metadata as one CSS string token. Escaping `<` is important because
+/// HTML parses the contents of a `style` element before CSS parsing sees it.
+pub(crate) fn css_string(s: &str) -> String {
+    let mut out = String::with_capacity(s.len());
+    for c in s.chars() {
+        if matches!(c, '"' | '\\' | '<' | '>' | '&') || c.is_control() {
+            let _ = write!(out, "\\{:x} ", c as u32);
+        } else {
+            out.push(c);
+        }
+    }
+    out
+}
+
+/// CSS class name for a style name.
+pub fn slug(name: &str) -> String {
+    let s: String = name.chars().map(|c| if c.is_ascii_alphanumeric() { c.to_ascii_lowercase() } else { '-' }).collect();
+    let s = s.trim_matches('-').to_string();
+    if s.is_empty() {
+        "basic".into()
+    } else if s.starts_with(|c: char| c.is_ascii_digit()) {
+        format!("s-{s}")
+    } else {
+        s
+    }
+}
diff --git a/crates/epub/src/package.rs b/crates/epub/src/package.rs
new file mode 100644
index 000000000..fff4fd6fe
--- /dev/null
+++ b/crates/epub/src/package.rs
@@ -0,0 +1,244 @@
+use super::chapters::{chapter_file, link_across_chapters, nav_list, split_chapters};
+use super::css::stylesheet_with;
+use super::fonts::font_file;
+use super::html::{Body, body_html};
+use super::markup::{EpubError, language_tag, story_markup, xml_attr, xml_text};
+use super::*;
+
+/// An ISO 8601 UTC timestamp (`2026-10-13T09:30:00Z`) for Unix seconds `t`.
+/// A time outside chrono's year range still converts: the calendar repeats every 400 years, so the
+/// instant is moved into range by whole cycles and only the year is carried (matches the old
+/// `civil_from_days`), rather than resetting to the epoch.
+pub(crate) fn iso8601(t: i64) -> String {
+    let (y, dt) = designcraft_doc::time::utc_parts(t, 0);
+    // `{:04}` rather than `%Y`, which writes a `+` before years past 9999.
+    format!("{y:04}-{}", dt.format("%m-%dT%H:%M:%SZ"))
+}
+
+/// The package's `dcterms:modified`: the given time, else the document's last save or creation.
+fn modified(doc: &Document, opts: &EpubOptions) -> String {
+    let t = opts.modified.or((doc.modified > 0).then_some(doc.modified)).or((doc.created > 0).then_some(doc.created));
+    t.map_or_else(|| "2026-01-01T00:00:00Z".to_string(), iso8601)
+}
+
+/// The book's identifier: the given one, else a `urn:uuid` derived from the title and the
+/// document's creation time, so a book keeps its identifier from export to export and two books
+/// with the same title don't share one.
+fn identifier(doc: &Document, opts: &EpubOptions, title: &str) -> String {
+    if let Some(id) = opts.identifier.clone().filter(|i| !i.trim().is_empty()) {
+        return id;
+    }
+    // Two FNV-1a 64-bit hashes (different offsets) as 128 bits, shaped as a version-5-style UUID.
+    let seed = format!("{title}\n{}", doc.created);
+    let fnv = |offset: u64| seed.bytes().fold(offset, |h, b| (h ^ u64::from(b)).wrapping_mul(0x0000_0100_0000_01b3));
+    let (a, b) = (fnv(0xcbf2_9ce4_8422_2325), fnv(0x84222325_cbf29ce4));
+    let hi = (a & 0xffff_ffff_ffff_0fff) | 0x5000;
+    let lo = (b & 0x3fff_ffff_ffff_ffff) | 0x8000_0000_0000_0000;
+    format!("urn:uuid:{:08x}-{:04x}-{:04x}-{:04x}-{:012x}", hi >> 32, (hi >> 16) & 0xffff, hi & 0xffff, lo >> 48, lo & 0xffff_ffff_ffff)
+}
+
+/// Package name and media type of a cover image: JPEG by its signature, else PNG.
+fn cover_file(data: &[u8]) -> (&'static str, &'static str) {
+    if data.starts_with(&[0xFF, 0xD8, 0xFF]) { ("images/cover.jpg", "image/jpeg") } else { ("images/cover.png", "image/png") }
+}
+
+/// The table of contents' title in `language` (a BCP 47 tag or a language name's code), English
+/// for languages without one here.
+pub fn contents_title(language: &str) -> &'static str {
+    let code = language.split(['-', '_']).next().unwrap_or("").to_ascii_lowercase();
+    match code.as_str() {
+        "nl" => "Inhoud",
+        "de" => "Inhalt",
+        "fr" => "Table des matières",
+        "es" | "pt" => "Índice",
+        "it" => "Indice",
+        "ja" => "目次",
+        "zh" => "目录",
+        _ => "Contents",
+    }
+}
+
+/// A page of a fixed-layout EPUB: its image (PNG), size in points and text (kept for search,
+/// read-aloud and accessibility).
+#[derive(Clone, Debug)]
+pub struct FixedPage {
+    pub png: Vec<u8>,
+    pub width: f64,
+    pub height: f64,
+    pub text: String,
+}
+
+/// A pre-paginated (fixed-layout) EPUB: one XHTML page per document page.
+pub fn export_fixed_epub(doc: &Document, pages: &[FixedPage], opts: &EpubOptions) -> Result<Vec<u8>, EpubError> {
+    let title = opts.title.clone().unwrap_or_else(|| doc.metadata_title().to_string());
+    let lang = language_tag(&opts.language);
+    let id = identifier(doc, opts, &title);
+    let modified = modified(doc, opts);
+    let mut manifest = String::from("<item id=\"nav\" href=\"nav.xhtml\" media-type=\"application/xhtml+xml\" properties=\"nav\"/>\n");
+    let mut spine = String::new();
+    let mut files: Vec<(String, Vec<u8>)> = Vec::new();
+    let mut nav_items = String::new();
+    for (i, p) in pages.iter().enumerate() {
+        let n = i + 1;
+        let (w, h) = (p.width.round().max(1.0) as u32, p.height.round().max(1.0) as u32);
+        let xhtml = format!(
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"{lang}\" lang=\"{lang}\">\n<head><meta charset=\"utf-8\"/><meta name=\"viewport\" content=\"width={w}, height={h}\"/><title>{} — {n}</title>\n<style>body{{margin:0;width:{w}px;height:{h}px;position:relative}} img{{position:absolute;left:0;top:0;width:{w}px;height:{h}px}} .t{{position:absolute;left:0;top:0;width:{w}px;color:transparent;font-size:1px;overflow:hidden}}</style></head>\n<body><img src=\"pages/p{n}.png\" alt=\"\"/><div class=\"t\">{}</div></body>\n</html>\n",
+            xml_text(&title),
+            story_markup(&p.text).replace('\n', "<br/>")
+        );
+        let _ = writeln!(
+            manifest,
+            "<item id=\"page{n}\" href=\"page{n}.xhtml\" media-type=\"application/xhtml+xml\"/>\n<item id=\"pimg{n}\" href=\"pages/p{n}.png\" media-type=\"image/png\"{}/>",
+            if n == 1 { " properties=\"cover-image\"" } else { "" }
+        );
+        let _ = writeln!(spine, "<itemref idref=\"page{n}\"/>");
+        let _ = write!(nav_items, "<li><a href=\"page{n}.xhtml\">{n}</a></li>");
+        files.push((format!("OEBPS/page{n}.xhtml"), xhtml.into_bytes()));
+        files.push((format!("OEBPS/pages/p{n}.png"), p.png.clone()));
+    }
+    let (vw, vh) = pages.first().map_or((612, 792), |p| (p.width.round() as u32, p.height.round() as u32));
+    let nav = format!(
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\" xml:lang=\"{lang}\">\n<head><meta charset=\"utf-8\"/><title>{}</title></head>\n<body><nav epub:type=\"page-list\" id=\"toc\"><h1>Pages</h1><ol>{nav_items}</ol></nav></body>\n</html>\n",
+        xml_text(&title)
+    );
+    let rendition = format!(
+        "\n<meta property=\"rendition:layout\">pre-paginated</meta>\n<meta property=\"rendition:spread\">auto</meta>\n<meta name=\"original-resolution\" content=\"{vw}x{vh}\"/>"
+    );
+    let head = PackageHead { lang, id: &id, title: &title, author: opts.author.as_deref().or(doc.metadata_author()), modified: &modified };
+    let opf = package_opf(&head, " prefix=\"rendition: http://www.idpf.org/vocab/rendition/#\"", &rendition, &manifest, &spine);
+    let entries = files.iter().map(|(name, data)| (name.clone(), data.as_slice(), name.ends_with(".png")));
+    write_package(&opf, &nav, entries)
+}
+
+/// The package metadata both EPUB flavours share.
+struct PackageHead<'a> {
+    lang: &'a str,
+    id: &'a str,
+    title: &'a str,
+    author: Option<&'a str>,
+    modified: &'a str,
+}
+
+/// The OPF package document. `prefix` goes on `<package>` (with its leading space), `meta` after
+/// `dcterms:modified` (with its leading newline); `manifest` and `spine` are the item lines.
+fn package_opf(h: &PackageHead, prefix: &str, meta: &str, manifest: &str, spine: &str) -> String {
+    let PackageHead { lang, id, title, author, modified } = h;
+    let author = author.map(|a| format!("<dc:creator>{}</dc:creator>", xml_text(a))).unwrap_or_default();
+    format!(
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<package xmlns=\"http://www.idpf.org/2007/opf\" version=\"3.0\" unique-identifier=\"bookid\" xml:lang=\"{lang}\"{prefix}>\n<metadata xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n<dc:identifier id=\"bookid\">{}</dc:identifier>\n<dc:title>{}</dc:title>\n<dc:language>{lang}</dc:language>{author}\n<meta property=\"dcterms:modified\">{modified}</meta>{meta}\n<meta name=\"generator\" content=\"DesignCraft\"/>\n</metadata>\n<manifest>\n{manifest}</manifest>\n<spine>\n{spine}</spine>\n</package>\n",
+        xml_text(id),
+        xml_text(title)
+    )
+}
+
+/// Zips an EPUB: the stored `mimetype`, `container.xml`, the OPF and nav, then `entries` in order
+/// as (path, bytes, stored uncompressed).
+fn write_package<'a>(opf: &str, nav: &str, entries: impl IntoIterator<Item = (String, &'a [u8], bool)>) -> Result<Vec<u8>, EpubError> {
+    let io = |e: std::io::Error| EpubError(e.to_string());
+    let zerr = |e: zip::result::ZipError| EpubError(e.to_string());
+    let container = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<container version=\"1.0\" xmlns=\"urn:oasis:names:tc:opendocument:xmlns:container\"><rootfiles><rootfile full-path=\"OEBPS/content.opf\" media-type=\"application/oebps-package+xml\"/></rootfiles></container>\n";
+    let mut buf = std::io::Cursor::new(Vec::new());
+    {
+        let mut z = zip::ZipWriter::new(&mut buf);
+        let stored = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
+        let deflate = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
+        z.start_file("mimetype", stored).map_err(zerr)?;
+        z.write_all(b"application/epub+zip").map_err(io)?;
+        for (name, data) in
+            [("META-INF/container.xml", container.as_bytes()), ("OEBPS/content.opf", opf.as_bytes()), ("OEBPS/nav.xhtml", nav.as_bytes())]
+        {
+            z.start_file(name, deflate).map_err(zerr)?;
+            z.write_all(data).map_err(io)?;
+        }
+        for (name, data, store) in entries {
+            z.start_file(name, if store { stored } else { deflate }).map_err(zerr)?;
+            z.write_all(data).map_err(io)?;
+        }
+        z.finish().map_err(zerr)?;
+    }
+    Ok(buf.into_inner())
+}
+
+/// Export the document as a reflowable EPUB 3.
+pub fn export_epub(doc: &Document, opts: &EpubOptions) -> Result<Vec<u8>, EpubError> {
+    let title = opts.title.clone().unwrap_or_else(|| doc.metadata_title().to_string());
+    let id = identifier(doc, opts, &title);
+    let modified = modified(doc, opts);
+    let Body { html: body, images, toc, .. } = body_html(doc, true, opts.split.as_ref(), &|name, _, _| name.to_string());
+    let lang = language_tag(&opts.language);
+    // One file per chapter (see `starts_chapter`); one file in all when Split Document is off.
+    let chapters: Vec<String> = split_chapters(&body)
+        .into_iter()
+        .map(|part| {
+            format!(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\" xml:lang=\"{lang}\" lang=\"{lang}\">\n<head><meta charset=\"utf-8\"/><title>{}</title><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"/></head>\n<body>\n{part}</body>\n</html>\n",
+                xml_text(&title)
+            )
+        })
+        .collect();
+    // The file each navigation target (an element id) ended up in.
+    let mut files: BTreeMap<String, String> = BTreeMap::new();
+    for (k, c) in chapters.iter().enumerate() {
+        for rest in c.split(" id=\"").skip(1) {
+            if let Some(id) = rest.split('"').next() {
+                files.entry(id.to_string()).or_insert_with(|| chapter_file(k));
+            }
+        }
+    }
+    // Note links whose target ended up in another file (endnotes end the book) point at it.
+    let chapters: Vec<String> = chapters.iter().enumerate().map(|(k, c)| link_across_chapters(c, &chapter_file(k), &files)).collect();
+    let mut nav_items = nav_list(&toc, &files);
+    if nav_items.is_empty() {
+        nav_items = format!("<li><a href=\"content.xhtml\">{}</a></li>", xml_text(&title));
+    }
+    let nav = format!(
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\" xml:lang=\"{lang}\">\n<head><meta charset=\"utf-8\"/><title>{}</title></head>\n<body><nav epub:type=\"toc\" id=\"toc\"><h1>{}</h1><ol>{nav_items}</ol></nav></body>\n</html>\n",
+        xml_text(&title),
+        xml_text(opts.toc_title.as_deref().filter(|t| !t.trim().is_empty()).unwrap_or(contents_title(&opts.language)))
+    );
+    let mut manifest = String::from(
+        "<item id=\"nav\" href=\"nav.xhtml\" media-type=\"application/xhtml+xml\" properties=\"nav\"/>\n<item id=\"css\" href=\"style.css\" media-type=\"text/css\"/>\n",
+    );
+    let mut spine = String::new();
+    for k in 0..chapters.len() {
+        let item = if k == 0 { "content".to_string() } else { format!("content{}", k + 1) };
+        let _ = writeln!(manifest, "<item id=\"{item}\" href=\"{}\" media-type=\"application/xhtml+xml\"/>", chapter_file(k));
+        let _ = writeln!(spine, "<itemref idref=\"{item}\"/>");
+    }
+    for (k, (name, (mime, _))) in images.iter().enumerate() {
+        let _ = writeln!(manifest, "<item id=\"img{k}\" href=\"{}\" media-type=\"{}\"/>", xml_attr(name), xml_attr(mime));
+    }
+    for (k, f) in opts.fonts.iter().enumerate() {
+        let (name, mime) = font_file(k, f);
+        let _ = writeln!(manifest, "<item id=\"font{k}\" href=\"{}\" media-type=\"{mime}\"/>", xml_attr(&name));
+    }
+    // Cover: an image page first in reading order.
+    if let Some(c) = &opts.cover {
+        let (name, mime) = cover_file(c);
+        let _ = writeln!(
+            manifest,
+            "<item id=\"cover-img\" href=\"{name}\" media-type=\"{mime}\" properties=\"cover-image\"/>\n<item id=\"cover\" href=\"cover.xhtml\" media-type=\"application/xhtml+xml\"/>"
+        );
+    }
+    let cover_spine = if opts.cover.is_some() { "<itemref idref=\"cover\"/>\n" } else { "" };
+    let head = PackageHead { lang, id: &id, title: &title, author: opts.author.as_deref().or(doc.metadata_author()), modified: &modified };
+    let opf = package_opf(&head, "", "", &manifest, &format!("{cover_spine}{spine}"));
+    let css = stylesheet_with(doc, &opts.generic_families, &opts.fonts);
+    let mut entries: Vec<(String, &[u8], bool)> = vec![("OEBPS/style.css".into(), css.as_bytes(), false)];
+    entries.extend(chapters.iter().enumerate().map(|(k, c)| (format!("OEBPS/{}", chapter_file(k)), c.as_bytes(), false)));
+    entries.extend(images.iter().map(|(name, (_, data))| (format!("OEBPS/{name}"), *data, true)));
+    entries.extend(opts.fonts.iter().enumerate().map(|(k, f)| (format!("OEBPS/{}", font_file(k, f).0), f.data.as_slice(), false)));
+    let cover_xhtml = opts.cover.as_ref().map(|c| {
+        format!(
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\" xml:lang=\"{lang}\">\n<head><meta charset=\"utf-8\"/><title>{}</title><style>body{{margin:0;text-align:center}} img{{max-width:100%;max-height:100vh}}</style></head>\n<body epub:type=\"cover\"><img src=\"{}\" alt=\"{}\"/></body>\n</html>\n",
+            xml_text(&title),
+            cover_file(c).0,
+            xml_attr(&title)
+        )
+    });
+    if let (Some(c), Some(xhtml)) = (&opts.cover, &cover_xhtml) {
+        entries.push((format!("OEBPS/{}", cover_file(c).0), c.as_slice(), true));
+        entries.push(("OEBPS/cover.xhtml".into(), xhtml.as_bytes(), false));
+    }
+    write_package(&opf, &nav, entries)
+}
diff --git a/crates/epub/src/story_writer.rs b/crates/epub/src/story_writer.rs
new file mode 100644
index 000000000..aed443d0b
--- /dev/null
+++ b/crates/epub/src/story_writer.rs
@@ -0,0 +1,439 @@
+use super::chapters::{CHAPTER_MARK, heading_level, starts_chapter};
+use super::css::{char_classes, export_mapping, override_css, para_classes};
+use super::html::asset_path;
+use super::markup::{safe_mime, story_markup, xml_attr, xml_text};
+use super::*;
+
+/// Closes the open list, if any.
+fn close_list(list: &mut Option<&str>, out: &mut String) {
+    if let Some(l) = list.take() {
+        let _ = writeln!(out, "</{}>", l.split(' ').next().unwrap_or(l));
+    }
+}
+
+/// Closes the open preformatted block and list, if any.
+fn close_blocks(list: &mut Option<&str>, pre: &mut Option<(String, bool)>, out: &mut String) {
+    if pre.take().is_some() {
+        out.push_str("</pre>\n");
+    }
+    close_list(list, out);
+}
+
+/// Nesting limit for stories inside stories (table cells, footnotes, tables in cells), so a deeply
+/// nested or cyclic document can't recurse without bound.
+const MAX_DEPTH: usize = 8;
+
+/// Writes stories with their tables and notes, numbering notes across the stories of one export.
+pub(crate) struct StoryWriter<'a, 'f> {
+    doc: &'a Document,
+    pc: BTreeMap<&'a str, String>,
+    cc: BTreeMap<&'a str, String>,
+    /// EPUB structural semantics (`epub:type`); plain HTML doesn't declare the namespace.
+    epub: bool,
+    /// Notes written so far, for unique element ids.
+    footnote_ids: u32,
+    endnote_ids: u32,
+    /// Number shown on the next footnote and endnote of the current story.
+    next_footnote: u32,
+    next_endnote: u32,
+    /// Endnotes met so far: (number, list item markup).
+    endnotes: Vec<(u32, String)>,
+    /// Names each packaged file (a package path, or a data URI for single-file HTML). Without
+    /// it, anchored objects are left out.
+    img_src: Option<&'f dyn Fn(&str, &str, &[u8]) -> String>,
+    /// Images, video and sound met so far, by package name.
+    pub(crate) images: BTreeMap<String, (&'a str, &'a [u8])>,
+    /// Asset names of the images written without alt text (decorative).
+    pub(crate) no_alt: Vec<String>,
+    /// Prefix of the `id`s the current story's headings get (`{prefix}-p{paragraph index}`, the
+    /// targets of the table of contents); only top-level paragraphs get one.
+    heading_ids: Option<String>,
+    /// Where EPUB content files start (see [`starts_chapter`]).
+    pub(crate) split: EpubSplit,
+}
+
+impl<'a, 'f> StoryWriter<'a, 'f> {
+    pub(crate) fn new(doc: &'a Document, epub: bool, img_src: Option<&'f dyn Fn(&str, &str, &[u8]) -> String>) -> Self {
+        StoryWriter {
+            doc,
+            pc: para_classes(&doc.styles),
+            cc: char_classes(&doc.styles),
+            epub,
+            footnote_ids: 0,
+            endnote_ids: 0,
+            next_footnote: 1,
+            next_endnote: 1,
+            endnotes: Vec::new(),
+            img_src,
+            images: BTreeMap::new(),
+            no_alt: Vec::new(),
+            heading_ids: None,
+            split: doc.settings.epub_split.clone(),
+        }
+    }
+
+    fn epub_type(&self, t: &str) -> String {
+        if self.epub { format!(" epub:type=\"{t}\"") } else { String::new() }
+    }
+
+    /// One document story: paragraphs, tables, and each footnote after the paragraph that refers
+    /// to it.
+    pub(crate) fn story(&mut self, sid: StoryId, heading_ids: Option<&str>) -> String {
+        let Some(st) = self.doc.story(sid) else { return String::new() };
+        self.heading_ids = heading_ids.map(str::to_string);
+        self.next_footnote = self.doc.footnote_start(sid);
+        self.next_endnote = self.doc.endnote_start(sid);
+        let mut out = String::new();
+        self.paragraphs(st, 0, "", &mut out);
+        out
+    }
+
+    /// `st`'s paragraphs. `lead` (a note's number) starts the first paragraph.
+    ///
+    /// Consecutive `li` paragraphs share one list (`ol` for a numbered style, `ul` for a bulleted
+    /// one, an unmarked `ul` when the style has no list type of its own, e.g. typed bullets), and
+    /// consecutive `pre` paragraphs of one style one block, their lines separated by newlines.
+    fn paragraphs(&mut self, st: &Story, depth: usize, lead: &str, out: &mut String) {
+        let doc = self.doc;
+        let mut lead = lead;
+        let mut list: Option<&str> = None;
+        let mut pre: Option<(String, bool)> = None;
+        for (pi, (r, pf)) in st.para_ranges().into_iter().zip(&st.paras).enumerate() {
+            let Some(text) = st.text.get(r.clone()) else { continue };
+            let table = pf.table.and_then(|id| st.tables.get(&id)).filter(|_| text.contains(story::TABLE_ANCHOR));
+            let only_table = table.is_some() && text.chars().all(|c| c == story::TABLE_ANCHOR || c.is_whitespace());
+            if !only_table || !lead.is_empty() {
+                // Export Tagging: the style's element and class.
+                let (tag, class) = export_mapping(&doc.styles, &pf.style, false, &self.pc);
+                let props = doc.styles.resolve_para(pf).0;
+                let rtl = props.direction == designcraft_doc::TextDirection::RightToLeft;
+                // Chapter files start only at top-level paragraphs, after any open list or
+                // preformatted block is closed, so each file stays balanced.
+                if depth == 0 && self.heading_ids.is_some() && starts_chapter(&self.split, &doc.styles, &pf.style) {
+                    close_blocks(&mut list, &mut pre, out);
+                    out.push_str(CHAPTER_MARK);
+                }
+                let continues_pre = tag == "pre" && pre.as_ref() == Some(&(class.clone(), rtl));
+                if !continues_pre && pre.take().is_some() {
+                    out.push_str("</pre>\n");
+                }
+                let list_tag = (tag == "li").then_some(match props.list_type {
+                    designcraft_doc::ListType::Numbers => "ol",
+                    designcraft_doc::ListType::Bullets => "ul",
+                    designcraft_doc::ListType::None => "ul style=\"list-style:none\"",
+                });
+                if list != list_tag {
+                    close_list(&mut list, out);
+                    if let Some(l) = list_tag {
+                        let _ = writeln!(out, "<{l}>");
+                    }
+                    list = list_tag;
+                }
+                if continues_pre {
+                    out.push('\n');
+                } else {
+                    let id = match &self.heading_ids {
+                        Some(prefix) if depth == 0 && heading_level(tag).is_some() => format!(" id=\"{prefix}-p{pi}\""),
+                        _ => String::new(),
+                    };
+                    let _ = write!(out, "<{tag}{id} class=\"{}\"{}>", xml_attr(&class), if rtl { " dir=\"rtl\"" } else { "" });
+                }
+                out.push_str(lead);
+                if lead.is_empty() && text.trim().is_empty() {
+                    out.push_str("&#160;");
+                }
+                lead = "";
+                let mut after = String::new();
+                if !only_table {
+                    self.runs(st, r, depth, out, &mut after);
+                }
+                if tag == "pre" {
+                    // Closed when the next paragraph isn't a line of the same block.
+                    pre = Some((class, rtl));
+                } else {
+                    let _ = writeln!(out, "</{tag}>");
+                }
+                // Footnotes follow the paragraph outside any list or preformatted block.
+                if !after.is_empty() {
+                    close_blocks(&mut list, &mut pre, out);
+                    out.push_str(&after);
+                }
+            }
+            if let Some(t) = table
+                && depth < MAX_DEPTH
+            {
+                close_blocks(&mut list, &mut pre, out);
+                self.table(t, depth + 1, out);
+            }
+        }
+        close_blocks(&mut list, &mut pre, out);
+    }
+
+    /// The markup for one run's text `raw` (starting at byte `a` of the story): anchored objects
+    /// and notes where their marks are.
+    fn run_markup(&mut self, st: &Story, raw: &str, a: usize, depth: usize, after: &mut String) -> String {
+        let doc = self.doc;
+        let mut t = String::new();
+        let mut seg_start = 0;
+        // Index of the next anchored object: marks count from the story start, as
+        // `Story::object_at` counts them (counted once, at the run's first mark).
+        let mut mark: Option<usize> = None;
+        for (i, c) in raw.char_indices() {
+            if c != FOOTNOTE_REF && c != ENDNOTE_REF && c != OBJECT_MARK {
+                continue;
+            }
+            t.push_str(&run_text(doc, raw.get(seg_start..i).unwrap_or_default()));
+            seg_start = i + c.len_utf8();
+            if c == OBJECT_MARK {
+                let k = mark.unwrap_or_else(|| st.text.get(..a).map_or(0, |t| t.matches(OBJECT_MARK).count()));
+                mark = Some(k.saturating_add(1));
+                if let Some(o) = st.objects.get(k) {
+                    t.push_str(&self.object(o));
+                }
+            } else if depth < MAX_DEPTH {
+                if c == FOOTNOTE_REF {
+                    self.footnote(st, a + i, depth, &mut t, after);
+                } else {
+                    self.endnote(st, a + i, depth, &mut t);
+                }
+            }
+        }
+        t.push_str(&run_text(doc, raw.get(seg_start..).unwrap_or_default()));
+        t
+    }
+
+    /// The runs of paragraph `para` of `st`; footnotes go to `after`.
+    fn runs(&mut self, st: &Story, para: std::ops::Range<usize>, depth: usize, out: &mut String, after: &mut String) {
+        let doc = self.doc;
+        for (rr, f) in st.runs() {
+            let a = rr.start.max(para.start);
+            let b = rr.end.min(para.end);
+            if a >= b {
+                continue;
+            }
+            // Hidden conditional text isn't exported.
+            if f.over.conditions.as_deref().is_some_and(|c| doc.conditions_hide(c)) || f.over.change == Some(designcraft_doc::ChangeMark::Deleted) {
+                continue;
+            }
+            let Some(raw) = st.text.get(a..b) else { continue };
+            let t = self.run_markup(st, raw, a, depth, after);
+            let (ctag, cls) = if f.style != story::NO_CHAR_STYLE {
+                let (tag, class) = export_mapping(&doc.styles, &f.style, true, &self.cc);
+                (tag, format!(" class=\"{}\"", xml_attr(&class)))
+            } else {
+                ("span", String::new())
+            };
+            let style = override_css(doc, &f.over);
+            let style_attr = if style.is_empty() { String::new() } else { format!(" style=\"{}\"", xml_attr(&style)) };
+            if cls.is_empty() && style_attr.is_empty() {
+                out.push_str(&t);
+            } else {
+                let _ = write!(out, "<{ctag}{cls}{style_attr}>{t}</{ctag}>");
+            }
+        }
+    }
+
+    /// An anchored object where it is anchored: its graphics in the text, an above-line object as
+    /// a block of its own. Anchored text frames are left out.
+    fn object(&mut self, o: &AnchoredObject) -> String {
+        let mut out = String::new();
+        o.item.walk(&mut |it| {
+            if let Some((markup, _)) = self.graphic(it) {
+                out.push_str(&markup);
+            }
+        });
+        match &o.position {
+            AnchorPosition::AboveLine { align, .. } if !out.is_empty() => {
+                let align = match align {
+                    designcraft_doc::anchored::AnchorAlign::Left => "left",
+                    designcraft_doc::anchored::AnchorAlign::Center => "center",
+                    designcraft_doc::anchored::AnchorAlign::Right => "right",
+                };
+                format!("<span class=\"anchored\" style=\"display:block;text-align:{align}\">{out}</span>")
+            }
+            _ => out,
+        }
+    }
+
+    /// The markup for one graphic item: an `<img>`, or an HTML5 player for video and sound (with
+    /// `true`), its file registered in `images`. `None` for an item that isn't a graphic, whose
+    /// asset has no data, or when the writer names no files.
+    pub(crate) fn graphic(&mut self, it: &Item) -> Option<(String, bool)> {
+        let img_src = self.img_src?;
+        let doc = self.doc;
+        let Content::Graphic(g) = &it.content else { return None };
+        let a = doc.assets.get(&g.asset)?;
+        if a.data.is_empty() {
+            return None;
+        }
+        let mime = safe_mime(&a.mime);
+        // Video and sound: an HTML5 player (with the poster, when there is one).
+        if let Some(kind) = designcraft_doc::media_kind(mime) {
+            let name = asset_path("media", a, mime);
+            self.images.insert(name.clone(), (mime, a.data.as_slice()));
+            let m = it.media.clone().unwrap_or_default();
+            let mut attrs = String::new();
+            for (on, attr) in [(m.controls, " controls=\"controls\""), (m.play_on_page_load, " autoplay=\"autoplay\""), (m.looping, " loop=\"loop\"")]
+            {
+                if on {
+                    attrs.push_str(attr);
+                }
+            }
+            if let Some(pa) = m.poster.and_then(|p| doc.assets.get(&p)) {
+                let poster_mime = safe_mime(&pa.mime);
+                let pn = asset_path("images", pa, poster_mime);
+                self.images.insert(pn.clone(), (poster_mime, pa.data.as_slice()));
+                if kind == "video" {
+                    attrs.push_str(&format!(" poster=\"{}\"", xml_attr(&img_src(&pn, poster_mime, &pa.data))));
+                }
+            }
+            let markup = format!("<{kind} src=\"{}\"{attrs}>{}</{kind}>", xml_attr(&img_src(&name, mime, &a.data)), xml_text(&a.name));
+            return Some((markup, true));
+        }
+        let name = asset_path("images", a, mime);
+        self.images.insert(name.clone(), (mime, a.data.as_slice()));
+        // Alt text from Object Export Options; without one the image counts as decorative
+        // (`alt=""`): a file name read aloud helps nobody.
+        if it.alt_text.trim().is_empty() {
+            self.no_alt.push(a.name.clone());
+        }
+        Some((format!("<img src=\"{}\" alt=\"{}\"/>", xml_attr(&img_src(&name, mime, &a.data)), xml_attr(&it.alt_text)), false))
+    }
+
+    /// The footnote whose reference is at byte `pos` of `st`: a note reference in `out`, the note
+    /// itself in `after`.
+    fn footnote(&mut self, st: &Story, pos: usize, depth: usize, out: &mut String, after: &mut String) {
+        let Some(note) = st.notes.get(st.notes_before(pos)) else { return };
+        let doc = self.doc;
+        let o = &doc.footnote_options;
+        let n = self.next_footnote;
+        self.next_footnote = n.saturating_add(1);
+        self.footnote_ids = self.footnote_ids.saturating_add(1);
+        let id = self.footnote_ids;
+        let _ = write!(
+            out,
+            "<sup><a{} role=\"doc-noteref\" id=\"fnref-{id}\" href=\"#fn-{id}\">{}</a></sup>",
+            self.epub_type("noteref"),
+            xml_text(&o.label(n, false))
+        );
+        let lead = format!("<a href=\"#fnref-{id}\">{}</a> ", xml_text(&o.label(n, true)));
+        let mut body = String::new();
+        self.paragraphs(&note.text, depth + 1, &lead, &mut body);
+        let _ = write!(after, "<aside{} role=\"doc-footnote\" id=\"fn-{id}\">\n{body}</aside>\n", self.epub_type("footnote"));
+    }
+
+    /// The endnote whose reference is at byte `pos` of `st`: a note reference in `out`; the note
+    /// joins the endnotes section.
+    fn endnote(&mut self, st: &Story, pos: usize, depth: usize, out: &mut String) {
+        let Some(note) = st.endnotes.get(st.endnotes_before(pos)) else { return };
+        let n = self.next_endnote;
+        self.next_endnote = n.saturating_add(1);
+        self.endnote_ids = self.endnote_ids.saturating_add(1);
+        let id = self.endnote_ids;
+        let label = xml_text(&self.doc.endnote_options.label(n));
+        let _ = write!(out, "<sup><a{} role=\"doc-noteref\" id=\"enref-{id}\" href=\"#en-{id}\">{label}</a></sup>", self.epub_type("noteref"));
+        let mut body = String::new();
+        self.paragraphs(&note.text, depth + 1, &format!("<a href=\"#enref-{id}\">{label}</a> "), &mut body);
+        let item = format!("<li{} id=\"en-{id}\">\n{body}</li>\n", self.epub_type("endnote"));
+        self.endnotes.push((n, item));
+    }
+
+    /// The endnotes met so far, in number order, as one section (empty when there are none).
+    pub(crate) fn endnotes_section(&mut self) -> String {
+        if self.endnotes.is_empty() {
+            return String::new();
+        }
+        self.endnotes.sort_by_key(|(n, _)| *n);
+        let doc = self.doc;
+        let o = &doc.endnote_options;
+        let mut out = format!("<section{} role=\"doc-endnotes\" id=\"endnotes\">\n", self.epub_type("endnotes"));
+        if !o.heading.trim().is_empty() {
+            let (tag, class) = export_mapping(&doc.styles, &o.heading_style, false, &self.pc);
+            let _ = writeln!(out, "<{tag} class=\"{}\">{}</{tag}>", xml_attr(&class), xml_text(&o.heading));
+        }
+        out.push_str("<ol style=\"list-style: none; padding-left: 0\">\n");
+        for (_, item) in &self.endnotes {
+            out.push_str(item);
+        }
+        out.push_str("</ol>\n</section>\n");
+        out
+    }
+
+    /// One table cell with its row and column spans, as `th` or `td`.
+    fn table_cell(&mut self, text: &Story, cell_tag: &str, (rs, cs): (usize, usize), depth: usize, out: &mut String) {
+        let _ = write!(out, "<{cell_tag}");
+        if rs > 1 {
+            let _ = write!(out, " rowspan=\"{rs}\"");
+        }
+        if cs > 1 {
+            let _ = write!(out, " colspan=\"{cs}\"");
+        }
+        out.push('>');
+        self.paragraphs(text, depth, "", out);
+        let _ = writeln!(out, "</{cell_tag}>");
+    }
+
+    /// A table: header rows as `thead`, footer rows as `tfoot`, merged cells as row and column
+    /// spans (kept within their row group).
+    fn table(&mut self, t: &Table, depth: usize, out: &mut String) {
+        let (nr, nc) = (t.nrows(), t.ncols());
+        if nr.checked_mul(nc) != Some(t.cells.len()) {
+            return;
+        }
+        let (h, f) = (t.header_rows(), t.footer_rows());
+        let body_end = nr.saturating_sub(f).max(h);
+        let mut covered = vec![false; t.cells.len()];
+        out.push_str("<table>\n");
+        for (rows, group, cell_tag) in [(0..h, "thead", "th"), (h..body_end, "tbody", "td"), (body_end..nr, "tfoot", "td")] {
+            if rows.is_empty() {
+                continue;
+            }
+            let _ = writeln!(out, "<{group}>");
+            for r in rows.clone() {
+                out.push_str("<tr>");
+                for c in 0..nc {
+                    let i = r * nc + c;
+                    if covered.get(i).copied().unwrap_or(true) {
+                        continue;
+                    }
+                    let Some(cell) = t.cells.get(i) else { continue };
+                    let rs = (cell.row_span.max(1) as usize).min(rows.end - r);
+                    let cs = (cell.col_span.max(1) as usize).min(nc - c);
+                    for rr in r..r + rs {
+                        for cc in c..c + cs {
+                            if let Some(slot) = covered.get_mut(rr * nc + cc) {
+                                *slot = true;
+                            }
+                        }
+                    }
+                    self.table_cell(&cell.text, cell_tag, (rs, cs), depth, out);
+                }
+                out.push_str("</tr>\n");
+            }
+            let _ = writeln!(out, "</{group}>");
+        }
+        out.push_str("</table>\n");
+    }
+}
+
+/// Run text with variables replaced by their values.
+fn run_text(doc: &Document, raw: &str) -> String {
+    if raw.chars().any(|c| designcraft_doc::vars::var_index(c).is_some()) {
+        let sub: String = raw
+            .chars()
+            .map(|c| match designcraft_doc::vars::var_index(c) {
+                Some(i) => doc.variable_value(i, None).unwrap_or_default(),
+                None => c.to_string(),
+            })
+            .collect();
+        story_markup(&sub)
+    } else {
+        story_markup(raw)
+    }
+}
+
+/// One story as XHTML: paragraphs, tables, and each footnote after the paragraph that refers to
+/// it. Endnote references link to the endnotes section that the full export ends with.
+pub fn story_html(doc: &Document, sid: StoryId) -> String {
+    StoryWriter::new(doc, true, None).story(sid, None)
+}
diff --git a/crates/epub/src/tests.rs b/crates/epub/src/tests.rs
new file mode 100644
index 000000000..f216fe95f
--- /dev/null
+++ b/crates/epub/src/tests.rs
@@ -0,0 +1,924 @@
+use super::*;
+use designcraft_doc::build::NewDocument;
+use designcraft_doc::geom::{Affine, Rect, shapes};
+use designcraft_doc::{Asset, AssetId, Content, Graphic, Item, ItemId, ParaFormat, Shape, SpreadRef, Story, StoryId, Table};
+use std::io::Read;
+use std::sync::Arc;
+
+#[test]
+fn exports_valid_package_in_reading_order() {
+    let mut d = Document::new(&NewDocument { pages: 2, ..Default::default() });
+    let lid = d.default_layer();
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 400.0, 300.0, 500.0), lid, "Second <b> & co", ParaFormat::default()).unwrap();
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "First\nline two", ParaFormat::default()).unwrap();
+    let bytes = export_epub(&d, &EpubOptions::default()).unwrap();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
+    assert_eq!(z.by_index(0).unwrap().name(), "mimetype");
+    let mut html = String::new();
+    z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut html).unwrap();
+    let a = html.find("First").unwrap();
+    let b = html.find("Second &lt;b&gt; &amp; co").unwrap();
+    assert!(a < b, "reading order");
+    assert!(html.contains("<p class=\"basic-paragraph\">"));
+    let mut css = String::new();
+    z.by_name("OEBPS/style.css").unwrap().read_to_string(&mut css).unwrap();
+    assert!(css.contains("p.basic-paragraph"));
+    assert!(z.by_name("OEBPS/nav.xhtml").is_ok());
+}
+
+/// #766: anchored graphics are exported where they are anchored (inline in the text, an
+/// above-line object as a block of its own), and their images go into the package.
+#[test]
+fn anchored_objects_are_exported_in_place() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 200.0), lid, "AB\nCD", ParaFormat::default()).unwrap();
+    let aid = AssetId(d.alloc());
+    d.assets.insert(
+        aid,
+        Arc::new(Asset {
+            page: 0,
+            id: aid,
+            name: "dot.png".into(),
+            mime: "image/png".into(),
+            link: None,
+            data: Arc::new(vec![7]),
+            pixels: Some((1, 1)),
+            ..Default::default()
+        }),
+    );
+    let graphic = |d: &mut Document, alt: &str| {
+        let mut item = Item::new(ItemId(d.alloc()), lid, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)));
+        item.alt_text = alt.into();
+        item.content = Content::Graphic(Graphic {
+            layer_options: None,
+            asset: aid,
+            size: (1.0, 1.0),
+            xf: Affine::IDENTITY,
+            auto_fit: Default::default(),
+            fit_align: 4,
+            crop: [0.0; 4],
+            clip: None,
+            wrap: Default::default(),
+            fill: Default::default(),
+        });
+        item
+    };
+    let inline = designcraft_doc::AnchoredObject::new(graphic(&mut d, "inline"), designcraft_doc::AnchorPosition::Inline { y_offset: 0.0 });
+    let above = designcraft_doc::AnchoredObject::new(
+        graphic(&mut d, "above"),
+        designcraft_doc::AnchorPosition::AboveLine { align: designcraft_doc::anchored::AnchorAlign::Center, space_before: 0.0, space_after: 0.0 },
+    );
+    let st = d.story_mut(sid).unwrap();
+    st.insert_object(1, inline);
+    // Byte offsets: "A" (1), the mark (3), "B\nC" (3): the second object goes between C and D.
+    st.insert_object(7, above);
+    // An anchored image without alt text is decorative and reported, like a placed one.
+    let bare = designcraft_doc::AnchoredObject::new(graphic(&mut d, ""), designcraft_doc::AnchorPosition::Inline { y_offset: 0.0 });
+    let end = d.story(sid).unwrap().text.len();
+    d.story_mut(sid).unwrap().insert_object(end, bare);
+    assert_eq!(images_without_alt(&d), vec!["dot.png".to_string()]);
+    let bytes = export_epub(&d, &EpubOptions::default()).unwrap();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
+    let mut html = String::new();
+    z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut html).unwrap();
+    let img = |alt: &str| format!("<img src=\"images/dot-{}.png\" alt=\"{alt}\"/>", aid.0);
+    assert!(html.contains(&format!("A{}B</p>", img("inline"))), "{html}");
+    assert!(html.contains(&format!("C<span class=\"anchored\" style=\"display:block;text-align:center\">{}</span>D", img("above"))), "{html}");
+    assert!(z.by_name(&format!("OEBPS/images/dot-{}.png", aid.0)).is_ok(), "the image is in the package");
+    let page = export_html(&d, &HtmlOptions::default());
+    assert!(page.contains("alt=\"inline\"") && page.contains("alt=\"above\""), "{page}");
+    // story_html on its own still leaves objects out.
+    assert!(!story_html(&d, sid).contains("<img"));
+}
+
+#[test]
+fn iso8601_timestamps() {
+    for (t, want) in [
+        (0, "1970-01-01T00:00:00Z"),
+        (951_782_400, "2000-02-29T00:00:00Z"),
+        (1_791_891_000, "2026-10-13T11:30:00Z"),
+        (-86_400, "1969-12-31T00:00:00Z"),
+        // Years past 9999 keep the plain zero-padded year (no `+`).
+        (253_402_300_800, "10000-01-01T00:00:00Z"),
+        // Beyond chrono's range the old `civil_from_days` still converted; pin that output
+        // (never the epoch) in both directions and at the `i64` extremes.
+        (10_000_000_000_000, "318857-05-20T17:46:40Z"),
+        (-10_000_000_000_000, "-314918-08-13T06:13:20Z"),
+        (i64::MAX, "292277026596-12-04T15:30:07Z"),
+        (i64::MIN, "-292277022657-01-27T08:29:52Z"),
+    ] {
+        assert_eq!(iso8601(t), want);
+    }
+}
+
+/// #771, #773: dcterms:modified is a real time, the default identifier is a stable urn:uuid
+/// that differs between documents with the same title, and a JPEG cover keeps its type.
+#[test]
+fn package_metadata_and_cover_image() {
+    let opf = |d: &Document, opts: &EpubOptions| {
+        let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(d, opts).unwrap())).unwrap();
+        let mut s = String::new();
+        z.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut s).unwrap();
+        let names: Vec<String> = z.file_names().map(str::to_string).collect();
+        (s, names)
+    };
+    let id_of = |opf: &str| opf.split("<dc:identifier id=\"bookid\">").nth(1).and_then(|r| r.split('<').next()).unwrap_or_default().to_string();
+    let mut a = Document::new(&NewDocument::default());
+    a.title = "Same".into();
+    a.created = 1_700_000_000;
+    let mut b = a.clone();
+    b.created = 1_700_000_001;
+    let (oa, _) = opf(&a, &EpubOptions::default());
+    let (oa2, _) = opf(&a, &EpubOptions::default());
+    let (ob, _) = opf(&b, &EpubOptions::default());
+    assert!(id_of(&oa).starts_with("urn:uuid:") && id_of(&oa).len() == 45, "{}", id_of(&oa));
+    assert_eq!(id_of(&oa), id_of(&oa2), "stable from export to export");
+    assert_ne!(id_of(&oa), id_of(&ob), "not shared by two books with the same title");
+    // Modified: the given time, else the document's save (or creation) time.
+    assert!(oa.contains("<meta property=\"dcterms:modified\">2023-11-14T22:13:20Z</meta>"), "{oa}");
+    let at = EpubOptions { modified: Some(1_791_891_000), ..Default::default() };
+    assert!(opf(&a, &at).0.contains("2026-10-13T11:30:00Z"));
+    // A JPEG cover is packaged as such.
+    let jpeg = EpubOptions { cover: Some(vec![0xFF, 0xD8, 0xFF, 0xE0, 1, 2]), ..Default::default() };
+    let (o, names) = opf(&a, &jpeg);
+    assert!(o.contains("href=\"images/cover.jpg\" media-type=\"image/jpeg\" properties=\"cover-image\""), "{o}");
+    assert!(names.contains(&"OEBPS/images/cover.jpg".to_string()), "{names:?}");
+}
+
+fn st_typed(d: &mut Document, sid: StoryId) {
+    if let Some(st) = d.story_mut(sid) {
+        st.paras[8].style = "Typed".into();
+    }
+}
+
+/// #767: consecutive `li` paragraphs share one list (`ol` for a numbered style), and
+/// consecutive `pre` paragraphs of one style one block with their lines on separate lines.
+#[test]
+fn lists_and_preformatted_blocks_are_grouped() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    for (name, tag, list) in [
+        ("Bullet", "li", Some(designcraft_doc::ListType::Bullets)),
+        ("Number", "li", Some(designcraft_doc::ListType::Numbers)),
+        ("Typed", "li", None),
+        ("Code", "pre", None),
+    ] {
+        let para = designcraft_doc::ParaAttrs { list_type: list, ..Default::default() };
+        d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
+            name: name.into(),
+            based_on: None,
+            next_style: None,
+            para,
+            chars: CharAttrs::default(),
+            shortcut: String::new(),
+        });
+        d.styles_mut()
+            .export_tags
+            .insert(format!("p:{name}"), designcraft_doc::ExportTag { tag: tag.into(), class: String::new(), ..Default::default() });
+    }
+    let text = "Intro\nfirst\nsecond\none\ntwo\nx = 1\ny = 2\nEnd\n• typed";
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 300.0), lid, text, ParaFormat::default()).unwrap();
+    let st = d.story_mut(sid).unwrap();
+    for (i, style) in ["Bullet", "Bullet", "Number", "Number", "Code", "Code"].into_iter().enumerate() {
+        st.paras[i + 1].style = style.into();
+    }
+    let html = story_html(&d, sid);
+    let li = |c: &str, t: &str| format!("<li class=\"{c}\">{t}</li>");
+    assert!(
+        html.contains(&format!(
+            "<ul>\n{}\n{}\n</ul>\n<ol>\n{}\n{}\n</ol>\n",
+            li("bullet", "first"),
+            li("bullet", "second"),
+            li("number", "one"),
+            li("number", "two")
+        )),
+        "{html}"
+    );
+    assert!(html.contains("<pre class=\"code\">x = 1\ny = 2</pre>\n<p class=\"basic-paragraph\">End</p>"), "{html}");
+    assert_eq!(html.matches("<pre").count(), 1, "{html}");
+    // A style without a list type of its own (typed bullets) gets no second marker.
+    st_typed(&mut d, sid);
+    let html = story_html(&d, sid);
+    assert!(html.contains("<ul style=\"list-style:none\">\n<li class=\"typed\">• typed</li>\n</ul>\n"), "{html}");
+}
+
+/// #769, #770: the navigation lists the h1–h3 headings (nested by level) and links to them,
+/// with its title in the book's language; without headings, each story's first paragraph.
+#[test]
+fn navigation_follows_the_headings() {
+    let mut d = Document::new(&NewDocument { pages: 2, ..Default::default() });
+    let lid = d.default_layer();
+    for (name, tag) in [("Chapter", "h1"), ("Section", "h2")] {
+        d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
+            name: name.into(),
+            based_on: None,
+            next_style: None,
+            para: Default::default(),
+            chars: CharAttrs::default(),
+            shortcut: String::new(),
+        });
+        d.styles_mut()
+            .export_tags
+            .insert(format!("p:{name}"), designcraft_doc::ExportTag { tag: tag.into(), class: String::new(), ..Default::default() });
+    }
+    let text = "One\nBody\nOne point one\nMore\nTwo\nText";
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 300.0), lid, text, ParaFormat::default()).unwrap();
+    let st = d.story_mut(sid).unwrap();
+    for (i, style) in [(0, "Chapter"), (2, "Section"), (4, "Chapter")] {
+        st.paras[i].style = style.into();
+    }
+    // A story that starts with body text adds nothing to the table of contents.
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 400.0, 300.0, 500.0), lid, "Text after the figure.", ParaFormat::default()).unwrap();
+    let read = |d: &Document, opts: &EpubOptions, path: &str| {
+        let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(d, opts).unwrap())).unwrap();
+        let mut s = String::new();
+        z.by_name(path).unwrap().read_to_string(&mut s).unwrap();
+        s
+    };
+    let nl = EpubOptions { language: "nl".into(), ..Default::default() };
+    let nav = read(&d, &nl, "OEBPS/nav.xhtml");
+    let link = |f: &str, t: &str, l: &str| format!("<a href=\"{f}#{t}\">{l}</a>");
+    // Split Document is off: every heading is in the one content file.
+    let want = format!(
+        "<h1>Inhoud</h1><ol><li>{}<ol><li>{}</li></ol></li><li>{}</li></ol>",
+        link("content.xhtml", "s0-p0", "One"),
+        link("content.xhtml", "s0-p2", "One point one"),
+        link("content.xhtml", "s0-p4", "Two")
+    );
+    assert!(nav.contains(&want), "{nav}");
+    assert!(!nav.contains("Text after the figure"), "{nav}");
+    let content = read(&d, &nl, "OEBPS/content.xhtml");
+    assert!(content.contains("<h1 id=\"s0-p0\" class=\"chapter\">One</h1>") && content.contains("<h2 id=\"s0-p2\""), "{content}");
+    let custom = EpubOptions { toc_title: Some("In dit boek".into()), ..Default::default() };
+    assert!(read(&d, &custom, "OEBPS/nav.xhtml").contains("<h1>In dit boek</h1>"));
+    // Without headings: one entry per story, its first paragraph.
+    let mut plain = Document::new(&NewDocument::default());
+    let lid = plain.default_layer();
+    plain.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "Opening\nrest", ParaFormat::default()).unwrap();
+    let nav = read(&plain, &EpubOptions::default(), "OEBPS/nav.xhtml");
+    assert!(nav.contains(&format!("<h1>Contents</h1><ol><li>{}</li></ol>", link("content.xhtml", "s0", "Opening"))), "{nav}");
+    // A heading shallower than the one before it but deeper than its parent stays under the
+    // parent: h1 A, h3 B, h2 C nest B and C under A.
+    let files: BTreeMap<String, String> = "ABCD".chars().map(|c| (c.to_string(), c.to_string())).collect();
+    let e = |t: &str, l: u8| (t.to_string(), t.to_string(), l);
+    assert_eq!(
+        nav_list(&[e("A", 1), e("B", 3), e("C", 2), e("D", 1)], &files),
+        format!(
+            "<li>{}<ol><li>{}</li><li>{}</li></ol></li><li>{}</li>",
+            link("A", "A", "A"),
+            link("B", "B", "B"),
+            link("C", "C", "C"),
+            link("D", "D", "D")
+        )
+    );
+    assert_eq!(
+        nav_list(&[e("A", 1), e("B", 2), e("C", 3), e("D", 1)], &files),
+        format!(
+            "<li>{}<ol><li>{}<ol><li>{}</li></ol></li></ol></li><li>{}</li>",
+            link("A", "A", "A"),
+            link("B", "B", "B"),
+            link("C", "C", "C"),
+            link("D", "D", "D")
+        )
+    );
+}
+
+/// Split Document off (the default) gives one content file, h1s and all. Single Paragraph
+/// Style starts a file before each paragraph of that style, with well-formed sections; the
+/// spine and manifest list the files in order.
+#[test]
+fn chapters_split_before_a_single_paragraph_style() {
+    let mut d = Document::new(&NewDocument { pages: 3, ..Default::default() });
+    let lid = d.default_layer();
+    d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
+        name: "Chapter".into(),
+        based_on: None,
+        next_style: None,
+        para: Default::default(),
+        chars: CharAttrs::default(),
+        shortcut: String::new(),
+    });
+    d.styles_mut()
+        .export_tags
+        .insert("p:Chapter".into(), designcraft_doc::ExportTag { tag: "h1".into(), class: String::new(), ..Default::default() });
+    // A title page without a heading, then a story that opens with a chapter and has a
+    // second one in the middle.
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "Title page", ParaFormat::default()).unwrap();
+    let (_, sid) = d
+        .add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 200.0, 300.0, 400.0), lid, "One\nFirst text\nTwo\nSecond text", ParaFormat::default())
+        .unwrap();
+    let st = d.story_mut(sid).unwrap();
+    st.paras[0].style = "Chapter".into();
+    st.paras[2].style = "Chapter".into();
+    let one_file = |d: &Document, opts: &EpubOptions| {
+        let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(d, opts).unwrap())).unwrap();
+        let mut c = String::new();
+        z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut c).unwrap();
+        z.by_name("OEBPS/content2.xhtml").is_err() && c.contains("Title page") && c.contains("Second text") && !c.contains(CHAPTER_MARK)
+    };
+    assert!(one_file(&d, &EpubOptions::default()), "off by default");
+    d.settings.epub_split = EpubSplit::Style("Chapter".into());
+    assert!(one_file(&d, &EpubOptions { split: Some(EpubSplit::Off), ..Default::default() }), "the export's own setting wins");
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(&d, &EpubOptions::default()).unwrap())).unwrap();
+    let mut read = |path: &str| {
+        let mut s = String::new();
+        z.by_name(path).unwrap().read_to_string(&mut s).unwrap();
+        s
+    };
+    let (c1, c2, c3) = (read("OEBPS/content.xhtml"), read("OEBPS/content2.xhtml"), read("OEBPS/content3.xhtml"));
+    assert!(c1.contains("Title page") && !c1.contains("One"), "{c1}");
+    assert!(c2.contains("<section id=\"s1\">\n<h1 id=\"s1-p0\"") && c2.contains("First text") && !c2.contains("Two"), "{c2}");
+    assert!(c3.contains("<section>\n<h1 id=\"s1-p2\""), "{c3}");
+    for c in [&c1, &c2, &c3] {
+        assert_eq!(c.matches("<section").count(), c.matches("</section>").count(), "{c}");
+        assert!(!c.contains(CHAPTER_MARK));
+    }
+    let opf = read("OEBPS/content.opf");
+    assert!(opf.contains("<itemref idref=\"content\"/>\n<itemref idref=\"content2\"/>\n<itemref idref=\"content3\"/>\n</spine>"), "{opf}");
+    assert!(opf.contains("<item id=\"content3\" href=\"content3.xhtml\""), "{opf}");
+    let nav = read("OEBPS/nav.xhtml");
+    assert!(nav.contains("href=\"content2.xhtml#s1-p0\"") && nav.contains("href=\"content3.xhtml#s1-p2\""), "{nav}");
+    assert!(z.by_name("OEBPS/content4.xhtml").is_err());
+    // HTML stays one page, without the marks.
+    let html = export_html(&d, &HtmlOptions::default());
+    assert!(!html.contains(CHAPTER_MARK) && html.contains("Second text"));
+}
+
+/// Based on export tags, a style with Split Document on starts each chapter file and an h1
+/// without it doesn't; navigation and endnote links point at the files their targets ended
+/// up in.
+#[test]
+fn chapters_split_before_split_document_styles() {
+    let mut d = Document::new(&NewDocument::default());
+    d.settings.epub_split = EpubSplit::ExportTags;
+    let lid = d.default_layer();
+    for (name, tag, split) in [("Part", "p", true), ("Chapter", "h1", false)] {
+        d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
+            name: name.into(),
+            based_on: None,
+            next_style: None,
+            para: Default::default(),
+            chars: CharAttrs::default(),
+            shortcut: String::new(),
+        });
+        d.styles_mut().export_tags.insert(format!("p:{name}"), designcraft_doc::ExportTag { tag: tag.into(), split, ..Default::default() });
+    }
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "Title page", ParaFormat::default()).unwrap();
+    let (_, sid) = d
+        .add_text_frame(
+            SpreadRef::Doc(0),
+            Rect::new(36.0, 200.0, 300.0, 600.0),
+            lid,
+            "Part One\nChapter A\ntext a\nPart Two\nChapter B\ntext b",
+            ParaFormat::default(),
+        )
+        .unwrap();
+    let st = d.story_mut(sid).unwrap();
+    for (i, style) in [(0, "Part"), (1, "Chapter"), (3, "Part"), (4, "Chapter")] {
+        st.paras[i].style = style.into();
+    }
+    // After "text a".
+    st.insert_endnote(25, "End note", ParaFormat::default());
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(&d, &EpubOptions::default()).unwrap())).unwrap();
+    let mut read = |path: &str| {
+        let mut s = String::new();
+        z.by_name(path).unwrap().read_to_string(&mut s).unwrap();
+        s
+    };
+    let (c1, c2, c3) = (read("OEBPS/content.xhtml"), read("OEBPS/content2.xhtml"), read("OEBPS/content3.xhtml"));
+    assert!(c1.contains("Title page") && !c1.contains("Part One"), "{c1}");
+    assert!(c2.contains("Part One") && c2.contains("<h1 id=\"s1-p1\"") && !c2.contains("Part Two"), "the h1 stays with its part: {c2}");
+    assert!(c3.contains("Part Two") && c3.contains("<h1 id=\"s1-p4\"") && c3.contains("End note"), "{c3}");
+    for c in [&c1, &c2, &c3] {
+        assert_eq!(c.matches("<section").count(), c.matches("</section>").count(), "{c}");
+    }
+    let nav = read("OEBPS/nav.xhtml");
+    assert!(nav.contains("href=\"content2.xhtml#s1-p1\"") && nav.contains("href=\"content3.xhtml#s1-p4\""), "{nav}");
+    assert!(c2.contains("href=\"content3.xhtml#en-1\""), "{c2}");
+    assert!(c3.contains("href=\"content2.xhtml#enref-1\""), "the endnote links back across files: {c3}");
+    assert!(z.by_name("OEBPS/content4.xhtml").is_err());
+}
+
+/// Note links stay working across chapter files: endnotes end the book, in the last file.
+#[test]
+fn note_links_point_at_the_chapter_file_of_their_target() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
+        name: "Chapter".into(),
+        based_on: None,
+        next_style: None,
+        para: Default::default(),
+        chars: CharAttrs::default(),
+        shortcut: String::new(),
+    });
+    d.styles_mut()
+        .export_tags
+        .insert("p:Chapter".into(), designcraft_doc::ExportTag { tag: "h1".into(), class: String::new(), ..Default::default() });
+    let (_, sid) = d
+        .add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 400.0), lid, "One\nFirst text\nTwo\nSecond text", ParaFormat::default())
+        .unwrap();
+    let st = d.story_mut(sid).unwrap();
+    st.paras[0].style = "Chapter".into();
+    st.paras[2].style = "Chapter".into();
+    // After "First": an endnote and a footnote.
+    st.insert_endnote(9, "End note", ParaFormat::default());
+    st.insert_note(9, "Foot note", ParaFormat::default());
+    d.settings.epub_split = EpubSplit::Style("Chapter".into());
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(&d, &EpubOptions::default()).unwrap())).unwrap();
+    let mut read = |path: &str| {
+        let mut s = String::new();
+        z.by_name(path).unwrap().read_to_string(&mut s).unwrap();
+        s
+    };
+    let (first, last) = (read("OEBPS/content.xhtml"), read("OEBPS/content2.xhtml"));
+    assert!(first.contains("id=\"enref-1\" href=\"content2.xhtml#en-1\""), "{first}");
+    assert!(first.contains("href=\"#fn-1\"") && first.contains("href=\"#fnref-1\""), "a footnote stays in its chapter: {first}");
+    assert!(last.contains("Second text") && last.contains("<a href=\"content.xhtml#enref-1\">"), "{last}");
+}
+
+/// A split before a list item or a preformatted line closes the open list or block first and
+/// reopens it in the new file, so every file is balanced.
+#[test]
+fn chapter_files_split_inside_lists_and_pre_stay_balanced() {
+    let mut d = Document::new(&NewDocument::default());
+    d.settings.epub_split = EpubSplit::ExportTags;
+    let lid = d.default_layer();
+    for (name, tag) in [("Item", "li"), ("Code", "pre")] {
+        d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
+            name: name.into(),
+            based_on: None,
+            next_style: None,
+            para: Default::default(),
+            chars: CharAttrs::default(),
+            shortcut: String::new(),
+        });
+        d.styles_mut().export_tags.insert(format!("p:{name}"), designcraft_doc::ExportTag { tag: tag.into(), split: true, ..Default::default() });
+    }
+    let (_, sid) = d
+        .add_text_frame(
+            SpreadRef::Doc(0),
+            Rect::new(36.0, 36.0, 300.0, 300.0),
+            lid,
+            "Intro
+one
+two
+x = 1
+y = 2
+End",
+            ParaFormat::default(),
+        )
+        .unwrap();
+    let st = d.story_mut(sid).unwrap();
+    for (i, style) in [(1, "Item"), (2, "Item"), (3, "Code"), (4, "Code")] {
+        st.paras[i].style = style.into();
+    }
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(&d, &EpubOptions::default()).unwrap())).unwrap();
+    let mut read = |path: &str| {
+        let mut s = String::new();
+        z.by_name(path).unwrap().read_to_string(&mut s).unwrap();
+        s
+    };
+    let files: Vec<String> = ["content", "content2", "content3", "content4", "content5"].iter().map(|f| read(&format!("OEBPS/{f}.xhtml"))).collect();
+    for (c, text) in files.iter().zip(["Intro", "one", "two", "x = 1", "y = 2"]) {
+        assert!(c.contains(text), "{text}: {c}");
+        for (open, close) in [("<ul", "</ul>"), ("<pre", "</pre>"), ("<section", "</section>")] {
+            assert_eq!(c.matches(open).count(), c.matches(close).count(), "{open}: {c}");
+        }
+    }
+    assert!(files[1].contains("<ul") && files[2].contains("<ul") && files[3].contains("<pre") && files[4].contains("<pre"));
+    assert!(files[4].contains("End"));
+    assert!(z.by_name("OEBPS/content6.xhtml").is_err());
+}
+
+#[test]
+fn split_chapters_keeps_sections_well_formed() {
+    let m = CHAPTER_MARK;
+    assert_eq!(split_chapters("<section id=\"s0\">\n<p>a</p>\n</section>\n"), vec!["<section id=\"s0\">\n<p>a</p>\n</section>\n"]);
+    assert_eq!(split_chapters(&format!("<section id=\"s0\">\n{m}<h1>A</h1>\n</section>\n")), vec!["<section id=\"s0\">\n<h1>A</h1>\n</section>\n"]);
+    assert_eq!(
+        split_chapters(&format!("<section id=\"s0\">\n<p>a</p>\n{m}<h1>B</h1>\n</section>\n")),
+        vec!["<section id=\"s0\">\n<p>a</p>\n</section>\n", "<section>\n<h1>B</h1>\n</section>\n"]
+    );
+    assert_eq!(split_chapters(""), vec![String::new()]);
+}
+
+#[test]
+fn styles_whose_names_slug_alike_keep_their_own_classes() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    for (name, size) in [("見出し", 30.0), ("本文", 10.0), ("Body Text", 12.0), ("Body-Text", 20.0)] {
+        d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
+            name: name.into(),
+            based_on: None,
+            next_style: None,
+            para: Default::default(),
+            chars: CharAttrs { size: Some(size), ..Default::default() },
+            shortcut: String::new(),
+        });
+    }
+    for (k, name) in ["見出し", "本文", "Body Text", "Body-Text"].into_iter().enumerate() {
+        let y = 36.0 + 100.0 * k as f64;
+        let pf = ParaFormat { style: name.into(), ..Default::default() };
+        d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, y, 300.0, y + 50.0), lid, &format!("P{k}"), pf).unwrap();
+    }
+    let bytes = export_epub(&d, &EpubOptions::default()).unwrap();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
+    let mut html = String::new();
+    z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut html).unwrap();
+    let mut css = String::new();
+    z.by_name("OEBPS/style.css").unwrap().read_to_string(&mut css).unwrap();
+    let class_of = |text: &str| {
+        let end = html.find(&format!("\">{text}</p>")).unwrap();
+        let start = html[..end].rfind("class=\"").unwrap() + 7;
+        html[start..end].to_string()
+    };
+    let classes: Vec<String> = (0..4).map(|k| class_of(&format!("P{k}"))).collect();
+    for (k, c) in classes.iter().enumerate() {
+        assert!(!classes[..k].contains(c), "class `{c}` shared: {classes:?}");
+        assert_eq!(css.matches(&format!("p.{c} {{")).count(), 1, "one rule for `{c}`:\n{css}");
+    }
+}
+
+#[test]
+fn slugs() {
+    assert_eq!(slug("[Basic Paragraph]"), "basic-paragraph");
+    assert_eq!(slug("Body First"), "body-first");
+    assert_eq!(slug("1 Head"), "s-1-head");
+}
+
+#[test]
+fn html_is_one_self_contained_page() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "Hello <web>", ParaFormat::default()).unwrap();
+    let html = export_html(&d, &HtmlOptions { title: Some("T".into()), language: None, ..Default::default() });
+    assert!(html.starts_with("<!DOCTYPE html>") && html.contains("<title>T</title>") && html.contains("Hello &lt;web&gt;"));
+    assert!(html.contains("p.basic-paragraph"), "styles inline");
+    assert_eq!(base64(b"Man"), "TWFu");
+    assert_eq!(base64(b"Ma"), "TWE=");
+    assert_eq!(base64(b"M"), "TQ==");
+}
+
+/// #774: an image without alt text is decorative (`alt=""`) and reported, and package names
+/// come from the original file names.
+#[test]
+fn images_get_readable_names_and_no_file_name_alt() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let place = |d: &mut Document, name: &str, mime: &str, alt: &str, y: f64| {
+        let aid = AssetId(d.alloc());
+        d.assets.insert(
+            aid,
+            Arc::new(Asset {
+                page: 0,
+                id: aid,
+                name: name.into(),
+                mime: mime.into(),
+                link: None,
+                data: Arc::new(vec![1]),
+                pixels: Some((1, 1)),
+                ..Default::default()
+            }),
+        );
+        let mut item = Item::new(ItemId(d.alloc()), lid, Shape::Rectangle, shapes::rectangle(Rect::new(36.0, y, 72.0, y + 36.0)));
+        item.alt_text = alt.into();
+        item.content = Content::Graphic(Graphic {
+            layer_options: None,
+            asset: aid,
+            size: (1.0, 1.0),
+            xf: Affine::IDENTITY,
+            auto_fit: Default::default(),
+            fit_align: 4,
+            crop: [0.0; 4],
+            clip: None,
+            wrap: Default::default(),
+            fill: Default::default(),
+        });
+        d.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+        aid.0
+    };
+    let a = place(&mut d, "/tmp/Anim Frame (1).GIF", "image/gif", "", 36.0);
+    let b = place(&mut d, "photo.jpg", "image/jpeg", "A heron", 120.0);
+    let c = place(&mut d, "???.png", "image/png", "Mark", 200.0);
+    assert_eq!(images_without_alt(&d), vec!["/tmp/Anim Frame (1).GIF".to_string()]);
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(&d, &EpubOptions::default()).unwrap())).unwrap();
+    let mut x = String::new();
+    z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut x).unwrap();
+    assert!(x.contains(&format!("<img src=\"images/anim-frame-1-{a}.gif\" alt=\"\"/>")), "{x}");
+    assert!(x.contains(&format!("<img src=\"images/photo-{b}.jpg\" alt=\"A heron\"/>")), "{x}");
+    assert!(x.contains(&format!("<img src=\"images/{c}.png\" alt=\"Mark\"/>")), "{x}");
+    assert!(z.by_name(&format!("OEBPS/images/anim-frame-1-{a}.gif")).is_ok());
+}
+
+/// #775: the generic fallback follows the font, and embedded fonts are packaged and declared.
+#[test]
+fn generic_fallbacks_and_embedded_fonts() {
+    let none = BTreeMap::new();
+    for (family, want) in [
+        ("Source Serif 4", "serif"),
+        ("Source Sans 3", "sans-serif"),
+        ("Microsoft Sans Serif", "sans-serif"),
+        ("JetBrains Mono", "monospace"),
+        ("Courier New", "monospace"),
+        ("Franklin Gothic", "sans-serif"),
+        ("Garamond", "serif"),
+    ] {
+        assert_eq!(generic_family(family, &none), want, "{family}");
+    }
+    let known: BTreeMap<String, String> = [("Montserrat".to_string(), "sans-serif".to_string()), ("Odd".to_string(), "nonsense".to_string())].into();
+    assert_eq!(generic_family("Montserrat", &known), "sans-serif");
+    assert_eq!(generic_family("Odd", &known), "serif", "only CSS generic families are used");
+    assert_eq!(css_weight_style("Semibold Italic"), (600, "italic"));
+    assert_eq!(css_weight_style("Bold"), (700, "normal"));
+    assert_eq!(css_weight_style("Extra Bold"), (800, "normal"));
+    assert_eq!(css_weight_style("Regular"), (400, "normal"));
+    assert_eq!(css_weight_style("Light"), (300, "normal"));
+    assert_eq!(css_weight_style("Thin Oblique"), (100, "italic"));
+    assert_eq!(css_weight_style("Black"), (900, "normal"));
+
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "Hello", ParaFormat::default()).unwrap();
+    if let Some(basic) = d.styles_mut().paragraph.iter_mut().find(|s| s.name == story::BASIC_PARAGRAPH) {
+        basic.chars.font_family = Some("Montserrat".into());
+        basic.chars.font_style = Some("Bold Italic".into());
+    }
+    assert_eq!(stylesheet_fonts(&d), vec![("Montserrat".to_string(), "Bold Italic".to_string())]);
+    let opts = EpubOptions {
+        generic_families: known,
+        fonts: vec![EmbeddedFont { family: "Montserrat".into(), style: "Bold Italic".into(), data: b"OTTO font".to_vec() }],
+        ..Default::default()
+    };
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(&d, &opts).unwrap())).unwrap();
+    let mut read = |path: &str| {
+        let mut s = String::new();
+        z.by_name(path).unwrap().read_to_string(&mut s).unwrap();
+        s
+    };
+    let css = read("OEBPS/style.css");
+    assert!(
+        css.starts_with(
+            "@font-face { font-family: \"Montserrat\"; src: url(\"fonts/0-montserrat-bold-italic.otf\"); font-weight: 700; font-style: italic; }"
+        ),
+        "{css}"
+    );
+    assert!(css.contains("font-family: \"Montserrat\", sans-serif;"), "{css}");
+    let opf = read("OEBPS/content.opf");
+    assert!(opf.contains("<item id=\"font0\" href=\"fonts/0-montserrat-bold-italic.otf\" media-type=\"font/otf\"/>"), "{opf}");
+    assert_eq!(read("OEBPS/fonts/0-montserrat-bold-italic.otf"), "OTTO font");
+    // HTML takes the generic families too, and embeds nothing.
+    let html = export_html(&d, &HtmlOptions { generic_families: opts.generic_families.clone(), ..Default::default() });
+    assert!(html.contains("\"Montserrat\", sans-serif;") && !html.contains("@font-face"), "{html}");
+}
+
+#[test]
+fn metadata_is_serialized_for_its_output_context() {
+    let mut d = Document::new(&NewDocument::default());
+    d.title = "Field Notes & <Edition>".into();
+    let lid = d.default_layer();
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "A&B <C> \"D\"", ParaFormat::default()).unwrap();
+    d.styles_mut().export_tags.insert(
+        format!("p:{}", story::BASIC_PARAGRAPH),
+        designcraft_doc::ExportTag { tag: "h2".into(), class: "Primary \"Copy\"".into(), ..Default::default() },
+    );
+    if let Some(basic) = d.styles_mut().paragraph.iter_mut().find(|s| s.name == story::BASIC_PARAGRAPH) {
+        basic.chars.font_family = Some("Quoted \"Serif\" <Alt>".into());
+    }
+
+    let aid = AssetId(d.alloc());
+    d.assets.insert(
+        aid,
+        Arc::new(Asset {
+            id: aid,
+            name: "Cover & Notes".into(),
+            mime: "image/png; profile=screen".into(),
+            data: Arc::new(vec![1]),
+            pixels: Some((1, 1)),
+            ..Default::default()
+        }),
+    );
+    let mut item = Item::new(ItemId(d.alloc()), lid, Shape::Rectangle, shapes::rectangle(Rect::new(36.0, 120.0, 72.0, 156.0)));
+    item.alt_text = "Cover \"A\" & B".into();
+    item.content = Content::Graphic(Graphic {
+        layer_options: None,
+        asset: aid,
+        size: (1.0, 1.0),
+        xf: Affine::IDENTITY,
+        clip: None,
+        auto_fit: Default::default(),
+        fit_align: 4,
+        crop: [0.0; 4],
+        wrap: Default::default(),
+        fill: Default::default(),
+    });
+    d.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+
+    let story = story_html(&d, sid);
+    assert!(story.contains("<h2 class=\"Primary &quot;Copy&quot;\">A&amp;B &lt;C&gt; &quot;D&quot;</h2>"));
+    let html = export_html(&d, &HtmlOptions { title: None, language: Some("English (US)".into()), ..Default::default() });
+    assert!(html.contains("<html lang=\"und\">"));
+    assert!(html.contains("<title>Field Notes &amp; &lt;Edition&gt;</title>"));
+    assert!(html.contains("alt=\"Cover &quot;A&quot; &amp; B\""));
+    assert!(html.contains("src=\"data:image/png;base64,AQ==\""));
+    assert!(!html.contains("image/png; profile=screen"));
+    assert!(!stylesheet(&d).contains("<Alt>"));
+    assert!(stylesheet(&d).contains("\\3c Alt\\3e "));
+
+    let bytes = export_epub(
+        &d,
+        &EpubOptions {
+            title: None,
+            author: Some("A & B".into()),
+            language: "English (US)".into(),
+            identifier: Some("notes&edition".into()),
+            cover: None,
+            ..Default::default()
+        },
+    )
+    .unwrap();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
+    let mut opf = String::new();
+    z.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut opf).unwrap();
+    assert!(opf.contains("xml:lang=\"und\""));
+    assert!(opf.contains("<dc:identifier id=\"bookid\">notes&amp;edition</dc:identifier>"));
+    assert!(opf.contains("<dc:creator>A &amp; B</dc:creator>"));
+    assert!(opf.contains("media-type=\"image/png\""));
+}
+
+/// File › File Info's Document Title and Author name the EPUB and the HTML page; the export
+/// options' title and author replace them.
+#[test]
+fn file_info_titles_the_epub_and_the_html_page() {
+    let mut d = Document::new(&NewDocument { title: "flyer-v3".into(), ..Default::default() });
+    d.file_info.document_title = "Spring & Summer".into();
+    d.file_info.author = "Ana Ruiz".into();
+    let opf = |d: &Document, opts: &EpubOptions| {
+        let mut z = zip::ZipArchive::new(std::io::Cursor::new(export_epub(d, opts).unwrap())).unwrap();
+        let mut opf = String::new();
+        z.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut opf).unwrap();
+        opf
+    };
+    let o = opf(&d, &EpubOptions::default());
+    assert!(o.contains("<dc:title>Spring &amp; Summer</dc:title>") && o.contains("<dc:creator>Ana Ruiz</dc:creator>"), "{o}");
+    let o = opf(&d, &EpubOptions { title: Some("Proof".into()), author: Some("Studio".into()), ..Default::default() });
+    assert!(o.contains("<dc:title>Proof</dc:title>") && o.contains("<dc:creator>Studio</dc:creator>"), "{o}");
+    let html = export_html(&d, &HtmlOptions::default());
+    assert!(html.contains("<title>Spring &amp; Summer</title>"));
+    d.file_info = Default::default();
+    let o = opf(&d, &EpubOptions::default());
+    assert!(o.contains("<dc:title>flyer-v3</dc:title>") && !o.contains("<dc:creator>"), "{o}");
+}
+
+/// "Body¹ text", a 2×2 table, then "Closing" with an endnote.
+fn tables_and_notes() -> Document {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 400.0), lid, "Body text", ParaFormat::default()).unwrap();
+    let st = d.story_mut(sid).unwrap();
+    st.insert_note(4, "Foot note text", ParaFormat::default());
+    let mut t = Table::new(1, 2, 2, 0, 0, 200.0);
+    for (r, c, s) in [(0, 0, "Cell A1"), (0, 1, "Cell B1"), (1, 0, "Cell A2"), (1, 1, "Cell B2")] {
+        t.cell_mut(r, c).unwrap().text = Story::with_text(StoryId(0), s, ParaFormat::default());
+    }
+    let end = st.len();
+    st.insert_table(end, t);
+    let end = st.len();
+    st.insert(end, "Closing");
+    let end = st.len();
+    st.insert_endnote(end, "End note text", ParaFormat::default());
+    d
+}
+
+#[test]
+fn tables_footnotes_and_endnotes_are_exported() {
+    let d = tables_and_notes();
+    let bytes = export_epub(&d, &EpubOptions::default()).unwrap();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
+    let mut html = String::new();
+    z.by_name("OEBPS/content.xhtml").unwrap().read_to_string(&mut html).unwrap();
+    let (t0, t1) = (html.find("<table>").unwrap(), html.find("</table>").unwrap());
+    for cell in ["Cell A1", "Cell B1", "Cell A2", "Cell B2"] {
+        let at = html.find(&format!("<td><p class=\"basic-paragraph\">{cell}</p>\n</td>")).unwrap_or_else(|| panic!("{cell} in a cell:\n{html}"));
+        assert!(t0 < at && at < t1);
+    }
+    assert_eq!(html.matches("<tr>").count(), 2);
+
+    let noteref = "Body<sup><a epub:type=\"noteref\" role=\"doc-noteref\" id=\"fnref-1\" href=\"#fn-1\">1</a></sup> text";
+    assert!(html.contains(noteref), "footnote reference:\n{html}");
+    let aside = html.find("<aside epub:type=\"footnote\" role=\"doc-footnote\" id=\"fn-1\">").unwrap();
+    let aside_end = aside + html[aside..].find("</aside>").unwrap();
+    assert!(html[aside..aside_end].contains("<a href=\"#fnref-1\">1</a> Foot note text"));
+    assert!(aside < t0, "the footnote follows its paragraph");
+
+    assert!(html.contains("Closing<sup><a epub:type=\"noteref\" role=\"doc-noteref\" id=\"enref-1\" href=\"#en-1\">1</a></sup>"));
+    let section = html.find("<section epub:type=\"endnotes\" role=\"doc-endnotes\" id=\"endnotes\">").unwrap();
+    assert!(section > html.find("Closing").unwrap());
+    assert!(html[section..].contains("<li epub:type=\"endnote\" id=\"en-1\">"));
+    assert!(html[section..].contains("<a href=\"#enref-1\">1</a> End note text"));
+    let mut nav = String::new();
+    z.by_name("OEBPS/nav.xhtml").unwrap().read_to_string(&mut nav).unwrap();
+    assert!(nav.contains("href=\"content.xhtml#endnotes\""));
+
+    let page = export_html(&d, &HtmlOptions::default());
+    assert!(page.contains("<aside role=\"doc-footnote\" id=\"fn-1\">") && page.contains("Cell B2") && page.contains("End note text"));
+    assert!(!page.contains("epub:type"), "plain HTML has no EPUB namespace");
+}
+
+/// A footnote or a table after a list paragraph or a preformatted line closes the list or
+/// block first: `aside` and `table` can't sit inside `ul` or `pre`.
+#[test]
+fn notes_and_tables_close_an_open_list_or_pre_block() {
+    for (tag, list, open, close) in [("li", Some(designcraft_doc::ListType::Bullets), "<ul>", "</ul>"), ("pre", None, "<pre", "</pre>")] {
+        let mut d = tables_and_notes();
+        let para = designcraft_doc::ParaAttrs { list_type: list, ..Default::default() };
+        d.styles_mut().paragraph.push(designcraft_doc::ParagraphStyle {
+            name: "Grouped".into(),
+            based_on: None,
+            next_style: None,
+            para,
+            chars: CharAttrs::default(),
+            shortcut: String::new(),
+        });
+        d.styles_mut()
+            .export_tags
+            .insert("p:Grouped".into(), designcraft_doc::ExportTag { tag: tag.into(), class: String::new(), ..Default::default() });
+        let sid = d.stories.keys().copied().find(|sid| d.story(*sid).is_some_and(|st| !st.notes.is_empty())).unwrap();
+        for p in &mut d.story_mut(sid).unwrap().paras {
+            p.style = "Grouped".into();
+        }
+        let html = story_html(&d, sid);
+        let mut rest = html.as_str();
+        while let Some(at) = rest.find(open) {
+            let block = &rest[at..];
+            let end = block.find(close).unwrap_or_else(|| panic!("{open} is closed:\n{html}"));
+            assert!(!block[..end].contains("<aside") && !block[..end].contains("<table"), "{html}");
+            rest = &block[end..];
+        }
+        assert!(html.contains("<aside") && html.contains("<table>"), "{html}");
+    }
+}
+
+#[test]
+fn table_rows_groups_and_merged_cells() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 400.0), lid, "", ParaFormat::default()).unwrap();
+    // One header row, two body rows, one footer row; the header spans both columns and the
+    // first body cell spans both body rows and runs into the footer.
+    let mut t = Table::new(1, 2, 2, 1, 1, 200.0);
+    for (r, c, s) in [(0, 0, "Head"), (1, 0, "Tall"), (1, 1, "B1"), (2, 1, "B2"), (3, 0, "F1"), (3, 1, "F2")] {
+        t.cell_mut(r, c).unwrap().text = Story::with_text(StoryId(0), s, ParaFormat::default());
+    }
+    t.cell_mut(0, 0).unwrap().col_span = 2;
+    t.cell_mut(1, 0).unwrap().row_span = 3;
+    d.story_mut(sid).unwrap().insert_table(0, t);
+    let html = story_html(&d, sid);
+    let p = |s: &str| format!("<p class=\"basic-paragraph\">{s}</p>\n");
+    let expected = format!(
+        "<table>\n<thead>\n<tr><th colspan=\"2\">{}</th>\n</tr>\n</thead>\n<tbody>\n<tr><td rowspan=\"2\">{}</td>\n<td>{}</td>\n</tr>\n<tr><td>{}</td>\n</tr>\n</tbody>\n<tfoot>\n<tr><td>{}</td>\n<td>{}</td>\n</tr>\n</tfoot>\n</table>\n",
+        p("Head"),
+        p("Tall"),
+        p("B1"),
+        p("B2"),
+        p("F1"),
+        p("F2")
+    );
+    assert!(html.contains(&expected), "{html}");
+}
+
+/// Note links stay working across chapter files: a link whose target ended up in another
+/// file (endnotes end the book) names that file; one in its own file stays as it is.
+#[test]
+fn note_links_name_the_chapter_file_of_their_target() {
+    let files: BTreeMap<String, String> =
+        [("enref-1", "content.xhtml"), ("fn-1", "content.xhtml"), ("fnref-1", "content.xhtml"), ("en-1", "content2.xhtml")]
+            .into_iter()
+            .map(|(id, f)| (id.to_string(), f.to_string()))
+            .collect();
+    let first = "<p>First<a id=\"enref-1\" href=\"#en-1\">1</a><a id=\"fnref-1\" href=\"#fn-1\">*</a></p><aside id=\"fn-1\"><a href=\"#fnref-1\">*</a></aside><a href=\"#gone\">x</a>";
+    assert_eq!(
+        link_across_chapters(first, "content.xhtml", &files),
+        "<p>First<a id=\"enref-1\" href=\"content2.xhtml#en-1\">1</a><a id=\"fnref-1\" href=\"#fn-1\">*</a></p><aside id=\"fn-1\"><a href=\"#fnref-1\">*</a></aside><a href=\"#gone\">x</a>"
+    );
+    let last = "<li id=\"en-1\"><a href=\"#enref-1\">1</a> End note</li>";
+    assert_eq!(link_across_chapters(last, "content2.xhtml", &files), "<li id=\"en-1\"><a href=\"content.xhtml#enref-1\">1</a> End note</li>");
+}
+
+#[test]
+fn char_css_joins_underline_and_strikethrough_in_one_declaration() {
+    let d = Document::new(&NewDocument::default());
+    let css = |u: bool, s: bool| {
+        let c = CharProps { underline: u, strikethrough: s, ..CharProps::default() };
+        let mut out = String::new();
+        char_css(&d, &c, 12.0, &BTreeMap::new(), &mut out);
+        out
+    };
+    let both = css(true, true);
+    assert_eq!(both.matches("text-decoration:").count(), 1, "{both}");
+    assert!(both.contains("text-decoration: underline line-through;"), "{both}");
+    assert!(css(true, false).contains("text-decoration: underline;"));
+    assert!(css(false, true).contains("text-decoration: line-through;"));
+    assert!(!css(false, false).contains("text-decoration"));
+}
diff --git a/crates/epub/tests/it/export_tag_styles.rs b/crates/epub/tests/it/export_tag_styles.rs
index b25d31c36..21a280242 100644
--- a/crates/epub/tests/it/export_tag_styles.rs
+++ b/crates/epub/tests/it/export_tag_styles.rs
@@ -39,8 +39,8 @@ fn fixture() -> Document {
 
 fn map(doc: &mut Document, paragraph_tag: &str, paragraph_class: &str, character_tag: &str, character_class: &str) {
     let tags = &mut doc.styles_mut().export_tags;
-    tags.insert("p:Chapter Title".into(), ExportTag { tag: paragraph_tag.into(), class: paragraph_class.into() });
-    tags.insert("c:Key Term".into(), ExportTag { tag: character_tag.into(), class: character_class.into() });
+    tags.insert("p:Chapter Title".into(), ExportTag { tag: paragraph_tag.into(), class: paragraph_class.into(), ..Default::default() });
+    tags.insert("c:Key Term".into(), ExportTag { tag: character_tag.into(), class: character_class.into(), ..Default::default() });
 }
 
 fn package(doc: &Document) -> (String, String) {
diff --git a/crates/epub/tests/it/grouped_reading_order.rs b/crates/epub/tests/it/grouped_reading_order.rs
index fe2223091..42811f61d 100644
--- a/crates/epub/tests/it/grouped_reading_order.rs
+++ b/crates/epub/tests/it/grouped_reading_order.rs
@@ -100,6 +100,7 @@ fn nested_and_item_rotations_are_combined_before_measuring_graphics() {
     let image = ItemId(doc.alloc());
     let mut item = Item::new(image, doc.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 100.0, 10.0)));
     item.content = Content::Graphic(Graphic {
+        layer_options: None,
         asset: aid,
         size: (1.0, 1.0),
         xf: Affine::IDENTITY,
diff --git a/crates/fonts/src/fontdb.rs b/crates/fonts/src/fontdb.rs
index 1c1e55bd1..d0f0054f8 100644
--- a/crates/fonts/src/fontdb.rs
+++ b/crates/fonts/src/fontdb.rs
@@ -14,51 +14,6 @@ use skrifa::{GlyphId, MetadataProvider};
 
 use crate::group::{FamilyInfo, FontGroup};
 
-/// The family used when a requested family is unknown (the UI sans).
-pub const FALLBACK_FAMILY: &str = "Source Sans 3";
-
-/// The bundled fonts (OFL), as font file bytes. Japanese fonts are not bundled: they come from
-/// the optional craft-fonts build input ([`crate::japanese_document_fonts`]).
-pub fn bundled() -> &'static [&'static [u8]] {
-    BUNDLED
-}
-
-static BUNDLED: &[&[u8]] = &[
-    include_bytes!("../../../assets/fonts/SourceSans3-Regular.ttf"),
-    include_bytes!("../../../assets/fonts/SourceSans3-Semibold.ttf"),
-    include_bytes!("../../../assets/fonts/SourceSans3-Bold.ttf"),
-    include_bytes!("../../../assets/fonts/SourceSans3-It.ttf"),
-    include_bytes!("../../../assets/fonts/SourceSerif4-Regular.ttf"),
-    include_bytes!("../../../assets/fonts/SourceSerif4-It.ttf"),
-    include_bytes!("../../../assets/fonts/SourceSerif4-Semibold.ttf"),
-    include_bytes!("../../../assets/fonts/SourceSerif4-Bold.ttf"),
-    include_bytes!("../../../assets/fonts/SourceSerif4-BoldIt.ttf"),
-    include_bytes!("../../../assets/fonts/Inter-Regular.ttf"),
-    include_bytes!("../../../assets/fonts/Inter-Medium.ttf"),
-    include_bytes!("../../../assets/fonts/Inter-SemiBold.ttf"),
-    include_bytes!("../../../assets/fonts/JetBrainsMono-Regular.ttf"),
-];
-
-#[derive(Clone)]
-enum FontBytes {
-    Static(&'static [u8]),
-    Owned(Arc<Vec<u8>>),
-}
-
-/// Where a face's font came from.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum FontSource {
-    /// Compiled into DesignCraft.
-    Bundled,
-    /// Font data handed to [`FontDb::add_font`], with no file behind it.
-    Memory,
-    /// An installed font file (the system's or the user's font folders, or one the platform
-    /// lists outside them).
-    Installed(std::path::PathBuf),
-    /// A font file in a document's `Document Fonts` folder ([`FontDb::load_document_fonts`]).
-    Document(std::path::PathBuf),
-}
-
 impl FontSource {
     /// The font file, if the face was loaded from one.
     pub fn path(&self) -> Option<&std::path::Path> {
@@ -69,82 +24,6 @@ impl FontSource {
     }
 }
 
-/// The folder beside a document whose fonts the document brings with it (as File › Package
-/// writes it).
-pub const DOCUMENT_FONTS_FOLDER: &str = "Document Fonts";
-/// Caps on what a `Document Fonts` folder (untrusted files) can make [`FontDb::load_document_fonts`]
-/// read: font files read, bytes per file and bytes in all.
-pub const MAX_DOCUMENT_FONT_FILES: usize = 200;
-pub const MAX_DOCUMENT_FONT_BYTES: u64 = 256 << 20;
-pub const MAX_DOCUMENT_FONTS_TOTAL: u64 = 512 << 20;
-
-/// What [`FontDb::load_document_fonts`] did: the scope the document looks its fonts up in (0 when
-/// the folder gave none), the faces in it, and a note for each file skipped.
-#[derive(Debug, Default)]
-pub struct DocumentFonts {
-    pub scope: u32,
-    pub faces: usize,
-    pub skipped: Vec<String>,
-}
-
-/// One loaded font face.
-pub struct FontFace {
-    id: u32,
-    /// Typographic family name (e.g. "Source Sans 3").
-    pub family: String,
-    /// Typographic style name (e.g. "Semibold", "Italic").
-    pub style: String,
-    /// The WWS family and style names (name IDs 21 and 22) when they differ from the typographic
-    /// ones: InDesign names an optical-size face by them ("Kepler Std Display" / "Light").
-    pub wws: Option<(String, String)>,
-    /// usWeightClass-style weight (400 = regular).
-    pub weight: f32,
-    pub italic: bool,
-    /// Where the font came from (a file to copy when packaging, a document's own font).
-    pub source: FontSource,
-    bytes: FontBytes,
-    index: u32,
-    pub upem: f64,
-    /// Ascender in font units (positive = up).
-    pub ascent: f64,
-    /// OS/2 typographic ascender in font units (the ascent when the font has no usable one): the
-    /// Ascent first baseline offset.
-    pub typo_ascent: f64,
-    /// Descender in font units (positive = down).
-    pub descent: f64,
-    /// Cap height and x height in font units (without plausible OS/2 values, the cap height is the
-    /// top of the H, and either is estimated from the ascent): the Cap Height and x Height first
-    /// baseline offsets.
-    pub cap_height: f64,
-    pub x_height: f64,
-    pub shaper: harfrust::ShaperData,
-    /// Variable fonts: the named instance's axis settings (user units; empty = default instance),
-    /// the normalised location and the shaper's view of it.
-    pub coords: Vec<([u8; 4], f32)>,
-    location: Location,
-    pub instance: Option<harfrust::ShaperInstance>,
-    /// Basic Multilingual Plane coverage bitset, built on first use.
-    bmp: std::sync::OnceLock<Box<[u64]>>,
-    /// The ideographic em box, read on first use.
-    em: std::sync::OnceLock<((f64, f64), bool)>,
-    /// The ideographic character face box, read on first use.
-    icf: std::sync::OnceLock<(f64, f64)>,
-    /// The font menu group and native family name, read on first use.
-    group: std::sync::OnceLock<(FontGroup, Option<String>)>,
-    family_aliases: Vec<String>,
-    style_aliases: Vec<String>,
-    /// Format, class and PANOSE numbers (the font menus), read on first use.
-    kind: std::sync::OnceLock<crate::kind::FaceKind>,
-    /// The PostScript name, read on first use.
-    postscript: std::sync::OnceLock<Option<String>>,
-}
-
-/// A cheap `Copy` handle to a face. Faces are never unloaded, so the handle lives for the rest of
-/// the process; unlike cloning an `Arc`, copying it touches no shared reference count (which made
-/// parallel composition scale negatively).
-#[derive(Clone, Copy)]
-pub struct FaceRef(&'static FontFace);
-
 impl FaceRef {
     /// The handle for a loaded face (memoised per face).
     pub fn of(face: &Arc<FontFace>) -> FaceRef {
@@ -194,227 +73,6 @@ impl std::fmt::Debug for FontFace {
     }
 }
 
-impl FontFace {
-    pub fn data(&self) -> &[u8] {
-        match &self.bytes {
-            FontBytes::Static(b) => b,
-            FontBytes::Owned(v) => v.as_slice(),
-        }
-    }
-    pub fn skrifa(&self) -> Option<skrifa::FontRef<'_>> {
-        skrifa::FontRef::from_index(self.data(), self.index).ok()
-    }
-    /// The face's format, class and PANOSE numbers, as the font menus show and filter them.
-    pub fn kind(&self) -> crate::kind::FaceKind {
-        *self.kind.get_or_init(|| {
-            let mut kind = self.skrifa().map(|f| crate::kind::read_kind(&f, &self.family)).unwrap_or_default();
-            // Nothing in the tables or the name: look at the letters.
-            if kind.class == crate::kind::FontClass::Other
-                && let Some(serifs) = has_serifs(self)
-            {
-                kind.class = if serifs { crate::kind::FontClass::Serif } else { crate::kind::FontClass::SansSerif };
-            }
-            kind
-        })
-    }
-    /// When the font file was added (created, else last modified): the font menus' Show Recently
-    /// Added. `None` for fonts without a file.
-    pub fn added(&self) -> Option<std::time::SystemTime> {
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            let meta = std::fs::metadata(self.source.path()?).ok()?;
-            meta.created().or_else(|_| meta.modified()).ok()
-        }
-        #[cfg(target_arch = "wasm32")]
-        {
-            None
-        }
-    }
-    pub fn hb(&self) -> Option<harfrust::FontRef<'_>> {
-        harfrust::FontRef::from_index(self.data(), self.index).ok()
-    }
-    /// Where in the design space glyphs, metrics and outlines come from.
-    pub fn location(&self) -> LocationRef<'_> {
-        (&self.location).into()
-    }
-    /// Is this a named instance of a variable font?
-    pub fn is_variable(&self) -> bool {
-        !self.coords.is_empty()
-    }
-    /// Face index within the font file (collections); 0 for plain fonts.
-    pub fn index(&self) -> u32 {
-        self.index
-    }
-    /// Unique id of this face within the process.
-    pub fn id(&self) -> u32 {
-        self.id
-    }
-    /// System placeholder fonts draw generic boxes rather than the requested character.
-    pub fn is_placeholder(&self) -> bool {
-        matches!(norm(self.family.trim_start_matches('.')).as_str(), "lastresort")
-    }
-
-    /// Does the face map `c` to a real glyph?
-    pub fn covers(&self, c: char) -> bool {
-        if self.is_placeholder() {
-            return false;
-        }
-        let cp = c as u32;
-        if cp < 0x1_0000 {
-            let bits = self.bmp.get_or_init(|| {
-                let mut b = vec![0u64; 1024].into_boxed_slice();
-                if let Some(f) = self.skrifa() {
-                    for (cp, gid) in f.charmap().mappings() {
-                        if cp < 0x1_0000 && gid.to_u32() != 0 {
-                            b[(cp / 64) as usize] |= 1 << (cp % 64);
-                        }
-                    }
-                }
-                b
-            });
-            return bits[(cp / 64) as usize] & (1 << (cp % 64)) != 0;
-        }
-        self.skrifa().is_some_and(|f| f.charmap().map(c).is_some_and(|gid| gid.to_u32() != 0))
-    }
-    /// Units per em.
-    pub fn units_per_em(&self) -> f64 {
-        self.upem
-    }
-    /// (ascent, descent) in font units, both positive.
-    pub fn vertical_metrics(&self) -> (f64, f64) {
-        (self.ascent, self.descent)
-    }
-    /// Every mapped character and its glyph id, sorted by code point (the Glyphs panel).
-    pub fn chars(&self) -> Vec<(char, u32)> {
-        let Some(f) = self.skrifa() else { return vec![] };
-        let mut v: Vec<(char, u32)> = f.charmap().mappings().filter_map(|(cp, g)| char::from_u32(cp).map(|c| (c, g.to_u32()))).collect();
-        v.sort_unstable_by_key(|x| x.0);
-        v.dedup_by_key(|x| x.0);
-        v
-    }
-    /// Advance width of glyph `gid` in font units.
-    pub fn advance(&self, gid: u32) -> f64 {
-        self.skrifa()
-            .and_then(|f| f.glyph_metrics(Size::unscaled(), self.location()).advance_width(GlyphId::new(gid)))
-            .map(|a| a as f64)
-            .unwrap_or(self.upem * 0.5)
-    }
-    /// Vertical advance (down the line) of glyph `gid` in font units: `vmtx`, else one em.
-    pub fn v_advance(&self, gid: u32) -> f64 {
-        crate::vertical::VMetrics::new(self).advance(GlyphId::new(gid))
-    }
-    /// Height of glyph `gid`'s vertical origin above its baseline in font units: `VORG`, else its
-    /// top plus its `vmtx` top side bearing, else the em box top. Across, the origin is at half the
-    /// horizontal advance. Upright glyphs in vertical text hang from it on the line's centre.
-    pub fn v_origin(&self, gid: u32) -> f64 {
-        crate::vertical::VMetrics::new(self).origin(GlyphId::new(gid))
-    }
-    /// The ideographic em box (top, bottom) in font units, y up, one em tall (Japanese fonts:
-    /// typically 880, -120): `BASE` `idtp`/`ideo`; else, for a CJK font, from the OS/2 typo
-    /// ascender when the typo ascender and descender span one em; else centred on half the cap
-    /// height (OS/2, else the `H` glyph's top); else 0.88 em above the baseline.
-    pub fn em_box(&self) -> (f64, f64) {
-        self.em.get_or_init(|| crate::vertical::em_box(self)).0
-    }
-    /// [`Self::em_box`] when the font's tables give it, `None` for the 0.88 em fallback.
-    pub fn declared_em_box(&self) -> Option<(f64, f64)> {
-        let (b, declared) = *self.em.get_or_init(|| crate::vertical::em_box(self));
-        declared.then_some(b)
-    }
-    /// The ideographic character face (ICF) box (top, bottom) in font units, y up: `BASE`
-    /// `icft`/`icfb`, else the em box inset by 5% of the em at the top and bottom.
-    pub fn icf_box(&self) -> (f64, f64) {
-        *self.icf.get_or_init(|| crate::vertical::icf_box(self))
-    }
-    /// The font menu group the font is for and, for a CJK group, its family name in that language
-    /// (see [`crate::FamilyInfo`]); read from the font once.
-    pub fn menu_group(&self) -> (FontGroup, Option<&str>) {
-        let (g, n) = self.group.get_or_init(|| self.skrifa().map(|f| crate::group::classify(&f, &self.family)).unwrap_or_default());
-        (*g, n.as_deref())
-    }
-    /// The PostScript name (`name` ID 6), read from the font once. None for a variable font's
-    /// named instance: the file's name belongs to its default instance.
-    pub fn postscript_name(&self) -> Option<&str> {
-        self.postscript
-            .get_or_init(|| if self.is_variable() { None } else { self.skrifa().and_then(|f| name(&f, &[StringId::POSTSCRIPT_NAME])) })
-            .as_deref()
-    }
-    /// Glyph id for `c` (0 = .notdef).
-    pub fn glyph_for(&self, c: char) -> u32 {
-        self.skrifa().and_then(|f| f.charmap().map(c)).map(|g| g.to_u32()).unwrap_or(0)
-    }
-
-    /// GDEF identifies marks even when shaping merges their source cluster with a base.
-    pub fn glyph_is_mark(&self, gid: u32) -> bool {
-        use skrifa::raw::TableProvider;
-        self.skrifa()
-            .and_then(|f| f.gdef().ok())
-            .and_then(|gdef| gdef.glyph_class_def()?.ok())
-            .is_some_and(|classes| classes.get(GlyphId::new(gid)) == 3)
-    }
-
-    /// Does the font's licence forbid passing it on? OS/2 `fsType` Restricted License embedding
-    /// (bit 1) without a less restrictive bit (Preview & Print, Editable). Fonts without an OS/2
-    /// table aren't restricted.
-    pub fn restricted_licence(&self) -> bool {
-        use skrifa::raw::TableProvider;
-        let fs_type = self.skrifa().and_then(|f| f.os2().ok()).map_or(0, |t| t.fs_type());
-        fs_type & 0x0002 != 0 && fs_type & 0x000C == 0
-    }
-
-    /// Does the font's licence allow embedding bitmaps only? OS/2 `fsType` bit 9: the outlines
-    /// may not be passed on, so the font file can't be packaged whole.
-    pub fn bitmap_only(&self) -> bool {
-        use skrifa::raw::TableProvider;
-        self.skrifa().and_then(|f| f.os2().ok()).is_some_and(|t| t.fs_type() & 0x0200 != 0)
-    }
-}
-
-/// A font file's length and modification time.
-#[cfg(not(target_arch = "wasm32"))]
-type FileStamp = (u64, Option<std::time::SystemTime>);
-
-#[cfg(not(target_arch = "wasm32"))]
-fn file_stamp(path: &std::path::Path) -> Option<FileStamp> {
-    std::fs::metadata(path).ok().map(|m| (m.len(), m.modified().ok()))
-}
-
-/// What [`FontDb::reload_fonts`] did: the faces cataloged by the rescan, and the installed font
-/// files that changed or were removed since they were read (their faces are read again, from the
-/// new file, the next time they are looked up).
-#[derive(Debug, Default, PartialEq)]
-pub struct ReloadedFonts {
-    pub cataloged: usize,
-    pub changed: Vec<std::path::PathBuf>,
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-#[derive(Clone, Debug)]
-struct CatalogEntry {
-    family: String,
-    style: String,
-    wws: Option<(String, String)>,
-    path: std::path::PathBuf,
-    /// The font menu group and native family name, read by the scan.
-    group: FontGroup,
-    native: Option<String>,
-    aliases: Vec<String>,
-    postscript: Option<String>,
-}
-
-/// What the scan reads of one face in a font file: its names and font menu group.
-#[cfg(not(target_arch = "wasm32"))]
-#[derive(Clone, Debug, PartialEq)]
-struct ScannedFace {
-    family: String,
-    style: String,
-    wws: Option<(String, String)>,
-    group: FontGroup,
-    native: Option<String>,
-    aliases: Vec<String>,
-    postscript: Option<String>,
-}
-
 /// Process-wide font database: the fonts every document shares (bundled, installed, added), and
 /// each open document's own fonts under its scope (see [`FontDb::scoped`]).
 pub struct FontDb {
@@ -453,1719 +111,43 @@ pub struct FontDb {
     fallback_snapshot_hook: Mutex<Option<FallbackSnapshotHook>>,
 }
 
-#[cfg(not(target_arch = "wasm32"))]
-#[derive(Default)]
-struct SysFallback {
-    enabled: bool,
-    /// Rescan generation: an older in-flight lookup must not restore a cleared miss.
-    generation: u64,
-    misses: std::collections::HashSet<char>,
-    /// CJK chain families already looked up in the catalog (loaded, or not installed).
-    chain_tried: std::collections::HashSet<&'static str>,
-}
-
-#[cfg(all(test, target_os = "linux"))]
-struct FallbackSnapshotHook {
-    reached: std::sync::mpsc::SyncSender<()>,
-    resume: Arc<std::sync::Barrier>,
-}
-
-/// Families tried (when installed) for characters the loaded fonts lack: CJK, symbols, emoji.
-#[cfg(not(target_arch = "wasm32"))]
-const SYSTEM_FALLBACKS: &[&str] = &[
-    "Helvetica Neue",
-    "Arial",
-    "Segoe UI",
-    "Noto Sans",
-    "DejaVu Sans",
-    "PingFang SC",
-    "Hiragino Sans",
-    "Hiragino Kaku Gothic ProN",
-    "Apple SD Gothic Neo",
-    "Heiti SC",
-    "STHeiti",
-    "Microsoft YaHei",
-    "Yu Gothic",
-    "Malgun Gothic",
-    "Noto Sans CJK SC",
-    "Noto Sans CJK JP",
-    "Arial Unicode MS",
-    "Apple Symbols",
-    "Segoe UI Symbol",
-    "Noto Sans Symbols",
-    "Noto Sans Symbols2",
-    "Noto Emoji",
-    "Segoe UI Emoji",
-    "Apple Color Emoji",
-    "Noto Color Emoji",
-];
-
-/// CJK fallback chains: the families tried first (user-added, else installed) for characters of
-/// each language that the primary font lacks. Each lists macOS, then Windows, then Linux /
-/// cross-platform families, serif first; a platform only has its own installed. Japanese tries
-/// the craft-fonts Japanese faces before these ([`japanese_chain`]).
-const JAPANESE_FALLBACKS: &[&str] = &[
-    "Hiragino Mincho ProN",
-    "YuMincho",
-    "Hiragino Sans",
-    "Yu Mincho",
-    "MS Mincho",
-    "Yu Gothic",
-    "Noto Serif CJK JP",
-    "Source Han Serif JP",
-    "Noto Serif JP",
-    "Noto Sans CJK JP",
-    "Source Han Sans JP",
-];
-const SIMPLIFIED_CHINESE_FALLBACKS: &[&str] = &[
-    "Songti SC",
-    "STSong",
-    "PingFang SC",
-    "SimSun",
-    "Microsoft YaHei",
-    "Noto Serif CJK SC",
-    "Source Han Serif SC",
-    "Noto Serif SC",
-    "Noto Sans CJK SC",
-    "Source Han Sans SC",
-];
-const TRADITIONAL_CHINESE_FALLBACKS: &[&str] = &[
-    "Songti TC",
-    "PingFang TC",
-    "PMingLiU",
-    "MingLiU",
-    "Microsoft JhengHei",
-    "Noto Serif CJK TC",
-    "Source Han Serif TC",
-    "Noto Serif TC",
-    "Noto Sans CJK TC",
-    "Source Han Sans TC",
-];
-const KOREAN_FALLBACKS: &[&str] = &[
-    "AppleMyungjo",
-    "Apple SD Gothic Neo",
-    "Batang",
-    "Malgun Gothic",
-    "Noto Serif CJK KR",
-    "Source Han Serif K",
-    "Noto Serif KR",
-    "Noto Sans CJK KR",
-    "Source Han Sans K",
-];
-
-/// Fonts made for Malayalam (macOS, Windows, Noto, Linux). A font that only maps the characters
-/// (Arial Unicode MS, first by path on macOS) sets them without conjuncts or vowel signs.
-const MALAYALAM_FALLBACKS: &[&str] = &[
-    "Malayalam Sangam MN",
-    "Malayalam MN",
-    "Nirmala UI",
-    "Kartika",
-    "Noto Sans Malayalam",
-    "Noto Serif Malayalam",
-    "Manjari",
-    "Rachana",
-    "Meera",
-    "Lohit Malayalam",
-];
-
-/// The fallback chain of a script that only fonts made for it set well, whatever the language.
-fn script_chain(c: char) -> Option<&'static [&'static str]> {
-    match c as u32 {
-        0x0D00..=0x0D7F => Some(MALAYALAM_FALLBACKS),
-        _ => None,
-    }
-}
-
-/// The Japanese fallback chain: the craft-fonts Japanese faces' families in document order
-/// (Mincho first; none without craft-fonts), then [`JAPANESE_FALLBACKS`].
-fn japanese_chain() -> &'static [&'static str] {
-    static CHAIN: std::sync::OnceLock<Vec<&str>> = std::sync::OnceLock::new();
-    CHAIN.get_or_init(|| {
-        let mut chain: Vec<&'static str> = Vec::new();
-        for f in crate::japanese_document_fonts() {
-            if !chain.contains(&f.family) {
-                chain.push(f.family);
-            }
-        }
-        chain.extend_from_slice(JAPANESE_FALLBACKS);
-        chain
-    })
-}
-
-/// The CJK fallback chain for `c` in `language` (a BCP 47 tag). The script decides where it is
-/// unambiguous (Hangul is Korean, kana Japanese, Bopomofo Traditional Chinese); ideographs and CJK
-/// punctuation follow the language, and have no chain without a CJK one.
-fn cjk_chain(c: char, language: Option<&str>) -> Option<&'static [&'static str]> {
-    match c as u32 {
-        0x1100..=0x11FF | 0x3130..=0x318F | 0xA960..=0xA97F | 0xAC00..=0xD7FF | 0xFFA0..=0xFFDC => return Some(KOREAN_FALLBACKS),
-        0x3040..=0x30FF | 0x31F0..=0x31FF | 0xFF66..=0xFF9F | 0x1B000..=0x1B16F => return Some(japanese_chain()),
-        0x3100..=0x312F | 0x31A0..=0x31BF => return Some(TRADITIONAL_CHINESE_FALLBACKS),
-        // Radicals, CJK symbols and punctuation, kanbun, strokes, enclosed and compatibility
-        // characters, ideographs, compatibility and vertical forms, full-width forms.
-        0x2E80..=0x2FDF
-        | 0x3000..=0x303F
-        | 0x3190..=0x319F
-        | 0x31C0..=0x31EF
-        | 0x3200..=0x33FF
-        | 0x3400..=0x4DBF
-        | 0x4E00..=0x9FFF
-        | 0xF900..=0xFAFF
-        | 0xFE10..=0xFE1F
-        | 0xFE30..=0xFE4F
-        | 0xFF00..=0xFFEF
-        | 0x20000..=0x3FFFF => {}
-        _ => return None,
-    }
-    // The language decides, whatever the region (`ja-JP`, `ko-KR`).
-    let language = language?;
-    match language.split('-').next()? {
-        "ja" => Some(japanese_chain()),
-        "ko" => Some(KOREAN_FALLBACKS),
-        "zh" if language.starts_with("zh-Hant") => Some(TRADITIONAL_CHINESE_FALLBACKS),
-        "zh" => Some(SIMPLIFIED_CHINESE_FALLBACKS),
-        _ => None,
-    }
-}
-
-static NEXT_ID: AtomicU32 = AtomicU32::new(1);
-/// Scopes are never reused: a closed document's scope finds no fonts ever after.
-#[cfg(not(target_arch = "wasm32"))]
-static NEXT_SCOPE: AtomicU32 = AtomicU32::new(1);
-const OUTLINE_CACHE_MAX: usize = 50_000;
-
-fn aliases(font: &skrifa::FontRef<'_>, ids: &[StringId]) -> Vec<String> {
-    let mut names: Vec<String> =
-        ids.iter().flat_map(|id| font.localized_strings(*id)).take(256).map(|name| name.to_string()).filter(|name| !name.trim().is_empty()).collect();
-    names.sort();
-    names.dedup();
-    names
-}
-
-fn name(font: &skrifa::FontRef<'_>, ids: &[StringId]) -> Option<String> {
-    ids.iter().find_map(|id| font.localized_strings(*id).english_or_first().map(|s| s.to_string()).filter(|s| !s.is_empty()))
-}
-
-/// A face's family and style names (the default instance's style for a variable font).
-/// Is a face of `family` and `style` among `faces`?
-fn has_face(faces: &[Arc<FontFace>], family: &str, style: &str) -> bool {
-    faces.iter().any(|f| f.family.eq_ignore_ascii_case(family) && f.style.eq_ignore_ascii_case(style))
-}
-
-/// A face's WWS family and style names (name IDs 21 and 22), if it has a WWS family and it differs
-/// from `family`/`style`.
-fn wws_names(f: &skrifa::FontRef<'_>, family: &str, style: &str) -> Option<(String, String)> {
-    let wf = name(f, &[StringId::WWS_FAMILY_NAME])?;
-    let ws = name(f, &[StringId::WWS_SUBFAMILY_NAME]).unwrap_or_else(|| "Regular".into());
-    (!wf.eq_ignore_ascii_case(family) || !ws.eq_ignore_ascii_case(style)).then_some((wf, ws))
-}
-
-/// The family and style a face is known by: its typographic names, or its WWS names (if it has
-/// them) when `by_wws`.
-fn known_as<'a>(family: &'a str, style: &'a str, wws: Option<&'a (String, String)>, by_wws: bool) -> Option<(&'a str, &'a str)> {
-    if by_wws { wws.map(|w| (w.0.as_str(), w.1.as_str())) } else { Some((family, style)) }
-}
-
-/// Is `family` the WWS family name of `f`?
-fn has_wws_family(f: &FontFace, family: &str) -> bool {
-    f.wws.as_ref().is_some_and(|w| w.0.eq_ignore_ascii_case(family))
-}
-
-/// Is `family` the typographic or the WWS family name of `c`?
-#[cfg(not(target_arch = "wasm32"))]
-fn in_catalog_family(c: &CatalogEntry, family: &str) -> bool {
-    c.family.eq_ignore_ascii_case(family) || c.wws.as_ref().is_some_and(|w| w.0.eq_ignore_ascii_case(family))
-}
-
-fn face_names(f: &skrifa::FontRef<'_>) -> Option<(String, String)> {
-    let family = name(f, &[StringId::TYPOGRAPHIC_FAMILY_NAME, StringId::FAMILY_NAME])?;
-    let style = name(f, &[StringId::TYPOGRAPHIC_SUBFAMILY_NAME, StringId::SUBFAMILY_NAME]).unwrap_or_else(|| "Regular".into());
-    Some((family, style))
-}
-
-/// The tables glyph outlines are drawn from.
-#[cfg(not(target_arch = "wasm32"))]
-const OUTLINE_TABLES: [&[u8; 4]; 4] = [b"glyf", b"CFF ", b"CFF2", b"VARC"];
-
-/// The names and font menu group of every face in the font file at `path`, reading only its table
-/// directories and the tables that name and classify it (`name`, `OS/2`, `meta`; `cmap` only for a
-/// font that declares no language or code page): a scan opens hundreds of font files, many of them
-/// megabytes long. A variable font is cataloged under its default style; its named instances
-/// appear once it loads. Faces without glyph outlines (none of [`OUTLINE_TABLES`]) are left out.
-#[cfg(not(target_arch = "wasm32"))]
-fn file_face_names(path: &std::path::Path) -> Vec<ScannedFace> {
-    use std::io::{Read, Seek, SeekFrom};
-    /// Caps on what a (possibly damaged) file can make the scan read.
-    const MAX_FACES: u32 = 256;
-    const MAX_NAME_TABLE: u32 = 1 << 20;
-    const MAX_SMALL_TABLE: u32 = 64 << 10;
-    const MAX_CMAP: u32 = 4 << 20;
-    let Ok(mut file) = std::fs::File::open(path) else { return vec![] };
-    let mut read_at = |offset: u64, len: usize| -> Option<Vec<u8>> {
-        let mut buf = vec![0; len];
-        file.seek(SeekFrom::Start(offset)).ok()?;
-        file.read_exact(&mut buf).ok()?;
-        Some(buf)
-    };
-    let be32 = |b: &[u8], at: usize| b.get(at..at + 4).and_then(|s| s.try_into().ok()).map(u32::from_be_bytes);
-    let Some(head) = read_at(0, 12) else { return vec![] };
-    // A collection lists where each face's table directory starts.
-    let starts: Vec<u32> = if head.starts_with(b"ttcf") {
-        let n = be32(&head, 8).unwrap_or(0).min(MAX_FACES) as usize;
-        read_at(12, n * 4).map(|b| b.as_chunks::<4>().0.iter().map(|c| u32::from_be_bytes(*c)).collect()).unwrap_or_default()
-    } else {
-        vec![0]
-    };
-    starts
-        .into_iter()
-        .filter_map(|start| {
-            let dir = read_at(start.into(), 12)?;
-            let tables = u16::from_be_bytes(dir.get(4..6)?.try_into().ok()?) as usize;
-            let records = read_at(u64::from(start) + 12, tables * 16)?;
-            // Faces drawn from other tables (Apple's `hvgl`, bitmaps) would draw nothing.
-            if !records.as_chunks::<16>().0.iter().any(|r| OUTLINE_TABLES.iter().any(|t| r.starts_with(*t))) {
-                return None;
-            }
-            // Table `tag`, unless missing or over `max` bytes.
-            let mut table = |tag: &[u8; 4], max: u32| -> Option<([u8; 4], Vec<u8>)> {
-                let rec = records.as_chunks::<16>().0.iter().find(|r| r.starts_with(tag))?;
-                let (offset, len) = (be32(rec, 8)?, be32(rec, 12)?);
-                if len > max {
-                    return None;
-                }
-                Some((*tag, read_at(offset.into(), len as usize)?))
-            };
-            // A font holding just these tables, to read them as the font itself would.
-            let mut found = vec![table(b"name", MAX_NAME_TABLE)?];
-            found.extend(table(b"OS/2", MAX_SMALL_TABLE));
-            found.extend(table(b"meta", MAX_SMALL_TABLE));
-            let font = crate::group::sfnt(found.clone())?;
-            let f = skrifa::FontRef::new(&font).ok()?;
-            let (family, style) = face_names(&f)?;
-            let (group, native) = match crate::group::declared_group(&f, &family) {
-                Some(g) => (g, crate::group::classify(&f, &family).1),
-                None => {
-                    found.extend(table(b"cmap", MAX_CMAP));
-                    let font = crate::group::sfnt(found)?;
-                    crate::group::classify(&skrifa::FontRef::new(&font).ok()?, &family)
-                }
-            };
-            let postscript = name(&f, &[StringId::POSTSCRIPT_NAME]);
-            let wws = wws_names(&f, &family, &style);
-            Some(ScannedFace {
-                family,
-                style,
-                wws,
-                group,
-                native,
-                aliases: aliases(&f, &[StringId::TYPOGRAPHIC_FAMILY_NAME, StringId::FAMILY_NAME]),
-                postscript,
-            })
-        })
-        .collect()
-}
-
-/// The platform's font folders (the system's and the user's), scanned by [`FontDb::global`].
-/// Empty on wasm.
-pub fn system_font_dirs() -> Vec<std::path::PathBuf> {
-    let mut dirs: Vec<std::path::PathBuf> = Vec::new();
-    if cfg!(target_arch = "wasm32") {
-        return dirs;
-    }
-    let home = std::env::var_os("HOME").map(std::path::PathBuf::from);
-    if cfg!(target_os = "macos") {
-        dirs.extend(["/System/Library/Fonts", "/Library/Fonts"].map(Into::into));
-        if let Some(h) = &home {
-            dirs.push(h.join("Library/Fonts"));
-        }
-        // Fonts macOS ships as assets (PingFang, Yu Mincho, …): com_apple_MobileAsset_Font<N>.
-        for parent in ["/System/Library/AssetsV2", "/System/Library/AssetsV2/PreinstalledAssetsV2/InstallWithOs"] {
-            let Ok(entries) = std::fs::read_dir(parent) else { continue };
-            for e in entries.flatten() {
-                if e.file_name().to_string_lossy().starts_with("com_apple_MobileAsset_Font") {
-                    dirs.push(e.path());
-                }
-            }
-        }
-        // Microsoft Office bundles its fonts (Calibri, Cambria, …) inside each app; read them in
-        // place from the first installed one (they share the same set).
-        let office = ["Microsoft Word", "Microsoft Excel", "Microsoft PowerPoint", "Microsoft Outlook"]
-            .iter()
-            .map(|app| std::path::PathBuf::from(format!("/Applications/{app}.app/Contents/Resources/DFonts")))
-            .find(|p| p.is_dir());
-        dirs.extend(office);
-    } else if cfg!(windows) {
-        let root = std::env::var_os("WINDIR").map(std::path::PathBuf::from).unwrap_or_else(|| "C:\\Windows".into());
-        dirs.push(root.join("Fonts"));
-        if let Some(l) = std::env::var_os("LOCALAPPDATA") {
-            dirs.push(std::path::PathBuf::from(l).join("Microsoft\\Windows\\Fonts"));
-        }
-    } else {
-        let xdg_data_home = std::env::var_os("XDG_DATA_HOME").map(std::path::PathBuf::from);
-        dirs.extend(unix_font_dirs(home.as_deref(), xdg_data_home.as_deref()));
-    }
-    dirs
-}
-
-fn unix_font_dirs(home: Option<&std::path::Path>, xdg_data_home: Option<&std::path::Path>) -> Vec<std::path::PathBuf> {
-    let mut dirs: Vec<std::path::PathBuf> = ["/usr/share/fonts", "/usr/local/share/fonts"].map(Into::into).into();
-    if let Some(home) = home {
-        dirs.push(home.join(".fonts"));
-    }
-    let data_home =
-        xdg_data_home.filter(|path| path.is_absolute()).map(std::path::Path::to_path_buf).or_else(|| home.map(|path| path.join(".local/share")));
-    dirs.extend(data_home.map(|path| path.join("fonts")));
-    dirs
-}
-
 /// The font files outside the font folders that the platform has available, which
 /// [`FontDb::global`]'s scan reads too: on macOS, those CoreText's font manager lists, such as the
 /// fonts font services and font managers register from their own folders. None elsewhere.
 #[cfg(target_os = "macos")]
 use crate::mac_fonts::available_font_files as platform_font_files;
-#[cfg(not(target_os = "macos"))]
-fn platform_font_files() -> Vec<std::path::PathBuf> {
-    Vec::new()
-}
 
-/// The files in `listed` that aren't in `scanned` (canonical paths), each once and added to
-/// `scanned`; paths that don't lead to a file (gone, unreadable folder) are left out.
+mod db;
+mod face;
+mod fallback;
+mod names;
+mod outline;
+mod scoped;
+mod system;
+
+#[cfg(test)]
+pub(crate) use face::last_resort_face;
+pub use face::{
+    DOCUMENT_FONTS_FOLDER, DocumentFonts, FALLBACK_FAMILY, FaceRef, FontFace, FontSource, MAX_DOCUMENT_FONT_BYTES, MAX_DOCUMENT_FONT_FILES,
+    MAX_DOCUMENT_FONTS_TOTAL, bundled,
+};
+#[cfg(test)]
+use face::{FontBytes, make_face};
+pub(crate) use face::{measured_top, plausible};
+#[cfg(all(test, target_os = "linux"))]
+use fallback::FallbackSnapshotHook;
 #[cfg(not(target_arch = "wasm32"))]
-fn unscanned_font_files(listed: Vec<std::path::PathBuf>, scanned: &mut std::collections::HashSet<std::path::PathBuf>) -> Vec<std::path::PathBuf> {
-    listed
-        .into_iter()
-        .filter(|p| {
-            let Ok(canonical) = std::fs::canonicalize(p) else { return false };
-            canonical.is_file() && scanned.insert(canonical)
-        })
-        .collect()
-}
-
-/// One face found in a font file: index, family, style and (variable fonts) the named instance's
-/// axis settings.
-type Found = (u32, String, String, Vec<([u8; 4], f32)>);
-
-/// Parse every face in `data` (a font file or collection); a variable font yields one face per
-/// named instance (InDesign lists them as styles).
-fn enumerate_faces(data: &[u8]) -> Vec<Found> {
-    /// A collection's count is input: what a damaged one can make the loop try.
-    const MAX_FACES: u32 = 1024;
-    let count = match FileRef::new(data) {
-        Ok(FileRef::Font(_)) => 1,
-        Ok(FileRef::Collection(c)) => c.len().min(MAX_FACES),
-        Err(_) => 0,
-    };
-    let mut out = Vec::new();
-    for i in 0..count {
-        let Ok(f) = skrifa::FontRef::from_index(data, i) else { continue };
-        let Some((family, style)) = face_names(&f) else { continue };
-        let axes = f.axes();
-        let mut named = Vec::new();
-        for ni in f.named_instances().iter() {
-            let Some(style) = name(&f, &[ni.subfamily_name_id()]) else { continue };
-            if named.iter().any(|(_, s, _): &(u32, String, _)| s.eq_ignore_ascii_case(&style)) {
-                continue;
-            }
-            let coords: Vec<([u8; 4], f32)> = axes.iter().zip(ni.user_coords()).map(|(a, v)| (a.tag().to_be_bytes(), v)).collect();
-            named.push((i, style, coords));
-        }
-        if named.is_empty() {
-            out.push((i, family, style, Vec::new()));
-        } else {
-            out.extend(named.into_iter().map(|(i, s, c)| (i, family.clone(), s, c)));
-        }
-    }
-    out
-}
-
-/// The compiled-in Source Sans 3 Regular, for a database that somehow has no faces at all.
-pub(crate) fn last_resort_face() -> Arc<FontFace> {
-    static FACE: std::sync::OnceLock<Arc<FontFace>> = std::sync::OnceLock::new();
-    FACE.get_or_init(|| {
-        // The font is compiled in (`include_bytes!`), so parsing it can't depend on input; the
-        // `last_resort_face_parses` test proves it on every run.
-        #[allow(clippy::expect_used)]
-        let face = make_face(FontBytes::Static(BUNDLED[0]), FontSource::Bundled, 0, FALLBACK_FAMILY.into(), "Regular".into(), Vec::new())
-            .expect("the compiled-in Source Sans 3 Regular parses");
-        Arc::new(face)
-    })
-    .clone()
-}
-
-fn make_face(bytes: FontBytes, source: FontSource, index: u32, family: String, style: String, coords: Vec<([u8; 4], f32)>) -> Option<FontFace> {
-    let data: &[u8] = match &bytes {
-        FontBytes::Static(b) => b,
-        FontBytes::Owned(v) => v.as_slice(),
-    };
-    let f = skrifa::FontRef::from_index(data, index).ok()?;
-    let settings: Vec<(skrifa::Tag, f32)> = coords.iter().map(|(t, v)| (skrifa::Tag::new(t), *v)).collect();
-    let location = if coords.is_empty() { Location::default() } else { f.axes().location(settings.iter().copied()) };
-    let m = f.metrics(Size::unscaled(), &location);
-    let upem = m.units_per_em.max(1) as f64;
-    let a = f.attributes();
-    let wws = wws_names(&f, &family, &style);
-    let hb = harfrust::FontRef::from_index(data, index).ok()?;
-    let shaper = harfrust::ShaperData::new(&hb);
-    let instance = (!coords.is_empty())
-        .then(|| harfrust::ShaperInstance::from_variations(&hb, settings.iter().map(|(t, v)| harfrust::Variation { tag: *t, value: *v })));
-    let axis = |tag: &[u8; 4]| coords.iter().find(|(t, _)| t == tag).map(|(_, v)| *v);
-    let weight = axis(b"wght").unwrap_or(if coords.is_empty() { a.weight.value() } else { style_weight(&style) });
-    let italic = axis(b"ital")
-        .map(|v| v >= 0.5)
-        .or(axis(b"slnt").map(|v| v.abs() > 0.1))
-        .unwrap_or(!matches!(a.style, skrifa::attribute::Style::Normal) || style_italic(&style));
-    let family_aliases = aliases(&f, &[StringId::TYPOGRAPHIC_FAMILY_NAME, StringId::FAMILY_NAME]);
-    let style_aliases = aliases(&f, &[StringId::TYPOGRAPHIC_SUBFAMILY_NAME, StringId::SUBFAMILY_NAME]);
-    Some(FontFace {
-        id: NEXT_ID.fetch_add(1, Ordering::Relaxed),
-        family,
-        style,
-        wws,
-        weight,
-        italic,
-        upem,
-        ascent: m.ascent as f64,
-        typo_ascent: typo_ascent(&f, &location, upem).unwrap_or(m.ascent as f64),
-        descent: -(m.descent as f64),
-        // Fonts with an OS/2 table older than version 2 don't declare these: measure them from
-        // flat-topped letters before falling back to a share of the ascent, which can be far off
-        // (drop caps are sized from the cap height).
-        cap_height: plausible(m.cap_height.map(f64::from), upem)
-            .or_else(|| measured_top(&f, (&location).into(), &['H', 'I', 'E', 'T'], upem))
-            .unwrap_or(m.ascent as f64 * 0.72),
-        x_height: plausible(m.x_height.map(f64::from), upem)
-            .or_else(|| measured_top(&f, (&location).into(), &['x', 'z', 'v'], upem))
-            .unwrap_or(m.ascent as f64 * 0.5),
-        shaper,
-        coords,
-        location,
-        instance,
-        source,
-        bytes,
-        index,
-        bmp: std::sync::OnceLock::new(),
-        em: std::sync::OnceLock::new(),
-        family_aliases,
-        style_aliases,
-        icf: std::sync::OnceLock::new(),
-        group: std::sync::OnceLock::new(),
-        kind: std::sync::OnceLock::new(),
-        postscript: std::sync::OnceLock::new(),
-    })
-}
-
-/// A font's height above the baseline (font units) if it is plausible: above 0 and at most 4 em.
-pub(crate) fn plausible(v: Option<f64>, upem: f64) -> Option<f64> {
-    v.filter(|v| *v > 0.0 && *v <= 4.0 * upem)
-}
-
-/// The top of the first of `chars` the font has a non-empty outline for, in font units: the
-/// highest point of its unhinted outline at `location`, if [`plausible`]. For flat-topped letters
-/// that is the cap height (`H`) or x-height (`x`).
-pub(crate) fn measured_top(f: &skrifa::FontRef<'_>, location: LocationRef<'_>, chars: &[char], upem: f64) -> Option<f64> {
-    struct Top(f32);
-    impl OutlinePen for Top {
-        fn move_to(&mut self, _x: f32, y: f32) {
-            self.0 = self.0.max(y);
-        }
-        fn line_to(&mut self, _x: f32, y: f32) {
-            self.0 = self.0.max(y);
-        }
-        fn quad_to(&mut self, _cx: f32, _cy: f32, _x: f32, y: f32) {
-            self.0 = self.0.max(y);
-        }
-        fn curve_to(&mut self, _cx0: f32, _cy0: f32, _cx1: f32, _cy1: f32, _x: f32, y: f32) {
-            self.0 = self.0.max(y);
-        }
-        fn close(&mut self) {}
-    }
-    let cmap = f.charmap();
-    let glyphs = f.outline_glyphs();
-    chars.iter().find_map(|&c| {
-        let g = glyphs.get(cmap.map(c)?)?;
-        let mut pen = Top(f32::NEG_INFINITY);
-        g.draw(DrawSettings::unhinted(Size::unscaled(), location), &mut pen).ok()?;
-        plausible(Some(f64::from(pen.0)), upem)
-    })
-}
-
-/// The OS/2 typographic ascender in font units at `location`, if the font has an OS/2 table and
-/// the value is [`plausible`].
-fn typo_ascent(f: &skrifa::FontRef<'_>, location: &Location, upem: f64) -> Option<f64> {
-    use skrifa::raw::TableProvider;
-    let mut v = f.os2().ok()?.s_typo_ascender() as f64;
-    if !location.coords().is_empty()
-        && let Ok(mvar) = f.mvar()
-    {
-        v += mvar.metric_delta(skrifa::raw::tables::mvar::tags::HASC, location.coords()).map_or(0.0, |d| d.to_f64());
-    }
-    plausible(Some(v), upem)
-}
-
-/// `family` without what layout apps add to a family name, if it has any: InDesign's `$ID/`
-/// prefix (`$ID/Arial` → `Arial`) and the font-format suffix appended when a family is installed
-/// in several formats (`Minion Pro (OTF)` → `Minion Pro`).
-fn plain_family(family: &str) -> Option<&str> {
-    let unprefixed = family.trim_start().strip_prefix("$ID/").map(str::trim).filter(|f| !f.is_empty());
-    without_format_suffix(unprefixed.unwrap_or(family)).or(unprefixed)
-}
-
-/// `family` without the font-format suffix layout apps append when a family is installed in
-/// several formats (`Minion Pro (OTF)` → `Minion Pro`), if it has one.
-fn without_format_suffix(family: &str) -> Option<&str> {
-    const FORMATS: [&str; 5] = ["OTF", "TT", "TTF", "TTC", "T1"];
-    let (base, suffix) = family.trim_end().strip_suffix(')')?.rsplit_once('(')?;
-    let base = base.trim_end();
-    (!base.is_empty() && FORMATS.iter().any(|f| f.eq_ignore_ascii_case(suffix.trim()))).then_some(base)
-}
-
-/// The names `family` is looked up under when no font has it as written: without surrounding
-/// spaces, then without an `$ID/` prefix or a format suffix (see [`plain_family`]).
-fn alternate_names(family: &str) -> impl Iterator<Item = &str> {
-    let trimmed = family.trim();
-    (trimmed != family && !trimmed.is_empty()).then_some(trimmed).into_iter().chain(plain_family(trimmed))
-}
-
-/// The named style part of a style with axis settings (`Bold {wght:650}` → `Bold`).
-pub fn base_style(style: &str) -> &str {
-    style.split('{').next().unwrap_or(style).trim()
-}
-
-/// Do two style names name the same face? Spacing, punctuation and case don't count, as when a face
-/// is looked up (InDesign documents can carry `Regular ` with a trailing space).
-pub fn same_style(a: &str, b: &str) -> bool {
-    norm(a) == norm(b)
-}
-
-fn norm(s: &str) -> String {
-    s.chars().filter(|c| c.is_alphanumeric()).flat_map(char::to_lowercase).collect()
-}
-
-/// Weight implied by a style name.
-fn style_weight(style: &str) -> f32 {
-    let s = norm(style);
-    const TABLE: &[(&str, f32)] = &[
-        ("extralight", 200.0),
-        ("ultralight", 200.0),
-        ("semibold", 600.0),
-        ("demibold", 600.0),
-        ("extrabold", 800.0),
-        ("ultrabold", 800.0),
-        ("hairline", 100.0),
-        ("thin", 100.0),
-        ("light", 300.0),
-        ("medium", 500.0),
-        ("bold", 700.0),
-        ("black", 900.0),
-        ("heavy", 900.0),
-    ];
-    TABLE.iter().find(|(k, _)| s.contains(k)).map(|(_, w)| *w).unwrap_or(400.0)
-}
-
-fn style_italic(style: &str) -> bool {
-    let s = norm(style);
-    s.contains("italic") || s.contains("oblique") || s == "it"
-}
-
-impl FontDb {
-    /// A database holding the bundled fonts, then the craft-fonts Japanese faces (Mincho first,
-    /// so they are the fallback for Japanese text after the requested and bundled fonts; empty
-    /// without `CRAFT_FONTS_DIR`), whose system font scan reads `font_dirs`.
-    pub fn with_font_dirs(font_dirs: Vec<std::path::PathBuf>) -> Self {
-        let mut faces = Vec::new();
-        let craft = crate::japanese_document_fonts().into_iter().map(|f| f.bytes);
-        for data in BUNDLED.iter().copied().chain(craft) {
-            for (i, family, style, coords) in enumerate_faces(data) {
-                if let Some(f) = make_face(FontBytes::Static(data), FontSource::Bundled, i, family, style, coords) {
-                    faces.push(Arc::new(f));
-                }
-            }
-        }
-        Self {
-            faces: RwLock::new(faces),
-            scopes: RwLock::new(HashMap::new()),
-            #[cfg(not(target_arch = "wasm32"))]
-            document_files: Mutex::new(HashMap::new()),
-            instances: RwLock::new(HashMap::new()),
-            outlines: Mutex::new(HashMap::new()),
-            #[cfg(not(target_arch = "wasm32"))]
-            catalog: RwLock::new(Vec::new()),
-            #[cfg(not(target_arch = "wasm32"))]
-            installed_files: Mutex::new(HashMap::new()),
-            font_dirs,
-            font_files: Vec::new,
-            #[cfg(not(target_arch = "wasm32"))]
-            cataloged: std::sync::OnceLock::new(),
-            #[cfg(not(target_arch = "wasm32"))]
-            sys: Mutex::new(SysFallback { enabled: true, ..Default::default() }),
-            #[cfg(all(test, target_os = "linux"))]
-            fallback_snapshot_hook: Mutex::new(None),
-        }
-    }
-
-    /// Enable or disable the lazy system-font fallback for characters the loaded fonts lack
-    /// (native only; on by default).
-    pub fn set_system_fallback(&self, on: bool) {
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            self.sys.lock().unwrap_or_else(PoisonError::into_inner).enabled = on;
-        }
-        #[cfg(target_arch = "wasm32")]
-        let _ = on;
-    }
-
-    /// Process-wide database: the bundled fonts, then the installed system fonts (the font
-    /// folders' and the platform's other font files, see [`platform_font_files`]), cataloged the
-    /// first time a lookup by family name needs them (or ahead of time by
-    /// [`FontDb::scan_in_background`]).
-    pub fn global() -> &'static FontDb {
-        static DB: std::sync::OnceLock<FontDb> = std::sync::OnceLock::new();
-        DB.get_or_init(|| FontDb { font_files: platform_font_files, ..FontDb::with_font_dirs(system_font_dirs()) })
-    }
-
-    fn read_faces(&self) -> std::sync::RwLockReadGuard<'_, Vec<Arc<FontFace>>> {
-        self.faces.read().unwrap_or_else(PoisonError::into_inner)
-    }
-
-    /// The system font catalog, scanned first if it hasn't been yet.
-    #[cfg(not(target_arch = "wasm32"))]
-    fn read_catalog(&self) -> std::sync::RwLockReadGuard<'_, Vec<CatalogEntry>> {
-        self.ensure_catalog();
-        self.catalog.read().unwrap_or_else(PoisonError::into_inner)
-    }
-
-    /// What the document with font scope `scope` sees: its own fonts ahead of the shared ones.
-    /// Scope 0 (a document without fonts of its own) or a closed scope sees the shared fonts.
-    pub fn scoped(&self, scope: u32) -> ScopedFonts<'_> {
-        let own = if scope == 0 { None } else { self.scopes.read().unwrap_or_else(PoisonError::into_inner).get(&scope).cloned() };
-        ScopedFonts { db: self, own }
-    }
-
-    /// The shared fonts' family names (see [`ScopedFonts::families`]).
-    pub fn families(&self) -> Vec<String> {
-        self.scoped(0).families()
-    }
-
-    /// The shared fonts' styles of `family` (see [`ScopedFonts::styles`]).
-    pub fn styles(&self, family: &str) -> Vec<String> {
-        self.scoped(0).styles(family)
-    }
-
-    /// The shared fonts' weight and italic of a style of `family` (see [`ScopedFonts::traits_of`]).
-    pub fn traits_of(&self, family: &str, style: &str) -> (f32, bool) {
-        self.scoped(0).traits_of(family, style)
-    }
-
-    /// Style linking among the shared fonts (see [`ScopedFonts::linked_style`]).
-    pub fn linked_style(&self, family: &str, current: &str, bold: Option<bool>, italic: Option<bool>) -> Option<String> {
-        self.scoped(0).linked_style(family, current, bold, italic)
-    }
-
-    /// Add a user font (TTF/OTF/TTC bytes). Returns the number of faces added (0 if unparseable or
-    /// every face was already present).
-    pub fn add_font(&self, bytes: Vec<u8>) -> usize {
-        self.add_faces(bytes, FontSource::Memory)
-    }
-
-    /// Add the faces of a font file from `source` to the shared fonts, skipping the family and
-    /// style already loaded.
-    fn add_faces(&self, bytes: Vec<u8>, source: FontSource) -> usize {
-        let faces = self.new_faces(bytes, source);
-        self.insert_faces(faces)
-    }
-
-    /// The faces of a font file from `source` whose family and style aren't loaded yet.
-    pub(crate) fn new_faces(&self, bytes: Vec<u8>, source: FontSource) -> Vec<FontFace> {
-        let data = Arc::new(bytes);
-        enumerate_faces(&data)
-            .into_iter()
-            .filter(|(_, family, style, _)| !has_face(&self.read_faces(), family, style))
-            .filter_map(|(i, family, style, coords)| make_face(FontBytes::Owned(data.clone()), source.clone(), i, family, style, coords))
-            .collect()
-    }
-
-    /// Add `faces` to the shared fonts all at once, so a lookup sees all of them or none (not a
-    /// family's bold without its regular), skipping a family and style another thread has added
-    /// meanwhile. Returns the number added.
-    fn insert_faces(&self, new: Vec<FontFace>) -> usize {
-        let mut faces = self.faces.write().unwrap_or_else(PoisonError::into_inner);
-        let mut added = 0;
-        for f in new {
-            if !has_face(&faces, &f.family, &f.style) {
-                faces.push(Arc::new(f));
-                added += 1;
-            }
-        }
-        added
-    }
-
-    /// Catalog the installed fonts unless that has been done: the first caller scans the font
-    /// folders, any other waits for that scan to finish.
-    #[cfg(not(target_arch = "wasm32"))]
-    fn ensure_catalog(&self) {
-        self.cataloged.get_or_init(|| {
-            self.scan_font_dirs();
-        });
-    }
-
-    /// Whether the installed fonts are cataloged: a lookup by family name won't wait for the
-    /// scan (always true on wasm, which has none). See [`FontDb::scan_in_background`].
-    pub fn system_fonts_cataloged(&self) -> bool {
-        #[cfg(target_arch = "wasm32")]
-        return true;
-        #[cfg(not(target_arch = "wasm32"))]
-        self.cataloged.get().is_some()
-    }
-
-    /// Catalog the installed fonts on a background thread, so the first lookup by family name
-    /// (opening a file, the font menus) doesn't wait for the scan. A no-op once they are
-    /// cataloged, and on wasm.
-    pub fn scan_in_background(&'static self) {
-        #[cfg(not(target_arch = "wasm32"))]
-        if self.cataloged.get().is_none() {
-            // A failed spawn leaves the scan to the first lookup that needs it.
-            let _ = std::thread::Builder::new().name("font-scan".into()).spawn(move || self.ensure_catalog());
-        }
-    }
-
-    /// Scan the font folders again (fonts installed or removed since), cataloging the faces
-    /// found (native only). Font data is loaded when a cataloged family is first resolved.
-    /// Returns the number of faces cataloged.
-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn load_system_fonts(&self) -> usize {
-        // The first scan, or a rescan once it is done (never both at once).
-        let mut first = None;
-        self.cataloged.get_or_init(|| first = Some(self.scan_font_dirs()));
-        let count = first.unwrap_or_else(|| self.scan_font_dirs());
-        // Retry characters and CJK chain families that newly installed fonts can now cover.
-        // Reset outside scan_font_dirs: a chain lookup can hold sys during the initial scan.
-        let mut sys = self.sys.lock().unwrap_or_else(PoisonError::into_inner);
-        sys.generation = sys.generation.wrapping_add(1);
-        sys.misses.clear();
-        sys.chain_tried.clear();
-        count
-    }
-
-    /// Fonts installed, changed or removed since they were read (#328): scan the font folders
-    /// again (see [`FontDb::load_system_fonts`]), then let go of the shared faces whose installed
-    /// file changed (length or modification time) or is gone, so the next lookup reads the file as
-    /// it is now, or finds the font missing. What was composed with the old faces must be composed
-    /// again. Faces are never freed (see [`FaceRef`]): each reload of a changed file keeps the old
-    /// copy. Bundled, added and document fonts are left alone. Nothing to do on wasm.
-    pub fn reload_fonts(&self) -> ReloadedFonts {
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            // Rescan first: a lookup after the faces are dropped finds the new files.
-            let cataloged = self.load_system_fonts();
-            let changed: Vec<std::path::PathBuf> = {
-                let mut files = self.installed_files.lock().unwrap_or_else(PoisonError::into_inner);
-                let mut changed: Vec<_> = files.iter().filter(|(p, stamp)| file_stamp(p).as_ref() != Some(*stamp)).map(|(p, _)| p.clone()).collect();
-                changed.sort();
-                for p in &changed {
-                    files.remove(p);
-                }
-                changed
-            };
-            if !changed.is_empty() {
-                let stale = |f: &FontFace| matches!(&f.source, FontSource::Installed(p) if changed.contains(p));
-                let mut dropped = std::collections::HashSet::new();
-                self.faces.write().unwrap_or_else(PoisonError::into_inner).retain(|f| {
-                    let keep = !stale(f);
-                    if !keep {
-                        dropped.insert(f.id);
-                    }
-                    keep
-                });
-                self.instances.write().unwrap_or_else(PoisonError::into_inner).retain(|(base, _), f| !dropped.contains(base) && !stale(f));
-                self.outlines.lock().unwrap_or_else(PoisonError::into_inner).retain(|(face, _), _| !dropped.contains(face));
-                log::debug!("reloading {} changed font files ({} faces)", changed.len(), dropped.len());
-            }
-            ReloadedFonts { cataloged, changed }
-        }
-        #[cfg(target_arch = "wasm32")]
-        ReloadedFonts::default()
-    }
-
-    /// Read an installed font file, noting its length and modification time as they were before
-    /// the read (a change during it is then found by the next reload).
-    #[cfg(not(target_arch = "wasm32"))]
-    fn read_installed(&self, path: &std::path::Path) -> Option<Vec<u8>> {
-        let stamp = file_stamp(path)?;
-        let data = std::fs::read(path).ok()?;
-        self.installed_files.lock().unwrap_or_else(PoisonError::into_inner).insert(path.to_path_buf(), stamp);
-        Some(data)
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    fn scan_font_dirs(&self) -> usize {
-        let mut found = Vec::new();
-        let mut stack = self.font_dirs.clone();
-        // Each folder once, however links lead back to it.
-        let mut visited = std::collections::HashSet::new();
-        // The font files read, by canonical path, so the platform's list adds only the others.
-        let mut scanned = std::collections::HashSet::new();
-        while let Some(d) = stack.pop() {
-            if !visited.insert(std::fs::canonicalize(&d).unwrap_or_else(|_| d.clone())) {
-                continue;
-            }
-            let Ok(rd) = std::fs::read_dir(&d) else { continue };
-            for e in rd.flatten() {
-                let p = e.path();
-                if p.is_dir() {
-                    stack.push(p);
-                    continue;
-                }
-                let ext = p.extension().and_then(std::ffi::OsStr::to_str).map(str::to_ascii_lowercase);
-                if !matches!(ext.as_deref(), Some("ttf" | "otf" | "ttc" | "otc")) {
-                    continue;
-                }
-                scanned.insert(std::fs::canonicalize(&p).unwrap_or_else(|_| p.clone()));
-                for f in file_face_names(&p) {
-                    found.push(CatalogEntry {
-                        family: f.family,
-                        style: f.style,
-                        wws: f.wws,
-                        path: p.clone(),
-                        group: f.group,
-                        native: f.native,
-                        aliases: f.aliases,
-                        postscript: f.postscript,
-                    });
-                }
-            }
-        }
-        // Font services name their files as they like (no extension, say): the face names read
-        // decide what is a font.
-        for p in unscanned_font_files((self.font_files)(), &mut scanned) {
-            for f in file_face_names(&p) {
-                found.push(CatalogEntry {
-                    family: f.family,
-                    style: f.style,
-                    wws: f.wws,
-                    path: p.clone(),
-                    group: f.group,
-                    native: f.native,
-                    aliases: f.aliases,
-                    postscript: f.postscript,
-                });
-            }
-        }
-        let n = found.len();
-        log::debug!("cataloged {n} system font faces");
-        *self.catalog.write().unwrap_or_else(PoisonError::into_inner) = found;
-        n
-    }
-
-    /// Load the files of the installed `family`. Returns whether any face was added.
-    #[cfg(not(target_arch = "wasm32"))]
-    fn load_cataloged(&self, family: &str) -> bool {
-        let paths: Vec<std::path::PathBuf> = {
-            let cat = self.read_catalog();
-            let mut p: Vec<_> = cat.iter().filter(|c| in_catalog_family(c, family)).map(|c| c.path.clone()).collect();
-            p.sort();
-            p.dedup();
-            p
-        };
-        // The whole family arrives at once (see `insert_faces`).
-        let mut faces = Vec::new();
-        for p in paths {
-            if let Some(data) = self.read_installed(&p) {
-                faces.extend(self.new_faces(data, FontSource::Installed(p)));
-            }
-        }
-        self.insert_faces(faces) > 0
-    }
-
-    /// Load the font files (.ttf, .otf, .ttc, .otc; not in subfolders) of a document's `Document
-    /// Fonts` folder under a new scope, for that document alone: looked up through
-    /// [`FontDb::scoped`], they come before the shared faces of the same family and style, until
-    /// [`FontDb::close_scope`]. A file loaded before and unchanged since (same length and
-    /// modification time) isn't read again: its faces are shared. The files are untrusted: past
-    /// [`MAX_DOCUMENT_FONT_FILES`] (in name order), files over [`MAX_DOCUMENT_FONT_BYTES`] or past
-    /// [`MAX_DOCUMENT_FONTS_TOTAL`] in all, and files that aren't fonts are skipped with a note. A
-    /// missing folder loads nothing (scope 0).
-    ///
-    /// The folder is named by a document, so this crate does not trust it: `allow` (`Ok`, or why a
-    /// path may not be read) is asked about
-    /// the folder and about every font file in it before either is opened, and a path it refuses
-    /// is skipped with its message (the engine passes its automation-root check; a host with no
-    /// roots passes `&|_| Ok(())`).
-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn load_document_fonts(&self, folder: &std::path::Path, allow: &dyn Fn(&std::path::Path) -> Result<(), String>) -> DocumentFonts {
-        let mut out = DocumentFonts::default();
-        if let Err(why) = allow(folder) {
-            out.skipped.push(why);
-            return out;
-        }
-        let Ok(entries) = std::fs::read_dir(folder) else { return out };
-        let mut files: Vec<std::path::PathBuf> = Vec::new();
-        for path in entries.flatten().map(|e| e.path()) {
-            let ext = path.extension().and_then(std::ffi::OsStr::to_str).map(str::to_ascii_lowercase);
-            if !matches!(ext.as_deref(), Some("ttf" | "otf" | "ttc" | "otc")) {
-                continue;
-            }
-            // Each file is vetted before it is touched at all, a link out of the folder included.
-            match allow(&path) {
-                Ok(()) if path.is_file() => files.push(path),
-                Ok(()) => {}
-                Err(why) => out.skipped.push(why),
-            }
-        }
-        files.sort();
-        let mut total = 0u64;
-        let mut own: Vec<Arc<FontFace>> = Vec::new();
-        for (n, path) in files.iter().enumerate() {
-            if n == MAX_DOCUMENT_FONT_FILES {
-                out.skipped.push(format!("{} more font files not loaded (at most {MAX_DOCUMENT_FONT_FILES} are)", files.len() - n));
-                break;
-            }
-            let name = path.file_name().map_or_else(|| path.display().to_string(), |n| n.to_string_lossy().into_owned());
-            // The listed length skips oversized files unread.
-            let meta = std::fs::metadata(path).ok();
-            let listed = meta.as_ref().map_or(0, std::fs::Metadata::len);
-            let faces = if listed > MAX_DOCUMENT_FONT_BYTES {
-                Err(too_large())
-            } else if total.saturating_add(listed) > MAX_DOCUMENT_FONTS_TOTAL {
-                Err(over_total())
-            } else {
-                let modified = meta.and_then(|m| m.modified().ok());
-                self.document_file(path, listed, modified, MAX_DOCUMENT_FONTS_TOTAL.saturating_sub(total))
-            };
-            match faces {
-                Err(r) => out.skipped.push(format!("{name}: {r}")),
-                Ok((faces, len)) => {
-                    total = total.saturating_add(len);
-                    // A family and style the folder already gave stays with its first file.
-                    for f in faces {
-                        if !own.iter().any(|o| o.family.eq_ignore_ascii_case(&f.family) && o.style.eq_ignore_ascii_case(&f.style)) {
-                            own.push(f);
-                        }
-                    }
-                }
-            }
-        }
-        for s in &out.skipped {
-            log::warn!("{}: {s}", folder.display());
-        }
-        if !own.is_empty() {
-            out.scope = NEXT_SCOPE.fetch_add(1, Ordering::Relaxed);
-            out.faces = own.len();
-            self.scopes.write().unwrap_or_else(PoisonError::into_inner).insert(out.scope, own.into());
-        }
-        out
-    }
-
-    /// The faces of the document font file at `path` (`listed` bytes long, modified at
-    /// `modified`): those read before if it hasn't changed since, else read now, within `room`
-    /// bytes of the folder's total → (faces, bytes), or why the file is skipped.
-    #[cfg(not(target_arch = "wasm32"))]
-    fn document_file(
-        &self,
-        path: &std::path::Path,
-        listed: u64,
-        modified: Option<std::time::SystemTime>,
-        room: u64,
-    ) -> Result<(Vec<Arc<FontFace>>, u64), String> {
-        use std::io::Read;
-        if let Some((len, m, faces)) = self.document_files.lock().unwrap_or_else(PoisonError::into_inner).get(path)
-            && (*len, *m) == (listed, modified)
-        {
-            return Ok((faces.clone(), listed));
-        }
-        // One byte past the limit catches a file that grew since it was listed.
-        let mut data = Vec::new();
-        std::fs::File::open(path)
-            .and_then(|f| f.take(MAX_DOCUMENT_FONT_BYTES + 1).read_to_end(&mut data))
-            .map_err(|e| format!("can't be read ({e})"))?;
-        let len = data.len() as u64;
-        if len > MAX_DOCUMENT_FONT_BYTES {
-            return Err(too_large());
-        }
-        if listed.max(len) > room {
-            return Err(over_total());
-        }
-        let data = Arc::new(data);
-        let faces: Vec<Arc<FontFace>> = enumerate_faces(&data)
-            .into_iter()
-            .filter_map(|(i, family, style, coords)| {
-                make_face(FontBytes::Owned(data.clone()), FontSource::Document(path.to_path_buf()), i, family, style, coords)
-            })
-            .map(Arc::new)
-            .collect();
-        if faces.is_empty() {
-            return Err("not a font DesignCraft can read".into());
-        }
-        self.document_files.lock().unwrap_or_else(PoisonError::into_inner).insert(path.to_path_buf(), (listed, modified, faces.clone()));
-        Ok((faces, len))
-    }
-
-    /// Close a document's font scope: its fonts are no longer found (in it or anywhere). Their
-    /// files stay read, for the document opening again.
-    pub fn close_scope(&self, scope: u32) {
-        self.scopes.write().unwrap_or_else(PoisonError::into_inner).remove(&scope);
-    }
-
-    /// The shared fonts' face for `family` + `style` (see [`ScopedFonts::face`]).
-    pub fn face(&self, family: &str, style: &str) -> Arc<FontFace> {
-        self.scoped(0).face(family, style)
-    }
-
-    /// The shared face with PostScript name `name` (see [`ScopedFonts::postscript_face`]).
-    pub fn postscript_face(&self, name: &str) -> Option<(String, String)> {
-        self.scoped(0).postscript_face(name)
-    }
-
-    /// Is `family` among the shared fonts (loaded, or installed on the system)?
-    pub fn has_family(&self, family: &str) -> bool {
-        self.scoped(0).has_family(family)
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    fn is_loaded(&self, family: &str) -> bool {
-        self.read_faces().iter().any(|f| f.family.eq_ignore_ascii_case(family) || has_wws_family(f, family))
-    }
-
-    /// A shared variable font's axes (see [`ScopedFonts::axes`]).
-    pub fn axes(&self, family: &str, style: &str) -> Vec<(String, String, f32, f32, f32)> {
-        self.scoped(0).axes(family, style)
-    }
-
-    /// A shared face other than `exclude` that covers `c` (see [`ScopedFonts::fallback_for`]).
-    pub fn fallback_for(&self, c: char, exclude: u32, language: Option<&str>) -> Option<Arc<FontFace>> {
-        self.scoped(0).fallback_for(c, exclude, language)
-    }
-
-    /// Load a system font covering `c` (preferred fallback families first, then any cataloged
-    /// file under 40 MB). Returns true if one was loaded. Misses are remembered.
-    #[cfg(not(target_arch = "wasm32"))]
-    fn system_fallback(&self, c: char) -> bool {
-        if c.is_control() || c.is_whitespace() {
-            return false;
-        }
-        let generation = {
-            let sys = self.sys.lock().unwrap_or_else(PoisonError::into_inner);
-            if !sys.enabled || sys.misses.contains(&c) {
-                return false;
-            }
-            sys.generation
-        };
-        let covered = |db: &FontDb| db.read_faces().iter().any(|f| f.covers(c));
-        let cataloged: Vec<String> = self.read_catalog().iter().map(|e| e.family.clone()).collect();
-        for fam in SYSTEM_FALLBACKS {
-            if !self.is_loaded(fam) && cataloged.iter().any(|f| f.eq_ignore_ascii_case(fam)) {
-                self.load_cataloged(fam);
-                if covered(self) {
-                    return true;
-                }
-            }
-        }
-        let mut paths: Vec<std::path::PathBuf> = self.catalog.read().unwrap_or_else(PoisonError::into_inner).iter().map(|e| e.path.clone()).collect();
-        paths.sort();
-        paths.dedup();
-        #[cfg(all(test, target_os = "linux"))]
-        {
-            let hook = self.fallback_snapshot_hook.lock().unwrap_or_else(PoisonError::into_inner).take();
-            if let Some(hook) = hook {
-                let _ = hook.reached.send(());
-                hook.resume.wait();
-            }
-        }
-        for p in paths {
-            if std::fs::metadata(&p).map(|m| m.len() > 40 << 20).unwrap_or(true) {
-                continue;
-            }
-            let Some(data) = self.read_installed(&p) else { continue };
-            let hit =
-                enumerate_faces(&data).iter().any(|(i, _, _, _)| skrifa::FontRef::from_index(&data, *i).is_ok_and(|f| f.charmap().map(c).is_some()));
-            if hit && self.add_faces(data, FontSource::Installed(p)) > 0 && covered(self) {
-                return true;
-            }
-        }
-        let mut sys = self.sys.lock().unwrap_or_else(PoisonError::into_inner);
-        if sys.generation == generation {
-            sys.misses.insert(c);
-        }
-        false
-    }
-
-    /// The box drawn for `face`'s missing glyph (.notdef) when the font's own has no outline, in
-    /// font units, y-down: a hollow rectangle across the glyph's advance, cap height tall. `None`
-    /// when the font draws its own.
-    pub fn missing_box(&self, face: &FontFace) -> Option<BezPath> {
-        if !font_outline(face, 0).elements().is_empty() {
-            return None;
-        }
-        let adv = Some(face.advance(0)).filter(|a| a.is_finite() && *a > 0.0).unwrap_or(face.upem * 0.5);
-        let top = Some(face.cap_height).filter(|h| h.is_finite() && *h > 0.0).unwrap_or(face.upem * 0.7);
-        let outer = kurbo::Rect::new(adv * 0.1, -top, adv * 0.9, 0.0);
-        let t = (face.upem * 0.05).min(outer.width() / 4.0).min(top / 4.0);
-        let inner = outer.inset(-t);
-        let mut p = BezPath::new();
-        // The inner rectangle runs the other way round, so filling leaves it empty.
-        p.move_to((outer.x0, outer.y0));
-        p.line_to((outer.x1, outer.y0));
-        p.line_to((outer.x1, outer.y1));
-        p.line_to((outer.x0, outer.y1));
-        p.close_path();
-        p.move_to((inner.x0, inner.y0));
-        p.line_to((inner.x0, inner.y1));
-        p.line_to((inner.x1, inner.y1));
-        p.line_to((inner.x1, inner.y0));
-        p.close_path();
-        Some(p)
-    }
-
-    /// Glyph outline in font units, y-down (flipped), cached per (face, glyph). A `.notdef`
-    /// without an outline is drawn as [`FontDb::missing_box`], so a missing character never
-    /// disappears.
-    pub fn outline(&self, face: &FontFace, gid: u32) -> Arc<BezPath> {
-        let key = (face.id, gid);
-        if let Some(p) = self.outlines.lock().unwrap_or_else(PoisonError::into_inner).get(&key) {
-            return p.clone();
-        }
-        let drawn = font_outline(face, gid);
-        let p = Arc::new(if gid == 0 && drawn.elements().is_empty() { self.missing_box(face).unwrap_or(drawn) } else { drawn });
-        let mut cache = self.outlines.lock().unwrap_or_else(PoisonError::into_inner);
-        if cache.len() >= OUTLINE_CACHE_MAX {
-            cache.clear();
-        }
-        cache.insert(key, p.clone());
-        p
-    }
-}
-
-/// One document's view of the [`FontDb`] ([`FontDb::scoped`]): the fonts of its `Document Fonts`
-/// folder, then the shared fonts (bundled, installed, added). Other documents' fonts aren't in it.
-#[derive(Clone)]
-pub struct ScopedFonts<'a> {
-    db: &'a FontDb,
-    /// The document's own faces, in the folder's file order (none without a scope).
-    own: Option<Arc<[Arc<FontFace>]>>,
-}
-
-impl ScopedFonts<'_> {
-    fn own(&self) -> &[Arc<FontFace>] {
-        self.own.as_deref().unwrap_or(&[])
-    }
-
-    /// Resolve localized and legacy family names without confusing replacement fonts with
-    /// installed originals. Document-local names take precedence over shared fonts.
-    ///
-    /// In each scope (the document's faces, loaded faces, the catalog) an exact typographic name
-    /// wins, then a WWS family name (an optical-size face's, see `find`), which names its faces as
-    /// it is, then the aliases. An optical-size face's legacy family name (name ID 1) is usually
-    /// its WWS name, so the aliases must not claim it first.
-    pub fn canonical_family(&self, family: &str) -> Option<String> {
-        let is = |name: &str| name.eq_ignore_ascii_case(family);
-        let in_faces = |faces: &[Arc<FontFace>]| -> Option<String> {
-            if let Some(f) = faces.iter().find(|f| is(&f.family)) {
-                return Some(f.family.clone());
-            }
-            if let Some(w) = faces.iter().find_map(|f| f.wws.as_ref().filter(|w| is(&w.0))) {
-                return Some(w.0.clone());
-            }
-            faces.iter().find(|f| f.family_aliases.iter().any(|alias| is(alias))).map(|f| f.family.clone())
-        };
-        if let Some(name) = in_faces(self.own()).or_else(|| in_faces(&self.db.read_faces())) {
-            return Some(name);
-        }
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            let catalog = self.db.read_catalog();
-            if let Some(c) = catalog.iter().find(|c| is(&c.family)) {
-                return Some(c.family.clone());
-            }
-            if let Some(w) = catalog.iter().find_map(|c| c.wws.as_ref().filter(|w| is(&w.0))) {
-                return Some(w.0.clone());
-            }
-            if let Some(c) = catalog.iter().find(|c| c.aliases.iter().any(|alias| is(alias))) {
-                return Some(c.family.clone());
-            }
-        }
-        None
-    }
-
-    /// Whether the requested style exists, including localized names and axis instances.
-    pub fn has_style(&self, family: &str, style: &str) -> bool {
-        if !self.has_family(family) {
-            return false;
-        }
-        let face = self.face(family, style);
-        norm(&face.style) == norm(style)
-            || (face.coords.is_empty() && face.style_aliases.iter().any(|alias| norm(alias) == norm(style)))
-            // An optical-size face asked for by its WWS names.
-            || face.wws.as_ref().is_some_and(|w| w.0.eq_ignore_ascii_case(family) && norm(&w.1) == norm(style))
-    }
-
-    /// Prefer known metric-compatible substitutes, then an appropriate script family. This
-    /// never changes `has_family`: a usable substitute is still a missing original font.
-    pub fn substitute_family(&self, family: &str) -> String {
-        let lower = family.to_lowercase();
-        let candidates: &[&str] = match lower.as_str() {
-            "calibri" | "calibri light" => &["Carlito", "Liberation Sans"],
-            "cambria" | "cambria math" => &["Caladea", "Liberation Serif"],
-            "arial" | "helvetica" => &["Liberation Sans", "Arial", "Helvetica"],
-            "times new roman" | "times" => &["Liberation Serif", "Times New Roman", "Times"],
-            "courier new" | "courier" => &["Liberation Mono", "Courier New", "Courier"],
-            _ if lower.contains("arabic") || lower.contains("naskh") => &["Amiri", "Noto Naskh Arabic", "Geeza Pro"],
-            _ if family.contains('楷') => &["Kaiti SC", "STKaiti", "KaiTi", "Songti SC"],
-            _ if family.contains("仿宋") => &["STFangsong", "FangSong", "Songti SC"],
-            _ if family.contains('宋') || family.contains("明朝") => &["Songti SC", "Noto Serif CJK SC", "SimSun"],
-            _ if family.contains('黑') || family.contains("雅黑") => &["PingFang SC", "Noto Sans CJK SC", "Microsoft YaHei"],
-            _ if family.chars().any(|c| ('\u{3400}'..='\u{9fff}').contains(&c)) => &["Songti SC", "Noto Serif CJK SC", "PingFang SC"],
-            _ => &[],
-        };
-        candidates.iter().find_map(|name| self.canonical_family(name)).unwrap_or_else(|| FALLBACK_FAMILY.to_string())
-    }
-
-    /// A replacement suggestion must cover the text being replaced, not just its main script.
-    /// Ties retain the preferred substitute; this does not install or redefine any font.
-    pub fn replacement_face(&self, family: &str, style: &str, characters: &[char]) -> Arc<FontFace> {
-        let mut best = self.face(family, style);
-        let coverage = |face: &FontFace| characters.iter().filter(|&&c| c.is_whitespace() || c.is_control() || face.covers(c)).count();
-        let mut score = coverage(&best);
-        let candidates: &[&str] = if characters.iter().any(|c| ('\u{0600}'..='\u{08ff}').contains(c)) {
-            &["Amiri", "Noto Naskh Arabic", "Al Bayan", "Damascus", "Geeza Pro", "Arial"]
-        } else if characters.iter().any(|c| ('\u{3400}'..='\u{9fff}').contains(c)) {
-            &["Songti SC", "Kaiti SC", "Noto Serif CJK SC", "PingFang SC", "Noto Sans CJK SC"]
-        } else {
-            &["Source Serif 4", "Source Sans 3", "Inter"]
-        };
-        for candidate in candidates {
-            if score == characters.len() {
-                break;
-            }
-            if !self.has_family(candidate) {
-                continue;
-            }
-            let face = self.face(candidate, style);
-            let next = coverage(&face);
-            if next > score {
-                best = face;
-                score = next;
-            }
-        }
-        best
-    }
-
-    /// Family names available (the document's, loaded and cataloged system fonts), sorted and
-    /// deduplicated.
-    pub fn families(&self) -> Vec<String> {
-        let mut v: Vec<String> = self.own().iter().chain(self.db.read_faces().iter()).map(|f| f.family.clone()).collect();
-        #[cfg(not(target_arch = "wasm32"))]
-        v.extend(self.db.read_catalog().iter().map(|c| c.family.clone()));
-        v.sort_by_key(|a| a.to_lowercase());
-        v.dedup_by(|a, b| a.eq_ignore_ascii_case(b));
-        v
-    }
-
-    /// The available families as the font menus list them (see [`ScopedFonts::families`]), each
-    /// with its group and native name, unsorted ([`crate::sort_for_menu`] orders them).
-    pub fn family_infos(&self) -> Vec<FamilyInfo> {
-        let mut out: Vec<FamilyInfo> = Vec::new();
-        let mut seen = std::collections::HashSet::new();
-        for f in self.own().iter().chain(self.db.read_faces().iter()) {
-            if seen.insert(f.family.to_lowercase()) {
-                let (group, native) = f.menu_group();
-                out.push(FamilyInfo { family: f.family.clone(), group, native: native.map(str::to_string) });
-            }
-        }
-        #[cfg(not(target_arch = "wasm32"))]
-        for c in self.db.read_catalog().iter() {
-            if seen.insert(c.family.to_lowercase()) {
-                out.push(FamilyInfo { family: c.family.clone(), group: c.group, native: c.native.clone() });
-            }
-        }
-        out
-    }
-
-    /// Style names available for `family` (Regular first, then by weight).
-    pub fn styles(&self, family: &str) -> Vec<String> {
-        self.style_traits(family).into_iter().map(|t| t.2).collect()
-    }
-
-    /// Weight and italic of a style of `family`: from the font when it is known, else from the
-    /// style's name.
-    pub fn traits_of(&self, family: &str, style: &str) -> (f32, bool) {
-        let base = base_style(style);
-        self.style_traits(family)
-            .into_iter()
-            .find(|t| t.2.eq_ignore_ascii_case(base))
-            .map_or((style_weight(base), style_italic(base)), |(italic, weight, _)| (weight, italic))
-    }
-
-    /// Style linking: the style of `family` that sets bold (`bold`) and italic (`italic`) as asked
-    /// and keeps the other from `current` (Bold from Italic is Bold Italic). `None` when the
-    /// family has no such style.
-    pub fn linked_style(&self, family: &str, current: &str, bold: Option<bool>, italic: Option<bool>) -> Option<String> {
-        let (weight, cur_italic) = self.traits_of(family, current);
-        let want_italic = italic.unwrap_or(cur_italic);
-        let want_weight = match bold {
-            Some(true) => 700.0,
-            Some(false) => 400.0,
-            None => weight,
-        };
-        // Width words (Condensed, Extended…) of the current style are kept when the family allows.
-        const WIDTHS: &[&str] = &["condensed", "compressed", "narrow", "extended", "expanded", "wide"];
-        let widths = |s: &str| {
-            let n = norm(s);
-            WIDTHS.iter().filter(|w| n.contains(*w)).count()
-        };
-        let cur_widths = widths(current);
-        self.style_traits(family)
-            .into_iter()
-            .filter(|(i, w, _)| *i == want_italic && bold.is_none_or(|b| b == (*w >= 600.0)))
-            .min_by(|a, b| {
-                let key = |t: &(bool, f32, String)| ((t.1 - want_weight).abs(), usize::from(widths(&t.2) != cur_widths), t.2.len());
-                let (ka, kb) = (key(a), key(b));
-                ka.0.total_cmp(&kb.0).then(ka.1.cmp(&kb.1)).then(ka.2.cmp(&kb.2))
-            })
-            .map(|t| t.2)
-    }
-
-    /// `(italic, weight, name)` of each style of `family` (the document's, loaded, or installed),
-    /// Regular first, then by weight.
-    fn style_traits(&self, family: &str) -> Vec<(bool, f32, String)> {
-        let v = self.exact_style_traits(family);
-        if !v.is_empty() {
-            return v;
-        }
-        alternate_names(family).map(|f| self.exact_style_traits(f)).find(|v| !v.is_empty()).unwrap_or_default()
-    }
-
-    fn exact_style_traits(&self, family: &str) -> Vec<(bool, f32, String)> {
-        let canonical = self.canonical_family(family);
-        let family = canonical.as_deref().unwrap_or(family);
-        let v = self.named_style_traits(family, false);
-        // No face of that typographic family: the family may be a WWS name (see `find`).
-        if v.is_empty() { self.named_style_traits(family, true) } else { v }
-    }
-
-    /// [`ScopedFonts::exact_style_traits`] by the faces' typographic names, or by their WWS names
-    /// when `by_wws`.
-    fn named_style_traits(&self, family: &str, by_wws: bool) -> Vec<(bool, f32, String)> {
-        let mut v: Vec<(bool, f32, String)> = self
-            .own()
-            .iter()
-            .chain(self.db.read_faces().iter())
-            .filter(|f| !f.style.contains('{'))
-            .filter_map(|f| known_as(&f.family, &f.style, f.wws.as_ref(), by_wws).map(|n| (f, n)))
-            .filter(|(_, (fam, _))| fam.eq_ignore_ascii_case(family))
-            .map(|(f, (_, style))| (f.italic, f.weight, style.to_string()))
-            .collect();
-        #[cfg(not(target_arch = "wasm32"))]
-        for c in self.db.read_catalog().iter() {
-            if let Some((fam, style)) = known_as(&c.family, &c.style, c.wws.as_ref(), by_wws)
-                && fam.eq_ignore_ascii_case(family)
-                && !v.iter().any(|(_, _, s)| s.eq_ignore_ascii_case(style))
-            {
-                v.push((style_italic(style), style_weight(style), style.to_string()));
-            }
-        }
-        v.sort_by(|a, b| a.0.cmp(&b.0).then(a.1.total_cmp(&b.1)).then(a.2.cmp(&b.2)));
-        v.dedup_by(|a, b| a.2 == b.2);
-        v
-    }
-
-    /// Resolve a family + style to a face, falling back to the closest style of the family, then to
-    /// Source Sans 3 Regular. Installed system fonts are found by name whatever ran before. A
-    /// family that isn't found as written is looked up without surrounding spaces, then without
-    /// InDesign's `$ID/` prefix or a format suffix (`Minion Pro (OTF)` → `Minion Pro`).
-    pub fn face(&self, family: &str, style: &str) -> Arc<FontFace> {
-        let canonical = self
-            .canonical_family(family)
-            .or_else(|| alternate_names(family).find_map(|f| self.canonical_family(f)))
-            .unwrap_or_else(|| self.substitute_family(alternate_names(family).last().unwrap_or(family)));
-        if let Some(f) = self.find_or_load(&canonical, style) {
-            return f;
-        }
-        self.find(FALLBACK_FAMILY, style)
-            .or_else(|| self.find(FALLBACK_FAMILY, "Regular"))
-            .or_else(|| self.db.read_faces().first().cloned())
-            .unwrap_or_else(last_resort_face)
-    }
-
-    fn find_or_load(&self, family: &str, style: &str) -> Option<Arc<FontFace>> {
-        if let Some(f) = self.find(family, style) {
-            return Some(f);
-        }
-        #[cfg(not(target_arch = "wasm32"))]
-        if self.db.load_cataloged(family) {
-            return self.find(family, style);
-        }
-        None
-    }
-
-    /// `family`'s kind (format, class, PANOSE) and when its file was added, read from its Regular
-    /// face (else its first), for the font menus' filters, which look at every family. A face
-    /// already loaded is asked; an installed family that isn't loaded is read from its file, which
-    /// is then let go rather than kept loaded. None for an unknown family or an unreadable file.
-    pub fn family_kind(&self, family: &str) -> Option<(crate::kind::FaceKind, Option<std::time::SystemTime>)> {
-        let styles = self.styles(family);
-        let style = styles.iter().find(|s| *s == "Regular").or(styles.first())?.clone();
-        if self.own().iter().chain(self.db.read_faces().iter()).any(|f| f.family.eq_ignore_ascii_case(family)) {
-            let f = self.find(family, &style)?;
-            return Some((f.kind(), f.added()));
-        }
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            let path = {
-                let cat = self.db.read_catalog();
-                let of_family = |c: &&CatalogEntry| c.family.eq_ignore_ascii_case(family);
-                let entry = cat.iter().filter(of_family).find(|c| norm(&c.style) == norm(&style)).or_else(|| cat.iter().find(of_family));
-                entry.map(|c| c.path.clone())?
-            };
-            if std::fs::metadata(&path).ok()?.len() > MAX_DOCUMENT_FONT_BYTES {
-                return None;
-            }
-            let data = Arc::new(std::fs::read(&path).ok()?);
-            let found = enumerate_faces(&data);
-            let pick = found
-                .iter()
-                .find(|(_, f, st, _)| f.eq_ignore_ascii_case(family) && norm(st) == norm(&style))
-                .or_else(|| found.iter().find(|(_, f, _, _)| f.eq_ignore_ascii_case(family)))?
-                .clone();
-            let (index, fam, st, coords) = pick;
-            let face = make_face(FontBytes::Owned(data.clone()), FontSource::Installed(path), index, fam, st, coords)?;
-            Some((face.kind(), face.added()))
-        }
-        #[cfg(target_arch = "wasm32")]
-        None
-    }
-
-    /// The family and style of the face whose PostScript name is `name`, ignoring case (the
-    /// document's, loaded, or installed on the system, not loading it). SVGs exported from
-    /// Illustrator name fonts this way (`font-family="'MyriadPro-Regular'"`).
-    pub fn postscript_face(&self, name: &str) -> Option<(String, String)> {
-        let named = |ps: Option<&str>| ps.is_some_and(|ps| ps.eq_ignore_ascii_case(name));
-        if let Some(f) = self.own().iter().chain(self.db.read_faces().iter()).find(|f| named(f.postscript_name())) {
-            return Some((f.family.clone(), f.style.clone()));
-        }
-        #[cfg(not(target_arch = "wasm32"))]
-        if let Some(c) = self.db.read_catalog().iter().find(|c| named(c.postscript.as_deref())) {
-            return Some((c.family.clone(), c.style.clone()));
-        }
-        None
-    }
-
-    /// Is `family` available (the document's, loaded, or installed on the system), as named or
-    /// under an alternate name (see [`ScopedFonts::face`])?
-    pub fn has_family(&self, family: &str) -> bool {
-        self.canonical_family(family).is_some() || alternate_names(family).any(|f| self.canonical_family(f).is_some())
-    }
-
-    /// A variable font's axes: (tag, name, min, default, max), empty for static fonts.
-    pub fn axes(&self, family: &str, style: &str) -> Vec<(String, String, f32, f32, f32)> {
-        let face = self.face(family, base_style(style));
-        let Some(f) = face.skrifa() else { return vec![] };
-        f.axes()
-            .iter()
-            .map(|a| {
-                let tag = String::from_utf8_lossy(&a.tag().to_be_bytes()).to_string();
-                let name = f.localized_strings(a.name_id()).english_or_first().map(|s| s.to_string()).unwrap_or_else(|| tag.clone());
-                (tag, name, a.min_value(), a.default_value(), a.max_value())
-            })
-            .collect()
-    }
-
-    /// Glyph outline in font units, y-down (flipped), cached per (face, glyph); see
-    /// [`FontDb::outline`].
-    pub fn outline(&self, face: &FontFace, gid: u32) -> Arc<BezPath> {
-        self.db.outline(face, gid)
-    }
-
-    /// See [`FontDb::missing_box`].
-    pub fn missing_box(&self, face: &FontFace) -> Option<BezPath> {
-        self.db.missing_box(face)
-    }
-
-    /// `Style {wght:650,wdth:90}`: the named style's font at those axis values, made on first use.
-    fn instance(&self, family: &str, style: &str) -> Option<Arc<FontFace>> {
-        let open = style.find('{')?;
-        let base = self.find(family, style[..open].trim())?;
-        if base.skrifa().is_none_or(|f| f.axes().is_empty()) {
-            return Some(base);
-        }
-        let key = (base.id, style.to_string());
-        if let Some(f) = self.db.instances.read().unwrap_or_else(PoisonError::into_inner).get(&key) {
-            return Some(f.clone());
-        }
-        let mut coords = base.coords.clone();
-        for kv in style[open + 1..].trim_end_matches('}').split(',') {
-            let (k, v) = kv.split_once(':')?;
-            let k = k.trim().as_bytes();
-            let v: f32 = v.trim().parse().ok()?;
-            if k.len() != 4 {
-                return None;
-            }
-            let tag = [k[0], k[1], k[2], k[3]];
-            match coords.iter_mut().find(|(t, _)| *t == tag) {
-                Some(c) => c.1 = v,
-                None => coords.push((tag, v)),
-            }
-        }
-        let f = make_face(base.bytes.clone(), base.source.clone(), base.index, base.family.clone(), style.to_string(), coords)?;
-        Some(self.db.instances.write().unwrap_or_else(PoisonError::into_inner).entry(key).or_insert_with(|| Arc::new(f)).clone())
-    }
-
-    fn find(&self, family: &str, style: &str) -> Option<Arc<FontFace>> {
-        if style.contains('{') {
-            return self.instance(family, style);
-        }
-        let faces = self.db.read_faces();
-        // The document's fonts first: they stand in for other fonts of the same name.
-        let named = |f: &&Arc<FontFace>| f.family.eq_ignore_ascii_case(family);
-        let own: Vec<&Arc<FontFace>> = self.own().iter().filter(named).collect();
-        let mut cands: Vec<&Arc<FontFace>> = if own.is_empty() { faces.iter().filter(named).collect() } else { own };
-        // No face of that typographic family: the family may be a WWS name, whose faces carry
-        // their WWS style names.
-        let by_wws = cands.is_empty();
-        if by_wws {
-            let aliased = |f: &&Arc<FontFace>| has_wws_family(f, family);
-            let own: Vec<&Arc<FontFace>> = self.own().iter().filter(aliased).collect();
-            cands = if own.is_empty() { faces.iter().filter(aliased).collect() } else { own };
-        }
-        if cands.is_empty() {
-            return None;
-        }
-        let style_of = |f: &FontFace| -> String { norm(f.wws.as_ref().filter(|_| by_wws).map_or(&f.style, |w| &w.1)) };
-        let ns = norm(style);
-        // A face's own style name first: another face's legacy subfamily ("Black" faces named
-        // "Regular" in their RIBBI family) or localized name must not shadow it.
-        if let Some(f) = cands
-            .iter()
-            .find(|f| style_of(f) == ns)
-            .or_else(|| cands.iter().find(|f| f.coords.is_empty() && f.style_aliases.iter().any(|alias| norm(alias) == ns)))
-        {
-            return Some((*f).clone());
-        }
-        let (tw, ti) = (style_weight(style), style_italic(style));
-        cands
-            .iter()
-            .min_by(|a, b| {
-                let sa = (a.weight - tw).abs() + if a.italic != ti { 1000.0 } else { 0.0 };
-                let sb = (b.weight - tw).abs() + if b.italic != ti { 1000.0 } else { 0.0 };
-                sa.total_cmp(&sb)
-            })
-            .map(|f| (*f).clone())
-    }
-
-    /// A face other than `exclude` that covers `c` in `language` (a BCP 47 tag, `None` when
-    /// unknown). CJK characters try their language's chain first (see [`cjk_chain`]), Malayalam
-    /// the fonts made for it (see [`script_chain`]); then the first face (fallback family first,
-    /// then load order, the document's fonts last) that covers `c`. On native, system fonts are
-    /// cataloged and loaded lazily the first time no loaded face covers a character.
-    pub fn fallback_for(&self, c: char, exclude: u32, language: Option<&str>) -> Option<Arc<FontFace>> {
-        if let Some(chain) = cjk_chain(c, language).or_else(|| script_chain(c))
-            && let Some(f) = chain.iter().find_map(|family| self.chain_face(family, c, exclude))
-        {
-            return Some(f);
-        }
-        if let Some(f) = self.loaded_fallback(c, exclude) {
-            return Some(f);
-        }
-        #[cfg(not(target_arch = "wasm32"))]
-        if self.db.system_fallback(c) {
-            return self.loaded_fallback(c, exclude);
-        }
-        None
-    }
-
-    /// The face of `family` (the document's first, regular first) that covers `c`, loading the
-    /// installed family the first time a chain asks for it (native, while the system fallback is
-    /// on).
-    fn chain_face(&self, family: &'static str, c: char, exclude: u32) -> Option<Arc<FontFace>> {
-        #[cfg(not(target_arch = "wasm32"))]
-        if !self.db.is_loaded(family) {
-            // Held while loading, so a parallel lookup waits for the font instead of passing it by.
-            let mut sys = self.db.sys.lock().unwrap_or_else(PoisonError::into_inner);
-            if sys.enabled && sys.chain_tried.insert(family) {
-                self.db.load_cataloged(family);
-            }
-        }
-        let faces = self.db.read_faces();
-        let mut order: Vec<&Arc<FontFace>> =
-            self.own().iter().chain(faces.iter()).filter(|f| f.id != exclude && f.family.eq_ignore_ascii_case(family)).collect();
-        order.sort_by_key(|f| (f.italic, (f.weight - 400.0).abs() as i32));
-        order.into_iter().find(|f| f.covers(c)).cloned()
-    }
-
-    fn loaded_fallback(&self, c: char, exclude: u32) -> Option<Arc<FontFace>> {
-        let faces = self.db.read_faces();
-        let mut order: Vec<&Arc<FontFace>> = faces.iter().chain(self.own().iter()).filter(|f| f.id != exclude).collect();
-        order.sort_by_key(|f| (!f.family.eq_ignore_ascii_case(FALLBACK_FAMILY), f.italic, (f.weight - 400.0).abs() as i32));
-        order.into_iter().find(|f| f.covers(c)).cloned()
-    }
-}
-
+use fallback::SysFallback;
+pub use names::{base_style, same_style};
+use outline::FlipPen;
+pub use scoped::ScopedFonts;
+#[cfg(all(not(target_arch = "wasm32"), test))]
+use system::file_face_names;
+#[cfg(all(test, not(any(target_os = "macos", windows))))]
+use system::unix_font_dirs;
 #[cfg(not(target_arch = "wasm32"))]
-fn too_large() -> String {
-    format!("larger than {} MB", MAX_DOCUMENT_FONT_BYTES >> 20)
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn over_total() -> String {
-    format!("over the {} MB the folder's fonts may take in all", MAX_DOCUMENT_FONTS_TOTAL >> 20)
-}
-
-/// Does the face's "l" (else "I") have serifs: much wider at its foot than mid-stem? `None` when
-/// it has neither letter.
-fn has_serifs(face: &FontFace) -> Option<bool> {
-    let gid = ['l', 'I'].into_iter().map(|c| face.glyph_for(c)).find(|g| *g != 0)?;
-    let path = font_outline(face, gid);
-    let bbox = kurbo::Shape::bounding_box(&path);
-    // An empty or degenerate outline (NaN included) says nothing.
-    if bbox.height().is_nan() || bbox.height() <= 1.0 {
-        return None;
-    }
-    let mut edges = Vec::new();
-    let mut last = None;
-    let mut start = None;
-    kurbo::flatten(&path, 1.0, |el| match el {
-        kurbo::PathEl::MoveTo(p) => {
-            last = Some(p);
-            start = Some(p);
-        }
-        kurbo::PathEl::LineTo(p) => {
-            if let Some(a) = last {
-                edges.push((a, p));
-            }
-            last = Some(p);
-        }
-        kurbo::PathEl::ClosePath => {
-            if let (Some(a), Some(b)) = (last, start) {
-                edges.push((a, b));
-            }
-            last = start;
-        }
-        _ => {}
-    });
-    // The outline is y-down: the foot is near bbox.y1 (the baseline).
-    let width_at = |y: f64| {
-        let xs: Vec<f64> = edges
-            .iter()
-            .filter(|(a, b)| (a.y <= y && y < b.y) || (b.y <= y && y < a.y))
-            .map(|(a, b)| a.x + (y - a.y) * (b.x - a.x) / (b.y - a.y))
-            .collect();
-        let (lo, hi) = xs.iter().fold((f64::MAX, f64::MIN), |(lo, hi), x| (lo.min(*x), hi.max(*x)));
-        (hi > lo).then_some(hi - lo)
-    };
-    let foot = width_at(bbox.y1 - bbox.height() * 0.02)?;
-    let stem = width_at(bbox.y0 + bbox.height() * 0.5)?;
-    Some(foot > stem * 1.6)
-}
-
-/// Glyph `gid`'s outline as the font draws it, in font units, y-down (flipped).
-fn font_outline(face: &FontFace, gid: u32) -> BezPath {
-    let mut pen = FlipPen(BezPath::new());
-    if let Some(f) = face.skrifa()
-        && let Some(g) = f.outline_glyphs().get(GlyphId::new(gid))
-    {
-        let _ = g.draw(DrawSettings::unhinted(Size::unscaled(), face.location()), &mut pen);
-    }
-    pen.0
-}
-
-struct FlipPen(BezPath);
+use system::{CatalogEntry, FileStamp};
+pub use system::{ReloadedFonts, system_font_dirs};
 
 impl OutlinePen for FlipPen {
     fn move_to(&mut self, x: f32, y: f32) {
@@ -2186,71 +168,4 @@ impl OutlinePen for FlipPen {
 }
 
 #[cfg(test)]
-#[cfg(not(target_arch = "wasm32"))]
-#[path = "tests_sysfonts.rs"]
-mod tests_sysfonts;
-
-#[cfg(test)]
-#[cfg(not(target_arch = "wasm32"))]
-#[path = "tests_fallback.rs"]
-mod tests_fallback;
-
-#[cfg(test)]
-#[cfg(not(target_arch = "wasm32"))]
-#[path = "tests_docfonts.rs"]
-mod tests_docfonts;
-
-#[cfg(test)]
-#[path = "tests_vertical.rs"]
-mod tests_vertical;
-
-#[cfg(test)]
-mod tests_heights {
-    use super::*;
-    use crate::testing::{font_mapping, with_table_u16};
-
-    fn face_of(bytes: Vec<u8>) -> FontFace {
-        make_face(FontBytes::Owned(Arc::new(bytes)), FontSource::Memory, 0, "Test".into(), "Regular".into(), Vec::new()).unwrap()
-    }
-
-    /// `font` with OS/2 sxHeight and sCapHeight set to 0 (undeclared).
-    fn undeclared(font: Vec<u8>) -> Vec<u8> {
-        with_table_u16(with_table_u16(font, b"OS/2", 86, 0).unwrap(), b"OS/2", 88, 0).unwrap()
-    }
-
-    /// The top of Source Sans 3's glyph for `c` from its bounding box (font units).
-    fn bbox_top(c: char) -> f64 {
-        let f = skrifa::FontRef::new(BUNDLED[0]).unwrap();
-        f.glyph_metrics(Size::unscaled(), LocationRef::default()).bounds(f.charmap().map(c).unwrap()).unwrap().y_max as f64
-    }
-
-    /// A font that doesn't declare its cap height and x-height gets them measured from its
-    /// flat-topped letters, also when it lacks the first choices `H` and `x`; a font that
-    /// declares them keeps them.
-    #[test]
-    fn undeclared_heights_are_measured_from_outlines() {
-        let glyphs = [('H', 'H'), ('x', 'x'), ('E', 'E'), ('z', 'z')];
-        for (glyphs, cap, x) in [(&glyphs[..], 'H', 'x'), (&glyphs[2..], 'E', 'z')] {
-            let face = face_of(undeclared(font_mapping("Heights", glyphs).unwrap()));
-            let (cap, x) = (bbox_top(cap), bbox_top(x));
-            assert!(cap > x && x > 0.0);
-            assert!((face.cap_height - cap).abs() <= 1.0, "{glyphs:?}: cap height {} vs {cap}", face.cap_height);
-            assert!((face.x_height - x).abs() <= 1.0, "{glyphs:?}: x-height {} vs {x}", face.x_height);
-        }
-        let declared = face_of(font_mapping("Heights", &glyphs).unwrap());
-        assert_eq!((declared.cap_height, declared.x_height), (660.0, 486.0), "Source Sans 3 Regular's OS/2 values");
-        // Declared values win over the outlines: `H` drawn as `x` doesn't lower the cap height.
-        let face = face_of(font_mapping("Heights", &[('H', 'x'), ('x', 'H')]).unwrap());
-        assert_eq!((face.cap_height, face.x_height), (declared.cap_height, declared.x_height));
-    }
-
-    /// Without any of the letters, or with only empty outlines, the heights fall back to a share
-    /// of the ascent.
-    #[test]
-    fn heights_without_measurable_letters_fall_back_to_the_ascent() {
-        for glyphs in [&[('a', 'a')][..], &[('H', ' '), ('x', ' ')]] {
-            let face = face_of(undeclared(font_mapping("Heights", glyphs).unwrap()));
-            assert_eq!((face.cap_height, face.x_height), (face.ascent * 0.72, face.ascent * 0.5), "{glyphs:?}");
-        }
-    }
-}
+mod tests;
diff --git a/crates/fonts/src/fontdb/db.rs b/crates/fonts/src/fontdb/db.rs
new file mode 100644
index 000000000..e7fee7cbf
--- /dev/null
+++ b/crates/fonts/src/fontdb/db.rs
@@ -0,0 +1,246 @@
+use super::face::{BUNDLED, FontBytes, FontFace, FontSource, enumerate_faces, make_face};
+#[cfg(not(target_arch = "wasm32"))]
+use super::fallback::SysFallback;
+use super::names::has_face;
+#[cfg(not(target_arch = "wasm32"))]
+use super::names::has_wws_family;
+use super::outline::font_outline;
+#[cfg(target_os = "macos")]
+use super::platform_font_files;
+use super::scoped::ScopedFonts;
+#[cfg(not(target_arch = "wasm32"))]
+use super::system::CatalogEntry;
+#[cfg(not(target_os = "macos"))]
+use super::system::platform_font_files;
+use super::system::system_font_dirs;
+use super::{Arc, AtomicU32, BezPath, FontDb, HashMap, Mutex, PoisonError, RwLock};
+
+pub(super) static NEXT_ID: AtomicU32 = AtomicU32::new(1);
+
+/// Scopes are never reused: a closed document's scope finds no fonts ever after.
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) static NEXT_SCOPE: AtomicU32 = AtomicU32::new(1);
+
+const OUTLINE_CACHE_MAX: usize = 50_000;
+
+impl FontDb {
+    /// A database holding the bundled fonts, then the craft-fonts Japanese faces (Mincho first),
+    /// followed by Noto Sans Hebrew Regular and Noto Sans Devanagari Regular for document text.
+    /// The optional craft-fonts faces are absent without `CRAFT_FONTS_DIR`; system font scans
+    /// read `font_dirs`. Japanese fallback and UI ordering remain independent of these additions.
+    pub fn with_font_dirs(font_dirs: Vec<std::path::PathBuf>) -> Self {
+        let mut faces = Vec::new();
+        let craft = crate::japanese_document_fonts()
+            .into_iter()
+            .chain(
+                ["Noto Sans Hebrew", "Noto Sans Devanagari"]
+                    .into_iter()
+                    .filter_map(|family| crate::CRAFT_FONTS.iter().find(|f| f.family == family && f.style == "Regular")),
+            )
+            .map(|f| f.bytes);
+        for data in BUNDLED.iter().copied().chain(craft) {
+            for (i, family, style, coords) in enumerate_faces(data) {
+                if let Some(f) = make_face(FontBytes::Static(data), FontSource::Bundled, i, family, style, coords) {
+                    faces.push(Arc::new(f));
+                }
+            }
+        }
+        Self {
+            faces: RwLock::new(faces),
+            scopes: RwLock::new(HashMap::new()),
+            #[cfg(not(target_arch = "wasm32"))]
+            document_files: Mutex::new(HashMap::new()),
+            instances: RwLock::new(HashMap::new()),
+            outlines: Mutex::new(HashMap::new()),
+            #[cfg(not(target_arch = "wasm32"))]
+            catalog: RwLock::new(Vec::new()),
+            #[cfg(not(target_arch = "wasm32"))]
+            installed_files: Mutex::new(HashMap::new()),
+            font_dirs,
+            font_files: Vec::new,
+            #[cfg(not(target_arch = "wasm32"))]
+            cataloged: std::sync::OnceLock::new(),
+            #[cfg(not(target_arch = "wasm32"))]
+            sys: Mutex::new(SysFallback { enabled: true, ..Default::default() }),
+            #[cfg(all(test, target_os = "linux"))]
+            fallback_snapshot_hook: Mutex::new(None),
+        }
+    }
+
+    /// Enable or disable the lazy system-font fallback for characters the loaded fonts lack
+    /// (native only; on by default).
+    pub fn set_system_fallback(&self, on: bool) {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            self.sys.lock().unwrap_or_else(PoisonError::into_inner).enabled = on;
+        }
+        #[cfg(target_arch = "wasm32")]
+        let _ = on;
+    }
+
+    /// Process-wide database: the bundled fonts, then the installed system fonts (the font
+    /// folders' and the platform's other font files, see [`platform_font_files`]), cataloged the
+    /// first time a lookup by family name needs them (or ahead of time by
+    /// [`FontDb::scan_in_background`]).
+    pub fn global() -> &'static FontDb {
+        static DB: std::sync::OnceLock<FontDb> = std::sync::OnceLock::new();
+        DB.get_or_init(|| FontDb { font_files: platform_font_files, ..FontDb::with_font_dirs(system_font_dirs()) })
+    }
+
+    pub(super) fn read_faces(&self) -> std::sync::RwLockReadGuard<'_, Vec<Arc<FontFace>>> {
+        self.faces.read().unwrap_or_else(PoisonError::into_inner)
+    }
+
+    /// The system font catalog, scanned first if it hasn't been yet.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(super) fn read_catalog(&self) -> std::sync::RwLockReadGuard<'_, Vec<CatalogEntry>> {
+        self.ensure_catalog();
+        self.catalog.read().unwrap_or_else(PoisonError::into_inner)
+    }
+
+    /// What the document with font scope `scope` sees: its own fonts ahead of the shared ones.
+    /// Scope 0 (a document without fonts of its own) or a closed scope sees the shared fonts.
+    pub fn scoped(&self, scope: u32) -> ScopedFonts<'_> {
+        let own = if scope == 0 { None } else { self.scopes.read().unwrap_or_else(PoisonError::into_inner).get(&scope).cloned() };
+        ScopedFonts { db: self, own }
+    }
+
+    /// The shared fonts' family names (see [`ScopedFonts::families`]).
+    pub fn families(&self) -> Vec<String> {
+        self.scoped(0).families()
+    }
+
+    /// The shared fonts' styles of `family` (see [`ScopedFonts::styles`]).
+    pub fn styles(&self, family: &str) -> Vec<String> {
+        self.scoped(0).styles(family)
+    }
+
+    /// The shared fonts' weight and italic of a style of `family` (see [`ScopedFonts::traits_of`]).
+    pub fn traits_of(&self, family: &str, style: &str) -> (f32, bool) {
+        self.scoped(0).traits_of(family, style)
+    }
+
+    /// Style linking among the shared fonts (see [`ScopedFonts::linked_style`]).
+    pub fn linked_style(&self, family: &str, current: &str, bold: Option<bool>, italic: Option<bool>) -> Option<String> {
+        self.scoped(0).linked_style(family, current, bold, italic)
+    }
+
+    /// Add a user font (TTF/OTF/TTC bytes). Returns the number of faces added (0 if unparseable or
+    /// every face was already present).
+    pub fn add_font(&self, bytes: Vec<u8>) -> usize {
+        self.add_faces(bytes, FontSource::Memory)
+    }
+
+    /// Add the faces of a font file from `source` to the shared fonts, skipping the family and
+    /// style already loaded.
+    pub(super) fn add_faces(&self, bytes: Vec<u8>, source: FontSource) -> usize {
+        let faces = self.new_faces(bytes, source);
+        self.insert_faces(faces)
+    }
+
+    /// The faces of a font file from `source` whose family and style aren't loaded yet.
+    pub(crate) fn new_faces(&self, bytes: Vec<u8>, source: FontSource) -> Vec<FontFace> {
+        let data = Arc::new(bytes);
+        enumerate_faces(&data)
+            .into_iter()
+            .filter(|(_, family, style, _)| !has_face(&self.read_faces(), family, style))
+            .filter_map(|(i, family, style, coords)| make_face(FontBytes::Owned(data.clone()), source.clone(), i, family, style, coords))
+            .collect()
+    }
+
+    /// Add `faces` to the shared fonts all at once, so a lookup sees all of them or none (not a
+    /// family's bold without its regular), skipping a family and style another thread has added
+    /// meanwhile. Returns the number added.
+    pub(super) fn insert_faces(&self, new: Vec<FontFace>) -> usize {
+        let mut faces = self.faces.write().unwrap_or_else(PoisonError::into_inner);
+        let mut added = 0;
+        for f in new {
+            if !has_face(&faces, &f.family, &f.style) {
+                faces.push(Arc::new(f));
+                added += 1;
+            }
+        }
+        added
+    }
+
+    /// Close a document's font scope: its fonts are no longer found (in it or anywhere). Their
+    /// files stay read, for the document opening again.
+    pub fn close_scope(&self, scope: u32) {
+        self.scopes.write().unwrap_or_else(PoisonError::into_inner).remove(&scope);
+    }
+
+    /// The shared fonts' face for `family` + `style` (see [`ScopedFonts::face`]).
+    pub fn face(&self, family: &str, style: &str) -> Arc<FontFace> {
+        self.scoped(0).face(family, style)
+    }
+
+    /// The shared face with PostScript name `name` (see [`ScopedFonts::postscript_face`]).
+    pub fn postscript_face(&self, name: &str) -> Option<(String, String)> {
+        self.scoped(0).postscript_face(name)
+    }
+
+    /// Is `family` among the shared fonts (loaded, or installed on the system)?
+    pub fn has_family(&self, family: &str) -> bool {
+        self.scoped(0).has_family(family)
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(super) fn is_loaded(&self, family: &str) -> bool {
+        self.read_faces().iter().any(|f| f.family.eq_ignore_ascii_case(family) || has_wws_family(f, family))
+    }
+
+    /// A shared variable font's axes (see [`ScopedFonts::axes`]).
+    pub fn axes(&self, family: &str, style: &str) -> Vec<(String, String, f32, f32, f32)> {
+        self.scoped(0).axes(family, style)
+    }
+
+    /// A shared face other than `exclude` that covers `c` (see [`ScopedFonts::fallback_for`]).
+    pub fn fallback_for(&self, c: char, exclude: u32, language: Option<&str>) -> Option<Arc<FontFace>> {
+        self.scoped(0).fallback_for(c, exclude, language)
+    }
+
+    /// The box drawn for `face`'s missing glyph (.notdef) when the font's own has no outline, in
+    /// font units, y-down: a hollow rectangle across the glyph's advance, cap height tall. `None`
+    /// when the font draws its own.
+    pub fn missing_box(&self, face: &FontFace) -> Option<BezPath> {
+        if !font_outline(face, 0).elements().is_empty() {
+            return None;
+        }
+        let adv = Some(face.advance(0)).filter(|a| a.is_finite() && *a > 0.0).unwrap_or(face.upem * 0.5);
+        let top = Some(face.cap_height).filter(|h| h.is_finite() && *h > 0.0).unwrap_or(face.upem * 0.7);
+        let outer = kurbo::Rect::new(adv * 0.1, -top, adv * 0.9, 0.0);
+        let t = (face.upem * 0.05).min(outer.width() / 4.0).min(top / 4.0);
+        let inner = outer.inset(-t);
+        let mut p = BezPath::new();
+        // The inner rectangle runs the other way round, so filling leaves it empty.
+        p.move_to((outer.x0, outer.y0));
+        p.line_to((outer.x1, outer.y0));
+        p.line_to((outer.x1, outer.y1));
+        p.line_to((outer.x0, outer.y1));
+        p.close_path();
+        p.move_to((inner.x0, inner.y0));
+        p.line_to((inner.x0, inner.y1));
+        p.line_to((inner.x1, inner.y1));
+        p.line_to((inner.x1, inner.y0));
+        p.close_path();
+        Some(p)
+    }
+
+    /// Glyph outline in font units, y-down (flipped), cached per (face, glyph). A `.notdef`
+    /// without an outline is drawn as [`FontDb::missing_box`], so a missing character never
+    /// disappears.
+    pub fn outline(&self, face: &FontFace, gid: u32) -> Arc<BezPath> {
+        let key = (face.id, gid);
+        if let Some(p) = self.outlines.lock().unwrap_or_else(PoisonError::into_inner).get(&key) {
+            return p.clone();
+        }
+        let drawn = font_outline(face, gid);
+        let p = Arc::new(if gid == 0 && drawn.elements().is_empty() { self.missing_box(face).unwrap_or(drawn) } else { drawn });
+        let mut cache = self.outlines.lock().unwrap_or_else(PoisonError::into_inner);
+        if cache.len() >= OUTLINE_CACHE_MAX {
+            cache.clear();
+        }
+        cache.insert(key, p.clone());
+        p
+    }
+}
diff --git a/crates/fonts/src/fontdb/face.rs b/crates/fonts/src/fontdb/face.rs
new file mode 100644
index 000000000..058be0c0e
--- /dev/null
+++ b/crates/fonts/src/fontdb/face.rs
@@ -0,0 +1,530 @@
+use super::db::NEXT_ID;
+use super::names::{aliases, face_names, name, norm, style_italic, style_weight, wws_names};
+use super::outline::has_serifs;
+use super::{Arc, DrawSettings, FileRef, FontGroup, GlyphId, Location, LocationRef, MetadataProvider, Ordering, OutlinePen, Size, StringId};
+
+/// The family used when a requested family is unknown (the UI sans).
+pub const FALLBACK_FAMILY: &str = "Source Sans 3";
+
+/// The bundled fonts (OFL), as font file bytes. Japanese fonts are not bundled: they come from
+/// the optional craft-fonts build input ([`crate::japanese_document_fonts`]).
+pub fn bundled() -> &'static [&'static [u8]] {
+    BUNDLED
+}
+
+pub(super) static BUNDLED: &[&[u8]] = &[
+    include_bytes!("../../../../assets/fonts/SourceSans3-Regular.ttf"),
+    include_bytes!("../../../../assets/fonts/SourceSans3-Semibold.ttf"),
+    include_bytes!("../../../../assets/fonts/SourceSans3-Bold.ttf"),
+    include_bytes!("../../../../assets/fonts/SourceSans3-It.ttf"),
+    include_bytes!("../../../../assets/fonts/SourceSerif4-Regular.ttf"),
+    include_bytes!("../../../../assets/fonts/SourceSerif4-It.ttf"),
+    include_bytes!("../../../../assets/fonts/SourceSerif4-Semibold.ttf"),
+    include_bytes!("../../../../assets/fonts/SourceSerif4-Bold.ttf"),
+    include_bytes!("../../../../assets/fonts/SourceSerif4-BoldIt.ttf"),
+    include_bytes!("../../../../assets/fonts/Inter-Regular.ttf"),
+    include_bytes!("../../../../assets/fonts/Inter-Medium.ttf"),
+    include_bytes!("../../../../assets/fonts/Inter-SemiBold.ttf"),
+    include_bytes!("../../../../assets/fonts/JetBrainsMono-Regular.ttf"),
+];
+
+#[derive(Clone)]
+pub(super) enum FontBytes {
+    Static(&'static [u8]),
+    Owned(Arc<Vec<u8>>),
+}
+
+/// Where a face's font came from.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum FontSource {
+    /// Compiled into DesignCraft.
+    Bundled,
+    /// Font data handed to [`FontDb::add_font`], with no file behind it.
+    Memory,
+    /// An installed font file (the system's or the user's font folders, or one the platform
+    /// lists outside them).
+    Installed(std::path::PathBuf),
+    /// A font file in a document's `Document Fonts` folder ([`FontDb::load_document_fonts`]).
+    Document(std::path::PathBuf),
+}
+
+/// The folder beside a document whose fonts the document brings with it (as File › Package
+/// writes it).
+pub const DOCUMENT_FONTS_FOLDER: &str = "Document Fonts";
+
+/// Caps on what a `Document Fonts` folder (untrusted files) can make [`FontDb::load_document_fonts`]
+/// read: font files read, bytes per file and bytes in all.
+pub const MAX_DOCUMENT_FONT_FILES: usize = 200;
+
+pub const MAX_DOCUMENT_FONT_BYTES: u64 = 256 << 20;
+
+pub const MAX_DOCUMENT_FONTS_TOTAL: u64 = 512 << 20;
+
+/// What [`FontDb::load_document_fonts`] did: the scope the document looks its fonts up in (0 when
+/// the folder gave none), the faces in it, and a note for each file skipped.
+#[derive(Debug, Default)]
+pub struct DocumentFonts {
+    pub scope: u32,
+    pub faces: usize,
+    pub skipped: Vec<String>,
+}
+
+/// One loaded font face.
+pub struct FontFace {
+    pub(super) id: u32,
+    /// Typographic family name (e.g. "Source Sans 3").
+    pub family: String,
+    /// Typographic style name (e.g. "Semibold", "Italic").
+    pub style: String,
+    /// The WWS family and style names (name IDs 21 and 22) when they differ from the typographic
+    /// ones: InDesign names an optical-size face by them ("Kepler Std Display" / "Light").
+    pub wws: Option<(String, String)>,
+    /// usWeightClass-style weight (400 = regular).
+    pub weight: f32,
+    pub italic: bool,
+    /// Where the font came from (a file to copy when packaging, a document's own font).
+    pub source: FontSource,
+    pub(super) bytes: FontBytes,
+    pub(super) index: u32,
+    pub upem: f64,
+    /// Ascender in font units (positive = up).
+    pub ascent: f64,
+    /// OS/2 typographic ascender in font units (the ascent when the font has no usable one): the
+    /// Ascent first baseline offset.
+    pub typo_ascent: f64,
+    /// Descender in font units (positive = down).
+    pub descent: f64,
+    /// Cap height and x height in font units (without plausible OS/2 values, the cap height is the
+    /// top of the H, and either is estimated from the ascent): the Cap Height and x Height first
+    /// baseline offsets.
+    pub cap_height: f64,
+    pub x_height: f64,
+    pub shaper: harfrust::ShaperData,
+    /// Variable fonts: the named instance's axis settings (user units; empty = default instance),
+    /// the normalised location and the shaper's view of it.
+    pub coords: Vec<([u8; 4], f32)>,
+    location: Location,
+    pub instance: Option<harfrust::ShaperInstance>,
+    /// Basic Multilingual Plane coverage bitset, built on first use.
+    bmp: std::sync::OnceLock<Box<[u64]>>,
+    /// The ideographic em box, read on first use.
+    em: std::sync::OnceLock<((f64, f64), bool)>,
+    /// The ideographic character face box, read on first use.
+    icf: std::sync::OnceLock<(f64, f64)>,
+    /// The font menu group and native family name, read on first use.
+    group: std::sync::OnceLock<(FontGroup, Option<String>)>,
+    pub(super) family_aliases: Vec<String>,
+    pub(super) style_aliases: Vec<String>,
+    /// Format, class and PANOSE numbers (the font menus), read on first use.
+    kind: std::sync::OnceLock<crate::kind::FaceKind>,
+    /// The PostScript name, read on first use.
+    postscript: std::sync::OnceLock<Option<String>>,
+}
+
+/// A cheap `Copy` handle to a face. Faces are never unloaded, so the handle lives for the rest of
+/// the process; unlike cloning an `Arc`, copying it touches no shared reference count (which made
+/// parallel composition scale negatively).
+#[derive(Clone, Copy)]
+pub struct FaceRef(pub(crate) &'static FontFace);
+
+impl FontFace {
+    pub fn data(&self) -> &[u8] {
+        match &self.bytes {
+            FontBytes::Static(b) => b,
+            FontBytes::Owned(v) => v.as_slice(),
+        }
+    }
+
+    pub fn skrifa(&self) -> Option<skrifa::FontRef<'_>> {
+        skrifa::FontRef::from_index(self.data(), self.index).ok()
+    }
+
+    /// The face's format, class and PANOSE numbers, as the font menus show and filter them.
+    pub fn kind(&self) -> crate::kind::FaceKind {
+        *self.kind.get_or_init(|| {
+            let mut kind = self.skrifa().map(|f| crate::kind::read_kind(&f, &self.family)).unwrap_or_default();
+            // Nothing in the tables or the name: look at the letters.
+            if kind.class == crate::kind::FontClass::Other
+                && let Some(serifs) = has_serifs(self)
+            {
+                kind.class = if serifs { crate::kind::FontClass::Serif } else { crate::kind::FontClass::SansSerif };
+            }
+            kind
+        })
+    }
+
+    pub fn hb(&self) -> Option<harfrust::FontRef<'_>> {
+        harfrust::FontRef::from_index(self.data(), self.index).ok()
+    }
+
+    /// Where in the design space glyphs, metrics and outlines come from.
+    pub fn location(&self) -> LocationRef<'_> {
+        (&self.location).into()
+    }
+
+    /// Is this a named instance of a variable font?
+    pub fn is_variable(&self) -> bool {
+        !self.coords.is_empty()
+    }
+
+    /// Face index within the font file (collections); 0 for plain fonts.
+    pub fn index(&self) -> u32 {
+        self.index
+    }
+
+    /// Unique id of this face within the process.
+    pub fn id(&self) -> u32 {
+        self.id
+    }
+
+    /// System placeholder fonts draw generic boxes rather than the requested character.
+    pub fn is_placeholder(&self) -> bool {
+        matches!(norm(self.family.trim_start_matches('.')).as_str(), "lastresort")
+    }
+
+    /// Does the face map `c` to a real glyph?
+    pub fn covers(&self, c: char) -> bool {
+        if self.is_placeholder() {
+            return false;
+        }
+        let cp = c as u32;
+        if cp < 0x1_0000 {
+            let bits = self.bmp.get_or_init(|| {
+                let mut b = vec![0u64; 1024].into_boxed_slice();
+                if let Some(f) = self.skrifa() {
+                    for (cp, gid) in f.charmap().mappings() {
+                        if cp < 0x1_0000 && gid.to_u32() != 0 {
+                            b[(cp / 64) as usize] |= 1 << (cp % 64);
+                        }
+                    }
+                }
+                b
+            });
+            return bits[(cp / 64) as usize] & (1 << (cp % 64)) != 0;
+        }
+        self.skrifa().is_some_and(|f| f.charmap().map(c).is_some_and(|gid| gid.to_u32() != 0))
+    }
+
+    /// Units per em.
+    pub fn units_per_em(&self) -> f64 {
+        self.upem
+    }
+
+    /// (ascent, descent) in font units, both positive.
+    pub fn vertical_metrics(&self) -> (f64, f64) {
+        (self.ascent, self.descent)
+    }
+
+    /// Every mapped character and its glyph id, sorted by code point (the Glyphs panel).
+    pub fn chars(&self) -> Vec<(char, u32)> {
+        let Some(f) = self.skrifa() else { return vec![] };
+        let mut v: Vec<(char, u32)> = f.charmap().mappings().filter_map(|(cp, g)| char::from_u32(cp).map(|c| (c, g.to_u32()))).collect();
+        v.sort_unstable_by_key(|x| x.0);
+        v.dedup_by_key(|x| x.0);
+        v
+    }
+
+    /// Advance width of glyph `gid` in font units.
+    pub fn advance(&self, gid: u32) -> f64 {
+        self.skrifa()
+            .and_then(|f| f.glyph_metrics(Size::unscaled(), self.location()).advance_width(GlyphId::new(gid)))
+            .map(|a| a as f64)
+            .unwrap_or(self.upem * 0.5)
+    }
+
+    /// Vertical advance (down the line) of glyph `gid` in font units: `vmtx`, else one em.
+    pub fn v_advance(&self, gid: u32) -> f64 {
+        crate::vertical::VMetrics::new(self).advance(GlyphId::new(gid))
+    }
+
+    /// Height of glyph `gid`'s vertical origin above its baseline in font units: `VORG`, else its
+    /// top plus its `vmtx` top side bearing, else the em box top. Across, the origin is at half the
+    /// horizontal advance. Upright glyphs in vertical text hang from it on the line's centre.
+    pub fn v_origin(&self, gid: u32) -> f64 {
+        crate::vertical::VMetrics::new(self).origin(GlyphId::new(gid))
+    }
+
+    /// The ideographic em box (top, bottom) in font units, y up, one em tall (Japanese fonts:
+    /// typically 880, -120): `BASE` `idtp`/`ideo`; else, for a CJK font, from the OS/2 typo
+    /// ascender when the typo ascender and descender span one em; else centred on half the cap
+    /// height (OS/2, else the `H` glyph's top); else 0.88 em above the baseline.
+    pub fn em_box(&self) -> (f64, f64) {
+        self.em.get_or_init(|| crate::vertical::em_box(self)).0
+    }
+
+    /// [`Self::em_box`] when the font's tables give it, `None` for the 0.88 em fallback.
+    pub fn declared_em_box(&self) -> Option<(f64, f64)> {
+        let (b, declared) = *self.em.get_or_init(|| crate::vertical::em_box(self));
+        declared.then_some(b)
+    }
+
+    /// The ideographic character face (ICF) box (top, bottom) in font units, y up: `BASE`
+    /// `icft`/`icfb`, else the em box inset by 5% of the em at the top and bottom.
+    pub fn icf_box(&self) -> (f64, f64) {
+        *self.icf.get_or_init(|| crate::vertical::icf_box(self))
+    }
+
+    /// The font menu group the font is for and, for a CJK group, its family name in that language
+    /// (see [`crate::FamilyInfo`]); read from the font once.
+    pub fn menu_group(&self) -> (FontGroup, Option<&str>) {
+        let (g, n) = self.group.get_or_init(|| self.skrifa().map(|f| crate::group::classify(&f, &self.family)).unwrap_or_default());
+        (*g, n.as_deref())
+    }
+
+    /// The PostScript name (`name` ID 6), read from the font once. None for a variable font's
+    /// named instance: the file's name belongs to its default instance.
+    pub fn postscript_name(&self) -> Option<&str> {
+        self.postscript
+            .get_or_init(|| if self.is_variable() { None } else { self.skrifa().and_then(|f| name(&f, &[StringId::POSTSCRIPT_NAME])) })
+            .as_deref()
+    }
+
+    /// Glyph id for `c` (0 = .notdef).
+    pub fn glyph_for(&self, c: char) -> u32 {
+        self.skrifa().and_then(|f| f.charmap().map(c)).map(|g| g.to_u32()).unwrap_or(0)
+    }
+
+    /// GDEF identifies marks even when shaping merges their source cluster with a base.
+    pub fn glyph_is_mark(&self, gid: u32) -> bool {
+        use skrifa::raw::TableProvider;
+        self.skrifa()
+            .and_then(|f| f.gdef().ok())
+            .and_then(|gdef| gdef.glyph_class_def()?.ok())
+            .is_some_and(|classes| classes.get(GlyphId::new(gid)) == 3)
+    }
+
+    /// Does the font's licence forbid passing it on? OS/2 `fsType` Restricted License embedding
+    /// (bit 1) without a less restrictive bit (Preview & Print, Editable). Fonts without an OS/2
+    /// table aren't restricted.
+    pub fn restricted_licence(&self) -> bool {
+        use skrifa::raw::TableProvider;
+        let fs_type = self.skrifa().and_then(|f| f.os2().ok()).map_or(0, |t| t.fs_type());
+        fs_type & 0x0002 != 0 && fs_type & 0x000C == 0
+    }
+
+    /// Does the font's licence allow embedding bitmaps only? OS/2 `fsType` bit 9: the outlines
+    /// may not be passed on, so the font file can't be packaged whole.
+    pub fn bitmap_only(&self) -> bool {
+        use skrifa::raw::TableProvider;
+        self.skrifa().and_then(|f| f.os2().ok()).is_some_and(|t| t.fs_type() & 0x0200 != 0)
+    }
+}
+
+/// One face found in a font file: index, family, style and (variable fonts) the named instance's
+/// axis settings.
+pub(super) type Found = (u32, String, String, Vec<([u8; 4], f32)>);
+
+/// Parse every face in `data` (a font file or collection); a variable font yields one face per
+/// named instance (InDesign lists them as styles).
+pub(super) fn enumerate_faces(data: &[u8]) -> Vec<Found> {
+    /// A collection's count is input: what a damaged one can make the loop try.
+    const MAX_FACES: u32 = 1024;
+    let count = match FileRef::new(data) {
+        Ok(FileRef::Font(_)) => 1,
+        Ok(FileRef::Collection(c)) => c.len().min(MAX_FACES),
+        Err(_) => 0,
+    };
+    let mut out = Vec::new();
+    for i in 0..count {
+        let Ok(f) = skrifa::FontRef::from_index(data, i) else { continue };
+        let Some((family, style)) = face_names(&f) else { continue };
+        let axes = f.axes();
+        let mut named = Vec::new();
+        for ni in f.named_instances().iter() {
+            let Some(style) = name(&f, &[ni.subfamily_name_id()]) else { continue };
+            if named.iter().any(|(_, s, _): &(u32, String, _)| s.eq_ignore_ascii_case(&style)) {
+                continue;
+            }
+            let coords: Vec<([u8; 4], f32)> = axes.iter().zip(ni.user_coords()).map(|(a, v)| (a.tag().to_be_bytes(), v)).collect();
+            named.push((i, style, coords));
+        }
+        if named.is_empty() {
+            out.push((i, family, style, Vec::new()));
+        } else {
+            out.extend(named.into_iter().map(|(i, s, c)| (i, family.clone(), s, c)));
+        }
+    }
+    out
+}
+
+/// The compiled-in Source Sans 3 Regular, for a database that somehow has no faces at all.
+pub(crate) fn last_resort_face() -> Arc<FontFace> {
+    static FACE: std::sync::OnceLock<Arc<FontFace>> = std::sync::OnceLock::new();
+    FACE.get_or_init(|| {
+        // The font is compiled in (`include_bytes!`), so parsing it can't depend on input; the
+        // `last_resort_face_parses` test proves it on every run.
+        #[allow(clippy::expect_used)]
+        let face = make_face(FontBytes::Static(BUNDLED[0]), FontSource::Bundled, 0, FALLBACK_FAMILY.into(), "Regular".into(), Vec::new())
+            .expect("the compiled-in Source Sans 3 Regular parses");
+        Arc::new(face)
+    })
+    .clone()
+}
+
+pub(super) fn make_face(
+    bytes: FontBytes,
+    source: FontSource,
+    index: u32,
+    family: String,
+    style: String,
+    coords: Vec<([u8; 4], f32)>,
+) -> Option<FontFace> {
+    let data: &[u8] = match &bytes {
+        FontBytes::Static(b) => b,
+        FontBytes::Owned(v) => v.as_slice(),
+    };
+    let f = skrifa::FontRef::from_index(data, index).ok()?;
+    let settings: Vec<(skrifa::Tag, f32)> = coords.iter().map(|(t, v)| (skrifa::Tag::new(t), *v)).collect();
+    let location = if coords.is_empty() { Location::default() } else { f.axes().location(settings.iter().copied()) };
+    let m = f.metrics(Size::unscaled(), &location);
+    let upem = m.units_per_em.max(1) as f64;
+    let a = f.attributes();
+    let wws = wws_names(&f, &family, &style);
+    let hb = harfrust::FontRef::from_index(data, index).ok()?;
+    let shaper = harfrust::ShaperData::new(&hb);
+    let instance = (!coords.is_empty())
+        .then(|| harfrust::ShaperInstance::from_variations(&hb, settings.iter().map(|(t, v)| harfrust::Variation { tag: *t, value: *v })));
+    let axis = |tag: &[u8; 4]| coords.iter().find(|(t, _)| t == tag).map(|(_, v)| *v);
+    let weight = axis(b"wght").unwrap_or(if coords.is_empty() { a.weight.value() } else { style_weight(&style) });
+    let italic = axis(b"ital")
+        .map(|v| v >= 0.5)
+        .or(axis(b"slnt").map(|v| v.abs() > 0.1))
+        .unwrap_or(!matches!(a.style, skrifa::attribute::Style::Normal) || style_italic(&style));
+    let family_aliases = aliases(&f, &[StringId::TYPOGRAPHIC_FAMILY_NAME, StringId::FAMILY_NAME]);
+    let style_aliases = aliases(&f, &[StringId::TYPOGRAPHIC_SUBFAMILY_NAME, StringId::SUBFAMILY_NAME]);
+    Some(FontFace {
+        id: NEXT_ID.fetch_add(1, Ordering::Relaxed),
+        family,
+        style,
+        wws,
+        weight,
+        italic,
+        upem,
+        ascent: m.ascent as f64,
+        typo_ascent: typo_ascent(&f, &location, upem).unwrap_or(m.ascent as f64),
+        descent: -(m.descent as f64),
+        // Fonts with an OS/2 table older than version 2 don't declare these: measure them from
+        // flat-topped letters before falling back to a share of the ascent, which can be far off
+        // (drop caps are sized from the cap height).
+        cap_height: plausible(m.cap_height.map(f64::from), upem)
+            .or_else(|| measured_top(&f, (&location).into(), &['H', 'I', 'E', 'T'], upem))
+            .unwrap_or(m.ascent as f64 * 0.72),
+        x_height: plausible(m.x_height.map(f64::from), upem)
+            .or_else(|| measured_top(&f, (&location).into(), &['x', 'z', 'v'], upem))
+            .unwrap_or(m.ascent as f64 * 0.5),
+        shaper,
+        coords,
+        location,
+        instance,
+        source,
+        bytes,
+        index,
+        bmp: std::sync::OnceLock::new(),
+        em: std::sync::OnceLock::new(),
+        family_aliases,
+        style_aliases,
+        icf: std::sync::OnceLock::new(),
+        group: std::sync::OnceLock::new(),
+        kind: std::sync::OnceLock::new(),
+        postscript: std::sync::OnceLock::new(),
+    })
+}
+
+/// A font's height above the baseline (font units) if it is plausible: above 0 and at most 4 em.
+pub(crate) fn plausible(v: Option<f64>, upem: f64) -> Option<f64> {
+    v.filter(|v| *v > 0.0 && *v <= 4.0 * upem)
+}
+
+/// The top of the first of `chars` the font has a non-empty outline for, in font units: the
+/// highest point of its unhinted outline at `location`, if [`plausible`]. For flat-topped letters
+/// that is the cap height (`H`) or x-height (`x`).
+pub(crate) fn measured_top(f: &skrifa::FontRef<'_>, location: LocationRef<'_>, chars: &[char], upem: f64) -> Option<f64> {
+    struct Top(f32);
+    impl OutlinePen for Top {
+        fn move_to(&mut self, _x: f32, y: f32) {
+            self.0 = self.0.max(y);
+        }
+        fn line_to(&mut self, _x: f32, y: f32) {
+            self.0 = self.0.max(y);
+        }
+        fn quad_to(&mut self, _cx: f32, _cy: f32, _x: f32, y: f32) {
+            self.0 = self.0.max(y);
+        }
+        fn curve_to(&mut self, _cx0: f32, _cy0: f32, _cx1: f32, _cy1: f32, _x: f32, y: f32) {
+            self.0 = self.0.max(y);
+        }
+        fn close(&mut self) {}
+    }
+    let cmap = f.charmap();
+    let glyphs = f.outline_glyphs();
+    chars.iter().find_map(|&c| {
+        let g = glyphs.get(cmap.map(c)?)?;
+        let mut pen = Top(f32::NEG_INFINITY);
+        g.draw(DrawSettings::unhinted(Size::unscaled(), location), &mut pen).ok()?;
+        plausible(Some(f64::from(pen.0)), upem)
+    })
+}
+
+/// The OS/2 typographic ascender in font units at `location`, if the font has an OS/2 table and
+/// the value is [`plausible`].
+fn typo_ascent(f: &skrifa::FontRef<'_>, location: &Location, upem: f64) -> Option<f64> {
+    use skrifa::raw::TableProvider;
+    let mut v = f.os2().ok()?.s_typo_ascender() as f64;
+    if !location.coords().is_empty()
+        && let Ok(mvar) = f.mvar()
+    {
+        v += mvar.metric_delta(skrifa::raw::tables::mvar::tags::HASC, location.coords()).map_or(0.0, |d| d.to_f64());
+    }
+    plausible(Some(v), upem)
+}
+
+#[cfg(test)]
+mod tests_heights {
+    use super::*;
+    use crate::testing::{font_mapping, with_table_u16};
+
+    fn face_of(bytes: Vec<u8>) -> FontFace {
+        make_face(FontBytes::Owned(Arc::new(bytes)), FontSource::Memory, 0, "Test".into(), "Regular".into(), Vec::new()).unwrap()
+    }
+
+    /// `font` with OS/2 sxHeight and sCapHeight set to 0 (undeclared).
+    fn undeclared(font: Vec<u8>) -> Vec<u8> {
+        with_table_u16(with_table_u16(font, b"OS/2", 86, 0).unwrap(), b"OS/2", 88, 0).unwrap()
+    }
+
+    /// The top of Source Sans 3's glyph for `c` from its bounding box (font units).
+    fn bbox_top(c: char) -> f64 {
+        let f = skrifa::FontRef::new(BUNDLED[0]).unwrap();
+        f.glyph_metrics(Size::unscaled(), LocationRef::default()).bounds(f.charmap().map(c).unwrap()).unwrap().y_max as f64
+    }
+
+    /// A font that doesn't declare its cap height and x-height gets them measured from its
+    /// flat-topped letters, also when it lacks the first choices `H` and `x`; a font that
+    /// declares them keeps them.
+    #[test]
+    fn undeclared_heights_are_measured_from_outlines() {
+        let glyphs = [('H', 'H'), ('x', 'x'), ('E', 'E'), ('z', 'z')];
+        for (glyphs, cap, x) in [(&glyphs[..], 'H', 'x'), (&glyphs[2..], 'E', 'z')] {
+            let face = face_of(undeclared(font_mapping("Heights", glyphs).unwrap()));
+            let (cap, x) = (bbox_top(cap), bbox_top(x));
+            assert!(cap > x && x > 0.0);
+            assert!((face.cap_height - cap).abs() <= 1.0, "{glyphs:?}: cap height {} vs {cap}", face.cap_height);
+            assert!((face.x_height - x).abs() <= 1.0, "{glyphs:?}: x-height {} vs {x}", face.x_height);
+        }
+        let declared = face_of(font_mapping("Heights", &glyphs).unwrap());
+        assert_eq!((declared.cap_height, declared.x_height), (660.0, 486.0), "Source Sans 3 Regular's OS/2 values");
+        // Declared values win over the outlines: `H` drawn as `x` doesn't lower the cap height.
+        let face = face_of(font_mapping("Heights", &[('H', 'x'), ('x', 'H')]).unwrap());
+        assert_eq!((face.cap_height, face.x_height), (declared.cap_height, declared.x_height));
+    }
+
+    /// Without any of the letters, or with only empty outlines, the heights fall back to a share
+    /// of the ascent.
+    #[test]
+    fn heights_without_measurable_letters_fall_back_to_the_ascent() {
+        for glyphs in [&[('a', 'a')][..], &[('H', ' '), ('x', ' ')]] {
+            let face = face_of(undeclared(font_mapping("Heights", glyphs).unwrap()));
+            assert_eq!((face.cap_height, face.x_height), (face.ascent * 0.72, face.ascent * 0.5), "{glyphs:?}");
+        }
+    }
+}
diff --git a/crates/fonts/src/fontdb/fallback.rs b/crates/fonts/src/fontdb/fallback.rs
new file mode 100644
index 000000000..7e29fa4b3
--- /dev/null
+++ b/crates/fonts/src/fontdb/fallback.rs
@@ -0,0 +1,179 @@
+#[cfg(all(test, target_os = "linux"))]
+use std::sync::Arc;
+
+#[cfg(not(target_arch = "wasm32"))]
+#[derive(Default)]
+pub(super) struct SysFallback {
+    pub(super) enabled: bool,
+    /// Rescan generation: an older in-flight lookup must not restore a cleared miss.
+    pub(super) generation: u64,
+    pub(super) misses: std::collections::HashSet<char>,
+    /// CJK chain families already looked up in the catalog (loaded, or not installed).
+    pub(super) chain_tried: std::collections::HashSet<&'static str>,
+}
+
+#[cfg(all(test, target_os = "linux"))]
+pub(super) struct FallbackSnapshotHook {
+    pub(super) reached: std::sync::mpsc::SyncSender<()>,
+    pub(super) resume: Arc<std::sync::Barrier>,
+}
+
+/// Families tried (when installed) for characters the loaded fonts lack: CJK, symbols, emoji.
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) const SYSTEM_FALLBACKS: &[&str] = &[
+    "Helvetica Neue",
+    "Arial",
+    "Segoe UI",
+    "Noto Sans",
+    "DejaVu Sans",
+    "PingFang SC",
+    "Hiragino Sans",
+    "Hiragino Kaku Gothic ProN",
+    "Apple SD Gothic Neo",
+    "Heiti SC",
+    "STHeiti",
+    "Microsoft YaHei",
+    "Yu Gothic",
+    "Malgun Gothic",
+    "Noto Sans CJK SC",
+    "Noto Sans CJK JP",
+    "Arial Unicode MS",
+    "Apple Symbols",
+    "Segoe UI Symbol",
+    "Noto Sans Symbols",
+    "Noto Sans Symbols2",
+    "Noto Emoji",
+    "Segoe UI Emoji",
+    "Apple Color Emoji",
+    "Noto Color Emoji",
+];
+
+/// CJK fallback chains: the families tried first (user-added, else installed) for characters of
+/// each language that the primary font lacks. Each lists macOS, then Windows, then Linux /
+/// cross-platform families, serif first; a platform only has its own installed. Japanese tries
+/// the craft-fonts Japanese faces before these ([`japanese_chain`]).
+const JAPANESE_FALLBACKS: &[&str] = &[
+    "Hiragino Mincho ProN",
+    "YuMincho",
+    "Hiragino Sans",
+    "Yu Mincho",
+    "MS Mincho",
+    "Yu Gothic",
+    "Noto Serif CJK JP",
+    "Source Han Serif JP",
+    "Noto Serif JP",
+    "Noto Sans CJK JP",
+    "Source Han Sans JP",
+];
+
+const SIMPLIFIED_CHINESE_FALLBACKS: &[&str] = &[
+    "Songti SC",
+    "STSong",
+    "PingFang SC",
+    "SimSun",
+    "Microsoft YaHei",
+    "Noto Serif CJK SC",
+    "Source Han Serif SC",
+    "Noto Serif SC",
+    "Noto Sans CJK SC",
+    "Source Han Sans SC",
+];
+
+const TRADITIONAL_CHINESE_FALLBACKS: &[&str] = &[
+    "Songti TC",
+    "PingFang TC",
+    "PMingLiU",
+    "MingLiU",
+    "Microsoft JhengHei",
+    "Noto Serif CJK TC",
+    "Source Han Serif TC",
+    "Noto Serif TC",
+    "Noto Sans CJK TC",
+    "Source Han Sans TC",
+];
+
+const KOREAN_FALLBACKS: &[&str] = &[
+    "AppleMyungjo",
+    "Apple SD Gothic Neo",
+    "Batang",
+    "Malgun Gothic",
+    "Noto Serif CJK KR",
+    "Source Han Serif K",
+    "Noto Serif KR",
+    "Noto Sans CJK KR",
+    "Source Han Sans K",
+];
+
+/// Fonts made for Malayalam (macOS, Windows, Noto, Linux). A font that only maps the characters
+/// (Arial Unicode MS, first by path on macOS) sets them without conjuncts or vowel signs.
+const MALAYALAM_FALLBACKS: &[&str] = &[
+    "Malayalam Sangam MN",
+    "Malayalam MN",
+    "Nirmala UI",
+    "Kartika",
+    "Noto Sans Malayalam",
+    "Noto Serif Malayalam",
+    "Manjari",
+    "Rachana",
+    "Meera",
+    "Lohit Malayalam",
+];
+
+/// The fallback chain of a script that only fonts made for it set well, whatever the language.
+pub(super) fn script_chain(c: char) -> Option<&'static [&'static str]> {
+    match c as u32 {
+        0x0D00..=0x0D7F => Some(MALAYALAM_FALLBACKS),
+        _ => None,
+    }
+}
+
+/// The Japanese fallback chain: the craft-fonts Japanese faces' families in document order
+/// (Mincho first; none without craft-fonts), then [`JAPANESE_FALLBACKS`].
+fn japanese_chain() -> &'static [&'static str] {
+    static CHAIN: std::sync::OnceLock<Vec<&str>> = std::sync::OnceLock::new();
+    CHAIN.get_or_init(|| {
+        let mut chain: Vec<&'static str> = Vec::new();
+        for f in crate::japanese_document_fonts() {
+            if !chain.contains(&f.family) {
+                chain.push(f.family);
+            }
+        }
+        chain.extend_from_slice(JAPANESE_FALLBACKS);
+        chain
+    })
+}
+
+/// The CJK fallback chain for `c` in `language` (a BCP 47 tag). The script decides where it is
+/// unambiguous (Hangul is Korean, kana Japanese, Bopomofo Traditional Chinese); ideographs and CJK
+/// punctuation follow the language, and have no chain without a CJK one.
+pub(super) fn cjk_chain(c: char, language: Option<&str>) -> Option<&'static [&'static str]> {
+    match c as u32 {
+        0x1100..=0x11FF | 0x3130..=0x318F | 0xA960..=0xA97F | 0xAC00..=0xD7FF | 0xFFA0..=0xFFDC => return Some(KOREAN_FALLBACKS),
+        0x3040..=0x30FF | 0x31F0..=0x31FF | 0xFF66..=0xFF9F | 0x1B000..=0x1B16F => return Some(japanese_chain()),
+        0x3100..=0x312F | 0x31A0..=0x31BF => return Some(TRADITIONAL_CHINESE_FALLBACKS),
+        // Radicals, CJK symbols and punctuation, kanbun, strokes, enclosed and compatibility
+        // characters, ideographs, compatibility and vertical forms, full-width forms.
+        0x2E80..=0x2FDF
+        | 0x3000..=0x303F
+        | 0x3190..=0x319F
+        | 0x31C0..=0x31EF
+        | 0x3200..=0x33FF
+        | 0x3400..=0x4DBF
+        | 0x4E00..=0x9FFF
+        | 0xF900..=0xFAFF
+        | 0xFE10..=0xFE1F
+        | 0xFE30..=0xFE4F
+        | 0xFF00..=0xFFEF
+        | 0x20000..=0x3FFFF => {}
+        _ => return None,
+    }
+    // The language decides, whatever the region (`ja-JP`, `ko-KR`).
+    let language = language?;
+    match language.split('-').next()? {
+        "ja" => Some(japanese_chain()),
+        "ko" => Some(KOREAN_FALLBACKS),
+        "zh" if language.starts_with("zh-Hant") => Some(TRADITIONAL_CHINESE_FALLBACKS),
+        "zh" => Some(SIMPLIFIED_CHINESE_FALLBACKS),
+        _ => None,
+    }
+}
diff --git a/crates/fonts/src/fontdb/names.rs b/crates/fonts/src/fontdb/names.rs
new file mode 100644
index 000000000..af5f14cc3
--- /dev/null
+++ b/crates/fonts/src/fontdb/names.rs
@@ -0,0 +1,118 @@
+use super::face::FontFace;
+#[cfg(not(target_arch = "wasm32"))]
+use super::system::CatalogEntry;
+use super::{Arc, MetadataProvider, StringId};
+
+pub(super) fn aliases(font: &skrifa::FontRef<'_>, ids: &[StringId]) -> Vec<String> {
+    let mut names: Vec<String> =
+        ids.iter().flat_map(|id| font.localized_strings(*id)).take(256).map(|name| name.to_string()).filter(|name| !name.trim().is_empty()).collect();
+    names.sort();
+    names.dedup();
+    names
+}
+
+pub(super) fn name(font: &skrifa::FontRef<'_>, ids: &[StringId]) -> Option<String> {
+    ids.iter().find_map(|id| font.localized_strings(*id).english_or_first().map(|s| s.to_string()).filter(|s| !s.is_empty()))
+}
+
+/// A face's family and style names (the default instance's style for a variable font).
+/// Is a face of `family` and `style` among `faces`?
+pub(super) fn has_face(faces: &[Arc<FontFace>], family: &str, style: &str) -> bool {
+    faces.iter().any(|f| f.family.eq_ignore_ascii_case(family) && f.style.eq_ignore_ascii_case(style))
+}
+
+/// A face's WWS family and style names (name IDs 21 and 22), if it has a WWS family and it differs
+/// from `family`/`style`.
+pub(super) fn wws_names(f: &skrifa::FontRef<'_>, family: &str, style: &str) -> Option<(String, String)> {
+    let wf = name(f, &[StringId::WWS_FAMILY_NAME])?;
+    let ws = name(f, &[StringId::WWS_SUBFAMILY_NAME]).unwrap_or_else(|| "Regular".into());
+    (!wf.eq_ignore_ascii_case(family) || !ws.eq_ignore_ascii_case(style)).then_some((wf, ws))
+}
+
+/// The family and style a face is known by: its typographic names, or its WWS names (if it has
+/// them) when `by_wws`.
+pub(super) fn known_as<'a>(family: &'a str, style: &'a str, wws: Option<&'a (String, String)>, by_wws: bool) -> Option<(&'a str, &'a str)> {
+    if by_wws { wws.map(|w| (w.0.as_str(), w.1.as_str())) } else { Some((family, style)) }
+}
+
+/// Is `family` the WWS family name of `f`?
+pub(super) fn has_wws_family(f: &FontFace, family: &str) -> bool {
+    f.wws.as_ref().is_some_and(|w| w.0.eq_ignore_ascii_case(family))
+}
+
+/// Is `family` the typographic or the WWS family name of `c`?
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) fn in_catalog_family(c: &CatalogEntry, family: &str) -> bool {
+    c.family.eq_ignore_ascii_case(family) || c.wws.as_ref().is_some_and(|w| w.0.eq_ignore_ascii_case(family))
+}
+
+pub(super) fn face_names(f: &skrifa::FontRef<'_>) -> Option<(String, String)> {
+    let family = name(f, &[StringId::TYPOGRAPHIC_FAMILY_NAME, StringId::FAMILY_NAME])?;
+    let style = name(f, &[StringId::TYPOGRAPHIC_SUBFAMILY_NAME, StringId::SUBFAMILY_NAME]).unwrap_or_else(|| "Regular".into());
+    Some((family, style))
+}
+
+/// `family` without what layout apps add to a family name, if it has any: InDesign's `$ID/`
+/// prefix (`$ID/Arial` → `Arial`) and the font-format suffix appended when a family is installed
+/// in several formats (`Minion Pro (OTF)` → `Minion Pro`).
+fn plain_family(family: &str) -> Option<&str> {
+    let unprefixed = family.trim_start().strip_prefix("$ID/").map(str::trim).filter(|f| !f.is_empty());
+    without_format_suffix(unprefixed.unwrap_or(family)).or(unprefixed)
+}
+
+/// `family` without the font-format suffix layout apps append when a family is installed in
+/// several formats (`Minion Pro (OTF)` → `Minion Pro`), if it has one.
+fn without_format_suffix(family: &str) -> Option<&str> {
+    const FORMATS: [&str; 5] = ["OTF", "TT", "TTF", "TTC", "T1"];
+    let (base, suffix) = family.trim_end().strip_suffix(')')?.rsplit_once('(')?;
+    let base = base.trim_end();
+    (!base.is_empty() && FORMATS.iter().any(|f| f.eq_ignore_ascii_case(suffix.trim()))).then_some(base)
+}
+
+/// The names `family` is looked up under when no font has it as written: without surrounding
+/// spaces, then without an `$ID/` prefix or a format suffix (see [`plain_family`]).
+pub(super) fn alternate_names(family: &str) -> impl Iterator<Item = &str> {
+    let trimmed = family.trim();
+    (trimmed != family && !trimmed.is_empty()).then_some(trimmed).into_iter().chain(plain_family(trimmed))
+}
+
+/// The named style part of a style with axis settings (`Bold {wght:650}` → `Bold`).
+pub fn base_style(style: &str) -> &str {
+    style.split('{').next().unwrap_or(style).trim()
+}
+
+/// Do two style names name the same face? Spacing, punctuation and case don't count, as when a face
+/// is looked up (InDesign documents can carry `Regular ` with a trailing space).
+pub fn same_style(a: &str, b: &str) -> bool {
+    norm(a) == norm(b)
+}
+
+pub(super) fn norm(s: &str) -> String {
+    s.chars().filter(|c| c.is_alphanumeric()).flat_map(char::to_lowercase).collect()
+}
+
+/// Weight implied by a style name.
+pub(super) fn style_weight(style: &str) -> f32 {
+    let s = norm(style);
+    const TABLE: &[(&str, f32)] = &[
+        ("extralight", 200.0),
+        ("ultralight", 200.0),
+        ("semibold", 600.0),
+        ("demibold", 600.0),
+        ("extrabold", 800.0),
+        ("ultrabold", 800.0),
+        ("hairline", 100.0),
+        ("thin", 100.0),
+        ("light", 300.0),
+        ("medium", 500.0),
+        ("bold", 700.0),
+        ("black", 900.0),
+        ("heavy", 900.0),
+    ];
+    TABLE.iter().find(|(k, _)| s.contains(k)).map(|(_, w)| *w).unwrap_or(400.0)
+}
+
+pub(super) fn style_italic(style: &str) -> bool {
+    let s = norm(style);
+    s.contains("italic") || s.contains("oblique") || s == "it"
+}
diff --git a/crates/fonts/src/fontdb/outline.rs b/crates/fonts/src/fontdb/outline.rs
new file mode 100644
index 000000000..30e328be4
--- /dev/null
+++ b/crates/fonts/src/fontdb/outline.rs
@@ -0,0 +1,62 @@
+use super::face::FontFace;
+use super::{BezPath, DrawSettings, GlyphId, MetadataProvider, Size};
+
+/// Does the face's "l" (else "I") have serifs: much wider at its foot than mid-stem? `None` when
+/// it has neither letter.
+pub(super) fn has_serifs(face: &FontFace) -> Option<bool> {
+    let gid = ['l', 'I'].into_iter().map(|c| face.glyph_for(c)).find(|g| *g != 0)?;
+    let path = font_outline(face, gid);
+    let bbox = kurbo::Shape::bounding_box(&path);
+    // An empty or degenerate outline (NaN included) says nothing.
+    if bbox.height().is_nan() || bbox.height() <= 1.0 {
+        return None;
+    }
+    let mut edges = Vec::new();
+    let mut last = None;
+    let mut start = None;
+    kurbo::flatten(&path, 1.0, |el| match el {
+        kurbo::PathEl::MoveTo(p) => {
+            last = Some(p);
+            start = Some(p);
+        }
+        kurbo::PathEl::LineTo(p) => {
+            if let Some(a) = last {
+                edges.push((a, p));
+            }
+            last = Some(p);
+        }
+        kurbo::PathEl::ClosePath => {
+            if let (Some(a), Some(b)) = (last, start) {
+                edges.push((a, b));
+            }
+            last = start;
+        }
+        _ => {}
+    });
+    // The outline is y-down: the foot is near bbox.y1 (the baseline).
+    let width_at = |y: f64| {
+        let xs: Vec<f64> = edges
+            .iter()
+            .filter(|(a, b)| (a.y <= y && y < b.y) || (b.y <= y && y < a.y))
+            .map(|(a, b)| a.x + (y - a.y) * (b.x - a.x) / (b.y - a.y))
+            .collect();
+        let (lo, hi) = xs.iter().fold((f64::MAX, f64::MIN), |(lo, hi), x| (lo.min(*x), hi.max(*x)));
+        (hi > lo).then_some(hi - lo)
+    };
+    let foot = width_at(bbox.y1 - bbox.height() * 0.02)?;
+    let stem = width_at(bbox.y0 + bbox.height() * 0.5)?;
+    Some(foot > stem * 1.6)
+}
+
+/// Glyph `gid`'s outline as the font draws it, in font units, y-down (flipped).
+pub(super) fn font_outline(face: &FontFace, gid: u32) -> BezPath {
+    let mut pen = FlipPen(BezPath::new());
+    if let Some(f) = face.skrifa()
+        && let Some(g) = f.outline_glyphs().get(GlyphId::new(gid))
+    {
+        let _ = g.draw(DrawSettings::unhinted(Size::unscaled(), face.location()), &mut pen);
+    }
+    pen.0
+}
+
+pub(super) struct FlipPen(pub(super) BezPath);
diff --git a/crates/fonts/src/fontdb/scoped.rs b/crates/fonts/src/fontdb/scoped.rs
new file mode 100644
index 000000000..01259841e
--- /dev/null
+++ b/crates/fonts/src/fontdb/scoped.rs
@@ -0,0 +1,555 @@
+#[cfg(test)]
+use super::face::{BUNDLED, FontSource, enumerate_faces};
+use super::face::{FALLBACK_FAMILY, FontFace, last_resort_face, make_face};
+use super::fallback::{cjk_chain, script_chain};
+use super::names::{alternate_names, base_style, has_wws_family, known_as, norm, style_italic, style_weight};
+use super::{Arc, BezPath, FamilyInfo, FontDb, MetadataProvider, PoisonError};
+
+/// One document's view of the [`FontDb`] ([`FontDb::scoped`]): the fonts of its `Document Fonts`
+/// folder, then the shared fonts (bundled, installed, added). Other documents' fonts aren't in it.
+#[derive(Clone)]
+pub struct ScopedFonts<'a> {
+    pub(super) db: &'a FontDb,
+    /// The document's own faces, in the folder's file order (none without a scope).
+    pub(super) own: Option<Arc<[Arc<FontFace>]>>,
+}
+
+impl ScopedFonts<'_> {
+    pub(super) fn own(&self) -> &[Arc<FontFace>] {
+        self.own.as_deref().unwrap_or(&[])
+    }
+
+    /// Resolve localized and legacy family names without confusing replacement fonts with
+    /// installed originals. Document-local names take precedence over shared fonts.
+    ///
+    /// In each scope (the document's faces, loaded faces, the catalog) an exact typographic name
+    /// wins, then a WWS family name (an optical-size face's, see `find`), which names its faces as
+    /// it is, then the aliases. An optical-size face's legacy family name (name ID 1) is usually
+    /// its WWS name, so the aliases must not claim it first.
+    pub fn canonical_family(&self, family: &str) -> Option<String> {
+        let is = |name: &str| name.eq_ignore_ascii_case(family);
+        let in_faces = |faces: &[Arc<FontFace>]| -> Option<String> {
+            if let Some(f) = faces.iter().find(|f| is(&f.family)) {
+                return Some(f.family.clone());
+            }
+            if let Some(w) = faces.iter().find_map(|f| f.wws.as_ref().filter(|w| is(&w.0))) {
+                return Some(w.0.clone());
+            }
+            faces.iter().find(|f| f.family_aliases.iter().any(|alias| is(alias))).map(|f| f.family.clone())
+        };
+        if let Some(name) = in_faces(self.own()).or_else(|| in_faces(&self.db.read_faces())) {
+            return Some(name);
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let catalog = self.db.read_catalog();
+            if let Some(c) = catalog.iter().find(|c| is(&c.family)) {
+                return Some(c.family.clone());
+            }
+            if let Some(w) = catalog.iter().find_map(|c| c.wws.as_ref().filter(|w| is(&w.0))) {
+                return Some(w.0.clone());
+            }
+            if let Some(c) = catalog.iter().find(|c| c.aliases.iter().any(|alias| is(alias))) {
+                return Some(c.family.clone());
+            }
+        }
+        None
+    }
+
+    /// Whether the requested style exists, including localized names and axis instances.
+    pub fn has_style(&self, family: &str, style: &str) -> bool {
+        if !self.has_family(family) {
+            return false;
+        }
+        let face = self.face(family, style);
+        norm(&face.style) == norm(style)
+            || (face.coords.is_empty() && face.style_aliases.iter().any(|alias| norm(alias) == norm(style)))
+            // An optical-size face asked for by its WWS names.
+            || face.wws.as_ref().is_some_and(|w| w.0.eq_ignore_ascii_case(family) && norm(&w.1) == norm(style))
+    }
+
+    /// Prefer known metric-compatible substitutes, then an appropriate script family. This
+    /// never changes `has_family`: a usable substitute is still a missing original font.
+    pub fn substitute_family(&self, family: &str) -> String {
+        let lower = family.to_lowercase();
+        let candidates: &[&str] = match lower.as_str() {
+            "calibri" | "calibri light" => &["Carlito", "Liberation Sans"],
+            "cambria" | "cambria math" => &["Caladea", "Liberation Serif"],
+            "arial" | "helvetica" => &["Liberation Sans", "Arial", "Helvetica"],
+            "times new roman" | "times" => &["Liberation Serif", "Times New Roman", "Times"],
+            "courier new" | "courier" => &["Liberation Mono", "Courier New", "Courier"],
+            _ if lower.contains("arabic") || lower.contains("naskh") => &["Amiri", "Noto Naskh Arabic", "Geeza Pro"],
+            _ if family.contains('楷') => &["Kaiti SC", "STKaiti", "KaiTi", "Songti SC"],
+            _ if family.contains("仿宋") => &["STFangsong", "FangSong", "Songti SC"],
+            _ if family.contains('宋') || family.contains("明朝") => &["Songti SC", "Noto Serif CJK SC", "SimSun"],
+            _ if family.contains('黑') || family.contains("雅黑") => &["PingFang SC", "Noto Sans CJK SC", "Microsoft YaHei"],
+            _ if family.chars().any(|c| ('\u{3400}'..='\u{9fff}').contains(&c)) => &["Songti SC", "Noto Serif CJK SC", "PingFang SC"],
+            _ => &[],
+        };
+        candidates.iter().find_map(|name| self.canonical_family(name)).unwrap_or_else(|| FALLBACK_FAMILY.to_string())
+    }
+
+    /// A replacement suggestion must cover the text being replaced, not just its main script.
+    /// Ties retain the preferred substitute; this does not install or redefine any font.
+    pub fn replacement_face(&self, family: &str, style: &str, characters: &[char]) -> Arc<FontFace> {
+        let mut best = self.face(family, style);
+        let coverage = |face: &FontFace| characters.iter().filter(|&&c| c.is_whitespace() || c.is_control() || face.covers(c)).count();
+        let mut score = coverage(&best);
+        let candidates: &[&str] = if characters.iter().any(|c| ('\u{0600}'..='\u{08ff}').contains(c)) {
+            &["Amiri", "Noto Naskh Arabic", "Al Bayan", "Damascus", "Geeza Pro", "Arial"]
+        } else if characters.iter().any(|c| ('\u{3400}'..='\u{9fff}').contains(c)) {
+            &["Songti SC", "Kaiti SC", "Noto Serif CJK SC", "PingFang SC", "Noto Sans CJK SC"]
+        } else {
+            &["Source Serif 4", "Source Sans 3", "Inter"]
+        };
+        for candidate in candidates {
+            if score == characters.len() {
+                break;
+            }
+            if !self.has_family(candidate) {
+                continue;
+            }
+            let face = self.face(candidate, style);
+            let next = coverage(&face);
+            if next > score {
+                best = face;
+                score = next;
+            }
+        }
+        best
+    }
+
+    /// Family names available (the document's, loaded and cataloged system fonts), sorted and
+    /// deduplicated.
+    pub fn families(&self) -> Vec<String> {
+        let mut v: Vec<String> = self.own().iter().chain(self.db.read_faces().iter()).map(|f| f.family.clone()).collect();
+        #[cfg(not(target_arch = "wasm32"))]
+        v.extend(self.db.read_catalog().iter().map(|c| c.family.clone()));
+        v.sort_by_key(|a| a.to_lowercase());
+        v.dedup_by(|a, b| a.eq_ignore_ascii_case(b));
+        v
+    }
+
+    /// The available families as the font menus list them (see [`ScopedFonts::families`]), each
+    /// with its group and native name, unsorted ([`crate::sort_for_menu`] orders them).
+    pub fn family_infos(&self) -> Vec<FamilyInfo> {
+        let mut out: Vec<FamilyInfo> = Vec::new();
+        let mut seen = std::collections::HashSet::new();
+        for f in self.own().iter().chain(self.db.read_faces().iter()) {
+            if seen.insert(f.family.to_lowercase()) {
+                let (group, native) = f.menu_group();
+                out.push(FamilyInfo { family: f.family.clone(), group, native: native.map(str::to_string) });
+            }
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        for c in self.db.read_catalog().iter() {
+            if seen.insert(c.family.to_lowercase()) {
+                out.push(FamilyInfo { family: c.family.clone(), group: c.group, native: c.native.clone() });
+            }
+        }
+        out
+    }
+
+    /// Style names available for `family` (Regular first, then by weight).
+    pub fn styles(&self, family: &str) -> Vec<String> {
+        self.style_traits(family).into_iter().map(|t| t.2).collect()
+    }
+
+    /// Weight and italic of a style of `family`: from the font when it is known, else from the
+    /// style's name.
+    pub fn traits_of(&self, family: &str, style: &str) -> (f32, bool) {
+        let base = base_style(style);
+        self.style_traits(family)
+            .into_iter()
+            .find(|t| t.2.eq_ignore_ascii_case(base))
+            .map_or((style_weight(base), style_italic(base)), |(italic, weight, _)| (weight, italic))
+    }
+
+    /// Style linking: the style of `family` that sets bold (`bold`) and italic (`italic`) as asked
+    /// and keeps the other from `current` (Bold from Italic is Bold Italic). `None` when the
+    /// family has no such style.
+    pub fn linked_style(&self, family: &str, current: &str, bold: Option<bool>, italic: Option<bool>) -> Option<String> {
+        let (weight, cur_italic) = self.traits_of(family, current);
+        let want_italic = italic.unwrap_or(cur_italic);
+        let want_weight = match bold {
+            Some(true) => 700.0,
+            Some(false) => 400.0,
+            None => weight,
+        };
+        // Width words (Condensed, Extended…) of the current style are kept when the family allows.
+        const WIDTHS: &[&str] = &["condensed", "compressed", "narrow", "extended", "expanded", "wide"];
+        let widths = |s: &str| {
+            let n = norm(s);
+            WIDTHS.iter().filter(|w| n.contains(*w)).count()
+        };
+        let cur_widths = widths(current);
+        self.style_traits(family)
+            .into_iter()
+            .filter(|(i, w, _)| *i == want_italic && bold.is_none_or(|b| b == (*w >= 600.0)))
+            .min_by(|a, b| {
+                let key = |t: &(bool, f32, String)| ((t.1 - want_weight).abs(), usize::from(widths(&t.2) != cur_widths), t.2.len());
+                let (ka, kb) = (key(a), key(b));
+                ka.0.total_cmp(&kb.0).then(ka.1.cmp(&kb.1)).then(ka.2.cmp(&kb.2))
+            })
+            .map(|t| t.2)
+    }
+
+    /// `(italic, weight, name)` of each style of `family` (the document's, loaded, or installed),
+    /// Regular first, then by weight.
+    fn style_traits(&self, family: &str) -> Vec<(bool, f32, String)> {
+        let v = self.exact_style_traits(family);
+        if !v.is_empty() {
+            return v;
+        }
+        alternate_names(family).map(|f| self.exact_style_traits(f)).find(|v| !v.is_empty()).unwrap_or_default()
+    }
+
+    fn exact_style_traits(&self, family: &str) -> Vec<(bool, f32, String)> {
+        let canonical = self.canonical_family(family);
+        let family = canonical.as_deref().unwrap_or(family);
+        let v = self.named_style_traits(family, false);
+        // No face of that typographic family: the family may be a WWS name (see `find`).
+        if v.is_empty() { self.named_style_traits(family, true) } else { v }
+    }
+
+    /// [`ScopedFonts::exact_style_traits`] by the faces' typographic names, or by their WWS names
+    /// when `by_wws`.
+    fn named_style_traits(&self, family: &str, by_wws: bool) -> Vec<(bool, f32, String)> {
+        let mut v: Vec<(bool, f32, String)> = self
+            .own()
+            .iter()
+            .chain(self.db.read_faces().iter())
+            .filter(|f| !f.style.contains('{'))
+            .filter_map(|f| known_as(&f.family, &f.style, f.wws.as_ref(), by_wws).map(|n| (f, n)))
+            .filter(|(_, (fam, _))| fam.eq_ignore_ascii_case(family))
+            .map(|(f, (_, style))| (f.italic, f.weight, style.to_string()))
+            .collect();
+        #[cfg(not(target_arch = "wasm32"))]
+        for c in self.db.read_catalog().iter() {
+            if let Some((fam, style)) = known_as(&c.family, &c.style, c.wws.as_ref(), by_wws)
+                && fam.eq_ignore_ascii_case(family)
+                && !v.iter().any(|(_, _, s)| s.eq_ignore_ascii_case(style))
+            {
+                v.push((style_italic(style), style_weight(style), style.to_string()));
+            }
+        }
+        v.sort_by(|a, b| a.0.cmp(&b.0).then(a.1.total_cmp(&b.1)).then(a.2.cmp(&b.2)));
+        v.dedup_by(|a, b| a.2 == b.2);
+        v
+    }
+
+    /// Resolve a family + style to a face, falling back to the closest style of the family, then to
+    /// Source Sans 3 Regular. Installed system fonts are found by name whatever ran before. A
+    /// family that isn't found as written is looked up without surrounding spaces, then without
+    /// InDesign's `$ID/` prefix or a format suffix (`Minion Pro (OTF)` → `Minion Pro`).
+    pub fn face(&self, family: &str, style: &str) -> Arc<FontFace> {
+        let canonical = self
+            .canonical_family(family)
+            .or_else(|| alternate_names(family).find_map(|f| self.canonical_family(f)))
+            .unwrap_or_else(|| self.substitute_family(alternate_names(family).last().unwrap_or(family)));
+        if let Some(f) = self.find_or_load(&canonical, style) {
+            return f;
+        }
+        self.find(FALLBACK_FAMILY, style)
+            .or_else(|| self.find(FALLBACK_FAMILY, "Regular"))
+            .or_else(|| self.db.read_faces().first().cloned())
+            .unwrap_or_else(last_resort_face)
+    }
+
+    fn find_or_load(&self, family: &str, style: &str) -> Option<Arc<FontFace>> {
+        if let Some(f) = self.find(family, style) {
+            return Some(f);
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        if self.db.load_cataloged(family) {
+            return self.find(family, style);
+        }
+        None
+    }
+
+    /// The family and style of the face whose PostScript name is `name`, ignoring case (the
+    /// document's, loaded, or installed on the system, not loading it). SVGs exported from
+    /// Illustrator name fonts this way (`font-family="'MyriadPro-Regular'"`).
+    pub fn postscript_face(&self, name: &str) -> Option<(String, String)> {
+        let named = |ps: Option<&str>| ps.is_some_and(|ps| ps.eq_ignore_ascii_case(name));
+        if let Some(f) = self.own().iter().chain(self.db.read_faces().iter()).find(|f| named(f.postscript_name())) {
+            return Some((f.family.clone(), f.style.clone()));
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        if let Some(c) = self.db.read_catalog().iter().find(|c| named(c.postscript.as_deref())) {
+            return Some((c.family.clone(), c.style.clone()));
+        }
+        None
+    }
+
+    /// Is `family` available (the document's, loaded, or installed on the system), as named or
+    /// under an alternate name (see [`ScopedFonts::face`])?
+    pub fn has_family(&self, family: &str) -> bool {
+        self.canonical_family(family).is_some() || alternate_names(family).any(|f| self.canonical_family(f).is_some())
+    }
+
+    /// A variable font's axes: (tag, name, min, default, max), empty for static fonts.
+    pub fn axes(&self, family: &str, style: &str) -> Vec<(String, String, f32, f32, f32)> {
+        let face = self.face(family, base_style(style));
+        let Some(f) = face.skrifa() else { return vec![] };
+        f.axes()
+            .iter()
+            .map(|a| {
+                let tag = String::from_utf8_lossy(&a.tag().to_be_bytes()).to_string();
+                let name = f.localized_strings(a.name_id()).english_or_first().map(|s| s.to_string()).unwrap_or_else(|| tag.clone());
+                (tag, name, a.min_value(), a.default_value(), a.max_value())
+            })
+            .collect()
+    }
+
+    /// Glyph outline in font units, y-down (flipped), cached per (face, glyph); see
+    /// [`FontDb::outline`].
+    pub fn outline(&self, face: &FontFace, gid: u32) -> Arc<BezPath> {
+        self.db.outline(face, gid)
+    }
+
+    /// See [`FontDb::missing_box`].
+    pub fn missing_box(&self, face: &FontFace) -> Option<BezPath> {
+        self.db.missing_box(face)
+    }
+
+    /// `Style {wght:650,wdth:90}`: the named style's font at those axis values, made on first use.
+    fn instance(&self, family: &str, style: &str) -> Option<Arc<FontFace>> {
+        let open = style.find('{')?;
+        let base = self.find(family, style[..open].trim())?;
+        if base.skrifa().is_none_or(|f| f.axes().is_empty()) {
+            return Some(base);
+        }
+        let key = (base.id, style.to_string());
+        if let Some(f) = self.db.instances.read().unwrap_or_else(PoisonError::into_inner).get(&key) {
+            return Some(f.clone());
+        }
+        let mut coords = base.coords.clone();
+        for kv in style[open + 1..].trim_end_matches('}').split(',') {
+            let (k, v) = kv.split_once(':')?;
+            let k = k.trim().as_bytes();
+            let v: f32 = v.trim().parse().ok()?;
+            if k.len() != 4 {
+                return None;
+            }
+            let tag = [k[0], k[1], k[2], k[3]];
+            match coords.iter_mut().find(|(t, _)| *t == tag) {
+                Some(c) => c.1 = v,
+                None => coords.push((tag, v)),
+            }
+        }
+        let f = make_face(base.bytes.clone(), base.source.clone(), base.index, base.family.clone(), style.to_string(), coords)?;
+        Some(self.db.instances.write().unwrap_or_else(PoisonError::into_inner).entry(key).or_insert_with(|| Arc::new(f)).clone())
+    }
+
+    pub(super) fn find(&self, family: &str, style: &str) -> Option<Arc<FontFace>> {
+        if style.contains('{') {
+            return self.instance(family, style);
+        }
+        let faces = self.db.read_faces();
+        // The document's fonts first: they stand in for other fonts of the same name.
+        let named = |f: &&Arc<FontFace>| f.family.eq_ignore_ascii_case(family);
+        let own: Vec<&Arc<FontFace>> = self.own().iter().filter(named).collect();
+        let mut cands: Vec<&Arc<FontFace>> = if own.is_empty() { faces.iter().filter(named).collect() } else { own };
+        // No face of that typographic family: the family may be a WWS name, whose faces carry
+        // their WWS style names.
+        let by_wws = cands.is_empty();
+        if by_wws {
+            let aliased = |f: &&Arc<FontFace>| has_wws_family(f, family);
+            let own: Vec<&Arc<FontFace>> = self.own().iter().filter(aliased).collect();
+            cands = if own.is_empty() { faces.iter().filter(aliased).collect() } else { own };
+        }
+        if cands.is_empty() {
+            return None;
+        }
+        let style_of = |f: &FontFace| -> String { norm(f.wws.as_ref().filter(|_| by_wws).map_or(&f.style, |w| &w.1)) };
+        let ns = norm(style);
+        // A face's own style name first: another face's legacy subfamily ("Black" faces named
+        // "Regular" in their RIBBI family) or localized name must not shadow it.
+        if let Some(f) = cands
+            .iter()
+            .find(|f| style_of(f) == ns)
+            .or_else(|| cands.iter().find(|f| f.coords.is_empty() && f.style_aliases.iter().any(|alias| norm(alias) == ns)))
+        {
+            return Some((*f).clone());
+        }
+        let (tw, ti) = (style_weight(style), style_italic(style));
+        cands
+            .iter()
+            .min_by(|a, b| {
+                let sa = (a.weight - tw).abs() + if a.italic != ti { 1000.0 } else { 0.0 };
+                let sb = (b.weight - tw).abs() + if b.italic != ti { 1000.0 } else { 0.0 };
+                sa.total_cmp(&sb)
+            })
+            .map(|f| (*f).clone())
+    }
+
+    /// A face other than `exclude` that covers `c` in `language` (a BCP 47 tag, `None` when
+    /// unknown). CJK characters try their language's chain first (see [`cjk_chain`]), Malayalam
+    /// the fonts made for it (see [`script_chain`]); then the first face (fallback family first,
+    /// then load order, the document's fonts last) that covers `c`. On native, system fonts are
+    /// cataloged and loaded lazily the first time no loaded face covers a character.
+    pub fn fallback_for(&self, c: char, exclude: u32, language: Option<&str>) -> Option<Arc<FontFace>> {
+        if let Some(chain) = cjk_chain(c, language).or_else(|| script_chain(c))
+            && let Some(f) = chain.iter().find_map(|family| self.chain_face(family, c, exclude))
+        {
+            return Some(f);
+        }
+        if let Some(f) = self.loaded_fallback(c, exclude) {
+            return Some(f);
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        if self.db.system_fallback(c) {
+            return self.loaded_fallback(c, exclude);
+        }
+        None
+    }
+
+    /// The face of `family` (the document's first, regular first) that covers `c`, loading the
+    /// installed family the first time a chain asks for it (native, while the system fallback is
+    /// on).
+    fn chain_face(&self, family: &'static str, c: char, exclude: u32) -> Option<Arc<FontFace>> {
+        #[cfg(not(target_arch = "wasm32"))]
+        if !self.db.is_loaded(family) {
+            // Held while loading, so a parallel lookup waits for the font instead of passing it by.
+            let mut sys = self.db.sys.lock().unwrap_or_else(PoisonError::into_inner);
+            if sys.enabled && sys.chain_tried.insert(family) {
+                self.db.load_cataloged(family);
+            }
+        }
+        let faces = self.db.read_faces();
+        let mut order: Vec<&Arc<FontFace>> =
+            self.own().iter().chain(faces.iter()).filter(|f| f.id != exclude && f.family.eq_ignore_ascii_case(family)).collect();
+        order.sort_by_key(|f| (f.italic, (f.weight - 400.0).abs() as i32));
+        order.into_iter().find(|f| f.covers(c)).cloned()
+    }
+
+    fn loaded_fallback(&self, c: char, exclude: u32) -> Option<Arc<FontFace>> {
+        let faces = self.db.read_faces();
+        let mut order: Vec<&Arc<FontFace>> = faces.iter().chain(self.own().iter()).filter(|f| f.id != exclude).collect();
+        order.sort_by_key(|f| (!f.family.eq_ignore_ascii_case(FALLBACK_FAMILY), f.italic, (f.weight - 400.0).abs() as i32));
+        order.into_iter().find(|f| f.covers(c)).cloned()
+    }
+}
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+mod native_gui_document_fonts_tests {
+    use super::*;
+
+    /// The production font scope contains the canonical bundled and Japanese faces in their existing order, including bundled Hebrew/Devanagari faces, without system or injected fonts.
+    #[test]
+    fn native_gui_canonical_document_faces_load_without_system_or_added_fonts() {
+        if crate::CRAFT_FONTS.is_empty() {
+            assert!(std::env::var_os("CRAFT_FONTS_REQUIRED").is_none(), "required canonical fonts were not embedded");
+            return; // Optional-input builds retain their supported Latin-only database.
+        }
+        let db = FontDb::with_font_dirs(Vec::new());
+        db.set_system_fallback(false);
+        let scope = db.scoped(0);
+        let japanese = crate::japanese_document_fonts();
+        assert_existing_document_faces_keep_order(&db, &japanese);
+        assert_primary_bundled_faces(&db);
+        assert_japanese_fonts_keep_priority(&japanese);
+        let latin = db.face(crate::DEFAULT_FAMILY, "Regular");
+        assert_japanese_fallback_priority(&db, latin.id());
+        let admitted = assert_canonical_script_fonts(&db, &scope, latin.id());
+        let loaded = loaded_faces(&db);
+        let previous_len = canonical_bundled_faces(&japanese).len();
+        assert_eq!(&loaded[previous_len..], admitted.as_slice(), "only the two deliberate Regular tuples follow the existing document faces");
+        assert!(!scope.has_family("Unavailable Native GUI Family"));
+        assert_eq!(scope.face("Unavailable Native GUI Family", "Regular").family, FALLBACK_FAMILY);
+    }
+
+    fn canonical_bundled_faces(japanese: &[&crate::CraftFont]) -> Vec<(String, String)> {
+        BUNDLED
+            .iter()
+            .copied()
+            .chain(japanese.iter().map(|font| font.bytes))
+            .flat_map(enumerate_faces)
+            .map(|(_, family, style, _)| (family, style))
+            .collect()
+    }
+
+    fn loaded_faces(db: &FontDb) -> Vec<(String, String)> {
+        db.read_faces().iter().map(|face| (face.family.clone(), face.style.clone())).collect()
+    }
+
+    fn assert_existing_document_faces_keep_order(db: &FontDb, japanese: &[&crate::CraftFont]) {
+        let expected = canonical_bundled_faces(japanese);
+        let loaded = loaded_faces(db);
+        assert!(loaded.len() >= expected.len(), "existing bundled/Japanese faces disappeared");
+        assert_eq!(&loaded[..expected.len()], expected.as_slice(), "preserve all Latin and Japanese face ordering");
+    }
+
+    fn assert_primary_bundled_faces(db: &FontDb) {
+        for family in ["Source Sans 3", "Source Serif 4", "Inter", "JetBrains Mono"] {
+            let face = db.face(family, "Regular");
+            assert_eq!((face.family.as_str(), face.style.as_str(), &face.source), (family, "Regular", &FontSource::Bundled));
+        }
+    }
+
+    fn assert_japanese_fonts_keep_priority(japanese: &[&crate::CraftFont]) {
+        assert!(!japanese.is_empty(), "the required central manifest includes the existing Japanese faces");
+        assert!(japanese[0].family.contains("Mincho"));
+        assert_eq!(crate::japanese_ui_fonts(false)[0].family, "BIZ UDPGothic");
+        assert_eq!(crate::japanese_ui_fonts(true)[0].style, "Bold");
+    }
+
+    fn assert_japanese_fallback_priority(db: &FontDb, latin_face_id: u32) {
+        for language in [Some("ja"), None] {
+            assert!(
+                db.fallback_for('語', latin_face_id, language).is_some_and(|face| face.family.contains("Mincho")),
+                "Japanese fallback changed: {language:?}"
+            );
+        }
+    }
+
+    fn assert_canonical_script_fonts(db: &FontDb, scope: &ScopedFonts<'_>, latin_face_id: u32) -> Vec<(String, String)> {
+        let mut admitted = Vec::new();
+        for (family, text) in [("Noto Sans Hebrew", "שלום עולם"), ("Noto Sans Devanagari", "नमस्ते दुनिया")] {
+            let embedded: Vec<_> = crate::CRAFT_FONTS.iter().filter(|font| font.family == family && font.style == "Regular").collect();
+            assert_eq!(embedded.len(), 1, "exactly one canonical {family} Regular input");
+            assert_script_face_registered(db, scope, family, embedded[0].bytes);
+            let face = scope.face(family, "Regular");
+            assert_script_glyphs_have_document_fallback(db, latin_face_id, family, text, &face, embedded[0].bytes);
+            admitted.push((family.to_string(), "Regular".to_string()));
+        }
+        admitted
+    }
+
+    fn assert_script_face_registered(db: &FontDb, scope: &ScopedFonts<'_>, family: &str, expected_bytes: &[u8]) {
+        assert!(scope.has_family(family), "production database did not register {family}");
+        assert!(scope.has_style(family, "Regular"), "{family} Regular");
+        assert!(!scope.has_style(family, "Unavailable Native GUI Style"));
+        assert!(db.families().iter().any(|name| name == family), "family catalog omits {family}");
+        assert!(scope.family_infos().iter().any(|info| info.family == family), "menu catalog omits {family}");
+        let face = scope.face(family, "Regular");
+        assert_eq!((face.family.as_str(), face.style.as_str(), &face.source), (family, "Regular", &FontSource::Bundled));
+        assert_eq!(face.data(), expected_bytes, "neither OS discovery nor an injected face may satisfy this contract");
+        let replacement = scope.face(family, "Unavailable Native GUI Style");
+        assert_eq!((replacement.family.as_str(), replacement.style.as_str()), (family, "Regular"), "nearest-style policy stays truthful");
+    }
+
+    fn assert_script_glyphs_have_document_fallback(
+        db: &FontDb,
+        latin_face_id: u32,
+        family: &str,
+        text: &str,
+        face: &FontFace,
+        expected_bytes: &[u8],
+    ) {
+        for character in text.chars().filter(|character| !character.is_whitespace()) {
+            assert_ne!(face.glyph_for(character), 0, "{family} lacks U+{:04X} ({character})", u32::from(character));
+            assert!(
+                db.fallback_for(character, latin_face_id, None).is_some_and(|fallback| {
+                    fallback.family == family
+                        && fallback.style == "Regular"
+                        && fallback.source == FontSource::Bundled
+                        && fallback.data() == expected_bytes
+                        && fallback.glyph_for(character) != 0
+                }),
+                "document fallback must use the canonical {family} Regular face for {character}"
+            );
+        }
+    }
+}
diff --git a/crates/fonts/src/fontdb/system.rs b/crates/fonts/src/fontdb/system.rs
new file mode 100644
index 000000000..2a367b894
--- /dev/null
+++ b/crates/fonts/src/fontdb/system.rs
@@ -0,0 +1,632 @@
+#[cfg(not(target_arch = "wasm32"))]
+use super::db::NEXT_SCOPE;
+use super::face::FontFace;
+#[cfg(not(target_arch = "wasm32"))]
+use super::face::{
+    DocumentFonts, FontBytes, FontSource, MAX_DOCUMENT_FONT_BYTES, MAX_DOCUMENT_FONT_FILES, MAX_DOCUMENT_FONTS_TOTAL, enumerate_faces, make_face,
+};
+#[cfg(not(target_arch = "wasm32"))]
+use super::fallback::SYSTEM_FALLBACKS;
+#[cfg(not(target_arch = "wasm32"))]
+use super::names::{aliases, face_names, in_catalog_family, name, norm, wws_names};
+#[cfg(not(target_arch = "wasm32"))]
+use super::{Arc, FontGroup, MetadataProvider, Ordering, PoisonError, StringId};
+use super::{FontDb, ScopedFonts};
+
+impl FontFace {
+    /// When the font file was added (created, else last modified): the font menus' Show Recently
+    /// Added. `None` for fonts without a file.
+    pub fn added(&self) -> Option<std::time::SystemTime> {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let meta = std::fs::metadata(self.source.path()?).ok()?;
+            meta.created().or_else(|_| meta.modified()).ok()
+        }
+        #[cfg(target_arch = "wasm32")]
+        {
+            None
+        }
+    }
+}
+
+/// A font file's length and modification time.
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) type FileStamp = (u64, Option<std::time::SystemTime>);
+
+#[cfg(not(target_arch = "wasm32"))]
+fn file_stamp(path: &std::path::Path) -> Option<FileStamp> {
+    std::fs::metadata(path).ok().map(|m| (m.len(), m.modified().ok()))
+}
+
+/// What [`FontDb::reload_fonts`] did: the faces cataloged by the rescan, and the installed font
+/// files that changed or were removed since they were read (their faces are read again, from the
+/// new file, the next time they are looked up).
+#[derive(Debug, Default, PartialEq)]
+pub struct ReloadedFonts {
+    pub cataloged: usize,
+    pub changed: Vec<std::path::PathBuf>,
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+#[derive(Clone, Debug)]
+pub(super) struct CatalogEntry {
+    pub(super) family: String,
+    pub(super) style: String,
+    pub(super) wws: Option<(String, String)>,
+    path: std::path::PathBuf,
+    /// The font menu group and native family name, read by the scan.
+    pub(super) group: FontGroup,
+    pub(super) native: Option<String>,
+    pub(super) aliases: Vec<String>,
+    pub(super) postscript: Option<String>,
+}
+
+/// What the scan reads of one face in a font file: its names and font menu group.
+#[cfg(not(target_arch = "wasm32"))]
+#[derive(Clone, Debug, PartialEq)]
+pub(super) struct ScannedFace {
+    pub(super) family: String,
+    pub(super) style: String,
+    wws: Option<(String, String)>,
+    group: FontGroup,
+    native: Option<String>,
+    aliases: Vec<String>,
+    postscript: Option<String>,
+}
+
+/// The tables glyph outlines are drawn from.
+#[cfg(not(target_arch = "wasm32"))]
+const OUTLINE_TABLES: [&[u8; 4]; 4] = [b"glyf", b"CFF ", b"CFF2", b"VARC"];
+
+/// The names and font menu group of every face in the font file at `path`, reading only its table
+/// directories and the tables that name and classify it (`name`, `OS/2`, `meta`; `cmap` only for a
+/// font that declares no language or code page): a scan opens hundreds of font files, many of them
+/// megabytes long. A variable font is cataloged under its default style; its named instances
+/// appear once it loads. Faces without glyph outlines (none of [`OUTLINE_TABLES`]) are left out.
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) fn file_face_names(path: &std::path::Path) -> Vec<ScannedFace> {
+    use std::io::{Read, Seek, SeekFrom};
+    /// Caps on what a (possibly damaged) file can make the scan read.
+    const MAX_FACES: u32 = 256;
+    const MAX_NAME_TABLE: u32 = 1 << 20;
+    const MAX_SMALL_TABLE: u32 = 64 << 10;
+    const MAX_CMAP: u32 = 4 << 20;
+    let Ok(mut file) = std::fs::File::open(path) else { return vec![] };
+    let mut read_at = |offset: u64, len: usize| -> Option<Vec<u8>> {
+        let mut buf = vec![0; len];
+        file.seek(SeekFrom::Start(offset)).ok()?;
+        file.read_exact(&mut buf).ok()?;
+        Some(buf)
+    };
+    let be32 = |b: &[u8], at: usize| b.get(at..at + 4).and_then(|s| s.try_into().ok()).map(u32::from_be_bytes);
+    let Some(head) = read_at(0, 12) else { return vec![] };
+    // A collection lists where each face's table directory starts.
+    let starts: Vec<u32> = if head.starts_with(b"ttcf") {
+        let n = be32(&head, 8).unwrap_or(0).min(MAX_FACES) as usize;
+        read_at(12, n * 4).map(|b| b.as_chunks::<4>().0.iter().map(|c| u32::from_be_bytes(*c)).collect()).unwrap_or_default()
+    } else {
+        vec![0]
+    };
+    starts
+        .into_iter()
+        .filter_map(|start| {
+            let dir = read_at(start.into(), 12)?;
+            let tables = u16::from_be_bytes(dir.get(4..6)?.try_into().ok()?) as usize;
+            let records = read_at(u64::from(start) + 12, tables * 16)?;
+            // Faces drawn from other tables (Apple's `hvgl`, bitmaps) would draw nothing.
+            if !records.as_chunks::<16>().0.iter().any(|r| OUTLINE_TABLES.iter().any(|t| r.starts_with(*t))) {
+                return None;
+            }
+            // Table `tag`, unless missing or over `max` bytes.
+            let mut table = |tag: &[u8; 4], max: u32| -> Option<([u8; 4], Vec<u8>)> {
+                let rec = records.as_chunks::<16>().0.iter().find(|r| r.starts_with(tag))?;
+                let (offset, len) = (be32(rec, 8)?, be32(rec, 12)?);
+                if len > max {
+                    return None;
+                }
+                Some((*tag, read_at(offset.into(), len as usize)?))
+            };
+            // A font holding just these tables, to read them as the font itself would.
+            let mut found = vec![table(b"name", MAX_NAME_TABLE)?];
+            found.extend(table(b"OS/2", MAX_SMALL_TABLE));
+            found.extend(table(b"meta", MAX_SMALL_TABLE));
+            let font = crate::group::sfnt(found.clone())?;
+            let f = skrifa::FontRef::new(&font).ok()?;
+            let (family, style) = face_names(&f)?;
+            let (group, native) = match crate::group::declared_group(&f, &family) {
+                Some(g) => (g, crate::group::classify(&f, &family).1),
+                None => {
+                    found.extend(table(b"cmap", MAX_CMAP));
+                    let font = crate::group::sfnt(found)?;
+                    crate::group::classify(&skrifa::FontRef::new(&font).ok()?, &family)
+                }
+            };
+            let postscript = name(&f, &[StringId::POSTSCRIPT_NAME]);
+            let wws = wws_names(&f, &family, &style);
+            Some(ScannedFace {
+                family,
+                style,
+                wws,
+                group,
+                native,
+                aliases: aliases(&f, &[StringId::TYPOGRAPHIC_FAMILY_NAME, StringId::FAMILY_NAME]),
+                postscript,
+            })
+        })
+        .collect()
+}
+
+/// The platform's font folders (the system's and the user's), scanned by [`FontDb::global`].
+/// Empty on wasm.
+pub fn system_font_dirs() -> Vec<std::path::PathBuf> {
+    let mut dirs: Vec<std::path::PathBuf> = Vec::new();
+    if cfg!(target_arch = "wasm32") {
+        return dirs;
+    }
+    let home = std::env::var_os("HOME").map(std::path::PathBuf::from);
+    if cfg!(target_os = "macos") {
+        dirs.extend(["/System/Library/Fonts", "/Library/Fonts"].map(Into::into));
+        if let Some(h) = &home {
+            dirs.push(h.join("Library/Fonts"));
+        }
+        // Fonts macOS ships as assets (PingFang, Yu Mincho, …): com_apple_MobileAsset_Font<N>.
+        for parent in ["/System/Library/AssetsV2", "/System/Library/AssetsV2/PreinstalledAssetsV2/InstallWithOs"] {
+            let Ok(entries) = std::fs::read_dir(parent) else { continue };
+            for e in entries.flatten() {
+                if e.file_name().to_string_lossy().starts_with("com_apple_MobileAsset_Font") {
+                    dirs.push(e.path());
+                }
+            }
+        }
+        // Microsoft Office bundles its fonts (Calibri, Cambria, …) inside each app; read them in
+        // place from the first installed one (they share the same set).
+        let office = ["Microsoft Word", "Microsoft Excel", "Microsoft PowerPoint", "Microsoft Outlook"]
+            .iter()
+            .map(|app| std::path::PathBuf::from(format!("/Applications/{app}.app/Contents/Resources/DFonts")))
+            .find(|p| p.is_dir());
+        dirs.extend(office);
+    } else if cfg!(windows) {
+        let root = std::env::var_os("WINDIR").map(std::path::PathBuf::from).unwrap_or_else(|| "C:\\Windows".into());
+        dirs.push(root.join("Fonts"));
+        if let Some(l) = std::env::var_os("LOCALAPPDATA") {
+            dirs.push(std::path::PathBuf::from(l).join("Microsoft\\Windows\\Fonts"));
+        }
+    } else {
+        let xdg_data_home = std::env::var_os("XDG_DATA_HOME").map(std::path::PathBuf::from);
+        dirs.extend(unix_font_dirs(home.as_deref(), xdg_data_home.as_deref()));
+    }
+    dirs
+}
+
+pub(super) fn unix_font_dirs(home: Option<&std::path::Path>, xdg_data_home: Option<&std::path::Path>) -> Vec<std::path::PathBuf> {
+    let mut dirs: Vec<std::path::PathBuf> = ["/usr/share/fonts", "/usr/local/share/fonts"].map(Into::into).into();
+    if let Some(home) = home {
+        dirs.push(home.join(".fonts"));
+    }
+    let data_home =
+        xdg_data_home.filter(|path| path.is_absolute()).map(std::path::Path::to_path_buf).or_else(|| home.map(|path| path.join(".local/share")));
+    dirs.extend(data_home.map(|path| path.join("fonts")));
+    dirs
+}
+
+#[cfg(not(target_os = "macos"))]
+pub(super) fn platform_font_files() -> Vec<std::path::PathBuf> {
+    Vec::new()
+}
+
+/// The files in `listed` that aren't in `scanned` (canonical paths), each once and added to
+/// `scanned`; paths that don't lead to a file (gone, unreadable folder) are left out.
+#[cfg(not(target_arch = "wasm32"))]
+fn unscanned_font_files(listed: Vec<std::path::PathBuf>, scanned: &mut std::collections::HashSet<std::path::PathBuf>) -> Vec<std::path::PathBuf> {
+    listed
+        .into_iter()
+        .filter(|p| {
+            let Ok(canonical) = std::fs::canonicalize(p) else { return false };
+            canonical.is_file() && scanned.insert(canonical)
+        })
+        .collect()
+}
+
+impl FontDb {
+    /// Catalog the installed fonts unless that has been done: the first caller scans the font
+    /// folders, any other waits for that scan to finish.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(super) fn ensure_catalog(&self) {
+        self.cataloged.get_or_init(|| {
+            self.scan_font_dirs();
+        });
+    }
+
+    /// Whether the installed fonts are cataloged: a lookup by family name won't wait for the
+    /// scan (always true on wasm, which has none). See [`FontDb::scan_in_background`].
+    pub fn system_fonts_cataloged(&self) -> bool {
+        #[cfg(target_arch = "wasm32")]
+        return true;
+        #[cfg(not(target_arch = "wasm32"))]
+        self.cataloged.get().is_some()
+    }
+
+    /// Catalog the installed fonts on a background thread, so the first lookup by family name
+    /// (opening a file, the font menus) doesn't wait for the scan. A no-op once they are
+    /// cataloged, and on wasm.
+    pub fn scan_in_background(&'static self) {
+        #[cfg(not(target_arch = "wasm32"))]
+        if self.cataloged.get().is_none() {
+            // A failed spawn leaves the scan to the first lookup that needs it.
+            let _ = std::thread::Builder::new().name("font-scan".into()).spawn(move || self.ensure_catalog());
+        }
+    }
+
+    /// Scan the font folders again (fonts installed or removed since), cataloging the faces
+    /// found (native only). Font data is loaded when a cataloged family is first resolved.
+    /// Returns the number of faces cataloged.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn load_system_fonts(&self) -> usize {
+        // The first scan, or a rescan once it is done (never both at once).
+        let mut first = None;
+        self.cataloged.get_or_init(|| first = Some(self.scan_font_dirs()));
+        let count = first.unwrap_or_else(|| self.scan_font_dirs());
+        // Retry characters and CJK chain families that newly installed fonts can now cover.
+        // Reset outside scan_font_dirs: a chain lookup can hold sys during the initial scan.
+        let mut sys = self.sys.lock().unwrap_or_else(PoisonError::into_inner);
+        sys.generation = sys.generation.wrapping_add(1);
+        sys.misses.clear();
+        sys.chain_tried.clear();
+        count
+    }
+
+    /// Fonts installed, changed or removed since they were read (#328): scan the font folders
+    /// again (see [`FontDb::load_system_fonts`]), then let go of the shared faces whose installed
+    /// file changed (length or modification time) or is gone, so the next lookup reads the file as
+    /// it is now, or finds the font missing. What was composed with the old faces must be composed
+    /// again. Faces are never freed (see [`FaceRef`]): each reload of a changed file keeps the old
+    /// copy. Bundled, added and document fonts are left alone. Nothing to do on wasm.
+    pub fn reload_fonts(&self) -> ReloadedFonts {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            // Rescan first: a lookup after the faces are dropped finds the new files.
+            let cataloged = self.load_system_fonts();
+            let changed: Vec<std::path::PathBuf> = {
+                let mut files = self.installed_files.lock().unwrap_or_else(PoisonError::into_inner);
+                let mut changed: Vec<_> = files.iter().filter(|(p, stamp)| file_stamp(p).as_ref() != Some(*stamp)).map(|(p, _)| p.clone()).collect();
+                changed.sort();
+                for p in &changed {
+                    files.remove(p);
+                }
+                changed
+            };
+            if !changed.is_empty() {
+                let stale = |f: &FontFace| matches!(&f.source, FontSource::Installed(p) if changed.contains(p));
+                let mut dropped = std::collections::HashSet::new();
+                self.faces.write().unwrap_or_else(PoisonError::into_inner).retain(|f| {
+                    let keep = !stale(f);
+                    if !keep {
+                        dropped.insert(f.id);
+                    }
+                    keep
+                });
+                self.instances.write().unwrap_or_else(PoisonError::into_inner).retain(|(base, _), f| !dropped.contains(base) && !stale(f));
+                self.outlines.lock().unwrap_or_else(PoisonError::into_inner).retain(|(face, _), _| !dropped.contains(face));
+                log::debug!("reloading {} changed font files ({} faces)", changed.len(), dropped.len());
+            }
+            ReloadedFonts { cataloged, changed }
+        }
+        #[cfg(target_arch = "wasm32")]
+        ReloadedFonts::default()
+    }
+
+    /// Read an installed font file, noting its length and modification time as they were before
+    /// the read (a change during it is then found by the next reload).
+    #[cfg(not(target_arch = "wasm32"))]
+    fn read_installed(&self, path: &std::path::Path) -> Option<Vec<u8>> {
+        let stamp = file_stamp(path)?;
+        let data = std::fs::read(path).ok()?;
+        self.installed_files.lock().unwrap_or_else(PoisonError::into_inner).insert(path.to_path_buf(), stamp);
+        Some(data)
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    fn scan_font_dirs(&self) -> usize {
+        let mut found = Vec::new();
+        let mut stack = self.font_dirs.clone();
+        // Each folder once, however links lead back to it.
+        let mut visited = std::collections::HashSet::new();
+        // The font files read, by canonical path, so the platform's list adds only the others.
+        let mut scanned = std::collections::HashSet::new();
+        while let Some(d) = stack.pop() {
+            if !visited.insert(std::fs::canonicalize(&d).unwrap_or_else(|_| d.clone())) {
+                continue;
+            }
+            let Ok(rd) = std::fs::read_dir(&d) else { continue };
+            for e in rd.flatten() {
+                let p = e.path();
+                if p.is_dir() {
+                    stack.push(p);
+                    continue;
+                }
+                let ext = p.extension().and_then(std::ffi::OsStr::to_str).map(str::to_ascii_lowercase);
+                if !matches!(ext.as_deref(), Some("ttf" | "otf" | "ttc" | "otc")) {
+                    continue;
+                }
+                scanned.insert(std::fs::canonicalize(&p).unwrap_or_else(|_| p.clone()));
+                for f in file_face_names(&p) {
+                    found.push(CatalogEntry {
+                        family: f.family,
+                        style: f.style,
+                        wws: f.wws,
+                        path: p.clone(),
+                        group: f.group,
+                        native: f.native,
+                        aliases: f.aliases,
+                        postscript: f.postscript,
+                    });
+                }
+            }
+        }
+        // Font services name their files as they like (no extension, say): the face names read
+        // decide what is a font.
+        for p in unscanned_font_files((self.font_files)(), &mut scanned) {
+            for f in file_face_names(&p) {
+                found.push(CatalogEntry {
+                    family: f.family,
+                    style: f.style,
+                    wws: f.wws,
+                    path: p.clone(),
+                    group: f.group,
+                    native: f.native,
+                    aliases: f.aliases,
+                    postscript: f.postscript,
+                });
+            }
+        }
+        let n = found.len();
+        log::debug!("cataloged {n} system font faces");
+        *self.catalog.write().unwrap_or_else(PoisonError::into_inner) = found;
+        n
+    }
+
+    /// Load the files of the installed `family`. Returns whether any face was added.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(super) fn load_cataloged(&self, family: &str) -> bool {
+        let paths: Vec<std::path::PathBuf> = {
+            let cat = self.read_catalog();
+            let mut p: Vec<_> = cat.iter().filter(|c| in_catalog_family(c, family)).map(|c| c.path.clone()).collect();
+            p.sort();
+            p.dedup();
+            p
+        };
+        // The whole family arrives at once (see `insert_faces`).
+        let mut faces = Vec::new();
+        for p in paths {
+            if let Some(data) = self.read_installed(&p) {
+                faces.extend(self.new_faces(data, FontSource::Installed(p)));
+            }
+        }
+        self.insert_faces(faces) > 0
+    }
+
+    /// Load the font files (.ttf, .otf, .ttc, .otc; not in subfolders) of a document's `Document
+    /// Fonts` folder under a new scope, for that document alone: looked up through
+    /// [`FontDb::scoped`], they come before the shared faces of the same family and style, until
+    /// [`FontDb::close_scope`]. A file loaded before and unchanged since (same length and
+    /// modification time) isn't read again: its faces are shared. The files are untrusted: past
+    /// [`MAX_DOCUMENT_FONT_FILES`] (in name order), files over [`MAX_DOCUMENT_FONT_BYTES`] or past
+    /// [`MAX_DOCUMENT_FONTS_TOTAL`] in all, and files that aren't fonts are skipped with a note. A
+    /// missing folder loads nothing (scope 0).
+    ///
+    /// The folder is named by a document, so this crate does not trust it: `allow` (`Ok`, or why a
+    /// path may not be read) is asked about
+    /// the folder and about every font file in it before either is opened, and a path it refuses
+    /// is skipped with its message (the engine passes its automation-root check; a host with no
+    /// roots passes `&|_| Ok(())`).
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn load_document_fonts(&self, folder: &std::path::Path, allow: &dyn Fn(&std::path::Path) -> Result<(), String>) -> DocumentFonts {
+        let mut out = DocumentFonts::default();
+        if let Err(why) = allow(folder) {
+            out.skipped.push(why);
+            return out;
+        }
+        let Ok(entries) = std::fs::read_dir(folder) else { return out };
+        let mut files: Vec<std::path::PathBuf> = Vec::new();
+        for path in entries.flatten().map(|e| e.path()) {
+            let ext = path.extension().and_then(std::ffi::OsStr::to_str).map(str::to_ascii_lowercase);
+            if !matches!(ext.as_deref(), Some("ttf" | "otf" | "ttc" | "otc")) {
+                continue;
+            }
+            // Each file is vetted before it is touched at all, a link out of the folder included.
+            match allow(&path) {
+                Ok(()) if path.is_file() => files.push(path),
+                Ok(()) => {}
+                Err(why) => out.skipped.push(why),
+            }
+        }
+        files.sort();
+        let mut total = 0u64;
+        let mut own: Vec<Arc<FontFace>> = Vec::new();
+        for (n, path) in files.iter().enumerate() {
+            if n == MAX_DOCUMENT_FONT_FILES {
+                out.skipped.push(format!("{} more font files not loaded (at most {MAX_DOCUMENT_FONT_FILES} are)", files.len() - n));
+                break;
+            }
+            let name = path.file_name().map_or_else(|| path.display().to_string(), |n| n.to_string_lossy().into_owned());
+            // The listed length skips oversized files unread.
+            let meta = std::fs::metadata(path).ok();
+            let listed = meta.as_ref().map_or(0, std::fs::Metadata::len);
+            let faces = if listed > MAX_DOCUMENT_FONT_BYTES {
+                Err(too_large())
+            } else if total.saturating_add(listed) > MAX_DOCUMENT_FONTS_TOTAL {
+                Err(over_total())
+            } else {
+                let modified = meta.and_then(|m| m.modified().ok());
+                self.document_file(path, listed, modified, MAX_DOCUMENT_FONTS_TOTAL.saturating_sub(total))
+            };
+            match faces {
+                Err(r) => out.skipped.push(format!("{name}: {r}")),
+                Ok((faces, len)) => {
+                    total = total.saturating_add(len);
+                    // A family and style the folder already gave stays with its first file.
+                    for f in faces {
+                        if !own.iter().any(|o| o.family.eq_ignore_ascii_case(&f.family) && o.style.eq_ignore_ascii_case(&f.style)) {
+                            own.push(f);
+                        }
+                    }
+                }
+            }
+        }
+        for s in &out.skipped {
+            log::warn!("{}: {s}", folder.display());
+        }
+        if !own.is_empty() {
+            out.scope = NEXT_SCOPE.fetch_add(1, Ordering::Relaxed);
+            out.faces = own.len();
+            self.scopes.write().unwrap_or_else(PoisonError::into_inner).insert(out.scope, own.into());
+        }
+        out
+    }
+
+    /// The faces of the document font file at `path` (`listed` bytes long, modified at
+    /// `modified`): those read before if it hasn't changed since, else read now, within `room`
+    /// bytes of the folder's total → (faces, bytes), or why the file is skipped.
+    #[cfg(not(target_arch = "wasm32"))]
+    fn document_file(
+        &self,
+        path: &std::path::Path,
+        listed: u64,
+        modified: Option<std::time::SystemTime>,
+        room: u64,
+    ) -> Result<(Vec<Arc<FontFace>>, u64), String> {
+        use std::io::Read;
+        if let Some((len, m, faces)) = self.document_files.lock().unwrap_or_else(PoisonError::into_inner).get(path)
+            && (*len, *m) == (listed, modified)
+        {
+            return Ok((faces.clone(), listed));
+        }
+        // One byte past the limit catches a file that grew since it was listed.
+        let mut data = Vec::new();
+        std::fs::File::open(path)
+            .and_then(|f| f.take(MAX_DOCUMENT_FONT_BYTES + 1).read_to_end(&mut data))
+            .map_err(|e| format!("can't be read ({e})"))?;
+        let len = data.len() as u64;
+        if len > MAX_DOCUMENT_FONT_BYTES {
+            return Err(too_large());
+        }
+        if listed.max(len) > room {
+            return Err(over_total());
+        }
+        let data = Arc::new(data);
+        let faces: Vec<Arc<FontFace>> = enumerate_faces(&data)
+            .into_iter()
+            .filter_map(|(i, family, style, coords)| {
+                make_face(FontBytes::Owned(data.clone()), FontSource::Document(path.to_path_buf()), i, family, style, coords)
+            })
+            .map(Arc::new)
+            .collect();
+        if faces.is_empty() {
+            return Err("not a font DesignCraft can read".into());
+        }
+        self.document_files.lock().unwrap_or_else(PoisonError::into_inner).insert(path.to_path_buf(), (listed, modified, faces.clone()));
+        Ok((faces, len))
+    }
+
+    /// Load a system font covering `c` (preferred fallback families first, then any cataloged
+    /// file under 40 MB). Returns true if one was loaded. Misses are remembered.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(super) fn system_fallback(&self, c: char) -> bool {
+        if c.is_control() || c.is_whitespace() {
+            return false;
+        }
+        let generation = {
+            let sys = self.sys.lock().unwrap_or_else(PoisonError::into_inner);
+            if !sys.enabled || sys.misses.contains(&c) {
+                return false;
+            }
+            sys.generation
+        };
+        let covered = |db: &FontDb| db.read_faces().iter().any(|f| f.covers(c));
+        let cataloged: Vec<String> = self.read_catalog().iter().map(|e| e.family.clone()).collect();
+        for fam in SYSTEM_FALLBACKS {
+            if !self.is_loaded(fam) && cataloged.iter().any(|f| f.eq_ignore_ascii_case(fam)) {
+                self.load_cataloged(fam);
+                if covered(self) {
+                    return true;
+                }
+            }
+        }
+        let mut paths: Vec<std::path::PathBuf> = self.catalog.read().unwrap_or_else(PoisonError::into_inner).iter().map(|e| e.path.clone()).collect();
+        paths.sort();
+        paths.dedup();
+        #[cfg(all(test, target_os = "linux"))]
+        {
+            let hook = self.fallback_snapshot_hook.lock().unwrap_or_else(PoisonError::into_inner).take();
+            if let Some(hook) = hook {
+                let _ = hook.reached.send(());
+                hook.resume.wait();
+            }
+        }
+        for p in paths {
+            if std::fs::metadata(&p).map(|m| m.len() > 40 << 20).unwrap_or(true) {
+                continue;
+            }
+            let Some(data) = self.read_installed(&p) else { continue };
+            let hit =
+                enumerate_faces(&data).iter().any(|(i, _, _, _)| skrifa::FontRef::from_index(&data, *i).is_ok_and(|f| f.charmap().map(c).is_some()));
+            if hit && self.add_faces(data, FontSource::Installed(p)) > 0 && covered(self) {
+                return true;
+            }
+        }
+        let mut sys = self.sys.lock().unwrap_or_else(PoisonError::into_inner);
+        if sys.generation == generation {
+            sys.misses.insert(c);
+        }
+        false
+    }
+}
+
+impl ScopedFonts<'_> {
+    /// `family`'s kind (format, class, PANOSE) and when its file was added, read from its Regular
+    /// face (else its first), for the font menus' filters, which look at every family. A face
+    /// already loaded is asked; an installed family that isn't loaded is read from its file, which
+    /// is then let go rather than kept loaded. None for an unknown family or an unreadable file.
+    pub fn family_kind(&self, family: &str) -> Option<(crate::kind::FaceKind, Option<std::time::SystemTime>)> {
+        let styles = self.styles(family);
+        let style = styles.iter().find(|s| *s == "Regular").or(styles.first())?.clone();
+        if self.own().iter().chain(self.db.read_faces().iter()).any(|f| f.family.eq_ignore_ascii_case(family)) {
+            let f = self.find(family, &style)?;
+            return Some((f.kind(), f.added()));
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let path = {
+                let cat = self.db.read_catalog();
+                let of_family = |c: &&CatalogEntry| c.family.eq_ignore_ascii_case(family);
+                let entry = cat.iter().filter(of_family).find(|c| norm(&c.style) == norm(&style)).or_else(|| cat.iter().find(of_family));
+                entry.map(|c| c.path.clone())?
+            };
+            if std::fs::metadata(&path).ok()?.len() > MAX_DOCUMENT_FONT_BYTES {
+                return None;
+            }
+            let data = Arc::new(std::fs::read(&path).ok()?);
+            let found = enumerate_faces(&data);
+            let pick = found
+                .iter()
+                .find(|(_, f, st, _)| f.eq_ignore_ascii_case(family) && norm(st) == norm(&style))
+                .or_else(|| found.iter().find(|(_, f, _, _)| f.eq_ignore_ascii_case(family)))?
+                .clone();
+            let (index, fam, st, coords) = pick;
+            let face = make_face(FontBytes::Owned(data.clone()), FontSource::Installed(path), index, fam, st, coords)?;
+            Some((face.kind(), face.added()))
+        }
+        #[cfg(target_arch = "wasm32")]
+        None
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn too_large() -> String {
+    format!("larger than {} MB", MAX_DOCUMENT_FONT_BYTES >> 20)
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn over_total() -> String {
+    format!("over the {} MB the folder's fonts may take in all", MAX_DOCUMENT_FONTS_TOTAL >> 20)
+}
diff --git a/crates/fonts/src/fontdb/tests.rs b/crates/fonts/src/fontdb/tests.rs
new file mode 100644
index 000000000..6417b340a
--- /dev/null
+++ b/crates/fonts/src/fontdb/tests.rs
@@ -0,0 +1,10 @@
+#[cfg(not(target_arch = "wasm32"))]
+mod sysfonts;
+
+#[cfg(not(target_arch = "wasm32"))]
+mod fallback;
+
+#[cfg(not(target_arch = "wasm32"))]
+mod docfonts;
+
+mod vertical;
diff --git a/crates/fonts/src/tests_docfonts.rs b/crates/fonts/src/fontdb/tests/docfonts.rs
similarity index 98%
rename from crates/fonts/src/tests_docfonts.rs
rename to crates/fonts/src/fontdb/tests/docfonts.rs
index 67b1d8748..0b7886f44 100644
--- a/crates/fonts/src/tests_docfonts.rs
+++ b/crates/fonts/src/fontdb/tests/docfonts.rs
@@ -4,7 +4,7 @@
 
 use std::path::{Path, PathBuf};
 
-use super::*;
+use crate::fontdb::{Arc, DOCUMENT_FONTS_FOLDER, FALLBACK_FAMILY, FontDb, FontSource, MAX_DOCUMENT_FONT_BYTES, MAX_DOCUMENT_FONT_FILES};
 use crate::testing::{font_with, font_with_names, font_with_wws, with_fs_type};
 
 /// An empty temporary folder unique to `name` and this process.
diff --git a/crates/fonts/src/tests_fallback.rs b/crates/fonts/src/fontdb/tests/fallback.rs
similarity index 99%
rename from crates/fonts/src/tests_fallback.rs
rename to crates/fonts/src/fontdb/tests/fallback.rs
index d9e27ac62..19eb30cec 100644
--- a/crates/fonts/src/tests_fallback.rs
+++ b/crates/fonts/src/fontdb/tests/fallback.rs
@@ -1,6 +1,6 @@
 //! CJK fallback follows the character's language (and the script where it is unambiguous).
 
-use super::*;
+use crate::fontdb::FontDb;
 use crate::testing::font_with;
 
 const HAN: char = '直';
diff --git a/crates/fonts/src/tests_sysfonts.rs b/crates/fonts/src/fontdb/tests/sysfonts.rs
similarity index 99%
rename from crates/fonts/src/tests_sysfonts.rs
rename to crates/fonts/src/fontdb/tests/sysfonts.rs
index 39bf0767e..0485ac7aa 100644
--- a/crates/fonts/src/tests_sysfonts.rs
+++ b/crates/fonts/src/fontdb/tests/sysfonts.rs
@@ -2,7 +2,7 @@
 
 use std::path::{Path, PathBuf};
 
-use super::*;
+use crate::fontdb::*;
 
 const FAMILY: &str = "Sysfont Sans3";
 
diff --git a/crates/fonts/src/tests_vertical.rs b/crates/fonts/src/fontdb/tests/vertical.rs
similarity index 98%
rename from crates/fonts/src/tests_vertical.rs
rename to crates/fonts/src/fontdb/tests/vertical.rs
index 3fdf91b3b..59511d73b 100644
--- a/crates/fonts/src/tests_vertical.rs
+++ b/crates/fonts/src/fontdb/tests/vertical.rs
@@ -3,9 +3,10 @@
 //! The synthetic font (Source Sans 3 with `vhea`/`vmtx`, and `VORG` where asked) runs everywhere;
 //! the checks against Shippori Mincho's own tables run when built with craft-fonts.
 
+use skrifa::MetadataProvider;
 use skrifa::raw::TableProvider;
 
-use super::*;
+use crate::fontdb::{Arc, FontBytes, FontDb, FontFace, FontSource, GlyphId, LocationRef, Size, make_face};
 use crate::testing::{font_mapping, font_with, with_base, with_code_pages, with_table_len, with_table_u16, with_vmtx, with_vorg};
 use crate::{ShapeContext, feature, shape_vertical, shape_with_context};
 
diff --git a/crates/format/src/lib.rs b/crates/format/src/lib.rs
index 5e87c5408..1adc43449 100644
--- a/crates/format/src/lib.rs
+++ b/crates/format/src/lib.rs
@@ -22,8 +22,11 @@ use serde_json::{Value, json};
 
 pub const MIME: &str = "application/vnd.designcraft+zip";
 /// Latest reader capability. Version 2 pinned the Keep Lines Together and drop cap defaults;
-/// version 3 adds rendering of retained EPS source assets.
-pub const VERSION: u32 = 3;
+/// version 3 adds rendering of retained EPS source assets; version 4 is one capability covering both
+/// retained placed-graphic layer options and explicit all-on placed-PDF layer choices, so a version 4
+/// reader understands both. Any later capability needs version 5. [`required_version`] is the only
+/// place that picks a version.
+pub const VERSION: u32 = 4;
 
 #[derive(Debug, thiserror::Error)]
 pub enum FormatError {
@@ -67,6 +70,21 @@ pub fn save_with_preview(doc: &Document, preview: Option<&[u8]>) -> Result<Vec<u
 /// 4 GiB written without them; the margin covers deflate output that is larger than its input.
 const LARGE_ENTRY: usize = (u32::MAX as usize).saturating_sub(64 << 20);
 
+/// The oldest reader capability that keeps everything in `doc`. Documents that need nothing newer
+/// keep their older requirement so existing readers still open them.
+fn required_version(doc: &Document) -> u32 {
+    // Version 4 covers both of these: older readers ignore the unknown fields, so they would
+    // silently drop retained graphic layer choices, or read an explicit all-on PDF layer choice
+    // (empty hidden list) as "use the file's defaults". A nonempty hidden list stays readable.
+    if doc.has_graphic_layer_options() || doc.has_explicit_all_on_pdf_layers() {
+        return 4;
+    }
+    // Older readers would silently omit EPS artwork. Preview-only legacy assets and documents
+    // without EPS stay at 2 so their existing readers keep working; writing 1 would make a
+    // reader re-run the version 2 paragraph upgrade over current defaults.
+    if doc.assets.values().any(|a| designcraft_images::is_eps(&a.data)) { 3 } else { 2 }
+}
+
 fn save_with_large_entries_from(doc: &Document, preview: Option<&[u8]>, large_entry: usize) -> Result<Vec<u8>, FormatError> {
     // JSON writes infinity and NaN as null, which no load accepts: the file would not open.
     if let Some(id) = doc.non_finite_item() {
@@ -84,10 +102,7 @@ fn save_with_large_entries_from(doc: &Document, preview: Option<&[u8]>, large_en
         z.start_file("mimetype", stored).map_err(io)?;
         z.write_all(MIME.as_bytes()).map_err(|e| FormatError::Io(e.to_string()))?;
         z.start_file("meta.json", deflate).map_err(io)?;
-        // Older readers would silently omit EPS artwork. Preview-only legacy assets and
-        // documents without EPS stay at 2 so their existing readers keep working; writing 1
-        // would make a reader re-run the version 2 paragraph upgrade over current defaults.
-        let version = if doc.assets.values().any(|a| designcraft_images::is_eps(&a.data)) { VERSION } else { 2 };
+        let version = required_version(doc);
         let meta = json!({"format": "designcraft", "version": version, "generator": concat!("DesignCraft ", env!("CARGO_PKG_VERSION"))});
         z.write_all(meta.to_string().as_bytes()).map_err(|e| FormatError::Io(e.to_string()))?;
         if let Some(png) = preview {
@@ -378,641 +393,4 @@ fn base64_decode(s: &str) -> Vec<u8> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use designcraft_doc::build::NewDocument;
-    use designcraft_doc::geom::Rect;
-    use designcraft_doc::{Asset, ParaFormat, SpreadRef};
-
-    fn png_asset(d: &mut Document, data: &[u8]) -> AssetId {
-        let aid = AssetId(d.alloc());
-        let a = Asset {
-            id: aid,
-            name: "x.png".into(),
-            mime: "image/png".into(),
-            data: Arc::new(data.to_vec()),
-            pixels: Some((1, 1)),
-            ..Default::default()
-        };
-        d.assets.insert(aid, Arc::new(a));
-        aid
-    }
-
-    fn place(d: &mut Document, asset: AssetId, crop: f64) -> designcraft_doc::ItemId {
-        use designcraft_doc::geom::{Affine, shapes};
-        use designcraft_doc::{Content, Graphic, Item, ItemId, Shape};
-        let id = ItemId(d.alloc());
-        let mut it = Item::new(id, d.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 50.0, 50.0)));
-        it.content = Content::Graphic(Graphic {
-            asset,
-            size: (1.0, 1.0),
-            xf: Affine::translate((crop, crop)),
-            clip: None,
-            auto_fit: Default::default(),
-            fit_align: 4,
-            crop: [crop; 4],
-            wrap: Default::default(),
-            fill: Default::default(),
-        });
-        d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
-        id
-    }
-
-    fn asset_entries(bytes: &[u8]) -> usize {
-        let z = zip::ZipArchive::new(Cursor::new(bytes)).unwrap();
-        z.file_names().filter(|n| n.starts_with("assets/")).count()
-    }
-
-    /// Zip `d` the way files were saved with one asset per placement (nothing merged or pruned).
-    fn save_uncompacted(d: &Document) -> Vec<u8> {
-        let mut buf = Cursor::new(Vec::new());
-        let mut z = zip::ZipWriter::new(&mut buf);
-        let opts = zip::write::SimpleFileOptions::default();
-        z.start_file("mimetype", opts).unwrap();
-        z.write_all(MIME.as_bytes()).unwrap();
-        z.start_file("document.json", opts).unwrap();
-        z.write_all(&serde_json::to_vec(d).unwrap()).unwrap();
-        for (id, a) in &d.assets {
-            z.start_file(format!("assets/{}.png", id.0), opts).unwrap();
-            z.write_all(&a.data).unwrap();
-        }
-        z.finish().unwrap();
-        buf.into_inner()
-    }
-
-    #[test]
-    fn eps_source_requires_new_reader_but_preview_documents_keep_the_older_one() {
-        let mut d = Document::new(&NewDocument::default());
-        let version = |d: &Document| {
-            let bytes = save(d).unwrap();
-            let mut z = zip::ZipArchive::new(Cursor::new(bytes)).unwrap();
-            let mut meta = String::new();
-            z.by_name("meta.json").unwrap().read_to_string(&mut meta).unwrap();
-            serde_json::from_str::<Value>(&meta).unwrap()["version"].as_u64().unwrap()
-        };
-        assert_eq!(version(&d), 2);
-        let aid = AssetId(d.alloc());
-        let source = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n%%EOF\n".to_vec();
-        d.assets.insert(
-            aid,
-            Arc::new(Asset {
-                id: aid,
-                name: "logo.eps".into(),
-                mime: "image/png".into(),
-                link: None,
-                data: Arc::new(source.clone()),
-                pixels: Some((40, 20)),
-                page: 0,
-                ..Default::default()
-            }),
-        );
-        place(&mut d, aid, 0.0);
-        assert_eq!(version(&d), 3, "sniff source even when legacy metadata says PNG");
-        assert_eq!(load(&save(&d).unwrap()).unwrap().assets[&aid].data.as_slice(), source);
-        Arc::make_mut(d.assets.get_mut(&aid).unwrap()).data = Arc::new(b"\x89PNG\r\n\x1a\npreview".to_vec());
-        assert_eq!(version(&d), 2, "legacy EPS previews stay compatible");
-    }
-
-    #[test]
-    fn roundtrip_with_assets() {
-        let mut d = Document::new(&NewDocument { pages: 3, ..Default::default() });
-        let lid = d.default_layer();
-        d.add_text_frame(SpreadRef::Doc(0), Rect::new(10.0, 10.0, 200.0, 200.0), lid, "héllo\nworld", ParaFormat::default()).unwrap();
-        let aid = png_asset(&mut d, &[1, 2, 3, 4]);
-        place(&mut d, aid, 0.0);
-        let bytes = save(&d).unwrap();
-        assert!(bytes.starts_with(b"PK"));
-        let back = load(&bytes).unwrap();
-        assert_eq!(back.page_count(), 3);
-        assert_eq!(*back.assets[&aid].data, vec![1, 2, 3, 4]);
-        assert_eq!(back.stories, d.stories);
-    }
-
-    /// `doc` as format 1 wrote it.
-    fn save_v1(doc: &Document) -> Vec<u8> {
-        let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
-        z.start_file("meta.json", zip::write::SimpleFileOptions::default()).unwrap();
-        z.write_all(br#"{"format": "designcraft", "version": 1}"#).unwrap();
-        z.start_file("document.json", zip::write::SimpleFileOptions::default()).unwrap();
-        z.write_all(&serde_json::to_vec(doc).unwrap()).unwrap();
-        z.finish().unwrap().into_inner()
-    }
-
-    fn para_style(name: &str, based_on: Option<&str>, keep_all_lines: Option<bool>) -> designcraft_doc::ParagraphStyle {
-        designcraft_doc::ParagraphStyle {
-            name: name.into(),
-            based_on: based_on.map(str::to_string),
-            next_style: None,
-            para: designcraft_doc::ParaAttrs { keep_lines_together: Some(true), keep_all_lines, ..Default::default() },
-            chars: Default::default(),
-            shortcut: String::new(),
-        }
-    }
-
-    /// Format 1 resolved an unset Keep Lines Together mode as all lines: those documents still
-    /// do after loading, wherever the mode comes from. New documents keep lines at start/end.
-    #[test]
-    fn format_1_keep_lines_without_mode_stays_all_lines() {
-        let mut d = Document::new(&NewDocument::default());
-        let st = d.styles_mut();
-        st.paragraph.push(para_style("Root", None, None));
-        st.paragraph.push(para_style("Child", Some("Root"), None));
-        st.paragraph.push(para_style("Explicit", None, Some(false)));
-        st.paragraph.push(para_style("Under explicit", Some("Explicit"), None));
-        st.paragraph.push(para_style("Loop A", Some("Loop B"), None));
-        st.paragraph.push(para_style("Loop B", Some("Loop A"), None));
-        let lid = d.default_layer();
-        let names = [designcraft_doc::story::BASIC_PARAGRAPH, "Root", "Child", "Explicit", "Under explicit", "Loop A", "Loop B", "Missing"];
-        let text = names.join("\n");
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(10.0, 10.0, 200.0, 200.0), lid, &text, ParaFormat::default()).unwrap();
-        {
-            let s = d.story_mut(sid).unwrap();
-            for (p, name) in s.paras.iter_mut().zip(names) {
-                p.style = name.into();
-                p.para.keep_lines_together = Some(true);
-            }
-            s.insert_note(1, "Note", ParaFormat { style: "Missing".into(), ..Default::default() });
-        }
-        let back = load(&save_v1(&d)).unwrap();
-        let resolve = |f: &ParaFormat| back.styles.resolve_para(f).0;
-        let story = back.story(sid).unwrap();
-        for (p, name) in story.paras.iter().zip(names) {
-            let pp = resolve(p);
-            assert!(pp.keep_lines_together);
-            assert_eq!(pp.keep_all_lines, !name.contains("xplicit"), "{name}");
-        }
-        assert!(resolve(&story.notes[0].text.paras[0]).keep_all_lines, "footnote with a missing style");
-        assert!(back.styles.resolve_para_style("Loop A").0.keep_all_lines && back.styles.resolve_para_style("Loop B").0.keep_all_lines);
-        // Pinned where the chains start; explicit and inheriting styles are left as they were.
-        assert_eq!(back.styles.para("Root").unwrap().para.keep_all_lines, Some(true));
-        assert_eq!(back.styles.para("Child").unwrap().para.keep_all_lines, None);
-        assert_eq!(back.styles.para("Under explicit").unwrap().para.keep_all_lines, None);
-        // The current format keeps the new default: at start/end of paragraph.
-        let now = load(&save(&d).unwrap()).unwrap();
-        let p = &now.story(sid).unwrap().paras[0];
-        assert!(!now.styles.resolve_para(p).0.keep_all_lines);
-        assert!(!designcraft_doc::ParaProps::default().keep_all_lines);
-    }
-
-    /// Format 1 wrote paragraph rules, text frame options and numbered lists in full, so their
-    /// old defaults (black rules, auto-size from the top centre, lists continuing across stories)
-    /// load as saved. New documents take InDesign's.
-    #[test]
-    fn format_1_rules_frames_and_lists_load_as_saved() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let old_rule = designcraft_doc::Rule { on: true, color: designcraft_doc::color::swatch::BLACK.into(), ..Default::default() };
-        let (fid, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(10.0, 10.0, 200.0, 200.0), lid, "Ruled", ParaFormat::default()).unwrap();
-        d.story_mut(sid).unwrap().paras[0].para.rule_above = Some(old_rule.clone());
-        d.item_mut(fid).unwrap().text_frame_mut().unwrap().options.auto_size_ref = 1;
-        d.settings.lists.push(designcraft_doc::NumberedList { name: "Steps".into(), continue_across_stories: true });
-        let back = load(&save_v1(&d)).unwrap();
-        assert_eq!(back.story(sid).unwrap().paras[0].para.rule_above, Some(old_rule));
-        assert_eq!(back.item(fid).unwrap().text_frame().unwrap().options.auto_size_ref, 1);
-        assert!(back.settings.lists[0].continue_across_stories);
-        assert_eq!(designcraft_doc::Rule::default().color, designcraft_doc::TEXT_COLOR);
-        assert_eq!(designcraft_doc::TextFrameOptions::default().auto_size_ref, 4);
-        assert!(!designcraft_doc::NumberedList::default().continue_across_stories);
-    }
-
-    /// Format 1 set drop caps without Align Left Edge: those documents still do where nothing set
-    /// it. New documents align the drop cap's left edge.
-    #[test]
-    fn format_1_drop_caps_stay_unaligned() {
-        let mut d = Document::new(&NewDocument::default());
-        let st = d.styles_mut();
-        st.paragraph.push(para_style("Opener", None, None));
-        st.paragraph.push(designcraft_doc::ParagraphStyle {
-            para: designcraft_doc::ParaAttrs { drop_cap_align_left: Some(true), ..Default::default() },
-            ..para_style("Aligned", None, None)
-        });
-        let lid = d.default_layer();
-        let (_, sid) =
-            d.add_text_frame(SpreadRef::Doc(0), Rect::new(10.0, 10.0, 200.0, 200.0), lid, "One\nTwo\nThree", ParaFormat::default()).unwrap();
-        {
-            let s = d.story_mut(sid).unwrap();
-            for (p, name) in s.paras.iter_mut().zip(["Opener", "Aligned", "Missing"]) {
-                p.style = name.into();
-                p.para.drop_cap_lines = Some(2);
-                p.para.drop_cap_chars = Some(1);
-            }
-        }
-        let back = load(&save_v1(&d)).unwrap();
-        let aligned: Vec<bool> = back.story(sid).unwrap().paras.iter().map(|p| back.styles.resolve_para(p).0.drop_cap_align_left).collect();
-        assert_eq!(aligned, [false, true, false]);
-        let now = load(&save(&d).unwrap()).unwrap();
-        assert!(now.styles.resolve_para(&now.story(sid).unwrap().paras[0]).0.drop_cap_align_left);
-    }
-
-    /// Assets over the zip size limit are written with zip64 sizes (scaled down here: the real
-    /// threshold is near 4 GiB); smaller ones are written exactly as before.
-    #[test]
-    fn large_assets_are_written_with_zip64_sizes_and_open_again() {
-        let mut d = Document::new(&NewDocument::default());
-        let aid = png_asset(&mut d, &[5; 64]);
-        place(&mut d, aid, 0.0);
-        let normal = save(&d).unwrap();
-        assert_eq!(normal, save_with_large_entries_from(&d, None, 65).unwrap(), "an asset under the threshold is unchanged");
-        let large = save_with_large_entries_from(&d, None, 64).unwrap();
-        assert!(large.len() > normal.len(), "the asset entry carries zip64 sizes");
-        assert_eq!(*load(&large).unwrap().assets[&aid].data, vec![5; 64]);
-    }
-
-    #[test]
-    fn saves_hold_each_used_file_once() {
-        let mut d = Document::new(&NewDocument::default());
-        let first = png_asset(&mut d, &[7; 64]);
-        let copy = png_asset(&mut d, &[7; 64]);
-        let replaced = png_asset(&mut d, &[9; 64]);
-        let a = place(&mut d, first, 1.0);
-        let b = place(&mut d, copy, 2.0);
-        assert_eq!(d.assets.len(), 3);
-
-        // Duplicates merge into the first asset, the unreferenced one is left out, and every
-        // placement keeps its own crop and transform.
-        let bytes = save(&d).unwrap();
-        assert_eq!(asset_entries(&bytes), 1);
-        assert_eq!(d.assets.len(), 3, "the open document keeps its assets");
-        let back = load(&bytes).unwrap();
-        assert_eq!(back.assets.keys().copied().collect::<Vec<_>>(), vec![first]);
-        assert!(!back.assets.contains_key(&replaced));
-        for (id, crop) in [(a, 1.0), (b, 2.0)] {
-            let g = back.item(id).and_then(|i| i.graphic()).unwrap();
-            assert_eq!((g.asset, g.crop, g.xf), (first, [crop; 4], d.item(id).unwrap().graphic().unwrap().xf));
-        }
-    }
-
-    #[test]
-    fn files_with_identical_bytes_at_different_paths_keep_their_paths() {
-        let mut d = Document::new(&NewDocument::default());
-        let ids: Vec<AssetId> = (0..3).map(|_| png_asset(&mut d, &[3; 32])).collect();
-        for (id, link) in ids.iter().zip(["/p/a.png", "/q/b.png"]) {
-            if let Some(a) = d.assets.get_mut(id) {
-                Arc::make_mut(a).link = Some(link.into());
-            }
-        }
-        let items: Vec<_> = ids.iter().enumerate().map(|(k, id)| place(&mut d, *id, k as f64)).collect();
-        for bytes in [save(&d).unwrap(), save_uncompacted(&d)] {
-            let back = load(&bytes).unwrap();
-            assert_eq!(back.assets.len(), 3);
-            let links: Vec<Option<&str>> = items
-                .iter()
-                .map(|i| back.item(*i).and_then(|i| i.graphic()).and_then(|g| back.assets.get(&g.asset)).unwrap().link.as_deref())
-                .collect();
-            assert_eq!(links, [Some("/p/a.png"), Some("/q/b.png"), None]);
-        }
-    }
-
-    #[test]
-    fn equal_size_archive_assets_preserve_content_and_share_only_identical_buffers() {
-        let mut d = Document::new(&NewDocument::default());
-        let mut pairs = Vec::new();
-        for n in 0..128u64 {
-            let mut bytes = vec![42; 1024];
-            bytes[1016..].copy_from_slice(&n.to_le_bytes());
-            let a = png_asset(&mut d, &bytes);
-            let b = png_asset(&mut d, &bytes);
-            // Distinct links must remain independently relinkable even when their bytes match.
-            Arc::make_mut(d.assets.get_mut(&a).unwrap()).link = Some(format!("/a/{n}.png"));
-            Arc::make_mut(d.assets.get_mut(&b).unwrap()).link = Some(format!("/b/{n}.png"));
-            place(&mut d, a, 1.0);
-            place(&mut d, b, 2.0);
-            pairs.push((a, b));
-        }
-        let back = load(&save_uncompacted(&d)).unwrap();
-        assert_eq!(back.assets.len(), 256);
-        for (n, (a, b)) in pairs.into_iter().enumerate() {
-            assert_eq!(back.assets[&a].data[1016..], (n as u64).to_le_bytes());
-            assert!(Arc::ptr_eq(&back.assets[&a].data, &back.assets[&b].data));
-            assert_eq!(back.assets[&a].link, d.assets[&a].link);
-            assert_eq!(back.assets[&b].link, d.assets[&b].link);
-        }
-        assert_eq!(back.spreads, d.spreads);
-    }
-
-    #[test]
-    fn older_files_with_one_asset_per_placement_open_with_one() {
-        let mut d = Document::new(&NewDocument::default());
-        let ids: Vec<AssetId> = (0..3).map(|_| png_asset(&mut d, &[5; 32])).collect();
-        for (k, id) in ids.iter().enumerate() {
-            place(&mut d, *id, k as f64);
-        }
-        let back = load(&save_uncompacted(&d)).unwrap();
-        assert_eq!(back.assets.len(), 1);
-        assert_eq!(asset_entries(&save(&back).unwrap()), 1);
-    }
-
-    /// The object of the item `id` in a document's JSON.
-    fn item_json(v: &mut Value, id: u64) -> Option<&mut Value> {
-        if v.get("id").and_then(Value::as_u64) == Some(id) && v.get("content").is_some() {
-            return Some(v);
-        }
-        match v {
-            Value::Object(m) => m.values_mut().find_map(|c| item_json(c, id)),
-            Value::Array(a) => a.iter_mut().find_map(|c| item_json(c, id)),
-            _ => None,
-        }
-    }
-
-    #[test]
-    fn frame_level_vertical_text_opens_as_a_vertical_story() {
-        // Documents that set Vertical on the frame: the story takes its first frame's direction.
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let (a, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(72.0, 72.0, 200.0, 400.0), lid, "縦書き", ParaFormat::default()).unwrap();
-        let (b, _) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(300.0, 72.0, 428.0, 400.0), lid, "", ParaFormat::default()).unwrap();
-        d.thread(a, b).unwrap();
-        let (c, other) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(450.0, 72.0, 550.0, 400.0), lid, "横", ParaFormat::default()).unwrap();
-        let mut v = serde_json::to_value(&d).unwrap();
-        item_json(&mut v, a.0).unwrap()["content"]["options"]["vertical"] = json!(true);
-        item_json(&mut v, c.0).unwrap()["content"]["options"]["vertical"] = json!(false);
-        let json = serde_json::to_vec(&v).unwrap();
-        let mut zipped = Cursor::new(Vec::new());
-        {
-            let mut z = zip::ZipWriter::new(&mut zipped);
-            z.start_file("document.json", zip::write::SimpleFileOptions::default()).unwrap();
-            z.write_all(&json).unwrap();
-            z.finish().unwrap();
-        }
-        for bytes in [json.clone(), zipped.into_inner()] {
-            let back = load(&bytes).unwrap();
-            assert!(back.stories[&sid].vertical);
-            assert!(!back.stories[&other].vertical);
-            // Saved again, the direction is the story's.
-            let again = load(&save(&back).unwrap()).unwrap();
-            assert!(again.stories[&sid].vertical && !again.stories[&other].vertical);
-        }
-    }
-
-    #[test]
-    fn documents_saved_before_glyph_fallback_keep_their_fallback_fonts() {
-        let d = Document::new(&NewDocument::default());
-        assert!(!d.settings.glyph_fallback);
-        assert!(!load(&save(&d).unwrap()).unwrap().settings.glyph_fallback, "saved and read as off");
-        let mut on = d.clone();
-        on.settings.glyph_fallback = true;
-        assert!(load(&save(&on).unwrap()).unwrap().settings.glyph_fallback);
-        // Written before the setting existed: drawn from fallback fonts, as they were.
-        let mut v = serde_json::to_value(&d).unwrap();
-        v["settings"].as_object_mut().unwrap().remove("glyphFallback").unwrap();
-        assert!(load(&serde_json::to_vec(&v).unwrap()).unwrap().settings.glyph_fallback);
-    }
-
-    /// A saved tab list over the limits loads repaired, as an imported one does: a non-finite
-    /// position (saved as `null`) dropped, positions clamped, leaders cut, the count capped.
-    #[test]
-    fn saved_tab_lists_load_sanitized() {
-        use designcraft_doc::{MAX_TAB_LEADER, MAX_TAB_POSITION, MAX_TAB_STOPS, TabAlign, TabStop};
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(72.0, 72.0, 300.0, 300.0), lid, "a\tb", ParaFormat::default()).unwrap();
-        let stop = |position: f64| TabStop { position, align: TabAlign::Right, leader: "0123456789".into(), align_on: String::new() };
-        let mut tabs: Vec<TabStop> = (0..500).rev().map(|i| stop(i as f64 * 40.0)).collect();
-        tabs.push(stop(f64::NAN));
-        d.story_mut(sid).unwrap().paras[0].para.tabs = Some(tabs);
-        let bytes = save(&d).unwrap();
-        let back = load(&bytes).unwrap();
-        let tabs = back.stories[&sid].paras[0].para.tabs.clone().unwrap();
-        assert_eq!(tabs.len(), MAX_TAB_STOPS);
-        assert!(tabs.windows(2).all(|w| w[0].position < w[1].position), "sorted");
-        assert!(tabs.iter().all(|t| t.position.is_finite() && t.position <= MAX_TAB_POSITION && t.leader.chars().count() <= MAX_TAB_LEADER));
-        assert_eq!(tabs.last().map(|t| t.position), Some(3960.0), "the first stops by position");
-    }
-
-    #[test]
-    fn the_preview_is_read_back_without_the_document() {
-        let d = Document::new(&NewDocument::default());
-        let png = b"\x89PNG fake".to_vec();
-        let bytes = save_with_preview(&d, Some(&png)).unwrap();
-        assert_eq!(read_preview(Cursor::new(&bytes)), Some(png));
-        assert!(load(&bytes).is_ok(), "the preview doesn't get in the way of opening");
-        // Files without one, legacy JSON and garbage have none.
-        assert_eq!(read_preview(Cursor::new(save(&d).unwrap())), None);
-        assert_eq!(read_preview(Cursor::new(b"{}".to_vec())), None);
-        assert_eq!(read_preview(Cursor::new(Vec::new())), None);
-    }
-
-    #[test]
-    fn a_preview_that_inflates_past_its_declared_size_is_refused() {
-        use std::io::Write;
-        let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
-        let opts = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
-        z.start_file(PREVIEW, opts).unwrap();
-        z.write_all(&vec![0u8; usize::try_from(MAX_PREVIEW_BYTES).unwrap() + 4096]).unwrap();
-        let mut bytes = z.finish().unwrap().into_inner();
-        // Declare the entry tiny in the local header and the central directory.
-        let patch = |bytes: &mut Vec<u8>, sig: &[u8], at: usize| {
-            let start = bytes.windows(4).position(|w| w == sig).unwrap();
-            bytes[start + at..start + at + 4].copy_from_slice(&16u32.to_le_bytes());
-        };
-        patch(&mut bytes, b"PK\x03\x04", 22);
-        patch(&mut bytes, b"PK\x01\x02", 24);
-        assert_eq!(read_preview(Cursor::new(&bytes)), None);
-    }
-
-    #[test]
-    fn rejects_garbage_and_newer_versions() {
-        assert!(load(b"nope").is_err());
-        for version in [99u64, u64::from(u32::MAX) + 2] {
-            let mut buf = Cursor::new(Vec::new());
-            {
-                let mut z = zip::ZipWriter::new(&mut buf);
-                z.start_file("meta.json", zip::write::SimpleFileOptions::default()).unwrap();
-                z.write_all(json!({"version": version}).to_string().as_bytes()).unwrap();
-                z.finish().unwrap();
-            }
-            assert!(matches!(load(&buf.into_inner()), Err(FormatError::TooNew(v)) if v == version));
-        }
-    }
-
-    fn r7a_nullable_document(local_clear: bool, style_clear: bool) -> Document {
-        use designcraft_doc::{CharAttrs, ParaAttrs};
-        let mut d = Document::new(&NewDocument { pages: 1, ..Default::default() });
-        let base = d.styles.default_paragraph.clone();
-        let chars = CharAttrs {
-            leading_aki: Some(Some(4.0)),
-            trailing_aki: Some(Some(3.0)),
-            underline_weight: Some(Some(2.0)),
-            underline_offset: Some(Some(1.0)),
-            strikethrough_weight: Some(Some(2.0)),
-            strikethrough_offset: Some(Some(1.0)),
-            ..Default::default()
-        };
-        // Legacy JSON loads as format 1, whose upgrade pins Keep Lines Together and Align Left
-        // Edge where a style chain leaves them unset; the base style sets them so both
-        // formats resolve the same.
-        let para = ParaAttrs {
-            start_at: Some(Some(7)),
-            paragraph_kashida_width: Some(Some(0.5)),
-            kinsoku: Some(Some(Default::default())),
-            keep_all_lines: Some(true),
-            drop_cap_align_left: Some(true),
-            ..Default::default()
-        };
-        let style = std::sync::Arc::make_mut(&mut d.styles).paragraph.iter_mut().find(|s| s.name == base).unwrap();
-        style.chars = chars;
-        style.para = para;
-        let clear_chars = CharAttrs {
-            leading_aki: Some(None),
-            trailing_aki: Some(None),
-            underline_weight: Some(None),
-            underline_offset: Some(None),
-            strikethrough_weight: Some(None),
-            strikethrough_offset: Some(None),
-            ..Default::default()
-        };
-        let clear_para = ParaAttrs { start_at: Some(None), paragraph_kashida_width: Some(None), kinsoku: Some(None), ..Default::default() };
-        let selected = if style_clear {
-            std::sync::Arc::make_mut(&mut d.styles).paragraph.push(designcraft_doc::styles::ParagraphStyle {
-                name: "Defaults".into(),
-                based_on: Some(base.clone()),
-                next_style: None,
-                para: clear_para.clone(),
-                chars: clear_chars.clone(),
-                shortcut: String::new(),
-            });
-            "Defaults".to_string()
-        } else {
-            base
-        };
-        let format = ParaFormat {
-            style: selected,
-            para: if local_clear { clear_para } else { ParaAttrs::default() },
-            chars: if local_clear { clear_chars } else { CharAttrs::default() },
-            table: None,
-        };
-        // Pin legacy paragraph defaults so both formats isolate nullable overrides.
-        for style in &mut d.styles_mut().paragraph {
-            style.para.keep_all_lines = Some(true);
-            style.para.drop_cap_align_left = Some(false);
-        }
-        let layer = d.default_layer();
-        d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 400.0), layer, "clear", format).unwrap();
-        d
-    }
-
-    fn r7a_nullable_resolution(d: &Document) -> (designcraft_doc::ParaProps, designcraft_doc::CharProps) {
-        let s = d.stories.values().find(|s| s.text == "clear").unwrap();
-        d.styles.resolve_para(s.paras.first().unwrap())
-    }
-
-    fn r7a_assert_nullable_defaults_survive(d: &Document) {
-        let expected = r7a_nullable_resolution(d);
-        assert_eq!(expected.0.start_at, None);
-        assert_eq!(expected.0.paragraph_kashida_width, None);
-        assert_eq!(expected.0.kinsoku, None);
-        assert_eq!(expected.1.leading_aki, None);
-        // Legacy JSON is format 1: its upgrade pins older defaults on the other styles, so only
-        // the native ZIP compares as the whole document.
-        for (bytes, native) in [(save(d).unwrap(), true), (serde_json::to_vec(d).unwrap(), false)] {
-            let back = load(&bytes).unwrap();
-            assert_eq!(r7a_nullable_resolution(&back), expected, "saved explicit defaults must not become inherited values");
-            if native {
-                assert_eq!(back, *d, "the native ZIP preserves the complete document");
-            }
-        }
-    }
-
-    #[test]
-    fn r7a_native_local_default_text_overrides_survive_zip_and_legacy_json() {
-        r7a_assert_nullable_defaults_survive(&r7a_nullable_document(true, false));
-    }
-
-    #[test]
-    fn r7a_native_named_style_default_overrides_survive_zip_and_legacy_json() {
-        r7a_assert_nullable_defaults_survive(&r7a_nullable_document(false, true));
-    }
-
-    #[test]
-    fn r7a_native_nullable_missing_and_explicit_value_controls() {
-        let d = r7a_nullable_document(false, false);
-        assert_eq!(r7a_nullable_resolution(&d).0.start_at, Some(7));
-        assert_eq!(r7a_nullable_resolution(&d).1.leading_aki, Some(4.0));
-        for (bytes, native) in [(save(&d).unwrap(), true), (serde_json::to_vec(&d).unwrap(), false)] {
-            let back = load(&bytes).unwrap();
-            assert_eq!(r7a_nullable_resolution(&back), r7a_nullable_resolution(&d));
-            if native {
-                assert_eq!(back, d);
-            }
-        }
-        let attrs: designcraft_doc::CharAttrs = serde_json::from_value(json!({"size":null})).unwrap();
-        assert!(attrs.size.is_none(), "nonnullable fields retain their existing null contract");
-        let props: designcraft_doc::CharProps = serde_json::from_value(json!({"leadingAki":null})).unwrap();
-        assert_eq!(props.leading_aki, None);
-    }
-
-    /// Write `len` bytes of `fill` to the current entry of `z`.
-    fn write_fill(z: &mut zip::ZipWriter<Cursor<Vec<u8>>>, len: usize, fill: u8) {
-        let chunk = vec![fill; 1 << 20];
-        let mut left = len;
-        while left > 0 {
-            let n = left.min(chunk.len());
-            z.write_all(&chunk[..n]).unwrap();
-            left -= n;
-        }
-    }
-
-    /// Make the archive claim that entry `name` expands to `size` bytes, in both its local header
-    /// and its central directory record (the archive has no ZIP64 fields or data descriptors).
-    fn claim_size(bytes: &mut [u8], name: &str, size: u32) {
-        let mut patched = 0;
-        for i in 0..bytes.len().saturating_sub(46) {
-            let (size_at, len_at, name_at) = match &bytes[i..i + 4] {
-                b"PK\x03\x04" => (22, 26, 30),
-                b"PK\x01\x02" => (24, 28, 46),
-                _ => continue,
-            };
-            let len = u16::from_le_bytes([bytes[i + len_at], bytes[i + len_at + 1]]) as usize;
-            if bytes.get(i + name_at..i + name_at + len) == Some(name.as_bytes()) {
-                bytes[i + size_at..i + size_at + 4].copy_from_slice(&size.to_le_bytes());
-                patched += 1;
-            }
-        }
-        assert_eq!(patched, 2, "{name} not found in both headers");
-    }
-
-    /// A small archive whose `document.json` expands past the 256 MiB limit while claiming to
-    /// hold one byte is refused once the limit is reached, with an error that says so, instead of
-    /// being read whole into memory.
-    #[test]
-    fn oversized_document_json_is_refused() {
-        let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
-        z.start_file("document.json", zip::write::SimpleFileOptions::default()).unwrap();
-        write_fill(&mut z, (256 << 20) + 1, b' ');
-        let mut bytes = z.finish().unwrap().into_inner();
-        assert!(bytes.len() < 4 << 20, "{}", bytes.len());
-        claim_size(&mut bytes, "document.json", 1);
-        let Err(err) = load(&bytes) else { panic!("an oversized document.json loaded") };
-        assert!(err.to_string().contains("limit"), "{err}");
-    }
-
-    /// An embedded file that expands past the 1 GiB limit (and says so) is refused too.
-    #[test]
-    fn oversized_asset_is_refused() {
-        let mut d = Document::new(&NewDocument::default());
-        let aid = png_asset(&mut d, &[1]);
-        place(&mut d, aid, 0.0);
-        let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
-        z.start_file("document.json", zip::write::SimpleFileOptions::default()).unwrap();
-        z.write_all(&serde_json::to_vec(&d).unwrap()).unwrap();
-        z.start_file(format!("assets/{}.png", aid.0), zip::write::SimpleFileOptions::default()).unwrap();
-        write_fill(&mut z, (1 << 30) + 1, 0);
-        let Err(err) = load(&z.finish().unwrap().into_inner()) else { panic!("an oversized asset loaded") };
-        assert!(err.to_string().contains("limit"), "{err}");
-    }
-
-    /// An archive with more entries than any document needs is refused before any is read.
-    #[test]
-    fn too_many_entries_are_refused() {
-        let d = Document::new(&NewDocument::default());
-        let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
-        let stored = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
-        z.start_file("document.json", stored).unwrap();
-        z.write_all(&serde_json::to_vec(&d).unwrap()).unwrap();
-        for i in 0..100_000 {
-            z.start_file(format!("junk/{i}"), stored).unwrap();
-        }
-        let Err(err) = load(&z.finish().unwrap().into_inner()) else { panic!("an archive with 100 001 entries loaded") };
-        assert!(err.to_string().contains("entries"), "{err}");
-    }
-}
+mod tests;
diff --git a/crates/format/src/tests.rs b/crates/format/src/tests.rs
new file mode 100644
index 000000000..981898a45
--- /dev/null
+++ b/crates/format/src/tests.rs
@@ -0,0 +1,736 @@
+use super::*;
+use designcraft_doc::build::NewDocument;
+use designcraft_doc::geom::Rect;
+use designcraft_doc::{Asset, ParaFormat, SpreadRef};
+
+fn png_asset(d: &mut Document, data: &[u8]) -> AssetId {
+    let aid = AssetId(d.alloc());
+    let a =
+        Asset { id: aid, name: "x.png".into(), mime: "image/png".into(), data: Arc::new(data.to_vec()), pixels: Some((1, 1)), ..Default::default() };
+    d.assets.insert(aid, Arc::new(a));
+    aid
+}
+
+fn place(d: &mut Document, asset: AssetId, crop: f64) -> designcraft_doc::ItemId {
+    use designcraft_doc::geom::{Affine, shapes};
+    use designcraft_doc::{Content, Graphic, Item, ItemId, Shape};
+    let id = ItemId(d.alloc());
+    let mut it = Item::new(id, d.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 50.0, 50.0)));
+    it.content = Content::Graphic(Graphic {
+        layer_options: None,
+        asset,
+        size: (1.0, 1.0),
+        xf: Affine::translate((crop, crop)),
+        clip: None,
+        auto_fit: Default::default(),
+        fit_align: 4,
+        crop: [crop; 4],
+        wrap: Default::default(),
+        fill: Default::default(),
+    });
+    d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
+    id
+}
+
+fn asset_entries(bytes: &[u8]) -> usize {
+    let z = zip::ZipArchive::new(Cursor::new(bytes)).unwrap();
+    z.file_names().filter(|n| n.starts_with("assets/")).count()
+}
+
+/// Zip `d` the way files were saved with one asset per placement (nothing merged or pruned).
+fn save_uncompacted(d: &Document) -> Vec<u8> {
+    let mut buf = Cursor::new(Vec::new());
+    let mut z = zip::ZipWriter::new(&mut buf);
+    let opts = zip::write::SimpleFileOptions::default();
+    z.start_file("mimetype", opts).unwrap();
+    z.write_all(MIME.as_bytes()).unwrap();
+    z.start_file("document.json", opts).unwrap();
+    z.write_all(&serde_json::to_vec(d).unwrap()).unwrap();
+    for (id, a) in &d.assets {
+        z.start_file(format!("assets/{}.png", id.0), opts).unwrap();
+        z.write_all(&a.data).unwrap();
+    }
+    z.finish().unwrap();
+    buf.into_inner()
+}
+
+#[test]
+fn explicit_all_on_pdf_layers_require_a_capable_reader_only_when_needed() {
+    let mut d = Document::new(&NewDocument::default());
+    let aid = AssetId(d.alloc());
+    d.assets.insert(
+        aid,
+        Arc::new(Asset {
+            id: aid,
+            name: "art.pdf".into(),
+            mime: "application/pdf".into(),
+            data: Arc::new(b"%PDF-1.7".to_vec()),
+            ..Default::default()
+        }),
+    );
+    let id = place(&mut d, aid, 0.0);
+    let version = |d: &Document| {
+        let bytes = save(d).unwrap();
+        let mut z = zip::ZipArchive::new(Cursor::new(bytes)).unwrap();
+        let mut meta = String::new();
+        z.by_name("meta.json").unwrap().read_to_string(&mut meta).unwrap();
+        serde_json::from_str::<Value>(&meta).unwrap()["version"].as_u64().unwrap()
+    };
+    assert_eq!(version(&d), 2);
+    d.item_mut(id).unwrap().pdf_layer_override = true;
+    assert_eq!(version(&d), 4);
+    assert!(load(&save(&d).unwrap()).unwrap().item(id).unwrap().pdf_layer_override);
+    d.item_mut(id).unwrap().pdf_hidden_layers = vec!["Red".into()];
+    assert_eq!(version(&d), 2, "legacy nonempty overrides remain readable");
+}
+
+#[test]
+fn one_version_4_reader_keeps_both_explicit_all_on_and_graphic_layer_options() {
+    use designcraft_doc::{Content, GraphicLayerOptions};
+    let mut d = Document::new(&NewDocument::default());
+    let pdf = AssetId(d.alloc());
+    d.assets.insert(
+        pdf,
+        Arc::new(Asset {
+            id: pdf,
+            name: "art.pdf".into(),
+            mime: "application/pdf".into(),
+            data: Arc::new(b"%PDF-1.7".to_vec()),
+            ..Default::default()
+        }),
+    );
+    let eps = AssetId(d.alloc());
+    let source = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n%%EOF\n".to_vec();
+    d.assets.insert(
+        eps,
+        Arc::new(Asset { id: eps, name: "logo.eps".into(), mime: "application/postscript".into(), data: Arc::new(source), ..Default::default() }),
+    );
+    let all_on = place(&mut d, pdf, 0.0);
+    let layered = place(&mut d, eps, 0.0);
+    assert_eq!(required_version(&d), 3, "neither feature: EPS documents keep version 3");
+    let options = GraphicLayerOptions { layers: vec![[("Name".to_string(), "Art".to_string())].into()], ..Default::default() };
+    let set_options = |d: &mut Document, value: Option<GraphicLayerOptions>| {
+        let Some(Content::Graphic(g)) = d.item_mut(layered).map(|it| &mut it.content) else { panic!("placed graphic") };
+        g.layer_options = value;
+    };
+    set_options(&mut d, Some(options.clone()));
+    d.item_mut(all_on).unwrap().pdf_layer_override = true;
+    let bytes = save(&d).unwrap();
+    let mut z = zip::ZipArchive::new(Cursor::new(&bytes)).unwrap();
+    let mut meta = String::new();
+    z.by_name("meta.json").unwrap().read_to_string(&mut meta).unwrap();
+    assert_eq!(serde_json::from_str::<Value>(&meta).unwrap()["version"], 4);
+    let reopened = load(&bytes).unwrap();
+    let it = reopened.item(all_on).unwrap();
+    assert!(it.pdf_layer_override && it.pdf_hidden_layers.is_empty(), "explicit all-on survives");
+    assert_eq!(reopened.item(layered).unwrap().graphic().unwrap().layer_options.as_ref(), Some(&options), "graphic layer options survive");
+    assert_eq!(required_version(&reopened), 4);
+    // Either feature alone needs version 4; dropping both restores the older requirement.
+    set_options(&mut d, None);
+    assert_eq!(required_version(&d), 4, "explicit all-on alone");
+    d.item_mut(all_on).unwrap().pdf_layer_override = false;
+    assert_eq!(required_version(&d), 3);
+    set_options(&mut d, Some(options));
+    assert_eq!(required_version(&d), 4, "graphic layer options alone");
+    set_options(&mut d, None);
+    d.assets.remove(&eps);
+    d.remove_item(layered).unwrap();
+    assert_eq!(required_version(&d), 2, "neither feature and no EPS: version 2");
+    // An explicit all-on choice on a parent spread also needs the version 4 reader.
+    let mut parent_item = (*d.remove_item(all_on).unwrap()).clone();
+    parent_item.pdf_layer_override = true;
+    d.insert_item(SpreadRef::Parent(0), parent_item, None).unwrap();
+    assert_eq!(required_version(&d), 4, "parent-spread placements are not skipped");
+}
+
+#[test]
+fn eps_source_requires_new_reader_but_preview_documents_keep_the_older_one() {
+    let mut d = Document::new(&NewDocument::default());
+    let version = |d: &Document| {
+        let bytes = save(d).unwrap();
+        let mut z = zip::ZipArchive::new(Cursor::new(bytes)).unwrap();
+        let mut meta = String::new();
+        z.by_name("meta.json").unwrap().read_to_string(&mut meta).unwrap();
+        serde_json::from_str::<Value>(&meta).unwrap()["version"].as_u64().unwrap()
+    };
+    assert_eq!(version(&d), 2);
+    let aid = AssetId(d.alloc());
+    let source = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n%%EOF\n".to_vec();
+    d.assets.insert(
+        aid,
+        Arc::new(Asset {
+            id: aid,
+            name: "logo.eps".into(),
+            mime: "image/png".into(),
+            link: None,
+            data: Arc::new(source.clone()),
+            pixels: Some((40, 20)),
+            page: 0,
+            ..Default::default()
+        }),
+    );
+    place(&mut d, aid, 0.0);
+    assert_eq!(version(&d), 3, "sniff source even when legacy metadata says PNG");
+    assert_eq!(load(&save(&d).unwrap()).unwrap().assets[&aid].data.as_slice(), source);
+    Arc::make_mut(d.assets.get_mut(&aid).unwrap()).data = Arc::new(b"\x89PNG\r\n\x1a\npreview".to_vec());
+    assert_eq!(version(&d), 2, "legacy EPS previews stay compatible");
+}
+
+#[test]
+fn one_place_picks_the_oldest_reader_that_keeps_the_document() {
+    use designcraft_doc::{Content, GraphicLayerOptions};
+    let mut d = Document::new(&NewDocument::default());
+    assert_eq!(required_version(&d), 2, "plain documents keep the version 2 reader");
+    let aid = AssetId(d.alloc());
+    let eps = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n%%EOF\n".to_vec();
+    d.assets.insert(
+        aid,
+        Arc::new(Asset { id: aid, name: "logo.eps".into(), mime: "application/postscript".into(), data: Arc::new(eps), ..Default::default() }),
+    );
+    let id = place(&mut d, aid, 0.0);
+    assert_eq!(required_version(&d), 3, "EPS sources alone keep the version 3 reader");
+    let Some(Content::Graphic(g)) = d.item_mut(id).map(|it| &mut it.content) else { panic!("placed graphic") };
+    g.layer_options = Some(GraphicLayerOptions { layers: vec![[("Name".to_string(), "Art".to_string())].into()], ..Default::default() });
+    assert_eq!(required_version(&d), 4, "retained graphic layer options need version 4 even with EPS");
+    assert_eq!(required_version(&load(&save(&d).unwrap()).unwrap()), 4);
+}
+
+#[test]
+fn roundtrip_with_assets() {
+    let mut d = Document::new(&NewDocument { pages: 3, ..Default::default() });
+    let lid = d.default_layer();
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(10.0, 10.0, 200.0, 200.0), lid, "héllo\nworld", ParaFormat::default()).unwrap();
+    let aid = png_asset(&mut d, &[1, 2, 3, 4]);
+    place(&mut d, aid, 0.0);
+    let bytes = save(&d).unwrap();
+    assert!(bytes.starts_with(b"PK"));
+    let back = load(&bytes).unwrap();
+    assert_eq!(back.page_count(), 3);
+    assert_eq!(*back.assets[&aid].data, vec![1, 2, 3, 4]);
+    assert_eq!(back.stories, d.stories);
+}
+
+/// `doc` as format 1 wrote it.
+fn save_v1(doc: &Document) -> Vec<u8> {
+    let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
+    z.start_file("meta.json", zip::write::SimpleFileOptions::default()).unwrap();
+    z.write_all(br#"{"format": "designcraft", "version": 1}"#).unwrap();
+    z.start_file("document.json", zip::write::SimpleFileOptions::default()).unwrap();
+    z.write_all(&serde_json::to_vec(doc).unwrap()).unwrap();
+    z.finish().unwrap().into_inner()
+}
+
+fn para_style(name: &str, based_on: Option<&str>, keep_all_lines: Option<bool>) -> designcraft_doc::ParagraphStyle {
+    designcraft_doc::ParagraphStyle {
+        name: name.into(),
+        based_on: based_on.map(str::to_string),
+        next_style: None,
+        para: designcraft_doc::ParaAttrs { keep_lines_together: Some(true), keep_all_lines, ..Default::default() },
+        chars: Default::default(),
+        shortcut: String::new(),
+    }
+}
+
+/// Format 1 resolved an unset Keep Lines Together mode as all lines: those documents still
+/// do after loading, wherever the mode comes from. New documents keep lines at start/end.
+#[test]
+fn format_1_keep_lines_without_mode_stays_all_lines() {
+    let mut d = Document::new(&NewDocument::default());
+    let st = d.styles_mut();
+    st.paragraph.push(para_style("Root", None, None));
+    st.paragraph.push(para_style("Child", Some("Root"), None));
+    st.paragraph.push(para_style("Explicit", None, Some(false)));
+    st.paragraph.push(para_style("Under explicit", Some("Explicit"), None));
+    st.paragraph.push(para_style("Loop A", Some("Loop B"), None));
+    st.paragraph.push(para_style("Loop B", Some("Loop A"), None));
+    let lid = d.default_layer();
+    let names = [designcraft_doc::story::BASIC_PARAGRAPH, "Root", "Child", "Explicit", "Under explicit", "Loop A", "Loop B", "Missing"];
+    let text = names.join("\n");
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(10.0, 10.0, 200.0, 200.0), lid, &text, ParaFormat::default()).unwrap();
+    {
+        let s = d.story_mut(sid).unwrap();
+        for (p, name) in s.paras.iter_mut().zip(names) {
+            p.style = name.into();
+            p.para.keep_lines_together = Some(true);
+        }
+        s.insert_note(1, "Note", ParaFormat { style: "Missing".into(), ..Default::default() });
+    }
+    let back = load(&save_v1(&d)).unwrap();
+    let resolve = |f: &ParaFormat| back.styles.resolve_para(f).0;
+    let story = back.story(sid).unwrap();
+    for (p, name) in story.paras.iter().zip(names) {
+        let pp = resolve(p);
+        assert!(pp.keep_lines_together);
+        assert_eq!(pp.keep_all_lines, !name.contains("xplicit"), "{name}");
+    }
+    assert!(resolve(&story.notes[0].text.paras[0]).keep_all_lines, "footnote with a missing style");
+    assert!(back.styles.resolve_para_style("Loop A").0.keep_all_lines && back.styles.resolve_para_style("Loop B").0.keep_all_lines);
+    // Pinned where the chains start; explicit and inheriting styles are left as they were.
+    assert_eq!(back.styles.para("Root").unwrap().para.keep_all_lines, Some(true));
+    assert_eq!(back.styles.para("Child").unwrap().para.keep_all_lines, None);
+    assert_eq!(back.styles.para("Under explicit").unwrap().para.keep_all_lines, None);
+    // The current format keeps the new default: at start/end of paragraph.
+    let now = load(&save(&d).unwrap()).unwrap();
+    let p = &now.story(sid).unwrap().paras[0];
+    assert!(!now.styles.resolve_para(p).0.keep_all_lines);
+    assert!(!designcraft_doc::ParaProps::default().keep_all_lines);
+}
+
+/// Format 1 wrote paragraph rules, text frame options and numbered lists in full, so their
+/// old defaults (black rules, auto-size from the top centre, lists continuing across stories)
+/// load as saved. New documents take InDesign's.
+#[test]
+fn format_1_rules_frames_and_lists_load_as_saved() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let old_rule = designcraft_doc::Rule { on: true, color: designcraft_doc::color::swatch::BLACK.into(), ..Default::default() };
+    let (fid, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(10.0, 10.0, 200.0, 200.0), lid, "Ruled", ParaFormat::default()).unwrap();
+    d.story_mut(sid).unwrap().paras[0].para.rule_above = Some(old_rule.clone());
+    d.item_mut(fid).unwrap().text_frame_mut().unwrap().options.auto_size_ref = 1;
+    d.settings.lists.push(designcraft_doc::NumberedList { name: "Steps".into(), continue_across_stories: true });
+    let back = load(&save_v1(&d)).unwrap();
+    assert_eq!(back.story(sid).unwrap().paras[0].para.rule_above, Some(old_rule));
+    assert_eq!(back.item(fid).unwrap().text_frame().unwrap().options.auto_size_ref, 1);
+    assert!(back.settings.lists[0].continue_across_stories);
+    assert_eq!(designcraft_doc::Rule::default().color, designcraft_doc::TEXT_COLOR);
+    assert_eq!(designcraft_doc::TextFrameOptions::default().auto_size_ref, 4);
+    assert!(!designcraft_doc::NumberedList::default().continue_across_stories);
+}
+
+/// Format 1 set drop caps without Align Left Edge: those documents still do where nothing set
+/// it. New documents align the drop cap's left edge.
+#[test]
+fn format_1_drop_caps_stay_unaligned() {
+    let mut d = Document::new(&NewDocument::default());
+    let st = d.styles_mut();
+    st.paragraph.push(para_style("Opener", None, None));
+    st.paragraph.push(designcraft_doc::ParagraphStyle {
+        para: designcraft_doc::ParaAttrs { drop_cap_align_left: Some(true), ..Default::default() },
+        ..para_style("Aligned", None, None)
+    });
+    let lid = d.default_layer();
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(10.0, 10.0, 200.0, 200.0), lid, "One\nTwo\nThree", ParaFormat::default()).unwrap();
+    {
+        let s = d.story_mut(sid).unwrap();
+        for (p, name) in s.paras.iter_mut().zip(["Opener", "Aligned", "Missing"]) {
+            p.style = name.into();
+            p.para.drop_cap_lines = Some(2);
+            p.para.drop_cap_chars = Some(1);
+        }
+    }
+    let back = load(&save_v1(&d)).unwrap();
+    let aligned: Vec<bool> = back.story(sid).unwrap().paras.iter().map(|p| back.styles.resolve_para(p).0.drop_cap_align_left).collect();
+    assert_eq!(aligned, [false, true, false]);
+    let now = load(&save(&d).unwrap()).unwrap();
+    assert!(now.styles.resolve_para(&now.story(sid).unwrap().paras[0]).0.drop_cap_align_left);
+}
+
+/// Assets over the zip size limit are written with zip64 sizes (scaled down here: the real
+/// threshold is near 4 GiB); smaller ones are written exactly as before.
+#[test]
+fn large_assets_are_written_with_zip64_sizes_and_open_again() {
+    let mut d = Document::new(&NewDocument::default());
+    let aid = png_asset(&mut d, &[5; 64]);
+    place(&mut d, aid, 0.0);
+    let normal = save(&d).unwrap();
+    assert_eq!(normal, save_with_large_entries_from(&d, None, 65).unwrap(), "an asset under the threshold is unchanged");
+    let large = save_with_large_entries_from(&d, None, 64).unwrap();
+    assert!(large.len() > normal.len(), "the asset entry carries zip64 sizes");
+    assert_eq!(*load(&large).unwrap().assets[&aid].data, vec![5; 64]);
+}
+
+#[test]
+fn saves_hold_each_used_file_once() {
+    let mut d = Document::new(&NewDocument::default());
+    let first = png_asset(&mut d, &[7; 64]);
+    let copy = png_asset(&mut d, &[7; 64]);
+    let replaced = png_asset(&mut d, &[9; 64]);
+    let a = place(&mut d, first, 1.0);
+    let b = place(&mut d, copy, 2.0);
+    assert_eq!(d.assets.len(), 3);
+
+    // Duplicates merge into the first asset, the unreferenced one is left out, and every
+    // placement keeps its own crop and transform.
+    let bytes = save(&d).unwrap();
+    assert_eq!(asset_entries(&bytes), 1);
+    assert_eq!(d.assets.len(), 3, "the open document keeps its assets");
+    let back = load(&bytes).unwrap();
+    assert_eq!(back.assets.keys().copied().collect::<Vec<_>>(), vec![first]);
+    assert!(!back.assets.contains_key(&replaced));
+    for (id, crop) in [(a, 1.0), (b, 2.0)] {
+        let g = back.item(id).and_then(|i| i.graphic()).unwrap();
+        assert_eq!((g.asset, g.crop, g.xf), (first, [crop; 4], d.item(id).unwrap().graphic().unwrap().xf));
+    }
+}
+
+#[test]
+fn files_with_identical_bytes_at_different_paths_keep_their_paths() {
+    let mut d = Document::new(&NewDocument::default());
+    let ids: Vec<AssetId> = (0..3).map(|_| png_asset(&mut d, &[3; 32])).collect();
+    for (id, link) in ids.iter().zip(["/p/a.png", "/q/b.png"]) {
+        if let Some(a) = d.assets.get_mut(id) {
+            Arc::make_mut(a).link = Some(link.into());
+        }
+    }
+    let items: Vec<_> = ids.iter().enumerate().map(|(k, id)| place(&mut d, *id, k as f64)).collect();
+    for bytes in [save(&d).unwrap(), save_uncompacted(&d)] {
+        let back = load(&bytes).unwrap();
+        assert_eq!(back.assets.len(), 3);
+        let links: Vec<Option<&str>> =
+            items.iter().map(|i| back.item(*i).and_then(|i| i.graphic()).and_then(|g| back.assets.get(&g.asset)).unwrap().link.as_deref()).collect();
+        assert_eq!(links, [Some("/p/a.png"), Some("/q/b.png"), None]);
+    }
+}
+
+#[test]
+fn equal_size_archive_assets_preserve_content_and_share_only_identical_buffers() {
+    let mut d = Document::new(&NewDocument::default());
+    let mut pairs = Vec::new();
+    for n in 0..128u64 {
+        let mut bytes = vec![42; 1024];
+        bytes[1016..].copy_from_slice(&n.to_le_bytes());
+        let a = png_asset(&mut d, &bytes);
+        let b = png_asset(&mut d, &bytes);
+        // Distinct links must remain independently relinkable even when their bytes match.
+        Arc::make_mut(d.assets.get_mut(&a).unwrap()).link = Some(format!("/a/{n}.png"));
+        Arc::make_mut(d.assets.get_mut(&b).unwrap()).link = Some(format!("/b/{n}.png"));
+        place(&mut d, a, 1.0);
+        place(&mut d, b, 2.0);
+        pairs.push((a, b));
+    }
+    let back = load(&save_uncompacted(&d)).unwrap();
+    assert_eq!(back.assets.len(), 256);
+    for (n, (a, b)) in pairs.into_iter().enumerate() {
+        assert_eq!(back.assets[&a].data[1016..], (n as u64).to_le_bytes());
+        assert!(Arc::ptr_eq(&back.assets[&a].data, &back.assets[&b].data));
+        assert_eq!(back.assets[&a].link, d.assets[&a].link);
+        assert_eq!(back.assets[&b].link, d.assets[&b].link);
+    }
+    assert_eq!(back.spreads, d.spreads);
+}
+
+#[test]
+fn older_files_with_one_asset_per_placement_open_with_one() {
+    let mut d = Document::new(&NewDocument::default());
+    let ids: Vec<AssetId> = (0..3).map(|_| png_asset(&mut d, &[5; 32])).collect();
+    for (k, id) in ids.iter().enumerate() {
+        place(&mut d, *id, k as f64);
+    }
+    let back = load(&save_uncompacted(&d)).unwrap();
+    assert_eq!(back.assets.len(), 1);
+    assert_eq!(asset_entries(&save(&back).unwrap()), 1);
+}
+
+/// The object of the item `id` in a document's JSON.
+fn item_json(v: &mut Value, id: u64) -> Option<&mut Value> {
+    if v.get("id").and_then(Value::as_u64) == Some(id) && v.get("content").is_some() {
+        return Some(v);
+    }
+    match v {
+        Value::Object(m) => m.values_mut().find_map(|c| item_json(c, id)),
+        Value::Array(a) => a.iter_mut().find_map(|c| item_json(c, id)),
+        _ => None,
+    }
+}
+
+#[test]
+fn frame_level_vertical_text_opens_as_a_vertical_story() {
+    // Documents that set Vertical on the frame: the story takes its first frame's direction.
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let (a, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(72.0, 72.0, 200.0, 400.0), lid, "縦書き", ParaFormat::default()).unwrap();
+    let (b, _) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(300.0, 72.0, 428.0, 400.0), lid, "", ParaFormat::default()).unwrap();
+    d.thread(a, b).unwrap();
+    let (c, other) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(450.0, 72.0, 550.0, 400.0), lid, "横", ParaFormat::default()).unwrap();
+    let mut v = serde_json::to_value(&d).unwrap();
+    item_json(&mut v, a.0).unwrap()["content"]["options"]["vertical"] = json!(true);
+    item_json(&mut v, c.0).unwrap()["content"]["options"]["vertical"] = json!(false);
+    let json = serde_json::to_vec(&v).unwrap();
+    let mut zipped = Cursor::new(Vec::new());
+    {
+        let mut z = zip::ZipWriter::new(&mut zipped);
+        z.start_file("document.json", zip::write::SimpleFileOptions::default()).unwrap();
+        z.write_all(&json).unwrap();
+        z.finish().unwrap();
+    }
+    for bytes in [json.clone(), zipped.into_inner()] {
+        let back = load(&bytes).unwrap();
+        assert!(back.stories[&sid].vertical);
+        assert!(!back.stories[&other].vertical);
+        // Saved again, the direction is the story's.
+        let again = load(&save(&back).unwrap()).unwrap();
+        assert!(again.stories[&sid].vertical && !again.stories[&other].vertical);
+    }
+}
+
+#[test]
+fn documents_saved_before_glyph_fallback_keep_their_fallback_fonts() {
+    let d = Document::new(&NewDocument::default());
+    assert!(!d.settings.glyph_fallback);
+    assert!(!load(&save(&d).unwrap()).unwrap().settings.glyph_fallback, "saved and read as off");
+    let mut on = d.clone();
+    on.settings.glyph_fallback = true;
+    assert!(load(&save(&on).unwrap()).unwrap().settings.glyph_fallback);
+    // Written before the setting existed: drawn from fallback fonts, as they were.
+    let mut v = serde_json::to_value(&d).unwrap();
+    v["settings"].as_object_mut().unwrap().remove("glyphFallback").unwrap();
+    assert!(load(&serde_json::to_vec(&v).unwrap()).unwrap().settings.glyph_fallback);
+}
+
+/// A saved tab list over the limits loads repaired, as an imported one does: a non-finite
+/// position (saved as `null`) dropped, positions clamped, leaders cut, the count capped.
+#[test]
+fn saved_tab_lists_load_sanitized() {
+    use designcraft_doc::{MAX_TAB_LEADER, MAX_TAB_POSITION, MAX_TAB_STOPS, TabAlign, TabStop};
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(72.0, 72.0, 300.0, 300.0), lid, "a\tb", ParaFormat::default()).unwrap();
+    let stop = |position: f64| TabStop { position, align: TabAlign::Right, leader: "0123456789".into(), align_on: String::new() };
+    let mut tabs: Vec<TabStop> = (0..500).rev().map(|i| stop(i as f64 * 40.0)).collect();
+    tabs.push(stop(f64::NAN));
+    d.story_mut(sid).unwrap().paras[0].para.tabs = Some(tabs);
+    let bytes = save(&d).unwrap();
+    let back = load(&bytes).unwrap();
+    let tabs = back.stories[&sid].paras[0].para.tabs.clone().unwrap();
+    assert_eq!(tabs.len(), MAX_TAB_STOPS);
+    assert!(tabs.windows(2).all(|w| w[0].position < w[1].position), "sorted");
+    assert!(tabs.iter().all(|t| t.position.is_finite() && t.position <= MAX_TAB_POSITION && t.leader.chars().count() <= MAX_TAB_LEADER));
+    assert_eq!(tabs.last().map(|t| t.position), Some(3960.0), "the first stops by position");
+}
+
+#[test]
+fn the_preview_is_read_back_without_the_document() {
+    let d = Document::new(&NewDocument::default());
+    let png = b"\x89PNG fake".to_vec();
+    let bytes = save_with_preview(&d, Some(&png)).unwrap();
+    assert_eq!(read_preview(Cursor::new(&bytes)), Some(png));
+    assert!(load(&bytes).is_ok(), "the preview doesn't get in the way of opening");
+    // Files without one, legacy JSON and garbage have none.
+    assert_eq!(read_preview(Cursor::new(save(&d).unwrap())), None);
+    assert_eq!(read_preview(Cursor::new(b"{}".to_vec())), None);
+    assert_eq!(read_preview(Cursor::new(Vec::new())), None);
+}
+
+#[test]
+fn a_preview_that_inflates_past_its_declared_size_is_refused() {
+    use std::io::Write;
+    let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
+    let opts = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
+    z.start_file(PREVIEW, opts).unwrap();
+    z.write_all(&vec![0u8; usize::try_from(MAX_PREVIEW_BYTES).unwrap() + 4096]).unwrap();
+    let mut bytes = z.finish().unwrap().into_inner();
+    // Declare the entry tiny in the local header and the central directory.
+    let patch = |bytes: &mut Vec<u8>, sig: &[u8], at: usize| {
+        let start = bytes.windows(4).position(|w| w == sig).unwrap();
+        bytes[start + at..start + at + 4].copy_from_slice(&16u32.to_le_bytes());
+    };
+    patch(&mut bytes, b"PK\x03\x04", 22);
+    patch(&mut bytes, b"PK\x01\x02", 24);
+    assert_eq!(read_preview(Cursor::new(&bytes)), None);
+}
+
+#[test]
+fn rejects_garbage_and_newer_versions() {
+    assert!(load(b"nope").is_err());
+    for version in [99u64, u64::from(u32::MAX) + 2] {
+        let mut buf = Cursor::new(Vec::new());
+        {
+            let mut z = zip::ZipWriter::new(&mut buf);
+            z.start_file("meta.json", zip::write::SimpleFileOptions::default()).unwrap();
+            z.write_all(json!({"version": version}).to_string().as_bytes()).unwrap();
+            z.finish().unwrap();
+        }
+        assert!(matches!(load(&buf.into_inner()), Err(FormatError::TooNew(v)) if v == version));
+    }
+}
+
+fn r7a_nullable_document(local_clear: bool, style_clear: bool) -> Document {
+    use designcraft_doc::{CharAttrs, ParaAttrs};
+    let mut d = Document::new(&NewDocument { pages: 1, ..Default::default() });
+    let base = d.styles.default_paragraph.clone();
+    let chars = CharAttrs {
+        leading_aki: Some(Some(4.0)),
+        trailing_aki: Some(Some(3.0)),
+        underline_weight: Some(Some(2.0)),
+        underline_offset: Some(Some(1.0)),
+        strikethrough_weight: Some(Some(2.0)),
+        strikethrough_offset: Some(Some(1.0)),
+        ..Default::default()
+    };
+    // Legacy JSON loads as format 1, whose upgrade pins Keep Lines Together and Align Left
+    // Edge where a style chain leaves them unset; the base style sets them so both
+    // formats resolve the same.
+    let para = ParaAttrs {
+        start_at: Some(Some(7)),
+        paragraph_kashida_width: Some(Some(0.5)),
+        kinsoku: Some(Some(Default::default())),
+        keep_all_lines: Some(true),
+        drop_cap_align_left: Some(true),
+        ..Default::default()
+    };
+    let style = std::sync::Arc::make_mut(&mut d.styles).paragraph.iter_mut().find(|s| s.name == base).unwrap();
+    style.chars = chars;
+    style.para = para;
+    let clear_chars = CharAttrs {
+        leading_aki: Some(None),
+        trailing_aki: Some(None),
+        underline_weight: Some(None),
+        underline_offset: Some(None),
+        strikethrough_weight: Some(None),
+        strikethrough_offset: Some(None),
+        ..Default::default()
+    };
+    let clear_para = ParaAttrs { start_at: Some(None), paragraph_kashida_width: Some(None), kinsoku: Some(None), ..Default::default() };
+    let selected = if style_clear {
+        std::sync::Arc::make_mut(&mut d.styles).paragraph.push(designcraft_doc::styles::ParagraphStyle {
+            name: "Defaults".into(),
+            based_on: Some(base.clone()),
+            next_style: None,
+            para: clear_para.clone(),
+            chars: clear_chars.clone(),
+            shortcut: String::new(),
+        });
+        "Defaults".to_string()
+    } else {
+        base
+    };
+    let format = ParaFormat {
+        style: selected,
+        para: if local_clear { clear_para } else { ParaAttrs::default() },
+        chars: if local_clear { clear_chars } else { CharAttrs::default() },
+        table: None,
+    };
+    // Pin legacy paragraph defaults so both formats isolate nullable overrides.
+    for style in &mut d.styles_mut().paragraph {
+        style.para.keep_all_lines = Some(true);
+        style.para.drop_cap_align_left = Some(false);
+    }
+    let layer = d.default_layer();
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 400.0), layer, "clear", format).unwrap();
+    d
+}
+
+fn r7a_nullable_resolution(d: &Document) -> (designcraft_doc::ParaProps, designcraft_doc::CharProps) {
+    let s = d.stories.values().find(|s| s.text == "clear").unwrap();
+    d.styles.resolve_para(s.paras.first().unwrap())
+}
+
+fn r7a_assert_nullable_defaults_survive(d: &Document) {
+    let expected = r7a_nullable_resolution(d);
+    assert_eq!(expected.0.start_at, None);
+    assert_eq!(expected.0.paragraph_kashida_width, None);
+    assert_eq!(expected.0.kinsoku, None);
+    assert_eq!(expected.1.leading_aki, None);
+    // Legacy JSON is format 1: its upgrade pins older defaults on the other styles, so only
+    // the native ZIP compares as the whole document.
+    for (bytes, native) in [(save(d).unwrap(), true), (serde_json::to_vec(d).unwrap(), false)] {
+        let back = load(&bytes).unwrap();
+        assert_eq!(r7a_nullable_resolution(&back), expected, "saved explicit defaults must not become inherited values");
+        if native {
+            assert_eq!(back, *d, "the native ZIP preserves the complete document");
+        }
+    }
+}
+
+#[test]
+fn r7a_native_local_default_text_overrides_survive_zip_and_legacy_json() {
+    r7a_assert_nullable_defaults_survive(&r7a_nullable_document(true, false));
+}
+
+#[test]
+fn r7a_native_named_style_default_overrides_survive_zip_and_legacy_json() {
+    r7a_assert_nullable_defaults_survive(&r7a_nullable_document(false, true));
+}
+
+#[test]
+fn r7a_native_nullable_missing_and_explicit_value_controls() {
+    let d = r7a_nullable_document(false, false);
+    assert_eq!(r7a_nullable_resolution(&d).0.start_at, Some(7));
+    assert_eq!(r7a_nullable_resolution(&d).1.leading_aki, Some(4.0));
+    for (bytes, native) in [(save(&d).unwrap(), true), (serde_json::to_vec(&d).unwrap(), false)] {
+        let back = load(&bytes).unwrap();
+        assert_eq!(r7a_nullable_resolution(&back), r7a_nullable_resolution(&d));
+        if native {
+            assert_eq!(back, d);
+        }
+    }
+    let attrs: designcraft_doc::CharAttrs = serde_json::from_value(json!({"size":null})).unwrap();
+    assert!(attrs.size.is_none(), "nonnullable fields retain their existing null contract");
+    let props: designcraft_doc::CharProps = serde_json::from_value(json!({"leadingAki":null})).unwrap();
+    assert_eq!(props.leading_aki, None);
+}
+
+/// Write `len` bytes of `fill` to the current entry of `z`.
+fn write_fill(z: &mut zip::ZipWriter<Cursor<Vec<u8>>>, len: usize, fill: u8) {
+    let chunk = vec![fill; 1 << 20];
+    let mut left = len;
+    while left > 0 {
+        let n = left.min(chunk.len());
+        z.write_all(&chunk[..n]).unwrap();
+        left -= n;
+    }
+}
+
+/// Make the archive claim that entry `name` expands to `size` bytes, in both its local header
+/// and its central directory record (the archive has no ZIP64 fields or data descriptors).
+fn claim_size(bytes: &mut [u8], name: &str, size: u32) {
+    let mut patched = 0;
+    for i in 0..bytes.len().saturating_sub(46) {
+        let (size_at, len_at, name_at) = match &bytes[i..i + 4] {
+            b"PK\x03\x04" => (22, 26, 30),
+            b"PK\x01\x02" => (24, 28, 46),
+            _ => continue,
+        };
+        let len = u16::from_le_bytes([bytes[i + len_at], bytes[i + len_at + 1]]) as usize;
+        if bytes.get(i + name_at..i + name_at + len) == Some(name.as_bytes()) {
+            bytes[i + size_at..i + size_at + 4].copy_from_slice(&size.to_le_bytes());
+            patched += 1;
+        }
+    }
+    assert_eq!(patched, 2, "{name} not found in both headers");
+}
+
+/// A small archive whose `document.json` expands past the 256 MiB limit while claiming to
+/// hold one byte is refused once the limit is reached, with an error that says so, instead of
+/// being read whole into memory.
+#[test]
+fn oversized_document_json_is_refused() {
+    let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
+    z.start_file("document.json", zip::write::SimpleFileOptions::default()).unwrap();
+    write_fill(&mut z, (256 << 20) + 1, b' ');
+    let mut bytes = z.finish().unwrap().into_inner();
+    assert!(bytes.len() < 4 << 20, "{}", bytes.len());
+    claim_size(&mut bytes, "document.json", 1);
+    let Err(err) = load(&bytes) else { panic!("an oversized document.json loaded") };
+    assert!(err.to_string().contains("limit"), "{err}");
+}
+
+/// An embedded file that expands past the 1 GiB limit (and says so) is refused too.
+#[test]
+fn oversized_asset_is_refused() {
+    let mut d = Document::new(&NewDocument::default());
+    let aid = png_asset(&mut d, &[1]);
+    place(&mut d, aid, 0.0);
+    let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
+    z.start_file("document.json", zip::write::SimpleFileOptions::default()).unwrap();
+    z.write_all(&serde_json::to_vec(&d).unwrap()).unwrap();
+    z.start_file(format!("assets/{}.png", aid.0), zip::write::SimpleFileOptions::default()).unwrap();
+    write_fill(&mut z, (1 << 30) + 1, 0);
+    let Err(err) = load(&z.finish().unwrap().into_inner()) else { panic!("an oversized asset loaded") };
+    assert!(err.to_string().contains("limit"), "{err}");
+}
+
+/// An archive with more entries than any document needs is refused before any is read.
+#[test]
+fn too_many_entries_are_refused() {
+    let d = Document::new(&NewDocument::default());
+    let mut z = zip::ZipWriter::new(Cursor::new(Vec::new()));
+    let stored = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
+    z.start_file("document.json", stored).unwrap();
+    z.write_all(&serde_json::to_vec(&d).unwrap()).unwrap();
+    for i in 0..100_000 {
+        z.start_file(format!("junk/{i}"), stored).unwrap();
+    }
+    let Err(err) = load(&z.finish().unwrap().into_inner()) else { panic!("an archive with 100 001 entries loaded") };
+    assert!(err.to_string().contains("entries"), "{err}");
+}
diff --git a/crates/geom/src/path.rs b/crates/geom/src/path.rs
index b50234a8f..adfc4a2e4 100644
--- a/crates/geom/src/path.rs
+++ b/crates/geom/src/path.rs
@@ -281,9 +281,12 @@ impl PathData {
         for el in bp.elements() {
             match *el {
                 PathEl::MoveTo(p) => {
-                    if let Some(sp) = cur.take()
+                    if let Some(mut sp) = cur.take()
                         && !sp.anchors.is_empty()
                     {
+                        for a in &mut sp.anchors {
+                            *a = Anchor::with_handles(a.p, a.h_in, a.h_out);
+                        }
                         subpaths.push(sp);
                     }
                     cur = Some(SubPath { anchors: vec![Anchor::corner(p)], closed: false });
@@ -418,6 +421,20 @@ mod tests {
         PathData::single(SubPath::polyline(&[Point::new(0.0, 0.0), Point::new(10.0, 0.0), Point::new(10.0, 10.0), Point::new(0.0, 10.0)], true))
     }
 
+    #[test]
+    fn from_bezpath_detects_smooth_on_every_open_subpath() {
+        let mut bp = BezPath::new();
+        for _ in 0..2 {
+            bp.move_to((0.0, 0.0));
+            bp.curve_to((0.0, 10.0), (10.0, 10.0), (10.0, 0.0));
+            bp.curve_to((10.0, -10.0), (20.0, -10.0), (20.0, 0.0));
+        }
+        let pd = PathData::from_bezpath(&bp);
+        assert_eq!(pd.subpaths.len(), 2);
+        assert_eq!(pd.subpaths[1].anchors[1].kind, AnchorKind::Smooth);
+        assert_eq!(pd.subpaths[0].anchors[1].kind, pd.subpaths[1].anchors[1].kind);
+    }
+
     #[test]
     fn anchors_serialize_compactly_and_read_v1_maps() {
         let corner = Anchor::corner(Point::new(1.0, 2.0));
diff --git a/crates/geom/src/units.rs b/crates/geom/src/units.rs
index f1077ffce..cc47fadb2 100644
--- a/crates/geom/src/units.rs
+++ b/crates/geom/src/units.rs
@@ -127,7 +127,10 @@ impl Unit {
         // Choose a major spacing (base × 1, 2, 5, 10…) at least ~60 px apart, or base / 2^n when zoomed in.
         let mut major = base;
         while major * zoom < 50.0 {
-            major *= if (major / base).log10().fract().abs() < 1e-9 { 2.0 } else { 2.5 };
+            let ratio = major / base;
+            let mantissa = ratio / 10f64.powf(ratio.log10().floor());
+            // 1 -> 2 -> 5 -> 10: double at mantissa 1 or 5, ×2.5 at mantissa 2.
+            major *= if (mantissa - 2.0).abs() < 1e-6 { 2.5 } else { 2.0 };
         }
         while major * zoom > 160.0 && major > base / 64.0 {
             major /= 2.0;
@@ -299,6 +302,12 @@ pub fn format_measure_prec(pt: f64, unit: Unit, decimals: usize) -> String {
 mod tests {
     use super::*;
 
+    #[test]
+    fn ruler_major_spacing_steps_1_2_5_10() {
+        assert!(close(Unit::Points.ruler_ticks(0.1).0, 720.0));
+        assert!(close(Unit::Points.ruler_ticks(0.01).0, 7200.0));
+    }
+
     fn p(s: &str) -> f64 {
         parse_measure(s, Unit::Points).unwrap()
     }
diff --git a/crates/idml/src/export.rs b/crates/idml/src/export.rs
index d7d0c04f9..35aab7bf4 100644
--- a/crates/idml/src/export.rs
+++ b/crates/idml/src/export.rs
@@ -14,6 +14,24 @@ use crate::names::{self, CHAR_BUILTINS, OBJECT_BUILTINS, PARA_BUILTINS, escape_i
 use crate::xml::{El, Node, document, document_with_pi};
 use crate::{DOM_VERSION, MIMETYPE, base64_encode};
 
+mod common;
+mod designmap;
+mod fonts_prefs;
+mod graphics;
+mod item;
+mod spread;
+mod story;
+mod styles;
+mod table;
+mod text_attrs;
+
+use common::pkg_root;
+pub(crate) use common::uid;
+use designmap::{CONTAINER, metadata_xmp};
+pub(crate) use item::corner_names;
+#[cfg(test)]
+pub(crate) use item::path_to_uri;
+
 const PKG_NS: &str = "http://ns.adobe.com/AdobeInDesign/idml/1.0/packaging";
 const NO_PARA_ID: &str = "ParagraphStyle/$ID/[No paragraph style]";
 const TOC_STYLE_ID: &str = "TOCStyle/Table of Contents";
@@ -71,67 +89,6 @@ fn zip_parts(parts: &[(String, Vec<u8>)]) -> Vec<u8> {
     w.finish().map(|c| c.into_inner()).unwrap_or_default()
 }
 
-pub(crate) fn uid(n: u64) -> String {
-    format!("u{n:x}")
-}
-
-fn p(name: &str, ty: &str, val: impl Into<String>) -> El {
-    El::new(name).attr("type", ty).text(val)
-}
-
-/// Insert a `<Properties>` element as the first child when there are any.
-fn with_props(mut el: El, props: Vec<El>) -> El {
-    if !props.is_empty() {
-        let mut pe = El::new("Properties");
-        pe.children = props.into_iter().map(Node::El).collect();
-        el.children.insert(0, Node::El(pe));
-    }
-    el
-}
-
-fn pkg_root(kind: &str) -> El {
-    El::new(&format!("idPkg:{kind}")).attr("xmlns:idPkg", PKG_NS).attr("DOMVersion", DOM_VERSION)
-}
-
-fn bool_s(b: bool) -> &'static str {
-    if b { "true" } else { "false" }
-}
-
-fn pct(v: f64) -> String {
-    num(v * 100.0)
-}
-
-/// (model, space, value) for a colour.
-fn color_value(c: &Color) -> (&'static str, String) {
-    match *c {
-        Color::Cmyk { c, m, y, k } => ("CMYK", format!("{} {} {} {}", pct(c as f64), pct(m as f64), pct(y as f64), pct(k as f64))),
-        Color::Rgb { r, g, b } => ("RGB", format!("{} {} {}", num(r as f64 * 255.0), num(g as f64 * 255.0), num(b as f64 * 255.0))),
-        Color::Gray { k } => ("CMYK", format!("0 0 0 {}", pct(k as f64))),
-    }
-}
-
-/// The IDML spread origin in our spread coordinates.
-pub(crate) fn spread_origin(sp: &Spread, facing: bool) -> (f64, f64) {
-    let h = sp.pages.iter().map(|p| p.height).fold(0.0, f64::max);
-    let b = sp.bounds();
-    let ox = if facing {
-        if let Some(r) = sp.pages.iter().find(|p| p.side == PageSide::Right) {
-            r.x
-        } else if let Some(l) = sp.pages.iter().rev().find(|p| p.side == PageSide::Left) {
-            l.x + l.width
-        } else {
-            b.center().x
-        }
-    } else {
-        b.center().x
-    };
-    (ox, h / 2.0)
-}
-
-fn affine_s(a: Affine) -> String {
-    a.as_coeffs().iter().map(|v| num(*v)).collect::<Vec<_>>().join(" ")
-}
-
 struct Ex<'a> {
     d: &'a Document,
     opts: &'a ExportOptions,
@@ -248,3137 +205,4 @@ impl<'a> Ex<'a> {
         parts.extend(story_parts);
         parts
     }
-
-    // ---------- designmap ----------
-
-    fn designmap(&mut self, masters: &[(String, Vec<u8>)], spreads: &[(String, Vec<u8>)], stories: &[(String, Vec<u8>)]) -> Vec<u8> {
-        let d = self.d;
-        let story_list: Vec<String> = d.stories.keys().map(|k| uid(k.0)).collect();
-        let mut root = El::new("Document")
-            .attr("xmlns:idPkg", PKG_NS)
-            .attr("DOMVersion", DOM_VERSION)
-            .attr("Self", "d")
-            .attr("StoryList", story_list.join(" "))
-            .attr("Name", format!("{}.indd", d.title))
-            .attr("ZeroPoint", {
-                let [x, y] = d.zero_point();
-                format!("{} {}", num(x), num(y))
-            })
-            .attr("ActiveLayer", d.layers.first().map(|l| uid(l.id.0)).unwrap_or_else(|| "n".into()));
-        root.push(
-            El::new("Language")
-                .attr("Self", "Language/$ID/[No Language]")
-                .attr("Name", "$ID/[No Language]")
-                .attr("SingleQuotes", "''")
-                .attr("DoubleQuotes", "\"\"")
-                .attr("PrimaryLanguageName", "$ID/[No Language]")
-                .attr("SublanguageName", "$ID/[No Language]")
-                .attr("Id", "0")
-                .attr("HyphenationVendor", "$ID/")
-                .attr("SpellingVendor", "$ID/"),
-        );
-        root.push(
-            El::new("Language")
-                .attr("Self", "Language/$ID/English%3a USA")
-                .attr("Name", "$ID/English: USA")
-                .attr("SingleQuotes", "\u{2018}\u{2019}")
-                .attr("DoubleQuotes", "\u{201C}\u{201D}")
-                .attr("PrimaryLanguageName", "$ID/English")
-                .attr("SublanguageName", "$ID/USA")
-                .attr("Id", "269")
-                .attr("HyphenationVendor", "Hunspell")
-                .attr("SpellingVendor", "Hunspell"),
-        );
-        let mut sets = std::collections::BTreeMap::new();
-        for a in d.styles.paragraph.iter().map(|p| &p.para).chain(d.stories.values().flat_map(|s| s.paras.iter().map(|p| &p.para))) {
-            if let Some(Some(k)) = &a.kinsoku
-                && !k.name.is_empty()
-            {
-                sets.insert(&k.name, k);
-            }
-        }
-        for k in sets.values() {
-            root.push(
-                El::new("KinsokuTable")
-                    .attr("Self", format!("KinsokuTable/{}", escape_id(&k.name)))
-                    .attr("Name", &k.name)
-                    .attr("CantBeginLineChars", &k.no_start)
-                    .attr("CantEndLineChars", &k.no_end)
-                    .attr("CantBeSeparatedChars", &k.inseparable)
-                    .attr("HangingPunctuationChars", &k.hanging),
-            );
-        }
-        for t in &d.styles.mojikumi_tables {
-            root.push(mojikumi_table_el(t));
-        }
-        root.push(El::new("idPkg:Graphic").attr("src", "Resources/Graphic.xml"));
-        root.push(El::new("idPkg:Fonts").attr("src", "Resources/Fonts.xml"));
-        root.push(El::new("idPkg:Styles").attr("src", "Resources/Styles.xml"));
-        root.push(
-            El::new("NumberingList")
-                .attr("Self", "NumberingList/$ID/[Default]")
-                .attr("Name", "$ID/[Default]")
-                .attr("ContinueNumbersAcrossStories", "false")
-                .attr("ContinueNumbersAcrossDocuments", "false"),
-        );
-        root.push(El::new("idPkg:Preferences").attr("src", "Resources/Preferences.xml"));
-        for c in &d.conditions {
-            root.push(
-                El::new("Condition")
-                    .attr("Self", format!("Condition/{}", escape_id(&c.name)))
-                    .attr("Name", &c.name)
-                    .attr("IndicatorColor", format!("{} {} {}", c.color[0], c.color[1], c.color[2]))
-                    .attr("IndicatorMethod", "UseUnderline")
-                    .attr("UnderlineIndicatorAppearance", "Solid")
-                    .attr("Visible", bool_s(c.visible)),
-            );
-        }
-        // Variables InDesign's cross-reference page/chapter blocks rely on.
-        for (name, ty) in [("XRefChapterNumber", "XrefChapterNumberType"), ("XRefPageNumber", "XrefPageNumberType")] {
-            let n = format!("<?AID 001b?>TV {name}");
-            root.push(El::new("TextVariable").attr("Self", format!("dTextVariablen{n}")).attr("Name", &n).attr("VariableType", ty));
-        }
-        for v in &d.text_variables {
-            root.push(text_variable_el(v));
-        }
-        // IDML lists layers back to front.
-        for l in d.layers.iter().rev() {
-            root.push(layer_el(l));
-        }
-        for (name, _) in masters {
-            root.push(El::new("idPkg:MasterSpread").attr("src", name));
-        }
-        for (name, _) in spreads {
-            root.push(El::new("idPkg:Spread").attr("src", name));
-        }
-        // Sections.
-        let mut secs = d.sections.clone();
-        secs.sort_by_key(|s| s.start);
-        if secs.is_empty() || secs[0].start != 0 {
-            secs.insert(
-                0,
-                designcraft_doc::Section {
-                    start: 0,
-                    start_number: Some(1),
-                    style: Default::default(),
-                    prefix: String::new(),
-                    marker: String::new(),
-                    include_prefix: false,
-                },
-            );
-        }
-        let total = d.page_count();
-        for (i, s) in secs.iter().enumerate() {
-            if s.start >= total {
-                continue;
-            }
-            let end = secs.get(i + 1).map(|n| n.start).unwrap_or(total).min(total);
-            let Some(page) = d.page(s.start) else { continue };
-            let mut el = El::new("Section")
-                .attr("Self", self.fresh())
-                .attr("Length", end.saturating_sub(s.start).max(1))
-                .attr("Name", &s.prefix)
-                .attr("ContinueNumbering", bool_s(s.start_number.is_none()))
-                .attr("IncludeSectionPrefix", bool_s(s.include_prefix));
-            if let Some(n) = s.start_number {
-                el.set("PageNumberStart", n);
-            }
-            el = el.attr("Marker", &s.marker).attr("PageStart", uid(page.id.0)).attr("SectionPrefix", &s.prefix);
-            root.push(with_props(el, vec![p("PageNumberStyle", "enumeration", names::number_style_out(s.style))]));
-        }
-        if !self.index_topics.is_empty() || !self.index_xrefs.is_empty() {
-            root.push(self.index_el());
-        }
-        // Formats before the stories whose sources apply them.
-        for (i, f) in d.xref_formats.iter().enumerate() {
-            root.push(xref_format_el(i, f));
-        }
-        for (name, _) in stories {
-            root.push(El::new("idPkg:Story").attr("src", name));
-        }
-        for (src, target) in self.xref_sources.clone() {
-            let mut h = El::new("Hyperlink")
-                .attr("Self", self.fresh())
-                .attr("Name", "Cross-Reference")
-                .attr("Source", &src)
-                .attr("Visible", "false")
-                .attr("Highlight", "None")
-                .attr("Width", "Thin")
-                .attr("BorderStyle", "Solid")
-                .attr("Hidden", "false")
-                .attr("DestinationUniqueKey", target & 0xFFFF_FFFF);
-            let mut props = El::new("Properties");
-            props.push(p("Destination", "object", anchor_self(target)));
-            h.push(props);
-            root.push(h);
-        }
-        // Root colour group: the Swatches panel order.
-        let mut cg =
-            El::new("ColorGroup").attr("Self", "ColorGroup/[Root Color Group]").attr("Name", "[Root Color Group]").attr("IsRootColorGroup", "true");
-        let mut seen = HashSet::new();
-        for s in &d.swatches {
-            let id = self.sw(&s.name);
-            if seen.insert(id.clone()) {
-                let n = seen.len() - 1;
-                cg.push(El::new("ColorGroupSwatch").attr("Self", format!("u{:x}ColorGroupSwatch{n:x}", self.next + 1)).attr("SwatchItemRef", id));
-            }
-        }
-        self.next += 1;
-        root.push(cg);
-        document_with_pi(
-            &root,
-            &format!("<?aid style=\"50\" type=\"document\" readerVersion=\"6.0\" featureSet=\"257\" product=\"{DOM_VERSION}(1)\" ?>"),
-        )
-    }
-
-    // ---------- Graphic.xml ----------
-
-    fn graphic_part(&mut self) -> Vec<u8> {
-        let d = self.d;
-        let mut root = pkg_root("Graphic");
-        let mut colors: Vec<El> = Vec::new();
-        let mut tints: Vec<El> = Vec::new();
-        let mut gradients: Vec<El> = Vec::new();
-        let mut inks: Vec<El> = Vec::new();
-        let color_el = |self_id: &str, name: &str, model: &str, c: &Color, over: &str, editable: bool, removable: bool, visible: bool| {
-            let (space, val) = color_value(c);
-            El::new("Color")
-                .attr("Self", self_id)
-                .attr("Model", model)
-                .attr("Space", space)
-                .attr("ColorValue", val)
-                .attr("ColorOverride", over)
-                .attr("AlternateSpace", "NoAlternateColor")
-                .attr("AlternateColorValue", "")
-                .attr("Name", name)
-                .attr("ColorEditable", bool_s(editable))
-                .attr("ColorRemovable", bool_s(removable))
-                .attr("Visible", bool_s(visible))
-                .attr("SwatchCreatorID", "7937")
-        };
-        // Specials (always present).
-        colors.push(color_el("Color/Black", "Black", "Process", &Color::cmyk(0.0, 0.0, 0.0, 1.0), "Specialblack", false, false, true));
-        let paper = match d.swatch(swatch::PAPER).map(|s| &s.value) {
-            Some(SwatchValue::Paper { color }) => *color,
-            _ => Color::cmyk(0.0, 0.0, 0.0, 0.0),
-        };
-        let paper = if paper == Color::WHITE { Color::cmyk(0.0, 0.0, 0.0, 0.0) } else { paper };
-        colors.push(color_el("Color/Paper", "Paper", "Process", &paper, "Specialpaper", true, false, true));
-        colors.push(color_el(
-            "Color/Registration",
-            "Registration",
-            "Registration",
-            &Color::cmyk(1.0, 1.0, 1.0, 1.0),
-            "Specialregistration",
-            false,
-            false,
-            true,
-        ));
-        for (i, ink) in
-            [("Process Cyan", 75, 0.61), ("Process Magenta", 15, 0.76), ("Process Yellow", 0, 0.16), ("Process Black", 45, 1.7)].iter().enumerate()
-        {
-            inks.push(
-                El::new("Ink")
-                    .attr("Self", format!("Ink/$ID/{}", ink.0))
-                    .attr("Name", format!("$ID/{}", ink.0))
-                    .attr("Angle", ink.1)
-                    .attr("ConvertToProcess", "false")
-                    .attr("Frequency", "70")
-                    .attr("NeutralDensity", num(ink.2))
-                    .attr("PrintInk", "true")
-                    .attr("TrapOrder", i + 1)
-                    .attr("InkType", "Normal"),
-            );
-        }
-        // Colour swatches, by value, for gradient stop lookup.
-        let mut by_value: Vec<(Color, String)> = Vec::new();
-        for s in &d.swatches {
-            if s.is_special() {
-                continue;
-            }
-            let id = self.sw(&s.name);
-            match &s.value {
-                SwatchValue::Color { color, color_type } => {
-                    let model = if *color_type == ColorType::Spot { "Spot" } else { "Process" };
-                    colors.push(color_el(&id, &s.name, model, color, "Normal", true, true, true));
-                    by_value.push((*color, id.clone()));
-                    if *color_type == ColorType::Spot {
-                        let mut ink = El::new("Ink");
-                        if let Some((_, to)) = d.inks.aliases.iter().find(|(a, _)| *a == s.name) {
-                            ink.set("AliasInkName", to);
-                        }
-                        let convert = d.inks.all_to_process || d.inks.to_process.contains(&s.name);
-                        inks.push(
-                            ink.attr("Self", format!("Ink/{}", escape_id(&s.name)))
-                                .attr("Name", &s.name)
-                                .attr("Angle", "45")
-                                .attr("ConvertToProcess", bool_s(convert))
-                                .attr("Frequency", "70")
-                                .attr("NeutralDensity", "0.5")
-                                .attr("PrintInk", "true")
-                                .attr("TrapOrder", inks.len() + 1)
-                                .attr("InkType", "Normal"),
-                        );
-                    }
-                }
-                SwatchValue::Tint { base, tint } => {
-                    tints.push(
-                        El::new("Tint")
-                            .attr("Self", &id)
-                            .attr("TintValue", pct(*tint as f64))
-                            .attr("BaseColor", self.sw(base))
-                            .attr("Name", &s.name)
-                            .attr("ColorOverride", "Normal")
-                            .attr("AlternateSpace", "NoAlternateColor")
-                            .attr("AlternateColorValue", "")
-                            .attr("ColorEditable", "true")
-                            .attr("ColorRemovable", "true")
-                            .attr("Visible", "true")
-                            .attr("SwatchCreatorID", "7937"),
-                    );
-                }
-                _ => {}
-            }
-        }
-        for s in &d.swatches {
-            let SwatchValue::Gradient { gradient } = &s.value else { continue };
-            let id = self.sw(&s.name);
-            let mut g = El::new("Gradient")
-                .attr("Self", &id)
-                .attr("Type", if gradient.kind == GradientKind::Radial { "Radial" } else { "Linear" })
-                .attr("Name", &s.name)
-                .attr("ColorEditable", "true")
-                .attr("ColorRemovable", "true")
-                .attr("Visible", "true")
-                .attr("SwatchCreatorID", "7937");
-            for (i, stop) in gradient.stops.iter().enumerate() {
-                let cid = match by_value.iter().find(|(c, _)| *c == stop.color) {
-                    Some((_, id)) => id.clone(),
-                    None => {
-                        let cid = format!("Color/{}", self.fresh());
-                        colors.push(color_el(&cid, "$ID/", "Process", &stop.color, "Normal", true, true, false));
-                        by_value.push((stop.color, cid.clone()));
-                        cid
-                    }
-                };
-                let mut e = El::new("GradientStop")
-                    .attr("Self", format!("{}GradientStop{i}", id.replace(['/', ' '], "_")))
-                    .attr("StopColor", cid)
-                    .attr("Location", pct(stop.offset as f64));
-                if i > 0 {
-                    e.set("Midpoint", pct(gradient.stops[i - 1].midpoint as f64));
-                }
-                g.push(e);
-            }
-            gradients.push(g);
-        }
-        for c in colors {
-            root.push(c);
-        }
-        for i in inks {
-            root.push(i);
-        }
-        for t in tints {
-            root.push(t);
-        }
-        root.push(
-            El::new("Swatch")
-                .attr("Self", "Swatch/None")
-                .attr("Name", "None")
-                .attr("ColorEditable", "false")
-                .attr("ColorRemovable", "false")
-                .attr("Visible", "true")
-                .attr("SwatchCreatorID", "7937"),
-        );
-        for g in gradients {
-            root.push(g);
-        }
-        for (gi, g) in d.color_groups.iter().enumerate() {
-            let mut el = El::new("ColorGroup")
-                .attr("Self", format!("ColorGroup/{}", escape_id(&g.name)))
-                .attr("Name", &g.name)
-                .attr("IsRootColorGroup", "false");
-            for (k, n) in g.swatches.iter().enumerate() {
-                if let Some(id) = self.swatch_ids.get(n) {
-                    el.push(El::new("ColorGroupSwatch").attr("Self", format!("u{gi}ColorGroupSwatch{k}")).attr("SwatchItemRef", id));
-                }
-            }
-            root.push(el);
-        }
-        for st in &d.stroke_styles {
-            let id = format!("CustomStrokeStyle/{}", st.name);
-            let pcts = |v: &[f64]| v.iter().map(|x| num(x * 100.0)).collect::<Vec<_>>().join(" ");
-            let el = match &st.kind {
-                designcraft_doc::StrokeType::Stripes { bands } => {
-                    let flat: Vec<f64> = bands.iter().flat_map(|(a, w)| [*a, a + w]).collect();
-                    Some(El::new("StripedStrokeStyle").attr("StripeArray", pcts(&flat)))
-                }
-                designcraft_doc::StrokeType::Dashed { pattern } => {
-                    Some(El::new("DashedStrokeStyle").attr("DashArray", pattern.iter().map(|x| num(*x)).collect::<Vec<_>>().join(" ")))
-                }
-                designcraft_doc::StrokeType::Dotted => Some(El::new("DottedStrokeStyle").attr("DotArray", "0 200")),
-                _ => None,
-            };
-            if let Some(el) = el {
-                root.push(el.attr("Self", id).attr("Name", &st.name));
-            }
-        }
-        for s in STROKE_STYLES {
-            root.push(El::new("StrokeStyle").attr("Self", format!("StrokeStyle/$ID/{s}")).attr("Name", format!("$ID/{s}")));
-        }
-        document(&root)
-    }
-
-    // ---------- Fonts.xml ----------
-
-    fn note_font(&mut self, family: &str, style: &str) {
-        self.fonts.entry(family.to_string()).or_default().insert(style.to_string());
-    }
-
-    fn fonts_part(&mut self) -> Vec<u8> {
-        let mut root = pkg_root("Fonts");
-        for f in &self.d.styles.composite_fonts {
-            let mut el = El::new("CompositeFont").attr("Self", format!("CompositeFont/{}", escape_id(&f.name))).attr("Name", &f.name);
-            for (i, e) in f.entries.iter().enumerate() {
-                self.note_font(&e.family, &e.style);
-                el.push(
-                    El::new("CompositeFontEntry")
-                        .attr("Self", format!("dcComposite{}_{i}", escape_id(&f.name)))
-                        .attr("Name", &e.name)
-                        .attr("CustomCharacters", &e.characters)
-                        .attr("FontStyle", &e.style)
-                        .attr("RelativeSize", num(e.relative_size * 100.0))
-                        .attr("HorizontalScale", num(e.horizontal_scale * 100.0))
-                        .attr("VerticalScale", num(e.vertical_scale * 100.0))
-                        .attr("BaselineShift", num(e.baseline_shift * 100.0))
-                        .attr("ScaleOption", bool_s(e.scale_option))
-                        .child(El::new("Properties").child(p("AppliedFont", "string", &e.family))),
-                );
-            }
-            root.push(el);
-        }
-        let fonts = std::mem::take(&mut self.fonts);
-        for (fam, styles) in &fonts {
-            let fid = format!("di{:x}", {
-                self.next += 1;
-                self.next
-            });
-            let mut fe = El::new("FontFamily").attr("Self", &fid).attr("Name", fam);
-            for s in styles {
-                fe.push(
-                    El::new("Font")
-                        .attr("Self", format!("{fid}Fontn{fam} {s}"))
-                        .attr("FontFamily", fam)
-                        .attr("Name", format!("{fam} {s}"))
-                        .attr("PostScriptName", format!("$ID/{}-{}", fam.replace(' ', ""), s.replace(' ', "")))
-                        .attr("Status", "NotAvailable")
-                        .attr("FontStyleName", s)
-                        .attr("FontType", "OpenTypeTT")
-                        .attr("WritingScript", "0")
-                        .attr("FullName", format!("{fam} {s}"))
-                        .attr("FullNameNative", format!("{fam} {s}"))
-                        .attr("FontStyleNameNative", s)
-                        .attr("PlatformName", "$ID/")
-                        .attr("Version", "$ID/")
-                        .attr("TypekitID", "$ID/"),
-                );
-            }
-            root.push(fe);
-        }
-        self.fonts = fonts;
-        document(&root)
-    }
-
-    // ---------- Preferences.xml ----------
-
-    fn prefs_part(&mut self) -> Vec<u8> {
-        let d = self.d;
-        let s = &d.settings;
-        let mut root = pkg_root("Preferences");
-        root.push(
-            El::new("DocumentPreference")
-                .attr("PageHeight", num(s.page_height))
-                .attr("PageWidth", num(s.page_width))
-                // InDesign creates this many pages before reading the spreads and replaces only the first
-                // spread, so (as InDesign itself writes) the value must be 1.
-                .attr("PagesPerDocument", 1)
-                .attr("FacingPages", bool_s(s.facing_pages))
-                .attr("DocumentBleedTopOffset", num(s.bleed[0]))
-                .attr("DocumentBleedBottomOffset", num(s.bleed[1]))
-                .attr("DocumentBleedInsideOrLeftOffset", num(s.bleed[2]))
-                .attr("DocumentBleedOutsideOrRightOffset", num(s.bleed[3]))
-                .attr("DocumentBleedUniformSize", bool_s(s.bleed.iter().all(|b| *b == s.bleed[0])))
-                .attr("SlugTopOffset", num(s.slug[0]))
-                .attr("SlugBottomOffset", num(s.slug[1]))
-                .attr("SlugInsideOrLeftOffset", num(s.slug[2]))
-                .attr("SlugRightOrOutsideOffset", num(s.slug[3]))
-                .attr("DocumentSlugUniformSize", bool_s(s.slug.iter().all(|b| *b == s.slug[0])))
-                .attr("PreserveLayoutWhenShuffling", "true")
-                .attr("AllowPageShuffle", "true")
-                .attr("OverprintBlack", bool_s(s.overprint_black))
-                .attr("PageBinding", if s.right_to_left_binding { "RightToLeft" } else { "LeftToRight" })
-                .attr("ColumnDirection", "Horizontal")
-                .attr(
-                    "Intent",
-                    match s.intent {
-                        designcraft_doc::Intent::Print => "PrintIntent",
-                        designcraft_doc::Intent::Web => "WebIntent",
-                        designcraft_doc::Intent::Mobile => "MobileIntent",
-                    },
-                )
-                .attr("CreatePrimaryTextFrame", bool_s(s.primary_text_frame))
-                .attr("ColumnGuideLocked", bool_s(s.column_guides_locked))
-                .attr("MasterTextFrame", bool_s(s.primary_text_frame))
-                .attr("SnippetImportUsesOriginalLocation", "false"),
-        );
-        let page = d.parents.first().and_then(|p| p.pages.first()).or_else(|| d.page(0));
-        if let Some(pg) = page {
-            root.push(margin_el(pg));
-        }
-        root.push(
-            El::new("ViewPreference")
-                .attr("HorizontalMeasurementUnits", names::unit_out(s.horizontal_units))
-                .attr("VerticalMeasurementUnits", names::unit_out(s.vertical_units))
-                .attr(
-                    "RulerOrigin",
-                    match s.ruler_origin {
-                        designcraft_doc::RulerOrigin::Spread => "SpreadOrigin",
-                        designcraft_doc::RulerOrigin::Page => "PageOrigin",
-                        designcraft_doc::RulerOrigin::Spine => "SpineOrigin",
-                    },
-                )
-                .attr("CursorKeyIncrement", num(s.keyboard_increment))
-                .attr("PointsPerInch", "72"),
-        );
-        let bg = &s.baseline_grid;
-        root.push(
-            El::new("GridPreference")
-                .attr("HorizontalGridlineDivision", num(s.grid.horizontal))
-                .attr("VerticalGridlineDivision", num(s.grid.vertical))
-                .attr("HorizontalGridSubdivision", s.grid.subdivisions)
-                .attr("VerticalGridSubdivision", s.grid.subdivisions)
-                .attr("GridsInBack", bool_s(s.grid.in_back))
-                .attr("BaselineStart", num(bg.start))
-                .attr("BaselineDivision", num(bg.increment))
-                .attr("BaselineViewThreshold", pct(bg.view_threshold))
-                .attr(
-                    "BaselineGridRelativeOption",
-                    match bg.relative_to {
-                        designcraft_doc::GridRelative::TopOfPage => "TopOfPageOfBaselineGridRelativeOption",
-                        designcraft_doc::GridRelative::TopMargin => "TopOfMarginOfBaselineGridRelativeOption",
-                    },
-                ),
-        );
-        root.push(El::new("PasteboardPreference").attr("PasteboardMargins", pt(s.pasteboard.0, s.pasteboard.1)));
-        root.push(self.footnote_option_el());
-        root.push(El::new("TransparencyPreference").attr(
-            "BlendingSpace",
-            match s.blend_space {
-                designcraft_doc::BlendSpace::Cmyk => "CMYK",
-                designcraft_doc::BlendSpace::Rgb => "RGB",
-            },
-        ));
-        let a = &s.advanced_type;
-        root.push(
-            El::new("TextPreference")
-                .attr("SuperscriptSize", num(a.superscript_size))
-                .attr("SuperscriptPosition", num(a.superscript_position))
-                .attr("SubscriptSize", num(a.subscript_size))
-                .attr("SubscriptPosition", num(a.subscript_position)),
-        );
-        document(&root)
-    }
-
-    // ---------- Styles.xml ----------
-
-    fn styles_part(&mut self) -> Vec<u8> {
-        let d = self.d;
-        let styles = d.styles.clone();
-        let mut root = pkg_root("Styles");
-
-        // Character styles.
-        let mut cg = Group::default();
-        for cs in &styles.character {
-            let id = names::style_self("CharacterStyle", CHAR_BUILTINS, &cs.name);
-            let mut el =
-                El::new("CharacterStyle").attr("Self", &id).attr("Imported", "false").attr("Name", names::style_name_out(CHAR_BUILTINS, &cs.name));
-            let mut props = Vec::new();
-            if cs.name != st::NO_CHAR_STYLE {
-                let based = cs.based_on.as_deref().filter(|b| *b != st::NO_CHAR_STYLE);
-                match based {
-                    Some(b) => props.push(p("BasedOn", "object", names::style_self("CharacterStyle", CHAR_BUILTINS, b))),
-                    None => props.push(p("BasedOn", "string", "$ID/[No character style]")),
-                }
-                self.char_attrs(&mut el, &mut props, &cs.chars);
-            }
-            cg.insert(&cs.name, with_props(el, props));
-        }
-        let mut rc = El::new("RootCharacterStyleGroup").attr("Self", self.fresh());
-        cg.emit(&mut rc, "CharacterStyleGroup", "");
-        root.push(rc);
-
-        // Paragraph styles.
-        let mut pg = Group::default();
-        for ps in &styles.paragraph {
-            let id = names::style_self("ParagraphStyle", PARA_BUILTINS, &ps.name);
-            let mut el =
-                El::new("ParagraphStyle").attr("Self", &id).attr("Name", names::style_name_out(PARA_BUILTINS, &ps.name)).attr("Imported", "false");
-            let mut props = Vec::new();
-            let (pa, ca) = if ps.name == designcraft_doc::NO_PARA_STYLE {
-                // The root style carries the complete attribute set.
-                let mut pa = designcraft_doc::ParaProps::common([&designcraft_doc::ParaProps::default()]);
-                pa.merge(&ps.para);
-                let mut ca = designcraft_doc::CharProps::common([&designcraft_doc::CharProps::default()]);
-                ca.merge(&ps.chars);
-                (pa, ca)
-            } else {
-                let next = ps.next_style.as_deref().unwrap_or(&ps.name);
-                el.set("NextStyle", names::style_self("ParagraphStyle", PARA_BUILTINS, next));
-                match ps.based_on.as_deref().filter(|b| *b != designcraft_doc::NO_PARA_STYLE) {
-                    Some(b) => props.push(p("BasedOn", "object", names::style_self("ParagraphStyle", PARA_BUILTINS, b))),
-                    None => props.push(p("BasedOn", "string", "$ID/[No paragraph style]")),
-                }
-                (ps.para.clone(), ps.chars.clone())
-            };
-            let parent = (ps.name != designcraft_doc::NO_PARA_STYLE).then(|| ps.based_on.as_deref().unwrap_or(designcraft_doc::NO_PARA_STYLE));
-            let parent_props = match ps.based_on.as_deref() {
-                Some(b) if ps.name != designcraft_doc::NO_PARA_STYLE => styles.resolve_para_style(b).0,
-                _ => designcraft_doc::ParaProps::default(),
-            };
-            let pa = with_list_tab(pa, || (styles.resolve_para_style(&ps.name).0, parent_props));
-            self.para_attrs(&mut el, &mut props, &pa, parent);
-            self.char_attrs(&mut el, &mut props, &ca);
-            pg.insert(&ps.name, with_props(el, props));
-        }
-        let mut rp = El::new("RootParagraphStyleGroup").attr("Self", self.fresh());
-        pg.emit(&mut rp, "ParagraphStyleGroup", "");
-        root.push(rp);
-
-        // Cell and table styles.
-        let mut cells = El::new("RootCellStyleGroup")
-            .attr("Self", self.fresh())
-            .child(El::new("CellStyle").attr("Self", "CellStyle/$ID/[None]").attr("AppliedParagraphStyle", NO_PARA_ID).attr("Name", "$ID/[None]"));
-        for cs in styles.cell.iter().filter(|c| c.name != designcraft_doc::NO_CELL_STYLE) {
-            let mut el = El::new("CellStyle")
-                .attr("Self", names::style_self("CellStyle", names::CELL_BUILTINS, &cs.name))
-                .attr("Name", names::style_name_out(names::CELL_BUILTINS, &cs.name));
-            if let Some(f) = &cs.fill {
-                el.set("FillColor", self.sw(f));
-            }
-            if let Some(t) = cs.fill_tint {
-                el.set("FillTint", pct(t as f64));
-            }
-            if let Some(i) = cs.insets {
-                for (k, v) in ["TopInset", "LeftInset", "BottomInset", "RightInset"].iter().zip(i) {
-                    el.set(k, num(v));
-                }
-            }
-            for (key, value) in ["TopInset", "LeftInset", "BottomInset", "RightInset"].iter().zip(cs.inset_overrides) {
-                if let Some(value) = value {
-                    el.set(key, num(value));
-                }
-            }
-            if let Some(vj) = cs.vj {
-                el.set("VerticalJustification", names::vj_out(vj));
-            }
-            if let Some(fb) = cs.first_baseline {
-                el.set("FirstBaselineOffset", names::first_baseline_out(fb));
-            }
-            if let Some(min) = cs.first_baseline_min {
-                el.set("MinimumFirstBaselineOffset", num(min));
-            }
-            if let Some(st) = &cs.stroke {
-                for side in ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"] {
-                    self.cell_stroke_attrs(&mut el, side, st);
-                }
-            }
-            for (side, attrs) in ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"].iter().zip(&cs.strokes) {
-                self.partial_cell_stroke_attrs(&mut el, side, attrs);
-            }
-            if let Some(ps) = &cs.paragraph_style {
-                el.set("AppliedParagraphStyle", names::style_self("ParagraphStyle", PARA_BUILTINS, ps));
-            }
-            let base = cs.based_on.as_deref().unwrap_or(designcraft_doc::NO_CELL_STYLE);
-            let based_on = if base == designcraft_doc::NO_CELL_STYLE {
-                p("BasedOn", "string", "$ID/[None]")
-            } else {
-                p("BasedOn", "object", names::style_self("CellStyle", names::CELL_BUILTINS, base))
-            };
-            cells = cells.child(with_props(el, vec![based_on]));
-        }
-        root.push(cells);
-        let mut tables = El::new("RootTableStyleGroup").attr("Self", self.fresh());
-        if !styles.table.iter().any(|s| s.name == designcraft_doc::NO_TABLE_STYLE) {
-            tables.push(El::new("TableStyle").attr("Self", "TableStyle/$ID/[No table style]").attr("Name", "$ID/[No table style]"));
-        }
-        if !styles.table.iter().any(|s| s.name == designcraft_doc::BASIC_TABLE) {
-            tables.push(with_props(
-                El::new("TableStyle").attr("Self", "TableStyle/$ID/[Basic Table]").attr("Name", "$ID/[Basic Table]"),
-                vec![p("BasedOn", "string", "$ID/[No table style]")],
-            ));
-        }
-        for ts in &styles.table {
-            let mut el = El::new("TableStyle")
-                .attr("Self", names::style_self("TableStyle", names::TABLE_BUILTINS, &ts.name))
-                .attr("Name", names::style_name_out(names::TABLE_BUILTINS, &ts.name));
-            for (k, v) in [
-                ("HeaderRegionCellStyle", &ts.header),
-                ("BodyRegionCellStyle", &ts.body),
-                ("FooterRegionCellStyle", &ts.footer),
-                ("LeftColumnRegionCellStyle", &ts.left_column),
-                ("RightColumnRegionCellStyle", &ts.right_column),
-            ] {
-                if let Some(n) = v {
-                    el.set(k, names::style_self("CellStyle", names::CELL_BUILTINS, n));
-                }
-            }
-            for (key, value) in [
-                ("HeaderRegionSameAsBodyRegion", ts.header_same_as_body),
-                ("FooterRegionSameAsBodyRegion", ts.footer_same_as_body),
-                ("LeftColumnRegionSameAsBodyRegion", ts.left_column_same_as_body),
-                ("RightColumnRegionSameAsBodyRegion", ts.right_column_same_as_body),
-            ] {
-                if let Some(value) = value {
-                    el.set(key, value);
-                }
-            }
-            if let Some(b) = &ts.border {
-                for side in ["Top", "Left", "Bottom", "Right"] {
-                    self.cell_stroke_attrs(&mut el, &format!("{side}Border"), b);
-                }
-            }
-            for (side, attrs) in ["TopBorder", "LeftBorder", "BottomBorder", "RightBorder"].iter().zip(&ts.borders) {
-                self.partial_cell_stroke_attrs(&mut el, side, attrs);
-            }
-            if let Some(a) = &ts.alt_rows {
-                el.set("StartRowFillColor", self.sw(&a.first_color));
-                el.set("StartRowFillCount", a.first);
-                el.set("StartRowFillTint", pct(a.first_tint as f64));
-                el.set("EndRowFillColor", self.sw(&a.next_color));
-                el.set("EndRowFillCount", a.next);
-                el.set("EndRowFillTint", pct(a.next_tint as f64));
-            }
-            self.partial_alt_fill_attrs(&mut el, "Row", &ts.row_fills);
-            self.partial_alt_fill_attrs(&mut el, "Column", &ts.column_fills);
-            self.partial_alt_stroke_attrs(&mut el, "Row", &ts.row_strokes);
-            self.partial_alt_stroke_attrs(&mut el, "Column", &ts.column_strokes);
-            if let Some(v) = ts.space_before {
-                el.set("SpaceBefore", num(v));
-            }
-            if let Some(v) = ts.space_after {
-                el.set("SpaceAfter", num(v));
-            }
-            let mut props = Vec::new();
-            if ts.name != designcraft_doc::NO_TABLE_STYLE {
-                let base = ts.based_on.as_deref().unwrap_or(designcraft_doc::NO_TABLE_STYLE);
-                props.push(if base == designcraft_doc::NO_TABLE_STYLE {
-                    p("BasedOn", "string", "$ID/[No table style]")
-                } else {
-                    p("BasedOn", "object", names::style_self("TableStyle", names::TABLE_BUILTINS, base))
-                });
-            }
-            tables = tables.child(with_props(el, props));
-        }
-        root.push(tables);
-        // Named numbered lists.
-        for l in &self.d.settings.lists {
-            root.push(
-                El::new("NumberingList")
-                    .attr("Self", format!("NumberingList/{}", escape_id(&l.name)))
-                    .attr("Name", &l.name)
-                    .attr("ContinueNumbersAcrossStories", bool_s(l.continue_across_stories))
-                    .attr("ContinueNumbersAcrossDocuments", "false"),
-            );
-        }
-
-        // Object styles.
-        let mut og = Group::default();
-        let mut have: Vec<&str> = styles.object.iter().map(|o| o.name.as_str()).collect();
-        let defaults = designcraft_doc::Styles::default();
-        let mut all: Vec<designcraft_doc::ObjectStyle> = styles.object.clone();
-        for b in &defaults.object {
-            if !have.contains(&b.name.as_str()) {
-                all.push(b.clone());
-                have.push(&b.name);
-            }
-        }
-        for os in &all {
-            let id = names::style_self("ObjectStyle", OBJECT_BUILTINS, &os.name);
-            let mut el = El::new("ObjectStyle").attr("Self", &id).attr("Name", names::style_name_out(OBJECT_BUILTINS, &os.name));
-            let mut props = Vec::new();
-            if os.name != designcraft_doc::NO_OBJECT_STYLE {
-                match os.based_on.as_deref().filter(|b| *b != designcraft_doc::NO_OBJECT_STYLE) {
-                    Some(b) => props.push(p("BasedOn", "object", names::style_self("ObjectStyle", OBJECT_BUILTINS, b))),
-                    None => props.push(p("BasedOn", "string", "$ID/[None]")),
-                }
-            }
-            el.set("EnableFill", bool_s(os.fill.is_some()));
-            el.set("EnableStroke", bool_s(os.stroke.is_some()));
-            el.set("EnableParagraphStyle", bool_s(os.paragraph_style.is_some()));
-            el.set("EnableTextFrameGeneralOptions", bool_s(os.text_frame.is_some()));
-            if let Some(f) = &os.fill {
-                el.set("FillColor", self.sw(&f.swatch));
-                el.set("FillTint", pct(f.tint as f64));
-            }
-            if let Some(s) = &os.stroke {
-                self.stroke_attrs(&mut el, s);
-            }
-            if let Some(ps) = &os.paragraph_style {
-                el.set("AppliedParagraphStyle", names::style_self("ParagraphStyle", PARA_BUILTINS, ps));
-            }
-            let mut el = with_props(el, props);
-            if let Some(e) = &os.effects {
-                let mut t = El::new("TransparencySetting");
-                for c in self.effect_els(e, true) {
-                    t.push(c);
-                }
-                el.push(t);
-            }
-            if let Some(tf) = &os.text_frame {
-                el.push(text_frame_pref(tf, &self.sw(&tf.column_rule_color)));
-            }
-            // Effects: a style with effects sets the drop shadow and feather, never blending.
-            let on = bool_s(os.effects.is_some());
-            el.push(
-                El::new("ObjectStyleObjectEffectsCategorySettings")
-                    .attr("EnableTransparency", "false")
-                    .attr("EnableDropShadow", on)
-                    .attr("EnableFeather", on)
-                    .attr("EnableInnerShadow", "false")
-                    .attr("EnableOuterGlow", "false")
-                    .attr("EnableInnerGlow", "false")
-                    .attr("EnableBevelEmboss", "false")
-                    .attr("EnableSatin", "false")
-                    .attr("EnableDirectionalFeather", "false")
-                    .attr("EnableGradientFeather", "false"),
-            );
-            og.insert(&os.name, el);
-        }
-        let mut ro = El::new("RootObjectStyleGroup").attr("Self", self.fresh());
-        og.emit(&mut ro, "ObjectStyleGroup", "");
-        root.push(ro);
-        if let Some(toc) = d.toc.as_ref().filter(|t| d.story(t.story).is_some()) {
-            root.push(self.toc_style_el(toc));
-        }
-        document(&root)
-    }
-
-    /// The document's table of contents as a TOC style; its story names it in `AppliedTOCStyle`.
-    fn toc_style_el(&mut self, toc: &designcraft_doc::Toc) -> El {
-        let para = |n: &str| names::style_self("ParagraphStyle", PARA_BUILTINS, n);
-        let chars = |n: Option<&str>| names::style_self("CharacterStyle", CHAR_BUILTINS, n.unwrap_or(designcraft_doc::NO_CHAR_STYLE));
-        let mut el = El::new("TOCStyle")
-            .attr("Self", TOC_STYLE_ID)
-            .attr("Name", TOC_STYLE_NAME)
-            .attr("Title", &toc.title)
-            .attr("TitleStyle", para(toc.title_style.as_deref().unwrap_or("TOC Title")))
-            .attr("RunIn", "false")
-            .attr("IncludeHidden", "false")
-            .attr("IncludeBookDocuments", "false")
-            .attr("CreatePdfBookmarks", "false");
-        for e in &toc.entries {
-            let format = e.entry_style.clone().unwrap_or_else(|| format!("TOC Level {}", e.level));
-            let position = match e.page_number {
-                _ if !toc.page_numbers => "NoPageNumber",
-                designcraft_doc::TocPageNumber::After => "AfterEntry",
-                designcraft_doc::TocPageNumber::Before => "BeforeEntry",
-                designcraft_doc::TocPageNumber::None => "NoPageNumber",
-            };
-            el.push(
-                El::new("TOCStyleEntry")
-                    .attr("Self", self.fresh())
-                    .attr("Name", names::style_name_out(PARA_BUILTINS, &e.style))
-                    .attr("FormatStyle", para(&format))
-                    .attr("Level", e.level)
-                    .attr("PageNumberPosition", position)
-                    .attr("Separator", names::toc_separator_out(e.separator.as_deref().unwrap_or("\t")))
-                    .attr("PageNumberStyle", chars(e.page_number_style.as_deref()))
-                    .attr("SeparatorStyle", chars(e.separator_style.as_deref()))
-                    .attr("Sort", if e.sort { "true" } else { "false" }),
-            );
-        }
-        el
-    }
-
-    fn char_attrs(&mut self, el: &mut El, props: &mut Vec<El>, a: &CharAttrs) {
-        if let Some(v) = a.leading_aki {
-            el.set("LeadingAki", num(v.unwrap_or(-1.0)));
-        }
-        if let Some(v) = a.trailing_aki {
-            el.set("TrailingAki", num(v.unwrap_or(-1.0)));
-        }
-        if let Some(v) = a.tsume {
-            el.set("Tsume", num(v * 100.0));
-        }
-        if let Some(v) = a.jidori {
-            el.set("Jidori", v);
-        }
-        if let Some(v) = a.leading_model {
-            el.set("LeadingModel", crate::cjk::leading_out(v));
-        }
-        if let Some(v) = a.character_alignment {
-            el.set("CharacterAlignment", crate::cjk::alignment_out(v));
-        }
-        if let Some(f) = &a.font_family {
-            if let Some(composite) = self.d.styles.composite_font(f) {
-                props.push(p("AppliedFont", "object", format!("CompositeFont/{}", escape_id(&composite.name))));
-            } else {
-                props.push(p("AppliedFont", "string", f.clone()));
-                let style = a.font_style.clone().unwrap_or_else(|| "Regular".into());
-                self.note_font(f, &style);
-            }
-        }
-        if let Some(v) = &a.font_style {
-            el.set("FontStyle", v);
-        }
-        if let Some(v) = a.size {
-            el.set("PointSize", num(v));
-        }
-        if let Some(l) = a.leading {
-            let (v, ty) = names::leading_out(l);
-            props.push(p("Leading", ty, v));
-        }
-        if let Some(k) = a.kerning {
-            match k {
-                designcraft_doc::Kerning::Metrics => el.set("KerningMethod", "$ID/Metrics"),
-                designcraft_doc::Kerning::Optical => el.set("KerningMethod", "$ID/Optical"),
-                designcraft_doc::Kerning::None => el.set("KerningMethod", "None"),
-                designcraft_doc::Kerning::Manual(v) => el.set("KerningValue", num(v)),
-            }
-        }
-        if let Some(v) = a.tracking {
-            el.set("Tracking", num(v));
-        }
-        if let Some(v) = a.h_scale {
-            el.set("HorizontalScale", pct(v));
-        }
-        if let Some(v) = a.v_scale {
-            el.set("VerticalScale", pct(v));
-        }
-        if let Some(v) = a.baseline_shift {
-            el.set("BaselineShift", num(v));
-        }
-        if let Some(v) = a.skew {
-            el.set("Skew", num(v));
-        }
-        if let Some(v) = &a.fill {
-            el.set("FillColor", self.sw(v));
-        }
-        if let Some(v) = a.fill_tint {
-            el.set("FillTint", pct(v as f64));
-        }
-        if let Some(v) = &a.stroke {
-            el.set("StrokeColor", self.sw(v));
-        }
-        if let Some(v) = a.stroke_tint {
-            el.set("StrokeTint", pct(v as f64));
-        }
-        if let Some(v) = a.stroke_weight {
-            el.set("StrokeWeight", num(v));
-        }
-        if let Some(v) = a.stroke_behind_fill {
-            el.set("StrokeAlignment", if v { "OutsideAlignment" } else { "CenterAlignment" });
-        }
-        if let Some(v) = a.capitalization {
-            el.set("Capitalization", names::caps_out(v));
-        }
-        if let Some(v) = a.position {
-            el.set("Position", names::position_out(v));
-        }
-        if let Some(v) = a.underline {
-            el.set("Underline", bool_s(v));
-        }
-        if let Some(v) = a.strikethrough {
-            el.set("StrikeThru", bool_s(v));
-        }
-        if let Some(v) = a.ligatures {
-            el.set("Ligatures", bool_s(v));
-        }
-        for (k, w, o, c, t) in [
-            ("Underline", a.underline_weight, a.underline_offset, &a.underline_color, a.underline_tint),
-            ("StrikeThru", a.strikethrough_weight, a.strikethrough_offset, &a.strikethrough_color, a.strikethrough_tint),
-        ] {
-            if let Some(w) = w {
-                el.set(&format!("{k}Weight"), num(w.unwrap_or(-9999.0)));
-            }
-            if let Some(o) = o {
-                el.set(&format!("{k}Offset"), num(o.unwrap_or(-9999.0)));
-            }
-            if let Some(c) = c {
-                el.set(&format!("{k}Color"), if c.is_empty() { "Text Color".into() } else { self.sw(c) });
-            }
-            if let Some(t) = t {
-                el.set(&format!("{k}Tint"), num(t as f64 * 100.0));
-            }
-        }
-        if let Some(list) = &a.otf_features {
-            for (tag, _, attr) in designcraft_doc::otf::TOGGLES {
-                el.set(attr, bool_s(designcraft_doc::otf::is_on(list, tag)));
-            }
-            let fig = designcraft_doc::otf::figures(list);
-            if let Some(f) = designcraft_doc::otf::FIGURES.iter().find(|f| f.0 == fig) {
-                el.set("OTFFigureStyle", f.3);
-            }
-            el.set("OTFStylisticSets", designcraft_doc::otf::stylistic_sets(list).to_string());
-        }
-        if let Some(v) = &a.glyph_form {
-            el.set("GlyphForm", v);
-        }
-        if let Some(v) = a.no_break {
-            el.set("NoBreak", bool_s(v));
-        }
-        if let Some(v) = a.digits {
-            el.set("DigitsType", names::digits_out(v));
-        }
-        if let Some(v) = a.character_direction {
-            el.set("CharacterDirection", crate::arabic::direction_out(v));
-        }
-        if let Some(v) = a.allow_kashidas {
-            el.set("Kashidas", if v { "DefaultKashidas" } else { "KashidasOff" });
-        }
-        if let Some(v) = a.diacritic_position {
-            el.set("DiacriticPosition", crate::arabic::diacritic_out(v));
-        }
-        if let Some(v) = a.diacritic_x_offset {
-            el.set("XOffsetDiacritic", num(v));
-        }
-        if let Some(v) = a.diacritic_y_offset {
-            el.set("YOffsetDiacritic", num(v));
-        }
-        if let Some(v) = &a.positional_form {
-            el.set("PositionalForm", v);
-        }
-        if let Some(r) = a.ruby.as_ref() {
-            el.set("RubyFlag", if r.is_empty() { "0" } else { "1" });
-            el.set("RubyString", r.as_str());
-        }
-        if let Some((family, style)) = crate::ruby::write(el, props, a, |n| self.sw(n)) {
-            self.note_font(&family, &style);
-        }
-        if let Some(k) = a.kenten {
-            el.set("KentenKind", if k { "KentenSesameDot" } else { "None" });
-        }
-        if let Some(c) = &a.kenten_character
-            && !c.is_empty()
-        {
-            el.set("KentenKind", "Custom");
-            el.set("KentenCustomCharacter", c);
-        }
-        if let Some(v) = a.tate_chu_yoko_x_offset {
-            el.set("TatechuyokoXOffset", num(v));
-        }
-        if let Some(v) = a.tate_chu_yoko_y_offset {
-            el.set("TatechuyokoYOffset", num(v));
-        }
-        if let Some(v) = a.tate_chu_yoko {
-            el.set("Tatechuyoko", bool_s(v));
-        }
-        if let Some(v) = a.warichu {
-            el.set("Warichu", bool_s(v));
-        }
-        if let Some(v) = a.warichu_lines {
-            el.set("WarichuLines", v);
-        }
-        if let Some(v) = a.warichu_size {
-            el.set("WarichuSize", num(v));
-        }
-        if let Some(v) = a.warichu_line_spacing {
-            el.set("WarichuLineSpacing", num(v));
-        }
-        if let Some(v) = a.warichu_alignment {
-            el.set("WarichuAlignment", crate::cjk::warichu_align_out(v));
-        }
-        if let Some(v) = a.warichu_chars_before_break {
-            el.set("WarichuCharsBeforeBreak", v);
-        }
-        if let Some(v) = a.warichu_chars_after_break {
-            el.set("WarichuCharsAfterBreak", v);
-        }
-        self.cjk_settings_chars(el, props, a);
-        if let Some(list) = &a.conditions {
-            el.set("AppliedConditions", list.iter().map(|c| format!("Condition/{}", escape_id(c))).collect::<Vec<_>>().join(" "));
-        }
-        if let Some(v) = &a.language {
-            el.set("AppliedLanguage", format!("$ID/{v}"));
-        }
-    }
-
-    /// Write paragraph attributes `a`, set over the resolved paragraph style `parent` (`None` for the
-    /// root style).
-    fn para_attrs(&mut self, el: &mut El, props: &mut Vec<El>, a: &ParaAttrs, parent: Option<&str>) {
-        if let Some(v) = &a.mojikumi {
-            props.push(p("Mojikumi", if v.starts_with("MojikumiTable/") { "object" } else { "enumeration" }, v));
-        }
-        if let Some(v) = &a.kinsoku_type {
-            el.set("KinsokuType", v);
-        }
-        if let Some(v) = a.kinsoku_hang {
-            el.set(
-                "KinsokuHangType",
-                match v {
-                    designcraft_doc::cjk::KinsokuHang::None => "None",
-                    designcraft_doc::cjk::KinsokuHang::Regular => "KinsokuHangRegular",
-                    designcraft_doc::cjk::KinsokuHang::Force => "KinsokuHangForce",
-                },
-            );
-        }
-        if let Some(v) = a.bunri_kinshi {
-            el.set("BunriKinshi", bool_s(v));
-        }
-        if let Some(v) = a.rensuuji {
-            el.set("Rensuuji", bool_s(v));
-        }
-        if let Some(v) = a.treat_ideographic_space_as_space {
-            el.set("TreatIdeographicSpaceAsSpace", bool_s(v));
-        }
-        cjk_settings_para(el, a);
-        if let Some(Some(k)) = &a.kinsoku {
-            props.push(p(
-                "KinsokuSet",
-                if k.name.is_empty() { "enumeration" } else { "object" },
-                if k.name.is_empty() { "Nothing".into() } else { format!("KinsokuTable/{}", escape_id(&k.name)) },
-            ));
-        }
-        if let Some(n) = &a.list_name {
-            el.set(
-                "AppliedNumberingList",
-                if n.is_empty() { "NumberingList/$ID/[Default]".to_string() } else { format!("NumberingList/{}", escape_id(n)) },
-            );
-        }
-        if let Some(v) = a.start_at {
-            match v {
-                Some(n) => {
-                    el.set("NumberingContinue", "false");
-                    el.set("NumberingStartAt", n);
-                }
-                None => el.set("NumberingContinue", "true"),
-            }
-        }
-        // Nested and GREP styles: property lists of records. The drop cap's character style is the
-        // nested style list's leading "through 1 Dropcap" entry (IDML has no attribute for it): a
-        // drop cap style set here (`[None]` included) restyles that entry, and a real one is
-        // inserted where there is none. Without a list of its own, the inherited list is written
-        // when that is what carries the drop cap style, since any list replaces the inherited one.
-        let real = |s: &str| !s.is_empty() && s != st::NO_CHAR_STYLE;
-        let cap = a.drop_cap_style.as_deref().filter(|s| !s.is_empty());
-        let mut list = a.nested_styles.clone();
-        if let (Some(cap), None) = (cap, &list) {
-            let inherited = parent.map(|n| self.d.styles.resolve_para_style(n).0);
-            let inherited_cap = inherited
-                .as_ref()
-                .is_some_and(|pp| real(&pp.drop_cap_style) || pp.nested_styles.first().is_some_and(|ns| ns.is_drop_cap() && real(&ns.style)));
-            if real(cap) || inherited_cap {
-                list = Some(inherited.map(|pp| pp.nested_styles).unwrap_or_default());
-            }
-        }
-        if let (Some(cap), Some(list)) = (cap, list.as_mut()) {
-            match list.first_mut() {
-                Some(ns) if ns.is_drop_cap() => ns.style = cap.to_string(),
-                _ if real(cap) => list.insert(0, designcraft_doc::NestedStyle::drop_cap(cap)),
-                _ => {}
-            }
-        }
-        if let Some(list) = &list {
-            let mut l = El::new("AllNestedStyles").attr("type", "list");
-            for ns in list {
-                let (ty, delim) = names::nested_until_out(&ns.until);
-                l = l.child(
-                    El::new("ListItem")
-                        .attr("type", "record")
-                        .child(p("AppliedCharacterStyle", "object", names::style_self("CharacterStyle", CHAR_BUILTINS, &ns.style)))
-                        .child(p("Delimiter", ty, delim))
-                        .child(p("Repetition", "long", ns.count.to_string()))
-                        .child(p("Inclusive", "boolean", bool_s(ns.through))),
-                );
-            }
-            props.push(l);
-        }
-        if let Some(list) = &a.nested_line_styles {
-            let mut l = El::new("AllNestedLineStyles").attr("type", "list");
-            for ns in list {
-                l = l.child(
-                    El::new("ListItem")
-                        .attr("type", "record")
-                        .child(p("AppliedCharacterStyle", "object", names::style_self("CharacterStyle", CHAR_BUILTINS, &ns.style)))
-                        .child(p("LineCount", "long", ns.lines.to_string())),
-                );
-            }
-            props.push(l);
-        }
-        if let Some(list) = &a.grep_styles {
-            let mut l = El::new("AllGREPStyles").attr("type", "list");
-            for g in list {
-                l = l.child(
-                    El::new("ListItem")
-                        .attr("type", "record")
-                        .child(p("AppliedCharacterStyle", "object", names::style_self("CharacterStyle", CHAR_BUILTINS, &g.style)))
-                        .child(p("GrepExpression", "string", g.pattern.clone())),
-                );
-            }
-            props.push(l);
-        }
-        macro_rules! n {
-            ($f:ident, $k:literal) => {
-                if let Some(v) = a.$f {
-                    el.set($k, num(v as f64));
-                }
-            };
-            ($f:ident, $k:literal, pct) => {
-                if let Some(v) = a.$f {
-                    el.set($k, pct(v as f64));
-                }
-            };
-        }
-        macro_rules! b {
-            ($f:ident, $k:literal) => {
-                if let Some(v) = a.$f {
-                    el.set($k, bool_s(v));
-                }
-            };
-        }
-        if let Some(v) = a.align {
-            el.set("Justification", names::align_out(v));
-        }
-        if let Some(v) = a.direction {
-            el.set(
-                "ParagraphDirection",
-                if v == designcraft_doc::TextDirection::RightToLeft { "RightToLeftDirection" } else { "LeftToRightDirection" },
-            );
-        }
-        if let Some(v) = a.kashidas {
-            el.set("Kashidas", if v { "DefaultKashidas" } else { "KashidasOff" });
-        }
-        if let Some(v) = &a.arabic_justification {
-            el.set("ParagraphJustification", v);
-        }
-        if let Some(Some(v)) = a.paragraph_kashida_width {
-            el.set("ParagraphKashidaWidth", num(v));
-        }
-        n!(left_indent, "LeftIndent");
-        n!(right_indent, "RightIndent");
-        n!(first_line_indent, "FirstLineIndent");
-        n!(last_line_indent, "LastLineIndent");
-        n!(space_before, "SpaceBefore");
-        n!(space_after, "SpaceAfter");
-        match a.same_para_style_spacing {
-            Some(Some(v)) => el.set("SameParaStyleSpacing", num(v)),
-            // Explicit Ignore: must be written so it still overrides a based-on style's value.
-            Some(None) => el.set("SameParaStyleSpacing", "Nothing"),
-            None => {}
-        }
-        n!(drop_cap_lines, "DropCapLines");
-        n!(drop_cap_chars, "DropCapCharacters");
-        if a.drop_cap_align_left.is_some() || a.drop_cap_scale_descenders.is_some() {
-            let d = parent.map(|name| self.d.styles.resolve_para_style(name).0).unwrap_or_default();
-            let bits = u32::from(a.drop_cap_align_left.unwrap_or(d.drop_cap_align_left))
-                | u32::from(a.drop_cap_scale_descenders.unwrap_or(d.drop_cap_scale_descenders)) << 1;
-            el.set("DropcapDetail", bits);
-        }
-        if let Some(g) = a.grid_align {
-            // IDML has one attribute for on/off and the reference: a reference set without
-            // `grid_align` isn't written.
-            let reference = crate::cjk::grid_reference_out(a.grid_reference.unwrap_or_default());
-            match g {
-                designcraft_doc::GridAlign::None => el.set("GridAlignment", "None"),
-                designcraft_doc::GridAlign::AllLines => {
-                    el.set("GridAlignment", reference);
-                    el.set("GridAlignFirstLineOnly", "false");
-                }
-                designcraft_doc::GridAlign::FirstLineOnly => {
-                    el.set("GridAlignment", reference);
-                    el.set("GridAlignFirstLineOnly", "true");
-                }
-            }
-        }
-        if let Some(c) = a.composer {
-            el.set(
-                "Composer",
-                match c {
-                    designcraft_doc::Composer::Paragraph => "HL Composer",
-                    designcraft_doc::Composer::SingleLine => "HL Single",
-                    designcraft_doc::Composer::Japanese => "HL Composer J",
-                    designcraft_doc::Composer::JapaneseSingleLine => "HL Single J",
-                },
-            );
-        }
-        b!(hyphenate, "Hyphenation");
-        n!(hyph_min_word, "HyphenateWordsLongerThan");
-        n!(hyph_after_first, "HyphenateAfterFirst");
-        n!(hyph_before_last, "HyphenateBeforeLast");
-        n!(hyph_limit, "HyphenateLadderLimit");
-        n!(hyph_zone, "HyphenationZone");
-        b!(hyph_capitalized, "HyphenateCapitalizedWords");
-        b!(hyph_last_word, "HyphenateLastWord");
-        b!(hyph_across_column, "HyphenateAcrossColumns");
-        if let Some(v) = a.hyph_weight {
-            el.set("HyphenWeight", num((v * 10.0).round()));
-        }
-        n!(word_space_min, "MinimumWordSpacing", pct);
-        n!(word_space_desired, "DesiredWordSpacing", pct);
-        n!(word_space_max, "MaximumWordSpacing", pct);
-        n!(letter_space_min, "MinimumLetterSpacing", pct);
-        n!(letter_space_desired, "DesiredLetterSpacing", pct);
-        n!(letter_space_max, "MaximumLetterSpacing", pct);
-        n!(glyph_scale_min, "MinimumGlyphScaling", pct);
-        n!(glyph_scale_desired, "DesiredGlyphScaling", pct);
-        n!(glyph_scale_max, "MaximumGlyphScaling", pct);
-        n!(auto_leading, "AutoLeading", pct);
-        if let Some(v) = a.single_word_justify {
-            el.set("SingleWordJustification", names::align_out(v));
-        }
-        n!(keep_with_next, "KeepWithNext");
-        b!(keep_lines_together, "KeepLinesTogether");
-        b!(keep_all_lines, "KeepAllLinesTogether");
-        n!(keep_first, "KeepFirstLines");
-        n!(keep_last, "KeepLastLines");
-        if let Some(v) = a.start_paragraph {
-            el.set("StartParagraph", names::start_para_out(v));
-        }
-        if let Some(sc) = a.span_columns {
-            match sc {
-                SpanColumns::Single => el.set("SpanColumnType", "SingleColumn"),
-                SpanColumns::Span(n) | SpanColumns::Split(n) => {
-                    el.set("SpanColumnType", if matches!(sc, SpanColumns::Span(_)) { "SpanColumns" } else { "SplitColumns" });
-                    props.push(if n == 0 {
-                        p("SpanSplitColumnCount", "enumeration", "All")
-                    } else {
-                        p("SpanSplitColumnCount", "long", n.to_string())
-                    });
-                }
-            }
-        }
-        n!(split_inside_gutter, "SplitColumnInsideGutter");
-        n!(split_outside_gutter, "SplitColumnOutsideGutter");
-        if let Some(r) = &a.rule_above {
-            self.rule(el, props, "RuleAbove", r);
-        }
-        if let Some(r) = &a.rule_below {
-            self.rule(el, props, "RuleBelow", r);
-        }
-        if let Some(tabs) = &a.tabs {
-            let mut tl = El::new("TabList").attr("type", "list");
-            for t in tabs {
-                tl.push(
-                    El::new("ListItem")
-                        .attr("type", "record")
-                        .child(p("Alignment", "enumeration", names::tab_align_out(t.align)))
-                        .child(p("AlignmentCharacter", "string", if t.align_on.is_empty() { ".".to_string() } else { t.align_on.clone() }))
-                        .child(p("Leader", "string", t.leader.clone()))
-                        .child(p("Position", "unit", num(t.position))),
-                );
-            }
-            props.push(tl);
-        }
-        if let Some(l) = a.list_type {
-            el.set(
-                "BulletsAndNumberingListType",
-                match l {
-                    ListType::None => "NoList",
-                    ListType::Bullets => "BulletList",
-                    ListType::Numbers => "NumberedList",
-                },
-            );
-        }
-        if let Some(n) = a.number_style {
-            props.push(p("NumberingFormat", "string", names::numbering_format_out(n)));
-        }
-        if let Some(x) = &a.number_expression {
-            el.set("NumberingExpression", names::list_text_out(x));
-        }
-        if let Some(x) = &a.list_separator {
-            el.set("BulletsTextAfter", names::list_text_out(x));
-        }
-        if let Some(c) = a.bullet_char.as_deref().and_then(|s| s.chars().next()) {
-            props.push(El::new("BulletChar").attr("BulletCharacterType", "UnicodeOnly").attr("BulletCharacterValue", u32::from(c).to_string()));
-        }
-        if let Some(b) = a.balance_ragged {
-            props.push(p("BalanceRaggedLines", "enumeration", if b { "FullyBalanced" } else { "NoBalancing" }));
-        }
-        b!(shading_on, "ParagraphShadingOn");
-        if let Some(c) = &a.shading_color {
-            props.push(p("ParagraphShadingColor", "object", self.sw(c)));
-        }
-        n!(shading_tint, "ParagraphShadingTint", pct);
-        const SIDES: [&str; 4] = ["Top", "Left", "Bottom", "Right"];
-        if let Some(o) = a.shading_offsets {
-            for (i, side) in SIDES.iter().enumerate() {
-                el.set(&format!("ParagraphShading{side}Offset"), num(o[i]));
-            }
-        }
-        b!(border_on, "ParagraphBorderOn");
-        if let Some(c) = &a.border_color {
-            props.push(p("ParagraphBorderColor", "object", self.sw(c)));
-        }
-        n!(border_tint, "ParagraphBorderTint", pct);
-        if let Some(w) = a.border_weights {
-            for (i, side) in SIDES.iter().enumerate() {
-                el.set(&format!("ParagraphBorder{side}LineWeight"), num(w[i]));
-            }
-        }
-        if let Some(o) = a.border_offsets {
-            for (i, side) in SIDES.iter().enumerate() {
-                el.set(&format!("ParagraphBorder{side}Offset"), num(o[i]));
-            }
-        }
-        if let Some(t) = &a.border_type {
-            props.push(p("ParagraphBorderType", "object", names::stroke_type_out(t)));
-        }
-        if let Some(c) = a.border_cap {
-            el.set("ParagraphBorderStrokeEndCap", names::cap_out(c));
-        }
-        if let Some(j) = a.border_join {
-            el.set("ParagraphBorderStrokeEndJoin", names::join_out(j));
-        }
-        const CORNERS: [&str; 4] = ["TopLeft", "TopRight", "BottomRight", "BottomLeft"];
-        for (prefix, corners) in [("ParagraphBorder", a.border_corners), ("ParagraphShading", a.shading_corners)] {
-            if let Some(cs) = corners {
-                for (c, k) in cs.iter().zip(CORNERS) {
-                    el.set(&format!("{prefix}{k}CornerOption"), names::corner_out(c.shape));
-                    el.set(&format!("{prefix}{k}CornerRadius"), num(c.size));
-                }
-            }
-        }
-        if let Some(w) = a.border_width {
-            el.set("ParagraphBorderWidth", names::box_width_out(w));
-        }
-        if let Some(t) = a.border_top {
-            el.set("ParagraphBorderTopOrigin", names::box_top_out(t));
-        }
-        if let Some(b) = a.border_bottom {
-            el.set("ParagraphBorderBottomOrigin", names::box_bottom_out(b));
-        }
-        b!(border_display_if_splits, "ParagraphBorderDisplayIfSplits");
-        b!(border_merge, "MergeConsecutiveParaBorders");
-        if let Some(c) = &a.border_gap_color {
-            props.push(p("ParagraphBorderGapColor", "object", self.sw(c)));
-        }
-        n!(border_gap_tint, "ParagraphBorderGapTint", pct);
-        if let Some(w) = a.shading_width {
-            el.set("ParagraphShadingWidth", names::box_width_out(w));
-        }
-        if let Some(t) = a.shading_top {
-            el.set("ParagraphShadingTopOrigin", names::box_top_out(t));
-        }
-        if let Some(b) = a.shading_bottom {
-            el.set("ParagraphShadingBottomOrigin", names::box_bottom_out(b));
-        }
-        b!(shading_clip, "ParagraphShadingClipToFrame");
-        b!(shading_nonprinting, "ParagraphShadingSuppressPrinting");
-        n!(span_space_before, "SpanColumnMinSpaceBefore");
-        n!(span_space_after, "SpanColumnMinSpaceAfter");
-        n!(list_level, "NumberingLevel");
-        for (k, style) in [("BulletsCharacterStyle", &a.bullet_char_style), ("NumberingCharacterStyle", &a.number_char_style)] {
-            if let Some(st) = style {
-                props.push(p(k, "object", names::style_self("CharacterStyle", CHAR_BUILTINS, st)));
-            }
-        }
-        if let Some(v) = a.bullet_align {
-            el.set("BulletsAlignment", names::list_align_out(v));
-        }
-        if let Some(v) = a.number_align {
-            el.set("NumberingAlignment", names::list_align_out(v));
-        }
-        b!(restart_numbers, "NumberingApplyRestartPolicy");
-        if let Some(level) = a.restart_after_level {
-            let (policy, level) = if level == 0 { ("AnyPreviousLevel", 0) } else { ("SpecificPreviousLevel", level) };
-            props.push(
-                El::new("NumberingRestartPolicies")
-                    .attr("RestartPolicy", policy)
-                    .attr("LowerLevel", level.to_string())
-                    .attr("UpperLevel", level.to_string()),
-            );
-        }
-        if let Some(f) = &a.bullet_font {
-            props.push(p("BulletsFont", "string", if f.is_empty() { "$ID/".to_string() } else { f.clone() }));
-        }
-        if let Some(f) = a.bullet_font_style.as_ref().filter(|f| !f.is_empty()) {
-            props.push(p("BulletsFontStyle", "string", f.clone()));
-        }
-    }
-
-    fn rule(&mut self, el: &mut El, props: &mut Vec<El>, k: &str, r: &Rule) {
-        el.set(k, bool_s(r.on));
-        el.set(&format!("{k}LineWeight"), num(r.weight));
-        el.set(&format!("{k}Tint"), pct(r.tint as f64));
-        el.set(&format!("{k}Width"), if r.column_width { "ColumnWidth" } else { "TextWidth" });
-        el.set(&format!("{k}Offset"), num(r.offset));
-        el.set(&format!("{k}LeftIndent"), num(r.left_indent));
-        el.set(&format!("{k}RightIndent"), num(r.right_indent));
-        props.push(if r.color == designcraft_doc::TEXT_COLOR {
-            p(&format!("{k}Color"), "string", designcraft_doc::TEXT_COLOR)
-        } else {
-            p(&format!("{k}Color"), "object", self.sw(&r.color))
-        });
-    }
-
-    fn stroke_attrs(&self, el: &mut El, s: &designcraft_doc::Stroke) {
-        el.set("StrokeColor", self.sw(&s.swatch));
-        el.set("StrokeWeight", num(if s.is_none() { 0.0 } else { s.weight }));
-        el.set("StrokeTint", pct(s.tint as f64));
-        el.set("StrokeType", names::stroke_type_out(&s.kind));
-        el.set("StrokeAlignment", names::stroke_align_out(s.align));
-        el.set("EndCap", names::cap_out(s.cap));
-        el.set("EndJoin", names::join_out(s.join));
-        el.set("MiterLimit", num(s.miter_limit));
-        el.set("LeftLineEnd", names::arrow_out(s.start));
-        el.set("RightLineEnd", names::arrow_out(s.end));
-        el.set("GapColor", self.sw(&s.gap_swatch));
-        el.set("GapTint", pct(s.gap_tint as f64));
-        el.set("OverprintStroke", bool_s(s.overprint));
-        el.set("OverprintGap", bool_s(s.gap_overprint));
-    }
-
-    // ---------- spreads ----------
-
-    fn spread_el_doc(&mut self, sp: &Spread, si: usize) -> El {
-        let first = self.d.first_page_of_spread(si);
-        let mut el = self.spread_common(sp, false, first);
-        el.name = "Spread".into();
-        el
-    }
-
-    fn spread_el(&mut self, sp: &Spread, _master: bool) -> El {
-        let mut el = self.spread_common(sp, true, 0);
-        el.name = "MasterSpread".into();
-        el
-    }
-
-    fn spread_common(&mut self, sp: &Spread, master: bool, first_page: usize) -> El {
-        let d = self.d;
-        let facing = d.settings.facing_pages;
-        let (ox, oy) = spread_origin(sp, facing);
-        let mut el = El::new("Spread").attr("Self", uid(sp.id.0));
-        if let (true, Some(info)) = (master, &sp.parent) {
-            el.set("Name", info.label());
-            el.set("NamePrefix", &info.prefix);
-            el.set("BaseName", &info.name);
-        }
-        el.set("ShowMasterItems", bool_s(sp.pages.iter().all(|p| p.show_parent_items)));
-        el.set("PageCount", sp.pages.len());
-        if !master {
-            el.set("BindingLocation", sp.pages.iter().filter(|p| p.side == PageSide::Left).count());
-            el.set("AllowPageShuffle", bool_s(sp.allow_shuffle));
-        }
-        // View › Rotate Spread is the rotation part of the spread's transform; pages and items stay in
-        // unrotated spread coordinates.
-        let rotation = if master { 0 } else { sp.pages.first().map_or(0, |p| p.view_rotation) };
-        el.set(
-            "ItemTransform",
-            match rotation {
-                1 => "0 1 -1 0 0 0",
-                2 => "-1 0 0 -1 0 0",
-                3 => "0 -1 1 0 0 0",
-                _ => "1 0 0 1 0 0",
-            },
-        );
-        let based_on = sp.parent.as_ref().and_then(|i| i.based_on);
-        for (i, pg) in sp.pages.iter().enumerate() {
-            let name = if master { sp.parent.as_ref().map(|i| i.prefix.clone()).unwrap_or_default() } else { d.page_name(first_page + i) };
-            let applied = if master { based_on } else { pg.parent };
-            let overrides: Vec<String> = pg.overridden.iter().map(|i| uid(i.0)).collect();
-            let pe = El::new("Page")
-                .attr("Self", uid(pg.id.0))
-                .attr("Name", name)
-                .attr("AppliedMaster", applied.map(|s| uid(s.0)).unwrap_or_else(|| "n".into()))
-                .attr("LayoutRule", names::liquid_rule_out(pg.liquid))
-                .attr("OverrideList", overrides.join(" "))
-                .attr("GeometricBounds", format!("0 0 {} {}", num(pg.height), num(pg.width)))
-                .attr("ItemTransform", format!("1 0 0 1 {} {}", num(pg.x - ox), num(-oy)))
-                .child(margin_el(pg));
-            let mut pe = pe;
-            push_page_guides(d, sp, pg, &mut pe, first_page + i);
-            el.push(pe);
-        }
-        let origin = Affine::translate((-ox, -oy));
-        for it in &sp.items {
-            let e = self.item_el(it, origin * it.xf);
-            el.push(e);
-        }
-        el
-    }
-
-    fn item_el(&mut self, it: &Item, xf: Affine) -> El {
-        let d = self.d;
-        let path_text = matches!(&it.content, Content::Text(t) if t.options.path.is_some());
-        let tag = match (&it.content, it.shape) {
-            (Content::Text(_), _) if path_text => match it.shape {
-                Shape::GraphicLine => "GraphicLine",
-                Shape::Oval => "Oval",
-                Shape::Rectangle => "Rectangle",
-                _ => "Polygon",
-            },
-            (Content::Text(_), _) => "TextFrame",
-            (Content::Group { .. }, Shape::Group) => "Group",
-            (_, Shape::Oval) => "Oval",
-            (_, Shape::Polygon) | (_, Shape::Path) => "Polygon",
-            (_, Shape::GraphicLine) => "GraphicLine",
-            _ => "Rectangle",
-        };
-        let mut el = El::new(tag).attr("Self", uid(it.id.0));
-        if let Some(o) = it.overrides {
-            el.set("OverriddenPageItem", uid(o.0));
-        }
-        if let Content::Text(t) = &it.content
-            && let Some(pt) = &t.options.path
-        {
-            // Type on a path: a TextPath child holds the story.
-            let len = designcraft_geom::warp::PathWarp::new(&it.path.to_bezpath(), false).length();
-            el.push(
-                El::new("TextPath")
-                    .attr("Self", format!("{}tp", uid(it.id.0)))
-                    .attr("ParentStory", uid(t.story.0))
-                    .attr("PreviousTextFrame", "n")
-                    .attr("NextTextFrame", "n")
-                    .attr("PathEffect", "RainbowPathEffect")
-                    .attr("PathAlignment", "CenterPathAlignment")
-                    .attr("TextAlignment", names::path_align_out(pt.align))
-                    .attr("FlipPathEffect", if pt.flip { "Flipped" } else { "NotFlipped" })
-                    .attr("StartBracket", num(pt.start))
-                    .attr("EndBracket", num(pt.end.map_or(len, |e| e.min(len)))),
-            );
-        } else if let Content::Text(t) = &it.content {
-            let (prev, next) = self.threads.get(&it.id.0).copied().unwrap_or((None, None));
-            el.set("ParentStory", uid(t.story.0));
-            el.set("PreviousTextFrame", prev.map(uid).unwrap_or_else(|| "n".into()));
-            el.set("NextTextFrame", next.map(uid).unwrap_or_else(|| "n".into()));
-        }
-        if tag != "Group" {
-            el.set(
-                "ContentType",
-                match it.content {
-                    Content::Text(_) => "TextType",
-                    Content::Graphic(_) => "GraphicType",
-                    _ => "Unassigned",
-                },
-            );
-        }
-        el.set("Name", if it.name.is_empty() { "$ID/".to_string() } else { it.name.clone() });
-        el.set("ItemLayer", uid(it.layer.0));
-        el.set("Visible", bool_s(!it.hidden));
-        el.set("Locked", bool_s(it.locked));
-        el.set("Nonprinting", bool_s(it.nonprinting));
-        let os = if it.object_style.is_empty() { designcraft_doc::NO_OBJECT_STYLE } else { &it.object_style };
-        el.set("AppliedObjectStyle", names::style_self("ObjectStyle", OBJECT_BUILTINS, os));
-        el.set("ItemTransform", affine_s(xf));
-        el.set("FillColor", self.sw(&it.fill.swatch));
-        el.set("FillTint", pct(it.fill.tint as f64));
-        el.set("OverprintFill", bool_s(it.fill.overprint));
-        if let Some([x0, y0, x1, y1]) = it.fill.gradient_vector {
-            // Gradient Swatch tool vector: start, length and angle in the item's space.
-            el.set("GradientFillStart", format!("{} {}", num(x0), num(y0)));
-            el.set("GradientFillLength", num((x1 - x0).hypot(y1 - y0)));
-            el.set("GradientFillAngle", num((-(y1 - y0)).atan2(x1 - x0).to_degrees()));
-        } else if let Some(a) = it.fill.gradient_angle {
-            el.set("GradientFillAngle", num(a));
-        }
-        // The same on the stroke.
-        if let Some([x0, y0, x1, y1]) = it.stroke.gradient_vector {
-            el.set("GradientStrokeStart", format!("{} {}", num(x0), num(y0)));
-            el.set("GradientStrokeLength", num((x1 - x0).hypot(y1 - y0)));
-            el.set("GradientStrokeAngle", num((-(y1 - y0)).atan2(x1 - x0).to_degrees()));
-        } else if let Some(a) = it.stroke.gradient_angle {
-            el.set("GradientStrokeAngle", num(a));
-        }
-        self.stroke_attrs(&mut el, &it.stroke);
-        // Corner options: map path-order corners to the named corners by geometry.
-        if !it.corners.is_none() {
-            let names_by_index = corner_names(&it.path);
-            for (i, c) in it.corners.corners.iter().enumerate() {
-                let n = names_by_index[i];
-                el.set(&format!("{n}CornerOption"), names::corner_out(c.shape));
-                el.set(&format!("{n}CornerRadius"), num(c.size));
-            }
-        }
-        let mut props = Vec::new();
-        if tag != "Group" && !it.path.is_empty() {
-            props.push(path_geometry(&it.path));
-        }
-        let mut el = with_props(el, props);
-        // Transparency.
-        // An item whose style sets effects writes the effects it has turned off too, so that on
-        // import it doesn't take the style's.
-        let styled = self.d.styles.object_effects(os).is_some();
-        let ds = &it.effects.drop_shadow;
-        let (gf, df) = (&it.effects.gradient_feather, &it.effects.directional_feather);
-        if it.opacity < 1.0 || it.blend != designcraft_color::BlendMode::Normal || ds.on || it.effects.feather > 0.0 || gf.on || df.on || styled {
-            let mut t = El::new("TransparencySetting");
-            t.push(El::new("BlendingSetting").attr("BlendMode", names::blend_out(it.blend)).attr("Opacity", pct(it.opacity as f64)));
-            for c in self.effect_els(&it.effects, styled) {
-                t.push(c);
-            }
-            if df.on {
-                let [top, left, bottom, right] = df.widths;
-                t.push(
-                    El::new("DirectionalFeatherSetting")
-                        .attr("Applied", "true")
-                        .attr("LeftWidth", num(left))
-                        .attr("RightWidth", num(right))
-                        .attr("TopWidth", num(top))
-                        .attr("BottomWidth", num(bottom)),
-                );
-            }
-            if gf.on {
-                let mut g = El::new("GradientFeatherSetting").attr("Applied", "true").attr("Type", if gf.radial { "Radial" } else { "Linear" });
-                if let Some([x0, y0, x1, y1]) = gf.vector {
-                    // Gradient Feather tool vector: start, length and angle in the item's space.
-                    g.set("Angle", num((-(y1 - y0)).atan2(x1 - x0).to_degrees()));
-                    g.set("Length", num((x1 - x0).hypot(y1 - y0)));
-                    g.set("GradientStart", format!("{} {}", num(x0), num(y0)));
-                } else {
-                    g.set("Angle", num(gf.angle));
-                }
-                let id = uid(it.id.0);
-                for (i, (opacity, location)) in [(gf.start, 0.0), (gf.end, 100.0)].into_iter().enumerate() {
-                    let mut s = El::new("OpacityGradientStop")
-                        .attr("Self", format!("{id}TransparencySetting1GradientFeatherSetting1OpacityGradientStop{i}"))
-                        .attr("Opacity", pct(opacity as f64))
-                        .attr("Location", num(location));
-                    if i > 0 {
-                        s.set("Midpoint", "50");
-                    }
-                    g.push(s);
-                }
-                t.push(g);
-            }
-            el.push(t);
-        }
-        if let Content::Text(t) = &it.content {
-            el.push(text_frame_pref(&t.options, &self.sw(&t.options.column_rule_color)));
-            if let Some(g) = t.options.baseline_grid {
-                el.push(
-                    El::new("BaselineFrameGridOption")
-                        .attr("UseCustomBaselineFrameGrid", "true")
-                        .attr("StartingOffsetForBaselineFrameGrid", num(g.start))
-                        .attr("BaselineFrameGridIncrement", num(g.increment)),
-                );
-            }
-        }
-        el.push(text_wrap_pref(&it.wrap));
-        match &it.content {
-            Content::Group { items } => {
-                for c in items {
-                    let e = self.item_el(c, c.xf);
-                    el.push(e);
-                }
-            }
-            Content::Graphic(g) => {
-                if g.auto_fit != designcraft_doc::Fitting::None || g.fit_align != 4 || g.crop != [0.0; 4] {
-                    el.push(
-                        El::new("FrameFittingOption")
-                            .attr("AutoFit", bool_s(g.auto_fit != designcraft_doc::Fitting::None))
-                            .attr("TopCrop", num(g.crop[0]))
-                            .attr("LeftCrop", num(g.crop[1]))
-                            .attr("BottomCrop", num(g.crop[2]))
-                            .attr("RightCrop", num(g.crop[3]))
-                            .attr("FittingOnEmptyFrame", names::fitting_out(g.auto_fit))
-                            .attr("FittingAlignment", names::anchor_out(g.fit_align)),
-                    );
-                }
-                if let Some(asset) = d.assets.get(&g.asset) {
-                    let e = self.image_el(asset, g);
-                    el.push(e);
-                }
-            }
-            _ => {}
-        }
-        el
-    }
-
-    /// The `TransparencySetting` children for `e`'s drop shadow and feather; `all` also writes the
-    /// effects that are off (`Mode="None"`), as an object style that sets effects does.
-    fn effect_els(&self, e: &designcraft_doc::Effects, all: bool) -> Vec<El> {
-        let mut out = Vec::new();
-        let ds = &e.drop_shadow;
-        if ds.on || all {
-            let a = self.d.light_angle(ds.angle, ds.global_light).to_radians();
-            out.push(
-                El::new("DropShadowSetting")
-                    .attr("Mode", if ds.on { "Drop" } else { "None" })
-                    .attr("XOffset", num(-ds.distance * a.cos()))
-                    .attr("YOffset", num(ds.distance * a.sin()))
-                    .attr("Size", num(ds.size))
-                    .attr("Spread", num(ds.spread))
-                    .attr("Opacity", pct(ds.opacity as f64))
-                    .attr("BlendMode", names::blend_out(ds.mode))
-                    .attr("EffectColor", self.sw(&ds.color)),
-            );
-        }
-        if e.feather > 0.0 || all {
-            let corners = match e.feather_options.corners {
-                designcraft_doc::FeatherCorners::Sharp => "Sharp",
-                designcraft_doc::FeatherCorners::Rounded => "Rounded",
-                designcraft_doc::FeatherCorners::Diffused => "Diffusion",
-            };
-            out.push(
-                El::new("FeatherSetting")
-                    .attr("Mode", if e.feather > 0.0 { "Standard" } else { "None" })
-                    .attr("Width", num(e.feather))
-                    .attr("ChokeAmount", num(e.feather_options.choke))
-                    .attr("CornerType", corners),
-            );
-        }
-        out
-    }
-
-    fn image_el(&mut self, asset: &designcraft_doc::Asset, g: &designcraft_doc::Graphic) -> El {
-        let is_pdf = asset.mime == "application/pdf";
-        let is_eps = asset.mime == "application/postscript" || designcraft_images::is_eps(&asset.data);
-        let mut el = El::new(if is_eps {
-            "EPS"
-        } else if is_pdf {
-            "PDF"
-        } else {
-            "Image"
-        })
-        .attr("Self", self.fresh());
-        // A PDF is vector: its page size in `pixels` isn't a resolution, and a cropped graphic
-        // spans less than the page. An EPS's `pixels` is its preview raster, so it still counts.
-        if let Some((pw, ph)) = asset.pixels.filter(|_| !is_pdf)
-            && g.size.0 > 0.0
-            && g.size.1 > 0.0
-        {
-            el.set("ActualPpi", pt(pw as f64 * 72.0 / g.size.0, ph as f64 * 72.0 / g.size.1));
-        }
-        el.set("ItemTransform", affine_s(g.xf));
-        // The swatch that colours a greyscale or bitmap image; written only when it exists.
-        if !g.fill.is_none()
-            && let Some(id) = self.swatch_ids.get(&g.fill.swatch)
-        {
-            el.set("FillColor", id.clone());
-            el.set("FillTint", pct(g.fill.tint as f64));
-        }
-        let embed = !asset.data.is_empty() && (self.opts.embed_images || asset.link.is_none());
-        let mut props = Vec::new();
-        if embed {
-            let mut c = El::new("Contents");
-            c.children.push(Node::CData(base64_encode(&asset.data)));
-            props.push(c);
-        }
-        props.push(El::new("GraphicBounds").attr("Left", "0").attr("Top", "0").attr("Right", num(g.size.0)).attr("Bottom", num(g.size.1)));
-        let mut el = with_props(el, props);
-        if !g.wrap.is_default() {
-            el.push(text_wrap_pref(&g.wrap));
-        }
-        if let Some(c) = &g.clip {
-            el.push(clipping_settings(c));
-        }
-        let uri = match &asset.link {
-            Some(l) => path_to_uri(l),
-            None => format!("file:{}", asset.name),
-        };
-        el.push(
-            El::new("Link")
-                .attr("Self", self.fresh())
-                .attr("AssetURL", "$ID/")
-                .attr("AssetID", "$ID/")
-                .attr("LinkResourceURI", uri)
-                .attr("LinkResourceFormat", format!("$ID/{}", format_name(if is_eps { "application/postscript" } else { &asset.mime })))
-                .attr("StoredState", if embed { "Embedded" } else { "Normal" })
-                .attr("LinkClassID", "35906")
-                .attr("LinkClientID", "257")
-                .attr("LinkResourceModified", "false")
-                .attr("LinkObjectModified", "false")
-                .attr("ShowInUI", "true")
-                .attr("CanEmbed", "true")
-                .attr("CanUnembed", "true")
-                .attr("CanPackage", "true")
-                .attr("ImportPolicy", "NoAutoImport")
-                .attr("ExportPolicy", "NoAutoExport"),
-        );
-        if is_pdf {
-            // `GraphicBounds` span the chosen box, as graphic space does. Without `PDFAttribute`
-            // the page would be cropped to its visible content, which changes the graphic's size
-            // and so its scale and position.
-            el.push(
-                El::new("PDFAttribute")
-                    .attr("PageNumber", asset.page.saturating_add(1))
-                    .attr("PDFCrop", names::pdf_crop_out(asset.pdf_crop))
-                    .attr("TransparentBackground", "true"),
-            );
-        }
-        el
-    }
-
-    /// `<Index>`: nested topics with their See / See also cross-references.
-    fn index_el(&mut self) -> El {
-        let mut topics = self.index_topics.clone();
-        for (_, _, target) in &self.index_xrefs {
-            topics.entry(vec![target.clone()]).or_default();
-        }
-        fn build(ex: &mut Ex, topics: &BTreeMap<Vec<String>, String>, prefix: &[String]) -> Vec<El> {
-            let mut out = Vec::new();
-            for (t, sort) in topics.iter().filter(|(t, _)| t.len() == prefix.len() + 1 && t.starts_with(prefix)) {
-                let mut el = El::new("Topic").attr("Self", topic_self(t)).attr("SortOrder", sort).attr("Name", t.last().map_or("", String::as_str));
-                for (from, kind, target) in ex.index_xrefs.clone() {
-                    if from == *t {
-                        el.push(
-                            El::new("CrossReference")
-                                .attr("Self", ex.fresh())
-                                .attr("ReferencedTopic", topic_self(std::slice::from_ref(&target)))
-                                .attr("CrossReferenceType", kind)
-                                .attr("CustomTypeString", ""),
-                        );
-                    }
-                }
-                for c in build(ex, topics, t) {
-                    el.push(c);
-                }
-                out.push(el);
-            }
-            out
-        }
-        let mut el = El::new("Index").attr("Self", "ix");
-        for t in build(self, &topics, &[]) {
-            el.push(t);
-        }
-        el
-    }
-
-    fn footnote_option_el(&self) -> El {
-        let o = &self.d.footnote_options;
-        let marker = if o.ref_char_style == st::NO_CHAR_STYLE {
-            NO_CHAR_ID.to_string()
-        } else {
-            names::style_self("CharacterStyle", CHAR_BUILTINS, &o.ref_char_style)
-        };
-        let enumv = |name: &str, v: &str| {
-            let mut e = El::new(name).attr("type", "enumeration");
-            e.children.push(Node::Text(v.into()));
-            e
-        };
-        let mut color = El::new("RuleColor").attr("type", "object");
-        color.children.push(Node::Text(self.sw(&o.rule.color)));
-        let mut el = El::new("FootnoteOption")
-            .attr("StartAt", o.start_at)
-            .attr("Prefix", &o.prefix)
-            .attr("Suffix", &o.suffix)
-            .attr("FootnoteTextStyle", names::style_self("ParagraphStyle", PARA_BUILTINS, &o.para_style))
-            .attr("FootnoteMarkerStyle", marker)
-            .attr("SeparatorText", &o.separator)
-            .attr("SpaceBetween", num(o.space_between))
-            .attr("Spacer", num(o.space_before))
-            .attr("FootnoteFirstBaselineOffset", names::first_baseline_out(o.first_baseline))
-            .attr("FootnoteMinimumFirstBaselineOffset", num(o.first_baseline_min))
-            .attr("EnableStraddling", bool_s(o.span_columns))
-            .attr("RuleOn", bool_s(o.rule.on))
-            .attr("RuleLineWeight", num(o.rule.weight))
-            .attr("RuleTint", num(o.rule.tint as f64 * 100.0))
-            .attr("RuleLeftIndent", num(o.rule.left_indent))
-            .attr("RuleWidth", num(o.rule.width))
-            .attr("RuleOffset", num(o.rule.offset));
-        let restart = names::NOTE_RESTART.iter().find(|r| r.0 == o.restart).map_or("DontRestart", |r| r.1);
-        let affix = names::NOTE_AFFIX.iter().find(|r| r.0 == o.affix_in).map_or("NoPrefixSuffix", |r| r.1);
-        let mut props = El::new("Properties");
-        props.push(enumv("FootnoteNumberingStyle", names::number_style_out(o.style)));
-        props.push(enumv("RestartNumbering", restart));
-        props.push(enumv("ShowPrefixSuffix", affix));
-        props.push(enumv("MarkerPositioning", names::note_marker_out(o.ref_position)));
-        props.push(color);
-        el.push(props);
-        el
-    }
-
-    /// `<Footnote>`: the footnote's paragraphs, the first starting with the footnote number marker
-    /// and the separator (as InDesign stores them).
-    fn footnote_el(&mut self, note: &Story) -> El {
-        let mut el = El::new("Footnote");
-        let mut paras = self.story_paras(note);
-        let lead = vec![Node::Pi("ACE".into(), "4".into()), Node::Text(self.d.footnote_options.separator.clone())];
-        if let Some(Node::El(csr)) =
-            paras.first_mut().and_then(|p| p.children.iter_mut().find(|n| matches!(n, Node::El(e) if e.name == "CharacterStyleRange")))
-        {
-            match csr.children.iter_mut().find_map(|n| match n {
-                Node::El(c) if c.name == "Content" => Some(c),
-                _ => None,
-            }) {
-                Some(c) => {
-                    c.children.splice(0..0, lead);
-                }
-                None => {
-                    let mut c = El::new("Content");
-                    c.children = lead;
-                    csr.children.insert(0, Node::El(c));
-                }
-            }
-        }
-        for p in paras {
-            el.push(p);
-        }
-        el
-    }
-
-    // ---------- stories ----------
-
-    fn story_el(&mut self, s: &Story) -> El {
-        let toc = self.d.toc.as_ref().is_some_and(|t| t.story == s.id);
-        let mut el = El::new("Story")
-            .attr("Self", uid(s.id.0))
-            .attr("AppliedTOCStyle", if toc { TOC_STYLE_ID } else { "n" })
-            .attr("TrackChanges", "false")
-            .attr("StoryTitle", "$ID/");
-        el.push(
-            El::new("StoryPreference")
-                .attr("OpticalMarginAlignment", "false")
-                .attr("OpticalMarginSize", "12")
-                .attr("FrameType", "TextFrameType")
-                .attr("StoryOrientation", if s.vertical { "Vertical" } else { "Horizontal" })
-                .attr(
-                    "StoryDirection",
-                    if s.direction == designcraft_doc::TextDirection::RightToLeft { "RightToLeftDirection" } else { "LeftToRightDirection" },
-                ),
-        );
-        for psr in self.story_paras(s) {
-            el.push(psr);
-        }
-        el
-    }
-
-    /// `ParagraphStyleRange`s of a story (or a table cell's story).
-    fn story_paras(&mut self, s: &Story) -> Vec<El> {
-        let mut paras = Vec::new();
-        let ranges = s.para_ranges();
-        let n = ranges.len();
-        for (pi, r) in ranges.into_iter().enumerate() {
-            let pf = s.paras.get(pi).cloned().unwrap_or_default();
-            let mut psr = self.psr_el(&pf);
-            let last = pi + 1 == n;
-            let ends_with_break = s.text.get(r.clone()).and_then(|t| t.chars().next_back()).is_some_and(st::is_break_char);
-            // Character runs intersecting the paragraph.
-            let mut segs: Vec<(std::ops::Range<usize>, CharFormat)> = Vec::new();
-            for (rr, f) in s.runs() {
-                let a = rr.start.max(r.start);
-                let b = rr.end.min(r.end);
-                if a < b {
-                    segs.push((a..b, f.clone()));
-                }
-            }
-            if segs.is_empty() {
-                let f = s.char_format_at(r.start).clone();
-                segs.push((r.start..r.start, f));
-            }
-            let nseg = segs.len();
-            for (k, (rr, f)) in segs.into_iter().enumerate() {
-                let seg_start = rr.start;
-                let text = &s.text[rr];
-                // Split at break characters.
-                let mut cur = String::new();
-                let mut pending: Vec<Node> = Vec::new();
-                let mut csrs: Vec<El> = Vec::new();
-                let flush_text = |cur: &mut String, pending: &mut Vec<Node>| {
-                    if !cur.is_empty() {
-                        pending.push(Node::Text(std::mem::take(cur)));
-                    }
-                };
-                let flush_content = |pending: &mut Vec<Node>, out: &mut Vec<Node>| {
-                    if !pending.is_empty() {
-                        let mut c = El::new("Content");
-                        c.children = std::mem::take(pending);
-                        out.push(Node::El(c));
-                    }
-                };
-                let mut out: Vec<Node> = Vec::new();
-                for (ci, ch) in text.char_indices() {
-                    let ace = match ch {
-                        st::PAGE_NUMBER | st::NEXT_PAGE_NUMBER | st::PREV_PAGE_NUMBER => Some("18"),
-                        st::SECTION_MARKER => Some("19"),
-                        st::INDENT_HERE => Some("7"),
-                        st::RIGHT_INDENT_TAB => Some("8"),
-                        _ => None,
-                    };
-                    let brk = match ch {
-                        st::COLUMN_BREAK => Some("NextColumn"),
-                        st::FRAME_BREAK => Some("NextFrame"),
-                        st::PAGE_BREAK => Some("NextPage"),
-                        st::ODD_PAGE_BREAK => Some("NextOddPage"),
-                        st::EVEN_PAGE_BREAK => Some("NextEvenPage"),
-                        _ => None,
-                    };
-                    if let Some(code) = ace {
-                        flush_text(&mut cur, &mut pending);
-                        pending.push(Node::Pi("ACE".into(), code.into()));
-                    } else if ch == st::TABLE_ANCHOR {
-                        flush_text(&mut cur, &mut pending);
-                        flush_content(&mut pending, &mut out);
-                        if let Some(t) = s.para_table(pi) {
-                            out.push(Node::El(self.table_el(t)));
-                        }
-                    } else if ch == designcraft_doc::ANCHOR_MARK {
-                        flush_text(&mut cur, &mut pending);
-                        flush_content(&mut pending, &mut out);
-                        let k = s.text[..seg_start + ci].matches(designcraft_doc::ANCHOR_MARK).count();
-                        if let Some(a) = s.anchors.get(k) {
-                            out.push(Node::El(
-                                El::new("HyperlinkTextDestination")
-                                    .attr("Self", anchor_self(a.id))
-                                    .attr("Name", &a.name)
-                                    .attr("Hidden", "false")
-                                    .attr("DestinationUniqueKey", a.id & 0xFFFF_FFFF),
-                            ));
-                        }
-                    } else if ch == designcraft_doc::OBJECT_MARK {
-                        // An anchored object: the item inside the range with its anchoring settings.
-                        flush_text(&mut cur, &mut pending);
-                        flush_content(&mut pending, &mut out);
-                        let k = s.text[..seg_start + ci].matches(designcraft_doc::OBJECT_MARK).count();
-                        if let Some(o) = s.objects.get(k) {
-                            let mut e = self.item_el(&o.item, o.item.xf);
-                            use designcraft_doc::anchored::AnchorAlign as A;
-                            let setting = match &o.position {
-                                designcraft_doc::AnchorPosition::Inline { y_offset } => {
-                                    El::new("AnchoredObjectSetting").attr("AnchoredPosition", "InlinePosition").attr("AnchorYoffset", num(*y_offset))
-                                }
-                                designcraft_doc::AnchorPosition::AboveLine { align, space_before, space_after } => El::new("AnchoredObjectSetting")
-                                    .attr("AnchoredPosition", "AboveLine")
-                                    .attr(
-                                        "HorizontalAlignment",
-                                        match align {
-                                            A::Left => "LeftAlign",
-                                            A::Center => "CenterAlign",
-                                            A::Right => "RightAlign",
-                                        },
-                                    )
-                                    .attr("AnchorSpaceAbove", num(*space_before))
-                                    .attr("AnchorYoffset", num(*space_after)),
-                                designcraft_doc::AnchorPosition::Custom {
-                                    x_relative,
-                                    y_relative,
-                                    x_offset,
-                                    y_offset,
-                                    object_point,
-                                    ref_point,
-                                    keep_within_column,
-                                    spine_relative,
-                                } => El::new("AnchoredObjectSetting")
-                                    .attr("AnchoredPosition", "Anchored")
-                                    .attr("AnchorPoint", names::anchor_out(*object_point))
-                                    .attr("HorizontalReferencePoint", names::anchor_rel_out(*x_relative, false))
-                                    .attr("VerticalReferencePoint", names::anchor_rel_out(*y_relative, true))
-                                    .attr("HorizontalAlignment", ["LeftAlign", "CenterAlign", "RightAlign"][(*ref_point % 3) as usize])
-                                    .attr("VerticalAlignment", ["TopAlign", "CenterAlign", "BottomAlign"][(*ref_point / 3).min(2) as usize])
-                                    // IDML measures a left-aligned object's X offset leftwards.
-                                    .attr("AnchorXoffset", num(if *ref_point % 3 == 0 { 0.0 - *x_offset } else { *x_offset }))
-                                    .attr("AnchorYoffset", num(*y_offset))
-                                    .attr("PinPosition", bool_s(*keep_within_column))
-                                    .attr("SpineRelative", bool_s(*spine_relative)),
-                            };
-                            e.push(setting);
-                            out.push(Node::El(e));
-                        }
-                    } else if ch == designcraft_doc::INDEX_MARK {
-                        flush_text(&mut cur, &mut pending);
-                        flush_content(&mut pending, &mut out);
-                        let k = s.text[..seg_start + ci].matches(designcraft_doc::INDEX_MARK).count();
-                        if let Some(r) = s.index_refs.get(k).filter(|r| !r.topics.is_empty()) {
-                            use designcraft_doc::index::IndexRange as R;
-                            for n in 1..=r.topics.len() {
-                                // A shared topic has one key: keep the first reference's
-                                // value (even empty), rather than inventing a merged key.
-                                self.index_topics.entry(r.topics[..n].to_vec()).or_insert_with(|| r.sort.get(n - 1).cloned().unwrap_or_default());
-                            }
-                            let (kind, limit) = match &r.range {
-                                R::CurrentPage => (Some("CurrentPage"), None),
-                                R::ToEndOfStory => (Some("ToEndOfStory"), None),
-                                R::NextParagraphs(n) => (Some("ForNextNParagraphs"), Some(*n)),
-                                R::SuppressPageRange => (Some("SuppressPageNumbers"), None),
-                                R::See(t) => {
-                                    self.index_xrefs.push((r.topics.clone(), "See", t.clone()));
-                                    (None, None)
-                                }
-                                R::SeeAlso(t) => {
-                                    self.index_xrefs.push((r.topics.clone(), "SeeAlso", t.clone()));
-                                    (Some("CurrentPage"), None)
-                                }
-                            };
-                            if let Some(kind) = kind {
-                                let mut el = El::new("PageReference")
-                                    .attr("Self", self.fresh())
-                                    .attr("PageReferenceType", kind)
-                                    .attr("ReferencedTopic", topic_self(&r.topics))
-                                    .attr("Id", k + 1);
-                                if let Some(n) = limit {
-                                    el.set("PageReferenceLimit", n);
-                                }
-                                out.push(Node::El(el));
-                            }
-                        }
-                    } else if ch == designcraft_doc::XREF_MARK {
-                        // A source wrapping its current text (InDesign regenerates it on update).
-                        flush_text(&mut cur, &mut pending);
-                        flush_content(&mut pending, &mut out);
-                        if !out.is_empty() {
-                            let mut c = self.csr_el(&f);
-                            c.children.append(&mut out);
-                            csrs.push(c);
-                        }
-                        let k = s.text[..seg_start + ci].matches(designcraft_doc::XREF_MARK).count();
-                        if let Some(x) = s.xrefs.get(k) {
-                            let me = self.fresh();
-                            let fmt = self.d.xref_formats.iter().position(|ff| ff.name == x.format).map_or("n".to_string(), xref_format_self);
-                            let text = self.d.xref_values(x.target).map_or("??".into(), |mut v| {
-                                v.page = "?".into();
-                                designcraft_doc::xref::expand(self.d.xref_format(&x.format).map_or("<fullPara />", |ff| ff.definition.as_str()), &v)
-                            });
-                            let mut c = self.csr_el(&f);
-                            let mut content = El::new("Content");
-                            content.children.push(Node::Text(text));
-                            c.push(content);
-                            let mut src = El::new("CrossReferenceSource")
-                                .attr("Self", &me)
-                                .attr("AppliedFormat", fmt)
-                                .attr("Name", format!("Cross-Reference {}", self.xref_sources.len() + 1))
-                                .attr("Hidden", "false");
-                            src.push(c);
-                            csrs.push(src);
-                            self.xref_sources.push((me, x.target));
-                        }
-                    } else if let Some(vi) = designcraft_doc::vars::var_index(ch) {
-                        flush_text(&mut cur, &mut pending);
-                        flush_content(&mut pending, &mut out);
-                        if let Some(v) = self.d.text_variables.get(vi) {
-                            let result = self.d.variable_value(vi, None).unwrap_or_else(|| format!("{}{}", v.before, v.after));
-                            out.push(Node::El(
-                                El::new("TextVariableInstance")
-                                    .attr("Self", self.fresh())
-                                    .attr("Name", &v.name)
-                                    .attr("ResultText", result)
-                                    .attr("AssociatedTextVariable", format!("dTextVariablen{}", v.name)),
-                            ));
-                        }
-                    } else if ch == designcraft_doc::NOTE_MARK {
-                        // Editorial notes aren't written to IDML yet.
-                    } else if ch == designcraft_doc::ENDNOTE_REF {
-                        // Endnotes aren't written to IDML yet: the endnote frame keeps their text
-                        // (numbers included) and the references are left out.
-                    } else if ch == designcraft_doc::FOOTNOTE_REF {
-                        // The reference: its own range carrying the reference position.
-                        flush_text(&mut cur, &mut pending);
-                        flush_content(&mut pending, &mut out);
-                        if !out.is_empty() {
-                            let mut c = self.csr_el(&f);
-                            c.children.append(&mut out);
-                            csrs.push(c);
-                        }
-                        if let Some(n) = s.notes.get(s.notes_before(seg_start + ci)) {
-                            let mut c = self.csr_el(&f);
-                            let pos = self.d.footnote_options.ref_position;
-                            if pos != designcraft_doc::Position::Normal {
-                                c.set("Position", names::position_out(pos));
-                            }
-                            c.push(self.footnote_el(&n.text));
-                            csrs.push(c);
-                        }
-                    } else if let Some(bt) = brk {
-                        flush_text(&mut cur, &mut pending);
-                        flush_content(&mut pending, &mut out);
-                        if !out.is_empty() {
-                            let mut c = self.csr_el(&f);
-                            c.children.append(&mut out);
-                            csrs.push(c);
-                        }
-                        let mut c = self.csr_el(&f);
-                        c.set("ParagraphBreakType", bt);
-                        c.push(El::new("Br"));
-                        csrs.push(c);
-                    } else {
-                        cur.push(ch);
-                    }
-                }
-                flush_text(&mut cur, &mut pending);
-                flush_content(&mut pending, &mut out);
-                let is_last_seg = k + 1 == nseg;
-                // A break character that ends the paragraph was written as its `Br`.
-                let para_br = is_last_seg && !last && !ends_with_break;
-                if !out.is_empty() || csrs.is_empty() || para_br {
-                    let mut c = self.csr_el(&f);
-                    c.children.extend(out);
-                    csrs.push(c);
-                }
-                // Tracked changes wrap the text they mark.
-                if let Some(kind) = change_type(f.over.change) {
-                    for c in csrs.iter_mut().filter(|c| c.name == "CharacterStyleRange" && !c.children.is_empty()) {
-                        let mut ch = El::new("Change").attr("Self", self.fresh()).attr("ChangeType", kind);
-                        ch.children = std::mem::take(&mut c.children);
-                        c.push(ch);
-                    }
-                }
-                if para_br && let Some(c) = csrs.last_mut() {
-                    let nl = s.runs().find(|(rr, _)| rr.contains(&r.end)).and_then(|(_, nf)| change_type(nf.over.change));
-                    match nl {
-                        None => c.push(El::new("Br")),
-                        Some(kind) => match c.children.last_mut() {
-                            Some(Node::El(ch)) if ch.name == "Change" && ch.get("ChangeType") == Some(kind) => ch.push(El::new("Br")),
-                            _ => {
-                                let mut ch = El::new("Change").attr("Self", self.fresh()).attr("ChangeType", kind);
-                                ch.push(El::new("Br"));
-                                c.push(ch);
-                            }
-                        },
-                    }
-                }
-                for c in csrs {
-                    psr.push(c);
-                }
-            }
-            paras.push(psr);
-        }
-        paras
-    }
-
-    fn cell_stroke_attrs(&self, el: &mut El, prefix: &str, s: &designcraft_doc::CellStroke) {
-        el.set(&format!("{prefix}StrokeWeight"), num(s.weight));
-        el.set(&format!("{prefix}StrokeColor"), self.sw(&s.color));
-        el.set(&format!("{prefix}StrokeTint"), pct(s.tint as f64));
-        el.set(&format!("{prefix}StrokeType"), names::stroke_type_out(&s.kind));
-        if s.gap_color != designcraft_color::swatch::NONE || s.gap_tint != 1.0 {
-            el.set(&format!("{prefix}StrokeGapColor"), self.sw(&s.gap_color));
-            el.set(&format!("{prefix}StrokeGapTint"), pct(s.gap_tint as f64));
-        }
-    }
-
-    fn partial_cell_stroke_attrs(&self, el: &mut El, prefix: &str, attrs: &designcraft_doc::CellStrokeAttrs) {
-        if let Some(value) = attrs.weight {
-            el.set(&format!("{prefix}StrokeWeight"), num(value));
-        }
-        if let Some(value) = &attrs.color {
-            el.set(&format!("{prefix}StrokeColor"), self.sw(value));
-        }
-        if let Some(value) = attrs.tint {
-            el.set(&format!("{prefix}StrokeTint"), pct(value as f64));
-        }
-        if let Some(value) = &attrs.kind {
-            el.set(&format!("{prefix}StrokeType"), names::stroke_type_out(value));
-        }
-        if let Some(value) = &attrs.gap_color {
-            el.set(&format!("{prefix}StrokeGapColor"), self.sw(value));
-        }
-        if let Some(value) = attrs.gap_tint {
-            el.set(&format!("{prefix}StrokeGapTint"), pct(value as f64));
-        }
-    }
-
-    fn partial_alt_fill_attrs(&self, el: &mut El, kind: &str, attrs: &designcraft_doc::AltFillsAttrs) {
-        if let Some(value) = attrs.first {
-            el.set(&format!("Start{kind}FillCount"), value);
-        }
-        if let Some(value) = &attrs.first_color {
-            el.set(&format!("Start{kind}FillColor"), self.sw(value));
-        }
-        if let Some(value) = attrs.first_tint {
-            el.set(&format!("Start{kind}FillTint"), pct(value as f64));
-        }
-        if let Some(value) = attrs.next {
-            el.set(&format!("End{kind}FillCount"), value);
-        }
-        if let Some(value) = &attrs.next_color {
-            el.set(&format!("End{kind}FillColor"), self.sw(value));
-        }
-        if let Some(value) = attrs.next_tint {
-            el.set(&format!("End{kind}FillTint"), pct(value as f64));
-        }
-        if let Some(value) = attrs.skip_first {
-            el.set(&format!("SkipFirstAlternatingFill{kind}s"), value);
-        }
-        if let Some(value) = attrs.skip_last {
-            el.set(&format!("SkipLastAlternatingFill{kind}s"), value);
-        }
-    }
-
-    fn partial_alt_stroke_attrs(&self, el: &mut El, kind: &str, attrs: &designcraft_doc::AltStrokesAttrs) {
-        if let Some(value) = attrs.first {
-            el.set(&format!("Start{kind}StrokeCount"), value);
-        }
-        if let Some(value) = attrs.next {
-            el.set(&format!("End{kind}StrokeCount"), value);
-        }
-        self.partial_cell_stroke_attrs(el, &format!("Start{kind}"), &attrs.first_stroke);
-        self.partial_cell_stroke_attrs(el, &format!("End{kind}"), &attrs.next_stroke);
-        if kind == "Column"
-            && let Some(value) = &attrs.next_stroke.kind
-        {
-            el.attrs.retain(|(key, _)| key != "EndColumnStrokeType");
-            el.set("EndColumnLineStyle", names::stroke_type_out(value));
-        }
-        if let Some(value) = attrs.skip_first {
-            el.set(&format!("SkipFirstAlternatingStroke{kind}s"), value);
-        }
-        if let Some(value) = attrs.skip_last {
-            el.set(&format!("SkipLastAlternatingStroke{kind}s"), value);
-        }
-    }
-
-    /// `<Table>` with rows, columns and cells (cell names are `column:row`).
-    fn table_el(&mut self, t: &designcraft_doc::Table) -> El {
-        let id = uid(t.id);
-        let (h, f) = (t.header_rows(), t.footer_rows());
-        let mut el = El::new("Table")
-            .attr("Self", &id)
-            .attr("HeaderRowCount", h)
-            .attr("FooterRowCount", f)
-            .attr("BodyRowCount", t.nrows() - h - f)
-            .attr("ColumnCount", t.ncols())
-            .attr(
-                "AppliedTableStyle",
-                names::style_self("TableStyle", names::TABLE_BUILTINS, if t.style.is_empty() { designcraft_doc::BASIC_TABLE } else { &t.style }),
-            )
-            .attr(
-                "TableDirection",
-                if t.options.direction == designcraft_doc::TextDirection::RightToLeft { "RightToLeftDirection" } else { "LeftToRightDirection" },
-            )
-            .attr("SpaceBefore", num(t.options.space_before))
-            .attr("SpaceAfter", num(t.options.space_after))
-            .attr("HeaderBehavior", if t.options.repeat_header { "RepeatOnEachTextColumn" } else { "RepeatOnce" })
-            .attr("FooterBehavior", if t.options.repeat_footer { "RepeatOnEachTextColumn" } else { "RepeatOnce" });
-        for (i, side) in ["Top", "Left", "Bottom", "Right"].iter().enumerate() {
-            self.cell_stroke_attrs(&mut el, &format!("{side}Border"), t.options.border_for(i));
-        }
-        for (kind, alt) in [("Row", &t.options.alt_rows), ("Column", &t.options.alt_cols)] {
-            if let Some(a) = alt {
-                el.set(&format!("Start{kind}FillColor"), self.sw(&a.first_color));
-                el.set(&format!("Start{kind}FillCount"), a.first);
-                el.set(&format!("Start{kind}FillTint"), pct(a.first_tint as f64));
-                el.set(&format!("End{kind}FillColor"), self.sw(&a.next_color));
-                el.set(&format!("End{kind}FillCount"), a.next);
-                el.set(&format!("End{kind}FillTint"), pct(a.next_tint as f64));
-                el.set(&format!("SkipFirstAlternatingFill{kind}s"), a.skip_first);
-                el.set(&format!("SkipLastAlternatingFill{kind}s"), a.skip_last);
-            } else {
-                // A local off value must override any enabled pattern in the named style.
-                el.set(&format!("Start{kind}FillCount"), 0);
-                el.set(&format!("End{kind}FillCount"), 0);
-            }
-        }
-        for (kind, strokes) in [("Row", &t.options.row_strokes), ("Column", &t.options.column_strokes)] {
-            if let Some(strokes) = strokes {
-                el.set(&format!("Start{kind}StrokeCount"), strokes.first);
-                el.set(&format!("End{kind}StrokeCount"), strokes.next);
-                self.cell_stroke_attrs(&mut el, &format!("Start{kind}"), &strokes.first_stroke);
-                self.cell_stroke_attrs(&mut el, &format!("End{kind}"), &strokes.next_stroke);
-                if kind == "Column" {
-                    el.attrs.retain(|(key, _)| key != "EndColumnStrokeType");
-                    el.set("EndColumnLineStyle", names::stroke_type_out(&strokes.next_stroke.kind));
-                }
-                el.set(&format!("SkipFirstAlternatingStroke{kind}s"), strokes.skip_first);
-                el.set(&format!("SkipLastAlternatingStroke{kind}s"), strokes.skip_last);
-            } else {
-                el.set(&format!("Start{kind}StrokeCount"), 0);
-                el.set(&format!("End{kind}StrokeCount"), 0);
-            }
-        }
-        for (r, row) in t.rows.iter().enumerate() {
-            let exact = row.mode == designcraft_doc::RowHeightMode::Exactly;
-            el.push(
-                El::new("Row")
-                    .attr("Self", format!("{id}Row{r}"))
-                    .attr("Name", r)
-                    .attr("SingleRowHeight", num(row.height.max(3.0)))
-                    .attr("MinimumHeight", num(row.height.max(0.0)))
-                    .attr("AutoGrow", bool_s(!exact)),
-            );
-        }
-        for (c, col) in t.columns.iter().enumerate() {
-            el.push(El::new("Column").attr("Self", format!("{id}Column{c}")).attr("Name", c).attr("SingleColumnWidth", num(col.width)));
-        }
-        let owners = t.owners();
-        for r in 0..t.nrows() {
-            for c in 0..t.ncols() {
-                if owners[r * t.ncols() + c] != (r, c) {
-                    continue;
-                }
-                let Some(cell) = t.cell(r, c) else { continue };
-                let vj = match cell.vj {
-                    designcraft_doc::VerticalJustification::Top => "TopAlign",
-                    designcraft_doc::VerticalJustification::Center => "CenterAlign",
-                    designcraft_doc::VerticalJustification::Bottom => "BottomAlign",
-                    designcraft_doc::VerticalJustification::Justify => "JustifyAlign",
-                };
-                let mut ce = El::new("Cell")
-                    .attr("Self", format!("{id}i{}", r * t.ncols() + c))
-                    .attr("Name", format!("{c}:{r}"))
-                    .attr("RowSpan", cell.row_span)
-                    .attr("ColumnSpan", cell.col_span)
-                    .attr(
-                        "AppliedCellStyle",
-                        names::style_self(
-                            "CellStyle",
-                            names::CELL_BUILTINS,
-                            if cell.style.is_empty() { designcraft_doc::NO_CELL_STYLE } else { &cell.style },
-                        ),
-                    )
-                    .attr("FillColor", self.sw(&cell.fill))
-                    .attr("FillTint", pct(cell.fill_tint as f64))
-                    .attr("TopInset", num(cell.insets[0]))
-                    .attr("LeftInset", num(cell.insets[1]))
-                    .attr("BottomInset", num(cell.insets[2]))
-                    .attr("RightInset", num(cell.insets[3]))
-                    .attr("VerticalJustification", vj)
-                    .attr("FirstBaselineOffset", names::first_baseline_out(cell.first_baseline))
-                    .attr("MinimumFirstBaselineOffset", num(cell.first_baseline_min))
-                    .attr("RotationAngle", num(cell.rotation));
-                for (i, side) in ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"].iter().enumerate() {
-                    // Do not turn absent native defaults into explicit shared-edge candidates.
-                    if cell.stroke_defined[i]
-                        || cell.border_overrides[i]
-                        || cell.stroke_priorities[i] != 0
-                        || cell.strokes[i] != designcraft_doc::CellStroke::default()
-                    {
-                        self.cell_stroke_attrs(&mut ce, side, &cell.strokes[i]);
-                    }
-                    let priority = if cell.border_overrides[i] && !cell.stroke_defined[i] {
-                        cell.stroke_priorities[i].max(1)
-                    } else {
-                        cell.stroke_priorities[i]
-                    };
-                    if priority != 0 {
-                        ce.set(&format!("{side}StrokePriority"), priority);
-                    }
-                }
-                let mut paras = self.story_paras(&cell.text);
-                // A graphic cell holds its image as an inline object in the cell's first paragraph.
-                if let Some(g) = &cell.graphic
-                    && let Some(object) = self.cell_graphic_el(g)
-                {
-                    // The cell clips its graphic on screen and in PDF; IDML does so only when asked.
-                    ce.set("ClipContentToCell", bool_s(true));
-                    let mut range = self.csr_el(&CharFormat::default());
-                    range.push(object);
-                    match paras.first_mut() {
-                        Some(first) => first.push(range),
-                        None => {
-                            let mut psr = self.psr_el(&ParaFormat::default());
-                            psr.push(range);
-                            paras.push(psr);
-                        }
-                    }
-                }
-                for psr in paras {
-                    ce.push(psr);
-                }
-                el.push(ce);
-            }
-        }
-        el
-    }
-
-    /// The frame of a table cell's graphic: an inline `Rectangle` around the shown image, or `None`
-    /// when the graphic's asset is missing.
-    fn cell_graphic_el(&mut self, g: &designcraft_doc::Graphic) -> Option<El> {
-        self.d.assets.get(&g.asset)?;
-        let shown = g.xf.transform_rect_bbox(designcraft_geom::Rect::new(0.0, 0.0, g.size.0, g.size.1));
-        let layer = self.d.layers.first().map(|l| l.id).unwrap_or(designcraft_doc::ids::LayerId(0));
-        let mut item = Item::new(designcraft_doc::ids::ItemId(0), layer, Shape::Rectangle, designcraft_geom::shapes::rectangle(shown));
-        item.content = Content::Graphic(g.clone());
-        let mut el = self.item_el(&item, Affine::IDENTITY);
-        el.set("Self", self.fresh());
-        el.push(El::new("AnchoredObjectSetting").attr("AnchoredPosition", "InlinePosition").attr("AnchorYoffset", "0"));
-        Some(el)
-    }
-
-    fn psr_el(&mut self, pf: &ParaFormat) -> El {
-        let mut el = El::new("ParagraphStyleRange").attr("AppliedParagraphStyle", names::style_self("ParagraphStyle", PARA_BUILTINS, &pf.style));
-        let mut props = Vec::new();
-        let styles = &self.d.styles;
-        let pa = with_list_tab(pf.para.clone(), || (styles.resolve_para(pf).0, styles.resolve_para_style(&pf.style).0));
-        self.para_attrs(&mut el, &mut props, &pa, Some(&pf.style));
-        self.char_attrs(&mut el, &mut props, &pf.chars);
-        with_props(el, props)
-    }
-
-    fn csr_el(&mut self, f: &CharFormat) -> El {
-        let id = if f.style.is_empty() || f.style == st::NO_CHAR_STYLE {
-            NO_CHAR_ID.to_string()
-        } else {
-            names::style_self("CharacterStyle", CHAR_BUILTINS, &f.style)
-        };
-        let mut el = El::new("CharacterStyleRange").attr("AppliedCharacterStyle", id);
-        let mut props = Vec::new();
-        self.char_attrs(&mut el, &mut props, &f.over);
-        with_props(el, props)
-    }
-}
-
-/// The left stop the composer adds for a list's Tab Position, if it adds one.
-fn list_tab_stop(pp: &designcraft_doc::ParaProps) -> Option<f64> {
-    if !matches!(pp.list_type, ListType::Bullets | ListType::Numbers) {
-        return None;
-    }
-    pp.list_tab.filter(|t| t.is_finite() && *t >= 0.0 && !pp.tabs.iter().any(|s| (s.position - t).abs() < 1e-6))
-}
-
-/// IDML has no attribute for the bullets-and-numbering Tab Position, so it is written as the left
-/// stop the composer adds for it, in the TabList of each level (style or paragraph) that sets the
-/// list type, the tab position or the tabs. `resolved` gives this level's resolved attributes and
-/// those it inherits; the stop comes back on import as an ordinary tab stop.
-fn with_list_tab(mut a: ParaAttrs, resolved: impl FnOnce() -> (designcraft_doc::ParaProps, designcraft_doc::ParaProps)) -> ParaAttrs {
-    if a.list_tab.is_none() && a.tabs.is_none() && a.list_type.is_none() {
-        return a;
-    }
-    let (here, parent) = resolved();
-    let stop = list_tab_stop(&here);
-    // An inherited TabList holds the parent's stop; a level that ends the list writes its tabs without it.
-    if stop.is_none() && list_tab_stop(&parent).is_none() {
-        return a;
-    }
-    let mut tabs = here.tabs;
-    if let Some(t) = stop {
-        tabs.push(designcraft_doc::TabStop { position: t, align: designcraft_doc::TabAlign::Left, leader: String::new(), align_on: String::new() });
-        tabs.sort_by(|a, b| a.position.total_cmp(&b.position));
-    }
-    a.tabs = Some(tabs);
-    a
-}
-
-/// Style folder tree (names `A/B/C` → groups A, B).
-#[derive(Default)]
-struct Group {
-    styles: Vec<El>,
-    groups: Vec<(String, Group)>,
-}
-
-impl Group {
-    fn insert(&mut self, name: &str, el: El) {
-        let builtin = name.starts_with('[');
-        let mut segs: Vec<&str> = if builtin { vec![name] } else { name.split('/').collect() };
-        let _leaf = segs.pop();
-        let mut g = self;
-        for s in segs {
-            let i = match g.groups.iter().position(|(n, _)| n == s) {
-                Some(i) => i,
-                None => {
-                    g.groups.push((s.to_string(), Group::default()));
-                    g.groups.len() - 1
-                }
-            };
-            g = &mut g.groups[i].1;
-        }
-        g.styles.push(el);
-    }
-
-    fn emit(self, parent: &mut El, kind: &str, path: &str) {
-        for s in self.styles {
-            parent.push(s);
-        }
-        for (name, g) in self.groups {
-            let full = if path.is_empty() { name.clone() } else { format!("{path}:{name}") };
-            let mut ge = El::new(kind).attr("Self", format!("{kind}/{}", escape_id(&full))).attr("Name", &name);
-            g.emit(&mut ge, kind, &full);
-            parent.push(ge);
-        }
-    }
-}
-
-fn margin_el(pg: &designcraft_doc::Page) -> El {
-    let m = pg.margin_rect();
-    // Dragged column guides that still fit the margin box are written as they stand, so they
-    // survive the round trip; otherwise the even split, which InDesign writes for unmoved columns.
-    let pos: Vec<String> = pg.columns.edges(m.width()).into_iter().map(num).collect();
-    El::new("MarginPreference")
-        .attr("ColumnCount", pg.columns.count.max(1))
-        .attr("ColumnGutter", num(pg.columns.gutter))
-        .attr("Top", num(pg.margins.top))
-        .attr("Bottom", num(pg.margins.bottom))
-        .attr("Left", num(pg.margins.inside))
-        .attr("Right", num(pg.margins.outside))
-        .attr("ColumnDirection", "Horizontal")
-        .attr("ColumnsPositions", pos.join(" "))
-}
-
-/// `rule_color` is the IDML reference of the column rule's swatch.
-/// `TextWrapPreference` of a page item or a placed graphic.
-fn text_wrap_pref(w: &designcraft_doc::TextWrap) -> El {
-    with_props(
-        El::new("TextWrapPreference")
-            .attr("Inverse", bool_s(w.invert))
-            .attr("ApplyToMasterPageOnly", "false")
-            .attr("TextWrapSide", names::wrap_side_out(w.side))
-            .attr("TextWrapMode", names::wrap_mode_out(w.mode)),
-        w.path
-            .iter()
-            .filter(|p| !p.is_empty())
-            .map(path_geometry)
-            .chain([El::new("TextWrapOffset")
-                .attr("Top", num(w.offsets[0]))
-                .attr("Left", num(w.offsets[1]))
-                .attr("Bottom", num(w.offsets[2]))
-                .attr("Right", num(w.offsets[3]))])
-            .collect(),
-    )
-    .child(El::new("ContourOption").attr("ContourType", names::contour_type_out(w.contour)).attr("IncludeInsideEdges", "false"))
-}
-
-fn text_frame_pref(o: &TextFrameOptions, rule_color: &str) -> El {
-    let mut inset = El::new("InsetSpacing").attr("type", "list");
-    for v in o.inset {
-        inset.push(p("ListItem", "unit", num(v)));
-    }
-    let el = El::new("TextFramePreference")
-        .attr("TextColumnCount", o.columns.max(1))
-        .attr("TextColumnGutter", num(o.gutter))
-        .attr("UseFixedColumnWidth", bool_s(o.columns_kind == ColumnsKind::FixedWidth))
-        .attr("UseFlexibleColumnWidth", bool_s(o.columns_kind == ColumnsKind::FlexibleWidth))
-        .attr("VerticalBalanceColumns", bool_s(o.balance_columns))
-        .attr("FirstBaselineOffset", names::first_baseline_out(o.first_baseline))
-        .attr("MinimumFirstBaselineOffset", num(o.first_baseline_min))
-        .attr("VerticalJustification", names::vj_out(o.vertical_justification))
-        .attr("VerticalThreshold", num(o.vj_paragraph_spacing_limit))
-        .attr("IgnoreWrap", bool_s(o.ignore_wrap))
-        .attr("AutoSizingType", names::auto_size_out(o.auto_size))
-        .attr("AutoSizingReferencePoint", names::REF_POINTS[(o.auto_size_ref as usize).min(8)])
-        .attr("UseMinimumHeightForAutoSizing", bool_s(o.auto_size_use_min_height))
-        .attr("MinimumHeightForAutoSizing", num(o.auto_size_min_height))
-        .attr("UseMinimumWidthForAutoSizing", bool_s(o.auto_size_use_min_width))
-        .attr("MinimumWidthForAutoSizing", num(o.auto_size_min_width))
-        .attr("UseNoLineBreaksForAutoSizing", bool_s(o.auto_size_no_line_breaks));
-    let el = if o.column_width > 0.0 { el.attr("TextColumnFixedWidth", num(o.column_width)) } else { el };
-    // Written on every frame: on import a frame takes any value it lacks from its object style.
-    let el = el
-        .attr("ColumnRuleOverride", bool_s(o.column_rule))
-        .attr("ColumnRuleStrokeWidth", num(o.column_rule_weight))
-        .attr("ColumnRuleStrokeColor", rule_color)
-        .attr("ColumnRuleStrokeTint", num(f64::from(o.column_rule_tint) * 100.0))
-        .attr("ColumnRuleOffset", num(o.column_rule_offset))
-        .attr("ColumnRuleTopInset", num(o.column_rule_top_inset))
-        .attr("ColumnRuleBottomInset", num(o.column_rule_bottom_inset))
-        .attr("ColumnRuleInsetChainOverride", bool_s(o.column_rule_top_inset == o.column_rule_bottom_inset));
-    with_props(el, vec![inset])
-}
-
-/// `<ClippingPathSettings>` with the outline (graphic space is the image's inner space, whose
-/// `GraphicBounds` start at 0,0).
-fn clipping_settings(c: &designcraft_doc::ClippingPath) -> El {
-    let mut geometry = path_geometry(&c.path);
-    geometry.name = "ClippingPathGeometry".into();
-    let el = El::new("ClippingPathSettings")
-        .attr("ClippingType", names::clipping_kind_out(c.kind))
-        .attr("InvertPath", bool_s(c.invert))
-        .attr("IncludeInsideEdges", bool_s(c.include_inside_edges))
-        .attr("RestrictToFrame", bool_s(c.restrict_to_frame))
-        .attr("UseHighResolutionImage", bool_s(c.use_high_resolution))
-        .attr("Threshold", num(c.threshold))
-        .attr("Tolerance", num(c.tolerance))
-        .attr("InsetFrame", num(c.inset))
-        .attr("AppliedPathName", if c.source_name.is_empty() { "$ID/" } else { c.source_name.as_str() })
-        .attr("Index", c.source_index.to_string());
-    with_props(el, vec![geometry])
-}
-
-fn path_geometry(path: &PathData) -> El {
-    let mut pg = El::new("PathGeometry");
-    for sp in &path.subpaths {
-        let mut arr = El::new("PathPointArray");
-        for a in &sp.anchors {
-            arr.push(
-                El::new("PathPointType")
-                    .attr("Anchor", pt(a.p.x, a.p.y))
-                    .attr("LeftDirection", pt(a.h_in.x, a.h_in.y))
-                    .attr("RightDirection", pt(a.h_out.x, a.h_out.y)),
-            );
-        }
-        pg.push(El::new("GeometryPathType").attr("PathOpen", bool_s(!sp.closed)).child(arr));
-    }
-    pg
-}
-
-/// IDML corner names for anchors 0..4 of a path (by position on its bounding box).
-pub(crate) fn corner_names(path: &PathData) -> [&'static str; 4] {
-    let default = ["TopLeft", "TopRight", "BottomRight", "BottomLeft"];
-    let Some(sp) = path.subpaths.first() else { return default };
-    if sp.anchors.len() != 4 {
-        return default;
-    }
-    let Some(b) = path.bounds() else { return default };
-    let c = b.center();
-    let mut out = default;
-    let mut seen = HashSet::new();
-    for (i, a) in sp.anchors.iter().enumerate() {
-        let n = match (a.p.y < c.y, a.p.x < c.x) {
-            (true, true) => "TopLeft",
-            (true, false) => "TopRight",
-            (false, false) => "BottomRight",
-            (false, true) => "BottomLeft",
-        };
-        if !seen.insert(n) {
-            return default;
-        }
-        out[i] = n;
-    }
-    out
-}
-
-fn format_name(mime: &str) -> &'static str {
-    match mime {
-        "image/png" => "Portable Network Graphics (PNG)",
-        "image/jpeg" => "JPEG",
-        "image/gif" => "GIF",
-        "image/tiff" => "TIFF",
-        "application/pdf" => "Adobe Portable Document Format (PDF)",
-        "application/postscript" => "Encapsulated PostScript (EPS)",
-        _ => "Portable Network Graphics (PNG)",
-    }
-}
-
-/// File path → IDML link URI (`file:/abs/path` with spaces percent-encoded).
-pub(crate) fn path_to_uri(path: &str) -> String {
-    if path.contains(':') && !path.starts_with('/') && path.chars().nth(1) != Some(':') {
-        return path.to_string(); // already a URI
-    }
-    let mut out = String::from("file:");
-    let p = path.replace('\\', "/");
-    for c in p.chars() {
-        match c {
-            ' ' => out.push_str("%20"),
-            '%' => out.push_str("%25"),
-            '#' => out.push_str("%23"),
-            c => out.push(c),
-        }
-    }
-    out
-}
-
-const CONTAINER: &str = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<container version=\"1.0\" xmlns=\"urn:oasis:names:tc:opendocument:xmlns:container\">\n\t<rootfiles>\n\t\t<rootfile full-path=\"designmap.xml\" media-type=\"text/xml\"/>\n\t</rootfiles>\n</container>\n";
-
-const STROKE_STYLES: &[&str] = &[
-    "Triple_Stroke",
-    "ThickThinThick",
-    "ThinThickThin",
-    "ThickThick",
-    "ThickThin",
-    "ThinThick",
-    "ThinThin",
-    "Japanese Dots",
-    "White Diamond",
-    "Left Slant Hash",
-    "Right Slant Hash",
-    "Straight Hash",
-    "Wavy",
-    "Canned Dotted",
-    "Canned Dashed 3x2",
-    "Canned Dashed 4x4",
-    "Dashed",
-    "Solid",
-];
-
-fn anchor_self(id: u64) -> String {
-    format!("HyperlinkTextDestination/a{id}")
-}
-
-fn xref_format_self(i: usize) -> String {
-    format!("CrossReferenceFormat/f{i}")
-}
-
-/// A cross-reference format as InDesign building blocks.
-fn xref_format_el(i: usize, f: &designcraft_doc::XrefFormat) -> El {
-    let me = xref_format_self(i);
-    let mut el = El::new("CrossReferenceFormat").attr("Self", &me).attr("Name", &f.name).attr("AppliedCharacterStyle", "n");
-    let mut k = 0;
-    let mut block = |el: &mut El, kind: &str, text: &str, delim: &str, include: bool| {
-        el.push(
-            El::new("BuildingBlock")
-                .attr("Self", format!("{me}BuildingBlock{k}"))
-                .attr("BlockType", kind)
-                .attr("AppliedCharacterStyle", "n")
-                .attr("CustomText", if text.is_empty() { "$ID/" } else { text })
-                .attr("AppliedDelimiter", if delim.is_empty() { "$ID/" } else { delim })
-                .attr("IncludeDelimiter", bool_s(include)),
-        );
-        k += 1;
-    };
-    let mut rest = f.definition.as_str();
-    while let Some(a) = rest.find('<') {
-        if a > 0 {
-            block(&mut el, "CustomStringBuildingBlock", &rest[..a], "", false);
-        }
-        let Some(b) = rest[a..].find('>') else { break };
-        let tag = rest[a + 1..a + b].trim().trim_end_matches('/').trim();
-        let attr = |k: &str| tag.find(&format!("{k}=\"")).and_then(|i| tag[i + k.len() + 2..].split('"').next()).unwrap_or("").to_string();
-        match tag.split_whitespace().next().unwrap_or("") {
-            "fullPara" => block(&mut el, "FullParagraphBuildingBlock", "", "", false),
-            "paraText" => block(&mut el, "ParagraphTextBuildingBlock", "", "", false),
-            "paraNum" => block(&mut el, "ParagraphNumberBuildingBlock", "", "", false),
-            "pageNum" => block(&mut el, "PageNumberBuildingBlock", "", "", false),
-            "txtAnchrName" => block(&mut el, "BookmarkNameBuildingBlock", "", "", false),
-            "chapNum" => block(&mut el, "ChapterNumberBuildingBlock", "", "", false),
-            "fileName" => block(&mut el, "FileNameBuildingBlock", "", "", false),
-            "partialPara" => block(&mut el, "PartialParagraphBuildingBlock", "", &attr("delim"), attr("includeDelim") == "true"),
-            _ => block(&mut el, "CustomStringBuildingBlock", &rest[a..a + b + 1], "", false),
-        }
-        rest = &rest[a + b + 1..];
-    }
-    if !rest.is_empty() {
-        block(&mut el, "CustomStringBuildingBlock", rest, "", false);
-    }
-    el
-}
-
-fn topic_self(path: &[String]) -> String {
-    let mut s = String::from("ix");
-    for n in path {
-        s.push_str("Topicn");
-        s.push_str(&escape_id(n));
-    }
-    s
-}
-
-/// Package metadata: the creation and modification times that date variables show.
-fn metadata_xmp(d: &Document) -> String {
-    use designcraft_doc::vars::format_date;
-    let iso = |t: i64| format!("{}:{:02}Z", format_date(t, "yyyy-MM-ddTHH:mm"), t.rem_euclid(60));
-    let modified = if d.modified > 0 { d.modified } else { d.created };
-    format!(
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<x:xmpmeta xmlns:x=\"adobe:ns:meta/\">\n <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n  <rdf:Description rdf:about=\"\" xmlns:xmp=\"http://ns.adobe.com/xap/1.0/\">\n   <xmp:CreateDate>{}</xmp:CreateDate>\n   <xmp:ModifyDate>{}</xmp:ModifyDate>\n  </rdf:Description>\n </rdf:RDF>\n</x:xmpmeta>\n",
-        iso(d.created),
-        iso(modified)
-    )
-}
-
-/// The page's ruler guides, measured from the ruler origin written in the preferences.
-fn push_page_guides(d: &Document, sp: &Spread, pg: &designcraft_doc::Page, pe: &mut El, page_index: usize) {
-    let facing = d.settings.facing_pages;
-    // Ruler guides, measured from the ruler origin written in the preferences: the
-    // spread's top left, the page's, or the spine (the import reads them the same way).
-    let left = sp.pages.iter().map(|p| p.x).fold(f64::INFINITY, f64::min);
-    let left = if left.is_finite() { left } else { 0.0 };
-    let spine = sp.pages.iter().map(|p| p.x - left).filter(|x| *x > 1e-6).fold(f64::INFINITY, f64::min);
-    let spine = if spine.is_finite() && facing { spine } else { 0.0 };
-    let origin_x = match d.settings.ruler_origin {
-        designcraft_doc::RulerOrigin::Spread => left,
-        designcraft_doc::RulerOrigin::Page => pg.x,
-        designcraft_doc::RulerOrigin::Spine => left + spine,
-    };
-    for g in &pg.guides {
-        let vertical = g.orientation == designcraft_doc::Orientation::Vertical;
-        let mut ge = El::new("Guide")
-            .attr("Self", format!("{}g{}", uid(pg.id.0), pe.elements().count()))
-            .attr("Orientation", if vertical { "Vertical" } else { "Horizontal" })
-            .attr("Location", num(if vertical { g.position - origin_x } else { g.position }))
-            .attr("FitToPage", bool_s(!g.spread))
-            .attr("ViewThreshold", "5")
-            .attr("Locked", bool_s(g.locked))
-            .attr("PageIndex", page_index.to_string())
-            .attr("GuideType", if g.liquid { "Liquid" } else { "Ruler" });
-        if let Some(l) = g.layer {
-            ge.set("ItemLayer", uid(l.0));
-        }
-        pe.push(ge);
-    }
-}
-
-/// A `MojikumiTable` element with its spacing overrides.
-fn mojikumi_table_el(t: &designcraft_doc::cjk::MojikumiTable) -> El {
-    let mut e = El::new("MojikumiTable").attr("Self", format!("MojikumiTable/{}", escape_id(&t.name))).attr("Name", &t.name);
-    if !t.based_on.is_empty() {
-        e.set("BasedOnMojikumiSet", &t.based_on);
-    }
-    if !t.overrides.is_empty() {
-        let mut list = El::new("OverrideMojikumiAkiList");
-        for r in &t.overrides {
-            list.push(
-                El::new("OverrideMojikumiAkiType")
-                    .attr("TargetMojikumiClass", r.target_class)
-                    .attr("SideMojikumiClass", r.side_class)
-                    .attr("SideIsAfterTarget", bool_s(r.after))
-                    .attr("Minimum", num(r.minimum))
-                    .attr("Desired", num(r.desired))
-                    .attr("Maximum", num(r.maximum))
-                    .attr("CompressionPriority", r.priority)
-                    .attr("AkiDoesNotFloat", bool_s(r.does_not_float)),
-            );
-        }
-        e.push(El::new("Properties").child(list));
-    }
-    e
-}
-
-/// A `Layer` element with its colour property.
-fn layer_el(l: &designcraft_doc::Layer) -> El {
-    let color = match names::layer_color_out(l.color) {
-        Some(n) => p("LayerColor", "enumeration", n),
-        None => {
-            let mut e = El::new("LayerColor").attr("type", "list");
-            for c in l.color {
-                e.push(p("ListItem", "double", num(c as f64)));
-            }
-            e
-        }
-    };
-    let el = El::new("Layer")
-        .attr("Self", uid(l.id.0))
-        .attr("Name", &l.name)
-        .attr("Visible", bool_s(l.visible))
-        .attr("Locked", bool_s(l.locked))
-        .attr("IgnoreWrap", bool_s(l.suppress_wrap_when_hidden))
-        .attr("ShowGuides", bool_s(l.show_guides))
-        .attr("LockGuides", "false")
-        .attr("UI", "true")
-        .attr("Expendable", "true")
-        .attr("Printable", bool_s(l.printable));
-    with_props(el, vec![color])
-}
-
-/// A text variable definition with its type's settings element.
-fn text_variable_el(v: &designcraft_doc::vars::TextVariable) -> El {
-    use designcraft_doc::vars::{Use, VarKind};
-    let pref = |name: &str| El::new(name).attr("TextBefore", &v.before);
-    let (ty, settings) = match &v.kind {
-        VarKind::Custom { text } => ("CustomTextType", Some(pref("CustomTextVariablePreference").attr("Contents", text))),
-        VarKind::LastPageNumber { section } => (
-            "LastPageNumberType",
-            Some(
-                pref("PageNumberVariablePreference").attr("Format", "Current").attr("Scope", if *section { "SectionScope" } else { "DocumentScope" }),
-            ),
-        ),
-        VarKind::ChapterNumber => ("ChapterNumberType", Some(pref("ChapterNumberVariablePreference").attr("Format", "Current"))),
-        VarKind::FileName { extension } => {
-            ("FileNameType", Some(pref("FileNameVariablePreference").attr("IncludePath", "false").attr("IncludeExtension", bool_s(*extension))))
-        }
-        VarKind::CreationDate { format } => ("CreationDateType", Some(pref("DateVariablePreference").attr("Format", format))),
-        VarKind::ModificationDate { format } => ("ModificationDateType", Some(pref("DateVariablePreference").attr("Format", format))),
-        VarKind::OutputDate { format } => ("OutputDateType", Some(pref("DateVariablePreference").attr("Format", format))),
-        VarKind::RunningHeader { style, use_, character } => {
-            let (ty, el, key, style_ref) = if *character {
-                (
-                    "MatchCharacterStyleType",
-                    "MatchCharacterStylePreference",
-                    "AppliedCharacterStyle",
-                    names::style_self("CharacterStyle", CHAR_BUILTINS, style),
-                )
-            } else {
-                (
-                    "MatchParagraphStyleType",
-                    "MatchParagraphStylePreference",
-                    "AppliedParagraphStyle",
-                    names::style_self("ParagraphStyle", PARA_BUILTINS, style),
-                )
-            };
-            let strategy = if *use_ == Use::LastOnPage { "LastOnPage" } else { "FirstOnPage" };
-            (
-                ty,
-                Some(pref(el).attr(key, style_ref).attr("SearchStrategy", strategy).attr("ChangeCase", "None").attr("DeleteEndPunctuation", "false")),
-            )
-        }
-        VarKind::Imported { variable_type, settings_element, settings, .. } => {
-            let el = (!settings_element.is_empty()).then(|| El { name: settings_element.clone(), attrs: settings.clone(), children: vec![] });
-            (variable_type.as_str(), el)
-        }
-    };
-    let mut e = El::new("TextVariable").attr("Self", format!("dTextVariablen{}", v.name)).attr("Name", &v.name).attr("VariableType", ty);
-    if let Some(mut s) = settings {
-        if !matches!(v.kind, VarKind::Imported { .. }) {
-            s.set("TextAfter", &v.after);
-        }
-        e.push(s);
-    }
-    e
-}
-
-/// Auto tate-chu-yoko, Japanese composition and grid settings of a paragraph range or style.
-fn cjk_settings_para(el: &mut El, a: &ParaAttrs) {
-    if let Some(v) = a.auto_tcy {
-        el.set("AutoTcy", v);
-    }
-    if let Some(v) = a.auto_tcy_include_roman {
-        el.set("AutoTcyIncludeRoman", bool_s(v));
-    }
-    if let Some(v) = a.rotate_roman {
-        el.set("RotateSingleByteCharacters", bool_s(v));
-    }
-    if let Some(v) = a.roman_word_break {
-        el.set("AllowArbitraryHyphenation", bool_s(v));
-    }
-    if let Some(v) = a.grid_gyoudori {
-        el.set("GridGyoudori", v);
-    }
-    if let Some(v) = a.paragraph_gyoudori {
-        el.set("ParagraphGyoudori", bool_s(v));
-    }
-}
-
-impl Ex<'_> {
-    /// Kenten Settings, Kenten Color and Shatai of a character range or style.
-    fn cjk_settings_chars(&self, el: &mut El, props: &mut Vec<El>, a: &CharAttrs) {
-        use designcraft_doc::cjk_settings::KentenKind;
-        if let Some(k) = a.kenten_kind
-            && a.kenten != Some(false)
-        {
-            el.set("KentenKind", crate::cjk::kenten_kind_out(k));
-            if k != KentenKind::Custom {
-                el.attrs.retain(|(n, _)| n != "KentenCustomCharacter");
-            } else if let Some(c) = &a.kenten_character {
-                el.set("KentenCustomCharacter", c);
-            }
-        }
-        if let Some(f) = &a.kenten_font {
-            props.push(p("KentenFont", "string", if f.is_empty() { "$ID/".to_string() } else { f.clone() }));
-        }
-        if let Some(st) = &a.kenten_font_style {
-            props.push(if st.is_empty() { p("KentenFontStyle", "enumeration", "Nothing") } else { p("KentenFontStyle", "string", st.clone()) });
-        }
-        if let Some(Some(v)) = a.kenten_size {
-            el.set("KentenFontSize", num(v));
-        }
-        if let Some(v) = a.kenten_x_scale {
-            el.set("KentenXScale", num(v * 100.0));
-        }
-        if let Some(v) = a.kenten_y_scale {
-            el.set("KentenYScale", num(v * 100.0));
-        }
-        if let Some(v) = a.kenten_distance {
-            el.set("KentenPlacement", num(v));
-        }
-        if let Some(v) = a.kenten_position {
-            el.set("KentenPosition", crate::cjk::kenten_position_out(v));
-        }
-        if let Some(v) = a.kenten_alignment {
-            el.set("KentenAlignment", crate::cjk::kenten_alignment_out(v));
-        }
-        if let Some(v) = &a.kenten_character_set {
-            el.set("KentenCharacterSet", v);
-        }
-        // The text's own colour is the string "Text Color" (a property); a swatch is a reference.
-        for (key, color) in [("KentenFillColor", &a.kenten_fill), ("KentenStrokeColor", &a.kenten_stroke)] {
-            match color {
-                Some(c) if c.is_empty() => props.push(p(key, "string", "Text Color")),
-                Some(c) => el.set(key, self.sw(c)),
-                None => {}
-            }
-        }
-        for (key, tint) in [("KentenTint", a.kenten_fill_tint), ("KentenStrokeTint", a.kenten_stroke_tint)] {
-            if let Some(t) = tint {
-                el.set(key, t.map_or_else(|| "-1".to_string(), |t| num(f64::from(t) * 100.0)));
-            }
-        }
-        if let Some(w) = a.kenten_stroke_weight {
-            el.set("KentenWeight", w.map_or_else(|| "-1".to_string(), num));
-        }
-        if let Some(v) = a.kenten_overprint_fill {
-            el.set("KentenOverprintFill", crate::cjk::overprint_out(v));
-        }
-        if let Some(v) = a.kenten_overprint_stroke {
-            el.set("KentenOverprintStroke", crate::cjk::overprint_out(v));
-        }
-        self.shatai_chars(el, a);
-    }
-
-    fn shatai_chars(&self, el: &mut El, a: &CharAttrs) {
-        if let Some(v) = a.shatai_magnification {
-            el.set("ShataiMagnification", num(v));
-        }
-        if let Some(v) = a.shatai_angle {
-            el.set("ShataiDegreeAngle", num(v * crate::cjk::SHATAI_ANGLE_UNITS));
-        }
-        if let Some(v) = a.shatai_adjust_rotation {
-            el.set("ShataiAdjustRotation", bool_s(v));
-        }
-        if let Some(v) = a.shatai_adjust_tsume {
-            el.set("ShataiAdjustTsume", bool_s(v));
-        }
-    }
-}
-
-/// The IDML `ChangeType` of a tracked change.
-fn change_type(mark: Option<designcraft_doc::ChangeMark>) -> Option<&'static str> {
-    match mark {
-        Some(designcraft_doc::ChangeMark::Deleted) => Some("DeletedText"),
-        Some(designcraft_doc::ChangeMark::Inserted) => Some("InsertedText"),
-        _ => None,
-    }
 }
diff --git a/crates/idml/src/export/common.rs b/crates/idml/src/export/common.rs
new file mode 100644
index 000000000..4e2d42e2c
--- /dev/null
+++ b/crates/idml/src/export/common.rs
@@ -0,0 +1,70 @@
+use super::{Affine, Color, DOM_VERSION, El, Node, PKG_NS, escape_id, num};
+
+pub(crate) fn uid(n: u64) -> String {
+    format!("u{n:x}")
+}
+
+pub(super) fn p(name: &str, ty: &str, val: impl Into<String>) -> El {
+    El::new(name).attr("type", ty).text(val)
+}
+
+/// Insert a `<Properties>` element as the first child when there are any.
+pub(super) fn with_props(mut el: El, props: Vec<El>) -> El {
+    if !props.is_empty() {
+        let mut pe = El::new("Properties");
+        pe.children = props.into_iter().map(Node::El).collect();
+        el.children.insert(0, Node::El(pe));
+    }
+    el
+}
+
+pub(super) fn pkg_root(kind: &str) -> El {
+    El::new(&format!("idPkg:{kind}")).attr("xmlns:idPkg", PKG_NS).attr("DOMVersion", DOM_VERSION)
+}
+
+pub(super) fn bool_s(b: bool) -> &'static str {
+    if b { "true" } else { "false" }
+}
+
+pub(super) fn pct(v: f64) -> String {
+    num(v * 100.0)
+}
+
+/// (model, space, value) for a colour.
+pub(super) fn color_value(c: &Color) -> (&'static str, String) {
+    match *c {
+        Color::Cmyk { c, m, y, k } => ("CMYK", format!("{} {} {} {}", pct(c as f64), pct(m as f64), pct(y as f64), pct(k as f64))),
+        Color::Rgb { r, g, b } => ("RGB", format!("{} {} {}", num(r as f64 * 255.0), num(g as f64 * 255.0), num(b as f64 * 255.0))),
+        Color::Gray { k } => ("CMYK", format!("0 0 0 {}", pct(k as f64))),
+    }
+}
+
+pub(super) fn affine_s(a: Affine) -> String {
+    a.as_coeffs().iter().map(|v| num(*v)).collect::<Vec<_>>().join(" ")
+}
+
+pub(super) fn anchor_self(id: u64) -> String {
+    format!("HyperlinkTextDestination/a{id}")
+}
+
+pub(super) fn xref_format_self(i: usize) -> String {
+    format!("CrossReferenceFormat/f{i}")
+}
+
+pub(super) fn topic_self(path: &[String]) -> String {
+    let mut s = String::from("ix");
+    for n in path {
+        s.push_str("Topicn");
+        s.push_str(&escape_id(n));
+    }
+    s
+}
+
+/// The IDML `ChangeType` of a tracked change.
+pub(super) fn change_type(mark: Option<designcraft_doc::ChangeMark>) -> Option<&'static str> {
+    match mark {
+        Some(designcraft_doc::ChangeMark::Deleted) => Some("DeletedText"),
+        Some(designcraft_doc::ChangeMark::Inserted) => Some("InsertedText"),
+        _ => None,
+    }
+}
diff --git a/crates/idml/src/export/designmap.rs b/crates/idml/src/export/designmap.rs
new file mode 100644
index 000000000..1c1c720b1
--- /dev/null
+++ b/crates/idml/src/export/designmap.rs
@@ -0,0 +1,352 @@
+use super::common::{anchor_self, bool_s, p, uid, with_props, xref_format_self};
+use super::{CHAR_BUILTINS, DOM_VERSION, Document, El, Ex, HashSet, PARA_BUILTINS, PKG_NS, document_with_pi, escape_id, names, num};
+
+impl<'a> Ex<'a> {
+    // ---------- designmap ----------
+
+    pub(super) fn designmap(&mut self, masters: &[(String, Vec<u8>)], spreads: &[(String, Vec<u8>)], stories: &[(String, Vec<u8>)]) -> Vec<u8> {
+        let d = self.d;
+        let story_list: Vec<String> = d.stories.keys().map(|k| uid(k.0)).collect();
+        let mut root = El::new("Document")
+            .attr("xmlns:idPkg", PKG_NS)
+            .attr("DOMVersion", DOM_VERSION)
+            .attr("Self", "d")
+            .attr("StoryList", story_list.join(" "))
+            .attr("Name", format!("{}.indd", d.title))
+            .attr("ZeroPoint", {
+                let [x, y] = d.zero_point();
+                format!("{} {}", num(x), num(y))
+            })
+            .attr("ActiveLayer", d.layers.first().map(|l| uid(l.id.0)).unwrap_or_else(|| "n".into()));
+        root.push(
+            El::new("Language")
+                .attr("Self", "Language/$ID/[No Language]")
+                .attr("Name", "$ID/[No Language]")
+                .attr("SingleQuotes", "''")
+                .attr("DoubleQuotes", "\"\"")
+                .attr("PrimaryLanguageName", "$ID/[No Language]")
+                .attr("SublanguageName", "$ID/[No Language]")
+                .attr("Id", "0")
+                .attr("HyphenationVendor", "$ID/")
+                .attr("SpellingVendor", "$ID/"),
+        );
+        root.push(
+            El::new("Language")
+                .attr("Self", "Language/$ID/English%3a USA")
+                .attr("Name", "$ID/English: USA")
+                .attr("SingleQuotes", "\u{2018}\u{2019}")
+                .attr("DoubleQuotes", "\u{201C}\u{201D}")
+                .attr("PrimaryLanguageName", "$ID/English")
+                .attr("SublanguageName", "$ID/USA")
+                .attr("Id", "269")
+                .attr("HyphenationVendor", "Hunspell")
+                .attr("SpellingVendor", "Hunspell"),
+        );
+        let mut sets = std::collections::BTreeMap::new();
+        for a in d.styles.paragraph.iter().map(|p| &p.para).chain(d.stories.values().flat_map(|s| s.paras.iter().map(|p| &p.para))) {
+            if let Some(Some(k)) = &a.kinsoku
+                && !k.name.is_empty()
+            {
+                sets.insert(&k.name, k);
+            }
+        }
+        for k in sets.values() {
+            root.push(
+                El::new("KinsokuTable")
+                    .attr("Self", format!("KinsokuTable/{}", escape_id(&k.name)))
+                    .attr("Name", &k.name)
+                    .attr("CantBeginLineChars", &k.no_start)
+                    .attr("CantEndLineChars", &k.no_end)
+                    .attr("CantBeSeparatedChars", &k.inseparable)
+                    .attr("HangingPunctuationChars", &k.hanging),
+            );
+        }
+        for t in &d.styles.mojikumi_tables {
+            root.push(mojikumi_table_el(t));
+        }
+        root.push(El::new("idPkg:Graphic").attr("src", "Resources/Graphic.xml"));
+        root.push(El::new("idPkg:Fonts").attr("src", "Resources/Fonts.xml"));
+        root.push(El::new("idPkg:Styles").attr("src", "Resources/Styles.xml"));
+        root.push(
+            El::new("NumberingList")
+                .attr("Self", "NumberingList/$ID/[Default]")
+                .attr("Name", "$ID/[Default]")
+                .attr("ContinueNumbersAcrossStories", "false")
+                .attr("ContinueNumbersAcrossDocuments", "false"),
+        );
+        root.push(El::new("idPkg:Preferences").attr("src", "Resources/Preferences.xml"));
+        for c in &d.conditions {
+            root.push(
+                El::new("Condition")
+                    .attr("Self", format!("Condition/{}", escape_id(&c.name)))
+                    .attr("Name", &c.name)
+                    .attr("IndicatorColor", format!("{} {} {}", c.color[0], c.color[1], c.color[2]))
+                    .attr("IndicatorMethod", "UseUnderline")
+                    .attr("UnderlineIndicatorAppearance", "Solid")
+                    .attr("Visible", bool_s(c.visible)),
+            );
+        }
+        // Variables InDesign's cross-reference page/chapter blocks rely on.
+        for (name, ty) in [("XRefChapterNumber", "XrefChapterNumberType"), ("XRefPageNumber", "XrefPageNumberType")] {
+            let n = format!("<?AID 001b?>TV {name}");
+            root.push(El::new("TextVariable").attr("Self", format!("dTextVariablen{n}")).attr("Name", &n).attr("VariableType", ty));
+        }
+        for v in &d.text_variables {
+            root.push(text_variable_el(v));
+        }
+        // IDML lists layers back to front.
+        for l in d.layers.iter().rev() {
+            root.push(layer_el(l));
+        }
+        for (name, _) in masters {
+            root.push(El::new("idPkg:MasterSpread").attr("src", name));
+        }
+        for (name, _) in spreads {
+            root.push(El::new("idPkg:Spread").attr("src", name));
+        }
+        // Sections.
+        let mut secs = d.sections.clone();
+        secs.sort_by_key(|s| s.start);
+        if secs.is_empty() || secs[0].start != 0 {
+            secs.insert(
+                0,
+                designcraft_doc::Section {
+                    start: 0,
+                    start_number: Some(1),
+                    style: Default::default(),
+                    prefix: String::new(),
+                    marker: String::new(),
+                    include_prefix: false,
+                },
+            );
+        }
+        let total = d.page_count();
+        for (i, s) in secs.iter().enumerate() {
+            if s.start >= total {
+                continue;
+            }
+            let end = secs.get(i + 1).map(|n| n.start).unwrap_or(total).min(total);
+            let Some(page) = d.page(s.start) else { continue };
+            let mut el = El::new("Section")
+                .attr("Self", self.fresh())
+                .attr("Length", end.saturating_sub(s.start).max(1))
+                .attr("Name", &s.prefix)
+                .attr("ContinueNumbering", bool_s(s.start_number.is_none()))
+                .attr("IncludeSectionPrefix", bool_s(s.include_prefix));
+            if let Some(n) = s.start_number {
+                el.set("PageNumberStart", n);
+            }
+            el = el.attr("Marker", &s.marker).attr("PageStart", uid(page.id.0)).attr("SectionPrefix", &s.prefix);
+            root.push(with_props(el, vec![p("PageNumberStyle", "enumeration", names::number_style_out(s.style))]));
+        }
+        if !self.index_topics.is_empty() || !self.index_xrefs.is_empty() {
+            root.push(self.index_el());
+        }
+        // Formats before the stories whose sources apply them.
+        for (i, f) in d.xref_formats.iter().enumerate() {
+            root.push(xref_format_el(i, f));
+        }
+        for (name, _) in stories {
+            root.push(El::new("idPkg:Story").attr("src", name));
+        }
+        for (src, target) in self.xref_sources.clone() {
+            let mut h = El::new("Hyperlink")
+                .attr("Self", self.fresh())
+                .attr("Name", "Cross-Reference")
+                .attr("Source", &src)
+                .attr("Visible", "false")
+                .attr("Highlight", "None")
+                .attr("Width", "Thin")
+                .attr("BorderStyle", "Solid")
+                .attr("Hidden", "false")
+                .attr("DestinationUniqueKey", target & 0xFFFF_FFFF);
+            let mut props = El::new("Properties");
+            props.push(p("Destination", "object", anchor_self(target)));
+            h.push(props);
+            root.push(h);
+        }
+        // Root colour group: the Swatches panel order.
+        let mut cg =
+            El::new("ColorGroup").attr("Self", "ColorGroup/[Root Color Group]").attr("Name", "[Root Color Group]").attr("IsRootColorGroup", "true");
+        let mut seen = HashSet::new();
+        for s in &d.swatches {
+            let id = self.sw(&s.name);
+            if seen.insert(id.clone()) {
+                let n = seen.len() - 1;
+                cg.push(El::new("ColorGroupSwatch").attr("Self", format!("u{:x}ColorGroupSwatch{n:x}", self.next + 1)).attr("SwatchItemRef", id));
+            }
+        }
+        self.next += 1;
+        root.push(cg);
+        document_with_pi(
+            &root,
+            &format!("<?aid style=\"50\" type=\"document\" readerVersion=\"6.0\" featureSet=\"257\" product=\"{DOM_VERSION}(1)\" ?>"),
+        )
+    }
+}
+
+pub(super) const CONTAINER: &str = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<container version=\"1.0\" xmlns=\"urn:oasis:names:tc:opendocument:xmlns:container\">\n\t<rootfiles>\n\t\t<rootfile full-path=\"designmap.xml\" media-type=\"text/xml\"/>\n\t</rootfiles>\n</container>\n";
+
+/// A cross-reference format as InDesign building blocks.
+fn xref_format_el(i: usize, f: &designcraft_doc::XrefFormat) -> El {
+    let me = xref_format_self(i);
+    let mut el = El::new("CrossReferenceFormat").attr("Self", &me).attr("Name", &f.name).attr("AppliedCharacterStyle", "n");
+    let mut k = 0;
+    let mut block = |el: &mut El, kind: &str, text: &str, delim: &str, include: bool| {
+        el.push(
+            El::new("BuildingBlock")
+                .attr("Self", format!("{me}BuildingBlock{k}"))
+                .attr("BlockType", kind)
+                .attr("AppliedCharacterStyle", "n")
+                .attr("CustomText", if text.is_empty() { "$ID/" } else { text })
+                .attr("AppliedDelimiter", if delim.is_empty() { "$ID/" } else { delim })
+                .attr("IncludeDelimiter", bool_s(include)),
+        );
+        k += 1;
+    };
+    let mut rest = f.definition.as_str();
+    while let Some(a) = rest.find('<') {
+        if a > 0 {
+            block(&mut el, "CustomStringBuildingBlock", &rest[..a], "", false);
+        }
+        let Some(b) = rest[a..].find('>') else { break };
+        let tag = rest[a + 1..a + b].trim().trim_end_matches('/').trim();
+        let attr = |k: &str| tag.find(&format!("{k}=\"")).and_then(|i| tag[i + k.len() + 2..].split('"').next()).unwrap_or("").to_string();
+        match tag.split_whitespace().next().unwrap_or("") {
+            "fullPara" => block(&mut el, "FullParagraphBuildingBlock", "", "", false),
+            "paraText" => block(&mut el, "ParagraphTextBuildingBlock", "", "", false),
+            "paraNum" => block(&mut el, "ParagraphNumberBuildingBlock", "", "", false),
+            "pageNum" => block(&mut el, "PageNumberBuildingBlock", "", "", false),
+            "txtAnchrName" => block(&mut el, "BookmarkNameBuildingBlock", "", "", false),
+            "chapNum" => block(&mut el, "ChapterNumberBuildingBlock", "", "", false),
+            "fileName" => block(&mut el, "FileNameBuildingBlock", "", "", false),
+            "partialPara" => block(&mut el, "PartialParagraphBuildingBlock", "", &attr("delim"), attr("includeDelim") == "true"),
+            _ => block(&mut el, "CustomStringBuildingBlock", &rest[a..a + b + 1], "", false),
+        }
+        rest = &rest[a + b + 1..];
+    }
+    if !rest.is_empty() {
+        block(&mut el, "CustomStringBuildingBlock", rest, "", false);
+    }
+    el
+}
+
+/// Package metadata: the creation and modification times that date variables show.
+pub(super) fn metadata_xmp(d: &Document) -> String {
+    use designcraft_doc::vars::format_date;
+    let iso = |t: i64| format!("{}:{:02}Z", format_date(t, "yyyy-MM-ddTHH:mm"), t.rem_euclid(60));
+    let modified = if d.modified > 0 { d.modified } else { d.created };
+    format!(
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<x:xmpmeta xmlns:x=\"adobe:ns:meta/\">\n <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n  <rdf:Description rdf:about=\"\" xmlns:xmp=\"http://ns.adobe.com/xap/1.0/\">\n   <xmp:CreateDate>{}</xmp:CreateDate>\n   <xmp:ModifyDate>{}</xmp:ModifyDate>\n  </rdf:Description>\n </rdf:RDF>\n</x:xmpmeta>\n",
+        iso(d.created),
+        iso(modified)
+    )
+}
+
+/// A `MojikumiTable` element with its spacing overrides.
+fn mojikumi_table_el(t: &designcraft_doc::cjk::MojikumiTable) -> El {
+    let mut e = El::new("MojikumiTable").attr("Self", format!("MojikumiTable/{}", escape_id(&t.name))).attr("Name", &t.name);
+    if !t.based_on.is_empty() {
+        e.set("BasedOnMojikumiSet", &t.based_on);
+    }
+    if !t.overrides.is_empty() {
+        let mut list = El::new("OverrideMojikumiAkiList");
+        for r in &t.overrides {
+            list.push(
+                El::new("OverrideMojikumiAkiType")
+                    .attr("TargetMojikumiClass", r.target_class)
+                    .attr("SideMojikumiClass", r.side_class)
+                    .attr("SideIsAfterTarget", bool_s(r.after))
+                    .attr("Minimum", num(r.minimum))
+                    .attr("Desired", num(r.desired))
+                    .attr("Maximum", num(r.maximum))
+                    .attr("CompressionPriority", r.priority)
+                    .attr("AkiDoesNotFloat", bool_s(r.does_not_float)),
+            );
+        }
+        e.push(El::new("Properties").child(list));
+    }
+    e
+}
+
+/// A `Layer` element with its colour property.
+fn layer_el(l: &designcraft_doc::Layer) -> El {
+    let color = match names::layer_color_out(l.color) {
+        Some(n) => p("LayerColor", "enumeration", n),
+        None => {
+            let mut e = El::new("LayerColor").attr("type", "list");
+            for c in l.color {
+                e.push(p("ListItem", "double", num(c as f64)));
+            }
+            e
+        }
+    };
+    let el = El::new("Layer")
+        .attr("Self", uid(l.id.0))
+        .attr("Name", &l.name)
+        .attr("Visible", bool_s(l.visible))
+        .attr("Locked", bool_s(l.locked))
+        .attr("IgnoreWrap", bool_s(l.suppress_wrap_when_hidden))
+        .attr("ShowGuides", bool_s(l.show_guides))
+        .attr("LockGuides", "false")
+        .attr("UI", "true")
+        .attr("Expendable", "true")
+        .attr("Printable", bool_s(l.printable));
+    with_props(el, vec![color])
+}
+
+/// A text variable definition with its type's settings element.
+fn text_variable_el(v: &designcraft_doc::vars::TextVariable) -> El {
+    use designcraft_doc::vars::{Use, VarKind};
+    let pref = |name: &str| El::new(name).attr("TextBefore", &v.before);
+    let (ty, settings) = match &v.kind {
+        VarKind::Custom { text } => ("CustomTextType", Some(pref("CustomTextVariablePreference").attr("Contents", text))),
+        VarKind::LastPageNumber { section } => (
+            "LastPageNumberType",
+            Some(
+                pref("PageNumberVariablePreference").attr("Format", "Current").attr("Scope", if *section { "SectionScope" } else { "DocumentScope" }),
+            ),
+        ),
+        VarKind::ChapterNumber => ("ChapterNumberType", Some(pref("ChapterNumberVariablePreference").attr("Format", "Current"))),
+        VarKind::FileName { extension } => {
+            ("FileNameType", Some(pref("FileNameVariablePreference").attr("IncludePath", "false").attr("IncludeExtension", bool_s(*extension))))
+        }
+        VarKind::CreationDate { format } => ("CreationDateType", Some(pref("DateVariablePreference").attr("Format", format))),
+        VarKind::ModificationDate { format } => ("ModificationDateType", Some(pref("DateVariablePreference").attr("Format", format))),
+        VarKind::OutputDate { format } => ("OutputDateType", Some(pref("DateVariablePreference").attr("Format", format))),
+        VarKind::RunningHeader { style, use_, character } => {
+            let (ty, el, key, style_ref) = if *character {
+                (
+                    "MatchCharacterStyleType",
+                    "MatchCharacterStylePreference",
+                    "AppliedCharacterStyle",
+                    names::style_self("CharacterStyle", CHAR_BUILTINS, style),
+                )
+            } else {
+                (
+                    "MatchParagraphStyleType",
+                    "MatchParagraphStylePreference",
+                    "AppliedParagraphStyle",
+                    names::style_self("ParagraphStyle", PARA_BUILTINS, style),
+                )
+            };
+            let strategy = if *use_ == Use::LastOnPage { "LastOnPage" } else { "FirstOnPage" };
+            (
+                ty,
+                Some(pref(el).attr(key, style_ref).attr("SearchStrategy", strategy).attr("ChangeCase", "None").attr("DeleteEndPunctuation", "false")),
+            )
+        }
+        VarKind::Imported { variable_type, settings_element, settings, .. } => {
+            let el = (!settings_element.is_empty()).then(|| El { name: settings_element.clone(), attrs: settings.clone(), children: vec![] });
+            (variable_type.as_str(), el)
+        }
+    };
+    let mut e = El::new("TextVariable").attr("Self", format!("dTextVariablen{}", v.name)).attr("Name", &v.name).attr("VariableType", ty);
+    if let Some(mut s) = settings {
+        if !matches!(v.kind, VarKind::Imported { .. }) {
+            s.set("TextAfter", &v.after);
+        }
+        e.push(s);
+    }
+    e
+}
diff --git a/crates/idml/src/export/fonts_prefs.rs b/crates/idml/src/export/fonts_prefs.rs
new file mode 100644
index 000000000..fac86af33
--- /dev/null
+++ b/crates/idml/src/export/fonts_prefs.rs
@@ -0,0 +1,174 @@
+use super::common::{bool_s, p, pct, pkg_root};
+use super::spread::margin_el;
+use super::{El, Ex, PARA_BUILTINS, document, escape_id, names, num, pt, st};
+
+impl<'a> Ex<'a> {
+    // ---------- Fonts.xml ----------
+
+    pub(super) fn note_font(&mut self, family: &str, style: &str) {
+        self.fonts.entry(family.to_string()).or_default().insert(style.to_string());
+    }
+
+    pub(super) fn fonts_part(&mut self) -> Vec<u8> {
+        let mut root = pkg_root("Fonts");
+        for f in &self.d.styles.composite_fonts {
+            let mut el = El::new("CompositeFont").attr("Self", format!("CompositeFont/{}", escape_id(&f.name))).attr("Name", &f.name);
+            for (i, e) in f.entries.iter().enumerate() {
+                self.note_font(&e.family, &e.style);
+                el.push(
+                    El::new("CompositeFontEntry")
+                        .attr("Self", format!("dcComposite{}_{i}", escape_id(&f.name)))
+                        .attr("Name", &e.name)
+                        .attr("CustomCharacters", &e.characters)
+                        .attr("FontStyle", &e.style)
+                        .attr("RelativeSize", num(e.relative_size * 100.0))
+                        .attr("HorizontalScale", num(e.horizontal_scale * 100.0))
+                        .attr("VerticalScale", num(e.vertical_scale * 100.0))
+                        .attr("BaselineShift", num(e.baseline_shift * 100.0))
+                        .attr("ScaleOption", bool_s(e.scale_option))
+                        .child(El::new("Properties").child(p("AppliedFont", "string", &e.family))),
+                );
+            }
+            root.push(el);
+        }
+        let fonts = std::mem::take(&mut self.fonts);
+        for (fam, styles) in &fonts {
+            let fid = format!("di{:x}", {
+                self.next += 1;
+                self.next
+            });
+            let mut fe = El::new("FontFamily").attr("Self", &fid).attr("Name", fam);
+            for s in styles {
+                fe.push(
+                    El::new("Font")
+                        .attr("Self", format!("{fid}Fontn{fam} {s}"))
+                        .attr("FontFamily", fam)
+                        .attr("Name", format!("{fam} {s}"))
+                        .attr("PostScriptName", format!("$ID/{}-{}", fam.replace(' ', ""), s.replace(' ', "")))
+                        .attr("Status", "NotAvailable")
+                        .attr("FontStyleName", s)
+                        .attr("FontType", "OpenTypeTT")
+                        .attr("WritingScript", "0")
+                        .attr("FullName", format!("{fam} {s}"))
+                        .attr("FullNameNative", format!("{fam} {s}"))
+                        .attr("FontStyleNameNative", s)
+                        .attr("PlatformName", "$ID/")
+                        .attr("Version", "$ID/")
+                        .attr("TypekitID", "$ID/"),
+                );
+            }
+            root.push(fe);
+        }
+        self.fonts = fonts;
+        document(&root)
+    }
+
+    // ---------- Preferences.xml ----------
+
+    pub(super) fn prefs_part(&mut self) -> Vec<u8> {
+        let d = self.d;
+        let s = &d.settings;
+        let mut root = pkg_root("Preferences");
+        root.push(
+            El::new("DocumentPreference")
+                .attr("PageHeight", num(s.page_height))
+                .attr("PageWidth", num(s.page_width))
+                // InDesign creates this many pages before reading the spreads and replaces only the first
+                // spread, so (as InDesign itself writes) the value must be 1.
+                .attr("PagesPerDocument", 1)
+                .attr("FacingPages", bool_s(s.facing_pages))
+                .attr("DocumentBleedTopOffset", num(s.bleed[0]))
+                .attr("DocumentBleedBottomOffset", num(s.bleed[1]))
+                .attr("DocumentBleedInsideOrLeftOffset", num(s.bleed[2]))
+                .attr("DocumentBleedOutsideOrRightOffset", num(s.bleed[3]))
+                .attr("DocumentBleedUniformSize", bool_s(s.bleed.iter().all(|b| *b == s.bleed[0])))
+                .attr("SlugTopOffset", num(s.slug[0]))
+                .attr("SlugBottomOffset", num(s.slug[1]))
+                .attr("SlugInsideOrLeftOffset", num(s.slug[2]))
+                .attr("SlugRightOrOutsideOffset", num(s.slug[3]))
+                .attr("DocumentSlugUniformSize", bool_s(s.slug.iter().all(|b| *b == s.slug[0])))
+                .attr("PreserveLayoutWhenShuffling", "true")
+                .attr("AllowPageShuffle", "true")
+                .attr("OverprintBlack", bool_s(s.overprint_black))
+                .attr("PageBinding", if s.right_to_left_binding { "RightToLeft" } else { "LeftToRight" })
+                .attr("ColumnDirection", "Horizontal")
+                .attr(
+                    "Intent",
+                    match s.intent {
+                        designcraft_doc::Intent::Print => "PrintIntent",
+                        designcraft_doc::Intent::Web => "WebIntent",
+                        designcraft_doc::Intent::Mobile => "MobileIntent",
+                    },
+                )
+                .attr("CreatePrimaryTextFrame", bool_s(s.primary_text_frame))
+                .attr("ColumnGuideLocked", bool_s(s.column_guides_locked))
+                .attr("MasterTextFrame", bool_s(s.primary_text_frame))
+                .attr("SnippetImportUsesOriginalLocation", "false"),
+        );
+        let page = d.parents.first().and_then(|p| p.pages.first()).or_else(|| d.page(0));
+        if let Some(pg) = page {
+            root.push(margin_el(pg));
+        }
+        root.push(
+            El::new("ViewPreference")
+                .attr("HorizontalMeasurementUnits", names::unit_out(s.horizontal_units))
+                .attr("VerticalMeasurementUnits", names::unit_out(s.vertical_units))
+                .attr(
+                    "RulerOrigin",
+                    match s.ruler_origin {
+                        designcraft_doc::RulerOrigin::Spread => "SpreadOrigin",
+                        designcraft_doc::RulerOrigin::Page => "PageOrigin",
+                        designcraft_doc::RulerOrigin::Spine => "SpineOrigin",
+                    },
+                )
+                .attr("CursorKeyIncrement", num(s.keyboard_increment))
+                .attr("PointsPerInch", "72"),
+        );
+        let bg = &s.baseline_grid;
+        root.push(
+            El::new("GridPreference")
+                .attr("HorizontalGridlineDivision", num(s.grid.horizontal))
+                .attr("VerticalGridlineDivision", num(s.grid.vertical))
+                .attr("HorizontalGridSubdivision", s.grid.subdivisions)
+                .attr("VerticalGridSubdivision", s.grid.subdivisions)
+                .attr("GridsInBack", bool_s(s.grid.in_back))
+                .attr("BaselineStart", num(bg.start))
+                .attr("BaselineDivision", num(bg.increment))
+                .attr("BaselineViewThreshold", pct(bg.view_threshold))
+                .attr(
+                    "BaselineGridRelativeOption",
+                    match bg.relative_to {
+                        designcraft_doc::GridRelative::TopOfPage => "TopOfPageOfBaselineGridRelativeOption",
+                        designcraft_doc::GridRelative::TopMargin => "TopOfMarginOfBaselineGridRelativeOption",
+                    },
+                ),
+        );
+        root.push(El::new("PasteboardPreference").attr("PasteboardMargins", pt(s.pasteboard.0, s.pasteboard.1)));
+        root.push(self.footnote_option_el());
+        root.push(El::new("TransparencyPreference").attr(
+            "BlendingSpace",
+            match s.blend_space {
+                designcraft_doc::BlendSpace::Cmyk => "CMYK",
+                designcraft_doc::BlendSpace::Rgb => "RGB",
+            },
+        ));
+        // Split Document: the style is a reference, a built-in one by its `$ID/` name; an empty
+        // one splits on the styles' export tags.
+        let (break_doc, split_style) = match &s.epub_split {
+            designcraft_doc::EpubSplit::Off => (false, names::style_name_out(PARA_BUILTINS, st::BASIC_PARAGRAPH)),
+            designcraft_doc::EpubSplit::ExportTags => (true, String::new()),
+            designcraft_doc::EpubSplit::Style(n) if PARA_BUILTINS.iter().any(|(o, _)| o == n) => (true, names::style_name_out(PARA_BUILTINS, n)),
+            designcraft_doc::EpubSplit::Style(n) => (true, names::style_self("ParagraphStyle", PARA_BUILTINS, n)),
+        };
+        root.push(El::new("EPubExportPreference").attr("BreakDocument", bool_s(break_doc)).attr("ParagraphStyleName", split_style));
+        let a = &s.advanced_type;
+        root.push(
+            El::new("TextPreference")
+                .attr("SuperscriptSize", num(a.superscript_size))
+                .attr("SuperscriptPosition", num(a.superscript_position))
+                .attr("SubscriptSize", num(a.subscript_size))
+                .attr("SubscriptPosition", num(a.subscript_position)),
+        );
+        document(&root)
+    }
+}
diff --git a/crates/idml/src/export/graphics.rs b/crates/idml/src/export/graphics.rs
new file mode 100644
index 000000000..3730166a6
--- /dev/null
+++ b/crates/idml/src/export/graphics.rs
@@ -0,0 +1,249 @@
+use super::common::{bool_s, color_value, pct, pkg_root};
+use super::{Color, ColorType, El, Ex, GradientKind, SwatchValue, document, escape_id, num, swatch};
+
+// Retained IDML attributes have unprefixed ASCII names. Native JSON can be
+// edited independently: never let its map keys become XML syntax or Self IDs.
+pub(super) fn graphic_layer_attribute_name(key: &str) -> bool {
+    !key.is_empty()
+        && key != "Self"
+        && key != "xmlns"
+        && key.bytes().enumerate().all(|(i, b)| b.is_ascii_alphabetic() || b == b'_' || (i > 0 && (b.is_ascii_digit() || matches!(b, b'.' | b'-'))))
+}
+
+impl<'a> Ex<'a> {
+    /// A `Gradient` element; stop colours missing from the swatches become anonymous colours.
+    fn gradient_el(
+        &mut self,
+        s: &designcraft_color::Swatch,
+        gradient: &designcraft_color::Gradient,
+        colors: &mut Vec<El>,
+        by_value: &mut Vec<(Color, String)>,
+    ) -> El {
+        let id = self.sw(&s.name);
+        let mut g = El::new("Gradient")
+            .attr("Self", &id)
+            .attr("Type", if gradient.kind == GradientKind::Radial { "Radial" } else { "Linear" })
+            .attr("Name", &s.name)
+            .attr("ColorEditable", "true")
+            .attr("ColorRemovable", "true")
+            .attr("Visible", "true")
+            .attr("SwatchCreatorID", "7937");
+        let d = self.d;
+        for (i, stop) in gradient.stops.iter().enumerate() {
+            // A stop on a swatch names it; a plain color names an equal color swatch or
+            // an unnamed color.
+            let named =
+                stop.swatch.as_deref().filter(|n| d.swatch(n).is_some_and(|w| !matches!(w.value, SwatchValue::Gradient { .. } | SwatchValue::None)));
+            let cid = match (named, by_value.iter().find(|(c, _)| *c == stop.color)) {
+                (Some(n), _) => self.sw(n),
+                (None, Some((_, id))) => id.clone(),
+                (None, None) => {
+                    let cid = format!("Color/{}", self.fresh());
+                    colors.push(color_el(&cid, "$ID/", "Process", &stop.color, "Normal", (true, true, false)));
+                    by_value.push((stop.color, cid.clone()));
+                    cid
+                }
+            };
+            let mut e = El::new("GradientStop")
+                .attr("Self", format!("{}GradientStop{i}", id.replace(['/', ' '], "_")))
+                .attr("StopColor", cid)
+                .attr("Location", pct(stop.offset as f64));
+            if i > 0 {
+                e.set("Midpoint", pct(gradient.stops[i - 1].midpoint as f64));
+            }
+            g.push(e);
+        }
+        g
+    }
+
+    // ---------- Graphic.xml ----------
+
+    pub(super) fn graphic_part(&mut self) -> Vec<u8> {
+        let d = self.d;
+        let mut root = pkg_root("Graphic");
+        let mut colors: Vec<El> = Vec::new();
+        let mut tints: Vec<El> = Vec::new();
+        let mut gradients: Vec<El> = Vec::new();
+        let mut inks: Vec<El> = Vec::new();
+        // Specials (always present).
+        colors.push(color_el("Color/Black", "Black", "Process", &Color::cmyk(0.0, 0.0, 0.0, 1.0), "Specialblack", (false, false, true)));
+        let paper = match d.swatch(swatch::PAPER).map(|s| &s.value) {
+            Some(SwatchValue::Paper { color }) => *color,
+            _ => Color::cmyk(0.0, 0.0, 0.0, 0.0),
+        };
+        let paper = if paper == Color::WHITE { Color::cmyk(0.0, 0.0, 0.0, 0.0) } else { paper };
+        colors.push(color_el("Color/Paper", "Paper", "Process", &paper, "Specialpaper", (true, false, true)));
+        colors.push(color_el(
+            "Color/Registration",
+            "Registration",
+            "Registration",
+            &Color::cmyk(1.0, 1.0, 1.0, 1.0),
+            "Specialregistration",
+            (false, false, true),
+        ));
+        for (i, ink) in
+            [("Process Cyan", 75, 0.61), ("Process Magenta", 15, 0.76), ("Process Yellow", 0, 0.16), ("Process Black", 45, 1.7)].iter().enumerate()
+        {
+            inks.push(
+                El::new("Ink")
+                    .attr("Self", format!("Ink/$ID/{}", ink.0))
+                    .attr("Name", format!("$ID/{}", ink.0))
+                    .attr("Angle", ink.1)
+                    .attr("ConvertToProcess", "false")
+                    .attr("Frequency", "70")
+                    .attr("NeutralDensity", num(ink.2))
+                    .attr("PrintInk", "true")
+                    .attr("TrapOrder", i + 1)
+                    .attr("InkType", "Normal"),
+            );
+        }
+        // Colour swatches, by value, for gradient stop lookup.
+        let mut by_value: Vec<(Color, String)> = Vec::new();
+        for s in &d.swatches {
+            if s.is_special() {
+                continue;
+            }
+            let id = self.sw(&s.name);
+            match &s.value {
+                SwatchValue::Color { color, color_type } => {
+                    let model = if *color_type == ColorType::Spot { "Spot" } else { "Process" };
+                    colors.push(color_el(&id, &s.name, model, color, "Normal", (true, true, true)));
+                    by_value.push((*color, id.clone()));
+                    if *color_type == ColorType::Spot {
+                        let mut ink = El::new("Ink");
+                        if let Some((_, to)) = d.inks.aliases.iter().find(|(a, _)| *a == s.name) {
+                            ink.set("AliasInkName", to);
+                        }
+                        let convert = d.inks.all_to_process || d.inks.to_process.contains(&s.name);
+                        inks.push(
+                            ink.attr("Self", format!("Ink/{}", escape_id(&s.name)))
+                                .attr("Name", &s.name)
+                                .attr("Angle", "45")
+                                .attr("ConvertToProcess", bool_s(convert))
+                                .attr("Frequency", "70")
+                                .attr("NeutralDensity", "0.5")
+                                .attr("PrintInk", "true")
+                                .attr("TrapOrder", inks.len() + 1)
+                                .attr("InkType", "Normal"),
+                        );
+                    }
+                }
+                SwatchValue::Tint { base, tint } => {
+                    tints.push(
+                        El::new("Tint")
+                            .attr("Self", &id)
+                            .attr("TintValue", pct(*tint as f64))
+                            .attr("BaseColor", self.sw(base))
+                            .attr("Name", &s.name)
+                            .attr("ColorOverride", "Normal")
+                            .attr("AlternateSpace", "NoAlternateColor")
+                            .attr("AlternateColorValue", "")
+                            .attr("ColorEditable", "true")
+                            .attr("ColorRemovable", "true")
+                            .attr("Visible", "true")
+                            .attr("SwatchCreatorID", "7937"),
+                    );
+                }
+                _ => {}
+            }
+        }
+        for s in &d.swatches {
+            let SwatchValue::Gradient { gradient } = &s.value else { continue };
+            gradients.push(self.gradient_el(s, gradient, &mut colors, &mut by_value));
+        }
+        for c in colors {
+            root.push(c);
+        }
+        for i in inks {
+            root.push(i);
+        }
+        for t in tints {
+            root.push(t);
+        }
+        root.push(
+            El::new("Swatch")
+                .attr("Self", "Swatch/None")
+                .attr("Name", "None")
+                .attr("ColorEditable", "false")
+                .attr("ColorRemovable", "false")
+                .attr("Visible", "true")
+                .attr("SwatchCreatorID", "7937"),
+        );
+        for g in gradients {
+            root.push(g);
+        }
+        for (gi, g) in d.color_groups.iter().enumerate() {
+            let mut el = El::new("ColorGroup")
+                .attr("Self", format!("ColorGroup/{}", escape_id(&g.name)))
+                .attr("Name", &g.name)
+                .attr("IsRootColorGroup", "false");
+            for (k, n) in g.swatches.iter().enumerate() {
+                if let Some(id) = self.swatch_ids.get(n) {
+                    el.push(El::new("ColorGroupSwatch").attr("Self", format!("u{gi}ColorGroupSwatch{k}")).attr("SwatchItemRef", id));
+                }
+            }
+            root.push(el);
+        }
+        for st in &d.stroke_styles {
+            let id = format!("CustomStrokeStyle/{}", st.name);
+            let pcts = |v: &[f64]| v.iter().map(|x| num(x * 100.0)).collect::<Vec<_>>().join(" ");
+            let el = match &st.kind {
+                designcraft_doc::StrokeType::Stripes { bands } => {
+                    let flat: Vec<f64> = bands.iter().flat_map(|(a, w)| [*a, a + w]).collect();
+                    Some(El::new("StripedStrokeStyle").attr("StripeArray", pcts(&flat)))
+                }
+                designcraft_doc::StrokeType::Dashed { pattern } => {
+                    Some(El::new("DashedStrokeStyle").attr("DashArray", pattern.iter().map(|x| num(*x)).collect::<Vec<_>>().join(" ")))
+                }
+                designcraft_doc::StrokeType::Dotted => Some(El::new("DottedStrokeStyle").attr("DotArray", "0 200")),
+                _ => None,
+            };
+            if let Some(el) = el {
+                root.push(el.attr("Self", id).attr("Name", &st.name));
+            }
+        }
+        for s in STROKE_STYLES {
+            root.push(El::new("StrokeStyle").attr("Self", format!("StrokeStyle/$ID/{s}")).attr("Name", format!("$ID/{s}")));
+        }
+        document(&root)
+    }
+}
+
+const STROKE_STYLES: &[&str] = &[
+    "Triple_Stroke",
+    "ThickThinThick",
+    "ThinThickThin",
+    "ThickThick",
+    "ThickThin",
+    "ThinThick",
+    "ThinThin",
+    "Japanese Dots",
+    "White Diamond",
+    "Left Slant Hash",
+    "Right Slant Hash",
+    "Straight Hash",
+    "Wavy",
+    "Canned Dotted",
+    "Canned Dashed 3x2",
+    "Canned Dashed 4x4",
+    "Dashed",
+    "Solid",
+];
+
+/// A `Color` element. `flags` is (editable, removable, visible).
+fn color_el(self_id: &str, name: &str, model: &str, c: &Color, over: &str, (editable, removable, visible): (bool, bool, bool)) -> El {
+    let (space, val) = color_value(c);
+    El::new("Color")
+        .attr("Self", self_id)
+        .attr("Model", model)
+        .attr("Space", space)
+        .attr("ColorValue", val)
+        .attr("ColorOverride", over)
+        .attr("AlternateSpace", "NoAlternateColor")
+        .attr("AlternateColorValue", "")
+        .attr("Name", name)
+        .attr("ColorEditable", bool_s(editable))
+        .attr("ColorRemovable", bool_s(removable))
+        .attr("Visible", bool_s(visible))
+        .attr("SwatchCreatorID", "7937")
+}
diff --git a/crates/idml/src/export/item.rs b/crates/idml/src/export/item.rs
new file mode 100644
index 000000000..371718b65
--- /dev/null
+++ b/crates/idml/src/export/item.rs
@@ -0,0 +1,516 @@
+use super::common::{affine_s, bool_s, p, pct, uid, with_props};
+use super::{
+    Affine, ColumnsKind, Content, El, Ex, HashSet, Item, Node, OBJECT_BUILTINS, PathData, Shape, TextFrameOptions, base64_encode, escape_id, names,
+    num, pt,
+};
+
+impl<'a> Ex<'a> {
+    pub(super) fn item_el(&mut self, it: &Item, xf: Affine) -> El {
+        let d = self.d;
+        let path_text = matches!(&it.content, Content::Text(t) if t.options.path.is_some());
+        let tag = match (&it.content, it.shape) {
+            (Content::Text(_), _) if path_text => match it.shape {
+                Shape::GraphicLine => "GraphicLine",
+                Shape::Oval => "Oval",
+                Shape::Rectangle => "Rectangle",
+                _ => "Polygon",
+            },
+            (Content::Text(_), _) => "TextFrame",
+            (Content::Group { .. }, Shape::Group) => "Group",
+            (_, Shape::Oval) => "Oval",
+            (_, Shape::Polygon) | (_, Shape::Path) => "Polygon",
+            (_, Shape::GraphicLine) => "GraphicLine",
+            _ => "Rectangle",
+        };
+        let mut el = El::new(tag).attr("Self", uid(it.id.0));
+        if let Some(o) = it.overrides {
+            el.set("OverriddenPageItem", uid(o.0));
+        }
+        if let Content::Text(t) = &it.content
+            && let Some(pt) = &t.options.path
+        {
+            // Type on a path: a TextPath child holds the story.
+            let len = designcraft_geom::warp::PathWarp::new(&it.path.to_bezpath(), false).length();
+            el.push(
+                El::new("TextPath")
+                    .attr("Self", format!("{}tp", uid(it.id.0)))
+                    .attr("ParentStory", uid(t.story.0))
+                    .attr("PreviousTextFrame", "n")
+                    .attr("NextTextFrame", "n")
+                    .attr("PathEffect", "RainbowPathEffect")
+                    .attr("PathAlignment", "CenterPathAlignment")
+                    .attr("TextAlignment", names::path_align_out(pt.align))
+                    .attr("FlipPathEffect", if pt.flip { "Flipped" } else { "NotFlipped" })
+                    .attr("StartBracket", num(pt.start))
+                    .attr("EndBracket", num(pt.end.map_or(len, |e| e.min(len)))),
+            );
+        } else if let Content::Text(t) = &it.content {
+            let (prev, next) = self.threads.get(&it.id.0).copied().unwrap_or((None, None));
+            el.set("ParentStory", uid(t.story.0));
+            el.set("PreviousTextFrame", prev.map(uid).unwrap_or_else(|| "n".into()));
+            el.set("NextTextFrame", next.map(uid).unwrap_or_else(|| "n".into()));
+        }
+        if tag != "Group" {
+            el.set(
+                "ContentType",
+                match it.content {
+                    Content::Text(_) => "TextType",
+                    Content::Graphic(_) => "GraphicType",
+                    _ => "Unassigned",
+                },
+            );
+        }
+        el.set("Name", if it.name.is_empty() { "$ID/".to_string() } else { it.name.clone() });
+        el.set("ItemLayer", uid(it.layer.0));
+        el.set("Visible", bool_s(!it.hidden));
+        el.set("Locked", bool_s(it.locked));
+        el.set("Nonprinting", bool_s(it.nonprinting));
+        let os = if it.object_style.is_empty() { designcraft_doc::NO_OBJECT_STYLE } else { &it.object_style };
+        el.set("AppliedObjectStyle", names::style_self("ObjectStyle", OBJECT_BUILTINS, os));
+        el.set("ItemTransform", affine_s(xf));
+        el.set("FillColor", self.sw(&it.fill.swatch));
+        el.set("FillTint", pct(it.fill.tint as f64));
+        el.set("OverprintFill", bool_s(it.fill.overprint));
+        if let Some([x0, y0, x1, y1]) = it.fill.gradient_vector {
+            // Gradient Swatch tool vector: start, length and angle in the item's space.
+            el.set("GradientFillStart", format!("{} {}", num(x0), num(y0)));
+            el.set("GradientFillLength", num((x1 - x0).hypot(y1 - y0)));
+            el.set("GradientFillAngle", num((-(y1 - y0)).atan2(x1 - x0).to_degrees()));
+        } else if let Some(a) = it.fill.gradient_angle {
+            el.set("GradientFillAngle", num(a));
+        }
+        // The same on the stroke.
+        if let Some([x0, y0, x1, y1]) = it.stroke.gradient_vector {
+            el.set("GradientStrokeStart", format!("{} {}", num(x0), num(y0)));
+            el.set("GradientStrokeLength", num((x1 - x0).hypot(y1 - y0)));
+            el.set("GradientStrokeAngle", num((-(y1 - y0)).atan2(x1 - x0).to_degrees()));
+        } else if let Some(a) = it.stroke.gradient_angle {
+            el.set("GradientStrokeAngle", num(a));
+        }
+        self.stroke_attrs(&mut el, &it.stroke);
+        // Corner options: map path-order corners to the named corners by geometry.
+        if !it.corners.is_none() {
+            let names_by_index = corner_names(&it.path);
+            for (i, c) in it.corners.corners.iter().enumerate() {
+                let n = names_by_index[i];
+                el.set(&format!("{n}CornerOption"), names::corner_out(c.shape));
+                el.set(&format!("{n}CornerRadius"), num(c.size));
+            }
+        }
+        let mut props = Vec::new();
+        if tag != "Group" && !it.path.is_empty() {
+            props.push(path_geometry(&it.path));
+        }
+        let mut el = with_props(el, props);
+        self.append_transparency(&mut el, it, os);
+        if let Content::Text(t) = &it.content {
+            el.push(text_frame_pref(&t.options, &self.sw(&t.options.column_rule_color)));
+            if let Some(g) = t.options.baseline_grid {
+                el.push(
+                    El::new("BaselineFrameGridOption")
+                        .attr("UseCustomBaselineFrameGrid", "true")
+                        .attr("StartingOffsetForBaselineFrameGrid", num(g.start))
+                        .attr(
+                            "BaselineFrameGridRelativeOption",
+                            match g.relative_to {
+                                designcraft_doc::FrameGridRelative::TopOfPage => "TopOfPageOfBaselineFrameGridRelativeOption",
+                                designcraft_doc::FrameGridRelative::TopMargin => "TopOfMarginOfBaselineFrameGridRelativeOption",
+                                designcraft_doc::FrameGridRelative::TopOfFrame => "TopOfFrameOfBaselineFrameGridRelativeOption",
+                                designcraft_doc::FrameGridRelative::TopInset => "TopOfInsetOfBaselineFrameGridRelativeOption",
+                            },
+                        )
+                        .attr("BaselineFrameGridIncrement", num(g.increment)),
+                );
+            }
+        }
+        el.push(text_wrap_pref(&it.wrap));
+        match &it.content {
+            Content::Group { items } => {
+                for c in items {
+                    let e = self.item_el(c, c.xf);
+                    el.push(e);
+                }
+            }
+            Content::Graphic(g) => {
+                if g.auto_fit != designcraft_doc::Fitting::None || g.fit_align != 4 || g.crop != [0.0; 4] {
+                    el.push(
+                        El::new("FrameFittingOption")
+                            .attr("AutoFit", bool_s(g.auto_fit != designcraft_doc::Fitting::None))
+                            .attr("TopCrop", num(g.crop[0]))
+                            .attr("LeftCrop", num(g.crop[1]))
+                            .attr("BottomCrop", num(g.crop[2]))
+                            .attr("RightCrop", num(g.crop[3]))
+                            .attr("FittingOnEmptyFrame", names::fitting_out(g.auto_fit))
+                            .attr("FittingAlignment", names::anchor_out(g.fit_align)),
+                    );
+                }
+                if let Some(asset) = d.assets.get(&g.asset) {
+                    let e = self.image_el(asset, g);
+                    el.push(e);
+                }
+            }
+            _ => {}
+        }
+        el
+    }
+
+    fn append_transparency(&self, el: &mut El, it: &Item, os: &str) {
+        // Transparency.
+        // An item whose style sets effects writes the effects it has turned off too, so that on
+        // import it doesn't take the style's.
+        let styled = self.d.styles.object_effects(os).is_some();
+        let ds = &it.effects.drop_shadow;
+        let (gf, df) = (&it.effects.gradient_feather, &it.effects.directional_feather);
+        if it.opacity < 1.0 || it.blend != designcraft_color::BlendMode::Normal || ds.on || it.effects.feather > 0.0 || gf.on || df.on || styled {
+            let mut t = El::new("TransparencySetting");
+            t.push(El::new("BlendingSetting").attr("BlendMode", names::blend_out(it.blend)).attr("Opacity", pct(it.opacity as f64)));
+            for c in self.effect_els(&it.effects, styled) {
+                t.push(c);
+            }
+            if df.on {
+                let [top, left, bottom, right] = df.widths;
+                t.push(
+                    El::new("DirectionalFeatherSetting")
+                        .attr("Applied", "true")
+                        .attr("LeftWidth", num(left))
+                        .attr("RightWidth", num(right))
+                        .attr("TopWidth", num(top))
+                        .attr("BottomWidth", num(bottom)),
+                );
+            }
+            if gf.on {
+                let mut g = El::new("GradientFeatherSetting").attr("Applied", "true").attr("Type", if gf.radial { "Radial" } else { "Linear" });
+                if let Some([x0, y0, x1, y1]) = gf.vector {
+                    // Gradient Feather tool vector: start, length and angle in the item's space.
+                    g.set("Angle", num((-(y1 - y0)).atan2(x1 - x0).to_degrees()));
+                    g.set("Length", num((x1 - x0).hypot(y1 - y0)));
+                    g.set("GradientStart", format!("{} {}", num(x0), num(y0)));
+                } else {
+                    g.set("Angle", num(gf.angle));
+                }
+                let id = uid(it.id.0);
+                for (i, (opacity, location)) in [(gf.start, 0.0), (gf.end, 100.0)].into_iter().enumerate() {
+                    let mut s = El::new("OpacityGradientStop")
+                        .attr("Self", format!("{id}TransparencySetting1GradientFeatherSetting1OpacityGradientStop{i}"))
+                        .attr("Opacity", pct(opacity as f64))
+                        .attr("Location", num(location));
+                    if i > 0 {
+                        s.set("Midpoint", "50");
+                    }
+                    g.push(s);
+                }
+                t.push(g);
+            }
+            el.push(t);
+        }
+    }
+
+    /// The `TransparencySetting` children for `e`'s drop shadow and feather; `all` also writes the
+    /// effects that are off (`Mode="None"`), as an object style that sets effects does.
+    pub(super) fn effect_els(&self, e: &designcraft_doc::Effects, all: bool) -> Vec<El> {
+        let mut out = Vec::new();
+        let ds = &e.drop_shadow;
+        if ds.on || all {
+            let a = self.d.light_angle(ds.angle, ds.global_light).to_radians();
+            out.push(
+                El::new("DropShadowSetting")
+                    .attr("Mode", if ds.on { "Drop" } else { "None" })
+                    .attr("XOffset", num(-ds.distance * a.cos()))
+                    .attr("YOffset", num(ds.distance * a.sin()))
+                    .attr("Size", num(ds.size))
+                    .attr("Spread", num(ds.spread))
+                    .attr("Opacity", pct(ds.opacity as f64))
+                    .attr("BlendMode", names::blend_out(ds.mode))
+                    .attr("EffectColor", self.sw(&ds.color)),
+            );
+        }
+        if e.feather > 0.0 || all {
+            let corners = match e.feather_options.corners {
+                designcraft_doc::FeatherCorners::Sharp => "Sharp",
+                designcraft_doc::FeatherCorners::Rounded => "Rounded",
+                designcraft_doc::FeatherCorners::Diffused => "Diffusion",
+            };
+            out.push(
+                El::new("FeatherSetting")
+                    .attr("Mode", if e.feather > 0.0 { "Standard" } else { "None" })
+                    .attr("Width", num(e.feather))
+                    .attr("ChokeAmount", num(e.feather_options.choke))
+                    .attr("CornerType", corners),
+            );
+        }
+        out
+    }
+
+    fn image_el(&mut self, asset: &designcraft_doc::Asset, g: &designcraft_doc::Graphic) -> El {
+        let is_pdf = asset.mime == "application/pdf";
+        let is_eps = asset.mime == "application/postscript" || designcraft_images::is_eps(&asset.data);
+        let mut el = El::new(if is_eps {
+            "EPS"
+        } else if is_pdf {
+            "PDF"
+        } else {
+            "Image"
+        })
+        .attr("Self", self.fresh());
+        // A PDF is vector: its page size in `pixels` isn't a resolution, and a cropped graphic
+        // spans less than the page. An EPS's `pixels` is its preview raster, so it still counts.
+        if let Some((pw, ph)) = asset.pixels.filter(|_| !is_pdf)
+            && g.size.0 > 0.0
+            && g.size.1 > 0.0
+        {
+            el.set("ActualPpi", pt(pw as f64 * 72.0 / g.size.0, ph as f64 * 72.0 / g.size.1));
+        }
+        el.set("ItemTransform", affine_s(g.xf));
+        // The swatch that colours a greyscale or bitmap image; written only when it exists.
+        if !g.fill.is_none()
+            && let Some(id) = self.swatch_ids.get(&g.fill.swatch)
+        {
+            el.set("FillColor", id.clone());
+            el.set("FillTint", pct(g.fill.tint as f64));
+        }
+        let embed = !asset.data.is_empty() && (self.opts.embed_images || asset.link.is_none());
+        let mut props = Vec::new();
+        if embed {
+            let mut c = El::new("Contents");
+            c.children.push(Node::CData(base64_encode(&asset.data)));
+            props.push(c);
+        }
+        props.push(El::new("GraphicBounds").attr("Left", "0").attr("Top", "0").attr("Right", num(g.size.0)).attr("Bottom", num(g.size.1)));
+        let mut el = with_props(el, props);
+        if !g.wrap.is_default() {
+            el.push(text_wrap_pref(&g.wrap));
+        }
+        if let Some(c) = &g.clip {
+            el.push(clipping_settings(c));
+        }
+        if let Some(options) = &g.layer_options {
+            el.push(self.layer_option_el(options));
+        }
+        let uri = match &asset.link {
+            Some(l) => path_to_uri(l),
+            None => format!("file:{}", asset.name),
+        };
+        el.push(
+            El::new("Link")
+                .attr("Self", self.fresh())
+                .attr("AssetURL", "$ID/")
+                .attr("AssetID", "$ID/")
+                .attr("LinkResourceURI", uri)
+                .attr("LinkResourceFormat", format!("$ID/{}", format_name(if is_eps { "application/postscript" } else { &asset.mime })))
+                .attr("StoredState", if embed { "Embedded" } else { "Normal" })
+                .attr("LinkClassID", "35906")
+                .attr("LinkClientID", "257")
+                .attr("LinkResourceModified", "false")
+                .attr("LinkObjectModified", "false")
+                .attr("ShowInUI", "true")
+                .attr("CanEmbed", "true")
+                .attr("CanUnembed", "true")
+                .attr("CanPackage", "true")
+                .attr("ImportPolicy", "NoAutoImport")
+                .attr("ExportPolicy", "NoAutoExport"),
+        );
+        if is_pdf {
+            // `GraphicBounds` span the chosen box, as graphic space does. Without `PDFAttribute`
+            // the page would be cropped to its visible content, which changes the graphic's size
+            // and so its scale and position.
+            el.push(
+                El::new("PDFAttribute")
+                    .attr("PageNumber", asset.page.saturating_add(1))
+                    .attr("PDFCrop", names::pdf_crop_out(asset.pdf_crop))
+                    .attr("TransparentBackground", "true"),
+            );
+        }
+        el
+    }
+}
+
+/// Style folder tree (names `A/B/C` → groups A, B).
+#[derive(Default)]
+pub(super) struct Group {
+    styles: Vec<El>,
+    groups: Vec<(String, Group)>,
+}
+
+impl Group {
+    pub(super) fn insert(&mut self, name: &str, el: El) {
+        let builtin = name.starts_with('[');
+        let mut segs: Vec<&str> = if builtin { vec![name] } else { name.split('/').collect() };
+        let _leaf = segs.pop();
+        let mut g = self;
+        for s in segs {
+            let i = match g.groups.iter().position(|(n, _)| n == s) {
+                Some(i) => i,
+                None => {
+                    g.groups.push((s.to_string(), Group::default()));
+                    g.groups.len() - 1
+                }
+            };
+            g = &mut g.groups[i].1;
+        }
+        g.styles.push(el);
+    }
+
+    pub(super) fn emit(self, parent: &mut El, kind: &str, path: &str) {
+        for s in self.styles {
+            parent.push(s);
+        }
+        for (name, g) in self.groups {
+            let full = if path.is_empty() { name.clone() } else { format!("{path}:{name}") };
+            let mut ge = El::new(kind).attr("Self", format!("{kind}/{}", escape_id(&full))).attr("Name", &name);
+            g.emit(&mut ge, kind, &full);
+            parent.push(ge);
+        }
+    }
+}
+
+/// `rule_color` is the IDML reference of the column rule's swatch.
+/// `TextWrapPreference` of a page item or a placed graphic.
+fn text_wrap_pref(w: &designcraft_doc::TextWrap) -> El {
+    with_props(
+        El::new("TextWrapPreference")
+            .attr("Inverse", bool_s(w.invert))
+            .attr("ApplyToMasterPageOnly", "false")
+            .attr("TextWrapSide", names::wrap_side_out(w.side))
+            .attr("TextWrapMode", names::wrap_mode_out(w.mode)),
+        w.path
+            .iter()
+            .filter(|p| !p.is_empty())
+            .map(path_geometry)
+            .chain([El::new("TextWrapOffset")
+                .attr("Top", num(w.offsets[0]))
+                .attr("Left", num(w.offsets[1]))
+                .attr("Bottom", num(w.offsets[2]))
+                .attr("Right", num(w.offsets[3]))])
+            .collect(),
+    )
+    .child(El::new("ContourOption").attr("ContourType", names::contour_type_out(w.contour)).attr("IncludeInsideEdges", "false"))
+}
+
+pub(super) fn text_frame_pref(o: &TextFrameOptions, rule_color: &str) -> El {
+    let mut inset = El::new("InsetSpacing").attr("type", "list");
+    for v in o.inset {
+        inset.push(p("ListItem", "unit", num(v)));
+    }
+    let el = El::new("TextFramePreference")
+        .attr("TextColumnCount", o.columns.max(1))
+        .attr("TextColumnGutter", num(o.gutter))
+        .attr("UseFixedColumnWidth", bool_s(o.columns_kind == ColumnsKind::FixedWidth))
+        .attr("UseFlexibleColumnWidth", bool_s(o.columns_kind == ColumnsKind::FlexibleWidth))
+        .attr("VerticalBalanceColumns", bool_s(o.balance_columns))
+        .attr("FirstBaselineOffset", names::first_baseline_out(o.first_baseline))
+        .attr("MinimumFirstBaselineOffset", num(o.first_baseline_min))
+        .attr("VerticalJustification", names::vj_out(o.vertical_justification))
+        .attr("VerticalThreshold", num(o.vj_paragraph_spacing_limit))
+        .attr("IgnoreWrap", bool_s(o.ignore_wrap))
+        .attr("AutoSizingType", names::auto_size_out(o.auto_size))
+        .attr("AutoSizingReferencePoint", names::REF_POINTS[(o.auto_size_ref as usize).min(8)])
+        .attr("UseMinimumHeightForAutoSizing", bool_s(o.auto_size_use_min_height))
+        .attr("MinimumHeightForAutoSizing", num(o.auto_size_min_height))
+        .attr("UseMinimumWidthForAutoSizing", bool_s(o.auto_size_use_min_width))
+        .attr("MinimumWidthForAutoSizing", num(o.auto_size_min_width))
+        .attr("UseNoLineBreaksForAutoSizing", bool_s(o.auto_size_no_line_breaks));
+    let el = if o.column_width > 0.0 { el.attr("TextColumnFixedWidth", num(o.column_width)) } else { el };
+    // Written on every frame: on import a frame takes any value it lacks from its object style.
+    let el = el
+        .attr("ColumnRuleOverride", bool_s(o.column_rule))
+        .attr("ColumnRuleStrokeWidth", num(o.column_rule_weight))
+        .attr("ColumnRuleStrokeColor", rule_color)
+        .attr("ColumnRuleStrokeTint", num(f64::from(o.column_rule_tint) * 100.0))
+        .attr("ColumnRuleOffset", num(o.column_rule_offset))
+        .attr("ColumnRuleTopInset", num(o.column_rule_top_inset))
+        .attr("ColumnRuleBottomInset", num(o.column_rule_bottom_inset))
+        .attr("ColumnRuleInsetChainOverride", bool_s(o.column_rule_top_inset == o.column_rule_bottom_inset));
+    with_props(el, vec![inset])
+}
+
+/// `<ClippingPathSettings>` with the outline (graphic space is the image's inner space, whose
+/// `GraphicBounds` start at 0,0).
+fn clipping_settings(c: &designcraft_doc::ClippingPath) -> El {
+    let mut geometry = path_geometry(&c.path);
+    geometry.name = "ClippingPathGeometry".into();
+    let el = El::new("ClippingPathSettings")
+        .attr("ClippingType", names::clipping_kind_out(c.kind))
+        .attr("InvertPath", bool_s(c.invert))
+        .attr("IncludeInsideEdges", bool_s(c.include_inside_edges))
+        .attr("RestrictToFrame", bool_s(c.restrict_to_frame))
+        .attr("UseHighResolutionImage", bool_s(c.use_high_resolution))
+        .attr("Threshold", num(c.threshold))
+        .attr("Tolerance", num(c.tolerance))
+        .attr("InsetFrame", num(c.inset))
+        .attr("AppliedPathName", if c.source_name.is_empty() { "$ID/" } else { c.source_name.as_str() })
+        .attr("Index", c.source_index.to_string());
+    with_props(el, vec![geometry])
+}
+
+fn path_geometry(path: &PathData) -> El {
+    let mut pg = El::new("PathGeometry");
+    for sp in &path.subpaths {
+        let mut arr = El::new("PathPointArray");
+        for a in &sp.anchors {
+            arr.push(
+                El::new("PathPointType")
+                    .attr("Anchor", pt(a.p.x, a.p.y))
+                    .attr("LeftDirection", pt(a.h_in.x, a.h_in.y))
+                    .attr("RightDirection", pt(a.h_out.x, a.h_out.y)),
+            );
+        }
+        pg.push(El::new("GeometryPathType").attr("PathOpen", bool_s(!sp.closed)).child(arr));
+    }
+    pg
+}
+
+/// IDML corner names for anchors 0..4 of a path (by position on its bounding box).
+pub(crate) fn corner_names(path: &PathData) -> [&'static str; 4] {
+    let default = ["TopLeft", "TopRight", "BottomRight", "BottomLeft"];
+    let Some(sp) = path.subpaths.first() else { return default };
+    if sp.anchors.len() != 4 {
+        return default;
+    }
+    let Some(b) = path.bounds() else { return default };
+    let c = b.center();
+    let mut out = default;
+    let mut seen = HashSet::new();
+    for (i, a) in sp.anchors.iter().enumerate() {
+        let n = match (a.p.y < c.y, a.p.x < c.x) {
+            (true, true) => "TopLeft",
+            (true, false) => "TopRight",
+            (false, false) => "BottomRight",
+            (false, true) => "BottomLeft",
+        };
+        if !seen.insert(n) {
+            return default;
+        }
+        out[i] = n;
+    }
+    out
+}
+
+fn format_name(mime: &str) -> &'static str {
+    match mime {
+        "image/png" => "Portable Network Graphics (PNG)",
+        "image/jpeg" => "JPEG",
+        "image/gif" => "GIF",
+        "image/tiff" => "TIFF",
+        "application/pdf" => "Adobe Portable Document Format (PDF)",
+        "application/postscript" => "Encapsulated PostScript (EPS)",
+        _ => "Portable Network Graphics (PNG)",
+    }
+}
+
+/// File path → IDML link URI (`file:/abs/path` with spaces percent-encoded).
+pub(crate) fn path_to_uri(path: &str) -> String {
+    if path.contains(':') && !path.starts_with('/') && path.chars().nth(1) != Some(':') {
+        return path.to_string(); // already a URI
+    }
+    let mut out = String::from("file:");
+    let p = path.replace('\\', "/");
+    for c in p.chars() {
+        match c {
+            ' ' => out.push_str("%20"),
+            '%' => out.push_str("%25"),
+            '#' => out.push_str("%23"),
+            c => out.push(c),
+        }
+    }
+    out
+}
diff --git a/crates/idml/src/export/spread.rs b/crates/idml/src/export/spread.rs
new file mode 100644
index 000000000..0610980d1
--- /dev/null
+++ b/crates/idml/src/export/spread.rs
@@ -0,0 +1,139 @@
+use super::common::{bool_s, uid};
+use super::{Affine, Document, El, Ex, PageSide, Spread, names, num};
+
+/// The IDML spread origin in our spread coordinates.
+pub(crate) fn spread_origin(sp: &Spread, facing: bool) -> (f64, f64) {
+    let h = sp.pages.iter().map(|p| p.height).fold(0.0, f64::max);
+    let b = sp.bounds();
+    let ox = if facing {
+        if let Some(r) = sp.pages.iter().find(|p| p.side == PageSide::Right) {
+            r.x
+        } else if let Some(l) = sp.pages.iter().rev().find(|p| p.side == PageSide::Left) {
+            l.x + l.width
+        } else {
+            b.center().x
+        }
+    } else {
+        b.center().x
+    };
+    (ox, h / 2.0)
+}
+
+impl<'a> Ex<'a> {
+    // ---------- spreads ----------
+
+    pub(super) fn spread_el_doc(&mut self, sp: &Spread, si: usize) -> El {
+        let first = self.d.first_page_of_spread(si);
+        let mut el = self.spread_common(sp, false, first);
+        el.name = "Spread".into();
+        el
+    }
+
+    pub(super) fn spread_el(&mut self, sp: &Spread, _master: bool) -> El {
+        let mut el = self.spread_common(sp, true, 0);
+        el.name = "MasterSpread".into();
+        el
+    }
+
+    fn spread_common(&mut self, sp: &Spread, master: bool, first_page: usize) -> El {
+        let d = self.d;
+        let facing = d.settings.facing_pages;
+        let (ox, oy) = spread_origin(sp, facing);
+        let mut el = El::new("Spread").attr("Self", uid(sp.id.0));
+        if let (true, Some(info)) = (master, &sp.parent) {
+            el.set("Name", info.label());
+            el.set("NamePrefix", &info.prefix);
+            el.set("BaseName", &info.name);
+        }
+        el.set("ShowMasterItems", bool_s(sp.pages.iter().all(|p| p.show_parent_items)));
+        el.set("PageCount", sp.pages.len());
+        if !master {
+            el.set("BindingLocation", sp.pages.iter().filter(|p| p.side == PageSide::Left).count());
+            el.set("AllowPageShuffle", bool_s(sp.allow_shuffle));
+        }
+        // View › Rotate Spread is the rotation part of the spread's transform; pages and items stay in
+        // unrotated spread coordinates.
+        let rotation = if master { 0 } else { sp.pages.first().map_or(0, |p| p.view_rotation) };
+        el.set(
+            "ItemTransform",
+            match rotation {
+                1 => "0 1 -1 0 0 0",
+                2 => "-1 0 0 -1 0 0",
+                3 => "0 -1 1 0 0 0",
+                _ => "1 0 0 1 0 0",
+            },
+        );
+        let based_on = sp.parent.as_ref().and_then(|i| i.based_on);
+        for (i, pg) in sp.pages.iter().enumerate() {
+            let name = if master { sp.parent.as_ref().map(|i| i.prefix.clone()).unwrap_or_default() } else { d.page_name(first_page + i) };
+            let applied = if master { based_on } else { pg.parent };
+            let overrides: Vec<String> = pg.overridden.iter().map(|i| uid(i.0)).collect();
+            let pe = El::new("Page")
+                .attr("Self", uid(pg.id.0))
+                .attr("Name", name)
+                .attr("AppliedMaster", applied.map(|s| uid(s.0)).unwrap_or_else(|| "n".into()))
+                .attr("LayoutRule", names::liquid_rule_out(pg.liquid))
+                .attr("OverrideList", overrides.join(" "))
+                .attr("GeometricBounds", format!("0 0 {} {}", num(pg.height), num(pg.width)))
+                .attr("ItemTransform", format!("1 0 0 1 {} {}", num(pg.x - ox), num(-oy)))
+                .child(margin_el(pg));
+            let mut pe = pe;
+            push_page_guides(d, sp, pg, &mut pe, first_page + i);
+            el.push(pe);
+        }
+        let origin = Affine::translate((-ox, -oy));
+        for it in &sp.items {
+            let e = self.item_el(it, origin * it.xf);
+            el.push(e);
+        }
+        el
+    }
+}
+
+pub(super) fn margin_el(pg: &designcraft_doc::Page) -> El {
+    let m = pg.margin_rect();
+    // Dragged column guides that still fit the margin box are written as they stand, so they
+    // survive the round trip; otherwise the even split, which InDesign writes for unmoved columns.
+    let pos: Vec<String> = pg.columns.edges(m.width()).into_iter().map(num).collect();
+    El::new("MarginPreference")
+        .attr("ColumnCount", pg.columns.count.max(1))
+        .attr("ColumnGutter", num(pg.columns.gutter))
+        .attr("Top", num(pg.margins.top))
+        .attr("Bottom", num(pg.margins.bottom))
+        .attr("Left", num(pg.margins.inside))
+        .attr("Right", num(pg.margins.outside))
+        .attr("ColumnDirection", "Horizontal")
+        .attr("ColumnsPositions", pos.join(" "))
+}
+
+/// The page's ruler guides, measured from the ruler origin written in the preferences.
+fn push_page_guides(d: &Document, sp: &Spread, pg: &designcraft_doc::Page, pe: &mut El, page_index: usize) {
+    let facing = d.settings.facing_pages;
+    // Ruler guides, measured from the ruler origin written in the preferences: the
+    // spread's top left, the page's, or the spine (the import reads them the same way).
+    let left = sp.pages.iter().map(|p| p.x).fold(f64::INFINITY, f64::min);
+    let left = if left.is_finite() { left } else { 0.0 };
+    let spine = sp.pages.iter().map(|p| p.x - left).filter(|x| *x > 1e-6).fold(f64::INFINITY, f64::min);
+    let spine = if spine.is_finite() && facing { spine } else { 0.0 };
+    let origin_x = match d.settings.ruler_origin {
+        designcraft_doc::RulerOrigin::Spread => left,
+        designcraft_doc::RulerOrigin::Page => pg.x,
+        designcraft_doc::RulerOrigin::Spine => left + spine,
+    };
+    for g in &pg.guides {
+        let vertical = g.orientation == designcraft_doc::Orientation::Vertical;
+        let mut ge = El::new("Guide")
+            .attr("Self", format!("{}g{}", uid(pg.id.0), pe.elements().count()))
+            .attr("Orientation", if vertical { "Vertical" } else { "Horizontal" })
+            .attr("Location", num(if vertical { g.position - origin_x } else { g.position }))
+            .attr("FitToPage", bool_s(!g.spread))
+            .attr("ViewThreshold", "5")
+            .attr("Locked", bool_s(g.locked))
+            .attr("PageIndex", page_index.to_string())
+            .attr("GuideType", if g.liquid { "Liquid" } else { "Ruler" });
+        if let Some(l) = g.layer {
+            ge.set("ItemLayer", uid(l.0));
+        }
+        pe.push(ge);
+    }
+}
diff --git a/crates/idml/src/export/story.rs b/crates/idml/src/export/story.rs
new file mode 100644
index 000000000..97c2837ec
--- /dev/null
+++ b/crates/idml/src/export/story.rs
@@ -0,0 +1,561 @@
+use super::common::{anchor_self, bool_s, change_type, topic_self, uid, with_props, xref_format_self};
+use super::graphics::graphic_layer_attribute_name;
+use super::{
+    BTreeMap, CHAR_BUILTINS, CharFormat, El, Ex, ListType, NO_CHAR_ID, Node, PARA_BUILTINS, ParaAttrs, ParaFormat, Story, TOC_STYLE_ID, names, num,
+    st,
+};
+
+impl<'a> Ex<'a> {
+    /// `<GraphicLayerOption>` of a placed graphic: its layer attributes and the nested layer tree.
+    pub(super) fn layer_option_el(&mut self, options: &designcraft_doc::GraphicLayerOptions) -> El {
+        let mut option = El::new("GraphicLayerOption");
+        for (key, value) in &options.attributes {
+            if graphic_layer_attribute_name(key) {
+                option.set(key, value);
+            }
+        }
+        // Only an ancestor whose subtree is still open can parent the next layer.
+        // Reopening a closed subtree would reorder native-edited lists on roundtrip.
+        let mut open = Vec::new();
+        let mut parents = Vec::with_capacity(options.layers.len());
+        for i in 0..options.layers.len() {
+            let parent = options.parents.get(i).copied().flatten();
+            if let Some(at) = parent.and_then(|p| open.iter().position(|id| *id == p)).filter(|at| *at < 239) {
+                open.truncate(at + 1);
+                parents.push(parent);
+            } else {
+                open.clear();
+                parents.push(None);
+            }
+            open.push(i);
+        }
+        let mut children: Vec<Vec<El>> = vec![Vec::new(); options.layers.len()];
+        let mut roots = Vec::new();
+        for (i, attributes) in options.layers.iter().enumerate().rev() {
+            let mut layer = El::new("GraphicLayer").attr("Self", self.fresh());
+            for (key, value) in attributes {
+                if graphic_layer_attribute_name(key) {
+                    layer.set(key, value);
+                }
+            }
+            if let Some(nested) = children.get_mut(i) {
+                for child in std::mem::take(nested).into_iter().rev() {
+                    layer.push(child);
+                }
+            }
+            if let Some(nested) = parents.get(i).copied().flatten().and_then(|parent| children.get_mut(parent)) {
+                nested.push(layer);
+            } else {
+                roots.push(layer);
+            }
+        }
+        for layer in roots.into_iter().rev() {
+            option.push(layer);
+        }
+        option
+    }
+
+    /// `<Index>`: nested topics with their See / See also cross-references.
+    pub(super) fn index_el(&mut self) -> El {
+        let mut topics = self.index_topics.clone();
+        for (_, _, target) in &self.index_xrefs {
+            topics.entry(vec![target.clone()]).or_default();
+        }
+        fn build(ex: &mut Ex, topics: &BTreeMap<Vec<String>, String>, prefix: &[String]) -> Vec<El> {
+            let mut out = Vec::new();
+            for (t, sort) in topics.iter().filter(|(t, _)| t.len() == prefix.len() + 1 && t.starts_with(prefix)) {
+                let mut el = El::new("Topic").attr("Self", topic_self(t)).attr("SortOrder", sort).attr("Name", t.last().map_or("", String::as_str));
+                for (from, kind, target) in ex.index_xrefs.clone() {
+                    if from == *t {
+                        el.push(
+                            El::new("CrossReference")
+                                .attr("Self", ex.fresh())
+                                .attr("ReferencedTopic", topic_self(std::slice::from_ref(&target)))
+                                .attr("CrossReferenceType", kind)
+                                .attr("CustomTypeString", ""),
+                        );
+                    }
+                }
+                for c in build(ex, topics, t) {
+                    el.push(c);
+                }
+                out.push(el);
+            }
+            out
+        }
+        let mut el = El::new("Index").attr("Self", "ix");
+        for t in build(self, &topics, &[]) {
+            el.push(t);
+        }
+        el
+    }
+
+    pub(super) fn footnote_option_el(&self) -> El {
+        let o = &self.d.footnote_options;
+        let marker = if o.ref_char_style == st::NO_CHAR_STYLE {
+            NO_CHAR_ID.to_string()
+        } else {
+            names::style_self("CharacterStyle", CHAR_BUILTINS, &o.ref_char_style)
+        };
+        let enumv = |name: &str, v: &str| {
+            let mut e = El::new(name).attr("type", "enumeration");
+            e.children.push(Node::Text(v.into()));
+            e
+        };
+        let mut color = El::new("RuleColor").attr("type", "object");
+        color.children.push(Node::Text(self.sw(&o.rule.color)));
+        let mut el = El::new("FootnoteOption")
+            .attr("StartAt", o.start_at)
+            .attr("Prefix", &o.prefix)
+            .attr("Suffix", &o.suffix)
+            .attr("FootnoteTextStyle", names::style_self("ParagraphStyle", PARA_BUILTINS, &o.para_style))
+            .attr("FootnoteMarkerStyle", marker)
+            .attr("SeparatorText", &o.separator)
+            .attr("SpaceBetween", num(o.space_between))
+            .attr("Spacer", num(o.space_before))
+            .attr("FootnoteFirstBaselineOffset", names::first_baseline_out(o.first_baseline))
+            .attr("FootnoteMinimumFirstBaselineOffset", num(o.first_baseline_min))
+            .attr("EnableStraddling", bool_s(o.span_columns))
+            .attr("RuleOn", bool_s(o.rule.on))
+            .attr("RuleLineWeight", num(o.rule.weight))
+            .attr("RuleTint", num(o.rule.tint as f64 * 100.0))
+            .attr("RuleLeftIndent", num(o.rule.left_indent))
+            .attr("RuleWidth", num(o.rule.width))
+            .attr("RuleOffset", num(o.rule.offset));
+        let restart = names::NOTE_RESTART.iter().find(|r| r.0 == o.restart).map_or("DontRestart", |r| r.1);
+        let affix = names::NOTE_AFFIX.iter().find(|r| r.0 == o.affix_in).map_or("NoPrefixSuffix", |r| r.1);
+        let mut props = El::new("Properties");
+        props.push(enumv("FootnoteNumberingStyle", names::number_style_out(o.style)));
+        props.push(enumv("RestartNumbering", restart));
+        props.push(enumv("ShowPrefixSuffix", affix));
+        props.push(enumv("MarkerPositioning", names::note_marker_out(o.ref_position)));
+        props.push(color);
+        el.push(props);
+        el
+    }
+
+    /// `<Footnote>`: the footnote's paragraphs, the first starting with the footnote number marker
+    /// and the separator (as InDesign stores them).
+    fn footnote_el(&mut self, note: &Story) -> El {
+        let mut el = El::new("Footnote");
+        let mut paras = self.story_paras(note);
+        let lead = vec![Node::Pi("ACE".into(), "4".into()), Node::Text(self.d.footnote_options.separator.clone())];
+        if let Some(Node::El(csr)) =
+            paras.first_mut().and_then(|p| p.children.iter_mut().find(|n| matches!(n, Node::El(e) if e.name == "CharacterStyleRange")))
+        {
+            match csr.children.iter_mut().find_map(|n| match n {
+                Node::El(c) if c.name == "Content" => Some(c),
+                _ => None,
+            }) {
+                Some(c) => {
+                    c.children.splice(0..0, lead);
+                }
+                None => {
+                    let mut c = El::new("Content");
+                    c.children = lead;
+                    csr.children.insert(0, Node::El(c));
+                }
+            }
+        }
+        for p in paras {
+            el.push(p);
+        }
+        el
+    }
+
+    // ---------- stories ----------
+
+    pub(super) fn story_el(&mut self, s: &Story) -> El {
+        let toc = self.d.toc.as_ref().is_some_and(|t| t.story == s.id);
+        let mut el = El::new("Story")
+            .attr("Self", uid(s.id.0))
+            .attr("AppliedTOCStyle", if toc { TOC_STYLE_ID } else { "n" })
+            .attr("TrackChanges", "false")
+            .attr("StoryTitle", "$ID/");
+        el.push(
+            El::new("StoryPreference")
+                .attr("OpticalMarginAlignment", bool_s(s.optical_margin.on))
+                .attr(
+                    "OpticalMarginSize",
+                    num(designcraft_doc::OpticalMargin::clamp_size(s.optical_margin.size).unwrap_or(designcraft_doc::OpticalMargin::DEFAULT_SIZE)),
+                )
+                .attr("FrameType", "TextFrameType")
+                .attr("StoryOrientation", if s.vertical { "Vertical" } else { "Horizontal" })
+                .attr(
+                    "StoryDirection",
+                    if s.direction == designcraft_doc::TextDirection::RightToLeft { "RightToLeftDirection" } else { "LeftToRightDirection" },
+                ),
+        );
+        for psr in self.story_paras(s) {
+            el.push(psr);
+        }
+        el
+    }
+
+    /// Write an index reference and record any cross-reference it declares.
+    fn index_reference(&mut self, s: &Story, k: usize) -> Option<El> {
+        if let Some(r) = s.index_refs.get(k).filter(|r| !r.topics.is_empty()) {
+            use designcraft_doc::index::IndexRange as R;
+            for n in 1..=r.topics.len() {
+                // A shared topic has one key: keep the first reference's
+                // value (even empty), rather than inventing a merged key.
+                self.index_topics.entry(r.topics[..n].to_vec()).or_insert_with(|| r.sort.get(n - 1).cloned().unwrap_or_default());
+            }
+            let (kind, limit) = match &r.range {
+                R::CurrentPage => (Some("CurrentPage"), None),
+                R::ToEndOfStory => (Some("ToEndOfStory"), None),
+                R::NextParagraphs(n) => (Some("ForNextNParagraphs"), Some(*n)),
+                R::SuppressPageRange => (Some("SuppressPageNumbers"), None),
+                R::See(t) => {
+                    self.index_xrefs.push((r.topics.clone(), "See", t.clone()));
+                    (None, None)
+                }
+                R::SeeAlso(t) => {
+                    self.index_xrefs.push((r.topics.clone(), "SeeAlso", t.clone()));
+                    (Some("CurrentPage"), None)
+                }
+            };
+            if let Some(kind) = kind {
+                let mut el = El::new("PageReference")
+                    .attr("Self", self.fresh())
+                    .attr("PageReferenceType", kind)
+                    .attr("ReferencedTopic", topic_self(&r.topics))
+                    .attr("Id", k + 1);
+                if let Some(n) = limit {
+                    el.set("PageReferenceLimit", n);
+                }
+                return Some(el);
+            }
+        }
+        None
+    }
+
+    fn anchored_object(&mut self, s: &Story, k: usize) -> Option<El> {
+        if let Some(o) = s.objects.get(k) {
+            let mut e = self.item_el(&o.item, o.item.xf);
+            use designcraft_doc::anchored::AnchorAlign as A;
+            let setting = match &o.position {
+                designcraft_doc::AnchorPosition::Inline { y_offset } => {
+                    El::new("AnchoredObjectSetting").attr("AnchoredPosition", "InlinePosition").attr("AnchorYoffset", num(*y_offset))
+                }
+                designcraft_doc::AnchorPosition::AboveLine { align, space_before, space_after } => El::new("AnchoredObjectSetting")
+                    .attr("AnchoredPosition", "AboveLine")
+                    .attr(
+                        "HorizontalAlignment",
+                        match align {
+                            A::Left => "LeftAlign",
+                            A::Center => "CenterAlign",
+                            A::Right => "RightAlign",
+                        },
+                    )
+                    .attr("AnchorSpaceAbove", num(*space_before))
+                    .attr("AnchorYoffset", num(*space_after)),
+                designcraft_doc::AnchorPosition::Custom {
+                    x_relative,
+                    y_relative,
+                    x_offset,
+                    y_offset,
+                    object_point,
+                    ref_point,
+                    keep_within_column,
+                    spine_relative,
+                } => El::new("AnchoredObjectSetting")
+                    .attr("AnchoredPosition", "Anchored")
+                    .attr("AnchorPoint", names::anchor_out(*object_point))
+                    .attr("HorizontalReferencePoint", names::anchor_rel_out(*x_relative, false))
+                    .attr("VerticalReferencePoint", names::anchor_rel_out(*y_relative, true))
+                    .attr("HorizontalAlignment", ["LeftAlign", "CenterAlign", "RightAlign"][(*ref_point % 3) as usize])
+                    .attr("VerticalAlignment", ["TopAlign", "CenterAlign", "BottomAlign"][(*ref_point / 3).min(2) as usize])
+                    // IDML measures a left-aligned object's X offset leftwards.
+                    .attr("AnchorXoffset", num(if *ref_point % 3 == 0 { 0.0 - *x_offset } else { *x_offset }))
+                    .attr("AnchorYoffset", num(*y_offset))
+                    .attr("PinPosition", bool_s(*keep_within_column))
+                    .attr("SpineRelative", bool_s(*spine_relative)),
+            };
+            e.push(setting);
+            return Some(e);
+        }
+        None
+    }
+
+    fn apply_tracked_changes(&mut self, s: &Story, f: &CharFormat, csrs: &mut [El], para_br: bool, para_end: usize) {
+        // Tracked changes wrap the text they mark.
+        if let Some(kind) = change_type(f.over.change) {
+            for c in csrs.iter_mut().filter(|c| c.name == "CharacterStyleRange" && !c.children.is_empty()) {
+                let mut ch = El::new("Change").attr("Self", self.fresh()).attr("ChangeType", kind);
+                ch.children = std::mem::take(&mut c.children);
+                c.push(ch);
+            }
+        }
+        if para_br && let Some(c) = csrs.last_mut() {
+            let nl = s.runs().find(|(rr, _)| rr.contains(&para_end)).and_then(|(_, nf)| change_type(nf.over.change));
+            match nl {
+                None => c.push(El::new("Br")),
+                Some(kind) => match c.children.last_mut() {
+                    Some(Node::El(ch)) if ch.name == "Change" && ch.get("ChangeType") == Some(kind) => ch.push(El::new("Br")),
+                    _ => {
+                        let mut ch = El::new("Change").attr("Self", self.fresh()).attr("ChangeType", kind);
+                        ch.push(El::new("Br"));
+                        c.push(ch);
+                    }
+                },
+            }
+        }
+    }
+
+    /// `ParagraphStyleRange`s of a story (or a table cell's story).
+    pub(super) fn story_paras(&mut self, s: &Story) -> Vec<El> {
+        let ranges = s.para_ranges();
+        let n = ranges.len();
+        ranges.into_iter().enumerate().map(|(pi, r)| self.story_para(s, pi, r, pi + 1 == n)).collect()
+    }
+
+    fn paragraph_runs(s: &Story, r: &std::ops::Range<usize>) -> Vec<(std::ops::Range<usize>, CharFormat)> {
+        // Character runs intersecting the paragraph.
+        let mut segs: Vec<(std::ops::Range<usize>, CharFormat)> = Vec::new();
+        for (rr, f) in s.runs() {
+            let a = rr.start.max(r.start);
+            let b = rr.end.min(r.end);
+            if a < b {
+                segs.push((a..b, f.clone()));
+            }
+        }
+        if segs.is_empty() {
+            let f = s.char_format_at(r.start).clone();
+            segs.push((r.start..r.start, f));
+        }
+        segs
+    }
+
+    fn story_para(&mut self, s: &Story, pi: usize, r: std::ops::Range<usize>, last: bool) -> El {
+        let pf = s.paras.get(pi).cloned().unwrap_or_default();
+        let mut psr = self.psr_el(&pf);
+        let ends_with_break = s.text.get(r.clone()).and_then(|t| t.chars().next_back()).is_some_and(st::is_break_char);
+        let segs = Self::paragraph_runs(s, &r);
+        let nseg = segs.len();
+        for (k, (rr, f)) in segs.into_iter().enumerate() {
+            let seg_start = rr.start;
+            let text = &s.text[rr];
+            // Split at break characters.
+            let mut cur = String::new();
+            let mut pending: Vec<Node> = Vec::new();
+            let mut csrs: Vec<El> = Vec::new();
+            let flush_text = |cur: &mut String, pending: &mut Vec<Node>| {
+                if !cur.is_empty() {
+                    pending.push(Node::Text(std::mem::take(cur)));
+                }
+            };
+            let flush_content = |pending: &mut Vec<Node>, out: &mut Vec<Node>| {
+                if !pending.is_empty() {
+                    let mut c = El::new("Content");
+                    c.children = std::mem::take(pending);
+                    out.push(Node::El(c));
+                }
+            };
+            let mut out: Vec<Node> = Vec::new();
+            for (ci, ch) in text.char_indices() {
+                let ace = match ch {
+                    st::PAGE_NUMBER | st::NEXT_PAGE_NUMBER | st::PREV_PAGE_NUMBER => Some("18"),
+                    st::SECTION_MARKER => Some("19"),
+                    st::INDENT_HERE => Some("7"),
+                    st::RIGHT_INDENT_TAB => Some("8"),
+                    _ => None,
+                };
+                let brk = match ch {
+                    st::COLUMN_BREAK => Some("NextColumn"),
+                    st::FRAME_BREAK => Some("NextFrame"),
+                    st::PAGE_BREAK => Some("NextPage"),
+                    st::ODD_PAGE_BREAK => Some("NextOddPage"),
+                    st::EVEN_PAGE_BREAK => Some("NextEvenPage"),
+                    _ => None,
+                };
+                if let Some(code) = ace {
+                    flush_text(&mut cur, &mut pending);
+                    pending.push(Node::Pi("ACE".into(), code.into()));
+                } else if ch == st::TABLE_ANCHOR {
+                    flush_text(&mut cur, &mut pending);
+                    flush_content(&mut pending, &mut out);
+                    if let Some(t) = s.para_table(pi) {
+                        out.push(Node::El(self.table_el(t)));
+                    }
+                } else if ch == designcraft_doc::ANCHOR_MARK {
+                    flush_text(&mut cur, &mut pending);
+                    flush_content(&mut pending, &mut out);
+                    let k = s.text[..seg_start + ci].matches(designcraft_doc::ANCHOR_MARK).count();
+                    if let Some(a) = s.anchors.get(k) {
+                        out.push(Node::El(
+                            El::new("HyperlinkTextDestination")
+                                .attr("Self", anchor_self(a.id))
+                                .attr("Name", &a.name)
+                                .attr("Hidden", "false")
+                                .attr("DestinationUniqueKey", a.id & 0xFFFF_FFFF),
+                        ));
+                    }
+                } else if ch == designcraft_doc::OBJECT_MARK {
+                    // An anchored object: the item inside the range with its anchoring settings.
+                    flush_text(&mut cur, &mut pending);
+                    flush_content(&mut pending, &mut out);
+                    let k = s.text[..seg_start + ci].matches(designcraft_doc::OBJECT_MARK).count();
+                    if let Some(el) = self.anchored_object(s, k) {
+                        out.push(Node::El(el));
+                    }
+                } else if ch == designcraft_doc::INDEX_MARK {
+                    flush_text(&mut cur, &mut pending);
+                    flush_content(&mut pending, &mut out);
+                    let k = s.text[..seg_start + ci].matches(designcraft_doc::INDEX_MARK).count();
+                    if let Some(el) = self.index_reference(s, k) {
+                        out.push(Node::El(el));
+                    }
+                } else if ch == designcraft_doc::XREF_MARK {
+                    // A source wrapping its current text (InDesign regenerates it on update).
+                    flush_text(&mut cur, &mut pending);
+                    flush_content(&mut pending, &mut out);
+                    if !out.is_empty() {
+                        let mut c = self.csr_el(&f);
+                        c.children.append(&mut out);
+                        csrs.push(c);
+                    }
+                    let k = s.text[..seg_start + ci].matches(designcraft_doc::XREF_MARK).count();
+                    if let Some(x) = s.xrefs.get(k) {
+                        let me = self.fresh();
+                        let fmt = self.d.xref_formats.iter().position(|ff| ff.name == x.format).map_or("n".to_string(), xref_format_self);
+                        let text = self.d.xref_values(x.target).map_or("??".into(), |mut v| {
+                            v.page = "?".into();
+                            designcraft_doc::xref::expand(self.d.xref_format(&x.format).map_or("<fullPara />", |ff| ff.definition.as_str()), &v)
+                        });
+                        let mut c = self.csr_el(&f);
+                        let mut content = El::new("Content");
+                        content.children.push(Node::Text(text));
+                        c.push(content);
+                        let mut src = El::new("CrossReferenceSource")
+                            .attr("Self", &me)
+                            .attr("AppliedFormat", fmt)
+                            .attr("Name", format!("Cross-Reference {}", self.xref_sources.len() + 1))
+                            .attr("Hidden", "false");
+                        src.push(c);
+                        csrs.push(src);
+                        self.xref_sources.push((me, x.target));
+                    }
+                } else if let Some(vi) = designcraft_doc::vars::var_index(ch) {
+                    flush_text(&mut cur, &mut pending);
+                    flush_content(&mut pending, &mut out);
+                    if let Some(v) = self.d.text_variables.get(vi) {
+                        let result = self.d.variable_value(vi, None).unwrap_or_else(|| format!("{}{}", v.before, v.after));
+                        out.push(Node::El(
+                            El::new("TextVariableInstance")
+                                .attr("Self", self.fresh())
+                                .attr("Name", &v.name)
+                                .attr("ResultText", result)
+                                .attr("AssociatedTextVariable", format!("dTextVariablen{}", v.name)),
+                        ));
+                    }
+                } else if ch == designcraft_doc::NOTE_MARK {
+                    // Editorial notes aren't written to IDML yet.
+                } else if ch == designcraft_doc::ENDNOTE_REF {
+                    // Endnotes aren't written to IDML yet: the endnote frame keeps their text
+                    // (numbers included) and the references are left out.
+                } else if ch == designcraft_doc::FOOTNOTE_REF {
+                    // The reference: its own range carrying the reference position.
+                    flush_text(&mut cur, &mut pending);
+                    flush_content(&mut pending, &mut out);
+                    if !out.is_empty() {
+                        let mut c = self.csr_el(&f);
+                        c.children.append(&mut out);
+                        csrs.push(c);
+                    }
+                    if let Some(n) = s.notes.get(s.notes_before(seg_start + ci)) {
+                        let mut c = self.csr_el(&f);
+                        let pos = self.d.footnote_options.ref_position;
+                        if pos != designcraft_doc::Position::Normal {
+                            c.set("Position", names::position_out(pos));
+                        }
+                        c.push(self.footnote_el(&n.text));
+                        csrs.push(c);
+                    }
+                } else if let Some(bt) = brk {
+                    flush_text(&mut cur, &mut pending);
+                    flush_content(&mut pending, &mut out);
+                    if !out.is_empty() {
+                        let mut c = self.csr_el(&f);
+                        c.children.append(&mut out);
+                        csrs.push(c);
+                    }
+                    let mut c = self.csr_el(&f);
+                    c.set("ParagraphBreakType", bt);
+                    c.push(El::new("Br"));
+                    csrs.push(c);
+                } else {
+                    cur.push(ch);
+                }
+            }
+            flush_text(&mut cur, &mut pending);
+            flush_content(&mut pending, &mut out);
+            let is_last_seg = k + 1 == nseg;
+            // A break character that ends the paragraph was written as its `Br`.
+            let para_br = is_last_seg && !last && !ends_with_break;
+            if !out.is_empty() || csrs.is_empty() || para_br {
+                let mut c = self.csr_el(&f);
+                c.children.extend(out);
+                csrs.push(c);
+            }
+            self.apply_tracked_changes(s, &f, &mut csrs, para_br, r.end);
+            for c in csrs {
+                psr.push(c);
+            }
+        }
+        psr
+    }
+
+    pub(super) fn psr_el(&mut self, pf: &ParaFormat) -> El {
+        let mut el = El::new("ParagraphStyleRange").attr("AppliedParagraphStyle", names::style_self("ParagraphStyle", PARA_BUILTINS, &pf.style));
+        let mut props = Vec::new();
+        let styles = &self.d.styles;
+        let pa = with_list_tab(pf.para.clone(), || (styles.resolve_para(pf).0, styles.resolve_para_style(&pf.style).0));
+        self.para_attrs(&mut el, &mut props, &pa, Some(&pf.style));
+        self.char_attrs(&mut el, &mut props, &pf.chars);
+        with_props(el, props)
+    }
+
+    pub(super) fn csr_el(&mut self, f: &CharFormat) -> El {
+        let id = if f.style.is_empty() || f.style == st::NO_CHAR_STYLE {
+            NO_CHAR_ID.to_string()
+        } else {
+            names::style_self("CharacterStyle", CHAR_BUILTINS, &f.style)
+        };
+        let mut el = El::new("CharacterStyleRange").attr("AppliedCharacterStyle", id);
+        let mut props = Vec::new();
+        self.char_attrs(&mut el, &mut props, &f.over);
+        with_props(el, props)
+    }
+}
+
+/// The left stop the composer adds for a list's Tab Position, if it adds one.
+fn list_tab_stop(pp: &designcraft_doc::ParaProps) -> Option<f64> {
+    if !matches!(pp.list_type, ListType::Bullets | ListType::Numbers) {
+        return None;
+    }
+    pp.list_tab.filter(|t| t.is_finite() && *t >= 0.0 && !pp.tabs.iter().any(|s| (s.position - t).abs() < 1e-6))
+}
+
+/// IDML has no attribute for the bullets-and-numbering Tab Position, so it is written as the left
+/// stop the composer adds for it, in the TabList of each level (style or paragraph) that sets the
+/// list type, the tab position or the tabs. `resolved` gives this level's resolved attributes and
+/// those it inherits; the stop comes back on import as an ordinary tab stop.
+pub(super) fn with_list_tab(mut a: ParaAttrs, resolved: impl FnOnce() -> (designcraft_doc::ParaProps, designcraft_doc::ParaProps)) -> ParaAttrs {
+    if a.list_tab.is_none() && a.tabs.is_none() && a.list_type.is_none() {
+        return a;
+    }
+    let (here, parent) = resolved();
+    let stop = list_tab_stop(&here);
+    // An inherited TabList holds the parent's stop; a level that ends the list writes its tabs without it.
+    if stop.is_none() && list_tab_stop(&parent).is_none() {
+        return a;
+    }
+    let mut tabs = here.tabs;
+    if let Some(t) = stop {
+        tabs.push(designcraft_doc::TabStop { position: t, align: designcraft_doc::TabAlign::Left, leader: String::new(), align_on: String::new() });
+        tabs.sort_by(|a, b| a.position.total_cmp(&b.position));
+    }
+    a.tabs = Some(tabs);
+    a
+}
diff --git a/crates/idml/src/export/styles.rs b/crates/idml/src/export/styles.rs
new file mode 100644
index 000000000..9435b533c
--- /dev/null
+++ b/crates/idml/src/export/styles.rs
@@ -0,0 +1,361 @@
+use super::common::{bool_s, p, pct, pkg_root, with_props};
+use super::item::{Group, text_frame_pref};
+use super::story::with_list_tab;
+use super::{
+    CHAR_BUILTINS, El, Ex, NO_PARA_ID, OBJECT_BUILTINS, PARA_BUILTINS, Rule, TOC_STYLE_ID, TOC_STYLE_NAME, document, escape_id, names, num, st,
+};
+
+impl<'a> Ex<'a> {
+    // ---------- Styles.xml ----------
+
+    pub(super) fn styles_part(&mut self) -> Vec<u8> {
+        let d = self.d;
+        let styles = d.styles.clone();
+        let mut root = pkg_root("Styles");
+
+        // Character styles.
+        let mut cg = Group::default();
+        for cs in &styles.character {
+            let id = names::style_self("CharacterStyle", CHAR_BUILTINS, &cs.name);
+            let mut el =
+                El::new("CharacterStyle").attr("Self", &id).attr("Imported", "false").attr("Name", names::style_name_out(CHAR_BUILTINS, &cs.name));
+            let mut props = Vec::new();
+            if cs.name != st::NO_CHAR_STYLE {
+                let based = cs.based_on.as_deref().filter(|b| *b != st::NO_CHAR_STYLE);
+                match based {
+                    Some(b) => props.push(p("BasedOn", "object", names::style_self("CharacterStyle", CHAR_BUILTINS, b))),
+                    None => props.push(p("BasedOn", "string", "$ID/[No character style]")),
+                }
+                self.char_attrs(&mut el, &mut props, &cs.chars);
+            }
+            cg.insert(&cs.name, with_props(el, props));
+        }
+        let mut rc = El::new("RootCharacterStyleGroup").attr("Self", self.fresh());
+        cg.emit(&mut rc, "CharacterStyleGroup", "");
+        root.push(rc);
+
+        // Paragraph styles.
+        let mut pg = Group::default();
+        for ps in &styles.paragraph {
+            let id = names::style_self("ParagraphStyle", PARA_BUILTINS, &ps.name);
+            let mut el =
+                El::new("ParagraphStyle").attr("Self", &id).attr("Name", names::style_name_out(PARA_BUILTINS, &ps.name)).attr("Imported", "false");
+            let mut props = Vec::new();
+            let (pa, ca) = if ps.name == designcraft_doc::NO_PARA_STYLE {
+                // The root style carries the complete attribute set.
+                let mut pa = designcraft_doc::ParaProps::common([&designcraft_doc::ParaProps::default()]);
+                pa.merge(&ps.para);
+                let mut ca = designcraft_doc::CharProps::common([&designcraft_doc::CharProps::default()]);
+                ca.merge(&ps.chars);
+                (pa, ca)
+            } else {
+                let next = ps.next_style.as_deref().unwrap_or(&ps.name);
+                el.set("NextStyle", names::style_self("ParagraphStyle", PARA_BUILTINS, next));
+                match ps.based_on.as_deref().filter(|b| *b != designcraft_doc::NO_PARA_STYLE) {
+                    Some(b) => props.push(p("BasedOn", "object", names::style_self("ParagraphStyle", PARA_BUILTINS, b))),
+                    None => props.push(p("BasedOn", "string", "$ID/[No paragraph style]")),
+                }
+                (ps.para.clone(), ps.chars.clone())
+            };
+            let parent = (ps.name != designcraft_doc::NO_PARA_STYLE).then(|| ps.based_on.as_deref().unwrap_or(designcraft_doc::NO_PARA_STYLE));
+            let parent_props = match ps.based_on.as_deref() {
+                Some(b) if ps.name != designcraft_doc::NO_PARA_STYLE => styles.resolve_para_style(b).0,
+                _ => designcraft_doc::ParaProps::default(),
+            };
+            let pa = with_list_tab(pa, || (styles.resolve_para_style(&ps.name).0, parent_props));
+            self.para_attrs(&mut el, &mut props, &pa, parent);
+            self.char_attrs(&mut el, &mut props, &ca);
+            if styles.export_tag(&ps.name, false).is_some_and(|t| t.split) {
+                el.set("SplitDocument", "true");
+            }
+            pg.insert(&ps.name, with_props(el, props));
+        }
+        let mut rp = El::new("RootParagraphStyleGroup").attr("Self", self.fresh());
+        pg.emit(&mut rp, "ParagraphStyleGroup", "");
+        root.push(rp);
+
+        self.append_cell_styles(&mut root, &styles);
+        self.append_table_styles(&mut root, &styles);
+        // Named numbered lists.
+        for l in &self.d.settings.lists {
+            root.push(
+                El::new("NumberingList")
+                    .attr("Self", format!("NumberingList/{}", escape_id(&l.name)))
+                    .attr("Name", &l.name)
+                    .attr("ContinueNumbersAcrossStories", bool_s(l.continue_across_stories))
+                    .attr("ContinueNumbersAcrossDocuments", "false"),
+            );
+        }
+
+        // Object styles.
+        let mut og = Group::default();
+        let mut have: Vec<&str> = styles.object.iter().map(|o| o.name.as_str()).collect();
+        let defaults = designcraft_doc::Styles::default();
+        let mut all: Vec<designcraft_doc::ObjectStyle> = styles.object.clone();
+        for b in &defaults.object {
+            if !have.contains(&b.name.as_str()) {
+                all.push(b.clone());
+                have.push(&b.name);
+            }
+        }
+        for os in &all {
+            let id = names::style_self("ObjectStyle", OBJECT_BUILTINS, &os.name);
+            let mut el = El::new("ObjectStyle").attr("Self", &id).attr("Name", names::style_name_out(OBJECT_BUILTINS, &os.name));
+            let mut props = Vec::new();
+            if os.name != designcraft_doc::NO_OBJECT_STYLE {
+                match os.based_on.as_deref().filter(|b| *b != designcraft_doc::NO_OBJECT_STYLE) {
+                    Some(b) => props.push(p("BasedOn", "object", names::style_self("ObjectStyle", OBJECT_BUILTINS, b))),
+                    None => props.push(p("BasedOn", "string", "$ID/[None]")),
+                }
+            }
+            el.set("EnableFill", bool_s(os.fill.is_some()));
+            el.set("EnableStroke", bool_s(os.stroke.is_some()));
+            el.set("EnableParagraphStyle", bool_s(os.paragraph_style.is_some()));
+            el.set("EnableTextFrameGeneralOptions", bool_s(os.text_frame.is_some()));
+            if let Some(f) = &os.fill {
+                el.set("FillColor", self.sw(&f.swatch));
+                el.set("FillTint", pct(f.tint as f64));
+            }
+            if let Some(s) = &os.stroke {
+                self.stroke_attrs(&mut el, s);
+            }
+            if let Some(ps) = &os.paragraph_style {
+                el.set("AppliedParagraphStyle", names::style_self("ParagraphStyle", PARA_BUILTINS, ps));
+            }
+            let mut el = with_props(el, props);
+            if let Some(e) = &os.effects {
+                let mut t = El::new("TransparencySetting");
+                for c in self.effect_els(e, true) {
+                    t.push(c);
+                }
+                el.push(t);
+            }
+            if let Some(tf) = &os.text_frame {
+                el.push(text_frame_pref(tf, &self.sw(&tf.column_rule_color)));
+            }
+            // Effects: a style with effects sets the drop shadow and feather, never blending.
+            let on = bool_s(os.effects.is_some());
+            el.push(
+                El::new("ObjectStyleObjectEffectsCategorySettings")
+                    .attr("EnableTransparency", "false")
+                    .attr("EnableDropShadow", on)
+                    .attr("EnableFeather", on)
+                    .attr("EnableInnerShadow", "false")
+                    .attr("EnableOuterGlow", "false")
+                    .attr("EnableInnerGlow", "false")
+                    .attr("EnableBevelEmboss", "false")
+                    .attr("EnableSatin", "false")
+                    .attr("EnableDirectionalFeather", "false")
+                    .attr("EnableGradientFeather", "false"),
+            );
+            og.insert(&os.name, el);
+        }
+        let mut ro = El::new("RootObjectStyleGroup").attr("Self", self.fresh());
+        og.emit(&mut ro, "ObjectStyleGroup", "");
+        root.push(ro);
+        if let Some(toc) = d.toc.as_ref().filter(|t| d.story(t.story).is_some()) {
+            root.push(self.toc_style_el(toc));
+        }
+        document(&root)
+    }
+
+    fn append_cell_styles(&mut self, root: &mut El, styles: &designcraft_doc::Styles) {
+        let mut cells = El::new("RootCellStyleGroup")
+            .attr("Self", self.fresh())
+            .child(El::new("CellStyle").attr("Self", "CellStyle/$ID/[None]").attr("AppliedParagraphStyle", NO_PARA_ID).attr("Name", "$ID/[None]"));
+        for cs in styles.cell.iter().filter(|c| c.name != designcraft_doc::NO_CELL_STYLE) {
+            let mut el = El::new("CellStyle")
+                .attr("Self", names::style_self("CellStyle", names::CELL_BUILTINS, &cs.name))
+                .attr("Name", names::style_name_out(names::CELL_BUILTINS, &cs.name));
+            if let Some(f) = &cs.fill {
+                el.set("FillColor", self.sw(f));
+            }
+            if let Some(t) = cs.fill_tint {
+                el.set("FillTint", pct(t as f64));
+            }
+            if let Some(i) = cs.insets {
+                for (k, v) in ["TopInset", "LeftInset", "BottomInset", "RightInset"].iter().zip(i) {
+                    el.set(k, num(v));
+                }
+            }
+            for (key, value) in ["TopInset", "LeftInset", "BottomInset", "RightInset"].iter().zip(cs.inset_overrides) {
+                if let Some(value) = value {
+                    el.set(key, num(value));
+                }
+            }
+            if let Some(vj) = cs.vj {
+                el.set("VerticalJustification", names::vj_out(vj));
+            }
+            if let Some(fb) = cs.first_baseline {
+                el.set("FirstBaselineOffset", names::first_baseline_out(fb));
+            }
+            if let Some(min) = cs.first_baseline_min {
+                el.set("MinimumFirstBaselineOffset", num(min));
+            }
+            if let Some(st) = &cs.stroke {
+                for side in ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"] {
+                    self.cell_stroke_attrs(&mut el, side, st);
+                }
+            }
+            for (side, attrs) in ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"].iter().zip(&cs.strokes) {
+                self.partial_cell_stroke_attrs(&mut el, side, attrs);
+            }
+            if let Some(ps) = &cs.paragraph_style {
+                el.set("AppliedParagraphStyle", names::style_self("ParagraphStyle", PARA_BUILTINS, ps));
+            }
+            let base = cs.based_on.as_deref().unwrap_or(designcraft_doc::NO_CELL_STYLE);
+            let based_on = if base == designcraft_doc::NO_CELL_STYLE {
+                p("BasedOn", "string", "$ID/[None]")
+            } else {
+                p("BasedOn", "object", names::style_self("CellStyle", names::CELL_BUILTINS, base))
+            };
+            cells = cells.child(with_props(el, vec![based_on]));
+        }
+        root.push(cells);
+    }
+
+    fn append_table_styles(&mut self, root: &mut El, styles: &designcraft_doc::Styles) {
+        let mut tables = El::new("RootTableStyleGroup").attr("Self", self.fresh());
+        if !styles.table.iter().any(|s| s.name == designcraft_doc::NO_TABLE_STYLE) {
+            tables.push(El::new("TableStyle").attr("Self", "TableStyle/$ID/[No table style]").attr("Name", "$ID/[No table style]"));
+        }
+        if !styles.table.iter().any(|s| s.name == designcraft_doc::BASIC_TABLE) {
+            tables.push(with_props(
+                El::new("TableStyle").attr("Self", "TableStyle/$ID/[Basic Table]").attr("Name", "$ID/[Basic Table]"),
+                vec![p("BasedOn", "string", "$ID/[No table style]")],
+            ));
+        }
+        for ts in &styles.table {
+            let mut el = El::new("TableStyle")
+                .attr("Self", names::style_self("TableStyle", names::TABLE_BUILTINS, &ts.name))
+                .attr("Name", names::style_name_out(names::TABLE_BUILTINS, &ts.name));
+            for (k, v) in [
+                ("HeaderRegionCellStyle", &ts.header),
+                ("BodyRegionCellStyle", &ts.body),
+                ("FooterRegionCellStyle", &ts.footer),
+                ("LeftColumnRegionCellStyle", &ts.left_column),
+                ("RightColumnRegionCellStyle", &ts.right_column),
+            ] {
+                if let Some(n) = v {
+                    el.set(k, names::style_self("CellStyle", names::CELL_BUILTINS, n));
+                }
+            }
+            for (key, value) in [
+                ("HeaderRegionSameAsBodyRegion", ts.header_same_as_body),
+                ("FooterRegionSameAsBodyRegion", ts.footer_same_as_body),
+                ("LeftColumnRegionSameAsBodyRegion", ts.left_column_same_as_body),
+                ("RightColumnRegionSameAsBodyRegion", ts.right_column_same_as_body),
+            ] {
+                if let Some(value) = value {
+                    el.set(key, value);
+                }
+            }
+            if let Some(b) = &ts.border {
+                for side in ["Top", "Left", "Bottom", "Right"] {
+                    self.cell_stroke_attrs(&mut el, &format!("{side}Border"), b);
+                }
+            }
+            for (side, attrs) in ["TopBorder", "LeftBorder", "BottomBorder", "RightBorder"].iter().zip(&ts.borders) {
+                self.partial_cell_stroke_attrs(&mut el, side, attrs);
+            }
+            if let Some(a) = &ts.alt_rows {
+                el.set("StartRowFillColor", self.sw(&a.first_color));
+                el.set("StartRowFillCount", a.first);
+                el.set("StartRowFillTint", pct(a.first_tint as f64));
+                el.set("EndRowFillColor", self.sw(&a.next_color));
+                el.set("EndRowFillCount", a.next);
+                el.set("EndRowFillTint", pct(a.next_tint as f64));
+            }
+            self.partial_alt_fill_attrs(&mut el, "Row", &ts.row_fills);
+            self.partial_alt_fill_attrs(&mut el, "Column", &ts.column_fills);
+            self.partial_alt_stroke_attrs(&mut el, "Row", &ts.row_strokes);
+            self.partial_alt_stroke_attrs(&mut el, "Column", &ts.column_strokes);
+            if let Some(v) = ts.space_before {
+                el.set("SpaceBefore", num(v));
+            }
+            if let Some(v) = ts.space_after {
+                el.set("SpaceAfter", num(v));
+            }
+            let mut props = Vec::new();
+            if ts.name != designcraft_doc::NO_TABLE_STYLE {
+                let base = ts.based_on.as_deref().unwrap_or(designcraft_doc::NO_TABLE_STYLE);
+                props.push(if base == designcraft_doc::NO_TABLE_STYLE {
+                    p("BasedOn", "string", "$ID/[No table style]")
+                } else {
+                    p("BasedOn", "object", names::style_self("TableStyle", names::TABLE_BUILTINS, base))
+                });
+            }
+            tables = tables.child(with_props(el, props));
+        }
+        root.push(tables);
+    }
+
+    /// The document's table of contents as a TOC style; its story names it in `AppliedTOCStyle`.
+    fn toc_style_el(&mut self, toc: &designcraft_doc::Toc) -> El {
+        let para = |n: &str| names::style_self("ParagraphStyle", PARA_BUILTINS, n);
+        let chars = |n: Option<&str>| names::style_self("CharacterStyle", CHAR_BUILTINS, n.unwrap_or(designcraft_doc::NO_CHAR_STYLE));
+        let mut el = El::new("TOCStyle")
+            .attr("Self", TOC_STYLE_ID)
+            .attr("Name", TOC_STYLE_NAME)
+            .attr("Title", &toc.title)
+            .attr("TitleStyle", para(toc.title_style.as_deref().unwrap_or("TOC Title")))
+            .attr("RunIn", "false")
+            .attr("IncludeHidden", "false")
+            .attr("IncludeBookDocuments", "false")
+            .attr("CreatePdfBookmarks", "false");
+        for e in &toc.entries {
+            let format = e.entry_style.clone().unwrap_or_else(|| format!("TOC Level {}", e.level));
+            let position = match e.page_number {
+                _ if !toc.page_numbers => "NoPageNumber",
+                designcraft_doc::TocPageNumber::After => "AfterEntry",
+                designcraft_doc::TocPageNumber::Before => "BeforeEntry",
+                designcraft_doc::TocPageNumber::None => "NoPageNumber",
+            };
+            el.push(
+                El::new("TOCStyleEntry")
+                    .attr("Self", self.fresh())
+                    .attr("Name", names::style_name_out(PARA_BUILTINS, &e.style))
+                    .attr("FormatStyle", para(&format))
+                    .attr("Level", e.level)
+                    .attr("PageNumberPosition", position)
+                    .attr("Separator", names::toc_separator_out(e.separator.as_deref().unwrap_or("\t")))
+                    .attr("PageNumberStyle", chars(e.page_number_style.as_deref()))
+                    .attr("SeparatorStyle", chars(e.separator_style.as_deref()))
+                    .attr("Sort", if e.sort { "true" } else { "false" }),
+            );
+        }
+        el
+    }
+
+    pub(super) fn rule(&mut self, el: &mut El, props: &mut Vec<El>, k: &str, r: &Rule) {
+        el.set(k, bool_s(r.on));
+        el.set(&format!("{k}LineWeight"), num(r.weight));
+        el.set(&format!("{k}Tint"), pct(r.tint as f64));
+        el.set(&format!("{k}Width"), if r.column_width { "ColumnWidth" } else { "TextWidth" });
+        el.set(&format!("{k}Offset"), num(r.offset));
+        el.set(&format!("{k}LeftIndent"), num(r.left_indent));
+        el.set(&format!("{k}RightIndent"), num(r.right_indent));
+        props.push(if r.color == designcraft_doc::TEXT_COLOR {
+            p(&format!("{k}Color"), "string", designcraft_doc::TEXT_COLOR)
+        } else {
+            p(&format!("{k}Color"), "object", self.sw(&r.color))
+        });
+    }
+
+    pub(super) fn stroke_attrs(&self, el: &mut El, s: &designcraft_doc::Stroke) {
+        el.set("StrokeColor", self.sw(&s.swatch));
+        el.set("StrokeWeight", num(if s.is_none() { 0.0 } else { s.weight }));
+        el.set("StrokeTint", pct(s.tint as f64));
+        el.set("StrokeType", names::stroke_type_out(&s.kind));
+        el.set("StrokeAlignment", names::stroke_align_out(s.align));
+        el.set("EndCap", names::cap_out(s.cap));
+        el.set("EndJoin", names::join_out(s.join));
+        el.set("MiterLimit", num(s.miter_limit));
+        el.set("LeftLineEnd", names::arrow_out(s.start));
+        el.set("RightLineEnd", names::arrow_out(s.end));
+        el.set("GapColor", self.sw(&s.gap_swatch));
+        el.set("GapTint", pct(s.gap_tint as f64));
+        el.set("OverprintStroke", bool_s(s.overprint));
+        el.set("OverprintGap", bool_s(s.gap_overprint));
+    }
+}
diff --git a/crates/idml/src/export/table.rs b/crates/idml/src/export/table.rs
new file mode 100644
index 000000000..1e81a811a
--- /dev/null
+++ b/crates/idml/src/export/table.rs
@@ -0,0 +1,253 @@
+use super::common::{bool_s, pct, uid};
+use super::{Affine, CharFormat, Content, El, Ex, Item, ParaFormat, Shape, names, num};
+
+impl<'a> Ex<'a> {
+    pub(super) fn cell_stroke_attrs(&self, el: &mut El, prefix: &str, s: &designcraft_doc::CellStroke) {
+        el.set(&format!("{prefix}StrokeWeight"), num(s.weight));
+        el.set(&format!("{prefix}StrokeColor"), self.sw(&s.color));
+        el.set(&format!("{prefix}StrokeTint"), pct(s.tint as f64));
+        el.set(&format!("{prefix}StrokeType"), names::stroke_type_out(&s.kind));
+        if s.gap_color != designcraft_color::swatch::NONE || s.gap_tint != 1.0 {
+            el.set(&format!("{prefix}StrokeGapColor"), self.sw(&s.gap_color));
+            el.set(&format!("{prefix}StrokeGapTint"), pct(s.gap_tint as f64));
+        }
+    }
+
+    pub(super) fn partial_cell_stroke_attrs(&self, el: &mut El, prefix: &str, attrs: &designcraft_doc::CellStrokeAttrs) {
+        if let Some(value) = attrs.weight {
+            el.set(&format!("{prefix}StrokeWeight"), num(value));
+        }
+        if let Some(value) = &attrs.color {
+            el.set(&format!("{prefix}StrokeColor"), self.sw(value));
+        }
+        if let Some(value) = attrs.tint {
+            el.set(&format!("{prefix}StrokeTint"), pct(value as f64));
+        }
+        if let Some(value) = &attrs.kind {
+            el.set(&format!("{prefix}StrokeType"), names::stroke_type_out(value));
+        }
+        if let Some(value) = &attrs.gap_color {
+            el.set(&format!("{prefix}StrokeGapColor"), self.sw(value));
+        }
+        if let Some(value) = attrs.gap_tint {
+            el.set(&format!("{prefix}StrokeGapTint"), pct(value as f64));
+        }
+    }
+
+    pub(super) fn partial_alt_fill_attrs(&self, el: &mut El, kind: &str, attrs: &designcraft_doc::AltFillsAttrs) {
+        if let Some(value) = attrs.first {
+            el.set(&format!("Start{kind}FillCount"), value);
+        }
+        if let Some(value) = &attrs.first_color {
+            el.set(&format!("Start{kind}FillColor"), self.sw(value));
+        }
+        if let Some(value) = attrs.first_tint {
+            el.set(&format!("Start{kind}FillTint"), pct(value as f64));
+        }
+        if let Some(value) = attrs.next {
+            el.set(&format!("End{kind}FillCount"), value);
+        }
+        if let Some(value) = &attrs.next_color {
+            el.set(&format!("End{kind}FillColor"), self.sw(value));
+        }
+        if let Some(value) = attrs.next_tint {
+            el.set(&format!("End{kind}FillTint"), pct(value as f64));
+        }
+        if let Some(value) = attrs.skip_first {
+            el.set(&format!("SkipFirstAlternatingFill{kind}s"), value);
+        }
+        if let Some(value) = attrs.skip_last {
+            el.set(&format!("SkipLastAlternatingFill{kind}s"), value);
+        }
+    }
+
+    pub(super) fn partial_alt_stroke_attrs(&self, el: &mut El, kind: &str, attrs: &designcraft_doc::AltStrokesAttrs) {
+        if let Some(value) = attrs.first {
+            el.set(&format!("Start{kind}StrokeCount"), value);
+        }
+        if let Some(value) = attrs.next {
+            el.set(&format!("End{kind}StrokeCount"), value);
+        }
+        self.partial_cell_stroke_attrs(el, &format!("Start{kind}"), &attrs.first_stroke);
+        self.partial_cell_stroke_attrs(el, &format!("End{kind}"), &attrs.next_stroke);
+        if kind == "Column"
+            && let Some(value) = &attrs.next_stroke.kind
+        {
+            el.attrs.retain(|(key, _)| key != "EndColumnStrokeType");
+            el.set("EndColumnLineStyle", names::stroke_type_out(value));
+        }
+        if let Some(value) = attrs.skip_first {
+            el.set(&format!("SkipFirstAlternatingStroke{kind}s"), value);
+        }
+        if let Some(value) = attrs.skip_last {
+            el.set(&format!("SkipLastAlternatingStroke{kind}s"), value);
+        }
+    }
+
+    /// `<Table>` with rows, columns and cells (cell names are `column:row`).
+    pub(super) fn table_el(&mut self, t: &designcraft_doc::Table) -> El {
+        let id = uid(t.id);
+        let (h, f) = (t.header_rows(), t.footer_rows());
+        let mut el = El::new("Table")
+            .attr("Self", &id)
+            .attr("HeaderRowCount", h)
+            .attr("FooterRowCount", f)
+            .attr("BodyRowCount", t.nrows() - h - f)
+            .attr("ColumnCount", t.ncols())
+            .attr(
+                "AppliedTableStyle",
+                names::style_self("TableStyle", names::TABLE_BUILTINS, if t.style.is_empty() { designcraft_doc::BASIC_TABLE } else { &t.style }),
+            )
+            .attr(
+                "TableDirection",
+                if t.options.direction == designcraft_doc::TextDirection::RightToLeft { "RightToLeftDirection" } else { "LeftToRightDirection" },
+            )
+            .attr("SpaceBefore", num(t.options.space_before))
+            .attr("SpaceAfter", num(t.options.space_after))
+            .attr("HeaderBehavior", if t.options.repeat_header { "RepeatOnEachTextColumn" } else { "RepeatOnce" })
+            .attr("FooterBehavior", if t.options.repeat_footer { "RepeatOnEachTextColumn" } else { "RepeatOnce" });
+        for (i, side) in ["Top", "Left", "Bottom", "Right"].iter().enumerate() {
+            self.cell_stroke_attrs(&mut el, &format!("{side}Border"), t.options.border_for(i));
+        }
+        for (kind, alt) in [("Row", &t.options.alt_rows), ("Column", &t.options.alt_cols)] {
+            if let Some(a) = alt {
+                el.set(&format!("Start{kind}FillColor"), self.sw(&a.first_color));
+                el.set(&format!("Start{kind}FillCount"), a.first);
+                el.set(&format!("Start{kind}FillTint"), pct(a.first_tint as f64));
+                el.set(&format!("End{kind}FillColor"), self.sw(&a.next_color));
+                el.set(&format!("End{kind}FillCount"), a.next);
+                el.set(&format!("End{kind}FillTint"), pct(a.next_tint as f64));
+                el.set(&format!("SkipFirstAlternatingFill{kind}s"), a.skip_first);
+                el.set(&format!("SkipLastAlternatingFill{kind}s"), a.skip_last);
+            } else {
+                // A local off value must override any enabled pattern in the named style.
+                el.set(&format!("Start{kind}FillCount"), 0);
+                el.set(&format!("End{kind}FillCount"), 0);
+            }
+        }
+        for (kind, strokes) in [("Row", &t.options.row_strokes), ("Column", &t.options.column_strokes)] {
+            if let Some(strokes) = strokes {
+                el.set(&format!("Start{kind}StrokeCount"), strokes.first);
+                el.set(&format!("End{kind}StrokeCount"), strokes.next);
+                self.cell_stroke_attrs(&mut el, &format!("Start{kind}"), &strokes.first_stroke);
+                self.cell_stroke_attrs(&mut el, &format!("End{kind}"), &strokes.next_stroke);
+                if kind == "Column" {
+                    el.attrs.retain(|(key, _)| key != "EndColumnStrokeType");
+                    el.set("EndColumnLineStyle", names::stroke_type_out(&strokes.next_stroke.kind));
+                }
+                el.set(&format!("SkipFirstAlternatingStroke{kind}s"), strokes.skip_first);
+                el.set(&format!("SkipLastAlternatingStroke{kind}s"), strokes.skip_last);
+            } else {
+                el.set(&format!("Start{kind}StrokeCount"), 0);
+                el.set(&format!("End{kind}StrokeCount"), 0);
+            }
+        }
+        for (r, row) in t.rows.iter().enumerate() {
+            let exact = row.mode == designcraft_doc::RowHeightMode::Exactly;
+            el.push(
+                El::new("Row")
+                    .attr("Self", format!("{id}Row{r}"))
+                    .attr("Name", r)
+                    .attr("SingleRowHeight", num(row.height.max(3.0)))
+                    .attr("MinimumHeight", num(row.height.max(0.0)))
+                    .attr("AutoGrow", bool_s(!exact)),
+            );
+        }
+        for (c, col) in t.columns.iter().enumerate() {
+            el.push(El::new("Column").attr("Self", format!("{id}Column{c}")).attr("Name", c).attr("SingleColumnWidth", num(col.width)));
+        }
+        let owners = t.owners();
+        for r in 0..t.nrows() {
+            for c in 0..t.ncols() {
+                if owners[r * t.ncols() + c] != (r, c) {
+                    continue;
+                }
+                let Some(cell) = t.cell(r, c) else { continue };
+                let vj = match cell.vj {
+                    designcraft_doc::VerticalJustification::Top => "TopAlign",
+                    designcraft_doc::VerticalJustification::Center => "CenterAlign",
+                    designcraft_doc::VerticalJustification::Bottom => "BottomAlign",
+                    designcraft_doc::VerticalJustification::Justify => "JustifyAlign",
+                };
+                let mut ce = El::new("Cell")
+                    .attr("Self", format!("{id}i{}", r * t.ncols() + c))
+                    .attr("Name", format!("{c}:{r}"))
+                    .attr("RowSpan", cell.row_span)
+                    .attr("ColumnSpan", cell.col_span)
+                    .attr(
+                        "AppliedCellStyle",
+                        names::style_self(
+                            "CellStyle",
+                            names::CELL_BUILTINS,
+                            if cell.style.is_empty() { designcraft_doc::NO_CELL_STYLE } else { &cell.style },
+                        ),
+                    )
+                    .attr("FillColor", self.sw(&cell.fill))
+                    .attr("FillTint", pct(cell.fill_tint as f64))
+                    .attr("TopInset", num(cell.insets[0]))
+                    .attr("LeftInset", num(cell.insets[1]))
+                    .attr("BottomInset", num(cell.insets[2]))
+                    .attr("RightInset", num(cell.insets[3]))
+                    .attr("VerticalJustification", vj)
+                    .attr("FirstBaselineOffset", names::first_baseline_out(cell.first_baseline))
+                    .attr("MinimumFirstBaselineOffset", num(cell.first_baseline_min))
+                    .attr("RotationAngle", num(cell.rotation));
+                for (i, side) in ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"].iter().enumerate() {
+                    // Do not turn absent native defaults into explicit shared-edge candidates.
+                    if cell.stroke_defined[i]
+                        || cell.border_overrides[i]
+                        || cell.stroke_priorities[i] != 0
+                        || cell.strokes[i] != designcraft_doc::CellStroke::default()
+                    {
+                        self.cell_stroke_attrs(&mut ce, side, &cell.strokes[i]);
+                    }
+                    let priority = if cell.border_overrides[i] && !cell.stroke_defined[i] {
+                        cell.stroke_priorities[i].max(1)
+                    } else {
+                        cell.stroke_priorities[i]
+                    };
+                    if priority != 0 {
+                        ce.set(&format!("{side}StrokePriority"), priority);
+                    }
+                }
+                let mut paras = self.story_paras(&cell.text);
+                // A graphic cell holds its image as an inline object in the cell's first paragraph.
+                if let Some(g) = &cell.graphic
+                    && let Some(object) = self.cell_graphic_el(g)
+                {
+                    // The cell clips its graphic on screen and in PDF; IDML does so only when asked.
+                    ce.set("ClipContentToCell", bool_s(true));
+                    let mut range = self.csr_el(&CharFormat::default());
+                    range.push(object);
+                    match paras.first_mut() {
+                        Some(first) => first.push(range),
+                        None => {
+                            let mut psr = self.psr_el(&ParaFormat::default());
+                            psr.push(range);
+                            paras.push(psr);
+                        }
+                    }
+                }
+                for psr in paras {
+                    ce.push(psr);
+                }
+                el.push(ce);
+            }
+        }
+        el
+    }
+
+    /// The frame of a table cell's graphic: an inline `Rectangle` around the shown image, or `None`
+    /// when the graphic's asset is missing.
+    fn cell_graphic_el(&mut self, g: &designcraft_doc::Graphic) -> Option<El> {
+        self.d.assets.get(&g.asset)?;
+        let shown = g.xf.transform_rect_bbox(designcraft_geom::Rect::new(0.0, 0.0, g.size.0, g.size.1));
+        let layer = self.d.layers.first().map(|l| l.id).unwrap_or(designcraft_doc::ids::LayerId(0));
+        let mut item = Item::new(designcraft_doc::ids::ItemId(0), layer, Shape::Rectangle, designcraft_geom::shapes::rectangle(shown));
+        item.content = Content::Graphic(g.clone());
+        let mut el = self.item_el(&item, Affine::IDENTITY);
+        el.set("Self", self.fresh());
+        el.push(El::new("AnchoredObjectSetting").attr("AnchoredPosition", "InlinePosition").attr("AnchorYoffset", "0"));
+        Some(el)
+    }
+}
diff --git a/crates/idml/src/export/text_attrs.rs b/crates/idml/src/export/text_attrs.rs
new file mode 100644
index 000000000..38acf0d2a
--- /dev/null
+++ b/crates/idml/src/export/text_attrs.rs
@@ -0,0 +1,751 @@
+use super::common::{bool_s, p, pct};
+use super::{CHAR_BUILTINS, CharAttrs, El, Ex, ListType, ParaAttrs, SpanColumns, escape_id, names, num, st};
+
+// Optional paragraph values are omitted when inherited from the style.
+macro_rules! n {
+    ($a:expr, $el:expr, $f:ident, $k:literal) => {
+        if let Some(v) = $a.$f {
+            $el.set($k, num(v as f64));
+        }
+    };
+    ($a:expr, $el:expr, $f:ident, $k:literal, pct) => {
+        if let Some(v) = $a.$f {
+            $el.set($k, pct(v as f64));
+        }
+    };
+}
+macro_rules! b {
+    ($a:expr, $el:expr, $f:ident, $k:literal) => {
+        if let Some(v) = $a.$f {
+            $el.set($k, bool_s(v));
+        }
+    };
+}
+
+impl<'a> Ex<'a> {
+    pub(super) fn char_attrs(&mut self, el: &mut El, props: &mut Vec<El>, a: &CharAttrs) {
+        if let Some(v) = a.leading_aki {
+            el.set("LeadingAki", num(v.unwrap_or(-1.0)));
+        }
+        if let Some(v) = a.trailing_aki {
+            el.set("TrailingAki", num(v.unwrap_or(-1.0)));
+        }
+        if let Some(v) = a.tsume {
+            el.set("Tsume", num(v * 100.0));
+        }
+        if let Some(v) = a.jidori {
+            el.set("Jidori", v);
+        }
+        if let Some(v) = a.leading_model {
+            el.set("LeadingModel", crate::cjk::leading_out(v));
+        }
+        if let Some(v) = a.character_alignment {
+            el.set("CharacterAlignment", crate::cjk::alignment_out(v));
+        }
+        self.char_font_attrs(el, props, a);
+        if let Some(v) = &a.fill {
+            el.set("FillColor", self.sw(v));
+        }
+        if let Some(v) = a.fill_tint {
+            el.set("FillTint", pct(v as f64));
+        }
+        if let Some(v) = &a.stroke {
+            el.set("StrokeColor", self.sw(v));
+        }
+        if let Some(v) = a.stroke_tint {
+            el.set("StrokeTint", pct(v as f64));
+        }
+        if let Some(v) = a.stroke_weight {
+            el.set("StrokeWeight", num(v));
+        }
+        if let Some(v) = a.stroke_behind_fill {
+            el.set("StrokeAlignment", if v { "OutsideAlignment" } else { "CenterAlignment" });
+        }
+        if let Some(v) = a.capitalization {
+            el.set("Capitalization", names::caps_out(v));
+        }
+        if let Some(v) = a.position {
+            el.set("Position", names::position_out(v));
+        }
+        if let Some(v) = a.underline {
+            el.set("Underline", bool_s(v));
+        }
+        if let Some(v) = a.strikethrough {
+            el.set("StrikeThru", bool_s(v));
+        }
+        if let Some(v) = a.ligatures {
+            el.set("Ligatures", bool_s(v));
+        }
+        self.char_decoration_attrs(el, a);
+        if let Some(list) = &a.otf_features {
+            for (tag, _, attr) in designcraft_doc::otf::TOGGLES {
+                el.set(attr, bool_s(designcraft_doc::otf::is_on(list, tag)));
+            }
+            let fig = designcraft_doc::otf::figures(list);
+            if let Some(f) = designcraft_doc::otf::FIGURES.iter().find(|f| f.0 == fig) {
+                el.set("OTFFigureStyle", f.3);
+            }
+            el.set("OTFStylisticSets", designcraft_doc::otf::stylistic_sets(list).to_string());
+        }
+        if let Some(v) = &a.glyph_form {
+            el.set("GlyphForm", v);
+        }
+        if let Some(v) = a.no_break {
+            el.set("NoBreak", bool_s(v));
+        }
+        self.char_arabic_attrs(el, a);
+        self.char_cjk_layout_attrs(el, props, a);
+        self.cjk_settings_chars(el, props, a);
+        if let Some(list) = &a.conditions {
+            el.set("AppliedConditions", list.iter().map(|c| format!("Condition/{}", escape_id(c))).collect::<Vec<_>>().join(" "));
+        }
+        if let Some(v) = &a.language {
+            el.set("AppliedLanguage", format!("$ID/{v}"));
+        }
+    }
+
+    fn char_arabic_attrs(&self, el: &mut El, a: &CharAttrs) {
+        if let Some(v) = a.digits {
+            el.set("DigitsType", names::digits_out(v));
+        }
+        if let Some(v) = a.character_direction {
+            el.set("CharacterDirection", crate::arabic::direction_out(v));
+        }
+        if let Some(v) = a.allow_kashidas {
+            el.set("Kashidas", if v { "DefaultKashidas" } else { "KashidasOff" });
+        }
+        if let Some(v) = a.diacritic_position {
+            el.set("DiacriticPosition", crate::arabic::diacritic_out(v));
+        }
+        if let Some(v) = a.diacritic_x_offset {
+            el.set("XOffsetDiacritic", num(v));
+        }
+        if let Some(v) = a.diacritic_y_offset {
+            el.set("YOffsetDiacritic", num(v));
+        }
+        if let Some(v) = &a.positional_form {
+            el.set("PositionalForm", v);
+        }
+    }
+
+    fn char_font_attrs(&mut self, el: &mut El, props: &mut Vec<El>, a: &CharAttrs) {
+        if let Some(f) = &a.font_family {
+            if let Some(composite) = self.d.styles.composite_font(f) {
+                props.push(p("AppliedFont", "object", format!("CompositeFont/{}", escape_id(&composite.name))));
+            } else {
+                props.push(p("AppliedFont", "string", f.clone()));
+                let style = a.font_style.clone().unwrap_or_else(|| "Regular".into());
+                self.note_font(f, &style);
+            }
+        }
+        if let Some(v) = &a.font_style {
+            el.set("FontStyle", v);
+        }
+        if let Some(v) = a.size {
+            el.set("PointSize", num(v));
+        }
+        if let Some(l) = a.leading {
+            let (v, ty) = names::leading_out(l);
+            props.push(p("Leading", ty, v));
+        }
+        if let Some(k) = a.kerning {
+            match k {
+                designcraft_doc::Kerning::Metrics => el.set("KerningMethod", "$ID/Metrics"),
+                designcraft_doc::Kerning::Optical => el.set("KerningMethod", "$ID/Optical"),
+                designcraft_doc::Kerning::None => el.set("KerningMethod", "None"),
+                designcraft_doc::Kerning::Manual(v) => el.set("KerningValue", num(v)),
+            }
+        }
+        if let Some(v) = a.tracking {
+            el.set("Tracking", num(v));
+        }
+        if let Some(v) = a.h_scale {
+            el.set("HorizontalScale", pct(v));
+        }
+        if let Some(v) = a.v_scale {
+            el.set("VerticalScale", pct(v));
+        }
+        if let Some(v) = a.baseline_shift {
+            el.set("BaselineShift", num(v));
+        }
+        if let Some(v) = a.skew {
+            el.set("Skew", num(v));
+        }
+    }
+
+    fn char_decoration_attrs(&self, el: &mut El, a: &CharAttrs) {
+        for (k, w, o, c, t) in [
+            ("Underline", a.underline_weight, a.underline_offset, &a.underline_color, a.underline_tint),
+            ("StrikeThru", a.strikethrough_weight, a.strikethrough_offset, &a.strikethrough_color, a.strikethrough_tint),
+        ] {
+            if let Some(w) = w {
+                el.set(&format!("{k}Weight"), num(w.unwrap_or(-9999.0)));
+            }
+            if let Some(o) = o {
+                el.set(&format!("{k}Offset"), num(o.unwrap_or(-9999.0)));
+            }
+            if let Some(c) = c {
+                el.set(&format!("{k}Color"), if c.is_empty() { "Text Color".into() } else { self.sw(c) });
+            }
+            if let Some(t) = t {
+                el.set(&format!("{k}Tint"), num(t as f64 * 100.0));
+            }
+        }
+    }
+
+    fn char_cjk_layout_attrs(&mut self, el: &mut El, props: &mut Vec<El>, a: &CharAttrs) {
+        if let Some(r) = a.ruby.as_ref() {
+            el.set("RubyFlag", if r.is_empty() { "0" } else { "1" });
+            el.set("RubyString", r.as_str());
+        }
+        if let Some((family, style)) = crate::ruby::write(el, props, a, |n| self.sw(n)) {
+            self.note_font(&family, &style);
+        }
+        if let Some(k) = a.kenten {
+            el.set("KentenKind", if k { "KentenSesameDot" } else { "None" });
+        }
+        if let Some(c) = &a.kenten_character
+            && !c.is_empty()
+        {
+            el.set("KentenKind", "Custom");
+            el.set("KentenCustomCharacter", c);
+        }
+        if let Some(v) = a.tate_chu_yoko_x_offset {
+            el.set("TatechuyokoXOffset", num(v));
+        }
+        if let Some(v) = a.tate_chu_yoko_y_offset {
+            el.set("TatechuyokoYOffset", num(v));
+        }
+        if let Some(v) = a.tate_chu_yoko {
+            el.set("Tatechuyoko", bool_s(v));
+        }
+        if let Some(v) = a.warichu {
+            el.set("Warichu", bool_s(v));
+        }
+        if let Some(v) = a.warichu_lines {
+            el.set("WarichuLines", v);
+        }
+        if let Some(v) = a.warichu_size {
+            el.set("WarichuSize", num(v));
+        }
+        if let Some(v) = a.warichu_line_spacing {
+            el.set("WarichuLineSpacing", num(v));
+        }
+        if let Some(v) = a.warichu_alignment {
+            el.set("WarichuAlignment", crate::cjk::warichu_align_out(v));
+        }
+        if let Some(v) = a.warichu_chars_before_break {
+            el.set("WarichuCharsBeforeBreak", v);
+        }
+        if let Some(v) = a.warichu_chars_after_break {
+            el.set("WarichuCharsAfterBreak", v);
+        }
+    }
+
+    fn para_nested_styles(&self, props: &mut Vec<El>, a: &ParaAttrs, parent: Option<&str>) {
+        // Nested and GREP styles: property lists of records. The drop cap's character style is the
+        // nested style list's leading "through 1 Dropcap" entry (IDML has no attribute for it): a
+        // drop cap style set here (`[None]` included) restyles that entry, and a real one is
+        // inserted where there is none. Without a list of its own, the inherited list is written
+        // when that is what carries the drop cap style, since any list replaces the inherited one.
+        let real = |s: &str| !s.is_empty() && s != st::NO_CHAR_STYLE;
+        let cap = a.drop_cap_style.as_deref().filter(|s| !s.is_empty());
+        let mut list = a.nested_styles.clone();
+        if let (Some(cap), None) = (cap, &list) {
+            let inherited = parent.map(|n| self.d.styles.resolve_para_style(n).0);
+            let inherited_cap = inherited
+                .as_ref()
+                .is_some_and(|pp| real(&pp.drop_cap_style) || pp.nested_styles.first().is_some_and(|ns| ns.is_drop_cap() && real(&ns.style)));
+            if real(cap) || inherited_cap {
+                list = Some(inherited.map(|pp| pp.nested_styles).unwrap_or_default());
+            }
+        }
+        if let (Some(cap), Some(list)) = (cap, list.as_mut()) {
+            match list.first_mut() {
+                Some(ns) if ns.is_drop_cap() => ns.style = cap.to_string(),
+                _ if real(cap) => list.insert(0, designcraft_doc::NestedStyle::drop_cap(cap)),
+                _ => {}
+            }
+        }
+        if let Some(list) = &list {
+            let mut l = El::new("AllNestedStyles").attr("type", "list");
+            for ns in list {
+                let (ty, delim) = names::nested_until_out(&ns.until);
+                l = l.child(
+                    El::new("ListItem")
+                        .attr("type", "record")
+                        .child(p("AppliedCharacterStyle", "object", names::style_self("CharacterStyle", CHAR_BUILTINS, &ns.style)))
+                        .child(p("Delimiter", ty, delim))
+                        .child(p("Repetition", "long", ns.count.to_string()))
+                        .child(p("Inclusive", "boolean", bool_s(ns.through))),
+                );
+            }
+            props.push(l);
+        }
+        if let Some(list) = &a.nested_line_styles {
+            let mut l = El::new("AllNestedLineStyles").attr("type", "list");
+            for ns in list {
+                l = l.child(
+                    El::new("ListItem")
+                        .attr("type", "record")
+                        .child(p("AppliedCharacterStyle", "object", names::style_self("CharacterStyle", CHAR_BUILTINS, &ns.style)))
+                        .child(p("LineCount", "long", ns.lines.to_string())),
+                );
+            }
+            props.push(l);
+        }
+        if let Some(list) = &a.grep_styles {
+            let mut l = El::new("AllGREPStyles").attr("type", "list");
+            for g in list {
+                l = l.child(
+                    El::new("ListItem")
+                        .attr("type", "record")
+                        .child(p("AppliedCharacterStyle", "object", names::style_self("CharacterStyle", CHAR_BUILTINS, &g.style)))
+                        .child(p("GrepExpression", "string", g.pattern.clone())),
+                );
+            }
+            props.push(l);
+        }
+    }
+
+    fn para_alignment_attrs(&self, el: &mut El, a: &ParaAttrs, parent: Option<&str>) {
+        if let Some(v) = a.align {
+            el.set("Justification", names::align_out(v));
+        }
+        if let Some(v) = a.direction {
+            el.set(
+                "ParagraphDirection",
+                if v == designcraft_doc::TextDirection::RightToLeft { "RightToLeftDirection" } else { "LeftToRightDirection" },
+            );
+        }
+        if let Some(v) = a.kashidas {
+            el.set("Kashidas", if v { "DefaultKashidas" } else { "KashidasOff" });
+        }
+        if let Some(v) = &a.arabic_justification {
+            el.set("ParagraphJustification", v);
+        }
+        if let Some(Some(v)) = a.paragraph_kashida_width {
+            el.set("ParagraphKashidaWidth", num(v));
+        }
+        n!(a, el, left_indent, "LeftIndent");
+        n!(a, el, right_indent, "RightIndent");
+        n!(a, el, first_line_indent, "FirstLineIndent");
+        n!(a, el, last_line_indent, "LastLineIndent");
+        n!(a, el, space_before, "SpaceBefore");
+        n!(a, el, space_after, "SpaceAfter");
+        match a.same_para_style_spacing {
+            Some(Some(v)) => el.set("SameParaStyleSpacing", num(v)),
+            // Explicit Ignore: must be written so it still overrides a based-on style's value.
+            Some(None) => el.set("SameParaStyleSpacing", "Nothing"),
+            None => {}
+        }
+        n!(a, el, drop_cap_lines, "DropCapLines");
+        n!(a, el, drop_cap_chars, "DropCapCharacters");
+        if a.drop_cap_align_left.is_some() || a.drop_cap_scale_descenders.is_some() {
+            let d = parent.map(|name| self.d.styles.resolve_para_style(name).0).unwrap_or_default();
+            let bits = u32::from(a.drop_cap_align_left.unwrap_or(d.drop_cap_align_left))
+                | u32::from(a.drop_cap_scale_descenders.unwrap_or(d.drop_cap_scale_descenders)) << 1;
+            el.set("DropcapDetail", bits);
+        }
+        if let Some(g) = a.grid_align {
+            // IDML has one attribute for on/off and the reference: a reference set without
+            // `grid_align` isn't written.
+            let reference = crate::cjk::grid_reference_out(a.grid_reference.unwrap_or_default());
+            match g {
+                designcraft_doc::GridAlign::None => el.set("GridAlignment", "None"),
+                designcraft_doc::GridAlign::AllLines => {
+                    el.set("GridAlignment", reference);
+                    el.set("GridAlignFirstLineOnly", "false");
+                }
+                designcraft_doc::GridAlign::FirstLineOnly => {
+                    el.set("GridAlignment", reference);
+                    el.set("GridAlignFirstLineOnly", "true");
+                }
+            }
+        }
+        if let Some(c) = a.composer {
+            el.set(
+                "Composer",
+                match c {
+                    designcraft_doc::Composer::Paragraph => "HL Composer",
+                    designcraft_doc::Composer::SingleLine => "HL Single",
+                    designcraft_doc::Composer::Japanese => "HL Composer J",
+                    designcraft_doc::Composer::JapaneseSingleLine => "HL Single J",
+                },
+            );
+        }
+    }
+
+    fn para_flow_attrs(&self, el: &mut El, a: &ParaAttrs) {
+        b!(a, el, hyphenate, "Hyphenation");
+        n!(a, el, hyph_min_word, "HyphenateWordsLongerThan");
+        n!(a, el, hyph_after_first, "HyphenateAfterFirst");
+        n!(a, el, hyph_before_last, "HyphenateBeforeLast");
+        n!(a, el, hyph_limit, "HyphenateLadderLimit");
+        n!(a, el, hyph_zone, "HyphenationZone");
+        b!(a, el, hyph_capitalized, "HyphenateCapitalizedWords");
+        b!(a, el, hyph_last_word, "HyphenateLastWord");
+        b!(a, el, hyph_across_column, "HyphenateAcrossColumns");
+        if let Some(v) = a.hyph_weight {
+            el.set("HyphenWeight", num((v * 10.0).round()));
+        }
+        n!(a, el, word_space_min, "MinimumWordSpacing", pct);
+        n!(a, el, word_space_desired, "DesiredWordSpacing", pct);
+        n!(a, el, word_space_max, "MaximumWordSpacing", pct);
+        n!(a, el, letter_space_min, "MinimumLetterSpacing", pct);
+        n!(a, el, letter_space_desired, "DesiredLetterSpacing", pct);
+        n!(a, el, letter_space_max, "MaximumLetterSpacing", pct);
+        n!(a, el, glyph_scale_min, "MinimumGlyphScaling", pct);
+        n!(a, el, glyph_scale_desired, "DesiredGlyphScaling", pct);
+        n!(a, el, glyph_scale_max, "MaximumGlyphScaling", pct);
+        n!(a, el, auto_leading, "AutoLeading", pct);
+        if let Some(v) = a.single_word_justify {
+            el.set("SingleWordJustification", names::align_out(v));
+        }
+        n!(a, el, keep_with_next, "KeepWithNext");
+        b!(a, el, keep_lines_together, "KeepLinesTogether");
+        b!(a, el, ignore_optical_margin, "IgnoreEdgeAlignment");
+        b!(a, el, keep_all_lines, "KeepAllLinesTogether");
+        n!(a, el, keep_first, "KeepFirstLines");
+        n!(a, el, keep_last, "KeepLastLines");
+        if let Some(v) = a.start_paragraph {
+            el.set("StartParagraph", names::start_para_out(v));
+        }
+    }
+
+    fn para_columns_and_list_attrs(&mut self, el: &mut El, props: &mut Vec<El>, a: &ParaAttrs) {
+        if let Some(sc) = a.span_columns {
+            match sc {
+                SpanColumns::Single => el.set("SpanColumnType", "SingleColumn"),
+                SpanColumns::Span(n) | SpanColumns::Split(n) => {
+                    el.set("SpanColumnType", if matches!(sc, SpanColumns::Span(_)) { "SpanColumns" } else { "SplitColumns" });
+                    props.push(if n == 0 {
+                        p("SpanSplitColumnCount", "enumeration", "All")
+                    } else {
+                        p("SpanSplitColumnCount", "long", n.to_string())
+                    });
+                }
+            }
+        }
+        n!(a, el, split_inside_gutter, "SplitColumnInsideGutter");
+        n!(a, el, split_outside_gutter, "SplitColumnOutsideGutter");
+        if let Some(r) = &a.rule_above {
+            self.rule(el, props, "RuleAbove", r);
+        }
+        if let Some(r) = &a.rule_below {
+            self.rule(el, props, "RuleBelow", r);
+        }
+        if let Some(tabs) = &a.tabs {
+            let mut tl = El::new("TabList").attr("type", "list");
+            for t in tabs {
+                tl.push(
+                    El::new("ListItem")
+                        .attr("type", "record")
+                        .child(p("Alignment", "enumeration", names::tab_align_out(t.align)))
+                        .child(p("AlignmentCharacter", "string", if t.align_on.is_empty() { ".".to_string() } else { t.align_on.clone() }))
+                        .child(p("Leader", "string", t.leader.clone()))
+                        .child(p("Position", "unit", num(t.position))),
+                );
+            }
+            props.push(tl);
+        }
+        if let Some(l) = a.list_type {
+            el.set(
+                "BulletsAndNumberingListType",
+                match l {
+                    ListType::None => "NoList",
+                    ListType::Bullets => "BulletList",
+                    ListType::Numbers => "NumberedList",
+                },
+            );
+        }
+        if let Some(n) = a.number_style {
+            props.push(p("NumberingFormat", "string", names::numbering_format_out(n)));
+        }
+        if let Some(x) = &a.number_expression {
+            el.set("NumberingExpression", names::list_text_out(x));
+        }
+        if let Some(x) = &a.list_separator {
+            el.set("BulletsTextAfter", names::list_text_out(x));
+        }
+        if let Some(c) = a.bullet_char.as_deref().and_then(|s| s.chars().next()) {
+            props.push(El::new("BulletChar").attr("BulletCharacterType", "UnicodeOnly").attr("BulletCharacterValue", u32::from(c).to_string()));
+        }
+        if let Some(b) = a.balance_ragged {
+            props.push(p("BalanceRaggedLines", "enumeration", if b { "FullyBalanced" } else { "NoBalancing" }));
+        }
+    }
+
+    fn para_box_corners(el: &mut El, a: &ParaAttrs) {
+        const CORNERS: [&str; 4] = ["TopLeft", "TopRight", "BottomRight", "BottomLeft"];
+        for (prefix, corners) in [("ParagraphBorder", a.border_corners), ("ParagraphShading", a.shading_corners)] {
+            if let Some(cs) = corners {
+                for (c, k) in cs.iter().zip(CORNERS) {
+                    el.set(&format!("{prefix}{k}CornerOption"), names::corner_out(c.shape));
+                    el.set(&format!("{prefix}{k}CornerRadius"), num(c.size));
+                }
+            }
+        }
+    }
+
+    fn para_box_attrs(&self, el: &mut El, props: &mut Vec<El>, a: &ParaAttrs) {
+        b!(a, el, shading_on, "ParagraphShadingOn");
+        if let Some(c) = &a.shading_color {
+            props.push(p("ParagraphShadingColor", "object", self.sw(c)));
+        }
+        n!(a, el, shading_tint, "ParagraphShadingTint", pct);
+        const SIDES: [&str; 4] = ["Top", "Left", "Bottom", "Right"];
+        if let Some(o) = a.shading_offsets {
+            for (i, side) in SIDES.iter().enumerate() {
+                el.set(&format!("ParagraphShading{side}Offset"), num(o[i]));
+            }
+        }
+        b!(a, el, border_on, "ParagraphBorderOn");
+        if let Some(c) = &a.border_color {
+            props.push(p("ParagraphBorderColor", "object", self.sw(c)));
+        }
+        n!(a, el, border_tint, "ParagraphBorderTint", pct);
+        if let Some(w) = a.border_weights {
+            for (i, side) in SIDES.iter().enumerate() {
+                el.set(&format!("ParagraphBorder{side}LineWeight"), num(w[i]));
+            }
+        }
+        if let Some(o) = a.border_offsets {
+            for (i, side) in SIDES.iter().enumerate() {
+                el.set(&format!("ParagraphBorder{side}Offset"), num(o[i]));
+            }
+        }
+        if let Some(t) = &a.border_type {
+            props.push(p("ParagraphBorderType", "object", names::stroke_type_out(t)));
+        }
+        if let Some(c) = a.border_cap {
+            el.set("ParagraphBorderStrokeEndCap", names::cap_out(c));
+        }
+        if let Some(j) = a.border_join {
+            el.set("ParagraphBorderStrokeEndJoin", names::join_out(j));
+        }
+        Self::para_box_corners(el, a);
+        if let Some(w) = a.border_width {
+            el.set("ParagraphBorderWidth", names::box_width_out(w));
+        }
+        if let Some(t) = a.border_top {
+            el.set("ParagraphBorderTopOrigin", names::box_top_out(t));
+        }
+        if let Some(b) = a.border_bottom {
+            el.set("ParagraphBorderBottomOrigin", names::box_bottom_out(b));
+        }
+        b!(a, el, border_display_if_splits, "ParagraphBorderDisplayIfSplits");
+        b!(a, el, border_merge, "MergeConsecutiveParaBorders");
+        if let Some(c) = &a.border_gap_color {
+            props.push(p("ParagraphBorderGapColor", "object", self.sw(c)));
+        }
+        n!(a, el, border_gap_tint, "ParagraphBorderGapTint", pct);
+        if let Some(w) = a.shading_width {
+            el.set("ParagraphShadingWidth", names::box_width_out(w));
+        }
+        if let Some(t) = a.shading_top {
+            el.set("ParagraphShadingTopOrigin", names::box_top_out(t));
+        }
+        if let Some(b) = a.shading_bottom {
+            el.set("ParagraphShadingBottomOrigin", names::box_bottom_out(b));
+        }
+        b!(a, el, shading_clip, "ParagraphShadingClipToFrame");
+        b!(a, el, shading_nonprinting, "ParagraphShadingSuppressPrinting");
+    }
+
+    fn para_list_attrs(&self, el: &mut El, props: &mut Vec<El>, a: &ParaAttrs) {
+        n!(a, el, span_space_before, "SpanColumnMinSpaceBefore");
+        n!(a, el, span_space_after, "SpanColumnMinSpaceAfter");
+        n!(a, el, list_level, "NumberingLevel");
+        for (k, style) in [("BulletsCharacterStyle", &a.bullet_char_style), ("NumberingCharacterStyle", &a.number_char_style)] {
+            if let Some(st) = style {
+                props.push(p(k, "object", names::style_self("CharacterStyle", CHAR_BUILTINS, st)));
+            }
+        }
+        if let Some(v) = a.bullet_align {
+            el.set("BulletsAlignment", names::list_align_out(v));
+        }
+        if let Some(v) = a.number_align {
+            el.set("NumberingAlignment", names::list_align_out(v));
+        }
+        b!(a, el, restart_numbers, "NumberingApplyRestartPolicy");
+        if let Some(level) = a.restart_after_level {
+            let (policy, level) = if level == 0 { ("AnyPreviousLevel", 0) } else { ("SpecificPreviousLevel", level) };
+            props.push(
+                El::new("NumberingRestartPolicies")
+                    .attr("RestartPolicy", policy)
+                    .attr("LowerLevel", level.to_string())
+                    .attr("UpperLevel", level.to_string()),
+            );
+        }
+        if let Some(f) = &a.bullet_font {
+            props.push(p("BulletsFont", "string", if f.is_empty() { "$ID/".to_string() } else { f.clone() }));
+        }
+        if let Some(f) = a.bullet_font_style.as_ref().filter(|f| !f.is_empty()) {
+            props.push(p("BulletsFontStyle", "string", f.clone()));
+        }
+    }
+
+    /// Write paragraph attributes `a`, set over the resolved paragraph style `parent` (`None` for the
+    /// root style).
+    pub(super) fn para_attrs(&mut self, el: &mut El, props: &mut Vec<El>, a: &ParaAttrs, parent: Option<&str>) {
+        if let Some(v) = &a.mojikumi {
+            props.push(p("Mojikumi", if v.starts_with("MojikumiTable/") { "object" } else { "enumeration" }, v));
+        }
+        if let Some(v) = &a.kinsoku_type {
+            el.set("KinsokuType", v);
+        }
+        if let Some(v) = a.kinsoku_hang {
+            el.set(
+                "KinsokuHangType",
+                match v {
+                    designcraft_doc::cjk::KinsokuHang::None => "None",
+                    designcraft_doc::cjk::KinsokuHang::Regular => "KinsokuHangRegular",
+                    designcraft_doc::cjk::KinsokuHang::Force => "KinsokuHangForce",
+                },
+            );
+        }
+        if let Some(v) = a.bunri_kinshi {
+            el.set("BunriKinshi", bool_s(v));
+        }
+        if let Some(v) = a.rensuuji {
+            el.set("Rensuuji", bool_s(v));
+        }
+        if let Some(v) = a.treat_ideographic_space_as_space {
+            el.set("TreatIdeographicSpaceAsSpace", bool_s(v));
+        }
+        cjk_settings_para(el, a);
+        if let Some(Some(k)) = &a.kinsoku {
+            props.push(p(
+                "KinsokuSet",
+                if k.name.is_empty() { "enumeration" } else { "object" },
+                if k.name.is_empty() { "Nothing".into() } else { format!("KinsokuTable/{}", escape_id(&k.name)) },
+            ));
+        }
+        if let Some(n) = &a.list_name {
+            el.set(
+                "AppliedNumberingList",
+                if n.is_empty() { "NumberingList/$ID/[Default]".to_string() } else { format!("NumberingList/{}", escape_id(n)) },
+            );
+        }
+        if let Some(v) = a.start_at {
+            match v {
+                Some(n) => {
+                    el.set("NumberingContinue", "false");
+                    el.set("NumberingStartAt", n);
+                }
+                None => el.set("NumberingContinue", "true"),
+            }
+        }
+        self.para_nested_styles(props, a, parent);
+        self.para_alignment_attrs(el, a, parent);
+        self.para_flow_attrs(el, a);
+        self.para_columns_and_list_attrs(el, props, a);
+        self.para_box_attrs(el, props, a);
+        self.para_list_attrs(el, props, a);
+    }
+}
+
+/// Auto tate-chu-yoko, Japanese composition and grid settings of a paragraph range or style.
+fn cjk_settings_para(el: &mut El, a: &ParaAttrs) {
+    if let Some(v) = a.auto_tcy {
+        el.set("AutoTcy", v);
+    }
+    if let Some(v) = a.auto_tcy_include_roman {
+        el.set("AutoTcyIncludeRoman", bool_s(v));
+    }
+    if let Some(v) = a.rotate_roman {
+        el.set("RotateSingleByteCharacters", bool_s(v));
+    }
+    if let Some(v) = a.roman_word_break {
+        el.set("AllowArbitraryHyphenation", bool_s(v));
+    }
+    if let Some(v) = a.grid_gyoudori {
+        el.set("GridGyoudori", v);
+    }
+    if let Some(v) = a.paragraph_gyoudori {
+        el.set("ParagraphGyoudori", bool_s(v));
+    }
+}
+
+impl Ex<'_> {
+    /// Kenten Settings, Kenten Color and Shatai of a character range or style.
+    fn cjk_settings_chars(&self, el: &mut El, props: &mut Vec<El>, a: &CharAttrs) {
+        use designcraft_doc::cjk_settings::KentenKind;
+        if let Some(k) = a.kenten_kind
+            && a.kenten != Some(false)
+        {
+            el.set("KentenKind", crate::cjk::kenten_kind_out(k));
+            if k != KentenKind::Custom {
+                el.attrs.retain(|(n, _)| n != "KentenCustomCharacter");
+            } else if let Some(c) = &a.kenten_character {
+                el.set("KentenCustomCharacter", c);
+            }
+        }
+        if let Some(f) = &a.kenten_font {
+            props.push(p("KentenFont", "string", if f.is_empty() { "$ID/".to_string() } else { f.clone() }));
+        }
+        if let Some(st) = &a.kenten_font_style {
+            props.push(if st.is_empty() { p("KentenFontStyle", "enumeration", "Nothing") } else { p("KentenFontStyle", "string", st.clone()) });
+        }
+        if let Some(Some(v)) = a.kenten_size {
+            el.set("KentenFontSize", num(v));
+        }
+        if let Some(v) = a.kenten_x_scale {
+            el.set("KentenXScale", num(v * 100.0));
+        }
+        if let Some(v) = a.kenten_y_scale {
+            el.set("KentenYScale", num(v * 100.0));
+        }
+        if let Some(v) = a.kenten_distance {
+            el.set("KentenPlacement", num(v));
+        }
+        if let Some(v) = a.kenten_position {
+            el.set("KentenPosition", crate::cjk::kenten_position_out(v));
+        }
+        if let Some(v) = a.kenten_alignment {
+            el.set("KentenAlignment", crate::cjk::kenten_alignment_out(v));
+        }
+        if let Some(v) = &a.kenten_character_set {
+            el.set("KentenCharacterSet", v);
+        }
+        // The text's own colour is the string "Text Color" (a property); a swatch is a reference.
+        for (key, color) in [("KentenFillColor", &a.kenten_fill), ("KentenStrokeColor", &a.kenten_stroke)] {
+            match color {
+                Some(c) if c.is_empty() => props.push(p(key, "string", "Text Color")),
+                Some(c) => el.set(key, self.sw(c)),
+                None => {}
+            }
+        }
+        for (key, tint) in [("KentenTint", a.kenten_fill_tint), ("KentenStrokeTint", a.kenten_stroke_tint)] {
+            if let Some(t) = tint {
+                el.set(key, t.map_or_else(|| "-1".to_string(), |t| num(f64::from(t) * 100.0)));
+            }
+        }
+        if let Some(w) = a.kenten_stroke_weight {
+            el.set("KentenWeight", w.map_or_else(|| "-1".to_string(), num));
+        }
+        if let Some(v) = a.kenten_overprint_fill {
+            el.set("KentenOverprintFill", crate::cjk::overprint_out(v));
+        }
+        if let Some(v) = a.kenten_overprint_stroke {
+            el.set("KentenOverprintStroke", crate::cjk::overprint_out(v));
+        }
+        self.shatai_chars(el, a);
+    }
+
+    fn shatai_chars(&self, el: &mut El, a: &CharAttrs) {
+        if let Some(v) = a.shatai_magnification {
+            el.set("ShataiMagnification", num(v));
+        }
+        if let Some(v) = a.shatai_angle {
+            el.set("ShataiDegreeAngle", num(v * crate::cjk::SHATAI_ANGLE_UNITS));
+        }
+        if let Some(v) = a.shatai_adjust_rotation {
+            el.set("ShataiAdjustRotation", bool_s(v));
+        }
+        if let Some(v) = a.shatai_adjust_tsume {
+            el.set("ShataiAdjustTsume", bool_s(v));
+        }
+    }
+}
diff --git a/crates/idml/src/import.rs b/crates/idml/src/import.rs
index 4085d3093..161594e1e 100644
--- a/crates/idml/src/import.rs
+++ b/crates/idml/src/import.rs
@@ -20,23 +20,26 @@ use crate::names::{self, CHAR_BUILTINS, OBJECT_BUILTINS, PARA_BUILTINS, unescape
 use crate::xml::{El, Node, parse};
 use crate::{IdmlError, MIMETYPE, Result, base64_decode, sniff_image};
 
-/// Preserve the legacy uniform field only when all four sides explicitly specify every
-/// property. Partial records must stay sparse so they can inherit from a parent style.
-fn uniform_cell_stroke(edges: &[designcraft_doc::CellStrokeAttrs; 4]) -> Option<designcraft_doc::CellStroke> {
-    let first = edges.first()?;
-    if edges.iter().any(|edge| edge != first) {
-        return None;
-    }
-    let mut stroke = designcraft_doc::CellStroke {
-        weight: first.weight?,
-        color: first.color.clone()?,
-        tint: first.tint?,
-        kind: first.kind.clone()?,
-        ..Default::default()
-    };
-    first.apply_to(&mut stroke);
-    Some(stroke)
-}
+mod document;
+mod frame;
+mod item;
+mod object_style;
+mod package;
+mod spread;
+mod story;
+mod styles;
+mod swatches;
+mod table;
+mod text_attrs;
+mod values;
+
+use document::IndexTopic;
+use frame::margins_of;
+use package::Package;
+#[cfg(test)]
+pub(crate) use package::{percent_decode, uri_to_path};
+use text_attrs::mojikumi_row;
+use values::{nums, xmp_date};
 
 /// Import an IDML package without reading its linked images from disk: this crate never touches
 /// the file system, so a caller that wants the links brings its own reader
@@ -126,130 +129,6 @@ pub fn import_idml_report_with_previews(
     Ok(Imported { document, warnings })
 }
 
-/// Whether sanitizing a file's tab list dropped, moved or shortened a stop. Sorting, and the `.`
-/// a char stop with no character aligns on, change nothing.
-fn tab_list_repaired(read: &[TabStop], sanitized: &[TabStop]) -> bool {
-    let kept = |t: &TabStop| {
-        sanitized.iter().any(|o| {
-            o.position == t.position
-                && o.leader == t.leader
-                && (o.align_on == t.align_on || (t.align_on.is_empty() && o.align == designcraft_doc::TabAlign::Char))
-        })
-    };
-    read.len() != sanitized.len() || !read.iter().all(kept)
-}
-
-/// Most entries an IDML package may hold.
-const MAX_ENTRIES: usize = 100_000;
-/// Most bytes one package part may expand to.
-const MAX_PART_BYTES: u64 = 512 << 20;
-/// Most bytes all the parts read from one package may expand to together.
-const MAX_TOTAL_BYTES: u64 = 2 << 30;
-
-/// An IDML package whose parts are decompressed only when the import asks for them, within
-/// byte budgets that don't trust the sizes the archive claims.
-struct Package<'a> {
-    zip: zip::ZipArchive<std::io::Cursor<&'a [u8]>>,
-    /// Normalised part name → entry name, first entry wins (zip order, so the choice is stable).
-    lenient: HashMap<String, String>,
-    /// Bytes the parts still to be read may expand to.
-    left: u64,
-}
-
-impl<'a> Package<'a> {
-    fn open(bytes: &'a [u8]) -> Result<Self> {
-        let zip = zip::ZipArchive::new(std::io::Cursor::new(bytes)).map_err(|e| IdmlError::NotIdml(e.to_string()))?;
-        if zip.len() > MAX_ENTRIES {
-            return Err(IdmlError::NotIdml(format!("{} entries (at most {MAX_ENTRIES})", zip.len())));
-        }
-        let mut lenient: HashMap<String, String> = HashMap::new();
-        for i in 0..zip.len() {
-            let Some(name) = zip.name_for_index(i) else { continue };
-            if name.ends_with('/') {
-                continue;
-            }
-            lenient.entry(normalize_part_name(name)).or_insert_with(|| name.to_string());
-        }
-        Ok(Package { zip, lenient, left: MAX_TOTAL_BYTES })
-    }
-
-    /// The bytes of part `name` (matched exactly, then leniently), or `None` if the package has
-    /// no such part.
-    fn part(&mut self, name: &str) -> Result<Option<Vec<u8>>> {
-        let exact = self.zip.index_for_name(name).filter(|_| !name.ends_with('/'));
-        let Some(i) = exact.or_else(|| self.lenient.get(&normalize_part_name(name)).and_then(|n| self.zip.index_for_name(n))) else {
-            return Ok(None);
-        };
-        let f = self.zip.by_index(i).map_err(|e| IdmlError::NotIdml(e.to_string()))?;
-        let part = f.name().to_string();
-        let limit = MAX_PART_BYTES.min(self.left);
-        let too_big = || IdmlError::Part {
-            part: part.clone(),
-            msg: format!("larger than the {MAX_PART_BYTES}-byte part limit (or the package is larger than {MAX_TOTAL_BYTES} bytes)"),
-        };
-        if f.size() > limit {
-            return Err(too_big());
-        }
-        let mut buf = Vec::new();
-        f.take(limit.saturating_add(1)).read_to_end(&mut buf).map_err(|e| IdmlError::Part { part: part.clone(), msg: e.to_string() })?;
-        let n = buf.len() as u64;
-        if n > limit {
-            return Err(too_big());
-        }
-        self.left = self.left.saturating_sub(n);
-        Ok(Some(buf))
-    }
-}
-
-/// A package part name in the form the lookup compares: InDesign and other IDML writers differ
-/// in percent-encoding, case, path separators and a leading `./` or `/`.
-fn normalize_part_name(name: &str) -> String {
-    let decoded = percent_decode(&name.replace('\\', "/"));
-    let mut rest = decoded.as_str();
-    loop {
-        if let Some(r) = rest.strip_prefix("./") {
-            rest = r;
-        } else if let Some(r) = rest.strip_prefix('/') {
-            rest = r;
-        } else {
-            break;
-        }
-    }
-    rest.to_lowercase()
-}
-
-/// Decode `%XX` escapes; anything else (including a malformed escape) is kept as written.
-pub(crate) fn percent_decode(s: &str) -> String {
-    let b = s.as_bytes();
-    let mut out = Vec::with_capacity(b.len());
-    let mut i = 0;
-    while let Some(&c) = b.get(i) {
-        if c == b'%'
-            && let (Some(h), Some(l)) = (b.get(i + 1).and_then(|h| (*h as char).to_digit(16)), b.get(i + 2).and_then(|l| (*l as char).to_digit(16)))
-        {
-            out.push((h * 16 + l) as u8);
-            i += 3;
-            continue;
-        }
-        out.push(c);
-        i += 1;
-    }
-    String::from_utf8_lossy(&out).into_owned()
-}
-
-/// An XMP date property, written as an element or an attribute.
-fn xmp_date(xmp: &str, key: &str) -> Option<i64> {
-    let value = if let Some(i) = xmp.find(&format!("<{key}>")) {
-        let rest = xmp.get(i + key.len() + 2..)?;
-        rest.get(..rest.find('<')?)?
-    } else {
-        let i = xmp.find(&format!("{key}=\""))?;
-        let rest = xmp.get(i + key.len() + 2..)?;
-        rest.get(..rest.find('"')?)?
-    };
-    designcraft_doc::vars::parse_iso_date(value)
-}
-
 struct ItemCtx {
     /// Self → (story self, prev self, next self)
     threads: Vec<(ItemId, String, String, String)>,
@@ -331,168 +210,6 @@ struct Importer<'r> {
     toc: Option<designcraft_doc::Toc>,
 }
 
-/// IDML stores a sort key on each topic, rather than on its page references.
-#[derive(Clone, Default)]
-struct IndexTopic {
-    path: Vec<String>,
-    sort: Vec<String>,
-}
-
-impl IndexTopic {
-    fn child(&self, topic: &El) -> Self {
-        let mut path = self.path.clone();
-        path.push(topic.get("Name").unwrap_or("").to_string());
-        let mut sort = self.sort.clone();
-        if let Some(key) = topic.get("SortOrder").filter(|key| !key.is_empty()) {
-            // Keep empty positions before a child's key, but omit trailing defaults.
-            sort.resize(self.path.len(), String::new());
-            sort.push(key.to_string());
-        }
-        Self { path, sort }
-    }
-}
-
-fn lab_to_color(l: f32, a: f32, b: f32) -> Color {
-    let rgb = lab::xyz_to_srgb(lab::lab_to_xyz(lab::Lab::new(l, a, b)));
-    Color::rgb(rgb[0], rgb[1], rgb[2])
-}
-
-fn mojikumi_row(e: &El) -> Result<designcraft_doc::cjk::MojikumiAki> {
-    let number = |key: &str| -> Result<f64> {
-        let Some(raw) = e.prop(key) else {
-            return Ok(0.0);
-        };
-        raw.trim().parse::<f64>().ok().filter(|v| v.is_finite()).ok_or_else(|| IdmlError::Invalid(format!("Mojikumi row has invalid {key}")))
-    };
-    let integer = |key: &str| -> Result<i16> {
-        let v = number(key)?;
-        if v.fract() != 0.0 || v < f64::from(i16::MIN) || v > f64::from(i16::MAX) {
-            return Err(IdmlError::Invalid(format!("Mojikumi {key} must be an in-range integer")));
-        }
-        Ok(v as i16)
-    };
-    let boolean = |key: &str| -> Result<bool> {
-        match e.prop(key).as_deref().map(str::trim) {
-            None | Some("false") => Ok(false),
-            Some("true") => Ok(true),
-            _ => Err(IdmlError::Invalid(format!("Mojikumi row has invalid {key}"))),
-        }
-    };
-    let row = designcraft_doc::cjk::MojikumiAki {
-        target_class: integer("TargetMojikumiClass")?,
-        side_class: integer("SideMojikumiClass")?,
-        after: boolean("SideIsAfterTarget")?,
-        minimum: number("Minimum")?,
-        desired: number("Desired")?,
-        maximum: number("Maximum")?,
-        priority: integer("CompressionPriority")?,
-        does_not_float: boolean("AkiDoesNotFloat")?,
-    };
-    Ok(row)
-}
-
-/// The numbers in a whitespace-separated list; empty when any number is NaN or infinite (JSON
-/// can't store them, and dropping just those would shift the rest).
-fn nums(s: &str) -> Vec<f64> {
-    let v: Vec<f64> = s.split_whitespace().filter_map(|v| v.parse().ok()).collect();
-    if v.iter().all(|x| x.is_finite()) { v } else { Vec::new() }
-}
-
-/// The viewBox size of an SVG whose root has a viewBox but no width/height (percentages count as
-/// none): InDesign places such a file at one viewBox unit to the point.
-fn svg_viewbox_size(data: &[u8]) -> Option<(f64, f64)> {
-    use quick_xml::events::Event;
-    if data.iter().find(|b| !b.is_ascii_whitespace()) != Some(&b'<') {
-        return None;
-    }
-    let mut r = quick_xml::Reader::from_reader(data);
-    let mut buf = Vec::new();
-    let root = loop {
-        match r.read_event_into(&mut buf).ok()? {
-            Event::Start(e) | Event::Empty(e) => break e.into_owned(),
-            Event::Eof => return None,
-            _ => buf.clear(),
-        }
-    };
-    if root.local_name().as_ref() != b"svg" {
-        return None;
-    }
-    let attr = |name: &[u8]| {
-        root.attributes()
-            .with_checks(false)
-            .flatten()
-            .find(|a| a.key.as_ref() == name)
-            .and_then(|a| a.normalized_value(quick_xml::XmlVersion::Implicit1_0).ok().map(|v| v.to_string()))
-    };
-    let absolute = |name: &[u8]| attr(name).is_some_and(|v| !v.trim().ends_with('%'));
-    if absolute(b"width") || absolute(b"height") {
-        return None;
-    }
-    let vb: Vec<f64> =
-        attr(b"viewBox")?.split(|c: char| c.is_whitespace() || c == ',').filter(|v| !v.is_empty()).filter_map(|v| v.parse().ok()).collect();
-    match vb[..] {
-        [_, _, w, h] if w.is_finite() && h.is_finite() && w > 0.0 && h > 0.0 => Some((w, h)),
-        _ => None,
-    }
-}
-
-fn parse_affine(s: Option<&str>) -> Affine {
-    match s.map(nums) {
-        Some(v) if v.len() == 6 => Affine::new([v[0], v[1], v[2], v[3], v[4], v[5]]),
-        _ => Affine::IDENTITY,
-    }
-}
-
-/// View › Rotate Spread from a `Spread` element's `ItemTransform`: quarter turns clockwise on
-/// screen (IDML y points down, so `0 1 -1 0` is one clockwise turn). The spread's items and
-/// pages stay in unrotated spread coordinates, so only the rotation part is read. Anything other
-/// than an exact quarter turn (identity, scale, other angles, malformed numbers) is no rotation.
-fn spread_view_rotation(s: Option<&str>) -> u8 {
-    let parsed: std::result::Result<Vec<f64>, _> = s.unwrap_or("").split_whitespace().take(7).map(str::parse::<f64>).collect();
-    let Some([a, b, c, d, _, _]) = parsed.ok().and_then(|v| <[f64; 6]>::try_from(v).ok()) else { return 0 };
-    let is = |x: f64, y: f64| (x - y).abs() < 1e-6;
-    let quarter = |m: [f64; 4]| is(a, m[0]) && is(b, m[1]) && is(c, m[2]) && is(d, m[3]);
-    if quarter([0.0, 1.0, -1.0, 0.0]) {
-        1
-    } else if quarter([-1.0, 0.0, 0.0, -1.0]) {
-        2
-    } else if quarter([0.0, -1.0, 1.0, 0.0]) {
-        3
-    } else {
-        0
-    }
-}
-
-fn parse_point(s: Option<&str>) -> Option<Point> {
-    let v = nums(s?);
-    (v.len() >= 2).then(|| Point::new(v[0], v[1]))
-}
-
-/// InDesign's corner size where a file gives a corner shape without one.
-const INDESIGN_CORNER_SIZE: f64 = 12.0;
-
-/// The four corners of a paragraph border or shading (`prefix` `ParagraphBorder` /
-/// `ParagraphShading`): top left, top right, bottom right, bottom left. Unset when none is given.
-fn corners(e: &El, prefix: &str) -> Option<[Corner; 4]> {
-    let keys = ["TopLeft", "TopRight", "BottomRight", "BottomLeft"];
-    let shapes = keys.map(|n| e.prop(&format!("{prefix}{n}CornerOption")));
-    let sizes = keys.map(|n| e.num(&format!("{prefix}{n}CornerRadius")));
-    if shapes.iter().all(Option::is_none) && sizes.iter().all(Option::is_none) {
-        return None;
-    }
-    let mut out = [Corner::default(); 4];
-    for (c, (shape, size)) in out.iter_mut().zip(shapes.iter().zip(sizes)) {
-        c.shape = shape.as_deref().map_or(designcraft_geom::corners::CornerShape::None, |s| names::corner_in(s.trim()));
-        c.size = size.filter(|v| v.is_finite()).map_or(12.0, |v| v.max(0.0));
-    }
-    Some(out)
-}
-
-/// IDML tint (percent; `-1` = the colour's own tint, 100 %) → 0..1.
-fn tint(v: Option<f64>) -> Option<f32> {
-    v.map(|t| if t < 0.0 || t.is_nan() { 1.0 } else { (t / 100.0).min(1.0) as f32 })
-}
-
 impl<'r> Importer<'r> {
     fn new(read_link: &'r dyn Fn(&str) -> Option<Vec<u8>>, previews: &'r HashMap<String, Arc<Vec<u8>>>) -> Self {
         let specials: Vec<Swatch> = designcraft_color::default_swatches().into_iter().filter(|s| s.locked).collect();
@@ -567,7 +284,7 @@ impl<'r> Importer<'r> {
         self.next_id
     }
 
-    fn run(&mut self, _root: &El, top: &[El]) -> Result<()> {
+    fn read_preferences(&mut self, top: &[El]) {
         // Preferences first (page size, facing pages).
         for e in top {
             match e.local() {
@@ -624,6 +341,9 @@ impl<'r> Importer<'r> {
                 _ => {}
             }
         }
+    }
+
+    fn read_composite_fonts(&mut self, top: &[El]) {
         for e in top.iter().filter(|e| e.local() == "CompositeFont") {
             let name =
                 e.get("Name").map(str::to_string).unwrap_or_else(|| unescape_id(e.get("Self").unwrap_or("").trim_start_matches("CompositeFont/")));
@@ -648,6 +368,9 @@ impl<'r> Importer<'r> {
                 .collect();
             self.styles.composite_fonts.push(designcraft_doc::cjk::CompositeFont { name, entries });
         }
+    }
+
+    fn read_cjk_tables(&mut self, top: &[El]) -> Result<()> {
         for e in top.iter().filter(|e| e.local() == "KinsokuTable") {
             if e.get("CantBeginLineChars").is_some() || e.get("CantEndLineChars").is_some() {
                 self.kinsoku.insert(
@@ -677,11 +400,21 @@ impl<'r> Importer<'r> {
                 overrides,
             });
         }
+        Ok(())
+    }
+
+    fn run(&mut self, _root: &El, top: &[El]) -> Result<()> {
+        self.read_preferences(top);
+        self.read_composite_fonts(top);
+        self.read_cjk_tables(top)?;
         self.graphics(top);
         self.styles(top);
         if let Some(e) = top.iter().find(|e| e.local() == "FootnoteOption") {
             self.footnote_option(e);
         }
+        if let Some(e) = top.iter().find(|e| e.local() == "EPubExportPreference") {
+            self.epub_split(e);
+        }
         for e in top.iter().filter(|e| e.local() == "Layer") {
             let id = LayerId(self.alloc());
             let color = match e.prop_el("LayerColor") {
@@ -818,2411 +551,6 @@ impl<'r> Importer<'r> {
         Ok(())
     }
 
-    fn doc_prefs(&mut self, e: &El) {
-        let s = &mut self.settings;
-        if let Some(v) = e.get("OverprintBlack") {
-            s.overprint_black = v != "false";
-        }
-        if let Some(v) = e.num("PageWidth") {
-            s.page_width = v;
-        }
-        if let Some(v) = e.num("PageHeight") {
-            s.page_height = v;
-        }
-        if let Some(v) = e.boolean("FacingPages") {
-            s.facing_pages = v;
-        }
-        if let Some(v) = e.get("PageBinding") {
-            s.right_to_left_binding = v == "RightToLeft";
-        }
-        for (i, k) in ["DocumentBleedTopOffset", "DocumentBleedBottomOffset", "DocumentBleedInsideOrLeftOffset", "DocumentBleedOutsideOrRightOffset"]
-            .iter()
-            .enumerate()
-        {
-            if let Some(v) = e.num(k) {
-                s.bleed[i] = v;
-            }
-        }
-        for (i, k) in ["SlugTopOffset", "SlugBottomOffset", "SlugInsideOrLeftOffset", "SlugRightOrOutsideOffset"].iter().enumerate() {
-            if let Some(v) = e.num(k) {
-                s.slug[i] = v;
-            }
-        }
-        if let Some(i) = e.get("Intent") {
-            s.intent = match i {
-                "WebIntent" => designcraft_doc::Intent::Web,
-                "MobileIntent" => designcraft_doc::Intent::Mobile,
-                _ => designcraft_doc::Intent::Print,
-            };
-        }
-        if let Some(v) = e.boolean("CreatePrimaryTextFrame") {
-            s.primary_text_frame = v;
-        }
-        if let Some(v) = e.boolean("ColumnGuideLocked") {
-            s.column_guides_locked = v;
-        }
-    }
-
-    fn grid_prefs(&mut self, e: &El) {
-        let s = &mut self.settings;
-        let bg: &mut BaselineGrid = &mut s.baseline_grid;
-        if let Some(v) = e.num("BaselineStart") {
-            bg.start = v;
-        }
-        if let Some(v) = e.num("BaselineDivision") {
-            bg.increment = v;
-        }
-        if let Some(v) = e.num("BaselineViewThreshold") {
-            bg.view_threshold = v / 100.0;
-        }
-        if let Some(v) = e.get("BaselineGridRelativeOption") {
-            bg.relative_to = if v.contains("Margin") { GridRelative::TopMargin } else { GridRelative::TopOfPage };
-        }
-        if let Some(v) = e.num("HorizontalGridlineDivision") {
-            s.grid.horizontal = v;
-        }
-        if let Some(v) = e.num("VerticalGridlineDivision") {
-            s.grid.vertical = v;
-        }
-        if let Some(v) = e.num("HorizontalGridSubdivision") {
-            s.grid.subdivisions = v.max(1.0) as u32;
-        }
-        if let Some(v) = e.boolean("GridsInBack") {
-            s.grid.in_back = v;
-        }
-    }
-
-    // ---------- swatches ----------
-
-    fn color_of(e: &El) -> Option<(Color, ColorType)> {
-        let v = nums(e.get("ColorValue").unwrap_or(""));
-        let space = e.get("Space").unwrap_or("CMYK");
-        let c = match space {
-            "RGB" if v.len() >= 3 => Color::rgb((v[0] / 255.0) as f32, (v[1] / 255.0) as f32, (v[2] / 255.0) as f32),
-            "LAB" if v.len() >= 3 => lab_to_color(v[0] as f32, v[1] as f32, v[2] as f32),
-            _ if v.len() >= 4 => Color::cmyk((v[0] / 100.0) as f32, (v[1] / 100.0) as f32, (v[2] / 100.0) as f32, (v[3] / 100.0) as f32),
-            _ => return None,
-        };
-        // Huge values (1e300) overflow `f32` to infinity.
-        let parts = match c {
-            Color::Rgb { r, g, b } => [r, g, b, 0.0],
-            Color::Cmyk { c, m, y, k } => [c, m, y, k],
-            Color::Gray { k } => [k, 0.0, 0.0, 0.0],
-        };
-        if !parts.iter().all(|v| v.is_finite()) {
-            return None;
-        }
-        let ty = if e.get("Model") == Some("Spot") { ColorType::Spot } else { ColorType::Process };
-        Some((c, ty))
-    }
-
-    fn graphics(&mut self, top: &[El]) {
-        let mut order: Vec<(String, Swatch)> = Vec::new();
-        // Colours.
-        for e in top.iter().filter(|e| e.local() == "Color") {
-            let Some(id) = e.get("Self") else { continue };
-            let Some((c, ty)) = Self::color_of(e) else { continue };
-            match id {
-                "Color/Paper" => {
-                    if let Some(s) = self.swatches.iter_mut().find(|s| s.name == swatch::PAPER) {
-                        s.value = SwatchValue::Paper { color: if c == Color::cmyk(0.0, 0.0, 0.0, 0.0) { Color::WHITE } else { c } };
-                    }
-                    continue;
-                }
-                "Color/Black" | "Color/Registration" => continue,
-                _ => {}
-            }
-            let name = e.get("Name").unwrap_or("");
-            if e.get("Visible") == Some("false") || name.is_empty() || name == "$ID/" || e.get("Model") == Some("Registration") {
-                self.hidden_colors.insert(id.to_string(), c);
-                continue;
-            }
-            let named = !name.starts_with("C=") && !name.starts_with("R=");
-            self.swatch_names.insert(id.to_string(), name.to_string());
-            order.push((
-                id.to_string(),
-                Swatch { name: name.to_string(), value: SwatchValue::Color { color: c, color_type: ty }, locked: false, named, hidden: false },
-            ));
-        }
-        // Tints (after colours: they reference them).
-        for e in top.iter().filter(|e| e.local() == "Tint") {
-            let Some(id) = e.get("Self") else { continue };
-            let base = e.get("BaseColor").map(|b| self.swatch_ref(b)).unwrap_or_else(|| swatch::BLACK.to_string());
-            let t = e.num("TintValue").unwrap_or(100.0);
-            let name = match e.get("Name") {
-                Some(n) if !n.is_empty() && n != "$ID/" => n.to_string(),
-                _ => format!("{base} {}%", names::num(t)),
-            };
-            self.swatch_names.insert(id.to_string(), name.clone());
-            order.push((
-                id.to_string(),
-                Swatch { name, value: SwatchValue::Tint { base, tint: (t / 100.0) as f32 }, locked: false, named: true, hidden: false },
-            ));
-        }
-        // Custom stroke styles.
-        for e in top.iter().filter(|e| matches!(e.local(), "StripedStrokeStyle" | "DashedStrokeStyle" | "DottedStrokeStyle")) {
-            let (Some(id), Some(name)) = (e.get("Self"), e.get("Name")) else { continue };
-            let kind = match e.local() {
-                "StripedStrokeStyle" => designcraft_doc::StrokeType::Stripes {
-                    bands: nums(e.get("StripeArray").unwrap_or(""))
-                        .as_chunks::<2>()
-                        .0
-                        .iter()
-                        .map(|c| (c[0] / 100.0, (c[1] - c[0]) / 100.0))
-                        .collect(),
-                },
-                "DashedStrokeStyle" => designcraft_doc::StrokeType::Dashed { pattern: nums(e.get("DashArray").unwrap_or("")) },
-                _ => designcraft_doc::StrokeType::Dotted,
-            };
-            let _ = id;
-            self.stroke_styles.push(designcraft_doc::StrokeStyleDef { name: name.to_string(), kind });
-        }
-        // Ink Manager.
-        for e in top.iter().filter(|e| e.local() == "Ink") {
-            let Some(name) = e
-                .get("Name")
-                .filter(|n| !n.starts_with("$ID/") && !["Process Cyan", "Process Magenta", "Process Yellow", "Process Black"].contains(n))
-            else {
-                continue;
-            };
-            if e.get("ConvertToProcess") == Some("true") {
-                self.inks.to_process.push(name.to_string());
-            }
-            if let Some(a) = e.get("AliasInkName").filter(|a| !a.is_empty() && *a != name && !a.starts_with("$ID/")) {
-                self.inks.aliases.push((name.to_string(), a.to_string()));
-            }
-        }
-        for e in top.iter().filter(|e| e.local() == "Gradient") {
-            let Some(id) = e.get("Self") else { continue };
-            let mut stops: Vec<GradientStop> = Vec::new();
-            for s in e.find_all("GradientStop") {
-                let c = s.get("StopColor").map(|r| self.color_for_ref(r, &order)).unwrap_or(Color::BLACK);
-                let loc = s.num("Location").unwrap_or(0.0) / 100.0;
-                if let (Some(prev), Some(m)) = (stops.last_mut(), s.num("Midpoint")) {
-                    prev.midpoint = (m / 100.0) as f32;
-                }
-                stops.push(GradientStop { offset: loc as f32, color: c, opacity: 1.0, midpoint: 0.5 });
-            }
-            let kind = if e.get("Type") == Some("Radial") { GradientKind::Radial } else { GradientKind::Linear };
-            let unnamed = e.get("Visible") == Some("false") || e.get("Name").is_none_or(|n| n.is_empty() || n == "$ID/");
-            let name = if unnamed { "Gradient".to_string() } else { e.get("Name").unwrap_or_default().to_string() };
-            let sw =
-                Swatch { name, value: SwatchValue::Gradient { gradient: Gradient { kind, stops } }, locked: false, named: !unnamed, hidden: false };
-            if unnamed {
-                // Unnamed gradients become swatches only when something uses them.
-                self.hidden_swatches.insert(id.to_string(), sw);
-            } else {
-                self.swatch_names.insert(id.to_string(), sw.name.clone());
-                order.push((id.to_string(), sw));
-            }
-        }
-        // Panel order from the root colour group.
-        let group_order: Vec<String> = top
-            .iter()
-            .filter(|e| e.local() == "ColorGroup")
-            .flat_map(|g| g.find_all("ColorGroupSwatch").filter_map(|s| s.get("SwatchItemRef").map(str::to_string)).collect::<Vec<_>>())
-            .collect();
-        if !group_order.is_empty() {
-            order.sort_by_key(|(id, _)| group_order.iter().position(|g| g == id).unwrap_or(usize::MAX));
-        }
-        let mut names: HashSet<String> = self.swatches.iter().map(|s| s.name.clone()).collect();
-        for (id, mut s) in order {
-            if names.contains(&s.name) {
-                let base = s.name.clone();
-                s.name = Styles::unique_name(|n| names.contains(n), &base);
-                self.swatch_names.insert(id, s.name.clone());
-            }
-            names.insert(s.name.clone());
-            self.swatches.push(s);
-        }
-        // Colour groups other than the root one become Swatches panel folders.
-        for g in top.iter().filter(|e| e.local() == "ColorGroup" && e.get("IsRootColorGroup") != Some("true")) {
-            let swatches: Vec<String> =
-                g.find_all("ColorGroupSwatch").filter_map(|s| s.get("SwatchItemRef")).filter_map(|r| self.swatch_names.get(r).cloned()).collect();
-            self.color_groups.push(designcraft_doc::ColorGroup { name: g.get("Name").unwrap_or("Color Group").to_string(), swatches });
-        }
-    }
-
-    fn color_for_ref(&self, r: &str, pending: &[(String, Swatch)]) -> Color {
-        if let Some(c) = self.hidden_colors.get(r) {
-            return *c;
-        }
-        match r {
-            "Color/Black" => return Color::cmyk(0.0, 0.0, 0.0, 1.0),
-            "Color/Paper" => return Color::WHITE,
-            "Color/Registration" => return Color::cmyk(1.0, 1.0, 1.0, 1.0),
-            _ => {}
-        }
-        if let Some((_, s)) = pending.iter().find(|(id, _)| id == r) {
-            match &s.value {
-                SwatchValue::Color { color, .. } => return *color,
-                SwatchValue::Tint { base, tint } => {
-                    let mut all: Vec<Swatch> = self.swatches.clone();
-                    all.extend(pending.iter().map(|(_, s)| s.clone()));
-                    return designcraft_color::swatch::resolve(&all, base, *tint).unwrap_or(Color::BLACK);
-                }
-                _ => {}
-            }
-        }
-        Color::BLACK
-    }
-
-    /// A `TextFramePreference`, with its column rule colour resolved to a swatch.
-    fn frame_options(&mut self, prefs: &[&El]) -> TextFrameOptions {
-        let mut o = text_frame_options(prefs);
-        if let Some(r) = Prefs(prefs).prop("ColumnRuleStrokeColor") {
-            o.column_rule_color = self.swatch_ref(&r);
-        }
-        o
-    }
-
-    /// A swatch reference (Self id) → our swatch name; unnamed colours become value-named swatches.
-    fn swatch_ref(&mut self, r: &str) -> String {
-        if let Some(n) = self.swatch_names.get(r) {
-            return n.clone();
-        }
-        if r == "n" || r.is_empty() {
-            return swatch::NONE.into();
-        }
-        if let Some(mut sw) = self.hidden_swatches.remove(r) {
-            sw.name = Styles::unique_name(|n| self.swatches.iter().any(|s| s.name == n), &sw.name);
-            self.swatch_names.insert(r.to_string(), sw.name.clone());
-            let name = sw.name.clone();
-            self.swatches.push(sw);
-            return name;
-        }
-        if let Some(c) = self.hidden_colors.get(r).copied() {
-            let name = match c {
-                Color::Cmyk { c, m, y, k } => designcraft_color::swatch::cmyk_name(c, m, y, k),
-                Color::Rgb { r, g, b } => format!("R={} G={} B={}", (r * 255.0).round(), (g * 255.0).round(), (b * 255.0).round()),
-                Color::Gray { k } => format!("K={}", (k * 100.0).round()),
-            };
-            if !self.swatches.iter().any(|s| s.name == name) {
-                self.swatches.push(Swatch {
-                    name: name.clone(),
-                    value: SwatchValue::Color { color: c, color_type: ColorType::Process },
-                    locked: false,
-                    named: false,
-                    hidden: false,
-                });
-            }
-            self.swatch_names.insert(r.to_string(), name.clone());
-            return name;
-        }
-        swatch::NONE.into()
-    }
-
-    // ---------- styles ----------
-
-    fn styles(&mut self, top: &[El]) {
-        for e in top.iter().filter(|e| e.local() == "Condition") {
-            let (Some(id), Some(name)) = (e.get("Self"), e.get("Name")) else { continue };
-            // Indicator colours: "r g b" (0–255) or a UI colour name (kept as the default blue).
-            let nums: Vec<u8> = e
-                .get("IndicatorColor")
-                .unwrap_or("")
-                .split_whitespace()
-                .filter_map(|x| x.parse::<f64>().ok())
-                .map(|x| x.clamp(0.0, 255.0) as u8)
-                .collect();
-            let color = if nums.len() == 3 { [nums[0], nums[1], nums[2]] } else { [79, 153, 255] };
-            self.condition_names.insert(id.to_string(), name.to_string());
-            self.conditions.push(designcraft_doc::Condition { name: name.to_string(), color, visible: e.get("Visible") != Some("false") });
-        }
-        for e in top.iter().filter(|e| e.local() == "NumberingList") {
-            let name = e.get("Name").unwrap_or("").to_string();
-            if !name.is_empty() && !name.starts_with("$ID/") && !self.lists.iter().any(|l| l.name == name) {
-                self.lists
-                    .push(designcraft_doc::NumberedList { name, continue_across_stories: e.get("ContinueNumbersAcrossStories") == Some("true") });
-            }
-        }
-        let mut paras: Vec<(String, El)> = Vec::new();
-        let mut chars: Vec<(String, El)> = Vec::new();
-        let mut objects: Vec<(String, El)> = Vec::new();
-        let mut cell_styles: Vec<(String, El)> = Vec::new();
-        let mut table_styles: Vec<(String, El)> = Vec::new();
-        fn walk(e: &El, style: &str, group: &str, out: &mut Vec<(String, El)>) {
-            for c in e.elements() {
-                if c.local() == style {
-                    out.push((c.get("Self").unwrap_or("").to_string(), c.clone()));
-                } else if c.local() == group {
-                    walk(c, style, group, out);
-                }
-            }
-        }
-        for e in top {
-            match e.local() {
-                "RootParagraphStyleGroup" => walk(e, "ParagraphStyle", "ParagraphStyleGroup", &mut paras),
-                "RootCharacterStyleGroup" => walk(e, "CharacterStyle", "CharacterStyleGroup", &mut chars),
-                "RootObjectStyleGroup" => walk(e, "ObjectStyle", "ObjectStyleGroup", &mut objects),
-                "RootCellStyleGroup" => walk(e, "CellStyle", "CellStyleGroup", &mut cell_styles),
-                "RootTableStyleGroup" => walk(e, "TableStyle", "TableStyleGroup", &mut table_styles),
-                _ => {}
-            }
-        }
-        for (id, e) in &paras {
-            let n = names::style_name_in(PARA_BUILTINS, e.get("Name").unwrap_or(""));
-            self.para_names.insert(id.clone(), n);
-        }
-        for (id, e) in &chars {
-            let n = names::style_name_in(CHAR_BUILTINS, e.get("Name").unwrap_or(""));
-            self.char_names.insert(id.clone(), n);
-        }
-        for (id, e) in &objects {
-            let n = names::style_name_in(OBJECT_BUILTINS, e.get("Name").unwrap_or(""));
-            self.object_names.insert(id.clone(), n);
-            self.object_els.insert(id.clone(), e.clone());
-        }
-        for (id, e) in &paras {
-            self.para_els.insert(id.clone(), e.clone());
-        }
-        for (_, e) in &paras {
-            let name = names::style_name_in(PARA_BUILTINS, e.get("Name").unwrap_or(""));
-            let based_on = if name == designcraft_doc::NO_PARA_STYLE { None } else { self.based_on(e, true) };
-            let next_style = e.get("NextStyle").map(|n| self.para_style_ref(n)).filter(|n| *n != name);
-            let para = self.para_attrs(e);
-            let chars = self.char_attrs(e);
-            let s = ParagraphStyle { name: name.clone(), based_on, next_style, para, chars, shortcut: String::new() };
-            match self.styles.para_mut(&name) {
-                Some(slot) => *slot = s,
-                None => self.styles.paragraph.push(s),
-            }
-        }
-        for (_, e) in &chars {
-            let name = names::style_name_in(CHAR_BUILTINS, e.get("Name").unwrap_or(""));
-            let based_on = if name == st::NO_CHAR_STYLE { None } else { self.based_on(e, false) };
-            let chars = self.char_attrs(e);
-            let s = CharacterStyle { name: name.clone(), based_on, chars, shortcut: String::new() };
-            match self.styles.char_style_mut(&name) {
-                Some(slot) => *slot = s,
-                None => self.styles.character.push(s),
-            }
-        }
-        // Keep built-ins as well: [Basic Table] is editable, and [No table style]
-        // supplies the defaults used by named styles in ordinary IDML files.
-        for (id, e) in &cell_styles {
-            self.cell_names.insert(id.clone(), names::style_name_in(names::CELL_BUILTINS, e.get("Name").unwrap_or("")));
-        }
-        for (id, e) in &table_styles {
-            self.table_names.insert(id.clone(), names::style_name_in(names::TABLE_BUILTINS, e.get("Name").unwrap_or("")));
-        }
-        for (_, e) in &cell_styles {
-            let name = names::style_name_in(names::CELL_BUILTINS, e.get("Name").unwrap_or(""));
-            let mut cs = designcraft_doc::CellStyle { name: name.clone(), ..Default::default() };
-            cs.based_on =
-                e.prop("BasedOn").map(|r| self.cell_style_ref(&r)).or_else(|| Some(designcraft_doc::NO_CELL_STYLE.into())).filter(|n| *n != name);
-            cs.fill = e.prop("FillColor").map(|c| self.swatch_ref(&c));
-            cs.fill_tint = tint(e.num("FillTint"));
-            cs.inset_overrides = ["TopInset", "LeftInset", "BottomInset", "RightInset"].map(|k| e.num(k).map(|v| v.max(0.0)));
-            if let [Some(top), Some(left), Some(bottom), Some(right)] = cs.inset_overrides {
-                cs.insets = Some([top, left, bottom, right]);
-                cs.inset_overrides = [None; 4];
-            }
-            cs.vj = e.get("VerticalJustification").map(names::vj_in);
-            cs.first_baseline = e.get("FirstBaselineOffset").map(names::first_baseline_in);
-            cs.first_baseline_min = e.num("MinimumFirstBaselineOffset").filter(|v| v.is_finite()).map(|v| v.clamp(0.0, 8640.0));
-            cs.strokes = ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"].map(|side| self.cell_stroke_attrs(e, side));
-            if let Some(stroke) = uniform_cell_stroke(&cs.strokes) {
-                cs.stroke = Some(stroke);
-                cs.strokes = Default::default();
-            }
-            cs.paragraph_style = e.get("AppliedParagraphStyle").map(|r| self.para_style_ref(r)).filter(|n| n != designcraft_doc::NO_PARA_STYLE);
-            match self.styles.cell.iter_mut().find(|c| c.name == name) {
-                Some(slot) => *slot = cs,
-                None => self.styles.cell.push(cs),
-            }
-        }
-        for (_, e) in &table_styles {
-            let name = names::style_name_in(names::TABLE_BUILTINS, e.get("Name").unwrap_or(""));
-            let mut ts = designcraft_doc::TableStyle { name: name.clone(), ..Default::default() };
-            ts.based_on =
-                e.prop("BasedOn").map(|r| self.table_style_ref(&r)).or_else(|| Some(designcraft_doc::NO_TABLE_STYLE.into())).filter(|n| *n != name);
-            ts.header = e.get("HeaderRegionCellStyle").map(|r| if r == "n" { designcraft_doc::NO_CELL_STYLE.into() } else { self.cell_style_ref(r) });
-            ts.body = e.get("BodyRegionCellStyle").map(|r| if r == "n" { designcraft_doc::NO_CELL_STYLE.into() } else { self.cell_style_ref(r) });
-            ts.footer = e.get("FooterRegionCellStyle").map(|r| if r == "n" { designcraft_doc::NO_CELL_STYLE.into() } else { self.cell_style_ref(r) });
-            ts.left_column =
-                e.get("LeftColumnRegionCellStyle").map(|r| if r == "n" { designcraft_doc::NO_CELL_STYLE.into() } else { self.cell_style_ref(r) });
-            ts.right_column =
-                e.get("RightColumnRegionCellStyle").map(|r| if r == "n" { designcraft_doc::NO_CELL_STYLE.into() } else { self.cell_style_ref(r) });
-            ts.header_same_as_body = e.boolean("HeaderRegionSameAsBodyRegion");
-            ts.footer_same_as_body = e.boolean("FooterRegionSameAsBodyRegion");
-            ts.left_column_same_as_body = e.boolean("LeftColumnRegionSameAsBodyRegion");
-            ts.right_column_same_as_body = e.boolean("RightColumnRegionSameAsBodyRegion");
-            ts.borders = ["TopBorder", "LeftBorder", "BottomBorder", "RightBorder"].map(|side| self.cell_stroke_attrs(e, side));
-            if let Some(border) = uniform_cell_stroke(&ts.borders) {
-                ts.border = Some(border);
-                ts.borders = Default::default();
-            }
-            ts.row_fills = self.alt_fill_attrs(e, "Row");
-            ts.column_fills = self.alt_fill_attrs(e, "Column");
-            ts.row_strokes = self.alt_stroke_attrs(e, "Row");
-            ts.column_strokes = self.alt_stroke_attrs(e, "Column");
-            ts.space_before = e.num("SpaceBefore");
-            ts.space_after = e.num("SpaceAfter");
-            match self.styles.table.iter_mut().find(|c| c.name == name) {
-                Some(slot) => *slot = ts,
-                None => self.styles.table.push(ts),
-            }
-        }
-        for (_, e) in &objects {
-            let name = names::style_name_in(OBJECT_BUILTINS, e.get("Name").unwrap_or(""));
-            let based_on = e.prop("BasedOn").map(|b| {
-                self.object_names
-                    .get(&b)
-                    .cloned()
-                    .unwrap_or_else(|| names::style_name_in(OBJECT_BUILTINS, &unescape_id(b.trim_start_matches("ObjectStyle/"))))
-            });
-            let based_on = based_on.filter(|b| *b != designcraft_doc::NO_OBJECT_STYLE && *b != name);
-            let enabled = |k: &str, attr: &str| match e.get(k) {
-                Some(v) => v == "true",
-                None => e.get(attr).is_some(),
-            };
-            let fill = enabled("EnableFill", "FillColor").then(|| {
-                let sw = e.get("FillColor").map(|r| self.swatch_ref(r)).unwrap_or_else(|| swatch::NONE.into());
-                Fill { swatch: sw, tint: tint(e.num("FillTint")).unwrap_or(1.0), ..Fill::none() }
-            });
-            let stroke = enabled("EnableStroke", "StrokeColor").then(|| self.stroke_from(e, None));
-            let paragraph_style = enabled("EnableParagraphStyle", "AppliedParagraphStyle")
-                .then(|| e.get("AppliedParagraphStyle").map(|r| self.para_style_ref(r)))
-                .flatten();
-            let text_frame = if e.get("EnableTextFrameGeneralOptions") == Some("true") {
-                e.find("TextFramePreference").map(|t| self.frame_options(&[t]))
-            } else {
-                None
-            };
-            let effects = self.style_effects(e);
-            let s = ObjectStyle { name: name.clone(), based_on, fill, stroke, paragraph_style, text_frame, effects };
-            match self.styles.object.iter_mut().find(|o| o.name == name) {
-                Some(slot) => *slot = s,
-                None => self.styles.object.push(s),
-            }
-        }
-    }
-
-    fn based_on(&self, e: &El, para: bool) -> Option<String> {
-        let b = e.prop("BasedOn")?;
-        let b = b.trim();
-        if para {
-            if let Some(n) = self.para_names.get(b) {
-                return Some(n.clone());
-            }
-            let n = names::style_name_in(PARA_BUILTINS, &unescape_id(b.trim_start_matches("ParagraphStyle/")));
-            Some(n)
-        } else {
-            if let Some(n) = self.char_names.get(b) {
-                return Some(n.clone()).filter(|n| n != st::NO_CHAR_STYLE);
-            }
-            let n = names::style_name_in(CHAR_BUILTINS, &unescape_id(b.trim_start_matches("CharacterStyle/")));
-            Some(n).filter(|n| n != st::NO_CHAR_STYLE)
-        }
-    }
-
-    /// Index topics (recursively); at the root, their See / See also cross-references too.
-    fn index_topics_of(&mut self, e: &El, prefix: &IndexTopic) {
-        for t in e.find_all("Topic") {
-            let topic = prefix.child(t);
-            if let Some(me) = t.get("Self") {
-                self.index_topics.insert(me.to_string(), topic.clone());
-            }
-            self.index_topics_of(t, &topic);
-        }
-        if !prefix.path.is_empty() {
-            return;
-        }
-        let mut stack = vec![(e, IndexTopic::default())];
-        while let Some((el, prefix)) = stack.pop() {
-            for t in el.find_all("Topic") {
-                let topic = prefix.child(t);
-                for x in t.find_all("CrossReference") {
-                    let target = x.get("ReferencedTopic").and_then(|r| self.index_topics.get(r)).map(|t| t.path.join(": ")).unwrap_or_default();
-                    use designcraft_doc::index::IndexRange as R;
-                    let range = match x.get("CrossReferenceType") {
-                        Some("SeeAlso") | Some("SeeAlsoHerein") => R::SeeAlso(target),
-                        _ => R::See(target),
-                    };
-                    self.index_xrefs.push(designcraft_doc::IndexRef { topics: topic.path.clone(), sort: topic.sort.clone(), range });
-                }
-                stack.push((t, topic));
-            }
-        }
-    }
-
-    /// `CrossReferenceFormat`: building blocks back to a format definition.
-    /// A `TextVariable` definition. Types that aren't computed here keep their settings and show
-    /// the result of their first instance.
-    fn text_variable(&mut self, e: &El) {
-        use designcraft_doc::vars::{TextVariable, Use, VAR_MAX, VarKind};
-        let ty = e.get("VariableType").unwrap_or("");
-        // Cross-reference internals; export writes its own.
-        if ty.is_empty() || ty.starts_with("Xref") {
-            return;
-        }
-        let vars = self.text_vars.get_or_insert_with(Vec::new);
-        if vars.len() >= VAR_MAX {
-            return;
-        }
-        let pref = e.elements().find(|c| c.local().ends_with("Preference"));
-        let attr = |k: &str| pref.and_then(|p| p.get(k)).unwrap_or("");
-        let date = || Some(attr("Format")).filter(|f| !f.is_empty()).unwrap_or("MM/dd/yy").to_string();
-        let kind = match ty {
-            "CustomTextType" => Some(VarKind::Custom { text: attr("Contents").into() }),
-            "LastPageNumberType" => Some(VarKind::LastPageNumber { section: attr("Scope") == "SectionScope" }),
-            "ChapterNumberType" => Some(VarKind::ChapterNumber),
-            "FileNameType" if attr("IncludePath") != "true" => Some(VarKind::FileName { extension: attr("IncludeExtension") == "true" }),
-            "CreationDateType" => Some(VarKind::CreationDate { format: date() }),
-            "ModificationDateType" => Some(VarKind::ModificationDate { format: date() }),
-            "OutputDateType" => Some(VarKind::OutputDate { format: date() }),
-            "MatchParagraphStyleType" | "MatchCharacterStyleType" => {
-                let character = ty == "MatchCharacterStyleType";
-                let r = attr(if character { "AppliedCharacterStyle" } else { "AppliedParagraphStyle" });
-                let use_ = if attr("SearchStrategy") == "LastOnPage" { Use::LastOnPage } else { Use::FirstOnPage };
-                // Change Case and Delete End Punctuation aren't modelled: the header shows the text as set.
-                (!r.is_empty()).then(|| VarKind::RunningHeader {
-                    style: if character { self.char_style_ref(r) } else { self.para_style_ref(r) },
-                    use_,
-                    character,
-                })
-            }
-            _ => None,
-        };
-        let name = e.get("Name").unwrap_or("").to_string();
-        let v = match kind {
-            Some(kind) => {
-                let mut v = TextVariable::new(&name, kind);
-                v.before = attr("TextBefore").into();
-                v.after = attr("TextAfter").into();
-                v
-            }
-            None => TextVariable::new(
-                &name,
-                VarKind::Imported {
-                    variable_type: ty.into(),
-                    result: String::new(),
-                    settings_element: pref.map(|p| p.name.clone()).unwrap_or_default(),
-                    settings: pref.map(|p| p.attrs.clone()).unwrap_or_default(),
-                },
-            ),
-        };
-        let vars = self.text_vars.get_or_insert_with(Vec::new);
-        if let Some(s) = e.get("Self") {
-            self.text_var_ids.insert(s.to_string(), vars.len());
-        }
-        vars.push(v);
-    }
-
-    /// A `TextVariableInstance`: the variable's character, or its recorded text when the file
-    /// doesn't define the variable.
-    fn text_variable_instance(&mut self, e: &El) -> String {
-        use designcraft_doc::vars::{VarKind, var_char};
-        let result = e.get("ResultText").unwrap_or("");
-        let found = e.get("AssociatedTextVariable").and_then(|r| self.text_var_ids.get(r)).copied();
-        let var = found.and_then(|i| Some((i, self.text_vars.as_mut()?.get_mut(i)?)));
-        match var.and_then(|(i, v)| Some((var_char(i)?, v))) {
-            Some((c, v)) => {
-                if let VarKind::Imported { result: r, .. } = &mut v.kind
-                    && r.is_empty()
-                {
-                    *r = result.to_string();
-                }
-                c.to_string()
-            }
-            None => result.to_string(),
-        }
-    }
-
-    fn xref_format(&mut self, e: &El) {
-        let name = e.get("Name").unwrap_or("Format").to_string();
-        let mut def = String::new();
-        for b in e.find_all("BuildingBlock") {
-            let text = |k: &str| b.get(k).filter(|v| *v != "$ID/").unwrap_or("").to_string();
-            match b.get("BlockType").unwrap_or("") {
-                "CustomStringBuildingBlock" => def.push_str(&text("CustomText")),
-                "FullParagraphBuildingBlock" => def.push_str("<fullPara />"),
-                "ParagraphTextBuildingBlock" => def.push_str("<paraText />"),
-                "ParagraphNumberBuildingBlock" => def.push_str("<paraNum />"),
-                "PageNumberBuildingBlock" => def.push_str("<pageNum />"),
-                "BookmarkNameBuildingBlock" => def.push_str("<txtAnchrName />"),
-                "ChapterNumberBuildingBlock" => def.push_str("<chapNum />"),
-                "FileNameBuildingBlock" => def.push_str("<fileName />"),
-                "PartialParagraphBuildingBlock" => def.push_str(&format!(
-                    "<partialPara delim=\"{}\" includeDelim=\"{}\" />",
-                    text("AppliedDelimiter"),
-                    b.get("IncludeDelimiter") == Some("true")
-                )),
-                _ => {}
-            }
-        }
-        if let Some(me) = e.get("Self") {
-            self.xref_format_names.insert(me.to_string(), name.clone());
-        }
-        match self.xref_formats.iter_mut().find(|f| f.name == name) {
-            Some(f) => f.definition = def,
-            None => self.xref_formats.push(designcraft_doc::XrefFormat { name, definition: def }),
-        }
-    }
-
-    /// Preferences › `FootnoteOption` (after styles: it names the footnote text and marker styles).
-    fn footnote_option(&mut self, e: &El) {
-        let mut o = designcraft_doc::FootnoteOptions::default();
-        if let Some(v) = e.num("StartAt") {
-            o.start_at = v.max(0.0) as u32;
-        }
-        o.prefix = e.get("Prefix").unwrap_or("").into();
-        o.suffix = e.get("Suffix").unwrap_or("").into();
-        if let Some(r) = e.get("FootnoteTextStyle") {
-            o.para_style = self.para_style_ref(r);
-        }
-        if let Some(r) = e.get("FootnoteMarkerStyle") {
-            o.ref_char_style = self.char_style_ref(r);
-        }
-        if let Some(v) = e.get("SeparatorText") {
-            o.separator = v.into();
-        }
-        o.space_between = e.num("SpaceBetween").unwrap_or(0.0);
-        o.space_before = e.num("Spacer").unwrap_or(0.0);
-        if let Some(v) = e.prop("FootnoteFirstBaselineOffset") {
-            o.first_baseline = names::first_baseline_in(v.trim());
-        }
-        o.first_baseline_min = e.num("FootnoteMinimumFirstBaselineOffset").unwrap_or(0.0);
-        o.span_columns = e.boolean("EnableStraddling").unwrap_or(false);
-        o.rule.on = e.boolean("RuleOn").unwrap_or(true);
-        o.rule.weight = e.num("RuleLineWeight").unwrap_or(1.0);
-        o.rule.tint = tint(e.num("RuleTint")).unwrap_or(1.0);
-        o.rule.left_indent = e.num("RuleLeftIndent").unwrap_or(0.0);
-        o.rule.width = e.num("RuleWidth").unwrap_or(72.0);
-        o.rule.offset = e.num("RuleOffset").unwrap_or(0.0);
-        if let Some(c) = e.prop("RuleColor") {
-            o.rule.color = self.swatch_ref(c.trim());
-        }
-        if let Some(v) = e.prop("FootnoteNumberingStyle") {
-            o.style = names::note_style_in(v.trim());
-        }
-        if let Some(v) = e.prop("RestartNumbering") {
-            o.restart = names::NOTE_RESTART.iter().find(|r| r.1 == v.trim()).map_or(Default::default(), |r| r.0);
-        }
-        if let Some(v) = e.prop("ShowPrefixSuffix") {
-            o.affix_in = names::NOTE_AFFIX.iter().find(|r| r.1 == v.trim()).map_or(Default::default(), |r| r.0);
-        }
-        if let Some(v) = e.prop("MarkerPositioning") {
-            o.ref_position = names::note_marker_in(v.trim());
-        }
-        self.footnote_options = o;
-    }
-
-    /// The table of contents: the TOC style a story is generated from (`AppliedTOCStyle`), with
-    /// its entries. Styles the document doesn't have fall back to the generated TOC styles.
-    fn toc_of(&self, top: &[El]) -> Option<designcraft_doc::Toc> {
-        use designcraft_doc::{TocEntry, TocPageNumber};
-        let (ts, story) = top.iter().filter(|e| e.local() == "TOCStyle").find_map(|ts| {
-            let id = ts.get("Self")?;
-            let story = top.iter().find(|e| e.local() == "Story" && e.get("AppliedTOCStyle") == Some(id))?;
-            Some((ts, *self.story_ids.get(story.get("Self")?)?))
-        })?;
-        let known = |r: Option<&str>| r.map(|r| self.para_style_ref(r)).filter(|n| self.styles.para(n).is_some());
-        // Character styles the document has; [None] is stored as no style.
-        let known_chars = |r: Option<&str>| {
-            r.map(|r| self.char_style_ref(r)).filter(|n| n != designcraft_doc::NO_CHAR_STYLE && self.styles.char_style(n).is_some())
-        };
-        let entries: Vec<TocEntry> = ts
-            .elements()
-            .filter(|e| e.local() == "TOCStyleEntry")
-            .filter_map(|e| {
-                let style = names::style_name_in(PARA_BUILTINS, e.get("Name")?);
-                if style.is_empty() || style.chars().count() > 256 {
-                    return None;
-                }
-                let level = e.get("Level").and_then(|l| l.trim().parse::<u8>().ok()).unwrap_or(1).clamp(1, 9);
-                let page_number = match e.get("PageNumberPosition") {
-                    Some("BeforeEntry") => TocPageNumber::Before,
-                    Some("NoPageNumber") => TocPageNumber::None,
-                    _ => TocPageNumber::After,
-                };
-                let separator = e.get("Separator").map(crate::names::toc_separator_in).filter(|s| s != "\t" && s.chars().count() <= 64);
-                let entry_style = known(e.get("FormatStyle")).filter(|n| *n != format!("TOC Level {level}"));
-                let page_number_style = known_chars(e.get("PageNumberStyle"));
-                let separator_style = known_chars(e.get("SeparatorStyle"));
-                let sort = e.get("Sort").is_some_and(|v| v.trim() == "true");
-                Some(TocEntry { style, level, entry_style, page_number, separator, page_number_style, separator_style, sort })
-            })
-            .take(64)
-            .collect();
-        if entries.is_empty() {
-            return None;
-        }
-        let title: String = ts.get("Title").unwrap_or("").chars().filter(|c| !matches!(c, '\n' | '\r' | '\u{2029}')).take(1024).collect();
-        let title_style = known(ts.get("TitleStyle")).filter(|n| n != "TOC Title");
-        Some(designcraft_doc::Toc { story, title, entries, page_numbers: true, title_style })
-    }
-
-    fn para_style_ref(&self, r: &str) -> String {
-        self.para_names.get(r).cloned().unwrap_or_else(|| names::style_name_in(PARA_BUILTINS, &unescape_id(r.trim_start_matches("ParagraphStyle/"))))
-    }
-    /// A character style reference written as an element's text (nested, line and GREP styles).
-    /// A style name may end in a space, so the reference is used as written when it names a
-    /// style; only otherwise is surrounding whitespace dropped.
-    fn listed_char_style_ref(&self, r: &str) -> String {
-        if self.char_names.contains_key(r) { self.char_style_ref(r) } else { self.char_style_ref(r.trim()) }
-    }
-
-    fn char_style_ref(&self, r: &str) -> String {
-        self.char_names.get(r).cloned().unwrap_or_else(|| names::style_name_in(CHAR_BUILTINS, &unescape_id(r.trim_start_matches("CharacterStyle/"))))
-    }
-
-    fn char_attrs(&mut self, e: &El) -> CharAttrs {
-        let mut a = CharAttrs::default();
-        if let Some(f) = e.prop("AppliedFont") {
-            // Some writers append the style after a tab. Spaces are part of a family's name
-            // ("Minion Pro " is another font than "Minion Pro"); line breaks around it aren't.
-            let fam = f.split('\t').next().unwrap_or(&f).trim_matches(['\n', '\r']);
-            a.font_family = self.composite_names.get(fam.trim()).cloned().or_else(|| names::font_family_in(fam));
-        }
-        // "Nothing" leaves the style unset: it comes from the paragraph style.
-        a.font_style = e.prop("FontStyle").filter(|s| !matches!(s.trim(), "Nothing" | "$ID/Nothing"));
-        a.size = e.num("PointSize");
-        a.leading = e.prop("Leading").and_then(|l| names::leading_in(l.trim()));
-        // Automatic kerning may carry an inactive numeric value (including the
-        // 1e11 IDML sentinel). It must not become a multi-million-em advance.
-        a.kerning = e.prop("KerningMethod").and_then(|k| match k.trim().trim_start_matches("$ID/") {
-            "Optical" => Some(Kerning::Optical),
-            "Metrics" | "Metrics - Roman Only" => Some(Kerning::Metrics),
-            "None" => Some(Kerning::None),
-            _ => None,
-        });
-        if a.kerning.is_none() {
-            a.kerning = e.num("KerningValue").filter(|v| v.is_finite() && v.abs() < 1e10).map(Kerning::Manual);
-        }
-        a.tracking = e.num("Tracking");
-        a.leading_aki = e.num("LeadingAki").map(|v| (v >= 0.0).then_some(v));
-        a.trailing_aki = e.num("TrailingAki").map(|v| (v >= 0.0).then_some(v));
-        a.tsume = e.num("Tsume").map(|v| (v / 100.0).clamp(0.0, 1.0));
-        a.jidori = e.num("Jidori").map(|v| v.clamp(0.0, 10000.0) as u32);
-        a.leading_model = e.prop("LeadingModel").and_then(|v| crate::cjk::leading_in(&v));
-        a.character_alignment = e.prop("CharacterAlignment").and_then(|v| crate::cjk::alignment_in(&v));
-        a.h_scale = e.num("HorizontalScale").map(|v| v / 100.0);
-        a.v_scale = e.num("VerticalScale").map(|v| v / 100.0);
-        a.baseline_shift = e.num("BaselineShift");
-        a.skew = e.num("Skew");
-        if let Some(r) = e.prop("FillColor") {
-            a.fill = Some(self.swatch_ref(r.trim()));
-        }
-        a.fill_tint = tint(e.num("FillTint"));
-        if let Some(r) = e.prop("StrokeColor") {
-            a.stroke = Some(self.swatch_ref(r.trim()));
-        }
-        a.stroke_tint = tint(e.num("StrokeTint"));
-        a.stroke_weight = e.num("StrokeWeight");
-        // Text strokes are centred on the outline or lie outside it, behind the fill.
-        a.stroke_behind_fill = e.prop("StrokeAlignment").and_then(|v| match v.trim() {
-            "OutsideAlignment" => Some(true),
-            "CenterAlignment" => Some(false),
-            _ => None,
-        });
-        a.capitalization = e.prop("Capitalization").and_then(|v| names::caps_in(v.trim()));
-        a.position = e.prop("Position").and_then(|v| names::position_in(v.trim()));
-        a.underline = e.boolean("Underline");
-        a.strikethrough = e.boolean("StrikeThru");
-        a.ligatures = e.boolean("Ligatures");
-        // Underline / strikethrough options (-9999 = automatic).
-        for k in ["Underline", "StrikeThru"] {
-            let num = |n: &str| e.num(&format!("{k}{n}")).filter(|v| *v > -9000.0);
-            // An explicit Text Color resets an inherited swatch; absence still inherits.
-            // Resolve the sentinel before swatch_ref, which maps unknown names to [None].
-            let color = e.prop(&format!("{k}Color")).map(|r| if r.trim() == "Text Color" { String::new() } else { self.swatch_ref(r.trim()) });
-            let tint = tint(e.num(&format!("{k}Tint")));
-            if k == "Underline" {
-                a.underline_weight = num("Weight").map(Some);
-                a.underline_offset = num("Offset").map(Some);
-                a.underline_color = color;
-                a.underline_tint = tint;
-            } else {
-                a.strikethrough_weight = num("Weight").map(Some);
-                a.strikethrough_offset = num("Offset").map(Some);
-                a.strikethrough_color = color;
-                a.strikethrough_tint = tint;
-            }
-        }
-        read_otf_features(e, &mut a);
-        a.glyph_form = e.prop("GlyphForm");
-        a.no_break = e.boolean("NoBreak");
-        a.tate_chu_yoko = e.boolean("Tatechuyoko");
-        a.tate_chu_yoko_x_offset = e.num("TatechuyokoXOffset");
-        a.tate_chu_yoko_y_offset = e.num("TatechuyokoYOffset");
-        a.warichu = e.boolean("Warichu");
-        a.warichu_lines = e.num("WarichuLines").map(|v| v.max(2.0) as u32);
-        a.warichu_size = e.num("WarichuSize");
-        a.warichu_line_spacing = e.num("WarichuLineSpacing");
-        a.warichu_alignment = e.prop("WarichuAlignment").as_deref().and_then(crate::cjk::warichu_align_in);
-        a.warichu_chars_before_break = e.num("WarichuCharsBeforeBreak").map(|v| v.max(0.0) as u32);
-        a.warichu_chars_after_break = e.num("WarichuCharsAfterBreak").map(|v| v.max(0.0) as u32);
-        // InDesign writes the flag as a number (1); older writers wrote a boolean.
-        if let Some(on) = e.boolean("RubyFlag").or_else(|| e.num("RubyFlag").map(|v| v != 0.0)) {
-            a.ruby = Some(if on { e.prop("RubyString").unwrap_or_default() } else { String::new() });
-        }
-        crate::ruby::read(e, &mut a, |r| self.swatch_ref(r));
-        if let Some(k) = e.get("KentenKind") {
-            a.kenten = Some(k != "None");
-            a.kenten_character = crate::cjk::kenten_character(k).map(str::to_string);
-            if k == "Custom" {
-                a.kenten_character = e.prop("KentenCustomCharacter");
-            }
-        }
-        a.digits = e.prop("DigitsType").and_then(|s| names::digits_in(s.trim()));
-        a.character_direction = e.prop("CharacterDirection").and_then(|s| crate::arabic::direction_in(&s));
-        a.allow_kashidas = e.prop("Kashidas").and_then(|s| crate::arabic::kashidas_in(&s));
-        a.diacritic_position = e.prop("DiacriticPosition").and_then(|s| crate::arabic::diacritic_in(&s));
-        a.diacritic_x_offset = e.num("XOffsetDiacritic").filter(|v| v.is_finite());
-        a.diacritic_y_offset = e.num("YOffsetDiacritic").filter(|v| v.is_finite());
-        a.positional_form = e.prop("PositionalForm");
-        self.cjk_settings_chars(e, &mut a);
-        if let Some(v) = e.get("AppliedConditions").filter(|v| !v.trim().is_empty()) {
-            let names: Vec<String> = v.split_whitespace().filter_map(|r| self.condition_names.get(r).cloned()).collect();
-            if !names.is_empty() {
-                a.conditions = Some(names);
-            }
-        }
-        a.language = e.prop("AppliedLanguage").map(|l| l.trim().trim_start_matches("$ID/").to_string());
-        a
-    }
-
-    fn para_attrs(&mut self, e: &El) -> ParaAttrs {
-        let mut a = ParaAttrs::default();
-        let u = |k: &str| e.num(k).map(|v| v.max(0.0) as u32);
-        let frac = |k: &str| e.num(k).map(|v| v / 100.0);
-        a.align = e.prop("Justification").and_then(|v| names::align_in(v.trim()));
-        a.kinsoku_hang = e.prop("KinsokuHangType").and_then(|v| match v.as_str() {
-            "None" => Some(designcraft_doc::cjk::KinsokuHang::None),
-            "KinsokuHangRegular" => Some(designcraft_doc::cjk::KinsokuHang::Regular),
-            "KinsokuHangForce" => Some(designcraft_doc::cjk::KinsokuHang::Force),
-            _ => None,
-        });
-        a.mojikumi = e.prop("Mojikumi").map(|name| self.mojikumi_names.get(&name).cloned().unwrap_or_else(|| unescape_id(&name)));
-        a.kinsoku_type = e.prop("KinsokuType");
-        a.bunri_kinshi = e.boolean("BunriKinshi");
-        a.rensuuji = e.boolean("Rensuuji");
-        a.treat_ideographic_space_as_space = e.boolean("TreatIdeographicSpaceAsSpace");
-        cjk_settings_para(e, &mut a);
-        if let Some(k) = e.prop("KinsokuSet") {
-            if k == "Nothing" || k == "None" {
-                a.kinsoku = Some(Some(Default::default()));
-            } else if let Some(set) = self.kinsoku.get(&k) {
-                a.kinsoku = Some(Some(set.clone()));
-            } else if let Some(set) = designcraft_doc::cjk::Kinsoku::named(&k) {
-                a.kinsoku = Some(Some(set));
-            }
-        }
-        a.direction = e.prop("ParagraphDirection").map(|v| {
-            if v.trim() == "RightToLeftDirection" { designcraft_doc::TextDirection::RightToLeft } else { designcraft_doc::TextDirection::LeftToRight }
-        });
-        a.kashidas = e.prop("Kashidas").and_then(|s| crate::arabic::kashidas_in(&s));
-        a.arabic_justification = e.prop("ParagraphJustification");
-        a.paragraph_kashida_width = e.num("ParagraphKashidaWidth").filter(|v| v.is_finite()).map(Some);
-        a.left_indent = e.num("LeftIndent");
-        a.right_indent = e.num("RightIndent");
-        a.first_line_indent = e.num("FirstLineIndent");
-        a.last_line_indent = e.num("LastLineIndent");
-        a.space_before = e.num("SpaceBefore");
-        if let Some(r) = e.prop("AppliedNumberingList") {
-            let r = r.trim().trim_start_matches("NumberingList/");
-            a.list_name = Some(if r.starts_with("$ID/") { String::new() } else { unescape_id(r) });
-        }
-        match e.prop("NumberingContinue").as_deref().map(str::trim) {
-            Some("false") => a.start_at = Some(e.num("NumberingStartAt").map(|n| n.max(1.0) as u32)),
-            Some("true") => a.start_at = Some(None),
-            _ => {}
-        }
-        // Nested and GREP styles.
-        if let Some(l) = e.prop_el("AllNestedStyles") {
-            let v: Vec<designcraft_doc::NestedStyle> = l
-                .find_all("ListItem")
-                .map(|it| {
-                    let t = |k: &str| it.find(k).map(|x| x.text_content()).unwrap_or_default();
-                    let d = it.find("Delimiter");
-                    designcraft_doc::NestedStyle {
-                        style: self.listed_char_style_ref(&t("AppliedCharacterStyle")),
-                        through: t("Inclusive").trim() != "false",
-                        count: t("Repetition").trim().parse().unwrap_or(1),
-                        until: names::nested_until_in(d.and_then(|d| d.get("type")).unwrap_or("enumeration"), &t("Delimiter")),
-                    }
-                })
-                .collect();
-            // IDML has no drop cap style attribute: the drop cap's character style is the list's
-            // leading "through 1 Dropcap" nested style.
-            a.drop_cap_style = v.first().filter(|ns| ns.is_drop_cap()).map(|ns| ns.style.clone());
-            a.nested_styles = Some(v);
-        }
-        if let Some(l) = e.prop_el("AllNestedLineStyles") {
-            let v: Vec<designcraft_doc::NestedLineStyle> = l
-                .find_all("ListItem")
-                .map(|it| {
-                    let t = |k: &str| it.find(k).map(|x| x.text_content()).unwrap_or_default();
-                    designcraft_doc::NestedLineStyle {
-                        style: self.listed_char_style_ref(&t("AppliedCharacterStyle")),
-                        lines: t("LineCount").trim().parse().unwrap_or(1),
-                    }
-                })
-                .collect();
-            a.nested_line_styles = Some(v);
-        }
-        if let Some(l) = e.prop_el("AllGREPStyles") {
-            let v: Vec<designcraft_doc::GrepStyle> = l
-                .find_all("ListItem")
-                .map(|it| {
-                    let t = |k: &str| it.find(k).map(|x| x.text_content()).unwrap_or_default();
-                    designcraft_doc::GrepStyle { style: self.listed_char_style_ref(&t("AppliedCharacterStyle")), pattern: t("GrepExpression") }
-                })
-                .collect();
-            a.grep_styles = Some(v);
-        }
-        a.space_after = e.num("SpaceAfter");
-        // A number, or an enumeration (Ignore) that turns it off even over a based-on style's value.
-        a.same_para_style_spacing = e.prop("SameParaStyleSpacing").map(|v| v.trim().parse::<f64>().ok().filter(|v| v.is_finite()));
-        a.drop_cap_lines = u("DropCapLines");
-        a.drop_cap_chars = u("DropCapCharacters");
-        // DropcapDetail bits: 1 = Align Left Edge, 2 = Scale for Descenders.
-        if let Some(v) = e.num("DropcapDetail").filter(|v| v.is_finite() && *v >= 0.0) {
-            let bits = v as u32;
-            a.drop_cap_align_left = Some(bits & 1 != 0);
-            a.drop_cap_scale_descenders = Some(bits & 2 != 0);
-        }
-        if let Some(g) = e.prop("GridAlignment") {
-            a.grid_align = Some(if g.trim() == "None" {
-                GridAlign::None
-            } else if e.boolean("GridAlignFirstLineOnly") == Some(true) {
-                GridAlign::FirstLineOnly
-            } else {
-                GridAlign::AllLines
-            });
-            if g.trim() != "None" {
-                a.grid_reference = Some(crate::cjk::grid_reference_in(&g));
-            }
-        }
-        a.composer = e.prop("Composer").map(|c| composer_in(&c));
-        a.hyphenate = e.boolean("Hyphenation");
-        a.hyph_min_word = u("HyphenateWordsLongerThan");
-        a.hyph_after_first = u("HyphenateAfterFirst");
-        a.hyph_before_last = u("HyphenateBeforeLast");
-        a.hyph_limit = u("HyphenateLadderLimit");
-        a.hyph_zone = e.num("HyphenationZone");
-        a.hyph_capitalized = e.boolean("HyphenateCapitalizedWords");
-        a.hyph_last_word = e.boolean("HyphenateLastWord");
-        a.hyph_across_column = e.boolean("HyphenateAcrossColumns");
-        a.hyph_weight = e.num("HyphenWeight").map(|v| v / 10.0);
-        a.word_space_min = frac("MinimumWordSpacing");
-        a.word_space_desired = frac("DesiredWordSpacing");
-        a.word_space_max = frac("MaximumWordSpacing");
-        a.letter_space_min = frac("MinimumLetterSpacing");
-        a.letter_space_desired = frac("DesiredLetterSpacing");
-        a.letter_space_max = frac("MaximumLetterSpacing");
-        a.glyph_scale_min = frac("MinimumGlyphScaling");
-        a.glyph_scale_desired = frac("DesiredGlyphScaling");
-        a.glyph_scale_max = frac("MaximumGlyphScaling");
-        a.auto_leading = frac("AutoLeading");
-        a.single_word_justify = e.prop("SingleWordJustification").and_then(|v| names::align_in(v.trim()));
-        a.keep_with_next = u("KeepWithNext");
-        a.keep_lines_together = e.boolean("KeepLinesTogether");
-        a.keep_all_lines = e.boolean("KeepAllLinesTogether");
-        a.keep_first = u("KeepFirstLines");
-        a.keep_last = u("KeepLastLines");
-        a.start_paragraph = e.prop("StartParagraph").and_then(|v| names::start_para_in(v.trim()));
-        if let Some(t) = e.prop("SpanColumnType") {
-            let n = e.prop("SpanSplitColumnCount").and_then(|v| v.trim().parse::<u32>().ok()).unwrap_or(0);
-            a.span_columns = Some(match t.trim() {
-                "SpanColumns" => SpanColumns::Span(n),
-                "SplitColumns" => SpanColumns::Split(n.max(2)),
-                _ => SpanColumns::Single,
-            });
-        }
-        a.split_inside_gutter = e.num("SplitColumnInsideGutter").filter(|v| v.is_finite());
-        a.split_outside_gutter = e.num("SplitColumnOutsideGutter").filter(|v| v.is_finite());
-        a.rule_above = self.rule(e, "RuleAbove");
-        a.rule_below = self.rule(e, "RuleBelow");
-        if let Some(tl) = e.prop_el("TabList") {
-            let mut tabs = Vec::new();
-            for li in tl.find_all("ListItem") {
-                let get = |k: &str| li.find(k).map(|x| x.text_content());
-                tabs.push(TabStop {
-                    position: get("Position").and_then(|v| v.trim().parse::<f64>().ok()).filter(|v| v.is_finite()).unwrap_or(0.0),
-                    align: names::tab_align_in(get("Alignment").unwrap_or_default().trim()),
-                    leader: get("Leader").unwrap_or_default(),
-                    align_on: get("AlignmentCharacter").filter(|c| c != ".").unwrap_or_default(),
-                });
-            }
-            let sanitized = TabStop::sanitized_list(tabs.clone());
-            if tab_list_repaired(&tabs, &sanitized) {
-                self.repaired_tab_lists = self.repaired_tab_lists.saturating_add(1);
-            }
-            a.tabs = Some(sanitized);
-        }
-        a.list_type = e.prop("BulletsAndNumberingListType").map(|v| match v.trim() {
-            "BulletList" => ListType::Bullets,
-            "NumberedList" => ListType::Numbers,
-            _ => ListType::None,
-        });
-        // A format with no counterpart (CJK, Arabic, Hebrew numbering) is left unset: decimal.
-        a.number_style = e.prop("NumberingFormat").and_then(|v| names::numbering_format_in(&v));
-        a.number_expression = e.prop("NumberingExpression");
-        a.list_separator = e.prop("BulletsTextAfter");
-        if let Some(b) = e.prop_el("BulletChar") {
-            // A glyph of a named font (`GlyphWithFont`) has no character to map to.
-            let unicode = matches!(b.get("BulletCharacterType"), Some("UnicodeOnly" | "UnicodeWithFont"));
-            if let Some(c) = b.get("BulletCharacterValue").and_then(|v| v.trim().parse::<u32>().ok()).and_then(char::from_u32).filter(|_| unicode) {
-                a.bullet_char = Some(c.to_string());
-            }
-        }
-        a.balance_ragged = e.prop("BalanceRaggedLines").map(|v| v.trim() != "NoBalancing" && v.trim() != "false");
-        a.shading_on = e.boolean("ParagraphShadingOn");
-        if let Some(c) = e.prop("ParagraphShadingColor") {
-            a.shading_color = Some(self.swatch_ref(c.trim()));
-        }
-        a.shading_tint = tint(e.num("ParagraphShadingTint"));
-        let sides = |f: &dyn Fn(&str) -> String| -> Option<[f64; 4]> {
-            let v = ["Top", "Left", "Bottom", "Right"].map(|s| e.num(&f(s)));
-            v.iter().any(Option::is_some).then(|| v.map(|x| x.unwrap_or(0.0)))
-        };
-        a.shading_offsets = sides(&|s| format!("ParagraphShading{s}Offset"));
-        a.border_on = e.boolean("ParagraphBorderOn");
-        if let Some(c) = e.prop("ParagraphBorderColor") {
-            a.border_color = Some(self.swatch_ref(c.trim()));
-        }
-        a.border_tint = tint(e.num("ParagraphBorderTint"));
-        a.border_weights = sides(&|s| format!("ParagraphBorder{s}LineWeight"));
-        a.border_offsets = sides(&|s| format!("ParagraphBorder{s}Offset"));
-        a.border_type = e.prop("ParagraphBorderType").map(|v| names::stroke_type_in(v.trim()));
-        a.border_cap = e.prop("ParagraphBorderStrokeEndCap").map(|v| names::cap_in(v.trim()));
-        a.border_join = e.prop("ParagraphBorderStrokeEndJoin").map(|v| names::join_in(v.trim()));
-        a.border_corners = corners(e, "ParagraphBorder");
-        a.border_width = e.prop("ParagraphBorderWidth").map(|v| names::box_width_in(v.trim()));
-        a.border_top = e.prop("ParagraphBorderTopOrigin").map(|v| names::box_top_in(v.trim()));
-        a.border_bottom = e.prop("ParagraphBorderBottomOrigin").map(|v| names::box_bottom_in(v.trim()));
-        a.border_display_if_splits = e.boolean("ParagraphBorderDisplayIfSplits");
-        a.border_merge = e.boolean("MergeConsecutiveParaBorders");
-        if let Some(c) = e.prop("ParagraphBorderGapColor") {
-            a.border_gap_color = Some(self.swatch_ref(c.trim()));
-        }
-        a.border_gap_tint = tint(e.num("ParagraphBorderGapTint"));
-        a.shading_corners = corners(e, "ParagraphShading");
-        a.shading_width = e.prop("ParagraphShadingWidth").map(|v| names::box_width_in(v.trim()));
-        a.shading_top = e.prop("ParagraphShadingTopOrigin").map(|v| names::box_top_in(v.trim()));
-        a.shading_bottom = e.prop("ParagraphShadingBottomOrigin").map(|v| names::box_bottom_in(v.trim()));
-        a.shading_clip = e.boolean("ParagraphShadingClipToFrame");
-        a.shading_nonprinting = e.boolean("ParagraphShadingSuppressPrinting");
-        a.span_space_before = e.num("SpanColumnMinSpaceBefore").filter(|v| v.is_finite());
-        a.span_space_after = e.num("SpanColumnMinSpaceAfter").filter(|v| v.is_finite());
-        a.list_level = e.num("NumberingLevel").filter(|v| v.is_finite()).map(|v| v.round().clamp(1.0, designcraft_doc::LIST_LEVELS as f64) as u32);
-        if let Some(c) = e.prop("BulletsCharacterStyle") {
-            a.bullet_char_style = Some(self.char_style_ref(c.trim()));
-        }
-        if let Some(c) = e.prop("NumberingCharacterStyle") {
-            a.number_char_style = Some(self.char_style_ref(c.trim()));
-        }
-        a.bullet_align = e.prop("BulletsAlignment").map(|v| names::list_align_in(v.trim()));
-        a.number_align = e.prop("NumberingAlignment").map(|v| names::list_align_in(v.trim()));
-        a.restart_numbers = e.boolean("NumberingApplyRestartPolicy");
-        if let Some(r) = e.prop_el("NumberingRestartPolicies") {
-            // A specific level restarts after that level; any other policy after any higher one.
-            let level = r.get("LowerLevel").and_then(|v| v.trim().parse::<u32>().ok()).unwrap_or(0);
-            a.restart_after_level = Some(if r.get("RestartPolicy").map(str::trim) == Some("SpecificPreviousLevel") { level } else { 0 });
-        }
-        if let Some(f) = e.prop("BulletsFont") {
-            let f = f.trim();
-            a.bullet_font = Some(if f == "$ID/" { String::new() } else { f.split('\t').next().unwrap_or(f).to_string() });
-        }
-        if let Some(f) = e.prop("BulletsFontStyle") {
-            let f = f.trim();
-            a.bullet_font_style = Some(if f == "Nothing" || f == "$ID/" { String::new() } else { f.trim_start_matches("$ID/").to_string() });
-        }
-        a
-    }
-
-    fn rule(&mut self, e: &El, k: &str) -> Option<Rule> {
-        // A style or range can set some of a rule's settings (such as only its colour); the others
-        // come from its paragraph style chain, so the rule is whole.
-        let fields = ["", "LineWeight", "Color", "Tint", "Width", "Offset", "LeftIndent", "RightIndent"];
-        if !fields.iter().any(|f| e.prop(&format!("{k}{f}")).is_some()) {
-            return None;
-        }
-        let v: Vec<Option<String>> = fields.iter().map(|f| self.para_setting(e, &format!("{k}{f}"))).collect();
-        let get = |i: usize| v.get(i).cloned().flatten();
-        let num = |i: usize| get(i).and_then(|v| v.trim().parse::<f64>().ok()).filter(|v| v.is_finite());
-        let on = get(0).map(|v| v.trim() == "true");
-        let weight = num(1);
-        on.or(weight.map(|_| false))?;
-        let mut r = Rule { on: on.unwrap_or(false), ..Rule::default() };
-        if let Some(w) = weight {
-            r.weight = w;
-        }
-        if let Some(t) = tint(num(3)) {
-            r.tint = t;
-        }
-        r.column_width = get(4).is_none_or(|w| w.trim() != "TextWidth");
-        r.offset = num(5).unwrap_or(0.0);
-        r.left_indent = num(6).unwrap_or(0.0);
-        r.right_indent = num(7).unwrap_or(0.0);
-        if let Some(c) = get(2) {
-            let c = c.trim();
-            if c == designcraft_doc::TEXT_COLOR {
-                r.color = c.to_string();
-            } else if c.contains('/') {
-                r.color = self.swatch_ref(c);
-            }
-        }
-        Some(r)
-    }
-
-    /// Paragraph setting `k` of `e` (a paragraph style or a range): its own, else from its
-    /// paragraph style chain (`BasedOn` of a style, the applied style of a range).
-    fn para_setting(&self, e: &El, k: &str) -> Option<String> {
-        if let Some(v) = e.prop(k) {
-            return Some(v);
-        }
-        let style_ref = |r: String| if r.starts_with("ParagraphStyle/") { r } else { format!("ParagraphStyle/{}", names::escape_id(&r)) };
-        let mut next =
-            if e.local() == "ParagraphStyle" { e.prop("BasedOn") } else { e.get("AppliedParagraphStyle").map(str::to_string) }.map(style_ref);
-        for _ in 0..16 {
-            let Some(id) = next else { break };
-            let s = self.para_els.get(&id)?;
-            if let Some(v) = s.prop(k) {
-                return Some(v);
-            }
-            next = s.prop("BasedOn").map(style_ref);
-        }
-        None
-    }
-
-    fn cell_style_ref(&self, reference: &str) -> String {
-        let reference = reference.trim();
-        self.cell_names
-            .get(reference)
-            .cloned()
-            .unwrap_or_else(|| names::style_name_in(names::CELL_BUILTINS, &unescape_id(reference.trim_start_matches("CellStyle/"))))
-    }
-
-    fn table_style_ref(&self, reference: &str) -> String {
-        let reference = reference.trim();
-        self.table_names
-            .get(reference)
-            .cloned()
-            .unwrap_or_else(|| names::style_name_in(names::TABLE_BUILTINS, &unescape_id(reference.trim_start_matches("TableStyle/"))))
-    }
-
-    fn cell_stroke_attrs(&mut self, el: &El, prefix: &str) -> designcraft_doc::CellStrokeAttrs {
-        designcraft_doc::CellStrokeAttrs {
-            weight: el.num(&format!("{prefix}StrokeWeight")).map(|v| v.max(0.0)),
-            color: el.prop(&format!("{prefix}StrokeColor")).map(|v| self.swatch_ref(&v)),
-            tint: tint(el.num(&format!("{prefix}StrokeTint"))),
-            kind: el.prop(&format!("{prefix}StrokeType")).map(|v| names::stroke_type_in(&v)),
-            gap_color: el.prop(&format!("{prefix}StrokeGapColor")).map(|v| self.swatch_ref(&v)),
-            gap_tint: tint(el.num(&format!("{prefix}StrokeGapTint"))),
-        }
-    }
-
-    fn alt_fill_attrs(&mut self, el: &El, kind: &str) -> designcraft_doc::AltFillsAttrs {
-        designcraft_doc::AltFillsAttrs {
-            first: el.num(&format!("Start{kind}FillCount")).map(|v| v.max(0.0) as u32),
-            first_color: el.prop(&format!("Start{kind}FillColor")).map(|v| self.swatch_ref(&v)),
-            first_tint: tint(el.num(&format!("Start{kind}FillTint"))),
-            next: el.num(&format!("End{kind}FillCount")).map(|v| v.max(0.0) as u32),
-            next_color: el.prop(&format!("End{kind}FillColor")).map(|v| self.swatch_ref(&v)),
-            next_tint: tint(el.num(&format!("End{kind}FillTint"))),
-            skip_first: el.num(&format!("SkipFirstAlternatingFill{kind}s")).map(|v| v.max(0.0) as u32),
-            skip_last: el.num(&format!("SkipLastAlternatingFill{kind}s")).map(|v| v.max(0.0) as u32),
-        }
-    }
-
-    fn alt_stroke_attrs(&mut self, el: &El, kind: &str) -> designcraft_doc::AltStrokesAttrs {
-        let first_stroke = self.cell_stroke_attrs(el, &format!("Start{kind}"));
-        let mut next_stroke = self.cell_stroke_attrs(el, &format!("End{kind}"));
-        // IDML uses LineStyle for this one attribute (rather than StrokeType).
-        if kind == "Column"
-            && let Some(value) = el.prop("EndColumnLineStyle")
-        {
-            next_stroke.kind = Some(names::stroke_type_in(&value));
-        }
-        designcraft_doc::AltStrokesAttrs {
-            first: el.num(&format!("Start{kind}StrokeCount")).map(|v| v.max(0.0) as u32),
-            next: el.num(&format!("End{kind}StrokeCount")).map(|v| v.max(0.0) as u32),
-            first_stroke,
-            next_stroke,
-            skip_first: el.num(&format!("SkipFirstAlternatingStroke{kind}s")).map(|v| v.max(0.0) as u32),
-            skip_last: el.num(&format!("SkipLastAlternatingStroke{kind}s")).map(|v| v.max(0.0) as u32),
-        }
-    }
-
-    // ---------- stories ----------
-
-    fn story(&mut self, id: StoryId, e: &El) -> Story {
-        self.story_with_para(id, e, ParaFormat::default())
-    }
-
-    fn story_with_para(&mut self, id: StoryId, e: &El, default_para: ParaFormat) -> Story {
-        let mut b = StoryBuilder {
-            text: String::new(),
-            paras: vec![default_para.clone()],
-            runs: Vec::new(),
-            fresh: true,
-            last: CharFormat::default(),
-            tables: Vec::new(),
-            after_table: None,
-            notes: Vec::new(),
-            anchors: Vec::new(),
-            xrefs: Vec::new(),
-            index_refs: Vec::new(),
-            objects: Vec::new(),
-        };
-        self.walk_story(e, &mut b, &default_para, &CharAttrs::default(), &CharFormat::default(), None);
-        let StoryBuilder { text, mut paras, runs, last, tables: tbls, notes, anchors, xrefs, index_refs, objects, .. } = b;
-        let mut chars: Vec<CharRun> = runs.into_iter().filter(|r| r.len > 0).collect();
-        if chars.is_empty() {
-            chars.push(CharRun { len: 0, format: last });
-        }
-        let mut tables = BTreeMap::new();
-        for (pi, t) in tbls {
-            if let Some(p) = paras.get_mut(pi) {
-                p.table = Some(t.id);
-                tables.insert(t.id, Arc::new(t));
-            }
-        }
-        let notes = notes.into_iter().enumerate().map(|(i, text)| Arc::new(designcraft_doc::Footnote { id: i as u64 + 1, text })).collect();
-        let mut anchor_list = Vec::new();
-        for (k, (me, name)) in anchors.into_iter().enumerate() {
-            let aid = (id.0 << 24) | (k as u64 + 1);
-            self.anchor_ids.insert(me, aid);
-            anchor_list.push(Arc::new(designcraft_doc::TextAnchor { id: aid, name }));
-        }
-        let mut xref_list = Vec::new();
-        for (k, (me, fmt)) in xrefs.into_iter().enumerate() {
-            self.xref_srcs.insert(me, (id, k));
-            let format = self.xref_format_names.get(&fmt).cloned().unwrap_or_else(|| "Full Paragraph & Page Number".into());
-            xref_list.push(Arc::new(designcraft_doc::CrossRef { target: 0, format }));
-        }
-        let mut st = Story {
-            id,
-            text,
-            paras,
-            chars,
-            frames: vec![],
-            direction: if e.find("StoryPreference").and_then(|p| p.get("StoryDirection")) == Some("RightToLeftDirection") {
-                designcraft_doc::TextDirection::RightToLeft
-            } else {
-                designcraft_doc::TextDirection::LeftToRight
-            },
-            vertical: e.find("StoryPreference").and_then(|p| p.get("StoryOrientation")) == Some("Vertical"),
-            rev: 0,
-            tables,
-            notes,
-            endnotes: Vec::new(),
-            anchors: anchor_list,
-            xrefs: xref_list,
-            index_refs: index_refs.into_iter().map(Arc::new).collect(),
-            objects: objects.into_iter().map(Arc::new).collect(),
-            editorial: Vec::new(),
-            link: None,
-            file_link: None,
-        };
-        st.fix_notes();
-        st.fix_marks();
-        // Drop anything inconsistent (e.g. a table sharing a paragraph with another).
-        if st.check().is_err() {
-            st.tables.retain(|_, _| false);
-            for p in &mut st.paras {
-                p.table = None;
-            }
-        }
-        st
-    }
-
-    /// `<Table>`: rows, columns and cells (cell `Name` is `column:row`).
-    fn table(&mut self, e: &El) -> Table {
-        let id = self.alloc();
-        let rows: Vec<&El> = e.find_all("Row").collect();
-        let cols: Vec<&El> = e.find_all("Column").collect();
-        let nr = rows.len().max(1);
-        let nc = cols.len().max(1);
-        let mut t = Table::new(id, nr, nc, 0, 0, 0.0);
-        t.options.direction = if e.get("TableDirection") == Some("RightToLeftDirection") {
-            designcraft_doc::TextDirection::RightToLeft
-        } else {
-            designcraft_doc::TextDirection::LeftToRight
-        };
-        for (r, re) in rows.iter().enumerate() {
-            let auto = re.boolean("AutoGrow").unwrap_or(true);
-            t.rows[r].mode = if auto { RowHeightMode::AtLeast } else { RowHeightMode::Exactly };
-            t.rows[r].height = if auto { re.num("MinimumHeight").unwrap_or(3.0) } else { re.num("SingleRowHeight").unwrap_or(12.0) };
-        }
-        for (c, ce) in cols.iter().enumerate() {
-            t.columns[c].width = ce.num("SingleColumnWidth").unwrap_or(72.0).max(3.0);
-        }
-        let h = e.num("HeaderRowCount").unwrap_or(0.0) as usize;
-        let f = e.num("FooterRowCount").unwrap_or(0.0) as usize;
-        if h.saturating_add(f) < nr {
-            t.set_header_footer(h, f);
-        }
-        let style_name = e.get("AppliedTableStyle").map(|r| self.table_style_ref(r)).unwrap_or_else(|| designcraft_doc::BASIC_TABLE.into());
-        let style = self.styles.resolve_table_style(&style_name);
-        style.apply_to(&mut t, &self.styles.cell);
-        // IDML distinguishes an explicit AppliedCellStyle from the effective region style.
-        for cell in &mut t.cells {
-            cell.style.clear();
-        }
-        // Table-local options override the named table style. Cell styles are already
-        // materialized independently, so their edges retain their higher precedence.
-        let mut border_unset = style.border.is_none() && style.borders.iter().all(|b| b.is_empty());
-        let mut borders = std::array::from_fn::<_, 4, _>(|i| t.options.border_for(i).clone());
-        for (side, border) in ["TopBorder", "LeftBorder", "BottomBorder", "RightBorder"].iter().zip(&mut borders) {
-            let attrs = self.cell_stroke_attrs(e, side);
-            border_unset &= attrs.is_empty();
-            attrs.apply_to(border);
-        }
-        t.options.border = borders[0].clone();
-        t.options.borders = borders.map(Some);
-        t.options.space_before = e.num("SpaceBefore").unwrap_or(t.options.space_before);
-        t.options.space_after = e.num("SpaceAfter").unwrap_or(t.options.space_after);
-        t.options.repeat_header = e.get("HeaderBehavior") != Some("RepeatOnce");
-        t.options.repeat_footer = e.get("FooterBehavior") != Some("RepeatOnce");
-        // A local count may enable a pattern disabled by its parent style. Merge before
-        // materialization so the parent's colors/tints are still available in that case.
-        let mut row_fills = style.row_fills.clone();
-        row_fills.merge(&self.alt_fill_attrs(e, "Row"));
-        row_fills.apply_to(&mut t.options.alt_rows);
-        let mut column_fills = style.column_fills.clone();
-        column_fills.merge(&self.alt_fill_attrs(e, "Column"));
-        column_fills.apply_to(&mut t.options.alt_cols);
-        let mut row_strokes = style.row_strokes.clone();
-        row_strokes.merge(&self.alt_stroke_attrs(e, "Row"));
-        row_strokes.apply_to(&mut t.options.row_strokes);
-        let mut column_strokes = style.column_strokes.clone();
-        column_strokes.merge(&self.alt_stroke_attrs(e, "Column"));
-        column_strokes.apply_to(&mut t.options.column_strokes);
-        let mut regions = Vec::new();
-        for ce in e.find_all("Cell") {
-            let Some((c, r)) =
-                ce.get("Name").and_then(|n| n.split_once(':')).and_then(|(a, b)| Some((a.parse::<usize>().ok()?, b.parse::<usize>().ok()?)))
-            else {
-                continue;
-            };
-            if r >= nr || c >= nc {
-                continue;
-            }
-            let rs = (span(ce, "RowSpan").max(1.0) as usize).min(nr - r);
-            let cs = (span(ce, "ColumnSpan").max(1.0) as usize).min(nc - c);
-            let mut cell = t.cell(r, c).cloned().unwrap_or_default();
-            let cell_style = ce.get("AppliedCellStyle").map(|r| self.cell_style_ref(r)).unwrap_or_else(|| designcraft_doc::NO_CELL_STYLE.into());
-            if cell_style != designcraft_doc::NO_CELL_STYLE {
-                designcraft_doc::resolve_cell_style(&self.styles.cell, &cell_style).apply_to(&mut cell);
-            }
-            cell.style = if cell_style == designcraft_doc::NO_CELL_STYLE { String::new() } else { cell_style };
-            let default_para = cell.text.paras.first().cloned().unwrap_or_default();
-            cell.text = self.story_with_para(StoryId(0), ce, default_para);
-            if let Some(fc) = ce.get("FillColor") {
-                cell.fill = self.swatch_ref(fc);
-            }
-            if let Some(tint) = tint(ce.num("FillTint")) {
-                cell.fill_tint = tint;
-            }
-            for (i, k) in ["TopInset", "LeftInset", "BottomInset", "RightInset"].iter().enumerate() {
-                if let Some(v) = ce.num(k) {
-                    cell.insets[i] = v.max(0.0);
-                }
-            }
-            if let Some(vj) = ce.get("VerticalJustification") {
-                cell.vj = names::vj_in(vj);
-            }
-            if let Some(fb) = ce.get("FirstBaselineOffset") {
-                cell.first_baseline = names::first_baseline_in(fb);
-            }
-            if let Some(min) = ce.num("MinimumFirstBaselineOffset").filter(|v| v.is_finite()) {
-                cell.first_baseline_min = min.clamp(0.0, 8640.0);
-            }
-            cell.rotation = ce.num("RotationAngle").unwrap_or(cell.rotation);
-            if cell.rotation != 0.0 {
-                self.rotated_cells += 1;
-            }
-            for (i, side) in ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"].iter().enumerate() {
-                let attrs = self.cell_stroke_attrs(ce, side);
-                attrs.apply_to(&mut cell.strokes[i]);
-                cell.stroke_defined[i] |= !attrs.is_empty();
-                let priority = ce.prop(&format!("{side}StrokePriority")).and_then(|v| v.trim().parse::<i32>().ok()).unwrap_or(0);
-                cell.stroke_priorities[i] = priority;
-                // Preserve style-defined edges and #102's positive-priority local overrides.
-                cell.border_overrides[i] |= priority > 0;
-                // No table or table style border is given anywhere, so the built-in 1 pt default must not
-                // draw over an outer edge the cell explicitly hides (weight 0 or the None swatch), as InDesign draws nothing.
-                let hidden = attrs.weight == Some(0.0) || attrs.color.as_deref() == Some(swatch::NONE);
-                cell.border_overrides[i] |= border_unset && hidden;
-            }
-            if let Some(slot) = t.cell_mut(r, c) {
-                *slot = cell;
-            }
-            if rs > 1 || cs > 1 {
-                regions.push(CellRange { r0: r, c0: c, r1: (r + rs - 1).min(nr - 1), c1: (c + cs - 1).min(nc - 1) });
-            }
-        }
-        for rg in regions {
-            let _ = t.merge(rg);
-        }
-        t
-    }
-
-    /// The format of the text in a `CharacterStyleRange`: its style, and its local attributes over
-    /// the enclosing paragraph range's, inside a tracked change if `outer` (the enclosing format) is.
-    fn range_format(&mut self, c: &El, pchars: &CharAttrs, outer: &CharFormat) -> CharFormat {
-        let style = c.get("AppliedCharacterStyle").map(|r| self.char_style_ref(r)).unwrap_or_else(|| st::NO_CHAR_STYLE.into());
-        let mut over = pchars.clone();
-        over.merge(&self.char_attrs(c));
-        over.change = over.change.or(outer.over.change);
-        CharFormat { style, over }
-    }
-
-    fn walk_story(&mut self, e: &El, b: &mut StoryBuilder, pf: &ParaFormat, pchars: &CharAttrs, cf: &CharFormat, brk: Option<&str>) {
-        for n in &e.children {
-            match n {
-                Node::El(c) => match c.local() {
-                    "ParagraphStyleRange" => {
-                        let style = c.get("AppliedParagraphStyle").map(|r| self.para_style_ref(r)).unwrap_or_else(|| pf.style.clone());
-                        let para = self.para_attrs(c);
-                        let mut chars = self.char_attrs(c);
-                        // A paragraph range inside a tracked change is part of that change.
-                        chars.change = chars.change.or(cf.over.change);
-                        let npf = ParaFormat { style, para, chars: CharAttrs::default(), table: None };
-                        if b.fresh
-                            && let Some(last) = b.paras.last_mut()
-                        {
-                            *last = npf.clone();
-                        }
-                        // Text and markers outside any character range (a destination or a
-                        // cross-reference source at paragraph level) take the paragraph's format.
-                        let pcf = CharFormat { style: st::NO_CHAR_STYLE.into(), over: chars.clone() };
-                        self.walk_story(c, b, &npf, &chars, &pcf, None);
-                    }
-                    "CharacterStyleRange" => {
-                        let ncf = self.range_format(c, pchars, cf);
-                        let bt = c.get("ParagraphBreakType").filter(|t| *t != "Anywhere");
-                        b.last = ncf.clone();
-                        self.walk_story(c, b, pf, pchars, &ncf, bt);
-                    }
-                    "Content" => {
-                        for t in &c.children {
-                            match t {
-                                Node::Text(s) | Node::CData(s) => {
-                                    let s: String = s
-                                        .chars()
-                                        .filter(|c| *c != '\u{FEFF}')
-                                        .map(|c| if c == '\n' || c == '\r' || c == '\u{2029}' { st::FORCED_LINE_BREAK } else { c })
-                                        .collect();
-                                    b.push(&s, cf);
-                                }
-                                Node::Pi(t, v) if t == "ACE" => {
-                                    if let Some(ch) = ace_char(v) {
-                                        b.push(&ch.to_string(), cf);
-                                    }
-                                }
-                                _ => {}
-                            }
-                        }
-                    }
-                    "Br" => {
-                        // A column, frame or page break ends its paragraph like a return does.
-                        if let Some(t) = brk {
-                            let ch = match t {
-                                "NextColumn" => st::COLUMN_BREAK,
-                                "NextFrame" => st::FRAME_BREAK,
-                                "NextOddPage" => st::ODD_PAGE_BREAK,
-                                "NextEvenPage" => st::EVEN_PAGE_BREAK,
-                                _ => st::PAGE_BREAK,
-                            };
-                            b.push(&ch.to_string(), cf);
-                        }
-                        b.push("\n", cf);
-                        b.paras.push(pf.clone());
-                        b.fresh = true;
-                    }
-                    "Table" => {
-                        let t = self.table(c);
-                        b.push_table(t, pf, cf);
-                    }
-                    "HyperlinkTextDestination" | "ParagraphDestination" => {
-                        b.anchors.push((c.get("Self").unwrap_or("").to_string(), c.get("Name").unwrap_or("Anchor").to_string()));
-                        b.push(&designcraft_doc::ANCHOR_MARK.to_string(), cf);
-                    }
-                    "PageReference" => {
-                        use designcraft_doc::index::IndexRange as R;
-                        let topic = c.get("ReferencedTopic").and_then(|r| self.index_topics.get(r)).cloned().unwrap_or_default();
-                        let range = match c.get("PageReferenceType") {
-                            Some("ToEndOfStory") | Some("ToEndOfDocument") | Some("ToEndOfSection") => R::ToEndOfStory,
-                            Some("ForNextNParagraphs") => R::NextParagraphs(c.num("PageReferenceLimit").unwrap_or(1.0).max(1.0) as u32),
-                            Some("SuppressPageNumbers") => R::SuppressPageRange,
-                            _ => R::CurrentPage,
-                        };
-                        b.index_refs.push(designcraft_doc::IndexRef { topics: topic.path, sort: topic.sort, range });
-                        b.push(&designcraft_doc::INDEX_MARK.to_string(), cf);
-                    }
-                    "CrossReferenceSource" => {
-                        // The generated text is regenerated from the format.
-                        b.xrefs.push((c.get("Self").unwrap_or("").to_string(), c.get("AppliedFormat").unwrap_or("").to_string()));
-                        // A source at paragraph level wraps a range; inside a range it holds the
-                        // text directly and takes that range's format.
-                        let f = c.find("CharacterStyleRange").map_or_else(|| cf.clone(), |r| self.range_format(r, pchars, cf));
-                        b.push(&designcraft_doc::XREF_MARK.to_string(), &f);
-                    }
-                    "Footnote" => {
-                        // The text starts with the number marker (ACE 4, dropped) and the separator.
-                        let mut note = self.story(StoryId(0), c);
-                        let sep = self.footnote_options.separator.clone();
-                        if !sep.is_empty() && note.text.starts_with(&sep) {
-                            note.delete(0..sep.len());
-                        }
-                        b.notes.push(note);
-                        // The reference's position comes from the footnote options.
-                        let mut rcf = cf.clone();
-                        rcf.over.position = None;
-                        b.push(&designcraft_doc::FOOTNOTE_REF.to_string(), &rcf);
-                    }
-                    // Anchored page items, including groups containing text frames.
-                    "Rectangle" | "Oval" | "Polygon" | "GraphicLine" | "Group" | "TextFrame" => {
-                        if let Some(item) = self.item(c, designcraft_geom::Affine::IDENTITY) {
-                            use designcraft_doc::anchored::AnchorAlign as A;
-                            // Each setting the item leaves unset comes from its object style chain,
-                            // then from the IDML defaults.
-                            let levels: Vec<&El> = std::iter::once(c).chain(self.object_style_chain(c)).collect();
-                            let s = |k: &str| {
-                                let set = levels.iter().filter_map(|l| l.find("AnchoredObjectSetting")).find_map(|x| x.get(k));
-                                set.unwrap_or(match k {
-                                    "AnchoredPosition" => "InlinePosition",
-                                    "AnchorPoint" => "BottomRightAnchor",
-                                    "HorizontalAlignment" => "LeftAlign",
-                                    "HorizontalReferencePoint" => "TextFrame",
-                                    "VerticalAlignment" => "BottomAlign",
-                                    "VerticalReferencePoint" => "LineBaseline",
-                                    "PinPosition" => "true",
-                                    _ => "",
-                                })
-                            };
-                            let get = |k: &str| s(k).trim().parse::<f64>().ok().filter(|v| v.is_finite()).unwrap_or(0.0);
-                            let position = match s("AnchoredPosition") {
-                                "AboveLine" => designcraft_doc::AnchorPosition::AboveLine {
-                                    align: match s("HorizontalAlignment") {
-                                        "CenterAlign" => A::Center,
-                                        "RightAlign" => A::Right,
-                                        _ => A::Left,
-                                    },
-                                    space_before: get("AnchorSpaceAbove"),
-                                    space_after: get("AnchorYoffset"),
-                                },
-                                "Anchored" => {
-                                    let col = match s("HorizontalAlignment") {
-                                        "CenterAlign" => 1,
-                                        "RightAlign" => 2,
-                                        _ => 0,
-                                    };
-                                    let row = match s("VerticalAlignment") {
-                                        "CenterAlign" => 1,
-                                        "BottomAlign" => 2,
-                                        _ => 0,
-                                    };
-                                    designcraft_doc::AnchorPosition::Custom {
-                                        x_relative: names::anchor_rel_in(s("HorizontalReferencePoint")),
-                                        y_relative: names::anchor_rel_in(s("VerticalReferencePoint")),
-                                        // IDML measures a left-aligned object's X offset leftwards.
-                                        x_offset: if col == 0 { 0.0 - get("AnchorXoffset") } else { get("AnchorXoffset") },
-                                        y_offset: get("AnchorYoffset"),
-                                        object_point: names::anchor_in(s("AnchorPoint")),
-                                        ref_point: row * 3 + col,
-                                        keep_within_column: s("PinPosition") == "true",
-                                        spine_relative: s("SpineRelative") == "true",
-                                    }
-                                }
-                                _ => designcraft_doc::AnchorPosition::Inline { y_offset: get("AnchorYoffset") },
-                            };
-                            b.objects.push(designcraft_doc::AnchoredObject::new(item, position));
-                            b.push(&designcraft_doc::OBJECT_MARK.to_string(), cf);
-                        }
-                    }
-                    "TextVariableInstance" => {
-                        let t = self.text_variable_instance(c);
-                        b.push(&t, cf);
-                    }
-                    "Change" => {
-                        // Tracked changes: deleted text stays in the story, marked, and takes no
-                        // room in the layout.
-                        let mut ncf = cf.clone();
-                        match c.get("ChangeType") {
-                            Some("DeletedText") => ncf.over.change = Some(designcraft_doc::ChangeMark::Deleted),
-                            Some("InsertedText" | "MovedText") => ncf.over.change = Some(designcraft_doc::ChangeMark::Inserted),
-                            _ => {}
-                        }
-                        self.walk_story(c, b, pf, pchars, &ncf, brk);
-                    }
-                    "Properties" | "Note" | "StoryPreference" | "InCopyExportOption" => {}
-                    _ => self.walk_story(c, b, pf, pchars, cf, brk),
-                },
-                Node::Pi(t, v) if t == "ACE" => {
-                    if let Some(ch) = ace_char(v) {
-                        b.push(&ch.to_string(), cf);
-                    }
-                }
-                _ => {}
-            }
-        }
-    }
-
-    // ---------- spreads and items ----------
-
-    /// Ruler guides of a `<Page>` (its `<Guide>` children), `page` its rectangle in our spread
-    /// coordinates. A guide's Location is measured from the ruler origin: the spread's top left, the
-    /// page's, or the spine. Fit to Page off: the guide crosses the spread.
-    fn guides_of(&self, p: &El, page: Rect, spine: f64) -> Vec<Guide> {
-        p.find_all("Guide")
-            .filter_map(|g| {
-                let at = g.num("Location").filter(|v| v.is_finite() && v.abs() < 1e7)?;
-                let orientation = if g.get("Orientation") == Some("Horizontal") { Orientation::Horizontal } else { Orientation::Vertical };
-                let position = match (orientation, self.settings.ruler_origin) {
-                    (Orientation::Horizontal, designcraft_doc::RulerOrigin::Page) => page.y0 + at,
-                    (Orientation::Horizontal, _) => at,
-                    (Orientation::Vertical, designcraft_doc::RulerOrigin::Page) => page.x0 + at,
-                    (Orientation::Vertical, designcraft_doc::RulerOrigin::Spine) => spine + at,
-                    (Orientation::Vertical, designcraft_doc::RulerOrigin::Spread) => at,
-                };
-                Some(Guide {
-                    orientation,
-                    position,
-                    spread: g.get("FitToPage") == Some("false"),
-                    locked: g.get("Locked") == Some("true"),
-                    layer: g.get("ItemLayer").and_then(|l| self.layer_ids.get(l)).copied(),
-                    liquid: g.get("GuideType") == Some("Liquid"),
-                })
-            })
-            .collect()
-    }
-
-    fn spread(&mut self, e: &El, id: SpreadId, master: bool) -> Spread {
-        let facing = self.settings.facing_pages;
-        // Page rectangles in IDML spread coordinates.
-        let mut pages: Vec<(Rect, &El)> = Vec::new();
-        for p in e.find_all("Page") {
-            let gb = nums(p.get("GeometricBounds").unwrap_or(""));
-            let (t, l, bt, r) =
-                if gb.len() == 4 { (gb[0], gb[1], gb[2], gb[3]) } else { (0.0, 0.0, self.settings.page_height, self.settings.page_width) };
-            let xf = parse_affine(p.get("ItemTransform"));
-            let a = xf * Point::new(l, t);
-            let c = xf * Point::new(r, bt);
-            pages.push((Rect::from_points(a, c), p));
-        }
-        let min_x = pages.iter().map(|(r, _)| r.x0).fold(f64::INFINITY, f64::min);
-        let min_y = pages.iter().map(|(r, _)| r.y0).fold(f64::INFINITY, f64::min);
-        let (min_x, min_y) = if min_x.is_finite() { (min_x, min_y) } else { (0.0, 0.0) };
-        let shift = Affine::translate((-min_x, -min_y));
-        // The spine: between a left and a right page (else the spread's left edge).
-        let spine = pages.iter().map(|(r, _)| r.x0 - min_x).filter(|x| *x > 1e-6).fold(f64::INFINITY, f64::min);
-        let spine = if spine.is_finite() && facing { spine } else { 0.0 };
-        let show = e.get("ShowMasterItems") != Some("false");
-        let first_abs: usize = self.spreads.iter().map(|s| s.pages.len()).sum();
-        let view_rotation = if master { 0 } else { spread_view_rotation(e.get("ItemTransform")) };
-        let mut out_pages = Vec::new();
-        for (i, (r, p)) in pages.iter().enumerate() {
-            let pid = PageId(self.alloc());
-            if let Some(s) = p.get("Self")
-                && !master
-            {
-                self.page_index.insert(s.to_string(), first_abs + i);
-            }
-            let side = if !facing {
-                PageSide::Single
-            } else if r.x1 <= 1e-6 {
-                PageSide::Left
-            } else {
-                PageSide::Right
-            };
-            let parent = p.get("AppliedMaster").and_then(|m| self.parent_ids.get(m)).copied();
-            // A document page's margins are local when they differ from its parent page's; a
-            // page without its own takes the parent page's.
-            let from_parent = if master {
-                None
-            } else {
-                parent
-                    .and_then(|id| self.parents.iter().find(|sp| sp.id == id))
-                    .and_then(|sp| sp.pages.get(sp.parent_page_for_side(side)?))
-                    .map(|q| (q.margins, q.columns.clone()))
-            };
-            let (margins, columns) = match (p.find("MarginPreference"), &from_parent) {
-                (Some(m), _) => {
-                    let (margins, columns) = margins_of(m);
-                    (margins, fit_columns(columns, &margins, r.width()))
-                }
-                (None, Some(own)) => own.clone(),
-                (None, None) => {
-                    let (margins, columns) = self.default_margins.clone().unwrap_or((Margins::uniform(36.0), Columns::default()));
-                    (margins, fit_columns(columns, &margins, r.width()))
-                }
-            };
-            let local_margins = from_parent.is_some_and(|(m, c)| m != margins || c != columns);
-            out_pages.push(Page {
-                id: pid,
-                width: r.width(),
-                height: r.height(),
-                x: r.x0 - min_x,
-                margins,
-                columns,
-                local_margins,
-                parent,
-                side,
-                overridden: vec![],
-                guides: self.guides_of(p, Rect::new(r.x0 - min_x, r.y0 - min_y, r.x1 - min_x, r.y1 - min_y), spine),
-                show_parent_items: show,
-                liquid: names::liquid_rule_in(p.get("LayoutRule").unwrap_or("Off")),
-                transition: None,
-                view_rotation: if i == 0 { view_rotation } else { 0 },
-                show_parent_overlay: false,
-            });
-        }
-        let overrides: Vec<Vec<String>> =
-            pages.iter().map(|(_, p)| p.get("OverrideList").unwrap_or("").split_whitespace().map(str::to_string).collect()).collect();
-        let mut items = Vec::new();
-        for c in e.elements() {
-            if let Some(it) = self.item(c, shift) {
-                items.push(Arc::new(it));
-            }
-        }
-        for (pg, ov) in out_pages.iter_mut().zip(overrides) {
-            pg.overridden = ov.iter().filter_map(|s| self.item_ids.get(s)).copied().filter(|i| self.is_parent_item(*i)).collect();
-        }
-        let parent = if master {
-            let prefix =
-                e.get("NamePrefix").map(str::to_string).unwrap_or_else(|| e.get("Name").unwrap_or("A").split('-').next().unwrap_or("A").to_string());
-            let name = e.get("BaseName").map(str::to_string).unwrap_or_else(|| {
-                let n = e.get("Name").unwrap_or("Parent");
-                n.split_once('-').map(|(_, b)| b.to_string()).unwrap_or_else(|| n.to_string())
-            });
-            // A parent spread has one base: its first page's. Pages that disagree lose theirs.
-            let applied: Vec<Option<SpreadId>> =
-                pages.iter().map(|(_, p)| p.get("AppliedMaster").and_then(|m| self.parent_ids.get(m)).copied()).collect();
-            let label = format!("{prefix}-{name}");
-            if applied.windows(2).any(|w| w[0] != w[1]) {
-                self.warnings.push(format!("parent {label}: its pages are based on different parents; only the first page's is kept"));
-            }
-            let based_on = applied.first().copied().flatten();
-            if applied.contains(&Some(id)) {
-                self.warnings.push(format!("parent {label}: a page names its own parent as its base, which is ignored"));
-            }
-            let based_on = based_on.filter(|b| *b != id);
-            Some(ParentInfo { prefix, name, based_on })
-        } else {
-            None
-        };
-        for p in &mut out_pages {
-            if master {
-                p.parent = None;
-            }
-        }
-        Spread { id, pages: out_pages, items, parent, allow_shuffle: e.get("AllowPageShuffle") != Some("false") }
-    }
-
-    fn is_parent_item(&self, id: ItemId) -> bool {
-        self.parents.iter().any(|p| {
-            p.items.iter().any(|it| {
-                let mut found = false;
-                it.walk(&mut |i| found |= i.id == id);
-                found
-            })
-        })
-    }
-
-    /// An item's object style chain: its applied style, the styles that one is based on, then
-    /// `[None]` (cycle-safe).
-    fn object_style_chain(&self, e: &El) -> Vec<&El> {
-        let mut chain = self.object_style_bases(e.get("AppliedObjectStyle").map(str::to_string));
-        if let Some(none) = self.object_els.get("ObjectStyle/$ID/[None]")
-            && !chain.iter().any(|c| std::ptr::eq(*c, none))
-        {
-            chain.push(none);
-        }
-        chain
-    }
-
-    /// Object style `id` and the styles it is based on, nearest first (cycle-safe, at most 16).
-    fn object_style_bases(&self, id: Option<String>) -> Vec<&El> {
-        let mut chain: Vec<&El> = Vec::new();
-        let mut os = id;
-        while let Some(id) = os {
-            let Some(s) = self.object_els.get(&id) else { break };
-            if chain.len() >= 16 || chain.iter().any(|c| std::ptr::eq(*c, s)) {
-                break;
-            }
-            chain.push(s);
-            os = s.prop("BasedOn").map(|b| {
-                let b = b.trim();
-                if b.starts_with("ObjectStyle/") { b.to_string() } else { format!("ObjectStyle/{}", names::escape_id(b)) }
-            });
-        }
-        chain
-    }
-
-    /// Resolve an item attribute, falling back to its object style chain.
-    fn attr_or_style(&self, e: &El, k: &str) -> Option<String> {
-        e.get(k).or_else(|| self.object_style_chain(e).into_iter().find_map(|s| s.get(k))).map(str::to_string)
-    }
-
-    /// The item's child element `name` laid over the same element of each style in its object style
-    /// chain: attributes and nested elements merge one by one, nearer levels winning. IDML writes on an
-    /// item only the values that differ from its style. Effects whose category the applied style turns
-    /// off (`ObjectStyle*EffectsCategorySettings`) come from the item alone.
-    fn with_style(&self, e: &El, name: &str) -> Option<El> {
-        let chain = self.object_style_chain(e);
-        let category = match name {
-            "TransparencySetting" => Some("ObjectStyleObjectEffectsCategorySettings"),
-            "StrokeTransparencySetting" => Some("ObjectStyleStrokeEffectsCategorySettings"),
-            "FillTransparencySetting" => Some("ObjectStyleFillEffectsCategorySettings"),
-            "ContentTransparencySetting" => Some("ObjectStyleContentEffectsCategorySettings"),
-            _ => None,
-        };
-        let enabled = |effect: &str| {
-            let Some(flag) = category.and_then(|_| effect_flag(effect)) else { return true };
-            chain.iter().find_map(|s| category.and_then(|c| s.find(c)).and_then(|c| c.get(flag))) != Some("false")
-        };
-        let mut out: Option<El> = None;
-        for s in chain.iter().rev() {
-            let Some(c) = s.find(name) else { continue };
-            let mut c = c.clone();
-            c.children.retain(|n| !matches!(n, Node::El(x) if !enabled(x.local())));
-            match &mut out {
-                Some(o) => overlay(o, &c, 0),
-                None => out = Some(c),
-            }
-        }
-        if let Some(c) = e.find(name) {
-            match &mut out {
-                Some(o) => overlay(o, c, 0),
-                None => out = Some(c.clone()),
-            }
-        }
-        out
-    }
-
-    /// Reads the drop shadow, feather, gradient feather and directional feather of a
-    /// `TransparencySetting` into `fx`.
-    fn effects_in(&mut self, t: &El, fx: &mut Effects) {
-        if let Some(ds) = t.find("DropShadowSetting")
-            && ds.get("Mode") == Some("Drop")
-        {
-            let x = ds.num("XOffset").unwrap_or(4.95);
-            let y = ds.num("YOffset").unwrap_or(4.95);
-            let def = DropShadow::default();
-            fx.drop_shadow = DropShadow {
-                on: true,
-                color: ds.get("EffectColor").map(|c| self.swatch_ref(c)).unwrap_or(def.color),
-                opacity: ds.num("Opacity").map(|o| (o / 100.0) as f32).unwrap_or(def.opacity),
-                angle: names_angle(x, y),
-                distance: x.hypot(y),
-                size: ds.num("Size").unwrap_or(def.size),
-                spread: ds.num("Spread").unwrap_or(def.spread),
-                global_light: false,
-                // Without the attribute (earlier DesignCraft exports) the shadow stays Normal, as it
-                // rendered then; a new shadow's default is Multiply.
-                mode: ds.get("BlendMode").map_or(designcraft_color::BlendMode::Normal, names::blend_in),
-            };
-        }
-        if let Some(f) = t.find("FeatherSetting")
-            && f.get("Mode").is_some_and(|m| m != "None")
-        {
-            fx.feather = f.num("Width").unwrap_or(9.0);
-            fx.feather_options.choke = finite(f.num("ChokeAmount")).unwrap_or(0.0).clamp(0.0, 100.0);
-            fx.feather_options.corners = match f.get("CornerType") {
-                Some("Sharp") => designcraft_doc::FeatherCorners::Sharp,
-                Some("Rounded") => designcraft_doc::FeatherCorners::Rounded,
-                _ => designcraft_doc::FeatherCorners::Diffused,
-            };
-        }
-        if let Some(g) = t.find("GradientFeatherSetting")
-            && g.boolean("Applied") == Some(true)
-        {
-            fx.gradient_feather = gradient_feather_in(g);
-        }
-        if let Some(df) = t.find("DirectionalFeatherSetting")
-            && df.boolean("Applied") == Some(true)
-        {
-            let w = |k: &str| finite(df.num(k)).unwrap_or(0.0).max(0.0);
-            fx.directional_feather = DirectionalFeather { on: true, widths: [w("TopWidth"), w("LeftWidth"), w("BottomWidth"), w("RightWidth")] };
-        }
-    }
-
-    /// An object style's drop shadow and feather. Each is read when the effects category turns it
-    /// on (without category settings: when its setting is on), from the nearest style in the
-    /// BasedOn chain that has the setting. `None` when the style sets neither.
-    fn style_effects(&mut self, e: &El) -> Option<Effects> {
-        let mut chain = self.object_style_bases(e.get("Self").map(str::to_string));
-        if chain.is_empty() {
-            chain.push(e);
-        }
-        let category = chain.iter().find_map(|s| s.find("ObjectStyleObjectEffectsCategorySettings")).cloned();
-        let setting = |name: &str| chain.iter().find_map(|s| s.find("TransparencySetting")?.find(name)).cloned();
-        let mut t = El::new("TransparencySetting");
-        let mut any = false;
-        for (name, flag) in [("DropShadowSetting", "EnableDropShadow"), ("FeatherSetting", "EnableFeather")] {
-            let el = setting(name);
-            let on = match &category {
-                Some(c) => c.get(flag) == Some("true"),
-                None => el.as_ref().and_then(|x| x.get("Mode")).is_some_and(|m| m != "None"),
-            };
-            any |= on;
-            if let (true, Some(el)) = (on, el) {
-                t.push(el);
-            }
-        }
-        if !any {
-            return None;
-        }
-        let mut fx = Effects::default();
-        self.effects_in(&t, &mut fx);
-        Some(fx)
-    }
-
-    fn stroke_from(&mut self, e: &El, item: Option<&El>) -> Stroke {
-        let g = |s: &Self, k: &str| -> Option<String> { if item.is_some() { s.attr_or_style(e, k) } else { e.get(k).map(str::to_string) } };
-        let color = g(self, "StrokeColor");
-        let mut s = Stroke::none();
-        if let Some(c) = color {
-            s.swatch = self.swatch_ref(&c);
-        }
-        if let Some(w) = g(self, "StrokeWeight").and_then(|v| v.parse::<f64>().ok()).filter(|v| v.is_finite()) {
-            s.weight = w;
-        }
-        if let Some(t) = g(self, "StrokeTint").and_then(|v| v.parse().ok()) {
-            s.tint = tint(Some(t)).unwrap_or(1.0);
-        }
-        if let Some(t) = g(self, "StrokeType") {
-            s.kind = names::stroke_type_in(&t);
-        }
-        if let Some(v) = g(self, "StrokeAlignment") {
-            s.align = names::stroke_align_in(&v);
-        }
-        if let Some(v) = g(self, "EndCap") {
-            s.cap = names::cap_in(&v);
-        }
-        if let Some(v) = g(self, "EndJoin") {
-            s.join = names::join_in(&v);
-        }
-        if let Some(v) = g(self, "MiterLimit").and_then(|v| v.parse::<f64>().ok()).filter(|v| v.is_finite()) {
-            s.miter_limit = v;
-        }
-        if let Some(v) = g(self, "LeftLineEnd") {
-            s.start = names::arrow_in(&v);
-        }
-        if let Some(v) = g(self, "RightLineEnd") {
-            s.end = names::arrow_in(&v);
-        }
-        if let Some(v) = g(self, "GapColor") {
-            s.gap_swatch = self.swatch_ref(&v);
-        }
-        if let Some(t) = g(self, "GapTint").and_then(|v| v.parse().ok()) {
-            s.gap_tint = tint(Some(t)).unwrap_or(1.0);
-        }
-        s.overprint = g(self, "OverprintStroke").as_deref() == Some("true");
-        s.gap_overprint = g(self, "OverprintGap").as_deref() == Some("true");
-        s
-    }
-
-    fn item(&mut self, e: &El, parent: Affine) -> Option<Item> {
-        let tag = e.local();
-        let shape = match tag {
-            "Rectangle" | "TextFrame" => Shape::Rectangle,
-            "Oval" => Shape::Oval,
-            "Polygon" => Shape::Polygon,
-            "GraphicLine" => Shape::GraphicLine,
-            "Group" => Shape::Group,
-            _ => return None,
-        };
-        let id = ItemId(self.alloc());
-        if let Some(s) = e.get("Self") {
-            self.item_ids.insert(s.to_string(), id);
-        }
-        let layer = e.get("ItemLayer").and_then(|l| self.layer_ids.get(l)).copied().unwrap_or_else(|| self.layers[0].id);
-        let path = e.prop_el("PathGeometry").map(path_of).unwrap_or_default();
-        let mut it = Item::new(id, layer, shape, path);
-        it.xf = parent * parse_affine(e.get("ItemTransform"));
-        it.name = e.get("Name").filter(|n| *n != "$ID/").unwrap_or("").to_string();
-        it.locked = e.get("Locked") == Some("true");
-        it.hidden = e.get("Visible") == Some("false");
-        it.overrides = e.get("OverriddenPageItem").and_then(|s| self.item_ids.get(s)).copied().filter(|i| self.is_parent_item(*i));
-        it.nonprinting = e.get("Nonprinting") == Some("true");
-        it.object_style = e
-            .get("AppliedObjectStyle")
-            .map(|r| {
-                self.object_names
-                    .get(r)
-                    .cloned()
-                    .unwrap_or_else(|| names::style_name_in(OBJECT_BUILTINS, &unescape_id(r.trim_start_matches("ObjectStyle/"))))
-            })
-            .unwrap_or_else(|| designcraft_doc::NO_OBJECT_STYLE.into());
-        // Fill and stroke.
-        if tag != "Group" {
-            if let Some(f) = self.attr_or_style(e, "FillColor") {
-                it.fill.swatch = self.swatch_ref(&f);
-            }
-            if let Some(t) = self.attr_or_style(e, "FillTint").and_then(|v| v.parse().ok()) {
-                it.fill.tint = tint(Some(t)).unwrap_or(1.0);
-            }
-            it.fill.overprint = self.attr_or_style(e, "OverprintFill").as_deref() == Some("true");
-            if let Some(a) = e.num("GradientFillAngle")
-                && a != 0.0
-            {
-                it.fill.gradient_angle = Some(a);
-            }
-            let start: Option<Vec<f64>> = e.prop("GradientFillStart").map(|s| nums(&s));
-            if let (Some([x, y]), Some(len)) = (start.as_deref().and_then(|v| <[f64; 2]>::try_from(v).ok()), e.num("GradientFillLength"))
-                && len > 0.0
-            {
-                let a = e.num("GradientFillAngle").unwrap_or(0.0).to_radians();
-                it.fill.gradient_vector = Some([x, y, x + len * a.cos(), y - len * a.sin()]);
-            }
-            it.stroke = self.stroke_from(e, Some(e));
-            if it.stroke.weight <= 0.0 {
-                it.stroke.swatch = swatch::NONE.into();
-                it.stroke.weight = 1.0;
-            }
-            // A gradient on the stroke: its angle, or the Gradient Swatch tool's vector.
-            if let Some(a) = e.num("GradientStrokeAngle")
-                && a != 0.0
-            {
-                it.stroke.gradient_angle = Some(a);
-            }
-            let start: Option<Vec<f64>> = e.prop("GradientStrokeStart").map(|s| nums(&s));
-            if let (Some([x, y]), Some(len)) = (start.as_deref().and_then(|v| <[f64; 2]>::try_from(v).ok()), e.num("GradientStrokeLength"))
-                && len > 0.0
-            {
-                let a = e.num("GradientStrokeAngle").unwrap_or(0.0).to_radians();
-                it.stroke.gradient_vector = Some([x, y, x + len * a.cos(), y - len * a.sin()]);
-            }
-        }
-        // Corners: each corner's shape and radius come from the item, then its object style chain;
-        // at each level a per-corner attribute wins over the legacy all-corners one.
-        if tag != "Group" {
-            let levels: Vec<&El> = std::iter::once(e).chain(self.object_style_chain(e)).collect();
-            let corner =
-                |n: &str, what: &str| levels.iter().find_map(|s| s.get(&format!("{n}Corner{what}")).or_else(|| s.get(&format!("Corner{what}"))));
-            let mut corners = CornerOptions::default();
-            for (i, n) in crate::export::corner_names(&it.path).iter().enumerate() {
-                let shape = corner(n, "Option").map(names::corner_in).unwrap_or_default();
-                let size = corner(n, "Radius").and_then(|v| v.trim().parse::<f64>().ok()).filter(|v| v.is_finite()).unwrap_or(INDESIGN_CORNER_SIZE);
-                corners.corners[i] = Corner { shape, size };
-            }
-            if !corners.is_none() {
-                it.corners = corners;
-            }
-        }
-        // Transparency.
-        if let Some(t) = self.with_style(e, "TransparencySetting") {
-            if let Some(bs) = t.find("BlendingSetting") {
-                if let Some(o) = bs.num("Opacity") {
-                    it.opacity = (o / 100.0).clamp(0.0, 1.0) as f32;
-                }
-                if let Some(m) = bs.get("BlendMode") {
-                    it.blend = names::blend_in(m);
-                }
-            }
-            self.effects_in(&t, &mut it.effects);
-        }
-        // Text wrap.
-        if let Some(w) = self.with_style(e, "TextWrapPreference") {
-            let mut tw = text_wrap(&w);
-            if let Some(pg) = w.prop_el("PathGeometry") {
-                match wrap_path_of(pg) {
-                    Ok(p) => tw.path = Some(p),
-                    Err(why) => log::warn!("IDML: custom text wrap boundary of {} dropped: {why}", e.get("Self").unwrap_or("an item")),
-                }
-            }
-            it.wrap = tw;
-        }
-        // Type on a path.
-        if tag != "TextFrame"
-            && let Some(tp) = e.find("TextPath")
-        {
-            let story_self = tp.get("ParentStory").unwrap_or("n").to_string();
-            if let Some(story) = self.story_ids.get(&story_self).copied() {
-                let options = TextFrameOptions {
-                    path: Some(designcraft_doc::PathType {
-                        start: tp.num("StartBracket").unwrap_or(0.0).max(0.0),
-                        // At (or past) the path's length it is the path's end: no end bracket.
-                        end: tp
-                            .num("EndBracket")
-                            .filter(|e| e.is_finite() && *e >= 0.0)
-                            .filter(|e| *e < designcraft_geom::warp::PathWarp::new(&it.path.to_bezpath(), false).length() - 0.01),
-                        flip: tp.get("FlipPathEffect") == Some("Flipped"),
-                        align: names::path_align_in(tp.get("TextAlignment").unwrap_or("")),
-                    }),
-                    ..Default::default()
-                };
-                it.content = Content::Text(TextFrame { story, options });
-                self.ctx.threads.push((id, story_self, "n".into(), "n".into()));
-            }
-        }
-        // Content.
-        match tag {
-            "TextFrame" => {
-                let story_self = e.get("ParentStory").unwrap_or("n").to_string();
-                let story = match self.story_ids.get(&story_self) {
-                    Some(s) => *s,
-                    None => {
-                        let sid = StoryId(self.alloc());
-                        self.stories.insert(sid, Story::new(sid));
-                        self.story_ids.insert(format!("#orphan{}", sid.0), sid);
-                        sid
-                    }
-                };
-                // Options the frame doesn't set come from its object style chain.
-                let prefs: Vec<&El> = std::iter::once(e).chain(self.object_style_chain(e)).filter_map(|s| s.find("TextFramePreference")).collect();
-                let mut options = text_frame_options(&prefs);
-                // `prefs` borrows the object styles, so the rule colour's swatch is resolved after it.
-                if let Some(r) = Prefs(&prefs).prop("ColumnRuleStrokeColor") {
-                    options.column_rule_color = self.swatch_ref(&r);
-                }
-                if let Some(g) = self.with_style(e, "BaselineFrameGridOption")
-                    && g.get("UseCustomBaselineFrameGrid") == Some("true")
-                {
-                    options.baseline_grid = Some(designcraft_doc::FrameBaselineGrid {
-                        start: g.num("StartingOffsetForBaselineFrameGrid").unwrap_or(0.0),
-                        increment: g.num("BaselineFrameGridIncrement").unwrap_or(12.0),
-                    });
-                }
-                it.content = Content::Text(TextFrame { story, options });
-                self.ctx.threads.push((
-                    id,
-                    story_self,
-                    e.get("PreviousTextFrame").unwrap_or("n").to_string(),
-                    e.get("NextTextFrame").unwrap_or("n").to_string(),
-                ));
-            }
-            "Group" => {
-                let mut kids = Vec::new();
-                for c in e.elements() {
-                    if let Some(k) = self.item(c, Affine::IDENTITY) {
-                        kids.push(Arc::new(k));
-                    }
-                }
-                it.content = Content::Group { items: kids };
-                it.fill = Fill::none();
-                it.stroke = Stroke::none();
-            }
-            _ => {
-                if let Some(g) = e.elements().find(|c| matches!(c.local(), "Image" | "PDF" | "EPS" | "ImportedPage" | "WMF" | "PICT" | "SVG")) {
-                    it.content = self.graphic(g);
-                    let fill = self.image_fill(g);
-                    if let Content::Graphic(gr) = &mut it.content {
-                        gr.fill = fill;
-                    }
-                    if let (Some(ff), Content::Graphic(gr)) = (self.with_style(e, "FrameFittingOption"), &mut it.content) {
-                        gr.crop = [ff.num("TopCrop"), ff.num("LeftCrop"), ff.num("BottomCrop"), ff.num("RightCrop")].map(|v| v.unwrap_or(0.0));
-                        gr.fit_align = ff.get("FittingAlignment").map_or(4, names::anchor_in);
-                        if ff.get("AutoFit") == Some("true") {
-                            gr.auto_fit = ff.get("FittingOnEmptyFrame").map_or(designcraft_doc::Fitting::FillProportionally, names::fitting_in);
-                            if gr.auto_fit == designcraft_doc::Fitting::None {
-                                gr.auto_fit = designcraft_doc::Fitting::FillProportionally;
-                            }
-                        }
-                    }
-                } else {
-                    // Page items pasted into this frame (Paste Into).
-                    let kids: Vec<Arc<Item>> = e
-                        .elements()
-                        .filter(|c| matches!(c.local(), "Rectangle" | "Oval" | "Polygon" | "GraphicLine" | "Group" | "TextFrame"))
-                        .filter_map(|c| self.item(c, Affine::IDENTITY))
-                        .map(Arc::new)
-                        .collect();
-                    if !kids.is_empty() {
-                        it.content = Content::Group { items: kids };
-                    }
-                }
-            }
-        }
-        Some(it)
-    }
-
-    /// The swatch applied to a placed image (`FillColor`, `FillTint`): it colours a greyscale or
-    /// bitmap image. Black at 100% is how InDesign writes an image nobody coloured: no swatch.
-    fn image_fill(&mut self, g: &El) -> Fill {
-        let Some(r) = g.get("FillColor") else { return Fill::none() };
-        let swatch = self.swatch_ref(r);
-        let tint = tint(g.num("FillTint")).unwrap_or(1.0);
-        if swatch == swatch::BLACK && tint >= 1.0 {
-            return Fill::none();
-        }
-        Fill { swatch, tint, ..Fill::none() }
-    }
-
-    fn graphic(&mut self, g: &El) -> Content {
-        let gxf = parse_affine(g.get("ItemTransform"));
-        let (l, t, r, b) = match g.prop_el("GraphicBounds") {
-            Some(gb) => {
-                (gb.num("Left").unwrap_or(0.0), gb.num("Top").unwrap_or(0.0), gb.num("Right").unwrap_or(0.0), gb.num("Bottom").unwrap_or(0.0))
-            }
-            None => (0.0, 0.0, 0.0, 0.0),
-        };
-        let size = ((r - l).abs(), (b - t).abs());
-        let wrap =
-            if g.get("AppliedObjectStyle").is_some() { self.with_style(g, "TextWrapPreference") } else { g.find("TextWrapPreference").cloned() };
-        let wrap = wrap.map(|w| text_wrap(&w)).unwrap_or_default();
-        let clip = clipping_path(g, Affine::translate((-l, -t)));
-        let link = g.find("Link");
-        let uri = link.and_then(|k| k.get("LinkResourceURI")).map(uri_to_path);
-        let graphic = |asset, size| {
-            Content::Graphic(designcraft_doc::Graphic {
-                asset,
-                size,
-                xf: gxf * Affine::translate((l, t)),
-                clip: clip.clone(),
-                auto_fit: Default::default(),
-                fit_align: 4,
-                crop: [0.0; 4],
-                // A wrap set on the placed graphic (Direct Selection) is stored on the graphic element,
-                // over the graphic's own object style when it names one.
-                wrap,
-                fill: Default::default(),
-            })
-        };
-        let mut data = g.prop_el("Contents").map(|c| base64_decode(&c.text_content())).unwrap_or_default();
-        let page = pdf_page_in(g);
-        // Where the box sits on the page needs the PDF parsed: the engine finds it after import.
-        let pdf_crop = pdf_attribute(g).and_then(|a| a.get("PDFCrop")).map_or(designcraft_doc::PdfCrop::Crop, names::pdf_crop_in);
-        let mut read_from = None;
-        if data.is_empty()
-            && let Some(p) = &uri
-        {
-            // Every placement of a linked file with one page and crop shares one asset; read the
-            // file once.
-            let key = (p.clone(), page, pdf_crop);
-            if let Some(id) = self.linked_assets.get(&key) {
-                let size = self.assets.get(id).and_then(|a| svg_viewbox_size(&a.data)).unwrap_or(size);
-                return graphic(*id, size);
-            }
-            if let Some(d) = (self.read_link)(p) {
-                data = d;
-                read_from = Some(key);
-            }
-        }
-        // A linked file that can't be read shows the document's preview of it, if it has one. The
-        // preview only stands in for the file: format and pixel size still describe the link.
-        let preview = data.is_empty().then(|| g.get("Self").and_then(|s| self.previews.get(s))).flatten();
-        // InDesign draws a viewBox-only SVG at one unit to the point: its GraphicBounds are the
-        // art's bounds, which can overhang the viewBox, so they must not size the viewBox.
-        let size = svg_viewbox_size(&data).unwrap_or(size);
-        let (mime, px) = if preview.is_some() { (None, None) } else { sniff_image(&data) };
-        let mime = mime.map(str::to_string).unwrap_or_else(|| match link.and_then(|k| k.get("LinkResourceFormat")).unwrap_or("") {
-            f if f.contains("EPS") || g.local() == "EPS" => "application/postscript".into(),
-            f if f.contains("JPEG") => "image/jpeg".into(),
-            f if f.contains("TIFF") => "image/tiff".into(),
-            f if f.contains("PDF") || g.local() == "PDF" => "application/pdf".into(),
-            f if f.contains("GIF") => "image/gif".into(),
-            _ => "image/png".into(),
-        });
-        let pixels = px.or_else(|| {
-            let ppi = nums(g.get("ActualPpi").unwrap_or(""));
-            (ppi.len() == 2 && size.0 > 0.0).then(|| ((size.0 * ppi[0] / 72.0).round() as u32, (size.1 * ppi[1] / 72.0).round() as u32))
-        });
-        let name =
-            uri.as_deref().and_then(|p| p.rsplit(['/', '\\']).next()).filter(|n| !n.is_empty()).map(str::to_string).unwrap_or_else(|| "image".into());
-        let fresh = AssetId(self.alloc());
-        let link_path = uri.filter(|p| p.contains('/') || p.contains('\\'));
-        let id = designcraft_doc::insert_asset(
-            &mut self.assets,
-            Asset {
-                page,
-                id: fresh,
-                name,
-                mime,
-                link: link_path,
-                data: preview.cloned().unwrap_or_else(|| Arc::new(data)),
-                pixels,
-                pdf_crop,
-                ..Default::default()
-            },
-        );
-        if let Some(key) = read_from {
-            self.linked_assets.insert(key, id);
-        }
-        graphic(id, size)
-    }
-
-    fn link_threads(&mut self) {
-        let threads = std::mem::take(&mut self.ctx.threads);
-        let by_self: HashMap<String, ItemId> = self.item_ids.clone();
-        let mut per_story: BTreeMap<StoryId, Vec<usize>> = BTreeMap::new();
-        for (i, (id, story, _, _)) in threads.iter().enumerate() {
-            let sid = self.story_ids.get(story).copied().or_else(|| self.frame_story(*id));
-            if let Some(sid) = sid {
-                per_story.entry(sid).or_default().push(i);
-            }
-        }
-        for (sid, idx) in per_story {
-            let members: HashSet<ItemId> = idx.iter().map(|i| threads[*i].0).collect();
-            let next_of: HashMap<ItemId, ItemId> =
-                idx.iter().filter_map(|i| by_self.get(&threads[*i].3).filter(|n| members.contains(n)).map(|n| (threads[*i].0, *n))).collect();
-            let has_prev: HashSet<ItemId> = next_of.values().copied().collect();
-            let mut order = Vec::new();
-            let mut seen = HashSet::new();
-            for i in &idx {
-                let head = threads[*i].0;
-                if has_prev.contains(&head) || seen.contains(&head) {
-                    continue;
-                }
-                let mut cur = Some(head);
-                while let Some(c) = cur {
-                    if !seen.insert(c) {
-                        break;
-                    }
-                    order.push(c);
-                    cur = next_of.get(&c).copied();
-                }
-            }
-            for i in &idx {
-                let f = threads[*i].0;
-                if seen.insert(f) {
-                    order.push(f);
-                }
-            }
-            if let Some(s) = self.stories.get_mut(&sid) {
-                s.frames = order;
-            }
-        }
-    }
-
-    fn frame_story(&self, id: ItemId) -> Option<StoryId> {
-        fn find(items: &[Arc<Item>], id: ItemId) -> Option<StoryId> {
-            for it in items {
-                let mut r = None;
-                it.walk(&mut |i| {
-                    if i.id == id {
-                        r = i.text_frame().map(|t| t.story);
-                    }
-                });
-                if r.is_some() {
-                    return r;
-                }
-            }
-            None
-        }
-        self.spreads.iter().chain(self.parents.iter()).find_map(|s| find(&s.items, id))
-    }
-
-    /// A nested style list replaces the one a style or paragraph inherits, and with it the drop
-    /// cap style (the list's leading "through 1 Dropcap" entry, read into the drop cap style). A
-    /// list of its own without that entry clears an inherited drop cap style.
-    fn clear_inherited_drop_cap_styles(&mut self) {
-        let clears = |a: &designcraft_doc::ParaAttrs| a.drop_cap_style.is_none() && a.nested_styles.is_some();
-        let cleared: Vec<String> = self
-            .styles
-            .paragraph
-            .iter()
-            .filter(|s| clears(&s.para) && inherits_drop_cap_style(&self.styles, s.based_on.as_deref()))
-            .map(|s| s.name.clone())
-            .collect();
-        for name in cleared {
-            if let Some(s) = self.styles.para_mut(&name) {
-                s.para.drop_cap_style = Some(st::NO_CHAR_STYLE.into());
-            }
-        }
-        for story in self.stories.values_mut() {
-            clear_story_drop_cap_styles(&self.styles, story, 0);
-        }
-    }
-
     fn finish(mut self, root: &El) -> Result<Document> {
         let title = root.get("Name").map(|n| n.trim_end_matches(".indd").to_string()).filter(|n| !n.is_empty()).unwrap_or_else(|| "Untitled".into());
         if self.spreads.is_empty() {
@@ -3233,6 +561,7 @@ impl<'r> Importer<'r> {
         // Make sure built-in paragraph styles exist and are first.
         let mut d = Document {
             title,
+            file_info: Default::default(),
             settings: self.settings.clone(),
             spreads: std::mem::take(&mut self.spreads).into_iter().map(Arc::new).collect(),
             parents: std::mem::take(&mut self.parents).into_iter().map(Arc::new).collect(),
@@ -3273,910 +602,3 @@ impl<'r> Importer<'r> {
         Ok(d)
     }
 }
-
-/// The object style category flag that turns an effect element on or off.
-fn effect_flag(effect: &str) -> Option<&'static str> {
-    Some(match effect {
-        "BlendingSetting" => "EnableTransparency",
-        "DropShadowSetting" => "EnableDropShadow",
-        "FeatherSetting" => "EnableFeather",
-        "InnerShadowSetting" => "EnableInnerShadow",
-        "OuterGlowSetting" => "EnableOuterGlow",
-        "InnerGlowSetting" => "EnableInnerGlow",
-        "BevelAndEmbossSetting" => "EnableBevelEmboss",
-        "SatinSetting" => "EnableSatin",
-        "DirectionalFeatherSetting" => "EnableDirectionalFeather",
-        "GradientFeatherSetting" => "EnableGradientFeather",
-        _ => return None,
-    })
-}
-
-/// Lays `top` over `base`: attributes one by one, child elements matched by name and merged the same
-/// way, text replaced. A property given in one form (attribute or `Properties` child) replaces the
-/// other form in `base`.
-fn overlay(base: &mut El, top: &El, depth: usize) {
-    if depth > 32 {
-        *base = top.clone();
-        return;
-    }
-    for (k, v) in &top.attrs {
-        base.set(k, v);
-        if let Some(Node::El(p)) = base.children.iter_mut().find(|n| matches!(n, Node::El(p) if p.local() == "Properties")) {
-            p.children.retain(|n| !matches!(n, Node::El(x) if x.local() == k));
-        }
-    }
-    if let Some(p) = top.find("Properties") {
-        let names: Vec<&str> = p.elements().map(El::local).collect();
-        base.attrs.retain(|(k, _)| !names.contains(&k.as_str()));
-    }
-    let has_text = top.children.iter().any(|n| matches!(n, Node::Text(t) | Node::CData(t) if !t.trim().is_empty()));
-    if has_text {
-        base.children.retain(|n| !matches!(n, Node::Text(_) | Node::CData(_)));
-    }
-    // The k-th child of a name merges with the k-th child of that name in `base` (repeated elements
-    // such as gradient stops pair up in order).
-    let mut seen: HashMap<&str, usize> = HashMap::new();
-    for n in &top.children {
-        match n {
-            Node::El(c) => {
-                let k = seen.entry(c.local()).or_insert(0);
-                let slot = base
-                    .children
-                    .iter_mut()
-                    .filter_map(|b| match b {
-                        Node::El(b) if b.local() == c.local() => Some(b),
-                        _ => None,
-                    })
-                    .nth(*k);
-                *k += 1;
-                match slot {
-                    Some(b) => overlay(b, c, depth + 1),
-                    None => base.children.push(n.clone()),
-                }
-            }
-            Node::Text(_) | Node::CData(_) if has_text => base.children.push(n.clone()),
-            _ => {}
-        }
-    }
-}
-
-/// A cell span count; an infinite span is kept so it clamps to the table edge.
-fn span(e: &El, k: &str) -> f64 {
-    e.prop(k).and_then(|v| v.trim().parse::<f64>().ok()).unwrap_or(1.0)
-}
-
-fn finite(v: Option<f64>) -> Option<f64> {
-    v.filter(|v| v.is_finite())
-}
-
-/// A `GradientFeatherSetting`. The model holds two opacity stops at the ends of the gradient: the
-/// first and last `OpacityGradientStop` give them; with a linear vector, their `Location`s move its
-/// ends.
-fn gradient_feather_in(g: &El) -> GradientFeather {
-    let def = GradientFeather::default();
-    let angle = finite(g.num("Angle")).unwrap_or(0.0);
-    let mut stops: Vec<(f64, f64)> = g
-        .find_all("OpacityGradientStop")
-        .filter_map(|s| Some((finite(s.num("Location"))?.clamp(0.0, 100.0) / 100.0, finite(s.num("Opacity"))?.clamp(0.0, 100.0) / 100.0)))
-        .collect();
-    stops.sort_by(|a, b| a.0.total_cmp(&b.0));
-    let (first, last) = match (stops.first(), stops.last()) {
-        (Some(&a), Some(&b)) => (a, b),
-        _ => ((0.0, def.start as f64), (1.0, def.end as f64)),
-    };
-    let start: Option<[f64; 2]> = g
-        .prop("GradientStart")
-        .and_then(|s| s.split_whitespace().map(|v| v.parse().ok().filter(|v: &f64| v.is_finite())).collect::<Option<Vec<f64>>>())
-        .and_then(|v| v.try_into().ok());
-    let radial = g.get("Type") == Some("Radial");
-    let vector = match (start, finite(g.num("Length"))) {
-        (Some([x, y]), Some(len)) if len > 0.0 => {
-            let a = angle.to_radians();
-            let (dx, dy) = (len * a.cos(), -len * a.sin());
-            let (l0, l1) = if !radial && last.0 > first.0 { (first.0, last.0) } else { (0.0, 1.0) };
-            Some([x + dx * l0, y + dy * l0, x + dx * l1, y + dy * l1])
-        }
-        _ => None,
-    };
-    GradientFeather { on: true, radial, angle, start: first.1 as f32, end: last.1 as f32, vector }
-}
-
-/// Drop-shadow angle (degrees) from IDML offsets (inverse of export's mapping).
-/// A `TextWrapPreference` element (of a page item or a placed graphic).
-fn text_wrap(w: &El) -> TextWrap {
-    let mut tw = TextWrap {
-        mode: names::wrap_mode_in(w.get("TextWrapMode").unwrap_or("None")),
-        invert: w.get("Inverse") == Some("true"),
-        side: names::wrap_side_in(w.get("TextWrapSide").unwrap_or("BothSides")),
-        contour: names::contour_type_in(w.find("ContourOption").and_then(|c| c.get("ContourType")).unwrap_or("SameAsClipping")),
-        ..TextWrap::default()
-    };
-    if let Some(o) = w.prop_el("TextWrapOffset") {
-        tw.offsets = [o.num("Top").unwrap_or(0.0), o.num("Left").unwrap_or(0.0), o.num("Bottom").unwrap_or(0.0), o.num("Right").unwrap_or(0.0)];
-    }
-    tw
-}
-
-fn names_angle(x: f64, y: f64) -> f64 {
-    if x == 0.0 && y == 0.0 {
-        return 135.0;
-    }
-    let a = y.atan2(-x).to_degrees();
-    if a < 0.0 { a + 360.0 } else { a }
-}
-
-struct StoryBuilder {
-    text: String,
-    paras: Vec<ParaFormat>,
-    runs: Vec<CharRun>,
-    /// The current paragraph has no content yet (its format can still be set by a range).
-    fresh: bool,
-    last: CharFormat,
-    /// Tables by anchor paragraph index.
-    tables: Vec<(usize, Table)>,
-    /// Content after a table anchor starts a new paragraph (with this format).
-    after_table: Option<ParaFormat>,
-    /// Footnote texts in reference order.
-    notes: Vec<Story>,
-    /// Text destinations (Self, name) and cross-reference sources (Self, format Self) in order.
-    anchors: Vec<(String, String)>,
-    index_refs: Vec<designcraft_doc::IndexRef>,
-    xrefs: Vec<(String, String)>,
-    objects: Vec<designcraft_doc::AnchoredObject>,
-}
-
-impl StoryBuilder {
-    /// A table gets an anchor paragraph of its own.
-    fn push_table(&mut self, t: Table, pf: &ParaFormat, cf: &CharFormat) {
-        let para_empty = self.text.rsplit('\n').next().is_none_or(str::is_empty);
-        if !para_empty {
-            self.after_table = None;
-            self.push("\n", cf);
-            self.paras.push(pf.clone());
-        }
-        self.after_table = None;
-        self.push(&st::TABLE_ANCHOR.to_string(), cf);
-        self.tables.push((self.paras.len() - 1, t));
-        self.after_table = Some(pf.clone());
-        self.fresh = false;
-    }
-
-    fn push(&mut self, s: &str, f: &CharFormat) {
-        if s.is_empty() {
-            return;
-        }
-        if let Some(pf) = self.after_table.take()
-            && !s.starts_with('\n')
-        {
-            self.push("\n", f);
-            self.paras.push(pf);
-        }
-        self.text.push_str(s);
-        if !s.contains('\n') || s.len() > 1 {
-            self.fresh = false;
-        }
-        match self.runs.last_mut() {
-            Some(r) if r.format == *f => r.len += s.len(),
-            _ => self.runs.push(CharRun { len: s.len(), format: f.clone() }),
-        }
-    }
-}
-
-fn ace_char(v: &str) -> Option<char> {
-    match v.trim() {
-        "18" => Some(st::PAGE_NUMBER),
-        "19" => Some(st::SECTION_MARKER),
-        "7" => Some(st::INDENT_HERE),
-        "8" => Some(st::RIGHT_INDENT_TAB),
-        _ => None,
-    }
-}
-
-/// `HL Composer` and `HL Single`, their World-Ready (`… Optyca`) and Japanese (`… J`) forms.
-fn composer_in(name: &str) -> designcraft_doc::Composer {
-    use designcraft_doc::Composer as C;
-    let name = name.trim().trim_start_matches("$ID/");
-    match (name.contains("Single"), name.ends_with(" J") || name.contains("Japanese")) {
-        (false, false) => C::Paragraph,
-        (true, false) => C::SingleLine,
-        (false, true) => C::Japanese,
-        (true, true) => C::JapaneseSingleLine,
-    }
-}
-
-fn margins_of(m: &El) -> (Margins, Columns) {
-    let g = |k: &str, d: f64| m.num(k).filter(|v| v.is_finite()).unwrap_or(d);
-    let margins = Margins { top: g("Top", 36.0), bottom: g("Bottom", 36.0), inside: g("Left", 36.0), outside: g("Right", 36.0) };
-    let count = g("ColumnCount", 1.0).clamp(1.0, f64::from(designcraft_doc::MAX_COLUMNS)) as u32;
-    let gutter = g("ColumnGutter", 12.0);
-    let positions = m.get("ColumnsPositions").and_then(|s| custom_columns(s, count, gutter));
-    (margins, Columns { count, gutter, positions })
-}
-
-/// `ColumnsPositions` when the column guides have been dragged off the even split: `2 × count`
-/// offsets from the margin box's left edge, valid as [`designcraft_doc::valid_column_positions`]
-/// over the box they span. InDesign writes the attribute whether or not they have been moved, so
-/// an even set is dropped: `positions` means "custom", and keeping an even copy would freeze the
-/// columns against a later change of count or gutter. Anything malformed is the even split; at
-/// most one number past `2 × count` is parsed, so a long list costs nothing.
-fn custom_columns(s: &str, count: u32, gutter: f64) -> Option<Vec<f64>> {
-    let want = 2 * count as usize;
-    let pos = s.split_whitespace().take(want + 1).map(|v| v.parse::<f64>().ok()).collect::<Option<Vec<f64>>>()?;
-    let width = *pos.last()?;
-    if !designcraft_doc::valid_column_positions(&pos, count, width) {
-        return None;
-    }
-    let even = Columns { count, gutter, positions: None }.edges(width);
-    // The tolerance only absorbs float noise in InDesign's arithmetic; a dragged guide moves far more.
-    pos.iter().zip(&even).any(|(a, b)| (a - b).abs() > 1e-4).then_some(pos)
-}
-
-/// `columns` with custom positions only when they fit the margin box of a `page_width`-wide page
-/// with these margins (the box's width doesn't depend on which side of the spine it is).
-fn fit_columns(mut columns: Columns, margins: &Margins, page_width: f64) -> Columns {
-    let width = (page_width - margins.inside - margins.outside).max(0.0);
-    if columns.valid_positions(width).is_none() {
-        columns.positions = None;
-    }
-    columns
-}
-
-/// Text Frame Options from `TextFramePreference` elements: each attribute from the first that sets it.
-fn text_frame_options(prefs: &[&El]) -> TextFrameOptions {
-    let e = Prefs(prefs);
-    let mut o = TextFrameOptions::default();
-    if let Some(v) = e.num("TextColumnCount") {
-        o.columns = v.clamp(1.0, 216.0) as u32;
-    }
-    if let Some(v) = e.num("TextColumnGutter") {
-        o.gutter = v;
-    }
-    o.columns_kind = if e.prop("UseFixedColumnWidth").as_deref().map(str::trim) == Some("true") {
-        ColumnsKind::FixedWidth
-    } else if e.prop("UseFlexibleColumnWidth").as_deref().map(str::trim) == Some("true") {
-        ColumnsKind::FlexibleWidth
-    } else {
-        ColumnsKind::FixedNumber
-    };
-    if o.columns_kind != ColumnsKind::FixedNumber
-        && let Some(v) = e.num("TextColumnFixedWidth")
-    {
-        o.column_width = v;
-    }
-    o.balance_columns = e.prop("VerticalBalanceColumns").as_deref().map(str::trim) == Some("true");
-    if let Some(p) = prefs.iter().find(|p| p.prop("InsetSpacing").is_some())
-        && let Some(inset) = inset_spacing(p)
-    {
-        o.inset = inset;
-    }
-    if let Some(v) = e.prop("VerticalJustification") {
-        o.vertical_justification = names::vj_in(v.trim());
-    }
-    if let Some(v) = e.num("VerticalThreshold") {
-        o.vj_paragraph_spacing_limit = v;
-    }
-    if let Some(v) = e.prop("FirstBaselineOffset") {
-        o.first_baseline = names::first_baseline_in(v.trim());
-    }
-    if let Some(v) = e.num("MinimumFirstBaselineOffset") {
-        o.first_baseline_min = v;
-    }
-    o.ignore_wrap = e.prop("IgnoreWrap").as_deref().map(str::trim) == Some("true");
-    if let Some(v) = e.prop("AutoSizingType") {
-        o.auto_size = names::auto_size_in(v.trim());
-    }
-    if let Some(v) = e.prop("AutoSizingReferencePoint") {
-        o.auto_size_ref = names::REF_POINTS.iter().position(|p| *p == v.trim()).unwrap_or(1) as u8;
-    }
-    let size = |k: &str| e.num(k).filter(|v| v.is_finite()).map(|v| v.clamp(0.0, 10_000.0));
-    o.auto_size_use_min_height = e.prop("UseMinimumHeightForAutoSizing").as_deref().map(str::trim) == Some("true");
-    o.auto_size_min_height = size("MinimumHeightForAutoSizing").unwrap_or(0.0);
-    o.auto_size_use_min_width = e.prop("UseMinimumWidthForAutoSizing").as_deref().map(str::trim) == Some("true");
-    o.auto_size_min_width = size("MinimumWidthForAutoSizing").unwrap_or(0.0);
-    o.auto_size_no_line_breaks = e.prop("UseNoLineBreaksForAutoSizing").as_deref().map(str::trim) == Some("true");
-    // Column rules (the colour is a swatch reference: see `Importer::frame_options`).
-    o.column_rule = e.prop("ColumnRuleOverride").as_deref().map(str::trim) == Some("true");
-    let finite = |k: &str| e.num(k).filter(|v| v.is_finite());
-    if let Some(v) = finite("ColumnRuleStrokeWidth") {
-        o.column_rule_weight = v.clamp(0.0, 1000.0);
-    }
-    if let Some(t) = tint(finite("ColumnRuleStrokeTint")) {
-        o.column_rule_tint = t.clamp(0.0, 1.0);
-    }
-    for (k, v) in [
-        ("ColumnRuleOffset", &mut o.column_rule_offset),
-        ("ColumnRuleTopInset", &mut o.column_rule_top_inset),
-        ("ColumnRuleBottomInset", &mut o.column_rule_bottom_inset),
-    ] {
-        if let Some(x) = finite(k) {
-            *v = x.clamp(-1440.0, 1440.0);
-        }
-    }
-    o
-}
-
-/// Deepest table-in-cell or note nesting the drop cap pass walks into.
-const MAX_STORY_NESTING: usize = 32;
-
-/// [`Importer::clear_inherited_drop_cap_styles`] for one story's paragraphs and those of the table
-/// cells, footnotes and endnotes in it.
-fn clear_story_drop_cap_styles(styles: &Styles, story: &mut Story, depth: usize) {
-    for p in &mut story.paras {
-        if p.para.drop_cap_style.is_none() && p.para.nested_styles.is_some() && inherits_drop_cap_style(styles, Some(&p.style)) {
-            p.para.drop_cap_style = Some(st::NO_CHAR_STYLE.into());
-        }
-    }
-    if depth >= MAX_STORY_NESTING {
-        return;
-    }
-    for table in story.tables.values_mut() {
-        for cell in &mut Arc::make_mut(table).cells {
-            clear_story_drop_cap_styles(styles, &mut cell.text, depth + 1);
-        }
-    }
-    for note in story.notes.iter_mut().chain(story.endnotes.iter_mut()) {
-        clear_story_drop_cap_styles(styles, &mut Arc::make_mut(note).text, depth + 1);
-    }
-}
-
-/// Does paragraph style `name` (and its based-on chain) set a drop cap character style? A style
-/// with a nested style list of its own and no drop cap style has none.
-fn inherits_drop_cap_style<'a>(styles: &'a Styles, mut name: Option<&'a str>) -> bool {
-    let mut seen = HashSet::new();
-    while let Some(n) = name {
-        let Some(s) = styles.para(n).filter(|_| seen.insert(n)) else { break };
-        if let Some(c) = s.para.drop_cap_style.as_deref() {
-            return !c.is_empty() && c != st::NO_CHAR_STYLE;
-        }
-        if s.para.nested_styles.is_some() {
-            return false;
-        }
-        name = s.based_on.as_deref();
-    }
-    false
-}
-
-/// Property lookup over preference levels: the nearest level wins, attributes before children.
-struct Prefs<'a>(&'a [&'a El]);
-
-impl Prefs<'_> {
-    fn prop(&self, k: &str) -> Option<String> {
-        self.0.iter().find_map(|e| e.prop(k))
-    }
-    fn num(&self, k: &str) -> Option<f64> {
-        // The nearest preference wins; within it, attributes precede property children.
-        self.prop(k).and_then(|v| v.trim().parse::<f64>().ok()).filter(|v| v.is_finite())
-    }
-}
-
-/// A scalar applies to every edge; a list is top, left, bottom, right. Keep the
-/// existing property-element precedence over the legacy scalar attribute, even
-/// when the property is malformed. Finite negative insets remain supported.
-fn inset_spacing(e: &El) -> Option<[f64; 4]> {
-    let number = |s: &str| s.trim().parse::<f64>().ok().filter(|v| v.is_finite());
-    let Some(property) = e.prop_el("InsetSpacing") else {
-        return e.get("InsetSpacing").and_then(number).map(|v| [v; 4]);
-    };
-    let mut items = property.elements();
-    if property.get("type") == Some("list") || property.find("ListItem").is_some() {
-        let mut inset = [0.0; 4];
-        for edge in &mut inset {
-            let item = items.next()?;
-            if item.local() != "ListItem" || item.elements().next().is_some() {
-                return None;
-            }
-            *edge = number(&item.text_content())?;
-        }
-        items.next().is_none().then_some(inset)
-    } else if items.next().is_none() {
-        number(&property.text_content()).map(|v| [v; 4])
-    } else {
-        None
-    }
-}
-
-/// A graphic's `ClippingPathSettings` with its saved geometry, moved into graphic space by
-/// `to_graphic`. `None` for type None, an unknown type, or no geometry (the outline is never
-/// traced here).
-fn clipping_path(g: &El, to_graphic: Affine) -> Option<Arc<designcraft_doc::ClippingPath>> {
-    let cs = g.find("ClippingPathSettings")?;
-    let kind = names::clipping_kind_in(cs.get("ClippingType").unwrap_or("None"))?;
-    let geometry = cs.prop_el("ClippingPathGeometry").or_else(|| cs.find("ClippingPathGeometry")).or_else(|| g.prop_el("ClippingPathGeometry"))?;
-    let mut path = path_capped(geometry, designcraft_doc::MAX_CLIP_ANCHORS);
-    path.subpaths.retain(|sp| sp.anchors.len() > 1 && sp.anchors.iter().all(|a| a.p.is_finite() && a.h_in.is_finite() && a.h_out.is_finite()));
-    if path.is_empty() {
-        return None;
-    }
-    path.transform(to_graphic);
-    let finite = |v: Option<f64>, def: f64| v.filter(|v| v.is_finite()).unwrap_or(def);
-    let mut c = designcraft_doc::ClippingPath::new(kind, path);
-    c.invert = cs.boolean("InvertPath").unwrap_or(false);
-    c.include_inside_edges = cs.boolean("IncludeInsideEdges").unwrap_or(false);
-    c.restrict_to_frame = cs.boolean("RestrictToFrame").unwrap_or(false);
-    c.use_high_resolution = cs.boolean("UseHighResolutionImage").unwrap_or(true);
-    c.threshold = finite(cs.num("Threshold"), c.threshold).clamp(0.0, 255.0);
-    c.tolerance = finite(cs.num("Tolerance"), c.tolerance).clamp(0.0, 10.0);
-    c.inset = finite(cs.num("InsetFrame"), 0.0);
-    c.source_name = cs.get("AppliedPathName").filter(|n| *n != "$ID/").unwrap_or("").to_string();
-    c.source_index = cs.num("Index").filter(|v| v.is_finite()).map_or(-1, |v| v.clamp(-1.0, i32::MAX as f64) as i32);
-    Some(Arc::new(c))
-}
-
-fn path_of(pg: &El) -> PathData {
-    path_capped(pg, usize::MAX)
-}
-
-/// The path of a `…Geometry` element, keeping at most `max` anchors.
-fn path_capped(pg: &El, max: usize) -> PathData {
-    let mut subs = Vec::new();
-    let mut left = max;
-    for g in pg.find_all("GeometryPathType") {
-        let closed = g.get("PathOpen") != Some("true");
-        let mut anchors = Vec::new();
-        if let Some(arr) = g.find("PathPointArray") {
-            // A NaN or infinite point drops its subpath (JSON can't store it).
-            let non_finite = |s: Option<&str>| s.is_some_and(|s| s.split_whitespace().any(|v| v.parse::<f64>().is_ok_and(|x| !x.is_finite())));
-            if arr.find_all("PathPointType").take(left).any(|p| ["Anchor", "LeftDirection", "RightDirection"].iter().any(|k| non_finite(p.get(k)))) {
-                continue;
-            }
-            for p in arr.find_all("PathPointType").take(left) {
-                let Some(a) = parse_point(p.get("Anchor")) else { continue };
-                let hin = parse_point(p.get("LeftDirection")).unwrap_or(a);
-                let hout = parse_point(p.get("RightDirection")).unwrap_or(a);
-                anchors.push(Anchor::with_handles(a, hin, hout));
-            }
-        }
-        left = left.saturating_sub(anchors.len());
-        if !anchors.is_empty() {
-            subs.push(SubPath::new(anchors, closed));
-        }
-    }
-    PathData::new(subs)
-}
-
-/// A placed PDF's `PDFAttribute` (Image Import Options), as a child or a property.
-fn pdf_attribute(g: &El) -> Option<&El> {
-    g.find("PDFAttribute").or_else(|| g.prop_el("PDFAttribute"))
-}
-
-/// The page a placed PDF shows (0-based), from `PDFAttribute/@PageNumber` (1-based). A missing or
-/// malformed value means page 1; a page the PDF lacks draws nothing and is left out of PDF export.
-fn pdf_page_in(g: &El) -> u32 {
-    pdf_attribute(g)
-        .and_then(|a| a.get("PageNumber"))
-        .and_then(|v| v.trim().parse::<u64>().ok())
-        .and_then(|n| u32::try_from(n.saturating_sub(1)).ok())
-        .unwrap_or(0)
-}
-
-/// Anchors a custom text wrap boundary may have.
-const MAX_WRAP_PATH_ANCHORS: usize = 4096;
-
-/// A custom text wrap boundary (`TextWrapPreference/Properties/PathGeometry`), in the item's inner
-/// space like its own path. Hostile input is an error: too many anchors, a malformed or non-finite
-/// point, or no points at all.
-fn wrap_path_of(pg: &El) -> std::result::Result<PathData, &'static str> {
-    let finite = |s: Option<&str>| -> std::result::Result<Option<Point>, &'static str> {
-        let Some(s) = s else { return Ok(None) };
-        let v = nums(s);
-        match (v.first(), v.get(1)) {
-            (Some(&x), Some(&y)) if v.len() == 2 && x.is_finite() && y.is_finite() => Ok(Some(Point::new(x, y))),
-            _ => Err("malformed or non-finite point"),
-        }
-    };
-    let mut subs = Vec::new();
-    let mut n = 0usize;
-    for g in pg.find_all("GeometryPathType") {
-        let closed = g.get("PathOpen") != Some("true");
-        let mut anchors = Vec::new();
-        for p in g.find("PathPointArray").into_iter().flat_map(|arr| arr.find_all("PathPointType")) {
-            n = n.saturating_add(1);
-            if n > MAX_WRAP_PATH_ANCHORS {
-                return Err("too many points");
-            }
-            let a = finite(p.get("Anchor"))?.ok_or("point without an anchor")?;
-            let hin = finite(p.get("LeftDirection"))?.unwrap_or(a);
-            let hout = finite(p.get("RightDirection"))?.unwrap_or(a);
-            anchors.push(Anchor::with_handles(a, hin, hout));
-        }
-        if !anchors.is_empty() {
-            subs.push(SubPath::new(anchors, closed));
-        }
-    }
-    if subs.is_empty() {
-        return Err("no points");
-    }
-    Ok(PathData::new(subs))
-}
-
-/// IDML link URI → file system path (`file:/a%20b` → `/a b`, `file:///C:/x` → `C:/x`). A URI
-/// naming another computer keeps it as a network path (`file://host/s/x` → `//host/s/x`).
-pub(crate) fn uri_to_path(uri: &str) -> String {
-    let rest = match uri.strip_prefix("file://") {
-        Some(rest) => {
-            let host_end = rest.find(['/', '\\']).unwrap_or(rest.len());
-            let host = rest.get(..host_end).unwrap_or_default();
-            if host.is_empty() || host.eq_ignore_ascii_case("localhost") {
-                rest.get(host_end..).unwrap_or(rest)
-            } else if matches!(host.as_bytes(), [letter, b':'] if letter.is_ascii_alphabetic()) {
-                rest
-            } else {
-                return format!("//{}", percent_decode(rest));
-            }
-        }
-        None => uri.strip_prefix("file:").unwrap_or(uri),
-    };
-    // `file:///C:/…` → `/C:/…` → `C:/…`
-    let rest = match rest.as_bytes() {
-        [b'/', _, b':', _, ..] => rest.get(1..).unwrap_or(rest),
-        _ => rest,
-    };
-    percent_decode(rest)
-}
-
-/// Auto tate-chu-yoko, Japanese composition and grid settings of a paragraph range or style.
-fn cjk_settings_para(e: &El, a: &mut ParaAttrs) {
-    let count = |k: &str| e.num(k).filter(|v| v.is_finite()).map(|v| v.clamp(0.0, 1000.0) as u32);
-    a.auto_tcy = count("AutoTcy");
-    a.auto_tcy_include_roman = e.boolean("AutoTcyIncludeRoman");
-    a.rotate_roman = e.boolean("RotateSingleByteCharacters");
-    // 欧文泣き別れ: the name is inferred (it follows TreatIdeographicSpaceAsSpace).
-    a.roman_word_break = e.boolean("AllowArbitraryHyphenation");
-    a.grid_gyoudori = count("GridGyoudori");
-    a.paragraph_gyoudori = e.boolean("ParagraphGyoudori");
-}
-
-impl Importer<'_> {
-    /// Kenten Settings, Kenten Color and Shatai of a character range or style.
-    fn cjk_settings_chars(&mut self, e: &El, a: &mut CharAttrs) {
-        let finite = |k: &str| e.num(k).filter(|v| v.is_finite());
-        if let Some(kind) = e.get("KentenKind").and_then(crate::cjk::kenten_kind_in) {
-            a.kenten_kind = Some(kind);
-            if a.kenten_character.as_deref().is_none_or(str::is_empty)
-                && let Some(mark) = kind.mark()
-            {
-                a.kenten_character = Some(mark.to_string());
-            }
-        }
-        if let Some(f) = e.prop("KentenFont") {
-            let f = f.trim();
-            a.kenten_font = Some(if f == "$ID/" { String::new() } else { f.to_string() });
-        }
-        if let Some(st) = e.prop("KentenFontStyle") {
-            let st = st.trim();
-            a.kenten_font_style = Some(if st == "Nothing" { String::new() } else { st.to_string() });
-        }
-        a.kenten_size = finite("KentenFontSize").map(|v| (v > 0.0).then_some(v));
-        a.kenten_x_scale = finite("KentenXScale").map(|v| v / 100.0);
-        a.kenten_y_scale = finite("KentenYScale").map(|v| v / 100.0);
-        a.kenten_distance = finite("KentenPlacement");
-        a.kenten_position = e.prop("KentenPosition").and_then(|v| crate::cjk::kenten_position_in(&v));
-        a.kenten_alignment = e.prop("KentenAlignment").and_then(|v| crate::cjk::kenten_alignment_in(&v));
-        a.kenten_character_set = e.prop("KentenCharacterSet");
-        // "Text Color" is the text's own colour; it resets an inherited swatch.
-        if let Some(r) = e.prop("KentenFillColor") {
-            a.kenten_fill = Some(if r.trim() == "Text Color" { String::new() } else { self.swatch_ref(r.trim()) });
-        }
-        if let Some(r) = e.prop("KentenStrokeColor") {
-            a.kenten_stroke = Some(if r.trim() == "Text Color" { String::new() } else { self.swatch_ref(r.trim()) });
-        }
-        // Tints and weight: -1 is the text's.
-        a.kenten_fill_tint = finite("KentenTint").map(|v| (v >= 0.0).then(|| (v.min(100.0) / 100.0) as f32));
-        a.kenten_stroke_tint = finite("KentenStrokeTint").map(|v| (v >= 0.0).then(|| (v.min(100.0) / 100.0) as f32));
-        a.kenten_stroke_weight = finite("KentenWeight").map(|v| (v >= 0.0).then_some(v));
-        a.kenten_overprint_fill = e.prop("KentenOverprintFill").and_then(|v| crate::cjk::overprint_in(&v));
-        a.kenten_overprint_stroke = e.prop("KentenOverprintStroke").and_then(|v| crate::cjk::overprint_in(&v));
-        a.shatai_magnification = finite("ShataiMagnification");
-        a.shatai_angle = finite("ShataiDegreeAngle").map(|v| v / crate::cjk::SHATAI_ANGLE_UNITS);
-        a.shatai_adjust_rotation = e.boolean("ShataiAdjustRotation");
-        a.shatai_adjust_tsume = e.boolean("ShataiAdjustTsume");
-    }
-}
-
-/// OpenType features (only when the element sets any).
-fn read_otf_features(e: &El, a: &mut CharAttrs) {
-    let mut otf_list: Vec<String> = Vec::new();
-    let mut any = false;
-    for (tag, _, attr) in designcraft_doc::otf::TOGGLES {
-        if let Some(on) = e.boolean(attr) {
-            designcraft_doc::otf::set(&mut otf_list, tag, on);
-            any = true;
-        }
-    }
-    if let Some(fig) = e.prop("OTFFigureStyle")
-        && let Some((id, ..)) = designcraft_doc::otf::FIGURES.iter().find(|f| f.3 == fig.trim())
-    {
-        designcraft_doc::otf::set_figures(&mut otf_list, id);
-        any = true;
-    }
-    if let Some(m) = e.num("OTFStylisticSets") {
-        designcraft_doc::otf::set_stylistic_sets(&mut otf_list, m.max(0.0) as u32);
-        any = true;
-    }
-    if any {
-        a.otf_features = Some(otf_list);
-    }
-}
-
-#[cfg(test)]
-mod numeric_property_tests {
-    use super::*;
-
-    fn pref(attrs: &[(&str, &str)], props: &[(&str, &str)]) -> El {
-        let mut e = El::new("TextFramePreference");
-        for (key, value) in attrs {
-            e.set(key, *value);
-        }
-        let mut p = El::new("Properties");
-        for (key, value) in props {
-            p.push(El::new(key).text(*value));
-        }
-        e.push(p);
-        e
-    }
-
-    #[test]
-    fn numeric_property_forms_import_every_frame_option() {
-        let local = pref(
-            &[("UseFixedColumnWidth", "true")],
-            &[
-                ("TextColumnCount", "3"),
-                ("TextColumnGutter", "17"),
-                ("TextColumnFixedWidth", "123"),
-                ("VerticalThreshold", "19"),
-                ("MinimumFirstBaselineOffset", "8"),
-                ("ColumnRuleStrokeWidth", "2"),
-                ("ColumnRuleStrokeTint", "25"),
-                ("ColumnRuleOffset", "3"),
-                ("ColumnRuleTopInset", "4"),
-                ("ColumnRuleBottomInset", "5"),
-            ],
-        );
-        let o = text_frame_options(&[&local]);
-        assert_eq!((o.columns, o.gutter, o.column_width), (3, 17., 123.));
-        assert_eq!((o.vj_paragraph_spacing_limit, o.first_baseline_min), (19., 8.));
-        assert_eq!(
-            (o.column_rule_weight, o.column_rule_tint, o.column_rule_offset, o.column_rule_top_inset, o.column_rule_bottom_inset),
-            (2., 0.25, 3., 4., 5.)
-        );
-    }
-
-    #[test]
-    fn numeric_property_precedence_is_nearest_level_then_attribute() {
-        let local = pref(&[("TextColumnCount", "4")], &[("TextColumnCount", "5"), ("TextColumnGutter", "17")]);
-        let child = pref(
-            &[("TextColumnGutter", "90"), ("MinimumFirstBaselineOffset", "8")],
-            &[("MinimumFirstBaselineOffset", "9"), ("VerticalThreshold", "19")],
-        );
-        let base = pref(&[("VerticalThreshold", "99")], &[("ColumnRuleStrokeWidth", "2")]);
-        let o = text_frame_options(&[&local, &child, &base]);
-        assert_eq!((o.columns, o.gutter, o.first_baseline_min, o.vj_paragraph_spacing_limit, o.column_rule_weight), (4, 17., 8., 19., 2.));
-        // An explicit invalid value still masks inherited values, as attribute lookup did.
-        let invalid = pref(&[("TextColumnCount", "bad")], &[("TextColumnCount", "6")]);
-        assert_eq!(text_frame_options(&[&invalid, &local]).columns, TextFrameOptions::default().columns);
-    }
-}
-
-#[cfg(test)]
-mod frame_preference_safety_tests {
-    use super::*;
-
-    fn pref(attrs: &[(&str, &str)], props: &[(&str, &str)]) -> El {
-        let mut e = El::new("TextFramePreference");
-        for (key, value) in attrs {
-            e.set(key, *value);
-        }
-        let mut p = El::new("Properties");
-        for (key, value) in props {
-            p.push(El::new(key).text(*value));
-        }
-        e.push(p);
-        e
-    }
-
-    #[test]
-    fn frame_preference_nonfinite_numbers_keep_finite_defaults() {
-        const KEYS: [&str; 10] = [
-            "TextColumnCount",
-            "TextColumnGutter",
-            "TextColumnFixedWidth",
-            "VerticalThreshold",
-            "MinimumFirstBaselineOffset",
-            "ColumnRuleStrokeWidth",
-            "ColumnRuleStrokeTint",
-            "ColumnRuleOffset",
-            "ColumnRuleTopInset",
-            "ColumnRuleBottomInset",
-        ];
-        let fallback = pref(&[("UseFixedColumnWidth", "true")], &[]);
-        let expected = text_frame_options(&[&fallback]);
-        for value in ["NaN", "inf", "-inf", "1e309"] {
-            for attribute in [true, false] {
-                let values: Vec<_> = KEYS.iter().map(|key| (*key, value)).collect();
-                let mut invalid = if attribute { pref(&values, &[]) } else { pref(&[], &values) };
-                invalid.set("UseFixedColumnWidth", "true");
-                let inherited = pref(&[], &[("TextColumnCount", "7"), ("TextColumnGutter", "9")]);
-                assert_eq!(text_frame_options(&[&invalid, &inherited]), expected, "{value}, attribute={attribute}");
-            }
-        }
-    }
-
-    #[test]
-    fn frame_preference_property_booleans_enums_and_precedence() {
-        let base = pref(
-            &[
-                ("UseFixedColumnWidth", "true"),
-                ("UseFlexibleColumnWidth", "false"),
-                ("VerticalBalanceColumns", "false"),
-                ("IgnoreWrap", "false"),
-                ("ColumnRuleOverride", "false"),
-                ("VerticalJustification", "TopAlign"),
-                ("FirstBaselineOffset", "AscentOffset"),
-                ("AutoSizingType", "Off"),
-                ("AutoSizingReferencePoint", "TopCenterPoint"),
-            ],
-            &[],
-        );
-        let local = pref(
-            &[],
-            &[
-                ("UseFixedColumnWidth", "false"),
-                ("UseFlexibleColumnWidth", "true"),
-                ("VerticalBalanceColumns", "true"),
-                ("IgnoreWrap", "true"),
-                ("ColumnRuleOverride", "true"),
-                ("VerticalJustification", "BottomAlign"),
-                ("FirstBaselineOffset", "FixedHeight"),
-                ("AutoSizingType", "HeightAndWidth"),
-                ("AutoSizingReferencePoint", "BottomRightPoint"),
-            ],
-        );
-        let o = text_frame_options(&[&local, &base]);
-        assert_eq!(o.columns_kind, ColumnsKind::FlexibleWidth);
-        assert!(o.balance_columns && o.ignore_wrap && o.column_rule);
-        assert_eq!(o.vertical_justification, designcraft_doc::VerticalJustification::Bottom);
-        assert_eq!(o.first_baseline, designcraft_doc::FirstBaseline::Fixed);
-        assert_eq!(o.auto_size, designcraft_doc::AutoSize::HeightAndWidth);
-        assert_eq!(o.auto_size_ref, 8);
-        let fixed = pref(&[], &[("UseFixedColumnWidth", "true")]);
-        assert_eq!(text_frame_options(&[&fixed, &local, &base]).columns_kind, ColumnsKind::FixedWidth);
-        // At one level an attribute wins over a conflicting property child, for every key.
-        let mut same_level = local.clone();
-        for (key, value) in &base.attrs {
-            same_level.set(key, value);
-        }
-        assert_eq!(text_frame_options(&[&same_level, &local]), text_frame_options(&[&base]));
-        // Malformed nearer values mask ancestors and use the normal per-field fallback.
-        let mut malformed = El::new("TextFramePreference");
-        for (key, _) in &base.attrs {
-            malformed.set(key, "invalid");
-        }
-        assert_eq!(text_frame_options(&[&malformed, &local]), TextFrameOptions { auto_size_ref: 1, ..Default::default() });
-    }
-}
-
-#[cfg(test)]
-mod page_column_import_safety_tests {
-    use super::*;
-
-    #[test]
-    fn frame_preference_page_columns_are_bounded_and_finite() {
-        for (raw, expected) in [("4000000000", 216), ("1e300", 216), ("-10", 1), ("NaN", 1), ("inf", 1)] {
-            let m = El::new("MarginPreference")
-                .attr("ColumnCount", raw)
-                .attr("ColumnGutter", "NaN")
-                .attr("Top", "inf")
-                .attr("Bottom", "-inf")
-                .attr("Left", "NaN")
-                .attr("Right", "1e309");
-            let (margins, columns) = margins_of(&m);
-            assert_eq!(columns.count, expected);
-            assert_eq!(columns.gutter, 12.);
-            assert_eq!(margins, Margins::uniform(36.));
-        }
-    }
-
-    /// Hostile `ColumnsPositions` are the even split: never half-read, never a panic, and a long
-    /// list is not parsed past what `ColumnCount` allows (#1096).
-    #[test]
-    fn hostile_column_positions_fall_back_to_the_even_split() {
-        let positions = |count: &str, raw: &str| {
-            let m = El::new("MarginPreference").attr("ColumnCount", count).attr("ColumnGutter", "20").attr("ColumnsPositions", raw);
-            margins_of(&m).1.positions
-        };
-        assert_eq!(positions("2", "0 150 170 450"), Some(vec![0., 150., 170., 450.]));
-        let huge = (0..10_000).map(|i| i.to_string()).collect::<Vec<_>>().join(" ");
-        for (count, raw) in [
-            ("2", "0 215 235 450"),         // the even split
-            ("2", "0 150 170"),             // odd
-            ("2", "0 450"),                 // too few for the count
-            ("2", "0 100 120 200 220 450"), // too many for the count
-            ("2", "0 150 90 450"),          // descending
-            ("2", "0 NaN 170 450"),
-            ("2", "0 inf 170 450"),
-            ("2", "0 150 170 1e309"),
-            ("2", "0 x 170 450"),
-            ("2", "10 150 170 450"), // not from the margin
-            ("2", ""),
-            ("2", huge.as_str()),
-            ("4000000000", huge.as_str()), // the count is capped at 216, so is the list
-            ("216", huge.as_str()),
-            ("NaN", "0 150 170 450"),
-        ] {
-            assert_eq!(positions(count, raw), None, "{count}: {}", raw.get(..raw.len().min(40)).unwrap_or(""));
-        }
-        // The cap itself: 216 one-point columns with no gutter are the even split; one edge moved
-        // makes them custom.
-        let gapless = |raw: &str| {
-            let m = El::new("MarginPreference").attr("ColumnCount", "216").attr("ColumnGutter", "0").attr("ColumnsPositions", raw);
-            margins_of(&m).1.positions
-        };
-        let edges = |first_right: &str| {
-            (0..432).map(|i| if i == 1 { first_right.to_string() } else { ((i + 1) / 2).to_string() }).collect::<Vec<_>>().join(" ")
-        };
-        assert_eq!(gapless(&edges("1")), None);
-        assert_eq!(gapless(&edges("0.5")).map(|p| p.len()), Some(432));
-    }
-}
-
-#[cfg(test)]
-mod frame_preference_scalar_tests {
-    use super::*;
-
-    #[test]
-    fn frame_preference_scalar_whitespace() {
-        let values = [
-            ("UseFixedColumnWidth", "true"),
-            ("UseFlexibleColumnWidth", "false"),
-            ("VerticalBalanceColumns", "true"),
-            ("IgnoreWrap", "true"),
-            ("ColumnRuleOverride", "true"),
-            ("VerticalJustification", "BottomAlign"),
-            ("FirstBaselineOffset", "FixedHeight"),
-            ("AutoSizingType", "HeightAndWidth"),
-            ("AutoSizingReferencePoint", "BottomRightPoint"),
-        ];
-        let preference = |properties: bool, padded: bool, fixed: bool| {
-            let mut e = El::new("TextFramePreference");
-            let mut props = El::new("Properties");
-            for (key, raw) in values {
-                let raw = match key {
-                    "UseFixedColumnWidth" if !fixed => "false",
-                    "UseFlexibleColumnWidth" if !fixed => "true",
-                    _ => raw,
-                };
-                let value = if padded { format!("\n  {raw}\t ") } else { raw.to_string() };
-                if properties {
-                    props.push(El::new(key).text(value));
-                } else {
-                    e.set(key, value);
-                }
-            }
-            e.push(props);
-            e
-        };
-        for fixed in [false, true] {
-            let clean = preference(false, false, fixed);
-            let expected = text_frame_options(&[&clean]);
-            assert_eq!(expected.columns_kind, if fixed { ColumnsKind::FixedWidth } else { ColumnsKind::FlexibleWidth });
-            assert!(expected.balance_columns && expected.ignore_wrap && expected.column_rule);
-            assert_eq!(expected.vertical_justification, designcraft_doc::VerticalJustification::Bottom);
-            assert_eq!(expected.first_baseline, designcraft_doc::FirstBaseline::Fixed);
-            assert_eq!(expected.auto_size, designcraft_doc::AutoSize::HeightAndWidth);
-            assert_eq!(expected.auto_size_ref, 8);
-            for properties in [false, true] {
-                let padded = preference(properties, true, fixed);
-                assert_eq!(text_frame_options(&[&padded]), expected);
-            }
-            // A malformed nearest attribute masks both its own valid child and farther values.
-            let mut invalid = preference(true, true, fixed);
-            for (key, _) in values {
-                invalid.set(key, " invalid ");
-            }
-            assert_eq!(text_frame_options(&[&invalid, &clean]), TextFrameOptions { auto_size_ref: 1, ..Default::default() });
-        }
-        // Object identities use the raw property lookup, not scalar whitespace normalization.
-        let exact = El::new("TextFramePreference").child(El::new("Properties").child(El::new("ColumnRuleStrokeColor").text(" Color/Named ")));
-        assert_eq!(Prefs(&[&exact]).prop("ColumnRuleStrokeColor").as_deref(), Some(" Color/Named "));
-    }
-}
diff --git a/crates/idml/src/import/document.rs b/crates/idml/src/import/document.rs
new file mode 100644
index 000000000..dce466381
--- /dev/null
+++ b/crates/idml/src/import/document.rs
@@ -0,0 +1,351 @@
+use super::values::tint;
+use super::{BaselineGrid, El, GridRelative, Importer, PARA_BUILTINS, names};
+
+/// IDML stores a sort key on each topic, rather than on its page references.
+#[derive(Clone, Default)]
+pub(super) struct IndexTopic {
+    pub(super) path: Vec<String>,
+    pub(super) sort: Vec<String>,
+}
+
+impl IndexTopic {
+    fn child(&self, topic: &El) -> Self {
+        let mut path = self.path.clone();
+        path.push(topic.get("Name").unwrap_or("").to_string());
+        let mut sort = self.sort.clone();
+        if let Some(key) = topic.get("SortOrder").filter(|key| !key.is_empty()) {
+            // Keep empty positions before a child's key, but omit trailing defaults.
+            sort.resize(self.path.len(), String::new());
+            sort.push(key.to_string());
+        }
+        Self { path, sort }
+    }
+}
+
+impl<'r> Importer<'r> {
+    pub(super) fn doc_prefs(&mut self, e: &El) {
+        let s = &mut self.settings;
+        if let Some(v) = e.get("OverprintBlack") {
+            s.overprint_black = v != "false";
+        }
+        if let Some(v) = e.num("PageWidth") {
+            s.page_width = v;
+        }
+        if let Some(v) = e.num("PageHeight") {
+            s.page_height = v;
+        }
+        if let Some(v) = e.boolean("FacingPages") {
+            s.facing_pages = v;
+        }
+        if let Some(v) = e.get("PageBinding") {
+            s.right_to_left_binding = v == "RightToLeft";
+        }
+        for (i, k) in ["DocumentBleedTopOffset", "DocumentBleedBottomOffset", "DocumentBleedInsideOrLeftOffset", "DocumentBleedOutsideOrRightOffset"]
+            .iter()
+            .enumerate()
+        {
+            if let Some(v) = e.num(k) {
+                s.bleed[i] = v;
+            }
+        }
+        for (i, k) in ["SlugTopOffset", "SlugBottomOffset", "SlugInsideOrLeftOffset", "SlugRightOrOutsideOffset"].iter().enumerate() {
+            if let Some(v) = e.num(k) {
+                s.slug[i] = v;
+            }
+        }
+        if let Some(i) = e.get("Intent") {
+            s.intent = match i {
+                "WebIntent" => designcraft_doc::Intent::Web,
+                "MobileIntent" => designcraft_doc::Intent::Mobile,
+                _ => designcraft_doc::Intent::Print,
+            };
+        }
+        if let Some(v) = e.boolean("CreatePrimaryTextFrame") {
+            s.primary_text_frame = v;
+        }
+        if let Some(v) = e.boolean("ColumnGuideLocked") {
+            s.column_guides_locked = v;
+        }
+    }
+
+    pub(super) fn grid_prefs(&mut self, e: &El) {
+        let s = &mut self.settings;
+        let bg: &mut BaselineGrid = &mut s.baseline_grid;
+        if let Some(v) = e.num("BaselineStart") {
+            bg.start = v;
+        }
+        if let Some(v) = e.num("BaselineDivision") {
+            bg.increment = v;
+        }
+        if let Some(v) = e.num("BaselineViewThreshold") {
+            bg.view_threshold = v / 100.0;
+        }
+        if let Some(v) = e.get("BaselineGridRelativeOption") {
+            bg.relative_to = if v.contains("Margin") { GridRelative::TopMargin } else { GridRelative::TopOfPage };
+        }
+        if let Some(v) = e.num("HorizontalGridlineDivision") {
+            s.grid.horizontal = v;
+        }
+        if let Some(v) = e.num("VerticalGridlineDivision") {
+            s.grid.vertical = v;
+        }
+        if let Some(v) = e.num("HorizontalGridSubdivision") {
+            s.grid.subdivisions = v.max(1.0) as u32;
+        }
+        if let Some(v) = e.boolean("GridsInBack") {
+            s.grid.in_back = v;
+        }
+    }
+
+    /// Index topics (recursively); at the root, their See / See also cross-references too.
+    pub(super) fn index_topics_of(&mut self, e: &El, prefix: &IndexTopic) {
+        for t in e.find_all("Topic") {
+            let topic = prefix.child(t);
+            if let Some(me) = t.get("Self") {
+                self.index_topics.insert(me.to_string(), topic.clone());
+            }
+            self.index_topics_of(t, &topic);
+        }
+        if !prefix.path.is_empty() {
+            return;
+        }
+        let mut stack = vec![(e, IndexTopic::default())];
+        while let Some((el, prefix)) = stack.pop() {
+            for t in el.find_all("Topic") {
+                let topic = prefix.child(t);
+                for x in t.find_all("CrossReference") {
+                    let target = x.get("ReferencedTopic").and_then(|r| self.index_topics.get(r)).map(|t| t.path.join(": ")).unwrap_or_default();
+                    use designcraft_doc::index::IndexRange as R;
+                    let range = match x.get("CrossReferenceType") {
+                        Some("SeeAlso") | Some("SeeAlsoHerein") => R::SeeAlso(target),
+                        _ => R::See(target),
+                    };
+                    self.index_xrefs.push(designcraft_doc::IndexRef { topics: topic.path.clone(), sort: topic.sort.clone(), range });
+                }
+                stack.push((t, topic));
+            }
+        }
+    }
+
+    /// `CrossReferenceFormat`: building blocks back to a format definition.
+    /// A `TextVariable` definition. Types that aren't computed here keep their settings and show
+    /// the result of their first instance.
+    pub(super) fn text_variable(&mut self, e: &El) {
+        use designcraft_doc::vars::{TextVariable, Use, VAR_MAX, VarKind};
+        let ty = e.get("VariableType").unwrap_or("");
+        // Cross-reference internals; export writes its own.
+        if ty.is_empty() || ty.starts_with("Xref") {
+            return;
+        }
+        let vars = self.text_vars.get_or_insert_with(Vec::new);
+        if vars.len() >= VAR_MAX {
+            return;
+        }
+        let pref = e.elements().find(|c| c.local().ends_with("Preference"));
+        let attr = |k: &str| pref.and_then(|p| p.get(k)).unwrap_or("");
+        let date = || Some(attr("Format")).filter(|f| !f.is_empty()).unwrap_or("MM/dd/yy").to_string();
+        let kind = match ty {
+            "CustomTextType" => Some(VarKind::Custom { text: attr("Contents").into() }),
+            "LastPageNumberType" => Some(VarKind::LastPageNumber { section: attr("Scope") == "SectionScope" }),
+            "ChapterNumberType" => Some(VarKind::ChapterNumber),
+            "FileNameType" if attr("IncludePath") != "true" => Some(VarKind::FileName { extension: attr("IncludeExtension") == "true" }),
+            "CreationDateType" => Some(VarKind::CreationDate { format: date() }),
+            "ModificationDateType" => Some(VarKind::ModificationDate { format: date() }),
+            "OutputDateType" => Some(VarKind::OutputDate { format: date() }),
+            "MatchParagraphStyleType" | "MatchCharacterStyleType" => {
+                let character = ty == "MatchCharacterStyleType";
+                let r = attr(if character { "AppliedCharacterStyle" } else { "AppliedParagraphStyle" });
+                let use_ = if attr("SearchStrategy") == "LastOnPage" { Use::LastOnPage } else { Use::FirstOnPage };
+                // Change Case and Delete End Punctuation aren't modelled: the header shows the text as set.
+                (!r.is_empty()).then(|| VarKind::RunningHeader {
+                    style: if character { self.char_style_ref(r) } else { self.para_style_ref(r) },
+                    use_,
+                    character,
+                })
+            }
+            _ => None,
+        };
+        let name = e.get("Name").unwrap_or("").to_string();
+        let v = match kind {
+            Some(kind) => {
+                let mut v = TextVariable::new(&name, kind);
+                v.before = attr("TextBefore").into();
+                v.after = attr("TextAfter").into();
+                v
+            }
+            None => TextVariable::new(
+                &name,
+                VarKind::Imported {
+                    variable_type: ty.into(),
+                    result: String::new(),
+                    settings_element: pref.map(|p| p.name.clone()).unwrap_or_default(),
+                    settings: pref.map(|p| p.attrs.clone()).unwrap_or_default(),
+                },
+            ),
+        };
+        let vars = self.text_vars.get_or_insert_with(Vec::new);
+        if let Some(s) = e.get("Self") {
+            self.text_var_ids.insert(s.to_string(), vars.len());
+        }
+        vars.push(v);
+    }
+
+    /// A `TextVariableInstance`: the variable's character, or its recorded text when the file
+    /// doesn't define the variable.
+    pub(super) fn text_variable_instance(&mut self, e: &El) -> String {
+        use designcraft_doc::vars::{VarKind, var_char};
+        let result = e.get("ResultText").unwrap_or("");
+        let found = e.get("AssociatedTextVariable").and_then(|r| self.text_var_ids.get(r)).copied();
+        let var = found.and_then(|i| Some((i, self.text_vars.as_mut()?.get_mut(i)?)));
+        match var.and_then(|(i, v)| Some((var_char(i)?, v))) {
+            Some((c, v)) => {
+                if let VarKind::Imported { result: r, .. } = &mut v.kind
+                    && r.is_empty()
+                {
+                    *r = result.to_string();
+                }
+                c.to_string()
+            }
+            None => result.to_string(),
+        }
+    }
+
+    pub(super) fn xref_format(&mut self, e: &El) {
+        let name = e.get("Name").unwrap_or("Format").to_string();
+        let mut def = String::new();
+        for b in e.find_all("BuildingBlock") {
+            let text = |k: &str| b.get(k).filter(|v| *v != "$ID/").unwrap_or("").to_string();
+            match b.get("BlockType").unwrap_or("") {
+                "CustomStringBuildingBlock" => def.push_str(&text("CustomText")),
+                "FullParagraphBuildingBlock" => def.push_str("<fullPara />"),
+                "ParagraphTextBuildingBlock" => def.push_str("<paraText />"),
+                "ParagraphNumberBuildingBlock" => def.push_str("<paraNum />"),
+                "PageNumberBuildingBlock" => def.push_str("<pageNum />"),
+                "BookmarkNameBuildingBlock" => def.push_str("<txtAnchrName />"),
+                "ChapterNumberBuildingBlock" => def.push_str("<chapNum />"),
+                "FileNameBuildingBlock" => def.push_str("<fileName />"),
+                "PartialParagraphBuildingBlock" => def.push_str(&format!(
+                    "<partialPara delim=\"{}\" includeDelim=\"{}\" />",
+                    text("AppliedDelimiter"),
+                    b.get("IncludeDelimiter") == Some("true")
+                )),
+                _ => {}
+            }
+        }
+        if let Some(me) = e.get("Self") {
+            self.xref_format_names.insert(me.to_string(), name.clone());
+        }
+        match self.xref_formats.iter_mut().find(|f| f.name == name) {
+            Some(f) => f.definition = def,
+            None => self.xref_formats.push(designcraft_doc::XrefFormat { name, definition: def }),
+        }
+    }
+
+    /// Preferences › `EPubExportPreference`: Split Document (after styles: it can name one). An
+    /// empty style name splits on the styles' export tags; a style the file lacks splits nothing.
+    pub(super) fn epub_split(&mut self, e: &El) {
+        if e.boolean("BreakDocument") != Some(true) {
+            return;
+        }
+        let name = e.get("ParagraphStyleName").unwrap_or("$ID/NormalParagraphStyle");
+        self.settings.epub_split = if name.trim().is_empty() {
+            designcraft_doc::EpubSplit::ExportTags
+        } else {
+            let style = self.para_style_ref(name);
+            if self.styles.para(&style).is_some() { designcraft_doc::EpubSplit::Style(style) } else { designcraft_doc::EpubSplit::Off }
+        };
+    }
+
+    /// Preferences › `FootnoteOption` (after styles: it names the footnote text and marker styles).
+    pub(super) fn footnote_option(&mut self, e: &El) {
+        let mut o = designcraft_doc::FootnoteOptions::default();
+        if let Some(v) = e.num("StartAt") {
+            o.start_at = v.max(0.0) as u32;
+        }
+        o.prefix = e.get("Prefix").unwrap_or("").into();
+        o.suffix = e.get("Suffix").unwrap_or("").into();
+        if let Some(r) = e.get("FootnoteTextStyle") {
+            o.para_style = self.para_style_ref(r);
+        }
+        if let Some(r) = e.get("FootnoteMarkerStyle") {
+            o.ref_char_style = self.char_style_ref(r);
+        }
+        if let Some(v) = e.get("SeparatorText") {
+            o.separator = v.into();
+        }
+        o.space_between = e.num("SpaceBetween").unwrap_or(0.0);
+        o.space_before = e.num("Spacer").unwrap_or(0.0);
+        if let Some(v) = e.prop("FootnoteFirstBaselineOffset") {
+            o.first_baseline = names::first_baseline_in(v.trim());
+        }
+        o.first_baseline_min = e.num("FootnoteMinimumFirstBaselineOffset").unwrap_or(0.0);
+        o.span_columns = e.boolean("EnableStraddling").unwrap_or(false);
+        o.rule.on = e.boolean("RuleOn").unwrap_or(true);
+        o.rule.weight = e.num("RuleLineWeight").unwrap_or(1.0);
+        o.rule.tint = tint(e.num("RuleTint")).unwrap_or(1.0);
+        o.rule.left_indent = e.num("RuleLeftIndent").unwrap_or(0.0);
+        o.rule.width = e.num("RuleWidth").unwrap_or(72.0);
+        o.rule.offset = e.num("RuleOffset").unwrap_or(0.0);
+        if let Some(c) = e.prop("RuleColor") {
+            o.rule.color = self.swatch_ref(c.trim());
+        }
+        if let Some(v) = e.prop("FootnoteNumberingStyle") {
+            o.style = names::note_style_in(v.trim());
+        }
+        if let Some(v) = e.prop("RestartNumbering") {
+            o.restart = names::NOTE_RESTART.iter().find(|r| r.1 == v.trim()).map_or(Default::default(), |r| r.0);
+        }
+        if let Some(v) = e.prop("ShowPrefixSuffix") {
+            o.affix_in = names::NOTE_AFFIX.iter().find(|r| r.1 == v.trim()).map_or(Default::default(), |r| r.0);
+        }
+        if let Some(v) = e.prop("MarkerPositioning") {
+            o.ref_position = names::note_marker_in(v.trim());
+        }
+        self.footnote_options = o;
+    }
+
+    /// The table of contents: the TOC style a story is generated from (`AppliedTOCStyle`), with
+    /// its entries. Styles the document doesn't have fall back to the generated TOC styles.
+    pub(super) fn toc_of(&self, top: &[El]) -> Option<designcraft_doc::Toc> {
+        use designcraft_doc::{TocEntry, TocPageNumber};
+        let (ts, story) = top.iter().filter(|e| e.local() == "TOCStyle").find_map(|ts| {
+            let id = ts.get("Self")?;
+            let story = top.iter().find(|e| e.local() == "Story" && e.get("AppliedTOCStyle") == Some(id))?;
+            Some((ts, *self.story_ids.get(story.get("Self")?)?))
+        })?;
+        let known = |r: Option<&str>| r.map(|r| self.para_style_ref(r)).filter(|n| self.styles.para(n).is_some());
+        // Character styles the document has; [None] is stored as no style.
+        let known_chars = |r: Option<&str>| {
+            r.map(|r| self.char_style_ref(r)).filter(|n| n != designcraft_doc::NO_CHAR_STYLE && self.styles.char_style(n).is_some())
+        };
+        let entries: Vec<TocEntry> = ts
+            .elements()
+            .filter(|e| e.local() == "TOCStyleEntry")
+            .filter_map(|e| {
+                let style = names::style_name_in(PARA_BUILTINS, e.get("Name")?);
+                if style.is_empty() || style.chars().count() > 256 {
+                    return None;
+                }
+                let level = e.get("Level").and_then(|l| l.trim().parse::<u8>().ok()).unwrap_or(1).clamp(1, 9);
+                let page_number = match e.get("PageNumberPosition") {
+                    Some("BeforeEntry") => TocPageNumber::Before,
+                    Some("NoPageNumber") => TocPageNumber::None,
+                    _ => TocPageNumber::After,
+                };
+                let separator = e.get("Separator").map(crate::names::toc_separator_in).filter(|s| s != "\t" && s.chars().count() <= 64);
+                let entry_style = known(e.get("FormatStyle")).filter(|n| *n != format!("TOC Level {level}"));
+                let page_number_style = known_chars(e.get("PageNumberStyle"));
+                let separator_style = known_chars(e.get("SeparatorStyle"));
+                let sort = e.get("Sort").is_some_and(|v| v.trim() == "true");
+                Some(TocEntry { style, level, entry_style, page_number, separator, page_number_style, separator_style, sort })
+            })
+            .take(64)
+            .collect();
+        if entries.is_empty() {
+            return None;
+        }
+        let title: String = ts.get("Title").unwrap_or("").chars().filter(|c| !matches!(c, '\n' | '\r' | '\u{2029}')).take(1024).collect();
+        let title_style = known(ts.get("TitleStyle")).filter(|n| n != "TOC Title");
+        Some(designcraft_doc::Toc { story, title, entries, page_numbers: true, title_style })
+    }
+}
diff --git a/crates/idml/src/import/frame.rs b/crates/idml/src/import/frame.rs
new file mode 100644
index 000000000..396168127
--- /dev/null
+++ b/crates/idml/src/import/frame.rs
@@ -0,0 +1,464 @@
+use super::values::tint;
+use super::{Columns, ColumnsKind, El, Margins, TextFrameOptions, TextWrap, names};
+
+/// Drop-shadow angle (degrees) from IDML offsets (inverse of export's mapping).
+/// A `TextWrapPreference` element (of a page item or a placed graphic).
+pub(super) fn text_wrap(w: &El) -> TextWrap {
+    let mut tw = TextWrap {
+        mode: names::wrap_mode_in(w.get("TextWrapMode").unwrap_or("None")),
+        invert: w.get("Inverse") == Some("true"),
+        side: names::wrap_side_in(w.get("TextWrapSide").unwrap_or("BothSides")),
+        contour: names::contour_type_in(w.find("ContourOption").and_then(|c| c.get("ContourType")).unwrap_or("SameAsClipping")),
+        ..TextWrap::default()
+    };
+    if let Some(o) = w.prop_el("TextWrapOffset") {
+        tw.offsets = [o.num("Top").unwrap_or(0.0), o.num("Left").unwrap_or(0.0), o.num("Bottom").unwrap_or(0.0), o.num("Right").unwrap_or(0.0)];
+    }
+    tw
+}
+
+pub(super) fn margins_of(m: &El) -> (Margins, Columns) {
+    let g = |k: &str, d: f64| m.num(k).filter(|v| v.is_finite()).unwrap_or(d);
+    let margins = Margins { top: g("Top", 36.0), bottom: g("Bottom", 36.0), inside: g("Left", 36.0), outside: g("Right", 36.0) };
+    let count = g("ColumnCount", 1.0).clamp(1.0, f64::from(designcraft_doc::MAX_COLUMNS)) as u32;
+    let gutter = g("ColumnGutter", 12.0);
+    let positions = m.get("ColumnsPositions").and_then(|s| custom_columns(s, count, gutter));
+    (margins, Columns { count, gutter, positions })
+}
+
+/// `ColumnsPositions` when the column guides have been dragged off the even split: `2 × count`
+/// offsets from the margin box's left edge, valid as [`designcraft_doc::valid_column_positions`]
+/// over the box they span. InDesign writes the attribute whether or not they have been moved, so
+/// an even set is dropped: `positions` means "custom", and keeping an even copy would freeze the
+/// columns against a later change of count or gutter. Anything malformed is the even split; at
+/// most one number past `2 × count` is parsed, so a long list costs nothing.
+fn custom_columns(s: &str, count: u32, gutter: f64) -> Option<Vec<f64>> {
+    let want = 2 * count as usize;
+    let pos = s.split_whitespace().take(want + 1).map(|v| v.parse::<f64>().ok()).collect::<Option<Vec<f64>>>()?;
+    let width = *pos.last()?;
+    if !designcraft_doc::valid_column_positions(&pos, count, width) {
+        return None;
+    }
+    let even = Columns { count, gutter, positions: None }.edges(width);
+    // The tolerance only absorbs float noise in InDesign's arithmetic; a dragged guide moves far more.
+    pos.iter().zip(&even).any(|(a, b)| (a - b).abs() > 1e-4).then_some(pos)
+}
+
+/// `columns` with custom positions only when they fit the margin box of a `page_width`-wide page
+/// with these margins (the box's width doesn't depend on which side of the spine it is).
+pub(super) fn fit_columns(mut columns: Columns, margins: &Margins, page_width: f64) -> Columns {
+    let width = (page_width - margins.inside - margins.outside).max(0.0);
+    if columns.valid_positions(width).is_none() {
+        columns.positions = None;
+    }
+    columns
+}
+
+/// A `BaselineFrameGridRelativeOption` value (`TopOfInsetOfBaselineFrameGridRelativeOption`, or a
+/// short form such as `TopOfInset`); unknown values measure from the top of the page.
+pub(super) fn frame_grid_relative(v: &str) -> designcraft_doc::FrameGridRelative {
+    use designcraft_doc::FrameGridRelative as R;
+    let v = v.strip_suffix("OfBaselineFrameGridRelativeOption").unwrap_or(v);
+    match v {
+        "TopOfMargin" | "TopMargin" => R::TopMargin,
+        "TopOfFrame" => R::TopOfFrame,
+        "TopOfInset" | "TopInset" => R::TopInset,
+        _ => R::TopOfPage,
+    }
+}
+
+/// Text Frame Options from `TextFramePreference` elements: each attribute from the first that sets it.
+pub(super) fn text_frame_options(prefs: &[&El]) -> TextFrameOptions {
+    let e = Prefs(prefs);
+    let mut o = TextFrameOptions::default();
+    if let Some(v) = e.num("TextColumnCount") {
+        o.columns = v.clamp(1.0, 216.0) as u32;
+    }
+    if let Some(v) = e.num("TextColumnGutter") {
+        o.gutter = v;
+    }
+    o.columns_kind = if e.prop("UseFixedColumnWidth").as_deref().map(str::trim) == Some("true") {
+        ColumnsKind::FixedWidth
+    } else if e.prop("UseFlexibleColumnWidth").as_deref().map(str::trim) == Some("true") {
+        ColumnsKind::FlexibleWidth
+    } else {
+        ColumnsKind::FixedNumber
+    };
+    if o.columns_kind != ColumnsKind::FixedNumber
+        && let Some(v) = e.num("TextColumnFixedWidth")
+    {
+        o.column_width = v;
+    }
+    o.balance_columns = e.prop("VerticalBalanceColumns").as_deref().map(str::trim) == Some("true");
+    if let Some(p) = prefs.iter().find(|p| p.prop("InsetSpacing").is_some())
+        && let Some(inset) = inset_spacing(p)
+    {
+        o.inset = inset;
+    }
+    if let Some(v) = e.prop("VerticalJustification") {
+        o.vertical_justification = names::vj_in(v.trim());
+    }
+    if let Some(v) = e.num("VerticalThreshold") {
+        o.vj_paragraph_spacing_limit = v;
+    }
+    if let Some(v) = e.prop("FirstBaselineOffset") {
+        o.first_baseline = names::first_baseline_in(v.trim());
+    }
+    if let Some(v) = e.num("MinimumFirstBaselineOffset") {
+        o.first_baseline_min = v;
+    }
+    o.ignore_wrap = e.prop("IgnoreWrap").as_deref().map(str::trim) == Some("true");
+    if let Some(v) = e.prop("AutoSizingType") {
+        o.auto_size = names::auto_size_in(v.trim());
+    }
+    if let Some(v) = e.prop("AutoSizingReferencePoint") {
+        o.auto_size_ref = names::REF_POINTS.iter().position(|p| *p == v.trim()).unwrap_or(1) as u8;
+    }
+    let size = |k: &str| e.num(k).filter(|v| v.is_finite()).map(|v| v.clamp(0.0, 10_000.0));
+    o.auto_size_use_min_height = e.prop("UseMinimumHeightForAutoSizing").as_deref().map(str::trim) == Some("true");
+    o.auto_size_min_height = size("MinimumHeightForAutoSizing").unwrap_or(0.0);
+    o.auto_size_use_min_width = e.prop("UseMinimumWidthForAutoSizing").as_deref().map(str::trim) == Some("true");
+    o.auto_size_min_width = size("MinimumWidthForAutoSizing").unwrap_or(0.0);
+    o.auto_size_no_line_breaks = e.prop("UseNoLineBreaksForAutoSizing").as_deref().map(str::trim) == Some("true");
+    // Column rules (the colour is a swatch reference: see `Importer::frame_options`).
+    o.column_rule = e.prop("ColumnRuleOverride").as_deref().map(str::trim) == Some("true");
+    let finite = |k: &str| e.num(k).filter(|v| v.is_finite());
+    if let Some(v) = finite("ColumnRuleStrokeWidth") {
+        o.column_rule_weight = v.clamp(0.0, 1000.0);
+    }
+    if let Some(t) = tint(finite("ColumnRuleStrokeTint")) {
+        o.column_rule_tint = t.clamp(0.0, 1.0);
+    }
+    for (k, v) in [
+        ("ColumnRuleOffset", &mut o.column_rule_offset),
+        ("ColumnRuleTopInset", &mut o.column_rule_top_inset),
+        ("ColumnRuleBottomInset", &mut o.column_rule_bottom_inset),
+    ] {
+        if let Some(x) = finite(k) {
+            *v = x.clamp(-1440.0, 1440.0);
+        }
+    }
+    o
+}
+
+/// Property lookup over preference levels: the nearest level wins, attributes before children.
+pub(super) struct Prefs<'a>(pub(super) &'a [&'a El]);
+
+impl Prefs<'_> {
+    pub(super) fn prop(&self, k: &str) -> Option<String> {
+        self.0.iter().find_map(|e| e.prop(k))
+    }
+    fn num(&self, k: &str) -> Option<f64> {
+        // The nearest preference wins; within it, attributes precede property children.
+        self.prop(k).and_then(|v| v.trim().parse::<f64>().ok()).filter(|v| v.is_finite())
+    }
+}
+
+/// A scalar applies to every edge; a list is top, left, bottom, right. Keep the
+/// existing property-element precedence over the legacy scalar attribute, even
+/// when the property is malformed. Finite negative insets remain supported.
+fn inset_spacing(e: &El) -> Option<[f64; 4]> {
+    let number = |s: &str| s.trim().parse::<f64>().ok().filter(|v| v.is_finite());
+    let Some(property) = e.prop_el("InsetSpacing") else {
+        return e.get("InsetSpacing").and_then(number).map(|v| [v; 4]);
+    };
+    let mut items = property.elements();
+    if property.get("type") == Some("list") || property.find("ListItem").is_some() {
+        let mut inset = [0.0; 4];
+        for edge in &mut inset {
+            let item = items.next()?;
+            if item.local() != "ListItem" || item.elements().next().is_some() {
+                return None;
+            }
+            *edge = number(&item.text_content())?;
+        }
+        items.next().is_none().then_some(inset)
+    } else if items.next().is_none() {
+        number(&property.text_content()).map(|v| [v; 4])
+    } else {
+        None
+    }
+}
+
+#[cfg(test)]
+mod numeric_property_tests {
+    use super::*;
+
+    fn pref(attrs: &[(&str, &str)], props: &[(&str, &str)]) -> El {
+        let mut e = El::new("TextFramePreference");
+        for (key, value) in attrs {
+            e.set(key, *value);
+        }
+        let mut p = El::new("Properties");
+        for (key, value) in props {
+            p.push(El::new(key).text(*value));
+        }
+        e.push(p);
+        e
+    }
+
+    #[test]
+    fn numeric_property_forms_import_every_frame_option() {
+        let local = pref(
+            &[("UseFixedColumnWidth", "true")],
+            &[
+                ("TextColumnCount", "3"),
+                ("TextColumnGutter", "17"),
+                ("TextColumnFixedWidth", "123"),
+                ("VerticalThreshold", "19"),
+                ("MinimumFirstBaselineOffset", "8"),
+                ("ColumnRuleStrokeWidth", "2"),
+                ("ColumnRuleStrokeTint", "25"),
+                ("ColumnRuleOffset", "3"),
+                ("ColumnRuleTopInset", "4"),
+                ("ColumnRuleBottomInset", "5"),
+            ],
+        );
+        let o = text_frame_options(&[&local]);
+        assert_eq!((o.columns, o.gutter, o.column_width), (3, 17., 123.));
+        assert_eq!((o.vj_paragraph_spacing_limit, o.first_baseline_min), (19., 8.));
+        assert_eq!(
+            (o.column_rule_weight, o.column_rule_tint, o.column_rule_offset, o.column_rule_top_inset, o.column_rule_bottom_inset),
+            (2., 0.25, 3., 4., 5.)
+        );
+    }
+
+    #[test]
+    fn numeric_property_precedence_is_nearest_level_then_attribute() {
+        let local = pref(&[("TextColumnCount", "4")], &[("TextColumnCount", "5"), ("TextColumnGutter", "17")]);
+        let child = pref(
+            &[("TextColumnGutter", "90"), ("MinimumFirstBaselineOffset", "8")],
+            &[("MinimumFirstBaselineOffset", "9"), ("VerticalThreshold", "19")],
+        );
+        let base = pref(&[("VerticalThreshold", "99")], &[("ColumnRuleStrokeWidth", "2")]);
+        let o = text_frame_options(&[&local, &child, &base]);
+        assert_eq!((o.columns, o.gutter, o.first_baseline_min, o.vj_paragraph_spacing_limit, o.column_rule_weight), (4, 17., 8., 19., 2.));
+        // An explicit invalid value still masks inherited values, as attribute lookup did.
+        let invalid = pref(&[("TextColumnCount", "bad")], &[("TextColumnCount", "6")]);
+        assert_eq!(text_frame_options(&[&invalid, &local]).columns, TextFrameOptions::default().columns);
+    }
+}
+
+#[cfg(test)]
+mod frame_preference_safety_tests {
+    use super::*;
+
+    fn pref(attrs: &[(&str, &str)], props: &[(&str, &str)]) -> El {
+        let mut e = El::new("TextFramePreference");
+        for (key, value) in attrs {
+            e.set(key, *value);
+        }
+        let mut p = El::new("Properties");
+        for (key, value) in props {
+            p.push(El::new(key).text(*value));
+        }
+        e.push(p);
+        e
+    }
+
+    #[test]
+    fn frame_preference_nonfinite_numbers_keep_finite_defaults() {
+        const KEYS: [&str; 10] = [
+            "TextColumnCount",
+            "TextColumnGutter",
+            "TextColumnFixedWidth",
+            "VerticalThreshold",
+            "MinimumFirstBaselineOffset",
+            "ColumnRuleStrokeWidth",
+            "ColumnRuleStrokeTint",
+            "ColumnRuleOffset",
+            "ColumnRuleTopInset",
+            "ColumnRuleBottomInset",
+        ];
+        let fallback = pref(&[("UseFixedColumnWidth", "true")], &[]);
+        let expected = text_frame_options(&[&fallback]);
+        for value in ["NaN", "inf", "-inf", "1e309"] {
+            for attribute in [true, false] {
+                let values: Vec<_> = KEYS.iter().map(|key| (*key, value)).collect();
+                let mut invalid = if attribute { pref(&values, &[]) } else { pref(&[], &values) };
+                invalid.set("UseFixedColumnWidth", "true");
+                let inherited = pref(&[], &[("TextColumnCount", "7"), ("TextColumnGutter", "9")]);
+                assert_eq!(text_frame_options(&[&invalid, &inherited]), expected, "{value}, attribute={attribute}");
+            }
+        }
+    }
+
+    #[test]
+    fn frame_preference_property_booleans_enums_and_precedence() {
+        let base = pref(
+            &[
+                ("UseFixedColumnWidth", "true"),
+                ("UseFlexibleColumnWidth", "false"),
+                ("VerticalBalanceColumns", "false"),
+                ("IgnoreWrap", "false"),
+                ("ColumnRuleOverride", "false"),
+                ("VerticalJustification", "TopAlign"),
+                ("FirstBaselineOffset", "AscentOffset"),
+                ("AutoSizingType", "Off"),
+                ("AutoSizingReferencePoint", "TopCenterPoint"),
+            ],
+            &[],
+        );
+        let local = pref(
+            &[],
+            &[
+                ("UseFixedColumnWidth", "false"),
+                ("UseFlexibleColumnWidth", "true"),
+                ("VerticalBalanceColumns", "true"),
+                ("IgnoreWrap", "true"),
+                ("ColumnRuleOverride", "true"),
+                ("VerticalJustification", "BottomAlign"),
+                ("FirstBaselineOffset", "FixedHeight"),
+                ("AutoSizingType", "HeightAndWidth"),
+                ("AutoSizingReferencePoint", "BottomRightPoint"),
+            ],
+        );
+        let o = text_frame_options(&[&local, &base]);
+        assert_eq!(o.columns_kind, ColumnsKind::FlexibleWidth);
+        assert!(o.balance_columns && o.ignore_wrap && o.column_rule);
+        assert_eq!(o.vertical_justification, designcraft_doc::VerticalJustification::Bottom);
+        assert_eq!(o.first_baseline, designcraft_doc::FirstBaseline::Fixed);
+        assert_eq!(o.auto_size, designcraft_doc::AutoSize::HeightAndWidth);
+        assert_eq!(o.auto_size_ref, 8);
+        let fixed = pref(&[], &[("UseFixedColumnWidth", "true")]);
+        assert_eq!(text_frame_options(&[&fixed, &local, &base]).columns_kind, ColumnsKind::FixedWidth);
+        // At one level an attribute wins over a conflicting property child, for every key.
+        let mut same_level = local.clone();
+        for (key, value) in &base.attrs {
+            same_level.set(key, value);
+        }
+        assert_eq!(text_frame_options(&[&same_level, &local]), text_frame_options(&[&base]));
+        // Malformed nearer values mask ancestors and use the normal per-field fallback.
+        let mut malformed = El::new("TextFramePreference");
+        for (key, _) in &base.attrs {
+            malformed.set(key, "invalid");
+        }
+        assert_eq!(text_frame_options(&[&malformed, &local]), TextFrameOptions { auto_size_ref: 1, ..Default::default() });
+    }
+}
+
+#[cfg(test)]
+mod page_column_import_safety_tests {
+    use super::*;
+
+    #[test]
+    fn frame_preference_page_columns_are_bounded_and_finite() {
+        for (raw, expected) in [("4000000000", 216), ("1e300", 216), ("-10", 1), ("NaN", 1), ("inf", 1)] {
+            let m = El::new("MarginPreference")
+                .attr("ColumnCount", raw)
+                .attr("ColumnGutter", "NaN")
+                .attr("Top", "inf")
+                .attr("Bottom", "-inf")
+                .attr("Left", "NaN")
+                .attr("Right", "1e309");
+            let (margins, columns) = margins_of(&m);
+            assert_eq!(columns.count, expected);
+            assert_eq!(columns.gutter, 12.);
+            assert_eq!(margins, Margins::uniform(36.));
+        }
+    }
+
+    /// Hostile `ColumnsPositions` are the even split: never half-read, never a panic, and a long
+    /// list is not parsed past what `ColumnCount` allows (#1096).
+    #[test]
+    fn hostile_column_positions_fall_back_to_the_even_split() {
+        let positions = |count: &str, raw: &str| {
+            let m = El::new("MarginPreference").attr("ColumnCount", count).attr("ColumnGutter", "20").attr("ColumnsPositions", raw);
+            margins_of(&m).1.positions
+        };
+        assert_eq!(positions("2", "0 150 170 450"), Some(vec![0., 150., 170., 450.]));
+        let huge = (0..10_000).map(|i| i.to_string()).collect::<Vec<_>>().join(" ");
+        for (count, raw) in [
+            ("2", "0 215 235 450"),         // the even split
+            ("2", "0 150 170"),             // odd
+            ("2", "0 450"),                 // too few for the count
+            ("2", "0 100 120 200 220 450"), // too many for the count
+            ("2", "0 150 90 450"),          // descending
+            ("2", "0 NaN 170 450"),
+            ("2", "0 inf 170 450"),
+            ("2", "0 150 170 1e309"),
+            ("2", "0 x 170 450"),
+            ("2", "10 150 170 450"), // not from the margin
+            ("2", ""),
+            ("2", huge.as_str()),
+            ("4000000000", huge.as_str()), // the count is capped at 216, so is the list
+            ("216", huge.as_str()),
+            ("NaN", "0 150 170 450"),
+        ] {
+            assert_eq!(positions(count, raw), None, "{count}: {}", raw.get(..raw.len().min(40)).unwrap_or(""));
+        }
+        // The cap itself: 216 one-point columns with no gutter are the even split; one edge moved
+        // makes them custom.
+        let gapless = |raw: &str| {
+            let m = El::new("MarginPreference").attr("ColumnCount", "216").attr("ColumnGutter", "0").attr("ColumnsPositions", raw);
+            margins_of(&m).1.positions
+        };
+        let edges = |first_right: &str| {
+            (0..432).map(|i| if i == 1 { first_right.to_string() } else { ((i + 1) / 2).to_string() }).collect::<Vec<_>>().join(" ")
+        };
+        assert_eq!(gapless(&edges("1")), None);
+        assert_eq!(gapless(&edges("0.5")).map(|p| p.len()), Some(432));
+    }
+}
+
+#[cfg(test)]
+mod frame_preference_scalar_tests {
+    use super::*;
+
+    #[test]
+    fn frame_preference_scalar_whitespace() {
+        let values = [
+            ("UseFixedColumnWidth", "true"),
+            ("UseFlexibleColumnWidth", "false"),
+            ("VerticalBalanceColumns", "true"),
+            ("IgnoreWrap", "true"),
+            ("ColumnRuleOverride", "true"),
+            ("VerticalJustification", "BottomAlign"),
+            ("FirstBaselineOffset", "FixedHeight"),
+            ("AutoSizingType", "HeightAndWidth"),
+            ("AutoSizingReferencePoint", "BottomRightPoint"),
+        ];
+        let preference = |properties: bool, padded: bool, fixed: bool| {
+            let mut e = El::new("TextFramePreference");
+            let mut props = El::new("Properties");
+            for (key, raw) in values {
+                let raw = match key {
+                    "UseFixedColumnWidth" if !fixed => "false",
+                    "UseFlexibleColumnWidth" if !fixed => "true",
+                    _ => raw,
+                };
+                let value = if padded { format!("\n  {raw}\t ") } else { raw.to_string() };
+                if properties {
+                    props.push(El::new(key).text(value));
+                } else {
+                    e.set(key, value);
+                }
+            }
+            e.push(props);
+            e
+        };
+        for fixed in [false, true] {
+            let clean = preference(false, false, fixed);
+            let expected = text_frame_options(&[&clean]);
+            assert_eq!(expected.columns_kind, if fixed { ColumnsKind::FixedWidth } else { ColumnsKind::FlexibleWidth });
+            assert!(expected.balance_columns && expected.ignore_wrap && expected.column_rule);
+            assert_eq!(expected.vertical_justification, designcraft_doc::VerticalJustification::Bottom);
+            assert_eq!(expected.first_baseline, designcraft_doc::FirstBaseline::Fixed);
+            assert_eq!(expected.auto_size, designcraft_doc::AutoSize::HeightAndWidth);
+            assert_eq!(expected.auto_size_ref, 8);
+            for properties in [false, true] {
+                let padded = preference(properties, true, fixed);
+                assert_eq!(text_frame_options(&[&padded]), expected);
+            }
+            // A malformed nearest attribute masks both its own valid child and farther values.
+            let mut invalid = preference(true, true, fixed);
+            for (key, _) in values {
+                invalid.set(key, " invalid ");
+            }
+            assert_eq!(text_frame_options(&[&invalid, &clean]), TextFrameOptions { auto_size_ref: 1, ..Default::default() });
+        }
+        // Object identities use the raw property lookup, not scalar whitespace normalization.
+        let exact = El::new("TextFramePreference").child(El::new("Properties").child(El::new("ColumnRuleStrokeColor").text(" Color/Named ")));
+        assert_eq!(Prefs(&[&exact]).prop("ColumnRuleStrokeColor").as_deref(), Some(" Color/Named "));
+    }
+}
diff --git a/crates/idml/src/import/item.rs b/crates/idml/src/import/item.rs
new file mode 100644
index 000000000..d25044dc6
--- /dev/null
+++ b/crates/idml/src/import/item.rs
@@ -0,0 +1,507 @@
+use super::frame::{Prefs, frame_grid_relative, text_frame_options, text_wrap};
+use super::object_style::INDESIGN_CORNER_SIZE;
+use super::package::uri_to_path;
+use super::values::{nums, parse_affine, parse_point, tint};
+use super::{
+    Affine, Anchor, Arc, Asset, AssetId, Content, Corner, CornerOptions, El, Fill, Importer, Item, ItemId, OBJECT_BUILTINS, PathData, Point, Shape,
+    Story, StoryId, Stroke, SubPath, TextFrame, TextFrameOptions, base64_decode, names, sniff_image, swatch, unescape_id,
+};
+
+/// The viewBox size of an SVG whose root has a viewBox but no width/height (percentages count as
+/// none): InDesign places such a file at one viewBox unit to the point.
+fn svg_viewbox_size(data: &[u8]) -> Option<(f64, f64)> {
+    use quick_xml::events::Event;
+    if data.iter().find(|b| !b.is_ascii_whitespace()) != Some(&b'<') {
+        return None;
+    }
+    let mut r = quick_xml::Reader::from_reader(data);
+    let mut buf = Vec::new();
+    let root = loop {
+        match r.read_event_into(&mut buf).ok()? {
+            Event::Start(e) | Event::Empty(e) => break e.into_owned(),
+            Event::Eof => return None,
+            _ => buf.clear(),
+        }
+    };
+    if root.local_name().as_ref() != b"svg" {
+        return None;
+    }
+    let attr = |name: &[u8]| {
+        root.attributes()
+            .with_checks(false)
+            .flatten()
+            .find(|a| a.key.as_ref() == name)
+            .and_then(|a| a.normalized_value(quick_xml::XmlVersion::Implicit1_0).ok().map(|v| v.to_string()))
+    };
+    let absolute = |name: &[u8]| attr(name).is_some_and(|v| !v.trim().ends_with('%'));
+    if absolute(b"width") || absolute(b"height") {
+        return None;
+    }
+    let vb: Vec<f64> =
+        attr(b"viewBox")?.split(|c: char| c.is_whitespace() || c == ',').filter(|v| !v.is_empty()).filter_map(|v| v.parse().ok()).collect();
+    match vb[..] {
+        [_, _, w, h] if w.is_finite() && h.is_finite() && w > 0.0 && h > 0.0 => Some((w, h)),
+        _ => None,
+    }
+}
+
+impl<'r> Importer<'r> {
+    pub(super) fn item(&mut self, e: &El, parent: Affine) -> Option<Item> {
+        let tag = e.local();
+        let shape = match tag {
+            "Rectangle" | "TextFrame" => Shape::Rectangle,
+            "Oval" => Shape::Oval,
+            "Polygon" => Shape::Polygon,
+            "GraphicLine" => Shape::GraphicLine,
+            "Group" => Shape::Group,
+            _ => return None,
+        };
+        let id = ItemId(self.alloc());
+        if let Some(s) = e.get("Self") {
+            self.item_ids.insert(s.to_string(), id);
+        }
+        let layer = e.get("ItemLayer").and_then(|l| self.layer_ids.get(l)).copied().unwrap_or_else(|| self.layers[0].id);
+        let path = e.prop_el("PathGeometry").map(path_of).unwrap_or_default();
+        let mut it = Item::new(id, layer, shape, path);
+        it.xf = parent * parse_affine(e.get("ItemTransform"));
+        it.name = e.get("Name").filter(|n| *n != "$ID/").unwrap_or("").to_string();
+        it.locked = e.get("Locked") == Some("true");
+        it.hidden = e.get("Visible") == Some("false");
+        it.overrides = e.get("OverriddenPageItem").and_then(|s| self.item_ids.get(s)).copied().filter(|i| self.is_parent_item(*i));
+        it.nonprinting = e.get("Nonprinting") == Some("true");
+        it.object_style = e
+            .get("AppliedObjectStyle")
+            .map(|r| {
+                self.object_names
+                    .get(r)
+                    .cloned()
+                    .unwrap_or_else(|| names::style_name_in(OBJECT_BUILTINS, &unescape_id(r.trim_start_matches("ObjectStyle/"))))
+            })
+            .unwrap_or_else(|| designcraft_doc::NO_OBJECT_STYLE.into());
+        // Fill and stroke.
+        if tag != "Group" {
+            if let Some(f) = self.attr_or_style(e, "FillColor") {
+                it.fill.swatch = self.swatch_ref(&f);
+            }
+            if let Some(t) = self.attr_or_style(e, "FillTint").and_then(|v| v.parse().ok()) {
+                it.fill.tint = tint(Some(t)).unwrap_or(1.0);
+            }
+            it.fill.overprint = self.attr_or_style(e, "OverprintFill").as_deref() == Some("true");
+            if let Some(a) = e.num("GradientFillAngle")
+                && a != 0.0
+            {
+                it.fill.gradient_angle = Some(a);
+            }
+            let start: Option<Vec<f64>> = e.prop("GradientFillStart").map(|s| nums(&s));
+            if let (Some([x, y]), Some(len)) = (start.as_deref().and_then(|v| <[f64; 2]>::try_from(v).ok()), e.num("GradientFillLength"))
+                && len > 0.0
+            {
+                let a = e.num("GradientFillAngle").unwrap_or(0.0).to_radians();
+                it.fill.gradient_vector = Some([x, y, x + len * a.cos(), y - len * a.sin()]);
+            }
+            it.stroke = self.stroke_from(e, Some(e));
+            if it.stroke.weight <= 0.0 {
+                it.stroke.swatch = swatch::NONE.into();
+                it.stroke.weight = 1.0;
+            }
+            // A gradient on the stroke: its angle, or the Gradient Swatch tool's vector.
+            if let Some(a) = e.num("GradientStrokeAngle")
+                && a != 0.0
+            {
+                it.stroke.gradient_angle = Some(a);
+            }
+            let start: Option<Vec<f64>> = e.prop("GradientStrokeStart").map(|s| nums(&s));
+            if let (Some([x, y]), Some(len)) = (start.as_deref().and_then(|v| <[f64; 2]>::try_from(v).ok()), e.num("GradientStrokeLength"))
+                && len > 0.0
+            {
+                let a = e.num("GradientStrokeAngle").unwrap_or(0.0).to_radians();
+                it.stroke.gradient_vector = Some([x, y, x + len * a.cos(), y - len * a.sin()]);
+            }
+        }
+        // Corners: each corner's shape and radius come from the item, then its object style chain;
+        // at each level a per-corner attribute wins over the legacy all-corners one.
+        if tag != "Group" {
+            let levels: Vec<&El> = std::iter::once(e).chain(self.object_style_chain(e)).collect();
+            let corner =
+                |n: &str, what: &str| levels.iter().find_map(|s| s.get(&format!("{n}Corner{what}")).or_else(|| s.get(&format!("Corner{what}"))));
+            let mut corners = CornerOptions::default();
+            for (i, n) in crate::export::corner_names(&it.path).iter().enumerate() {
+                let shape = corner(n, "Option").map(names::corner_in).unwrap_or_default();
+                let size = corner(n, "Radius").and_then(|v| v.trim().parse::<f64>().ok()).filter(|v| v.is_finite()).unwrap_or(INDESIGN_CORNER_SIZE);
+                corners.corners[i] = Corner { shape, size };
+            }
+            if !corners.is_none() {
+                it.corners = corners;
+            }
+        }
+        // Transparency.
+        if let Some(t) = self.with_style(e, "TransparencySetting") {
+            if let Some(bs) = t.find("BlendingSetting") {
+                if let Some(o) = bs.num("Opacity") {
+                    it.opacity = (o / 100.0).clamp(0.0, 1.0) as f32;
+                }
+                if let Some(m) = bs.get("BlendMode") {
+                    it.blend = names::blend_in(m);
+                }
+            }
+            self.effects_in(&t, &mut it.effects);
+        }
+        // Text wrap.
+        if let Some(w) = self.with_style(e, "TextWrapPreference") {
+            let mut tw = text_wrap(&w);
+            if let Some(pg) = w.prop_el("PathGeometry") {
+                match wrap_path_of(pg) {
+                    Ok(p) => tw.path = Some(p),
+                    Err(why) => log::warn!("IDML: custom text wrap boundary of {} dropped: {why}", e.get("Self").unwrap_or("an item")),
+                }
+            }
+            it.wrap = tw;
+        }
+        // Type on a path.
+        if tag != "TextFrame"
+            && let Some(tp) = e.find("TextPath")
+        {
+            let story_self = tp.get("ParentStory").unwrap_or("n").to_string();
+            if let Some(story) = self.story_ids.get(&story_self).copied() {
+                let options = TextFrameOptions {
+                    path: Some(designcraft_doc::PathType {
+                        start: tp.num("StartBracket").unwrap_or(0.0).max(0.0),
+                        // At (or past) the path's length it is the path's end: no end bracket.
+                        end: tp
+                            .num("EndBracket")
+                            .filter(|e| e.is_finite() && *e >= 0.0)
+                            .filter(|e| *e < designcraft_geom::warp::PathWarp::new(&it.path.to_bezpath(), false).length() - 0.01),
+                        flip: tp.get("FlipPathEffect") == Some("Flipped"),
+                        align: names::path_align_in(tp.get("TextAlignment").unwrap_or("")),
+                    }),
+                    ..Default::default()
+                };
+                it.content = Content::Text(TextFrame { story, options });
+                self.ctx.threads.push((id, story_self, "n".into(), "n".into()));
+            }
+        }
+        self.read_content(e, tag, id, &mut it);
+        Some(it)
+    }
+
+    fn read_content(&mut self, e: &El, tag: &str, id: ItemId, item: &mut Item) {
+        match tag {
+            "TextFrame" => {
+                let story_self = e.get("ParentStory").unwrap_or("n").to_string();
+                let story = match self.story_ids.get(&story_self) {
+                    Some(s) => *s,
+                    None => {
+                        let sid = StoryId(self.alloc());
+                        self.stories.insert(sid, Story::new(sid));
+                        self.story_ids.insert(format!("#orphan{}", sid.0), sid);
+                        sid
+                    }
+                };
+                // Options the frame doesn't set come from its object style chain.
+                let prefs: Vec<&El> = std::iter::once(e).chain(self.object_style_chain(e)).filter_map(|s| s.find("TextFramePreference")).collect();
+                let mut options = text_frame_options(&prefs);
+                // `prefs` borrows the object styles, so the rule colour's swatch is resolved after it.
+                if let Some(r) = Prefs(&prefs).prop("ColumnRuleStrokeColor") {
+                    options.column_rule_color = self.swatch_ref(&r);
+                }
+                if let Some(g) = self.with_style(e, "BaselineFrameGridOption")
+                    && g.get("UseCustomBaselineFrameGrid") == Some("true")
+                {
+                    options.baseline_grid = Some(designcraft_doc::FrameBaselineGrid {
+                        start: g.num("StartingOffsetForBaselineFrameGrid").unwrap_or(0.0),
+                        increment: g.num("BaselineFrameGridIncrement").unwrap_or(12.0),
+                        relative_to: g.get("BaselineFrameGridRelativeOption").map(frame_grid_relative).unwrap_or_default(),
+                    });
+                }
+                item.content = Content::Text(TextFrame { story, options });
+                self.ctx.threads.push((
+                    id,
+                    story_self,
+                    e.get("PreviousTextFrame").unwrap_or("n").to_string(),
+                    e.get("NextTextFrame").unwrap_or("n").to_string(),
+                ));
+            }
+            "Group" => {
+                let mut kids = Vec::new();
+                for c in e.elements() {
+                    if let Some(k) = self.item(c, Affine::IDENTITY) {
+                        kids.push(Arc::new(k));
+                    }
+                }
+                item.content = Content::Group { items: kids };
+                item.fill = Fill::none();
+                item.stroke = Stroke::none();
+            }
+            _ => {
+                if let Some(g) = e.elements().find(|c| matches!(c.local(), "Image" | "PDF" | "EPS" | "ImportedPage" | "WMF" | "PICT" | "SVG")) {
+                    item.content = self.graphic(g);
+                    let fill = self.image_fill(g);
+                    if let Content::Graphic(gr) = &mut item.content {
+                        gr.fill = fill;
+                    }
+                    if let (Some(ff), Content::Graphic(gr)) = (self.with_style(e, "FrameFittingOption"), &mut item.content) {
+                        gr.crop = [ff.num("TopCrop"), ff.num("LeftCrop"), ff.num("BottomCrop"), ff.num("RightCrop")].map(|v| v.unwrap_or(0.0));
+                        gr.fit_align = ff.get("FittingAlignment").map_or(4, names::anchor_in);
+                        if ff.get("AutoFit") == Some("true") {
+                            gr.auto_fit = ff.get("FittingOnEmptyFrame").map_or(designcraft_doc::Fitting::FillProportionally, names::fitting_in);
+                            if gr.auto_fit == designcraft_doc::Fitting::None {
+                                gr.auto_fit = designcraft_doc::Fitting::FillProportionally;
+                            }
+                        }
+                    }
+                } else {
+                    // Page items pasted into this frame (Paste Into).
+                    let kids: Vec<Arc<Item>> = e
+                        .elements()
+                        .filter(|c| matches!(c.local(), "Rectangle" | "Oval" | "Polygon" | "GraphicLine" | "Group" | "TextFrame"))
+                        .filter_map(|c| self.item(c, Affine::IDENTITY))
+                        .map(Arc::new)
+                        .collect();
+                    if !kids.is_empty() {
+                        item.content = Content::Group { items: kids };
+                    }
+                }
+            }
+        }
+    }
+
+    /// The swatch applied to a placed image (`FillColor`, `FillTint`): it colours a greyscale or
+    /// bitmap image. Black at 100% is how InDesign writes an image nobody coloured: no swatch.
+    fn image_fill(&mut self, g: &El) -> Fill {
+        let Some(r) = g.get("FillColor") else { return Fill::none() };
+        let swatch = self.swatch_ref(r);
+        let tint = tint(g.num("FillTint")).unwrap_or(1.0);
+        if swatch == swatch::BLACK && tint >= 1.0 {
+            return Fill::none();
+        }
+        Fill { swatch, tint, ..Fill::none() }
+    }
+
+    fn graphic(&mut self, g: &El) -> Content {
+        let layer_options = g.find("GraphicLayerOption").map(|options| {
+            let attrs = |e: &El| e.attrs.iter().filter(|(key, _)| key != "Self").cloned().collect();
+            let mut out = designcraft_doc::GraphicLayerOptions { attributes: attrs(options), ..Default::default() };
+            let mut pending: Vec<_> = options.find_all("GraphicLayer").map(|e| (e, None)).collect();
+            pending.reverse();
+            while let Some((layer, parent)) = pending.pop() {
+                let index = out.layers.len();
+                out.layers.push(attrs(layer));
+                out.parents.push(parent);
+                let children: Vec<_> = layer.find_all("GraphicLayer").collect();
+                pending.extend(children.into_iter().rev().map(|e| (e, Some(index))));
+            }
+            if out.parents.iter().all(Option::is_none) {
+                out.parents.clear();
+            }
+            out
+        });
+        if layer_options.as_ref().is_some_and(designcraft_doc::GraphicLayerOptions::has_visibility_overrides) {
+            self.warnings.push(format!("graphic {}: {}", g.get("Self").unwrap_or("(unnamed)"), designcraft_doc::GRAPHIC_LAYER_RENDERING_WARNING));
+        }
+        let gxf = parse_affine(g.get("ItemTransform"));
+        let (l, t, r, b) = match g.prop_el("GraphicBounds") {
+            Some(gb) => {
+                (gb.num("Left").unwrap_or(0.0), gb.num("Top").unwrap_or(0.0), gb.num("Right").unwrap_or(0.0), gb.num("Bottom").unwrap_or(0.0))
+            }
+            None => (0.0, 0.0, 0.0, 0.0),
+        };
+        let size = ((r - l).abs(), (b - t).abs());
+        let wrap =
+            if g.get("AppliedObjectStyle").is_some() { self.with_style(g, "TextWrapPreference") } else { g.find("TextWrapPreference").cloned() };
+        let wrap = wrap.map(|w| text_wrap(&w)).unwrap_or_default();
+        let clip = clipping_path(g, Affine::translate((-l, -t)));
+        let link = g.find("Link");
+        let uri = link.and_then(|k| k.get("LinkResourceURI")).map(uri_to_path);
+        let graphic = |asset, size| {
+            Content::Graphic(designcraft_doc::Graphic {
+                layer_options: layer_options.clone(),
+                asset,
+                size,
+                xf: gxf * Affine::translate((l, t)),
+                clip: clip.clone(),
+                auto_fit: Default::default(),
+                fit_align: 4,
+                crop: [0.0; 4],
+                // A wrap set on the placed graphic (Direct Selection) is stored on the graphic element,
+                // over the graphic's own object style when it names one.
+                wrap,
+                fill: Default::default(),
+            })
+        };
+        let mut data = g.prop_el("Contents").map(|c| base64_decode(&c.text_content())).unwrap_or_default();
+        let page = pdf_page_in(g);
+        // Where the box sits on the page needs the PDF parsed: the engine finds it after import.
+        let pdf_crop = pdf_attribute(g).and_then(|a| a.get("PDFCrop")).map_or(designcraft_doc::PdfCrop::Crop, names::pdf_crop_in);
+        let mut read_from = None;
+        if data.is_empty()
+            && let Some(p) = &uri
+        {
+            // Every placement of a linked file with one page and crop shares one asset; read the
+            // file once.
+            let key = (p.clone(), page, pdf_crop);
+            if let Some(id) = self.linked_assets.get(&key) {
+                let size = self.assets.get(id).and_then(|a| svg_viewbox_size(&a.data)).unwrap_or(size);
+                return graphic(*id, size);
+            }
+            if let Some(d) = (self.read_link)(p) {
+                data = d;
+                read_from = Some(key);
+            }
+        }
+        // A linked file that can't be read shows the document's preview of it, if it has one. The
+        // preview only stands in for the file: format and pixel size still describe the link.
+        let preview = data.is_empty().then(|| g.get("Self").and_then(|s| self.previews.get(s))).flatten();
+        // InDesign draws a viewBox-only SVG at one unit to the point: its GraphicBounds are the
+        // art's bounds, which can overhang the viewBox, so they must not size the viewBox.
+        let size = svg_viewbox_size(&data).unwrap_or(size);
+        let (mime, px) = if preview.is_some() { (None, None) } else { sniff_image(&data) };
+        let mime = mime.map(str::to_string).unwrap_or_else(|| match link.and_then(|k| k.get("LinkResourceFormat")).unwrap_or("") {
+            f if f.contains("EPS") || g.local() == "EPS" => "application/postscript".into(),
+            f if f.contains("JPEG") => "image/jpeg".into(),
+            f if f.contains("TIFF") => "image/tiff".into(),
+            f if f.contains("PDF") || g.local() == "PDF" => "application/pdf".into(),
+            f if f.contains("GIF") => "image/gif".into(),
+            _ => "image/png".into(),
+        });
+        let pixels = px.or_else(|| {
+            let ppi = nums(g.get("ActualPpi").unwrap_or(""));
+            (ppi.len() == 2 && size.0 > 0.0).then(|| ((size.0 * ppi[0] / 72.0).round() as u32, (size.1 * ppi[1] / 72.0).round() as u32))
+        });
+        let name =
+            uri.as_deref().and_then(|p| p.rsplit(['/', '\\']).next()).filter(|n| !n.is_empty()).map(str::to_string).unwrap_or_else(|| "image".into());
+        let fresh = AssetId(self.alloc());
+        let link_path = uri.filter(|p| p.contains('/') || p.contains('\\'));
+        let id = designcraft_doc::insert_asset(
+            &mut self.assets,
+            Asset {
+                page,
+                id: fresh,
+                name,
+                mime,
+                link: link_path,
+                data: preview.cloned().unwrap_or_else(|| Arc::new(data)),
+                pixels,
+                pdf_crop,
+                ..Default::default()
+            },
+        );
+        if let Some(key) = read_from {
+            self.linked_assets.insert(key, id);
+        }
+        graphic(id, size)
+    }
+}
+
+/// A graphic's `ClippingPathSettings` with its saved geometry, moved into graphic space by
+/// `to_graphic`. `None` for type None, an unknown type, or no geometry (the outline is never
+/// traced here).
+fn clipping_path(g: &El, to_graphic: Affine) -> Option<Arc<designcraft_doc::ClippingPath>> {
+    let cs = g.find("ClippingPathSettings")?;
+    let kind = names::clipping_kind_in(cs.get("ClippingType").unwrap_or("None"))?;
+    let geometry = cs.prop_el("ClippingPathGeometry").or_else(|| cs.find("ClippingPathGeometry")).or_else(|| g.prop_el("ClippingPathGeometry"))?;
+    let mut path = path_capped(geometry, designcraft_doc::MAX_CLIP_ANCHORS);
+    path.subpaths.retain(|sp| sp.anchors.len() > 1 && sp.anchors.iter().all(|a| a.p.is_finite() && a.h_in.is_finite() && a.h_out.is_finite()));
+    if path.is_empty() {
+        return None;
+    }
+    path.transform(to_graphic);
+    let finite = |v: Option<f64>, def: f64| v.filter(|v| v.is_finite()).unwrap_or(def);
+    let mut c = designcraft_doc::ClippingPath::new(kind, path);
+    c.invert = cs.boolean("InvertPath").unwrap_or(false);
+    c.include_inside_edges = cs.boolean("IncludeInsideEdges").unwrap_or(false);
+    c.restrict_to_frame = cs.boolean("RestrictToFrame").unwrap_or(false);
+    c.use_high_resolution = cs.boolean("UseHighResolutionImage").unwrap_or(true);
+    c.threshold = finite(cs.num("Threshold"), c.threshold).clamp(0.0, 255.0);
+    c.tolerance = finite(cs.num("Tolerance"), c.tolerance).clamp(0.0, 10.0);
+    c.inset = finite(cs.num("InsetFrame"), 0.0);
+    c.source_name = cs.get("AppliedPathName").filter(|n| *n != "$ID/").unwrap_or("").to_string();
+    c.source_index = cs.num("Index").filter(|v| v.is_finite()).map_or(-1, |v| v.clamp(-1.0, i32::MAX as f64) as i32);
+    Some(Arc::new(c))
+}
+
+fn path_of(pg: &El) -> PathData {
+    path_capped(pg, usize::MAX)
+}
+
+/// The path of a `…Geometry` element, keeping at most `max` anchors.
+fn path_capped(pg: &El, max: usize) -> PathData {
+    let mut subs = Vec::new();
+    let mut left = max;
+    for g in pg.find_all("GeometryPathType") {
+        let closed = g.get("PathOpen") != Some("true");
+        let mut anchors = Vec::new();
+        if let Some(arr) = g.find("PathPointArray") {
+            // A NaN or infinite point drops its subpath (JSON can't store it).
+            let non_finite = |s: Option<&str>| s.is_some_and(|s| s.split_whitespace().any(|v| v.parse::<f64>().is_ok_and(|x| !x.is_finite())));
+            if arr.find_all("PathPointType").take(left).any(|p| ["Anchor", "LeftDirection", "RightDirection"].iter().any(|k| non_finite(p.get(k)))) {
+                continue;
+            }
+            for p in arr.find_all("PathPointType").take(left) {
+                let Some(a) = parse_point(p.get("Anchor")) else { continue };
+                let hin = parse_point(p.get("LeftDirection")).unwrap_or(a);
+                let hout = parse_point(p.get("RightDirection")).unwrap_or(a);
+                anchors.push(Anchor::with_handles(a, hin, hout));
+            }
+        }
+        left = left.saturating_sub(anchors.len());
+        if !anchors.is_empty() {
+            subs.push(SubPath::new(anchors, closed));
+        }
+    }
+    PathData::new(subs)
+}
+
+/// A placed PDF's `PDFAttribute` (Image Import Options), as a child or a property.
+fn pdf_attribute(g: &El) -> Option<&El> {
+    g.find("PDFAttribute").or_else(|| g.prop_el("PDFAttribute"))
+}
+
+/// The page a placed PDF shows (0-based), from `PDFAttribute/@PageNumber` (1-based). A missing or
+/// malformed value means page 1; a page the PDF lacks draws nothing and is left out of PDF export.
+fn pdf_page_in(g: &El) -> u32 {
+    pdf_attribute(g)
+        .and_then(|a| a.get("PageNumber"))
+        .and_then(|v| v.trim().parse::<u64>().ok())
+        .and_then(|n| u32::try_from(n.saturating_sub(1)).ok())
+        .unwrap_or(0)
+}
+
+/// Anchors a custom text wrap boundary may have.
+const MAX_WRAP_PATH_ANCHORS: usize = 4096;
+
+/// A custom text wrap boundary (`TextWrapPreference/Properties/PathGeometry`), in the item's inner
+/// space like its own path. Hostile input is an error: too many anchors, a malformed or non-finite
+/// point, or no points at all.
+fn wrap_path_of(pg: &El) -> std::result::Result<PathData, &'static str> {
+    let finite = |s: Option<&str>| -> std::result::Result<Option<Point>, &'static str> {
+        let Some(s) = s else { return Ok(None) };
+        let v = nums(s);
+        match (v.first(), v.get(1)) {
+            (Some(&x), Some(&y)) if v.len() == 2 && x.is_finite() && y.is_finite() => Ok(Some(Point::new(x, y))),
+            _ => Err("malformed or non-finite point"),
+        }
+    };
+    let mut subs = Vec::new();
+    let mut n = 0usize;
+    for g in pg.find_all("GeometryPathType") {
+        let closed = g.get("PathOpen") != Some("true");
+        let mut anchors = Vec::new();
+        for p in g.find("PathPointArray").into_iter().flat_map(|arr| arr.find_all("PathPointType")) {
+            n = n.saturating_add(1);
+            if n > MAX_WRAP_PATH_ANCHORS {
+                return Err("too many points");
+            }
+            let a = finite(p.get("Anchor"))?.ok_or("point without an anchor")?;
+            let hin = finite(p.get("LeftDirection"))?.unwrap_or(a);
+            let hout = finite(p.get("RightDirection"))?.unwrap_or(a);
+            anchors.push(Anchor::with_handles(a, hin, hout));
+        }
+        if !anchors.is_empty() {
+            subs.push(SubPath::new(anchors, closed));
+        }
+    }
+    if subs.is_empty() {
+        return Err("no points");
+    }
+    Ok(PathData::new(subs))
+}
diff --git a/crates/idml/src/import/object_style.rs b/crates/idml/src/import/object_style.rs
new file mode 100644
index 000000000..343e67211
--- /dev/null
+++ b/crates/idml/src/import/object_style.rs
@@ -0,0 +1,324 @@
+use super::values::{finite, tint};
+use super::{Corner, DirectionalFeather, DropShadow, Effects, El, GradientFeather, HashMap, Importer, Node, Stroke, names};
+
+/// InDesign's corner size where a file gives a corner shape without one.
+pub(super) const INDESIGN_CORNER_SIZE: f64 = 12.0;
+
+/// The four corners of a paragraph border or shading (`prefix` `ParagraphBorder` /
+/// `ParagraphShading`): top left, top right, bottom right, bottom left. Unset when none is given.
+pub(super) fn corners(e: &El, prefix: &str) -> Option<[Corner; 4]> {
+    let keys = ["TopLeft", "TopRight", "BottomRight", "BottomLeft"];
+    let shapes = keys.map(|n| e.prop(&format!("{prefix}{n}CornerOption")));
+    let sizes = keys.map(|n| e.num(&format!("{prefix}{n}CornerRadius")));
+    if shapes.iter().all(Option::is_none) && sizes.iter().all(Option::is_none) {
+        return None;
+    }
+    let mut out = [Corner::default(); 4];
+    for (c, (shape, size)) in out.iter_mut().zip(shapes.iter().zip(sizes)) {
+        c.shape = shape.as_deref().map_or(designcraft_geom::corners::CornerShape::None, |s| names::corner_in(s.trim()));
+        c.size = size.filter(|v| v.is_finite()).map_or(12.0, |v| v.max(0.0));
+    }
+    Some(out)
+}
+
+impl<'r> Importer<'r> {
+    /// An item's object style chain: its applied style, the styles that one is based on, then
+    /// `[None]` (cycle-safe).
+    pub(super) fn object_style_chain(&self, e: &El) -> Vec<&El> {
+        let mut chain = self.object_style_bases(e.get("AppliedObjectStyle").map(str::to_string));
+        if let Some(none) = self.object_els.get("ObjectStyle/$ID/[None]")
+            && !chain.iter().any(|c| std::ptr::eq(*c, none))
+        {
+            chain.push(none);
+        }
+        chain
+    }
+
+    /// Object style `id` and the styles it is based on, nearest first (cycle-safe, at most 16).
+    fn object_style_bases(&self, id: Option<String>) -> Vec<&El> {
+        let mut chain: Vec<&El> = Vec::new();
+        let mut os = id;
+        while let Some(id) = os {
+            let Some(s) = self.object_els.get(&id) else { break };
+            if chain.len() >= 16 || chain.iter().any(|c| std::ptr::eq(*c, s)) {
+                break;
+            }
+            chain.push(s);
+            os = s.prop("BasedOn").map(|b| {
+                let b = b.trim();
+                if b.starts_with("ObjectStyle/") { b.to_string() } else { format!("ObjectStyle/{}", names::escape_id(b)) }
+            });
+        }
+        chain
+    }
+
+    /// Resolve an item attribute, falling back to its object style chain.
+    pub(super) fn attr_or_style(&self, e: &El, k: &str) -> Option<String> {
+        e.get(k).or_else(|| self.object_style_chain(e).into_iter().find_map(|s| s.get(k))).map(str::to_string)
+    }
+
+    /// The item's child element `name` laid over the same element of each style in its object style
+    /// chain: attributes and nested elements merge one by one, nearer levels winning. IDML writes on an
+    /// item only the values that differ from its style. Effects whose category the applied style turns
+    /// off (`ObjectStyle*EffectsCategorySettings`) come from the item alone.
+    pub(super) fn with_style(&self, e: &El, name: &str) -> Option<El> {
+        let chain = self.object_style_chain(e);
+        let category = match name {
+            "TransparencySetting" => Some("ObjectStyleObjectEffectsCategorySettings"),
+            "StrokeTransparencySetting" => Some("ObjectStyleStrokeEffectsCategorySettings"),
+            "FillTransparencySetting" => Some("ObjectStyleFillEffectsCategorySettings"),
+            "ContentTransparencySetting" => Some("ObjectStyleContentEffectsCategorySettings"),
+            _ => None,
+        };
+        let enabled = |effect: &str| {
+            let Some(flag) = category.and_then(|_| effect_flag(effect)) else { return true };
+            chain.iter().find_map(|s| category.and_then(|c| s.find(c)).and_then(|c| c.get(flag))) != Some("false")
+        };
+        let mut out: Option<El> = None;
+        for s in chain.iter().rev() {
+            let Some(c) = s.find(name) else { continue };
+            let mut c = c.clone();
+            c.children.retain(|n| !matches!(n, Node::El(x) if !enabled(x.local())));
+            match &mut out {
+                Some(o) => overlay(o, &c, 0),
+                None => out = Some(c),
+            }
+        }
+        if let Some(c) = e.find(name) {
+            match &mut out {
+                Some(o) => overlay(o, c, 0),
+                None => out = Some(c.clone()),
+            }
+        }
+        out
+    }
+
+    /// Reads the drop shadow, feather, gradient feather and directional feather of a
+    /// `TransparencySetting` into `fx`.
+    pub(super) fn effects_in(&mut self, t: &El, fx: &mut Effects) {
+        if let Some(ds) = t.find("DropShadowSetting")
+            && ds.get("Mode") == Some("Drop")
+        {
+            let x = ds.num("XOffset").unwrap_or(4.95);
+            let y = ds.num("YOffset").unwrap_or(4.95);
+            let def = DropShadow::default();
+            fx.drop_shadow = DropShadow {
+                on: true,
+                color: ds.get("EffectColor").map(|c| self.swatch_ref(c)).unwrap_or(def.color),
+                opacity: ds.num("Opacity").map(|o| (o / 100.0) as f32).unwrap_or(def.opacity),
+                angle: names_angle(x, y),
+                distance: x.hypot(y),
+                size: ds.num("Size").unwrap_or(def.size),
+                spread: ds.num("Spread").unwrap_or(def.spread),
+                global_light: false,
+                // Without the attribute (earlier DesignCraft exports) the shadow stays Normal, as it
+                // rendered then; a new shadow's default is Multiply.
+                mode: ds.get("BlendMode").map_or(designcraft_color::BlendMode::Normal, names::blend_in),
+            };
+        }
+        if let Some(f) = t.find("FeatherSetting")
+            && f.get("Mode").is_some_and(|m| m != "None")
+        {
+            fx.feather = f.num("Width").unwrap_or(9.0);
+            fx.feather_options.choke = finite(f.num("ChokeAmount")).unwrap_or(0.0).clamp(0.0, 100.0);
+            fx.feather_options.corners = match f.get("CornerType") {
+                Some("Sharp") => designcraft_doc::FeatherCorners::Sharp,
+                Some("Rounded") => designcraft_doc::FeatherCorners::Rounded,
+                _ => designcraft_doc::FeatherCorners::Diffused,
+            };
+        }
+        if let Some(g) = t.find("GradientFeatherSetting")
+            && g.boolean("Applied") == Some(true)
+        {
+            fx.gradient_feather = gradient_feather_in(g);
+        }
+        if let Some(df) = t.find("DirectionalFeatherSetting")
+            && df.boolean("Applied") == Some(true)
+        {
+            let w = |k: &str| finite(df.num(k)).unwrap_or(0.0).max(0.0);
+            fx.directional_feather = DirectionalFeather { on: true, widths: [w("TopWidth"), w("LeftWidth"), w("BottomWidth"), w("RightWidth")] };
+        }
+    }
+
+    /// An object style's drop shadow and feather. Each is read when the effects category turns it
+    /// on (without category settings: when its setting is on), from the nearest style in the
+    /// BasedOn chain that has the setting. `None` when the style sets neither.
+    pub(super) fn style_effects(&mut self, e: &El) -> Option<Effects> {
+        let mut chain = self.object_style_bases(e.get("Self").map(str::to_string));
+        if chain.is_empty() {
+            chain.push(e);
+        }
+        let category = chain.iter().find_map(|s| s.find("ObjectStyleObjectEffectsCategorySettings")).cloned();
+        let setting = |name: &str| chain.iter().find_map(|s| s.find("TransparencySetting")?.find(name)).cloned();
+        let mut t = El::new("TransparencySetting");
+        let mut any = false;
+        for (name, flag) in [("DropShadowSetting", "EnableDropShadow"), ("FeatherSetting", "EnableFeather")] {
+            let el = setting(name);
+            let on = match &category {
+                Some(c) => c.get(flag) == Some("true"),
+                None => el.as_ref().and_then(|x| x.get("Mode")).is_some_and(|m| m != "None"),
+            };
+            any |= on;
+            if let (true, Some(el)) = (on, el) {
+                t.push(el);
+            }
+        }
+        if !any {
+            return None;
+        }
+        let mut fx = Effects::default();
+        self.effects_in(&t, &mut fx);
+        Some(fx)
+    }
+
+    pub(super) fn stroke_from(&mut self, e: &El, item: Option<&El>) -> Stroke {
+        let g = |s: &Self, k: &str| -> Option<String> { if item.is_some() { s.attr_or_style(e, k) } else { e.get(k).map(str::to_string) } };
+        let color = g(self, "StrokeColor");
+        let mut s = Stroke::none();
+        if let Some(c) = color {
+            s.swatch = self.swatch_ref(&c);
+        }
+        if let Some(w) = g(self, "StrokeWeight").and_then(|v| v.parse::<f64>().ok()).filter(|v| v.is_finite()) {
+            s.weight = w;
+        }
+        if let Some(t) = g(self, "StrokeTint").and_then(|v| v.parse().ok()) {
+            s.tint = tint(Some(t)).unwrap_or(1.0);
+        }
+        if let Some(t) = g(self, "StrokeType") {
+            s.kind = names::stroke_type_in(&t);
+        }
+        if let Some(v) = g(self, "StrokeAlignment") {
+            s.align = names::stroke_align_in(&v);
+        }
+        if let Some(v) = g(self, "EndCap") {
+            s.cap = names::cap_in(&v);
+        }
+        if let Some(v) = g(self, "EndJoin") {
+            s.join = names::join_in(&v);
+        }
+        if let Some(v) = g(self, "MiterLimit").and_then(|v| v.parse::<f64>().ok()).filter(|v| v.is_finite()) {
+            s.miter_limit = v;
+        }
+        if let Some(v) = g(self, "LeftLineEnd") {
+            s.start = names::arrow_in(&v);
+        }
+        if let Some(v) = g(self, "RightLineEnd") {
+            s.end = names::arrow_in(&v);
+        }
+        if let Some(v) = g(self, "GapColor") {
+            s.gap_swatch = self.swatch_ref(&v);
+        }
+        if let Some(t) = g(self, "GapTint").and_then(|v| v.parse().ok()) {
+            s.gap_tint = tint(Some(t)).unwrap_or(1.0);
+        }
+        s.overprint = g(self, "OverprintStroke").as_deref() == Some("true");
+        s.gap_overprint = g(self, "OverprintGap").as_deref() == Some("true");
+        s
+    }
+}
+
+/// The object style category flag that turns an effect element on or off.
+fn effect_flag(effect: &str) -> Option<&'static str> {
+    Some(match effect {
+        "BlendingSetting" => "EnableTransparency",
+        "DropShadowSetting" => "EnableDropShadow",
+        "FeatherSetting" => "EnableFeather",
+        "InnerShadowSetting" => "EnableInnerShadow",
+        "OuterGlowSetting" => "EnableOuterGlow",
+        "InnerGlowSetting" => "EnableInnerGlow",
+        "BevelAndEmbossSetting" => "EnableBevelEmboss",
+        "SatinSetting" => "EnableSatin",
+        "DirectionalFeatherSetting" => "EnableDirectionalFeather",
+        "GradientFeatherSetting" => "EnableGradientFeather",
+        _ => return None,
+    })
+}
+
+/// Lays `top` over `base`: attributes one by one, child elements matched by name and merged the same
+/// way, text replaced. A property given in one form (attribute or `Properties` child) replaces the
+/// other form in `base`.
+fn overlay(base: &mut El, top: &El, depth: usize) {
+    if depth > 32 {
+        *base = top.clone();
+        return;
+    }
+    for (k, v) in &top.attrs {
+        base.set(k, v);
+        if let Some(Node::El(p)) = base.children.iter_mut().find(|n| matches!(n, Node::El(p) if p.local() == "Properties")) {
+            p.children.retain(|n| !matches!(n, Node::El(x) if x.local() == k));
+        }
+    }
+    if let Some(p) = top.find("Properties") {
+        let names: Vec<&str> = p.elements().map(El::local).collect();
+        base.attrs.retain(|(k, _)| !names.contains(&k.as_str()));
+    }
+    let has_text = top.children.iter().any(|n| matches!(n, Node::Text(t) | Node::CData(t) if !t.trim().is_empty()));
+    if has_text {
+        base.children.retain(|n| !matches!(n, Node::Text(_) | Node::CData(_)));
+    }
+    // The k-th child of a name merges with the k-th child of that name in `base` (repeated elements
+    // such as gradient stops pair up in order).
+    let mut seen: HashMap<&str, usize> = HashMap::new();
+    for n in &top.children {
+        match n {
+            Node::El(c) => {
+                let k = seen.entry(c.local()).or_insert(0);
+                let slot = base
+                    .children
+                    .iter_mut()
+                    .filter_map(|b| match b {
+                        Node::El(b) if b.local() == c.local() => Some(b),
+                        _ => None,
+                    })
+                    .nth(*k);
+                *k += 1;
+                match slot {
+                    Some(b) => overlay(b, c, depth + 1),
+                    None => base.children.push(n.clone()),
+                }
+            }
+            Node::Text(_) | Node::CData(_) if has_text => base.children.push(n.clone()),
+            _ => {}
+        }
+    }
+}
+
+/// A `GradientFeatherSetting`. The model holds two opacity stops at the ends of the gradient: the
+/// first and last `OpacityGradientStop` give them; with a linear vector, their `Location`s move its
+/// ends.
+fn gradient_feather_in(g: &El) -> GradientFeather {
+    let def = GradientFeather::default();
+    let angle = finite(g.num("Angle")).unwrap_or(0.0);
+    let mut stops: Vec<(f64, f64)> = g
+        .find_all("OpacityGradientStop")
+        .filter_map(|s| Some((finite(s.num("Location"))?.clamp(0.0, 100.0) / 100.0, finite(s.num("Opacity"))?.clamp(0.0, 100.0) / 100.0)))
+        .collect();
+    stops.sort_by(|a, b| a.0.total_cmp(&b.0));
+    let (first, last) = match (stops.first(), stops.last()) {
+        (Some(&a), Some(&b)) => (a, b),
+        _ => ((0.0, def.start as f64), (1.0, def.end as f64)),
+    };
+    let start: Option<[f64; 2]> = g
+        .prop("GradientStart")
+        .and_then(|s| s.split_whitespace().map(|v| v.parse().ok().filter(|v: &f64| v.is_finite())).collect::<Option<Vec<f64>>>())
+        .and_then(|v| v.try_into().ok());
+    let radial = g.get("Type") == Some("Radial");
+    let vector = match (start, finite(g.num("Length"))) {
+        (Some([x, y]), Some(len)) if len > 0.0 => {
+            let a = angle.to_radians();
+            let (dx, dy) = (len * a.cos(), -len * a.sin());
+            let (l0, l1) = if !radial && last.0 > first.0 { (first.0, last.0) } else { (0.0, 1.0) };
+            Some([x + dx * l0, y + dy * l0, x + dx * l1, y + dy * l1])
+        }
+        _ => None,
+    };
+    GradientFeather { on: true, radial, angle, start: first.1 as f32, end: last.1 as f32, vector }
+}
+
+fn names_angle(x: f64, y: f64) -> f64 {
+    if x == 0.0 && y == 0.0 {
+        return 135.0;
+    }
+    let a = y.atan2(-x).to_degrees();
+    if a < 0.0 { a + 360.0 } else { a }
+}
diff --git a/crates/idml/src/import/package.rs b/crates/idml/src/import/package.rs
new file mode 100644
index 000000000..94cbe309a
--- /dev/null
+++ b/crates/idml/src/import/package.rs
@@ -0,0 +1,126 @@
+use super::{HashMap, IdmlError, Read, Result};
+
+/// Most entries an IDML package may hold.
+const MAX_ENTRIES: usize = 100_000;
+
+/// Most bytes one package part may expand to.
+const MAX_PART_BYTES: u64 = 512 << 20;
+
+/// Most bytes all the parts read from one package may expand to together.
+const MAX_TOTAL_BYTES: u64 = 2 << 30;
+
+/// An IDML package whose parts are decompressed only when the import asks for them, within
+/// byte budgets that don't trust the sizes the archive claims.
+pub(super) struct Package<'a> {
+    zip: zip::ZipArchive<std::io::Cursor<&'a [u8]>>,
+    /// Normalised part name → entry name, first entry wins (zip order, so the choice is stable).
+    lenient: HashMap<String, String>,
+    /// Bytes the parts still to be read may expand to.
+    left: u64,
+}
+
+impl<'a> Package<'a> {
+    pub(super) fn open(bytes: &'a [u8]) -> Result<Self> {
+        let zip = zip::ZipArchive::new(std::io::Cursor::new(bytes)).map_err(|e| IdmlError::NotIdml(e.to_string()))?;
+        if zip.len() > MAX_ENTRIES {
+            return Err(IdmlError::NotIdml(format!("{} entries (at most {MAX_ENTRIES})", zip.len())));
+        }
+        let mut lenient: HashMap<String, String> = HashMap::new();
+        for i in 0..zip.len() {
+            let Some(name) = zip.name_for_index(i) else { continue };
+            if name.ends_with('/') {
+                continue;
+            }
+            lenient.entry(normalize_part_name(name)).or_insert_with(|| name.to_string());
+        }
+        Ok(Package { zip, lenient, left: MAX_TOTAL_BYTES })
+    }
+
+    /// The bytes of part `name` (matched exactly, then leniently), or `None` if the package has
+    /// no such part.
+    pub(super) fn part(&mut self, name: &str) -> Result<Option<Vec<u8>>> {
+        let exact = self.zip.index_for_name(name).filter(|_| !name.ends_with('/'));
+        let Some(i) = exact.or_else(|| self.lenient.get(&normalize_part_name(name)).and_then(|n| self.zip.index_for_name(n))) else {
+            return Ok(None);
+        };
+        let f = self.zip.by_index(i).map_err(|e| IdmlError::NotIdml(e.to_string()))?;
+        let part = f.name().to_string();
+        let limit = MAX_PART_BYTES.min(self.left);
+        let too_big = || IdmlError::Part {
+            part: part.clone(),
+            msg: format!("larger than the {MAX_PART_BYTES}-byte part limit (or the package is larger than {MAX_TOTAL_BYTES} bytes)"),
+        };
+        if f.size() > limit {
+            return Err(too_big());
+        }
+        let mut buf = Vec::new();
+        f.take(limit.saturating_add(1)).read_to_end(&mut buf).map_err(|e| IdmlError::Part { part: part.clone(), msg: e.to_string() })?;
+        let n = buf.len() as u64;
+        if n > limit {
+            return Err(too_big());
+        }
+        self.left = self.left.saturating_sub(n);
+        Ok(Some(buf))
+    }
+}
+
+/// A package part name in the form the lookup compares: InDesign and other IDML writers differ
+/// in percent-encoding, case, path separators and a leading `./` or `/`.
+fn normalize_part_name(name: &str) -> String {
+    let decoded = percent_decode(&name.replace('\\', "/"));
+    let mut rest = decoded.as_str();
+    loop {
+        if let Some(r) = rest.strip_prefix("./") {
+            rest = r;
+        } else if let Some(r) = rest.strip_prefix('/') {
+            rest = r;
+        } else {
+            break;
+        }
+    }
+    rest.to_lowercase()
+}
+
+/// Decode `%XX` escapes; anything else (including a malformed escape) is kept as written.
+pub(crate) fn percent_decode(s: &str) -> String {
+    let b = s.as_bytes();
+    let mut out = Vec::with_capacity(b.len());
+    let mut i = 0;
+    while let Some(&c) = b.get(i) {
+        if c == b'%'
+            && let (Some(h), Some(l)) = (b.get(i + 1).and_then(|h| (*h as char).to_digit(16)), b.get(i + 2).and_then(|l| (*l as char).to_digit(16)))
+        {
+            out.push((h * 16 + l) as u8);
+            i += 3;
+            continue;
+        }
+        out.push(c);
+        i += 1;
+    }
+    String::from_utf8_lossy(&out).into_owned()
+}
+
+/// IDML link URI → file system path (`file:/a%20b` → `/a b`, `file:///C:/x` → `C:/x`). A URI
+/// naming another computer keeps it as a network path (`file://host/s/x` → `//host/s/x`).
+pub(crate) fn uri_to_path(uri: &str) -> String {
+    let rest = match uri.strip_prefix("file://") {
+        Some(rest) => {
+            let host_end = rest.find(['/', '\\']).unwrap_or(rest.len());
+            let host = rest.get(..host_end).unwrap_or_default();
+            if host.is_empty() || host.eq_ignore_ascii_case("localhost") {
+                rest.get(host_end..).unwrap_or(rest)
+            } else if matches!(host.as_bytes(), [letter, b':'] if letter.is_ascii_alphabetic()) {
+                rest
+            } else {
+                return format!("//{}", percent_decode(rest));
+            }
+        }
+        None => uri.strip_prefix("file:").unwrap_or(uri),
+    };
+    // `file:///C:/…` → `/C:/…` → `C:/…`
+    let rest = match rest.as_bytes() {
+        [b'/', _, b':', _, ..] => rest.get(1..).unwrap_or(rest),
+        _ => rest,
+    };
+    percent_decode(rest)
+}
diff --git a/crates/idml/src/import/spread.rs b/crates/idml/src/import/spread.rs
new file mode 100644
index 000000000..e2caa6b18
--- /dev/null
+++ b/crates/idml/src/import/spread.rs
@@ -0,0 +1,200 @@
+use super::frame::{fit_columns, margins_of};
+use super::values::{nums, parse_affine};
+use super::{
+    Affine, Arc, Columns, El, Guide, Importer, ItemId, Margins, Orientation, Page, PageId, PageSide, ParentInfo, Point, Rect, Spread, SpreadId, names,
+};
+
+/// View › Rotate Spread from a `Spread` element's `ItemTransform`: quarter turns clockwise on
+/// screen (IDML y points down, so `0 1 -1 0` is one clockwise turn). The spread's items and
+/// pages stay in unrotated spread coordinates, so only the rotation part is read. Anything other
+/// than an exact quarter turn (identity, scale, other angles, malformed numbers) is no rotation.
+fn spread_view_rotation(s: Option<&str>) -> u8 {
+    let parsed: std::result::Result<Vec<f64>, _> = s.unwrap_or("").split_whitespace().take(7).map(str::parse::<f64>).collect();
+    let Some([a, b, c, d, _, _]) = parsed.ok().and_then(|v| <[f64; 6]>::try_from(v).ok()) else { return 0 };
+    let is = |x: f64, y: f64| (x - y).abs() < 1e-6;
+    let quarter = |m: [f64; 4]| is(a, m[0]) && is(b, m[1]) && is(c, m[2]) && is(d, m[3]);
+    if quarter([0.0, 1.0, -1.0, 0.0]) {
+        1
+    } else if quarter([-1.0, 0.0, 0.0, -1.0]) {
+        2
+    } else if quarter([0.0, -1.0, 1.0, 0.0]) {
+        3
+    } else {
+        0
+    }
+}
+
+impl<'r> Importer<'r> {
+    // ---------- spreads and items ----------
+
+    /// Ruler guides of a `<Page>` (its `<Guide>` children), `page` its rectangle in our spread
+    /// coordinates. A guide's Location is measured from the ruler origin: the spread's top left, the
+    /// page's, or the spine. Fit to Page off: the guide crosses the spread.
+    fn guides_of(&self, p: &El, page: Rect, spine: f64) -> Vec<Guide> {
+        p.find_all("Guide")
+            .filter_map(|g| {
+                let at = g.num("Location").filter(|v| v.is_finite() && v.abs() < 1e7)?;
+                let orientation = if g.get("Orientation") == Some("Horizontal") { Orientation::Horizontal } else { Orientation::Vertical };
+                let position = match (orientation, self.settings.ruler_origin) {
+                    (Orientation::Horizontal, designcraft_doc::RulerOrigin::Page) => page.y0 + at,
+                    (Orientation::Horizontal, _) => at,
+                    (Orientation::Vertical, designcraft_doc::RulerOrigin::Page) => page.x0 + at,
+                    (Orientation::Vertical, designcraft_doc::RulerOrigin::Spine) => spine + at,
+                    (Orientation::Vertical, designcraft_doc::RulerOrigin::Spread) => at,
+                };
+                Some(Guide {
+                    orientation,
+                    position,
+                    spread: g.get("FitToPage") == Some("false"),
+                    locked: g.get("Locked") == Some("true"),
+                    layer: g.get("ItemLayer").and_then(|l| self.layer_ids.get(l)).copied(),
+                    liquid: g.get("GuideType") == Some("Liquid"),
+                })
+            })
+            .collect()
+    }
+
+    /// The page rectangles of a spread element, in IDML spread coordinates.
+    fn page_rects<'a>(&self, e: &'a El) -> Vec<(Rect, &'a El)> {
+        let mut pages: Vec<(Rect, &'a El)> = Vec::new();
+        for p in e.find_all("Page") {
+            let gb = nums(p.get("GeometricBounds").unwrap_or(""));
+            let (t, l, bt, r) =
+                if gb.len() == 4 { (gb[0], gb[1], gb[2], gb[3]) } else { (0.0, 0.0, self.settings.page_height, self.settings.page_width) };
+            let xf = parse_affine(p.get("ItemTransform"));
+            let a = xf * Point::new(l, t);
+            let c = xf * Point::new(r, bt);
+            pages.push((Rect::from_points(a, c), p));
+        }
+        pages
+    }
+
+    /// A page's margins and columns, and whether they are local (differ from its parent page's).
+    fn page_margins(&self, p: &El, r: &Rect, master: bool, parent: Option<SpreadId>, side: PageSide) -> (Margins, Columns, bool) {
+        // A document page's margins are local when they differ from its parent page's; a
+        // page without its own takes the parent page's.
+        let from_parent = if master {
+            None
+        } else {
+            parent
+                .and_then(|id| self.parents.iter().find(|sp| sp.id == id))
+                .and_then(|sp| sp.pages.get(sp.parent_page_for_side(side)?))
+                .map(|q| (q.margins, q.columns.clone()))
+        };
+        let (margins, columns) = match (p.find("MarginPreference"), &from_parent) {
+            (Some(m), _) => {
+                let (margins, columns) = margins_of(m);
+                (margins, fit_columns(columns, &margins, r.width()))
+            }
+            (None, Some(own)) => own.clone(),
+            (None, None) => {
+                let (margins, columns) = self.default_margins.clone().unwrap_or((Margins::uniform(36.0), Columns::default()));
+                (margins, fit_columns(columns, &margins, r.width()))
+            }
+        };
+        let local_margins = from_parent.is_some_and(|(m, c)| m != margins || c != columns);
+        (margins, columns, local_margins)
+    }
+
+    pub(super) fn spread(&mut self, e: &El, id: SpreadId, master: bool) -> Spread {
+        let facing = self.settings.facing_pages;
+        // Page rectangles in IDML spread coordinates.
+        let pages = self.page_rects(e);
+        let min_x = pages.iter().map(|(r, _)| r.x0).fold(f64::INFINITY, f64::min);
+        let min_y = pages.iter().map(|(r, _)| r.y0).fold(f64::INFINITY, f64::min);
+        let (min_x, min_y) = if min_x.is_finite() { (min_x, min_y) } else { (0.0, 0.0) };
+        let shift = Affine::translate((-min_x, -min_y));
+        // The spine: between a left and a right page (else the spread's left edge).
+        let spine = pages.iter().map(|(r, _)| r.x0 - min_x).filter(|x| *x > 1e-6).fold(f64::INFINITY, f64::min);
+        let spine = if spine.is_finite() && facing { spine } else { 0.0 };
+        let show = e.get("ShowMasterItems") != Some("false");
+        let first_abs: usize = self.spreads.iter().map(|s| s.pages.len()).sum();
+        let view_rotation = if master { 0 } else { spread_view_rotation(e.get("ItemTransform")) };
+        let mut out_pages = Vec::new();
+        for (i, (r, p)) in pages.iter().enumerate() {
+            let pid = PageId(self.alloc());
+            if let Some(s) = p.get("Self")
+                && !master
+            {
+                self.page_index.insert(s.to_string(), first_abs + i);
+            }
+            let side = if !facing {
+                PageSide::Single
+            } else if r.x1 <= 1e-6 {
+                PageSide::Left
+            } else {
+                PageSide::Right
+            };
+            let parent = p.get("AppliedMaster").and_then(|m| self.parent_ids.get(m)).copied();
+            let (margins, columns, local_margins) = self.page_margins(p, r, master, parent, side);
+            out_pages.push(Page {
+                id: pid,
+                width: r.width(),
+                height: r.height(),
+                x: r.x0 - min_x,
+                margins,
+                columns,
+                local_margins,
+                parent,
+                side,
+                overridden: vec![],
+                guides: self.guides_of(p, Rect::new(r.x0 - min_x, r.y0 - min_y, r.x1 - min_x, r.y1 - min_y), spine),
+                show_parent_items: show,
+                liquid: names::liquid_rule_in(p.get("LayoutRule").unwrap_or("Off")),
+                transition: None,
+                view_rotation: if i == 0 { view_rotation } else { 0 },
+                show_parent_overlay: false,
+            });
+        }
+        let overrides: Vec<Vec<String>> =
+            pages.iter().map(|(_, p)| p.get("OverrideList").unwrap_or("").split_whitespace().map(str::to_string).collect()).collect();
+        let mut items = Vec::new();
+        for c in e.elements() {
+            if let Some(it) = self.item(c, shift) {
+                items.push(Arc::new(it));
+            }
+        }
+        for (pg, ov) in out_pages.iter_mut().zip(overrides) {
+            pg.overridden = ov.iter().filter_map(|s| self.item_ids.get(s)).copied().filter(|i| self.is_parent_item(*i)).collect();
+        }
+        let parent = if master {
+            let prefix =
+                e.get("NamePrefix").map(str::to_string).unwrap_or_else(|| e.get("Name").unwrap_or("A").split('-').next().unwrap_or("A").to_string());
+            let name = e.get("BaseName").map(str::to_string).unwrap_or_else(|| {
+                let n = e.get("Name").unwrap_or("Parent");
+                n.split_once('-').map(|(_, b)| b.to_string()).unwrap_or_else(|| n.to_string())
+            });
+            // A parent spread has one base: its first page's. Pages that disagree lose theirs.
+            let applied: Vec<Option<SpreadId>> =
+                pages.iter().map(|(_, p)| p.get("AppliedMaster").and_then(|m| self.parent_ids.get(m)).copied()).collect();
+            let label = format!("{prefix}-{name}");
+            if applied.windows(2).any(|w| w[0] != w[1]) {
+                self.warnings.push(format!("parent {label}: its pages are based on different parents; only the first page's is kept"));
+            }
+            let based_on = applied.first().copied().flatten();
+            if applied.contains(&Some(id)) {
+                self.warnings.push(format!("parent {label}: a page names its own parent as its base, which is ignored"));
+            }
+            let based_on = based_on.filter(|b| *b != id);
+            Some(ParentInfo { prefix, name, based_on })
+        } else {
+            None
+        };
+        for p in &mut out_pages {
+            if master {
+                p.parent = None;
+            }
+        }
+        Spread { id, pages: out_pages, items, parent, allow_shuffle: e.get("AllowPageShuffle") != Some("false") }
+    }
+
+    pub(super) fn is_parent_item(&self, id: ItemId) -> bool {
+        self.parents.iter().any(|p| {
+            p.items.iter().any(|it| {
+                let mut found = false;
+                it.walk(&mut |i| found |= i.id == id);
+                found
+            })
+        })
+    }
+}
diff --git a/crates/idml/src/import/story.rs b/crates/idml/src/import/story.rs
new file mode 100644
index 000000000..3d87fc35a
--- /dev/null
+++ b/crates/idml/src/import/story.rs
@@ -0,0 +1,444 @@
+use super::text_attrs::{ace_char, clear_story_drop_cap_styles, inherits_drop_cap_style};
+use super::{
+    Arc, BTreeMap, CharAttrs, CharFormat, CharRun, El, HashMap, HashSet, Importer, Item, ItemId, ParaFormat, Story, StoryId, Table, names, st,
+};
+use crate::xml::Node;
+
+impl<'r> Importer<'r> {
+    // ---------- stories ----------
+
+    pub(super) fn story(&mut self, id: StoryId, e: &El) -> Story {
+        self.story_with_para(id, e, ParaFormat::default())
+    }
+
+    pub(super) fn story_with_para(&mut self, id: StoryId, e: &El, default_para: ParaFormat) -> Story {
+        let mut b = StoryBuilder {
+            text: String::new(),
+            paras: vec![default_para.clone()],
+            runs: Vec::new(),
+            fresh: true,
+            last: CharFormat::default(),
+            tables: Vec::new(),
+            after_table: None,
+            notes: Vec::new(),
+            anchors: Vec::new(),
+            xrefs: Vec::new(),
+            index_refs: Vec::new(),
+            objects: Vec::new(),
+        };
+        self.walk_story(e, &mut b, &default_para, &CharAttrs::default(), &CharFormat::default(), None);
+        let StoryBuilder { text, mut paras, runs, last, tables: tbls, notes, anchors, xrefs, index_refs, objects, .. } = b;
+        let mut chars: Vec<CharRun> = runs.into_iter().filter(|r| r.len > 0).collect();
+        if chars.is_empty() {
+            chars.push(CharRun { len: 0, format: last });
+        }
+        let mut tables = BTreeMap::new();
+        for (pi, t) in tbls {
+            if let Some(p) = paras.get_mut(pi) {
+                p.table = Some(t.id);
+                tables.insert(t.id, Arc::new(t));
+            }
+        }
+        let notes = notes.into_iter().enumerate().map(|(i, text)| Arc::new(designcraft_doc::Footnote { id: i as u64 + 1, text })).collect();
+        let mut anchor_list = Vec::new();
+        for (k, (me, name)) in anchors.into_iter().enumerate() {
+            let aid = (id.0 << 24) | (k as u64 + 1);
+            self.anchor_ids.insert(me, aid);
+            anchor_list.push(Arc::new(designcraft_doc::TextAnchor { id: aid, name }));
+        }
+        let mut xref_list = Vec::new();
+        for (k, (me, fmt)) in xrefs.into_iter().enumerate() {
+            self.xref_srcs.insert(me, (id, k));
+            let format = self.xref_format_names.get(&fmt).cloned().unwrap_or_else(|| "Full Paragraph & Page Number".into());
+            xref_list.push(Arc::new(designcraft_doc::CrossRef { target: 0, format }));
+        }
+        let pref = e.find("StoryPreference");
+        let optical_margin = designcraft_doc::OpticalMargin {
+            on: pref.and_then(|p| p.boolean("OpticalMarginAlignment")).unwrap_or(false),
+            size: pref
+                .and_then(|p| p.num("OpticalMarginSize"))
+                .and_then(designcraft_doc::OpticalMargin::clamp_size)
+                .unwrap_or(designcraft_doc::OpticalMargin::DEFAULT_SIZE),
+        };
+        let mut st = Story {
+            id,
+            text,
+            paras,
+            chars,
+            frames: vec![],
+            direction: if e.find("StoryPreference").and_then(|p| p.get("StoryDirection")) == Some("RightToLeftDirection") {
+                designcraft_doc::TextDirection::RightToLeft
+            } else {
+                designcraft_doc::TextDirection::LeftToRight
+            },
+            vertical: e.find("StoryPreference").and_then(|p| p.get("StoryOrientation")) == Some("Vertical"),
+            optical_margin,
+            rev: 0,
+            tables,
+            notes,
+            endnotes: Vec::new(),
+            anchors: anchor_list,
+            xrefs: xref_list,
+            index_refs: index_refs.into_iter().map(Arc::new).collect(),
+            objects: objects.into_iter().map(Arc::new).collect(),
+            editorial: Vec::new(),
+            link: None,
+            file_link: None,
+        };
+        st.fix_notes();
+        st.fix_marks();
+        // Drop anything inconsistent (e.g. a table sharing a paragraph with another).
+        if st.check().is_err() {
+            st.tables.retain(|_, _| false);
+            for p in &mut st.paras {
+                p.table = None;
+            }
+        }
+        st
+    }
+
+    /// The format of the text in a `CharacterStyleRange`: its style, and its local attributes over
+    /// the enclosing paragraph range's, inside a tracked change if `outer` (the enclosing format) is.
+    fn range_format(&mut self, c: &El, pchars: &CharAttrs, outer: &CharFormat) -> CharFormat {
+        let style = c.get("AppliedCharacterStyle").map(|r| self.char_style_ref(r)).unwrap_or_else(|| st::NO_CHAR_STYLE.into());
+        let mut over = pchars.clone();
+        over.merge(&self.char_attrs(c));
+        over.change = over.change.or(outer.over.change);
+        CharFormat { style, over }
+    }
+
+    fn walk_story(&mut self, e: &El, b: &mut StoryBuilder, pf: &ParaFormat, pchars: &CharAttrs, cf: &CharFormat, brk: Option<&str>) {
+        for n in &e.children {
+            match n {
+                Node::El(c) => match c.local() {
+                    "ParagraphStyleRange" => {
+                        let style = c.get("AppliedParagraphStyle").map(|r| self.para_style_ref(r)).unwrap_or_else(|| pf.style.clone());
+                        let para = self.para_attrs(c);
+                        let mut chars = self.char_attrs(c);
+                        // A paragraph range inside a tracked change is part of that change.
+                        chars.change = chars.change.or(cf.over.change);
+                        let npf = ParaFormat { style, para, chars: CharAttrs::default(), table: None };
+                        if b.fresh
+                            && let Some(last) = b.paras.last_mut()
+                        {
+                            *last = npf.clone();
+                        }
+                        // Text and markers outside any character range (a destination or a
+                        // cross-reference source at paragraph level) take the paragraph's format.
+                        let pcf = CharFormat { style: st::NO_CHAR_STYLE.into(), over: chars.clone() };
+                        self.walk_story(c, b, &npf, &chars, &pcf, None);
+                    }
+                    "CharacterStyleRange" => {
+                        let ncf = self.range_format(c, pchars, cf);
+                        let bt = c.get("ParagraphBreakType").filter(|t| *t != "Anywhere");
+                        b.last = ncf.clone();
+                        self.walk_story(c, b, pf, pchars, &ncf, bt);
+                    }
+                    "Content" => {
+                        for t in &c.children {
+                            match t {
+                                Node::Text(s) | Node::CData(s) => {
+                                    let s: String = s
+                                        .chars()
+                                        .filter(|c| *c != '\u{FEFF}')
+                                        .map(|c| if c == '\n' || c == '\r' || c == '\u{2029}' { st::FORCED_LINE_BREAK } else { c })
+                                        .collect();
+                                    b.push(&s, cf);
+                                }
+                                Node::Pi(t, v) if t == "ACE" => {
+                                    if let Some(ch) = ace_char(v) {
+                                        b.push(&ch.to_string(), cf);
+                                    }
+                                }
+                                _ => {}
+                            }
+                        }
+                    }
+                    "Br" => {
+                        // A column, frame or page break ends its paragraph like a return does.
+                        if let Some(t) = brk {
+                            let ch = match t {
+                                "NextColumn" => st::COLUMN_BREAK,
+                                "NextFrame" => st::FRAME_BREAK,
+                                "NextOddPage" => st::ODD_PAGE_BREAK,
+                                "NextEvenPage" => st::EVEN_PAGE_BREAK,
+                                _ => st::PAGE_BREAK,
+                            };
+                            b.push(&ch.to_string(), cf);
+                        }
+                        b.push("\n", cf);
+                        b.paras.push(pf.clone());
+                        b.fresh = true;
+                    }
+                    "Table" => {
+                        let t = self.table(c);
+                        b.push_table(t, pf, cf);
+                    }
+                    "HyperlinkTextDestination" | "ParagraphDestination" => {
+                        b.anchors.push((c.get("Self").unwrap_or("").to_string(), c.get("Name").unwrap_or("Anchor").to_string()));
+                        b.push(&designcraft_doc::ANCHOR_MARK.to_string(), cf);
+                    }
+                    "PageReference" => {
+                        use designcraft_doc::index::IndexRange as R;
+                        let topic = c.get("ReferencedTopic").and_then(|r| self.index_topics.get(r)).cloned().unwrap_or_default();
+                        let range = match c.get("PageReferenceType") {
+                            Some("ToEndOfStory") | Some("ToEndOfDocument") | Some("ToEndOfSection") => R::ToEndOfStory,
+                            Some("ForNextNParagraphs") => R::NextParagraphs(c.num("PageReferenceLimit").unwrap_or(1.0).max(1.0) as u32),
+                            Some("SuppressPageNumbers") => R::SuppressPageRange,
+                            _ => R::CurrentPage,
+                        };
+                        b.index_refs.push(designcraft_doc::IndexRef { topics: topic.path, sort: topic.sort, range });
+                        b.push(&designcraft_doc::INDEX_MARK.to_string(), cf);
+                    }
+                    "CrossReferenceSource" => {
+                        // The generated text is regenerated from the format.
+                        b.xrefs.push((c.get("Self").unwrap_or("").to_string(), c.get("AppliedFormat").unwrap_or("").to_string()));
+                        // A source at paragraph level wraps a range; inside a range it holds the
+                        // text directly and takes that range's format.
+                        let f = c.find("CharacterStyleRange").map_or_else(|| cf.clone(), |r| self.range_format(r, pchars, cf));
+                        b.push(&designcraft_doc::XREF_MARK.to_string(), &f);
+                    }
+                    "Footnote" => {
+                        // The text starts with the number marker (ACE 4, dropped) and the separator.
+                        let mut note = self.story(StoryId(0), c);
+                        let sep = self.footnote_options.separator.clone();
+                        if !sep.is_empty() && note.text.starts_with(&sep) {
+                            note.delete(0..sep.len());
+                        }
+                        b.notes.push(note);
+                        // The reference's position comes from the footnote options.
+                        let mut rcf = cf.clone();
+                        rcf.over.position = None;
+                        b.push(&designcraft_doc::FOOTNOTE_REF.to_string(), &rcf);
+                    }
+                    // Anchored page items, including groups containing text frames.
+                    "Rectangle" | "Oval" | "Polygon" | "GraphicLine" | "Group" | "TextFrame" => {
+                        if let Some(item) = self.item(c, designcraft_geom::Affine::IDENTITY) {
+                            use designcraft_doc::anchored::AnchorAlign as A;
+                            // Each setting the item leaves unset comes from its object style chain,
+                            // then from the IDML defaults.
+                            let levels: Vec<&El> = std::iter::once(c).chain(self.object_style_chain(c)).collect();
+                            let s = |k: &str| {
+                                let set = levels.iter().filter_map(|l| l.find("AnchoredObjectSetting")).find_map(|x| x.get(k));
+                                set.unwrap_or(match k {
+                                    "AnchoredPosition" => "InlinePosition",
+                                    "AnchorPoint" => "BottomRightAnchor",
+                                    "HorizontalAlignment" => "LeftAlign",
+                                    "HorizontalReferencePoint" => "TextFrame",
+                                    "VerticalAlignment" => "BottomAlign",
+                                    "VerticalReferencePoint" => "LineBaseline",
+                                    "PinPosition" => "true",
+                                    _ => "",
+                                })
+                            };
+                            let get = |k: &str| s(k).trim().parse::<f64>().ok().filter(|v| v.is_finite()).unwrap_or(0.0);
+                            let position = match s("AnchoredPosition") {
+                                "AboveLine" => designcraft_doc::AnchorPosition::AboveLine {
+                                    align: match s("HorizontalAlignment") {
+                                        "CenterAlign" => A::Center,
+                                        "RightAlign" => A::Right,
+                                        _ => A::Left,
+                                    },
+                                    space_before: get("AnchorSpaceAbove"),
+                                    space_after: get("AnchorYoffset"),
+                                },
+                                "Anchored" => {
+                                    let col = match s("HorizontalAlignment") {
+                                        "CenterAlign" => 1,
+                                        "RightAlign" => 2,
+                                        _ => 0,
+                                    };
+                                    let row = match s("VerticalAlignment") {
+                                        "CenterAlign" => 1,
+                                        "BottomAlign" => 2,
+                                        _ => 0,
+                                    };
+                                    designcraft_doc::AnchorPosition::Custom {
+                                        x_relative: names::anchor_rel_in(s("HorizontalReferencePoint")),
+                                        y_relative: names::anchor_rel_in(s("VerticalReferencePoint")),
+                                        // IDML measures a left-aligned object's X offset leftwards.
+                                        x_offset: if col == 0 { 0.0 - get("AnchorXoffset") } else { get("AnchorXoffset") },
+                                        y_offset: get("AnchorYoffset"),
+                                        object_point: names::anchor_in(s("AnchorPoint")),
+                                        ref_point: row * 3 + col,
+                                        keep_within_column: s("PinPosition") == "true",
+                                        spine_relative: s("SpineRelative") == "true",
+                                    }
+                                }
+                                _ => designcraft_doc::AnchorPosition::Inline { y_offset: get("AnchorYoffset") },
+                            };
+                            b.objects.push(designcraft_doc::AnchoredObject::new(item, position));
+                            b.push(&designcraft_doc::OBJECT_MARK.to_string(), cf);
+                        }
+                    }
+                    "TextVariableInstance" => {
+                        let t = self.text_variable_instance(c);
+                        b.push(&t, cf);
+                    }
+                    "Change" => {
+                        // Tracked changes: deleted text stays in the story, marked, and takes no
+                        // room in the layout.
+                        let mut ncf = cf.clone();
+                        match c.get("ChangeType") {
+                            Some("DeletedText") => ncf.over.change = Some(designcraft_doc::ChangeMark::Deleted),
+                            Some("InsertedText" | "MovedText") => ncf.over.change = Some(designcraft_doc::ChangeMark::Inserted),
+                            _ => {}
+                        }
+                        self.walk_story(c, b, pf, pchars, &ncf, brk);
+                    }
+                    "Properties" | "Note" | "StoryPreference" | "InCopyExportOption" => {}
+                    _ => self.walk_story(c, b, pf, pchars, cf, brk),
+                },
+                Node::Pi(t, v) if t == "ACE" => {
+                    if let Some(ch) = ace_char(v) {
+                        b.push(&ch.to_string(), cf);
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
+    pub(super) fn link_threads(&mut self) {
+        let threads = std::mem::take(&mut self.ctx.threads);
+        let by_self: HashMap<String, ItemId> = self.item_ids.clone();
+        let mut per_story: BTreeMap<StoryId, Vec<usize>> = BTreeMap::new();
+        for (i, (id, story, _, _)) in threads.iter().enumerate() {
+            let sid = self.story_ids.get(story).copied().or_else(|| self.frame_story(*id));
+            if let Some(sid) = sid {
+                per_story.entry(sid).or_default().push(i);
+            }
+        }
+        for (sid, idx) in per_story {
+            let members: HashSet<ItemId> = idx.iter().map(|i| threads[*i].0).collect();
+            let next_of: HashMap<ItemId, ItemId> =
+                idx.iter().filter_map(|i| by_self.get(&threads[*i].3).filter(|n| members.contains(n)).map(|n| (threads[*i].0, *n))).collect();
+            let has_prev: HashSet<ItemId> = next_of.values().copied().collect();
+            let mut order = Vec::new();
+            let mut seen = HashSet::new();
+            for i in &idx {
+                let head = threads[*i].0;
+                if has_prev.contains(&head) || seen.contains(&head) {
+                    continue;
+                }
+                let mut cur = Some(head);
+                while let Some(c) = cur {
+                    if !seen.insert(c) {
+                        break;
+                    }
+                    order.push(c);
+                    cur = next_of.get(&c).copied();
+                }
+            }
+            for i in &idx {
+                let f = threads[*i].0;
+                if seen.insert(f) {
+                    order.push(f);
+                }
+            }
+            if let Some(s) = self.stories.get_mut(&sid) {
+                s.frames = order;
+            }
+        }
+    }
+
+    fn frame_story(&self, id: ItemId) -> Option<StoryId> {
+        fn find(items: &[Arc<Item>], id: ItemId) -> Option<StoryId> {
+            for it in items {
+                let mut r = None;
+                it.walk(&mut |i| {
+                    if i.id == id {
+                        r = i.text_frame().map(|t| t.story);
+                    }
+                });
+                if r.is_some() {
+                    return r;
+                }
+            }
+            None
+        }
+        self.spreads.iter().chain(self.parents.iter()).find_map(|s| find(&s.items, id))
+    }
+
+    /// A nested style list replaces the one a style or paragraph inherits, and with it the drop
+    /// cap style (the list's leading "through 1 Dropcap" entry, read into the drop cap style). A
+    /// list of its own without that entry clears an inherited drop cap style.
+    pub(super) fn clear_inherited_drop_cap_styles(&mut self) {
+        let clears = |a: &designcraft_doc::ParaAttrs| a.drop_cap_style.is_none() && a.nested_styles.is_some();
+        let cleared: Vec<String> = self
+            .styles
+            .paragraph
+            .iter()
+            .filter(|s| clears(&s.para) && inherits_drop_cap_style(&self.styles, s.based_on.as_deref()))
+            .map(|s| s.name.clone())
+            .collect();
+        for name in cleared {
+            if let Some(s) = self.styles.para_mut(&name) {
+                s.para.drop_cap_style = Some(st::NO_CHAR_STYLE.into());
+            }
+        }
+        for story in self.stories.values_mut() {
+            clear_story_drop_cap_styles(&self.styles, story, 0);
+        }
+    }
+}
+
+struct StoryBuilder {
+    text: String,
+    paras: Vec<ParaFormat>,
+    runs: Vec<CharRun>,
+    /// The current paragraph has no content yet (its format can still be set by a range).
+    fresh: bool,
+    last: CharFormat,
+    /// Tables by anchor paragraph index.
+    tables: Vec<(usize, Table)>,
+    /// Content after a table anchor starts a new paragraph (with this format).
+    after_table: Option<ParaFormat>,
+    /// Footnote texts in reference order.
+    notes: Vec<Story>,
+    /// Text destinations (Self, name) and cross-reference sources (Self, format Self) in order.
+    anchors: Vec<(String, String)>,
+    index_refs: Vec<designcraft_doc::IndexRef>,
+    xrefs: Vec<(String, String)>,
+    objects: Vec<designcraft_doc::AnchoredObject>,
+}
+
+impl StoryBuilder {
+    /// A table gets an anchor paragraph of its own.
+    fn push_table(&mut self, t: Table, pf: &ParaFormat, cf: &CharFormat) {
+        let para_empty = self.text.rsplit('\n').next().is_none_or(str::is_empty);
+        if !para_empty {
+            self.after_table = None;
+            self.push("\n", cf);
+            self.paras.push(pf.clone());
+        }
+        self.after_table = None;
+        self.push(&st::TABLE_ANCHOR.to_string(), cf);
+        self.tables.push((self.paras.len() - 1, t));
+        self.after_table = Some(pf.clone());
+        self.fresh = false;
+    }
+
+    fn push(&mut self, s: &str, f: &CharFormat) {
+        if s.is_empty() {
+            return;
+        }
+        if let Some(pf) = self.after_table.take()
+            && !s.starts_with('\n')
+        {
+            self.push("\n", f);
+            self.paras.push(pf);
+        }
+        self.text.push_str(s);
+        if !s.contains('\n') || s.len() > 1 {
+            self.fresh = false;
+        }
+        match self.runs.last_mut() {
+            Some(r) if r.format == *f => r.len += s.len(),
+            _ => self.runs.push(CharRun { len: s.len(), format: f.clone() }),
+        }
+    }
+}
+
+/// Deepest table-in-cell or note nesting the drop cap pass walks into.
+pub(super) const MAX_STORY_NESTING: usize = 32;
diff --git a/crates/idml/src/import/styles.rs b/crates/idml/src/import/styles.rs
new file mode 100644
index 000000000..5719393a2
--- /dev/null
+++ b/crates/idml/src/import/styles.rs
@@ -0,0 +1,350 @@
+use super::table::uniform_cell_stroke;
+use super::values::tint;
+use super::{
+    CHAR_BUILTINS, CharacterStyle, El, Fill, Importer, OBJECT_BUILTINS, ObjectStyle, PARA_BUILTINS, ParagraphStyle, Rule, names, st, swatch,
+    unescape_id,
+};
+
+impl<'r> Importer<'r> {
+    // ---------- styles ----------
+
+    pub(super) fn styles(&mut self, top: &[El]) {
+        for e in top.iter().filter(|e| e.local() == "Condition") {
+            let (Some(id), Some(name)) = (e.get("Self"), e.get("Name")) else { continue };
+            // Indicator colours: "r g b" (0–255) or a UI colour name (kept as the default blue).
+            let nums: Vec<u8> = e
+                .get("IndicatorColor")
+                .unwrap_or("")
+                .split_whitespace()
+                .filter_map(|x| x.parse::<f64>().ok())
+                .map(|x| x.clamp(0.0, 255.0) as u8)
+                .collect();
+            let color = if nums.len() == 3 { [nums[0], nums[1], nums[2]] } else { [79, 153, 255] };
+            self.condition_names.insert(id.to_string(), name.to_string());
+            self.conditions.push(designcraft_doc::Condition { name: name.to_string(), color, visible: e.get("Visible") != Some("false") });
+        }
+        for e in top.iter().filter(|e| e.local() == "NumberingList") {
+            let name = e.get("Name").unwrap_or("").to_string();
+            if !name.is_empty() && !name.starts_with("$ID/") && !self.lists.iter().any(|l| l.name == name) {
+                self.lists
+                    .push(designcraft_doc::NumberedList { name, continue_across_stories: e.get("ContinueNumbersAcrossStories") == Some("true") });
+            }
+        }
+        let mut paras: Vec<(String, El)> = Vec::new();
+        let mut chars: Vec<(String, El)> = Vec::new();
+        let mut objects: Vec<(String, El)> = Vec::new();
+        let mut cell_styles: Vec<(String, El)> = Vec::new();
+        let mut table_styles: Vec<(String, El)> = Vec::new();
+        fn walk(e: &El, style: &str, group: &str, out: &mut Vec<(String, El)>) {
+            for c in e.elements() {
+                if c.local() == style {
+                    out.push((c.get("Self").unwrap_or("").to_string(), c.clone()));
+                } else if c.local() == group {
+                    walk(c, style, group, out);
+                }
+            }
+        }
+        for e in top {
+            match e.local() {
+                "RootParagraphStyleGroup" => walk(e, "ParagraphStyle", "ParagraphStyleGroup", &mut paras),
+                "RootCharacterStyleGroup" => walk(e, "CharacterStyle", "CharacterStyleGroup", &mut chars),
+                "RootObjectStyleGroup" => walk(e, "ObjectStyle", "ObjectStyleGroup", &mut objects),
+                "RootCellStyleGroup" => walk(e, "CellStyle", "CellStyleGroup", &mut cell_styles),
+                "RootTableStyleGroup" => walk(e, "TableStyle", "TableStyleGroup", &mut table_styles),
+                _ => {}
+            }
+        }
+        for (id, e) in &paras {
+            let n = names::style_name_in(PARA_BUILTINS, e.get("Name").unwrap_or(""));
+            self.para_names.insert(id.clone(), n);
+        }
+        for (id, e) in &chars {
+            let n = names::style_name_in(CHAR_BUILTINS, e.get("Name").unwrap_or(""));
+            self.char_names.insert(id.clone(), n);
+        }
+        for (id, e) in &objects {
+            let n = names::style_name_in(OBJECT_BUILTINS, e.get("Name").unwrap_or(""));
+            self.object_names.insert(id.clone(), n);
+            self.object_els.insert(id.clone(), e.clone());
+        }
+        for (id, e) in &paras {
+            self.para_els.insert(id.clone(), e.clone());
+        }
+        for (_, e) in &paras {
+            let name = names::style_name_in(PARA_BUILTINS, e.get("Name").unwrap_or(""));
+            let based_on = if name == designcraft_doc::NO_PARA_STYLE { None } else { self.based_on(e, true) };
+            let next_style = e.get("NextStyle").map(|n| self.para_style_ref(n)).filter(|n| *n != name);
+            let para = self.para_attrs(e);
+            let chars = self.char_attrs(e);
+            let s = ParagraphStyle { name: name.clone(), based_on, next_style, para, chars, shortcut: String::new() };
+            match self.styles.para_mut(&name) {
+                Some(slot) => *slot = s,
+                None => self.styles.paragraph.push(s),
+            }
+            // Split Document (EPUB only): on the style, and on its EPUB export tag map. Files write
+            // `false` on every style, so either place saying `true` turns it on.
+            let split = e.get("SplitDocument") == Some("true")
+                || e.elements()
+                    .any(|m| m.local() == "StyleExportTagMap" && m.get("ExportType") == Some("EPUB") && m.get("SplitDocument") == Some("true"));
+            if split {
+                self.styles.export_tags.entry(format!("p:{name}")).or_default().split = true;
+            }
+        }
+        for (_, e) in &chars {
+            let name = names::style_name_in(CHAR_BUILTINS, e.get("Name").unwrap_or(""));
+            let based_on = if name == st::NO_CHAR_STYLE { None } else { self.based_on(e, false) };
+            let chars = self.char_attrs(e);
+            let s = CharacterStyle { name: name.clone(), based_on, chars, shortcut: String::new() };
+            match self.styles.char_style_mut(&name) {
+                Some(slot) => *slot = s,
+                None => self.styles.character.push(s),
+            }
+        }
+        // Keep built-ins as well: [Basic Table] is editable, and [No table style]
+        // supplies the defaults used by named styles in ordinary IDML files.
+        for (id, e) in &cell_styles {
+            self.cell_names.insert(id.clone(), names::style_name_in(names::CELL_BUILTINS, e.get("Name").unwrap_or("")));
+        }
+        for (id, e) in &table_styles {
+            self.table_names.insert(id.clone(), names::style_name_in(names::TABLE_BUILTINS, e.get("Name").unwrap_or("")));
+        }
+        for (_, e) in &cell_styles {
+            let name = names::style_name_in(names::CELL_BUILTINS, e.get("Name").unwrap_or(""));
+            let mut cs = designcraft_doc::CellStyle { name: name.clone(), ..Default::default() };
+            cs.based_on =
+                e.prop("BasedOn").map(|r| self.cell_style_ref(&r)).or_else(|| Some(designcraft_doc::NO_CELL_STYLE.into())).filter(|n| *n != name);
+            cs.fill = e.prop("FillColor").map(|c| self.swatch_ref(&c));
+            cs.fill_tint = tint(e.num("FillTint"));
+            cs.inset_overrides = ["TopInset", "LeftInset", "BottomInset", "RightInset"].map(|k| e.num(k).map(|v| v.max(0.0)));
+            if let [Some(top), Some(left), Some(bottom), Some(right)] = cs.inset_overrides {
+                cs.insets = Some([top, left, bottom, right]);
+                cs.inset_overrides = [None; 4];
+            }
+            cs.vj = e.get("VerticalJustification").map(names::vj_in);
+            cs.first_baseline = e.get("FirstBaselineOffset").map(names::first_baseline_in);
+            cs.first_baseline_min = e.num("MinimumFirstBaselineOffset").filter(|v| v.is_finite()).map(|v| v.clamp(0.0, 8640.0));
+            cs.strokes = ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"].map(|side| self.cell_stroke_attrs(e, side));
+            if let Some(stroke) = uniform_cell_stroke(&cs.strokes) {
+                cs.stroke = Some(stroke);
+                cs.strokes = Default::default();
+            }
+            cs.paragraph_style = e.get("AppliedParagraphStyle").map(|r| self.para_style_ref(r)).filter(|n| n != designcraft_doc::NO_PARA_STYLE);
+            match self.styles.cell.iter_mut().find(|c| c.name == name) {
+                Some(slot) => *slot = cs,
+                None => self.styles.cell.push(cs),
+            }
+        }
+        for (_, e) in &table_styles {
+            let name = names::style_name_in(names::TABLE_BUILTINS, e.get("Name").unwrap_or(""));
+            let mut ts = designcraft_doc::TableStyle { name: name.clone(), ..Default::default() };
+            ts.based_on =
+                e.prop("BasedOn").map(|r| self.table_style_ref(&r)).or_else(|| Some(designcraft_doc::NO_TABLE_STYLE.into())).filter(|n| *n != name);
+            ts.header = e.get("HeaderRegionCellStyle").map(|r| if r == "n" { designcraft_doc::NO_CELL_STYLE.into() } else { self.cell_style_ref(r) });
+            ts.body = e.get("BodyRegionCellStyle").map(|r| if r == "n" { designcraft_doc::NO_CELL_STYLE.into() } else { self.cell_style_ref(r) });
+            ts.footer = e.get("FooterRegionCellStyle").map(|r| if r == "n" { designcraft_doc::NO_CELL_STYLE.into() } else { self.cell_style_ref(r) });
+            ts.left_column =
+                e.get("LeftColumnRegionCellStyle").map(|r| if r == "n" { designcraft_doc::NO_CELL_STYLE.into() } else { self.cell_style_ref(r) });
+            ts.right_column =
+                e.get("RightColumnRegionCellStyle").map(|r| if r == "n" { designcraft_doc::NO_CELL_STYLE.into() } else { self.cell_style_ref(r) });
+            ts.header_same_as_body = e.boolean("HeaderRegionSameAsBodyRegion");
+            ts.footer_same_as_body = e.boolean("FooterRegionSameAsBodyRegion");
+            ts.left_column_same_as_body = e.boolean("LeftColumnRegionSameAsBodyRegion");
+            ts.right_column_same_as_body = e.boolean("RightColumnRegionSameAsBodyRegion");
+            ts.borders = ["TopBorder", "LeftBorder", "BottomBorder", "RightBorder"].map(|side| self.cell_stroke_attrs(e, side));
+            if let Some(border) = uniform_cell_stroke(&ts.borders) {
+                ts.border = Some(border);
+                ts.borders = Default::default();
+            }
+            ts.row_fills = self.alt_fill_attrs(e, "Row");
+            ts.column_fills = self.alt_fill_attrs(e, "Column");
+            ts.row_strokes = self.alt_stroke_attrs(e, "Row");
+            ts.column_strokes = self.alt_stroke_attrs(e, "Column");
+            ts.space_before = e.num("SpaceBefore");
+            ts.space_after = e.num("SpaceAfter");
+            match self.styles.table.iter_mut().find(|c| c.name == name) {
+                Some(slot) => *slot = ts,
+                None => self.styles.table.push(ts),
+            }
+        }
+        for (_, e) in &objects {
+            let name = names::style_name_in(OBJECT_BUILTINS, e.get("Name").unwrap_or(""));
+            let based_on = e.prop("BasedOn").map(|b| {
+                self.object_names
+                    .get(&b)
+                    .cloned()
+                    .unwrap_or_else(|| names::style_name_in(OBJECT_BUILTINS, &unescape_id(b.trim_start_matches("ObjectStyle/"))))
+            });
+            let based_on = based_on.filter(|b| *b != designcraft_doc::NO_OBJECT_STYLE && *b != name);
+            let enabled = |k: &str, attr: &str| match e.get(k) {
+                Some(v) => v == "true",
+                None => e.get(attr).is_some(),
+            };
+            let fill = enabled("EnableFill", "FillColor").then(|| {
+                let sw = e.get("FillColor").map(|r| self.swatch_ref(r)).unwrap_or_else(|| swatch::NONE.into());
+                Fill { swatch: sw, tint: tint(e.num("FillTint")).unwrap_or(1.0), ..Fill::none() }
+            });
+            let stroke = enabled("EnableStroke", "StrokeColor").then(|| self.stroke_from(e, None));
+            let paragraph_style = enabled("EnableParagraphStyle", "AppliedParagraphStyle")
+                .then(|| e.get("AppliedParagraphStyle").map(|r| self.para_style_ref(r)))
+                .flatten();
+            let text_frame = if e.get("EnableTextFrameGeneralOptions") == Some("true") {
+                e.find("TextFramePreference").map(|t| self.frame_options(&[t]))
+            } else {
+                None
+            };
+            let effects = self.style_effects(e);
+            let s = ObjectStyle { name: name.clone(), based_on, fill, stroke, paragraph_style, text_frame, effects };
+            match self.styles.object.iter_mut().find(|o| o.name == name) {
+                Some(slot) => *slot = s,
+                None => self.styles.object.push(s),
+            }
+        }
+    }
+
+    fn based_on(&self, e: &El, para: bool) -> Option<String> {
+        let b = e.prop("BasedOn")?;
+        let b = b.trim();
+        if para {
+            if let Some(n) = self.para_names.get(b) {
+                return Some(n.clone());
+            }
+            let n = names::style_name_in(PARA_BUILTINS, &unescape_id(b.trim_start_matches("ParagraphStyle/")));
+            Some(n)
+        } else {
+            if let Some(n) = self.char_names.get(b) {
+                return Some(n.clone()).filter(|n| n != st::NO_CHAR_STYLE);
+            }
+            let n = names::style_name_in(CHAR_BUILTINS, &unescape_id(b.trim_start_matches("CharacterStyle/")));
+            Some(n).filter(|n| n != st::NO_CHAR_STYLE)
+        }
+    }
+
+    pub(super) fn para_style_ref(&self, r: &str) -> String {
+        self.para_names.get(r).cloned().unwrap_or_else(|| names::style_name_in(PARA_BUILTINS, &unescape_id(r.trim_start_matches("ParagraphStyle/"))))
+    }
+
+    /// A character style reference written as an element's text (nested, line and GREP styles).
+    /// A style name may end in a space, so the reference is used as written when it names a
+    /// style; only otherwise is surrounding whitespace dropped.
+    pub(super) fn listed_char_style_ref(&self, r: &str) -> String {
+        if self.char_names.contains_key(r) { self.char_style_ref(r) } else { self.char_style_ref(r.trim()) }
+    }
+
+    pub(super) fn char_style_ref(&self, r: &str) -> String {
+        self.char_names.get(r).cloned().unwrap_or_else(|| names::style_name_in(CHAR_BUILTINS, &unescape_id(r.trim_start_matches("CharacterStyle/"))))
+    }
+
+    pub(super) fn rule(&mut self, e: &El, k: &str) -> Option<Rule> {
+        // A style or range can set some of a rule's settings (such as only its colour); the others
+        // come from its paragraph style chain, so the rule is whole.
+        let fields = ["", "LineWeight", "Color", "Tint", "Width", "Offset", "LeftIndent", "RightIndent"];
+        if !fields.iter().any(|f| e.prop(&format!("{k}{f}")).is_some()) {
+            return None;
+        }
+        let v: Vec<Option<String>> = fields.iter().map(|f| self.para_setting(e, &format!("{k}{f}"))).collect();
+        let get = |i: usize| v.get(i).cloned().flatten();
+        let num = |i: usize| get(i).and_then(|v| v.trim().parse::<f64>().ok()).filter(|v| v.is_finite());
+        let on = get(0).map(|v| v.trim() == "true");
+        let weight = num(1);
+        on.or(weight.map(|_| false))?;
+        let mut r = Rule { on: on.unwrap_or(false), ..Rule::default() };
+        if let Some(w) = weight {
+            r.weight = w;
+        }
+        if let Some(t) = tint(num(3)) {
+            r.tint = t;
+        }
+        r.column_width = get(4).is_none_or(|w| w.trim() != "TextWidth");
+        r.offset = num(5).unwrap_or(0.0);
+        r.left_indent = num(6).unwrap_or(0.0);
+        r.right_indent = num(7).unwrap_or(0.0);
+        if let Some(c) = get(2) {
+            let c = c.trim();
+            if c == designcraft_doc::TEXT_COLOR {
+                r.color = c.to_string();
+            } else if c.contains('/') {
+                r.color = self.swatch_ref(c);
+            }
+        }
+        Some(r)
+    }
+
+    /// Paragraph setting `k` of `e` (a paragraph style or a range): its own, else from its
+    /// paragraph style chain (`BasedOn` of a style, the applied style of a range).
+    fn para_setting(&self, e: &El, k: &str) -> Option<String> {
+        if let Some(v) = e.prop(k) {
+            return Some(v);
+        }
+        let style_ref = |r: String| if r.starts_with("ParagraphStyle/") { r } else { format!("ParagraphStyle/{}", names::escape_id(&r)) };
+        let mut next =
+            if e.local() == "ParagraphStyle" { e.prop("BasedOn") } else { e.get("AppliedParagraphStyle").map(str::to_string) }.map(style_ref);
+        for _ in 0..16 {
+            let Some(id) = next else { break };
+            let s = self.para_els.get(&id)?;
+            if let Some(v) = s.prop(k) {
+                return Some(v);
+            }
+            next = s.prop("BasedOn").map(style_ref);
+        }
+        None
+    }
+
+    pub(super) fn cell_style_ref(&self, reference: &str) -> String {
+        let reference = reference.trim();
+        self.cell_names
+            .get(reference)
+            .cloned()
+            .unwrap_or_else(|| names::style_name_in(names::CELL_BUILTINS, &unescape_id(reference.trim_start_matches("CellStyle/"))))
+    }
+
+    pub(super) fn table_style_ref(&self, reference: &str) -> String {
+        let reference = reference.trim();
+        self.table_names
+            .get(reference)
+            .cloned()
+            .unwrap_or_else(|| names::style_name_in(names::TABLE_BUILTINS, &unescape_id(reference.trim_start_matches("TableStyle/"))))
+    }
+
+    pub(super) fn cell_stroke_attrs(&mut self, el: &El, prefix: &str) -> designcraft_doc::CellStrokeAttrs {
+        designcraft_doc::CellStrokeAttrs {
+            weight: el.num(&format!("{prefix}StrokeWeight")).map(|v| v.max(0.0)),
+            color: el.prop(&format!("{prefix}StrokeColor")).map(|v| self.swatch_ref(&v)),
+            tint: tint(el.num(&format!("{prefix}StrokeTint"))),
+            kind: el.prop(&format!("{prefix}StrokeType")).map(|v| names::stroke_type_in(&v)),
+            gap_color: el.prop(&format!("{prefix}StrokeGapColor")).map(|v| self.swatch_ref(&v)),
+            gap_tint: tint(el.num(&format!("{prefix}StrokeGapTint"))),
+        }
+    }
+
+    pub(super) fn alt_fill_attrs(&mut self, el: &El, kind: &str) -> designcraft_doc::AltFillsAttrs {
+        designcraft_doc::AltFillsAttrs {
+            first: el.num(&format!("Start{kind}FillCount")).map(|v| v.max(0.0) as u32),
+            first_color: el.prop(&format!("Start{kind}FillColor")).map(|v| self.swatch_ref(&v)),
+            first_tint: tint(el.num(&format!("Start{kind}FillTint"))),
+            next: el.num(&format!("End{kind}FillCount")).map(|v| v.max(0.0) as u32),
+            next_color: el.prop(&format!("End{kind}FillColor")).map(|v| self.swatch_ref(&v)),
+            next_tint: tint(el.num(&format!("End{kind}FillTint"))),
+            skip_first: el.num(&format!("SkipFirstAlternatingFill{kind}s")).map(|v| v.max(0.0) as u32),
+            skip_last: el.num(&format!("SkipLastAlternatingFill{kind}s")).map(|v| v.max(0.0) as u32),
+        }
+    }
+
+    pub(super) fn alt_stroke_attrs(&mut self, el: &El, kind: &str) -> designcraft_doc::AltStrokesAttrs {
+        let first_stroke = self.cell_stroke_attrs(el, &format!("Start{kind}"));
+        let mut next_stroke = self.cell_stroke_attrs(el, &format!("End{kind}"));
+        // IDML uses LineStyle for this one attribute (rather than StrokeType).
+        if kind == "Column"
+            && let Some(value) = el.prop("EndColumnLineStyle")
+        {
+            next_stroke.kind = Some(names::stroke_type_in(&value));
+        }
+        designcraft_doc::AltStrokesAttrs {
+            first: el.num(&format!("Start{kind}StrokeCount")).map(|v| v.max(0.0) as u32),
+            next: el.num(&format!("End{kind}StrokeCount")).map(|v| v.max(0.0) as u32),
+            first_stroke,
+            next_stroke,
+            skip_first: el.num(&format!("SkipFirstAlternatingStroke{kind}s")).map(|v| v.max(0.0) as u32),
+            skip_last: el.num(&format!("SkipLastAlternatingStroke{kind}s")).map(|v| v.max(0.0) as u32),
+        }
+    }
+}
diff --git a/crates/idml/src/import/swatches.rs b/crates/idml/src/import/swatches.rs
new file mode 100644
index 000000000..bdf00d9cb
--- /dev/null
+++ b/crates/idml/src/import/swatches.rs
@@ -0,0 +1,252 @@
+use super::frame::{Prefs, text_frame_options};
+use super::values::{lab_to_color, nums};
+use super::{
+    Color, ColorType, El, Gradient, GradientKind, GradientStop, HashMap, HashSet, Importer, Styles, Swatch, SwatchValue, TextFrameOptions, names,
+    swatch,
+};
+
+impl<'r> Importer<'r> {
+    // ---------- swatches ----------
+
+    fn color_of(e: &El) -> Option<(Color, ColorType)> {
+        let v = nums(e.get("ColorValue").unwrap_or(""));
+        let space = e.get("Space").unwrap_or("CMYK");
+        let c = match space {
+            "RGB" if v.len() >= 3 => Color::rgb((v[0] / 255.0) as f32, (v[1] / 255.0) as f32, (v[2] / 255.0) as f32),
+            "LAB" if v.len() >= 3 => lab_to_color(v[0] as f32, v[1] as f32, v[2] as f32),
+            _ if v.len() >= 4 => Color::cmyk((v[0] / 100.0) as f32, (v[1] / 100.0) as f32, (v[2] / 100.0) as f32, (v[3] / 100.0) as f32),
+            _ => return None,
+        };
+        // Huge values (1e300) overflow `f32` to infinity.
+        let parts = match c {
+            Color::Rgb { r, g, b } => [r, g, b, 0.0],
+            Color::Cmyk { c, m, y, k } => [c, m, y, k],
+            Color::Gray { k } => [k, 0.0, 0.0, 0.0],
+        };
+        if !parts.iter().all(|v| v.is_finite()) {
+            return None;
+        }
+        let ty = if e.get("Model") == Some("Spot") { ColorType::Spot } else { ColorType::Process };
+        Some((c, ty))
+    }
+
+    /// Custom stroke styles.
+    fn read_stroke_styles(&mut self, top: &[El]) {
+        for e in top.iter().filter(|e| matches!(e.local(), "StripedStrokeStyle" | "DashedStrokeStyle" | "DottedStrokeStyle")) {
+            let (Some(id), Some(name)) = (e.get("Self"), e.get("Name")) else { continue };
+            let kind = match e.local() {
+                "StripedStrokeStyle" => designcraft_doc::StrokeType::Stripes {
+                    bands: nums(e.get("StripeArray").unwrap_or(""))
+                        .as_chunks::<2>()
+                        .0
+                        .iter()
+                        .map(|c| (c[0] / 100.0, (c[1] - c[0]) / 100.0))
+                        .collect(),
+                },
+                "DashedStrokeStyle" => designcraft_doc::StrokeType::Dashed { pattern: nums(e.get("DashArray").unwrap_or("")) },
+                _ => designcraft_doc::StrokeType::Dotted,
+            };
+            let _ = id;
+            self.stroke_styles.push(designcraft_doc::StrokeStyleDef { name: name.to_string(), kind });
+        }
+    }
+
+    /// Ink Manager settings: inks converted to process and ink aliases.
+    fn read_inks(&mut self, top: &[El]) {
+        for e in top.iter().filter(|e| e.local() == "Ink") {
+            let Some(name) = e
+                .get("Name")
+                .filter(|n| !n.starts_with("$ID/") && !["Process Cyan", "Process Magenta", "Process Yellow", "Process Black"].contains(n))
+            else {
+                continue;
+            };
+            if e.get("ConvertToProcess") == Some("true") {
+                self.inks.to_process.push(name.to_string());
+            }
+            if let Some(a) = e.get("AliasInkName").filter(|a| !a.is_empty() && *a != name && !a.starts_with("$ID/")) {
+                self.inks.aliases.push((name.to_string(), a.to_string()));
+            }
+        }
+    }
+
+    pub(super) fn graphics(&mut self, top: &[El]) {
+        let mut order: Vec<(String, Swatch)> = Vec::new();
+        // Colours.
+        for e in top.iter().filter(|e| e.local() == "Color") {
+            let Some(id) = e.get("Self") else { continue };
+            let Some((c, ty)) = Self::color_of(e) else { continue };
+            match id {
+                "Color/Paper" => {
+                    if let Some(s) = self.swatches.iter_mut().find(|s| s.name == swatch::PAPER) {
+                        s.value = SwatchValue::Paper { color: if c == Color::cmyk(0.0, 0.0, 0.0, 0.0) { Color::WHITE } else { c } };
+                    }
+                    continue;
+                }
+                "Color/Black" | "Color/Registration" => continue,
+                _ => {}
+            }
+            let name = e.get("Name").unwrap_or("");
+            if e.get("Visible") == Some("false") || name.is_empty() || name == "$ID/" || e.get("Model") == Some("Registration") {
+                self.hidden_colors.insert(id.to_string(), c);
+                continue;
+            }
+            let named = !name.starts_with("C=") && !name.starts_with("R=");
+            self.swatch_names.insert(id.to_string(), name.to_string());
+            order.push((
+                id.to_string(),
+                Swatch { name: name.to_string(), value: SwatchValue::Color { color: c, color_type: ty }, locked: false, named, hidden: false },
+            ));
+        }
+        // Tints (after colours: they reference them).
+        for e in top.iter().filter(|e| e.local() == "Tint") {
+            let Some(id) = e.get("Self") else { continue };
+            let base = e.get("BaseColor").map(|b| self.swatch_ref(b)).unwrap_or_else(|| swatch::BLACK.to_string());
+            let t = e.num("TintValue").unwrap_or(100.0);
+            let name = match e.get("Name") {
+                Some(n) if !n.is_empty() && n != "$ID/" => n.to_string(),
+                _ => format!("{base} {}%", names::num(t)),
+            };
+            self.swatch_names.insert(id.to_string(), name.clone());
+            order.push((
+                id.to_string(),
+                Swatch { name, value: SwatchValue::Tint { base, tint: (t / 100.0) as f32 }, locked: false, named: true, hidden: false },
+            ));
+        }
+        self.read_stroke_styles(top);
+        self.read_inks(top);
+        for e in top.iter().filter(|e| e.local() == "Gradient") {
+            let Some(id) = e.get("Self") else { continue };
+            let mut stops: Vec<GradientStop> = Vec::new();
+            for s in e.find_all("GradientStop") {
+                let r = s.get("StopColor");
+                let c = r.map(|r| self.color_for_ref(r, &order)).unwrap_or(Color::BLACK);
+                // A stop on a named swatch (a spot, a tint, [Paper]) keeps it for its inks;
+                // unnamed colors stay plain. The id becomes the swatch's name below, once
+                // repeated names are numbered.
+                let swatch = r.filter(|r| self.swatch_names.get(*r).is_some_and(|n| n != swatch::NONE)).map(str::to_string);
+                let loc = s.num("Location").unwrap_or(0.0) / 100.0;
+                if let (Some(prev), Some(m)) = (stops.last_mut(), s.num("Midpoint")) {
+                    prev.midpoint = (m / 100.0) as f32;
+                }
+                stops.push(GradientStop { swatch, ..GradientStop::new(loc as f32, c) });
+            }
+            let kind = if e.get("Type") == Some("Radial") { GradientKind::Radial } else { GradientKind::Linear };
+            let unnamed = e.get("Visible") == Some("false") || e.get("Name").is_none_or(|n| n.is_empty() || n == "$ID/");
+            let name = if unnamed { "Gradient".to_string() } else { e.get("Name").unwrap_or_default().to_string() };
+            let sw =
+                Swatch { name, value: SwatchValue::Gradient { gradient: Gradient { kind, stops } }, locked: false, named: !unnamed, hidden: false };
+            if unnamed {
+                // Unnamed gradients become swatches only when something uses them.
+                self.hidden_swatches.insert(id.to_string(), sw);
+            } else {
+                self.swatch_names.insert(id.to_string(), sw.name.clone());
+                order.push((id.to_string(), sw));
+            }
+        }
+        // Panel order from the root colour group.
+        let group_order: Vec<String> = top
+            .iter()
+            .filter(|e| e.local() == "ColorGroup")
+            .flat_map(|g| g.find_all("ColorGroupSwatch").filter_map(|s| s.get("SwatchItemRef").map(str::to_string)).collect::<Vec<_>>())
+            .collect();
+        if !group_order.is_empty() {
+            order.sort_by_key(|(id, _)| group_order.iter().position(|g| g == id).unwrap_or(usize::MAX));
+        }
+        let mut names: HashSet<String> = self.swatches.iter().map(|s| s.name.clone()).collect();
+        let first_new = self.swatches.len();
+        for (id, mut s) in order {
+            if names.contains(&s.name) {
+                let base = s.name.clone();
+                s.name = Styles::unique_name(|n| names.contains(n), &base);
+                self.swatch_names.insert(id, s.name.clone());
+            }
+            names.insert(s.name.clone());
+            self.swatches.push(s);
+        }
+        let stop_names = |stops: &mut Vec<GradientStop>, ids: &HashMap<String, String>| {
+            for stop in stops {
+                stop.swatch = stop.swatch.take().and_then(|id| ids.get(&id).cloned());
+            }
+        };
+        for s in self.swatches.iter_mut().skip(first_new).chain(self.hidden_swatches.values_mut()) {
+            if let SwatchValue::Gradient { gradient } = &mut s.value {
+                stop_names(&mut gradient.stops, &self.swatch_names);
+            }
+        }
+        // Colour groups other than the root one become Swatches panel folders.
+        for g in top.iter().filter(|e| e.local() == "ColorGroup" && e.get("IsRootColorGroup") != Some("true")) {
+            let swatches: Vec<String> =
+                g.find_all("ColorGroupSwatch").filter_map(|s| s.get("SwatchItemRef")).filter_map(|r| self.swatch_names.get(r).cloned()).collect();
+            self.color_groups.push(designcraft_doc::ColorGroup { name: g.get("Name").unwrap_or("Color Group").to_string(), swatches });
+        }
+    }
+
+    fn color_for_ref(&self, r: &str, pending: &[(String, Swatch)]) -> Color {
+        if let Some(c) = self.hidden_colors.get(r) {
+            return *c;
+        }
+        match r {
+            "Color/Black" => return Color::cmyk(0.0, 0.0, 0.0, 1.0),
+            "Color/Paper" => return Color::WHITE,
+            "Color/Registration" => return Color::cmyk(1.0, 1.0, 1.0, 1.0),
+            _ => {}
+        }
+        if let Some((_, s)) = pending.iter().find(|(id, _)| id == r) {
+            match &s.value {
+                SwatchValue::Color { color, .. } => return *color,
+                SwatchValue::Tint { base, tint } => {
+                    let mut all: Vec<Swatch> = self.swatches.clone();
+                    all.extend(pending.iter().map(|(_, s)| s.clone()));
+                    return designcraft_color::swatch::resolve(&all, base, *tint).unwrap_or(Color::BLACK);
+                }
+                _ => {}
+            }
+        }
+        Color::BLACK
+    }
+
+    /// A `TextFramePreference`, with its column rule colour resolved to a swatch.
+    pub(super) fn frame_options(&mut self, prefs: &[&El]) -> TextFrameOptions {
+        let mut o = text_frame_options(prefs);
+        if let Some(r) = Prefs(prefs).prop("ColumnRuleStrokeColor") {
+            o.column_rule_color = self.swatch_ref(&r);
+        }
+        o
+    }
+
+    /// A swatch reference (Self id) → our swatch name; unnamed colours become value-named swatches.
+    pub(super) fn swatch_ref(&mut self, r: &str) -> String {
+        if let Some(n) = self.swatch_names.get(r) {
+            return n.clone();
+        }
+        if r == "n" || r.is_empty() {
+            return swatch::NONE.into();
+        }
+        if let Some(mut sw) = self.hidden_swatches.remove(r) {
+            sw.name = Styles::unique_name(|n| self.swatches.iter().any(|s| s.name == n), &sw.name);
+            self.swatch_names.insert(r.to_string(), sw.name.clone());
+            let name = sw.name.clone();
+            self.swatches.push(sw);
+            return name;
+        }
+        if let Some(c) = self.hidden_colors.get(r).copied() {
+            let name = match c {
+                Color::Cmyk { c, m, y, k } => designcraft_color::swatch::cmyk_name(c, m, y, k),
+                Color::Rgb { r, g, b } => format!("R={} G={} B={}", (r * 255.0).round(), (g * 255.0).round(), (b * 255.0).round()),
+                Color::Gray { k } => format!("K={}", (k * 100.0).round()),
+            };
+            if !self.swatches.iter().any(|s| s.name == name) {
+                self.swatches.push(Swatch {
+                    name: name.clone(),
+                    value: SwatchValue::Color { color: c, color_type: ColorType::Process },
+                    locked: false,
+                    named: false,
+                    hidden: false,
+                });
+            }
+            self.swatch_names.insert(r.to_string(), name.clone());
+            return name;
+        }
+        swatch::NONE.into()
+    }
+}
diff --git a/crates/idml/src/import/table.rs b/crates/idml/src/import/table.rs
new file mode 100644
index 000000000..5b5ca744b
--- /dev/null
+++ b/crates/idml/src/import/table.rs
@@ -0,0 +1,159 @@
+use super::values::{span, tint};
+use super::{CellRange, El, Importer, RowHeightMode, StoryId, Table, names, swatch};
+
+/// Preserve the legacy uniform field only when all four sides explicitly specify every
+/// property. Partial records must stay sparse so they can inherit from a parent style.
+pub(super) fn uniform_cell_stroke(edges: &[designcraft_doc::CellStrokeAttrs; 4]) -> Option<designcraft_doc::CellStroke> {
+    let first = edges.first()?;
+    if edges.iter().any(|edge| edge != first) {
+        return None;
+    }
+    let mut stroke = designcraft_doc::CellStroke {
+        weight: first.weight?,
+        color: first.color.clone()?,
+        tint: first.tint?,
+        kind: first.kind.clone()?,
+        ..Default::default()
+    };
+    first.apply_to(&mut stroke);
+    Some(stroke)
+}
+
+impl<'r> Importer<'r> {
+    /// `<Table>`: rows, columns and cells (cell `Name` is `column:row`).
+    pub(super) fn table(&mut self, e: &El) -> Table {
+        let id = self.alloc();
+        let rows: Vec<&El> = e.find_all("Row").collect();
+        let cols: Vec<&El> = e.find_all("Column").collect();
+        let nr = rows.len().max(1);
+        let nc = cols.len().max(1);
+        let mut t = Table::new(id, nr, nc, 0, 0, 0.0);
+        t.options.direction = if e.get("TableDirection") == Some("RightToLeftDirection") {
+            designcraft_doc::TextDirection::RightToLeft
+        } else {
+            designcraft_doc::TextDirection::LeftToRight
+        };
+        for (r, re) in rows.iter().enumerate() {
+            let auto = re.boolean("AutoGrow").unwrap_or(true);
+            t.rows[r].mode = if auto { RowHeightMode::AtLeast } else { RowHeightMode::Exactly };
+            t.rows[r].height = if auto { re.num("MinimumHeight").unwrap_or(3.0) } else { re.num("SingleRowHeight").unwrap_or(12.0) };
+        }
+        for (c, ce) in cols.iter().enumerate() {
+            t.columns[c].width = ce.num("SingleColumnWidth").unwrap_or(72.0).max(3.0);
+        }
+        let h = e.num("HeaderRowCount").unwrap_or(0.0) as usize;
+        let f = e.num("FooterRowCount").unwrap_or(0.0) as usize;
+        if h.saturating_add(f) < nr {
+            t.set_header_footer(h, f);
+        }
+        let style_name = e.get("AppliedTableStyle").map(|r| self.table_style_ref(r)).unwrap_or_else(|| designcraft_doc::BASIC_TABLE.into());
+        let style = self.styles.resolve_table_style(&style_name);
+        style.apply_to(&mut t, &self.styles.cell);
+        // IDML distinguishes an explicit AppliedCellStyle from the effective region style.
+        for cell in &mut t.cells {
+            cell.style.clear();
+        }
+        // Table-local options override the named table style. Cell styles are already
+        // materialized independently, so their edges retain their higher precedence.
+        let mut border_unset = style.border.is_none() && style.borders.iter().all(|b| b.is_empty());
+        let mut borders = std::array::from_fn::<_, 4, _>(|i| t.options.border_for(i).clone());
+        for (side, border) in ["TopBorder", "LeftBorder", "BottomBorder", "RightBorder"].iter().zip(&mut borders) {
+            let attrs = self.cell_stroke_attrs(e, side);
+            border_unset &= attrs.is_empty();
+            attrs.apply_to(border);
+        }
+        t.options.border = borders[0].clone();
+        t.options.borders = borders.map(Some);
+        t.options.space_before = e.num("SpaceBefore").unwrap_or(t.options.space_before);
+        t.options.space_after = e.num("SpaceAfter").unwrap_or(t.options.space_after);
+        t.options.repeat_header = e.get("HeaderBehavior") != Some("RepeatOnce");
+        t.options.repeat_footer = e.get("FooterBehavior") != Some("RepeatOnce");
+        // A local count may enable a pattern disabled by its parent style. Merge before
+        // materialization so the parent's colors/tints are still available in that case.
+        let mut row_fills = style.row_fills.clone();
+        row_fills.merge(&self.alt_fill_attrs(e, "Row"));
+        row_fills.apply_to(&mut t.options.alt_rows);
+        let mut column_fills = style.column_fills.clone();
+        column_fills.merge(&self.alt_fill_attrs(e, "Column"));
+        column_fills.apply_to(&mut t.options.alt_cols);
+        let mut row_strokes = style.row_strokes.clone();
+        row_strokes.merge(&self.alt_stroke_attrs(e, "Row"));
+        row_strokes.apply_to(&mut t.options.row_strokes);
+        let mut column_strokes = style.column_strokes.clone();
+        column_strokes.merge(&self.alt_stroke_attrs(e, "Column"));
+        column_strokes.apply_to(&mut t.options.column_strokes);
+        let mut regions = Vec::new();
+        for ce in e.find_all("Cell") {
+            let Some((c, r)) =
+                ce.get("Name").and_then(|n| n.split_once(':')).and_then(|(a, b)| Some((a.parse::<usize>().ok()?, b.parse::<usize>().ok()?)))
+            else {
+                continue;
+            };
+            if r >= nr || c >= nc {
+                continue;
+            }
+            let rs = (span(ce, "RowSpan").max(1.0) as usize).min(nr - r);
+            let cs = (span(ce, "ColumnSpan").max(1.0) as usize).min(nc - c);
+            let mut cell = t.cell(r, c).cloned().unwrap_or_default();
+            let cell_style = ce.get("AppliedCellStyle").map(|r| self.cell_style_ref(r)).unwrap_or_else(|| designcraft_doc::NO_CELL_STYLE.into());
+            if cell_style != designcraft_doc::NO_CELL_STYLE {
+                designcraft_doc::resolve_cell_style(&self.styles.cell, &cell_style).apply_to(&mut cell);
+            }
+            cell.style = if cell_style == designcraft_doc::NO_CELL_STYLE { String::new() } else { cell_style };
+            let default_para = cell.text.paras.first().cloned().unwrap_or_default();
+            cell.text = self.story_with_para(StoryId(0), ce, default_para);
+            self.read_cell_attrs(&mut cell, ce, border_unset);
+            if let Some(slot) = t.cell_mut(r, c) {
+                *slot = cell;
+            }
+            if rs > 1 || cs > 1 {
+                regions.push(CellRange { r0: r, c0: c, r1: (r + rs - 1).min(nr - 1), c1: (c + cs - 1).min(nc - 1) });
+            }
+        }
+        for rg in regions {
+            let _ = t.merge(rg);
+        }
+        t
+    }
+
+    /// A cell's local fill, insets, alignment, rotation and edge strokes.
+    fn read_cell_attrs(&mut self, cell: &mut designcraft_doc::Cell, ce: &El, border_unset: bool) {
+        if let Some(fc) = ce.get("FillColor") {
+            cell.fill = self.swatch_ref(fc);
+        }
+        if let Some(tint) = tint(ce.num("FillTint")) {
+            cell.fill_tint = tint;
+        }
+        for (i, k) in ["TopInset", "LeftInset", "BottomInset", "RightInset"].iter().enumerate() {
+            if let Some(v) = ce.num(k) {
+                cell.insets[i] = v.max(0.0);
+            }
+        }
+        if let Some(vj) = ce.get("VerticalJustification") {
+            cell.vj = names::vj_in(vj);
+        }
+        if let Some(fb) = ce.get("FirstBaselineOffset") {
+            cell.first_baseline = names::first_baseline_in(fb);
+        }
+        if let Some(min) = ce.num("MinimumFirstBaselineOffset").filter(|v| v.is_finite()) {
+            cell.first_baseline_min = min.clamp(0.0, 8640.0);
+        }
+        cell.rotation = ce.num("RotationAngle").unwrap_or(cell.rotation);
+        if cell.rotation != 0.0 {
+            self.rotated_cells += 1;
+        }
+        for (i, side) in ["TopEdge", "LeftEdge", "BottomEdge", "RightEdge"].iter().enumerate() {
+            let attrs = self.cell_stroke_attrs(ce, side);
+            attrs.apply_to(&mut cell.strokes[i]);
+            cell.stroke_defined[i] |= !attrs.is_empty();
+            let priority = ce.prop(&format!("{side}StrokePriority")).and_then(|v| v.trim().parse::<i32>().ok()).unwrap_or(0);
+            cell.stroke_priorities[i] = priority;
+            // Preserve style-defined edges and #102's positive-priority local overrides.
+            cell.border_overrides[i] |= priority > 0;
+            // No table or table style border is given anywhere, so the built-in 1 pt default must not
+            // draw over an outer edge the cell explicitly hides (weight 0 or the None swatch), as InDesign draws nothing.
+            let hidden = attrs.weight == Some(0.0) || attrs.color.as_deref() == Some(swatch::NONE);
+            cell.border_overrides[i] |= border_unset && hidden;
+        }
+    }
+}
diff --git a/crates/idml/src/import/text_attrs.rs b/crates/idml/src/import/text_attrs.rs
new file mode 100644
index 000000000..323c14b17
--- /dev/null
+++ b/crates/idml/src/import/text_attrs.rs
@@ -0,0 +1,575 @@
+use super::object_style::corners;
+use super::story::MAX_STORY_NESTING;
+use super::values::tint;
+use super::{
+    Arc, CharAttrs, El, GridAlign, HashSet, IdmlError, Importer, Kerning, ListType, ParaAttrs, Result, SpanColumns, Story, Styles, TabStop, names,
+    st, unescape_id,
+};
+
+/// Whether sanitizing a file's tab list dropped, moved or shortened a stop. Sorting, and the `.`
+/// a char stop with no character aligns on, change nothing.
+fn tab_list_repaired(read: &[TabStop], sanitized: &[TabStop]) -> bool {
+    let kept = |t: &TabStop| {
+        sanitized.iter().any(|o| {
+            o.position == t.position
+                && o.leader == t.leader
+                && (o.align_on == t.align_on || (t.align_on.is_empty() && o.align == designcraft_doc::TabAlign::Char))
+        })
+    };
+    read.len() != sanitized.len() || !read.iter().all(kept)
+}
+
+pub(super) fn mojikumi_row(e: &El) -> Result<designcraft_doc::cjk::MojikumiAki> {
+    let number = |key: &str| -> Result<f64> {
+        let Some(raw) = e.prop(key) else {
+            return Ok(0.0);
+        };
+        raw.trim().parse::<f64>().ok().filter(|v| v.is_finite()).ok_or_else(|| IdmlError::Invalid(format!("Mojikumi row has invalid {key}")))
+    };
+    let integer = |key: &str| -> Result<i16> {
+        let v = number(key)?;
+        if v.fract() != 0.0 || v < f64::from(i16::MIN) || v > f64::from(i16::MAX) {
+            return Err(IdmlError::Invalid(format!("Mojikumi {key} must be an in-range integer")));
+        }
+        Ok(v as i16)
+    };
+    let boolean = |key: &str| -> Result<bool> {
+        match e.prop(key).as_deref().map(str::trim) {
+            None | Some("false") => Ok(false),
+            Some("true") => Ok(true),
+            _ => Err(IdmlError::Invalid(format!("Mojikumi row has invalid {key}"))),
+        }
+    };
+    let row = designcraft_doc::cjk::MojikumiAki {
+        target_class: integer("TargetMojikumiClass")?,
+        side_class: integer("SideMojikumiClass")?,
+        after: boolean("SideIsAfterTarget")?,
+        minimum: number("Minimum")?,
+        desired: number("Desired")?,
+        maximum: number("Maximum")?,
+        priority: integer("CompressionPriority")?,
+        does_not_float: boolean("AkiDoesNotFloat")?,
+    };
+    Ok(row)
+}
+
+impl<'r> Importer<'r> {
+    pub(super) fn char_attrs(&mut self, e: &El) -> CharAttrs {
+        let mut a = CharAttrs::default();
+        if let Some(f) = e.prop("AppliedFont") {
+            // Some writers append the style after a tab. Spaces are part of a family's name
+            // ("Minion Pro " is another font than "Minion Pro"); line breaks around it aren't.
+            let fam = f.split('\t').next().unwrap_or(&f).trim_matches(['\n', '\r']);
+            a.font_family = self.composite_names.get(fam.trim()).cloned().or_else(|| names::font_family_in(fam));
+        }
+        // "Nothing" leaves the style unset: it comes from the paragraph style.
+        a.font_style = e.prop("FontStyle").filter(|s| !matches!(s.trim(), "Nothing" | "$ID/Nothing"));
+        a.size = e.num("PointSize");
+        a.leading = e.prop("Leading").and_then(|l| names::leading_in(l.trim()));
+        // Automatic kerning may carry an inactive numeric value (including the
+        // 1e11 IDML sentinel). It must not become a multi-million-em advance.
+        a.kerning = e.prop("KerningMethod").and_then(|k| match k.trim().trim_start_matches("$ID/") {
+            "Optical" => Some(Kerning::Optical),
+            "Metrics" | "Metrics - Roman Only" => Some(Kerning::Metrics),
+            "None" => Some(Kerning::None),
+            _ => None,
+        });
+        if a.kerning.is_none() {
+            a.kerning = e.num("KerningValue").filter(|v| v.is_finite() && v.abs() < 1e10).map(Kerning::Manual);
+        }
+        a.tracking = e.num("Tracking");
+        a.leading_aki = e.num("LeadingAki").map(|v| (v >= 0.0).then_some(v));
+        a.trailing_aki = e.num("TrailingAki").map(|v| (v >= 0.0).then_some(v));
+        a.tsume = e.num("Tsume").map(|v| (v / 100.0).clamp(0.0, 1.0));
+        a.jidori = e.num("Jidori").map(|v| v.clamp(0.0, 10000.0) as u32);
+        a.leading_model = e.prop("LeadingModel").and_then(|v| crate::cjk::leading_in(&v));
+        a.character_alignment = e.prop("CharacterAlignment").and_then(|v| crate::cjk::alignment_in(&v));
+        a.h_scale = e.num("HorizontalScale").map(|v| v / 100.0);
+        a.v_scale = e.num("VerticalScale").map(|v| v / 100.0);
+        a.baseline_shift = e.num("BaselineShift");
+        a.skew = e.num("Skew");
+        if let Some(r) = e.prop("FillColor") {
+            a.fill = Some(self.swatch_ref(r.trim()));
+        }
+        a.fill_tint = tint(e.num("FillTint"));
+        if let Some(r) = e.prop("StrokeColor") {
+            a.stroke = Some(self.swatch_ref(r.trim()));
+        }
+        a.stroke_tint = tint(e.num("StrokeTint"));
+        a.stroke_weight = e.num("StrokeWeight");
+        // Text strokes are centred on the outline or lie outside it, behind the fill.
+        a.stroke_behind_fill = e.prop("StrokeAlignment").and_then(|v| match v.trim() {
+            "OutsideAlignment" => Some(true),
+            "CenterAlignment" => Some(false),
+            _ => None,
+        });
+        a.capitalization = e.prop("Capitalization").and_then(|v| names::caps_in(v.trim()));
+        a.position = e.prop("Position").and_then(|v| names::position_in(v.trim()));
+        a.underline = e.boolean("Underline");
+        a.strikethrough = e.boolean("StrikeThru");
+        a.ligatures = e.boolean("Ligatures");
+        // Underline / strikethrough options (-9999 = automatic).
+        for k in ["Underline", "StrikeThru"] {
+            let num = |n: &str| e.num(&format!("{k}{n}")).filter(|v| *v > -9000.0);
+            // An explicit Text Color resets an inherited swatch; absence still inherits.
+            // Resolve the sentinel before swatch_ref, which maps unknown names to [None].
+            let color = e.prop(&format!("{k}Color")).map(|r| if r.trim() == "Text Color" { String::new() } else { self.swatch_ref(r.trim()) });
+            let tint = tint(e.num(&format!("{k}Tint")));
+            if k == "Underline" {
+                a.underline_weight = num("Weight").map(Some);
+                a.underline_offset = num("Offset").map(Some);
+                a.underline_color = color;
+                a.underline_tint = tint;
+            } else {
+                a.strikethrough_weight = num("Weight").map(Some);
+                a.strikethrough_offset = num("Offset").map(Some);
+                a.strikethrough_color = color;
+                a.strikethrough_tint = tint;
+            }
+        }
+        read_otf_features(e, &mut a);
+        a.glyph_form = e.prop("GlyphForm");
+        a.no_break = e.boolean("NoBreak");
+        a.tate_chu_yoko = e.boolean("Tatechuyoko");
+        a.tate_chu_yoko_x_offset = e.num("TatechuyokoXOffset");
+        a.tate_chu_yoko_y_offset = e.num("TatechuyokoYOffset");
+        a.warichu = e.boolean("Warichu");
+        a.warichu_lines = e.num("WarichuLines").map(|v| v.max(2.0) as u32);
+        a.warichu_size = e.num("WarichuSize");
+        a.warichu_line_spacing = e.num("WarichuLineSpacing");
+        a.warichu_alignment = e.prop("WarichuAlignment").as_deref().and_then(crate::cjk::warichu_align_in);
+        a.warichu_chars_before_break = e.num("WarichuCharsBeforeBreak").map(|v| v.max(0.0) as u32);
+        a.warichu_chars_after_break = e.num("WarichuCharsAfterBreak").map(|v| v.max(0.0) as u32);
+        // InDesign writes the flag as a number (1); older writers wrote a boolean.
+        if let Some(on) = e.boolean("RubyFlag").or_else(|| e.num("RubyFlag").map(|v| v != 0.0)) {
+            a.ruby = Some(if on { e.prop("RubyString").unwrap_or_default() } else { String::new() });
+        }
+        crate::ruby::read(e, &mut a, |r| self.swatch_ref(r));
+        if let Some(k) = e.get("KentenKind") {
+            a.kenten = Some(k != "None");
+            a.kenten_character = crate::cjk::kenten_character(k).map(str::to_string);
+            if k == "Custom" {
+                a.kenten_character = e.prop("KentenCustomCharacter");
+            }
+        }
+        a.digits = e.prop("DigitsType").and_then(|s| names::digits_in(s.trim()));
+        a.character_direction = e.prop("CharacterDirection").and_then(|s| crate::arabic::direction_in(&s));
+        a.allow_kashidas = e.prop("Kashidas").and_then(|s| crate::arabic::kashidas_in(&s));
+        a.diacritic_position = e.prop("DiacriticPosition").and_then(|s| crate::arabic::diacritic_in(&s));
+        a.diacritic_x_offset = e.num("XOffsetDiacritic").filter(|v| v.is_finite());
+        a.diacritic_y_offset = e.num("YOffsetDiacritic").filter(|v| v.is_finite());
+        a.positional_form = e.prop("PositionalForm");
+        self.cjk_settings_chars(e, &mut a);
+        if let Some(v) = e.get("AppliedConditions").filter(|v| !v.trim().is_empty()) {
+            let names: Vec<String> = v.split_whitespace().filter_map(|r| self.condition_names.get(r).cloned()).collect();
+            if !names.is_empty() {
+                a.conditions = Some(names);
+            }
+        }
+        a.language = e.prop("AppliedLanguage").map(|l| l.trim().trim_start_matches("$ID/").to_string());
+        a
+    }
+
+    pub(super) fn para_attrs(&mut self, e: &El) -> ParaAttrs {
+        let mut a = ParaAttrs::default();
+        let u = |k: &str| e.num(k).map(|v| v.max(0.0) as u32);
+        let frac = |k: &str| e.num(k).map(|v| v / 100.0);
+        a.align = e.prop("Justification").and_then(|v| names::align_in(v.trim()));
+        a.kinsoku_hang = e.prop("KinsokuHangType").and_then(|v| match v.as_str() {
+            "None" => Some(designcraft_doc::cjk::KinsokuHang::None),
+            "KinsokuHangRegular" => Some(designcraft_doc::cjk::KinsokuHang::Regular),
+            "KinsokuHangForce" => Some(designcraft_doc::cjk::KinsokuHang::Force),
+            _ => None,
+        });
+        a.mojikumi = e.prop("Mojikumi").map(|name| self.mojikumi_names.get(&name).cloned().unwrap_or_else(|| unescape_id(&name)));
+        a.kinsoku_type = e.prop("KinsokuType");
+        a.bunri_kinshi = e.boolean("BunriKinshi");
+        a.rensuuji = e.boolean("Rensuuji");
+        a.treat_ideographic_space_as_space = e.boolean("TreatIdeographicSpaceAsSpace");
+        cjk_settings_para(e, &mut a);
+        if let Some(k) = e.prop("KinsokuSet") {
+            if k == "Nothing" || k == "None" {
+                a.kinsoku = Some(Some(Default::default()));
+            } else if let Some(set) = self.kinsoku.get(&k) {
+                a.kinsoku = Some(Some(set.clone()));
+            } else if let Some(set) = designcraft_doc::cjk::Kinsoku::named(&k) {
+                a.kinsoku = Some(Some(set));
+            }
+        }
+        a.direction = e.prop("ParagraphDirection").map(|v| {
+            if v.trim() == "RightToLeftDirection" { designcraft_doc::TextDirection::RightToLeft } else { designcraft_doc::TextDirection::LeftToRight }
+        });
+        a.kashidas = e.prop("Kashidas").and_then(|s| crate::arabic::kashidas_in(&s));
+        a.arabic_justification = e.prop("ParagraphJustification");
+        a.paragraph_kashida_width = e.num("ParagraphKashidaWidth").filter(|v| v.is_finite()).map(Some);
+        a.left_indent = e.num("LeftIndent");
+        a.right_indent = e.num("RightIndent");
+        a.first_line_indent = e.num("FirstLineIndent");
+        a.last_line_indent = e.num("LastLineIndent");
+        a.space_before = e.num("SpaceBefore");
+        if let Some(r) = e.prop("AppliedNumberingList") {
+            let r = r.trim().trim_start_matches("NumberingList/");
+            a.list_name = Some(if r.starts_with("$ID/") { String::new() } else { unescape_id(r) });
+        }
+        match e.prop("NumberingContinue").as_deref().map(str::trim) {
+            Some("false") => a.start_at = Some(e.num("NumberingStartAt").map(|n| n.max(1.0) as u32)),
+            Some("true") => a.start_at = Some(None),
+            _ => {}
+        }
+        self.read_nested_styles(e, &mut a);
+        a.space_after = e.num("SpaceAfter");
+        // A number, or an enumeration (Ignore) that turns it off even over a based-on style's value.
+        a.same_para_style_spacing = e.prop("SameParaStyleSpacing").map(|v| v.trim().parse::<f64>().ok().filter(|v| v.is_finite()));
+        a.drop_cap_lines = u("DropCapLines");
+        a.drop_cap_chars = u("DropCapCharacters");
+        // DropcapDetail bits: 1 = Align Left Edge, 2 = Scale for Descenders.
+        if let Some(v) = e.num("DropcapDetail").filter(|v| v.is_finite() && *v >= 0.0) {
+            let bits = v as u32;
+            a.drop_cap_align_left = Some(bits & 1 != 0);
+            a.drop_cap_scale_descenders = Some(bits & 2 != 0);
+        }
+        if let Some(g) = e.prop("GridAlignment") {
+            a.grid_align = Some(if g.trim() == "None" {
+                GridAlign::None
+            } else if e.boolean("GridAlignFirstLineOnly") == Some(true) {
+                GridAlign::FirstLineOnly
+            } else {
+                GridAlign::AllLines
+            });
+            if g.trim() != "None" {
+                a.grid_reference = Some(crate::cjk::grid_reference_in(&g));
+            }
+        }
+        a.composer = e.prop("Composer").map(|c| composer_in(&c));
+        a.hyphenate = e.boolean("Hyphenation");
+        a.hyph_min_word = u("HyphenateWordsLongerThan");
+        a.hyph_after_first = u("HyphenateAfterFirst");
+        a.hyph_before_last = u("HyphenateBeforeLast");
+        a.hyph_limit = u("HyphenateLadderLimit");
+        a.hyph_zone = e.num("HyphenationZone");
+        a.hyph_capitalized = e.boolean("HyphenateCapitalizedWords");
+        a.hyph_last_word = e.boolean("HyphenateLastWord");
+        a.hyph_across_column = e.boolean("HyphenateAcrossColumns");
+        a.hyph_weight = e.num("HyphenWeight").map(|v| v / 10.0);
+        a.word_space_min = frac("MinimumWordSpacing");
+        a.word_space_desired = frac("DesiredWordSpacing");
+        a.word_space_max = frac("MaximumWordSpacing");
+        a.letter_space_min = frac("MinimumLetterSpacing");
+        a.letter_space_desired = frac("DesiredLetterSpacing");
+        a.letter_space_max = frac("MaximumLetterSpacing");
+        a.glyph_scale_min = frac("MinimumGlyphScaling");
+        a.glyph_scale_desired = frac("DesiredGlyphScaling");
+        a.glyph_scale_max = frac("MaximumGlyphScaling");
+        a.auto_leading = frac("AutoLeading");
+        a.single_word_justify = e.prop("SingleWordJustification").and_then(|v| names::align_in(v.trim()));
+        a.keep_with_next = u("KeepWithNext");
+        a.keep_lines_together = e.boolean("KeepLinesTogether");
+        a.ignore_optical_margin = e.boolean("IgnoreEdgeAlignment");
+        a.keep_all_lines = e.boolean("KeepAllLinesTogether");
+        a.keep_first = u("KeepFirstLines");
+        a.keep_last = u("KeepLastLines");
+        a.start_paragraph = e.prop("StartParagraph").and_then(|v| names::start_para_in(v.trim()));
+        if let Some(t) = e.prop("SpanColumnType") {
+            let n = e.prop("SpanSplitColumnCount").and_then(|v| v.trim().parse::<u32>().ok()).unwrap_or(0);
+            a.span_columns = Some(match t.trim() {
+                "SpanColumns" => SpanColumns::Span(n),
+                "SplitColumns" => SpanColumns::Split(n.max(2)),
+                _ => SpanColumns::Single,
+            });
+        }
+        a.split_inside_gutter = e.num("SplitColumnInsideGutter").filter(|v| v.is_finite());
+        a.split_outside_gutter = e.num("SplitColumnOutsideGutter").filter(|v| v.is_finite());
+        a.rule_above = self.rule(e, "RuleAbove");
+        a.rule_below = self.rule(e, "RuleBelow");
+        a.tabs = self.read_tabs(e);
+        a.list_type = e.prop("BulletsAndNumberingListType").map(|v| match v.trim() {
+            "BulletList" => ListType::Bullets,
+            "NumberedList" => ListType::Numbers,
+            _ => ListType::None,
+        });
+        // A format with no counterpart (CJK, Arabic, Hebrew numbering) is left unset: decimal.
+        a.number_style = e.prop("NumberingFormat").and_then(|v| names::numbering_format_in(&v));
+        a.number_expression = e.prop("NumberingExpression");
+        a.list_separator = e.prop("BulletsTextAfter");
+        if let Some(b) = e.prop_el("BulletChar") {
+            // A glyph of a named font (`GlyphWithFont`) has no character to map to.
+            let unicode = matches!(b.get("BulletCharacterType"), Some("UnicodeOnly" | "UnicodeWithFont"));
+            if let Some(c) = b.get("BulletCharacterValue").and_then(|v| v.trim().parse::<u32>().ok()).and_then(char::from_u32).filter(|_| unicode) {
+                a.bullet_char = Some(c.to_string());
+            }
+        }
+        a.balance_ragged = e.prop("BalanceRaggedLines").map(|v| v.trim() != "NoBalancing" && v.trim() != "false");
+        a.shading_on = e.boolean("ParagraphShadingOn");
+        if let Some(c) = e.prop("ParagraphShadingColor") {
+            a.shading_color = Some(self.swatch_ref(c.trim()));
+        }
+        a.shading_tint = tint(e.num("ParagraphShadingTint"));
+        let sides = |f: &dyn Fn(&str) -> String| -> Option<[f64; 4]> {
+            let v = ["Top", "Left", "Bottom", "Right"].map(|s| e.num(&f(s)));
+            v.iter().any(Option::is_some).then(|| v.map(|x| x.unwrap_or(0.0)))
+        };
+        a.shading_offsets = sides(&|s| format!("ParagraphShading{s}Offset"));
+        a.border_on = e.boolean("ParagraphBorderOn");
+        if let Some(c) = e.prop("ParagraphBorderColor") {
+            a.border_color = Some(self.swatch_ref(c.trim()));
+        }
+        a.border_tint = tint(e.num("ParagraphBorderTint"));
+        a.border_weights = sides(&|s| format!("ParagraphBorder{s}LineWeight"));
+        a.border_offsets = sides(&|s| format!("ParagraphBorder{s}Offset"));
+        a.border_type = e.prop("ParagraphBorderType").map(|v| names::stroke_type_in(v.trim()));
+        a.border_cap = e.prop("ParagraphBorderStrokeEndCap").map(|v| names::cap_in(v.trim()));
+        a.border_join = e.prop("ParagraphBorderStrokeEndJoin").map(|v| names::join_in(v.trim()));
+        a.border_corners = corners(e, "ParagraphBorder");
+        a.border_width = e.prop("ParagraphBorderWidth").map(|v| names::box_width_in(v.trim()));
+        a.border_top = e.prop("ParagraphBorderTopOrigin").map(|v| names::box_top_in(v.trim()));
+        a.border_bottom = e.prop("ParagraphBorderBottomOrigin").map(|v| names::box_bottom_in(v.trim()));
+        a.border_display_if_splits = e.boolean("ParagraphBorderDisplayIfSplits");
+        a.border_merge = e.boolean("MergeConsecutiveParaBorders");
+        if let Some(c) = e.prop("ParagraphBorderGapColor") {
+            a.border_gap_color = Some(self.swatch_ref(c.trim()));
+        }
+        a.border_gap_tint = tint(e.num("ParagraphBorderGapTint"));
+        a.shading_corners = corners(e, "ParagraphShading");
+        a.shading_width = e.prop("ParagraphShadingWidth").map(|v| names::box_width_in(v.trim()));
+        a.shading_top = e.prop("ParagraphShadingTopOrigin").map(|v| names::box_top_in(v.trim()));
+        a.shading_bottom = e.prop("ParagraphShadingBottomOrigin").map(|v| names::box_bottom_in(v.trim()));
+        a.shading_clip = e.boolean("ParagraphShadingClipToFrame");
+        a.shading_nonprinting = e.boolean("ParagraphShadingSuppressPrinting");
+        a.span_space_before = e.num("SpanColumnMinSpaceBefore").filter(|v| v.is_finite());
+        a.span_space_after = e.num("SpanColumnMinSpaceAfter").filter(|v| v.is_finite());
+        a.list_level = e.num("NumberingLevel").filter(|v| v.is_finite()).map(|v| v.round().clamp(1.0, designcraft_doc::LIST_LEVELS as f64) as u32);
+        if let Some(c) = e.prop("BulletsCharacterStyle") {
+            a.bullet_char_style = Some(self.char_style_ref(c.trim()));
+        }
+        if let Some(c) = e.prop("NumberingCharacterStyle") {
+            a.number_char_style = Some(self.char_style_ref(c.trim()));
+        }
+        a.bullet_align = e.prop("BulletsAlignment").map(|v| names::list_align_in(v.trim()));
+        a.number_align = e.prop("NumberingAlignment").map(|v| names::list_align_in(v.trim()));
+        a.restart_numbers = e.boolean("NumberingApplyRestartPolicy");
+        if let Some(r) = e.prop_el("NumberingRestartPolicies") {
+            // A specific level restarts after that level; any other policy after any higher one.
+            let level = r.get("LowerLevel").and_then(|v| v.trim().parse::<u32>().ok()).unwrap_or(0);
+            a.restart_after_level = Some(if r.get("RestartPolicy").map(str::trim) == Some("SpecificPreviousLevel") { level } else { 0 });
+        }
+        if let Some(f) = e.prop("BulletsFont") {
+            let f = f.trim();
+            a.bullet_font = Some(if f == "$ID/" { String::new() } else { f.split('\t').next().unwrap_or(f).to_string() });
+        }
+        if let Some(f) = e.prop("BulletsFontStyle") {
+            let f = f.trim();
+            a.bullet_font_style = Some(if f == "Nothing" || f == "$ID/" { String::new() } else { f.trim_start_matches("$ID/").to_string() });
+        }
+        a
+    }
+
+    fn read_nested_styles(&self, e: &El, attrs: &mut ParaAttrs) {
+        if let Some(list) = e.prop_el("AllNestedStyles") {
+            let styles: Vec<designcraft_doc::NestedStyle> = list
+                .find_all("ListItem")
+                .map(|item| {
+                    let text = |key: &str| item.find(key).map(|element| element.text_content()).unwrap_or_default();
+                    let delimiter = item.find("Delimiter");
+                    designcraft_doc::NestedStyle {
+                        style: self.listed_char_style_ref(&text("AppliedCharacterStyle")),
+                        through: text("Inclusive").trim() != "false",
+                        count: text("Repetition").trim().parse().unwrap_or(1),
+                        until: names::nested_until_in(delimiter.and_then(|element| element.get("type")).unwrap_or("enumeration"), &text("Delimiter")),
+                    }
+                })
+                .collect();
+            // IDML has no drop cap style attribute: the drop cap's character style is the list's
+            // leading "through 1 Dropcap" nested style.
+            attrs.drop_cap_style = styles.first().filter(|style| style.is_drop_cap()).map(|style| style.style.clone());
+            attrs.nested_styles = Some(styles);
+        }
+        if let Some(list) = e.prop_el("AllNestedLineStyles") {
+            let styles = list
+                .find_all("ListItem")
+                .map(|item| {
+                    let text = |key: &str| item.find(key).map(|element| element.text_content()).unwrap_or_default();
+                    designcraft_doc::NestedLineStyle {
+                        style: self.listed_char_style_ref(&text("AppliedCharacterStyle")),
+                        lines: text("LineCount").trim().parse().unwrap_or(1),
+                    }
+                })
+                .collect();
+            attrs.nested_line_styles = Some(styles);
+        }
+        if let Some(list) = e.prop_el("AllGREPStyles") {
+            let styles = list
+                .find_all("ListItem")
+                .map(|item| {
+                    let text = |key: &str| item.find(key).map(|element| element.text_content()).unwrap_or_default();
+                    designcraft_doc::GrepStyle { style: self.listed_char_style_ref(&text("AppliedCharacterStyle")), pattern: text("GrepExpression") }
+                })
+                .collect();
+            attrs.grep_styles = Some(styles);
+        }
+    }
+
+    fn read_tabs(&mut self, e: &El) -> Option<Vec<TabStop>> {
+        let list = e.prop_el("TabList")?;
+        let tabs: Vec<_> = list
+            .find_all("ListItem")
+            .map(|item| {
+                let get = |key: &str| item.find(key).map(|element| element.text_content());
+                TabStop {
+                    position: get("Position").and_then(|value| value.trim().parse::<f64>().ok()).filter(|value| value.is_finite()).unwrap_or(0.0),
+                    align: names::tab_align_in(get("Alignment").unwrap_or_default().trim()),
+                    leader: get("Leader").unwrap_or_default(),
+                    align_on: get("AlignmentCharacter").filter(|character| character != ".").unwrap_or_default(),
+                }
+            })
+            .collect();
+        let sanitized = TabStop::sanitized_list(tabs.clone());
+        if tab_list_repaired(&tabs, &sanitized) {
+            self.repaired_tab_lists = self.repaired_tab_lists.saturating_add(1);
+        }
+        Some(sanitized)
+    }
+}
+
+pub(super) fn ace_char(v: &str) -> Option<char> {
+    match v.trim() {
+        "18" => Some(st::PAGE_NUMBER),
+        "19" => Some(st::SECTION_MARKER),
+        "7" => Some(st::INDENT_HERE),
+        "8" => Some(st::RIGHT_INDENT_TAB),
+        _ => None,
+    }
+}
+
+/// `HL Composer` and `HL Single`, their World-Ready (`… Optyca`) and Japanese (`… J`) forms.
+fn composer_in(name: &str) -> designcraft_doc::Composer {
+    use designcraft_doc::Composer as C;
+    let name = name.trim().trim_start_matches("$ID/");
+    match (name.contains("Single"), name.ends_with(" J") || name.contains("Japanese")) {
+        (false, false) => C::Paragraph,
+        (true, false) => C::SingleLine,
+        (false, true) => C::Japanese,
+        (true, true) => C::JapaneseSingleLine,
+    }
+}
+
+/// [`Importer::clear_inherited_drop_cap_styles`] for one story's paragraphs and those of the table
+/// cells, footnotes and endnotes in it.
+pub(super) fn clear_story_drop_cap_styles(styles: &Styles, story: &mut Story, depth: usize) {
+    for p in &mut story.paras {
+        if p.para.drop_cap_style.is_none() && p.para.nested_styles.is_some() && inherits_drop_cap_style(styles, Some(&p.style)) {
+            p.para.drop_cap_style = Some(st::NO_CHAR_STYLE.into());
+        }
+    }
+    if depth >= MAX_STORY_NESTING {
+        return;
+    }
+    for table in story.tables.values_mut() {
+        for cell in &mut Arc::make_mut(table).cells {
+            clear_story_drop_cap_styles(styles, &mut cell.text, depth + 1);
+        }
+    }
+    for note in story.notes.iter_mut().chain(story.endnotes.iter_mut()) {
+        clear_story_drop_cap_styles(styles, &mut Arc::make_mut(note).text, depth + 1);
+    }
+}
+
+/// Does paragraph style `name` (and its based-on chain) set a drop cap character style? A style
+/// with a nested style list of its own and no drop cap style has none.
+pub(super) fn inherits_drop_cap_style<'a>(styles: &'a Styles, mut name: Option<&'a str>) -> bool {
+    let mut seen = HashSet::new();
+    while let Some(n) = name {
+        let Some(s) = styles.para(n).filter(|_| seen.insert(n)) else { break };
+        if let Some(c) = s.para.drop_cap_style.as_deref() {
+            return !c.is_empty() && c != st::NO_CHAR_STYLE;
+        }
+        if s.para.nested_styles.is_some() {
+            return false;
+        }
+        name = s.based_on.as_deref();
+    }
+    false
+}
+
+/// Auto tate-chu-yoko, Japanese composition and grid settings of a paragraph range or style.
+fn cjk_settings_para(e: &El, a: &mut ParaAttrs) {
+    let count = |k: &str| e.num(k).filter(|v| v.is_finite()).map(|v| v.clamp(0.0, 1000.0) as u32);
+    a.auto_tcy = count("AutoTcy");
+    a.auto_tcy_include_roman = e.boolean("AutoTcyIncludeRoman");
+    a.rotate_roman = e.boolean("RotateSingleByteCharacters");
+    // 欧文泣き別れ: the name is inferred (it follows TreatIdeographicSpaceAsSpace).
+    a.roman_word_break = e.boolean("AllowArbitraryHyphenation");
+    a.grid_gyoudori = count("GridGyoudori");
+    a.paragraph_gyoudori = e.boolean("ParagraphGyoudori");
+}
+
+impl Importer<'_> {
+    /// Kenten Settings, Kenten Color and Shatai of a character range or style.
+    fn cjk_settings_chars(&mut self, e: &El, a: &mut CharAttrs) {
+        let finite = |k: &str| e.num(k).filter(|v| v.is_finite());
+        if let Some(kind) = e.get("KentenKind").and_then(crate::cjk::kenten_kind_in) {
+            a.kenten_kind = Some(kind);
+            if a.kenten_character.as_deref().is_none_or(str::is_empty)
+                && let Some(mark) = kind.mark()
+            {
+                a.kenten_character = Some(mark.to_string());
+            }
+        }
+        if let Some(f) = e.prop("KentenFont") {
+            let f = f.trim();
+            a.kenten_font = Some(if f == "$ID/" { String::new() } else { f.to_string() });
+        }
+        if let Some(st) = e.prop("KentenFontStyle") {
+            let st = st.trim();
+            a.kenten_font_style = Some(if st == "Nothing" { String::new() } else { st.to_string() });
+        }
+        a.kenten_size = finite("KentenFontSize").map(|v| (v > 0.0).then_some(v));
+        a.kenten_x_scale = finite("KentenXScale").map(|v| v / 100.0);
+        a.kenten_y_scale = finite("KentenYScale").map(|v| v / 100.0);
+        a.kenten_distance = finite("KentenPlacement");
+        a.kenten_position = e.prop("KentenPosition").and_then(|v| crate::cjk::kenten_position_in(&v));
+        a.kenten_alignment = e.prop("KentenAlignment").and_then(|v| crate::cjk::kenten_alignment_in(&v));
+        a.kenten_character_set = e.prop("KentenCharacterSet");
+        // "Text Color" is the text's own colour; it resets an inherited swatch.
+        if let Some(r) = e.prop("KentenFillColor") {
+            a.kenten_fill = Some(if r.trim() == "Text Color" { String::new() } else { self.swatch_ref(r.trim()) });
+        }
+        if let Some(r) = e.prop("KentenStrokeColor") {
+            a.kenten_stroke = Some(if r.trim() == "Text Color" { String::new() } else { self.swatch_ref(r.trim()) });
+        }
+        // Tints and weight: -1 is the text's.
+        a.kenten_fill_tint = finite("KentenTint").map(|v| (v >= 0.0).then(|| (v.min(100.0) / 100.0) as f32));
+        a.kenten_stroke_tint = finite("KentenStrokeTint").map(|v| (v >= 0.0).then(|| (v.min(100.0) / 100.0) as f32));
+        a.kenten_stroke_weight = finite("KentenWeight").map(|v| (v >= 0.0).then_some(v));
+        a.kenten_overprint_fill = e.prop("KentenOverprintFill").and_then(|v| crate::cjk::overprint_in(&v));
+        a.kenten_overprint_stroke = e.prop("KentenOverprintStroke").and_then(|v| crate::cjk::overprint_in(&v));
+        a.shatai_magnification = finite("ShataiMagnification");
+        a.shatai_angle = finite("ShataiDegreeAngle").map(|v| v / crate::cjk::SHATAI_ANGLE_UNITS);
+        a.shatai_adjust_rotation = e.boolean("ShataiAdjustRotation");
+        a.shatai_adjust_tsume = e.boolean("ShataiAdjustTsume");
+    }
+}
+
+/// OpenType features (only when the element sets any).
+fn read_otf_features(e: &El, a: &mut CharAttrs) {
+    let mut otf_list: Vec<String> = Vec::new();
+    let mut any = false;
+    for (tag, _, attr) in designcraft_doc::otf::TOGGLES {
+        if let Some(on) = e.boolean(attr) {
+            designcraft_doc::otf::set(&mut otf_list, tag, on);
+            any = true;
+        }
+    }
+    if let Some(fig) = e.prop("OTFFigureStyle")
+        && let Some((id, ..)) = designcraft_doc::otf::FIGURES.iter().find(|f| f.3 == fig.trim())
+    {
+        designcraft_doc::otf::set_figures(&mut otf_list, id);
+        any = true;
+    }
+    if let Some(m) = e.num("OTFStylisticSets") {
+        designcraft_doc::otf::set_stylistic_sets(&mut otf_list, m.max(0.0) as u32);
+        any = true;
+    }
+    if any {
+        a.otf_features = Some(otf_list);
+    }
+}
diff --git a/crates/idml/src/import/values.rs b/crates/idml/src/import/values.rs
new file mode 100644
index 000000000..41ad7bfe6
--- /dev/null
+++ b/crates/idml/src/import/values.rs
@@ -0,0 +1,52 @@
+use super::{Affine, Color, El, Point, lab};
+
+/// An XMP date property, written as an element or an attribute.
+pub(super) fn xmp_date(xmp: &str, key: &str) -> Option<i64> {
+    let value = if let Some(i) = xmp.find(&format!("<{key}>")) {
+        let rest = xmp.get(i + key.len() + 2..)?;
+        rest.get(..rest.find('<')?)?
+    } else {
+        let i = xmp.find(&format!("{key}=\""))?;
+        let rest = xmp.get(i + key.len() + 2..)?;
+        rest.get(..rest.find('"')?)?
+    };
+    designcraft_doc::vars::parse_iso_date(value)
+}
+
+pub(super) fn lab_to_color(l: f32, a: f32, b: f32) -> Color {
+    let rgb = lab::xyz_to_srgb(lab::lab_to_xyz(lab::Lab::new(l, a, b)));
+    Color::rgb(rgb[0], rgb[1], rgb[2])
+}
+
+/// The numbers in a whitespace-separated list; empty when any number is NaN or infinite (JSON
+/// can't store them, and dropping just those would shift the rest).
+pub(super) fn nums(s: &str) -> Vec<f64> {
+    let v: Vec<f64> = s.split_whitespace().filter_map(|v| v.parse().ok()).collect();
+    if v.iter().all(|x| x.is_finite()) { v } else { Vec::new() }
+}
+
+pub(super) fn parse_affine(s: Option<&str>) -> Affine {
+    match s.map(nums) {
+        Some(v) if v.len() == 6 => Affine::new([v[0], v[1], v[2], v[3], v[4], v[5]]),
+        _ => Affine::IDENTITY,
+    }
+}
+
+pub(super) fn parse_point(s: Option<&str>) -> Option<Point> {
+    let v = nums(s?);
+    (v.len() >= 2).then(|| Point::new(v[0], v[1]))
+}
+
+/// IDML tint (percent; `-1` = the colour's own tint, 100 %) → 0..1.
+pub(super) fn tint(v: Option<f64>) -> Option<f32> {
+    v.map(|t| if t < 0.0 || t.is_nan() { 1.0 } else { (t / 100.0).min(1.0) as f32 })
+}
+
+/// A cell span count; an infinite span is kept so it clamps to the table edge.
+pub(super) fn span(e: &El, k: &str) -> f64 {
+    e.prop(k).and_then(|v| v.trim().parse::<f64>().ok()).unwrap_or(1.0)
+}
+
+pub(super) fn finite(v: Option<f64>) -> Option<f64> {
+    v.filter(|v| v.is_finite())
+}
diff --git a/crates/idml/src/tests.rs b/crates/idml/src/tests.rs
index a6a0e3f2c..b2534790b 100644
--- a/crates/idml/src/tests.rs
+++ b/crates/idml/src/tests.rs
@@ -300,6 +300,7 @@ fn indesign_text_defaults() -> Vec<AttrRow> {
         "HyphenateLadderLimit": "3" => 3, "0" => 0, |r| r.0.hyph_limit;
         "HyphenationZone": "36" => 36.0, "18" => 18.0, |r| r.0.hyph_zone;
         "HyphenateCapitalizedWords": "true" => true, "false" => false, |r| r.0.hyph_capitalized;
+        "IgnoreEdgeAlignment": "false" => false, "true" => true, |r| r.0.ignore_optical_margin;
         "HyphenateLastWord": "true" => true, "false" => false, |r| r.0.hyph_last_word;
         "HyphenateAcrossColumns": "true" => true, "false" => false, |r| r.0.hyph_across_column;
         "HyphenWeight": "5" => 0.5, "9" => 0.9, |r| r.0.hyph_weight;
@@ -484,6 +485,57 @@ fn text_color_rules_round_trip() {
     assert_eq!(p.para.kashidas, Some(false));
 }
 
+fn optical_story(pref: &str) -> String {
+    format!(
+        r#"<?xml version="1.0" encoding="UTF-8"?>
+<idPkg:Story xmlns:idPkg="http://ns.adobe.com/AdobeInDesign/idml/1.0/packaging" DOMVersion="16.0">
+  <Story Self="s1">
+    <StoryPreference {pref} StoryOrientation="Horizontal" StoryDirection="LeftToRightDirection"/>
+    <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Body">
+      <CharacterStyleRange AppliedCharacterStyle="CharacterStyle/$ID/[No character style]"><Content>“Hung” here.</Content><Br/></CharacterStyleRange>
+    </ParagraphStyleRange>
+    <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Body" IgnoreEdgeAlignment="true">
+      <CharacterStyleRange AppliedCharacterStyle="CharacterStyle/$ID/[No character style]"><Content>“Flush” here.</Content></CharacterStyleRange>
+    </ParagraphStyleRange>
+  </Story>
+</idPkg:Story>"#
+    )
+}
+
+/// Story ▸ Optical Margin Alignment and its size, and Ignore Optical Margin on paragraphs and
+/// paragraph styles, survive import and export.
+#[test]
+fn story_optical_margin_round_trips() {
+    let story = |d: &Document| d.stories.values().find(|s| s.text.starts_with("“Hung”")).cloned().unwrap();
+    let d = import_idml_with(&fixture_with_story(&optical_story(r#"OpticalMarginAlignment="true" OpticalMarginSize="18""#)), &|_| None).unwrap();
+    let s = story(&d);
+    assert_eq!(s.optical_margin, designcraft_doc::OpticalMargin { on: true, size: 18.0 });
+    assert_eq!((s.paras[0].para.ignore_optical_margin, s.paras[1].para.ignore_optical_margin), (None, Some(true)));
+    let bytes = export_idml(&d);
+    let text = zip_text(&bytes, "Stories/");
+    assert!(text.contains(r#"OpticalMarginAlignment="true" OpticalMarginSize="18""#), "{text}");
+    assert!(text.contains(r#"IgnoreEdgeAlignment="true""#), "{text}");
+    let back = story(&import_idml(&bytes).unwrap());
+    assert_eq!(back.optical_margin, s.optical_margin);
+    assert_eq!(back.paras[1].para.ignore_optical_margin, Some(true));
+    // Sizes outside InDesign's range are clamped; malformed ones and an absent preference are the default.
+    for (pref, want) in [
+        (r#"OpticalMarginAlignment="true" OpticalMarginSize="1e9""#, (true, 1296.0)),
+        (r#"OpticalMarginAlignment="true" OpticalMarginSize="0""#, (true, 0.1)),
+        (r#"OpticalMarginAlignment="true" OpticalMarginSize="NaN""#, (true, 12.0)),
+        (r#"OpticalMarginAlignment="false""#, (false, 12.0)),
+    ] {
+        let d = import_idml_with(&fixture_with_story(&optical_story(pref)), &|_| None).unwrap();
+        let om = story(&d).optical_margin;
+        assert_eq!((om.on, om.size), want, "{pref}");
+    }
+    // On a paragraph style.
+    let d = import_idml_with(&fixture_with_styles(&keep_styles(r#"IgnoreEdgeAlignment="true""#)), &|_| None).unwrap();
+    assert!(d.styles.resolve_para_style("Body").0.ignore_optical_margin);
+    let styles = zip_text(&export_idml(&d), "Resources/Styles.xml");
+    assert!(styles.contains(r#"IgnoreEdgeAlignment="true""#), "{styles}");
+}
+
 /// `[Basic Paragraph]` is InDesign's `$ID/NormalParagraphStyle`, both ways.
 #[test]
 fn basic_paragraph_is_normal_paragraph_style() {
@@ -681,6 +733,15 @@ fn kanji_page_numbers() {
 #[test]
 fn imports_hand_written_fixture() {
     let d = import_idml_with(&fixture(), &|_| None).unwrap();
+    assert_fixture_settings_and_pages(&d);
+    assert_fixture_sections_and_layers(&d);
+    assert_fixture_swatches(&d);
+    assert_fixture_styles(&d);
+    assert_fixture_text(&d);
+    assert_fixture_items(&d);
+}
+
+fn assert_fixture_settings_and_pages(d: &Document) {
     assert_eq!(d.title, "Fixture");
     assert!(d.settings.facing_pages);
     assert_eq!((d.settings.page_width, d.settings.page_height), (500.0, 700.0));
@@ -696,12 +757,18 @@ fn imports_hand_written_fixture() {
     assert_eq!(sp.pages[0].parent, Some(d.parents[0].id));
     let info = d.parents[0].parent.as_ref().unwrap();
     assert_eq!((info.prefix.as_str(), info.name.as_str()), ("A", "Parent"));
+}
+
+fn assert_fixture_sections_and_layers(d: &Document) {
     // Sections.
     assert_eq!(d.page_name(0), "v");
     assert_eq!(d.page_name(1), "vi");
     // Layers.
     assert_eq!(d.layers[0].name, "Art");
     assert_eq!(d.layers[0].color, [255, 0, 0]);
+}
+
+fn assert_fixture_swatches(d: &Document) {
     // Swatches.
     assert!(matches!(d.swatch("Brand").unwrap().value, SwatchValue::Color { color_type: designcraft_color::ColorType::Spot, .. }));
     assert!(matches!(&d.swatch("Brand 50%").unwrap().value, SwatchValue::Tint { base, tint } if base == "Brand" && *tint == 0.5));
@@ -709,10 +776,15 @@ fn imports_hand_written_fixture() {
     assert_eq!(gradient.kind, designcraft_color::GradientKind::Radial);
     assert_eq!(gradient.stops[1].color, Color::cmyk(0.1, 0.2, 0.3, 0.4));
     assert!((gradient.stops[0].midpoint - 0.3).abs() < 1e-6);
+    assert_eq!(gradient.stops[0].swatch.as_deref(), Some("Brand"), "a stop on a swatch keeps it");
+    assert_eq!(gradient.stops[1].swatch, None, "an unnamed color stays plain");
     // The parent rectangle used an unnamed colour → value-named swatch.
     let mr = &d.parents[0].items[0];
     assert_eq!(mr.fill.swatch, "C=10 M=20 Y=30 K=40");
     assert_eq!(mr.bounds(), Rect::new(20.0, 20.0, 100.0, 50.0));
+}
+
+fn assert_fixture_styles(d: &Document) {
     // Styles.
     let body = d.styles.para("Text/Body").expect("grouped style");
     assert_eq!(body.based_on.as_deref(), Some(st::BASIC_PARAGRAPH));
@@ -720,6 +792,9 @@ fn imports_hand_written_fixture() {
     assert_eq!(body.chars.leading, Some(designcraft_doc::Leading::Points(13.0)));
     assert_eq!(body.para.align, Some(designcraft_doc::Align::LeftJustified));
     assert_eq!(d.styles.char_style("Strong").unwrap().chars.font_style.as_deref(), Some("Bold"));
+}
+
+fn assert_fixture_text(d: &Document) {
     // Frames, threads, text.
     let story = d.stories.values().next().unwrap();
     assert_eq!(story.text, format!("Hello & bold\nPage {}\tend{}\nafter", st::PAGE_NUMBER, st::FRAME_BREAK));
@@ -737,6 +812,10 @@ fn imports_hand_written_fixture() {
     let o = &f1.text_frame().unwrap().options;
     assert_eq!((o.columns, o.gutter, o.inset), (2, 8.0, [1.0, 2.0, 3.0, 4.0]));
     assert_eq!(d.item(story.frames[1]).unwrap().bounds(), Rect::new(550.0, 50.0, 650.0, 150.0));
+}
+
+fn assert_fixture_items(d: &Document) {
+    let sp = &d.spreads[0];
     // Group child keeps its own transform relative to the group.
     let g = sp.items.iter().find(|i| i.shape == Shape::Group).unwrap();
     assert_eq!(g.bounds(), Rect::new(510.0, 370.0, 560.0, 420.0));
@@ -990,6 +1069,29 @@ fn round_trips_small_document() {
     assert!(back.swatch("Brand 30").is_some());
 }
 
+#[test]
+fn gradient_stops_keep_their_swatches_through_a_round_trip() {
+    use designcraft_color::{ColorType, Gradient, GradientKind, GradientStop};
+    let mut d = Document::new(&NewDocument::default());
+    let gold = Color::cmyk(0.0, 0.3, 0.9, 0.1);
+    d.swatches.push(Swatch { value: SwatchValue::Color { color: gold, color_type: ColorType::Spot }, ..Swatch::color("Gold", gold) });
+    d.swatches.push(Swatch { value: SwatchValue::Tint { base: "Gold".into(), tint: 0.4 }, ..Swatch::color("Gold 40%", gold) });
+    let on = |offset: f32, name: &str| GradientStop {
+        swatch: Some(name.into()),
+        ..GradientStop::new(offset, designcraft_color::swatch::resolve(&d.swatches, name, 1.0).unwrap())
+    };
+    let stops = vec![on(0.0, "Gold"), on(0.3, "Gold 40%"), GradientStop::new(0.6, Color::cmyk(0.5, 0.0, 0.0, 0.0)), on(1.0, "[Paper]")];
+    d.swatches.push(Swatch {
+        value: SwatchValue::Gradient { gradient: Gradient { kind: GradientKind::Linear, stops } },
+        ..Swatch::color("Gold fade", gold)
+    });
+    let back = import_idml(&export_idml(&d)).unwrap();
+    let SwatchValue::Gradient { gradient } = &back.swatch("Gold fade").unwrap().value else { panic!("gradient") };
+    let names: Vec<Option<&str>> = gradient.stops.iter().map(|s| s.swatch.as_deref()).collect();
+    assert_eq!(names, [Some("Gold"), Some("Gold 40%"), None, Some("[Paper]")]);
+    assert_eq!(gradient.stops[2].color, Color::cmyk(0.5, 0.0, 0.0, 0.0));
+}
+
 #[test]
 fn round_trips_overridden_parent_items() {
     let mut d = Document::new(&NewDocument { pages: 1, ..Default::default() });
@@ -2354,7 +2456,20 @@ fn fixture_with_table_styles(styles: &str, story: &str) -> Vec<u8> {
 fn table_style_cascade_preserves_sparse_edges_and_local_overrides() {
     let d = import_idml(&fixture_with_table_styles(CASCADE_STYLES, CASCADE_STORY)).unwrap();
     d.check().unwrap();
-    let table = d.stories.values().flat_map(|s| s.tables.values()).next().unwrap();
+    let table = first_table(&d);
+    assert_cascade_table_options(table);
+    assert_cascade_header_cell(table);
+    assert_cascade_explicit_cell(table);
+    assert_cascade_local_cell(table);
+    assert_cascade_body_cells(table);
+    assert_cascade_round_trip(&d, table);
+}
+
+fn first_table(doc: &Document) -> &designcraft_doc::Table {
+    doc.stories.values().flat_map(|s| s.tables.values()).next().unwrap()
+}
+
+fn assert_cascade_table_options(table: &designcraft_doc::Table) {
     assert_eq!((table.nrows(), table.ncols()), (2, 3));
     assert_eq!(table.style, "Table");
     assert_eq!(table.options.space_before, 19.0);
@@ -2363,6 +2478,9 @@ fn table_style_cascade_preserves_sparse_edges_and_local_overrides() {
     let fills = table.options.alt_rows.as_ref().unwrap();
     assert_eq!((fills.first, fills.next, fills.first_tint), (1, 1, 0.2));
     assert_eq!(fills.first_color, "Brand");
+}
+
+fn assert_cascade_header_cell(table: &designcraft_doc::Table) {
     let header = table.cell(0, 0).unwrap();
     assert_eq!(header.fill, designcraft_color::swatch::PAPER, "header takes precedence over left region");
     assert!(header.style.is_empty(), "a table region does not become AppliedCellStyle");
@@ -2376,6 +2494,9 @@ fn table_style_cascade_preserves_sparse_edges_and_local_overrides() {
     assert_eq!(header.border_overrides, [true; 4]);
     assert_eq!(header.stroke_defined, [true; 4]);
     assert_eq!(header.stroke_priorities, [0; 4]);
+}
+
+fn assert_cascade_explicit_cell(table: &designcraft_doc::Table) {
     let explicit = table.cell(0, 1).unwrap();
     assert_eq!(explicit.fill, "Brand");
     assert_eq!(explicit.fill_tint, 0.75);
@@ -2384,6 +2505,9 @@ fn table_style_cascade_preserves_sparse_edges_and_local_overrides() {
     assert_eq!(explicit.strokes[0].color, designcraft_color::swatch::NONE);
     assert_eq!(explicit.strokes[3].weight, 5.0);
     assert_eq!(explicit.strokes[3].tint, 0.3);
+}
+
+fn assert_cascade_local_cell(table: &designcraft_doc::Table) {
     let local = table.cell(0, 2).unwrap();
     assert_eq!(local.fill, designcraft_color::swatch::NONE);
     assert_eq!(local.fill_tint, 0.0);
@@ -2393,13 +2517,18 @@ fn table_style_cascade_preserves_sparse_edges_and_local_overrides() {
     assert_eq!(local.strokes[3].color, designcraft_color::swatch::NONE);
     assert_eq!(local.stroke_priorities, [0, 0, 0, 7]);
     assert_eq!(local.text.paras[0].style, st::BASIC_PARAGRAPH, "explicit paragraph style wins");
+}
+
+fn assert_cascade_body_cells(table: &designcraft_doc::Table) {
     assert_eq!(table.cell(1, 0).unwrap().fill, designcraft_color::swatch::BLACK);
     assert_eq!(table.cell(1, 0).unwrap().strokes[1].weight, 0.0);
     assert_eq!(table.cell(1, 1).unwrap().fill_tint, 0.5);
     assert_eq!(table.cell(1, 2).unwrap().fill, "Brand");
+}
 
-    let back = import_idml(&export_idml(&d)).unwrap();
-    let roundtrip = back.stories.values().flat_map(|s| s.tables.values()).next().unwrap();
+fn assert_cascade_round_trip(d: &Document, table: &designcraft_doc::Table) {
+    let back = import_idml(&export_idml(d)).unwrap();
+    let roundtrip = first_table(&back);
     for (before, after) in table.cells.iter().zip(&roundtrip.cells) {
         assert_eq!(after.strokes, before.strokes);
         assert_eq!(after.border_overrides, before.border_overrides);
@@ -2923,14 +3052,22 @@ fn kenten_shatai_and_grid_settings_import_and_round_trip() {
 
 #[test]
 fn ruby_settings_import_from_idml_and_round_trip() {
-    use designcraft_doc::cjk_settings::AdornmentOverprint;
-    use designcraft_doc::ruby::{RubyAlignment, RubyOverhang, RubyParentSpacing, RubyPosition, RubyType};
     // InDesign's names: RubyFlag is a number, colours and fonts are properties.
     let story = r#"<idPkg:Story xmlns:idPkg="http://ns.adobe.com/AdobeInDesign/idml/1.0/packaging"><Story Self="s1">
       <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/$ID/[No paragraph style]">
         <CharacterStyleRange AppliedCharacterStyle="CharacterStyle/$ID/[No character style]" RubyFlag="1" RubyString="かん　じ" RubyType="PerCharacterRuby" RubyAlignment="RubyCenter" RubyPosition="BelowLeft" RubyYOffset="-1.4173228" RubyFontSize="-1" RubyXScale="90" RubyParentOverhangAmount="RubyOverhangNoLimit" RubyParentSpacing="RubyParentBothSides" RubyAutoAlign="false" RubyAutoScaling="true" RubyParentScalingPercent="40" RubyAutoTcyDigits="2" RubyTint="-1" RubyOverprintFill="Auto"><Properties><RubyFont type="string">$ID/</RubyFont><RubyFontStyle type="enumeration">Nothing</RubyFontStyle><RubyFill type="string">Text Color</RubyFill></Properties><Content>漢字</Content></CharacterStyleRange>
       </ParagraphStyleRange></Story></idPkg:Story>"#;
-    let doc = import_idml(&fixture_with_story(story)).unwrap();
+    let imported = import_idml(&fixture_with_story(story)).unwrap();
+    assert_imported_ruby_settings(&imported);
+
+    let doc = ruby_round_trip_document();
+    let back = import_idml(&export_idml(&doc)).unwrap();
+    assert_ruby_round_trip(&doc, &back);
+}
+
+fn assert_imported_ruby_settings(doc: &Document) {
+    use designcraft_doc::cjk_settings::AdornmentOverprint;
+    use designcraft_doc::ruby::{RubyAlignment, RubyOverhang, RubyParentSpacing, RubyPosition, RubyType};
     let a = doc.stories.values().find(|s| s.text.contains("漢字")).unwrap().runs().next().unwrap().1.over.clone();
     assert_eq!(a.ruby.as_deref(), Some("かん　じ"));
     assert_eq!(a.ruby_type, Some(RubyType::PerCharacter));
@@ -2945,8 +3082,11 @@ fn ruby_settings_import_from_idml_and_round_trip() {
     assert_eq!(a.ruby_auto_tcy_digits, Some(2));
     assert_eq!((a.ruby_font.as_deref(), a.ruby_font_style.as_deref(), a.ruby_fill.as_deref()), (Some(""), Some(""), Some("")));
     assert_eq!((a.ruby_fill_tint, a.ruby_overprint_fill), (Some(None), Some(AdornmentOverprint::Auto)));
+}
 
-    // Every setting survives export and import.
+fn ruby_round_trip_document() -> Document {
+    use designcraft_doc::cjk_settings::AdornmentOverprint;
+    use designcraft_doc::ruby::{RubyAlignment, RubyOverhang, RubyParentSpacing, RubyPosition, RubyType};
     let mut d = Document::new(&NewDocument::default());
     let lid = d.default_layer();
     let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(72.0, 72.0, 300.0, 200.0), lid, "漢字", ParaFormat::default()).unwrap();
@@ -2981,8 +3121,11 @@ fn ruby_settings_import_from_idml_and_round_trip() {
         o.ruby_overprint_fill = Some(AdornmentOverprint::On);
         o.ruby_overprint_stroke = Some(AdornmentOverprint::Off);
     });
-    let a = d.stories[&sid].runs().next().unwrap().1.over.clone();
-    let back = import_idml(&export_idml(&d)).unwrap();
+    d
+}
+
+fn assert_ruby_round_trip(d: &Document, back: &Document) {
+    let a = d.stories.values().find(|s| s.text.contains("漢字")).unwrap().runs().next().unwrap().1.over.clone();
     let b = back.stories.values().find(|s| s.text.contains("漢字")).unwrap().runs().next().unwrap().1.over.clone();
     macro_rules! same {
         ($($f:ident),*) => { $( assert_eq!(a.$f, b.$f, stringify!($f)); )* };
@@ -4456,6 +4599,7 @@ fn exports_graphic_in_table_cell() {
     });
     let mut t = designcraft_doc::Table::new(d.alloc(), 2, 2, 0, 0, 200.0);
     t.cell_mut(1, 0).unwrap().graphic = Some(designcraft_doc::Graphic {
+        layer_options: None,
         asset: id,
         size: (24.0, 24.0),
         xf: designcraft_geom::Affine::IDENTITY,
@@ -4580,3 +4724,57 @@ fn style_names_with_a_literal_colon_survive_a_round_trip() {
         assert_eq!(names::style_name_in(names::PARA_BUILTINS, &names::style_name_out(names::PARA_BUILTINS, n)), n);
     }
 }
+
+/// Split Document (EPUB only) comes from the style, or from its EPUB export tag map, and is
+/// written back on the style.
+#[test]
+fn split_document_round_trips() {
+    let xml = r#"<?xml version="1.0" encoding="UTF-8"?>
+<idPkg:Styles xmlns:idPkg="http://ns.adobe.com/AdobeInDesign/idml/1.0/packaging" DOMVersion="16.0">
+  <RootParagraphStyleGroup Self="rp">
+    <ParagraphStyle Self="ParagraphStyle/$ID/[No paragraph style]" Name="$ID/[No paragraph style]" PointSize="12" SplitDocument="false"/>
+    <ParagraphStyle Self="ParagraphStyle/Part" Name="Part" SplitDocument="true"/>
+    <ParagraphStyle Self="ParagraphStyle/Chapter" Name="Chapter" SplitDocument="false">
+      <StyleExportTagMap Self="uaStyleExportTagMapnEPUB" ExportType="EPUB" ExportTag="h1" ExportClass="" ExportAttributes="" SplitDocument="true" EmitCss="true"/>
+    </ParagraphStyle>
+    <ParagraphStyle Self="ParagraphStyle/Body" Name="Body" SplitDocument="false"/>
+  </RootParagraphStyleGroup>
+</idPkg:Styles>"#;
+    let d = import_idml_with(&fixture_with_styles(xml), &|_| None).unwrap();
+    let split = |d: &designcraft_doc::Document, name: &str| d.styles.export_tag(name, false).is_some_and(|t| t.split);
+    assert!(split(&d, "Part") && split(&d, "Chapter") && !split(&d, "Body"));
+    let back = import_idml(&export_idml(&d)).unwrap();
+    assert!(split(&back, "Part") && split(&back, "Chapter") && !split(&back, "Body"));
+}
+
+/// EPUB Export Options › Split Document: off, one style (built in or not) or the styles' export
+/// tags, read from the file's `EPubExportPreference` and written back.
+#[test]
+fn epub_split_document_round_trips() {
+    use designcraft_doc::EpubSplit;
+    let styles =
+        STYLES.replace("</RootParagraphStyleGroup>", r#"<ParagraphStyle Self="ParagraphStyle/Chapter" Name="Chapter"/></RootParagraphStyleGroup>"#);
+    assert!(styles.contains("ParagraphStyle/Chapter"), "the fixture has a paragraph style group");
+    for (attrs, want) in [
+        (r#"BreakDocument="false" ParagraphStyleName="ParagraphStyle/Chapter""#, EpubSplit::Off),
+        (r#"BreakDocument="true" ParagraphStyleName="ParagraphStyle/Chapter""#, EpubSplit::Style("Chapter".into())),
+        (r#"BreakDocument="true" ParagraphStyleName="ParagraphStyle/Text%3aBody""#, EpubSplit::Style("Text/Body".into())),
+        (r#"BreakDocument="true" ParagraphStyleName="$ID/NormalParagraphStyle""#, EpubSplit::Style(designcraft_doc::BASIC_PARAGRAPH.into())),
+        (r#"BreakDocument="true" ParagraphStyleName="""#, EpubSplit::ExportTags),
+        (r#"BreakDocument="true" ParagraphStyleName="ParagraphStyle/Missing""#, EpubSplit::Off),
+    ] {
+        let prefs = PREFS.replace("</idPkg:Preferences>", &format!("<EPubExportPreference {attrs}/></idPkg:Preferences>"));
+        let file = zip_files(&[
+            ("designmap.xml", DESIGNMAP),
+            ("Resources/Graphic.xml", GRAPHIC),
+            ("Resources/Styles.xml", &styles),
+            ("Resources/Preferences.xml", &prefs),
+            ("MasterSpreads/MasterSpread_m1.xml", MASTER),
+            ("Spreads/Spread_sp1.xml", SPREAD),
+            ("Stories/Story_s1.xml", STORY),
+        ]);
+        let d = import_idml_with(&file, &|_| None).unwrap();
+        assert_eq!(d.settings.epub_split, want, "{attrs}");
+        assert_eq!(import_idml(&export_idml(&d)).unwrap().settings.epub_split, want, "{attrs}");
+    }
+}
diff --git a/crates/idml/src/tests/assets.rs b/crates/idml/src/tests/assets.rs
index 23ec31f34..48875c256 100644
--- a/crates/idml/src/tests/assets.rs
+++ b/crates/idml/src/tests/assets.rs
@@ -70,6 +70,129 @@ fn package(frames: &[String]) -> Vec<u8> {
     ])
 }
 
+#[test]
+fn nested_graphic_layers_preserve_hierarchy_on_roundtrip() {
+    let option = r#"<GraphicLayerOption UpdateLinkOption="KeepOverrides">
+      <GraphicLayer Self="a" Id="1" Name="Group"><GraphicLayer Self="b" Id="2" Name="Nested" OriginalVisibility="true" CurrentVisibility="false"/></GraphicLayer>
+      <GraphicLayer Self="c" Id="3" Name="Sibling"/>
+    </GraphicLayerOption>"#;
+    let image = image(1, PHOTO, None).replace("</Image>", &format!("{option}</Image>"));
+    let d = import_idml(&package(&[frame(1, 0.0, 0.0, &image)])).unwrap();
+    let options = |d: &Document| d.spreads[0].items[0].graphic().unwrap().layer_options.clone().unwrap();
+    let expected = options(&d);
+    assert_eq!(expected.layers.len(), 3);
+    assert_eq!(expected.parents, [None, Some(0), None]);
+    assert!(expected.has_visibility_overrides());
+    let reopened = import_idml(&export_idml(&d)).unwrap();
+    assert_eq!(options(&reopened), expected);
+}
+
+#[test]
+fn graphic_layer_options_survive_for_each_placement_of_a_shared_asset() {
+    let option = |n: usize, visible: &str| {
+        format!(
+            r#"<GraphicLayerOption UpdateLinkOption="KeepOverrides"><GraphicLayer Self="gl{n}" Id="7" Name="Synthetic layer" OriginalVisibility="true" CurrentVisibility="{visible}" Locked="true" HasPrintState="true" PrintState="false"/></GraphicLayerOption>"#
+        )
+    };
+    let frames = ["false", "true"]
+        .into_iter()
+        .enumerate()
+        .map(|(i, visible)| {
+            let n = i + 1;
+            frame(n, i as f64 * 100.0, 0.0, &image(n, PHOTO, None).replace("</Image>", &format!("{}</Image>", option(n, visible))))
+        })
+        .collect::<Vec<_>>();
+    let reads = Cell::new(0);
+    let loaded = import_idml_report_with_previews(
+        &package(&frames),
+        &|_| {
+            reads.set(reads.get() + 1);
+            Some(vec![42; 16])
+        },
+        &Default::default(),
+    )
+    .unwrap();
+    assert_eq!(reads.get(), 1);
+    assert_eq!(loaded.document.assets.len(), 1, "layer choices belong to placements, not shared image bytes");
+    let out = export_idml(&loaded.document);
+    let spreads = zip_text(&out, "Spreads/");
+    assert_eq!(spreads.matches("<GraphicLayer ").count(), 2, "both placements must retain their independent layer choices");
+    assert!(spreads.contains("CurrentVisibility=\"false\""));
+    assert!(spreads.contains("CurrentVisibility=\"true\""));
+    assert_eq!(spreads.matches("UpdateLinkOption=\"KeepOverrides\"").count(), 2);
+    assert_eq!(spreads.matches("PrintState=\"false\"").count(), 2);
+    assert!(loaded.warnings.iter().any(|w| w.contains("layer visibility")));
+    let reopened = import_idml(&out).unwrap();
+    let options = |d: &Document| {
+        d.spreads[0]
+            .items
+            .iter()
+            .filter_map(|i| match &i.content {
+                Content::Graphic(g) => g.layer_options.clone(),
+                _ => None,
+            })
+            .collect::<Vec<_>>()
+    };
+    assert_eq!(options(&loaded.document), options(&reopened));
+    let twice = zip_text(&export_idml(&reopened), "Spreads/");
+    assert_eq!(twice.matches("<GraphicLayer ").count(), 2);
+}
+
+#[test]
+fn malformed_native_graphic_layer_parents_cannot_cycle_or_overflow_xml_depth() {
+    let mut d = import_idml(&package(&[frame(1, 0.0, 0.0, &image(1, PHOTO, None))])).unwrap();
+    let Content::Graphic(g) = &mut std::sync::Arc::make_mut(&mut std::sync::Arc::make_mut(&mut d.spreads[0]).items[0]).content else {
+        panic!("graphic")
+    };
+    let mut options = designcraft_doc::GraphicLayerOptions::default();
+    for i in 0..300usize {
+        options.layers.push(std::collections::BTreeMap::from([("Name".into(), format!("Layer {i}"))]));
+        options.parents.push(Some(i.saturating_sub(1)));
+    }
+    options.parents[1] = Some(usize::MAX);
+    g.layer_options = Some(options);
+    let reopened = import_idml(&export_idml(&d)).unwrap();
+    assert_eq!(reopened.spreads[0].items[0].graphic().unwrap().layer_options.as_ref().unwrap().layers.len(), 300);
+}
+
+#[test]
+fn closed_graphic_layer_subtrees_cannot_reorder_native_layers() {
+    let mut d = import_idml(&package(&[frame(1, 0.0, 0.0, &image(1, PHOTO, None))])).unwrap();
+    let Content::Graphic(g) = &mut std::sync::Arc::make_mut(&mut std::sync::Arc::make_mut(&mut d.spreads[0]).items[0]).content else {
+        panic!("graphic")
+    };
+    g.layer_options = Some(designcraft_doc::GraphicLayerOptions {
+        layers: ["A", "B", "C", "D"].into_iter().map(|name| std::collections::BTreeMap::from([("Name".into(), name.into())])).collect(),
+        parents: vec![None, None, Some(0), Some(2)],
+        ..Default::default()
+    });
+    let reopened = import_idml(&export_idml(&d)).unwrap();
+    let options = reopened.spreads[0].items[0].graphic().unwrap().layer_options.as_ref().unwrap();
+    assert_eq!(options.layers.iter().map(|a| a["Name"].as_str()).collect::<Vec<_>>(), ["A", "B", "C", "D"]);
+    assert_eq!(options.parents, [None, None, None, Some(2)]);
+}
+
+#[test]
+fn graphic_layer_attributes_from_native_data_cannot_inject_xml_or_self_ids() {
+    let mut d = import_idml(&package(&[frame(1, 0.0, 0.0, &image(1, PHOTO, None))])).unwrap();
+    let Content::Graphic(g) = &mut std::sync::Arc::make_mut(&mut std::sync::Arc::make_mut(&mut d.spreads[0]).items[0]).content else {
+        panic!("graphic")
+    };
+    let attributes = std::collections::BTreeMap::from([
+        ("Name".into(), "A < B & C".into()),
+        ("Self".into(), "injected-id".into()),
+        ("xmlns".into(), "urn:injected".into()),
+        ("bad\" injected=\"true".into(), "invalid".into()),
+    ]);
+    g.layer_options = Some(designcraft_doc::GraphicLayerOptions { attributes: attributes.clone(), layers: vec![attributes], ..Default::default() });
+    let out = export_idml(&d);
+    let xml = zip_text(&out, "Spreads/");
+    assert!(!xml.contains("injected-id") && !xml.contains("injected=") && !xml.contains("urn:injected"));
+    let back = import_idml(&out).unwrap();
+    let Content::Graphic(g) = &back.spreads[0].items[0].content else { panic!("graphic") };
+    assert_eq!(g.layer_options.as_ref().unwrap().layers[0]["Name"], "A < B & C");
+}
+
 /// (asset, crop, transform) of each graphic, left to right.
 fn placements(d: &Document) -> Vec<(AssetId, [f64; 4], designcraft_geom::Affine)> {
     let mut out: Vec<(f64, AssetId, [f64; 4], designcraft_geom::Affine)> = d.spreads[0]
diff --git a/crates/idml/src/tests/frame_grid.rs b/crates/idml/src/tests/frame_grid.rs
index 93c081377..99f57b4ea 100644
--- a/crates/idml/src/tests/frame_grid.rs
+++ b/crates/idml/src/tests/frame_grid.rs
@@ -6,6 +6,12 @@ const NS: &str = r#"xmlns:idPkg="http://ns.adobe.com/AdobeInDesign/idml/1.0/pack
 /// 14 pt increment; its four paragraphs align to the grid. The frame's top is the page's top, so
 /// the grid lines are 6 + n·14 pt down from the frame top whatever the grid is measured from.
 fn frame_grid_doc() -> Document {
+    frame_grid_doc_relative(None)
+}
+
+/// [`frame_grid_doc`] with `BaselineFrameGridRelativeOption` set to `relative` when given.
+fn frame_grid_doc_relative(relative: Option<&str>) -> Document {
+    let relative = relative.map(|r| format!(r#" BaselineFrameGridRelativeOption="{r}""#)).unwrap_or_default();
     let designmap = format!(
         r#"<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Document {NS} Self="d" StoryList="s1" Name="grid.indd"><idPkg:Graphic src="Resources/Graphic.xml"/><idPkg:Styles src="Resources/Styles.xml"/><idPkg:Preferences src="Resources/Preferences.xml"/><Layer Self="L1" Name="Layer 1" Visible="true" Locked="false"/><idPkg:Spread src="Spreads/Spread_sp1.xml"/><idPkg:Story src="Stories/Story_s1.xml"/></Document>"#
@@ -17,7 +23,7 @@ fn frame_grid_doc() -> Document {
         .collect();
     let spread = format!(
         r#"<idPkg:Spread {NS}><Spread Self="sp1" PageCount="1" ItemTransform="1 0 0 1 0 0"><Page Self="p1" GeometricBounds="0 0 600 400" ItemTransform="1 0 0 1 0 -300"/>
-<TextFrame Self="t1" ParentStory="s1" PreviousTextFrame="n" NextTextFrame="n" ItemLayer="L1" ItemTransform="1 0 0 1 0 -300"><Properties><PathGeometry><GeometryPathType PathOpen="false"><PathPointArray>{pts}</PathPointArray></GeometryPathType></PathGeometry></Properties><TextFramePreference InsetSpacing="0"/><BaselineFrameGridOption UseCustomBaselineFrameGrid="true" StartingOffsetForBaselineFrameGrid="6" BaselineFrameGridIncrement="14"/></TextFrame>
+<TextFrame Self="t1" ParentStory="s1" PreviousTextFrame="n" NextTextFrame="n" ItemLayer="L1" ItemTransform="1 0 0 1 0 -300"><Properties><PathGeometry><GeometryPathType PathOpen="false"><PathPointArray>{pts}</PathPointArray></GeometryPathType></PathGeometry></Properties><TextFramePreference InsetSpacing="0"/><BaselineFrameGridOption UseCustomBaselineFrameGrid="true" StartingOffsetForBaselineFrameGrid="6" BaselineFrameGridIncrement="14"{relative}/></TextFrame>
 </Spread></idPkg:Spread>"#
     );
     let story = format!(
@@ -46,7 +52,7 @@ fn baselines(d: &Document) -> Vec<f64> {
 fn custom_frame_grid_sets_lines_from_its_start_by_its_increment() {
     let d = frame_grid_doc();
     let grid = d.spreads[0].items[0].text_frame().unwrap().options.baseline_grid;
-    assert_eq!(grid, Some(designcraft_doc::FrameBaselineGrid { start: 6.0, increment: 14.0 }));
+    assert_eq!(grid, Some(designcraft_doc::FrameBaselineGrid::new(6.0, 14.0)));
     let b = baselines(&d);
     assert_eq!(b.len(), 4, "{b:?}");
     for y in &b {
@@ -69,3 +75,24 @@ fn custom_frame_grid_round_trips() {
     assert_eq!(grid(&back), grid(&d));
     assert_eq!(baselines(&back), baselines(&d));
 }
+
+#[test]
+fn custom_frame_grid_relative_to_round_trips() {
+    use designcraft_doc::FrameGridRelative as R;
+    let relative = |d: &Document| d.spreads[0].items[0].text_frame().unwrap().options.baseline_grid.map(|g| g.relative_to);
+    for (attr, want) in [
+        ("TopOfPageOfBaselineFrameGridRelativeOption", R::TopOfPage),
+        ("TopOfMarginOfBaselineFrameGridRelativeOption", R::TopMargin),
+        ("TopOfFrameOfBaselineFrameGridRelativeOption", R::TopOfFrame),
+        ("TopOfInsetOfBaselineFrameGridRelativeOption", R::TopInset),
+        ("TopOfInset", R::TopInset),
+        ("SomethingNew", R::TopOfPage),
+    ] {
+        let d = frame_grid_doc_relative(Some(attr));
+        assert_eq!(relative(&d), Some(want), "{attr}");
+        let back = import_idml(&export_idml(&d)).unwrap();
+        assert_eq!(relative(&back), Some(want), "{attr} after export");
+    }
+    // A frame without the attribute measures from the top of the page.
+    assert_eq!(relative(&frame_grid_doc()), Some(R::TopOfPage));
+}
diff --git a/crates/idml/src/xml.rs b/crates/idml/src/xml.rs
index 374e70c7f..62b853368 100644
--- a/crates/idml/src/xml.rs
+++ b/crates/idml/src/xml.rs
@@ -88,7 +88,7 @@ impl El {
         if let Some(v) = self.get(k) {
             return Some(v.to_string());
         }
-        self.prop_el(k).map(|e| e.text_content())
+        self.prop_el(k).map(El::text_content)
     }
     pub fn prop_el(&self, k: &str) -> Option<&El> {
         self.find("Properties").and_then(|p| p.find(k))
diff --git a/crates/images/Cargo.toml b/crates/images/Cargo.toml
index ae8dd0293..48dc5955d 100644
--- a/crates/images/Cargo.toml
+++ b/crates/images/Cargo.toml
@@ -14,6 +14,8 @@ designcraft-fonts = { workspace = true }
 image = { workspace = true }
 tiff = { workspace = true }
 resvg = { workspace = true }
+quick-xml = { workspace = true }
+flate2 = "1"
 log = { workspace = true }
 craft-cms = { workspace = true }
 zune-core = { version = "0.5", default-features = false }
diff --git a/crates/images/src/lib.rs b/crates/images/src/lib.rs
index 3a8facf08..817aa7829 100644
--- a/crates/images/src/lib.rs
+++ b/crates/images/src/lib.rs
@@ -60,6 +60,7 @@ pub fn mime(bytes: &[u8]) -> &'static str {
     }
 }
 
+/// Initialize the process-wide usvg database from the bundled and Japanese fonts, with case-aware family/PostScript resolution, fallback selection and preflighted SVG data URLs; file-backed image URLs are never read.
 fn svg_options() -> &'static usvg::Options<'static> {
     static OPTS: OnceLock<usvg::Options<'static>> = OnceLock::new();
     OPTS.get_or_init(|| {
@@ -77,8 +78,23 @@ fn svg_options() -> &'static usvg::Options<'static> {
         let font_resolver = usvg::FontResolver { select_font: select_font(), select_fallback: select_fallback() };
         // Images inside an SVG come only from `data:` URLs: an `href` naming a file is not read
         // (it is left out, as usvg leaves out an image it can't load).
-        let image_href_resolver =
-            usvg::ImageHrefResolver { resolve_data: usvg::ImageHrefResolver::default_data_resolver(), resolve_string: Box::new(|_, _| None) };
+        let default_data = usvg::ImageHrefResolver::default_data_resolver();
+        let image_href_resolver = usvg::ImageHrefResolver {
+            resolve_data: Box::new(move |mime, data, options| {
+                let raster = matches!(
+                    image::guess_format(&data),
+                    Ok(image::ImageFormat::Png | image::ImageFormat::Jpeg | image::ImageFormat::Gif | image::ImageFormat::WebP)
+                );
+                if mime == "image/svg+xml" || (mime == "text/plain" && !raster) {
+                    let xml = svg_data(&data)?;
+                    svg_preflight(&xml)?;
+                    default_data(mime, Arc::new(xml.into_owned()), options)
+                } else {
+                    default_data(mime, data, options)
+                }
+            }),
+            resolve_string: Box::new(|_, _| None),
+        };
         usvg::Options { fontdb: Arc::new(db), font_family: "Source Sans 3".into(), font_resolver, image_href_resolver, ..Default::default() }
     })
 }
@@ -207,9 +223,71 @@ fn add_face(db: &mut Arc<usvg::fontdb::Database>, face: Arc<designcraft_fonts::F
     ids.into_iter().find(|id| db.face(*id).is_some_and(|f| f.index == index))
 }
 
-/// The parsed SVG.
+/// Limits apply before usvg's recursive XML/SVG parsing, including SVGZ output.
+/// Ordinary SVG doctypes are accepted; internal DTD subsets are not, since entity
+/// expansion could introduce markup that the streaming depth check never sees.
+const MAX_SVG_BYTES: usize = 16 * 1024 * 1024;
+const MAX_SVG_EVENTS: usize = 100_000;
+const MAX_SVG_DEPTH: usize = 64;
+
+/// Enforce the encoded-size cap, gunzip SVGZ data with that bound, and return the decoded content within the cap as an owned or borrowed `Cow`.
+fn svg_data(bytes: &[u8]) -> Option<std::borrow::Cow<'_, [u8]>> {
+    use std::io::Read;
+
+    if bytes.len() > MAX_SVG_BYTES {
+        return None;
+    }
+    if bytes.starts_with(&[0x1f, 0x8b]) {
+        let mut xml = Vec::new();
+        flate2::read::GzDecoder::new(bytes).take(MAX_SVG_BYTES as u64 + 1).read_to_end(&mut xml).ok()?;
+        (xml.len() <= MAX_SVG_BYTES).then_some(std::borrow::Cow::Owned(xml))
+    } else {
+        Some(std::borrow::Cow::Borrowed(bytes))
+    }
+}
+
+/// Require UTF-8, bounded XML events, balanced tags and depth at most 64; reject internal DTD subsets while accepting ordinary external doctypes.
+fn svg_preflight(bytes: &[u8]) -> Option<()> {
+    use quick_xml::events::Event;
+
+    let text = std::str::from_utf8(bytes).ok()?;
+    let mut reader = quick_xml::Reader::from_str(text);
+    let mut depth = 0usize;
+    for _ in 0..MAX_SVG_EVENTS {
+        match reader.read_event().ok()? {
+            Event::Start(_) => {
+                depth += 1;
+                if depth > MAX_SVG_DEPTH {
+                    return None;
+                }
+            }
+            Event::Empty(_) if depth >= MAX_SVG_DEPTH => return None,
+            Event::End(_) => depth = depth.checked_sub(1)?,
+            Event::DocType(doctype) => {
+                // A '[' inside a quoted external identifier is not an internal subset.
+                let mut quote = None;
+                for &byte in doctype.as_ref() {
+                    match (quote, byte) {
+                        (Some(q), b) if b == q => quote = None,
+                        (None, b'\'' | b'"') => quote = Some(byte),
+                        (None, b'[') => return None,
+                        _ => {}
+                    }
+                }
+            }
+            Event::Eof => return (depth == 0).then_some(()),
+            _ => {}
+        }
+    }
+    None
+}
+
+/// Parse an SVG with at most 16 MiB encoded/decoded data, 100,000 XML events and
+/// 64 nested elements. Reject internal DTD subsets before recursive conversion.
 pub fn svg_tree(bytes: &[u8]) -> Option<usvg::Tree> {
-    usvg::Tree::from_data(bytes, svg_options()).ok()
+    let xml = svg_data(bytes)?;
+    svg_preflight(&xml)?;
+    usvg::Tree::from_data(&xml, svg_options()).ok()
 }
 
 /// Natural size of a placed graphic in points: rasters at 72 ppi (one pixel per point), PSDs
@@ -494,313 +572,4 @@ pub fn render_svg(bytes: &[u8], max_side: u32) -> Option<(Vec<u8>, u32, u32)> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    const SVG: &str = r##"<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="200" height="100" viewBox="0 0 200 100">
-  <rect x="0" y="0" width="100" height="100" fill="#ff0000"/>
-  <text x="110" y="60" font-size="20">Hi</text>
-</svg>"##;
-
-    #[test]
-    fn svg_sniff_size_and_render() {
-        let b = SVG.as_bytes();
-        assert!(is_svg(b));
-        assert_eq!(mime(b), "image/svg+xml");
-        assert_eq!(natural_size(b), Some((150.0, 75.0)));
-        let (px, w, h) = render_svg(b, 400).unwrap();
-        assert_eq!((w, h), (400, 200));
-        // Red on the left; the text drew some ink on the right.
-        assert_eq!(&px[(100 * 400 + 100) * 4..][..4], &[255, 0, 0, 255]);
-        assert!(px.chunks(4).skip(220).step_by(7).any(|p| p[3] > 128 && p[0] < 100), "text pixels");
-        assert!(!is_svg(b"\x89PNG"));
-    }
-
-    #[test]
-    fn svg_images_come_only_from_data_urls() {
-        let dir = std::env::temp_dir().join(format!("dc-svg-href-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let file = dir.join("red.png");
-        image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255])).save(&file).unwrap();
-        let blue = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10'%3E%3Crect width='10' height='10' fill='blue'/%3E%3C/svg%3E";
-        let svg = format!(
-            r#"<svg xmlns="http://www.w3.org/2000/svg" width="30" height="10">
-<image x="0" y="0" width="10" height="10" href="{}"/>
-<image x="10" y="0" width="10" height="10" href="{blue}"/>
-<image x="20" y="0" width="10" height="10" href="/etc/hostname"/>
-</svg>"#,
-            file.display()
-        );
-        // The image nodes usvg kept: only the data URL's (PDF export embeds every one).
-        fn images(g: &usvg::Group) -> usize {
-            g.children()
-                .iter()
-                .map(|n| match n {
-                    usvg::Node::Group(g) => images(g),
-                    usvg::Node::Image(_) => 1,
-                    _ => 0,
-                })
-                .sum()
-        }
-        assert_eq!(images(svg_tree(svg.as_bytes()).unwrap().root()), 1, "files the SVG names are not read");
-        let (px, w, _) = render_svg(svg.as_bytes(), 30).unwrap();
-        let at = |x: usize, y: usize| px[(y * w as usize + x) * 4..][..4].to_vec();
-        assert_eq!(at(15, 5), [0, 0, 255, 255], "a data URL is drawn");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    /// The family of the font that sets each text glyph of `svg`, and the glyph's id.
-    fn glyph_families(svg: &str) -> Vec<(String, u16)> {
-        fn walk(g: &usvg::Group, tree: &usvg::Tree, out: &mut Vec<(String, u16)>) {
-            for n in g.children() {
-                match n {
-                    usvg::Node::Group(g) => walk(g, tree, out),
-                    usvg::Node::Text(t) => {
-                        for g in t.layouted().iter().flat_map(|s| &s.positioned_glyphs) {
-                            out.extend(tree.fontdb().face(g.font).map(|f| (f.families[0].0.clone(), g.id.0)));
-                        }
-                    }
-                    _ => {}
-                }
-            }
-        }
-        let tree = svg_tree(svg.as_bytes()).unwrap();
-        let mut out = Vec::new();
-        walk(tree.root(), &tree, &mut out);
-        out
-    }
-
-    #[test]
-    fn svg_text_uses_the_shared_fonts() {
-        let font = designcraft_fonts::testing::font_with("DC Test SVG Hangul", &['한', '글']).unwrap();
-        designcraft_fonts::FontDb::global().add_font(font);
-        let text = |attrs: &str, body: &str| {
-            format!(r#"<svg xmlns="http://www.w3.org/2000/svg" width="100" height="40"><text y="30" font-size="20"{attrs}>{body}</text></svg>"#)
-        };
-        let named = r#" font-family="DC Test SVG Hangul""#;
-        // A family named in the SVG.
-        let set = glyph_families(&text(named, "한글"));
-        assert!(set.len() == 2 && set.iter().all(|(f, gid)| f == "DC Test SVG Hangul" && *gid != 0), "{set:?}");
-        // Characters the bundled default lacks: a shared face that has them, not the default.
-        let set = glyph_families(&text("", "한글"));
-        assert!(set.len() == 2 && set.iter().all(|(f, gid)| f != "Source Sans 3" && *gid != 0), "{set:?}");
-    }
-
-    #[test]
-    fn svg_family_names_match_in_any_case() {
-        let font = designcraft_fonts::testing::font_with("DC Test SVG Casing", &['A', 'b']).unwrap();
-        designcraft_fonts::FontDb::global().add_font(font);
-        let text = |family: &str, attrs: &str| {
-            format!(
-                r#"<svg xmlns="http://www.w3.org/2000/svg" width="100" height="40"><text y="30" font-size="20" font-family="{family}"{attrs}>Ab</text></svg>"#
-            )
-        };
-        for family in ["DC Test SVG Casing", "dc test svg casing", "DC TEST svg Casing", "Nope, dc test SVG casing, serif"] {
-            let set = glyph_families(&text(family, ""));
-            assert!(set.len() == 2 && set.iter().all(|(f, gid)| f == "DC Test SVG Casing" && *gid != 0), "{family}: {set:?}");
-        }
-        // Weight and style still reach the query: there's only a regular face, so it sets the text.
-        let set = glyph_families(&text("dc test svg casing", r#" font-weight="700" font-style="italic""#));
-        assert!(set.len() == 2 && set.iter().all(|(f, _)| f == "DC Test SVG Casing"), "{set:?}");
-        // A family nobody has still falls to the bundled serif.
-        let set = glyph_families(&text("DC Test SVG Nobody", ""));
-        assert!(set.len() == 2 && set.iter().all(|(f, _)| f == "Source Serif 4"), "{set:?}");
-    }
-
-    /// The PostScript name of the face that sets the text of `svg` (one face for all of it).
-    fn text_face(svg_attrs: &str) -> String {
-        let svg =
-            format!(r#"<svg xmlns="http://www.w3.org/2000/svg" width="100" height="40"><text y="30" font-size="20"{svg_attrs}>ab</text></svg>"#);
-        let tree = svg_tree(svg.as_bytes()).unwrap();
-        let mut faces = Vec::new();
-        for n in tree.root().children() {
-            if let usvg::Node::Text(t) = n {
-                for g in t.layouted().iter().flat_map(|s| &s.positioned_glyphs) {
-                    faces.extend(tree.fontdb().face(g.font).map(|f| f.post_script_name.clone()));
-                }
-            }
-        }
-        faces.dedup();
-        assert_eq!(faces.len(), 1, "{faces:?}");
-        faces.remove(0)
-    }
-
-    #[test]
-    fn svg_text_finds_fonts_by_postscript_name() {
-        // Bundled, as Illustrator's SVG export names it; any case.
-        assert_eq!(text_face(r#" font-family="'SourceSerif4-Semibold'""#), "SourceSerif4-Semibold");
-        assert_eq!(text_face(r#" font-family="sourceserif4-semibold""#), "SourceSerif4-Semibold");
-        // A shared font (as an installed one would be).
-        let font = designcraft_fonts::testing::font_with("DC Test SVG PostScript", &['a', 'b']).unwrap();
-        designcraft_fonts::FontDb::global().add_font(font);
-        assert_eq!(text_face(r#" font-family="DCTestSVGPostScript-Regular""#), "DCTestSVGPostScript-Regular");
-        // The name picks that face: font-weight and font-style don't change it.
-        assert_eq!(text_face(r#" font-family="SourceSerif4-Semibold" font-weight="bold" font-style="italic""#), "SourceSerif4-Semibold");
-        // A family listed before it still comes first; one after it is a fallback.
-        assert_eq!(text_face(r#" font-family="'Source Sans 3', SourceSerif4-Bold""#), "SourceSans3-Regular");
-        assert_eq!(text_face(r#" font-family="NoSuch-Font, SourceSerif4-Bold, 'Source Sans 3'""#), "SourceSerif4-Bold");
-        // Family names work as before.
-        assert_eq!(text_face(r#" font-family="'Source Serif 4'" font-weight="bold""#), "SourceSerif4-Bold");
-        // An unknown name falls back as before (the serif default).
-        assert_eq!(text_face(r#" font-family="NoSuch-Font""#), text_face(r#" font-family="No Such Font""#));
-        assert_eq!(text_face(r#" font-family="NoSuch-Font""#), "SourceSerif4-Regular");
-    }
-
-    /// A minimal Photoshop file: 2×1 RGB, no layers, raw merged image.
-    fn tiny_psd() -> Vec<u8> {
-        let mut b = Vec::new();
-        b.extend(b"8BPS");
-        b.extend(1u16.to_be_bytes());
-        b.extend([0u8; 6]);
-        b.extend(3u16.to_be_bytes()); // channels
-        b.extend(1u32.to_be_bytes()); // height
-        b.extend(2u32.to_be_bytes()); // width
-        b.extend(8u16.to_be_bytes()); // depth
-        b.extend(3u16.to_be_bytes()); // RGB
-        b.extend(0u32.to_be_bytes()); // colour mode data
-        b.extend(0u32.to_be_bytes()); // image resources
-        b.extend(0u32.to_be_bytes()); // layer and mask info
-        b.extend(0u16.to_be_bytes()); // raw
-        b.extend([255, 0, 0, 255, 0, 0]); // R, G, B planes: a red pixel, then a green one
-        b
-    }
-
-    #[test]
-    fn psd_composite_decodes() {
-        let b = tiny_psd();
-        assert_eq!(mime(&b), "image/vnd.adobe.photoshop");
-        assert_eq!(pixel_size(&b), Some((2, 1)));
-        let img = decode_rgba(&b).unwrap();
-        assert_eq!(img.get_pixel(0, 0).0, [255, 0, 0, 255]);
-        assert_eq!(img.get_pixel(1, 0).0, [0, 255, 0, 255]);
-    }
-
-    fn tiff_of<C: tiff::encoder::colortype::ColorType>(w: u32, h: u32, px: &[C::Inner], alpha: bool) -> Vec<u8>
-    where
-        [C::Inner]: tiff::encoder::TiffValue,
-    {
-        let mut b = Vec::new();
-        let mut enc = tiff::encoder::TiffEncoder::new(std::io::Cursor::new(&mut b)).unwrap();
-        let mut img = enc.new_image::<C>(w, h).unwrap();
-        if alpha {
-            // CMYKA8 already has five samples: only the tag that says the fifth is alpha.
-            img.encoder().write_tag(tiff::tags::Tag::ExtraSamples, &[2u16][..]).unwrap();
-        }
-        img.write_data(px).unwrap();
-        b
-    }
-
-    /// A placed EPS is measured by its bounding box in points and drawn through its proxy; the
-    /// bytes stay the EPS.
-    #[test]
-    fn eps_draws_through_its_proxy_at_its_bounding_box_size() {
-        let eps =
-            b"%!PS-Adobe-3.1 EPSF-3.0\n%%BoundingBox: 0 0 4 2\n%%EndComments\n/rf { rectfill } bind def\n0 0 0 1 setcmykcolor\n0 0 2 2 rf\n%%EOF\n";
-        assert_eq!(natural_size(eps), Some((4.0, 2.0)));
-        let img = decode_rgba(eps).expect("drawn");
-        assert_eq!(img.dimensions(), (32, 16));
-        assert_eq!(img.get_pixel(1, 1).0, [0, 0, 0, 255], "the rectangle");
-        assert_eq!(img.get_pixel(30, 1).0[3], 0, "outside it, transparent");
-    }
-
-    /// CMYK TIFFs read back as their ink values; RGB ones aren't CMYK.
-    #[test]
-    fn cmyk_tiff_keeps_inks() {
-        use tiff::encoder::colortype::{CMYK8, CMYK16, CMYKA8, RGB8};
-        // 2×1: 100% K, then C0 M100 Y100 K0.
-        let px = [0, 0, 0, 255, 0, 255, 255, 0];
-        let b = tiff_of::<CMYK8>(2, 1, &px, false);
-        assert_eq!(mime(&b), "image/tiff");
-        assert!(is_cmyk_tiff(&b));
-        assert_eq!(decode_cmyk_tiff(&b), Some(CmykRaster { width: 2, height: 1, cmyk: px.to_vec(), alpha: None }));
-        // The screen gets RGB through the working CMYK space.
-        let raster = CmykRaster { width: 2, height: 1, cmyk: px.to_vec(), alpha: None };
-        let want = colour::to_display_rgba(colour::Pixels::Cmyk(raster), None, &colour::DisplayColour::active()).unwrap();
-        assert_eq!(decode_rgba(&b).unwrap(), want);
-
-        let b = tiff_of::<CMYK16>(2, 1, &[0, 0, 0, 65_535, 0, 32_896, 65_535, 0], false);
-        assert_eq!(decode_cmyk_tiff(&b).unwrap().cmyk, [0, 0, 0, 255, 0, 128, 255, 0]);
-
-        let b = tiff_of::<CMYKA8>(2, 1, &[0, 0, 0, 255, 255, 0, 255, 255, 0, 0], true);
-        let r = decode_cmyk_tiff(&b).unwrap();
-        assert_eq!((r.cmyk, r.alpha), (px.to_vec(), Some(vec![255, 0])));
-
-        let rgb = tiff_of::<RGB8>(1, 1, &[255, 0, 0], false);
-        assert!(!is_cmyk_tiff(&rgb));
-        assert_eq!(decode_cmyk_tiff(&rgb), None);
-        assert!(!is_cmyk_tiff(b"II*\0"), "truncated");
-        assert_eq!(decode_cmyk_tiff(&b[..b.len() / 2]), None, "truncated");
-    }
-
-    /// Indexed colour (PhotometricInterpretation 3), which the `tiff` encoder has no type for.
-    struct Palette<const BITS: u16>;
-    impl<const BITS: u16> tiff::encoder::colortype::ColorType for Palette<BITS> {
-        type Inner = u8;
-        const TIFF_VALUE: tiff::tags::PhotometricInterpretation = tiff::tags::PhotometricInterpretation::RGBPalette;
-        const BITS_PER_SAMPLE: &[u16] = &[BITS];
-        const SAMPLE_FORMAT: &[tiff::tags::SampleFormat] = &[tiff::tags::SampleFormat::Uint];
-        fn horizontal_predict(row: &[u8], result: &mut Vec<u8>) {
-            result.extend_from_slice(row);
-        }
-    }
-
-    /// A palette TIFF as Photoshop and Pillow write it: 16-bit ColorMap entries (reds, then
-    /// greens, then blues), each 8-bit value times 256.
-    fn palette_tiff<const BITS: u16>(w: u32, h: u32, px: &[u8], colours: &[[u8; 3]], lzw: bool) -> Vec<u8> {
-        let n = 1usize << BITS;
-        let mut map = vec![0u16; 3 * n];
-        for (i, c) in colours.iter().enumerate() {
-            for (ch, &v) in c.iter().enumerate() {
-                map[ch * n + i] = u16::from(v) << 8;
-            }
-        }
-        let mut b = Vec::new();
-        let mut enc = tiff::encoder::TiffEncoder::new(std::io::Cursor::new(&mut b)).unwrap();
-        if lzw {
-            enc = enc.with_compression(tiff::encoder::Compression::Lzw);
-        }
-        let mut img = enc.new_image::<Palette<BITS>>(w, h).unwrap();
-        img.encoder().write_tag(tiff::tags::Tag::ColorMap, &map[..]).unwrap();
-        img.write_data(px).unwrap();
-        b
-    }
-
-    /// Indexed-colour TIFFs (an old GIF logo saved from Photoshop) are sized and drawn through
-    /// their palette, uncompressed or LZW, 8- or 4-bit.
-    #[test]
-    fn palette_tiff_decodes_through_its_colormap() {
-        let colours = [[0, 128, 255], [255, 0, 0], [10, 20, 30]];
-        for lzw in [false, true] {
-            let b = palette_tiff::<8>(3, 1, &[2, 0, 1], &colours, lzw);
-            assert_eq!(pixel_size(&b), Some((3, 1)), "lzw {lzw}");
-            let img = decode_rgba(&b).expect("decodes");
-            let px: Vec<_> = img.pixels().map(|p| p.0).collect();
-            assert_eq!(px, [[10, 20, 30, 255], [0, 128, 255, 255], [255, 0, 0, 255]], "lzw {lzw}");
-        }
-        // Two indices per byte, high nibble first: 2, 1 | 0, 2 (the encoder counts samples, not
-        // bytes, so the strip carries two spare bytes the decoder doesn't read).
-        let b = palette_tiff::<4>(2, 2, &[0x21, 0x02, 0, 0], &colours, false);
-        assert_eq!(pixel_size(&b), Some((2, 2)));
-        let px: Vec<_> = decode_rgba(&b).expect("decodes").pixels().map(|p| p.0).collect();
-        assert_eq!(px, [[10, 20, 30, 255], [255, 0, 0, 255], [0, 128, 255, 255], [10, 20, 30, 255]]);
-    }
-
-    #[test]
-    fn cmyk_tiff_with_alpha_reports_its_pixel_size() {
-        use tiff::encoder::colortype::CMYKA8;
-        let b = tiff_of::<CMYKA8>(2, 1, &[0, 0, 0, 255, 255, 0, 0, 0, 0, 0], true);
-        assert_eq!(pixel_size(&b), Some((2, 1)));
-    }
-
-    #[test]
-    fn bmp_decodes() {
-        let mut bmp = Vec::new();
-        image::RgbaImage::from_pixel(3, 2, image::Rgba([0, 0, 255, 255]))
-            .write_to(&mut std::io::Cursor::new(&mut bmp), image::ImageFormat::Bmp)
-            .unwrap();
-        assert_eq!(mime(&bmp), "image/bmp");
-        assert_eq!(pixel_size(&bmp), Some((3, 2)));
-        assert_eq!(decode_rgba(&bmp).unwrap().get_pixel(1, 1).0, [0, 0, 255, 255]);
-    }
-}
+mod tests;
diff --git a/crates/images/src/psd.rs b/crates/images/src/psd.rs
index 4006e0e30..90977d36e 100644
--- a/crates/images/src/psd.rs
+++ b/crates/images/src/psd.rs
@@ -353,566 +353,4 @@ fn fill(dst: &mut [u8], slot: usize, step: usize, src: &[u8], depth: u16) {
 }
 
 #[cfg(test)]
-mod tests {
-    use crate::CmykRaster;
-    use crate::colour::{DisplayColour, Pixels, to_display_rgba};
-    use crate::decode_rgba;
-
-    const W: u32 = 12;
-    const H: u32 = 8;
-
-    /// A `W`×`H` 8-bit plane: `bg` everywhere, `val` in the square `[x0, x1)×[y0, y1)`.
-    fn plane(bg: u8, square: Option<(u32, u32, u32, u32, u8)>) -> Vec<u8> {
-        let mut p = vec![bg; (W * H) as usize];
-        if let Some((x0, y0, x1, y1, val)) = square {
-            for y in y0..y1 {
-                for x in x0..x1 {
-                    p[(y * W + x) as usize] = val;
-                }
-            }
-        }
-        p
-    }
-    /// Mid grey with a dark square in the middle.
-    fn gray() -> Vec<u8> {
-        plane(150, Some((4, 2, 8, 6, 60)))
-    }
-    /// An alpha channel (a saved selection): a square of 255 top-left.
-    fn sel() -> Vec<u8> {
-        plane(0, Some((1, 1, 4, 4, 255)))
-    }
-    /// A spot channel: a square of 255 bottom-right.
-    fn spot() -> Vec<u8> {
-        plane(0, Some((8, 5, 11, 7, 255)))
-    }
-
-    enum Layers {
-        /// An empty layer and mask section.
-        None,
-        /// Layer info with this layer count and one layer record.
-        Count(i16),
-        /// Empty layer info; the layers in an `Lr16` tagged block (16-bit documents).
-        Lr16(i16),
-    }
-
-    /// A Photoshop file for the tests, written per the public file format spec.
-    struct Psd {
-        /// 1 = PSD, 2 = PSB.
-        version: u16,
-        mode: u16,
-        depth: u16,
-        w: u32,
-        h: u32,
-        /// Composite channels: rows of big-endian samples.
-        channels: Vec<Vec<u8>>,
-        palette: Vec<u8>,
-        layers: Layers,
-        rle: bool,
-        /// An ICC profile resource (1039) when not empty.
-        icc: Vec<u8>,
-    }
-
-    impl Psd {
-        fn new(mode: u16, channels: Vec<Vec<u8>>) -> Self {
-            Psd { version: 1, mode, depth: 8, w: W, h: H, channels, palette: Vec::new(), layers: Layers::None, rle: false, icc: Vec::new() }
-        }
-        fn rle(self) -> Self {
-            Psd { rle: true, ..self }
-        }
-        fn layers(self, layers: Layers) -> Self {
-            Psd { layers, ..self }
-        }
-        fn psb(&self) -> bool {
-            self.version == 2
-        }
-        /// A section length: 4 bytes, 8 in PSB.
-        fn len(&self, n: usize) -> Vec<u8> {
-            if self.psb() { (n as u64).to_be_bytes().to_vec() } else { (n as u32).to_be_bytes().to_vec() }
-        }
-        fn row_bytes(&self) -> usize {
-            (self.w as usize * self.depth as usize).div_ceil(8)
-        }
-        /// Compression + channel data, as in the image data section.
-        fn channel_data(&self, planes: &[Vec<u8>], rle: bool) -> Vec<u8> {
-            let mut b = Vec::new();
-            if !rle {
-                b.extend(0u16.to_be_bytes());
-                planes.iter().for_each(|p| b.extend(p));
-                return b;
-            }
-            b.extend(1u16.to_be_bytes());
-            let rows: Vec<Vec<u8>> = planes.iter().flat_map(|p| p.chunks(self.row_bytes()).map(packbits)).collect();
-            for r in &rows {
-                if self.psb() { b.extend((r.len() as u32).to_be_bytes()) } else { b.extend((r.len() as u16).to_be_bytes()) }
-            }
-            rows.iter().for_each(|r| b.extend(r));
-            b
-        }
-        /// Layer info: the count, one full-canvas layer (transparency + first channel), its data.
-        fn layer_info(&self, count: i16) -> Vec<u8> {
-            let plane_len = self.row_bytes() * self.h as usize;
-            let mut b = Vec::new();
-            b.extend(count.to_be_bytes());
-            for v in [0, 0, self.h as i32, self.w as i32] {
-                b.extend(v.to_be_bytes());
-            }
-            b.extend(2u16.to_be_bytes());
-            for id in [-1i16, 0] {
-                b.extend(id.to_be_bytes());
-                b.extend(self.len(2 + plane_len));
-            }
-            b.extend(b"8BIMnorm");
-            b.extend([255, 0, 0, 0]);
-            let mut extra = Vec::new();
-            extra.extend(0u32.to_be_bytes()); // layer mask data
-            extra.extend(0u32.to_be_bytes()); // blending ranges
-            extra.extend([7, b'L', b'a', b'y', b'e', b'r', b' ', b'1']); // name, padded to 4
-            b.extend((extra.len() as u32).to_be_bytes());
-            b.extend(extra);
-            let first = self.channels.first().cloned().unwrap_or_default();
-            b.extend(self.channel_data(&[vec![255; plane_len]], false));
-            b.extend(self.channel_data(&[first], false));
-            if b.len() % 2 == 1 {
-                b.push(0);
-            }
-            b
-        }
-        fn layer_and_mask(&self) -> Vec<u8> {
-            let mut s = Vec::new();
-            match self.layers {
-                Layers::None => return s,
-                Layers::Count(n) => {
-                    let info = self.layer_info(n);
-                    s.extend(self.len(info.len()));
-                    s.extend(info);
-                    s.extend(0u32.to_be_bytes()); // global layer mask info
-                }
-                Layers::Lr16(n) => {
-                    s.extend(self.len(0));
-                    s.extend(0u32.to_be_bytes());
-                    // An unrelated tagged block first (4-byte length, padded to 4).
-                    s.extend(b"8BIMPatt");
-                    s.extend(3u32.to_be_bytes());
-                    s.extend([1, 2, 3, 0]);
-                    let mut info = self.layer_info(n);
-                    while !info.len().is_multiple_of(4) {
-                        info.push(0);
-                    }
-                    s.extend(b"8BIMLr16");
-                    s.extend(self.len(info.len()));
-                    s.extend(info);
-                }
-            }
-            s
-        }
-        fn write(&self) -> Vec<u8> {
-            let mut b = Vec::new();
-            b.extend(b"8BPS");
-            b.extend(self.version.to_be_bytes());
-            b.extend([0u8; 6]);
-            b.extend((self.channels.len() as u16).to_be_bytes());
-            b.extend(self.h.to_be_bytes());
-            b.extend(self.w.to_be_bytes());
-            b.extend(self.depth.to_be_bytes());
-            b.extend(self.mode.to_be_bytes());
-            b.extend((self.palette.len() as u32).to_be_bytes());
-            b.extend(&self.palette);
-            // Image resources: ResolutionInfo (1005), 72 ppi.
-            let mut res = Vec::new();
-            res.extend(b"8BIM");
-            res.extend(1005u16.to_be_bytes());
-            res.extend([0, 0]);
-            res.extend(16u32.to_be_bytes());
-            for v in [72u32 << 16, 0x0001_0001, 72 << 16, 0x0001_0001] {
-                res.extend(v.to_be_bytes());
-            }
-            if !self.icc.is_empty() {
-                res.extend(b"8BIM");
-                res.extend(1039u16.to_be_bytes());
-                res.extend([0, 0]);
-                res.extend((self.icc.len() as u32).to_be_bytes());
-                res.extend(&self.icc);
-                if self.icc.len() % 2 == 1 {
-                    res.push(0);
-                }
-            }
-            b.extend((res.len() as u32).to_be_bytes());
-            b.extend(res);
-            let lm = self.layer_and_mask();
-            b.extend(self.len(lm.len()));
-            b.extend(lm);
-            b.extend(self.channel_data(&self.channels, self.rle));
-            b
-        }
-    }
-
-    /// PackBits: repeat runs of 2+ bytes, literals otherwise.
-    fn packbits(row: &[u8]) -> Vec<u8> {
-        let mut out = Vec::new();
-        let mut i = 0;
-        while i < row.len() {
-            let run = row[i..].iter().take(128).take_while(|&&v| v == row[i]).count();
-            if run >= 2 {
-                out.push((1 - run as i16) as i8 as u8);
-                out.push(row[i]);
-                i += run;
-                continue;
-            }
-            let start = i;
-            while i < row.len() && i - start < 128 && !(i + 1 < row.len() && row[i + 1] == row[i]) {
-                i += 1;
-            }
-            out.push((i - start - 1) as u8);
-            out.extend(&row[start..i]);
-        }
-        out
-    }
-
-    fn pixels(b: &[u8]) -> Vec<[u8; 4]> {
-        let img = decode_rgba(b).expect("decodes");
-        assert_eq!(img.dimensions(), (W, H));
-        img.pixels().map(|p| p.0).collect()
-    }
-
-    fn at(x: u32, y: u32) -> usize {
-        (y * W + x) as usize
-    }
-
-    #[test]
-    fn grayscale_extra_channels_leave_the_gray_composite() {
-        let extras = [sel(), spot(), sel(), plane(255, None)];
-        for n in 0..=extras.len() {
-            for rle in [false, true] {
-                for layered in [false, true] {
-                    let mut ch = vec![gray()];
-                    ch.extend(extras[..n].iter().cloned());
-                    let mut psd = Psd::new(1, ch);
-                    psd.rle = rle;
-                    if layered {
-                        psd.layers = Layers::Count(1);
-                    }
-                    let want: Vec<[u8; 4]> = gray().iter().map(|&g| [g, g, g, 255]).collect();
-                    assert_eq!(pixels(&psd.write()), want, "gray + {n} extra channels, rle {rle}, layered {layered}");
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn negative_layer_count_makes_the_first_extra_channel_the_transparency() {
-        let hole = plane(255, Some((2, 3, 5, 6, 0)));
-        for rle in [false, true] {
-            for extras in [vec![], vec![spot()], vec![spot(), sel(), sel()]] {
-                let mut ch = vec![gray(), hole.clone()];
-                ch.extend(extras.iter().cloned());
-                let mut psd = Psd::new(1, ch).layers(Layers::Count(-1));
-                psd.rle = rle;
-                let px = pixels(&psd.write());
-                for (i, p) in px.iter().enumerate() {
-                    if hole[i] == 0 {
-                        assert_eq!(p[3], 0, "pixel {i} is in the hole");
-                    } else {
-                        let g = gray()[i];
-                        assert_eq!(*p, [g, g, g, 255], "pixel {i}, rle {rle}, {} extras", extras.len());
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn rgb_with_a_spot_channel_is_opaque_rgb() {
-        let (r, g, b) = (plane(200, None), plane(10, Some((0, 0, 6, 8, 90))), plane(30, None));
-        for rle in [false, true] {
-            let mut psd = Psd::new(3, vec![r.clone(), g.clone(), b.clone(), spot()]);
-            psd.rle = rle;
-            let px = pixels(&psd.write());
-            assert_eq!(px[at(0, 0)], [200, 90, 30, 255]);
-            assert_eq!(px[at(9, 6)], [200, 10, 30, 255], "the spot square doesn't hide the image");
-            assert!(px.iter().all(|p| p[3] == 255));
-        }
-    }
-
-    #[test]
-    fn rgb_with_merged_transparency_is_rgba_unmatted_from_white() {
-        // Straight red at alpha 128, stored matted over white: 0 → 255 − 128 = 127.
-        let r = plane(255, None);
-        let gb = plane(0, Some((0, 0, 1, 1, 127)));
-        let a = plane(255, Some((0, 0, 1, 1, 128)));
-        let psd = Psd::new(3, vec![r, gb.clone(), gb, a, sel()]).layers(Layers::Count(-1)).rle();
-        let px = pixels(&psd.write());
-        assert_eq!(px[at(0, 0)], [255, 0, 0, 128]);
-        assert_eq!(px[at(5, 5)], [255, 0, 0, 255]);
-        assert_eq!(px[at(2, 2)][3], 255, "the alpha selection after the transparency is ignored");
-    }
-
-    #[test]
-    fn cmyk_converts_like_other_cmyk_images() {
-        // Stored inverted: 255 = no ink. Cyan 100 % on the left, 50 % black on the right.
-        let c = plane(255, Some((0, 0, 6, 8, 0)));
-        let m = plane(255, None);
-        let y = plane(255, None);
-        let k = plane(255, Some((6, 0, 12, 8, 127)));
-        // Through the working CMYK space, like CMYK JPEGs and TIFFs.
-        let expect = |cmyk: [u8; 4]| {
-            let raster = CmykRaster { width: 1, height: 1, cmyk: cmyk.to_vec(), alpha: None };
-            to_display_rgba(Pixels::Cmyk(raster), None, &DisplayColour::active()).unwrap().get_pixel(0, 0).0
-        };
-        for rle in [false, true] {
-            // An extra alpha channel (5 channels) doesn't become the alpha.
-            let mut psd = Psd::new(4, vec![c.clone(), m.clone(), y.clone(), k.clone(), sel()]);
-            psd.rle = rle;
-            let px = pixels(&psd.write());
-            let cyan = px[at(0, 0)];
-            assert_eq!(cyan, expect([255, 0, 0, 0]));
-            assert!(cyan[1] < 200 && cyan[2] < 250, "press cyan, not (0, 255, 255): {cyan:?}");
-            assert_eq!(px[at(11, 7)], expect([0, 0, 0, 128]));
-            assert!(px.iter().all(|p| p[3] == 255));
-        }
-    }
-
-    #[test]
-    fn embedded_profile_converts_rgb_to_srgb() {
-        let r = plane(64, None);
-        let g = plane(192, None);
-        let b = plane(64, None);
-        let plain = pixels(&Psd::new(3, vec![r.clone(), g.clone(), b.clone()]).write());
-        assert_eq!(plain[0], [64, 192, 64, 255]);
-        let mut psd = Psd::new(3, vec![r, g, b]);
-        psd.icc = craft_cms::Builtin::AdobeRgbCompat.profile().to_bytes().to_vec();
-        let px = pixels(&psd.write());
-        // Adobe RGB green is greener than sRGB's: less red once shown as sRGB.
-        assert!(px[0][0] < 50 && px[0][1] > 180 && px[0][3] == 255, "{:?}", px[0]);
-        // A damaged profile is ignored.
-        psd.icc.truncate(100);
-        assert_eq!(pixels(&psd.write())[0], [64, 192, 64, 255]);
-    }
-
-    /// 8-bit plane → 16-bit big-endian samples (v × 257).
-    fn wide(p: &[u8]) -> Vec<u8> {
-        p.iter().flat_map(|&v| (v as u16 * 257).to_be_bytes()).collect()
-    }
-
-    #[test]
-    fn sixteen_bit_grayscale() {
-        for rle in [false, true] {
-            let mut psd = Psd::new(1, vec![wide(&gray()), wide(&sel()), wide(&spot())]);
-            psd.depth = 16;
-            psd.rle = rle;
-            let want: Vec<[u8; 4]> = gray().iter().map(|&g| [g, g, g, 255]).collect();
-            assert_eq!(pixels(&psd.write()), want);
-        }
-    }
-
-    #[test]
-    fn sixteen_bit_transparency_from_the_lr16_block() {
-        let hole = plane(255, Some((2, 3, 5, 6, 0)));
-        let mut psd = Psd::new(1, vec![wide(&gray()), wide(&hole), wide(&spot())]).layers(Layers::Lr16(-1));
-        psd.depth = 16;
-        let px = pixels(&psd.write());
-        assert_eq!(px[at(3, 4)][3], 0);
-        assert_eq!(px[at(9, 6)], [150, 150, 150, 255]);
-    }
-
-    #[test]
-    fn psb_with_rle_and_transparency() {
-        let hole = plane(255, Some((2, 3, 5, 6, 0)));
-        let mut psd = Psd::new(1, vec![gray(), hole, sel()]).layers(Layers::Count(-1)).rle();
-        psd.version = 2;
-        let px = pixels(&psd.write());
-        assert_eq!(px[at(3, 4)][3], 0);
-        assert_eq!(px[at(2, 2)], [150, 150, 150, 255]);
-        assert_eq!(px[at(5, 3)], [60, 60, 60, 255]);
-    }
-
-    #[test]
-    fn indexed_uses_the_palette() {
-        let mut palette = vec![0u8; 768];
-        palette[3] = 10; // index 3: R
-        palette[256 + 3] = 20; // G
-        palette[512 + 3] = 30; // B
-        palette[7] = 255; // index 7: red
-        let mut psd = Psd::new(2, vec![plane(3, Some((0, 0, 1, 1, 7)))]);
-        psd.palette = palette;
-        let px = pixels(&psd.write());
-        assert_eq!(px[at(0, 0)], [255, 0, 0, 255]);
-        assert_eq!(px[at(1, 0)], [10, 20, 30, 255]);
-    }
-
-    #[test]
-    fn bitmap_set_bits_are_black() {
-        // 12 px wide: 2 bytes per row. The first pixel of each row is black.
-        let mut psd = Psd::new(0, vec![[0x80u8, 0x00].repeat(H as usize)]);
-        psd.depth = 1;
-        let px = pixels(&psd.write());
-        assert_eq!(px[at(0, 3)], [0, 0, 0, 255]);
-        assert_eq!(px[at(1, 3)], [255, 255, 255, 255]);
-        assert_eq!(px[at(11, 3)], [255, 255, 255, 255]);
-    }
-
-    #[test]
-    fn lab_white_and_black() {
-        let l = plane(255, Some((0, 0, 1, 1, 0)));
-        let ab = plane(128, None);
-        let psd = Psd::new(9, vec![l, ab.clone(), ab, sel()]);
-        let px = pixels(&psd.write());
-        assert_eq!(px[at(0, 0)], [0, 0, 0, 255]);
-        for v in &px[at(5, 5)][..3] {
-            assert!(*v >= 254, "L 100 is white: {:?}", px[at(5, 5)]);
-        }
-    }
-
-    fn valid_files() -> Vec<Vec<u8>> {
-        let hole = plane(255, Some((2, 3, 5, 6, 0)));
-        let mut wide16 = Psd::new(1, vec![wide(&gray()), wide(&hole)]).layers(Layers::Lr16(-1)).rle();
-        wide16.depth = 16;
-        let mut psb = Psd::new(3, vec![gray(), gray(), gray(), hole.clone()]).layers(Layers::Count(-1)).rle();
-        psb.version = 2;
-        vec![
-            Psd::new(1, vec![gray(), sel(), spot()]).write(),
-            Psd::new(1, vec![gray(), hole.clone(), spot()]).layers(Layers::Count(-1)).rle().write(),
-            Psd::new(4, vec![gray(), gray(), gray(), gray()]).rle().write(),
-            wide16.write(),
-            psb.write(),
-        ]
-    }
-
-    #[test]
-    fn truncated_files_never_panic() {
-        for file in valid_files() {
-            let full = decode_rgba(&file).expect("the full file decodes");
-            for n in 0..file.len() {
-                if let Some(img) = decode_rgba(&file[..n]) {
-                    assert_eq!(img, full, "a truncated file decodes only when the composite survived");
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn corrupted_files_never_panic() {
-        // A small LCG: deterministic byte flips across every valid file.
-        let mut seed = 0x2545_f491_u32;
-        let mut next = || {
-            seed = seed.wrapping_mul(1_664_525).wrapping_add(1_013_904_223);
-            seed >> 8
-        };
-        for file in valid_files() {
-            for _ in 0..2000 {
-                let mut b = file.clone();
-                for _ in 0..1 + next() % 4 {
-                    let i = 4 + next() as usize % (b.len() - 4);
-                    b[i] = next() as u8;
-                }
-                let _ = decode_rgba(&b);
-            }
-        }
-    }
-
-    #[test]
-    fn hostile_headers_are_rejected() {
-        let ok = Psd::new(1, vec![gray()]).write();
-        let set = |at: usize, v: &[u8]| {
-            let mut b = ok.clone();
-            b[at..at + v.len()].copy_from_slice(v);
-            b
-        };
-        assert!(decode_rgba(&ok).is_some());
-        assert!(decode_rgba(&set(4, &3u16.to_be_bytes())).is_none(), "version 3");
-        assert!(decode_rgba(&set(12, &0u16.to_be_bytes())).is_none(), "no channels");
-        assert!(decode_rgba(&set(12, &57u16.to_be_bytes())).is_none(), "57 channels");
-        assert!(decode_rgba(&set(14, &0u32.to_be_bytes())).is_none(), "zero height");
-        assert!(decode_rgba(&set(18, &0u32.to_be_bytes())).is_none(), "zero width");
-        assert!(decode_rgba(&set(18, &30_001u32.to_be_bytes())).is_none(), "wider than a PSD can be");
-        assert!(decode_rgba(&set(14, &u32::MAX.to_be_bytes())).is_none(), "absurd height");
-        assert!(decode_rgba(&set(22, &32u16.to_be_bytes())).is_none(), "32-bit");
-        assert!(decode_rgba(&set(22, &7u16.to_be_bytes())).is_none(), "7-bit");
-        assert!(decode_rgba(&set(24, &7u16.to_be_bytes())).is_none(), "multichannel");
-        // Huge but within the side limit: refused before allocating.
-        let mut big = set(14, &30_000u32.to_be_bytes());
-        big[18..22].copy_from_slice(&30_000u32.to_be_bytes());
-        assert!(decode_rgba(&big).is_none(), "too many pixels");
-        // RGB with only 2 channels; indexed without a palette.
-        assert!(decode_rgba(&Psd::new(3, vec![gray(), gray()]).write()).is_none());
-        assert!(decode_rgba(&Psd::new(2, vec![gray()]).write()).is_none());
-    }
-
-    #[test]
-    fn bad_compression_is_rejected() {
-        let ok = Psd::new(1, vec![gray()]).rle().write();
-        assert!(decode_rgba(&ok).is_some());
-        let comp = ok.len() - Psd::new(1, vec![gray()]).rle().channel_data(&[gray()], true).len();
-        for method in [2u16, 3, 4] {
-            let mut b = ok.clone();
-            b[comp..comp + 2].copy_from_slice(&method.to_be_bytes());
-            assert!(decode_rgba(&b).is_none(), "compression {method}");
-        }
-        // A row count past the end of the data.
-        let mut b = ok.clone();
-        b[comp + 2..comp + 4].copy_from_slice(&u16::MAX.to_be_bytes());
-        assert!(decode_rgba(&b).is_none());
-        // A row that unpacks to the wrong width: a literal of 1 byte instead of a run of 12.
-        let mut rows = Vec::new();
-        for _ in 0..H {
-            rows.push(vec![0u8, 150]);
-        }
-        let mut b = ok[..comp].to_vec();
-        b.extend(1u16.to_be_bytes());
-        rows.iter().for_each(|r| b.extend((r.len() as u16).to_be_bytes()));
-        rows.iter().for_each(|r| b.extend(r));
-        assert!(decode_rgba(&b).is_none());
-    }
-
-    #[test]
-    fn packbits_round_trips() {
-        let row = [1u8, 1, 1, 2, 3, 4, 4, 5, 6, 6, 6, 6, 7];
-        assert_eq!(super::unpack_bits(&packbits(&row), row.len()), Some(row.to_vec()));
-        // -128 is a no-op.
-        assert_eq!(super::unpack_bits(&[0x80, 0x01, 9, 8], 2), Some(vec![9, 8]));
-        assert_eq!(super::unpack_bits(&[0x05, 1, 2], 6), None, "literal past the end of the data");
-        assert_eq!(super::unpack_bits(&[0xFE, 7], 2), None, "run longer than the row");
-    }
-
-    #[test]
-    fn huge_header_without_data_is_rejected_before_allocating() {
-        // A gray 11000×11000 image (≈ 460 MiB as RGBA, under the cap) with almost no image data.
-        let (w, h) = (11_000u32, 11_000u32);
-        let mut head = Vec::new();
-        head.extend(b"8BPS");
-        head.extend(1u16.to_be_bytes());
-        head.extend([0u8; 6]);
-        head.extend(1u16.to_be_bytes()); // channels
-        head.extend(h.to_be_bytes());
-        head.extend(w.to_be_bytes());
-        head.extend(8u16.to_be_bytes());
-        head.extend(1u16.to_be_bytes()); // grayscale
-        head.extend([0u8; 12]); // empty colour mode data, image resources, layers
-        let holds = |b: &[u8]| {
-            let r = super::Reader { b: &b[head.len()..] };
-            super::ImageData::parse(r, false, 1, w as usize, h as usize).expect("parses").holds(1)
-        };
-        // Raw: a few bytes instead of 11000 × 11000.
-        let mut raw = head.clone();
-        raw.extend(0u16.to_be_bytes());
-        raw.extend([0u8; 16]);
-        assert!(holds(&raw).is_none());
-        assert!(super::decode(&raw).is_none());
-        // RLE: every row count present and plausible, but the rows themselves missing.
-        let mut rle = head.clone();
-        rle.extend(1u16.to_be_bytes());
-        for _ in 0..h {
-            rle.extend(174u16.to_be_bytes()); // 2 × ⌈11000 / 128⌉: the shortest full row
-        }
-        assert!(holds(&rle).is_none());
-        assert!(super::decode(&rle).is_none());
-        // RLE row counts too short to unpack to a full row, even with the data present.
-        let mut short = head.clone();
-        short.extend(1u16.to_be_bytes());
-        for _ in 0..h {
-            short.extend(2u16.to_be_bytes());
-        }
-        short.extend(vec![0u8; 2 * h as usize]);
-        assert!(holds(&short).is_none());
-        assert!(super::decode(&short).is_none());
-    }
-}
+mod tests;
diff --git a/crates/images/src/psd/tests.rs b/crates/images/src/psd/tests.rs
new file mode 100644
index 000000000..031c9e57a
--- /dev/null
+++ b/crates/images/src/psd/tests.rs
@@ -0,0 +1,561 @@
+use crate::CmykRaster;
+use crate::colour::{DisplayColour, Pixels, to_display_rgba};
+use crate::decode_rgba;
+
+const W: u32 = 12;
+const H: u32 = 8;
+
+/// A `W`×`H` 8-bit plane: `bg` everywhere, `val` in the square `[x0, x1)×[y0, y1)`.
+fn plane(bg: u8, square: Option<(u32, u32, u32, u32, u8)>) -> Vec<u8> {
+    let mut p = vec![bg; (W * H) as usize];
+    if let Some((x0, y0, x1, y1, val)) = square {
+        for y in y0..y1 {
+            for x in x0..x1 {
+                p[(y * W + x) as usize] = val;
+            }
+        }
+    }
+    p
+}
+/// Mid grey with a dark square in the middle.
+fn gray() -> Vec<u8> {
+    plane(150, Some((4, 2, 8, 6, 60)))
+}
+/// An alpha channel (a saved selection): a square of 255 top-left.
+fn sel() -> Vec<u8> {
+    plane(0, Some((1, 1, 4, 4, 255)))
+}
+/// A spot channel: a square of 255 bottom-right.
+fn spot() -> Vec<u8> {
+    plane(0, Some((8, 5, 11, 7, 255)))
+}
+
+enum Layers {
+    /// An empty layer and mask section.
+    None,
+    /// Layer info with this layer count and one layer record.
+    Count(i16),
+    /// Empty layer info; the layers in an `Lr16` tagged block (16-bit documents).
+    Lr16(i16),
+}
+
+/// A Photoshop file for the tests, written per the public file format spec.
+struct Psd {
+    /// 1 = PSD, 2 = PSB.
+    version: u16,
+    mode: u16,
+    depth: u16,
+    w: u32,
+    h: u32,
+    /// Composite channels: rows of big-endian samples.
+    channels: Vec<Vec<u8>>,
+    palette: Vec<u8>,
+    layers: Layers,
+    rle: bool,
+    /// An ICC profile resource (1039) when not empty.
+    icc: Vec<u8>,
+}
+
+impl Psd {
+    fn new(mode: u16, channels: Vec<Vec<u8>>) -> Self {
+        Psd { version: 1, mode, depth: 8, w: W, h: H, channels, palette: Vec::new(), layers: Layers::None, rle: false, icc: Vec::new() }
+    }
+    fn rle(self) -> Self {
+        Psd { rle: true, ..self }
+    }
+    fn layers(self, layers: Layers) -> Self {
+        Psd { layers, ..self }
+    }
+    fn psb(&self) -> bool {
+        self.version == 2
+    }
+    /// A section length: 4 bytes, 8 in PSB.
+    fn len(&self, n: usize) -> Vec<u8> {
+        if self.psb() { (n as u64).to_be_bytes().to_vec() } else { (n as u32).to_be_bytes().to_vec() }
+    }
+    fn row_bytes(&self) -> usize {
+        (self.w as usize * self.depth as usize).div_ceil(8)
+    }
+    /// Compression + channel data, as in the image data section.
+    fn channel_data(&self, planes: &[Vec<u8>], rle: bool) -> Vec<u8> {
+        let mut b = Vec::new();
+        if !rle {
+            b.extend(0u16.to_be_bytes());
+            planes.iter().for_each(|p| b.extend(p));
+            return b;
+        }
+        b.extend(1u16.to_be_bytes());
+        let rows: Vec<Vec<u8>> = planes.iter().flat_map(|p| p.chunks(self.row_bytes()).map(packbits)).collect();
+        for r in &rows {
+            if self.psb() { b.extend((r.len() as u32).to_be_bytes()) } else { b.extend((r.len() as u16).to_be_bytes()) }
+        }
+        rows.iter().for_each(|r| b.extend(r));
+        b
+    }
+    /// Layer info: the count, one full-canvas layer (transparency + first channel), its data.
+    fn layer_info(&self, count: i16) -> Vec<u8> {
+        let plane_len = self.row_bytes() * self.h as usize;
+        let mut b = Vec::new();
+        b.extend(count.to_be_bytes());
+        for v in [0, 0, self.h as i32, self.w as i32] {
+            b.extend(v.to_be_bytes());
+        }
+        b.extend(2u16.to_be_bytes());
+        for id in [-1i16, 0] {
+            b.extend(id.to_be_bytes());
+            b.extend(self.len(2 + plane_len));
+        }
+        b.extend(b"8BIMnorm");
+        b.extend([255, 0, 0, 0]);
+        let mut extra = Vec::new();
+        extra.extend(0u32.to_be_bytes()); // layer mask data
+        extra.extend(0u32.to_be_bytes()); // blending ranges
+        extra.extend([7, b'L', b'a', b'y', b'e', b'r', b' ', b'1']); // name, padded to 4
+        b.extend((extra.len() as u32).to_be_bytes());
+        b.extend(extra);
+        let first = self.channels.first().cloned().unwrap_or_default();
+        b.extend(self.channel_data(&[vec![255; plane_len]], false));
+        b.extend(self.channel_data(&[first], false));
+        if b.len() % 2 == 1 {
+            b.push(0);
+        }
+        b
+    }
+    fn layer_and_mask(&self) -> Vec<u8> {
+        let mut s = Vec::new();
+        match self.layers {
+            Layers::None => return s,
+            Layers::Count(n) => {
+                let info = self.layer_info(n);
+                s.extend(self.len(info.len()));
+                s.extend(info);
+                s.extend(0u32.to_be_bytes()); // global layer mask info
+            }
+            Layers::Lr16(n) => {
+                s.extend(self.len(0));
+                s.extend(0u32.to_be_bytes());
+                // An unrelated tagged block first (4-byte length, padded to 4).
+                s.extend(b"8BIMPatt");
+                s.extend(3u32.to_be_bytes());
+                s.extend([1, 2, 3, 0]);
+                let mut info = self.layer_info(n);
+                while !info.len().is_multiple_of(4) {
+                    info.push(0);
+                }
+                s.extend(b"8BIMLr16");
+                s.extend(self.len(info.len()));
+                s.extend(info);
+            }
+        }
+        s
+    }
+    fn write(&self) -> Vec<u8> {
+        let mut b = Vec::new();
+        b.extend(b"8BPS");
+        b.extend(self.version.to_be_bytes());
+        b.extend([0u8; 6]);
+        b.extend((self.channels.len() as u16).to_be_bytes());
+        b.extend(self.h.to_be_bytes());
+        b.extend(self.w.to_be_bytes());
+        b.extend(self.depth.to_be_bytes());
+        b.extend(self.mode.to_be_bytes());
+        b.extend((self.palette.len() as u32).to_be_bytes());
+        b.extend(&self.palette);
+        // Image resources: ResolutionInfo (1005), 72 ppi.
+        let mut res = Vec::new();
+        res.extend(b"8BIM");
+        res.extend(1005u16.to_be_bytes());
+        res.extend([0, 0]);
+        res.extend(16u32.to_be_bytes());
+        for v in [72u32 << 16, 0x0001_0001, 72 << 16, 0x0001_0001] {
+            res.extend(v.to_be_bytes());
+        }
+        if !self.icc.is_empty() {
+            res.extend(b"8BIM");
+            res.extend(1039u16.to_be_bytes());
+            res.extend([0, 0]);
+            res.extend((self.icc.len() as u32).to_be_bytes());
+            res.extend(&self.icc);
+            if self.icc.len() % 2 == 1 {
+                res.push(0);
+            }
+        }
+        b.extend((res.len() as u32).to_be_bytes());
+        b.extend(res);
+        let lm = self.layer_and_mask();
+        b.extend(self.len(lm.len()));
+        b.extend(lm);
+        b.extend(self.channel_data(&self.channels, self.rle));
+        b
+    }
+}
+
+/// PackBits: repeat runs of 2+ bytes, literals otherwise.
+fn packbits(row: &[u8]) -> Vec<u8> {
+    let mut out = Vec::new();
+    let mut i = 0;
+    while i < row.len() {
+        let run = row[i..].iter().take(128).take_while(|&&v| v == row[i]).count();
+        if run >= 2 {
+            out.push((1 - run as i16) as i8 as u8);
+            out.push(row[i]);
+            i += run;
+            continue;
+        }
+        let start = i;
+        while i < row.len() && i - start < 128 && !(i + 1 < row.len() && row[i + 1] == row[i]) {
+            i += 1;
+        }
+        out.push((i - start - 1) as u8);
+        out.extend(&row[start..i]);
+    }
+    out
+}
+
+fn pixels(b: &[u8]) -> Vec<[u8; 4]> {
+    let img = decode_rgba(b).expect("decodes");
+    assert_eq!(img.dimensions(), (W, H));
+    img.pixels().map(|p| p.0).collect()
+}
+
+fn at(x: u32, y: u32) -> usize {
+    (y * W + x) as usize
+}
+
+#[test]
+fn grayscale_extra_channels_leave_the_gray_composite() {
+    let extras = [sel(), spot(), sel(), plane(255, None)];
+    for n in 0..=extras.len() {
+        for rle in [false, true] {
+            for layered in [false, true] {
+                let mut ch = vec![gray()];
+                ch.extend(extras[..n].iter().cloned());
+                let mut psd = Psd::new(1, ch);
+                psd.rle = rle;
+                if layered {
+                    psd.layers = Layers::Count(1);
+                }
+                let want: Vec<[u8; 4]> = gray().iter().map(|&g| [g, g, g, 255]).collect();
+                assert_eq!(pixels(&psd.write()), want, "gray + {n} extra channels, rle {rle}, layered {layered}");
+            }
+        }
+    }
+}
+
+#[test]
+fn negative_layer_count_makes_the_first_extra_channel_the_transparency() {
+    let hole = plane(255, Some((2, 3, 5, 6, 0)));
+    for rle in [false, true] {
+        for extras in [vec![], vec![spot()], vec![spot(), sel(), sel()]] {
+            let mut ch = vec![gray(), hole.clone()];
+            ch.extend(extras.iter().cloned());
+            let mut psd = Psd::new(1, ch).layers(Layers::Count(-1));
+            psd.rle = rle;
+            let px = pixels(&psd.write());
+            for (i, p) in px.iter().enumerate() {
+                if hole[i] == 0 {
+                    assert_eq!(p[3], 0, "pixel {i} is in the hole");
+                } else {
+                    let g = gray()[i];
+                    assert_eq!(*p, [g, g, g, 255], "pixel {i}, rle {rle}, {} extras", extras.len());
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn rgb_with_a_spot_channel_is_opaque_rgb() {
+    let (r, g, b) = (plane(200, None), plane(10, Some((0, 0, 6, 8, 90))), plane(30, None));
+    for rle in [false, true] {
+        let mut psd = Psd::new(3, vec![r.clone(), g.clone(), b.clone(), spot()]);
+        psd.rle = rle;
+        let px = pixels(&psd.write());
+        assert_eq!(px[at(0, 0)], [200, 90, 30, 255]);
+        assert_eq!(px[at(9, 6)], [200, 10, 30, 255], "the spot square doesn't hide the image");
+        assert!(px.iter().all(|p| p[3] == 255));
+    }
+}
+
+#[test]
+fn rgb_with_merged_transparency_is_rgba_unmatted_from_white() {
+    // Straight red at alpha 128, stored matted over white: 0 → 255 − 128 = 127.
+    let r = plane(255, None);
+    let gb = plane(0, Some((0, 0, 1, 1, 127)));
+    let a = plane(255, Some((0, 0, 1, 1, 128)));
+    let psd = Psd::new(3, vec![r, gb.clone(), gb, a, sel()]).layers(Layers::Count(-1)).rle();
+    let px = pixels(&psd.write());
+    assert_eq!(px[at(0, 0)], [255, 0, 0, 128]);
+    assert_eq!(px[at(5, 5)], [255, 0, 0, 255]);
+    assert_eq!(px[at(2, 2)][3], 255, "the alpha selection after the transparency is ignored");
+}
+
+#[test]
+fn cmyk_converts_like_other_cmyk_images() {
+    // Stored inverted: 255 = no ink. Cyan 100 % on the left, 50 % black on the right.
+    let c = plane(255, Some((0, 0, 6, 8, 0)));
+    let m = plane(255, None);
+    let y = plane(255, None);
+    let k = plane(255, Some((6, 0, 12, 8, 127)));
+    // Through the working CMYK space, like CMYK JPEGs and TIFFs.
+    let expect = |cmyk: [u8; 4]| {
+        let raster = CmykRaster { width: 1, height: 1, cmyk: cmyk.to_vec(), alpha: None };
+        to_display_rgba(Pixels::Cmyk(raster), None, &DisplayColour::active()).unwrap().get_pixel(0, 0).0
+    };
+    for rle in [false, true] {
+        // An extra alpha channel (5 channels) doesn't become the alpha.
+        let mut psd = Psd::new(4, vec![c.clone(), m.clone(), y.clone(), k.clone(), sel()]);
+        psd.rle = rle;
+        let px = pixels(&psd.write());
+        let cyan = px[at(0, 0)];
+        assert_eq!(cyan, expect([255, 0, 0, 0]));
+        assert!(cyan[1] < 200 && cyan[2] < 250, "press cyan, not (0, 255, 255): {cyan:?}");
+        assert_eq!(px[at(11, 7)], expect([0, 0, 0, 128]));
+        assert!(px.iter().all(|p| p[3] == 255));
+    }
+}
+
+#[test]
+fn embedded_profile_converts_rgb_to_srgb() {
+    let r = plane(64, None);
+    let g = plane(192, None);
+    let b = plane(64, None);
+    let plain = pixels(&Psd::new(3, vec![r.clone(), g.clone(), b.clone()]).write());
+    assert_eq!(plain[0], [64, 192, 64, 255]);
+    let mut psd = Psd::new(3, vec![r, g, b]);
+    psd.icc = craft_cms::Builtin::AdobeRgbCompat.profile().to_bytes().to_vec();
+    let px = pixels(&psd.write());
+    // Adobe RGB green is greener than sRGB's: less red once shown as sRGB.
+    assert!(px[0][0] < 50 && px[0][1] > 180 && px[0][3] == 255, "{:?}", px[0]);
+    // A damaged profile is ignored.
+    psd.icc.truncate(100);
+    assert_eq!(pixels(&psd.write())[0], [64, 192, 64, 255]);
+}
+
+/// 8-bit plane → 16-bit big-endian samples (v × 257).
+fn wide(p: &[u8]) -> Vec<u8> {
+    p.iter().flat_map(|&v| (v as u16 * 257).to_be_bytes()).collect()
+}
+
+#[test]
+fn sixteen_bit_grayscale() {
+    for rle in [false, true] {
+        let mut psd = Psd::new(1, vec![wide(&gray()), wide(&sel()), wide(&spot())]);
+        psd.depth = 16;
+        psd.rle = rle;
+        let want: Vec<[u8; 4]> = gray().iter().map(|&g| [g, g, g, 255]).collect();
+        assert_eq!(pixels(&psd.write()), want);
+    }
+}
+
+#[test]
+fn sixteen_bit_transparency_from_the_lr16_block() {
+    let hole = plane(255, Some((2, 3, 5, 6, 0)));
+    let mut psd = Psd::new(1, vec![wide(&gray()), wide(&hole), wide(&spot())]).layers(Layers::Lr16(-1));
+    psd.depth = 16;
+    let px = pixels(&psd.write());
+    assert_eq!(px[at(3, 4)][3], 0);
+    assert_eq!(px[at(9, 6)], [150, 150, 150, 255]);
+}
+
+#[test]
+fn psb_with_rle_and_transparency() {
+    let hole = plane(255, Some((2, 3, 5, 6, 0)));
+    let mut psd = Psd::new(1, vec![gray(), hole, sel()]).layers(Layers::Count(-1)).rle();
+    psd.version = 2;
+    let px = pixels(&psd.write());
+    assert_eq!(px[at(3, 4)][3], 0);
+    assert_eq!(px[at(2, 2)], [150, 150, 150, 255]);
+    assert_eq!(px[at(5, 3)], [60, 60, 60, 255]);
+}
+
+#[test]
+fn indexed_uses_the_palette() {
+    let mut palette = vec![0u8; 768];
+    palette[3] = 10; // index 3: R
+    palette[256 + 3] = 20; // G
+    palette[512 + 3] = 30; // B
+    palette[7] = 255; // index 7: red
+    let mut psd = Psd::new(2, vec![plane(3, Some((0, 0, 1, 1, 7)))]);
+    psd.palette = palette;
+    let px = pixels(&psd.write());
+    assert_eq!(px[at(0, 0)], [255, 0, 0, 255]);
+    assert_eq!(px[at(1, 0)], [10, 20, 30, 255]);
+}
+
+#[test]
+fn bitmap_set_bits_are_black() {
+    // 12 px wide: 2 bytes per row. The first pixel of each row is black.
+    let mut psd = Psd::new(0, vec![[0x80u8, 0x00].repeat(H as usize)]);
+    psd.depth = 1;
+    let px = pixels(&psd.write());
+    assert_eq!(px[at(0, 3)], [0, 0, 0, 255]);
+    assert_eq!(px[at(1, 3)], [255, 255, 255, 255]);
+    assert_eq!(px[at(11, 3)], [255, 255, 255, 255]);
+}
+
+#[test]
+fn lab_white_and_black() {
+    let l = plane(255, Some((0, 0, 1, 1, 0)));
+    let ab = plane(128, None);
+    let psd = Psd::new(9, vec![l, ab.clone(), ab, sel()]);
+    let px = pixels(&psd.write());
+    assert_eq!(px[at(0, 0)], [0, 0, 0, 255]);
+    for v in &px[at(5, 5)][..3] {
+        assert!(*v >= 254, "L 100 is white: {:?}", px[at(5, 5)]);
+    }
+}
+
+fn valid_files() -> Vec<Vec<u8>> {
+    let hole = plane(255, Some((2, 3, 5, 6, 0)));
+    let mut wide16 = Psd::new(1, vec![wide(&gray()), wide(&hole)]).layers(Layers::Lr16(-1)).rle();
+    wide16.depth = 16;
+    let mut psb = Psd::new(3, vec![gray(), gray(), gray(), hole.clone()]).layers(Layers::Count(-1)).rle();
+    psb.version = 2;
+    vec![
+        Psd::new(1, vec![gray(), sel(), spot()]).write(),
+        Psd::new(1, vec![gray(), hole.clone(), spot()]).layers(Layers::Count(-1)).rle().write(),
+        Psd::new(4, vec![gray(), gray(), gray(), gray()]).rle().write(),
+        wide16.write(),
+        psb.write(),
+    ]
+}
+
+#[test]
+fn truncated_files_never_panic() {
+    for file in valid_files() {
+        let full = decode_rgba(&file).expect("the full file decodes");
+        for n in 0..file.len() {
+            if let Some(img) = decode_rgba(&file[..n]) {
+                assert_eq!(img, full, "a truncated file decodes only when the composite survived");
+            }
+        }
+    }
+}
+
+#[test]
+fn corrupted_files_never_panic() {
+    // A small LCG: deterministic byte flips across every valid file.
+    let mut seed = 0x2545_f491_u32;
+    let mut next = || {
+        seed = seed.wrapping_mul(1_664_525).wrapping_add(1_013_904_223);
+        seed >> 8
+    };
+    for file in valid_files() {
+        for _ in 0..2000 {
+            let mut b = file.clone();
+            for _ in 0..1 + next() % 4 {
+                let i = 4 + next() as usize % (b.len() - 4);
+                b[i] = next() as u8;
+            }
+            let _ = decode_rgba(&b);
+        }
+    }
+}
+
+#[test]
+fn hostile_headers_are_rejected() {
+    let ok = Psd::new(1, vec![gray()]).write();
+    let set = |at: usize, v: &[u8]| {
+        let mut b = ok.clone();
+        b[at..at + v.len()].copy_from_slice(v);
+        b
+    };
+    assert!(decode_rgba(&ok).is_some());
+    assert!(decode_rgba(&set(4, &3u16.to_be_bytes())).is_none(), "version 3");
+    assert!(decode_rgba(&set(12, &0u16.to_be_bytes())).is_none(), "no channels");
+    assert!(decode_rgba(&set(12, &57u16.to_be_bytes())).is_none(), "57 channels");
+    assert!(decode_rgba(&set(14, &0u32.to_be_bytes())).is_none(), "zero height");
+    assert!(decode_rgba(&set(18, &0u32.to_be_bytes())).is_none(), "zero width");
+    assert!(decode_rgba(&set(18, &30_001u32.to_be_bytes())).is_none(), "wider than a PSD can be");
+    assert!(decode_rgba(&set(14, &u32::MAX.to_be_bytes())).is_none(), "absurd height");
+    assert!(decode_rgba(&set(22, &32u16.to_be_bytes())).is_none(), "32-bit");
+    assert!(decode_rgba(&set(22, &7u16.to_be_bytes())).is_none(), "7-bit");
+    assert!(decode_rgba(&set(24, &7u16.to_be_bytes())).is_none(), "multichannel");
+    // Huge but within the side limit: refused before allocating.
+    let mut big = set(14, &30_000u32.to_be_bytes());
+    big[18..22].copy_from_slice(&30_000u32.to_be_bytes());
+    assert!(decode_rgba(&big).is_none(), "too many pixels");
+    // RGB with only 2 channels; indexed without a palette.
+    assert!(decode_rgba(&Psd::new(3, vec![gray(), gray()]).write()).is_none());
+    assert!(decode_rgba(&Psd::new(2, vec![gray()]).write()).is_none());
+}
+
+#[test]
+fn bad_compression_is_rejected() {
+    let ok = Psd::new(1, vec![gray()]).rle().write();
+    assert!(decode_rgba(&ok).is_some());
+    let comp = ok.len() - Psd::new(1, vec![gray()]).rle().channel_data(&[gray()], true).len();
+    for method in [2u16, 3, 4] {
+        let mut b = ok.clone();
+        b[comp..comp + 2].copy_from_slice(&method.to_be_bytes());
+        assert!(decode_rgba(&b).is_none(), "compression {method}");
+    }
+    // A row count past the end of the data.
+    let mut b = ok.clone();
+    b[comp + 2..comp + 4].copy_from_slice(&u16::MAX.to_be_bytes());
+    assert!(decode_rgba(&b).is_none());
+    // A row that unpacks to the wrong width: a literal of 1 byte instead of a run of 12.
+    let mut rows = Vec::new();
+    for _ in 0..H {
+        rows.push(vec![0u8, 150]);
+    }
+    let mut b = ok[..comp].to_vec();
+    b.extend(1u16.to_be_bytes());
+    rows.iter().for_each(|r| b.extend((r.len() as u16).to_be_bytes()));
+    rows.iter().for_each(|r| b.extend(r));
+    assert!(decode_rgba(&b).is_none());
+}
+
+#[test]
+fn packbits_round_trips() {
+    let row = [1u8, 1, 1, 2, 3, 4, 4, 5, 6, 6, 6, 6, 7];
+    assert_eq!(super::unpack_bits(&packbits(&row), row.len()), Some(row.to_vec()));
+    // -128 is a no-op.
+    assert_eq!(super::unpack_bits(&[0x80, 0x01, 9, 8], 2), Some(vec![9, 8]));
+    assert_eq!(super::unpack_bits(&[0x05, 1, 2], 6), None, "literal past the end of the data");
+    assert_eq!(super::unpack_bits(&[0xFE, 7], 2), None, "run longer than the row");
+}
+
+#[test]
+fn huge_header_without_data_is_rejected_before_allocating() {
+    // A gray 11000×11000 image (≈ 460 MiB as RGBA, under the cap) with almost no image data.
+    let (w, h) = (11_000u32, 11_000u32);
+    let mut head = Vec::new();
+    head.extend(b"8BPS");
+    head.extend(1u16.to_be_bytes());
+    head.extend([0u8; 6]);
+    head.extend(1u16.to_be_bytes()); // channels
+    head.extend(h.to_be_bytes());
+    head.extend(w.to_be_bytes());
+    head.extend(8u16.to_be_bytes());
+    head.extend(1u16.to_be_bytes()); // grayscale
+    head.extend([0u8; 12]); // empty colour mode data, image resources, layers
+    let holds = |b: &[u8]| {
+        let r = super::Reader { b: &b[head.len()..] };
+        super::ImageData::parse(r, false, 1, w as usize, h as usize).expect("parses").holds(1)
+    };
+    // Raw: a few bytes instead of 11000 × 11000.
+    let mut raw = head.clone();
+    raw.extend(0u16.to_be_bytes());
+    raw.extend([0u8; 16]);
+    assert!(holds(&raw).is_none());
+    assert!(super::decode(&raw).is_none());
+    // RLE: every row count present and plausible, but the rows themselves missing.
+    let mut rle = head.clone();
+    rle.extend(1u16.to_be_bytes());
+    for _ in 0..h {
+        rle.extend(174u16.to_be_bytes()); // 2 × ⌈11000 / 128⌉: the shortest full row
+    }
+    assert!(holds(&rle).is_none());
+    assert!(super::decode(&rle).is_none());
+    // RLE row counts too short to unpack to a full row, even with the data present.
+    let mut short = head.clone();
+    short.extend(1u16.to_be_bytes());
+    for _ in 0..h {
+        short.extend(2u16.to_be_bytes());
+    }
+    short.extend(vec![0u8; 2 * h as usize]);
+    assert!(holds(&short).is_none());
+    assert!(super::decode(&short).is_none());
+}
diff --git a/crates/images/src/tests.rs b/crates/images/src/tests.rs
new file mode 100644
index 000000000..ba6e032eb
--- /dev/null
+++ b/crates/images/src/tests.rs
@@ -0,0 +1,403 @@
+use super::*;
+
+const SVG: &str = r##"<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="100" viewBox="0 0 200 100">
+  <rect x="0" y="0" width="100" height="100" fill="#ff0000"/>
+  <text x="110" y="60" font-size="20">Hi</text>
+</svg>"##;
+
+/// Build an SVG with the requested number of nested `g` wrappers around a leaf rect.
+fn nested_svg(groups: usize) -> String {
+    format!(
+        r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">{}<rect width="10" height="10"/>{}</svg>"#,
+        "<g opacity=\"0.99\">".repeat(groups),
+        "</g>".repeat(groups)
+    )
+}
+
+/// Fast-gzip helper for SVGZ tests.
+fn gzip(bytes: &[u8]) -> Vec<u8> {
+    use std::io::Write;
+
+    let mut encoder = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::fast());
+    encoder.write_all(bytes).unwrap();
+    encoder.finish().unwrap()
+}
+
+/// A boundary-depth SVG parses into a tree; one level deeper and 2,000 levels are rejected by the tree, size and render APIs.
+#[test]
+fn svg_depth_is_checked_before_recursive_parsing() {
+    // Count the SVG root and leaf too; the boundary document still draws its path.
+    let accepted = nested_svg(MAX_SVG_DEPTH - 2);
+    let tree = svg_tree(accepted.as_bytes()).unwrap();
+    assert!(!tree.root().children().is_empty());
+    drop(tree);
+    for depth in [MAX_SVG_DEPTH - 1, 2000] {
+        let rejected = nested_svg(depth);
+        assert!(svg_tree(rejected.as_bytes()).is_none());
+        assert!(natural_size(rejected.as_bytes()).is_none());
+        assert!(render_svg(rejected.as_bytes(), 10).is_none());
+    }
+}
+
+/// Markup-looking text in comments, CDATA and attributes does not count as XML depth.
+#[test]
+fn svg_depth_ignores_markup_in_comments_cdata_and_attributes() {
+    let markup = "<g>".repeat(2000);
+    let svg = format!(
+        r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><!--{markup}--><desc><![CDATA[{markup}]]></desc><rect data-label="&lt;g>" width="10" height="10"/></svg>"#
+    );
+    assert!(svg_tree(svg.as_bytes()).is_some());
+}
+
+/// An external SVG doctype is accepted; an internal entity subset is rejected.
+#[test]
+fn svg_external_doctype_is_preserved_but_entity_markup_is_refused() {
+    let external = format!(r#"<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">{}"#, nested_svg(2));
+    assert!(svg_tree(external.as_bytes()).is_some());
+    let internal = r#"<!DOCTYPE svg [<!ENTITY shape "<rect width='10' height='10'/>">]><svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">&shape;</svg>"#;
+    assert!(svg_tree(internal.as_bytes()).is_none());
+}
+
+/// The exact 16 MiB document and 100,000-event boundaries are accepted, each one-over case rejected.
+#[test]
+fn svg_byte_and_event_limits_are_enforced() {
+    let mut bytes = nested_svg(0).into_bytes();
+    bytes.resize(MAX_SVG_BYTES, b' ');
+    assert!(svg_tree(&bytes).is_some());
+    bytes.push(b' ');
+    assert!(svg_tree(&bytes).is_none());
+
+    let document = |comments| {
+        format!(
+            r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">{}<rect width="10" height="10"/></svg>"#,
+            "<!-- -->".repeat(comments)
+        )
+    };
+    assert!(svg_tree(document(MAX_SVG_EVENTS - 4).as_bytes()).is_some());
+    assert!(svg_tree(document(MAX_SVG_EVENTS - 3).as_bytes()).is_none());
+}
+
+/// SVGZ depth, decoded size and malformed gzip follow the plain-SVG limits.
+#[test]
+fn svgz_has_the_same_depth_and_decoded_size_limits() {
+    assert!(svg_tree(&gzip(nested_svg(2).as_bytes())).is_some());
+    assert!(svg_tree(&gzip(nested_svg(2000).as_bytes())).is_none());
+    let mut bytes = nested_svg(0).into_bytes();
+    bytes.resize(MAX_SVG_BYTES + 1, b' ');
+    let compressed = gzip(&bytes);
+    assert!(compressed.len() < MAX_SVG_BYTES);
+    assert!(svg_tree(&compressed).is_none());
+    assert!(svg_tree(b"\x1f\x8bnot gzip").is_none());
+}
+
+/// Deeply nested SVG data images are omitted without bypassing the depth preflight.
+#[test]
+fn nested_svg_data_images_cannot_bypass_the_depth_limit() {
+    let nested = nested_svg(2000);
+    let encoded = nested.bytes().map(|b| format!("%{b:02X}")).collect::<String>();
+    for mime in ["image/svg+xml", "text/plain"] {
+        let svg = format!(
+            r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><image width="10" height="10" href="data:{mime},{encoded}"/></svg>"#
+        );
+        // As with other unreadable data images, the parent survives without the image.
+        assert!(svg_tree(svg.as_bytes()).unwrap().root().children().is_empty());
+    }
+}
+
+#[test]
+fn svg_sniff_size_and_render() {
+    let b = SVG.as_bytes();
+    assert!(is_svg(b));
+    assert_eq!(mime(b), "image/svg+xml");
+    assert_eq!(natural_size(b), Some((150.0, 75.0)));
+    let (px, w, h) = render_svg(b, 400).unwrap();
+    assert_eq!((w, h), (400, 200));
+    // Red on the left; the text drew some ink on the right.
+    assert_eq!(&px[(100 * 400 + 100) * 4..][..4], &[255, 0, 0, 255]);
+    assert!(px.chunks(4).skip(220).step_by(7).any(|p| p[3] > 128 && p[0] < 100), "text pixels");
+    assert!(!is_svg(b"\x89PNG"));
+}
+
+#[test]
+fn svg_images_come_only_from_data_urls() {
+    let dir = std::env::temp_dir().join(format!("dc-svg-href-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let file = dir.join("red.png");
+    image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255])).save(&file).unwrap();
+    let blue = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10'%3E%3Crect width='10' height='10' fill='blue'/%3E%3C/svg%3E";
+    let svg = format!(
+        r#"<svg xmlns="http://www.w3.org/2000/svg" width="30" height="10">
+<image x="0" y="0" width="10" height="10" href="{}"/>
+<image x="10" y="0" width="10" height="10" href="{blue}"/>
+<image x="20" y="0" width="10" height="10" href="/etc/hostname"/>
+</svg>"#,
+        file.display()
+    );
+    // The image nodes usvg kept: only the data URL's (PDF export embeds every one).
+    fn images(g: &usvg::Group) -> usize {
+        g.children()
+            .iter()
+            .map(|n| match n {
+                usvg::Node::Group(g) => images(g),
+                usvg::Node::Image(_) => 1,
+                _ => 0,
+            })
+            .sum()
+    }
+    assert_eq!(images(svg_tree(svg.as_bytes()).unwrap().root()), 1, "files the SVG names are not read");
+    let (px, w, _) = render_svg(svg.as_bytes(), 30).unwrap();
+    let at = |x: usize, y: usize| px[(y * w as usize + x) * 4..][..4].to_vec();
+    assert_eq!(at(15, 5), [0, 0, 255, 255], "a data URL is drawn");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// The family of the font that sets each text glyph of `svg`, and the glyph's id.
+fn glyph_families(svg: &str) -> Vec<(String, u16)> {
+    fn walk(g: &usvg::Group, tree: &usvg::Tree, out: &mut Vec<(String, u16)>) {
+        for n in g.children() {
+            match n {
+                usvg::Node::Group(g) => walk(g, tree, out),
+                usvg::Node::Text(t) => {
+                    for g in t.layouted().iter().flat_map(|s| &s.positioned_glyphs) {
+                        out.extend(tree.fontdb().face(g.font).map(|f| (f.families[0].0.clone(), g.id.0)));
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+    let tree = svg_tree(svg.as_bytes()).unwrap();
+    let mut out = Vec::new();
+    walk(tree.root(), &tree, &mut out);
+    out
+}
+
+#[test]
+fn svg_text_uses_the_shared_fonts() {
+    let font = designcraft_fonts::testing::font_with("DC Test SVG Hangul", &['한', '글']).unwrap();
+    designcraft_fonts::FontDb::global().add_font(font);
+    let text = |attrs: &str, body: &str| {
+        format!(r#"<svg xmlns="http://www.w3.org/2000/svg" width="100" height="40"><text y="30" font-size="20"{attrs}>{body}</text></svg>"#)
+    };
+    let named = r#" font-family="DC Test SVG Hangul""#;
+    // A family named in the SVG.
+    let set = glyph_families(&text(named, "한글"));
+    assert!(set.len() == 2 && set.iter().all(|(f, gid)| f == "DC Test SVG Hangul" && *gid != 0), "{set:?}");
+    // Characters the bundled default lacks: a shared face that has them, not the default.
+    let set = glyph_families(&text("", "한글"));
+    assert!(set.len() == 2 && set.iter().all(|(f, gid)| f != "Source Sans 3" && *gid != 0), "{set:?}");
+}
+
+#[test]
+fn svg_family_names_match_in_any_case() {
+    let font = designcraft_fonts::testing::font_with("DC Test SVG Casing", &['A', 'b']).unwrap();
+    designcraft_fonts::FontDb::global().add_font(font);
+    let text = |family: &str, attrs: &str| {
+        format!(
+            r#"<svg xmlns="http://www.w3.org/2000/svg" width="100" height="40"><text y="30" font-size="20" font-family="{family}"{attrs}>Ab</text></svg>"#
+        )
+    };
+    for family in ["DC Test SVG Casing", "dc test svg casing", "DC TEST svg Casing", "Nope, dc test SVG casing, serif"] {
+        let set = glyph_families(&text(family, ""));
+        assert!(set.len() == 2 && set.iter().all(|(f, gid)| f == "DC Test SVG Casing" && *gid != 0), "{family}: {set:?}");
+    }
+    // Weight and style still reach the query: there's only a regular face, so it sets the text.
+    let set = glyph_families(&text("dc test svg casing", r#" font-weight="700" font-style="italic""#));
+    assert!(set.len() == 2 && set.iter().all(|(f, _)| f == "DC Test SVG Casing"), "{set:?}");
+    // A family nobody has still falls to the bundled serif.
+    let set = glyph_families(&text("DC Test SVG Nobody", ""));
+    assert!(set.len() == 2 && set.iter().all(|(f, _)| f == "Source Serif 4"), "{set:?}");
+}
+
+/// The PostScript name of the face that sets the text of `svg` (one face for all of it).
+fn text_face(svg_attrs: &str) -> String {
+    let svg = format!(r#"<svg xmlns="http://www.w3.org/2000/svg" width="100" height="40"><text y="30" font-size="20"{svg_attrs}>ab</text></svg>"#);
+    let tree = svg_tree(svg.as_bytes()).unwrap();
+    let mut faces = Vec::new();
+    for n in tree.root().children() {
+        if let usvg::Node::Text(t) = n {
+            for g in t.layouted().iter().flat_map(|s| &s.positioned_glyphs) {
+                faces.extend(tree.fontdb().face(g.font).map(|f| f.post_script_name.clone()));
+            }
+        }
+    }
+    faces.dedup();
+    assert_eq!(faces.len(), 1, "{faces:?}");
+    faces.remove(0)
+}
+
+#[test]
+fn svg_text_finds_fonts_by_postscript_name() {
+    // Bundled, as Illustrator's SVG export names it; any case.
+    assert_eq!(text_face(r#" font-family="'SourceSerif4-Semibold'""#), "SourceSerif4-Semibold");
+    assert_eq!(text_face(r#" font-family="sourceserif4-semibold""#), "SourceSerif4-Semibold");
+    // A shared font (as an installed one would be).
+    let font = designcraft_fonts::testing::font_with("DC Test SVG PostScript", &['a', 'b']).unwrap();
+    designcraft_fonts::FontDb::global().add_font(font);
+    assert_eq!(text_face(r#" font-family="DCTestSVGPostScript-Regular""#), "DCTestSVGPostScript-Regular");
+    // The name picks that face: font-weight and font-style don't change it.
+    assert_eq!(text_face(r#" font-family="SourceSerif4-Semibold" font-weight="bold" font-style="italic""#), "SourceSerif4-Semibold");
+    // A family listed before it still comes first; one after it is a fallback.
+    assert_eq!(text_face(r#" font-family="'Source Sans 3', SourceSerif4-Bold""#), "SourceSans3-Regular");
+    assert_eq!(text_face(r#" font-family="NoSuch-Font, SourceSerif4-Bold, 'Source Sans 3'""#), "SourceSerif4-Bold");
+    // Family names work as before.
+    assert_eq!(text_face(r#" font-family="'Source Serif 4'" font-weight="bold""#), "SourceSerif4-Bold");
+    // An unknown name falls back as before (the serif default).
+    assert_eq!(text_face(r#" font-family="NoSuch-Font""#), text_face(r#" font-family="No Such Font""#));
+    assert_eq!(text_face(r#" font-family="NoSuch-Font""#), "SourceSerif4-Regular");
+}
+
+/// A minimal Photoshop file: 2×1 RGB, no layers, raw merged image.
+fn tiny_psd() -> Vec<u8> {
+    let mut b = Vec::new();
+    b.extend(b"8BPS");
+    b.extend(1u16.to_be_bytes());
+    b.extend([0u8; 6]);
+    b.extend(3u16.to_be_bytes()); // channels
+    b.extend(1u32.to_be_bytes()); // height
+    b.extend(2u32.to_be_bytes()); // width
+    b.extend(8u16.to_be_bytes()); // depth
+    b.extend(3u16.to_be_bytes()); // RGB
+    b.extend(0u32.to_be_bytes()); // colour mode data
+    b.extend(0u32.to_be_bytes()); // image resources
+    b.extend(0u32.to_be_bytes()); // layer and mask info
+    b.extend(0u16.to_be_bytes()); // raw
+    b.extend([255, 0, 0, 255, 0, 0]); // R, G, B planes: a red pixel, then a green one
+    b
+}
+
+#[test]
+fn psd_composite_decodes() {
+    let b = tiny_psd();
+    assert_eq!(mime(&b), "image/vnd.adobe.photoshop");
+    assert_eq!(pixel_size(&b), Some((2, 1)));
+    let img = decode_rgba(&b).unwrap();
+    assert_eq!(img.get_pixel(0, 0).0, [255, 0, 0, 255]);
+    assert_eq!(img.get_pixel(1, 0).0, [0, 255, 0, 255]);
+}
+
+fn tiff_of<C: tiff::encoder::colortype::ColorType>(w: u32, h: u32, px: &[C::Inner], alpha: bool) -> Vec<u8>
+where
+    [C::Inner]: tiff::encoder::TiffValue,
+{
+    let mut b = Vec::new();
+    let mut enc = tiff::encoder::TiffEncoder::new(std::io::Cursor::new(&mut b)).unwrap();
+    let mut img = enc.new_image::<C>(w, h).unwrap();
+    if alpha {
+        // CMYKA8 already has five samples: only the tag that says the fifth is alpha.
+        img.encoder().write_tag(tiff::tags::Tag::ExtraSamples, &[2u16][..]).unwrap();
+    }
+    img.write_data(px).unwrap();
+    b
+}
+
+/// A placed EPS is measured by its bounding box in points and drawn through its proxy; the
+/// bytes stay the EPS.
+#[test]
+fn eps_draws_through_its_proxy_at_its_bounding_box_size() {
+    let eps = b"%!PS-Adobe-3.1 EPSF-3.0\n%%BoundingBox: 0 0 4 2\n%%EndComments\n/rf { rectfill } bind def\n0 0 0 1 setcmykcolor\n0 0 2 2 rf\n%%EOF\n";
+    assert_eq!(natural_size(eps), Some((4.0, 2.0)));
+    let img = decode_rgba(eps).expect("drawn");
+    assert_eq!(img.dimensions(), (32, 16));
+    assert_eq!(img.get_pixel(1, 1).0, [0, 0, 0, 255], "the rectangle");
+    assert_eq!(img.get_pixel(30, 1).0[3], 0, "outside it, transparent");
+}
+
+/// CMYK TIFFs read back as their ink values; RGB ones aren't CMYK.
+#[test]
+fn cmyk_tiff_keeps_inks() {
+    use tiff::encoder::colortype::{CMYK8, CMYK16, CMYKA8, RGB8};
+    // 2×1: 100% K, then C0 M100 Y100 K0.
+    let px = [0, 0, 0, 255, 0, 255, 255, 0];
+    let b = tiff_of::<CMYK8>(2, 1, &px, false);
+    assert_eq!(mime(&b), "image/tiff");
+    assert!(is_cmyk_tiff(&b));
+    assert_eq!(decode_cmyk_tiff(&b), Some(CmykRaster { width: 2, height: 1, cmyk: px.to_vec(), alpha: None }));
+    // The screen gets RGB through the working CMYK space.
+    let raster = CmykRaster { width: 2, height: 1, cmyk: px.to_vec(), alpha: None };
+    let want = colour::to_display_rgba(colour::Pixels::Cmyk(raster), None, &colour::DisplayColour::active()).unwrap();
+    assert_eq!(decode_rgba(&b).unwrap(), want);
+
+    let b = tiff_of::<CMYK16>(2, 1, &[0, 0, 0, 65_535, 0, 32_896, 65_535, 0], false);
+    assert_eq!(decode_cmyk_tiff(&b).unwrap().cmyk, [0, 0, 0, 255, 0, 128, 255, 0]);
+
+    let b = tiff_of::<CMYKA8>(2, 1, &[0, 0, 0, 255, 255, 0, 255, 255, 0, 0], true);
+    let r = decode_cmyk_tiff(&b).unwrap();
+    assert_eq!((r.cmyk, r.alpha), (px.to_vec(), Some(vec![255, 0])));
+
+    let rgb = tiff_of::<RGB8>(1, 1, &[255, 0, 0], false);
+    assert!(!is_cmyk_tiff(&rgb));
+    assert_eq!(decode_cmyk_tiff(&rgb), None);
+    assert!(!is_cmyk_tiff(b"II*\0"), "truncated");
+    assert_eq!(decode_cmyk_tiff(&b[..b.len() / 2]), None, "truncated");
+}
+
+/// Indexed colour (PhotometricInterpretation 3), which the `tiff` encoder has no type for.
+struct Palette<const BITS: u16>;
+impl<const BITS: u16> tiff::encoder::colortype::ColorType for Palette<BITS> {
+    type Inner = u8;
+    const TIFF_VALUE: tiff::tags::PhotometricInterpretation = tiff::tags::PhotometricInterpretation::RGBPalette;
+    const BITS_PER_SAMPLE: &[u16] = &[BITS];
+    const SAMPLE_FORMAT: &[tiff::tags::SampleFormat] = &[tiff::tags::SampleFormat::Uint];
+    fn horizontal_predict(row: &[u8], result: &mut Vec<u8>) {
+        result.extend_from_slice(row);
+    }
+}
+
+/// A palette TIFF as Photoshop and Pillow write it: 16-bit ColorMap entries (reds, then
+/// greens, then blues), each 8-bit value times 256.
+fn palette_tiff<const BITS: u16>(w: u32, h: u32, px: &[u8], colours: &[[u8; 3]], lzw: bool) -> Vec<u8> {
+    let n = 1usize << BITS;
+    let mut map = vec![0u16; 3 * n];
+    for (i, c) in colours.iter().enumerate() {
+        for (ch, &v) in c.iter().enumerate() {
+            map[ch * n + i] = u16::from(v) << 8;
+        }
+    }
+    let mut b = Vec::new();
+    let mut enc = tiff::encoder::TiffEncoder::new(std::io::Cursor::new(&mut b)).unwrap();
+    if lzw {
+        enc = enc.with_compression(tiff::encoder::Compression::Lzw);
+    }
+    let mut img = enc.new_image::<Palette<BITS>>(w, h).unwrap();
+    img.encoder().write_tag(tiff::tags::Tag::ColorMap, &map[..]).unwrap();
+    img.write_data(px).unwrap();
+    b
+}
+
+/// Indexed-colour TIFFs (an old GIF logo saved from Photoshop) are sized and drawn through
+/// their palette, uncompressed or LZW, 8- or 4-bit.
+#[test]
+fn palette_tiff_decodes_through_its_colormap() {
+    let colours = [[0, 128, 255], [255, 0, 0], [10, 20, 30]];
+    for lzw in [false, true] {
+        let b = palette_tiff::<8>(3, 1, &[2, 0, 1], &colours, lzw);
+        assert_eq!(pixel_size(&b), Some((3, 1)), "lzw {lzw}");
+        let img = decode_rgba(&b).expect("decodes");
+        let px: Vec<_> = img.pixels().map(|p| p.0).collect();
+        assert_eq!(px, [[10, 20, 30, 255], [0, 128, 255, 255], [255, 0, 0, 255]], "lzw {lzw}");
+    }
+    // Two indices per byte, high nibble first: 2, 1 | 0, 2 (the encoder counts samples, not
+    // bytes, so the strip carries two spare bytes the decoder doesn't read).
+    let b = palette_tiff::<4>(2, 2, &[0x21, 0x02, 0, 0], &colours, false);
+    assert_eq!(pixel_size(&b), Some((2, 2)));
+    let px: Vec<_> = decode_rgba(&b).expect("decodes").pixels().map(|p| p.0).collect();
+    assert_eq!(px, [[10, 20, 30, 255], [255, 0, 0, 255], [0, 128, 255, 255], [10, 20, 30, 255]]);
+}
+
+#[test]
+fn cmyk_tiff_with_alpha_reports_its_pixel_size() {
+    use tiff::encoder::colortype::CMYKA8;
+    let b = tiff_of::<CMYKA8>(2, 1, &[0, 0, 0, 255, 255, 0, 0, 0, 0, 0], true);
+    assert_eq!(pixel_size(&b), Some((2, 1)));
+}
+
+#[test]
+fn bmp_decodes() {
+    let mut bmp = Vec::new();
+    image::RgbaImage::from_pixel(3, 2, image::Rgba([0, 0, 255, 255])).write_to(&mut std::io::Cursor::new(&mut bmp), image::ImageFormat::Bmp).unwrap();
+    assert_eq!(mime(&bmp), "image/bmp");
+    assert_eq!(pixel_size(&bmp), Some((3, 2)));
+    assert_eq!(decode_rgba(&bmp).unwrap().get_pixel(1, 1).0, [0, 0, 255, 255]);
+}
diff --git a/crates/mcp/src/server.rs b/crates/mcp/src/server.rs
index 328df76d3..b5d2d8175 100644
--- a/crates/mcp/src/server.rs
+++ b/crates/mcp/src/server.rs
@@ -59,10 +59,17 @@ impl Server {
 
     /// Serve newline-delimited JSON-RPC until `input` closes. Logs go to stderr only (stdout is
     /// the protocol stream).
-    pub fn serve(&mut self, input: impl BufRead, mut output: impl Write) -> std::io::Result<()> {
-        for line in input.lines() {
-            let line = line?;
-            if let Some(reply) = self.handle_line(&line) {
+    pub fn serve(&mut self, mut input: impl BufRead, mut output: impl Write) -> std::io::Result<()> {
+        let mut buf = Vec::new();
+        loop {
+            buf.clear();
+            if input.read_until(b'\n', &mut buf)? == 0 {
+                break;
+            }
+            // Invalid UTF-8 becomes U+FFFD, so the line gets a parse error instead of ending the stream.
+            let line = String::from_utf8_lossy(&buf);
+            let line = line.trim_end_matches(['\r', '\n']);
+            if let Some(reply) = self.handle_line(line) {
                 output.write_all(reply.as_bytes())?;
                 output.write_all(b"\n")?;
                 output.flush()?;
diff --git a/crates/mcp/src/tests.rs b/crates/mcp/src/tests.rs
index 21270e5e8..66ea74b55 100644
--- a/crates/mcp/src/tests.rs
+++ b/crates/mcp/src/tests.rs
@@ -76,6 +76,28 @@ fn framing_basics() {
     assert_eq!(rpc(&mut s, 5, "tools/call", json!({}))["error"]["code"], -32602);
 }
 
+#[test]
+fn serve_survives_invalid_utf8_line() {
+    let mut s = server();
+    let mut input = Vec::new();
+    input.extend_from_slice(json!({"jsonrpc":"2.0","id":1,"method":"ping"}).to_string().as_bytes());
+    input.extend_from_slice(b"\n\xff\xfe not utf-8\n");
+    input.extend_from_slice(json!({"jsonrpc":"2.0","id":2,"method":"ping"}).to_string().as_bytes());
+    input.extend_from_slice(b"\n\r\n");
+    input.extend_from_slice(json!({"jsonrpc":"2.0","id":3,"method":"ping"}).to_string().as_bytes());
+    input.extend_from_slice(b"\r\n");
+    let mut out = Vec::new();
+    let res = s.serve(input.as_slice(), &mut out);
+    assert!(res.is_ok(), "serve stopped: {res:?}");
+    let lines: Vec<Value> = String::from_utf8(out).unwrap().lines().map(|l| serde_json::from_str(l).unwrap()).collect();
+    assert_eq!(lines.len(), 4, "{lines:?}");
+    assert_eq!(lines[0]["id"], 1);
+    assert_eq!(lines[1]["error"]["code"], -32700);
+    assert!(lines[1]["id"].is_null());
+    assert_eq!(lines[2]["id"], 2);
+    assert_eq!(lines[3]["id"], 3);
+}
+
 #[test]
 fn protocol_round_trip_over_serve() {
     let mut s = server();
diff --git a/crates/mcp/tests/it/automation_roots.rs b/crates/mcp/tests/it/automation_roots.rs
index 871945920..8dcc3228d 100644
--- a/crates/mcp/tests/it/automation_roots.rs
+++ b/crates/mcp/tests/it/automation_roots.rs
@@ -51,7 +51,7 @@ fn confined(tag: &str, read: bool, write: bool) -> (Server, PathBuf) {
         std::fs::write(dir.join("tags.xml"), format!("<root><p>{text}</p></root>")).unwrap();
     }
     let (in_dir, out_dir) = (base.join("in"), base.join("out"));
-    let roots = AutomationRoots::new(read.then_some(in_dir.as_path()), write.then_some(out_dir.as_path())).unwrap();
+    let roots = AutomationRoots::new(read.then_some(in_dir.as_path()).as_slice(), write.then_some(out_dir.as_path()).as_slice()).unwrap();
     let mut server = Server::new(Box::new(Headless::with_document().with_automation_roots(roots)));
     ok(&mut server, "new_document", json!({}));
     (server, base)
@@ -339,7 +339,7 @@ fn without_roots_nothing_is_confined() {
     let _ = std::fs::remove_dir_all(&base);
     std::fs::create_dir_all(&base).unwrap();
     designcraft_file(&base.join("a.designcraft"), 3, "Anywhere");
-    let mut server = Server::new(Box::new(Headless::with_document().with_automation_roots(AutomationRoots::new(None, None).unwrap())));
+    let mut server = Server::new(Box::new(Headless::with_document().with_automation_roots(AutomationRoots::new(&[], &[]).unwrap())));
     ok(&mut server, "open_document", json!({"path": s(&base.join("a.designcraft"))}));
     assert_eq!(pages(&mut server), 3);
     ok(&mut server, "save_document", json!({"path": s(&base.join("b.designcraft"))}));
diff --git a/crates/pdf/Cargo.toml b/crates/pdf/Cargo.toml
index 09da578ee..2b4275da3 100644
--- a/crates/pdf/Cargo.toml
+++ b/crates/pdf/Cargo.toml
@@ -15,6 +15,8 @@ designcraft-doc = { workspace = true }
 designcraft-fonts = { workspace = true }
 designcraft-compose = { workspace = true }
 craft-pdf = { workspace = true, features = ["write-pdf"] }
+craft-prepress = { workspace = true }
+craft-cms = { workspace = true }
 krilla-svg = { workspace = true }
 designcraft-images = { workspace = true }
 image = { workspace = true }
diff --git a/crates/pdf/src/export.rs b/crates/pdf/src/export.rs
index 5d3ad0644..164e4c8f4 100644
--- a/crates/pdf/src/export.rs
+++ b/crates/pdf/src/export.rs
@@ -1,5 +1,9 @@
 //! Document → PDF. The item walk mirrors `designcraft-render`'s `draw_spread` / `draw_item`.
 
+#[cfg(test)]
+#[path = "registration_tests.rs"]
+pub(crate) mod registration_tests;
+
 use std::collections::HashMap;
 use std::sync::Arc;
 
@@ -23,450 +27,26 @@ use krilla::tagging::{Artifact, ArtifactType, ContentTag, Identifier, Tag, TagGr
 
 use crate::{ExportReport, PdfError, PdfOptions, Result, Standard};
 
-/// Export `doc` as PDF bytes.
-pub fn export_pdf(doc: &Document, cache: &Cache, opts: &PdfOptions) -> Result<Vec<u8>> {
-    export_pdf_with_report(doc, cache, opts).map(|r| r.bytes)
-}
+mod booklet;
+mod common;
+mod graphics;
+mod images;
+mod metadata;
+mod paint;
+mod pipeline;
+mod walk;
 
-/// One output page: a document page or a spread, in spread coordinates.
-pub(crate) struct Sheet {
-    pub spread: usize,
-    pub trim: Rect,
-    pub bleed: Rect,
-    pub media: Rect,
-    /// Page name(s) for the page-information mark.
-    pub label: String,
-}
-
-pub(crate) const MARK_LEN: f64 = 18.0;
-
-/// Whether a layer's items go into the PDF.
-pub(crate) fn layer_exported(layer: &designcraft_doc::Layer) -> bool {
-    layer.visible && layer.printable
-}
-
-/// Whether an item and everything inside it go into the PDF, its layer aside.
-pub(crate) fn item_exported(it: &Item) -> bool {
-    !it.hidden && !it.nonprinting
-}
-
-/// Every item of spread `si` that goes into the PDF, with its parent's transform: the items on
-/// exported layers, leaving out hidden and non-printing items with everything inside them.
-pub(crate) fn exported_items(doc: &Document, si: usize) -> Vec<(Affine, &Item)> {
-    let Some(sp) = doc.spreads.get(si) else { return Vec::new() };
-    let mut stack: Vec<(Affine, &Item)> =
-        sp.items.iter().filter(|it| doc.layer(it.layer).is_some_and(layer_exported)).map(|it| (Affine::IDENTITY, &**it)).collect();
-    let mut out = Vec::new();
-    while let Some((xf, it)) = stack.pop() {
-        if !item_exported(it) {
-            continue;
-        }
-        stack.extend(it.shown_children().map(|c| (xf * it.xf, &**c)));
-        out.push((xf, it));
-    }
-    out
-}
-
-fn bleed_lr(side: PageSide, b: [f64; 4]) -> (f64, f64) {
-    // Bleed is top, bottom, inside, outside; single-sided pages read inside as left.
-    if side == PageSide::Left { (b[3], b[2]) } else { (b[2], b[3]) }
-}
-
-/// The spread each exported PDF page shows (in page order).
-pub fn sheet_spreads(doc: &Document, opts: &PdfOptions) -> Vec<usize> {
-    sheets(doc, opts).map(|v| v.iter().map(|s| s.spread).collect()).unwrap_or_default()
-}
-
-fn sheets(doc: &Document, opts: &PdfOptions) -> Result<Vec<Sheet>> {
-    let count = doc.page_count();
-    let pages: Vec<usize> = match &opts.pages {
-        Some(v) => v.clone(),
-        None => (0..count).collect(),
-    };
-    if pages.is_empty() {
-        return Err(PdfError::NoPages);
-    }
-    if let Some(bad) = pages.iter().find(|p| **p >= count) {
-        return Err(PdfError::BadPage(bad.saturating_add(1)));
-    }
-    let b = doc.settings.bleed.map(|v| if opts.bleed { v.max(0.0) } else { 0.0 });
-    let mut out: Vec<Sheet> = Vec::new();
-    let mut seen_spreads: Vec<usize> = Vec::new();
-    for abs in pages {
-        let (si, pi) = doc.page_loc(abs).ok_or(PdfError::BadPage(abs.saturating_add(1)))?;
-        let sp: &Spread = &doc.spreads[si];
-        let (trim, l, r, label) = if opts.spreads {
-            if seen_spreads.contains(&si) {
-                continue;
-            }
-            seen_spreads.push(si);
-            let first = doc.first_page_of_spread(si);
-            // The outer edges by position: a right-to-left spread lists its right page first.
-            let outer = sp.outer_page_indices();
-            let (l, _) = outer.and_then(|(l, _)| sp.pages.get(l)).map(|p| bleed_lr(p.side, b)).unwrap_or((b[2], b[3]));
-            let (_, r) = outer.and_then(|(_, r)| sp.pages.get(r)).map(|p| bleed_lr(p.side, b)).unwrap_or((b[2], b[3]));
-            let names: Vec<String> = (0..sp.pages.len()).map(|i| doc.page_name(first + i)).collect();
-            (sp.bounds(), l, r, names.join("–"))
-        } else {
-            let p = &sp.pages[pi];
-            let (l, r) = bleed_lr(p.side, b);
-            (p.bounds(), l, r, doc.page_name(abs))
-        };
-        let bleed = Rect::new(trim.x0 - l, trim.y0 - b[0], trim.x1 + r, trim.y1 + b[1]);
-        let media = if opts.marks.any() {
-            let m = mark_start(opts, b) + MARK_LEN + 6.0;
-            trim.inflate(m, m)
-        } else {
-            bleed
-        };
-        out.push(Sheet { spread: si, trim, bleed, media, label });
-    }
-    Ok(out)
-}
-
-/// Distance from the trim edge where marks start: the offset, but never inside the bleed.
-pub(crate) fn mark_start(opts: &PdfOptions, bleed: [f64; 4]) -> f64 {
-    bleed.iter().copied().fold(opts.marks.offset.max(0.0), f64::max)
-}
-
-/// Like [`export_pdf`], also returning warnings about approximated or dropped features.
-pub fn export_pdf_with_report(doc: &Document, cache: &Cache, opts: &PdfOptions) -> Result<ExportReport> {
-    write::guard(|| export_pdf_with_report_inner(doc, cache, opts))
-}
-
-/// Form fields (Buttons and Forms) and, for interactive PDF, video and sound; not in PDF/X
-/// or PDF/A: this update comes after krilla's validator ran, and its NeedAppearances fields and
-/// Screen annotations aren't allowed in PDF/A.
-fn add_form_fields(bytes: &mut Vec<u8>, warnings: &mut Vec<String>, doc: &Document, sheets: &[Sheet], opts: &PdfOptions) {
-    let fields = crate::forms::collect(doc, sheets);
-    let media = if opts.media { crate::forms::collect_media(doc, sheets) } else { Vec::new() };
-    if fields.is_empty() && media.is_empty() {
-        return;
-    }
-    match opts.standard {
-        Standard::PdfX4 => warnings.push("PDF/X-4: form fields and media were left out".into()),
-        Standard::PdfA2b => warnings.push("PDF/A-2b: form fields and media were left out".into()),
-        _ => match crate::forms::add_fields(&*bytes, &fields, &media) {
-            Some(b) => *bytes = b,
-            None => warnings.push("form fields and media couldn't be added to this PDF".into()),
-        },
-    }
-}
-
-fn export_pdf_with_report_inner(doc: &Document, cache: &Cache, opts: &PdfOptions) -> Result<ExportReport> {
-    let sheets = sheets(doc, opts)?;
-    let warnings = Vec::new();
-    let (version, archival) = match opts.standard {
-        Standard::None => (PdfVersion::Pdf17, None),
-        Standard::PdfX4 => (PdfVersion::Pdf16, None),
-        Standard::PdfA2b => (PdfVersion::Pdf17, Some(Archival::A2_B)),
-    };
-    let configuration = write::configuration(version, archival)?;
-    let settings = krilla::SerializeSettings { compress_content_streams: opts.compress, configuration, ..Default::default() };
-    let title = opts.title.clone().unwrap_or_else(|| doc.title.clone());
-    let created = opts.created.or_else(now_unix);
-    let metadata = Metadata {
-        creator: "DesignCraft".into(),
-        producer: "DesignCraft".into(),
-        title: Some(title.clone()),
-        authors: opts.author.iter().cloned().collect(),
-        created: created.map(date_time),
-        ..Default::default()
-    };
-    let mut writer = Writer::new(settings, metadata);
-    let pdf = writer.document_mut();
-
-    let mut ex = Exporter {
-        drawing_items: Vec::new(),
-        doc,
-        cache,
-        opts,
-        clip: Rect::ZERO,
-        warnings,
-        images: HashMap::new(),
-        images_by_content: ImageContentCache::default(),
-        #[cfg(test)]
-        image_conversions: 0,
-        pdfs: HashMap::new(),
-        version,
-        too_new: Vec::new(),
-        svgs: HashMap::new(),
-        fonts: HashMap::new(),
-        reverse_cmaps: HashMap::new(),
-        rgb_only: archival.is_some(),
-        tags: Vec::new(),
-        story_tags: HashMap::new(),
-        tag_story: None,
-        text_area: None,
-        para_tags: HashMap::new(),
-    };
-    if ex.rgb_only {
-        ex.warn("PDF/A: CMYK colours were converted to RGB (no CMYK output intent profile is available yet)");
-    }
-    if let Some(o) = crate::links::outline(doc, &sheets) {
-        pdf.set_outline(o);
-    }
-    for (sheet_idx, sh) in sheets.iter().enumerate() {
-        let size = Size::from_wh(sh.media.width().max(1.0) as f32, sh.media.height().max(1.0) as f32).ok_or(PdfError::NoPages)?;
-        let local = |r: Rect| {
-            krilla::geom::Rect::from_ltrb(
-                (r.x0 - sh.media.x0) as f32,
-                (r.y0 - sh.media.y0) as f32,
-                (r.x1 - sh.media.x0) as f32,
-                (r.y1 - sh.media.y0) as f32,
-            )
-        };
-        let settings = PageSettings::new(size).with_trim_box(local(sh.trim)).with_bleed_box(local(sh.bleed));
-        let mut page = pdf.start_page_with(settings);
-        let mut s = page.surface();
-        #[cfg(all(test, not(target_arch = "wasm32")))]
-        unwind_tests::inject(&mut s);
-        s.push_transform(&tf(Affine::translate(-sh.media.origin().to_vec2())));
-        ex.clip = sh.bleed;
-        if let Some(clip) = to_path(&sh.bleed.to_path(0.1)) {
-            s.push_clip_path(&clip, &FillRule::NonZero);
-            ex.spread(&mut s, sh.spread);
-            s.pop();
-        }
-        if opts.tagged {
-            s.start_tagged(ContentTag::Artifact(Artifact::new(ArtifactType::Page, None)));
-        }
-        ex.marks(&mut s, sh, &title, created);
-        if opts.tagged {
-            s.end_tagged();
-        }
-        s.pop();
-        s.finish();
-        for a in crate::links::annotations(doc, cache, &sheets, sheet_idx) {
-            page.add_annotation(a);
-        }
-        page.finish();
-    }
-    if opts.tagged {
-        pdf.set_tag_tree(ex.tag_tree());
-    }
-    ex.check_placed_versions()?;
-    let mut bytes = writer.finish().map_err(PdfError::from)?;
-    // Transparency blends in the document's blend space: CMYK for print (and always in PDF/X).
-    let mut warnings = ex.warnings;
-    if !ex.rgb_only && (doc.settings.blend_space == designcraft_doc::BlendSpace::Cmyk || opts.standard == Standard::PdfX4) {
-        // The rewrite matches krilla's exact output; in PDF/X-4, `check_pdfx4` reports any
-        // group that got past it, with its page.
-        crate::pdfx::cmyk_group_spaces(&mut bytes);
-    }
-    add_form_fields(&mut bytes, &mut warnings, doc, &sheets, opts);
-    if opts.standard == Standard::PdfX4 {
-        // Output intent and PDF/X identification, then check the result.
-        match crate::pdfx::make_pdfx4(&bytes, &title, created) {
-            Some(b) => bytes = b,
-            None => warnings.push("PDF/X-4: the output intent couldn't be added".into()),
-        }
-        for issue in crate::pdfx::check_pdfx4(&bytes) {
-            warnings.push(format!("PDF/X-4: {issue}"));
-        }
-    }
-    warnings.dedup();
-    Ok(ExportReport { bytes, pages: sheets.len(), warnings })
-}
-
-/// One PDF from several (a book's documents), every page carried over as vectors; each part
-/// comes with its pages' sizes (points).
-pub fn merge_pdfs(parts: &[(Vec<u8>, Vec<(f32, f32)>)], title: Option<&str>) -> Result<Vec<u8>> {
-    write::guard(|| merge_pdfs_inner(parts, title))
-}
-
-fn merge_pdfs_inner(parts: &[(Vec<u8>, Vec<(f32, f32)>)], title: Option<&str>) -> Result<Vec<u8>> {
-    let metadata = Metadata { creator: "DesignCraft".into(), producer: "DesignCraft".into(), title: title.map(str::to_owned), ..Default::default() };
-    let mut writer = Writer::new(krilla::SerializeSettings::default(), metadata);
-    let pdf = writer.document_mut();
-    let mut pages = 0;
-    for (bytes, sizes) in parts {
-        let src = krilla::pdf::Pdf::new(Arc::new(bytes.clone())).map_err(|e| PdfError::Write(format!("{e:?}")))?;
-        let doc = krilla::pdf::PdfDocument::new(Arc::new(src));
-        for (i, &(w, h)) in sizes.iter().enumerate() {
-            let size = Size::from_wh(w.max(1.0), h.max(1.0)).ok_or(PdfError::NoPages)?;
-            let mut page = pdf.start_page_with(PageSettings::new(size));
-            let mut s = page.surface();
-            #[cfg(all(test, not(target_arch = "wasm32")))]
-            unwind_tests::inject(&mut s);
-            s.draw_pdf_page(&doc, size, i);
-            s.finish();
-            page.finish();
-            pages += 1;
-        }
-    }
-    if pages == 0 {
-        return Err(PdfError::NoPages);
-    }
-    writer.finish().map_err(PdfError::from)
-}
-
-/// File › Print Booklet: how pages pair up on printer spreads.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum BookletKind {
-    /// Folded and stapled: pages padded to a multiple of 4, outer pages together.
-    #[default]
-    SaddleStitch,
-    /// Two pages side by side in reading order.
-    TwoUpConsecutive,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct BookletOptions {
-    pub kind: BookletKind,
-    /// Gap between the two pages of a printer spread (points).
-    pub space_between: f64,
-    pub title: Option<String>,
-}
-
-/// The printer spreads for `n` pages: (left, right) absolute page indices, `None` = blank.
-pub fn booklet_pairs(n: usize, kind: BookletKind) -> Vec<(Option<usize>, Option<usize>)> {
-    let page = |i: usize| (i < n).then_some(i);
-    match kind {
-        BookletKind::TwoUpConsecutive => (0..n.div_ceil(2)).map(|k| (page(2 * k), page(2 * k + 1))).collect(),
-        BookletKind::SaddleStitch => {
-            let m = n.div_ceil(4).max(1) * 4;
-            (0..m / 2).map(|i| if i % 2 == 0 { (page(m - 1 - i), page(i)) } else { (page(i), page(m - 1 - i)) }).collect()
-        }
-    }
-}
-
-/// An imposed PDF: two document pages per sheet, in booklet order.
-pub fn export_booklet(doc: &Document, cache: &Cache, opts: &BookletOptions) -> Result<ExportReport> {
-    write::guard(|| export_booklet_inner(doc, cache, opts))
-}
-
-fn export_booklet_inner(doc: &Document, cache: &Cache, opts: &BookletOptions) -> Result<ExportReport> {
-    let n = doc.page_count();
-    if n == 0 {
-        return Err(PdfError::NoPages);
-    }
-    let pdf_opts = PdfOptions { title: opts.title.clone(), ..PdfOptions::default() };
-    let settings = krilla::SerializeSettings { compress_content_streams: true, ..Default::default() };
-    let title = opts.title.clone().unwrap_or_else(|| doc.title.clone());
-    let metadata = Metadata { creator: "DesignCraft".into(), producer: "DesignCraft".into(), title: Some(title), ..Default::default() };
-    let mut writer = Writer::new(settings, metadata);
-    let pdf = writer.document_mut();
-    let mut ex = Exporter {
-        drawing_items: Vec::new(),
-        doc,
-        cache,
-        opts: &pdf_opts,
-        clip: Rect::ZERO,
-        warnings: Vec::new(),
-        images: HashMap::new(),
-        images_by_content: ImageContentCache::default(),
-        #[cfg(test)]
-        image_conversions: 0,
-        pdfs: HashMap::new(),
-        // krilla's default.
-        version: PdfVersion::Pdf17,
-        too_new: Vec::new(),
-        svgs: HashMap::new(),
-        fonts: HashMap::new(),
-        reverse_cmaps: HashMap::new(),
-        rgb_only: false,
-        tags: Vec::new(),
-        story_tags: HashMap::new(),
-        tag_story: None,
-        text_area: None,
-        para_tags: HashMap::new(),
-    };
-    let pairs = booklet_pairs(n, opts.kind);
-    // Sheet size from the largest page.
-    let (mut pw, mut ph) = (0.0f64, 0.0f64);
-    for i in 0..n {
-        if let Some((si, pi)) = doc.page_loc(i) {
-            let p = &doc.spreads[si].pages[pi];
-            pw = pw.max(p.width);
-            ph = ph.max(p.height);
-        }
-    }
-    let gap = opts.space_between.max(0.0);
-    let size = Size::from_wh((2.0 * pw + gap) as f32, ph as f32).ok_or(PdfError::NoPages)?;
-    for (left, right) in &pairs {
-        let mut page = pdf.start_page_with(PageSettings::new(size));
-        let mut s = page.surface();
-        #[cfg(all(test, not(target_arch = "wasm32")))]
-        unwind_tests::inject(&mut s);
-        for (slot, abs) in [(0.0, left), (pw + gap, right)] {
-            let Some((si, pi)) = abs.and_then(|a| doc.page_loc(a)) else { continue };
-            let p = &doc.spreads[si].pages[pi];
-            let r = Rect::new(p.x, 0.0, p.x + p.width, p.height);
-            // Pages narrower than the slot sit against the fold.
-            let dx = if slot == 0.0 { pw - p.width } else { 0.0 };
-            s.push_transform(&tf(Affine::translate((slot + dx - p.x, (ph - p.height) / 2.0))));
-            ex.clip = r;
-            if let Some(clip) = to_path(&r.to_path(0.1)) {
-                s.push_clip_path(&clip, &FillRule::NonZero);
-                ex.spread(&mut s, si);
-                s.pop();
-            }
-            s.pop();
-        }
-        s.finish();
-        page.finish();
-    }
-    ex.check_placed_versions()?;
-    let mut bytes = writer.finish().map_err(PdfError::from)?;
-    if doc.settings.blend_space == designcraft_doc::BlendSpace::Cmyk {
-        crate::pdfx::cmyk_group_spaces(&mut bytes);
-    }
-    let mut warnings = ex.warnings;
-    warnings.dedup();
-    Ok(ExportReport { bytes, pages: pairs.len(), warnings })
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn now_unix() -> Option<i64> {
-    use std::time::{SystemTime, UNIX_EPOCH};
-    SystemTime::now().duration_since(UNIX_EPOCH).ok().map(|d| d.as_secs() as i64)
-}
-#[cfg(target_arch = "wasm32")]
-fn now_unix() -> Option<i64> {
-    None
-}
-
-fn date_time(t: i64) -> krilla::metadata::DateTime {
-    let c = civil(t);
-    krilla::metadata::DateTime::new(c.0.clamp(0, 9999) as u16)
-        .month(c.1)
-        .day(c.2)
-        .hour(c.3)
-        .minute(c.4)
-        .second(c.5)
-        .utc_offset_hour(0)
-        .utc_offset_minute(0)
-}
-
-/// Unix seconds (UTC) → (year, month, day, hour, minute, second), proleptic Gregorian. A time
-/// outside chrono's year range still converts (the calendar repeats every 400 years, so the
-/// instant is moved into range by whole cycles and only the year is carried, matching the old
-/// `civil`), rather than resetting to the epoch. `date_time` applies the PDF `0..=9999` year clamp.
-pub(crate) fn civil(t: i64) -> (i64, u8, u8, u8, u8, u8) {
-    use chrono::{Datelike, Timelike};
-    let (y, t) = designcraft_doc::time::utc_parts(t, 0);
-    (y, t.month() as u8, t.day() as u8, t.hour() as u8, t.minute() as u8, t.second() as u8)
-}
-
-/// A successful conversion and its name-independent diagnostic. Replayed once for each asset.
-#[derive(Clone)]
-struct ConvertedImage {
-    image: Image,
-    warning: Option<&'static str>,
-}
-
-const CMYK_FALLBACK_WARNING: &str = "converted to RGB (a CMYK TIFF that is planar, has premultiplied alpha, uses other inks or is over 256 MiB)";
-
-#[cfg(not(test))]
-type ImageContentCache = HashMap<Arc<Vec<u8>>, ConvertedImage>;
-
-// Unit tests force collisions through the real cache path; production keeps RandomState.
+pub use booklet::{BookletKind, BookletOptions, booklet_pairs, export_booklet, merge_pdfs};
+use common::TagEntry;
+pub(crate) use common::{norm, q, registration, regular, solid_fill, tf, to_path};
+use graphics::CoverageImage;
 #[cfg(test)]
-type ImageContentCache = HashMap<Arc<Vec<u8>>, ConvertedImage, std::hash::BuildHasherDefault<ConstantImageHasher>>;
-#[cfg(test)]
-#[derive(Default)]
-struct ConstantImageHasher;
+use images::ConstantImageHasher;
+pub(crate) use images::SRGB_ICC;
+use images::{CmykImage, GreyImage, ImageContentCache, RasterMode, SrgbImage, embedded_icc, is_grey, is_grey_icc};
+pub(crate) use metadata::civil;
+pub(crate) use pipeline::{MARK_LEN, Sheet, exported_items, mark_start};
+pub use pipeline::{export_pdf, export_pdf_with_report, print_color, sheet_spreads};
 #[cfg(test)]
 impl std::hash::Hasher for ConstantImageHasher {
     fn finish(&self) -> u64 {
@@ -477,7 +57,12 @@ impl std::hash::Hasher for ConstantImageHasher {
 
 pub(crate) struct Exporter<'a> {
     pub doc: &'a Document,
+    /// The document's inks with its Ink Manager settings.
+    pub(crate) inks: craft_prepress::InkSet,
     pub cache: &'a Cache,
+    /// Each story's composition per page it is shown on, for this export: the document doesn't
+    /// change while it runs, and asking the cache checks every frame of the story again.
+    composed: HashMap<(designcraft_doc::StoryId, Option<usize>), Arc<designcraft_compose::ComposedStory>>,
     pub opts: &'a PdfOptions,
     /// Current sheet's visible area (spread space) for culling.
     pub clip: Rect,
@@ -490,7 +75,12 @@ pub(crate) struct Exporter<'a> {
     #[cfg(test)]
     image_conversions: usize,
     /// Placed PDFs (embedded as vector pages) and their page counts.
-    pdfs: HashMap<AssetId, Option<(krilla::pdf::PdfDocument, usize)>>,
+    pdfs: HashMap<(AssetId, Vec<hayro_syntax::object::ObjectIdentifier>), Option<(krilla::pdf::PdfDocument, usize)>>,
+    variants: HashMap<(AssetId, Option<Vec<String>>), crate::optional_content::Variant>,
+    has_optional_content: bool,
+    #[cfg(test)]
+    pdf_preparations: usize,
+    layer_error: Option<PdfError>,
     /// The PDF version written; placed PDFs must not be newer.
     version: PdfVersion,
     /// Placed PDFs too new to embed in this version ("name is PDF 2.0"): the export fails.
@@ -514,1029 +104,6 @@ pub(crate) struct Exporter<'a> {
     pub(crate) para_tags: HashMap<(designcraft_doc::StoryId, usize), Vec<Identifier>>,
 }
 
-enum TagEntry {
-    Story(designcraft_doc::StoryId),
-    Figure(TagGroup),
-}
-
-pub(crate) fn tf(a: Affine) -> Transform {
-    let c = a.as_coeffs();
-    Transform::from_row(c[0] as f32, c[1] as f32, c[2] as f32, c[3] as f32, c[4] as f32, c[5] as f32)
-}
-
-pub(crate) fn to_path(bp: &BezPath) -> Option<Path> {
-    let mut pb = PathBuilder::new();
-    for el in bp.elements() {
-        match *el {
-            PathEl::MoveTo(p) => pb.move_to(p.x as f32, p.y as f32),
-            PathEl::LineTo(p) => pb.line_to(p.x as f32, p.y as f32),
-            PathEl::QuadTo(a, p) => pb.quad_to(a.x as f32, a.y as f32, p.x as f32, p.y as f32),
-            PathEl::CurveTo(a, b, p) => pb.cubic_to(a.x as f32, a.y as f32, b.x as f32, b.y as f32, p.x as f32, p.y as f32),
-            PathEl::ClosePath => pb.close(),
-        }
-    }
-    pb.finish()
-}
-
-pub(crate) fn norm(v: f32) -> NormalizedF32 {
-    NormalizedF32::new(if v.is_finite() { v.clamp(0.0, 1.0) } else { 1.0 }).unwrap_or(NormalizedF32::ONE)
-}
-
-fn q(v: f32) -> u8 {
-    (v.clamp(0.0, 1.0) * 255.0).round() as u8
-}
-
-fn regular(c: &Color, rgb_only: bool) -> krilla::color::RegularColor {
-    use krilla::color::RegularColor as R;
-    if rgb_only && matches!(c, Color::Cmyk { .. }) {
-        let [r, g, b] = c.to_rgb();
-        return R::Rgb(rgb::Color::new(q(r), q(g), q(b)));
-    }
-    match *c {
-        Color::Rgb { r, g, b } => R::Rgb(rgb::Color::new(q(r), q(g), q(b))),
-        Color::Cmyk { c, m, y, k } => R::Cmyk(cmyk::Color::new(q(c), q(m), q(y), q(k))),
-        // DesignCraft grey is ink coverage (0 = white); PDF DeviceGray is lightness.
-        Color::Gray { k } => R::Luma(luma::Color::new(q(1.0 - k))),
-    }
-}
-
-/// A process colour in its own device space (CMYK → DeviceCMYK, RGB → DeviceRGB, Gray → DeviceGray).
-/// `rgb_only` converts CMYK to RGB (PDF/A without a CMYK output profile).
-pub(crate) fn device(c: &Color, rgb_only: bool) -> krilla::color::Color {
-    match regular(c, rgb_only) {
-        krilla::color::RegularColor::Rgb(v) => v.into(),
-        krilla::color::RegularColor::Cmyk(v) => v.into(),
-        krilla::color::RegularColor::Luma(v) => v.into(),
-    }
-}
-
-/// `[Registration]` prints on every plate: `/Separation /All`.
-pub(crate) fn registration(tint: f32, rgb_only: bool) -> krilla::color::Color {
-    use krilla::color::separation::{Color as SepColor, SeparationColorant, SeparationSpace};
-    let alt = regular(&Color::cmyk(1.0, 1.0, 1.0, 1.0), rgb_only);
-    SepColor::new(q(tint), SeparationSpace::new(SeparationColorant::AllColorants, alt)).into()
-}
-
-fn blend(b: DcBlend) -> krilla::blend::BlendMode {
-    use krilla::blend::BlendMode as K;
-    match b {
-        DcBlend::Normal => K::Normal,
-        DcBlend::Darken => K::Darken,
-        DcBlend::Multiply => K::Multiply,
-        DcBlend::ColorBurn => K::ColorBurn,
-        DcBlend::Lighten => K::Lighten,
-        DcBlend::Screen => K::Screen,
-        DcBlend::ColorDodge => K::ColorDodge,
-        DcBlend::Overlay => K::Overlay,
-        DcBlend::SoftLight => K::SoftLight,
-        DcBlend::HardLight => K::HardLight,
-        DcBlend::Difference => K::Difference,
-        DcBlend::Exclusion => K::Exclusion,
-        DcBlend::Hue => K::Hue,
-        DcBlend::Saturation => K::Saturation,
-        DcBlend::Color => K::Color,
-        DcBlend::Luminosity => K::Luminosity,
-    }
-}
-
-fn rects_overlap(a: Rect, b: Rect) -> bool {
-    a.x0 <= b.x1 && b.x0 <= a.x1 && a.y0 <= b.y1 && b.y0 <= a.y1
-}
-
-pub(crate) fn solid_fill(c: krilla::color::Color, opacity: f32) -> Fill {
-    Fill { paint: c.into(), opacity: norm(opacity), rule: FillRule::NonZero }
-}
-
-impl Exporter<'_> {
-    /// A print document, or a PDF/X file (whose output intent is CMYK).
-    pub(crate) fn for_print(&self) -> bool {
-        self.doc.settings.intent == designcraft_doc::Intent::Print || self.opts.standard == Standard::PdfX4
-    }
-
-    pub(crate) fn warn(&mut self, w: impl Into<String>) {
-        let w = w.into();
-        if !self.warnings.contains(&w) {
-            self.warnings.push(w);
-        }
-    }
-
-    /// A swatch + tint as a PDF colour: spot swatches (and tints of them) become `/Separation`
-    /// with the swatch's values as the alternate space; process colours stay in their device space.
-    pub(crate) fn swatch_color(&self, name: &str, tint: f32) -> Option<krilla::color::Color> {
-        use krilla::color::separation::{Color as SepColor, SeparationColorant, SeparationSpace};
-        let mut n = name;
-        let mut t = tint;
-        for _ in 0..8 {
-            let sw = self.doc.swatch(n)?;
-            match &sw.value {
-                SwatchValue::None => return None,
-                // [Paper] prints no ink (it knocks out what lies below); its colour is only what
-                // the screen shows. Written as RGB white (`1 1 1 rg`) it would put DeviceRGB in a
-                // CMYK print file.
-                SwatchValue::Paper { .. } if self.for_print() => return Some(device(&Color::cmyk(0.0, 0.0, 0.0, 0.0), self.rgb_only)),
-                SwatchValue::Tint { base, tint: bt } => {
-                    t *= bt;
-                    n = base;
-                }
-                SwatchValue::Registration => return Some(registration(t, self.rgb_only)),
-                SwatchValue::Color { color: _, color_type: ColorType::Spot } => {
-                    // Ink Manager: an alias prints on another ink; converted inks go to process.
-                    let (ink, process) = self.doc.inks.resolve(&sw.name);
-                    let target =
-                        self.doc.swatch(ink).filter(|w| matches!(w.value, SwatchValue::Color { color_type: ColorType::Spot, .. })).unwrap_or(sw);
-                    let SwatchValue::Color { color, .. } = &target.value else { break };
-                    if process {
-                        return Some(device(&designcraft_color::swatch::apply_tint(*color, t), self.rgb_only));
-                    }
-                    let space = SeparationSpace::new(SeparationColorant::Custom(target.name.clone()), regular(color, self.rgb_only));
-                    return Some(SepColor::new(q(t), space).into());
-                }
-                _ => break,
-            }
-        }
-        self.doc.resolve_color(name, tint).map(|c| device(&c, self.rgb_only))
-    }
-
-    /// The parent pages' items on `layer` shown on page `pi` of spread `si`: the parent's bases
-    /// first, then the parent.
-    fn parent_items(&mut self, s: &mut Surface, si: usize, pi: usize, page: &designcraft_doc::Page, layer: &designcraft_doc::Layer, first: usize) {
-        let doc = self.doc;
-        for (ppi, ppage) in doc.shown_parent_pages(SpreadRef::Doc(si), pi) {
-            let Some(parent) = doc.parents.get(ppi) else { continue };
-            let Some(ppg) = parent.pages.get(ppage) else { continue };
-            let dx = page.x - ppg.x;
-            for it in &parent.items {
-                if it.layer != layer.id || page.overridden.contains(&it.id) {
-                    continue;
-                }
-                // Parent items belong to the parent page they sit on.
-                if parent.page_at_x(it.bounds().center().x) != Some(ppage) && parent.pages.len() > 1 {
-                    continue;
-                }
-                self.top_item(s, it, Affine::translate((dx, 0.0)), Some(first + pi), true);
-            }
-        }
-    }
-
-    fn spread(&mut self, s: &mut Surface, si: usize) {
-        let doc = self.doc;
-        let Some(sp) = doc.spreads.get(si) else { return };
-        let first = doc.first_page_of_spread(si);
-        for layer in doc.layers.iter().rev() {
-            if !layer_exported(layer) {
-                continue;
-            }
-            for (pi, page) in sp.pages.iter().enumerate() {
-                if page.show_parent_items {
-                    self.parent_items(s, si, pi, page, layer, first);
-                }
-            }
-            for it in &sp.items {
-                if it.layer == layer.id {
-                    self.top_item(s, it, Affine::IDENTITY, None, false);
-                }
-            }
-        }
-    }
-
-    /// Push blend/opacity for an item drawn as a group. Returns the number of pushes.
-    fn push_group(s: &mut Surface, opacity: f32, mode: DcBlend) -> usize {
-        let mut n = 0;
-        if mode != DcBlend::Normal {
-            s.push_blend_mode(blend(mode));
-            n += 1;
-        }
-        if opacity < 0.999 {
-            s.push_opacity(norm(opacity));
-            n += 1;
-        } else if mode != DcBlend::Normal {
-            s.push_isolated();
-            n += 1;
-        }
-        n
-    }
-
-    /// Isolate Blending / Knockout groups: an isolated transparency group (knockout is drawn
-    /// isolated too).
-    fn push_isolation(s: &mut Surface, it: &Item) -> usize {
-        if it.isolate || it.knockout {
-            s.push_isolated();
-            1
-        } else {
-            0
-        }
-    }
-
-    /// A spread or parent item, inside its structure tag when tagging.
-    fn top_item(&mut self, s: &mut Surface, it: &Item, parent: Affine, page: Option<usize>, on_parent: bool) {
-        if !self.opts.tagged || !item_exported(it) {
-            return self.item(s, it, parent, page);
-        }
-        let story = it.text_frame().map(|t| t.story);
-        let figure = !it.alt_text.is_empty() || matches!(it.content, Content::Graphic(_)) || it.has_nested_items();
-        if on_parent || it.export_options.artifact || (story.is_none() && !figure) {
-            // Page furniture and decoration.
-            let kind = if on_parent { ArtifactType::Page } else { ArtifactType::Other };
-            s.start_tagged(ContentTag::Artifact(Artifact::new(kind, None)));
-            self.item(s, it, parent, page);
-            s.end_tagged();
-            return;
-        }
-        if let Some(sid) = story {
-            // Text runs tag themselves by paragraph; the rest of the frame is an artifact.
-            if let std::collections::hash_map::Entry::Vacant(e) = self.story_tags.entry(sid) {
-                e.insert(Vec::new());
-                self.tags.push(TagEntry::Story(sid));
-            }
-            self.tag_story = Some(sid);
-            self.item(s, it, parent, page);
-            self.tag_story = None;
-            return;
-        }
-        let id = s.start_tagged(ContentTag::Other);
-        self.item(s, it, parent, page);
-        s.end_tagged();
-        let alt = (!it.alt_text.is_empty()).then(|| it.alt_text.clone());
-        let mut g = TagGroup::new(Tag::Figure(alt));
-        g.push(id);
-        self.tags.push(TagEntry::Figure(g));
-    }
-
-    /// The structure tree: stories (one paragraph each, its frames in thread order of appearance)
-    /// and figures, in the order they first appear.
-    fn tag_tree(&mut self) -> TagTree {
-        let mut tree = TagTree::new();
-        for e in std::mem::take(&mut self.tags) {
-            match e {
-                TagEntry::Story(sid) => {
-                    // One structure element per paragraph: headings and quotes from the
-                    // paragraph style's Export Tagging, else P.
-                    let mut paras: Vec<usize> = self.para_tags.keys().filter(|(s, _)| *s == sid).map(|(_, p)| *p).collect();
-                    paras.sort_unstable();
-                    let story = self.doc.story(sid);
-                    for pi in paras {
-                        let ids = self.para_tags.remove(&(sid, pi)).unwrap_or_default();
-                        let style = story.and_then(|st| st.paras.get(pi)).map(|p| p.style.clone()).unwrap_or_default();
-                        let tag = self.doc.styles.export_tag(&style, false).map(|e| e.tag.clone()).unwrap_or_default();
-                        let text = || story.and_then(|st| st.para_ranges().get(pi).map(|r| st.text[r.clone()].trim().to_string()));
-                        let kind: krilla::tagging::TagKind = match tag.as_str() {
-                            h if h.len() == 2 && h.starts_with('h') => {
-                                let n = h[1..].parse::<u16>().unwrap_or(1).clamp(1, 6);
-                                Tag::Hn(std::num::NonZeroU16::new(n).unwrap_or(std::num::NonZeroU16::MIN), text()).into()
-                            }
-                            "blockquote" => Tag::BlockQuote.into(),
-                            _ => Tag::P.into(),
-                        };
-                        let mut g = TagGroup::new(kind);
-                        for id in ids {
-                            g.push(id);
-                        }
-                        tree.push(g);
-                    }
-                }
-                TagEntry::Figure(g) => tree.push(g),
-            }
-        }
-        tree
-    }
-
-    fn item(&mut self, s: &mut Surface, it: &Item, parent: Affine, page: Option<usize>) {
-        if self.drawing_items.len() >= 64 || self.drawing_items.contains(&it.id) {
-            self.warnings.push(format!("Cyclic or excessively nested item {} was not rendered", it.id));
-            return;
-        }
-        self.drawing_items.push(it.id);
-        self.item_guarded(s, it, parent, page);
-        self.drawing_items.pop();
-    }
-
-    fn item_guarded(&mut self, s: &mut Surface, it: &Item, parent: Affine, page: Option<usize>) {
-        let gf = &it.effects.gradient_feather;
-        if !gf.on || !item_exported(it) {
-            return self.item_inner(s, it, parent, page);
-        }
-        // Gradient feather: a luminosity mask (white = opaque) over the object.
-        let xf = parent * it.xf;
-        let (p0, p1) = gf.points(it.feather_bounds());
-        let gray = |a: f32| -> krilla::color::Color { luma::Color::new((a.clamp(0.0, 1.0) * 255.0).round() as u8).into() };
-        let stops = vec![
-            Stop { offset: NormalizedF32::ZERO, color: gray(gf.start), opacity: NormalizedF32::ONE },
-            Stop { offset: NormalizedF32::ONE, color: gray(gf.end), opacity: NormalizedF32::ONE },
-        ];
-        let paint: krilla::paint::Paint = if gf.radial {
-            let r = (p1 - p0).hypot().max(1e-3) as f32;
-            RadialGradient {
-                fx: p0.x as f32,
-                fy: p0.y as f32,
-                fr: 0.0,
-                cx: p0.x as f32,
-                cy: p0.y as f32,
-                cr: r,
-                transform: tf(xf),
-                spread_method: SpreadMethod::Pad,
-                stops,
-                anti_alias: false,
-            }
-            .into()
-        } else {
-            LinearGradient {
-                x1: p0.x as f32,
-                y1: p0.y as f32,
-                x2: p1.x as f32,
-                y2: p1.y as f32,
-                transform: tf(xf),
-                spread_method: SpreadMethod::Pad,
-                stops,
-                anti_alias: false,
-            }
-            .into()
-        };
-        // The gradient keeps its item-space geometry, but its mask covers the complete exported
-        // area (including bleed), so distant child shadows and thick strokes are never cut off.
-        let mut sb = s.stream_builder();
-        let mut ms = sb.surface();
-        if let Some(p) = to_path(&self.clip.to_path(0.1)) {
-            ms.set_fill(Some(Fill { paint, opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
-            ms.draw_path(&p);
-        }
-        ms.finish();
-        let stream = sb.finish();
-        s.push_mask(krilla::mask::Mask::new(stream, krilla::mask::MaskType::Luminosity));
-        self.item_inner(s, it, parent, page);
-        s.pop();
-    }
-
-    fn item_inner(&mut self, s: &mut Surface, it: &Item, parent: Affine, page: Option<usize>) {
-        if !item_exported(it) {
-            return;
-        }
-        let ds = &it.effects.drop_shadow;
-        let grow = it.stroke.extent() + 2.0 + if ds.on { ds.distance.abs() + ds.size.abs() } else { 0.0 };
-        let vb = parent.transform_rect_bbox(it.bounds()).inflate(grow, grow);
-        if !rects_overlap(vb, self.clip) {
-            return;
-        }
-        let xf = parent * it.xf;
-        if it.has_nested_items() {
-            // A frame with items pasted into it: fill, the items clipped to the frame, stroke.
-            let bp = if it.corners.is_none() { it.path.to_bezpath() } else { corners::apply(&it.path, &it.corners) };
-            let path = to_path(&bp);
-            let pushes = Self::push_group(s, it.opacity, it.blend);
-            s.push_transform(&tf(xf));
-            if !it.fill.is_none()
-                && let Some(p) = &path
-                && let Some(paint) = self.fill_paint(&it.fill, bp.bounding_box())
-            {
-                s.set_stroke(None);
-                s.set_fill(Some(Fill { paint, opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
-                s.draw_path(p);
-                s.set_fill(None);
-            }
-            s.pop();
-            // The clip in page space, so the children keep their absolute transforms.
-            let mut page_bp = bp.clone();
-            page_bp.apply_affine(xf);
-            let clip = to_path(&page_bp);
-            if let Some(c) = &clip {
-                s.push_clip_path(c, &FillRule::NonZero);
-            }
-            for c in it.children() {
-                self.item(s, c, xf, page);
-            }
-            if clip.is_some() {
-                s.pop();
-            }
-            if !it.stroke.is_none()
-                && let Some(p) = &path
-            {
-                s.push_transform(&tf(xf));
-                self.stroke(s, it, &bp, p);
-                s.pop();
-            }
-            for _ in 0..pushes {
-                s.pop();
-            }
-            return;
-        }
-        if !it.children().is_empty() {
-            let pushes = Self::push_group(s, it.opacity, it.blend) + Self::push_isolation(s, it);
-            for c in it.shown_children() {
-                self.item(s, c, xf, page);
-            }
-            for _ in 0..pushes {
-                s.pop();
-            }
-            return;
-        }
-        let doc = self.doc;
-        let bp = if it.corners.is_none() { it.path.to_bezpath() } else { corners::apply(&it.path, &it.corners) };
-        let path = to_path(&bp);
-        let pushes = Self::push_group(s, it.opacity, it.blend);
-        let frame_art = self.tag_story.is_some();
-        if frame_art {
-            s.start_tagged(ContentTag::Artifact(Artifact::new(ArtifactType::Other, None)));
-        }
-        // Drop shadow (simple offset silhouette, like the renderer).
-        if ds.on
-            && let Some(p) = &path
-            && let Some(c) = self.swatch_color(&ds.color, 1.0)
-        {
-            let a = self.doc.light_angle(ds.angle, ds.global_light).to_radians();
-            let off = Vec2::new(-a.cos() * ds.distance, a.sin() * ds.distance);
-            s.push_transform(&tf(Affine::translate(off) * xf));
-            s.set_stroke(None);
-            s.set_fill(Some(solid_fill(c, ds.opacity)));
-            s.draw_path(p);
-            s.set_fill(None);
-            s.pop();
-        }
-        s.push_transform(&tf(xf));
-        // Fill.
-        if !it.fill.is_none()
-            && let Some(p) = &path
-            && let Some(paint) = self.fill_paint(&it.fill, bp.bounding_box())
-        {
-            if it.fill.overprint {
-                self.warn("overprint is not exported yet");
-            }
-            s.set_stroke(None);
-            s.set_fill(Some(Fill { paint, opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
-            s.draw_path(p);
-            s.set_fill(None);
-        }
-        if frame_art {
-            s.end_tagged();
-        }
-        // Content.
-        match &it.content {
-            Content::Graphic(g) => {
-                let g = &if it.media.is_some() { it.drawn_graphic(&self.doc.assets).unwrap_or_else(|| g.clone()) } else { g.clone() };
-                if let Some(p) = &path {
-                    s.push_clip_path(p, &FillRule::NonZero);
-                    self.graphic(s, g);
-                    s.pop();
-                }
-            }
-            Content::Text(tfr) => {
-                let cs = self.cache.get(doc, tfr.story, page);
-                if let (Some(ft), Some(pt)) = (cs.frame(it.id), &tfr.options.path) {
-                    // Type on a path: the glyphs as outlines along the path.
-                    for (si, gp) in designcraft_compose::path_glyphs(&cs, ft, &bp, pt) {
-                        let st = &cs.styles[si as usize];
-                        // A gradient spans the path's box.
-                        let fill = designcraft_doc::Fill { swatch: st.fill.clone(), tint: st.fill_tint, ..designcraft_doc::Fill::none() };
-                        if let (Some(paint), Some(p)) = (self.fill_paint(&fill, bp.bounding_box()), to_path(&gp)) {
-                            s.set_fill(Some(Fill { paint, opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
-                            s.draw_path(&p);
-                            s.set_fill(None);
-                        }
-                    }
-                } else if let Some(ft) = cs.frame(it.id) {
-                    let text = doc.story(tfr.story).map(|st| st.text.as_str()).unwrap_or("");
-                    let local = doc.text_local(it);
-                    if local != Affine::IDENTITY {
-                        s.push_transform(&tf(local));
-                    }
-                    self.text_area = (local.determinant().abs() > 1e-12).then(|| local.inverse().transform_rect_bbox(it.inner_bounds()));
-                    self.frame_text(s, &cs, ft, text);
-                    self.text_area = None;
-                    if local != Affine::IDENTITY {
-                        s.pop();
-                    }
-                }
-            }
-            _ => {}
-        }
-        // Stroke.
-        if !it.stroke.is_none()
-            && let Some(p) = &path
-        {
-            if frame_art {
-                s.start_tagged(ContentTag::Artifact(Artifact::new(ArtifactType::Other, None)));
-            }
-            self.stroke(s, it, &bp, p);
-            if frame_art {
-                s.end_tagged();
-            }
-        }
-        s.pop();
-        for _ in 0..pushes {
-            s.pop();
-        }
-        if let Content::Text(tfr) = &it.content {
-            let cs = self.cache.get(doc, tfr.story, page);
-            if let Some(ft) = cs.frame(it.id) {
-                self.frame_objects(s, ft, xf * doc.text_local(it), page);
-            }
-        }
-    }
-
-    /// Draw embedded page items after restoring the surface, retaining spread-space
-    /// transforms for page culling (also for anonymous note and cell stories).
-    fn frame_objects(&mut self, s: &mut Surface, ft: &designcraft_compose::FrameText, xf: Affine, page: Option<usize>) {
-        let mut pending = vec![(ft, xf)];
-        while let Some((frame, transform)) = pending.pop() {
-            for object in &frame.objects {
-                self.item(s, &object.object.item, transform * Affine::translate(object.origin.to_vec2()), page);
-            }
-            for note in &frame.notes {
-                if let Some(frame) = note.text.frames.first() {
-                    pending.push((frame, transform * Affine::translate(note.origin.to_vec2())));
-                }
-            }
-            for cell in frame.tables.iter().flat_map(|t| &t.cells) {
-                if let Some(frame) = cell.text.frames.first() {
-                    pending.push((frame, transform * Affine::translate(cell.origin.to_vec2())));
-                }
-            }
-        }
-    }
-
-    /// A swatch fill (solid or gradient) in the item's inner space. `None` for [None]/unknown.
-    pub(crate) fn fill_paint(&mut self, fill: &designcraft_doc::Fill, bounds: Rect) -> Option<krilla::paint::Paint> {
-        self.fill_paint_in(fill, bounds, Affine::IDENTITY)
-    }
-
-    /// [`Self::fill_paint`] for a gradient laid out in a space that `xf` maps to the current one
-    /// (text runs: the frame's text space under the run's origin).
-    pub(crate) fn fill_paint_in(&mut self, fill: &designcraft_doc::Fill, bounds: Rect, xf: Affine) -> Option<krilla::paint::Paint> {
-        let (swatch, tint) = (fill.swatch.as_str(), fill.tint);
-        if let Some(g) = designcraft_color::swatch::resolve_gradient(&self.doc.swatches, swatch) {
-            let kind = g.kind;
-            let mut expanded = g.expanded_stops();
-            // Grey and CMYK stops blend as inks, so a grey stop beside a CMYK one is the K ink.
-            if !self.rgb_only && expanded.iter().any(|(_, c, _)| matches!(c, Color::Cmyk { .. })) {
-                for (_, c, _) in &mut expanded {
-                    if let Color::Gray { k } = *c {
-                        *c = Color::cmyk(0.0, 0.0, 0.0, k);
-                    }
-                }
-            }
-            // A PDF shading needs one colour space. Midpoint expansion can introduce RGB even
-            // when every authored stop is CMYK/Gray; PDF/A can also change the output space.
-            let components = |c: &Color| match c {
-                Color::Cmyk { .. } if !self.rgb_only => 4,
-                Color::Gray { .. } => 1,
-                _ => 3,
-            };
-            let mixed = expanded.first().is_some_and(|(_, first, _)| expanded.iter().any(|(_, c, _)| components(c) != components(first)));
-            if mixed {
-                self.warn(format!("gradient '{swatch}': mixed color spaces converted to RGB (colour appearance and separations may change)"));
-            }
-            let mut stops: Vec<Stop> = Vec::new();
-            let mut last = 0.0f32;
-            for (o, c, a) in expanded {
-                let o = o.clamp(last, 1.0);
-                last = o;
-                let color = if mixed && !matches!(c, Color::Rgb { .. }) {
-                    let [r, g, b] = c.to_rgb();
-                    rgb::Color::new(q(r), q(g), q(b)).into()
-                } else {
-                    // Preserve RGB values, including already-interpolated display RGB, and
-                    // leave every homogeneous gradient on its existing device-space path.
-                    device(&c, self.rgb_only)
-                };
-                stops.push(Stop { offset: norm(o), color, opacity: norm(a) });
-            }
-            if stops.is_empty() {
-                return None;
-            }
-            return Some(match kind {
-                GradientKind::Radial => {
-                    // A circle stretched into the object's ellipse, as on screen.
-                    let (c, rx, ry) = fill.radial_ellipse(bounds);
-                    let rx = rx.max(1e-3);
-                    let stretch = Affine::translate(c.to_vec2()) * Affine::scale_non_uniform(1.0, ry / rx) * Affine::translate(-c.to_vec2());
-                    let (cx, cy) = (c.x as f32, c.y as f32);
-                    RadialGradient {
-                        fx: cx,
-                        fy: cy,
-                        fr: 0.0,
-                        cx,
-                        cy,
-                        cr: rx as f32,
-                        transform: tf(xf * stretch),
-                        spread_method: SpreadMethod::Pad,
-                        stops,
-                        anti_alias: false,
-                    }
-                    .into()
-                }
-                _ => {
-                    let (p0, p1) = fill.linear_axis(bounds);
-                    LinearGradient {
-                        x1: p0.x as f32,
-                        y1: p0.y as f32,
-                        x2: p1.x as f32,
-                        y2: p1.y as f32,
-                        transform: tf(xf),
-                        spread_method: SpreadMethod::Pad,
-                        stops,
-                        anti_alias: false,
-                    }
-                    .into()
-                }
-            });
-        }
-        self.swatch_color(swatch, tint).map(Into::into)
-    }
-
-    fn stroke(&mut self, s: &mut Surface, it: &Item, bp: &BezPath, path: &Path) {
-        let st = &it.stroke;
-        // A gradient swatch runs across the path's box, as on a fill.
-        let paint: krilla::paint::Paint = if designcraft_color::swatch::resolve_gradient(&self.doc.swatches, &st.swatch).is_some() {
-            let Some(p) = self.fill_paint(&st.as_fill(), bp.bounding_box()) else { return };
-            p
-        } else {
-            let Some(c) = self.swatch_color(&st.swatch, st.tint) else { return };
-            c.into()
-        };
-        let closed = it.path.is_closed();
-        let mut cap = match st.cap {
-            designcraft_doc::Cap::Butt => krilla::paint::LineCap::Butt,
-            designcraft_doc::Cap::Round => krilla::paint::LineCap::Round,
-            designcraft_doc::Cap::Projecting => krilla::paint::LineCap::Square,
-        };
-        let kind = self.doc.stroke_kind(&st.kind);
-        // Stripes, wavy and hash strokes: a filled outline (gap colour under it).
-        if let Some(o) = kind.outline(bp, st.weight, 0.05)
-            && let Some(op) = to_path(&o)
-        {
-            s.set_stroke(None);
-            if let Some(g) = self.swatch_color(&st.gap_swatch, st.gap_tint)
-                && st.gap_swatch != designcraft_color::swatch::NONE
-            {
-                s.set_stroke(Some(Stroke { paint: g.into(), width: st.weight as f32, opacity: NormalizedF32::ONE, ..Default::default() }));
-                s.set_fill(None);
-                s.draw_path(path);
-                s.set_stroke(None);
-            }
-            s.set_fill(Some(Fill { paint: paint.clone(), opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
-            s.draw_path(&op);
-            s.set_fill(None);
-            return;
-        }
-        // Viewers expand dashes too: a degenerate pattern draws solid, as on screen.
-        let length = designcraft_doc::path_length_bound(bp);
-        let dash = match &kind {
-            StrokeType::Dashed { pattern } if StrokeType::expandable_dashes(pattern, length) => {
-                let mut pat: Vec<f32> = pattern.iter().map(|v| v.max(0.0) as f32).collect();
-                if pat.len() % 2 == 1 {
-                    pat.extend(pat.clone());
-                }
-                Some(StrokeDash { array: pat, offset: 0.0 })
-            }
-            StrokeType::Dotted if StrokeType::expandable_dashes(&[0.0, st.weight * 2.0], length) => {
-                cap = krilla::paint::LineCap::Round;
-                Some(StrokeDash { array: vec![0.0, (st.weight * 2.0) as f32], offset: 0.0 })
-            }
-            _ => None,
-        };
-        let arrows = designcraft_doc::arrow::apply(bp, st, closed);
-        let trimmed = arrows.as_ref().and_then(|a| to_path(&a.0));
-        let path = trimmed.as_ref().unwrap_or(path);
-        let aligned = closed && st.align != StrokeAlign::Center;
-        let width = if aligned { st.weight * 2.0 } else { st.weight };
-        let mut pushes = 0;
-        match st.align {
-            StrokeAlign::Inside if closed => {
-                s.push_clip_path(path, &FillRule::NonZero);
-                pushes += 1;
-            }
-            StrokeAlign::Outside if closed => {
-                // Clip to everything outside the path: a big frame plus the path, even-odd.
-                let b = bp.bounding_box().inflate(width * 2.0 + 10.0, width * 2.0 + 10.0);
-                let mut outside = b.to_path(0.1);
-                outside.extend(bp.iter());
-                if let Some(p) = to_path(&outside) {
-                    s.push_clip_path(&p, &FillRule::EvenOdd);
-                    pushes += 1;
-                }
-            }
-            _ => {}
-        }
-        s.set_fill(None);
-        if dash.is_some()
-            && pushes == 0
-            && let Some(g) = self.swatch_color(&st.gap_swatch, st.gap_tint)
-        {
-            // Gap colour under dashes and dots.
-            s.set_stroke(Some(Stroke { paint: g.into(), width: width as f32, opacity: NormalizedF32::ONE, ..Default::default() }));
-            s.draw_path(path);
-        }
-        s.set_stroke(Some(Stroke {
-            paint: paint.clone(),
-            width: width as f32,
-            miter_limit: st.miter_limit.max(1.0) as f32,
-            line_cap: cap,
-            line_join: match st.join {
-                designcraft_doc::Join::Miter => krilla::paint::LineJoin::Miter,
-                designcraft_doc::Join::Round => krilla::paint::LineJoin::Round,
-                designcraft_doc::Join::Bevel => krilla::paint::LineJoin::Bevel,
-            },
-            opacity: NormalizedF32::ONE,
-            dash,
-        }));
-        s.draw_path(path);
-        s.set_stroke(None);
-        for _ in 0..pushes {
-            s.pop();
-        }
-        for h in arrows.iter().flat_map(|a| &a.1) {
-            let Some(p) = to_path(&h.path) else { continue };
-            match h.outline {
-                Some(w) => {
-                    s.set_stroke(Some(Stroke { paint: paint.clone(), width: w as f32, opacity: NormalizedF32::ONE, ..Default::default() }));
-                    s.draw_path(&p);
-                    s.set_stroke(None);
-                }
-                None => {
-                    s.set_fill(Some(krilla::paint::Fill { paint: paint.clone(), opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
-                    s.draw_path(&p);
-                    s.set_fill(None);
-                }
-            }
-        }
-    }
-
-    /// A placed PDF as krilla embeds it. krilla refuses a PDF newer than the file it writes (the
-    /// export fails at the end with `VersionMismatch(Pdf17)`), and PDF/X-4 is PDF 1.6 while
-    /// VectorCraft and most tools write 1.7. PDF 1.7 changed nothing in how a page draws, so a 1.7
-    /// file goes in as 1.6 (its header and catalog `/Version` relabelled, as
-    /// `qpdf --force-version=1.6` does). A newer
-    /// file is left out and the export fails naming it ([`Exporter::check_placed_versions`]).
-    /// Returns the document with its page count.
-    fn placed_pdf(&mut self, asset: &designcraft_doc::Asset) -> Option<(krilla::pdf::PdfDocument, usize)> {
-        use hayro_syntax::PdfVersion as V;
-        let Ok(pdf) = krilla::pdf::Pdf::new(asset.data.clone()) else {
-            self.warn(format!("{}: can't read the placed PDF", asset.name));
-            return None;
-        };
-        let max = match self.version {
-            PdfVersion::Pdf14 => V::Pdf14,
-            PdfVersion::Pdf15 => V::Pdf15,
-            PdfVersion::Pdf16 => V::Pdf16,
-            PdfVersion::Pdf17 => V::Pdf17,
-            PdfVersion::Pdf20 => V::Pdf20,
-        };
-        let have = pdf.version();
-        if have <= max {
-            let pages = pdf.pages().len();
-            return Some((krilla::pdf::PdfDocument::new(Arc::new(pdf)), pages));
-        }
-        if have == V::Pdf17
-            && max == V::Pdf16
-            && let bytes = relabel_pdf_header(&asset.data, b"%PDF-1.7", b"%PDF-1.6").unwrap_or_else(|| asset.data.to_vec())
-            && let Ok(pdf) = krilla::pdf::Pdf::new(Arc::new(relabel_catalog_version(bytes)))
-            && pdf.version() <= max
-        {
-            self.warn(format!("{}: a PDF 1.7 placed in a PDF 1.6 file, embedded as PDF 1.6", asset.name));
-            let pages = pdf.pages().len();
-            return Some((krilla::pdf::PdfDocument::new(Arc::new(pdf)), pages));
-        }
-        let v = match have {
-            V::Pdf17 => "PDF 1.7",
-            V::Pdf20 => "PDF 2.0",
-            _ => "a newer PDF",
-        };
-        self.too_new.push(format!("{} is {v}", asset.name));
-        None
-    }
-
-    /// Fail with the names of placed PDFs too new for this export (see [`Exporter::placed_pdf`]).
-    fn check_placed_versions(&self) -> Result<()> {
-        if self.too_new.is_empty() {
-            return Ok(());
-        }
-        let v = self.version.as_str();
-        Err(PdfError::Write(format!(
-            "a placed PDF is newer than the {v} this export writes ({}): save it as {v} or older and place it again",
-            self.too_new.join(", ")
-        )))
-    }
-
-    fn load_image(&mut self, id: AssetId) -> Option<Image> {
-        if let Some(i) = self.images.get(&id) {
-            return i.clone();
-        }
-        let asset = self.doc.assets.get(&id)?.clone();
-        // Use the same EPS preview as the renderer, preserving CMYK TIFF inks below. The
-        // content cache is keyed on the bytes actually converted, so equal previews share one.
-        let data = if designcraft_images::is_eps(&asset.data) {
-            let Some((proxy, _)) = designcraft_images::eps_proxy(&asset.data) else {
-                self.warn(format!("image `{}` could not be decoded and was skipped", asset.name));
-                self.images.insert(id, None);
-                return None;
-            };
-            Arc::new(proxy)
-        } else {
-            asset.data.clone()
-        };
-        if let Some(converted) = self.images_by_content.get(&data).cloned() {
-            if let Some(warning) = converted.warning {
-                self.warn(format!("{}: {warning}", asset.name));
-            }
-            self.images.insert(id, Some(converted.image.clone()));
-            return Some(converted.image);
-        }
-        let fmt = image::guess_format(&data).ok();
-        #[cfg(test)]
-        {
-            self.image_conversions += 1;
-        }
-        let mut warning = None;
-        let mode = RasterMode::for_standard(self.opts.standard);
-        let img = match fmt {
-            Some(image::ImageFormat::Jpeg) => jpeg(data.clone().into(), || embedded_icc(&data), mode),
-            // A CMYK TIFF keeps its ink values (`image` decodes it to RGB, and 100% K would print
-            // as four-colour black). PDF/A exports are RGB only.
-            Some(image::ImageFormat::Tiff) if !self.rgb_only && designcraft_images::is_cmyk_tiff(&data) => match cmyk_tiff(&data, mode) {
-                Some(img) => Some(img),
-                None => {
-                    warning = Some(CMYK_FALLBACK_WARNING);
-                    self.warn(format!("{}: {CMYK_FALLBACK_WARNING}", asset.name));
-                    lossless(&data, fmt, mode)
-                }
-            },
-            _ if self.opts.compress_images => recompress(&data, mode).or_else(|| lossless(&data, fmt, mode)),
-            _ => lossless(&data, fmt, mode),
-        };
-        if img.is_none() {
-            if data.is_empty() {
-                // A linked file that wasn't found when the document was opened: nothing to decode.
-                let at = asset.link.as_deref().map(|l| format!(" ({l})")).unwrap_or_default();
-                self.warn(format!("image `{}` is missing{at} and was skipped", asset.name));
-            } else {
-                self.warn(format!("image `{}` could not be decoded and was skipped", asset.name));
-            }
-        }
-        if let Some(image) = &img {
-            // Share the original encoded payload. HashMap checks exact bytes after hashing,
-            // so collisions cannot merge distinct images or their diagnostics.
-            self.images_by_content.insert(data, ConvertedImage { image: image.clone(), warning });
-        }
-        self.images.insert(id, img.clone());
-        img
-    }
-
-    /// Draw a placed graphic, inside its clipping path when it has one.
-    pub(crate) fn graphic(&mut self, s: &mut Surface, g: &designcraft_doc::Graphic) {
-        match g.clip_region().map(|(region, even_odd)| (to_path(&region), even_odd)) {
-            Some((Some(clip), even_odd)) => {
-                s.push_clip_path(&clip, if even_odd { &FillRule::EvenOdd } else { &FillRule::NonZero });
-                self.graphic_unclipped(s, g);
-                s.pop();
-            }
-            // A degenerate outline shows nothing, or everything when inverted.
-            Some((None, even_odd)) => {
-                if even_odd {
-                    self.graphic_unclipped(s, g);
-                }
-            }
-            None => self.graphic_unclipped(s, g),
-        }
-    }
-
-    fn graphic_unclipped(&mut self, s: &mut Surface, g: &designcraft_doc::Graphic) {
-        // Video / sound without a poster: a dark frame with a play mark.
-        if let Some(asset) = self.doc.assets.get(&g.asset)
-            && designcraft_doc::media_kind(&asset.mime).is_some()
-        {
-            let (w, h) = g.size;
-            let (cx, cy, r) = (w / 2.0, h / 2.0, w.min(h) * 0.18);
-            let mut tri = BezPath::new();
-            tri.move_to((cx - r * 0.6, cy - r));
-            tri.line_to((cx + r, cy));
-            tri.line_to((cx - r * 0.6, cy + r));
-            tri.close_path();
-            s.push_transform(&tf(g.xf));
-            s.set_stroke(None);
-            for (bp, c) in [(Rect::new(0.0, 0.0, w, h).to_path(0.1), rgb::Color::new(48, 48, 52)), (tri, rgb::Color::new(235, 235, 235))] {
-                if let Some(p) = to_path(&bp) {
-                    s.set_fill(Some(Fill { paint: c.into(), ..Default::default() }));
-                    s.draw_path(&p);
-                }
-            }
-            s.set_fill(None);
-            s.pop();
-            return;
-        }
-        // Placed PDFs go in as vectors (the page as a form XObject).
-        let doc = self.doc;
-        if let Some(asset) = doc.assets.get(&g.asset)
-            && asset.data.starts_with(b"%PDF")
-        {
-            // Cropped to a box: the whole page, placed so that the box spans graphic space.
-            let shown = asset.shown_box();
-            let [l, t, r, b] = shown.unwrap_or([0.0, 0.0, 1.0, 1.0]);
-            let (page_w, page_h) = (g.size.0 / (r - l), g.size.1 / (b - t));
-            let Some(size) = Size::from_wh(page_w.max(1e-3) as f32, page_h.max(1e-3) as f32) else { return };
-            let placed = match self.pdfs.get(&g.asset) {
-                Some(p) => p.clone(),
-                None => {
-                    let p = self.placed_pdf(asset);
-                    self.pdfs.insert(g.asset, p.clone());
-                    p
-                }
-            };
-            match placed {
-                // krilla would fail the whole export at the end on a page the PDF doesn't have.
-                Some((_, pages)) if asset.page as usize >= pages => {
-                    self.warn(format!("{}: the placed PDF has no page {}", asset.name, u64::from(asset.page) + 1));
-                }
-                Some((placed, _)) => {
-                    s.push_transform(&tf(g.xf));
-                    let clip = shown.and_then(|_| to_path(&Rect::new(0.0, 0.0, g.size.0, g.size.1).to_path(0.1)));
-                    if let Some(clip) = &clip {
-                        s.push_clip_path(clip, &FillRule::NonZero);
-                    }
-                    s.push_transform(&tf(Affine::translate((-l * page_w, -t * page_h))));
-                    s.draw_pdf_page(&placed, size, asset.page as usize);
-                    s.pop();
-                    if clip.is_some() {
-                        s.pop();
-                    }
-                    s.pop();
-                }
-                None => {}
-            }
-            return;
-        }
-        // Placed SVGs go in as vectors too.
-        if let Some(asset) = self.doc.assets.get(&g.asset)
-            && designcraft_images::is_svg(&asset.data)
-        {
-            let Some(size) = Size::from_wh(g.size.0.max(1e-3) as f32, g.size.1.max(1e-3) as f32) else { return };
-            let tree = self.svgs.entry(g.asset).or_insert_with(|| designcraft_images::svg_tree(&asset.data).map(Arc::new)).clone();
-            match tree {
-                Some(tree) => {
-                    use krilla_svg::SurfaceExt;
-                    s.push_transform(&tf(g.xf));
-                    if s.draw_svg(&tree, size, krilla_svg::SvgSettings::default()).is_none() {
-                        self.warn(format!("{}: parts of the placed SVG could not be drawn", asset.name));
-                    }
-                    s.pop();
-                }
-                None => self.warn(format!("{}: can't read the placed SVG", asset.name)),
-            }
-            return;
-        }
-        if self.colorized(s, g) {
-            return;
-        }
-        let Some(img) = self.load_image(g.asset) else { return };
-        let Some(size) = Size::from_wh(g.size.0.max(1e-3) as f32, g.size.1.max(1e-3) as f32) else { return };
-        s.push_transform(&tf(g.xf));
-        s.draw_image(img, size);
-        s.pop();
-    }
-
-    /// A greyscale or bitmap image coloured by the swatch applied to it (#1094): the swatch is
-    /// painted through the image's ink coverage (its darkness), over 0% ink for a greyscale
-    /// image, whose white is opaque. `false`, drawing nothing, when the image keeps its own
-    /// colours: no swatch, one that no longer exists, a colour image.
-    fn colorized(&mut self, s: &mut Surface, g: &designcraft_doc::Graphic) -> bool {
-        if g.fill.is_none() {
-            return false;
-        }
-        let Some(asset) = self.doc.assets.get(&g.asset) else { return false };
-        let Some(tone) = designcraft_images::tone(&asset.data) else { return false };
-        let Some(paint) = self.swatch_color(&g.fill.swatch, g.fill.tint) else { return false };
-        let Some(coverage) = designcraft_images::decode_rgba(&asset.data).and_then(|img| CoverageImage::new(&img)) else { return false };
-        let interpolate = RasterMode::for_standard(self.opts.standard).interpolate;
-        let Ok(mask) = Image::from_custom(coverage, interpolate) else { return false };
-        let size = Size::from_wh(g.size.0.max(1e-3) as f32, g.size.1.max(1e-3) as f32);
-        let (Some(size), Some(rect)) = (size, to_path(&Rect::new(0.0, 0.0, g.size.0, g.size.1).to_path(0.1))) else { return false };
-        s.push_transform(&tf(g.xf));
-        if tone == designcraft_images::Tone::Gray {
-            let blank =
-                self.swatch_color(designcraft_color::swatch::PAPER, 1.0).unwrap_or_else(|| device(&Color::cmyk(0.0, 0.0, 0.0, 0.0), self.rgb_only));
-            s.set_fill(Some(Fill { paint: blank.into(), ..Default::default() }));
-            s.draw_path(&rect);
-        }
-        let mut sb = s.stream_builder();
-        let mut ms = sb.surface();
-        ms.draw_image(mask, size);
-        ms.finish();
-        let stream = sb.finish();
-        s.push_mask(krilla::mask::Mask::new(stream, krilla::mask::MaskType::Luminosity));
-        s.set_fill(Some(Fill { paint: paint.into(), ..Default::default() }));
-        s.draw_path(&rect);
-        s.pop();
-        s.set_fill(None);
-        s.pop();
-        true
-    }
-}
-
-/// The ink coverage of a greyscale or bitmap image (255 = black, 0 = white or transparent) as a
-/// DeviceGray image, painted into a luminosity mask.
-#[derive(Clone, Hash)]
-struct CoverageImage {
-    grey: Arc<Vec<u8>>,
-    size: (u32, u32),
-}
-
 impl CoverageImage {
     fn new(rgba: &image::RgbaImage) -> Option<Self> {
         let size = rgba.dimensions();
@@ -1546,6 +113,12 @@ impl CoverageImage {
         let grey = rgba.pixels().map(|p| ((u16::from(255 - p[0]) * u16::from(p[3]) + 127) / 255) as u8).collect();
         Some(Self { grey: Arc::new(grey), size })
     }
+
+    /// Coverage given directly, one byte per pixel; `None` when the size doesn't match.
+    fn from_grey(grey: Arc<Vec<u8>>, size: (u32, u32)) -> Option<Self> {
+        let n = usize::try_from(u64::from(size.0) * u64::from(size.1)).ok()?;
+        (n > 0 && grey.len() == n).then_some(Self { grey, size })
+    }
 }
 
 impl krilla::image::CustomImage for CoverageImage {
@@ -1569,150 +142,12 @@ impl krilla::image::CustomImage for CoverageImage {
     }
 }
 
-/// `data` with its `%PDF-x.y` header (within the first 1024 bytes, where readers look for it)
-/// changed from `from` to `to`, both the same length. `None` when the header isn't `from`.
-fn relabel_pdf_header(data: &[u8], from: &[u8], to: &[u8]) -> Option<Vec<u8>> {
-    if from.len() != to.len() {
-        return None;
-    }
-    let head = data.get(..data.len().min(1024))?;
-    let at = head.windows(from.len()).position(|w| w == from)?;
-    let mut out = data.to_vec();
-    out.get_mut(at..at + to.len())?.copy_from_slice(to);
-    Some(out)
-}
-
-/// `data` with every `/Version /1.7` changed to `/Version /1.6` in place, so the xref offsets
-/// hold. The catalog's `/Version` wins over the header (TCPDF writes both), so relabelling the
-/// header alone leaves the file a PDF 1.7. A catalog inside a compressed object stream is left as
-/// it is, and the version check still names the file.
-fn relabel_catalog_version(mut data: Vec<u8>) -> Vec<u8> {
-    const KEY: &[u8] = b"/Version";
-    let mut from = 0;
-    while let Some(at) = data.get(from..).and_then(|rest| rest.windows(KEY.len()).position(|w| w == KEY)) {
-        let mut i = from + at + KEY.len();
-        while data.get(i).is_some_and(|b| b" \t\r\n\x0c\0".contains(b)) {
-            i += 1;
-        }
-        let ends = data.get(i + 4).is_none_or(|b| !b.is_ascii_alphanumeric() && *b != b'.');
-        if data.get(i..i + 4) == Some(b"/1.7".as_slice())
-            && ends
-            && let Some(b) = data.get_mut(i + 3)
-        {
-            *b = b'6';
-        }
-        from = i;
-    }
-    data
-}
-
-/// The sRGB profile (ICC v2.1) that untagged RGB images carry in PDF/X-4.
-pub(crate) static SRGB_ICC: &[u8] = include_bytes!("../../../assets/icc/sRGB-v2-magic.icc");
-
-/// How raster images are written for the export's standard.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-struct RasterMode {
-    /// `/Interpolate true`: smoother upscaling in viewers. PDF/X-4 and PDF/A don't allow it.
-    interpolate: bool,
-    /// Give RGB images with no ICC profile of their own the sRGB profile: under PDF/X-4's CMYK
-    /// output intent, RGB must be colour-managed.
-    tag_rgb: bool,
-}
-
 impl RasterMode {
     fn for_standard(standard: Standard) -> Self {
-        Self { interpolate: standard == Standard::None, tag_rgb: standard == Standard::PdfX4 }
+        Self { interpolate: standard == Standard::None, tag_rgb: standard.is_pdfx() }
     }
 }
 
-/// The ICC profile embedded in an image file, if it has one.
-fn embedded_icc(data: &[u8]) -> Option<Vec<u8>> {
-    use image::ImageDecoder;
-    let mut dec = image::ImageReader::new(std::io::Cursor::new(data)).with_guessed_format().ok()?.into_decoder().ok()?;
-    dec.icc_profile().ok().flatten()
-}
-
-/// Whether an ICC profile describes RGB (its colour space signature, header bytes 16 to 20).
-fn is_rgb_icc(icc: &[u8]) -> bool {
-    icc.get(16..20) == Some(b"RGB ".as_slice())
-}
-
-/// Whether an ICC profile describes grey.
-fn is_grey_icc(icc: &[u8]) -> bool {
-    icc.get(16..20) == Some(b"GRAY".as_slice())
-}
-
-/// Whether `data` decodes to grey (with or without alpha), read from its header.
-fn is_grey(data: &[u8]) -> bool {
-    use image::ImageDecoder;
-    image::ImageReader::new(std::io::Cursor::new(data))
-        .with_guessed_format()
-        .ok()
-        .and_then(|r| r.into_decoder().ok())
-        .is_some_and(|dec| !dec.color_type().has_color())
-}
-
-/// A JPEG, passed through. With `tag_rgb`, a JPEG keeps its own profile, and one without gets
-/// sRGB. krilla uses a profile only when its channels match the JPEG's, so a grey or CMYK JPEG
-/// without a profile stays DeviceGray or DeviceCMYK.
-fn jpeg(data: krilla::Data, icc: impl FnOnce() -> Option<Vec<u8>>, mode: RasterMode) -> Option<Image> {
-    if !mode.tag_rgb {
-        return Image::from_jpeg(data, mode.interpolate).ok();
-    }
-    let icc: krilla::Data = match icc() {
-        Some(own) => own.into(),
-        None => SRGB_ICC.into(),
-    };
-    Image::from_jpeg_with_icc(data, Some(icc), mode.interpolate).ok()
-}
-
-/// Whether krilla would write this PNG, GIF or WebP as untagged RGB: not grey, and no profile of
-/// its own.
-fn untagged_rgb(data: &[u8]) -> bool {
-    use image::ImageDecoder;
-    let Some(mut dec) = image::ImageReader::new(std::io::Cursor::new(data)).with_guessed_format().ok().and_then(|r| r.into_decoder().ok()) else {
-        return false;
-    };
-    let grey = matches!(dec.color_type(), image::ColorType::L8 | image::ColorType::La8 | image::ColorType::L16 | image::ColorType::La16);
-    !grey && dec.icc_profile().ok().flatten().is_none()
-}
-
-fn lossless(data: &Arc<Vec<u8>>, fmt: Option<image::ImageFormat>, mode: RasterMode) -> Option<Image> {
-    // krilla reads PNG, GIF and WebP lazily: a damaged file is accepted here and fails the whole
-    // export when the PDF is written. Decoding it first means it is skipped, like any other
-    // image that can't be decoded.
-    let rgba = designcraft_images::decode_rgba(data)?;
-    let i = mode.interpolate;
-    let direct = match fmt {
-        Some(image::ImageFormat::Png | image::ImageFormat::Gif | image::ImageFormat::WebP) if mode.tag_rgb && untagged_rgb(data) => None,
-        Some(image::ImageFormat::Png) => Image::from_png(data.clone().into(), i).ok(),
-        Some(image::ImageFormat::Gif) => Image::from_gif(data.clone().into(), i).ok(),
-        Some(image::ImageFormat::WebP) => Image::from_webp(data.clone().into(), i).ok(),
-        _ => None,
-    };
-    direct.or_else(|| {
-        // A grey TIFF, BMP… stays DeviceGray, as a grey PNG or JPEG does (#1426).
-        if let Some(grey) = GreyImage::new(data) {
-            return Image::from_custom(grey, i).ok();
-        }
-        // TIFF, BMP, PSD composites… and, with `tag_rgb`, untagged RGB.
-        if mode.tag_rgb {
-            return SrgbImage::new(rgba).and_then(|img| Image::from_custom(img, i).ok());
-        }
-        let (w, h) = rgba.dimensions();
-        Some(Image::from_rgba8(rgba.into_raw(), w, h))
-    })
-}
-
-/// An RGB raster tagged with the sRGB profile, for PDF/X-4.
-#[derive(Clone, Hash)]
-struct SrgbImage {
-    rgb: Arc<Vec<u8>>,
-    /// Only when some pixel is not opaque.
-    alpha: Option<Arc<Vec<u8>>>,
-    size: (u32, u32),
-}
-
 impl SrgbImage {
     fn new(rgba: image::RgbaImage) -> Option<Self> {
         let size = rgba.dimensions();
@@ -1749,17 +184,6 @@ impl krilla::image::CustomImage for SrgbImage {
     }
 }
 
-/// A grey raster as a DeviceGray image (ICCBased when the file has a grey profile of its own), so
-/// a page that only holds black prints as black, not as RGB.
-#[derive(Clone, Hash)]
-struct GreyImage {
-    grey: Arc<Vec<u8>>,
-    /// Only when some pixel is not opaque.
-    alpha: Option<Arc<Vec<u8>>>,
-    size: (u32, u32),
-    icc: Option<Arc<Vec<u8>>>,
-}
-
 impl GreyImage {
     /// `None` when `data` isn't grey or can't be decoded.
     fn new(data: &[u8]) -> Option<Self> {
@@ -1804,13 +228,6 @@ impl krilla::image::CustomImage for GreyImage {
     }
 }
 
-/// A CMYK raster as a krilla image: its samples are written unchanged as DeviceCMYK, like a
-/// CMYK JPEG's. An embedded ICC profile is left out, as it is for JPEGs: the inks are meant for
-/// the output intent's press, and tagging them with another CMYK profile would let a RIP
-/// convert 100% K to four-colour black.
-#[derive(Clone, Hash)]
-struct CmykImage(Arc<designcraft_images::CmykRaster>);
-
 impl krilla::image::CustomImage for CmykImage {
     fn color_channel(&self) -> &[u8] {
         &self.0.cmyk
@@ -1832,254 +249,6 @@ impl krilla::image::CustomImage for CmykImage {
     }
 }
 
-/// A CMYK TIFF as a DeviceCMYK image. `None` when it can't be read as CMYK.
-fn cmyk_tiff(data: &[u8], mode: RasterMode) -> Option<Image> {
-    let r = designcraft_images::decode_cmyk_tiff(data)?;
-    // krilla panics when the channel lengths don't match the size.
-    let pixels = usize::try_from(r.width).ok()?.checked_mul(usize::try_from(r.height).ok()?)?;
-    if r.cmyk.len() != pixels.checked_mul(4)? || r.alpha.as_ref().is_some_and(|a| a.len() != pixels) {
-        return None;
-    }
-    Image::from_custom(CmykImage(Arc::new(r)), mode.interpolate).ok()
-}
-
-/// Opaque raster → JPEG (quality 90). `None` when the image has transparency or can't be decoded.
-/// With `tag_rgb`, the JPEG keeps the source's RGB profile, or gets sRGB.
-fn recompress(data: &[u8], mode: RasterMode) -> Option<Image> {
-    let img = image::load_from_memory(data).ok()?;
-    if img.color().has_alpha() && img.to_rgba8().pixels().any(|p| p[3] < 255) {
-        return None;
-    }
-    let mut buf = Vec::new();
-    let enc = image::codecs::jpeg::JpegEncoder::new_with_quality(&mut buf, 90);
-    // A grey image stays a grey JPEG (#1426).
-    let grey = !img.color().has_color();
-    if grey {
-        let l = img.to_luma8();
-        image::ImageEncoder::write_image(enc, l.as_raw(), l.width(), l.height(), image::ExtendedColorType::L8).ok()?;
-    } else {
-        let rgb = img.to_rgb8();
-        image::ImageEncoder::write_image(enc, rgb.as_raw(), rgb.width(), rgb.height(), image::ExtendedColorType::Rgb8).ok()?;
-    }
-    jpeg(buf.into(), || embedded_icc(data).filter(|p| if grey { is_grey_icc(p) } else { is_rgb_icc(p) }), mode)
-}
-
-#[cfg(test)]
-mod image_content_cache_tests {
-    use super::*;
-    use designcraft_doc::Asset;
-
-    fn png(w: u32, h: u32, color: [u8; 4]) -> Vec<u8> {
-        let image = image::RgbaImage::from_pixel(w, h, image::Rgba(color));
-        let mut bytes = Vec::new();
-        image.write_to(&mut std::io::Cursor::new(&mut bytes), image::ImageFormat::Png).unwrap();
-        bytes
-    }
-    fn asset(doc: &mut Document, bytes: Vec<u8>, name: &str) -> AssetId {
-        let id = AssetId(doc.alloc());
-        doc.assets.insert(id, Arc::new(Asset { id, name: name.into(), mime: "image/png".into(), data: Arc::new(bytes), ..Default::default() }));
-        id
-    }
-    fn exporter<'a>(doc: &'a Document, cache: &'a Cache, opts: &'a PdfOptions) -> Exporter<'a> {
-        Exporter {
-            drawing_items: Vec::new(),
-            doc,
-            cache,
-            opts,
-            clip: Rect::ZERO,
-            warnings: Vec::new(),
-            images: HashMap::new(),
-            images_by_content: ImageContentCache::default(),
-            image_conversions: 0,
-            pdfs: HashMap::new(),
-            version: PdfVersion::Pdf17,
-            too_new: Vec::new(),
-            svgs: HashMap::new(),
-            fonts: HashMap::new(),
-            reverse_cmaps: HashMap::new(),
-            rgb_only: false,
-            tags: Vec::new(),
-            story_tags: HashMap::new(),
-            tag_story: None,
-            text_area: None,
-            para_tags: HashMap::new(),
-        }
-    }
-    #[test]
-    fn exact_bytes_reuse_conversion_under_real_hash_collisions() {
-        use std::hash::{BuildHasher, Hasher};
-        let mut d = Document::new(&Default::default());
-        let red = png(2, 1, [255, 0, 0, 255]);
-        let blue = png(1, 2, [0, 0, 255, 128]);
-        let a1 = asset(&mut d, red.clone(), "a1");
-        let b1 = asset(&mut d, blue.clone(), "b1");
-        let a2 = asset(&mut d, red, "a2");
-        let b2 = asset(&mut d, blue, "b2");
-        assert!(!Arc::ptr_eq(&d.assets[&a1].data, &d.assets[&a2].data));
-        let cache = Cache::new();
-        let opts = PdfOptions::default();
-        let mut ex = exporter(&d, &cache, &opts);
-        let mut h1 = ex.images_by_content.hasher().build_hasher();
-        h1.write(&d.assets[&a1].data);
-        let mut h2 = ex.images_by_content.hasher().build_hasher();
-        h2.write(&d.assets[&b1].data);
-        assert_eq!(h1.finish(), h2.finish());
-        assert_ne!(d.assets[&a1].data, d.assets[&b1].data);
-        for (id, count, size) in [(a1, 1, (2, 1)), (b1, 2, (1, 2)), (a2, 2, (2, 1)), (a1, 2, (2, 1)), (b2, 2, (1, 2))] {
-            assert_eq!(ex.load_image(id).unwrap().size(), size);
-            assert_eq!(ex.image_conversions, count, "count actual converter executions, not krilla resource equality");
-        }
-        assert_eq!(ex.images.len(), 4);
-        assert_eq!(ex.images_by_content.len(), 2);
-        let first_key = ex.images_by_content.keys().find(|key| key.as_slice() == d.assets[&a1].data.as_slice()).unwrap();
-        assert!(Arc::ptr_eq(first_key, &d.assets[&a1].data), "cache keys share the original encoded payload");
-        ex.images_by_content.clear();
-        assert_eq!(ex.load_image(a1).unwrap().size(), (2, 1));
-        assert_eq!(ex.image_conversions, 2, "the AssetId cache remains the first lookup");
-        assert!(ex.images_by_content.is_empty());
-    }
-    #[test]
-    fn successful_content_cache_does_not_suppress_failure_names() {
-        let mut d = Document::new(&Default::default());
-        let a = asset(&mut d, vec![0, 1, 2, 3], "broken-a.png");
-        let b = asset(&mut d, vec![0, 1, 2, 3], "broken-b.png");
-        let cache = Cache::new();
-        let opts = PdfOptions::default();
-        let mut ex = exporter(&d, &cache, &opts);
-        assert!(ex.load_image(a).is_none());
-        assert!(ex.load_image(b).is_none());
-        assert!(ex.load_image(a).is_none());
-        assert_eq!(ex.image_conversions, 2);
-        assert!(ex.images_by_content.is_empty());
-        assert_eq!(ex.warnings.len(), 2);
-        assert!(ex.warnings[0].contains("broken-a.png"));
-        assert!(ex.warnings[1].contains("broken-b.png"));
-    }
-    #[test]
-    fn content_cache_is_scoped_to_each_immutable_options_context() {
-        let mut d = Document::new(&Default::default());
-        let data = png(2, 2, [240, 20, 30, 255]);
-        let a = asset(&mut d, data.clone(), "a");
-        let b = asset(&mut d, data, "b");
-        let cache = Cache::new();
-        for compress_images in [false, true, false] {
-            let opts = PdfOptions { compress_images, ..Default::default() };
-            let mut ex = exporter(&d, &cache, &opts);
-            assert!(ex.load_image(a).is_some());
-            assert!(ex.load_image(b).is_some());
-            assert_eq!(ex.image_conversions, 1);
-            assert_eq!(ex.images_by_content.len(), 1);
-        }
-    }
-
-    #[test]
-    fn successful_cmyk_fallback_replays_each_asset_name_once_and_converts_once() {
-        let bytes = crate::image_fixtures::cmyk_tiff(None, true);
-        assert!(designcraft_images::is_cmyk_tiff(&bytes));
-        assert!(designcraft_images::decode_cmyk_tiff(&bytes).is_none());
-        assert!(designcraft_images::decode_rgba(&bytes).is_some());
-        let mut d = Document::new(&Default::default());
-        let a = asset(&mut d, bytes.clone(), "ink-a.tif");
-        let b = asset(&mut d, bytes, "ink-b.tif");
-        let cache = Cache::new();
-        for compress_images in [false, true] {
-            let opts = PdfOptions { compress_images, ..Default::default() };
-            let mut ex = exporter(&d, &cache, &opts);
-            for id in [a, b, a, b] {
-                assert_eq!(ex.load_image(id).unwrap().size(), (2, 1));
-            }
-            assert_eq!(ex.image_conversions, 1);
-            assert_eq!(ex.images_by_content.len(), 1);
-            assert_eq!(ex.warnings, [format!("ink-a.tif: {CMYK_FALLBACK_WARNING}"), format!("ink-b.tif: {CMYK_FALLBACK_WARNING}")]);
-        }
-    }
-
-    #[test]
-    fn cmyk_alpha_and_rgb_only_context_keep_conversion_counts_and_failures() {
-        let cache = Cache::new();
-        for alpha in [None, Some(2), Some(1)] {
-            let mut d = Document::new(&Default::default());
-            let bytes = crate::image_fixtures::cmyk_tiff(alpha, false);
-            // RGB-only exports get the RGB the screen shows.
-            let screen_rgb: Vec<u8> =
-                designcraft_images::decode_rgba(&bytes).map_or_else(Vec::new, |img| img.pixels().flat_map(|p| [p[0], p[1], p[2]]).collect());
-            let a = asset(&mut d, bytes.clone(), "a.tif");
-            let b = asset(&mut d, bytes, "b.tif");
-            for standard in [Standard::None, Standard::PdfA2b, Standard::PdfX4, Standard::PdfA2b, Standard::None] {
-                let opts = PdfOptions { standard, ..Default::default() };
-                let mut ex = exporter(&d, &cache, &opts);
-                ex.rgb_only = standard == Standard::PdfA2b;
-                // Unassociated alpha (2) decodes as inks, and as RGB for RGB-only exports.
-                // Associated alpha is rejected by both paths: retain both failure names.
-                let succeeds = alpha.is_none() || alpha == Some(2);
-                let first = ex.load_image(a);
-                assert_eq!(first.is_some(), succeeds, "{alpha:?} {standard:?}");
-                if alpha.is_none() {
-                    let (space, samples) = image_color_samples(first.unwrap());
-                    assert_eq!(space, if ex.rgb_only { "DeviceRGB" } else { "DeviceCMYK" });
-                    assert_eq!(samples, if ex.rgb_only { screen_rgb.clone() } else { crate::image_fixtures::INKS.to_vec() });
-                }
-                assert_eq!(ex.load_image(b).is_some(), succeeds, "{alpha:?} {standard:?}");
-                assert_eq!(ex.load_image(a).is_some(), succeeds);
-                assert_eq!(ex.image_conversions, if succeeds { 1 } else { 2 });
-                assert_eq!(ex.images_by_content.len(), usize::from(succeeds));
-                if succeeds {
-                    assert!(ex.warnings.is_empty());
-                } else {
-                    for name in ["a.tif", "b.tif"] {
-                        assert!(ex.warnings.contains(&format!("image `{name}` could not be decoded and was skipped")));
-                        assert_eq!(ex.warnings.contains(&format!("{name}: {CMYK_FALLBACK_WARNING}")), !ex.rgb_only);
-                    }
-                }
-            }
-        }
-    }
-
-    // Serialize the converted raster without an archival validator so the RGB-only pixel
-    // contract stays independent of main's existing PDF/A interpolation validation failure.
-    fn image_color_samples(image: Image) -> (String, Vec<u8>) {
-        use hayro_syntax::object::Name;
-        let mut pdf = krilla::Document::new();
-        let size = Size::from_wh(20.0, 20.0).unwrap();
-        let mut page = pdf.start_page_with(PageSettings::new(size));
-        let mut surface = page.surface();
-        surface.draw_image(image, size);
-        surface.finish();
-        page.finish();
-        let bytes = pdf.finish().unwrap();
-        let pdf = hayro_syntax::Pdf::new(bytes).unwrap();
-        let stream = pdf
-            .objects()
-            .into_iter()
-            .filter_map(|o| o.into_stream())
-            .find(|s| s.dict().get::<Name>("Subtype").is_some_and(|n| n.as_str() == "Image"))
-            .unwrap();
-        (stream.dict().get::<Name>("ColorSpace").unwrap().as_str().to_owned(), stream.decoded().unwrap().into_owned())
-    }
-
-    #[test]
-    fn content_cache_owns_only_existing_payloads_and_drops_with_exporter() {
-        let mut d = Document::new(&Default::default());
-        let bytes = png(2, 1, [20, 30, 40, 255]);
-        let a = asset(&mut d, bytes.clone(), "a.png");
-        let b = asset(&mut d, bytes, "b.png");
-        let payload = Arc::downgrade(&d.assets[&a].data);
-        let duplicate = Arc::downgrade(&d.assets[&b].data);
-        let cache = Cache::new();
-        let opts = PdfOptions::default();
-        let mut ex = exporter(&d, &cache, &opts);
-        assert!(ex.load_image(a).is_some());
-        assert!(ex.load_image(b).is_some());
-        assert_eq!(duplicate.strong_count(), 1, "a content hit must not retain the second encoded allocation");
-        let key = ex.images_by_content.keys().next().unwrap();
-        assert!(Arc::ptr_eq(key, &d.assets[&a].data));
-        drop(ex);
-        drop(d);
-        assert!(payload.upgrade().is_none(), "no converted image or encoded key outlives this exporter");
-        assert!(duplicate.upgrade().is_none());
-    }
-}
-
 #[cfg(all(test, not(target_arch = "wasm32")))]
 mod unwind_tests {
     use super::*;
@@ -2130,89 +299,3 @@ mod unwind_tests {
         println!("all three export entry points recovered");
     }
 }
-
-#[cfg(test)]
-mod eps_tests {
-    use super::*;
-    use hayro_syntax::object::Name;
-
-    #[test]
-    fn eps_tiff_preview_keeps_cmyk_inks_in_pdf() {
-        let pixels = vec![0u8, 0, 0, 255, 0, 255, 255, 0];
-        let mut tiff = Vec::new();
-        tiff::encoder::TiffEncoder::new(std::io::Cursor::new(&mut tiff))
-            .unwrap()
-            .write_image::<tiff::encoder::colortype::CMYK8>(2, 1, &pixels)
-            .unwrap();
-        let ps = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 2 1\n%%EOF\n";
-        let mut eps = vec![0xC5, 0xD0, 0xD3, 0xC6];
-        for value in [30usize, ps.len(), 0, 0, 30 + ps.len(), tiff.len()] {
-            eps.extend((value as u32).to_le_bytes());
-        }
-        eps.extend([0xFF, 0xFF]);
-        eps.extend_from_slice(ps);
-        eps.extend_from_slice(&tiff);
-        assert_eq!(designcraft_images::eps_proxy(&eps).unwrap().0, tiff);
-        let mut doc = Document::new(&designcraft_doc::build::NewDocument::default());
-        let aid = AssetId(doc.alloc());
-        doc.assets.insert(
-            aid,
-            Arc::new(designcraft_doc::Asset {
-                id: aid,
-                name: "cmyk.eps".into(),
-                mime: "application/postscript".into(),
-                link: None,
-                data: Arc::new(eps),
-                pixels: Some((2, 1)),
-                page: 0,
-                ..Default::default()
-            }),
-        );
-        let mut item = Item::new(
-            designcraft_doc::ItemId(doc.alloc()),
-            doc.default_layer(),
-            designcraft_doc::Shape::Rectangle,
-            designcraft_geom::shapes::rectangle(Rect::new(72.0, 72.0, 272.0, 172.0)),
-        );
-        item.content = Content::Graphic(designcraft_doc::Graphic {
-            asset: aid,
-            size: (2.0, 1.0),
-            xf: Affine::translate((72.0, 72.0)) * Affine::scale(100.0),
-            auto_fit: Default::default(),
-            fit_align: 4,
-            crop: [0.0; 4],
-            clip: None,
-            wrap: Default::default(),
-            fill: Default::default(),
-        });
-        doc.insert_item(designcraft_doc::SpreadRef::Doc(0), item, None).unwrap();
-        for standard in [Standard::None, Standard::PdfX4] {
-            let report = export_pdf_with_report(&doc, &Cache::new(), &PdfOptions { standard, ..Default::default() }).unwrap();
-            assert!(report.warnings.is_empty(), "{:?}", report.warnings);
-            let pdf = hayro_syntax::Pdf::new(report.bytes).unwrap();
-            let images: Vec<_> = pdf
-                .objects()
-                .into_iter()
-                .filter_map(|o| o.into_stream())
-                .filter(|s| s.dict().get::<Name>("Subtype").is_some_and(|n| n.as_str() == "Image"))
-                .map(|s| (s.dict().get::<Name>("ColorSpace").unwrap().as_str().to_string(), s.decoded().unwrap().into_owned()))
-                .collect();
-            assert_eq!(images, vec![("DeviceCMYK".to_string(), pixels.clone())], "{standard:?}");
-        }
-    }
-
-    #[test]
-    fn civil_dates_match_the_old_cycle_conversion_including_beyond_chrono() {
-        use super::civil;
-        assert_eq!(civil(0), (1970, 1, 1, 0, 0, 0));
-        assert_eq!(civil(951_782_400), (2000, 2, 29, 0, 0, 0));
-        assert_eq!(civil(1_791_504_000 + 3_723), (2026, 10, 9, 1, 2, 3));
-        // Beyond chrono's year range the old `civil` still converted; pin that output, never the
-        // epoch. `date_time` is what clamps the year to the PDF `0..=9999` range afterwards.
-        assert_eq!(civil(253_402_300_800), (10000, 1, 1, 0, 0, 0));
-        assert_eq!(civil(10_000_000_000_000), (318857, 5, 20, 17, 46, 40));
-        assert_eq!(civil(-10_000_000_000_000), (-314918, 8, 13, 6, 13, 20));
-        assert_eq!(civil(i64::MAX), (292277026596, 12, 4, 15, 30, 7));
-        assert_eq!(civil(i64::MIN), (-292277022657, 1, 27, 8, 29, 52));
-    }
-}
diff --git a/crates/pdf/src/export/booklet.rs b/crates/pdf/src/export/booklet.rs
new file mode 100644
index 000000000..bc2138623
--- /dev/null
+++ b/crates/pdf/src/export/booklet.rs
@@ -0,0 +1,174 @@
+use super::common::{tf, to_path};
+use super::images::ImageContentCache;
+use super::metadata::file_info_metadata;
+use super::pipeline::print_color;
+use super::*;
+
+/// One PDF from several (a book's documents), every page carried over as vectors; each part
+/// comes with its pages' sizes (points).
+pub fn merge_pdfs(parts: &[(Vec<u8>, Vec<(f32, f32)>)], title: Option<&str>) -> Result<Vec<u8>> {
+    write::guard(|| merge_pdfs_inner(parts, title))
+}
+
+fn merge_pdfs_inner(parts: &[(Vec<u8>, Vec<(f32, f32)>)], title: Option<&str>) -> Result<Vec<u8>> {
+    let metadata = Metadata { creator: "DesignCraft".into(), producer: "DesignCraft".into(), title: title.map(str::to_owned), ..Default::default() };
+    let mut writer = Writer::new(krilla::SerializeSettings::default(), metadata);
+    let pdf = writer.document_mut();
+    let mut pages = 0;
+    let mut has_optional_content = false;
+    for (bytes, sizes) in parts {
+        let variant = crate::optional_content::prepare(&Arc::new(bytes.clone()), None)?;
+        has_optional_content |= !sizes.is_empty() && variant.has_optional_content;
+        let src = krilla::pdf::Pdf::new(variant.data).map_err(|e| PdfError::Write(format!("{e:?}")))?;
+        let doc = krilla::pdf::PdfDocument::new(Arc::new(src));
+        for (i, &(w, h)) in sizes.iter().enumerate() {
+            let size = Size::from_wh(w.max(1.0), h.max(1.0)).ok_or(PdfError::NoPages)?;
+            let mut page = pdf.start_page_with(PageSettings::new(size));
+            let mut s = page.surface();
+            #[cfg(all(test, not(target_arch = "wasm32")))]
+            unwind_tests::inject(&mut s);
+            s.draw_pdf_page(&doc, size, i);
+            s.finish();
+            page.finish();
+            pages += 1;
+        }
+    }
+    if pages == 0 {
+        return Err(PdfError::NoPages);
+    }
+    let bytes = writer.finish().map_err(PdfError::from)?;
+    if has_optional_content { crate::optional_content::register(&bytes) } else { Ok(bytes) }
+}
+
+/// File › Print Booklet: how pages pair up on printer spreads.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub enum BookletKind {
+    /// Folded and stapled: pages padded to a multiple of 4, outer pages together.
+    #[default]
+    SaddleStitch,
+    /// Two pages side by side in reading order.
+    TwoUpConsecutive,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct BookletOptions {
+    pub kind: BookletKind,
+    /// Gap between the two pages of a printer spread (points).
+    pub space_between: f64,
+    pub title: Option<String>,
+}
+
+/// The printer spreads for `n` pages: (left, right) absolute page indices, `None` = blank.
+pub fn booklet_pairs(n: usize, kind: BookletKind) -> Vec<(Option<usize>, Option<usize>)> {
+    let page = |i: usize| (i < n).then_some(i);
+    match kind {
+        BookletKind::TwoUpConsecutive => (0..n.div_ceil(2)).map(|k| (page(2 * k), page(2 * k + 1))).collect(),
+        BookletKind::SaddleStitch => {
+            let m = n.div_ceil(4).max(1) * 4;
+            (0..m / 2).map(|i| if i % 2 == 0 { (page(m - 1 - i), page(i)) } else { (page(i), page(m - 1 - i)) }).collect()
+        }
+    }
+}
+
+/// An imposed PDF: two document pages per sheet, in booklet order.
+pub fn export_booklet(doc: &Document, cache: &Cache, opts: &BookletOptions) -> Result<ExportReport> {
+    write::guard(|| export_booklet_inner(doc, cache, opts))
+}
+
+fn export_booklet_inner(doc: &Document, cache: &Cache, opts: &BookletOptions) -> Result<ExportReport> {
+    let n = doc.page_count();
+    if n == 0 {
+        return Err(PdfError::NoPages);
+    }
+    let pdf_opts = PdfOptions { title: opts.title.clone(), ..PdfOptions::default() };
+    let mut warnings = Vec::new();
+    let base = if print_color(doc, &pdf_opts) {
+        let (settings, warning) = crate::pdfx::print_settings(false)?;
+        warnings.extend(warning);
+        settings
+    } else {
+        krilla::SerializeSettings::default()
+    };
+    let settings = krilla::SerializeSettings { compress_content_streams: true, ..base };
+    let metadata = file_info_metadata(doc, opts.title.as_deref(), None);
+    let mut writer = Writer::new(settings, metadata);
+    let pdf = writer.document_mut();
+    let mut ex = Exporter {
+        drawing_items: Vec::new(),
+        inks: crate::inks::ink_set(doc),
+        doc,
+        cache,
+        composed: HashMap::new(),
+        opts: &pdf_opts,
+        clip: Rect::ZERO,
+        warnings,
+        images: HashMap::new(),
+        images_by_content: ImageContentCache::default(),
+        #[cfg(test)]
+        image_conversions: 0,
+        pdfs: HashMap::new(),
+        variants: HashMap::new(),
+        has_optional_content: false,
+        #[cfg(test)]
+        pdf_preparations: 0,
+        layer_error: None,
+        // krilla's default.
+        version: PdfVersion::Pdf17,
+        too_new: Vec::new(),
+        svgs: HashMap::new(),
+        fonts: HashMap::new(),
+        reverse_cmaps: HashMap::new(),
+        rgb_only: false,
+        tags: Vec::new(),
+        story_tags: HashMap::new(),
+        tag_story: None,
+        text_area: None,
+        para_tags: HashMap::new(),
+    };
+    let pairs = booklet_pairs(n, opts.kind);
+    // Sheet size from the largest page.
+    let (mut pw, mut ph) = (0.0f64, 0.0f64);
+    for i in 0..n {
+        if let Some((si, pi)) = doc.page_loc(i) {
+            let p = &doc.spreads[si].pages[pi];
+            pw = pw.max(p.width);
+            ph = ph.max(p.height);
+        }
+    }
+    let gap = opts.space_between.max(0.0);
+    let size = Size::from_wh((2.0 * pw + gap) as f32, ph as f32).ok_or(PdfError::NoPages)?;
+    for (left, right) in &pairs {
+        let mut page = pdf.start_page_with(PageSettings::new(size));
+        let mut s = page.surface();
+        #[cfg(all(test, not(target_arch = "wasm32")))]
+        unwind_tests::inject(&mut s);
+        for (slot, abs) in [(0.0, left), (pw + gap, right)] {
+            let Some((si, pi)) = abs.and_then(|a| doc.page_loc(a)) else { continue };
+            let p = &doc.spreads[si].pages[pi];
+            let r = Rect::new(p.x, 0.0, p.x + p.width, p.height);
+            // Pages narrower than the slot sit against the fold.
+            let dx = if slot == 0.0 { pw - p.width } else { 0.0 };
+            s.push_transform(&tf(Affine::translate((slot + dx - p.x, (ph - p.height) / 2.0))));
+            ex.clip = r;
+            if let Some(clip) = to_path(&r.to_path(0.1)) {
+                s.push_clip_path(&clip, &FillRule::NonZero);
+                ex.spread(&mut s, si);
+                s.pop();
+            }
+            s.pop();
+        }
+        s.finish();
+        page.finish();
+    }
+    ex.check_placed_versions()?;
+    if let Some(error) = ex.layer_error {
+        return Err(error);
+    }
+    let mut bytes = writer.finish().map_err(PdfError::from)?;
+    if ex.has_optional_content {
+        bytes = crate::optional_content::register(&bytes)?;
+    }
+    let mut warnings = ex.warnings;
+    warnings.dedup();
+    Ok(ExportReport { bytes, pages: pairs.len(), warnings })
+}
diff --git a/crates/pdf/src/export/common.rs b/crates/pdf/src/export/common.rs
new file mode 100644
index 000000000..53bcf8165
--- /dev/null
+++ b/crates/pdf/src/export/common.rs
@@ -0,0 +1,166 @@
+use super::*;
+
+pub(super) enum TagEntry {
+    Story(designcraft_doc::StoryId),
+    Figure(TagGroup),
+}
+
+pub(crate) fn tf(a: Affine) -> Transform {
+    let c = a.as_coeffs();
+    Transform::from_row(c[0] as f32, c[1] as f32, c[2] as f32, c[3] as f32, c[4] as f32, c[5] as f32)
+}
+
+pub(crate) fn to_path(bp: &BezPath) -> Option<Path> {
+    let mut pb = PathBuilder::new();
+    for el in bp.elements() {
+        match *el {
+            PathEl::MoveTo(p) => pb.move_to(p.x as f32, p.y as f32),
+            PathEl::LineTo(p) => pb.line_to(p.x as f32, p.y as f32),
+            PathEl::QuadTo(a, p) => pb.quad_to(a.x as f32, a.y as f32, p.x as f32, p.y as f32),
+            PathEl::CurveTo(a, b, p) => pb.cubic_to(a.x as f32, a.y as f32, b.x as f32, b.y as f32, p.x as f32, p.y as f32),
+            PathEl::ClosePath => pb.close(),
+        }
+    }
+    pb.finish()
+}
+
+pub(crate) fn norm(v: f32) -> NormalizedF32 {
+    NormalizedF32::new(if v.is_finite() { v.clamp(0.0, 1.0) } else { 1.0 }).unwrap_or(NormalizedF32::ONE)
+}
+
+pub(crate) fn q(v: f32) -> u8 {
+    (v.clamp(0.0, 1.0) * 255.0).round() as u8
+}
+
+pub(crate) fn regular(c: &Color, rgb_only: bool) -> krilla::color::RegularColor {
+    use krilla::color::RegularColor as R;
+    if rgb_only && matches!(c, Color::Cmyk { .. }) {
+        let [r, g, b] = c.to_rgb();
+        return R::Rgb(rgb::Color::new(q(r), q(g), q(b)));
+    }
+    match *c {
+        Color::Rgb { r, g, b } => R::Rgb(rgb::Color::new(q(r), q(g), q(b))),
+        Color::Cmyk { c, m, y, k } => R::Cmyk(cmyk::Color::new(q(c), q(m), q(y), q(k))),
+        // DesignCraft grey is ink coverage (0 = white); PDF DeviceGray is lightness.
+        Color::Gray { k } => R::Luma(luma::Color::new(q(1.0 - k))),
+    }
+}
+
+/// A process colour in its own device space (CMYK → DeviceCMYK, RGB → DeviceRGB, Gray → DeviceGray).
+/// `rgb_only` converts CMYK to RGB (PDF/A without a CMYK output profile).
+pub(crate) fn device(c: &Color, rgb_only: bool) -> krilla::color::Color {
+    match regular(c, rgb_only) {
+        krilla::color::RegularColor::Rgb(v) => v.into(),
+        krilla::color::RegularColor::Cmyk(v) => v.into(),
+        krilla::color::RegularColor::Luma(v) => v.into(),
+    }
+}
+
+/// `[Registration]` prints on every plate: `/Separation /All`.
+pub(crate) fn registration(tint: f32, rgb_only: bool) -> krilla::color::Color {
+    use krilla::color::separation::{Color as SepColor, SeparationColorant, SeparationSpace};
+    let alt = regular(&Color::cmyk(1.0, 1.0, 1.0, 1.0), rgb_only);
+    SepColor::new(q(tint), SeparationSpace::new(SeparationColorant::AllColorants, alt)).into()
+}
+
+pub(super) fn blend(b: DcBlend) -> krilla::blend::BlendMode {
+    use krilla::blend::BlendMode as K;
+    match b {
+        DcBlend::Normal => K::Normal,
+        DcBlend::Darken => K::Darken,
+        DcBlend::Multiply => K::Multiply,
+        DcBlend::ColorBurn => K::ColorBurn,
+        DcBlend::Lighten => K::Lighten,
+        DcBlend::Screen => K::Screen,
+        DcBlend::ColorDodge => K::ColorDodge,
+        DcBlend::Overlay => K::Overlay,
+        DcBlend::SoftLight => K::SoftLight,
+        DcBlend::HardLight => K::HardLight,
+        DcBlend::Difference => K::Difference,
+        DcBlend::Exclusion => K::Exclusion,
+        DcBlend::Hue => K::Hue,
+        DcBlend::Saturation => K::Saturation,
+        DcBlend::Color => K::Color,
+        DcBlend::Luminosity => K::Luminosity,
+    }
+}
+
+pub(super) fn rects_overlap(a: Rect, b: Rect) -> bool {
+    a.x0 <= b.x1 && b.x0 <= a.x1 && a.y0 <= b.y1 && b.y0 <= a.y1
+}
+
+pub(crate) fn solid_fill(c: krilla::color::Color, opacity: f32) -> Fill {
+    Fill { paint: c.into(), opacity: norm(opacity), rule: FillRule::NonZero }
+}
+
+impl Exporter<'_> {
+    /// A print document, or a PDF/X file (whose output intent is CMYK).
+    pub(crate) fn for_print(&self) -> bool {
+        self.doc.settings.intent == designcraft_doc::Intent::Print || self.opts.standard.is_pdfx()
+    }
+
+    /// Whether a paint overprints: its own attribute, or 100% [Black] when Preferences ›
+    /// Appearance of Black overprints it (not in PDF/A, whose RGB output has no overprint).
+    pub(crate) fn overprints(&self, swatch: &str, tint: f32, flag: bool) -> bool {
+        flag || (!self.rgb_only && self.doc.settings.overprint_black && swatch == designcraft_color::swatch::BLACK && tint >= 0.999)
+    }
+
+    /// Overprint for what is painted until the matching pop: `/op` for fills, `/OP` for strokes,
+    /// and `/OPM 1`, so a CMYK paint's zero components leave the inks beneath it alone. Returns
+    /// whether it pushed. PDF/A exports are RGB and leave overprint out.
+    pub(crate) fn push_overprint(&mut self, s: &mut Surface, fill: bool, stroke: bool) -> bool {
+        if !fill && !stroke {
+            return false;
+        }
+        if self.rgb_only {
+            self.warn("PDF/A: overprint was left out");
+            return false;
+        }
+        s.push_overprint(krilla::blend::Overprint { fill, stroke, nonzero: true });
+        true
+    }
+
+    pub(crate) fn warn(&mut self, w: impl Into<String>) {
+        let w = w.into();
+        if !self.warnings.contains(&w) {
+            self.warnings.push(w);
+        }
+    }
+
+    /// A swatch + tint as a PDF colour: spot swatches (and tints of them) become `/Separation`
+    /// with the swatch's values as the alternate space; process colours stay in their device space.
+    pub(crate) fn swatch_color(&self, name: &str, tint: f32) -> Option<krilla::color::Color> {
+        use krilla::color::separation::{Color as SepColor, SeparationColorant, SeparationSpace};
+        let mut n = name;
+        let mut t = tint;
+        for _ in 0..8 {
+            let sw = self.doc.swatch(n)?;
+            match &sw.value {
+                SwatchValue::None => return None,
+                // [Paper] prints no ink (it knocks out what lies below); its colour is only what
+                // the screen shows. Written as RGB white (`1 1 1 rg`) it would put DeviceRGB in a
+                // CMYK print file.
+                SwatchValue::Paper { .. } if self.for_print() => return Some(device(&Color::cmyk(0.0, 0.0, 0.0, 0.0), self.rgb_only)),
+                SwatchValue::Tint { base, tint: bt } => {
+                    t *= bt;
+                    n = base;
+                }
+                SwatchValue::Registration => return Some(registration(t, self.rgb_only)),
+                SwatchValue::Color { color: _, color_type: ColorType::Spot } => {
+                    // Ink Manager: an alias prints on another ink; converted inks go to process.
+                    let (ink, process) = crate::inks::spot_output(self.doc, &self.inks, &sw.name);
+                    let target =
+                        self.doc.swatch(ink).filter(|w| matches!(w.value, SwatchValue::Color { color_type: ColorType::Spot, .. })).unwrap_or(sw);
+                    let SwatchValue::Color { color, .. } = &target.value else { break };
+                    if process {
+                        return Some(device(&designcraft_color::swatch::apply_tint(*color, t), self.rgb_only));
+                    }
+                    let space = SeparationSpace::new(SeparationColorant::Custom(target.name.clone()), regular(color, self.rgb_only));
+                    return Some(SepColor::new(q(t), space).into());
+                }
+                _ => break,
+            }
+        }
+        self.doc.resolve_color(name, tint).map(|c| device(&c, self.rgb_only))
+    }
+}
diff --git a/crates/pdf/src/export/graphics.rs b/crates/pdf/src/export/graphics.rs
new file mode 100644
index 000000000..96780de32
--- /dev/null
+++ b/crates/pdf/src/export/graphics.rs
@@ -0,0 +1,354 @@
+use super::common::{device, tf, to_path};
+use super::images::{CMYK_FALLBACK_WARNING, ConvertedImage, RasterMode, cmyk_tiff, embedded_icc, jpeg, lossless, recompress};
+use super::pipeline::{relabel_catalog_version, relabel_pdf_header};
+use super::*;
+
+impl Exporter<'_> {
+    /// A placed PDF as krilla embeds it. krilla refuses a PDF newer than the file it writes (the
+    /// export fails at the end with `VersionMismatch(Pdf17)`), and PDF/X-4 is PDF 1.6 while
+    /// VectorCraft and most tools write 1.7. PDF 1.7 changed nothing in how a page draws, so a 1.7
+    /// file goes in as 1.6 (its header and catalog `/Version` relabelled, as
+    /// `qpdf --force-version=1.6` does). A newer
+    /// file is left out and the export fails naming it ([`Exporter::check_placed_versions`]).
+    /// Returns the document with its page count.
+    fn placed_pdf(&mut self, asset: &designcraft_doc::Asset, data: Arc<Vec<u8>>) -> Option<(krilla::pdf::PdfDocument, usize)> {
+        use hayro_syntax::PdfVersion as V;
+        let Ok(pdf) = krilla::pdf::Pdf::new(data.clone()) else {
+            self.warn(format!("{}: can't read the placed PDF", asset.name));
+            return None;
+        };
+        let max = match self.version {
+            PdfVersion::Pdf14 => V::Pdf14,
+            PdfVersion::Pdf15 => V::Pdf15,
+            PdfVersion::Pdf16 => V::Pdf16,
+            PdfVersion::Pdf17 => V::Pdf17,
+            PdfVersion::Pdf20 => V::Pdf20,
+        };
+        let have = pdf.version();
+        if have <= max {
+            let pages = pdf.pages().len();
+            return Some((krilla::pdf::PdfDocument::new(Arc::new(pdf)), pages));
+        }
+        if have == V::Pdf17
+            && max == V::Pdf16
+            && let bytes = relabel_pdf_header(&data, b"%PDF-1.7", b"%PDF-1.6").unwrap_or_else(|| data.to_vec())
+            && let Ok(pdf) = krilla::pdf::Pdf::new(Arc::new(relabel_catalog_version(bytes)))
+            && pdf.version() <= max
+        {
+            self.warn(format!("{}: a PDF 1.7 placed in a PDF 1.6 file, embedded as PDF 1.6", asset.name));
+            let pages = pdf.pages().len();
+            return Some((krilla::pdf::PdfDocument::new(Arc::new(pdf)), pages));
+        }
+        let v = match have {
+            V::Pdf17 => "PDF 1.7",
+            V::Pdf20 => "PDF 2.0",
+            _ => "a newer PDF",
+        };
+        self.too_new.push(format!("{} is {v}", asset.name));
+        None
+    }
+
+    /// Fail with the names of placed PDFs too new for this export (see [`Exporter::placed_pdf`]).
+    pub(super) fn check_placed_versions(&self) -> Result<()> {
+        if self.too_new.is_empty() {
+            return Ok(());
+        }
+        let v = self.version.as_str();
+        Err(PdfError::Write(format!(
+            "a placed PDF is newer than the {v} this export writes ({}): save it as {v} or older and place it again",
+            self.too_new.join(", ")
+        )))
+    }
+
+    pub(super) fn load_image(&mut self, id: AssetId) -> Option<Image> {
+        if let Some(i) = self.images.get(&id) {
+            return i.clone();
+        }
+        let asset = self.doc.assets.get(&id)?.clone();
+        // Use the same EPS preview as the renderer, preserving CMYK TIFF inks below. The
+        // content cache is keyed on the bytes actually converted, so equal previews share one.
+        let data = if designcraft_images::is_eps(&asset.data) {
+            let Some((proxy, _)) = designcraft_images::eps_proxy(&asset.data) else {
+                self.warn(format!("image `{}` could not be decoded and was skipped", asset.name));
+                self.images.insert(id, None);
+                return None;
+            };
+            Arc::new(proxy)
+        } else {
+            asset.data.clone()
+        };
+        if let Some(converted) = self.images_by_content.get(&data).cloned() {
+            if let Some(warning) = converted.warning {
+                self.warn(format!("{}: {warning}", asset.name));
+            }
+            self.images.insert(id, Some(converted.image.clone()));
+            return Some(converted.image);
+        }
+        let fmt = image::guess_format(&data).ok();
+        #[cfg(test)]
+        {
+            self.image_conversions += 1;
+        }
+        let mut warning = None;
+        let mode = RasterMode::for_standard(self.opts.standard);
+        let img = match fmt {
+            Some(image::ImageFormat::Jpeg) => jpeg(data.clone().into(), || embedded_icc(&data), mode),
+            // A CMYK TIFF keeps its ink values (`image` decodes it to RGB, and 100% K would print
+            // as four-colour black). PDF/A exports are RGB only.
+            Some(image::ImageFormat::Tiff) if !self.rgb_only && designcraft_images::is_cmyk_tiff(&data) => match cmyk_tiff(&data, mode) {
+                Some(img) => Some(img),
+                None => {
+                    warning = Some(CMYK_FALLBACK_WARNING);
+                    self.warn(format!("{}: {CMYK_FALLBACK_WARNING}", asset.name));
+                    lossless(&data, fmt, mode)
+                }
+            },
+            _ if self.opts.compress_images => recompress(&data, mode).or_else(|| lossless(&data, fmt, mode)),
+            _ => lossless(&data, fmt, mode),
+        };
+        if img.is_none() {
+            if data.is_empty() {
+                // A linked file that wasn't found when the document was opened: nothing to decode.
+                let at = asset.link.as_deref().map(|l| format!(" ({l})")).unwrap_or_default();
+                self.warn(format!("image `{}` is missing{at} and was skipped", asset.name));
+            } else {
+                self.warn(format!("image `{}` could not be decoded and was skipped", asset.name));
+            }
+        }
+        if let Some(image) = &img {
+            // Share the original encoded payload. HashMap checks exact bytes after hashing,
+            // so collisions cannot merge distinct images or their diagnostics.
+            self.images_by_content.insert(data, ConvertedImage { image: image.clone(), warning });
+        }
+        self.images.insert(id, img.clone());
+        img
+    }
+
+    /// Draw a placed graphic, inside its clipping path when it has one. `hidden` is the
+    /// placed PDF's layer choice: `None` keeps the file's defaults, `Some(&[])` shows every layer.
+    /// Retained IDML graphic-layer options are not applied when drawing, so they warn here.
+    pub(crate) fn graphic(&mut self, s: &mut Surface, g: &designcraft_doc::Graphic, hidden: Option<&[String]>) {
+        if g.layer_options.as_ref().is_some_and(designcraft_doc::GraphicLayerOptions::has_visibility_overrides) {
+            self.warn(designcraft_doc::GRAPHIC_LAYER_RENDERING_WARNING);
+        }
+        match g.clip_region().map(|(region, even_odd)| (to_path(&region), even_odd)) {
+            Some((Some(clip), even_odd)) => {
+                s.push_clip_path(&clip, if even_odd { &FillRule::EvenOdd } else { &FillRule::NonZero });
+                self.graphic_unclipped(s, g, hidden);
+                s.pop();
+            }
+            // A degenerate outline shows nothing, or everything when inverted.
+            Some((None, even_odd)) => {
+                if even_odd {
+                    self.graphic_unclipped(s, g, hidden);
+                }
+            }
+            None => self.graphic_unclipped(s, g, hidden),
+        }
+    }
+
+    pub(super) fn graphic_unclipped(&mut self, s: &mut Surface, g: &designcraft_doc::Graphic, hidden: Option<&[String]>) {
+        if self.graphic_media_placeholder(s, g) || self.graphic_placed_pdf(s, g, hidden) || self.graphic_placed_svg(s, g) {
+            return;
+        }
+        if self.colorized(s, g) {
+            return;
+        }
+        let Some(img) = self.load_image(g.asset) else { return };
+        let Some(size) = Size::from_wh(g.size.0.max(1e-3) as f32, g.size.1.max(1e-3) as f32) else { return };
+        s.push_transform(&tf(g.xf));
+        s.draw_image(img, size);
+        s.pop();
+    }
+
+    /// Video or sound without a poster: a dark frame with a play mark. `false` when `g` is not one.
+    fn graphic_media_placeholder(&self, s: &mut Surface, g: &designcraft_doc::Graphic) -> bool {
+        let Some(asset) = self.doc.assets.get(&g.asset) else { return false };
+        if designcraft_doc::media_kind(&asset.mime).is_none() {
+            return false;
+        }
+        let (w, h) = g.size;
+        let (cx, cy, r) = (w / 2.0, h / 2.0, w.min(h) * 0.18);
+        let mut tri = BezPath::new();
+        tri.move_to((cx - r * 0.6, cy - r));
+        tri.line_to((cx + r, cy));
+        tri.line_to((cx - r * 0.6, cy + r));
+        tri.close_path();
+        s.push_transform(&tf(g.xf));
+        s.set_stroke(None);
+        for (bp, c) in [(Rect::new(0.0, 0.0, w, h).to_path(0.1), rgb::Color::new(48, 48, 52)), (tri, rgb::Color::new(235, 235, 235))] {
+            if let Some(p) = to_path(&bp) {
+                s.set_fill(Some(Fill { paint: c.into(), ..Default::default() }));
+                s.draw_path(&p);
+            }
+        }
+        s.set_fill(None);
+        s.pop();
+        true
+    }
+
+    /// A placed PDF goes in as vectors (the page as a form XObject). `false` when `g` is not one.
+    fn graphic_placed_pdf(&mut self, s: &mut Surface, g: &designcraft_doc::Graphic, hidden: Option<&[String]>) -> bool {
+        let doc = self.doc;
+        let Some(asset) = doc.assets.get(&g.asset).filter(|asset| asset.data.starts_with(b"%PDF")) else { return false };
+        // Cropped to a box: the whole page, placed so that the box spans graphic space.
+        let shown = asset.shown_box();
+        let [l, t, r, b] = shown.unwrap_or([0.0, 0.0, 1.0, 1.0]);
+        let (page_w, page_h) = (g.size.0 / (r - l), g.size.1 / (b - t));
+        let Some(size) = Size::from_wh(page_w.max(1e-3) as f32, page_h.max(1e-3) as f32) else { return true };
+        let request = (g.asset, hidden.map(<[String]>::to_vec));
+        let variant = match self.variants.get(&request) {
+            Some(variant) => variant.clone(),
+            None => {
+                #[cfg(test)]
+                {
+                    self.pdf_preparations += 1;
+                }
+                match crate::optional_content::prepare(&asset.data, hidden) {
+                    Ok(variant) => {
+                        self.variants.insert(request, variant.clone());
+                        variant
+                    }
+                    Err(error) => {
+                        let message = match error {
+                            PdfError::Write(message) => message,
+                            other => other.to_string(),
+                        };
+                        self.layer_error.get_or_insert(PdfError::Write(format!("{}: {message}", asset.name)));
+                        return true;
+                    }
+                }
+            }
+        };
+        if let Some(warning) = variant.warning {
+            self.warn(format!("{}: {warning}", asset.name));
+        }
+        let key = (g.asset, variant.hidden);
+        let placed = match self.pdfs.get(&key) {
+            Some(p) => p.clone(),
+            None => {
+                let p = self.placed_pdf(asset, variant.data);
+                self.pdfs.insert(key, p.clone());
+                p
+            }
+        };
+        match placed {
+            // krilla would fail the whole export at the end on a page the PDF doesn't have.
+            Some((_, pages)) if asset.page as usize >= pages => {
+                self.warn(format!("{}: the placed PDF has no page {}", asset.name, u64::from(asset.page) + 1));
+            }
+            Some((placed, _)) => {
+                self.has_optional_content |= variant.has_optional_content;
+                s.push_transform(&tf(g.xf));
+                let clip = shown.and_then(|_| to_path(&Rect::new(0.0, 0.0, g.size.0, g.size.1).to_path(0.1)));
+                if let Some(clip) = &clip {
+                    s.push_clip_path(clip, &FillRule::NonZero);
+                }
+                s.push_transform(&tf(Affine::translate((-l * page_w, -t * page_h))));
+                s.draw_pdf_page(&placed, size, asset.page as usize);
+                s.pop();
+                if clip.is_some() {
+                    s.pop();
+                }
+                s.pop();
+            }
+            None => {}
+        }
+        true
+    }
+
+    /// A placed SVG goes in as vectors too. `false` when `g` is not one.
+    fn graphic_placed_svg(&mut self, s: &mut Surface, g: &designcraft_doc::Graphic) -> bool {
+        let Some(asset) = self.doc.assets.get(&g.asset).filter(|asset| designcraft_images::is_svg(&asset.data)) else { return false };
+        let Some(size) = Size::from_wh(g.size.0.max(1e-3) as f32, g.size.1.max(1e-3) as f32) else { return true };
+        let tree = self.svgs.entry(g.asset).or_insert_with(|| designcraft_images::svg_tree(&asset.data).map(Arc::new)).clone();
+        match tree {
+            Some(tree) => {
+                use krilla_svg::SurfaceExt;
+                s.push_transform(&tf(g.xf));
+                if s.draw_svg(&tree, size, krilla_svg::SvgSettings::default()).is_none() {
+                    self.warn(format!("{}: parts of the placed SVG could not be drawn", asset.name));
+                }
+                s.pop();
+            }
+            None => self.warn(format!("{}: can't read the placed SVG", asset.name)),
+        }
+        true
+    }
+
+    /// A greyscale or bitmap image coloured by the swatch applied to it (#1094): the swatch is
+    /// painted through the image's ink coverage (its darkness), over 0% ink for a greyscale
+    /// image, whose white is opaque. `false`, drawing nothing, when the image keeps its own
+    /// colours: no swatch, one that no longer exists, a colour image.
+    fn colorized(&mut self, s: &mut Surface, g: &designcraft_doc::Graphic) -> bool {
+        if g.fill.is_none() {
+            return false;
+        }
+        let Some(asset) = self.doc.assets.get(&g.asset) else { return false };
+        let Some(tone) = designcraft_images::tone(&asset.data) else { return false };
+        let Some(paint) = self.swatch_color(&g.fill.swatch, g.fill.tint) else { return false };
+        let Some(coverage) = designcraft_images::decode_rgba(&asset.data).and_then(|img| CoverageImage::new(&img)) else { return false };
+        let interpolate = RasterMode::for_standard(self.opts.standard).interpolate;
+        let Ok(mask) = Image::from_custom(coverage, interpolate) else { return false };
+        let size = Size::from_wh(g.size.0.max(1e-3) as f32, g.size.1.max(1e-3) as f32);
+        let (Some(size), Some(rect)) = (size, to_path(&Rect::new(0.0, 0.0, g.size.0, g.size.1).to_path(0.1))) else { return false };
+        s.push_transform(&tf(g.xf));
+        if tone == designcraft_images::Tone::Gray {
+            let blank =
+                self.swatch_color(designcraft_color::swatch::PAPER, 1.0).unwrap_or_else(|| device(&Color::cmyk(0.0, 0.0, 0.0, 0.0), self.rgb_only));
+            s.set_fill(Some(Fill { paint: blank.into(), ..Default::default() }));
+            s.draw_path(&rect);
+        }
+        let mut sb = s.stream_builder();
+        let mut ms = sb.surface();
+        ms.draw_image(mask, size);
+        ms.finish();
+        let stream = sb.finish();
+        s.push_mask(krilla::mask::Mask::new(stream, krilla::mask::MaskType::Luminosity));
+        s.set_fill(Some(Fill { paint: paint.into(), ..Default::default() }));
+        s.draw_path(&rect);
+        s.pop();
+        s.set_fill(None);
+        s.pop();
+        true
+    }
+}
+
+/// `paint` through `mask`'s coverage, a luminosity mask: the color's own inks (spot, process),
+/// never an RGB raster. The shadow multiplies with what is beneath it, as InDesign's drop shadow
+/// does by default (the shadow model has no blend mode of its own), so a spot under a black
+/// shadow keeps its full ink.
+pub(super) fn draw_coverage(s: &mut Surface, mask: &crate::ShadowMask, paint: krilla::color::Color) {
+    let r = mask.rect;
+    let (Some(size), Some(rect), Some(image)) = (
+        Size::from_wh(r.width().max(1e-3) as f32, r.height().max(1e-3) as f32),
+        to_path(&r.to_path(0.1)),
+        CoverageImage::from_grey(mask.coverage.clone(), (mask.width, mask.height)),
+    ) else {
+        return;
+    };
+    let Ok(image) = Image::from_custom(image, false) else { return };
+    let mut sb = s.stream_builder();
+    let mut ms = sb.surface();
+    ms.push_transform(&tf(Affine::translate((r.x0, r.y0))));
+    ms.draw_image(image, size);
+    ms.pop();
+    ms.finish();
+    let stream = sb.finish();
+    s.push_blend_mode(krilla::blend::BlendMode::Multiply);
+    s.push_mask(krilla::mask::Mask::new(stream, krilla::mask::MaskType::Luminosity));
+    s.set_stroke(None);
+    s.set_fill(Some(Fill { paint: paint.into(), ..Default::default() }));
+    s.draw_path(&rect);
+    s.set_fill(None);
+    s.pop();
+    s.pop();
+}
+
+/// The ink coverage of a greyscale or bitmap image (255 = black, 0 = white or transparent) as a
+/// DeviceGray image, painted into a luminosity mask.
+#[derive(Clone, Hash)]
+pub(super) struct CoverageImage {
+    pub(super) grey: Arc<Vec<u8>>,
+    pub(super) size: (u32, u32),
+}
diff --git a/crates/pdf/src/export/images.rs b/crates/pdf/src/export/images.rs
new file mode 100644
index 000000000..a164a6948
--- /dev/null
+++ b/crates/pdf/src/export/images.rs
@@ -0,0 +1,538 @@
+#[cfg(test)]
+use super::metadata::civil;
+#[cfg(test)]
+use super::pipeline::export_pdf_with_report;
+#[cfg(test)]
+use super::{
+    Affine, AssetId, Cache, Content, Document, Exporter, Item, PageSettings, PdfOptions, PdfVersion, Rect, Size, Standard, Writer, registration_tests,
+};
+use super::{Image, krilla};
+use std::collections::HashMap;
+use std::sync::Arc;
+
+/// A successful conversion and its name-independent diagnostic. Replayed once for each asset.
+#[derive(Clone)]
+pub(super) struct ConvertedImage {
+    pub(super) image: Image,
+    pub(super) warning: Option<&'static str>,
+}
+
+pub(super) const CMYK_FALLBACK_WARNING: &str =
+    "converted to RGB (a CMYK TIFF that is planar, has premultiplied alpha, uses other inks or is over 256 MiB)";
+
+#[cfg(not(test))]
+pub(super) type ImageContentCache = HashMap<Arc<Vec<u8>>, ConvertedImage>;
+
+// Unit tests force collisions through the real cache path; production keeps RandomState.
+#[cfg(test)]
+pub(super) type ImageContentCache = HashMap<Arc<Vec<u8>>, ConvertedImage, std::hash::BuildHasherDefault<ConstantImageHasher>>;
+
+#[cfg(test)]
+#[derive(Default)]
+pub(super) struct ConstantImageHasher;
+
+/// The sRGB profile (ICC v2.1) that untagged RGB images carry in PDF/X-4.
+pub(crate) static SRGB_ICC: &[u8] = include_bytes!("../../../../assets/icc/sRGB-v2-magic.icc");
+
+/// How raster images are written for the export's standard.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(super) struct RasterMode {
+    /// `/Interpolate true`: smoother upscaling in viewers. PDF/X-4 and PDF/A don't allow it.
+    pub(super) interpolate: bool,
+    /// Give RGB images with no ICC profile of their own the sRGB profile: under PDF/X-4's CMYK
+    /// output intent, RGB must be colour-managed.
+    pub(super) tag_rgb: bool,
+}
+
+/// The ICC profile embedded in an image file, if it has one.
+pub(super) fn embedded_icc(data: &[u8]) -> Option<Vec<u8>> {
+    use image::ImageDecoder;
+    let mut dec = image::ImageReader::new(std::io::Cursor::new(data)).with_guessed_format().ok()?.into_decoder().ok()?;
+    dec.icc_profile().ok().flatten()
+}
+
+/// Whether an ICC profile describes RGB (its colour space signature, header bytes 16 to 20).
+fn is_rgb_icc(icc: &[u8]) -> bool {
+    icc.get(16..20) == Some(b"RGB ".as_slice())
+}
+
+/// Whether an ICC profile describes grey.
+pub(super) fn is_grey_icc(icc: &[u8]) -> bool {
+    icc.get(16..20) == Some(b"GRAY".as_slice())
+}
+
+/// Whether `data` decodes to grey (with or without alpha), read from its header.
+pub(super) fn is_grey(data: &[u8]) -> bool {
+    use image::ImageDecoder;
+    image::ImageReader::new(std::io::Cursor::new(data))
+        .with_guessed_format()
+        .ok()
+        .and_then(|r| r.into_decoder().ok())
+        .is_some_and(|dec| !dec.color_type().has_color())
+}
+
+/// A JPEG, passed through. With `tag_rgb`, a JPEG keeps its own profile, and one without gets
+/// sRGB. krilla uses a profile only when its channels match the JPEG's, so a grey or CMYK JPEG
+/// without a profile stays DeviceGray or DeviceCMYK.
+pub(super) fn jpeg(data: krilla::Data, icc: impl FnOnce() -> Option<Vec<u8>>, mode: RasterMode) -> Option<Image> {
+    if !mode.tag_rgb {
+        return Image::from_jpeg(data, mode.interpolate).ok();
+    }
+    let icc: krilla::Data = match icc() {
+        Some(own) => own.into(),
+        None => SRGB_ICC.into(),
+    };
+    Image::from_jpeg_with_icc(data, Some(icc), mode.interpolate).ok()
+}
+
+/// Whether krilla would write this PNG, GIF or WebP as untagged RGB: not grey, and no profile of
+/// its own.
+fn untagged_rgb(data: &[u8]) -> bool {
+    use image::ImageDecoder;
+    let Some(mut dec) = image::ImageReader::new(std::io::Cursor::new(data)).with_guessed_format().ok().and_then(|r| r.into_decoder().ok()) else {
+        return false;
+    };
+    let grey = matches!(dec.color_type(), image::ColorType::L8 | image::ColorType::La8 | image::ColorType::L16 | image::ColorType::La16);
+    !grey && dec.icc_profile().ok().flatten().is_none()
+}
+
+pub(super) fn lossless(data: &Arc<Vec<u8>>, fmt: Option<image::ImageFormat>, mode: RasterMode) -> Option<Image> {
+    // krilla reads PNG, GIF and WebP lazily: a damaged file is accepted here and fails the whole
+    // export when the PDF is written. Decoding it first means it is skipped, like any other
+    // image that can't be decoded.
+    let rgba = designcraft_images::decode_rgba(data)?;
+    let i = mode.interpolate;
+    let direct = match fmt {
+        Some(image::ImageFormat::Png | image::ImageFormat::Gif | image::ImageFormat::WebP) if mode.tag_rgb && untagged_rgb(data) => None,
+        Some(image::ImageFormat::Png) => Image::from_png(data.clone().into(), i).ok(),
+        Some(image::ImageFormat::Gif) => Image::from_gif(data.clone().into(), i).ok(),
+        Some(image::ImageFormat::WebP) => Image::from_webp(data.clone().into(), i).ok(),
+        _ => None,
+    };
+    direct.or_else(|| {
+        // A grey TIFF, BMP… stays DeviceGray, as a grey PNG or JPEG does (#1426).
+        if let Some(grey) = GreyImage::new(data) {
+            return Image::from_custom(grey, i).ok();
+        }
+        // TIFF, BMP, PSD composites… and, with `tag_rgb`, untagged RGB.
+        if mode.tag_rgb {
+            return SrgbImage::new(rgba).and_then(|img| Image::from_custom(img, i).ok());
+        }
+        let (w, h) = rgba.dimensions();
+        Some(Image::from_rgba8(rgba.into_raw(), w, h))
+    })
+}
+
+/// An RGB raster tagged with the sRGB profile, for PDF/X-4.
+#[derive(Clone, Hash)]
+pub(super) struct SrgbImage {
+    pub(super) rgb: Arc<Vec<u8>>,
+    /// Only when some pixel is not opaque.
+    pub(super) alpha: Option<Arc<Vec<u8>>>,
+    pub(super) size: (u32, u32),
+}
+
+/// A grey raster as a DeviceGray image (ICCBased when the file has a grey profile of its own), so
+/// a page that only holds black prints as black, not as RGB.
+#[derive(Clone, Hash)]
+pub(super) struct GreyImage {
+    pub(super) grey: Arc<Vec<u8>>,
+    /// Only when some pixel is not opaque.
+    pub(super) alpha: Option<Arc<Vec<u8>>>,
+    pub(super) size: (u32, u32),
+    pub(super) icc: Option<Arc<Vec<u8>>>,
+}
+
+/// A CMYK raster as a krilla image: its samples are written unchanged as DeviceCMYK, like a
+/// CMYK JPEG's. An embedded ICC profile is left out, as it is for JPEGs: the inks are meant for
+/// the output intent's press, and tagging them with another CMYK profile would let a RIP
+/// convert 100% K to four-colour black.
+#[derive(Clone, Hash)]
+pub(super) struct CmykImage(pub(super) Arc<designcraft_images::CmykRaster>);
+
+/// A CMYK TIFF as a DeviceCMYK image. `None` when it can't be read as CMYK.
+pub(super) fn cmyk_tiff(data: &[u8], mode: RasterMode) -> Option<Image> {
+    let r = designcraft_images::decode_cmyk_tiff(data)?;
+    // krilla panics when the channel lengths don't match the size.
+    let pixels = usize::try_from(r.width).ok()?.checked_mul(usize::try_from(r.height).ok()?)?;
+    if r.cmyk.len() != pixels.checked_mul(4)? || r.alpha.as_ref().is_some_and(|a| a.len() != pixels) {
+        return None;
+    }
+    Image::from_custom(CmykImage(Arc::new(r)), mode.interpolate).ok()
+}
+
+/// Opaque raster → JPEG (quality 90). `None` when the image has transparency or can't be decoded.
+/// With `tag_rgb`, the JPEG keeps the source's RGB profile, or gets sRGB.
+pub(super) fn recompress(data: &[u8], mode: RasterMode) -> Option<Image> {
+    let img = image::load_from_memory(data).ok()?;
+    if img.color().has_alpha() && img.to_rgba8().pixels().any(|p| p[3] < 255) {
+        return None;
+    }
+    let mut buf = Vec::new();
+    let enc = image::codecs::jpeg::JpegEncoder::new_with_quality(&mut buf, 90);
+    // A grey image stays a grey JPEG (#1426).
+    let grey = !img.color().has_color();
+    if grey {
+        let l = img.to_luma8();
+        image::ImageEncoder::write_image(enc, l.as_raw(), l.width(), l.height(), image::ExtendedColorType::L8).ok()?;
+    } else {
+        let rgb = img.to_rgb8();
+        image::ImageEncoder::write_image(enc, rgb.as_raw(), rgb.width(), rgb.height(), image::ExtendedColorType::Rgb8).ok()?;
+    }
+    jpeg(buf.into(), || embedded_icc(data).filter(|p| if grey { is_grey_icc(p) } else { is_rgb_icc(p) }), mode)
+}
+
+#[cfg(test)]
+mod image_content_cache_tests {
+    use super::*;
+    use designcraft_doc::Asset;
+
+    fn png(w: u32, h: u32, color: [u8; 4]) -> Vec<u8> {
+        let image = image::RgbaImage::from_pixel(w, h, image::Rgba(color));
+        let mut bytes = Vec::new();
+        image.write_to(&mut std::io::Cursor::new(&mut bytes), image::ImageFormat::Png).unwrap();
+        bytes
+    }
+    fn asset(doc: &mut Document, bytes: Vec<u8>, name: &str) -> AssetId {
+        let id = AssetId(doc.alloc());
+        doc.assets.insert(id, Arc::new(Asset { id, name: name.into(), mime: "image/png".into(), data: Arc::new(bytes), ..Default::default() }));
+        id
+    }
+    fn exporter<'a>(doc: &'a Document, cache: &'a Cache, opts: &'a PdfOptions) -> Exporter<'a> {
+        Exporter {
+            drawing_items: Vec::new(),
+            inks: crate::inks::ink_set(doc),
+            doc,
+            cache,
+            composed: HashMap::new(),
+            opts,
+            clip: Rect::ZERO,
+            warnings: Vec::new(),
+            images: HashMap::new(),
+            images_by_content: ImageContentCache::default(),
+            image_conversions: 0,
+            pdfs: HashMap::new(),
+            variants: HashMap::new(),
+            has_optional_content: false,
+            pdf_preparations: 0,
+            layer_error: None,
+            version: PdfVersion::Pdf17,
+            too_new: Vec::new(),
+            svgs: HashMap::new(),
+            fonts: HashMap::new(),
+            reverse_cmaps: HashMap::new(),
+            rgb_only: false,
+            tags: Vec::new(),
+            story_tags: HashMap::new(),
+            tag_story: None,
+            text_area: None,
+            para_tags: HashMap::new(),
+        }
+    }
+    #[test]
+    fn prepared_pdf_variants_reuse_parsing_by_asset_and_hidden_names() {
+        let mut doc = Document::new(&Default::default());
+        let cache = Cache::new();
+        let opts = PdfOptions::default();
+        // One layer, "Hidden", shown by default: hiding it needs a prepared copy, showing it doesn't.
+        let content = "/OC /a BDC 0 0 1 rg 0 0 100 100 re f EMC";
+        let source = registration_tests::assemble(&[
+            "<</Type/Catalog/Pages 2 0 R/OCProperties<</OCGs[5 0 R]>>>>".into(),
+            "<</Type/Pages/Kids[3 0 R]/Count 1>>".into(),
+            "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<</Properties<</a 5 0 R>>>>/Contents 4 0 R>>".into(),
+            format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
+            "<</Type/OCG/Name(Hidden)>>".into(),
+        ]);
+        let a = asset(&mut doc, source.clone(), "a.pdf");
+        let b = asset(&mut doc, source, "b.pdf");
+        let mut ex = exporter(&doc, &cache, &opts);
+        let mut writer = Writer::new(Default::default(), Default::default());
+        let mut page = writer.document_mut().start_page_with(PageSettings::new(Size::from_wh(100.0, 100.0).unwrap()));
+        let mut surface = page.surface();
+        for (id, hidden, count) in [(a, None, 1), (a, None, 1), (a, Some(vec!["Hidden".into()]), 2), (b, None, 3), (a, None, 3)] {
+            let graphic = designcraft_doc::Graphic {
+                asset: id,
+                size: (100.0, 100.0),
+                xf: Affine::IDENTITY,
+                clip: None,
+                auto_fit: Default::default(),
+                fit_align: 4,
+                crop: [0.0; 4],
+                wrap: Default::default(),
+                fill: Default::default(),
+                layer_options: None,
+            };
+            ex.graphic_unclipped(&mut surface, &graphic, hidden.as_deref());
+            assert!(ex.layer_error.is_none());
+            assert_eq!(ex.pdf_preparations, count, "count actual preparations, not writer resource deduplication");
+        }
+        assert_eq!(ex.variants.len(), 3);
+        // a, b, and a with its layer hidden (a copy of its own).
+        assert_eq!(ex.pdfs.len(), 3);
+        let variant = ex.variants.get(&(a, None)).unwrap();
+        assert!(Arc::ptr_eq(&variant.data, &doc.assets[&a].data));
+        surface.finish();
+        page.finish();
+        assert!(writer.finish().is_ok());
+    }
+    #[test]
+    fn exact_bytes_reuse_conversion_under_real_hash_collisions() {
+        use std::hash::{BuildHasher, Hasher};
+        let mut d = Document::new(&Default::default());
+        let red = png(2, 1, [255, 0, 0, 255]);
+        let blue = png(1, 2, [0, 0, 255, 128]);
+        let a1 = asset(&mut d, red.clone(), "a1");
+        let b1 = asset(&mut d, blue.clone(), "b1");
+        let a2 = asset(&mut d, red, "a2");
+        let b2 = asset(&mut d, blue, "b2");
+        assert!(!Arc::ptr_eq(&d.assets[&a1].data, &d.assets[&a2].data));
+        let cache = Cache::new();
+        let opts = PdfOptions::default();
+        let mut ex = exporter(&d, &cache, &opts);
+        let mut h1 = ex.images_by_content.hasher().build_hasher();
+        h1.write(&d.assets[&a1].data);
+        let mut h2 = ex.images_by_content.hasher().build_hasher();
+        h2.write(&d.assets[&b1].data);
+        assert_eq!(h1.finish(), h2.finish());
+        assert_ne!(d.assets[&a1].data, d.assets[&b1].data);
+        for (id, count, size) in [(a1, 1, (2, 1)), (b1, 2, (1, 2)), (a2, 2, (2, 1)), (a1, 2, (2, 1)), (b2, 2, (1, 2))] {
+            assert_eq!(ex.load_image(id).unwrap().size(), size);
+            assert_eq!(ex.image_conversions, count, "count actual converter executions, not krilla resource equality");
+        }
+        assert_eq!(ex.images.len(), 4);
+        assert_eq!(ex.images_by_content.len(), 2);
+        let first_key = ex.images_by_content.keys().find(|key| key.as_slice() == d.assets[&a1].data.as_slice()).unwrap();
+        assert!(Arc::ptr_eq(first_key, &d.assets[&a1].data), "cache keys share the original encoded payload");
+        ex.images_by_content.clear();
+        assert_eq!(ex.load_image(a1).unwrap().size(), (2, 1));
+        assert_eq!(ex.image_conversions, 2, "the AssetId cache remains the first lookup");
+        assert!(ex.images_by_content.is_empty());
+    }
+    #[test]
+    fn successful_content_cache_does_not_suppress_failure_names() {
+        let mut d = Document::new(&Default::default());
+        let a = asset(&mut d, vec![0, 1, 2, 3], "broken-a.png");
+        let b = asset(&mut d, vec![0, 1, 2, 3], "broken-b.png");
+        let cache = Cache::new();
+        let opts = PdfOptions::default();
+        let mut ex = exporter(&d, &cache, &opts);
+        assert!(ex.load_image(a).is_none());
+        assert!(ex.load_image(b).is_none());
+        assert!(ex.load_image(a).is_none());
+        assert_eq!(ex.image_conversions, 2);
+        assert!(ex.images_by_content.is_empty());
+        assert_eq!(ex.warnings.len(), 2);
+        assert!(ex.warnings[0].contains("broken-a.png"));
+        assert!(ex.warnings[1].contains("broken-b.png"));
+    }
+    #[test]
+    fn content_cache_is_scoped_to_each_immutable_options_context() {
+        let mut d = Document::new(&Default::default());
+        let data = png(2, 2, [240, 20, 30, 255]);
+        let a = asset(&mut d, data.clone(), "a");
+        let b = asset(&mut d, data, "b");
+        let cache = Cache::new();
+        for compress_images in [false, true, false] {
+            let opts = PdfOptions { compress_images, ..Default::default() };
+            let mut ex = exporter(&d, &cache, &opts);
+            assert!(ex.load_image(a).is_some());
+            assert!(ex.load_image(b).is_some());
+            assert_eq!(ex.image_conversions, 1);
+            assert_eq!(ex.images_by_content.len(), 1);
+        }
+    }
+
+    #[test]
+    fn successful_cmyk_fallback_replays_each_asset_name_once_and_converts_once() {
+        let bytes = crate::image_fixtures::cmyk_tiff(None, true);
+        assert!(designcraft_images::is_cmyk_tiff(&bytes));
+        assert!(designcraft_images::decode_cmyk_tiff(&bytes).is_none());
+        assert!(designcraft_images::decode_rgba(&bytes).is_some());
+        let mut d = Document::new(&Default::default());
+        let a = asset(&mut d, bytes.clone(), "ink-a.tif");
+        let b = asset(&mut d, bytes, "ink-b.tif");
+        let cache = Cache::new();
+        for compress_images in [false, true] {
+            let opts = PdfOptions { compress_images, ..Default::default() };
+            let mut ex = exporter(&d, &cache, &opts);
+            for id in [a, b, a, b] {
+                assert_eq!(ex.load_image(id).unwrap().size(), (2, 1));
+            }
+            assert_eq!(ex.image_conversions, 1);
+            assert_eq!(ex.images_by_content.len(), 1);
+            assert_eq!(ex.warnings, [format!("ink-a.tif: {CMYK_FALLBACK_WARNING}"), format!("ink-b.tif: {CMYK_FALLBACK_WARNING}")]);
+        }
+    }
+
+    #[test]
+    fn cmyk_alpha_and_rgb_only_context_keep_conversion_counts_and_failures() {
+        let cache = Cache::new();
+        for alpha in [None, Some(2), Some(1)] {
+            let mut d = Document::new(&Default::default());
+            let bytes = crate::image_fixtures::cmyk_tiff(alpha, false);
+            // RGB-only exports get the RGB the screen shows.
+            let screen_rgb: Vec<u8> =
+                designcraft_images::decode_rgba(&bytes).map_or_else(Vec::new, |img| img.pixels().flat_map(|p| [p[0], p[1], p[2]]).collect());
+            let a = asset(&mut d, bytes.clone(), "a.tif");
+            let b = asset(&mut d, bytes, "b.tif");
+            for standard in [Standard::None, Standard::PdfA2b, Standard::PdfX4, Standard::PdfA2b, Standard::None] {
+                let opts = PdfOptions { standard, ..Default::default() };
+                let mut ex = exporter(&d, &cache, &opts);
+                ex.rgb_only = standard == Standard::PdfA2b;
+                // Unassociated alpha (2) decodes as inks, and as RGB for RGB-only exports.
+                // Associated alpha is rejected by both paths: retain both failure names.
+                let succeeds = alpha.is_none() || alpha == Some(2);
+                let first = ex.load_image(a);
+                assert_eq!(first.is_some(), succeeds, "{alpha:?} {standard:?}");
+                if alpha.is_none() {
+                    let (space, samples) = image_color_samples(first.unwrap());
+                    assert_eq!(space, if ex.rgb_only { "DeviceRGB" } else { "DeviceCMYK" });
+                    assert_eq!(samples, if ex.rgb_only { screen_rgb.clone() } else { crate::image_fixtures::INKS.to_vec() });
+                }
+                assert_eq!(ex.load_image(b).is_some(), succeeds, "{alpha:?} {standard:?}");
+                assert_eq!(ex.load_image(a).is_some(), succeeds);
+                assert_eq!(ex.image_conversions, if succeeds { 1 } else { 2 });
+                assert_eq!(ex.images_by_content.len(), usize::from(succeeds));
+                if succeeds {
+                    assert!(ex.warnings.is_empty());
+                } else {
+                    for name in ["a.tif", "b.tif"] {
+                        assert!(ex.warnings.contains(&format!("image `{name}` could not be decoded and was skipped")));
+                        assert_eq!(ex.warnings.contains(&format!("{name}: {CMYK_FALLBACK_WARNING}")), !ex.rgb_only);
+                    }
+                }
+            }
+        }
+    }
+
+    // Serialize the converted raster without an archival validator so the RGB-only pixel
+    // contract stays independent of main's existing PDF/A interpolation validation failure.
+    fn image_color_samples(image: Image) -> (String, Vec<u8>) {
+        use hayro_syntax::object::Name;
+        let mut pdf = krilla::Document::new();
+        let size = Size::from_wh(20.0, 20.0).unwrap();
+        let mut page = pdf.start_page_with(PageSettings::new(size));
+        let mut surface = page.surface();
+        surface.draw_image(image, size);
+        surface.finish();
+        page.finish();
+        let bytes = pdf.finish().unwrap();
+        let pdf = hayro_syntax::Pdf::new(bytes).unwrap();
+        let stream = pdf
+            .objects()
+            .into_iter()
+            .filter_map(|o| o.into_stream())
+            .find(|s| s.dict().get::<Name>("Subtype").is_some_and(|n| n.as_str() == "Image"))
+            .unwrap();
+        (stream.dict().get::<Name>("ColorSpace").unwrap().as_str().to_owned(), stream.decoded().unwrap().into_owned())
+    }
+
+    #[test]
+    fn content_cache_owns_only_existing_payloads_and_drops_with_exporter() {
+        let mut d = Document::new(&Default::default());
+        let bytes = png(2, 1, [20, 30, 40, 255]);
+        let a = asset(&mut d, bytes.clone(), "a.png");
+        let b = asset(&mut d, bytes, "b.png");
+        let payload = Arc::downgrade(&d.assets[&a].data);
+        let duplicate = Arc::downgrade(&d.assets[&b].data);
+        let cache = Cache::new();
+        let opts = PdfOptions::default();
+        let mut ex = exporter(&d, &cache, &opts);
+        assert!(ex.load_image(a).is_some());
+        assert!(ex.load_image(b).is_some());
+        assert_eq!(duplicate.strong_count(), 1, "a content hit must not retain the second encoded allocation");
+        let key = ex.images_by_content.keys().next().unwrap();
+        assert!(Arc::ptr_eq(key, &d.assets[&a].data));
+        drop(ex);
+        drop(d);
+        assert!(payload.upgrade().is_none(), "no converted image or encoded key outlives this exporter");
+        assert!(duplicate.upgrade().is_none());
+    }
+}
+
+#[cfg(test)]
+mod eps_tests {
+    use super::*;
+    use hayro_syntax::object::Name;
+
+    #[test]
+    fn eps_tiff_preview_keeps_cmyk_inks_in_pdf() {
+        let pixels = vec![0u8, 0, 0, 255, 0, 255, 255, 0];
+        let mut tiff = Vec::new();
+        tiff::encoder::TiffEncoder::new(std::io::Cursor::new(&mut tiff))
+            .unwrap()
+            .write_image::<tiff::encoder::colortype::CMYK8>(2, 1, &pixels)
+            .unwrap();
+        let ps = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 2 1\n%%EOF\n";
+        let mut eps = vec![0xC5, 0xD0, 0xD3, 0xC6];
+        for value in [30usize, ps.len(), 0, 0, 30 + ps.len(), tiff.len()] {
+            eps.extend((value as u32).to_le_bytes());
+        }
+        eps.extend([0xFF, 0xFF]);
+        eps.extend_from_slice(ps);
+        eps.extend_from_slice(&tiff);
+        assert_eq!(designcraft_images::eps_proxy(&eps).unwrap().0, tiff);
+        let mut doc = Document::new(&designcraft_doc::build::NewDocument::default());
+        let aid = AssetId(doc.alloc());
+        doc.assets.insert(
+            aid,
+            Arc::new(designcraft_doc::Asset {
+                id: aid,
+                name: "cmyk.eps".into(),
+                mime: "application/postscript".into(),
+                link: None,
+                data: Arc::new(eps),
+                pixels: Some((2, 1)),
+                page: 0,
+                ..Default::default()
+            }),
+        );
+        let mut item = Item::new(
+            designcraft_doc::ItemId(doc.alloc()),
+            doc.default_layer(),
+            designcraft_doc::Shape::Rectangle,
+            designcraft_geom::shapes::rectangle(Rect::new(72.0, 72.0, 272.0, 172.0)),
+        );
+        item.content = Content::Graphic(designcraft_doc::Graphic {
+            layer_options: None,
+            asset: aid,
+            size: (2.0, 1.0),
+            xf: Affine::translate((72.0, 72.0)) * Affine::scale(100.0),
+            auto_fit: Default::default(),
+            fit_align: 4,
+            crop: [0.0; 4],
+            clip: None,
+            wrap: Default::default(),
+            fill: Default::default(),
+        });
+        doc.insert_item(designcraft_doc::SpreadRef::Doc(0), item, None).unwrap();
+        for standard in [Standard::None, Standard::PdfX4] {
+            let report = export_pdf_with_report(&doc, &Cache::new(), &PdfOptions { standard, ..Default::default() }).unwrap();
+            assert!(report.warnings.is_empty(), "{:?}", report.warnings);
+            let pdf = hayro_syntax::Pdf::new(report.bytes).unwrap();
+            let images: Vec<_> = pdf
+                .objects()
+                .into_iter()
+                .filter_map(|o| o.into_stream())
+                .filter(|s| s.dict().get::<Name>("Subtype").is_some_and(|n| n.as_str() == "Image"))
+                .map(|s| (s.dict().get::<Name>("ColorSpace").unwrap().as_str().to_string(), s.decoded().unwrap().into_owned()))
+                .collect();
+            assert_eq!(images, vec![("DeviceCMYK".to_string(), pixels.clone())], "{standard:?}");
+        }
+    }
+
+    #[test]
+    fn civil_dates_match_the_old_cycle_conversion_including_beyond_chrono() {
+        use super::civil;
+        assert_eq!(civil(0), (1970, 1, 1, 0, 0, 0));
+        assert_eq!(civil(951_782_400), (2000, 2, 29, 0, 0, 0));
+        assert_eq!(civil(1_791_504_000 + 3_723), (2026, 10, 9, 1, 2, 3));
+        // Beyond chrono's year range the old `civil` still converted; pin that output, never the
+        // epoch. `date_time` is what clamps the year to the PDF `0..=9999` range afterwards.
+        assert_eq!(civil(253_402_300_800), (10000, 1, 1, 0, 0, 0));
+        assert_eq!(civil(10_000_000_000_000), (318857, 5, 20, 17, 46, 40));
+        assert_eq!(civil(-10_000_000_000_000), (-314918, 8, 13, 6, 13, 20));
+        assert_eq!(civil(i64::MAX), (292277026596, 12, 4, 15, 30, 7));
+        assert_eq!(civil(i64::MIN), (-292277022657, 1, 27, 8, 29, 52));
+    }
+}
diff --git a/crates/pdf/src/export/metadata.rs b/crates/pdf/src/export/metadata.rs
new file mode 100644
index 000000000..5f857c619
--- /dev/null
+++ b/crates/pdf/src/export/metadata.rs
@@ -0,0 +1,51 @@
+use super::{Document, Metadata, krilla};
+
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) fn now_unix() -> Option<i64> {
+    use std::time::{SystemTime, UNIX_EPOCH};
+    SystemTime::now().duration_since(UNIX_EPOCH).ok().map(|d| d.as_secs() as i64)
+}
+
+#[cfg(target_arch = "wasm32")]
+pub(super) fn now_unix() -> Option<i64> {
+    None
+}
+
+/// The document information from File Info (title, author, description, keywords). `title` and
+/// `author` from the export options replace File Info's.
+pub(super) fn file_info_metadata(doc: &Document, title: Option<&str>, author: Option<&str>) -> Metadata {
+    let info = &doc.file_info;
+    let description = info.description.trim();
+    Metadata {
+        creator: "DesignCraft".into(),
+        producer: "DesignCraft".into(),
+        title: Some(title.unwrap_or_else(|| doc.metadata_title()).to_string()),
+        authors: author.or_else(|| doc.metadata_author()).map(str::to_string).into_iter().collect(),
+        description: (!description.is_empty()).then(|| description.to_string()),
+        keywords: info.keywords.clone(),
+        created: None,
+        modified: None,
+    }
+}
+
+pub(super) fn date_time(t: i64) -> krilla::metadata::DateTime {
+    let c = civil(t);
+    krilla::metadata::DateTime::new(c.0.clamp(0, 9999) as u16)
+        .month(c.1)
+        .day(c.2)
+        .hour(c.3)
+        .minute(c.4)
+        .second(c.5)
+        .utc_offset_hour(0)
+        .utc_offset_minute(0)
+}
+
+/// Unix seconds (UTC) → (year, month, day, hour, minute, second), proleptic Gregorian. A time
+/// outside chrono's year range still converts (the calendar repeats every 400 years, so the
+/// instant is moved into range by whole cycles and only the year is carried, matching the old
+/// `civil`), rather than resetting to the epoch. `date_time` applies the PDF `0..=9999` year clamp.
+pub(crate) fn civil(t: i64) -> (i64, u8, u8, u8, u8, u8) {
+    use chrono::{Datelike, Timelike};
+    let (y, t) = designcraft_doc::time::utc_parts(t, 0);
+    (y, t.month() as u8, t.day() as u8, t.hour() as u8, t.minute() as u8, t.second() as u8)
+}
diff --git a/crates/pdf/src/export/paint.rs b/crates/pdf/src/export/paint.rs
new file mode 100644
index 000000000..026b78674
--- /dev/null
+++ b/crates/pdf/src/export/paint.rs
@@ -0,0 +1,258 @@
+use super::common::{device, norm, q, tf, to_path};
+use super::*;
+
+impl Exporter<'_> {
+    /// Fill `p` with an item's fill paint, overprinting when the fill does.
+    pub(super) fn fill_item_path(&mut self, s: &mut Surface, fill: &designcraft_doc::Fill, paint: krilla::paint::Paint, p: &Path) {
+        let op = self.overprints(&fill.swatch, fill.tint, fill.overprint);
+        let pushed = self.push_overprint(s, op, false);
+        s.set_stroke(None);
+        s.set_fill(Some(Fill { paint, opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
+        s.draw_path(p);
+        s.set_fill(None);
+        if pushed {
+            s.pop();
+        }
+    }
+
+    /// A swatch fill (solid or gradient) in the item's inner space. `None` for [None]/unknown.
+    pub(crate) fn fill_paint(&mut self, fill: &designcraft_doc::Fill, bounds: Rect) -> Option<krilla::paint::Paint> {
+        self.fill_paint_in(fill, bounds, Affine::IDENTITY)
+    }
+
+    /// [`Self::fill_paint`] for a gradient laid out in a space that `xf` maps to the current one
+    /// (text runs: the frame's text space under the run's origin).
+    pub(crate) fn fill_paint_in(&mut self, fill: &designcraft_doc::Fill, bounds: Rect, xf: Affine) -> Option<krilla::paint::Paint> {
+        let (swatch, tint) = (fill.swatch.as_str(), fill.tint);
+        if let Some(g) = designcraft_color::swatch::resolve_gradient(&self.doc.swatches, swatch) {
+            let kind = g.kind;
+            let overprint = self.overprints(swatch, tint, fill.overprint);
+            let stops = match self.ink_gradient_stops(g, swatch, overprint) {
+                Some(stops) => stops,
+                None => self.device_gradient_stops(g, swatch),
+            };
+            if stops.is_empty() {
+                return None;
+            }
+            return Some(match kind {
+                GradientKind::Radial => {
+                    // A circle stretched into the object's ellipse, as on screen.
+                    let (c, rx, ry) = fill.radial_ellipse(bounds);
+                    let rx = rx.max(1e-3);
+                    let stretch = Affine::translate(c.to_vec2()) * Affine::scale_non_uniform(1.0, ry / rx) * Affine::translate(-c.to_vec2());
+                    let (cx, cy) = (c.x as f32, c.y as f32);
+                    RadialGradient {
+                        fx: cx,
+                        fy: cy,
+                        fr: 0.0,
+                        cx,
+                        cy,
+                        cr: rx as f32,
+                        transform: tf(xf * stretch),
+                        spread_method: SpreadMethod::Pad,
+                        stops,
+                        anti_alias: false,
+                    }
+                    .into()
+                }
+                _ => {
+                    let (p0, p1) = fill.linear_axis(bounds);
+                    LinearGradient {
+                        x1: p0.x as f32,
+                        y1: p0.y as f32,
+                        x2: p1.x as f32,
+                        y2: p1.y as f32,
+                        transform: tf(xf),
+                        spread_method: SpreadMethod::Pad,
+                        stops,
+                        anti_alias: false,
+                    }
+                    .into()
+                }
+            });
+        }
+        self.swatch_color(swatch, tint).map(Into::into)
+    }
+
+    /// A gradient's stops in device colors: CMYK, RGB or Gray, as one space.
+    fn device_gradient_stops(&mut self, g: &designcraft_color::Gradient, swatch: &str) -> Vec<Stop> {
+        let mut expanded = g.expanded_stops();
+        // Gray and CMYK stops blend as inks, so a gray stop beside a CMYK one is the K ink.
+        if !self.rgb_only && expanded.iter().any(|(_, c, _)| matches!(c, Color::Cmyk { .. })) {
+            for (_, c, _) in &mut expanded {
+                if let Color::Gray { k } = *c {
+                    *c = Color::cmyk(0.0, 0.0, 0.0, k);
+                }
+            }
+        }
+        // A PDF shading needs one color space. Midpoint expansion can introduce RGB even
+        // when every authored stop is CMYK/Gray; PDF/A can also change the output space.
+        let components = |c: &Color| match c {
+            Color::Cmyk { .. } if !self.rgb_only => 4,
+            Color::Gray { .. } => 1,
+            _ => 3,
+        };
+        let mixed = expanded.first().is_some_and(|(_, first, _)| expanded.iter().any(|(_, c, _)| components(c) != components(first)));
+        if mixed {
+            self.warn(format!("gradient '{swatch}': mixed color spaces converted to RGB (color appearance and separations may change)"));
+        }
+        let mut stops: Vec<Stop> = Vec::new();
+        let mut last = 0.0f32;
+        for (o, c, a) in expanded {
+            let o = o.clamp(last, 1.0);
+            last = o;
+            let color = if mixed && !matches!(c, Color::Rgb { .. }) {
+                let [r, g, b] = c.to_rgb();
+                rgb::Color::new(q(r), q(g), q(b)).into()
+            } else {
+                // Preserve RGB values, including already-interpolated display RGB, and
+                // leave every homogeneous gradient on its existing device-space path.
+                device(&c, self.rgb_only)
+            };
+            stops.push(Stop { offset: norm(o), color, opacity: norm(a) });
+        }
+        stops
+    }
+
+    pub(super) fn stroke(&mut self, s: &mut Surface, it: &Item, bp: &BezPath, path: &Path) {
+        let st = &it.stroke;
+        // A gradient swatch runs across the path's box, as on a fill.
+        let paint: krilla::paint::Paint = if designcraft_color::swatch::resolve_gradient(&self.doc.swatches, &st.swatch).is_some() {
+            let Some(p) = self.fill_paint(&st.as_fill(), bp.bounding_box()) else { return };
+            p
+        } else {
+            let Some(c) = self.swatch_color(&st.swatch, st.tint) else { return };
+            c.into()
+        };
+        let closed = it.path.is_closed();
+        // Overprint Stroke covers the stroke and its arrowheads, Overprint Gap the gap color;
+        // each is pushed around what it paints (a filled outline or a stroked path).
+        let stroke_op = self.overprints(&st.swatch, st.tint, st.overprint);
+        let gap_op = self.overprints(&st.gap_swatch, st.gap_tint, st.gap_overprint);
+        let mut cap = match st.cap {
+            designcraft_doc::Cap::Butt => krilla::paint::LineCap::Butt,
+            designcraft_doc::Cap::Round => krilla::paint::LineCap::Round,
+            designcraft_doc::Cap::Projecting => krilla::paint::LineCap::Square,
+        };
+        let kind = self.doc.stroke_kind(&st.kind);
+        // Stripes, wavy and hash strokes: a filled outline (gap colour under it).
+        if let Some(o) = kind.outline(bp, st.weight, 0.05)
+            && let Some(op) = to_path(&o)
+        {
+            s.set_stroke(None);
+            if let Some(g) = self.swatch_color(&st.gap_swatch, st.gap_tint)
+                && st.gap_swatch != designcraft_color::swatch::NONE
+            {
+                let pushed = self.push_overprint(s, gap_op, gap_op);
+                s.set_stroke(Some(Stroke { paint: g.into(), width: st.weight as f32, opacity: NormalizedF32::ONE, ..Default::default() }));
+                s.set_fill(None);
+                s.draw_path(path);
+                s.set_stroke(None);
+                if pushed {
+                    s.pop();
+                }
+            }
+            let pushed = self.push_overprint(s, stroke_op, stroke_op);
+            s.set_fill(Some(Fill { paint: paint.clone(), opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
+            s.draw_path(&op);
+            s.set_fill(None);
+            if pushed {
+                s.pop();
+            }
+            return;
+        }
+        // Viewers expand dashes too: a degenerate pattern draws solid, as on screen.
+        let length = designcraft_doc::path_length_bound(bp);
+        let dash = match &kind {
+            StrokeType::Dashed { pattern } if StrokeType::expandable_dashes(pattern, length) => {
+                let mut pat: Vec<f32> = pattern.iter().map(|v| v.max(0.0) as f32).collect();
+                if pat.len() % 2 == 1 {
+                    pat.extend(pat.clone());
+                }
+                Some(StrokeDash { array: pat, offset: 0.0 })
+            }
+            StrokeType::Dotted if StrokeType::expandable_dashes(&[0.0, st.weight * 2.0], length) => {
+                cap = krilla::paint::LineCap::Round;
+                Some(StrokeDash { array: vec![0.0, (st.weight * 2.0) as f32], offset: 0.0 })
+            }
+            _ => None,
+        };
+        let arrows = designcraft_doc::arrow::apply(bp, st, closed);
+        let trimmed = arrows.as_ref().and_then(|a| to_path(&a.0));
+        let path = trimmed.as_ref().unwrap_or(path);
+        let aligned = closed && st.align != StrokeAlign::Center;
+        let width = if aligned { st.weight * 2.0 } else { st.weight };
+        let mut pushes = 0;
+        match st.align {
+            StrokeAlign::Inside if closed => {
+                s.push_clip_path(path, &FillRule::NonZero);
+                pushes += 1;
+            }
+            StrokeAlign::Outside if closed => {
+                // Clip to everything outside the path: a big frame plus the path, even-odd.
+                let b = bp.bounding_box().inflate(width * 2.0 + 10.0, width * 2.0 + 10.0);
+                let mut outside = b.to_path(0.1);
+                outside.extend(bp.iter());
+                if let Some(p) = to_path(&outside) {
+                    s.push_clip_path(&p, &FillRule::EvenOdd);
+                    pushes += 1;
+                }
+            }
+            _ => {}
+        }
+        s.set_fill(None);
+        if dash.is_some()
+            && pushes == 0
+            && let Some(g) = self.swatch_color(&st.gap_swatch, st.gap_tint)
+        {
+            // Gap colour under dashes and dots.
+            let pushed = self.push_overprint(s, gap_op, gap_op);
+            s.set_stroke(Some(Stroke { paint: g.into(), width: width as f32, opacity: NormalizedF32::ONE, ..Default::default() }));
+            s.draw_path(path);
+            if pushed {
+                s.pop();
+            }
+        }
+        let pushed = self.push_overprint(s, stroke_op, stroke_op);
+        s.set_stroke(Some(Stroke {
+            paint: paint.clone(),
+            width: width as f32,
+            miter_limit: st.miter_limit.max(1.0) as f32,
+            line_cap: cap,
+            line_join: match st.join {
+                designcraft_doc::Join::Miter => krilla::paint::LineJoin::Miter,
+                designcraft_doc::Join::Round => krilla::paint::LineJoin::Round,
+                designcraft_doc::Join::Bevel => krilla::paint::LineJoin::Bevel,
+            },
+            opacity: NormalizedF32::ONE,
+            dash,
+        }));
+        s.draw_path(path);
+        s.set_stroke(None);
+        if pushed {
+            s.pop();
+        }
+        for _ in 0..pushes {
+            s.pop();
+        }
+        let pushed = self.push_overprint(s, stroke_op, stroke_op);
+        for h in arrows.iter().flat_map(|a| &a.1) {
+            let Some(p) = to_path(&h.path) else { continue };
+            match h.outline {
+                Some(w) => {
+                    s.set_stroke(Some(Stroke { paint: paint.clone(), width: w as f32, opacity: NormalizedF32::ONE, ..Default::default() }));
+                    s.draw_path(&p);
+                    s.set_stroke(None);
+                }
+                None => {
+                    s.set_fill(Some(krilla::paint::Fill { paint: paint.clone(), opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
+                    s.draw_path(&p);
+                    s.set_fill(None);
+                }
+            }
+        }
+        if pushed {
+            s.pop();
+        }
+    }
+}
diff --git a/crates/pdf/src/export/pipeline.rs b/crates/pdf/src/export/pipeline.rs
new file mode 100644
index 000000000..ca9d1a988
--- /dev/null
+++ b/crates/pdf/src/export/pipeline.rs
@@ -0,0 +1,326 @@
+use super::common::{tf, to_path};
+use super::images::ImageContentCache;
+use super::metadata::{date_time, file_info_metadata, now_unix};
+use super::*;
+
+/// Export `doc` as PDF bytes.
+pub fn export_pdf(doc: &Document, cache: &Cache, opts: &PdfOptions) -> Result<Vec<u8>> {
+    export_pdf_with_report(doc, cache, opts).map(|r| r.bytes)
+}
+
+/// One output page: a document page or a spread, in spread coordinates.
+pub(crate) struct Sheet {
+    pub spread: usize,
+    pub trim: Rect,
+    pub bleed: Rect,
+    pub media: Rect,
+    /// Page name(s) for the page-information mark.
+    pub label: String,
+}
+
+pub(crate) const MARK_LEN: f64 = 18.0;
+
+/// Whether a layer's items go into the PDF.
+pub(crate) fn layer_exported(layer: &designcraft_doc::Layer) -> bool {
+    layer.visible && layer.printable
+}
+
+/// Whether an item and everything inside it go into the PDF, its layer aside.
+pub(crate) fn item_exported(it: &Item) -> bool {
+    !it.hidden && !it.nonprinting
+}
+
+/// Every item of spread `si` that goes into the PDF, with its parent's transform: the items on
+/// exported layers, leaving out hidden and non-printing items with everything inside them.
+pub(crate) fn exported_items(doc: &Document, si: usize) -> Vec<(Affine, &Item)> {
+    let Some(sp) = doc.spreads.get(si) else { return Vec::new() };
+    let mut stack: Vec<(Affine, &Item)> =
+        sp.items.iter().filter(|it| doc.layer(it.layer).is_some_and(layer_exported)).map(|it| (Affine::IDENTITY, &**it)).collect();
+    let mut out = Vec::new();
+    while let Some((xf, it)) = stack.pop() {
+        if !item_exported(it) {
+            continue;
+        }
+        stack.extend(it.shown_children().map(|c| (xf * it.xf, &**c)));
+        out.push((xf, it));
+    }
+    out
+}
+
+fn bleed_lr(side: PageSide, b: [f64; 4]) -> (f64, f64) {
+    // Bleed is top, bottom, inside, outside; single-sided pages read inside as left.
+    if side == PageSide::Left { (b[3], b[2]) } else { (b[2], b[3]) }
+}
+
+/// The spread each exported PDF page shows (in page order).
+pub fn sheet_spreads(doc: &Document, opts: &PdfOptions) -> Vec<usize> {
+    sheets(doc, opts).map(|v| v.iter().map(|s| s.spread).collect()).unwrap_or_default()
+}
+
+fn sheets(doc: &Document, opts: &PdfOptions) -> Result<Vec<Sheet>> {
+    let count = doc.page_count();
+    let pages: Vec<usize> = match &opts.pages {
+        Some(v) => v.clone(),
+        None => (0..count).collect(),
+    };
+    if pages.is_empty() {
+        return Err(PdfError::NoPages);
+    }
+    if let Some(bad) = pages.iter().find(|p| **p >= count) {
+        return Err(PdfError::BadPage(bad.saturating_add(1)));
+    }
+    let b = doc.settings.bleed.map(|v| if opts.bleed { v.max(0.0) } else { 0.0 });
+    let mut out: Vec<Sheet> = Vec::new();
+    let mut seen_spreads: Vec<usize> = Vec::new();
+    for abs in pages {
+        let (si, pi) = doc.page_loc(abs).ok_or(PdfError::BadPage(abs.saturating_add(1)))?;
+        let sp: &Spread = &doc.spreads[si];
+        let (trim, l, r, label) = if opts.spreads {
+            if seen_spreads.contains(&si) {
+                continue;
+            }
+            seen_spreads.push(si);
+            let first = doc.first_page_of_spread(si);
+            // The outer edges by position: a right-to-left spread lists its right page first.
+            let outer = sp.outer_page_indices();
+            let (l, _) = outer.and_then(|(l, _)| sp.pages.get(l)).map(|p| bleed_lr(p.side, b)).unwrap_or((b[2], b[3]));
+            let (_, r) = outer.and_then(|(_, r)| sp.pages.get(r)).map(|p| bleed_lr(p.side, b)).unwrap_or((b[2], b[3]));
+            let names: Vec<String> = (0..sp.pages.len()).map(|i| doc.page_name(first + i)).collect();
+            (sp.bounds(), l, r, names.join("–"))
+        } else {
+            let p = &sp.pages[pi];
+            let (l, r) = bleed_lr(p.side, b);
+            (p.bounds(), l, r, doc.page_name(abs))
+        };
+        let bleed = Rect::new(trim.x0 - l, trim.y0 - b[0], trim.x1 + r, trim.y1 + b[1]);
+        let media = if opts.marks.any() {
+            let m = mark_start(opts, b) + MARK_LEN + 6.0;
+            trim.inflate(m, m)
+        } else {
+            bleed
+        };
+        out.push(Sheet { spread: si, trim, bleed, media, label });
+    }
+    Ok(out)
+}
+
+/// Distance from the trim edge where marks start: the offset, but never inside the bleed.
+pub(crate) fn mark_start(opts: &PdfOptions, bleed: [f64; 4]) -> f64 {
+    bleed.iter().copied().fold(opts.marks.offset.max(0.0), f64::max)
+}
+
+/// Whether an export is CMYK print output: transparency blends in CMYK, in the document's CMYK
+/// working space (which PDF/X also carries as its output intent). True when the document blends
+/// in CMYK, and always in PDF/X; PDF/A exports are RGB.
+pub fn print_color(doc: &Document, opts: &PdfOptions) -> bool {
+    opts.standard != Standard::PdfA2b && (doc.settings.blend_space == designcraft_doc::BlendSpace::Cmyk || opts.standard.is_pdfx())
+}
+
+/// Like [`export_pdf`], also returning warnings about approximated or dropped features.
+pub fn export_pdf_with_report(doc: &Document, cache: &Cache, opts: &PdfOptions) -> Result<ExportReport> {
+    write::guard(|| export_pdf_with_report_inner(doc, cache, opts))
+}
+
+/// Form fields (Buttons and Forms) and, for interactive PDF, video and sound; not in PDF/X
+/// or PDF/A: this update comes after krilla's validator ran, and its NeedAppearances fields and
+/// Screen annotations aren't allowed in PDF/A.
+fn add_form_fields(bytes: &mut Vec<u8>, warnings: &mut Vec<String>, doc: &Document, sheets: &[Sheet], opts: &PdfOptions) {
+    let fields = crate::forms::collect(doc, sheets);
+    let media = if opts.media { crate::forms::collect_media(doc, sheets) } else { Vec::new() };
+    if fields.is_empty() && media.is_empty() {
+        return;
+    }
+    match opts.standard {
+        Standard::PdfX4 => warnings.push("PDF/X-4: form fields and media were left out".into()),
+        Standard::PdfX1a => warnings.push("PDF/X-1a: form fields and media were left out".into()),
+        Standard::PdfA2b => warnings.push("PDF/A-2b: form fields and media were left out".into()),
+        _ => match crate::forms::add_fields(&*bytes, &fields, &media) {
+            Some(b) => *bytes = b,
+            None => warnings.push("form fields and media couldn't be added to this PDF".into()),
+        },
+    }
+}
+
+fn export_pdf_with_report_inner(doc: &Document, cache: &Cache, opts: &PdfOptions) -> Result<ExportReport> {
+    let sheets = sheets(doc, opts)?;
+    let (version, archival) = match opts.standard {
+        Standard::None => (PdfVersion::Pdf17, None),
+        // PDF/X-1a starts as the PDF/X-4 print file, then is flattened.
+        Standard::PdfX4 | Standard::PdfX1a => (PdfVersion::Pdf16, None),
+        Standard::PdfA2b => (PdfVersion::Pdf17, Some(Archival::A2_B)),
+    };
+    let configuration = write::configuration(version, archival)?;
+    let mut warnings = Vec::new();
+    let base = if print_color(doc, opts) {
+        // An output intent only for PDF/X, as in InDesign.
+        let (settings, warning) = crate::pdfx::print_settings(opts.standard.is_pdfx())?;
+        warnings.extend(warning);
+        let pdfx_version = (opts.standard == Standard::PdfX4).then(|| "PDF/X-4".to_string());
+        krilla::SerializeSettings { pdfx_version, ..settings }
+    } else {
+        krilla::SerializeSettings::default()
+    };
+    let settings = krilla::SerializeSettings { compress_content_streams: opts.compress, configuration, ..base };
+    let title = opts.title.clone().unwrap_or_else(|| doc.title.clone());
+    let created = opts.created.or_else(now_unix);
+    let metadata = Metadata { created: created.map(date_time), ..file_info_metadata(doc, opts.title.as_deref(), opts.author.as_deref()) };
+    let mut writer = Writer::new(settings, metadata);
+    let pdf = writer.document_mut();
+
+    let mut ex = Exporter {
+        drawing_items: Vec::new(),
+        inks: crate::inks::ink_set(doc),
+        doc,
+        cache,
+        composed: HashMap::new(),
+        opts,
+        clip: Rect::ZERO,
+        warnings,
+        images: HashMap::new(),
+        images_by_content: ImageContentCache::default(),
+        #[cfg(test)]
+        image_conversions: 0,
+        pdfs: HashMap::new(),
+        variants: HashMap::new(),
+        has_optional_content: false,
+        #[cfg(test)]
+        pdf_preparations: 0,
+        layer_error: None,
+        version,
+        too_new: Vec::new(),
+        svgs: HashMap::new(),
+        fonts: HashMap::new(),
+        reverse_cmaps: HashMap::new(),
+        rgb_only: archival.is_some(),
+        tags: Vec::new(),
+        story_tags: HashMap::new(),
+        tag_story: None,
+        text_area: None,
+        para_tags: HashMap::new(),
+    };
+    if ex.rgb_only {
+        ex.warn("PDF/A: CMYK colours were converted to RGB (no CMYK output intent profile is available yet)");
+    }
+    if let Some(o) = crate::links::outline(doc, &sheets) {
+        pdf.set_outline(o);
+    }
+    for (sheet_idx, sh) in sheets.iter().enumerate() {
+        let size = Size::from_wh(sh.media.width().max(1.0) as f32, sh.media.height().max(1.0) as f32).ok_or(PdfError::NoPages)?;
+        let local = |r: Rect| {
+            krilla::geom::Rect::from_ltrb(
+                (r.x0 - sh.media.x0) as f32,
+                (r.y0 - sh.media.y0) as f32,
+                (r.x1 - sh.media.x0) as f32,
+                (r.y1 - sh.media.y0) as f32,
+            )
+        };
+        let settings = PageSettings::new(size).with_trim_box(local(sh.trim)).with_bleed_box(local(sh.bleed));
+        let mut page = pdf.start_page_with(settings);
+        let mut s = page.surface();
+        #[cfg(all(test, not(target_arch = "wasm32")))]
+        unwind_tests::inject(&mut s);
+        s.push_transform(&tf(Affine::translate(-sh.media.origin().to_vec2())));
+        ex.clip = sh.bleed;
+        if let Some(clip) = to_path(&sh.bleed.to_path(0.1)) {
+            s.push_clip_path(&clip, &FillRule::NonZero);
+            ex.spread(&mut s, sh.spread);
+            s.pop();
+        }
+        if opts.tagged {
+            s.start_tagged(ContentTag::Artifact(Artifact::new(ArtifactType::Page, None)));
+        }
+        ex.marks(&mut s, sh, &title, created);
+        if opts.tagged {
+            s.end_tagged();
+        }
+        s.pop();
+        s.finish();
+        for a in crate::links::annotations(doc, cache, &sheets, sheet_idx) {
+            page.add_annotation(a);
+        }
+        page.finish();
+    }
+    if opts.tagged {
+        pdf.set_tag_tree(ex.tag_tree());
+    }
+    ex.check_placed_versions()?;
+    if let Some(error) = ex.layer_error {
+        return Err(error);
+    }
+    let mut bytes = writer.finish().map_err(PdfError::from)?;
+    let mut warnings = ex.warnings;
+    if ex.has_optional_content {
+        bytes = crate::optional_content::register(&bytes)?;
+    }
+    add_form_fields(&mut bytes, &mut warnings, doc, &sheets, opts);
+    if opts.standard == Standard::PdfX4 {
+        // The XMP dates krilla doesn't write, then check the result.
+        match crate::pdfx::make_pdfx4(&bytes, created) {
+            Some(b) => bytes = b,
+            None => warnings.push("PDF/X-4: the XMP metadata date couldn't be added".into()),
+        }
+        for issue in crate::pdfx::check_pdfx4(&bytes) {
+            warnings.push(format!("PDF/X-4: {issue}"));
+        }
+    }
+    if opts.standard == Standard::PdfX1a {
+        bytes = crate::pdfx1a::flatten_x1a(&bytes, opts.flatten_dpi, &page_graphics(doc, &sheets), &mut warnings)?;
+    }
+    warnings.dedup();
+    Ok(ExportReport { bytes, pages: sheets.len(), warnings })
+}
+
+/// Each sheet's name and the names of the graphics placed on it, for PDF/X-1a's errors.
+fn page_graphics(doc: &Document, sheets: &[Sheet]) -> Vec<crate::pdfx1a::PageGraphics> {
+    sheets
+        .iter()
+        .map(|sh| {
+            let mut graphics: Vec<String> = Vec::new();
+            for (xf, it) in exported_items(doc, sh.spread) {
+                let Some(asset) = it.graphic().and_then(|g| doc.assets.get(&g.asset)) else { continue };
+                let shown = xf.transform_rect_bbox(it.bounds()).intersect(sh.media);
+                if shown.width() > 0.0 && shown.height() > 0.0 && !graphics.contains(&asset.name) {
+                    graphics.push(asset.name.clone());
+                }
+            }
+            crate::pdfx1a::PageGraphics { label: sh.label.clone(), graphics }
+        })
+        .collect()
+}
+
+/// `data` with its `%PDF-x.y` header (within the first 1024 bytes, where readers look for it)
+/// changed from `from` to `to`, both the same length. `None` when the header isn't `from`.
+pub(super) fn relabel_pdf_header(data: &[u8], from: &[u8], to: &[u8]) -> Option<Vec<u8>> {
+    if from.len() != to.len() {
+        return None;
+    }
+    let head = data.get(..data.len().min(1024))?;
+    let at = head.windows(from.len()).position(|w| w == from)?;
+    let mut out = data.to_vec();
+    out.get_mut(at..at + to.len())?.copy_from_slice(to);
+    Some(out)
+}
+
+/// `data` with every `/Version /1.7` changed to `/Version /1.6` in place, so the xref offsets
+/// hold. The catalog's `/Version` wins over the header (TCPDF writes both), so relabelling the
+/// header alone leaves the file a PDF 1.7. A catalog inside a compressed object stream is left as
+/// it is, and the version check still names the file.
+pub(super) fn relabel_catalog_version(mut data: Vec<u8>) -> Vec<u8> {
+    const KEY: &[u8] = b"/Version";
+    let mut from = 0;
+    while let Some(at) = data.get(from..).and_then(|rest| rest.windows(KEY.len()).position(|w| w == KEY)) {
+        let mut i = from + at + KEY.len();
+        while data.get(i).is_some_and(|b| b" \t\r\n\x0c\0".contains(b)) {
+            i += 1;
+        }
+        let ends = data.get(i + 4).is_none_or(|b| !b.is_ascii_alphanumeric() && *b != b'.');
+        if data.get(i..i + 4) == Some(b"/1.7".as_slice())
+            && ends
+            && let Some(b) = data.get_mut(i + 3)
+        {
+            *b = b'6';
+        }
+        from = i;
+    }
+    data
+}
diff --git a/crates/pdf/src/export/walk.rs b/crates/pdf/src/export/walk.rs
new file mode 100644
index 000000000..af6429b23
--- /dev/null
+++ b/crates/pdf/src/export/walk.rs
@@ -0,0 +1,440 @@
+use super::common::{TagEntry, blend, norm, rects_overlap, solid_fill, tf, to_path};
+use super::graphics::draw_coverage;
+use super::pipeline::{item_exported, layer_exported};
+use super::*;
+
+impl Exporter<'_> {
+    /// Story `sid` composed for `page` ([`Cache::get`]), asked of the cache once per export.
+    fn composed(&mut self, sid: designcraft_doc::StoryId, page: Option<usize>) -> Arc<designcraft_compose::ComposedStory> {
+        let (doc, cache) = (self.doc, self.cache);
+        self.composed.entry((sid, page)).or_insert_with(|| cache.get(doc, sid, page)).clone()
+    }
+
+    /// The parent pages' items on `layer` shown on page `pi` of spread `si`: the parent's bases
+    /// first, then the parent.
+    fn parent_items(&mut self, s: &mut Surface, si: usize, pi: usize, page: &designcraft_doc::Page, layer: &designcraft_doc::Layer, first: usize) {
+        let doc = self.doc;
+        for (ppi, ppage) in doc.shown_parent_pages(SpreadRef::Doc(si), pi) {
+            let Some(parent) = doc.parents.get(ppi) else { continue };
+            let Some(ppg) = parent.pages.get(ppage) else { continue };
+            let dx = page.x - ppg.x;
+            for it in &parent.items {
+                if it.layer != layer.id || page.overridden.contains(&it.id) {
+                    continue;
+                }
+                // Parent items belong to the parent page they sit on.
+                if parent.page_at_x(it.bounds().center().x) != Some(ppage) && parent.pages.len() > 1 {
+                    continue;
+                }
+                self.top_item(s, it, Affine::translate((dx, 0.0)), Some(first + pi), true);
+            }
+        }
+    }
+
+    pub(super) fn spread(&mut self, s: &mut Surface, si: usize) {
+        let doc = self.doc;
+        let Some(sp) = doc.spreads.get(si) else { return };
+        let first = doc.first_page_of_spread(si);
+        for layer in doc.layers.iter().rev() {
+            if !layer_exported(layer) {
+                continue;
+            }
+            for (pi, page) in sp.pages.iter().enumerate() {
+                if page.show_parent_items {
+                    self.parent_items(s, si, pi, page, layer, first);
+                }
+            }
+            for it in &sp.items {
+                if it.layer == layer.id {
+                    self.top_item(s, it, Affine::IDENTITY, None, false);
+                }
+            }
+        }
+    }
+
+    /// Push blend/opacity for an item drawn as a group. Returns the number of pushes.
+    fn push_group(s: &mut Surface, opacity: f32, mode: DcBlend) -> usize {
+        let mut n = 0;
+        if mode != DcBlend::Normal {
+            s.push_blend_mode(blend(mode));
+            n += 1;
+        }
+        if opacity < 0.999 {
+            s.push_opacity(norm(opacity));
+            n += 1;
+        } else if mode != DcBlend::Normal {
+            s.push_isolated();
+            n += 1;
+        }
+        n
+    }
+
+    /// Isolate Blending / Knockout Group: a transparency group with `/I` and `/K` as set.
+    fn push_isolation(s: &mut Surface, it: &Item) -> usize {
+        if it.isolate || it.knockout {
+            s.push_group(krilla::blend::GroupOptions { isolated: it.isolate, knockout: it.knockout });
+            1
+        } else {
+            0
+        }
+    }
+
+    /// A spread or parent item, inside its structure tag when tagging.
+    fn top_item(&mut self, s: &mut Surface, it: &Item, parent: Affine, page: Option<usize>, on_parent: bool) {
+        if !self.opts.tagged || !item_exported(it) {
+            return self.item(s, it, parent, page);
+        }
+        let story = it.text_frame().map(|t| t.story);
+        let figure = !it.alt_text.is_empty() || matches!(it.content, Content::Graphic(_)) || it.has_nested_items();
+        if on_parent || it.export_options.artifact || (story.is_none() && !figure) {
+            // Page furniture and decoration.
+            let kind = if on_parent { ArtifactType::Page } else { ArtifactType::Other };
+            s.start_tagged(ContentTag::Artifact(Artifact::new(kind, None)));
+            self.item(s, it, parent, page);
+            s.end_tagged();
+            return;
+        }
+        if let Some(sid) = story {
+            // Text runs tag themselves by paragraph; the rest of the frame is an artifact.
+            if let std::collections::hash_map::Entry::Vacant(e) = self.story_tags.entry(sid) {
+                e.insert(Vec::new());
+                self.tags.push(TagEntry::Story(sid));
+            }
+            self.tag_story = Some(sid);
+            self.item(s, it, parent, page);
+            self.tag_story = None;
+            return;
+        }
+        let id = s.start_tagged(ContentTag::Other);
+        self.item(s, it, parent, page);
+        s.end_tagged();
+        let alt = (!it.alt_text.is_empty()).then(|| it.alt_text.clone());
+        let mut g = TagGroup::new(Tag::Figure(alt));
+        g.push(id);
+        self.tags.push(TagEntry::Figure(g));
+    }
+
+    /// The structure tree: stories (one paragraph each, its frames in thread order of appearance)
+    /// and figures, in the order they first appear.
+    pub(super) fn tag_tree(&mut self) -> TagTree {
+        let mut tree = TagTree::new();
+        for e in std::mem::take(&mut self.tags) {
+            match e {
+                TagEntry::Story(sid) => {
+                    // One structure element per paragraph: headings and quotes from the
+                    // paragraph style's Export Tagging, else P.
+                    let mut paras: Vec<usize> = self.para_tags.keys().filter(|(s, _)| *s == sid).map(|(_, p)| *p).collect();
+                    paras.sort_unstable();
+                    let story = self.doc.story(sid);
+                    for pi in paras {
+                        let ids = self.para_tags.remove(&(sid, pi)).unwrap_or_default();
+                        let style = story.and_then(|st| st.paras.get(pi)).map(|p| p.style.clone()).unwrap_or_default();
+                        let tag = self.doc.styles.export_tag(&style, false).map(|e| e.tag.clone()).unwrap_or_default();
+                        let text = || story.and_then(|st| st.para_ranges().get(pi).map(|r| st.text[r.clone()].trim().to_string()));
+                        let kind: krilla::tagging::TagKind = match tag.as_str() {
+                            h if h.len() == 2 && h.starts_with('h') => {
+                                let n = h[1..].parse::<u16>().unwrap_or(1).clamp(1, 6);
+                                Tag::Hn(std::num::NonZeroU16::new(n).unwrap_or(std::num::NonZeroU16::MIN), text()).into()
+                            }
+                            "blockquote" => Tag::BlockQuote.into(),
+                            _ => Tag::P.into(),
+                        };
+                        let mut g = TagGroup::new(kind);
+                        for id in ids {
+                            g.push(id);
+                        }
+                        tree.push(g);
+                    }
+                }
+                TagEntry::Figure(g) => tree.push(g),
+            }
+        }
+        tree
+    }
+
+    fn item(&mut self, s: &mut Surface, it: &Item, parent: Affine, page: Option<usize>) {
+        if self.drawing_items.len() >= 64 || self.drawing_items.contains(&it.id) {
+            self.warnings.push(format!("Cyclic or excessively nested item {} was not rendered", it.id));
+            return;
+        }
+        self.drawing_items.push(it.id);
+        self.item_guarded(s, it, parent, page);
+        self.drawing_items.pop();
+    }
+
+    fn item_guarded(&mut self, s: &mut Surface, it: &Item, parent: Affine, page: Option<usize>) {
+        let gf = &it.effects.gradient_feather;
+        if !gf.on || !item_exported(it) {
+            return self.item_inner(s, it, parent, page);
+        }
+        // Gradient feather: a luminosity mask (white = opaque) over the object.
+        let xf = parent * it.xf;
+        let (p0, p1) = gf.points(it.feather_bounds());
+        let gray = |a: f32| -> krilla::color::Color { luma::Color::new((a.clamp(0.0, 1.0) * 255.0).round() as u8).into() };
+        let stops = vec![
+            Stop { offset: NormalizedF32::ZERO, color: gray(gf.start), opacity: NormalizedF32::ONE },
+            Stop { offset: NormalizedF32::ONE, color: gray(gf.end), opacity: NormalizedF32::ONE },
+        ];
+        let paint: krilla::paint::Paint = if gf.radial {
+            let r = (p1 - p0).hypot().max(1e-3) as f32;
+            RadialGradient {
+                fx: p0.x as f32,
+                fy: p0.y as f32,
+                fr: 0.0,
+                cx: p0.x as f32,
+                cy: p0.y as f32,
+                cr: r,
+                transform: tf(xf),
+                spread_method: SpreadMethod::Pad,
+                stops,
+                anti_alias: false,
+            }
+            .into()
+        } else {
+            LinearGradient {
+                x1: p0.x as f32,
+                y1: p0.y as f32,
+                x2: p1.x as f32,
+                y2: p1.y as f32,
+                transform: tf(xf),
+                spread_method: SpreadMethod::Pad,
+                stops,
+                anti_alias: false,
+            }
+            .into()
+        };
+        // The gradient keeps its item-space geometry, but its mask covers the complete exported
+        // area (including bleed), so distant child shadows and thick strokes are never cut off.
+        let mut sb = s.stream_builder();
+        let mut ms = sb.surface();
+        if let Some(p) = to_path(&self.clip.to_path(0.1)) {
+            ms.set_fill(Some(Fill { paint, opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
+            ms.draw_path(&p);
+        }
+        ms.finish();
+        let stream = sb.finish();
+        s.push_mask(krilla::mask::Mask::new(stream, krilla::mask::MaskType::Luminosity));
+        self.item_inner(s, it, parent, page);
+        s.pop();
+    }
+
+    fn item_inner(&mut self, s: &mut Surface, it: &Item, parent: Affine, page: Option<usize>) {
+        if !item_exported(it) {
+            return;
+        }
+        let ds = &it.effects.drop_shadow;
+        let grow = it.stroke.extent() + 2.0 + if ds.on { ds.distance.abs() + ds.size.abs() } else { 0.0 };
+        let vb = parent.transform_rect_bbox(it.bounds()).inflate(grow, grow);
+        if !rects_overlap(vb, self.clip) {
+            return;
+        }
+        let xf = parent * it.xf;
+        if it.has_nested_items() {
+            self.draw_nested_item(s, it, xf, page);
+            return;
+        }
+        if !it.children().is_empty() {
+            self.draw_group_children(s, it, xf, page);
+            return;
+        }
+        let bp = if it.corners.is_none() { it.path.to_bezpath() } else { corners::apply(&it.path, &it.corners) };
+        let path = to_path(&bp);
+        self.draw_leaf_item(s, it, parent, page, &bp, path.as_ref());
+    }
+
+    fn draw_nested_item(&mut self, s: &mut Surface, it: &Item, xf: Affine, page: Option<usize>) {
+        // A frame with items pasted into it: fill, the items clipped to the frame, stroke.
+        let bp = if it.corners.is_none() { it.path.to_bezpath() } else { corners::apply(&it.path, &it.corners) };
+        let path = to_path(&bp);
+        let pushes = Self::push_group(s, it.opacity, it.blend);
+        s.push_transform(&tf(xf));
+        if !it.fill.is_none()
+            && let Some(p) = &path
+            && let Some(paint) = self.fill_paint(&it.fill, bp.bounding_box())
+        {
+            self.fill_item_path(s, &it.fill, paint, p);
+        }
+        s.pop();
+        // The clip in page space, so the children keep their absolute transforms.
+        let mut page_bp = bp.clone();
+        page_bp.apply_affine(xf);
+        let clip = to_path(&page_bp);
+        if let Some(c) = &clip {
+            s.push_clip_path(c, &FillRule::NonZero);
+        }
+        for child in it.children() {
+            self.item(s, child, xf, page);
+        }
+        if clip.is_some() {
+            s.pop();
+        }
+        if !it.stroke.is_none()
+            && let Some(p) = &path
+        {
+            s.push_transform(&tf(xf));
+            self.stroke(s, it, &bp, p);
+            s.pop();
+        }
+        for _ in 0..pushes {
+            s.pop();
+        }
+    }
+
+    fn draw_group_children(&mut self, s: &mut Surface, it: &Item, xf: Affine, page: Option<usize>) {
+        let pushes = Self::push_group(s, it.opacity, it.blend) + Self::push_isolation(s, it);
+        for child in it.shown_children() {
+            self.item(s, child, xf, page);
+        }
+        for _ in 0..pushes {
+            s.pop();
+        }
+    }
+
+    fn draw_leaf_item(&mut self, s: &mut Surface, it: &Item, parent: Affine, page: Option<usize>, bp: &BezPath, path: Option<&Path>) {
+        let xf = parent * it.xf;
+        let pushes = Self::push_group(s, it.opacity, it.blend);
+        let frame_art = self.tag_story.is_some();
+        if frame_art {
+            s.start_tagged(ContentTag::Artifact(Artifact::new(ArtifactType::Other, None)));
+        }
+        self.draw_drop_shadow(s, it, parent, xf, path);
+        s.push_transform(&tf(xf));
+        if !it.fill.is_none()
+            && let Some(p) = path
+            && let Some(paint) = self.fill_paint(&it.fill, bp.bounding_box())
+        {
+            self.fill_item_path(s, &it.fill, paint, p);
+        }
+        if frame_art {
+            s.end_tagged();
+        }
+        self.draw_leaf_content(s, it, bp, path, page);
+        self.draw_leaf_stroke(s, it, bp, path, frame_art);
+        s.pop();
+        for _ in 0..pushes {
+            s.pop();
+        }
+        if let Content::Text(tfr) = &it.content {
+            let cs = self.composed(tfr.story, page);
+            if let Some(ft) = cs.frame(it.id) {
+                self.frame_objects(s, ft, xf * self.doc.text_local(it), page);
+            }
+        }
+    }
+
+    /// Draw a cached coverage mask or the offset item silhouette as the drop shadow.
+    fn draw_drop_shadow(&mut self, s: &mut Surface, it: &Item, parent: Affine, xf: Affine, path: Option<&Path>) {
+        let ds = &it.effects.drop_shadow;
+        if ds.on
+            && let Some(mask) = self.opts.shadows.get(&it.id)
+            && let Some(c) = self.swatch_color(&ds.color, 1.0)
+        {
+            s.push_transform(&tf(parent));
+            draw_coverage(s, mask, c);
+            s.pop();
+        } else if ds.on
+            && let Some(p) = path
+            && let Some(c) = self.swatch_color(&ds.color, 1.0)
+        {
+            let a = self.doc.light_angle(ds.angle, ds.global_light).to_radians();
+            let off = Vec2::new(-a.cos() * ds.distance, a.sin() * ds.distance);
+            s.push_transform(&tf(Affine::translate(off) * xf));
+            s.set_stroke(None);
+            s.set_fill(Some(solid_fill(c, ds.opacity)));
+            s.draw_path(p);
+            s.set_fill(None);
+            s.pop();
+        }
+    }
+
+    fn draw_leaf_content(&mut self, s: &mut Surface, it: &Item, bp: &BezPath, path: Option<&Path>, page: Option<usize>) {
+        let doc = self.doc;
+        match &it.content {
+            Content::Graphic(g) => {
+                let g = &if it.media.is_some() { it.drawn_graphic(&self.doc.assets).unwrap_or_else(|| g.clone()) } else { g.clone() };
+                if let Some(p) = path {
+                    s.push_clip_path(p, &FillRule::NonZero);
+                    // An explicit all-on choice is `Some(&[])`, not the file's defaults: passing
+                    // `None` would embed the source's default-hidden layers and skip the rewrite
+                    // error that a stale choice must raise.
+                    self.graphic(s, g, it.has_pdf_layer_override().then_some(it.pdf_hidden_layers.as_slice()));
+                    s.pop();
+                }
+            }
+            Content::Text(tfr) => {
+                let cs = self.composed(tfr.story, page);
+                if let (Some(ft), Some(pt)) = (cs.frame(it.id), &tfr.options.path) {
+                    // Type on a path: the glyphs as outlines along the path.
+                    for (si, gp) in designcraft_compose::path_glyphs(&cs, ft, bp, pt) {
+                        let st = &cs.styles[si as usize];
+                        // A gradient spans the path's box.
+                        let fill = designcraft_doc::Fill {
+                            swatch: st.fill.clone(),
+                            tint: st.fill_tint,
+                            overprint: st.overprint_fill,
+                            ..designcraft_doc::Fill::none()
+                        };
+                        if let (Some(paint), Some(p)) = (self.fill_paint(&fill, bp.bounding_box()), to_path(&gp)) {
+                            let op = self.overprints(&st.fill, st.fill_tint, st.overprint_fill);
+                            let op = self.push_overprint(s, op, false);
+                            s.set_fill(Some(Fill { paint, opacity: NormalizedF32::ONE, rule: FillRule::NonZero }));
+                            s.draw_path(&p);
+                            s.set_fill(None);
+                            if op {
+                                s.pop();
+                            }
+                        }
+                    }
+                } else if let Some(ft) = cs.frame(it.id) {
+                    let text = doc.story(tfr.story).map(|st| st.text.as_str()).unwrap_or("");
+                    let local = doc.text_local(it);
+                    if local != Affine::IDENTITY {
+                        s.push_transform(&tf(local));
+                    }
+                    self.text_area = (local.determinant().abs() > 1e-12).then(|| local.inverse().transform_rect_bbox(it.inner_bounds()));
+                    self.frame_text(s, &cs, ft, text);
+                    self.text_area = None;
+                    if local != Affine::IDENTITY {
+                        s.pop();
+                    }
+                }
+            }
+            _ => {}
+        }
+    }
+
+    fn draw_leaf_stroke(&mut self, s: &mut Surface, it: &Item, bp: &BezPath, path: Option<&Path>, frame_art: bool) {
+        if !it.stroke.is_none()
+            && let Some(p) = path
+        {
+            if frame_art {
+                s.start_tagged(ContentTag::Artifact(Artifact::new(ArtifactType::Other, None)));
+            }
+            self.stroke(s, it, bp, p);
+            if frame_art {
+                s.end_tagged();
+            }
+        }
+    }
+
+    /// Draw embedded page items after restoring the surface, retaining spread-space
+    /// transforms for page culling (also for anonymous note and cell stories).
+    fn frame_objects(&mut self, s: &mut Surface, ft: &designcraft_compose::FrameText, xf: Affine, page: Option<usize>) {
+        let mut pending = vec![(ft, xf)];
+        while let Some((frame, transform)) = pending.pop() {
+            for object in &frame.objects {
+                self.item(s, &object.object.item, transform * Affine::translate(object.origin.to_vec2()), page);
+            }
+            for note in &frame.notes {
+                if let Some(frame) = note.text.frames.first() {
+                    pending.push((frame, transform * Affine::translate(note.origin.to_vec2())));
+                }
+            }
+            for cell in frame.tables.iter().flat_map(|t| &t.cells) {
+                if let Some(frame) = cell.text.frames.first() {
+                    pending.push((frame, transform * Affine::translate(cell.origin.to_vec2())));
+                }
+            }
+        }
+    }
+}
diff --git a/crates/pdf/src/gradient_inks.rs b/crates/pdf/src/gradient_inks.rs
new file mode 100644
index 000000000..e889ee1d2
--- /dev/null
+++ b/crates/pdf/src/gradient_inks.rs
@@ -0,0 +1,208 @@
+//! Gradients written in their inks. A gradient whose stops name a spot swatch shades in that
+//! spot: one spot with paper or tints of itself is a Separation shading, a spot with process
+//! inks or a second spot a DeviceN shading (process colorants in CMYK order, then the spots).
+//! In print, a process gradient with a `[Paper]` stop shades in DeviceCMYK. An overprinting
+//! gradient of fewer than four process inks is a DeviceN shading of just those inks: nonzero
+//! overprint mode doesn't apply to shadings (ISO 32000-2 §8.6.7), so a DeviceCMYK shading's
+//! zero components would knock out the plates beneath.
+
+use craft_pdf::write::backend as krilla;
+use designcraft_color::swatch::{ColorType, SwatchValue, apply_tint};
+use designcraft_color::{Color, Gradient};
+use krilla::color::device_n::{self, Colorant, DeviceNSpace, Process};
+use krilla::color::separation::{self, SeparationColorant, SeparationSpace};
+use krilla::paint::Stop;
+
+use crate::export::{Exporter, norm, q, regular};
+
+/// A stop as inks.
+enum Ink {
+    /// CMYK tints (0..=1); `[Paper]` is all zero.
+    Process([f32; 4]),
+    Spot {
+        name: String,
+        alternate: Color,
+        tint: f32,
+    },
+}
+
+/// Inks of a plain color: CMYK as it is, gray as black. RGB has none.
+fn process_inks(c: Color) -> Option<[f32; 4]> {
+    let tint = |v: f32| if v.is_finite() { v.clamp(0.0, 1.0) } else { 0.0 };
+    match c {
+        Color::Cmyk { c, m, y, k } => Some([tint(c), tint(m), tint(y), tint(k)]),
+        Color::Gray { k } => Some([0.0, 0.0, 0.0, tint(k)]),
+        Color::Rgb { .. } => None,
+    }
+}
+
+/// The shading's color space.
+enum Space {
+    Separation(SeparationSpace),
+    DeviceN(DeviceNSpace),
+}
+
+impl Exporter<'_> {
+    /// The inks a stop prints with, following tints and the Ink Manager as solid fills do.
+    /// `None` when they can't go into an ink shading (RGB, `[Registration]`).
+    fn stop_ink(&self, stop: &designcraft_color::GradientStop) -> Option<Ink> {
+        let Some(mut n) = stop.swatch.as_deref() else { return process_inks(stop.color).map(Ink::Process) };
+        let mut t = 1.0f32;
+        for _ in 0..8 {
+            // A swatch that's gone leaves the stop's own color.
+            let Some(sw) = self.doc.swatch(n) else { return process_inks(stop.color).map(Ink::Process) };
+            match &sw.value {
+                SwatchValue::Paper { .. } => return Some(Ink::Process([0.0; 4])),
+                SwatchValue::Tint { base, tint } => {
+                    t *= tint;
+                    n = base;
+                }
+                SwatchValue::Color { color_type: ColorType::Spot, .. } => {
+                    let (ink, process) = crate::inks::spot_output(self.doc, &self.inks, &sw.name);
+                    let target =
+                        self.doc.swatch(ink).filter(|w| matches!(w.value, SwatchValue::Color { color_type: ColorType::Spot, .. })).unwrap_or(sw);
+                    let SwatchValue::Color { color, .. } = &target.value else { return None };
+                    if process {
+                        return process_inks(apply_tint(*color, t)).map(Ink::Process);
+                    }
+                    let tint = if t.is_finite() { t.clamp(0.0, 1.0) } else { 1.0 };
+                    return Some(Ink::Spot { name: target.name.clone(), alternate: *color, tint });
+                }
+                SwatchValue::Color { color, .. } => return process_inks(apply_tint(*color, t)).map(Ink::Process),
+                SwatchValue::Registration | SwatchValue::None | SwatchValue::Gradient { .. } => return None,
+            }
+        }
+        None
+    }
+
+    /// The gradient's stops in its inks, or `None` to write it in device colors (no spot, or
+    /// inks that can't share one shading space, which is warned about). `overprint`: the paint
+    /// overprints.
+    pub(crate) fn ink_gradient_stops(&mut self, g: &Gradient, swatch: &str, overprint: bool) -> Option<Vec<Stop>> {
+        let overprint = overprint && !self.rgb_only;
+        // Plain-color stops (all older documents) keep their device colors.
+        if !overprint && g.stops.iter().all(|s| s.swatch.is_none()) {
+            return None;
+        }
+        let inks: Vec<Option<Ink>> = g.stops.iter().map(|s| self.stop_ink(s)).collect();
+        let has_spot = inks.iter().any(|i| matches!(i, Some(Ink::Spot { .. })));
+        let on_paper = g.stops.iter().any(|s| s.swatch.as_deref() == Some(designcraft_color::swatch::PAPER));
+        if !has_spot && !overprint && !(on_paper && self.for_print() && !self.rgb_only) {
+            return None;
+        }
+        let Some(inks) = inks.into_iter().collect::<Option<Vec<Ink>>>() else {
+            return self.unshaded(swatch, "a stop has no inks (RGB or [Registration])", has_spot);
+        };
+        // Spots in the order the stops name them; process inks a stop sets.
+        let mut spots: Vec<(String, Color)> = Vec::new();
+        let mut process = [false; 4];
+        for i in &inks {
+            match i {
+                Ink::Process(v) => {
+                    for (used, v) in process.iter_mut().zip(v) {
+                        *used |= *v > 1e-6;
+                    }
+                }
+                Ink::Spot { name, alternate, .. } => {
+                    if !spots.iter().any(|(n, _)| n == name) {
+                        spots.push((name.clone(), *alternate));
+                    }
+                }
+            }
+        }
+        let process: Vec<usize> = (0..4).filter(|j| process.get(*j).copied().unwrap_or(false)).collect();
+        let space = match (spots.as_slice(), process.is_empty()) {
+            // All four inks are painted either way.
+            ([], false) if overprint && process.len() < 4 => {
+                let colorants: Vec<Colorant> = process.iter().filter_map(|j| Process::ALL.get(*j).copied().map(Colorant::Process)).collect();
+                match DeviceNSpace::new(colorants) {
+                    Some(s) => Some(Space::DeviceN(s)),
+                    None => return self.unshaded(swatch, "its inks don't fit one DeviceN space", false),
+                }
+            }
+            ([], _) => None,
+            ([(name, alternate)], true) => {
+                Some(Space::Separation(SeparationSpace::new(SeparationColorant::Custom(name.clone()), regular(alternate, self.rgb_only))))
+            }
+            _ => {
+                if self.rgb_only {
+                    return self.unshaded(swatch, "DeviceN isn't allowed in PDF/A", true);
+                }
+                let mut colorants: Vec<Colorant> = process.iter().filter_map(|j| Process::ALL.get(*j).copied().map(Colorant::Process)).collect();
+                for (name, alternate) in &spots {
+                    let Color::Cmyk { c, m, y, k } = *alternate else {
+                        return self.unshaded(swatch, &format!("'{name}' has no CMYK values"), true);
+                    };
+                    colorants.push(Colorant::Spot { name: name.clone(), alternate: krilla::color::cmyk::Color::new(q(c), q(m), q(y), q(k)) });
+                }
+                match DeviceNSpace::new(colorants) {
+                    Some(s) => Some(Space::DeviceN(s)),
+                    None => return self.unshaded(swatch, "its inks don't fit one DeviceN space", true),
+                }
+            }
+        };
+        // Tints per colorant at each authored stop.
+        let tints: Vec<Vec<f32>> = inks
+            .iter()
+            .map(|i| {
+                let mut v = vec![0.0f32; process.len() + spots.len()];
+                match i {
+                    Ink::Process(p) => {
+                        for (slot, j) in v.iter_mut().zip(&process) {
+                            *slot = p.get(*j).copied().unwrap_or(0.0);
+                        }
+                    }
+                    Ink::Spot { name, tint, .. } => {
+                        if let Some(slot) = spots.iter().position(|(n, _)| n == name).and_then(|k| v.get_mut(process.len() + k)) {
+                            *slot = *tint;
+                        }
+                    }
+                }
+                v
+            })
+            .collect();
+        // A midpoint becomes a stop halfway between its neighbours' tints, as the display does.
+        let mut expanded: Vec<(f32, Vec<f32>, f32)> = Vec::with_capacity(tints.len() * 2);
+        for (k, (s, v)) in g.stops.iter().zip(&tints).enumerate() {
+            expanded.push((s.offset, v.clone(), s.opacity));
+            if let (Some(n), Some(nv)) = (g.stops.get(k + 1), tints.get(k + 1))
+                && (s.midpoint - 0.5).abs() > 1e-3
+            {
+                let mid: Vec<f32> = v.iter().zip(nv).map(|(a, b)| (a + b) / 2.0).collect();
+                expanded.push((s.offset + (n.offset - s.offset) * s.midpoint, mid, (s.opacity + n.opacity) / 2.0));
+            }
+        }
+        let mut stops = Vec::with_capacity(expanded.len());
+        let mut last = 0.0f32;
+        for (o, v, a) in expanded {
+            let o = if o.is_finite() { o.clamp(last, 1.0) } else { last };
+            last = o;
+            let color: krilla::color::Color = match &space {
+                Some(Space::Separation(sp)) => separation::Color::new(q(v.first().copied().unwrap_or(0.0)), sp.clone()).into(),
+                Some(Space::DeviceN(sp)) => device_n::Color::new(v.iter().map(|t| q(*t)).collect(), sp.clone())?.into(),
+                // Process inks only (a gradient to [Paper] in print, or an overprinting one of
+                // all four inks).
+                None => {
+                    let mut cmyk = [0.0f32; 4];
+                    for (t, j) in v.iter().zip(&process) {
+                        if let Some(slot) = cmyk.get_mut(*j) {
+                            *slot = *t;
+                        }
+                    }
+                    let [c, m, y, k] = cmyk;
+                    krilla::color::cmyk::Color::new(q(c), q(m), q(y), q(k)).into()
+                }
+            };
+            stops.push(Stop { offset: norm(o), color, opacity: norm(a) });
+        }
+        (!stops.is_empty()).then_some(stops)
+    }
+
+    /// Falls back to device colors, warning when that loses a spot ink.
+    fn unshaded(&mut self, swatch: &str, why: &str, has_spot: bool) -> Option<Vec<Stop>> {
+        if has_spot {
+            self.warn(format!("gradient '{swatch}': spot inks printed as process color ({why})"));
+        }
+        None
+    }
+}
diff --git a/crates/pdf/src/inks.rs b/crates/pdf/src/inks.rs
new file mode 100644
index 000000000..72009e9e1
--- /dev/null
+++ b/crates/pdf/src/inks.rs
@@ -0,0 +1,97 @@
+//! The document's inks as a [`craft_prepress::InkSet`]: the four process inks, each spot swatch
+//! with its color as the alternate, and the Ink Manager settings (aliases, spots to process).
+//!
+//! The document saves the Ink Manager by swatch name ([`designcraft_doc::InkManager`]); the set
+//! is built from it whenever output needs it, so renaming or editing a swatch never leaves a
+//! stale copy.
+
+use craft_prepress::{Alternate, Ink, InkId, InkSet, Spot};
+use designcraft_color::swatch::{ColorType, Swatch, SwatchValue};
+use designcraft_doc::Document;
+
+fn is_spot(w: &Swatch) -> bool {
+    matches!(w.value, SwatchValue::Color { color_type: ColorType::Spot, .. })
+}
+
+/// The inks of `doc` with its Ink Manager settings applied. An alias whose target isn't a spot
+/// swatch, or that would make a loop, is left out: that spot prints on its own plate.
+pub fn ink_set(doc: &Document) -> InkSet {
+    let mut set = InkSet::new();
+    for w in doc.swatches.iter().filter(|w| is_spot(w)) {
+        let SwatchValue::Color { color, .. } = w.value else { continue };
+        let alternate = match color {
+            designcraft_color::Color::Cmyk { c, m, y, k } => Alternate::Cmyk([c, m, y, k]),
+            other => {
+                let lab = other.to_lab();
+                Alternate::Lab([lab.l, lab.a, lab.b])
+            }
+        };
+        set.add(Ink::Spot(Spot { name: w.name.clone(), alternate, solidity: None }));
+    }
+    let spot_id = |set: &InkSet, name: &str| doc.swatch(name).filter(|w| is_spot(w)).and_then(|_| set.lookup(name));
+    for name in &doc.inks.to_process {
+        if let Some(id) = spot_id(&set, name) {
+            set.set_to_process(id, true);
+        }
+    }
+    for (from, to) in &doc.inks.aliases {
+        if let (Some(from), Some(to)) = (spot_id(&set, from), spot_id(&set, to)) {
+            set.alias(from, to);
+        }
+    }
+    set.set_all_to_process(doc.inks.all_to_process);
+    set
+}
+
+/// How spot swatch `name` prints: the spot swatch whose plate (or, converted, whose color) it
+/// takes after aliases, and whether it prints as process color. A name the set doesn't hold
+/// prints as itself on its own plate.
+pub fn spot_output<'a>(doc: &'a Document, set: &InkSet, name: &'a str) -> (&'a str, bool) {
+    let Some(id) = set.lookup(name) else { return (name, false) };
+    let end = std::iter::successors(Some(id), |i| set.alias_of(*i)).take(set.len()).last().unwrap_or(id);
+    let target = if end == id { name } else { swatch_of(doc, set, end).unwrap_or(name) };
+    (target, set.plate_of(id).is_none())
+}
+
+/// The first spot swatch that is ink `id`.
+fn swatch_of<'a>(doc: &'a Document, set: &InkSet, id: InkId) -> Option<&'a str> {
+    doc.swatches.iter().filter(|w| is_spot(w)).find(|w| set.lookup(&w.name) == Some(id)).map(|w| w.name.as_str())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use designcraft_color::Color;
+    use designcraft_doc::build::NewDocument;
+
+    fn spot(d: &mut Document, name: &str, color: Color) {
+        d.swatches.push(Swatch {
+            name: name.into(),
+            value: SwatchValue::Color { color, color_type: ColorType::Spot },
+            locked: false,
+            named: true,
+            hidden: false,
+        });
+    }
+
+    #[test]
+    fn aliases_follow_chains_and_converted_inks_print_as_process() {
+        let mut d = Document::new(&NewDocument::default());
+        spot(&mut d, "Gold", Color::Cmyk { c: 0.0, m: 0.2, y: 0.8, k: 0.1 });
+        spot(&mut d, "Bronze", Color::Rgb { r: 0.6, g: 0.4, b: 0.2 });
+        spot(&mut d, "Copper", Color::Cmyk { c: 0.0, m: 0.5, y: 0.6, k: 0.2 });
+        d.inks.aliases = vec![("Gold".into(), "Bronze".into()), ("Bronze".into(), "Copper".into()), ("Copper".into(), "Gold".into())];
+        d.inks.to_process = vec!["Copper".into()];
+        let set = ink_set(&d);
+        assert_eq!(set.spots().map(|(_, s)| s.name.as_str()).collect::<Vec<_>>(), ["Gold", "Bronze", "Copper"]);
+        // The loop-closing alias is refused, so Gold → Bronze → Copper, which is converted.
+        assert_eq!(spot_output(&d, &set, "Gold"), ("Copper", true));
+        assert_eq!(spot_output(&d, &set, "Copper"), ("Copper", true));
+        d.inks.to_process.clear();
+        let set = ink_set(&d);
+        assert_eq!(spot_output(&d, &set, "Bronze"), ("Copper", false));
+        assert_eq!(spot_output(&d, &set, "Unknown"), ("Unknown", false));
+        d.inks.all_to_process = true;
+        assert!(spot_output(&d, &ink_set(&d), "Gold").1);
+    }
+}
diff --git a/crates/pdf/src/lib.rs b/crates/pdf/src/lib.rs
index 66512ac50..7d6682c6d 100644
--- a/crates/pdf/src/lib.rs
+++ b/crates/pdf/src/lib.rs
@@ -12,8 +12,13 @@
 //! - **Colour:** CMYK as DeviceCMYK, RGB as DeviceRGB, Gray as DeviceGray, spot swatches (and their
 //!   tints) as `/Separation` with the swatch's own values as the alternate space, `[Registration]`
 //!   as `/Separation /All`.
-//!   Gradients with mixed output colour spaces are converted to RGB with an export warning;
-//!   homogeneous gradients keep their existing colour space (subject to PDF/A conversion).
+//!   Gradient stops on swatches shade in their inks: one spot with tints of itself or `[Paper]`
+//!   as a `/Separation` shading, a spot with process inks or a second spot as `/DeviceN`
+//!   (process colorants first; not in PDF/A, which goes to process color with a warning), and in
+//!   print a process gradient to `[Paper]` as DeviceCMYK. Plain-color stops keep their own
+//!   space; gradients mixing RGB with CMYK or Gray are converted to RGB with an export warning.
+//! - **Overprint:** Overprint Fill, Stroke and Gap, overprinting text and 100% [Black] (when
+//!   Appearance of Black says so) as `/op` and `/OP` with `/OPM 1`; left out of PDF/A.
 //! - **Images:** clipped to their frame; JPEG data is passed through, PNG/GIF/WebP are embedded
 //!   losslessly (or re-encoded as JPEG with [`PdfOptions::compress_images`]). PDF/X-4 and PDF/A
 //!   images are written without interpolation. In PDF/X-4 an RGB image without a profile of its own
@@ -23,22 +28,31 @@
 //!   right characters), so text is selectable and searchable.
 //! - **Marks:** crop marks, bleed marks and a page-information line, drawn in `[Registration]`.
 //! - **Standards:** PDF/A-2b through krilla's validator and PDF/X-4 output intent/identification
-//!   with built-in conformance checks. `designcraft-cli validate-pdf` exposes those checks for CI.
+//!   with built-in conformance checks. PDF/X-1a:2003 is the PDF/X-4 print file flattened by
+//!   craft-prepress (no transparency, only DeviceCMYK, DeviceGray, Separation and DeviceN) and
+//!   written by krilla as PDF 1.4 with the PDF/X-1a identification. `designcraft-cli validate-pdf` exposes those checks for CI.
 //!
-//! Not yet: tagged PDF, bookmarks, hyperlinks, overprint, layers as optional content.
+//! Not yet: tagged PDF, bookmarks, hyperlinks, layers as optional content.
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
 #![forbid(unsafe_code)]
 
 mod export;
+mod gradient_inks;
+pub mod inks;
 mod links;
 mod marks;
 mod text;
 
 mod forms;
+mod optional_content;
 mod pdfx;
+mod pdfx1a;
 mod transitions;
-pub use export::{BookletKind, BookletOptions, booklet_pairs, export_booklet, export_pdf, export_pdf_with_report, merge_pdfs, sheet_spreads};
-pub use pdfx::{check_pdfx4, cmyk_group_spaces, has_rgb_groups, make_pdfx4};
+pub use export::{
+    BookletKind, BookletOptions, booklet_pairs, export_booklet, export_pdf, export_pdf_with_report, merge_pdfs, print_color, sheet_spreads,
+};
+pub use pdfx::{check_pdfx4, has_rgb_groups, make_pdfx4};
+pub use pdfx1a::check_pdfx1a;
 pub use transitions::{add_blend_space, add_catalog_entries, add_page_entries, add_transitions};
 
 /// PDF standard to target.
@@ -49,21 +63,30 @@ pub enum Standard {
     None,
     /// PDF/X-4 (PDF 1.6, trim/bleed boxes, output intent and identification).
     PdfX4,
+    /// PDF/X-1a:2003 (PDF 1.4, CMYK and spot only, no transparency): the PDF/X-4 file flattened.
+    PdfX1a,
     /// PDF/A-2b (archival; validated by krilla).
     PdfA2b,
 }
 
 impl Standard {
-    /// `none`, `x4` / `pdfx4` / `PDF/X-4`, `a2b` / `pdfa2b` / `PDF/A-2b`.
+    /// `none`, `x4` / `pdfx4` / `PDF/X-4`, `x1a` / `pdfx1a` / `PDF/X-1a:2003`, `a2b` / `pdfa2b` /
+    /// `PDF/A-2b`.
     pub fn parse(s: &str) -> Option<Self> {
         let k: String = s.chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase();
         match k.as_str() {
             "" | "none" => Some(Self::None),
             "x4" | "pdfx4" | "pdfx42008" | "pdfx42010" => Some(Self::PdfX4),
+            "x1a" | "pdfx1a" | "pdfx1a2003" => Some(Self::PdfX1a),
             "a2b" | "pdfa2b" => Some(Self::PdfA2b),
             _ => None,
         }
     }
+
+    /// PDF/X: a CMYK output intent, trim boxes, no interpolation.
+    pub fn is_pdfx(self) -> bool {
+        matches!(self, Self::PdfX4 | Self::PdfX1a)
+    }
 }
 
 /// Printer's marks (Export PDF › Marks and Bleeds).
@@ -120,6 +143,22 @@ pub struct PdfOptions {
     pub tagged: bool,
     /// Interactive PDF: placed video and sound are embedded and play in Screen annotations.
     pub media: bool,
+    /// PDF/X-1a: the resolution (pixels per inch) craft-prepress's flattener rasterizes complex
+    /// transparent regions at.
+    pub flatten_dpi: f32,
+    /// Soft drop shadows drawn as their shadow color through a coverage mask, by item id (spread
+    /// items only). Items without one draw the simple offset silhouette.
+    pub shadows: std::sync::Arc<std::collections::HashMap<designcraft_doc::ItemId, ShadowMask>>,
+}
+
+/// A soft drop shadow's coverage over `rect` (spread coordinates): `width` × `height` greys,
+/// 255 = the shadow color at full strength. Its opacity is in the coverage.
+#[derive(Clone, Debug, PartialEq)]
+pub struct ShadowMask {
+    pub rect: designcraft_geom::Rect,
+    pub width: u32,
+    pub height: u32,
+    pub coverage: std::sync::Arc<Vec<u8>>,
 }
 
 impl Default for PdfOptions {
@@ -137,6 +176,8 @@ impl Default for PdfOptions {
             created: None,
             tagged: false,
             media: false,
+            flatten_dpi: 300.0,
+            shadows: Default::default(),
         }
     }
 }
@@ -206,10 +247,14 @@ impl From<craft_pdf::write::WriteError> for PdfError {
     }
 }
 
+#[cfg(test)]
+mod print_tests;
 #[cfg(test)]
 mod rtl_tests;
 #[cfg(test)]
 mod tests;
+#[cfg(test)]
+mod x1a_tests;
 
 // Run the same public API/output contracts with the unit-only colliding cache hasher as well
 // as the production RandomState used by the integration-test executable.
diff --git a/crates/pdf/src/optional_content.rs b/crates/pdf/src/optional_content.rs
new file mode 100644
index 000000000..7857d36d7
--- /dev/null
+++ b/crates/pdf/src/optional_content.rs
@@ -0,0 +1,474 @@
+use hayro_syntax::Pdf;
+use hayro_syntax::object::{Array, Dict, MaybeRef, Name, Object, ObjectIdentifier, Stream};
+use hayro_syntax::reader::{Reader, ReaderExt};
+use std::sync::Arc;
+
+use crate::{PdfError, Result};
+
+const MARKER: &[u8] = b"DesignCraftHiddenOCG";
+
+fn invalid() -> PdfError {
+    PdfError::Write("the placed PDF's optional-content state could not be preserved safely".into())
+}
+
+/// A layer hidden in Object Layer Options that the placed file doesn't have (relinked, say):
+/// exporting would be a guess at what was meant to stay hidden.
+fn missing_layer() -> PdfError {
+    PdfError::Write("a layer hidden in Object Layer Options is not in the placed PDF; relink it or reset its layer options".into())
+}
+
+fn references(dict: &Dict<'_>, key: &[u8]) -> Result<Vec<ObjectIdentifier>> {
+    if !dict.contains_key(key) {
+        return Ok(Vec::new());
+    }
+    dict.get::<Array<'_>>(key).ok_or_else(invalid)?.raw_iter().map(|value| value.as_obj_ref().map(Into::into).ok_or_else(invalid)).collect()
+}
+
+fn edited(dict: &Dict<'_>, replacements: &[(&[u8], &[u8])]) -> Result<Vec<u8>> {
+    let data = dict.data();
+    let body = data.strip_prefix(b"<<").and_then(|d| d.strip_suffix(b">>")).ok_or_else(invalid)?;
+    let mut reader = Reader::new(body);
+    let mut out = b"<<".to_vec();
+    loop {
+        reader.skip_white_spaces_and_comments();
+        if reader.at_end() {
+            break;
+        }
+        let start = reader.offset();
+        let name = reader.read_without_context::<Name<'_>>().ok_or_else(invalid)?;
+        reader.skip_white_spaces_and_comments();
+        reader.skip::<MaybeRef<Object<'_>>>(false).ok_or_else(invalid)?;
+        if !replacements.iter().any(|(key, _)| *key == name.as_ref()) {
+            out.push(b'\n');
+            out.extend_from_slice(body.get(start..reader.offset()).ok_or_else(invalid)?);
+        }
+    }
+    for (key, value) in replacements {
+        if !value.is_empty() {
+            out.extend_from_slice(b"\n/");
+            out.extend_from_slice(key);
+            out.push(b' ');
+            out.extend_from_slice(value);
+        }
+    }
+    out.extend_from_slice(b"\n>>");
+    Ok(out)
+}
+
+/// The trailer of the cross-reference section at `offset`: a table's `trailer` dictionary or an
+/// xref stream's own. A table is read entry by entry rather than searched for the keyword, so a
+/// `trailer` in a comment can't stand in for the real one; reading is bounded either way.
+fn trailer_at(bytes: &[u8], offset: usize) -> Option<Dict<'_>> {
+    const MAX_SECTION_BYTES: usize = 4 * 1024 * 1024;
+    let data = bytes.get(offset..)?;
+    let mut reader = Reader::new(data.get(..data.len().min(MAX_SECTION_BYTES))?);
+    reader.skip_white_spaces_and_comments();
+    if reader.forward_tag(b"xref").is_none() {
+        reader.read_without_context::<ObjectIdentifier>()?;
+        reader.skip_white_spaces_and_comments();
+        let stream = reader.read_without_context::<Stream<'_>>()?;
+        let is_xref = stream.dict().get::<Name<'_>>(b"Type").as_ref().map(AsRef::as_ref) == Some(b"XRef");
+        return is_xref.then(|| stream.dict().clone());
+    }
+    // Every pass consumes input or fails, and the input is bounded, so this ends.
+    loop {
+        reader.skip_white_spaces();
+        if reader.forward_tag(b"trailer").is_some() {
+            break;
+        }
+        reader.read_without_context::<u32>()?;
+        reader.skip_white_spaces();
+        let count = reader.read_without_context::<usize>()?;
+        if count > MAX_SECTION_BYTES / 18 {
+            return None;
+        }
+        for _ in 0..count {
+            reader.skip_white_spaces();
+            reader.read_without_context::<u32>()?;
+            reader.skip_white_spaces();
+            if reader.read_without_context::<u32>()? > 65535 {
+                return None;
+            }
+            reader.skip_white_spaces();
+            reader.forward_tag(b"n").or_else(|| reader.forward_tag(b"f"))?;
+        }
+    }
+    reader.skip_white_spaces_and_comments();
+    reader.read_without_context::<Dict<'_>>()
+}
+
+/// Whether `dict` has `key`: a literal `null` value is the same as no entry. A reference counts,
+/// since a trailer has no context to resolve it in.
+fn has_entry(dict: &Dict<'_>, key: &[u8]) -> bool {
+    dict.contains_key(key) && !matches!(dict.get_raw::<Object<'_>>(key), Some(MaybeRef::NotRef(Object::Null(_))))
+}
+
+fn append(bytes: &[u8], changes: &[(ObjectIdentifier, Vec<u8>)], root: ObjectIdentifier) -> Result<Vec<u8>> {
+    let damaged = || PdfError::Write("the placed PDF's cross-reference table is damaged; layer changes could not be preserved safely".into());
+    let at = crate::transitions::rfind(bytes, b"startxref").ok_or_else(damaged)?;
+    let tail = std::str::from_utf8(bytes.get(at..).ok_or_else(damaged)?).map_err(|_| damaged())?;
+    let prev = crate::transitions::int_after(tail, "startxref").ok_or_else(damaged)?;
+    let trailer = trailer_at(bytes, prev).ok_or_else(damaged)?;
+    // Never write decrypted objects into an encrypted file. An earlier update's trailer can
+    // carry the encryption, so follow the (bounded, acyclic) Prev chain to its end.
+    let mut offset = Some(prev);
+    let mut visited = std::collections::HashSet::new();
+    for _ in 0..32 {
+        let Some(at) = offset else { break };
+        if !visited.insert(at) {
+            return Err(damaged());
+        }
+        let section = trailer_at(bytes, at).ok_or_else(damaged)?;
+        if has_entry(&section, b"Encrypt") {
+            return Err(invalid());
+        }
+        offset = section.get::<usize>(b"Prev");
+        if offset.is_none() && has_entry(&section, b"Prev") {
+            return Err(damaged());
+        }
+    }
+    if offset.is_some() {
+        return Err(damaged());
+    }
+    trailer.get::<i32>(b"Size").filter(|n| *n > 0).ok_or_else(damaged)?;
+    let mut out = bytes.to_vec();
+    out.push(b'\n');
+    let mut offsets = Vec::new();
+    for (id, body) in changes {
+        offsets.push((*id, out.len()));
+        out.extend_from_slice(format!("{} {} obj\n", id.obj_number, id.gen_number).as_bytes());
+        out.extend_from_slice(body);
+        out.extend_from_slice(b"\nendobj\n");
+    }
+    let xref = out.len();
+    out.extend_from_slice(b"xref\n");
+    offsets.sort_by_key(|(id, _)| *id);
+    for (id, offset) in offsets {
+        out.extend_from_slice(format!("{} 1\n{offset:010} {:05} n\r\n", id.obj_number, id.gen_number).as_bytes());
+    }
+    let root = format!("{} {} R", root.obj_number, root.gen_number);
+    let prev = prev.to_string();
+    let trailer = edited(
+        &trailer,
+        &[
+            (b"Root", root.as_bytes()),
+            (b"Prev", prev.as_bytes()),
+            (b"XRefStm", b""),
+            (b"Type", b""),
+            (b"W", b""),
+            (b"Index", b""),
+            (b"Length", b""),
+            (b"Filter", b""),
+            (b"DecodeParms", b""),
+        ],
+    )?;
+    out.extend_from_slice(b"trailer\n");
+    out.extend_from_slice(&trailer);
+    out.extend_from_slice(format!("\nstartxref\n{xref}\n%%EOF\n").as_bytes());
+    Ok(out)
+}
+
+#[derive(Clone)]
+pub(crate) struct Variant {
+    pub data: Arc<Vec<u8>>,
+    pub hidden: Vec<ObjectIdentifier>,
+    pub warning: Option<String>,
+    pub has_optional_content: bool,
+}
+
+/// The placed PDF with its layer choice applied: `None` keeps the file's own default
+/// visibility, `Some(names)` shows every layer except `names` (so `Some(&[])` is all on).
+pub(crate) fn prepare(bytes: &Arc<Vec<u8>>, choice: Option<&[String]>) -> Result<Variant> {
+    let hidden = choice.unwrap_or_default();
+    let pdf = Pdf::new(bytes.clone()).map_err(|_| invalid())?;
+    let xref = pdf.xref();
+    let root = xref.get::<Dict<'_>>(xref.root_id()).ok_or_else(invalid)?;
+    // A null value, literal or referenced, is the same as no entry.
+    if matches!(root.get::<Object<'_>>(b"OCProperties"), None | Some(Object::Null(_))) {
+        let has_optional_content = pdf
+            .objects()
+            .into_iter()
+            .any(|object| matches!(object, Object::Dict(dict) if dict.get::<Name<'_>>(b"Type").as_ref().map(AsRef::as_ref) == Some(b"OCG")));
+        if !hidden.is_empty() {
+            return Err(missing_layer());
+        }
+        return Ok(Variant { data: bytes.clone(), hidden: Vec::new(), warning: None, has_optional_content });
+    }
+    let properties = root.get::<Dict<'_>>(b"OCProperties").ok_or_else(invalid)?;
+    let mut groups = references(&properties, b"OCGs")?;
+    let config = properties.get::<Dict<'_>>(b"D");
+    let mut fallback = config.is_none();
+    let config = config.unwrap_or_default();
+    let base_off = match config.get::<Name<'_>>(b"BaseState").as_ref().map(AsRef::as_ref) {
+        None if !config.contains_key(b"BaseState") => false,
+        Some(b"ON") => false,
+        Some(b"OFF") => true,
+        None | Some(_) => {
+            fallback = true;
+            false
+        }
+    };
+    let off = references(&config, b"OFF")?;
+    let on = match references(&config, b"ON") {
+        Ok(on) => on,
+        Err(error) if !fallback && !base_off && off.is_empty() => {
+            let value = config.get::<Object<'_>>(b"ON").ok_or(error)?;
+            fallback = true;
+            value.into_array().map(|array| array.raw_iter().filter_map(|value| value.as_obj_ref().map(Into::into)).collect()).unwrap_or_default()
+        }
+        Err(error) => return Err(error),
+    };
+    if on.iter().any(|id| off.contains(id)) {
+        return Err(invalid());
+    }
+    let incomplete = on.iter().chain(&off).any(|id| !groups.contains(id));
+    groups.extend(on.iter().chain(&off).copied());
+    groups.sort();
+    groups.dedup();
+    // Aggregating applications use the default state, not /AS usage-event adjustments.
+    let mut changes = Vec::new();
+    let mut effective = Vec::new();
+    let mut renamed = false;
+    let mut found = vec![false; hidden.len()];
+    for id in groups {
+        let group = xref.get::<Dict<'_>>(id).ok_or_else(invalid)?;
+        if group.get::<Name<'_>>(b"Type").as_ref().map(AsRef::as_ref) != Some(b"OCG") {
+            return Err(invalid());
+        }
+        let name = group.get::<hayro_syntax::object::String<'_>>(b"Name");
+        let is_hidden = match (choice, name.as_ref()) {
+            (None, _) => !fallback && (off.contains(&id) || (base_off && !on.contains(&id))),
+            (Some([]), None) => false,
+            (Some(_), Some(name)) => matches_hidden(hidden, &mut found, name.as_bytes()),
+            (Some(_), None) => return Err(invalid()),
+        };
+        if is_hidden {
+            effective.push(id);
+        }
+        // Unmarked groups are visible when registered in the output catalog. An explicit choice
+        // writes every group's state, so the catalog rewrite is attempted (and a file whose
+        // history cannot take one fails closed) even when the choice happens to change nothing.
+        if !is_hidden && name.is_some() && choice.is_none() {
+            continue;
+        }
+        let (body, generated) = layer_edit(&group, id, name.is_some(), is_hidden)?;
+        renamed |= generated;
+        changes.push((id, body));
+    }
+    if found.contains(&false) {
+        return Err(missing_layer());
+    }
+    effective.sort();
+    effective.dedup();
+    let data = if changes.is_empty() { bytes.clone() } else { Arc::new(append(bytes, &changes, xref.root_id())?) };
+    let warning = layer_warning(fallback, incomplete, renamed);
+    Ok(Variant { data, hidden: effective, warning, has_optional_content: true })
+}
+
+/// Whether the layer called `name` is one of the `hidden` choices. Each choice it matches is
+/// recorded in `found`, so a choice that names no layer can be reported.
+fn matches_hidden(hidden: &[String], found: &mut [bool], name: &[u8]) -> bool {
+    let name = String::from_utf8_lossy(name);
+    let mut is_hidden = false;
+    for (n, found) in hidden.iter().zip(found) {
+        if n == name.as_ref() {
+            (*found, is_hidden) = (true, true);
+        }
+    }
+    is_hidden
+}
+
+/// The rewritten group for a layer in the output: its marker records `is_hidden`, and a layer
+/// without a readable name gets a generated one. The flag reports whether a name was generated.
+fn layer_edit(group: &Dict<'_>, id: ObjectIdentifier, named: bool, is_hidden: bool) -> Result<(Vec<u8>, bool)> {
+    let marker = is_hidden.to_string();
+    if named {
+        return Ok((edited(group, &[(MARKER, marker.as_bytes())])?, false));
+    }
+    if group.contains_key(b"Name") && group.get::<Object<'_>>(b"Name").is_none() {
+        return Err(invalid());
+    }
+    let label = format!("(Placed PDF layer {} {})", id.obj_number, id.gen_number);
+    Ok((edited(group, &[(MARKER, marker.as_bytes()), (b"Name", label.as_bytes())])?, true))
+}
+
+/// The warning a prepared variant carries, or `None` when the layers were read as written.
+fn layer_warning(fallback: bool, incomplete: bool, renamed: bool) -> Option<String> {
+    let mut warnings = Vec::new();
+    if fallback {
+        warnings.push("layer state not readable, all layers shown unless hidden by Object Layer Options");
+    }
+    if incomplete {
+        warnings.push("layer list incomplete; layers named in the default configuration were added");
+    }
+    if renamed {
+        warnings.push("layer display name not readable; generated a name, visibility preserved");
+    }
+    if warnings.is_empty() { None } else { Some(warnings.join("; ")) }
+}
+
+pub(crate) fn register(bytes: &[u8]) -> Result<Vec<u8>> {
+    #[cfg(test)]
+    crate::export::registration_tests::REGISTRATIONS.with(|count| count.set(count.get() + 1));
+    let pdf = Pdf::new(bytes.to_vec()).map_err(|_| invalid())?;
+    let mut groups = Vec::new();
+    let mut changes = Vec::new();
+    for object in pdf.objects() {
+        let Object::Dict(dict) = object else { continue };
+        if dict.get::<Name<'_>>(b"Type").as_ref().map(AsRef::as_ref) != Some(b"OCG") {
+            continue;
+        }
+        // Resource-only OCGs without a catalog configuration are visible by default.
+        let hidden = if dict.contains_key(MARKER) { dict.get::<bool>(MARKER).ok_or_else(invalid)? } else { false };
+        let id = dict.obj_id().ok_or_else(invalid)?;
+        groups.push((id, hidden));
+        changes.push((id, edited(&dict, &[(MARKER, b"")])?));
+    }
+    if groups.is_empty() {
+        return Ok(bytes.to_vec());
+    }
+    groups.sort_by_key(|(id, _)| *id);
+    let refs = |hidden_only: bool| {
+        groups
+            .iter()
+            .filter(|(_, hidden)| !hidden_only || *hidden)
+            .map(|(id, _)| format!("{} {} R", id.obj_number, id.gen_number))
+            .collect::<Vec<_>>()
+            .join(" ")
+    };
+    let all = refs(false);
+    let properties = format!("<</OCGs[{all}]/D<</Name(Placed PDF layers)/BaseState/ON/OFF[{}]/Order[{all}]>>>>", refs(true));
+    let root = pdf.xref().root_id();
+    let catalog = pdf.xref().get::<Dict<'_>>(root).ok_or_else(invalid)?;
+    changes.push((root, edited(&catalog, &[(b"OCProperties", properties.as_bytes())])?));
+    append(bytes, &changes, root)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn visible_named_groups_keep_original_buffer_with_repaired_xref() {
+        let bytes = Arc::new(
+            b"%PDF-1.5\n1 0 obj\n<</Type/Catalog/Pages 2 0 R/OCProperties<</OCGs[4 0 R]/D<</BaseState/ON>>>>>>\nendobj\n\
+              2 0 obj\n<</Type/Pages/Kids[3 0 R]/Count 1>>\nendobj\n\
+              3 0 obj\n<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<<>>>>\nendobj\n\
+              4 0 obj\n<</Type/OCG/Name(Visible)>>\nendobj\n\
+              trailer\n<</Size 5/Root 1 0 R>>\nstartxref\n1\n%%EOF\n"
+                .to_vec(),
+        );
+        assert!(Pdf::new(bytes.clone()).is_ok());
+
+        let variant = prepare(&bytes, None).unwrap();
+
+        assert!(Arc::ptr_eq(&bytes, &variant.data), "visible groups must not copy the complete PDF or require incremental writes");
+        assert!(variant.hidden.is_empty());
+        assert!(variant.warning.is_none());
+    }
+
+    /// One page with layer "Off", hidden by the file's default configuration. `trailer` is the
+    /// trailer dictionary; `previous` an earlier revision's trailer, chained by /Prev.
+    fn default_hidden(trailer: &str, previous: Option<&str>) -> Arc<Vec<u8>> {
+        let mut bytes = b"%PDF-1.5\n".to_vec();
+        let mut offsets = Vec::new();
+        for body in [
+            "<</Type/Catalog/Pages 2 0 R/OCProperties<</OCGs[4 0 R]/D<</OFF[4 0 R]>>>>>>",
+            "<</Type/Pages/Kids[3 0 R]/Count 1>>",
+            "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<<>>>>",
+            "<</Type/OCG/Name(Off)>>",
+        ] {
+            offsets.push(bytes.len());
+            bytes.extend_from_slice(format!("{} 0 obj\n{body}\nendobj\n", offsets.len()).as_bytes());
+        }
+        let table = |bytes: &mut Vec<u8>, trailer: &str| {
+            let at = bytes.len();
+            bytes.extend_from_slice(b"xref\n0 5\n0000000000 65535 f\r\n");
+            for offset in &offsets {
+                bytes.extend_from_slice(format!("{offset:010} 00000 n\r\n").as_bytes());
+            }
+            bytes.extend_from_slice(format!("trailer\n{trailer}\n").as_bytes());
+            at
+        };
+        let trailer = match previous {
+            Some(previous) => {
+                let at = table(&mut bytes, previous);
+                trailer.replace(">>", &format!("/Prev {at}>>"))
+            }
+            None => trailer.to_owned(),
+        };
+        let at = table(&mut bytes, &trailer);
+        bytes.extend_from_slice(format!("startxref\n{at}\n%%EOF\n").as_bytes());
+        Arc::new(bytes)
+    }
+
+    #[test]
+    fn an_explicit_choice_overrides_a_layer_the_file_hides() {
+        let bytes = default_hidden("<</Size 5/Root 1 0 R>>", None);
+
+        let defaults = prepare(&bytes, None).unwrap();
+        let all_on = prepare(&bytes, Some(&[])).unwrap();
+
+        let group = ObjectIdentifier::new(4, 0);
+        assert_eq!(defaults.hidden, vec![group], "file defaults keep the layer hidden");
+        assert!(all_on.hidden.is_empty(), "an explicit all-on choice shows it");
+        let registered = register(&all_on.data).unwrap();
+        let pdf = Pdf::new(registered).unwrap();
+        let catalog = pdf.xref().get::<Dict<'_>>(pdf.xref().root_id()).unwrap();
+        let config = catalog.get::<Dict<'_>>(b"OCProperties").unwrap().get::<Dict<'_>>(b"D").unwrap();
+        assert_eq!(references(&config, b"OFF").unwrap(), Vec::new());
+    }
+
+    /// The incremental writer alone, so a reader's own handling of the input can't decide the result.
+    fn update(bytes: &[u8]) -> Result<Vec<u8>> {
+        append(bytes, &[(ObjectIdentifier::new(4, 0), b"<</Type/OCG/Name(Off)>>".to_vec())], ObjectIdentifier::new(1, 0))
+    }
+
+    #[test]
+    fn a_null_encrypt_entry_is_no_encryption() {
+        for trailer in ["<</Size 5/Root 1 0 R/Encrypt null>>", "<</Size 5/Root 1 0 R>>"] {
+            assert!(update(&default_hidden(trailer, None)).is_ok(), "{trailer}");
+        }
+        for trailer in ["<</Size 5/Root 1 0 R/Encrypt 9 0 R>>", "<</Size 5/Root 1 0 R/Encrypt<</Filter/Standard>>>>"] {
+            assert!(update(&default_hidden(trailer, None)).is_err(), "{trailer}");
+        }
+        // End to end, a null entry still lets a layer choice be written.
+        assert!(prepare(&default_hidden("<</Size 5/Root 1 0 R/Encrypt null>>", None), None).is_ok());
+    }
+
+    #[test]
+    fn encryption_in_an_earlier_revision_is_found() {
+        let bytes = default_hidden("<</Size 5/Root 1 0 R>>", Some("<</Size 5/Root 1 0 R/Encrypt 9 0 R>>"));
+        assert!(update(&bytes).is_err());
+        let bytes = default_hidden("<</Size 5/Root 1 0 R>>", Some("<</Size 5/Root 1 0 R/Encrypt null>>"));
+        assert!(update(&bytes).is_ok());
+    }
+
+    #[test]
+    fn a_trailer_in_a_comment_does_not_hide_the_real_one() {
+        let bytes = b"xref\n% trailer <</Size 9/Encrypt null>>\n0 1\n0000000000 65535 f\r\ntrailer\n<</Size 9/Encrypt 12 0 R>>";
+        assert!(trailer_at(bytes, 0).is_none(), "a comment inside the table is not table syntax");
+        let bytes = b"xref\n0 1\n0000000000 65535 f\r\ntrailer\n<</Size 9/Encrypt 12 0 R>>";
+        assert!(has_entry(&trailer_at(bytes, 0).unwrap(), b"Encrypt"));
+    }
+
+    #[test]
+    fn an_unreadable_prev_is_damage_and_a_null_one_ends_the_chain() {
+        for value in ["(12)", "/Twelve", "-1", "[12]", "<<>>", "true", "9 0 R"] {
+            let bytes = default_hidden(&format!("<</Size 5/Root 1 0 R/Prev {value}>>"), None);
+            let error = update(&bytes).unwrap_err().to_string();
+            assert!(error.contains("cross-reference"), "{value}: {error}");
+        }
+        assert!(update(&default_hidden("<</Size 5/Root 1 0 R/Prev null>>", None)).is_ok());
+    }
+
+    #[test]
+    fn a_cyclic_prev_chain_is_damage() {
+        let mut bytes = default_hidden("<</Size 5/Root 1 0 R>>", None).to_vec();
+        let at = crate::transitions::rfind(&bytes, b"xref\n").unwrap();
+        let patched = String::from_utf8(bytes.clone()).unwrap().replacen("<</Size 5/Root 1 0 R>>", &format!("<</Size 5/Root 1 0 R/Prev {at}>>"), 1);
+        bytes = patched.into_bytes();
+        let error = update(&bytes).unwrap_err().to_string();
+        assert!(error.contains("cross-reference"), "{error}");
+    }
+}
diff --git a/crates/pdf/src/pdfx.rs b/crates/pdf/src/pdfx.rs
index 11d30602b..e20247813 100644
--- a/crates/pdf/src/pdfx.rs
+++ b/crates/pdf/src/pdfx.rs
@@ -1,6 +1,7 @@
-//! PDF/X-4: the output intent (the working CMYK space's profile), the PDF/X version in the document
-//! information and XMP, written as an incremental update of krilla's PDF 1.6 output; and a
-//! check of the requirements this exporter is responsible for.
+//! CMYK print output: the serialization settings (the working CMYK space's profile as the output
+//! intent, CMYK blending), the XMP dates PDF/X-4 requires, written as an incremental update of
+//! krilla's PDF 1.6 output, and a check of the PDF/X-4 requirements this exporter is responsible
+//! for.
 
 use std::collections::HashSet;
 
@@ -8,143 +9,100 @@ use hayro_syntax::content::UntypedIter;
 use hayro_syntax::object::{Array, Dict, Name, Object, ObjectIdentifier, Stream};
 use hayro_syntax::page::Resources;
 
+use craft_pdf::write::WriteError;
+use craft_pdf::write::backend as krilla;
+use craft_pdf::write::print::{self, PrintColor};
+
 use crate::transitions::{find, int_after, object, rfind};
 
 mod fonts;
 
-/// Escape a PDF literal string.
-fn lit(s: &str) -> String {
-    let mut o = String::from("(");
-    for c in s.chars() {
-        if matches!(c, '(' | ')' | '\\') {
-            o.push('\\');
-        }
-        o.push(c);
-    }
-    o.push(')');
-    o
+/// The serialization settings for CMYK print output: DeviceCMYK and CMYK blending groups in the
+/// document's CMYK working space (Coated FOGRA39 when it has none or its profile can't be
+/// written). With `intent` (PDF/X), the working space is also the `GTS_PDFX` output intent, with
+/// `/Trapped /False`. The second value is a warning when the working space's profile was replaced.
+pub(crate) fn print_settings(intent: bool) -> crate::Result<(krilla::SerializeSettings, Option<String>)> {
+    print_settings_with(&designcraft_color::cms::active(), intent)
 }
 
-/// Turn krilla's output into PDF/X-4. `date` (Unix seconds, UTC) is the XMP metadata date; `None`
-/// (no clock, as on wasm) writes the epoch, because PDF/X-4 requires the entry. `None` back when
-/// the file isn't the simple kind this understands (a classic cross-reference table and plain
-/// dictionaries).
-pub fn make_pdfx4(pdf: &[u8], title: &str, date: Option<i64>) -> Option<Vec<u8>> {
+/// [`print_settings`] for the working spaces of `cms`.
+pub(crate) fn print_settings_with(cms: &designcraft_color::cms::Cms, intent: bool) -> crate::Result<(krilla::SerializeSettings, Option<String>)> {
+    let write = |color: PrintColor<'_>| if intent { print::settings(color) } else { print::cmyk_blending(color.profile) };
+    let fogra39 = || write(PrintColor::fogra39(craft_cms::builtin::COATED_FOGRA39_ICC));
+    let Ok(space) = cms.output_intent() else { return Ok((fogra39()?, None)) };
+    let registered = space.identifier != "Custom";
+    let color = PrintColor {
+        profile: &space.icc,
+        condition_identifier: space.identifier,
+        condition: Some(&space.condition),
+        registry_name: registered.then_some("http://www.color.org"),
+        info: Some(&space.condition),
+    };
+    match write(color) {
+        Ok(settings) => Ok((settings, None)),
+        Err(WriteError::InvalidProfile) => {
+            Ok((fogra39()?, Some(format!("the CMYK working space `{}` couldn't be written to the PDF; Coated FOGRA39 was used", space.condition))))
+        }
+        Err(e) => Err(e.into()),
+    }
+}
+
+/// Finish krilla's PDF/X-4 output with the XMP entries PDF/X-4 requires and krilla doesn't write:
+/// `xmp:MetadataDate` and `xmpMM:VersionID`, as an incremental update. `date` (Unix seconds, UTC)
+/// is the metadata date; `None` (no clock, as on wasm) writes the epoch. `None` back when the
+/// file isn't the simple kind this understands (a classic cross-reference table, uncompressed
+/// XMP).
+pub fn make_pdfx4(pdf: &[u8], date: Option<i64>) -> Option<Vec<u8>> {
     let t_at = rfind(pdf, b"trailer")?;
-    let trailer = String::from_utf8_lossy(&pdf[t_at..]).to_string();
+    let trailer = String::from_utf8_lossy(pdf.get(t_at..)?).to_string();
     let size = int_after(&trailer, "/Size")?;
     let root = int_after(&trailer, "/Root")?;
     let prev = int_after(&trailer, "startxref")?;
-    let info = int_after(&trailer, "/Info");
-    let id = trailer.find("/ID").and_then(|i| trailer[i..].find(']').map(|j| trailer[i..i + j + 1].to_string()));
-    let cat = String::from_utf8_lossy(&pdf[object(pdf, root)?]).to_string();
+    let info = int_after(&trailer, "/Info").map(|i| format!("/Info {i} 0 R")).unwrap_or_default();
+    let id = trailer.find("/ID").and_then(|i| trailer.get(i..)?.find(']').and_then(|j| trailer.get(i..i + j + 1)).map(str::to_string));
+    let cat = String::from_utf8_lossy(pdf.get(object(pdf, root)?)?).to_string();
+    let meta = int_after(&cat, "/Metadata")?;
+    let body = pdf.get(object(pdf, meta)?)?;
+    let s0 = find(body, b"stream", 0)? + b"stream".len();
+    let s0 = s0 + body.get(s0..)?.iter().take_while(|c| **c == b'\r' || **c == b'\n').count();
+    let s1 = rfind(body, b"endstream")?;
+    let xml = String::from_utf8_lossy(body.get(s0..s1)?).trim_end().to_string();
+    let dict = String::from_utf8_lossy(body.get(..find(body, b"stream", 0)?)?).to_string();
+    if dict.contains("/Filter") || !xml.contains("</rdf:RDF>") {
+        return None;
+    }
+    let (y, mo, d, h, mi, se) = crate::export::civil(date.unwrap_or(0));
+    let stamp = format!("{y:04}-{mo:02}-{d:02}T{h:02}:{mi:02}:{se:02}Z");
+    let dates = format!(
+        "<rdf:Description rdf:about=\"\" xmlns:xmp=\"http://ns.adobe.com/xap/1.0/\" xmlns:xmpMM=\"http://ns.adobe.com/xap/1.0/mm/\">\
+         <xmp:MetadataDate>{stamp}</xmp:MetadataDate><xmpMM:VersionID>1</xmpMM:VersionID></rdf:Description>"
+    );
+    let xml = xml.replacen("</rdf:RDF>", &format!("{dates}</rdf:RDF>"), 1);
+    let dict = {
+        let i = dict.find("/Length")?;
+        let rest = dict.get(i + 7..)?.trim_start();
+        let end = rest.find(|c: char| !c.is_ascii_digit()).unwrap_or(rest.len());
+        format!("{}/Length {}{}", dict.get(..i)?, xml.len(), rest.get(end..)?)
+    };
     let mut out = pdf.to_vec();
     if !out.ends_with(b"\n") {
         out.push(b'\n');
     }
-    let mut entries: Vec<(usize, usize)> = Vec::new();
-    let mut put = |out: &mut Vec<u8>, id: usize, body: &[u8]| {
-        entries.push((id, out.len()));
-        out.extend_from_slice(format!("{id} 0 obj\n").as_bytes());
-        out.extend_from_slice(body);
-        out.extend_from_slice(b"\nendobj\n");
-    };
-    // The output profile and the output intent.
-    let intent = designcraft_color::cms::active().output_intent().ok()?;
-    let (icc_id, oi_id) = (size, size + 1);
-    let mut s = format!("<</N 4/Length {}>>\nstream\n", intent.icc.len()).into_bytes();
-    s.extend_from_slice(&intent.icc);
-    s.extend_from_slice(b"\nendstream");
-    put(&mut out, icc_id, &s);
-    let cond = &intent.condition;
-    put(
-        &mut out,
-        oi_id,
-        format!(
-            "<</Type/OutputIntent/S/GTS_PDFX/OutputConditionIdentifier{}/OutputCondition{}/Info{}/RegistryName(http://www.color.org)/DestOutputProfile {icc_id} 0 R>>",
-            lit(intent.identifier),
-            lit(cond),
-            lit(cond)
-        )
-        .as_bytes(),
-    );
-    // The catalog with the intent.
-    let close = cat.rfind(">>")?;
-    let cat_new = format!("{}/OutputIntents[{oi_id} 0 R]{}", cat[..close].trim(), &cat[close..]);
-    put(&mut out, root, cat_new.trim().as_bytes());
-    // Document information: the PDF/X version and trapping state.
-    let mut next = size + 2;
-    let info_id = match info {
-        Some(i) => {
-            let body = String::from_utf8_lossy(&pdf[object(pdf, i)?]).to_string();
-            let close = body.rfind(">>")?;
-            put(&mut out, i, format!("{}/GTS_PDFXVersion(PDF/X-4)/Trapped/False{}", body[..close].trim(), &body[close..]).trim().as_bytes());
-            i
-        }
-        None => {
-            let i = next;
-            next += 1;
-            put(&mut out, i, format!("<</Title{}/GTS_PDFXVersion(PDF/X-4)/Trapped/False>>", lit(title)).as_bytes());
-            i
-        }
-    };
-    // XMP: the PDF/X identification schema, the trapping state that Info also states, and the
-    // metadata date and version ID that PDF/X-4 requires.
-    if let Some(meta) = int_after(&cat, "/Metadata") {
-        let r = object(pdf, meta)?;
-        let body = &pdf[r];
-        let s0 = find(body, b"stream", 0)? + b"stream".len();
-        let s0 = s0 + body[s0..].iter().take_while(|c| **c == b'\r' || **c == b'\n').count();
-        let s1 = rfind(body, b"endstream")?;
-        let xml = String::from_utf8_lossy(body.get(s0..s1)?).trim_end().to_string();
-        let dict = String::from_utf8_lossy(&body[..find(body, b"stream", 0)?]).to_string();
-        if dict.contains("/Filter") {
-            return None;
-        }
-        let (y, mo, d, h, mi, se) = crate::export::civil(date.unwrap_or(0));
-        let stamp = format!("{y:04}-{mo:02}-{d:02}T{h:02}:{mi:02}:{se:02}Z");
-        let add = concat!(
-            "<rdf:Description rdf:about=\"\" xmlns:pdfxid=\"http://www.npes.org/pdfx/ns/id/\"><pdfxid:GTS_PDFXVersion>PDF/X-4</pdfxid:GTS_PDFXVersion></rdf:Description>",
-            "<rdf:Description rdf:about=\"\" xmlns:pdf=\"http://ns.adobe.com/pdf/1.3/\"><pdf:Trapped>False</pdf:Trapped></rdf:Description>"
-        );
-        let dates = format!(
-            "<rdf:Description rdf:about=\"\" xmlns:xmp=\"http://ns.adobe.com/xap/1.0/\" xmlns:xmpMM=\"http://ns.adobe.com/xap/1.0/mm/\">\
-             <xmp:MetadataDate>{stamp}</xmp:MetadataDate><xmpMM:VersionID>1</xmpMM:VersionID></rdf:Description>"
-        );
-        let xml = xml.replacen("</rdf:RDF>", &format!("{add}{dates}</rdf:RDF>"), 1);
-        let dict = {
-            let i = dict.find("/Length")?;
-            let rest = &dict[i + 7..];
-            let rest = rest.trim_start();
-            let end = rest.find(|c: char| !c.is_ascii_digit()).unwrap_or(rest.len());
-            format!("{}/Length {}{}", &dict[..i], xml.len(), &rest[end..])
-        };
-        let mut b = dict.trim().as_bytes().to_vec();
-        b.extend_from_slice(b"\nstream\n");
-        b.extend_from_slice(xml.as_bytes());
-        b.extend_from_slice(b"\nendstream");
-        put(&mut out, meta, &b);
-    }
-    // Cross-reference section and trailer.
+    let at = out.len();
+    out.extend_from_slice(format!("{meta} 0 obj\n").as_bytes());
+    out.extend_from_slice(dict.trim().as_bytes());
+    out.extend_from_slice(b"\nstream\n");
+    out.extend_from_slice(xml.as_bytes());
+    out.extend_from_slice(b"\nendstream\nendobj\n");
     let xref_at = out.len();
-    entries.sort();
-    let mut x = String::from("xref\n");
-    for (oid, off) in &entries {
-        x.push_str(&format!("{oid} 1\n{off:010} 00000 n\r\n"));
-    }
     let id = id.unwrap_or_default();
-    x.push_str(&format!("trailer\n<</Size {next}/Root {root} 0 R/Info {info_id} 0 R{id}/Prev {prev}>>\nstartxref\n{xref_at}\n%%EOF\n"));
-    out.extend_from_slice(x.as_bytes());
+    out.extend_from_slice(
+        format!("xref\n{meta} 1\n{at:010} 00000 n\r\ntrailer\n<</Size {size}/Root {root} 0 R{info}{id}/Prev {prev}>>\nstartxref\n{xref_at}\n%%EOF\n")
+            .as_bytes(),
+    );
     Some(out)
 }
 
-/// krilla gives every transparency group it writes (placed PDF pages, opacity, isolated
-/// blending) a DeviceRGB blending space. In a print document that puts DeviceRGB in a CMYK file
-/// (PDF/X-4 forbids it under a CMYK output intent) and blends CMYK art through RGB, which can
-/// turn a K-only black into a four-colour black. This rewrites those group dictionaries to
-/// DeviceCMYK in place and at the same length (the optional `/Type/Group` gives the room), so
-/// every cross-reference offset stays valid. Only object dictionaries are touched, never stream
-/// data. Returns how many groups changed.
 /// Whether a transparency group dictionary still names DeviceRGB as its blending space.
 pub fn has_rgb_groups(pdf: &[u8]) -> bool {
     pdf.windows(b"/CS/DeviceRGB".len()).enumerate().any(|(i, w)| {
@@ -152,61 +110,6 @@ pub fn has_rgb_groups(pdf: &[u8]) -> bool {
     })
 }
 
-pub fn cmyk_group_spaces(pdf: &mut [u8]) -> usize {
-    const FORMS: [(&[u8], &[u8]); 2] = [
-        (b"/Group<</Type/Group/S/Transparency/I true/CS/DeviceRGB>>", b"/Group<</S/Transparency/I true/CS/DeviceCMYK>>"),
-        (b"/Group<</Type/Group/S/Transparency/CS/DeviceRGB>>", b"/Group<</S/Transparency/CS/DeviceCMYK>>"),
-    ];
-    let Some(dicts) = dictionary_ranges(pdf) else { return 0 };
-    let mut changed = 0;
-    for r in dicts {
-        for (from, to) in FORMS {
-            let mut at = r.start;
-            while let Some(i) = find(pdf.get(..r.end).unwrap_or_default(), from, at) {
-                if let Some(dst) = pdf.get_mut(i..i + from.len()) {
-                    dst.fill(b' ');
-                    if let Some(head) = dst.get_mut(..to.len()) {
-                        head.copy_from_slice(to);
-                        changed += 1;
-                    }
-                }
-                at = i + from.len();
-            }
-        }
-    }
-    changed
-}
-
-/// Byte ranges of the dictionary part of every object in a file with one classic
-/// cross-reference table (krilla's output): from the object's offset to its `stream` keyword or
-/// `endobj`. `None` when the table can't be read.
-fn dictionary_ranges(pdf: &[u8]) -> Option<Vec<std::ops::Range<usize>>> {
-    let tail = String::from_utf8_lossy(pdf.get(rfind(pdf, b"startxref")?..)?).to_string();
-    let xref = int_after(&tail, "startxref")?;
-    let table = pdf.get(xref..)?;
-    if !table.starts_with(b"xref") {
-        return None;
-    }
-    let end = find(table, b"trailer", 0)?;
-    let text = String::from_utf8_lossy(table.get(4..end)?).to_string();
-    let mut words = text.split_ascii_whitespace();
-    let mut out = Vec::new();
-    while let (Some(_first), Some(count)) = (words.next(), words.next()) {
-        let count: usize = count.parse().ok()?;
-        for _ in 0..count {
-            let (off, _gen, kind) = (words.next()?, words.next()?, words.next()?);
-            if kind != "n" {
-                continue;
-            }
-            let start: usize = off.parse().ok()?;
-            let endobj = find(pdf, b"endobj", start)?;
-            let stop = find(pdf.get(..endobj)?, b"stream", start).unwrap_or(endobj);
-            out.push(start..stop);
-        }
-    }
-    Some(out)
-}
-
 /// PDF/X-4 checks on an exported file: what's missing or not allowed, device RGB under the CMYK
 /// output intent included (empty = passes these checks).
 pub fn check_pdfx4(pdf: &[u8]) -> Vec<String> {
@@ -294,7 +197,7 @@ fn device_rgb(pdf: &[u8]) -> Vec<String> {
 }
 
 /// Whether the file's PDF/X output intent has a four-channel (CMYK) destination profile.
-fn cmyk_output_intent(file: &hayro_syntax::Pdf) -> bool {
+pub(crate) fn cmyk_output_intent(file: &hayro_syntax::Pdf) -> bool {
     let xref = file.xref();
     let Some(catalog) = xref.get::<Dict<'_>>(xref.root_id()) else { return false };
     let Some(intents) = catalog.get::<Array<'_>>(b"OutputIntents") else { return false };
@@ -324,7 +227,7 @@ fn is_device_rgb(cs: &Object<'_>) -> bool {
 }
 
 /// How deep forms, patterns and soft masks may nest before the walk stops.
-const MAX_DEPTH: usize = 16;
+pub(crate) const MAX_DEPTH: usize = 16;
 
 /// What one page uses in device RGB, in the order found.
 #[derive(Default)]
@@ -472,469 +375,4 @@ impl RgbScan {
 }
 
 #[cfg(test)]
-mod tests {
-    use craft_pdf::write::backend as krilla;
-    use std::sync::Arc;
-
-    use designcraft_color::{Color, Swatch};
-    use designcraft_compose::Cache;
-    use designcraft_doc::build::NewDocument;
-    use designcraft_doc::{Asset, AssetId, Content, Document, Fill, Fitting, Graphic, Item, ItemId, Shape, SpreadRef};
-    use designcraft_geom::{Affine, Rect};
-    use hayro_syntax::object::{Name, Object};
-    use image::{ExtendedColorType, ImageEncoder};
-
-    use crate::{ExportReport, PdfOptions, Standard, check_pdfx4, export_pdf_with_report};
-
-    pub(super) fn place(d: &mut Document, name: &str, data: Vec<u8>, size: (f64, f64), at: (f64, f64)) {
-        let asset = AssetId(d.alloc());
-        let mime = designcraft_images::mime(&data).into();
-        let pixels = designcraft_images::pixel_size(&data);
-        d.assets.insert(asset, Arc::new(Asset { id: asset, name: name.into(), mime, data: data.into(), pixels, ..Default::default() }));
-        let lid = d.default_layer();
-        let id = ItemId(d.alloc());
-        let r = Rect::new(at.0, at.1, at.0 + 100.0, at.1 + 50.0);
-        let mut it = Item::new(id, lid, Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
-        it.content = Content::Graphic(Graphic {
-            asset,
-            size,
-            xf: Affine::translate(at) * Affine::scale(100.0 / size.0),
-            clip: None,
-            auto_fit: Fitting::FillProportionally,
-            fit_align: 4,
-            crop: [0.0; 4],
-            wrap: Default::default(),
-            fill: Default::default(),
-        });
-        d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
-    }
-
-    fn add_box(d: &mut Document, r: Rect, swatch: &str) {
-        let lid = d.default_layer();
-        let mut b = Item::new(ItemId(d.alloc()), lid, Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
-        b.fill = Fill::swatch(swatch);
-        d.insert_item(SpreadRef::Doc(0), b, None).unwrap();
-    }
-
-    /// A 4 × 2 PNG: red RGB or mid grey, optionally carrying an ICC profile.
-    fn png(gray: bool, icc: Option<Vec<u8>>) -> Vec<u8> {
-        let mut b = Vec::new();
-        let mut enc = image::codecs::png::PngEncoder::new(&mut b);
-        if let Some(p) = icc {
-            enc.set_icc_profile(p).unwrap();
-        }
-        let (px, ty) = if gray { (vec![128u8; 8], ExtendedColorType::L8) } else { ([255u8, 0, 0].repeat(8), ExtendedColorType::Rgb8) };
-        enc.write_image(&px, 4, 2, ty).unwrap();
-        b
-    }
-
-    /// The header of an ICC v2.1 RGB display profile: what a PDF writer reads to tag an image
-    /// `/ICCBased` (the check looks at the colour space, not at the profile's tables).
-    fn rgb_icc() -> Vec<u8> {
-        let mut p = vec![0u8; 132];
-        p[..4].copy_from_slice(&132u32.to_be_bytes());
-        p[8] = 2;
-        p[9] = 0x10;
-        p[12..16].copy_from_slice(b"mntr");
-        p[16..20].copy_from_slice(b"RGB ");
-        p[20..24].copy_from_slice(b"XYZ ");
-        p[36..40].copy_from_slice(b"acsp");
-        p
-    }
-
-    /// A 4 × 2 CMYK image (100% K) as krilla writes it.
-    #[derive(Clone, Hash)]
-    struct CmykImage(Vec<u8>);
-
-    impl krilla::image::CustomImage for CmykImage {
-        fn color_channel(&self) -> &[u8] {
-            &self.0
-        }
-        fn alpha_channel(&self) -> Option<&[u8]> {
-            None
-        }
-        fn bits_per_component(&self) -> krilla::image::BitsPerComponent {
-            krilla::image::BitsPerComponent::Eight
-        }
-        fn size(&self) -> (u32, u32) {
-            (4, 2)
-        }
-        fn icc_profile(&self) -> Option<&[u8]> {
-            None
-        }
-        fn color_space(&self) -> krilla::image::ImageColorspace {
-            krilla::image::ImageColorspace::Cmyk
-        }
-    }
-
-    /// A one-page PDF 1.6 holding a CMYK image, as another app would hand over a placed graphic.
-    fn pdf_with_cmyk_image() -> Vec<u8> {
-        pdf_with_image(krilla::image::Image::from_custom(CmykImage([0u8, 0, 0, 255].repeat(8)), false).unwrap())
-    }
-
-    /// A one-page PDF 1.6 holding `img`.
-    fn pdf_with_image(img: krilla::image::Image) -> Vec<u8> {
-        let configuration = krilla::configure::ConfigurationBuilder::new().with_version(krilla::configure::PdfVersion::Pdf16).finish().unwrap();
-        let mut pdf = krilla::Document::new_with(krilla::SerializeSettings { configuration, ..Default::default() });
-        let size = krilla::geom::Size::from_wh(100.0, 50.0).unwrap();
-        let mut page = pdf.start_page_with(krilla::page::PageSettings::new(size));
-        let mut s = page.surface();
-        s.draw_image(img, size);
-        s.finish();
-        page.finish();
-        pdf.finish().unwrap()
-    }
-
-    pub(super) fn x4(d: &Document) -> ExportReport {
-        export_pdf_with_report(d, &Cache::new(), &PdfOptions { standard: Standard::PdfX4, ..Default::default() }).unwrap()
-    }
-
-    /// The `/ColorSpace` of every image XObject: a name, or `[` for an array (ICCBased, Indexed…).
-    fn image_spaces(bytes: &[u8]) -> Vec<String> {
-        let pdf = hayro_syntax::Pdf::new(bytes.to_vec()).unwrap();
-        let mut out: Vec<String> = pdf
-            .objects()
-            .into_iter()
-            .filter_map(|o| o.into_stream())
-            .filter(|s| s.dict().get::<Name>(b"Subtype").is_some_and(|n| n.as_str() == "Image") && s.dict().get::<bool>(b"ImageMask").is_none())
-            .filter_map(|s| match s.dict().get::<Object>(b"ColorSpace")? {
-                Object::Name(n) => Some(n.as_str().to_string()),
-                Object::Array(a) => a.iter::<Name>().next().map(|n| format!("[{}", n.as_str())),
-                _ => None,
-            })
-            .collect();
-        out.sort();
-        out
-    }
-
-    /// A DeviceRGB image under the CMYK output intent is reported. A placed PDF carries its
-    /// images into the export unchanged.
-    #[test]
-    fn device_rgb_image_is_flagged() {
-        let mut d = Document::new(&NewDocument::default());
-        let photo = krilla::image::Image::from_png(png(false, None).into(), false).unwrap();
-        place(&mut d, "photo.pdf", pdf_with_image(photo), (100.0, 50.0), (72.0, 72.0));
-        let r = x4(&d);
-        assert_eq!(image_spaces(&r.bytes), ["DeviceRGB"]);
-        let rgb: Vec<&String> = r.warnings.iter().filter(|w| w.contains("RGB")).collect();
-        assert_eq!(rgb.len(), 1, "{:?}", r.warnings);
-        assert!(rgb[0].starts_with("PDF/X-4: an RGB image (object ") && rgb[0].contains("4 × 2 px) on page 1:"), "{}", rgb[0]);
-        // Without a PDF/X output intent there is nothing to check RGB against.
-        let plain = export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
-        assert!(!check_pdfx4(&plain.bytes).iter().any(|i| i.contains("RGB")));
-    }
-
-    /// CMYK and grey are the output intent's own values and ICC-tagged RGB is colour-managed:
-    /// none of them is flagged, whether placed directly or inside a placed PDF.
-    #[test]
-    fn cmyk_grey_and_icc_rgb_pass() {
-        let mut d = Document::new(&NewDocument::default());
-        add_box(&mut d, Rect::new(36.0, 400.0, 136.0, 500.0), "C=100 M=0 Y=0 K=0");
-        place(&mut d, "grey.png", png(true, None), (4.0, 2.0), (72.0, 72.0));
-        place(&mut d, "tagged.png", png(false, Some(rgb_icc())), (4.0, 2.0), (72.0, 172.0));
-        place(&mut d, "logo.pdf", pdf_with_cmyk_image(), (100.0, 50.0), (72.0, 272.0));
-        let r = x4(&d);
-        assert_eq!(image_spaces(&r.bytes), ["DeviceCMYK", "DeviceGray", "[ICCBased"]);
-        assert!(r.warnings.is_empty(), "{:?}", r.warnings);
-    }
-
-    /// RGB swatches paint in DeviceRGB.
-    #[test]
-    fn device_rgb_fills_are_flagged() {
-        let mut d = Document::new(&NewDocument { pages: 2, ..NewDocument::default() });
-        d.swatches.push(Swatch::color("Brand Red", Color::rgb(0.9, 0.1, 0.1)));
-        add_box(&mut d, Rect::new(36.0, 400.0, 136.0, 500.0), "Brand Red");
-        let r = x4(&d);
-        assert_eq!(r.warnings, ["PDF/X-4: RGB fills or strokes on page 1: under a CMYK output intent RGB needs an ICC profile"]);
-    }
-
-    /// A minimal PDF with a CMYK (N 4) PDF/X output intent and one page with `entries` (its
-    /// resources, a group…) and `content`.
-    fn tiny_pdf(entries: &str, content: &str) -> Vec<u8> {
-        tiny_pdf_with(entries, content, "<</N 3/Length 0>>\nstream\n\nendstream")
-    }
-
-    /// [`tiny_pdf`] with `extra` as object 6 (an RGB profile in [`tiny_pdf`]).
-    pub(super) fn tiny_pdf_with(entries: &str, content: &str, extra: &str) -> Vec<u8> {
-        let objects = [
-            "<</Type/Catalog/Pages 2 0 R/OutputIntents[<</Type/OutputIntent/S/GTS_PDFX/DestOutputProfile 4 0 R>>]>>".to_string(),
-            "<</Type/Pages/Kids[3 0 R]/Count 1>>".to_string(),
-            format!("<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]{entries}/Contents 5 0 R>>"),
-            "<</N 4/Length 0>>\nstream\n\nendstream".to_string(),
-            format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
-            extra.to_string(),
-        ];
-        let mut out = b"%PDF-1.6\n".to_vec();
-        let mut offsets = Vec::new();
-        for (i, o) in objects.iter().enumerate() {
-            offsets.push(out.len());
-            out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());
-        }
-        let xref = out.len();
-        out.extend_from_slice(format!("xref\n0 {}\n0000000000 65535 f\r\n", objects.len() + 1).as_bytes());
-        for off in offsets {
-            out.extend_from_slice(format!("{off:010} 00000 n\r\n").as_bytes());
-        }
-        out.extend_from_slice(format!("trailer\n<</Size {}/Root 1 0 R>>\nstartxref\n{xref}\n%%EOF\n", objects.len() + 1).as_bytes());
-        out
-    }
-
-    /// A metadata object whose only `stream` is the one inside `endstream` is refused, not a slice panic.
-    #[test]
-    fn metadata_with_only_endstream_does_not_panic() {
-        let objects = ["<</Type/Catalog/Pages 2 0 R/Metadata 3 0 R>>", "<</Type/Pages/Kids[]/Count 0>>", "<</Type/Metadata>>endstream"];
-        let mut out = b"%PDF-1.6\n".to_vec();
-        for (i, o) in objects.iter().enumerate() {
-            out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());
-        }
-        out.extend_from_slice(b"trailer\n<</Size 4/Root 1 0 R>>\nstartxref\n0\n%%EOF\n");
-        assert!(super::make_pdfx4(&out, "t", None).is_none());
-    }
-
-    /// DeviceRGB is allowed when a `DefaultRGB` colour space makes it colour-managed.
-    #[test]
-    fn default_rgb_makes_device_rgb_managed() {
-        let rgb = |i: &String| i.contains("RGB");
-        let content = "1 0 0 rg 0 0 10 10 re f /DeviceRGB CS 0 0 1 SC 0 0 m 10 10 l S";
-        let bare = check_pdfx4(&tiny_pdf("/Resources<<>>", content));
-        assert_eq!(bare.iter().filter(|i| rgb(i)).count(), 1, "{bare:?}");
-        let managed = check_pdfx4(&tiny_pdf("/Resources<</ColorSpace<</DefaultRGB[/ICCBased 6 0 R]>>>>", content));
-        assert!(!managed.iter().any(rgb), "{managed:?}");
-        // CMYK and grey need no default space.
-        let cmyk = check_pdfx4(&tiny_pdf("/Resources<<>>", "0 0 0 1 k 0 0 10 10 re f 0.5 G 0 0 m 10 10 l S"));
-        assert!(!cmyk.iter().any(rgb), "{cmyk:?}");
-    }
-
-    /// Every font that draws visible text must be embedded (#909): a base-14 font with no font
-    /// file, a CID font whose descendant has none, and one drawn from inside a form are reported;
-    /// an embedded font, an unused one and invisible text (render mode 3, as in OCR layers) are not.
-    #[test]
-    fn unembedded_fonts_are_flagged() {
-        let fonts = |entries: &str, content: &str| -> Vec<String> {
-            check_pdfx4(&tiny_pdf(entries, content)).into_iter().filter(|i| i.contains("font")).collect()
-        };
-        let helvetica = "/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>>>>>";
-        assert_eq!(
-            fonts(helvetica, "BT /F1 24 Tf 20 50 Td (Base14 text) Tj ET"),
-            ["the font Helvetica isn't embedded (page 1): PDF/X-4 needs every font used for visible text embedded"]
-        );
-        assert!(fonts(helvetica, "BT /F1 24 Tf 3 Tr 20 50 Td (OCR) Tj ET").is_empty(), "invisible text needs no embedded font");
-        assert!(fonts(helvetica, "0 0 0 1 k 0 0 10 10 re f").is_empty(), "an unused font is not reported");
-        let restored = fonts(helvetica, "BT /F1 24 Tf q 3 Tr Q 20 50 Td (shown) Tj ET");
-        assert_eq!(restored.len(), 1, "Q restores the visible render mode: {restored:?}");
-
-        let embedded = "/Resources<</Font<</F1<</Type/Font/Subtype/TrueType/BaseFont/ABCDEF+Arial/FontDescriptor<</Type/FontDescriptor/FontName/ABCDEF+Arial/FontFile2 6 0 R>>>>>>>>";
-        assert!(fonts(embedded, "BT /F1 12 Tf (x) Tj ET").is_empty());
-        let cid = "/Resources<</Font<</F1<</Type/Font/Subtype/Type0/BaseFont/KozMin/Encoding/Identity-H/DescendantFonts[<</Type/Font/Subtype/CIDFontType0/BaseFont/KozMin/FontDescriptor<</Type/FontDescriptor/FontName/KozMin>>>>]>>>>>>";
-        assert_eq!(fonts(cid, "BT /F1 12 Tf <0001> Tj ET").len(), 1);
-        let cid_embedded = cid.replace("/FontName/KozMin>>", "/FontName/KozMin/FontFile3 6 0 R>>");
-        assert!(fonts(&cid_embedded, "BT /F1 12 Tf <0001> Tj ET").is_empty());
-
-        let draw = "BT /T 9 Tf (in a form) Tj ET";
-        let form = format!(
-            "<</Type/XObject/Subtype/Form/BBox[0 0 100 100]/Resources<</Font<</T<</Type/Font/Subtype/Type1/BaseFont/Times-Roman>>>>>>/Length {}>>\nstream\n{draw}\nendstream",
-            draw.len()
-        );
-        let pdf = tiny_pdf_with("/Resources<</XObject<</X1 6 0 R>>>>", "/X1 Do", &form);
-        let issues: Vec<String> = check_pdfx4(&pdf).into_iter().filter(|i| i.contains("font")).collect();
-        assert_eq!(issues.len(), 1, "{issues:?}");
-        assert!(issues[0].starts_with("the font Times-Roman isn't embedded"), "{issues:?}");
-    }
-
-    /// A placed PDF that draws with an unembedded font: the PDF/X-4 export warns about it (#909).
-    #[test]
-    fn placed_pdf_with_an_unembedded_font_is_reported() {
-        let mut d = Document::new(&NewDocument::default());
-        let placed = tiny_pdf(
-            "/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica/Encoding/WinAnsiEncoding>>>>>>",
-            "BT /F1 24 Tf 0 0 0 1 k 20 50 Td (Base14 text) Tj ET",
-        );
-        place(&mut d, "helvetica.pdf", placed, (100.0, 100.0), (72.0, 72.0));
-        let r = x4(&d);
-        assert!(r.warnings.iter().any(|w| w.starts_with("PDF/X-4: the font Helvetica isn't embedded (page 1)")), "{:?}", r.warnings);
-    }
-
-    #[test]
-    fn unembedded_fonts_are_reported_by_every_text_show_operator() {
-        let entries = "/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>>>>>";
-        for show in ["(x) Tj", "[(x) 20 (y)] TJ", "(x) '", "0 0 (x) \""] {
-            let pdf = tiny_pdf(entries, &format!("BT /F1 12 Tf {show} ET"));
-            let issues = check_pdfx4(&pdf);
-            assert_eq!(issues.iter().filter(|i| i.contains("isn't embedded")).count(), 1, "{show}: {issues:?}");
-        }
-    }
-
-    #[test]
-    fn unembedded_fonts_in_forms_inherit_and_restore_text_state() {
-        let entries = "/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>>>/XObject<</X1 6 0 R>>>>";
-        let draw = "BT (inherited font) Tj /F1 10 Tf 3 Tr ET";
-        let form = format!("<</Type/XObject/Subtype/Form/BBox[0 0 100 100]/Length {}>>\nstream\n{draw}\nendstream", draw.len());
-        for (content, count) in [
-            ("/F1 12 Tf /X1 Do", 1),
-            ("/F1 12 Tf 3 Tr /X1 Do", 0),
-            ("/F1 12 Tf 3 Tr /X1 Do 0 Tr /X1 Do", 1),
-            ("/F1 12 Tf /X1 Do BT (still visible) Tj ET", 1),
-        ] {
-            let pdf = tiny_pdf_with(entries, content, &form);
-            let issues = check_pdfx4(&pdf);
-            assert_eq!(issues.iter().filter(|i| i.contains("isn't embedded")).count(), count, "{content}: {issues:?}");
-        }
-    }
-
-    #[test]
-    fn unembedded_fonts_in_recursive_forms_are_bounded() {
-        let draw = "BT /F1 12 Tf (x) Tj ET /X1 Do";
-        let form = format!(
-            "<</Type/XObject/Subtype/Form/BBox[0 0 100 100]/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>>>/XObject<</X1 6 0 R>>>>/Length {}>>\nstream\n{draw}\nendstream",
-            draw.len()
-        );
-        let pdf = tiny_pdf_with("/Resources<</XObject<</X1 6 0 R>>>>", "/X1 Do", &form);
-        let issues = check_pdfx4(&pdf);
-        assert_eq!(issues.iter().filter(|i| i.contains("isn't embedded")).count(), 1, "{issues:?}");
-    }
-
-    #[test]
-    fn unembedded_fonts_are_reported_after_form_text_state_is_restored() {
-        let entries = "/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>>>/XObject<</X1 6 0 R>>>>";
-        let draw = "BT /F2 10 Tf 3 Tr (hidden) Tj ET";
-        let form = format!(
-            "<</Type/XObject/Subtype/Form/BBox[0 0 100 100]/Resources<</Font<</F2<</Type/Font/Subtype/Type1/BaseFont/Times-Roman>>>>>>/Length {}>>\nstream\n{draw}\nendstream",
-            draw.len()
-        );
-        let pdf = tiny_pdf_with(entries, "/F1 12 Tf /X1 Do BT (visible) Tj ET", &form);
-        let issues: Vec<String> = check_pdfx4(&pdf).into_iter().filter(|i| i.contains("isn't embedded")).collect();
-        assert_eq!(issues.len(), 1, "{issues:?}");
-        assert!(issues[0].starts_with("the font Helvetica isn't embedded"), "{issues:?}");
-    }
-
-    /// An RGB blending space on the page group and an RGB inline image are device RGB too.
-    #[test]
-    fn rgb_groups_and_inline_images_are_flagged() {
-        let group = check_pdfx4(&tiny_pdf("/Resources<<>>/Group<</S/Transparency/CS/DeviceRGB>>", "0 0 0 1 k"));
-        assert!(
-            group.iter().any(|i| i == "a transparency group blending in RGB on page 1: under a CMYK output intent RGB needs an ICC profile"),
-            "{group:?}"
-        );
-        let inline = check_pdfx4(&tiny_pdf("/Resources<<>>", "q BI /W 1 /H 1 /CS /RGB /BPC 8 /F /AHx ID ff0000> EI Q"));
-        assert!(inline.iter().any(|i| i.starts_with("an RGB inline image on page 1")), "{inline:?}");
-        let grey = check_pdfx4(&tiny_pdf("/Resources<<>>", "q BI /W 1 /H 1 /CS /G /BPC 8 /F /AHx ID 80> EI Q"));
-        assert!(!grey.iter().any(|i| i.contains("RGB")), "{grey:?}");
-    }
-
-    /// A 4 × 2 RGB image in every raster path the exporter has, none with a profile. Each has
-    /// its own colour, so no two share an image XObject.
-    fn rgb_rasters() -> Vec<(&'static str, Vec<u8>)> {
-        let px = |c: [u8; 3]| c.repeat(8);
-        let encode = |f: &dyn Fn(&mut Vec<u8>)| {
-            let mut b = Vec::new();
-            f(&mut b);
-            b
-        };
-        let jpeg = encode(&|b| image::codecs::jpeg::JpegEncoder::new(b).write_image(&px([0, 0, 255]), 4, 2, ExtendedColorType::Rgb8).unwrap());
-        let gif = encode(&|b| image::codecs::gif::GifEncoder::new(b).encode(&[0u8, 255, 0, 255].repeat(8), 4, 2, ExtendedColorType::Rgba8).unwrap());
-        let webp =
-            encode(&|b| image::codecs::webp::WebPEncoder::new_lossless(b).write_image(&px([255, 255, 0]), 4, 2, ExtendedColorType::Rgb8).unwrap());
-        let tiff = encode(&|b| {
-            image::codecs::tiff::TiffEncoder::new(std::io::Cursor::new(b)).write_image(&px([0, 255, 255]), 4, 2, ExtendedColorType::Rgb8).unwrap()
-        });
-        vec![("photo.png", png(false, None)), ("photo.jpg", jpeg), ("photo.gif", gif), ("photo.webp", webp), ("photo.tif", tiff)]
-    }
-
-    /// The decoded `/ICCBased` profile of every image XObject that has one.
-    fn image_profiles(bytes: &[u8]) -> Vec<Vec<u8>> {
-        let pdf = hayro_syntax::Pdf::new(bytes.to_vec()).unwrap();
-        pdf.objects()
-            .into_iter()
-            .filter_map(|o| o.into_stream())
-            .filter(|s| s.dict().get::<Name>(b"Subtype").is_some_and(|n| n.as_str() == "Image"))
-            .filter_map(|s| match s.dict().get::<hayro_syntax::object::Array>(b"ColorSpace")?.iter::<Object>().nth(1)? {
-                Object::Stream(p) => Some(p.decoded().ok()?.into_owned()),
-                _ => None,
-            })
-            .collect()
-    }
-
-    /// PDF/X-4 wrote placed RGB images as DeviceRGB under the CMYK output intent, and only warned.
-    /// Each raster path now tags them with sRGB, re-encoded as JPEG or not. A plain export keeps
-    /// DeviceRGB.
-    #[test]
-    fn rgb_images_carry_srgb_in_pdfx4() {
-        let mut d = Document::new(&NewDocument::default());
-        for (i, (name, data)) in rgb_rasters().into_iter().enumerate() {
-            place(&mut d, name, data, (4.0, 2.0), (72.0, 72.0 + 60.0 * i as f64));
-        }
-        for compress_images in [false, true] {
-            let opts = PdfOptions { standard: Standard::PdfX4, compress_images, ..Default::default() };
-            let r = export_pdf_with_report(&d, &Cache::new(), &opts).unwrap();
-            assert!(r.warnings.is_empty(), "compress_images {compress_images}: {:?}", r.warnings);
-            assert_eq!(image_spaces(&r.bytes), ["[ICCBased"; 5], "compress_images {compress_images}");
-            let profiles = image_profiles(&r.bytes);
-            assert_eq!(profiles.len(), 5);
-            assert!(profiles.iter().all(|p| p == crate::export::SRGB_ICC), "every image carries the sRGB profile");
-        }
-        let plain = export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
-        assert_eq!(image_spaces(&plain.bytes), ["DeviceRGB"; 5]);
-    }
-
-    /// An image's own profile and a grey image are left as they are in PDF/X-4.
-    #[test]
-    fn own_profiles_and_grey_stay() {
-        let mut d = Document::new(&NewDocument::default());
-        place(&mut d, "grey.png", png(true, None), (4.0, 2.0), (72.0, 72.0));
-        place(&mut d, "tagged.png", png(false, Some(rgb_icc())), (4.0, 2.0), (72.0, 172.0));
-        let r = x4(&d);
-        assert_eq!(image_spaces(&r.bytes), ["DeviceGray", "[ICCBased"]);
-        assert_eq!(image_profiles(&r.bytes), [rgb_icc()]);
-    }
-
-    /// Every image constructor asked for interpolation, which PDF/X-4 and PDF/A forbid: PDF/A
-    /// exports with a placed image failed (#71). Plain exports keep it.
-    #[test]
-    fn no_interpolation_in_pdfx4_or_pdfa() {
-        let mut d = Document::new(&NewDocument::default());
-        for (i, (name, data)) in rgb_rasters().into_iter().enumerate() {
-            place(&mut d, name, data, (4.0, 2.0), (72.0, 72.0 + 60.0 * i as f64));
-        }
-        let interpolated = |b: &[u8]| String::from_utf8_lossy(b).matches("/Interpolate true").count();
-        for compress_images in [false, true] {
-            for standard in [Standard::PdfX4, Standard::PdfA2b] {
-                let opts = PdfOptions { standard, compress_images, ..Default::default() };
-                let r = export_pdf_with_report(&d, &Cache::new(), &opts).unwrap_or_else(|e| panic!("{standard:?}: {e:?}"));
-                assert_eq!(interpolated(&r.bytes), 0, "{standard:?}, compress_images {compress_images}");
-            }
-            let plain = export_pdf_with_report(&d, &Cache::new(), &PdfOptions { compress_images, ..Default::default() }).unwrap();
-            // The TIFF goes through the decoded fallback, which never asked for interpolation,
-            // unless it is re-encoded as JPEG.
-            assert_eq!(interpolated(&plain.bytes), if compress_images { 5 } else { 4 }, "compress_images {compress_images}");
-            assert!(check_pdfx4(&plain.bytes).iter().any(|i| i == "an image asks for interpolation"));
-        }
-        let tif = cmyk_tiff();
-        let mut c = Document::new(&NewDocument::default());
-        place(&mut c, "scan.tif", tif, (4.0, 2.0), (72.0, 72.0));
-        assert_eq!(interpolated(&x4(&c).bytes), 0, "CMYK TIFF");
-    }
-
-    /// A 4 × 2 CMYK TIFF, 100% K.
-    fn cmyk_tiff() -> Vec<u8> {
-        let mut b = Vec::new();
-        tiff::encoder::TiffEncoder::new(std::io::Cursor::new(&mut b))
-            .unwrap()
-            .write_image::<tiff::encoder::colortype::CMYK8>(4, 2, &[0u8, 0, 0, 255].repeat(8))
-            .unwrap();
-        b
-    }
-
-    /// The XMP states the trapping state as the document information does.
-    #[test]
-    fn xmp_states_trapped() {
-        let r = x4(&Document::new(&NewDocument::default()));
-        let pdf = hayro_syntax::Pdf::new(r.bytes.clone()).unwrap();
-        let xref = pdf.xref();
-        let catalog = xref.get::<hayro_syntax::object::Dict>(xref.root_id()).unwrap();
-        let xmp = catalog.get::<hayro_syntax::object::Stream>(b"Metadata").unwrap().decoded().unwrap().into_owned();
-        let xmp = String::from_utf8_lossy(&xmp);
-        assert!(xmp.contains("xmlns:pdf=\"http://ns.adobe.com/pdf/1.3/\"><pdf:Trapped>False</pdf:Trapped>"), "{xmp}");
-        assert!(String::from_utf8_lossy(&r.bytes).contains("/Trapped/False"));
-        assert!(r.warnings.is_empty(), "{:?}", r.warnings);
-    }
-}
+mod tests;
diff --git a/crates/pdf/src/pdfx/fonts.rs b/crates/pdf/src/pdfx/fonts.rs
index 83178682a..2107f84eb 100644
--- a/crates/pdf/src/pdfx/fonts.rs
+++ b/crates/pdf/src/pdfx/fonts.rs
@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 
 use hayro_syntax::content::UntypedIter;
-use hayro_syntax::object::{Array, Dict, Name, Object, ObjectIdentifier};
+use hayro_syntax::object::{Array, Dict, Name, Object, ObjectIdentifier, Stream};
 use hayro_syntax::page::Resources;
 
 use super::MAX_DEPTH;
@@ -127,46 +127,46 @@ impl<'a> FontScan<'a> {
                             false
                         })
                         && self.active.insert(form.obj_id())
+                        && self.scan_form(form, res, depth)
                     {
-                        let mut resources = Vec::new();
-                        let mut parent = Some(res);
-                        while let Some(r) = parent {
-                            resources.push((r.fonts.data(), r.x_objects.data()));
-                            parent = r.parent();
-                        }
-                        let key = FormContext {
-                            form: form.obj_id(),
-                            font: self.font.as_ref().map(Dict::data),
-                            mode: self.mode,
-                            resources,
-                            ancestors: self.path.clone(),
-                        };
-                        if let Some(found) = self.completed.get(&key) {
-                            self.found.extend(found.iter().cloned());
-                            self.active.remove(&form.obj_id());
-                            continue;
-                        }
-                        let inner = Resources::from_parent(form.dict().get::<Dict<'_>>(b"Resources").unwrap_or_default(), res.clone());
-                        let state = (self.font.clone(), self.mode);
-                        let outer_found = std::mem::take(&mut self.found);
-                        self.path.push(form.obj_id());
-                        if let Ok(data) = form.decoded() {
-                            self.content(&data, &inner, depth + 1);
-                        }
-                        self.path.pop();
-                        if !self.limited {
-                            self.completed.insert(key, self.found.clone());
-                        }
-                        self.found.extend(outer_found);
-                        (self.font, self.mode) = state;
-                        self.active.remove(&form.obj_id());
-                        if self.limited {
-                            return;
-                        }
+                        return;
                     }
                 }
                 _ => {}
             }
         }
     }
+
+    /// Scans a form XObject the caller has marked active. Returns `true` when the operation
+    /// limit stopped the scan, so the caller must stop too.
+    fn scan_form(&mut self, form: Stream<'a>, res: &Resources<'a>, depth: usize) -> bool {
+        let mut resources = Vec::new();
+        let mut parent = Some(res);
+        while let Some(r) = parent {
+            resources.push((r.fonts.data(), r.x_objects.data()));
+            parent = r.parent();
+        }
+        let key =
+            FormContext { form: form.obj_id(), font: self.font.as_ref().map(Dict::data), mode: self.mode, resources, ancestors: self.path.clone() };
+        if let Some(found) = self.completed.get(&key) {
+            self.found.extend(found.iter().cloned());
+            self.active.remove(&form.obj_id());
+            return false;
+        }
+        let inner = Resources::from_parent(form.dict().get::<Dict<'_>>(b"Resources").unwrap_or_default(), res.clone());
+        let state = (self.font.clone(), self.mode);
+        let outer_found = std::mem::take(&mut self.found);
+        self.path.push(form.obj_id());
+        if let Ok(data) = form.decoded() {
+            self.content(&data, &inner, depth + 1);
+        }
+        self.path.pop();
+        if !self.limited {
+            self.completed.insert(key, self.found.clone());
+        }
+        self.found.extend(outer_found);
+        (self.font, self.mode) = state;
+        self.active.remove(&form.obj_id());
+        self.limited
+    }
 }
diff --git a/crates/pdf/src/pdfx/tests.rs b/crates/pdf/src/pdfx/tests.rs
new file mode 100644
index 000000000..edb6aec8f
--- /dev/null
+++ b/crates/pdf/src/pdfx/tests.rs
@@ -0,0 +1,464 @@
+use craft_pdf::write::backend as krilla;
+use std::sync::Arc;
+
+use designcraft_color::{Color, Swatch};
+use designcraft_compose::Cache;
+use designcraft_doc::build::NewDocument;
+use designcraft_doc::{Asset, AssetId, Content, Document, Fill, Fitting, Graphic, Item, ItemId, Shape, SpreadRef};
+use designcraft_geom::{Affine, Rect};
+use hayro_syntax::object::{Name, Object};
+use image::{ExtendedColorType, ImageEncoder};
+
+use crate::{ExportReport, PdfOptions, Standard, check_pdfx4, export_pdf_with_report};
+
+pub(super) fn place(d: &mut Document, name: &str, data: Vec<u8>, size: (f64, f64), at: (f64, f64)) {
+    let asset = AssetId(d.alloc());
+    let mime = designcraft_images::mime(&data).into();
+    let pixels = designcraft_images::pixel_size(&data);
+    d.assets.insert(asset, Arc::new(Asset { id: asset, name: name.into(), mime, data: data.into(), pixels, ..Default::default() }));
+    let lid = d.default_layer();
+    let id = ItemId(d.alloc());
+    let r = Rect::new(at.0, at.1, at.0 + 100.0, at.1 + 50.0);
+    let mut it = Item::new(id, lid, Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
+    it.content = Content::Graphic(Graphic {
+        layer_options: None,
+        asset,
+        size,
+        xf: Affine::translate(at) * Affine::scale(100.0 / size.0),
+        clip: None,
+        auto_fit: Fitting::FillProportionally,
+        fit_align: 4,
+        crop: [0.0; 4],
+        wrap: Default::default(),
+        fill: Default::default(),
+    });
+    d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
+}
+
+fn add_box(d: &mut Document, r: Rect, swatch: &str) {
+    let lid = d.default_layer();
+    let mut b = Item::new(ItemId(d.alloc()), lid, Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
+    b.fill = Fill::swatch(swatch);
+    d.insert_item(SpreadRef::Doc(0), b, None).unwrap();
+}
+
+/// A 4 × 2 PNG: red RGB or mid grey, optionally carrying an ICC profile.
+fn png(gray: bool, icc: Option<Vec<u8>>) -> Vec<u8> {
+    let mut b = Vec::new();
+    let mut enc = image::codecs::png::PngEncoder::new(&mut b);
+    if let Some(p) = icc {
+        enc.set_icc_profile(p).unwrap();
+    }
+    let (px, ty) = if gray { (vec![128u8; 8], ExtendedColorType::L8) } else { ([255u8, 0, 0].repeat(8), ExtendedColorType::Rgb8) };
+    enc.write_image(&px, 4, 2, ty).unwrap();
+    b
+}
+
+/// The header of an ICC v2.1 RGB display profile: what a PDF writer reads to tag an image
+/// `/ICCBased` (the check looks at the colour space, not at the profile's tables).
+fn rgb_icc() -> Vec<u8> {
+    let mut p = vec![0u8; 132];
+    p[..4].copy_from_slice(&132u32.to_be_bytes());
+    p[8] = 2;
+    p[9] = 0x10;
+    p[12..16].copy_from_slice(b"mntr");
+    p[16..20].copy_from_slice(b"RGB ");
+    p[20..24].copy_from_slice(b"XYZ ");
+    p[36..40].copy_from_slice(b"acsp");
+    p
+}
+
+/// A 4 × 2 CMYK image (100% K) as krilla writes it.
+#[derive(Clone, Hash)]
+struct CmykImage(Vec<u8>);
+
+impl krilla::image::CustomImage for CmykImage {
+    fn color_channel(&self) -> &[u8] {
+        &self.0
+    }
+    fn alpha_channel(&self) -> Option<&[u8]> {
+        None
+    }
+    fn bits_per_component(&self) -> krilla::image::BitsPerComponent {
+        krilla::image::BitsPerComponent::Eight
+    }
+    fn size(&self) -> (u32, u32) {
+        (4, 2)
+    }
+    fn icc_profile(&self) -> Option<&[u8]> {
+        None
+    }
+    fn color_space(&self) -> krilla::image::ImageColorspace {
+        krilla::image::ImageColorspace::Cmyk
+    }
+}
+
+/// A one-page PDF 1.6 holding a CMYK image, as another app would hand over a placed graphic.
+fn pdf_with_cmyk_image() -> Vec<u8> {
+    pdf_with_image(krilla::image::Image::from_custom(CmykImage([0u8, 0, 0, 255].repeat(8)), false).unwrap())
+}
+
+/// A one-page PDF 1.6 holding `img`.
+fn pdf_with_image(img: krilla::image::Image) -> Vec<u8> {
+    let configuration = krilla::configure::ConfigurationBuilder::new().with_version(krilla::configure::PdfVersion::Pdf16).finish().unwrap();
+    let mut pdf = krilla::Document::new_with(krilla::SerializeSettings { configuration, ..Default::default() });
+    let size = krilla::geom::Size::from_wh(100.0, 50.0).unwrap();
+    let mut page = pdf.start_page_with(krilla::page::PageSettings::new(size));
+    let mut s = page.surface();
+    s.draw_image(img, size);
+    s.finish();
+    page.finish();
+    pdf.finish().unwrap()
+}
+
+pub(super) fn x4(d: &Document) -> ExportReport {
+    export_pdf_with_report(d, &Cache::new(), &PdfOptions { standard: Standard::PdfX4, ..Default::default() }).unwrap()
+}
+
+/// The `/ColorSpace` of every image XObject: a name, or `[` for an array (ICCBased, Indexed…).
+fn image_spaces(bytes: &[u8]) -> Vec<String> {
+    let pdf = hayro_syntax::Pdf::new(bytes.to_vec()).unwrap();
+    let mut out: Vec<String> = pdf
+        .objects()
+        .into_iter()
+        .filter_map(|o| o.into_stream())
+        .filter(|s| s.dict().get::<Name>(b"Subtype").is_some_and(|n| n.as_str() == "Image") && s.dict().get::<bool>(b"ImageMask").is_none())
+        .filter_map(|s| match s.dict().get::<Object>(b"ColorSpace")? {
+            Object::Name(n) => Some(n.as_str().to_string()),
+            Object::Array(a) => a.iter::<Name>().next().map(|n| format!("[{}", n.as_str())),
+            _ => None,
+        })
+        .collect();
+    out.sort();
+    out
+}
+
+/// A DeviceRGB image under the CMYK output intent is reported. A placed PDF carries its
+/// images into the export unchanged.
+#[test]
+fn device_rgb_image_is_flagged() {
+    let mut d = Document::new(&NewDocument::default());
+    let photo = krilla::image::Image::from_png(png(false, None).into(), false).unwrap();
+    place(&mut d, "photo.pdf", pdf_with_image(photo), (100.0, 50.0), (72.0, 72.0));
+    let r = x4(&d);
+    assert_eq!(image_spaces(&r.bytes), ["DeviceRGB"]);
+    let rgb: Vec<&String> = r.warnings.iter().filter(|w| w.contains("RGB")).collect();
+    assert_eq!(rgb.len(), 1, "{:?}", r.warnings);
+    assert!(rgb[0].starts_with("PDF/X-4: an RGB image (object ") && rgb[0].contains("4 × 2 px) on page 1:"), "{}", rgb[0]);
+    // Without a PDF/X output intent there is nothing to check RGB against.
+    let plain = export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
+    assert!(!check_pdfx4(&plain.bytes).iter().any(|i| i.contains("RGB")));
+}
+
+/// CMYK and grey are the output intent's own values and ICC-tagged RGB is colour-managed:
+/// none of them is flagged, whether placed directly or inside a placed PDF.
+#[test]
+fn cmyk_grey_and_icc_rgb_pass() {
+    let mut d = Document::new(&NewDocument::default());
+    add_box(&mut d, Rect::new(36.0, 400.0, 136.0, 500.0), "C=100 M=0 Y=0 K=0");
+    place(&mut d, "grey.png", png(true, None), (4.0, 2.0), (72.0, 72.0));
+    place(&mut d, "tagged.png", png(false, Some(rgb_icc())), (4.0, 2.0), (72.0, 172.0));
+    place(&mut d, "logo.pdf", pdf_with_cmyk_image(), (100.0, 50.0), (72.0, 272.0));
+    let r = x4(&d);
+    assert_eq!(image_spaces(&r.bytes), ["DeviceCMYK", "DeviceGray", "[ICCBased"]);
+    assert!(r.warnings.is_empty(), "{:?}", r.warnings);
+}
+
+/// RGB swatches paint in DeviceRGB.
+#[test]
+fn device_rgb_fills_are_flagged() {
+    let mut d = Document::new(&NewDocument { pages: 2, ..NewDocument::default() });
+    d.swatches.push(Swatch::color("Brand Red", Color::rgb(0.9, 0.1, 0.1)));
+    add_box(&mut d, Rect::new(36.0, 400.0, 136.0, 500.0), "Brand Red");
+    let r = x4(&d);
+    assert_eq!(r.warnings, ["PDF/X-4: RGB fills or strokes on page 1: under a CMYK output intent RGB needs an ICC profile"]);
+}
+
+/// A minimal PDF with a CMYK (N 4) PDF/X output intent and one page with `entries` (its
+/// resources, a group…) and `content`.
+fn tiny_pdf(entries: &str, content: &str) -> Vec<u8> {
+    tiny_pdf_with(entries, content, "<</N 3/Length 0>>\nstream\n\nendstream")
+}
+
+/// [`tiny_pdf`] with `extra` as object 6 (an RGB profile in [`tiny_pdf`]).
+pub(super) fn tiny_pdf_with(entries: &str, content: &str, extra: &str) -> Vec<u8> {
+    let objects = [
+        "<</Type/Catalog/Pages 2 0 R/OutputIntents[<</Type/OutputIntent/S/GTS_PDFX/DestOutputProfile 4 0 R>>]>>".to_string(),
+        "<</Type/Pages/Kids[3 0 R]/Count 1>>".to_string(),
+        format!("<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]{entries}/Contents 5 0 R>>"),
+        "<</N 4/Length 0>>\nstream\n\nendstream".to_string(),
+        format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
+        extra.to_string(),
+    ];
+    let mut out = b"%PDF-1.6\n".to_vec();
+    let mut offsets = Vec::new();
+    for (i, o) in objects.iter().enumerate() {
+        offsets.push(out.len());
+        out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());
+    }
+    let xref = out.len();
+    out.extend_from_slice(format!("xref\n0 {}\n0000000000 65535 f\r\n", objects.len() + 1).as_bytes());
+    for off in offsets {
+        out.extend_from_slice(format!("{off:010} 00000 n\r\n").as_bytes());
+    }
+    out.extend_from_slice(format!("trailer\n<</Size {}/Root 1 0 R>>\nstartxref\n{xref}\n%%EOF\n", objects.len() + 1).as_bytes());
+    out
+}
+
+/// A metadata object whose only `stream` is the one inside `endstream` is refused, not a slice panic.
+#[test]
+fn metadata_with_only_endstream_does_not_panic() {
+    let objects = ["<</Type/Catalog/Pages 2 0 R/Metadata 3 0 R>>", "<</Type/Pages/Kids[]/Count 0>>", "<</Type/Metadata>>endstream"];
+    let mut out = b"%PDF-1.6\n".to_vec();
+    for (i, o) in objects.iter().enumerate() {
+        out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());
+    }
+    out.extend_from_slice(b"trailer\n<</Size 4/Root 1 0 R>>\nstartxref\n0\n%%EOF\n");
+    assert!(super::make_pdfx4(&out, None).is_none());
+}
+
+/// DeviceRGB is allowed when a `DefaultRGB` colour space makes it colour-managed.
+#[test]
+fn default_rgb_makes_device_rgb_managed() {
+    let rgb = |i: &String| i.contains("RGB");
+    let content = "1 0 0 rg 0 0 10 10 re f /DeviceRGB CS 0 0 1 SC 0 0 m 10 10 l S";
+    let bare = check_pdfx4(&tiny_pdf("/Resources<<>>", content));
+    assert_eq!(bare.iter().filter(|i| rgb(i)).count(), 1, "{bare:?}");
+    let managed = check_pdfx4(&tiny_pdf("/Resources<</ColorSpace<</DefaultRGB[/ICCBased 6 0 R]>>>>", content));
+    assert!(!managed.iter().any(rgb), "{managed:?}");
+    // CMYK and grey need no default space.
+    let cmyk = check_pdfx4(&tiny_pdf("/Resources<<>>", "0 0 0 1 k 0 0 10 10 re f 0.5 G 0 0 m 10 10 l S"));
+    assert!(!cmyk.iter().any(rgb), "{cmyk:?}");
+}
+
+/// Every font that draws visible text must be embedded (#909): a base-14 font with no font
+/// file, a CID font whose descendant has none, and one drawn from inside a form are reported;
+/// an embedded font, an unused one and invisible text (render mode 3, as in OCR layers) are not.
+#[test]
+fn unembedded_fonts_are_flagged() {
+    let fonts = |entries: &str, content: &str| -> Vec<String> {
+        check_pdfx4(&tiny_pdf(entries, content)).into_iter().filter(|i| i.contains("font")).collect()
+    };
+    let helvetica = "/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>>>>>";
+    assert_eq!(
+        fonts(helvetica, "BT /F1 24 Tf 20 50 Td (Base14 text) Tj ET"),
+        ["the font Helvetica isn't embedded (page 1): PDF/X-4 needs every font used for visible text embedded"]
+    );
+    assert!(fonts(helvetica, "BT /F1 24 Tf 3 Tr 20 50 Td (OCR) Tj ET").is_empty(), "invisible text needs no embedded font");
+    assert!(fonts(helvetica, "0 0 0 1 k 0 0 10 10 re f").is_empty(), "an unused font is not reported");
+    let restored = fonts(helvetica, "BT /F1 24 Tf q 3 Tr Q 20 50 Td (shown) Tj ET");
+    assert_eq!(restored.len(), 1, "Q restores the visible render mode: {restored:?}");
+
+    let embedded = "/Resources<</Font<</F1<</Type/Font/Subtype/TrueType/BaseFont/ABCDEF+Arial/FontDescriptor<</Type/FontDescriptor/FontName/ABCDEF+Arial/FontFile2 6 0 R>>>>>>>>";
+    assert!(fonts(embedded, "BT /F1 12 Tf (x) Tj ET").is_empty());
+    let cid = "/Resources<</Font<</F1<</Type/Font/Subtype/Type0/BaseFont/KozMin/Encoding/Identity-H/DescendantFonts[<</Type/Font/Subtype/CIDFontType0/BaseFont/KozMin/FontDescriptor<</Type/FontDescriptor/FontName/KozMin>>>>]>>>>>>";
+    assert_eq!(fonts(cid, "BT /F1 12 Tf <0001> Tj ET").len(), 1);
+    let cid_embedded = cid.replace("/FontName/KozMin>>", "/FontName/KozMin/FontFile3 6 0 R>>");
+    assert!(fonts(&cid_embedded, "BT /F1 12 Tf <0001> Tj ET").is_empty());
+
+    let draw = "BT /T 9 Tf (in a form) Tj ET";
+    let form = format!(
+        "<</Type/XObject/Subtype/Form/BBox[0 0 100 100]/Resources<</Font<</T<</Type/Font/Subtype/Type1/BaseFont/Times-Roman>>>>>>/Length {}>>\nstream\n{draw}\nendstream",
+        draw.len()
+    );
+    let pdf = tiny_pdf_with("/Resources<</XObject<</X1 6 0 R>>>>", "/X1 Do", &form);
+    let issues: Vec<String> = check_pdfx4(&pdf).into_iter().filter(|i| i.contains("font")).collect();
+    assert_eq!(issues.len(), 1, "{issues:?}");
+    assert!(issues[0].starts_with("the font Times-Roman isn't embedded"), "{issues:?}");
+}
+
+/// A placed PDF that draws with an unembedded font: the PDF/X-4 export warns about it (#909).
+#[test]
+fn placed_pdf_with_an_unembedded_font_is_reported() {
+    let mut d = Document::new(&NewDocument::default());
+    let placed = tiny_pdf(
+        "/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica/Encoding/WinAnsiEncoding>>>>>>",
+        "BT /F1 24 Tf 0 0 0 1 k 20 50 Td (Base14 text) Tj ET",
+    );
+    place(&mut d, "helvetica.pdf", placed, (100.0, 100.0), (72.0, 72.0));
+    let r = x4(&d);
+    assert!(r.warnings.iter().any(|w| w.starts_with("PDF/X-4: the font Helvetica isn't embedded (page 1)")), "{:?}", r.warnings);
+}
+
+#[test]
+fn unembedded_fonts_are_reported_by_every_text_show_operator() {
+    let entries = "/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>>>>>";
+    for show in ["(x) Tj", "[(x) 20 (y)] TJ", "(x) '", "0 0 (x) \""] {
+        let pdf = tiny_pdf(entries, &format!("BT /F1 12 Tf {show} ET"));
+        let issues = check_pdfx4(&pdf);
+        assert_eq!(issues.iter().filter(|i| i.contains("isn't embedded")).count(), 1, "{show}: {issues:?}");
+    }
+}
+
+#[test]
+fn unembedded_fonts_in_forms_inherit_and_restore_text_state() {
+    let entries = "/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>>>/XObject<</X1 6 0 R>>>>";
+    let draw = "BT (inherited font) Tj /F1 10 Tf 3 Tr ET";
+    let form = format!("<</Type/XObject/Subtype/Form/BBox[0 0 100 100]/Length {}>>\nstream\n{draw}\nendstream", draw.len());
+    for (content, count) in [
+        ("/F1 12 Tf /X1 Do", 1),
+        ("/F1 12 Tf 3 Tr /X1 Do", 0),
+        ("/F1 12 Tf 3 Tr /X1 Do 0 Tr /X1 Do", 1),
+        ("/F1 12 Tf /X1 Do BT (still visible) Tj ET", 1),
+    ] {
+        let pdf = tiny_pdf_with(entries, content, &form);
+        let issues = check_pdfx4(&pdf);
+        assert_eq!(issues.iter().filter(|i| i.contains("isn't embedded")).count(), count, "{content}: {issues:?}");
+    }
+}
+
+#[test]
+fn unembedded_fonts_in_recursive_forms_are_bounded() {
+    let draw = "BT /F1 12 Tf (x) Tj ET /X1 Do";
+    let form = format!(
+        "<</Type/XObject/Subtype/Form/BBox[0 0 100 100]/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>>>/XObject<</X1 6 0 R>>>>/Length {}>>\nstream\n{draw}\nendstream",
+        draw.len()
+    );
+    let pdf = tiny_pdf_with("/Resources<</XObject<</X1 6 0 R>>>>", "/X1 Do", &form);
+    let issues = check_pdfx4(&pdf);
+    assert_eq!(issues.iter().filter(|i| i.contains("isn't embedded")).count(), 1, "{issues:?}");
+}
+
+#[test]
+fn unembedded_fonts_are_reported_after_form_text_state_is_restored() {
+    let entries = "/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>>>/XObject<</X1 6 0 R>>>>";
+    let draw = "BT /F2 10 Tf 3 Tr (hidden) Tj ET";
+    let form = format!(
+        "<</Type/XObject/Subtype/Form/BBox[0 0 100 100]/Resources<</Font<</F2<</Type/Font/Subtype/Type1/BaseFont/Times-Roman>>>>>>/Length {}>>\nstream\n{draw}\nendstream",
+        draw.len()
+    );
+    let pdf = tiny_pdf_with(entries, "/F1 12 Tf /X1 Do BT (visible) Tj ET", &form);
+    let issues: Vec<String> = check_pdfx4(&pdf).into_iter().filter(|i| i.contains("isn't embedded")).collect();
+    assert_eq!(issues.len(), 1, "{issues:?}");
+    assert!(issues[0].starts_with("the font Helvetica isn't embedded"), "{issues:?}");
+}
+
+/// An RGB blending space on the page group and an RGB inline image are device RGB too.
+#[test]
+fn rgb_groups_and_inline_images_are_flagged() {
+    let group = check_pdfx4(&tiny_pdf("/Resources<<>>/Group<</S/Transparency/CS/DeviceRGB>>", "0 0 0 1 k"));
+    assert!(
+        group.iter().any(|i| i == "a transparency group blending in RGB on page 1: under a CMYK output intent RGB needs an ICC profile"),
+        "{group:?}"
+    );
+    let inline = check_pdfx4(&tiny_pdf("/Resources<<>>", "q BI /W 1 /H 1 /CS /RGB /BPC 8 /F /AHx ID ff0000> EI Q"));
+    assert!(inline.iter().any(|i| i.starts_with("an RGB inline image on page 1")), "{inline:?}");
+    let grey = check_pdfx4(&tiny_pdf("/Resources<<>>", "q BI /W 1 /H 1 /CS /G /BPC 8 /F /AHx ID 80> EI Q"));
+    assert!(!grey.iter().any(|i| i.contains("RGB")), "{grey:?}");
+}
+
+/// A 4 × 2 RGB image in every raster path the exporter has, none with a profile. Each has
+/// its own colour, so no two share an image XObject.
+fn rgb_rasters() -> Vec<(&'static str, Vec<u8>)> {
+    let px = |c: [u8; 3]| c.repeat(8);
+    let encode = |f: &dyn Fn(&mut Vec<u8>)| {
+        let mut b = Vec::new();
+        f(&mut b);
+        b
+    };
+    let jpeg = encode(&|b| image::codecs::jpeg::JpegEncoder::new(b).write_image(&px([0, 0, 255]), 4, 2, ExtendedColorType::Rgb8).unwrap());
+    let gif = encode(&|b| image::codecs::gif::GifEncoder::new(b).encode(&[0u8, 255, 0, 255].repeat(8), 4, 2, ExtendedColorType::Rgba8).unwrap());
+    let webp = encode(&|b| image::codecs::webp::WebPEncoder::new_lossless(b).write_image(&px([255, 255, 0]), 4, 2, ExtendedColorType::Rgb8).unwrap());
+    let tiff = encode(&|b| {
+        image::codecs::tiff::TiffEncoder::new(std::io::Cursor::new(b)).write_image(&px([0, 255, 255]), 4, 2, ExtendedColorType::Rgb8).unwrap()
+    });
+    vec![("photo.png", png(false, None)), ("photo.jpg", jpeg), ("photo.gif", gif), ("photo.webp", webp), ("photo.tif", tiff)]
+}
+
+/// The decoded `/ICCBased` profile of every image XObject that has one.
+fn image_profiles(bytes: &[u8]) -> Vec<Vec<u8>> {
+    let pdf = hayro_syntax::Pdf::new(bytes.to_vec()).unwrap();
+    pdf.objects()
+        .into_iter()
+        .filter_map(|o| o.into_stream())
+        .filter(|s| s.dict().get::<Name>(b"Subtype").is_some_and(|n| n.as_str() == "Image"))
+        .filter_map(|s| match s.dict().get::<hayro_syntax::object::Array>(b"ColorSpace")?.iter::<Object>().nth(1)? {
+            Object::Stream(p) => Some(p.decoded().ok()?.into_owned()),
+            _ => None,
+        })
+        .collect()
+}
+
+/// PDF/X-4 wrote placed RGB images as DeviceRGB under the CMYK output intent, and only warned.
+/// Each raster path now tags them with sRGB, re-encoded as JPEG or not. A plain export keeps
+/// DeviceRGB.
+#[test]
+fn rgb_images_carry_srgb_in_pdfx4() {
+    let mut d = Document::new(&NewDocument::default());
+    for (i, (name, data)) in rgb_rasters().into_iter().enumerate() {
+        place(&mut d, name, data, (4.0, 2.0), (72.0, 72.0 + 60.0 * i as f64));
+    }
+    for compress_images in [false, true] {
+        let opts = PdfOptions { standard: Standard::PdfX4, compress_images, ..Default::default() };
+        let r = export_pdf_with_report(&d, &Cache::new(), &opts).unwrap();
+        assert!(r.warnings.is_empty(), "compress_images {compress_images}: {:?}", r.warnings);
+        assert_eq!(image_spaces(&r.bytes), ["[ICCBased"; 5], "compress_images {compress_images}");
+        let profiles = image_profiles(&r.bytes);
+        assert_eq!(profiles.len(), 5);
+        assert!(profiles.iter().all(|p| p == crate::export::SRGB_ICC), "every image carries the sRGB profile");
+    }
+    let plain = export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
+    assert_eq!(image_spaces(&plain.bytes), ["DeviceRGB"; 5]);
+}
+
+/// An image's own profile and a grey image are left as they are in PDF/X-4.
+#[test]
+fn own_profiles_and_grey_stay() {
+    let mut d = Document::new(&NewDocument::default());
+    place(&mut d, "grey.png", png(true, None), (4.0, 2.0), (72.0, 72.0));
+    place(&mut d, "tagged.png", png(false, Some(rgb_icc())), (4.0, 2.0), (72.0, 172.0));
+    let r = x4(&d);
+    assert_eq!(image_spaces(&r.bytes), ["DeviceGray", "[ICCBased"]);
+    assert_eq!(image_profiles(&r.bytes), [rgb_icc()]);
+}
+
+/// Every image constructor asked for interpolation, which PDF/X-4 and PDF/A forbid: PDF/A
+/// exports with a placed image failed (#71). Plain exports keep it.
+#[test]
+fn no_interpolation_in_pdfx4_or_pdfa() {
+    let mut d = Document::new(&NewDocument::default());
+    for (i, (name, data)) in rgb_rasters().into_iter().enumerate() {
+        place(&mut d, name, data, (4.0, 2.0), (72.0, 72.0 + 60.0 * i as f64));
+    }
+    let interpolated = |b: &[u8]| String::from_utf8_lossy(b).matches("/Interpolate true").count();
+    for compress_images in [false, true] {
+        for standard in [Standard::PdfX4, Standard::PdfA2b] {
+            let opts = PdfOptions { standard, compress_images, ..Default::default() };
+            let r = export_pdf_with_report(&d, &Cache::new(), &opts).unwrap_or_else(|e| panic!("{standard:?}: {e:?}"));
+            assert_eq!(interpolated(&r.bytes), 0, "{standard:?}, compress_images {compress_images}");
+        }
+        let plain = export_pdf_with_report(&d, &Cache::new(), &PdfOptions { compress_images, ..Default::default() }).unwrap();
+        // The TIFF goes through the decoded fallback, which never asked for interpolation,
+        // unless it is re-encoded as JPEG.
+        assert_eq!(interpolated(&plain.bytes), if compress_images { 5 } else { 4 }, "compress_images {compress_images}");
+        assert!(check_pdfx4(&plain.bytes).iter().any(|i| i == "an image asks for interpolation"));
+    }
+    let tif = cmyk_tiff();
+    let mut c = Document::new(&NewDocument::default());
+    place(&mut c, "scan.tif", tif, (4.0, 2.0), (72.0, 72.0));
+    assert_eq!(interpolated(&x4(&c).bytes), 0, "CMYK TIFF");
+}
+
+/// A 4 × 2 CMYK TIFF, 100% K.
+fn cmyk_tiff() -> Vec<u8> {
+    let mut b = Vec::new();
+    tiff::encoder::TiffEncoder::new(std::io::Cursor::new(&mut b))
+        .unwrap()
+        .write_image::<tiff::encoder::colortype::CMYK8>(4, 2, &[0u8, 0, 0, 255].repeat(8))
+        .unwrap();
+    b
+}
+
+/// The XMP states the trapping state as the document information does.
+#[test]
+fn xmp_states_trapped() {
+    let r = x4(&Document::new(&NewDocument::default()));
+    let pdf = hayro_syntax::Pdf::new(r.bytes.clone()).unwrap();
+    let xref = pdf.xref();
+    let catalog = xref.get::<hayro_syntax::object::Dict>(xref.root_id()).unwrap();
+    let xmp = catalog.get::<hayro_syntax::object::Stream>(b"Metadata").unwrap().decoded().unwrap().into_owned();
+    let xmp = String::from_utf8_lossy(&xmp);
+    assert!(xmp.contains("xmlns:pdf=\"http://ns.adobe.com/pdf/1.3/\"") && xmp.contains("<pdf:Trapped>False</pdf:Trapped>"), "{xmp}");
+    assert!(String::from_utf8_lossy(&r.bytes).contains("/Trapped/False"));
+    assert!(r.warnings.is_empty(), "{:?}", r.warnings);
+}
diff --git a/crates/pdf/src/pdfx1a.rs b/crates/pdf/src/pdfx1a.rs
new file mode 100644
index 000000000..88759b071
--- /dev/null
+++ b/crates/pdf/src/pdfx1a.rs
@@ -0,0 +1,743 @@
+//! PDF/X-1a:2003: the PDF/X-4 print file flattened by craft-prepress (no transparency left; RGB
+//! and ICC color converted into the output intent's CMYK; inks, overprint and live text kept),
+//! written by krilla as PDF 1.4, given the PDF/X-1a identification and output intent, then
+//! checked.
+
+use std::collections::{HashMap, HashSet};
+
+use craft_pdf::write::backend::configure::PdfVersion;
+use craft_prepress::flatten::pdf::ReadOptions;
+use craft_prepress::flatten::{FlattenDocumentOptions, FlattenOptions, FlattenTotals, flatten_document};
+use hayro_syntax::content::UntypedIter;
+use hayro_syntax::object::{Array, Dict, Name, Object, ObjectIdentifier, Stream};
+use hayro_syntax::page::Resources;
+
+use crate::PdfError;
+use crate::pdfx::MAX_DEPTH;
+use crate::transitions::{find, int_after, rfind};
+
+/// `GTS_PDFXVersion` of PDF/X-1a:2003 (ISO 15930-4): the base level, PDF/X-1:2003.
+const VERSION: &str = "PDF/X-1:2003";
+
+/// `GTS_PDFXConformance` of PDF/X-1a:2003 (ISO 15930-4): with [`VERSION`], it names the
+/// conformance level.
+const CONFORMANCE: &str = "PDF/X-1a:2003";
+
+/// `/RegistryName` of the ICC's registry of characterized printing conditions. An output intent
+/// naming one of them needs no `/DestOutputProfile` in PDF/X.
+const ICC_REGISTRY: &str = "http://www.color.org";
+
+/// The graphics placed on one output page, to name in errors: the page's name and the graphics'
+/// names.
+#[derive(Clone, Debug, Default)]
+pub(crate) struct PageGraphics {
+    pub label: String,
+    pub graphics: Vec<String>,
+}
+
+/// The PDF/X-1a file for `pdf`, the PDF/X-4 print file: flattened at `dpi`, written at PDF 1.4,
+/// identified, checked. `pages` names each output page and its graphics for errors. Fails when
+/// the flattener fails or leaves an image out, when the output intent's profile can't go into a
+/// PDF 1.4 file, or when the result still has transparency or color outside DeviceCMYK,
+/// DeviceGray, Separation and DeviceN; other check findings become warnings.
+pub(crate) fn flatten_x1a(pdf: &[u8], dpi: f32, pages: &[PageGraphics], warnings: &mut Vec<String>) -> crate::Result<Vec<u8>> {
+    let dpi = if dpi.is_finite() { dpi.clamp(36.0, 2400.0) } else { 300.0 };
+    let opts = FlattenDocumentOptions {
+        read: ReadOptions { raster_dpi: dpi, ..ReadOptions::default() },
+        flatten: FlattenOptions { raster_dpi: dpi, ..FlattenOptions::default() },
+        producer: "DesignCraft".into(),
+        version: PdfVersion::Pdf14,
+        pdfx_version: Some(VERSION.into()),
+        ..FlattenDocumentOptions::default()
+    };
+    let (bytes, report) = flatten_document(pdf, &opts).map_err(|e| PdfError::Write(format!("PDF/X-1a: the transparency flattener failed: {e}")))?;
+    let unread: Vec<String> = report
+        .pages
+        .iter()
+        .filter(|(_, r)| r.read.unreadable_images > 0)
+        .map(|(page, r)| {
+            let n = r.read.unreadable_images;
+            let images = if n == 1 { "1 image".to_string() } else { format!("{n} images") };
+            let fallback = PageGraphics { label: page.saturating_add(1).to_string(), graphics: Vec::new() };
+            let at = pages.get(*page).unwrap_or(&fallback);
+            let names: Vec<String> = at.graphics.iter().take(5).map(|g| format!("`{g}`")).collect();
+            let more = if at.graphics.len() > 5 { ", …" } else { "" };
+            let placed = if names.is_empty() { String::new() } else { format!(" (graphics on it: {}{more})", names.join(", ")) };
+            format!("{images} on page {}{placed}", at.label)
+        })
+        .collect();
+    if !unread.is_empty() {
+        return Err(PdfError::Write(format!(
+            "PDF/X-1a: the transparency flattener couldn't read {}, and a PDF/X file can't leave images out: replace the graphic, or export without PDF/X-1a",
+            unread.join("; ")
+        )));
+    }
+    warnings.extend(flatten_warnings(&report.totals, dpi));
+    let bytes = finish(&bytes).map_err(|e| PdfError::Write(format!("PDF/X-1a: {e}")))?;
+    let (fatal, other) = checks(&bytes);
+    if !fatal.is_empty() {
+        return Err(PdfError::Write(format!("PDF/X-1a: after flattening, {}", fatal.join("; "))));
+    }
+    warnings.extend(other.into_iter().map(|issue| format!("PDF/X-1a: {issue}")));
+    Ok(bytes)
+}
+
+/// What the flattener's `t` (at `dpi`) tells the user: rasterized transparency, and spot inks past
+/// the ink set's capacity, whose tints the flattener drops.
+pub(crate) fn flatten_warnings(t: &FlattenTotals, dpi: f32) -> Vec<String> {
+    let mut out = Vec::new();
+    if t.complex_regions > 0 || t.complex_groups > 0 {
+        let at = t.lowest_dpi.map(|d| format!(", some below {dpi:.0} ppi (lowest {d:.0} ppi)")).unwrap_or_default();
+        out.push(format!("PDF/X-1a: transparency flattened: {} region(s) rasterized at {dpi:.0} ppi{at}", t.complex_regions + t.complex_groups));
+    }
+    if t.dropped_inks > 0 {
+        out.push(format!(
+            "PDF/X-1a: the document has more spot inks than the flattener can separate: {} tint(s) in the inks past its limit were dropped and won't print",
+            t.dropped_inks
+        ));
+    }
+    out
+}
+
+/// PDF/X-1a:2003 checks on an exported file (empty = passes them): PDF 1.4 or lower, the
+/// identification (`GTS_PDFXVersion` and `GTS_PDFXConformance`), a CMYK `GTS_PDFX` output intent
+/// whose profile, when it has one, is ICC v2 (and without one, names a registered printing
+/// condition), `/Trapped` True or False, trim boxes, no encryption or interpolation; no
+/// transparency (soft masks, transparency groups, constant opacity below 1, blend modes other
+/// than Normal); only DeviceCMYK, DeviceGray, Separation and DeviceN (and Indexed and Pattern
+/// spaces over them), a spot's alternate space process; every font embedded.
+pub fn check_pdfx1a(pdf: &[u8]) -> Vec<String> {
+    let (mut issues, other) = checks(pdf);
+    issues.extend(other);
+    issues
+}
+
+/// [`check_pdfx1a`]'s findings: transparency and color spaces first, then the rest.
+fn checks(pdf: &[u8]) -> (Vec<String>, Vec<String>) {
+    let mut issues = Vec::new();
+    let text = String::from_utf8_lossy(pdf);
+    if !pdf.starts_with(b"%PDF-1.") || pdf.get(7).is_none_or(|v| *v > b'4') {
+        issues.push("the PDF version must be 1.4 or lower".into());
+    }
+    if !text.contains("/S/GTS_PDFX") {
+        issues.push("no PDF/X output intent".into());
+    }
+    if !text.contains(&format!("/GTS_PDFXVersion({VERSION})")) {
+        issues.push(format!("the document information doesn't name {VERSION}"));
+    }
+    if !text.contains(&format!("/GTS_PDFXConformance({CONFORMANCE})")) {
+        issues.push(format!("the document information doesn't name the conformance level {CONFORMANCE}"));
+    }
+    if !text.contains("/Trapped/False") && !text.contains("/Trapped/True") && !text.contains("/Trapped /False") && !text.contains("/Trapped /True") {
+        issues.push("the document information needs /Trapped True or False".into());
+    }
+    if text.contains("/Interpolate true") {
+        issues.push("an image asks for interpolation".into());
+    }
+    if text.contains("/Encrypt") {
+        issues.push("the file is encrypted".into());
+    }
+    let pages = text.matches("/Type/Page/").count() + text.matches("/Type/Page>").count();
+    let trims = text.matches("/TrimBox").count();
+    if pages > 0 && trims < pages {
+        issues.push("every page needs a trim box".into());
+    }
+    let (content, fonts) = content(pdf);
+    issues.extend(fonts);
+    (content, issues)
+}
+
+/// Transparency and color spaces, then the output intent and fonts, walked through every page's
+/// content and what it uses.
+fn content(pdf: &[u8]) -> (Vec<String>, Vec<String>) {
+    let Ok(file) = hayro_syntax::Pdf::new(pdf.to_vec()) else {
+        return (vec!["the file couldn't be read to check its transparency and color spaces".into()], Vec::new());
+    };
+    let mut fonts = intent_issues(&file);
+    let mut found: Vec<(String, Vec<usize>)> = Vec::new();
+    let mut font_found: Vec<(String, Vec<usize>)> = Vec::new();
+    for (i, page) in file.pages().iter().enumerate() {
+        let mut scan = Scan::default();
+        let res = page.resources();
+        if let Some(group) = page.raw().get::<Dict<'_>>(b"Group") {
+            scan.group(&group);
+        }
+        if let Some(content) = page.page_stream() {
+            scan.content(content, res, 0);
+        }
+        for (list, items) in [(&mut found, scan.found), (&mut font_found, scan.font_issues)] {
+            for what in items {
+                match list.iter_mut().find(|(w, _)| *w == what) {
+                    Some((_, pages)) => pages.push(i + 1),
+                    None => list.push((what, vec![i + 1])),
+                }
+            }
+        }
+    }
+    let on_pages = |(what, pages): (String, Vec<usize>)| {
+        let list: Vec<String> = pages.iter().take(10).map(|p| p.to_string()).collect();
+        let more = if pages.len() > 10 { ", …" } else { "" };
+        let s = if pages.len() == 1 { "" } else { "s" };
+        format!("{what} on page{s} {}{more}", list.join(", "))
+    };
+    fonts.extend(font_found.into_iter().map(on_pages));
+    (found.into_iter().map(on_pages).collect(), fonts)
+}
+
+/// A `GTS_PDFX` output intent, as PDF/X-1a judges it.
+struct Intent {
+    /// Its object number, when it is an indirect object.
+    obj: Option<usize>,
+    /// `/OutputCondition`, else `/OutputConditionIdentifier`, for messages.
+    name: String,
+    /// An `/OutputConditionIdentifier` other than `Custom` in the ICC registry.
+    registered: bool,
+    /// Whether it has a `/DestOutputProfile`, and the profile's object number.
+    has_profile: bool,
+    profile_obj: Option<usize>,
+    /// The profile's `/N` and decoded bytes.
+    channels: Option<i32>,
+    profile: Option<Vec<u8>>,
+}
+
+impl Intent {
+    /// The profile's ICC major version (byte 8 of its header).
+    fn major(&self) -> Option<u8> {
+        self.profile.as_deref()?.get(8).copied()
+    }
+
+    /// "ICC v4", or what keeps the version from being read.
+    fn version(&self) -> String {
+        self.major().map_or_else(|| "unreadable".to_string(), |v| format!("ICC v{v}"))
+    }
+}
+
+/// The catalog's `GTS_PDFX` output intents.
+fn pdfx_intents(file: &hayro_syntax::Pdf) -> Vec<Intent> {
+    let xref = file.xref();
+    let Some(catalog) = xref.get::<Dict<'_>>(xref.root_id()) else { return Vec::new() };
+    let Some(intents) = catalog.get::<Array<'_>>(b"OutputIntents") else { return Vec::new() };
+    let number = |n: i32| usize::try_from(n).ok();
+    intents
+        .iter::<Dict<'_>>()
+        .filter(|oi| oi.get::<Name<'_>>(b"S").is_some_and(|s| s.as_ref() == b"GTS_PDFX"))
+        .map(|oi| {
+            let text = |key: &[u8]| {
+                oi.get::<hayro_syntax::object::String<'_>>(key)
+                    .map(|s| String::from_utf8_lossy(s.as_bytes()).trim().to_string())
+                    .filter(|s| !s.is_empty())
+            };
+            let identifier = text(b"OutputConditionIdentifier");
+            let registry = text(b"RegistryName");
+            let profile = oi.get::<Stream<'_>>(b"DestOutputProfile");
+            Intent {
+                obj: oi.obj_id().and_then(|id| number(id.obj_number)),
+                name: text(b"OutputCondition").or_else(|| identifier.clone()).unwrap_or_else(|| "?".into()),
+                registered: registry.is_some_and(|r| r.trim_end_matches('/') == ICC_REGISTRY) && identifier.as_deref().is_some_and(|i| i != "Custom"),
+                has_profile: oi.contains_key(b"DestOutputProfile"),
+                profile_obj: oi.get_ref(b"DestOutputProfile").and_then(|r| number(r.obj_number)),
+                channels: profile.as_ref().and_then(|p| p.dict().get::<i32>(b"N")),
+                profile: profile.and_then(|p| p.decoded().ok()).map(|b| b.into_owned()),
+            }
+        })
+        .collect()
+}
+
+/// What PDF/X-1a finds wrong with the file's output intent: a CMYK profile, ICC v2 (PDF 1.4
+/// allows no later version), or none for a registered printing condition.
+fn intent_issues(file: &hayro_syntax::Pdf) -> Vec<String> {
+    let Some(oi) = pdfx_intents(file).into_iter().next() else { return Vec::new() };
+    let mut issues = Vec::new();
+    if oi.has_profile {
+        if oi.channels != Some(4) {
+            issues.push("the output intent has no CMYK destination profile".into());
+        }
+        if oi.major() != Some(2) {
+            issues.push(format!("the output intent's profile is {}, and PDF/X-1a (PDF 1.4) allows only ICC v2 profiles", oi.version()));
+        }
+    } else if !oi.registered {
+        issues
+            .push(format!("the output intent has no destination profile and doesn't name a printing condition in the ICC registry ({ICC_REGISTRY})"));
+    }
+    issues
+}
+
+/// krilla's PDF 1.4 file with what PDF/X-1a needs and krilla doesn't write, rewritten as one
+/// revision: `GTS_PDFXConformance` in the document information and the XMP, and the output intent
+/// of a registered printing condition without `/DestOutputProfile` (its profile is left out of
+/// the file). An unregistered condition keeps its profile, which must then be ICC v2.
+pub(crate) fn finish(pdf: &[u8]) -> Result<Vec<u8>, String> {
+    let unreadable = || "the flattened file couldn't be read to add the PDF/X-1a identification".to_string();
+    let layout = Layout::read(pdf).ok_or_else(unreadable)?;
+    let file = hayro_syntax::Pdf::new(pdf.to_vec()).map_err(|_| unreadable())?;
+    let mut bodies: HashMap<usize, Vec<u8>> = HashMap::new();
+    let info = int_after(&layout.trailer, "/Info").ok_or_else(unreadable)?;
+    let body = layout.body(pdf, info).ok_or_else(unreadable)?;
+    let (head, close) = body.split_at_checked(rfind(body, b">>").ok_or_else(unreadable)?).ok_or_else(unreadable)?;
+    bodies.insert(info, [head, format!("/GTS_PDFXConformance({CONFORMANCE})").as_bytes(), close].concat());
+    let xref = file.xref();
+    if let Some(meta) = xref.get::<Dict<'_>>(xref.root_id()).and_then(|c| c.get_ref(b"Metadata")).and_then(|r| usize::try_from(r.obj_number).ok())
+        && let Some(xmp) = layout.body(pdf, meta).and_then(xmp_with_conformance)
+    {
+        bodies.insert(meta, xmp);
+    }
+    let mut stripped: Vec<usize> = Vec::new();
+    for oi in pdfx_intents(&file) {
+        if !oi.has_profile {
+            continue;
+        }
+        if !oi.registered {
+            if oi.major() != Some(2) {
+                return Err(format!(
+                    "the output intent's profile `{}` is {}, and PDF/X-1a (PDF 1.4) allows only ICC v2 profiles: choose a CMYK working space with an ICC v2 profile, or Coated FOGRA39",
+                    oi.name,
+                    oi.version()
+                ));
+            }
+            continue;
+        }
+        let (Some(obj), Some(profile)) = (oi.obj, oi.profile_obj) else { return Err(unreadable()) };
+        let body = match bodies.get(&obj) {
+            Some(b) => b.clone(),
+            None => layout.body(pdf, obj).ok_or_else(unreadable)?.to_vec(),
+        };
+        let key = format!("/DestOutputProfile {profile} 0 R");
+        let at = find(&body, key.as_bytes(), 0).ok_or_else(unreadable)?;
+        let (before, rest) = body.split_at_checked(at).ok_or_else(unreadable)?;
+        let after = rest.get(key.len()..).ok_or_else(unreadable)?;
+        bodies.insert(obj, [before, after].concat());
+        stripped.push(profile);
+    }
+    // A profile only the stripped intents named goes too.
+    let dropped: HashSet<usize> = stripped.iter().copied().filter(|p| references(pdf, *p) == stripped.iter().filter(|q| *q == p).count()).collect();
+    layout.write(pdf, &bodies, &dropped).ok_or_else(unreadable)
+}
+
+/// How often `n 0 R` appears in `pdf` (a stream that happens to hold those bytes counts too, which
+/// only ever keeps an object).
+fn references(pdf: &[u8], n: usize) -> usize {
+    let needle = format!("{n} 0 R");
+    let mut count = 0;
+    let mut from = 0;
+    while let Some(at) = find(pdf, needle.as_bytes(), from) {
+        let before = at.checked_sub(1).and_then(|i| pdf.get(i)).is_none_or(|c| !c.is_ascii_digit());
+        let after = pdf.get(at + needle.len()).is_none_or(|c| !c.is_ascii_alphanumeric());
+        if before && after {
+            count += 1;
+        }
+        from = at + needle.len();
+    }
+    count
+}
+
+/// The body of an uncompressed XMP metadata stream object with the Adobe `pdfx` properties of
+/// the identification (`GTS_PDFXVersion`, `GTS_PDFXConformance`) added and its `/Length` updated;
+/// `None` when the stream is filtered or isn't XMP.
+fn xmp_with_conformance(body: &[u8]) -> Option<Vec<u8>> {
+    let s0 = find(body, b"stream", 0)?;
+    let dict = String::from_utf8_lossy(body.get(..s0)?).to_string();
+    let s0 = s0 + b"stream".len();
+    let s0 = s0 + body.get(s0..)?.iter().take_while(|c| **c == b'\r' || **c == b'\n').count();
+    let s1 = rfind(body, b"endstream")?;
+    let xml = String::from_utf8_lossy(body.get(s0..s1)?).trim_end().to_string();
+    if dict.contains("/Filter") || !xml.contains("</rdf:RDF>") {
+        return None;
+    }
+    let ids = format!(
+        "<rdf:Description rdf:about=\"\" xmlns:pdfx=\"http://ns.adobe.com/pdfx/1.3/\"><pdfx:GTS_PDFXVersion>{VERSION}</pdfx:GTS_PDFXVersion>\
+         <pdfx:GTS_PDFXConformance>{CONFORMANCE}</pdfx:GTS_PDFXConformance></rdf:Description>"
+    );
+    let xml = xml.replacen("</rdf:RDF>", &format!("{ids}</rdf:RDF>"), 1);
+    let i = dict.find("/Length")?;
+    let rest = dict.get(i + 7..)?.trim_start();
+    let end = rest.find(|c: char| !c.is_ascii_digit()).unwrap_or(rest.len());
+    let dict = format!("{}/Length {}{}", dict.get(..i)?, xml.len(), rest.get(end..)?);
+    Some(format!("\n{}\nstream\n{xml}\nendstream\n", dict.trim()).into_bytes())
+}
+
+/// Where the objects of a single-revision file with a classic cross-reference table are.
+struct Layout {
+    /// (object number, start, end), by start: from `n 0 obj` up to the next object or the table.
+    objects: Vec<(usize, usize, usize)>,
+    /// Where the cross-reference table starts.
+    table: usize,
+    /// The trailer dictionary.
+    trailer: String,
+    size: usize,
+}
+
+impl Layout {
+    fn read(pdf: &[u8]) -> Option<Layout> {
+        let sx = rfind(pdf, b"startxref")?;
+        let table: usize = std::str::from_utf8(pdf.get(sx + b"startxref".len()..)?).ok()?.split_whitespace().next()?.parse().ok()?;
+        let section = pdf.get(table..sx)?;
+        let t = find(section, b"trailer", 0)?;
+        let trailer = String::from_utf8_lossy(section.get(t + b"trailer".len()..)?).trim().to_string();
+        if trailer.contains("/Prev") || trailer.contains("/XRefStm") {
+            return None;
+        }
+        let size = int_after(&trailer, "/Size")?;
+        let mut tokens = std::str::from_utf8(section.get(..t)?).ok()?.split_whitespace();
+        if tokens.next()? != "xref" {
+            return None;
+        }
+        let mut starts: Vec<(usize, usize)> = Vec::new();
+        let mut seen = HashSet::new();
+        while let Some(first) = tokens.next() {
+            let first: usize = first.parse().ok()?;
+            let count: usize = tokens.next()?.parse().ok()?;
+            for i in 0..count {
+                let (offset, generation, kind) = (tokens.next()?, tokens.next()?, tokens.next()?);
+                if kind != "n" {
+                    continue;
+                }
+                let n = first.checked_add(i)?;
+                let offset: usize = offset.parse().ok()?;
+                if generation != "00000" || offset >= table || n >= size || !seen.insert(n) {
+                    return None;
+                }
+                starts.push((n, offset));
+            }
+        }
+        // Free entries past the objects would only make the rewritten table longer.
+        let max = starts.iter().map(|(n, _)| *n).max().unwrap_or(0);
+        if size > max.saturating_mul(2).saturating_add(16) {
+            return None;
+        }
+        starts.sort_by_key(|(_, offset)| *offset);
+        let mut objects = Vec::with_capacity(starts.len());
+        for (i, &(n, start)) in starts.iter().enumerate() {
+            let end = starts.get(i + 1).map_or(table, |(_, s)| *s);
+            if !pdf.get(start..end)?.starts_with(format!("{n} 0 obj").as_bytes()) {
+                return None;
+            }
+            objects.push((n, start, end));
+        }
+        Some(Layout { objects, table, trailer, size })
+    }
+
+    /// Object `n` between `n 0 obj` and `endobj`.
+    fn body<'p>(&self, pdf: &'p [u8], n: usize) -> Option<&'p [u8]> {
+        let &(_, start, end) = self.objects.iter().find(|(m, _, _)| *m == n)?;
+        let obj = pdf.get(start..end)?;
+        obj.get(format!("{n} 0 obj").len()..rfind(obj, b"endobj")?)
+    }
+
+    /// The file with the objects in `bodies` replaced and those in `dropped` left out, and a new
+    /// cross-reference table.
+    fn write(&self, pdf: &[u8], bodies: &HashMap<usize, Vec<u8>>, dropped: &HashSet<usize>) -> Option<Vec<u8>> {
+        let first = self.objects.first().map_or(self.table, |o| o.1);
+        let mut out = pdf.get(..first)?.to_vec();
+        let mut offsets = HashMap::new();
+        for &(n, start, end) in &self.objects {
+            if dropped.contains(&n) {
+                continue;
+            }
+            offsets.insert(n, out.len());
+            match bodies.get(&n) {
+                Some(body) => {
+                    out.extend_from_slice(format!("{n} 0 obj").as_bytes());
+                    out.extend_from_slice(body);
+                    out.extend_from_slice(b"endobj\n");
+                }
+                None => out.extend_from_slice(pdf.get(start..end)?),
+            }
+        }
+        if !out.ends_with(b"\n") {
+            out.push(b'\n');
+        }
+        let table = out.len();
+        // The free entries, each pointing at the next.
+        let free: Vec<usize> = (1..self.size).filter(|n| !offsets.contains_key(n)).collect();
+        let next: HashMap<usize, usize> = free.iter().copied().zip(free.iter().skip(1).copied().chain([0])).collect();
+        out.extend_from_slice(format!("xref\n0 {}\n{:010} 65535 f\r\n", self.size, free.first().copied().unwrap_or(0)).as_bytes());
+        for n in 1..self.size {
+            let next = next.get(&n).copied().unwrap_or(0);
+            let entry = match offsets.get(&n) {
+                Some(offset) => format!("{offset:010} 00000 n\r\n"),
+                // A dropped object's number could be used again, at the next generation.
+                None if dropped.contains(&n) => format!("{next:010} 00001 f\r\n"),
+                None => format!("{next:010} 65535 f\r\n"),
+            };
+            out.extend_from_slice(entry.as_bytes());
+        }
+        out.extend_from_slice(format!("trailer\n{}\nstartxref\n{table}\n%%EOF\n", self.trailer).as_bytes());
+        Some(out)
+    }
+}
+
+/// Why a color space isn't allowed in PDF/X-1a, or `None` when it is.
+fn disallowed(cs: &Object<'_>, res: &Resources<'_>, depth: usize) -> Option<String> {
+    if depth > 4 {
+        return Some("a color space nested too deeply".into());
+    }
+    match cs {
+        Object::Name(n) => match n.as_ref() {
+            b"DeviceCMYK" | b"CMYK" | b"DeviceGray" | b"G" | b"Pattern" => None,
+            b"DeviceRGB" | b"RGB" => Some("DeviceRGB color".into()),
+            b"Indexed" | b"I" => None,
+            other => match res.get_color_space(&Name::new_unescaped(other)) {
+                Some(named) if !matches!(named, Object::Name(_)) => disallowed(&named, res, depth + 1),
+                Some(Object::Name(m)) if m.as_ref() != other => disallowed(&Object::Name(m), res, depth + 1),
+                _ => Some(format!("the color space /{}", String::from_utf8_lossy(other))),
+            },
+        },
+        Object::Array(a) => {
+            let mut items = a.iter::<Object<'_>>();
+            let family = match items.next() {
+                Some(Object::Name(n)) => n,
+                _ => return Some("an unreadable color space".into()),
+            };
+            match family.as_ref() {
+                b"ICCBased" => Some("ICC-based color".into()),
+                b"CalRGB" | b"CalGray" => Some("CIE-based (CalRGB/CalGray) color".into()),
+                b"Lab" => Some("Lab color".into()),
+                b"DeviceRGB" | b"RGB" => Some("DeviceRGB color".into()),
+                b"DeviceCMYK" | b"CMYK" | b"DeviceGray" | b"G" => None,
+                b"Indexed" | b"I" => items.next().and_then(|base| disallowed(&base, res, depth + 1)),
+                b"Pattern" => items.next().and_then(|base| disallowed(&base, res, depth + 1)),
+                b"Separation" | b"DeviceN" => {
+                    let _names = items.next();
+                    let alt = items.next()?;
+                    if let Some(why) = disallowed(&alt, res, depth + 1) {
+                        return Some(format!("a spot color whose alternate space is {why}"));
+                    }
+                    let _tint = items.next();
+                    // NChannel attributes are PDF 1.6, past the 1.4 that PDF/X-1a:2003 allows.
+                    let attrs = items.next().and_then(|o| match o {
+                        Object::Dict(d) => Some(d),
+                        _ => None,
+                    });
+                    attrs
+                        .filter(|a| a.get::<Name<'_>>(b"Subtype").is_some_and(|n| n.as_ref() == b"NChannel") || a.contains_key(b"Process"))
+                        .map(|_| "a DeviceN space with NChannel attributes (PDF 1.6)".into())
+                }
+                other => Some(format!("the color space /{}", String::from_utf8_lossy(other))),
+            }
+        }
+        _ => Some("an unreadable color space".into()),
+    }
+}
+
+/// What one page has that PDF/X-1a doesn't allow, in the order found.
+#[derive(Default)]
+struct Scan {
+    found: Vec<String>,
+    font_issues: Vec<String>,
+    seen: HashSet<ObjectIdentifier>,
+    fonts: HashSet<ObjectIdentifier>,
+}
+
+impl Scan {
+    fn add(&mut self, what: String) {
+        if !self.found.contains(&what) {
+            self.found.push(what);
+        }
+    }
+
+    fn space(&mut self, cs: &Object<'_>, res: &Resources<'_>) {
+        if let Some(why) = disallowed(cs, res, 0) {
+            self.add(why);
+        }
+    }
+
+    fn content(&mut self, data: &[u8], res: &Resources<'_>, depth: usize) {
+        if depth > MAX_DEPTH {
+            return;
+        }
+        let mut ops = UntypedIter::new(data);
+        while let Some(op) = ops.next() {
+            let operator: &[u8] = op.operator;
+            let last = op.operands().last().cloned();
+            let name = || last.clone().and_then(Object::into_name);
+            match operator {
+                b"rg" | b"RG" => self.add("DeviceRGB color".into()),
+                b"cs" | b"CS" => {
+                    if let Some(n) = name() {
+                        self.space(&Object::Name(n), res);
+                    }
+                }
+                b"sh" => {
+                    if let Some(sh) = name().and_then(|n| res.get_shading(&n)) {
+                        self.shading(sh, res);
+                    }
+                }
+                b"scn" | b"SCN" => {
+                    if let Some(p) = name().and_then(|n| res.get_pattern(&n)) {
+                        self.pattern(p, res, depth);
+                    }
+                }
+                b"gs" => {
+                    if let Some(gs) = name().and_then(|n| res.get_ext_g_state(&n)) {
+                        self.ext_g_state(&gs, res, depth);
+                    }
+                }
+                b"Tf" => {
+                    let font = op.operands().next().cloned().and_then(Object::into_name).and_then(|n| res.get_font(&n));
+                    if let Some(font) = font {
+                        self.font(&font, res, depth);
+                    }
+                }
+                b"Do" => {
+                    if let Some(xo) = name().and_then(|n| res.get_x_object(&n)) {
+                        match xo.dict().get::<Name<'_>>(b"Subtype").as_deref() {
+                            Some(b"Image") => self.image(&xo, res),
+                            Some(b"Form") => self.form(&xo, res, depth),
+                            _ => {}
+                        }
+                    }
+                }
+                b"BI" | b"EI" => {
+                    if let Some(Object::Stream(img)) = last
+                        && let Some(cs) = img.dict().get::<Object<'_>>(b"CS").or_else(|| img.dict().get::<Object<'_>>(b"ColorSpace"))
+                    {
+                        self.space(&cs, res);
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
+    fn ext_g_state(&mut self, gs: &Dict<'_>, res: &Resources<'_>, depth: usize) {
+        match gs.get::<Object<'_>>(b"SMask") {
+            None => {}
+            Some(Object::Name(n)) if n.as_ref() == b"None" => {}
+            Some(mask) => {
+                self.add("a soft mask (transparency)".into());
+                if let Some(form) = match mask {
+                    Object::Dict(d) => d.get::<Stream<'_>>(b"G"),
+                    _ => None,
+                } {
+                    self.form(&form, res, depth);
+                }
+            }
+        }
+        for key in [&b"CA"[..], b"ca"] {
+            if gs.get::<f32>(key).is_some_and(|a| a < 1.0) {
+                self.add("constant opacity below 100% (transparency)".into());
+            }
+        }
+        let normal = |n: &[u8]| matches!(n, b"Normal" | b"Compatible");
+        match gs.get::<Object<'_>>(b"BM") {
+            Some(Object::Name(n)) if !normal(n.as_ref()) => {
+                self.add(format!("the blend mode /{} (transparency)", String::from_utf8_lossy(n.as_ref())))
+            }
+            Some(Object::Array(a)) if a.iter::<Name<'_>>().any(|n| !normal(n.as_ref())) => {
+                self.add("a blend mode other than Normal (transparency)".into())
+            }
+            _ => {}
+        }
+    }
+
+    fn image(&mut self, img: &Stream<'_>, res: &Resources<'_>) {
+        if !self.seen.insert(img.obj_id()) {
+            return;
+        }
+        let d = img.dict();
+        if d.get::<Object<'_>>(b"SMask").is_some() {
+            self.add(format!("an image with a soft mask (object {}, transparency)", img.obj_id().obj_number));
+        }
+        if d.get::<i32>(b"SMaskInData").is_some_and(|v| v != 0) {
+            self.add(format!("an image with transparency in its data (object {})", img.obj_id().obj_number));
+        }
+        if d.get::<bool>(b"ImageMask") == Some(true) {
+            return;
+        }
+        match d.get::<Object<'_>>(b"ColorSpace") {
+            Some(cs) => {
+                if let Some(why) = disallowed(&cs, res, 0) {
+                    let (w, h) = (d.get::<i32>(b"Width").unwrap_or(0), d.get::<i32>(b"Height").unwrap_or(0));
+                    self.add(format!("{why} in an image (object {}, {w} × {h} px)", img.obj_id().obj_number));
+                }
+            }
+            // JPX images may carry their own space; X-1a doesn't allow them.
+            None => self.add(format!("an image without a color space (object {})", img.obj_id().obj_number)),
+        }
+    }
+
+    fn form(&mut self, form: &Stream<'_>, parent: &Resources<'_>, depth: usize) {
+        if depth >= MAX_DEPTH || !self.seen.insert(form.obj_id()) {
+            return;
+        }
+        let res = Resources::from_parent(form.dict().get::<Dict<'_>>(b"Resources").unwrap_or_default(), parent.clone());
+        if let Some(group) = form.dict().get::<Dict<'_>>(b"Group") {
+            self.group(&group);
+        }
+        if let Ok(data) = form.decoded() {
+            self.content(&data, &res, depth + 1);
+        }
+    }
+
+    fn group(&mut self, group: &Dict<'_>) {
+        if group.get::<Name<'_>>(b"S").is_some_and(|s| s.as_ref() == b"Transparency") {
+            self.add("a transparency group".into());
+        }
+    }
+
+    fn shading(&mut self, sh: Object<'_>, res: &Resources<'_>) {
+        let dict = match sh {
+            Object::Dict(d) => d,
+            Object::Stream(s) => s.dict().clone(),
+            _ => return,
+        };
+        if let Some(cs) = dict.get::<Object<'_>>(b"ColorSpace") {
+            self.space(&cs, res);
+        }
+    }
+
+    fn pattern(&mut self, p: Object<'_>, res: &Resources<'_>, depth: usize) {
+        match p {
+            Object::Dict(d) => {
+                if let Some(sh) = d.get::<Object<'_>>(b"Shading") {
+                    self.shading(sh, res);
+                }
+                if let Some(gs) = d.get::<Dict<'_>>(b"ExtGState") {
+                    self.ext_g_state(&gs, res, depth);
+                }
+            }
+            Object::Stream(s) => self.form(&s, res, depth),
+            _ => {}
+        }
+    }
+
+    /// Embedded: a simple font's descriptor, or a Type 0 font's descendant's, has a font file. A
+    /// Type 3 font's glyphs are content streams in the file, scanned like the page's.
+    fn font(&mut self, font: &Dict<'_>, parent: &Resources<'_>, depth: usize) {
+        if let Some(id) = font.obj_id()
+            && !self.fonts.insert(id)
+        {
+            return;
+        }
+        let name = font.get::<Name<'_>>(b"BaseFont").map(|n| String::from_utf8_lossy(n.as_ref()).to_string()).unwrap_or_else(|| "?".into());
+        let subtype = font.get::<Name<'_>>(b"Subtype");
+        let descriptor = match subtype.as_deref() {
+            Some(b"Type3") => return self.type3(font, parent, depth),
+            Some(b"Type0") => {
+                font.get::<Array<'_>>(b"DescendantFonts").and_then(|a| a.iter::<Dict<'_>>().next()).and_then(|d| d.get::<Dict<'_>>(b"FontDescriptor"))
+            }
+            _ => font.get::<Dict<'_>>(b"FontDescriptor"),
+        };
+        let embedded = descriptor.is_some_and(|d| [&b"FontFile"[..], b"FontFile2", b"FontFile3"].iter().any(|k| d.get::<Stream<'_>>(k).is_some()));
+        if !embedded {
+            self.font_issues.push(format!("the font {name} isn't embedded"));
+        }
+    }
+
+    /// A Type 3 font's glyph procedures, with the font's resources over `parent`'s.
+    fn type3(&mut self, font: &Dict<'_>, parent: &Resources<'_>, depth: usize) {
+        if depth >= MAX_DEPTH {
+            return;
+        }
+        let res = Resources::from_parent(font.get::<Dict<'_>>(b"Resources").unwrap_or_default(), parent.clone());
+        let Some(procs) = font.get::<Dict<'_>>(b"CharProcs") else { return };
+        for key in procs.keys() {
+            if let Some(glyph) = procs.get::<Stream<'_>>(key.as_ref())
+                && self.seen.insert(glyph.obj_id())
+                && let Ok(data) = glyph.decoded()
+            {
+                self.content(&data, &res, depth + 1);
+            }
+        }
+    }
+}
diff --git a/crates/pdf/src/print_tests.rs b/crates/pdf/src/print_tests.rs
new file mode 100644
index 000000000..6c5dafcb2
--- /dev/null
+++ b/crates/pdf/src/print_tests.rs
@@ -0,0 +1,289 @@
+//! CMYK print output, read back from the exported PDF: blending spaces, the output intent,
+//! overprint and knockout groups.
+
+use designcraft_color::cms::{self, Cms, ColorSettings};
+use designcraft_compose::Cache;
+use designcraft_doc::build::NewDocument;
+use designcraft_doc::{BlendSpace, Document, Fill, Item, ItemId, SpreadRef};
+use designcraft_geom::Rect;
+use hayro_syntax::Pdf;
+use hayro_syntax::object::{Array, Dict, Name, Object, Stream};
+
+use crate::{PdfOptions, export_pdf};
+
+/// A box filled with `swatch`; `edit` sets its other attributes.
+fn add_box(d: &mut Document, r: Rect, swatch: &str, edit: impl FnOnce(&mut Item)) -> ItemId {
+    let lid = d.default_layer();
+    let id = ItemId(d.alloc());
+    let mut b = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
+    b.fill = Fill::swatch(swatch);
+    edit(&mut b);
+    d.insert_item(SpreadRef::Doc(0), b, None).unwrap();
+    id
+}
+
+/// One page: a cyan box with a 50% black box over it at 50% opacity.
+fn transparent_doc() -> Document {
+    let mut d = Document::new(&NewDocument::default());
+    add_box(&mut d, Rect::new(36.0, 36.0, 236.0, 236.0), "C=100 M=0 Y=0 K=0", |_| {});
+    add_box(&mut d, Rect::new(136.0, 136.0, 336.0, 336.0), "Black", |b| b.opacity = 0.5);
+    d
+}
+
+pub(crate) struct Intent {
+    pub identifier: String,
+    pub condition: String,
+    pub registry: Option<String>,
+    pub profile: Vec<u8>,
+}
+
+fn text(d: &Dict<'_>, key: &[u8]) -> Option<String> {
+    d.get::<hayro_syntax::object::String>(key).map(|s| String::from_utf8_lossy(s.as_bytes()).into_owned())
+}
+
+/// The catalog's `GTS_PDFX` output intent.
+pub(crate) fn output_intent(bytes: &[u8]) -> Option<Intent> {
+    let pdf = Pdf::new(bytes.to_vec()).ok()?;
+    let xref = pdf.xref();
+    let catalog = xref.get::<Dict<'_>>(xref.root_id())?;
+    let intents = catalog.get::<Array<'_>>(b"OutputIntents")?;
+    let oi = intents.iter::<Dict<'_>>().find(|oi| oi.get::<Name<'_>>(b"S").is_some_and(|s| s.as_ref() == b"GTS_PDFX"))?;
+    Some(Intent {
+        identifier: text(&oi, b"OutputConditionIdentifier")?,
+        condition: text(&oi, b"OutputCondition").unwrap_or_default(),
+        registry: text(&oi, b"RegistryName"),
+        profile: oi.get::<Stream<'_>>(b"DestOutputProfile")?.decoded().ok()?.into_owned(),
+    })
+}
+
+/// The `/CS` of each page's transparency group (`None` for a page without one).
+fn page_group_spaces(bytes: &[u8]) -> Vec<Option<String>> {
+    let pdf = Pdf::new(bytes.to_vec()).unwrap();
+    pdf.pages()
+        .iter()
+        .map(|p| {
+            let g = p.raw().get::<Dict<'_>>(b"Group")?;
+            match g.get::<Object<'_>>(b"CS")? {
+                Object::Name(n) => Some(n.as_str().to_string()),
+                Object::Array(a) => a.iter::<Name<'_>>().next().map(|n| n.as_str().to_string()),
+                _ => None,
+            }
+        })
+        .collect()
+}
+
+/// Every form XObject's transparency group dictionary.
+fn form_groups(bytes: &[u8]) -> Vec<(Option<String>, bool, bool)> {
+    let pdf = Pdf::new(bytes.to_vec()).unwrap();
+    pdf.objects()
+        .into_iter()
+        .filter_map(|o| o.into_stream())
+        .filter(|s| s.dict().get::<Name<'_>>(b"Subtype").is_some_and(|n| n.as_ref() == b"Form"))
+        .filter_map(|s| {
+            let g = s.dict().get::<Dict<'_>>(b"Group")?;
+            let cs = g.get::<Name<'_>>(b"CS").map(|n| n.as_str().to_string());
+            Some((cs, g.get::<bool>(b"I").unwrap_or(false), g.get::<bool>(b"K").unwrap_or(false)))
+        })
+        .collect()
+}
+
+/// Print output (a CMYK blend space) blends in DeviceCMYK. A plain export carries no output
+/// intent and no `/Trapped`, as in InDesign; PDF/X-4 carries the CMYK working space as its output
+/// intent with `/Trapped /False`. A screen document (RGB blend space) is written as before.
+#[test]
+fn print_output_blends_in_cmyk_with_an_output_intent_only_in_pdfx() {
+    let mut d = transparent_doc();
+    let bytes = export_pdf(&d, &Cache::new(), &PdfOptions::default()).unwrap();
+    assert_eq!(page_group_spaces(&bytes), [Some("DeviceCMYK".to_string())]);
+    assert!(!form_groups(&bytes).is_empty());
+    assert!(form_groups(&bytes).iter().all(|(cs, ..)| cs.is_none()), "content groups inherit the page group: {:?}", form_groups(&bytes));
+    assert!(!crate::has_rgb_groups(&bytes));
+    assert!(output_intent(&bytes).is_none(), "no output intent outside PDF/X");
+    assert!(!String::from_utf8_lossy(&bytes).contains("/OutputIntents"));
+    assert!(!String::from_utf8_lossy(&bytes).contains("/Trapped"));
+
+    let x4 = export_pdf(&d, &Cache::new(), &PdfOptions { standard: crate::Standard::PdfX4, ..PdfOptions::default() }).unwrap();
+    assert_eq!(page_group_spaces(&x4), [Some("DeviceCMYK".to_string())]);
+    let intent = output_intent(&x4).expect("output intent");
+    assert_eq!(intent.identifier, "FOGRA39");
+    assert_eq!(intent.profile, craft_cms::builtin::COATED_FOGRA39_ICC);
+    assert!(String::from_utf8_lossy(&x4).contains("/Trapped/False"));
+
+    // A booklet of a print document blends in CMYK too, without an output intent.
+    let booklet = crate::export_booklet(&d, &Cache::new(), &crate::BookletOptions::default()).unwrap();
+    assert!(page_group_spaces(&booklet.bytes).contains(&Some("DeviceCMYK".to_string())));
+    assert!(output_intent(&booklet.bytes).is_none());
+
+    d.settings.blend_space = BlendSpace::Rgb;
+    let screen = export_pdf(&d, &Cache::new(), &PdfOptions::default()).unwrap();
+    assert!(output_intent(&screen).is_none());
+    assert_eq!(page_group_spaces(&screen), [None]);
+    assert!(!String::from_utf8_lossy(&screen).contains("/Trapped"));
+}
+
+/// The output intent is the CMYK working space's profile and condition, not FOGRA39.
+#[test]
+fn output_intent_is_the_cmyk_working_space() {
+    use craft_pdf::write::backend as krilla;
+    let generic = Cms::new(&ColorSettings { cmyk: cms::GENERIC_CMYK.into(), ..ColorSettings::default() }).unwrap();
+    let (plain, warning) = crate::pdfx::print_settings_with(&generic, false).unwrap();
+    assert_eq!(warning, None);
+    assert!(plain.output_intent.is_none() && plain.trapped.is_none() && plain.cmyk_profile.is_some());
+    let (settings, warning) = crate::pdfx::print_settings_with(&generic, true).unwrap();
+    assert_eq!(warning, None);
+    let mut pdf = krilla::Document::new_with(settings);
+    let mut page = pdf.start_page_with(krilla::page::PageSettings::new(krilla::geom::Size::from_wh(100.0, 100.0).unwrap()));
+    page.surface().finish();
+    page.finish();
+    let bytes = pdf.finish().unwrap();
+    let intent = output_intent(&bytes).expect("output intent");
+    let want = generic.output_intent().unwrap();
+    assert_eq!((intent.identifier.as_str(), intent.condition.as_str()), ("Custom", cms::GENERIC_CMYK));
+    assert_eq!(intent.registry, None, "an unregistered condition names no registry");
+    assert_eq!(intent.profile, &*want.icc);
+    assert_ne!(intent.profile, craft_cms::builtin::COATED_FOGRA39_ICC);
+}
+
+/// The overprint entries of every ExtGState that has them: (`/op`, `/OP`, `/OPM`).
+fn overprint_states(bytes: &[u8]) -> Vec<(bool, bool, i32)> {
+    let pdf = Pdf::new(bytes.to_vec()).unwrap();
+    pdf.objects()
+        .into_iter()
+        .filter_map(|o| match o {
+            Object::Dict(d) => Some(d),
+            _ => None,
+        })
+        .filter_map(|d| Some((d.get::<bool>(b"op")?, d.get::<bool>(b"OP")?, d.get::<i32>(b"OPM")?)))
+        .collect()
+}
+
+/// A document whose [Black] doesn't overprint by itself, with one box `edit` sets up.
+fn one_box(swatch: &str, edit: impl FnOnce(&mut Item)) -> Document {
+    let mut d = Document::new(&NewDocument::default());
+    d.settings.overprint_black = false;
+    add_box(&mut d, Rect::new(36.0, 36.0, 236.0, 236.0), swatch, edit);
+    d
+}
+
+fn exported(d: &Document) -> Vec<u8> {
+    export_pdf(d, &Cache::new(), &PdfOptions::default()).unwrap()
+}
+
+/// Overprint Fill, Overprint Stroke and Overprint Gap are written as `/op` and `/OP` with
+/// `/OPM 1`; without them nothing overprints.
+#[test]
+fn overprint_attributes_are_written() {
+    const CYAN: &str = "C=100 M=0 Y=0 K=0";
+    let stroked = |b: &mut Item| {
+        b.stroke.swatch = "C=0 M=100 Y=0 K=0".into();
+        b.stroke.weight = 4.0;
+    };
+    assert_eq!(overprint_states(&exported(&one_box(CYAN, stroked))), []);
+    let fill = exported(&one_box(CYAN, |b| b.fill.overprint = true));
+    assert_eq!(overprint_states(&fill), [(true, false, 1)]);
+    let stroke = exported(&one_box(CYAN, |b| {
+        stroked(b);
+        b.stroke.overprint = true;
+    }));
+    assert!(overprint_states(&stroke).iter().all(|(_, s, opm)| *s && *opm == 1), "{:?}", overprint_states(&stroke));
+    assert!(!overprint_states(&stroke).is_empty());
+    let gap = exported(&one_box(CYAN, |b| {
+        stroked(b);
+        b.stroke.kind = designcraft_doc::StrokeType::Dashed { pattern: vec![12.0, 6.0] };
+        b.stroke.gap_swatch = "C=0 M=0 Y=100 K=0".into();
+        b.stroke.gap_overprint = true;
+    }));
+    assert!(overprint_states(&gap).iter().all(|(_, s, opm)| *s && *opm == 1), "{:?}", overprint_states(&gap));
+    assert_eq!(overprint_states(&gap).len(), 1, "only the gap overprints");
+    // PDF/A exports are RGB: overprint is left out, with a warning.
+    let opts = PdfOptions { standard: crate::Standard::PdfA2b, ..PdfOptions::default() };
+    let r = crate::export_pdf_with_report(&one_box(CYAN, |b| b.fill.overprint = true), &Cache::new(), &opts).unwrap();
+    assert_eq!(overprint_states(&r.bytes), []);
+    assert!(r.warnings.iter().any(|w| w == "PDF/A: overprint was left out"), "{:?}", r.warnings);
+}
+
+/// 100% [Black] fills, strokes and text overprint when Appearance of Black says so; tints of
+/// it and other colors don't.
+#[test]
+fn black_overprints_with_the_preference() {
+    let black = designcraft_color::swatch::BLACK;
+    let mut on = one_box(black, |_| {});
+    on.settings.overprint_black = true;
+    assert_eq!(overprint_states(&exported(&on)), [(true, false, 1)]);
+    let mut tint = one_box(black, |b| b.fill.tint = 0.5);
+    tint.settings.overprint_black = true;
+    assert_eq!(overprint_states(&exported(&tint)), []);
+    assert_eq!(overprint_states(&exported(&one_box(black, |_| {}))), [], "off in the preferences");
+    let mut stroke = one_box(designcraft_color::swatch::NONE, |b| {
+        b.stroke.swatch = black.into();
+        b.stroke.weight = 2.0;
+    });
+    stroke.settings.overprint_black = true;
+    assert!(overprint_states(&exported(&stroke)).iter().any(|(_, s, opm)| *s && *opm == 1));
+    // Text in [Black], the default.
+    let mut text = Document::new(&NewDocument::default());
+    let lid = text.default_layer();
+    text.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 100.0), lid, "Black text", Default::default()).unwrap();
+    assert_eq!(overprint_states(&exported(&text)), [(true, false, 1)]);
+    // PDF/A leaves [Black] overprint out without a warning: it is the default for all black text.
+    let opts = PdfOptions { standard: crate::Standard::PdfA2b, ..PdfOptions::default() };
+    let r = crate::export_pdf_with_report(&text, &Cache::new(), &opts).unwrap();
+    assert_eq!(overprint_states(&r.bytes), []);
+    assert!(!r.warnings.iter().any(|w| w.contains("overprint")), "{:?}", r.warnings);
+    text.settings.overprint_black = false;
+    assert_eq!(overprint_states(&exported(&text)), []);
+}
+
+/// Ruby with Overprint Fill on overprints.
+#[test]
+fn ruby_overprint_fill_is_written() {
+    use designcraft_doc::cjk_settings::AdornmentOverprint;
+    let mut d = Document::new(&NewDocument::default());
+    d.settings.overprint_black = false;
+    let lid = d.default_layer();
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 576.0, 300.0), lid, "漢字です", Default::default()).unwrap();
+    assert_eq!(overprint_states(&exported(&d)), []);
+    let sid = *d.stories.keys().next().unwrap();
+    d.story_mut(sid).unwrap().format_chars(0.."漢字".len(), |f| {
+        f.over.ruby = Some("かんじ".into());
+        f.over.ruby_overprint_fill = Some(AdornmentOverprint::On);
+    });
+    let r = crate::export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
+    assert_eq!(overprint_states(&r.bytes), [(true, false, 1)]);
+    assert!(!r.warnings.iter().any(|w| w.contains("overprint")), "{:?}", r.warnings);
+}
+
+/// Knockout Group writes `/K true` and Isolate Blending `/I true`, each on its own.
+#[test]
+fn knockout_and_isolation_are_group_attributes() {
+    let grouped = |knockout: bool, isolate: bool| {
+        let mut d = Document::new(&NewDocument::default());
+        let lid = d.default_layer();
+        let child = |d: &mut Document, r: Rect, swatch: &str| {
+            let mut b = Item::new(ItemId(d.alloc()), lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
+            b.fill = Fill::swatch(swatch);
+            std::sync::Arc::new(b)
+        };
+        let items = vec![
+            child(&mut d, Rect::new(36.0, 36.0, 136.0, 136.0), "C=100 M=0 Y=0 K=0"),
+            child(&mut d, Rect::new(86.0, 86.0, 186.0, 186.0), "C=0 M=100 Y=0 K=0"),
+        ];
+        let mut g = Item::new(
+            ItemId(d.alloc()),
+            lid,
+            designcraft_doc::Shape::Group,
+            designcraft_geom::shapes::rectangle(Rect::new(36.0, 36.0, 186.0, 186.0)),
+        );
+        g.content = designcraft_doc::Content::Group { items };
+        g.knockout = knockout;
+        g.isolate = isolate;
+        d.insert_item(SpreadRef::Doc(0), g, None).unwrap();
+        form_groups(&exported(&d))
+    };
+    let attributes =
+        |groups: Vec<(Option<String>, bool, bool)>| groups.into_iter().map(|(_, i, k)| (i, k)).filter(|ik| *ik != (false, false)).collect::<Vec<_>>();
+    assert_eq!(attributes(grouped(true, false)), [(false, true)]);
+    assert_eq!(attributes(grouped(false, true)), [(true, false)]);
+    assert_eq!(attributes(grouped(true, true)), [(true, true)]);
+    assert_eq!(attributes(grouped(false, false)), []);
+}
diff --git a/crates/pdf/src/registration_tests.rs b/crates/pdf/src/registration_tests.rs
new file mode 100644
index 000000000..4d67aac01
--- /dev/null
+++ b/crates/pdf/src/registration_tests.rs
@@ -0,0 +1,227 @@
+use super::{
+    Affine, Arc, AssetId, BookletOptions, Cache, Content, Document, Item, PdfOptions, Rect, SpreadRef, Standard, export_booklet, export_pdf,
+    merge_pdfs,
+};
+
+fn placed_document(source: Vec<u8>) -> Document {
+    use designcraft_doc::{Asset, Graphic, ItemId, Shape};
+    let mut doc = Document::new(&Default::default());
+    let asset = AssetId(doc.alloc());
+    doc.add_asset(Asset { id: asset, name: "placed.pdf".into(), mime: "application/pdf".into(), data: Arc::new(source), ..Default::default() });
+    let mut item =
+        Item::new(ItemId(doc.alloc()), doc.default_layer(), Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(0.0, 0.0, 100.0, 100.0)));
+    item.content = Content::Graphic(Graphic {
+        asset,
+        size: (100.0, 100.0),
+        xf: Affine::IDENTITY,
+        clip: None,
+        auto_fit: Default::default(),
+        fit_align: 4,
+        crop: [0.0; 4],
+        wrap: Default::default(),
+        fill: Default::default(),
+        layer_options: None,
+    });
+    doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    doc
+}
+
+fn layered_source(catalog: bool) -> Vec<u8> {
+    let properties = if catalog { "/OCProperties<</OCGs[5 0 R]/D<</OFF[5 0 R]>>>>" } else { "" };
+    let content = b"/OC /a BDC 0.125 0.625 0.875 rg 0 0 100 100 re f EMC";
+    let objects = [
+        format!("<</Type/Catalog/Pages 2 0 R{properties}>>"),
+        "<</Type/Pages/Kids[3 0 R]/Count 1>>".into(),
+        "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<</Properties<</a 5 0 R>>>>/Contents 4 0 R>>".into(),
+        format!("<</Length {}>>\nstream\n{}\nendstream", content.len(), String::from_utf8_lossy(content)),
+        "<</Type/OCG/Name(Hidden)>>".into(),
+    ];
+    assemble(&objects)
+}
+
+fn unlayered_source() -> Vec<u8> {
+    let content = "0.125 0.625 0.875 rg 0 0 100 100 re f";
+    assemble(&[
+        "<</Type/Catalog/Pages 2 0 R>>".into(),
+        "<</Type/Pages/Kids[3 0 R]/Count 1>>".into(),
+        "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<<>>/Contents 4 0 R>>".into(),
+        format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
+    ])
+}
+
+pub(super) fn assemble(objects: &[String]) -> Vec<u8> {
+    let mut bytes = b"%PDF-1.5\n".to_vec();
+    let mut offsets = Vec::new();
+    for (index, body) in objects.iter().enumerate() {
+        offsets.push(bytes.len());
+        bytes.extend_from_slice(format!("{} 0 obj\n{body}\nendobj\n", index + 1).as_bytes());
+    }
+    let xref = bytes.len();
+    let size = objects.len() + 1;
+    bytes.extend_from_slice(format!("xref\n0 {size}\n0000000000 65535 f\r\n").as_bytes());
+    for offset in offsets {
+        bytes.extend_from_slice(format!("{offset:010} 00000 n\r\n").as_bytes());
+    }
+    bytes.extend_from_slice(format!("trailer\n<</Size {size}/Root 1 0 R>>\nstartxref\n{xref}\n%%EOF\n").as_bytes());
+    bytes
+}
+
+thread_local! {
+    pub(crate) static REGISTRATIONS: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
+}
+
+fn registrations(action: impl FnOnce()) -> usize {
+    REGISTRATIONS.set(0);
+    action();
+    REGISTRATIONS.get()
+}
+
+fn check_vector_artwork(pdf: &hayro_syntax::Pdf) {
+    use hayro_syntax::object::{Name, Object};
+
+    let mut found = false;
+    for object in pdf.objects() {
+        let Object::Stream(stream) = object else { continue };
+        let subtype = stream.dict().get::<Name<'_>>(b"Subtype");
+        assert_ne!(subtype.as_ref().map(AsRef::as_ref), Some(b"Image".as_slice()), "placed artwork must remain vector");
+        if subtype.as_ref().map(AsRef::as_ref) == Some(b"Form".as_slice()) {
+            let content = stream.decoded().unwrap();
+            let content = String::from_utf8_lossy(&content);
+            found |= content.contains("0.125 0.625 0.875 rg") && content.contains("0 0 100 100 re f");
+        }
+    }
+    assert!(found, "placed rectangle and its distinctive fill colour must survive in a vector Form XObject");
+}
+
+fn check_unlayered_pdf(bytes: &[u8], pages: usize, artwork: bool) {
+    use hayro_syntax::object::Dict;
+
+    let pdf = hayro_syntax::Pdf::new(bytes.to_vec()).unwrap();
+    assert_eq!(pdf.pages().len(), pages);
+    let catalog = pdf.xref().get::<Dict<'_>>(pdf.xref().root_id()).unwrap();
+    assert!(!catalog.contains_key(b"OCProperties"), "unlayered output must not acquire optional content");
+    if artwork {
+        check_vector_artwork(&pdf);
+    }
+}
+
+fn check_unlayered(doc: &Document, artwork: bool) {
+    let cache = Cache::new();
+    let mut bytes = Vec::new();
+    assert_eq!(
+        registrations(|| {
+            bytes = export_pdf(doc, &cache, &PdfOptions::default()).unwrap();
+            check_unlayered_pdf(&bytes, 1, artwork);
+        }),
+        0
+    );
+    assert_eq!(
+        registrations(|| {
+            let report = export_booklet(doc, &cache, &BookletOptions::default()).unwrap();
+            check_unlayered_pdf(&report.bytes, 2, artwork);
+        }),
+        0
+    );
+    assert_eq!(
+        registrations(|| {
+            let merged = merge_pdfs(&[(bytes, vec![(100.0, 100.0)])], None).unwrap();
+            check_unlayered_pdf(&merged, 1, artwork);
+        }),
+        0
+    );
+}
+
+#[test]
+fn no_placed_pdfs_skip_optional_content_registration() {
+    check_unlayered(&Document::new(&Default::default()), false);
+}
+
+#[test]
+fn unlayered_placed_pdf_skips_optional_content_registration() {
+    check_unlayered(&placed_document(unlayered_source()), true);
+}
+
+#[test]
+fn null_optional_content_properties_are_no_optional_content() {
+    let content = "0.125 0.625 0.875 rg 0 0 100 100 re f";
+    for (properties, extra) in [("/OCProperties null", None), ("/OCProperties 5 0 R", Some("null"))] {
+        let mut objects = vec![
+            format!("<</Type/Catalog/Pages 2 0 R{properties}>>"),
+            "<</Type/Pages/Kids[3 0 R]/Count 1>>".into(),
+            "<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/Resources<<>>/Contents 4 0 R>>".into(),
+            format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()),
+        ];
+        objects.extend(extra.map(String::from));
+        let doc = placed_document(assemble(&objects));
+        for standard in [Standard::None, Standard::PdfX4] {
+            let bytes = export_pdf(&doc, &Cache::new(), &PdfOptions { standard, ..Default::default() }).unwrap();
+            check_unlayered_pdf(&bytes, 1, true);
+        }
+    }
+}
+
+#[test]
+fn layered_and_resource_only_inputs_register_optional_content() {
+    for hidden in [true, false] {
+        let source = layered_source(hidden);
+        let doc = placed_document(source.clone());
+        let cache = Cache::new();
+        let mut exported = Vec::new();
+        assert_eq!(
+            registrations(|| {
+                exported = export_pdf(&doc, &cache, &PdfOptions::default()).unwrap();
+            }),
+            1
+        );
+        check_registered(&exported, hidden);
+        assert_eq!(
+            registrations(|| {
+                let report = export_booklet(&doc, &cache, &BookletOptions::default()).unwrap();
+                check_registered(&report.bytes, hidden);
+            }),
+            1
+        );
+        for input in [source, exported] {
+            assert_eq!(
+                registrations(|| {
+                    let merged = merge_pdfs(&[(input, vec![(100.0, 100.0)])], None).unwrap();
+                    check_registered(&merged, hidden);
+                }),
+                1
+            );
+        }
+    }
+}
+
+fn check_registered(bytes: &[u8], hidden: bool) {
+    use hayro_syntax::object::{Array, Dict, Name, Object, ObjectIdentifier};
+
+    let pdf = hayro_syntax::Pdf::new(bytes.to_vec()).unwrap();
+    check_vector_artwork(&pdf);
+    let xref = pdf.xref();
+    let catalog = xref.get::<Dict<'_>>(xref.root_id()).unwrap();
+    let properties = catalog.get::<Dict<'_>>(b"OCProperties").unwrap();
+    let groups = properties.get::<Array<'_>>(b"OCGs").unwrap();
+    assert_eq!(groups.raw_iter().count(), 1);
+    let group_id: ObjectIdentifier = groups.raw_iter().next().unwrap().as_obj_ref().unwrap().into();
+    let group = xref.get::<Dict<'_>>(group_id).unwrap();
+    assert_eq!(group.get::<Name<'_>>(b"Type").unwrap().as_ref(), b"OCG");
+    assert_eq!(group.get::<hayro_syntax::object::String<'_>>(b"Name").unwrap().as_bytes(), b"Hidden");
+
+    let config = properties.get::<Dict<'_>>(b"D").unwrap();
+    if hidden {
+        let off = config.get::<Array<'_>>(b"OFF").unwrap();
+        assert_eq!(off.raw_iter().count(), 1);
+        let off_id: ObjectIdentifier = off.raw_iter().next().unwrap().as_obj_ref().unwrap().into();
+        assert_eq!(off_id, group_id, "OFF must reference the Hidden OCG listed in OCGs");
+    } else if config.contains_key(b"OFF") {
+        assert_eq!(config.get::<Array<'_>>(b"OFF").unwrap().raw_iter().count(), 0);
+    }
+    // Superseded revisions may retain the marker; readers use only the objects resolved by the current xref.
+    for object in pdf.objects() {
+        let Object::Dict(dict) = object else { continue };
+        if dict.get::<Name<'_>>(b"Type").as_ref().map(AsRef::as_ref) == Some(b"OCG") {
+            assert!(!dict.contains_key(b"DesignCraftHiddenOCG"), "internal marker remains in resolved OCG {:?}", dict.obj_id());
+        }
+    }
+}
diff --git a/crates/pdf/src/rtl_tests.rs b/crates/pdf/src/rtl_tests.rs
index 53db2ac25..82974029e 100644
--- a/crates/pdf/src/rtl_tests.rs
+++ b/crates/pdf/src/rtl_tests.rs
@@ -8,7 +8,7 @@ use designcraft_doc::{Align, Document, ParaAttrs, ParaFormat, SpreadRef, TextDir
 use designcraft_geom::Rect;
 
 use crate::tests::extract_text;
-use crate::*;
+use crate::{PdfOptions, export_pdf};
 
 const HEBREW: &str = "DC Test PDF Hebrew";
 const ARABIC: &str = "DC Test PDF Arabic";
diff --git a/crates/pdf/src/tests.rs b/crates/pdf/src/tests.rs
index 39f472ffc..2accc79fa 100644
--- a/crates/pdf/src/tests.rs
+++ b/crates/pdf/src/tests.rs
@@ -188,10 +188,9 @@ fn standards() {
     // Output intent, identification and checks all in place; the update still reads.
     assert!(r.warnings.is_empty(), "{:?}", r.warnings);
     assert!(crate::check_pdfx4(&r.bytes).is_empty());
-    let text = String::from_utf8_lossy(&r.bytes).to_string();
     // The default working CMYK space is the built-in Coated FOGRA39.
-    assert!(text.contains("/OutputIntents[") && text.contains("/OutputConditionIdentifier(FOGRA39)"), "output intent");
-    assert!(text.contains(r"/OutputCondition(Coated FOGRA39 \(fitted, craft-cms\))"), "output condition");
+    let intent = crate::print_tests::output_intent(&r.bytes).expect("output intent");
+    assert_eq!((intent.identifier.as_str(), intent.condition.as_str()), ("FOGRA39", "Coated FOGRA39 (fitted, craft-cms)"));
     // A plain export fails the checks; both read with the same pages.
     let plain = export_pdf(&d, &Cache::new(), &PdfOptions::default()).unwrap();
     assert_eq!(hayro_syntax::Pdf::new(r.bytes.clone()).unwrap().pages().len(), hayro_syntax::Pdf::new(plain.clone()).unwrap().pages().len());
@@ -200,6 +199,25 @@ fn standards() {
     assert_eq!(Standard::parse("pdfa-2b"), Some(Standard::PdfA2b));
 }
 
+#[test]
+fn table_gradient_fill_exports_a_shading() {
+    let mut d = Document::new(&NewDocument::default());
+    let mut gradient = designcraft_color::Gradient::default();
+    gradient.stops[0].color = Color::rgb(1.0, 0.0, 0.0);
+    gradient.stops[1].color = Color::rgb(0.0, 0.0, 1.0);
+    d.swatches.push(Swatch { name: "Table gradient".into(), value: SwatchValue::Gradient { gradient }, locked: false, named: true, hidden: false });
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 336.0, 300.0), d.default_layer(), "", ParaFormat::default()).unwrap();
+    let mut t = designcraft_doc::Table::new(1, 1, 2, 0, 0, 200.0);
+    t.rows[0].height = 40.0;
+    t.rows[0].mode = designcraft_doc::RowHeightMode::Exactly;
+    for cell in &mut t.cells {
+        cell.fill = "Table gradient".into();
+    }
+    d.story_mut(sid).unwrap().insert_table(0, t);
+    let pdf = uncompressed(&d, PdfOptions::default());
+    assert!(pdf.contains("/ShadingType 2") || pdf.contains("/ShadingType2"), "table fill must export a linear gradient");
+}
+
 #[test]
 fn tables_export_cell_text() {
     let mut d = Document::new(&NewDocument::default());
@@ -257,6 +275,7 @@ fn place(d: &mut Document, data: Vec<u8>, px: (u32, u32)) {
     let id = ItemId(d.alloc());
     let mut it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(72.0, 72.0, 272.0, 172.0)));
     it.content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
+        layer_options: None,
         asset,
         size: (px.0 as f64, px.1 as f64),
         xf: designcraft_geom::Affine::translate((72.0, 72.0)) * designcraft_geom::Affine::scale(50.0),
@@ -477,6 +496,7 @@ fn paint_order(bytes: &[u8]) -> Vec<(String, f32)> {
                 GlyphDrawMode::Fill => ("fill text".into(), 0.0),
                 GlyphDrawMode::Stroke(p) => ("stroke text".into(), p.line_width),
                 GlyphDrawMode::Invisible => ("invisible text".into(), 0.0),
+                GlyphDrawMode::Clip => ("clip text".into(), 0.0),
             });
         }
         fn draw_image(&mut self, _: Image<'_, '_>, _: kurbo::Affine) {}
@@ -603,8 +623,15 @@ fn column_rules_are_drawn() {
         o.inset = [0.0; 4];
         o.column_rule = on;
         o.column_rule_weight = 2.0;
+        // The rules run from the top line's ascent to the bottom line's descent, not the 264 pt
+        // of the columns.
+        let sid = *d.stories.keys().next().unwrap();
+        let cs = designcraft_compose::compose_story(&d, sid, &designcraft_compose::ComposeOptions::default());
+        let line = &cs.frames[0].lines[0];
+        let depth = line.ascent + line.descent;
+        assert!(cs.frames[0].lines.len() == 1 && depth < 264.0 - 1.0, "{depth}");
         let (_, paths) = drawn(&export_pdf(&d, &Cache::new(), &PdfOptions::default()).unwrap());
-        paths.into_iter().filter(|r| (r.width() - 2.0).abs() < 0.01 && (r.height() - 264.0).abs() < 0.01).map(|r| r.center().x).collect::<Vec<_>>()
+        paths.into_iter().filter(|r| (r.width() - 2.0).abs() < 0.01 && (r.height() - depth).abs() < 0.01).map(|r| r.center().x).collect::<Vec<_>>()
     };
     // 540 pt wide in three columns with 12 pt gutters: columns of 172 pt from x 36.
     let xs = rules(true);
@@ -613,21 +640,6 @@ fn column_rules_are_drawn() {
     assert!(rules(false).is_empty());
 }
 
-#[test]
-fn ruby_overprint_is_reported_as_not_exported() {
-    use designcraft_doc::cjk_settings::AdornmentOverprint;
-    let mut d = doc_with_text("漢字です");
-    let sid = *d.stories.keys().next().unwrap();
-    let clean = export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
-    assert!(!clean.warnings.iter().any(|w| w.contains("overprint")), "{:?}", clean.warnings);
-    d.story_mut(sid).unwrap().format_chars(0.."漢字".len(), |f| {
-        f.over.ruby = Some("かんじ".into());
-        f.over.ruby_overprint_fill = Some(AdornmentOverprint::On);
-    });
-    let r = export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
-    assert!(r.warnings.iter().any(|w| w.contains("overprint is not exported yet")), "{:?}", r.warnings);
-}
-
 #[test]
 fn small_caps_and_small_cap_figures_extract_as_typed() {
     // Source Sans 3 substitutes letters and figures under `smcp` / `c2sc` (`one` → `one.s`),
@@ -809,6 +821,38 @@ fn empty_and_populated_export_metadata_preserve_key_presence() {
     assert!(s.contains("Synthetic title") && s.contains("Test author"));
 }
 
+/// File › File Info goes into the PDF's document information and XMP; the export options' title
+/// and author replace File Info's, and PDF/X-4 and Print Booklet keep them.
+#[test]
+fn file_info_is_written_into_the_pdf_metadata() {
+    let mut d = doc_with_text("Body");
+    d.title = "flyer-v3".into();
+    d.file_info.document_title = "Spring Catalog".into();
+    d.file_info.author = "Ana Ruiz".into();
+    d.file_info.description = "Shoes for the spring season".into();
+    d.file_info.keywords = vec!["spring".into(), "shoes".into()];
+    let s = uncompressed(&d, PdfOptions::default());
+    for want in ["/Title(Spring Catalog)", "/Author(Ana Ruiz)", "/Subject(Shoes for the spring season)", "/Keywords(spring, shoes)"] {
+        assert!(s.contains(want), "missing {want}");
+    }
+    for want in ["<dc:title>", "<dc:creator>", "<dc:description>", "spring, shoes</pdf:Keywords>"] {
+        assert!(s.contains(want), "XMP missing {want}");
+    }
+    assert!(!s.contains("flyer-v3"), "the document's name is not the title");
+    let s = uncompressed(&d, PdfOptions { title: Some("Proof".into()), author: Some("Studio".into()), ..Default::default() });
+    assert!(s.contains("/Title(Proof)") && s.contains("/Author(Studio)") && !s.contains("Ana Ruiz"), "the options win");
+    let s = uncompressed(&d, PdfOptions { standard: Standard::PdfX4, ..Default::default() });
+    assert!(s.contains("GTS_PDFXVersion"), "PDF/X-4");
+    let booklet = export_booklet(&d, &Cache::new(), &BookletOptions::default()).unwrap();
+    let b = String::from_utf8_lossy(&booklet.bytes);
+    for (name, s) in [("PDF/X-4", s.as_str()), ("Print Booklet", &*b)] {
+        for want in ["/Title(Spring Catalog)", "/Author(Ana Ruiz)", "/Subject(Shoes for the spring season)", "/Keywords(spring, shoes)"] {
+            assert!(s.contains(want), "{name} missing {want}");
+        }
+        assert!(s.contains("<dc:description>") && s.contains("spring, shoes</pdf:Keywords>"), "{name} XMP");
+    }
+}
+
 /// A swatch applied to a placed greyscale image colours it (#1094): the image's darkness is the
 /// coverage of the swatch, so a spot swatch prints on its own plate. A colour image, or a swatch
 /// that no longer exists, exports as the image itself.
@@ -853,3 +897,30 @@ fn a_swatch_colours_a_greyscale_image() {
     let (s, _) = export(&rgb, Some("PANTONE Test"));
     assert!(!s.contains("PANTONE#20Test"), "a colour image keeps its colours");
 }
+
+/// The export asks for each story's composition once per page it is shown on: a parent page's
+/// page number still reads its own page everywhere, and a story threaded across pages shows each
+/// frame's own lines.
+#[test]
+fn each_page_shows_its_own_composition() {
+    use designcraft_doc::story::PAGE_NUMBER;
+    let mut d = Document::new(&NewDocument { pages: 3, facing_pages: false, ..NewDocument::default() });
+    let lid = d.default_layer();
+    d.add_text_frame(SpreadRef::Parent(0), Rect::new(36.0, 700.0, 300.0, 740.0), lid, &format!("Folio{PAGE_NUMBER}"), ParaFormat::default()).unwrap();
+    let (first, _) =
+        d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 300.0, 56.0), lid, "Alpha\nBravo\nCharlie", ParaFormat::default()).unwrap();
+    let mut prev = first;
+    for si in 1..3 {
+        let id = ItemId(d.alloc());
+        let it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(36.0, 36.0, 300.0, 56.0)));
+        d.insert_item(SpreadRef::Doc(si), it, None).unwrap();
+        d.thread(prev, id).unwrap();
+        prev = id;
+    }
+    let cache = Cache::new();
+    let opts = PdfOptions { created: Some(0), ..PdfOptions::default() };
+    let bytes = export_pdf(&d, &cache, &opts).unwrap();
+    // Parent items first, then the page's own.
+    assert_eq!(extract_text(&bytes), ["Folio1Alpha", "Folio2Bravo", "Folio3Charlie"]);
+    assert_eq!(export_pdf(&d, &cache, &opts).unwrap(), bytes, "a warm cache exports the same bytes");
+}
diff --git a/crates/pdf/src/text.rs b/crates/pdf/src/text.rs
index 7687bd2f8..ba44cf713 100644
--- a/crates/pdf/src/text.rs
+++ b/crates/pdf/src/text.rs
@@ -32,10 +32,11 @@ use crate::export::{Exporter, solid_fill, tf, to_path};
 
 impl Exporter<'_> {
     /// A text run's paint: solid, or a gradient spanning the frame's box (`area`, text space),
-    /// for glyphs drawn under `origin` (text space ← run space).
-    fn text_paint(&mut self, swatch: &str, tint: f32, origin: Affine, area: Rect) -> Option<Paint> {
+    /// for glyphs drawn under `origin` (text space ← run space). `overprint`: the run's
+    /// overprint attribute for this paint.
+    fn text_paint(&mut self, swatch: &str, tint: f32, overprint: bool, origin: Affine, area: Rect) -> Option<Paint> {
         if designcraft_color::swatch::resolve_gradient(&self.doc.swatches, swatch).is_some() && origin.determinant().abs() > 1e-12 {
-            let fill = designcraft_doc::Fill { swatch: swatch.into(), tint, ..designcraft_doc::Fill::none() };
+            let fill = designcraft_doc::Fill { swatch: swatch.into(), tint, overprint, ..designcraft_doc::Fill::none() };
             return self.fill_paint_in(&fill, self.text_area.unwrap_or(area), origin.inverse());
         }
         self.swatch_color(swatch, tint).map(Into::into)
@@ -233,6 +234,34 @@ impl Exporter<'_> {
         }
     }
 
+    /// One line's glyphs as tagged runs; a glyph that is turned or slanted gets a transform of its own.
+    fn line_glyphs(&mut self, s: &mut Surface, cs: &ComposedStory, ft: &FrameText, l: &designcraft_compose::Line, story: &str) {
+        let gs = &l.glyphs;
+        let mut i = 0;
+        while i < gs.len() {
+            let g = &gs[i];
+            if !g.visible || g.sx <= 0.0 || g.sy <= 0.0 {
+                i += 1;
+                continue;
+            }
+            // Vertical type: an upright glyph turns back a quarter about its em box centre.
+            // Shatai slants each glyph about its own em box centre first.
+            let turn = if ft.vertical { g.vertical_xf(l.baseline) } else { None };
+            let shatai = cs.styles.get(g.style as usize).and_then(|st| st.shatai_xf(g, l.baseline));
+            if turn.is_some() || shatai.is_some() {
+                let m = turn.unwrap_or(Affine::IDENTITY) * shatai.unwrap_or(Affine::IDENTITY);
+                s.push_transform(&crate::export::tf(m));
+                self.tagged_run(s, cs, &gs[i..i + 1], l.baseline, story);
+                s.pop();
+                i += 1;
+                continue;
+            }
+            let j = run_end(ft, gs, i);
+            self.tagged_run(s, cs, &gs[i..j], l.baseline, story);
+            i = j;
+        }
+    }
+
     pub(crate) fn frame_text(&mut self, s: &mut Surface, cs: &ComposedStory, ft: &FrameText, story: &str) {
         // Paragraph shading and rules under the text.
         self.as_artifact(s, |me, s| {
@@ -260,30 +289,7 @@ impl Exporter<'_> {
             });
         }
         for l in &ft.lines {
-            let gs = &l.glyphs;
-            let mut i = 0;
-            while i < gs.len() {
-                let g = &gs[i];
-                if !g.visible || g.sx <= 0.0 || g.sy <= 0.0 {
-                    i += 1;
-                    continue;
-                }
-                // Vertical type: an upright glyph turns back a quarter about its em box centre.
-                // Shatai slants each glyph about its own em box centre first.
-                let turn = if ft.vertical { g.vertical_xf(l.baseline) } else { None };
-                let shatai = cs.styles.get(g.style as usize).and_then(|st| st.shatai_xf(g, l.baseline));
-                if turn.is_some() || shatai.is_some() {
-                    let m = turn.unwrap_or(Affine::IDENTITY) * shatai.unwrap_or(Affine::IDENTITY);
-                    s.push_transform(&crate::export::tf(m));
-                    self.tagged_run(s, cs, &gs[i..i + 1], l.baseline, story);
-                    s.pop();
-                    i += 1;
-                    continue;
-                }
-                let j = run_end(ft, gs, i);
-                self.tagged_run(s, cs, &gs[i..j], l.baseline, story);
-                i = j;
-            }
+            self.line_glyphs(s, cs, ft, l, story);
         }
         self.as_artifact(s, |me, s| {
             for (rule, r) in text_rules(cs, ft, false) {
@@ -309,7 +315,7 @@ impl Exporter<'_> {
             if let Some(clip) = to_path(&c.clip.to_path(0.1)) {
                 s.push_clip_path(&clip, &krilla::paint::FillRule::NonZero);
                 s.push_transform(&tf(Affine::translate((c.clip.x0, c.clip.y0))));
-                self.graphic(s, g);
+                self.graphic(s, g, None);
                 s.pop();
                 s.pop();
             }
@@ -326,10 +332,16 @@ impl Exporter<'_> {
     fn tables(&mut self, s: &mut Surface, ft: &FrameText) {
         for t in &ft.tables {
             for c in &t.cells {
-                if let Some((sw, tint)) = &c.fill
-                    && let Some(col) = self.swatch_color(sw, *tint)
-                {
-                    self.fill_rect(s, c.rect, col);
+                if let Some((sw, tint)) = &c.fill {
+                    let fill = designcraft_doc::Fill { swatch: sw.clone(), tint: *tint, ..designcraft_doc::Fill::none() };
+                    if let Some(paint) = self.fill_paint(&fill, t.rect)
+                        && let Some(path) = to_path(&c.rect.to_path(0.1))
+                    {
+                        s.set_stroke(None);
+                        s.set_fill(Some(paint_fill(paint)));
+                        s.draw_path(&path);
+                        s.set_fill(None);
+                    }
                 }
             }
             for c in &t.cells {
@@ -479,18 +491,18 @@ impl Exporter<'_> {
         // Outside a frame (no text area), a gradient spans the run.
         let end = glyphs.last().map_or(g0.x, |g| g.x + g.adv);
         let run_area = Rect::new(g0.x, baseline - size, end.max(g0.x + 1.0), baseline + size * 0.25);
-        let fill = self.text_paint(&st.fill, st.fill_tint, origin, run_area);
+        let fill = self.text_paint(&st.fill, st.fill_tint, st.overprint_fill, origin, run_area);
         let stroke = if st.stroke != designcraft_color::swatch::NONE && st.stroke_weight > 0.0 {
-            self.text_paint(&st.stroke, st.stroke_tint, origin, run_area)
+            self.text_paint(&st.stroke, st.stroke_tint, st.overprint_stroke, origin, run_area)
         } else {
             None
         };
         if fill.is_none() && stroke.is_none() {
             return;
         }
-        if st.overprint_fill || st.overprint_stroke {
-            self.warn("overprint is not exported yet");
-        }
+        let fill_op = fill.is_some() && self.overprints(&st.fill, st.fill_tint, st.overprint_fill);
+        let stroke_op = stroke.is_some() && self.overprints(&st.stroke, st.stroke_tint, st.overprint_stroke);
+        let overprint = self.push_overprint(s, fill_op, stroke_op);
         // Stroke behind fill: a double-width stroke first, as outlines so the text is not
         // duplicated, then the fill over its inner half. With no fill, the stroke is clipped
         // to the outside of the glyphs instead.
@@ -521,6 +533,9 @@ impl Exporter<'_> {
         if clipped {
             s.pop();
         }
+        if overprint {
+            s.pop();
+        }
     }
 
     /// A run as real text.
diff --git a/crates/pdf/src/x1a_tests.rs b/crates/pdf/src/x1a_tests.rs
new file mode 100644
index 000000000..777d1e2a6
--- /dev/null
+++ b/crates/pdf/src/x1a_tests.rs
@@ -0,0 +1,320 @@
+//! PDF/X-1a export, read back from the exported PDF: no transparency left, only process and spot
+//! color, overprint and live text kept, the identification; and the checks refusing what X-1a
+//! doesn't allow.
+
+use std::collections::HashMap;
+use std::sync::Arc;
+
+use designcraft_color::{Color, ColorType, Swatch, SwatchValue};
+use designcraft_compose::Cache;
+use designcraft_doc::build::NewDocument;
+use designcraft_doc::{Content, Document, Fill, Item, ItemId, ParaFormat, SpreadRef};
+use designcraft_geom::Rect;
+use hayro_syntax::Pdf;
+use hayro_syntax::object::{Dict, Name, Object};
+
+use crate::tests::extract_text;
+use crate::{PdfOptions, ShadowMask, Standard, check_pdfx1a, export_pdf_with_report};
+
+fn add(d: &mut Document, r: Rect, swatch: &str, edit: impl FnOnce(&mut Item)) -> ItemId {
+    let lid = d.default_layer();
+    let id = ItemId(d.alloc());
+    let mut b = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
+    b.fill = Fill::swatch(swatch);
+    edit(&mut b);
+    d.insert_item(SpreadRef::Doc(0), b, None).unwrap();
+    id
+}
+
+/// A spot Gold background with, over it: a box with a soft drop shadow, a 50% cyan box, a
+/// knockout group of two 50% boxes, a magenta box that overprints, and a text frame.
+fn transparent_doc() -> (Document, PdfOptions) {
+    let mut d = Document::new(&NewDocument::default());
+    let gold = Color::cmyk(0.0, 0.3, 0.9, 0.1);
+    d.swatches.push(Swatch { value: SwatchValue::Color { color: gold, color_type: ColorType::Spot }, ..Swatch::color("Gold", gold) });
+    add(&mut d, Rect::new(0.0, 0.0, 612.0, 792.0), "Gold", |_| {});
+    let shadowed = add(&mut d, Rect::new(72.0, 72.0, 172.0, 172.0), "C=0 M=100 Y=0 K=0", |b| {
+        b.effects.drop_shadow.on = true;
+        b.effects.drop_shadow.opacity = 1.0;
+    });
+    add(&mut d, Rect::new(300.0, 72.0, 400.0, 172.0), "C=100 M=0 Y=0 K=0", |b| b.opacity = 0.5);
+    let lid = d.default_layer();
+    let child = |d: &mut Document, r: Rect, swatch: &str| {
+        let mut b = Item::new(ItemId(d.alloc()), lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
+        b.fill = Fill::swatch(swatch);
+        b.opacity = 0.5;
+        Arc::new(b)
+    };
+    let items = vec![
+        child(&mut d, Rect::new(72.0, 300.0, 172.0, 400.0), "C=100 M=0 Y=0 K=0"),
+        child(&mut d, Rect::new(122.0, 350.0, 222.0, 450.0), "C=0 M=0 Y=100 K=0"),
+    ];
+    let mut g =
+        Item::new(ItemId(d.alloc()), lid, designcraft_doc::Shape::Group, designcraft_geom::shapes::rectangle(Rect::new(72.0, 300.0, 222.0, 450.0)));
+    g.content = Content::Group { items };
+    g.knockout = true;
+    d.insert_item(SpreadRef::Doc(0), g, None).unwrap();
+    add(&mut d, Rect::new(300.0, 300.0, 400.0, 400.0), "C=0 M=100 Y=0 K=0", |b| b.fill.overprint = true);
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(72.0, 500.0, 400.0, 600.0), lid, "Live text", ParaFormat::default()).unwrap();
+    // The shadow's coverage: a ramp from 0 to full strength, offset from the box.
+    let (w, h) = (64u32, 64u32);
+    let coverage: Vec<u8> = (0..h).flat_map(|_| (0..w).map(move |x| (x * 255 / (w - 1)) as u8)).collect();
+    let mask = ShadowMask { rect: Rect::new(77.0, 77.0, 182.0, 182.0), width: w, height: h, coverage: Arc::new(coverage) };
+    let opts =
+        PdfOptions { standard: Standard::PdfX1a, flatten_dpi: 72.0, shadows: Arc::new(HashMap::from([(shadowed, mask)])), ..PdfOptions::default() };
+    (d, opts)
+}
+
+/// Every color space family named in the file's resources, images and shadings.
+fn families(bytes: &[u8]) -> Vec<String> {
+    let pdf = Pdf::new(bytes.to_vec()).unwrap();
+    let mut out = Vec::new();
+    let mut add = |o: Option<Object<'_>>| {
+        let name = match o {
+            Some(Object::Name(n)) => Some(n.as_str().to_string()),
+            Some(Object::Array(a)) => a.iter::<Name<'_>>().next().map(|n| n.as_str().to_string()),
+            _ => None,
+        };
+        if let Some(n) = name
+            && !out.contains(&n)
+        {
+            out.push(n);
+        }
+    };
+    for o in pdf.objects() {
+        let dict: Option<Dict<'_>> = match o {
+            Object::Dict(d) => Some(d),
+            Object::Stream(s) => Some(s.dict().clone()),
+            _ => None,
+        };
+        let Some(dict) = dict else { continue };
+        add(dict.get::<Object<'_>>(b"ColorSpace").filter(|o| !matches!(o, Object::Dict(_))));
+        if let Some(spaces) = dict.get::<Dict<'_>>(b"ColorSpace") {
+            for key in spaces.keys() {
+                add(spaces.get::<Object<'_>>(key.as_ref()));
+            }
+        }
+    }
+    out
+}
+
+/// A drop shadow over a spot, a 50% object and a knockout group come out with no transparency,
+/// only process and spot color, the output intent and the PDF/X-1a identification; overprint
+/// and live text survive.
+#[test]
+fn x1a_export_flattens_transparency_into_inks() {
+    let (d, opts) = transparent_doc();
+    let r = export_pdf_with_report(&d, &Cache::new(), &opts).unwrap();
+    let bytes = &r.bytes;
+    let text = String::from_utf8_lossy(bytes);
+    assert!(bytes.starts_with(b"%PDF-1.4"), "{:?}", text.get(..8));
+    assert_eq!(check_pdfx1a(bytes), Vec::<String>::new());
+    assert!(text.contains("/GTS_PDFXVersion(PDF/X-1:2003)") && text.contains("/GTS_PDFXConformance(PDF/X-1a:2003)"), "the identification");
+    assert!(text.contains("<pdfx:GTS_PDFXConformance>PDF/X-1a:2003</pdfx:GTS_PDFXConformance>"), "the identification in XMP");
+    // The default Coated FOGRA39 is a registered condition: no (ICC v4) profile in the file.
+    let pdf = Pdf::new(bytes.to_vec()).unwrap();
+    let oi = pdfx_intent(&pdf);
+    assert_eq!(oi.get::<hayro_syntax::object::String<'_>>(b"OutputConditionIdentifier").unwrap().as_bytes(), b"FOGRA39");
+    assert_eq!(oi.get::<hayro_syntax::object::String<'_>>(b"RegistryName").unwrap().as_bytes(), b"http://www.color.org");
+    assert!(!oi.contains_key(b"DestOutputProfile"), "no destination profile");
+    let profiles = pdf.objects().into_iter().filter(|o| matches!(o, Object::Stream(s) if s.dict().get::<i32>(b"N") == Some(4))).count();
+    assert_eq!(profiles, 0, "the profile is left out of the file");
+    assert!(!text.contains("/NChannel"), "no PDF 1.6 NChannel attributes at PDF 1.4");
+    assert!(text.contains("/Trapped/False"), "Trapped");
+    for f in families(bytes) {
+        assert!(["DeviceCMYK", "DeviceGray", "Separation", "DeviceN", "Indexed", "Pattern"].contains(&f.as_str()), "color space {f}");
+    }
+    assert!(text.contains("/Gold"), "the spot ink stays a spot");
+    for gone in ["/SMask<<", "/SMask <<", "/S/Transparency", "/ca 0.5", "/CA 0.5", "/BM/Multiply"] {
+        assert!(!text.contains(gone), "{gone}");
+    }
+    let states: Vec<(bool, bool, i32)> = pdf
+        .objects()
+        .into_iter()
+        .filter_map(|o| match o {
+            Object::Dict(d) => Some((d.get::<bool>(b"op")?, d.get::<bool>(b"OP")?, d.get::<i32>(b"OPM")?)),
+            _ => None,
+        })
+        .collect();
+    assert!(states.iter().any(|(op, _, opm)| *op && *opm == 1), "overprint survives: {states:?}");
+    assert!(extract_text(bytes).concat().contains("Live text"), "{:?}", extract_text(bytes));
+}
+
+/// The catalog's `GTS_PDFX` output intent.
+fn pdfx_intent<'a>(pdf: &'a Pdf) -> Dict<'a> {
+    let xref = pdf.xref();
+    let catalog = xref.get::<Dict<'_>>(xref.root_id()).unwrap();
+    let intents = catalog.get::<hayro_syntax::object::Array<'_>>(b"OutputIntents").unwrap();
+    intents.iter::<Dict<'_>>().find(|oi| oi.get::<Name<'_>>(b"S").is_some_and(|s| s.as_ref() == b"GTS_PDFX")).unwrap()
+}
+
+/// An ICC profile header of major version `major`, all a check reads of it.
+fn icc_header(major: u8) -> Vec<u8> {
+    [&[0u8; 8][..], &[major, 0x20, 0, 0], b"prtrCMYK"].concat()
+}
+
+/// A minimal PDF 1.4 with a CMYK output intent (an unregistered condition with an ICC v2
+/// profile), the X-1a identification and `content` on its page; `entries` go into the page
+/// dictionary.
+fn tiny_x1a(entries: &str, content: &str) -> Vec<u8> {
+    tiny_x1a_with(entries, content, "/OutputConditionIdentifier(Custom)/DestOutputProfile 4 0 R", &icc_header(2))
+}
+
+/// [`tiny_x1a`] whose output intent (object 7) has `intent` and whose object 4 holds `profile`.
+fn tiny_x1a_with(entries: &str, content: &str, intent: &str, profile: &[u8]) -> Vec<u8> {
+    assemble(&tiny_objects(entries, content, intent, profile))
+}
+
+/// [`tiny_x1a_with`]'s objects, from 1.
+fn tiny_objects(entries: &str, content: &str, intent: &str, profile: &[u8]) -> Vec<Vec<u8>> {
+    vec![
+        b"<</Type/Catalog/Pages 2 0 R/OutputIntents[7 0 R]>>".to_vec(),
+        b"<</Type/Pages/Kids[3 0 R]/Count 1>>".to_vec(),
+        format!("<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/TrimBox[0 0 100 100]{entries}/Contents 5 0 R>>").into_bytes(),
+        [format!("<</N 4/Length {}>>\nstream\n", profile.len()).as_bytes(), profile, b"\nendstream"].concat(),
+        format!("<</Length {}>>\nstream\n{content}\nendstream", content.len()).into_bytes(),
+        b"<</GTS_PDFXVersion(PDF/X-1:2003)/GTS_PDFXConformance(PDF/X-1a:2003)/Trapped/False>>".to_vec(),
+        format!("<</Type/OutputIntent/S/GTS_PDFX{intent}>>").into_bytes(),
+    ]
+}
+
+/// A PDF 1.4 file of `objects` (from 1), object 1 the catalog and 6 the information dictionary.
+fn assemble(objects: &[Vec<u8>]) -> Vec<u8> {
+    let mut out = b"%PDF-1.4\n".to_vec();
+    let mut offsets = Vec::new();
+    for (i, o) in objects.iter().enumerate() {
+        offsets.push(out.len());
+        out.extend_from_slice(format!("{} 0 obj\n", i + 1).as_bytes());
+        out.extend_from_slice(o);
+        out.extend_from_slice(b"\nendobj\n");
+    }
+    let xref = out.len();
+    out.extend_from_slice(format!("xref\n0 {}\n0000000000 65535 f\r\n", objects.len() + 1).as_bytes());
+    for off in offsets {
+        out.extend_from_slice(format!("{off:010} 00000 n\r\n").as_bytes());
+    }
+    out.extend_from_slice(format!("trailer\n<</Size {}/Root 1 0 R/Info 6 0 R>>\nstartxref\n{xref}\n%%EOF\n", objects.len() + 1).as_bytes());
+    out
+}
+
+/// The X-1a checks refuse soft masks, constant opacity, blend modes, transparency groups, RGB
+/// and ICC-based color; process and spot color pass.
+#[test]
+fn x1a_checks_refuse_transparency_and_rgb() {
+    let clean = check_pdfx1a(&tiny_x1a(
+        "/Resources<</ColorSpace<</Gold[/Separation/Gold/DeviceCMYK 9 0 R]>>>>",
+        "0 0 0 1 k 0 0 10 10 re f 0.5 G /Gold cs 1 scn 0 0 5 5 re f",
+    ));
+    assert_eq!(clean, Vec::<String>::new());
+    let has = |entries: &str, content: &str, what: &str| {
+        let issues = check_pdfx1a(&tiny_x1a(entries, content));
+        assert!(issues.iter().any(|i| i.contains(what)), "{what}: {issues:?}");
+    };
+    has("/Resources<<>>", "1 0 0 rg 0 0 10 10 re f", "DeviceRGB");
+    has("/Resources<</ColorSpace<</CS0[/ICCBased 4 0 R]>>>>", "/CS0 cs 0 0 0 1 scn 0 0 10 10 re f", "ICC-based");
+    has("/Resources<</ExtGState<</G0<</SMask<</S/Luminosity/G 5 0 R>>>>>>>>", "/G0 gs 0 0 0 1 k 0 0 10 10 re f", "soft mask");
+    has("/Resources<</ExtGState<</G0<</ca 0.5>>>>>>", "/G0 gs 0 0 0 1 k 0 0 10 10 re f", "opacity");
+    has("/Resources<</ExtGState<</G0<</BM/Multiply>>>>>>", "/G0 gs 0 0 0 1 k 0 0 10 10 re f", "/Multiply");
+    has("/Resources<<>>/Group<</S/Transparency/CS/DeviceCMYK>>", "0 0 0 1 k", "transparency group");
+    has("/Resources<</ColorSpace<</S[/Separation/Gold/DeviceRGB 9 0 R]>>>>", "/S cs 1 scn 0 0 10 10 re f", "alternate space");
+    has("/Resources<<>>", "q BI /W 1 /H 1 /CS /RGB /BPC 8 /F /AHx ID ff0000> EI Q", "DeviceRGB");
+    has(
+        "/Resources<</ColorSpace<</N[/DeviceN[/Cyan/Gold]/DeviceCMYK 9 0 R<</Subtype/NChannel/Colorants<<>>>>]>>>>",
+        "/N cs 1 1 scn 0 0 10 10 re f",
+        "NChannel",
+    );
+    // The output intent: an ICC v2 profile, or none for a registered condition.
+    let intent = |intent: &str, profile: &[u8]| check_pdfx1a(&tiny_x1a_with("/Resources<<>>", "0 0 0 1 k", intent, profile));
+    let v4 = intent("/OutputConditionIdentifier(Custom)/DestOutputProfile 4 0 R", &icc_header(4));
+    assert!(v4.iter().any(|i| i.contains("ICC v4")), "{v4:?}");
+    let registered = "/OutputConditionIdentifier(FOGRA39)/RegistryName(http://www.color.org)";
+    assert!(!intent(&format!("{registered}/DestOutputProfile 4 0 R"), &icc_header(4)).is_empty(), "v4 even when registered");
+    assert_eq!(intent(registered, b""), Vec::<String>::new());
+    let unnamed = intent("/OutputConditionIdentifier(Custom)", b"");
+    assert!(unnamed.iter().any(|i| i.contains("no destination profile")), "{unnamed:?}");
+    // The identification names the conformance level.
+    let base_only = String::from_utf8_lossy(&tiny_x1a("/Resources<<>>", "0 0 0 1 k")).replace("/GTS_PDFXConformance(PDF/X-1a:2003)", "");
+    let issues = check_pdfx1a(base_only.as_bytes());
+    assert!(issues.iter().any(|i| i.contains("PDF/X-1a:2003")), "{issues:?}");
+    // A Type 3 font is embedded by nature; its glyphs are checked like the page.
+    let type3 = |glyph: &str| {
+        let font = "/Resources<</Font<</F0<</Type/Font/Subtype/Type3/FontBBox[0 0 1 1]/FontMatrix[1 0 0 1 0 0]/CharProcs<</a 8 0 R>>\
+                    /Encoding<</Type/Encoding/Differences[97/a]>>/FirstChar 97/LastChar 97/Widths[1]>>>>>>";
+        let mut objects = tiny_objects(font, "BT /F0 10 Tf (a) Tj ET", "/OutputConditionIdentifier(Custom)/DestOutputProfile 4 0 R", &icc_header(2));
+        objects.push(format!("<</Length {}>>\nstream\n{glyph}\nendstream", glyph.len()).into_bytes());
+        check_pdfx1a(&assemble(&objects))
+    };
+    assert_eq!(type3("1 0 d0 0 0 0 1 k 0 0 1 1 re f"), Vec::<String>::new());
+    let rgb = type3("1 0 d0 1 0 0 rg 0 0 1 1 re f");
+    assert!(rgb.iter().any(|i| i.contains("DeviceRGB")), "{rgb:?}");
+    // A PDF/X-4 file isn't X-1a.
+    let x4 = export_pdf_with_report(
+        &Document::new(&NewDocument::default()),
+        &Cache::new(),
+        &PdfOptions { standard: Standard::PdfX4, ..Default::default() },
+    )
+    .unwrap();
+    let issues = check_pdfx1a(&x4.bytes);
+    assert!(issues.iter().any(|i| i.contains("1.4")) && issues.iter().any(|i| i.contains("PDF/X-1:2003")), "{issues:?}");
+}
+
+#[test]
+fn x1a_parses() {
+    for s in ["x1a", "PDF/X-1a", "PDF/X-1a:2003", "pdfx1a"] {
+        assert_eq!(Standard::parse(s), Some(Standard::PdfX1a), "{s}");
+    }
+}
+
+/// The identification and output intent krilla doesn't write: the conformance level goes into
+/// the document information; a registered condition's intent loses its profile, which leaves the
+/// file; an unregistered condition keeps an ICC v2 profile and refuses a v4 one.
+#[test]
+fn x1a_finish_names_the_conformance_and_fixes_the_intent() {
+    let base = |intent: &str, major: u8| {
+        let mut objects = tiny_objects("/Resources<<>>", "0 0 0 1 k", intent, &icc_header(major));
+        objects[5] = b"<</GTS_PDFXVersion(PDF/X-1:2003)/Trapped/False>>".to_vec();
+        assemble(&objects)
+    };
+    let registered = "/OutputConditionIdentifier(FOGRA39)/RegistryName(http://www.color.org)/DestOutputProfile 4 0 R";
+    let before = base(registered, 4);
+    assert!(!check_pdfx1a(&before).is_empty());
+    let out = crate::pdfx1a::finish(&before).unwrap();
+    assert_eq!(check_pdfx1a(&out), Vec::<String>::new());
+    let pdf = Pdf::new(out.clone()).unwrap();
+    assert!(!pdfx_intent(&pdf).contains_key(b"DestOutputProfile"));
+    assert!(!String::from_utf8_lossy(&out).contains("/N 4"), "the profile is left out");
+    assert_eq!(pdf.pages().len(), 1);
+
+    let custom = "/OutputConditionIdentifier(Custom)/OutputCondition(Press)/DestOutputProfile 4 0 R";
+    let kept = crate::pdfx1a::finish(&base(custom, 2)).unwrap();
+    assert_eq!(check_pdfx1a(&kept), Vec::<String>::new());
+    assert!(pdfx_intent(&Pdf::new(kept).unwrap()).contains_key(b"DestOutputProfile"));
+    let refused = crate::pdfx1a::finish(&base(custom, 4)).unwrap_err();
+    assert!(refused.contains("`Press`") && refused.contains("ICC v4"), "{refused}");
+}
+
+/// An image the flattener can't read fails the export, naming the page and its graphics.
+#[test]
+fn x1a_refuses_to_leave_images_out() {
+    let objects = vec![
+        b"<</Type/Catalog/Pages 2 0 R>>".to_vec(),
+        b"<</Type/Pages/Kids[3 0 R]/Count 1>>".to_vec(),
+        b"<</Type/Page/Parent 2 0 R/MediaBox[0 0 100 100]/TrimBox[0 0 100 100]/Resources<</XObject<</Im0 4 0 R>>>>/Contents 5 0 R>>".to_vec(),
+        b"<</Type/XObject/Subtype/Image/Width 2/Height 2/ColorSpace/DeviceCMYK/BitsPerComponent 8/Filter/DCTDecode/Length 8>>\nstream\nnot jpeg\nendstream".to_vec(),
+        b"<</Length 30>>\nstream\nq 50 0 0 50 10 10 cm /Im0 Do Q\nendstream".to_vec(),
+        b"<</Producer(test)>>".to_vec(),
+    ];
+    let pages = [crate::pdfx1a::PageGraphics { label: "iv".into(), graphics: vec!["logo.pdf".into()] }];
+    let err = crate::pdfx1a::flatten_x1a(&assemble(&objects), 72.0, &pages, &mut Vec::new()).unwrap_err().to_string();
+    assert!(err.contains("1 image on page iv") && err.contains("`logo.pdf`"), "{err}");
+}
+
+/// Spot inks past the flattener's ink set lose their tints: the warning says they won't print.
+#[test]
+fn x1a_dropped_inks_warning_says_they_wont_print() {
+    let mut totals = craft_prepress::flatten::FlattenTotals::default();
+    totals.dropped_inks = 3;
+    let warnings = crate::pdfx1a::flatten_warnings(&totals, 300.0);
+    assert!(warnings.iter().any(|w| w.contains("3 tint(s)") && w.contains("dropped and won't print")), "{warnings:?}");
+    assert!(warnings.iter().all(|w| !w.contains("converted to process")), "{warnings:?}");
+}
diff --git a/crates/pdf/tests/it/gradient_color_spaces.rs b/crates/pdf/tests/it/gradient_color_spaces.rs
index d906413e1..15a2c5233 100644
--- a/crates/pdf/tests/it/gradient_color_spaces.rs
+++ b/crates/pdf/tests/it/gradient_color_spaces.rs
@@ -14,7 +14,7 @@ fn document(colors: &[Color], kind: GradientKind, midpoint: f32, opacity: f32) -
     let stops = colors
         .iter()
         .enumerate()
-        .map(|(i, &color)| GradientStop { offset: i as f32 / (colors.len() - 1) as f32, color, opacity, midpoint })
+        .map(|(i, &color)| GradientStop { offset: i as f32 / (colors.len() - 1) as f32, color, opacity, midpoint, swatch: None })
         .collect();
     doc.swatches.push(Swatch {
         name: "Mixed inks".into(),
diff --git a/crates/pdf/tests/it/main.rs b/crates/pdf/tests/it/main.rs
index e2e092e2f..053f62183 100644
--- a/crates/pdf/tests/it/main.rs
+++ b/crates/pdf/tests/it/main.rs
@@ -4,3 +4,4 @@ mod image_fixtures;
 mod gradient_color_spaces;
 mod image_content_cache;
 mod page_entry_search_contract;
+mod spot_gradients;
diff --git a/crates/pdf/tests/it/spot_gradients.rs b/crates/pdf/tests/it/spot_gradients.rs
new file mode 100644
index 000000000..eac962bc9
--- /dev/null
+++ b/crates/pdf/tests/it/spot_gradients.rs
@@ -0,0 +1,217 @@
+//! Gradients on spot swatches shade in their inks: Separation for one spot, DeviceN for a spot
+//! with process inks or a second spot.
+use designcraft_color::{Color, ColorType, Gradient, GradientKind, GradientStop, Swatch, SwatchValue};
+use designcraft_compose::Cache;
+use designcraft_doc::{Document, Fill, Item, ItemId, Shape, SpreadRef, build::NewDocument};
+use designcraft_geom::{Rect, shapes};
+use designcraft_pdf::{PdfOptions, Standard, export_pdf_with_report};
+use hayro_syntax::{
+    Pdf,
+    object::{Array, Dict, Name},
+};
+
+const CYAN: &str = "C=100 M=0 Y=0 K=0";
+
+fn spot(d: &mut Document, name: &str, color: Color) {
+    d.swatches.push(Swatch { value: SwatchValue::Color { color, color_type: ColorType::Spot }, ..Swatch::color(name, color) });
+}
+
+/// A document with spot inks Gold and Silver, a 40 % tint of Gold, and one box filled with a gradient on `stops`
+/// (swatch name or plain color, location).
+fn document(stops: &[(Result<&str, Color>, f32)], midpoint: f32) -> Document {
+    document_with(stops, midpoint, false)
+}
+
+/// [`document`], the box's fill overprinting when `overprint`.
+fn document_with(stops: &[(Result<&str, Color>, f32)], midpoint: f32, overprint: bool) -> Document {
+    let mut d = Document::new(&NewDocument { width: 120.0, height: 120.0, facing_pages: false, ..Default::default() });
+    spot(&mut d, "Gold", Color::cmyk(0.0, 0.3, 0.9, 0.1));
+    spot(&mut d, "Silver", Color::cmyk(0.2, 0.15, 0.1, 0.3));
+    d.swatches.push(Swatch { value: SwatchValue::Tint { base: "Gold".into(), tint: 0.4 }, ..Swatch::color("Gold 40%", Color::BLACK) });
+    let stops = stops
+        .iter()
+        .map(|(s, offset)| match s {
+            Ok(name) => GradientStop { swatch: Some(name.to_string()), midpoint, ..GradientStop::new(*offset, d.resolve_color(name, 1.0).unwrap()) },
+            Err(c) => GradientStop { midpoint, ..GradientStop::new(*offset, *c) },
+        })
+        .collect();
+    d.swatches.push(Swatch {
+        value: SwatchValue::Gradient { gradient: Gradient { kind: GradientKind::Linear, stops } },
+        ..Swatch::color("Fade", Color::BLACK)
+    });
+    let mut item = Item::new(ItemId(d.alloc()), d.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(10.0, 10.0, 110.0, 110.0)));
+    item.fill = Fill { overprint, ..Fill::swatch("Fade") };
+    d.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    d
+}
+
+fn endpoint(function: &Dict<'_>, first: bool) -> Vec<f32> {
+    if let Some(functions) = function.get::<Array<'_>>(b"Functions") {
+        let functions: Vec<_> = functions.iter::<Dict<'_>>().collect();
+        return endpoint(if first { functions.first().unwrap() } else { functions.last().unwrap() }, first);
+    }
+    function.get::<Array<'_>>(if first { b"C0" } else { b"C1" }).unwrap().iter::<f32>().collect()
+}
+
+/// Each shading on the page: its color space family, colorant names, and the colors at its
+/// two ends.
+struct Shading {
+    family: String,
+    colorants: Vec<String>,
+    start: Vec<f32>,
+    end: Vec<f32>,
+}
+
+fn export(d: &Document, standard: Standard) -> (Vec<Shading>, Vec<String>) {
+    let report = export_pdf_with_report(d, &Cache::new(), &PdfOptions { standard, compress: false, ..Default::default() }).unwrap();
+    let pdf = Pdf::new(report.bytes).unwrap();
+    let patterns = &pdf.pages()[0].resources().patterns;
+    let mut out = Vec::new();
+    for (name, _) in patterns.entries() {
+        let pattern = patterns.get::<Dict<'_>>(name.as_ref()).unwrap();
+        let shading = pattern.get::<Dict<'_>>(b"Shading").unwrap();
+        let text = |n: Name<'_>| String::from_utf8_lossy(n.as_ref()).into_owned();
+        let (family, colorants) = match shading.get::<Name<'_>>(b"ColorSpace") {
+            Some(n) => (text(n), Vec::new()),
+            None => {
+                let space = shading.get::<Array<'_>>(b"ColorSpace").unwrap();
+                let mut it = space.flex_iter();
+                let family = text(it.next::<Name<'_>>().unwrap());
+                let colorants = match family.as_str() {
+                    "Separation" => vec![text(it.next::<Name<'_>>().unwrap())],
+                    "DeviceN" => it.next::<Array<'_>>().unwrap().iter::<Name<'_>>().map(text).collect(),
+                    _ => Vec::new(),
+                };
+                (family, colorants)
+            }
+        };
+        let function = shading.get::<Dict<'_>>(b"Function").unwrap();
+        out.push(Shading { family, colorants, start: endpoint(&function, true), end: endpoint(&function, false) });
+    }
+    assert!(!out.is_empty(), "the gradient is a shading");
+    (out, report.warnings)
+}
+
+fn close(a: &[f32], b: &[f32]) -> bool {
+    a.len() == b.len() && a.iter().zip(b).all(|(a, b)| (a - b).abs() < 0.01)
+}
+
+fn no_conversion(warnings: &[String]) {
+    assert!(!warnings.iter().any(|w| w.contains("Fade")), "{warnings:?}");
+}
+
+#[test]
+fn a_spot_to_paper_gradient_is_a_separation_shading() {
+    for standard in [Standard::None, Standard::PdfX4] {
+        let (shadings, warnings) = export(&document(&[(Ok("Gold"), 0.0), (Ok("[Paper]"), 1.0)], 0.5), standard);
+        no_conversion(&warnings);
+        let s = &shadings[0];
+        assert_eq!((s.family.as_str(), s.colorants.as_slice()), ("Separation", &["Gold".to_string()][..]), "{standard:?}");
+        assert!(close(&s.start, &[1.0]) && close(&s.end, &[0.0]), "{:?} → {:?}", s.start, s.end);
+    }
+    // A tint of the spot shades in the same Separation.
+    let (shadings, _) = export(&document(&[(Ok("Gold"), 0.0), (Ok("Gold 40%"), 1.0)], 0.5), Standard::PdfX4);
+    assert_eq!(shadings[0].family, "Separation");
+    assert!(close(&shadings[0].end, &[0.4]), "{:?}", shadings[0].end);
+    // Converted to process in the Ink Manager: CMYK.
+    let mut d = document(&[(Ok("Gold"), 0.0), (Ok("[Paper]"), 1.0)], 0.5);
+    d.inks.to_process.push("Gold".into());
+    let (shadings, _) = export(&d, Standard::PdfX4);
+    assert_eq!(shadings[0].family, "DeviceCMYK");
+    assert!(close(&shadings[0].start, &[0.0, 0.3, 0.9, 0.1]), "{:?}", shadings[0].start);
+}
+
+/// Stops follow the Ink Manager as fills do (`designcraft_pdf::inks`): an alias that would close
+/// a loop is left out, so Gold prints on Silver's plate and Silver on its own.
+#[test]
+fn gradient_stops_follow_ink_aliases_as_fills_do() {
+    let mut d = document(&[(Ok("Gold"), 0.0), (Ok("[Paper]"), 1.0)], 0.5);
+    d.inks.aliases = vec![("Gold".into(), "Silver".into()), ("Silver".into(), "Gold".into())];
+    let set = designcraft_pdf::inks::ink_set(&d);
+    assert_eq!(designcraft_pdf::inks::spot_output(&d, &set, "Gold"), ("Silver", false));
+    let (shadings, _) = export(&d, Standard::PdfX4);
+    assert_eq!((shadings[0].family.as_str(), shadings[0].colorants.as_slice()), ("Separation", &["Silver".to_string()][..]));
+    assert!(close(&shadings[0].start, &[1.0]), "{:?}", shadings[0].start);
+}
+
+#[test]
+fn a_spot_to_cyan_gradient_is_a_device_n_shading() {
+    let (shadings, warnings) = export(&document(&[(Ok("Gold"), 0.0), (Ok(CYAN), 1.0)], 0.5), Standard::PdfX4);
+    no_conversion(&warnings);
+    let s = &shadings[0];
+    assert_eq!(s.family, "DeviceN");
+    assert_eq!(s.colorants, ["Cyan", "Gold"]);
+    assert!(close(&s.start, &[0.0, 1.0]) && close(&s.end, &[1.0, 0.0]), "{:?} → {:?}", s.start, s.end);
+    // A midpoint stays in the inks: the colors at the ends are unchanged and in DeviceN.
+    let (shadings, _) = export(&document(&[(Ok("Gold"), 0.0), (Ok(CYAN), 1.0)], 0.25), Standard::PdfX4);
+    assert_eq!(shadings[0].family, "DeviceN");
+    assert!(close(&shadings[0].start, &[0.0, 1.0]) && close(&shadings[0].end, &[1.0, 0.0]));
+}
+
+#[test]
+fn a_two_spot_gradient_is_a_device_n_shading() {
+    let (shadings, warnings) = export(&document(&[(Ok("Gold"), 0.0), (Ok("Silver"), 1.0)], 0.5), Standard::PdfX4);
+    no_conversion(&warnings);
+    let s = &shadings[0];
+    assert_eq!(s.family, "DeviceN");
+    assert_eq!(s.colorants, ["Gold", "Silver"]);
+    assert!(close(&s.start, &[1.0, 0.0]) && close(&s.end, &[0.0, 1.0]), "{:?} → {:?}", s.start, s.end);
+    // Stop opacity is a soft mask over the same inks.
+    let mut d = document(&[(Ok("Gold"), 0.0), (Ok("Silver"), 1.0)], 0.5);
+    if let Some(SwatchValue::Gradient { gradient }) = d.swatches.iter_mut().find(|w| w.name == "Fade").map(|w| &mut w.value) {
+        gradient.stops[0].opacity = 0.4;
+    }
+    let (shadings, warnings) = export(&d, Standard::PdfX4);
+    no_conversion(&warnings);
+    assert!(shadings.iter().any(|s| s.family == "DeviceN" && s.colorants == ["Gold", "Silver"]));
+}
+
+#[test]
+fn a_process_gradient_to_paper_prints_in_cmyk() {
+    let (shadings, warnings) = export(&document(&[(Ok(CYAN), 0.0), (Ok("[Paper]"), 1.0)], 0.5), Standard::PdfX4);
+    no_conversion(&warnings);
+    assert_eq!(shadings[0].family, "DeviceCMYK");
+    assert!(close(&shadings[0].start, &[1.0, 0.0, 0.0, 0.0]) && close(&shadings[0].end, &[0.0, 0.0, 0.0, 0.0]));
+}
+
+/// Nonzero overprint mode doesn't apply to shadings, so an overprinting process gradient names
+/// only the inks it uses and leaves the other plates alone.
+#[test]
+fn an_overprinting_process_gradient_is_a_device_n_shading_of_its_inks() {
+    for standard in [Standard::None, Standard::PdfX4] {
+        let (shadings, warnings) = export(&document_with(&[(Ok(CYAN), 0.0), (Ok("[Paper]"), 1.0)], 0.5, true), standard);
+        no_conversion(&warnings);
+        let s = &shadings[0];
+        assert_eq!((s.family.as_str(), s.colorants.as_slice()), ("DeviceN", &["Cyan".to_string()][..]), "{standard:?}");
+        assert!(close(&s.start, &[1.0]) && close(&s.end, &[0.0]), "{:?} → {:?}", s.start, s.end);
+    }
+    // Plain-color stops too.
+    let c_to_m = [(Err(Color::cmyk(1.0, 0.0, 0.0, 0.0)), 0.0), (Err(Color::cmyk(0.0, 1.0, 0.0, 0.0)), 1.0)];
+    let (shadings, _) = export(&document_with(&c_to_m, 0.5, true), Standard::PdfX4);
+    let s = &shadings[0];
+    assert_eq!((s.family.as_str(), s.colorants.as_slice()), ("DeviceN", &["Cyan".to_string(), "Magenta".to_string()][..]));
+    assert!(close(&s.start, &[1.0, 0.0]) && close(&s.end, &[0.0, 1.0]), "{:?} → {:?}", s.start, s.end);
+    // Without overprint it stays in DeviceCMYK.
+    let (shadings, _) = export(&document(&c_to_m, 0.5), Standard::PdfX4);
+    assert_eq!(shadings[0].family, "DeviceCMYK");
+}
+
+/// PDF/A forbids DeviceN's PostScript tint transform: the gradient goes to process color, with
+/// a warning, and the export still succeeds.
+#[test]
+fn pdf_a_writes_mixed_spot_gradients_in_process_color() {
+    let (shadings, warnings) = export(&document(&[(Ok("Gold"), 0.0), (Ok(CYAN), 1.0)], 0.5), Standard::PdfA2b);
+    assert!(warnings.iter().any(|w| w.contains("'Fade'") && w.contains("spot inks printed as process")), "{warnings:?}");
+    assert!(shadings.iter().all(|s| s.family != "DeviceN"));
+}
+
+/// Stops with plain colors (every document saved before stops named swatches) export as they
+/// did: the spot's values in DeviceCMYK.
+#[test]
+fn plain_color_stops_keep_their_device_space() {
+    let gold = Color::cmyk(0.0, 0.3, 0.9, 0.1);
+    let (shadings, warnings) = export(&document(&[(Err(gold), 0.0), (Err(Color::cmyk(1.0, 0.0, 0.0, 0.0)), 1.0)], 0.5), Standard::PdfX4);
+    no_conversion(&warnings);
+    assert_eq!(shadings[0].family, "DeviceCMYK");
+    assert!(close(&shadings[0].start, &[0.0, 0.3, 0.9, 0.1]));
+}
diff --git a/crates/pdf/tests/support/image_content_cache_contract.rs b/crates/pdf/tests/support/image_content_cache_contract.rs
index 2442c33a0..a35fc464e 100644
--- a/crates/pdf/tests/support/image_content_cache_contract.rs
+++ b/crates/pdf/tests/support/image_content_cache_contract.rs
@@ -30,6 +30,7 @@ fn place_named(d: &mut Document, data: Vec<u8>, x: f64, name: &str, mime: &str,
     let mut item = Item::new(id, d.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(x, 36.0, x + 20.0, 56.0)));
     item.stroke.weight = 0.0;
     item.content = Content::Graphic(Graphic {
+        layer_options: None,
         asset: aid,
         size: (20.0, 20.0),
         xf: Affine::translate((x, 36.0)),
diff --git a/crates/pptx/src/tests.rs b/crates/pptx/src/tests.rs
index ba97a67b8..253c5d260 100644
--- a/crates/pptx/src/tests.rs
+++ b/crates/pptx/src/tests.rs
@@ -212,6 +212,7 @@ fn pictures_are_cropped_to_their_frames() {
         it.fill = Fill::none();
         // 200 × 100 image at 1:1, its left quarter cut off by the frame.
         it.content = Content::Graphic(Graphic {
+            layer_options: None,
             asset,
             size: (200.0, 100.0),
             xf: Affine::translate((50.0, 100.0)),
diff --git a/crates/render/src/blendspace.rs b/crates/render/src/blendspace.rs
index f6c2fa328..73855cea9 100644
--- a/crates/render/src/blendspace.rs
+++ b/crates/render/src/blendspace.rs
@@ -87,6 +87,7 @@ fn same_document(old: &Document, new: &Document) -> bool {
         styles,
         assets,
         title,
+        file_info,
         settings,
         layers,
         swatches,
@@ -125,6 +126,7 @@ fn same_document(old: &Document, new: &Document) -> bool {
         && old.assets.len() == assets.len()
         && old.assets.iter().zip(assets).all(|((a, x), (b, y))| a == b && std::sync::Arc::ptr_eq(x, y))
         && old.title == *title
+        && old.file_info == *file_info
         && old.settings == *settings
         && old.layers == *layers
         && old.swatches == *swatches
@@ -444,8 +446,7 @@ mod tests {
             doc,
             &Cache::new(),
             &[Placed { spread: SpreadRef::Doc(0), xf: Affine::IDENTITY }],
-            200,
-            140,
+            (200, 140),
             Affine::translate((30.0, 10.0)),
             &RenderOptions { blend_space_view: true, background: Some([180, 180, 180, 255]), ..Default::default() },
         )
@@ -587,8 +588,7 @@ mod tests {
             &doc,
             &Cache::new(),
             &[Placed { spread: SpreadRef::Doc(0), xf: Affine::IDENTITY }],
-            200,
-            140,
+            (200, 140),
             Affine::translate((30.0, 10.0)),
             &cyan,
         );
@@ -647,10 +647,11 @@ mod tests {
         renderer.threads = 0;
         let placements = [Placed { spread: SpreadRef::Doc(0), xf: Affine::IDENTITY }];
         let options = RenderOptions { paper: false, blend_space_view: true, ..Default::default() };
-        let out = renderer.render(&doc, &Cache::new(), &placements, 160, 120, Affine::IDENTITY, &options);
+        let out = renderer.render(&doc, &Cache::new(), &placements, (160, 120), Affine::IDENTITY, &options);
         assert!(out.pixel(30, 40)[3].abs_diff(64) <= 1, "half-opacity object inside a half-opacity group is quarter opaque");
-        let cmy = renderer.render(&doc, &Cache::new(), &placements, 160, 120, Affine::IDENTITY, &RenderOptions { plate: Some(4), ..options.clone() });
-        let k = renderer.render(&doc, &Cache::new(), &placements, 160, 120, Affine::IDENTITY, &RenderOptions { plate: Some(3), ..options });
+        let cmy =
+            renderer.render(&doc, &Cache::new(), &placements, (160, 120), Affine::IDENTITY, &RenderOptions { plate: Some(4), ..options.clone() });
+        let k = renderer.render(&doc, &Cache::new(), &placements, (160, 120), Affine::IDENTITY, &RenderOptions { plate: Some(3), ..options });
         for ((out, cmy), k) in out.pixels.as_chunks::<4>().0.iter().zip(cmy.pixels.as_chunks::<4>().0).zip(k.pixels.as_chunks::<4>().0) {
             assert_eq!(cmy[3], k[3], "all ink passes have the same coverage");
             assert_eq!(out[3], cmy[3], "conversion preserves coverage");
diff --git a/crates/render/src/color.rs b/crates/render/src/color.rs
new file mode 100644
index 000000000..c4406b73c
--- /dev/null
+++ b/crates/render/src/color.rs
@@ -0,0 +1,276 @@
+use super::types::{Frame, Rendered};
+use super::{Affine, BlendMode, Compose, DcBlend, Document, Item, Mix, Rect, RenderContext, peniko, vello_cpu};
+
+const CMYK_N: usize = 17;
+
+/// The sRGB → working CMYK table for the current colour settings (17³, built once per settings,
+/// trilinear);
+/// sample it with [`cmyk_in`]. Fetch it once for many pixels.
+pub(crate) fn cmyk_table() -> std::sync::Arc<Vec<[f32; 4]>> {
+    const N: usize = CMYK_N;
+    type Lut = (designcraft_color::cms::ColorSettings, std::sync::Arc<Vec<[f32; 4]>>);
+    static LUT: std::sync::Mutex<Option<Lut>> = std::sync::Mutex::new(None);
+    let settings = designcraft_color::cms::active_settings();
+    let mut g = LUT.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+    match g.as_ref() {
+        Some((s, t)) if *s == settings => t.clone(),
+        _ => {
+            let cms = designcraft_color::cms::active();
+            let step = |i: usize| i as f32 / (N - 1) as f32;
+            let t: Vec<[f32; 4]> = (0..N * N * N)
+                .map(|i| cms.srgb_to_cmyk([step(i / (N * N)), step(i / N % N), step(i % N)], designcraft_color::cms::Intent::RelativeColorimetric))
+                .collect();
+            let t = std::sync::Arc::new(t);
+            *g = Some((settings, t.clone()));
+            t
+        }
+    }
+}
+
+/// Trilinear lookup of `rgb` in a [`cmyk_table`].
+pub(crate) fn cmyk_in(table: &[[f32; 4]], rgb: [f32; 3]) -> [f32; 4] {
+    const N: usize = CMYK_N;
+    let f = rgb.map(|v| v.clamp(0.0, 1.0) * (N - 1) as f32);
+    let i = f.map(|v| (v as usize).min(N - 2));
+    let d = [f[0] - i[0] as f32, f[1] - i[1] as f32, f[2] - i[2] as f32];
+    let mut out = [0.0f32; 4];
+    for (corner, w) in (0..8).map(|c| {
+        let (a, b, cc) = (c >> 2 & 1, c >> 1 & 1, c & 1);
+        let w = (if a == 1 { d[0] } else { 1.0 - d[0] }) * (if b == 1 { d[1] } else { 1.0 - d[1] }) * (if cc == 1 { d[2] } else { 1.0 - d[2] });
+        ((i[0] + a) * N * N + (i[1] + b) * N + i[2] + cc, w)
+    }) {
+        if let Some(t) = table.get(corner) {
+            for k in 0..4 {
+                out[k] += t[k] * w;
+            }
+        }
+    }
+    out
+}
+
+/// An image's ink coverage on one process plate, as grey (cached per image and plate).
+pub(crate) fn plate_pixmap(pm: &std::sync::Arc<vello_cpu::Pixmap>, plate: u8) -> std::sync::Arc<vello_cpu::Pixmap> {
+    // Keep source allocations alive (their addresses are keys), invalidate on colour settings,
+    // and cap derived raster memory rather than merely counting differently sized images.
+    type Entry = (std::sync::Arc<vello_cpu::Pixmap>, std::sync::Arc<vello_cpu::Pixmap>);
+    type Cache = (designcraft_color::cms::ColorSettings, std::collections::HashMap<(usize, u8), Entry>, usize);
+    const BUDGET: usize = 64 << 20;
+    static CACHE: std::sync::Mutex<Option<Cache>> = std::sync::Mutex::new(None);
+    let key = (std::sync::Arc::as_ptr(pm) as usize, plate);
+    let settings = designcraft_color::cms::active_settings();
+    {
+        let mut guard = CACHE.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+        if let Some((previous, map, _)) = guard.as_ref() {
+            if *previous == settings {
+                if let Some((_, derived)) = map.get(&key) {
+                    return derived.clone();
+                }
+            } else {
+                *guard = None;
+            }
+        }
+    }
+    let table = cmyk_table();
+    let data: Vec<vello_cpu::color::PremulRgba8> = pm
+        .data()
+        .iter()
+        .map(|p| {
+            if p.a == 0 {
+                return *p;
+            }
+            let k = 255.0 / p.a as f32;
+            let rgb = [p.r, p.g, p.b].map(|v| (v as f32 * k / 255.0).min(1.0));
+            let cmyk = cmyk_in(&table, rgb);
+            let ink = |i: usize| ((1.0 - cmyk[i].clamp(0.0, 1.0)) * p.a as f32).round() as u8;
+            if plate == 4 {
+                return vello_cpu::color::PremulRgba8 { r: ink(0), g: ink(1), b: ink(2), a: p.a };
+            }
+            let v = ink(plate.min(3) as usize);
+            vello_cpu::color::PremulRgba8 { r: v, g: v, b: v, a: p.a }
+        })
+        .collect();
+    let out = std::sync::Arc::new(vello_cpu::Pixmap::from_parts(data, pm.width(), pm.height()));
+    let bytes = (pm.width() as usize).saturating_mul(pm.height() as usize).saturating_mul(8);
+    if bytes <= BUDGET {
+        let mut guard = CACHE.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+        let (previous, map, used) = guard.get_or_insert_with(|| (settings.clone(), Default::default(), 0));
+        if *previous != settings || used.saturating_add(bytes) > BUDGET {
+            map.clear();
+            *used = 0;
+            *previous = settings;
+        }
+        if map.insert(key, (pm.clone(), out.clone())).is_none() {
+            *used += bytes;
+        }
+    }
+    out
+}
+
+pub(crate) fn rect_overlaps(a: Rect, b: Rect) -> bool {
+    a.x0 < b.x1 && a.x1 > b.x0 && a.y0 < b.y1 && a.y1 > b.y0
+}
+
+thread_local! {
+    /// Object Layer Options of the placed PDF being drawn.
+    pub(crate) static HIDDEN_LAYERS: std::cell::RefCell<Option<Vec<String>>> = const { std::cell::RefCell::new(None) };
+    /// Appearance of Black for the render on this thread: 100% K as pure black.
+    pub(crate) static RICH_BLACK: std::cell::Cell<bool> = const { std::cell::Cell::new(false) };
+    /// The CMYK blend space's ink pass for the render on this thread (`RenderOptions::plate`).
+    pub(crate) static PLATE: std::cell::Cell<Option<u8>> = const { std::cell::Cell::new(None) };
+}
+
+/// Screen indicators and placeholders are display sRGB, independent of the document's RGB
+/// working profile. Encode their inks only while drawing a process plate or CMYK blend pass.
+pub(crate) fn screen_color(rgb: [u8; 3], alpha: u8) -> peniko::Color {
+    if PLATE.with(std::cell::Cell::get).is_none() {
+        return peniko::Color::from_rgba8(rgb[0], rgb[1], rgb[2], alpha);
+    }
+    let [c, m, y, k] = cmyk_in(&cmyk_table(), rgb.map(|v| v as f32 / 255.0));
+    color_of(&designcraft_color::Color::Cmyk { c, m, y, k }, alpha as f32 / 255.0)
+}
+
+pub fn color_of(c: &designcraft_color::Color, alpha: f32) -> peniko::Color {
+    if let Some(p) = PLATE.with(std::cell::Cell::get) {
+        let cmyk = match *c {
+            designcraft_color::Color::Cmyk { c, m, y, k } => [c, m, y, k],
+            _ => c.to_cmyk_managed(designcraft_color::cms::Intent::RelativeColorimetric),
+        };
+        let a = (alpha.clamp(0.0, 1.0) * 255.0).round() as u8;
+        let ink = |i: usize| ((1.0 - cmyk[i].clamp(0.0, 1.0)) * 255.0).round() as u8;
+        if p == 4 {
+            return peniko::Color::from_rgba8(ink(0), ink(1), ink(2), a);
+        }
+        let v = ink(p.min(3) as usize);
+        return peniko::Color::from_rgba8(v, v, v, a);
+    }
+    if RICH_BLACK.with(std::cell::Cell::get)
+        && let designcraft_color::Color::Cmyk { c: cc, m, y, k } = *c
+        && cc <= 1e-3
+        && m <= 1e-3
+        && y <= 1e-3
+        && k >= 0.999
+    {
+        return peniko::Color::from_rgba8(0, 0, 0, (alpha.clamp(0.0, 1.0) * 255.0).round() as u8);
+    }
+    let [r, g, b, a] = c.to_rgba8(alpha);
+    peniko::Color::from_rgba8(r, g, b, a)
+}
+
+/// Set a swatch fill (solid or gradient) as the paint. Returns false for [None]/unknown.
+pub(crate) fn set_fill_paint(ctx: &mut RenderContext, doc: &Document, fill: &designcraft_doc::Fill, bounds: Rect) -> bool {
+    let (swatch, tint) = (fill.swatch.as_str(), fill.tint);
+    if let Some(g) = designcraft_color::swatch::resolve_gradient(&doc.swatches, swatch) {
+        // Sampled so process colours blend as inks, as InDesign shows them (and as the PDF's CMYK
+        // shading prints).
+        let stops: Vec<peniko::ColorStop> = g.display_stops().iter().map(|(o, c, a)| peniko::ColorStop::from((*o, color_of(c, *a)))).collect();
+        if stops.is_empty() {
+            return false;
+        }
+        let grad = match g.kind {
+            // Radial: a circle stretched into the object's ellipse (the paint transform).
+            designcraft_color::GradientKind::Radial => {
+                let (c, rx, ry) = fill.radial_ellipse(bounds);
+                let rx = rx.max(1e-3);
+                ctx.set_paint_transform(Affine::translate(c.to_vec2()) * Affine::scale_non_uniform(1.0, ry / rx) * Affine::translate(-c.to_vec2()));
+                peniko::Gradient::new_radial(c, rx as f32).with_stops(stops.as_slice())
+            }
+            _ => {
+                let (a, b) = fill.linear_axis(bounds);
+                peniko::Gradient::new_linear(a, b).with_stops(stops.as_slice())
+            }
+        };
+        ctx.set_paint(grad);
+        return true;
+    }
+    match doc.resolve_color(swatch, tint) {
+        Some(c) => {
+            ctx.set_paint(color_of(&c, 1.0));
+            true
+        }
+        None => false,
+    }
+}
+
+/// Overprint Preview: does this paint overprint (its own flag, or 100% [Black], which
+/// overprints by default)? It's then multiplied over what's beneath.
+pub(crate) fn overprints(f: &Frame, swatch: &str, tint: f32, flag: bool) -> bool {
+    f.opts.overprint_preview && (flag || (f.doc.settings.overprint_black && swatch == designcraft_color::swatch::BLACK && tint >= 0.999))
+}
+
+/// Does any item on the spread, or on the parent pages it shows, use a blend mode other than
+/// Normal (groups and pasted-in items included)?
+pub(crate) fn spread_blends(doc: &Document, sp: &designcraft_doc::Spread) -> bool {
+    let blends = |it: &Item| {
+        let mut any = false;
+        it.walk(&mut |i| any |= i.blend != Default::default());
+        any
+    };
+    sp.items.iter().any(|i| blends(i)) || doc.parents.iter().any(|p| p.items.iter().any(|i| blends(i)))
+}
+
+pub fn blend_mode(b: DcBlend) -> BlendMode {
+    use DcBlend as B;
+    let mix = match b {
+        B::Normal => Mix::Normal,
+        B::Darken => Mix::Darken,
+        B::Multiply => Mix::Multiply,
+        B::ColorBurn => Mix::ColorBurn,
+        B::Lighten => Mix::Lighten,
+        B::Screen => Mix::Screen,
+        B::ColorDodge => Mix::ColorDodge,
+        B::Overlay => Mix::Overlay,
+        B::SoftLight => Mix::SoftLight,
+        B::HardLight => Mix::HardLight,
+        B::Difference => Mix::Difference,
+        B::Exclusion => Mix::Exclusion,
+        B::Hue => Mix::Hue,
+        B::Saturation => Mix::Saturation,
+        B::Color => Mix::Color,
+        B::Luminosity => Mix::Luminosity,
+    };
+    BlendMode::new(mix, Compose::SrcOver)
+}
+
+/// View › Proof Colors: simulate the proof target (a press, another RGB space, colour-vision
+/// deficiencies) through the active colour settings' proof table.
+pub fn proof_view(img: &mut Rendered, setup: &designcraft_color::cms::ProofSetup) {
+    let lut = designcraft_color::cms::active().proof_lut(setup);
+    for px in img.pixels.as_chunks_mut::<4>().0 {
+        let a = px[3];
+        if a == 0 {
+            continue;
+        }
+        // Premultiplied → straight, proof, back.
+        let k = 255.0 / a as f32;
+        let rgb = [px[0], px[1], px[2]].map(|v| ((v as f32 * k).round()).min(255.0) as u8);
+        let out = lut.apply8(rgb);
+        for i in 0..3 {
+            px[i] = ((out[i] as u32 * a as u32 + 127) / 255) as u8;
+        }
+    }
+}
+
+/// A CMYK transparency blend space on screen: the pixels of `area` (device space) through the
+/// working CMYK profile and back, as a spread composited in that space looks.
+pub(crate) fn blend_space_view(img: &mut Rendered, area: Rect) {
+    use designcraft_color::cms::{ProofSetup, ProofTarget};
+    let lut = designcraft_color::cms::active().proof_lut(&ProofSetup { target: ProofTarget::WorkingCmyk, ..Default::default() });
+    let (w, h) = (img.width as i64, img.height as i64);
+    let (x0, y0) = ((area.x0.floor() as i64).clamp(0, w), (area.y0.floor() as i64).clamp(0, h));
+    let (x1, y1) = ((area.x1.ceil() as i64).clamp(0, w), (area.y1.ceil() as i64).clamp(0, h));
+    for y in y0..y1 {
+        let row = &mut img.pixels[((y * w + x0) * 4) as usize..((y * w + x1) * 4) as usize];
+        for px in row.as_chunks_mut::<4>().0 {
+            let a = px[3];
+            if a == 0 {
+                continue;
+            }
+            let k = 255.0 / a as f32;
+            let rgb = [px[0], px[1], px[2]].map(|v| ((v as f32 * k).round()).min(255.0) as u8);
+            let out = lut.apply8(rgb);
+            for i in 0..3 {
+                px[i] = ((out[i] as u32 * a as u32 + 127) / 255) as u8;
+            }
+        }
+    }
+}
diff --git a/crates/render/src/damage.rs b/crates/render/src/damage.rs
index 31f9757e0..3c11a5c20 100644
--- a/crates/render/src/damage.rs
+++ b/crates/render/src/damage.rs
@@ -257,8 +257,8 @@ mod tests {
         let mut r = Renderer::new();
         r.threads = 0;
         let opts = RenderOptions::default();
-        let mut img = r.render(old, &cache, &placed, w, h, view, &opts);
-        let full = r.render(new, &cache, &placed, w, h, view, &opts);
+        let mut img = r.render(old, &cache, &placed, (w, h), view, &opts);
+        let full = r.render(new, &cache, &placed, (w, h), view, &opts);
         // Patch the damaged pixels.
         let regions = damage(old, new).unwrap();
         let u = regions.iter().map(|(_, r)| *r).reduce(|a, b| a.union(b)).unwrap();
@@ -266,7 +266,7 @@ mod tests {
         let y0 = ((u.y0 * zoom).floor().max(0.0)) as u32;
         let x1 = ((u.x1 * zoom).ceil() as u32).min(w);
         let y1 = ((u.y1 * zoom).ceil() as u32).min(h);
-        let patch = r.render(new, &cache, &placed, x1 - x0, y1 - y0, Affine::translate((-(x0 as f64), -(y0 as f64))) * view, &opts);
+        let patch = r.render(new, &cache, &placed, (x1 - x0, y1 - y0), Affine::translate((-(x0 as f64), -(y0 as f64))) * view, &opts);
         for y in y0..y1 {
             for x in x0..x1 {
                 let pi = (((y - y0) * (x1 - x0) + (x - x0)) * 4) as usize;
diff --git a/crates/render/src/decode.rs b/crates/render/src/decode.rs
new file mode 100644
index 000000000..135dbf108
--- /dev/null
+++ b/crates/render/src/decode.rs
@@ -0,0 +1,101 @@
+use super::pdf_raster::{is_pdf, pdf_page_size, render_pdf_page};
+use super::{Pixmap, vello_cpu};
+
+/// Decode encoded image bytes into a premultiplied pixmap.
+pub fn decode_pixmap(bytes: &[u8]) -> Option<Pixmap> {
+    decode_pixmap_page(bytes, 0)
+}
+
+/// [`decode_pixmap`] for page `page` of a PDF (other formats have one page).
+pub fn decode_pixmap_page(bytes: &[u8], page: u32) -> Option<Pixmap> {
+    // Documents retain the EPS source; only display its TIFF preview or placeholder.
+    let proxy = if designcraft_images::is_eps(bytes) { Some(designcraft_images::eps_proxy(bytes)?.0) } else { None };
+    let bytes = proxy.as_deref().unwrap_or(bytes);
+    if is_pdf(bytes) {
+        return render_pdf_page(bytes, page as usize, 3000);
+    }
+    if designcraft_images::is_svg(bytes) {
+        let (px, w, h) = designcraft_images::render_svg(bytes, 3000)?;
+        let data = px.as_chunks::<4>().0.iter().map(|p| vello_cpu::color::PremulRgba8 { r: p[0], g: p[1], b: p[2], a: p[3] }).collect();
+        return Some(Pixmap::from_parts(data, w.min(u16::MAX as u32) as u16, h.min(u16::MAX as u32) as u16));
+    }
+    let img = designcraft_images::decode_rgba(bytes)?;
+    let (w, h) = img.dimensions();
+    if w == 0 || h == 0 || w > u16::MAX as u32 || h > u16::MAX as u32 {
+        return None;
+    }
+    let data: Vec<vello_cpu::color::PremulRgba8> = img
+        .pixels()
+        .map(|p| {
+            let a = p[3] as u16;
+            let m = |c: u8| ((c as u16 * a + 127) / 255) as u8;
+            vello_cpu::color::PremulRgba8 { r: m(p[0]), g: m(p[1]), b: m(p[2]), a: p[3] }
+        })
+        .collect();
+    Some(Pixmap::from_parts(data, w as u16, h as u16))
+}
+
+/// Box-filter downsample by 2.
+pub(crate) fn halve(pm: &Pixmap) -> Pixmap {
+    let (w, h) = (pm.width() as usize, pm.height() as usize);
+    let (nw, nh) = ((w / 2).max(1), (h / 2).max(1));
+    let src = pm.data();
+    let mut out = Vec::with_capacity(nw * nh);
+    for y in 0..nh {
+        for x in 0..nw {
+            let mut acc = [0u32; 4];
+            for (dx, dy) in [(0, 0), (1, 0), (0, 1), (1, 1)] {
+                let sx = (2 * x + dx).min(w - 1);
+                let sy = (2 * y + dy).min(h - 1);
+                let p = src[sy * w + sx];
+                acc[0] += p.r as u32;
+                acc[1] += p.g as u32;
+                acc[2] += p.b as u32;
+                acc[3] += p.a as u32;
+            }
+            out.push(vello_cpu::color::PremulRgba8 { r: (acc[0] / 4) as u8, g: (acc[1] / 4) as u8, b: (acc[2] / 4) as u8, a: (acc[3] / 4) as u8 });
+        }
+    }
+    Pixmap::from_parts(out, nw as u16, nh as u16)
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) fn now() -> u64 {
+    use std::time::{SystemTime, UNIX_EPOCH};
+    SystemTime::now().duration_since(UNIX_EPOCH).map(|d| d.as_micros() as u64).unwrap_or(0)
+}
+
+#[cfg(target_arch = "wasm32")]
+pub(crate) fn now() -> u64 {
+    0
+}
+
+/// Pixel size of an encoded image without decoding it fully.
+pub fn image_size(bytes: &[u8]) -> Option<(u32, u32)> {
+    if designcraft_images::is_eps(bytes) {
+        return designcraft_images::eps_pixel_size(bytes);
+    }
+    if is_pdf(bytes) {
+        // Placed PDFs are sized by their page (crop box) in points.
+        return pdf_page_size(bytes, 0).map(|(w, h)| (w.round().max(1.0) as u32, h.round().max(1.0) as u32));
+    }
+    if designcraft_images::is_svg(bytes) {
+        // SVGs by their width and height (CSS pixels → points).
+        return designcraft_images::natural_size(bytes).map(|(w, h)| (w.round().max(1.0) as u32, h.round().max(1.0) as u32));
+    }
+    designcraft_images::pixel_size(bytes)
+}
+
+/// Natural size of a placed graphic, unrounded: a PDF page (crop box) and an SVG in points, a raster
+/// in pixels, an EPS its bounding box independently of preview pixels. Placed graphics are drawn at
+/// this size; `image_size` rounds it to whole pixels for display.
+pub fn natural_size(bytes: &[u8], page: usize) -> Option<(f64, f64)> {
+    if is_pdf(bytes) {
+        return pdf_page_size(bytes, page).map(|(w, h)| (w.max(1e-3), h.max(1e-3)));
+    }
+    designcraft_images::natural_size(bytes)
+}
+
+pub fn image_mime(bytes: &[u8]) -> &'static str {
+    designcraft_images::mime(bytes)
+}
diff --git a/crates/render/src/draw.rs b/crates/render/src/draw.rs
new file mode 100644
index 000000000..9780e820e
--- /dev/null
+++ b/crates/render/src/draw.rs
@@ -0,0 +1,296 @@
+use super::color::{HIDDEN_LAYERS, blend_mode, color_of, overprints, rect_overlaps, screen_color, set_fill_paint, spread_blends};
+use super::types::{DisplayQuality, Frame};
+use super::{
+    Affine, Arc, BezPath, BlendMode, Compose, ComposedStory, Content, DcBlend, Item, Mix, RenderContext, Renderer, Shape, ShownOn, SpreadRef,
+    StoryId, Vec2, blendspace, corners, fx, grid, kurbo, peniko,
+};
+
+/// An item's fill under its content; an overprinting fill multiplies into what is beneath.
+fn draw_body_fill(ctx: &mut RenderContext, f: &Frame, it: &Item, bp: &BezPath, xf: Affine) {
+    if it.fill.is_none() {
+        return;
+    }
+    let doc = f.doc;
+    ctx.set_transform(f.view * xf);
+    let op = overprints(f, &it.fill.swatch, it.fill.tint, it.fill.overprint);
+    if op {
+        ctx.push_layer(None, Some(BlendMode::new(Mix::Multiply, Compose::SrcOver)), None, None, None);
+    }
+    if set_fill_paint(ctx, doc, &it.fill, bp.bounding_box()) {
+        ctx.fill_path(bp);
+    }
+    ctx.reset_paint_transform();
+    if op {
+        ctx.pop_layer();
+    }
+}
+
+impl Renderer {
+    pub(crate) fn draw_spread(&mut self, ctx: &mut RenderContext, f: &Frame, sr: SpreadRef) {
+        let doc = f.doc;
+        let Some(sp) = doc.spread(sr) else { return };
+        // Paper.
+        if f.opts.paper {
+            let paper = doc.resolve_color(designcraft_color::swatch::PAPER, 1.0).unwrap_or(designcraft_color::Color::WHITE);
+            if f.opts.page_shadow {
+                ctx.set_transform(f.view);
+                ctx.set_paint(peniko::Color::from_rgba8(0, 0, 0, 90));
+                for p in &sp.pages {
+                    let s = 3.0 * f.px;
+                    ctx.fill_rect(&(p.bounds() + Vec2::new(s, s)));
+                }
+            }
+            ctx.set_transform(f.view);
+            ctx.set_paint(color_of(&paper, 1.0));
+            // One rect for equal-height spreads avoids an anti-aliasing seam at the spine.
+            if sp.pages.windows(2).all(|w| w[0].height == w[1].height) {
+                ctx.fill_rect(&sp.bounds());
+            } else {
+                for p in &sp.pages {
+                    ctx.fill_rect(&p.bounds());
+                }
+            }
+        }
+        let grid_area = f.opts.document_grid.iter().find(|(r, _)| *r == sr).map(|(_, a)| *a);
+        let grid = &doc.settings.grid;
+        if let Some(area) = grid_area.filter(|_| grid.in_back) {
+            grid::draw(ctx, f, sp, grid, area);
+        }
+        if blendspace::uses_cmyk(doc, sr, f.opts) {
+            self.draw_cmyk_spread(ctx, f, sr);
+            if let Some(area) = grid_area.filter(|_| !grid.in_back) {
+                grid::draw(ctx, f, sp, grid, area);
+            }
+            return;
+        }
+        // Blend modes blend with the objects below, not with the paper (as in InDesign and in PDF,
+        // where the page's group starts transparent): a Color Dodge or Screen object over blank paper
+        // shows as it is. So the items are drawn in their own group, laid over the paper once.
+        let isolate = f.opts.paper && spread_blends(doc, sp);
+        if isolate {
+            ctx.push_layer(None, None, None, None, None);
+        }
+        // Layers back to front; within each layer parent items first.
+        for layer in doc.layers.iter().rev() {
+            if !layer.visible || f.opts.printing_only && !layer.printable {
+                continue;
+            }
+            // Document pages show their parent and its bases; a parent spread shows its bases.
+            let first = match sr {
+                SpreadRef::Doc(si) => Some(doc.first_page_of_spread(si)),
+                SpreadRef::Parent(_) => None,
+            };
+            // Base items compose for where they show: the document page, or this parent spread.
+            let shown_on = |pi: usize| match (sr, first) {
+                (SpreadRef::Parent(p), _) => ShownOn::Parent(p),
+                (_, Some(a)) => ShownOn::Page(a + pi),
+                (_, None) => ShownOn::Own,
+            };
+            for (pi, page) in sp.pages.iter().enumerate() {
+                if !page.show_parent_items {
+                    continue;
+                }
+                for (ppi, ppage) in doc.shown_parent_pages(sr, pi) {
+                    let Some(parent) = doc.parents.get(ppi) else { continue };
+                    let Some(ppg) = parent.pages.get(ppage) else { continue };
+                    let dx = page.x - ppg.x;
+                    for it in &parent.items {
+                        if it.layer != layer.id || page.overridden.contains(&it.id) {
+                            continue;
+                        }
+                        // Parent items belong to the parent page they sit on.
+                        if parent.page_at_x(it.bounds().center().x) != Some(ppage) && parent.pages.len() > 1 {
+                            continue;
+                        }
+                        self.draw_item(ctx, f, it, Affine::translate((dx, 0.0)), shown_on(pi));
+                    }
+                }
+            }
+            for it in &sp.items {
+                if it.layer == layer.id {
+                    self.draw_item(ctx, f, it, Affine::IDENTITY, ShownOn::Own);
+                }
+            }
+        }
+        if isolate {
+            ctx.pop_layer();
+        }
+        if let Some(area) = grid_area.filter(|_| !grid.in_back) {
+            grid::draw(ctx, f, sp, grid, area);
+        }
+    }
+
+    pub(crate) fn draw_item(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, parent: Affine, page: ShownOn) {
+        if self.drawing_items.len() >= 64 || self.drawing_items.contains(&it.id) {
+            return;
+        }
+        self.drawing_items.push(it.id);
+        self.draw_item_inner(ctx, f, it, parent, page);
+        self.drawing_items.pop();
+    }
+
+    /// A group: children carry their own transforms relative to the group.
+    fn draw_group(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, xf: Affine, page: ShownOn) {
+        // Isolate Blending / Knockout: the group is its own layer (blend modes stop at it).
+        let layered = it.opacity < 0.999 || it.blend != DcBlend::Normal || it.isolate || it.knockout;
+        if layered {
+            ctx.set_transform(Affine::IDENTITY);
+            ctx.push_layer(None, Some(blend_mode(it.blend)), Some(it.opacity), None, None);
+        }
+        // Gradient feather: the group's objects drawn together, then faded as one.
+        let feather = it.effects.gradient_feather.on && f.opts.quality != DisplayQuality::Fast;
+        if feather {
+            ctx.set_transform(Affine::IDENTITY);
+            ctx.push_layer(None, None, None, None, None);
+        }
+        if it.knockout {
+            // Knockout: each object first clears its area of those behind it, so it composites
+            // with the group's backdrop rather than with its siblings.
+            for c in it.shown_children() {
+                if !c.hidden {
+                    ctx.set_transform(Affine::IDENTITY);
+                    ctx.push_layer(None, Some(BlendMode::new(Mix::Normal, Compose::DestOut)), None, None, None);
+                    ctx.set_transform(f.view * xf * c.xf);
+                    ctx.set_paint(peniko::Color::BLACK);
+                    ctx.fill_path(&c.path.to_bezpath());
+                    ctx.pop_layer();
+                }
+                self.draw_item(ctx, f, c, xf, page);
+            }
+        } else {
+            for c in it.shown_children() {
+                self.draw_item(ctx, f, c, xf, page);
+            }
+        }
+        if feather {
+            fx::gradient_feather_mask(ctx, f, it, xf);
+            ctx.pop_layer();
+        }
+        if layered {
+            ctx.pop_layer();
+        }
+    }
+
+    fn draw_item_inner(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, parent: Affine, page: ShownOn) {
+        if it.hidden || f.opts.hidden.contains(&it.id) || f.opts.printing_only && it.nonprinting {
+            return;
+        }
+        let xf = parent * it.xf;
+        let vb = xf.transform_rect_bbox(it.inner_bounds()).inflate(it.stroke.extent() + 2.0, it.stroke.extent() + 2.0);
+        // A frame with items pasted into it draws like any other object (draw_body: fill, the items
+        // clipped to the frame, stroke), so its effects apply to all of it.
+        if !it.children().is_empty() && !it.has_nested_items() {
+            self.draw_group(ctx, f, it, xf, page);
+            return;
+        }
+        // Composed text stays inside its frame apart from glyph overhang (italics, swashes, big
+        // initials), so text frames get a margin rather than being exempt from culling.
+        let margin = match it.content {
+            Content::Text(_) => 36.0 + 0.25 * vb.width().max(vb.height()),
+            _ => 0.0,
+        };
+        let effects = it.effects.any() && f.opts.quality != DisplayQuality::Fast;
+        let fx_outset = if effects { fx::outset(it) } else { 0.0 };
+        if !rect_overlaps(vb.inflate(margin + fx_outset, margin + fx_outset), f.visible) {
+            return;
+        }
+        self.stats.items += 1;
+        let bp = if it.corners.is_none() { it.path.to_bezpath() } else { corners::apply(&it.path, &it.corners) };
+        let layered = it.opacity < 0.999 || it.blend != DcBlend::Normal;
+        if layered {
+            ctx.set_transform(Affine::IDENTITY);
+            ctx.push_layer(None, Some(blend_mode(it.blend)), Some(it.opacity), None, None);
+        }
+        if effects {
+            self.draw_item_fx(ctx, f, it, &bp, xf, page);
+        } else {
+            self.draw_body(ctx, f, it, &bp, xf, page);
+        }
+        if layered {
+            ctx.pop_layer();
+        }
+    }
+
+    /// The composed story for a frame (memoised for the current render: the cache lookup
+    /// validates the whole thread each time).
+    fn story(&mut self, f: &Frame, sid: StoryId, page: ShownOn) -> Arc<ComposedStory> {
+        let key = (sid, page);
+        if let Some(cs) = self.stories.get(&key) {
+            return cs.clone();
+        }
+        let cs = f.cache.get_on(f.doc, sid, page);
+        self.stories.insert(key, cs.clone());
+        cs
+    }
+
+    /// Fill, content and stroke of a leaf item (no opacity, blend or effects).
+    pub(crate) fn draw_body(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, bp: &BezPath, xf: Affine, page: ShownOn) {
+        draw_body_fill(ctx, f, it, bp, xf);
+        // Content.
+        match &it.content {
+            Content::Graphic(g) => {
+                let g = &if it.media.is_some() { it.drawn_graphic(&f.doc.assets).unwrap_or_else(|| g.clone()) } else { g.clone() };
+                ctx.set_transform(f.view * xf);
+                ctx.push_clip_layer(bp);
+                let hidden = it.has_pdf_layer_override().then(|| it.pdf_hidden_layers.clone());
+                let previous = HIDDEN_LAYERS.with(|h| h.replace(hidden));
+                self.draw_graphic(ctx, f, g, xf);
+                HIDDEN_LAYERS.with(|h| h.replace(previous));
+                ctx.pop_layer();
+            }
+            // Items pasted into the frame, clipped by it.
+            Content::Group { items } if it.has_nested_items() => {
+                ctx.set_transform(f.view * xf);
+                ctx.push_clip_layer(bp);
+                for c in items {
+                    self.draw_item(ctx, f, c, xf, page);
+                }
+                ctx.pop_layer();
+            }
+            Content::Text(tf) => {
+                let cs = self.story(f, tf.story, page);
+                if let Some(ft) = cs.frame(it.id) {
+                    match &tf.options.path {
+                        Some(pt) => self.draw_path_text(ctx, f, &cs, ft, xf, bp, pt),
+                        None => self.draw_text(ctx, f, &cs, ft, xf * f.doc.text_local(it)),
+                    }
+                }
+            }
+            _ => {}
+        }
+        // Form fields (screen only; PDF viewers draw their own): a tint, a check mark.
+        if let Some(ff) = &it.form_field
+            && !f.opts.printing_only
+        {
+            let r = it.inner_bounds();
+            ctx.set_transform(f.view * xf);
+            ctx.set_paint(screen_color([80, 140, 255], 40));
+            ctx.fill_rect(&r);
+            ctx.set_paint(screen_color([60, 110, 220], 200));
+            ctx.set_stroke(kurbo::Stroke::new(0.75));
+            ctx.stroke_path(&r.to_path(0.1));
+            if ff.kind == designcraft_doc::FieldKind::CheckBox && !ff.value.is_empty() && ff.value != "Off" {
+                let (w, h) = (r.width(), r.height());
+                let mut c = BezPath::new();
+                c.move_to((r.x0 + w * 0.22, r.y0 + h * 0.48));
+                c.line_to((r.x0 + w * 0.42, r.y0 + h * 0.72));
+                c.line_to((r.x0 + w * 0.78, r.y0 + h * 0.24));
+                ctx.set_paint(screen_color([0, 0, 0], 255));
+                ctx.set_stroke(kurbo::Stroke::new((w.min(h) * 0.12).max(0.8)).with_caps(kurbo::Cap::Round).with_join(kurbo::Join::Round));
+                ctx.stroke_path(&c);
+            }
+        }
+        // Stroke.
+        if !it.stroke.is_none() {
+            let op = overprints(f, &it.stroke.swatch, it.stroke.tint, it.stroke.overprint);
+            if op {
+                ctx.set_transform(f.view * xf);
+                ctx.push_layer(None, Some(BlendMode::new(Mix::Multiply, Compose::SrcOver)), None, None, None);
+            }
+            self.draw_stroke(ctx, f, it, bp, xf);
+            if op {
+                ctx.pop_layer();
+            }
+        }
+    }
+}
diff --git a/crates/render/src/driver.rs b/crates/render/src/driver.rs
new file mode 100644
index 000000000..a5dd2b86b
--- /dev/null
+++ b/crates/render/src/driver.rs
@@ -0,0 +1,154 @@
+use super::color::{PLATE, RICH_BLACK, blend_space_view, rect_overlaps};
+use super::decode::now;
+use super::types::{Frame, FrameStats, MAX_PAGE_PIXELS, MAX_SIDE, Placed, RenderOptions, Rendered, default_threads};
+use super::{
+    Affine, Cache, Document, HashMap, PageSide, Rect, RenderContext, Renderer, Resources, SpreadRef, Vec2, blendspace, kurbo, peniko, text, vello_cpu,
+};
+
+impl Renderer {
+    pub fn new() -> Self {
+        Self {
+            ctx: None,
+            resources: Resources::new(),
+            glyphs: text::GlyphCache::default(),
+            stories: HashMap::new(),
+            drawing_items: Vec::new(),
+            cmyk_view: None,
+            cmyk_ran: false,
+            #[cfg(test)]
+            cmyk_passes: 0,
+            #[cfg(test)]
+            cmyk_pass_pixels: 0,
+            #[cfg(test)]
+            cmyk_pass_items: 0,
+            threads: default_threads(),
+            stats: FrameStats::default(),
+        }
+    }
+
+    /// Drop cached glyph paths and the CMYK viewport (rebuilt on demand).
+    pub fn clear_caches(&mut self) {
+        self.cmyk_view = None;
+        self.glyphs.clear();
+        self.stories.clear();
+    }
+
+    /// Number of text frames whose glyph paths are cached.
+    pub fn cached_frames(&self) -> usize {
+        self.glyphs.len()
+    }
+
+    /// Render the given spreads into a `width`×`height` image with `view` (canvas → pixels).
+    pub fn render(&mut self, doc: &Document, cache: &Cache, spreads: &[Placed], size: (u32, u32), view: Affine, opts: &RenderOptions) -> Rendered {
+        let start = now();
+        let (width, height) = size;
+        RICH_BLACK.with(|r| r.set(opts.rich_black));
+        PLATE.with(|p| p.set(opts.plate));
+        if let Some(hit) = self.cmyk_view.as_ref().filter(|entry| entry.matches(doc, spreads, width, height, view, opts, self.threads)) {
+            let image = hit.image();
+            self.stats = hit.stats();
+            self.stats.micros = now().saturating_sub(start);
+            return image;
+        }
+        // Release the old snapshot before rendering an edited document or resized viewport.
+        self.cmyk_view = None;
+        self.cmyk_ran = false;
+        let image = self.render_uncached(doc, cache, spreads, size, view, opts);
+        // Kept only when the ink passes ran: other views render at their usual cost anyway.
+        if self.cmyk_ran && image.pixels.len() <= blendspace::CachedView::MAX_BYTES {
+            self.cmyk_view = Some(blendspace::CachedView::new(doc, spreads, view, opts, &image, self.stats, self.threads));
+        }
+        self.stats.micros = now().saturating_sub(start);
+        image
+    }
+
+    fn render_uncached(
+        &mut self,
+        doc: &Document,
+        cache: &Cache,
+        spreads: &[Placed],
+        size: (u32, u32),
+        view: Affine,
+        opts: &RenderOptions,
+    ) -> Rendered {
+        let start = now();
+        let (width, height) = size;
+        let w = width.clamp(1, MAX_SIDE) as u16;
+        let h = height.clamp(1, MAX_SIDE) as u16;
+        let mut ctx = match self.ctx.take() {
+            Some(mut c) if c.width() == w && c.height() == h && c.render_settings().num_threads == self.threads => {
+                c.reset();
+                c
+            }
+            _ => RenderContext::new_with(w, h, vello_cpu::RenderSettings { num_threads: self.threads, ..Default::default() }),
+        };
+        let mt = ctx.render_settings().num_threads > 0;
+        RICH_BLACK.with(|r| r.set(opts.rich_black));
+        PLATE.with(|p| p.set(opts.plate));
+        self.stats = FrameStats::default();
+        self.stories.clear();
+        self.glyphs.tick();
+        if let Some(bg) = opts.background {
+            ctx.set_transform(Affine::IDENTITY);
+            ctx.set_paint(peniko::Color::from_rgba8(bg[0], bg[1], bg[2], bg[3]));
+            ctx.fill_rect(&kurbo::Rect::new(0.0, 0.0, w as f64, h as f64));
+        }
+        let px = 1.0 / view.determinant().abs().sqrt().max(1e-12);
+        let canvas_visible = view.inverse().transform_rect_bbox(Rect::new(0.0, 0.0, w as f64, h as f64));
+        for pl in spreads {
+            let Some(sp) = doc.spread(pl.spread) else { continue };
+            let sview = view * pl.xf;
+            let visible = pl.xf.inverse().transform_rect_bbox(canvas_visible);
+            let bounds = sp.bounds();
+            // Cull spreads far outside the viewport (pasteboard items may extend; allow a margin).
+            if !rect_overlaps(bounds.inflate(2000.0, 2000.0), visible) {
+                continue;
+            }
+            let f = Frame { doc, cache, view: sview, visible, px, opts, mt };
+            self.draw_spread(&mut ctx, &f, pl.spread);
+        }
+        ctx.flush();
+        // Render straight into the returned buffer (no extra copy of the frame).
+        let mut pixels = vec![0u8; w as usize * h as usize * 4];
+        if let Some(pm) = vello_cpu::PixmapMut::new(w, h, &mut pixels) {
+            ctx.render(pm, &mut self.resources);
+        }
+        if opts.blend_space_view && doc.settings.blend_space == designcraft_doc::BlendSpace::Cmyk && opts.plate.is_none() {
+            let mut img = Rendered { width: w as u32, height: h as u32, pixels };
+            for pl in spreads {
+                let Some(sp) = doc.spread(pl.spread) else { continue };
+                if blendspace::uses_rgb_proof(doc, pl.spread, opts) {
+                    let r = (view * pl.xf).transform_rect_bbox(sp.bounds());
+                    blend_space_view(&mut img, r);
+                }
+            }
+            pixels = img.pixels;
+        }
+        self.ctx = Some(ctx);
+        self.stories.clear();
+        self.stats.micros = now().saturating_sub(start);
+        Rendered { width: w as u32, height: h as u32, pixels }
+    }
+
+    /// Render one document page (absolute index) at `scale` px/pt, optionally including bleed.
+    pub fn render_page(&mut self, doc: &Document, cache: &Cache, abs: usize, scale: f64, bleed: bool, opts: &RenderOptions) -> Option<Rendered> {
+        let (si, pi) = doc.page_loc(abs)?;
+        let page = &doc.spreads[si].pages[pi];
+        let mut r = page.bounds();
+        if bleed {
+            let b = doc.settings.bleed;
+            let (l, rr) = if page.side == PageSide::Left { (b[3], b[2]) } else { (b[2], b[3]) };
+            r = Rect::new(r.x0 - l, r.y0 - b[0], r.x1 + rr, r.y1 + b[1]);
+        }
+        let w = (r.width() * scale).round().max(1.0) as u32;
+        let h = (r.height() * scale).round().max(1.0) as u32;
+        if w > MAX_SIDE || h > MAX_SIDE || w as u64 * h as u64 > MAX_PAGE_PIXELS {
+            log::warn!("page {abs} at {scale} px/pt would be {w}×{h} pixels: too large to render");
+            return None;
+        }
+        let view = Affine::scale(scale) * Affine::translate(-r.origin().to_vec2());
+        let mut o = opts.clone();
+        o.background = Some([255, 255, 255, 255]);
+        Some(self.render(doc, cache, &[Placed { spread: SpreadRef::Doc(si), xf: Affine::translate(Vec2::ZERO) }], (w, h), view, &o))
+    }
+}
diff --git a/crates/render/src/lib.rs b/crates/render/src/lib.rs
index 522e245cb..8a23bb004 100644
--- a/crates/render/src/lib.rs
+++ b/crates/render/src/lib.rs
@@ -27,35 +27,36 @@ mod blendspace;
 mod colorize;
 pub mod damage;
 mod fx;
-mod grid;
-
-/// How far (points) an object's soft effects reach outside its geometry.
-pub fn effect_outset(it: &Item) -> f64 {
-    fx::outset(it)
-}
 pub mod glyphs;
+mod grid;
 mod pdf_bounds;
 mod pdf_layers;
 pub use pdf_layers::{pdf_hide_layers, pdf_layers};
+
+mod color;
+mod decode;
+mod draw;
+mod driver;
+mod pdf_raster;
+mod stroke;
+mod types;
+
+use color::{PLATE, rect_overlaps, set_fill_paint};
+pub use color::{blend_mode, color_of, proof_view};
+pub(crate) use color::{overprints, screen_color};
+use decode::halve;
+pub use decode::{decode_pixmap, decode_pixmap_page, image_mime, image_size, natural_size};
+#[cfg(test)]
+use pdf_raster::PDF_RENDERS;
+pub use pdf_raster::{
+    PdfRasterError, check_pdf_input_size, crop_pixmap, is_pdf, pdf_crop_box, pdf_page_box, pdf_page_count, pdf_page_png, pdf_page_png_checked,
+    pdf_page_png_options_checked, pdf_page_size, render_pdf_page, shown_box,
+};
+pub(crate) use types::Frame;
+pub use types::{DisplayQuality, FrameStats, MAX_PAGE_PIXELS, MAX_SIDE, Placed, RenderOptions, Rendered, default_threads, effect_outset};
 pub mod images;
 mod text;
 
-/// Largest side of a raster the renderer draws. vello_cpu keeps sizes in `u16` and rounds them
-/// up to its tiles (4 px) and depth buckets (128 px), so a side near `u16::MAX` overflows inside
-/// it: stay a few buckets below.
-pub const MAX_SIDE: u32 = u16::MAX as u32 + 1 - 512;
-
-/// Largest page raster [`Renderer::render_page`] makes (2 GiB of RGBA).
-pub const MAX_PAGE_PIXELS: u64 = 1 << 29;
-
-/// A rendered image (premultiplied RGBA8, row-major).
-#[derive(Clone)]
-pub struct Rendered {
-    pub width: u32,
-    pub height: u32,
-    pub pixels: Vec<u8>,
-}
-
 impl Rendered {
     pub fn to_straight(&self) -> Vec<u8> {
         let mut out = self.pixels.clone();
@@ -115,69 +116,6 @@ impl Rendered {
     }
 }
 
-/// What to draw.
-#[derive(Clone, Debug, PartialEq)]
-pub struct RenderOptions {
-    /// Canvas background (premultiplied RGBA8); `None` = transparent.
-    pub background: Option<[u8; 4]>,
-    /// Fill pages with paper colour.
-    pub paper: bool,
-    /// Skip non-printing items and layers (Preview mode, export).
-    pub printing_only: bool,
-    /// Items not to draw (live drag previews).
-    pub hidden: Vec<designcraft_doc::ItemId>,
-    /// Draw text smaller than this many pixels as grey bars ("greeking"); 0 = never.
-    pub greek_below_px: f64,
-    /// Drop shadow on pages (screen view).
-    pub page_shadow: bool,
-    /// Pink highlight behind text set in fonts that aren't installed (screen view).
-    pub highlight_missing_fonts: bool,
-    /// Preferences › Composition: yellow behind lines whose word spacing breaks the paragraph's
-    /// limits (darker = worse), green behind text with custom tracking or kerning (screen view).
-    pub highlight_hj: bool,
-    pub highlight_keeps: bool,
-    pub highlight_custom_tracking: bool,
-    /// Conditional text indicators: an underline in each condition's colour (screen view).
-    pub condition_indicators: bool,
-    /// Editorial note anchors (screen view).
-    pub note_indicators: bool,
-    /// Track Changes: added text highlighted (screen view).
-    pub change_markup: bool,
-    /// View › Structure › Show Tag Markers: brackets around inline-tagged text (screen view).
-    pub tag_markers: bool,
-    /// Separations Preview: draw one process plate (0 = cyan … 3 = black) as grey ink coverage,
-    /// from each object's own colour (CMYK as authored, others through the colour settings).
-    /// 4 (internal, the CMYK blend space): cyan, magenta and yellow coverage in red, green, blue.
-    pub plate: Option<u8>,
-    /// View › Display Performance.
-    pub quality: DisplayQuality,
-    /// Preferences › Appearance of Black: show 100% K as rich (pure) black instead of the
-    /// accurate dark grey.
-    pub rich_black: bool,
-    /// View › Overprint Preview: overprinting inks mix with what's beneath.
-    pub overprint_preview: bool,
-    /// Screen: spreads with transparency are shown as blended in the document's blend space (a
-    /// CMYK blend space keeps their colours in the working CMYK gamut).
-    pub blend_space_view: bool,
-    /// View › Show Document Grid: the area (spread coordinates) of each listed spread that the
-    /// document grid covers, drawn behind or in front of the page items as the grid settings say
-    /// (screen view). Empty draws no grid.
-    pub document_grid: Vec<(SpreadRef, Rect)>,
-}
-
-/// View › Display Performance: how placed graphics and effects are drawn on screen.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum DisplayQuality {
-    /// Graphics as grey boxes, no transparency effects.
-    Fast,
-    /// Low-resolution proxies (72 ppi at 100%).
-    Typical,
-    /// Full resolution.
-    #[default]
-    High,
-}
-
 impl Default for RenderOptions {
     fn default() -> Self {
         Self {
@@ -205,20 +143,6 @@ impl Default for RenderOptions {
     }
 }
 
-/// A spread placed on the canvas: canvas = xf × spread (a translation, turned for a rotated spread view).
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Placed {
-    pub spread: SpreadRef,
-    pub xf: Affine,
-}
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct FrameStats {
-    pub items: usize,
-    pub glyphs: usize,
-    pub micros: u64,
-}
-
 /// Reusable renderer: keeps the render context, the frame-space glyph paths of composed text
 /// and (process-wide) decoded images between renders.
 pub struct Renderer {
@@ -249,1989 +173,5 @@ impl Default for Renderer {
     }
 }
 
-#[derive(Clone, Copy)]
-pub(crate) struct Frame<'a> {
-    doc: &'a Document,
-    cache: &'a Cache,
-    view: Affine,
-    /// Visible area in spread space.
-    visible: Rect,
-    /// Size of a device pixel in points.
-    px: f64,
-    opts: &'a RenderOptions,
-    /// Drawing into a multithreaded context (no filter layers).
-    mt: bool,
-}
-
-pub fn default_threads() -> u16 {
-    #[cfg(target_arch = "wasm32")]
-    {
-        0
-    }
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        if let Some(n) = std::env::var("DESIGNCRAFT_RENDER_THREADS").ok().and_then(|v| v.parse().ok()) {
-            return n;
-        }
-        std::thread::available_parallelism().map(|n| (n.get().saturating_sub(1)).clamp(0, 8) as u16).unwrap_or(0)
-    }
-}
-
-/// An item's fill under its content; an overprinting fill multiplies into what is beneath.
-fn draw_body_fill(ctx: &mut RenderContext, f: &Frame, it: &Item, bp: &BezPath, xf: Affine) {
-    if it.fill.is_none() {
-        return;
-    }
-    let doc = f.doc;
-    ctx.set_transform(f.view * xf);
-    let op = overprints(f, &it.fill.swatch, it.fill.tint, it.fill.overprint);
-    if op {
-        ctx.push_layer(None, Some(BlendMode::new(Mix::Multiply, Compose::SrcOver)), None, None, None);
-    }
-    if set_fill_paint(ctx, doc, &it.fill, bp.bounding_box()) {
-        ctx.fill_path(bp);
-    }
-    ctx.reset_paint_transform();
-    if op {
-        ctx.pop_layer();
-    }
-}
-
-impl Renderer {
-    pub fn new() -> Self {
-        Self {
-            ctx: None,
-            resources: Resources::new(),
-            glyphs: text::GlyphCache::default(),
-            stories: HashMap::new(),
-            drawing_items: Vec::new(),
-            cmyk_view: None,
-            cmyk_ran: false,
-            #[cfg(test)]
-            cmyk_passes: 0,
-            #[cfg(test)]
-            cmyk_pass_pixels: 0,
-            #[cfg(test)]
-            cmyk_pass_items: 0,
-            threads: default_threads(),
-            stats: FrameStats::default(),
-        }
-    }
-
-    /// Drop cached glyph paths and the CMYK viewport (rebuilt on demand).
-    pub fn clear_caches(&mut self) {
-        self.cmyk_view = None;
-        self.glyphs.clear();
-        self.stories.clear();
-    }
-
-    /// Number of text frames whose glyph paths are cached.
-    pub fn cached_frames(&self) -> usize {
-        self.glyphs.len()
-    }
-
-    /// Render the given spreads into a `width`×`height` image with `view` (canvas → pixels).
-    pub fn render(
-        &mut self,
-        doc: &Document,
-        cache: &Cache,
-        spreads: &[Placed],
-        width: u32,
-        height: u32,
-        view: Affine,
-        opts: &RenderOptions,
-    ) -> Rendered {
-        let start = now();
-        RICH_BLACK.with(|r| r.set(opts.rich_black));
-        PLATE.with(|p| p.set(opts.plate));
-        if let Some(hit) = self.cmyk_view.as_ref().filter(|entry| entry.matches(doc, spreads, width, height, view, opts, self.threads)) {
-            let image = hit.image();
-            self.stats = hit.stats();
-            self.stats.micros = now().saturating_sub(start);
-            return image;
-        }
-        // Release the old snapshot before rendering an edited document or resized viewport.
-        self.cmyk_view = None;
-        self.cmyk_ran = false;
-        let image = self.render_uncached(doc, cache, spreads, width, height, view, opts);
-        // Kept only when the ink passes ran: other views render at their usual cost anyway.
-        if self.cmyk_ran && image.pixels.len() <= blendspace::CachedView::MAX_BYTES {
-            self.cmyk_view = Some(blendspace::CachedView::new(doc, spreads, view, opts, &image, self.stats, self.threads));
-        }
-        self.stats.micros = now().saturating_sub(start);
-        image
-    }
-    #[allow(clippy::too_many_arguments)]
-    fn render_uncached(
-        &mut self,
-        doc: &Document,
-        cache: &Cache,
-        spreads: &[Placed],
-        width: u32,
-        height: u32,
-        view: Affine,
-        opts: &RenderOptions,
-    ) -> Rendered {
-        let start = now();
-        let w = width.clamp(1, MAX_SIDE) as u16;
-        let h = height.clamp(1, MAX_SIDE) as u16;
-        let mut ctx = match self.ctx.take() {
-            Some(mut c) if c.width() == w && c.height() == h && c.render_settings().num_threads == self.threads => {
-                c.reset();
-                c
-            }
-            _ => RenderContext::new_with(w, h, vello_cpu::RenderSettings { num_threads: self.threads, ..Default::default() }),
-        };
-        let mt = ctx.render_settings().num_threads > 0;
-        RICH_BLACK.with(|r| r.set(opts.rich_black));
-        PLATE.with(|p| p.set(opts.plate));
-        self.stats = FrameStats::default();
-        self.stories.clear();
-        self.glyphs.tick();
-        if let Some(bg) = opts.background {
-            ctx.set_transform(Affine::IDENTITY);
-            ctx.set_paint(peniko::Color::from_rgba8(bg[0], bg[1], bg[2], bg[3]));
-            ctx.fill_rect(&kurbo::Rect::new(0.0, 0.0, w as f64, h as f64));
-        }
-        let px = 1.0 / view.determinant().abs().sqrt().max(1e-12);
-        let canvas_visible = view.inverse().transform_rect_bbox(Rect::new(0.0, 0.0, w as f64, h as f64));
-        for pl in spreads {
-            let Some(sp) = doc.spread(pl.spread) else { continue };
-            let sview = view * pl.xf;
-            let visible = pl.xf.inverse().transform_rect_bbox(canvas_visible);
-            let bounds = sp.bounds();
-            // Cull spreads far outside the viewport (pasteboard items may extend; allow a margin).
-            if !rect_overlaps(bounds.inflate(2000.0, 2000.0), visible) {
-                continue;
-            }
-            let f = Frame { doc, cache, view: sview, visible, px, opts, mt };
-            self.draw_spread(&mut ctx, &f, pl.spread);
-        }
-        ctx.flush();
-        // Render straight into the returned buffer (no extra copy of the frame).
-        let mut pixels = vec![0u8; w as usize * h as usize * 4];
-        if let Some(pm) = vello_cpu::PixmapMut::new(w, h, &mut pixels) {
-            ctx.render(pm, &mut self.resources);
-        }
-        if opts.blend_space_view && doc.settings.blend_space == designcraft_doc::BlendSpace::Cmyk && opts.plate.is_none() {
-            let mut img = Rendered { width: w as u32, height: h as u32, pixels };
-            for pl in spreads {
-                let Some(sp) = doc.spread(pl.spread) else { continue };
-                if blendspace::uses_rgb_proof(doc, pl.spread, opts) {
-                    let r = (view * pl.xf).transform_rect_bbox(sp.bounds());
-                    blend_space_view(&mut img, r);
-                }
-            }
-            pixels = img.pixels;
-        }
-        self.ctx = Some(ctx);
-        self.stories.clear();
-        self.stats.micros = now().saturating_sub(start);
-        Rendered { width: w as u32, height: h as u32, pixels }
-    }
-
-    /// Render one document page (absolute index) at `scale` px/pt, optionally including bleed.
-    pub fn render_page(&mut self, doc: &Document, cache: &Cache, abs: usize, scale: f64, bleed: bool, opts: &RenderOptions) -> Option<Rendered> {
-        let (si, pi) = doc.page_loc(abs)?;
-        let page = &doc.spreads[si].pages[pi];
-        let mut r = page.bounds();
-        if bleed {
-            let b = doc.settings.bleed;
-            let (l, rr) = if page.side == PageSide::Left { (b[3], b[2]) } else { (b[2], b[3]) };
-            r = Rect::new(r.x0 - l, r.y0 - b[0], r.x1 + rr, r.y1 + b[1]);
-        }
-        let w = (r.width() * scale).round().max(1.0) as u32;
-        let h = (r.height() * scale).round().max(1.0) as u32;
-        if w > MAX_SIDE || h > MAX_SIDE || w as u64 * h as u64 > MAX_PAGE_PIXELS {
-            log::warn!("page {abs} at {scale} px/pt would be {w}×{h} pixels: too large to render");
-            return None;
-        }
-        let view = Affine::scale(scale) * Affine::translate(-r.origin().to_vec2());
-        let mut o = opts.clone();
-        o.background = Some([255, 255, 255, 255]);
-        Some(self.render(doc, cache, &[Placed { spread: SpreadRef::Doc(si), xf: Affine::translate(Vec2::ZERO) }], w, h, view, &o))
-    }
-
-    fn draw_spread(&mut self, ctx: &mut RenderContext, f: &Frame, sr: SpreadRef) {
-        let doc = f.doc;
-        let Some(sp) = doc.spread(sr) else { return };
-        // Paper.
-        if f.opts.paper {
-            let paper = doc.resolve_color(designcraft_color::swatch::PAPER, 1.0).unwrap_or(designcraft_color::Color::WHITE);
-            if f.opts.page_shadow {
-                ctx.set_transform(f.view);
-                ctx.set_paint(peniko::Color::from_rgba8(0, 0, 0, 90));
-                for p in &sp.pages {
-                    let s = 3.0 * f.px;
-                    ctx.fill_rect(&(p.bounds() + Vec2::new(s, s)));
-                }
-            }
-            ctx.set_transform(f.view);
-            ctx.set_paint(color_of(&paper, 1.0));
-            // One rect for equal-height spreads avoids an anti-aliasing seam at the spine.
-            if sp.pages.windows(2).all(|w| w[0].height == w[1].height) {
-                ctx.fill_rect(&sp.bounds());
-            } else {
-                for p in &sp.pages {
-                    ctx.fill_rect(&p.bounds());
-                }
-            }
-        }
-        let grid_area = f.opts.document_grid.iter().find(|(r, _)| *r == sr).map(|(_, a)| *a);
-        let grid = &doc.settings.grid;
-        if let Some(area) = grid_area.filter(|_| grid.in_back) {
-            grid::draw(ctx, f, sp, grid, area);
-        }
-        if blendspace::uses_cmyk(doc, sr, f.opts) {
-            self.draw_cmyk_spread(ctx, f, sr);
-            if let Some(area) = grid_area.filter(|_| !grid.in_back) {
-                grid::draw(ctx, f, sp, grid, area);
-            }
-            return;
-        }
-        // Blend modes blend with the objects below, not with the paper (as in InDesign and in PDF,
-        // where the page's group starts transparent): a Color Dodge or Screen object over blank paper
-        // shows as it is. So the items are drawn in their own group, laid over the paper once.
-        let isolate = f.opts.paper && spread_blends(doc, sp);
-        if isolate {
-            ctx.push_layer(None, None, None, None, None);
-        }
-        // Layers back to front; within each layer parent items first.
-        for layer in doc.layers.iter().rev() {
-            if !layer.visible || f.opts.printing_only && !layer.printable {
-                continue;
-            }
-            // Document pages show their parent and its bases; a parent spread shows its bases.
-            let first = match sr {
-                SpreadRef::Doc(si) => Some(doc.first_page_of_spread(si)),
-                SpreadRef::Parent(_) => None,
-            };
-            // Base items compose for where they show: the document page, or this parent spread.
-            let shown_on = |pi: usize| match (sr, first) {
-                (SpreadRef::Parent(p), _) => ShownOn::Parent(p),
-                (_, Some(a)) => ShownOn::Page(a + pi),
-                (_, None) => ShownOn::Own,
-            };
-            for (pi, page) in sp.pages.iter().enumerate() {
-                if !page.show_parent_items {
-                    continue;
-                }
-                for (ppi, ppage) in doc.shown_parent_pages(sr, pi) {
-                    let Some(parent) = doc.parents.get(ppi) else { continue };
-                    let Some(ppg) = parent.pages.get(ppage) else { continue };
-                    let dx = page.x - ppg.x;
-                    for it in &parent.items {
-                        if it.layer != layer.id || page.overridden.contains(&it.id) {
-                            continue;
-                        }
-                        // Parent items belong to the parent page they sit on.
-                        if parent.page_at_x(it.bounds().center().x) != Some(ppage) && parent.pages.len() > 1 {
-                            continue;
-                        }
-                        self.draw_item(ctx, f, it, Affine::translate((dx, 0.0)), shown_on(pi));
-                    }
-                }
-            }
-            for it in &sp.items {
-                if it.layer == layer.id {
-                    self.draw_item(ctx, f, it, Affine::IDENTITY, ShownOn::Own);
-                }
-            }
-        }
-        if isolate {
-            ctx.pop_layer();
-        }
-        if let Some(area) = grid_area.filter(|_| !grid.in_back) {
-            grid::draw(ctx, f, sp, grid, area);
-        }
-    }
-
-    fn draw_item(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, parent: Affine, page: ShownOn) {
-        if self.drawing_items.len() >= 64 || self.drawing_items.contains(&it.id) {
-            return;
-        }
-        self.drawing_items.push(it.id);
-        self.draw_item_inner(ctx, f, it, parent, page);
-        self.drawing_items.pop();
-    }
-
-    fn draw_item_inner(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, parent: Affine, page: ShownOn) {
-        if it.hidden || f.opts.hidden.contains(&it.id) || f.opts.printing_only && it.nonprinting {
-            return;
-        }
-        let xf = parent * it.xf;
-        let vb = xf.transform_rect_bbox(it.inner_bounds()).inflate(it.stroke.extent() + 2.0, it.stroke.extent() + 2.0);
-        // A frame with items pasted into it draws like any other object (draw_body: fill, the items
-        // clipped to the frame, stroke), so its effects apply to all of it.
-        if !it.children().is_empty() && !it.has_nested_items() {
-            // Groups: children carry their own transforms relative to the group.
-            // Isolate Blending / Knockout: the group is its own layer (blend modes stop at it).
-            let layered = it.opacity < 0.999 || it.blend != DcBlend::Normal || it.isolate || it.knockout;
-            if layered {
-                ctx.set_transform(Affine::IDENTITY);
-                ctx.push_layer(None, Some(blend_mode(it.blend)), Some(it.opacity), None, None);
-            }
-            // Gradient feather: the group's objects drawn together, then faded as one.
-            let feather = it.effects.gradient_feather.on && f.opts.quality != DisplayQuality::Fast;
-            if feather {
-                ctx.set_transform(Affine::IDENTITY);
-                ctx.push_layer(None, None, None, None, None);
-            }
-            if it.knockout {
-                // Knockout: each object first clears its area of those behind it, so it composites
-                // with the group's backdrop rather than with its siblings.
-                for c in it.shown_children() {
-                    if !c.hidden {
-                        ctx.set_transform(Affine::IDENTITY);
-                        ctx.push_layer(None, Some(BlendMode::new(Mix::Normal, Compose::DestOut)), None, None, None);
-                        ctx.set_transform(f.view * xf * c.xf);
-                        ctx.set_paint(peniko::Color::BLACK);
-                        ctx.fill_path(&c.path.to_bezpath());
-                        ctx.pop_layer();
-                    }
-                    self.draw_item(ctx, f, c, xf, page);
-                }
-            } else {
-                for c in it.shown_children() {
-                    self.draw_item(ctx, f, c, xf, page);
-                }
-            }
-            if feather {
-                fx::gradient_feather_mask(ctx, f, it, xf);
-                ctx.pop_layer();
-            }
-            if layered {
-                ctx.pop_layer();
-            }
-            return;
-        }
-        // Composed text stays inside its frame apart from glyph overhang (italics, swashes, big
-        // initials), so text frames get a margin rather than being exempt from culling.
-        let margin = match it.content {
-            Content::Text(_) => 36.0 + 0.25 * vb.width().max(vb.height()),
-            _ => 0.0,
-        };
-        let effects = it.effects.any() && f.opts.quality != DisplayQuality::Fast;
-        let fx_outset = if effects { fx::outset(it) } else { 0.0 };
-        if !rect_overlaps(vb.inflate(margin + fx_outset, margin + fx_outset), f.visible) {
-            return;
-        }
-        self.stats.items += 1;
-        let bp = if it.corners.is_none() { it.path.to_bezpath() } else { corners::apply(&it.path, &it.corners) };
-        let layered = it.opacity < 0.999 || it.blend != DcBlend::Normal;
-        if layered {
-            ctx.set_transform(Affine::IDENTITY);
-            ctx.push_layer(None, Some(blend_mode(it.blend)), Some(it.opacity), None, None);
-        }
-        if effects {
-            self.draw_item_fx(ctx, f, it, &bp, xf, page);
-        } else {
-            self.draw_body(ctx, f, it, &bp, xf, page);
-        }
-        if layered {
-            ctx.pop_layer();
-        }
-    }
-
-    /// The composed story for a frame (memoised for the current render: the cache lookup
-    /// validates the whole thread each time).
-    fn story(&mut self, f: &Frame, sid: StoryId, page: ShownOn) -> Arc<ComposedStory> {
-        let key = (sid, page);
-        if let Some(cs) = self.stories.get(&key) {
-            return cs.clone();
-        }
-        let cs = f.cache.get_on(f.doc, sid, page);
-        self.stories.insert(key, cs.clone());
-        cs
-    }
-
-    /// Fill, content and stroke of a leaf item (no opacity, blend or effects).
-    pub(crate) fn draw_body(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, bp: &BezPath, xf: Affine, page: ShownOn) {
-        draw_body_fill(ctx, f, it, bp, xf);
-        // Content.
-        match &it.content {
-            Content::Graphic(g) => {
-                let g = &if it.media.is_some() { it.drawn_graphic(&f.doc.assets).unwrap_or_else(|| g.clone()) } else { g.clone() };
-                ctx.set_transform(f.view * xf);
-                ctx.push_clip_layer(bp);
-                if !it.pdf_hidden_layers.is_empty() {
-                    HIDDEN_LAYERS.with(|h| *h.borrow_mut() = it.pdf_hidden_layers.clone());
-                }
-                self.draw_graphic(ctx, f, g, xf);
-                if !it.pdf_hidden_layers.is_empty() {
-                    HIDDEN_LAYERS.with(|h| h.borrow_mut().clear());
-                }
-                ctx.pop_layer();
-            }
-            // Items pasted into the frame, clipped by it.
-            Content::Group { items } if it.has_nested_items() => {
-                ctx.set_transform(f.view * xf);
-                ctx.push_clip_layer(bp);
-                for c in items {
-                    self.draw_item(ctx, f, c, xf, page);
-                }
-                ctx.pop_layer();
-            }
-            Content::Text(tf) => {
-                let cs = self.story(f, tf.story, page);
-                if let Some(ft) = cs.frame(it.id) {
-                    match &tf.options.path {
-                        Some(pt) => self.draw_path_text(ctx, f, &cs, ft, xf, bp, pt),
-                        None => self.draw_text(ctx, f, &cs, ft, xf * f.doc.text_local(it)),
-                    }
-                }
-            }
-            _ => {}
-        }
-        // Form fields (screen only; PDF viewers draw their own): a tint, a check mark.
-        if let Some(ff) = &it.form_field
-            && !f.opts.printing_only
-        {
-            let r = it.inner_bounds();
-            ctx.set_transform(f.view * xf);
-            ctx.set_paint(screen_color([80, 140, 255], 40));
-            ctx.fill_rect(&r);
-            ctx.set_paint(screen_color([60, 110, 220], 200));
-            ctx.set_stroke(kurbo::Stroke::new(0.75));
-            ctx.stroke_path(&r.to_path(0.1));
-            if ff.kind == designcraft_doc::FieldKind::CheckBox && !ff.value.is_empty() && ff.value != "Off" {
-                let (w, h) = (r.width(), r.height());
-                let mut c = BezPath::new();
-                c.move_to((r.x0 + w * 0.22, r.y0 + h * 0.48));
-                c.line_to((r.x0 + w * 0.42, r.y0 + h * 0.72));
-                c.line_to((r.x0 + w * 0.78, r.y0 + h * 0.24));
-                ctx.set_paint(screen_color([0, 0, 0], 255));
-                ctx.set_stroke(kurbo::Stroke::new((w.min(h) * 0.12).max(0.8)).with_caps(kurbo::Cap::Round).with_join(kurbo::Join::Round));
-                ctx.stroke_path(&c);
-            }
-        }
-        // Stroke.
-        if !it.stroke.is_none() {
-            let op = overprints(f, &it.stroke.swatch, it.stroke.tint, it.stroke.overprint);
-            if op {
-                ctx.set_transform(f.view * xf);
-                ctx.push_layer(None, Some(BlendMode::new(Mix::Multiply, Compose::SrcOver)), None, None, None);
-            }
-            self.draw_stroke(ctx, f, it, bp, xf);
-            if op {
-                ctx.pop_layer();
-            }
-        }
-    }
-
-    fn draw_stroke(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, bp: &BezPath, xf: Affine) {
-        self.draw_stroke_painted(ctx, f, it, bp, xf);
-        ctx.reset_paint_transform();
-    }
-
-    /// The stroke, in its colour or gradient (a gradient runs across the path's box, as a fill's).
-    fn draw_stroke_painted(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, bp: &BezPath, xf: Affine) {
-        let st = &it.stroke;
-        let (paint, bounds) = (st.as_fill(), bp.bounding_box());
-        if f.doc.resolve_color(&st.swatch, st.tint).is_none() && designcraft_color::swatch::resolve_gradient(&f.doc.swatches, &st.swatch).is_none() {
-            return;
-        }
-        let mut stroke = kurbo::Stroke::new(st.weight)
-            .with_caps(match st.cap {
-                designcraft_doc::Cap::Butt => kurbo::Cap::Butt,
-                designcraft_doc::Cap::Round => kurbo::Cap::Round,
-                designcraft_doc::Cap::Projecting => kurbo::Cap::Square,
-            })
-            .with_join(match st.join {
-                designcraft_doc::Join::Miter => kurbo::Join::Miter,
-                designcraft_doc::Join::Round => kurbo::Join::Round,
-                designcraft_doc::Join::Bevel => kurbo::Join::Bevel,
-            })
-            .with_miter_limit(st.miter_limit);
-        let kind = f.doc.stroke_kind(&st.kind);
-        let length = designcraft_doc::path_length_bound(bp);
-        match &kind {
-            StrokeType::Dashed { pattern } if StrokeType::expandable_dashes(pattern, length) => {
-                stroke = stroke.with_dashes(0.0, pattern.iter().copied())
-            }
-            StrokeType::Dotted if StrokeType::expandable_dashes(&[0.0, st.weight * 2.0], length) => {
-                stroke = stroke.with_dashes(0.0, [0.0, st.weight * 2.0]).with_caps(kurbo::Cap::Round)
-            }
-            _ => {}
-        }
-        ctx.set_transform(f.view * xf);
-        if !set_fill_paint(ctx, f.doc, &paint, bounds) {
-            return;
-        }
-        let closed = it.path.is_closed();
-        // Arrowheads: the path is shortened under them; they're drawn after it.
-        let arrows = designcraft_doc::arrow::apply(bp, st, closed);
-        let bp = arrows.as_ref().map_or(bp, |a| &a.0);
-        // Gap colour under dashes and dots: the whole path, undashed.
-        let gap = if matches!(kind, StrokeType::Solid) { None } else { f.doc.resolve_color(&st.gap_swatch, st.gap_tint) };
-        if let Some(g) = gap
-            && !matches!(st.align, StrokeAlign::Inside | StrokeAlign::Outside if closed)
-        {
-            let op = overprints(f, &st.gap_swatch, st.gap_tint, st.gap_overprint);
-            if op {
-                ctx.set_transform(Affine::IDENTITY);
-                ctx.push_layer(None, Some(BlendMode::new(Mix::Multiply, Compose::SrcOver)), None, None, None);
-                ctx.set_transform(f.view * xf);
-            }
-            ctx.set_paint(color_of(&g, 1.0));
-            ctx.set_stroke(kurbo::Stroke {
-                dash_pattern: Default::default(),
-                start_cap: kurbo::Cap::Butt,
-                end_cap: kurbo::Cap::Butt,
-                ..stroke.clone()
-            });
-            ctx.stroke_path(bp);
-            if op {
-                ctx.pop_layer();
-            }
-            set_fill_paint(ctx, f.doc, &paint, bounds);
-        }
-        // Stripes, wavy and hash strokes are fills (along the path's centre line).
-        if let Some(o) = kind.outline(bp, st.weight, 0.05 * f.px) {
-            ctx.fill_path(&o);
-            for h in arrows.iter().flat_map(|a| &a.1) {
-                match h.outline {
-                    Some(w) => {
-                        ctx.set_stroke(kurbo::Stroke::new(w).with_join(kurbo::Join::Miter));
-                        ctx.stroke_path(&h.path);
-                    }
-                    None => ctx.fill_path(&h.path),
-                }
-            }
-            return;
-        }
-        match st.align {
-            StrokeAlign::Inside if closed => {
-                // Clip a double-width stroke to the path.
-                ctx.push_clip_layer(bp);
-                ctx.set_stroke(kurbo::Stroke { width: st.weight * 2.0, ..stroke });
-                ctx.stroke_path(bp);
-                ctx.pop_layer();
-            }
-            StrokeAlign::Outside if closed => {
-                // Subtract the filled path from a double-width stroke. Combining a stroked
-                // outline (already hollow) with the path using even-odd would paint its centre.
-                // Isolate the stroke so the subtraction leaves the item's fill/content and
-                // backdrop intact; the same nonzero fill rule also preserves compound holes.
-                ctx.push_layer(None, None, None, None, None);
-                ctx.set_stroke(kurbo::Stroke { width: st.weight * 2.0, ..stroke });
-                ctx.stroke_path(bp);
-                ctx.push_layer(None, Some(BlendMode::new(Mix::Normal, Compose::DestOut)), None, None, None);
-                ctx.fill_path(bp);
-                ctx.pop_layer();
-                ctx.pop_layer();
-            }
-            _ => {
-                ctx.set_stroke(stroke);
-                ctx.stroke_path(bp);
-            }
-        }
-        for h in arrows.iter().flat_map(|a| &a.1) {
-            match h.outline {
-                Some(w) => {
-                    ctx.set_stroke(kurbo::Stroke::new(w).with_join(kurbo::Join::Miter));
-                    ctx.stroke_path(&h.path);
-                }
-                None => ctx.fill_path(&h.path),
-            }
-        }
-    }
-
-    /// Draw a placed graphic, inside its clipping path when it has one.
-    pub(crate) fn draw_graphic(&mut self, ctx: &mut RenderContext, f: &Frame, g: &designcraft_doc::Graphic, xf: Affine) {
-        let Some((region, even_odd)) = g.clip_region() else {
-            self.draw_graphic_unclipped(ctx, f, g, xf);
-            return;
-        };
-        ctx.set_transform(f.view * xf);
-        if even_odd {
-            ctx.set_fill_rule(peniko::Fill::EvenOdd);
-        }
-        ctx.push_clip_layer(&region);
-        ctx.set_fill_rule(peniko::Fill::NonZero);
-        self.draw_graphic_unclipped(ctx, f, g, xf);
-        ctx.pop_layer();
-    }
-
-    fn draw_graphic_unclipped(&mut self, ctx: &mut RenderContext, f: &Frame, g: &designcraft_doc::Graphic, xf: Affine) {
-        let Some(asset) = f.doc.assets.get(&g.asset) else { return };
-        if designcraft_doc::media_kind(&asset.mime).is_some() {
-            // Video / sound: a dark frame with a play mark (the poster, when set, is drawn by the item).
-            ctx.set_transform(f.view * xf * g.xf);
-            ctx.set_paint(screen_color([48, 48, 52], 255));
-            ctx.fill_rect(&Rect::new(0.0, 0.0, g.size.0, g.size.1));
-            let (cx, cy, r) = (g.size.0 / 2.0, g.size.1 / 2.0, g.size.0.min(g.size.1) * 0.18);
-            let mut tri = BezPath::new();
-            tri.move_to((cx - r * 0.6, cy - r));
-            tri.line_to((cx + r, cy));
-            tri.line_to((cx - r * 0.6, cy + r));
-            tri.close_path();
-            ctx.set_paint(screen_color([235, 235, 235], 255));
-            ctx.fill_path(&tri);
-            return;
-        }
-        if f.opts.quality == DisplayQuality::Fast {
-            ctx.set_transform(f.view * xf * g.xf);
-            ctx.set_paint(screen_color([178, 178, 178], 255));
-            ctx.fill_rect(&Rect::new(0.0, 0.0, g.size.0, g.size.1));
-            return;
-        }
-        // Pick a mip level close to the on-screen size (Typical: a 72 ppi proxy).
-        let on_screen = (f.view * xf * g.xf).determinant().abs().sqrt();
-        let on_screen = if f.opts.quality == DisplayQuality::Typical { on_screen.min(1.0) } else { on_screen };
-        let hidden = HIDDEN_LAYERS.with(|h| h.borrow().clone());
-        let data = if !hidden.is_empty() && is_pdf(&asset.data) {
-            // Stale persisted/relinked choices must not reveal hidden source content.
-            let Some(variant) = pdf_layers::layered(&asset.data, &hidden) else { return };
-            variant
-        } else {
-            asset.data.clone()
-        };
-        // A placed PDF cropped to a box: the whole page, placed so that the box spans graphic space.
-        let [l, t, r, b] = shown_box(asset).unwrap_or([0.0, 0.0, 1.0, 1.0]);
-        let (page_w, page_h) = (g.size.0 / (r - l), g.size.1 / (b - t));
-        let page = Rect::new(-l * page_w, -t * page_h, (1.0 - l) * page_w, (1.0 - t) * page_h);
-        let Some(pm) = images::mip(&data, asset.page, page_w, on_screen) else { return };
-        // A coloured image is already in the plate's inks (its colours come from `color_of`).
-        let pm = match (colorize::colorized(f.doc, &g.fill, &asset.data, &pm), PLATE.with(std::cell::Cell::get)) {
-            (Some(coloured), _) => coloured,
-            (None, Some(plate)) => plate_pixmap(&pm, plate),
-            (None, None) => pm,
-        };
-        // Only where the page is: a box reaching past it (a media box larger than the crop box)
-        // shows nothing there.
-        let rect = Rect::new(0.0, 0.0, g.size.0, g.size.1).intersect(page);
-        ctx.set_transform(f.view * xf * g.xf);
-        let sx = page_w / pm.width().max(1) as f64;
-        let sy = page_h / pm.height().max(1) as f64;
-        ctx.set_paint(vello_cpu::Image {
-            image: vello_cpu::ImageSource::Pixmap(pm),
-            sampler: peniko::ImageSampler::default().with_quality(peniko::ImageQuality::Medium),
-        });
-        ctx.set_paint_transform(Affine::translate((page.x0, page.y0)) * Affine::scale_non_uniform(sx, sy));
-        ctx.fill_rect(&rect);
-        ctx.reset_paint_transform();
-    }
-}
-
-const CMYK_N: usize = 17;
-
-/// The sRGB → working CMYK table for the current colour settings (17³, built once per settings,
-/// trilinear);
-/// sample it with [`cmyk_in`]. Fetch it once for many pixels.
-pub(crate) fn cmyk_table() -> std::sync::Arc<Vec<[f32; 4]>> {
-    const N: usize = CMYK_N;
-    type Lut = (designcraft_color::cms::ColorSettings, std::sync::Arc<Vec<[f32; 4]>>);
-    static LUT: std::sync::Mutex<Option<Lut>> = std::sync::Mutex::new(None);
-    let settings = designcraft_color::cms::active_settings();
-    let mut g = LUT.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
-    match g.as_ref() {
-        Some((s, t)) if *s == settings => t.clone(),
-        _ => {
-            let cms = designcraft_color::cms::active();
-            let step = |i: usize| i as f32 / (N - 1) as f32;
-            let t: Vec<[f32; 4]> = (0..N * N * N)
-                .map(|i| cms.srgb_to_cmyk([step(i / (N * N)), step(i / N % N), step(i % N)], designcraft_color::cms::Intent::RelativeColorimetric))
-                .collect();
-            let t = std::sync::Arc::new(t);
-            *g = Some((settings, t.clone()));
-            t
-        }
-    }
-}
-
-/// Trilinear lookup of `rgb` in a [`cmyk_table`].
-pub(crate) fn cmyk_in(table: &[[f32; 4]], rgb: [f32; 3]) -> [f32; 4] {
-    const N: usize = CMYK_N;
-    let f = rgb.map(|v| v.clamp(0.0, 1.0) * (N - 1) as f32);
-    let i = f.map(|v| (v as usize).min(N - 2));
-    let d = [f[0] - i[0] as f32, f[1] - i[1] as f32, f[2] - i[2] as f32];
-    let mut out = [0.0f32; 4];
-    for (corner, w) in (0..8).map(|c| {
-        let (a, b, cc) = (c >> 2 & 1, c >> 1 & 1, c & 1);
-        let w = (if a == 1 { d[0] } else { 1.0 - d[0] }) * (if b == 1 { d[1] } else { 1.0 - d[1] }) * (if cc == 1 { d[2] } else { 1.0 - d[2] });
-        ((i[0] + a) * N * N + (i[1] + b) * N + i[2] + cc, w)
-    }) {
-        if let Some(t) = table.get(corner) {
-            for k in 0..4 {
-                out[k] += t[k] * w;
-            }
-        }
-    }
-    out
-}
-
-/// An image's ink coverage on one process plate, as grey (cached per image and plate).
-fn plate_pixmap(pm: &std::sync::Arc<vello_cpu::Pixmap>, plate: u8) -> std::sync::Arc<vello_cpu::Pixmap> {
-    // Keep source allocations alive (their addresses are keys), invalidate on colour settings,
-    // and cap derived raster memory rather than merely counting differently sized images.
-    type Entry = (std::sync::Arc<vello_cpu::Pixmap>, std::sync::Arc<vello_cpu::Pixmap>);
-    type Cache = (designcraft_color::cms::ColorSettings, std::collections::HashMap<(usize, u8), Entry>, usize);
-    const BUDGET: usize = 64 << 20;
-    static CACHE: std::sync::Mutex<Option<Cache>> = std::sync::Mutex::new(None);
-    let key = (std::sync::Arc::as_ptr(pm) as usize, plate);
-    let settings = designcraft_color::cms::active_settings();
-    {
-        let mut guard = CACHE.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
-        if let Some((previous, map, _)) = guard.as_ref() {
-            if *previous == settings {
-                if let Some((_, derived)) = map.get(&key) {
-                    return derived.clone();
-                }
-            } else {
-                *guard = None;
-            }
-        }
-    }
-    let table = cmyk_table();
-    let data: Vec<vello_cpu::color::PremulRgba8> = pm
-        .data()
-        .iter()
-        .map(|p| {
-            if p.a == 0 {
-                return *p;
-            }
-            let k = 255.0 / p.a as f32;
-            let rgb = [p.r, p.g, p.b].map(|v| (v as f32 * k / 255.0).min(1.0));
-            let cmyk = cmyk_in(&table, rgb);
-            let ink = |i: usize| ((1.0 - cmyk[i].clamp(0.0, 1.0)) * p.a as f32).round() as u8;
-            if plate == 4 {
-                return vello_cpu::color::PremulRgba8 { r: ink(0), g: ink(1), b: ink(2), a: p.a };
-            }
-            let v = ink(plate.min(3) as usize);
-            vello_cpu::color::PremulRgba8 { r: v, g: v, b: v, a: p.a }
-        })
-        .collect();
-    let out = std::sync::Arc::new(vello_cpu::Pixmap::from_parts(data, pm.width(), pm.height()));
-    let bytes = (pm.width() as usize).saturating_mul(pm.height() as usize).saturating_mul(8);
-    if bytes <= BUDGET {
-        let mut guard = CACHE.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
-        let (previous, map, used) = guard.get_or_insert_with(|| (settings.clone(), Default::default(), 0));
-        if *previous != settings || used.saturating_add(bytes) > BUDGET {
-            map.clear();
-            *used = 0;
-            *previous = settings;
-        }
-        if map.insert(key, (pm.clone(), out.clone())).is_none() {
-            *used += bytes;
-        }
-    }
-    out
-}
-
-fn rect_overlaps(a: Rect, b: Rect) -> bool {
-    a.x0 < b.x1 && a.x1 > b.x0 && a.y0 < b.y1 && a.y1 > b.y0
-}
-
-thread_local! {
-    /// Object Layer Options of the placed PDF being drawn.
-    static HIDDEN_LAYERS: std::cell::RefCell<Vec<String>> = const { std::cell::RefCell::new(Vec::new()) };
-    /// Appearance of Black for the render on this thread: 100% K as pure black.
-    static RICH_BLACK: std::cell::Cell<bool> = const { std::cell::Cell::new(false) };
-    /// Separations Preview plate for the render on this thread.
-    static PLATE: std::cell::Cell<Option<u8>> = const { std::cell::Cell::new(None) };
-}
-
-/// Screen indicators and placeholders are display sRGB, independent of the document's RGB
-/// working profile. Encode their inks only while drawing a process plate or CMYK blend pass.
-pub(crate) fn screen_color(rgb: [u8; 3], alpha: u8) -> peniko::Color {
-    if PLATE.with(std::cell::Cell::get).is_none() {
-        return peniko::Color::from_rgba8(rgb[0], rgb[1], rgb[2], alpha);
-    }
-    let [c, m, y, k] = cmyk_in(&cmyk_table(), rgb.map(|v| v as f32 / 255.0));
-    color_of(&designcraft_color::Color::Cmyk { c, m, y, k }, alpha as f32 / 255.0)
-}
-
-pub fn color_of(c: &designcraft_color::Color, alpha: f32) -> peniko::Color {
-    if let Some(p) = PLATE.with(std::cell::Cell::get) {
-        let cmyk = match *c {
-            designcraft_color::Color::Cmyk { c, m, y, k } => [c, m, y, k],
-            _ => c.to_cmyk_managed(designcraft_color::cms::Intent::RelativeColorimetric),
-        };
-        let a = (alpha.clamp(0.0, 1.0) * 255.0).round() as u8;
-        let ink = |i: usize| ((1.0 - cmyk[i].clamp(0.0, 1.0)) * 255.0).round() as u8;
-        if p == 4 {
-            return peniko::Color::from_rgba8(ink(0), ink(1), ink(2), a);
-        }
-        let v = ink(p.min(3) as usize);
-        return peniko::Color::from_rgba8(v, v, v, a);
-    }
-    if RICH_BLACK.with(std::cell::Cell::get)
-        && let designcraft_color::Color::Cmyk { c: cc, m, y, k } = *c
-        && cc <= 1e-3
-        && m <= 1e-3
-        && y <= 1e-3
-        && k >= 0.999
-    {
-        return peniko::Color::from_rgba8(0, 0, 0, (alpha.clamp(0.0, 1.0) * 255.0).round() as u8);
-    }
-    let [r, g, b, a] = c.to_rgba8(alpha);
-    peniko::Color::from_rgba8(r, g, b, a)
-}
-
-/// Set a swatch fill (solid or gradient) as the paint. Returns false for [None]/unknown.
-fn set_fill_paint(ctx: &mut RenderContext, doc: &Document, fill: &designcraft_doc::Fill, bounds: Rect) -> bool {
-    let (swatch, tint) = (fill.swatch.as_str(), fill.tint);
-    if let Some(g) = designcraft_color::swatch::resolve_gradient(&doc.swatches, swatch) {
-        // Sampled so process colours blend as inks, as InDesign shows them (and as the PDF's CMYK
-        // shading prints).
-        let stops: Vec<peniko::ColorStop> = g.display_stops().iter().map(|(o, c, a)| peniko::ColorStop::from((*o, color_of(c, *a)))).collect();
-        if stops.is_empty() {
-            return false;
-        }
-        let grad = match g.kind {
-            // Radial: a circle stretched into the object's ellipse (the paint transform).
-            designcraft_color::GradientKind::Radial => {
-                let (c, rx, ry) = fill.radial_ellipse(bounds);
-                let rx = rx.max(1e-3);
-                ctx.set_paint_transform(Affine::translate(c.to_vec2()) * Affine::scale_non_uniform(1.0, ry / rx) * Affine::translate(-c.to_vec2()));
-                peniko::Gradient::new_radial(c, rx as f32).with_stops(stops.as_slice())
-            }
-            _ => {
-                let (a, b) = fill.linear_axis(bounds);
-                peniko::Gradient::new_linear(a, b).with_stops(stops.as_slice())
-            }
-        };
-        ctx.set_paint(grad);
-        return true;
-    }
-    match doc.resolve_color(swatch, tint) {
-        Some(c) => {
-            ctx.set_paint(color_of(&c, 1.0));
-            true
-        }
-        None => false,
-    }
-}
-
-/// Overprint Preview: does this paint overprint (its own flag, or 100% [Black], which
-/// overprints by default)? It's then multiplied over what's beneath.
-pub(crate) fn overprints(f: &Frame, swatch: &str, tint: f32, flag: bool) -> bool {
-    f.opts.overprint_preview && (flag || (f.doc.settings.overprint_black && swatch == designcraft_color::swatch::BLACK && tint >= 0.999))
-}
-
-/// Does any item on the spread, or on the parent pages it shows, use a blend mode other than
-/// Normal (groups and pasted-in items included)?
-fn spread_blends(doc: &Document, sp: &designcraft_doc::Spread) -> bool {
-    let blends = |it: &Item| {
-        let mut any = false;
-        it.walk(&mut |i| any |= i.blend != Default::default());
-        any
-    };
-    sp.items.iter().any(|i| blends(i)) || doc.parents.iter().any(|p| p.items.iter().any(|i| blends(i)))
-}
-
-pub fn blend_mode(b: DcBlend) -> BlendMode {
-    use DcBlend as B;
-    let mix = match b {
-        B::Normal => Mix::Normal,
-        B::Darken => Mix::Darken,
-        B::Multiply => Mix::Multiply,
-        B::ColorBurn => Mix::ColorBurn,
-        B::Lighten => Mix::Lighten,
-        B::Screen => Mix::Screen,
-        B::ColorDodge => Mix::ColorDodge,
-        B::Overlay => Mix::Overlay,
-        B::SoftLight => Mix::SoftLight,
-        B::HardLight => Mix::HardLight,
-        B::Difference => Mix::Difference,
-        B::Exclusion => Mix::Exclusion,
-        B::Hue => Mix::Hue,
-        B::Saturation => Mix::Saturation,
-        B::Color => Mix::Color,
-        B::Luminosity => Mix::Luminosity,
-    };
-    BlendMode::new(mix, Compose::SrcOver)
-}
-
-/// Decode encoded image bytes into a premultiplied pixmap.
-pub fn decode_pixmap(bytes: &[u8]) -> Option<Pixmap> {
-    decode_pixmap_page(bytes, 0)
-}
-
-/// [`decode_pixmap`] for page `page` of a PDF (other formats have one page).
-pub fn decode_pixmap_page(bytes: &[u8], page: u32) -> Option<Pixmap> {
-    // Documents retain the EPS source; only display its TIFF preview or placeholder.
-    let proxy = if designcraft_images::is_eps(bytes) { Some(designcraft_images::eps_proxy(bytes)?.0) } else { None };
-    let bytes = proxy.as_deref().unwrap_or(bytes);
-    if is_pdf(bytes) {
-        return render_pdf_page(bytes, page as usize, 3000);
-    }
-    if designcraft_images::is_svg(bytes) {
-        let (px, w, h) = designcraft_images::render_svg(bytes, 3000)?;
-        let data = px.as_chunks::<4>().0.iter().map(|p| vello_cpu::color::PremulRgba8 { r: p[0], g: p[1], b: p[2], a: p[3] }).collect();
-        return Some(Pixmap::from_parts(data, w.min(u16::MAX as u32) as u16, h.min(u16::MAX as u32) as u16));
-    }
-    let img = designcraft_images::decode_rgba(bytes)?;
-    let (w, h) = img.dimensions();
-    if w == 0 || h == 0 || w > u16::MAX as u32 || h > u16::MAX as u32 {
-        return None;
-    }
-    let data: Vec<vello_cpu::color::PremulRgba8> = img
-        .pixels()
-        .map(|p| {
-            let a = p[3] as u16;
-            let m = |c: u8| ((c as u16 * a + 127) / 255) as u8;
-            vello_cpu::color::PremulRgba8 { r: m(p[0]), g: m(p[1]), b: m(p[2]), a: p[3] }
-        })
-        .collect();
-    Some(Pixmap::from_parts(data, w as u16, h as u16))
-}
-
-/// Box-filter downsample by 2.
-fn halve(pm: &Pixmap) -> Pixmap {
-    let (w, h) = (pm.width() as usize, pm.height() as usize);
-    let (nw, nh) = ((w / 2).max(1), (h / 2).max(1));
-    let src = pm.data();
-    let mut out = Vec::with_capacity(nw * nh);
-    for y in 0..nh {
-        for x in 0..nw {
-            let mut acc = [0u32; 4];
-            for (dx, dy) in [(0, 0), (1, 0), (0, 1), (1, 1)] {
-                let sx = (2 * x + dx).min(w - 1);
-                let sy = (2 * y + dy).min(h - 1);
-                let p = src[sy * w + sx];
-                acc[0] += p.r as u32;
-                acc[1] += p.g as u32;
-                acc[2] += p.b as u32;
-                acc[3] += p.a as u32;
-            }
-            out.push(vello_cpu::color::PremulRgba8 { r: (acc[0] / 4) as u8, g: (acc[1] / 4) as u8, b: (acc[2] / 4) as u8, a: (acc[3] / 4) as u8 });
-        }
-    }
-    Pixmap::from_parts(out, nw as u16, nh as u16)
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn now() -> u64 {
-    use std::time::{SystemTime, UNIX_EPOCH};
-    SystemTime::now().duration_since(UNIX_EPOCH).map(|d| d.as_micros() as u64).unwrap_or(0)
-}
-#[cfg(target_arch = "wasm32")]
-fn now() -> u64 {
-    0
-}
-
-/// Pixel size of an encoded image without decoding it fully.
-pub fn image_size(bytes: &[u8]) -> Option<(u32, u32)> {
-    if designcraft_images::is_eps(bytes) {
-        return designcraft_images::eps_pixel_size(bytes);
-    }
-    if is_pdf(bytes) {
-        // Placed PDFs are sized by their page (crop box) in points.
-        return pdf_page_size(bytes, 0).map(|(w, h)| (w.round().max(1.0) as u32, h.round().max(1.0) as u32));
-    }
-    if designcraft_images::is_svg(bytes) {
-        // SVGs by their width and height (CSS pixels → points).
-        return designcraft_images::natural_size(bytes).map(|(w, h)| (w.round().max(1.0) as u32, h.round().max(1.0) as u32));
-    }
-    designcraft_images::pixel_size(bytes)
-}
-
-/// Natural size of a placed graphic, unrounded: a PDF page (crop box) and an SVG in points, a raster
-/// in pixels, an EPS its bounding box independently of preview pixels. Placed graphics are drawn at
-/// this size; `image_size` rounds it to whole pixels for display.
-pub fn natural_size(bytes: &[u8], page: usize) -> Option<(f64, f64)> {
-    if is_pdf(bytes) {
-        return pdf_page_size(bytes, page).map(|(w, h)| (w.max(1e-3), h.max(1e-3)));
-    }
-    designcraft_images::natural_size(bytes)
-}
-
-/// MIME type guess for encoded image bytes.
-/// Is this a PDF file (placed PDFs are graphics)?
-pub fn is_pdf(bytes: &[u8]) -> bool {
-    bytes.starts_with(b"%PDF")
-}
-
-/// Page count of a PDF.
-pub fn pdf_page_count(bytes: &[u8]) -> Option<usize> {
-    let pdf = craft_pdf::open_slice(bytes, None).ok()?;
-    Some(pdf.pages().len())
-}
-
-/// Size of PDF page `page` (0-based), in points, as it shows (crop box, rotation applied).
-pub fn pdf_page_size(bytes: &[u8], page: usize) -> Option<(f64, f64)> {
-    let pdf = craft_pdf::open_slice(bytes, None).ok()?;
-    let p = pdf.pages().get(page)?;
-    let (w, h) = p.render_dimensions();
-    Some((w as f64, h as f64))
-}
-
-/// A placed page could not be rasterized completely for export.
-#[derive(Debug, thiserror::Error)]
-pub enum PdfRasterError {
-    #[error("{0}")]
-    Input(#[source] craft_pdf::OpenError),
-    #[error("{0}")]
-    Render(#[from] craft_pdf::raster::Error),
-    #[error("the PDF page could not be read or rendered")]
-    InvalidPage,
-    #[error("PDF page {page} is unavailable; choose an existing page in Image Import Options or place the replacement PDF again")]
-    MissingPage { page: usize },
-    #[error("the selected PDF layers could not be hidden")]
-    LayerRewrite,
-    #[error("an image could not be decoded or exceeded the PDF renderer's resource limits; repair or replace this placed PDF before exporting again")]
-    ImageDecode,
-    #[error("the PDF renderer encountered an unsupported font")]
-    UnsupportedFont,
-    #[error(
-        "the PDF renderer could not read all page content or reached its resource limits; repair or replace this placed PDF before exporting again"
-    )]
-    ContentTruncated,
-}
-
-/// Reject oversized PDFs before placement, layer rewriting or output allocation.
-pub fn check_pdf_input_size(size: usize) -> Result<(), PdfRasterError> {
-    craft_pdf::check_input_size(size).map_err(PdfRasterError::Input)
-}
-
-/// PDF page `page` as PNG, its longer side about `max_side` pixels, with the `hidden` layers off.
-/// Only the `shown` part ([`designcraft_doc::Asset::shown_box`]) is kept when given.
-/// Returns `None` on the same failures as [`pdf_page_png_checked`].
-pub fn pdf_page_png(bytes: &[u8], page: usize, max_side: u32, hidden: &[String], shown: Option<[f64; 4]>) -> Option<Vec<u8>> {
-    pdf_page_png_checked(bytes, page, max_side, hidden, shown).ok()
-}
-
-/// Rasterize a placed page for export, preserving available interpreter diagnostics.
-/// This cannot detect backend approximations that do not emit an interpreter warning.
-pub fn pdf_page_png_checked(bytes: &[u8], page: usize, max_side: u32, hidden: &[String], shown: Option<[f64; 4]>) -> Result<Vec<u8>, PdfRasterError> {
-    check_pdf_input_size(bytes.len())?;
-    let data = if hidden.is_empty() {
-        std::borrow::Cow::Borrowed(bytes)
-    } else {
-        std::borrow::Cow::Owned(pdf_hide_layers(bytes, hidden).ok_or(PdfRasterError::LayerRewrite)?)
-    };
-    let raster = render_pdf_raster(&data, page, max_side)?;
-    if raster.diagnostics.image_decode_failed {
-        return Err(PdfRasterError::ImageDecode);
-    }
-    if raster.diagnostics.unsupported_font {
-        return Err(PdfRasterError::UnsupportedFont);
-    }
-    if raster.diagnostics.content_truncated {
-        return Err(PdfRasterError::ContentTruncated);
-    }
-    let pm = raster_pixmap(&raster);
-    let pm = match shown {
-        Some(frac) => crop_pixmap(&pm, frac).ok_or(PdfRasterError::InvalidPage)?,
-        None => pm,
-    };
-    let pixels = pm.data().iter().flat_map(|p| [p.r, p.g, p.b, p.a]).collect();
-    Ok(Rendered { width: u32::from(pm.width()), height: u32::from(pm.height()), pixels }.to_png())
-}
-
-/// Rasterize PDF page `page` so its longer side is about `max_side` pixels (screen display).
-/// Export callers that need failure diagnostics use [`pdf_page_png_checked`].
-pub fn render_pdf_page(bytes: &[u8], page: usize, max_side: u32) -> Option<Pixmap> {
-    #[cfg(test)]
-    PDF_RENDERS.with(|n| n.set(n.get() + 1));
-    let raster = render_pdf_raster(bytes, page, max_side).ok()?;
-    Some(raster_pixmap(&raster))
-}
-
-fn raster_pixmap(raster: &craft_pdf::raster::Raster) -> Pixmap {
-    let data = raster.bytes().as_chunks::<4>().0.iter().map(|c| vello_cpu::color::PremulRgba8 { r: c[0], g: c[1], b: c[2], a: c[3] }).collect();
-    Pixmap::from_parts(data, raster.width as u16, raster.height as u16)
-}
-
 #[cfg(test)]
-thread_local! {
-    /// How many PDF pages [`render_pdf_page`] rasterized on this thread.
-    static PDF_RENDERS: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
-}
-
-fn render_pdf_raster(bytes: &[u8], page: usize, max_side: u32) -> Result<craft_pdf::raster::Raster, PdfRasterError> {
-    let pdf = craft_pdf::open_slice(bytes, None).map_err(|e| match e {
-        craft_pdf::OpenError::Load(_) => PdfRasterError::InvalidPage,
-        other => PdfRasterError::Input(other),
-    })?;
-    let p = pdf.pages().get(page).ok_or(PdfRasterError::MissingPage { page: page.saturating_add(1) })?;
-    let (w, h) = p.render_dimensions();
-    let scale = (max_side as f32 / w.max(h).max(1.0)).min(8.0);
-    craft_pdf::raster::render(
-        p,
-        &craft_pdf::raster::RenderCache::new(),
-        &craft_pdf::interpret::InterpreterSettings::default(),
-        &craft_pdf::raster::Options { scale: [scale; 2], ..Default::default() },
-    )
-    .map_err(PdfRasterError::Render)
-}
-
-/// A page box of a PDF page (`crop`, `trim`, `bleed`, `art`, `media`) as (x, y, w, h) in points
-/// from the top-left of the page as rendered (its visible crop box); missing boxes fall back to the
-/// crop box, as PDF readers do.
-pub fn pdf_page_box(bytes: &[u8], page: usize, kind: &str) -> Option<(f64, f64, f64, f64)> {
-    use craft_pdf::syntax::object::{Rect as PRect, dict::keys};
-    let pdf = craft_pdf::open_slice(bytes, None).ok()?;
-    let p = pdf.pages().get(page)?;
-    let visible = p.intersected_crop_box();
-    let page_box = match kind {
-        "media" => p.media_box(),
-        "trim" | "bleed" | "art" => {
-            let key: &[u8] = match kind {
-                "trim" => keys::TRIM_BOX,
-                "bleed" => keys::BLEED_BOX,
-                _ => keys::ART_BOX,
-            };
-            p.raw().get::<PRect>(key).map(|b| b.intersect(p.media_box())).unwrap_or(visible)
-        }
-        _ => visible,
-    };
-    let transform = Affine::new(p.initial_transform(true).as_coeffs());
-    let b = transform.transform_rect_bbox(Rect::new(page_box.x0, page_box.y0, page_box.x1, page_box.y1));
-    b.is_finite().then_some((b.x0, b.y0, b.width(), b.height()))
-}
-
-/// The part of PDF page `page` that `crop` shows: its left, top, right and bottom edges as
-/// fractions of the page as rendered (its visible crop box, rotated as it displays), and its size
-/// in points. A box the page doesn't define is its crop box, as PDF readers do. The content boxes
-/// are the bounds of what the page draws, found from its drawing operations without rendering it
-/// (the whole page when it draws nothing).
-pub fn pdf_crop_box(bytes: &[u8], page: usize, crop: designcraft_doc::PdfCrop) -> Option<([f64; 4], (f64, f64))> {
-    use craft_pdf::syntax::object::{Rect as PRect, dict::keys};
-    use designcraft_doc::PdfCrop;
-    const WHOLE: [f64; 4] = [0.0, 0.0, 1.0, 1.0];
-    let pdf = craft_pdf::open_slice(bytes, None).ok()?;
-    let p = pdf.pages().get(page)?;
-    let (w, h) = p.render_dimensions();
-    let (w, h) = (f64::from(w), f64::from(h));
-    if !(w > 0.0 && h > 0.0) {
-        return None;
-    }
-    let frac = match crop {
-        PdfCrop::Crop => WHOLE,
-        PdfCrop::ContentVisible => pdf_bounds::page_content_bounds(bytes, page).unwrap_or(WHOLE),
-        PdfCrop::ContentAll => {
-            if pdf_layers::has_optional_content(&pdf) {
-                // If all-on rewriting is unsupported, a visible-only box could cut
-                // off hidden content. Keep the entire page conservatively instead.
-                pdf_hide_layers(bytes, &[]).and_then(|all_on| pdf_bounds::page_content_bounds(&all_on, page)).unwrap_or(WHOLE)
-            } else {
-                pdf_bounds::page_content_bounds(bytes, page).unwrap_or(WHOLE)
-            }
-        }
-        PdfCrop::Art | PdfCrop::Trim | PdfCrop::Bleed | PdfCrop::Media => {
-            let media = p.media_box();
-            let b = match crop {
-                PdfCrop::Media => media,
-                _ => {
-                    let key: &[u8] = match crop {
-                        PdfCrop::Trim => keys::TRIM_BOX,
-                        PdfCrop::Bleed => keys::BLEED_BOX,
-                        _ => keys::ART_BOX,
-                    };
-                    p.raw().get::<PRect>(key).map(|b| b.intersect(media)).unwrap_or_else(|| p.intersected_crop_box())
-                }
-            };
-            // Into rendered page space (y down, rotated, origin at the crop box).
-            let r = Affine::new(p.initial_transform(true).as_coeffs()).transform_rect_bbox(Rect::new(b.x0, b.y0, b.x1, b.y1));
-            [r.x0 / w, r.y0 / h, r.x1 / w, r.y1 / h]
-        }
-    };
-    let size = ((frac[2] - frac[0]) * w, (frac[3] - frac[1]) * h);
-    (frac.iter().all(|v| v.is_finite()) && size.0 > 0.0 && size.1 > 0.0).then_some((frac, size))
-}
-
-/// The part of the page a placed PDF shows ([`designcraft_doc::Asset::shown_box`]). A Bounding
-/// Box crop that import left unmeasured is measured here, once per file, page and crop: that
-/// interprets the page's drawing, which only drawing or exporting the graphic needs.
-pub fn shown_box(asset: &designcraft_doc::Asset) -> Option<[f64; 4]> {
-    if !asset.content_box_pending() {
-        return asset.shown_box();
-    }
-    asset.shown(content_box(&asset.data, asset.page, asset.pdf_crop)?)
-}
-
-type ContentBoxes = HashMap<(usize, u32, designcraft_doc::PdfCrop), (std::sync::Weak<Vec<u8>>, Option<[f64; 4]>)>;
-
-/// [`pdf_crop_box`]'s box, cached by the file's allocation. The weak reference keeps that address
-/// from naming another file while the entry lives.
-fn content_box(bytes: &Arc<Vec<u8>>, page: u32, crop: designcraft_doc::PdfCrop) -> Option<[f64; 4]> {
-    static CACHE: std::sync::Mutex<Option<ContentBoxes>> = std::sync::Mutex::new(None);
-    let key = (Arc::as_ptr(bytes) as usize, page, crop);
-    let cached = CACHE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(|c| c.get(&key)).and_then(|(file, b)| {
-        let same = file.upgrade().is_some_and(|f| Arc::ptr_eq(&f, bytes));
-        same.then_some(*b)
-    });
-    if let Some(b) = cached {
-        return b;
-    }
-    // Render outside the lock: other graphics keep drawing meanwhile.
-    let b = pdf_crop_box(bytes, page as usize, crop).map(|(frac, _)| frac);
-    let mut cache = CACHE.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
-    let cache = cache.get_or_insert_with(HashMap::new);
-    cache.retain(|_, (file, _)| file.strong_count() > 0);
-    cache.insert(key, (Arc::downgrade(bytes), b));
-    b
-}
-
-/// The part of `pm` inside `frac` (left, top, right, bottom as fractions of it); what lies outside
-/// `pm` is transparent.
-pub fn crop_pixmap(pm: &Pixmap, frac: [f64; 4]) -> Option<Pixmap> {
-    let (pw, ph) = (f64::from(pm.width()), f64::from(pm.height()));
-    let [l, t, r, b] = [frac[0] * pw, frac[1] * ph, frac[2] * pw, frac[3] * ph].map(f64::round);
-    let (w, h) = (r - l, b - t);
-    if !(w >= 1.0 && h >= 1.0 && w <= f64::from(u16::MAX) && h <= f64::from(u16::MAX)) {
-        return None;
-    }
-    let (w, h) = (w as u16, h as u16);
-    let mut out = Pixmap::new(w, h);
-    let src = pm.data();
-    let dst = out.data_mut();
-    for y in 0..usize::from(h) {
-        let sy = y as f64 + t;
-        if sy < 0.0 || sy >= ph {
-            continue;
-        }
-        for x in 0..usize::from(w) {
-            let sx = x as f64 + l;
-            if sx < 0.0 || sx >= pw {
-                continue;
-            }
-            let (Some(p), Some(q)) = (src.get(sy as usize * usize::from(pm.width()) + sx as usize), dst.get_mut(y * usize::from(w) + x)) else {
-                continue;
-            };
-            *q = *p;
-        }
-    }
-    Some(out)
-}
-
-/// Separations Preview on a rendered image: `plate` 0–3 shows that process plate (C, M, Y, K) as
-/// ink density in grey; with an `ink_limit` (0–4, total ink) areas over it are shown in red.
-/// Pixels are separated with a plain GCR (black = 1 − max(r, g, b)), so it's a preview.
-/// View › Proof Colors: simulate the proof target (a press, another RGB space, colour-vision
-/// deficiencies) through the active colour settings' proof table.
-pub fn proof_view(img: &mut Rendered, setup: &designcraft_color::cms::ProofSetup) {
-    let lut = designcraft_color::cms::active().proof_lut(setup);
-    for px in img.pixels.as_chunks_mut::<4>().0 {
-        let a = px[3];
-        if a == 0 {
-            continue;
-        }
-        // Premultiplied → straight, proof, back.
-        let k = 255.0 / a as f32;
-        let rgb = [px[0], px[1], px[2]].map(|v| ((v as f32 * k).round()).min(255.0) as u8);
-        let out = lut.apply8(rgb);
-        for i in 0..3 {
-            px[i] = ((out[i] as u32 * a as u32 + 127) / 255) as u8;
-        }
-    }
-}
-
-/// A CMYK transparency blend space on screen: the pixels of `area` (device space) through the
-/// working CMYK profile and back, as a spread composited in that space looks.
-fn blend_space_view(img: &mut Rendered, area: Rect) {
-    use designcraft_color::cms::{ProofSetup, ProofTarget};
-    let lut = designcraft_color::cms::active().proof_lut(&ProofSetup { target: ProofTarget::WorkingCmyk, ..Default::default() });
-    let (w, h) = (img.width as i64, img.height as i64);
-    let (x0, y0) = ((area.x0.floor() as i64).clamp(0, w), (area.y0.floor() as i64).clamp(0, h));
-    let (x1, y1) = ((area.x1.ceil() as i64).clamp(0, w), (area.y1.ceil() as i64).clamp(0, h));
-    for y in y0..y1 {
-        let row = &mut img.pixels[((y * w + x0) * 4) as usize..((y * w + x1) * 4) as usize];
-        for px in row.as_chunks_mut::<4>().0 {
-            let a = px[3];
-            if a == 0 {
-                continue;
-            }
-            let k = 255.0 / a as f32;
-            let rgb = [px[0], px[1], px[2]].map(|v| ((v as f32 * k).round()).min(255.0) as u8);
-            let out = lut.apply8(rgb);
-            for i in 0..3 {
-                px[i] = ((out[i] as u32 * a as u32 + 127) / 255) as u8;
-            }
-        }
-    }
-}
-
-pub fn separation_view(img: &mut Rendered, plate: Option<u8>, ink_limit: Option<f32>) {
-    for px in img.pixels.as_chunks_mut::<4>().0 {
-        let a = px[3] as f32 / 255.0;
-        // Composite over paper white, then separate.
-        let ch = |v: u8| (v as f32 / 255.0) + (1.0 - a);
-        let (r, g, b) = (ch(px[0]).min(1.0), ch(px[1]).min(1.0), ch(px[2]).min(1.0));
-        let k = 1.0 - r.max(g).max(b);
-        let inks =
-            if k >= 0.999 { [0.0, 0.0, 0.0, 1.0] } else { [(1.0 - r - k) / (1.0 - k), (1.0 - g - k) / (1.0 - k), (1.0 - b - k) / (1.0 - k), k] };
-        let mut out = match plate {
-            Some(p) => {
-                let v = ((1.0 - inks[p.min(3) as usize].clamp(0.0, 1.0)) * 255.0).round() as u8;
-                [v, v, v, 255]
-            }
-            None => [(r * 255.0) as u8, (g * 255.0) as u8, (b * 255.0) as u8, 255],
-        };
-        if let Some(limit) = ink_limit
-            && inks.iter().sum::<f32>() > limit
-        {
-            out = [230, 40, 40, 255];
-        }
-        px.copy_from_slice(&out);
-    }
-}
-
-pub fn image_mime(bytes: &[u8]) -> &'static str {
-    designcraft_images::mime(bytes)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use designcraft_doc::build::NewDocument;
-    use designcraft_doc::{Fill, ParaFormat};
-
-    #[test]
-    fn eps_source_decodes_like_its_preview() {
-        let source = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n%%EOF\n";
-        let mut tiff = Vec::new();
-        image::DynamicImage::ImageRgba8(image::RgbaImage::from_pixel(3, 2, image::Rgba([255, 0, 0, 128])))
-            .write_to(&mut std::io::Cursor::new(&mut tiff), image::ImageFormat::Tiff)
-            .unwrap();
-        let mut dos = vec![0xC5, 0xD0, 0xD3, 0xC6];
-        for value in [30usize, source.len(), 0, 0, 30 + source.len(), tiff.len()] {
-            dos.extend((value as u32).to_le_bytes());
-        }
-        dos.extend([0xFF, 0xFF]);
-        dos.extend_from_slice(source);
-        dos.extend_from_slice(&tiff);
-        for source in [source.as_slice(), dos.as_slice()] {
-            let proxy = designcraft_images::eps_proxy(source).unwrap().0;
-            let actual = decode_pixmap(source).unwrap();
-            let expected = decode_pixmap(&proxy).unwrap();
-            assert_eq!((actual.width(), actual.height()), (expected.width(), expected.height()));
-            assert_eq!(actual.data(), expected.data());
-            assert_eq!(image_size(source), image_size(&proxy));
-            assert_eq!(image_mime(source), "application/postscript");
-        }
-        let corrupt = b"%!PS-Adobe-3.0 EPSF-3.0\nno bounding box\n";
-        assert!(decode_pixmap(corrupt).is_none());
-        assert!(image_size(corrupt).is_none());
-    }
-
-    #[test]
-    fn footnote_vector_objects_are_painted() {
-        use designcraft_doc::{AnchorPosition, AnchoredObject, ItemId, Shape, SpreadRef};
-        let mut d = Document::new(&NewDocument::default());
-        let (_, sid) =
-            d.add_text_frame(SpreadRef::Doc(0), Rect::new(20.0, 20.0, 300.0, 300.0), d.default_layer(), "Body", ParaFormat::default()).unwrap();
-        let mut item =
-            Item::new(ItemId(d.alloc()), d.default_layer(), Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(0.0, 0.0, 12.0, 12.0)));
-        item.fill = Fill::swatch(designcraft_color::swatch::BLACK);
-        // Open contours with a fill are implicitly closed for painting. A single
-        // open contour must not hide the whole compound glyph.
-        item.path.subpaths[0].closed = false;
-        let story = d.story_mut(sid).unwrap();
-        story.insert_note(4, "", ParaFormat::default());
-        Arc::make_mut(&mut story.notes[0]).text.insert_object(0, AnchoredObject::new(item, AnchorPosition::Inline { y_offset: 0.0 }));
-        let cache = Cache::new();
-        let cs = cache.get(&d, sid, None);
-        let note = &cs.frames[0].notes[0];
-        let object = &note.text.frames[0].objects[0];
-        let centre = note.origin + object.origin.to_vec2() + designcraft_geom::Vec2::new(6.0, 6.0);
-        let image = Renderer::new().render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
-        let pixel = image.pixel(centre.x as u32, centre.y as u32);
-        assert!(pixel[0] < 80 && pixel[1] < 80 && pixel[2] < 80, "{pixel:?}");
-    }
-
-    /// `Rendered` has public fields: a buffer that doesn't match the stated size used to panic
-    /// in `to_png`.
-    /// A canvas 65535 pixels wide (any render wider than that was clamped to it) panicked inside
-    /// vello_cpu when it snapped the width up to its tiles; a huge page export now declines.
-    #[test]
-    fn very_wide_renders_do_not_panic() {
-        let doc = Document::new(&NewDocument::default());
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        let img = r.render(&doc, &cache, &[], 70_000, 4, Affine::IDENTITY, &RenderOptions::default());
-        assert_eq!(img.width, MAX_SIDE);
-        let page = [Placed { spread: SpreadRef::Doc(0), xf: Affine::IDENTITY }];
-        let opts = RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
-        let img = r.render(&doc, &cache, &page, 70_000, 64, Affine::scale(120.0), &opts);
-        assert_eq!(img.width, MAX_SIDE);
-        assert!(r.render_page(&doc, &cache, 0, 500.0, true, &RenderOptions::default()).is_none());
-    }
-
-    #[test]
-    fn to_png_survives_a_mismatched_buffer() {
-        let short = Rendered { width: 4, height: 4, pixels: vec![255; 10] };
-        let png = short.to_png();
-        assert_eq!(image::load_from_memory(&png).map(|i| (i.width(), i.height())).ok(), Some((4, 4)));
-        assert!(Rendered { width: 0, height: 0, pixels: vec![] }.to_png().len() < 1024);
-    }
-
-    #[test]
-    fn proof_view_simulates_the_target() {
-        use designcraft_color::cms::{ProofSetup, ProofTarget};
-        let red = |a: u8| Rendered { width: 1, height: 1, pixels: vec![a, 0, 0, a] };
-        let mut img = red(255);
-        proof_view(&mut img, &ProofSetup { target: ProofTarget::Protanopia, ..Default::default() });
-        assert!(img.pixels[1] > 40, "protanopia turns pure red olive: {:?}", img.pixels);
-        let mut img = red(255);
-        proof_view(&mut img, &ProofSetup { target: ProofTarget::MonitorRgb, ..Default::default() });
-        assert!(img.pixels[0] > 245 && img.pixels[1] < 10, "monitor RGB is no simulation: {:?}", img.pixels);
-        // Transparent pixels stay transparent; premultiplication is kept.
-        let mut img = Rendered { width: 2, height: 1, pixels: vec![0, 0, 0, 0, 100, 0, 0, 128] };
-        proof_view(&mut img, &ProofSetup { target: ProofTarget::WorkingCmyk, ..Default::default() });
-        assert_eq!(&img.pixels[..4], &[0, 0, 0, 0]);
-        assert!(img.pixels[4] <= 128 && img.pixels[7] == 128);
-    }
-
-    #[test]
-    fn renders_page_with_text_and_fill() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let (fid, _) =
-            d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 576.0, 300.0), lid, "Hello DesignCraft", ParaFormat::default()).unwrap();
-        let id = designcraft_doc::ItemId(d.alloc());
-        let mut box_ =
-            Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(36.0, 400.0, 136.0, 500.0)));
-        box_.fill = Fill::swatch("C=100 M=0 Y=0 K=0");
-        d.insert_item(SpreadRef::Doc(0), box_, None).unwrap();
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
-        assert_eq!((img.width, img.height), (612, 792));
-        // Paper is white, the box is cyan-ish, text drew some dark pixels.
-        assert_eq!(img.pixel(300, 700), [255, 255, 255, 255]);
-        let c = img.pixel(80, 450);
-        assert!(c[0] < 80 && c[2] > 150, "{c:?}");
-        let dark = (36..300).flat_map(|x| (36..60).map(move |y| (x, y))).filter(|&(x, y)| img.pixel(x, y)[0] < 100).count();
-        assert!(dark > 50, "text pixels: {dark}");
-        let _ = fid;
-        assert!(r.stats.glyphs >= 15);
-    }
-
-    /// An inside-aligned stroke is the stroke of the path inset by half its weight: a band from the
-    /// edge inwards, its rounded corners concentric with the frame's.
-    #[test]
-    fn inside_strokes_are_inset_by_half_the_weight() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let id = designcraft_doc::ItemId(d.alloc());
-        let mut it =
-            Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 300.0, 300.0)));
-        it.stroke = designcraft_doc::Stroke {
-            swatch: designcraft_color::swatch::BLACK.into(),
-            weight: 10.0,
-            align: designcraft_doc::StrokeAlign::Inside,
-            ..Default::default()
-        };
-        it.corners = designcraft_geom::corners::CornerOptions::uniform(designcraft_geom::corners::CornerShape::Rounded, 20.0);
-        d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
-        let ink = |x: u32, y: u32| img.pixel(x, y)[0] < 64;
-        let paper = |x: u32, y: u32| img.pixel(x, y)[0] > 192;
-        // Straight edges: ink from the edge to 10 pt inside, nothing outside.
-        assert!(paper(97, 200) && ink(101, 200) && ink(108, 200) && paper(112, 200));
-        assert!(ink(298, 200) && paper(302, 200) && paper(288, 200));
-        // Rounded corner centred at (120, 120): ink between radii 10 and 20, paper outside the arc
-        // and inside the band.
-        assert!(paper(103, 103) && ink(108, 108) && paper(114, 114));
-    }
-
-    #[test]
-    fn arrowheads_draw_at_line_ends() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let id = designcraft_doc::ItemId(d.alloc());
-        let path = designcraft_geom::shapes::line(designcraft_geom::Point::new(100.0, 400.0), designcraft_geom::Point::new(400.0, 400.0));
-        let mut line = Item::new(id, lid, designcraft_doc::Shape::GraphicLine, path);
-        line.stroke = designcraft_doc::Stroke {
-            swatch: designcraft_color::swatch::BLACK.into(),
-            weight: 2.0,
-            end: designcraft_doc::Arrowhead::TriangleWide,
-            ..Default::default()
-        };
-        d.insert_item(SpreadRef::Doc(0), line, None).unwrap();
-        // A dashed line with a gap colour: the gaps are painted.
-        let id = designcraft_doc::ItemId(d.alloc());
-        let path = designcraft_geom::shapes::line(designcraft_geom::Point::new(100.0, 500.0), designcraft_geom::Point::new(400.0, 500.0));
-        let mut dashed = Item::new(id, lid, designcraft_doc::Shape::GraphicLine, path);
-        dashed.stroke = designcraft_doc::Stroke {
-            swatch: designcraft_color::swatch::BLACK.into(),
-            weight: 4.0,
-            kind: designcraft_doc::StrokeType::Dashed { pattern: vec![12.0, 4.0] },
-            gap_swatch: "C=100 M=0 Y=0 K=0".into(),
-            ..Default::default()
-        };
-        d.insert_item(SpreadRef::Doc(0), dashed, None).unwrap();
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
-        // The head is 6.4 × weight wide: ink 4 pt above the line near the tip, none at the start.
-        assert!(img.pixel(393, 396)[0] < 128, "{:?}", img.pixel(393, 396));
-        assert_eq!(img.pixel(105, 396), [255, 255, 255, 255]);
-        // Nothing past the tip.
-        assert_eq!(img.pixel(403, 400), [255, 255, 255, 255]);
-        let (dash, gap) = (img.pixel(106, 500), img.pixel(114, 500));
-        assert!(dash[0] < 80 && dash[2] < 80, "dash {dash:?}");
-        assert!(gap[0] < 80 && gap[2] > 150, "gap {gap:?}");
-    }
-
-    #[test]
-    fn overprint_preview_mixes_inks() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        for (sw, op) in [("C=0 M=0 Y=100 K=0", false), ("C=0 M=100 Y=0 K=0", true)] {
-            let id = designcraft_doc::ItemId(d.alloc());
-            let mut it =
-                Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
-            it.fill = Fill { overprint: op, ..Fill::swatch(sw) };
-            d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
-        }
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let px = |on: bool, r: &mut Renderer| {
-            r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions { overprint_preview: on, ..Default::default() }).unwrap().pixel(150, 150)
-        };
-        let off = px(false, &mut r);
-        let on = px(true, &mut r);
-        assert!(off[2] > 100, "magenta knocks out: {off:?}");
-        assert!(on[2] < 60 && on[0] > 180, "magenta over yellow → red: {on:?}");
-    }
-
-    #[test]
-    fn cmyk_blend_space_shows_transparent_spreads_in_cmyk() {
-        let mut d = Document::new(&NewDocument::default());
-        d.swatches.push(designcraft_color::swatch::Swatch::color("Green", designcraft_color::Color::rgb8(0, 255, 0)));
-        let lid = d.default_layer();
-        let id = designcraft_doc::ItemId(d.alloc());
-        let mut it =
-            Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
-        it.fill = Fill::swatch("Green");
-        d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let px = |d: &Document, r: &mut Renderer| {
-            r.render_page(d, &cache, 0, 1.0, false, &RenderOptions { blend_space_view: true, ..Default::default() }).unwrap().pixel(150, 150)
-        };
-        // No transparency on the spread: shown as is.
-        assert_eq!(px(&d, &mut r)[1], 255);
-        // With transparency in a CMYK blend space the bright green leaves the RGB gamut's edge.
-        d.item_mut(id).unwrap().opacity = 0.99;
-        let cmyk = px(&d, &mut r);
-        assert!(cmyk[0] > 20 || cmyk[1] < 240, "{cmyk:?}");
-        d.settings.blend_space = designcraft_doc::BlendSpace::Rgb;
-        let rgb = px(&d, &mut r);
-        assert!(rgb[1] > 245 && rgb[0] < 10, "{rgb:?}");
-    }
-
-    #[test]
-    fn blend_modes_blend_in_cmyk_on_screen_in_a_cmyk_blend_space() {
-        // A lilac (RGB) rectangle, and a 100% K one over its lower half and the paper below it,
-        // in Color Dodge: in CMYK the black clears the lilac's inks (white), over the paper it
-        // shows as it is; in RGB, dodging with black changes nothing.
-        let mut d = Document::new(&NewDocument::default());
-        d.swatches.push(designcraft_color::swatch::Swatch::color("Lilac", designcraft_color::Color::rgb8(171, 154, 227)));
-        let lid = d.default_layer();
-        let rect = |d: &mut Document, r: Rect, fill: &str| {
-            let id = designcraft_doc::ItemId(d.alloc());
-            let mut it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
-            it.fill = Fill::swatch(fill);
-            d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
-            id
-        };
-        rect(&mut d, Rect::new(100.0, 100.0, 300.0, 200.0), "Lilac");
-        let black = rect(&mut d, Rect::new(150.0, 150.0, 250.0, 250.0), designcraft_color::swatch::BLACK);
-        d.item_mut(black).unwrap().blend = DcBlend::ColorDodge;
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let px = |d: &Document, r: &mut Renderer, x: u32, y: u32| {
-            r.render_page(d, &cache, 0, 1.0, false, &RenderOptions { blend_space_view: true, ..Default::default() }).unwrap().pixel(x, y)
-        };
-        let over_lilac = px(&d, &mut r, 200, 175);
-        assert!(over_lilac[..3].iter().all(|v| *v > 235), "dodged to white: {over_lilac:?}");
-        let over_paper = px(&d, &mut r, 200, 225);
-        assert!(over_paper[..3].iter().all(|v| *v < 90), "black as it is: {over_paper:?}");
-        let lilac = px(&d, &mut r, 120, 150);
-        assert!(lilac[2] > lilac[1] + 25, "the lilac beside it: {lilac:?}");
-        // Inside a group, the group's blend mode.
-        let g = designcraft_doc::ItemId(d.alloc());
-        let it = d.remove_item(black).unwrap();
-        let mut grp = Item::new(g, lid, designcraft_doc::Shape::Group, Default::default());
-        let mut inner = (*it).clone();
-        inner.blend = DcBlend::Normal;
-        grp.content = Content::Group { items: vec![Arc::new(inner)] };
-        grp.blend = DcBlend::ColorDodge;
-        d.insert_item(SpreadRef::Doc(0), grp, None).unwrap();
-        let grouped = px(&d, &mut r, 200, 175);
-        assert!(grouped[..3].iter().all(|v| *v > 235), "{grouped:?}");
-        // An RGB blend space: still lilac under the black (lightened a little: [Black] shows as a
-        // dark grey in RGB).
-        d.settings.blend_space = designcraft_doc::BlendSpace::Rgb;
-        let rgb = px(&d, &mut r, 200, 175);
-        assert!(rgb[2] > rgb[1] + 25 && rgb[1] < 220, "{rgb:?}");
-    }
-
-    #[test]
-    fn knockout_group_hides_its_own_objects() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let mut kids = Vec::new();
-        for (sw, x) in [("C=0 M=0 Y=100 K=0", 100.0), ("C=0 M=100 Y=0 K=0", 150.0)] {
-            let id = designcraft_doc::ItemId(d.alloc());
-            let mut it =
-                Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(x, 100.0, x + 100.0, 200.0)));
-            it.fill = Fill::swatch(sw);
-            it.opacity = 0.5;
-            kids.push(std::sync::Arc::new(it));
-        }
-        let gid = designcraft_doc::ItemId(d.alloc());
-        let mut g = Item::new(gid, lid, designcraft_doc::Shape::Group, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 250.0, 200.0)));
-        g.content = designcraft_doc::Content::Group { items: kids };
-        d.insert_item(SpreadRef::Doc(0), g, None).unwrap();
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let overlap = |d: &Document, r: &mut Renderer| r.render_page(d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap().pixel(175, 150);
-        let plain = overlap(&d, &mut r);
-        d.item_mut(gid).unwrap().knockout = true;
-        let ko = overlap(&d, &mut r);
-        let magenta_only = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap().pixel(225, 150);
-        assert_ne!(plain, ko, "{plain:?} {ko:?}");
-        for c in 0..3 {
-            assert!((ko[c] as i32 - magenta_only[c] as i32).abs() <= 3, "the overlap shows magenta alone: {ko:?} vs {magenta_only:?}");
-        }
-    }
-
-    #[test]
-    fn separations_split_plates_and_flag_ink_limits() {
-        // Pure cyan (0, 255, 255) and rich black-ish (20, 20, 20).
-        let mut img = Rendered { width: 2, height: 1, pixels: vec![0, 255, 255, 255, 20, 20, 20, 255] };
-        let mut c = img.clone();
-        separation_view(&mut c, Some(0), None);
-        assert_eq!(c.pixel(0, 0)[0], 0, "cyan plate solid under cyan");
-        let mut m = img.clone();
-        separation_view(&mut m, Some(1), None);
-        assert_eq!(m.pixel(0, 0)[0], 255, "no magenta");
-        separation_view(&mut img, None, Some(0.5));
-        assert_eq!(img.pixel(0, 0), [230, 40, 40, 255], "100% over a 50% limit");
-    }
-
-    #[test]
-    fn black_overprints_only_with_the_preference() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        for (sw, r) in
-            [("C=100 M=0 Y=0 K=0", Rect::new(100.0, 100.0, 200.0, 200.0)), (designcraft_color::swatch::BLACK, Rect::new(150.0, 100.0, 250.0, 200.0))]
-        {
-            let id = designcraft_doc::ItemId(d.alloc());
-            let mut it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
-            it.fill = Fill::swatch(sw);
-            d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
-        }
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let o = RenderOptions { overprint_preview: true, ..Default::default() };
-        let on = r.render_page(&d, &cache, 0, 1.0, false, &o).unwrap().pixel(175, 150);
-        let alone = r.render_page(&d, &cache, 0, 1.0, false, &o).unwrap().pixel(225, 150);
-        d.settings.overprint_black = false;
-        let off = r.render_page(&d, &cache, 0, 1.0, false, &o).unwrap().pixel(175, 150);
-        assert_eq!(off, alone, "knocks out: black alone");
-        assert_ne!(on, alone, "overprints: the cyan shows through");
-    }
-
-    #[test]
-    fn appearance_of_black_on_screen() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let id = designcraft_doc::ItemId(d.alloc());
-        let mut it =
-            Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
-        it.fill = Fill::swatch(designcraft_color::swatch::BLACK);
-        d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let px = |rich: bool, r: &mut Renderer| {
-            r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions { rich_black: rich, ..Default::default() }).unwrap().pixel(150, 150)
-        };
-        assert!(px(false, &mut r)[0] > 20, "accurate: a dark grey");
-        assert_eq!(px(true, &mut r)[..3], [0, 0, 0]);
-    }
-
-    #[test]
-    fn display_performance_fast_draws_grey_boxes() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        // A 4×4 red PNG placed at 100,100 (100×100 pt).
-        let mut png = Vec::new();
-        image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255]))
-            .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png)
-            .unwrap();
-        let aid = designcraft_doc::AssetId(d.alloc());
-        d.assets.insert(
-            aid,
-            Arc::new(designcraft_doc::Asset {
-                id: aid,
-                name: "red.png".into(),
-                mime: "image/png".into(),
-                data: Arc::new(png),
-                pixels: Some((4, 4)),
-                ..Default::default()
-            }),
-        );
-        let id = designcraft_doc::ItemId(d.alloc());
-        let mut it =
-            Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
-        it.content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
-            asset: aid,
-            size: (100.0, 100.0),
-            xf: Affine::translate((100.0, 100.0)),
-            clip: None,
-            auto_fit: Default::default(),
-            fit_align: 4,
-            crop: [0.0; 4],
-            wrap: Default::default(),
-            fill: Default::default(),
-        });
-        d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let px = |q: DisplayQuality, r: &mut Renderer| {
-            r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions { quality: q, ..Default::default() }).unwrap().pixel(150, 150)
-        };
-        assert_eq!(px(DisplayQuality::High, &mut r)[..3], [255, 0, 0]);
-        assert_eq!(px(DisplayQuality::Typical, &mut r)[..3], [255, 0, 0]);
-        assert_eq!(px(DisplayQuality::Fast, &mut r)[..3], [178, 178, 178]);
-    }
-
-    #[test]
-    fn clipping_path_hides_the_image_outside_it() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let mut png = Vec::new();
-        image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255]))
-            .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png)
-            .unwrap();
-        let aid = designcraft_doc::AssetId(d.alloc());
-        d.assets.insert(
-            aid,
-            Arc::new(designcraft_doc::Asset {
-                page: 0,
-                id: aid,
-                name: "red.png".into(),
-                mime: "image/png".into(),
-                link: None,
-                data: Arc::new(png),
-                pixels: Some((4, 4)),
-                ..Default::default()
-            }),
-        );
-        // A 100 pt image at 100,100 clipped by a triangle with its apex at the top middle.
-        let triangle = designcraft_geom::PathData::single(designcraft_geom::path::SubPath::polyline(
-            &[designcraft_geom::Point::new(0.0, 100.0), designcraft_geom::Point::new(50.0, 0.0), designcraft_geom::Point::new(100.0, 100.0)],
-            true,
-        ));
-        let mut clip = designcraft_doc::ClippingPath::new(designcraft_doc::ClippingKind::PhotoshopPath, triangle);
-        let id = designcraft_doc::ItemId(d.alloc());
-        let mut it =
-            Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
-        it.content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
-            asset: aid,
-            size: (100.0, 100.0),
-            xf: Affine::translate((100.0, 100.0)),
-            auto_fit: Default::default(),
-            fit_align: 4,
-            crop: [0.0; 4],
-            wrap: Default::default(),
-            clip: Some(Arc::new(clip.clone())),
-            fill: Default::default(),
-        });
-        d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
-        let cache = Cache::new();
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let page = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
-        assert_eq!(page.pixel(150, 170)[..3], [255, 0, 0], "inside the triangle");
-        assert_eq!(page.pixel(110, 110)[..3], [255, 255, 255], "inside the frame, outside the triangle: paper");
-        // Inverted: the corners show and the triangle is paper.
-        clip.invert = true;
-        if let Some(designcraft_doc::Content::Graphic(g)) = d.item_mut(id).map(|it| &mut it.content) {
-            g.clip = Some(Arc::new(clip));
-        }
-        let cache = Cache::new();
-        let page = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
-        assert_eq!(page.pixel(150, 170)[..3], [255, 255, 255]);
-        assert_eq!(page.pixel(110, 110)[..3], [255, 0, 0]);
-    }
-
-    #[test]
-    fn missing_fonts_are_highlighted_on_screen_only() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 336.0, 100.0), lid, "Missing font", ParaFormat::default()).unwrap();
-        d.story_mut(sid).unwrap().format_chars(0..12, |f| f.over.font_family = Some("No Such Family".into()));
-        let cache = Cache::new();
-        let cs = cache.get(&d, sid, None);
-        assert!(cs.styles.iter().any(|s| s.missing_font));
-        let l = &cs.frames[0].lines[0];
-        // A point inside the line box but between glyph strokes: the space after "Missing".
-        let g = l.glyphs.iter().find(|g| g.byte == 7).unwrap();
-        let (x, y) = ((g.x + g.adv / 2.0) as u32, (l.baseline - l.ascent * 0.5) as u32);
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let plain = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
-        let shown = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions { highlight_missing_fonts: true, ..Default::default() }).unwrap();
-        assert_eq!(plain.pixel(x, y)[1], 255, "no highlight in output");
-        let p = shown.pixel(x, y);
-        assert!(p[0] > 240 && p[1] < 200, "pink on screen: {p:?}");
-    }
-
-    #[test]
-    fn table_edges_paint_gap_colour_between_dashes_and_stripes() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 336.0, 400.0), lid, "", ParaFormat::default()).unwrap();
-        let mut t = designcraft_doc::Table::new(1, 1, 1, 0, 0, 200.0);
-        t.rows[0].height = 60.0;
-        t.rows[0].mode = designcraft_doc::RowHeightMode::Exactly;
-        let gap = |kind| designcraft_doc::CellStroke { weight: 8.0, kind, gap_color: "C=100 M=0 Y=0 K=0".into(), ..Default::default() };
-        let cell = t.cell_mut(0, 0).unwrap();
-        cell.strokes[0] = gap(designcraft_doc::StrokeType::Dashed { pattern: vec![12.0, 6.0] });
-        cell.strokes[2] = gap(designcraft_doc::StrokeType::ThickThin);
-        cell.border_overrides = [true; 4];
-        cell.stroke_defined = [true; 4];
-        d.story_mut(sid).unwrap().insert_table(0, t);
-        let cache = Cache::new();
-        let rect = cache.get(&d, sid, None).frames[0].tables[0].cell(0, 0).unwrap().rect;
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
-        let ink = |p: [u8; 4]| p[0] < 80 && p[2] < 80;
-        let cyan = |p: [u8; 4]| p[0] < 80 && p[2] > 150;
-        let y = rect.y0.round() as u32;
-        let (dash, space) = (img.pixel((rect.x0 + 6.0) as u32, y), img.pixel((rect.x0 + 15.0) as u32, y));
-        assert!(ink(dash), "dash {dash:?}");
-        assert!(cyan(space), "gap {space:?}");
-        let column: Vec<_> = (rect.y1 as u32 - 5..=rect.y1 as u32 + 5).map(|y| img.pixel(rect.center().x as u32, y)).collect();
-        assert!(column.iter().any(|p| ink(*p)) && column.iter().any(|p| cyan(*p)), "stripes and gap: {column:?}");
-    }
-
-    #[test]
-    fn degenerate_dash_patterns_draw_solid_and_fill_types_close_table_corners() {
-        let fine = designcraft_doc::StrokeType::Dashed { pattern: vec![1e-6, 1e-6] };
-        // Expanding these would take ~10^8 dashes per edge.
-        assert!(text::cell_stroke(&fine, 4.0, 200.0).dash_pattern.is_empty());
-        assert!(text::cell_stroke(&designcraft_doc::StrokeType::Dotted, 1e-6, 200.0).dash_pattern.is_empty());
-        assert!(!text::cell_stroke(&designcraft_doc::StrokeType::Dashed { pattern: vec![3.0, 2.0] }, 1.0, 200.0).dash_pattern.is_empty());
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let (fid, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 336.0, 400.0), lid, "", ParaFormat::default()).unwrap();
-        d.item_mut(fid).unwrap().stroke = designcraft_doc::Stroke { weight: 2.0, kind: fine.clone(), ..Default::default() };
-        let mut t = designcraft_doc::Table::new(1, 2, 2, 0, 0, 200.0);
-        for r in 0..2 {
-            t.rows[r].height = 60.0;
-            t.rows[r].mode = designcraft_doc::RowHeightMode::Exactly;
-        }
-        let stroke = |kind| designcraft_doc::CellStroke { weight: 8.0, kind, gap_color: "C=100 M=0 Y=0 K=0".into(), ..Default::default() };
-        for cell in &mut t.cells {
-            cell.strokes = std::array::from_fn(|_| stroke(designcraft_doc::StrokeType::ThickThin));
-            cell.border_overrides = [true; 4];
-            cell.stroke_defined = [true; 4];
-        }
-        if let Some(cell) = t.cell_mut(1, 0) {
-            cell.strokes[2] = stroke(fine);
-        }
-        d.story_mut(sid).unwrap().insert_table(0, t);
-        let cache = Cache::new();
-        let frag = cache.get(&d, sid, None).frames[0].tables[0].clone();
-        let (top, bottom) = (frag.cell(0, 0).unwrap().rect, frag.cell(1, 0).unwrap().rect);
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
-        let ink = |p: [u8; 4]| p[0] < 80;
-        let solid: Vec<_> = (2..10).map(|i| img.pixel((bottom.x0 + 20.0 + i as f64 * 0.5) as u32, bottom.y1.round() as u32)).collect();
-        assert!(solid.iter().all(|p| ink(*p)), "the degenerate dashed edge draws solid: {solid:?}");
-        // Outside the table's top-left corner, inside both edges' reach.
-        let corner = img.pixel((top.x0 - 3.0) as u32, (top.y0 - 3.0) as u32);
-        assert!(ink(corner), "corner closed: {corner:?}");
-        let edge = frag.strokes.iter().find(|s| s.a == designcraft_geom::Point::new(top.x0, top.y0) && s.a.y == s.b.y).unwrap();
-        let (a, b) = frag.corner_capped(edge);
-        assert_eq!((a, b), (designcraft_geom::Point::new(top.x0 - 4.0, top.y0), edge.b), "only table corners extend");
-    }
-
-    #[test]
-    fn renders_tables() {
-        let mut d = Document::new(&NewDocument::default());
-        let lid = d.default_layer();
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 336.0, 400.0), lid, "", ParaFormat::default()).unwrap();
-        let mut t = designcraft_doc::Table::new(5, 3, 3, 1, 0, 300.0);
-        for c in 0..3 {
-            let cell = t.cell_mut(0, c).unwrap();
-            cell.fill = "C=100 M=0 Y=0 K=0".into();
-            cell.text.insert(0, "Head");
-            t.cell_mut(2, c).unwrap().text.insert(0, "WWWWWWWW");
-        }
-        d.story_mut(sid).unwrap().insert_table(0, t);
-        let cache = Cache::new();
-        let cs = cache.get(&d, sid, None);
-        let tf = &cs.frames[0].tables[0];
-        let head = tf.cell(0, 1).unwrap().rect;
-        let body = tf.cell(2, 0).unwrap().rect;
-        let mut r = Renderer::new();
-        r.threads = 0;
-        let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
-        // Header fill (cyan) near the right edge of the middle header cell.
-        let c = img.pixel((head.x1 - 3.0) as u32, (head.y0 + 3.0) as u32);
-        assert!(c[0] < 80 && c[2] > 150, "{c:?}");
-        // The table border (black) on the left edge.
-        let e = img.pixel(body.x0.round() as u32, body.center().y as u32);
-        assert!(e[0] < 200, "{e:?}");
-        // Cell text drew dark pixels inside the body cell.
-        let dark = ((body.x0 + 5.0) as u32..(body.x1 - 2.0) as u32)
-            .flat_map(|x| ((body.y0 + 2.0) as u32..(body.y1 - 2.0) as u32).map(move |y| (x, y)))
-            .filter(|&(x, y)| img.pixel(x, y)[0] < 100)
-            .count();
-        assert!(dark > 30, "cell text pixels: {dark}");
-    }
-
-    /// A one-page PDF (612 x 792 pt) that draws `content`.
-    fn one_page_pdf(content: &str) -> Vec<u8> {
-        let objects = [
-            "<< /Type /Catalog /Pages 2 0 R >>".to_string(),
-            "<< /Type /Pages /Kids [3 0 R] /Count 1 >>".to_string(),
-            "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 612 792] /Contents 4 0 R >>".to_string(),
-            format!("<< /Length {} >>\nstream\n{content}\nendstream", content.len()),
-        ];
-        let mut out = b"%PDF-1.4\n".to_vec();
-        let mut offsets = Vec::new();
-        for (i, o) in objects.iter().enumerate() {
-            offsets.push(out.len());
-            out.extend(format!("{} 0 obj\n{o}\nendobj\n", i + 1).bytes());
-        }
-        let xref = out.len();
-        out.extend(format!("xref\n0 {}\n0000000000 65535 f \n", objects.len() + 1).bytes());
-        for o in offsets {
-            out.extend(format!("{o:010} 00000 n \n").bytes());
-        }
-        out.extend(format!("trailer\n<< /Size {} /Root 1 0 R >>\nstartxref\n{xref}\n%%EOF\n", objects.len() + 1).bytes());
-        out
-    }
-
-    /// A Bounding Box crop is the exact extent of what the page draws, strokes included, found
-    /// without rasterizing the page: PDF export of a document that places a complex illustration
-    /// cropped that way spent seconds rendering it just to measure it.
-    #[test]
-    fn content_crop_box_is_measured_without_rendering_the_page() {
-        // A filled rectangle 100..300 x 532..592 (PDF y up) and a 10 pt horizontal line at
-        // y 100 from x 400 to 500, butt capped. Clipped away: a rectangle off to the left.
-        let pdf = one_page_pdf("0 0 0 rg 100 532 200 60 re f 10 w 400 100 m 500 100 l S q 0 0 50 50 re W n 100 0 10 10 re f Q");
-        let before = PDF_RENDERS.with(std::cell::Cell::get);
-        let (frac, size) = pdf_crop_box(&pdf, 0, designcraft_doc::PdfCrop::ContentVisible).unwrap();
-        assert_eq!(PDF_RENDERS.with(std::cell::Cell::get), before, "the page was rasterized");
-        let want = [100.0 / 612.0, 200.0 / 792.0, 500.0 / 612.0, 697.0 / 792.0];
-        assert!(frac.iter().zip(want).all(|(a, b)| (a - b).abs() < 1e-6), "{frac:?} vs {want:?}");
-        assert!((size.0 - 400.0).abs() < 1e-3 && (size.1 - 497.0).abs() < 1e-3, "{size:?}");
-    }
-}
+mod tests;
diff --git a/crates/render/src/pdf_bounds.rs b/crates/render/src/pdf_bounds.rs
index 17881df6e..4af5737a2 100644
--- a/crates/render/src/pdf_bounds.rs
+++ b/crates/render/src/pdf_bounds.rs
@@ -105,7 +105,8 @@ impl<'a> Device<'a> for Bounds {
 
     fn draw_glyph(&mut self, glyph: &Glyph<'a>, transform: Affine, glyph_transform: Affine, paint: &Paint<'a>, mode: &GlyphDrawMode) {
         let mode = match mode {
-            GlyphDrawMode::Invisible => return,
+            // Clipping text paints nothing; its clip arrives through `push_clip_path`.
+            GlyphDrawMode::Invisible | GlyphDrawMode::Clip => return,
             GlyphDrawMode::Fill => PathDrawMode::Fill(FillRule::NonZero),
             GlyphDrawMode::Stroke(s) => PathDrawMode::Stroke(s.clone()),
         };
diff --git a/crates/render/src/pdf_raster.rs b/crates/render/src/pdf_raster.rs
new file mode 100644
index 000000000..76160be96
--- /dev/null
+++ b/crates/render/src/pdf_raster.rs
@@ -0,0 +1,274 @@
+use super::types::Rendered;
+use super::{Affine, Arc, HashMap, Pixmap, Rect, pdf_bounds, pdf_hide_layers, pdf_layers, vello_cpu};
+
+/// MIME type guess for encoded image bytes.
+/// Is this a PDF file (placed PDFs are graphics)?
+pub fn is_pdf(bytes: &[u8]) -> bool {
+    bytes.starts_with(b"%PDF")
+}
+
+/// Page count of a PDF.
+pub fn pdf_page_count(bytes: &[u8]) -> Option<usize> {
+    let pdf = craft_pdf::open_slice(bytes, None).ok()?;
+    Some(pdf.pages().len())
+}
+
+/// Size of PDF page `page` (0-based), in points, as it shows (crop box, rotation applied).
+pub fn pdf_page_size(bytes: &[u8], page: usize) -> Option<(f64, f64)> {
+    let pdf = craft_pdf::open_slice(bytes, None).ok()?;
+    let p = pdf.pages().get(page)?;
+    let (w, h) = p.render_dimensions();
+    Some((w as f64, h as f64))
+}
+
+/// A placed page could not be rasterized completely for export.
+#[derive(Debug, thiserror::Error)]
+pub enum PdfRasterError {
+    #[error("{0}")]
+    Input(#[source] craft_pdf::OpenError),
+    #[error("{0}")]
+    Render(#[from] craft_pdf::raster::Error),
+    #[error("the PDF page could not be read or rendered")]
+    InvalidPage,
+    #[error("PDF page {page} is unavailable; choose an existing page in Image Import Options or place the replacement PDF again")]
+    MissingPage { page: usize },
+    #[error("the selected PDF layers could not be hidden")]
+    LayerRewrite,
+    #[error("an image could not be decoded or exceeded the PDF renderer's resource limits; repair or replace this placed PDF before exporting again")]
+    ImageDecode,
+    #[error("the PDF renderer encountered an unsupported font")]
+    UnsupportedFont,
+    #[error(
+        "the PDF renderer could not read all page content or reached its resource limits; repair or replace this placed PDF before exporting again"
+    )]
+    ContentTruncated,
+}
+
+/// Reject oversized PDFs before placement, layer rewriting or output allocation.
+pub fn check_pdf_input_size(size: usize) -> Result<(), PdfRasterError> {
+    craft_pdf::check_input_size(size).map_err(PdfRasterError::Input)
+}
+
+/// PDF page `page` as PNG, its longer side about `max_side` pixels, with the `hidden` layers off.
+/// Only the `shown` part ([`designcraft_doc::Asset::shown_box`]) is kept when given.
+/// Returns `None` on the same failures as [`pdf_page_png_checked`].
+pub fn pdf_page_png(bytes: &[u8], page: usize, max_side: u32, hidden: &[String], shown: Option<[f64; 4]>) -> Option<Vec<u8>> {
+    pdf_page_png_checked(bytes, page, max_side, hidden, shown).ok()
+}
+
+/// Rasterize a placed page for export, preserving available interpreter diagnostics.
+/// This cannot detect backend approximations that do not emit an interpreter warning.
+pub fn pdf_page_png_checked(bytes: &[u8], page: usize, max_side: u32, hidden: &[String], shown: Option<[f64; 4]>) -> Result<Vec<u8>, PdfRasterError> {
+    pdf_page_png_options_checked(bytes, page, max_side, (!hidden.is_empty()).then_some(hidden), shown)
+}
+
+/// Rasterize with an explicit visibility override: `Some(&[])` enables every layer;
+/// `None` retains file defaults. The legacy entry point keeps its empty-list semantics.
+pub fn pdf_page_png_options_checked(
+    bytes: &[u8],
+    page: usize,
+    max_side: u32,
+    hidden: Option<&[String]>,
+    shown: Option<[f64; 4]>,
+) -> Result<Vec<u8>, PdfRasterError> {
+    check_pdf_input_size(bytes.len())?;
+    let data = if let Some(hidden) = hidden {
+        std::borrow::Cow::Owned(pdf_hide_layers(bytes, hidden).ok_or(PdfRasterError::LayerRewrite)?)
+    } else {
+        std::borrow::Cow::Borrowed(bytes)
+    };
+    let raster = render_pdf_raster(&data, page, max_side)?;
+    if raster.diagnostics.image_decode_failed {
+        return Err(PdfRasterError::ImageDecode);
+    }
+    if raster.diagnostics.unsupported_font {
+        return Err(PdfRasterError::UnsupportedFont);
+    }
+    if raster.diagnostics.content_truncated {
+        return Err(PdfRasterError::ContentTruncated);
+    }
+    let pm = raster_pixmap(&raster);
+    let pm = match shown {
+        Some(frac) => crop_pixmap(&pm, frac).ok_or(PdfRasterError::InvalidPage)?,
+        None => pm,
+    };
+    let pixels = pm.data().iter().flat_map(|p| [p.r, p.g, p.b, p.a]).collect();
+    Ok(Rendered { width: u32::from(pm.width()), height: u32::from(pm.height()), pixels }.to_png())
+}
+
+/// Rasterize PDF page `page` so its longer side is about `max_side` pixels (screen display).
+/// Export callers that need failure diagnostics use [`pdf_page_png_checked`].
+pub fn render_pdf_page(bytes: &[u8], page: usize, max_side: u32) -> Option<Pixmap> {
+    #[cfg(test)]
+    PDF_RENDERS.with(|n| n.set(n.get() + 1));
+    let raster = render_pdf_raster(bytes, page, max_side).ok()?;
+    Some(raster_pixmap(&raster))
+}
+
+fn raster_pixmap(raster: &craft_pdf::raster::Raster) -> Pixmap {
+    let data = raster.bytes().as_chunks::<4>().0.iter().map(|c| vello_cpu::color::PremulRgba8 { r: c[0], g: c[1], b: c[2], a: c[3] }).collect();
+    Pixmap::from_parts(data, raster.width as u16, raster.height as u16)
+}
+
+#[cfg(test)]
+thread_local! {
+    /// How many PDF pages [`render_pdf_page`] rasterized on this thread.
+    pub(crate) static PDF_RENDERS: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
+}
+
+fn render_pdf_raster(bytes: &[u8], page: usize, max_side: u32) -> Result<craft_pdf::raster::Raster, PdfRasterError> {
+    let pdf = craft_pdf::open_slice(bytes, None).map_err(|e| match e {
+        craft_pdf::OpenError::Load(_) => PdfRasterError::InvalidPage,
+        other => PdfRasterError::Input(other),
+    })?;
+    let p = pdf.pages().get(page).ok_or(PdfRasterError::MissingPage { page: page.saturating_add(1) })?;
+    let (w, h) = p.render_dimensions();
+    let scale = (max_side as f32 / w.max(h).max(1.0)).min(8.0);
+    craft_pdf::raster::render(
+        p,
+        &craft_pdf::raster::RenderCache::new(),
+        &craft_pdf::interpret::InterpreterSettings::default(),
+        &craft_pdf::raster::Options { scale: [scale; 2], ..Default::default() },
+    )
+    .map_err(PdfRasterError::Render)
+}
+
+/// A page box of a PDF page (`crop`, `trim`, `bleed`, `art`, `media`) as (x, y, w, h) in points
+/// from the top-left of the page as rendered (its visible crop box); missing boxes fall back to the
+/// crop box, as PDF readers do.
+pub fn pdf_page_box(bytes: &[u8], page: usize, kind: &str) -> Option<(f64, f64, f64, f64)> {
+    use craft_pdf::syntax::object::{Rect as PRect, dict::keys};
+    let pdf = craft_pdf::open_slice(bytes, None).ok()?;
+    let p = pdf.pages().get(page)?;
+    let visible = p.intersected_crop_box();
+    let page_box = match kind {
+        "media" => p.media_box(),
+        "trim" | "bleed" | "art" => {
+            let key: &[u8] = match kind {
+                "trim" => keys::TRIM_BOX,
+                "bleed" => keys::BLEED_BOX,
+                _ => keys::ART_BOX,
+            };
+            p.raw().get::<PRect>(key).map(|b| b.intersect(p.media_box())).unwrap_or(visible)
+        }
+        _ => visible,
+    };
+    let transform = Affine::new(p.initial_transform(true).as_coeffs());
+    let b = transform.transform_rect_bbox(Rect::new(page_box.x0, page_box.y0, page_box.x1, page_box.y1));
+    b.is_finite().then_some((b.x0, b.y0, b.width(), b.height()))
+}
+
+/// The part of PDF page `page` that `crop` shows: its left, top, right and bottom edges as
+/// fractions of the page as rendered (its visible crop box, rotated as it displays), and its size
+/// in points. A box the page doesn't define is its crop box, as PDF readers do. The content boxes
+/// are the bounds of what the page draws, found from its drawing operations without rendering it
+/// (the whole page when it draws nothing).
+pub fn pdf_crop_box(bytes: &[u8], page: usize, crop: designcraft_doc::PdfCrop) -> Option<([f64; 4], (f64, f64))> {
+    use craft_pdf::syntax::object::{Rect as PRect, dict::keys};
+    use designcraft_doc::PdfCrop;
+    const WHOLE: [f64; 4] = [0.0, 0.0, 1.0, 1.0];
+    let pdf = craft_pdf::open_slice(bytes, None).ok()?;
+    let p = pdf.pages().get(page)?;
+    let (w, h) = p.render_dimensions();
+    let (w, h) = (f64::from(w), f64::from(h));
+    if !(w > 0.0 && h > 0.0) {
+        return None;
+    }
+    let frac = match crop {
+        PdfCrop::Crop => WHOLE,
+        PdfCrop::ContentVisible => pdf_bounds::page_content_bounds(bytes, page).unwrap_or(WHOLE),
+        PdfCrop::ContentAll => {
+            if pdf_layers::has_optional_content(&pdf) {
+                // If all-on rewriting is unsupported, a visible-only box could cut
+                // off hidden content. Keep the entire page conservatively instead.
+                pdf_hide_layers(bytes, &[]).and_then(|all_on| pdf_bounds::page_content_bounds(&all_on, page)).unwrap_or(WHOLE)
+            } else {
+                pdf_bounds::page_content_bounds(bytes, page).unwrap_or(WHOLE)
+            }
+        }
+        PdfCrop::Art | PdfCrop::Trim | PdfCrop::Bleed | PdfCrop::Media => {
+            let media = p.media_box();
+            let b = match crop {
+                PdfCrop::Media => media,
+                _ => {
+                    let key: &[u8] = match crop {
+                        PdfCrop::Trim => keys::TRIM_BOX,
+                        PdfCrop::Bleed => keys::BLEED_BOX,
+                        _ => keys::ART_BOX,
+                    };
+                    p.raw().get::<PRect>(key).map(|b| b.intersect(media)).unwrap_or_else(|| p.intersected_crop_box())
+                }
+            };
+            // Into rendered page space (y down, rotated, origin at the crop box).
+            let r = Affine::new(p.initial_transform(true).as_coeffs()).transform_rect_bbox(Rect::new(b.x0, b.y0, b.x1, b.y1));
+            [r.x0 / w, r.y0 / h, r.x1 / w, r.y1 / h]
+        }
+    };
+    let size = ((frac[2] - frac[0]) * w, (frac[3] - frac[1]) * h);
+    (frac.iter().all(|v| v.is_finite()) && size.0 > 0.0 && size.1 > 0.0).then_some((frac, size))
+}
+
+/// The part of the page a placed PDF shows ([`designcraft_doc::Asset::shown_box`]). A Bounding
+/// Box crop that import left unmeasured is measured here, once per file, page and crop: that
+/// interprets the page's drawing, which only drawing or exporting the graphic needs.
+pub fn shown_box(asset: &designcraft_doc::Asset) -> Option<[f64; 4]> {
+    if !asset.content_box_pending() {
+        return asset.shown_box();
+    }
+    asset.shown(content_box(&asset.data, asset.page, asset.pdf_crop)?)
+}
+
+type ContentBoxes = HashMap<(usize, u32, designcraft_doc::PdfCrop), (std::sync::Weak<Vec<u8>>, Option<[f64; 4]>)>;
+
+/// [`pdf_crop_box`]'s box, cached by the file's allocation. The weak reference keeps that address
+/// from naming another file while the entry lives.
+fn content_box(bytes: &Arc<Vec<u8>>, page: u32, crop: designcraft_doc::PdfCrop) -> Option<[f64; 4]> {
+    static CACHE: std::sync::Mutex<Option<ContentBoxes>> = std::sync::Mutex::new(None);
+    let key = (Arc::as_ptr(bytes) as usize, page, crop);
+    let cached = CACHE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(|c| c.get(&key)).and_then(|(file, b)| {
+        let same = file.upgrade().is_some_and(|f| Arc::ptr_eq(&f, bytes));
+        same.then_some(*b)
+    });
+    if let Some(b) = cached {
+        return b;
+    }
+    // Render outside the lock: other graphics keep drawing meanwhile.
+    let b = pdf_crop_box(bytes, page as usize, crop).map(|(frac, _)| frac);
+    let mut cache = CACHE.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+    let cache = cache.get_or_insert_with(HashMap::new);
+    cache.retain(|_, (file, _)| file.strong_count() > 0);
+    cache.insert(key, (Arc::downgrade(bytes), b));
+    b
+}
+
+/// The part of `pm` inside `frac` (left, top, right, bottom as fractions of it); what lies outside
+/// `pm` is transparent.
+pub fn crop_pixmap(pm: &Pixmap, frac: [f64; 4]) -> Option<Pixmap> {
+    let (pw, ph) = (f64::from(pm.width()), f64::from(pm.height()));
+    let [l, t, r, b] = [frac[0] * pw, frac[1] * ph, frac[2] * pw, frac[3] * ph].map(f64::round);
+    let (w, h) = (r - l, b - t);
+    if !(w >= 1.0 && h >= 1.0 && w <= f64::from(u16::MAX) && h <= f64::from(u16::MAX)) {
+        return None;
+    }
+    let (w, h) = (w as u16, h as u16);
+    let mut out = Pixmap::new(w, h);
+    let src = pm.data();
+    let dst = out.data_mut();
+    for y in 0..usize::from(h) {
+        let sy = y as f64 + t;
+        if sy < 0.0 || sy >= ph {
+            continue;
+        }
+        for x in 0..usize::from(w) {
+            let sx = x as f64 + l;
+            if sx < 0.0 || sx >= pw {
+                continue;
+            }
+            let (Some(p), Some(q)) = (src.get(sy as usize * usize::from(pm.width()) + sx as usize), dst.get_mut(y * usize::from(w) + x)) else {
+                continue;
+            };
+            *q = *p;
+        }
+    }
+    Some(out)
+}
diff --git a/crates/render/src/stroke.rs b/crates/render/src/stroke.rs
new file mode 100644
index 000000000..c9d8b6acb
--- /dev/null
+++ b/crates/render/src/stroke.rs
@@ -0,0 +1,205 @@
+use super::color::{HIDDEN_LAYERS, PLATE, color_of, overprints, plate_pixmap, screen_color, set_fill_paint};
+use super::pdf_raster::{is_pdf, shown_box};
+use super::types::{DisplayQuality, Frame};
+use super::{
+    Affine, BezPath, BlendMode, Compose, Item, Mix, Rect, RenderContext, Renderer, Shape, StrokeAlign, StrokeType, colorize, images, kurbo,
+    pdf_layers, peniko, vello_cpu,
+};
+
+impl Renderer {
+    pub(crate) fn draw_stroke(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, bp: &BezPath, xf: Affine) {
+        self.draw_stroke_painted(ctx, f, it, bp, xf);
+        ctx.reset_paint_transform();
+    }
+
+    /// The stroke, in its colour or gradient (a gradient runs across the path's box, as a fill's).
+    fn draw_stroke_painted(&mut self, ctx: &mut RenderContext, f: &Frame, it: &Item, bp: &BezPath, xf: Affine) {
+        let st = &it.stroke;
+        let (paint, bounds) = (st.as_fill(), bp.bounding_box());
+        if f.doc.resolve_color(&st.swatch, st.tint).is_none() && designcraft_color::swatch::resolve_gradient(&f.doc.swatches, &st.swatch).is_none() {
+            return;
+        }
+        let mut stroke = kurbo::Stroke::new(st.weight)
+            .with_caps(match st.cap {
+                designcraft_doc::Cap::Butt => kurbo::Cap::Butt,
+                designcraft_doc::Cap::Round => kurbo::Cap::Round,
+                designcraft_doc::Cap::Projecting => kurbo::Cap::Square,
+            })
+            .with_join(match st.join {
+                designcraft_doc::Join::Miter => kurbo::Join::Miter,
+                designcraft_doc::Join::Round => kurbo::Join::Round,
+                designcraft_doc::Join::Bevel => kurbo::Join::Bevel,
+            })
+            .with_miter_limit(st.miter_limit);
+        let kind = f.doc.stroke_kind(&st.kind);
+        let length = designcraft_doc::path_length_bound(bp);
+        match &kind {
+            StrokeType::Dashed { pattern } if StrokeType::expandable_dashes(pattern, length) => {
+                stroke = stroke.with_dashes(0.0, pattern.iter().copied())
+            }
+            StrokeType::Dotted if StrokeType::expandable_dashes(&[0.0, st.weight * 2.0], length) => {
+                stroke = stroke.with_dashes(0.0, [0.0, st.weight * 2.0]).with_caps(kurbo::Cap::Round)
+            }
+            _ => {}
+        }
+        ctx.set_transform(f.view * xf);
+        if !set_fill_paint(ctx, f.doc, &paint, bounds) {
+            return;
+        }
+        let closed = it.path.is_closed();
+        // Arrowheads: the path is shortened under them; they're drawn after it.
+        let arrows = designcraft_doc::arrow::apply(bp, st, closed);
+        let bp = arrows.as_ref().map_or(bp, |a| &a.0);
+        // Gap colour under dashes and dots: the whole path, undashed.
+        let gap = if matches!(kind, StrokeType::Solid) { None } else { f.doc.resolve_color(&st.gap_swatch, st.gap_tint) };
+        if let Some(g) = gap
+            && !matches!(st.align, StrokeAlign::Inside | StrokeAlign::Outside if closed)
+        {
+            let op = overprints(f, &st.gap_swatch, st.gap_tint, st.gap_overprint);
+            if op {
+                ctx.set_transform(Affine::IDENTITY);
+                ctx.push_layer(None, Some(BlendMode::new(Mix::Multiply, Compose::SrcOver)), None, None, None);
+                ctx.set_transform(f.view * xf);
+            }
+            ctx.set_paint(color_of(&g, 1.0));
+            ctx.set_stroke(kurbo::Stroke {
+                dash_pattern: Default::default(),
+                start_cap: kurbo::Cap::Butt,
+                end_cap: kurbo::Cap::Butt,
+                ..stroke.clone()
+            });
+            ctx.stroke_path(bp);
+            if op {
+                ctx.pop_layer();
+            }
+            set_fill_paint(ctx, f.doc, &paint, bounds);
+        }
+        // Stripes, wavy and hash strokes are fills (along the path's centre line).
+        if let Some(o) = kind.outline(bp, st.weight, 0.05 * f.px) {
+            ctx.fill_path(&o);
+            for h in arrows.iter().flat_map(|a| &a.1) {
+                match h.outline {
+                    Some(w) => {
+                        ctx.set_stroke(kurbo::Stroke::new(w).with_join(kurbo::Join::Miter));
+                        ctx.stroke_path(&h.path);
+                    }
+                    None => ctx.fill_path(&h.path),
+                }
+            }
+            return;
+        }
+        match st.align {
+            StrokeAlign::Inside if closed => {
+                // Clip a double-width stroke to the path.
+                ctx.push_clip_layer(bp);
+                ctx.set_stroke(kurbo::Stroke { width: st.weight * 2.0, ..stroke });
+                ctx.stroke_path(bp);
+                ctx.pop_layer();
+            }
+            StrokeAlign::Outside if closed => {
+                // Subtract the filled path from a double-width stroke. Combining a stroked
+                // outline (already hollow) with the path using even-odd would paint its centre.
+                // Isolate the stroke so the subtraction leaves the item's fill/content and
+                // backdrop intact; the same nonzero fill rule also preserves compound holes.
+                ctx.push_layer(None, None, None, None, None);
+                ctx.set_stroke(kurbo::Stroke { width: st.weight * 2.0, ..stroke });
+                ctx.stroke_path(bp);
+                ctx.push_layer(None, Some(BlendMode::new(Mix::Normal, Compose::DestOut)), None, None, None);
+                ctx.fill_path(bp);
+                ctx.pop_layer();
+                ctx.pop_layer();
+            }
+            _ => {
+                ctx.set_stroke(stroke);
+                ctx.stroke_path(bp);
+            }
+        }
+        for h in arrows.iter().flat_map(|a| &a.1) {
+            match h.outline {
+                Some(w) => {
+                    ctx.set_stroke(kurbo::Stroke::new(w).with_join(kurbo::Join::Miter));
+                    ctx.stroke_path(&h.path);
+                }
+                None => ctx.fill_path(&h.path),
+            }
+        }
+    }
+
+    /// Draw a placed graphic, inside its clipping path when it has one.
+    pub(crate) fn draw_graphic(&mut self, ctx: &mut RenderContext, f: &Frame, g: &designcraft_doc::Graphic, xf: Affine) {
+        let Some((region, even_odd)) = g.clip_region() else {
+            self.draw_graphic_unclipped(ctx, f, g, xf);
+            return;
+        };
+        ctx.set_transform(f.view * xf);
+        if even_odd {
+            ctx.set_fill_rule(peniko::Fill::EvenOdd);
+        }
+        ctx.push_clip_layer(&region);
+        ctx.set_fill_rule(peniko::Fill::NonZero);
+        self.draw_graphic_unclipped(ctx, f, g, xf);
+        ctx.pop_layer();
+    }
+
+    fn draw_graphic_unclipped(&mut self, ctx: &mut RenderContext, f: &Frame, g: &designcraft_doc::Graphic, xf: Affine) {
+        let Some(asset) = f.doc.assets.get(&g.asset) else { return };
+        if designcraft_doc::media_kind(&asset.mime).is_some() {
+            // Video / sound: a dark frame with a play mark (the poster, when set, is drawn by the item).
+            ctx.set_transform(f.view * xf * g.xf);
+            ctx.set_paint(screen_color([48, 48, 52], 255));
+            ctx.fill_rect(&Rect::new(0.0, 0.0, g.size.0, g.size.1));
+            let (cx, cy, r) = (g.size.0 / 2.0, g.size.1 / 2.0, g.size.0.min(g.size.1) * 0.18);
+            let mut tri = BezPath::new();
+            tri.move_to((cx - r * 0.6, cy - r));
+            tri.line_to((cx + r, cy));
+            tri.line_to((cx - r * 0.6, cy + r));
+            tri.close_path();
+            ctx.set_paint(screen_color([235, 235, 235], 255));
+            ctx.fill_path(&tri);
+            return;
+        }
+        if f.opts.quality == DisplayQuality::Fast {
+            ctx.set_transform(f.view * xf * g.xf);
+            ctx.set_paint(screen_color([178, 178, 178], 255));
+            ctx.fill_rect(&Rect::new(0.0, 0.0, g.size.0, g.size.1));
+            return;
+        }
+        // Pick a mip level close to the on-screen size (Typical: a 72 ppi proxy).
+        let on_screen = (f.view * xf * g.xf).determinant().abs().sqrt();
+        let on_screen = if f.opts.quality == DisplayQuality::Typical { on_screen.min(1.0) } else { on_screen };
+        let hidden = HIDDEN_LAYERS.with(|h| h.borrow().clone());
+        let data = match hidden.as_deref().filter(|_| is_pdf(&asset.data)) {
+            // An explicit choice (including all-on) that cannot be rewritten fails closed:
+            // stale persisted/relinked choices must not reveal hidden source content.
+            Some(hidden) => {
+                let Some(variant) = pdf_layers::layered(&asset.data, hidden) else { return };
+                variant
+            }
+            None => asset.data.clone(),
+        };
+        // A placed PDF cropped to a box: the whole page, placed so that the box spans graphic space.
+        let [l, t, r, b] = shown_box(asset).unwrap_or([0.0, 0.0, 1.0, 1.0]);
+        let (page_w, page_h) = (g.size.0 / (r - l), g.size.1 / (b - t));
+        let page = Rect::new(-l * page_w, -t * page_h, (1.0 - l) * page_w, (1.0 - t) * page_h);
+        let Some(pm) = images::mip(&data, asset.page, page_w, on_screen) else { return };
+        // A coloured image is already in the plate's inks (its colours come from `color_of`).
+        let pm = match (colorize::colorized(f.doc, &g.fill, &asset.data, &pm), PLATE.with(std::cell::Cell::get)) {
+            (Some(coloured), _) => coloured,
+            (None, Some(plate)) => plate_pixmap(&pm, plate),
+            (None, None) => pm,
+        };
+        // Only where the page is: a box reaching past it (a media box larger than the crop box)
+        // shows nothing there.
+        let rect = Rect::new(0.0, 0.0, g.size.0, g.size.1).intersect(page);
+        ctx.set_transform(f.view * xf * g.xf);
+        let sx = page_w / pm.width().max(1) as f64;
+        let sy = page_h / pm.height().max(1) as f64;
+        ctx.set_paint(vello_cpu::Image {
+            image: vello_cpu::ImageSource::Pixmap(pm),
+            sampler: peniko::ImageSampler::default().with_quality(peniko::ImageQuality::Medium),
+        });
+        ctx.set_paint_transform(Affine::translate((page.x0, page.y0)) * Affine::scale_non_uniform(sx, sy));
+        ctx.fill_rect(&rect);
+        ctx.reset_paint_transform();
+    }
+}
diff --git a/crates/render/src/tests.rs b/crates/render/src/tests.rs
new file mode 100644
index 000000000..295a0da5f
--- /dev/null
+++ b/crates/render/src/tests.rs
@@ -0,0 +1,671 @@
+use super::*;
+use designcraft_doc::build::NewDocument;
+use designcraft_doc::{Fill, ParaFormat};
+
+#[test]
+fn eps_source_decodes_like_its_preview() {
+    let source = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 20 10\n%%EOF\n";
+    let mut tiff = Vec::new();
+    image::DynamicImage::ImageRgba8(image::RgbaImage::from_pixel(3, 2, image::Rgba([255, 0, 0, 128])))
+        .write_to(&mut std::io::Cursor::new(&mut tiff), image::ImageFormat::Tiff)
+        .unwrap();
+    let mut dos = vec![0xC5, 0xD0, 0xD3, 0xC6];
+    for value in [30usize, source.len(), 0, 0, 30 + source.len(), tiff.len()] {
+        dos.extend((value as u32).to_le_bytes());
+    }
+    dos.extend([0xFF, 0xFF]);
+    dos.extend_from_slice(source);
+    dos.extend_from_slice(&tiff);
+    for source in [source.as_slice(), dos.as_slice()] {
+        let proxy = designcraft_images::eps_proxy(source).unwrap().0;
+        let actual = decode_pixmap(source).unwrap();
+        let expected = decode_pixmap(&proxy).unwrap();
+        assert_eq!((actual.width(), actual.height()), (expected.width(), expected.height()));
+        assert_eq!(actual.data(), expected.data());
+        assert_eq!(image_size(source), image_size(&proxy));
+        assert_eq!(image_mime(source), "application/postscript");
+    }
+    let corrupt = b"%!PS-Adobe-3.0 EPSF-3.0\nno bounding box\n";
+    assert!(decode_pixmap(corrupt).is_none());
+    assert!(image_size(corrupt).is_none());
+}
+
+#[test]
+fn footnote_vector_objects_are_painted() {
+    use designcraft_doc::{AnchorPosition, AnchoredObject, ItemId, Shape, SpreadRef};
+    let mut d = Document::new(&NewDocument::default());
+    let (_, sid) =
+        d.add_text_frame(SpreadRef::Doc(0), Rect::new(20.0, 20.0, 300.0, 300.0), d.default_layer(), "Body", ParaFormat::default()).unwrap();
+    let mut item =
+        Item::new(ItemId(d.alloc()), d.default_layer(), Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(0.0, 0.0, 12.0, 12.0)));
+    item.fill = Fill::swatch(designcraft_color::swatch::BLACK);
+    // Open contours with a fill are implicitly closed for painting. A single
+    // open contour must not hide the whole compound glyph.
+    item.path.subpaths[0].closed = false;
+    let story = d.story_mut(sid).unwrap();
+    story.insert_note(4, "", ParaFormat::default());
+    Arc::make_mut(&mut story.notes[0]).text.insert_object(0, AnchoredObject::new(item, AnchorPosition::Inline { y_offset: 0.0 }));
+    let cache = Cache::new();
+    let cs = cache.get(&d, sid, None);
+    let note = &cs.frames[0].notes[0];
+    let object = &note.text.frames[0].objects[0];
+    let centre = note.origin + object.origin.to_vec2() + designcraft_geom::Vec2::new(6.0, 6.0);
+    let image = Renderer::new().render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    let pixel = image.pixel(centre.x as u32, centre.y as u32);
+    assert!(pixel[0] < 80 && pixel[1] < 80 && pixel[2] < 80, "{pixel:?}");
+}
+
+/// `Rendered` has public fields: a buffer that doesn't match the stated size used to panic
+/// in `to_png`.
+/// A canvas 65535 pixels wide (any render wider than that was clamped to it) panicked inside
+/// vello_cpu when it snapped the width up to its tiles; a huge page export now declines.
+#[test]
+fn very_wide_renders_do_not_panic() {
+    let doc = Document::new(&NewDocument::default());
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    let img = r.render(&doc, &cache, &[], (70_000, 4), Affine::IDENTITY, &RenderOptions::default());
+    assert_eq!(img.width, MAX_SIDE);
+    let page = [Placed { spread: SpreadRef::Doc(0), xf: Affine::IDENTITY }];
+    let opts = RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
+    let img = r.render(&doc, &cache, &page, (70_000, 64), Affine::scale(120.0), &opts);
+    assert_eq!(img.width, MAX_SIDE);
+    assert!(r.render_page(&doc, &cache, 0, 500.0, true, &RenderOptions::default()).is_none());
+}
+
+#[test]
+fn to_png_survives_a_mismatched_buffer() {
+    let short = Rendered { width: 4, height: 4, pixels: vec![255; 10] };
+    let png = short.to_png();
+    assert_eq!(image::load_from_memory(&png).map(|i| (i.width(), i.height())).ok(), Some((4, 4)));
+    assert!(Rendered { width: 0, height: 0, pixels: vec![] }.to_png().len() < 1024);
+}
+
+#[test]
+fn proof_view_simulates_the_target() {
+    use designcraft_color::cms::{ProofSetup, ProofTarget};
+    let red = |a: u8| Rendered { width: 1, height: 1, pixels: vec![a, 0, 0, a] };
+    let mut img = red(255);
+    proof_view(&mut img, &ProofSetup { target: ProofTarget::Protanopia, ..Default::default() });
+    assert!(img.pixels[1] > 40, "protanopia turns pure red olive: {:?}", img.pixels);
+    let mut img = red(255);
+    proof_view(&mut img, &ProofSetup { target: ProofTarget::MonitorRgb, ..Default::default() });
+    assert!(img.pixels[0] > 245 && img.pixels[1] < 10, "monitor RGB is no simulation: {:?}", img.pixels);
+    // Transparent pixels stay transparent; premultiplication is kept.
+    let mut img = Rendered { width: 2, height: 1, pixels: vec![0, 0, 0, 0, 100, 0, 0, 128] };
+    proof_view(&mut img, &ProofSetup { target: ProofTarget::WorkingCmyk, ..Default::default() });
+    assert_eq!(&img.pixels[..4], &[0, 0, 0, 0]);
+    assert!(img.pixels[4] <= 128 && img.pixels[7] == 128);
+}
+
+#[test]
+fn renders_page_with_text_and_fill() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let (fid, _) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 576.0, 300.0), lid, "Hello DesignCraft", ParaFormat::default()).unwrap();
+    let id = designcraft_doc::ItemId(d.alloc());
+    let mut box_ = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(36.0, 400.0, 136.0, 500.0)));
+    box_.fill = Fill::swatch("C=100 M=0 Y=0 K=0");
+    d.insert_item(SpreadRef::Doc(0), box_, None).unwrap();
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    assert_eq!((img.width, img.height), (612, 792));
+    // Paper is white, the box is cyan-ish, text drew some dark pixels.
+    assert_eq!(img.pixel(300, 700), [255, 255, 255, 255]);
+    let c = img.pixel(80, 450);
+    assert!(c[0] < 80 && c[2] > 150, "{c:?}");
+    let dark = (36..300).flat_map(|x| (36..60).map(move |y| (x, y))).filter(|&(x, y)| img.pixel(x, y)[0] < 100).count();
+    assert!(dark > 50, "text pixels: {dark}");
+    let _ = fid;
+    assert!(r.stats.glyphs >= 15);
+}
+
+/// An inside-aligned stroke is the stroke of the path inset by half its weight: a band from the
+/// edge inwards, its rounded corners concentric with the frame's.
+#[test]
+fn inside_strokes_are_inset_by_half_the_weight() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let id = designcraft_doc::ItemId(d.alloc());
+    let mut it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 300.0, 300.0)));
+    it.stroke = designcraft_doc::Stroke {
+        swatch: designcraft_color::swatch::BLACK.into(),
+        weight: 10.0,
+        align: designcraft_doc::StrokeAlign::Inside,
+        ..Default::default()
+    };
+    it.corners = designcraft_geom::corners::CornerOptions::uniform(designcraft_geom::corners::CornerShape::Rounded, 20.0);
+    d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    let ink = |x: u32, y: u32| img.pixel(x, y)[0] < 64;
+    let paper = |x: u32, y: u32| img.pixel(x, y)[0] > 192;
+    // Straight edges: ink from the edge to 10 pt inside, nothing outside.
+    assert!(paper(97, 200) && ink(101, 200) && ink(108, 200) && paper(112, 200));
+    assert!(ink(298, 200) && paper(302, 200) && paper(288, 200));
+    // Rounded corner centred at (120, 120): ink between radii 10 and 20, paper outside the arc
+    // and inside the band.
+    assert!(paper(103, 103) && ink(108, 108) && paper(114, 114));
+}
+
+#[test]
+fn arrowheads_draw_at_line_ends() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let id = designcraft_doc::ItemId(d.alloc());
+    let path = designcraft_geom::shapes::line(designcraft_geom::Point::new(100.0, 400.0), designcraft_geom::Point::new(400.0, 400.0));
+    let mut line = Item::new(id, lid, designcraft_doc::Shape::GraphicLine, path);
+    line.stroke = designcraft_doc::Stroke {
+        swatch: designcraft_color::swatch::BLACK.into(),
+        weight: 2.0,
+        end: designcraft_doc::Arrowhead::TriangleWide,
+        ..Default::default()
+    };
+    d.insert_item(SpreadRef::Doc(0), line, None).unwrap();
+    // A dashed line with a gap colour: the gaps are painted.
+    let id = designcraft_doc::ItemId(d.alloc());
+    let path = designcraft_geom::shapes::line(designcraft_geom::Point::new(100.0, 500.0), designcraft_geom::Point::new(400.0, 500.0));
+    let mut dashed = Item::new(id, lid, designcraft_doc::Shape::GraphicLine, path);
+    dashed.stroke = designcraft_doc::Stroke {
+        swatch: designcraft_color::swatch::BLACK.into(),
+        weight: 4.0,
+        kind: designcraft_doc::StrokeType::Dashed { pattern: vec![12.0, 4.0] },
+        gap_swatch: "C=100 M=0 Y=0 K=0".into(),
+        ..Default::default()
+    };
+    d.insert_item(SpreadRef::Doc(0), dashed, None).unwrap();
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    // The head is 6.4 × weight wide: ink 4 pt above the line near the tip, none at the start.
+    assert!(img.pixel(393, 396)[0] < 128, "{:?}", img.pixel(393, 396));
+    assert_eq!(img.pixel(105, 396), [255, 255, 255, 255]);
+    // Nothing past the tip.
+    assert_eq!(img.pixel(403, 400), [255, 255, 255, 255]);
+    let (dash, gap) = (img.pixel(106, 500), img.pixel(114, 500));
+    assert!(dash[0] < 80 && dash[2] < 80, "dash {dash:?}");
+    assert!(gap[0] < 80 && gap[2] > 150, "gap {gap:?}");
+}
+
+#[test]
+fn overprint_preview_mixes_inks() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    for (sw, op) in [("C=0 M=0 Y=100 K=0", false), ("C=0 M=100 Y=0 K=0", true)] {
+        let id = designcraft_doc::ItemId(d.alloc());
+        let mut it =
+            Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
+        it.fill = Fill { overprint: op, ..Fill::swatch(sw) };
+        d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
+    }
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let px = |on: bool, r: &mut Renderer| {
+        r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions { overprint_preview: on, ..Default::default() }).unwrap().pixel(150, 150)
+    };
+    let off = px(false, &mut r);
+    let on = px(true, &mut r);
+    assert!(off[2] > 100, "magenta knocks out: {off:?}");
+    assert!(on[2] < 60 && on[0] > 180, "magenta over yellow → red: {on:?}");
+}
+
+#[test]
+fn cmyk_blend_space_shows_transparent_spreads_in_cmyk() {
+    let mut d = Document::new(&NewDocument::default());
+    d.swatches.push(designcraft_color::swatch::Swatch::color("Green", designcraft_color::Color::rgb8(0, 255, 0)));
+    let lid = d.default_layer();
+    let id = designcraft_doc::ItemId(d.alloc());
+    let mut it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
+    it.fill = Fill::swatch("Green");
+    d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let px = |d: &Document, r: &mut Renderer| {
+        r.render_page(d, &cache, 0, 1.0, false, &RenderOptions { blend_space_view: true, ..Default::default() }).unwrap().pixel(150, 150)
+    };
+    // No transparency on the spread: shown as is.
+    assert_eq!(px(&d, &mut r)[1], 255);
+    // With transparency in a CMYK blend space the bright green leaves the RGB gamut's edge.
+    d.item_mut(id).unwrap().opacity = 0.99;
+    let cmyk = px(&d, &mut r);
+    assert!(cmyk[0] > 20 || cmyk[1] < 240, "{cmyk:?}");
+    d.settings.blend_space = designcraft_doc::BlendSpace::Rgb;
+    let rgb = px(&d, &mut r);
+    assert!(rgb[1] > 245 && rgb[0] < 10, "{rgb:?}");
+}
+
+#[test]
+fn blend_modes_blend_in_cmyk_on_screen_in_a_cmyk_blend_space() {
+    // A lilac (RGB) rectangle, and a 100% K one over its lower half and the paper below it,
+    // in Color Dodge: in CMYK the black clears the lilac's inks (white), over the paper it
+    // shows as it is; in RGB, dodging with black changes nothing.
+    let mut d = Document::new(&NewDocument::default());
+    d.swatches.push(designcraft_color::swatch::Swatch::color("Lilac", designcraft_color::Color::rgb8(171, 154, 227)));
+    let lid = d.default_layer();
+    let rect = |d: &mut Document, r: Rect, fill: &str| {
+        let id = designcraft_doc::ItemId(d.alloc());
+        let mut it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
+        it.fill = Fill::swatch(fill);
+        d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
+        id
+    };
+    rect(&mut d, Rect::new(100.0, 100.0, 300.0, 200.0), "Lilac");
+    let black = rect(&mut d, Rect::new(150.0, 150.0, 250.0, 250.0), designcraft_color::swatch::BLACK);
+    d.item_mut(black).unwrap().blend = DcBlend::ColorDodge;
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let px = |d: &Document, r: &mut Renderer, x: u32, y: u32| {
+        r.render_page(d, &cache, 0, 1.0, false, &RenderOptions { blend_space_view: true, ..Default::default() }).unwrap().pixel(x, y)
+    };
+    let over_lilac = px(&d, &mut r, 200, 175);
+    assert!(over_lilac[..3].iter().all(|v| *v > 235), "dodged to white: {over_lilac:?}");
+    let over_paper = px(&d, &mut r, 200, 225);
+    assert!(over_paper[..3].iter().all(|v| *v < 90), "black as it is: {over_paper:?}");
+    let lilac = px(&d, &mut r, 120, 150);
+    assert!(lilac[2] > lilac[1] + 25, "the lilac beside it: {lilac:?}");
+    // Inside a group, the group's blend mode.
+    let g = designcraft_doc::ItemId(d.alloc());
+    let it = d.remove_item(black).unwrap();
+    let mut grp = Item::new(g, lid, designcraft_doc::Shape::Group, Default::default());
+    let mut inner = (*it).clone();
+    inner.blend = DcBlend::Normal;
+    grp.content = Content::Group { items: vec![Arc::new(inner)] };
+    grp.blend = DcBlend::ColorDodge;
+    d.insert_item(SpreadRef::Doc(0), grp, None).unwrap();
+    let grouped = px(&d, &mut r, 200, 175);
+    assert!(grouped[..3].iter().all(|v| *v > 235), "{grouped:?}");
+    // An RGB blend space: still lilac under the black (lightened a little: [Black] shows as a
+    // dark grey in RGB).
+    d.settings.blend_space = designcraft_doc::BlendSpace::Rgb;
+    let rgb = px(&d, &mut r, 200, 175);
+    assert!(rgb[2] > rgb[1] + 25 && rgb[1] < 220, "{rgb:?}");
+}
+
+#[test]
+fn knockout_group_hides_its_own_objects() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let mut kids = Vec::new();
+    for (sw, x) in [("C=0 M=0 Y=100 K=0", 100.0), ("C=0 M=100 Y=0 K=0", 150.0)] {
+        let id = designcraft_doc::ItemId(d.alloc());
+        let mut it =
+            Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(x, 100.0, x + 100.0, 200.0)));
+        it.fill = Fill::swatch(sw);
+        it.opacity = 0.5;
+        kids.push(std::sync::Arc::new(it));
+    }
+    let gid = designcraft_doc::ItemId(d.alloc());
+    let mut g = Item::new(gid, lid, designcraft_doc::Shape::Group, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 250.0, 200.0)));
+    g.content = designcraft_doc::Content::Group { items: kids };
+    d.insert_item(SpreadRef::Doc(0), g, None).unwrap();
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let overlap = |d: &Document, r: &mut Renderer| r.render_page(d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap().pixel(175, 150);
+    let plain = overlap(&d, &mut r);
+    d.item_mut(gid).unwrap().knockout = true;
+    let ko = overlap(&d, &mut r);
+    let magenta_only = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap().pixel(225, 150);
+    assert_ne!(plain, ko, "{plain:?} {ko:?}");
+    for c in 0..3 {
+        assert!((ko[c] as i32 - magenta_only[c] as i32).abs() <= 3, "the overlap shows magenta alone: {ko:?} vs {magenta_only:?}");
+    }
+}
+
+#[test]
+fn black_overprints_only_with_the_preference() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    for (sw, r) in
+        [("C=100 M=0 Y=0 K=0", Rect::new(100.0, 100.0, 200.0, 200.0)), (designcraft_color::swatch::BLACK, Rect::new(150.0, 100.0, 250.0, 200.0))]
+    {
+        let id = designcraft_doc::ItemId(d.alloc());
+        let mut it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(r));
+        it.fill = Fill::swatch(sw);
+        d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
+    }
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let o = RenderOptions { overprint_preview: true, ..Default::default() };
+    let on = r.render_page(&d, &cache, 0, 1.0, false, &o).unwrap().pixel(175, 150);
+    let alone = r.render_page(&d, &cache, 0, 1.0, false, &o).unwrap().pixel(225, 150);
+    d.settings.overprint_black = false;
+    let off = r.render_page(&d, &cache, 0, 1.0, false, &o).unwrap().pixel(175, 150);
+    assert_eq!(off, alone, "knocks out: black alone");
+    assert_ne!(on, alone, "overprints: the cyan shows through");
+}
+
+#[test]
+fn appearance_of_black_on_screen() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let id = designcraft_doc::ItemId(d.alloc());
+    let mut it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
+    it.fill = Fill::swatch(designcraft_color::swatch::BLACK);
+    d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let px = |rich: bool, r: &mut Renderer| {
+        r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions { rich_black: rich, ..Default::default() }).unwrap().pixel(150, 150)
+    };
+    assert!(px(false, &mut r)[0] > 20, "accurate: a dark grey");
+    assert_eq!(px(true, &mut r)[..3], [0, 0, 0]);
+}
+
+#[test]
+fn display_performance_fast_draws_grey_boxes() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    // A 4×4 red PNG placed at 100,100 (100×100 pt).
+    let mut png = Vec::new();
+    image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255])).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
+    let aid = designcraft_doc::AssetId(d.alloc());
+    d.assets.insert(
+        aid,
+        Arc::new(designcraft_doc::Asset {
+            id: aid,
+            name: "red.png".into(),
+            mime: "image/png".into(),
+            data: Arc::new(png),
+            pixels: Some((4, 4)),
+            ..Default::default()
+        }),
+    );
+    let id = designcraft_doc::ItemId(d.alloc());
+    let mut it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
+    it.content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
+        layer_options: None,
+        asset: aid,
+        size: (100.0, 100.0),
+        xf: Affine::translate((100.0, 100.0)),
+        clip: None,
+        auto_fit: Default::default(),
+        fit_align: 4,
+        crop: [0.0; 4],
+        wrap: Default::default(),
+        fill: Default::default(),
+    });
+    d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let px = |q: DisplayQuality, r: &mut Renderer| {
+        r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions { quality: q, ..Default::default() }).unwrap().pixel(150, 150)
+    };
+    assert_eq!(px(DisplayQuality::High, &mut r)[..3], [255, 0, 0]);
+    assert_eq!(px(DisplayQuality::Typical, &mut r)[..3], [255, 0, 0]);
+    assert_eq!(px(DisplayQuality::Fast, &mut r)[..3], [178, 178, 178]);
+}
+
+#[test]
+fn clipping_path_hides_the_image_outside_it() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let mut png = Vec::new();
+    image::RgbaImage::from_pixel(4, 4, image::Rgba([255, 0, 0, 255])).write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
+    let aid = designcraft_doc::AssetId(d.alloc());
+    d.assets.insert(
+        aid,
+        Arc::new(designcraft_doc::Asset {
+            page: 0,
+            id: aid,
+            name: "red.png".into(),
+            mime: "image/png".into(),
+            link: None,
+            data: Arc::new(png),
+            pixels: Some((4, 4)),
+            ..Default::default()
+        }),
+    );
+    // A 100 pt image at 100,100 clipped by a triangle with its apex at the top middle.
+    let triangle = designcraft_geom::PathData::single(designcraft_geom::path::SubPath::polyline(
+        &[designcraft_geom::Point::new(0.0, 100.0), designcraft_geom::Point::new(50.0, 0.0), designcraft_geom::Point::new(100.0, 100.0)],
+        true,
+    ));
+    let mut clip = designcraft_doc::ClippingPath::new(designcraft_doc::ClippingKind::PhotoshopPath, triangle);
+    let id = designcraft_doc::ItemId(d.alloc());
+    let mut it = Item::new(id, lid, designcraft_doc::Shape::Rectangle, designcraft_geom::shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
+    it.content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
+        layer_options: None,
+        asset: aid,
+        size: (100.0, 100.0),
+        xf: Affine::translate((100.0, 100.0)),
+        auto_fit: Default::default(),
+        fit_align: 4,
+        crop: [0.0; 4],
+        wrap: Default::default(),
+        clip: Some(Arc::new(clip.clone())),
+        fill: Default::default(),
+    });
+    d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
+    let cache = Cache::new();
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let page = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    assert_eq!(page.pixel(150, 170)[..3], [255, 0, 0], "inside the triangle");
+    assert_eq!(page.pixel(110, 110)[..3], [255, 255, 255], "inside the frame, outside the triangle: paper");
+    // Inverted: the corners show and the triangle is paper.
+    clip.invert = true;
+    if let Some(designcraft_doc::Content::Graphic(g)) = d.item_mut(id).map(|it| &mut it.content) {
+        g.clip = Some(Arc::new(clip));
+    }
+    let cache = Cache::new();
+    let page = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    assert_eq!(page.pixel(150, 170)[..3], [255, 255, 255]);
+    assert_eq!(page.pixel(110, 110)[..3], [255, 0, 0]);
+}
+
+#[test]
+fn missing_fonts_are_highlighted_on_screen_only() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 336.0, 100.0), lid, "Missing font", ParaFormat::default()).unwrap();
+    d.story_mut(sid).unwrap().format_chars(0..12, |f| f.over.font_family = Some("No Such Family".into()));
+    let cache = Cache::new();
+    let cs = cache.get(&d, sid, None);
+    assert!(cs.styles.iter().any(|s| s.missing_font));
+    let l = &cs.frames[0].lines[0];
+    // A point inside the line box but between glyph strokes: the space after "Missing".
+    let g = l.glyphs.iter().find(|g| g.byte == 7).unwrap();
+    let (x, y) = ((g.x + g.adv / 2.0) as u32, (l.baseline - l.ascent * 0.5) as u32);
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let plain = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    let shown = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions { highlight_missing_fonts: true, ..Default::default() }).unwrap();
+    assert_eq!(plain.pixel(x, y)[1], 255, "no highlight in output");
+    let p = shown.pixel(x, y);
+    assert!(p[0] > 240 && p[1] < 200, "pink on screen: {p:?}");
+}
+
+#[test]
+fn table_edges_paint_gap_colour_between_dashes_and_stripes() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 336.0, 400.0), lid, "", ParaFormat::default()).unwrap();
+    let mut t = designcraft_doc::Table::new(1, 1, 1, 0, 0, 200.0);
+    t.rows[0].height = 60.0;
+    t.rows[0].mode = designcraft_doc::RowHeightMode::Exactly;
+    let gap = |kind| designcraft_doc::CellStroke { weight: 8.0, kind, gap_color: "C=100 M=0 Y=0 K=0".into(), ..Default::default() };
+    let cell = t.cell_mut(0, 0).unwrap();
+    cell.strokes[0] = gap(designcraft_doc::StrokeType::Dashed { pattern: vec![12.0, 6.0] });
+    cell.strokes[2] = gap(designcraft_doc::StrokeType::ThickThin);
+    cell.border_overrides = [true; 4];
+    cell.stroke_defined = [true; 4];
+    d.story_mut(sid).unwrap().insert_table(0, t);
+    let cache = Cache::new();
+    let rect = cache.get(&d, sid, None).frames[0].tables[0].cell(0, 0).unwrap().rect;
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    let ink = |p: [u8; 4]| p[0] < 80 && p[2] < 80;
+    let cyan = |p: [u8; 4]| p[0] < 80 && p[2] > 150;
+    let y = rect.y0.round() as u32;
+    let (dash, space) = (img.pixel((rect.x0 + 6.0) as u32, y), img.pixel((rect.x0 + 15.0) as u32, y));
+    assert!(ink(dash), "dash {dash:?}");
+    assert!(cyan(space), "gap {space:?}");
+    let column: Vec<_> = (rect.y1 as u32 - 5..=rect.y1 as u32 + 5).map(|y| img.pixel(rect.center().x as u32, y)).collect();
+    assert!(column.iter().any(|p| ink(*p)) && column.iter().any(|p| cyan(*p)), "stripes and gap: {column:?}");
+}
+
+#[test]
+fn degenerate_dash_patterns_draw_solid_and_fill_types_close_table_corners() {
+    let fine = designcraft_doc::StrokeType::Dashed { pattern: vec![1e-6, 1e-6] };
+    // Expanding these would take ~10^8 dashes per edge.
+    assert!(text::cell_stroke(&fine, 4.0, 200.0).dash_pattern.is_empty());
+    assert!(text::cell_stroke(&designcraft_doc::StrokeType::Dotted, 1e-6, 200.0).dash_pattern.is_empty());
+    assert!(!text::cell_stroke(&designcraft_doc::StrokeType::Dashed { pattern: vec![3.0, 2.0] }, 1.0, 200.0).dash_pattern.is_empty());
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let (fid, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 336.0, 400.0), lid, "", ParaFormat::default()).unwrap();
+    d.item_mut(fid).unwrap().stroke = designcraft_doc::Stroke { weight: 2.0, kind: fine.clone(), ..Default::default() };
+    let mut t = designcraft_doc::Table::new(1, 2, 2, 0, 0, 200.0);
+    for r in 0..2 {
+        t.rows[r].height = 60.0;
+        t.rows[r].mode = designcraft_doc::RowHeightMode::Exactly;
+    }
+    let stroke = |kind| designcraft_doc::CellStroke { weight: 8.0, kind, gap_color: "C=100 M=0 Y=0 K=0".into(), ..Default::default() };
+    for cell in &mut t.cells {
+        cell.strokes = std::array::from_fn(|_| stroke(designcraft_doc::StrokeType::ThickThin));
+        cell.border_overrides = [true; 4];
+        cell.stroke_defined = [true; 4];
+    }
+    if let Some(cell) = t.cell_mut(1, 0) {
+        cell.strokes[2] = stroke(fine);
+    }
+    d.story_mut(sid).unwrap().insert_table(0, t);
+    let cache = Cache::new();
+    let frag = cache.get(&d, sid, None).frames[0].tables[0].clone();
+    let (top, bottom) = (frag.cell(0, 0).unwrap().rect, frag.cell(1, 0).unwrap().rect);
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    let ink = |p: [u8; 4]| p[0] < 80;
+    let solid: Vec<_> = (2..10).map(|i| img.pixel((bottom.x0 + 20.0 + i as f64 * 0.5) as u32, bottom.y1.round() as u32)).collect();
+    assert!(solid.iter().all(|p| ink(*p)), "the degenerate dashed edge draws solid: {solid:?}");
+    // Outside the table's top-left corner, inside both edges' reach.
+    let corner = img.pixel((top.x0 - 3.0) as u32, (top.y0 - 3.0) as u32);
+    assert!(ink(corner), "corner closed: {corner:?}");
+    let edge = frag.strokes.iter().find(|s| s.a == designcraft_geom::Point::new(top.x0, top.y0) && s.a.y == s.b.y).unwrap();
+    let (a, b) = frag.corner_capped(edge);
+    assert_eq!((a, b), (designcraft_geom::Point::new(top.x0 - 4.0, top.y0), edge.b), "only table corners extend");
+}
+
+#[test]
+fn table_gradient_fill_is_continuous_across_cells() {
+    let mut d = Document::new(&NewDocument::default());
+    let mut gradient = designcraft_color::Gradient::default();
+    gradient.stops[0].color = designcraft_color::Color::rgb(1.0, 0.0, 0.0);
+    gradient.stops[1].color = designcraft_color::Color::rgb(0.0, 0.0, 1.0);
+    d.swatches.push(designcraft_color::Swatch {
+        name: "Table gradient".into(),
+        value: designcraft_color::SwatchValue::Gradient { gradient },
+        locked: false,
+        named: true,
+        hidden: false,
+    });
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 336.0, 300.0), d.default_layer(), "", ParaFormat::default()).unwrap();
+    let mut t = designcraft_doc::Table::new(1, 1, 2, 0, 0, 200.0);
+    t.rows[0].height = 40.0;
+    t.rows[0].mode = designcraft_doc::RowHeightMode::Exactly;
+    for cell in &mut t.cells {
+        cell.fill = "Table gradient".into();
+    }
+    d.story_mut(sid).unwrap().insert_table(0, t);
+    let cache = Cache::new();
+    let rect = cache.get(&d, sid, None).frames[0].tables[0].rect;
+    let mut renderer = Renderer::new();
+    renderer.threads = 0;
+    let img = renderer.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    let y = rect.center().y as u32;
+    let a = img.pixel((rect.x0 + 20.0) as u32, y);
+    let b = img.pixel((rect.x1 - 20.0) as u32, y);
+    assert!(i16::from(a[0]) - i16::from(a[2]) > 80, "red end: {a:?}");
+    assert!(i16::from(b[2]) - i16::from(b[0]) > 80, "blue end: {b:?}");
+    let left = img.pixel((rect.center().x - 2.0) as u32, y);
+    let right = img.pixel((rect.center().x + 2.0) as u32, y);
+    assert!((i16::from(left[0]) - i16::from(right[0])).abs() < 20, "no gradient restart between cells");
+}
+
+#[test]
+fn renders_tables() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(36.0, 36.0, 336.0, 400.0), lid, "", ParaFormat::default()).unwrap();
+    let mut t = designcraft_doc::Table::new(5, 3, 3, 1, 0, 300.0);
+    for c in 0..3 {
+        let cell = t.cell_mut(0, c).unwrap();
+        cell.fill = "C=100 M=0 Y=0 K=0".into();
+        cell.text.insert(0, "Head");
+        t.cell_mut(2, c).unwrap().text.insert(0, "WWWWWWWW");
+    }
+    d.story_mut(sid).unwrap().insert_table(0, t);
+    let cache = Cache::new();
+    let cs = cache.get(&d, sid, None);
+    let tf = &cs.frames[0].tables[0];
+    let head = tf.cell(0, 1).unwrap().rect;
+    let body = tf.cell(2, 0).unwrap().rect;
+    let mut r = Renderer::new();
+    r.threads = 0;
+    let img = r.render_page(&d, &cache, 0, 1.0, false, &RenderOptions::default()).unwrap();
+    // Header fill (cyan) near the right edge of the middle header cell.
+    let c = img.pixel((head.x1 - 3.0) as u32, (head.y0 + 3.0) as u32);
+    assert!(c[0] < 80 && c[2] > 150, "{c:?}");
+    // The table border (black) on the left edge.
+    let e = img.pixel(body.x0.round() as u32, body.center().y as u32);
+    assert!(e[0] < 200, "{e:?}");
+    // Cell text drew dark pixels inside the body cell.
+    let dark = ((body.x0 + 5.0) as u32..(body.x1 - 2.0) as u32)
+        .flat_map(|x| ((body.y0 + 2.0) as u32..(body.y1 - 2.0) as u32).map(move |y| (x, y)))
+        .filter(|&(x, y)| img.pixel(x, y)[0] < 100)
+        .count();
+    assert!(dark > 30, "cell text pixels: {dark}");
+}
+
+/// A one-page PDF (612 x 792 pt) that draws `content`.
+fn one_page_pdf(content: &str) -> Vec<u8> {
+    let objects = [
+        "<< /Type /Catalog /Pages 2 0 R >>".to_string(),
+        "<< /Type /Pages /Kids [3 0 R] /Count 1 >>".to_string(),
+        "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 612 792] /Contents 4 0 R >>".to_string(),
+        format!("<< /Length {} >>\nstream\n{content}\nendstream", content.len()),
+    ];
+    let mut out = b"%PDF-1.4\n".to_vec();
+    let mut offsets = Vec::new();
+    for (i, o) in objects.iter().enumerate() {
+        offsets.push(out.len());
+        out.extend(format!("{} 0 obj\n{o}\nendobj\n", i + 1).bytes());
+    }
+    let xref = out.len();
+    out.extend(format!("xref\n0 {}\n0000000000 65535 f \n", objects.len() + 1).bytes());
+    for o in offsets {
+        out.extend(format!("{o:010} 00000 n \n").bytes());
+    }
+    out.extend(format!("trailer\n<< /Size {} /Root 1 0 R >>\nstartxref\n{xref}\n%%EOF\n", objects.len() + 1).bytes());
+    out
+}
+
+/// A Bounding Box crop is the exact extent of what the page draws, strokes included, found
+/// without rasterizing the page: PDF export of a document that places a complex illustration
+/// cropped that way spent seconds rendering it just to measure it.
+#[test]
+fn content_crop_box_is_measured_without_rendering_the_page() {
+    // A filled rectangle 100..300 x 532..592 (PDF y up) and a 10 pt horizontal line at
+    // y 100 from x 400 to 500, butt capped. Clipped away: a rectangle off to the left.
+    let pdf = one_page_pdf("0 0 0 rg 100 532 200 60 re f 10 w 400 100 m 500 100 l S q 0 0 50 50 re W n 100 0 10 10 re f Q");
+    let before = PDF_RENDERS.with(std::cell::Cell::get);
+    let (frac, size) = pdf_crop_box(&pdf, 0, designcraft_doc::PdfCrop::ContentVisible).unwrap();
+    assert_eq!(PDF_RENDERS.with(std::cell::Cell::get), before, "the page was rasterized");
+    let want = [100.0 / 612.0, 200.0 / 792.0, 500.0 / 612.0, 697.0 / 792.0];
+    assert!(frac.iter().zip(want).all(|(a, b)| (a - b).abs() < 1e-6), "{frac:?} vs {want:?}");
+    assert!((size.0 - 400.0).abs() < 1e-3 && (size.1 - 497.0).abs() < 1e-3, "{size:?}");
+}
diff --git a/crates/render/src/text.rs b/crates/render/src/text.rs
index a9cdc5ce3..3797f508e 100644
--- a/crates/render/src/text.rs
+++ b/crates/render/src/text.rs
@@ -250,6 +250,117 @@ fn line_box(l: &Line) -> Option<Rect> {
     Some(Rect::new(x0 - pad, l.baseline - l.ascent - pad, x1 + pad, bottom + pad))
 }
 
+fn draw_text_indicators(ctx: &mut RenderContext, f: &Frame, cs: &ComposedStory, ft: &FrameText, m: Affine) {
+    // Text in fonts that aren't installed: pink behind the glyphs (screen only).
+    if f.opts.highlight_missing_fonts && cs.styles.iter().any(|s| s.missing_font) {
+        ctx.set_transform(m);
+        ctx.set_paint(screen_color([255, 166, 214], 255));
+        for l in &ft.lines {
+            for g in l.glyphs.iter().filter(|g| g.adv > 0.0 && cs.styles.get(g.style as usize).is_some_and(|s| s.missing_font)) {
+                ctx.fill_rect(&kurbo::Rect::new(g.x, l.baseline - l.ascent, g.x + g.adv, l.baseline + l.descent));
+            }
+        }
+    }
+    if f.opts.highlight_keeps && ft.lines.iter().any(|l| l.keep_violation) {
+        ctx.set_transform(m);
+        ctx.set_paint(screen_color([255, 236, 120], 255));
+        for l in ft.lines.iter().filter(|l| l.keep_violation) {
+            ctx.fill_rect(&kurbo::Rect::new(l.x0, l.baseline - l.ascent, l.x1, l.baseline + l.descent));
+        }
+    }
+    if f.opts.highlight_hj && ft.lines.iter().any(|l| l.hj > 0) {
+        ctx.set_transform(m);
+        for l in ft.lines.iter().filter(|l| l.hj > 0) {
+            let shade = [0u8, 0xF6, 0xEA, 0xD8][l.hj.min(3) as usize];
+            ctx.set_paint(screen_color([255, shade, [0u8, 0xB0, 0x70, 0x30][l.hj.min(3) as usize]], 255));
+            ctx.fill_rect(&kurbo::Rect::new(l.x0, l.baseline - l.ascent, l.end_x.max(l.x0 + 1.0), l.baseline + l.descent));
+        }
+    }
+    if f.opts.highlight_custom_tracking && cs.styles.iter().any(|s| s.custom_tracking) {
+        ctx.set_transform(m);
+        ctx.set_paint(screen_color([176, 236, 176], 255));
+        for l in &ft.lines {
+            for g in l.glyphs.iter().filter(|g| g.adv > 0.0 && cs.styles.get(g.style as usize).is_some_and(|s| s.custom_tracking)) {
+                ctx.fill_rect(&kurbo::Rect::new(g.x, l.baseline - l.ascent, g.x + g.adv, l.baseline + l.descent));
+            }
+        }
+    }
+    if f.opts.tag_markers && cs.styles.iter().any(|s| s.xml_tag.is_some()) {
+        ctx.set_transform(m);
+        let px = 1.0 / m.determinant().abs().sqrt().max(1e-9);
+        for l in &ft.lines {
+            let tag_of = |g: &designcraft_compose::PlacedGlyph| cs.styles.get(g.style as usize).and_then(|s| s.xml_tag.clone());
+            let gs: Vec<_> = l.glyphs.iter().filter(|g| g.len > 0).collect();
+            let mut i = 0;
+            while i < gs.len() {
+                let Some(tag) = tag_of(gs[i]) else {
+                    i += 1;
+                    continue;
+                };
+                let mut j = i + 1;
+                while j < gs.len() && tag_of(gs[j]).as_deref() == Some(tag.as_str()) {
+                    j += 1;
+                }
+                let c = f.doc.xml.tags.iter().find(|t| t.name == tag).map_or([100, 100, 220], |t| t.color);
+                ctx.set_paint(screen_color([c[0], c[1], c[2]], 255));
+                let (x0, x1) = (gs[i].x, gs[j - 1].x + gs[j - 1].adv);
+                let (top, bot) = (l.baseline - l.ascent, l.baseline + l.descent);
+                let (w, t) = (2.5 * px, px.max(0.3));
+                // [ before the element, ] after it.
+                for (x, dir) in [(x0, 1.0), (x1, -1.0)] {
+                    ctx.fill_rect(&kurbo::Rect::new(x - t / 2.0, top, x + t / 2.0, bot));
+                    for y in [top, bot - t] {
+                        let (a, b) = if dir > 0.0 { (x, x + w) } else { (x - w, x) };
+                        ctx.fill_rect(&kurbo::Rect::new(a, y, b, y + t));
+                    }
+                }
+                i = j;
+            }
+        }
+    }
+    if f.opts.change_markup && cs.styles.iter().any(|s| s.inserted) {
+        ctx.set_transform(m);
+        for l in &ft.lines {
+            for g in l.glyphs.iter().filter(|g| g.adv > 0.0 && cs.styles.get(g.style as usize).is_some_and(|s| s.inserted)) {
+                ctx.set_paint(screen_color([120, 190, 255], 110));
+                ctx.fill_rect(&kurbo::Rect::new(g.x, l.baseline - l.ascent, g.x + g.adv, l.baseline + l.descent));
+            }
+        }
+    }
+    if f.opts.note_indicators
+        && let Some(st) = f.doc.story(cs.story).filter(|st| !st.editorial.is_empty())
+    {
+        // A small flag at each note anchor, in the notes' amber.
+        ctx.set_transform(m);
+        ctx.set_paint(screen_color([232, 160, 32], 255));
+        for l in &ft.lines {
+            for g in l.glyphs.iter().filter(|g| st.text.get(g.byte..).is_some_and(|t| t.starts_with(designcraft_doc::NOTE_MARK))) {
+                let h = l.ascent.max(4.0);
+                let mut p = BezPath::new();
+                p.move_to((g.x - h * 0.25, l.baseline - h));
+                p.line_to((g.x + h * 0.25, l.baseline - h));
+                p.line_to((g.x, l.baseline - h * 0.55));
+                p.close_path();
+                ctx.fill_path(&p);
+                ctx.fill_rect(&kurbo::Rect::new(g.x - h * 0.03, l.baseline - h * 0.6, g.x + h * 0.03, l.baseline + l.descent * 0.5));
+            }
+        }
+    }
+    if f.opts.condition_indicators && !f.doc.conditions.is_empty() && cs.styles.iter().any(|s| s.condition.is_some()) {
+        ctx.set_transform(m);
+        let px = 1.0 / m.determinant().abs().sqrt().max(1e-9);
+        for l in &ft.lines {
+            for g in l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0) {
+                let Some(name) = cs.styles.get(g.style as usize).and_then(|s| s.condition.as_deref()) else { continue };
+                let Some(c) = f.doc.conditions.iter().find(|c| c.name == name) else { continue };
+                ctx.set_paint(screen_color([c.color[0], c.color[1], c.color[2]], 255));
+                let y = l.baseline + l.descent * 0.6;
+                ctx.fill_rect(&kurbo::Rect::new(g.x, y, g.x + g.adv, y + 2.0 * px));
+            }
+        }
+    }
+}
+
 impl Renderer {
     pub(crate) fn draw_text(&mut self, ctx: &mut RenderContext, f: &Frame, cs: &Arc<ComposedStory>, ft: &FrameText, xf: Affine) {
         let doc = f.doc;
@@ -276,114 +387,7 @@ impl Renderer {
         if !ft.tables.is_empty() {
             self.draw_tables(ctx, f, ft, xf);
         }
-        // Text in fonts that aren't installed: pink behind the glyphs (screen only).
-        if f.opts.highlight_missing_fonts && cs.styles.iter().any(|s| s.missing_font) {
-            ctx.set_transform(m);
-            ctx.set_paint(screen_color([255, 166, 214], 255));
-            for l in &ft.lines {
-                for g in l.glyphs.iter().filter(|g| g.adv > 0.0 && cs.styles.get(g.style as usize).is_some_and(|s| s.missing_font)) {
-                    ctx.fill_rect(&kurbo::Rect::new(g.x, l.baseline - l.ascent, g.x + g.adv, l.baseline + l.descent));
-                }
-            }
-        }
-        if f.opts.highlight_keeps && ft.lines.iter().any(|l| l.keep_violation) {
-            ctx.set_transform(m);
-            ctx.set_paint(screen_color([255, 236, 120], 255));
-            for l in ft.lines.iter().filter(|l| l.keep_violation) {
-                ctx.fill_rect(&kurbo::Rect::new(l.x0, l.baseline - l.ascent, l.x1, l.baseline + l.descent));
-            }
-        }
-        if f.opts.highlight_hj && ft.lines.iter().any(|l| l.hj > 0) {
-            ctx.set_transform(m);
-            for l in ft.lines.iter().filter(|l| l.hj > 0) {
-                let shade = [0u8, 0xF6, 0xEA, 0xD8][l.hj.min(3) as usize];
-                ctx.set_paint(screen_color([255, shade, [0u8, 0xB0, 0x70, 0x30][l.hj.min(3) as usize]], 255));
-                ctx.fill_rect(&kurbo::Rect::new(l.x0, l.baseline - l.ascent, l.end_x.max(l.x0 + 1.0), l.baseline + l.descent));
-            }
-        }
-        if f.opts.highlight_custom_tracking && cs.styles.iter().any(|s| s.custom_tracking) {
-            ctx.set_transform(m);
-            ctx.set_paint(screen_color([176, 236, 176], 255));
-            for l in &ft.lines {
-                for g in l.glyphs.iter().filter(|g| g.adv > 0.0 && cs.styles.get(g.style as usize).is_some_and(|s| s.custom_tracking)) {
-                    ctx.fill_rect(&kurbo::Rect::new(g.x, l.baseline - l.ascent, g.x + g.adv, l.baseline + l.descent));
-                }
-            }
-        }
-        if f.opts.tag_markers && cs.styles.iter().any(|s| s.xml_tag.is_some()) {
-            ctx.set_transform(m);
-            let px = 1.0 / m.determinant().abs().sqrt().max(1e-9);
-            for l in &ft.lines {
-                let tag_of = |g: &designcraft_compose::PlacedGlyph| cs.styles.get(g.style as usize).and_then(|s| s.xml_tag.clone());
-                let gs: Vec<_> = l.glyphs.iter().filter(|g| g.len > 0).collect();
-                let mut i = 0;
-                while i < gs.len() {
-                    let Some(tag) = tag_of(gs[i]) else {
-                        i += 1;
-                        continue;
-                    };
-                    let mut j = i + 1;
-                    while j < gs.len() && tag_of(gs[j]).as_deref() == Some(tag.as_str()) {
-                        j += 1;
-                    }
-                    let c = f.doc.xml.tags.iter().find(|t| t.name == tag).map_or([100, 100, 220], |t| t.color);
-                    ctx.set_paint(screen_color([c[0], c[1], c[2]], 255));
-                    let (x0, x1) = (gs[i].x, gs[j - 1].x + gs[j - 1].adv);
-                    let (top, bot) = (l.baseline - l.ascent, l.baseline + l.descent);
-                    let (w, t) = (2.5 * px, px.max(0.3));
-                    // [ before the element, ] after it.
-                    for (x, dir) in [(x0, 1.0), (x1, -1.0)] {
-                        ctx.fill_rect(&kurbo::Rect::new(x - t / 2.0, top, x + t / 2.0, bot));
-                        for y in [top, bot - t] {
-                            let (a, b) = if dir > 0.0 { (x, x + w) } else { (x - w, x) };
-                            ctx.fill_rect(&kurbo::Rect::new(a, y, b, y + t));
-                        }
-                    }
-                    i = j;
-                }
-            }
-        }
-        if f.opts.change_markup && cs.styles.iter().any(|s| s.inserted) {
-            ctx.set_transform(m);
-            for l in &ft.lines {
-                for g in l.glyphs.iter().filter(|g| g.adv > 0.0 && cs.styles.get(g.style as usize).is_some_and(|s| s.inserted)) {
-                    ctx.set_paint(screen_color([120, 190, 255], 110));
-                    ctx.fill_rect(&kurbo::Rect::new(g.x, l.baseline - l.ascent, g.x + g.adv, l.baseline + l.descent));
-                }
-            }
-        }
-        if f.opts.note_indicators
-            && let Some(st) = f.doc.story(cs.story).filter(|st| !st.editorial.is_empty())
-        {
-            // A small flag at each note anchor, in the notes' amber.
-            ctx.set_transform(m);
-            ctx.set_paint(screen_color([232, 160, 32], 255));
-            for l in &ft.lines {
-                for g in l.glyphs.iter().filter(|g| st.text.get(g.byte..).is_some_and(|t| t.starts_with(designcraft_doc::NOTE_MARK))) {
-                    let h = l.ascent.max(4.0);
-                    let mut p = BezPath::new();
-                    p.move_to((g.x - h * 0.25, l.baseline - h));
-                    p.line_to((g.x + h * 0.25, l.baseline - h));
-                    p.line_to((g.x, l.baseline - h * 0.55));
-                    p.close_path();
-                    ctx.fill_path(&p);
-                    ctx.fill_rect(&kurbo::Rect::new(g.x - h * 0.03, l.baseline - h * 0.6, g.x + h * 0.03, l.baseline + l.descent * 0.5));
-                }
-            }
-        }
-        if f.opts.condition_indicators && !f.doc.conditions.is_empty() && cs.styles.iter().any(|s| s.condition.is_some()) {
-            ctx.set_transform(m);
-            let px = 1.0 / m.determinant().abs().sqrt().max(1e-9);
-            for l in &ft.lines {
-                for g in l.glyphs.iter().filter(|g| g.visible && g.adv > 0.0) {
-                    let Some(name) = cs.styles.get(g.style as usize).and_then(|s| s.condition.as_deref()) else { continue };
-                    let Some(c) = f.doc.conditions.iter().find(|c| c.name == name) else { continue };
-                    ctx.set_paint(screen_color([c.color[0], c.color[1], c.color[2]], 255));
-                    let y = l.baseline + l.descent * 0.6;
-                    ctx.fill_rect(&kurbo::Rect::new(g.x, y, g.x + g.adv, y + 2.0 * px));
-                }
-            }
-        }
+        draw_text_indicators(ctx, f, cs, ft, m);
         let scale = m.determinant().abs().sqrt();
         let greek_px = f.opts.greek_below_px;
         let mut greek = BezPath::new();
@@ -470,14 +474,16 @@ impl Renderer {
         let doc = f.doc;
         for t in &ft.tables {
             for c in &t.cells {
-                if let Some((sw, tint)) = &c.fill
-                    && let Some(col) = doc.resolve_color(sw, *tint)
-                {
+                if let Some((sw, tint)) = &c.fill {
                     ctx.set_transform(f.view * xf);
-                    ctx.set_paint(color_of(&col, 1.0));
+                    let fill = designcraft_doc::Fill { swatch: sw.clone(), tint: *tint, ..designcraft_doc::Fill::none() };
                     // Overlap neighbours by half a device pixel so adjacent fills show no seams.
                     let h = 0.5 * f.px;
-                    ctx.fill_rect(&c.rect.inflate(h, h));
+                    // All cells share the table's gradient space; it must not restart at a cell edge.
+                    if crate::set_fill_paint(ctx, doc, &fill, t.rect) {
+                        ctx.fill_rect(&c.rect.inflate(h, h));
+                    }
+                    ctx.reset_paint_transform();
                 }
             }
             for c in &t.cells {
diff --git a/crates/render/src/types.rs b/crates/render/src/types.rs
new file mode 100644
index 000000000..6476c735b
--- /dev/null
+++ b/crates/render/src/types.rs
@@ -0,0 +1,127 @@
+use super::{Affine, Cache, Document, Item, Rect, SpreadRef, fx};
+
+/// How far (points) an object's soft effects reach outside its geometry.
+pub fn effect_outset(it: &Item) -> f64 {
+    fx::outset(it)
+}
+
+/// Largest side of a raster the renderer draws. vello_cpu keeps sizes in `u16` and rounds them
+/// up to its tiles (4 px) and depth buckets (128 px), so a side near `u16::MAX` overflows inside
+/// it: stay a few buckets below.
+pub const MAX_SIDE: u32 = u16::MAX as u32 + 1 - 512;
+
+/// Largest page raster [`Renderer::render_page`] makes (2 GiB of RGBA).
+pub const MAX_PAGE_PIXELS: u64 = 1 << 29;
+
+/// A rendered image (premultiplied RGBA8, row-major).
+#[derive(Clone)]
+pub struct Rendered {
+    pub width: u32,
+    pub height: u32,
+    pub pixels: Vec<u8>,
+}
+
+/// What to draw.
+#[derive(Clone, Debug, PartialEq)]
+pub struct RenderOptions {
+    /// Canvas background (premultiplied RGBA8); `None` = transparent.
+    pub background: Option<[u8; 4]>,
+    /// Fill pages with paper colour.
+    pub paper: bool,
+    /// Skip non-printing items and layers (Preview mode, export).
+    pub printing_only: bool,
+    /// Items not to draw (live drag previews).
+    pub hidden: Vec<designcraft_doc::ItemId>,
+    /// Draw text smaller than this many pixels as grey bars ("greeking"); 0 = never.
+    pub greek_below_px: f64,
+    /// Drop shadow on pages (screen view).
+    pub page_shadow: bool,
+    /// Pink highlight behind text set in fonts that aren't installed (screen view).
+    pub highlight_missing_fonts: bool,
+    /// Preferences › Composition: yellow behind lines whose word spacing breaks the paragraph's
+    /// limits (darker = worse), green behind text with custom tracking or kerning (screen view).
+    pub highlight_hj: bool,
+    pub highlight_keeps: bool,
+    pub highlight_custom_tracking: bool,
+    /// Conditional text indicators: an underline in each condition's colour (screen view).
+    pub condition_indicators: bool,
+    /// Editorial note anchors (screen view).
+    pub note_indicators: bool,
+    /// Track Changes: added text highlighted (screen view).
+    pub change_markup: bool,
+    /// View › Structure › Show Tag Markers: brackets around inline-tagged text (screen view).
+    pub tag_markers: bool,
+    /// The CMYK blend space's ink passes (internal): 3 draws black ink coverage as gray, 4 cyan,
+    /// magenta and yellow coverage in red, green and blue, from each object's own color (CMYK as
+    /// authored, others through the color settings); 0–2 draw cyan, magenta or yellow as gray.
+    pub plate: Option<u8>,
+    /// View › Display Performance.
+    pub quality: DisplayQuality,
+    /// Preferences › Appearance of Black: show 100% K as rich (pure) black instead of the
+    /// accurate dark grey.
+    pub rich_black: bool,
+    /// View › Overprint Preview: overprinting inks mix with what's beneath.
+    pub overprint_preview: bool,
+    /// Screen: spreads with transparency are shown as blended in the document's blend space (a
+    /// CMYK blend space keeps their colours in the working CMYK gamut).
+    pub blend_space_view: bool,
+    /// View › Show Document Grid: the area (spread coordinates) of each listed spread that the
+    /// document grid covers, drawn behind or in front of the page items as the grid settings say
+    /// (screen view). Empty draws no grid.
+    pub document_grid: Vec<(SpreadRef, Rect)>,
+}
+
+/// View › Display Performance: how placed graphics and effects are drawn on screen.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum DisplayQuality {
+    /// Graphics as grey boxes, no transparency effects.
+    Fast,
+    /// Low-resolution proxies (72 ppi at 100%).
+    Typical,
+    /// Full resolution.
+    #[default]
+    High,
+}
+
+/// A spread placed on the canvas: canvas = xf × spread (a translation, turned for a rotated spread view).
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Placed {
+    pub spread: SpreadRef,
+    pub xf: Affine,
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct FrameStats {
+    pub items: usize,
+    pub glyphs: usize,
+    pub micros: u64,
+}
+
+#[derive(Clone, Copy)]
+pub(crate) struct Frame<'a> {
+    pub(crate) doc: &'a Document,
+    pub(crate) cache: &'a Cache,
+    pub(crate) view: Affine,
+    /// Visible area in spread space.
+    pub(crate) visible: Rect,
+    /// Size of a device pixel in points.
+    pub(crate) px: f64,
+    pub(crate) opts: &'a RenderOptions,
+    /// Drawing into a multithreaded context (no filter layers).
+    pub(crate) mt: bool,
+}
+
+pub fn default_threads() -> u16 {
+    #[cfg(target_arch = "wasm32")]
+    {
+        0
+    }
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        if let Some(n) = std::env::var("DESIGNCRAFT_RENDER_THREADS").ok().and_then(|v| v.parse().ok()) {
+            return n;
+        }
+        std::thread::available_parallelism().map(|n| (n.get().saturating_sub(1)).clamp(0, 8) as u16).unwrap_or(0)
+    }
+}
diff --git a/crates/render/tests/it/blend_over_paper.rs b/crates/render/tests/it/blend_over_paper.rs
index 0fd257027..6136e59ef 100644
--- a/crates/render/tests/it/blend_over_paper.rs
+++ b/crates/render/tests/it/blend_over_paper.rs
@@ -28,7 +28,7 @@ fn pixel(d: &Document, x: u32, y: u32) -> [u8; 4] {
     let mut r = Renderer::new();
     r.threads = 0;
     let placed = [Placed { spread: SpreadRef::Doc(0), xf: Affine::IDENTITY }];
-    let img = r.render(d, &Cache::new(), &placed, 200, 100, Affine::IDENTITY, &RenderOptions::default());
+    let img = r.render(d, &Cache::new(), &placed, (200, 100), Affine::IDENTITY, &RenderOptions::default());
     let i = ((y * 200 + x) * 4) as usize;
     [img.pixels[i], img.pixels[i + 1], img.pixels[i + 2], img.pixels[i + 3]]
 }
diff --git a/crates/render/tests/it/colorize.rs b/crates/render/tests/it/colorize.rs
index 883b36b8e..5bf87a54d 100644
--- a/crates/render/tests/it/colorize.rs
+++ b/crates/render/tests/it/colorize.rs
@@ -51,6 +51,7 @@ fn shown(file: Vec<u8>, fill: Fill) -> Vec<[u8; 4]> {
     it.fill = Fill::swatch(CYAN);
     it.stroke = Stroke::default();
     it.content = Content::Graphic(Graphic {
+        layer_options: None,
         asset: aid,
         size: (150.0, 50.0),
         xf: Affine::translate((100.0, 100.0)),
diff --git a/crates/render/tests/it/effects.rs b/crates/render/tests/it/effects.rs
index 85f17d3b4..967856d24 100644
--- a/crates/render/tests/it/effects.rs
+++ b/crates/render/tests/it/effects.rs
@@ -30,7 +30,7 @@ fn render_with(d: &Document, threads: u16) -> Rendered {
     let mut r = Renderer::new();
     r.threads = threads;
     let opts = RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
-    r.render(d, &Cache::new(), &[Placed { spread: SpreadRef::Doc(0), xf: Affine::translate(Vec2::ZERO) }], SIZE, SIZE, Affine::IDENTITY, &opts)
+    r.render(d, &Cache::new(), &[Placed { spread: SpreadRef::Doc(0), xf: Affine::translate(Vec2::ZERO) }], (SIZE, SIZE), Affine::IDENTITY, &opts)
 }
 
 fn render(d: &Document) -> Rendered {
@@ -235,7 +235,7 @@ fn render_zoomed(d: &Document) -> Rendered {
     let mut r = Renderer::new();
     let opts = RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
     let view = Affine::scale(8.0) * Affine::translate(Vec2::new(-70.0, -70.0));
-    r.render(d, &Cache::new(), &[Placed { spread: SpreadRef::Doc(0), xf: Affine::translate(Vec2::ZERO) }], SIZE, SIZE, view, &opts)
+    r.render(d, &Cache::new(), &[Placed { spread: SpreadRef::Doc(0), xf: Affine::translate(Vec2::ZERO) }], (SIZE, SIZE), view, &opts)
 }
 
 #[test]
diff --git a/crates/render/tests/it/gradient_inks.rs b/crates/render/tests/it/gradient_inks.rs
index 8bb407a66..8fec16ac4 100644
--- a/crates/render/tests/it/gradient_inks.rs
+++ b/crates/render/tests/it/gradient_inks.rs
@@ -10,7 +10,7 @@ use designcraft_render::{Placed, RenderOptions, Renderer};
 #[test]
 fn a_cmyk_gradient_is_c50_m50_halfway() {
     let mut d = Document::new(&NewDocument { width: 100.0, height: 20.0, facing_pages: false, ..Default::default() });
-    let stop = |offset: f32, color: Color| GradientStop { offset, color, opacity: 1.0, midpoint: 0.5 };
+    let stop = |offset: f32, color: Color| GradientStop::new(offset, color);
     let gradient =
         Gradient { kind: GradientKind::Linear, stops: vec![stop(0.0, Color::cmyk(0.0, 1.0, 0.0, 0.0)), stop(1.0, Color::cmyk(1.0, 0.0, 0.0, 0.0))] };
     d.swatches.push(Swatch { name: "Magenta to Cyan".into(), value: SwatchValue::Gradient { gradient }, locked: false, named: true, hidden: false });
@@ -23,8 +23,7 @@ fn a_cmyk_gradient_is_c50_m50_halfway() {
         &d,
         &Cache::new(),
         &[Placed { spread: SpreadRef::Doc(0), xf: Affine::IDENTITY }],
-        100,
-        20,
+        (100, 20),
         Affine::IDENTITY,
         &RenderOptions { paper: false, background: Some([255; 4]), ..Default::default() },
     );
diff --git a/crates/render/tests/it/gradients.rs b/crates/render/tests/it/gradients.rs
index 619d3103b..3a1c4bcd4 100644
--- a/crates/render/tests/it/gradients.rs
+++ b/crates/render/tests/it/gradients.rs
@@ -11,7 +11,7 @@ use designcraft_render::{Placed, RenderOptions, Rendered, Renderer};
 /// A 100×200 rectangle at (50, 20) filled with a black-to-white radial gradient.
 fn portrait(vector: Option<[f64; 4]>) -> Document {
     let mut d = Document::new(&NewDocument { width: 200.0, height: 240.0, facing_pages: false, ..Default::default() });
-    let stop = |offset: f32, color: Color| GradientStop { offset, color, opacity: 1.0, midpoint: 0.5 };
+    let stop = |offset: f32, color: Color| GradientStop::new(offset, color);
     d.swatches.push(Swatch {
         name: "Radial".into(),
         value: SwatchValue::Gradient {
@@ -32,7 +32,7 @@ fn render(d: &Document) -> Rendered {
     let mut r = Renderer::new();
     r.threads = 0;
     let opts = RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
-    r.render(d, &Cache::new(), &[Placed { spread: SpreadRef::Doc(0), xf: Affine::translate(Vec2::ZERO) }], 200, 240, Affine::IDENTITY, &opts)
+    r.render(d, &Cache::new(), &[Placed { spread: SpreadRef::Doc(0), xf: Affine::translate(Vec2::ZERO) }], (200, 240), Affine::IDENTITY, &opts)
 }
 
 fn grey(img: &Rendered, x: u32, y: u32) -> u8 {
diff --git a/crates/render/tests/it/perf.rs b/crates/render/tests/it/perf.rs
index 46f33ab62..b6bdce5b4 100644
--- a/crates/render/tests/it/perf.rs
+++ b/crates/render/tests/it/perf.rs
@@ -61,22 +61,22 @@ fn glyph_paths_are_cached_and_offscreen_text_is_skipped() {
     // 200% view of the top-left of the first spread: only a few frames are visible.
     let view = Affine::scale(2.0);
     let opts = RenderOptions::default();
-    let a = r.render(&d, &cache, &all, 800, 600, view, &opts);
+    let a = r.render(&d, &cache, &all, (800, 600), view, &opts);
     let drawn = r.stats.glyphs;
     assert!(drawn > 100, "glyphs drawn: {drawn}");
     assert!(r.cached_frames() <= 4, "only visible frames get glyph paths: {}", r.cached_frames());
     // Same pixels from the cache.
-    let b = r.render(&d, &cache, &all, 800, 600, view, &opts);
+    let b = r.render(&d, &cache, &all, (800, 600), view, &opts);
     assert!(a.pixels == b.pixels);
     // Culling: far fewer glyphs than the visible frames hold.
-    let whole = r.render(&d, &cache, &all, 2400, 1600, Affine::scale(1.0), &opts);
+    let whole = r.render(&d, &cache, &all, (2400, 1600), Affine::scale(1.0), &opts);
     assert!(r.stats.glyphs > drawn * 2, "{} vs {drawn}", r.stats.glyphs);
     drop(whole);
     // A new composition (edited story) gets fresh paths.
     let mut d2 = d.clone();
     let sid = *d2.stories.keys().next().unwrap();
     d2.set_story_text(sid, "Edited").unwrap();
-    let c = r.render(&d2, &cache, &all, 800, 600, view, &opts);
+    let c = r.render(&d2, &cache, &all, (800, 600), view, &opts);
     assert!(r.stats.glyphs < 10);
     assert!(c.pixels != a.pixels);
 }
@@ -88,7 +88,7 @@ fn greeked_text_builds_no_glyph_paths() {
     let mut r = Renderer::new();
     r.threads = 0;
     let opts = RenderOptions { greek_below_px: 6.0, ..Default::default() };
-    let img = r.render(&d, &cache, &placed(&d), 400, 300, Affine::scale(0.3), &opts);
+    let img = r.render(&d, &cache, &placed(&d), (400, 300), Affine::scale(0.3), &opts);
     assert_eq!(r.stats.glyphs, 0);
     assert_eq!(r.cached_frames(), 0);
     // The grey bars are drawn.
@@ -106,11 +106,11 @@ fn render_text_heavy_spread_at_100_percent_within_budget() {
     // 100% on a HiDPI 2880×1800 canvas = 2 px/pt, centred on the second spread.
     let view = Affine::scale(2.0) * Affine::translate((0.0, -828.0));
     let opts = RenderOptions { greek_below_px: 6.0, ..Default::default() };
-    r.render(&d, &cache, &all, 2880, 1800, view, &opts);
+    r.render(&d, &cache, &all, (2880, 1800), view, &opts);
     let mut v: Vec<f64> = (0..9)
         .map(|_| {
             let t = Instant::now();
-            drop(r.render(&d, &cache, &all, 2880, 1800, view, &opts));
+            drop(r.render(&d, &cache, &all, (2880, 1800), view, &opts));
             t.elapsed().as_secs_f64() * 1000.0
         })
         .collect();
diff --git a/crates/render/tests/it/placed_pdf.rs b/crates/render/tests/it/placed_pdf.rs
index 118453067..deb699e11 100644
--- a/crates/render/tests/it/placed_pdf.rs
+++ b/crates/render/tests/it/placed_pdf.rs
@@ -78,6 +78,7 @@ fn placed(size: f64, pdf: Vec<u8>) -> Rendered {
         let id = ItemId(d.alloc());
         let mut item = Item::new(id, d.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, size, size)));
         item.content = Content::Graphic(Graphic {
+            layer_options: None,
             asset,
             size: (size, size),
             xf: Affine::IDENTITY,
diff --git a/crates/render/tests/it/stroke_alignment.rs b/crates/render/tests/it/stroke_alignment.rs
index eee8450ab..e1c233c8a 100644
--- a/crates/render/tests/it/stroke_alignment.rs
+++ b/crates/render/tests/it/stroke_alignment.rs
@@ -30,8 +30,7 @@ fn render_with(path: PathData, fill: bool, stroke: Stroke, xf: Affine, threads:
         &d,
         &Cache::new(),
         &[Placed { spread: SpreadRef::Doc(0), xf: Affine::IDENTITY }],
-        96,
-        96,
+        (96, 96),
         Affine::IDENTITY,
         &RenderOptions { paper: false, background, ..Default::default() },
     )
diff --git a/crates/render/tests/it/text_frame_bottom.rs b/crates/render/tests/it/text_frame_bottom.rs
index 3716902f8..56e162c67 100644
--- a/crates/render/tests/it/text_frame_bottom.rs
+++ b/crates/render/tests/it/text_frame_bottom.rs
@@ -21,8 +21,7 @@ fn text_image(height: f64) -> Rendered {
         &d,
         &Cache::new(),
         &[Placed { spread: SpreadRef::Doc(0), xf: Affine::IDENTITY }],
-        160,
-        100,
+        (160, 100),
         Affine::IDENTITY,
         &RenderOptions { background: Some([255; 4]), ..Default::default() },
     )
diff --git a/crates/textimport/src/docx.rs b/crates/textimport/src/docx.rs
index 87aaa3359..94085ca69 100644
--- a/crates/textimport/src/docx.rs
+++ b/crates/textimport/src/docx.rs
@@ -186,8 +186,8 @@ fn run_attrs(rpr: Option<&El>) -> CharAttrs {
     if let Some(s) = r.on("strike") {
         a.strikethrough = Some(s);
     }
-    // Half-points; sizes outside the engine's 0.1–1296 pt range (or non-finite) are dropped.
-    if let Some(pt) = r.val("sz").and_then(|v| v.parse::<f64>().ok()).map(|sz| sz / 2.0).filter(|pt| (0.1..=1296.0).contains(pt)) {
+    // Half-points; a size the engine cannot mean is dropped (#1593).
+    if let Some(pt) = r.val("sz").and_then(|v| v.parse::<f64>().ok()).map(|sz| sz / 2.0).and_then(designcraft_doc::attrs::imported_type_size) {
         a.size = Some(pt);
     }
     if let Some(f) = r.child("rFonts").and_then(|f| f.attr("ascii").or(f.attr("hAnsi"))) {
@@ -210,7 +210,8 @@ fn run_attrs(rpr: Option<&El>) -> CharAttrs {
 fn para_attrs(ppr: Option<&El>) -> ParaAttrs {
     let mut a = ParaAttrs::default();
     let Some(p) = ppr else { return a };
-    let tw = |v: Option<&str>| v.and_then(|v| v.parse::<f64>().ok()).filter(|v| v.is_finite()).map(|v| v / 20.0);
+    // Twips, clamped: a file can hold 1e300, which became a 5e298 pt indent (#1593).
+    let tw = |v: Option<&str>| v.and_then(|v| v.parse::<f64>().ok()).map(|v| v / 20.0).and_then(designcraft_doc::attrs::imported_measure);
     if let Some(sp) = p.child("spacing") {
         a.space_before = tw(sp.attr("before"));
         a.space_after = tw(sp.attr("after"));
@@ -303,7 +304,7 @@ impl Ctx {
                     let t = Table::from_strings(self.next_table, &rows, 300.0, &ParaFormat::default(), &CharFormat::default());
                     let len = st.len();
                     st.insert_table(len, t);
-                    first = false;
+                    first = st.text.ends_with('\n');
                 }
                 "sdt" => {
                     if let Some(c) = e.child("sdtContent") {
@@ -581,487 +582,4 @@ pub fn import(bytes: &[u8]) -> Result<Imported, ImportError> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use std::io::Write;
-
-    #[test]
-    fn cdata_text() {
-        let el = parse("<a><t><![CDATA[x < y]]></t></a>").unwrap();
-        assert_eq!(el.child("t").unwrap().text(), "x < y");
-    }
-
-    /// Issue #712: nesting past the budget is an error from the parser, not a stack overflow later.
-    #[test]
-    fn nesting_past_the_budget_is_refused() {
-        let nested = |n: usize| format!("{}{}", "<w:p>".repeat(n), "</w:p>".repeat(n));
-        let ok = parse(&nested(MAX_DEPTH)).expect("the budget itself parses");
-        assert_eq!(ok.name, "p");
-        let err = parse(&nested(MAX_DEPTH + 1)).expect_err("one level more is refused");
-        assert!(err.to_string().contains("nested deeper"), "{err}");
-        assert!(parse(&nested(100_000)).is_err());
-    }
-
-    pub(crate) fn docx(document: &str, styles: &str, footnotes: &str) -> Vec<u8> {
-        docx_parts(&[("word/document.xml", document), ("word/styles.xml", styles), ("word/footnotes.xml", footnotes)])
-    }
-
-    /// A zip of `(part name, XML)`; empty parts are left out.
-    fn docx_parts(parts: &[(&str, &str)]) -> Vec<u8> {
-        let mut w = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
-        let o = zip::write::SimpleFileOptions::default();
-        for &(n, c) in parts {
-            if c.is_empty() {
-                continue;
-            }
-            w.start_file(n, o).unwrap();
-            w.write_all(c.as_bytes()).unwrap();
-        }
-        w.finish().unwrap().into_inner()
-    }
-
-    const W: &str = r#"xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main""#;
-
-    #[test]
-    fn oversized_part_is_an_error_not_a_huge_read() {
-        // A highly compressible part: 64 KiB of spaces inflates past a 4 KiB cap.
-        let big = docx(&" ".repeat(64 * 1024), "", "");
-        let mut zip = zip::ZipArchive::new(std::io::Cursor::new(big.as_slice())).unwrap();
-        assert!(matches!(part_capped(&mut zip, "word/document.xml", 4096), Err(ImportError::Corrupt(_))));
-        // At or under the cap reads fine; a missing part is `None`.
-        assert_eq!(part_capped(&mut zip, "word/document.xml", 64 * 1024).unwrap().map(|s| s.len()), Some(64 * 1024));
-        assert_eq!(part_capped(&mut zip, "word/missing.xml", 4096).unwrap(), None);
-    }
-
-    #[test]
-    fn imports_styles_runs_footnotes_and_tables() {
-        let styles = format!(
-            r#"<w:styles {W}>
-              <w:style w:type="paragraph" w:styleId="Normal"><w:name w:val="Normal"/></w:style>
-              <w:style w:type="paragraph" w:styleId="Heading1"><w:name w:val="heading 1"/><w:basedOn w:val="Normal"/>
-                <w:pPr><w:spacing w:before="240" w:after="120"/></w:pPr><w:rPr><w:b/><w:sz w:val="32"/></w:rPr></w:style>
-              <w:style w:type="paragraph" w:styleId="Unused"><w:name w:val="Unused"/></w:style>
-              <w:style w:type="character" w:styleId="Emph"><w:name w:val="Emphasis"/><w:rPr><w:i/></w:rPr></w:style>
-            </w:styles>"#
-        );
-        let document = format!(
-            r#"<w:document {W}><w:body>
-              <w:p><w:pPr><w:pStyle w:val="Heading1"/></w:pPr><w:r><w:t>Title &amp; more</w:t></w:r></w:p>
-              <w:p><w:r><w:t xml:space="preserve">Plain </w:t></w:r><w:r><w:rPr><w:b/></w:rPr><w:t>bold</w:t></w:r>
-                <w:r><w:rPr><w:rStyle w:val="Emph"/></w:rPr><w:t> styled</w:t></w:r><w:r><w:tab/><w:t>x</w:t></w:r>
-                <w:r><w:footnoteReference w:id="1"/></w:r></w:p>
-              <w:tbl><w:tr><w:tc><w:p><w:r><w:t>A</w:t></w:r></w:p></w:tc><w:tc><w:p><w:r><w:t>B</w:t></w:r></w:p></w:tc></w:tr></w:tbl>
-              <w:p><w:r><w:t>After</w:t></w:r></w:p>
-            </w:body></w:document>"#
-        );
-        let notes = format!(
-            r#"<w:footnotes {W}><w:footnote w:id="0"><w:p/></w:footnote>
-              <w:footnote w:id="1"><w:p><w:r><w:t>The note.</w:t></w:r></w:p></w:footnote></w:footnotes>"#
-        );
-        let i = import(&docx(&document, &styles, &notes)).unwrap();
-        let st = &i.story;
-        st.check().unwrap();
-        assert!(st.text.starts_with("Title & more\nPlain bold styled\tx"), "{:?}", st.text);
-        assert!(st.text.ends_with("After"));
-        assert_eq!(st.paras[0].style, "heading 1");
-        assert_eq!(st.paras[1].style, "Normal");
-        let at = st.text.find("bold").unwrap();
-        assert_eq!(st.format_after(at).over.font_style.as_deref(), Some("Bold"));
-        assert_eq!(st.format_after(st.text.find("styled").unwrap()).style, "Emphasis");
-        assert_eq!(st.notes.len(), 1);
-        assert_eq!(st.notes[0].text.text, "The note.");
-        assert_eq!(st.tables.len(), 1);
-        let names: Vec<&str> = i.para_styles.iter().map(|s| s.name.as_str()).collect();
-        assert_eq!(names, ["Normal", "heading 1"], "unused styles are skipped");
-        assert_eq!(i.para_styles[1].based_on.as_deref(), Some("Normal"));
-        assert_eq!(i.para_styles[1].chars.size, Some(16.0));
-        assert_eq!(i.para_styles[1].para.space_before, Some(12.0));
-        assert_eq!(i.char_styles[0].chars.font_style.as_deref(), Some("Italic"));
-    }
-
-    /// A content control inside a paragraph (`w:sdt`) keeps its text, also around a hyperlink.
-    #[test]
-    fn inline_content_control_text_is_kept() {
-        let document = format!(
-            r#"<w:document {W}><w:body>
-              <w:p><w:r><w:t xml:space="preserve">Date: </w:t></w:r><w:sdt><w:sdtPr><w:alias w:val="d"/></w:sdtPr><w:sdtContent><w:r><w:t>1 May 2026</w:t></w:r></w:sdtContent></w:sdt><w:r><w:t>.</w:t></w:r></w:p>
-              <w:p><w:sdt><w:sdtContent><w:hyperlink><w:r><w:t>Link</w:t></w:r></w:hyperlink></w:sdtContent></w:sdt></w:p>
-            </w:body></w:document>"#
-        );
-        let st = import(&docx(&document, "", "")).unwrap().story;
-        st.check().unwrap();
-        assert_eq!(st.text, "Date: 1 May 2026.\nLink");
-    }
-
-    /// `str::parse::<f64>` accepts "NaN"/"inf"; sizes, spacing and indents must ignore them.
-    #[test]
-    fn non_finite_sizes_spacing_and_indents_are_ignored() {
-        let document = format!(
-            r#"<w:document {W}><w:body>
-              <w:p><w:pPr><w:spacing w:before="NaN" w:after="inf"/><w:ind w:left="-inf" w:right="NaN" w:firstLine="-inf"/></w:pPr>
-                <w:r><w:rPr><w:sz w:val="NaN"/></w:rPr><w:t>a</w:t></w:r><w:r><w:rPr><w:sz w:val="inf"/></w:rPr><w:t>b</w:t></w:r></w:p>
-              <w:p><w:pPr><w:ind w:hanging="inf"/></w:pPr><w:r><w:t>c</w:t></w:r></w:p>
-            </w:body></w:document>"#
-        );
-        let st = import(&docx(&document, "", "")).unwrap().story;
-        let fin = |v: Option<f64>| v.is_none_or(f64::is_finite);
-        for p in &st.paras {
-            let p = &p.para;
-            assert!(fin(p.space_before) && fin(p.space_after), "{p:?}");
-            assert!(fin(p.left_indent) && fin(p.right_indent) && fin(p.first_line_indent), "{p:?}");
-        }
-        for at in [0, 1] {
-            assert!(fin(st.format_after(at).over.size), "{:?}", st.format_after(at).over.size);
-        }
-    }
-
-    #[test]
-    fn out_of_range_sizes_are_dropped() {
-        let document = format!(
-            r#"<w:document {W}><w:body>
-              <w:p><w:r><w:rPr><w:sz w:val="0"/></w:rPr><w:t>a</w:t></w:r><w:r><w:rPr><w:sz w:val="99999999"/></w:rPr><w:t>b</w:t></w:r></w:p>
-            </w:body></w:document>"#
-        );
-        let st = import(&docx(&document, "", "")).unwrap().story;
-        for at in [0, 1] {
-            assert_eq!(st.format_after(at).over.size, None, "run {at}");
-        }
-    }
-
-    #[test]
-    fn tracked_changes_import_as_accepted_including_moves() {
-        // Regression (#256): text in a tracked move destination (`w:moveTo`) vanished on import.
-        let document = format!(
-            r#"<w:document {W}><w:body>
-              <w:p><w:r><w:t xml:space="preserve">Kept text. </w:t></w:r>
-                <w:moveTo w:id="1" w:author="A"><w:r><w:t xml:space="preserve">MOVED HERE.</w:t></w:r>
-                  <w:del w:id="5" w:author="A"><w:r><w:delText>MOVED THEN DELETED</w:delText></w:r></w:del></w:moveTo>
-                <w:r><w:t xml:space="preserve"> Plain </w:t></w:r>
-                <w:ins w:id="2" w:author="A"><w:r><w:t>INSERTED</w:t></w:r></w:ins>
-                <w:del w:id="3" w:author="A"><w:r><w:delText>DELETED</w:delText></w:r></w:del></w:p>
-              <w:p><w:moveFrom w:id="4" w:author="A"><w:r><w:t>MOVED HERE.</w:t></w:r></w:moveFrom><w:r><w:t>End.</w:t></w:r></w:p>
-            </w:body></w:document>"#
-        );
-        let i = import(&docx(&document, "", "")).unwrap();
-        i.story.check().unwrap();
-        assert_eq!(i.story.text, "Kept text. MOVED HERE. Plain INSERTED\nEnd.");
-    }
-
-    /// A page break ends its paragraph: the text after it is a paragraph of its own (same style).
-    #[test]
-    fn page_break_ends_its_paragraph() {
-        let styles = format!(r#"<w:styles {W}><w:style w:type="paragraph" w:styleId="H"><w:name w:val="Chapter"/></w:style></w:styles>"#);
-        let document = format!(
-            r#"<w:document {W}><w:body>
-              <w:p><w:r><w:t>End of one</w:t></w:r><w:r><w:br w:type="page"/></w:r></w:p>
-              <w:p><w:pPr><w:pStyle w:val="H"/></w:pPr><w:r><w:br w:type="page"/><w:t>Two</w:t><w:br w:type="column"/></w:r></w:p>
-            </w:body></w:document>"#
-        );
-        let st = import(&docx(&document, &styles, "")).unwrap().story;
-        st.check().unwrap();
-        let (pb, cb) = (designcraft_doc::PAGE_BREAK, designcraft_doc::COLUMN_BREAK);
-        assert_eq!(st.text, format!("End of one{pb}\n{pb}\nTwo{cb}\n"));
-        let styles: Vec<&str> = st.paras.iter().map(|p| p.style.as_str()).collect();
-        assert_eq!(styles, [BASIC_PARAGRAPH, "Chapter", "Chapter", "Chapter"]);
-    }
-
-    /// A paragraph in a Word list: `w:numPr` with `numId` and, unless `None`, `ilvl`.
-    fn list_p(num_id: &str, ilvl: Option<&str>, text: &str) -> String {
-        let ilvl = ilvl.map(|l| format!(r#"<w:ilvl w:val="{l}"/>"#)).unwrap_or_default();
-        format!(r#"<w:p><w:pPr><w:numPr>{ilvl}<w:numId w:val="{num_id}"/></w:numPr></w:pPr><w:r><w:t>{text}</w:t></w:r></w:p>"#)
-    }
-
-    fn plain_p(text: &str) -> String {
-        format!(r#"<w:p><w:r><w:t>{text}</w:t></w:r></w:p>"#)
-    }
-
-    fn lists_docx(numbering: &str, styles: &str, body: &[String]) -> Imported {
-        let document = format!(r#"<w:document {W}><w:body>{}</w:body></w:document>"#, body.concat());
-        let i = import(&docx_parts(&[("word/document.xml", &document), ("word/styles.xml", styles), ("word/numbering.xml", numbering)])).unwrap();
-        i.story.check().unwrap();
-        i
-    }
-
-    /// The label composition gives paragraph `i`: numbered paragraphs count per level on one
-    /// counter that a paragraph outside a list restarts; bullets and empty paragraphs leave it.
-    fn label(st: &Story, i: usize) -> String {
-        let mut counter = designcraft_doc::ListCounter::default();
-        let mut label = String::new();
-        for (f, r) in st.paras.iter().zip(st.para_ranges()).take(i + 1) {
-            let mut p = designcraft_doc::ParaProps::default();
-            p.apply(&f.para);
-            label = match p.list_type {
-                _ if r.is_empty() => String::new(),
-                ListType::Numbers => {
-                    counter.advance(&p);
-                    p.number_label_in(&counter)
-                }
-                ListType::Bullets => p.bullet_label(),
-                ListType::None => {
-                    counter = designcraft_doc::ListCounter::default();
-                    String::new()
-                }
-            };
-        }
-        label
-    }
-
-    /// Regression (#626): pandoc's Markdown list example lost its bullets and numbers.
-    #[test]
-    fn bullets_and_numbers_from_numbering_xml() {
-        let numbering = format!(
-            r#"<w:numbering {W}>
-              <w:abstractNum w:abstractNumId="990"><w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="bullet"/><w:lvlText w:val="•"/>
-                <w:pPr><w:ind w:left="480" w:hanging="480"/></w:pPr></w:lvl></w:abstractNum>
-              <w:abstractNum w:abstractNumId="991"><w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1."/>
-                <w:pPr><w:ind w:left="480" w:hanging="480"/></w:pPr></w:lvl></w:abstractNum>
-              <w:num w:numId="1000"><w:abstractNumId w:val="990"/></w:num>
-              <w:num w:numId="1001"><w:abstractNumId w:val="991"/><w:lvlOverride w:ilvl="0"><w:startOverride w:val="1"/></w:lvlOverride></w:num>
-            </w:numbering>"#
-        );
-        let body = [
-            plain_p("Intro paragraph."),
-            list_p("1000", Some("0"), "first item"),
-            list_p("1000", Some("0"), "second item"),
-            list_p("1001", Some("0"), "step one"),
-            list_p("1001", Some("0"), "step two"),
-        ];
-        let st = lists_docx(&numbering, "", &body).story;
-        let types: Vec<Option<ListType>> = st.paras.iter().map(|p| p.para.list_type).collect();
-        assert_eq!(types, [None, Some(ListType::Bullets), Some(ListType::Bullets), Some(ListType::Numbers), Some(ListType::Numbers)]);
-        assert_eq!(label(&st, 1), "•\t");
-        assert_eq!(st.paras[3].para.number_style, Some(designcraft_doc::NumberStyle::Arabic));
-        assert_eq!((label(&st, 3), label(&st, 4)), ("1.\t".to_string(), "2.\t".to_string()));
-        // The model's own counter already starts at 1 and carries on: no Start At needed.
-        assert_eq!((st.paras[3].para.start_at, st.paras[4].para.start_at), (None, None));
-        assert_eq!((st.paras[1].para.left_indent, st.paras[1].para.first_line_indent), (Some(24.0), Some(-24.0)));
-    }
-
-    /// Level 1 inside level 0, parent numbers in a label, numbering that carries on past a plain
-    /// paragraph, and a `num` with a start override restarting.
-    #[test]
-    fn nested_levels_and_restarts() {
-        let numbering = format!(
-            r#"<w:numbering {W}>
-              <w:abstractNum w:abstractNumId="1">
-                <w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1."/></w:lvl>
-                <w:lvl w:ilvl="1"><w:start w:val="1"/><w:numFmt w:val="lowerLetter"/><w:lvlText w:val="%2)"/><w:suff w:val="space"/>
-                  <w:pPr><w:ind w:left="1440" w:hanging="360"/></w:pPr></w:lvl>
-                <w:lvl w:ilvl="2"><w:start w:val="1"/><w:numFmt w:val="upperRoman"/><w:lvlText w:val="%1.%2.%3"/></w:lvl>
-              </w:abstractNum>
-              <w:num w:numId="1"><w:abstractNumId w:val="1"/></w:num>
-              <w:num w:numId="2"><w:abstractNumId w:val="1"/><w:lvlOverride w:ilvl="0"><w:startOverride w:val="1"/></w:lvlOverride></w:num>
-              <w:num w:numId="3"><w:abstractNumId w:val="1"/></w:num>
-            </w:numbering>"#
-        );
-        let body = [
-            list_p("1", None, "A"),
-            list_p("1", Some("1"), "B"),
-            list_p("1", Some("1"), "C"),
-            list_p("1", Some("2"), "D"),
-            list_p("1", Some("0"), "E"),
-            plain_p("Between"),
-            list_p("1", Some("0"), "F"),
-            list_p("2", Some("0"), "G"),
-            list_p("3", Some("0"), "H"),
-        ];
-        let st = lists_docx(&numbering, "", &body).story;
-        let start: Vec<Option<Option<u32>>> = st.paras.iter().map(|p| p.para.start_at).collect();
-        // Word's numbers: 1, a, b, 1.b.I, 2, –, 3, 1 (own counter), 4 (shares numId 1's). The
-        // model numbers each level on its own, so only the paragraphs after the plain one need
-        // Start At.
-        assert_eq!(start, [None, None, None, None, None, None, Some(Some(3)), Some(Some(1)), Some(Some(4))]);
-        let levels: Vec<Option<u32>> = st.paras.iter().map(|p| p.para.list_level).collect();
-        assert_eq!(levels, [Some(1), Some(2), Some(2), Some(3), Some(1), None, Some(1), Some(1), Some(1)]);
-        assert_eq!(label(&st, 1), "a) ");
-        // Parent numbers are the model's level references.
-        assert_eq!(st.paras[3].para.number_expression.as_deref(), Some("^1.^2.^#^t"));
-        assert_eq!(label(&st, 3), "1.b.I\t");
-        let labels: Vec<String> = (0..st.paras.len()).map(|i| label(&st, i)).collect();
-        assert_eq!(labels, ["1.\t", "a) ", "b) ", "1.b.I\t", "2.\t", "", "3.\t", "1.\t", "4.\t"]);
-        assert_eq!(st.paras[1].para.left_indent, Some(72.0));
-        assert_eq!(st.paras[1].para.first_line_indent, Some(-18.0));
-    }
-
-    /// Parent numbers the model's levels can't give are written as text: a list that starts at
-    /// level 1 (level 0 never numbered), and a legal-style label (decimal parents).
-    #[test]
-    fn parent_numbers_the_model_lacks_are_text() {
-        let numbering = format!(
-            r#"<w:numbering {W}>
-              <w:abstractNum w:abstractNumId="1">
-                <w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="upperRoman"/><w:lvlText w:val="%1."/></w:lvl>
-                <w:lvl w:ilvl="1"><w:start w:val="1"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1.%2"/></w:lvl>
-                <w:lvl w:ilvl="2"><w:start w:val="1"/><w:isLgl/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1.%2.%3"/></w:lvl>
-              </w:abstractNum>
-              <w:num w:numId="1"><w:abstractNumId w:val="1"/></w:num>
-            </w:numbering>"#
-        );
-        let body = [list_p("1", Some("1"), "A"), list_p("1", Some("0"), "B"), list_p("1", Some("1"), "C"), list_p("1", Some("2"), "D")];
-        let st = lists_docx(&numbering, "", &body).story;
-        let labels: Vec<String> = (0..st.paras.len()).map(|i| label(&st, i)).collect();
-        assert_eq!(labels, ["I.1\t", "I.\t", "I.1\t", "1.1.1\t"]);
-        assert_eq!(st.paras[0].para.number_expression.as_deref(), Some("I.^#^t"));
-        assert_eq!(st.paras[2].para.number_expression.as_deref(), Some("^1.^#^t"));
-    }
-
-    /// A paragraph style's `w:numPr` (inherited through `w:basedOn`) makes its paragraphs a list;
-    /// numId 0 on a paragraph takes it out of the list.
-    #[test]
-    fn style_lists_and_num_id_zero() {
-        let numbering = format!(
-            r#"<w:numbering {W}>
-              <w:abstractNum w:abstractNumId="7">
-                <w:lvl w:ilvl="0"><w:numFmt w:val="bullet"/><w:lvlText w:val="&#xF0B7;"/><w:rPr><w:rFonts w:ascii="Symbol" w:hAnsi="Symbol"/></w:rPr></w:lvl>
-                <w:lvl w:ilvl="1"><w:numFmt w:val="bullet"/><w:lvlText w:val="o"/><w:rPr><w:rFonts w:ascii="Courier New"/></w:rPr></w:lvl>
-              </w:abstractNum>
-              <w:num w:numId="5"><w:abstractNumId w:val="7"/></w:num>
-            </w:numbering>"#
-        );
-        let styles = format!(
-            r#"<w:styles {W}>
-              <w:style w:type="paragraph" w:styleId="ListBullet"><w:name w:val="List Bullet"/><w:pPr><w:numPr><w:numId w:val="5"/></w:numPr></w:pPr></w:style>
-              <w:style w:type="paragraph" w:styleId="ListBullet2"><w:name w:val="List Bullet 2"/><w:basedOn w:val="ListBullet"/>
-                <w:pPr><w:numPr><w:ilvl w:val="1"/></w:numPr></w:pPr></w:style>
-            </w:styles>"#
-        );
-        let styled =
-            |id: &str, extra: &str, text: &str| format!(r#"<w:p><w:pPr><w:pStyle w:val="{id}"/>{extra}</w:pPr><w:r><w:t>{text}</w:t></w:r></w:p>"#);
-        let body = [
-            styled("ListBullet", "", "one"),
-            styled("ListBullet2", "", "two"),
-            styled("ListBullet", r#"<w:numPr><w:ilvl w:val="0"/><w:numId w:val="0"/></w:numPr>"#, "not a list"),
-        ];
-        let st = lists_docx(&numbering, &styles, &body).story;
-        assert_eq!(label(&st, 0), "•\t");
-        assert_eq!(label(&st, 1), "◦\t");
-        assert_eq!(st.paras[2].para.list_type, None);
-        assert_eq!(st.paras[2].style, "List Bullet");
-    }
-
-    /// Hostile list definitions: missing abstractNums and levels, huge or negative levels and
-    /// starts, a long label, a `w:basedOn` cycle. No panic; what can't be a list is plain.
-    #[test]
-    fn hostile_numbering_falls_back_to_plain_paragraphs() {
-        let long = "x".repeat(10_000);
-        let numbering = format!(
-            r#"<w:numbering {W}>
-              <w:abstractNum w:abstractNumId="1">
-                <w:lvl w:ilvl="0"><w:start w:val="99999999999999"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1{long}%9%"/></w:lvl>
-                <w:lvl w:ilvl="99999999999999"><w:numFmt w:val="decimal"/></w:lvl>
-                <w:lvl w:ilvl="-1"><w:numFmt w:val="decimal"/></w:lvl>
-                <w:lvl w:ilvl="3"><w:start w:val="-5"/><w:numFmt w:val="ordinalText"/><w:lvlText w:val="%4^"/><w:lvlRestart w:val="99"/></w:lvl>
-              </w:abstractNum>
-              <w:num w:numId="1"><w:abstractNumId w:val="1"/></w:num>
-              <w:num w:numId="2"><w:abstractNumId w:val="404"/></w:num>
-              <w:num w:numId="3"/>
-              <w:num><w:abstractNumId w:val="1"/></w:num>
-            </w:numbering>"#
-        );
-        let styles = format!(
-            r#"<w:styles {W}>
-              <w:style w:type="paragraph" w:styleId="A"><w:name w:val="A"/><w:basedOn w:val="B"/></w:style>
-              <w:style w:type="paragraph" w:styleId="B"><w:name w:val="B"/><w:basedOn w:val="A"/></w:style>
-            </w:styles>"#
-        );
-        let body = [
-            list_p("2", None, "missing abstractNum"),
-            list_p("3", None, "num without abstractNum"),
-            list_p("404", None, "unknown numId"),
-            list_p("1", Some("99999999999999"), "huge level"),
-            list_p("1", Some("9"), "level 9"),
-            list_p("1", Some("-1"), "negative level"),
-            list_p("1", Some("1"), "undefined level"),
-            r#"<w:p><w:pPr><w:pStyle w:val="A"/><w:numPr><w:ilvl w:val="0"/></w:numPr></w:pPr><w:r><w:t>cycle</w:t></w:r></w:p>"#.to_string(),
-            list_p("1", None, "huge start"),
-            list_p("1", Some("3"), "negative start"),
-        ];
-        let st = lists_docx(&numbering, &styles, &body).story;
-        assert!(st.paras[..8].iter().all(|p| p.para.list_type.is_none()), "{:?}", st.paras);
-        assert_eq!(st.paras[8].para.start_at, Some(Some(u32::MAX)));
-        let expr = st.paras[8].para.number_expression.clone().unwrap_or_default();
-        assert!(expr.starts_with("^#x") && expr.chars().count() < 80, "{expr}");
-        // A start below 0 counts from 0, which the model shows as 1; `^` in a label is literal.
-        assert_eq!(label(&st, 9), "1^\t");
-        // Unreadable list definitions leave plain paragraphs and a warning, not a failed import.
-        let document = format!(r#"<w:document {W}><w:body>{}</w:body></w:document>"#, list_p("1", None, "x"));
-        let i = import(&docx_parts(&[("word/document.xml", &document), ("word/numbering.xml", "<w:numbering></w:num>")])).unwrap();
-        assert_eq!(i.story.paras[0].para.list_type, None);
-        assert_eq!(i.warnings.len(), 1);
-    }
-
-    #[test]
-    fn an_element_with_many_attributes_parses_in_linear_time() {
-        // RUSTSEC-2026-0194: before quick-xml 0.41 the duplicate-attribute check compared each name with every
-        // earlier one on the element, so a crafted .docx/.xlsx with one huge tag hung the import (O(N²)).
-        let attrs: String = (0..100_000).map(|i| format!(" w:a{i}=\"{i}\"")).collect();
-        let xml = format!("<w:document><w:body><w:p{attrs}/></w:body></w:document>");
-        let started = std::time::Instant::now();
-        let doc = parse(&xml).unwrap();
-        assert!(started.elapsed() < std::time::Duration::from_secs(5), "parse took {:?}", started.elapsed());
-        let p = doc.child("body").and_then(|b| b.child("p")).unwrap();
-        assert_eq!(p.attr("a0"), Some("0"));
-        assert_eq!(p.attr("a99999"), Some("99999"));
-    }
-
-    #[test]
-    fn table_cells_read_text_like_body_paragraphs() {
-        // Regression (#721): cells took every text node, so deleted text, move sources and field
-        // instructions showed up in the table.
-        let para = r#"<w:p><w:r><w:t xml:space="preserve">kept </w:t></w:r>
-            <w:del w:id="1" w:author="A"><w:r><w:delText>GONE</w:delText></w:r></w:del>
-            <w:moveFrom w:id="2" w:author="A"><w:r><w:t>MOVED AWAY</w:t></w:r></w:moveFrom>
-            <w:r><w:fldChar w:fldCharType="begin"/></w:r><w:r><w:instrText xml:space="preserve"> PAGE </w:instrText></w:r>
-            <w:r><w:fldChar w:fldCharType="separate"/></w:r><w:r><w:t>7</w:t></w:r><w:r><w:fldChar w:fldCharType="end"/></w:r></w:p>"#;
-        let document = format!(r#"<w:document {W}><w:body>{para}<w:tbl><w:tr><w:tc>{para}<w:p/></w:tc></w:tr></w:tbl></w:body></w:document>"#);
-        let i = import(&docx(&document, "", "")).unwrap();
-        assert!(i.story.text.starts_with("kept 7"), "{:?}", i.story.text);
-        let cell = &i.story.tables.values().next().unwrap().cell(0, 0).unwrap().text;
-        assert_eq!(cell.text, "kept 7\n");
-    }
-
-    #[test]
-    fn normal_is_its_own_style_over_the_document_defaults() {
-        // Regression (#722): text formatted only by Normal and the document defaults lost it.
-        let styles = format!(
-            r#"<w:styles {W}><w:docDefaults><w:rPrDefault><w:rPr><w:sz w:val="22"/></w:rPr></w:rPrDefault>
-              <w:pPrDefault><w:pPr><w:spacing w:after="160"/></w:pPr></w:pPrDefault></w:docDefaults>
-              <w:style w:type="paragraph" w:default="1" w:styleId="Normal"><w:name w:val="Normal"/><w:rPr><w:rFonts w:ascii="Georgia"/><w:sz w:val="26"/></w:rPr></w:style>
-              <w:style w:type="paragraph" w:styleId="Quote"><w:name w:val="Quote"/><w:basedOn w:val="Normal"/><w:rPr><w:i/></w:rPr></w:style>
-            </w:styles>"#
-        );
-        let document = format!(
-            r#"<w:document {W}><w:body><w:p><w:r><w:t>Plain</w:t></w:r></w:p>
-            <w:p><w:pPr><w:pStyle w:val="Quote"/></w:pPr><w:r><w:t>Quoted</w:t></w:r></w:p></w:body></w:document>"#
-        );
-        let i = import(&docx(&document, &styles, "")).unwrap();
-        assert_eq!(i.story.paras[0].style, "Normal");
-        let normal = i.para_styles.iter().find(|s| s.name == "Normal").unwrap();
-        assert_eq!(normal.chars.size, Some(13.0), "Normal's size wins over the default");
-        assert_eq!(normal.chars.font_family.as_deref(), Some("Georgia"));
-        assert_eq!(normal.para.space_after, Some(8.0), "from the document defaults");
-        let quote = i.para_styles.iter().find(|s| s.name == "Quote").unwrap();
-        assert_eq!(quote.based_on.as_deref(), Some("Normal"));
-        assert_eq!(quote.chars.size, None, "inherited from Normal, not copied");
-    }
-
-    /// `ST_OnOff` is a boolean plus the words `on` and `off`: an explicit `off` is off.
-    #[test]
-    fn off_valued_toggles_stay_off() {
-        let document = format!(
-            r#"<w:document {W}><w:body><w:p>
-              <w:r><w:rPr><w:b w:val="off"/><w:i w:val="0"/><w:strike w:val="off"/><w:u w:val="off"/><w:caps w:val="off"/></w:rPr><w:t>plain</w:t></w:r>
-              <w:r><w:rPr><w:b w:val="on"/></w:rPr><w:t>bold</w:t></w:r>
-            </w:p></w:body></w:document>"#
-        );
-        let st = import(&docx(&document, "", "")).unwrap().story;
-        st.check().unwrap();
-        let plain = st.format_after(st.text.find("plain").unwrap()).clone().over;
-        assert_eq!(plain.font_style.as_deref(), Some("Regular"), "an explicit `off` is not bold");
-        assert_eq!(plain.strikethrough, Some(false));
-        assert_eq!(plain.underline, Some(false));
-        assert_eq!(plain.capitalization, None, "no all-caps");
-        let on = st.format_after(st.text.find("bold").unwrap()).clone().over;
-        assert_eq!(on.font_style.as_deref(), Some("Bold"), "`on` is still on");
-    }
-}
+mod tests;
diff --git a/crates/textimport/src/docx/tests.rs b/crates/textimport/src/docx/tests.rs
new file mode 100644
index 000000000..c70ca851f
--- /dev/null
+++ b/crates/textimport/src/docx/tests.rs
@@ -0,0 +1,522 @@
+use super::*;
+use std::io::Write;
+
+#[test]
+fn cdata_text() {
+    let el = parse("<a><t><![CDATA[x < y]]></t></a>").unwrap();
+    assert_eq!(el.child("t").unwrap().text(), "x < y");
+}
+
+/// Issue #712: nesting past the budget is an error from the parser, not a stack overflow later.
+#[test]
+fn nesting_past_the_budget_is_refused() {
+    let nested = |n: usize| format!("{}{}", "<w:p>".repeat(n), "</w:p>".repeat(n));
+    let ok = parse(&nested(MAX_DEPTH)).expect("the budget itself parses");
+    assert_eq!(ok.name, "p");
+    let err = parse(&nested(MAX_DEPTH + 1)).expect_err("one level more is refused");
+    assert!(err.to_string().contains("nested deeper"), "{err}");
+    assert!(parse(&nested(100_000)).is_err());
+}
+
+#[test]
+fn table_adds_no_empty_paragraph() {
+    let document = format!(
+        r#"<w:document {W}><w:body>
+              <w:p><w:r><w:t>Before</w:t></w:r></w:p>
+              <w:tbl><w:tr><w:tc><w:p><w:r><w:t>A</w:t></w:r></w:p></w:tc></w:tr></w:tbl>
+              <w:p><w:r><w:t>After</w:t></w:r></w:p>
+            </w:body></w:document>"#
+    );
+    let st = import(&docx(&document, "", "")).unwrap().story;
+    st.check().unwrap();
+    let paras: Vec<&str> = st.para_ranges().into_iter().map(|r| &st.text[r]).collect();
+    assert_eq!(paras.len(), 3, "{paras:?}");
+    assert_eq!(paras[0], "Before");
+    assert_eq!(paras[2], "After");
+}
+
+pub(crate) fn docx(document: &str, styles: &str, footnotes: &str) -> Vec<u8> {
+    docx_parts(&[("word/document.xml", document), ("word/styles.xml", styles), ("word/footnotes.xml", footnotes)])
+}
+
+/// A zip of `(part name, XML)`; empty parts are left out.
+fn docx_parts(parts: &[(&str, &str)]) -> Vec<u8> {
+    let mut w = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    let o = zip::write::SimpleFileOptions::default();
+    for &(n, c) in parts {
+        if c.is_empty() {
+            continue;
+        }
+        w.start_file(n, o).unwrap();
+        w.write_all(c.as_bytes()).unwrap();
+    }
+    w.finish().unwrap().into_inner()
+}
+
+const W: &str = r#"xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main""#;
+
+#[test]
+fn oversized_part_is_an_error_not_a_huge_read() {
+    // A highly compressible part: 64 KiB of spaces inflates past a 4 KiB cap.
+    let big = docx(&" ".repeat(64 * 1024), "", "");
+    let mut zip = zip::ZipArchive::new(std::io::Cursor::new(big.as_slice())).unwrap();
+    assert!(matches!(part_capped(&mut zip, "word/document.xml", 4096), Err(ImportError::Corrupt(_))));
+    // At or under the cap reads fine; a missing part is `None`.
+    assert_eq!(part_capped(&mut zip, "word/document.xml", 64 * 1024).unwrap().map(|s| s.len()), Some(64 * 1024));
+    assert_eq!(part_capped(&mut zip, "word/missing.xml", 4096).unwrap(), None);
+}
+
+/// A DOCX can hold any number where a measure belongs: `1e300` twips became a 5e298 pt
+/// indent, and `w:sz` of `1e300` a 5e299 pt type size. Measures are clamped to the widest
+/// page and a size the engine cannot mean is dropped (#1593).
+#[test]
+fn a_measure_or_size_a_file_cannot_mean_is_bounded() {
+    use designcraft_doc::attrs::MAX_MEASURE;
+    let doc = format!(
+        r#"<w:document {W}><w:body><w:p><w:pPr>
+                 <w:spacing w:before="1e300" w:after="-1e300"/><w:ind w:left="1e300" w:firstLine="-1e300"/>
+               </w:pPr><w:r><w:rPr><w:sz w:val="1e300"/></w:rPr><w:t>big</w:t></w:r></w:p></w:body></w:document>"#
+    );
+    let i = import(&docx(&doc, "", "")).unwrap();
+    let p = &i.story.paras[0].para;
+    for (what, v) in
+        [("space before", p.space_before), ("space after", p.space_after), ("left indent", p.left_indent), ("first line", p.first_line_indent)]
+    {
+        let v = v.expect("the value is kept, bounded");
+        assert!(v.is_finite() && v.abs() <= MAX_MEASURE, "{what} is within the widest page: {v}");
+    }
+    let size = i.story.char_format_at(i.story.text.find("big").unwrap() + 1).over.size;
+    assert_eq!(size, None, "a size the engine cannot mean is dropped, so the style's size stands");
+}
+
+#[test]
+fn imports_styles_runs_footnotes_and_tables() {
+    let styles = format!(
+        r#"<w:styles {W}>
+              <w:style w:type="paragraph" w:styleId="Normal"><w:name w:val="Normal"/></w:style>
+              <w:style w:type="paragraph" w:styleId="Heading1"><w:name w:val="heading 1"/><w:basedOn w:val="Normal"/>
+                <w:pPr><w:spacing w:before="240" w:after="120"/></w:pPr><w:rPr><w:b/><w:sz w:val="32"/></w:rPr></w:style>
+              <w:style w:type="paragraph" w:styleId="Unused"><w:name w:val="Unused"/></w:style>
+              <w:style w:type="character" w:styleId="Emph"><w:name w:val="Emphasis"/><w:rPr><w:i/></w:rPr></w:style>
+            </w:styles>"#
+    );
+    let document = format!(
+        r#"<w:document {W}><w:body>
+              <w:p><w:pPr><w:pStyle w:val="Heading1"/></w:pPr><w:r><w:t>Title &amp; more</w:t></w:r></w:p>
+              <w:p><w:r><w:t xml:space="preserve">Plain </w:t></w:r><w:r><w:rPr><w:b/></w:rPr><w:t>bold</w:t></w:r>
+                <w:r><w:rPr><w:rStyle w:val="Emph"/></w:rPr><w:t> styled</w:t></w:r><w:r><w:tab/><w:t>x</w:t></w:r>
+                <w:r><w:footnoteReference w:id="1"/></w:r></w:p>
+              <w:tbl><w:tr><w:tc><w:p><w:r><w:t>A</w:t></w:r></w:p></w:tc><w:tc><w:p><w:r><w:t>B</w:t></w:r></w:p></w:tc></w:tr></w:tbl>
+              <w:p><w:r><w:t>After</w:t></w:r></w:p>
+            </w:body></w:document>"#
+    );
+    let notes = format!(
+        r#"<w:footnotes {W}><w:footnote w:id="0"><w:p/></w:footnote>
+              <w:footnote w:id="1"><w:p><w:r><w:t>The note.</w:t></w:r></w:p></w:footnote></w:footnotes>"#
+    );
+    let i = import(&docx(&document, &styles, &notes)).unwrap();
+    let st = &i.story;
+    st.check().unwrap();
+    assert!(st.text.starts_with("Title & more\nPlain bold styled\tx"), "{:?}", st.text);
+    assert!(st.text.ends_with("After"));
+    assert_eq!(st.paras[0].style, "heading 1");
+    assert_eq!(st.paras[1].style, "Normal");
+    let at = st.text.find("bold").unwrap();
+    assert_eq!(st.format_after(at).over.font_style.as_deref(), Some("Bold"));
+    assert_eq!(st.format_after(st.text.find("styled").unwrap()).style, "Emphasis");
+    assert_eq!(st.notes.len(), 1);
+    assert_eq!(st.notes[0].text.text, "The note.");
+    assert_eq!(st.tables.len(), 1);
+    let names: Vec<&str> = i.para_styles.iter().map(|s| s.name.as_str()).collect();
+    assert_eq!(names, ["Normal", "heading 1"], "unused styles are skipped");
+    assert_eq!(i.para_styles[1].based_on.as_deref(), Some("Normal"));
+    assert_eq!(i.para_styles[1].chars.size, Some(16.0));
+    assert_eq!(i.para_styles[1].para.space_before, Some(12.0));
+    assert_eq!(i.char_styles[0].chars.font_style.as_deref(), Some("Italic"));
+}
+
+/// A content control inside a paragraph (`w:sdt`) keeps its text, also around a hyperlink.
+#[test]
+fn inline_content_control_text_is_kept() {
+    let document = format!(
+        r#"<w:document {W}><w:body>
+              <w:p><w:r><w:t xml:space="preserve">Date: </w:t></w:r><w:sdt><w:sdtPr><w:alias w:val="d"/></w:sdtPr><w:sdtContent><w:r><w:t>1 May 2026</w:t></w:r></w:sdtContent></w:sdt><w:r><w:t>.</w:t></w:r></w:p>
+              <w:p><w:sdt><w:sdtContent><w:hyperlink><w:r><w:t>Link</w:t></w:r></w:hyperlink></w:sdtContent></w:sdt></w:p>
+            </w:body></w:document>"#
+    );
+    let st = import(&docx(&document, "", "")).unwrap().story;
+    st.check().unwrap();
+    assert_eq!(st.text, "Date: 1 May 2026.\nLink");
+}
+
+/// `str::parse::<f64>` accepts "NaN"/"inf"; sizes, spacing and indents must ignore them.
+#[test]
+fn non_finite_sizes_spacing_and_indents_are_ignored() {
+    let document = format!(
+        r#"<w:document {W}><w:body>
+              <w:p><w:pPr><w:spacing w:before="NaN" w:after="inf"/><w:ind w:left="-inf" w:right="NaN" w:firstLine="-inf"/></w:pPr>
+                <w:r><w:rPr><w:sz w:val="NaN"/></w:rPr><w:t>a</w:t></w:r><w:r><w:rPr><w:sz w:val="inf"/></w:rPr><w:t>b</w:t></w:r></w:p>
+              <w:p><w:pPr><w:ind w:hanging="inf"/></w:pPr><w:r><w:t>c</w:t></w:r></w:p>
+            </w:body></w:document>"#
+    );
+    let st = import(&docx(&document, "", "")).unwrap().story;
+    let fin = |v: Option<f64>| v.is_none_or(f64::is_finite);
+    for p in &st.paras {
+        let p = &p.para;
+        assert!(fin(p.space_before) && fin(p.space_after), "{p:?}");
+        assert!(fin(p.left_indent) && fin(p.right_indent) && fin(p.first_line_indent), "{p:?}");
+    }
+    for at in [0, 1] {
+        assert!(fin(st.format_after(at).over.size), "{:?}", st.format_after(at).over.size);
+    }
+}
+
+#[test]
+fn out_of_range_sizes_are_dropped() {
+    let document = format!(
+        r#"<w:document {W}><w:body>
+              <w:p><w:r><w:rPr><w:sz w:val="0"/></w:rPr><w:t>a</w:t></w:r><w:r><w:rPr><w:sz w:val="99999999"/></w:rPr><w:t>b</w:t></w:r></w:p>
+            </w:body></w:document>"#
+    );
+    let st = import(&docx(&document, "", "")).unwrap().story;
+    for at in [0, 1] {
+        assert_eq!(st.format_after(at).over.size, None, "run {at}");
+    }
+}
+
+#[test]
+fn tracked_changes_import_as_accepted_including_moves() {
+    // Regression (#256): text in a tracked move destination (`w:moveTo`) vanished on import.
+    let document = format!(
+        r#"<w:document {W}><w:body>
+              <w:p><w:r><w:t xml:space="preserve">Kept text. </w:t></w:r>
+                <w:moveTo w:id="1" w:author="A"><w:r><w:t xml:space="preserve">MOVED HERE.</w:t></w:r>
+                  <w:del w:id="5" w:author="A"><w:r><w:delText>MOVED THEN DELETED</w:delText></w:r></w:del></w:moveTo>
+                <w:r><w:t xml:space="preserve"> Plain </w:t></w:r>
+                <w:ins w:id="2" w:author="A"><w:r><w:t>INSERTED</w:t></w:r></w:ins>
+                <w:del w:id="3" w:author="A"><w:r><w:delText>DELETED</w:delText></w:r></w:del></w:p>
+              <w:p><w:moveFrom w:id="4" w:author="A"><w:r><w:t>MOVED HERE.</w:t></w:r></w:moveFrom><w:r><w:t>End.</w:t></w:r></w:p>
+            </w:body></w:document>"#
+    );
+    let i = import(&docx(&document, "", "")).unwrap();
+    i.story.check().unwrap();
+    assert_eq!(i.story.text, "Kept text. MOVED HERE. Plain INSERTED\nEnd.");
+}
+
+/// A page break ends its paragraph: the text after it is a paragraph of its own (same style).
+#[test]
+fn page_break_ends_its_paragraph() {
+    let styles = format!(r#"<w:styles {W}><w:style w:type="paragraph" w:styleId="H"><w:name w:val="Chapter"/></w:style></w:styles>"#);
+    let document = format!(
+        r#"<w:document {W}><w:body>
+              <w:p><w:r><w:t>End of one</w:t></w:r><w:r><w:br w:type="page"/></w:r></w:p>
+              <w:p><w:pPr><w:pStyle w:val="H"/></w:pPr><w:r><w:br w:type="page"/><w:t>Two</w:t><w:br w:type="column"/></w:r></w:p>
+            </w:body></w:document>"#
+    );
+    let st = import(&docx(&document, &styles, "")).unwrap().story;
+    st.check().unwrap();
+    let (pb, cb) = (designcraft_doc::PAGE_BREAK, designcraft_doc::COLUMN_BREAK);
+    assert_eq!(st.text, format!("End of one{pb}\n{pb}\nTwo{cb}\n"));
+    let styles: Vec<&str> = st.paras.iter().map(|p| p.style.as_str()).collect();
+    assert_eq!(styles, [BASIC_PARAGRAPH, "Chapter", "Chapter", "Chapter"]);
+}
+
+/// A paragraph in a Word list: `w:numPr` with `numId` and, unless `None`, `ilvl`.
+fn list_p(num_id: &str, ilvl: Option<&str>, text: &str) -> String {
+    let ilvl = ilvl.map(|l| format!(r#"<w:ilvl w:val="{l}"/>"#)).unwrap_or_default();
+    format!(r#"<w:p><w:pPr><w:numPr>{ilvl}<w:numId w:val="{num_id}"/></w:numPr></w:pPr><w:r><w:t>{text}</w:t></w:r></w:p>"#)
+}
+
+fn plain_p(text: &str) -> String {
+    format!(r#"<w:p><w:r><w:t>{text}</w:t></w:r></w:p>"#)
+}
+
+fn lists_docx(numbering: &str, styles: &str, body: &[String]) -> Imported {
+    let document = format!(r#"<w:document {W}><w:body>{}</w:body></w:document>"#, body.concat());
+    let i = import(&docx_parts(&[("word/document.xml", &document), ("word/styles.xml", styles), ("word/numbering.xml", numbering)])).unwrap();
+    i.story.check().unwrap();
+    i
+}
+
+/// The label composition gives paragraph `i`: numbered paragraphs count per level on one
+/// counter that a paragraph outside a list restarts; bullets and empty paragraphs leave it.
+fn label(st: &Story, i: usize) -> String {
+    let mut counter = designcraft_doc::ListCounter::default();
+    let mut label = String::new();
+    for (f, r) in st.paras.iter().zip(st.para_ranges()).take(i + 1) {
+        let mut p = designcraft_doc::ParaProps::default();
+        p.apply(&f.para);
+        label = match p.list_type {
+            _ if r.is_empty() => String::new(),
+            ListType::Numbers => {
+                counter.advance(&p);
+                p.number_label_in(&counter)
+            }
+            ListType::Bullets => p.bullet_label(),
+            ListType::None => {
+                counter = designcraft_doc::ListCounter::default();
+                String::new()
+            }
+        };
+    }
+    label
+}
+
+/// Regression (#626): pandoc's Markdown list example lost its bullets and numbers.
+#[test]
+fn bullets_and_numbers_from_numbering_xml() {
+    let numbering = format!(
+        r#"<w:numbering {W}>
+              <w:abstractNum w:abstractNumId="990"><w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="bullet"/><w:lvlText w:val="•"/>
+                <w:pPr><w:ind w:left="480" w:hanging="480"/></w:pPr></w:lvl></w:abstractNum>
+              <w:abstractNum w:abstractNumId="991"><w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1."/>
+                <w:pPr><w:ind w:left="480" w:hanging="480"/></w:pPr></w:lvl></w:abstractNum>
+              <w:num w:numId="1000"><w:abstractNumId w:val="990"/></w:num>
+              <w:num w:numId="1001"><w:abstractNumId w:val="991"/><w:lvlOverride w:ilvl="0"><w:startOverride w:val="1"/></w:lvlOverride></w:num>
+            </w:numbering>"#
+    );
+    let body = [
+        plain_p("Intro paragraph."),
+        list_p("1000", Some("0"), "first item"),
+        list_p("1000", Some("0"), "second item"),
+        list_p("1001", Some("0"), "step one"),
+        list_p("1001", Some("0"), "step two"),
+    ];
+    let st = lists_docx(&numbering, "", &body).story;
+    let types: Vec<Option<ListType>> = st.paras.iter().map(|p| p.para.list_type).collect();
+    assert_eq!(types, [None, Some(ListType::Bullets), Some(ListType::Bullets), Some(ListType::Numbers), Some(ListType::Numbers)]);
+    assert_eq!(label(&st, 1), "•\t");
+    assert_eq!(st.paras[3].para.number_style, Some(designcraft_doc::NumberStyle::Arabic));
+    assert_eq!((label(&st, 3), label(&st, 4)), ("1.\t".to_string(), "2.\t".to_string()));
+    // The model's own counter already starts at 1 and carries on: no Start At needed.
+    assert_eq!((st.paras[3].para.start_at, st.paras[4].para.start_at), (None, None));
+    assert_eq!((st.paras[1].para.left_indent, st.paras[1].para.first_line_indent), (Some(24.0), Some(-24.0)));
+}
+
+/// Level 1 inside level 0, parent numbers in a label, numbering that carries on past a plain
+/// paragraph, and a `num` with a start override restarting.
+#[test]
+fn nested_levels_and_restarts() {
+    let numbering = format!(
+        r#"<w:numbering {W}>
+              <w:abstractNum w:abstractNumId="1">
+                <w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1."/></w:lvl>
+                <w:lvl w:ilvl="1"><w:start w:val="1"/><w:numFmt w:val="lowerLetter"/><w:lvlText w:val="%2)"/><w:suff w:val="space"/>
+                  <w:pPr><w:ind w:left="1440" w:hanging="360"/></w:pPr></w:lvl>
+                <w:lvl w:ilvl="2"><w:start w:val="1"/><w:numFmt w:val="upperRoman"/><w:lvlText w:val="%1.%2.%3"/></w:lvl>
+              </w:abstractNum>
+              <w:num w:numId="1"><w:abstractNumId w:val="1"/></w:num>
+              <w:num w:numId="2"><w:abstractNumId w:val="1"/><w:lvlOverride w:ilvl="0"><w:startOverride w:val="1"/></w:lvlOverride></w:num>
+              <w:num w:numId="3"><w:abstractNumId w:val="1"/></w:num>
+            </w:numbering>"#
+    );
+    let body = [
+        list_p("1", None, "A"),
+        list_p("1", Some("1"), "B"),
+        list_p("1", Some("1"), "C"),
+        list_p("1", Some("2"), "D"),
+        list_p("1", Some("0"), "E"),
+        plain_p("Between"),
+        list_p("1", Some("0"), "F"),
+        list_p("2", Some("0"), "G"),
+        list_p("3", Some("0"), "H"),
+    ];
+    let st = lists_docx(&numbering, "", &body).story;
+    let start: Vec<Option<Option<u32>>> = st.paras.iter().map(|p| p.para.start_at).collect();
+    // Word's numbers: 1, a, b, 1.b.I, 2, –, 3, 1 (own counter), 4 (shares numId 1's). The
+    // model numbers each level on its own, so only the paragraphs after the plain one need
+    // Start At.
+    assert_eq!(start, [None, None, None, None, None, None, Some(Some(3)), Some(Some(1)), Some(Some(4))]);
+    let levels: Vec<Option<u32>> = st.paras.iter().map(|p| p.para.list_level).collect();
+    assert_eq!(levels, [Some(1), Some(2), Some(2), Some(3), Some(1), None, Some(1), Some(1), Some(1)]);
+    assert_eq!(label(&st, 1), "a) ");
+    // Parent numbers are the model's level references.
+    assert_eq!(st.paras[3].para.number_expression.as_deref(), Some("^1.^2.^#^t"));
+    assert_eq!(label(&st, 3), "1.b.I\t");
+    let labels: Vec<String> = (0..st.paras.len()).map(|i| label(&st, i)).collect();
+    assert_eq!(labels, ["1.\t", "a) ", "b) ", "1.b.I\t", "2.\t", "", "3.\t", "1.\t", "4.\t"]);
+    assert_eq!(st.paras[1].para.left_indent, Some(72.0));
+    assert_eq!(st.paras[1].para.first_line_indent, Some(-18.0));
+}
+
+/// Parent numbers the model's levels can't give are written as text: a list that starts at
+/// level 1 (level 0 never numbered), and a legal-style label (decimal parents).
+#[test]
+fn parent_numbers_the_model_lacks_are_text() {
+    let numbering = format!(
+        r#"<w:numbering {W}>
+              <w:abstractNum w:abstractNumId="1">
+                <w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="upperRoman"/><w:lvlText w:val="%1."/></w:lvl>
+                <w:lvl w:ilvl="1"><w:start w:val="1"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1.%2"/></w:lvl>
+                <w:lvl w:ilvl="2"><w:start w:val="1"/><w:isLgl/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1.%2.%3"/></w:lvl>
+              </w:abstractNum>
+              <w:num w:numId="1"><w:abstractNumId w:val="1"/></w:num>
+            </w:numbering>"#
+    );
+    let body = [list_p("1", Some("1"), "A"), list_p("1", Some("0"), "B"), list_p("1", Some("1"), "C"), list_p("1", Some("2"), "D")];
+    let st = lists_docx(&numbering, "", &body).story;
+    let labels: Vec<String> = (0..st.paras.len()).map(|i| label(&st, i)).collect();
+    assert_eq!(labels, ["I.1\t", "I.\t", "I.1\t", "1.1.1\t"]);
+    assert_eq!(st.paras[0].para.number_expression.as_deref(), Some("I.^#^t"));
+    assert_eq!(st.paras[2].para.number_expression.as_deref(), Some("^1.^#^t"));
+}
+
+/// A paragraph style's `w:numPr` (inherited through `w:basedOn`) makes its paragraphs a list;
+/// numId 0 on a paragraph takes it out of the list.
+#[test]
+fn style_lists_and_num_id_zero() {
+    let numbering = format!(
+        r#"<w:numbering {W}>
+              <w:abstractNum w:abstractNumId="7">
+                <w:lvl w:ilvl="0"><w:numFmt w:val="bullet"/><w:lvlText w:val="&#xF0B7;"/><w:rPr><w:rFonts w:ascii="Symbol" w:hAnsi="Symbol"/></w:rPr></w:lvl>
+                <w:lvl w:ilvl="1"><w:numFmt w:val="bullet"/><w:lvlText w:val="o"/><w:rPr><w:rFonts w:ascii="Courier New"/></w:rPr></w:lvl>
+              </w:abstractNum>
+              <w:num w:numId="5"><w:abstractNumId w:val="7"/></w:num>
+            </w:numbering>"#
+    );
+    let styles = format!(
+        r#"<w:styles {W}>
+              <w:style w:type="paragraph" w:styleId="ListBullet"><w:name w:val="List Bullet"/><w:pPr><w:numPr><w:numId w:val="5"/></w:numPr></w:pPr></w:style>
+              <w:style w:type="paragraph" w:styleId="ListBullet2"><w:name w:val="List Bullet 2"/><w:basedOn w:val="ListBullet"/>
+                <w:pPr><w:numPr><w:ilvl w:val="1"/></w:numPr></w:pPr></w:style>
+            </w:styles>"#
+    );
+    let styled =
+        |id: &str, extra: &str, text: &str| format!(r#"<w:p><w:pPr><w:pStyle w:val="{id}"/>{extra}</w:pPr><w:r><w:t>{text}</w:t></w:r></w:p>"#);
+    let body = [
+        styled("ListBullet", "", "one"),
+        styled("ListBullet2", "", "two"),
+        styled("ListBullet", r#"<w:numPr><w:ilvl w:val="0"/><w:numId w:val="0"/></w:numPr>"#, "not a list"),
+    ];
+    let st = lists_docx(&numbering, &styles, &body).story;
+    assert_eq!(label(&st, 0), "•\t");
+    assert_eq!(label(&st, 1), "◦\t");
+    assert_eq!(st.paras[2].para.list_type, None);
+    assert_eq!(st.paras[2].style, "List Bullet");
+}
+
+/// Hostile list definitions: missing abstractNums and levels, huge or negative levels and
+/// starts, a long label, a `w:basedOn` cycle. No panic; what can't be a list is plain.
+#[test]
+fn hostile_numbering_falls_back_to_plain_paragraphs() {
+    let long = "x".repeat(10_000);
+    let numbering = format!(
+        r#"<w:numbering {W}>
+              <w:abstractNum w:abstractNumId="1">
+                <w:lvl w:ilvl="0"><w:start w:val="99999999999999"/><w:numFmt w:val="decimal"/><w:lvlText w:val="%1{long}%9%"/></w:lvl>
+                <w:lvl w:ilvl="99999999999999"><w:numFmt w:val="decimal"/></w:lvl>
+                <w:lvl w:ilvl="-1"><w:numFmt w:val="decimal"/></w:lvl>
+                <w:lvl w:ilvl="3"><w:start w:val="-5"/><w:numFmt w:val="ordinalText"/><w:lvlText w:val="%4^"/><w:lvlRestart w:val="99"/></w:lvl>
+              </w:abstractNum>
+              <w:num w:numId="1"><w:abstractNumId w:val="1"/></w:num>
+              <w:num w:numId="2"><w:abstractNumId w:val="404"/></w:num>
+              <w:num w:numId="3"/>
+              <w:num><w:abstractNumId w:val="1"/></w:num>
+            </w:numbering>"#
+    );
+    let styles = format!(
+        r#"<w:styles {W}>
+              <w:style w:type="paragraph" w:styleId="A"><w:name w:val="A"/><w:basedOn w:val="B"/></w:style>
+              <w:style w:type="paragraph" w:styleId="B"><w:name w:val="B"/><w:basedOn w:val="A"/></w:style>
+            </w:styles>"#
+    );
+    let body = [
+        list_p("2", None, "missing abstractNum"),
+        list_p("3", None, "num without abstractNum"),
+        list_p("404", None, "unknown numId"),
+        list_p("1", Some("99999999999999"), "huge level"),
+        list_p("1", Some("9"), "level 9"),
+        list_p("1", Some("-1"), "negative level"),
+        list_p("1", Some("1"), "undefined level"),
+        r#"<w:p><w:pPr><w:pStyle w:val="A"/><w:numPr><w:ilvl w:val="0"/></w:numPr></w:pPr><w:r><w:t>cycle</w:t></w:r></w:p>"#.to_string(),
+        list_p("1", None, "huge start"),
+        list_p("1", Some("3"), "negative start"),
+    ];
+    let st = lists_docx(&numbering, &styles, &body).story;
+    assert!(st.paras[..8].iter().all(|p| p.para.list_type.is_none()), "{:?}", st.paras);
+    assert_eq!(st.paras[8].para.start_at, Some(Some(u32::MAX)));
+    let expr = st.paras[8].para.number_expression.clone().unwrap_or_default();
+    assert!(expr.starts_with("^#x") && expr.chars().count() < 80, "{expr}");
+    // A start below 0 counts from 0, which the model shows as 1; `^` in a label is literal.
+    assert_eq!(label(&st, 9), "1^\t");
+    // Unreadable list definitions leave plain paragraphs and a warning, not a failed import.
+    let document = format!(r#"<w:document {W}><w:body>{}</w:body></w:document>"#, list_p("1", None, "x"));
+    let i = import(&docx_parts(&[("word/document.xml", &document), ("word/numbering.xml", "<w:numbering></w:num>")])).unwrap();
+    assert_eq!(i.story.paras[0].para.list_type, None);
+    assert_eq!(i.warnings.len(), 1);
+}
+
+#[test]
+fn an_element_with_many_attributes_parses_in_linear_time() {
+    // RUSTSEC-2026-0194: before quick-xml 0.41 the duplicate-attribute check compared each name with every
+    // earlier one on the element, so a crafted .docx/.xlsx with one huge tag hung the import (O(N²)).
+    let attrs: String = (0..100_000).map(|i| format!(" w:a{i}=\"{i}\"")).collect();
+    let xml = format!("<w:document><w:body><w:p{attrs}/></w:body></w:document>");
+    let started = std::time::Instant::now();
+    let doc = parse(&xml).unwrap();
+    assert!(started.elapsed() < std::time::Duration::from_secs(5), "parse took {:?}", started.elapsed());
+    let p = doc.child("body").and_then(|b| b.child("p")).unwrap();
+    assert_eq!(p.attr("a0"), Some("0"));
+    assert_eq!(p.attr("a99999"), Some("99999"));
+}
+
+#[test]
+fn table_cells_read_text_like_body_paragraphs() {
+    // Regression (#721): cells took every text node, so deleted text, move sources and field
+    // instructions showed up in the table.
+    let para = r#"<w:p><w:r><w:t xml:space="preserve">kept </w:t></w:r>
+            <w:del w:id="1" w:author="A"><w:r><w:delText>GONE</w:delText></w:r></w:del>
+            <w:moveFrom w:id="2" w:author="A"><w:r><w:t>MOVED AWAY</w:t></w:r></w:moveFrom>
+            <w:r><w:fldChar w:fldCharType="begin"/></w:r><w:r><w:instrText xml:space="preserve"> PAGE </w:instrText></w:r>
+            <w:r><w:fldChar w:fldCharType="separate"/></w:r><w:r><w:t>7</w:t></w:r><w:r><w:fldChar w:fldCharType="end"/></w:r></w:p>"#;
+    let document = format!(r#"<w:document {W}><w:body>{para}<w:tbl><w:tr><w:tc>{para}<w:p/></w:tc></w:tr></w:tbl></w:body></w:document>"#);
+    let i = import(&docx(&document, "", "")).unwrap();
+    assert!(i.story.text.starts_with("kept 7"), "{:?}", i.story.text);
+    let cell = &i.story.tables.values().next().unwrap().cell(0, 0).unwrap().text;
+    assert_eq!(cell.text, "kept 7\n");
+}
+
+#[test]
+fn normal_is_its_own_style_over_the_document_defaults() {
+    // Regression (#722): text formatted only by Normal and the document defaults lost it.
+    let styles = format!(
+        r#"<w:styles {W}><w:docDefaults><w:rPrDefault><w:rPr><w:sz w:val="22"/></w:rPr></w:rPrDefault>
+              <w:pPrDefault><w:pPr><w:spacing w:after="160"/></w:pPr></w:pPrDefault></w:docDefaults>
+              <w:style w:type="paragraph" w:default="1" w:styleId="Normal"><w:name w:val="Normal"/><w:rPr><w:rFonts w:ascii="Georgia"/><w:sz w:val="26"/></w:rPr></w:style>
+              <w:style w:type="paragraph" w:styleId="Quote"><w:name w:val="Quote"/><w:basedOn w:val="Normal"/><w:rPr><w:i/></w:rPr></w:style>
+            </w:styles>"#
+    );
+    let document = format!(
+        r#"<w:document {W}><w:body><w:p><w:r><w:t>Plain</w:t></w:r></w:p>
+            <w:p><w:pPr><w:pStyle w:val="Quote"/></w:pPr><w:r><w:t>Quoted</w:t></w:r></w:p></w:body></w:document>"#
+    );
+    let i = import(&docx(&document, &styles, "")).unwrap();
+    assert_eq!(i.story.paras[0].style, "Normal");
+    let normal = i.para_styles.iter().find(|s| s.name == "Normal").unwrap();
+    assert_eq!(normal.chars.size, Some(13.0), "Normal's size wins over the default");
+    assert_eq!(normal.chars.font_family.as_deref(), Some("Georgia"));
+    assert_eq!(normal.para.space_after, Some(8.0), "from the document defaults");
+    let quote = i.para_styles.iter().find(|s| s.name == "Quote").unwrap();
+    assert_eq!(quote.based_on.as_deref(), Some("Normal"));
+    assert_eq!(quote.chars.size, None, "inherited from Normal, not copied");
+}
+
+/// `ST_OnOff` is a boolean plus the words `on` and `off`: an explicit `off` is off.
+#[test]
+fn off_valued_toggles_stay_off() {
+    let document = format!(
+        r#"<w:document {W}><w:body><w:p>
+              <w:r><w:rPr><w:b w:val="off"/><w:i w:val="0"/><w:strike w:val="off"/><w:u w:val="off"/><w:caps w:val="off"/></w:rPr><w:t>plain</w:t></w:r>
+              <w:r><w:rPr><w:b w:val="on"/></w:rPr><w:t>bold</w:t></w:r>
+            </w:p></w:body></w:document>"#
+    );
+    let st = import(&docx(&document, "", "")).unwrap().story;
+    st.check().unwrap();
+    let plain = st.format_after(st.text.find("plain").unwrap()).clone().over;
+    assert_eq!(plain.font_style.as_deref(), Some("Regular"), "an explicit `off` is not bold");
+    assert_eq!(plain.strikethrough, Some(false));
+    assert_eq!(plain.underline, Some(false));
+    assert_eq!(plain.capitalization, None, "no all-caps");
+    let on = st.format_after(st.text.find("bold").unwrap()).clone().over;
+    assert_eq!(on.font_style.as_deref(), Some("Bold"), "`on` is still on");
+}
diff --git a/crates/textimport/src/docx_numbering.rs b/crates/textimport/src/docx_numbering.rs
index e3837e720..2a7d7873a 100644
--- a/crates/textimport/src/docx_numbering.rs
+++ b/crates/textimport/src/docx_numbering.rs
@@ -129,7 +129,8 @@ fn number_style(fmt: &str) -> Format {
 }
 
 fn parse_level(e: &El) -> Level {
-    let tw = |v: Option<&str>| v.and_then(|v| v.trim().parse::<f64>().ok()).filter(|v| v.is_finite()).map(|v| v / 20.0);
+    // Twips, clamped as elsewhere: a level's indent is a measure, not any number (#1593).
+    let tw = |v: Option<&str>| v.and_then(|v| v.trim().parse::<f64>().ok()).map(|v| v / 20.0).and_then(designcraft_doc::attrs::imported_measure);
     let ind = e.child("pPr").and_then(|p| p.child("ind"));
     Level {
         format: e.val("numFmt").map_or(Format::Number(NumberStyle::Arabic), |f| number_style(&f)),
diff --git a/crates/textimport/src/rtf.rs b/crates/textimport/src/rtf.rs
index 782071798..f795804bb 100644
--- a/crates/textimport/src/rtf.rs
+++ b/crates/textimport/src/rtf.rs
@@ -62,6 +62,35 @@ const SKIP: &[&str] = &[
     "object",
 ];
 
+struct ControlWord {
+    word: String,
+    parameter: Option<i64>,
+    next_index: usize,
+}
+
+fn read_control_word(chars: &[char], index: usize) -> ControlWord {
+    let mut word_end = index + 1;
+    while word_end < chars.len() && chars[word_end].is_ascii_alphabetic() {
+        word_end += 1;
+    }
+    let word = chars[index + 1..word_end].iter().collect();
+    let mut next_index = word_end;
+    // A '-' only starts the parameter when a digit follows; otherwise it is text.
+    let negative = chars.get(next_index) == Some(&'-') && chars.get(next_index + 1).is_some_and(char::is_ascii_digit);
+    let has_parameter = negative || chars.get(next_index).is_some_and(char::is_ascii_digit);
+    if has_parameter {
+        next_index += 1;
+        while next_index < chars.len() && chars[next_index].is_ascii_digit() {
+            next_index += 1;
+        }
+    }
+    let parameter = chars[word_end..next_index].iter().collect::<String>().parse().ok();
+    if chars.get(next_index) == Some(&' ') {
+        next_index += 1;
+    }
+    ControlWord { word, parameter, next_index }
+}
+
 pub fn import(bytes: &[u8]) -> Result<Imported, ImportError> {
     let src = String::from_utf8_lossy(bytes);
     if !src.trim_start().starts_with("{\\rtf") {
@@ -159,25 +188,8 @@ pub fn import(bytes: &[u8]) -> Result<Imported, ImportError> {
                     continue;
                 }
                 // A control word with an optional numeric parameter and one delimiting space.
-                let mut j = i + 1;
-                while j < chars.len() && chars[j].is_ascii_alphabetic() {
-                    j += 1;
-                }
-                let word: String = chars[i + 1..j].iter().collect();
-                let mut k = j;
-                // A '-' only starts the parameter when a digit follows; otherwise it is text.
-                let negative = chars.get(k) == Some(&'-') && chars.get(k + 1).is_some_and(char::is_ascii_digit);
-                if negative || chars.get(k).is_some_and(char::is_ascii_digit) {
-                    k += 1;
-                    while k < chars.len() && chars[k].is_ascii_digit() {
-                        k += 1;
-                    }
-                }
-                let param: Option<i64> = chars[j..k].iter().collect::<String>().parse().ok();
-                if k < chars.len() && chars[k] == ' ' {
-                    k += 1;
-                }
-                i = k;
+                let ControlWord { word, parameter: param, next_index } = read_control_word(&chars, i);
+                i = next_index;
                 // A control word is one character of the `\uN` fallback (a following `\u` is not).
                 if pending > 0 && word != "u" {
                     pending -= 1;
@@ -229,7 +241,7 @@ pub fn import(bytes: &[u8]) -> Result<Imported, ImportError> {
                     "strike" => restyle(&|s| s.strike = on),
                     // Half-points; sizes outside the engine's 0.1–1296 pt range fall back to the default.
                     "fs" => restyle(&|s| {
-                        s.size = param.map(|p| p as f64 / 2.0).filter(|pt| (0.1..=1296.0).contains(pt));
+                        s.size = param.map(|p| p as f64 / 2.0).and_then(designcraft_doc::attrs::imported_type_size);
                     }),
                     "plain" => restyle(&|s| {
                         s.bold = false;
diff --git a/crates/textimport/src/tagged.rs b/crates/textimport/src/tagged.rs
index 3a890734a..74806ae4c 100644
--- a/crates/textimport/src/tagged.rs
+++ b/crates/textimport/src/tagged.rs
@@ -201,7 +201,9 @@ pub fn import(bytes: &[u8]) -> Result<Imported, ImportError> {
                     }
                     "cFont" => fmt.over.font_family = (!value.is_empty()).then(|| value.to_string()),
                     "cTypeface" => fmt.over.font_style = (!value.is_empty()).then(|| value.to_string()),
-                    "cSize" => fmt.over.size = value.trim().parse().ok().filter(|s: &f64| s.is_finite()),
+                    // A size the engine cannot mean (0, negative, 1e300) is dropped, so the text
+                    // keeps its style's size (#1593).
+                    "cSize" => fmt.over.size = value.trim().parse().ok().and_then(designcraft_doc::attrs::imported_type_size),
                     "DefineParaStyle" | "DefineCharStyle" => {
                         let nm = value.split('=').next().unwrap_or("").trim().to_string();
                         let list = if name == "DefineParaStyle" { &mut para_styles } else { &mut char_styles };
@@ -276,6 +278,24 @@ mod tests {
         assert_eq!(import("<ASCII-WIN>\r\n<ParaStyle:Body>A<0xD83D>B<0xDE00>C".as_bytes()).unwrap().story.text, "ABC");
     }
 
+    /// A size does not have to be non-finite to be nonsense: a file can hold `1e300`, `0` or a
+    /// negative, and tagged text took all three and set them on the text (#1593). They are now
+    /// dropped, as RTF and DOCX already dropped them, so the text keeps its style's size.
+    #[test]
+    fn a_char_size_the_engine_cannot_mean_is_dropped() {
+        for v in ["1e300", "-5", "0", "1297", "0.09"] {
+            let src = format!("<ASCII-WIN>\r\n<ParaStyle:Body><cSize:{v}>big<cSize:>");
+            let i = import(src.as_bytes()).unwrap();
+            let size = i.story.char_format_at(i.story.text.find("big").unwrap() + 1).over.size;
+            assert_eq!(size, None, "cSize {v} is not a size the engine can mean");
+        }
+        // A size inside the range still arrives.
+        let src = "<ASCII-WIN>\r\n<ParaStyle:Body><cSize:18>big<cSize:>";
+        let i = import(src.as_bytes()).unwrap();
+        let size = i.story.char_format_at(i.story.text.find("big").unwrap() + 1).over.size;
+        assert_eq!(size, Some(18.0));
+    }
+
     /// `f64::from_str` accepts "NaN" and "inf"; a non-finite size must not reach the story.
     #[test]
     fn non_finite_char_size_is_ignored() {
diff --git a/crates/textimport/src/xlsx.rs b/crates/textimport/src/xlsx.rs
index 83bea3c87..a26665ecc 100644
--- a/crates/textimport/src/xlsx.rs
+++ b/crates/textimport/src/xlsx.rs
@@ -91,6 +91,34 @@ fn general(f: f64) -> String {
     }
 }
 
+/// The first and last column used on the header row, if that row has any cells.
+fn header_span(cells: &[(usize, usize, String)], header_row: usize) -> Option<(usize, usize)> {
+    cells.iter().filter(|(r, _, _)| *r == header_row).fold(None, |span, (_, c, _)| match span {
+        None => Some((*c, *c)),
+        Some((lo, hi)) => Some((lo.min(*c), hi.max(*c))),
+    })
+}
+
+/// One row's values laid into `width` columns starting at column `min_c`; values outside that
+/// span come back separately (only the non-empty ones), so the caller can warn.
+fn place_row(cols: &[(usize, String)], min_c: usize, width: usize) -> (Vec<String>, Vec<String>) {
+    let mut row = vec![String::new(); width];
+    let mut extra: Vec<String> = Vec::new();
+    for (c, v) in cols {
+        let at = c.checked_sub(min_c).filter(|at| *at < width);
+        match at {
+            Some(at) => {
+                if let Some(cell) = row.get_mut(at) {
+                    *cell = v.clone();
+                }
+            }
+            None if !v.is_empty() => extra.push(v.clone()),
+            None => {}
+        }
+    }
+    (row, extra)
+}
+
 /// One worksheet as a grid of cached cell text, empty cells kept, for data merge.
 /// The first used row is the header. Later rows that are entirely empty are left out.
 /// Cells past the header are kept so the caller can warn. Over 200 columns or 100,000
@@ -117,19 +145,9 @@ pub fn records(bytes: &[u8], sheet: Option<&str>) -> Result<Vec<Vec<String>>, Im
         return Err(ImportError::Corrupt("the worksheet is empty".into()));
     }
     let header_row = cells.iter().map(|c| c.0).min().unwrap_or(0);
-    let mut min_c = usize::MAX;
-    let mut max_c = 0usize;
-    let mut header_used = false;
-    for (r, c, _) in &cells {
-        if *r == header_row {
-            header_used = true;
-            min_c = min_c.min(*c);
-            max_c = max_c.max(*c);
-        }
-    }
-    if !header_used || min_c == usize::MAX {
+    let Some((min_c, max_c)) = header_span(&cells, header_row) else {
         return Err(ImportError::Corrupt("the worksheet has no header".into()));
-    }
+    };
     let width = max_c.saturating_sub(min_c).saturating_add(1);
     if width > crate::DATA_MERGE_MAX_COLS {
         return Err(ImportError::Corrupt(format!("the sheet has {width} columns; the limit is {}", crate::DATA_MERGE_MAX_COLS)));
@@ -154,26 +172,8 @@ pub fn records(bytes: &[u8], sheet: Option<&str>) -> Result<Vec<Vec<String>>, Im
     }
     let mut out = Vec::with_capacity(data_rows.saturating_add(1));
     for (r, cols) in &by_row {
-        let mut row = vec![String::new(); width];
-        let mut extra: Vec<String> = Vec::new();
-        for (c, v) in cols {
-            if *c < min_c {
-                // Outside the header span. Keep one non-empty value so the caller can warn.
-                if !v.is_empty() {
-                    extra.push(v.clone());
-                }
-                continue;
-            }
-            let at = c - min_c;
-            if at < width {
-                if let Some(cell) = row.get_mut(at) {
-                    *cell = v.clone();
-                }
-            } else if !v.is_empty() {
-                extra.push(v.clone());
-            }
-        }
-        if *r != header_row && row.iter().all(|c| c.is_empty()) && extra.is_empty() {
+        let (mut row, extra) = place_row(cols, min_c, width);
+        if *r != header_row && row.iter().all(String::is_empty) && extra.is_empty() {
             continue;
         }
         row.extend(extra);
diff --git a/crates/tools/src/catalog.rs b/crates/tools/src/catalog.rs
index 054a2ca45..e63debb4d 100644
--- a/crates/tools/src/catalog.rs
+++ b/crates/tools/src/catalog.rs
@@ -85,8 +85,3 @@ pub const SPLIT_IN_TWO_COLUMNS: &[&str] = &["contentCollector"];
 pub fn tool_info(id: &str) -> Option<ToolInfo> {
     TOOL_GROUPS.iter().flat_map(|g| g.iter()).find(|t| t.id == id).copied()
 }
-
-/// Tool for a single-key shortcut (`"T"`, `"Shift+P"`).
-pub fn tool_for_shortcut(key: &str) -> Option<&'static str> {
-    TOOL_GROUPS.iter().flat_map(|g| g.iter()).find(|t| t.shortcut == Some(key)).map(|t| t.id)
-}
diff --git a/crates/tools/src/gradient.rs b/crates/tools/src/gradient.rs
index b35b90b11..1ccb3a367 100644
--- a/crates/tools/src/gradient.rs
+++ b/crates/tools/src/gradient.rs
@@ -1,6 +1,7 @@
 //! Gradient Swatch tool (G): drag across the selected objects (or the object under the pointer)
 //! to set where their gradient fill starts and ends; Shift constrains the angle to 45° steps.
 
+use designcraft_doc::SpreadRef;
 use designcraft_geom::{Point, Vec2};
 use serde_json::json;
 
@@ -10,8 +11,8 @@ use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, Tool
 pub struct GradientTool {
     /// Gradient Feather tool (Shift+G): the drag sets the fade instead of the fill gradient.
     pub feather: bool,
-    /// Canvas start point, spread-space start point and the target ids.
-    drag: Option<(Point, Point, Vec<u64>)>,
+    /// Canvas start point, spread-space start point and the target ids, and the spread.
+    drag: Option<(Point, Point, Vec<u64>, SpreadRef)>,
     end: Option<Point>,
 }
 
@@ -44,27 +45,27 @@ impl Tool for GradientTool {
                 } else {
                     cx.selection.items.iter().map(|i| i.0).collect()
                 };
-                let Some((_, sp)) = cx.layout.spread_at(ev.pos) else { return vec![] };
+                let Some((spread, sp)) = cx.layout.spread_at(ev.pos) else { return vec![] };
                 if ids.is_empty() {
                     return vec![];
                 }
-                self.drag = Some((ev.pos, sp, ids));
+                self.drag = Some((ev.pos, sp, ids, spread));
                 self.end = None;
                 vec![Action::Begin(if self.feather { "Gradient Feather".into() } else { "Gradient".into() })]
             }
             PointerKind::Drag => {
-                let Some((start, sp, ids)) = &self.drag else { return vec![] };
+                let Some((start, sp, ids, spread)) = &self.drag else { return vec![] };
                 let end = constrain(*start, ev.pos, ev.mods);
                 self.end = Some(end);
                 if (end - *start).hypot() < cx.tol(2.0) {
                     return vec![];
                 }
-                let to = *sp + (end - *start);
+                let to = *sp + cx.layout.delta_to_spread(*spread, end - *start);
                 let cmd = if self.feather { "object.gradientFeather" } else { "object.gradient" };
                 vec![Action::Preview(cmd.into(), json!({"ids": ids, "from": [sp.x, sp.y], "to": [to.x, to.y]}))]
             }
             PointerKind::Up => {
-                let moved = self.end.zip(self.drag.as_ref()).is_some_and(|(e, (s, _, _))| (e - *s).hypot() >= cx.tol(2.0));
+                let moved = self.end.zip(self.drag.as_ref()).is_some_and(|(e, (s, ..))| (e - *s).hypot() >= cx.tol(2.0));
                 let was = self.drag.take().is_some();
                 self.end = None;
                 match (was, moved) {
@@ -79,7 +80,7 @@ impl Tool for GradientTool {
 
     fn overlays(&self, _cx: &ToolContext) -> Vec<Overlay> {
         match (&self.drag, self.end) {
-            (Some((a, _, _)), Some(b)) => vec![Overlay::Line { a: *a, b, color: [0, 0, 0], dashed: false }],
+            (Some((a, ..)), Some(b)) => vec![Overlay::Line { a: *a, b, color: [0, 0, 0], dashed: false }],
             _ => vec![],
         }
     }
diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs
index f0fd68019..bb6b9b90c 100644
--- a/crates/tools/src/lib.rs
+++ b/crates/tools/src/lib.rs
@@ -31,9 +31,11 @@ use designcraft_geom::{Affine, BezPath, Point, Rect, Unit, Vec2};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-pub use catalog::{SPLIT_IN_TWO_COLUMNS, TOOL_GROUPS, ToolInfo, tool_for_shortcut, tool_info};
+pub use catalog::{SPLIT_IN_TWO_COLUMNS, TOOL_GROUPS, ToolInfo, tool_info};
 pub use layout::{CanvasLayout, SpreadSlot};
 pub use nav::ZoomTool;
+/// The exact text an IME commit types (see [`Tool::ime_commit`]).
+pub use text::ime_commit_text;
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Mods {
diff --git a/crates/tools/src/select.rs b/crates/tools/src/select.rs
index cba5fc317..033e1a97c 100644
--- a/crates/tools/src/select.rs
+++ b/crates/tools/src/select.rs
@@ -683,6 +683,412 @@ fn positive_pad(v: f64) -> f64 {
     if v.is_finite() && v > 0.0 { v } else { 0.0 }
 }
 
+impl SelectionTool {
+    fn pointer_down(&mut self, cx: &ToolContext, ev: &PointerEvent) -> Vec<Action> {
+        let p = ev.pos;
+
+        self.shift_release = None;
+        self.key_release = None;
+        // Type on a path: a bracket moves where the text starts or ends.
+        if !ev.mods.shift
+            && let Some((id, end)) = self.bracket_at(cx, p)
+        {
+            self.drag = Drag::Bracket { id, end };
+            return vec![Action::Begin("Move Bracket".into())];
+        }
+        if self.direct
+            && let Some((id, si, ai, handle)) = anchor_at(cx, p)
+        {
+            let at = anchor_spread_point(cx, id, si, ai);
+            self.drag = Drag::Anchor { id, si, ai, handle, start: p, at };
+            return vec![Action::Begin(if handle.is_some() { "Move Direction Handle".into() } else { "Move Anchor".into() })];
+        }
+        // A selected placed graphic's own handles resize it inside its frame (the
+        // frame's anchors, under Direct Selection, come first).
+        if let Some((id, h)) = content_handle_at(cx, p)
+            && let (Some(loc), Some((_, b))) = (cx.doc.find(id), selected_graphic(cx))
+        {
+            let turns = cx.layout.slot(loc.spread).map_or(0, |s| s.rotation as usize);
+            let handle = (h + 8 - 2 * turns) % 8;
+            let from = cx.layout.xf(loc.spread).inverse().transform_rect_bbox(b);
+            self.drag = Drag::ContentResize { id, handle, from, spread: loc.spread };
+            return vec![Action::Begin("Resize Content".into())];
+        }
+        if let Some((frame, corner)) = self.diamond_at(cx, p) {
+            if ev.mods.alt {
+                self.drag = Drag::None;
+                let opts = frame.cycled(corner, ev.mods.shift);
+                return vec![Action::Exec("object.cornerOptions".into(), corners::params(frame.id, &opts))];
+            }
+            self.drag = Drag::Corner { frame, corner, start: p };
+            return vec![Action::Begin("Corner Options".into())];
+        }
+        if let Some(frame) = self.widget_at(cx, p) {
+            self.live = Some(frame.id);
+            self.drag = Drag::None;
+            return vec![Action::Handled];
+        }
+        if !self.direct
+            && handle_at(cx, p).is_none()
+            && let Some(center) = rotate_zone(cx, p)
+        {
+            self.drag = Drag::Rotate { center, start_angle: (p - center).atan2(), start_rotation: crate::snap::reference_rotation(cx) };
+            return vec![Action::Begin("Rotate".into())];
+        }
+        if let Some(h) = handle_at(cx, p).filter(|_| !self.direct)
+            && let (Some(b), Some(first)) = (cx.selection_bounds(), cx.selection.items.first())
+            && let Some(loc) = cx.doc.find(*first)
+        {
+            // On a turned spread the canvas handle is another one of the spread's.
+            let turns = cx.layout.slot(loc.spread).map_or(0, |s| s.rotation as usize);
+            let handle = (h + 8 - 2 * turns) % 8;
+            self.drag = Drag::Resize { handle, start: p, from: cx.layout.xf(loc.spread).inverse().transform_rect_bbox(b), spread: loc.spread };
+            return vec![Action::Begin("Resize".into())];
+        }
+        // The content grabber: select the frame's content; a drag moves it.
+        if !self.direct
+            && !ev.mods.shift
+            && let Some(id) = grabber_at(cx, p)
+        {
+            self.drag = Drag::Pending { start: p, hit: true, content: true };
+            if cx.selection.items == [id] && cx.selection.content {
+                return vec![];
+            }
+            return vec![Action::Exec("selection.set".into(), json!({"ids": [id.0], "content": true}))];
+        }
+        // Cmd+Shift-click a parent item on a page: override it there and select the copy.
+        if ev.mods.cmd
+            && ev.mods.shift
+            && cx.hit(p).is_none()
+            && let Some((page, id)) = cx.hit_parent_on_page(p)
+        {
+            self.drag = Drag::Pending { start: p, hit: true, content: false };
+            return vec![Action::Exec("layout.overrideParentItems".into(), json!({"page": page, "ids": [id.0]}))];
+        }
+        match cx.hit(p) {
+            Some((sr, id)) => {
+                let id = if self.direct { id } else { cx.doc.top_level_of(id).unwrap_or(id) };
+                let mut out = vec![];
+                if ev.mods.shift {
+                    if cx.selection.contains(id) {
+                        // Keep it selected so a Shift-drag can constrain. A click still toggles, on release.
+                        self.shift_release = Some(id.0);
+                    } else {
+                        out.push(Action::Exec("selection.toggle".into(), json!({"id": id.0})));
+                    }
+                } else if !cx.selection.contains(id) || (self.direct && !cx.selection.content) {
+                    out.push(Action::Exec("selection.set".into(), json!({"ids": [id.0], "content": self.direct})));
+                } else if !self.direct && cx.selection.items.len() > 1 {
+                    // InDesign: a click on one of several selected objects makes it the
+                    // key object, on release so that a drag still moves them all.
+                    self.key_release = Some(id.0);
+                }
+                let content = self.direct || on_selected_content(cx, p);
+                self.drag = Drag::Pending { start: p, hit: true, content };
+                let _ = sr;
+                out
+            }
+            None => {
+                self.live = None;
+                self.drag = Drag::Pending { start: p, hit: false, content: false };
+                if ev.mods.shift { vec![] } else { vec![Action::Exec("selection.set".into(), json!({"ids": []}))] }
+            }
+        }
+    }
+
+    fn pointer_drag_move(&mut self, cx: &ToolContext, ev: &PointerEvent, drag: Drag) -> Vec<Action> {
+        let Drag::Move { start, origin_spread, bounds0, exclude, content } = drag else { return vec![] };
+        let p = ev.pos;
+
+        let mut d: Vec2 = p - start;
+        let mut screen_x_locked = false;
+        let mut screen_y_locked = false;
+        if ev.mods.shift {
+            if d.x.abs() > d.y.abs() {
+                d.y = 0.0;
+                screen_y_locked = true;
+            } else {
+                d.x = 0.0;
+                screen_x_locked = true;
+            }
+        }
+        // Snap on the spread under the pointer. Shift uses that spread's view rotation.
+        // Content stays in its frame, on the frame's spread.
+        let target = if content { origin_spread } else { cx.layout.spread_at(p).map(|(s, _)| s).unwrap_or(origin_spread) };
+        // 180 degrees keeps the screen axis. 90 and 270 swap it into the other spread axis.
+        let odd_turn = cx.layout.slot(target).is_some_and(|slot| slot.rotation % 2 == 1);
+        let spread_x_locked = if odd_turn { screen_y_locked } else { screen_x_locked };
+        let spread_y_locked = if odd_turn { screen_x_locked } else { screen_y_locked };
+        let x_edges = if spread_x_locked { [false; 3] } else { [true; 3] };
+        let y_edges = if spread_y_locked { [false; 3] } else { [true; 3] };
+        self.guides.clear();
+        // The movement in the origin spread's coordinates (its view may be turned).
+        let mut ds = cx.layout.delta_to_spread(origin_spread, d);
+        let b0s = bounds0.map(|b| cx.layout.xf(origin_spread).inverse().transform_rect_bbox(b));
+        let q0 = b0s.map_or(Point::ORIGIN, |b| Point::new(b.x0, b.y0));
+        // Same corner conversion transform.move already uses when the spread changes.
+        let mut landed = cx.layout.to_spread(target, cx.layout.to_canvas(origin_spread, q0 + ds));
+        // Command suspends snapping. A Shift-locked spread axis is not offered.
+        if !ev.mods.cmd
+            && cx.snap.any()
+            && let Some(b0) = b0s
+        {
+            let proposed = if target == origin_spread {
+                b0 + ds
+            } else {
+                let shift = landed - q0;
+                Rect::new(b0.x0 + shift.x, b0.y0 + shift.y, b0.x1 + shift.x, b0.y1 + shift.y)
+            };
+            let hit = crate::snap::snap(
+                cx,
+                SnapRequest {
+                    spread: target,
+                    gesture: Gesture::Move,
+                    rect: proposed,
+                    x_edges,
+                    y_edges,
+                    exclude: &exclude,
+                    exclude_guides: &[],
+                    copying: ev.mods.alt && !content,
+                    lengths: [None, None],
+                    angle: None,
+                    radius: 0.0,
+                    pointer: cx.layout.to_spread(target, p),
+                },
+            );
+            if target == origin_spread {
+                if x_edges != [false, false, false] && hit.delta.x.is_finite() {
+                    ds.x += hit.delta.x;
+                }
+                if y_edges != [false, false, false] && hit.delta.y.is_finite() {
+                    ds.y += hit.delta.y;
+                }
+            } else {
+                if x_edges != [false, false, false] && hit.delta.x.is_finite() {
+                    landed.x += hit.delta.x;
+                }
+                if y_edges != [false, false, false] && hit.delta.y.is_finite() {
+                    landed.y += hit.delta.y;
+                }
+            }
+            self.guides = hit.guides;
+        }
+        // Same spread: dx, dy are the origin spread translation. Crossing: the corner
+        // conversion, so the reparented item lands on the snapped target point.
+        let (dx, dy) = if target == origin_spread {
+            (ds.x, ds.y)
+        } else {
+            let dt = landed - q0;
+            (dt.x, dt.y)
+        };
+        if content {
+            let ids: Vec<u64> = exclude.iter().map(|i| i.0).collect();
+            return vec![Action::Preview("transform.move".into(), json!({"dx": dx, "dy": dy, "ids": ids, "content": true}))];
+        }
+        let mut params = json!({"dx": dx, "dy": dy, "copy": ev.mods.alt});
+        if target != origin_spread {
+            params = json!({"dx": dx, "dy": dy, "copy": ev.mods.alt, "toSpread": spread_json(target)});
+        }
+        vec![Action::Preview("transform.move".into(), params)]
+    }
+
+    fn pointer_drag(&mut self, cx: &ToolContext, ev: &PointerEvent) -> Vec<Action> {
+        let p = ev.pos;
+        match self.drag.clone() {
+            Drag::Bracket { id, end } => {
+                let Some((warp, xf, _, _)) = path_type_of(cx, id) else { return vec![] };
+                if xf.determinant().abs() < 1e-12 {
+                    return vec![];
+                }
+                let s = warp.nearest(xf.inverse() * p);
+                vec![Action::Preview("type.pathOptions".into(), json!({"id": id.0, if end { "end" } else { "start" }: s}))]
+            }
+            Drag::Pending { start, hit, content } => {
+                if (p - start).hypot() < cx.tol(3.0) {
+                    return vec![];
+                }
+                self.shift_release = None;
+                self.key_release = None;
+                if hit && !cx.selection.items.is_empty() {
+                    // Direct Selection on items without content moves (or duplicates) them whole.
+                    let content = content && cx.selection.items.iter().any(|i| cx.doc.item(*i).is_some_and(holds_content));
+                    let sr = cx.selection.items.first().and_then(|i| cx.doc.find(*i)).map(|l| l.spread).unwrap_or(SpreadRef::Doc(0));
+                    let exclude = cx.selection.items.clone();
+                    let bounds0 = if content { content_bounds(cx) } else { cx.selection_visible_bounds() };
+                    self.drag = Drag::Move { start, origin_spread: sr, bounds0, exclude: exclude.clone(), content };
+                    let mut v = vec![];
+                    // Dragging a content selection by its frame moves the frame: select it.
+                    if !content && cx.selection.content {
+                        let ids: Vec<u64> = exclude.iter().map(|i| i.0).collect();
+                        v.push(Action::Exec("selection.set".into(), json!({"ids": ids})));
+                    }
+                    let label = if content {
+                        "Move Content"
+                    } else if ev.mods.alt {
+                        "Duplicate"
+                    } else {
+                        "Move"
+                    };
+                    v.push(Action::Begin(label.into()));
+                    v.extend(self.pointer(cx, ev));
+                    v
+                } else {
+                    self.drag = Drag::Marquee { start, cur: p };
+                    vec![]
+                }
+            }
+            movement @ Drag::Move { .. } => self.pointer_drag_move(cx, ev, movement),
+            Drag::Resize { handle, start, from, spread } => {
+                let _ = start;
+                let pointer = cx.layout.to_spread(spread, p);
+                let raw = resize_edges_rect(from, handle, pointer);
+                let mut to = resize_rect(from, handle, pointer, ev.mods);
+                // Space while dragging: Live Distribute (several objects keep their size).
+                let distribute = ev.mods.space && cx.selection.items.len() > 1;
+                self.guides.clear();
+                // Command still scales content. It does not skip the snap.
+                if !distribute && cx.snap.any() {
+                    let (mut x_edges, mut y_edges) = resize_edge_flags(handle);
+                    let driver_x = drives_x(handle, from, raw);
+                    if ev.mods.shift {
+                        if driver_x {
+                            y_edges = [false, false, false];
+                        } else {
+                            x_edges = [false, false, false];
+                        }
+                    }
+                    let exclude = cx.selection.items.clone();
+                    let (pad_x, pad_y) = single_stroke_pad(cx);
+                    let proposed = to;
+                    let mut hit = crate::snap::snap(
+                        cx,
+                        SnapRequest {
+                            spread,
+                            gesture: Gesture::Resize,
+                            rect: proposed,
+                            x_edges,
+                            y_edges,
+                            exclude: &exclude,
+                            exclude_guides: &[],
+                            copying: false,
+                            lengths: [axis_length(x_edges, proposed.width(), pad_x), axis_length(y_edges, proposed.height(), pad_y)],
+                            angle: None,
+                            radius: 0.0,
+                            pointer,
+                        },
+                    );
+                    to = finish_snapped_resize(from, handle, proposed, ev.mods, driver_x, (x_edges, y_edges), &hit);
+                    crate::snap::lay_dimension_guides(&mut hit.guides, cx.layout.xf(spread), proposed, to, x_edges, y_edges, hit.length_delta);
+                    self.guides = hit.guides;
+                }
+                vec![Action::Preview(
+                    "transform.resize".into(),
+                    json!({"from": rect_json(from), "to": rect_json(to), "content": ev.mods.cmd, "distribute": distribute}),
+                )]
+            }
+            Drag::ContentResize { id, handle, from, spread } => {
+                let to = resize_rect(from, handle, cx.layout.to_spread(spread, p), ev.mods);
+                vec![Action::Preview("transform.set".into(), json!({"ids": [id.0], "content": true, "bounds": rect_json(to)}))]
+            }
+            Drag::Marquee { start, .. } => {
+                self.drag = Drag::Marquee { start, cur: p };
+                vec![]
+            }
+            Drag::Place { .. } => vec![],
+            Drag::Corner { frame, corner, start } => {
+                let Some(d) = frame.drag_delta(corner, start, p) else { return vec![] };
+                let opts = frame.dragged(corner, frame.size(corner) + d, ev.mods.shift);
+                vec![Action::Preview("object.cornerOptions".into(), corners::params(frame.id, &opts))]
+            }
+            Drag::Rotate { center, start_angle, start_rotation } => {
+                let mut a = ((p - center).atan2() - start_angle).to_degrees();
+                self.guides.clear();
+                if ev.mods.shift {
+                    // 45 degree steps. The rotation pass does not run while Shift is held.
+                    a = (a / 45.0).round() * 45.0;
+                } else if let Some(start) = start_rotation {
+                    let raw = -a;
+                    if let Some(resulting) = crate::snap::folded_rotation(start + raw) {
+                        let spread = cx.selection.items.first().and_then(|id| cx.doc.find(*id)).map(|loc| loc.spread).unwrap_or(SpreadRef::Doc(0));
+                        let exclude = cx.selection.items.clone();
+                        // The rect is unused by the angle pass. It only has to be finite.
+                        let hit = crate::snap::snap(
+                            cx,
+                            SnapRequest {
+                                spread,
+                                gesture: Gesture::Rotate,
+                                rect: Rect::new(0.0, 0.0, 1.0, 1.0),
+                                x_edges: [false, false, false],
+                                y_edges: [false, false, false],
+                                exclude: &exclude,
+                                exclude_guides: &[],
+                                copying: false,
+                                lengths: [None, None],
+                                angle: Some(resulting),
+                                radius: (p - center).hypot(),
+                                pointer: cx.layout.to_spread(spread, p),
+                            },
+                        );
+                        if let Some(snapped) = hit.angle
+                            && let Some(delta) = crate::snap::rotation_command_delta(start, snapped, raw)
+                        {
+                            a = -delta;
+                        }
+                        self.guides = hit.guides;
+                    }
+                }
+                // Screen y points down: a positive screen angle is clockwise.
+                vec![Action::Preview("transform.rotate".into(), json!({"angle": -a}))]
+            }
+            Drag::Anchor { id, si, ai, handle, start, at } => {
+                let d = p - start;
+                let mut dx = d.x;
+                let mut dy = d.y;
+                self.guides.clear();
+                // Direction handles do not snap. An anchor excludes the path it is on.
+                if handle.is_none()
+                    && let Some((spread, origin)) = at
+                {
+                    let proposed = origin + cx.layout.delta_to_spread(spread, d);
+                    let exclude = [ItemId(id)];
+                    let hit = crate::snap::snap(
+                        cx,
+                        SnapRequest {
+                            spread,
+                            gesture: Gesture::Point,
+                            rect: Rect::from_points(proposed, proposed),
+                            x_edges: [true, true, true],
+                            y_edges: [true, true, true],
+                            exclude: &exclude,
+                            exclude_guides: &[],
+                            copying: false,
+                            lengths: [None, None],
+                            angle: None,
+                            radius: 0.0,
+                            pointer: proposed,
+                        },
+                    );
+                    // dx and dy stay in canvas space. Snap.delta is spread space.
+                    let corr = spread_delta_to_canvas(cx.layout.xf(spread), hit.delta);
+                    if corr.x.is_finite() {
+                        dx += corr.x;
+                    }
+                    if corr.y.is_finite() {
+                        dy += corr.y;
+                    }
+                    self.guides = hit.guides;
+                }
+                let mut params = json!({"id": id, "anchors": [[si, ai]], "dx": dx, "dy": dy});
+                if let Some(h) = handle {
+                    params["handle"] = json!(h);
+                }
+                vec![Action::Preview("path.moveAnchors".into(), params)]
+            }
+            Drag::None => vec![],
+        }
+    }
+}
+
 impl Tool for SelectionTool {
     fn id(&self) -> &'static str {
         if self.direct { "directSelection" } else { "selection" }
@@ -736,400 +1142,8 @@ impl Tool for SelectionTool {
                 self.hover_handle = handle_at(cx, p);
                 vec![]
             }
-            PointerKind::Down => {
-                self.shift_release = None;
-                self.key_release = None;
-                // Type on a path: a bracket moves where the text starts or ends.
-                if !ev.mods.shift
-                    && let Some((id, end)) = self.bracket_at(cx, p)
-                {
-                    self.drag = Drag::Bracket { id, end };
-                    return vec![Action::Begin("Move Bracket".into())];
-                }
-                if self.direct
-                    && let Some((id, si, ai, handle)) = anchor_at(cx, p)
-                {
-                    let at = anchor_spread_point(cx, id, si, ai);
-                    self.drag = Drag::Anchor { id, si, ai, handle, start: p, at };
-                    return vec![Action::Begin(if handle.is_some() { "Move Direction Handle".into() } else { "Move Anchor".into() })];
-                }
-                // A selected placed graphic's own handles resize it inside its frame (the
-                // frame's anchors, under Direct Selection, come first).
-                if let Some((id, h)) = content_handle_at(cx, p)
-                    && let (Some(loc), Some((_, b))) = (cx.doc.find(id), selected_graphic(cx))
-                {
-                    let turns = cx.layout.slot(loc.spread).map_or(0, |s| s.rotation as usize);
-                    let handle = (h + 8 - 2 * turns) % 8;
-                    let from = cx.layout.xf(loc.spread).inverse().transform_rect_bbox(b);
-                    self.drag = Drag::ContentResize { id, handle, from, spread: loc.spread };
-                    return vec![Action::Begin("Resize Content".into())];
-                }
-                if let Some((frame, corner)) = self.diamond_at(cx, p) {
-                    if ev.mods.alt {
-                        self.drag = Drag::None;
-                        let opts = frame.cycled(corner, ev.mods.shift);
-                        return vec![Action::Exec("object.cornerOptions".into(), corners::params(frame.id, &opts))];
-                    }
-                    self.drag = Drag::Corner { frame, corner, start: p };
-                    return vec![Action::Begin("Corner Options".into())];
-                }
-                if let Some(frame) = self.widget_at(cx, p) {
-                    self.live = Some(frame.id);
-                    self.drag = Drag::None;
-                    return vec![Action::Handled];
-                }
-                if !self.direct
-                    && handle_at(cx, p).is_none()
-                    && let Some(center) = rotate_zone(cx, p)
-                {
-                    self.drag = Drag::Rotate { center, start_angle: (p - center).atan2(), start_rotation: crate::snap::reference_rotation(cx) };
-                    return vec![Action::Begin("Rotate".into())];
-                }
-                if let Some(h) = handle_at(cx, p).filter(|_| !self.direct)
-                    && let (Some(b), Some(first)) = (cx.selection_bounds(), cx.selection.items.first())
-                    && let Some(loc) = cx.doc.find(*first)
-                {
-                    // On a turned spread the canvas handle is another one of the spread's.
-                    let turns = cx.layout.slot(loc.spread).map_or(0, |s| s.rotation as usize);
-                    let handle = (h + 8 - 2 * turns) % 8;
-                    self.drag =
-                        Drag::Resize { handle, start: p, from: cx.layout.xf(loc.spread).inverse().transform_rect_bbox(b), spread: loc.spread };
-                    return vec![Action::Begin("Resize".into())];
-                }
-                // The content grabber: select the frame's content; a drag moves it.
-                if !self.direct
-                    && !ev.mods.shift
-                    && let Some(id) = grabber_at(cx, p)
-                {
-                    self.drag = Drag::Pending { start: p, hit: true, content: true };
-                    if cx.selection.items == [id] && cx.selection.content {
-                        return vec![];
-                    }
-                    return vec![Action::Exec("selection.set".into(), json!({"ids": [id.0], "content": true}))];
-                }
-                // Cmd+Shift-click a parent item on a page: override it there and select the copy.
-                if ev.mods.cmd
-                    && ev.mods.shift
-                    && cx.hit(p).is_none()
-                    && let Some((page, id)) = cx.hit_parent_on_page(p)
-                {
-                    self.drag = Drag::Pending { start: p, hit: true, content: false };
-                    return vec![Action::Exec("layout.overrideParentItems".into(), json!({"page": page, "ids": [id.0]}))];
-                }
-                match cx.hit(p) {
-                    Some((sr, id)) => {
-                        let id = if self.direct { id } else { cx.doc.top_level_of(id).unwrap_or(id) };
-                        let mut out = vec![];
-                        if ev.mods.shift {
-                            if cx.selection.contains(id) {
-                                // Keep it selected so a Shift-drag can constrain. A click still toggles, on release.
-                                self.shift_release = Some(id.0);
-                            } else {
-                                out.push(Action::Exec("selection.toggle".into(), json!({"id": id.0})));
-                            }
-                        } else if !cx.selection.contains(id) || (self.direct && !cx.selection.content) {
-                            out.push(Action::Exec("selection.set".into(), json!({"ids": [id.0], "content": self.direct})));
-                        } else if !self.direct && cx.selection.items.len() > 1 {
-                            // InDesign: a click on one of several selected objects makes it the
-                            // key object, on release so that a drag still moves them all.
-                            self.key_release = Some(id.0);
-                        }
-                        let content = self.direct || on_selected_content(cx, p);
-                        self.drag = Drag::Pending { start: p, hit: true, content };
-                        let _ = sr;
-                        out
-                    }
-                    None => {
-                        self.live = None;
-                        self.drag = Drag::Pending { start: p, hit: false, content: false };
-                        if ev.mods.shift { vec![] } else { vec![Action::Exec("selection.set".into(), json!({"ids": []}))] }
-                    }
-                }
-            }
-            PointerKind::Drag => match self.drag.clone() {
-                Drag::Bracket { id, end } => {
-                    let Some((warp, xf, _, _)) = path_type_of(cx, id) else { return vec![] };
-                    if xf.determinant().abs() < 1e-12 {
-                        return vec![];
-                    }
-                    let s = warp.nearest(xf.inverse() * p);
-                    vec![Action::Preview("type.pathOptions".into(), json!({"id": id.0, if end { "end" } else { "start" }: s}))]
-                }
-                Drag::Pending { start, hit, content } => {
-                    if (p - start).hypot() < cx.tol(3.0) {
-                        return vec![];
-                    }
-                    self.shift_release = None;
-                    self.key_release = None;
-                    if hit && !cx.selection.items.is_empty() {
-                        // Direct Selection on items without content moves (or duplicates) them whole.
-                        let content = content && cx.selection.items.iter().any(|i| cx.doc.item(*i).is_some_and(holds_content));
-                        let sr = cx.selection.items.first().and_then(|i| cx.doc.find(*i)).map(|l| l.spread).unwrap_or(SpreadRef::Doc(0));
-                        let exclude = cx.selection.items.clone();
-                        let bounds0 = if content { content_bounds(cx) } else { cx.selection_visible_bounds() };
-                        self.drag = Drag::Move { start, origin_spread: sr, bounds0, exclude: exclude.clone(), content };
-                        let mut v = vec![];
-                        // Dragging a content selection by its frame moves the frame: select it.
-                        if !content && cx.selection.content {
-                            let ids: Vec<u64> = exclude.iter().map(|i| i.0).collect();
-                            v.push(Action::Exec("selection.set".into(), json!({"ids": ids})));
-                        }
-                        let label = if content {
-                            "Move Content"
-                        } else if ev.mods.alt {
-                            "Duplicate"
-                        } else {
-                            "Move"
-                        };
-                        v.push(Action::Begin(label.into()));
-                        v.extend(self.pointer(cx, ev));
-                        v
-                    } else {
-                        self.drag = Drag::Marquee { start, cur: p };
-                        vec![]
-                    }
-                }
-                Drag::Move { start, origin_spread, bounds0, exclude, content } => {
-                    let mut d: Vec2 = p - start;
-                    let mut screen_x_locked = false;
-                    let mut screen_y_locked = false;
-                    if ev.mods.shift {
-                        if d.x.abs() > d.y.abs() {
-                            d.y = 0.0;
-                            screen_y_locked = true;
-                        } else {
-                            d.x = 0.0;
-                            screen_x_locked = true;
-                        }
-                    }
-                    // Snap on the spread under the pointer. Shift uses that spread's view rotation.
-                    // Content stays in its frame, on the frame's spread.
-                    let target = if content { origin_spread } else { cx.layout.spread_at(p).map(|(s, _)| s).unwrap_or(origin_spread) };
-                    // 180 degrees keeps the screen axis. 90 and 270 swap it into the other spread axis.
-                    let odd_turn = cx.layout.slot(target).is_some_and(|slot| slot.rotation % 2 == 1);
-                    let spread_x_locked = if odd_turn { screen_y_locked } else { screen_x_locked };
-                    let spread_y_locked = if odd_turn { screen_x_locked } else { screen_y_locked };
-                    let x_edges = if spread_x_locked { [false; 3] } else { [true; 3] };
-                    let y_edges = if spread_y_locked { [false; 3] } else { [true; 3] };
-                    self.guides.clear();
-                    // The movement in the origin spread's coordinates (its view may be turned).
-                    let mut ds = cx.layout.delta_to_spread(origin_spread, d);
-                    let b0s = bounds0.map(|b| cx.layout.xf(origin_spread).inverse().transform_rect_bbox(b));
-                    let q0 = b0s.map_or(Point::ORIGIN, |b| Point::new(b.x0, b.y0));
-                    // Same corner conversion transform.move already uses when the spread changes.
-                    let mut landed = cx.layout.to_spread(target, cx.layout.to_canvas(origin_spread, q0 + ds));
-                    // Command suspends snapping. A Shift-locked spread axis is not offered.
-                    if !ev.mods.cmd
-                        && cx.snap.any()
-                        && let Some(b0) = b0s
-                    {
-                        let proposed = if target == origin_spread {
-                            b0 + ds
-                        } else {
-                            let shift = landed - q0;
-                            Rect::new(b0.x0 + shift.x, b0.y0 + shift.y, b0.x1 + shift.x, b0.y1 + shift.y)
-                        };
-                        let hit = crate::snap::snap(
-                            cx,
-                            SnapRequest {
-                                spread: target,
-                                gesture: Gesture::Move,
-                                rect: proposed,
-                                x_edges,
-                                y_edges,
-                                exclude: &exclude,
-                                exclude_guides: &[],
-                                copying: ev.mods.alt && !content,
-                                lengths: [None, None],
-                                angle: None,
-                                radius: 0.0,
-                                pointer: cx.layout.to_spread(target, p),
-                            },
-                        );
-                        if target == origin_spread {
-                            if x_edges != [false, false, false] && hit.delta.x.is_finite() {
-                                ds.x += hit.delta.x;
-                            }
-                            if y_edges != [false, false, false] && hit.delta.y.is_finite() {
-                                ds.y += hit.delta.y;
-                            }
-                        } else {
-                            if x_edges != [false, false, false] && hit.delta.x.is_finite() {
-                                landed.x += hit.delta.x;
-                            }
-                            if y_edges != [false, false, false] && hit.delta.y.is_finite() {
-                                landed.y += hit.delta.y;
-                            }
-                        }
-                        self.guides = hit.guides;
-                    }
-                    // Same spread: dx, dy are the origin spread translation. Crossing: the corner
-                    // conversion, so the reparented item lands on the snapped target point.
-                    let (dx, dy) = if target == origin_spread {
-                        (ds.x, ds.y)
-                    } else {
-                        let dt = landed - q0;
-                        (dt.x, dt.y)
-                    };
-                    if content {
-                        let ids: Vec<u64> = exclude.iter().map(|i| i.0).collect();
-                        return vec![Action::Preview("transform.move".into(), json!({"dx": dx, "dy": dy, "ids": ids, "content": true}))];
-                    }
-                    let mut params = json!({"dx": dx, "dy": dy, "copy": ev.mods.alt});
-                    if target != origin_spread {
-                        params = json!({"dx": dx, "dy": dy, "copy": ev.mods.alt, "toSpread": spread_json(target)});
-                    }
-                    vec![Action::Preview("transform.move".into(), params)]
-                }
-                Drag::Resize { handle, start, from, spread } => {
-                    let _ = start;
-                    let pointer = cx.layout.to_spread(spread, p);
-                    let raw = resize_edges_rect(from, handle, pointer);
-                    let mut to = resize_rect(from, handle, pointer, ev.mods);
-                    // Space while dragging: Live Distribute (several objects keep their size).
-                    let distribute = ev.mods.space && cx.selection.items.len() > 1;
-                    self.guides.clear();
-                    // Command still scales content. It does not skip the snap.
-                    if !distribute && cx.snap.any() {
-                        let (mut x_edges, mut y_edges) = resize_edge_flags(handle);
-                        let driver_x = drives_x(handle, from, raw);
-                        if ev.mods.shift {
-                            if driver_x {
-                                y_edges = [false, false, false];
-                            } else {
-                                x_edges = [false, false, false];
-                            }
-                        }
-                        let exclude = cx.selection.items.clone();
-                        let (pad_x, pad_y) = single_stroke_pad(cx);
-                        let proposed = to;
-                        let mut hit = crate::snap::snap(
-                            cx,
-                            SnapRequest {
-                                spread,
-                                gesture: Gesture::Resize,
-                                rect: proposed,
-                                x_edges,
-                                y_edges,
-                                exclude: &exclude,
-                                exclude_guides: &[],
-                                copying: false,
-                                lengths: [axis_length(x_edges, proposed.width(), pad_x), axis_length(y_edges, proposed.height(), pad_y)],
-                                angle: None,
-                                radius: 0.0,
-                                pointer,
-                            },
-                        );
-                        to = finish_snapped_resize(from, handle, proposed, ev.mods, driver_x, (x_edges, y_edges), &hit);
-                        crate::snap::lay_dimension_guides(&mut hit.guides, cx.layout.xf(spread), proposed, to, x_edges, y_edges, hit.length_delta);
-                        self.guides = hit.guides;
-                    }
-                    vec![Action::Preview(
-                        "transform.resize".into(),
-                        json!({"from": rect_json(from), "to": rect_json(to), "content": ev.mods.cmd, "distribute": distribute}),
-                    )]
-                }
-                Drag::ContentResize { id, handle, from, spread } => {
-                    let to = resize_rect(from, handle, cx.layout.to_spread(spread, p), ev.mods);
-                    vec![Action::Preview("transform.set".into(), json!({"ids": [id.0], "content": true, "bounds": rect_json(to)}))]
-                }
-                Drag::Marquee { start, .. } => {
-                    self.drag = Drag::Marquee { start, cur: p };
-                    vec![]
-                }
-                Drag::Place { .. } => vec![],
-                Drag::Corner { frame, corner, start } => {
-                    let Some(d) = frame.drag_delta(corner, start, p) else { return vec![] };
-                    let opts = frame.dragged(corner, frame.size(corner) + d, ev.mods.shift);
-                    vec![Action::Preview("object.cornerOptions".into(), corners::params(frame.id, &opts))]
-                }
-                Drag::Rotate { center, start_angle, start_rotation } => {
-                    let mut a = ((p - center).atan2() - start_angle).to_degrees();
-                    self.guides.clear();
-                    if ev.mods.shift {
-                        // 45 degree steps. The rotation pass does not run while Shift is held.
-                        a = (a / 45.0).round() * 45.0;
-                    } else if let Some(start) = start_rotation {
-                        let raw = -a;
-                        if let Some(resulting) = crate::snap::folded_rotation(start + raw) {
-                            let spread =
-                                cx.selection.items.first().and_then(|id| cx.doc.find(*id)).map(|loc| loc.spread).unwrap_or(SpreadRef::Doc(0));
-                            let exclude = cx.selection.items.clone();
-                            // The rect is unused by the angle pass. It only has to be finite.
-                            let hit = crate::snap::snap(
-                                cx,
-                                SnapRequest {
-                                    spread,
-                                    gesture: Gesture::Rotate,
-                                    rect: Rect::new(0.0, 0.0, 1.0, 1.0),
-                                    x_edges: [false, false, false],
-                                    y_edges: [false, false, false],
-                                    exclude: &exclude,
-                                    exclude_guides: &[],
-                                    copying: false,
-                                    lengths: [None, None],
-                                    angle: Some(resulting),
-                                    radius: (p - center).hypot(),
-                                    pointer: cx.layout.to_spread(spread, p),
-                                },
-                            );
-                            if let Some(snapped) = hit.angle
-                                && let Some(delta) = crate::snap::rotation_command_delta(start, snapped, raw)
-                            {
-                                a = -delta;
-                            }
-                            self.guides = hit.guides;
-                        }
-                    }
-                    // Screen y points down: a positive screen angle is clockwise.
-                    vec![Action::Preview("transform.rotate".into(), json!({"angle": -a}))]
-                }
-                Drag::Anchor { id, si, ai, handle, start, at } => {
-                    let d = p - start;
-                    let mut dx = d.x;
-                    let mut dy = d.y;
-                    self.guides.clear();
-                    // Direction handles do not snap. An anchor excludes the path it is on.
-                    if handle.is_none()
-                        && let Some((spread, origin)) = at
-                    {
-                        let proposed = origin + cx.layout.delta_to_spread(spread, d);
-                        let exclude = [ItemId(id)];
-                        let hit = crate::snap::snap(
-                            cx,
-                            SnapRequest {
-                                spread,
-                                gesture: Gesture::Point,
-                                rect: Rect::from_points(proposed, proposed),
-                                x_edges: [true, true, true],
-                                y_edges: [true, true, true],
-                                exclude: &exclude,
-                                exclude_guides: &[],
-                                copying: false,
-                                lengths: [None, None],
-                                angle: None,
-                                radius: 0.0,
-                                pointer: proposed,
-                            },
-                        );
-                        // dx and dy stay in canvas space. Snap.delta is spread space.
-                        let corr = spread_delta_to_canvas(cx.layout.xf(spread), hit.delta);
-                        if corr.x.is_finite() {
-                            dx += corr.x;
-                        }
-                        if corr.y.is_finite() {
-                            dy += corr.y;
-                        }
-                        self.guides = hit.guides;
-                    }
-                    let mut params = json!({"id": id, "anchors": [[si, ai]], "dx": dx, "dy": dy});
-                    if let Some(h) = handle {
-                        params["handle"] = json!(h);
-                    }
-                    vec![Action::Preview("path.moveAnchors".into(), params)]
-                }
-                Drag::None => vec![],
-            },
+            PointerKind::Down => self.pointer_down(cx, ev),
+            PointerKind::Drag => self.pointer_drag(cx, ev),
             PointerKind::Up => {
                 self.guides.clear();
                 let release = self.shift_release.take();
diff --git a/crates/tools/src/snap.rs b/crates/tools/src/snap.rs
index 974081dd5..e79051b11 100644
--- a/crates/tools/src/snap.rs
+++ b/crates/tools/src/snap.rs
@@ -1368,880 +1368,4 @@ fn push_alignment_guide(out: &mut Vec<Overlay>, cx: &ToolContext, spread: Spread
 }
 
 #[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use designcraft_compose::Cache;
-    use designcraft_doc::build::NewDocument;
-    use designcraft_doc::{Document, Guide, Item, Margins, PageSide, Selection, Shape, Stroke};
-    use designcraft_geom::shapes;
-    use designcraft_geom::{Affine, Unit};
-
-    use crate::layout::CanvasLayout;
-
-    use super::*;
-
-    /// Snapping offers the parent page the canvas shows: a single-sided page uses a two-page parent's first page.
-    #[test]
-    fn shown_parent_page_matches_page_side() {
-        let two = Document::new(&NewDocument { facing_pages: true, ..Default::default() });
-        assert_eq!(two.parents[0].pages.len(), 2);
-        assert_eq!(two.parents[0].parent_page_for_side(PageSide::Single), Some(0));
-        assert_eq!(two.parents[0].parent_page_for_side(PageSide::Left), Some(0));
-        assert_eq!(two.parents[0].parent_page_for_side(PageSide::Right), Some(1));
-        let mut one = Document::new(&NewDocument { facing_pages: false, ..Default::default() });
-        assert_eq!(one.parents[0].pages.len(), 1);
-        assert_eq!(one.parents[0].parent_page_for_side(PageSide::Single), Some(0));
-        Arc::make_mut(&mut one.parents[0]).pages.clear();
-        assert_eq!(one.parents[0].parent_page_for_side(PageSide::Single), None);
-    }
-
-    // The factory flags are const. Pin them anyway.
-    #[test]
-    #[allow(clippy::assertions_on_constants)]
-    fn factory_zone_is_four_pixels() {
-        assert!(SnapView::FACTORY.snap_to_guides);
-        assert!(!SnapView::FACTORY.snap_to_document_grid);
-        assert!(SnapView::FACTORY.smart_guides);
-        assert_eq!(SnapView::FACTORY.zone_px, 4.0);
-        assert!(!SnapView::OFF.any());
-        assert!(SnapView::FACTORY.any());
-    }
-
-    fn doc_with_items(moving: Rect, other: Rect, guide_x: f64) -> (Document, ItemId, ItemId) {
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let make = |doc: &mut Document, rect: Rect| {
-            let id = ItemId(doc.alloc());
-            let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(rect));
-            doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-            id
-        };
-        let moving_id = make(&mut doc, moving);
-        let other_id = make(&mut doc, other);
-        let page = &mut Arc::make_mut(&mut doc.spreads[0]).pages[0];
-        page.guides.push(Guide { orientation: Orientation::Vertical, position: guide_x, spread: false, locked: false, layer: None, liquid: false });
-        (doc, moving_id, other_id)
-    }
-
-    fn ctx_on<'a>(doc: &'a Document, sel: &'a Selection, cache: &'a Cache, layout: &'a CanvasLayout) -> ToolContext<'a> {
-        ToolContext {
-            doc,
-            selection: sel,
-            cache,
-            layout,
-            zoom: 1.0,
-            layer: doc.default_layer(),
-            snap: SnapView::FACTORY,
-            unit: Unit::Points,
-            stroke_in_front: false,
-        }
-    }
-
-    fn y_req(rect: Rect) -> SnapRequest<'static> {
-        SnapRequest {
-            spread: SpreadRef::Doc(0),
-            gesture: Gesture::Move,
-            rect,
-            x_edges: [false, false, false],
-            y_edges: [true, true, true],
-            exclude: &[],
-            exclude_guides: &[],
-            copying: false,
-            lengths: [None, None],
-            angle: None,
-            radius: 0.0,
-            pointer: Point::new(0.0, 0.0),
-        }
-    }
-
-    fn move_req<'a>(rect: Rect, exclude: &'a [ItemId]) -> SnapRequest<'a> {
-        SnapRequest {
-            spread: SpreadRef::Doc(0),
-            gesture: Gesture::Move,
-            rect,
-            x_edges: [true, true, true],
-            y_edges: [false, false, false],
-            exclude,
-            exclude_guides: &[],
-            copying: false,
-            lengths: [None, None],
-            angle: None,
-            radius: 0.0,
-            pointer: Point::new(0.0, 0.0),
-        }
-    }
-
-    /// The bleed guide attracts like a ruler guide: a top edge 2 pt below the top bleed line
-    /// snaps up to it; with no bleed there is nothing there to snap to.
-    #[test]
-    fn bleed_guide_is_a_snap_target() {
-        let far = Rect::new(300.0, 300.0, 320.0, 320.0);
-        for (bleed, expected) in [([9.0, 9.0, 9.0, 9.0], -2.0), ([0.0; 4], 0.0)] {
-            let (mut doc, moving, _other) = doc_with_items(Rect::new(80.0, 100.0, 100.0, 140.0), far, 500.0);
-            doc.settings.bleed = bleed;
-            let top = doc.spreads[0].bounds().y0 - 9.0;
-            let rect = Rect::new(80.0, top + 2.0, 100.0, top + 40.0);
-            let cache = Cache::new();
-            let layout = CanvasLayout::new(&doc, false);
-            let sel = Selection::default();
-            let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-            cx.snap.zone_px = 4.0;
-            let hit = snap(
-                &cx,
-                SnapRequest {
-                    spread: SpreadRef::Doc(0),
-                    gesture: Gesture::Move,
-                    rect,
-                    x_edges: [false, false, false],
-                    y_edges: [true, true, true],
-                    exclude: &[moving],
-                    exclude_guides: &[],
-                    copying: false,
-                    lengths: [None, None],
-                    angle: None,
-                    radius: 0.0,
-                    pointer: Point::new(0.0, 0.0),
-                },
-            );
-            assert!((hit.delta.y - expected).abs() < 1e-6, "bleed {bleed:?}: {:?}", hit.delta);
-        }
-    }
-
-    #[test]
-    fn guide_beats_a_closer_object_edge() {
-        // Right edge at 100.5. Object edge at 100 (0.5 away). Guide at 104 (3.5 away). Zone is 4.
-        let (doc, moving, _other) = doc_with_items(Rect::new(80.0, 100.0, 100.5, 140.0), Rect::new(90.0, 100.0, 100.0, 160.0), 104.0);
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.zone_px = 4.0;
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Move,
-                rect: Rect::new(80.0, 100.0, 100.5, 140.0),
-                x_edges: [true, true, true],
-                y_edges: [false, false, false],
-                exclude: &[moving],
-                exclude_guides: &[],
-                copying: false,
-                lengths: [None, None],
-                angle: None,
-                radius: 0.0,
-                pointer: Point::new(0.0, 0.0),
-            },
-        );
-        assert!((hit.delta.x - 3.5).abs() < 1e-6);
-        assert!(hit.guides.is_empty());
-    }
-
-    /// A dragged guide is not its own target: excluded, the guide at 104 doesn't pull a line at 102.
-    /// Nor does the baseline grid pull it.
-    #[test]
-    fn excluded_guide_is_not_a_target() {
-        let far = Rect::new(400.0, 400.0, 420.0, 420.0);
-        let (doc, _, _) = doc_with_items(far, far, 104.0);
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let cx = ctx_on(&doc, &sel, &cache, &layout);
-        let line = Rect::new(102.0, 100.0, 102.0, 300.0);
-        let dragged = [designcraft_doc::GuideSel { spread: SpreadRef::Doc(0), page: 0, index: 0 }];
-        let hit = snap(&cx, move_req(line, &[]));
-        assert!((hit.delta.x - 2.0).abs() < 1e-6, "{:?}", hit.delta);
-        let hit = snap(&cx, SnapRequest { exclude_guides: &dragged, ..move_req(line, &[]) });
-        assert_eq!(hit.delta.x, 0.0);
-        // A dragged guide passes the baseline grid's lines (36 + 12n), which a moved object meets.
-        let flat = Rect::new(100.0, 86.0, 300.0, 86.0);
-        assert!((snap(&cx, y_req(flat)).delta.y - -2.0).abs() < 1e-6);
-        assert_eq!(snap(&cx, SnapRequest { gesture: Gesture::Guide, ..y_req(flat) }).delta.y, 0.0);
-    }
-
-    #[test]
-    fn parent_centered_stroke_attracts_at_the_outer_edge() {
-        let mut doc = Document::new(&NewDocument::default());
-        let pid = doc.add_parent("A", "A-Parent", 1, 12.0, Margins::uniform(36.0));
-        doc.apply_parent(&[0], Some(pid)).unwrap();
-        let layer = doc.default_layer();
-        let id = ItemId(doc.alloc());
-        let (ppi, ppg) = doc.parent_page_for(0).unwrap();
-        let parent_x = doc.parents[ppi].pages[ppg].x;
-        let mut item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(parent_x + 72.0, 140.0, parent_x + 252.0, 300.0)));
-        item.stroke = Stroke::default(); // 1 pt, center
-        doc.insert_item(SpreadRef::Parent(ppi), item, None).unwrap();
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        // Moving left edge at 253. Visible parent right edge is 252.5.
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Move,
-                rect: Rect::new(253.0, 140.0, 353.0, 240.0),
-                x_edges: [true, false, false],
-                y_edges: [false, false, false],
-                exclude: &[],
-                exclude_guides: &[],
-                copying: false,
-                lengths: [None, None],
-                angle: None,
-                radius: 0.0,
-                pointer: Point::new(0.0, 0.0),
-            },
-        );
-        assert!((hit.delta.x - -0.5).abs() < 1e-6, "delta {}", hit.delta.x);
-    }
-
-    #[test]
-    fn object_edge_snaps_when_guide_snap_is_off() {
-        let (doc, moving, _other) = doc_with_items(Rect::new(80.0, 100.0, 100.5, 140.0), Rect::new(90.0, 100.0, 100.0, 160.0), 104.0);
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Move,
-                rect: Rect::new(80.0, 100.0, 100.5, 140.0),
-                x_edges: [true, true, true],
-                y_edges: [false, false, false],
-                exclude: &[moving],
-                exclude_guides: &[],
-                copying: false,
-                lengths: [None, None],
-                angle: None,
-                radius: 0.0,
-                pointer: Point::new(0.0, 0.0),
-            },
-        );
-        assert!((hit.delta.x - -0.5).abs() < 1e-6);
-        assert!(matches!(hit.guides.first(), Some(Overlay::Guide { .. })));
-    }
-
-    #[test]
-    fn hidden_layer_guide_is_not_a_target() {
-        let (mut doc, moving, _) = doc_with_items(Rect::new(80.0, 100.0, 102.0, 140.0), Rect::new(300.0, 100.0, 340.0, 140.0), 104.0);
-        let layer = doc.default_layer();
-        doc.layers.iter_mut().find(|l| l.id == layer).unwrap().visible = false;
-        Arc::make_mut(&mut doc.spreads[0]).pages[0].guides[0].layer = Some(layer);
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let cx = ctx_on(&doc, &sel, &cache, &layout);
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Move,
-                rect: Rect::new(80.0, 100.0, 102.0, 140.0),
-                x_edges: [false, false, true],
-                y_edges: [false, false, false],
-                exclude: &[moving],
-                exclude_guides: &[],
-                copying: false,
-                lengths: [None, None],
-                angle: None,
-                radius: 0.0,
-                pointer: Point::new(0.0, 0.0),
-            },
-        );
-        assert_eq!(hit.delta.x, 0.0);
-    }
-
-    #[test]
-    fn alt_copy_snaps_to_the_original() {
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let id = ItemId(doc.alloc());
-        let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(100.0, 40.0, 160.0, 80.0)));
-        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Move,
-                rect: Rect::new(162.0, 40.0, 222.0, 80.0),
-                x_edges: [true, false, false],
-                y_edges: [false, false, false],
-                exclude: &[id],
-                exclude_guides: &[],
-                copying: true,
-                lengths: [None, None],
-                angle: None,
-                radius: 0.0,
-                pointer: Point::new(0.0, 0.0),
-            },
-        );
-        assert!((hit.delta.x - -2.0).abs() < 1e-6);
-    }
-
-    #[test]
-    fn alt_copy_does_not_stick_to_the_preview() {
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let make = |doc: &mut Document, rect: Rect| {
-            let id = ItemId(doc.alloc());
-            let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(rect));
-            doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-            id
-        };
-        let original = make(&mut doc, Rect::new(100.0, 40.0, 160.0, 80.0));
-        let ghost = make(&mut doc, Rect::new(161.0, 40.0, 221.0, 80.0));
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::items(vec![ghost]);
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Move,
-                rect: Rect::new(161.0, 40.0, 221.0, 80.0),
-                x_edges: [true, false, false],
-                y_edges: [false, false, false],
-                exclude: &[original],
-                exclude_guides: &[],
-                copying: true,
-                lengths: [None, None],
-                angle: None,
-                radius: 0.0,
-                pointer: Point::new(0.0, 0.0),
-            },
-        );
-        assert!((hit.delta.x - -1.0).abs() < 1e-6, "delta.x = {}", hit.delta.x);
-    }
-
-    #[test]
-    fn parent_page_guides_snap_on_the_document_page() {
-        // Facing document: page 1 is a right page at x = 0; its parent page is A's right page at
-        // x = 612 in the parent spread.
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let id = ItemId(doc.alloc());
-        let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(80.0, 100.0, 100.5, 140.0)));
-        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-        Arc::make_mut(&mut doc.parents[0]).pages[1].guides.push(Guide {
-            orientation: Orientation::Vertical,
-            position: 612.0 + 104.0,
-            spread: false,
-            locked: false,
-            layer: None,
-            liquid: false,
-        });
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.zone_px = 4.0;
-        let hit = snap(&cx, move_req(Rect::new(80.0, 100.0, 100.5, 140.0), &[id]));
-        assert!((hit.delta.x - 3.5).abs() < 1e-6, "snaps to the parent guide at x = 104: {:?}", hit.delta);
-    }
-
-    #[test]
-    fn grid_beats_a_closer_guide() {
-        let mut doc = Document::new(&NewDocument::default());
-        doc.settings.grid.horizontal = 72.0;
-        doc.settings.grid.vertical = 72.0;
-        doc.settings.grid.subdivisions = 8; // 9 pt
-        let layer = doc.default_layer();
-        let id = ItemId(doc.alloc());
-        let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(10.0, 10.0, 40.0, 40.0)));
-        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-        // Guide 1 pt away at x = 11. Subdivision line at 9 is 1 pt the other way. Grid must win.
-        Arc::make_mut(&mut doc.spreads[0]).pages[0].guides.push(Guide {
-            orientation: Orientation::Vertical,
-            position: 11.0,
-            spread: true,
-            locked: false,
-            layer: None,
-            liquid: false,
-        });
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_document_grid = true;
-        let hit = snap(&cx, move_req(Rect::new(10.0, 10.0, 40.0, 40.0), &[id]));
-        assert!((hit.delta.x - -1.0).abs() < 1e-6);
-        assert!(hit.guides.is_empty());
-    }
-
-    #[test]
-    fn hidden_baseline_still_snaps_and_zero_increment_does_not() {
-        let mut doc = Document::new(&NewDocument::default());
-        doc.settings.baseline_grid.start = 36.0;
-        doc.settings.baseline_grid.increment = 12.0;
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let cx = ctx_on(&doc, &sel, &cache, &layout);
-        // Top at 49 wants the line at 48 (start 36, increment 12). The margin at 36 is 13 pt away.
-        let hit = snap(&cx, y_req(Rect::new(100.0, 49.0, 140.0, 80.0)));
-        assert!((hit.delta.y - -1.0).abs() < 1e-6);
-        let mut dead = doc.clone();
-        dead.settings.baseline_grid.increment = 0.0;
-        let layout = CanvasLayout::new(&dead, false);
-        let cx = ctx_on(&dead, &sel, &cache, &layout);
-        let hit = snap(&cx, y_req(Rect::new(100.0, 49.0, 140.0, 80.0)));
-        assert_eq!(hit.delta.y, 0.0);
-    }
-
-    #[test]
-    fn baseline_relative_to_the_top_margin_snaps_from_the_margin() {
-        let mut doc = Document::new(&NewDocument::default());
-        std::sync::Arc::make_mut(&mut doc.spreads[0]).pages[0].margins.top = 37.0;
-        doc.settings.baseline_grid.start = 0.0;
-        doc.settings.baseline_grid.increment = 10.0;
-        doc.settings.baseline_grid.relative_to = designcraft_doc::GridRelative::TopMargin;
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let cx = ctx_on(&doc, &sel, &cache, &layout);
-        // Lines at 37 + 10n: a top at 58 goes up to 57, not down to the page-relative 60.
-        let hit = snap(&cx, y_req(Rect::new(100.0, 58.0, 140.0, 80.0)));
-        assert!((hit.delta.y - -1.0).abs() < 1e-6, "{}", hit.delta.y);
-    }
-
-    #[test]
-    fn nearer_of_margin_and_baseline_wins() {
-        // Bottom margin at 792 - 54 = 738, between baseline lines 732 and 744.
-        let doc = Document::new(&NewDocument {
-            margins: designcraft_doc::Margins { top: 54.0, bottom: 54.0, inside: 54.0, outside: 42.0 },
-            ..Default::default()
-        });
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        // At 50% the 4 px zone is 8 pt: both the margin and a baseline line are in reach.
-        let cx = ToolContext { zoom: 0.5, ..ctx_on(&doc, &sel, &cache, &layout) };
-        let bottom = |y1: f64| SnapRequest { y_edges: [false, false, true], gesture: Gesture::Resize, ..y_req(Rect::new(100.0, 600.0, 140.0, y1)) };
-        assert!((snap(&cx, bottom(739.5)).delta.y - -1.5).abs() < 1e-6, "the margin is nearer");
-        assert!((snap(&cx, bottom(742.5)).delta.y - 1.5).abs() < 1e-6, "the baseline line is nearer");
-        assert!((snap(&cx, bottom(741.0)).delta.y - -3.0).abs() < 1e-6, "a tie goes to the margin");
-    }
-
-    #[test]
-    fn rotated_item_matches_its_own_side() {
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let id = ItemId(doc.alloc());
-        let mut item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 200.0, 40.0)));
-        item.xf = Affine::rotate((-30.0_f64).to_radians());
-        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        cx.snap.snap_to_document_grid = false;
-        // Width 193.2 is the axis-aligned box. 200 is the side. Zone 4 reaches 200 from 197, not from 193.
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Resize,
-                rect: Rect::new(80.0, 200.0, 277.0, 280.0),
-                x_edges: [false, false, true],
-                y_edges: [false, false, false],
-                exclude: &[],
-                exclude_guides: &[],
-                copying: false,
-                lengths: [Some(197.0), None],
-                angle: None,
-                radius: 0.0,
-                pointer: Point::new(277.0, 240.0),
-            },
-        );
-        assert!((hit.delta.x - 3.0).abs() < 1e-6);
-        assert!(matches!(hit.guides.last(), Some(Overlay::Measure { text, .. }) if text.contains("200")));
-    }
-
-    #[test]
-    fn grouped_child_matches_spread_side() {
-        // Group scale 2 on X and 1 on Y. Child rotated -90 degrees (decompose reports +90).
-        // Spread-space sides are local width times 1 (100) and local height times 2 (80).
-        // 82 is 2 pt from 80 and far from 200, which is what per-node scales would offer.
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let child_id = ItemId(doc.alloc());
-        let mut child = Item::new(child_id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 100.0, 40.0)));
-        child.xf = Affine::rotate((-90.0_f64).to_radians());
-        let group_id = ItemId(doc.alloc());
-        let mut group = Item::new(group_id, layer, Shape::Group, designcraft_geom::PathData::default());
-        group.xf = Affine::scale_non_uniform(2.0, 1.0);
-        group.content = designcraft_doc::Content::Group { items: vec![std::sync::Arc::new(child)] };
-        doc.insert_item(SpreadRef::Doc(0), group, None).unwrap();
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        cx.snap.snap_to_document_grid = false;
-        cx.snap.align_edges = false;
-        cx.snap.align_centers = false;
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Resize,
-                rect: Rect::new(200.0, 200.0, 282.0, 240.0),
-                x_edges: [false, false, true],
-                y_edges: [false, false, false],
-                exclude: &[],
-                exclude_guides: &[],
-                copying: false,
-                lengths: [Some(82.0), None],
-                angle: None,
-                radius: 0.0,
-                pointer: Point::new(282.0, 220.0),
-            },
-        );
-        assert!((hit.delta.x - -2.0).abs() < 1e-6, "delta.x = {}, want -2 toward local height times 2", hit.delta.x);
-    }
-
-    #[test]
-    fn move_matches_a_stationary_gap() {
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        // Stationary gap of 20 between [0,40] and [60,90]. Moving box at [112,150], 22 away from 90.
-        for r in [Rect::new(0.0, 0.0, 40.0, 30.0), Rect::new(60.0, 0.0, 90.0, 30.0), Rect::new(112.0, 0.0, 150.0, 30.0)] {
-            let id = ItemId(doc.alloc());
-            let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(r));
-            doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-        }
-        let moving = doc.spreads[0].items[2].id;
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Move,
-                rect: Rect::new(112.0, 0.0, 150.0, 30.0),
-                x_edges: [true, true, true],
-                y_edges: [false, false, false],
-                exclude: &[moving],
-                exclude_guides: &[],
-                copying: false,
-                lengths: [None, None],
-                angle: None,
-                radius: 0.0,
-                pointer: Point::new(0.0, 0.0),
-            },
-        );
-        assert!((hit.delta.x - -2.0).abs() < 1e-6);
-        assert!(hit.guides.iter().any(|g| matches!(g, Overlay::Gap { .. })));
-    }
-
-    fn doc_with_rects(rects: &[Rect]) -> Document {
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        for &r in rects {
-            let id = ItemId(doc.alloc());
-            let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(r));
-            doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-        }
-        doc
-    }
-
-    fn gap_overlays(guides: &[Overlay]) -> usize {
-        guides.iter().filter(|g| matches!(g, Overlay::Gap { .. })).count()
-    }
-
-    // #188: a box dragged between two others snaps to the middle and marks both gaps.
-    #[test]
-    fn move_centers_between_two_boxes_side_by_side() {
-        // Neighbours end at 40 and start at 160. The 30 wide mover at [83,113] is 2 left of centre.
-        let doc = doc_with_rects(&[Rect::new(0.0, 0.0, 40.0, 30.0), Rect::new(160.0, 0.0, 200.0, 30.0)]);
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        let hit = snap(&cx, move_req(Rect::new(83.0, 5.0, 113.0, 25.0), &[]));
-        assert!((hit.delta.x - 2.0).abs() < 1e-6, "{}", hit.delta.x);
-        assert_eq!(gap_overlays(&hit.guides), 2);
-    }
-
-    #[test]
-    fn move_centers_between_two_boxes_stacked() {
-        let doc = doc_with_rects(&[Rect::new(0.0, 0.0, 30.0, 40.0), Rect::new(0.0, 160.0, 30.0, 200.0)]);
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        let hit = snap(&cx, y_req(Rect::new(5.0, 83.0, 25.0, 113.0)));
-        assert!((hit.delta.y - 2.0).abs() < 1e-6, "{}", hit.delta.y);
-        assert_eq!(gap_overlays(&hit.guides), 2);
-    }
-
-    fn with_baseline_grid(mut doc: Document) -> Document {
-        doc.settings.baseline_grid.start = 36.0;
-        doc.settings.baseline_grid.increment = 12.0;
-        doc
-    }
-
-    // #188: with Snap to Guides on, the hidden baseline grid took vertical moves first.
-    #[test]
-    fn vertical_centering_beats_a_closer_baseline() {
-        // Middle at 200. Mover centre 198 (+2). Its top and bottom are 3 from lines 180 and 216.
-        let doc = with_baseline_grid(doc_with_rects(&[Rect::new(100.0, 100.0, 130.0, 140.0), Rect::new(100.0, 260.0, 130.0, 300.0)]));
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let cx = ctx_on(&doc, &sel, &cache, &layout);
-        let hit = snap(&cx, y_req(Rect::new(105.0, 183.0, 125.0, 213.0)));
-        assert!((hit.delta.y - 2.0).abs() < 1e-6, "{}", hit.delta.y);
-        assert_eq!(gap_overlays(&hit.guides), 2);
-    }
-
-    #[test]
-    fn vertical_alignment_beats_a_closer_baseline() {
-        // Top 107 is 1 from the line at 108 and 2 from the other box's top at 105.
-        let doc = with_baseline_grid(doc_with_rects(&[Rect::new(300.0, 105.0, 340.0, 135.0)]));
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let cx = ctx_on(&doc, &sel, &cache, &layout);
-        let hit = snap(&cx, y_req(Rect::new(100.0, 107.0, 140.0, 137.0)));
-        assert!((hit.delta.y - -2.0).abs() < 1e-6, "{}", hit.delta.y);
-        assert!(hit.guides.iter().any(|g| matches!(g, Overlay::Guide { .. })));
-    }
-
-    #[test]
-    fn move_off_center_outside_the_zone_does_not_center() {
-        // 10 off centre, zone 4.
-        let doc = doc_with_rects(&[Rect::new(0.0, 0.0, 40.0, 30.0), Rect::new(160.0, 0.0, 200.0, 30.0)]);
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        let hit = snap(&cx, move_req(Rect::new(95.0, 5.0, 125.0, 25.0), &[]));
-        assert_eq!(hit.delta.x, 0.0);
-        assert_eq!(gap_overlays(&hit.guides), 0);
-    }
-
-    #[test]
-    fn centering_needs_smart_spacing() {
-        let doc = doc_with_rects(&[Rect::new(0.0, 0.0, 40.0, 30.0), Rect::new(160.0, 0.0, 200.0, 30.0)]);
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        cx.snap.smart_spacing = false;
-        let hit = snap(&cx, move_req(Rect::new(83.0, 5.0, 113.0, 25.0), &[]));
-        assert_eq!(hit.delta.x, 0.0);
-    }
-
-    #[test]
-    fn create_does_not_match_spacing() {
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        for r in [Rect::new(0.0, 0.0, 40.0, 30.0), Rect::new(60.0, 0.0, 90.0, 30.0)] {
-            let id = ItemId(doc.alloc());
-            let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(r));
-            doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-        }
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        cx.snap.smart_dimensions = false;
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Create,
-                rect: Rect::new(112.0, 0.0, 150.0, 30.0),
-                x_edges: [true, true, true],
-                y_edges: [false, false, false],
-                exclude: &[],
-                exclude_guides: &[],
-                copying: false,
-                lengths: [Some(38.0), None],
-                angle: None,
-                radius: 0.0,
-                pointer: Point::new(0.0, 0.0),
-            },
-        );
-        assert!((hit.delta.x).abs() < 1e-6);
-    }
-
-    #[test]
-    fn rotation_matches_another_items_angle() {
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let id = ItemId(doc.alloc());
-        let mut item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 80.0, 40.0)));
-        item.xf = Affine::rotate((-30.0_f64).to_radians());
-        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Rotate,
-                rect: Rect::new(100.0, 100.0, 160.0, 140.0),
-                x_edges: [false, false, false],
-                y_edges: [false, false, false],
-                exclude: &[],
-                exclude_guides: &[],
-                copying: false,
-                lengths: [None, None],
-                angle: Some(28.0),
-                radius: 80.0,
-                pointer: Point::new(180.0, 120.0),
-            },
-        );
-        let angle = hit.angle.expect("rotation hit");
-        assert!((angle - 30.0).abs() < 1e-6);
-        assert!(matches!(hit.guides.first(), Some(Overlay::Measure { .. })));
-    }
-
-    #[test]
-    fn parent_item_angle_matches() {
-        // Document::new already has A-Parent. Apply a second parent and insert on the
-        // page parent_page_for shows, not Parent(0). A facing right page sits near x 612.
-        let mut doc = Document::new(&NewDocument::default());
-        let pid = doc.add_parent("B", "B-Parent", 1, 12.0, Margins::uniform(36.0));
-        doc.apply_parent(&[0], Some(pid)).unwrap();
-        std::sync::Arc::make_mut(&mut doc.spreads[0]).pages[0].show_parent_items = true;
-        let (ppi, ppg) = doc.parent_page_for(0).unwrap();
-        let parent_x = doc.parents[ppi].pages[ppg].x;
-        let rect = Rect::new(parent_x + 72.0, 140.0, parent_x + 152.0, 180.0);
-        let center = rect.center();
-        let layer = doc.default_layer();
-        let id = ItemId(doc.alloc());
-        let mut item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(rect));
-        item.xf = Affine::translate((center.x, center.y)) * Affine::rotate((-30.0_f64).to_radians()) * Affine::translate((-center.x, -center.y));
-        doc.insert_item(SpreadRef::Parent(ppi), item, None).unwrap();
-        assert!(doc.spreads[0].items.iter().all(|it| (designcraft_geom::decompose::decompose(it.xf).rotation - 30.0).abs() > 1.0));
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        let hit = snap(
-            &cx,
-            SnapRequest {
-                spread: SpreadRef::Doc(0),
-                gesture: Gesture::Rotate,
-                rect: Rect::new(100.0, 100.0, 160.0, 140.0),
-                x_edges: [false, false, false],
-                y_edges: [false, false, false],
-                exclude: &[],
-                exclude_guides: &[],
-                copying: false,
-                lengths: [None, None],
-                angle: Some(28.0),
-                radius: 80.0,
-                pointer: Point::new(180.0, 120.0),
-            },
-        );
-        let angle = hit.angle.expect("parent rotation hit");
-        assert!((angle - 30.0).abs() < 1e-6);
-    }
-
-    #[test]
-    fn rotated_group_uses_the_per_child_union() {
-        // Two children do not fill their local union. Rotating that union as one rectangle
-        // swings the empty corners out. The snap target is each child's visible box, transformed, then united.
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let mut child_a = Item::new(ItemId(doc.alloc()), layer, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)));
-        child_a.stroke = Stroke { weight: 2.0, ..Stroke::default() };
-        let child_b = Item::new(ItemId(doc.alloc()), layer, Shape::Rectangle, shapes::rectangle(Rect::new(40.0, 30.0, 50.0, 40.0)));
-        let mut group = Item::new(ItemId(doc.alloc()), layer, Shape::Group, designcraft_geom::PathData::default());
-        let xf = Affine::translate((300.0, 400.0)) * Affine::rotate((-45.0_f64).to_radians());
-        group.xf = xf;
-        group.content = designcraft_doc::Content::Group { items: vec![Arc::new(child_a), Arc::new(child_b)] };
-        doc.insert_item(SpreadRef::Doc(0), group, None).unwrap();
-        let a_vis = Rect::new(-1.0, -1.0, 11.0, 11.0);
-        let b_vis = Rect::new(40.0, 30.0, 50.0, 40.0);
-        let per_child = xf.transform_rect_bbox(a_vis).union(xf.transform_rect_bbox(b_vis));
-        let rotated_union = xf.transform_rect_bbox(a_vis.union(b_vis));
-        // At 45 degrees the empty corners move y, not x. The two boxes share x0.
-        assert!((per_child.y0 - rotated_union.y0).abs() > 1.0, "fixture does not separate the two boxes");
-        let gap = 2.0;
-        // A short rect just above the per-child top. Its other edges stay outside the zone of the rotated union.
-        let moving = Rect::new(per_child.x0, per_child.y0 - gap - 4.0, per_child.x0 + 20.0, per_child.y0 - gap);
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        cx.snap.snap_to_document_grid = false;
-        let hit = snap(&cx, y_req(moving));
-        assert!((hit.delta.y - gap).abs() < 1e-4, "delta.y {}, want {gap} onto {}", hit.delta.y, per_child.y0);
-        let wrong = rotated_union.y0 - moving.y1;
-        assert!((hit.delta.y - wrong).abs() > 1.0, "delta matched the rotated local union");
-    }
-
-    #[test]
-    fn rotated_group_child_does_not_offer_local_zero() {
-        // The group is at 30 degrees. Its child stays at local 0, so the absolute angle is 30.
-        // 2 degrees is inside the zone of 0 and far from 30. Local 0 must not win.
-        let mut doc = Document::new(&NewDocument::default());
-        let layer = doc.default_layer();
-        let child = Item::new(ItemId(doc.alloc()), layer, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 40.0, 20.0)));
-        let mut group = Item::new(ItemId(doc.alloc()), layer, Shape::Group, designcraft_geom::PathData::default());
-        group.xf = Affine::rotate((-30.0_f64).to_radians());
-        group.content = designcraft_doc::Content::Group { items: vec![Arc::new(child)] };
-        doc.insert_item(SpreadRef::Doc(0), group, None).unwrap();
-        let cache = Cache::new();
-        let layout = CanvasLayout::new(&doc, false);
-        let sel = Selection::default();
-        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
-        cx.snap.snap_to_guides = false;
-        let ask = |angle: f64| {
-            snap(
-                &cx,
-                SnapRequest {
-                    spread: SpreadRef::Doc(0),
-                    gesture: Gesture::Rotate,
-                    rect: Rect::new(100.0, 100.0, 160.0, 140.0),
-                    x_edges: [false, false, false],
-                    y_edges: [false, false, false],
-                    exclude: &[],
-                    exclude_guides: &[],
-                    copying: false,
-                    lengths: [None, None],
-                    angle: Some(angle),
-                    radius: 80.0,
-                    pointer: Point::new(180.0, 120.0),
-                },
-            )
-        };
-        let near_zero = ask(2.0);
-        assert!(near_zero.angle.is_none(), "local 0 was a target: {:?}", near_zero.angle);
-        let near_group = ask(28.0);
-        let angle = near_group.angle.expect("absolute 30");
-        assert!((angle - 30.0).abs() < 1e-6, "angle {angle}");
-    }
-}
+mod tests;
diff --git a/crates/tools/src/snap/tests.rs b/crates/tools/src/snap/tests.rs
new file mode 100644
index 000000000..2dfccafae
--- /dev/null
+++ b/crates/tools/src/snap/tests.rs
@@ -0,0 +1,875 @@
+use std::sync::Arc;
+
+use designcraft_compose::Cache;
+use designcraft_doc::build::NewDocument;
+use designcraft_doc::{Document, Guide, Item, Margins, PageSide, Selection, Shape, Stroke};
+use designcraft_geom::shapes;
+use designcraft_geom::{Affine, Unit};
+
+use crate::layout::CanvasLayout;
+
+use super::*;
+
+/// Snapping offers the parent page the canvas shows: a single-sided page uses a two-page parent's first page.
+#[test]
+fn shown_parent_page_matches_page_side() {
+    let two = Document::new(&NewDocument { facing_pages: true, ..Default::default() });
+    assert_eq!(two.parents[0].pages.len(), 2);
+    assert_eq!(two.parents[0].parent_page_for_side(PageSide::Single), Some(0));
+    assert_eq!(two.parents[0].parent_page_for_side(PageSide::Left), Some(0));
+    assert_eq!(two.parents[0].parent_page_for_side(PageSide::Right), Some(1));
+    let mut one = Document::new(&NewDocument { facing_pages: false, ..Default::default() });
+    assert_eq!(one.parents[0].pages.len(), 1);
+    assert_eq!(one.parents[0].parent_page_for_side(PageSide::Single), Some(0));
+    Arc::make_mut(&mut one.parents[0]).pages.clear();
+    assert_eq!(one.parents[0].parent_page_for_side(PageSide::Single), None);
+}
+
+// The factory flags are const. Pin them anyway.
+#[test]
+#[allow(clippy::assertions_on_constants)]
+fn factory_zone_is_four_pixels() {
+    assert!(SnapView::FACTORY.snap_to_guides);
+    assert!(!SnapView::FACTORY.snap_to_document_grid);
+    assert!(SnapView::FACTORY.smart_guides);
+    assert_eq!(SnapView::FACTORY.zone_px, 4.0);
+    assert!(!SnapView::OFF.any());
+    assert!(SnapView::FACTORY.any());
+}
+
+fn doc_with_items(moving: Rect, other: Rect, guide_x: f64) -> (Document, ItemId, ItemId) {
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let make = |doc: &mut Document, rect: Rect| {
+        let id = ItemId(doc.alloc());
+        let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(rect));
+        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+        id
+    };
+    let moving_id = make(&mut doc, moving);
+    let other_id = make(&mut doc, other);
+    let page = &mut Arc::make_mut(&mut doc.spreads[0]).pages[0];
+    page.guides.push(Guide { orientation: Orientation::Vertical, position: guide_x, spread: false, locked: false, layer: None, liquid: false });
+    (doc, moving_id, other_id)
+}
+
+fn ctx_on<'a>(doc: &'a Document, sel: &'a Selection, cache: &'a Cache, layout: &'a CanvasLayout) -> ToolContext<'a> {
+    ToolContext {
+        doc,
+        selection: sel,
+        cache,
+        layout,
+        zoom: 1.0,
+        layer: doc.default_layer(),
+        snap: SnapView::FACTORY,
+        unit: Unit::Points,
+        stroke_in_front: false,
+    }
+}
+
+fn y_req(rect: Rect) -> SnapRequest<'static> {
+    SnapRequest {
+        spread: SpreadRef::Doc(0),
+        gesture: Gesture::Move,
+        rect,
+        x_edges: [false, false, false],
+        y_edges: [true, true, true],
+        exclude: &[],
+        exclude_guides: &[],
+        copying: false,
+        lengths: [None, None],
+        angle: None,
+        radius: 0.0,
+        pointer: Point::new(0.0, 0.0),
+    }
+}
+
+fn move_req<'a>(rect: Rect, exclude: &'a [ItemId]) -> SnapRequest<'a> {
+    SnapRequest {
+        spread: SpreadRef::Doc(0),
+        gesture: Gesture::Move,
+        rect,
+        x_edges: [true, true, true],
+        y_edges: [false, false, false],
+        exclude,
+        exclude_guides: &[],
+        copying: false,
+        lengths: [None, None],
+        angle: None,
+        radius: 0.0,
+        pointer: Point::new(0.0, 0.0),
+    }
+}
+
+/// The bleed guide attracts like a ruler guide: a top edge 2 pt below the top bleed line
+/// snaps up to it; with no bleed there is nothing there to snap to.
+#[test]
+fn bleed_guide_is_a_snap_target() {
+    let far = Rect::new(300.0, 300.0, 320.0, 320.0);
+    for (bleed, expected) in [([9.0, 9.0, 9.0, 9.0], -2.0), ([0.0; 4], 0.0)] {
+        let (mut doc, moving, _other) = doc_with_items(Rect::new(80.0, 100.0, 100.0, 140.0), far, 500.0);
+        doc.settings.bleed = bleed;
+        let top = doc.spreads[0].bounds().y0 - 9.0;
+        let rect = Rect::new(80.0, top + 2.0, 100.0, top + 40.0);
+        let cache = Cache::new();
+        let layout = CanvasLayout::new(&doc, false);
+        let sel = Selection::default();
+        let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+        cx.snap.zone_px = 4.0;
+        let hit = snap(
+            &cx,
+            SnapRequest {
+                spread: SpreadRef::Doc(0),
+                gesture: Gesture::Move,
+                rect,
+                x_edges: [false, false, false],
+                y_edges: [true, true, true],
+                exclude: &[moving],
+                exclude_guides: &[],
+                copying: false,
+                lengths: [None, None],
+                angle: None,
+                radius: 0.0,
+                pointer: Point::new(0.0, 0.0),
+            },
+        );
+        assert!((hit.delta.y - expected).abs() < 1e-6, "bleed {bleed:?}: {:?}", hit.delta);
+    }
+}
+
+#[test]
+fn guide_beats_a_closer_object_edge() {
+    // Right edge at 100.5. Object edge at 100 (0.5 away). Guide at 104 (3.5 away). Zone is 4.
+    let (doc, moving, _other) = doc_with_items(Rect::new(80.0, 100.0, 100.5, 140.0), Rect::new(90.0, 100.0, 100.0, 160.0), 104.0);
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.zone_px = 4.0;
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Move,
+            rect: Rect::new(80.0, 100.0, 100.5, 140.0),
+            x_edges: [true, true, true],
+            y_edges: [false, false, false],
+            exclude: &[moving],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [None, None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(0.0, 0.0),
+        },
+    );
+    assert!((hit.delta.x - 3.5).abs() < 1e-6);
+    assert!(hit.guides.is_empty());
+}
+
+/// A dragged guide is not its own target: excluded, the guide at 104 doesn't pull a line at 102.
+/// Nor does the baseline grid pull it.
+#[test]
+fn excluded_guide_is_not_a_target() {
+    let far = Rect::new(400.0, 400.0, 420.0, 420.0);
+    let (doc, _, _) = doc_with_items(far, far, 104.0);
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let cx = ctx_on(&doc, &sel, &cache, &layout);
+    let line = Rect::new(102.0, 100.0, 102.0, 300.0);
+    let dragged = [designcraft_doc::GuideSel { spread: SpreadRef::Doc(0), page: 0, index: 0 }];
+    let hit = snap(&cx, move_req(line, &[]));
+    assert!((hit.delta.x - 2.0).abs() < 1e-6, "{:?}", hit.delta);
+    let hit = snap(&cx, SnapRequest { exclude_guides: &dragged, ..move_req(line, &[]) });
+    assert_eq!(hit.delta.x, 0.0);
+    // A dragged guide passes the baseline grid's lines (36 + 12n), which a moved object meets.
+    let flat = Rect::new(100.0, 86.0, 300.0, 86.0);
+    assert!((snap(&cx, y_req(flat)).delta.y - -2.0).abs() < 1e-6);
+    assert_eq!(snap(&cx, SnapRequest { gesture: Gesture::Guide, ..y_req(flat) }).delta.y, 0.0);
+}
+
+#[test]
+fn parent_centered_stroke_attracts_at_the_outer_edge() {
+    let mut doc = Document::new(&NewDocument::default());
+    let pid = doc.add_parent("A", "A-Parent", 1, 12.0, Margins::uniform(36.0));
+    doc.apply_parent(&[0], Some(pid)).unwrap();
+    let layer = doc.default_layer();
+    let id = ItemId(doc.alloc());
+    let (ppi, ppg) = doc.parent_page_for(0).unwrap();
+    let parent_x = doc.parents[ppi].pages[ppg].x;
+    let mut item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(parent_x + 72.0, 140.0, parent_x + 252.0, 300.0)));
+    item.stroke = Stroke::default(); // 1 pt, center
+    doc.insert_item(SpreadRef::Parent(ppi), item, None).unwrap();
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    // Moving left edge at 253. Visible parent right edge is 252.5.
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Move,
+            rect: Rect::new(253.0, 140.0, 353.0, 240.0),
+            x_edges: [true, false, false],
+            y_edges: [false, false, false],
+            exclude: &[],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [None, None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(0.0, 0.0),
+        },
+    );
+    assert!((hit.delta.x - -0.5).abs() < 1e-6, "delta {}", hit.delta.x);
+}
+
+#[test]
+fn object_edge_snaps_when_guide_snap_is_off() {
+    let (doc, moving, _other) = doc_with_items(Rect::new(80.0, 100.0, 100.5, 140.0), Rect::new(90.0, 100.0, 100.0, 160.0), 104.0);
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Move,
+            rect: Rect::new(80.0, 100.0, 100.5, 140.0),
+            x_edges: [true, true, true],
+            y_edges: [false, false, false],
+            exclude: &[moving],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [None, None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(0.0, 0.0),
+        },
+    );
+    assert!((hit.delta.x - -0.5).abs() < 1e-6);
+    assert!(matches!(hit.guides.first(), Some(Overlay::Guide { .. })));
+}
+
+#[test]
+fn hidden_layer_guide_is_not_a_target() {
+    let (mut doc, moving, _) = doc_with_items(Rect::new(80.0, 100.0, 102.0, 140.0), Rect::new(300.0, 100.0, 340.0, 140.0), 104.0);
+    let layer = doc.default_layer();
+    doc.layers.iter_mut().find(|l| l.id == layer).unwrap().visible = false;
+    Arc::make_mut(&mut doc.spreads[0]).pages[0].guides[0].layer = Some(layer);
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let cx = ctx_on(&doc, &sel, &cache, &layout);
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Move,
+            rect: Rect::new(80.0, 100.0, 102.0, 140.0),
+            x_edges: [false, false, true],
+            y_edges: [false, false, false],
+            exclude: &[moving],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [None, None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(0.0, 0.0),
+        },
+    );
+    assert_eq!(hit.delta.x, 0.0);
+}
+
+#[test]
+fn alt_copy_snaps_to_the_original() {
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let id = ItemId(doc.alloc());
+    let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(100.0, 40.0, 160.0, 80.0)));
+    doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Move,
+            rect: Rect::new(162.0, 40.0, 222.0, 80.0),
+            x_edges: [true, false, false],
+            y_edges: [false, false, false],
+            exclude: &[id],
+            exclude_guides: &[],
+            copying: true,
+            lengths: [None, None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(0.0, 0.0),
+        },
+    );
+    assert!((hit.delta.x - -2.0).abs() < 1e-6);
+}
+
+#[test]
+fn alt_copy_does_not_stick_to_the_preview() {
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let make = |doc: &mut Document, rect: Rect| {
+        let id = ItemId(doc.alloc());
+        let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(rect));
+        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+        id
+    };
+    let original = make(&mut doc, Rect::new(100.0, 40.0, 160.0, 80.0));
+    let ghost = make(&mut doc, Rect::new(161.0, 40.0, 221.0, 80.0));
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::items(vec![ghost]);
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Move,
+            rect: Rect::new(161.0, 40.0, 221.0, 80.0),
+            x_edges: [true, false, false],
+            y_edges: [false, false, false],
+            exclude: &[original],
+            exclude_guides: &[],
+            copying: true,
+            lengths: [None, None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(0.0, 0.0),
+        },
+    );
+    assert!((hit.delta.x - -1.0).abs() < 1e-6, "delta.x = {}", hit.delta.x);
+}
+
+#[test]
+fn parent_page_guides_snap_on_the_document_page() {
+    // Facing document: page 1 is a right page at x = 0; its parent page is A's right page at
+    // x = 612 in the parent spread.
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let id = ItemId(doc.alloc());
+    let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(80.0, 100.0, 100.5, 140.0)));
+    doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    Arc::make_mut(&mut doc.parents[0]).pages[1].guides.push(Guide {
+        orientation: Orientation::Vertical,
+        position: 612.0 + 104.0,
+        spread: false,
+        locked: false,
+        layer: None,
+        liquid: false,
+    });
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.zone_px = 4.0;
+    let hit = snap(&cx, move_req(Rect::new(80.0, 100.0, 100.5, 140.0), &[id]));
+    assert!((hit.delta.x - 3.5).abs() < 1e-6, "snaps to the parent guide at x = 104: {:?}", hit.delta);
+}
+
+#[test]
+fn grid_beats_a_closer_guide() {
+    let mut doc = Document::new(&NewDocument::default());
+    doc.settings.grid.horizontal = 72.0;
+    doc.settings.grid.vertical = 72.0;
+    doc.settings.grid.subdivisions = 8; // 9 pt
+    let layer = doc.default_layer();
+    let id = ItemId(doc.alloc());
+    let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(10.0, 10.0, 40.0, 40.0)));
+    doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    // Guide 1 pt away at x = 11. Subdivision line at 9 is 1 pt the other way. Grid must win.
+    Arc::make_mut(&mut doc.spreads[0]).pages[0].guides.push(Guide {
+        orientation: Orientation::Vertical,
+        position: 11.0,
+        spread: true,
+        locked: false,
+        layer: None,
+        liquid: false,
+    });
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_document_grid = true;
+    let hit = snap(&cx, move_req(Rect::new(10.0, 10.0, 40.0, 40.0), &[id]));
+    assert!((hit.delta.x - -1.0).abs() < 1e-6);
+    assert!(hit.guides.is_empty());
+}
+
+#[test]
+fn hidden_baseline_still_snaps_and_zero_increment_does_not() {
+    let mut doc = Document::new(&NewDocument::default());
+    doc.settings.baseline_grid.start = 36.0;
+    doc.settings.baseline_grid.increment = 12.0;
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let cx = ctx_on(&doc, &sel, &cache, &layout);
+    // Top at 49 wants the line at 48 (start 36, increment 12). The margin at 36 is 13 pt away.
+    let hit = snap(&cx, y_req(Rect::new(100.0, 49.0, 140.0, 80.0)));
+    assert!((hit.delta.y - -1.0).abs() < 1e-6);
+    let mut dead = doc.clone();
+    dead.settings.baseline_grid.increment = 0.0;
+    let layout = CanvasLayout::new(&dead, false);
+    let cx = ctx_on(&dead, &sel, &cache, &layout);
+    let hit = snap(&cx, y_req(Rect::new(100.0, 49.0, 140.0, 80.0)));
+    assert_eq!(hit.delta.y, 0.0);
+}
+
+#[test]
+fn baseline_relative_to_the_top_margin_snaps_from_the_margin() {
+    let mut doc = Document::new(&NewDocument::default());
+    std::sync::Arc::make_mut(&mut doc.spreads[0]).pages[0].margins.top = 37.0;
+    doc.settings.baseline_grid.start = 0.0;
+    doc.settings.baseline_grid.increment = 10.0;
+    doc.settings.baseline_grid.relative_to = designcraft_doc::GridRelative::TopMargin;
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let cx = ctx_on(&doc, &sel, &cache, &layout);
+    // Lines at 37 + 10n: a top at 58 goes up to 57, not down to the page-relative 60.
+    let hit = snap(&cx, y_req(Rect::new(100.0, 58.0, 140.0, 80.0)));
+    assert!((hit.delta.y - -1.0).abs() < 1e-6, "{}", hit.delta.y);
+}
+
+#[test]
+fn nearer_of_margin_and_baseline_wins() {
+    // Bottom margin at 792 - 54 = 738, between baseline lines 732 and 744.
+    let doc = Document::new(&NewDocument {
+        margins: designcraft_doc::Margins { top: 54.0, bottom: 54.0, inside: 54.0, outside: 42.0 },
+        ..Default::default()
+    });
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    // At 50% the 4 px zone is 8 pt: both the margin and a baseline line are in reach.
+    let cx = ToolContext { zoom: 0.5, ..ctx_on(&doc, &sel, &cache, &layout) };
+    let bottom = |y1: f64| SnapRequest { y_edges: [false, false, true], gesture: Gesture::Resize, ..y_req(Rect::new(100.0, 600.0, 140.0, y1)) };
+    assert!((snap(&cx, bottom(739.5)).delta.y - -1.5).abs() < 1e-6, "the margin is nearer");
+    assert!((snap(&cx, bottom(742.5)).delta.y - 1.5).abs() < 1e-6, "the baseline line is nearer");
+    assert!((snap(&cx, bottom(741.0)).delta.y - -3.0).abs() < 1e-6, "a tie goes to the margin");
+}
+
+#[test]
+fn rotated_item_matches_its_own_side() {
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let id = ItemId(doc.alloc());
+    let mut item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 200.0, 40.0)));
+    item.xf = Affine::rotate((-30.0_f64).to_radians());
+    doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    cx.snap.snap_to_document_grid = false;
+    // Width 193.2 is the axis-aligned box. 200 is the side. Zone 4 reaches 200 from 197, not from 193.
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Resize,
+            rect: Rect::new(80.0, 200.0, 277.0, 280.0),
+            x_edges: [false, false, true],
+            y_edges: [false, false, false],
+            exclude: &[],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [Some(197.0), None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(277.0, 240.0),
+        },
+    );
+    assert!((hit.delta.x - 3.0).abs() < 1e-6);
+    assert!(matches!(hit.guides.last(), Some(Overlay::Measure { text, .. }) if text.contains("200")));
+}
+
+#[test]
+fn grouped_child_matches_spread_side() {
+    // Group scale 2 on X and 1 on Y. Child rotated -90 degrees (decompose reports +90).
+    // Spread-space sides are local width times 1 (100) and local height times 2 (80).
+    // 82 is 2 pt from 80 and far from 200, which is what per-node scales would offer.
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let child_id = ItemId(doc.alloc());
+    let mut child = Item::new(child_id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 100.0, 40.0)));
+    child.xf = Affine::rotate((-90.0_f64).to_radians());
+    let group_id = ItemId(doc.alloc());
+    let mut group = Item::new(group_id, layer, Shape::Group, designcraft_geom::PathData::default());
+    group.xf = Affine::scale_non_uniform(2.0, 1.0);
+    group.content = designcraft_doc::Content::Group { items: vec![std::sync::Arc::new(child)] };
+    doc.insert_item(SpreadRef::Doc(0), group, None).unwrap();
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    cx.snap.snap_to_document_grid = false;
+    cx.snap.align_edges = false;
+    cx.snap.align_centers = false;
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Resize,
+            rect: Rect::new(200.0, 200.0, 282.0, 240.0),
+            x_edges: [false, false, true],
+            y_edges: [false, false, false],
+            exclude: &[],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [Some(82.0), None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(282.0, 220.0),
+        },
+    );
+    assert!((hit.delta.x - -2.0).abs() < 1e-6, "delta.x = {}, want -2 toward local height times 2", hit.delta.x);
+}
+
+#[test]
+fn move_matches_a_stationary_gap() {
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    // Stationary gap of 20 between [0,40] and [60,90]. Moving box at [112,150], 22 away from 90.
+    for r in [Rect::new(0.0, 0.0, 40.0, 30.0), Rect::new(60.0, 0.0, 90.0, 30.0), Rect::new(112.0, 0.0, 150.0, 30.0)] {
+        let id = ItemId(doc.alloc());
+        let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(r));
+        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    }
+    let moving = doc.spreads[0].items[2].id;
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Move,
+            rect: Rect::new(112.0, 0.0, 150.0, 30.0),
+            x_edges: [true, true, true],
+            y_edges: [false, false, false],
+            exclude: &[moving],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [None, None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(0.0, 0.0),
+        },
+    );
+    assert!((hit.delta.x - -2.0).abs() < 1e-6);
+    assert!(hit.guides.iter().any(|g| matches!(g, Overlay::Gap { .. })));
+}
+
+fn doc_with_rects(rects: &[Rect]) -> Document {
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    for &r in rects {
+        let id = ItemId(doc.alloc());
+        let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(r));
+        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    }
+    doc
+}
+
+fn gap_overlays(guides: &[Overlay]) -> usize {
+    guides.iter().filter(|g| matches!(g, Overlay::Gap { .. })).count()
+}
+
+// #188: a box dragged between two others snaps to the middle and marks both gaps.
+#[test]
+fn move_centers_between_two_boxes_side_by_side() {
+    // Neighbours end at 40 and start at 160. The 30 wide mover at [83,113] is 2 left of centre.
+    let doc = doc_with_rects(&[Rect::new(0.0, 0.0, 40.0, 30.0), Rect::new(160.0, 0.0, 200.0, 30.0)]);
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    let hit = snap(&cx, move_req(Rect::new(83.0, 5.0, 113.0, 25.0), &[]));
+    assert!((hit.delta.x - 2.0).abs() < 1e-6, "{}", hit.delta.x);
+    assert_eq!(gap_overlays(&hit.guides), 2);
+}
+
+#[test]
+fn move_centers_between_two_boxes_stacked() {
+    let doc = doc_with_rects(&[Rect::new(0.0, 0.0, 30.0, 40.0), Rect::new(0.0, 160.0, 30.0, 200.0)]);
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    let hit = snap(&cx, y_req(Rect::new(5.0, 83.0, 25.0, 113.0)));
+    assert!((hit.delta.y - 2.0).abs() < 1e-6, "{}", hit.delta.y);
+    assert_eq!(gap_overlays(&hit.guides), 2);
+}
+
+fn with_baseline_grid(mut doc: Document) -> Document {
+    doc.settings.baseline_grid.start = 36.0;
+    doc.settings.baseline_grid.increment = 12.0;
+    doc
+}
+
+// #188: with Snap to Guides on, the hidden baseline grid took vertical moves first.
+#[test]
+fn vertical_centering_beats_a_closer_baseline() {
+    // Middle at 200. Mover centre 198 (+2). Its top and bottom are 3 from lines 180 and 216.
+    let doc = with_baseline_grid(doc_with_rects(&[Rect::new(100.0, 100.0, 130.0, 140.0), Rect::new(100.0, 260.0, 130.0, 300.0)]));
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let cx = ctx_on(&doc, &sel, &cache, &layout);
+    let hit = snap(&cx, y_req(Rect::new(105.0, 183.0, 125.0, 213.0)));
+    assert!((hit.delta.y - 2.0).abs() < 1e-6, "{}", hit.delta.y);
+    assert_eq!(gap_overlays(&hit.guides), 2);
+}
+
+#[test]
+fn vertical_alignment_beats_a_closer_baseline() {
+    // Top 107 is 1 from the line at 108 and 2 from the other box's top at 105.
+    let doc = with_baseline_grid(doc_with_rects(&[Rect::new(300.0, 105.0, 340.0, 135.0)]));
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let cx = ctx_on(&doc, &sel, &cache, &layout);
+    let hit = snap(&cx, y_req(Rect::new(100.0, 107.0, 140.0, 137.0)));
+    assert!((hit.delta.y - -2.0).abs() < 1e-6, "{}", hit.delta.y);
+    assert!(hit.guides.iter().any(|g| matches!(g, Overlay::Guide { .. })));
+}
+
+#[test]
+fn move_off_center_outside_the_zone_does_not_center() {
+    // 10 off centre, zone 4.
+    let doc = doc_with_rects(&[Rect::new(0.0, 0.0, 40.0, 30.0), Rect::new(160.0, 0.0, 200.0, 30.0)]);
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    let hit = snap(&cx, move_req(Rect::new(95.0, 5.0, 125.0, 25.0), &[]));
+    assert_eq!(hit.delta.x, 0.0);
+    assert_eq!(gap_overlays(&hit.guides), 0);
+}
+
+#[test]
+fn centering_needs_smart_spacing() {
+    let doc = doc_with_rects(&[Rect::new(0.0, 0.0, 40.0, 30.0), Rect::new(160.0, 0.0, 200.0, 30.0)]);
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    cx.snap.smart_spacing = false;
+    let hit = snap(&cx, move_req(Rect::new(83.0, 5.0, 113.0, 25.0), &[]));
+    assert_eq!(hit.delta.x, 0.0);
+}
+
+#[test]
+fn create_does_not_match_spacing() {
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    for r in [Rect::new(0.0, 0.0, 40.0, 30.0), Rect::new(60.0, 0.0, 90.0, 30.0)] {
+        let id = ItemId(doc.alloc());
+        let item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(r));
+        doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    }
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    cx.snap.smart_dimensions = false;
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Create,
+            rect: Rect::new(112.0, 0.0, 150.0, 30.0),
+            x_edges: [true, true, true],
+            y_edges: [false, false, false],
+            exclude: &[],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [Some(38.0), None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(0.0, 0.0),
+        },
+    );
+    assert!((hit.delta.x).abs() < 1e-6);
+}
+
+#[test]
+fn rotation_matches_another_items_angle() {
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let id = ItemId(doc.alloc());
+    let mut item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 80.0, 40.0)));
+    item.xf = Affine::rotate((-30.0_f64).to_radians());
+    doc.insert_item(SpreadRef::Doc(0), item, None).unwrap();
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Rotate,
+            rect: Rect::new(100.0, 100.0, 160.0, 140.0),
+            x_edges: [false, false, false],
+            y_edges: [false, false, false],
+            exclude: &[],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [None, None],
+            angle: Some(28.0),
+            radius: 80.0,
+            pointer: Point::new(180.0, 120.0),
+        },
+    );
+    let angle = hit.angle.expect("rotation hit");
+    assert!((angle - 30.0).abs() < 1e-6);
+    assert!(matches!(hit.guides.first(), Some(Overlay::Measure { .. })));
+}
+
+#[test]
+fn parent_item_angle_matches() {
+    // Document::new already has A-Parent. Apply a second parent and insert on the
+    // page parent_page_for shows, not Parent(0). A facing right page sits near x 612.
+    let mut doc = Document::new(&NewDocument::default());
+    let pid = doc.add_parent("B", "B-Parent", 1, 12.0, Margins::uniform(36.0));
+    doc.apply_parent(&[0], Some(pid)).unwrap();
+    std::sync::Arc::make_mut(&mut doc.spreads[0]).pages[0].show_parent_items = true;
+    let (ppi, ppg) = doc.parent_page_for(0).unwrap();
+    let parent_x = doc.parents[ppi].pages[ppg].x;
+    let rect = Rect::new(parent_x + 72.0, 140.0, parent_x + 152.0, 180.0);
+    let center = rect.center();
+    let layer = doc.default_layer();
+    let id = ItemId(doc.alloc());
+    let mut item = Item::new(id, layer, Shape::Rectangle, shapes::rectangle(rect));
+    item.xf = Affine::translate((center.x, center.y)) * Affine::rotate((-30.0_f64).to_radians()) * Affine::translate((-center.x, -center.y));
+    doc.insert_item(SpreadRef::Parent(ppi), item, None).unwrap();
+    assert!(doc.spreads[0].items.iter().all(|it| (designcraft_geom::decompose::decompose(it.xf).rotation - 30.0).abs() > 1.0));
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    let hit = snap(
+        &cx,
+        SnapRequest {
+            spread: SpreadRef::Doc(0),
+            gesture: Gesture::Rotate,
+            rect: Rect::new(100.0, 100.0, 160.0, 140.0),
+            x_edges: [false, false, false],
+            y_edges: [false, false, false],
+            exclude: &[],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [None, None],
+            angle: Some(28.0),
+            radius: 80.0,
+            pointer: Point::new(180.0, 120.0),
+        },
+    );
+    let angle = hit.angle.expect("parent rotation hit");
+    assert!((angle - 30.0).abs() < 1e-6);
+}
+
+#[test]
+fn rotated_group_uses_the_per_child_union() {
+    // Two children do not fill their local union. Rotating that union as one rectangle
+    // swings the empty corners out. The snap target is each child's visible box, transformed, then united.
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let mut child_a = Item::new(ItemId(doc.alloc()), layer, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)));
+    child_a.stroke = Stroke { weight: 2.0, ..Stroke::default() };
+    let child_b = Item::new(ItemId(doc.alloc()), layer, Shape::Rectangle, shapes::rectangle(Rect::new(40.0, 30.0, 50.0, 40.0)));
+    let mut group = Item::new(ItemId(doc.alloc()), layer, Shape::Group, designcraft_geom::PathData::default());
+    let xf = Affine::translate((300.0, 400.0)) * Affine::rotate((-45.0_f64).to_radians());
+    group.xf = xf;
+    group.content = designcraft_doc::Content::Group { items: vec![Arc::new(child_a), Arc::new(child_b)] };
+    doc.insert_item(SpreadRef::Doc(0), group, None).unwrap();
+    let a_vis = Rect::new(-1.0, -1.0, 11.0, 11.0);
+    let b_vis = Rect::new(40.0, 30.0, 50.0, 40.0);
+    let per_child = xf.transform_rect_bbox(a_vis).union(xf.transform_rect_bbox(b_vis));
+    let rotated_union = xf.transform_rect_bbox(a_vis.union(b_vis));
+    // At 45 degrees the empty corners move y, not x. The two boxes share x0.
+    assert!((per_child.y0 - rotated_union.y0).abs() > 1.0, "fixture does not separate the two boxes");
+    let gap = 2.0;
+    // A short rect just above the per-child top. Its other edges stay outside the zone of the rotated union.
+    let moving = Rect::new(per_child.x0, per_child.y0 - gap - 4.0, per_child.x0 + 20.0, per_child.y0 - gap);
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    cx.snap.snap_to_document_grid = false;
+    let hit = snap(&cx, y_req(moving));
+    assert!((hit.delta.y - gap).abs() < 1e-4, "delta.y {}, want {gap} onto {}", hit.delta.y, per_child.y0);
+    let wrong = rotated_union.y0 - moving.y1;
+    assert!((hit.delta.y - wrong).abs() > 1.0, "delta matched the rotated local union");
+}
+
+#[test]
+fn rotated_group_child_does_not_offer_local_zero() {
+    // The group is at 30 degrees. Its child stays at local 0, so the absolute angle is 30.
+    // 2 degrees is inside the zone of 0 and far from 30. Local 0 must not win.
+    let mut doc = Document::new(&NewDocument::default());
+    let layer = doc.default_layer();
+    let child = Item::new(ItemId(doc.alloc()), layer, Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 40.0, 20.0)));
+    let mut group = Item::new(ItemId(doc.alloc()), layer, Shape::Group, designcraft_geom::PathData::default());
+    group.xf = Affine::rotate((-30.0_f64).to_radians());
+    group.content = designcraft_doc::Content::Group { items: vec![Arc::new(child)] };
+    doc.insert_item(SpreadRef::Doc(0), group, None).unwrap();
+    let cache = Cache::new();
+    let layout = CanvasLayout::new(&doc, false);
+    let sel = Selection::default();
+    let mut cx = ctx_on(&doc, &sel, &cache, &layout);
+    cx.snap.snap_to_guides = false;
+    let ask = |angle: f64| {
+        snap(
+            &cx,
+            SnapRequest {
+                spread: SpreadRef::Doc(0),
+                gesture: Gesture::Rotate,
+                rect: Rect::new(100.0, 100.0, 160.0, 140.0),
+                x_edges: [false, false, false],
+                y_edges: [false, false, false],
+                exclude: &[],
+                exclude_guides: &[],
+                copying: false,
+                lengths: [None, None],
+                angle: Some(angle),
+                radius: 80.0,
+                pointer: Point::new(180.0, 120.0),
+            },
+        )
+    };
+    let near_zero = ask(2.0);
+    assert!(near_zero.angle.is_none(), "local 0 was a target: {:?}", near_zero.angle);
+    let near_group = ask(28.0);
+    let angle = near_group.angle.expect("absolute 30");
+    assert!((angle - 30.0).abs() < 1e-6, "angle {angle}");
+}
diff --git a/crates/tools/src/tests.rs b/crates/tools/src/tests.rs
index ee3b362f1..2a9bd0444 100644
--- a/crates/tools/src/tests.rs
+++ b/crates/tools/src/tests.rs
@@ -27,6 +27,7 @@ fn color_theme_tool_requests_a_palette_without_editing_the_image() {
     let mut d = Document::new(&NewDocument::default());
     let id = add_rect(&mut d, Rect::new(100.0, 100.0, 200.0, 200.0));
     d.item_mut(id).unwrap().content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
+        layer_options: None,
         asset: designcraft_doc::AssetId(1),
         size: (100.0, 100.0),
         xf: designcraft_geom::Affine::IDENTITY,
@@ -193,6 +194,32 @@ fn gradient_tool_drag_sets_the_vector() {
     assert_eq!(t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 220.0 + off.x, 153.0 + off.y)), vec![Action::Commit]);
 }
 
+#[test]
+fn gradient_tool_drag_follows_a_rotated_spread() {
+    let mut d = Document::new(&NewDocument::default());
+    let lid = d.default_layer();
+    d.add_text_frame(SpreadRef::Doc(0), Rect::new(100.0, 100.0, 300.0, 200.0), lid, "", ParaFormat::default()).unwrap();
+    Arc::make_mut(&mut d.spreads[0]).pages[0].view_rotation = 1;
+    let (s, c, l) = (Selection::default(), Cache::new(), CanvasLayout::new(&d, false));
+    let cx = ctx(&d, &s, &c, &l);
+    let start = l.to_canvas(SpreadRef::Doc(0), Point::new(150.0, 150.0));
+    let mut t = create("gradientSwatch");
+    t.pointer(&cx, &PointerEvent::new(PointerKind::Down, start.x, start.y));
+    for shift in [false, true] {
+        let ev = PointerEvent::new(PointerKind::Drag, start.x + 100.0, start.y).with_mods(Mods { shift, ..Default::default() });
+        match &t.pointer(&cx, &ev)[0] {
+            Action::Preview(_, p) => {
+                let to: Vec<f64> = p["to"].as_array().unwrap().iter().map(|v| v.as_f64().unwrap()).collect();
+                let want = l.delta_to_spread(SpreadRef::Doc(0), Vec2::new(100.0, 0.0));
+                assert!((to[0] - (150.0 + want.x)).abs() < 1e-6 && (to[1] - (150.0 + want.y)).abs() < 1e-6, "{to:?} want {want:?}");
+                assert!((to[0] - 150.0).abs() > 1e-6 || (to[1] - 150.0).abs() > 1e-6);
+                assert!((to[0] - 150.0).abs() < 1e-6, "{to:?}");
+            }
+            other => panic!("{other:?}"),
+        }
+    }
+}
+
 #[test]
 fn anchor_tools_emit_path_commands() {
     let mut d = Document::new(&NewDocument::default());
@@ -1108,6 +1135,7 @@ fn graphic_frame(doc: &mut Document) -> ItemId {
     let id = ItemId(doc.alloc());
     let mut item = Item::new(id, doc.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
     item.content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
+        layer_options: None,
         asset: designcraft_doc::AssetId(1),
         size: (200.0, 100.0),
         xf: designcraft_geom::Affine::translate((50.0, 100.0)),
@@ -1502,6 +1530,7 @@ fn eyedropper_samples_a_placed_image_and_matches_other_objects() {
     let photo = ItemId(d.alloc());
     let mut it = Item::new(photo, lid, Shape::Rectangle, shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)));
     it.content = designcraft_doc::Content::Graphic(designcraft_doc::Graphic {
+        layer_options: None,
         asset: designcraft_doc::AssetId(1),
         size: (100.0, 100.0),
         xf: designcraft_geom::Affine::translate((0.0, 0.0)),
@@ -1855,6 +1884,7 @@ fn eyedropper_ignores_inactive_states_of_a_multi_state_object() {
     let raster = {
         let mut it = Item::new(ItemId(d.alloc()), lid, Shape::Rectangle, shapes::rectangle(area));
         it.content = Content::Graphic(Graphic {
+            layer_options: None,
             asset: AssetId(1),
             size: (100.0, 100.0),
             xf: designcraft_geom::Affine::translate((0.0, 0.0)),
diff --git a/crates/tools/src/text.rs b/crates/tools/src/text.rs
index f0503e912..b879760f0 100644
--- a/crates/tools/src/text.rs
+++ b/crates/tools/src/text.rs
@@ -5,7 +5,8 @@
 //!
 //! IME: the marked text of a composition is a preview of `text.insert` at the caret (so it lays
 //! out in place like typed text), underlined, until the IME commits it (one `text.insert`, one
-//! undo step) or clears it (the preview goes, leaving no undo step).
+//! undo step) or clears it (the preview goes, leaving no undo step). A delete-surrounding batch
+//! is one `text.deleteSurrounding` instead; the engine runs it through the command pipeline.
 
 use std::ops::Range;
 
@@ -136,6 +137,13 @@ impl TypeTool {
     }
 }
 
+/// The text an IME commit types: `\r` becomes a paragraph break, and other control characters
+/// are dropped (Tab and the line break stay). The engine and the UI share this so a commit's
+/// exact accepted text is known without inspecting the document.
+pub fn ime_commit_text(text: &str) -> String {
+    text.chars().map(|c| if c == '\r' { '\n' } else { c }).filter(|c| !c.is_control() || matches!(c, '\n' | '\t')).collect()
+}
+
 /// Byte range in `s` of the characters `r` (IME ranges count characters; carets count bytes).
 /// `None` when `r` runs past the end of `s` or backwards.
 fn char_range_to_bytes(s: &str, r: Range<usize>) -> Option<Range<usize>> {
@@ -441,8 +449,9 @@ impl Tool for TypeTool {
         out
     }
 
+    /// Normalize commit text, cancel marked text, and emit one `text.insert` when text remains and a text selection is active.
     fn ime_commit(&mut self, cx: &ToolContext, text: &str) -> Vec<Action> {
-        let text: String = text.chars().map(|c| if c == '\r' { '\n' } else { c }).filter(|c| !c.is_control() || matches!(c, '\n' | '\t')).collect();
+        let text = ime_commit_text(text);
         // The marked text goes; the result is typed in its place like any typing: one command,
         // one undo step.
         let mut out = if self.preedit.take().is_some() { vec![Action::Cancel] } else { vec![] };
diff --git a/crates/ui-egui/Cargo.toml b/crates/ui-egui/Cargo.toml
index c9d85253f..ffe855f4a 100644
--- a/crates/ui-egui/Cargo.toml
+++ b/crates/ui-egui/Cargo.toml
@@ -10,7 +10,9 @@ description = "DesignCraft egui frontend (InDesign-style UI); swappable — noth
 workspace = true
 
 [dependencies]
-craft-ui = { workspace = true }
+craft-ui = { workspace = true, features = ["native-windows"] }
+craft-window = { workspace = true }
+craft-keymap = { workspace = true }
 designcraft-geom = { workspace = true }
 designcraft-color = { workspace = true }
 designcraft-doc = { workspace = true }
@@ -19,15 +21,21 @@ designcraft-compose = { workspace = true }
 designcraft-render = { workspace = true }
 designcraft-tools = { workspace = true }
 designcraft-engine = { workspace = true }
+craft-prepress = { workspace = true }
+# The UI draws monochrome icon glyphs from egui's bundled emoji faces (☰, ⚠, 📋); 0.37 moved
+# them behind this feature. They stay bundled copies of OSI/CC0 faces from `epaint_default_fonts`.
+egui = { workspace = true, features = ["monochrome_emoji_fonts"] }
+web-time = { workspace = true }
+# Unicode bidi classes are used only to bypass the label cache for ordinary LTR text.
 unicode-bidi = { workspace = true }
-unicode-bidi-mirroring = { workspace = true }
-unicode-segmentation = { workspace = true }
-egui = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 log = { workspace = true }
 
 [dev-dependencies]
+# egui 0.37 no longer enables `default_fonts` for library consumers; egui_kittest disables
+# egui's defaults, and package-scoped UI tests do not build the app binary.
+egui = { workspace = true, features = ["default_fonts", "monochrome_emoji_fonts"] }
 tempfile = { workspace = true }
 designcraft-idml = { workspace = true }
 zip = { workspace = true }
@@ -38,3 +46,9 @@ designcraft-fonts = { workspace = true, features = ["testing"] }
 [build-dependencies]
 serde_json = { workspace = true }
 toml = "1"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+craft-update = { workspace = true }
+# File and message dialogs that never block the frame; the browser build uses its own path.
+craft-dialogs = { workspace = true }
+raw-window-handle = { workspace = true }
diff --git a/crates/ui-egui/examples/ui_shot.rs b/crates/ui-egui/examples/ui_shot.rs
index 45acf8c38..73de469cc 100644
--- a/crates/ui-egui/examples/ui_shot.rs
+++ b/crates/ui-egui/examples/ui_shot.rs
@@ -93,7 +93,8 @@ fn main() {
 /// windowed app's raw-input hook does.
 fn step(harness: &mut egui_kittest::Harness<'_, DesignApp>) {
     let mut raw = std::mem::take(harness.input_mut());
-    harness.state_mut().raw_input_hook(&mut raw);
+    let ctx = harness.ctx.clone();
+    harness.state_mut().raw_input_hook(&ctx, &mut raw);
     *harness.input_mut() = raw;
     harness.step();
 }
diff --git a/crates/ui-egui/src/about.rs b/crates/ui-egui/src/about.rs
index 75442b93c..30e48274b 100644
--- a/crates/ui-egui/src/about.rs
+++ b/crates/ui-egui/src/about.rs
@@ -36,7 +36,7 @@ pub fn paint_mark(ui: &egui::Ui, rect: Rect, color: Color32) {
     let ctx = ui.ctx();
     let ppp = ctx.pixels_per_point();
     let px = ((rect.width().min(rect.height()) * ppp).round() as u32).clamp(8, 1024);
-    let key = egui::Id::new(("artcraft_mark", px, color.to_array()));
+    let key = egui::Id::unique(("artcraft_mark", px, color.to_array()));
     let tex: Option<egui::TextureHandle> = ctx.data(|d| d.get_temp(key));
     let tex = tex.unwrap_or_else(|| {
         let mut rc = vello_cpu::RenderContext::new_with(px as u16, px as u16, vello_cpu::RenderSettings { num_threads: 0, ..Default::default() });
@@ -114,7 +114,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
     }
     let t = Tokens::get(ctx);
     let mut open: Option<&'static str> = None;
-    let area = egui::Id::new("about");
+    let area = egui::Id::unique("about");
     let instance = area.with("placement");
     let resp = crate::modal_drag::modal(ctx, area, instance).show(ctx, |ui| {
         ui.set_width(if app.ui.about_tab == 0 { 460.0 } else { 640.0 });
diff --git a/crates/ui-egui/src/app.rs b/crates/ui-egui/src/app.rs
new file mode 100644
index 000000000..383362594
--- /dev/null
+++ b/crates/ui-egui/src/app.rs
@@ -0,0 +1,328 @@
+#[cfg(not(target_arch = "wasm32"))]
+use super::PendingDrop;
+use super::clock::now_ms;
+use super::services::Services;
+use super::state::{CanvasCache, ImportRequest, ImportedFile, Perf, ScreenMode, UiState, View, second_window_viewport};
+use super::{
+    ControlRequest, ControlResponse, DesignApp, HashMap, InputGeneration, LivePreview, QuitState, Receiver, SCREENSHOT_MAX_AGGREGATE_BYTES,
+    SCREENSHOT_MAX_IMAGE_BYTES, SCREENSHOT_MAX_REQUESTS, ScreenshotGeometry, Sender, Session, ShotRequest, UiRequest, Value, ViewInfo, about, canvas,
+    chrome, cursors, dialogs, dock, json, menus, new_document, page_history, panel_docking, shortcut_import, story_editor, theme, toolbar,
+    updates_ui,
+};
+
+mod clipboard;
+mod commands;
+mod control;
+pub(crate) mod file_dialogs;
+mod files;
+mod frame;
+mod ime;
+mod input;
+mod keys;
+mod quit;
+mod screenshot;
+mod view;
+
+#[cfg(test)]
+pub(crate) use files::browser_import_tests;
+pub use files::opens_as_document;
+
+impl DesignApp {
+    /// Start the background font scan, establish the monotonic timing origin, and initialize document, view, input, screenshot, dialog and control state.
+    pub fn new(session: Session, services: Services) -> Self {
+        // The font menus and the first file opened need the installed fonts: catalog them now.
+        designcraft_fonts::FontDb::global().scan_in_background();
+        // The app owns the monotonic origin for recovery timing and frame pacing; `now_ms` itself
+        // is process-global so screenshot deadlines stay comparable across hosts.
+        let now = now_ms() / 1000.0;
+        #[cfg(not(target_arch = "wasm32"))]
+        let dialog_wake = std::sync::Arc::new(std::sync::OnceLock::new());
+        DesignApp {
+            pending_pdf: None,
+            #[cfg(not(target_arch = "wasm32"))]
+            file_dialogs: file_dialogs::new_dialogs(dialog_wake.clone()),
+            #[cfg(not(target_arch = "wasm32"))]
+            asked: Vec::new(),
+            #[cfg(not(target_arch = "wasm32"))]
+            held_answers: Vec::new(),
+            #[cfg(not(target_arch = "wasm32"))]
+            dialog_wake,
+            session,
+            ui: UiState::default(),
+            services,
+            views: HashMap::new(),
+            page_history: HashMap::new(),
+            canvas: CanvasCache::new(),
+            canvas_rect: None,
+            split: false,
+            second_window: false,
+            pane: 0,
+            focus_pane: 0,
+            other_pane: None,
+            power_zoom: None,
+            color_applied: false,
+            perf: Perf::default(),
+            synthetic: vec![],
+            control_synthetic: vec![],
+            native_actions: Default::default(),
+            native_events_pending: Default::default(),
+            control_input_frame: Default::default(),
+            clipboard_guard_installed: false,
+            story_editor: None,
+            control_rx: None,
+            pending_shots: vec![],
+            queued_shots: vec![],
+            shot_token: 0,
+            screenshot_geometry: None,
+            screenshot_epoch: 0,
+            synthetic_injected: false,
+            injected_events: Vec::new(),
+            injected_private: false,
+            injected_generation: InputGeneration::default(),
+            injected_pending: Default::default(),
+            injected_settled: Default::default(),
+            injected_settle_hook: false,
+            #[cfg(not(target_arch = "wasm32"))]
+            pending_drops: Vec::new(),
+            #[cfg(test)]
+            logic_tick_ticks: 0,
+            #[cfg(test)]
+            logic_frame_ticks: 0,
+            #[cfg(test)]
+            input_ticks: 0,
+            styled: false,
+            fonts_lang: String::new(),
+            fonts_system: false,
+            restyle: false,
+            fonts_ready: false,
+            os_documents: Vec::new(),
+            integrated_titlebar: false,
+            custom_titlebar: false,
+            window_maximized: false,
+            pending_window_commands: vec![],
+            native_menu: false,
+            native_shortcuts: Default::default(),
+            keymap: crate::keys::new_keymap(craft_keymap::Overrides::new()),
+            key_dispatcher: craft_keymap::egui::Dispatcher::new(),
+            shortcut_dialog: None,
+            shortcut_answers: Default::default(),
+            last_time: now,
+            last_recovery: now,
+            egui_ctx: None,
+            in_control: false,
+            object_clip_text: None,
+            ime_marked: None,
+            ime_discard: false,
+            canvas_ime: false,
+            ime_tracker: egui::ime_context::ImeContextTracker::new(),
+            pending_ime_delete: None,
+            ime_target: None,
+            ime_interrupt: false,
+            ime_canvas: None,
+            quit_requested: false,
+            close_requested_pending: false,
+            quit_without_asking: false,
+            quitting: None,
+            cursors: cursors::Images::default(),
+            live_preview: LivePreview::default(),
+            updates_rt: updates_ui::Runtime::default(),
+        }
+    }
+
+    pub fn status(&mut self, s: impl Into<String>) {
+        self.ui.status = s.into();
+    }
+
+    /// "<feature>: <error>" in the status bar: the feature name is translated, the engine's own
+    /// error text stays as the engine wrote it.
+    pub fn status_error(&mut self, feature: &str, error: impl std::fmt::Display) {
+        self.ui.status = format!("{}: {error}", crate::i18n::tr(&self.ui.language, feature));
+    }
+
+    /// First frame only: load the saved colour profiles and make the saved Color Settings active.
+    fn apply_saved_color_settings(&mut self) {
+        if self.color_applied {
+            return;
+        }
+        self.color_applied = true;
+        for path in self.ui.color_profiles.clone() {
+            if let Err(e) = self.session.execute("color.loadProfile", &json!({"path": path})) {
+                log::warn!("Color Settings: {e}");
+                self.status_error("Color Settings", e);
+            }
+        }
+        if let Some(cs) = self.ui.color_settings.clone() {
+            let known = cs.with_known_profiles();
+            for (saved, used) in [(&cs.rgb, &known.rgb), (&cs.cmyk, &known.cmyk)] {
+                if saved != used {
+                    let e = format!("saved profile {saved} is not available; using {used}");
+                    log::warn!("Color Settings: {e}");
+                    self.status_error("Color Settings", e);
+                }
+            }
+            let _ = designcraft_color::cms::set_active(&known);
+        }
+    }
+
+    /// Queue and deadline work, run once per app callback.
+    ///
+    /// `logic_tick` runs on every call (a first pass, a later discarded pass, or a hidden
+    /// `run_logic` tick) and consumes queues and deadlines once. Work that is genuinely once per
+    /// presented layout frame lives in [`Self::ui_setup`] / [`Self::ui_frame_end`], which only a
+    /// real `run_ui` pass calls. A hidden `run_logic` tick also reports pass index zero, so the
+    /// pass index alone cannot identify a UI pass.
+    pub fn logic(&mut self, ctx: &egui::Context) {
+        #[cfg(test)]
+        {
+            self.logic_tick_ticks += 1;
+        }
+        self.logic_tick(ctx);
+    }
+
+    /// Lay out the whole window.
+    pub fn ui(&mut self, ui: &mut egui::Ui) {
+        #[cfg(test)]
+        {
+            self.input_ticks += 1;
+        }
+        let ctx = ui.ctx().clone();
+        self.canvas_ime = false;
+        self.ime_canvas = None;
+        self.ime_interrupt = false;
+        // Fonts/theme must be installed from the real UI pass, before the font gate below: doing
+        // this only from a hidden logic tick would make the first shown pass wait forever.
+        if ctx.current_pass_index() == 0 {
+            self.ui_setup(&ctx);
+        }
+        if !self.fonts_ready {
+            // The first pass installs fonts and returns before any widget sees this frame's input.
+            // Put an injected step back rather than acknowledge it as consumed.
+            self.requeue_injected_batch();
+            ctx.request_repaint();
+            return;
+        }
+        self.settle_live_preview();
+        // Input consumers run once, in the live first UI pass, before layout. Hidden logic ticks
+        // must not replay shortcuts or dropped files from stale input.
+        if ctx.current_pass_index() == 0 {
+            #[cfg(not(target_arch = "wasm32"))]
+            {
+                // Sample the generation once for the whole batch: placing the first valid file
+                // must not suppress later files that belong to the same captured batch.
+                let current = self.input_generation();
+                for drop in std::mem::take(&mut self.pending_drops) {
+                    if drop.generation != current {
+                        continue;
+                    }
+                    let _ = self.open_dropped_at(&drop.path, drop.pointer);
+                }
+            }
+            menus::shortcuts(self, &ctx);
+        }
+        let t0 = now_ms();
+        let t = theme::Tokens::get(&ctx);
+        let presenting = self.ui.screen_mode == ScreenMode::Presentation;
+        if presenting || self.ui.hidden_panels != 0 {
+            panel_docking::cancel_gesture(&ctx);
+        }
+        canvas::begin_frame(&ctx);
+        let dbg = std::env::var_os("DESIGNCRAFT_DEBUG_LAYOUT").is_some();
+        if dbg {
+            eprintln!("root start {:?}", ui.available_rect_before_wrap());
+        }
+        if !presenting {
+            chrome::app_bar(self, ui);
+            if dbg {
+                eprintln!("after app bar {:?}", ui.available_rect_before_wrap());
+            }
+            if self.ui.control_bar && self.session.active().is_some() && self.ui.hidden_panels == 0 {
+                chrome::control_bar(self, ui);
+            }
+            chrome::status_bar(self, ui);
+            if dbg {
+                eprintln!("after status {:?}", ui.available_rect_before_wrap());
+            }
+            if self.ui.hidden_panels != 1 {
+                toolbar::show(self, ui);
+            }
+        }
+        egui::CentralPanel::default().frame(egui::Frame::NONE.fill(t.pasteboard)).show(ui, |ui| {
+            // The panel layout holds the canvas as its protected `canvas` panel.
+            if presenting || self.ui.hidden_panels != 0 {
+                self.canvas_area(ui, presenting);
+            } else {
+                panel_docking::show(self, ui);
+            }
+        });
+        // New Window: pane 1 in a window of its own.
+        if self.second_window
+            && !presenting
+            && let Some(title) = self.session.active().map(|d| format!("{} — 2", d.doc.title))
+        {
+            let fill = t.pasteboard;
+            let ctx = ui.ctx().clone();
+            ctx.show_viewport_immediate(
+                second_window_viewport(),
+                egui::ViewportBuilder::default().with_title(title).with_inner_size([960.0, 720.0]),
+                |ui, _class| {
+                    egui::CentralPanel::default().frame(egui::Frame::NONE.fill(fill)).show(ui, |ui| {
+                        self.switch_pane(1);
+                        if self.view().is_none() {
+                            self.switch_pane(0);
+                            let v = self.view().copied();
+                            self.switch_pane(1);
+                            if let (Some(mut v), Some(m)) = (v, self.view_mut()) {
+                                v.fitted = false;
+                                *m = v;
+                            }
+                        }
+                        if ui.input(|i| i.pointer.any_pressed()) {
+                            self.focus_pane = 1;
+                        }
+                        canvas::show(self, ui);
+                    });
+                    if ui.input(|i| i.viewport().close_requested()) {
+                        self.end_second_ime_viewport();
+                        self.second_window = false;
+                        self.focus_pane = 0;
+                    }
+                },
+            );
+            self.switch_pane(self.focus_pane);
+        } else if self.second_window {
+            // The child viewport does not run this pass (Presentation, or no document for its
+            // title): its pass counter stops advancing, so treat it as gone and let the tracker
+            // start a fresh context when the window is shown again.
+            self.end_second_ime_viewport();
+        }
+        // Tab, Shift+Tab and Presentation hide the floating panels with the docked ones.
+        if !presenting && self.ui.hidden_panels == 0 {
+            dock::float_only_windows(self, &ctx);
+        }
+        story_editor::show(self, &ctx);
+        dialogs::show(self, &ctx);
+        about::show(self, &ctx);
+        updates_ui::show(self, &ctx);
+        menus::palette(self, &ctx);
+        // The IME is observed once, here: after the canvas, the floating panels, the story editor,
+        // dialogs and Quick Apply have all applied this pass's commands and focus changes.
+        canvas::ime_observe(self, &ctx);
+        if self.custom_titlebar {
+            chrome::resize_borders(self, ui);
+        }
+        for url in std::mem::take(&mut self.ui.pending_urls) {
+            ctx.open_url(egui::OpenUrl::new_tab(url));
+        }
+        if !ctx.will_discard() {
+            // A settled UI pass has taken the injected step (a discarded pass has not). Keep
+            // `injected_private` until the next raw-input hook, so this pass's end-pass clipboard
+            // guard still sees the control provenance.
+            self.synthetic_injected = false;
+            self.injected_events.clear();
+            self.injected_pending.store(false, std::sync::atomic::Ordering::Relaxed);
+            self.injected_settled.store(false, std::sync::atomic::Ordering::Relaxed);
+            self.ui_frame_end(&ctx);
+        }
+        self.perf.frame_ms = now_ms() - t0;
+    }
+}
diff --git a/crates/ui-egui/src/app/clipboard.rs b/crates/ui-egui/src/app/clipboard.rs
new file mode 100644
index 000000000..4b813dd5c
--- /dev/null
+++ b/crates/ui-egui/src/app/clipboard.rs
@@ -0,0 +1,56 @@
+use super::{DesignApp, Value, canvas, json};
+
+impl DesignApp {
+    /// Paste without the clipboard's text (a menu, not the paste keys): read it here. With no
+    /// insertion point, text that doesn't stand for copied objects becomes a new text frame
+    /// centred in the view.
+    pub(super) fn with_system_clipboard(&mut self, id: &str, mut params: Value) -> Value {
+        let typing = self.session.active().is_some_and(|d| d.selection.text.is_some());
+        if !matches!(id, "edit.paste" | "edit.pasteWithoutFormatting") || !(typing || id == "edit.paste") {
+            return params;
+        }
+        if params.get("text").is_none()
+            && let Some(text) = self.services.clipboard_text.as_mut().and_then(|f| f())
+            && let Some(o) = params.as_object_mut()
+        {
+            o.insert("text".into(), Value::String(text));
+        }
+        // Still what an object copy put there: paste those objects, not the placeholder text.
+        let norm = |t: &str| t.replace("\r\n", "\n");
+        if let Some(copied) = &self.object_clip_text
+            && params.get("text").and_then(Value::as_str).is_some_and(|t| norm(t) == norm(copied))
+            && let Some(o) = params.as_object_mut()
+        {
+            o.remove("text");
+        }
+        if !typing
+            && params.get("text").and_then(Value::as_str).is_some_and(|t| !t.is_empty())
+            && let Some((spread, at)) = canvas::view_centre(self)
+            && let Ok(spread) = serde_json::to_value(spread)
+            && let Some(o) = params.as_object_mut()
+        {
+            o.entry("spread").or_insert(spread);
+            o.entry("at").or_insert(json!([at.x, at.y]));
+        }
+        params
+    }
+
+    /// Keep widget clipboard output private while a queued control event is running.
+    pub(crate) fn install_clipboard_guard(&mut self, ctx: &egui::Context) {
+        if self.clipboard_guard_installed {
+            return;
+        }
+        let private = self.control_input_frame.clone();
+        ctx.on_end_pass(
+            "control clipboard",
+            std::sync::Arc::new(move |ui| {
+                if private.load(std::sync::atomic::Ordering::Relaxed) {
+                    ui.ctx().output_mut(|o| {
+                        o.commands.retain(|cmd| !matches!(cmd, egui::OutputCommand::CopyText(_) | egui::OutputCommand::CopyImage(_)))
+                    });
+                }
+            }),
+        );
+        self.clipboard_guard_installed = true;
+    }
+}
diff --git a/crates/ui-egui/src/app/commands.rs b/crates/ui-egui/src/app/commands.rs
new file mode 100644
index 000000000..44e35ef15
--- /dev/null
+++ b/crates/ui-egui/src/app/commands.rs
@@ -0,0 +1,109 @@
+use super::{DesignApp, UiRequest, Value, canvas, dialogs, json, menus};
+
+impl DesignApp {
+    /// THE entry point for every action (menus, shortcuts, palette, panels, control channel).
+    pub fn run(&mut self, id: &str, params: Value) -> Result<Value, String> {
+        if let Some(r) = menus::run_ui(self, id, &params) {
+            return r;
+        }
+        // Only user-initiated runs touch the system clipboard, never the control channel's.
+        let system_clipboard = !self.in_control && !self.control_input_frame.load(std::sync::atomic::Ordering::Relaxed);
+        let mut params = if system_clipboard { self.with_system_clipboard(id, params) } else { params };
+        // Vector art copied in another app (Illustrator, VectorCraft, Figma) is SVG markup on the
+        // system clipboard: with no insertion point it pastes as editable paths where text would go.
+        let typing = self.session.active().is_some_and(|d| d.selection.text.is_some());
+        let id = match params.as_object_mut() {
+            Some(o) if id == "edit.paste" && !typing && o.get("text").and_then(Value::as_str).is_some_and(designcraft_engine::cmd::is_svg_markup) => {
+                if let Some(svg) = o.remove("text") {
+                    o.insert("svg".into(), svg);
+                }
+                "edit.pasteSvg"
+            }
+            _ => id,
+        };
+        // Copied objects paste on the spread in view.
+        if matches!(id, "edit.paste" | "edit.pasteInPlace" | "edit.pasteSvg")
+            && let Some(spread) = canvas::current_spread(self)
+            && let Some(p) = params.as_object_mut()
+        {
+            p.entry("spread").or_insert(json!(spread));
+        }
+        let r = self.session.execute(id, &params).map_err(|e| e.to_string());
+        self.after_engine();
+        match &r {
+            Err(e) => self.status(e.clone()),
+            // Copied text goes to the system clipboard too, whichever way Copy was chosen.
+            Ok(v) if system_clipboard && matches!(id, "edit.copy" | "edit.cut") => {
+                let text = match v.get("text").and_then(Value::as_str) {
+                    Some(t) => {
+                        self.object_clip_text = None;
+                        Some(t.to_string())
+                    }
+                    None if !self.native_menu => {
+                        self.object_clip_text = Some(designcraft_engine::cmd::copied_objects_text(&self.session));
+                        self.object_clip_text.clone()
+                    }
+                    None => {
+                        self.object_clip_text = self.services.clipboard_text.as_mut().and_then(|f| f());
+                        None
+                    }
+                };
+                if let (Some(t), Some(ctx)) = (text, &self.egui_ctx) {
+                    ctx.copy_text(t);
+                    ctx.request_repaint();
+                }
+            }
+            Ok(_) => {}
+        }
+        if r.is_ok() && matches!(id, "file.open" | "file.openIdml" | "file.openBytes") {
+            if self.ui.dialog.as_ref().is_some_and(|d| d.id == "findFont") {
+                self.ui.dialog = None;
+            }
+            match self.session.execute("font.list", &json!({})) {
+                Ok(fonts) if fonts.as_array().is_some_and(|fonts| fonts.iter().any(|f| f["missing"] == true || f["styleMissing"] == true)) => {
+                    self.ui.dialog = Some(dialogs::Dialog::new("findFont", json!({"_fonts": fonts, "onOpen": true})));
+                }
+                Err(e) => self.status(e.to_string()),
+                _ => {}
+            }
+        }
+        if r.is_ok()
+            && matches!(id, "font.replace" | "font.reload" | "edit.undo" | "edit.redo")
+            && let Some(dialog) = self.ui.dialog.as_mut().filter(|d| d.id == "findFont")
+        {
+            dialog.fields.remove("_fonts");
+        }
+        r
+    }
+
+    /// Handle requests produced by tools/commands (dialogs, view changes, file pickers).
+    pub fn after_engine(&mut self) {
+        let reqs = std::mem::take(&mut self.session.ui_requests);
+        for r in reqs {
+            let was_find = self.ui.dialog.as_ref().is_some_and(|d| d.id == "findChange");
+            match r {
+                UiRequest::Dialog { id, params } if id == "colorTheme" => dialogs::open_color_theme(self, params),
+                UiRequest::Dialog { id, params } => self.ui.dialog = Some(dialogs::Dialog::new(&id, params)),
+                UiRequest::View { params } => canvas::apply_view_request(self, &params),
+                UiRequest::Pick { purpose, params } => {
+                    let _ = params;
+                    let _ = self.pick_and_open(&purpose);
+                }
+            }
+            // Release only when the request actually replaces Find, including a native PDF picker.
+            if was_find && self.ui.dialog.as_ref().is_none_or(|d| d.id != "findChange") {
+                self.session.reset_find_scope();
+            }
+        }
+        // New documents get a fitted view.
+        if let Some(st) = self.session.active() {
+            let uid = st.uid;
+            self.views.entry(uid).or_default();
+        }
+    }
+
+    pub fn select_tool(&mut self, id: &str) {
+        let _ = self.run("tool.select", json!({"tool": id}));
+        self.ui.flyout = None;
+    }
+}
diff --git a/crates/ui-egui/src/app/control.rs b/crates/ui-egui/src/app/control.rs
new file mode 100644
index 000000000..3c29ca9af
--- /dev/null
+++ b/crates/ui-egui/src/app/control.rs
@@ -0,0 +1,34 @@
+use super::{ControlRequest, DesignApp, Receiver};
+
+impl DesignApp {
+    pub fn with_control(mut self, rx: Receiver<ControlRequest>) -> Self {
+        self.control_rx = Some(rx);
+        self
+    }
+
+    /// Defer control commands while host-order input is pending; otherwise handle replies and screenshot admission.
+    pub(super) fn drain_control(&mut self, ctx: &egui::Context) {
+        // An injected batch may still be waiting in the host's pending raw input. Running another
+        // control command now could switch documents or dialogs under it, so keep the channel
+        // queued until a settled UI pass has taken the batch.
+        if self.host_order_pending() {
+            return;
+        }
+        let Some(rx) = self.control_rx.take() else { return };
+        while !self.host_order_pending() {
+            let Ok(req) = rx.try_recv() else { break };
+            let reply = req.reply.clone();
+            match crate::control::handle(self, ctx, &req) {
+                crate::control::Outcome::Done(v) => {
+                    let _ = reply.send(v);
+                }
+                crate::control::Outcome::Screenshot { path } => {
+                    if let Err(e) = self.admit_screenshot(path, reply.clone()) {
+                        let _ = reply.send(e);
+                    }
+                }
+            }
+        }
+        self.control_rx = Some(rx);
+    }
+}
diff --git a/crates/ui-egui/src/app/file_dialogs.rs b/crates/ui-egui/src/app/file_dialogs.rs
new file mode 100644
index 000000000..0d3a2b4da
--- /dev/null
+++ b/crates/ui-egui/src/app/file_dialogs.rs
@@ -0,0 +1,605 @@
+//! File and message dialogs that never block the frame (craft-dialogs).
+//!
+//! A blocking dialog runs the platform's modal loop inside the frame. On macOS an event that
+//! arrives meanwhile (a file dragged from Finder and held over the window) re-enters winit's
+//! handler and aborts the app. So a command that needs a path asks for it with
+//! [`DesignApp::ask_open`] or [`DesignApp::ask_save`] and returns; the host shows the dialog at the
+//! end of the frame ([`DesignApp::show_file_dialogs`]), and the continuation runs with the chosen
+//! path on a later frame. A command given a path (control channel, scripts, tests) never asks.
+//!
+//! The browser build has no native dialogs: Open goes through `Services::open_async` and the
+//! inbox, and Save hands the suggested name to `Services::download`.
+
+use super::{DesignApp, Value, json};
+
+/// What runs with the chosen path, on the frame the answer arrives.
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) type Then = Box<dyn FnOnce(&mut DesignApp, String) -> Result<Value, String>>;
+
+/// Whether an answer still needs the document that was active when the dialog was asked for.
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub(crate) enum Bound {
+    /// The continuation edits or reads the active document: it runs in that document, and not
+    /// at all once it has closed.
+    Document,
+    /// The continuation doesn't depend on a document (opening one, a library, a book).
+    App,
+}
+
+/// Which dialog was asked for, by whom and for which document. Asking again with all three the
+/// same (File › Open chosen twice) brings the open panel to the front instead of queueing a
+/// second one; anything else queues.
+#[cfg(not(target_arch = "wasm32"))]
+#[derive(Clone, PartialEq)]
+pub(crate) struct AskKey {
+    request: craft_dialogs::Request,
+    /// The document active when the dialog was asked for, when the answer depends on it.
+    doc: Option<u64>,
+    /// The code that asked (`#[track_caller]` through the asking helpers): Place, Place with
+    /// Options and Choose Image share one dialog but not what they do with its answer.
+    origin: &'static std::panic::Location<'static>,
+}
+
+/// A dialog's continuation: what it was asked for and what its answer does.
+#[cfg(not(target_arch = "wasm32"))]
+pub struct Asked {
+    key: AskKey,
+    /// The egui dialog open when it was asked for (Color Settings, Find): its answer may update or
+    /// replace that one, but waits while any other is open.
+    dialog: Option<String>,
+    step: Step,
+}
+
+/// An answer waiting for the egui dialog opened since it was asked for to close, so it doesn't
+/// replace it (an unsaved-changes question, Preferences with unsaved edits).
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) struct Held {
+    doc: Option<u64>,
+    dialog: Option<String>,
+    then: Then,
+    path: String,
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+enum Step {
+    /// Open: run `then` with the file chosen.
+    Open(Then),
+    /// Save: `ext` is added to a name typed without it, then `then` runs, after the replace-file
+    /// question when the added extension names a file that exists.
+    Save { ext: Option<String>, then: Then },
+    /// The replace-file question about `path`: Yes runs `then` with it.
+    Replace { path: String, then: Then },
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub type Dialogs = craft_dialogs::Dialogs<Asked>;
+
+/// A dialog that can't show (no window, no platform dialog) and the reason.
+#[cfg(not(target_arch = "wasm32"))]
+const DIALOG_UNAVAILABLE: &str = "The file dialog couldn't be shown";
+
+/// The browser build has no dialog for this purpose.
+#[cfg(target_arch = "wasm32")]
+const NO_PICKER: &str = "needs a file picker";
+
+/// The dialogs, with a wake-up that repaints once the first frame has given it the context.
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) fn new_dialogs(ctx: std::sync::Arc<std::sync::OnceLock<egui::Context>>) -> Dialogs {
+    craft_dialogs::Dialogs::new(std::sync::Arc::new(move || {
+        if let Some(ctx) = ctx.get() {
+            ctx.request_repaint();
+        }
+    }))
+}
+
+impl DesignApp {
+    /// Ask for a file to open for `purpose` (`open`, `place`, `relink`…: it sets the file types).
+    /// `then` runs with its path on a later frame; Cancel runs nothing.
+    #[track_caller]
+    pub(crate) fn ask_open(
+        &mut self,
+        purpose: &str,
+        bound: Bound,
+        then: impl FnOnce(&mut DesignApp, String) -> Result<Value, String> + 'static,
+    ) -> Result<Value, String> {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let mut dialog = craft_dialogs::FileDialog::open();
+            for filter in open_filters(purpose) {
+                dialog = dialog.filter(filter.name, filter.extensions);
+            }
+            self.ask_file(dialog, bound, Step::Open(Box::new(then)));
+            Ok(Value::Null)
+        }
+        #[cfg(target_arch = "wasm32")]
+        {
+            let _ = (purpose, bound, then);
+            Err(NO_PICKER.into())
+        }
+    }
+
+    /// Ask where to save `name`: beside the active document once it has been saved, else in the
+    /// folder of the last file saved or exported (#1653). `then` runs with the path on a later
+    /// frame; Cancel runs nothing. In a browser the name is the download's and `then` runs now.
+    #[track_caller]
+    pub(crate) fn ask_save(
+        &mut self,
+        name: &str,
+        bound: Bound,
+        then: impl FnOnce(&mut DesignApp, String) -> Result<Value, String> + 'static,
+    ) -> Result<Value, String> {
+        if self.services.download.is_some() {
+            return then(self, name.to_string());
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let suggested = self.suggested_save_path(name);
+            let (folder, name) = save_dialog_start(&suggested);
+            let ext = suggested_extension(&name).map(str::to_string);
+            let mut dialog = craft_dialogs::FileDialog::save().file_name(name.as_str());
+            if let Some(folder) = folder {
+                dialog = dialog.directory(folder);
+            }
+            if let Some(ext) = &ext {
+                dialog = dialog.filter(ext.to_ascii_uppercase(), &[ext.as_str()]);
+            }
+            self.ask_file(dialog, bound, Step::Save { ext, then: Box::new(then) });
+            Ok(Value::Null)
+        }
+        #[cfg(target_arch = "wasm32")]
+        {
+            let _ = (bound, then);
+            Err(NO_PICKER.into())
+        }
+    }
+
+    /// `name` after the folder a save dialog starts in. Only the last part of a name goes after
+    /// the folder: a title may hold a slash, and an empty name would make the folder itself the
+    /// suggested file.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) fn suggested_save_path(&self, name: &str) -> String {
+        use std::path::{Path, PathBuf};
+        let folder = self
+            .session
+            .active()
+            .and_then(|d| d.path.as_deref())
+            .and_then(folder_of)
+            .or_else(|| self.ui.last_save_folder.as_ref().map(PathBuf::from));
+        match (folder, Path::new(name).file_name()) {
+            (Some(f), Some(file)) => f.join(file).to_string_lossy().to_string(),
+            _ => name.to_string(),
+        }
+    }
+
+    /// Queues `dialog` unless the same code already asked for the same one for the same document
+    /// and it is still showing or waiting: choosing File › Open again while its panel is up brings
+    /// that panel to the front instead of showing a second one.
+    #[cfg(not(target_arch = "wasm32"))]
+    #[track_caller]
+    fn ask_file(&mut self, dialog: craft_dialogs::FileDialog, bound: Bound, step: Step) {
+        let key =
+            AskKey { request: craft_dialogs::Request::File(dialog.clone()), doc: self.bound_doc(bound), origin: std::panic::Location::caller() };
+        if self.asked.contains(&key) {
+            self.file_dialogs.raise();
+            return;
+        }
+        self.asked.push(key.clone());
+        let dialog_open = self.ui.dialog.as_ref().map(|d| d.id.clone());
+        self.file_dialogs.ask(dialog, Asked { key, dialog: dialog_open, step });
+    }
+
+    /// A dialog is showing or waiting to show, or its answer hasn't run yet.
+    pub(crate) fn file_dialogs_pending(&self) -> bool {
+        #[cfg(not(target_arch = "wasm32"))]
+        return !self.asked.is_empty() || !self.held_answers.is_empty();
+        #[cfg(target_arch = "wasm32")]
+        false
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    fn bound_doc(&self, bound: Bound) -> Option<u64> {
+        match bound {
+            Bound::Document => self.session.active().map(|d| d.uid),
+            Bound::App => None,
+        }
+    }
+
+    /// Shows the next dialog asked for. The host calls it at the end of every frame with its
+    /// window: on macOS Save and message boxes are sheets on it.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn show_file_dialogs<W: raw_window_handle::HasWindowHandle + raw_window_handle::HasDisplayHandle>(&mut self, parent: Option<&W>) {
+        self.file_dialogs.show_pending(parent);
+    }
+
+    /// Runs the continuations of the dialogs that have answered, and of answers held until the
+    /// egui dialog in their way has closed.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) fn handle_file_dialog_answers(&mut self) {
+        use craft_dialogs::{Answer, MessageResult};
+        for held in std::mem::take(&mut self.held_answers) {
+            self.continue_in(held);
+        }
+        for (asked, answer) in self.file_dialogs.take_answers() {
+            let Asked { key, dialog, step } = asked;
+            if let Some(i) = self.asked.iter().position(|k| *k == key) {
+                self.asked.remove(i);
+            }
+            let doc = key.doc;
+            match (step, answer) {
+                (_, Answer::Unavailable(why)) => self.status_error(DIALOG_UNAVAILABLE, why),
+                (Step::Open(then), Answer::Paths(paths)) => {
+                    if let Some(path) = paths.into_iter().next() {
+                        self.continue_in(Held { doc, dialog, then, path: path.to_string_lossy().to_string() });
+                    }
+                }
+                (Step::Save { ext, then }, Answer::Paths(paths)) => {
+                    let Some(picked) = paths.into_iter().next() else { continue };
+                    let path = picked_save_path(picked.clone(), ext.as_deref());
+                    if path != picked && path.exists() {
+                        self.ask_replace(key, dialog, path, then);
+                    } else {
+                        self.saved_to(Held { doc, dialog, then, path: path.to_string_lossy().to_string() });
+                    }
+                }
+                (Step::Replace { path, then }, Answer::Message(MessageResult::Yes)) => self.saved_to(Held { doc, dialog, then, path }),
+                // Cancel, or No to replacing the file: nothing happens.
+                _ => {}
+            }
+        }
+    }
+
+    /// The extension added to the name typed names another file than the one the dialog checked,
+    /// so replacing an existing one asks again.
+    #[cfg(not(target_arch = "wasm32"))]
+    fn ask_replace(&mut self, key: AskKey, dialog: Option<String>, path: std::path::PathBuf, then: Then) {
+        let lang = &self.ui.language;
+        let file = path.file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_default();
+        let message = craft_dialogs::Message {
+            level: craft_dialogs::MessageLevel::Warning,
+            title: crate::i18n::tr(lang, "Replace File?").to_string(),
+            description: crate::i18n::tr(lang, "“{file}” already exists. Do you want to replace it?").replace("{file}", &file),
+            buttons: craft_dialogs::MessageButtons::YesNo,
+        };
+        let key = AskKey { request: craft_dialogs::Request::Message(message.clone()), ..key };
+        self.asked.push(key.clone());
+        let path = path.to_string_lossy().to_string();
+        self.file_dialogs.ask_message(message, Asked { key, dialog, step: Step::Replace { path, then } });
+    }
+
+    /// A save path chosen: its folder is where the next save dialog starts.
+    #[cfg(not(target_arch = "wasm32"))]
+    fn saved_to(&mut self, answer: Held) {
+        if let Some(folder) = folder_of(&answer.path) {
+            self.ui.last_save_folder = Some(folder.to_string_lossy().to_string());
+        }
+        self.continue_in(answer);
+    }
+
+    /// Runs the answer's continuation in the document the dialog was asked for, made active again
+    /// if the user moved to another meanwhile; nothing runs once it has closed. While an egui
+    /// dialog opened since the asking is up, the answer waits for it to close.
+    #[cfg(not(target_arch = "wasm32"))]
+    fn continue_in(&mut self, answer: Held) {
+        if self.ui.dialog.as_ref().is_some_and(|d| Some(&d.id) != answer.dialog.as_ref()) {
+            self.held_answers.push(answer);
+            return;
+        }
+        let Held { doc, then, path, .. } = answer;
+        if let Some(uid) = doc {
+            let Some(index) = self.session.documents().iter().position(|d| d.uid == uid) else {
+                self.status(crate::i18n::tr(&self.ui.language, "Cancelled: the document the dialog was for has closed"));
+                return;
+            };
+            if self.session.active().map(|d| d.uid) != Some(uid)
+                && let Err(e) = self.run("file.activate", json!({"index": index}))
+            {
+                self.status(e);
+                return;
+            }
+        }
+        // As for a UI command: a dialog that replaces Find releases its scope.
+        let was_find = self.ui.dialog.as_ref().is_some_and(|d| d.id == "findChange");
+        if let Err(e) = then(self, path) {
+            self.status(e);
+        }
+        if was_find && self.ui.dialog.as_ref().is_none_or(|d| d.id != "findChange") {
+            self.session.reset_find_scope();
+        }
+    }
+}
+
+/// `p` with `key` set to the chosen path: a command re-run with the answer to its dialog.
+pub(crate) fn with_path(p: &Value, key: &str, path: String) -> Value {
+    let mut q = if p.is_object() { p.clone() } else { json!({}) };
+    q[key] = json!(path);
+    q
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn folder_of(path: &str) -> Option<std::path::PathBuf> {
+    std::path::Path::new(path).parent().filter(|f| !f.as_os_str().is_empty()).map(std::path::Path::to_path_buf)
+}
+
+/// One file-type row in an open dialog.
+#[cfg(not(target_arch = "wasm32"))]
+struct OpenFilter {
+    name: &'static str,
+    extensions: &'static [&'static str],
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+const GRAPHICS: &[&str] = &["png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "psd", "svg", "pdf", "ai", "eps"];
+
+#[cfg(not(target_arch = "wasm32"))]
+fn open_filters(purpose: &str) -> &'static [OpenFilter] {
+    match purpose {
+        "swatches" => &[OpenFilter { name: "Swatch Exchange (ASE)", extensions: &["ase"] }],
+        "script" => &[OpenFilter { name: "Script", extensions: &["dcscript", "txt", "json"] }],
+        "shortcuts" => &[OpenFilter { name: "Shortcut set (JSON, InDesign text)", extensions: &["json", "txt"] }],
+        "icc" => &[OpenFilter { name: "ICC profile", extensions: &["icc", "icm"] }],
+        "book" => &[OpenFilter { name: "Book", extensions: &["dcbook"] }],
+        "xml" => &[OpenFilter { name: "XML", extensions: &["xml"] }],
+        "dtd" => &[OpenFilter { name: "DTD", extensions: &["dtd"] }],
+        "library" => &[OpenFilter { name: "Object Library", extensions: &["dclib"] }],
+        "relink" => &[OpenFilter { name: "Graphics", extensions: GRAPHICS }],
+        "dataMerge" => &[OpenFilter { name: "Data source (CSV, TSV, text, Excel)", extensions: &["csv", "tsv", "tab", "txt", "xlsx"] }],
+        "place" => &[
+            OpenFilter {
+                name: "Graphics and text",
+                extensions: &[
+                    "png",
+                    "jpg",
+                    "jpeg",
+                    "gif",
+                    "webp",
+                    "tif",
+                    "tiff",
+                    "bmp",
+                    "psd",
+                    "svg",
+                    "pdf",
+                    "ai",
+                    "eps",
+                    "txt",
+                    "docx",
+                    "rtf",
+                    "md",
+                    "xlsx",
+                    "idml",
+                    "designcraft",
+                    "mp4",
+                    "m4v",
+                    "mov",
+                    "webm",
+                    "mp3",
+                    "m4a",
+                    "wav",
+                    "ogg",
+                ],
+            },
+            OpenFilter { name: "Graphics", extensions: GRAPHICS },
+            OpenFilter { name: "Text (Word, RTF, plain, Excel)", extensions: &["docx", "rtf", "txt", "md", "xlsx"] },
+            OpenFilter { name: "Video and sound", extensions: &["mp4", "m4v", "mov", "webm", "mp3", "m4a", "wav", "ogg"] },
+        ],
+        _ => &[
+            OpenFilter { name: "DesignCraft, IDML or InDesign", extensions: &["designcraft", "idml", "indd", "indt"] },
+            OpenFilter { name: "DesignCraft", extensions: &["designcraft"] },
+            OpenFilter { name: "InDesign Markup (IDML)", extensions: &["idml"] },
+            OpenFilter { name: "InDesign document or template (INDD, INDT)", extensions: &["indd", "indt"] },
+            // Files saved without an extension; `file.open` tells the formats apart by content.
+            OpenFilter { name: "All files", extensions: &[ALL_FILES] },
+        ],
+    }
+}
+
+/// The "All files" pattern. The macOS panel merges every filter into one list of allowed types,
+/// which takes type identifiers as well as extensions: `public.data` admits any file.
+#[cfg(not(target_arch = "wasm32"))]
+const ALL_FILES: &str = if cfg!(target_os = "macos") { "public.data" } else { "*" };
+
+/// The extension of the file name a save dialog suggests (`Brochure.designcraft`), if it has one.
+/// The dialog filters on it, so the macOS and Windows dialogs add it to a name typed without it.
+#[cfg(not(target_arch = "wasm32"))]
+fn suggested_extension(name: &str) -> Option<&str> {
+    std::path::Path::new(name).extension().and_then(std::ffi::OsStr::to_str).filter(|e| !e.is_empty() && !e.contains(char::is_whitespace))
+}
+
+/// The file a save dialog's answer writes: `picked` with the suggested extension added when it has
+/// none (Linux dialogs don't add it). A document always ends in `.designcraft`, as `file.save`
+/// writes it.
+#[cfg(not(target_arch = "wasm32"))]
+fn picked_save_path(picked: std::path::PathBuf, ext: Option<&str>) -> std::path::PathBuf {
+    let Some(ext) = ext else { return picked };
+    if ext.eq_ignore_ascii_case("designcraft") {
+        let p = picked.to_string_lossy();
+        return designcraft_engine::cmd::with_document_extension(&p).into();
+    }
+    if picked.extension().is_some() || picked.file_name().is_none() {
+        return picked;
+    }
+    let mut s = picked.into_os_string();
+    s.push(".");
+    s.push(ext);
+    s.into()
+}
+
+/// The folder a save dialog starts in and the name it suggests. A suggestion with a folder in
+/// front (the document's, or the last one used) starts there while that folder still exists;
+/// otherwise the system picks.
+#[cfg(not(target_arch = "wasm32"))]
+fn save_dialog_start(suggested: &str) -> (Option<std::path::PathBuf>, String) {
+    let path = std::path::Path::new(suggested);
+    let name = path.file_name().map_or_else(|| suggested.to_string(), |n| n.to_string_lossy().to_string());
+    let folder = path.parent().filter(|f| !f.as_os_str().is_empty() && f.is_dir()).map(std::path::Path::to_path_buf);
+    (folder, name)
+}
+
+#[cfg(test)]
+pub(crate) mod testing {
+    use craft_dialogs::{Answer, MessageResult, Request};
+
+    use super::DesignApp;
+
+    /// No window: dialogs answered by an override need none.
+    pub(crate) struct NoWindow;
+
+    impl raw_window_handle::HasWindowHandle for NoWindow {
+        fn window_handle(&self) -> Result<raw_window_handle::WindowHandle<'_>, raw_window_handle::HandleError> {
+            Err(raw_window_handle::HandleError::Unavailable)
+        }
+    }
+
+    impl raw_window_handle::HasDisplayHandle for NoWindow {
+        fn display_handle(&self) -> Result<raw_window_handle::DisplayHandle<'_>, raw_window_handle::HandleError> {
+            Err(raw_window_handle::HandleError::Unavailable)
+        }
+    }
+
+    /// Every file dialog answers `path` (`None`: Cancel); every message box answers Yes.
+    pub(crate) fn answer_with(path: Option<String>) -> impl FnMut(&Request) -> Answer + 'static {
+        move |request| match (request, &path) {
+            (Request::Message(_), _) => Answer::Message(MessageResult::Yes),
+            (Request::File(_), Some(path)) => Answer::Paths(vec![path.into()]),
+            (Request::File(_), None) => Answer::Cancelled,
+        }
+    }
+
+    impl DesignApp {
+        /// From now on, `answer` answers every dialog instead of a native one.
+        pub(crate) fn answer_dialogs(&mut self, answer: impl FnMut(&Request) -> Answer + 'static) {
+            self.file_dialogs.set_override(Some(Box::new(answer)));
+        }
+
+        /// Shows the dialogs asked for (the override answers them) and runs their answers, until
+        /// none is left: what the frames after the asking one do.
+        pub(crate) fn settle_dialogs(&mut self) {
+            for _ in 0..8 {
+                self.show_file_dialogs(None::<&NoWindow>);
+                self.handle_file_dialog_answers();
+                if !self.file_dialogs.is_open() && self.file_dialogs.queued() == 0 {
+                    return;
+                }
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::path::PathBuf;
+
+    use super::testing::answer_with;
+    use super::{ALL_FILES, open_filters, picked_save_path, save_dialog_start, suggested_extension};
+
+    #[test]
+    fn relink_open_dialog_lists_graphics() {
+        let exts: Vec<&str> = open_filters("relink").iter().flat_map(|filter| filter.extensions.iter().copied()).collect();
+        for ext in ["png", "jpg", "tif", "psd", "svg", "pdf", "ai", "eps"] {
+            assert!(exts.contains(&ext), "{ext} is missing from the relink dialog: {exts:?}");
+        }
+        assert!(!exts.contains(&"designcraft") && !exts.contains(&"idml"));
+    }
+
+    #[test]
+    fn data_merge_open_dialog_lists_table_extensions() {
+        let exts: Vec<&str> = open_filters("dataMerge").iter().flat_map(|filter| filter.extensions.iter().copied()).collect();
+        for ext in ["csv", "tsv", "tab", "txt", "xlsx"] {
+            assert!(exts.contains(&ext), "{ext} is missing from the dataMerge dialog: {exts:?}");
+        }
+        assert!(!exts.iter().any(|ext| *ext == "designcraft" || *ext == "idml"), "dataMerge must not fall through to the document filters: {exts:?}");
+        let place = open_filters("place");
+        assert!(place.len() > 1, "the place dialog keeps a filter for each kind of file");
+        assert!(place.iter().any(|filter| filter.extensions.contains(&"png")));
+        let documents = open_filters("");
+        for ext in ["designcraft", "idml", "indd", "indt"] {
+            assert!(documents.first().is_some_and(|filter| filter.extensions.contains(&ext)), "{ext} is missing from the first Open filter");
+        }
+        assert!(documents.last().is_some_and(|filter| filter.extensions == [ALL_FILES]), "files without an extension can be picked");
+    }
+
+    #[test]
+    fn save_dialog_answers_get_the_suggested_extension() {
+        let save = |picked: &str, name: &str| picked_save_path(PathBuf::from(picked), suggested_extension(name));
+        assert_eq!(save("/d/Brochure", "Untitled.designcraft"), PathBuf::from("/d/Brochure.designcraft"));
+        assert_eq!(save("/d/Brochure.idml", "Untitled.designcraft"), PathBuf::from("/d/Brochure.idml.designcraft"));
+        assert_eq!(save("/d/Brochure.designcraft", "Untitled.designcraft"), PathBuf::from("/d/Brochure.designcraft"));
+        assert_eq!(save("/d/Brochure", "Untitled.pdf"), PathBuf::from("/d/Brochure.pdf"));
+        assert_eq!(save("/d/Brochure.txt", "Untitled.rtf"), PathBuf::from("/d/Brochure.txt"), "another export format is kept");
+        assert_eq!(save("/d/Package", "Untitled 1.2 Folder"), PathBuf::from("/d/Package"), "a folder has no extension");
+    }
+
+    /// #1653: the save dialog opens in the folder the suggestion names, unless it is gone.
+    #[test]
+    fn save_dialog_starts_in_the_suggested_folder_while_it_exists() {
+        let folder = std::env::temp_dir();
+        let suggested = folder.join("Brochure.pdf");
+        assert_eq!(save_dialog_start(&suggested.to_string_lossy()), (Some(folder.clone()), "Brochure.pdf".to_string()));
+        let gone = folder.join(format!("designcraft-gone-{}", std::process::id())).join("Brochure.pdf");
+        assert_eq!(save_dialog_start(&gone.to_string_lossy()), (None, "Brochure.pdf".to_string()), "a folder deleted since: the system's own");
+        assert_eq!(save_dialog_start("Untitled 1.2 Folder"), (None, "Untitled 1.2 Folder".to_string()), "a bare name: the system's own");
+    }
+
+    /// Place, Graphic Cell and Choose Image share the Place dialog, but each keeps its own
+    /// request, as does Place asked for another document; Place asked again for the same one
+    /// doesn't queue a second dialog.
+    #[test]
+    fn different_askers_and_documents_queue_their_own_dialogs() {
+        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.answer_dialogs(answer_with(None));
+        app.run("file.new", serde_json::json!({})).unwrap();
+        app.run("app.placeDialog", serde_json::json!({})).unwrap();
+        app.run("app.graphicCell", serde_json::json!({})).unwrap();
+        assert_eq!(app.file_dialogs.queued(), 2);
+        app.run("file.new", serde_json::json!({})).unwrap();
+        app.run("app.placeDialog", serde_json::json!({})).unwrap();
+        assert_eq!(app.file_dialogs.queued(), 3);
+        app.run("app.placeDialog", serde_json::json!({})).unwrap();
+        assert_eq!(app.file_dialogs.queued(), 3);
+    }
+
+    /// An answer that arrives while an egui dialog opened since is up (Preferences, an
+    /// unsaved-changes question) waits for it to close instead of replacing it.
+    #[test]
+    fn an_answer_waits_for_a_dialog_opened_after_the_asking() {
+        let dir = tempfile::tempdir().unwrap();
+        let path = dir.path().join("Held.designcraft");
+        let mut source = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        source.run("file.new", serde_json::json!({})).unwrap();
+        source.run("file.saveAs", serde_json::json!({"path": path.to_string_lossy()})).unwrap();
+
+        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.answer_dialogs(answer_with(Some(path.to_string_lossy().to_string())));
+        app.run("app.openDialog", serde_json::json!({})).unwrap();
+        app.ui.dialog = Some(crate::dialogs::Dialog::new("preferences", serde_json::json!({})));
+        app.settle_dialogs();
+        assert!(app.session.documents().is_empty(), "the answer waits");
+        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("preferences"));
+        assert!(app.file_dialogs_pending(), "Quit still sees the answer coming");
+        app.ui.dialog = None;
+        app.handle_file_dialog_answers();
+        assert_eq!(app.session.documents().len(), 1);
+        assert!(!app.file_dialogs_pending());
+    }
+
+    /// File › Open without a path asks and returns at once; the document opens on a later frame,
+    /// when the dialog's answer arrives. The frame never waits for the dialog.
+    #[test]
+    fn file_open_without_a_path_opens_the_chosen_document_when_the_dialog_answers() {
+        let dir = tempfile::tempdir().unwrap();
+        let path = dir.path().join("Chosen.designcraft");
+        let mut source = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        source.run("file.new", serde_json::json!({})).unwrap();
+        source.run("file.saveAs", serde_json::json!({"path": path.to_string_lossy()})).unwrap();
+
+        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.answer_dialogs(answer_with(Some(path.to_string_lossy().to_string())));
+        app.run("app.openDialog", serde_json::json!({})).unwrap();
+        assert!(app.session.documents().is_empty(), "nothing opens before the dialog has answered");
+        // Asking again while the dialog is up doesn't queue a second one.
+        app.run("app.openDialog", serde_json::json!({})).unwrap();
+        assert_eq!(app.file_dialogs.queued(), 1);
+        app.settle_dialogs();
+        assert_eq!(app.session.documents().len(), 1, "the chosen document opened once");
+        assert_eq!(app.session.active().and_then(|d| d.path.clone()).map(PathBuf::from), Some(path));
+    }
+}
diff --git a/crates/ui-egui/src/app/files.rs b/crates/ui-egui/src/app/files.rs
new file mode 100644
index 000000000..49d2bd757
--- /dev/null
+++ b/crates/ui-egui/src/app/files.rs
@@ -0,0 +1,843 @@
+use super::{DesignApp, ImportRequest, ImportedFile, Value, canvas, dialogs, file_dialogs, json, shortcut_import};
+#[cfg(test)]
+use super::{Services, Session};
+#[cfg(test)]
+use crate::Inbox;
+#[cfg(test)]
+use crate::test_window;
+
+impl DesignApp {
+    /// Ask the host for a file to open (`open`) or place (`place`). A native dialog answers on a
+    /// later frame ([`Self::open_picked`]); in a browser the file arrives through the inbox.
+    #[track_caller]
+    pub fn pick_and_open(&mut self, purpose: &str) -> Result<Value, String> {
+        if let Some(open) = self.services.open_async.as_mut() {
+            let request = ImportRequest { purpose: purpose.into(), target: self.session.active().map(|d| d.uid) };
+            open(request);
+            return Ok(Value::Null);
+        }
+        let bound = if purpose == "place" { file_dialogs::Bound::Document } else { file_dialogs::Bound::App };
+        let purpose_owned = purpose.to_string();
+        self.ask_open(purpose, bound, move |app, path| app.open_picked(&purpose_owned, path))
+    }
+
+    /// Open (`open`) or place (`place`) the file at `path`, chosen in a dialog or passed by a script.
+    pub(crate) fn open_picked(&mut self, purpose: &str, path: String) -> Result<Value, String> {
+        // Image Import Options: a multi-page PDF asks which page.
+        if purpose == "place" && path.to_ascii_lowercase().ends_with(".pdf") {
+            let target = self.session.active().map(|d| d.uid);
+            let pages = self.services.read.as_mut().and_then(|r| r(&path).ok()).and_then(|b| designcraft_render::pdf_page_count(&b)).unwrap_or(1);
+            if pages > 1 {
+                self.ui.dialog = Some(dialogs::Dialog::new("pdfImport", json!({"path": path, "page": "1", "pages": pages, "target": target})));
+                return Ok(Value::Null);
+            }
+            return self.place_file(json!({"path": path}));
+        }
+        if purpose == "place" {
+            return self.place_file(json!({"path": path}));
+        }
+        self.open_file("file.open", json!({"path": path}))
+    }
+
+    /// Load Styles: ask the host for a document whose styles to load; `kind` is `paragraph`,
+    /// `character` or empty for both. A native dialog's answer opens the dialog that chooses
+    /// among the file's styles; in a browser they all load when the file arrives.
+    #[track_caller]
+    pub fn pick_styles(&mut self, kind: &str) -> Result<Value, String> {
+        designcraft_engine::cmd::has_doc(&self.session)?;
+        if let Some(open) = self.services.open_async.as_mut() {
+            let purpose = if kind.is_empty() { "styles".to_string() } else { format!("styles:{kind}") };
+            open(ImportRequest { purpose, target: self.session.active().map(|d| d.uid) });
+            return Ok(Value::Null);
+        }
+        let kind = kind.to_string();
+        self.ask_open("styles", file_dialogs::Bound::Document, move |app, path| {
+            let found = app.run("style.load.list", json!({"path": path}))?;
+            let of = |k: &str| if kind.is_empty() || kind == k { found[k].clone() } else { json!([]) };
+            app.ui.dialog = Some(dialogs::Dialog::new(
+                "loadStyles",
+                json!({"path": path, "paragraph": of("paragraph"), "character": of("character"), "conflicts": "redefine"}),
+            ));
+            Ok(Value::Null)
+        })
+    }
+
+    pub fn import_request(&self, purpose: &str) -> ImportRequest {
+        ImportRequest { purpose: purpose.into(), target: self.session.active().map(|d| d.uid) }
+    }
+
+    pub(crate) fn activate_import_target(&mut self, request: &ImportRequest) -> Result<(), String> {
+        let Some(index) = request.target.and_then(|uid| self.session.documents().iter().position(|d| d.uid == uid)) else {
+            let message = "Import cancelled: the originating document has closed";
+            self.status(crate::i18n::tr(&self.ui.language, message));
+            return Err(message.into());
+        };
+        self.run("file.activate", json!({"index": index}))?;
+        Ok(())
+    }
+
+    pub(crate) fn cancel_pdf_import(&mut self) {
+        self.pending_pdf = None;
+    }
+
+    pub(crate) fn confirm_pdf_import(&mut self, page: u64, crop: String) -> Result<Value, String> {
+        let file = self.pending_pdf.take().ok_or("PDF import cancelled: no pending file")?;
+        self.activate_import_target(&file.request)?;
+        let params = json!({"name": file.name, "base64": designcraft_engine::cmd::base64_encode(&file.bytes), "pdfPage": page, "pdfCrop": crop});
+        if file.request.purpose == "place" { self.place_file(params) } else { self.open_file("file.place", params) }
+    }
+
+    /// A single unresolved PDF owns its bytes. Later deliveries cancel explicitly rather than
+    /// replacing its options. Cancellation, replacement and target closure release its payload.
+    pub(super) fn drain_inbox(&mut self) {
+        if let Some(file) = &self.pending_pdf {
+            let target_exists = self.session.documents().iter().any(|d| Some(d.uid) == file.request.target);
+            let owns_dialog =
+                self.ui.dialog.as_ref().is_some_and(|d| d.id == "pdfImport" && d.fields.get("async").and_then(Value::as_bool) == Some(true));
+            if !target_exists || !owns_dialog {
+                self.pending_pdf = None;
+                if !target_exists {
+                    if owns_dialog {
+                        self.ui.dialog = None;
+                    }
+                    self.status(crate::i18n::tr(&self.ui.language, "PDF import cancelled: the originating document has closed"));
+                }
+            }
+        }
+        let Some(inbox) = self.services.inbox.clone() else { return };
+        let files = std::mem::take(&mut *inbox.lock().unwrap_or_else(std::sync::PoisonError::into_inner));
+        for file in files {
+            if file.request.purpose == "shortcuts" {
+                shortcut_import::import_delivered(self, &file.bytes);
+                continue;
+            }
+            if self.ui.dialog.is_some() {
+                self.status(
+                    crate::i18n::tr(&self.ui.language, "{name}: import cancelled while a dialog is open; choose the file again")
+                        .replace("{name}", &file.name),
+                );
+                continue;
+            }
+            let name = file.name.clone();
+            if let Err(e) = self.import_file(file) {
+                self.status(format!("{name}: {e}"));
+            }
+        }
+    }
+
+    fn import_file(&mut self, file: ImportedFile) -> Result<Value, String> {
+        let lower = file.name.to_ascii_lowercase();
+        if let Some(kind) = file.request.purpose.strip_prefix("styles") {
+            self.activate_import_target(&file.request)?;
+            let mut params = json!({"name": file.name, "base64": designcraft_engine::cmd::base64_encode(&file.bytes)});
+            match kind {
+                ":paragraph" => params["character"] = json!([]),
+                ":character" => params["paragraph"] = json!([]),
+                _ => {}
+            }
+            return self.run("style.load", params);
+        }
+        let layout = opens_as_document(&file.name)
+            || (std::path::Path::new(&file.name).extension().is_none() && designcraft_engine::cmd::is_document(&file.bytes));
+        let place =
+            file.request.purpose == "place" || (matches!(file.request.purpose.as_str(), "drop" | "open") && !layout && !lower.ends_with(".ase"));
+        if place || lower.ends_with(".ase") || file.request.purpose == "swatches" {
+            self.activate_import_target(&file.request)?;
+        }
+        if place && lower.ends_with(".pdf") {
+            let pages = designcraft_render::pdf_page_count(&file.bytes).unwrap_or(1);
+            if pages > 1 {
+                self.ui.dialog =
+                    Some(dialogs::Dialog::new("pdfImport", json!({"async": true, "name": file.name.clone(), "page": "1", "pages": pages})));
+                self.pending_pdf = Some(file);
+                return Ok(Value::Null);
+            }
+        }
+        let b64 = designcraft_engine::cmd::base64_encode(&file.bytes);
+        if lower.ends_with(".ase") || file.request.purpose == "swatches" {
+            self.run("swatch.load", json!({"base64": b64}))
+        } else if file.request.purpose == "place" {
+            self.place_file(json!({"name": file.name, "base64": b64}))
+        } else if place {
+            self.open_file("file.place", json!({"name": file.name, "base64": b64}))
+        } else {
+            let title = file.name.rsplit_once('.').map_or(file.name.as_str(), |(stem, _)| stem);
+            self.open_file("file.openBytes", json!({"name": title, "base64": b64}))
+        }
+    }
+
+    /// A file dropped on the window: documents open, the swatches in a swatch exchange (.ase) file
+    /// are loaded, and anything else is placed on the spread in view (a parent spread while parents
+    /// are being edited). A file without an extension opens when its content is a DesignCraft or
+    /// IDML document.
+    pub fn open_dropped(&mut self, path: &str) -> Result<Value, String> {
+        self.open_dropped_at(path, None)
+    }
+
+    /// Open or place each file dropped on a floating panel's own window. `pointer` is in the main
+    /// window's coordinates.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) fn open_dropped_files(&mut self, files: &[egui::DroppedFileHandle], pointer: Option<egui::Pos2>) {
+        for f in files {
+            let p = f.path().to_string_lossy().to_string();
+            if !p.is_empty() {
+                let _ = self.open_dropped_at(&p, pointer);
+            }
+        }
+    }
+
+    /// [`Self::open_dropped`] at the pointer: a graphic's top left lands where the file was
+    /// dropped on the canvas, text goes to a new frame on the document page there.
+    pub fn open_dropped_at(&mut self, path: &str, pointer: Option<egui::Pos2>) -> Result<Value, String> {
+        if path.to_ascii_lowercase().ends_with(".ase") {
+            return self.run("swatch.load", json!({"path": path}));
+        }
+        let document = opens_as_document(path)
+            || (std::path::Path::new(path).extension().is_none()
+                && designcraft_engine::io::read_capped(path, designcraft_engine::cmd::DOCUMENT_SNIFF_BYTES)
+                    .is_ok_and(|b| designcraft_engine::cmd::is_document(&b)));
+        if document {
+            return self.open_file("file.open", json!({"path": path}));
+        }
+        let mut params = json!({"path": path});
+        if let (Some((sr, at)), Some(o)) = (canvas::drop_point(self, pointer), params.as_object_mut()) {
+            o.insert("spread".into(), serde_json::to_value(sr).unwrap_or(Value::Null));
+            o.insert("x".into(), json!(at.x));
+            o.insert("y".into(), json!(at.y));
+            if let (designcraft_doc::SpreadRef::Doc(si), Some(st)) = (sr, self.session.active()) {
+                let pi = st.doc.spreads.get(si).and_then(|s| s.page_at_x(at.x)).unwrap_or(0);
+                o.insert("page".into(), json!(st.doc.first_page_of_spread(si) + pi + 1));
+            }
+        }
+        self.open_file("file.place", params)
+    }
+
+    /// Queue files the operating system asked the app to open. They can arrive before the window
+    /// exists (the event that launched the app); the first ready frame opens them, each as a new
+    /// document through `file.open`, as File › Open does.
+    pub fn open_documents_later(&mut self, paths: impl IntoIterator<Item = String>) {
+        self.os_documents.extend(paths);
+    }
+
+    pub(crate) fn open_os_documents(&mut self) {
+        for path in std::mem::take(&mut self.os_documents) {
+            if let Err(e) = self.open_file("file.open", json!({"path": path})) {
+                log::warn!("{path}: {e}");
+            }
+        }
+    }
+
+    /// File › Place: the file fills the selected empty or graphic frame; with none, an image loads
+    /// into the place cursor (click to place at its natural size, drag to draw the frame).
+    pub(crate) fn place_file(&mut self, mut params: Value) -> Result<Value, String> {
+        if let Some(o) = params.as_object_mut() {
+            o.insert("loadCursor".into(), json!(true));
+        }
+        self.open_file("file.place", params)
+    }
+
+    /// Open (`file.open`, `file.openBytes`) or place (`file.place`) a file the user chose. A file
+    /// that can't be opened or placed gets an alert with the reason, as well as the status line.
+    /// A successful import with warnings keeps the document and shows the warnings in an alert.
+    pub fn open_file(&mut self, cmd: &str, params: Value) -> Result<Value, String> {
+        let file = match params.get("path").and_then(Value::as_str) {
+            Some(path) => std::path::Path::new(path).file_name().map_or_else(|| path.to_string(), |n| n.to_string_lossy().to_string()),
+            None => params.get("name").and_then(Value::as_str).unwrap_or_default().to_string(),
+        };
+        self.open_named_file(cmd, params, file)
+    }
+
+    /// [`Self::open_file`] for a command whose params don't name the file: `file` is shown in the
+    /// alert or warnings.
+    pub fn open_named_file(&mut self, cmd: &str, params: Value, file: String) -> Result<Value, String> {
+        let r = self.run(cmd, params);
+        if let Err(e) = &r {
+            let title = if cmd == "file.place" { "Can't Place the File" } else { "Can't Open the File" };
+            if self.ui.dialog.as_ref().is_some_and(|d| d.id == "findChange") {
+                self.session.reset_find_scope();
+            }
+            self.ui.dialog = Some(dialogs::Dialog::new("alert", json!({"title": title, "file": file, "message": e})));
+        } else if let Ok(result) = &r {
+            let warnings: Vec<&str> = result
+                .get("warnings")
+                .and_then(Value::as_array)
+                .into_iter()
+                .flatten()
+                .filter_map(Value::as_str)
+                .filter(|warning| !warning.is_empty())
+                .collect();
+            if !warnings.is_empty() {
+                self.status(format!("{file}: {}", warnings.join("; ")));
+                // Find Font, offered for the document's missing fonts, stays up: the status line
+                // keeps the warnings.
+                if self.ui.dialog.as_ref().is_none_or(|d| d.id != "findFont") {
+                    self.ui.dialog =
+                        Some(dialogs::Dialog::new("alert", json!({"title": "Import Warnings", "file": file, "message": warnings.join("\n")})));
+                }
+            }
+        }
+        r
+    }
+
+    /// Deliver window actions to the host without persisting them in UI preferences.
+    pub(crate) fn flush_window_commands(&mut self, ctx: &egui::Context) {
+        for command in std::mem::take(&mut self.pending_window_commands) {
+            ctx.send_viewport_cmd(command);
+        }
+    }
+}
+
+/// Files that open as documents (when dropped or picked) rather than being placed: DesignCraft,
+/// IDML, and InDesign documents and templates (converted to IDML on open).
+pub fn opens_as_document(name: &str) -> bool {
+    let n = name.to_ascii_lowercase();
+    [".designcraft", ".idml", ".indd", ".indt"].iter().any(|ext| n.ends_with(ext))
+}
+
+#[cfg(test)]
+mod import_warning_tests {
+    use super::*;
+    use std::io::Write;
+
+    fn idml(missing_parts: bool) -> Vec<u8> {
+        let missing = if missing_parts { r#"<idPkg:Spread src="Spreads/missing.xml"/><idPkg:Story src="Stories/missing.xml"/>"# } else { "" };
+        let map = format!(
+            r#"<Document xmlns:idPkg="http://ns.adobe.com/AdobeInDesign/idml/1.0/packaging" Self="d"><idPkg:Spread src="Spreads/one.xml"/>{missing}</Document>"#
+        );
+        let spread = r#"<idPkg:Spread xmlns:idPkg="http://ns.adobe.com/AdobeInDesign/idml/1.0/packaging"><Spread Self="s"><Page Self="p" GeometricBounds="0 0 100 100" ItemTransform="1 0 0 1 0 0"/><Rectangle Self="r" ItemTransform="1 0 0 1 0 0"/></Spread></idPkg:Spread>"#;
+        let mut zip = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+        let options = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
+        for (name, text) in [("mimetype", designcraft_idml::MIMETYPE), ("designmap.xml", &map), ("Spreads/one.xml", spread)] {
+            zip.start_file(name, options).unwrap();
+            zip.write_all(text.as_bytes()).unwrap();
+        }
+        zip.finish().unwrap().into_inner()
+    }
+
+    fn app() -> DesignApp {
+        let mut app = DesignApp::new(Session::new(), Services { inbox: Some(Inbox::default()), ..Default::default() });
+        app.run("file.new", json!({"title": "Existing work"})).unwrap();
+        app.run("frame.create", json!({"rect": [10, 10, 50, 50]})).unwrap();
+        app
+    }
+
+    fn assert_partial_import_warning(app: &mut DesignApp, file: &str) {
+        let dialog = app.ui.dialog.as_ref().expect("partial import must show an alert");
+        assert_eq!(dialog.id, "alert");
+        assert_eq!(dialog.fields["title"], "Import Warnings");
+        assert_eq!(dialog.fields["file"], file);
+        for part in ["Spreads/missing.xml", "Stories/missing.xml"] {
+            assert!(dialog.fields["message"].as_str().unwrap().contains(part), "every missing part is named");
+            assert!(app.ui.status.contains(part), "the status line retains the warning");
+        }
+        assert_eq!(app.session.documents().len(), 2);
+        assert_eq!(app.session.documents()[0].doc.title, "Existing work");
+        assert!(app.session.documents()[0].is_dirty(), "existing unsaved work stays intact");
+        assert_eq!(app.session.documents()[0].doc.spreads[0].items.len(), 1);
+        assert_eq!(app.session.doc().unwrap().doc.spreads.len(), 1);
+        assert_eq!(app.session.doc().unwrap().doc.spreads[0].items.len(), 1, "available document content is kept");
+        dialogs::confirm(app).unwrap();
+        assert!(app.ui.dialog.is_none(), "OK dismisses the warning");
+        assert_eq!(app.session.documents().len(), 2, "dismissing the warning keeps the imported document");
+    }
+
+    #[test]
+    fn byte_open_reports_partial_import_warnings_without_losing_documents() {
+        let mut app = app();
+        let result =
+            app.open_file("file.openBytes", json!({"name": "partial.idml", "base64": designcraft_engine::cmd::base64_encode(&idml(true))})).unwrap();
+        assert_eq!(result["warnings"].as_array().unwrap().len(), 2);
+        assert_partial_import_warning(&mut app, "partial.idml");
+    }
+
+    #[test]
+    fn native_open_reports_partial_import_warnings_without_losing_documents() {
+        let path = std::env::temp_dir().join(format!("designcraft-partial-import-{}", std::process::id())).join("partial.idml");
+        std::fs::create_dir_all(path.parent().unwrap()).unwrap();
+        std::fs::write(&path, idml(true)).unwrap();
+        let picked = path.to_string_lossy().to_string();
+        let mut app = app();
+        let result = app.run("app.openDialog", json!({"path": picked}));
+        std::fs::remove_file(&path).unwrap();
+        std::fs::remove_dir(path.parent().unwrap()).unwrap();
+        assert_eq!(result.unwrap()["warnings"].as_array().unwrap().len(), 2);
+        assert_partial_import_warning(&mut app, "partial.idml");
+    }
+
+    #[test]
+    fn inbox_open_reports_partial_import_warnings_without_losing_documents() {
+        let mut app = app();
+        let request = app.import_request("open");
+        app.services.inbox.as_ref().unwrap().lock().unwrap().push(ImportedFile { request, name: "partial.idml".into(), bytes: idml(true) });
+        app.drain_inbox();
+        assert_partial_import_warning(&mut app, "partial");
+    }
+
+    #[test]
+    fn find_font_on_open_outranks_the_warning_alert() {
+        let mut app = app();
+        app.run("frame.create", json!({"rect": [0, 0, 200, 200], "content": "text", "text": "Sample"})).unwrap();
+        let d = std::sync::Arc::make_mut(&mut app.session.doc_mut().unwrap().doc);
+        let sid = *d.stories.keys().next().unwrap();
+        let story = d.story_mut(sid).unwrap();
+        story.format_chars(0..6, |f| f.over.font_family = Some("Unavailable Test Family".into()));
+        story.paras[0].para.grep_styles = Some(vec![designcraft_doc::GrepStyle { style: "Keep".into(), pattern: "[a-".into() }]);
+        let path = std::env::temp_dir().join(format!("designcraft-font-warning-{}.designcraft", std::process::id()));
+        app.run("file.save", json!({"path": path})).unwrap();
+        let result = app.open_file("file.open", json!({"path": path}));
+        std::fs::remove_file(&path).unwrap();
+        assert_eq!(result.unwrap()["warnings"].as_array().unwrap().len(), 1);
+        assert_eq!(app.ui.dialog.as_ref().unwrap().id, "findFont");
+        assert!(app.ui.status.contains("GREP style not applied"), "{}", app.ui.status);
+    }
+
+    #[test]
+    fn complete_import_does_not_show_a_warning() {
+        let mut app = app();
+        let result = app
+            .open_file("file.openBytes", json!({"name": "complete.idml", "base64": designcraft_engine::cmd::base64_encode(&idml(false))}))
+            .unwrap();
+        assert_eq!(result["warnings"], json!([]));
+        assert!(app.ui.dialog.is_none());
+        assert!(app.ui.status.is_empty());
+        assert_eq!(app.session.documents().len(), 2);
+    }
+}
+
+#[cfg(test)]
+pub(crate) mod browser_import_tests {
+    use super::*;
+
+    fn app() -> DesignApp {
+        let mut app = DesignApp::new(Session::new(), Services { inbox: Some(Inbox::default()), ..Default::default() });
+        app.run("file.new", json!({"title": "A"})).unwrap();
+        app
+    }
+    fn deliver(app: &mut DesignApp, request: ImportRequest, name: &str, bytes: Vec<u8>) {
+        app.services.inbox.as_ref().unwrap().lock().unwrap().push(ImportedFile { request, name: name.into(), bytes });
+        app.drain_inbox();
+    }
+    fn image() -> Vec<u8> {
+        br##"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="10" height="10" fill="#ff0000"/></svg>"##.to_vec()
+    }
+    fn pdf_pages(count: usize) -> Vec<u8> {
+        let kids = (0..count).map(|i| format!("{} 0 R", 3 + i * 2)).collect::<Vec<_>>().join(" ");
+        let mut objects = vec!["<< /Type /Catalog /Pages 2 0 R >>".to_string(), format!("<< /Type /Pages /Kids [{kids}] /Count {count} >>")];
+        for (i, color) in ["1 0 0", "0 1 0", "0 0 1"].iter().take(count).enumerate() {
+            let content = format!("{color} rg 0 0 200 200 re f\n");
+            objects.push(format!("<< /Type /Page /Parent 2 0 R /MediaBox [0 0 200 200] /Resources << >> /Contents {} 0 R >>", 4 + i * 2));
+            objects.push(format!("<< /Length {} >>\nstream\n{content}endstream", content.len()));
+        }
+        let mut result = "%PDF-1.4\n".to_string();
+        let mut offsets = Vec::new();
+        for (i, object) in objects.iter().enumerate() {
+            offsets.push(result.len());
+            result.push_str(&format!("{} 0 obj\n{object}\nendobj\n", i + 1));
+        }
+        let xref = result.len();
+        result.push_str(&format!("xref\n0 {}\n0000000000 65535 f \n", offsets.len() + 1));
+        for offset in offsets {
+            result.push_str(&format!("{offset:010} 00000 n \n"));
+        }
+        result.push_str(&format!("trailer\n<< /Size {} /Root 1 0 R >>\nstartxref\n{xref}\n%%EOF\n", objects.len() + 1));
+        result.into_bytes()
+    }
+    pub(crate) fn pdf() -> Vec<u8> {
+        pdf_pages(3)
+    }
+
+    #[test]
+    fn picker_receives_context_before_returning_and_cancel_does_not_edit() {
+        let captured = std::sync::Arc::new(std::sync::Mutex::new(None));
+        let copy = captured.clone();
+        let mut app = app();
+        app.services.open_async = Some(Box::new(move |request| *copy.lock().unwrap() = Some(request)));
+        let uid = app.session.doc().unwrap().uid;
+        app.pick_and_open("place").unwrap();
+        app.run("file.new", json!({"title": "B"})).unwrap();
+        let request = captured.lock().unwrap().take().unwrap();
+        assert_eq!(request.purpose, "place");
+        assert_eq!(request.target, Some(uid));
+        assert!(app.session.documents().iter().all(|d| d.doc.assets.is_empty()));
+        deliver(&mut app, request, "broken.pdf", b"not a PDF".to_vec());
+        assert!(app.session.documents().iter().all(|d| d.doc.assets.is_empty()));
+        assert!(app.pending_pdf.is_none());
+    }
+
+    #[test]
+    fn delayed_place_activates_original_document_and_undo_belongs_to_it() {
+        let mut app = app();
+        let request = app.import_request("place");
+        app.run("file.new", json!({"title": "B"})).unwrap();
+        deliver(&mut app, request, "red.svg", image());
+        assert_eq!(app.session.active_index(), Some(0));
+        assert_eq!(app.session.documents()[0].doc.assets.len(), 1);
+        assert!(app.session.documents()[1].doc.assets.is_empty());
+        app.run("edit.undo", json!({})).unwrap();
+        assert!(app.session.doc().unwrap().doc.assets.is_empty());
+        app.run("edit.redo", json!({})).unwrap();
+        assert_eq!(app.session.doc().unwrap().doc.assets.len(), 1);
+    }
+
+    #[test]
+    fn closed_target_is_not_replaced_by_a_reused_tab_index() {
+        let mut app = app();
+        let request = app.import_request("place");
+        app.run("file.close", json!({})).unwrap();
+        app.run("file.new", json!({"title": "replacement"})).unwrap();
+        deliver(&mut app, request, "red.svg", image());
+        assert!(app.session.doc().unwrap().doc.assets.is_empty());
+    }
+
+    #[test]
+    fn closing_earlier_tab_does_not_shift_import_target() {
+        let mut app = app();
+        app.run("file.new", json!({"title": "target"})).unwrap();
+        let request = app.import_request("place");
+        app.run("file.new", json!({"title": "other"})).unwrap();
+        app.run("file.close", json!({"index": 0})).unwrap();
+        deliver(&mut app, request, "red.svg", image());
+        assert_eq!(app.session.doc().unwrap().doc.title, "target");
+        assert_eq!(app.session.documents()[0].doc.assets.len(), 1);
+        assert!(app.session.documents()[1].doc.assets.is_empty());
+    }
+
+    #[test]
+    fn layout_place_and_open_preserve_explicit_intent() {
+        let mut source = Session::new();
+        source.execute("file.new", &json!({"title": "source"})).unwrap();
+        source.execute("frame.create", &json!({"rect": [10, 10, 50, 50], "content": "text", "text": "placed"})).unwrap();
+        let native = designcraft_engine::cmd::to_bytes(&source.doc().unwrap().doc).unwrap();
+        let idml = designcraft_idml::export_idml(&source.doc().unwrap().doc);
+        for (name, bytes) in [("source.designcraft", native), ("source.idml", idml)] {
+            let mut app = app();
+            let request = app.import_request("place");
+            deliver(&mut app, request, name, bytes.clone());
+            assert_eq!(app.session.documents().len(), 1);
+            assert_eq!(app.session.doc().unwrap().doc.title, "A");
+            assert!(app.session.doc().unwrap().doc.stories.values().any(|s| s.text == "placed"));
+            app.run("edit.undo", json!({})).unwrap();
+            assert!(app.session.doc().unwrap().doc.stories.is_empty());
+            app.run("edit.redo", json!({})).unwrap();
+            assert!(!app.session.doc().unwrap().doc.stories.is_empty());
+            let request = app.import_request("open");
+            deliver(&mut app, request, name, bytes);
+            assert_eq!(app.session.documents().len(), 2);
+        }
+    }
+
+    #[test]
+    fn pdf_options_keep_bytes_target_and_selected_page() {
+        let mut app = app();
+        let bytes = pdf();
+        let request = app.import_request("place");
+        deliver(&mut app, request, "three.pdf", bytes.clone());
+        assert!(app.session.doc().unwrap().doc.assets.is_empty());
+        assert_eq!(app.ui.dialog.as_ref().unwrap().id, "pdfImport");
+        app.run("file.new", json!({"title": "B"})).unwrap();
+        app.ui.dialog.as_mut().unwrap().fields.insert("page".into(), json!("2"));
+        dialogs::confirm(&mut app).unwrap();
+        assert_eq!(app.session.active_index(), Some(0));
+        let asset = app.session.doc().unwrap().doc.assets.values().next().unwrap();
+        assert_eq!(asset.page, 1);
+        assert_eq!(*asset.data, bytes);
+        assert!(app.pending_pdf.is_none());
+        assert!(app.session.documents()[1].doc.assets.is_empty());
+        app.run("place.drop", json!({"x": 36, "y": 36})).unwrap();
+        let exported = app.run("file.exportPdf", json!({})).unwrap();
+        let exported = designcraft_engine::cmd::base64_decode(exported["base64"].as_str().unwrap());
+        let pixels = designcraft_render::render_pdf_page(&exported, 0, 400).unwrap();
+        assert!(pixels.data().iter().filter(|p| p.g > 240 && p.r < 10 && p.b < 10).count() > 1000);
+        assert_eq!(pixels.data().iter().filter(|p| p.r > 240 && p.g < 10 && p.b < 10).count(), 0);
+    }
+
+    #[test]
+    fn pdf_options_refuse_a_page_range_instead_of_placing_page_one() {
+        for spec in ["4-5", "2,5", "2-3", "2.5", "-3", "0", "nan", "inf"] {
+            let mut app = app();
+            let request = app.import_request("place");
+            deliver(&mut app, request, "three.pdf", pdf());
+            app.ui.dialog.as_mut().unwrap().fields.insert("page".into(), json!(spec));
+            assert!(dialogs::confirm(&mut app).is_err(), "{spec}");
+            assert!(app.session.doc().unwrap().doc.assets.is_empty(), "{spec}");
+            assert_eq!(app.ui.dialog.as_ref().unwrap().id, "pdfImport", "{spec}");
+        }
+    }
+
+    #[test]
+    fn place_loads_the_cursor_unless_a_frame_can_take_the_graphic() {
+        let mut app = app();
+        let items = |app: &DesignApp| app.session.doc().unwrap().doc.spreads[0].items.len();
+        // Nothing selected: the graphic waits in the place cursor; Escape unloads it.
+        let request = app.import_request("place");
+        deliver(&mut app, request, "red.svg", image());
+        assert_eq!(app.session.tool_id(), "placeGun");
+        assert!(app.session.loaded.is_some());
+        assert_eq!(items(&app), 0);
+        let mods = designcraft_tools::Mods::default();
+        app.session.tool_key(designcraft_tools::ToolKey::Escape, mods, designcraft_engine::ViewInfo::at_zoom(1.0)).unwrap();
+        assert_eq!(app.session.tool_id(), "selection");
+        assert!(app.session.loaded.is_none());
+        // A click with the loaded cursor places the graphic at its natural size.
+        let request = app.import_request("place");
+        deliver(&mut app, request, "red.svg", image());
+        app.run("place.drop", json!({"x": 100, "y": 100})).unwrap();
+        let it = app.session.doc().unwrap().doc.spreads[0].items.last().unwrap();
+        assert_eq!(it.bounds(), designcraft_geom::Rect::new(100.0, 100.0, 107.5, 107.5), "10 CSS px = 7.5 pt");
+        // An empty graphic frame selected: the graphic fills it.
+        let f = app.run("frame.create", json!({"rect": [200, 200, 300, 300], "content": "graphic"})).unwrap()["id"].as_u64().unwrap();
+        app.run("selection.set", json!({"ids": [f]})).unwrap();
+        let request = app.import_request("place");
+        deliver(&mut app, request, "red.svg", image());
+        assert_eq!(app.session.tool_id(), "selection");
+        assert!(app.session.loaded.is_none());
+        assert_eq!(items(&app), 2);
+        let frame = app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(f)).unwrap();
+        assert!(matches!(frame.content, designcraft_doc::Content::Graphic(_)));
+    }
+
+    #[test]
+    fn pdf_options_reject_oversized_page_without_editing() {
+        let mut app = app();
+        for page in [0_u64, 4, 4_294_967_296, 4_294_967_297, u64::MAX] {
+            let request = app.import_request("place");
+            deliver(&mut app, request, "three.pdf", pdf());
+            app.ui.dialog.as_mut().unwrap().fields.insert("page".into(), json!(page.to_string()));
+            // The native dialog clamps zero to one; positive invalid pages must fail.
+            if page == 0 {
+                assert!(app.confirm_pdf_import(page, "crop".into()).is_err());
+            } else {
+                assert!(dialogs::confirm(&mut app).is_err());
+            }
+            app.ui.dialog = None;
+            assert!(app.session.doc().unwrap().doc.assets.is_empty());
+            assert!(app.pending_pdf.is_none());
+        }
+        let request = app.import_request("place");
+        deliver(&mut app, request, "three.pdf", pdf());
+        app.ui.dialog.as_mut().unwrap().fields.insert("page".into(), json!("2"));
+        dialogs::confirm(&mut app).unwrap();
+        assert_eq!(app.session.doc().unwrap().doc.assets.values().next().unwrap().page, 1);
+    }
+
+    #[test]
+    fn drop_routing_and_nonlayout_open_remain_compatible() {
+        let mut app = app();
+        let native = designcraft_engine::cmd::to_bytes(&app.session.doc().unwrap().doc).unwrap();
+        let request = app.import_request("drop");
+        deliver(&mut app, request, "document.designcraft", native);
+        assert_eq!(app.session.documents().len(), 2);
+        let request = app.import_request("drop");
+        app.run("file.activate", json!({"index": 0})).unwrap();
+        deliver(&mut app, request, "red.svg", image());
+        assert_eq!(app.session.active_index(), Some(1));
+        assert_eq!(app.session.doc().unwrap().doc.assets.len(), 1);
+        let request = app.import_request("open");
+        deliver(&mut app, request, "single.pdf", pdf_pages(1));
+        assert_eq!(app.session.documents().len(), 2);
+        assert!(app.pending_pdf.is_none());
+        assert!(app.ui.dialog.is_none());
+    }
+
+    #[test]
+    fn ase_swatches_keep_purpose_and_target() {
+        let mut source = Session::new();
+        source.execute("file.new", &json!({})).unwrap();
+        source.execute("swatch.create", &json!({"name": "Import Teal", "color": "#108080"})).unwrap();
+        let data = source.execute("swatch.save", &json!({"names": ["Import Teal"]})).unwrap();
+        let bytes = designcraft_engine::cmd::base64_decode(data["base64"].as_str().unwrap());
+        for (purpose, name) in [("swatches", "picker-file"), ("drop", "palette.ase")] {
+            let mut app = app();
+            let request = app.import_request(purpose);
+            app.run("file.new", json!({"title": "B"})).unwrap();
+            deliver(&mut app, request, name, bytes.clone());
+            assert_eq!(app.session.active_index(), Some(0));
+            assert!(app.session.documents()[0].doc.swatches.iter().any(|s| s.name == "Import Teal"));
+            assert!(!app.session.documents()[1].doc.swatches.iter().any(|s| s.name == "Import Teal"));
+        }
+    }
+
+    #[test]
+    fn native_pdf_dialog_keeps_path_and_uid_at_confirmation() {
+        let mut app = app();
+        let path = std::env::temp_dir().join(format!("designcraft-native-import-{}-{}.pdf", std::process::id(), app.session.doc().unwrap().uid));
+        std::fs::write(&path, pdf()).unwrap();
+        let pick_path = path.to_string_lossy().to_string();
+        app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(Some(pick_path)));
+        app.services.read = Some(Box::new(|path| std::fs::read(path).map_err(|e| e.to_string())));
+        app.pick_and_open("place").unwrap();
+        app.settle_dialogs();
+        assert_eq!(app.ui.dialog.as_ref().unwrap().id, "pdfImport");
+        app.run("file.new", json!({"title": "B"})).unwrap();
+        app.ui.dialog.as_mut().unwrap().fields.insert("page".into(), json!("2"));
+        dialogs::confirm(&mut app).unwrap();
+        assert_eq!(app.session.active_index(), Some(0));
+        assert_eq!(app.session.doc().unwrap().doc.assets.values().next().unwrap().page, 1);
+        assert!(app.session.documents()[1].doc.assets.is_empty());
+        std::fs::remove_file(path).unwrap();
+    }
+
+    #[test]
+    fn pending_pdf_cancel_close_supersession_and_second_delivery_release_bytes() {
+        let mut app = app();
+        let request = app.import_request("place");
+        deliver(&mut app, request.clone(), "first.pdf", pdf());
+        deliver(&mut app, request.clone(), "second.svg", image());
+        assert_eq!(app.pending_pdf.as_ref().unwrap().name, "first.pdf");
+        assert!(app.session.doc().unwrap().doc.assets.is_empty());
+        app.ui.dialog = None;
+        app.drain_inbox();
+        assert!(app.pending_pdf.is_none());
+        deliver(&mut app, request.clone(), "first.pdf", pdf());
+        app.ui.dialog = Some(dialogs::Dialog::new("newDocument", json!({})));
+        app.drain_inbox();
+        assert!(app.pending_pdf.is_none());
+        app.ui.dialog = None;
+        deliver(&mut app, request, "first.pdf", pdf());
+        app.run("file.close", json!({})).unwrap();
+        app.run("file.new", json!({})).unwrap();
+        assert!(dialogs::confirm(&mut app).is_err());
+        assert!(app.pending_pdf.is_none());
+        assert!(app.session.doc().unwrap().doc.assets.is_empty());
+    }
+}
+
+#[cfg(test)]
+mod load_styles_tests {
+    use super::*;
+
+    /// A client's document on disk: Head based on Body, and a Lead character style.
+    fn client_bytes() -> Vec<u8> {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Body", "chars": {"size": 10}})).unwrap();
+        s.execute("style.paragraph.create", &json!({"name": "Head", "basedOn": "Body", "chars": {"size": 20}})).unwrap();
+        s.execute("style.character.create", &json!({"name": "Lead", "chars": {"size": 9}})).unwrap();
+        designcraft_engine::cmd::base64_decode(s.execute("file.serialize", &json!({})).unwrap()["base64"].as_str().unwrap())
+    }
+
+    /// An app with a document that has its own 8 pt Body, and a picker that answers with the client's file.
+    fn app_and_file(test: &str) -> (DesignApp, std::path::PathBuf) {
+        let path = std::env::temp_dir().join(format!("designcraft-load-styles-{}-{test}.designcraft", std::process::id()));
+        std::fs::write(&path, client_bytes()).unwrap();
+        let picked = path.to_string_lossy().to_string();
+        let mut app = DesignApp::new(Session::new(), Services::default());
+        app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(Some(picked)));
+        app.run("file.new", json!({})).unwrap();
+        app.run("style.paragraph.create", json!({"name": "Body", "chars": {"size": 8}})).unwrap();
+        (app, path)
+    }
+
+    fn names(app: &DesignApp) -> (Vec<String>, Vec<String>) {
+        let st = &app.session.doc().unwrap().doc.styles;
+        (st.paragraph.iter().skip(2).map(|s| s.name.clone()).collect(), st.character.iter().skip(1).map(|s| s.name.clone()).collect())
+    }
+
+    #[test]
+    fn load_all_text_styles_asks_which_styles_of_the_picked_file_to_load() {
+        let (mut app, path) = app_and_file("all");
+        app.run("app.loadTextStyles", json!({})).unwrap();
+        app.settle_dialogs();
+        let d = app.ui.dialog.as_mut().expect("the Load Styles dialog");
+        let row = |name: &str, conflict: bool| json!({"name": name, "conflict": conflict});
+        assert_eq!(d.id, "loadStyles");
+        assert_eq!(d.fields["paragraph"], json!([row("[Basic Paragraph]", false), row("Body", true), row("Head", false)]));
+        assert_eq!(d.fields["character"], json!([row("Lead", false)]));
+        // Lead is unchecked; the rest loads, and Body takes the file's definition.
+        d.fields["character"][0]["on"] = json!(false);
+        dialogs::confirm(&mut app).unwrap();
+        std::fs::remove_file(&path).unwrap();
+        assert!(app.ui.dialog.is_none());
+        assert_eq!(names(&app), (vec!["Body".to_string(), "Head".to_string()], vec![]));
+        assert_eq!(app.session.doc().unwrap().doc.styles.para("Body").unwrap().chars.size, Some(10.0));
+    }
+
+    #[test]
+    fn the_dialog_applies_the_chosen_conflict_rule() {
+        let (mut app, path) = app_and_file("rename");
+        app.run("app.loadParagraphStyles", json!({})).unwrap();
+        app.settle_dialogs();
+        let d = app.ui.dialog.as_mut().unwrap();
+        assert_eq!(d.fields["character"], json!([]), "Load Paragraph Styles offers no character styles");
+        assert_eq!(d.fields["conflicts"], "redefine");
+        d.fields.insert("conflicts".into(), json!("autoRename"));
+        dialogs::confirm(&mut app).unwrap();
+        std::fs::remove_file(&path).unwrap();
+        assert_eq!(names(&app), (vec!["Body".to_string(), "Body 2".to_string(), "Head".to_string()], vec![]));
+        assert_eq!(app.session.doc().unwrap().doc.styles.para("Body").unwrap().chars.size, Some(8.0));
+    }
+
+    #[test]
+    fn load_character_styles_offers_only_character_styles() {
+        let (mut app, path) = app_and_file("character");
+        app.run("app.loadCharacterStyles", json!({})).unwrap();
+        app.settle_dialogs();
+        assert_eq!(app.ui.dialog.as_ref().unwrap().fields["paragraph"], json!([]));
+        dialogs::confirm(&mut app).unwrap();
+        std::fs::remove_file(&path).unwrap();
+        assert_eq!(names(&app), (vec!["Body".to_string()], vec!["Lead".to_string()]));
+    }
+
+    /// A script can put anything into the dialog's rows: drawing and ticking them must not panic.
+    #[test]
+    fn the_dialog_draws_and_ticks_rows_that_are_no_style_rows() {
+        use egui_kittest::kittest::Queryable as _;
+        let mut h = test_window::open(DesignApp::new(Session::new(), Services::default()), egui::vec2(1200.0, 800.0));
+        h.state_mut().app.ui.dialog = Some(dialogs::Dialog::new(
+            "loadStyles",
+            json!({"path": "x", "conflicts": 3, "paragraph": [1, "Body", null, {"name": 7}, {"name": "Head", "conflict": true}], "character": "none"}),
+        ));
+        h.run_steps(3);
+        let button = h.get_by_label("Deselect All").rect().center();
+        test_window::click_at(&mut h, button);
+        let d = h.state().app.ui.dialog.as_ref().unwrap();
+        assert_eq!(d.fields["paragraph"][4]["on"], false);
+        assert_eq!(d.fields["paragraph"][0], 1, "what is no style row stays as it is");
+        assert!(dialogs::confirm(&mut h.state_mut().app).is_err(), "there is no file `x`");
+    }
+
+    #[test]
+    fn no_file_or_no_document_opens_no_dialog() {
+        let (mut app, path) = app_and_file("none");
+        std::fs::remove_file(&path).unwrap();
+        // The picked file can't be read: the status line says so.
+        app.run("app.loadTextStyles", json!({})).unwrap();
+        app.settle_dialogs();
+        assert!(app.ui.dialog.as_ref().is_none_or(|d| d.id != "loadStyles"));
+        assert!(!app.ui.status.is_empty());
+        // The picker is cancelled.
+        app.ui.dialog = None;
+        app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(None));
+        app.run("app.loadTextStyles", json!({})).unwrap();
+        app.settle_dialogs();
+        assert!(app.ui.dialog.is_none());
+        // No document: the picker isn't shown at all.
+        app.run("file.close", json!({})).unwrap();
+        app.answer_dialogs(|_| panic!("asked for a file without a document"));
+        assert!(app.run("app.loadTextStyles", json!({})).is_err());
+        app.settle_dialogs();
+    }
+
+    #[test]
+    fn styles_from_an_asynchronous_picker_load_into_the_document_that_asked() {
+        let asked = std::sync::Arc::new(std::sync::Mutex::new(Vec::new()));
+        let seen = asked.clone();
+        let services = Services {
+            inbox: Some(Inbox::default()),
+            open_async: Some(Box::new(move |request| seen.lock().unwrap().push(request))),
+            ..Default::default()
+        };
+        let mut app = DesignApp::new(Session::new(), services);
+        app.run("file.new", json!({"title": "A"})).unwrap();
+        app.run("app.loadCharacterStyles", json!({})).unwrap();
+        let request = asked.lock().unwrap().pop().expect("the picker was asked");
+        assert_eq!(request.purpose, "styles:character");
+        // Another document is in front when the file arrives.
+        app.run("file.new", json!({"title": "B"})).unwrap();
+        app.services.inbox.as_ref().unwrap().lock().unwrap().push(ImportedFile { request, name: "client.designcraft".into(), bytes: client_bytes() });
+        app.drain_inbox();
+        assert_eq!(app.session.active_index(), Some(0));
+        assert_eq!(names(&app), (vec![], vec!["Lead".to_string()]));
+        assert!(app.session.documents()[1].doc.styles.char_style("Lead").is_none());
+    }
+}
diff --git a/crates/ui-egui/src/app/frame.rs b/crates/ui-egui/src/app/frame.rs
new file mode 100644
index 000000000..ceeb28743
--- /dev/null
+++ b/crates/ui-egui/src/app/frame.rs
@@ -0,0 +1,160 @@
+#[cfg(not(target_arch = "wasm32"))]
+use super::json;
+use super::{DesignApp, canvas, chrome, new_document, now_ms, theme, updates_ui};
+
+impl DesignApp {
+    /// Install the UI fonts on the first frame, and again when the language or the system fonts change.
+    fn update_fonts(&mut self, ctx: &egui::Context) {
+        if !self.styled {
+            // The UI scale is a preference (applied above); egui's own Cmd+Plus/Minus/0 would rescale the
+            // whole window instead of the canvas, only to be reset next frame.
+            ctx.options_mut(|o| o.zoom_with_keyboard = false);
+            self.fonts_system = theme::install_fonts(ctx, &self.ui.language);
+            self.fonts_lang = self.ui.language.clone();
+            self.styled = true;
+            self.restyle = true;
+        } else {
+            if self.fonts_lang != self.ui.language || (!self.fonts_system && theme::system_fonts_ready()) {
+                self.fonts_system = theme::install_fonts(ctx, &self.ui.language);
+                self.fonts_lang = self.ui.language.clone();
+            }
+            self.fonts_ready = true;
+        }
+    }
+
+    /// Work whose identity is a consumed queue item, revision or deadline.
+    pub(super) fn logic_tick(&mut self, ctx: &egui::Context) {
+        self.update_screenshot_epoch(ctx);
+        self.drain_control(ctx);
+        updates_ui::tick(self, ctx);
+        #[cfg(not(target_arch = "wasm32"))]
+        let _ = self.dialog_wake.set(ctx.clone());
+        if self.fonts_ready && !self.host_order_pending() {
+            #[cfg(not(target_arch = "wasm32"))]
+            self.handle_file_dialog_answers();
+            self.drain_inbox();
+            self.open_os_documents();
+        }
+        if self.host_order_pending() {
+            ctx.request_repaint();
+        }
+        self.collect_screenshots(ctx);
+        // Ending a stale preview is state cleanup after a control/menu action, not a frame effect:
+        // it stays here so a hidden tick still closes a preview whose dialog has gone.
+        if !self.host_order_pending() {
+            new_document::end_stale_preview(self);
+        }
+        self.request_hidden_paint_for_pending_input(ctx);
+        self.handle_quit(ctx);
+        self.flush_window_commands(ctx);
+    }
+
+    /// The first pass of a real `run_ui`: fonts, theme, scale and window state, before any widget
+    /// is laid out. It must run before the font gate in [`Self::ui`], or the app would wait for
+    /// fonts that this function is what installs.
+    pub(crate) fn ui_setup(&mut self, ctx: &egui::Context) {
+        #[cfg(test)]
+        {
+            self.logic_frame_ticks += 1;
+        }
+        if self.egui_ctx.is_none() {
+            self.egui_ctx = Some(ctx.clone());
+        }
+        crate::keys::note_platform(ctx);
+        self.sync_keymap();
+        self.window_maximized = ctx.input(|i| i.viewport().maximized.unwrap_or(false));
+        self.apply_saved_color_settings();
+        let scale = self.ui.ui_scale.clamp(0.5, 3.0);
+        if (ctx.zoom_factor() - scale).abs() > 1e-3 {
+            ctx.set_zoom_factor(scale);
+        }
+        self.update_fonts(ctx);
+        if !self.fonts_system {
+            // The font scan runs in the background: look again shortly.
+            ctx.request_repaint_after(std::time::Duration::from_millis(250));
+        }
+        if self.restyle {
+            theme::apply(ctx, &theme::Tokens::for_brightness(self.ui.brightness));
+            self.restyle = false;
+        }
+    }
+
+    /// The end of a settled `run_ui` pass: pacing, recovery and screenshot settlement. Recovery
+    /// uses the monotonic clock, so a wall-clock/NTP jump cannot postpone or advance it.
+    pub(super) fn ui_frame_end(&mut self, ctx: &egui::Context) {
+        let now = now_ms() / 1000.0;
+        // Crash recovery: unsaved documents are written to the recovery folder every 30 s.
+        #[cfg(not(target_arch = "wasm32"))]
+        if self.session.recovery_dir.is_some() && now - self.last_recovery > (self.session.prefs.recovery_minutes * 60.0).max(5.0) {
+            self.last_recovery = now;
+            if self.session.documents().iter().any(|d| d.is_dirty())
+                && let Err(e) = self.session.execute("file.recovery.save", &json!({}))
+            {
+                self.status(crate::i18n::tr(&self.ui.language, "Couldn't write recovery data: {error}").replace("{error}", &e.to_string()));
+            }
+        }
+        let dt = now - self.last_time;
+        if dt > 0.0 {
+            self.perf.fps = self.perf.fps * 0.9 + (1.0 / dt).min(240.0) * 0.1;
+        }
+        self.last_time = now;
+        self.issue_screenshots(ctx);
+    }
+
+    /// The document area: the start screen, or the document tabs over one or two canvas panes.
+    pub(crate) fn canvas_area(&mut self, ui: &mut egui::Ui, presenting: bool) {
+        let t = theme::Tokens::get(ui.ctx());
+        if self.session.active().is_none() {
+            chrome::start_screen(self, ui);
+            return;
+        }
+        if !presenting {
+            chrome::doc_tabs(self, ui);
+        }
+        let split_layout = (self.split && !presenting)
+            .then(|| {
+                craft_ui::layout::split_rect(
+                    ui.available_rect_before_wrap(),
+                    craft_ui::layout::SplitAxis::Horizontal,
+                    craft_ui::layout::SplitSize::Ratio(0.5),
+                    2.0,
+                    0.0,
+                )
+            })
+            .flatten();
+        if let Some(layout) = split_layout {
+            // Two panes with a divider; each has its own view (zoom, scroll) and render cache.
+            ui.painter().rect_filled(layout.divider, 0.0, t.border);
+            // Resolve the clicked pane before either canvas handles this frame's keys.
+            if let Some(p) = ui.input(|i| i.pointer.any_pressed().then(|| i.pointer.interact_pos()).flatten()) {
+                if layout.first.contains(p) {
+                    self.focus_pane = 0;
+                } else if layout.second.contains(p) {
+                    self.focus_pane = 1;
+                }
+            }
+            for (k, half) in [layout.first, layout.second].into_iter().enumerate() {
+                self.switch_pane(k as u8);
+                // A new pane starts at the other pane's view.
+                if k == 1 && self.view().is_none() {
+                    self.switch_pane(0);
+                    let v = self.view().copied();
+                    self.switch_pane(1);
+                    if let (Some(mut v), Some(m)) = (v, self.view_mut()) {
+                        v.fitted = false;
+                        *m = v;
+                    }
+                }
+                ui.scope_builder(egui::UiBuilder::new().max_rect(half), |ui| canvas::show(self, ui));
+            }
+            self.switch_pane(self.focus_pane);
+        } else {
+            self.switch_pane(0);
+            // With a second window, the main one takes the focus back when clicked.
+            if !self.second_window || (ui.input(|i| i.pointer.any_pressed()) && ui.ui_contains_pointer()) {
+                self.focus_pane = 0;
+            }
+            canvas::show(self, ui);
+        }
+    }
+}
diff --git a/crates/ui-egui/src/app/ime.rs b/crates/ui-egui/src/app/ime.rs
new file mode 100644
index 000000000..6f36d7235
--- /dev/null
+++ b/crates/ui-egui/src/app/ime.rs
@@ -0,0 +1,23 @@
+use super::DesignApp;
+
+impl DesignApp {
+    /// Did an IME composition end outside the IME this frame (a click, a tool switch)? egui's
+    /// `should_interrupt_composition` toggles winit's IME, which doesn't reach the macOS input
+    /// context: it keeps the marked text and types it again into the next composition, so the
+    /// host discards it there.
+    pub fn take_ime_discard(&mut self) -> bool {
+        std::mem::take(&mut self.ime_discard)
+    }
+
+    /// Did the canvas ask for the system IME in the last frame (a Type tool caret)? The web
+    /// build's hidden text input has the keyboard then, so text events hold what the browser
+    /// typed (see [`drop_key_name_text`]).
+    pub fn canvas_ime(&self) -> bool {
+        self.canvas_ime
+    }
+
+    /// The second window uses a stable viewport id; forget its IME context when it closes.
+    pub(crate) fn end_second_ime_viewport(&mut self) {
+        self.ime_tracker.end_viewport(egui::ViewportId::from_hash_of("designcraft_second_window"));
+    }
+}
diff --git a/crates/ui-egui/src/app/input.rs b/crates/ui-egui/src/app/input.rs
new file mode 100644
index 000000000..8d248561c
--- /dev/null
+++ b/crates/ui-egui/src/app/input.rs
@@ -0,0 +1,186 @@
+#[cfg(not(target_arch = "wasm32"))]
+use super::PendingDrop;
+use super::{DesignApp, InputGeneration, Value, menus};
+
+impl DesignApp {
+    /// Keep pending synthetic input and screenshot settlement repainting while the window may be
+    /// hidden.
+    ///
+    /// `visible() == None` means unknown and is treated like hidden. The command holds for one
+    /// frame and is sent once per tick until a settled UI pass has taken the injected step or
+    /// issued the queued capture.
+    pub(super) fn request_hidden_paint_for_pending_input(&self, ctx: &egui::Context) {
+        let pending = self.host_order_pending() || !self.queued_shots.is_empty();
+        if !pending || ctx.input(|i| i.viewport().visible()) == Some(true) {
+            return;
+        }
+        // The 0.37 web backend ignores `RequestPaintWhileHidden` until the fork carries it. Do not
+        // pretend a hidden-tab capture or gesture will run there; the request times out instead.
+        #[cfg(not(target_arch = "wasm32"))]
+        ctx.send_viewport_cmd(egui::ViewportCommand::RequestPaintWhileHidden);
+    }
+
+    /// Inject synthetic events (one pointer event per host iteration), retaining control
+    /// provenance until a settled UI pass has actually taken the batch.
+    pub fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
+        if !self.injected_settle_hook {
+            let pending = self.injected_pending.clone();
+            let settled = self.injected_settled.clone();
+            ctx.on_end_pass(
+                "injected input settlement",
+                std::sync::Arc::new(move |ui| {
+                    if ui.ctx().viewport_id() == egui::ViewportId::ROOT
+                        && pending.load(std::sync::atomic::Ordering::Relaxed)
+                        && !ui.ctx().will_discard()
+                    {
+                        settled.store(true, std::sync::atomic::Ordering::Relaxed);
+                    }
+                }),
+            );
+            self.injected_settle_hook = true;
+        }
+        // A settled pass that did not go through `DesignApp::ui` (a harness consuming raw input
+        // directly) still consumed the batch; acknowledge it before considering the next step.
+        if self.injected_settled.swap(false, std::sync::atomic::Ordering::Relaxed) {
+            self.synthetic_injected = false;
+            self.injected_events.clear();
+            self.injected_pending.store(false, std::sync::atomic::Ordering::Relaxed);
+            self.injected_private = false;
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let pointer = raw.events.iter().rev().find_map(|event| match event {
+                egui::Event::PointerMoved(pos) | egui::Event::PointerButton { pos, .. } => Some(*pos),
+                _ => None,
+            });
+            let generation = self.input_generation();
+            for file in std::mem::take(&mut raw.dropped_files) {
+                let path = file.path().to_string_lossy().to_string();
+                if !path.is_empty() {
+                    self.pending_drops.push(PendingDrop { path, pointer, generation });
+                }
+            }
+        }
+        self.discard_stale_injected_batch(raw);
+        // A batch acknowledged by the previous pass keeps its private provenance through that
+        // pass's end hook (the clipboard guard), and is cleared at the next host iteration.
+        if !self.synthetic_injected {
+            self.injected_private = false;
+        }
+        let private = self.injected_private || !self.control_synthetic.is_empty();
+        self.control_input_frame.store(private, std::sync::atomic::Ordering::Relaxed);
+        // While the previous batch is still unapplied (it lives in eframe's pending raw input),
+        // inject nothing more: one pointer step per UI pass, not per hidden logic tick.
+        if self.synthetic_injected {
+            return;
+        }
+        let private = !self.control_synthetic.is_empty();
+        let events = if private { &mut self.control_synthetic } else { &mut self.synthetic };
+        let Some(first) = events.first() else { return };
+        let n = match first {
+            egui::Event::PointerMoved(_) | egui::Event::PointerButton { .. } => 1,
+            _ => events.iter().position(|e| matches!(e, egui::Event::Key { pressed: false, .. })).map_or(events.len(), |i| i + 1),
+        };
+        let batch: Vec<egui::Event> = events.drain(..n).collect();
+        self.injected_generation = self.input_generation();
+        self.injected_private = private;
+        self.injected_events = batch.clone();
+        self.injected_pending.store(true, std::sync::atomic::Ordering::Relaxed);
+        raw.events.extend(batch);
+        // Held until a settled UI pass runs with the fonts installed; a hidden logic tick, a
+        // discarded multipass first pass or a font-gated early return must not acknowledge it.
+        self.synthetic_injected = true;
+    }
+
+    /// Notify after enqueuing a native menu event, before waking the host. The returned callback
+    /// owns its state so the event handler never borrows the app.
+    pub fn native_action_notifier(&self, ctx: egui::Context) -> Box<dyn Fn() + Send + Sync> {
+        let pending = self.native_events_pending.clone();
+        Box::new(move || {
+            pending.store(true, std::sync::atomic::Ordering::Release);
+            ctx.request_repaint();
+        })
+    }
+
+    /// Poll from the first real UI pass, under the host's normal UI/watchdog guard. Resolve menu
+    /// choices before refreshing their IDs, then execute them once synthetic input has settled.
+    /// Event arrival already blocks logic deliveries, so a deferred action keeps its ordering
+    /// without executing native dialogs or menu commands from a hidden logic-only tick.
+    pub fn poll_native_actions(&mut self, ctx: &egui::Context, mut next: impl FnMut() -> Option<(String, Value)>) {
+        // Clear before draining: a notification arriving during the drain stays set for the
+        // next pass, even when its channel send races the final empty receive.
+        self.native_events_pending.swap(false, std::sync::atomic::Ordering::AcqRel);
+        while let Some((id, params)) = next() {
+            self.native_actions.push_back((id, params));
+        }
+        self.apply_native_actions(ctx);
+    }
+
+    /// True while an injected batch, control synthetic event or ordinary synthetic event remains queued.
+    fn synthetic_input_pending(&self) -> bool {
+        self.synthetic_injected || !self.control_synthetic.is_empty() || !self.synthetic.is_empty()
+    }
+
+    /// True when synthetic input, a queued native action or a pending native-event notification remains.
+    pub(super) fn host_order_pending(&self) -> bool {
+        self.synthetic_input_pending() || !self.native_actions.is_empty() || self.native_events_pending.load(std::sync::atomic::Ordering::Acquire)
+    }
+
+    /// Execute queued native actions only after synthetic input settles, and request another repaint while host work remains.
+    fn apply_native_actions(&mut self, ctx: &egui::Context) {
+        while !self.synthetic_input_pending() {
+            let Some((id, params)) = self.native_actions.pop_front() else { break };
+            menus::activate_native(self, ctx, &id, &params);
+        }
+        if self.host_order_pending() {
+            ctx.request_repaint();
+        }
+    }
+
+    /// The current state an injected batch belongs to.
+    pub(crate) fn input_generation(&self) -> InputGeneration {
+        InputGeneration {
+            document: self.active_document_epoch(),
+            dialog: self.ui.dialog.as_ref().map(|dialog| egui::Id::unique(&dialog.id)),
+            focus: self.egui_ctx.as_ref().and_then(|ctx| ctx.memory(|memory| memory.focused())),
+        }
+    }
+
+    /// Drop a batch whose document, dialog or focus changed before a UI pass could take it.
+    /// The batch is still in the host's pending raw input; remove exactly the events we appended
+    /// (contiguously, in order) so a subsequent forced paint cannot replay stale input.
+    fn discard_stale_injected_batch(&mut self, raw: &mut egui::RawInput) {
+        if !self.synthetic_injected || self.input_generation() == self.injected_generation {
+            return;
+        }
+        let events = std::mem::take(&mut self.injected_events);
+        if !events.is_empty()
+            && let Some(start) = raw.events.windows(events.len()).rposition(|window| window == events.as_slice())
+        {
+            raw.events.drain(start..start + events.len());
+        }
+        self.synthetic_injected = false;
+        self.injected_pending.store(false, std::sync::atomic::Ordering::Relaxed);
+        self.injected_private = false;
+        self.control_input_frame.store(false, std::sync::atomic::Ordering::Relaxed);
+    }
+
+    /// A font-gated first pass saw the events before any widget did. Put the same batch back at
+    /// the front of its queue (with the original provenance) so a later UI pass consumes it.
+    pub(super) fn requeue_injected_batch(&mut self) {
+        if !std::mem::take(&mut self.synthetic_injected) {
+            return;
+        }
+        let events = std::mem::take(&mut self.injected_events);
+        if !events.is_empty() {
+            if self.injected_private {
+                self.control_synthetic.splice(0..0, events);
+            } else {
+                self.synthetic.splice(0..0, events);
+            }
+        }
+        self.injected_pending.store(false, std::sync::atomic::Ordering::Relaxed);
+        self.injected_private = false;
+        self.control_input_frame.store(false, std::sync::atomic::Ordering::Relaxed);
+    }
+}
diff --git a/crates/ui-egui/src/app/keys.rs b/crates/ui-egui/src/app/keys.rs
new file mode 100644
index 000000000..79e6ab73a
--- /dev/null
+++ b/crates/ui-egui/src/app/keys.rs
@@ -0,0 +1,24 @@
+use super::DesignApp;
+
+impl DesignApp {
+    /// Applies `ui.shortcuts` to the keymap when they differ, e.g. after preferences were loaded,
+    /// and rebuilds it when the shortcut platform changed (the web build learns the browser's
+    /// operating system on the first frame). Outside the Keyboard Shortcuts dialog the active
+    /// shortcut set takes `ui.shortcuts` too: an earlier version may have changed them.
+    pub fn sync_keymap(&mut self) {
+        if self.shortcut_dialog.is_none() {
+            crate::keys::store_in_set(&mut self.ui);
+        }
+        if self.keymap.platform() != crate::keys::platform() {
+            self.keymap = crate::keys::new_keymap(self.ui.shortcuts.clone());
+        } else if *self.keymap.overrides() != self.ui.shortcuts {
+            self.keymap.set_overrides(self.ui.shortcuts.clone());
+        }
+    }
+
+    /// Whether the Keyboard Shortcuts dialog is recording keys: a native menu bar pauses its key
+    /// equivalents meanwhile, so the keys reach the dialog.
+    pub fn shortcut_recording(&self) -> bool {
+        self.shortcut_dialog.as_ref().is_some_and(|d| d.recording())
+    }
+}
diff --git a/crates/ui-egui/src/app/quit.rs b/crates/ui-egui/src/app/quit.rs
new file mode 100644
index 000000000..c1c67a493
--- /dev/null
+++ b/crates/ui-egui/src/app/quit.rs
@@ -0,0 +1,182 @@
+use super::{DesignApp, HashMap, QuitState, Value, json, menus};
+
+impl DesignApp {
+    /// Quit: close the window the way its close button does, so unsaved documents ask first.
+    pub fn request_quit(&mut self) {
+        self.quit_requested = true;
+    }
+
+    /// Ask about unsaved documents without closing any of them yet. A later Cancel must also
+    /// keep documents whose earlier answer was Don't Save, including their history and recovery.
+    pub(crate) fn handle_quit(&mut self, ctx: &egui::Context) {
+        let close_requested = ctx.input(|i| i.viewport().close_requested());
+        if self.host_order_pending() {
+            if close_requested {
+                self.close_requested_pending = true;
+                ctx.send_viewport_cmd(egui::ViewportCommand::CancelClose);
+            }
+            ctx.request_repaint();
+            return;
+        }
+        let replay_close = std::mem::take(&mut self.close_requested_pending);
+        if std::mem::take(&mut self.quit_requested) || replay_close {
+            ctx.send_viewport_cmd(egui::ViewportCommand::Close);
+        }
+        if close_requested || replay_close {
+            if self.quit_without_asking {
+                self.quitting = None;
+                return;
+            }
+            if self.quitting.is_none() && !self.session.documents().iter().any(|d| d.is_dirty()) {
+                return;
+            }
+            let approved =
+                self.quitting.as_ref().is_some_and(|q| q.pending.is_none()) && self.ui.dialog.is_none() && self.next_unapproved_document().is_none();
+            if approved {
+                // Commit only when the backend receives the final close, after checking for
+                // edits that arrived since the last answer. Closing also discards recovery data.
+                if let Err(e) = self.finish_confirmed_quit() {
+                    self.status(e);
+                    self.cancel_quit();
+                    ctx.send_viewport_cmd(egui::ViewportCommand::CancelClose);
+                }
+                return;
+            }
+            ctx.send_viewport_cmd(egui::ViewportCommand::CancelClose);
+            // Dock Quit can arrive while the app is hidden or minimized. Make its question
+            // visible through the normal safe window commands before asking about documents.
+            ctx.send_viewport_cmd(egui::ViewportCommand::Visible(true));
+            ctx.send_viewport_cmd(egui::ViewportCommand::Minimized(false));
+            ctx.send_viewport_cmd(egui::ViewportCommand::Focus);
+            if self.quitting.is_none() {
+                self.quitting =
+                    Some(QuitState { original_active: self.session.active().map(|d| d.uid), accepted: HashMap::new(), pending: None, saving: None });
+            }
+        }
+        let Some(q) = self.quitting.as_ref() else { return };
+        if q.saving.is_some() {
+            // Waiting for the save dialog; cancelled, it answers without saving and Quit stops.
+            if !self.file_dialogs_pending() {
+                self.cancel_quit();
+            }
+            return;
+        }
+        if let Some(uid) = q.pending {
+            let asking = self.ui.dialog.as_ref().is_some_and(|d| {
+                d.id == "closeDocument"
+                    && d.fields.get("quitting").and_then(Value::as_bool) == Some(true)
+                    && d.fields.get("uid").and_then(Value::as_u64) == Some(uid)
+            });
+            if !asking {
+                self.cancel_quit();
+            }
+            return;
+        }
+        if self.ui.dialog.is_some() {
+            self.cancel_quit();
+            return;
+        }
+        self.ask_next_unsaved(ctx);
+    }
+
+    /// Finalize a complete, still-current quit plan at an orderly host exit. The host can
+    /// terminate before egui receives its queued Close; an unfinished/stale plan leaves every
+    /// document live so the host can preserve its recovery data instead.
+    pub fn finish_confirmed_quit(&mut self) -> Result<(), String> {
+        let approved =
+            self.quitting.as_ref().is_some_and(|q| q.pending.is_none()) && self.ui.dialog.is_none() && self.next_unapproved_document().is_none();
+        if !approved {
+            return Ok(());
+        }
+        while !self.session.documents().is_empty() {
+            self.run("file.close", json!({"index": 0}))?;
+        }
+        self.quitting = None;
+        Ok(())
+    }
+
+    fn next_unapproved_document(&self) -> Option<(usize, u64)> {
+        let q = self.quitting.as_ref()?;
+        self.session
+            .documents()
+            .iter()
+            .enumerate()
+            .find(|(_, d)| d.is_dirty() && q.accepted.get(&d.uid) != Some(&d.revision))
+            .map(|(i, d)| (i, d.uid))
+    }
+
+    fn cancel_quit(&mut self) {
+        let Some(q) = self.quitting.take() else { return };
+        if let Some(i) = q.original_active.and_then(|uid| self.session.documents().iter().position(|d| d.uid == uid)) {
+            let _ = self.run("file.activate", json!({"index": i}));
+        }
+    }
+
+    /// Save/Don't Save during Quit approves this UID's current revision, without destroying it.
+    pub(crate) fn confirm_quit_document(&mut self, uid: u64, discard: bool) -> Result<Value, String> {
+        if self.quitting.as_ref().and_then(|q| q.pending) != Some(uid) {
+            return Err("Quit confirmation is no longer active".into());
+        }
+        let Some(i) = self.session.documents().iter().position(|d| d.uid == uid) else {
+            if let Some(q) = self.quitting.as_mut() {
+                q.pending = None;
+            }
+            return Ok(Value::Null);
+        };
+        if !discard {
+            if let Some(q) = self.quitting.as_mut() {
+                q.pending = None;
+                q.saving = Some(uid);
+            }
+            let saved = self.run("file.activate", json!({"index": i})).and_then(|_| menus::save_then(self, move |app| app.quit_document_saved(uid)));
+            if let Err(e) = saved {
+                self.cancel_quit();
+                return Err(e);
+            }
+            return Ok(Value::Null);
+        }
+        if let Some(q) = self.quitting.as_mut() {
+            if let Some(d) = self.session.documents().iter().find(|d| d.uid == uid) {
+                q.accepted.insert(uid, d.revision);
+            }
+            q.pending = None;
+        }
+        Ok(Value::Null)
+    }
+
+    /// The Save chosen during Quit has written `uid` (at once, or once its save dialog answered):
+    /// approve its current revision. Still unsaved, Quit stops.
+    fn quit_document_saved(&mut self, uid: u64) -> Result<Value, String> {
+        if self.quitting.as_ref().and_then(|q| q.saving) != Some(uid) {
+            return Ok(Value::Null);
+        }
+        let revision = self.session.documents().iter().find(|d| d.uid == uid).filter(|d| !d.is_dirty()).map(|d| d.revision);
+        match (revision, self.quitting.as_mut()) {
+            (Some(revision), Some(q)) => {
+                q.accepted.insert(uid, revision);
+                q.saving = None;
+            }
+            _ => self.cancel_quit(),
+        }
+        Ok(Value::Null)
+    }
+
+    /// Show the next unapproved document, or request a final close that revalidates all approvals.
+    fn ask_next_unsaved(&mut self, ctx: &egui::Context) {
+        let Some((i, uid)) = self.next_unapproved_document() else {
+            ctx.send_viewport_cmd(egui::ViewportCommand::Close);
+            return;
+        };
+        if self.run("file.activate", json!({"index": i})).is_err() {
+            self.cancel_quit();
+            return;
+        }
+        menus::close_document(self, Some(i));
+        if let Some(d) = self.ui.dialog.as_mut() {
+            d.fields.insert("quitting".into(), json!(true));
+        }
+        if let Some(q) = self.quitting.as_mut() {
+            q.pending = Some(uid);
+        }
+    }
+}
diff --git a/crates/ui-egui/src/app/screenshot.rs b/crates/ui-egui/src/app/screenshot.rs
new file mode 100644
index 000000000..90422c1c8
--- /dev/null
+++ b/crates/ui-egui/src/app/screenshot.rs
@@ -0,0 +1,282 @@
+use super::{
+    ControlResponse, DesignApp, SCREENSHOT_MAX_AGGREGATE_BYTES, SCREENSHOT_MAX_IMAGE_BYTES, SCREENSHOT_MAX_REQUESTS, ScreenshotGeometry, Sender,
+    ShotRequest, json, now_ms,
+};
+
+impl DesignApp {
+    /// Advance the screenshot geometry epoch whenever size, DPI, zoom or surface change.
+    pub(super) fn update_screenshot_epoch(&mut self, ctx: &egui::Context) {
+        let Some(mut geometry) = screenshot_geometry(ctx) else { return };
+        geometry.document = self.active_document_epoch();
+        if self.screenshot_geometry != Some(geometry) {
+            self.screenshot_geometry = Some(geometry);
+            self.screenshot_epoch = self.screenshot_epoch.wrapping_add(1);
+        }
+    }
+
+    /// Admit one `ui.screenshot` request against the app's count and byte budgets.
+    ///
+    /// Admission happens before any capture is issued: the checked, current viewport dimensions
+    /// reserve their RGBA bytes, and queued plus completed images are counted together.
+    pub(crate) fn admit_screenshot(&mut self, path: Option<String>, reply: Sender<ControlResponse>) -> Result<u64, serde_json::Value> {
+        let Some(mut geometry) = self.screenshot_geometry else {
+            return Err(json!({"ok": false, "error": "the window geometry is not known yet"}));
+        };
+        // The cached geometry may predate a document switch handled earlier in this same logic
+        // tick. Admit for the current document, not for the one the cache last saw.
+        geometry.document = self.active_document_epoch();
+        if self.pending_shots.len() >= SCREENSHOT_MAX_REQUESTS {
+            return Err(json!({"ok": false, "error": format!("at most {SCREENSHOT_MAX_REQUESTS} screenshot requests may be outstanding")}));
+        }
+        let reserved_bytes = geometry
+            .width
+            .checked_mul(geometry.height)
+            .and_then(|pixels| pixels.checked_mul(4))
+            .ok_or_else(|| json!({"ok": false, "error": "the screenshot dimensions overflow the addressable size"}))?;
+        if reserved_bytes > SCREENSHOT_MAX_IMAGE_BYTES {
+            return Err(json!({
+                "ok": false,
+                "error": format!(
+                    "a screenshot of {}×{} exceeds the {SCREENSHOT_MAX_IMAGE_BYTES}-byte image limit",
+                    geometry.width, geometry.height
+                )
+            }));
+        }
+        let used = self.pending_shots.iter().try_fold(0usize, |total, shot| total.checked_add(shot.reserved_bytes));
+        let over_budget = used.and_then(|used| used.checked_add(reserved_bytes)).is_none_or(|total| total > SCREENSHOT_MAX_AGGREGATE_BYTES);
+        if over_budget {
+            return Err(json!({"ok": false, "error": format!("the {SCREENSHOT_MAX_AGGREGATE_BYTES}-byte screenshot budget is exhausted")}));
+        }
+        self.shot_token += 1;
+        let token = self.shot_token;
+        let now = now_ms();
+        self.queued_shots.push((token, now + 120.0, 0));
+        self.pending_shots.push(ShotRequest {
+            token,
+            path,
+            reply,
+            deadline: now + 8000.0,
+            viewport: egui::ViewportId::ROOT,
+            epoch: self.screenshot_epoch,
+            geometry,
+            reserved_bytes,
+            slot: None,
+        });
+        Ok(token)
+    }
+
+    /// The current document state (`0` when none is open). Revert preserves the UID but
+    /// gives the replacement state a new epoch, invalidating old captures and input.
+    pub(super) fn active_document_epoch(&self) -> u64 {
+        self.session.active().map_or(0, |document| document.identity_epoch)
+    }
+
+    /// Reject one admitted request: remove its admission and queued token and cancel any live
+    /// capture slot before replying with the error.
+    fn reject_screenshot(&mut self, index: usize, message: &str) {
+        let shot = self.pending_shots.remove(index);
+        self.queued_shots.retain(|(token, ..)| *token != shot.token);
+        if let Some(slot) = &shot.slot {
+            slot.cancel();
+        }
+        let _ = shot.reply.send(json!({"ok": false, "error": message}));
+    }
+
+    /// Settle and issue queued captures. Called only at the end of a settled `run_ui` pass, so
+    /// `frames` counts actual layout passes; hidden logic ticks never satisfy the three-frame
+    /// settling policy on their own.
+    pub(super) fn issue_screenshots(&mut self, ctx: &egui::Context) {
+        let now = now_ms();
+        let mut due = Vec::new();
+        self.queued_shots.retain_mut(|(token, at, frames)| {
+            *frames += 1;
+            if now >= *at && *frames >= 3 {
+                due.push(*token);
+                false
+            } else {
+                true
+            }
+        });
+        for token in due {
+            let Some(index) = self.pending_shots.iter().position(|shot| shot.token == token) else { continue };
+            if self.pending_shots[index].geometry.document != self.active_document_epoch() {
+                self.reject_screenshot(index, "the active document changed before the screenshot was issued");
+                continue;
+            }
+            let Some(current) = self.screenshot_geometry else {
+                let shot = self.pending_shots.remove(index);
+                let _ = shot.reply.send(json!({"ok": false, "error": "the window geometry is not known yet"}));
+                continue;
+            };
+            // Re-check the current dimensions before issuing: a request admitted before a resize,
+            // DPI or zoom change must renew its checked reservation (or fail, never overrun it).
+            if self.pending_shots[index].epoch != self.screenshot_epoch {
+                let bytes = current.width.checked_mul(current.height).and_then(|pixels| pixels.checked_mul(4));
+                let others = self
+                    .pending_shots
+                    .iter()
+                    .enumerate()
+                    .filter(|(i, _)| *i != index)
+                    .try_fold(0usize, |total, (_, shot)| total.checked_add(shot.reserved_bytes));
+                let reserved = bytes.zip(others).and_then(|(bytes, others)| others.checked_add(bytes).map(|total| (bytes, total)));
+                let fits = reserved.is_some_and(|(bytes, total)| bytes <= SCREENSHOT_MAX_IMAGE_BYTES && total <= SCREENSHOT_MAX_AGGREGATE_BYTES);
+                let Some((bytes, _)) = reserved else {
+                    let shot = self.pending_shots.remove(index);
+                    let _ = shot.reply.send(json!({
+                        "ok": false,
+                        "error": "the window changed and the screenshot no longer fits the admitted budget"
+                    }));
+                    continue;
+                };
+                if !fits {
+                    let shot = self.pending_shots.remove(index);
+                    let _ = shot.reply.send(json!({
+                        "ok": false,
+                        "error": "the window changed and the screenshot no longer fits the admitted budget"
+                    }));
+                    continue;
+                }
+                let shot = &mut self.pending_shots[index];
+                shot.epoch = self.screenshot_epoch;
+                shot.geometry = current;
+                shot.reserved_bytes = bytes;
+            }
+            let shot = &mut self.pending_shots[index];
+            let (slot, callback) = craft_ui::capture::CaptureSlot::new(ctx, shot.viewport, SCREENSHOT_MAX_IMAGE_BYTES);
+            shot.slot = Some(slot);
+            // The callback holds only a weak slot: it never captures the app, writes a file, runs a
+            // command or wakes the context itself (the slot's live request does that).
+            ctx.send_viewport_cmd_to(shot.viewport, egui::ViewportCommand::Screenshot(callback));
+        }
+        if !self.queued_shots.is_empty() || !self.pending_shots.is_empty() {
+            ctx.request_repaint_after(std::time::Duration::from_millis(16));
+        }
+        // The screenshot command itself forces one hidden paint; the settling frames before it do
+        // not, so ask for them while the window may be hidden. The 0.37 web backend does not yet
+        // honor this command (fork follow-up): hidden-tab captures time out there rather than
+        // pretending to settle.
+        if !self.queued_shots.is_empty() && ctx.input(|i| i.viewport().visible()) != Some(true) {
+            #[cfg(not(target_arch = "wasm32"))]
+            ctx.send_viewport_cmd(egui::ViewportCommand::RequestPaintWhileHidden);
+        }
+    }
+
+    /// Take completed captures out of their slots and write files only on this (UI) thread.
+    pub(super) fn collect_screenshots(&mut self, ctx: &egui::Context) {
+        if self.pending_shots.is_empty() {
+            return;
+        }
+        let now = now_ms();
+        let current_document = self.active_document_epoch();
+        let mut i = 0;
+        while i < self.pending_shots.len() {
+            // Check before taking the callback: a request whose document changed must not write,
+            // retry, or wait for its slot, even when no frame has completed yet.
+            if self.pending_shots.get(i).is_some_and(|shot| shot.geometry.document != current_document) {
+                self.reject_screenshot(i, "the active document changed while the screenshot was pending");
+                continue;
+            }
+            let taken = self.pending_shots.get(i).and_then(|shot| shot.slot.as_ref()).and_then(|slot| slot.take());
+            let Some(result) = taken else {
+                if now >= self.pending_shots[i].deadline {
+                    let shot = self.pending_shots.remove(i);
+                    self.queued_shots.retain(|(token, ..)| *token != shot.token);
+                    if let Some(slot) = &shot.slot {
+                        slot.cancel();
+                    }
+                    let _ = shot.reply.send(json!({"ok": false, "error": "no frame was presented (screen locked or window hidden); use ui.render"}));
+                } else {
+                    i += 1;
+                }
+                continue;
+            };
+            let (epoch_changed, within_reserved) = {
+                let shot = &self.pending_shots[i];
+                let within = match &result {
+                    Ok(image) => {
+                        let [width, height] = image.size;
+                        width <= shot.geometry.width && height <= shot.geometry.height
+                    }
+                    Err(_) => true,
+                };
+                (shot.epoch != self.screenshot_epoch, within)
+            };
+            if !epoch_changed && within_reserved {
+                let shot = self.pending_shots.remove(i);
+                self.queued_shots.retain(|(token, ..)| *token != shot.token);
+                let value = match result {
+                    Ok(image) => crate::control::save_screenshot(self, image.as_ref(), shot.path.as_deref()),
+                    Err(e) => json!({"ok": false, "error": e.to_string()}),
+                };
+                let _ = shot.reply.send(value);
+                continue;
+            }
+            let (retry, retry_token) = {
+                let shot = &self.pending_shots[i];
+                (now < shot.deadline, shot.token)
+            };
+            if let Some(slot) = self.pending_shots[i].slot.take() {
+                slot.cancel();
+            }
+            if !retry {
+                let shot = self.pending_shots.remove(i);
+                self.queued_shots.retain(|(token, ..)| *token != shot.token);
+                let message = match result {
+                    Err(e) => e.to_string(),
+                    Ok(_) if epoch_changed => "the window changed while the screenshot was captured".to_string(),
+                    Ok(_) => "the screenshot is larger than the admitted viewport".to_string(),
+                };
+                let _ = shot.reply.send(json!({"ok": false, "error": message}));
+                continue;
+            }
+            // Reject the stale pixels and retry within the same deadline with a fresh epoch.
+            self.queued_shots.push((retry_token, now + 120.0, 0));
+            i += 1;
+        }
+        if !self.queued_shots.is_empty() || !self.pending_shots.is_empty() {
+            ctx.request_repaint_after(std::time::Duration::from_millis(16));
+        }
+    }
+}
+
+/// The physical capture surface of the root viewport, from its logical rect and DPI.
+fn screenshot_geometry(ctx: &egui::Context) -> Option<ScreenshotGeometry> {
+    let zoom = ctx.zoom_factor();
+    let fallback = ctx.pixels_per_point();
+    let (rect, native, fullscreen) = ctx.input(|i| {
+        let viewport = i.viewport();
+        // Web (eframe's web backend) and egui_kittest set `screen_rect` but not `inner_rect`;
+        // both describe the same logical content rect for this viewport.
+        (viewport.inner_rect.or(i.raw.screen_rect), viewport.native_pixels_per_point, viewport.fullscreen)
+    });
+    let rect = rect?;
+    let pixels_per_point = match native {
+        // `native_pixels_per_point` is before egui's zoom
+        // (`Context::pixels_per_point() == zoom_factor * native_pixels_per_point`), so apply the
+        // zoom exactly once. The fallback already includes it.
+        Some(native) => native * zoom,
+        None => fallback,
+    };
+    if !pixels_per_point.is_finite() || pixels_per_point <= 0.0 {
+        return None;
+    }
+    let width = (rect.width() * pixels_per_point).ceil();
+    let height = (rect.height() * pixels_per_point).ceil();
+    if !width.is_finite() || !height.is_finite() || width < 1.0 || height < 1.0 {
+        return None;
+    }
+    Some(ScreenshotGeometry {
+        width: width as usize,
+        height: height as usize,
+        document: 0,
+        signature: [
+            rect.width().to_bits(),
+            rect.height().to_bits(),
+            pixels_per_point.to_bits(),
+            u32::from(fullscreen.unwrap_or(false)),
+            zoom.to_bits(),
+            // Reserved for a surface-generation counter once a backend exposes one.
+            0,
+        ],
+    })
+}
diff --git a/crates/ui-egui/src/app/view.rs b/crates/ui-egui/src/app/view.rs
new file mode 100644
index 000000000..a229fa598
--- /dev/null
+++ b/crates/ui-egui/src/app/view.rs
@@ -0,0 +1,79 @@
+use super::{DesignApp, LivePreview, Value, View, ViewInfo, json, page_history};
+
+impl DesignApp {
+    /// The view key of the active document in the current pane.
+    pub(crate) fn view_key(&self) -> Option<u64> {
+        let uid = self.session.active()?.uid;
+        Some(if self.pane == 1 { uid ^ (1 << 63) } else { uid })
+    }
+
+    pub fn view(&self) -> Option<&View> {
+        self.views.get(&self.view_key()?)
+    }
+
+    pub fn view_mut(&mut self) -> Option<&mut View> {
+        let k = self.view_key()?;
+        Some(self.views.entry(k).or_default())
+    }
+
+    pub(crate) fn page_history(&self) -> Option<&page_history::PageHistory> {
+        self.page_history.get(&self.view_key()?)
+    }
+
+    pub(crate) fn page_history_mut(&mut self) -> Option<&mut page_history::PageHistory> {
+        let k = self.view_key()?;
+        Some(self.page_history.entry(k).or_default())
+    }
+
+    /// Make `pane` current: its canvas cache and rect move in.
+    pub fn switch_pane(&mut self, pane: u8) {
+        if pane == self.pane {
+            return;
+        }
+        let (c, r) = self.other_pane.take().unwrap_or_default();
+        let old = (std::mem::replace(&mut self.canvas, c), std::mem::replace(&mut self.canvas_rect, r));
+        self.other_pane = Some(old);
+        self.pane = pane;
+    }
+
+    pub fn view_info(&self) -> ViewInfo {
+        ViewInfo {
+            zoom: self.view().map(|v| v.zoom).unwrap_or(1.0),
+            snap: self.ui.snap_view(),
+            // Tool readouts (sizes, smart-guide distances) measure in the document's ruler units,
+            // as its Control and Properties fields do.
+            unit: self.session.active().map_or(self.ui.units, |st| st.doc.settings.horizontal_units),
+            stroke_in_front: self.ui.stroke_front,
+        }
+    }
+
+    /// Show `command` on the page as a live preview named `label` (the undo step's name): each call
+    /// replaces the last, and nothing reaches the undo history until [`Self::end_live_preview`]. A
+    /// panel calls this, or [`Self::hold_live_preview`], every frame its control is held; a frame
+    /// without either commits the preview.
+    pub fn live_preview(&mut self, label: &str, command: &str, params: Value) {
+        if self.run("edit.preview", json!({"label": label, "command": command, "params": params})).is_ok() {
+            self.live_preview = LivePreview { open: true, held: true };
+        }
+    }
+
+    /// The control showing the live preview is still held (pressed, though not moved this frame).
+    pub fn hold_live_preview(&mut self) {
+        self.live_preview.held = self.live_preview.open;
+    }
+
+    /// Commit the live preview, if one is open, as one undo step.
+    pub fn end_live_preview(&mut self) {
+        if std::mem::take(&mut self.live_preview).open {
+            let _ = self.run("edit.commitPreview", json!({}));
+        }
+    }
+
+    /// Start of a frame: a live preview no panel held last frame (its control was let go, or the
+    /// panel closed) is committed, so it never swallows later edits' undo steps.
+    pub(crate) fn settle_live_preview(&mut self) {
+        if !std::mem::take(&mut self.live_preview.held) {
+            self.end_live_preview();
+        }
+    }
+}
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index b1c71c056..de4331c7d 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -4,18 +4,70 @@
 use designcraft_compose as compose;
 use designcraft_doc::{Content, Document, GuideSel, Item, SpreadRef};
 use designcraft_engine::doc::Selection;
+use designcraft_engine::{ImeMutation, ImeTextContext};
 use designcraft_geom::{Affine, Point, Rect as DRect, Vec2 as DVec2};
 use designcraft_tools::{CanvasLayout, Cursor, Mods, Overlay, PointerEvent, PointerKind, SpreadSlot, ToolKey};
+use egui::ime_context::{CommittedText, ImeMutationStamp, ImeObservation, ImeTarget};
+use egui::output::IMESurroundingText;
 use egui::{Color32, Pos2, Rect, Sense, Stroke, StrokeKind, pos2, vec2};
 use serde_json::{Value, json};
 
 use crate::{DesignApp, ScreenMode, View, theme::Tokens};
 
+mod column_guides;
+mod frames;
+mod guides;
+mod ime;
+mod input;
+mod page_decor;
+mod render;
+mod rulers;
+mod scroll;
+mod text_overlay;
+mod tool_overlays;
+mod view;
+
+use column_guides::{COLUMN_DRAG, ColumnDrag, column_guide_at, spread_x_across};
+use frames::{draw_frames, draw_selection};
+#[cfg(test)]
+use frames::{item_canvas_xf, overset_frames, overset_marks, ported_frames, text_frames_in};
+use guides::{GUIDE_DRAG, GUIDE_PRESS, GuideDrag, GuidePress, guide_readout, guide_spot, moving_guides, readout_at};
+#[cfg(test)]
+use guides::{guide_at, guide_drag_delta, guide_measure};
+use ime::ime_canvas_pass;
+pub(crate) use ime::{CanvasIme, ime_observe};
+pub(crate) use input::forwarded_keys;
+pub use input::{begin_frame, context_menu_open};
+use input::{context_menu, draw_cursor_badge, handle_input, pointer_elsewhere};
+#[cfg(test)]
+use input::{press_count, release_clicks};
+#[cfg(test)]
+use page_decor::{MAX_BASELINES, baseline_grid_lines};
+use page_decor::{dashed, draw_flattener_preview, draw_guides, shown_area};
+pub use render::DisplayKey;
+use render::render_texture;
+#[cfg(test)]
+use render::{c32, invalidate_on_display_change, screen_options};
+pub(crate) use rulers::fmt_tick;
+#[cfg(test)]
+use rulers::ruler_pieces;
+use rulers::{draw_rulers, ruler_units_menus};
+use scroll::{mods, navigation_space, scrollbars, spring_zoom_mode};
+pub use text_overlay::selected_text;
+use text_overlay::{draw_dynamic_spelling, draw_hidden_characters};
+#[cfg(test)]
+use text_overlay::{draw_text_selection, hidden_marks};
+use tool_overlays::draw_tool_overlays;
+pub(crate) use view::page_in_view;
+use view::present_fit;
+pub use view::{
+    apply_view_request, can_go_through_history, current_page, current_parent_page, current_slot, current_spread, current_spread_page, drop_point,
+    fit, go_through_history, go_to_page, set_zoom, show_spread, step_spread, view_centre, zoom_at,
+};
+
 pub const RULER: f32 = 15.0;
 /// Width of the view's scrollbars.
 pub const SCROLLBAR: f32 = 10.0;
-/// Shortest scrollbar thumb.
-const MIN_THUMB: f32 = 18.0;
 
 /// Canvas ↔ screen transform.
 #[derive(Clone, Copy, Debug)]
@@ -81,357 +133,82 @@ impl Xf {
     }
 }
 
-fn c32(c: [u8; 3]) -> Color32 {
-    Color32::from_rgb(c[0], c[1], c[2])
-}
-
-/// Fit the current spread (or page) in the canvas.
-pub fn fit(app: &mut DesignApp, rect: Rect, what: &str) {
-    let Some(st) = app.session.active() else { return };
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let cur = current_slot(app, &layout).unwrap_or(0);
-    let Some(slot) = layout.slots.get(cur) else { return };
-    let mut b = slot.bounds;
-    if what == "page"
-        && let Some(sp) = st.doc.spread(slot.spread)
-    {
-        let center = app.view().map(|v| v.origin.x + rect.width() as f64 / 2.0 / v.zoom).unwrap_or(0.0);
-        let c = slot.to_spread(Point::new(center, slot.bounds.center().y));
-        let pi = sp.page_at_x(c.x).unwrap_or(0);
-        b = slot.xf.transform_rect_bbox(sp.pages[pi].bounds());
+/// A guide being dragged out or moved: its line, what caught it, and where it is beside the pointer (#1282).
+fn draw_guide_drag(app: &DesignApp, painter: &egui::Painter, xf: &Xf, g: &GuideDrag, p: Pos2, rect: Rect, t: &Tokens) {
+    let col = Color32::from_rgb(74, 227, 255);
+    let spot = guide_spot(app, xf, g);
+    let line = spot.as_ref().map_or(p, |s| s.screen);
+    let (a, b) = match g.orientation {
+        designcraft_doc::Orientation::Horizontal => (pos2(rect.min.x, line.y), pos2(rect.max.x, line.y)),
+        designcraft_doc::Orientation::Vertical => (pos2(line.x, rect.min.y), pos2(line.x, rect.max.y)),
+    };
+    // What caught it, as for a moved object.
+    for mark in spot.iter().flat_map(|s| &s.marks) {
+        if let Overlay::Guide { a, b } = mark {
+            painter.line_segment([xf.to_screen(*a), xf.to_screen(*b)], Stroke::new(1.0, t.smart_guide));
+        }
     }
-    if what == "all" {
-        b = layout.slots.iter().map(|s| s.bounds).reduce(|a, b| a.union(b)).unwrap_or(b);
+    // A new guide from the rulers with the Page tool is a liquid guide: dashed.
+    if g.from.is_none() && app.session.tool_id() == "page" {
+        dashed(painter, a, b, Stroke::new(1.0, col), 6.0, 3.0);
+    } else {
+        painter.line_segment([a, b], Stroke::new(1.0, col));
     }
-    if what == "selection" {
-        // Fit Selection in Window: the selected objects (on their spread's slot).
-        let sel: Vec<designcraft_geom::Rect> = st
-            .selection
-            .items
-            .iter()
-            .filter_map(|id| {
-                let loc = st.doc.find(*id)?;
-                let slot = layout.slots.iter().find(|s| s.spread == loc.spread)?;
-                Some(slot.xf.transform_rect_bbox(st.doc.item(*id)?.bounds()))
-            })
-            .collect();
-        let Some(u) = sel.into_iter().reduce(|a, b| a.union(b)) else { return };
-        b = u.inflate(u.width().max(u.height()) * 0.05 + 1.0, u.width().max(u.height()) * 0.05 + 1.0);
-    }
-    fit_bounds(app, rect, b);
-}
-
-/// Zoom and scroll so canvas rectangle `b` fills the canvas `rect`.
-fn fit_bounds(app: &mut DesignApp, rect: Rect, b: DRect) {
-    let pad = 40.0;
-    let zoom =
-        ((rect.width() as f64 - 2.0 * pad) / b.width().max(1e-6)).min((rect.height() as f64 - 2.0 * pad) / b.height().max(1e-6)).clamp(0.05, 40.0);
-    let origin = Point::new(b.center().x - rect.width() as f64 / 2.0 / zoom, b.center().y - rect.height() as f64 / 2.0 / zoom);
-    if let Some(v) = app.view_mut() {
-        *v = View { zoom, origin, fitted: true, rotation: v.rotation };
+    // Where it is, beside the pointer (#1282).
+    if let Some(text) = guide_readout(app, xf, g) {
+        let galley = painter.layout_no_wrap(text, egui::FontId::proportional(11.0), t.text);
+        let at = readout_at(p, galley.size(), rect);
+        let bg = Rect::from_min_size(at, galley.size()).expand(3.0);
+        painter.rect_filled(bg, 2.0, t.panel);
+        painter.rect_stroke(bg, 2.0, Stroke::new(1.0, t.border), StrokeKind::Inside);
+        painter.galley(at, galley, t.text);
     }
 }
 
-/// Fit spread `r` (a document or parent spread on the canvas as it is laid out now) in the canvas.
-/// Before the canvas has a size, the next frame fits whatever spread is current.
-pub fn show_spread(app: &mut DesignApp, r: SpreadRef) {
-    let Some(st) = app.session.active() else { return };
-    let Some(b) = CanvasLayout::new(&st.doc, st.editing_parents).slot(r).map(|s| s.bounds) else { return };
-    match app.canvas_rect {
-        Some(rect) => fit_bounds(app, rect, b),
-        None => {
-            if let Some(v) = app.view_mut() {
-                v.fitted = false;
+/// The rendered texture, placed where its region is in the current view.
+fn paint_render(app: &DesignApp, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout, screen: Rect, preview: bool) {
+    if let (Some(tex), Some(sh)) = (&app.canvas.texture, app.canvas.shown) {
+        // Place the texture where its region is in the current view (shifted while panning,
+        // scaled while a zoom re-render is pending).
+        // The texture's corners in canvas space, placed through the view (rotation included).
+        let (w, h) = (sh.size.0 as f64 / sh.zoom, sh.size.1 as f64 / sh.zoom);
+        let o = sh.origin;
+        let corners = [
+            (o, pos2(0.0, 0.0)),
+            (Point::new(o.x + w, o.y), pos2(1.0, 0.0)),
+            (Point::new(o.x + w, o.y + h), pos2(1.0, 1.0)),
+            (Point::new(o.x, o.y + h), pos2(0.0, 1.0)),
+        ];
+        let mut mesh = egui::Mesh::with_texture(tex.id());
+        for (c, uv) in corners {
+            mesh.vertices.push(egui::epaint::Vertex { pos: xf.to_screen(c), uv, color: Color32::WHITE });
+        }
+        mesh.indices.extend([0, 1, 2, 0, 2, 3]);
+        if preview {
+            // Preview: only the shown area of each spread keeps its content.
+            for slot in &layout.slots {
+                let r = shown_area(app, doc, xf, slot);
+                painter.with_clip_rect(r.intersect(screen)).add(egui::Shape::mesh(mesh.clone()));
             }
+        } else {
+            painter.add(egui::Shape::mesh(mesh));
         }
     }
 }
 
-/// Index of the slot nearest the view centre.
-pub fn current_slot(app: &DesignApp, layout: &CanvasLayout) -> Option<usize> {
-    let v = app.view()?;
-    let r = app.canvas_rect?;
-    let c = Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, v.origin.y + r.height() as f64 / 2.0 / v.zoom);
-    layout
-        .slots
-        .iter()
-        .enumerate()
-        .min_by(|a, b| {
-            let da = (a.1.bounds.center().y - c.y).abs();
-            let db = (b.1.bounds.center().y - c.y).abs();
-            da.total_cmp(&db)
-        })
-        .map(|(i, _)| i)
-}
-
-/// The spread under the view centre (a parent spread while parents are edited).
-pub fn current_spread(app: &DesignApp) -> Option<SpreadRef> {
-    let st = app.session.active()?;
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    Some(layout.slots.get(current_slot(app, &layout)?)?.spread)
-}
-
-/// The spread nearest the view centre and the centre in that spread's coordinates.
-pub fn view_centre(app: &DesignApp) -> Option<(SpreadRef, Point)> {
-    let st = app.session.active()?;
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let slot = layout.slots.get(current_slot(app, &layout)?)?;
-    let v = app.view()?;
-    let r = app.canvas_rect?;
-    let c = Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, v.origin.y + r.height() as f64 / 2.0 / v.zoom);
-    Some((slot.spread, slot.to_spread(c)))
-}
-
-/// Where a file dropped on the window lands: the spread under the pointer, or under the view
-/// centre when the pointer isn't over the canvas, and that point in spread coordinates.
-pub fn drop_point(app: &DesignApp, screen: Option<Pos2>) -> Option<(SpreadRef, Point)> {
-    let rect = app.canvas_rect?;
-    let Some(pos) = screen.filter(|p| rect.contains(*p)) else { return view_centre(app) };
-    let st = app.session.active()?;
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    layout.spread_at(Xf::new(rect, app.view()?).to_canvas(pos))
-}
-
-/// Absolute page index under the view centre.
-pub fn current_page(app: &DesignApp) -> Option<usize> {
-    let st = app.session.active()?;
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let i = current_slot(app, &layout)?;
-    let slot = layout.slots.get(i)?;
-    let SpreadRef::Doc(si) = slot.spread else { return Some(0) };
-    let v = app.view()?;
-    let r = app.canvas_rect?;
-    let c = slot.to_spread(Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, slot.bounds.center().y));
-    let pi = st.doc.spreads[si].page_at_x(c.x).unwrap_or(0);
-    Some(st.doc.first_page_of_spread(si) + pi)
-}
-
-/// The spread (document or parent) under the view centre and the page index within it: where
-/// commands that act "on the page I am working on" should go.
-pub fn current_spread_page(app: &DesignApp) -> Option<(SpreadRef, usize)> {
-    let st = app.session.active()?;
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let i = current_slot(app, &layout)?;
-    let slot = layout.slots.get(i)?;
-    let v = app.view()?;
-    let r = app.canvas_rect?;
-    let c = slot.to_spread(Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, slot.bounds.center().y));
-    let pg = st.doc.spread(slot.spread)?.page_at_x(c.x).unwrap_or(0);
-    Some((slot.spread, pg))
-}
-
-/// While parent spreads are being edited: (parent spread index, page index within it) under the
-/// view centre. `None` when document pages are shown.
-pub fn current_parent_page(app: &DesignApp) -> Option<(usize, usize)> {
-    let st = app.session.active()?;
-    if !st.editing_parents {
-        return None;
-    }
-    let layout = CanvasLayout::new(&st.doc, true);
-    let i = current_slot(app, &layout)?;
-    let slot = layout.slots.get(i)?;
-    let SpreadRef::Parent(pi) = slot.spread else { return None };
-    let v = app.view()?;
-    let r = app.canvas_rect?;
-    let c = slot.to_spread(Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, slot.bounds.center().y));
-    let qi = st.doc.parents.get(pi)?.page_at_x(c.x).unwrap_or(0);
-    Some((pi, qi))
-}
-
-/// Scroll so absolute page `abs` is centred (keeps zoom).
-pub fn go_to_page(app: &mut DesignApp, abs: usize) {
-    let Some(st) = app.session.active() else { return };
-    let layout = CanvasLayout::new(&st.doc, false);
-    let Some(pr) = layout.page_rect(&st.doc, abs) else { return };
-    let Some(rect) = app.canvas_rect else { return };
-    if let Some(v) = app.view_mut() {
-        v.origin = Point::new(pr.center().x - rect.width() as f64 / 2.0 / v.zoom, pr.center().y - rect.height() as f64 / 2.0 / v.zoom);
+/// Presentation: a click shows the next spread, Shift-click the previous one.
+fn present_click(app: &mut DesignApp, ui: &egui::Ui, resp: &egui::Response, rect: Rect) {
+    if resp.clicked() {
+        // The release that made the click says whether Shift was down.
+        let shift = ui.input(|i| {
+            i.modifiers.shift || i.events.iter().any(|e| matches!(e, egui::Event::PointerButton { pressed: false, modifiers, .. } if modifiers.shift))
+        });
+        step_spread(app, if shift { -1 } else { 1 });
+        present_fit(app, rect);
     }
 }
 
-/// Presentation: the spread in view, centred and as large as `rect` allows.
-fn present_fit(app: &mut DesignApp, rect: Rect) {
-    let Some(st) = app.session.active() else { return };
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let Some(b) = current_slot(app, &layout).and_then(|i| layout.slots.get(i)).map(|s| s.bounds) else { return };
-    if b.width() <= 0.0 || b.height() <= 0.0 {
-        return;
-    }
-    let zoom = (rect.width() as f64 / b.width()).min(rect.height() as f64 / b.height()).clamp(0.05, 40.0);
-    let origin = Point::new(b.center().x - rect.width() as f64 / 2.0 / zoom, b.center().y - rect.height() as f64 / 2.0 / zoom);
-    if let Some(v) = app.view_mut() {
-        v.zoom = zoom;
-        v.origin = origin;
-    }
-}
-
-/// Centre the spread `delta` spreads after (or before) the one in view (keeps zoom); stops at the
-/// first and last spread. Parent spreads while they are being edited.
-pub fn step_spread(app: &mut DesignApp, delta: isize) {
-    let Some(st) = app.session.active() else { return };
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let Some(cur) = current_slot(app, &layout) else { return };
-    let to = cur.saturating_add_signed(delta).min(layout.slots.len().saturating_sub(1));
-    let Some(b) = layout.slots.get(to).map(|s| s.bounds) else { return };
-    let Some(rect) = app.canvas_rect else { return };
-    if let Some(v) = app.view_mut() {
-        v.origin = Point::new(b.center().x - rect.width() as f64 / 2.0 / v.zoom, b.center().y - rect.height() as f64 / 2.0 / v.zoom);
-    }
-}
-
-pub fn zoom_at(app: &mut DesignApp, screen: Pos2, factor: f64) {
-    let Some(rect) = app.canvas_rect else { return };
-    let Some(v) = app.view_mut() else { return };
-    let xf = Xf::new(rect, v);
-    let c = xf.to_canvas(screen);
-    let screen = xf.unrotate(screen);
-    let nz = (v.zoom * factor).clamp(0.05, 40.0);
-    v.zoom = nz;
-    v.origin = Point::new(c.x - (screen.x - rect.min.x) as f64 / nz, c.y - (screen.y - rect.min.y) as f64 / nz);
-}
-
-pub fn set_zoom(app: &mut DesignApp, z: f64) {
-    let Some(rect) = app.canvas_rect else { return };
-    let cur = app.view().map(|v| v.zoom).unwrap_or(1.0);
-    zoom_at(app, rect.center(), z / cur);
-}
-
-/// Whether the wheel motion now arriving was made with Alt down. As egui does for Ctrl/Cmd, a
-/// motion keeps its key to its end: the wheel is smoothed over a few frames, and a trackpad swipe
-/// coasts on after the key is let go.
-fn wheel_alt(ui: &egui::Ui) -> bool {
-    let id = egui::Id::new("canvas_wheel_alt");
-    // Alt, and whether a trackpad swipe is under way.
-    let (mut alt, mut swipe): (bool, bool) = ui.data(|d| d.get_temp(id)).unwrap_or_default();
-    ui.input(|i| {
-        for e in &i.events {
-            if let egui::Event::MouseWheel { phase, modifiers, .. } = e {
-                (alt, swipe) = match phase {
-                    egui::TouchPhase::Start => (modifiers.alt, true),
-                    egui::TouchPhase::Move => (modifiers.alt || (swipe && alt), swipe),
-                    egui::TouchPhase::End | egui::TouchPhase::Cancel => (false, false),
-                };
-            }
-        }
-    });
-    ui.data_mut(|d| d.insert_temp(id, (alt, swipe)));
-    alt
-}
-
-pub fn apply_view_request(app: &mut DesignApp, p: &Value) {
-    if let Some(r) = p.get("showSpread").and_then(|v| serde_json::from_value::<SpreadRef>(v.clone()).ok()) {
-        show_spread(app, r);
-    }
-    // Power Zoom (Hand tool, Alt-press): zoom out to the spread, aim a view-sized rectangle, zoom
-    // back in where it was released.
-    if let Some(phase) = p.get("powerZoom").and_then(Value::as_str) {
-        let at = p.get("at").and_then(Value::as_array).map(|a| Point::new(a[0].as_f64().unwrap_or(0.0), a[1].as_f64().unwrap_or(0.0)));
-        match phase {
-            "start" => {
-                if let (Some(v), Some(rect)) = (app.view().copied(), app.canvas_rect) {
-                    let centre = Xf::new(rect, &v).to_canvas(rect.center());
-                    app.power_zoom = Some((v.zoom, at.unwrap_or(centre)));
-                    fit(app, rect, "spread");
-                }
-            }
-            "move" => {
-                if let (Some(pz), Some(a)) = (&mut app.power_zoom, at) {
-                    pz.1 = a;
-                }
-            }
-            _ => {
-                if let (Some((z, c)), Some(rect)) = (app.power_zoom.take(), app.canvas_rect)
-                    && let Some(v) = app.view_mut()
-                {
-                    let c = at.unwrap_or(c);
-                    v.zoom = z;
-                    v.origin = Point::new(c.x - rect.width() as f64 / 2.0 / z, c.y - rect.height() as f64 / 2.0 / z);
-                }
-            }
-        }
-    }
-    if let Some(d) = p.get("pan").and_then(Value::as_array) {
-        let (dx, dy) = (d.first().and_then(Value::as_f64).unwrap_or(0.0), d.get(1).and_then(Value::as_f64).unwrap_or(0.0));
-        if let Some(v) = app.view_mut() {
-            v.origin = Point::new(v.origin.x - dx / v.zoom, v.origin.y - dy / v.zoom);
-        }
-    }
-    if let (Some(a), Some(rect)) = (p.get("zoomAt").and_then(Value::as_array), app.canvas_rect)
-        && let Some(v) = app.view()
-    {
-        let c = Point::new(a[0].as_f64().unwrap_or(0.0), a[1].as_f64().unwrap_or(0.0));
-        let xf = Xf::new(rect, v);
-        let s = xf.to_screen(c);
-        zoom_at(app, s, p.get("factor").and_then(Value::as_f64).unwrap_or(2.0));
-    }
-}
-
-fn mods(i: &egui::InputState, space: bool) -> Mods {
-    Mods { shift: i.modifiers.shift, alt: i.modifiers.alt, cmd: i.modifiers.command, ctrl: i.modifiers.ctrl, space }
-}
-
-/// Held Space belongs to navigation only when neither the document nor a text field is typing.
-fn navigation_space(app: &mut DesignApp, ctx: &egui::Context) -> bool {
-    ctx.input(|i| i.focused && i.key_down(egui::Key::Space)) && !app.session.wants_text() && !ctx.text_edit_focused()
-}
-
-fn spring_zoom_mode(app: &DesignApp, ctx: &egui::Context, space: bool) -> bool {
-    let down = ctx.data(|d| d.get_temp::<bool>(egui::Id::new(("canvas_pointer_down", app.pane)))).unwrap_or(false);
-    space && ctx.input(|i| i.modifiers.command) && !down && !app.session.tool_busy()
-}
-
-#[derive(Clone, Default)]
-struct SpringZoom {
-    tool: designcraft_tools::ZoomTool,
-    down: bool,
-}
-
-/// Lend the Zoom tool the gesture; the selected tool and document selection stay intact.
-fn spring_zoom_input(app: &mut DesignApp, ui: &egui::Ui, resp: &egui::Response, xf: &Xf, active: bool) -> bool {
-    let id = egui::Id::new(("canvas_spring_zoom", app.pane));
-    let mut zoom: SpringZoom = ui.data(|d| d.get_temp(id)).unwrap_or_default();
-    if !ui.input(|i| i.focused) {
-        ui.data_mut(|d| d.remove::<SpringZoom>(id));
-        return false;
-    }
-    if !zoom.down && (!active || ui.input(|i| i.pointer.middle_down())) {
-        return false;
-    }
-    let (pointer, m) = ui.input(|i| (i.pointer.clone(), mods(i, true)));
-    let vi = app.view_info();
-    let mut events = Vec::new();
-    let canvas = if xf.rot == 0 { app.canvas_rect } else { Some(resp.rect) };
-    if pointer.primary_pressed()
-        && resp.hovered()
-        && let Some(p) = pointer.press_origin().filter(|p| canvas.is_some_and(|r| r.contains(*p)))
-    {
-        events.push(PointerEvent { kind: PointerKind::Down, pos: xf.to_canvas(p), mods: m, clicks: 1 });
-        zoom.down = true;
-        resp.request_focus();
-    }
-    if zoom.down
-        && let Some(p) = pointer.interact_pos()
-    {
-        if resp.dragged() && resp.drag_delta() != egui::Vec2::ZERO {
-            events.push(PointerEvent { kind: PointerKind::Drag, pos: xf.to_canvas(p), mods: m, clicks: 1 });
-        }
-        if pointer.primary_released() {
-            events.push(PointerEvent { kind: PointerKind::Up, pos: xf.to_canvas(p), mods: m, clicks: 1 });
-            zoom.down = false;
-        }
-    }
-    for e in events {
-        if let Err(err) = app.session.pointer_with_tool(&mut zoom.tool, &e, vi) {
-            app.status(err.to_string());
-        }
-    }
-    app.after_engine();
-    // Keep ownership until pointer release even if the shortcut was released first, so an Up
-    // cannot leak into the previous tool and edit the document.
-    ui.data_mut(|d| d.insert_temp(id, zoom));
-    true
-}
-
+/// Lay out the canvas, scrollbars and rulers, presentation mode, fit/view state, input handling and painting.
 pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     let t = Tokens::get(ui.ctx());
     let outer = ui.available_rect_before_wrap();
@@ -450,15 +227,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         // One spread at a time, as large as the screen allows; a click shows the next one,
         // Shift-click the previous one. Tools and selection don't see the input.
         present_fit(app, rect);
-        if resp.clicked() {
-            // The release that made the click says whether Shift was down.
-            let shift = ui.input(|i| {
-                i.modifiers.shift
-                    || i.events.iter().any(|e| matches!(e, egui::Event::PointerButton { pressed: false, modifiers, .. } if modifiers.shift))
-            });
-            step_spread(app, if shift { -1 } else { 1 });
-            present_fit(app, rect);
-        }
+        present_click(app, ui, &resp, rect);
     } else {
         if !app.view().is_some_and(|v| v.fitted) {
             fit(app, rect, "spread");
@@ -499,73 +268,21 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     }
     // Rendered content.
     render_texture(app, ui.ctx(), rect, &xf, &layout, preview);
-    if let (Some(tex), Some(sh)) = (&app.canvas.texture, app.canvas.shown) {
-        // Place the texture where its region is in the current view (shifted while panning,
-        // scaled while a zoom re-render is pending).
-        // The texture's corners in canvas space, placed through the view (rotation included).
-        let (w, h) = (sh.size.0 as f64 / sh.zoom, sh.size.1 as f64 / sh.zoom);
-        let o = sh.origin;
-        let corners = [
-            (o, pos2(0.0, 0.0)),
-            (Point::new(o.x + w, o.y), pos2(1.0, 0.0)),
-            (Point::new(o.x + w, o.y + h), pos2(1.0, 1.0)),
-            (Point::new(o.x, o.y + h), pos2(0.0, 1.0)),
-        ];
-        let mut mesh = egui::Mesh::with_texture(tex.id());
-        for (c, uv) in corners {
-            mesh.vertices.push(egui::epaint::Vertex { pos: xf.to_screen(c), uv, color: Color32::WHITE });
-        }
-        mesh.indices.extend([0, 1, 2, 0, 2, 3]);
-        if preview {
-            // Preview: only the shown area of each spread keeps its content.
-            for slot in &layout.slots {
-                let r = shown_area(app, &doc, &xf, slot);
-                painter.with_clip_rect(r.intersect(screen)).add(egui::Shape::mesh(mesh.clone()));
-            }
-        } else {
-            painter.add(egui::Shape::mesh(mesh));
-        }
-    }
+    paint_render(app, &painter, &xf, &doc, &layout, screen, preview);
+    crate::separations::paint(app, ui.ctx(), &painter, &xf, &layout, screen);
     let hair = 1.0 / ui.ctx().pixels_per_point();
     for slot in &layout.slots {
         painter.rect_stroke(xf.rect(slot.bounds), 0.0, Stroke::new(hair, Color32::from_rgb(0x4a, 0x4a, 0x4a)), StrokeKind::Outside);
     }
     if !preview {
-        let drag = ui.data(|d| d.get_temp::<GuideDrag>(egui::Id::new(GUIDE_DRAG)));
-        let press = ui.data(|d| d.get_temp::<GuidePress>(egui::Id::new(GUIDE_PRESS)));
+        let drag = ui.data(|d| d.get_temp::<GuideDrag>(egui::Id::unique(GUIDE_DRAG)));
+        let press = ui.data(|d| d.get_temp::<GuidePress>(egui::Id::unique(GUIDE_PRESS)));
         let moving = drag.as_ref().zip(press).and_then(|(g, press)| moving_guides(app, &xf, rect, g, press));
         draw_guides(app, &painter, &xf, &doc, &layout, &t, moving.as_ref());
         if let Some(g) = drag
             && let Some(p) = g.at
         {
-            let col = Color32::from_rgb(74, 227, 255);
-            let spot = guide_spot(app, &xf, &g);
-            let line = spot.as_ref().map_or(p, |s| s.screen);
-            let (a, b) = match g.orientation {
-                designcraft_doc::Orientation::Horizontal => (pos2(rect.min.x, line.y), pos2(rect.max.x, line.y)),
-                designcraft_doc::Orientation::Vertical => (pos2(line.x, rect.min.y), pos2(line.x, rect.max.y)),
-            };
-            // What caught it, as for a moved object.
-            for mark in spot.iter().flat_map(|s| &s.marks) {
-                if let Overlay::Guide { a, b } = mark {
-                    painter.line_segment([xf.to_screen(*a), xf.to_screen(*b)], Stroke::new(1.0, t.smart_guide));
-                }
-            }
-            // A new guide from the rulers with the Page tool is a liquid guide: dashed.
-            if g.from.is_none() && app.session.tool_id() == "page" {
-                dashed(&painter, a, b, Stroke::new(1.0, col), 6.0, 3.0);
-            } else {
-                painter.line_segment([a, b], Stroke::new(1.0, col));
-            }
-            // Where it is, beside the pointer (#1282).
-            if let Some(text) = guide_readout(app, &xf, &g) {
-                let galley = painter.layout_no_wrap(text, egui::FontId::proportional(11.0), t.text);
-                let at = readout_at(p, galley.size(), rect);
-                let bg = Rect::from_min_size(at, galley.size()).expand(3.0);
-                painter.rect_filled(bg, 2.0, t.panel);
-                painter.rect_stroke(bg, 2.0, Stroke::new(1.0, t.border), StrokeKind::Inside);
-                painter.galley(at, galley, t.text);
-            }
+            draw_guide_drag(app, &painter, &xf, &g, p, rect, &t);
         }
         draw_frames(app, &painter, &xf, &doc, &layout);
         if app.ui.hidden_characters {
@@ -582,9 +299,12 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         return;
     }
     let sel_rect = draw_selection(app, &painter, &xf, &doc, &layout);
+    // Where the pointer moved on to another of the app's windows, this window's last pointer
+    // position is stale: no hover feedback or tool cursor there.
+    let elsewhere = pointer_elsewhere(app, ui.ctx());
     if !preview {
         // Content grabbers: the selected frame's and the hovered one's (Selection tool).
-        let hover = ui.ctx().pointer_hover_pos().filter(|p| screen.contains(*p)).map(|p| xf.to_canvas(p));
+        let hover = ui.ctx().pointer_hover_pos().filter(|p| screen.contains(*p) && !elsewhere).map(|p| xf.to_canvas(p));
         let vi = app.view_info();
         for c in app.session.content_grabbers(hover, vi) {
             let c = xf.to_screen(c);
@@ -593,7 +313,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         }
     }
     draw_tool_overlays(app, &painter, &xf);
-    ime_output(app, ui.ctx(), &xf);
+    ime_canvas_pass(app, ui.ctx(), &xf);
     if rulers {
         draw_rulers(app, ui, full, rect, &xf, &doc, &layout, &t);
         ruler_units_menus(app, &resp, full, rect, &doc);
@@ -606,13 +326,13 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         crate::taskbar::show(app, &ui.ctx().clone(), r, screen);
     }
     // Cursor.
-    if let Some(p) = resp.hover_pos().filter(|p| screen.contains(*p)) {
+    if let Some(p) = resp.hover_pos().filter(|p| screen.contains(*p) && !elsewhere) {
         let wants_text = app.session.wants_text();
         let space = navigation_space(app, ui.ctx());
         let zoom = spring_zoom_mode(app, ui.ctx(), space);
         let middle = ui.input(|i| i.pointer.middle_down());
-        let alt_hand: bool = ui.data(|d| d.get_temp(egui::Id::new(("canvas_alt_hand", app.pane)))).unwrap_or(false);
-        let tool_drag: bool = ui.data(|d| d.get_temp(egui::Id::new(("canvas_pointer_down", app.pane)))).unwrap_or(false);
+        let alt_hand: bool = ui.data(|d| d.get_temp(egui::Id::unique(("canvas_alt_hand", app.pane)))).unwrap_or(false);
+        let tool_drag: bool = ui.data(|d| d.get_temp(egui::Id::unique(("canvas_pointer_down", app.pane)))).unwrap_or(false);
         let alt_text = wants_text && !tool_drag && ui.input(|i| i.modifiers.alt);
         let c = if middle || alt_hand {
             Cursor::HandGrab
@@ -624,7 +344,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
             app.session.cursor(xf.to_canvas(p), ui.input(|i| mods(i, false)), app.view_info())
         };
         // A column guide that a press would drag, or one being dragged: a resize cursor across it.
-        let dragging = ui.data(|d| d.get_temp::<ColumnDrag>(egui::Id::new((COLUMN_DRAG, app.pane)))).map(|g| g.spread);
+        let dragging = ui.data(|d| d.get_temp::<ColumnDrag>(egui::Id::unique((COLUMN_DRAG, app.pane)))).map(|g| g.spread);
         let column = dragging.or_else(|| {
             let menu_open = context_menu_open(ui.ctx());
             (!space && !zoom && !middle && !alt_hand && !tool_drag && !menu_open && xf.rot == 0)
@@ -640,2920 +360,11 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         ui.ctx().set_cursor_icon(icon);
         draw_cursor_badge(&painter, p, c, &t);
     }
-}
-
-/// The loaded text cursor's badge beside the system cursor: lines of text, a closed chain
-/// (a click threads) or a broken one (a click unthreads). Drawn in code.
-fn draw_cursor_badge(painter: &egui::Painter, p: Pos2, c: Cursor, t: &Tokens) {
-    if !matches!(c, Cursor::LoadedText | Cursor::ThreadLink | Cursor::Unthread) {
-        return;
+    // A second viewport has no panels, dialogs or Quick Apply after its canvas: observe here,
+    // once, as the end of its pass. The root viewport observes at the end of `DesignApp::ui`.
+    if ui.ctx().viewport_id() != egui::ViewportId::ROOT {
+        ime_observe(app, ui.ctx());
     }
-    let r = Rect::from_min_size(p + vec2(12.0, 12.0), vec2(20.0, 16.0));
-    painter.rect_filled(r, 3.0, t.measure_bg);
-    let ink = Stroke::new(1.5, t.measure_text);
-    let c0 = r.center();
-    match c {
-        Cursor::LoadedText => {
-            for (dy, w) in [(-4.0, 12.0), (0.0, 12.0), (4.0, 8.0)] {
-                painter.line_segment([pos2(c0.x - 6.0, c0.y + dy), pos2(c0.x - 6.0 + w, c0.y + dy)], ink);
-            }
-        }
-        _ => {
-            let gap = if c == Cursor::Unthread { 2.5 } else { -2.0 };
-            for side in [-1.0, 1.0] {
-                let link = Rect::from_center_size(pos2(c0.x + side * (3.5 + gap / 2.0), c0.y), vec2(9.0, 6.0));
-                painter.rect_stroke(link, 3.0, ink, StrokeKind::Middle);
-            }
-            if c == Cursor::Unthread {
-                painter.line_segment([pos2(c0.x + 2.0, c0.y - 6.0), pos2(c0.x - 2.0, c0.y + 6.0)], ink);
-            }
-        }
-    }
-}
-
-/// Render options for the canvas texture.
-fn screen_options(app: &DesignApp, layout: &CanvasLayout, preview: bool, ppp: f64) -> designcraft_render::RenderOptions {
-    designcraft_render::RenderOptions {
-        printing_only: preview,
-        greek_below_px: 3.0 * ppp,
-        highlight_missing_fonts: !preview && app.session.prefs.highlight_substituted_fonts,
-        highlight_hj: !preview && app.session.prefs.highlight_hj,
-        condition_indicators: !preview,
-        note_indicators: !preview && app.session.prefs.show_note_anchors,
-        change_markup: !preview && app.session.prefs.show_added_text,
-        tag_markers: !preview && app.ui.tag_markers,
-        plate: app.ui.separation,
-        highlight_keeps: !preview && app.session.prefs.highlight_keeps,
-        highlight_custom_tracking: !preview && app.session.prefs.highlight_custom_tracking,
-        quality: app.ui.display_quality,
-        rich_black: app.ui.rich_black,
-        overprint_preview: app.ui.overprint_preview,
-        blend_space_view: !app.ui.proof_colors,
-        document_grid: if app.ui.document_grid && !preview { grid_areas(layout) } else { vec![] },
-        ..Default::default()
-    }
-}
-
-/// The area each spread's document grid covers, in spread coordinates: the full-width band of
-/// the pasteboard nearest that spread, the band in which `CanvasLayout::spread_at` (and so
-/// snapping) picks it.
-fn grid_areas(layout: &CanvasLayout) -> Vec<(designcraft_doc::SpreadRef, DRect)> {
-    let pb = layout.pasteboard;
-    let slots = &layout.slots;
-    slots
-        .iter()
-        .enumerate()
-        .map(|(i, slot)| {
-            let lo = i.checked_sub(1).and_then(|j| slots.get(j)).map_or(pb.y0, |prev| (prev.bounds.y1 + slot.bounds.y0) / 2.0);
-            let hi = slots.get(i + 1).map_or(pb.y1, |next| (slot.bounds.y1 + next.bounds.y0) / 2.0);
-            (slot.spread, slot.xf.inverse().transform_rect_bbox(DRect::new(pb.x0, lo, pb.x1, hi)))
-        })
-        .collect()
-}
-
-/// The display options that change how the canvas texture looks without touching the document.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct DisplayKey {
-    quality: designcraft_render::DisplayQuality,
-    separation: Option<u8>,
-    rich_black: bool,
-    overprint_preview: bool,
-    proof_colors: bool,
-    tag_markers: bool,
-    document_grid: bool,
-    highlight_substituted_fonts: bool,
-    highlight_hj: bool,
-    show_note_anchors: bool,
-    show_added_text: bool,
-    highlight_keeps: bool,
-    highlight_custom_tracking: bool,
-}
-
-fn display_key(app: &DesignApp) -> DisplayKey {
-    let (ui, prefs) = (&app.ui, &app.session.prefs);
-    DisplayKey {
-        quality: ui.display_quality,
-        separation: ui.separation,
-        rich_black: ui.rich_black,
-        overprint_preview: ui.overprint_preview,
-        proof_colors: ui.proof_colors,
-        tag_markers: ui.tag_markers,
-        document_grid: ui.document_grid,
-        highlight_substituted_fonts: prefs.highlight_substituted_fonts,
-        highlight_hj: prefs.highlight_hj,
-        show_note_anchors: prefs.show_note_anchors,
-        show_added_text: prefs.show_added_text,
-        highlight_keeps: prefs.highlight_keeps,
-        highlight_custom_tracking: prefs.highlight_custom_tracking,
-    }
-}
-
-/// When a display option changed, drop the texture and any render in flight: they were drawn with the old options.
-fn invalidate_on_display_change(app: &mut DesignApp) {
-    let key = display_key(app);
-    if app.canvas.display_key != Some(key) {
-        app.canvas.display_key = Some(key);
-        app.canvas.shown = None;
-        app.canvas.pending = None;
-        app.canvas.pending_doc = None;
-    }
-}
-
-/// Keep the canvas texture current. Panning inside the overscanned region just shifts the
-/// texture; zooming shows the old texture scaled until the background render arrives; document
-/// edits render synchronously so editing never lags.
-fn render_texture(app: &mut DesignApp, ctx: &egui::Context, rect: Rect, xf: &Xf, layout: &CanvasLayout, preview: bool) {
-    invalidate_on_display_change(app);
-    let Some(st) = app.session.active() else { return };
-    let ppp = ctx.pixels_per_point() as f64;
-    let doc_key = (st.uid, std::sync::Arc::as_ptr(&st.doc) as u64, st.revision, preview);
-    let editing_parents = st.editing_parents;
-    // Overscan: 25% of the viewport on every side, within the GPU's maximum texture size.
-    let max_side = ctx.input(|i| i.max_texture_side) as f32 / ppp as f32;
-    let (ow, oh) =
-        ((rect.width() * 0.25).min((max_side - rect.width()) / 2.0).max(0.0), (rect.height() * 0.25).min((max_side - rect.height()) / 2.0).max(0.0));
-    let want = |origin: Point| crate::Shown {
-        doc: doc_key,
-        editing_parents,
-        origin: Point::new(origin.x - ow as f64 / xf.zoom, origin.y - oh as f64 / xf.zoom),
-        zoom: xf.zoom,
-        size: (rect.width() + 2.0 * ow, rect.height() + 2.0 * oh),
-    };
-    let target = want(xf.origin);
-    // Does the current texture cover the viewport at this zoom and document state?
-    let covers = |s: &crate::Shown| {
-        s.doc == doc_key && s.editing_parents == editing_parents && (s.zoom - xf.zoom).abs() < 1e-9 && {
-            let x0 = (xf.origin.x - s.origin.x) * s.zoom;
-            let y0 = (xf.origin.y - s.origin.y) * s.zoom;
-            x0 >= -0.5 && y0 >= -0.5 && x0 + rect.width() as f64 <= s.size.0 as f64 + 0.5 && y0 + rect.height() as f64 <= s.size.1 as f64 + 0.5
-        }
-    };
-    // Collect finished background renders.
-    #[cfg(not(target_arch = "wasm32"))]
-    if let (Some(w), Some((tok, shown))) = (app.canvas.worker.as_ref(), app.canvas.pending)
-        && let Some(done) = w.poll()
-        && done.token == tok
-    {
-        upload(app, ctx, done.image);
-        app.canvas.shown = Some(shown);
-        app.canvas.shown_doc = app.canvas.pending_doc.take();
-        app.canvas.pending = None;
-        app.perf.render_ms = done.ms;
-    }
-    if app.canvas.shown.is_some_and(|s| covers(&s)) {
-        return;
-    }
-    let doc_changed = app.canvas.shown.is_none_or(|s| s.doc != doc_key);
-    let mode_changed = app.canvas.shown.is_some_and(|s| s.editing_parents != editing_parents);
-    let zoom_same = app.canvas.shown.is_some_and(|s| (s.zoom - xf.zoom).abs() < 1e-9);
-    let job = |app: &DesignApp| {
-        let st = app.session.active()?;
-        let placed: Vec<designcraft_render::Placed> =
-            layout.slots.iter().map(|s| designcraft_render::Placed { spread: s.spread, xf: s.xf }).collect();
-        let w = (target.size.0 as f64 * ppp).round().max(1.0) as u32;
-        let h = (target.size.1 as f64 * ppp).round().max(1.0) as u32;
-        let view = Affine::scale(ppp) * Affine::scale(xf.zoom) * Affine::translate((-target.origin.x, -target.origin.y));
-        let opts = screen_options(app, layout, preview, ppp);
-        Some((st.doc.clone(), placed, w, h, view, opts))
-    };
-    // Synchronous path: document edits (keep editing crisp), first frame, or no worker.
-    #[cfg(not(target_arch = "wasm32"))]
-    if !app.canvas.worker_started {
-        app.canvas.worker_started = true;
-        app.canvas.worker = render_worker_spawn(ctx);
-    }
-    #[cfg(not(target_arch = "wasm32"))]
-    let has_worker = app.canvas.worker.is_some();
-    #[cfg(target_arch = "wasm32")]
-    let has_worker = false;
-    // An edit with the view unchanged: repaint just the regions it changed.
-    if doc_changed && zoom_same && patch_texture(app, layout, ppp, doc_key, preview) {
-        return;
-    }
-    // A mode switch changes every spread's meaning, even if the document has no damage.
-    // Show the new canvas immediately, including when fitting it changes the zoom.
-    if !has_worker || app.canvas.shown.is_none() || mode_changed || (doc_changed && zoom_same) {
-        let t0 = crate::now_ms();
-        let Some((doc, placed, w, h, view, opts)) = job(app) else { return };
-        let img = app.canvas.renderer.render(&doc, &app.session.cache, &placed, w, h, view, &opts);
-        upload(app, ctx, img);
-        app.canvas.shown = Some(target);
-        app.canvas.shown_doc = Some(doc);
-        app.canvas.pending = None;
-        app.canvas.pending_doc = None;
-        app.perf.render_ms = crate::now_ms() - t0;
-        return;
-    }
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        // Already rendering this view?
-        if app.canvas.pending.is_some_and(|(_, p)| {
-            p.doc == doc_key && p.editing_parents == editing_parents && (p.zoom - xf.zoom).abs() < 1e-9 && {
-                let x0 = (xf.origin.x - p.origin.x) * p.zoom;
-                let y0 = (xf.origin.y - p.origin.y) * p.zoom;
-                x0 >= 0.0 && y0 >= 0.0 && x0 + rect.width() as f64 <= p.size.0 as f64 && y0 + rect.height() as f64 <= p.size.1 as f64
-            }
-        }) {
-            return;
-        }
-        let Some((doc, placed, w, h, view, opts)) = job(app) else { return };
-        app.canvas.pending_doc = Some(doc.clone());
-        app.canvas.token += 1;
-        let token = app.canvas.token;
-        if let Some(wk) = app.canvas.worker.as_ref() {
-            wk.submit(crate::render_worker::Job { token, doc, cache: app.session.cache.clone(), placed, w, h, view, opts });
-        }
-        app.canvas.pending = Some((token, target));
-    }
-}
-
-/// Repaint only the damaged regions of the current texture after an edit (typing, nudging).
-/// Returns false when a full render is needed (view moved, too much changed, or damage unknown).
-fn patch_texture(app: &mut DesignApp, layout: &CanvasLayout, ppp: f64, doc_key: (u64, u64, u64, bool), preview: bool) -> bool {
-    let (Some(sh), Some(old), Some(st)) = (app.canvas.shown, app.canvas.shown_doc.clone(), app.session.active()) else { return false };
-    if sh.doc.0 != doc_key.0 || sh.doc.3 != doc_key.3 || sh.editing_parents != st.editing_parents {
-        return false;
-    }
-    let (tw, th) = ((sh.size.0 as f64 * ppp).round() as i64, (sh.size.1 as f64 * ppp).round() as i64);
-    // Patches are in full-resolution pixels: a texture `upload` shrank to the GPU's limit
-    // (a viewport wider than `max_texture_side`) takes full renders instead.
-    let full = [usize::try_from(tw).unwrap_or(0), usize::try_from(th).unwrap_or(0)];
-    if app.canvas.texture.as_ref().is_none_or(|t| t.size() != full) {
-        return false;
-    }
-    let new = st.doc.clone();
-    let Some(regions) = designcraft_render::damage::damage_with(&old, &new, Some(&app.session.cache)) else { return false };
-    let t0 = crate::now_ms();
-    let k = sh.zoom * ppp;
-    let mut px: Option<(i64, i64, i64, i64)> = None;
-    for (r, rect) in &regions {
-        let c = layout.xf(*r).transform_rect_bbox(*rect);
-        let x0 = ((c.x0 - sh.origin.x) * k).floor() as i64 - 1;
-        let y0 = ((c.y0 - sh.origin.y) * k).floor() as i64 - 1;
-        let x1 = ((c.x1 - sh.origin.x) * k).ceil() as i64 + 1;
-        let y1 = ((c.y1 - sh.origin.y) * k).ceil() as i64 + 1;
-        px = Some(px.map_or((x0, y0, x1, y1), |p| (p.0.min(x0), p.1.min(y0), p.2.max(x1), p.3.max(y1))));
-    }
-    let done = |app: &mut DesignApp| {
-        app.canvas.shown = Some(crate::Shown { doc: doc_key, ..sh });
-        app.canvas.shown_doc = Some(new.clone());
-        // A background render of the old document must not overwrite this.
-        app.canvas.pending = None;
-        app.canvas.pending_doc = None;
-    };
-    let Some((x0, y0, x1, y1)) = px.map(|p| (p.0.max(0), p.1.max(0), p.2.min(tw), p.3.min(th))) else {
-        done(app);
-        return true;
-    };
-    if x1 <= x0 || y1 <= y0 {
-        done(app);
-        return true;
-    }
-    // Big changes: a full render costs about the same.
-    if ((x1 - x0) * (y1 - y0)) as f64 > 0.5 * (tw * th) as f64 {
-        return false;
-    }
-    let placed: Vec<designcraft_render::Placed> = layout.slots.iter().map(|s| designcraft_render::Placed { spread: s.spread, xf: s.xf }).collect();
-    let view = Affine::translate((-(x0 as f64), -(y0 as f64)))
-        * Affine::scale(ppp)
-        * Affine::scale(sh.zoom)
-        * Affine::translate((-sh.origin.x, -sh.origin.y));
-    let opts = screen_options(app, layout, preview, ppp);
-    let img = app.canvas.patcher.render(&new, &app.session.cache, &placed, (x1 - x0) as u32, (y1 - y0) as u32, view, &opts);
-    let ci = egui::ColorImage::from_rgba_premultiplied([img.width as usize, img.height as usize], &img.pixels);
-    if let Some(tex) = app.canvas.texture.as_mut() {
-        tex.set_partial([x0 as usize, y0 as usize], ci, egui::TextureOptions::LINEAR);
-    }
-    done(app);
-    app.canvas.patches += 1;
-    app.perf.render_ms = crate::now_ms() - t0;
-    true
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn render_worker_spawn(ctx: &egui::Context) -> Option<crate::render_worker::Worker> {
-    if std::env::var_os("DESIGNCRAFT_SYNC_RENDER").is_some() {
-        return None;
-    }
-    crate::render_worker::Worker::spawn(ctx.clone())
-}
-
-fn upload(app: &mut DesignApp, ctx: &egui::Context, mut img: designcraft_render::Rendered) {
-    if app.ui.proof_colors {
-        designcraft_render::proof_view(&mut img, &app.ui.proof_setup);
-    }
-    // Plates render from source colours; the ink limit is estimated from the composite.
-    if app.ui.separation.is_none() && app.ui.ink_limit.is_some() {
-        designcraft_render::separation_view(&mut img, None, app.ui.ink_limit);
-    }
-    let ci = egui::ColorImage::from_rgba_premultiplied([img.width as usize, img.height as usize], &img.pixels);
-    let ci = crate::widgets::fit_texture(ci, ctx.input(|i| i.max_texture_side));
-    match &mut app.canvas.texture {
-        Some(tex) => tex.set(ci, egui::TextureOptions::LINEAR),
-        None => app.canvas.texture = Some(ctx.load_texture("canvas", ci, egui::TextureOptions::LINEAR)),
-    }
-}
-
-fn dashed(painter: &egui::Painter, a: Pos2, b: Pos2, stroke: Stroke, dash: f32, gap: f32) {
-    painter.extend(egui::Shape::dashed_line(&[a, b], stroke, dash, gap));
-}
-
-/// The most baseline grid lines drawn on a page: one per point of the tallest page (216 in).
-const MAX_BASELINES: usize = 216 * 72;
-
-/// Baseline grid lines inside a page, measured from its top: `start + n * increment` for n >= 0 (the bottom
-/// edge is not a line), `start` from [`BaselineGrid::origin`](designcraft_doc::BaselineGrid::origin). Lines
-/// above the page are skipped without walking them, however far up the start is.
-fn baseline_grid_lines(start: f64, increment: f64, height: f64) -> impl Iterator<Item = f64> {
-    let step = increment.max(1.0);
-    let first = if start < 0.0 { start.rem_euclid(step) } else { start };
-    (0..MAX_BASELINES).map(move |n| first + n as f64 * step).take_while(move |y| *y < height)
-}
-
-/// What a screen mode shows of a spread, in screen coordinates: the trim, or out to the bleed or
-/// the slug box. Slug shows every printing element, so the bleed as well — and a slug narrower
-/// than the bleed does not pull the edge back in.
-fn shown_area(app: &DesignApp, doc: &Document, xf: &Xf, slot: &SpreadSlot) -> Rect {
-    let trim = xf.rect(slot.bounds);
-    let boxes: &[[f64; 4]] = match app.ui.screen_mode {
-        ScreenMode::Bleed => &[doc.settings.bleed],
-        ScreenMode::Slug => &[doc.settings.bleed, doc.settings.slug],
-        _ => &[],
-    };
-    let Some(sp) = doc.spread(slot.spread) else { return trim };
-    boxes.iter().filter_map(|o| sp.outset_rect(*o)).map(|r| xf.rect(slot.xf.transform_rect_bbox(r))).fold(trim, |a, b| a.union(b))
-}
-
-/// `moving`: guides being dragged, drawn where they would be dropped instead of where they are.
-fn draw_guides(app: &DesignApp, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout, t: &Tokens, moving: Option<&MovingGuides>) {
-    let s = &doc.settings;
-    let selection: std::collections::HashSet<GuideSel> =
-        app.session.active().map(|st| st.selection.guides.iter().copied().collect()).unwrap_or_default();
-    for slot in &layout.slots {
-        let Some(sp) = doc.spread(slot.spread) else { continue };
-        // Everything below is in spread coordinates, placed through the slot (which may be turned).
-        let m = slot.xf;
-        let pt = |p: Point| xf.to_screen(m * p);
-        let rect = |r: DRect| xf.rect(m.transform_rect_bbox(r));
-        // Bleed, then slug: one rectangle each around the spread (the inside offset only applies
-        // at the spread's outer edges).
-        if app.ui.guides {
-            for (r, color) in [(sp.bleed_rect(s.bleed), s.bleed_color), (sp.slug_rect(s.slug), s.slug_color)] {
-                if let Some(r) = r {
-                    painter.rect_stroke(rect(r), 0.0, Stroke::new(hair(painter), c32(color)), StrokeKind::Middle);
-                }
-            }
-        }
-        let pasteboard = m.inverse().transform_rect_bbox(layout.pasteboard);
-        for (pi, p) in sp.pages.iter().enumerate() {
-            let pr = p.bounds();
-            // Page tool › Show Parent Page Overlay: the parent page's size over the page.
-            if p.show_parent_overlay
-                && let SpreadRef::Doc(si) = slot.spread
-                && let Some((ppi, ppg)) = doc.parent_page_for(doc.first_page_of_spread(si) + pi)
-                && let Some(pp) = doc.parents.get(ppi).and_then(|ps| ps.pages.get(ppg))
-            {
-                let r = rect(DRect::new(pr.x0, pr.y0, pr.x0 + pp.width, pr.y0 + pp.height));
-                painter.rect_filled(r, 0.0, Color32::from_rgba_unmultiplied(110, 110, 230, 28));
-                painter.rect_stroke(r, 0.0, Stroke::new(1.0, Color32::from_rgb(110, 110, 230)), StrokeKind::Middle);
-            }
-            if !app.ui.guides {
-                continue;
-            }
-            // Baseline grid.
-            if app.ui.baseline_grid && xf.zoom >= s.baseline_grid.view_threshold {
-                let g = &s.baseline_grid;
-                for y in baseline_grid_lines(g.origin(p), g.increment, p.height) {
-                    painter.line_segment(
-                        [pt(Point::new(pr.x0, pr.y0 + y)), pt(Point::new(pr.x1, pr.y0 + y))],
-                        Stroke::new(hair(painter), c32(g.color).gamma_multiply(0.8)),
-                    );
-                }
-            }
-            // Margins (magenta) and columns (violet).
-            painter.rect_stroke(rect(p.margin_rect()), 0.0, Stroke::new(hair(painter), c32(s.margin_color)), StrokeKind::Middle);
-            let cols = p.column_rects();
-            if cols.len() > 1 {
-                for (i, c) in cols.iter().enumerate() {
-                    let col = Stroke::new(hair(painter), c32(s.column_color));
-                    if i > 0 {
-                        painter.line_segment([pt(Point::new(c.x0, c.y0)), pt(Point::new(c.x0, c.y1))], col);
-                    }
-                    if i + 1 < cols.len() {
-                        painter.line_segment([pt(Point::new(c.x1, c.y0)), pt(Point::new(c.x1, c.y1))], col);
-                    }
-                }
-            }
-            // The page's own guides, then those it shows from its parent page. Selected guides are
-            // drawn thicker, in their layer's color.
-            let own = p.guides.len();
-            for (gi, mut g) in p.guides.iter().cloned().chain(doc.parent_guides(p)).enumerate().filter(|(_, g)| g.visible_in(doc)) {
-                let key = GuideSel { spread: slot.spread, page: pi, index: gi };
-                let selected = gi < own && selection.contains(&key);
-                if gi < own
-                    && let Some(m) = moving
-                    && m.guides.contains(&key)
-                {
-                    g.position += match g.orientation {
-                        designcraft_doc::Orientation::Vertical => m.dx,
-                        designcraft_doc::Orientation::Horizontal => m.dy,
-                    };
-                }
-                // Spread guides cross the pasteboard; page guides their page.
-                let span = if g.spread { pasteboard } else { pr };
-                let (a, bb) = match g.orientation {
-                    designcraft_doc::Orientation::Horizontal => (Point::new(span.x0, g.position), Point::new(span.x1, g.position)),
-                    designcraft_doc::Orientation::Vertical => {
-                        let span = if g.spread { sp.bounds().inflate(0.0, 36.0) } else { pr };
-                        (Point::new(g.position, span.y0), Point::new(g.position, span.y1))
-                    }
-                };
-                let stroke = if selected {
-                    let color = g.layer.and_then(|l| doc.layer(l)).map_or(Color32::from_rgb(79, 153, 255), |l| c32(l.color));
-                    Stroke::new(2.0, color)
-                } else {
-                    Stroke::new(hair(painter), Color32::from_rgb(74, 227, 255))
-                };
-                if g.liquid {
-                    // Liquid guides are dashed.
-                    painter.extend(egui::Shape::dashed_line(&[pt(a), pt(bb)], stroke, 6.0, 3.0));
-                } else {
-                    painter.line_segment([pt(a), pt(bb)], stroke);
-                }
-            }
-        }
-    }
-    let _ = t;
-}
-
-/// Spread-space → canvas transform for an item at `loc`.
-fn item_canvas_xf(doc: &Document, layout: &CanvasLayout, id: designcraft_doc::ItemId) -> Option<(Affine, &'static str)> {
-    let loc = doc.find(id)?;
-    Some((layout.xf(loc.spread) * doc.parent_xf(&loc), ""))
-}
-
-fn path_screen(it: &Item, xf: &Xf, a: Affine) -> Vec<Vec<Pos2>> {
-    let bp = it.path.to_bezpath();
-    let full = a * it.xf;
-    let mut out = Vec::new();
-    let mut cur: Vec<Pos2> = Vec::new();
-    designcraft_geom::kurbo::flatten(&bp, 0.25 / xf.zoom.max(0.01), |el| {
-        use designcraft_geom::PathEl::*;
-        match el {
-            MoveTo(p) => {
-                if cur.len() > 1 {
-                    out.push(std::mem::take(&mut cur));
-                }
-                cur.clear();
-                cur.push(xf.to_screen(full * p));
-            }
-            LineTo(p) => cur.push(xf.to_screen(full * p)),
-            ClosePath => {
-                if let Some(f) = cur.first().copied() {
-                    cur.push(f);
-                }
-            }
-            _ => {}
-        }
-    });
-    if cur.len() > 1 {
-        out.push(cur);
-    }
-    out
-}
-
-fn draw_frames(app: &DesignApp, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) {
-    if !app.ui.frame_edges {
-        return;
-    }
-    let ported = ported_frames(app, doc);
-    for slot in &layout.slots {
-        let Some(sp) = doc.spread(slot.spread) else { continue };
-        let a = slot.xf;
-        // Parent items on document pages, and base parents' items on a parent spread: dotted edges.
-        for (pi, page) in sp.pages.iter().enumerate() {
-            for (ppi, ppg) in doc.shown_parent_pages(slot.spread, pi) {
-                let Some(parent) = doc.parents.get(ppi) else { continue };
-                let Some(ppage) = parent.pages.get(ppg) else { continue };
-                let dx = page.x - ppage.x;
-                for it in &parent.items {
-                    if (parent.pages.len() > 1 && parent.page_at_x(it.bounds().center().x) != Some(ppg)) || page.overridden.contains(&it.id) {
-                        continue;
-                    }
-                    let col = doc.layer(it.layer).map(|l| c32(l.color)).unwrap_or(Color32::LIGHT_BLUE);
-                    for poly in path_screen(it, xf, a * Affine::translate((dx, 0.0))) {
-                        for w in poly.windows(2) {
-                            dashed(painter, w[0], w[1], Stroke::new(hair(painter), col.gamma_multiply(0.8)), 2.0, 2.0);
-                        }
-                    }
-                }
-            }
-        }
-        for it in &sp.items {
-            draw_item_edges(painter, xf, doc, it, a);
-        }
-        // Every overset frame, selected or not and inside groups too, shows its red mark at the
-        // out port (InDesign shows it only on the selected frame; a report in Preflight is easy
-        // to miss while laying out).
-        for (it, c) in overset_marks(app, doc, layout, &sp.items, xf.zoom, &ported) {
-            let c = xf.to_screen(c);
-            let s = designcraft_tools::thread::PORT_SIZE_PX as f32;
-            painter.rect_filled(Rect::from_center_size(c, vec2(s, s)), 0.0, Color32::WHITE);
-            painter.rect_stroke(Rect::from_center_size(c, vec2(s, s)), 0.0, Stroke::new(hair(painter), layer_color(doc, it)), StrokeKind::Inside);
-            let red = Color32::from_rgb(230, 20, 20);
-            painter.line_segment([c - vec2(2.5, 0.0), c + vec2(2.5, 0.0)], Stroke::new(1.5, red));
-            painter.line_segment([c - vec2(0.0, 2.5), c + vec2(0.0, 2.5)], Stroke::new(1.5, red));
-        }
-        // Tagged frames in their tag's colour.
-        if app.ui.tagged_frames {
-            for top in &sp.items {
-                top.walk(&mut |it: &Item| {
-                    if it.xml_tag.is_empty() {
-                        return;
-                    }
-                    let Some(t) = doc.xml.tags.iter().find(|t| t.name == it.xml_tag) else { return };
-                    let col = Color32::from_rgb(t.color[0], t.color[1], t.color[2]);
-                    for poly in path_screen(it, xf, a) {
-                        for w in poly.windows(2) {
-                            painter.line_segment([w[0], w[1]], Stroke::new(2.5, col));
-                        }
-                    }
-                });
-            }
-        }
-    }
-}
-
-fn draw_item_edges(painter: &egui::Painter, xf: &Xf, doc: &Document, it: &Item, a: Affine) {
-    if it.hidden || doc.layer(it.layer).is_some_and(|l| !l.visible) {
-        return;
-    }
-    let col = doc.layer(it.layer).map(|l| c32(l.color)).unwrap_or(Color32::LIGHT_BLUE);
-    if let Content::Group { items } = &it.content {
-        for c in items {
-            draw_item_edges(painter, xf, doc, c, a * it.xf);
-        }
-        return;
-    }
-    // Frames without a stroke show their edge; shapes with strokes are visible already.
-    let show = it.stroke.is_none() || matches!(it.content, Content::Text(_) | Content::Graphic(_));
-    if show {
-        for poly in path_screen(it, xf, a) {
-            painter.add(egui::Shape::line(poly, Stroke::new(hair(painter), col.gamma_multiply(0.75))));
-        }
-    }
-    // Empty graphic frame: the X.
-    if it.object_style == designcraft_doc::BASIC_GRAPHICS_FRAME && matches!(it.content, Content::Unassigned) {
-        let r = it.inner_bounds();
-        let m = a * it.xf;
-        let p = |x: f64, y: f64| xf.to_screen(m * Point::new(x, y));
-        painter.line_segment([p(r.x0, r.y0), p(r.x1, r.y1)], Stroke::new(hair(painter), col.gamma_multiply(0.75)));
-        painter.line_segment([p(r.x1, r.y0), p(r.x0, r.y1)], Stroke::new(hair(painter), col.gamma_multiply(0.75)));
-    }
-}
-
-/// Layer colour of the first selected item: live-corner marks are outlined in it.
-fn selection_color(app: &DesignApp) -> Color32 {
-    let fallback = Color32::from_rgb(79, 153, 255);
-    let Some(st) = app.session.active() else { return fallback };
-    st.selection.items.first().and_then(|id| st.doc.item(*id)).map_or(fallback, |it| layer_color(&st.doc, it))
-}
-
-fn layer_color(doc: &Document, it: &Item) -> Color32 {
-    doc.layer(it.layer).map(|l| c32(l.color)).unwrap_or(Color32::from_rgb(79, 153, 255))
-}
-
-/// Draw selection chrome; returns the selection's screen bounds (for the Contextual Task Bar).
-fn draw_selection(app: &DesignApp, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) -> Option<Rect> {
-    let st = app.session.active()?;
-    let sel: &Selection = &st.selection;
-    let mut text_rect = None;
-    // Text selection / caret.
-    if let Some(ts) = sel.text {
-        draw_text_selection(app, painter, xf, doc, layout, ts, sel.cells);
-        let fid = ts.frame.or_else(|| {
-            let cs = app.session.cache.get(doc, ts.story, None);
-            compose::caret(&cs, ts.focus).and_then(|c| cs.frames.get(c.0)).map(|f| f.frame)
-        });
-        if let Some(fid) = fid
-            && let (Some(it), Some((a, _))) = (doc.item(fid), item_canvas_xf(doc, layout, fid))
-        {
-            text_rect = Some(xf.rect(a.transform_rect_bbox(it.bounds())));
-        }
-    }
-    let mut union: Option<Rect> = None;
-    let mut color = Color32::from_rgb(79, 153, 255);
-    for id in &sel.items {
-        let (Some(it), Some((a, _))) = (doc.item(*id), item_canvas_xf(doc, layout, *id)) else { continue };
-        color = layer_color(doc, it);
-        for poly in path_screen(it, xf, a) {
-            painter.add(egui::Shape::line(poly, Stroke::new(1.0, color)));
-        }
-        if sel.items.len() == 1 && sel.text.is_none() {
-            // InDesign draws a 1 pt bounding box around the selection.
-            painter.rect_stroke(xf.rect(a.transform_rect_bbox(it.bounds())), 0.0, Stroke::new(1.0, color), StrokeKind::Middle);
-        } else if sel.key == Some(*id) {
-            // The key object for Align: a thicker bounding box, as in InDesign.
-            painter.rect_stroke(xf.rect(a.transform_rect_bbox(it.bounds())), 0.0, Stroke::new(3.0, color), StrokeKind::Middle);
-        }
-        let b = xf.rect(a.transform_rect_bbox(it.bounds()));
-        union = Some(union.map_or(b, |u| u.union(b)));
-        // Text frame ports, also of the frames inside a selected group (so an overset frame in a
-        // group shows its red mark).
-        let mut frames = Vec::new();
-        text_frames_in(it, 0, &mut frames);
-        for (frame, story) in frames {
-            draw_ports(app, painter, xf, doc, layout, frame, story, color);
-        }
-        if let Content::Graphic(g) = &it.content
-            && sel.content
-        {
-            let gb = xf.rect((a * it.xf).transform_rect_bbox(g.xf.transform_rect_bbox(DRect::new(0.0, 0.0, g.size.0, g.size.1))));
-            let brown = Color32::from_rgb(196, 111, 43);
-            painter.rect_stroke(gb, 0.0, Stroke::new(1.0, brown), StrokeKind::Middle);
-            // Its own handles resize the graphic (InDesign's brown content bounding box).
-            if sel.items.len() == 1 {
-                for h in designcraft_tools::select::handles(DRect::new(gb.min.x as f64, gb.min.y as f64, gb.max.x as f64, gb.max.y as f64)) {
-                    let r = Rect::from_center_size(pos2(h.x as f32, h.y as f32), vec2(6.5, 6.5));
-                    painter.rect_filled(r, 0.0, Color32::WHITE);
-                    painter.rect_stroke(r, 0.0, Stroke::new(hair(painter), brown), StrokeKind::Inside);
-                }
-            }
-        }
-    }
-    let direct = matches!(app.session.tool_id(), "directSelection" | "pen" | "addAnchor" | "deleteAnchor" | "convertDirection");
-    if direct {
-        for id in &sel.items {
-            let (Some(it), Some((a, _))) = (doc.item(*id), item_canvas_xf(doc, layout, *id)) else { continue };
-            let m = a * it.xf;
-            let col = layer_color(doc, it);
-            for sp in &it.path.subpaths {
-                for an in &sp.anchors {
-                    let p = xf.to_screen(m * an.p);
-                    for (h, has) in [(an.h_in, an.has_in()), (an.h_out, an.has_out())] {
-                        if has {
-                            let hp = xf.to_screen(m * h);
-                            painter.line_segment([p, hp], Stroke::new(1.0, col));
-                            painter.circle_filled(hp, 2.5, col);
-                        }
-                    }
-                    let r = Rect::from_center_size(p, vec2(5.0, 5.0));
-                    painter.rect_filled(r, 0.0, Color32::WHITE);
-                    painter.rect_stroke(r, 0.0, Stroke::new(1.0, col), StrokeKind::Inside);
-                }
-            }
-        }
-    }
-    if let Some(u) = union
-        && sel.text.is_none()
-        && !direct
-    {
-        if sel.items.len() > 1 {
-            painter.rect_stroke(u, 0.0, Stroke::new(1.0, color), StrokeKind::Middle);
-        }
-        let hs = 6.5;
-        // Centre point. The Selection tool draws the live-corner widget as an overlay.
-        painter.rect_filled(Rect::from_center_size(u.center(), vec2(3.5, 3.5)), 0.0, color);
-        // A selected placed graphic has its own handles instead of the frame's.
-        let graphic_selected =
-            sel.content && sel.items.len() == 1 && doc.item(sel.items[0]).is_some_and(|i| matches!(i.content, Content::Graphic(_)));
-        for h in designcraft_tools::select::handles(DRect::new(u.min.x as f64, u.min.y as f64, u.max.x as f64, u.max.y as f64))
-            .into_iter()
-            .filter(|_| !graphic_selected)
-        {
-            let r = Rect::from_center_size(pos2(h.x as f32, h.y as f32), vec2(hs, hs));
-            painter.rect_filled(r, 0.0, Color32::WHITE);
-            painter.rect_stroke(r, 0.0, Stroke::new(hair(painter), color), StrokeKind::Inside);
-        }
-    }
-    // Threads.
-    if app.ui.text_threads || sel.items.iter().any(|i| doc.item(*i).is_some_and(|x| x.is_text_frame())) {
-        for id in &sel.items {
-            let Some(sid) = doc.item(*id).and_then(|i| i.text_frame()).map(|t| t.story) else { continue };
-            let Some(story) = doc.story(sid) else { continue };
-            for w in story.frames.windows(2) {
-                let (Some(a), Some(b)) = (port_pos(doc, layout, w[0], true), port_pos(doc, layout, w[1], false)) else { continue };
-                let col = doc.item(w[0]).map(|i| layer_color(doc, i)).unwrap_or(color);
-                painter.line_segment([xf.to_screen(a), xf.to_screen(b)], Stroke::new(1.0, col));
-            }
-        }
-    }
-    text_rect.or(union)
-}
-
-/// How deep a selected group is walked for the text frames whose ports are drawn.
-const PORT_GROUP_DEPTH: usize = 32;
-
-/// The text frames whose ports `draw_selection` draws: the selected text frames and the text
-/// frames inside selected groups.
-fn ported_frames(app: &DesignApp, doc: &Document) -> std::collections::HashSet<designcraft_doc::ItemId> {
-    let mut frames = Vec::new();
-    if let Some(st) = app.session.active() {
-        for it in st.selection.items.iter().filter_map(|id| doc.item(*id)) {
-            text_frames_in(it, 0, &mut frames);
-        }
-    }
-    frames.into_iter().map(|(f, _)| f.id).collect()
-}
-
-/// Canvas centres of the always-on overset marks among `items`: the out port of every visible
-/// frame that ends an overset story, except the frames in `ported`, whose out port `draw_ports`
-/// already marks.
-fn overset_marks<'a>(
-    app: &DesignApp,
-    doc: &Document,
-    layout: &CanvasLayout,
-    items: &'a [std::sync::Arc<Item>],
-    zoom: f64,
-    ported: &std::collections::HashSet<designcraft_doc::ItemId>,
-) -> Vec<(&'a Item, Point)> {
-    let mut frames = Vec::new();
-    overset_frames(app, doc, items, 0, &mut frames);
-    frames
-        .into_iter()
-        .filter(|it| !ported.contains(&it.id))
-        .filter_map(|it| Some((it, designcraft_tools::thread::port_center(doc, layout, it.id, true, zoom)?)))
-        .collect()
-}
-
-/// The visible text frames among `items` (groups walked) that end an overset story.
-fn overset_frames<'a>(app: &DesignApp, doc: &Document, items: &'a [std::sync::Arc<Item>], depth: usize, out: &mut Vec<&'a Item>) {
-    if depth > PORT_GROUP_DEPTH {
-        return;
-    }
-    for it in items {
-        if it.hidden || doc.layer(it.layer).is_some_and(|l| !l.visible) {
-            continue;
-        }
-        match &it.content {
-            Content::Text(tf) => {
-                let Some(story) = doc.story(tf.story) else { continue };
-                if story.frames.last() == Some(&it.id) && app.session.cache.get(doc, tf.story, None).is_overset() {
-                    out.push(it);
-                }
-            }
-            Content::Group { items } => overset_frames(app, doc, items, depth + 1, out),
-            _ => {}
-        }
-    }
-}
-
-/// `it` when it is a text frame, or every text frame nested in it when it is a group, each with
-/// its story.
-fn text_frames_in<'a>(it: &'a Item, depth: usize, out: &mut Vec<(&'a Item, designcraft_doc::StoryId)>) {
-    match &it.content {
-        Content::Text(tf) => out.push((it, tf.story)),
-        Content::Group { items } if depth < PORT_GROUP_DEPTH => {
-            for child in items {
-                text_frames_in(child, depth + 1, out);
-            }
-        }
-        _ => {}
-    }
-}
-
-/// Port location (canvas): out port at bottom-right, in port at top-left.
-fn port_pos(doc: &Document, layout: &CanvasLayout, id: designcraft_doc::ItemId, out: bool) -> Option<Point> {
-    let it = doc.item(id)?;
-    let (a, _) = item_canvas_xf(doc, layout, id)?;
-    let r = it.inner_bounds();
-    let p = if out { Point::new(r.x1 - 10.0, r.y1) } else { Point::new(r.x0 + 10.0, r.y0) };
-    Some(a * it.xf * p)
-}
-
-#[allow(clippy::too_many_arguments)]
-fn draw_ports(
-    app: &DesignApp,
-    painter: &egui::Painter,
-    xf: &Xf,
-    doc: &Document,
-    layout: &CanvasLayout,
-    it: &Item,
-    sid: designcraft_doc::StoryId,
-    color: Color32,
-) {
-    let Some(story) = doc.story(sid) else { return };
-    let pos = story.frames.iter().position(|f| *f == it.id).unwrap_or(0);
-    let is_last = pos + 1 == story.frames.len();
-    let cs = app.session.cache.get(doc, sid, None);
-    let overset = is_last && cs.is_overset();
-    let s = designcraft_tools::thread::PORT_SIZE_PX as f32;
-    // In port on the left edge below the top-left corner; out port on the right edge above the
-    // bottom-right corner. The Selection tool hit-tests the same places.
-    let port = |out: bool| designcraft_tools::thread::port_center(doc, layout, it.id, out, xf.zoom).map(|c| xf.to_screen(c));
-    let (Some(inp), Some(outp)) = (port(false), port(true)) else { return };
-    for (c, has_link, is_out) in [(inp, pos > 0, false), (outp, !is_last, true)] {
-        let pr = Rect::from_center_size(c, vec2(s, s));
-        painter.rect_filled(pr, 0.0, Color32::WHITE);
-        painter.rect_stroke(pr, 0.0, Stroke::new(hair(painter), color), StrokeKind::Inside);
-        if is_out && overset {
-            let red = Color32::from_rgb(230, 20, 20);
-            painter.line_segment([c - vec2(2.5, 0.0), c + vec2(2.5, 0.0)], Stroke::new(1.5, red));
-            painter.line_segment([c - vec2(0.0, 2.5), c + vec2(0.0, 2.5)], Stroke::new(1.5, red));
-        } else if has_link {
-            painter.add(egui::Shape::convex_polygon(vec![c + vec2(-2.0, -2.5), c + vec2(2.5, 0.0), c + vec2(-2.0, 2.5)], color, Stroke::NONE));
-        }
-    }
-}
-
-fn draw_text_selection(
-    app: &DesignApp,
-    painter: &egui::Painter,
-    xf: &Xf,
-    doc: &Document,
-    layout: &CanvasLayout,
-    ts: designcraft_doc::TextSel,
-    cells: Option<designcraft_doc::TableSel>,
-) {
-    let cs = app.session.cache.get(doc, ts.story, None);
-    let range = ts.range();
-    let tint = Color32::from_rgba_unmultiplied(80, 140, 255, 110);
-    // Selected table cells: tint every selected cell.
-    if let Some(sel) = cells.filter(|c| c.story == ts.story) {
-        let selected = doc.story(sel.story).and_then(|s| s.tables.get(&sel.table)).map(|t| t.selected_owners(sel.range)).unwrap_or_default();
-        for ft in &cs.frames {
-            let (Some((a, _)), Some(it)) = (item_canvas_xf(doc, layout, ft.frame), doc.item(ft.frame)) else { continue };
-            let m = a * doc.text_xf(it);
-            for t in ft.tables.iter().filter(|t| t.table == sel.table) {
-                for c in t.cells.iter().filter(|c| selected.binary_search(&(c.row, c.col)).is_ok()) {
-                    let q = [
-                        xf.to_screen(m * Point::new(c.rect.x0, c.rect.y0)),
-                        xf.to_screen(m * Point::new(c.rect.x1, c.rect.y0)),
-                        xf.to_screen(m * Point::new(c.rect.x1, c.rect.y1)),
-                        xf.to_screen(m * Point::new(c.rect.x0, c.rect.y1)),
-                    ];
-                    painter.add(egui::Shape::convex_polygon(q.to_vec(), Color32::from_rgba_unmultiplied(80, 140, 255, 90), Stroke::NONE));
-                }
-            }
-        }
-        return;
-    }
-    if let Some(cell) = ts.cell {
-        draw_cell_selection(app, painter, xf, doc, layout, &cs, ts, cell);
-        return;
-    }
-    let mut runs: Vec<(usize, Affine, Vec<[Point; 4]>, Vec<(usize, usize)>)> = Vec::new();
-    for (fi, ft) in cs.frames.iter().enumerate() {
-        let Some((a, _)) = item_canvas_xf(doc, layout, ft.frame) else { continue };
-        let Some(it) = doc.item(ft.frame) else { continue };
-        let m = a * doc.text_xf(it);
-        // Show the frame edge while typing.
-        for poly in path_screen(it, xf, a) {
-            painter.add(egui::Shape::line(poly, Stroke::new(1.0, layer_color(doc, it).gamma_multiply(0.6))));
-        }
-        if range.is_empty() {
-            continue;
-        }
-        // Type on a path: the highlight bends with the text.
-        if let Some(map) = compose::PathTextMap::new(it, ft) {
-            for l in &ft.lines {
-                let (s, e) = (range.start.max(l.range.start), range.end.min(l.range.end));
-                if s >= e {
-                    continue;
-                }
-                for q in compose::highlight_quads(l, s, e, false) {
-                    let (x0, x1) = (q[0].x.min(q[1].x), q[0].x.max(q[1].x));
-                    let (y0, y1) = (q[0].y.min(q[2].y), q[0].y.max(q[2].y));
-                    // Short slices, each turned with the path.
-                    let n = ((x1 - x0) / 2.0).ceil().clamp(1.0, 2000.0) as usize;
-                    for k in 0..n {
-                        let (a, b) = (x0 + (x1 - x0) * k as f64 / n as f64, x0 + (x1 - x0) * (k + 1) as f64 / n as f64);
-                        let poly =
-                            [Point::new(a, y0), Point::new(b, y0), Point::new(b, y1), Point::new(a, y1)].map(|p| xf.to_screen(m * map.to_path(p)));
-                        painter.add(egui::Shape::convex_polygon(poly.to_vec(), tint, Stroke::NONE));
-                    }
-                }
-            }
-            continue;
-        }
-        let mut quads = Vec::new();
-        let mut glyphs = Vec::new();
-        for (li, l) in ft.lines.iter().enumerate() {
-            let s = range.start.max(l.range.start);
-            let e = range.end.min(l.range.end);
-            if s > e || (s == e && !(l.range.end < range.end && e == l.range.end)) {
-                continue;
-            }
-            let past = e == l.range.end && range.end > l.range.end;
-            quads.extend(compose::highlight_quads(l, s, e, past));
-            // A selected drop cap is highlighted down to its baseline.
-            if let Some(dc) = l.drop_cap {
-                let sel = l.glyphs.iter().filter(|g| g.len > 0 && g.byte < dc.end && g.byte >= s && g.byte < e);
-                let (a, b) = sel.fold((f64::INFINITY, f64::NEG_INFINITY), |(a, b), g| (a.min(g.x), b.max(g.x + g.adv)));
-                if a < b {
-                    let r = dc.rect;
-                    quads.push([Point::new(a, r.y0), Point::new(b, r.y0), Point::new(b, r.y1), Point::new(a, r.y1)]);
-                }
-            }
-            for (gi, g) in l.glyphs.iter().enumerate() {
-                if g.visible && g.len > 0 && g.byte >= s && g.byte < e {
-                    glyphs.push((li, gi));
-                }
-            }
-        }
-        if !quads.is_empty() {
-            runs.push((fi, m, quads, glyphs));
-        }
-    }
-    if !runs.is_empty() {
-        draw_inverse_highlight(app, painter, xf, doc, &cs, ts.story, &runs);
-    }
-    if ts.is_caret()
-        && let Some((fi, x, bl, asc, desc)) = compose::caret(&cs, ts.focus)
-        && let Some(ft) = cs.frames.get(fi)
-        && let (Some((a, _)), Some(it)) = (item_canvas_xf(doc, layout, ft.frame), doc.item(ft.frame))
-    {
-        let m = a * doc.text_xf(it);
-        // Type on a path: the caret stands across the path where it is along it.
-        let on = |p: Point| compose::PathTextMap::new(it, ft).map_or(p, |map| map.to_path(p));
-        let p0 = xf.to_screen(m * on(Point::new(x, bl - asc)));
-        let p1 = xf.to_screen(m * on(Point::new(x, bl + desc)));
-        let blink = (painter.ctx().input(|i| i.time) * 1.6) as i64 % 2 == 0;
-        if blink {
-            painter.line_segment([p0, p1], Stroke::new(1.0, Color32::BLACK));
-        }
-        painter.ctx().request_repaint_after(std::time::Duration::from_millis(330));
-    }
-}
-
-/// A text field had keyboard focus when this frame began, per window: egui keeps one focus per
-/// viewport, so a field focused in the main window must not mute the second window's canvas.
-fn field_focused_id(ctx: &egui::Context) -> egui::Id {
-    egui::Id::new("canvas_field_focused").with(ctx.viewport_id())
-}
-
-/// Called before the panels draw. A panel field gives up focus on Enter or Tab while it draws,
-/// before the canvas: without this the canvas would take that same key for the text.
-pub fn begin_frame(ctx: &egui::Context) {
-    let (id, focused) = (field_focused_id(ctx), ctx.text_edit_focused());
-    ctx.data_mut(|d| d.insert_temp(id, focused));
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        let now = ctx.input(|i| i.modifiers);
-        // The modifiers last frame ended with are the ones this frame's events began with.
-        ctx.data_mut(|d| {
-            let (_, end) = d.get_temp::<(egui::Modifiers, egui::Modifiers)>(modifiers_id()).unwrap_or((now, now));
-            d.insert_temp(modifiers_id(), (end, now));
-        });
-    }
-}
-
-/// (held when this frame's events began, held after them).
-#[cfg(not(target_arch = "wasm32"))]
-fn modifiers_id() -> egui::Id {
-    egui::Id::new("canvas-frame-modifiers")
-}
-
-/// Caret / text highlight inside a table cell (the cell's lines are offset by the cell origin).
-#[allow(clippy::too_many_arguments)]
-fn draw_cell_selection(
-    _app: &DesignApp,
-    painter: &egui::Painter,
-    xf: &Xf,
-    doc: &Document,
-    layout: &CanvasLayout,
-    cs: &compose::ComposedStory,
-    ts: designcraft_doc::TextSel,
-    cell: designcraft_doc::CellAddr,
-) {
-    // Footnote text or a cell: its composed story and where it sits in the frame.
-    let found = match cell.footnote_id() {
-        Some(id) => compose::find_note(cs, id).map(|(fi, n)| (fi, n.origin, n.text.clone())),
-        None => compose::find_cell(cs, cell.table, cell.row, cell.col).map(|(fi, _, pc)| (fi, pc.origin, pc.text.clone())),
-    };
-    let Some((fi, origin, text)) = found else { return };
-    let Some(ft) = cs.frames.get(fi) else { return };
-    let (Some((a, _)), Some(it)) = (item_canvas_xf(doc, layout, ft.frame), doc.item(ft.frame)) else { return };
-    let m = a * doc.text_xf(it) * designcraft_geom::Affine::translate(origin.to_vec2());
-    let range = ts.range();
-    if !range.is_empty()
-        && let Some(cft) = text.frames.first()
-    {
-        for l in &cft.lines {
-            let s = range.start.max(l.range.start);
-            let e = range.end.min(l.range.end);
-            if s > e || (s == e && !(l.range.end < range.end && e == l.range.end)) {
-                continue;
-            }
-            let past = e == l.range.end && range.end > l.range.end;
-            for q in compose::highlight_quads(l, s, e, past) {
-                let poly = q.map(|p| xf.to_screen(m * p));
-                painter.add(egui::Shape::convex_polygon(poly.to_vec(), Color32::from_rgba_unmultiplied(80, 140, 255, 110), Stroke::NONE));
-            }
-        }
-    }
-    if ts.is_caret()
-        && let Some((_, x, bl, asc, desc)) = match cell.footnote_id() {
-            Some(id) => compose::note_caret(cs, id, ts.focus),
-            None => compose::cell_caret(cs, cell.table, cell.row, cell.col, ts.focus),
-        }
-    {
-        let m = a * doc.text_xf(it);
-        let (p0, p1) = (xf.to_screen(m * Point::new(x, bl - asc)), xf.to_screen(m * Point::new(x, bl + desc)));
-        let blink = (painter.ctx().input(|i| i.time) * 1.6) as i64 % 2 == 0;
-        if blink {
-            painter.line_segment([p0, p1], Stroke::new(1.0, Color32::BLACK));
-        }
-        painter.ctx().request_repaint_after(std::time::Duration::from_millis(330));
-    }
-}
-
-/// InDesign draws selected text inverted: a black highlight with the selected glyphs in the
-/// inverse of their colour (white for black text). The highlight and glyph outlines are
-/// rasterised with `vello_cpu` into a small screen-space texture over the selection.
-fn draw_inverse_highlight(
-    app: &DesignApp,
-    painter: &egui::Painter,
-    xf: &Xf,
-    doc: &Document,
-    cs: &compose::ComposedStory,
-    story: designcraft_doc::StoryId,
-    runs: &[(usize, Affine, Vec<[Point; 4]>, Vec<(usize, usize)>)],
-) {
-    use designcraft_render::vello_cpu::{self, kurbo, peniko};
-    let ctx = painter.ctx();
-    let ppp = ctx.pixels_per_point();
-    let to_screen = |m: Affine, p: Point| xf.to_screen(m * p);
-    let mut bbox = Rect::NOTHING;
-    for (_, m, quads, _) in runs {
-        for q in quads {
-            for p in q {
-                bbox.extend_with(to_screen(*m, *p));
-            }
-        }
-    }
-    let bbox = bbox.intersect(painter.clip_rect());
-    if !bbox.is_positive() {
-        return;
-    }
-    // Snap to device pixels so the texture maps 1:1.
-    let bbox = Rect::from_min_max(
-        pos2((bbox.min.x * ppp).floor() / ppp, (bbox.min.y * ppp).floor() / ppp),
-        pos2((bbox.max.x * ppp).ceil() / ppp, (bbox.max.y * ppp).ceil() / ppp),
-    );
-    let (w, h) = (((bbox.width() * ppp).round() as u32).clamp(1, 8192), ((bbox.height() * ppp).round() as u32).clamp(1, 8192));
-    let Some(st) = app.session.active() else { return };
-    let key = egui::Id::new(("inverse_sel", st.uid, st.revision, std::sync::Arc::as_ptr(&st.doc) as usize, story.0))
-        .with((runs.iter().map(|r| r.2.len() + r.3.len() * 7919).sum::<usize>(), w, h))
-        .with((bbox.min.x.to_bits(), bbox.min.y.to_bits(), xf.zoom.to_bits(), st.selection.text.map(|t| (t.anchor, t.focus))));
-    let cache_id = egui::Id::new("inverse_sel_tex");
-    let cached: Option<(egui::Id, egui::TextureHandle)> = ctx.data(|d| d.get_temp(cache_id));
-    let tex = match cached {
-        Some((k, t)) if k == key => t,
-        _ => {
-            let view = xf.affine(ppp as f64, bbox.min);
-            let mut rc = vello_cpu::RenderContext::new_with(w as u16, h as u16, vello_cpu::RenderSettings { num_threads: 0, ..Default::default() });
-            rc.set_paint(peniko::Color::from_rgba8(0, 0, 0, 255));
-            for (_, m, quads, _) in runs {
-                rc.set_transform(view * *m);
-                for q in quads {
-                    let mut bp = kurbo::BezPath::new();
-                    bp.move_to(q[0]);
-                    for p in &q[1..] {
-                        bp.line_to(*p);
-                    }
-                    bp.close_path();
-                    rc.fill_path(&bp);
-                }
-            }
-            let db = designcraft_fonts::FontDb::global();
-            for (fi, m, _, glyphs) in runs {
-                let Some(ft) = cs.frames.get(*fi) else { continue };
-                for &(li, gi) in glyphs {
-                    let Some(l) = ft.lines.get(li) else { continue };
-                    let Some(g) = l.glyphs.get(gi) else { continue };
-                    let Some(style) = cs.styles.get(g.style as usize) else { continue };
-                    let Some(c) = doc.resolve_color(&style.fill, style.fill_tint) else { continue };
-                    let [r, gg, b, _] = c.to_rgba8(1.0);
-                    rc.set_paint(peniko::Color::from_rgba8(255 - r, 255 - gg, 255 - b, 255));
-                    let outline = db.outline(&g.face, g.gid);
-                    let skew =
-                        if style.skew != 0.0 { Affine::new([1.0, 0.0, -style.skew.to_radians().tan(), 1.0, 0.0, 0.0]) } else { Affine::IDENTITY };
-                    let shatai = style.shatai_xf(g, l.baseline).unwrap_or(Affine::IDENTITY);
-                    let ga = shatai * Affine::translate((g.x, l.baseline + g.y)) * skew * Affine::scale_non_uniform(g.sx, g.sy);
-                    rc.set_transform(view * *m * ga);
-                    rc.fill_path(&outline);
-                }
-            }
-            rc.flush();
-            let mut pm = vello_cpu::Pixmap::new(w as u16, h as u16);
-            let mut res = vello_cpu::Resources::new();
-            rc.render(&mut pm, &mut res);
-            let ci = egui::ColorImage::from_rgba_premultiplied([w as usize, h as usize], pm.data_as_u8_slice());
-            let t = crate::widgets::load_texture(ctx, "inverse_selection", ci, egui::TextureOptions::NEAREST);
-            ctx.data_mut(|d| d.insert_temp(cache_id, (key, t.clone())));
-            t
-        }
-    };
-    painter.image(tex.id(), bbox, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
-}
-
-fn draw_tool_overlays(app: &mut DesignApp, painter: &egui::Painter, xf: &Xf) {
-    if let (Some((z, c)), Some(rect)) = (app.power_zoom, app.canvas_rect) {
-        // The view that releasing returns to.
-        let (w, h) = (rect.width() as f64 / z, rect.height() as f64 / z);
-        let r = xf.rect(designcraft_geom::Rect::new(c.x - w / 2.0, c.y - h / 2.0, c.x + w / 2.0, c.y + h / 2.0));
-        painter.rect_stroke(r, 0.0, egui::Stroke::new(1.5, Color32::from_rgb(230, 40, 40)), egui::StrokeKind::Middle);
-    }
-    let tok = Tokens::get(painter.ctx());
-    let ov = app.session.overlays(app.view_info());
-    let doc = app.session.active().map(|st| st.doc.clone());
-    let layout = app.session.layout();
-    let sel_color = selection_color(app);
-    for o in ov {
-        match o {
-            Overlay::Marquee(r) => {
-                let r = xf.rect(r);
-                painter.rect_filled(r, 0.0, Color32::from_rgba_unmultiplied(80, 140, 255, 30));
-                for (a, b) in [
-                    (r.left_top(), r.right_top()),
-                    (r.right_top(), r.right_bottom()),
-                    (r.right_bottom(), r.left_bottom()),
-                    (r.left_bottom(), r.left_top()),
-                ] {
-                    dashed(painter, a, b, Stroke::new(1.0, Color32::from_gray(200)), 3.0, 3.0);
-                }
-            }
-            Overlay::Measure { p, text } => {
-                let s = xf.to_screen(p) + vec2(14.0, 14.0);
-                let g = painter.layout_no_wrap(text, egui::FontId::proportional(11.0), tok.measure_text);
-                let r = Rect::from_min_size(s, g.size() + vec2(10.0, 6.0));
-                painter.rect_filled(r, 3.0, tok.measure_bg);
-                painter.galley(r.min + vec2(5.0, 3.0), g, tok.measure_text);
-            }
-            Overlay::Line { a, b, color, dashed: d } => {
-                let st = Stroke::new(1.0, c32(color));
-                if d {
-                    dashed(painter, xf.to_screen(a), xf.to_screen(b), st, 3.0, 3.0);
-                } else {
-                    painter.line_segment([xf.to_screen(a), xf.to_screen(b)], st);
-                }
-            }
-            Overlay::Guide { a, b } => {
-                painter.line_segment([xf.to_screen(a), xf.to_screen(b)], Stroke::new(1.0, tok.smart_guide));
-            }
-            Overlay::Gap { a, b, label } => {
-                let (a, b) = (xf.to_screen(a), xf.to_screen(b));
-                painter.line_segment([a, b], Stroke::new(1.0, tok.smart_guide));
-                let s = a + (b - a) * 0.5;
-                let g = painter.layout_no_wrap(label, egui::FontId::proportional(11.0), tok.measure_text);
-                let r = Rect::from_min_size(s, g.size() + vec2(10.0, 6.0));
-                painter.rect_filled(r, 3.0, tok.measure_bg);
-                painter.galley(r.min + vec2(5.0, 3.0), g, tok.measure_text);
-            }
-            Overlay::Path { path, color, dashed: d } => draw_path_overlay(painter, xf, &path, c32(color), d),
-            Overlay::ContentGhost(id) => {
-                if let Some(doc) = &doc {
-                    draw_content_ghost(painter, xf, doc, &layout, id);
-                }
-            }
-            Overlay::LiveCornerWidget(p) => {
-                let r = Rect::from_center_size(xf.to_screen(p), vec2(6.0, 6.0));
-                painter.rect_filled(r, 0.0, tok.live_corner);
-                painter.rect_stroke(r, 0.0, Stroke::new(1.0, sel_color), StrokeKind::Inside);
-            }
-            Overlay::LiveCornerDiamond(p) => {
-                let c = xf.to_screen(p);
-                let h = 4.5;
-                let pts = vec![c + vec2(0.0, -h), c + vec2(h, 0.0), c + vec2(0.0, h), c + vec2(-h, 0.0)];
-                painter.add(egui::Shape::convex_polygon(pts, tok.live_corner, Stroke::new(1.0, sel_color)));
-            }
-            Overlay::PageHandles(r) => {
-                // The Page tool's selected page: outline and eight handles, as InDesign draws them.
-                let r = xf.rect(r);
-                let col = Color32::from_rgb(79, 153, 255);
-                painter.rect_stroke(r, 0.0, Stroke::new(1.0, col), StrokeKind::Middle);
-                for i in (0..9).filter(|i| *i != 4) {
-                    let c = pos2(r.min.x + r.width() * (i % 3) as f32 / 2.0, r.min.y + r.height() * (i / 3) as f32 / 2.0);
-                    let h = Rect::from_center_size(c, vec2(7.0, 7.0));
-                    painter.rect_filled(h, 0.0, Color32::WHITE);
-                    painter.rect_stroke(h, 0.0, Stroke::new(1.0, col), StrokeKind::Inside);
-                }
-            }
-            Overlay::Tag { p, text } => {
-                let text = crate::i18n::tr(&app.ui.language, &text).to_owned();
-                let s = xf.to_screen(p);
-                let g = painter.layout_no_wrap(text, egui::FontId::proportional(10.0), tok.measure_text);
-                let r = Rect::from_min_size(s - vec2(0.0, g.size().y + 4.0), g.size() + vec2(8.0, 4.0));
-                painter.rect_filled(r, 2.0, tok.measure_bg);
-                painter.rect_stroke(r, 2.0, Stroke::new(1.0, Color32::from_rgb(79, 153, 255)), StrokeKind::Inside);
-                painter.galley(r.min + vec2(4.0, 2.0), g, tok.measure_text);
-            }
-            Overlay::Tip { p, text } => {
-                let text = crate::i18n::tr(&app.ui.language, &text).to_owned();
-                let s = xf.to_screen(p) + vec2(14.0, 14.0);
-                let g = painter.layout(text, egui::FontId::proportional(11.0), tok.measure_text, 260.0);
-                let r = Rect::from_min_size(s, g.size() + vec2(10.0, 6.0));
-                painter.rect_filled(r, 3.0, tok.measure_bg);
-                painter.galley(r.min + vec2(5.0, 3.0), g, tok.measure_text);
-            }
-            Overlay::LiquidPins { object, page, pins, resize } => draw_liquid_pins(painter, xf.rect(object), xf.rect(page), pins, resize),
-        }
-    }
-}
-
-/// A path overlay (canvas coordinates; the Pencil's stroke while drawing, the Smooth and Erase
-/// drags) as screen polylines, its curves flattened to about a quarter of a screen pixel.
-fn draw_path_overlay(painter: &egui::Painter, xf: &Xf, path: &designcraft_geom::BezPath, color: Color32, dashed_line: bool) {
-    use designcraft_geom::PathEl;
-    let stroke = Stroke::new(1.0, color);
-    let mut runs: Vec<Vec<Pos2>> = Vec::new();
-    designcraft_geom::kurbo::flatten(path, 0.25 / xf.zoom.max(1e-9), |el| match el {
-        PathEl::MoveTo(p) => runs.push(vec![xf.to_screen(p)]),
-        PathEl::LineTo(p) => {
-            if let Some(run) = runs.last_mut() {
-                run.push(xf.to_screen(p));
-            }
-        }
-        PathEl::ClosePath => {
-            if let Some(run) = runs.last_mut()
-                && let Some(&first) = run.first()
-            {
-                run.push(first);
-            }
-        }
-        // Flattening yields only moves, lines and closes.
-        PathEl::QuadTo(..) | PathEl::CurveTo(..) => {}
-    });
-    for run in runs.into_iter().filter(|r| r.len() >= 2) {
-        if dashed_line {
-            painter.extend(egui::Shape::dashed_line(&run, stroke, 3.0, 3.0));
-        } else {
-            painter.add(egui::Shape::line(run, stroke));
-        }
-    }
-}
-
-/// A frame's whole content drawn faintly over the canvas, the part outside the frame included,
-/// with its bounds outlined (while the content moves inside the frame).
-fn draw_content_ghost(painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout, id: designcraft_doc::ItemId) {
-    let Some(it) = doc.item(id) else { return };
-    let Some((a, _)) = item_canvas_xf(doc, layout, id) else { return };
-    let outline = Stroke::new(1.0, Color32::from_rgb(196, 111, 43));
-    let Content::Graphic(g) = &it.content else {
-        for c in it.children() {
-            let r = xf.rect((a * it.xf).transform_rect_bbox(c.bounds()));
-            painter.rect_stroke(r, 0.0, outline, StrokeKind::Middle);
-        }
-        return;
-    };
-    let m = a * it.xf * g.xf;
-    let (w, h) = g.size;
-    let corners = [Point::new(0.0, 0.0), Point::new(w, 0.0), Point::new(w, h), Point::new(0.0, h)].map(|p| xf.to_screen(m * p));
-    if corners.iter().any(|p| !p.x.is_finite() || !p.y.is_finite()) {
-        return;
-    }
-    if let Some(tex) = ghost_texture(painter.ctx(), doc, g) {
-        let mut mesh = egui::Mesh::with_texture(tex.id());
-        let tint = Color32::from_white_alpha(90);
-        for (p, uv) in corners.iter().zip([pos2(0.0, 0.0), pos2(1.0, 0.0), pos2(1.0, 1.0), pos2(0.0, 1.0)]) {
-            mesh.vertices.push(egui::epaint::Vertex { pos: *p, uv, color: tint });
-        }
-        mesh.indices.extend([0, 1, 2, 0, 2, 3]);
-        painter.add(egui::Shape::mesh(mesh));
-    }
-    painter.add(egui::Shape::closed_line(corners.to_vec(), outline));
-}
-
-/// A screen-resolution proxy of a placed graphic for the ghost, cached per asset.
-fn ghost_texture(ctx: &egui::Context, doc: &Document, g: &designcraft_doc::Graphic) -> Option<egui::TextureHandle> {
-    let asset = doc.assets.get(&g.asset)?;
-    let key = egui::Id::new(("content_ghost", std::sync::Arc::as_ptr(&asset.data) as usize, asset.data.len(), asset.page));
-    if let Some(t) = ctx.data(|d| d.get_temp::<egui::TextureHandle>(key)) {
-        return Some(t);
-    }
-    // A 72 ppi proxy is enough for a faint preview.
-    let pm = designcraft_render::images::mip(&asset.data, asset.page, g.size.0, 1.0)?;
-    let (pw, ph) = (pm.width() as usize, pm.height() as usize);
-    if pw == 0 || ph == 0 {
-        return None;
-    }
-    let ci = egui::ColorImage::from_rgba_premultiplied([pw, ph], pm.data_as_u8_slice());
-    let max = ctx.input(|i| i.max_texture_side).min(4096);
-    let t = ctx.load_texture("content_ghost", crate::widgets::fit_texture(ci, max), egui::TextureOptions::LINEAR);
-    ctx.data_mut(|d| d.insert_temp(key, t.clone()));
-    Some(t)
-}
-
-/// An object's liquid controls on an object-based page, as InDesign draws them in orange: a
-/// dashed line across the object for width and height with a padlock (closed: locked), and a pin
-/// outside each edge (pinned: a line to the page edge).
-fn draw_liquid_pins(painter: &egui::Painter, o: Rect, page: Rect, pins: [bool; 4], resize: [bool; 2]) {
-    let col = Color32::from_rgb(178, 88, 18);
-    let st = Stroke::new(1.5, col);
-    let c = o.center();
-    let mids = [pos2(c.x, o.min.y), pos2(o.max.x, c.y), pos2(c.x, o.max.y), pos2(o.min.x, c.y)];
-    // The width and height lines between the edges' middles.
-    for (a, b) in [(mids[3], mids[1]), (mids[0], mids[2])] {
-        dashed(painter, a, b, Stroke::new(1.0, col), 3.0, 3.0);
-    }
-    for m in mids {
-        painter.circle_filled(m, 3.5, col);
-    }
-    let (po, lo) = (designcraft_tools::PIN_OFFSET_PX as f32, designcraft_tools::LOCK_OFFSET_PX as f32);
-    let outward = [vec2(0.0, -1.0), vec2(1.0, 0.0), vec2(0.0, 1.0), vec2(-1.0, 0.0)];
-    let edge = [pos2(c.x, page.min.y), pos2(page.max.x, c.y), pos2(c.x, page.max.y), pos2(page.min.x, c.y)];
-    for i in 0..4 {
-        if pins[i] {
-            painter.line_segment([mids[i], edge[i]], st);
-            painter.circle_filled(edge[i], 4.0, col);
-        } else {
-            painter.circle_stroke(mids[i] + outward[i] * po, 4.0, st);
-        }
-    }
-    // Padlocks: the width lock right of the centre, the height lock above it.
-    for (at, locked) in [(c + vec2(lo, 0.0), !resize[0]), (c + vec2(0.0, -lo), !resize[1])] {
-        let body = Rect::from_center_size(at + vec2(0.0, 2.0), vec2(8.0, 6.0));
-        painter.rect_filled(body.expand(1.0), 1.0, Color32::WHITE);
-        painter.rect_filled(body, 1.0, col);
-        // The shackle: over the body when locked, swung open when not.
-        let base = if locked { body.center().x } else { body.center().x + 3.0 };
-        let pts: Vec<_> = (0..=8)
-            .map(|k| {
-                let a = std::f32::consts::PI * k as f32 / 8.0;
-                pos2(base - 2.6 * a.cos(), body.min.y - 3.0 * a.sin())
-            })
-            .collect();
-        painter.add(egui::Shape::line(pts, Stroke::new(1.3, col)));
-    }
-}
-
-#[allow(clippy::too_many_arguments)]
-fn draw_rulers(app: &DesignApp, ui: &egui::Ui, full: Rect, rect: Rect, xf: &Xf, doc: &Document, layout: &CanvasLayout, t: &Tokens) {
-    let painter = ui.painter_at(full);
-    let (top, left) = ruler_rects(full, rect);
-    painter.rect_filled(top, 0.0, t.ruler);
-    painter.rect_filled(left, 0.0, t.ruler);
-    painter.rect_filled(Rect::from_min_max(full.min, rect.min), 0.0, t.ruler);
-    painter.line_segment([pos2(rect.min.x, rect.min.y - 0.25), pos2(full.max.x, rect.min.y - 0.25)], Stroke::new(0.5, t.ruler_tick));
-    painter.line_segment([pos2(rect.min.x - 0.25, rect.min.y), pos2(rect.min.x - 0.25, full.max.y)], Stroke::new(0.5, t.ruler_tick));
-    // Zero-point crosshair box.
-    let corner = Rect::from_min_max(full.min, rect.min);
-    let zc = corner.center();
-    painter.line_segment([zc - vec2(4.0, 0.0), zc + vec2(4.0, 0.0)], Stroke::new(1.0, t.ruler_tick));
-    painter.line_segment([zc - vec2(0.0, 4.0), zc + vec2(0.0, 4.0)], Stroke::new(1.0, t.ruler_tick));
-    // While the zero point is dragged out of the corner, the rulers measure from where it would
-    // land (kept on the pasteboard, as the engine keeps it) and crosshair lines show the spot.
-    // Cmd-dragged, the lines are the two guides it makes; locked, a plain drag does nothing.
-    let dragged = ui.data(|d| d.get_temp::<Pos2>(egui::Id::new((ZERO_POINT_DRAG, app.pane)))).filter(|p| !corner.contains(*p));
-    let guides = ui.input(|i| i.modifiers.command);
-    let moving = dragged.filter(|_| !guides && !doc.settings.zero_point_locked).and_then(|p| zero_point_at(app, xf, p));
-    let cross = if guides { dragged } else { moving.map(|(_, c)| xf.to_screen(c)) };
-    if let Some(p) = cross {
-        let m = Stroke::new(1.0, t.text_dim);
-        dashed(&painter, pos2(p.x, rect.min.y), pos2(p.x, full.max.y), m, 3.0, 3.0);
-        dashed(&painter, pos2(rect.min.x, p.y), pos2(full.max.x, p.y), m, 3.0, 3.0);
-    }
-    let zp = moving.map_or_else(|| doc.zero_point(), |(zp, _)| zp);
-    let pieces = ruler_pieces(app, doc, layout, zp);
-    let Some(&(_, _, origin)) = pieces.first() else { return };
-    let font = egui::FontId::proportional(9.0);
-    let tick = Stroke::new(1.0, t.ruler_tick);
-    // Horizontal: one run of ticks per piece (a page origin restarts at every page).
-    let unit = doc.settings.horizontal_units;
-    let (major, sub) = unit.ruler_ticks(xf.zoom);
-    let (v0, v1) = (xf.to_canvas(top.min).x, xf.to_canvas(pos2(top.max.x, 0.0)).x);
-    for &(from, to, o) in &pieces {
-        // The piece and the visible ruler, measured from the piece's origin.
-        let (s0, s1) = (from - o.x, to - o.x);
-        let (c0, c1) = ((v0 - o.x).max(s0), (v1 - o.x).min(s1));
-        if !(c0.is_finite() && c1.is_finite() && c0 <= c1) {
-            continue;
-        }
-        let mut k = (c0 / major).floor() as i64;
-        while (k as f64) * major <= c1 {
-            let x0 = k as f64 * major;
-            for s in 0..sub {
-                let x = x0 + major * s as f64 / sub as f64;
-                if x < s0 || x >= s1 {
-                    continue;
-                }
-                let sx = xf.to_screen(Point::new(o.x + x, 0.0)).x;
-                let len = if s == 0 {
-                    RULER
-                } else if sub % 2 == 0 && s == sub / 2 {
-                    7.0
-                } else {
-                    4.0
-                };
-                painter.line_segment([pos2(sx, top.max.y - len), pos2(sx, top.max.y)], tick);
-                if s == 0 {
-                    let v = unit.from_pt(x);
-                    painter.text(pos2(sx + 2.0, top.min.y + 1.0), egui::Align2::LEFT_TOP, fmt_tick(v), font.clone(), t.ruler_text);
-                }
-            }
-            k += 1;
-        }
-    }
-    // Vertical.
-    let unit = doc.settings.vertical_units;
-    let (major, sub) = unit.ruler_ticks(xf.zoom);
-    let c0 = xf.to_canvas(pos2(0.0, left.min.y)).y - origin.y;
-    let c1 = xf.to_canvas(pos2(0.0, left.max.y)).y - origin.y;
-    let mut k = (c0 / major).floor() as i64;
-    while (k as f64) * major <= c1 {
-        let y0 = k as f64 * major;
-        for s in 0..sub {
-            let y = y0 + major * s as f64 / sub as f64;
-            let sy = xf.to_screen(Point::new(0.0, origin.y + y)).y;
-            let len = if s == 0 {
-                RULER
-            } else if sub % 2 == 0 && s == sub / 2 {
-                7.0
-            } else {
-                4.0
-            };
-            painter.line_segment([pos2(left.max.x - len, sy), pos2(left.max.x, sy)], tick);
-            if s == 0 {
-                // Stacked digits like InDesign's vertical ruler.
-                let label = fmt_tick(unit.from_pt(y));
-                for (j, ch) in label.chars().enumerate() {
-                    painter.text(pos2(left.min.x + 3.0, sy + 2.0 + j as f32 * 8.5), egui::Align2::LEFT_TOP, ch, font.clone(), t.ruler_text);
-                }
-            }
-        }
-        k += 1;
-    }
-    // Pointer position markers.
-    if let Some(p) = ui.ctx().pointer_hover_pos().filter(|p| rect.contains(*p)) {
-        let m = Stroke::new(1.0, t.text_dim);
-        dashed(&painter, pos2(p.x, top.min.y), pos2(p.x, top.max.y), m, 1.5, 1.5);
-        dashed(&painter, pos2(left.min.x, p.y), pos2(left.max.x, p.y), m, 1.5, 1.5);
-    }
-}
-
-/// The horizontal ruler of the spread in view in pieces `(from x, to x, origin)`, canvas
-/// coordinates: the ruler origin (one per page for a page origin) moved by zero point `zp`.
-fn ruler_pieces(app: &DesignApp, doc: &Document, layout: &CanvasLayout, zp: [f64; 2]) -> Vec<(f64, f64, Point)> {
-    let Some(slot) = current_slot(app, layout).and_then(|i| layout.slots.get(i)) else { return Vec::new() };
-    ruler_pieces_of(doc, slot, zp)
-}
-
-/// [`ruler_pieces`] for the spread in `slot`.
-fn ruler_pieces_of(doc: &Document, slot: &SpreadSlot, zp: [f64; 2]) -> Vec<(f64, f64, Point)> {
-    let x = |v: f64, y: f64| if v.is_finite() { slot.to_canvas(Point::new(v, y)).x } else { v };
-    doc.ruler_pieces(slot.spread)
-        .into_iter()
-        .map(|(from, to, b)| (x(from, b.y), x(to, b.y), slot.to_canvas(Point::new(b.x + zp[0], b.y + zp[1]))))
-        .collect()
-}
-
-/// The horizontal (top) and vertical (left) rulers around the view `rect` in `full`.
-fn ruler_rects(full: Rect, rect: Rect) -> (Rect, Rect) {
-    (
-        Rect::from_min_max(pos2(rect.min.x, full.min.y), pos2(full.max.x, rect.min.y)),
-        Rect::from_min_max(pos2(full.min.x, rect.min.y), pos2(rect.min.x, full.max.y)),
-    )
-}
-
-/// Right-clicking a ruler opens its menu, as InDesign's: units for that ruler, Hide Rulers and
-/// (the horizontal ruler) Delete All Guides on Spread. Right-clicking the corner where they meet
-/// opens Lock Zero Point and the units for both rulers at once.
-fn ruler_units_menus(app: &mut DesignApp, resp: &egui::Response, full: Rect, rect: Rect, doc: &Document) {
-    let (top, left) = ruler_rects(full, rect);
-    let corner = Rect::from_min_max(full.min, rect.min);
-    let at = resp.interact_pointer_pos();
-    let (h, v) = (doc.settings.horizontal_units, doc.settings.vertical_units);
-    let locked = doc.settings.zero_point_locked;
-    // (where, which units it sets, the unit checked)
-    let menus = [(top, RulerMenu::Horizontal, Some(h)), (left, RulerMenu::Vertical, Some(v)), (corner, RulerMenu::Both, (h == v).then_some(h))];
-    for (area, which, cur) in menus {
-        let open = if resp.secondary_clicked() {
-            Some(egui::SetOpenCommand::Bool(at.is_some_and(|p| area.contains(p))))
-        } else if resp.clicked() {
-            Some(egui::SetOpenCommand::Bool(false))
-        } else {
-            None
-        };
-        egui::Popup::context_menu(resp)
-            .id(resp.id.with(("ruler_units", which as u8)))
-            .open_memory(open)
-            .show(|ui| ruler_units_menu(app, ui, which, cur, locked));
-    }
-}
-
-#[derive(Clone, Copy, PartialEq)]
-enum RulerMenu {
-    Horizontal,
-    Vertical,
-    Both,
-}
-
-/// The units a ruler's menu offers, in InDesign's order.
-const RULER_UNITS: [designcraft_geom::Unit; 9] = {
-    use designcraft_geom::Unit::*;
-    [Points, Picas, Inches, InchesDecimal, Millimeters, Centimeters, Ciceros, Agates, Pixels]
-};
-
-/// A ruler's menu: the units (the current one checked), then Hide Rulers and, on the horizontal
-/// ruler, Delete All Guides on Spread. The corner's menu (`Both`) starts with Lock Zero Point
-/// (`locked` = the zero point is locked). Picking a unit sets `horizontalUnits`,
-/// `verticalUnits` or both through `document.preferences`.
-fn ruler_units_menu(app: &mut DesignApp, ui: &mut egui::Ui, which: RulerMenu, cur: Option<designcraft_geom::Unit>, locked: bool) {
-    let lang = app.ui.language.clone();
-    let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
-    if which == RulerMenu::Both {
-        let label = tr(if locked { "Unlock Zero Point" } else { "Lock Zero Point" });
-        if ui.button(crate::rtl::widget(ui, format!("   {label}"))).clicked() {
-            let _ = app.run("view.lockZeroPoint", json!({"on": !locked}));
-            ui.close();
-        }
-        ui.separator();
-    }
-    // A document in Q or Ha keeps its unit on the list.
-    let extra = cur.filter(|u| !RULER_UNITS.contains(u));
-    for u in RULER_UNITS.into_iter().chain(extra) {
-        let label = tr(u.label());
-        let text = if Some(u) == cur { format!("✓ {label}") } else { format!("   {label}") };
-        if ui.button(crate::rtl::widget(ui, text)).clicked() {
-            let p = match which {
-                RulerMenu::Horizontal => json!({"horizontalUnits": u}),
-                RulerMenu::Vertical => json!({"verticalUnits": u}),
-                RulerMenu::Both => json!({"horizontalUnits": u, "verticalUnits": u}),
-            };
-            let _ = app.run("document.preferences", p);
-            ui.close();
-        }
-    }
-    ui.separator();
-    let hide = format!("   {}", tr("Hide Rulers"));
-    if ui
-        .add(egui::Button::new(crate::rtl::widget(ui, hide)).shortcut_text(crate::menus::shortcut_of(app, "view.rulers").unwrap_or_default()))
-        .clicked()
-    {
-        let _ = app.run("view.rulers", json!({}));
-        ui.close();
-    }
-    if which == RulerMenu::Horizontal && ui.button(crate::rtl::widget(ui, format!("   {}", tr("Delete All Guides on Spread")))).clicked() {
-        crate::menus::activate(app, "app.deleteAllGuides", &Value::Null);
-        ui.close();
-    }
-}
-
-/// A canvas context menu asked for by a right-click; `open` until the popup is open after a frame.
-#[derive(Clone, Copy, Debug)]
-struct MenuRequest {
-    kind: crate::menus::ContextMenu,
-    open: bool,
-}
-
-/// The popup id of the canvas context menu in split-view pane `pane`.
-fn context_menu_id(pane: u8) -> egui::Id {
-    egui::Id::new(("canvas_context_menu", pane))
-}
-
-/// Was a canvas context menu open (in either pane of this window) when this frame began?
-/// Pane 0 shows its menu, which a click or Escape may close, before pane 1 handles input; that
-/// click or key still belongs to the menu. Popups are per window (viewport), and so is input.
-pub fn context_menu_open(ctx: &egui::Context) -> bool {
-    let pass = ctx.cumulative_pass_nr();
-    let key = egui::Id::new("canvas_context_menu_open").with(ctx.viewport_id());
-    if let Some((p, open)) = ctx.data(|d| d.get_temp::<(u64, bool)>(key))
-        && p == pass
-    {
-        return open;
-    }
-    let open = (0..2).any(|pane| egui::Popup::is_id_open(ctx, context_menu_id(pane)));
-    ctx.data_mut(|d| d.insert_temp(key, (pass, open)));
-    open
-}
-
-/// Shows the context menu a right-click asked for. A right-click while the menu is open closes it
-/// in that frame (it was a click outside the menu), so the request stays until a frame ends with
-/// the menu open: it reopens in the next frame where the new click was.
-fn context_menu(app: &mut DesignApp, ui: &egui::Ui, resp: &egui::Response) {
-    let id = context_menu_id(app.pane);
-    let Some(req) = ui.data(|d| d.get_temp::<MenuRequest>(id)) else { return };
-    egui::Popup::menu(resp)
-        .id(id)
-        .open_memory(req.open.then_some(egui::SetOpenCommand::Bool(true)))
-        .at_pointer_fixed()
-        .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
-        .show(|ui| crate::menus::context_menu(app, ui, req.kind));
-    if req.open {
-        if egui::Popup::is_id_open(ui.ctx(), id) {
-            ui.data_mut(|d| d.insert_temp(id, MenuRequest { open: false, ..req }));
-        } else {
-            ui.ctx().request_repaint();
-        }
-    }
-}
-
-/// Prepares a right-click at canvas point `p`: picks the menu and the selection it acts on.
-/// - Typing: a click in a text frame places the caret there as a left click would, except
-///   inside the selected text, which stays selected; elsewhere the text is left as it is.
-/// - On an object: it is selected first unless it already is, as the Selection tool would.
-/// - On nothing: the selection stays.
-fn context_target(app: &mut DesignApp, p: Point, zoom: f64) -> crate::menus::ContextMenu {
-    use crate::menus::ContextMenu;
-    let hit = item_at(app, p, zoom);
-    if app.session.wants_text() {
-        let text_frame = hit.filter(|(id, _)| app.session.active().and_then(|st| st.doc.item(*id)).is_some_and(Item::is_text_frame));
-        if let Some((id, sp)) = text_frame {
-            // A press in the selected text keeps it for dragging; end that press without a move.
-            if app.run("text.placeCaret", json!({"frame": id.0, "point": [sp.x, sp.y]})).is_ok_and(|r| r["dragging"] == json!(true)) {
-                let _ = app.run("text.release", json!({"frame": id.0, "point": [sp.x, sp.y], "moved": true}));
-            }
-        }
-        return ContextMenu::Text;
-    }
-    let Some((id, _)) = hit else { return ContextMenu::Canvas };
-    let direct = app.session.tool_id() == "directSelection";
-    let Some((target, selected)) = app.session.active().map(|st| {
-        let target = if direct { id } else { st.doc.top_level_of(id).unwrap_or(id) };
-        (target, st.selection.contains(target))
-    }) else {
-        return ContextMenu::Canvas;
-    };
-    if !selected {
-        let _ = app.run("selection.set", json!({"ids": [target.0], "content": direct}));
-    }
-    ContextMenu::Object
-}
-
-/// The frontmost item under canvas point `p` and that point in its spread, hit as the tools do.
-fn item_at(app: &DesignApp, p: Point, zoom: f64) -> Option<(designcraft_doc::ItemId, Point)> {
-    let st = app.session.active()?;
-    let (sr, sp) = CanvasLayout::new(&st.doc, st.editing_parents).spread_at(p)?;
-    let tol = 4.0 / zoom.max(1e-6);
-    let id = match sr {
-        SpreadRef::Doc(si) => st.doc.hit_item(si, sp, tol)?,
-        _ => st.doc.spread(sr)?.items.iter().rev().find(|it| !it.locked && designcraft_doc::edit_hit(it, sp, tol))?.id,
-    };
-    Some((id, sp))
-}
-
-pub(crate) fn fmt_tick(v: f64) -> String {
-    let r = v.round();
-    if (v - r).abs() < 1e-6 { format!("{}", r as i64) } else { format!("{v:.1}") }
-}
-
-/// Move the view's content by a screen-space distance `d` (rotated views move in screen axes).
-fn pan(app: &mut DesignApp, xf: &Xf, d: egui::Vec2) {
-    let d = xf.unrotate_delta(d);
-    if let Some(v) = app.view_mut() {
-        v.origin = Point::new(v.origin.x - d.x as f64 / v.zoom, v.origin.y - d.y as f64 / v.zoom);
-    }
-}
-
-/// A scrollbar thumb on a track `track` pixels long, for `visible` (the view) within `content`
-/// (the pasteboard), both spans along the bar's axis in screen pixels: the thumb's start and
-/// length on the track, and the content pixels one thumb pixel moves (0 when nothing scrolls).
-fn thumb_span(track: f32, content: (f32, f32), visible: (f32, f32)) -> (f32, f32, f32) {
-    let track = track.max(0.0);
-    let (lo, hi) = (content.0.min(visible.0), content.1.max(visible.1));
-    let (total, shown) = (hi - lo, visible.1 - visible.0);
-    let scrollable = total - shown;
-    if !total.is_finite() || !shown.is_finite() || total <= 0.0 || scrollable <= 0.0 {
-        return (0.0, track, 0.0);
-    }
-    let len = (track * shown / total).max(MIN_THUMB.min(track));
-    let free = track - len;
-    if free <= 0.0 {
-        return (0.0, track, 0.0);
-    }
-    ((visible.0 - lo) / scrollable * free, len, scrollable / free)
-}
-
-/// The track and thumb of the vertical (or horizontal) scrollbar of the view `screen` inside
-/// `outer`, and the content pixels per thumb pixel.
-fn scrollbar_rects(outer: Rect, screen: Rect, content: Rect, vertical: bool) -> (Rect, Rect, f32) {
-    if vertical {
-        let track = Rect::from_min_max(pos2(outer.max.x - SCROLLBAR, screen.min.y), pos2(outer.max.x, screen.max.y));
-        let (start, len, k) = thumb_span(track.height(), (content.min.y, content.max.y), (screen.min.y, screen.max.y));
-        (track, Rect::from_min_size(pos2(track.min.x, track.min.y + start), vec2(SCROLLBAR, len)), k)
-    } else {
-        let track = Rect::from_min_max(pos2(screen.min.x, outer.max.y - SCROLLBAR), pos2(screen.max.x, outer.max.y));
-        let (start, len, k) = thumb_span(track.width(), (content.min.x, content.max.x), (screen.min.x, screen.max.x));
-        (track, Rect::from_min_size(pos2(track.min.x + start, track.min.y), vec2(len, SCROLLBAR)), k)
-    }
-}
-
-/// The view's scrollbars, on the right and bottom edges of `outer`: they span the pasteboard;
-/// dragging a thumb pans, clicking the track pages by one view.
-fn scrollbars(app: &mut DesignApp, ui: &mut egui::Ui, outer: Rect, screen: Rect, rect: Rect, t: &Tokens) {
-    let content = |app: &DesignApp| {
-        let st = app.session.active()?;
-        let v = app.view()?;
-        let xf = Xf::new(rect, v);
-        Some((xf, xf.rect(CanvasLayout::new(&st.doc, st.editing_parents).pasteboard)))
-    };
-    let Some((xf, cb)) = content(app) else { return };
-    let press = ui.input(|i| i.pointer.press_origin());
-    let mut hot = [false; 2];
-    for (n, vertical) in [true, false].into_iter().enumerate() {
-        let (track, thumb, k) = scrollbar_rects(outer, screen, cb, vertical);
-        let id = egui::Id::new(("canvas_scrollbar", app.pane, vertical));
-        let resp = ui.interact(track, id, Sense::click_and_drag());
-        let grab_id = id.with("grab");
-        if resp.drag_started() {
-            let on_thumb = press.is_some_and(|p| thumb.contains(p));
-            ui.data_mut(|d| d.insert_temp(grab_id, on_thumb));
-        }
-        let grabbed = resp.dragged() && ui.data(|d| d.get_temp::<bool>(grab_id)).unwrap_or(false);
-        if !resp.dragged() {
-            ui.data_mut(|d| d.remove::<bool>(grab_id));
-        }
-        let along = |p: egui::Vec2| if vertical { p.y } else { p.x };
-        let page = along(screen.size());
-        let mut moved = 0.0;
-        if grabbed {
-            moved = -along(resp.drag_delta()) * k;
-        } else if resp.clicked()
-            && let Some(p) = resp.interact_pointer_pos()
-        {
-            let (p, a, b) = if vertical { (p.y, thumb.min.y, thumb.max.y) } else { (p.x, thumb.min.x, thumb.max.x) };
-            if p < a {
-                moved = page;
-            } else if p > b {
-                moved = -page;
-            }
-        }
-        if moved != 0.0 && moved.is_finite() {
-            pan(app, &xf, if vertical { vec2(0.0, moved) } else { vec2(moved, 0.0) });
-        }
-        if let Some(slot) = hot.get_mut(n) {
-            *slot = grabbed || resp.hovered();
-        }
-    }
-    // Painted from the view as it is after this frame's input.
-    let Some((_, cb)) = content(app) else { return };
-    let painter = ui.painter_at(outer);
-    let right = Rect::from_min_max(pos2(outer.max.x - SCROLLBAR, outer.min.y), outer.max);
-    let bottom = Rect::from_min_max(pos2(outer.min.x, outer.max.y - SCROLLBAR), outer.max);
-    painter.rect_filled(right, 0.0, t.panel_darker);
-    painter.rect_filled(bottom, 0.0, t.panel_darker);
-    for (n, vertical) in [true, false].into_iter().enumerate() {
-        let (_, thumb, _) = scrollbar_rects(outer, screen, cb, vertical);
-        let alpha = if hot.get(n).copied().unwrap_or(false) { 0.6 } else { 0.35 };
-        painter.rect_filled(thumb.shrink(2.0), SCROLLBAR / 2.0 - 2.0, t.text.gamma_multiply(alpha));
-    }
-}
-
-fn handle_input(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect) {
-    // While a context menu is open (in either pane), the click that closes it and the keys go to the menu.
-    let menu_open = context_menu_open(ui.ctx());
-    let Some(v) = app.view().copied() else { return };
-    let xf = Xf::new(rect, &v);
-    let wants_text = app.session.wants_text();
-    let space = navigation_space(app, ui.ctx());
-    // Scroll / zoom.
-    let alt = wheel_alt(ui);
-    if resp.hovered() {
-        let (scroll, zoom_delta, m, hover) = ui.input(|i| (i.smooth_scroll_delta, i.zoom_delta(), i.modifiers, i.pointer.hover_pos()));
-        if let Some(hp) = hover {
-            if zoom_delta != 1.0 {
-                zoom_at(app, hp, zoom_delta as f64);
-            } else if m.command && scroll.y != 0.0 {
-                zoom_at(app, hp, (1.0 + scroll.y as f64 * 0.003).clamp(0.5, 2.0));
-            } else if alt && scroll != egui::Vec2::ZERO {
-                // Alt + wheel zooms by as much as Ctrl/Cmd + wheel, which egui turns into `zoom_delta`.
-                let speed = ui.ctx().options(|o| o.input_options.scroll_zoom_speed);
-                zoom_at(app, hp, (speed * (scroll.x + scroll.y)).exp() as f64);
-            } else if scroll != egui::Vec2::ZERO
-                && let Some(v) = app.view_mut()
-            {
-                let scroll = xf.unrotate_delta(scroll);
-                v.origin = Point::new(v.origin.x - scroll.x as f64 / v.zoom, v.origin.y - scroll.y as f64 / v.zoom);
-            }
-        }
-    }
-    let zoom = spring_zoom_mode(app, ui.ctx(), space);
-    if spring_zoom_input(app, ui, resp, &xf, zoom) {
-        return;
-    }
-    // Space-drag = hand (unless a tool drag is under way: then Space is a modifier, e.g. Live
-    // Distribute while resizing). Middle-drag pans too, with any tool; tools only
-    // see the primary button.
-    // A column guide drag keeps the pointer until the button is up, whatever Space or a menu does
-    // meanwhile.
-    if ui.data(|d| d.get_temp::<ColumnDrag>(egui::Id::new((COLUMN_DRAG, app.pane)))).is_some() && column_guide_drag(app, ui, resp, rect, &xf) {
-        return;
-    }
-    let tool_drag: bool = ui.data(|d| d.get_temp(egui::Id::new(("canvas_pointer_down", app.pane)))).unwrap_or(false);
-    let hand = space && !ui.input(|i| i.modifiers.command);
-    if !tool_drag && ((hand && resp.dragged()) || resp.dragged_by(egui::PointerButton::Middle)) {
-        let d = xf.unrotate_delta(resp.drag_delta());
-        if let Some(v) = app.view_mut() {
-            v.origin = Point::new(v.origin.x - d.x as f64 / v.zoom, v.origin.y - d.y as f64 / v.zoom);
-        }
-        return;
-    }
-    // Editing text (Space types a space): Alt held at the press gives the Hand tool until the
-    // button is released, and the caret stays. Alt pressed later in a text drag copies the text.
-    let alt_hand_id = egui::Id::new(("canvas_alt_hand", app.pane));
-    let mut alt_hand: bool = ui.data(|d| d.get_temp(alt_hand_id)).unwrap_or(false);
-    let (press, alt, primary_down) = ui.input(|i| (i.pointer.primary_pressed(), i.modifiers.alt, i.pointer.primary_down()));
-    if press && alt && wants_text && !tool_drag && !menu_open && resp.hovered() {
-        alt_hand = true;
-    }
-    if alt_hand {
-        if resp.dragged() {
-            pan(app, &xf, resp.drag_delta());
-        }
-        ui.data_mut(|d| d.insert_temp(alt_hand_id, primary_down));
-        return;
-    }
-    // The zero point and ruler guides need the rulers (hidden while the view is rotated).
-    if !space && !menu_open && xf.rot == 0 && zero_point_drag(app, ui, resp, rect, &xf) {
-        return;
-    }
-    // Hidden or locked guides can't stay selected.
-    if (!app.ui.guides || app.ui.guides_locked) && app.session.active().is_some_and(|st| !st.selection.guides.is_empty()) {
-        let _ = app.run("guide.deselect", json!({}));
-    }
-    if !space && !menu_open && xf.rot == 0 && guide_drag(app, ui, resp, rect, &xf) {
-        return;
-    }
-    if !space && !menu_open && xf.rot == 0 && column_guide_drag(app, ui, resp, rect, &xf) {
-        return;
-    }
-    let m = ui.input(|i| mods(i, space));
-    let vi = app.view_info();
-    let pos = |p: Pos2| xf.to_canvas(p);
-    let mut events: Vec<PointerEvent> = Vec::new();
-    let down_id = egui::Id::new(("canvas_pointer_down", app.pane));
-    let mut down: bool = ui.data(|d| d.get_temp(down_id)).unwrap_or(false);
-    let clicks_id = egui::Id::new(("canvas_clicks", app.pane));
-    let (pressed, released, origin, latest, now) =
-        ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.press_origin(), i.pointer.latest_pos(), i.time));
-    let in_view = |o: Pos2| if xf.rot == 0 { rect.contains(o) } else { resp.rect.contains(o) };
-    if pressed
-        && !space
-        && !menu_open
-        && let Some(o) = origin.filter(|o| in_view(*o) && resp.hovered())
-    {
-        // Count presses in a row here: egui reports double and triple clicks only on release and
-        // stops at three, but a press must know (word, line, paragraph, story).
-        let (delay, dist) = ui.ctx().options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_dist));
-        let n = press_count(ui.data(|d| d.get_temp(clicks_id)), o, now, delay, dist);
-        ui.data_mut(|d| d.insert_temp(clicks_id, Clicks { at: f64::NEG_INFINITY, pos: o, n }));
-        events.push(PointerEvent { kind: PointerKind::Down, pos: pos(o), mods: m, clicks: n });
-        down = true;
-    }
-    if down
-        && resp.dragged()
-        && resp.drag_delta() != egui::Vec2::ZERO
-        && let Some(p) = latest
-    {
-        events.push(PointerEvent { kind: PointerKind::Drag, pos: pos(p), mods: m, clicks: 1 });
-    }
-    // Power Zoom: holding the Hand tool still for half a second turns the press into one.
-    let hold_id = egui::Id::new(("canvas_hold", app.pane));
-    if down && !released && app.session.tool_id() == "hand" && !m.alt {
-        let (now, origin_pos) = ui.input(|i| (i.time, i.pointer.press_origin()));
-        let (start, fired): (f64, bool) = ui.data(|d| d.get_temp(hold_id)).unwrap_or((now, false));
-        let still = origin_pos.zip(latest).is_some_and(|(o, l)| (o - l).length() < 3.0);
-        if !fired && still && now - start >= 0.5 {
-            let p = pos(latest.unwrap_or(rect.center()));
-            events.push(PointerEvent { kind: PointerKind::Up, pos: p, mods: m, clicks: 1 });
-            events.push(PointerEvent { kind: PointerKind::Down, pos: p, mods: Mods { alt: true, ..m }, clicks: 1 });
-            ui.data_mut(|d| d.insert_temp(hold_id, (start, true)));
-        } else {
-            ui.data_mut(|d| d.insert_temp(hold_id, (start, fired)));
-            if !fired {
-                ui.ctx().request_repaint_after(std::time::Duration::from_millis(100));
-            }
-        }
-    } else {
-        ui.data_mut(|d| d.remove::<(f64, bool)>(hold_id));
-    }
-    if down && released {
-        if let Some(c) = ui.data(|d| d.get_temp::<Clicks>(clicks_id)) {
-            let dist = ui.ctx().options(|o| o.input_options.max_click_dist);
-            ui.data_mut(|d| d.insert_temp(clicks_id, release_clicks(c, latest.unwrap_or(c.pos), now, dist)));
-        }
-        let p = latest.unwrap_or(rect.center());
-        events.push(PointerEvent { kind: PointerKind::Up, pos: pos(p), mods: m, clicks: 1 });
-        down = false;
-    } else if !down && let Some(p) = resp.hover_pos() {
-        events.push(PointerEvent { kind: PointerKind::Move, pos: pos(p), mods: m, clicks: 1 });
-    }
-    ui.data_mut(|d| d.insert_temp(down_id, down));
-    for e in events {
-        if let Err(err) = app.session.pointer(&e, vi) {
-            app.status(err.to_string());
-        }
-    }
-    app.after_engine();
-    // Right-click: tools only see the primary button, so it starts no gesture; it opens the menu.
-    if resp.secondary_clicked()
-        && !down
-        && !space
-        && app.ui.screen_mode != ScreenMode::Presentation
-        && let Some(o) = resp.interact_pointer_pos().filter(|o| in_view(*o))
-    {
-        let kind = context_target(app, xf.to_canvas(o), xf.zoom);
-        ui.data_mut(|d| d.insert_temp(context_menu_id(app.pane), MenuRequest { kind, open: true }));
-        ui.ctx().request_repaint();
-    }
-    if resp.clicked() || resp.drag_started() {
-        resp.request_focus();
-    }
-    // Arrow keys, Tab and Escape belong to the canvas (caret, nudge, tab character, deselect).
-    // Without the lock egui moves focus to a neighbouring widget, and the next Space or Return
-    // clicks it while typing still reaches the text.
-    let lock = egui::EventFilter { tab: true, horizontal_arrows: true, vertical_arrows: true, escape: true };
-    ui.memory_mut(|m| m.set_focus_lock_filter(resp.id, lock));
-    // Keyboard for the active tool. A field focused when the frame began keeps this frame's keys.
-    let field_id = field_focused_id(ui.ctx());
-    let field = ui.ctx().text_edit_focused() || ui.data(|d| d.get_temp::<bool>(field_id)).unwrap_or(false);
-    if menu_open || modal_open(app) || (field && !resp.has_focus()) || !keyboard_pane(app) {
-        return;
-    }
-    // Keys of a frame that began composing are the IME's too (a Backspace that empties the marked
-    // text must not delete the character before it).
-    let composing_at_start = app.session.tool_composing();
-    let evs = ui.input(|i| i.events.clone());
-    // Native only: egui-winit sends a ⌘+V chord as a paste without its key press, so the modifiers
-    // held at the paste tell Paste in Place from Paste. The web also gets the key press, and the
-    // shortcut table has already run the command. A chord's modifiers may be released in the same
-    // frame, hence the modifiers held at each event.
-    #[cfg(not(target_arch = "wasm32"))]
-    let mut held =
-        ui.data(|d| d.get_temp::<(egui::Modifiers, egui::Modifiers)>(modifiers_id())).map_or_else(|| ui.input(|i| i.modifiers), |(start, _)| start);
-    for e in evs {
-        #[cfg(not(target_arch = "wasm32"))]
-        let chord = {
-            if let egui::Event::ModifiersChanged(m) = &e {
-                held = *m;
-            }
-            if matches!(e, egui::Event::Paste(_)) { crate::menus::paste_chord_command(app, held) } else { None }
-        };
-        let composing = composing_at_start || app.session.tool_composing();
-        match e {
-            egui::Event::Ime(ime) if wants_text => ime_event(app, ime, vi),
-            // Keys the IME passes through come as text only while nothing is marked.
-            egui::Event::Text(t) if wants_text && !composing => {
-                let _ = app.run("text.insert", json!({"text": t}));
-            }
-            // The IME owns the keyboard until it commits: no typing, clipboard or editing keys.
-            egui::Event::Text(_) | egui::Event::Paste(_) | egui::Event::Copy | egui::Event::Cut | egui::Event::Key { .. } if composing => {}
-            egui::Event::Paste(t) if wants_text => {
-                // Formatted when the system clipboard still holds what was copied here;
-                // Shift (⇧⌘V) pastes without formatting.
-                let plain = ui.input(|i| i.modifiers.shift);
-                let id = if plain { "edit.pasteWithoutFormatting" } else { "edit.paste" };
-                let _ = app.run(id, json!({"text": t}));
-            }
-            egui::Event::Copy | egui::Event::Cut if wants_text => {
-                // `run` puts the copied text on the system clipboard.
-                let id = if matches!(e, egui::Event::Cut) { "edit.cut" } else { "edit.copy" };
-                let _ = app.run(id, json!({}));
-            }
-            // Paste in Place's chord (⌘⌥⇧V unless rebound) arrives as a paste too.
-            #[cfg(not(target_arch = "wasm32"))]
-            egui::Event::Paste(_) if chord.is_some() => {
-                if let Some(id) = chord
-                    && crate::menus::enabled(app, id)
-                {
-                    crate::menus::activate(app, id, &serde_json::Value::Null);
-                }
-            }
-            // Without a native menu bar the copy and paste keys arrive only as these events.
-            egui::Event::Copy | egui::Event::Cut | egui::Event::Paste(_) if !app.native_menu => {
-                let (id, params) = match e {
-                    egui::Event::Copy => ("edit.copy", serde_json::Value::Null),
-                    egui::Event::Cut => ("edit.cut", serde_json::Value::Null),
-                    egui::Event::Paste(t) => ("edit.paste", json!({"text": t})),
-                    _ => continue,
-                };
-                if crate::menus::enabled(app, id) {
-                    crate::menus::activate(app, id, &params);
-                }
-            }
-            egui::Event::Key { key, pressed: true, modifiers, .. } => {
-                let k = match key {
-                    egui::Key::ArrowLeft => Some(ToolKey::Left),
-                    egui::Key::ArrowRight => Some(ToolKey::Right),
-                    egui::Key::ArrowUp => Some(ToolKey::Up),
-                    egui::Key::ArrowDown => Some(ToolKey::Down),
-                    egui::Key::Enter => Some(ToolKey::Enter),
-                    egui::Key::Escape => Some(ToolKey::Escape),
-                    egui::Key::Backspace => Some(ToolKey::Backspace),
-                    egui::Key::Delete => Some(ToolKey::Delete),
-                    egui::Key::Tab => Some(ToolKey::Tab),
-                    egui::Key::Home => Some(ToolKey::Home),
-                    egui::Key::End => Some(ToolKey::End),
-                    _ => None,
-                };
-                if let Some(k) = k {
-                    let m = Mods { shift: modifiers.shift, alt: modifiers.alt, cmd: modifiers.command, ctrl: modifiers.ctrl, space: false };
-                    let handled = app.session.tool_key(k, m, vi).unwrap_or(false);
-                    if !handled && k == ToolKey::Escape {
-                        let _ = app.run("edit.deselectAll", json!({}));
-                    }
-                    app.after_engine();
-                }
-            }
-            _ => {}
-        }
-    }
-    let _ = DVec2::ZERO;
-}
-
-/// A dialog or Quick Apply has the keyboard. The canvas keeps egui's focus behind a modal, and it
-/// runs before the modal draws, so it must not also act on the Esc or Return that closes it.
-fn modal_open(app: &DesignApp) -> bool {
-    app.ui.dialog.is_some() || app.ui.palette.is_some()
-}
-
-/// Does the current pane take the keyboard? Both panes (split, or the second window) see the same
-/// events, so typing, tool keys, the clipboard and the input method serve only the focused pane.
-fn keyboard_pane(app: &DesignApp) -> bool {
-    app.pane == app.focus_pane
-}
-
-/// One input method event for the text caret: marked text previews in the story, a commit types.
-fn ime_event(app: &mut DesignApp, e: egui::ImeEvent, vi: designcraft_engine::ViewInfo) {
-    let r = match e {
-        egui::ImeEvent::Preedit { text, active_range_chars } => {
-            app.ime_marked = Some(text.clone()).filter(|t| !t.is_empty());
-            app.session.tool_preedit(&text, active_range_chars, vi).map_err(|e| e.to_string())
-        }
-        // A bare line break confirms the composition (Enter with some IMEs): the marked text, not
-        // a new paragraph.
-        egui::ImeEvent::Commit(t) if t == "\n" || t == "\r" => {
-            keep_marked_text(app);
-            Ok(())
-        }
-        egui::ImeEvent::Commit(t) => {
-            app.ime_marked = None;
-            app.session.tool_ime_commit(&t, vi).map_err(|e| e.to_string())
-        }
-        // The web text agent's corrections and mobile Backspace: characters around the caret go.
-        egui::ImeEvent::DeleteSurrounding { before_chars, after_chars } if !app.session.tool_composing() => {
-            delete_surrounding(app, before_chars, after_chars)
-        }
-        // `Enabled` and `Disabled` carry nothing: the IME is on while `ime_output` sets `ime`.
-        _ => Ok(()),
-    };
-    if let Err(e) = r {
-        app.status(e);
-    }
-    app.after_engine();
-}
-
-/// Delete `before` characters before the caret and `after` after it (sizes come from the browser:
-/// a correction never deletes more than a word's worth).
-fn delete_surrounding(app: &mut DesignApp, before: usize, after: usize) -> Result<(), String> {
-    for (n, forward) in [(before, false), (after, true)] {
-        for _ in 0..n.min(64) {
-            app.run("text.delete", json!({"forward": forward}))?;
-        }
-    }
-    Ok(())
-}
-
-/// End a composition outside the IME (a click away, the canvas losing the keyboard): the marked
-/// text stays as typed, and the system IME is told to drop its copy.
-pub(crate) fn keep_marked_text(app: &mut DesignApp) {
-    if app.ime_marked.take().is_some() {
-        app.ime_discard = true;
-    }
-    if app.session.tool_composing() {
-        if let Err(e) = app.session.end_composition() {
-            app.status(e.to_string());
-        }
-        app.after_engine();
-    }
-}
-
-/// While the text caret is in the canvas, let the system IME compose (egui-winit allows it only in
-/// frames that set `ime`; the web build focuses its hidden text input then) and keep the candidate
-/// window at the caret, through zoom, scrolling, view rotation and vertical text.
-fn ime_output(app: &mut DesignApp, ctx: &egui::Context, xf: &Xf) {
-    if !keyboard_pane(app) {
-        return;
-    }
-    // A text field, dialog or Quick Apply has the keyboard: egui's own text editing serves the IME.
-    let ours = app.session.wants_text() && !ctx.text_edit_focused() && !modal_open(app);
-    let caret = if ours { app.session.tool_ime_caret(app.view_info()) } else { None };
-    let Some((a, b)) = caret else {
-        // The IME goes away with its marked text: keep that text as typed, like a click away.
-        keep_marked_text(app);
-        return;
-    };
-    let r = Rect::from_two_pos(xf.to_screen(a), xf.to_screen(b)).expand(1.0);
-    // The composition ended outside the IME (a click, a command): the IME drops what it has marked.
-    let interrupt = app.ime_marked.is_some() && !app.session.tool_composing();
-    if interrupt {
-        app.ime_marked = None;
-        app.ime_discard = true;
-    }
-    app.canvas_ime = true;
-    ctx.output_mut(|o| {
-        o.ime = Some(egui::output::IMEOutput { purpose: egui::IMEPurpose::Normal, rect: r, cursor_rect: r, should_interrupt_composition: interrupt });
-    });
-}
-
-/// View → Show Hidden Characters: ¶ paragraph ends, » tabs, · spaces, ¬ forced line breaks, # end of story.
-fn draw_hidden_characters(app: &DesignApp, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) {
-    for story in doc.stories.values() {
-        let cs = app.session.cache.get(doc, story.id, None);
-        for ft in &cs.frames {
-            let (Some((a, _)), Some(it)) = (item_canvas_xf(doc, layout, ft.frame), doc.item(ft.frame)) else { continue };
-            let m = a * doc.text_xf(it);
-            let col = layer_color(doc, it);
-            for l in &ft.lines {
-                let size = (l.ascent * 0.75 * xf.zoom).clamp(6.0, 40.0) as f32;
-                let font = egui::FontId::proportional(size);
-                for (x, mark, centered) in hidden_marks(&story.text, l) {
-                    let p = xf.to_screen(m * Point::new(x, l.baseline));
-                    let align = if centered { egui::Align2::CENTER_BOTTOM } else { egui::Align2::LEFT_BOTTOM };
-                    painter.text(p, align, mark, font.clone(), col);
-                }
-            }
-        }
-    }
-}
-
-/// The hidden-character marks on line `l` of a story with text `text`: frame-space x, mark, and
-/// whether the mark is centered on x (spaces) or starts at it.
-fn hidden_marks(text: &str, l: &compose::Line) -> Vec<(f64, &'static str, bool)> {
-    let mut out = Vec::new();
-    for g in &l.glyphs {
-        if g.len == 0 {
-            continue;
-        }
-        let Some(ch) = text.get(g.byte..).and_then(|t| t.chars().next()) else { continue };
-        let mark = match ch {
-            ' ' => "·",
-            '\t' => "»",
-            '\u{2028}' => "¬",
-            '\u{A0}' => "°",
-            _ => continue,
-        };
-        if ch == ' ' {
-            out.push((g.x + g.adv / 2.0, mark, true));
-        } else {
-            out.push((g.x, mark, false));
-        }
-    }
-    if l.last_in_para {
-        // The spaces trimmed off the line's end sit past `end_x`; the paragraph mark follows them.
-        let end = l.glyphs.iter().filter(|g| g.len > 0 && !g.visible && g.x >= l.end_x - 1e-9).map(|g| g.x + g.adv).fold(l.end_x, f64::max);
-        let mark = if l.range.end >= text.len() { "#" } else { "¶" };
-        out.push((end + 1.0, mark, false));
-    }
-    out
-}
-
-/// View › Flattener Preview: red over every object that involves transparency (opacity, blend
-/// modes, effects, knockout) — what flattening or export rasterising affects.
-fn draw_flattener_preview(painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) {
-    fn transparent(it: &Item) -> bool {
-        it.opacity < 1.0 || it.blend != Default::default() || it.effects.any() || it.knockout || it.children().iter().any(|c| transparent(c))
-    }
-    let red = Color32::from_rgba_unmultiplied(230, 30, 30, 110);
-    for slot in &layout.slots {
-        let Some(sp) = doc.spread(slot.spread) else { continue };
-        for it in sp.items.iter().filter(|it| !it.hidden && transparent(it)) {
-            let r = it.bounds().inflate(designcraft_render::effect_outset(it), designcraft_render::effect_outset(it));
-            painter.rect_filled(xf.rect(slot.xf.transform_rect_bbox(r)), 0.0, red);
-        }
-    }
-}
-
-/// Edit › Spelling › Dynamic Spelling: red squiggles under misspelled words (checked once per
-/// story version).
-fn draw_dynamic_spelling(app: &DesignApp, ctx: &egui::Context, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) {
-    for story in doc.stories.values() {
-        let key = egui::Id::new(("dyn_spell", std::sync::Arc::as_ptr(story) as usize, doc.user_words.len()));
-        let bad: std::sync::Arc<Vec<std::ops::Range<usize>>> = match ctx.data(|d| d.get_temp(key)) {
-            Some(v) => v,
-            None => {
-                let v = std::sync::Arc::new(designcraft_engine::cmd::spelling::misspellings(doc, story, &doc.user_words));
-                ctx.data_mut(|d| d.insert_temp(key, v.clone()));
-                v
-            }
-        };
-        if bad.is_empty() {
-            continue;
-        }
-        let cs = app.session.cache.get(doc, story.id, None);
-        let red = Stroke::new(1.0, Color32::from_rgb(230, 30, 30));
-        for ft in &cs.frames {
-            let (Some((a, _)), Some(it)) = (item_canvas_xf(doc, layout, ft.frame), doc.item(ft.frame)) else { continue };
-            let m = a * doc.text_xf(it);
-            for l in &ft.lines {
-                for r in bad.iter().filter(|r| r.start < l.range.end && r.end > l.range.start) {
-                    let gs: Vec<_> = l.glyphs.iter().filter(|g| g.len > 0 && g.byte >= r.start && g.byte < r.end).collect();
-                    let (Some(x0), Some(x1)) = (gs.iter().map(|g| g.x).reduce(f64::min), gs.iter().map(|g| g.x + g.adv).reduce(f64::max)) else {
-                        continue;
-                    };
-                    let y = l.baseline + l.descent * 0.5;
-                    let (p0, p1) = (xf.to_screen(m * Point::new(x0, y)), xf.to_screen(m * Point::new(x1, y)));
-                    // A zigzag 2 px high, 4 px per wave.
-                    let n = ((p1.x - p0.x) / 2.0).max(1.0) as usize;
-                    let pts: Vec<Pos2> =
-                        (0..=n).map(|k| pos2(p0.x + (p1.x - p0.x) * k as f32 / n as f32, p0.y + if k % 2 == 0 { 0.0 } else { 2.0 })).collect();
-                    painter.add(egui::Shape::line(pts, red));
-                }
-            }
-        }
-    }
-}
-
-/// Plain text of the current text selection (story markers resolved to readable characters).
-pub fn selected_text(app: &DesignApp) -> Option<String> {
-    let st = app.session.active()?;
-    let t = st.selection.text?;
-    let story = st.doc.text_story(t.story, t.cell)?;
-    let s = story.slice(t.range());
-    if s.is_empty() {
-        return None;
-    }
-    Some(s.replace(designcraft_doc::story::FORCED_LINE_BREAK, "\n"))
-}
-
-/// One device pixel, the width InDesign uses for guides and frame edges.
-fn hair(painter: &egui::Painter) -> f32 {
-    1.0 / painter.ctx().pixels_per_point()
-}
-
-const ZERO_POINT_DRAG: &str = "canvas_zero_point_drag";
-
-/// The ruler corner: drag from it and the zero point lands where the pointer is released; a click
-/// that stays in the corner leaves it; a double-click resets it. Locked, the corner ignores both.
-/// Cmd-dragged (Ctrl elsewhere), it makes a horizontal and a vertical guide instead.
-/// Holds the pointer position while dragging; returns true while it owns the pointer.
-fn zero_point_drag(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf) -> bool {
-    let id = egui::Id::new((ZERO_POINT_DRAG, app.pane));
-    let corner = Rect::from_min_max(resp.rect.min, rect.min);
-    let (pressed, released, down, origin, latest, dbl, command) = ui.input(|i| {
-        (
-            i.pointer.primary_pressed(),
-            i.pointer.primary_released(),
-            i.pointer.primary_down(),
-            i.pointer.press_origin(),
-            i.pointer.latest_pos(),
-            i.pointer.button_double_clicked(egui::PointerButton::Primary),
-            i.modifiers.command,
-        )
-    });
-    let mut at: Option<Pos2> = ui.data(|d| d.get_temp(id));
-    if at.is_none() {
-        if !pressed || !resp.hovered() || app.session.active().is_none() || corner.width() <= 0.0 || corner.height() <= 0.0 {
-            return false;
-        }
-        at = origin.filter(|o| corner.contains(*o));
-    }
-    let Some(mut p) = at else { return false };
-    if let Some(l) = latest.filter(|l| l.x.is_finite() && l.y.is_finite()) {
-        p = l;
-    }
-    if !released && down {
-        ui.ctx().set_cursor_icon(egui::CursorIcon::Crosshair);
-        ui.data_mut(|d| d.insert_temp(id, p));
-        return true;
-    }
-    ui.data_mut(|d| d.remove::<Pos2>(id));
-    if !released {
-        // The release happened where we couldn't see it (outside the window).
-        return false;
-    }
-    let locked = app.session.active().is_none_or(|st| st.doc.settings.zero_point_locked);
-    if command {
-        if !corner.contains(p) && rect.contains(p) {
-            corner_guides(app, xf, p);
-        }
-    } else if !locked {
-        if dbl {
-            let _ = app.run("view.zeroPoint", json!({"reset": true}));
-        } else if !corner.contains(p)
-            && let Some((zp, _)) = zero_point_at(app, xf, p)
-        {
-            let _ = app.run("view.zeroPoint", json!({ "at": zp }));
-        }
-    }
-    true
-}
-
-/// A screen point as a zero point (its offset from the ruler origin of the spread in view, kept
-/// on the pasteboard as the engine keeps it), and where that zero point is on the canvas.
-fn zero_point_at(app: &DesignApp, xf: &Xf, p: Pos2) -> Option<([f64; 2], Point)> {
-    let st = app.session.active()?;
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let slot = layout.slots.get(current_slot(app, &layout)?)?;
-    let sp = slot.to_spread(xf.to_canvas(p));
-    let base = st.doc.ruler_base(slot.spread, sp.x)?;
-    let zp = st.doc.clamp_zero_point([sp.x - base.x, sp.y - base.y])?;
-    Some((zp, slot.to_canvas(Point::new(base.x + zp[0], base.y + zp[1]))))
-}
-
-/// Cmd-drag from the ruler corner: a horizontal and a vertical spread guide through the drop
-/// point, on the spread under it.
-fn corner_guides(app: &mut DesignApp, xf: &Xf, p: Pos2) {
-    if !app.ui.guides || app.ui.guides_locked {
-        return;
-    }
-    let Some((r, sp)) = app.session.active().and_then(|st| CanvasLayout::new(&st.doc, st.editing_parents).spread_at(xf.to_canvas(p))) else {
-        return;
-    };
-    if !(sp.x.is_finite() && sp.y.is_finite()) {
-        return;
-    }
-    let _ = app.run("guide.add", json!({"spread": r, "orientation": "both", "point": [sp.x, sp.y], "spreadGuide": true}));
-}
-
-const GUIDE_DRAG: &str = "canvas_guide_drag";
-
-/// A ruler guide being dragged: out of a ruler (`from` None) or an existing one.
-#[derive(Clone, Debug)]
-struct GuideDrag {
-    orientation: designcraft_doc::Orientation,
-    from: Option<(designcraft_doc::SpreadRef, usize, usize)>,
-    /// Pointer position (screen).
-    at: Option<Pos2>,
-    /// Modifiers held at the pointer's last move: Shift snaps to the ruler's ticks, Command
-    /// suspends snapping.
-    mods: egui::Modifiers,
-}
-
-const GUIDE_PRESS: &str = "canvas_guide_press";
-
-/// A press on an existing guide: where it was (screen) and whether Shift was down. Released
-/// where it was pressed, it is a click, which selects the guide.
-#[derive(Clone, Copy, Debug)]
-struct GuidePress {
-    origin: Pos2,
-    shift: bool,
-}
-
-/// How far (screen pixels) the pointer may move between press and release for a click.
-const GUIDE_CLICK_SLOP: f32 = 3.0;
-
-/// Where a dragged guide is, as the rulers measure it (#1282): `X: …` for a vertical guide, `Y: …`
-/// for a horizontal one, from the zero point (and the page origin, when rulers restart per page)
-/// in the document's ruler units. `None` with no document or rulers.
-fn guide_readout(app: &DesignApp, xf: &Xf, g: &GuideDrag) -> Option<String> {
-    let (label, value, unit) = guide_measure(app, xf, g)?;
-    Some(format!("{label}: {}", designcraft_geom::units::format_measure(value, unit)))
-}
-
-/// Where a pointer readout of `size` goes for a pointer at `p`: below right of it, on the other
-/// side where that would leave the canvas `area` (near its right or bottom edge), and kept inside
-/// it (with the label's 3-point frame) however small the canvas is.
-fn readout_at(p: Pos2, size: egui::Vec2, area: Rect) -> Pos2 {
-    const GAP: f32 = 12.0;
-    const PAD: f32 = 3.0;
-    let x = if p.x + GAP + size.x + PAD > area.max.x { p.x - GAP - size.x } else { p.x + GAP };
-    let y = if p.y + GAP + size.y + PAD > area.max.y { p.y - GAP - size.y } else { p.y + GAP };
-    let clamp = |v: f32, lo: f32, hi: f32| if hi < lo { lo } else { v.clamp(lo, hi) };
-    pos2(clamp(x, area.min.x + PAD, area.max.x - PAD - size.x), clamp(y, area.min.y + PAD, area.max.y - PAD - size.y))
-}
-
-/// [`guide_readout`]'s parts: the axis label, the value (points) and its unit.
-fn guide_measure(app: &DesignApp, xf: &Xf, g: &GuideDrag) -> Option<(&'static str, f64, designcraft_geom::Unit)> {
-    let p = g.at?;
-    let st = app.session.active()?;
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    // Measured where the guide is dropped (`guide_drag`): its snapped spot, on the spread under
-    // the pointer, as the rulers measure that spread, not the one in the middle of the view.
-    let (c, slot) = match guide_spot(app, xf, g) {
-        Some(spot) => (layout.to_canvas(spot.spread, spot.sp), layout.slot(spot.spread)?),
-        None => (xf.to_canvas(p), current_slot(app, &layout).and_then(|i| layout.slots.get(i))?),
-    };
-    // An existing guide moves only on its own spread (`guide_drag`): over another, dropping it
-    // leaves it where it was, so there is no place to show.
-    if g.from.is_some_and(|(r, _, _)| r != slot.spread) {
-        return None;
-    }
-    let pieces = ruler_pieces_of(&st.doc, slot, st.doc.zero_point());
-    let first = pieces.first()?;
-    let (label, value, unit) = match g.orientation {
-        designcraft_doc::Orientation::Vertical => {
-            // The horizontal ruler restarts at each page: the piece under the guide measures it.
-            let o = pieces.iter().find(|(from, to, _)| *from <= c.x && c.x < *to).unwrap_or(first).2;
-            ("X", c.x - o.x, st.doc.settings.horizontal_units)
-        }
-        designcraft_doc::Orientation::Horizontal => ("Y", c.y - first.2.y, st.doc.settings.vertical_units),
-    };
-    value.is_finite().then_some((label, value, unit))
-}
-
-/// Where a dragged ruler guide is (#1221).
-struct GuideSpot {
-    /// The spread under the pointer.
-    spread: SpreadRef,
-    /// The pointer in that spread's coordinates.
-    pointer: Point,
-    /// [`Self::pointer`] with the guide's axis snapped.
-    sp: Point,
-    /// [`Self::sp`] on screen, where the preview line goes.
-    screen: Pos2,
-    /// Alignment marks (canvas coordinates) when an object or page edge or center caught it.
-    marks: Vec<Overlay>,
-}
-
-/// Where the guide of drag `g` is: its axis (x for a vertical guide, y for a horizontal one)
-/// snapped as a moved object's is, to ruler guides, margins, columns, bleed, the document grid and
-/// smart-guide targets (not the baseline grid, which would catch a horizontal guide almost
-/// anywhere). Shift snaps to the ruler's ticks instead and Command suspends snapping. The guides
-/// being dragged are not targets. An existing guide over another spread, where it
-/// can't be dropped, stays at the pointer. The preview, the readout and the drop all read it.
-/// `None` with no spread under the pointer.
-fn guide_spot(app: &DesignApp, xf: &Xf, g: &GuideDrag) -> Option<GuideSpot> {
-    let p = g.at?;
-    let st = app.session.active()?;
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let (r, pointer) = layout.spread_at(xf.to_canvas(p))?;
-    let spot = |sp: Point, marks: Vec<Overlay>| GuideSpot { spread: r, pointer, sp, screen: xf.to_screen(layout.to_canvas(r, sp)), marks };
-    if g.mods.command || g.from.is_some_and(|(from, _, _)| from != r) {
-        return Some(GuideSpot { spread: r, pointer, sp: pointer, screen: p, marks: Vec::new() });
-    }
-    let vertical = matches!(g.orientation, designcraft_doc::Orientation::Vertical);
-    let place = |v: f64| if vertical { Point::new(v, pointer.y) } else { Point::new(pointer.x, v) };
-    if g.mods.shift {
-        let slot = layout.slot(r)?;
-        let at = ruler_tick_of(&st.doc, slot, g.orientation, xf.zoom, pointer).map_or(pointer, place);
-        return Some(spot(at, Vec::new()));
-    }
-    let spread = st.doc.spread(r)?;
-    // Not targets: the dragged guide, and the others of a selected group, which move with it.
-    let exclude: Vec<GuideSel> = match g.from {
-        Some((sr, pi, gi)) if drags_group(app, GuideSel { spread: sr, page: pi, index: gi }) => st.selection.guides.to_vec(),
-        Some((sr, pi, gi)) => vec![GuideSel { spread: sr, page: pi, index: gi }],
-        None => Vec::new(),
-    };
-    // How far the guide reaches across its axis: its page, or the whole spread.
-    let page = match g.from {
-        Some((_, pi, gi)) => spread.pages.get(pi).filter(|pg| pg.guides.get(gi).is_some_and(|guide| !guide.spread)),
-        None => spread.pages.iter().find(|pg| pg.bounds().contains(pointer)),
-    };
-    let reach = page.map_or_else(|| spread.bounds(), |pg| pg.bounds());
-    let (at, rect, x_edges, y_edges) = if vertical {
-        (pointer.x, DRect::new(pointer.x, reach.y0, pointer.x, reach.y1), [true; 3], [false; 3])
-    } else {
-        (pointer.y, DRect::new(reach.x0, pointer.y, reach.x1, pointer.y), [false; 3], [true; 3])
-    };
-    let cx = designcraft_tools::ToolContext {
-        doc: &st.doc,
-        selection: &st.selection,
-        cache: &app.session.cache,
-        layout: &layout,
-        zoom: xf.zoom.max(1e-6),
-        layer: st.active_layer,
-        snap: app.ui.snap_view(),
-        unit: app.ui.units,
-        stroke_in_front: false,
-    };
-    let s = designcraft_tools::snap::snap(
-        &cx,
-        designcraft_tools::SnapRequest {
-            spread: r,
-            gesture: designcraft_tools::Gesture::Guide,
-            rect,
-            x_edges,
-            y_edges,
-            exclude: &[],
-            exclude_guides: &exclude,
-            copying: false,
-            lengths: [None, None],
-            angle: None,
-            radius: 0.0,
-            pointer,
-        },
-    );
-    let snapped = at + if vertical { s.delta.x } else { s.delta.y };
-    Some(if snapped.is_finite() { spot(place(snapped), s.guides) } else { spot(pointer, Vec::new()) })
-}
-
-/// The nearest ruler tick to spread point `sp` along a guide of `orientation`'s axis, in spread
-/// coordinates: the horizontal ruler's (the piece under the point) where that axis runs across the
-/// screen, else the vertical ruler's. `None` when the ruler has no ticks there.
-fn ruler_tick_of(doc: &Document, slot: &SpreadSlot, orientation: designcraft_doc::Orientation, zoom: f64, sp: Point) -> Option<f64> {
-    let vertical = matches!(orientation, designcraft_doc::Orientation::Vertical);
-    // A quarter-turned spread runs its x axis down the screen.
-    let across = vertical == slot.rotation.is_multiple_of(2);
-    let c = slot.to_canvas(sp);
-    let pieces = ruler_pieces_of(doc, slot, doc.zero_point());
-    let step = |unit: designcraft_geom::Unit| {
-        let (major, sub) = unit.ruler_ticks(zoom);
-        let step = major / f64::from(sub.max(1));
-        (step.is_finite() && step > 0.0).then_some(step)
-    };
-    let tick = |v: f64, o: f64, step: f64| o + ((v - o) / step).round() * step;
-    let c = if across {
-        let &(_, _, o) = pieces.iter().find(|(from, to, _)| *from <= c.x && c.x < *to).or(pieces.first())?;
-        Point::new(tick(c.x, o.x, step(doc.settings.horizontal_units)?), c.y)
-    } else {
-        let o = pieces.first()?.2;
-        Point::new(c.x, tick(c.y, o.y, step(doc.settings.vertical_units)?))
-    };
-    let s = slot.to_spread(c);
-    Some(if vertical { s.x } else { s.y }).filter(|v| v.is_finite())
-}
-
-/// The guide under a screen point (within 3 px), as (spread, page, index, orientation).
-fn guide_at(app: &DesignApp, xf: &Xf, p: Pos2) -> Option<(designcraft_doc::SpreadRef, usize, usize, designcraft_doc::Orientation)> {
-    let st = app.session.active()?;
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let cp = xf.to_canvas(p);
-    let tol = 3.0 / xf.zoom;
-    for slot in &layout.slots {
-        let sp = st.doc.spread(slot.spread)?;
-        let local = slot.to_spread(cp);
-        for (pi, pg) in sp.pages.iter().enumerate() {
-            let pr = if pg.guides.iter().any(|g| g.spread) { slot.xf.inverse().transform_rect_bbox(layout.pasteboard) } else { pg.bounds() };
-            for (gi, g) in pg.guides.iter().enumerate() {
-                if !g.editable_in(&st.doc) {
-                    continue;
-                }
-                let r = if g.spread { pr } else { pg.bounds() };
-                let hit = match g.orientation {
-                    designcraft_doc::Orientation::Horizontal => (local.y - g.position).abs() <= tol && local.x >= r.x0 && local.x <= r.x1,
-                    designcraft_doc::Orientation::Vertical => (local.x - g.position).abs() <= tol && local.y >= r.y0 - tol && local.y <= r.y1 + tol,
-                };
-                if hit && !g.locked {
-                    return Some((slot.spread, pi, gi, g.orientation));
-                }
-            }
-        }
-    }
-    None
-}
-
-/// Ruler guides: drag one out of a ruler, drag an existing one (Selection tools) to move it, drop
-/// it back on a ruler to delete it. A press near an unlocked guide takes it even over an object:
-/// the guide is selected and the object is not. Returns true from the press to the release, so
-/// the tools never see that press.
-fn guide_drag(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf) -> bool {
-    let id = egui::Id::new(GUIDE_DRAG);
-    let (pressed, released, origin, latest) =
-        ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.press_origin(), i.pointer.latest_pos()));
-    let mut drag: Option<GuideDrag> = ui.data(|d| d.get_temp(id));
-    if drag.is_none() && pressed && resp.hovered() && app.ui.guides && !app.ui.guides_locked {
-        let Some(o) = origin else { return false };
-        let full = resp.rect;
-        if full.contains(o) && !rect.contains(o) {
-            // In a ruler (not the corner).
-            let orientation = if o.y < rect.min.y && o.x >= rect.min.x {
-                Some(designcraft_doc::Orientation::Horizontal)
-            } else if o.x < rect.min.x && o.y >= rect.min.y {
-                Some(designcraft_doc::Orientation::Vertical)
-            } else {
-                None
-            };
-            if let Some(orientation) = orientation {
-                drag = Some(GuideDrag { orientation, from: None, at: Some(o), mods: egui::Modifiers::NONE });
-            }
-        } else if rect.contains(o)
-            && matches!(app.session.tool_id(), "selection" | "directSelection")
-            && let Some((r, pi, gi, orientation)) = guide_at(app, xf, o)
-        {
-            let shift = ui.input(|i| i.modifiers.shift);
-            // A press on a guide selects it (Shift: on release, as a click adds or removes it).
-            let selected = app.session.active().is_some_and(|st| st.selection.guides.contains(&GuideSel { spread: r, page: pi, index: gi }));
-            if !shift && !selected {
-                let _ = app.run("guide.select", json!({"spread": r, "page": pi, "index": gi}));
-            }
-            ui.data_mut(|d| d.insert_temp(egui::Id::new(GUIDE_PRESS), GuidePress { origin: o, shift }));
-            drag = Some(GuideDrag { orientation, from: Some((r, pi, gi)), at: Some(o), mods: egui::Modifiers::NONE });
-        }
-    }
-    let Some(mut g) = drag else { return false };
-    if let Some(p) = latest {
-        g.at = Some(p);
-    }
-    g.mods = ui.input(|i| i.modifiers);
-    if !released {
-        ui.ctx().set_cursor_icon(match g.orientation {
-            designcraft_doc::Orientation::Horizontal => egui::CursorIcon::ResizeVertical,
-            designcraft_doc::Orientation::Vertical => egui::CursorIcon::ResizeHorizontal,
-        });
-        ui.data_mut(|d| d.insert_temp(id, g));
-        return true;
-    }
-    ui.data_mut(|d| d.remove::<GuideDrag>(id));
-    let press: Option<GuidePress> = ui.data_mut(|d| {
-        let press = d.get_temp(egui::Id::new(GUIDE_PRESS));
-        d.remove::<GuidePress>(egui::Id::new(GUIDE_PRESS));
-        press
-    });
-    let Some(p) = g.at else { return true };
-    if let (Some((r, pi, gi)), Some(press)) = (g.from, press)
-        && (p - press.origin).length() <= GUIDE_CLICK_SLOP
-    {
-        // A click: the guide is selected (at the press); Shift adds it or removes it.
-        if press.shift {
-            let _ = app.run("guide.select", json!({"spread": r, "page": pi, "index": gi, "toggle": true}));
-        }
-        return true;
-    }
-    // Dragging one of several selected guides moves (or deletes) them all.
-    let group = g.from.is_some_and(|(spread, page, index)| drags_group(app, GuideSel { spread, page, index }));
-    let on_canvas = rect.contains(p);
-    // Placed where the preview showed it (snapped); the page under the pointer owns a new guide.
-    let target = guide_spot(app, xf, &g).and_then(|spot| {
-        let spread = app.session.active()?.doc.spread(spot.spread)?;
-        let on_page = spread.pages.iter().position(|pg| pg.bounds().contains(spot.pointer));
-        Some((spot.spread, spot.sp, on_page))
-    });
-    let pos_of = |sp: Point| match g.orientation {
-        designcraft_doc::Orientation::Horizontal => sp.y,
-        designcraft_doc::Orientation::Vertical => sp.x,
-    };
-    let orient = match g.orientation {
-        designcraft_doc::Orientation::Horizontal => "horizontal",
-        designcraft_doc::Orientation::Vertical => "vertical",
-    };
-    match (g.from, on_canvas, target) {
-        // Dropped back on a ruler: delete.
-        (Some(_), false, _) if group => {
-            let _ = app.run("guide.delete", json!({}));
-        }
-        (Some((r, pi, gi)), false, _) => {
-            let _ = app.run("guide.delete", json!({"spread": r, "page": pi, "index": gi}));
-        }
-        (Some((r, _, _)), true, Some((tr, _, _))) if tr == r && group => {
-            if let Some((dx, dy)) = press.and_then(|press| guide_drag_delta(app, xf, &g, press.origin)) {
-                let _ = app.run("guide.moveBy", json!({"dx": dx, "dy": dy}));
-            }
-        }
-        (Some((r, pi, gi)), true, Some((tr, sp, _))) if tr == r => {
-            let _ = app.run("guide.move", json!({"spread": r, "page": pi, "index": gi, "position": pos_of(sp)}));
-        }
-        (None, true, Some((r, sp, on_page))) => {
-            // The Page tool draws liquid guides from the rulers.
-            let liquid = app.session.tool_id() == "page" && on_page.is_some();
-            let mut params =
-                json!({"spread": r, "orientation": orient, "position": pos_of(sp), "at": sp.x, "spreadGuide": on_page.is_none(), "liquid": liquid});
-            if let Some(pi) = on_page {
-                params["page"] = json!(pi);
-            }
-            let _ = app.run("guide.add", params);
-        }
-        _ => {}
-    }
-    true
-}
-
-/// Whether dragging guide `from` takes the other selected guides along: it is one of several
-/// selected.
-fn drags_group(app: &DesignApp, from: GuideSel) -> bool {
-    app.session.active().is_some_and(|st| st.selection.guides.len() > 1 && st.selection.guides.contains(&from))
-}
-
-/// How far a drag of the existing guide `g.from`, pressed at `origin` (screen), moves guides, in
-/// spread coordinates: the dragged guide goes to its [`guide_spot`], the other selected guides as
-/// far along their own axis as it moved. `None` while the pointer is not over the guide's own
-/// spread, where a drop leaves it in place.
-fn guide_drag_delta(app: &DesignApp, xf: &Xf, g: &GuideDrag, origin: Pos2) -> Option<(f64, f64)> {
-    let (r, pi, gi) = g.from?;
-    let spot = guide_spot(app, xf, g)?;
-    if spot.spread != r {
-        return None;
-    }
-    let sp = spot.sp;
-    let st = app.session.active()?;
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let start = layout.slot(r)?.to_spread(xf.to_canvas(origin));
-    let at = st.doc.spread(r)?.pages.get(pi)?.guides.get(gi)?.position;
-    let (dx, dy) = match g.orientation {
-        designcraft_doc::Orientation::Vertical => (sp.x - at, sp.y - start.y),
-        designcraft_doc::Orientation::Horizontal => (sp.x - start.x, sp.y - at),
-    };
-    (dx.is_finite() && dy.is_finite()).then_some((dx, dy))
-}
-
-/// Guides being dragged on the canvas and how far they have moved (spread coordinates).
-struct MovingGuides {
-    guides: std::collections::HashSet<GuideSel>,
-    dx: f64,
-    dy: f64,
-}
-
-/// What a drag of an existing guide moves, for the preview: the dragged guide, or every selected
-/// guide when it is one of several selected. `None` before the drag leaves the click distance,
-/// over a ruler (a drop there deletes) and off the guide's spread.
-fn moving_guides(app: &DesignApp, xf: &Xf, rect: Rect, g: &GuideDrag, press: GuidePress) -> Option<MovingGuides> {
-    let (spread, page, index) = g.from?;
-    let p = g.at?;
-    if !rect.contains(p) || (p - press.origin).length() <= GUIDE_CLICK_SLOP {
-        return None;
-    }
-    let (dx, dy) = guide_drag_delta(app, xf, g, press.origin)?;
-    let from = GuideSel { spread, page, index };
-    let guides = if drags_group(app, from) { app.session.active()?.selection.guides.iter().copied().collect() } else { [from].into_iter().collect() };
-    Some(MovingGuides { guides, dx, dy })
-}
-
-/// An object is under screen point `p` where the Selection tool would pick it (a document
-/// spread's, or a parent spread's while editing parents): it takes the press before the guides
-/// behind it.
-fn over_item(app: &DesignApp, xf: &Xf, p: Pos2) -> bool {
-    let Some(st) = app.session.active() else { return false };
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let cx = designcraft_tools::ToolContext {
-        doc: &st.doc,
-        selection: &st.selection,
-        cache: &app.session.cache,
-        layout: &layout,
-        zoom: xf.zoom.max(1e-6),
-        layer: st.active_layer,
-        snap: app.ui.snap_view(),
-        unit: app.ui.units,
-        stroke_in_front: false,
-    };
-    cx.hit(xf.to_canvas(p)).is_some()
-}
-
-const COLUMN_DRAG: &str = "canvas_column_drag";
-
-/// A column guide being dragged with a Selection tool: its gutter follows the pointer.
-#[derive(Clone, Debug)]
-struct ColumnDrag {
-    /// The document the drag's interaction belongs to.
-    doc: u64,
-    spread: SpreadRef,
-    page: usize,
-    gutter: usize,
-    /// The pointer's spread x minus the gutter's left edge at the press: the gutter keeps that
-    /// distance from the pointer.
-    grab: f64,
-    /// The left edge last previewed.
-    last: Option<f64>,
-}
-
-/// The interior column guide under screen point `p` (within 3 px) that a press there would drag,
-/// as (spread, page, gutter, the gutter's left edge in spread x): a Selection tool, guides shown
-/// (not in Preview or Presentation), column guides unlocked, and no object or ruler guide that
-/// takes the press there.
-fn column_guide_at(app: &DesignApp, xf: &Xf, p: Pos2) -> Option<(SpreadRef, usize, usize, f64)> {
-    let preview = matches!(app.ui.screen_mode, ScreenMode::Preview | ScreenMode::Presentation);
-    if !app.ui.guides || preview || !matches!(app.session.tool_id(), "selection" | "directSelection") {
-        return None;
-    }
-    let st = app.session.active()?;
-    if st.doc.settings.column_guides_locked {
-        return None;
-    }
-    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-    let (r, sp) = layout.spread_at(xf.to_canvas(p))?;
-    let tol = 3.0 / xf.zoom.max(1e-9);
-    let hit = st.doc.spread(r)?.pages.iter().enumerate().find_map(|(pi, pg)| {
-        let m = pg.margin_rect();
-        if sp.y < m.y0 - tol || sp.y > m.y1 + tol {
-            return None;
-        }
-        pg.column_rects().windows(2).enumerate().find_map(|(gi, w)| match w {
-            // Columns that cannot move (gutters wider than the margin box) offer no guide.
-            [a, b]
-                if ((sp.x - a.x1).abs() <= tol || (sp.x - b.x0).abs() <= tol)
-                    && pg.columns.with_gutter_moved(m.width(), gi, a.x1 - m.x0).is_some() =>
-            {
-                Some((r, pi, gi, a.x1))
-            }
-            _ => None,
-        })
-    })?;
-    // A ruler guide there takes the press first (see `guide_drag`).
-    let ruler_guide = !app.ui.guides_locked && guide_at(app, xf, p).is_some();
-    (!ruler_guide && !over_item(app, xf, p)).then_some(hit)
-}
-
-/// Whether spread `r`'s x axis runs across the screen (the spread view is not turned a quarter).
-fn spread_x_across(app: &DesignApp, r: SpreadRef) -> bool {
-    app.session.active().is_none_or(|st| {
-        let [a, b, ..] = CanvasLayout::new(&st.doc, st.editing_parents).xf(r).as_coeffs();
-        a.abs() >= b.abs()
-    })
-}
-
-/// Canvas x `x` moved to the nearest tick mark of the horizontal ruler (its finest increment).
-fn ruler_tick_x(app: &DesignApp, doc: &Document, layout: &CanvasLayout, zoom: f64, x: f64) -> Option<f64> {
-    let pieces = ruler_pieces(app, doc, layout, doc.zero_point());
-    let &(_, _, o) = pieces.iter().find(|(from, to, _)| *from <= x && x < *to).or(pieces.first())?;
-    let (major, sub) = doc.settings.horizontal_units.ruler_ticks(zoom);
-    let step = major / f64::from(sub.max(1));
-    (step.is_finite() && step > 0.0).then(|| o.x + ((x - o.x) / step).round() * step).filter(|v| v.is_finite())
-}
-
-/// Where a dragged gutter's left edge goes for spread x `want`: Shift snaps it to the ruler's tick
-/// marks; otherwise its edges snap to the document grid, guides and objects as those snaps are
-/// set. Measured against the document as it was when the drag began.
-fn snap_gutter(app: &DesignApp, g: &ColumnDrag, want: f64, shift: bool, zoom: f64) -> f64 {
-    let Some(st) = app.session.active() else { return want };
-    let doc = st.interaction.as_ref().map_or_else(|| st.doc.clone(), |i| i.doc.clone());
-    let layout = CanvasLayout::new(&doc, st.editing_parents);
-    let Some(slot) = layout.slots.iter().find(|s| s.spread == g.spread) else { return want };
-    let Some(pg) = doc.spread(g.spread).and_then(|sp| sp.pages.get(g.page)) else { return want };
-    let m = pg.margin_rect();
-    if shift {
-        if !spread_x_across(app, g.spread) {
-            return want;
-        }
-        let c = slot.to_canvas(Point::new(want, m.y0));
-        return ruler_tick_x(app, &doc, &layout, zoom, c.x).map_or(want, |x| slot.to_spread(Point::new(x, c.y)).x);
-    }
-    let cols = pg.column_rects();
-    let width = match (cols.get(g.gutter), cols.get(g.gutter + 1)) {
-        (Some(a), Some(b)) => (b.x0 - a.x1).max(0.0),
-        _ => 0.0,
-    };
-    let cx = designcraft_tools::ToolContext {
-        doc: &doc,
-        selection: &st.selection,
-        cache: &app.session.cache,
-        layout: &layout,
-        zoom: zoom.max(1e-6),
-        layer: st.active_layer,
-        // A line has no size or spacing to match.
-        snap: designcraft_tools::SnapView { smart_dimensions: false, smart_spacing: false, ..app.ui.snap_view() },
-        unit: app.ui.units,
-        stroke_in_front: false,
-    };
-    let rect = DRect::new(want, m.y0, want + width, m.y1);
-    let s = designcraft_tools::snap::snap(
-        &cx,
-        designcraft_tools::SnapRequest {
-            spread: g.spread,
-            gesture: designcraft_tools::Gesture::Move,
-            rect,
-            x_edges: [true, false, true],
-            y_edges: [false; 3],
-            exclude: &[],
-            exclude_guides: &[],
-            copying: false,
-            lengths: [None, None],
-            angle: None,
-            radius: 0.0,
-            pointer: Point::new(want, m.center().y),
-        },
-    );
-    let x = want + s.delta.x;
-    if x.is_finite() { x } else { want }
-}
-
-/// Column guides: with a Selection tool, drag an interior column guide (not over an object) to
-/// move its gutter, both guides together; Escape puts it back. One undo step per drag. Returns
-/// true while it owns the pointer.
-fn column_guide_drag(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf) -> bool {
-    let id = egui::Id::new((COLUMN_DRAG, app.pane));
-    let (pressed, released, origin, latest, shift, escape) = ui.input(|i| {
-        (
-            i.pointer.primary_pressed(),
-            // A release this frame, or one missed while something else had the pointer.
-            i.pointer.primary_released() || !i.pointer.primary_down(),
-            i.pointer.press_origin(),
-            i.pointer.latest_pos(),
-            i.modifiers.shift,
-            i.key_pressed(egui::Key::Escape),
-        )
-    });
-    let mut drag: Option<ColumnDrag> = ui.data(|d| d.get_temp(id));
-    if drag.is_none()
-        && pressed
-        && resp.hovered()
-        && let Some(o) = origin.filter(|o| rect.contains(*o))
-        && let Some((spread, page, gutter, left)) = column_guide_at(app, xf, o)
-        // Another gesture or a dialog's preview owns the document until it ends.
-        && let Some((doc, slot_x)) = app
-            .session
-            .active()
-            .filter(|st| st.interaction.is_none())
-            .map(|st| (st.uid, CanvasLayout::new(&st.doc, st.editing_parents).to_spread(spread, xf.to_canvas(o)).x))
-        && app.session.begin_interaction("Move Column Guide").is_ok()
-    {
-        drag = Some(ColumnDrag { doc, spread, page, gutter, grab: slot_x - left, last: None });
-    }
-    let Some(mut g) = drag else { return false };
-    // Another document became active: the drag ends in its own, as it began.
-    if app.session.active().is_none_or(|st| st.uid != g.doc) {
-        app.session.cancel_interaction_of(g.doc);
-        ui.data_mut(|d| d.remove::<ColumnDrag>(id));
-        return false;
-    }
-    if escape {
-        app.session.cancel_interaction();
-        ui.data_mut(|d| d.remove::<ColumnDrag>(id));
-        return true;
-    }
-    if let Some(p) = latest
-        && let Some(x) = app.session.active().map(|st| CanvasLayout::new(&st.doc, st.editing_parents).to_spread(g.spread, xf.to_canvas(p)).x)
-        && x.is_finite()
-    {
-        let want = snap_gutter(app, &g, x - g.grab, shift, xf.zoom);
-        if g.last != Some(want) && (g.last.is_some() || (p - origin.unwrap_or(p)).length() > 0.0) {
-            let params = json!({"spread": g.spread, "page": g.page, "gutter": g.gutter, "position": want});
-            if let Err(e) = app.session.preview("layout.moveColumnGuide", params) {
-                app.status(e.to_string());
-            }
-            g.last = Some(want);
-        }
-    }
-    if released {
-        ui.data_mut(|d| d.remove::<ColumnDrag>(id));
-        if let Err(e) = app.session.commit_interaction() {
-            app.status(e.to_string());
-        }
-        app.after_engine();
-        return true;
-    }
-    ui.data_mut(|d| d.insert_temp(id, g));
-    true
 }
 
 /// Presses in a row on the canvas: the last press's count, and where and when it was released
@@ -3565,22 +376,6 @@ struct Clicks {
     n: u8,
 }
 
-/// The count of a press at `pos` at time `now`: one more than the last press when it comes within
-/// the double-click delay of the last release and near where that release was, else 1.
-fn press_count(last: Option<Clicks>, pos: Pos2, now: f64, delay: f64, dist: f32) -> u8 {
-    match last {
-        Some(c) if now - c.at <= delay && (pos - c.pos).length() <= dist => c.n.saturating_add(1),
-        _ => 1,
-    }
-}
-
-/// The record a release at `pos` leaves: a release away from its press ended a drag, which is
-/// not a click, so the next press counts from one.
-fn release_clicks(press: Clicks, pos: Pos2, now: f64, dist: f32) -> Clicks {
-    let n = if (pos - press.pos).length() <= dist { press.n } else { 0 };
-    Clicks { at: now, pos, n }
-}
-
 #[cfg(test)]
 #[path = "parent_canvas_tests.rs"]
 mod parent_canvas_tests;
@@ -3590,2280 +385,4 @@ mod parent_canvas_tests;
 mod guide_selection_tests;
 
 #[cfg(test)]
-mod tests {
-    use designcraft_geom::Unit;
-    use egui_kittest::{Harness, kittest::Queryable};
-
-    use super::*;
-
-    #[test]
-    fn a_press_after_a_drag_is_not_a_double_click() {
-        let (delay, dist) = (0.3, 6.0);
-        let press = |last, x: f32, now| press_count(last, pos2(x, 0.0), now, delay, dist);
-        // Click, click: a double click.
-        let n = press(None, 0.0, 0.0);
-        let up = release_clicks(Clicks { at: f64::NEG_INFINITY, pos: pos2(0.0, 0.0), n }, pos2(0.0, 0.0), 0.1, dist);
-        assert_eq!(press(Some(up), 1.0, 0.2), 2);
-        // A drag from 0 to 100, then a fast press where it started or where it ended: a single click.
-        let up = release_clicks(Clicks { at: f64::NEG_INFINITY, pos: pos2(0.0, 0.0), n: 1 }, pos2(100.0, 0.0), 0.1, dist);
-        assert_eq!(press(Some(up), 0.0, 0.2), 1);
-        assert_eq!(press(Some(up), 100.0, 0.2), 1);
-        // Too slow: a single click.
-        let up = release_clicks(Clicks { at: f64::NEG_INFINITY, pos: pos2(0.0, 0.0), n: 1 }, pos2(0.0, 0.0), 0.1, dist);
-        assert_eq!(press(Some(up), 0.0, 1.0), 1);
-    }
-
-    /// While a page's render is on its way the page shows paper, not the black of its shadow.
-    #[test]
-    fn pages_show_paper_under_their_render() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", serde_json::json!({"pages": 3, "facingPages": true})).unwrap();
-        let ctx = egui::Context::default();
-        let mut shapes = Vec::new();
-        for _ in 0..2 {
-            let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), ..Default::default() };
-            let mut out = ctx.run_ui(raw, |ui| show(&mut app, ui));
-            out.textures_delta.clear();
-            shapes = out.shapes;
-        }
-        let st = app.session.active().unwrap();
-        let layout = CanvasLayout::new(&st.doc, false);
-        let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
-        // The paper swatch on screen (white, as the colour settings show it).
-        let [r, g, b, _] = st.doc.resolve_color(designcraft_color::swatch::PAPER, 1.0).unwrap().to_rgba8(1.0);
-        let paper: Vec<Rect> = shapes
-            .iter()
-            .filter_map(|c| match &c.shape {
-                egui::Shape::Rect(s) if s.fill == Color32::from_rgb(r, g, b) => Some(s.rect),
-                _ => None,
-            })
-            .collect();
-        // Each page on its own (a spread's pages may differ in size).
-        assert_eq!(paper.len(), st.doc.page_count());
-        for abs in 0..st.doc.page_count() {
-            let want = xf.rect(layout.page_rect(&st.doc, abs).unwrap());
-            assert!(paper.iter().any(|r| (r.min - want.min).length() < 0.01 && (r.max - want.max).length() < 0.01), "page {abs}");
-        }
-    }
-
-    /// Bleed and Slug are preview modes: like Preview they hide the guides, and what the page
-    /// shows widens to the bleed or the slug box. The slug guide is drawn in Normal, in its own
-    /// colour, beside the bleed guide.
-    #[test]
-    fn bleed_and_slug_are_preview_modes_that_show_their_area() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", serde_json::json!({"bleed": 9, "slug": 18})).unwrap();
-        let strokes = |app: &mut DesignApp, want: [u8; 3]| -> usize {
-            let ctx = egui::Context::default();
-            let mut shapes = Vec::new();
-            for _ in 0..2 {
-                let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), ..Default::default() };
-                let mut out = ctx.run_ui(raw, |ui| show(app, ui));
-                out.textures_delta.clear();
-                shapes = out.shapes;
-            }
-            let want = c32(want);
-            shapes.iter().filter(|c| matches!(&c.shape, egui::Shape::Rect(s) if s.stroke.color == want)).count()
-        };
-        let s = app.session.active().unwrap().doc.settings.clone();
-        // Normal draws every guide, the slug's among them.
-        app.ui.screen_mode = ScreenMode::Normal;
-        assert!(strokes(&mut app, s.margin_color) > 0, "Normal draws the margin guide");
-        assert!(strokes(&mut app, s.bleed_color) > 0, "Normal draws the bleed guide");
-        assert!(strokes(&mut app, s.slug_color) > 0, "Normal draws the slug guide");
-        // Every preview mode hides them.
-        for mode in [ScreenMode::Preview, ScreenMode::Bleed, ScreenMode::Slug, ScreenMode::Presentation] {
-            app.ui.screen_mode = mode;
-            assert_eq!(strokes(&mut app, s.margin_color), 0, "{mode:?} hides the margin guide");
-            assert_eq!(strokes(&mut app, s.slug_color), 0, "{mode:?} hides the slug guide");
-        }
-    }
-
-    /// Each preview mode's shown area: Preview stops at the trim, Bleed reaches the bleed box and
-    /// Slug the slug box. A slug narrower than the bleed never pulls the edge back in.
-    #[test]
-    fn shown_area_widens_to_the_bleed_and_slug_boxes() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", serde_json::json!({"bleed": 9, "slug": 18})).unwrap();
-        let doc = app.session.active().unwrap().doc.clone();
-        let layout = CanvasLayout::new(&doc, false);
-        let xf = Xf::new(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0)), &View::default());
-        let slot = &layout.slots[0];
-        let area = |app: &mut DesignApp, mode| {
-            app.ui.screen_mode = mode;
-            shown_area(app, &doc, &xf, slot)
-        };
-        let trim = xf.rect(slot.bounds);
-        assert_eq!(area(&mut app, ScreenMode::Preview), trim, "Preview stops at the trim");
-        assert_eq!(area(&mut app, ScreenMode::Presentation), trim, "Presentation stops at the trim");
-        let bleed = area(&mut app, ScreenMode::Bleed);
-        let slug = area(&mut app, ScreenMode::Slug);
-        assert!(bleed.contains_rect(trim) && bleed != trim, "Bleed reaches past the trim");
-        assert!(slug.contains_rect(bleed) && slug != bleed, "Slug reaches past the bleed");
-        // 9 pt of bleed and 18 pt of slug at this zoom, on every edge.
-        let grew = |r: Rect, pt: f64| {
-            let d = (pt * xf.zoom) as f32;
-            (r.min - trim.min + vec2(d, d)).length() < 0.01 && (r.max - trim.max - vec2(d, d)).length() < 0.01
-        };
-        assert!(grew(bleed, 9.0), "Bleed grows by the bleed: {bleed:?}");
-        assert!(grew(slug, 18.0), "Slug grows by the slug: {slug:?}");
-        // A slug inside the bleed: Slug still shows every printing element, so the bleed too.
-        app.run("file.new", serde_json::json!({"bleed": 18, "slug": 9})).unwrap();
-        let doc = app.session.active().unwrap().doc.clone();
-        app.ui.screen_mode = ScreenMode::Slug;
-        assert!(grew(shown_area(&app, &doc, &xf, slot), 18.0), "the wider of the two boxes wins");
-        // No bleed and no slug: nothing to widen to.
-        app.run("file.new", serde_json::json!({})).unwrap();
-        let doc = app.session.active().unwrap().doc.clone();
-        for mode in [ScreenMode::Bleed, ScreenMode::Slug] {
-            app.ui.screen_mode = mode;
-            assert_eq!(shown_area(&app, &doc, &xf, slot), trim, "{mode:?} without a bleed or slug");
-        }
-    }
-
-    fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
-        let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let ctx = ui.ctx().clone();
-                app.logic(&ctx);
-                app.ui(ui);
-            },
-            app,
-        );
-        h.run_steps(4);
-        h
-    }
-
-    #[test]
-    fn display_option_change_drops_the_render_in_flight() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let shown = crate::Shown { doc: (1, 2, 3, false), origin: Point::new(0.0, 0.0), zoom: 1.0, size: (10.0, 10.0), editing_parents: false };
-        invalidate_on_display_change(&mut app);
-        app.canvas.shown = Some(shown);
-        app.canvas.pending = Some((7, shown));
-        // Nothing changed: the texture and the request stay.
-        invalidate_on_display_change(&mut app);
-        assert!(app.canvas.shown.is_some() && app.canvas.pending.is_some());
-        // A display option changed while the render ran: its result must not be accepted.
-        app.ui.display_quality = designcraft_render::DisplayQuality::Fast;
-        invalidate_on_display_change(&mut app);
-        assert!(app.canvas.shown.is_none() && app.canvas.pending.is_none() && app.canvas.pending_doc.is_none());
-        // The document grid is drawn into the texture too.
-        app.canvas.shown = Some(shown);
-        app.ui.document_grid = !app.ui.document_grid;
-        invalidate_on_display_change(&mut app);
-        assert!(app.canvas.shown.is_none());
-    }
-
-    /// A primary-button drag from `a` to `b` over a few frames.
-    fn drag(h: &mut Harness<'_, DesignApp>, a: Pos2, b: Pos2) {
-        h.hover_at(a);
-        h.step();
-        h.event(egui::Event::PointerButton { pos: a, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
-        h.step();
-        for k in 1..=4 {
-            h.hover_at(a + (b - a) * (k as f32 / 4.0));
-            h.step();
-        }
-        h.event(egui::Event::PointerButton { pos: b, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() });
-        h.run_steps(3);
-    }
-
-    #[test]
-    fn the_page_tool_draws_liquid_guides_from_the_rulers() {
-        // Chris Cicchino's Page Tool and Liquid Layout video (11:00): with the Page tool, a guide
-        // dragged from the ruler is a liquid guide (dashed).
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.session.set_tool("page");
-        let mut h = harness(app);
-        let r = h.state().canvas_rect.unwrap();
-        let guides = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().doc.spreads[0].pages[0].guides.clone();
-        drag(&mut h, pos2(r.center().x, r.min.y - 8.0), r.center());
-        let g = guides(&h);
-        assert_eq!(g.len(), 1, "{g:?}");
-        assert!(g[0].liquid && g[0].orientation == designcraft_doc::Orientation::Horizontal);
-        // With the Selection tool it's a ruler guide.
-        h.state_mut().session.set_tool("selection");
-        drag(&mut h, pos2(r.center().x, r.min.y - 8.0), r.center() + vec2(0.0, 40.0));
-        let g = guides(&h);
-        assert_eq!(g.len(), 2);
-        assert!(!g[1].liquid);
-    }
-
-    /// Dragging a column guide with the Selection tool moves its gutter (one undo step); with
-    /// column guides locked the same drag leaves the columns alone.
-    #[test]
-    fn the_selection_tool_drags_a_column_guide() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        // Two columns across the 540 pt margin box: the gutter's left edge is at x = 300.
-        app.run("layout.marginsAndColumns", json!({"parent": "A", "columns": 2, "gutter": 12})).unwrap();
-        let mut h = harness(app);
-        let page = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().doc.spreads[0].pages[0].clone();
-        let screen = |h: &Harness<'_, DesignApp>, x: f64| {
-            let app = h.state();
-            let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
-            let layout = CanvasLayout::new(&app.session.active().unwrap().doc, false);
-            let slot = layout.slots.iter().find(|s| s.spread == SpreadRef::Doc(0)).unwrap();
-            (xf.to_screen(slot.xf * Point::new(x, 400.0)), xf.zoom as f32)
-        };
-        let (at, zoom) = screen(&h, 300.0);
-        drag(&mut h, at, at + vec2(72.0 * zoom, 0.0));
-        assert_eq!(page(&h).columns.positions, None, "column guides are locked in a new document");
-        h.hover_at(at);
-        h.run_steps(2);
-        assert_ne!(h.output().platform_output.cursor_icon, egui::CursorIcon::ResizeHorizontal);
-
-        h.state_mut().run("view.lockColumnGuides", json!({"on": false})).unwrap();
-        h.run_steps(2);
-        let (at, zoom) = screen(&h, 300.0);
-        drag(&mut h, at, at + vec2(72.0 * zoom, 0.0));
-        let pg = page(&h);
-        let cols = pg.column_rects();
-        assert!((cols[0].x1 - 372.0).abs() < 1.0 && (cols[1].x0 - cols[0].x1 - 12.0).abs() < 1e-9, "{cols:?}");
-        assert!(pg.local_margins, "the dragged page's columns are its own");
-        // Over the moved guide: a resize cursor.
-        h.hover_at(screen(&h, 372.0).0);
-        h.run_steps(2);
-        assert_eq!(h.output().platform_output.cursor_icon, egui::CursorIcon::ResizeHorizontal);
-        h.state_mut().run("edit.undo", json!({})).unwrap();
-        assert_eq!(page(&h).columns.positions, None, "one undo step");
-
-        // Escape during the drag puts the gutter back.
-        h.hover_at(at);
-        h.step();
-        h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
-        h.step();
-        h.hover_at(at + vec2(40.0, 0.0));
-        h.step();
-        assert!(page(&h).columns.positions.is_some(), "the drag previews");
-        h.event(egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() });
-        h.step();
-        h.event(egui::Event::PointerButton {
-            pos: at + vec2(40.0, 0.0),
-            button: egui::PointerButton::Primary,
-            pressed: false,
-            modifiers: Default::default(),
-        });
-        h.run_steps(3);
-        assert_eq!(page(&h).columns.positions, None);
-        assert!(!page(&h).local_margins);
-
-        // Space pressed during the drag and the button released under it: the drag ends with the
-        // release and the gutter stops following the pointer.
-        let key = |pressed| egui::Event::Key { key: egui::Key::Space, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
-        h.hover_at(at);
-        h.step();
-        h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
-        h.step();
-        h.hover_at(at + vec2(40.0, 0.0));
-        h.step();
-        h.event(key(true));
-        h.step();
-        h.event(egui::Event::PointerButton {
-            pos: at + vec2(40.0, 0.0),
-            button: egui::PointerButton::Primary,
-            pressed: false,
-            modifiers: Default::default(),
-        });
-        h.step();
-        h.event(key(false));
-        h.run_steps(2);
-        let moved = page(&h).columns.positions;
-        assert!(moved.is_some());
-        h.hover_at(at + vec2(120.0, 0.0));
-        h.run_steps(3);
-        assert_eq!(page(&h).columns.positions, moved, "the gutter stays where the drag ended");
-        assert!(h.state().session.active().unwrap().interaction.is_none());
-        h.state_mut().run("edit.undo", json!({})).unwrap();
-        assert_eq!(page(&h).columns.positions, None, "the drag was one undo step");
-    }
-
-    /// A column guide is not picked where the screen mode hides guides, where an object on the
-    /// parent being edited lies over it, or where its columns cannot move.
-    #[test]
-    fn column_guides_are_picked_only_where_a_drag_can_move_them() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 1})).unwrap();
-        app.run("layout.marginsAndColumns", json!({"parent": "A", "columns": 2, "gutter": 12})).unwrap();
-        app.run("view.lockColumnGuides", json!({"on": false})).unwrap();
-        let mut h = harness(app);
-        let hit = |h: &Harness<'_, DesignApp>, r: SpreadRef, x: f64| {
-            let app = h.state();
-            let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
-            let st = app.session.active().unwrap();
-            let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-            let slot = layout.slots.iter().find(|s| s.spread == r).unwrap();
-            column_guide_at(app, &xf, xf.to_screen(slot.xf * Point::new(x, 400.0)))
-        };
-        assert!(hit(&h, SpreadRef::Doc(0), 300.0).is_some());
-        h.state_mut().ui.screen_mode = ScreenMode::Preview;
-        assert!(hit(&h, SpreadRef::Doc(0), 300.0).is_none(), "Preview hides the guides");
-        h.state_mut().ui.screen_mode = ScreenMode::Normal;
-
-        // Editing parent A: its right page (the one page 0 follows) and a frame over its gutter.
-        h.state_mut().run("layout.parents.edit", json!({"on": true, "parent": "A-Parent"})).unwrap();
-        h.run_steps(2);
-        let parent = SpreadRef::Parent(0);
-        let x = h.state().session.active().unwrap().doc.parents[0].pages[1].column_rects()[0].x1;
-        assert!(hit(&h, parent, x).is_some());
-        h.state_mut()
-            .run("frame.create", json!({"spread": {"kind": "parent", "index": 0}, "rect": [x - 20.0, 300.0, x + 20.0, 500.0], "content": "text"}))
-            .unwrap();
-        h.run_steps(2);
-        assert!(hit(&h, parent, x).is_none(), "the parent's frame takes the press");
-        h.state_mut().run("layout.parents.edit", json!({"on": false})).unwrap();
-        h.run_steps(2);
-
-        // Gutters wider than the margin box: the even split cannot be moved.
-        h.state_mut().run("layout.marginsAndColumns", json!({"pages": [0], "columns": 2, "gutter": 1000})).unwrap();
-        h.run_steps(2);
-        let x = h.state().session.active().unwrap().doc.spreads[0].pages[0].column_rects()[0].x1;
-        assert!(hit(&h, SpreadRef::Doc(0), x).is_none());
-    }
-
-    fn right_click(h: &mut Harness<'_, DesignApp>, p: Pos2) {
-        h.hover_at(p);
-        h.step();
-        for pressed in [true, false] {
-            h.event(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Secondary, pressed, modifiers: Default::default() });
-        }
-        h.run_steps(3);
-    }
-
-    fn new_document() -> Harness<'static, DesignApp> {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        harness(app)
-    }
-
-    fn held(modifiers: egui::Modifiers) -> egui::Event {
-        egui::Event::ModifiersChanged(modifiers)
-    }
-
-    fn wheel(phase: egui::TouchPhase, up: f32, modifiers: egui::Modifiers) -> egui::Event {
-        egui::Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta: vec2(0.0, up), phase, modifiers }
-    }
-
-    // Plays `events` with the pointer at `at`, a frame each, and lets the motion settle.
-    fn play(h: &mut Harness<'_, DesignApp>, at: Pos2, events: &[egui::Event]) -> View {
-        h.hover_at(at);
-        for event in events {
-            h.event(event.clone());
-            h.step();
-        }
-        h.run_steps(30);
-        *h.state().view().unwrap()
-    }
-
-    /// Alt + wheel scrolled the view like the plain wheel; it zooms at the pointer (#470).
-    #[test]
-    fn alt_wheel_zooms_at_the_pointer() {
-        use egui::{Modifiers, TouchPhase::Move};
-        let mut h = new_document();
-        let rect = h.state().canvas_rect.unwrap();
-        let at = rect.center() + vec2(150.0, 90.0);
-        let before = *h.state().view().unwrap();
-        let under = Xf::new(rect, &before).to_canvas(at);
-        let zoomed = play(&mut h, at, &[held(Modifiers::ALT), wheel(Move, 100.0, Modifiers::ALT)]);
-        assert!(zoomed.zoom > before.zoom * 1.2, "wheel up zooms in: {} -> {}", before.zoom, zoomed.zoom);
-        let still = Xf::new(rect, &zoomed).to_canvas(at);
-        assert!((still.x - under.x).abs() < 0.01 && (still.y - under.y).abs() < 0.01, "the point under the pointer stays: {under:?} -> {still:?}");
-        let back = play(&mut h, at, &[held(Modifiers::ALT), wheel(Move, -100.0, Modifiers::ALT)]);
-        assert!((back.zoom - before.zoom).abs() < 1e-6, "wheel down zooms out: {} -> {}", zoomed.zoom, back.zoom);
-        // The plain wheel still scrolls.
-        let scrolled = play(&mut h, at, &[held(Modifiers::NONE), wheel(Move, 100.0, Modifiers::NONE)]);
-        assert!(scrolled.zoom == back.zoom && scrolled.origin.y < back.origin.y, "{back:?} -> {scrolled:?}");
-    }
-
-    /// Alt zooms exactly as Ctrl/Cmd does, also when the key is let go while the wheel's motion is
-    /// still arriving: the rest of it zooms too and does not scroll the page.
-    #[test]
-    fn alt_wheel_zooms_like_ctrl_wheel_to_the_end_of_the_motion() {
-        use egui::{
-            Modifiers,
-            TouchPhase::{End, Move, Start},
-        };
-        const NONE: Modifiers = Modifiers::NONE;
-        // Each motion in steps; the views are compared after every step.
-        let motions: [fn(Modifiers) -> Vec<Vec<egui::Event>>; 4] = [
-            |key| vec![vec![held(key), wheel(Move, 100.0, key)]],
-            // A wheel turned fast, the key let go a frame later.
-            |key| vec![vec![held(key), wheel(Move, 400.0, key), held(NONE)]],
-            // A trackpad swipe that coasts on after the key is let go; once it has ended, the wheel scrolls.
-            |key| {
-                vec![
-                    vec![held(key), wheel(Start, 0.0, key), wheel(Move, 50.0, key), held(NONE), wheel(Move, 200.0, NONE)],
-                    vec![wheel(End, 0.0, NONE), wheel(Move, 100.0, NONE)],
-                ]
-            },
-            |key| vec![vec![held(key | Modifiers::SHIFT), wheel(Move, 100.0, key | Modifiers::SHIFT)]],
-        ];
-        for (i, motion) in motions.iter().enumerate() {
-            let (mut with_alt, mut with_command) = (new_document(), new_document());
-            let at = with_alt.state().canvas_rect.unwrap().center() + vec2(150.0, 90.0);
-            let start = *with_alt.state().view().unwrap();
-            for (alt, command) in motion(Modifiers::ALT).iter().zip(motion(Modifiers::COMMAND)) {
-                let (alt, command) = (play(&mut with_alt, at, alt), play(&mut with_command, at, &command));
-                assert!(command.zoom > start.zoom, "motion {i} zooms");
-                assert_eq!(alt, command, "motion {i}");
-            }
-        }
-    }
-
-    fn units(h: &Harness<'_, DesignApp>) -> (Unit, Unit) {
-        let s = &h.state().session.doc().unwrap().doc.settings;
-        (s.horizontal_units, s.vertical_units)
-    }
-
-    fn zoom_app(tool: &str) -> DesignApp {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.select_tool(tool);
-        app.ui.rulers = false;
-        app
-    }
-
-    fn canvas_frame(app: &mut DesignApp, ctx: &egui::Context, m: egui::Modifiers, mut events: Vec<egui::Event>) -> egui::CursorIcon {
-        events.insert(0, egui::Event::ModifiersChanged(m));
-        let mut output = ctx.run_ui(
-            egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), events, ..Default::default() },
-            |ui| {
-                app.logic(ui.ctx());
-                // Fonts installed by logic become available at the start of the next frame,
-                // just as in the full application UI.
-                if app.fonts_ready {
-                    show(app, ui);
-                }
-            },
-        );
-        output.textures_delta.clear();
-        output.platform_output.cursor_icon
-    }
-
-    /// The cursor icon the canvas sets for `c` on this platform (bitmap and painted cursors
-    /// report their own icon).
-    fn shown(c: Cursor) -> egui::CursorIcon {
-        crate::cursors::show(&egui::Context::default(), &mut crate::cursors::Images::default(), c, Pos2::ZERO)
-    }
-
-    fn space_key(pressed: bool, modifiers: egui::Modifiers) -> egui::Event {
-        egui::Event::Key { key: egui::Key::Space, physical_key: None, pressed, repeat: false, modifiers }
-    }
-
-    fn press(pos: Pos2, pressed: bool, modifiers: egui::Modifiers) -> egui::Event {
-        egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers }
-    }
-
-    fn hover(app: &mut DesignApp, ctx: &egui::Context, p: Pos2) {
-        for _ in 0..3 {
-            canvas_frame(app, ctx, egui::Modifiers::NONE, vec![egui::Event::PointerMoved(p)]);
-        }
-    }
-
-    const CMD: egui::Modifiers = egui::Modifiers { command: true, mac_cmd: true, ..egui::Modifiers::NONE };
-
-    #[test]
-    fn spring_zoom_click_is_anchored_view_only_and_release_restores_previous_tool() {
-        for tool in ["rectangleFrame", "directSelection", "type", "hand", "zoom"] {
-            let mut app = zoom_app(tool);
-            if tool == "rectangleFrame" {
-                let frame = app.run("frame.create", json!({"rect":[36,36,300,200],"content":"text","text":"Hello"})).unwrap();
-                app.run("text.select", json!({"story":frame["story"],"anchor":5})).unwrap();
-            }
-            let ctx = egui::Context::default();
-            let p = pos2(300.0, 250.0);
-            hover(&mut app, &ctx, p);
-            let before = *app.view().unwrap();
-            let doc = app.session.doc().unwrap().doc.clone();
-            let selection = app.session.doc().unwrap().selection.clone();
-            let history = app.run("document.history", json!({})).unwrap();
-            let cursor = canvas_frame(&mut app, &ctx, CMD, vec![space_key(true, CMD)]);
-            assert_eq!(cursor, shown(Cursor::ZoomIn), "{tool}");
-            canvas_frame(&mut app, &ctx, CMD, vec![press(p, true, CMD)]);
-            canvas_frame(&mut app, &ctx, CMD, vec![press(p, false, CMD)]);
-            let after = *app.view().unwrap();
-            assert_eq!(after.zoom, before.zoom * 2.0, "{tool}");
-            let anchor = Xf::new(app.canvas_rect.unwrap(), &before).to_canvas(p);
-            assert!((Xf::new(app.canvas_rect.unwrap(), &after).to_canvas(p) - anchor).hypot() < 1e-9);
-            let cursor = canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![space_key(false, egui::Modifiers::NONE)]);
-            assert_eq!(app.session.tool_id(), tool);
-            let expected = app.session.cursor(anchor, Mods::default(), app.view_info());
-            assert_eq!(cursor, shown(expected), "{tool}");
-            assert!(std::sync::Arc::ptr_eq(&doc, &app.session.doc().unwrap().doc));
-            assert_eq!(selection, app.session.doc().unwrap().selection);
-            assert_eq!(history, app.run("document.history", json!({})).unwrap());
-        }
-    }
-
-    #[test]
-    fn spring_zoom_alt_clicks_out_and_modifier_release_switches_back_to_hand() {
-        let mut app = zoom_app("rectangleFrame");
-        let ctx = egui::Context::default();
-        let p = pos2(300.0, 250.0);
-        hover(&mut app, &ctx, p);
-        let z = app.view().unwrap().zoom;
-        let alt = egui::Modifiers { alt: true, ..CMD };
-        assert_eq!(canvas_frame(&mut app, &ctx, CMD, vec![space_key(true, CMD)]), shown(Cursor::ZoomIn));
-        assert_eq!(canvas_frame(&mut app, &ctx, alt, vec![]), shown(Cursor::ZoomOut));
-        canvas_frame(&mut app, &ctx, alt, vec![press(p, true, alt)]);
-        canvas_frame(&mut app, &ctx, alt, vec![press(p, false, alt)]);
-        assert_eq!(app.view().unwrap().zoom, z * 0.5);
-        assert_eq!(canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![]), shown(Cursor::Hand));
-        let before = *app.view().unwrap();
-        canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(p, true, egui::Modifiers::NONE)]);
-        canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![egui::Event::PointerMoved(p + vec2(80.0, 0.0))]);
-        canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(p + vec2(80.0, 0.0), false, egui::Modifiers::NONE)]);
-        assert_eq!(app.view().unwrap().zoom, before.zoom);
-        assert!(app.view().unwrap().origin.x < before.origin.x);
-        assert_eq!(app.session.tool_id(), "rectangleFrame");
-    }
-
-    #[test]
-    fn spring_zoom_scrubs_and_owns_pointer_release_after_shortcut_release() {
-        let mut app = zoom_app("rectangleFrame");
-        let ctx = egui::Context::default();
-        let p = pos2(300.0, 250.0);
-        hover(&mut app, &ctx, p);
-        let z = app.view().unwrap().zoom;
-        let doc = app.session.doc().unwrap().doc.clone();
-        // Ctrl is the platform command modifier on Windows/Linux, using the same input path.
-        let cmd = egui::Modifiers { command: true, ctrl: true, ..egui::Modifiers::NONE };
-        canvas_frame(&mut app, &ctx, cmd, vec![space_key(true, cmd), press(p, true, cmd)]);
-        let end = p + vec2(150.0, 0.0);
-        canvas_frame(&mut app, &ctx, cmd, vec![egui::Event::PointerMoved(end)]);
-        assert!((app.view().unwrap().zoom - z * std::f64::consts::E).abs() < 1e-9);
-        let scrubbed = app.view().unwrap().zoom;
-        assert_eq!(canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![space_key(false, egui::Modifiers::NONE)]), shown(Cursor::Crosshair));
-        canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(end, false, egui::Modifiers::NONE)]);
-        assert_eq!(app.view().unwrap().zoom, scrubbed, "no extra click zoom at the end of a scrub");
-        assert!(std::sync::Arc::ptr_eq(&doc, &app.session.doc().unwrap().doc));
-        // The original tool still draws after the temporary gesture.
-        canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(p, true, egui::Modifiers::NONE)]);
-        canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![egui::Event::PointerMoved(p + vec2(50.0, 50.0))]);
-        canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(p + vec2(50.0, 50.0), false, egui::Modifiers::NONE)]);
-        assert!(!std::sync::Arc::ptr_eq(&doc, &app.session.doc().unwrap().doc));
-        assert_eq!(app.session.tool_id(), "rectangleFrame");
-    }
-
-    #[test]
-    fn spring_zoom_is_suppressed_while_typing_in_a_text_frame() {
-        let mut app = zoom_app("type");
-        let frame = app.run("frame.create", json!({"rect":[36,36,300,200],"content":"text","text":"Hello"})).unwrap();
-        app.run("text.select", json!({"story":frame["story"],"anchor":5})).unwrap();
-        assert!(app.session.wants_text());
-        let ctx = egui::Context::default();
-        let p = pos2(300.0, 250.0);
-        hover(&mut app, &ctx, p);
-        let before = *app.view().unwrap();
-        let alt = egui::Modifiers { alt: true, ..CMD };
-        for m in [CMD, alt] {
-            app.run("text.select", json!({"story":frame["story"],"anchor":5})).unwrap();
-            assert!(app.session.wants_text());
-            assert!(!matches!(canvas_frame(&mut app, &ctx, m, vec![space_key(true, m)]), egui::CursorIcon::ZoomIn | egui::CursorIcon::ZoomOut));
-            canvas_frame(&mut app, &ctx, m, vec![press(p, true, m)]);
-            canvas_frame(&mut app, &ctx, m, vec![press(p, false, m)]);
-            assert_eq!(app.view().unwrap().zoom, before.zoom);
-            assert_eq!(app.view().unwrap().origin, before.origin);
-            canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![space_key(false, egui::Modifiers::NONE)]);
-        }
-    }
-
-    #[test]
-    fn spring_zoom_is_suppressed_while_a_text_field_has_focus() {
-        let mut app = zoom_app("rectangleFrame");
-        let ctx = egui::Context::default();
-        let mut text = String::new();
-        let p = pos2(300.0, 250.0);
-        hover(&mut app, &ctx, p);
-        let before = *app.view().unwrap();
-        for m in [egui::Modifiers::NONE, CMD, egui::Modifiers { alt: true, ..CMD }] {
-            let mut output = ctx.run_ui(
-                egui::RawInput {
-                    screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))),
-                    events: vec![egui::Event::ModifiersChanged(m), space_key(true, m), egui::Event::Text("x".into()), egui::Event::PointerMoved(p)],
-                    ..Default::default()
-                },
-                |ui| {
-                    ui.text_edit_singleline(&mut text).request_focus();
-                    show(&mut app, ui);
-                },
-            );
-            output.textures_delta.clear();
-            assert!(ctx.text_edit_focused());
-            assert!(!matches!(output.platform_output.cursor_icon, egui::CursorIcon::ZoomIn | egui::CursorIcon::ZoomOut | egui::CursorIcon::Grab));
-            assert_eq!(app.view().unwrap().zoom, before.zoom);
-            assert_eq!(app.session.tool_id(), "rectangleFrame");
-        }
-        assert!(!text.is_empty(), "typing still reaches the field");
-    }
-
-    #[test]
-    fn spring_zoom_does_not_interrupt_an_existing_tool_drag() {
-        let mut app = zoom_app("rectangleFrame");
-        let ctx = egui::Context::default();
-        let p = pos2(300.0, 250.0);
-        hover(&mut app, &ctx, p);
-        let before = *app.view().unwrap();
-        let doc = app.session.doc().unwrap().doc.clone();
-        canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(p, true, egui::Modifiers::NONE)]);
-        let end = p + vec2(100.0, 100.0);
-        canvas_frame(&mut app, &ctx, CMD, vec![space_key(true, CMD), egui::Event::PointerMoved(end)]);
-        canvas_frame(&mut app, &ctx, CMD, vec![press(end, false, CMD)]);
-        assert_eq!(app.view().unwrap().zoom, before.zoom);
-        assert_eq!(app.view().unwrap().origin, before.origin);
-        assert!(!std::sync::Arc::ptr_eq(&doc, &app.session.doc().unwrap().doc));
-    }
-
-    #[test]
-    fn spring_zoom_does_not_zoom_on_the_rulers() {
-        let mut app = zoom_app("rectangleFrame");
-        app.ui.rulers = true;
-        let ctx = egui::Context::default();
-        hover(&mut app, &ctx, pos2(300.0, 250.0));
-        let rect = app.canvas_rect.unwrap();
-        let p = pos2(rect.min.x - RULER / 2.0, rect.center().y);
-        hover(&mut app, &ctx, p);
-        let before = *app.view().unwrap();
-        canvas_frame(&mut app, &ctx, CMD, vec![space_key(true, CMD)]);
-        canvas_frame(&mut app, &ctx, CMD, vec![press(p, true, CMD)]);
-        canvas_frame(&mut app, &ctx, CMD, vec![press(p, false, CMD)]);
-        assert_eq!(app.view().unwrap().zoom, before.zoom);
-        assert_eq!(app.view().unwrap().origin, before.origin);
-    }
-
-    #[test]
-    fn parent_guides_on_a_page_are_not_picked_there() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        // 100 pt into A's right page, which page 1 (a right page at x = 0) shows.
-        let parent_guide = json!({"spread": {"kind": "parent", "index": 0}, "page": 1, "orientation": "vertical", "position": 712});
-        app.run("guide.add", parent_guide).unwrap();
-        let mut h = harness(app);
-        let at = |app: &DesignApp| {
-            let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
-            let layout = CanvasLayout::new(&app.session.active().unwrap().doc, false);
-            let slot = layout.slots.iter().find(|s| s.spread == SpreadRef::Doc(0)).unwrap();
-            guide_at(app, &xf, xf.to_screen(slot.xf * Point::new(100.0, 300.0)))
-        };
-        assert_eq!(at(h.state()), None, "the parent's guide is edited on the parent");
-        h.state_mut().run("guide.add", json!({"orientation": "vertical", "position": 100})).unwrap();
-        h.run_steps(2);
-        assert!(matches!(at(h.state()), Some((SpreadRef::Doc(0), 0, 0, _))), "the page's own guide is");
-    }
-
-    #[test]
-    fn mouse_double_clicking_a_frame_handle_fits_with_one_undo_step() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let id = designcraft_doc::ItemId(
-            app.run("frame.create", json!({"rect": [100, 100, 400, 300], "content": "text", "text": "Fit this text"})).unwrap()["id"]
-                .as_u64()
-                .unwrap(),
-        );
-        app.run("selection.set", json!({"ids": [id.0]})).unwrap();
-        let original = app.session.doc().unwrap().doc.item(id).unwrap().bounds();
-        // 60 frames a second: the default 0.25 s step puts two clicks past egui's double-click delay.
-        let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let ctx = ui.ctx().clone();
-                app.logic(&ctx);
-                app.ui(ui);
-            },
-            app,
-        );
-        h.run_steps(4);
-        let app = h.state();
-        let st = app.session.doc().unwrap();
-        let layout = CanvasLayout::new(&st.doc, false);
-        let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
-        let p = xf.to_screen(layout.xf(SpreadRef::Doc(0)) * Point::new(original.x1, original.y1));
-        h.hover_at(p);
-        h.step();
-        // Separate frames model the actual mouse, including egui's release-time double click.
-        for _ in 0..2 {
-            for pressed in [true, false] {
-                h.event(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
-                h.step();
-            }
-        }
-        h.run_steps(2);
-        let fitted = h.state().session.doc().unwrap().doc.item(id).unwrap().bounds();
-        assert!(fitted.width() < original.width() && fitted.height() < original.height(), "{fitted:?}");
-        assert_eq!(h.state().session.tool_id(), "selection");
-        h.state_mut().run("edit.undo", json!({})).unwrap();
-        assert_eq!(h.state().session.doc().unwrap().doc.item(id).unwrap().bounds(), original);
-    }
-
-    const ART: &str = r##"<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 50" width="100pt" height="50pt"><path d="M0,0 C30,0 70,50 100,50" fill="none" stroke="#000" stroke-width="2"/></svg>"##;
-
-    #[test]
-    fn pasting_svg_from_another_app_places_editable_paths_in_the_middle_of_the_view() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let mut h = harness(app);
-        h.run_steps(2);
-        let undo = h.state().session.doc().unwrap().history.undo.len();
-        h.event(egui::Event::Paste(ART.into()));
-        h.run_steps(2);
-        let app = h.state();
-        let st = app.session.doc().unwrap();
-        assert_eq!(st.history.undo.len(), undo + 1, "one undo step");
-        let id = *st.selection.items.first().expect("the pasted path is selected");
-        let it = st.doc.item(id).unwrap();
-        assert_eq!(it.shape, designcraft_doc::Shape::Path);
-        assert_eq!(it.path.subpaths[0].anchors.len(), 2);
-        assert!((it.stroke.weight - 2.0).abs() < 1e-9);
-        // Centred where text from another app would go: the middle of the view.
-        let (_, centre) = view_centre(app).unwrap();
-        assert!((it.bounds().center() - centre).hypot() < 0.01, "{:?} vs {centre:?}", it.bounds());
-    }
-
-    #[test]
-    fn the_paste_in_place_shortcut_pastes_in_place_and_plain_paste_offsets() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let id = app.run("frame.create", json!({"rect": [100, 100, 200, 200]})).unwrap()["id"].as_u64().unwrap();
-        let original = app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().bounds();
-        app.run("edit.copy", json!({})).unwrap();
-        let clip = app.object_clip_text.clone().expect("the copy's placeholder text");
-        let mut h = harness(app);
-        let paste = |h: &mut Harness<'static, DesignApp>, modifiers: egui::Modifiers| {
-            // As egui-winit delivers ⌃⌥⇧V: the chord's paste and the V release, no V press; here the
-            // modifiers are released within the same frame.
-            let release = egui::Event::Key { key: egui::Key::V, physical_key: None, pressed: false, repeat: false, modifiers };
-            let none = egui::Event::ModifiersChanged(egui::Modifiers::NONE);
-            h.input_mut().events.extend([egui::Event::ModifiersChanged(modifiers), egui::Event::Paste(clip.clone()), release, none]);
-            h.run_steps(2);
-            let st = h.state().session.doc().unwrap();
-            let pasted = *st.selection.items.first().expect("the copy is selected");
-            assert_ne!(pasted.0, id);
-            st.doc.item(pasted).unwrap().bounds()
-        };
-        let linux = egui::Modifiers { alt: true, ctrl: true, shift: true, mac_cmd: false, command: true };
-        assert_eq!(paste(&mut h, linux), original, "Paste in Place");
-        let moved = paste(&mut h, egui::Modifiers::COMMAND);
-        assert!((moved.x0 - original.x0 - 12.0).abs() < 1e-9 && (moved.y0 - original.y0 - 12.0).abs() < 1e-9, "{moved:?}");
-        // The modifiers went down in an earlier frame than the paste.
-        h.event_modifiers(egui::Event::Paste(clip.clone()), linux);
-        h.run_steps(2);
-        let st = h.state().session.doc().unwrap();
-        let pasted = *st.selection.items.first().expect("the copy is selected");
-        assert_eq!(st.doc.item(pasted).unwrap().bounds(), original);
-    }
-
-    #[test]
-    fn edit_paste_from_the_menu_pastes_svg_on_the_system_clipboard_as_paths() {
-        let services = crate::Services { clipboard_text: Some(Box::new(|| Some(ART.to_string()))), ..Default::default() };
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), services);
-        app.native_menu = true;
-        app.run("file.new", json!({})).unwrap();
-        crate::menus::activate(&mut app, "edit.paste", &Value::Null);
-        let st = app.session.doc().unwrap();
-        let id = *st.selection.items.first().expect("the pasted path is selected");
-        assert_eq!(st.doc.item(id).unwrap().shape, designcraft_doc::Shape::Path);
-        assert!(st.selection.text.is_none(), "paths, not a text frame of markup");
-        // With an insertion point, the markup is text like any other.
-        let story = app.run("frame.create", json!({"rect": [10, 10, 300, 300], "content": "text"})).unwrap()["story"].clone();
-        app.run("text.select", json!({"story": story, "anchor": 0, "focus": 0})).unwrap();
-        let items = app.session.doc().unwrap().doc.spreads[0].items.len();
-        crate::menus::activate(&mut app, "edit.paste", &Value::Null);
-        assert_eq!(app.session.doc().unwrap().doc.spreads[0].items.len(), items, "no paths added");
-    }
-
-    #[test]
-    fn selected_merged_owners_paint_the_same_row_and_column_targets() {
-        for column in [true, false] {
-            for merged in [false, true] {
-                let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-                app.run("file.new", json!({"pages": 1})).unwrap();
-                app.run("frame.create", json!({"rect": [36, 36, 300, 300], "content": "text"})).unwrap();
-                app.run("table.insert", json!({"rows": 2, "cols": 2})).unwrap();
-                if merged {
-                    let range = if column { json!({"rows": [0, 0], "cols": [0, 1]}) } else { json!({"rows": [0, 1], "cols": [0, 0]}) };
-                    app.run("table.select", range).unwrap();
-                    app.run("table.merge", json!({})).unwrap();
-                }
-                app.run("table.select", json!({"rows": [1, 1], "cols": [1, 1]})).unwrap();
-                app.run(if column { "table.selectColumn" } else { "table.selectRow" }, json!({})).unwrap();
-                let st = app.session.doc().unwrap();
-                let selection = st.selection.clone();
-                let ts = selection.text.unwrap();
-                let selected = selection.cells.unwrap();
-                assert_eq!(
-                    selected.range,
-                    if column { designcraft_doc::CellRange::new(0, 1, 1, 1) } else { designcraft_doc::CellRange::new(1, 0, 1, 1) }
-                );
-                let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-                let cs = app.session.cache.get(&st.doc, ts.story, None);
-                let ft = &cs.frames[0];
-                let table = ft.tables.iter().find(|t| t.table == selected.table).unwrap();
-                let (a, _) = item_canvas_xf(&st.doc, &layout, ft.frame).unwrap();
-                let m = a * st.doc.text_xf(st.doc.item(ft.frame).unwrap());
-                let xf = Xf { min: pos2(0.0, 0.0), origin: Point::new(0.0, 0.0), zoom: 1.0, rot: 0, pivot: pos2(0.0, 0.0) };
-                let owners = if merged {
-                    [(0, 0), (1, 1)]
-                } else if column {
-                    [(0, 1), (1, 1)]
-                } else {
-                    [(1, 0), (1, 1)]
-                };
-                let expected: Vec<_> = owners
-                    .into_iter()
-                    .map(|(r, c)| {
-                        let rect = table.cells.iter().find(|cell| cell.row == r && cell.col == c).unwrap().rect;
-                        vec![
-                            xf.to_screen(m * Point::new(rect.x0, rect.y0)),
-                            xf.to_screen(m * Point::new(rect.x1, rect.y0)),
-                            xf.to_screen(m * Point::new(rect.x1, rect.y1)),
-                            xf.to_screen(m * Point::new(rect.x0, rect.y1)),
-                        ]
-                    })
-                    .collect();
-                let ctx = egui::Context::default();
-                let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
-                    draw_text_selection(&app, ui.painter(), &xf, &st.doc, &layout, ts, Some(selected));
-                });
-                output.textures_delta.clear();
-                let tint = Color32::from_rgba_unmultiplied(80, 140, 255, 90);
-                let painted: Vec<_> = output
-                    .shapes
-                    .into_iter()
-                    .filter_map(|s| match s.shape {
-                        egui::Shape::Path(path) if path.fill == tint => {
-                            assert!(path.closed);
-                            assert_eq!(path.stroke, egui::epaint::PathStroke::NONE);
-                            Some(path.points)
-                        }
-                        _ => None,
-                    })
-                    .collect();
-                assert_eq!(painted, expected, "only the two touched owners are tinted; column={column}, merged={merged}");
-                assert_eq!(app.session.doc().unwrap().selection, selection);
-            }
-        }
-    }
-
-    /// A selected group lists the text frames inside it for ports.
-    #[test]
-    fn grouped_text_frames_get_ports() {
-        let mut s = designcraft_engine::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        let a = s.execute("frame.create", &json!({"rect": [10, 10, 110, 60], "content": "text"})).unwrap()["id"].as_u64().unwrap();
-        let b = s.execute("frame.create", &json!({"rect": [10, 80, 110, 130]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("selection.set", &json!({"ids": [a, b]})).unwrap();
-        let g = s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap();
-        let doc = &s.doc().unwrap().doc;
-        let group = doc.item(designcraft_doc::ItemId(g)).unwrap();
-        let mut out = Vec::new();
-        text_frames_in(group, 0, &mut out);
-        assert_eq!(out.iter().map(|(it, _)| it.id.0).collect::<Vec<_>>(), vec![a], "one text frame in the group");
-        // A plain text frame lists itself.
-        out.clear();
-        text_frames_in(out_frame(doc, a), 0, &mut out);
-        assert_eq!(out.len(), 1);
-    }
-
-    /// A selected group paints both ports of the overset text frame inside it, on top of the
-    /// group's own selection marks.
-    #[test]
-    fn a_selected_group_paints_both_ports_of_its_text_frame() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let s = &mut app.session;
-        let text = "far too much text for a frame this small, over and over again ".repeat(8);
-        let a = s.execute("frame.create", &json!({"rect": [100, 100, 200, 140], "content": "text", "text": text})).unwrap()["id"].as_u64().unwrap();
-        let b = s.execute("frame.create", &json!({"rect": [100, 200, 200, 260]})).unwrap()["id"].as_u64().unwrap();
-        s.execute("selection.set", &json!({"ids": [a, b]})).unwrap();
-        let g = s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap();
-        s.execute("transform.rotate", &json!({"angle": 30, "ids": [g]})).unwrap();
-        s.execute("selection.set", &json!({"ids": [g]})).unwrap();
-        let doc = app.session.doc().unwrap().doc.clone();
-        let layout = CanvasLayout::new(&doc, false);
-        let xf = Xf { min: pos2(0.0, 0.0), origin: Point::new(0.0, 0.0), zoom: 1.0, rot: 0, pivot: pos2(0.0, 0.0) };
-        let ctx = egui::Context::default();
-        let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
-            draw_selection(&app, ui.painter(), &xf, &doc, &layout);
-        });
-        output.textures_delta.clear();
-        let white: Vec<Rect> = output
-            .shapes
-            .into_iter()
-            .filter_map(|s| match s.shape {
-                egui::Shape::Rect(r) if r.fill == Color32::WHITE => Some(r.rect),
-                _ => None,
-            })
-            .collect();
-        for out in [false, true] {
-            let c = xf.to_screen(designcraft_tools::thread::port_center(&doc, &layout, designcraft_doc::ItemId(a), out, xf.zoom).unwrap());
-            let port = white.iter().position(|r| (r.center() - c).length() < 0.01).unwrap_or_else(|| panic!("port (out: {out}) at {c:?}"));
-            assert!(!white[port + 1..].iter().any(|r| r.contains(c)), "nothing painted later covers the port (out: {out})");
-        }
-    }
-
-    fn out_frame(doc: &Document, id: u64) -> &Item {
-        doc.item(designcraft_doc::ItemId(id)).unwrap()
-    }
-
-    /// An overset frame inside a group is listed for the red mark even when nothing is
-    /// selected; a frame with room, or a hidden one, is not.
-    #[test]
-    fn overset_frames_are_found_inside_groups() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let s = &mut app.session;
-        let frame_with = |s: &mut designcraft_engine::Session, rect: [f64; 4], text: &str| {
-            s.execute("frame.create", &json!({"rect": rect, "content": "text", "text": text})).unwrap()["id"].as_u64().unwrap()
-        };
-        let tiny = frame_with(s, [10.0, 10.0, 40.0, 16.0], "far too much text for a frame this small, over and over again");
-        let roomy = frame_with(s, [10.0, 100.0, 300.0, 300.0], "fits");
-        s.execute("selection.set", &json!({"ids": [tiny, roomy]})).unwrap();
-        s.execute("object.group", &json!({})).unwrap();
-        s.execute("selection.set", &json!({"ids": []})).unwrap();
-        let doc = app.session.doc().unwrap().doc.clone();
-        let mut out = Vec::new();
-        overset_frames(&app, &doc, &doc.spreads[0].items, 0, &mut out);
-        assert_eq!(out.iter().map(|it| it.id.0).collect::<Vec<_>>(), vec![tiny]);
-        // Hidden: no mark.
-        app.session.execute("object.hide", &json!({"ids": [tiny]})).unwrap();
-        let doc = app.session.doc().unwrap().doc.clone();
-        out.clear();
-        overset_frames(&app, &doc, &doc.spreads[0].items, 0, &mut out);
-        assert!(out.is_empty());
-    }
-
-    /// The always-on overset mark sits at the frame's out port, a step along its own right edge
-    /// (so a rotated frame gets it inside its edge, not straight up from the corner), and a
-    /// selected overset frame gets only the mark its ports draw.
-    #[test]
-    fn overset_mark_sits_on_the_out_port_once() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let s = &mut app.session;
-        let id = s
-            .execute("frame.create", &json!({"rect": [100, 100, 200, 160], "content": "text", "text": "far too much text for a frame this small, over and over again ".repeat(8)}))
-            .unwrap()["id"]
-            .as_u64()
-            .unwrap();
-        s.execute("transform.rotate", &json!({"angle": 90, "ids": [id]})).unwrap();
-        s.execute("selection.set", &json!({"ids": []})).unwrap();
-        let doc = app.session.doc().unwrap().doc.clone();
-        let layout = CanvasLayout::new(&doc, false);
-        let zoom = 1.0;
-        let marks = overset_marks(&app, &doc, &layout, &doc.spreads[0].items, zoom, &ported_frames(&app, &doc));
-        assert_eq!(marks.len(), 1);
-        let it = out_frame(&doc, id);
-        let (a, _) = item_canvas_xf(&doc, &layout, it.id).unwrap();
-        let m = a * it.xf;
-        let r = it.inner_bounds();
-        let corner = m * Point::new(r.x1, r.y1);
-        let edge = (m * Point::new(r.x1, r.y0)) - corner;
-        let d = marks[0].1 - corner;
-        assert!((d.x * edge.y - d.y * edge.x).abs() < 1e-6, "the mark lies on the frame's right edge: {d:?} along {edge:?}");
-        assert!((d.hypot() - 12.0 / zoom).abs() < 1e-6, "12 screen px from the corner: {d:?}");
-        // Selected: the ports draw the mark, so no always-on mark is added.
-        app.session.execute("selection.set", &json!({"ids": [id]})).unwrap();
-        let marks = overset_marks(&app, &doc, &layout, &doc.spreads[0].items, zoom, &ported_frames(&app, &doc));
-        assert!(marks.is_empty());
-    }
-
-    #[test]
-    fn right_clicking_a_ruler_sets_that_rulers_units() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let mut h = harness(app);
-        let rect = h.state().canvas_rect.unwrap();
-        assert_eq!(units(&h), (Unit::Picas, Unit::Picas));
-        // Vertical ruler: the current unit is checked; picking one sets only the vertical units.
-        right_click(&mut h, pos2(rect.min.x - RULER / 2.0, rect.center().y));
-        h.get_by_label("✓ Picas");
-        h.get_by_label("   Millimeters").click();
-        h.run_steps(3);
-        assert_eq!(units(&h), (Unit::Picas, Unit::Millimeters));
-        // Horizontal ruler.
-        right_click(&mut h, pos2(rect.center().x, rect.min.y - RULER / 2.0));
-        h.get_by_label("✓ Picas");
-        h.get_by_label("   Inches").click();
-        h.run_steps(3);
-        assert_eq!(units(&h), (Unit::Inches, Unit::Millimeters));
-        // The corner where the rulers meet sets both, as InDesign's: nothing is checked while
-        // they differ.
-        let corner = rect.min - vec2(RULER / 2.0, RULER / 2.0);
-        right_click(&mut h, corner);
-        assert!(h.query_by_label("✓ Inches").is_none() && h.query_by_label("✓ Millimeters").is_none());
-        let _ = h.get_by_label_contains("Hide Rulers");
-        let _ = h.get_by_label("   Lock Zero Point");
-        assert!(h.query_by_label("   Delete All Guides on Spread").is_none(), "only on the horizontal ruler");
-        h.get_by_label("   Points").click();
-        h.run_steps(3);
-        assert_eq!(units(&h), (Unit::Points, Unit::Points));
-        // InDesign's list: no Q or Ha.
-        right_click(&mut h, corner);
-        h.get_by_label("✓ Points");
-        assert!(h.query_by_label("   Q").is_none() && h.query_by_label("   Ha").is_none());
-        let _ = h.get_by_label("   Inches Decimal");
-        // The horizontal ruler's menu also deletes the spread's guides; Hide Rulers hides them.
-        right_click(&mut h, pos2(rect.center().x, rect.min.y - RULER / 2.0));
-        let _ = h.get_by_label("   Delete All Guides on Spread");
-        h.get_by_label_contains("Hide Rulers").click();
-        h.run_steps(3);
-        assert!(!h.state().ui.rulers);
-        // The page opens no units menu.
-        right_click(&mut h, rect.center());
-        assert!(h.query_by_label("   Points").is_none());
-    }
-
-    /// The live-corner widget draws on a selected rectangle frame; clicking it draws the diamonds.
-    #[test]
-    fn live_corner_widget_and_diamonds_draw() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [100, 100, 300, 250], "content": "graphic"})).unwrap();
-        let id = app.session.doc().unwrap().doc.spreads[0].items[0].id;
-        app.run("selection.set", json!({"ids": [id.0]})).unwrap();
-        let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).with_pixels_per_point(1.0).wgpu().build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let ctx = ui.ctx().clone();
-                app.logic(&ctx);
-                app.ui(ui);
-            },
-            app,
-        );
-        h.run_steps(4);
-        let screen = |h: &Harness<'_, DesignApp>, x: f64, y: f64| {
-            let app = h.state();
-            let layout = CanvasLayout::new(&app.session.doc().unwrap().doc, false);
-            let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
-            xf.to_screen(layout.to_canvas(SpreadRef::Doc(0), Point::new(x, y)))
-        };
-        let widget = screen(&h, 300.0, 100.0) + vec2(0.0, 11.5);
-        let diamond = screen(&h, 100.0, 100.0) + vec2(12.0, 0.0);
-        let yellow = |h: &mut Harness<'_, DesignApp>, p: Pos2| -> Option<bool> {
-            let img = match h.render() {
-                Ok(img) => img,
-                Err(e) => {
-                    eprintln!("skipped: no offscreen renderer ({e})");
-                    return None;
-                }
-            };
-            let px = img.get_pixel(p.x.round() as u32, p.y.round() as u32).0;
-            Some(px[0] > 200 && px[1] > 180 && px[2] < 100)
-        };
-        let Some(w) = yellow(&mut h, widget) else { return };
-        assert!(w, "no widget at {widget:?}");
-        assert_eq!(yellow(&mut h, diamond), Some(false));
-        h.hover_at(widget);
-        h.step();
-        for pressed in [true, false] {
-            h.event(egui::Event::PointerButton { pos: widget, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
-            h.step();
-        }
-        h.run_steps(3);
-        assert_eq!(yellow(&mut h, diamond), Some(true), "no diamond at {diamond:?}");
-        assert_eq!(yellow(&mut h, widget), Some(false));
-    }
-
-    /// A harness whose frames are 1 ms apart, so two clicks make a double-click.
-    fn fast_harness(app: DesignApp) -> Harness<'static, DesignApp> {
-        let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).with_step_dt(0.001).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let ctx = ui.ctx().clone();
-                app.logic(&ctx);
-                app.ui(ui);
-            },
-            app,
-        );
-        h.run_steps(4);
-        h
-    }
-
-    fn primary(h: &mut Harness<'_, DesignApp>, pos: Pos2, pressed: bool) {
-        h.event(egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
-        h.run_steps(2);
-    }
-
-    fn corner_drag(h: &mut Harness<'_, DesignApp>, from: Pos2, to: Pos2) {
-        h.hover_at(from);
-        h.step();
-        primary(h, from, true);
-        h.event(egui::Event::PointerMoved(from + (to - from) / 2.0));
-        h.run_steps(2);
-        h.event(egui::Event::PointerMoved(to));
-        h.run_steps(2);
-        primary(h, to, false);
-    }
-
-    fn corner_click(h: &mut Harness<'_, DesignApp>, p: Pos2) {
-        h.hover_at(p);
-        h.step();
-        primary(h, p, true);
-        primary(h, p, false);
-    }
-
-    /// Where the rulers measure from (canvas coordinates): the document's zero point on the
-    /// spread in view (its first page, for a page origin).
-    fn ruler_zero(app: &DesignApp, doc: &Document, layout: &CanvasLayout) -> Option<Point> {
-        ruler_pieces(app, doc, layout, doc.zero_point()).first().map(|p| p.2)
-    }
-
-    fn zero_point(h: &Harness<'_, DesignApp>) -> [f64; 2] {
-        h.state().session.doc().unwrap().doc.settings.zero_point
-    }
-
-    #[test]
-    fn the_ruler_corner_drags_resets_and_locks_the_zero_point() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 3})).unwrap();
-        let mut h = fast_harness(app);
-        let rect = h.state().canvas_rect.unwrap();
-        let corner = rect.min - vec2(RULER / 2.0, RULER / 2.0);
-        // A click that stays in the corner leaves the zero point.
-        corner_click(&mut h, corner);
-        assert_eq!(zero_point(&h), [0.0, 0.0]);
-        // Dragged out, it lands where released, measured from the spread in view.
-        let dest = rect.min + vec2(80.0, 50.0);
-        let expected = {
-            let app = h.state();
-            let st = app.session.active().unwrap();
-            let layout = CanvasLayout::new(&st.doc, false);
-            let slot = layout.slots[current_slot(app, &layout).unwrap()];
-            let sp = slot.to_spread(Xf::new(rect, app.view().unwrap()).to_canvas(dest));
-            let b = st.doc.spread(slot.spread).unwrap().bounds();
-            [sp.x - b.x0, sp.y - b.y0]
-        };
-        corner_drag(&mut h, corner, dest);
-        let zp = zero_point(&h);
-        assert!((zp[0] - expected[0]).abs() < 0.5 && (zp[1] - expected[1]).abs() < 0.5, "{zp:?} vs {expected:?}");
-        assert!(zp[0].abs() > 1.0 && zp[1].abs() > 1.0, "moved: {zp:?}");
-        // The rulers measure from the point it was dropped on.
-        {
-            let app = h.state();
-            let st = app.session.active().unwrap();
-            let layout = CanvasLayout::new(&st.doc, false);
-            let o = ruler_zero(app, &st.doc, &layout).unwrap();
-            let on_screen = Xf::new(rect, app.view().unwrap()).to_screen(o);
-            assert!((on_screen - dest).length() < 0.5, "{on_screen:?} vs {dest:?}");
-        }
-        // A double-click resets it.
-        corner_click(&mut h, corner);
-        corner_click(&mut h, corner);
-        assert_eq!(zero_point(&h), [0.0, 0.0]);
-        // Locked from the corner's context menu, the corner ignores drags and double-clicks.
-        right_click(&mut h, corner);
-        h.get_by_label("   Lock Zero Point").click();
-        h.run_steps(3);
-        assert!(h.state().session.doc().unwrap().doc.settings.zero_point_locked);
-        corner_drag(&mut h, corner, dest);
-        assert_eq!(zero_point(&h), [0.0, 0.0]);
-        // Unlocked again from the same menu.
-        right_click(&mut h, corner);
-        h.get_by_label("   Unlock Zero Point").click();
-        h.run_steps(3);
-        corner_drag(&mut h, corner, dest);
-        assert_ne!(zero_point(&h), [0.0, 0.0]);
-        h.state_mut().run("view.lockZeroPoint", json!({"on": true})).unwrap();
-        corner_click(&mut h, corner);
-        corner_click(&mut h, corner);
-        assert_ne!(zero_point(&h), [0.0, 0.0], "a locked zero point isn't reset");
-    }
-
-    #[test]
-    fn cmd_dragging_the_ruler_corner_makes_a_guide_each_way() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let mut h = harness(app);
-        let rect = h.state().canvas_rect.unwrap();
-        let corner = rect.min - vec2(RULER / 2.0, RULER / 2.0);
-        let dest = rect.min + vec2(120.0, 90.0);
-        let (r, at) = {
-            let app = h.state();
-            let st = app.session.active().unwrap();
-            CanvasLayout::new(&st.doc, false).spread_at(Xf::new(rect, app.view().unwrap()).to_canvas(dest)).unwrap()
-        };
-        h.event(egui::Event::ModifiersChanged(egui::Modifiers::COMMAND));
-        h.step();
-        corner_drag(&mut h, corner, dest);
-        h.event(egui::Event::ModifiersChanged(egui::Modifiers::NONE));
-        h.step();
-        let doc = h.state().session.doc().unwrap().doc.clone();
-        let guides: Vec<_> = doc.spread(r).unwrap().pages.iter().flat_map(|p| p.guides.clone()).collect();
-        assert_eq!(guides.len(), 2, "{guides:?}");
-        let pos = |o: designcraft_doc::Orientation| guides.iter().find(|g| g.orientation == o).map(|g| g.position).unwrap();
-        assert!((pos(designcraft_doc::Orientation::Horizontal) - at.y).abs() < 0.5);
-        assert!((pos(designcraft_doc::Orientation::Vertical) - at.x).abs() < 0.5);
-        assert!(guides.iter().all(|g| g.spread));
-        assert_eq!(doc.settings.zero_point, [0.0, 0.0], "the zero point stays");
-    }
-
-    /// A guide being dragged out of a ruler says where it is, as the rulers measure it (#1282):
-    /// from the zero point, in the ruler units, and the label follows the pointer while it moves.
-    #[test]
-    fn a_dragged_guide_shows_where_it_is() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("view.zeroPoint", json!({"at": [100, 50]})).unwrap();
-        let mut h = harness(app);
-        let rect = h.state().canvas_rect.unwrap();
-        let dest = rect.min + vec2(160.0, 110.0);
-        let (xf, at) = {
-            let app = h.state();
-            let xf = Xf::new(rect, app.view().unwrap());
-            let st = app.session.active().unwrap();
-            (xf, CanvasLayout::new(&st.doc, false).spread_at(xf.to_canvas(dest)).unwrap().1)
-        };
-        let units = h.state().session.doc().unwrap().doc.settings.horizontal_units;
-        for (orientation, label, want) in
-            [(designcraft_doc::Orientation::Vertical, "X", at.x - 100.0), (designcraft_doc::Orientation::Horizontal, "Y", at.y - 50.0)]
-        {
-            let g = GuideDrag { orientation, from: None, at: Some(dest), mods: egui::Modifiers::NONE };
-            let (l, v, _) = guide_measure(h.state(), &xf, &g).unwrap();
-            assert_eq!(l, label);
-            assert!((v - want).abs() < 1e-6, "{label}: {v} vs {want}");
-            let text = guide_readout(h.state(), &xf, &g).unwrap();
-            assert_eq!(text, format!("{label}: {}", designcraft_geom::units::format_measure(v, units)));
-        }
-        // While a guide is actually being dragged out of the top ruler, the readout is there.
-        let ruler = pos2(rect.min.x + 200.0, rect.min.y - RULER / 2.0);
-        h.hover_at(ruler);
-        h.step();
-        primary(&mut h, ruler, true);
-        h.event(egui::Event::PointerMoved(dest));
-        h.run_steps(2);
-        let g = h.ctx.data(|d| d.get_temp::<GuideDrag>(egui::Id::new(GUIDE_DRAG))).expect("dragging");
-        assert_eq!(g.orientation, designcraft_doc::Orientation::Horizontal);
-        assert!(guide_readout(h.state(), &xf, &g).is_some_and(|t| t.starts_with("Y: ")));
-        primary(&mut h, dest, false);
-    }
-
-    /// Over a spread other than the one in the middle of the view, the readout measures that
-    /// spread, the one the guide is dropped on: it reads the position the guide gets.
-    #[test]
-    fn the_guide_readout_measures_the_spread_under_the_pointer() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 5})).unwrap();
-        app.run("view.zeroPoint", json!({"at": [100, 50]})).unwrap();
-        let h = harness(app);
-        let rect = h.state().canvas_rect.unwrap();
-        let xf = Xf::new(rect, h.state().view().unwrap());
-        let st = h.state().session.active().unwrap();
-        let layout = CanvasLayout::new(&st.doc, false);
-        let current = current_slot(h.state(), &layout).unwrap();
-        // A point inside the last spread, well away from the one in view.
-        let last = layout.slots.last().unwrap();
-        assert_ne!(layout.slots.iter().position(|s| s.spread == last.spread), Some(current), "the last spread isn't the one in view");
-        let inside = Point::new(last.bounds.center().x, last.bounds.y0 + (last.bounds.y1 - last.bounds.y0) * 0.3);
-        let (r, sp) = layout.spread_at(inside).unwrap();
-        assert_eq!(r, last.spread);
-        let g = GuideDrag {
-            orientation: designcraft_doc::Orientation::Horizontal,
-            from: None,
-            at: Some(xf.to_screen(inside)),
-            mods: egui::Modifiers::NONE,
-        };
-        let (label, v, _) = guide_measure(h.state(), &xf, &g).unwrap();
-        assert_eq!(label, "Y");
-        // The guide would be stored at `sp.y` on that spread, which its ruler reads from the zero point.
-        // (To screen and back in f32: a few hundred-thousandths of a point.)
-        assert!((v - (sp.y - 50.0)).abs() < 1e-3, "{v} vs {}", sp.y - 50.0);
-        // An existing guide of another spread can't be dropped there (it only moves on its own
-        // spread): no readout over this one, a readout over its own.
-        let first = layout.slots[current].spread;
-        let moving = GuideDrag {
-            orientation: designcraft_doc::Orientation::Horizontal,
-            from: Some((first, 0, 0)),
-            at: Some(xf.to_screen(inside)),
-            mods: egui::Modifiers::NONE,
-        };
-        assert!(guide_measure(h.state(), &xf, &moving).is_none(), "an existing guide over another spread");
-        let own = layout.slots[current].bounds;
-        let over_own = Point::new(own.center().x, own.y0 + (own.y1 - own.y0) * 0.3);
-        let moving_here = GuideDrag { at: Some(xf.to_screen(over_own)), ..moving };
-        assert!(guide_measure(h.state(), &xf, &moving_here).is_some(), "over its own spread");
-    }
-
-    /// The guide readout stays on the canvas: below right of the pointer in the open, flipped
-    /// left or up near the right or bottom edge, and inside the canvas in every corner.
-    #[test]
-    fn the_guide_readout_stays_inside_the_canvas() {
-        let area = Rect::from_min_max(pos2(50.0, 40.0), pos2(850.0, 640.0));
-        let size = vec2(80.0, 14.0);
-        let inside = |at: Pos2| {
-            let r = Rect::from_min_size(at, size).expand(3.0);
-            r.min.x >= area.min.x - 1e-3 && r.min.y >= area.min.y - 1e-3 && r.max.x <= area.max.x + 1e-3 && r.max.y <= area.max.y + 1e-3
-        };
-        assert_eq!(readout_at(pos2(400.0, 300.0), size, area), pos2(412.0, 312.0), "in the open: below right");
-        let right = readout_at(pos2(845.0, 300.0), size, area);
-        assert!(right.x + size.x < 845.0 && inside(right), "near the right edge: left of the pointer, {right:?}");
-        let bottom = readout_at(pos2(400.0, 636.0), size, area);
-        assert!(bottom.y + size.y < 636.0 && inside(bottom), "near the bottom: above it, {bottom:?}");
-        for p in [area.min, pos2(area.max.x, area.min.y), area.max, pos2(area.min.x, area.max.y), pos2(-500.0, 2000.0)] {
-            assert!(inside(readout_at(p, size, area)), "{p:?}");
-        }
-        // A canvas narrower than the label: pinned to its top left, not past it.
-        let tiny = Rect::from_min_max(pos2(0.0, 0.0), pos2(40.0, 10.0));
-        assert_eq!(readout_at(pos2(20.0, 5.0), size, tiny), pos2(3.0, 3.0));
-    }
-
-    #[test]
-    fn rulers_and_xy_fields_measure_from_the_zero_point_on_every_spread() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        // Spread 0: page 1; spread 1: pages 2 and 3.
-        app.run("file.new", json!({"pages": 3})).unwrap();
-        app.run("view.zeroPoint", json!({"at": [100, 50]})).unwrap();
-        app.session.prefs.dimensions_include_stroke = false;
-        let mut h = harness(app);
-        let rect = h.state().canvas_rect.unwrap();
-        for (spread, x0) in [(0usize, 136.0), (1, 736.0)] {
-            let app = h.state_mut();
-            let id = app.run("frame.create", json!({"spread": spread, "rect": [x0, 70, x0 + 50.0, 120]})).unwrap()["id"].clone();
-            app.run("selection.set", json!({"ids": [id]})).unwrap();
-            // X/Y (Control, Properties and Info panels).
-            let r = crate::panels::sel_info(app).unwrap().page_rect;
-            assert!((r.x0 - (x0 - 100.0)).abs() < 1e-6 && (r.y0 - 20.0).abs() < 1e-6, "spread {spread}: {r:?}");
-            // The rulers, with that spread in view.
-            let layout = CanvasLayout::new(&app.session.active().unwrap().doc, false);
-            let slot = layout.slots[spread];
-            let v = app.view_mut().unwrap();
-            let zoom = v.zoom;
-            let c = slot.bounds.center();
-            v.origin = Point::new(c.x - rect.width() as f64 / 2.0 / zoom, c.y - rect.height() as f64 / 2.0 / zoom);
-            h.run_steps(2);
-            let app = h.state();
-            let doc = app.session.active().unwrap().doc.clone();
-            assert_eq!(current_slot(app, &layout), Some(spread));
-            let o = ruler_zero(app, &doc, &layout).unwrap();
-            assert!((o.x - slot.bounds.x0 - 100.0).abs() < 1e-6 && (o.y - slot.bounds.y0 - 50.0).abs() < 1e-6, "spread {spread}: {o:?}");
-        }
-    }
-
-    /// Screen position of spread 0's point (x, y).
-    fn screen_of(h: &Harness<'_, DesignApp>, x: f64, y: f64) -> Pos2 {
-        let app = h.state();
-        let st = app.session.active().unwrap();
-        let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
-        xf.to_screen(CanvasLayout::new(&st.doc, st.editing_parents).xf(SpreadRef::Doc(0)) * Point::new(x, y))
-    }
-
-    /// A menu row: a button that isn't a toggle, named by its label, then its shortcut if it has
-    /// one. Toggle buttons with the same name (the Task Bar's icons) don't match, nor do buttons
-    /// right of the canvas (the Properties panel's Arrange).
-    fn menu_row<'h>(h: &'h Harness<'_, DesignApp>, label: &'h str) -> Option<egui_kittest::Node<'h>> {
-        let right = f64::from(h.state().canvas_rect.map_or(f32::INFINITY, |r| r.max.x));
-        h.query_by(move |n| {
-            n.role() == egui::accesskit::Role::Button
-                && n.toggled().is_none()
-                && n.bounding_box().is_none_or(|b| b.x0 < right)
-                && n.label().is_some_and(|l| l == label || l.strip_prefix(label).and_then(|r| r.strip_prefix(' ')).is_some_and(|r| !r.contains(' ')))
-        })
-    }
-
-    fn enabled(h: &Harness<'_, DesignApp>, label: &str) -> bool {
-        use egui_kittest::kittest::NodeT;
-        !menu_row(h, label).unwrap_or_else(|| panic!("no menu row {label}")).accesskit_node().is_disabled()
-    }
-
-    fn spread_items(h: &Harness<'_, DesignApp>) -> Vec<u64> {
-        h.state().session.doc().unwrap().doc.spreads[0].items.iter().map(|i| i.id.0).collect()
-    }
-
-    fn selected(h: &Harness<'_, DesignApp>) -> Vec<u64> {
-        h.state().session.doc().unwrap().selection.items.iter().map(|i| i.0).collect()
-    }
-
-    #[test]
-    fn right_clicking_an_object_selects_it_and_its_menu_arranges_it() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let a = app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap()["id"].as_u64().unwrap();
-        let b = app.run("frame.create", json!({"rect": [150, 150, 300, 300]})).unwrap()["id"].as_u64().unwrap();
-        let mut h = harness(app);
-        assert_eq!(selected(&h), [b]);
-        let on_a = screen_of(&h, 60.0, 60.0);
-        right_click(&mut h, on_a);
-        assert_eq!(selected(&h), [a], "the object under the pointer is selected first");
-        // An empty frame's menu: Content, but no Fitting (nothing to fit) and no text frame entries.
-        assert!(menu_row(&h, "Content").is_some());
-        assert!(menu_row(&h, "Fitting").is_none() && menu_row(&h, "Text Frame Options…").is_none());
-        // Paste is available with nothing copied here: the system clipboard may hold another app's text.
-        assert!(enabled(&h, "Copy") && enabled(&h, "Paste"));
-        menu_row(&h, "Arrange").unwrap().click();
-        h.run_steps(3);
-        menu_row(&h, "Bring to Front").unwrap().click();
-        h.run_steps(3);
-        assert_eq!(spread_items(&h), [b, a]);
-        assert!(menu_row(&h, "Arrange").is_none(), "choosing an entry closes the menu");
-    }
-
-    #[test]
-    fn right_clicking_empty_canvas_offers_paste_after_a_copy() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let a = app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap()["id"].as_u64().unwrap();
-        app.run("edit.copy", json!({})).unwrap();
-        app.select_tool("rectangleFrame");
-        let mut h = harness(app);
-        let empty = screen_of(&h, 400.0, 500.0);
-        right_click(&mut h, empty);
-        assert_eq!(selected(&h), [a], "a right-click on nothing keeps the selection");
-        assert!(menu_row(&h, "Arrange").is_none(), "the page menu, not the object menu");
-        assert!(enabled(&h, "Paste in Place"));
-        assert!(menu_row(&h, "✓ Show/Hide Rulers").is_some(), "toggles show their state");
-        // Escape closes the menu and does nothing else: the tool would deselect, the shortcuts
-        // would switch to the Selection tool.
-        h.key_press(egui::Key::Escape);
-        h.run_steps(3);
-        assert!(menu_row(&h, "Paste in Place").is_none());
-        assert_eq!((h.state().session.tool_id(), selected(&h)), ("rectangleFrame", vec![a]));
-        right_click(&mut h, empty);
-        menu_row(&h, "Paste").unwrap().click();
-        h.run_steps(3);
-        assert_eq!(spread_items(&h).len(), 2);
-    }
-
-    #[test]
-    fn right_clicking_another_object_while_the_menu_is_open_reopens_it_there() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let a = app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap()["id"].as_u64().unwrap();
-        let b = app.run("frame.create", json!({"rect": [36, 600, 200, 760]})).unwrap()["id"].as_u64().unwrap();
-        let mut h = harness(app);
-        // The menu opens down from A, with the pointer on its first row (no submenu open); B is below it.
-        let (on_a, on_b) = (screen_of(&h, 60.0, 60.0), screen_of(&h, 50.0, 700.0));
-        right_click(&mut h, on_a);
-        assert_eq!(selected(&h), [a]);
-        assert!(menu_row(&h, "Arrange").is_some());
-        right_click(&mut h, on_b);
-        assert_eq!(selected(&h), [b]);
-        assert!(menu_row(&h, "Arrange").is_some(), "the menu reopens at the new click");
-    }
-
-    #[test]
-    fn a_context_menu_in_one_pane_keeps_the_keys_from_the_other() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let a = app.run("frame.create", json!({"rect": [36, 36, 100, 100]})).unwrap()["id"].as_u64().unwrap();
-        app.select_tool("rectangleFrame");
-        app.split = true;
-        let mut h = harness(app);
-        // The focused pane is the left one; this point is near its right edge, away from the frame.
-        let left = h.state().canvas_rect.unwrap();
-        right_click(&mut h, pos2(left.max.x - 40.0, left.center().y));
-        assert!(menu_row(&h, "Paste in Place").is_some());
-        // Escape closes the left pane's menu before the right pane handles the keys.
-        h.key_press(egui::Key::Escape);
-        h.run_steps(3);
-        assert!(menu_row(&h, "Paste in Place").is_none());
-        assert_eq!((h.state().session.tool_id(), selected(&h)), ("rectangleFrame", vec![a]));
-    }
-
-    #[test]
-    fn right_clicking_text_keeps_the_selected_text_or_places_the_caret() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [36, 36, 400, 200], "content": "text"})).unwrap();
-        app.select_tool("type");
-        app.run("text.insert", json!({"text": "Hello world"})).unwrap();
-        let sid = *app.session.doc().unwrap().doc.stories.keys().next().unwrap();
-        app.run("text.select", json!({"story": sid.0, "anchor": 0, "focus": 5})).unwrap();
-        let mut h = harness(app);
-        let text_sel = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().selection.text.as_ref().map(|t| (t.anchor, t.focus));
-        // Inside "Hello": the selection stays.
-        let inside = screen_of(&h, 45.0, 44.0);
-        right_click(&mut h, inside);
-        assert_eq!(text_sel(&h), Some((0, 5)));
-        assert!(menu_row(&h, "Paste without Formatting").is_some(), "the text menu");
-        h.key_press(egui::Key::Escape);
-        h.run_steps(3);
-        // Past the end of the line: the caret goes there.
-        let past_end = screen_of(&h, 300.0, 44.0);
-        right_click(&mut h, past_end);
-        assert_eq!(text_sel(&h), Some((11, 11)));
-        assert!(menu_row(&h, "Paste without Formatting").is_some());
-    }
-
-    #[test]
-    fn rows_hidden_in_the_menu_bar_are_hidden_in_context_menus() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap();
-        app.ui.hidden_menu_items.push(crate::menus::menu_key("Object/Arrange", "Bring to Front"));
-        let mut h = harness(app);
-        let on_frame = screen_of(&h, 60.0, 60.0);
-        right_click(&mut h, on_frame);
-        menu_row(&h, "Arrange").unwrap().click();
-        h.run_steps(3);
-        assert!(menu_row(&h, "Bring to Front").is_none());
-        assert!(menu_row(&h, "Send to Back").is_some());
-        assert!(h.query_by_label("Show All Menu Items").is_some());
-    }
-
-    #[test]
-    fn a_secondary_drag_neither_moves_marquees_nor_draws() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let a = app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap()["id"].as_u64().unwrap();
-        let mut h = harness(app);
-        // A secondary-button drag between spread points.
-        let drag = |h: &mut Harness<'_, DesignApp>, from: (f64, f64), to: (f64, f64)| {
-            let (from, to) = (screen_of(h, from.0, from.1), screen_of(h, to.0, to.1));
-            h.hover_at(from);
-            h.step();
-            h.event(egui::Event::PointerButton { pos: from, button: egui::PointerButton::Secondary, pressed: true, modifiers: Default::default() });
-            h.step();
-            for t in [0.25, 0.5, 0.75, 1.0] {
-                h.event(egui::Event::PointerMoved(from + (to - from) * t));
-                h.step();
-            }
-            h.event(egui::Event::PointerButton { pos: to, button: egui::PointerButton::Secondary, pressed: false, modifiers: Default::default() });
-            h.run_steps(3);
-        };
-        let xf = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().doc.item(designcraft_doc::ItemId(a)).unwrap().xf;
-        let before = xf(&h);
-        // Selection tool: on the object (no move), and from empty page across it (no marquee).
-        drag(&mut h, (100.0, 100.0), (300.0, 300.0));
-        assert_eq!(xf(&h), before);
-        h.state_mut().run("edit.deselectAll", json!({})).unwrap();
-        drag(&mut h, (400.0, 400.0), (20.0, 20.0));
-        assert!(selected(&h).is_empty());
-        // Rectangle Frame tool: no frame.
-        h.state_mut().select_tool("rectangleFrame");
-        drag(&mut h, (300.0, 300.0), (500.0, 500.0));
-        assert_eq!(spread_items(&h), [a]);
-    }
-
-    /// A text frame holding `text`, the Type tool, and a harness stepping at 60 fps (clicks in a
-    /// row must land within the double-click delay).
-    fn typing(text: &str) -> (Harness<'static, DesignApp>, u64) {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let r = app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "text": text})).unwrap();
-        let id = r["id"].as_u64().unwrap();
-        app.run("tool.select", json!({"tool": "type"})).unwrap();
-        let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let ctx = ui.ctx().clone();
-                app.logic(&ctx);
-                app.ui(ui);
-            },
-            app,
-        );
-        h.run_steps(4);
-        (h, id)
-    }
-
-    /// The screen point over the first line of frame `id` where a click puts the caret at a byte
-    /// in `bytes`.
-    fn screen_at(h: &mut Harness<'_, DesignApp>, id: u64, bytes: std::ops::Range<usize>) -> Pos2 {
-        let mut x = 74.0;
-        let p = loop {
-            assert!(x < 400.0, "no point on the first line hits {bytes:?}");
-            h.state_mut().run("text.placeCaret", json!({"frame": id, "point": [x, 80.0]})).unwrap();
-            if h.state().session.doc().unwrap().selection.text.is_some_and(|t| bytes.contains(&t.focus)) {
-                break Point::new(x, 80.0);
-            }
-            x += 1.0;
-        };
-        h.state_mut().run("edit.deselectAll", json!({})).unwrap();
-        let app = h.state();
-        let c = app.session.layout().to_canvas(SpreadRef::Doc(0), p);
-        Xf::new(app.canvas_rect.unwrap(), app.view().unwrap()).to_screen(c)
-    }
-
-    fn click(h: &mut Harness<'_, DesignApp>, p: Pos2) {
-        for pressed in [true, false] {
-            h.event(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
-            h.step();
-        }
-    }
-
-    fn selected_range(h: &Harness<'_, DesignApp>) -> std::ops::Range<usize> {
-        h.state().session.doc().unwrap().selection.text.map(|t| t.range()).unwrap_or_default()
-    }
-
-    #[test]
-    fn clicks_in_a_row_select_word_line_paragraph_with_return_and_story() {
-        let text = "One two. Three four! Five six.\nSecond para here.";
-        let (mut h, id) = typing(text);
-        // Inside "Three": double-click selects the word, then line and paragraph with return.
-        let p = screen_at(&mut h, id, 10..14);
-        h.hover_at(p);
-        h.step();
-        let mut got = vec![];
-        for _ in 0..5 {
-            click(&mut h, p);
-            let r = selected_range(&h);
-            got.push(text[r].to_string());
-        }
-        assert_eq!(got[1..], ["Three", "One two. Three four! Five six.", "One two. Three four! Five six.\n", text], "{got:?}");
-        assert!(got[0].is_empty(), "one click places the caret: {got:?}");
-    }
-
-    #[test]
-    fn esc_that_closes_a_dialog_keeps_the_type_tool_and_its_text_selection() {
-        let (mut h, id) = typing("One two three");
-        // A click in the text gives the canvas the keyboard focus, as when typing.
-        let p = screen_at(&mut h, id, 5..6);
-        h.hover_at(p);
-        h.step();
-        for _ in 0..2 {
-            click(&mut h, p);
-        }
-        h.run_steps(4);
-        let words = selected_range(&h);
-        assert_eq!(words, 4..7, "the double-click selects \"two\"");
-        let app = h.state_mut();
-        let name = app.run("style.character.create", json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
-        app.ui.dialog = Some(crate::dialogs::Dialog::new("characterStyleOptions", json!({"name": name})));
-        h.run_steps(3);
-        h.key_press(egui::Key::Escape);
-        h.run_steps(3);
-        assert!(h.state().ui.dialog.is_none(), "Esc closes the dialog");
-        assert_eq!((h.state().session.tool_id(), selected_range(&h)), ("type", words));
-        // With no dialog open, Esc in the text still leaves it for the Selection tool.
-        h.key_press(egui::Key::Escape);
-        h.run_steps(3);
-        assert_eq!(h.state().session.tool_id(), "selection");
-    }
-
-    #[test]
-    fn slow_clicks_do_not_add_up() {
-        let (mut h, id) = typing("One two. Three four!");
-        let p = screen_at(&mut h, id, 10..14);
-        h.hover_at(p);
-        h.step();
-        for _ in 0..3 {
-            click(&mut h, p);
-            h.run_steps(30);
-        }
-        assert!(selected_range(&h).is_empty(), "three clicks half a second apart leave a caret: {:?}", selected_range(&h));
-    }
-
-    /// A viewport wider than the GPU's largest texture: the canvas texture is sampled down, and an
-    /// edit repaints it whole. A region repainted in view pixels would land in the wrong place,
-    /// or outside the texture (a wgpu validation error). A view that fits is still patched.
-    #[test]
-    fn an_edit_repaints_a_canvas_texture_sampled_down_to_the_gpu_limit_whole() {
-        for (width, sampled_down) in [(1440.0, false), (2600.0, true)] {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.run("file.new", json!({})).unwrap();
-            let frame = app.run("frame.create", json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Text"})).unwrap();
-            let mut h = Harness::builder().with_size(vec2(width, 900.0)).build_ui_state(
-                |ui, app: &mut DesignApp| {
-                    let ctx = ui.ctx().clone();
-                    app.logic(&ctx);
-                    app.ui(ui);
-                },
-                app,
-            );
-            h.run_steps(6);
-            let limit = h.ctx.input(|i| i.max_texture_side);
-            let size = h.state().canvas.texture.as_ref().map(|t| t.size()).unwrap();
-            assert!(size[0] <= limit && size[1] <= limit, "{size:?}");
-            let shown = h.state().canvas.shown.unwrap().size;
-            assert_eq!(shown.0 > limit as f32, sampled_down, "view {shown:?}, limit {limit}");
-            let patches = h.state().canvas.patches;
-            // A small edit: one more character in the frame.
-            h.state_mut().run("text.insert", json!({"story": frame["story"], "at": 4, "text": "s"})).unwrap();
-            h.run_steps(6);
-            assert_eq!(h.state().canvas.patches == patches, sampled_down, "width {width}");
-            assert_eq!(h.state().canvas.texture.as_ref().map(|t| t.size()), Some(size));
-        }
-    }
-
-    /// ⌥E then I types "í" on a Mac: the input method composes the dead key's accent, which
-    /// it does only for a window that turned it on. The canvas never did, so ⌥E typed "e".
-    #[test]
-    fn dead_keys_compose_through_the_input_method() {
-        let (mut h, id) = typing("T");
-        h.state_mut().run("text.placeCaret", json!({"frame": id, "point": [390.0, 80.0]})).unwrap();
-        h.run_steps(2);
-        assert!(h.output().platform_output.ime.is_some(), "a text caret turns the input method on");
-        h.event(egui::Event::Ime(egui::ImeEvent::Preedit { text: "´".into(), active_range_chars: None }));
-        h.run_steps(2);
-        let text = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().doc.stories.values().map(|s| s.text.clone()).collect::<String>();
-        assert_eq!(text(&h), "T´", "the accent being composed shows in the story");
-        assert!(h.state().session.tool_composing(), "and is marked as composed, not typed");
-        h.event(egui::Event::Ime(egui::ImeEvent::Preedit { text: String::new(), active_range_chars: None }));
-        h.event(egui::Event::Ime(egui::ImeEvent::Commit("í".into())));
-        h.run_steps(2);
-        assert_eq!(text(&h), "Tí");
-        assert!(!h.state().session.tool_composing());
-        // Moving the caret mid-composition keeps the accent as typed and tells the input method
-        // to drop its copy.
-        h.event(egui::Event::Ime(egui::ImeEvent::Preedit { text: "˜".into(), active_range_chars: None }));
-        h.run_steps(2);
-        h.state_mut().run("text.move", json!({"dir": "left"})).unwrap();
-        h.step();
-        assert_eq!(text(&h), "Tí˜");
-        assert!(!h.state().session.tool_composing());
-        assert!(h.output().platform_output.ime.as_ref().is_some_and(|i| i.should_interrupt_composition));
-        assert!(h.state_mut().take_ime_discard());
-        // Another tool takes no text: the input method is off.
-        h.state_mut().run("tool.select", json!({"tool": "selection"})).unwrap();
-        h.run_steps(2);
-        assert!(h.output().platform_output.ime.is_none());
-    }
-
-    #[test]
-    fn tools_show_their_own_cursors_over_the_page() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let mut h = harness(app);
-        let p = h.state().canvas_rect.unwrap().center();
-        let mut shown = |tool: &str| {
-            h.state_mut().run("tool.select", json!({"tool": tool})).unwrap();
-            h.hover_at(p);
-            h.run_steps(2);
-            let out = &h.output().platform_output;
-            (out.cursor_icon, out.cursor_image.clone())
-        };
-        let (pen, direct, text) = (shown("pen"), shown("directSelection"), shown("type"));
-        let ppp = h.ctx.pixels_per_point();
-        let images = &mut h.state_mut().cursors;
-        match crate::cursors::mode() {
-            crate::cursors::Mode::Os => {
-                assert_eq!(pen.1, images.get(Cursor::Pen, ppp), "Pen");
-                assert_eq!(direct.1, images.get(Cursor::ArrowHollow, ppp), "Direct Selection");
-                assert_eq!(text, (egui::CursorIcon::Text, None), "the I-beam stays a system cursor");
-            }
-            crate::cursors::Mode::Painted => assert_eq!((pen.0, direct.0), (egui::CursorIcon::None, egui::CursorIcon::None)),
-            crate::cursors::Mode::System => assert_eq!(pen, (egui::CursorIcon::Crosshair, None)),
-        }
-    }
-
-    #[test]
-    fn document_grid_is_drawn_where_points_snap_to_it() {
-        use designcraft_tools::{SnapView, ToolContext};
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let doc = app.session.active().unwrap().doc.clone();
-        let layout = CanvasLayout::new(&doc, false);
-        let sr = SpreadRef::Doc(0);
-        // Where the grid snaps a point in the first page (72 pt / 8 subdivisions = 9 pt).
-        let page = doc.spreads[0].pages[0].bounds();
-        let sel = Selection::default();
-        let cx = ToolContext {
-            doc: &doc,
-            selection: &sel,
-            cache: &app.session.cache,
-            layout: &layout,
-            zoom: 1.0,
-            layer: doc.layers[0].id,
-            snap: SnapView { snap_to_document_grid: true, zone_px: 20.0, ..SnapView::OFF },
-            unit: Unit::Points,
-            stroke_in_front: false,
-        };
-        let (snapped, _) = designcraft_tools::snap::snap_point(&cx, sr, Point::new(page.x0 + 31.3, page.y0 + 47.9));
-        assert_eq!((snapped.x - page.x0, snapped.y - page.y0), (27.0, 45.0));
-        // Render 40 × 40 pt around it at 4 px/pt.
-        let scale = 4.0;
-        let corner = layout.xf(sr) * Point::new(snapped.x - 20.0, snapped.y - 20.0);
-        let view = Affine::scale(scale) * Affine::translate((-corner.x, -corner.y));
-        let placed: Vec<_> = layout.slots.iter().map(|s| designcraft_render::Placed { spread: s.spread, xf: s.xf }).collect();
-        let render = |app: &DesignApp| {
-            let opts = screen_options(app, &layout, false, 1.0);
-            designcraft_render::Renderer::new().render(&doc, &app.session.cache, &placed, 160, 160, view, &opts)
-        };
-        // The snapped point is at pixel (80, 80); halfway to the next line is 18 px further.
-        let darkest = |img: &designcraft_render::Rendered, xs: [u32; 2], ys: [u32; 2]| {
-            (xs[0]..xs[1]).flat_map(|x| (ys[0]..ys[1]).map(move |y| (x, y))).map(|(x, y)| img.pixel(x, y)[0]).min().unwrap()
-        };
-        let off = render(&app);
-        assert_eq!(darkest(&off, [78, 82], [60, 64]), 255, "no grid while it is hidden");
-        app.run("view.documentGrid", json!({})).unwrap();
-        let on = render(&app);
-        assert!(darkest(&on, [79, 81], [60, 64]) < 250, "a vertical line at the snapped x");
-        assert!(darkest(&on, [60, 64], [79, 81]) < 250, "a horizontal line at the snapped y");
-        assert_eq!(darkest(&on, [96, 100], [96, 100]), 255, "nothing between lines");
-        // Preview hides it.
-        app.ui.screen_mode = ScreenMode::Preview;
-        assert!(screen_options(&app, &layout, true, 1.0).document_grid.is_empty());
-    }
-
-    /// egui moves keyboard focus on a plain arrow key or Tab, and Space/Return then clicks the
-    /// focused widget (e.g. the status bar's spread buttons) while typing still reaches the text.
-    #[test]
-    fn arrow_keys_and_tab_keep_keyboard_focus_on_the_canvas() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 3})).unwrap();
-        let f = app.run("frame.create", json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Hello"})).unwrap();
-        app.select_tool("type");
-        let mut h = harness(app);
-        let p = {
-            let app = h.state();
-            let st = app.session.active().unwrap();
-            let layout = CanvasLayout::new(&st.doc, st.editing_parents);
-            let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
-            xf.to_screen(layout.xf(SpreadRef::Doc(0)) * Point::new(100.0, 60.0))
-        };
-        h.hover_at(p);
-        h.step();
-        for pressed in [true, false] {
-            h.event(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
-            h.step();
-        }
-        h.run_steps(2);
-        let focus = h.ctx.memory(|m| m.focused());
-        assert!(focus.is_some(), "a click on the canvas takes keyboard focus");
-        let view = *h.state().view().unwrap();
-        for key in [egui::Key::ArrowDown, egui::Key::Space, egui::Key::ArrowRight, egui::Key::Enter, egui::Key::Tab, egui::Key::Escape] {
-            h.key_press(key);
-            if key == egui::Key::Space {
-                h.event(egui::Event::Text(" ".into()));
-            }
-            h.run_steps(2);
-            assert_eq!(h.ctx.memory(|m| m.focused()), focus, "{key:?} keeps keyboard focus on the canvas");
-        }
-        let v = *h.state().view().unwrap();
-        assert_eq!((v.origin, v.zoom), (view.origin, view.zoom), "the view stays where it was");
-        let text = h.state_mut().session.execute("story.get", &json!({"story": f["story"]})).unwrap()["text"].clone();
-        assert_eq!(text, "Hello \n\t", "Space, Return and Tab reach the text");
-    }
-
-    #[test]
-    fn rulers_open_no_units_menu_without_a_document() {
-        let mut h = harness(DesignApp::new(designcraft_engine::Session::new(), crate::Services::default()));
-        let Some(rect) = h.state().canvas_rect else { return };
-        right_click(&mut h, pos2(rect.center().x, rect.min.y - RULER / 2.0));
-        assert!(h.query_by_label("   Points").is_none());
-    }
-
-    /// One frame of the whole app with `events`; returns what it asks of the system IME.
-    fn ime_frame(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>) -> Option<egui::output::IMEOutput> {
-        let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1400.0, 900.0))), events, ..Default::default() };
-        let mut out = ctx.run_ui(raw, |ui| {
-            app.logic(ui.ctx());
-            app.ui(ui);
-        });
-        out.textures_delta.clear();
-        out.platform_output.ime
-    }
-
-    /// An edit patches the canvas texture in place only while that texture is at full resolution:
-    /// past the GPU's texture limit `upload` shrinks it, and a full-resolution patch written into
-    /// it is a renderer validation error.
-    #[test]
-    fn edits_patch_the_canvas_only_at_full_resolution() {
-        for (max_side, patches) in [(None, true), (Some(1024), false)] {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            let ctx = egui::Context::default();
-            let frame = |app: &mut DesignApp| {
-                // Wider than the limit (egui's font atlas needs at least 1024).
-                let mut raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1900.0, 900.0))), ..Default::default() };
-                if let Some(m) = max_side {
-                    raw.max_texture_side = Some(m);
-                }
-                let mut out = ctx.run_ui(raw, |ui| {
-                    app.logic(ui.ctx());
-                    app.ui(ui);
-                });
-                out.textures_delta.clear();
-            };
-            app.run("file.new", json!({})).unwrap();
-            for _ in 0..3 {
-                frame(&mut app);
-            }
-            app.run("frame.create", json!({"rect": [36, 36, 60, 60]})).unwrap();
-            frame(&mut app);
-            let size = app.canvas.texture.as_ref().unwrap().size();
-            assert!(max_side.is_none_or(|m| size[0] <= m && size[1] <= m), "{size:?}");
-            assert_eq!(app.canvas.patches > 0, patches, "limit {max_side:?}");
-        }
-    }
-
-    /// The Type tool's caret at the end of a new text frame holding `text`, the app's first frames
-    /// drawn; returns the story id.
-    fn typing_app(app: &mut DesignApp, ctx: &egui::Context, text: &str) -> Value {
-        app.run("file.new", json!({})).unwrap();
-        let f = app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text", "text": text})).unwrap();
-        let sid = f["story"].clone();
-        app.session.execute("text.select", &json!({"story": sid, "anchor": text.len(), "focus": text.len()})).unwrap();
-        app.select_tool("type");
-        for _ in 0..4 {
-            ime_frame(app, ctx, vec![]);
-        }
-        sid
-    }
-
-    fn story_text(app: &mut DesignApp, sid: &Value) -> String {
-        app.session.execute("story.get", &json!({"story": sid})).unwrap()["text"].as_str().unwrap().to_string()
-    }
-
-    /// Spread point `p` on screen.
-    fn on_screen(app: &DesignApp, p: Point) -> Pos2 {
-        let st = app.session.active().unwrap();
-        let c = CanvasLayout::new(&st.doc, st.editing_parents).to_canvas(SpreadRef::Doc(0), p);
-        Xf::new(app.canvas_rect.unwrap(), app.view().unwrap()).to_screen(c)
-    }
-
-    fn preedit(t: &str, c: usize) -> egui::Event {
-        egui::Event::Ime(egui::ImeEvent::Preedit { text: t.into(), active_range_chars: Some(c..c) })
-    }
-
-    #[test]
-    #[allow(deprecated)] // `ImeEvent::Enabled` / `Disabled`: egui no longer sends them, other integrations may.
-    fn ime_events_compose_in_the_story_with_the_candidate_window_at_the_caret() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let ctx = egui::Context::default();
-        let sid = typing_app(&mut app, &ctx, "曲:");
-        // At a text caret the IME is allowed, its window on the caret as the canvas draws it.
-        let ime = ime_frame(&mut app, &ctx, vec![]).expect("IME allowed at a text caret");
-        let (top, bottom) = {
-            let st = app.session.active().unwrap();
-            let cs = app.session.cache.get(&st.doc, designcraft_doc::StoryId(sid.as_u64().unwrap()), None);
-            let (fi, x, bl, asc, desc) = compose::caret(&cs, "曲:".len()).unwrap();
-            let fid = cs.frames[fi].frame;
-            let (a, _) = item_canvas_xf(&st.doc, &CanvasLayout::new(&st.doc, st.editing_parents), fid).unwrap();
-            let m = a * st.doc.text_xf(st.doc.item(fid).unwrap());
-            let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
-            (xf.to_screen(m * Point::new(x, bl - asc)), xf.to_screen(m * Point::new(x, bl + desc)))
-        };
-        assert!(ime.rect.expand(1.0).contains(top) && ime.rect.expand(1.0).contains(bottom), "{:?} vs {top:?}–{bottom:?}", ime.rect);
-        assert_eq!(ime.cursor_rect, ime.rect);
-        assert!(!ime.should_interrupt_composition);
-        assert!(app.canvas_ime(), "the web build keeps whole words typed at the caret");
-        // "ni" → に → 日, with the events winit sends.
-        ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Enabled), preedit("ni", 2)]);
-        assert_eq!(story_text(&mut app, &sid), "曲:ni", "marked text shows in place");
-        assert!(app.session.tool_composing());
-        // Keys, plain text, the clipboard and Undo (the native menu's ⌘Z) wait for the IME.
-        let steps = app.session.doc().unwrap().history.undo.len();
-        let key = |key, pressed| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
-        ime_frame(
-            &mut app,
-            &ctx,
-            vec![key(egui::Key::Backspace, true), key(egui::Key::Backspace, false), egui::Event::Text("x".into()), egui::Event::Paste("y".into())],
-        );
-        crate::menus::activate(&mut app, "edit.undo", &Value::Null);
-        assert!(!crate::menus::enabled(&app, "edit.undo"));
-        assert_eq!(story_text(&mut app, &sid), "曲:ni");
-        let ime2 = ime_frame(&mut app, &ctx, vec![preedit("に", 1)]).expect("IME allowed while composing");
-        assert_eq!(story_text(&mut app, &sid), "曲:に");
-        assert!(ime2.rect.center().x > ime.rect.center().x, "the window follows the IME's cursor: {:?} {:?}", ime2.rect, ime.rect);
-        ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into())), egui::Event::Ime(egui::ImeEvent::Disabled)]);
-        assert_eq!(story_text(&mut app, &sid), "曲:日");
-        assert!(!app.session.tool_composing());
-        assert_eq!(app.session.doc().unwrap().history.undo.len(), steps + 1, "the commit is one undo step");
-        assert_eq!(app.session.journal.last(), Some(&("text.insert".to_string(), json!({"text": "日"}))));
-        // After the commit, typing and Undo work again.
-        ime_frame(&mut app, &ctx, vec![egui::Event::Text("!".into())]);
-        assert_eq!(story_text(&mut app, &sid), "曲:日!");
-        crate::menus::activate(&mut app, "edit.undo", &Value::Null);
-        crate::menus::activate(&mut app, "edit.undo", &Value::Null);
-        assert_eq!(story_text(&mut app, &sid), "曲:");
-        // Without a text caret the IME is off: single-key tool shortcuts keep working.
-        app.select_tool("selection");
-        assert!(ime_frame(&mut app, &ctx, vec![]).is_none());
-        assert!(!app.canvas_ime());
-    }
-
-    /// Both panes of a split window see the same keyboard events: only the pane last clicked
-    /// types them.
-    #[test]
-    fn a_split_window_types_once() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let ctx = egui::Context::default();
-        let sid = typing_app(&mut app, &ctx, "ab");
-        app.run("window.split", json!({"on": true})).unwrap();
-        for _ in 0..3 {
-            ime_frame(&mut app, &ctx, vec![]);
-        }
-        assert!(app.other_pane.as_ref().and_then(|o| o.1).is_some(), "both panes are drawn");
-        ime_frame(&mut app, &ctx, vec![egui::Event::Text("c".into())]);
-        assert_eq!(story_text(&mut app, &sid), "abc");
-        let key = |pressed| egui::Event::Key { key: egui::Key::Backspace, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
-        ime_frame(&mut app, &ctx, vec![key(true), key(false)]);
-        assert_eq!(story_text(&mut app, &sid), "ab");
-        ime_frame(&mut app, &ctx, vec![egui::Event::Paste("de".into())]);
-        assert_eq!(story_text(&mut app, &sid), "abde");
-        ime_frame(&mut app, &ctx, vec![preedit("に", 1)]);
-        assert_eq!(story_text(&mut app, &sid), "abdeに");
-        ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))]);
-        assert_eq!(story_text(&mut app, &sid), "abde日");
-    }
-
-    #[test]
-    fn clicking_away_mid_composition_keeps_the_text_and_interrupts_the_ime() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let ctx = egui::Context::default();
-        let sid = typing_app(&mut app, &ctx, "");
-        ime_frame(&mut app, &ctx, vec![preedit("しょうこ", 4)]);
-        assert!(app.session.tool_composing());
-        // A click in the frame (macOS and Windows send nothing for it): the marked text stays as
-        // typed and the IME is told to drop its composition, once.
-        let p = on_screen(&app, Point::new(150.0, 120.0));
-        let press = |pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
-        let ime = ime_frame(&mut app, &ctx, vec![egui::Event::PointerMoved(p), press(true)]).expect("still at a text caret");
-        assert!(ime.should_interrupt_composition);
-        ime_frame(&mut app, &ctx, vec![press(false)]);
-        assert!(!app.session.tool_composing());
-        assert_eq!(story_text(&mut app, &sid), "しょうこ");
-        assert!(app.take_ime_discard(), "the host tells the system IME to drop its marked text");
-        assert!(!ime_frame(&mut app, &ctx, vec![]).expect("still at a text caret").should_interrupt_composition);
-        assert!(!app.take_ime_discard());
-        // A bare line break from the IME confirms a composition: the marked text, no new paragraph.
-        ime_frame(&mut app, &ctx, vec![preedit("がく", 2)]);
-        ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("\n".into()))]);
-        assert!(!app.session.tool_composing());
-        let typed = story_text(&mut app, &sid);
-        assert!(typed.contains("がく") && typed.contains("しょうこ") && !typed.contains('\n'), "{typed:?}");
-    }
-
-    #[test]
-    fn baseline_grid_lines_are_the_ones_on_the_page() {
-        // A start far above the page used to be walked line by line, without end.
-        for start in [-1e9, -1e17] {
-            let mut far = baseline_grid_lines(start, 12.0, 792.0);
-            assert_eq!((far.next(), far.count()), (Some(8.0), 65));
-        }
-        let lines = |start, increment, height| baseline_grid_lines(start, increment, height).collect::<Vec<_>>();
-        assert_eq!(lines(36.0, 12.0, 72.0), [36.0, 48.0, 60.0], "the bottom edge is not a line");
-        assert_eq!(lines(-30.0, 12.0, 30.0), [6.0, 18.0], "a start above the page keeps its rhythm");
-        assert_eq!(lines(f64::NAN, 12.0, 792.0), [0.0; 0]);
-        assert_eq!(baseline_grid_lines(0.0, 12.0, f64::INFINITY).count(), MAX_BASELINES);
-    }
-
-    #[test]
-    fn enter_or_tab_in_a_panel_field_leave_the_selected_text_alone() {
-        for key in [egui::Key::Enter, egui::Key::Tab] {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.run("file.new", json!({})).unwrap();
-            let f = app.run("frame.create", json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Hello"})).unwrap();
-            app.select_tool("type");
-            app.run("text.select", json!({"story": f["story"], "anchor": 1, "focus": 4})).unwrap();
-            assert!(app.session.wants_text());
-            let mut h = harness(app);
-            let size = h.get_all_by_role(egui::accesskit::Role::TextInput).find(|n| n.value().as_deref() == Some("12 pt")).unwrap();
-            size.focus();
-            h.run_steps(1);
-            h.key_press_modifiers(egui::Modifiers::COMMAND, egui::Key::A);
-            h.run_steps(1);
-            h.event(egui::Event::Text("18".into()));
-            h.run_steps(1);
-            h.key_press(key);
-            h.run_steps(3);
-            let text = h.state_mut().session.execute("story.get", &json!({"story": f["story"]})).unwrap()["text"].clone();
-            assert_eq!(text, "Hello", "{key:?} confirms the field and leaves the story alone");
-            let size = crate::panels::text_attrs(h.state_mut()).unwrap()["chars"]["size"].clone();
-            assert_eq!(size, 18.0, "{key:?} applies the typed size");
-        }
-    }
-
-    #[test]
-    fn trailing_spaces_show_dots_before_the_paragraph_mark() {
-        let text = "ab  \ncd  ";
-        let mut d = Document::new(&designcraft_doc::build::NewDocument::default());
-        let lid = d.default_layer();
-        let rect = DRect::new(0.0, 0.0, 300.0, 100.0);
-        let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), rect, lid, text, Default::default()).unwrap();
-        let cs = compose::compose_story(&d, sid, &compose::ComposeOptions::default());
-        let lines: Vec<_> = cs.frames.iter().flat_map(|f| &f.lines).collect();
-        assert_eq!(lines.len(), 2);
-        for (l, end_mark) in lines.iter().zip(["¶", "#"]) {
-            let marks = hidden_marks(text, l);
-            let dots: Vec<f64> = marks.iter().filter(|m| m.1 == "·").map(|m| m.0).collect();
-            assert_eq!(dots.len(), 2, "a dot for each trailing space: {marks:?}");
-            let &(para_x, mark, _) = marks.last().unwrap();
-            assert_eq!(mark, end_mark);
-            // The dots sit past the last letter, and the mark comes after both spaces.
-            let space = l.glyphs.iter().rev().find(|g| g.len > 0).unwrap();
-            assert!(dots.iter().all(|&x| x > l.end_x && x < para_x), "{dots:?} then {mark} at {para_x}");
-            assert!(para_x >= space.x + space.adv, "{mark} at {para_x} overlaps the last space");
-        }
-    }
-}
-
-#[cfg(test)]
-mod pencil_preview_tests {
-    use egui::{Pos2, pos2, vec2};
-
-    /// Lines painted in `color` (egui paths) and the points they pass through.
-    fn lines_in(h: &egui_kittest::Harness<'static, crate::test_window::Window>, color: egui::Color32) -> Vec<Vec<Pos2>> {
-        fn walk(s: &egui::Shape, color: egui::Color32, out: &mut Vec<Vec<Pos2>>) {
-            match s {
-                egui::Shape::Path(p) if p.stroke.color == egui::epaint::ColorMode::Solid(color) && p.points.len() >= 2 => out.push(p.points.clone()),
-                egui::Shape::Vec(v) => v.iter().for_each(|s| walk(s, color, out)),
-                _ => {}
-            }
-        }
-        let mut out = vec![];
-        h.output().shapes.iter().for_each(|s| walk(&s.shape, color, &mut out));
-        out
-    }
-
-    #[test]
-    fn the_pencil_stroke_shows_while_drawing() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", serde_json::json!({})).unwrap();
-        app.run("tool.select", serde_json::json!({"tool": "pencil"})).unwrap();
-        let mut h = crate::test_window::open(app, vec2(1400.0, 900.0));
-        let doc = &h.state().app.session.doc().unwrap().doc;
-        let layer = doc.layers[0].color;
-        let color = egui::Color32::from_rgb(layer[0], layer[1], layer[2]);
-        let items = |h: &egui_kittest::Harness<'static, crate::test_window::Window>| h.state().app.session.doc().unwrap().doc.spreads[0].items.len();
-        let before = items(&h);
-        // Press on the page and drag, without letting go.
-        let start = pos2(520.0, 380.0);
-        h.hover_at(start);
-        h.drag_at(start);
-        h.run_steps(2);
-        let path: Vec<Pos2> = (1..=12).map(|i| start + vec2(i as f32 * 12.0, (i as f32 * 0.6).sin() * 30.0)).collect();
-        for p in &path {
-            h.hover_at(*p);
-            h.run_steps(1);
-        }
-        let drawn = lines_in(&h, color);
-        let stroke = drawn.iter().max_by_key(|l| l.len()).expect("the stroke is painted while the button is down");
-        let near = |a: Pos2, b: Pos2| (a - b).length() < 2.0;
-        assert!(near(stroke[0], start), "it starts where the press was: {:?}", stroke[0]);
-        assert!(path.iter().all(|p| stroke.iter().any(|q| near(*p, *q))), "it follows the pointer: {stroke:?}");
-        assert_eq!(items(&h), before, "nothing is made before the release");
-        // Letting go makes the path and ends the preview.
-        h.drop_at(*path.last().unwrap());
-        h.run_steps(3);
-        assert_eq!(items(&h), before + 1);
-        let app = &mut h.state_mut().app;
-        let view = app.view_info();
-        assert!(app.session.overlays(view).is_empty(), "the preview is gone");
-    }
-}
-
-#[cfg(test)]
-mod scrollbar_tests {
-    use egui::{Event, Modifiers, PointerButton};
-    use egui_kittest::Harness;
-
-    use super::*;
-    use crate::test_window::{Window, open, wheel};
-
-    fn window() -> Harness<'static, Window> {
-        let mut h = open(DesignApp::new(designcraft_engine::Session::new(), crate::Services::default()), vec2(1440.0, 900.0));
-        // Zoomed in so both axes scroll.
-        set_zoom(&mut h.state_mut().app, 2.0);
-        h.run_steps(3);
-        h
-    }
-
-    fn origin(h: &Harness<'static, Window>) -> Point {
-        h.state().app.view().map(|v| v.origin).unwrap_or_default()
-    }
-
-    /// The scrollbar's track and thumb as the canvas lays them out for the current view, and
-    /// the content pixels per thumb pixel.
-    fn bar(h: &Harness<'static, Window>, vertical: bool) -> (Rect, Rect, f32) {
-        let app = &h.state().app;
-        let rect = app.canvas_rect.unwrap();
-        let st = app.session.active().unwrap();
-        let xf = Xf::new(rect, app.view().unwrap());
-        let cb = xf.rect(CanvasLayout::new(&st.doc, st.editing_parents).pasteboard);
-        let outer = Rect::from_min_max(rect.min, rect.max + vec2(SCROLLBAR, SCROLLBAR));
-        scrollbar_rects(outer, rect, cb, vertical)
-    }
-
-    /// A primary-button drag from `a` to `b` in a few moves, with `mods` held throughout.
-    fn drag(h: &mut Harness<'static, Window>, a: Pos2, b: Pos2, mods: Modifiers) {
-        h.event(Event::ModifiersChanged(mods));
-        h.hover_at(a);
-        h.step();
-        h.event(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: true, modifiers: mods });
-        h.step();
-        for n in 1..=4 {
-            h.hover_at(a + (b - a) * n as f32 / 4.0);
-            h.step();
-        }
-        h.event(Event::PointerButton { pos: b, button: PointerButton::Primary, pressed: false, modifiers: mods });
-        h.event(Event::ModifiersChanged(Modifiers::NONE));
-        h.run_steps(3);
-    }
-
-    #[test]
-    fn document_views_have_scrollbars_beside_the_view() {
-        let h = window();
-        let rect = h.state().app.canvas_rect.unwrap();
-        for vertical in [true, false] {
-            let r = h.ctx.read_response(egui::Id::new(("canvas_scrollbar", 0u8, vertical))).expect("scrollbar").rect;
-            let (track, thumb, k) = bar(&h, vertical);
-            assert_eq!(r, track);
-            assert!(k > 0.0, "the zoomed-in view scrolls");
-            if vertical {
-                assert_eq!((r.min.x, r.width(), r.min.y, r.max.y), (rect.max.x, SCROLLBAR, rect.min.y, rect.max.y));
-                assert!(thumb.height() < track.height());
-            } else {
-                assert_eq!((r.min.y, r.height(), r.min.x, r.max.x), (rect.max.y, SCROLLBAR, rect.min.x, rect.max.x));
-                assert!(thumb.width() < track.width());
-            }
-        }
-    }
-
-    #[test]
-    fn dragging_a_thumb_pans_and_clicking_the_track_pages() {
-        let mut h = window();
-        let zoom = h.state().app.view().unwrap().zoom;
-        // Vertical thumb: down 40 px moves the view down by 40 thumb pixels' worth of content.
-        let (_, thumb, k) = bar(&h, true);
-        let before = origin(&h);
-        drag(&mut h, thumb.center(), thumb.center() + vec2(0.0, 40.0), Modifiers::NONE);
-        let after = origin(&h);
-        let want = 40.0 * k as f64 / zoom;
-        assert!((after.y - before.y - want).abs() < want * 0.2, "{before:?} → {after:?}, want +{want}");
-        assert_eq!(after.x, before.x);
-        // Horizontal thumb: left 30 px.
-        let (_, thumb, k) = bar(&h, false);
-        drag(&mut h, thumb.center(), thumb.center() - vec2(30.0, 0.0), Modifiers::NONE);
-        let next = origin(&h);
-        let want = 30.0 * k as f64 / zoom;
-        assert!((after.x - next.x - want).abs() < want * 0.2, "{after:?} → {next:?}, want -{want}");
-        assert_eq!(next.y, after.y);
-        // A click on the vertical track above the thumb pages up by one view.
-        let (track, thumb, _) = bar(&h, true);
-        assert!(thumb.min.y - track.min.y > 4.0);
-        crate::test_window::click_at(&mut h, pos2(track.center().x, track.min.y + 2.0));
-        let paged = origin(&h);
-        let view = h.state().app.canvas_rect.unwrap().height() as f64 / zoom;
-        assert!((next.y - paged.y - view).abs() < 0.01, "{next:?} → {paged:?}, want -{view}");
-    }
-
-    #[test]
-    fn scrolling_the_view_moves_the_thumbs() {
-        let mut h = window();
-        let (_, v0, _) = bar(&h, true);
-        let (_, h0, _) = bar(&h, false);
-        let c = h.state().app.canvas_rect.unwrap().center();
-        wheel(&mut h, c, vec2(-50.0, -80.0));
-        let (_, v1, _) = bar(&h, true);
-        let (_, h1, _) = bar(&h, false);
-        assert!(v1.min.y > v0.min.y && h1.min.x > h0.min.x, "{v0:?} → {v1:?}, {h0:?} → {h1:?}");
-        let r = h.ctx.read_response(egui::Id::new(("canvas_scrollbar", 0u8, true))).expect("scrollbar");
-        assert_eq!(r.rect, bar(&h, true).0);
-    }
-
-    #[test]
-    fn alt_drag_while_editing_text_pans_and_keeps_the_caret() {
-        let mut h = window();
-        let app = &mut h.state_mut().app;
-        let rect = app.canvas_rect.unwrap();
-        let xf = Xf::new(rect, app.view().unwrap());
-        // A text frame filling the visible part of the page, with the caret in it.
-        let (a, b) = (xf.to_canvas(rect.min + vec2(20.0, 20.0)), xf.to_canvas(rect.max - vec2(20.0, 20.0)));
-        let r = app.run("frame.create", json!({"rect": [a.x, a.y, b.x, b.y], "content": "text", "text": "Hello brave world"})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        app.run("tool.select", json!({"tool": "type"})).unwrap();
-        app.run("text.select", json!({"story": sid, "anchor": 3, "focus": 3})).unwrap();
-        assert!(app.session.wants_text());
-        h.run_steps(2);
-        let caret = h.state().app.session.doc().unwrap().selection.text;
-        let before = origin(&h);
-        let zoom = h.state().app.view().unwrap().zoom;
-        let from = rect.center();
-        drag(&mut h, from, from + vec2(60.0, 40.0), Modifiers::ALT);
-        let after = origin(&h);
-        assert!(after.x < before.x && after.y < before.y, "{before:?} → {after:?}");
-        assert!((before.x - after.x - 60.0 / zoom).abs() < 15.0 / zoom, "{before:?} → {after:?}");
-        assert_eq!(h.state().app.session.doc().unwrap().selection.text, caret);
-        assert!(h.state_mut().app.session.wants_text(), "still editing text");
-        // Without Alt the same drag selects text and leaves the view alone.
-        drag(&mut h, from, from + vec2(60.0, 40.0), Modifiers::NONE);
-        assert_eq!(origin(&h), after);
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/canvas/column_guides.rs b/crates/ui-egui/src/canvas/column_guides.rs
new file mode 100644
index 000000000..34d995fda
--- /dev/null
+++ b/crates/ui-egui/src/canvas/column_guides.rs
@@ -0,0 +1,199 @@
+use super::guides::{guide_at, over_item};
+use super::rulers::ruler_pieces;
+use super::{CanvasLayout, DRect, DesignApp, Document, Point, Pos2, Rect, ScreenMode, SpreadRef, Xf, json};
+
+pub(super) const COLUMN_DRAG: &str = "canvas_column_drag";
+
+/// A column guide being dragged with a Selection tool: its gutter follows the pointer.
+#[derive(Clone, Debug)]
+pub(super) struct ColumnDrag {
+    /// The document the drag's interaction belongs to.
+    doc: u64,
+    pub(super) spread: SpreadRef,
+    page: usize,
+    gutter: usize,
+    /// The pointer's spread x minus the gutter's left edge at the press: the gutter keeps that
+    /// distance from the pointer.
+    grab: f64,
+    /// The left edge last previewed.
+    last: Option<f64>,
+}
+
+/// The interior column guide under screen point `p` (within 3 px) that a press there would drag,
+/// as (spread, page, gutter, the gutter's left edge in spread x): a Selection tool, guides shown
+/// (not in Preview or Presentation), column guides unlocked, and no object or ruler guide that
+/// takes the press there.
+pub(super) fn column_guide_at(app: &DesignApp, xf: &Xf, p: Pos2) -> Option<(SpreadRef, usize, usize, f64)> {
+    let preview = matches!(app.ui.screen_mode, ScreenMode::Preview | ScreenMode::Presentation);
+    if !app.ui.guides || preview || !matches!(app.session.tool_id(), "selection" | "directSelection") {
+        return None;
+    }
+    let st = app.session.active()?;
+    if st.doc.settings.column_guides_locked {
+        return None;
+    }
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let (r, sp) = layout.spread_at(xf.to_canvas(p))?;
+    let tol = 3.0 / xf.zoom.max(1e-9);
+    let hit = st.doc.spread(r)?.pages.iter().enumerate().find_map(|(pi, pg)| {
+        let m = pg.margin_rect();
+        if sp.y < m.y0 - tol || sp.y > m.y1 + tol {
+            return None;
+        }
+        pg.column_rects().windows(2).enumerate().find_map(|(gi, w)| match w {
+            // Columns that cannot move (gutters wider than the margin box) offer no guide.
+            [a, b]
+                if ((sp.x - a.x1).abs() <= tol || (sp.x - b.x0).abs() <= tol)
+                    && pg.columns.with_gutter_moved(m.width(), gi, a.x1 - m.x0).is_some() =>
+            {
+                Some((r, pi, gi, a.x1))
+            }
+            _ => None,
+        })
+    })?;
+    // A ruler guide there takes the press first (see `guide_drag`).
+    let ruler_guide = !app.ui.guides_locked && guide_at(app, xf, p).is_some();
+    (!ruler_guide && !over_item(app, xf, p)).then_some(hit)
+}
+
+/// Whether spread `r`'s x axis runs across the screen (the spread view is not turned a quarter).
+pub(super) fn spread_x_across(app: &DesignApp, r: SpreadRef) -> bool {
+    app.session.active().is_none_or(|st| {
+        let [a, b, ..] = CanvasLayout::new(&st.doc, st.editing_parents).xf(r).as_coeffs();
+        a.abs() >= b.abs()
+    })
+}
+
+/// Canvas x `x` moved to the nearest tick mark of the horizontal ruler (its finest increment).
+fn ruler_tick_x(app: &DesignApp, doc: &Document, layout: &CanvasLayout, zoom: f64, x: f64) -> Option<f64> {
+    let pieces = ruler_pieces(app, doc, layout, doc.zero_point());
+    let &(_, _, o) = pieces.iter().find(|(from, to, _)| *from <= x && x < *to).or(pieces.first())?;
+    let (major, sub) = doc.settings.horizontal_units.ruler_ticks(zoom);
+    let step = major / f64::from(sub.max(1));
+    (step.is_finite() && step > 0.0).then(|| o.x + ((x - o.x) / step).round() * step).filter(|v| v.is_finite())
+}
+
+/// Where a dragged gutter's left edge goes for spread x `want`: Shift snaps it to the ruler's tick
+/// marks; otherwise its edges snap to the document grid, guides and objects as those snaps are
+/// set. Measured against the document as it was when the drag began.
+fn snap_gutter(app: &DesignApp, g: &ColumnDrag, want: f64, shift: bool, zoom: f64) -> f64 {
+    let Some(st) = app.session.active() else { return want };
+    let doc = st.interaction.as_ref().map_or_else(|| st.doc.clone(), |i| i.doc.clone());
+    let layout = CanvasLayout::new(&doc, st.editing_parents);
+    let Some(slot) = layout.slots.iter().find(|s| s.spread == g.spread) else { return want };
+    let Some(pg) = doc.spread(g.spread).and_then(|sp| sp.pages.get(g.page)) else { return want };
+    let m = pg.margin_rect();
+    if shift {
+        if !spread_x_across(app, g.spread) {
+            return want;
+        }
+        let c = slot.to_canvas(Point::new(want, m.y0));
+        return ruler_tick_x(app, &doc, &layout, zoom, c.x).map_or(want, |x| slot.to_spread(Point::new(x, c.y)).x);
+    }
+    let cols = pg.column_rects();
+    let width = match (cols.get(g.gutter), cols.get(g.gutter + 1)) {
+        (Some(a), Some(b)) => (b.x0 - a.x1).max(0.0),
+        _ => 0.0,
+    };
+    let cx = designcraft_tools::ToolContext {
+        doc: &doc,
+        selection: &st.selection,
+        cache: &app.session.cache,
+        layout: &layout,
+        zoom: zoom.max(1e-6),
+        layer: st.active_layer,
+        // A line has no size or spacing to match.
+        snap: designcraft_tools::SnapView { smart_dimensions: false, smart_spacing: false, ..app.ui.snap_view() },
+        unit: app.ui.units,
+        stroke_in_front: false,
+    };
+    let rect = DRect::new(want, m.y0, want + width, m.y1);
+    let s = designcraft_tools::snap::snap(
+        &cx,
+        designcraft_tools::SnapRequest {
+            spread: g.spread,
+            gesture: designcraft_tools::Gesture::Move,
+            rect,
+            x_edges: [true, false, true],
+            y_edges: [false; 3],
+            exclude: &[],
+            exclude_guides: &[],
+            copying: false,
+            lengths: [None, None],
+            angle: None,
+            radius: 0.0,
+            pointer: Point::new(want, m.center().y),
+        },
+    );
+    let x = want + s.delta.x;
+    if x.is_finite() { x } else { want }
+}
+
+/// Column guides: with a Selection tool, drag an interior column guide (not over an object) to
+/// move its gutter, both guides together; Escape puts it back. One undo step per drag. Returns
+/// true while it owns the pointer.
+pub(super) fn column_guide_drag(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf) -> bool {
+    let id = egui::Id::unique((COLUMN_DRAG, app.pane));
+    let (pressed, released, origin, latest, shift, escape) = ui.input(|i| {
+        (
+            i.pointer.primary_pressed(),
+            // A release this frame, or one missed while something else had the pointer.
+            i.pointer.primary_released() || !i.pointer.primary_down(),
+            i.pointer.press_origin(),
+            i.pointer.latest_pos(),
+            i.modifiers.shift,
+            i.key_pressed(egui::Key::Escape),
+        )
+    });
+    let mut drag: Option<ColumnDrag> = ui.data(|d| d.get_temp(id));
+    if drag.is_none()
+        && pressed
+        && resp.hovered()
+        && let Some(o) = origin.filter(|o| rect.contains(*o))
+        && let Some((spread, page, gutter, left)) = column_guide_at(app, xf, o)
+        // Another gesture or a dialog's preview owns the document until it ends.
+        && let Some((doc, slot_x)) = app
+            .session
+            .active()
+            .filter(|st| st.interaction.is_none())
+            .map(|st| (st.uid, CanvasLayout::new(&st.doc, st.editing_parents).to_spread(spread, xf.to_canvas(o)).x))
+        && app.session.begin_interaction("Move Column Guide").is_ok()
+    {
+        drag = Some(ColumnDrag { doc, spread, page, gutter, grab: slot_x - left, last: None });
+    }
+    let Some(mut g) = drag else { return false };
+    // Another document became active: the drag ends in its own, as it began.
+    if app.session.active().is_none_or(|st| st.uid != g.doc) {
+        app.session.cancel_interaction_of(g.doc);
+        ui.data_mut(|d| d.remove::<ColumnDrag>(id));
+        return false;
+    }
+    if escape {
+        app.session.cancel_interaction();
+        ui.data_mut(|d| d.remove::<ColumnDrag>(id));
+        return true;
+    }
+    if let Some(p) = latest
+        && let Some(x) = app.session.active().map(|st| CanvasLayout::new(&st.doc, st.editing_parents).to_spread(g.spread, xf.to_canvas(p)).x)
+        && x.is_finite()
+    {
+        let want = snap_gutter(app, &g, x - g.grab, shift, xf.zoom);
+        if g.last != Some(want) && (g.last.is_some() || (p - origin.unwrap_or(p)).length() > 0.0) {
+            let params = json!({"spread": g.spread, "page": g.page, "gutter": g.gutter, "position": want});
+            if let Err(e) = app.session.preview("layout.moveColumnGuide", params) {
+                app.status(e.to_string());
+            }
+            g.last = Some(want);
+        }
+    }
+    if released {
+        ui.data_mut(|d| d.remove::<ColumnDrag>(id));
+        if let Err(e) = app.session.commit_interaction() {
+            app.status(e.to_string());
+        }
+        app.after_engine();
+        return true;
+    }
+    ui.data_mut(|d| d.insert_temp(id, g));
+    true
+}
diff --git a/crates/ui-egui/src/canvas/frames.rs b/crates/ui-egui/src/canvas/frames.rs
new file mode 100644
index 000000000..4ff09ab98
--- /dev/null
+++ b/crates/ui-egui/src/canvas/frames.rs
@@ -0,0 +1,378 @@
+use super::page_decor::dashed;
+use super::render::c32;
+use super::rulers::hair;
+use super::text_overlay::draw_text_selection;
+use super::{
+    Affine, CanvasLayout, Color32, Content, DRect, DesignApp, Document, Item, Point, Pos2, Rect, Selection, Stroke, StrokeKind, Xf, compose, pos2,
+    vec2,
+};
+
+/// Spread-space → canvas transform for an item at `loc`.
+pub(super) fn item_canvas_xf(doc: &Document, layout: &CanvasLayout, id: designcraft_doc::ItemId) -> Option<(Affine, &'static str)> {
+    let loc = doc.find(id)?;
+    Some((layout.xf(loc.spread) * doc.parent_xf(&loc), ""))
+}
+
+pub(super) fn path_screen(it: &Item, xf: &Xf, a: Affine) -> Vec<Vec<Pos2>> {
+    let bp = it.path.to_bezpath();
+    let full = a * it.xf;
+    let mut out = Vec::new();
+    let mut cur: Vec<Pos2> = Vec::new();
+    designcraft_geom::kurbo::flatten(&bp, 0.25 / xf.zoom.max(0.01), |el| {
+        use designcraft_geom::PathEl::*;
+        match el {
+            MoveTo(p) => {
+                if cur.len() > 1 {
+                    out.push(std::mem::take(&mut cur));
+                }
+                cur.clear();
+                cur.push(xf.to_screen(full * p));
+            }
+            LineTo(p) => cur.push(xf.to_screen(full * p)),
+            ClosePath => {
+                if let Some(f) = cur.first().copied() {
+                    cur.push(f);
+                }
+            }
+            _ => {}
+        }
+    });
+    if cur.len() > 1 {
+        out.push(cur);
+    }
+    out
+}
+
+pub(super) fn draw_frames(app: &DesignApp, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) {
+    if !app.ui.frame_edges {
+        return;
+    }
+    let ported = ported_frames(app, doc);
+    for slot in &layout.slots {
+        let Some(sp) = doc.spread(slot.spread) else { continue };
+        let a = slot.xf;
+        // Parent items on document pages, and base parents' items on a parent spread: dotted edges.
+        for (pi, page) in sp.pages.iter().enumerate() {
+            for (ppi, ppg) in doc.shown_parent_pages(slot.spread, pi) {
+                let Some(parent) = doc.parents.get(ppi) else { continue };
+                let Some(ppage) = parent.pages.get(ppg) else { continue };
+                let dx = page.x - ppage.x;
+                for it in &parent.items {
+                    if (parent.pages.len() > 1 && parent.page_at_x(it.bounds().center().x) != Some(ppg)) || page.overridden.contains(&it.id) {
+                        continue;
+                    }
+                    let col = doc.layer(it.layer).map(|l| c32(l.color)).unwrap_or(Color32::LIGHT_BLUE);
+                    for poly in path_screen(it, xf, a * Affine::translate((dx, 0.0))) {
+                        for w in poly.windows(2) {
+                            dashed(painter, w[0], w[1], Stroke::new(hair(painter), col.gamma_multiply(0.8)), 2.0, 2.0);
+                        }
+                    }
+                }
+            }
+        }
+        for it in &sp.items {
+            draw_item_edges(painter, xf, doc, it, a);
+        }
+        // Every overset frame, selected or not and inside groups too, shows its red mark at the
+        // out port (InDesign shows it only on the selected frame; a report in Preflight is easy
+        // to miss while laying out).
+        for (it, c) in overset_marks(app, doc, layout, &sp.items, xf.zoom, &ported) {
+            let c = xf.to_screen(c);
+            let s = designcraft_tools::thread::PORT_SIZE_PX as f32;
+            painter.rect_filled(Rect::from_center_size(c, vec2(s, s)), 0.0, Color32::WHITE);
+            painter.rect_stroke(Rect::from_center_size(c, vec2(s, s)), 0.0, Stroke::new(hair(painter), layer_color(doc, it)), StrokeKind::Inside);
+            let red = Color32::from_rgb(230, 20, 20);
+            painter.line_segment([c - vec2(2.5, 0.0), c + vec2(2.5, 0.0)], Stroke::new(1.5, red));
+            painter.line_segment([c - vec2(0.0, 2.5), c + vec2(0.0, 2.5)], Stroke::new(1.5, red));
+        }
+        // Tagged frames in their tag's colour.
+        if app.ui.tagged_frames {
+            for top in &sp.items {
+                top.walk(&mut |it: &Item| {
+                    if it.xml_tag.is_empty() {
+                        return;
+                    }
+                    let Some(t) = doc.xml.tags.iter().find(|t| t.name == it.xml_tag) else { return };
+                    let col = Color32::from_rgb(t.color[0], t.color[1], t.color[2]);
+                    for poly in path_screen(it, xf, a) {
+                        for w in poly.windows(2) {
+                            painter.line_segment([w[0], w[1]], Stroke::new(2.5, col));
+                        }
+                    }
+                });
+            }
+        }
+    }
+}
+
+fn draw_item_edges(painter: &egui::Painter, xf: &Xf, doc: &Document, it: &Item, a: Affine) {
+    if it.hidden || doc.layer(it.layer).is_some_and(|l| !l.visible) {
+        return;
+    }
+    let col = doc.layer(it.layer).map(|l| c32(l.color)).unwrap_or(Color32::LIGHT_BLUE);
+    if let Content::Group { items } = &it.content {
+        for c in items {
+            draw_item_edges(painter, xf, doc, c, a * it.xf);
+        }
+        return;
+    }
+    // Frames without a stroke show their edge; shapes with strokes are visible already.
+    let show = it.stroke.is_none() || matches!(it.content, Content::Text(_) | Content::Graphic(_));
+    if show {
+        for poly in path_screen(it, xf, a) {
+            painter.add(egui::Shape::line(poly, Stroke::new(hair(painter), col.gamma_multiply(0.75))));
+        }
+    }
+    // Empty graphic frame: the X.
+    if it.object_style == designcraft_doc::BASIC_GRAPHICS_FRAME && matches!(it.content, Content::Unassigned) {
+        let r = it.inner_bounds();
+        let m = a * it.xf;
+        let p = |x: f64, y: f64| xf.to_screen(m * Point::new(x, y));
+        painter.line_segment([p(r.x0, r.y0), p(r.x1, r.y1)], Stroke::new(hair(painter), col.gamma_multiply(0.75)));
+        painter.line_segment([p(r.x1, r.y0), p(r.x0, r.y1)], Stroke::new(hair(painter), col.gamma_multiply(0.75)));
+    }
+}
+
+/// Layer colour of the first selected item: live-corner marks are outlined in it.
+pub(super) fn selection_color(app: &DesignApp) -> Color32 {
+    let fallback = Color32::from_rgb(79, 153, 255);
+    let Some(st) = app.session.active() else { return fallback };
+    st.selection.items.first().and_then(|id| st.doc.item(*id)).map_or(fallback, |it| layer_color(&st.doc, it))
+}
+
+pub(super) fn layer_color(doc: &Document, it: &Item) -> Color32 {
+    doc.layer(it.layer).map(|l| c32(l.color)).unwrap_or(Color32::from_rgb(79, 153, 255))
+}
+
+/// Draw selection chrome; returns the selection's screen bounds (for the Contextual Task Bar).
+pub(super) fn draw_selection(app: &DesignApp, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) -> Option<Rect> {
+    let st = app.session.active()?;
+    let sel: &Selection = &st.selection;
+    let mut text_rect = None;
+    // Text selection / caret.
+    if let Some(ts) = sel.text {
+        draw_text_selection(app, painter, xf, doc, layout, ts, sel.cells);
+        let fid = ts.frame.or_else(|| {
+            let cs = app.session.cache.get(doc, ts.story, None);
+            compose::caret(&cs, ts.focus).and_then(|c| cs.frames.get(c.0)).map(|f| f.frame)
+        });
+        if let Some(fid) = fid
+            && let (Some(it), Some((a, _))) = (doc.item(fid), item_canvas_xf(doc, layout, fid))
+        {
+            text_rect = Some(xf.rect(a.transform_rect_bbox(it.bounds())));
+        }
+    }
+    let mut union: Option<Rect> = None;
+    let mut color = Color32::from_rgb(79, 153, 255);
+    for id in &sel.items {
+        let (Some(it), Some((a, _))) = (doc.item(*id), item_canvas_xf(doc, layout, *id)) else { continue };
+        color = layer_color(doc, it);
+        for poly in path_screen(it, xf, a) {
+            painter.add(egui::Shape::line(poly, Stroke::new(1.0, color)));
+        }
+        if sel.items.len() == 1 && sel.text.is_none() {
+            // InDesign draws a 1 pt bounding box around the selection.
+            painter.rect_stroke(xf.rect(a.transform_rect_bbox(it.bounds())), 0.0, Stroke::new(1.0, color), StrokeKind::Middle);
+        } else if sel.key == Some(*id) {
+            // The key object for Align: a thicker bounding box, as in InDesign.
+            painter.rect_stroke(xf.rect(a.transform_rect_bbox(it.bounds())), 0.0, Stroke::new(3.0, color), StrokeKind::Middle);
+        }
+        let b = xf.rect(a.transform_rect_bbox(it.bounds()));
+        union = Some(union.map_or(b, |u| u.union(b)));
+        // Text frame ports, also of the frames inside a selected group (so an overset frame in a
+        // group shows its red mark).
+        let mut frames = Vec::new();
+        text_frames_in(it, 0, &mut frames);
+        for (frame, story) in frames {
+            draw_ports(app, painter, xf, doc, layout, frame, story, color);
+        }
+        if let Content::Graphic(g) = &it.content
+            && sel.content
+        {
+            let gb = xf.rect((a * it.xf).transform_rect_bbox(g.xf.transform_rect_bbox(DRect::new(0.0, 0.0, g.size.0, g.size.1))));
+            let brown = Color32::from_rgb(196, 111, 43);
+            painter.rect_stroke(gb, 0.0, Stroke::new(1.0, brown), StrokeKind::Middle);
+            // Its own handles resize the graphic (InDesign's brown content bounding box).
+            if sel.items.len() == 1 {
+                for h in designcraft_tools::select::handles(DRect::new(gb.min.x as f64, gb.min.y as f64, gb.max.x as f64, gb.max.y as f64)) {
+                    let r = Rect::from_center_size(pos2(h.x as f32, h.y as f32), vec2(6.5, 6.5));
+                    painter.rect_filled(r, 0.0, Color32::WHITE);
+                    painter.rect_stroke(r, 0.0, Stroke::new(hair(painter), brown), StrokeKind::Inside);
+                }
+            }
+        }
+    }
+    let direct = matches!(app.session.tool_id(), "directSelection" | "pen" | "addAnchor" | "deleteAnchor" | "convertDirection");
+    if direct {
+        for id in &sel.items {
+            let (Some(it), Some((a, _))) = (doc.item(*id), item_canvas_xf(doc, layout, *id)) else { continue };
+            let m = a * it.xf;
+            let col = layer_color(doc, it);
+            for sp in &it.path.subpaths {
+                for an in &sp.anchors {
+                    let p = xf.to_screen(m * an.p);
+                    for (h, has) in [(an.h_in, an.has_in()), (an.h_out, an.has_out())] {
+                        if has {
+                            let hp = xf.to_screen(m * h);
+                            painter.line_segment([p, hp], Stroke::new(1.0, col));
+                            painter.circle_filled(hp, 2.5, col);
+                        }
+                    }
+                    let r = Rect::from_center_size(p, vec2(5.0, 5.0));
+                    painter.rect_filled(r, 0.0, Color32::WHITE);
+                    painter.rect_stroke(r, 0.0, Stroke::new(1.0, col), StrokeKind::Inside);
+                }
+            }
+        }
+    }
+    if let Some(u) = union
+        && sel.text.is_none()
+        && !direct
+    {
+        if sel.items.len() > 1 {
+            painter.rect_stroke(u, 0.0, Stroke::new(1.0, color), StrokeKind::Middle);
+        }
+        let hs = 6.5;
+        // Centre point. The Selection tool draws the live-corner widget as an overlay.
+        painter.rect_filled(Rect::from_center_size(u.center(), vec2(3.5, 3.5)), 0.0, color);
+        // A selected placed graphic has its own handles instead of the frame's.
+        let graphic_selected =
+            sel.content && sel.items.len() == 1 && doc.item(sel.items[0]).is_some_and(|i| matches!(i.content, Content::Graphic(_)));
+        for h in designcraft_tools::select::handles(DRect::new(u.min.x as f64, u.min.y as f64, u.max.x as f64, u.max.y as f64))
+            .into_iter()
+            .filter(|_| !graphic_selected)
+        {
+            let r = Rect::from_center_size(pos2(h.x as f32, h.y as f32), vec2(hs, hs));
+            painter.rect_filled(r, 0.0, Color32::WHITE);
+            painter.rect_stroke(r, 0.0, Stroke::new(hair(painter), color), StrokeKind::Inside);
+        }
+    }
+    // Threads.
+    if app.ui.text_threads || sel.items.iter().any(|i| doc.item(*i).is_some_and(|x| x.is_text_frame())) {
+        for id in &sel.items {
+            let Some(sid) = doc.item(*id).and_then(|i| i.text_frame()).map(|t| t.story) else { continue };
+            let Some(story) = doc.story(sid) else { continue };
+            for w in story.frames.windows(2) {
+                let (Some(a), Some(b)) = (port_pos(doc, layout, w[0], true), port_pos(doc, layout, w[1], false)) else { continue };
+                let col = doc.item(w[0]).map(|i| layer_color(doc, i)).unwrap_or(color);
+                painter.line_segment([xf.to_screen(a), xf.to_screen(b)], Stroke::new(1.0, col));
+            }
+        }
+    }
+    text_rect.or(union)
+}
+
+/// How deep a selected group is walked for the text frames whose ports are drawn.
+const PORT_GROUP_DEPTH: usize = 32;
+
+/// The text frames whose ports `draw_selection` draws: the selected text frames and the text
+/// frames inside selected groups.
+pub(super) fn ported_frames(app: &DesignApp, doc: &Document) -> std::collections::HashSet<designcraft_doc::ItemId> {
+    let mut frames = Vec::new();
+    if let Some(st) = app.session.active() {
+        for it in st.selection.items.iter().filter_map(|id| doc.item(*id)) {
+            text_frames_in(it, 0, &mut frames);
+        }
+    }
+    frames.into_iter().map(|(f, _)| f.id).collect()
+}
+
+/// Canvas centres of the always-on overset marks among `items`: the out port of every visible
+/// frame that ends an overset story, except the frames in `ported`, whose out port `draw_ports`
+/// already marks.
+pub(super) fn overset_marks<'a>(
+    app: &DesignApp,
+    doc: &Document,
+    layout: &CanvasLayout,
+    items: &'a [std::sync::Arc<Item>],
+    zoom: f64,
+    ported: &std::collections::HashSet<designcraft_doc::ItemId>,
+) -> Vec<(&'a Item, Point)> {
+    let mut frames = Vec::new();
+    overset_frames(app, doc, items, 0, &mut frames);
+    frames
+        .into_iter()
+        .filter(|it| !ported.contains(&it.id))
+        .filter_map(|it| Some((it, designcraft_tools::thread::port_center(doc, layout, it.id, true, zoom)?)))
+        .collect()
+}
+
+/// The visible text frames among `items` (groups walked) that end an overset story.
+pub(super) fn overset_frames<'a>(app: &DesignApp, doc: &Document, items: &'a [std::sync::Arc<Item>], depth: usize, out: &mut Vec<&'a Item>) {
+    if depth > PORT_GROUP_DEPTH {
+        return;
+    }
+    for it in items {
+        if it.hidden || doc.layer(it.layer).is_some_and(|l| !l.visible) {
+            continue;
+        }
+        match &it.content {
+            Content::Text(tf) => {
+                let Some(story) = doc.story(tf.story) else { continue };
+                if story.frames.last() == Some(&it.id) && app.session.cache.get(doc, tf.story, None).is_overset() {
+                    out.push(it);
+                }
+            }
+            Content::Group { items } => overset_frames(app, doc, items, depth + 1, out),
+            _ => {}
+        }
+    }
+}
+
+/// `it` when it is a text frame, or every text frame nested in it when it is a group, each with
+/// its story.
+pub(super) fn text_frames_in<'a>(it: &'a Item, depth: usize, out: &mut Vec<(&'a Item, designcraft_doc::StoryId)>) {
+    match &it.content {
+        Content::Text(tf) => out.push((it, tf.story)),
+        Content::Group { items } if depth < PORT_GROUP_DEPTH => {
+            for child in items {
+                text_frames_in(child, depth + 1, out);
+            }
+        }
+        _ => {}
+    }
+}
+
+/// Port location (canvas): out port at bottom-right, in port at top-left.
+fn port_pos(doc: &Document, layout: &CanvasLayout, id: designcraft_doc::ItemId, out: bool) -> Option<Point> {
+    let it = doc.item(id)?;
+    let (a, _) = item_canvas_xf(doc, layout, id)?;
+    let r = it.inner_bounds();
+    let p = if out { Point::new(r.x1 - 10.0, r.y1) } else { Point::new(r.x0 + 10.0, r.y0) };
+    Some(a * it.xf * p)
+}
+
+#[allow(clippy::too_many_arguments)]
+fn draw_ports(
+    app: &DesignApp,
+    painter: &egui::Painter,
+    xf: &Xf,
+    doc: &Document,
+    layout: &CanvasLayout,
+    it: &Item,
+    sid: designcraft_doc::StoryId,
+    color: Color32,
+) {
+    let Some(story) = doc.story(sid) else { return };
+    let pos = story.frames.iter().position(|f| *f == it.id).unwrap_or(0);
+    let is_last = pos + 1 == story.frames.len();
+    let cs = app.session.cache.get(doc, sid, None);
+    let overset = is_last && cs.is_overset();
+    let s = designcraft_tools::thread::PORT_SIZE_PX as f32;
+    // In port on the left edge below the top-left corner; out port on the right edge above the
+    // bottom-right corner. The Selection tool hit-tests the same places.
+    let port = |out: bool| designcraft_tools::thread::port_center(doc, layout, it.id, out, xf.zoom).map(|c| xf.to_screen(c));
+    let (Some(inp), Some(outp)) = (port(false), port(true)) else { return };
+    for (c, has_link, is_out) in [(inp, pos > 0, false), (outp, !is_last, true)] {
+        let pr = Rect::from_center_size(c, vec2(s, s));
+        painter.rect_filled(pr, 0.0, Color32::WHITE);
+        painter.rect_stroke(pr, 0.0, Stroke::new(hair(painter), color), StrokeKind::Inside);
+        if is_out && overset {
+            let red = Color32::from_rgb(230, 20, 20);
+            painter.line_segment([c - vec2(2.5, 0.0), c + vec2(2.5, 0.0)], Stroke::new(1.5, red));
+            painter.line_segment([c - vec2(0.0, 2.5), c + vec2(0.0, 2.5)], Stroke::new(1.5, red));
+        } else if has_link {
+            painter.add(egui::Shape::convex_polygon(vec![c + vec2(-2.0, -2.5), c + vec2(2.5, 0.0), c + vec2(-2.0, 2.5)], color, Stroke::NONE));
+        }
+    }
+}
diff --git a/crates/ui-egui/src/canvas/guides.rs b/crates/ui-egui/src/canvas/guides.rs
new file mode 100644
index 000000000..eebd41208
--- /dev/null
+++ b/crates/ui-egui/src/canvas/guides.rs
@@ -0,0 +1,412 @@
+use super::rulers::ruler_pieces_of;
+use super::view::current_slot;
+use super::{CanvasLayout, DRect, DesignApp, Document, GuideSel, Overlay, Point, Pos2, Rect, SpreadRef, SpreadSlot, Xf, json, pos2};
+
+pub(super) const GUIDE_DRAG: &str = "canvas_guide_drag";
+
+/// A ruler guide being dragged: out of a ruler (`from` None) or an existing one.
+#[derive(Clone, Debug)]
+pub(super) struct GuideDrag {
+    pub(super) orientation: designcraft_doc::Orientation,
+    pub(super) from: Option<(designcraft_doc::SpreadRef, usize, usize)>,
+    /// Pointer position (screen).
+    pub(super) at: Option<Pos2>,
+    /// Modifiers held at the pointer's last move: Shift snaps to the ruler's ticks, Command
+    /// suspends snapping.
+    pub(super) mods: egui::Modifiers,
+}
+
+pub(super) const GUIDE_PRESS: &str = "canvas_guide_press";
+
+/// A press on an existing guide: where it was (screen) and whether Shift was down. Released
+/// where it was pressed, it is a click, which selects the guide.
+#[derive(Clone, Copy, Debug)]
+pub(super) struct GuidePress {
+    pub(super) origin: Pos2,
+    pub(super) shift: bool,
+}
+
+/// How far (screen pixels) the pointer may move between press and release for a click.
+const GUIDE_CLICK_SLOP: f32 = 3.0;
+
+/// Where a dragged guide is, as the rulers measure it (#1282): `X: …` for a vertical guide, `Y: …`
+/// for a horizontal one, from the zero point (and the page origin, when rulers restart per page)
+/// in the document's ruler units. `None` with no document or rulers.
+pub(super) fn guide_readout(app: &DesignApp, xf: &Xf, g: &GuideDrag) -> Option<String> {
+    let (label, value, unit) = guide_measure(app, xf, g)?;
+    Some(format!("{label}: {}", designcraft_geom::units::format_measure(value, unit)))
+}
+
+/// Where a pointer readout of `size` goes for a pointer at `p`: below right of it, on the other
+/// side where that would leave the canvas `area` (near its right or bottom edge), and kept inside
+/// it (with the label's 3-point frame) however small the canvas is.
+pub(super) fn readout_at(p: Pos2, size: egui::Vec2, area: Rect) -> Pos2 {
+    const GAP: f32 = 12.0;
+    const PAD: f32 = 3.0;
+    let x = if p.x + GAP + size.x + PAD > area.max.x { p.x - GAP - size.x } else { p.x + GAP };
+    let y = if p.y + GAP + size.y + PAD > area.max.y { p.y - GAP - size.y } else { p.y + GAP };
+    let clamp = |v: f32, lo: f32, hi: f32| if hi < lo { lo } else { v.clamp(lo, hi) };
+    pos2(clamp(x, area.min.x + PAD, area.max.x - PAD - size.x), clamp(y, area.min.y + PAD, area.max.y - PAD - size.y))
+}
+
+/// [`guide_readout`]'s parts: the axis label, the value (points) and its unit.
+pub(super) fn guide_measure(app: &DesignApp, xf: &Xf, g: &GuideDrag) -> Option<(&'static str, f64, designcraft_geom::Unit)> {
+    let p = g.at?;
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    // Measured where the guide is dropped (`guide_drag`): its snapped spot, on the spread under
+    // the pointer, as the rulers measure that spread, not the one in the middle of the view.
+    let (c, slot) = match guide_spot(app, xf, g) {
+        Some(spot) => (layout.to_canvas(spot.spread, spot.sp), layout.slot(spot.spread)?),
+        None => (xf.to_canvas(p), current_slot(app, &layout).and_then(|i| layout.slots.get(i))?),
+    };
+    // An existing guide moves only on its own spread (`guide_drag`): over another, dropping it
+    // leaves it where it was, so there is no place to show.
+    if g.from.is_some_and(|(r, _, _)| r != slot.spread) {
+        return None;
+    }
+    let pieces = ruler_pieces_of(&st.doc, slot, st.doc.zero_point());
+    let first = pieces.first()?;
+    let (label, value, unit) = match g.orientation {
+        designcraft_doc::Orientation::Vertical => {
+            // The horizontal ruler restarts at each page: the piece under the guide measures it.
+            let o = pieces.iter().find(|(from, to, _)| *from <= c.x && c.x < *to).unwrap_or(first).2;
+            ("X", c.x - o.x, st.doc.settings.horizontal_units)
+        }
+        designcraft_doc::Orientation::Horizontal => ("Y", c.y - first.2.y, st.doc.settings.vertical_units),
+    };
+    value.is_finite().then_some((label, value, unit))
+}
+
+/// Where a dragged ruler guide is (#1221).
+pub(super) struct GuideSpot {
+    /// The spread under the pointer.
+    spread: SpreadRef,
+    /// The pointer in that spread's coordinates.
+    pointer: Point,
+    /// [`Self::pointer`] with the guide's axis snapped.
+    pub(super) sp: Point,
+    /// [`Self::sp`] on screen, where the preview line goes.
+    pub(super) screen: Pos2,
+    /// Alignment marks (canvas coordinates) when an object or page edge or center caught it.
+    pub(super) marks: Vec<Overlay>,
+}
+
+/// Where the guide of drag `g` is: its axis (x for a vertical guide, y for a horizontal one)
+/// snapped as a moved object's is, to ruler guides, margins, columns, bleed, the document grid and
+/// smart-guide targets (not the baseline grid, which would catch a horizontal guide almost
+/// anywhere). Shift snaps to the ruler's ticks instead and Command suspends snapping. The guides
+/// being dragged are not targets. An existing guide over another spread, where it
+/// can't be dropped, stays at the pointer. The preview, the readout and the drop all read it.
+/// `None` with no spread under the pointer.
+pub(super) fn guide_spot(app: &DesignApp, xf: &Xf, g: &GuideDrag) -> Option<GuideSpot> {
+    let p = g.at?;
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let (r, pointer) = layout.spread_at(xf.to_canvas(p))?;
+    let spot = |sp: Point, marks: Vec<Overlay>| GuideSpot { spread: r, pointer, sp, screen: xf.to_screen(layout.to_canvas(r, sp)), marks };
+    if g.mods.command || g.from.is_some_and(|(from, _, _)| from != r) {
+        return Some(GuideSpot { spread: r, pointer, sp: pointer, screen: p, marks: Vec::new() });
+    }
+    let vertical = matches!(g.orientation, designcraft_doc::Orientation::Vertical);
+    let place = |v: f64| if vertical { Point::new(v, pointer.y) } else { Point::new(pointer.x, v) };
+    if g.mods.shift {
+        let slot = layout.slot(r)?;
+        let at = ruler_tick_of(&st.doc, slot, g.orientation, xf.zoom, pointer).map_or(pointer, place);
+        return Some(spot(at, Vec::new()));
+    }
+    let spread = st.doc.spread(r)?;
+    // Not targets: the dragged guide, and the others of a selected group, which move with it.
+    let exclude: Vec<GuideSel> = match g.from {
+        Some((sr, pi, gi)) if drags_group(app, GuideSel { spread: sr, page: pi, index: gi }) => st.selection.guides.to_vec(),
+        Some((sr, pi, gi)) => vec![GuideSel { spread: sr, page: pi, index: gi }],
+        None => Vec::new(),
+    };
+    // How far the guide reaches across its axis: its page, or the whole spread.
+    let page = match g.from {
+        Some((_, pi, gi)) => spread.pages.get(pi).filter(|pg| pg.guides.get(gi).is_some_and(|guide| !guide.spread)),
+        None => spread.pages.iter().find(|pg| pg.bounds().contains(pointer)),
+    };
+    let reach = page.map_or_else(|| spread.bounds(), |pg| pg.bounds());
+    let (at, rect, x_edges, y_edges) = if vertical {
+        (pointer.x, DRect::new(pointer.x, reach.y0, pointer.x, reach.y1), [true; 3], [false; 3])
+    } else {
+        (pointer.y, DRect::new(reach.x0, pointer.y, reach.x1, pointer.y), [false; 3], [true; 3])
+    };
+    let cx = designcraft_tools::ToolContext {
+        doc: &st.doc,
+        selection: &st.selection,
+        cache: &app.session.cache,
+        layout: &layout,
+        zoom: xf.zoom.max(1e-6),
+        layer: st.active_layer,
+        snap: app.ui.snap_view(),
+        unit: app.ui.units,
+        stroke_in_front: false,
+    };
+    let s = designcraft_tools::snap::snap(
+        &cx,
+        designcraft_tools::SnapRequest {
+            spread: r,
+            gesture: designcraft_tools::Gesture::Guide,
+            rect,
+            x_edges,
+            y_edges,
+            exclude: &[],
+            exclude_guides: &exclude,
+            copying: false,
+            lengths: [None, None],
+            angle: None,
+            radius: 0.0,
+            pointer,
+        },
+    );
+    let snapped = at + if vertical { s.delta.x } else { s.delta.y };
+    Some(if snapped.is_finite() { spot(place(snapped), s.guides) } else { spot(pointer, Vec::new()) })
+}
+
+/// The nearest ruler tick to spread point `sp` along a guide of `orientation`'s axis, in spread
+/// coordinates: the horizontal ruler's (the piece under the point) where that axis runs across the
+/// screen, else the vertical ruler's. `None` when the ruler has no ticks there.
+fn ruler_tick_of(doc: &Document, slot: &SpreadSlot, orientation: designcraft_doc::Orientation, zoom: f64, sp: Point) -> Option<f64> {
+    let vertical = matches!(orientation, designcraft_doc::Orientation::Vertical);
+    // A quarter-turned spread runs its x axis down the screen.
+    let across = vertical == slot.rotation.is_multiple_of(2);
+    let c = slot.to_canvas(sp);
+    let pieces = ruler_pieces_of(doc, slot, doc.zero_point());
+    let step = |unit: designcraft_geom::Unit| {
+        let (major, sub) = unit.ruler_ticks(zoom);
+        let step = major / f64::from(sub.max(1));
+        (step.is_finite() && step > 0.0).then_some(step)
+    };
+    let tick = |v: f64, o: f64, step: f64| o + ((v - o) / step).round() * step;
+    let c = if across {
+        let &(_, _, o) = pieces.iter().find(|(from, to, _)| *from <= c.x && c.x < *to).or(pieces.first())?;
+        Point::new(tick(c.x, o.x, step(doc.settings.horizontal_units)?), c.y)
+    } else {
+        let o = pieces.first()?.2;
+        Point::new(c.x, tick(c.y, o.y, step(doc.settings.vertical_units)?))
+    };
+    let s = slot.to_spread(c);
+    Some(if vertical { s.x } else { s.y }).filter(|v| v.is_finite())
+}
+
+/// The guide under a screen point (within 3 px), as (spread, page, index, orientation).
+pub(super) fn guide_at(app: &DesignApp, xf: &Xf, p: Pos2) -> Option<(designcraft_doc::SpreadRef, usize, usize, designcraft_doc::Orientation)> {
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let cp = xf.to_canvas(p);
+    let tol = 3.0 / xf.zoom;
+    for slot in &layout.slots {
+        let sp = st.doc.spread(slot.spread)?;
+        let local = slot.to_spread(cp);
+        for (pi, pg) in sp.pages.iter().enumerate() {
+            let pr = if pg.guides.iter().any(|g| g.spread) { slot.xf.inverse().transform_rect_bbox(layout.pasteboard) } else { pg.bounds() };
+            for (gi, g) in pg.guides.iter().enumerate() {
+                if !g.editable_in(&st.doc) {
+                    continue;
+                }
+                let r = if g.spread { pr } else { pg.bounds() };
+                let hit = match g.orientation {
+                    designcraft_doc::Orientation::Horizontal => (local.y - g.position).abs() <= tol && local.x >= r.x0 && local.x <= r.x1,
+                    designcraft_doc::Orientation::Vertical => (local.x - g.position).abs() <= tol && local.y >= r.y0 - tol && local.y <= r.y1 + tol,
+                };
+                if hit && !g.locked {
+                    return Some((slot.spread, pi, gi, g.orientation));
+                }
+            }
+        }
+    }
+    None
+}
+
+/// A primary press at `o` on a ruler starts a new guide; on a guide it selects and grabs it.
+fn begin_guide_drag(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf, o: Pos2) -> Option<GuideDrag> {
+    let full = resp.rect;
+    if full.contains(o) && !rect.contains(o) {
+        // In a ruler (not the corner).
+        let orientation = if o.y < rect.min.y && o.x >= rect.min.x {
+            Some(designcraft_doc::Orientation::Horizontal)
+        } else if o.x < rect.min.x && o.y >= rect.min.y {
+            Some(designcraft_doc::Orientation::Vertical)
+        } else {
+            None
+        };
+        if let Some(orientation) = orientation {
+            return Some(GuideDrag { orientation, from: None, at: Some(o), mods: egui::Modifiers::NONE });
+        }
+    } else if rect.contains(o)
+        && matches!(app.session.tool_id(), "selection" | "directSelection")
+        && let Some((r, pi, gi, orientation)) = guide_at(app, xf, o)
+    {
+        let shift = ui.input(|i| i.modifiers.shift);
+        // A press on a guide selects it (Shift: on release, as a click adds or removes it).
+        let selected = app.session.active().is_some_and(|st| st.selection.guides.contains(&GuideSel { spread: r, page: pi, index: gi }));
+        if !shift && !selected {
+            let _ = app.run("guide.select", json!({"spread": r, "page": pi, "index": gi}));
+        }
+        ui.data_mut(|d| d.insert_temp(egui::Id::unique(GUIDE_PRESS), GuidePress { origin: o, shift }));
+        return Some(GuideDrag { orientation, from: Some((r, pi, gi)), at: Some(o), mods: egui::Modifiers::NONE });
+    }
+    None
+}
+
+/// Ruler guides: drag one out of a ruler, drag an existing one (Selection tools) to move it, drop
+/// it back on a ruler to delete it. A press near an unlocked guide takes it even over an object:
+/// the guide is selected and the object is not. Returns true from the press to the release, so
+/// the tools never see that press.
+pub(super) fn guide_drag(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf) -> bool {
+    let id = egui::Id::unique(GUIDE_DRAG);
+    let (pressed, released, origin, latest) =
+        ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.press_origin(), i.pointer.latest_pos()));
+    let mut drag: Option<GuideDrag> = ui.data(|d| d.get_temp(id));
+    if drag.is_none() && pressed && resp.hovered() && app.ui.guides && !app.ui.guides_locked {
+        let Some(o) = origin else { return false };
+        drag = begin_guide_drag(app, ui, resp, rect, xf, o);
+    }
+    let Some(mut g) = drag else { return false };
+    if let Some(p) = latest {
+        g.at = Some(p);
+    }
+    g.mods = ui.input(|i| i.modifiers);
+    if !released {
+        ui.ctx().set_cursor_icon(match g.orientation {
+            designcraft_doc::Orientation::Horizontal => egui::CursorIcon::ResizeVertical,
+            designcraft_doc::Orientation::Vertical => egui::CursorIcon::ResizeHorizontal,
+        });
+        ui.data_mut(|d| d.insert_temp(id, g));
+        return true;
+    }
+    ui.data_mut(|d| d.remove::<GuideDrag>(id));
+    let press: Option<GuidePress> = ui.data_mut(|d| {
+        let press = d.get_temp(egui::Id::unique(GUIDE_PRESS));
+        d.remove::<GuidePress>(egui::Id::unique(GUIDE_PRESS));
+        press
+    });
+    let Some(p) = g.at else { return true };
+    if let (Some((r, pi, gi)), Some(press)) = (g.from, press)
+        && (p - press.origin).length() <= GUIDE_CLICK_SLOP
+    {
+        // A click: the guide is selected (at the press); Shift adds it or removes it.
+        if press.shift {
+            let _ = app.run("guide.select", json!({"spread": r, "page": pi, "index": gi, "toggle": true}));
+        }
+        return true;
+    }
+    // Dragging one of several selected guides moves (or deletes) them all.
+    let group = g.from.is_some_and(|(spread, page, index)| drags_group(app, GuideSel { spread, page, index }));
+    let on_canvas = rect.contains(p);
+    // Placed where the preview showed it (snapped); the page under the pointer owns a new guide.
+    let target = guide_spot(app, xf, &g).and_then(|spot| {
+        let spread = app.session.active()?.doc.spread(spot.spread)?;
+        let on_page = spread.pages.iter().position(|pg| pg.bounds().contains(spot.pointer));
+        Some((spot.spread, spot.sp, on_page))
+    });
+    let pos_of = |sp: Point| match g.orientation {
+        designcraft_doc::Orientation::Horizontal => sp.y,
+        designcraft_doc::Orientation::Vertical => sp.x,
+    };
+    let orient = match g.orientation {
+        designcraft_doc::Orientation::Horizontal => "horizontal",
+        designcraft_doc::Orientation::Vertical => "vertical",
+    };
+    match (g.from, on_canvas, target) {
+        // Dropped back on a ruler: delete.
+        (Some(_), false, _) if group => {
+            let _ = app.run("guide.delete", json!({}));
+        }
+        (Some((r, pi, gi)), false, _) => {
+            let _ = app.run("guide.delete", json!({"spread": r, "page": pi, "index": gi}));
+        }
+        (Some((r, _, _)), true, Some((tr, _, _))) if tr == r && group => {
+            if let Some((dx, dy)) = press.and_then(|press| guide_drag_delta(app, xf, &g, press.origin)) {
+                let _ = app.run("guide.moveBy", json!({"dx": dx, "dy": dy}));
+            }
+        }
+        (Some((r, pi, gi)), true, Some((tr, sp, _))) if tr == r => {
+            let _ = app.run("guide.move", json!({"spread": r, "page": pi, "index": gi, "position": pos_of(sp)}));
+        }
+        (None, true, Some((r, sp, on_page))) => {
+            // The Page tool draws liquid guides from the rulers.
+            let liquid = app.session.tool_id() == "page" && on_page.is_some();
+            let mut params =
+                json!({"spread": r, "orientation": orient, "position": pos_of(sp), "at": sp.x, "spreadGuide": on_page.is_none(), "liquid": liquid});
+            if let Some(pi) = on_page {
+                params["page"] = json!(pi);
+            }
+            let _ = app.run("guide.add", params);
+        }
+        _ => {}
+    }
+    true
+}
+
+/// Whether dragging guide `from` takes the other selected guides along: it is one of several
+/// selected.
+fn drags_group(app: &DesignApp, from: GuideSel) -> bool {
+    app.session.active().is_some_and(|st| st.selection.guides.len() > 1 && st.selection.guides.contains(&from))
+}
+
+/// How far a drag of the existing guide `g.from`, pressed at `origin` (screen), moves guides, in
+/// spread coordinates: the dragged guide goes to its [`guide_spot`], the other selected guides as
+/// far along their own axis as it moved. `None` while the pointer is not over the guide's own
+/// spread, where a drop leaves it in place.
+pub(super) fn guide_drag_delta(app: &DesignApp, xf: &Xf, g: &GuideDrag, origin: Pos2) -> Option<(f64, f64)> {
+    let (r, pi, gi) = g.from?;
+    let spot = guide_spot(app, xf, g)?;
+    if spot.spread != r {
+        return None;
+    }
+    let sp = spot.sp;
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let start = layout.slot(r)?.to_spread(xf.to_canvas(origin));
+    let at = st.doc.spread(r)?.pages.get(pi)?.guides.get(gi)?.position;
+    let (dx, dy) = match g.orientation {
+        designcraft_doc::Orientation::Vertical => (sp.x - at, sp.y - start.y),
+        designcraft_doc::Orientation::Horizontal => (sp.x - start.x, sp.y - at),
+    };
+    (dx.is_finite() && dy.is_finite()).then_some((dx, dy))
+}
+
+/// Guides being dragged on the canvas and how far they have moved (spread coordinates).
+pub(super) struct MovingGuides {
+    pub(super) guides: std::collections::HashSet<GuideSel>,
+    pub(super) dx: f64,
+    pub(super) dy: f64,
+}
+
+/// What a drag of an existing guide moves, for the preview: the dragged guide, or every selected
+/// guide when it is one of several selected. `None` before the drag leaves the click distance,
+/// over a ruler (a drop there deletes) and off the guide's spread.
+pub(super) fn moving_guides(app: &DesignApp, xf: &Xf, rect: Rect, g: &GuideDrag, press: GuidePress) -> Option<MovingGuides> {
+    let (spread, page, index) = g.from?;
+    let p = g.at?;
+    if !rect.contains(p) || (p - press.origin).length() <= GUIDE_CLICK_SLOP {
+        return None;
+    }
+    let (dx, dy) = guide_drag_delta(app, xf, g, press.origin)?;
+    let from = GuideSel { spread, page, index };
+    let guides = if drags_group(app, from) { app.session.active()?.selection.guides.iter().copied().collect() } else { [from].into_iter().collect() };
+    Some(MovingGuides { guides, dx, dy })
+}
+
+/// An object is under screen point `p` where the Selection tool would pick it (a document
+/// spread's, or a parent spread's while editing parents): it takes the press before the guides
+/// behind it.
+pub(super) fn over_item(app: &DesignApp, xf: &Xf, p: Pos2) -> bool {
+    let Some(st) = app.session.active() else { return false };
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let cx = designcraft_tools::ToolContext {
+        doc: &st.doc,
+        selection: &st.selection,
+        cache: &app.session.cache,
+        layout: &layout,
+        zoom: xf.zoom.max(1e-6),
+        layer: st.active_layer,
+        snap: app.ui.snap_view(),
+        unit: app.ui.units,
+        stroke_in_front: false,
+    };
+    cx.hit(xf.to_canvas(p)).is_some()
+}
diff --git a/crates/ui-egui/src/canvas/ime.rs b/crates/ui-egui/src/canvas/ime.rs
new file mode 100644
index 000000000..418d1f25a
--- /dev/null
+++ b/crates/ui-egui/src/canvas/ime.rs
@@ -0,0 +1,421 @@
+use super::input::{keyboard_pane, modal_open};
+use super::{CommittedText, DesignApp, IMESurroundingText, ImeMutation, ImeMutationStamp, ImeObservation, ImeTarget, ImeTextContext, Rect, Xf};
+
+/// Has the composition these events belong to already ended outside the IME in this batch?
+///
+/// A pointer press and a document switch end the composition and type its marked text where the
+/// caret then is, but the system IME still sends the Commit (or a delete) for the copy it holds.
+/// Applying those at the new caret would type the text twice, put it in another story or document,
+/// or delete text there, so they are dropped and the IME is told to drop its copy.
+fn ime_composition_ended(app: &DesignApp) -> bool {
+    app.ime_marked.is_some() && !app.session.tool_composing()
+}
+
+/// Did the composition move to another owner (another story, cell or document state) since it
+/// began? A late commit then belongs to the old one, not the caret that is there now.
+fn ime_composition_moved(app: &DesignApp) -> bool {
+    let Some(recorded) = app.ime_target else { return false };
+    app.session.ime_text_context().is_some_and(|context| ime_target(&context) != recorded)
+}
+
+/// Drop events for a composition that already ended or moved, keeping what was typed.
+fn drop_stale_ime_events(app: &mut DesignApp) {
+    app.ime_marked = None;
+    app.ime_target = None;
+    app.pending_ime_delete = None;
+    app.ime_discard = true;
+    // The host must interrupt the system IME's copy in this pass too, as for a click away.
+    app.ime_interrupt = true;
+}
+
+/// One input method event for the text caret: marked text previews in the story, a commit types.
+pub(super) fn ime_event(app: &mut DesignApp, ctx: &egui::Context, e: egui::ImeEvent, vi: designcraft_engine::ViewInfo) {
+    let r = match e {
+        egui::ImeEvent::Preedit { text, active_range_chars } => {
+            if text.is_empty() {
+                app.ime_marked = None;
+                app.ime_target = None;
+            } else {
+                // The composition's owner at its first marked text: a commit may only land there.
+                if app.ime_marked.is_none() {
+                    app.ime_target = app.session.ime_text_context().map(|c| ime_target(&c));
+                }
+                app.ime_marked = Some(text.clone());
+            }
+            app.session.tool_preedit(&text, active_range_chars, vi).map_err(|e| e.to_string())
+        }
+        // A composition that already ended or moved in this batch owns nothing any more.
+        egui::ImeEvent::Commit(_) | egui::ImeEvent::DeleteSurrounding { .. } | egui::ImeEvent::DeleteSurroundingBytes { .. }
+            if app.ime_interrupt || ime_composition_ended(app) || ime_composition_moved(app) =>
+        {
+            // Dropping a stale delete clears the marked target. Keep the pass's interrupt latch
+            // authoritative so the commit following that delete cannot become a fresh insertion.
+            drop_stale_ime_events(app);
+            Ok(())
+        }
+        // A bare line break confirms the composition (Enter with some IMEs): the marked text, not
+        // a new paragraph.
+        egui::ImeEvent::Commit(t) if t == "\n" || t == "\r" => {
+            finish_pending_ime_delete(app, ctx);
+            keep_marked_text(app);
+            Ok(())
+        }
+        egui::ImeEvent::Commit(t) => ime_commit(app, ctx, &t, vi),
+        // The web text agent's corrections and mobile Backspace: characters around the caret go.
+        // These are held for the Commit in the same batch so both mutations are one undo step.
+        egui::ImeEvent::DeleteSurrounding { before_chars, after_chars } => {
+            app.pending_ime_delete = Some((before_chars, after_chars, false));
+            Ok(())
+        }
+        egui::ImeEvent::DeleteSurroundingBytes { before_bytes, after_bytes } => {
+            app.pending_ime_delete = Some((before_bytes, after_bytes, true));
+            Ok(())
+        }
+        // `Enabled` and `Disabled` carry nothing: the IME is on while the observation sets `ime`.
+        _ => Ok(()),
+    };
+    if let Err(e) = r {
+        app.status(e);
+    }
+    app.after_engine();
+}
+
+/// The bounded committed snapshot and stable target just before an IME mutation.
+struct ImeBefore {
+    target: ImeTarget,
+    stamp: ImeMutationStamp,
+    snapshot: IMESurroundingText,
+    document_uid: u64,
+    document_epoch: u64,
+    story: designcraft_doc::StoryId,
+    cell: Option<designcraft_doc::CellAddr>,
+    anchor: usize,
+    focus: usize,
+}
+
+/// Build a stable owner from the document uid, story and cell identity, plus the document epoch.
+fn ime_target(context: &ImeTextContext<'_>) -> ImeTarget {
+    let owner = egui::Id::unique(("designcraft-ime", context.document_uid, context.story.0, context.cell.map(|c| (c.table, c.row, c.col))));
+    ImeTarget::new(owner, context.document_epoch)
+}
+
+/// Capture the bounded committed surrounding text, mutation stamp, target and selection identity before an IME edit.
+fn capture_ime_before(app: &DesignApp) -> Option<ImeBefore> {
+    let context = app.session.ime_text_context()?;
+    let snapshot = IMESurroundingText::from_text(context.text, context.focus, context.anchor, None);
+    let stamp = ImeMutationStamp::from_surrounding_text(snapshot.clone());
+    Some(ImeBefore {
+        target: ime_target(&context),
+        stamp,
+        snapshot,
+        document_uid: context.document_uid,
+        document_epoch: context.document_epoch,
+        story: context.story,
+        cell: context.cell,
+        anchor: context.anchor,
+        focus: context.focus,
+    })
+}
+
+/// Fold a pending delete-surrounding plus commit into one engine operation, clear marked/target state and record the change.
+fn ime_commit(app: &mut DesignApp, ctx: &egui::Context, text: &str, vi: designcraft_engine::ViewInfo) -> Result<(), String> {
+    let pending = app.pending_ime_delete.take();
+    let before = capture_ime_before(app);
+    let r = if let Some((before_bytes, after_bytes, bytes)) = pending {
+        app.session.ime_commit_after_delete(text, vi, before_bytes, after_bytes, bytes)
+    } else {
+        app.session.ime_commit(text, vi)
+    };
+    app.ime_marked = None;
+    app.ime_target = None;
+    let r = r.map_err(|e| e.to_string());
+    if let Ok(mutation) = &r {
+        note_ime_change(app, ctx, before, mutation.as_ref(), pending);
+    }
+    r.map(|_| ())
+}
+
+/// Apply a pending IME delete unless its composition ended or moved; record the mutation and drop stale marked text.
+pub(super) fn finish_pending_ime_delete(app: &mut DesignApp, ctx: &egui::Context) {
+    let Some((before_bytes, after_bytes, bytes)) = app.pending_ime_delete.take() else { return };
+    if ime_composition_ended(app) || ime_composition_moved(app) {
+        // The composition ended earlier in this batch: its delete belongs to the copy the system
+        // IME still holds, not to the caret that is there now.
+        drop_stale_ime_events(app);
+        return;
+    }
+    let before = capture_ime_before(app);
+    match app.session.ime_delete_surrounding(before_bytes, after_bytes, bytes) {
+        Ok(mutation) => {
+            // The delete drops the composition (its marked text is not typed): the IME's copy goes.
+            if !app.session.tool_composing() && app.ime_marked.take().is_some() {
+                app.ime_discard = true;
+            }
+            if !app.session.tool_composing() {
+                app.ime_target = None;
+            }
+            note_ime_change(app, ctx, before, mutation.as_ref(), Some((before_bytes, after_bytes, bytes)));
+        }
+        Err(e) => app.status(e.to_string()),
+    }
+    app.after_engine();
+}
+
+/// Record the origin of a successful IME mutation.
+///
+/// A receipt is earned only when the engine reported the exact mutation it applied and the bounded
+/// committed snapshot agrees with it. Smart quotes, autocorrect, tracked changes and any other
+/// application transformation therefore report `Other`, as do failed, stale and no-op mutations.
+fn note_ime_change(
+    app: &mut DesignApp,
+    ctx: &egui::Context,
+    before: Option<ImeBefore>,
+    mutation: Option<&ImeMutation>,
+    delete: Option<(usize, usize, bool)>,
+) {
+    let Some(before) = before else { return };
+    let Some(after) = app.session.ime_text_context() else {
+        let viewport = ctx.viewport_id();
+        app.ime_tracker.note_application_change(viewport, ctx.cumulative_frame_nr_for(viewport), before.target);
+        return;
+    };
+    if ime_target(&after) != before.target {
+        return;
+    }
+    let after_snapshot = IMESurroundingText::from_text(after.text, after.focus, after.anchor, None);
+    if &after_snapshot == before.stamp.surrounding_text() {
+        return;
+    }
+    let after_stamp = ImeMutationStamp::from_surrounding_text(after_snapshot.clone());
+    let viewport = ctx.viewport_id();
+    let frame_nr = ctx.cumulative_frame_nr_for(viewport);
+    if mutation.is_some_and(|m| ime_change_is_exact(&before, &after_snapshot, m, delete)) {
+        app.ime_tracker.note_input_method_apply(viewport, frame_nr, before.target, before.stamp, after_stamp);
+    } else {
+        app.ime_tracker.note_application_change(viewport, frame_nr, before.target);
+    }
+}
+
+/// Does the bounded post-mutation snapshot agree with the mutation the engine applied?
+///
+/// The expected result is built from the reported ranges and typed text — absolute byte offsets in
+/// the whole story, not the truncated outgoing window — so a delete that reaches past the window
+/// still matches. Every visible byte of the after window must agree with it, but a mutation the
+/// after window does not overlap at all (a delete longer than the window) rests on the engine's
+/// report alone, which is exact because the engine computed it from the whole story. A rewrite,
+/// tracked changes or a replaced story is not a receipt.
+fn ime_change_is_exact(before: &ImeBefore, after: &IMESurroundingText, m: &ImeMutation, delete: Option<(usize, usize, bool)>) -> bool {
+    // The same target, selection and text the receipt was captured around.
+    if m.document_uid != before.document_uid
+        || m.document_epoch != before.document_epoch
+        || m.story != before.story
+        || m.cell != before.cell
+        || m.anchor_before != before.anchor
+        || m.focus_before != before.focus
+    {
+        return false;
+    }
+    let (Some(before_payload), Some(after_payload)) = (before.snapshot.available(), after.available()) else { return false };
+    let before_text = before_payload.text.as_str();
+    let after_text = after_payload.text.as_str();
+    let selection = m.anchor_before.min(m.focus_before)..m.anchor_before.max(m.focus_before);
+    // The reported deletion adjoins the selection, is inside the text, and exists only for a
+    // delete-surrounding event. Its exact extent is the engine's: it computes the ranges from the
+    // whole story with the requested counts.
+    if m.deleted_before.end != selection.start
+        || m.deleted_after.start != selection.end
+        || m.deleted_before.start > selection.start
+        || m.deleted_after.end > m.text_len_before
+    {
+        return false;
+    }
+    if delete.is_none() && (!m.deleted_before.is_empty() || !m.deleted_after.is_empty()) {
+        return false;
+    }
+    // The story changed by exactly the removed bytes, the replaced selection and the typed text:
+    // tracked changes and an inserted paragraph return (a table anchor) break this identity.
+    let replaced = if m.inserted.is_empty() { 0 } else { selection.len() };
+    let expected_len = m
+        .text_len_before
+        .saturating_sub(m.deleted_before.len())
+        .saturating_sub(m.deleted_after.len())
+        .saturating_sub(replaced)
+        .saturating_add(m.inserted.len());
+    if m.text_len_after != expected_len {
+        return false;
+    }
+    // A commit collapses the caret after the typed text; a delete keeps the selection, shifted.
+    let (want_anchor, want_focus) = if m.inserted.is_empty() {
+        (m.anchor_before.saturating_sub(m.deleted_before.len()), m.focus_before.saturating_sub(m.deleted_before.len()))
+    } else {
+        let at = m.deleted_before.start + m.inserted.len();
+        (at, at)
+    };
+    if m.anchor_after != want_anchor || m.focus_after != want_focus {
+        return false;
+    }
+    // The text around the caret, rebuilt from the reported mutation. A snapshot's window starts
+    // before its selection's start by the selection's own offset in that window.
+    let before_win = selection.start.saturating_sub(before_payload.cursor.min(before_payload.anchor));
+    let after_selection = m.anchor_after.min(m.focus_after)..m.anchor_after.max(m.focus_after);
+    let after_win = after_selection.start.saturating_sub(after_payload.cursor.min(after_payload.anchor));
+    if after_win.saturating_add(after_payload.cursor) != m.focus_after || after_win.saturating_add(after_payload.anchor) != m.anchor_after {
+        return false;
+    }
+    let before_end = before_win.saturating_add(before_text.len());
+    let after_end = after_win.saturating_add(after_text.len());
+    if before_end > m.text_len_before || after_end > m.text_len_after {
+        return false;
+    }
+    let kept = if m.inserted.is_empty() { selection.len() } else { 0 };
+    let inserted_post = m.deleted_before.start + kept;
+    let tail_post = inserted_post + m.inserted.len();
+    let compared = (|| -> Option<usize> {
+        let mut n = 0usize;
+        n += ime_compare_kept(before_text, before_win..before_end, 0..m.deleted_before.start, 0, after_text, after_win..after_end)?;
+        if kept > 0 {
+            n += ime_compare_kept(before_text, before_win..before_end, selection.clone(), m.deleted_before.start, after_text, after_win..after_end)?;
+        }
+        n += ime_compare_window(after_text, after_win..after_end, &(inserted_post..tail_post), &m.inserted)?;
+        n += ime_compare_kept(
+            before_text,
+            before_win..before_end,
+            m.deleted_after.end..m.text_len_before,
+            tail_post,
+            after_text,
+            after_win..after_end,
+        )?;
+        Some(n)
+    })();
+    compared.is_some()
+}
+
+/// Compare one unchanged piece of the story: the pre-mutation bytes `pre` (absolute) appear at
+/// post-mutation offset `post_start`. Returns the number of bytes compared, or `None` on a
+/// mismatch. Bytes outside the bounded before window cannot be checked and are skipped.
+fn ime_compare_kept(
+    before_text: &str,
+    before_win: std::ops::Range<usize>,
+    pre: std::ops::Range<usize>,
+    post_start: usize,
+    after_text: &str,
+    after_win: std::ops::Range<usize>,
+) -> Option<usize> {
+    let from = pre.start.max(before_win.start);
+    let to = pre.end.min(before_win.end);
+    if from >= to {
+        return Some(0);
+    }
+    let expected = before_text.get(from - before_win.start..to - before_win.start)?;
+    let post = post_start + (from - pre.start)..post_start + (to - pre.start);
+    ime_compare_window(after_text, after_win, &post, expected)
+}
+
+/// Compare `expected`, which begins at absolute post-mutation offset `post.start`, with what the
+/// after window shows of it. Returns the number of bytes compared; `None` when they differ.
+fn ime_compare_window(after_text: &str, after_win: std::ops::Range<usize>, post: &std::ops::Range<usize>, expected: &str) -> Option<usize> {
+    let from = post.start.max(after_win.start);
+    let to = post.end.min(after_win.end);
+    if from >= to {
+        return Some(0);
+    }
+    let actual = after_text.get(from - after_win.start..to - after_win.start)?;
+    let skip = from - post.start;
+    let want = expected.get(skip..skip + (to - from))?;
+    (actual == want).then_some(to - from)
+}
+
+/// End a composition outside the IME (a click away, the canvas losing the keyboard): the marked
+/// text stays as typed, and the system IME is told to drop its copy.
+pub(crate) fn keep_marked_text(app: &mut DesignApp) {
+    if app.ime_marked.take().is_some() {
+        app.ime_discard = true;
+    }
+    app.ime_target = None;
+    if app.session.tool_composing() {
+        if let Err(e) = app.session.end_composition() {
+            app.status(e.to_string());
+        }
+        app.after_engine();
+    }
+}
+
+/// What the canvas found for this viewport pass, observed once at the end of the pass.
+pub(crate) struct CanvasIme {
+    /// The viewport it was found in: the second window's canvas runs inside the root's pass and
+    /// must not consume the root's observation.
+    viewport: egui::ViewportId,
+    /// The caret's screen rectangle, when the canvas owns the text caret this pass.
+    caret: Option<Rect>,
+}
+
+/// While the text caret is in the canvas, let the system IME compose (egui-winit allows it only in
+/// frames that set `ime`; the web build focuses its hidden text input then) and keep the candidate
+/// window at the caret, through zoom, scrolling, view rotation and vertical text.
+///
+/// The caret is only recorded here: the observation waits for the end of the viewport's pass, so
+/// a command or a field that takes the keyboard in a later section of the UI is included.
+pub(super) fn ime_canvas_pass(app: &mut DesignApp, ctx: &egui::Context, xf: &Xf) {
+    if !keyboard_pane(app) {
+        // Both panes see the same viewport and events. The focused pane owns this viewport's one
+        // observation; observing for the other would reset the context every split-window frame.
+        return;
+    }
+    // A text field, dialog or Quick Apply has the keyboard: egui's own text editing serves the IME.
+    let ours = app.session.wants_text() && !ctx.text_edit_focused() && !modal_open(app);
+    let caret = if ours { app.session.tool_ime_caret(app.view_info()) } else { None };
+    let caret = caret.map(|(a, b)| Rect::from_two_pos(xf.to_screen(a), xf.to_screen(b)).expand(1.0));
+    app.canvas_ime = caret.is_some();
+    app.ime_canvas = Some(CanvasIme { viewport: ctx.viewport_id(), caret });
+}
+
+/// Observe the IME once for this viewport pass, after every command and focus change it applied.
+pub(crate) fn ime_observe(app: &mut DesignApp, ctx: &egui::Context) {
+    let viewport = ctx.viewport_id();
+    if app.ime_canvas.as_ref().is_none_or(|canvas| canvas.viewport != viewport) {
+        return;
+    }
+    let Some(canvas) = app.ime_canvas.take() else { return };
+    // A text field, dialog or Quick Apply that took the keyboard later in the pass owns the IME.
+    let ours = canvas.caret.is_some() && !ctx.text_edit_focused() && !modal_open(app);
+    let Some(r) = canvas.caret.filter(|_| ours) else {
+        // The IME goes away with its marked text: keep that text as typed, like a click away.
+        keep_marked_text(app);
+        app.ime_tracker.observe(viewport, None);
+        return;
+    };
+    // The composition ended outside the IME (a click, a command): the IME drops what it has marked.
+    let interrupt = app.ime_interrupt || (app.ime_marked.is_some() && !app.session.tool_composing());
+    app.ime_interrupt = false;
+    if interrupt {
+        app.ime_marked = None;
+        app.ime_target = None;
+        app.ime_discard = true;
+    }
+    app.canvas_ime = true;
+    // One observation per viewport pass, after this pass's events and commands. The committed
+    // text excludes any active pre-edit, and the tracker copies only the bounded IME window.
+    let update = match app.session.ime_text_context() {
+        Some(context) => {
+            let observation = ImeObservation::new(ctx.cumulative_frame_nr_for(viewport), ctx.cumulative_pass_nr_for(viewport), ime_target(&context))
+                .purpose(egui::IMEPurpose::Normal)
+                .committed(Some(CommittedText::new(context.text, context.focus, context.anchor)));
+            app.ime_tracker.observe(viewport, Some(observation))
+        }
+        None => app.ime_tracker.observe(viewport, None),
+    };
+    let Some(update) = update else { return };
+    ctx.output_mut(|o| {
+        o.ime = Some(egui::output::IMEOutput {
+            owner: update.owner,
+            context_generation: update.context_generation,
+            purpose: update.purpose,
+            rect: r,
+            cursor_rect: r,
+            should_interrupt_composition: interrupt,
+            reset_request: None,
+            change_cause: update.change_cause,
+            surrounding_text: update.surrounding_text,
+        });
+    });
+}
diff --git a/crates/ui-egui/src/canvas/input.rs b/crates/ui-egui/src/canvas/input.rs
new file mode 100644
index 000000000..3e2f32659
--- /dev/null
+++ b/crates/ui-egui/src/canvas/input.rs
@@ -0,0 +1,549 @@
+use super::column_guides::{COLUMN_DRAG, ColumnDrag, column_guide_drag};
+use super::guides::guide_drag;
+use super::ime::{finish_pending_ime_delete, ime_event};
+use super::rulers::zero_point_drag;
+use super::scroll::{mods, navigation_space, pan, spring_zoom_input, spring_zoom_mode, wheel_alt};
+use super::view::zoom_at;
+use super::{
+    CanvasLayout, Clicks, Cursor, DVec2, DesignApp, Item, Mods, Point, PointerEvent, PointerKind, Pos2, Rect, ScreenMode, SpreadRef, Stroke,
+    StrokeKind, Tokens, ToolKey, Xf, json, pos2, vec2,
+};
+
+/// Whether the pointer this canvas's window last saw is in another of the app's windows: a
+/// floating panel's OS window, or the other window of New Window.
+pub(super) fn pointer_elsewhere(app: &DesignApp, ctx: &egui::Context) -> bool {
+    let mut others = crate::panel_docking::native_viewports(app, ctx);
+    if app.second_window && !ctx.embed_viewports() {
+        others.extend([egui::ViewportId::ROOT, crate::second_window_viewport()]);
+    }
+    crate::cursors::pointer_elsewhere(ctx, &others)
+}
+
+/// The loaded text cursor's badge beside the system cursor: lines of text, a closed chain
+/// (a click threads) or a broken one (a click unthreads). Drawn in code.
+pub(super) fn draw_cursor_badge(painter: &egui::Painter, p: Pos2, c: Cursor, t: &Tokens) {
+    if !matches!(c, Cursor::LoadedText | Cursor::ThreadLink | Cursor::Unthread) {
+        return;
+    }
+    let r = Rect::from_min_size(p + vec2(12.0, 12.0), vec2(20.0, 16.0));
+    painter.rect_filled(r, 3.0, t.measure_bg);
+    let ink = Stroke::new(1.5, t.measure_text);
+    let c0 = r.center();
+    match c {
+        Cursor::LoadedText => {
+            for (dy, w) in [(-4.0, 12.0), (0.0, 12.0), (4.0, 8.0)] {
+                painter.line_segment([pos2(c0.x - 6.0, c0.y + dy), pos2(c0.x - 6.0 + w, c0.y + dy)], ink);
+            }
+        }
+        _ => {
+            let gap = if c == Cursor::Unthread { 2.5 } else { -2.0 };
+            for side in [-1.0, 1.0] {
+                let link = Rect::from_center_size(pos2(c0.x + side * (3.5 + gap / 2.0), c0.y), vec2(9.0, 6.0));
+                painter.rect_stroke(link, 3.0, ink, StrokeKind::Middle);
+            }
+            if c == Cursor::Unthread {
+                painter.line_segment([pos2(c0.x + 2.0, c0.y - 6.0), pos2(c0.x - 2.0, c0.y + 6.0)], ink);
+            }
+        }
+    }
+}
+
+/// A text field had keyboard focus when this frame began, per window: egui keeps one focus per
+/// viewport, so a field focused in the main window must not mute the second window's canvas.
+fn field_focused_id(ctx: &egui::Context) -> egui::Id {
+    egui::Id::unique("canvas_field_focused").with(ctx.viewport_id())
+}
+
+/// Called before the panels draw. A panel field gives up focus on Enter or Tab while it draws,
+/// before the canvas: without this the canvas would take that same key for the text.
+pub fn begin_frame(ctx: &egui::Context) {
+    let (id, focused) = (field_focused_id(ctx), ctx.text_edit_focused());
+    ctx.data_mut(|d| d.insert_temp(id, focused));
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let now = ctx.input(|i| i.modifiers);
+        // The modifiers last frame ended with are the ones this frame's events began with.
+        ctx.data_mut(|d| {
+            let (_, end) = d.get_temp::<(egui::Modifiers, egui::Modifiers)>(modifiers_id()).unwrap_or((now, now));
+            d.insert_temp(modifiers_id(), (end, now));
+        });
+    }
+}
+
+/// (held when this frame's events began, held after them).
+#[cfg(not(target_arch = "wasm32"))]
+fn modifiers_id() -> egui::Id {
+    egui::Id::unique("canvas-frame-modifiers")
+}
+
+/// A canvas context menu asked for by a right-click; `open` until the popup is open after a frame.
+#[derive(Clone, Copy, Debug)]
+struct MenuRequest {
+    kind: crate::menus::ContextMenu,
+    open: bool,
+}
+
+/// The popup id of the canvas context menu in split-view pane `pane`.
+fn context_menu_id(pane: u8) -> egui::Id {
+    egui::Id::unique(("canvas_context_menu", pane))
+}
+
+/// Was a canvas context menu open (in either pane of this window) when this frame began?
+/// Pane 0 shows its menu, which a click or Escape may close, before pane 1 handles input; that
+/// click or key still belongs to the menu. Popups are per window (viewport), and so is input.
+pub fn context_menu_open(ctx: &egui::Context) -> bool {
+    let pass = ctx.cumulative_pass_nr();
+    let key = egui::Id::unique("canvas_context_menu_open").with(ctx.viewport_id());
+    if let Some((p, open)) = ctx.data(|d| d.get_temp::<(u64, bool)>(key))
+        && p == pass
+    {
+        return open;
+    }
+    let open = (0..2).any(|pane| egui::Popup::is_id_open(ctx, context_menu_id(pane)));
+    ctx.data_mut(|d| d.insert_temp(key, (pass, open)));
+    open
+}
+
+/// Shows the context menu a right-click asked for. A right-click while the menu is open closes it
+/// in that frame (it was a click outside the menu), so the request stays until a frame ends with
+/// the menu open: it reopens in the next frame where the new click was.
+pub(super) fn context_menu(app: &mut DesignApp, ui: &egui::Ui, resp: &egui::Response) {
+    let id = context_menu_id(app.pane);
+    let Some(req) = ui.data(|d| d.get_temp::<MenuRequest>(id)) else { return };
+    egui::Popup::menu(resp)
+        .id(id)
+        .open_memory(req.open.then_some(egui::SetOpenCommand::Bool(true)))
+        .at_pointer_fixed()
+        .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
+        .show(|ui| crate::menus::context_menu(app, ui, req.kind));
+    if req.open {
+        if egui::Popup::is_id_open(ui.ctx(), id) {
+            ui.data_mut(|d| d.insert_temp(id, MenuRequest { open: false, ..req }));
+        } else {
+            ui.ctx().request_repaint();
+        }
+    }
+}
+
+/// Prepares a right-click at canvas point `p`: picks the menu and the selection it acts on.
+/// - Typing: a click in a text frame places the caret there as a left click would, except
+///   inside the selected text, which stays selected; elsewhere the text is left as it is.
+/// - On an object: it is selected first unless it already is, as the Selection tool would.
+/// - On nothing: the selection stays.
+fn context_target(app: &mut DesignApp, p: Point, zoom: f64) -> crate::menus::ContextMenu {
+    use crate::menus::ContextMenu;
+    let hit = item_at(app, p, zoom);
+    if app.session.wants_text() {
+        let text_frame = hit.filter(|(id, _)| app.session.active().and_then(|st| st.doc.item(*id)).is_some_and(Item::is_text_frame));
+        if let Some((id, sp)) = text_frame {
+            // A press in the selected text keeps it for dragging; end that press without a move.
+            if app.run("text.placeCaret", json!({"frame": id.0, "point": [sp.x, sp.y]})).is_ok_and(|r| r["dragging"] == json!(true)) {
+                let _ = app.run("text.release", json!({"frame": id.0, "point": [sp.x, sp.y], "moved": true}));
+            }
+        }
+        return ContextMenu::Text;
+    }
+    let Some((id, _)) = hit else { return ContextMenu::Canvas };
+    let direct = app.session.tool_id() == "directSelection";
+    let Some((target, selected)) = app.session.active().map(|st| {
+        let target = if direct { id } else { st.doc.top_level_of(id).unwrap_or(id) };
+        (target, st.selection.contains(target))
+    }) else {
+        return ContextMenu::Canvas;
+    };
+    if !selected {
+        let _ = app.run("selection.set", json!({"ids": [target.0], "content": direct}));
+    }
+    ContextMenu::Object
+}
+
+/// The frontmost item under canvas point `p` and that point in its spread, hit as the tools do.
+fn item_at(app: &DesignApp, p: Point, zoom: f64) -> Option<(designcraft_doc::ItemId, Point)> {
+    let st = app.session.active()?;
+    let (sr, sp) = CanvasLayout::new(&st.doc, st.editing_parents).spread_at(p)?;
+    let tol = 4.0 / zoom.max(1e-6);
+    let id = match sr {
+        SpreadRef::Doc(si) => st.doc.hit_item(si, sp, tol)?,
+        _ => st.doc.spread(sr)?.items.iter().rev().find(|it| !it.locked && designcraft_doc::edit_hit(it, sp, tol))?.id,
+    };
+    Some((id, sp))
+}
+
+/// Wheel, pinch and Alt/Ctrl/Cmd + wheel over the canvas: zoom at the pointer, else scroll.
+fn wheel_navigate(app: &mut DesignApp, ui: &egui::Ui, resp: &egui::Response, xf: &Xf) {
+    let alt = wheel_alt(ui);
+    if resp.hovered() {
+        let (scroll, zoom_delta, m, hover) = ui.input(|i| (i.smooth_scroll_delta, i.zoom_delta(), i.modifiers, i.pointer.hover_pos()));
+        if let Some(hp) = hover {
+            if zoom_delta != 1.0 {
+                zoom_at(app, hp, zoom_delta as f64);
+            } else if m.command && scroll.y != 0.0 {
+                zoom_at(app, hp, (1.0 + scroll.y as f64 * 0.003).clamp(0.5, 2.0));
+            } else if alt && scroll != egui::Vec2::ZERO {
+                // Alt + wheel zooms by as much as Ctrl/Cmd + wheel, which egui turns into `zoom_delta`.
+                let speed = ui.ctx().options(|o| o.input_options.scroll_zoom_speed);
+                zoom_at(app, hp, (speed * (scroll.x + scroll.y)).exp() as f64);
+            } else if scroll != egui::Vec2::ZERO
+                && let Some(v) = app.view_mut()
+            {
+                let scroll = xf.unrotate_delta(scroll);
+                v.origin = Point::new(v.origin.x - scroll.x as f64 / v.zoom, v.origin.y - scroll.y as f64 / v.zoom);
+            }
+        }
+    }
+}
+
+/// Where the primary button went down this pass, if egui no longer holds the press origin.
+fn recent_primary_press(ui: &egui::Ui) -> Option<Pos2> {
+    ui.input(|i| {
+        i.events
+            .iter()
+            .rev()
+            .find_map(|event| match event {
+                egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: true, .. } => Some(*pos),
+                _ => None,
+            })
+            .filter(|pos| pos.is_finite())
+    })
+}
+
+/// Power Zoom: whether a press held still with the Hand tool (`active`) has now lasted half a
+/// second. Keeps the hold's state under `hold_id`, and clears it when the hold ends.
+fn power_zoom_fires(ui: &egui::Ui, hold_id: egui::Id, active: bool, latest: Option<Pos2>) -> bool {
+    if !active {
+        ui.data_mut(|d| d.remove::<(f64, bool)>(hold_id));
+        return false;
+    }
+    let (now, origin_pos) = ui.input(|i| (i.time, i.pointer.press_origin()));
+    let (start, fired): (f64, bool) = ui.data(|d| d.get_temp(hold_id)).unwrap_or((now, false));
+    let still = origin_pos.zip(latest).is_some_and(|(o, l)| (o - l).length() < 3.0);
+    if !fired && still && now - start >= 0.5 {
+        ui.data_mut(|d| d.insert_temp(hold_id, (start, true)));
+        return true;
+    }
+    ui.data_mut(|d| d.insert_temp(hold_id, (start, fired)));
+    if !fired {
+        ui.ctx().request_repaint_after(std::time::Duration::from_millis(100));
+    }
+    false
+}
+
+/// The zero point, ruler guide and column guide drags; whether one took this pass.
+fn ruler_drags(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf, space: bool, menu_open: bool) -> bool {
+    // The zero point and ruler guides need the rulers (hidden while the view is rotated).
+    if !space && !menu_open && xf.rot == 0 && zero_point_drag(app, ui, resp, rect, xf) {
+        return true;
+    }
+    // Hidden or locked guides can't stay selected.
+    if (!app.ui.guides || app.ui.guides_locked) && app.session.active().is_some_and(|st| !st.selection.guides.is_empty()) {
+        let _ = app.run("guide.deselect", json!({}));
+    }
+    if !space && !menu_open && xf.rot == 0 && guide_drag(app, ui, resp, rect, xf) {
+        return true;
+    }
+    if !space && !menu_open && xf.rot == 0 && column_guide_drag(app, ui, resp, rect, xf) {
+        return true;
+    }
+    false
+}
+
+/// Hand-tool panning (Space-drag, middle drag, or Alt held at a text press); whether it took this pass.
+fn hand_pan(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, xf: &Xf, space: bool, wants_text: bool, menu_open: bool) -> bool {
+    let tool_drag: bool = ui.data(|d| d.get_temp(egui::Id::unique(("canvas_pointer_down", app.pane)))).unwrap_or(false);
+    let hand = space && !ui.input(|i| i.modifiers.command);
+    if !tool_drag && ((hand && resp.dragged()) || resp.dragged_by(egui::PointerButton::Middle)) {
+        let d = xf.unrotate_delta(resp.drag_delta());
+        if let Some(v) = app.view_mut() {
+            v.origin = Point::new(v.origin.x - d.x as f64 / v.zoom, v.origin.y - d.y as f64 / v.zoom);
+        }
+        return true;
+    }
+    // Editing text (Space types a space): Alt held at the press gives the Hand tool until the
+    // button is released, and the caret stays. Alt pressed later in a text drag copies the text.
+    let alt_hand_id = egui::Id::unique(("canvas_alt_hand", app.pane));
+    let mut alt_hand: bool = ui.data(|d| d.get_temp(alt_hand_id)).unwrap_or(false);
+    let (press, alt, primary_down) = ui.input(|i| (i.pointer.primary_pressed(), i.modifiers.alt, i.pointer.primary_down()));
+    if press && alt && wants_text && !tool_drag && !menu_open && resp.hovered() {
+        alt_hand = true;
+    }
+    if alt_hand {
+        if resp.dragged() {
+            pan(app, xf, resp.drag_delta());
+        }
+        ui.data_mut(|d| d.insert_temp(alt_hand_id, primary_down));
+        return true;
+    }
+    false
+}
+
+/// A release ends the press run's last click; remembers where and when for the next press.
+fn note_release(ui: &egui::Ui, clicks_id: egui::Id, latest: Option<Pos2>, now: f64) {
+    if let Some(c) = ui.data(|d| d.get_temp::<Clicks>(clicks_id)) {
+        let dist = ui.ctx().options(|o| o.input_options.max_click_dist);
+        ui.data_mut(|d| d.insert_temp(clicks_id, release_clicks(c, latest.unwrap_or(c.pos), now, dist)));
+    }
+}
+
+/// Give an open menu priority, then handle wheel/zoom/pan, spring Zoom, guide drags and primary pointer routing.
+pub(super) fn handle_input(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect) {
+    // While a context menu is open (in either pane), the click that closes it and the keys go to the menu.
+    let menu_open = context_menu_open(ui.ctx());
+    let Some(v) = app.view().copied() else { return };
+    let xf = Xf::new(rect, &v);
+    let wants_text = app.session.wants_text();
+    let space = navigation_space(app, ui.ctx());
+    wheel_navigate(app, ui, resp, &xf);
+    let zoom = spring_zoom_mode(app, ui.ctx(), space);
+    if spring_zoom_input(app, ui, resp, &xf, zoom) {
+        return;
+    }
+    // Space-drag = hand (unless a tool drag is under way: then Space is a modifier, e.g. Live
+    // Distribute while resizing). Middle-drag pans too, with any tool; tools only
+    // see the primary button.
+    // A column guide drag keeps the pointer until the button is up, whatever Space or a menu does
+    // meanwhile.
+    if ui.data(|d| d.get_temp::<ColumnDrag>(egui::Id::unique((COLUMN_DRAG, app.pane)))).is_some() && column_guide_drag(app, ui, resp, rect, &xf) {
+        return;
+    }
+    if hand_pan(app, ui, resp, &xf, space, wants_text, menu_open) {
+        return;
+    }
+    if ruler_drags(app, ui, resp, rect, &xf, space, menu_open) {
+        return;
+    }
+    let m = ui.input(|i| mods(i, space));
+    let vi = app.view_info();
+    let pos = |p: Pos2| xf.to_canvas(p);
+    let mut events: Vec<PointerEvent> = Vec::new();
+    let down_id = egui::Id::unique(("canvas_pointer_down", app.pane));
+    let mut down: bool = ui.data(|d| d.get_temp(down_id)).unwrap_or(false);
+    let clicks_id = egui::Id::unique(("canvas_clicks", app.pane));
+    let (pressed, released, origin, latest, now) =
+        ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.press_origin(), i.pointer.latest_pos(), i.time));
+    // A complete click can arrive in one pass: release clears egui's held origin.
+    // Recover the actual primary press position, preserving the origin for held gestures.
+    let origin = origin.or_else(|| recent_primary_press(ui));
+    let in_view = |o: Pos2| if xf.rot == 0 { rect.contains(o) } else { resp.rect.contains(o) };
+    if pressed
+        && !space
+        && !menu_open
+        && let Some(o) = origin.filter(|o| in_view(*o) && resp.hovered())
+    {
+        // Count presses in a row here: egui reports double and triple clicks only on release and
+        // stops at three, but a press must know (word, line, paragraph, story).
+        let (delay, dist) = ui.ctx().options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_dist));
+        let n = press_count(ui.data(|d| d.get_temp(clicks_id)), o, now, delay, dist);
+        ui.data_mut(|d| d.insert_temp(clicks_id, Clicks { at: f64::NEG_INFINITY, pos: o, n }));
+        events.push(PointerEvent { kind: PointerKind::Down, pos: pos(o), mods: m, clicks: n });
+        down = true;
+    }
+    if down
+        && resp.dragged()
+        && resp.drag_delta() != egui::Vec2::ZERO
+        && let Some(p) = latest
+    {
+        events.push(PointerEvent { kind: PointerKind::Drag, pos: pos(p), mods: m, clicks: 1 });
+    }
+    // Power Zoom: holding the Hand tool still for half a second turns the press into one.
+    let hold_id = egui::Id::unique(("canvas_hold", app.pane));
+    if power_zoom_fires(ui, hold_id, down && !released && app.session.tool_id() == "hand" && !m.alt, latest) {
+        let p = pos(latest.unwrap_or(rect.center()));
+        events.push(PointerEvent { kind: PointerKind::Up, pos: p, mods: m, clicks: 1 });
+        events.push(PointerEvent { kind: PointerKind::Down, pos: p, mods: Mods { alt: true, ..m }, clicks: 1 });
+    }
+    if down && released {
+        note_release(ui, clicks_id, latest, now);
+        let p = latest.unwrap_or(rect.center());
+        events.push(PointerEvent { kind: PointerKind::Up, pos: pos(p), mods: m, clicks: 1 });
+        down = false;
+    } else if !down && let Some(p) = resp.hover_pos() {
+        events.push(PointerEvent { kind: PointerKind::Move, pos: pos(p), mods: m, clicks: 1 });
+    }
+    ui.data_mut(|d| d.insert_temp(down_id, down));
+    for e in events {
+        if let Err(err) = app.session.pointer(&e, vi) {
+            app.status(err.to_string());
+        }
+    }
+    app.after_engine();
+    // Right-click: tools only see the primary button, so it starts no gesture; it opens the menu.
+    if resp.secondary_clicked()
+        && !down
+        && !space
+        && app.ui.screen_mode != ScreenMode::Presentation
+        && let Some(o) = resp.interact_pointer_pos().filter(|o| in_view(*o))
+    {
+        let kind = context_target(app, xf.to_canvas(o), xf.zoom);
+        ui.data_mut(|d| d.insert_temp(context_menu_id(app.pane), MenuRequest { kind, open: true }));
+        ui.ctx().request_repaint();
+    }
+    if resp.clicked() || resp.drag_started() {
+        resp.request_focus();
+    }
+    // Arrow keys, Tab and Escape belong to the canvas (caret, nudge, tab character, deselect).
+    // Without the lock egui moves focus to a neighbouring widget, and the next Space or Return
+    // clicks it while typing still reaches the text.
+    let lock = egui::EventFilter { tab: true, horizontal_arrows: true, vertical_arrows: true, escape: true };
+    ui.memory_mut(|m| m.set_focus_lock_filter(resp.id, lock));
+    // Keyboard for the active tool. A field focused when the frame began keeps this frame's keys.
+    let field_id = field_focused_id(ui.ctx());
+    let field = ui.ctx().text_edit_focused() || ui.data(|d| d.get_temp::<bool>(field_id)).unwrap_or(false);
+    if menu_open || modal_open(app) || (field && !resp.has_focus()) || !keyboard_pane(app) {
+        return;
+    }
+    // Keys of a frame that began composing are the IME's too (a Backspace that empties the marked
+    // text must not delete the character before it).
+    let composing_at_start = app.session.tool_composing();
+    let evs = ui.input(|i| i.events.clone());
+    // Native only: egui-winit sends a ⌘+V chord as a paste without its key press, so the modifiers
+    // held at the paste tell Paste in Place from Paste. The web also gets the key press, and the
+    // shortcut table has already run the command. A chord's modifiers may be released in the same
+    // frame, hence the modifiers held at each event.
+    #[cfg(not(target_arch = "wasm32"))]
+    let mut held =
+        ui.data(|d| d.get_temp::<(egui::Modifiers, egui::Modifiers)>(modifiers_id())).map_or_else(|| ui.input(|i| i.modifiers), |(start, _)| start);
+    for e in evs {
+        #[cfg(not(target_arch = "wasm32"))]
+        let chord = {
+            if let egui::Event::ModifiersChanged(m) = &e {
+                held = *m;
+            }
+            if matches!(e, egui::Event::Paste(_)) { crate::menus::paste_chord_command(app, held) } else { None }
+        };
+        let composing = composing_at_start || app.session.tool_composing();
+        match e {
+            egui::Event::Ime(ime) if wants_text => ime_event(app, ui.ctx(), ime, vi),
+            // Keys the IME passes through come as text only while nothing is marked.
+            egui::Event::Text(t) if wants_text && !composing => {
+                let _ = app.run("text.insert", json!({"text": t}));
+            }
+            // The IME owns the keyboard until it commits: no typing, clipboard or editing keys.
+            egui::Event::Text(_) | egui::Event::Paste(_) | egui::Event::Copy | egui::Event::Cut | egui::Event::Key { .. } if composing => {}
+            egui::Event::Paste(t) if wants_text => {
+                // Formatted when the system clipboard still holds what was copied here;
+                // Shift (⇧⌘V) pastes without formatting.
+                let plain = ui.input(|i| i.modifiers.shift);
+                let id = if plain { "edit.pasteWithoutFormatting" } else { "edit.paste" };
+                let _ = app.run(id, json!({"text": t}));
+            }
+            egui::Event::Copy | egui::Event::Cut if wants_text => {
+                // `run` puts the copied text on the system clipboard.
+                let id = if matches!(e, egui::Event::Cut) { "edit.cut" } else { "edit.copy" };
+                let _ = app.run(id, json!({}));
+            }
+            // Paste in Place's chord (⌘⌥⇧V unless rebound) arrives as a paste too.
+            #[cfg(not(target_arch = "wasm32"))]
+            egui::Event::Paste(_) if chord.is_some() => {
+                if let Some(id) = chord
+                    && crate::menus::enabled(app, id)
+                {
+                    crate::menus::activate(app, id, &serde_json::Value::Null);
+                }
+            }
+            // Without a native menu bar the copy and paste keys arrive only as these events.
+            egui::Event::Copy | egui::Event::Cut | egui::Event::Paste(_) if !app.native_menu => {
+                let (id, params) = match e {
+                    egui::Event::Copy => ("edit.copy", serde_json::Value::Null),
+                    egui::Event::Cut => ("edit.cut", serde_json::Value::Null),
+                    egui::Event::Paste(t) => ("edit.paste", json!({"text": t})),
+                    _ => continue,
+                };
+                if crate::menus::enabled(app, id) {
+                    crate::menus::activate(app, id, &params);
+                }
+            }
+            egui::Event::Key { key, pressed: true, modifiers, .. } => tool_key(app, key, modifiers, vi),
+            _ => {}
+        }
+    }
+    finish_pending_ime_delete(app, ui.ctx());
+    let _ = DVec2::ZERO;
+}
+
+/// A key for the active tool (caret movement, nudging, Backspace); Escape it leaves alone
+/// deselects.
+fn tool_key(app: &mut DesignApp, key: egui::Key, modifiers: egui::Modifiers, vi: designcraft_engine::ViewInfo) {
+    let k = match key {
+        egui::Key::ArrowLeft => ToolKey::Left,
+        egui::Key::ArrowRight => ToolKey::Right,
+        egui::Key::ArrowUp => ToolKey::Up,
+        egui::Key::ArrowDown => ToolKey::Down,
+        egui::Key::Enter => ToolKey::Enter,
+        egui::Key::Escape => ToolKey::Escape,
+        egui::Key::Backspace => ToolKey::Backspace,
+        egui::Key::Delete => ToolKey::Delete,
+        egui::Key::Tab => ToolKey::Tab,
+        egui::Key::Home => ToolKey::Home,
+        egui::Key::End => ToolKey::End,
+        _ => return,
+    };
+    let m = Mods { shift: modifiers.shift, alt: modifiers.alt, cmd: modifiers.command, ctrl: modifiers.ctrl, space: false };
+    let handled = app.session.tool_key(k, m, vi).unwrap_or(false);
+    if !handled && k == ToolKey::Escape {
+        let _ = app.run("edit.deselectAll", json!({}));
+    }
+    app.after_engine();
+}
+
+/// The keys a floating panel's own OS window left over once the shortcuts took theirs: the
+/// clipboard and the active tool's keys, as the canvas handles them while no text is edited.
+/// `modifiers` are those held in that window; egui-winit sends ⌘C, ⌘X and ⌘V as `Copy`, `Cut`
+/// and `Paste` without their key press.
+pub(crate) fn forwarded_keys(app: &mut DesignApp, events: Vec<egui::Event>, modifiers: egui::Modifiers) {
+    if !keyboard_pane(app) || modal_open(app) || app.session.wants_text() || app.session.tool_composing() {
+        return;
+    }
+    let vi = app.view_info();
+    for e in events {
+        #[cfg(not(target_arch = "wasm32"))]
+        let chord = if matches!(e, egui::Event::Paste(_)) { crate::menus::paste_chord_command(app, modifiers) } else { None };
+        // The web keeps floating panels in the page, so nothing is forwarded there.
+        #[cfg(target_arch = "wasm32")]
+        let chord: Option<&str> = {
+            let _ = modifiers;
+            None
+        };
+        let (id, params) = match (e, chord) {
+            (egui::Event::Paste(_), Some(id)) => (id, serde_json::Value::Null),
+            (egui::Event::Copy, _) if !app.native_menu => ("edit.copy", serde_json::Value::Null),
+            (egui::Event::Cut, _) if !app.native_menu => ("edit.cut", serde_json::Value::Null),
+            (egui::Event::Paste(t), _) if !app.native_menu => ("edit.paste", json!({"text": t})),
+            (egui::Event::Key { key, pressed: true, modifiers, .. }, _) => {
+                tool_key(app, key, modifiers, vi);
+                continue;
+            }
+            _ => continue,
+        };
+        if crate::menus::enabled(app, id) {
+            crate::menus::activate(app, id, &params);
+        }
+    }
+}
+
+/// A dialog or Quick Apply has the keyboard. The canvas keeps egui's focus behind a modal, and it
+/// runs before the modal draws, so it must not also act on the Esc or Return that closes it.
+pub(super) fn modal_open(app: &DesignApp) -> bool {
+    app.ui.dialog.is_some() || app.ui.palette.is_some()
+}
+
+/// Does the current pane take the keyboard? Both panes (split, or the second window) see the same
+/// events, so typing, tool keys, the clipboard and the input method serve only the focused pane.
+pub(super) fn keyboard_pane(app: &DesignApp) -> bool {
+    app.pane == app.focus_pane
+}
+
+/// The count of a press at `pos` at time `now`: one more than the last press when it comes within
+/// the double-click delay of the last release and near where that release was, else 1.
+pub(super) fn press_count(last: Option<Clicks>, pos: Pos2, now: f64, delay: f64, dist: f32) -> u8 {
+    match last {
+        Some(c) if now - c.at <= delay && (pos - c.pos).length() <= dist => c.n.saturating_add(1),
+        _ => 1,
+    }
+}
+
+/// The record a release at `pos` leaves: a release away from its press ended a drag, which is
+/// not a click, so the next press counts from one.
+pub(super) fn release_clicks(press: Clicks, pos: Pos2, now: f64, dist: f32) -> Clicks {
+    let n = if (pos - press.pos).length() <= dist { press.n } else { 0 };
+    Clicks { at: now, pos, n }
+}
diff --git a/crates/ui-egui/src/canvas/page_decor.rs b/crates/ui-egui/src/canvas/page_decor.rs
new file mode 100644
index 000000000..af2bec79b
--- /dev/null
+++ b/crates/ui-egui/src/canvas/page_decor.rs
@@ -0,0 +1,209 @@
+use super::guides::MovingGuides;
+use super::render::c32;
+use super::rulers::hair;
+use super::{
+    CanvasLayout, Color32, DRect, DesignApp, Document, GuideSel, Item, Point, Pos2, Rect, ScreenMode, SpreadRef, SpreadSlot, Stroke, StrokeKind,
+    Tokens, Xf,
+};
+
+pub(super) fn dashed(painter: &egui::Painter, a: Pos2, b: Pos2, stroke: Stroke, dash: f32, gap: f32) {
+    painter.extend(egui::Shape::dashed_line(&[a, b], stroke, dash, gap));
+}
+
+/// The most baseline grid lines drawn on a page: one per point of the tallest page (216 in).
+pub(super) const MAX_BASELINES: usize = 216 * 72;
+
+/// Baseline grid lines inside a page, measured from its top: `start + n * increment` for n >= 0 (the bottom
+/// edge is not a line), `start` from [`BaselineGrid::origin`](designcraft_doc::BaselineGrid::origin). Lines
+/// above the page are skipped without walking them, however far up the start is.
+pub(super) fn baseline_grid_lines(start: f64, increment: f64, height: f64) -> impl Iterator<Item = f64> {
+    let step = increment.max(1.0);
+    let first = if start < 0.0 { start.rem_euclid(step) } else { start };
+    (0..MAX_BASELINES).map(move |n| first + n as f64 * step).take_while(move |y| *y < height)
+}
+
+/// What a screen mode shows of a spread, in screen coordinates: the trim, or out to the bleed or
+/// the slug box. Slug shows every printing element, so the bleed as well — and a slug narrower
+/// than the bleed does not pull the edge back in.
+pub(super) fn shown_area(app: &DesignApp, doc: &Document, xf: &Xf, slot: &SpreadSlot) -> Rect {
+    let trim = xf.rect(slot.bounds);
+    let boxes: &[[f64; 4]] = match app.ui.screen_mode {
+        ScreenMode::Bleed => &[doc.settings.bleed],
+        ScreenMode::Slug => &[doc.settings.bleed, doc.settings.slug],
+        _ => &[],
+    };
+    let Some(sp) = doc.spread(slot.spread) else { return trim };
+    boxes.iter().filter_map(|o| sp.outset_rect(*o)).map(|r| xf.rect(slot.xf.transform_rect_bbox(r))).fold(trim, |a, b| a.union(b))
+}
+
+/// `moving`: guides being dragged, drawn where they would be dropped instead of where they are.
+pub(super) fn draw_guides(
+    app: &DesignApp,
+    painter: &egui::Painter,
+    xf: &Xf,
+    doc: &Document,
+    layout: &CanvasLayout,
+    t: &Tokens,
+    moving: Option<&MovingGuides>,
+) {
+    let selection: std::collections::HashSet<GuideSel> =
+        app.session.active().map(|st| st.selection.guides.iter().copied().collect()).unwrap_or_default();
+    for slot in &layout.slots {
+        let Some(sp) = doc.spread(slot.spread) else { continue };
+        if app.ui.guides {
+            draw_bleed_and_slug(painter, xf, doc, slot, sp);
+        }
+        let pasteboard = slot.xf.inverse().transform_rect_bbox(layout.pasteboard);
+        for (pi, p) in sp.pages.iter().enumerate() {
+            let pr = p.bounds();
+            draw_parent_overlay(painter, xf, doc, slot, pi, p, pr);
+            if !app.ui.guides {
+                continue;
+            }
+            draw_page_grids(painter, xf, doc, slot, p, pr, app.ui.baseline_grid);
+            let cx = GuideCtx { painter, xf, doc, slot, sp, pasteboard };
+            draw_page_guides(&cx, (pi, p, pr), moving, &selection);
+        }
+    }
+    let _ = t;
+}
+
+/// The bleed and slug outlines of a spread, in their own colours.
+fn draw_bleed_and_slug(painter: &egui::Painter, xf: &Xf, doc: &Document, slot: &SpreadSlot, sp: &designcraft_doc::Spread) {
+    let s = &doc.settings;
+    let rect = |r: DRect| xf.rect(slot.xf.transform_rect_bbox(r));
+    // Bleed, then slug: one rectangle each around the spread (the inside offset only applies
+    // at the spread's outer edges).
+    for (r, color) in [(sp.bleed_rect(s.bleed), s.bleed_color), (sp.slug_rect(s.slug), s.slug_color)] {
+        if let Some(r) = r {
+            painter.rect_stroke(rect(r), 0.0, Stroke::new(hair(painter), c32(color)), StrokeKind::Middle);
+        }
+    }
+}
+
+/// Page tool › Show Parent Page Overlay: the parent page's size over the page.
+fn draw_parent_overlay(painter: &egui::Painter, xf: &Xf, doc: &Document, slot: &SpreadSlot, pi: usize, p: &designcraft_doc::Page, pr: DRect) {
+    let rect = |r: DRect| xf.rect(slot.xf.transform_rect_bbox(r));
+    if p.show_parent_overlay
+        && let SpreadRef::Doc(si) = slot.spread
+        && let Some((ppi, ppg)) = doc.parent_page_for(doc.first_page_of_spread(si) + pi)
+        && let Some(pp) = doc.parents.get(ppi).and_then(|ps| ps.pages.get(ppg))
+    {
+        let r = rect(DRect::new(pr.x0, pr.y0, pr.x0 + pp.width, pr.y0 + pp.height));
+        painter.rect_filled(r, 0.0, Color32::from_rgba_unmultiplied(110, 110, 230, 28));
+        painter.rect_stroke(r, 0.0, Stroke::new(1.0, Color32::from_rgb(110, 110, 230)), StrokeKind::Middle);
+    }
+}
+
+/// A page's baseline grid (when `baseline` is on and the view is zoomed in far enough), margins
+/// and columns.
+fn draw_page_grids(painter: &egui::Painter, xf: &Xf, doc: &Document, slot: &SpreadSlot, p: &designcraft_doc::Page, pr: DRect, baseline: bool) {
+    let s = &doc.settings;
+    let pt = |q: Point| xf.to_screen(slot.xf * q);
+    let rect = |r: DRect| xf.rect(slot.xf.transform_rect_bbox(r));
+    // Baseline grid.
+    if baseline && xf.zoom >= s.baseline_grid.view_threshold {
+        let g = &s.baseline_grid;
+        for y in baseline_grid_lines(g.origin(p), g.increment, p.height) {
+            painter.line_segment(
+                [pt(Point::new(pr.x0, pr.y0 + y)), pt(Point::new(pr.x1, pr.y0 + y))],
+                Stroke::new(hair(painter), c32(g.color).gamma_multiply(0.8)),
+            );
+        }
+    }
+    // Margins (magenta) and columns (violet).
+    painter.rect_stroke(rect(p.margin_rect()), 0.0, Stroke::new(hair(painter), c32(s.margin_color)), StrokeKind::Middle);
+    let cols = p.column_rects();
+    if cols.len() > 1 {
+        for (i, c) in cols.iter().enumerate() {
+            let col = Stroke::new(hair(painter), c32(s.column_color));
+            if i > 0 {
+                painter.line_segment([pt(Point::new(c.x0, c.y0)), pt(Point::new(c.x0, c.y1))], col);
+            }
+            if i + 1 < cols.len() {
+                painter.line_segment([pt(Point::new(c.x1, c.y0)), pt(Point::new(c.x1, c.y1))], col);
+            }
+        }
+    }
+}
+
+/// What one page's guides are drawn against.
+struct GuideCtx<'a> {
+    painter: &'a egui::Painter,
+    xf: &'a Xf,
+    doc: &'a Document,
+    slot: &'a SpreadSlot,
+    sp: &'a designcraft_doc::Spread,
+    pasteboard: DRect,
+}
+
+/// The page's own guides, then those it shows from its parent page. `moving` draws dragged
+/// guides where they would be dropped. `page`: its index in the spread, the page, and its bounds.
+fn draw_page_guides(
+    cx: &GuideCtx,
+    page: (usize, &designcraft_doc::Page, DRect),
+    moving: Option<&MovingGuides>,
+    selection: &std::collections::HashSet<GuideSel>,
+) {
+    let GuideCtx { doc, slot, .. } = *cx;
+    let (pi, p, pr) = page;
+    let own = p.guides.len();
+    for (gi, mut g) in p.guides.iter().cloned().chain(doc.parent_guides(p)).enumerate().filter(|(_, g)| g.visible_in(doc)) {
+        let key = GuideSel { spread: slot.spread, page: pi, index: gi };
+        // Selected guides are drawn thicker, in their layer's color.
+        let selected = gi < own && selection.contains(&key);
+        if gi < own
+            && let Some(m) = moving
+            && m.guides.contains(&key)
+        {
+            g.position += match g.orientation {
+                designcraft_doc::Orientation::Vertical => m.dx,
+                designcraft_doc::Orientation::Horizontal => m.dy,
+            };
+        }
+        draw_guide(cx, pr, &g, selected);
+    }
+}
+
+/// One guide as a line: across the pasteboard for a spread guide, across its page otherwise.
+fn draw_guide(cx: &GuideCtx, pr: DRect, g: &designcraft_doc::Guide, selected: bool) {
+    let GuideCtx { painter, xf, doc, slot, sp, pasteboard } = *cx;
+    let pt = |q: Point| xf.to_screen(slot.xf * q);
+    // Spread guides cross the pasteboard; page guides their page.
+    let span = if g.spread { pasteboard } else { pr };
+    let (a, bb) = match g.orientation {
+        designcraft_doc::Orientation::Horizontal => (Point::new(span.x0, g.position), Point::new(span.x1, g.position)),
+        designcraft_doc::Orientation::Vertical => {
+            let span = if g.spread { sp.bounds().inflate(0.0, 36.0) } else { pr };
+            (Point::new(g.position, span.y0), Point::new(g.position, span.y1))
+        }
+    };
+    let stroke = if selected {
+        let color = g.layer.and_then(|l| doc.layer(l)).map_or(Color32::from_rgb(79, 153, 255), |l| c32(l.color));
+        Stroke::new(2.0, color)
+    } else {
+        Stroke::new(hair(painter), Color32::from_rgb(74, 227, 255))
+    };
+    if g.liquid {
+        // Liquid guides are dashed.
+        painter.extend(egui::Shape::dashed_line(&[pt(a), pt(bb)], stroke, 6.0, 3.0));
+    } else {
+        painter.line_segment([pt(a), pt(bb)], stroke);
+    }
+}
+
+/// View › Flattener Preview: red over every object that involves transparency (opacity, blend
+/// modes, effects, knockout) — what flattening or export rasterising affects.
+pub(super) fn draw_flattener_preview(painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) {
+    fn transparent(it: &Item) -> bool {
+        it.opacity < 1.0 || it.blend != Default::default() || it.effects.any() || it.knockout || it.children().iter().any(|c| transparent(c))
+    }
+    let red = Color32::from_rgba_unmultiplied(230, 30, 30, 110);
+    for slot in &layout.slots {
+        let Some(sp) = doc.spread(slot.spread) else { continue };
+        for it in sp.items.iter().filter(|it| !it.hidden && transparent(it)) {
+            let r = it.bounds().inflate(designcraft_render::effect_outset(it), designcraft_render::effect_outset(it));
+            painter.rect_filled(xf.rect(slot.xf.transform_rect_bbox(r)), 0.0, red);
+        }
+    }
+}
diff --git a/crates/ui-egui/src/canvas/render.rs b/crates/ui-egui/src/canvas/render.rs
new file mode 100644
index 000000000..642694b8a
--- /dev/null
+++ b/crates/ui-egui/src/canvas/render.rs
@@ -0,0 +1,281 @@
+use super::{Affine, CanvasLayout, Color32, DRect, DesignApp, Point, Rect, Xf};
+
+pub(super) fn c32(c: [u8; 3]) -> Color32 {
+    Color32::from_rgb(c[0], c[1], c[2])
+}
+
+/// Render options for the canvas texture.
+pub(super) fn screen_options(app: &DesignApp, layout: &CanvasLayout, preview: bool, ppp: f64) -> designcraft_render::RenderOptions {
+    designcraft_render::RenderOptions {
+        printing_only: preview,
+        greek_below_px: 3.0 * ppp,
+        highlight_missing_fonts: !preview && app.session.prefs.highlight_substituted_fonts,
+        highlight_hj: !preview && app.session.prefs.highlight_hj,
+        condition_indicators: !preview,
+        note_indicators: !preview && app.session.prefs.show_note_anchors,
+        change_markup: !preview && app.session.prefs.show_added_text,
+        tag_markers: !preview && app.ui.tag_markers,
+        highlight_keeps: !preview && app.session.prefs.highlight_keeps,
+        highlight_custom_tracking: !preview && app.session.prefs.highlight_custom_tracking,
+        quality: app.ui.display_quality,
+        rich_black: app.ui.rich_black,
+        overprint_preview: app.ui.overprint_preview,
+        blend_space_view: !app.ui.proof_colors,
+        document_grid: if app.ui.document_grid && !preview { grid_areas(layout) } else { vec![] },
+        ..Default::default()
+    }
+}
+
+/// The area each spread's document grid covers, in spread coordinates: the full-width band of
+/// the pasteboard nearest that spread, the band in which `CanvasLayout::spread_at` (and so
+/// snapping) picks it.
+fn grid_areas(layout: &CanvasLayout) -> Vec<(designcraft_doc::SpreadRef, DRect)> {
+    let pb = layout.pasteboard;
+    let slots = &layout.slots;
+    slots
+        .iter()
+        .enumerate()
+        .map(|(i, slot)| {
+            let lo = i.checked_sub(1).and_then(|j| slots.get(j)).map_or(pb.y0, |prev| (prev.bounds.y1 + slot.bounds.y0) / 2.0);
+            let hi = slots.get(i + 1).map_or(pb.y1, |next| (slot.bounds.y1 + next.bounds.y0) / 2.0);
+            (slot.spread, slot.xf.inverse().transform_rect_bbox(DRect::new(pb.x0, lo, pb.x1, hi)))
+        })
+        .collect()
+}
+
+/// The display options that change how the canvas texture looks without touching the document.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct DisplayKey {
+    quality: designcraft_render::DisplayQuality,
+    rich_black: bool,
+    overprint_preview: bool,
+    proof_colors: bool,
+    tag_markers: bool,
+    document_grid: bool,
+    highlight_substituted_fonts: bool,
+    highlight_hj: bool,
+    show_note_anchors: bool,
+    show_added_text: bool,
+    highlight_keeps: bool,
+    highlight_custom_tracking: bool,
+}
+
+fn display_key(app: &DesignApp) -> DisplayKey {
+    let (ui, prefs) = (&app.ui, &app.session.prefs);
+    DisplayKey {
+        quality: ui.display_quality,
+        rich_black: ui.rich_black,
+        overprint_preview: ui.overprint_preview,
+        proof_colors: ui.proof_colors,
+        tag_markers: ui.tag_markers,
+        document_grid: ui.document_grid,
+        highlight_substituted_fonts: prefs.highlight_substituted_fonts,
+        highlight_hj: prefs.highlight_hj,
+        show_note_anchors: prefs.show_note_anchors,
+        show_added_text: prefs.show_added_text,
+        highlight_keeps: prefs.highlight_keeps,
+        highlight_custom_tracking: prefs.highlight_custom_tracking,
+    }
+}
+
+/// When a display option changed, drop the texture and any render in flight: they were drawn with the old options.
+pub(super) fn invalidate_on_display_change(app: &mut DesignApp) {
+    let key = display_key(app);
+    if app.canvas.display_key != Some(key) {
+        app.canvas.display_key = Some(key);
+        app.canvas.shown = None;
+        app.canvas.pending = None;
+        app.canvas.pending_doc = None;
+    }
+}
+
+/// Keep the canvas texture current. Panning inside the overscanned region just shifts the
+/// texture; zooming shows the old texture scaled until the background render arrives; document
+/// edits render synchronously so editing never lags.
+pub(super) fn render_texture(app: &mut DesignApp, ctx: &egui::Context, rect: Rect, xf: &Xf, layout: &CanvasLayout, preview: bool) {
+    invalidate_on_display_change(app);
+    let Some(st) = app.session.active() else { return };
+    let ppp = ctx.pixels_per_point() as f64;
+    let doc_key = (st.uid, std::sync::Arc::as_ptr(&st.doc) as u64, st.revision, preview);
+    let editing_parents = st.editing_parents;
+    // Overscan: 25% of the viewport on every side, within the GPU's maximum texture size.
+    let max_side = ctx.input(|i| i.max_texture_side) as f32 / ppp as f32;
+    let (ow, oh) =
+        ((rect.width() * 0.25).min((max_side - rect.width()) / 2.0).max(0.0), (rect.height() * 0.25).min((max_side - rect.height()) / 2.0).max(0.0));
+    let want = |origin: Point| crate::Shown {
+        doc: doc_key,
+        editing_parents,
+        origin: Point::new(origin.x - ow as f64 / xf.zoom, origin.y - oh as f64 / xf.zoom),
+        zoom: xf.zoom,
+        size: (rect.width() + 2.0 * ow, rect.height() + 2.0 * oh),
+    };
+    let target = want(xf.origin);
+    // Does the current texture cover the viewport at this zoom and document state?
+    let covers = |s: &crate::Shown| {
+        s.doc == doc_key && s.editing_parents == editing_parents && (s.zoom - xf.zoom).abs() < 1e-9 && {
+            let x0 = (xf.origin.x - s.origin.x) * s.zoom;
+            let y0 = (xf.origin.y - s.origin.y) * s.zoom;
+            x0 >= -0.5 && y0 >= -0.5 && x0 + rect.width() as f64 <= s.size.0 as f64 + 0.5 && y0 + rect.height() as f64 <= s.size.1 as f64 + 0.5
+        }
+    };
+    // Collect finished background renders.
+    #[cfg(not(target_arch = "wasm32"))]
+    if let (Some(w), Some((tok, shown))) = (app.canvas.worker.as_ref(), app.canvas.pending)
+        && let Some(done) = w.poll()
+        && done.token == tok
+    {
+        upload(app, ctx, done.image);
+        app.canvas.shown = Some(shown);
+        app.canvas.shown_doc = app.canvas.pending_doc.take();
+        app.canvas.pending = None;
+        app.perf.render_ms = done.ms;
+    }
+    if app.canvas.shown.is_some_and(|s| covers(&s)) {
+        return;
+    }
+    let doc_changed = app.canvas.shown.is_none_or(|s| s.doc != doc_key);
+    let mode_changed = app.canvas.shown.is_some_and(|s| s.editing_parents != editing_parents);
+    let zoom_same = app.canvas.shown.is_some_and(|s| (s.zoom - xf.zoom).abs() < 1e-9);
+    let job = |app: &DesignApp| {
+        let st = app.session.active()?;
+        let placed: Vec<designcraft_render::Placed> =
+            layout.slots.iter().map(|s| designcraft_render::Placed { spread: s.spread, xf: s.xf }).collect();
+        let w = (target.size.0 as f64 * ppp).round().max(1.0) as u32;
+        let h = (target.size.1 as f64 * ppp).round().max(1.0) as u32;
+        let view = Affine::scale(ppp) * Affine::scale(xf.zoom) * Affine::translate((-target.origin.x, -target.origin.y));
+        let opts = screen_options(app, layout, preview, ppp);
+        Some((st.doc.clone(), placed, w, h, view, opts))
+    };
+    // Synchronous path: document edits (keep editing crisp), first frame, or no worker.
+    #[cfg(not(target_arch = "wasm32"))]
+    if !app.canvas.worker_started {
+        app.canvas.worker_started = true;
+        app.canvas.worker = render_worker_spawn(ctx);
+    }
+    #[cfg(not(target_arch = "wasm32"))]
+    let has_worker = app.canvas.worker.is_some();
+    #[cfg(target_arch = "wasm32")]
+    let has_worker = false;
+    // An edit with the view unchanged: repaint just the regions it changed.
+    if doc_changed && zoom_same && patch_texture(app, layout, ppp, doc_key, preview) {
+        return;
+    }
+    // A mode switch changes every spread's meaning, even if the document has no damage.
+    // Show the new canvas immediately, including when fitting it changes the zoom.
+    if !has_worker || app.canvas.shown.is_none() || mode_changed || (doc_changed && zoom_same) {
+        let t0 = crate::now_ms();
+        let Some((doc, placed, w, h, view, opts)) = job(app) else { return };
+        let img = app.canvas.renderer.render(&doc, &app.session.cache, &placed, (w, h), view, &opts);
+        upload(app, ctx, img);
+        app.canvas.shown = Some(target);
+        app.canvas.shown_doc = Some(doc);
+        app.canvas.pending = None;
+        app.canvas.pending_doc = None;
+        app.perf.render_ms = crate::now_ms() - t0;
+        return;
+    }
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        // Already rendering this view?
+        if app.canvas.pending.is_some_and(|(_, p)| {
+            p.doc == doc_key && p.editing_parents == editing_parents && (p.zoom - xf.zoom).abs() < 1e-9 && {
+                let x0 = (xf.origin.x - p.origin.x) * p.zoom;
+                let y0 = (xf.origin.y - p.origin.y) * p.zoom;
+                x0 >= 0.0 && y0 >= 0.0 && x0 + rect.width() as f64 <= p.size.0 as f64 && y0 + rect.height() as f64 <= p.size.1 as f64
+            }
+        }) {
+            return;
+        }
+        let Some((doc, placed, w, h, view, opts)) = job(app) else { return };
+        app.canvas.pending_doc = Some(doc.clone());
+        app.canvas.token += 1;
+        let token = app.canvas.token;
+        if let Some(wk) = app.canvas.worker.as_ref() {
+            wk.submit(crate::render_worker::Job { token, doc, cache: app.session.cache.clone(), placed, w, h, view, opts });
+        }
+        app.canvas.pending = Some((token, target));
+    }
+}
+
+/// Repaint only the damaged regions of the current texture after an edit (typing, nudging).
+/// Returns false when a full render is needed (view moved, too much changed, or damage unknown).
+fn patch_texture(app: &mut DesignApp, layout: &CanvasLayout, ppp: f64, doc_key: (u64, u64, u64, bool), preview: bool) -> bool {
+    let (Some(sh), Some(old), Some(st)) = (app.canvas.shown, app.canvas.shown_doc.clone(), app.session.active()) else { return false };
+    if sh.doc.0 != doc_key.0 || sh.doc.3 != doc_key.3 || sh.editing_parents != st.editing_parents {
+        return false;
+    }
+    let (tw, th) = ((sh.size.0 as f64 * ppp).round() as i64, (sh.size.1 as f64 * ppp).round() as i64);
+    // Patches are in full-resolution pixels: a texture `upload` shrank to the GPU's limit
+    // (a viewport wider than `max_texture_side`) takes full renders instead.
+    let full = [usize::try_from(tw).unwrap_or(0), usize::try_from(th).unwrap_or(0)];
+    if app.canvas.texture.as_ref().is_none_or(|t| t.size() != full) {
+        return false;
+    }
+    let new = st.doc.clone();
+    let Some(regions) = designcraft_render::damage::damage_with(&old, &new, Some(&app.session.cache)) else { return false };
+    let t0 = crate::now_ms();
+    let k = sh.zoom * ppp;
+    let mut px: Option<(i64, i64, i64, i64)> = None;
+    for (r, rect) in &regions {
+        let c = layout.xf(*r).transform_rect_bbox(*rect);
+        let x0 = ((c.x0 - sh.origin.x) * k).floor() as i64 - 1;
+        let y0 = ((c.y0 - sh.origin.y) * k).floor() as i64 - 1;
+        let x1 = ((c.x1 - sh.origin.x) * k).ceil() as i64 + 1;
+        let y1 = ((c.y1 - sh.origin.y) * k).ceil() as i64 + 1;
+        px = Some(px.map_or((x0, y0, x1, y1), |p| (p.0.min(x0), p.1.min(y0), p.2.max(x1), p.3.max(y1))));
+    }
+    let done = |app: &mut DesignApp| {
+        app.canvas.shown = Some(crate::Shown { doc: doc_key, ..sh });
+        app.canvas.shown_doc = Some(new.clone());
+        // A background render of the old document must not overwrite this.
+        app.canvas.pending = None;
+        app.canvas.pending_doc = None;
+    };
+    let Some((x0, y0, x1, y1)) = px.map(|p| (p.0.max(0), p.1.max(0), p.2.min(tw), p.3.min(th))) else {
+        done(app);
+        return true;
+    };
+    if x1 <= x0 || y1 <= y0 {
+        done(app);
+        return true;
+    }
+    // Big changes: a full render costs about the same.
+    if ((x1 - x0) * (y1 - y0)) as f64 > 0.5 * (tw * th) as f64 {
+        return false;
+    }
+    let placed: Vec<designcraft_render::Placed> = layout.slots.iter().map(|s| designcraft_render::Placed { spread: s.spread, xf: s.xf }).collect();
+    let view = Affine::translate((-(x0 as f64), -(y0 as f64)))
+        * Affine::scale(ppp)
+        * Affine::scale(sh.zoom)
+        * Affine::translate((-sh.origin.x, -sh.origin.y));
+    let opts = screen_options(app, layout, preview, ppp);
+    let img = app.canvas.patcher.render(&new, &app.session.cache, &placed, ((x1 - x0) as u32, (y1 - y0) as u32), view, &opts);
+    let ci = egui::ColorImage::from_rgba_premultiplied([img.width as usize, img.height as usize], &img.pixels);
+    if let Some(tex) = app.canvas.texture.as_mut() {
+        tex.set_partial([x0 as usize, y0 as usize], ci, egui::TextureOptions::LINEAR);
+    }
+    done(app);
+    app.canvas.patches += 1;
+    app.perf.render_ms = crate::now_ms() - t0;
+    true
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn render_worker_spawn(ctx: &egui::Context) -> Option<crate::render_worker::Worker> {
+    if std::env::var_os("DESIGNCRAFT_SYNC_RENDER").is_some() {
+        return None;
+    }
+    crate::render_worker::Worker::spawn(ctx.clone())
+}
+
+fn upload(app: &mut DesignApp, ctx: &egui::Context, mut img: designcraft_render::Rendered) {
+    if app.ui.proof_colors {
+        designcraft_render::proof_view(&mut img, &app.ui.proof_setup);
+    }
+    let ci = egui::ColorImage::from_rgba_premultiplied([img.width as usize, img.height as usize], &img.pixels);
+    let ci = crate::widgets::fit_texture(ci, ctx.input(|i| i.max_texture_side));
+    match &mut app.canvas.texture {
+        Some(tex) => tex.set(ci, egui::TextureOptions::LINEAR),
+        None => app.canvas.texture = Some(ctx.load_texture("canvas", ci, egui::TextureOptions::LINEAR)),
+    }
+}
diff --git a/crates/ui-egui/src/canvas/rulers.rs b/crates/ui-egui/src/canvas/rulers.rs
new file mode 100644
index 000000000..4aae485ec
--- /dev/null
+++ b/crates/ui-egui/src/canvas/rulers.rs
@@ -0,0 +1,312 @@
+use super::input::pointer_elsewhere;
+use super::page_decor::dashed;
+use super::view::current_slot;
+use super::{CanvasLayout, DesignApp, Document, Point, Pos2, RULER, Rect, SpreadSlot, Stroke, Tokens, Value, Xf, json, pos2, vec2};
+
+/// Paint ruler bands and ticks, the zero-point crosshair, guide previews, and ticks restarted at each page origin.
+#[allow(clippy::too_many_arguments)]
+pub(super) fn draw_rulers(app: &DesignApp, ui: &egui::Ui, full: Rect, rect: Rect, xf: &Xf, doc: &Document, layout: &CanvasLayout, t: &Tokens) {
+    let painter = ui.painter_at(full);
+    let (top, left) = ruler_rects(full, rect);
+    painter.rect_filled(top, 0.0, t.ruler);
+    painter.rect_filled(left, 0.0, t.ruler);
+    painter.rect_filled(Rect::from_min_max(full.min, rect.min), 0.0, t.ruler);
+    painter.line_segment([pos2(rect.min.x, rect.min.y - 0.25), pos2(full.max.x, rect.min.y - 0.25)], Stroke::new(0.5, t.ruler_tick));
+    painter.line_segment([pos2(rect.min.x - 0.25, rect.min.y), pos2(rect.min.x - 0.25, full.max.y)], Stroke::new(0.5, t.ruler_tick));
+    // Zero-point crosshair box.
+    let corner = Rect::from_min_max(full.min, rect.min);
+    let zc = corner.center();
+    painter.line_segment([zc - vec2(4.0, 0.0), zc + vec2(4.0, 0.0)], Stroke::new(1.0, t.ruler_tick));
+    painter.line_segment([zc - vec2(0.0, 4.0), zc + vec2(0.0, 4.0)], Stroke::new(1.0, t.ruler_tick));
+    // While the zero point is dragged out of the corner, the rulers measure from where it would
+    // land (kept on the pasteboard, as the engine keeps it) and crosshair lines show the spot.
+    // Cmd-dragged, the lines are the two guides it makes; locked, a plain drag does nothing.
+    let dragged = ui.data(|d| d.get_temp::<Pos2>(egui::Id::unique((ZERO_POINT_DRAG, app.pane)))).filter(|p| !corner.contains(*p));
+    let guides = ui.input(|i| i.modifiers.command);
+    let moving = dragged.filter(|_| !guides && !doc.settings.zero_point_locked).and_then(|p| zero_point_at(app, xf, p));
+    let cross = if guides { dragged } else { moving.map(|(_, c)| xf.to_screen(c)) };
+    if let Some(p) = cross {
+        let m = Stroke::new(1.0, t.text_dim);
+        dashed(&painter, pos2(p.x, rect.min.y), pos2(p.x, full.max.y), m, 3.0, 3.0);
+        dashed(&painter, pos2(rect.min.x, p.y), pos2(full.max.x, p.y), m, 3.0, 3.0);
+    }
+    let zp = moving.map_or_else(|| doc.zero_point(), |(zp, _)| zp);
+    let pieces = ruler_pieces(app, doc, layout, zp);
+    let Some(&(_, _, origin)) = pieces.first() else { return };
+    let font = egui::FontId::proportional(9.0);
+    let tick = Stroke::new(1.0, t.ruler_tick);
+    // Horizontal: one run of ticks per piece (a page origin restarts at every page).
+    let unit = doc.settings.horizontal_units;
+    let (major, sub) = unit.ruler_ticks(xf.zoom);
+    let (v0, v1) = (xf.to_canvas(top.min).x, xf.to_canvas(pos2(top.max.x, 0.0)).x);
+    for &(from, to, o) in &pieces {
+        // The piece and the visible ruler, measured from the piece's origin.
+        let (s0, s1) = (from - o.x, to - o.x);
+        let (c0, c1) = ((v0 - o.x).max(s0), (v1 - o.x).min(s1));
+        if !(c0.is_finite() && c1.is_finite() && c0 <= c1) {
+            continue;
+        }
+        let mut k = (c0 / major).floor() as i64;
+        while (k as f64) * major <= c1 {
+            let x0 = k as f64 * major;
+            for s in 0..sub {
+                let x = x0 + major * s as f64 / sub as f64;
+                if x < s0 || x >= s1 {
+                    continue;
+                }
+                let sx = xf.to_screen(Point::new(o.x + x, 0.0)).x;
+                let len = if s == 0 {
+                    RULER
+                } else if sub % 2 == 0 && s == sub / 2 {
+                    7.0
+                } else {
+                    4.0
+                };
+                painter.line_segment([pos2(sx, top.max.y - len), pos2(sx, top.max.y)], tick);
+                if s == 0 {
+                    let v = unit.from_pt(x);
+                    painter.text(pos2(sx + 2.0, top.min.y + 1.0), egui::Align2::LEFT_TOP, fmt_tick(v), font.clone(), t.ruler_text);
+                }
+            }
+            k += 1;
+        }
+    }
+    // Vertical.
+    let unit = doc.settings.vertical_units;
+    let (major, sub) = unit.ruler_ticks(xf.zoom);
+    let c0 = xf.to_canvas(pos2(0.0, left.min.y)).y - origin.y;
+    let c1 = xf.to_canvas(pos2(0.0, left.max.y)).y - origin.y;
+    let mut k = (c0 / major).floor() as i64;
+    while (k as f64) * major <= c1 {
+        let y0 = k as f64 * major;
+        for s in 0..sub {
+            let y = y0 + major * s as f64 / sub as f64;
+            let sy = xf.to_screen(Point::new(0.0, origin.y + y)).y;
+            let len = if s == 0 {
+                RULER
+            } else if sub % 2 == 0 && s == sub / 2 {
+                7.0
+            } else {
+                4.0
+            };
+            painter.line_segment([pos2(left.max.x - len, sy), pos2(left.max.x, sy)], tick);
+            if s == 0 {
+                // Stacked digits like InDesign's vertical ruler.
+                let label = fmt_tick(unit.from_pt(y));
+                for (j, ch) in label.chars().enumerate() {
+                    painter.text(pos2(left.min.x + 3.0, sy + 2.0 + j as f32 * 8.5), egui::Align2::LEFT_TOP, ch, font.clone(), t.ruler_text);
+                }
+            }
+        }
+        k += 1;
+    }
+    // Pointer position markers.
+    if let Some(p) = ui.ctx().pointer_hover_pos().filter(|p| rect.contains(*p) && !pointer_elsewhere(app, ui.ctx())) {
+        let m = Stroke::new(1.0, t.text_dim);
+        dashed(&painter, pos2(p.x, top.min.y), pos2(p.x, top.max.y), m, 1.5, 1.5);
+        dashed(&painter, pos2(left.min.x, p.y), pos2(left.max.x, p.y), m, 1.5, 1.5);
+    }
+}
+
+/// The horizontal ruler of the spread in view in pieces `(from x, to x, origin)`, canvas
+/// coordinates: the ruler origin (one per page for a page origin) moved by zero point `zp`.
+pub(super) fn ruler_pieces(app: &DesignApp, doc: &Document, layout: &CanvasLayout, zp: [f64; 2]) -> Vec<(f64, f64, Point)> {
+    let Some(slot) = current_slot(app, layout).and_then(|i| layout.slots.get(i)) else { return Vec::new() };
+    ruler_pieces_of(doc, slot, zp)
+}
+
+/// [`ruler_pieces`] for the spread in `slot`.
+pub(super) fn ruler_pieces_of(doc: &Document, slot: &SpreadSlot, zp: [f64; 2]) -> Vec<(f64, f64, Point)> {
+    let x = |v: f64, y: f64| if v.is_finite() { slot.to_canvas(Point::new(v, y)).x } else { v };
+    doc.ruler_pieces(slot.spread)
+        .into_iter()
+        .map(|(from, to, b)| (x(from, b.y), x(to, b.y), slot.to_canvas(Point::new(b.x + zp[0], b.y + zp[1]))))
+        .collect()
+}
+
+/// The horizontal (top) and vertical (left) rulers around the view `rect` in `full`.
+fn ruler_rects(full: Rect, rect: Rect) -> (Rect, Rect) {
+    (
+        Rect::from_min_max(pos2(rect.min.x, full.min.y), pos2(full.max.x, rect.min.y)),
+        Rect::from_min_max(pos2(full.min.x, rect.min.y), pos2(rect.min.x, full.max.y)),
+    )
+}
+
+/// Right-clicking a ruler opens its menu, as InDesign's: units for that ruler, Hide Rulers and
+/// (the horizontal ruler) Delete All Guides on Spread. Right-clicking the corner where they meet
+/// opens Lock Zero Point and the units for both rulers at once.
+pub(super) fn ruler_units_menus(app: &mut DesignApp, resp: &egui::Response, full: Rect, rect: Rect, doc: &Document) {
+    let (top, left) = ruler_rects(full, rect);
+    let corner = Rect::from_min_max(full.min, rect.min);
+    let at = resp.interact_pointer_pos();
+    let (h, v) = (doc.settings.horizontal_units, doc.settings.vertical_units);
+    let locked = doc.settings.zero_point_locked;
+    // (where, which units it sets, the unit checked)
+    let menus = [(top, RulerMenu::Horizontal, Some(h)), (left, RulerMenu::Vertical, Some(v)), (corner, RulerMenu::Both, (h == v).then_some(h))];
+    for (area, which, cur) in menus {
+        let open = if resp.secondary_clicked() {
+            Some(egui::SetOpenCommand::Bool(at.is_some_and(|p| area.contains(p))))
+        } else if resp.clicked() {
+            Some(egui::SetOpenCommand::Bool(false))
+        } else {
+            None
+        };
+        egui::Popup::context_menu(resp)
+            .id(resp.id.with(("ruler_units", which as u8)))
+            .open_memory(open)
+            .show(|ui| ruler_units_menu(app, ui, which, cur, locked));
+    }
+}
+
+#[derive(Clone, Copy, PartialEq)]
+enum RulerMenu {
+    Horizontal,
+    Vertical,
+    Both,
+}
+
+/// The units a ruler's menu offers, in InDesign's order.
+const RULER_UNITS: [designcraft_geom::Unit; 9] = {
+    use designcraft_geom::Unit::*;
+    [Points, Picas, Inches, InchesDecimal, Millimeters, Centimeters, Ciceros, Agates, Pixels]
+};
+
+/// A ruler's menu: the units (the current one checked), then Hide Rulers and, on the horizontal
+/// ruler, Delete All Guides on Spread. The corner's menu (`Both`) starts with Lock Zero Point
+/// (`locked` = the zero point is locked). Picking a unit sets `horizontalUnits`,
+/// `verticalUnits` or both through `document.preferences`.
+fn ruler_units_menu(app: &mut DesignApp, ui: &mut egui::Ui, which: RulerMenu, cur: Option<designcraft_geom::Unit>, locked: bool) {
+    let lang = app.ui.language.clone();
+    let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
+    if which == RulerMenu::Both {
+        let label = tr(if locked { "Unlock Zero Point" } else { "Lock Zero Point" });
+        if ui.button(crate::rtl::widget(ui, format!("   {label}"))).clicked() {
+            let _ = app.run("view.lockZeroPoint", json!({"on": !locked}));
+            ui.close();
+        }
+        ui.separator();
+    }
+    // A document in Q or Ha keeps its unit on the list.
+    let extra = cur.filter(|u| !RULER_UNITS.contains(u));
+    for u in RULER_UNITS.into_iter().chain(extra) {
+        let label = tr(u.label());
+        let text = if Some(u) == cur { format!("✓ {label}") } else { format!("   {label}") };
+        if ui.button(crate::rtl::widget(ui, text)).clicked() {
+            let p = match which {
+                RulerMenu::Horizontal => json!({"horizontalUnits": u}),
+                RulerMenu::Vertical => json!({"verticalUnits": u}),
+                RulerMenu::Both => json!({"horizontalUnits": u, "verticalUnits": u}),
+            };
+            let _ = app.run("document.preferences", p);
+            ui.close();
+        }
+    }
+    ui.separator();
+    let hide = format!("   {}", tr("Hide Rulers"));
+    if ui
+        .add(egui::Button::new(crate::rtl::widget(ui, hide)).shortcut_text(crate::menus::shortcut_of(app, "view.rulers").unwrap_or_default()))
+        .clicked()
+    {
+        let _ = app.run("view.rulers", json!({}));
+        ui.close();
+    }
+    if which == RulerMenu::Horizontal && ui.button(crate::rtl::widget(ui, format!("   {}", tr("Delete All Guides on Spread")))).clicked() {
+        crate::menus::activate(app, "app.deleteAllGuides", &Value::Null);
+        ui.close();
+    }
+}
+
+pub(crate) fn fmt_tick(v: f64) -> String {
+    let r = v.round();
+    if (v - r).abs() < 1e-6 { format!("{}", r as i64) } else { format!("{v:.1}") }
+}
+
+/// One device pixel, the width InDesign uses for guides and frame edges.
+pub(super) fn hair(painter: &egui::Painter) -> f32 {
+    1.0 / painter.ctx().pixels_per_point()
+}
+
+const ZERO_POINT_DRAG: &str = "canvas_zero_point_drag";
+
+/// The ruler corner: drag from it and the zero point lands where the pointer is released; a click
+/// that stays in the corner leaves it; a double-click resets it. Locked, the corner ignores both.
+/// Cmd-dragged (Ctrl elsewhere), it makes a horizontal and a vertical guide instead.
+/// Holds the pointer position while dragging; returns true while it owns the pointer.
+pub(super) fn zero_point_drag(app: &mut DesignApp, ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, xf: &Xf) -> bool {
+    let id = egui::Id::unique((ZERO_POINT_DRAG, app.pane));
+    let corner = Rect::from_min_max(resp.rect.min, rect.min);
+    let (pressed, released, down, origin, latest, dbl, command) = ui.input(|i| {
+        (
+            i.pointer.primary_pressed(),
+            i.pointer.primary_released(),
+            i.pointer.primary_down(),
+            i.pointer.press_origin(),
+            i.pointer.latest_pos(),
+            i.pointer.button_double_clicked(egui::PointerButton::Primary),
+            i.modifiers.command,
+        )
+    });
+    let mut at: Option<Pos2> = ui.data(|d| d.get_temp(id));
+    if at.is_none() {
+        if !pressed || !resp.hovered() || app.session.active().is_none() || corner.width() <= 0.0 || corner.height() <= 0.0 {
+            return false;
+        }
+        at = origin.filter(|o| corner.contains(*o));
+    }
+    let Some(mut p) = at else { return false };
+    if let Some(l) = latest.filter(|l| l.x.is_finite() && l.y.is_finite()) {
+        p = l;
+    }
+    if !released && down {
+        ui.ctx().set_cursor_icon(egui::CursorIcon::Crosshair);
+        ui.data_mut(|d| d.insert_temp(id, p));
+        return true;
+    }
+    ui.data_mut(|d| d.remove::<Pos2>(id));
+    if !released {
+        // The release happened where we couldn't see it (outside the window).
+        return false;
+    }
+    let locked = app.session.active().is_none_or(|st| st.doc.settings.zero_point_locked);
+    if command {
+        if !corner.contains(p) && rect.contains(p) {
+            corner_guides(app, xf, p);
+        }
+    } else if !locked {
+        if dbl {
+            let _ = app.run("view.zeroPoint", json!({"reset": true}));
+        } else if !corner.contains(p)
+            && let Some((zp, _)) = zero_point_at(app, xf, p)
+        {
+            let _ = app.run("view.zeroPoint", json!({ "at": zp }));
+        }
+    }
+    true
+}
+
+/// A screen point as a zero point (its offset from the ruler origin of the spread in view, kept
+/// on the pasteboard as the engine keeps it), and where that zero point is on the canvas.
+fn zero_point_at(app: &DesignApp, xf: &Xf, p: Pos2) -> Option<([f64; 2], Point)> {
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let slot = layout.slots.get(current_slot(app, &layout)?)?;
+    let sp = slot.to_spread(xf.to_canvas(p));
+    let base = st.doc.ruler_base(slot.spread, sp.x)?;
+    let zp = st.doc.clamp_zero_point([sp.x - base.x, sp.y - base.y])?;
+    Some((zp, slot.to_canvas(Point::new(base.x + zp[0], base.y + zp[1]))))
+}
+
+/// Cmd-drag from the ruler corner: a horizontal and a vertical spread guide through the drop
+/// point, on the spread under it.
+fn corner_guides(app: &mut DesignApp, xf: &Xf, p: Pos2) {
+    if !app.ui.guides || app.ui.guides_locked {
+        return;
+    }
+    let Some((r, sp)) = app.session.active().and_then(|st| CanvasLayout::new(&st.doc, st.editing_parents).spread_at(xf.to_canvas(p))) else {
+        return;
+    };
+    if !(sp.x.is_finite() && sp.y.is_finite()) {
+        return;
+    }
+    let _ = app.run("guide.add", json!({"spread": r, "orientation": "both", "point": [sp.x, sp.y], "spreadGuide": true}));
+}
diff --git a/crates/ui-egui/src/canvas/scroll.rs b/crates/ui-egui/src/canvas/scroll.rs
new file mode 100644
index 000000000..e70785a97
--- /dev/null
+++ b/crates/ui-egui/src/canvas/scroll.rs
@@ -0,0 +1,364 @@
+#[cfg(test)]
+use super::json;
+#[cfg(test)]
+use super::view::set_zoom;
+use super::{CanvasLayout, DesignApp, Mods, Point, PointerEvent, PointerKind, Rect, SCROLLBAR, Sense, Tokens, Xf, pos2, vec2};
+#[cfg(test)]
+use egui::Pos2;
+
+/// Shortest scrollbar thumb.
+const MIN_THUMB: f32 = 18.0;
+
+/// How long egui (0.37 `WheelState`) keeps a scroll action's latched modifiers after the last
+/// wheel event: 150 ms, or a second while fingers rest on a trackpad. The Alt latch below ends
+/// with the action, exactly as egui ends Ctrl/Cmd, so the rest of an ended motion scrolls for
+/// both keys and a later plain scroll is never taken for a zoom.
+const SCROLL_ACTION_TIMEOUT: f64 = 0.150;
+
+const RESTING_FINGER_TIMEOUT: f64 = 1.0;
+
+/// Whether the wheel motion now arriving was made with Alt down. As egui does for Ctrl/Cmd, a
+/// motion keeps its key to its end: the wheel is smoothed over a few frames, and a trackpad swipe
+/// coasts on after the key is let go.
+pub(super) fn wheel_alt(ui: &egui::Ui) -> bool {
+    let id = egui::Id::unique("canvas_wheel_alt");
+    // Alt, whether a trackpad swipe is under way, and the time of the last wheel event.
+    let (mut alt, mut swipe, mut last): (bool, bool, f64) = ui.data(|d| d.get_temp(id)).unwrap_or((false, false, f64::NEG_INFINITY));
+    ui.input(|i| {
+        for e in &i.events {
+            let egui::Event::MouseWheel { phase, modifiers, source, .. } = e else { continue };
+            // egui ends the action (and drops its latched modifiers) when a new event arrives
+            // after this pause; the Alt latch ends there too.
+            let timeout = if swipe && *source == egui::MouseWheelSource::Trackpad { RESTING_FINGER_TIMEOUT } else { SCROLL_ACTION_TIMEOUT };
+            if timeout < i.time - last {
+                alt = false;
+                swipe = false;
+            }
+            last = i.time;
+            (alt, swipe) = match phase {
+                egui::TouchPhase::Start => (modifiers.alt, true),
+                egui::TouchPhase::Move => (modifiers.alt || (swipe && alt), swipe),
+                egui::TouchPhase::End | egui::TouchPhase::Cancel => (false, false),
+            };
+        }
+    });
+    ui.data_mut(|d| d.insert_temp(id, (alt, swipe, last)));
+    alt
+}
+
+pub(super) fn mods(i: &egui::InputState, space: bool) -> Mods {
+    Mods { shift: i.modifiers.shift, alt: i.modifiers.alt, cmd: i.modifiers.command, ctrl: i.modifiers.ctrl, space }
+}
+
+/// Held Space belongs to navigation only when neither the document nor a text field is typing.
+pub(super) fn navigation_space(app: &mut DesignApp, ctx: &egui::Context) -> bool {
+    ctx.input(|i| i.focused && i.key_down(egui::Key::Space)) && !app.session.wants_text() && !ctx.text_edit_focused()
+}
+
+/// Allow temporary Zoom only for Cmd+Space with no pointer press and no busy tool.
+pub(super) fn spring_zoom_mode(app: &DesignApp, ctx: &egui::Context, space: bool) -> bool {
+    let down = ctx.data(|d| d.get_temp::<bool>(egui::Id::unique(("canvas_pointer_down", app.pane)))).unwrap_or(false);
+    space && ctx.input(|i| i.modifiers.command) && !down && !app.session.tool_busy()
+}
+
+#[derive(Clone, Default)]
+struct SpringZoom {
+    tool: designcraft_tools::ZoomTool,
+    down: bool,
+}
+
+/// Lend the Zoom tool the gesture; the selected tool and document selection stay intact.
+pub(super) fn spring_zoom_input(app: &mut DesignApp, ui: &egui::Ui, resp: &egui::Response, xf: &Xf, active: bool) -> bool {
+    let id = egui::Id::unique(("canvas_spring_zoom", app.pane));
+    let mut zoom: SpringZoom = ui.data(|d| d.get_temp(id)).unwrap_or_default();
+    if !ui.input(|i| i.focused) {
+        ui.data_mut(|d| d.remove::<SpringZoom>(id));
+        return false;
+    }
+    if !zoom.down && (!active || ui.input(|i| i.pointer.middle_down())) {
+        return false;
+    }
+    let (pointer, m) = ui.input(|i| (i.pointer.clone(), mods(i, true)));
+    let vi = app.view_info();
+    let mut events = Vec::new();
+    let canvas = if xf.rot == 0 { app.canvas_rect } else { Some(resp.rect) };
+    if pointer.primary_pressed()
+        && resp.hovered()
+        && let Some(p) = pointer.press_origin().filter(|p| canvas.is_some_and(|r| r.contains(*p)))
+    {
+        events.push(PointerEvent { kind: PointerKind::Down, pos: xf.to_canvas(p), mods: m, clicks: 1 });
+        zoom.down = true;
+        resp.request_focus();
+    }
+    if zoom.down
+        && let Some(p) = pointer.interact_pos()
+    {
+        if resp.dragged() && resp.drag_delta() != egui::Vec2::ZERO {
+            events.push(PointerEvent { kind: PointerKind::Drag, pos: xf.to_canvas(p), mods: m, clicks: 1 });
+        }
+        if pointer.primary_released() {
+            events.push(PointerEvent { kind: PointerKind::Up, pos: xf.to_canvas(p), mods: m, clicks: 1 });
+            zoom.down = false;
+        }
+    }
+    for e in events {
+        if let Err(err) = app.session.pointer_with_tool(&mut zoom.tool, &e, vi) {
+            app.status(err.to_string());
+        }
+    }
+    app.after_engine();
+    // Keep ownership until pointer release even if the shortcut was released first, so an Up
+    // cannot leak into the previous tool and edit the document.
+    ui.data_mut(|d| d.insert_temp(id, zoom));
+    true
+}
+
+/// Move the view's content by a screen-space distance `d` (rotated views move in screen axes).
+pub(super) fn pan(app: &mut DesignApp, xf: &Xf, d: egui::Vec2) {
+    let d = xf.unrotate_delta(d);
+    if let Some(v) = app.view_mut() {
+        v.origin = Point::new(v.origin.x - d.x as f64 / v.zoom, v.origin.y - d.y as f64 / v.zoom);
+    }
+}
+
+/// A scrollbar thumb on a track `track` pixels long, for `visible` (the view) within `content`
+/// (the pasteboard), both spans along the bar's axis in screen pixels: the thumb's start and
+/// length on the track, and the content pixels one thumb pixel moves (0 when nothing scrolls).
+fn thumb_span(track: f32, content: (f32, f32), visible: (f32, f32)) -> (f32, f32, f32) {
+    let track = track.max(0.0);
+    let (lo, hi) = (content.0.min(visible.0), content.1.max(visible.1));
+    let (total, shown) = (hi - lo, visible.1 - visible.0);
+    let scrollable = total - shown;
+    if !total.is_finite() || !shown.is_finite() || total <= 0.0 || scrollable <= 0.0 {
+        return (0.0, track, 0.0);
+    }
+    let len = (track * shown / total).max(MIN_THUMB.min(track));
+    let free = track - len;
+    if free <= 0.0 {
+        return (0.0, track, 0.0);
+    }
+    ((visible.0 - lo) / scrollable * free, len, scrollable / free)
+}
+
+/// The track and thumb of the vertical (or horizontal) scrollbar of the view `screen` inside
+/// `outer`, and the content pixels per thumb pixel.
+fn scrollbar_rects(outer: Rect, screen: Rect, content: Rect, vertical: bool) -> (Rect, Rect, f32) {
+    if vertical {
+        let track = Rect::from_min_max(pos2(outer.max.x - SCROLLBAR, screen.min.y), pos2(outer.max.x, screen.max.y));
+        let (start, len, k) = thumb_span(track.height(), (content.min.y, content.max.y), (screen.min.y, screen.max.y));
+        (track, Rect::from_min_size(pos2(track.min.x, track.min.y + start), vec2(SCROLLBAR, len)), k)
+    } else {
+        let track = Rect::from_min_max(pos2(screen.min.x, outer.max.y - SCROLLBAR), pos2(screen.max.x, outer.max.y));
+        let (start, len, k) = thumb_span(track.width(), (content.min.x, content.max.x), (screen.min.x, screen.max.x));
+        (track, Rect::from_min_size(pos2(track.min.x + start, track.min.y), vec2(len, SCROLLBAR)), k)
+    }
+}
+
+/// How far a scrollbar interaction pans the view along its axis: a thumb drag follows the pointer,
+/// a click on the track beside the thumb pages by one view.
+fn scrollbar_move(resp: &egui::Response, grabbed: bool, vertical: bool, thumb: Rect, page: f32, k: f32) -> f32 {
+    if grabbed {
+        let d = resp.drag_delta();
+        return -(if vertical { d.y } else { d.x }) * k;
+    }
+    if resp.clicked()
+        && let Some(p) = resp.interact_pointer_pos()
+    {
+        let (p, a, b) = if vertical { (p.y, thumb.min.y, thumb.max.y) } else { (p.x, thumb.min.x, thumb.max.x) };
+        if p < a {
+            return page;
+        } else if p > b {
+            return -page;
+        }
+    }
+    0.0
+}
+
+/// The view's scrollbars, on the right and bottom edges of `outer`: they span the pasteboard;
+/// dragging a thumb pans, clicking the track pages by one view.
+pub(super) fn scrollbars(app: &mut DesignApp, ui: &mut egui::Ui, outer: Rect, screen: Rect, rect: Rect, t: &Tokens) {
+    let content = |app: &DesignApp| {
+        let st = app.session.active()?;
+        let v = app.view()?;
+        let xf = Xf::new(rect, v);
+        Some((xf, xf.rect(CanvasLayout::new(&st.doc, st.editing_parents).pasteboard)))
+    };
+    let Some((xf, cb)) = content(app) else { return };
+    let press = ui.input(|i| i.pointer.press_origin());
+    let mut hot = [false; 2];
+    for (n, vertical) in [true, false].into_iter().enumerate() {
+        let (track, thumb, k) = scrollbar_rects(outer, screen, cb, vertical);
+        let id = egui::Id::unique(("canvas_scrollbar", app.pane, vertical));
+        let resp = ui.interact(track, id, Sense::click_and_drag());
+        let grab_id = id.with("grab");
+        if resp.drag_started() {
+            let on_thumb = press.is_some_and(|p| thumb.contains(p));
+            ui.data_mut(|d| d.insert_temp(grab_id, on_thumb));
+        }
+        let grabbed = resp.dragged() && ui.data(|d| d.get_temp::<bool>(grab_id)).unwrap_or(false);
+        if !resp.dragged() {
+            ui.data_mut(|d| d.remove::<bool>(grab_id));
+        }
+        let page = if vertical { screen.size().y } else { screen.size().x };
+        let moved = scrollbar_move(&resp, grabbed, vertical, thumb, page, k);
+        if moved != 0.0 && moved.is_finite() {
+            pan(app, &xf, if vertical { vec2(0.0, moved) } else { vec2(moved, 0.0) });
+        }
+        if let Some(slot) = hot.get_mut(n) {
+            *slot = grabbed || resp.hovered();
+        }
+    }
+    // Painted from the view as it is after this frame's input.
+    let Some((_, cb)) = content(app) else { return };
+    let painter = ui.painter_at(outer);
+    let right = Rect::from_min_max(pos2(outer.max.x - SCROLLBAR, outer.min.y), outer.max);
+    let bottom = Rect::from_min_max(pos2(outer.min.x, outer.max.y - SCROLLBAR), outer.max);
+    painter.rect_filled(right, 0.0, t.panel_darker);
+    painter.rect_filled(bottom, 0.0, t.panel_darker);
+    for (n, vertical) in [true, false].into_iter().enumerate() {
+        let (_, thumb, _) = scrollbar_rects(outer, screen, cb, vertical);
+        let alpha = if hot.get(n).copied().unwrap_or(false) { 0.6 } else { 0.35 };
+        painter.rect_filled(thumb.shrink(2.0), SCROLLBAR / 2.0 - 2.0, t.text.gamma_multiply(alpha));
+    }
+}
+
+#[cfg(test)]
+mod scrollbar_tests {
+    use egui::{Event, Modifiers, PointerButton};
+    use egui_kittest::Harness;
+
+    use super::*;
+    use crate::test_window::{Window, open, wheel};
+
+    fn window() -> Harness<'static, Window> {
+        let mut h = open(DesignApp::new(designcraft_engine::Session::new(), crate::Services::default()), vec2(1440.0, 900.0));
+        // Zoomed in so both axes scroll.
+        set_zoom(&mut h.state_mut().app, 2.0);
+        h.run_steps(3);
+        h
+    }
+
+    fn origin(h: &Harness<'static, Window>) -> Point {
+        h.state().app.view().map(|v| v.origin).unwrap_or_default()
+    }
+
+    /// The scrollbar's track and thumb as the canvas lays them out for the current view, and
+    /// the content pixels per thumb pixel.
+    fn bar(h: &Harness<'static, Window>, vertical: bool) -> (Rect, Rect, f32) {
+        let app = &h.state().app;
+        let rect = app.canvas_rect.unwrap();
+        let st = app.session.active().unwrap();
+        let xf = Xf::new(rect, app.view().unwrap());
+        let cb = xf.rect(CanvasLayout::new(&st.doc, st.editing_parents).pasteboard);
+        let outer = Rect::from_min_max(rect.min, rect.max + vec2(SCROLLBAR, SCROLLBAR));
+        scrollbar_rects(outer, rect, cb, vertical)
+    }
+
+    /// A primary-button drag from `a` to `b` in a few moves, with `mods` held throughout.
+    fn drag(h: &mut Harness<'static, Window>, a: Pos2, b: Pos2, mods: Modifiers) {
+        h.event(Event::ModifiersChanged(mods));
+        h.hover_at(a);
+        h.step();
+        h.event(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: true, modifiers: mods });
+        h.step();
+        for n in 1..=4 {
+            h.hover_at(a + (b - a) * n as f32 / 4.0);
+            h.step();
+        }
+        h.event(Event::PointerButton { pos: b, button: PointerButton::Primary, pressed: false, modifiers: mods });
+        h.event(Event::ModifiersChanged(Modifiers::NONE));
+        h.run_steps(3);
+    }
+
+    /// Scrollbars sit immediately outside the view, have non-full-size thumbs and use a positive content scale.
+    #[test]
+    fn document_views_have_scrollbars_beside_the_view() {
+        let h = window();
+        let rect = h.state().app.canvas_rect.unwrap();
+        for vertical in [true, false] {
+            let r = h.ctx.read_response(egui::Id::unique(("canvas_scrollbar", 0u8, vertical))).expect("scrollbar").rect;
+            let (track, thumb, k) = bar(&h, vertical);
+            assert_eq!(r, track);
+            assert!(k > 0.0, "the zoomed-in view scrolls");
+            if vertical {
+                assert_eq!((r.min.x, r.width(), r.min.y, r.max.y), (rect.max.x, SCROLLBAR, rect.min.y, rect.max.y));
+                assert!(thumb.height() < track.height());
+            } else {
+                assert_eq!((r.min.y, r.height(), r.min.x, r.max.x), (rect.max.y, SCROLLBAR, rect.min.x, rect.max.x));
+                assert!(thumb.width() < track.width());
+            }
+        }
+    }
+
+    #[test]
+    fn dragging_a_thumb_pans_and_clicking_the_track_pages() {
+        let mut h = window();
+        let zoom = h.state().app.view().unwrap().zoom;
+        // Vertical thumb: down 40 px moves the view down by 40 thumb pixels' worth of content.
+        let (_, thumb, k) = bar(&h, true);
+        let before = origin(&h);
+        drag(&mut h, thumb.center(), thumb.center() + vec2(0.0, 40.0), Modifiers::NONE);
+        let after = origin(&h);
+        let want = 40.0 * k as f64 / zoom;
+        assert!((after.y - before.y - want).abs() < want * 0.2, "{before:?} → {after:?}, want +{want}");
+        assert_eq!(after.x, before.x);
+        // Horizontal thumb: left 30 px.
+        let (_, thumb, k) = bar(&h, false);
+        drag(&mut h, thumb.center(), thumb.center() - vec2(30.0, 0.0), Modifiers::NONE);
+        let next = origin(&h);
+        let want = 30.0 * k as f64 / zoom;
+        assert!((after.x - next.x - want).abs() < want * 0.2, "{after:?} → {next:?}, want -{want}");
+        assert_eq!(next.y, after.y);
+        // A click on the vertical track above the thumb pages up by one view.
+        let (track, thumb, _) = bar(&h, true);
+        assert!(thumb.min.y - track.min.y > 4.0);
+        crate::test_window::click_at(&mut h, pos2(track.center().x, track.min.y + 2.0));
+        let paged = origin(&h);
+        let view = h.state().app.canvas_rect.unwrap().height() as f64 / zoom;
+        assert!((next.y - paged.y - view).abs() < 0.01, "{next:?} → {paged:?}, want -{view}");
+    }
+
+    /// Wheel scrolling moves both thumbs and keeps the painted scrollbar rect in sync.
+    #[test]
+    fn scrolling_the_view_moves_the_thumbs() {
+        let mut h = window();
+        let (_, v0, _) = bar(&h, true);
+        let (_, h0, _) = bar(&h, false);
+        let c = h.state().app.canvas_rect.unwrap().center();
+        wheel(&mut h, c, vec2(-50.0, -80.0));
+        let (_, v1, _) = bar(&h, true);
+        let (_, h1, _) = bar(&h, false);
+        assert!(v1.min.y > v0.min.y && h1.min.x > h0.min.x, "{v0:?} → {v1:?}, {h0:?} → {h1:?}");
+        let r = h.ctx.read_response(egui::Id::unique(("canvas_scrollbar", 0u8, true))).expect("scrollbar");
+        assert_eq!(r.rect, bar(&h, true).0);
+    }
+
+    #[test]
+    fn alt_drag_while_editing_text_pans_and_keeps_the_caret() {
+        let mut h = window();
+        let app = &mut h.state_mut().app;
+        let rect = app.canvas_rect.unwrap();
+        let xf = Xf::new(rect, app.view().unwrap());
+        // A text frame filling the visible part of the page, with the caret in it.
+        let (a, b) = (xf.to_canvas(rect.min + vec2(20.0, 20.0)), xf.to_canvas(rect.max - vec2(20.0, 20.0)));
+        let r = app.run("frame.create", json!({"rect": [a.x, a.y, b.x, b.y], "content": "text", "text": "Hello brave world"})).unwrap();
+        let sid = r["story"].as_u64().unwrap();
+        app.run("tool.select", json!({"tool": "type"})).unwrap();
+        app.run("text.select", json!({"story": sid, "anchor": 3, "focus": 3})).unwrap();
+        assert!(app.session.wants_text());
+        h.run_steps(2);
+        let caret = h.state().app.session.doc().unwrap().selection.text;
+        let before = origin(&h);
+        let zoom = h.state().app.view().unwrap().zoom;
+        let from = rect.center();
+        drag(&mut h, from, from + vec2(60.0, 40.0), Modifiers::ALT);
+        let after = origin(&h);
+        assert!(after.x < before.x && after.y < before.y, "{before:?} → {after:?}");
+        assert!((before.x - after.x - 60.0 / zoom).abs() < 15.0 / zoom, "{before:?} → {after:?}");
+        assert_eq!(h.state().app.session.doc().unwrap().selection.text, caret);
+        assert!(h.state_mut().app.session.wants_text(), "still editing text");
+        // Without Alt the same drag selects text and leaves the view alone.
+        drag(&mut h, from, from + vec2(60.0, 40.0), Modifiers::NONE);
+        assert_eq!(origin(&h), after);
+    }
+}
diff --git a/crates/ui-egui/src/canvas/tests.rs b/crates/ui-egui/src/canvas/tests.rs
new file mode 100644
index 000000000..01300bdd0
--- /dev/null
+++ b/crates/ui-egui/src/canvas/tests.rs
@@ -0,0 +1,2839 @@
+use designcraft_geom::Unit;
+use egui_kittest::{Harness, kittest::Queryable};
+
+use super::*;
+
+#[test]
+fn a_press_after_a_drag_is_not_a_double_click() {
+    let (delay, dist) = (0.3, 6.0);
+    let press = |last, x: f32, now| press_count(last, pos2(x, 0.0), now, delay, dist);
+    // Click, click: a double click.
+    let n = press(None, 0.0, 0.0);
+    let up = release_clicks(Clicks { at: f64::NEG_INFINITY, pos: pos2(0.0, 0.0), n }, pos2(0.0, 0.0), 0.1, dist);
+    assert_eq!(press(Some(up), 1.0, 0.2), 2);
+    // A drag from 0 to 100, then a fast press where it started or where it ended: a single click.
+    let up = release_clicks(Clicks { at: f64::NEG_INFINITY, pos: pos2(0.0, 0.0), n: 1 }, pos2(100.0, 0.0), 0.1, dist);
+    assert_eq!(press(Some(up), 0.0, 0.2), 1);
+    assert_eq!(press(Some(up), 100.0, 0.2), 1);
+    // Too slow: a single click.
+    let up = release_clicks(Clicks { at: f64::NEG_INFINITY, pos: pos2(0.0, 0.0), n: 1 }, pos2(0.0, 0.0), 0.1, dist);
+    assert_eq!(press(Some(up), 0.0, 1.0), 1);
+}
+
+/// While a page's render is on its way the page shows paper, not the black of its shadow.
+#[test]
+fn pages_show_paper_under_their_render() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", serde_json::json!({"pages": 3, "facingPages": true})).unwrap();
+    let ctx = egui::Context::default();
+    let mut shapes = Vec::new();
+    for _ in 0..2 {
+        let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), ..Default::default() };
+        let mut out = ctx.run_ui(raw, |ui| show(&mut app, ui));
+        out.textures_delta.clear();
+        shapes = out.shapes;
+    }
+    let st = app.session.active().unwrap();
+    let layout = CanvasLayout::new(&st.doc, false);
+    let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
+    // The paper swatch on screen (white, as the colour settings show it).
+    let [r, g, b, _] = st.doc.resolve_color(designcraft_color::swatch::PAPER, 1.0).unwrap().to_rgba8(1.0);
+    let paper: Vec<Rect> = shapes
+        .iter()
+        .filter_map(|c| match &c.shape {
+            egui::Shape::Rect(s) if s.fill == Color32::from_rgb(r, g, b) => Some(s.rect),
+            _ => None,
+        })
+        .collect();
+    // Each page on its own (a spread's pages may differ in size).
+    assert_eq!(paper.len(), st.doc.page_count());
+    for abs in 0..st.doc.page_count() {
+        let want = xf.rect(layout.page_rect(&st.doc, abs).unwrap());
+        assert!(paper.iter().any(|r| (r.min - want.min).length() < 0.01 && (r.max - want.max).length() < 0.01), "page {abs}");
+    }
+}
+
+/// Bleed and Slug are preview modes: like Preview they hide the guides, and what the page
+/// shows widens to the bleed or the slug box. The slug guide is drawn in Normal, in its own
+/// colour, beside the bleed guide.
+#[test]
+fn bleed_and_slug_are_preview_modes_that_show_their_area() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", serde_json::json!({"bleed": 9, "slug": 18})).unwrap();
+    let strokes = |app: &mut DesignApp, want: [u8; 3]| -> usize {
+        let ctx = egui::Context::default();
+        let mut shapes = Vec::new();
+        for _ in 0..2 {
+            let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0))), ..Default::default() };
+            let mut out = ctx.run_ui(raw, |ui| show(app, ui));
+            out.textures_delta.clear();
+            shapes = out.shapes;
+        }
+        let want = c32(want);
+        shapes.iter().filter(|c| matches!(&c.shape, egui::Shape::Rect(s) if s.stroke.color == want)).count()
+    };
+    let s = app.session.active().unwrap().doc.settings.clone();
+    // Normal draws every guide, the slug's among them.
+    app.ui.screen_mode = ScreenMode::Normal;
+    assert!(strokes(&mut app, s.margin_color) > 0, "Normal draws the margin guide");
+    assert!(strokes(&mut app, s.bleed_color) > 0, "Normal draws the bleed guide");
+    assert!(strokes(&mut app, s.slug_color) > 0, "Normal draws the slug guide");
+    // Every preview mode hides them.
+    for mode in [ScreenMode::Preview, ScreenMode::Bleed, ScreenMode::Slug, ScreenMode::Presentation] {
+        app.ui.screen_mode = mode;
+        assert_eq!(strokes(&mut app, s.margin_color), 0, "{mode:?} hides the margin guide");
+        assert_eq!(strokes(&mut app, s.slug_color), 0, "{mode:?} hides the slug guide");
+    }
+}
+
+/// Each preview mode's shown area: Preview stops at the trim, Bleed reaches the bleed box and
+/// Slug the slug box. A slug narrower than the bleed never pulls the edge back in.
+#[test]
+fn shown_area_widens_to_the_bleed_and_slug_boxes() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", serde_json::json!({"bleed": 9, "slug": 18})).unwrap();
+    let doc = app.session.active().unwrap().doc.clone();
+    let layout = CanvasLayout::new(&doc, false);
+    let xf = Xf::new(Rect::from_min_size(Pos2::ZERO, vec2(1440.0, 900.0)), &View::default());
+    let slot = &layout.slots[0];
+    let area = |app: &mut DesignApp, mode| {
+        app.ui.screen_mode = mode;
+        shown_area(app, &doc, &xf, slot)
+    };
+    let trim = xf.rect(slot.bounds);
+    assert_eq!(area(&mut app, ScreenMode::Preview), trim, "Preview stops at the trim");
+    assert_eq!(area(&mut app, ScreenMode::Presentation), trim, "Presentation stops at the trim");
+    let bleed = area(&mut app, ScreenMode::Bleed);
+    let slug = area(&mut app, ScreenMode::Slug);
+    assert!(bleed.contains_rect(trim) && bleed != trim, "Bleed reaches past the trim");
+    assert!(slug.contains_rect(bleed) && slug != bleed, "Slug reaches past the bleed");
+    // 9 pt of bleed and 18 pt of slug at this zoom, on every edge.
+    let grew = |r: Rect, pt: f64| {
+        let d = (pt * xf.zoom) as f32;
+        (r.min - trim.min + vec2(d, d)).length() < 0.01 && (r.max - trim.max - vec2(d, d)).length() < 0.01
+    };
+    assert!(grew(bleed, 9.0), "Bleed grows by the bleed: {bleed:?}");
+    assert!(grew(slug, 18.0), "Slug grows by the slug: {slug:?}");
+    // A slug inside the bleed: Slug still shows every printing element, so the bleed too.
+    app.run("file.new", serde_json::json!({"bleed": 18, "slug": 9})).unwrap();
+    let doc = app.session.active().unwrap().doc.clone();
+    app.ui.screen_mode = ScreenMode::Slug;
+    assert!(grew(shown_area(&app, &doc, &xf, slot), 18.0), "the wider of the two boxes wins");
+    // No bleed and no slug: nothing to widen to.
+    app.run("file.new", serde_json::json!({})).unwrap();
+    let doc = app.session.active().unwrap().doc.clone();
+    for mode in [ScreenMode::Bleed, ScreenMode::Slug] {
+        app.ui.screen_mode = mode;
+        assert_eq!(shown_area(&app, &doc, &xf, slot), trim, "{mode:?} without a bleed or slug");
+    }
+}
+
+/// Build the four-fps app harness used by canvas tests.
+fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
+    harness_with_step(app, 1.0 / 4.0)
+}
+
+/// A window whose frames last `step_dt` seconds. Wheel motion is tested at a realistic frame
+/// rate: egui ends a scroll action after 150 ms without wheel events, so quarter-second
+/// frames would split every motion into separate actions.
+fn harness_with_step(app: DesignApp, step_dt: f32) -> Harness<'static, DesignApp> {
+    let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).with_step_dt(step_dt).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let ctx = ui.ctx().clone();
+            app.logic(&ctx);
+            app.ui(ui);
+        },
+        app,
+    );
+    h.run_steps(4);
+    h
+}
+
+#[test]
+fn display_option_change_drops_the_render_in_flight() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let shown = crate::Shown { doc: (1, 2, 3, false), origin: Point::new(0.0, 0.0), zoom: 1.0, size: (10.0, 10.0), editing_parents: false };
+    invalidate_on_display_change(&mut app);
+    app.canvas.shown = Some(shown);
+    app.canvas.pending = Some((7, shown));
+    // Nothing changed: the texture and the request stay.
+    invalidate_on_display_change(&mut app);
+    assert!(app.canvas.shown.is_some() && app.canvas.pending.is_some());
+    // A display option changed while the render ran: its result must not be accepted.
+    app.ui.display_quality = designcraft_render::DisplayQuality::Fast;
+    invalidate_on_display_change(&mut app);
+    assert!(app.canvas.shown.is_none() && app.canvas.pending.is_none() && app.canvas.pending_doc.is_none());
+    // The document grid is drawn into the texture too.
+    app.canvas.shown = Some(shown);
+    app.ui.document_grid = !app.ui.document_grid;
+    invalidate_on_display_change(&mut app);
+    assert!(app.canvas.shown.is_none());
+}
+
+/// A primary-button drag from `a` to `b` over a few frames.
+fn drag(h: &mut Harness<'_, DesignApp>, a: Pos2, b: Pos2) {
+    h.hover_at(a);
+    h.step();
+    h.event(egui::Event::PointerButton { pos: a, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
+    h.step();
+    for k in 1..=4 {
+        h.hover_at(a + (b - a) * (k as f32 / 4.0));
+        h.step();
+    }
+    h.event(egui::Event::PointerButton { pos: b, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() });
+    h.run_steps(3);
+}
+
+#[test]
+fn the_page_tool_draws_liquid_guides_from_the_rulers() {
+    // Chris Cicchino's Page Tool and Liquid Layout video (11:00): with the Page tool, a guide
+    // dragged from the ruler is a liquid guide (dashed).
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.session.set_tool("page");
+    let mut h = harness(app);
+    let r = h.state().canvas_rect.unwrap();
+    let guides = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().doc.spreads[0].pages[0].guides.clone();
+    drag(&mut h, pos2(r.center().x, r.min.y - 8.0), r.center());
+    let g = guides(&h);
+    assert_eq!(g.len(), 1, "{g:?}");
+    assert!(g[0].liquid && g[0].orientation == designcraft_doc::Orientation::Horizontal);
+    // With the Selection tool it's a ruler guide.
+    h.state_mut().session.set_tool("selection");
+    drag(&mut h, pos2(r.center().x, r.min.y - 8.0), r.center() + vec2(0.0, 40.0));
+    let g = guides(&h);
+    assert_eq!(g.len(), 2);
+    assert!(!g[1].liquid);
+}
+
+/// Dragging a column guide with the Selection tool moves its gutter (one undo step); with
+/// column guides locked the same drag leaves the columns alone.
+#[test]
+fn the_selection_tool_drags_a_column_guide() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    // Two columns across the 540 pt margin box: the gutter's left edge is at x = 300.
+    app.run("layout.marginsAndColumns", json!({"parent": "A", "columns": 2, "gutter": 12})).unwrap();
+    let mut h = harness(app);
+    let page = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().doc.spreads[0].pages[0].clone();
+    let screen = |h: &Harness<'_, DesignApp>, x: f64| {
+        let app = h.state();
+        let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
+        let layout = CanvasLayout::new(&app.session.active().unwrap().doc, false);
+        let slot = layout.slots.iter().find(|s| s.spread == SpreadRef::Doc(0)).unwrap();
+        (xf.to_screen(slot.xf * Point::new(x, 400.0)), xf.zoom as f32)
+    };
+    let (at, zoom) = screen(&h, 300.0);
+    drag(&mut h, at, at + vec2(72.0 * zoom, 0.0));
+    assert_eq!(page(&h).columns.positions, None, "column guides are locked in a new document");
+    h.hover_at(at);
+    h.run_steps(2);
+    assert_ne!(h.output().platform_output.cursor_icon, egui::CursorIcon::ResizeHorizontal);
+
+    h.state_mut().run("view.lockColumnGuides", json!({"on": false})).unwrap();
+    h.run_steps(2);
+    let (at, zoom) = screen(&h, 300.0);
+    drag(&mut h, at, at + vec2(72.0 * zoom, 0.0));
+    let pg = page(&h);
+    let cols = pg.column_rects();
+    assert!((cols[0].x1 - 372.0).abs() < 1.0 && (cols[1].x0 - cols[0].x1 - 12.0).abs() < 1e-9, "{cols:?}");
+    assert!(pg.local_margins, "the dragged page's columns are its own");
+    // Over the moved guide: a resize cursor.
+    h.hover_at(screen(&h, 372.0).0);
+    h.run_steps(2);
+    assert_eq!(h.output().platform_output.cursor_icon, egui::CursorIcon::ResizeHorizontal);
+    h.state_mut().run("edit.undo", json!({})).unwrap();
+    assert_eq!(page(&h).columns.positions, None, "one undo step");
+
+    // Escape during the drag puts the gutter back.
+    h.hover_at(at);
+    h.step();
+    h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
+    h.step();
+    h.hover_at(at + vec2(40.0, 0.0));
+    h.step();
+    assert!(page(&h).columns.positions.is_some(), "the drag previews");
+    h.event(egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() });
+    h.step();
+    h.event(egui::Event::PointerButton {
+        pos: at + vec2(40.0, 0.0),
+        button: egui::PointerButton::Primary,
+        pressed: false,
+        modifiers: Default::default(),
+    });
+    h.run_steps(3);
+    assert_eq!(page(&h).columns.positions, None);
+    assert!(!page(&h).local_margins);
+
+    // Space pressed during the drag and the button released under it: the drag ends with the
+    // release and the gutter stops following the pointer.
+    let key = |pressed| egui::Event::Key { key: egui::Key::Space, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
+    h.hover_at(at);
+    h.step();
+    h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
+    h.step();
+    h.hover_at(at + vec2(40.0, 0.0));
+    h.step();
+    h.event(key(true));
+    h.step();
+    h.event(egui::Event::PointerButton {
+        pos: at + vec2(40.0, 0.0),
+        button: egui::PointerButton::Primary,
+        pressed: false,
+        modifiers: Default::default(),
+    });
+    h.step();
+    h.event(key(false));
+    h.run_steps(2);
+    let moved = page(&h).columns.positions;
+    assert!(moved.is_some());
+    h.hover_at(at + vec2(120.0, 0.0));
+    h.run_steps(3);
+    assert_eq!(page(&h).columns.positions, moved, "the gutter stays where the drag ended");
+    assert!(h.state().session.active().unwrap().interaction.is_none());
+    h.state_mut().run("edit.undo", json!({})).unwrap();
+    assert_eq!(page(&h).columns.positions, None, "the drag was one undo step");
+}
+
+/// A column guide is not picked where the screen mode hides guides, where an object on the
+/// parent being edited lies over it, or where its columns cannot move.
+#[test]
+fn column_guides_are_picked_only_where_a_drag_can_move_them() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 1})).unwrap();
+    app.run("layout.marginsAndColumns", json!({"parent": "A", "columns": 2, "gutter": 12})).unwrap();
+    app.run("view.lockColumnGuides", json!({"on": false})).unwrap();
+    let mut h = harness(app);
+    let hit = |h: &Harness<'_, DesignApp>, r: SpreadRef, x: f64| {
+        let app = h.state();
+        let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
+        let st = app.session.active().unwrap();
+        let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+        let slot = layout.slots.iter().find(|s| s.spread == r).unwrap();
+        column_guide_at(app, &xf, xf.to_screen(slot.xf * Point::new(x, 400.0)))
+    };
+    assert!(hit(&h, SpreadRef::Doc(0), 300.0).is_some());
+    h.state_mut().ui.screen_mode = ScreenMode::Preview;
+    assert!(hit(&h, SpreadRef::Doc(0), 300.0).is_none(), "Preview hides the guides");
+    h.state_mut().ui.screen_mode = ScreenMode::Normal;
+
+    // Editing parent A: its right page (the one page 0 follows) and a frame over its gutter.
+    h.state_mut().run("layout.parents.edit", json!({"on": true, "parent": "A-Parent"})).unwrap();
+    h.run_steps(2);
+    let parent = SpreadRef::Parent(0);
+    let x = h.state().session.active().unwrap().doc.parents[0].pages[1].column_rects()[0].x1;
+    assert!(hit(&h, parent, x).is_some());
+    h.state_mut()
+        .run("frame.create", json!({"spread": {"kind": "parent", "index": 0}, "rect": [x - 20.0, 300.0, x + 20.0, 500.0], "content": "text"}))
+        .unwrap();
+    h.run_steps(2);
+    assert!(hit(&h, parent, x).is_none(), "the parent's frame takes the press");
+    h.state_mut().run("layout.parents.edit", json!({"on": false})).unwrap();
+    h.run_steps(2);
+
+    // Gutters wider than the margin box: the even split cannot be moved.
+    h.state_mut().run("layout.marginsAndColumns", json!({"pages": [0], "columns": 2, "gutter": 1000})).unwrap();
+    h.run_steps(2);
+    let x = h.state().session.active().unwrap().doc.spreads[0].pages[0].column_rects()[0].x1;
+    assert!(hit(&h, SpreadRef::Doc(0), x).is_none());
+}
+
+fn right_click(h: &mut Harness<'_, DesignApp>, p: Pos2) {
+    h.hover_at(p);
+    h.step();
+    for pressed in [true, false] {
+        h.event(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Secondary, pressed, modifiers: Default::default() });
+    }
+    h.run_steps(3);
+}
+
+fn new_document() -> Harness<'static, DesignApp> {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    harness(app)
+}
+
+/// [`new_document`] at 60 frames a second, the cadence a wheel motion really arrives at.
+fn new_document_60fps() -> Harness<'static, DesignApp> {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    harness_with_step(app, 1.0 / 60.0)
+}
+
+fn held(modifiers: egui::Modifiers) -> egui::Event {
+    egui::Event::ModifiersChanged(modifiers)
+}
+
+/// Construct a point-unit vertical mouse-wheel event with an unknown source.
+fn wheel(phase: egui::TouchPhase, up: f32, modifiers: egui::Modifiers) -> egui::Event {
+    egui::Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta: vec2(0.0, up), phase, modifiers, source: egui::MouseWheelSource::Unknown }
+}
+
+// Plays `events` with the pointer at `at`, a frame each, and lets the motion settle.
+fn play(h: &mut Harness<'_, DesignApp>, at: Pos2, events: &[egui::Event]) -> View {
+    h.hover_at(at);
+    for event in events {
+        h.event(event.clone());
+        h.step();
+    }
+    h.run_steps(30);
+    *h.state().view().unwrap()
+}
+
+/// Alt + wheel scrolled the view like the plain wheel; it zooms at the pointer (#470).
+#[test]
+fn alt_wheel_zooms_at_the_pointer() {
+    use egui::{Modifiers, TouchPhase::Move};
+    let mut h = new_document();
+    let rect = h.state().canvas_rect.unwrap();
+    let at = rect.center() + vec2(150.0, 90.0);
+    let before = *h.state().view().unwrap();
+    let under = Xf::new(rect, &before).to_canvas(at);
+    let zoomed = play(&mut h, at, &[held(Modifiers::ALT), wheel(Move, 100.0, Modifiers::ALT)]);
+    assert!(zoomed.zoom > before.zoom * 1.2, "wheel up zooms in: {} -> {}", before.zoom, zoomed.zoom);
+    let still = Xf::new(rect, &zoomed).to_canvas(at);
+    assert!((still.x - under.x).abs() < 0.01 && (still.y - under.y).abs() < 0.01, "the point under the pointer stays: {under:?} -> {still:?}");
+    let back = play(&mut h, at, &[held(Modifiers::ALT), wheel(Move, -100.0, Modifiers::ALT)]);
+    assert!((back.zoom - before.zoom).abs() < 1e-6, "wheel down zooms out: {} -> {}", zoomed.zoom, back.zoom);
+    // The plain wheel still scrolls.
+    let scrolled = play(&mut h, at, &[held(Modifiers::NONE), wheel(Move, 100.0, Modifiers::NONE)]);
+    assert!(scrolled.zoom == back.zoom && scrolled.origin.y < back.origin.y, "{back:?} -> {scrolled:?}");
+}
+
+/// Alt zooms exactly as Ctrl/Cmd does, also when the key is let go while the wheel's motion is
+/// still arriving: the rest of it zooms too and does not scroll the page.
+#[test]
+fn alt_wheel_zooms_like_ctrl_wheel_to_the_end_of_the_motion() {
+    use egui::{
+        Modifiers,
+        TouchPhase::{End, Move, Start},
+    };
+    const NONE: Modifiers = Modifiers::NONE;
+    // Each motion in steps; the views are compared after every step.
+    let motions: [fn(Modifiers) -> Vec<Vec<egui::Event>>; 4] = [
+        |key| vec![vec![held(key), wheel(Move, 100.0, key)]],
+        // A wheel turned fast, the key let go a frame later.
+        |key| vec![vec![held(key), wheel(Move, 400.0, key), held(NONE)]],
+        // A trackpad swipe that coasts on after the key is let go; once it has ended, the wheel scrolls.
+        |key| {
+            vec![
+                vec![held(key), wheel(Start, 0.0, key), wheel(Move, 50.0, key), held(NONE), wheel(Move, 200.0, NONE)],
+                vec![wheel(End, 0.0, NONE), wheel(Move, 100.0, NONE)],
+            ]
+        },
+        |key| vec![vec![held(key | Modifiers::SHIFT), wheel(Move, 100.0, key | Modifiers::SHIFT)]],
+    ];
+    for (i, motion) in motions.iter().enumerate() {
+        let (mut with_alt, mut with_command) = (new_document_60fps(), new_document_60fps());
+        let at = with_alt.state().canvas_rect.unwrap().center() + vec2(150.0, 90.0);
+        let start = *with_alt.state().view().unwrap();
+        for (alt, command) in motion(Modifiers::ALT).iter().zip(motion(Modifiers::COMMAND)) {
+            let (alt, command) = (play(&mut with_alt, at, alt), play(&mut with_command, at, &command));
+            assert!(command.zoom > start.zoom, "motion {i} zooms");
+            assert_eq!(alt, command, "motion {i}");
+        }
+    }
+}
+
+fn units(h: &Harness<'_, DesignApp>) -> (Unit, Unit) {
+    let s = &h.state().session.doc().unwrap().doc.settings;
+    (s.horizontal_units, s.vertical_units)
+}
+
+fn zoom_app(tool: &str) -> DesignApp {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.select_tool(tool);
+    app.ui.rulers = false;
+    app
+}
+
+/// Run one app frame with the supplied modifiers, install fonts, draw the canvas when ready and return the cursor icon.
+fn canvas_frame(app: &mut DesignApp, ctx: &egui::Context, m: egui::Modifiers, mut events: Vec<egui::Event>) -> egui::CursorIcon {
+    events.insert(0, egui::Event::ModifiersChanged(m));
+    let mut output =
+        ctx.run_ui(egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), events, ..Default::default() }, |ui| {
+            app.logic(ui.ctx());
+            // Fonts are installed by the first real UI pass, just as in the full application.
+            app.ui_setup(ui.ctx());
+            if app.fonts_ready {
+                show(app, ui);
+            }
+        });
+    output.textures_delta.clear();
+    output.platform_output.cursor_icon
+}
+
+/// The cursor icon the canvas sets for `c` on this platform (bitmap and painted cursors
+/// report their own icon).
+fn shown(c: Cursor) -> egui::CursorIcon {
+    crate::cursors::show(&egui::Context::default(), &mut crate::cursors::Images::default(), c, Pos2::ZERO)
+}
+
+fn space_key(pressed: bool, modifiers: egui::Modifiers) -> egui::Event {
+    egui::Event::Key { key: egui::Key::Space, physical_key: None, pressed, repeat: false, modifiers }
+}
+
+fn press(pos: Pos2, pressed: bool, modifiers: egui::Modifiers) -> egui::Event {
+    egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers }
+}
+
+fn hover(app: &mut DesignApp, ctx: &egui::Context, p: Pos2) {
+    for _ in 0..3 {
+        canvas_frame(app, ctx, egui::Modifiers::NONE, vec![egui::Event::PointerMoved(p)]);
+    }
+}
+
+const CMD: egui::Modifiers = egui::Modifiers { command: true, mac_cmd: true, ..egui::Modifiers::NONE };
+
+#[test]
+fn spring_zoom_click_is_anchored_view_only_and_release_restores_previous_tool() {
+    for tool in ["rectangleFrame", "directSelection", "type", "hand", "zoom"] {
+        let mut app = zoom_app(tool);
+        if tool == "rectangleFrame" {
+            let frame = app.run("frame.create", json!({"rect":[36,36,300,200],"content":"text","text":"Hello"})).unwrap();
+            app.run("text.select", json!({"story":frame["story"],"anchor":5})).unwrap();
+        }
+        let ctx = egui::Context::default();
+        let p = pos2(300.0, 250.0);
+        hover(&mut app, &ctx, p);
+        let before = *app.view().unwrap();
+        let doc = app.session.doc().unwrap().doc.clone();
+        let selection = app.session.doc().unwrap().selection.clone();
+        let history = app.run("document.history", json!({})).unwrap();
+        let cursor = canvas_frame(&mut app, &ctx, CMD, vec![space_key(true, CMD)]);
+        assert_eq!(cursor, shown(Cursor::ZoomIn), "{tool}");
+        canvas_frame(&mut app, &ctx, CMD, vec![press(p, true, CMD)]);
+        canvas_frame(&mut app, &ctx, CMD, vec![press(p, false, CMD)]);
+        let after = *app.view().unwrap();
+        assert_eq!(after.zoom, before.zoom * 2.0, "{tool}");
+        let anchor = Xf::new(app.canvas_rect.unwrap(), &before).to_canvas(p);
+        assert!((Xf::new(app.canvas_rect.unwrap(), &after).to_canvas(p) - anchor).hypot() < 1e-9);
+        let cursor = canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![space_key(false, egui::Modifiers::NONE)]);
+        assert_eq!(app.session.tool_id(), tool);
+        let expected = app.session.cursor(anchor, Mods::default(), app.view_info());
+        assert_eq!(cursor, shown(expected), "{tool}");
+        assert!(std::sync::Arc::ptr_eq(&doc, &app.session.doc().unwrap().doc));
+        assert_eq!(selection, app.session.doc().unwrap().selection);
+        assert_eq!(history, app.run("document.history", json!({})).unwrap());
+    }
+}
+
+#[test]
+fn spring_zoom_alt_clicks_out_and_modifier_release_switches_back_to_hand() {
+    let mut app = zoom_app("rectangleFrame");
+    let ctx = egui::Context::default();
+    let p = pos2(300.0, 250.0);
+    hover(&mut app, &ctx, p);
+    let z = app.view().unwrap().zoom;
+    let alt = egui::Modifiers { alt: true, ..CMD };
+    assert_eq!(canvas_frame(&mut app, &ctx, CMD, vec![space_key(true, CMD)]), shown(Cursor::ZoomIn));
+    assert_eq!(canvas_frame(&mut app, &ctx, alt, vec![]), shown(Cursor::ZoomOut));
+    canvas_frame(&mut app, &ctx, alt, vec![press(p, true, alt)]);
+    canvas_frame(&mut app, &ctx, alt, vec![press(p, false, alt)]);
+    assert_eq!(app.view().unwrap().zoom, z * 0.5);
+    assert_eq!(canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![]), shown(Cursor::Hand));
+    let before = *app.view().unwrap();
+    canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(p, true, egui::Modifiers::NONE)]);
+    canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![egui::Event::PointerMoved(p + vec2(80.0, 0.0))]);
+    canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(p + vec2(80.0, 0.0), false, egui::Modifiers::NONE)]);
+    assert_eq!(app.view().unwrap().zoom, before.zoom);
+    assert!(app.view().unwrap().origin.x < before.origin.x);
+    assert_eq!(app.session.tool_id(), "rectangleFrame");
+}
+
+#[test]
+fn spring_zoom_scrubs_and_owns_pointer_release_after_shortcut_release() {
+    let mut app = zoom_app("rectangleFrame");
+    let ctx = egui::Context::default();
+    let p = pos2(300.0, 250.0);
+    hover(&mut app, &ctx, p);
+    let z = app.view().unwrap().zoom;
+    let doc = app.session.doc().unwrap().doc.clone();
+    // Ctrl is the platform command modifier on Windows/Linux, using the same input path.
+    let cmd = egui::Modifiers { command: true, ctrl: true, ..egui::Modifiers::NONE };
+    canvas_frame(&mut app, &ctx, cmd, vec![space_key(true, cmd), press(p, true, cmd)]);
+    let end = p + vec2(150.0, 0.0);
+    canvas_frame(&mut app, &ctx, cmd, vec![egui::Event::PointerMoved(end)]);
+    assert!((app.view().unwrap().zoom - z * std::f64::consts::E).abs() < 1e-9);
+    let scrubbed = app.view().unwrap().zoom;
+    assert_eq!(canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![space_key(false, egui::Modifiers::NONE)]), shown(Cursor::Crosshair));
+    canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(end, false, egui::Modifiers::NONE)]);
+    assert_eq!(app.view().unwrap().zoom, scrubbed, "no extra click zoom at the end of a scrub");
+    assert!(std::sync::Arc::ptr_eq(&doc, &app.session.doc().unwrap().doc));
+    // The original tool still draws after the temporary gesture.
+    canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(p, true, egui::Modifiers::NONE)]);
+    canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![egui::Event::PointerMoved(p + vec2(50.0, 50.0))]);
+    canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(p + vec2(50.0, 50.0), false, egui::Modifiers::NONE)]);
+    assert!(!std::sync::Arc::ptr_eq(&doc, &app.session.doc().unwrap().doc));
+    assert_eq!(app.session.tool_id(), "rectangleFrame");
+}
+
+#[test]
+fn spring_zoom_is_suppressed_while_typing_in_a_text_frame() {
+    let mut app = zoom_app("type");
+    let frame = app.run("frame.create", json!({"rect":[36,36,300,200],"content":"text","text":"Hello"})).unwrap();
+    app.run("text.select", json!({"story":frame["story"],"anchor":5})).unwrap();
+    assert!(app.session.wants_text());
+    let ctx = egui::Context::default();
+    let p = pos2(300.0, 250.0);
+    hover(&mut app, &ctx, p);
+    let before = *app.view().unwrap();
+    let alt = egui::Modifiers { alt: true, ..CMD };
+    for m in [CMD, alt] {
+        app.run("text.select", json!({"story":frame["story"],"anchor":5})).unwrap();
+        assert!(app.session.wants_text());
+        assert!(!matches!(canvas_frame(&mut app, &ctx, m, vec![space_key(true, m)]), egui::CursorIcon::ZoomIn | egui::CursorIcon::ZoomOut));
+        canvas_frame(&mut app, &ctx, m, vec![press(p, true, m)]);
+        canvas_frame(&mut app, &ctx, m, vec![press(p, false, m)]);
+        assert_eq!(app.view().unwrap().zoom, before.zoom);
+        assert_eq!(app.view().unwrap().origin, before.origin);
+        canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![space_key(false, egui::Modifiers::NONE)]);
+    }
+}
+
+#[test]
+fn spring_zoom_is_suppressed_while_a_text_field_has_focus() {
+    let mut app = zoom_app("rectangleFrame");
+    let ctx = egui::Context::default();
+    let mut text = String::new();
+    let p = pos2(300.0, 250.0);
+    hover(&mut app, &ctx, p);
+    let before = *app.view().unwrap();
+    for m in [egui::Modifiers::NONE, CMD, egui::Modifiers { alt: true, ..CMD }] {
+        let mut output = ctx.run_ui(
+            egui::RawInput {
+                screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))),
+                events: vec![egui::Event::ModifiersChanged(m), space_key(true, m), egui::Event::Text("x".into()), egui::Event::PointerMoved(p)],
+                ..Default::default()
+            },
+            |ui| {
+                ui.text_edit_singleline(&mut text).request_focus();
+                show(&mut app, ui);
+            },
+        );
+        output.textures_delta.clear();
+        assert!(ctx.text_edit_focused());
+        assert!(!matches!(output.platform_output.cursor_icon, egui::CursorIcon::ZoomIn | egui::CursorIcon::ZoomOut | egui::CursorIcon::Grab));
+        assert_eq!(app.view().unwrap().zoom, before.zoom);
+        assert_eq!(app.session.tool_id(), "rectangleFrame");
+    }
+    assert!(!text.is_empty(), "typing still reaches the field");
+}
+
+#[test]
+fn spring_zoom_does_not_interrupt_an_existing_tool_drag() {
+    let mut app = zoom_app("rectangleFrame");
+    let ctx = egui::Context::default();
+    let p = pos2(300.0, 250.0);
+    hover(&mut app, &ctx, p);
+    let before = *app.view().unwrap();
+    let doc = app.session.doc().unwrap().doc.clone();
+    canvas_frame(&mut app, &ctx, egui::Modifiers::NONE, vec![press(p, true, egui::Modifiers::NONE)]);
+    let end = p + vec2(100.0, 100.0);
+    canvas_frame(&mut app, &ctx, CMD, vec![space_key(true, CMD), egui::Event::PointerMoved(end)]);
+    canvas_frame(&mut app, &ctx, CMD, vec![press(end, false, CMD)]);
+    assert_eq!(app.view().unwrap().zoom, before.zoom);
+    assert_eq!(app.view().unwrap().origin, before.origin);
+    assert!(!std::sync::Arc::ptr_eq(&doc, &app.session.doc().unwrap().doc));
+}
+
+#[test]
+fn spring_zoom_does_not_zoom_on_the_rulers() {
+    let mut app = zoom_app("rectangleFrame");
+    app.ui.rulers = true;
+    let ctx = egui::Context::default();
+    hover(&mut app, &ctx, pos2(300.0, 250.0));
+    let rect = app.canvas_rect.unwrap();
+    let p = pos2(rect.min.x - RULER / 2.0, rect.center().y);
+    hover(&mut app, &ctx, p);
+    let before = *app.view().unwrap();
+    canvas_frame(&mut app, &ctx, CMD, vec![space_key(true, CMD)]);
+    canvas_frame(&mut app, &ctx, CMD, vec![press(p, true, CMD)]);
+    canvas_frame(&mut app, &ctx, CMD, vec![press(p, false, CMD)]);
+    assert_eq!(app.view().unwrap().zoom, before.zoom);
+    assert_eq!(app.view().unwrap().origin, before.origin);
+}
+
+#[test]
+fn parent_guides_on_a_page_are_not_picked_there() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    // 100 pt into A's right page, which page 1 (a right page at x = 0) shows.
+    let parent_guide = json!({"spread": {"kind": "parent", "index": 0}, "page": 1, "orientation": "vertical", "position": 712});
+    app.run("guide.add", parent_guide).unwrap();
+    let mut h = harness(app);
+    let at = |app: &DesignApp| {
+        let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
+        let layout = CanvasLayout::new(&app.session.active().unwrap().doc, false);
+        let slot = layout.slots.iter().find(|s| s.spread == SpreadRef::Doc(0)).unwrap();
+        guide_at(app, &xf, xf.to_screen(slot.xf * Point::new(100.0, 300.0)))
+    };
+    assert_eq!(at(h.state()), None, "the parent's guide is edited on the parent");
+    h.state_mut().run("guide.add", json!({"orientation": "vertical", "position": 100})).unwrap();
+    h.run_steps(2);
+    assert!(matches!(at(h.state()), Some((SpreadRef::Doc(0), 0, 0, _))), "the page's own guide is");
+}
+
+#[test]
+fn mouse_double_clicking_a_frame_handle_fits_with_one_undo_step() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let id = designcraft_doc::ItemId(
+        app.run("frame.create", json!({"rect": [100, 100, 400, 300], "content": "text", "text": "Fit this text"})).unwrap()["id"].as_u64().unwrap(),
+    );
+    app.run("selection.set", json!({"ids": [id.0]})).unwrap();
+    let original = app.session.doc().unwrap().doc.item(id).unwrap().bounds();
+    // 60 frames a second: the default 0.25 s step puts two clicks past egui's double-click delay.
+    let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let ctx = ui.ctx().clone();
+            app.logic(&ctx);
+            app.ui(ui);
+        },
+        app,
+    );
+    h.run_steps(4);
+    let app = h.state();
+    let st = app.session.doc().unwrap();
+    let layout = CanvasLayout::new(&st.doc, false);
+    let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
+    let p = xf.to_screen(layout.xf(SpreadRef::Doc(0)) * Point::new(original.x1, original.y1));
+    h.hover_at(p);
+    h.step();
+    // Separate frames model the actual mouse, including egui's release-time double click.
+    for _ in 0..2 {
+        for pressed in [true, false] {
+            h.event(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
+            h.step();
+        }
+    }
+    h.run_steps(2);
+    let fitted = h.state().session.doc().unwrap().doc.item(id).unwrap().bounds();
+    assert!(fitted.width() < original.width() && fitted.height() < original.height(), "{fitted:?}");
+    assert_eq!(h.state().session.tool_id(), "selection");
+    h.state_mut().run("edit.undo", json!({})).unwrap();
+    assert_eq!(h.state().session.doc().unwrap().doc.item(id).unwrap().bounds(), original);
+}
+
+const ART: &str = r##"<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 50" width="100pt" height="50pt"><path d="M0,0 C30,0 70,50 100,50" fill="none" stroke="#000" stroke-width="2"/></svg>"##;
+
+#[test]
+fn pasting_svg_from_another_app_places_editable_paths_in_the_middle_of_the_view() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let mut h = harness(app);
+    h.run_steps(2);
+    let undo = h.state().session.doc().unwrap().history.undo.len();
+    h.event(egui::Event::Paste(ART.into()));
+    h.run_steps(2);
+    let app = h.state();
+    let st = app.session.doc().unwrap();
+    assert_eq!(st.history.undo.len(), undo + 1, "one undo step");
+    let id = *st.selection.items.first().expect("the pasted path is selected");
+    let it = st.doc.item(id).unwrap();
+    assert_eq!(it.shape, designcraft_doc::Shape::Path);
+    assert_eq!(it.path.subpaths[0].anchors.len(), 2);
+    assert!((it.stroke.weight - 2.0).abs() < 1e-9);
+    // Centred where text from another app would go: the middle of the view.
+    let (_, centre) = view_centre(app).unwrap();
+    assert!((it.bounds().center() - centre).hypot() < 0.01, "{:?} vs {centre:?}", it.bounds());
+}
+
+#[test]
+fn the_paste_in_place_shortcut_pastes_in_place_and_plain_paste_offsets() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let id = app.run("frame.create", json!({"rect": [100, 100, 200, 200]})).unwrap()["id"].as_u64().unwrap();
+    let original = app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().bounds();
+    app.run("edit.copy", json!({})).unwrap();
+    let clip = app.object_clip_text.clone().expect("the copy's placeholder text");
+    let mut h = harness(app);
+    let paste = |h: &mut Harness<'static, DesignApp>, modifiers: egui::Modifiers| {
+        // As egui-winit delivers ⌃⌥⇧V: the chord's paste and the V release, no V press; here the
+        // modifiers are released within the same frame.
+        let release = egui::Event::Key { key: egui::Key::V, physical_key: None, pressed: false, repeat: false, modifiers };
+        let none = egui::Event::ModifiersChanged(egui::Modifiers::NONE);
+        h.input_mut().events.extend([egui::Event::ModifiersChanged(modifiers), egui::Event::Paste(clip.clone()), release, none]);
+        h.run_steps(2);
+        let st = h.state().session.doc().unwrap();
+        let pasted = *st.selection.items.first().expect("the copy is selected");
+        assert_ne!(pasted.0, id);
+        st.doc.item(pasted).unwrap().bounds()
+    };
+    let linux = egui::Modifiers { alt: true, ctrl: true, shift: true, mac_cmd: false, command: true };
+    assert_eq!(paste(&mut h, linux), original, "Paste in Place");
+    let moved = paste(&mut h, egui::Modifiers::COMMAND);
+    assert!((moved.x0 - original.x0 - 12.0).abs() < 1e-9 && (moved.y0 - original.y0 - 12.0).abs() < 1e-9, "{moved:?}");
+    // The modifiers went down in an earlier frame than the paste.
+    h.event_modifiers(egui::Event::Paste(clip.clone()), linux);
+    h.run_steps(2);
+    let st = h.state().session.doc().unwrap();
+    let pasted = *st.selection.items.first().expect("the copy is selected");
+    assert_eq!(st.doc.item(pasted).unwrap().bounds(), original);
+}
+
+#[test]
+fn edit_paste_from_the_menu_pastes_svg_on_the_system_clipboard_as_paths() {
+    let services = crate::Services { clipboard_text: Some(Box::new(|| Some(ART.to_string()))), ..Default::default() };
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), services);
+    app.native_menu = true;
+    app.run("file.new", json!({})).unwrap();
+    crate::menus::activate(&mut app, "edit.paste", &Value::Null);
+    let st = app.session.doc().unwrap();
+    let id = *st.selection.items.first().expect("the pasted path is selected");
+    assert_eq!(st.doc.item(id).unwrap().shape, designcraft_doc::Shape::Path);
+    assert!(st.selection.text.is_none(), "paths, not a text frame of markup");
+    // With an insertion point, the markup is text like any other.
+    let story = app.run("frame.create", json!({"rect": [10, 10, 300, 300], "content": "text"})).unwrap()["story"].clone();
+    app.run("text.select", json!({"story": story, "anchor": 0, "focus": 0})).unwrap();
+    let items = app.session.doc().unwrap().doc.spreads[0].items.len();
+    crate::menus::activate(&mut app, "edit.paste", &Value::Null);
+    assert_eq!(app.session.doc().unwrap().doc.spreads[0].items.len(), items, "no paths added");
+}
+
+#[test]
+fn selected_merged_owners_paint_the_same_row_and_column_targets() {
+    for column in [true, false] {
+        for merged in [false, true] {
+            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+            app.run("file.new", json!({"pages": 1})).unwrap();
+            app.run("frame.create", json!({"rect": [36, 36, 300, 300], "content": "text"})).unwrap();
+            app.run("table.insert", json!({"rows": 2, "cols": 2})).unwrap();
+            if merged {
+                let range = if column { json!({"rows": [0, 0], "cols": [0, 1]}) } else { json!({"rows": [0, 1], "cols": [0, 0]}) };
+                app.run("table.select", range).unwrap();
+                app.run("table.merge", json!({})).unwrap();
+            }
+            app.run("table.select", json!({"rows": [1, 1], "cols": [1, 1]})).unwrap();
+            app.run(if column { "table.selectColumn" } else { "table.selectRow" }, json!({})).unwrap();
+            let st = app.session.doc().unwrap();
+            let selection = st.selection.clone();
+            let ts = selection.text.unwrap();
+            let selected = selection.cells.unwrap();
+            assert_eq!(
+                selected.range,
+                if column { designcraft_doc::CellRange::new(0, 1, 1, 1) } else { designcraft_doc::CellRange::new(1, 0, 1, 1) }
+            );
+            let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+            let cs = app.session.cache.get(&st.doc, ts.story, None);
+            let ft = &cs.frames[0];
+            let table = ft.tables.iter().find(|t| t.table == selected.table).unwrap();
+            let (a, _) = item_canvas_xf(&st.doc, &layout, ft.frame).unwrap();
+            let m = a * st.doc.text_xf(st.doc.item(ft.frame).unwrap());
+            let xf = Xf { min: pos2(0.0, 0.0), origin: Point::new(0.0, 0.0), zoom: 1.0, rot: 0, pivot: pos2(0.0, 0.0) };
+            let owners = if merged {
+                [(0, 0), (1, 1)]
+            } else if column {
+                [(0, 1), (1, 1)]
+            } else {
+                [(1, 0), (1, 1)]
+            };
+            let expected: Vec<_> = owners
+                .into_iter()
+                .map(|(r, c)| {
+                    let rect = table.cells.iter().find(|cell| cell.row == r && cell.col == c).unwrap().rect;
+                    vec![
+                        xf.to_screen(m * Point::new(rect.x0, rect.y0)),
+                        xf.to_screen(m * Point::new(rect.x1, rect.y0)),
+                        xf.to_screen(m * Point::new(rect.x1, rect.y1)),
+                        xf.to_screen(m * Point::new(rect.x0, rect.y1)),
+                    ]
+                })
+                .collect();
+            let ctx = egui::Context::default();
+            let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
+                draw_text_selection(&app, ui.painter(), &xf, &st.doc, &layout, ts, Some(selected));
+            });
+            output.textures_delta.clear();
+            let tint = Color32::from_rgba_unmultiplied(80, 140, 255, 90);
+            let painted: Vec<_> = output
+                .shapes
+                .into_iter()
+                .filter_map(|s| match s.shape {
+                    egui::Shape::Path(path) if path.fill == tint => {
+                        assert!(path.closed);
+                        assert_eq!(path.stroke, egui::epaint::PathStroke::NONE);
+                        Some(path.points)
+                    }
+                    _ => None,
+                })
+                .collect();
+            assert_eq!(painted, expected, "only the two touched owners are tinted; column={column}, merged={merged}");
+            assert_eq!(app.session.doc().unwrap().selection, selection);
+        }
+    }
+}
+
+/// A selected group lists the text frames inside it for ports.
+#[test]
+fn grouped_text_frames_get_ports() {
+    let mut s = designcraft_engine::Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    let a = s.execute("frame.create", &json!({"rect": [10, 10, 110, 60], "content": "text"})).unwrap()["id"].as_u64().unwrap();
+    let b = s.execute("frame.create", &json!({"rect": [10, 80, 110, 130]})).unwrap()["id"].as_u64().unwrap();
+    s.execute("selection.set", &json!({"ids": [a, b]})).unwrap();
+    let g = s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap();
+    let doc = &s.doc().unwrap().doc;
+    let group = doc.item(designcraft_doc::ItemId(g)).unwrap();
+    let mut out = Vec::new();
+    text_frames_in(group, 0, &mut out);
+    assert_eq!(out.iter().map(|(it, _)| it.id.0).collect::<Vec<_>>(), vec![a], "one text frame in the group");
+    // A plain text frame lists itself.
+    out.clear();
+    text_frames_in(out_frame(doc, a), 0, &mut out);
+    assert_eq!(out.len(), 1);
+}
+
+/// A selected group paints both ports of the overset text frame inside it, on top of the
+/// group's own selection marks.
+#[test]
+fn a_selected_group_paints_both_ports_of_its_text_frame() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let s = &mut app.session;
+    let text = "far too much text for a frame this small, over and over again ".repeat(8);
+    let a = s.execute("frame.create", &json!({"rect": [100, 100, 200, 140], "content": "text", "text": text})).unwrap()["id"].as_u64().unwrap();
+    let b = s.execute("frame.create", &json!({"rect": [100, 200, 200, 260]})).unwrap()["id"].as_u64().unwrap();
+    s.execute("selection.set", &json!({"ids": [a, b]})).unwrap();
+    let g = s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap();
+    s.execute("transform.rotate", &json!({"angle": 30, "ids": [g]})).unwrap();
+    s.execute("selection.set", &json!({"ids": [g]})).unwrap();
+    let doc = app.session.doc().unwrap().doc.clone();
+    let layout = CanvasLayout::new(&doc, false);
+    let xf = Xf { min: pos2(0.0, 0.0), origin: Point::new(0.0, 0.0), zoom: 1.0, rot: 0, pivot: pos2(0.0, 0.0) };
+    let ctx = egui::Context::default();
+    let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
+        draw_selection(&app, ui.painter(), &xf, &doc, &layout);
+    });
+    output.textures_delta.clear();
+    let white: Vec<Rect> = output
+        .shapes
+        .into_iter()
+        .filter_map(|s| match s.shape {
+            egui::Shape::Rect(r) if r.fill == Color32::WHITE => Some(r.rect),
+            _ => None,
+        })
+        .collect();
+    for out in [false, true] {
+        let c = xf.to_screen(designcraft_tools::thread::port_center(&doc, &layout, designcraft_doc::ItemId(a), out, xf.zoom).unwrap());
+        let port = white.iter().position(|r| (r.center() - c).length() < 0.01).unwrap_or_else(|| panic!("port (out: {out}) at {c:?}"));
+        assert!(!white[port + 1..].iter().any(|r| r.contains(c)), "nothing painted later covers the port (out: {out})");
+    }
+}
+
+fn out_frame(doc: &Document, id: u64) -> &Item {
+    doc.item(designcraft_doc::ItemId(id)).unwrap()
+}
+
+/// An overset frame inside a group is listed for the red mark even when nothing is
+/// selected; a frame with room, or a hidden one, is not.
+#[test]
+fn overset_frames_are_found_inside_groups() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let s = &mut app.session;
+    let frame_with = |s: &mut designcraft_engine::Session, rect: [f64; 4], text: &str| {
+        s.execute("frame.create", &json!({"rect": rect, "content": "text", "text": text})).unwrap()["id"].as_u64().unwrap()
+    };
+    let tiny = frame_with(s, [10.0, 10.0, 40.0, 16.0], "far too much text for a frame this small, over and over again");
+    let roomy = frame_with(s, [10.0, 100.0, 300.0, 300.0], "fits");
+    s.execute("selection.set", &json!({"ids": [tiny, roomy]})).unwrap();
+    s.execute("object.group", &json!({})).unwrap();
+    s.execute("selection.set", &json!({"ids": []})).unwrap();
+    let doc = app.session.doc().unwrap().doc.clone();
+    let mut out = Vec::new();
+    overset_frames(&app, &doc, &doc.spreads[0].items, 0, &mut out);
+    assert_eq!(out.iter().map(|it| it.id.0).collect::<Vec<_>>(), vec![tiny]);
+    // Hidden: no mark.
+    app.session.execute("object.hide", &json!({"ids": [tiny]})).unwrap();
+    let doc = app.session.doc().unwrap().doc.clone();
+    out.clear();
+    overset_frames(&app, &doc, &doc.spreads[0].items, 0, &mut out);
+    assert!(out.is_empty());
+}
+
+/// The always-on overset mark sits at the frame's out port, a step along its own right edge
+/// (so a rotated frame gets it inside its edge, not straight up from the corner), and a
+/// selected overset frame gets only the mark its ports draw.
+#[test]
+fn overset_mark_sits_on_the_out_port_once() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let s = &mut app.session;
+    let id = s
+        .execute("frame.create", &json!({"rect": [100, 100, 200, 160], "content": "text", "text": "far too much text for a frame this small, over and over again ".repeat(8)}))
+        .unwrap()["id"]
+        .as_u64()
+        .unwrap();
+    s.execute("transform.rotate", &json!({"angle": 90, "ids": [id]})).unwrap();
+    s.execute("selection.set", &json!({"ids": []})).unwrap();
+    let doc = app.session.doc().unwrap().doc.clone();
+    let layout = CanvasLayout::new(&doc, false);
+    let zoom = 1.0;
+    let marks = overset_marks(&app, &doc, &layout, &doc.spreads[0].items, zoom, &ported_frames(&app, &doc));
+    assert_eq!(marks.len(), 1);
+    let it = out_frame(&doc, id);
+    let (a, _) = item_canvas_xf(&doc, &layout, it.id).unwrap();
+    let m = a * it.xf;
+    let r = it.inner_bounds();
+    let corner = m * Point::new(r.x1, r.y1);
+    let edge = (m * Point::new(r.x1, r.y0)) - corner;
+    let d = marks[0].1 - corner;
+    assert!((d.x * edge.y - d.y * edge.x).abs() < 1e-6, "the mark lies on the frame's right edge: {d:?} along {edge:?}");
+    assert!((d.hypot() - 12.0 / zoom).abs() < 1e-6, "12 screen px from the corner: {d:?}");
+    // Selected: the ports draw the mark, so no always-on mark is added.
+    app.session.execute("selection.set", &json!({"ids": [id]})).unwrap();
+    let marks = overset_marks(&app, &doc, &layout, &doc.spreads[0].items, zoom, &ported_frames(&app, &doc));
+    assert!(marks.is_empty());
+}
+
+#[test]
+fn right_clicking_a_ruler_sets_that_rulers_units() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let mut h = harness(app);
+    let rect = h.state().canvas_rect.unwrap();
+    assert_eq!(units(&h), (Unit::Picas, Unit::Picas));
+    // Vertical ruler: the current unit is checked; picking one sets only the vertical units.
+    right_click(&mut h, pos2(rect.min.x - RULER / 2.0, rect.center().y));
+    h.get_by_label("✓ Picas");
+    h.get_by_label("   Millimeters").click();
+    h.run_steps(3);
+    assert_eq!(units(&h), (Unit::Picas, Unit::Millimeters));
+    // Horizontal ruler.
+    right_click(&mut h, pos2(rect.center().x, rect.min.y - RULER / 2.0));
+    h.get_by_label("✓ Picas");
+    h.get_by_label("   Inches").click();
+    h.run_steps(3);
+    assert_eq!(units(&h), (Unit::Inches, Unit::Millimeters));
+    // The corner where the rulers meet sets both, as InDesign's: nothing is checked while
+    // they differ.
+    let corner = rect.min - vec2(RULER / 2.0, RULER / 2.0);
+    right_click(&mut h, corner);
+    assert!(h.query_by_label("✓ Inches").is_none() && h.query_by_label("✓ Millimeters").is_none());
+    let _ = h.get_by_label_contains("Hide Rulers");
+    let _ = h.get_by_label("   Lock Zero Point");
+    assert!(h.query_by_label("   Delete All Guides on Spread").is_none(), "only on the horizontal ruler");
+    h.get_by_label("   Points").click();
+    h.run_steps(3);
+    assert_eq!(units(&h), (Unit::Points, Unit::Points));
+    // InDesign's list: no Q or Ha.
+    right_click(&mut h, corner);
+    h.get_by_label("✓ Points");
+    assert!(h.query_by_label("   Q").is_none() && h.query_by_label("   Ha").is_none());
+    let _ = h.get_by_label("   Inches Decimal");
+    // The horizontal ruler's menu also deletes the spread's guides; Hide Rulers hides them.
+    right_click(&mut h, pos2(rect.center().x, rect.min.y - RULER / 2.0));
+    let _ = h.get_by_label("   Delete All Guides on Spread");
+    h.get_by_label_contains("Hide Rulers").click();
+    h.run_steps(3);
+    assert!(!h.state().ui.rulers);
+    // The page opens no units menu.
+    right_click(&mut h, rect.center());
+    assert!(h.query_by_label("   Points").is_none());
+}
+
+/// The live-corner widget draws on a selected rectangle frame; clicking it draws the diamonds.
+#[test]
+fn live_corner_widget_and_diamonds_draw() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [100, 100, 300, 250], "content": "graphic"})).unwrap();
+    let id = app.session.doc().unwrap().doc.spreads[0].items[0].id;
+    app.run("selection.set", json!({"ids": [id.0]})).unwrap();
+    let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).with_pixels_per_point(1.0).wgpu().build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let ctx = ui.ctx().clone();
+            app.logic(&ctx);
+            app.ui(ui);
+        },
+        app,
+    );
+    h.run_steps(4);
+    let screen = |h: &Harness<'_, DesignApp>, x: f64, y: f64| {
+        let app = h.state();
+        let layout = CanvasLayout::new(&app.session.doc().unwrap().doc, false);
+        let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
+        xf.to_screen(layout.to_canvas(SpreadRef::Doc(0), Point::new(x, y)))
+    };
+    let widget = screen(&h, 300.0, 100.0) + vec2(0.0, 11.5);
+    let diamond = screen(&h, 100.0, 100.0) + vec2(12.0, 0.0);
+    let yellow = |h: &mut Harness<'_, DesignApp>, p: Pos2| -> Option<bool> {
+        let img = match h.render() {
+            Ok(img) => img,
+            Err(e) => {
+                eprintln!("skipped: no offscreen renderer ({e})");
+                return None;
+            }
+        };
+        let px = img.get_pixel(p.x.round() as u32, p.y.round() as u32).0;
+        Some(px[0] > 200 && px[1] > 180 && px[2] < 100)
+    };
+    let Some(w) = yellow(&mut h, widget) else { return };
+    assert!(w, "no widget at {widget:?}");
+    assert_eq!(yellow(&mut h, diamond), Some(false));
+    h.hover_at(widget);
+    h.step();
+    for pressed in [true, false] {
+        h.event(egui::Event::PointerButton { pos: widget, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
+        h.step();
+    }
+    h.run_steps(3);
+    assert_eq!(yellow(&mut h, diamond), Some(true), "no diamond at {diamond:?}");
+    assert_eq!(yellow(&mut h, widget), Some(false));
+}
+
+/// A harness whose frames are 1 ms apart, so two clicks make a double-click.
+fn fast_harness(app: DesignApp) -> Harness<'static, DesignApp> {
+    let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).with_step_dt(0.001).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let ctx = ui.ctx().clone();
+            app.logic(&ctx);
+            app.ui(ui);
+        },
+        app,
+    );
+    h.run_steps(4);
+    h
+}
+
+fn primary(h: &mut Harness<'_, DesignApp>, pos: Pos2, pressed: bool) {
+    h.event(egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
+    h.run_steps(2);
+}
+
+fn corner_drag(h: &mut Harness<'_, DesignApp>, from: Pos2, to: Pos2) {
+    h.hover_at(from);
+    h.step();
+    primary(h, from, true);
+    h.event(egui::Event::PointerMoved(from + (to - from) / 2.0));
+    h.run_steps(2);
+    h.event(egui::Event::PointerMoved(to));
+    h.run_steps(2);
+    primary(h, to, false);
+}
+
+fn corner_click(h: &mut Harness<'_, DesignApp>, p: Pos2) {
+    h.hover_at(p);
+    h.step();
+    primary(h, p, true);
+    primary(h, p, false);
+}
+
+/// Where the rulers measure from (canvas coordinates): the document's zero point on the
+/// spread in view (its first page, for a page origin).
+fn ruler_zero(app: &DesignApp, doc: &Document, layout: &CanvasLayout) -> Option<Point> {
+    ruler_pieces(app, doc, layout, doc.zero_point()).first().map(|p| p.2)
+}
+
+fn zero_point(h: &Harness<'_, DesignApp>) -> [f64; 2] {
+    h.state().session.doc().unwrap().doc.settings.zero_point
+}
+
+#[test]
+fn the_ruler_corner_drags_resets_and_locks_the_zero_point() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 3})).unwrap();
+    let mut h = fast_harness(app);
+    let rect = h.state().canvas_rect.unwrap();
+    let corner = rect.min - vec2(RULER / 2.0, RULER / 2.0);
+    // A click that stays in the corner leaves the zero point.
+    corner_click(&mut h, corner);
+    assert_eq!(zero_point(&h), [0.0, 0.0]);
+    // Dragged out, it lands where released, measured from the spread in view.
+    let dest = rect.min + vec2(80.0, 50.0);
+    let expected = {
+        let app = h.state();
+        let st = app.session.active().unwrap();
+        let layout = CanvasLayout::new(&st.doc, false);
+        let slot = layout.slots[current_slot(app, &layout).unwrap()];
+        let sp = slot.to_spread(Xf::new(rect, app.view().unwrap()).to_canvas(dest));
+        let b = st.doc.spread(slot.spread).unwrap().bounds();
+        [sp.x - b.x0, sp.y - b.y0]
+    };
+    corner_drag(&mut h, corner, dest);
+    let zp = zero_point(&h);
+    assert!((zp[0] - expected[0]).abs() < 0.5 && (zp[1] - expected[1]).abs() < 0.5, "{zp:?} vs {expected:?}");
+    assert!(zp[0].abs() > 1.0 && zp[1].abs() > 1.0, "moved: {zp:?}");
+    // The rulers measure from the point it was dropped on.
+    {
+        let app = h.state();
+        let st = app.session.active().unwrap();
+        let layout = CanvasLayout::new(&st.doc, false);
+        let o = ruler_zero(app, &st.doc, &layout).unwrap();
+        let on_screen = Xf::new(rect, app.view().unwrap()).to_screen(o);
+        assert!((on_screen - dest).length() < 0.5, "{on_screen:?} vs {dest:?}");
+    }
+    // A double-click resets it.
+    corner_click(&mut h, corner);
+    corner_click(&mut h, corner);
+    assert_eq!(zero_point(&h), [0.0, 0.0]);
+    // Locked from the corner's context menu, the corner ignores drags and double-clicks.
+    right_click(&mut h, corner);
+    h.get_by_label("   Lock Zero Point").click();
+    h.run_steps(3);
+    assert!(h.state().session.doc().unwrap().doc.settings.zero_point_locked);
+    corner_drag(&mut h, corner, dest);
+    assert_eq!(zero_point(&h), [0.0, 0.0]);
+    // Unlocked again from the same menu.
+    right_click(&mut h, corner);
+    h.get_by_label("   Unlock Zero Point").click();
+    h.run_steps(3);
+    corner_drag(&mut h, corner, dest);
+    assert_ne!(zero_point(&h), [0.0, 0.0]);
+    h.state_mut().run("view.lockZeroPoint", json!({"on": true})).unwrap();
+    corner_click(&mut h, corner);
+    corner_click(&mut h, corner);
+    assert_ne!(zero_point(&h), [0.0, 0.0], "a locked zero point isn't reset");
+}
+
+#[test]
+fn cmd_dragging_the_ruler_corner_makes_a_guide_each_way() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let mut h = harness(app);
+    let rect = h.state().canvas_rect.unwrap();
+    let corner = rect.min - vec2(RULER / 2.0, RULER / 2.0);
+    let dest = rect.min + vec2(120.0, 90.0);
+    let (r, at) = {
+        let app = h.state();
+        let st = app.session.active().unwrap();
+        CanvasLayout::new(&st.doc, false).spread_at(Xf::new(rect, app.view().unwrap()).to_canvas(dest)).unwrap()
+    };
+    h.event(egui::Event::ModifiersChanged(egui::Modifiers::COMMAND));
+    h.step();
+    corner_drag(&mut h, corner, dest);
+    h.event(egui::Event::ModifiersChanged(egui::Modifiers::NONE));
+    h.step();
+    let doc = h.state().session.doc().unwrap().doc.clone();
+    let guides: Vec<_> = doc.spread(r).unwrap().pages.iter().flat_map(|p| p.guides.clone()).collect();
+    assert_eq!(guides.len(), 2, "{guides:?}");
+    let pos = |o: designcraft_doc::Orientation| guides.iter().find(|g| g.orientation == o).map(|g| g.position).unwrap();
+    assert!((pos(designcraft_doc::Orientation::Horizontal) - at.y).abs() < 0.5);
+    assert!((pos(designcraft_doc::Orientation::Vertical) - at.x).abs() < 0.5);
+    assert!(guides.iter().all(|g| g.spread));
+    assert_eq!(doc.settings.zero_point, [0.0, 0.0], "the zero point stays");
+}
+
+/// A guide being dragged out of a ruler says where it is, as the rulers measure it (#1282):
+/// from the zero point, in the ruler units, and the label follows the pointer while it moves.
+#[test]
+fn a_dragged_guide_shows_where_it_is() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("view.zeroPoint", json!({"at": [100, 50]})).unwrap();
+    let mut h = harness(app);
+    let rect = h.state().canvas_rect.unwrap();
+    let dest = rect.min + vec2(160.0, 110.0);
+    let (xf, at) = {
+        let app = h.state();
+        let xf = Xf::new(rect, app.view().unwrap());
+        let st = app.session.active().unwrap();
+        (xf, CanvasLayout::new(&st.doc, false).spread_at(xf.to_canvas(dest)).unwrap().1)
+    };
+    let units = h.state().session.doc().unwrap().doc.settings.horizontal_units;
+    for (orientation, label, want) in
+        [(designcraft_doc::Orientation::Vertical, "X", at.x - 100.0), (designcraft_doc::Orientation::Horizontal, "Y", at.y - 50.0)]
+    {
+        let g = GuideDrag { orientation, from: None, at: Some(dest), mods: egui::Modifiers::NONE };
+        let (l, v, _) = guide_measure(h.state(), &xf, &g).unwrap();
+        assert_eq!(l, label);
+        assert!((v - want).abs() < 1e-6, "{label}: {v} vs {want}");
+        let text = guide_readout(h.state(), &xf, &g).unwrap();
+        assert_eq!(text, format!("{label}: {}", designcraft_geom::units::format_measure(v, units)));
+    }
+    // While a guide is actually being dragged out of the top ruler, the readout is there.
+    let ruler = pos2(rect.min.x + 200.0, rect.min.y - RULER / 2.0);
+    h.hover_at(ruler);
+    h.step();
+    primary(&mut h, ruler, true);
+    h.event(egui::Event::PointerMoved(dest));
+    h.run_steps(2);
+    let g = h.ctx.data(|d| d.get_temp::<GuideDrag>(egui::Id::unique(GUIDE_DRAG))).expect("dragging");
+    assert_eq!(g.orientation, designcraft_doc::Orientation::Horizontal);
+    assert!(guide_readout(h.state(), &xf, &g).is_some_and(|t| t.starts_with("Y: ")));
+    primary(&mut h, dest, false);
+}
+
+/// Over a spread other than the one in the middle of the view, the readout measures that
+/// spread, the one the guide is dropped on: it reads the position the guide gets.
+#[test]
+fn the_guide_readout_measures_the_spread_under_the_pointer() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 5})).unwrap();
+    app.run("view.zeroPoint", json!({"at": [100, 50]})).unwrap();
+    let h = harness(app);
+    let rect = h.state().canvas_rect.unwrap();
+    let xf = Xf::new(rect, h.state().view().unwrap());
+    let st = h.state().session.active().unwrap();
+    let layout = CanvasLayout::new(&st.doc, false);
+    let current = current_slot(h.state(), &layout).unwrap();
+    // A point inside the last spread, well away from the one in view.
+    let last = layout.slots.last().unwrap();
+    assert_ne!(layout.slots.iter().position(|s| s.spread == last.spread), Some(current), "the last spread isn't the one in view");
+    let inside = Point::new(last.bounds.center().x, last.bounds.y0 + (last.bounds.y1 - last.bounds.y0) * 0.3);
+    let (r, sp) = layout.spread_at(inside).unwrap();
+    assert_eq!(r, last.spread);
+    let g =
+        GuideDrag { orientation: designcraft_doc::Orientation::Horizontal, from: None, at: Some(xf.to_screen(inside)), mods: egui::Modifiers::NONE };
+    let (label, v, _) = guide_measure(h.state(), &xf, &g).unwrap();
+    assert_eq!(label, "Y");
+    // The guide would be stored at `sp.y` on that spread, which its ruler reads from the zero point.
+    // (To screen and back in f32: a few hundred-thousandths of a point.)
+    assert!((v - (sp.y - 50.0)).abs() < 1e-3, "{v} vs {}", sp.y - 50.0);
+    // An existing guide of another spread can't be dropped there (it only moves on its own
+    // spread): no readout over this one, a readout over its own.
+    let first = layout.slots[current].spread;
+    let moving = GuideDrag {
+        orientation: designcraft_doc::Orientation::Horizontal,
+        from: Some((first, 0, 0)),
+        at: Some(xf.to_screen(inside)),
+        mods: egui::Modifiers::NONE,
+    };
+    assert!(guide_measure(h.state(), &xf, &moving).is_none(), "an existing guide over another spread");
+    let own = layout.slots[current].bounds;
+    let over_own = Point::new(own.center().x, own.y0 + (own.y1 - own.y0) * 0.3);
+    let moving_here = GuideDrag { at: Some(xf.to_screen(over_own)), ..moving };
+    assert!(guide_measure(h.state(), &xf, &moving_here).is_some(), "over its own spread");
+}
+
+/// The guide readout stays on the canvas: below right of the pointer in the open, flipped
+/// left or up near the right or bottom edge, and inside the canvas in every corner.
+#[test]
+fn the_guide_readout_stays_inside_the_canvas() {
+    let area = Rect::from_min_max(pos2(50.0, 40.0), pos2(850.0, 640.0));
+    let size = vec2(80.0, 14.0);
+    let inside = |at: Pos2| {
+        let r = Rect::from_min_size(at, size).expand(3.0);
+        r.min.x >= area.min.x - 1e-3 && r.min.y >= area.min.y - 1e-3 && r.max.x <= area.max.x + 1e-3 && r.max.y <= area.max.y + 1e-3
+    };
+    assert_eq!(readout_at(pos2(400.0, 300.0), size, area), pos2(412.0, 312.0), "in the open: below right");
+    let right = readout_at(pos2(845.0, 300.0), size, area);
+    assert!(right.x + size.x < 845.0 && inside(right), "near the right edge: left of the pointer, {right:?}");
+    let bottom = readout_at(pos2(400.0, 636.0), size, area);
+    assert!(bottom.y + size.y < 636.0 && inside(bottom), "near the bottom: above it, {bottom:?}");
+    for p in [area.min, pos2(area.max.x, area.min.y), area.max, pos2(area.min.x, area.max.y), pos2(-500.0, 2000.0)] {
+        assert!(inside(readout_at(p, size, area)), "{p:?}");
+    }
+    // A canvas narrower than the label: pinned to its top left, not past it.
+    let tiny = Rect::from_min_max(pos2(0.0, 0.0), pos2(40.0, 10.0));
+    assert_eq!(readout_at(pos2(20.0, 5.0), size, tiny), pos2(3.0, 3.0));
+}
+
+#[test]
+fn rulers_and_xy_fields_measure_from_the_zero_point_on_every_spread() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    // Spread 0: page 1; spread 1: pages 2 and 3.
+    app.run("file.new", json!({"pages": 3})).unwrap();
+    app.run("view.zeroPoint", json!({"at": [100, 50]})).unwrap();
+    app.session.prefs.dimensions_include_stroke = false;
+    let mut h = harness(app);
+    let rect = h.state().canvas_rect.unwrap();
+    for (spread, x0) in [(0usize, 136.0), (1, 736.0)] {
+        let app = h.state_mut();
+        let id = app.run("frame.create", json!({"spread": spread, "rect": [x0, 70, x0 + 50.0, 120]})).unwrap()["id"].clone();
+        app.run("selection.set", json!({"ids": [id]})).unwrap();
+        // X/Y (Control, Properties and Info panels).
+        let r = crate::panels::sel_info(app).unwrap().page_rect;
+        assert!((r.x0 - (x0 - 100.0)).abs() < 1e-6 && (r.y0 - 20.0).abs() < 1e-6, "spread {spread}: {r:?}");
+        // The rulers, with that spread in view.
+        let layout = CanvasLayout::new(&app.session.active().unwrap().doc, false);
+        let slot = layout.slots[spread];
+        let v = app.view_mut().unwrap();
+        let zoom = v.zoom;
+        let c = slot.bounds.center();
+        v.origin = Point::new(c.x - rect.width() as f64 / 2.0 / zoom, c.y - rect.height() as f64 / 2.0 / zoom);
+        h.run_steps(2);
+        let app = h.state();
+        let doc = app.session.active().unwrap().doc.clone();
+        assert_eq!(current_slot(app, &layout), Some(spread));
+        let o = ruler_zero(app, &doc, &layout).unwrap();
+        assert!((o.x - slot.bounds.x0 - 100.0).abs() < 1e-6 && (o.y - slot.bounds.y0 - 50.0).abs() < 1e-6, "spread {spread}: {o:?}");
+    }
+}
+
+/// Screen position of spread 0's point (x, y).
+fn screen_of(h: &Harness<'_, DesignApp>, x: f64, y: f64) -> Pos2 {
+    let app = h.state();
+    let st = app.session.active().unwrap();
+    let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
+    xf.to_screen(CanvasLayout::new(&st.doc, st.editing_parents).xf(SpreadRef::Doc(0)) * Point::new(x, y))
+}
+
+/// A menu row: a button that isn't a toggle, named by its label, then its shortcut if it has
+/// one. Toggle buttons with the same name (the Task Bar's icons) don't match, nor do buttons
+/// right of the canvas (the Properties panel's Arrange).
+fn menu_row<'h>(h: &'h Harness<'_, DesignApp>, label: &'h str) -> Option<egui_kittest::Node<'h>> {
+    let right = f64::from(h.state().canvas_rect.map_or(f32::INFINITY, |r| r.max.x));
+    h.query_by(move |n| {
+        n.role() == egui::accesskit::Role::Button
+            && n.toggled().is_none()
+            && n.bounding_box().is_none_or(|b| b.x0 < right)
+            && n.label().is_some_and(|l| l == label || l.strip_prefix(label).and_then(|r| r.strip_prefix(' ')).is_some_and(|r| !r.contains(' ')))
+    })
+}
+
+fn enabled(h: &Harness<'_, DesignApp>, label: &str) -> bool {
+    use egui_kittest::kittest::NodeT;
+    !menu_row(h, label).unwrap_or_else(|| panic!("no menu row {label}")).accesskit_node().is_disabled()
+}
+
+fn spread_items(h: &Harness<'_, DesignApp>) -> Vec<u64> {
+    h.state().session.doc().unwrap().doc.spreads[0].items.iter().map(|i| i.id.0).collect()
+}
+
+fn selected(h: &Harness<'_, DesignApp>) -> Vec<u64> {
+    h.state().session.doc().unwrap().selection.items.iter().map(|i| i.0).collect()
+}
+
+#[test]
+fn right_clicking_an_object_selects_it_and_its_menu_arranges_it() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let a = app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap()["id"].as_u64().unwrap();
+    let b = app.run("frame.create", json!({"rect": [150, 150, 300, 300]})).unwrap()["id"].as_u64().unwrap();
+    let mut h = harness(app);
+    assert_eq!(selected(&h), [b]);
+    let on_a = screen_of(&h, 60.0, 60.0);
+    right_click(&mut h, on_a);
+    assert_eq!(selected(&h), [a], "the object under the pointer is selected first");
+    // An empty frame's menu: Content, but no Fitting (nothing to fit) and no text frame entries.
+    assert!(menu_row(&h, "Content").is_some());
+    assert!(menu_row(&h, "Fitting").is_none() && menu_row(&h, "Text Frame Options…").is_none());
+    // Paste is available with nothing copied here: the system clipboard may hold another app's text.
+    assert!(enabled(&h, "Copy") && enabled(&h, "Paste"));
+    menu_row(&h, "Arrange").unwrap().click();
+    h.run_steps(3);
+    menu_row(&h, "Bring to Front").unwrap().click();
+    h.run_steps(3);
+    assert_eq!(spread_items(&h), [b, a]);
+    assert!(menu_row(&h, "Arrange").is_none(), "choosing an entry closes the menu");
+}
+
+#[test]
+fn right_clicking_empty_canvas_offers_paste_after_a_copy() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let a = app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap()["id"].as_u64().unwrap();
+    app.run("edit.copy", json!({})).unwrap();
+    app.select_tool("rectangleFrame");
+    let mut h = harness(app);
+    let empty = screen_of(&h, 400.0, 500.0);
+    right_click(&mut h, empty);
+    assert_eq!(selected(&h), [a], "a right-click on nothing keeps the selection");
+    assert!(menu_row(&h, "Arrange").is_none(), "the page menu, not the object menu");
+    assert!(enabled(&h, "Paste in Place"));
+    assert!(menu_row(&h, "✓ Show/Hide Rulers").is_some(), "toggles show their state");
+    // Escape closes the menu and does nothing else: the tool would deselect, the shortcuts
+    // would switch to the Selection tool.
+    h.key_press(egui::Key::Escape);
+    h.run_steps(3);
+    assert!(menu_row(&h, "Paste in Place").is_none());
+    assert_eq!((h.state().session.tool_id(), selected(&h)), ("rectangleFrame", vec![a]));
+    right_click(&mut h, empty);
+    menu_row(&h, "Paste").unwrap().click();
+    h.run_steps(3);
+    assert_eq!(spread_items(&h).len(), 2);
+}
+
+#[test]
+fn right_clicking_another_object_while_the_menu_is_open_reopens_it_there() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let a = app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap()["id"].as_u64().unwrap();
+    let b = app.run("frame.create", json!({"rect": [36, 600, 200, 760]})).unwrap()["id"].as_u64().unwrap();
+    let mut h = harness(app);
+    // The menu opens down from A, with the pointer on its first row (no submenu open); B is below it.
+    let (on_a, on_b) = (screen_of(&h, 60.0, 60.0), screen_of(&h, 50.0, 700.0));
+    right_click(&mut h, on_a);
+    assert_eq!(selected(&h), [a]);
+    assert!(menu_row(&h, "Arrange").is_some());
+    right_click(&mut h, on_b);
+    assert_eq!(selected(&h), [b]);
+    assert!(menu_row(&h, "Arrange").is_some(), "the menu reopens at the new click");
+}
+
+#[test]
+fn a_context_menu_in_one_pane_keeps_the_keys_from_the_other() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let a = app.run("frame.create", json!({"rect": [36, 36, 100, 100]})).unwrap()["id"].as_u64().unwrap();
+    app.select_tool("rectangleFrame");
+    app.split = true;
+    let mut h = harness(app);
+    // The focused pane is the left one; this point is near its right edge, away from the frame.
+    let left = h.state().canvas_rect.unwrap();
+    right_click(&mut h, pos2(left.max.x - 40.0, left.center().y));
+    assert!(menu_row(&h, "Paste in Place").is_some());
+    // Escape closes the left pane's menu before the right pane handles the keys.
+    h.key_press(egui::Key::Escape);
+    h.run_steps(3);
+    assert!(menu_row(&h, "Paste in Place").is_none());
+    assert_eq!((h.state().session.tool_id(), selected(&h)), ("rectangleFrame", vec![a]));
+}
+
+#[test]
+fn right_clicking_text_keeps_the_selected_text_or_places_the_caret() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [36, 36, 400, 200], "content": "text"})).unwrap();
+    app.select_tool("type");
+    app.run("text.insert", json!({"text": "Hello world"})).unwrap();
+    let sid = *app.session.doc().unwrap().doc.stories.keys().next().unwrap();
+    app.run("text.select", json!({"story": sid.0, "anchor": 0, "focus": 5})).unwrap();
+    let mut h = harness(app);
+    let text_sel = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().selection.text.as_ref().map(|t| (t.anchor, t.focus));
+    // Inside "Hello": the selection stays.
+    let inside = screen_of(&h, 45.0, 44.0);
+    right_click(&mut h, inside);
+    assert_eq!(text_sel(&h), Some((0, 5)));
+    assert!(menu_row(&h, "Paste without Formatting").is_some(), "the text menu");
+    h.key_press(egui::Key::Escape);
+    h.run_steps(3);
+    // Past the end of the line: the caret goes there.
+    let past_end = screen_of(&h, 300.0, 44.0);
+    right_click(&mut h, past_end);
+    assert_eq!(text_sel(&h), Some((11, 11)));
+    assert!(menu_row(&h, "Paste without Formatting").is_some());
+}
+
+#[test]
+fn rows_hidden_in_the_menu_bar_are_hidden_in_context_menus() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap();
+    app.ui.hidden_menu_items.push(crate::menus::menu_key("Object/Arrange", "Bring to Front"));
+    let mut h = harness(app);
+    let on_frame = screen_of(&h, 60.0, 60.0);
+    right_click(&mut h, on_frame);
+    menu_row(&h, "Arrange").unwrap().click();
+    h.run_steps(3);
+    assert!(menu_row(&h, "Bring to Front").is_none());
+    assert!(menu_row(&h, "Send to Back").is_some());
+    assert!(h.query_by_label("Show All Menu Items").is_some());
+}
+
+#[test]
+fn a_secondary_drag_neither_moves_marquees_nor_draws() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let a = app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap()["id"].as_u64().unwrap();
+    let mut h = harness(app);
+    // A secondary-button drag between spread points.
+    let drag = |h: &mut Harness<'_, DesignApp>, from: (f64, f64), to: (f64, f64)| {
+        let (from, to) = (screen_of(h, from.0, from.1), screen_of(h, to.0, to.1));
+        h.hover_at(from);
+        h.step();
+        h.event(egui::Event::PointerButton { pos: from, button: egui::PointerButton::Secondary, pressed: true, modifiers: Default::default() });
+        h.step();
+        for t in [0.25, 0.5, 0.75, 1.0] {
+            h.event(egui::Event::PointerMoved(from + (to - from) * t));
+            h.step();
+        }
+        h.event(egui::Event::PointerButton { pos: to, button: egui::PointerButton::Secondary, pressed: false, modifiers: Default::default() });
+        h.run_steps(3);
+    };
+    let xf = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().doc.item(designcraft_doc::ItemId(a)).unwrap().xf;
+    let before = xf(&h);
+    // Selection tool: on the object (no move), and from empty page across it (no marquee).
+    drag(&mut h, (100.0, 100.0), (300.0, 300.0));
+    assert_eq!(xf(&h), before);
+    h.state_mut().run("edit.deselectAll", json!({})).unwrap();
+    drag(&mut h, (400.0, 400.0), (20.0, 20.0));
+    assert!(selected(&h).is_empty());
+    // Rectangle Frame tool: no frame.
+    h.state_mut().select_tool("rectangleFrame");
+    drag(&mut h, (300.0, 300.0), (500.0, 500.0));
+    assert_eq!(spread_items(&h), [a]);
+}
+
+/// A text frame holding `text`, the Type tool, and a harness stepping at 60 fps (clicks in a
+/// row must land within the double-click delay).
+fn typing(text: &str) -> (Harness<'static, DesignApp>, u64) {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let r = app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "text": text})).unwrap();
+    let id = r["id"].as_u64().unwrap();
+    app.run("tool.select", json!({"tool": "type"})).unwrap();
+    let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let ctx = ui.ctx().clone();
+            app.logic(&ctx);
+            app.ui(ui);
+        },
+        app,
+    );
+    h.run_steps(4);
+    (h, id)
+}
+
+/// The screen point over the first line of frame `id` where a click puts the caret at a byte
+/// in `bytes`.
+fn screen_at(h: &mut Harness<'_, DesignApp>, id: u64, bytes: std::ops::Range<usize>) -> Pos2 {
+    let mut x = 74.0;
+    let p = loop {
+        assert!(x < 400.0, "no point on the first line hits {bytes:?}");
+        h.state_mut().run("text.placeCaret", json!({"frame": id, "point": [x, 80.0]})).unwrap();
+        if h.state().session.doc().unwrap().selection.text.is_some_and(|t| bytes.contains(&t.focus)) {
+            break Point::new(x, 80.0);
+        }
+        x += 1.0;
+    };
+    h.state_mut().run("edit.deselectAll", json!({})).unwrap();
+    let app = h.state();
+    let c = app.session.layout().to_canvas(SpreadRef::Doc(0), p);
+    Xf::new(app.canvas_rect.unwrap(), app.view().unwrap()).to_screen(c)
+}
+
+fn click(h: &mut Harness<'_, DesignApp>, p: Pos2) {
+    for pressed in [true, false] {
+        h.event(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
+        h.step();
+    }
+}
+
+fn selected_range(h: &Harness<'_, DesignApp>) -> std::ops::Range<usize> {
+    h.state().session.doc().unwrap().selection.text.map(|t| t.range()).unwrap_or_default()
+}
+
+#[test]
+fn clicks_in_a_row_select_word_line_paragraph_with_return_and_story() {
+    let text = "One two. Three four! Five six.\nSecond para here.";
+    let (mut h, id) = typing(text);
+    // Inside "Three": double-click selects the word, then line and paragraph with return.
+    let p = screen_at(&mut h, id, 10..14);
+    h.hover_at(p);
+    h.step();
+    let mut got = vec![];
+    for _ in 0..5 {
+        click(&mut h, p);
+        let r = selected_range(&h);
+        got.push(text[r].to_string());
+    }
+    assert_eq!(got[1..], ["Three", "One two. Three four! Five six.", "One two. Three four! Five six.\n", text], "{got:?}");
+    assert!(got[0].is_empty(), "one click places the caret: {got:?}");
+}
+
+#[test]
+fn esc_that_closes_a_dialog_keeps_the_type_tool_and_its_text_selection() {
+    let (mut h, id) = typing("One two three");
+    // A click in the text gives the canvas the keyboard focus, as when typing.
+    let p = screen_at(&mut h, id, 5..6);
+    h.hover_at(p);
+    h.step();
+    for _ in 0..2 {
+        click(&mut h, p);
+    }
+    h.run_steps(4);
+    let words = selected_range(&h);
+    assert_eq!(words, 4..7, "the double-click selects \"two\"");
+    let app = h.state_mut();
+    let name = app.run("style.character.create", json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
+    app.ui.dialog = Some(crate::dialogs::Dialog::new("characterStyleOptions", json!({"name": name})));
+    h.run_steps(3);
+    h.key_press(egui::Key::Escape);
+    h.run_steps(3);
+    assert!(h.state().ui.dialog.is_none(), "Esc closes the dialog");
+    assert_eq!((h.state().session.tool_id(), selected_range(&h)), ("type", words));
+    // With no dialog open, Esc in the text still leaves it for the Selection tool.
+    h.key_press(egui::Key::Escape);
+    h.run_steps(3);
+    assert_eq!(h.state().session.tool_id(), "selection");
+}
+
+#[test]
+fn slow_clicks_do_not_add_up() {
+    let (mut h, id) = typing("One two. Three four!");
+    let p = screen_at(&mut h, id, 10..14);
+    h.hover_at(p);
+    h.step();
+    for _ in 0..3 {
+        click(&mut h, p);
+        h.run_steps(30);
+    }
+    assert!(selected_range(&h).is_empty(), "three clicks half a second apart leave a caret: {:?}", selected_range(&h));
+}
+
+/// A viewport wider than the GPU's largest texture: the canvas texture is sampled down, and an
+/// edit repaints it whole. A region repainted in view pixels would land in the wrong place,
+/// or outside the texture (a wgpu validation error). A view that fits is still patched.
+#[test]
+fn an_edit_repaints_a_canvas_texture_sampled_down_to_the_gpu_limit_whole() {
+    for (width, sampled_down) in [(1440.0, false), (2600.0, true)] {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        let frame = app.run("frame.create", json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Text"})).unwrap();
+        let mut h = Harness::builder().with_size(vec2(width, 900.0)).build_ui_state(
+            |ui, app: &mut DesignApp| {
+                let ctx = ui.ctx().clone();
+                app.logic(&ctx);
+                app.ui(ui);
+            },
+            app,
+        );
+        h.run_steps(6);
+        let limit = h.ctx.input(|i| i.max_texture_side);
+        let size = h.state().canvas.texture.as_ref().map(|t| t.size()).unwrap();
+        assert!(size[0] <= limit && size[1] <= limit, "{size:?}");
+        let shown = h.state().canvas.shown.unwrap().size;
+        assert_eq!(shown.0 > limit as f32, sampled_down, "view {shown:?}, limit {limit}");
+        let patches = h.state().canvas.patches;
+        // A small edit: one more character in the frame.
+        h.state_mut().run("text.insert", json!({"story": frame["story"], "at": 4, "text": "s"})).unwrap();
+        h.run_steps(6);
+        assert_eq!(h.state().canvas.patches == patches, sampled_down, "width {width}");
+        assert_eq!(h.state().canvas.texture.as_ref().map(|t| t.size()), Some(size));
+    }
+}
+
+/// ⌥E then I types "í" on a Mac: the input method composes the dead key's accent, which
+/// it does only for a window that turned it on. The canvas never did, so ⌥E typed "e".
+#[test]
+fn dead_keys_compose_through_the_input_method() {
+    let (mut h, id) = typing("T");
+    h.state_mut().run("text.placeCaret", json!({"frame": id, "point": [390.0, 80.0]})).unwrap();
+    h.run_steps(2);
+    assert!(h.output().platform_output.ime.is_some(), "a text caret turns the input method on");
+    h.event(egui::Event::Ime(egui::ImeEvent::Preedit { text: "´".into(), active_range_chars: None }));
+    h.run_steps(2);
+    let text = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().doc.stories.values().map(|s| s.text.clone()).collect::<String>();
+    assert_eq!(text(&h), "T´", "the accent being composed shows in the story");
+    assert!(h.state().session.tool_composing(), "and is marked as composed, not typed");
+    h.event(egui::Event::Ime(egui::ImeEvent::Preedit { text: String::new(), active_range_chars: None }));
+    h.event(egui::Event::Ime(egui::ImeEvent::Commit("í".into())));
+    h.run_steps(2);
+    assert_eq!(text(&h), "Tí");
+    assert!(!h.state().session.tool_composing());
+    // Moving the caret mid-composition keeps the accent as typed and tells the input method
+    // to drop its copy.
+    h.event(egui::Event::Ime(egui::ImeEvent::Preedit { text: "˜".into(), active_range_chars: None }));
+    h.run_steps(2);
+    h.state_mut().run("text.move", json!({"dir": "left"})).unwrap();
+    h.step();
+    assert_eq!(text(&h), "Tí˜");
+    assert!(!h.state().session.tool_composing());
+    assert!(h.output().platform_output.ime.as_ref().is_some_and(|i| i.should_interrupt_composition));
+    assert!(h.state_mut().take_ime_discard());
+    // Another tool takes no text: the input method is off.
+    h.state_mut().run("tool.select", json!({"tool": "selection"})).unwrap();
+    h.run_steps(2);
+    assert!(h.output().platform_output.ime.is_none());
+}
+
+#[test]
+fn tools_show_their_own_cursors_over_the_page() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let mut h = harness(app);
+    let p = h.state().canvas_rect.unwrap().center();
+    let mut shown = |tool: &str| {
+        h.state_mut().run("tool.select", json!({"tool": tool})).unwrap();
+        h.hover_at(p);
+        h.run_steps(2);
+        let out = &h.output().platform_output;
+        (out.cursor_icon, out.cursor_image.clone())
+    };
+    let (pen, direct, text, selection) = (shown("pen"), shown("directSelection"), shown("type"), shown("selection"));
+    let ppp = h.ctx.pixels_per_point();
+    let images = &mut h.state_mut().cursors;
+    match crate::cursors::mode() {
+        crate::cursors::Mode::Os => {
+            assert_eq!(pen.1, images.get(Cursor::Pen, ppp), "Pen");
+            assert_eq!(direct.1, images.get(Cursor::ArrowHollow, ppp), "Direct Selection");
+            assert_eq!(selection.1, images.get(Cursor::Arrow, ppp), "Selection");
+            assert_eq!(text, (egui::CursorIcon::Text, None), "the I-beam stays a system cursor");
+        }
+        crate::cursors::Mode::Painted => {
+            assert_eq!((pen.0, direct.0, selection.0), (egui::CursorIcon::None, egui::CursorIcon::None, egui::CursorIcon::None));
+        }
+        crate::cursors::Mode::System => assert_eq!(pen, (egui::CursorIcon::Crosshair, None)),
+    }
+}
+
+#[test]
+fn document_grid_is_drawn_where_points_snap_to_it() {
+    use designcraft_tools::{SnapView, ToolContext};
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let doc = app.session.active().unwrap().doc.clone();
+    let layout = CanvasLayout::new(&doc, false);
+    let sr = SpreadRef::Doc(0);
+    // Where the grid snaps a point in the first page (72 pt / 8 subdivisions = 9 pt).
+    let page = doc.spreads[0].pages[0].bounds();
+    let sel = Selection::default();
+    let cx = ToolContext {
+        doc: &doc,
+        selection: &sel,
+        cache: &app.session.cache,
+        layout: &layout,
+        zoom: 1.0,
+        layer: doc.layers[0].id,
+        snap: SnapView { snap_to_document_grid: true, zone_px: 20.0, ..SnapView::OFF },
+        unit: Unit::Points,
+        stroke_in_front: false,
+    };
+    let (snapped, _) = designcraft_tools::snap::snap_point(&cx, sr, Point::new(page.x0 + 31.3, page.y0 + 47.9));
+    assert_eq!((snapped.x - page.x0, snapped.y - page.y0), (27.0, 45.0));
+    // Render 40 × 40 pt around it at 4 px/pt.
+    let scale = 4.0;
+    let corner = layout.xf(sr) * Point::new(snapped.x - 20.0, snapped.y - 20.0);
+    let view = Affine::scale(scale) * Affine::translate((-corner.x, -corner.y));
+    let placed: Vec<_> = layout.slots.iter().map(|s| designcraft_render::Placed { spread: s.spread, xf: s.xf }).collect();
+    let render = |app: &DesignApp| {
+        let opts = screen_options(app, &layout, false, 1.0);
+        designcraft_render::Renderer::new().render(&doc, &app.session.cache, &placed, (160, 160), view, &opts)
+    };
+    // The snapped point is at pixel (80, 80); halfway to the next line is 18 px further.
+    let darkest = |img: &designcraft_render::Rendered, xs: [u32; 2], ys: [u32; 2]| {
+        (xs[0]..xs[1]).flat_map(|x| (ys[0]..ys[1]).map(move |y| (x, y))).map(|(x, y)| img.pixel(x, y)[0]).min().unwrap()
+    };
+    let off = render(&app);
+    assert_eq!(darkest(&off, [78, 82], [60, 64]), 255, "no grid while it is hidden");
+    app.run("view.documentGrid", json!({})).unwrap();
+    let on = render(&app);
+    assert!(darkest(&on, [79, 81], [60, 64]) < 250, "a vertical line at the snapped x");
+    assert!(darkest(&on, [60, 64], [79, 81]) < 250, "a horizontal line at the snapped y");
+    assert_eq!(darkest(&on, [96, 100], [96, 100]), 255, "nothing between lines");
+    // Preview hides it.
+    app.ui.screen_mode = ScreenMode::Preview;
+    assert!(screen_options(&app, &layout, true, 1.0).document_grid.is_empty());
+}
+
+/// egui moves keyboard focus on a plain arrow key or Tab, and Space/Return then clicks the
+/// focused widget (e.g. the status bar's spread buttons) while typing still reaches the text.
+#[test]
+fn arrow_keys_and_tab_keep_keyboard_focus_on_the_canvas() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 3})).unwrap();
+    let f = app.run("frame.create", json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Hello"})).unwrap();
+    app.select_tool("type");
+    let mut h = harness(app);
+    let p = {
+        let app = h.state();
+        let st = app.session.active().unwrap();
+        let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+        let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
+        xf.to_screen(layout.xf(SpreadRef::Doc(0)) * Point::new(100.0, 60.0))
+    };
+    h.hover_at(p);
+    h.step();
+    for pressed in [true, false] {
+        h.event(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
+        h.step();
+    }
+    h.run_steps(2);
+    let focus = h.ctx.memory(|m| m.focused());
+    assert!(focus.is_some(), "a click on the canvas takes keyboard focus");
+    let view = *h.state().view().unwrap();
+    for key in [egui::Key::ArrowDown, egui::Key::Space, egui::Key::ArrowRight, egui::Key::Enter, egui::Key::Tab, egui::Key::Escape] {
+        h.key_press(key);
+        if key == egui::Key::Space {
+            h.event(egui::Event::Text(" ".into()));
+        }
+        h.run_steps(2);
+        assert_eq!(h.ctx.memory(|m| m.focused()), focus, "{key:?} keeps keyboard focus on the canvas");
+    }
+    let v = *h.state().view().unwrap();
+    assert_eq!((v.origin, v.zoom), (view.origin, view.zoom), "the view stays where it was");
+    let text = h.state_mut().session.execute("story.get", &json!({"story": f["story"]})).unwrap()["text"].clone();
+    assert_eq!(text, "Hello \n\t", "Space, Return and Tab reach the text");
+}
+
+#[test]
+fn rulers_open_no_units_menu_without_a_document() {
+    let mut h = harness(DesignApp::new(designcraft_engine::Session::new(), crate::Services::default()));
+    let Some(rect) = h.state().canvas_rect else { return };
+    right_click(&mut h, pos2(rect.center().x, rect.min.y - RULER / 2.0));
+    assert!(h.query_by_label("   Points").is_none());
+}
+
+/// One frame of the whole app with `events`; returns what it asks of the system IME.
+fn ime_frame(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>) -> Option<egui::output::IMEOutput> {
+    let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1400.0, 900.0))), events, ..Default::default() };
+    let mut out = ctx.run_ui(raw, |ui| {
+        app.logic(ui.ctx());
+        app.ui(ui);
+    });
+    out.textures_delta.clear();
+    out.platform_output.ime
+}
+
+/// An edit patches the canvas texture in place only while that texture is at full resolution:
+/// past the GPU's texture limit `upload` shrinks it, and a full-resolution patch written into
+/// it is a renderer validation error.
+#[test]
+fn edits_patch_the_canvas_only_at_full_resolution() {
+    for (max_side, patches) in [(None, true), (Some(1024), false)] {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        let ctx = egui::Context::default();
+        let frame = |app: &mut DesignApp| {
+            // Wider than the limit (egui's font atlas needs at least 1024).
+            let mut raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1900.0, 900.0))), ..Default::default() };
+            if let Some(m) = max_side {
+                raw.max_texture_side = Some(m);
+            }
+            let mut out = ctx.run_ui(raw, |ui| {
+                app.logic(ui.ctx());
+                app.ui(ui);
+            });
+            out.textures_delta.clear();
+        };
+        app.run("file.new", json!({})).unwrap();
+        for _ in 0..3 {
+            frame(&mut app);
+        }
+        app.run("frame.create", json!({"rect": [36, 36, 60, 60]})).unwrap();
+        frame(&mut app);
+        let size = app.canvas.texture.as_ref().unwrap().size();
+        assert!(max_side.is_none_or(|m| size[0] <= m && size[1] <= m), "{size:?}");
+        assert_eq!(app.canvas.patches > 0, patches, "limit {max_side:?}");
+    }
+}
+
+/// The Type tool's caret at the end of a new text frame holding `text`, the app's first frames
+/// drawn; returns the story id.
+fn typing_app(app: &mut DesignApp, ctx: &egui::Context, text: &str) -> Value {
+    app.run("file.new", json!({})).unwrap();
+    let f = app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text", "text": text})).unwrap();
+    let sid = f["story"].clone();
+    app.session.execute("text.select", &json!({"story": sid, "anchor": text.len(), "focus": text.len()})).unwrap();
+    app.select_tool("type");
+    for _ in 0..4 {
+        ime_frame(app, ctx, vec![]);
+    }
+    sid
+}
+
+fn story_text(app: &mut DesignApp, sid: &Value) -> String {
+    app.session.execute("story.get", &json!({"story": sid})).unwrap()["text"].as_str().unwrap().to_string()
+}
+
+/// Spread point `p` on screen.
+fn on_screen(app: &DesignApp, p: Point) -> Pos2 {
+    let st = app.session.active().unwrap();
+    let c = CanvasLayout::new(&st.doc, st.editing_parents).to_canvas(SpreadRef::Doc(0), p);
+    Xf::new(app.canvas_rect.unwrap(), app.view().unwrap()).to_screen(c)
+}
+
+fn preedit(t: &str, c: usize) -> egui::Event {
+    egui::Event::Ime(egui::ImeEvent::Preedit { text: t.into(), active_range_chars: Some(c..c) })
+}
+
+/// Extract `(surrounding text, cursor, anchor)` from an IME output.
+fn ime_payload(ime: &egui::output::IMEOutput) -> Option<(&str, usize, usize)> {
+    ime.surrounding_text.available().map(|p| (p.text.as_str(), p.cursor, p.anchor))
+}
+
+/// Set an engine text selection for a test fixture.
+fn text_selection(app: &mut DesignApp, sid: &Value, anchor: usize, focus: usize) {
+    app.session.execute("text.select", &json!({"story": sid, "anchor": anchor, "focus": focus})).unwrap();
+}
+
+struct NativeClickFixture {
+    app: DesignApp,
+    ctx: egui::Context,
+    target: Value,
+    old: Value,
+    at: Pos2,
+    focus: usize,
+}
+
+/// Build the old and target stories, measure an interior target caret, and leave the old story selected before the click.
+fn native_gui_click_fixture() -> NativeClickFixture {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let old = typing_app(&mut app, &ctx, "Old story");
+    let frame = app.run("frame.create", json!({"rect": [36, 280, 300, 400], "content": "text", "text": "Target story"})).unwrap();
+    let target = frame["story"].clone();
+    // Measure an interior first-word caret through the engine, rather than guessing a
+    // font-dependent screen pixel or clicking the frame's resize border.
+    let (point, focus) = (50..180)
+        .find_map(|x| {
+            app.run("text.placeCaret", json!({"frame": frame["id"], "point": [x, 290]})).unwrap();
+            let sel = app.session.doc().unwrap().selection.text.unwrap();
+            assert_eq!(sel.story.0, target.as_u64().unwrap());
+            (1..5).contains(&sel.focus).then_some((Point::new(f64::from(x), 290.0), sel.focus))
+        })
+        .expect("an interior point in the target's first word");
+    text_selection(&mut app, &old, "Old story".len(), "Old story".len());
+    for _ in 0..4 {
+        ime_frame(&mut app, &ctx, vec![]);
+    }
+    let at = on_screen(&app, point);
+    assert!(app.canvas_rect.unwrap().contains(at));
+    ime_frame(&mut app, &ctx, vec![egui::Event::PointerMoved(at)]);
+    assert_eq!(app.session.doc().unwrap().selection.text.unwrap().story.0, old.as_u64().unwrap());
+    NativeClickFixture { app, ctx, target, old, at, focus }
+}
+
+/// Build a primary pointer press or release event at a position.
+fn native_gui_button(pos: Pos2, pressed: bool) -> egui::Event {
+    egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() }
+}
+
+/// The 37-byte Devanagari line the native run had in the previous story.
+const NATIVE_GUI_OLD_DEVANAGARI: &str = "नमस्ते दुनिया";
+
+/// The click fixture with the non-empty selection in the previous story that the native
+/// Windows run had (37-byte Devanagari, 0..37). A non-empty selection shows the contextual
+/// task bar; keep it present but clear of the target click.
+fn native_gui_selected_old_click_fixture() -> NativeClickFixture {
+    let mut f = native_gui_click_fixture();
+    text_selection(&mut f.app, &f.old, 0, "Old story".len());
+    f.app.run("text.insert", json!({"text": NATIVE_GUI_OLD_DEVANAGARI})).unwrap();
+    text_selection(&mut f.app, &f.old, 0, NATIVE_GUI_OLD_DEVANAGARI.len());
+    for _ in 0..4 {
+        ime_frame(&mut f.app, &f.ctx, vec![]);
+    }
+    let sel = f.app.session.doc().unwrap().selection.text.unwrap();
+    assert_eq!((sel.story.0, sel.anchor, sel.focus), (f.old.as_u64().unwrap(), 0, NATIVE_GUI_OLD_DEVANAGARI.len()));
+    assert_eq!(NATIVE_GUI_OLD_DEVANAGARI.len(), 37, "the native fixture's Devanagari line was 37 UTF-8 bytes");
+    assert!(!sel.is_caret(), "the previous story's selection is non-empty");
+    assert!(!context_menu_open(&f.ctx), "no context menu owns this frame's keys");
+    assert!(f.app.ui.dialog.is_none() && f.app.ui.palette.is_none(), "no modal owns the keyboard");
+    assert!(!f.ctx.text_edit_focused(), "no text field owns the keyboard");
+    assert_eq!(f.app.pane, f.app.focus_pane, "the canvas pane takes the keyboard");
+    let task_bar = egui::Id::unique(("task_bar", f.ctx.viewport_id(), f.app.pane));
+    let bar = f.ctx.memory(|m| m.area_rect(task_bar)).expect("the old selection shows the floating task bar");
+    assert!(!bar.contains(f.at), "the floating task bar does not cover the target click at {bar:?}");
+    f
+}
+
+/// Run one raw event batch, optionally force a discarded pass, and return the pointer edges observed by each pass.
+fn native_gui_input(f: &mut NativeClickFixture, events: Vec<egui::Event>, discard: bool) -> Vec<(bool, bool, bool)> {
+    let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1400.0, 900.0))), events, ..Default::default() };
+    let mut edges = Vec::new();
+    let mut out = f.ctx.run_ui(raw, |ui| {
+        edges.push(ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.press_origin().is_some())));
+        f.app.logic(ui.ctx());
+        f.app.ui(ui);
+        if discard && edges.len() == 1 {
+            ui.ctx().request_discard("native same-batch click exactly-once regression");
+        }
+    });
+    if discard {
+        assert_eq!(out.platform_output.num_completed_passes, 2, "the requested discarded pass actually ran");
+    }
+    out.textures_delta.clear();
+    edges
+}
+
+/// Assert that the primary button, canvas press state and tool gesture are all released.
+fn native_gui_released(f: &NativeClickFixture) {
+    assert!(!f.ctx.input(|i| i.pointer.primary_down()), "the native primary button is up");
+    let down = f.ctx.data(|d| d.get_temp::<bool>(egui::Id::unique(("canvas_pointer_down", f.app.pane)))).unwrap_or(false);
+    assert!(!down, "the canvas retained a released pointer");
+    assert!(!f.app.session.tool_busy(), "a released click must not leave a tool gesture");
+}
+
+/// Create an independently measured second-story caret farther apart than the double-click distance.
+fn native_gui_second_click_target(f: &mut NativeClickFixture) -> (Value, Pos2, usize) {
+    let frame = f.app.run("frame.create", json!({"rect": [330, 280, 575, 400], "content": "text", "text": "Second story"})).unwrap();
+    let story = frame["story"].clone();
+    let (point, focus) = (345..465)
+        .find_map(|x| {
+            f.app.run("text.placeCaret", json!({"frame": frame["id"], "point": [x, 290]})).unwrap();
+            let sel = f.app.session.doc().unwrap().selection.text.unwrap();
+            assert_eq!(sel.story.0, story.as_u64().unwrap());
+            (1..5).contains(&sel.focus).then_some((Point::new(f64::from(x), 290.0), sel.focus))
+        })
+        .expect("an independently measured interior caret in the second story");
+    text_selection(&mut f.app, &f.old, "Old story".len(), "Old story".len());
+    for _ in 0..4 {
+        ime_frame(&mut f.app, &f.ctx, vec![]);
+    }
+    let at = on_screen(&f.app, point);
+    assert!(f.app.canvas_rect.unwrap().contains(f.at));
+    assert!(f.app.canvas_rect.unwrap().contains(at));
+    let max_click_dist = f.ctx.options(|o| o.input_options.max_click_dist);
+    assert!((at - f.at).length() > max_click_dist, "the two target presses must not form a double click");
+    (story, at, focus)
+}
+
+/// Two completed clicks in one batch use the last press once, emit one caret/release pair, add no history, and type at the final caret.
+#[test]
+fn native_gui_two_completed_clicks_use_last_primary_press_once() {
+    for reverse in [false, true] {
+        for discard in [false, true] {
+            let mut f = native_gui_click_fixture();
+            let (second, second_at, second_focus) = native_gui_second_click_target(&mut f);
+            let (first_at, last_at, final_story, final_focus) =
+                if reverse { (second_at, f.at, f.target.clone(), f.focus) } else { (f.at, second_at, second.clone(), second_focus) };
+            let initial = f.app.session.doc().unwrap().selection.text.unwrap();
+            assert_eq!((initial.story.0, initial.anchor, initial.focus), (f.old.as_u64().unwrap(), "Old story".len(), "Old story".len()));
+            let undo = f.app.session.doc().unwrap().history.undo.len();
+            let journal = f.app.session.journal.len();
+            let edges = native_gui_input(
+                &mut f,
+                vec![
+                    egui::Event::PointerMoved(first_at),
+                    native_gui_button(first_at, true),
+                    native_gui_button(first_at, false),
+                    egui::Event::PointerMoved(last_at),
+                    native_gui_button(last_at, true),
+                    native_gui_button(last_at, false),
+                ],
+                discard,
+            );
+            assert_eq!(edges[0], (true, true, false), "both completed clicks leave no held origin");
+            assert_eq!(edges.iter().filter(|e| e.0).count(), 1, "discard must not replay either press");
+            let sel = f.app.session.doc().unwrap().selection.text.unwrap();
+            assert_eq!(
+                (sel.story.0, sel.anchor, sel.focus),
+                (final_story.as_u64().unwrap(), final_focus, final_focus),
+                "reverse={reverse}, discard={discard}"
+            );
+            let commands = &f.app.session.journal[journal..];
+            assert_eq!(
+                commands.iter().filter(|(id, _)| id == "text.placeCaret").count(),
+                1,
+                "one aggregate canvas selection, reverse={reverse}, discard={discard}"
+            );
+            assert_eq!(
+                commands.iter().filter(|(id, _)| id == "text.release").count(),
+                1,
+                "one corresponding release, reverse={reverse}, discard={discard}"
+            );
+            let clicks = f.ctx.data(|d| d.get_temp::<Clicks>(egui::Id::unique(("canvas_clicks", f.app.pane)))).expect("one recovered canvas press");
+            assert_eq!(clicks.n, 1, "separated clicks and discarded passes must not select a word");
+            assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo, "pointer selection adds no document history");
+            native_gui_released(&f);
+            native_gui_input(&mut f, vec![egui::Event::Text("!".into())], false);
+            let mut target_text = "Target story".to_owned();
+            let mut second_text = "Second story".to_owned();
+            if reverse {
+                target_text.insert(final_focus, '!');
+            } else {
+                second_text.insert(final_focus, '!');
+            }
+            assert_eq!(story_text(&mut f.app, &f.target), target_text);
+            assert_eq!(story_text(&mut f.app, &second), second_text);
+            assert_eq!(story_text(&mut f.app, &f.old), "Old story");
+            assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo + 1, "typing at the final caret is one edit");
+            native_gui_released(&f);
+        }
+    }
+}
+
+/// A non-finite final press rejects the click instead of reviving an earlier valid press; later motion cannot drag.
+#[test]
+fn native_gui_nonfinite_final_press_cannot_reuse_an_earlier_click() {
+    for discard in [false, true] {
+        let mut f = native_gui_click_fixture();
+        let at = f.at;
+        let initial = f.app.session.doc().unwrap().selection.text;
+        let undo = f.app.session.doc().unwrap().history.undo.len();
+        let journal = f.app.session.journal.len();
+        let edges = native_gui_input(
+            &mut f,
+            vec![
+                egui::Event::PointerMoved(at),
+                native_gui_button(at, true),
+                native_gui_button(at, false),
+                native_gui_button(pos2(f32::NAN, at.y), true),
+                egui::Event::PointerMoved(at),
+                native_gui_button(at, false),
+            ],
+            discard,
+        );
+        assert_eq!(edges[0], (true, true, false));
+        assert_eq!(edges.iter().filter(|e| e.0).count(), 1, "discard must not replay malformed input");
+        assert_eq!(
+            f.app.session.doc().unwrap().selection.text,
+            initial,
+            "discard={discard}: reject the last press instead of reviving an earlier valid one"
+        );
+        assert!(f.app.session.journal[journal..].iter().all(|(id, _)| id != "text.placeCaret" && id != "text.release"));
+        assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo);
+        assert_eq!(story_text(&mut f.app, &f.target), "Target story");
+        assert_eq!(story_text(&mut f.app, &f.old), "Old story");
+        native_gui_released(&f);
+        native_gui_input(&mut f, vec![egui::Event::PointerMoved(at + vec2(90.0, 0.0))], false);
+        assert_eq!(f.app.session.doc().unwrap().selection.text, initial, "motion after the invalid released press cannot drag");
+        native_gui_released(&f);
+    }
+}
+
+/// A same-batch click switches story exactly once; typing, undo and redo affect only the target story, including discarded-pass runs.
+#[test]
+fn native_gui_same_batch_click_switches_story_once_before_typing() {
+    for discard in [false, true] {
+        let mut f = native_gui_click_fixture();
+        let undo = f.app.session.doc().unwrap().history.undo.len();
+        let at = f.at;
+        let edges = native_gui_input(&mut f, vec![egui::Event::PointerMoved(at), native_gui_button(at, true), native_gui_button(at, false)], discard);
+        assert_eq!(edges[0], (true, true, false), "the real input consumed both edges and cleared the origin");
+        assert_eq!(edges.iter().filter(|e| e.0).count(), 1, "a discarded pass must not replay the press");
+        let selection = f.app.session.doc().unwrap().selection.text.unwrap();
+        assert_eq!((selection.story.0, selection.anchor, selection.focus), (f.target.as_u64().unwrap(), f.focus, f.focus), "discard={discard}");
+        let clicks = f.ctx.data(|d| d.get_temp::<Clicks>(egui::Id::unique(("canvas_clicks", f.app.pane)))).expect("one actual canvas click");
+        assert_eq!(clicks.n, 1, "discard={discard}: replay must not turn a caret into word selection");
+        native_gui_released(&f);
+        assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo, "a click is not a document edit");
+        let end = |pressed| egui::Event::Key { key: egui::Key::End, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
+        native_gui_input(&mut f, vec![end(true), end(false)], false);
+        let caret = f.app.session.doc().unwrap().selection.text.unwrap();
+        assert_eq!((caret.story.0, caret.focus), (f.target.as_u64().unwrap(), "Target story".len()));
+        native_gui_input(&mut f, vec![egui::Event::Text("!".into())], false);
+        assert_eq!(story_text(&mut f.app, &f.target), "Target story!");
+        assert_eq!(story_text(&mut f.app, &f.old), "Old story");
+        assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo + 1, "one typed edit, including discarded-pass control");
+        f.app.run("edit.undo", json!({})).unwrap();
+        assert_eq!(story_text(&mut f.app, &f.target), "Target story");
+        assert_eq!(story_text(&mut f.app, &f.old), "Old story");
+        f.app.run("edit.redo", json!({})).unwrap();
+        assert_eq!(story_text(&mut f.app, &f.target), "Target story!");
+        assert_eq!(story_text(&mut f.app, &f.old), "Old story");
+        native_gui_released(&f);
+    }
+}
+
+/// The native Windows failure: with a non-empty selection in another story, a click that
+/// switches stories followed by End in the same job left the new story's caret at the click
+/// point. End in a later job worked. Drive the actual app UI and actual pointer/key events in
+/// one batch, in split batches, and with End while the press is still held; discard a pass to
+/// cover replay. The End press must reach the type tool once and win over the click, wherever
+/// the pointer release falls, and typing must go there once.
+#[test]
+fn native_gui_click_then_end_in_one_batch_keeps_the_target_caret_at_the_story_end() {
+    let names = ["same batch, click events first", "click batch then End batch", "End while the press is held"];
+    for (layout, name) in names.into_iter().enumerate() {
+        for discard in [false, true] {
+            let mut f = native_gui_selected_old_click_fixture();
+            let (at, target, old) = (f.at, f.target.clone(), f.old.clone());
+            let undo = f.app.session.doc().unwrap().history.undo.len();
+            let journal = f.app.session.journal.len();
+            let moved = || egui::Event::PointerMoved(at);
+            let down = || native_gui_button(at, true);
+            let up = || native_gui_button(at, false);
+            let end = |pressed| egui::Event::Key { key: egui::Key::End, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
+            let batches: Vec<Vec<egui::Event>> = match layout {
+                0 => vec![vec![moved(), down(), up(), end(true), end(false)]],
+                1 => vec![vec![moved(), down(), up()], vec![end(true), end(false)]],
+                _ => vec![vec![moved(), down()], vec![end(true)], vec![up(), end(false)]],
+            };
+            for events in batches {
+                native_gui_input(&mut f, events, discard);
+            }
+            let selection = f.app.session.doc().unwrap().selection.text.unwrap();
+            assert_eq!(
+                (selection.story.0, selection.anchor, selection.focus),
+                (target.as_u64().unwrap(), "Target story".len(), "Target story".len()),
+                "{name}, discard={discard}: End must win after the click, wherever the release falls"
+            );
+            let commands = &f.app.session.journal[journal..];
+            assert_eq!(
+                commands.iter().filter(|(id, _)| id == "text.move").count(),
+                1,
+                "{name}, discard={discard}: the End press reached the type tool once"
+            );
+            let clicks = f.ctx.data(|d| d.get_temp::<Clicks>(egui::Id::unique(("canvas_clicks", f.app.pane)))).expect("one actual canvas click");
+            assert_eq!(clicks.n, 1, "{name}, discard={discard}: a discarded pass must not replay the press as a word selection");
+            native_gui_released(&f);
+            native_gui_input(&mut f, vec![egui::Event::Text("!".into())], discard);
+            assert_eq!(story_text(&mut f.app, &target), "Target story!", "{name}, discard={discard}: typing lands at the End caret once");
+            assert_eq!(story_text(&mut f.app, &old), NATIVE_GUI_OLD_DEVANAGARI);
+            assert_eq!(
+                f.app.session.journal[journal..].iter().filter(|(id, _)| id == "text.insert").count(),
+                1,
+                "{name}, discard={discard}: the text event is not replayed"
+            );
+            assert_eq!(f.app.session.doc().unwrap().history.undo.len(), undo + 1, "{name}, discard={discard}: one edit");
+        }
+    }
+}
+
+/// Pointer ownership survives a split press/move/release; a real drag selects, release ends it, and later motion cannot continue it.
+#[test]
+fn native_gui_split_click_and_drag_release_keep_pointer_ownership() {
+    for drag in [false, true] {
+        let mut f = native_gui_click_fixture();
+        let at = f.at;
+        native_gui_input(&mut f, vec![native_gui_button(at, true)], false);
+        let sel = f.app.session.doc().unwrap().selection.text.unwrap();
+        assert_eq!((sel.story.0, sel.focus), (f.target.as_u64().unwrap(), f.focus));
+        assert!(f.ctx.input(|i| i.pointer.primary_down()));
+        assert!(f.ctx.data(|d| d.get_temp::<bool>(egui::Id::unique(("canvas_pointer_down", f.app.pane)))).unwrap());
+        if drag {
+            let moved = at + vec2(60.0, 0.0);
+            native_gui_input(&mut f, vec![egui::Event::PointerMoved(moved)], false);
+            let sel = f.app.session.doc().unwrap().selection.text.unwrap();
+            assert_eq!(sel.story.0, f.target.as_u64().unwrap());
+            assert!(!sel.is_caret(), "a real held drag selects text");
+        }
+        let release = if drag { pos2(-20.0, at.y) } else { at };
+        native_gui_input(&mut f, vec![egui::Event::PointerMoved(release), native_gui_button(release, false)], false);
+        native_gui_released(&f);
+        let selection = f.app.session.doc().unwrap().selection.text;
+        native_gui_input(&mut f, vec![egui::Event::PointerMoved(at + vec2(90.0, 0.0))], false);
+        assert_eq!(f.app.session.doc().unwrap().selection.text, selection, "motion after release cannot continue the old drag");
+        assert_eq!(story_text(&mut f.app, &f.target), "Target story");
+        assert_eq!(story_text(&mut f.app, &f.old), "Old story");
+    }
+}
+
+/// An unowned outside press, and a press that dismisses an open menu, cannot move the selection or edit either story.
+#[test]
+fn native_gui_outside_press_and_open_menu_do_not_click_through() {
+    for menu in [false, true] {
+        let mut f = native_gui_click_fixture();
+        let at = f.at;
+        let selection = f.app.session.doc().unwrap().selection.text;
+        if menu {
+            let blank = f.app.canvas_rect.unwrap().max - vec2(30.0, 30.0);
+            for pressed in [true, false] {
+                let event = egui::Event::PointerButton { pos: blank, button: egui::PointerButton::Secondary, pressed, modifiers: Default::default() };
+                native_gui_input(&mut f, vec![egui::Event::PointerMoved(blank), event], false);
+            }
+            assert!(context_menu_open(&f.ctx), "the actual secondary click opened the canvas menu");
+            assert_eq!(f.app.session.doc().unwrap().selection.text, selection);
+            native_gui_input(&mut f, vec![egui::Event::PointerMoved(at), native_gui_button(at, true), native_gui_button(at, false)], false);
+        } else {
+            let outside = pos2(-20.0, -20.0);
+            assert!(!f.app.canvas_rect.unwrap().contains(outside));
+            native_gui_input(
+                &mut f,
+                vec![
+                    egui::Event::PointerMoved(outside),
+                    native_gui_button(outside, true),
+                    egui::Event::PointerMoved(at),
+                    native_gui_button(at, false),
+                ],
+                false,
+            );
+        }
+        assert_eq!(f.app.session.doc().unwrap().selection.text, selection, "menu={menu}: an unowned press cannot move the old caret");
+        assert_eq!(story_text(&mut f.app, &f.target), "Target story");
+        assert_eq!(story_text(&mut f.app, &f.old), "Old story");
+        native_gui_released(&f);
+    }
+}
+
+/// Font inventory distinguishes exact bundled faces, missing styles and missing families without accepting installed or injected substitutes.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn native_gui_font_inventory_keeps_exact_regular_and_missing_style_diagnostics() {
+    if designcraft_fonts::CRAFT_FONTS.is_empty() {
+        assert!(std::env::var_os("CRAFT_FONTS_REQUIRED").is_none(), "required canonical fonts were not embedded");
+        return; // The supported optional-input build has no central document fonts.
+    }
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    for (family, text) in [("Noto Sans Hebrew", "שלום"), ("Noto Sans Devanagari", "नमस्ते")] {
+        assert!(designcraft_fonts::CRAFT_FONTS.iter().any(|f| f.family == family && f.style == "Regular"), "canonical {family} Regular absent");
+        for style in ["Regular", "Unavailable Native GUI Style"] {
+            let frame = app.run("frame.create", json!({"rect": [36, 36, 300, 120], "content": "text", "text": text})).unwrap();
+            app.run("text.select", json!({"story": frame["story"], "anchor": 0, "focus": text.len()})).unwrap();
+            app.run("type.char", json!({"fontFamily": family, "fontStyle": style})).unwrap();
+        }
+    }
+    let frame = app.run("frame.create", json!({"rect": [36, 36, 300, 120], "content": "text", "text": "Missing"})).unwrap();
+    app.run("text.select", json!({"story": frame["story"], "anchor": 0, "focus": 7})).unwrap();
+    app.run("type.char", json!({"fontFamily": "Unavailable Native GUI Family", "fontStyle": "Regular"})).unwrap();
+    let inventory = app.run("font.list", json!({})).unwrap();
+    let rows = inventory.as_array().unwrap();
+    assert_eq!(rows.len(), 5, "{inventory}");
+    for family in ["Noto Sans Hebrew", "Noto Sans Devanagari"] {
+        for style in ["Regular", "Unavailable Native GUI Style"] {
+            let row = rows.iter().find(|r| r["family"] == family && r["style"] == style).unwrap();
+            assert_eq!(row["missing"], false, "{row}");
+            assert_eq!(row["styleMissing"], style != "Regular", "{row}");
+            assert_eq!(row["matchStatus"], if style == "Regular" { "exact" } else { "styleSubstitute" }, "{row}");
+            assert_eq!(row["resolvedFamily"], family, "{row}");
+            assert_eq!(row["resolvedStyle"], "Regular", "{row}");
+            assert_eq!(row["source"], "bundled", "an installed or injected face cannot satisfy this production contract: {row}");
+        }
+    }
+    let missing = rows.iter().find(|r| r["family"] == "Unavailable Native GUI Family").unwrap();
+    assert_eq!(missing["missing"], true, "{missing}");
+    assert_eq!(missing["matchStatus"], "missing", "{missing}");
+    assert!(missing["source"].is_null(), "{missing}");
+}
+
+#[test]
+#[allow(deprecated)] // `ImeEvent::Enabled` / `Disabled`: egui no longer sends them, other integrations may.
+fn ime_events_compose_in_the_story_with_the_candidate_window_at_the_caret() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let sid = typing_app(&mut app, &ctx, "曲:");
+    // At a text caret the IME is allowed, its window on the caret as the canvas draws it.
+    let ime = ime_frame(&mut app, &ctx, vec![]).expect("IME allowed at a text caret");
+    let (top, bottom) = {
+        let st = app.session.active().unwrap();
+        let cs = app.session.cache.get(&st.doc, designcraft_doc::StoryId(sid.as_u64().unwrap()), None);
+        let (fi, x, bl, asc, desc) = compose::caret(&cs, "曲:".len()).unwrap();
+        let fid = cs.frames[fi].frame;
+        let (a, _) = item_canvas_xf(&st.doc, &CanvasLayout::new(&st.doc, st.editing_parents), fid).unwrap();
+        let m = a * st.doc.text_xf(st.doc.item(fid).unwrap());
+        let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
+        (xf.to_screen(m * Point::new(x, bl - asc)), xf.to_screen(m * Point::new(x, bl + desc)))
+    };
+    assert!(ime.rect.expand(1.0).contains(top) && ime.rect.expand(1.0).contains(bottom), "{:?} vs {top:?}–{bottom:?}", ime.rect);
+    assert_eq!(ime.cursor_rect, ime.rect);
+    assert!(!ime.should_interrupt_composition);
+    assert!(app.canvas_ime(), "the web build keeps whole words typed at the caret");
+    // "ni" → に → 日, with the events winit sends.
+    ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Enabled), preedit("ni", 2)]);
+    assert_eq!(story_text(&mut app, &sid), "曲:ni", "marked text shows in place");
+    assert!(app.session.tool_composing());
+    // Keys, plain text, the clipboard and Undo (the native menu's ⌘Z) wait for the IME.
+    let steps = app.session.doc().unwrap().history.undo.len();
+    let key = |key, pressed| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
+    ime_frame(
+        &mut app,
+        &ctx,
+        vec![key(egui::Key::Backspace, true), key(egui::Key::Backspace, false), egui::Event::Text("x".into()), egui::Event::Paste("y".into())],
+    );
+    crate::menus::activate(&mut app, "edit.undo", &Value::Null);
+    assert!(!crate::menus::enabled(&app, "edit.undo"));
+    assert_eq!(story_text(&mut app, &sid), "曲:ni");
+    let ime2 = ime_frame(&mut app, &ctx, vec![preedit("に", 1)]).expect("IME allowed while composing");
+    assert_eq!(story_text(&mut app, &sid), "曲:に");
+    assert!(ime2.rect.center().x > ime.rect.center().x, "the window follows the IME's cursor: {:?} {:?}", ime2.rect, ime.rect);
+    ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into())), egui::Event::Ime(egui::ImeEvent::Disabled)]);
+    assert_eq!(story_text(&mut app, &sid), "曲:日");
+    assert!(!app.session.tool_composing());
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), steps + 1, "the commit is one undo step");
+    assert_eq!(app.session.journal.last(), Some(&("text.insert".to_string(), json!({"text": "日"}))));
+    // After the commit, typing and Undo work again.
+    ime_frame(&mut app, &ctx, vec![egui::Event::Text("!".into())]);
+    assert_eq!(story_text(&mut app, &sid), "曲:日!");
+    crate::menus::activate(&mut app, "edit.undo", &Value::Null);
+    crate::menus::activate(&mut app, "edit.undo", &Value::Null);
+    assert_eq!(story_text(&mut app, &sid), "曲:");
+    // Without a text caret the IME is off: single-key tool shortcuts keep working.
+    app.select_tool("selection");
+    assert!(ime_frame(&mut app, &ctx, vec![]).is_none());
+    assert!(!app.canvas_ime());
+}
+
+/// Both panes of a split window see the same keyboard events: only the pane last clicked
+/// types them.
+#[test]
+fn a_split_window_types_once() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let sid = typing_app(&mut app, &ctx, "ab");
+    app.run("window.split", json!({"on": true})).unwrap();
+    for _ in 0..3 {
+        ime_frame(&mut app, &ctx, vec![]);
+    }
+    assert!(app.other_pane.as_ref().and_then(|o| o.1).is_some(), "both panes are drawn");
+    ime_frame(&mut app, &ctx, vec![egui::Event::Text("c".into())]);
+    assert_eq!(story_text(&mut app, &sid), "abc");
+    let key = |pressed| egui::Event::Key { key: egui::Key::Backspace, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
+    ime_frame(&mut app, &ctx, vec![key(true), key(false)]);
+    assert_eq!(story_text(&mut app, &sid), "ab");
+    ime_frame(&mut app, &ctx, vec![egui::Event::Paste("de".into())]);
+    assert_eq!(story_text(&mut app, &sid), "abde");
+    ime_frame(&mut app, &ctx, vec![preedit("に", 1)]);
+    assert_eq!(story_text(&mut app, &sid), "abdeに");
+    ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))]);
+    assert_eq!(story_text(&mut app, &sid), "abde日");
+}
+
+/// Surrounding text is committed text only, preserves reversed selection direction, and a commit keeps owner/generation while reporting `InputMethod`.
+#[test]
+fn ime_reports_the_committed_story_and_excludes_the_pre_edit() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let sid = typing_app(&mut app, &ctx, "a😀b");
+    let len = "a😀b".len();
+    text_selection(&mut app, &sid, 0, len);
+    let ime = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
+    assert_eq!(ime_payload(&ime), Some(("a😀b", len, 0)), "reversed selection keeps its direction");
+    let owner = (ime.owner, ime.context_generation);
+    // Marked text previews in the document but is not committed surrounding text.
+    let ime = ime_frame(&mut app, &ctx, vec![preedit("に", 1)]).expect("a text caret");
+    assert_eq!(ime_payload(&ime), Some(("a😀b", len, 0)));
+    assert_eq!(ime.owner, owner.0);
+    let ime = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))]).expect("a text caret");
+    assert_eq!(ime_payload(&ime), Some(("日", 3, 3)));
+    assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod);
+    assert_eq!(story_text(&mut app, &sid), "日");
+    assert_eq!(ime.owner, owner.0);
+    assert_eq!(ime.context_generation, owner.1, "a commit is not a new context");
+    let ime = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
+    assert_eq!(ime_payload(&ime), Some(("日", 3, 3)), "a later pass reports the same committed text");
+    assert_eq!((ime.owner, ime.context_generation), owner, "an unchanged pass keeps the context");
+}
+
+/// An empty story provides `("",0,0)`; long text is bounded and an out-of-window selection is explicitly unavailable.
+#[test]
+fn ime_empty_story_is_available_and_wide_text_is_bounded() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    typing_app(&mut app, &ctx, "");
+    let ime = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
+    assert_eq!(ime_payload(&ime), Some(("", 0, 0)), "an empty document is available, not unavailable");
+    assert!(!app.session.tool_composing());
+
+    let long = "a".repeat(5000);
+    let sid = typing_app(&mut app, &ctx, &long);
+    let ime = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
+    let (text, _, _) = ime_payload(&ime).expect("a long document still has surrounding text");
+    assert!(text.len() <= egui::output::MAX_IME_SURROUNDING_TEXT_BYTES, "{}", text.len());
+    text_selection(&mut app, &sid, 0, 5000);
+    let ime = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
+    assert!(ime.surrounding_text.available().is_none(), "a selection beyond the bound is explicitly unavailable");
+}
+
+/// Caret movement preserves owner; changing story or document changes owner and generation.
+#[test]
+fn ime_owner_follows_the_story_and_the_document() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    typing_app(&mut app, &ctx, "ab");
+    let first = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
+    app.session.execute("text.move", &json!({"dir": "left"})).unwrap();
+    let moved = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
+    assert_eq!((moved.owner, moved.context_generation), (first.owner, first.context_generation), "a caret move keeps the context");
+
+    let other = app.run("frame.create", json!({"rect": [400, 36, 200, 100], "content": "text", "text": "xy"})).unwrap();
+    let other_sid = other["story"].clone();
+    text_selection(&mut app, &other_sid, 2, 2);
+    let second = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
+    assert_ne!(second.owner, first.owner, "another story is another owner");
+    assert_ne!(second.context_generation, first.context_generation);
+
+    app.run("file.new", json!({})).unwrap();
+    let doc = app.run("frame.create", json!({"rect": [36, 36, 200, 100], "content": "text", "text": "z"})).unwrap();
+    text_selection(&mut app, &doc["story"], 1, 1);
+    let replaced = ime_frame(&mut app, &ctx, vec![]).expect("a text caret");
+    assert_ne!(replaced.owner, second.owner, "a new document is another owner");
+    assert_eq!(ime_payload(&replaced), Some(("z", 1, 1)));
+}
+
+/// Pure commits report `InputMethod`; typing before or after a commit in one pass makes the cause `Other`.
+#[test]
+fn ime_cause_distinguishes_commits_from_application_edits() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    typing_app(&mut app, &ctx, "a");
+    let committed = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))]).expect("a text caret");
+    assert_eq!(committed.change_cause, egui::output::ImeChangeCause::InputMethod);
+    let typed = ime_frame(&mut app, &ctx, vec![egui::Event::Text("!".into())]).expect("a text caret");
+    assert_eq!(typed.change_cause, egui::output::ImeChangeCause::Other, "ordinary typing is an application edit");
+    assert_eq!(ime_payload(&typed), Some(("a日!", 5, 5)));
+
+    // An application edit before the commit in one pass breaks the receipt chain.
+    let mut before = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    typing_app(&mut before, &ctx, "a");
+    let mixed = ime_frame(&mut before, &ctx, vec![egui::Event::Text("x".into()), egui::Event::Ime(egui::ImeEvent::Commit("日".into()))])
+        .expect("a text caret");
+    assert_eq!(mixed.change_cause, egui::output::ImeChangeCause::Other);
+    assert_eq!(ime_payload(&mixed), Some(("ax日", 5, 5)));
+
+    // An application edit after the commit in one pass also dominates.
+    let mut after = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    typing_app(&mut after, &ctx, "a");
+    let mixed = ime_frame(&mut after, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into())), egui::Event::Text("!".into())])
+        .expect("a text caret");
+    assert_eq!(mixed.change_cause, egui::output::ImeChangeCause::Other);
+    assert_eq!(ime_payload(&mixed), Some(("a日!", 5, 5)));
+}
+
+/// The settled multipass result rebuilds the current surrounding text while retaining the accepted commit cause.
+#[test]
+fn ime_cause_and_context_survive_a_discarded_pass() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    typing_app(&mut app, &ctx, "a");
+    let raw = egui::RawInput {
+        screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1400.0, 900.0))),
+        events: vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))],
+        ..Default::default()
+    };
+    let mut passes = 0;
+    let mut out = ctx.run_ui(raw, |ui| {
+        passes += 1;
+        if passes == 1 {
+            ui.ctx().request_discard("IME multipass regression");
+        }
+        app.logic(ui.ctx());
+        app.ui(ui);
+    });
+    out.textures_delta.clear();
+    assert_eq!(out.platform_output.num_completed_passes, 2, "the frame really was multipass");
+    let ime = out.platform_output.ime.expect("a text caret");
+    assert_eq!(ime_payload(&ime), Some(("a日", 4, 4)), "the second pass rebuilds the current text");
+    assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod, "the discarded pass keeps the accepted commit's cause");
+}
+
+/// Autocorrected commit text is an application edit with cause `Other`.
+#[test]
+fn ime_autocorrect_is_not_an_input_method_cause() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    app.session.prefs.autocorrect = true;
+    let sid = typing_app(&mut app, &ctx, "teh");
+    let ime = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit(" ".into()))]).expect("a text caret");
+    assert_eq!(story_text(&mut app, &sid), "the ");
+    assert_eq!(ime.change_cause, egui::output::ImeChangeCause::Other);
+}
+
+/// The selection stays selected and directed; byte partials leave whole characters; the deletion is one undo step.
+#[test]
+fn ime_delete_surrounding_excludes_the_selection_and_rounds_bytes_inward() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let sid = typing_app(&mut app, &ctx, "aé😀b");
+    // Select é, which keeps its bytes and direction; 'a' before and 😀 after go.
+    text_selection(&mut app, &sid, 1, 3);
+    ime_frame(&mut app, &ctx, vec![]);
+    let steps = app.session.doc().unwrap().history.undo.len();
+    let ime = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 2, after_bytes: 4 })])
+        .expect("a text caret");
+    assert_eq!(story_text(&mut app, &sid), "éb");
+    let sel = app.session.doc().unwrap().selection.text.unwrap();
+    assert_eq!((sel.anchor, sel.focus), (0, 2), "the selected text stays selected and directed");
+    assert_eq!(ime_payload(&ime), Some(("éb", 2, 0)));
+    assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod);
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), steps + 1, "one deletion is one undo step");
+    app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(story_text(&mut app, &sid), "aé😀b");
+    ime_frame(&mut app, &ctx, vec![]);
+    // The same deletion with a reversed selection keeps anchor > focus.
+    text_selection(&mut app, &sid, 3, 1);
+    ime_frame(&mut app, &ctx, vec![]);
+    let ime = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 2, after_bytes: 4 })])
+        .expect("a text caret");
+    assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod);
+    let sel = app.session.doc().unwrap().selection.text.unwrap();
+    assert_eq!(story_text(&mut app, &sid), "éb");
+    assert_eq!((sel.anchor, sel.focus), (2, 0), "reversed selection stays reversed");
+
+    // One byte of a two-byte character leaves the whole character.
+    let partial = typing_app(&mut app, &ctx, "aé");
+    text_selection(&mut app, &partial, 1, 1);
+    ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 0, after_bytes: 1 })]);
+    assert_eq!(story_text(&mut app, &partial), "aé");
+    // A preceding count that lands inside the four-byte emoji leaves it whole too.
+    let partial = typing_app(&mut app, &ctx, "a😀");
+    ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 2, after_bytes: 0 })]);
+    assert_eq!(story_text(&mut app, &partial), "a😀");
+}
+
+/// A 200-character request deletes the whole 100-character story.
+#[test]
+fn ime_delete_surrounding_has_no_sixty_four_character_cap() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let sid = typing_app(&mut app, &ctx, &"x".repeat(100));
+    ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurrounding { before_chars: 200, after_chars: 0 })]);
+    assert_eq!(story_text(&mut app, &sid), "");
+}
+
+/// Delete plus commit in one IME batch produces one undoable edit and reports the final surrounding text.
+#[test]
+fn ime_delete_and_commit_are_one_undo_step() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let sid = typing_app(&mut app, &ctx, "ab");
+    text_selection(&mut app, &sid, 1, 2);
+    ime_frame(&mut app, &ctx, vec![]);
+    let steps = app.session.doc().unwrap().history.undo.len();
+    let ime = ime_frame(
+        &mut app,
+        &ctx,
+        vec![
+            egui::Event::Ime(egui::ImeEvent::DeleteSurrounding { before_chars: 1, after_chars: 0 }),
+            egui::Event::Ime(egui::ImeEvent::Commit("X".into())),
+        ],
+    )
+    .expect("a text caret");
+    assert_eq!(story_text(&mut app, &sid), "X");
+    assert_eq!(ime_payload(&ime), Some(("X", 1, 1)));
+    assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod);
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), steps + 1, "the IME batch is one undo step");
+    app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(story_text(&mut app, &sid), "ab");
+}
+
+/// The input method's Commit for a composition a click ended earlier in the same event batch
+/// must not type the marked text again at the clicked caret.
+#[test]
+fn a_commit_after_a_click_in_the_same_batch_is_not_typed_twice() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let sid = typing_app(&mut app, &ctx, "ab");
+    ime_frame(&mut app, &ctx, vec![preedit("い", 1)]);
+    assert_eq!(story_text(&mut app, &sid), "abい");
+    let p = on_screen(&app, Point::new(150.0, 120.0));
+    let press = |pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+    ime_frame(&mut app, &ctx, vec![egui::Event::PointerMoved(p), press(true), egui::Event::Ime(egui::ImeEvent::Commit("い".into()))])
+        .expect("still at a text caret");
+    let typed = story_text(&mut app, &sid);
+    assert_eq!(typed.matches('い').count(), 1, "the click typed the marked text once: {typed:?}");
+    assert!(typed.starts_with("ab"), "{typed:?}");
+    assert!(!app.session.tool_composing());
+    assert!(app.take_ime_discard(), "the system IME is told to drop its copy");
+    ime_frame(&mut app, &ctx, vec![press(false)]);
+}
+
+/// A delete-surrounding and its commit from the same ended composition must not edit the
+/// clicked caret's text either.
+#[test]
+fn a_delete_and_commit_after_a_click_in_the_same_batch_are_dropped() {
+    for delete in [
+        egui::ImeEvent::DeleteSurrounding { before_chars: 1, after_chars: 0 },
+        egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 1, after_bytes: 0 },
+    ] {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        let ctx = egui::Context::default();
+        let sid = typing_app(&mut app, &ctx, "ab");
+        ime_frame(&mut app, &ctx, vec![preedit("い", 1)]);
+        let p = on_screen(&app, Point::new(150.0, 120.0));
+        let press = |pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+        ime_frame(
+            &mut app,
+            &ctx,
+            vec![egui::Event::PointerMoved(p), press(true), egui::Event::Ime(delete), egui::Event::Ime(egui::ImeEvent::Commit("い".into()))],
+        )
+        .expect("still at a text caret");
+        let typed = story_text(&mut app, &sid);
+        assert_eq!(typed.matches('い').count(), 1, "the late commit is dropped: {typed:?}");
+        assert!(typed.contains("ab"), "the click's text was not deleted: {typed:?}");
+        assert!(app.take_ime_discard());
+        ime_frame(&mut app, &ctx, vec![press(false)]);
+    }
+}
+
+/// A byte-count delete that reaches past the bounded IME window is still exactly the requested
+/// input method mutation: the engine reports the ranges from the whole story.
+#[test]
+fn a_delete_beyond_the_surrounding_window_is_still_an_input_method_cause() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let sid = typing_app(&mut app, &ctx, &"x".repeat(5000));
+    let ime = ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 4500, after_bytes: 0 })])
+        .expect("a text caret");
+    assert_eq!(story_text(&mut app, &sid).len(), 500);
+    assert_eq!(ime.change_cause, egui::output::ImeChangeCause::InputMethod);
+    assert_eq!(ime_payload(&ime).map(|(text, cursor, anchor)| (text.len(), cursor, anchor)), Some((500, 500, 500)));
+}
+
+/// The pass's IME observation comes after the later UI sections: a click into the Story
+/// Editor's field takes the keyboard from the canvas in the same pass, so the composition
+/// ends there and the canvas reports no IME.
+#[test]
+fn a_later_field_taking_the_keyboard_ends_the_composition_in_that_pass() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let f = app.run("frame.create", json!({"rect": [36, 36, 300, 200], "content": "text", "text": "ab"})).unwrap();
+    let sid = f["story"].clone();
+    app.select_tool("type");
+    app.run("text.select", json!({"story": sid, "anchor": 2, "focus": 2})).unwrap();
+    app.run("app.storyEditor", json!({"story": sid})).unwrap();
+    let mut h = crate::test_window::open(app, egui::vec2(1440.0, 900.0));
+    h.event(preedit("い", 1));
+    h.run_steps(2);
+    assert!(h.state().app.session.tool_composing());
+    let canvas_owner = h.output().platform_output.ime.as_ref().expect("the canvas owns the composition").owner;
+    let field = h.get_all_by_role(egui::accesskit::Role::MultilineTextInput).next().expect("the Story Editor's text field");
+    field.click();
+    h.run_steps(2);
+    assert!(!h.state().app.session.tool_composing(), "the composition ended where the field took the keyboard");
+    assert!(h.state_mut().app.take_ime_discard());
+    assert!(h.get_all_by_role(egui::accesskit::Role::MultilineTextInput).next().unwrap().is_focused(), "the field has the keyboard");
+    let ime = h.output().platform_output.ime.as_ref().expect("the focused Story Editor publishes its IME context");
+    assert_ne!(ime.owner, canvas_owner, "the field owns the IME, not the canvas");
+    let typed = story_text(&mut h.state_mut().app, &sid);
+    assert!(typed.contains('い'), "the marked text stays as typed: {typed:?}");
+    h.event(egui::Event::Ime(egui::ImeEvent::Commit("X".into())));
+    h.run_steps(2);
+    let edited = story_text(&mut h.state_mut().app, &sid);
+    assert_eq!(edited.matches('X').count(), 1, "the field's next commit is applied once: {edited:?}");
+    assert_eq!(edited.matches('い').count(), 1, "the old canvas composition is not replayed: {edited:?}");
+}
+
+#[test]
+fn clicking_away_mid_composition_keeps_the_text_and_interrupts_the_ime() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let sid = typing_app(&mut app, &ctx, "");
+    ime_frame(&mut app, &ctx, vec![preedit("しょうこ", 4)]);
+    assert!(app.session.tool_composing());
+    // A click in the frame (macOS and Windows send nothing for it): the marked text stays as
+    // typed and the IME is told to drop its composition, once.
+    let p = on_screen(&app, Point::new(150.0, 120.0));
+    let press = |pressed| egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+    let ime = ime_frame(&mut app, &ctx, vec![egui::Event::PointerMoved(p), press(true)]).expect("still at a text caret");
+    assert!(ime.should_interrupt_composition);
+    ime_frame(&mut app, &ctx, vec![press(false)]);
+    assert!(!app.session.tool_composing());
+    assert_eq!(story_text(&mut app, &sid), "しょうこ");
+    assert!(app.take_ime_discard(), "the host tells the system IME to drop its marked text");
+    assert!(!ime_frame(&mut app, &ctx, vec![]).expect("still at a text caret").should_interrupt_composition);
+    assert!(!app.take_ime_discard());
+    // A bare line break from the IME confirms a composition: the marked text, no new paragraph.
+    ime_frame(&mut app, &ctx, vec![preedit("がく", 2)]);
+    ime_frame(&mut app, &ctx, vec![egui::Event::Ime(egui::ImeEvent::Commit("\n".into()))]);
+    assert!(!app.session.tool_composing());
+    let typed = story_text(&mut app, &sid);
+    assert!(typed.contains("がく") && typed.contains("しょうこ") && !typed.contains('\n'), "{typed:?}");
+}
+
+#[test]
+fn baseline_grid_lines_are_the_ones_on_the_page() {
+    // A start far above the page used to be walked line by line, without end.
+    for start in [-1e9, -1e17] {
+        let mut far = baseline_grid_lines(start, 12.0, 792.0);
+        assert_eq!((far.next(), far.count()), (Some(8.0), 65));
+    }
+    let lines = |start, increment, height| baseline_grid_lines(start, increment, height).collect::<Vec<_>>();
+    assert_eq!(lines(36.0, 12.0, 72.0), [36.0, 48.0, 60.0], "the bottom edge is not a line");
+    assert_eq!(lines(-30.0, 12.0, 30.0), [6.0, 18.0], "a start above the page keeps its rhythm");
+    assert_eq!(lines(f64::NAN, 12.0, 792.0), [0.0; 0]);
+    assert_eq!(baseline_grid_lines(0.0, 12.0, f64::INFINITY).count(), MAX_BASELINES);
+}
+
+#[test]
+fn enter_or_tab_in_a_panel_field_leave_the_selected_text_alone() {
+    for key in [egui::Key::Enter, egui::Key::Tab] {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        let f = app.run("frame.create", json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Hello"})).unwrap();
+        app.select_tool("type");
+        app.run("text.select", json!({"story": f["story"], "anchor": 1, "focus": 4})).unwrap();
+        assert!(app.session.wants_text());
+        let mut h = harness(app);
+        let size = h.get_all_by_role(egui::accesskit::Role::TextInput).find(|n| n.value().as_deref() == Some("12 pt")).unwrap();
+        size.focus();
+        h.run_steps(1);
+        h.key_press_modifiers(egui::Modifiers::COMMAND, egui::Key::A);
+        h.run_steps(1);
+        h.event(egui::Event::Text("18".into()));
+        h.run_steps(1);
+        h.key_press(key);
+        h.run_steps(3);
+        let text = h.state_mut().session.execute("story.get", &json!({"story": f["story"]})).unwrap()["text"].clone();
+        assert_eq!(text, "Hello", "{key:?} confirms the field and leaves the story alone");
+        let size = crate::panels::text_attrs(h.state_mut()).unwrap()["chars"]["size"].clone();
+        assert_eq!(size, 18.0, "{key:?} applies the typed size");
+    }
+}
+
+#[test]
+fn trailing_spaces_show_dots_before_the_paragraph_mark() {
+    let text = "ab  \ncd  ";
+    let mut d = Document::new(&designcraft_doc::build::NewDocument::default());
+    let lid = d.default_layer();
+    let rect = DRect::new(0.0, 0.0, 300.0, 100.0);
+    let (_, sid) = d.add_text_frame(SpreadRef::Doc(0), rect, lid, text, Default::default()).unwrap();
+    let cs = compose::compose_story(&d, sid, &compose::ComposeOptions::default());
+    let lines: Vec<_> = cs.frames.iter().flat_map(|f| &f.lines).collect();
+    assert_eq!(lines.len(), 2);
+    for (l, end_mark) in lines.iter().zip(["¶", "#"]) {
+        let marks = hidden_marks(text, l);
+        let dots: Vec<f64> = marks.iter().filter(|m| m.1 == "·").map(|m| m.0).collect();
+        assert_eq!(dots.len(), 2, "a dot for each trailing space: {marks:?}");
+        let &(para_x, mark, _) = marks.last().unwrap();
+        assert_eq!(mark, end_mark);
+        // The dots sit past the last letter, and the mark comes after both spaces.
+        let space = l.glyphs.iter().rev().find(|g| g.len > 0).unwrap();
+        assert!(dots.iter().all(|&x| x > l.end_x && x < para_x), "{dots:?} then {mark} at {para_x}");
+        assert!(para_x >= space.x + space.adv, "{mark} at {para_x} overlaps the last space");
+    }
+}
diff --git a/crates/ui-egui/src/canvas/text_overlay.rs b/crates/ui-egui/src/canvas/text_overlay.rs
new file mode 100644
index 000000000..dc48ae720
--- /dev/null
+++ b/crates/ui-egui/src/canvas/text_overlay.rs
@@ -0,0 +1,370 @@
+use super::frames::{item_canvas_xf, layer_color, path_screen};
+use super::{Affine, CanvasLayout, Color32, DesignApp, Document, Point, Pos2, Rect, Stroke, Xf, compose, pos2};
+
+pub(super) fn draw_text_selection(
+    app: &DesignApp,
+    painter: &egui::Painter,
+    xf: &Xf,
+    doc: &Document,
+    layout: &CanvasLayout,
+    ts: designcraft_doc::TextSel,
+    cells: Option<designcraft_doc::TableSel>,
+) {
+    let cs = app.session.cache.get(doc, ts.story, None);
+    let range = ts.range();
+    let tint = Color32::from_rgba_unmultiplied(80, 140, 255, 110);
+    // Selected table cells: tint every selected cell.
+    if let Some(sel) = cells.filter(|c| c.story == ts.story) {
+        let selected = doc.story(sel.story).and_then(|s| s.tables.get(&sel.table)).map(|t| t.selected_owners(sel.range)).unwrap_or_default();
+        for ft in &cs.frames {
+            let (Some((a, _)), Some(it)) = (item_canvas_xf(doc, layout, ft.frame), doc.item(ft.frame)) else { continue };
+            let m = a * doc.text_xf(it);
+            for t in ft.tables.iter().filter(|t| t.table == sel.table) {
+                for c in t.cells.iter().filter(|c| selected.binary_search(&(c.row, c.col)).is_ok()) {
+                    let q = [
+                        xf.to_screen(m * Point::new(c.rect.x0, c.rect.y0)),
+                        xf.to_screen(m * Point::new(c.rect.x1, c.rect.y0)),
+                        xf.to_screen(m * Point::new(c.rect.x1, c.rect.y1)),
+                        xf.to_screen(m * Point::new(c.rect.x0, c.rect.y1)),
+                    ];
+                    painter.add(egui::Shape::convex_polygon(q.to_vec(), Color32::from_rgba_unmultiplied(80, 140, 255, 90), Stroke::NONE));
+                }
+            }
+        }
+        return;
+    }
+    if let Some(cell) = ts.cell {
+        draw_cell_selection(app, painter, xf, doc, layout, &cs, ts, cell);
+        return;
+    }
+    let mut runs: Vec<(usize, Affine, Vec<[Point; 4]>, Vec<(usize, usize)>)> = Vec::new();
+    for (fi, ft) in cs.frames.iter().enumerate() {
+        let Some((a, _)) = item_canvas_xf(doc, layout, ft.frame) else { continue };
+        let Some(it) = doc.item(ft.frame) else { continue };
+        let m = a * doc.text_xf(it);
+        // Show the frame edge while typing.
+        for poly in path_screen(it, xf, a) {
+            painter.add(egui::Shape::line(poly, Stroke::new(1.0, layer_color(doc, it).gamma_multiply(0.6))));
+        }
+        if range.is_empty() {
+            continue;
+        }
+        // Type on a path: the highlight bends with the text.
+        if let Some(map) = compose::PathTextMap::new(it, ft) {
+            for l in &ft.lines {
+                let (s, e) = (range.start.max(l.range.start), range.end.min(l.range.end));
+                if s >= e {
+                    continue;
+                }
+                for q in compose::highlight_quads(l, s, e, false) {
+                    let (x0, x1) = (q[0].x.min(q[1].x), q[0].x.max(q[1].x));
+                    let (y0, y1) = (q[0].y.min(q[2].y), q[0].y.max(q[2].y));
+                    // Short slices, each turned with the path.
+                    let n = ((x1 - x0) / 2.0).ceil().clamp(1.0, 2000.0) as usize;
+                    for k in 0..n {
+                        let (a, b) = (x0 + (x1 - x0) * k as f64 / n as f64, x0 + (x1 - x0) * (k + 1) as f64 / n as f64);
+                        let poly =
+                            [Point::new(a, y0), Point::new(b, y0), Point::new(b, y1), Point::new(a, y1)].map(|p| xf.to_screen(m * map.to_path(p)));
+                        painter.add(egui::Shape::convex_polygon(poly.to_vec(), tint, Stroke::NONE));
+                    }
+                }
+            }
+            continue;
+        }
+        let mut quads = Vec::new();
+        let mut glyphs = Vec::new();
+        for (li, l) in ft.lines.iter().enumerate() {
+            let s = range.start.max(l.range.start);
+            let e = range.end.min(l.range.end);
+            if s > e || (s == e && !(l.range.end < range.end && e == l.range.end)) {
+                continue;
+            }
+            let past = e == l.range.end && range.end > l.range.end;
+            quads.extend(compose::highlight_quads(l, s, e, past));
+            // A selected drop cap is highlighted down to its baseline.
+            if let Some(dc) = l.drop_cap {
+                let sel = l.glyphs.iter().filter(|g| g.len > 0 && g.byte < dc.end && g.byte >= s && g.byte < e);
+                let (a, b) = sel.fold((f64::INFINITY, f64::NEG_INFINITY), |(a, b), g| (a.min(g.x), b.max(g.x + g.adv)));
+                if a < b {
+                    let r = dc.rect;
+                    quads.push([Point::new(a, r.y0), Point::new(b, r.y0), Point::new(b, r.y1), Point::new(a, r.y1)]);
+                }
+            }
+            for (gi, g) in l.glyphs.iter().enumerate() {
+                if g.visible && g.len > 0 && g.byte >= s && g.byte < e {
+                    glyphs.push((li, gi));
+                }
+            }
+        }
+        if !quads.is_empty() {
+            runs.push((fi, m, quads, glyphs));
+        }
+    }
+    if !runs.is_empty() {
+        draw_inverse_highlight(app, painter, xf, doc, &cs, ts.story, &runs);
+    }
+    if ts.is_caret()
+        && let Some((fi, x, bl, asc, desc)) = compose::caret(&cs, ts.focus)
+        && let Some(ft) = cs.frames.get(fi)
+        && let (Some((a, _)), Some(it)) = (item_canvas_xf(doc, layout, ft.frame), doc.item(ft.frame))
+    {
+        let m = a * doc.text_xf(it);
+        // Type on a path: the caret stands across the path where it is along it.
+        let on = |p: Point| compose::PathTextMap::new(it, ft).map_or(p, |map| map.to_path(p));
+        let p0 = xf.to_screen(m * on(Point::new(x, bl - asc)));
+        let p1 = xf.to_screen(m * on(Point::new(x, bl + desc)));
+        let blink = (painter.ctx().input(|i| i.time) * 1.6) as i64 % 2 == 0;
+        if blink {
+            painter.line_segment([p0, p1], Stroke::new(1.0, Color32::BLACK));
+        }
+        painter.ctx().request_repaint_after(std::time::Duration::from_millis(330));
+    }
+}
+
+/// Caret / text highlight inside a table cell (the cell's lines are offset by the cell origin).
+#[allow(clippy::too_many_arguments)]
+fn draw_cell_selection(
+    _app: &DesignApp,
+    painter: &egui::Painter,
+    xf: &Xf,
+    doc: &Document,
+    layout: &CanvasLayout,
+    cs: &compose::ComposedStory,
+    ts: designcraft_doc::TextSel,
+    cell: designcraft_doc::CellAddr,
+) {
+    // Footnote text or a cell: its composed story and where it sits in the frame.
+    let found = match cell.footnote_id() {
+        Some(id) => compose::find_note(cs, id).map(|(fi, n)| (fi, n.origin, n.text.clone())),
+        None => compose::find_cell(cs, cell.table, cell.row, cell.col).map(|(fi, _, pc)| (fi, pc.origin, pc.text.clone())),
+    };
+    let Some((fi, origin, text)) = found else { return };
+    let Some(ft) = cs.frames.get(fi) else { return };
+    let (Some((a, _)), Some(it)) = (item_canvas_xf(doc, layout, ft.frame), doc.item(ft.frame)) else { return };
+    let m = a * doc.text_xf(it) * designcraft_geom::Affine::translate(origin.to_vec2());
+    let range = ts.range();
+    if !range.is_empty()
+        && let Some(cft) = text.frames.first()
+    {
+        for l in &cft.lines {
+            let s = range.start.max(l.range.start);
+            let e = range.end.min(l.range.end);
+            if s > e || (s == e && !(l.range.end < range.end && e == l.range.end)) {
+                continue;
+            }
+            let past = e == l.range.end && range.end > l.range.end;
+            for q in compose::highlight_quads(l, s, e, past) {
+                let poly = q.map(|p| xf.to_screen(m * p));
+                painter.add(egui::Shape::convex_polygon(poly.to_vec(), Color32::from_rgba_unmultiplied(80, 140, 255, 110), Stroke::NONE));
+            }
+        }
+    }
+    if ts.is_caret()
+        && let Some((_, x, bl, asc, desc)) = match cell.footnote_id() {
+            Some(id) => compose::note_caret(cs, id, ts.focus),
+            None => compose::cell_caret(cs, cell.table, cell.row, cell.col, ts.focus),
+        }
+    {
+        let m = a * doc.text_xf(it);
+        let (p0, p1) = (xf.to_screen(m * Point::new(x, bl - asc)), xf.to_screen(m * Point::new(x, bl + desc)));
+        let blink = (painter.ctx().input(|i| i.time) * 1.6) as i64 % 2 == 0;
+        if blink {
+            painter.line_segment([p0, p1], Stroke::new(1.0, Color32::BLACK));
+        }
+        painter.ctx().request_repaint_after(std::time::Duration::from_millis(330));
+    }
+}
+
+/// InDesign draws selected text inverted: a black highlight with the selected glyphs in the
+/// inverse of their colour (white for black text). The highlight and glyph outlines are
+/// rasterised with `vello_cpu` into a small screen-space texture over the selection.
+fn draw_inverse_highlight(
+    app: &DesignApp,
+    painter: &egui::Painter,
+    xf: &Xf,
+    doc: &Document,
+    cs: &compose::ComposedStory,
+    story: designcraft_doc::StoryId,
+    runs: &[(usize, Affine, Vec<[Point; 4]>, Vec<(usize, usize)>)],
+) {
+    use designcraft_render::vello_cpu::{self, kurbo, peniko};
+    let ctx = painter.ctx();
+    let ppp = ctx.pixels_per_point();
+    let to_screen = |m: Affine, p: Point| xf.to_screen(m * p);
+    let mut bbox = Rect::NOTHING;
+    for (_, m, quads, _) in runs {
+        for q in quads {
+            for p in q {
+                bbox.extend_with(to_screen(*m, *p));
+            }
+        }
+    }
+    let bbox = bbox.intersect(painter.clip_rect());
+    if !bbox.is_positive() {
+        return;
+    }
+    // Snap to device pixels so the texture maps 1:1.
+    let bbox = Rect::from_min_max(
+        pos2((bbox.min.x * ppp).floor() / ppp, (bbox.min.y * ppp).floor() / ppp),
+        pos2((bbox.max.x * ppp).ceil() / ppp, (bbox.max.y * ppp).ceil() / ppp),
+    );
+    let (w, h) = (((bbox.width() * ppp).round() as u32).clamp(1, 8192), ((bbox.height() * ppp).round() as u32).clamp(1, 8192));
+    let Some(st) = app.session.active() else { return };
+    let key = egui::Id::unique(("inverse_sel", st.uid, st.revision, std::sync::Arc::as_ptr(&st.doc) as usize, story.0))
+        .with((runs.iter().map(|r| r.2.len() + r.3.len() * 7919).sum::<usize>(), w, h))
+        .with((bbox.min.x.to_bits(), bbox.min.y.to_bits(), xf.zoom.to_bits(), st.selection.text.map(|t| (t.anchor, t.focus))));
+    let cache_id = egui::Id::unique("inverse_sel_tex");
+    let cached: Option<(egui::Id, egui::TextureHandle)> = ctx.data(|d| d.get_temp(cache_id));
+    let tex = match cached {
+        Some((k, t)) if k == key => t,
+        _ => {
+            let view = xf.affine(ppp as f64, bbox.min);
+            let mut rc = vello_cpu::RenderContext::new_with(w as u16, h as u16, vello_cpu::RenderSettings { num_threads: 0, ..Default::default() });
+            rc.set_paint(peniko::Color::from_rgba8(0, 0, 0, 255));
+            for (_, m, quads, _) in runs {
+                rc.set_transform(view * *m);
+                for q in quads {
+                    let mut bp = kurbo::BezPath::new();
+                    bp.move_to(q[0]);
+                    for p in &q[1..] {
+                        bp.line_to(*p);
+                    }
+                    bp.close_path();
+                    rc.fill_path(&bp);
+                }
+            }
+            let db = designcraft_fonts::FontDb::global();
+            for (fi, m, _, glyphs) in runs {
+                let Some(ft) = cs.frames.get(*fi) else { continue };
+                for &(li, gi) in glyphs {
+                    let Some(l) = ft.lines.get(li) else { continue };
+                    let Some(g) = l.glyphs.get(gi) else { continue };
+                    let Some(style) = cs.styles.get(g.style as usize) else { continue };
+                    let Some(c) = doc.resolve_color(&style.fill, style.fill_tint) else { continue };
+                    let [r, gg, b, _] = c.to_rgba8(1.0);
+                    rc.set_paint(peniko::Color::from_rgba8(255 - r, 255 - gg, 255 - b, 255));
+                    let outline = db.outline(&g.face, g.gid);
+                    let skew =
+                        if style.skew != 0.0 { Affine::new([1.0, 0.0, -style.skew.to_radians().tan(), 1.0, 0.0, 0.0]) } else { Affine::IDENTITY };
+                    let shatai = style.shatai_xf(g, l.baseline).unwrap_or(Affine::IDENTITY);
+                    let ga = shatai * Affine::translate((g.x, l.baseline + g.y)) * skew * Affine::scale_non_uniform(g.sx, g.sy);
+                    rc.set_transform(view * *m * ga);
+                    rc.fill_path(&outline);
+                }
+            }
+            rc.flush();
+            let mut pm = vello_cpu::Pixmap::new(w as u16, h as u16);
+            let mut res = vello_cpu::Resources::new();
+            rc.render(&mut pm, &mut res);
+            let ci = egui::ColorImage::from_rgba_premultiplied([w as usize, h as usize], pm.data_as_u8_slice());
+            let t = crate::widgets::load_texture(ctx, "inverse_selection", ci, egui::TextureOptions::NEAREST);
+            ctx.data_mut(|d| d.insert_temp(cache_id, (key, t.clone())));
+            t
+        }
+    };
+    painter.image(tex.id(), bbox, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
+}
+
+/// View → Show Hidden Characters: ¶ paragraph ends, » tabs, · spaces, ¬ forced line breaks, # end of story.
+pub(super) fn draw_hidden_characters(app: &DesignApp, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) {
+    for story in doc.stories.values() {
+        let cs = app.session.cache.get(doc, story.id, None);
+        for ft in &cs.frames {
+            let (Some((a, _)), Some(it)) = (item_canvas_xf(doc, layout, ft.frame), doc.item(ft.frame)) else { continue };
+            let m = a * doc.text_xf(it);
+            let col = layer_color(doc, it);
+            for l in &ft.lines {
+                let size = (l.ascent * 0.75 * xf.zoom).clamp(6.0, 40.0) as f32;
+                let font = egui::FontId::proportional(size);
+                for (x, mark, centered) in hidden_marks(&story.text, l) {
+                    let p = xf.to_screen(m * Point::new(x, l.baseline));
+                    let align = if centered { egui::Align2::CENTER_BOTTOM } else { egui::Align2::LEFT_BOTTOM };
+                    painter.text(p, align, mark, font.clone(), col);
+                }
+            }
+        }
+    }
+}
+
+/// The hidden-character marks on line `l` of a story with text `text`: frame-space x, mark, and
+/// whether the mark is centered on x (spaces) or starts at it.
+pub(super) fn hidden_marks(text: &str, l: &compose::Line) -> Vec<(f64, &'static str, bool)> {
+    let mut out = Vec::new();
+    for g in &l.glyphs {
+        if g.len == 0 {
+            continue;
+        }
+        let Some(ch) = text.get(g.byte..).and_then(|t| t.chars().next()) else { continue };
+        let mark = match ch {
+            ' ' => "·",
+            '\t' => "»",
+            '\u{2028}' => "¬",
+            '\u{A0}' => "°",
+            _ => continue,
+        };
+        if ch == ' ' {
+            out.push((g.x + g.adv / 2.0, mark, true));
+        } else {
+            out.push((g.x, mark, false));
+        }
+    }
+    if l.last_in_para {
+        // The spaces trimmed off the line's end sit past `end_x`; the paragraph mark follows them.
+        let end = l.glyphs.iter().filter(|g| g.len > 0 && !g.visible && g.x >= l.end_x - 1e-9).map(|g| g.x + g.adv).fold(l.end_x, f64::max);
+        let mark = if l.range.end >= text.len() { "#" } else { "¶" };
+        out.push((end + 1.0, mark, false));
+    }
+    out
+}
+
+/// Edit › Spelling › Dynamic Spelling: red squiggles under misspelled words (checked once per
+/// story version).
+pub(super) fn draw_dynamic_spelling(app: &DesignApp, ctx: &egui::Context, painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout) {
+    for story in doc.stories.values() {
+        let key = egui::Id::unique(("dyn_spell", std::sync::Arc::as_ptr(story) as usize, doc.user_words.len()));
+        let bad: std::sync::Arc<Vec<std::ops::Range<usize>>> = match ctx.data(|d| d.get_temp(key)) {
+            Some(v) => v,
+            None => {
+                let v = std::sync::Arc::new(designcraft_engine::cmd::spelling::misspellings(doc, story, &doc.user_words));
+                ctx.data_mut(|d| d.insert_temp(key, v.clone()));
+                v
+            }
+        };
+        if bad.is_empty() {
+            continue;
+        }
+        let cs = app.session.cache.get(doc, story.id, None);
+        let red = Stroke::new(1.0, Color32::from_rgb(230, 30, 30));
+        for ft in &cs.frames {
+            let (Some((a, _)), Some(it)) = (item_canvas_xf(doc, layout, ft.frame), doc.item(ft.frame)) else { continue };
+            let m = a * doc.text_xf(it);
+            for l in &ft.lines {
+                for r in bad.iter().filter(|r| r.start < l.range.end && r.end > l.range.start) {
+                    let gs: Vec<_> = l.glyphs.iter().filter(|g| g.len > 0 && g.byte >= r.start && g.byte < r.end).collect();
+                    let (Some(x0), Some(x1)) = (gs.iter().map(|g| g.x).reduce(f64::min), gs.iter().map(|g| g.x + g.adv).reduce(f64::max)) else {
+                        continue;
+                    };
+                    let y = l.baseline + l.descent * 0.5;
+                    let (p0, p1) = (xf.to_screen(m * Point::new(x0, y)), xf.to_screen(m * Point::new(x1, y)));
+                    // A zigzag 2 px high, 4 px per wave.
+                    let n = ((p1.x - p0.x) / 2.0).max(1.0) as usize;
+                    let pts: Vec<Pos2> =
+                        (0..=n).map(|k| pos2(p0.x + (p1.x - p0.x) * k as f32 / n as f32, p0.y + if k % 2 == 0 { 0.0 } else { 2.0 })).collect();
+                    painter.add(egui::Shape::line(pts, red));
+                }
+            }
+        }
+    }
+}
+
+/// Plain text of the current text selection (story markers resolved to readable characters).
+pub fn selected_text(app: &DesignApp) -> Option<String> {
+    let st = app.session.active()?;
+    let t = st.selection.text?;
+    let story = st.doc.text_story(t.story, t.cell)?;
+    let s = story.slice(t.range());
+    if s.is_empty() {
+        return None;
+    }
+    Some(s.replace(designcraft_doc::story::FORCED_LINE_BREAK, "\n"))
+}
diff --git a/crates/ui-egui/src/canvas/tool_overlays.rs b/crates/ui-egui/src/canvas/tool_overlays.rs
new file mode 100644
index 000000000..5720ba030
--- /dev/null
+++ b/crates/ui-egui/src/canvas/tool_overlays.rs
@@ -0,0 +1,289 @@
+use super::frames::{item_canvas_xf, selection_color};
+use super::page_decor::dashed;
+use super::render::c32;
+use super::{CanvasLayout, Color32, Content, DesignApp, Document, Overlay, Point, Pos2, Rect, Stroke, StrokeKind, Tokens, Xf, pos2, vec2};
+
+pub(super) fn draw_tool_overlays(app: &mut DesignApp, painter: &egui::Painter, xf: &Xf) {
+    if let (Some((z, c)), Some(rect)) = (app.power_zoom, app.canvas_rect) {
+        // The view that releasing returns to.
+        let (w, h) = (rect.width() as f64 / z, rect.height() as f64 / z);
+        let r = xf.rect(designcraft_geom::Rect::new(c.x - w / 2.0, c.y - h / 2.0, c.x + w / 2.0, c.y + h / 2.0));
+        painter.rect_stroke(r, 0.0, egui::Stroke::new(1.5, Color32::from_rgb(230, 40, 40)), egui::StrokeKind::Middle);
+    }
+    let tok = Tokens::get(painter.ctx());
+    let ov = app.session.overlays(app.view_info());
+    let doc = app.session.active().map(|st| st.doc.clone());
+    let layout = app.session.layout();
+    let sel_color = selection_color(app);
+    for o in ov {
+        match o {
+            Overlay::Marquee(r) => {
+                let r = xf.rect(r);
+                painter.rect_filled(r, 0.0, Color32::from_rgba_unmultiplied(80, 140, 255, 30));
+                for (a, b) in [
+                    (r.left_top(), r.right_top()),
+                    (r.right_top(), r.right_bottom()),
+                    (r.right_bottom(), r.left_bottom()),
+                    (r.left_bottom(), r.left_top()),
+                ] {
+                    dashed(painter, a, b, Stroke::new(1.0, Color32::from_gray(200)), 3.0, 3.0);
+                }
+            }
+            Overlay::Measure { p, text } => {
+                let s = xf.to_screen(p) + vec2(14.0, 14.0);
+                let g = painter.layout_no_wrap(text, egui::FontId::proportional(11.0), tok.measure_text);
+                let r = Rect::from_min_size(s, g.size() + vec2(10.0, 6.0));
+                painter.rect_filled(r, 3.0, tok.measure_bg);
+                painter.galley(r.min + vec2(5.0, 3.0), g, tok.measure_text);
+            }
+            Overlay::Line { a, b, color, dashed: d } => {
+                let st = Stroke::new(1.0, c32(color));
+                if d {
+                    dashed(painter, xf.to_screen(a), xf.to_screen(b), st, 3.0, 3.0);
+                } else {
+                    painter.line_segment([xf.to_screen(a), xf.to_screen(b)], st);
+                }
+            }
+            Overlay::Guide { a, b } => {
+                painter.line_segment([xf.to_screen(a), xf.to_screen(b)], Stroke::new(1.0, tok.smart_guide));
+            }
+            Overlay::Gap { a, b, label } => {
+                let (a, b) = (xf.to_screen(a), xf.to_screen(b));
+                painter.line_segment([a, b], Stroke::new(1.0, tok.smart_guide));
+                let s = a + (b - a) * 0.5;
+                let g = painter.layout_no_wrap(label, egui::FontId::proportional(11.0), tok.measure_text);
+                let r = Rect::from_min_size(s, g.size() + vec2(10.0, 6.0));
+                painter.rect_filled(r, 3.0, tok.measure_bg);
+                painter.galley(r.min + vec2(5.0, 3.0), g, tok.measure_text);
+            }
+            Overlay::Path { path, color, dashed: d } => draw_path_overlay(painter, xf, &path, c32(color), d),
+            Overlay::ContentGhost(id) => {
+                if let Some(doc) = &doc {
+                    draw_content_ghost(painter, xf, doc, &layout, id);
+                }
+            }
+            Overlay::LiveCornerWidget(p) => {
+                let r = Rect::from_center_size(xf.to_screen(p), vec2(6.0, 6.0));
+                painter.rect_filled(r, 0.0, tok.live_corner);
+                painter.rect_stroke(r, 0.0, Stroke::new(1.0, sel_color), StrokeKind::Inside);
+            }
+            Overlay::LiveCornerDiamond(p) => {
+                let c = xf.to_screen(p);
+                let h = 4.5;
+                let pts = vec![c + vec2(0.0, -h), c + vec2(h, 0.0), c + vec2(0.0, h), c + vec2(-h, 0.0)];
+                painter.add(egui::Shape::convex_polygon(pts, tok.live_corner, Stroke::new(1.0, sel_color)));
+            }
+            Overlay::PageHandles(r) => {
+                // The Page tool's selected page: outline and eight handles, as InDesign draws them.
+                let r = xf.rect(r);
+                let col = Color32::from_rgb(79, 153, 255);
+                painter.rect_stroke(r, 0.0, Stroke::new(1.0, col), StrokeKind::Middle);
+                for i in (0..9).filter(|i| *i != 4) {
+                    let c = pos2(r.min.x + r.width() * (i % 3) as f32 / 2.0, r.min.y + r.height() * (i / 3) as f32 / 2.0);
+                    let h = Rect::from_center_size(c, vec2(7.0, 7.0));
+                    painter.rect_filled(h, 0.0, Color32::WHITE);
+                    painter.rect_stroke(h, 0.0, Stroke::new(1.0, col), StrokeKind::Inside);
+                }
+            }
+            Overlay::Tag { p, text } => {
+                let text = crate::i18n::tr(&app.ui.language, &text).to_owned();
+                let s = xf.to_screen(p);
+                let g = painter.layout_no_wrap(text, egui::FontId::proportional(10.0), tok.measure_text);
+                let r = Rect::from_min_size(s - vec2(0.0, g.size().y + 4.0), g.size() + vec2(8.0, 4.0));
+                painter.rect_filled(r, 2.0, tok.measure_bg);
+                painter.rect_stroke(r, 2.0, Stroke::new(1.0, Color32::from_rgb(79, 153, 255)), StrokeKind::Inside);
+                painter.galley(r.min + vec2(4.0, 2.0), g, tok.measure_text);
+            }
+            Overlay::Tip { p, text } => {
+                let text = crate::i18n::tr(&app.ui.language, &text).to_owned();
+                let s = xf.to_screen(p) + vec2(14.0, 14.0);
+                let g = painter.layout(text, egui::FontId::proportional(11.0), tok.measure_text, 260.0);
+                let r = Rect::from_min_size(s, g.size() + vec2(10.0, 6.0));
+                painter.rect_filled(r, 3.0, tok.measure_bg);
+                painter.galley(r.min + vec2(5.0, 3.0), g, tok.measure_text);
+            }
+            Overlay::LiquidPins { object, page, pins, resize } => draw_liquid_pins(painter, xf.rect(object), xf.rect(page), pins, resize),
+        }
+    }
+}
+
+/// A path overlay (canvas coordinates; the Pencil's stroke while drawing, the Smooth and Erase
+/// drags) as screen polylines, its curves flattened to about a quarter of a screen pixel.
+fn draw_path_overlay(painter: &egui::Painter, xf: &Xf, path: &designcraft_geom::BezPath, color: Color32, dashed_line: bool) {
+    use designcraft_geom::PathEl;
+    let stroke = Stroke::new(1.0, color);
+    let mut runs: Vec<Vec<Pos2>> = Vec::new();
+    designcraft_geom::kurbo::flatten(path, 0.25 / xf.zoom.max(1e-9), |el| match el {
+        PathEl::MoveTo(p) => runs.push(vec![xf.to_screen(p)]),
+        PathEl::LineTo(p) => {
+            if let Some(run) = runs.last_mut() {
+                run.push(xf.to_screen(p));
+            }
+        }
+        PathEl::ClosePath => {
+            if let Some(run) = runs.last_mut()
+                && let Some(&first) = run.first()
+            {
+                run.push(first);
+            }
+        }
+        // Flattening yields only moves, lines and closes.
+        PathEl::QuadTo(..) | PathEl::CurveTo(..) => {}
+    });
+    for run in runs.into_iter().filter(|r| r.len() >= 2) {
+        if dashed_line {
+            painter.extend(egui::Shape::dashed_line(&run, stroke, 3.0, 3.0));
+        } else {
+            painter.add(egui::Shape::line(run, stroke));
+        }
+    }
+}
+
+/// A frame's whole content drawn faintly over the canvas, the part outside the frame included,
+/// with its bounds outlined (while the content moves inside the frame).
+fn draw_content_ghost(painter: &egui::Painter, xf: &Xf, doc: &Document, layout: &CanvasLayout, id: designcraft_doc::ItemId) {
+    let Some(it) = doc.item(id) else { return };
+    let Some((a, _)) = item_canvas_xf(doc, layout, id) else { return };
+    let outline = Stroke::new(1.0, Color32::from_rgb(196, 111, 43));
+    let Content::Graphic(g) = &it.content else {
+        for c in it.children() {
+            let r = xf.rect((a * it.xf).transform_rect_bbox(c.bounds()));
+            painter.rect_stroke(r, 0.0, outline, StrokeKind::Middle);
+        }
+        return;
+    };
+    let m = a * it.xf * g.xf;
+    let (w, h) = g.size;
+    let corners = [Point::new(0.0, 0.0), Point::new(w, 0.0), Point::new(w, h), Point::new(0.0, h)].map(|p| xf.to_screen(m * p));
+    if corners.iter().any(|p| !p.x.is_finite() || !p.y.is_finite()) {
+        return;
+    }
+    if let Some(tex) = ghost_texture(painter.ctx(), doc, g) {
+        let mut mesh = egui::Mesh::with_texture(tex.id());
+        let tint = Color32::from_white_alpha(90);
+        for (p, uv) in corners.iter().zip([pos2(0.0, 0.0), pos2(1.0, 0.0), pos2(1.0, 1.0), pos2(0.0, 1.0)]) {
+            mesh.vertices.push(egui::epaint::Vertex { pos: *p, uv, color: tint });
+        }
+        mesh.indices.extend([0, 1, 2, 0, 2, 3]);
+        painter.add(egui::Shape::mesh(mesh));
+    }
+    painter.add(egui::Shape::closed_line(corners.to_vec(), outline));
+}
+
+/// A screen-resolution proxy of a placed graphic for the ghost, cached per asset.
+fn ghost_texture(ctx: &egui::Context, doc: &Document, g: &designcraft_doc::Graphic) -> Option<egui::TextureHandle> {
+    let asset = doc.assets.get(&g.asset)?;
+    let key = egui::Id::unique(("content_ghost", std::sync::Arc::as_ptr(&asset.data) as usize, asset.data.len(), asset.page));
+    if let Some(t) = ctx.data(|d| d.get_temp::<egui::TextureHandle>(key)) {
+        return Some(t);
+    }
+    // A 72 ppi proxy is enough for a faint preview.
+    let pm = designcraft_render::images::mip(&asset.data, asset.page, g.size.0, 1.0)?;
+    let (pw, ph) = (pm.width() as usize, pm.height() as usize);
+    if pw == 0 || ph == 0 {
+        return None;
+    }
+    let ci = egui::ColorImage::from_rgba_premultiplied([pw, ph], pm.data_as_u8_slice());
+    let max = ctx.input(|i| i.max_texture_side).min(4096);
+    let t = ctx.load_texture("content_ghost", crate::widgets::fit_texture(ci, max), egui::TextureOptions::LINEAR);
+    ctx.data_mut(|d| d.insert_temp(key, t.clone()));
+    Some(t)
+}
+
+/// An object's liquid controls on an object-based page, as InDesign draws them in orange: a
+/// dashed line across the object for width and height with a padlock (closed: locked), and a pin
+/// outside each edge (pinned: a line to the page edge).
+fn draw_liquid_pins(painter: &egui::Painter, o: Rect, page: Rect, pins: [bool; 4], resize: [bool; 2]) {
+    let col = Color32::from_rgb(178, 88, 18);
+    let st = Stroke::new(1.5, col);
+    let c = o.center();
+    let mids = [pos2(c.x, o.min.y), pos2(o.max.x, c.y), pos2(c.x, o.max.y), pos2(o.min.x, c.y)];
+    // The width and height lines between the edges' middles.
+    for (a, b) in [(mids[3], mids[1]), (mids[0], mids[2])] {
+        dashed(painter, a, b, Stroke::new(1.0, col), 3.0, 3.0);
+    }
+    for m in mids {
+        painter.circle_filled(m, 3.5, col);
+    }
+    let (po, lo) = (designcraft_tools::PIN_OFFSET_PX as f32, designcraft_tools::LOCK_OFFSET_PX as f32);
+    let outward = [vec2(0.0, -1.0), vec2(1.0, 0.0), vec2(0.0, 1.0), vec2(-1.0, 0.0)];
+    let edge = [pos2(c.x, page.min.y), pos2(page.max.x, c.y), pos2(c.x, page.max.y), pos2(page.min.x, c.y)];
+    for i in 0..4 {
+        if pins[i] {
+            painter.line_segment([mids[i], edge[i]], st);
+            painter.circle_filled(edge[i], 4.0, col);
+        } else {
+            painter.circle_stroke(mids[i] + outward[i] * po, 4.0, st);
+        }
+    }
+    // Padlocks: the width lock right of the centre, the height lock above it.
+    for (at, locked) in [(c + vec2(lo, 0.0), !resize[0]), (c + vec2(0.0, -lo), !resize[1])] {
+        let body = Rect::from_center_size(at + vec2(0.0, 2.0), vec2(8.0, 6.0));
+        painter.rect_filled(body.expand(1.0), 1.0, Color32::WHITE);
+        painter.rect_filled(body, 1.0, col);
+        // The shackle: over the body when locked, swung open when not.
+        let base = if locked { body.center().x } else { body.center().x + 3.0 };
+        let pts: Vec<_> = (0..=8)
+            .map(|k| {
+                let a = std::f32::consts::PI * k as f32 / 8.0;
+                pos2(base - 2.6 * a.cos(), body.min.y - 3.0 * a.sin())
+            })
+            .collect();
+        painter.add(egui::Shape::line(pts, Stroke::new(1.3, col)));
+    }
+}
+
+#[cfg(test)]
+mod pencil_preview_tests {
+    use egui::{Pos2, pos2, vec2};
+
+    /// Lines painted in `color` (egui paths) and the points they pass through.
+    fn lines_in(h: &egui_kittest::Harness<'static, crate::test_window::Window>, color: egui::Color32) -> Vec<Vec<Pos2>> {
+        fn walk(s: &egui::Shape, color: egui::Color32, out: &mut Vec<Vec<Pos2>>) {
+            match s {
+                egui::Shape::Path(p) if p.stroke.color == egui::epaint::ColorMode::Solid(color) && p.points.len() >= 2 => out.push(p.points.clone()),
+                egui::Shape::Vec(v) => v.iter().for_each(|s| walk(s, color, out)),
+                _ => {}
+            }
+        }
+        let mut out = vec![];
+        h.output().shapes.iter().for_each(|s| walk(&s.shape, color, &mut out));
+        out
+    }
+
+    #[test]
+    fn the_pencil_stroke_shows_while_drawing() {
+        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", serde_json::json!({})).unwrap();
+        app.run("tool.select", serde_json::json!({"tool": "pencil"})).unwrap();
+        let mut h = crate::test_window::open(app, vec2(1400.0, 900.0));
+        let doc = &h.state().app.session.doc().unwrap().doc;
+        let layer = doc.layers[0].color;
+        let color = egui::Color32::from_rgb(layer[0], layer[1], layer[2]);
+        let items = |h: &egui_kittest::Harness<'static, crate::test_window::Window>| h.state().app.session.doc().unwrap().doc.spreads[0].items.len();
+        let before = items(&h);
+        // Press on the page and drag, without letting go.
+        let start = pos2(520.0, 380.0);
+        h.hover_at(start);
+        h.drag_at(start);
+        h.run_steps(2);
+        let path: Vec<Pos2> = (1..=12).map(|i| start + vec2(i as f32 * 12.0, (i as f32 * 0.6).sin() * 30.0)).collect();
+        for p in &path {
+            h.hover_at(*p);
+            h.run_steps(1);
+        }
+        let drawn = lines_in(&h, color);
+        let stroke = drawn.iter().max_by_key(|l| l.len()).expect("the stroke is painted while the button is down");
+        let near = |a: Pos2, b: Pos2| (a - b).length() < 2.0;
+        assert!(near(stroke[0], start), "it starts where the press was: {:?}", stroke[0]);
+        assert!(path.iter().all(|p| stroke.iter().any(|q| near(*p, *q))), "it follows the pointer: {stroke:?}");
+        assert_eq!(items(&h), before, "nothing is made before the release");
+        // Letting go makes the path and ends the preview.
+        h.drop_at(*path.last().unwrap());
+        h.run_steps(3);
+        assert_eq!(items(&h), before + 1);
+        let app = &mut h.state_mut().app;
+        let view = app.view_info();
+        assert!(app.session.overlays(view).is_empty(), "the preview is gone");
+    }
+}
diff --git a/crates/ui-egui/src/canvas/view.rs b/crates/ui-egui/src/canvas/view.rs
new file mode 100644
index 000000000..db3eebcc8
--- /dev/null
+++ b/crates/ui-egui/src/canvas/view.rs
@@ -0,0 +1,344 @@
+use super::{CanvasLayout, DRect, DVec2, DesignApp, Document, Point, Pos2, Rect, SpreadRef, Value, View, Xf};
+
+/// Fit the current spread (or page) in the canvas.
+pub fn fit(app: &mut DesignApp, rect: Rect, what: &str) {
+    let Some(st) = app.session.active() else { return };
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let cur = current_slot(app, &layout).unwrap_or(0);
+    let Some(slot) = layout.slots.get(cur) else { return };
+    let mut b = slot.bounds;
+    if what == "page"
+        && let Some(sp) = st.doc.spread(slot.spread)
+    {
+        let center = app.view().map(|v| v.origin.x + rect.width() as f64 / 2.0 / v.zoom).unwrap_or(0.0);
+        let c = slot.to_spread(Point::new(center, slot.bounds.center().y));
+        let pi = sp.page_at_x(c.x).unwrap_or(0);
+        b = slot.xf.transform_rect_bbox(sp.pages[pi].bounds());
+    }
+    if what == "all" {
+        b = layout.slots.iter().map(|s| s.bounds).reduce(|a, b| a.union(b)).unwrap_or(b);
+    }
+    if what == "selection" {
+        // Fit Selection in Window: the selected objects (on their spread's slot).
+        let sel: Vec<designcraft_geom::Rect> = st
+            .selection
+            .items
+            .iter()
+            .filter_map(|id| {
+                let loc = st.doc.find(*id)?;
+                let slot = layout.slots.iter().find(|s| s.spread == loc.spread)?;
+                Some(slot.xf.transform_rect_bbox(st.doc.item(*id)?.bounds()))
+            })
+            .collect();
+        let Some(u) = sel.into_iter().reduce(|a, b| a.union(b)) else { return };
+        b = u.inflate(u.width().max(u.height()) * 0.05 + 1.0, u.width().max(u.height()) * 0.05 + 1.0);
+    }
+    fit_bounds(app, rect, b);
+}
+
+/// Zoom and scroll so canvas rectangle `b` fills the canvas `rect`.
+fn fit_bounds(app: &mut DesignApp, rect: Rect, b: DRect) {
+    let pad = 40.0;
+    let zoom =
+        ((rect.width() as f64 - 2.0 * pad) / b.width().max(1e-6)).min((rect.height() as f64 - 2.0 * pad) / b.height().max(1e-6)).clamp(0.05, 40.0);
+    let origin = Point::new(b.center().x - rect.width() as f64 / 2.0 / zoom, b.center().y - rect.height() as f64 / 2.0 / zoom);
+    if let Some(v) = app.view_mut() {
+        *v = View { zoom, origin, fitted: true, rotation: v.rotation };
+    }
+}
+
+/// Fit spread `r` (a document or parent spread on the canvas as it is laid out now) in the canvas.
+/// Before the canvas has a size, the next frame fits whatever spread is current.
+pub fn show_spread(app: &mut DesignApp, r: SpreadRef) {
+    let Some(st) = app.session.active() else { return };
+    let Some(b) = CanvasLayout::new(&st.doc, st.editing_parents).slot(r).map(|s| s.bounds) else { return };
+    match app.canvas_rect {
+        Some(rect) => fit_bounds(app, rect, b),
+        None => {
+            if let Some(v) = app.view_mut() {
+                v.fitted = false;
+            }
+        }
+    }
+}
+
+/// Index of the slot nearest the view centre.
+pub fn current_slot(app: &DesignApp, layout: &CanvasLayout) -> Option<usize> {
+    let v = app.view()?;
+    let r = app.canvas_rect?;
+    let c = Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, v.origin.y + r.height() as f64 / 2.0 / v.zoom);
+    layout
+        .slots
+        .iter()
+        .enumerate()
+        .min_by(|a, b| {
+            let da = (a.1.bounds.center().y - c.y).abs();
+            let db = (b.1.bounds.center().y - c.y).abs();
+            da.total_cmp(&db)
+        })
+        .map(|(i, _)| i)
+}
+
+/// The spread under the view centre (a parent spread while parents are edited).
+pub fn current_spread(app: &DesignApp) -> Option<SpreadRef> {
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    Some(layout.slots.get(current_slot(app, &layout)?)?.spread)
+}
+
+/// The spread nearest the view centre and the centre in that spread's coordinates.
+pub fn view_centre(app: &DesignApp) -> Option<(SpreadRef, Point)> {
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let slot = layout.slots.get(current_slot(app, &layout)?)?;
+    let v = app.view()?;
+    let r = app.canvas_rect?;
+    let c = Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, v.origin.y + r.height() as f64 / 2.0 / v.zoom);
+    Some((slot.spread, slot.to_spread(c)))
+}
+
+/// Where a file dropped on the window lands: the spread under the pointer, or under the view
+/// centre when the pointer isn't over the canvas, and that point in spread coordinates.
+pub fn drop_point(app: &DesignApp, screen: Option<Pos2>) -> Option<(SpreadRef, Point)> {
+    let rect = app.canvas_rect?;
+    let Some(pos) = screen.filter(|p| rect.contains(*p)) else { return view_centre(app) };
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    layout.spread_at(Xf::new(rect, app.view()?).to_canvas(pos))
+}
+
+/// Absolute page index under the view centre.
+pub fn current_page(app: &DesignApp) -> Option<usize> {
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let i = current_slot(app, &layout)?;
+    let slot = layout.slots.get(i)?;
+    let SpreadRef::Doc(si) = slot.spread else { return Some(0) };
+    let v = app.view()?;
+    let r = app.canvas_rect?;
+    let c = slot.to_spread(Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, slot.bounds.center().y));
+    let pi = st.doc.spreads[si].page_at_x(c.x).unwrap_or(0);
+    Some(st.doc.first_page_of_spread(si) + pi)
+}
+
+/// The spread (document or parent) under the view centre and the page index within it: where
+/// commands that act "on the page I am working on" should go.
+pub fn current_spread_page(app: &DesignApp) -> Option<(SpreadRef, usize)> {
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let i = current_slot(app, &layout)?;
+    let slot = layout.slots.get(i)?;
+    let v = app.view()?;
+    let r = app.canvas_rect?;
+    let c = slot.to_spread(Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, slot.bounds.center().y));
+    let pg = st.doc.spread(slot.spread)?.page_at_x(c.x).unwrap_or(0);
+    Some((slot.spread, pg))
+}
+
+/// While parent spreads are being edited: (parent spread index, page index within it) under the
+/// view centre. `None` when document pages are shown.
+pub fn current_parent_page(app: &DesignApp) -> Option<(usize, usize)> {
+    let st = app.session.active()?;
+    if !st.editing_parents {
+        return None;
+    }
+    let layout = CanvasLayout::new(&st.doc, true);
+    let i = current_slot(app, &layout)?;
+    let slot = layout.slots.get(i)?;
+    let SpreadRef::Parent(pi) = slot.spread else { return None };
+    let v = app.view()?;
+    let r = app.canvas_rect?;
+    let c = slot.to_spread(Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, slot.bounds.center().y));
+    let qi = st.doc.parents.get(pi)?.page_at_x(c.x).unwrap_or(0);
+    Some((pi, qi))
+}
+
+/// Scroll so absolute page `abs` is centred (keeps zoom). A jump Go Back can return from.
+pub fn go_to_page(app: &mut DesignApp, abs: usize) {
+    note_jump(app, false);
+    centre_page(app, abs);
+    note_jump(app, true);
+}
+
+fn centre_page(app: &mut DesignApp, abs: usize) {
+    let Some(st) = app.session.active() else { return };
+    let layout = CanvasLayout::new(&st.doc, false);
+    let Some(pr) = layout.page_rect(&st.doc, abs) else { return };
+    let Some(rect) = app.canvas_rect else { return };
+    if let Some(v) = app.view_mut() {
+        v.origin = Point::new(pr.center().x - rect.width() as f64 / 2.0 / v.zoom, pr.center().y - rect.height() as f64 / 2.0 / v.zoom);
+    }
+}
+
+/// The document's pages by id, in page order.
+fn page_ids(doc: &Document) -> Vec<designcraft_doc::ids::PageId> {
+    doc.spreads.iter().flat_map(|s| s.pages.iter().map(|p| p.id)).collect()
+}
+
+/// The page in view and the view centre's offset from that page's centre. Parent pages have none,
+/// nor has a view still waiting to be fitted (leaving parent pages for a document page).
+pub(crate) fn page_in_view(app: &DesignApp) -> Option<(designcraft_doc::ids::PageId, DVec2)> {
+    let st = app.session.active().filter(|st| !st.editing_parents)?;
+    let (v, r) = (app.view().filter(|v| v.fitted)?, app.canvas_rect?);
+    let abs = current_page(app)?;
+    let id = st.doc.page(abs)?.id;
+    let pr = CanvasLayout::new(&st.doc, false).page_rect(&st.doc, abs)?;
+    let c = Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, v.origin.y + r.height() as f64 / 2.0 / v.zoom);
+    Some((id, c - pr.center()))
+}
+
+/// Layout ▸ Go Back / Go Forward record jumps (Go to Page, the page and spread commands, the Pages
+/// panel), not scrolling: where the view is when a jump starts, and where the jump took it.
+fn note_jump(app: &mut DesignApp, to: bool) {
+    let Some((id, offset)) = page_in_view(app) else { return };
+    if let Some(h) = app.page_history_mut() {
+        if to { h.visit(id, offset) } else { h.leave(id, offset) }
+    }
+}
+
+/// Whether Layout ▸ Go Back (`step` < 0) or Go Forward has a page to go to from the view as it is.
+pub fn can_go_through_history(app: &DesignApp, step: isize) -> bool {
+    let Some(st) = app.session.active().filter(|st| !st.editing_parents) else { return false };
+    // A view still waiting to be fitted is refitted next frame, which would replace the destination.
+    if !app.view().is_some_and(|v| v.fitted) {
+        return false;
+    }
+    let ids = page_ids(&st.doc);
+    let Some(mut h) = app.page_history().cloned() else { return false };
+    if let Some((id, offset)) = page_in_view(app) {
+        h.leave(id, offset);
+    }
+    h.can_go(step, |id| ids.contains(&id))
+}
+
+/// Layout ▸ Go Back (`step` < 0) or Go Forward: show the page viewed before or after this one, where
+/// the view was on it (zoom kept).
+pub fn go_through_history(app: &mut DesignApp, step: isize) {
+    if !app.view().is_some_and(|v| v.fitted) {
+        return;
+    }
+    note_jump(app, false);
+    let Some(ids) = app.session.active().filter(|st| !st.editing_parents).map(|st| page_ids(&st.doc)) else { return };
+    let Some((id, offset)) = app.page_history_mut().and_then(|h| h.go(step, |id| ids.contains(&id))) else { return };
+    let Some(st) = app.session.active() else { return };
+    let Some(pr) = ids.iter().position(|p| *p == id).and_then(|abs| CanvasLayout::new(&st.doc, false).page_rect(&st.doc, abs)) else { return };
+    let Some(rect) = app.canvas_rect else { return };
+    let c = pr.center() + offset;
+    if let Some(v) = app.view_mut() {
+        v.origin = Point::new(c.x - rect.width() as f64 / 2.0 / v.zoom, c.y - rect.height() as f64 / 2.0 / v.zoom);
+    }
+}
+
+/// Presentation: the spread in view, centred and as large as `rect` allows.
+pub(super) fn present_fit(app: &mut DesignApp, rect: Rect) {
+    let Some(st) = app.session.active() else { return };
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let Some(b) = current_slot(app, &layout).and_then(|i| layout.slots.get(i)).map(|s| s.bounds) else { return };
+    if b.width() <= 0.0 || b.height() <= 0.0 {
+        return;
+    }
+    let zoom = (rect.width() as f64 / b.width()).min(rect.height() as f64 / b.height()).clamp(0.05, 40.0);
+    let origin = Point::new(b.center().x - rect.width() as f64 / 2.0 / zoom, b.center().y - rect.height() as f64 / 2.0 / zoom);
+    if let Some(v) = app.view_mut() {
+        v.zoom = zoom;
+        v.origin = origin;
+    }
+}
+
+/// Centre the spread `delta` spreads after (or before) the one in view (keeps zoom); stops at the
+/// first and last spread. Parent spreads while they are being edited.
+pub fn step_spread(app: &mut DesignApp, delta: isize) {
+    // At the first or last spread only the view moves, within the spread: no jump for Go Back.
+    let jump = spread_step(app, delta).is_some_and(|(cur, to)| cur != to);
+    if jump {
+        note_jump(app, false);
+    }
+    centre_spread(app, delta);
+    if jump {
+        note_jump(app, true);
+    }
+}
+
+/// The slot in view and the one `delta` spreads after (or before) it, stopping at the ends.
+fn spread_step(app: &DesignApp, delta: isize) -> Option<(usize, usize)> {
+    let st = app.session.active()?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let cur = current_slot(app, &layout)?;
+    Some((cur, cur.saturating_add_signed(delta).min(layout.slots.len().saturating_sub(1))))
+}
+
+fn centre_spread(app: &mut DesignApp, delta: isize) {
+    let Some((_, to)) = spread_step(app, delta) else { return };
+    let Some(st) = app.session.active() else { return };
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let Some(b) = layout.slots.get(to).map(|s| s.bounds) else { return };
+    let Some(rect) = app.canvas_rect else { return };
+    if let Some(v) = app.view_mut() {
+        v.origin = Point::new(b.center().x - rect.width() as f64 / 2.0 / v.zoom, b.center().y - rect.height() as f64 / 2.0 / v.zoom);
+    }
+}
+
+pub fn zoom_at(app: &mut DesignApp, screen: Pos2, factor: f64) {
+    let Some(rect) = app.canvas_rect else { return };
+    let Some(v) = app.view_mut() else { return };
+    let xf = Xf::new(rect, v);
+    let c = xf.to_canvas(screen);
+    let screen = xf.unrotate(screen);
+    let nz = (v.zoom * factor).clamp(0.05, 40.0);
+    v.zoom = nz;
+    v.origin = Point::new(c.x - (screen.x - rect.min.x) as f64 / nz, c.y - (screen.y - rect.min.y) as f64 / nz);
+}
+
+pub fn set_zoom(app: &mut DesignApp, z: f64) {
+    let Some(rect) = app.canvas_rect else { return };
+    let cur = app.view().map(|v| v.zoom).unwrap_or(1.0);
+    zoom_at(app, rect.center(), z / cur);
+}
+
+pub fn apply_view_request(app: &mut DesignApp, p: &Value) {
+    if let Some(r) = p.get("showSpread").and_then(|v| serde_json::from_value::<SpreadRef>(v.clone()).ok()) {
+        show_spread(app, r);
+    }
+    // Power Zoom (Hand tool, Alt-press): zoom out to the spread, aim a view-sized rectangle, zoom
+    // back in where it was released.
+    if let Some(phase) = p.get("powerZoom").and_then(Value::as_str) {
+        let at = p.get("at").and_then(Value::as_array).map(|a| Point::new(a[0].as_f64().unwrap_or(0.0), a[1].as_f64().unwrap_or(0.0)));
+        match phase {
+            "start" => {
+                if let (Some(v), Some(rect)) = (app.view().copied(), app.canvas_rect) {
+                    let centre = Xf::new(rect, &v).to_canvas(rect.center());
+                    app.power_zoom = Some((v.zoom, at.unwrap_or(centre)));
+                    fit(app, rect, "spread");
+                }
+            }
+            "move" => {
+                if let (Some(pz), Some(a)) = (&mut app.power_zoom, at) {
+                    pz.1 = a;
+                }
+            }
+            _ => {
+                if let (Some((z, c)), Some(rect)) = (app.power_zoom.take(), app.canvas_rect)
+                    && let Some(v) = app.view_mut()
+                {
+                    let c = at.unwrap_or(c);
+                    v.zoom = z;
+                    v.origin = Point::new(c.x - rect.width() as f64 / 2.0 / z, c.y - rect.height() as f64 / 2.0 / z);
+                }
+            }
+        }
+    }
+    if let Some(d) = p.get("pan").and_then(Value::as_array) {
+        let (dx, dy) = (d.first().and_then(Value::as_f64).unwrap_or(0.0), d.get(1).and_then(Value::as_f64).unwrap_or(0.0));
+        if let Some(v) = app.view_mut() {
+            v.origin = Point::new(v.origin.x - dx / v.zoom, v.origin.y - dy / v.zoom);
+        }
+    }
+    if let (Some(a), Some(rect)) = (p.get("zoomAt").and_then(Value::as_array), app.canvas_rect)
+        && let Some(v) = app.view()
+    {
+        let c = Point::new(a[0].as_f64().unwrap_or(0.0), a[1].as_f64().unwrap_or(0.0));
+        let xf = Xf::new(rect, v);
+        let s = xf.to_screen(c);
+        zoom_at(app, s, p.get("factor").and_then(Value::as_f64).unwrap_or(2.0));
+    }
+}
diff --git a/crates/ui-egui/src/chrome.rs b/crates/ui-egui/src/chrome.rs
index 303c08703..21a7de715 100644
--- a/crates/ui-egui/src/chrome.rs
+++ b/crates/ui-egui/src/chrome.rs
@@ -10,6 +10,25 @@ use crate::theme::{Tokens, semibold};
 use crate::widgets::{NumField, caption, measure};
 use crate::{DesignApp, icons};
 
+mod app_bar;
+mod control_bar;
+mod start_screen;
+mod status_bar;
+
+pub(crate) use app_bar::resize_borders;
+#[cfg(test)]
+use app_bar::search_id;
+pub use app_bar::{app_bar, search_had_focus};
+pub use control_bar::control_bar;
+pub(crate) use control_bar::{icon_field, swatch_field};
+pub(crate) use start_screen::recent_file_stat;
+pub use start_screen::start_screen;
+#[cfg(test)]
+use start_screen::{RECENT_STAT_MS, recent_file_stat_at};
+#[cfg(test)]
+use status_bar::DOC_TAB_MAX_W;
+pub use status_bar::{doc_tabs, status_bar};
+
 /// Height of the application bar (InDesign 2026), then a 7 pt lower band and a 1 pt border. The
 /// band covers the panel's 1 pt separator line, so the frame's bottom margin is 1 pt short of it.
 const APP_BAR: f32 = 36.0;
@@ -30,2306 +49,11 @@ const MAC_LIGHTS_LEFT: f32 = 10.0;
 /// plus the same gap the lights keep from the top of the window.
 pub const MAC_CONTENT_LEFT: f32 = MAC_LIGHTS_LEFT + 2.0 * MAC_LIGHT_PITCH + MAC_LIGHT + (MAC_APP_BAR - MAC_LIGHT) / 2.0;
 
-fn search_id() -> egui::Id {
-    egui::Id::new("app_bar_search")
-}
-
-/// Whether the application bar's search field had the keyboard last frame. Escape takes egui's
-/// focus away before any widget runs, so that press must not reach the global shortcuts.
-pub fn search_had_focus(ctx: &egui::Context) -> bool {
-    ctx.memory(|m| m.had_focus_last_frame(search_id()))
-}
-
-/// The search field's state between frames: the query, the highlighted match, whether the matches
-/// are shown, and the widget that had the keyboard before the field took it.
-#[derive(Clone, Default)]
-struct SearchState {
-    query: String,
-    highlight: usize,
-    open: bool,
-    previous_focus: Option<egui::Id>,
-}
-
-/// The application bar's search field: finds menu commands by their labels in the interface
-/// language. ↑/↓ move through the matches; Return or a click runs one as its menu item would.
-/// Running one or pressing Escape clears the field and gives the keyboard back to the widget that
-/// had it. While the field has the keyboard, no key reaches the shortcuts or the document.
-fn search_field(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    let id = search_id();
-    let state_id = id.with("state");
-    let mut st: SearchState = ui.data(|d| d.get_temp(state_id)).unwrap_or_default();
-    let (r, _) = ui.allocate_exact_size(vec2(125.0, 18.0), Sense::hover());
-    ui.painter().rect(r, 1.0, t.input, Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
-    icons::paint(ui.painter(), egui::Rect::from_min_size(r.min + vec2(3.0, 2.0), vec2(14.0, 14.0)), "search", t.icon);
-    let focused = ui.memory(|m| m.has_focus(id));
-    let had_focus = search_had_focus(ui.ctx());
-    if !focused && !had_focus {
-        st.previous_focus = ui.memory(|m| m.focused());
-    }
-    let none = egui::Modifiers::NONE;
-    let (down, up, enter, escape) = if focused || had_focus {
-        ui.input_mut(|i| {
-            (
-                i.consume_key(none, egui::Key::ArrowDown),
-                i.consume_key(none, egui::Key::ArrowUp),
-                i.consume_key(none, egui::Key::Enter),
-                i.consume_key(none, egui::Key::Escape),
-            )
-        })
-    } else {
-        (false, false, false, false)
-    };
-    let lang = app.ui.language.clone();
-    let hint = crate::rtl::widget(ui, egui::RichText::new(crate::i18n::tr(&lang, "Search")).color(t.text_dim));
-    let field = egui::Rect::from_min_max(r.min + vec2(19.0, 0.0), r.max - vec2(3.0, 0.0));
-    let resp = ui
-        .put(
-            field,
-            egui::TextEdit::singleline(&mut st.query)
-                .id(id)
-                .frame(egui::Frame::NONE)
-                .margin(egui::Margin::ZERO)
-                .font(egui::FontId::proportional(11.0))
-                .text_color(t.text)
-                .hint_text(hint)
-                .desired_width(field.width())
-                .vertical_align(egui::Align::Center)
-                // Return runs the highlighted match instead of leaving the field.
-                .return_key(None),
-        )
-        .on_hover_text(crate::i18n::tr(&lang, "Search commands"));
-    if resp.changed() {
-        st.highlight = 0;
-        st.open = true;
-    }
-    if resp.gained_focus() {
-        st.open = true;
-    }
-    let items = if st.open { crate::menus::command_search(app, &st.query) } else { Vec::new() };
-    let last = items.len().saturating_sub(1);
-    if down {
-        st.highlight = st.highlight.saturating_add(1);
-    }
-    if up {
-        st.highlight = st.highlight.saturating_sub(1);
-    }
-    st.highlight = st.highlight.min(last);
-    let mut run = None;
-    if enter && let Some(it) = items.get(st.highlight).filter(|it| crate::menus::menu_enabled(app, &it.id)) {
-        run = Some(it.id.clone());
-    }
-    let mut over_matches = false;
-    if st.open && !st.query.trim().is_empty() {
-        let shown = egui::Area::new(id.with("matches"))
-            .order(egui::Order::Foreground)
-            .pivot(egui::Align2::RIGHT_TOP)
-            .fixed_pos(r.right_bottom() + vec2(0.0, 2.0))
-            .show(ui.ctx(), |ui| {
-                egui::Frame::menu(ui.style()).show(ui, |ui| {
-                    let size = vec2(300.0, 22.0);
-                    ui.set_width(size.x);
-                    if items.is_empty() {
-                        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&lang, "No matching commands")).color(t.text_dim));
-                    }
-                    for (k, it) in items.iter().enumerate() {
-                        let mut b = egui::Button::new(crate::rtl::widget(ui, it.label.as_str())).frame(false).min_size(size);
-                        if let Some(sc) = &it.shortcut {
-                            b = b.shortcut_text(crate::menus::shortcut_text(sc));
-                        }
-                        if k == st.highlight {
-                            ui.painter().rect_filled(egui::Rect::from_min_size(ui.cursor().min, size), 2.0, t.hover);
-                        }
-                        let enabled = crate::menus::menu_enabled(app, &it.id);
-                        // The button aligns its label by the layout it's in: left, like the menus.
-                        let row = ui.allocate_ui_with_layout(
-                            size,
-                            egui::Layout::left_to_right(egui::Align::Center).with_main_align(egui::Align::Min),
-                            |ui| ui.add_enabled(enabled, b),
-                        );
-                        if row.inner.clicked() {
-                            run = Some(it.id.clone());
-                        }
-                    }
-                });
-            });
-        over_matches = shown.response.contains_pointer();
-    }
-    if escape || run.is_some() {
-        st.query.clear();
-        st.open = false;
-        let previous = st.previous_focus.take();
-        ui.memory_mut(|m| match previous {
-            Some(p) => m.request_focus(p),
-            None => m.surrender_focus(id),
-        });
-    } else if !resp.has_focus() && !over_matches {
-        // A click elsewhere or Tab took the keyboard: the matches close, the query stays.
-        st.open = false;
-    }
-    ui.data_mut(|d| d.insert_temp(state_id, st));
-    if let Some(cmd) = run {
-        crate::menus::activate(app, &cmd, &serde_json::Value::Null);
-    }
-}
-
-/// Width of the app bar's right-hand slot: what is left of the row, minus a pixel of slack so
-/// that rounding at fractional scales (115%) never makes the row a hair wider than the scroll
-/// area and shows a needless scroll bar. Never narrower than the controls themselves.
-fn tools_slot_width(available: f32, tools_w: f32) -> f32 {
-    (available - 1.0).max(tools_w)
-}
-
-pub fn app_bar(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    let mac = app.integrated_titlebar;
-    let left = if mac { MAC_CONTENT_LEFT as i8 } else { 8 };
-    let bar = if mac { MAC_APP_BAR } else { APP_BAR };
-    // The tallest control keeps a margin above and below it in the shorter macOS bar.
-    let home = if mac { 22.0 } else { 24.0 };
-    let resp = egui::Panel::top("app_bar")
-        .exact_size(bar + APP_BAR_BAND)
-        .frame(egui::Frame::NONE.fill(t.app_bar).inner_margin(egui::Margin {
-            left,
-            right: if app.custom_titlebar { 0 } else { 10 },
-            top: 0,
-            bottom: (APP_BAR_BAND - SEPARATOR) as i8,
-        }))
-        .show(ui, |ui| {
-            let full = ui.max_rect();
-            if mac {
-                // The whole title-bar band, margins included; the controls drawn below take
-                // their own clicks.
-                let band = egui::Rect::from_min_max(
-                    egui::pos2(full.min.x - f32::from(left), full.min.y),
-                    egui::pos2(full.max.x + 10.0, full.min.y + MAC_APP_BAR),
-                );
-                crate::title_bar::empty_area(ui, band);
-            }
-            let mut menus_end = full.min.x;
-            let mut tools_start = full.max.x;
-            // Windows caption buttons stay at the right edge; the rest of the bar scrolls.
-            let caption_w = if app.custom_titlebar { CAPTION_W } else { 0.0 };
-            // Undecorated window: the bar moves it. The drag area is the whole bar but the caption
-            // buttons, lower band included, registered before the menus and tools so they stay on
-            // top of it: any gap drags, and the lower band is always there, however narrow the
-            // window (the menus and tools scroll).
-            if app.custom_titlebar {
-                let drag = egui::Rect::from_min_max(
-                    egui::pos2(full.min.x - left as f32, full.min.y),
-                    egui::pos2(full.max.x - caption_w, full.min.y + bar + APP_BAR_BAND),
-                );
-                let response = ui.interact(drag, egui::Id::new("window_title_drag"), Sense::click_and_drag());
-                // Only from an empty part of the bar: the lower band, or the gap between the menus
-                // and the tools (as they were last frame). A menu title pressed and dragged doesn't
-                // move the window, as with native title bars.
-                let (gap0, gap1) =
-                    ui.data(|d| (d.get_temp::<f32>(egui::Id::new("app_bar_menus_end")), d.get_temp::<f32>(egui::Id::new("app_bar_tools_start"))));
-                let empty = |p: egui::Pos2| p.y >= full.min.y + bar || matches!((gap0, gap1), (Some(a), Some(b)) if p.x >= a && p.x <= b);
-                let from_empty = ui.input(|i| i.pointer.press_origin().or(i.pointer.interact_pos())).is_some_and(empty);
-                if response.double_clicked() && from_empty {
-                    let on = !ui.input(|i| i.viewport().maximized.unwrap_or(false));
-                    let _ = app.run("window.maximize", json!({"on": on}));
-                } else if response.drag_started_by(egui::PointerButton::Primary) && from_empty {
-                    let _ = app.run("window.drag", json!({}));
-                }
-                app.flush_window_commands(ui.ctx());
-            }
-            if app.custom_titlebar {
-                let caption = egui::Rect::from_min_max(egui::pos2(full.max.x - caption_w, full.min.y), full.max);
-                ui.scope_builder(egui::UiBuilder::new().max_rect(caption).layout(egui::Layout::right_to_left(egui::Align::Center)), |ui| {
-                    caption_buttons(app, ui);
-                });
-            }
-            let scrolled = egui::Rect::from_min_max(full.min, egui::pos2(full.max.x - caption_w, full.max.y));
-            ui.scope_builder(egui::UiBuilder::new().max_rect(scrolled), |ui| {
-                // The right-hand controls' width, measured last frame: in a window too narrow for them
-                // and the menus they follow the menus, and the bar scrolls sideways.
-                let tools_w_id = ui.id().with("tools_width");
-                let tools_w: f32 = ui.data(|d| d.get_temp(tools_w_id)).unwrap_or(0.0);
-                crate::widgets::overflow_scrolling(ui);
-                // (Drag-scrolling is touch-only by default, so a mouse drag on the bar moves the window.)
-                egui::ScrollArea::horizontal().id_salt("app_bar_scroll").auto_shrink([false, false]).show(ui, |ui| {
-                    ui.horizontal_centered(|ui| {
-                        if icons::button(ui, "home", home, app.session.active().is_none(), crate::i18n::tr(&app.ui.language, "Home")).clicked() {
-                            app.session_home();
-                        }
-                        ui.add_space(6.0);
-                        if !app.native_menu {
-                            ui.style_mut().visuals.widgets.inactive.weak_bg_fill = Color32::TRANSPARENT;
-                            ui.style_mut().visuals.widgets.inactive.bg_stroke = Stroke::NONE;
-                            ui.style_mut().visuals.widgets.hovered.bg_stroke = Stroke::NONE;
-                            ui.style_mut().spacing.button_padding = vec2(7.0, 3.0);
-                            crate::menus::menu_bar(app, ui);
-                        }
-                        menus_end = ui.min_rect().max.x;
-                        // Where the menus end on screen (moves as a narrow bar scrolls).
-                        ui.data_mut(|d| d.insert_temp(egui::Id::new("app_bar_menus_end"), menus_end));
-                        let size = vec2(tools_slot_width(ui.available_width(), tools_w), ui.available_height());
-                        let tools = ui.allocate_ui_with_layout(size, egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                            ui.add_space(4.0);
-                            search_field(app, ui);
-                            ui.add_space(8.0);
-                            let current = app.ui.workspace.clone();
-                            let shown = crate::i18n::workspace_name(&app.ui.language, &current);
-                            crate::menus::menu_button(
-                                ui,
-                                crate::rtl::widget(ui, egui::RichText::new(format!("{shown} ▾")).font(semibold(11.5)).color(t.text)),
-                                |ui| {
-                                    let customs: Vec<String> = app.ui.custom_workspaces.iter().map(|w| w.name.clone()).collect();
-                                    for w in crate::menus::WORKSPACES.iter().map(|w| w.to_string()).chain(customs.iter().cloned()) {
-                                        if ui
-                                            .selectable_label(w == current, crate::rtl::widget(ui, crate::i18n::workspace_name(&app.ui.language, &w)))
-                                            .clicked()
-                                        {
-                                            let _ = app.run("window.workspace", json!({"name": w}));
-                                            ui.close();
-                                        }
-                                    }
-                                    ui.separator();
-                                    if ui
-                                        .button(crate::rtl::widget(
-                                            ui,
-                                            format!(
-                                                "{} {}",
-                                                crate::i18n::tr(&app.ui.language, "Reset"),
-                                                crate::i18n::workspace_name(&app.ui.language, &current)
-                                            ),
-                                        ))
-                                        .clicked()
-                                    {
-                                        let _ = app.run("window.resetWorkspace", json!({}));
-                                        ui.close();
-                                    }
-                                    if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "New Workspace…"))).clicked() {
-                                        let _ = app.run("window.newWorkspace", json!({}));
-                                        ui.close();
-                                    }
-                                    if !customs.is_empty() {
-                                        crate::menus::menu_button(
-                                            ui,
-                                            crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Delete Workspace")),
-                                            |ui| {
-                                                for w in &customs {
-                                                    if ui.button(w).clicked() {
-                                                        let _ = app.run("window.deleteWorkspace", json!({"name": w}));
-                                                        ui.close();
-                                                    }
-                                                }
-                                            },
-                                        );
-                                    }
-                                },
-                            );
-                            ui.add_space(6.0);
-                            if icons::button(ui, "share", 22.0, false, crate::i18n::tr(&app.ui.language, "Share")).clicked() {
-                                app.status(crate::i18n::tr(&app.ui.language, "Export a PDF, IDML or package to share — no cloud account needed."));
-                            }
-                            ui.add_space(8.0);
-                            // Always one click away: the ArtCraft community Discord.
-                            if crate::about::discord_button(ui, "Discord", vec2(78.0, 22.0)) {
-                                let _ = app.run("help.discord", json!({}));
-                            }
-                            tools_start = ui.min_rect().min.x;
-                            ui.data_mut(|d| d.insert_temp(egui::Id::new("app_bar_tools_start"), tools_start));
-                            ui.min_rect().width()
-                        });
-                        if (tools.inner - tools_w).abs() > 0.5 {
-                            ui.data_mut(|d| d.insert_temp(tools_w_id, tools.inner));
-                            ui.ctx().request_discard("app bar: the right-hand controls changed width");
-                        }
-                    });
-                });
-            });
-            // Centred title.
-            let title = match app.session.active() {
-                Some(d) => format!("DesignCraft — {}", crate::rtl::isolate(&d.title())),
-                None => "DesignCraft".to_string(),
-            };
-            // Centred between the menus and the right-hand controls; left out when it won't fit.
-            let galley = crate::rtl::plain(ui.ctx(), &title, egui::FontId::proportional(11.5), t.text);
-            let w = galley.size().x;
-            let cx = full.center().x;
-            if cx - w / 2.0 > menus_end + 12.0 && cx + w / 2.0 < tools_start - 12.0 {
-                ui.painter().galley(egui::pos2(cx - w / 2.0, full.center().y - galley.size().y / 2.0), galley, t.text);
-            }
-        });
-    let r = resp.response.rect;
-    ui.painter().rect_filled(egui::Rect::from_min_max(egui::pos2(r.min.x, r.max.y - APP_BAR_BAND), r.max), 0.0, t.pasteboard);
-    ui.painter().line_segment([egui::pos2(r.min.x, r.max.y), egui::pos2(r.max.x, r.max.y)], Stroke::new(1.0, t.border));
-}
-
-const CAPTION_BUTTON_W: f32 = 46.0;
-/// Minimize, maximize and close, and the space after them.
-const CAPTION_W: f32 = 3.0 * CAPTION_BUTTON_W + 8.0;
-
-/// Windows caption buttons. The macOS traffic lights remain native.
-fn caption_buttons(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    let maximized = ui.input(|i| i.viewport().maximized.unwrap_or(false));
-    let spacing = ui.spacing().item_spacing.x;
-    ui.spacing_mut().item_spacing.x = 0.0;
-    for (command, label) in
-        [("window.close", "Close"), ("window.maximize", if maximized { "Restore" } else { "Maximize" }), ("window.minimize", "Minimize")]
-    {
-        let (rect, _) = ui.allocate_exact_size(vec2(CAPTION_BUTTON_W, APP_BAR), Sense::hover());
-        let response = ui.interact(rect, egui::Id::new(command), Sense::click());
-        response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, ui.is_enabled(), label));
-        let hovered = response.hovered();
-        if hovered {
-            ui.painter().rect_filled(rect, 0.0, if command == "window.close" { t.caption_close } else { t.hover });
-        }
-        let color = if hovered && command == "window.close" { t.caption_close_text } else { t.text };
-        let stroke = Stroke::new(1.0, color);
-        let icon = egui::Rect::from_center_size(rect.center(), vec2(10.0, 10.0));
-        match command {
-            "window.close" => {
-                ui.painter().line_segment([icon.left_top(), icon.right_bottom()], stroke);
-                ui.painter().line_segment([icon.right_top(), icon.left_bottom()], stroke);
-            }
-            "window.maximize" if maximized => {
-                let back = icon.translate(vec2(2.0, -2.0));
-                ui.painter().line_segment([back.left_top(), back.right_top()], stroke);
-                ui.painter().line_segment([back.right_top(), back.right_bottom()], stroke);
-                ui.painter().rect_stroke(icon, 0.0, stroke, egui::StrokeKind::Inside);
-            }
-            "window.maximize" => {
-                ui.painter().rect_stroke(icon, 0.0, stroke, egui::StrokeKind::Inside);
-            }
-            _ => {
-                ui.painter().line_segment([icon.left_center(), icon.right_center()], stroke);
-            }
-        }
-        if response.clicked() {
-            let params = if command == "window.maximize" { json!({"on": !maximized}) } else { json!({}) };
-            let _ = app.run(command, params);
-            app.flush_window_commands(ui.ctx());
-        }
-        response.on_hover_text(crate::i18n::tr(&app.ui.language, label));
-    }
-    ui.spacing_mut().item_spacing.x = spacing;
-    ui.add_space(8.0);
-}
-
-/// Undecorated Windows windows need resize grips as well as caption controls.
-pub(crate) fn resize_borders(app: &mut DesignApp, ui: &mut egui::Ui) {
-    if ui.input(|i| i.viewport().maximized.unwrap_or(false) || i.viewport().fullscreen.unwrap_or(false)) {
-        return;
-    }
-    let r = ui.ctx().content_rect();
-    let edge = 4.0;
-    let corner = 10.0;
-    let rect = |x0, y0, x1, y1| egui::Rect::from_min_max(egui::pos2(x0, y0), egui::pos2(x1, y1));
-    for (name, region, cursor) in [
-        ("northWest", rect(r.left(), r.top(), r.left() + corner, r.top() + corner), egui::CursorIcon::ResizeNwSe),
-        ("northEast", rect(r.right() - corner, r.top(), r.right(), r.top() + corner), egui::CursorIcon::ResizeNeSw),
-        ("southWest", rect(r.left(), r.bottom() - corner, r.left() + corner, r.bottom()), egui::CursorIcon::ResizeNeSw),
-        ("southEast", rect(r.right() - corner, r.bottom() - corner, r.right(), r.bottom()), egui::CursorIcon::ResizeNwSe),
-        ("north", rect(r.left() + corner, r.top(), r.right() - corner, r.top() + edge), egui::CursorIcon::ResizeVertical),
-        ("south", rect(r.left() + corner, r.bottom() - edge, r.right() - corner, r.bottom()), egui::CursorIcon::ResizeVertical),
-        ("west", rect(r.left(), r.top() + corner, r.left() + edge, r.bottom() - corner), egui::CursorIcon::ResizeHorizontal),
-        ("east", rect(r.right() - edge, r.top() + corner, r.right(), r.bottom() - corner), egui::CursorIcon::ResizeHorizontal),
-    ] {
-        let response = ui.interact(region, egui::Id::new(("window_resize", name)), Sense::drag()).on_hover_cursor(cursor);
-        if response.drag_started_by(egui::PointerButton::Primary) {
-            let _ = app.run("window.resize", json!({"edge": name}));
-            app.flush_window_commands(ui.ctx());
-        }
-    }
-}
-
 impl DesignApp {
     fn session_home(&mut self) {
         self.ui.status = crate::i18n::tr(&self.ui.language, "Home").into();
     }
 }
 
-fn vsep(ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    let (r, _) = ui.allocate_exact_size(vec2(9.0, 46.0), Sense::hover());
-    ui.painter().line_segment([r.center_top() + vec2(0.0, 4.0), r.center_bottom() - vec2(0.0, 4.0)], Stroke::new(1.0, t.divider));
-}
-
-/// Two-row context-sensitive Control panel.
-pub fn control_bar(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    egui::Panel::top("control_bar")
-        .exact_size(59.0)
-        .frame(
-            egui::Frame::NONE.fill(t.panel).inner_margin(egui::Margin { left: 8, right: 8, top: 5, bottom: 3 }).stroke(Stroke::new(1.0, t.divider)),
-        )
-        .show(ui, |ui| {
-            // Wider than the window: the bar scrolls sideways.
-            crate::widgets::overflow_scrolling(ui);
-            egui::ScrollArea::horizontal().id_salt("control_bar_scroll").auto_shrink([false, true]).show(ui, |ui| {
-                ui.horizontal_top(|ui| {
-                    let text_mode =
-                        matches!(app.session.tool_id(), "type" | "verticalType") || app.session.active().is_some_and(|d| d.selection.text.is_some());
-                    if app.session.tool_id() == "page" {
-                        control_page(app, ui);
-                    } else if text_mode {
-                        control_text(app, ui);
-                    } else {
-                        crate::object_control::show(app, ui);
-                    }
-                });
-            });
-        });
-}
-
-/// Page-size preset menu and the portrait / landscape toggles of the Control panel.
-fn page_preset_and_orientation(app: &mut DesignApp, ui: &mut egui::Ui, lang: &str, size: (f64, f64), n: usize, anchor: u8) {
-    let landscape = size.0 > size.1;
-    ui.vertical(|ui| {
-        let cur = panels::properties::preset_name(size.0, size.1);
-        egui::ComboBox::from_id_salt("ctl_page_preset").selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, cur))).width(130.0).show_ui(
-            ui,
-            |ui| {
-                for (name, w, h) in panels::properties::PAGE_PRESETS {
-                    if ui.selectable_label(cur == *name, crate::rtl::widget(ui, crate::i18n::tr(lang, name))).clicked() {
-                        let (w, h) = if landscape { (h, w) } else { (w, h) };
-                        let _ = app.run("layout.pageSize", json!({"pages": [n], "width": w, "height": h, "anchor": anchor}));
-                    }
-                }
-            },
-        );
-        ui.horizontal(|ui| {
-            for (icon, tip, want) in [("orient-portrait", "Portrait", false), ("orient-landscape", "Landscape", true)] {
-                if crate::widgets::icon_toggle(ui, icon, landscape == want, crate::i18n::tr(lang, tip)).clicked() && landscape != want {
-                    let _ = app.run("layout.pageSize", json!({"pages": [n], "width": size.1, "height": size.0, "anchor": anchor}));
-                }
-            }
-        });
-    });
-}
-
-/// The Control panel with the Page tool, as InDesign's: reference point, X/Y, W/H, page-size
-/// preset, orientation, Liquid Page Rule and Show Parent Page Overlay, for
-/// the page the Page tool selected (else the page in view). W/H keep the reference point in place.
-fn control_page(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let lang = app.ui.language.clone();
-    let Some(st) = app.session.active() else { return };
-    let units = st.doc.settings.horizontal_units;
-    let Some(page) = st.selection.page.or_else(|| crate::canvas::current_page(app)) else { return };
-    let Some(st) = app.session.active() else { return };
-    let d = st.doc.clone();
-    let Some((si, pi)) = d.page_loc(page) else { return };
-    let pg = d.spreads[si].pages[pi].clone();
-    let n = page + 1;
-    // Reference point: W/H edits keep it in place.
-    let (r, _) = ui.allocate_exact_size(vec2(30.0, 44.0), Sense::hover());
-    if let Some(p) = panels::properties::ref_point_proxy(ui, egui::Rect::from_center_size(r.center(), vec2(27.0, 27.0)), app.ui.ref_point) {
-        app.ui.ref_point = p;
-    }
-    let anchor = app.ui.ref_point.min(8);
-    let (fx, fy) = ((anchor % 3) as f64 / 2.0, (anchor / 3) as f64 / 2.0);
-    // The reference point's position: from the spine across, from the top down.
-    let (x, y) = (pg.x - d.spreads[si].spine_x() + fx * pg.width, fy * pg.height);
-    egui::Grid::new("ctl_page_xywh").num_columns(4).spacing(vec2(4.0, 4.0)).show(ui, |ui| {
-        caption(ui, crate::i18n::tr(&lang, "X:"));
-        // Pages don't move within their spread yet.
-        ui.add_enabled_ui(false, |ui| measure(ui, "cpx", Some(x), units, 64.0));
-        caption(ui, crate::i18n::tr(&lang, "W:"));
-        if let Some(v) = measure(ui, "cpw", Some(pg.width), units, 64.0) {
-            let _ = app.run("layout.pageSize", json!({"pages": [n], "width": v, "anchor": anchor}));
-        }
-        ui.end_row();
-        caption(ui, crate::i18n::tr(&lang, "Y:"));
-        ui.add_enabled_ui(false, |ui| measure(ui, "cpy", Some(y), units, 64.0));
-        caption(ui, crate::i18n::tr(&lang, "H:"));
-        if let Some(v) = measure(ui, "cph", Some(pg.height), units, 64.0) {
-            let _ = app.run("layout.pageSize", json!({"pages": [n], "height": v, "anchor": anchor}));
-        }
-        ui.end_row();
-    });
-    vsep(ui);
-    // Page-size preset and orientation.
-    page_preset_and_orientation(app, ui, &lang, (pg.width, pg.height), n, anchor);
-    vsep(ui);
-    ui.vertical(|ui| {
-        caption(ui, crate::i18n::tr(&lang, "Liquid Page Rule:"));
-        let label = panels::interactive::liquid_rule_label(pg.liquid);
-        egui::ComboBox::from_id_salt("ctl_page_rule").selected_text(crate::rtl::widget(ui, crate::i18n::tr(&lang, label))).width(150.0).show_ui(
-            ui,
-            |ui| {
-                for (r, l) in panels::interactive::LIQUID_RULES {
-                    if ui.selectable_label(pg.liquid == r, crate::rtl::widget(ui, crate::i18n::tr(&lang, l))).clicked() && pg.liquid != r {
-                        let _ = app.run("liquid.pageRule", json!({"rule": r, "pages": [n]}));
-                    }
-                }
-            },
-        );
-    });
-    vsep(ui);
-    ui.vertical(|ui| {
-        let mut overlay = pg.show_parent_overlay;
-        if ui.checkbox(&mut overlay, crate::rtl::widget(ui, crate::i18n::tr(&lang, "Show Parent Page Overlay"))).changed() {
-            let _ = app.run("layout.pageOptions", json!({"pages": [n], "showParentOverlay": overlay}));
-        }
-    });
-}
-
-/// The Control panel's font sizes (and leadings), as InDesign lists them.
-const SIZES: &[f64] = &[6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 14.0, 18.0, 24.0, 30.0, 36.0, 48.0, 60.0, 72.0];
-/// The Control panel's tracking values (1/1000 em).
-const TRACKING: &[f64] = &[-100.0, -75.0, -50.0, -25.0, -10.0, -5.0, 0.0, 5.0, 10.0, 25.0, 50.0, 75.0, 100.0, 200.0];
-
-/// Whether the text Control panel shows Paragraph Formatting Controls (¶) rather than Character
-/// Formatting Controls (A).
-const PARA_MODE: &str = "ctl_text_para_mode";
-
-/// An icon and a field after it, as the Control panel lays its fields out.
-fn icon_field(ui: &mut egui::Ui, icon: &str, tip: &str, field: NumField) -> Option<f64> {
-    let t = Tokens::get(ui.ctx());
-    let (r, resp) = ui.allocate_exact_size(vec2(18.0, 18.0), Sense::hover());
-    icons::paint(ui.painter(), r, icon, t.icon);
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, tip));
-    let label = resp.id;
-    resp.on_hover_text(tip);
-    field.spinner().labelled_by(label).show(ui)
-}
-
-/// A column of two rows (the Control panel's two-row groups).
-fn rows(ui: &mut egui::Ui, mut row: impl FnMut(&mut egui::Ui, usize)) {
-    ui.vertical(|ui| {
-        ui.spacing_mut().item_spacing.y = 3.0;
-        ui.horizontal(|ui| row(ui, 0));
-        ui.horizontal(|ui| row(ui, 1));
-    });
-}
-
-/// A small toggle button showing `text` (the case and position buttons).
-fn text_toggle(ui: &mut egui::Ui, text: &str, strike: bool, on: bool, tip: &str) -> bool {
-    let t = Tokens::get(ui.ctx());
-    let (r, resp) = ui.allocate_exact_size(vec2(24.0, 20.0), Sense::click());
-    if on {
-        ui.painter().rect_filled(r, 2.0, t.tool_active);
-    } else if resp.hovered() {
-        ui.painter().rect_filled(r, 2.0, t.hover);
-    }
-    let col = if on { t.text_strong } else { t.icon };
-    ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, egui::FontId::proportional(13.0), col);
-    if strike {
-        ui.painter().line_segment([r.center() + vec2(-6.0, 0.5), r.center() + vec2(6.0, 0.5)], Stroke::new(1.2, col));
-    }
-    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, true, on, tip));
-    resp.on_hover_text(tip).clicked()
-}
-
-/// The text Control panel, as InDesign's: A shows the Character Formatting Controls (font, size
-/// and leading, the case and position buttons, kerning and tracking, the scales, baseline shift
-/// and skew, the character style and language); ¶ the Paragraph Formatting Controls (alignment,
-/// the indents, space before and after, the drop cap, the paragraph style, Hyphenate and Align to
-/// Baseline Grid).
-fn control_text(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    let lang = app.ui.language.clone();
-    let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
-    let attrs = panels::text_attrs(app);
-    let chars = attrs.as_ref().map(|a| a["chars"].clone()).unwrap_or_default();
-    let para = attrs.as_ref().map(|a| a["para"].clone()).unwrap_or_default();
-    let mode_id = egui::Id::new(PARA_MODE);
-    let para_mode = ui.data(|d| d.get_temp::<bool>(mode_id)).unwrap_or(false);
-    ui.vertical(|ui| {
-        ui.spacing_mut().item_spacing.y = 3.0;
-        for (para, text, tip) in [(false, "A", "Character Formatting Controls"), (true, "¶", "Paragraph Formatting Controls")] {
-            let on = para_mode == para;
-            let (r, resp) = ui.allocate_exact_size(vec2(24.0, 22.0), Sense::click());
-            if on {
-                ui.painter().rect_filled(r, 2.0, t.tool_active);
-            } else if resp.hovered() {
-                ui.painter().rect_filled(r, 2.0, t.hover);
-            }
-            ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, semibold(15.0), if on { t.text_strong } else { t.text_dim });
-            let tip = tr(tip);
-            resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, true, on, &tip));
-            if resp.on_hover_text(&tip).clicked() {
-                ui.data_mut(|d| d.insert_temp(mode_id, para));
-            }
-        }
-    });
-    vsep(ui);
-    if para_mode {
-        control_paragraph(app, ui, &attrs, &para, &tr);
-    } else {
-        control_character(app, ui, &attrs, &chars, &para, &tr);
-    }
-}
-
-fn control_character(
-    app: &mut DesignApp,
-    ui: &mut egui::Ui,
-    attrs: &Option<serde_json::Value>,
-    chars: &serde_json::Value,
-    para: &serde_json::Value,
-    tr: &dyn Fn(&str) -> String,
-) {
-    ui.vertical(|ui| {
-        let fam = chars["fontFamily"].as_str().unwrap_or("").to_string();
-        let sty = chars["fontStyle"].as_str().unwrap_or("").to_string();
-        panels::font_family_picker(app, ui, &fam, 170.0);
-        panels::font_style_picker(app, ui, &fam, &sty, 170.0);
-    });
-    vsep(ui);
-    // Size and leading: a spinner on the left and a list of common values on the right;
-    // automatic leading in parentheses.
-    rows(ui, |ui, row| {
-        if row == 0 {
-            if let Some(v) = icon_field(
-                ui,
-                "font-size",
-                &tr("Font Size"),
-                NumField::number("csize", chars["size"].as_f64(), " pt", 2).width(84.0).presets(SIZES).range(0.1, 1296.0),
-            ) {
-                let _ = app.run("type.char", json!({"attrs": {"size": v}}));
-            }
-        } else {
-            let auto = chars["leading"]["kind"].as_str() != Some("points");
-            let lead = if auto {
-                chars["size"].as_f64().map(|s| s * para["autoLeading"].as_f64().unwrap_or(1.2))
-            } else {
-                chars["leading"]["value"].as_f64()
-            };
-            let lead = lead.map(|v| (v * 100.0).round() / 100.0);
-            let key = if auto { "cleadauto" } else { "clead" };
-            if let Some(v) = icon_field(
-                ui,
-                "leading",
-                &tr("Leading"),
-                NumField::number(key, lead, " pt", 2).width(84.0).presets(SIZES).range(0.0, 5000.0).parens(auto),
-            ) {
-                let _ = app.run("type.char", json!({"attrs": {"leading": {"kind": "points", "value": v}}}));
-            }
-        }
-    });
-    vsep(ui);
-    // All Caps, Superscript, Underline / Small Caps, Subscript, Strikethrough.
-    let caps = chars["capitalization"].as_str().unwrap_or("normal").to_string();
-    let pos = chars["position"].as_str().unwrap_or("normal").to_string();
-    let (ul, st) = (chars["underline"].as_bool().unwrap_or(false), chars["strikethrough"].as_bool().unwrap_or(false));
-    let mut set = None;
-    rows(ui, |ui, row| {
-        if row == 0 {
-            if text_toggle(ui, "TT", false, caps == "allCaps", &tr("All Caps")) {
-                set = Some(json!({"capitalization": if caps == "allCaps" { "normal" } else { "allCaps" }}));
-            }
-            if text_toggle(ui, "T¹", false, pos == "superscript", &tr("Superscript")) {
-                set = Some(json!({"position": if pos == "superscript" { "normal" } else { "superscript" }}));
-            }
-            if text_toggle(ui, "T̲", false, ul, &tr("Underline")) {
-                set = Some(json!({"underline": !ul}));
-            }
-        } else {
-            if text_toggle(ui, "Tᴛ", false, caps == "smallCaps", &tr("Small Caps")) {
-                set = Some(json!({"capitalization": if caps == "smallCaps" { "normal" } else { "smallCaps" }}));
-            }
-            if text_toggle(ui, "T₁", false, pos == "subscript", &tr("Subscript")) {
-                set = Some(json!({"position": if pos == "subscript" { "normal" } else { "subscript" }}));
-            }
-            if text_toggle(ui, "T", true, st, &tr("Strikethrough")) {
-                set = Some(json!({"strikethrough": !st}));
-            }
-        }
-    });
-    if let Some(a) = set {
-        let _ = app.run("type.char", json!({"attrs": a}));
-    }
-    vsep(ui);
-    rows(ui, |ui, row| {
-        if row == 0 {
-            let t = Tokens::get(ui.ctx());
-            let (r, resp) = ui.allocate_exact_size(vec2(18.0, 18.0), Sense::hover());
-            icons::paint(ui.painter(), r, "kerning", t.icon);
-            resp.on_hover_text(tr("Kerning"));
-            crate::panels::properties::kerning_control(app, ui, "ckern", &chars["kerning"], 92.0);
-        } else {
-            if let Some(v) = icon_field(
-                ui,
-                "tracking",
-                &tr("Tracking"),
-                NumField::number("ctrack", chars["tracking"].as_f64(), "", 0).width(92.0).presets(TRACKING).step(5.0).range(-1000.0, 10000.0),
-            ) {
-                let _ = app.run("type.char", json!({"attrs": {"tracking": v}}));
-            }
-        }
-    });
-    vsep(ui);
-    const SCALES: &[f64] = &[25.0, 50.0, 75.0, 80.0, 90.0, 100.0, 110.0, 120.0, 125.0, 150.0, 200.0];
-    let pct = |v: &serde_json::Value| v.as_f64().map(|s| (s * 1000.0).round() / 10.0);
-    rows(ui, |ui, row| {
-        if row == 0 {
-            if let Some(v) = icon_field(
-                ui,
-                "vscale",
-                &tr("Vertical Scale"),
-                NumField::number("cvs", pct(&chars["vScale"]), "%", 1).width(84.0).presets(SCALES).range(1.0, 1000.0),
-            ) {
-                let _ = app.run("type.char", json!({"attrs": {"vScale": v / 100.0}}));
-            }
-        } else {
-            if let Some(v) = icon_field(
-                ui,
-                "hscale",
-                &tr("Horizontal Scale"),
-                NumField::number("chs", pct(&chars["hScale"]), "%", 1).width(84.0).presets(SCALES).range(1.0, 1000.0),
-            ) {
-                let _ = app.run("type.char", json!({"attrs": {"hScale": v / 100.0}}));
-            }
-        }
-    });
-    vsep(ui);
-    rows(ui, |ui, row| {
-        if row == 0 {
-            if let Some(v) = icon_field(
-                ui,
-                "baseline-shift",
-                &tr("Baseline Shift"),
-                NumField::number("cbs", chars["baselineShift"].as_f64(), " pt", 2).width(76.0).range(-5000.0, 5000.0),
-            ) {
-                let _ = app.run("type.char", json!({"attrs": {"baselineShift": v}}));
-            }
-        } else {
-            if let Some(v) = icon_field(
-                ui,
-                "skew",
-                &tr("Skew (False Italic)"),
-                NumField::number("csk", chars["skew"].as_f64(), "°", 1).width(76.0).range(-85.0, 85.0),
-            ) {
-                let _ = app.run("type.char", json!({"attrs": {"skew": v}}));
-            }
-        }
-    });
-    vsep(ui);
-    ui.vertical(|ui| {
-        ui.spacing_mut().item_spacing.y = 3.0;
-        // The character style, then the language.
-        let cs = attrs.as_ref().and_then(|a| a["characterStyle"].as_str()).unwrap_or(designcraft_doc::NO_CHAR_STYLE).to_string();
-        let names: Vec<String> = app.session.active().map(|d| d.doc.styles.character.iter().map(|c| c.name.clone()).collect()).unwrap_or_default();
-        let mut pick = None;
-        egui::ComboBox::from_id_salt("ctl_char_style")
-            .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, &cs)))
-            .width(150.0)
-            .show_ui(ui, |ui| {
-                for n in &names {
-                    if ui.selectable_label(*n == cs, crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, n))).clicked() {
-                        pick = Some(n.clone());
-                    }
-                }
-            });
-        if let Some(n) = pick {
-            let _ = app.run("style.character.apply", json!({"name": n}));
-        }
-        let lang = chars["language"].as_str().unwrap_or("English: USA").to_string();
-        egui::ComboBox::from_id_salt("ctl_language").selected_text(crate::rtl::widget(ui, tr(&lang))).width(150.0).show_ui(ui, |ui| {
-            egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| crate::panels::properties::language_menu(app, ui, &lang));
-        });
-    });
-}
-
-fn control_paragraph(
-    app: &mut DesignApp,
-    ui: &mut egui::Ui,
-    attrs: &Option<serde_json::Value>,
-    para: &serde_json::Value,
-    tr: &dyn Fn(&str) -> String,
-) {
-    let cur: Align = serde_json::from_value(para["align"].clone()).unwrap_or_default();
-    let mut align = None;
-    rows(ui, |ui, row| {
-        if row == 0 {
-            for (a, icon) in [
-                (Align::Left, "palign-left"),
-                (Align::Center, "palign-center"),
-                (Align::Right, "palign-right"),
-                (Align::TowardsSpine, "palign-spine-towards"),
-            ] {
-                if icons::button(ui, icon, 20.0, cur == a, &tr(a.label())).clicked() {
-                    align = Some(a);
-                }
-            }
-        } else {
-            for (a, icon) in [
-                (Align::LeftJustified, "palign-justify-left"),
-                (Align::CenterJustified, "palign-justify-center"),
-                (Align::RightJustified, "palign-justify-right"),
-                (Align::FullyJustified, "palign-justify-all"),
-                (Align::AwayFromSpine, "palign-spine-away"),
-            ] {
-                if icons::button(ui, icon, 20.0, cur == a, &tr(a.label())).clicked() {
-                    align = Some(a);
-                }
-            }
-        }
-    });
-    if let Some(a) = align {
-        let _ = app.run("type.para", json!({"attrs": {"align": a}}));
-    }
-    vsep(ui);
-    let units = app.session.active().map(|d| d.doc.settings.horizontal_units).unwrap_or(Unit::Picas);
-    let mut set = None;
-    for ((ia, ta, ka), (ib, tb, kb)) in [
-        (("indent-left", "Left Indent", "leftIndent"), ("indent-first", "First Line Left Indent", "firstLineIndent")),
-        (("indent-right", "Right Indent", "rightIndent"), ("indent-last", "Last Line Right Indent", "lastLineIndent")),
-        (("space-before", "Space Before", "spaceBefore"), ("space-after", "Space After", "spaceAfter")),
-    ] {
-        rows(ui, |ui, row| {
-            if row == 0 {
-                if let Some(v) = icon_field(ui, ia, &tr(ta), NumField::measure(ka, para[ka].as_f64(), units).width(84.0).range(0.0, 10_000.0)) {
-                    set = Some((ka, v));
-                }
-            } else {
-                let min = crate::panels::properties::para_field_min(kb);
-                if let Some(v) = icon_field(ui, ib, &tr(tb), NumField::measure(kb, para[kb].as_f64(), units).width(84.0).range(min, 10_000.0)) {
-                    set = Some((kb, v));
-                }
-            }
-        });
-        vsep(ui);
-    }
-    if let Some((k, v)) = set {
-        let _ = app.run("type.para", json!({"attrs": {k: v}}));
-    }
-    let mut drop = None;
-    rows(ui, |ui, row| {
-        if row == 0 {
-            let max = designcraft_compose::MAX_DROP_CAP_LINES as f64;
-            if let Some(v) = icon_field(
-                ui,
-                "drop-lines",
-                &tr("Drop Cap Number of Lines"),
-                NumField::number("cdl", para["dropCapLines"].as_f64(), "", 0).width(64.0).range(0.0, max),
-            ) {
-                drop = Some(("dropCapLines", v));
-            }
-        } else {
-            let max = designcraft_compose::MAX_DROP_CAP_CHARS as f64;
-            if let Some(v) = icon_field(
-                ui,
-                "drop-chars",
-                &tr("Drop Cap One or More Characters"),
-                NumField::number("cdc", para["dropCapChars"].as_f64(), "", 0).width(64.0).range(0.0, max),
-            ) {
-                drop = Some(("dropCapChars", v));
-            }
-        }
-    });
-    if let Some((k, v)) = drop {
-        let _ = app.run("type.para", json!({"attrs": {k: v.max(0.0) as u64}}));
-    }
-    vsep(ui);
-    // Bulleted List over Numbered List, as InDesign's (a list with the default hanging indent, or,
-    // pressed, none). Pressed when every selected paragraph has it, as Type › Apply Bullets shows.
-    use designcraft_doc::ListType;
-    let pressed = [ListType::Bullets, ListType::Numbers].map(|k| app.session.selection_has_list(k));
-    let mut list = None;
-    rows(ui, |ui, row| {
-        let (icon, cmd, tip) = if row == 0 { ("bullets", "list.bullets", "Bulleted List") } else { ("numbering", "list.numbers", "Numbered List") };
-        let on = pressed.get(row).copied().unwrap_or(false);
-        if crate::widgets::icon_toggle(ui, icon, on, &tr(tip)).clicked() {
-            list = Some((cmd, !on));
-        }
-    });
-    if let Some((cmd, on)) = list {
-        let _ = app.run(cmd, json!({"on": on}));
-    }
-    vsep(ui);
-    // Shading over Border: on or off, the Paragraph Borders and Shading dialog on its tab, and the
-    // colour, as InDesign's.
-    let doc = app.session.active().map(|d| d.doc.clone());
-    let mut shade = None;
-    let mut dialog = None;
-    // Both checkboxes as wide as the wider label, so the icons and colours line up in columns.
-    let check_w = ["Shading", "Border"]
-        .iter()
-        .map(|l| ui.fonts_mut(|f| f.layout_no_wrap(tr(l), egui::FontId::proportional(11.5), Color32::WHITE).size().x))
-        .fold(0.0, f32::max)
-        + 28.0;
-    rows(ui, |ui, row| {
-        let (on_key, color_key, label, icon, tab) = if row == 0 {
-            ("shadingOn", "shadingColor", "Shading", "para-shading", "shading")
-        } else {
-            ("borderOn", "borderColor", "Border", "para-border", "border")
-        };
-        let mut on = para[on_key].as_bool().unwrap_or(false);
-        ui.allocate_ui_with_layout(vec2(check_w, crate::widgets::FIELD_H), egui::Layout::left_to_right(egui::Align::Center), |ui| {
-            ui.set_min_width(check_w);
-            if crate::widgets::checkbox(ui, &mut on, &tr(label)).changed() {
-                shade = Some(json!({ on_key: on }));
-            }
-        });
-        if crate::widgets::icon_toggle(ui, icon, false, &tr("Paragraph Borders and Shading…")).clicked() {
-            dialog = Some(tab);
-        }
-        if let Some(doc) = &doc {
-            let cur = para[color_key].as_str().unwrap_or("[Black]").to_string();
-            if let Some(w) = swatch_field(ui, doc, &cur, 96.0, &tr(if row == 0 { "Paragraph Shading" } else { "Paragraph Border" })) {
-                shade = Some(json!({ color_key: w }));
-            }
-        }
-    });
-    if let Some(attrs) = shade {
-        let _ = app.run("type.para", json!({ "attrs": attrs }));
-    }
-    if let Some(tab) = dialog {
-        let _ = app.run("app.paragraphBordersDialog", json!({ "tab": tab }));
-    }
-    vsep(ui);
-    ui.vertical(|ui| {
-        ui.spacing_mut().item_spacing.y = 3.0;
-        let ps = attrs.as_ref().and_then(|a| a["paragraphStyle"].as_str()).unwrap_or("").to_string();
-        let ov = attrs.as_ref().and_then(|a| a["paraOverrides"].as_u64()).unwrap_or(0)
-            + attrs.as_ref().and_then(|a| a["charOverrides"].as_u64()).unwrap_or(0);
-        panels::para_style_picker(app, ui, &ps, ov > 0, 170.0);
-        ui.horizontal(|ui| {
-            let mut h = para["hyphenate"].as_bool().unwrap_or(true);
-            if crate::widgets::checkbox(ui, &mut h, &tr("Hyphenate")).changed() {
-                let _ = app.run("type.para", json!({"attrs": {"hyphenate": h}}));
-            }
-            // First Line Only is aligned too: the button shows it pressed, and a click turns alignment off.
-            let grid = matches!(para["gridAlign"].as_str(), Some("allLines" | "firstLineOnly"));
-            if crate::widgets::icon_toggle(ui, "grid-baseline", grid, &tr("Align to Baseline Grid")).clicked() {
-                let _ = app.run("type.para", json!({"attrs": {"gridAlign": if grid { "none" } else { "allLines" }}}));
-            }
-        });
-    });
-}
-
-/// A swatch field of the Control panel (Shading and Border colours): the swatch's chip and name,
-/// and the document's swatches in its menu. Returns the swatch picked.
-pub(crate) fn swatch_field(ui: &mut egui::Ui, doc: &designcraft_doc::Document, cur: &str, width: f32, label: &str) -> Option<String> {
-    let t = Tokens::get(ui.ctx());
-    let (r, resp) = ui.allocate_exact_size(vec2(width, crate::widgets::FIELD_H), Sense::click());
-    let resp = resp.on_hover_text(label);
-    resp.widget_info(|| {
-        let mut info = egui::WidgetInfo::labeled(egui::WidgetType::ComboBox, true, label);
-        info.current_text_value = Some(cur.to_string());
-        info
-    });
-    let p = ui.painter();
-    p.rect_filled(r, 0.0, if resp.hovered() { t.hover } else { t.input });
-    p.rect_stroke(r, 0.0, Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
-    let seg = egui::Rect::from_min_max(egui::pos2(r.max.x - crate::widgets::SEG_W, r.min.y), r.max);
-    p.line_segment([seg.left_top(), seg.left_bottom()], Stroke::new(1.0, t.field_border));
-    icons::paint(p, egui::Rect::from_center_size(seg.center(), vec2(12.0, 12.0)), "chevron-down", t.icon);
-    let (c, g) = crate::widgets::swatch_colors(doc, cur, 1.0);
-    let chip = egui::Rect::from_min_size(egui::pos2(r.min.x + 4.0, r.center().y - 6.0), vec2(12.0, 12.0));
-    crate::widgets::paint_chip(p, chip, c, g);
-    let clip = egui::Rect::from_min_max(r.min, egui::pos2(seg.min.x - 2.0, r.max.y));
-    p.with_clip_rect(clip).text(egui::pos2(chip.max.x + 5.0, r.center().y), egui::Align2::LEFT_CENTER, cur, egui::FontId::proportional(11.5), t.text);
-    let mut picked = None;
-    egui::Popup::menu(&resp).show(|ui| {
-        picked = crate::panels::swatch_list(ui, doc, cur);
-    });
-    picked
-}
-
-/// The widest a document tab grows: a longer name is shortened so its close button and the
-/// tabs after it stay in view.
-const DOC_TAB_MAX_W: f32 = 260.0;
-/// Close button and padding around a tab's title.
-const DOC_TAB_PAD: f32 = 44.0;
-
-pub fn doc_tabs(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    let (bar, _) = ui.allocate_exact_size(vec2(ui.available_width(), 28.0), Sense::hover());
-    let max_w = DOC_TAB_MAX_W.min(bar.width());
-    let close_label = crate::i18n::tr(&app.ui.language, "Close");
-    ui.painter().rect_filled(bar, 0.0, t.tab_strip);
-    ui.painter().line_segment([bar.left_bottom(), bar.right_bottom()], Stroke::new(1.0, t.border));
-    let mut x = bar.min.x;
-    let active = app.session.active_index();
-    let zoom = app.view().map(|v| v.zoom).unwrap_or(1.0);
-    let mut activate = None;
-    let mut close = None;
-    let titles: Vec<(String, bool)> = app.session.documents().iter().map(|d| (d.title(), d.is_dirty())).collect();
-    for (i, (title, dirty)) in titles.iter().enumerate() {
-        let is_active = Some(i) == active;
-        // `*` = unsaved; the view-mode suffix only in Preview (InDesign shows its GPU mode there).
-        let suffix = if is_active && app.ui.screen_mode == crate::ScreenMode::Preview { " [Preview]" } else { "" };
-        let color = if is_active { t.text_strong } else { t.text_dim };
-        // The name gives way first; the dirty marker and zoom stay readable.
-        let zoom_label = crate::rtl::plain(ui.ctx(), &format!(" @ {:.0}%{suffix}", zoom * 100.0), semibold(11.5), color);
-        let name = format!("{}{}", if *dirty { "*" } else { "" }, crate::rtl::isolate(title));
-        let name_max = max_w - DOC_TAB_PAD - zoom_label.size().x;
-        let galley = crate::rtl::truncated(ui.ctx(), &name, semibold(11.5), color, name_max);
-        let elided = galley.elided;
-        let w = (galley.size().x + zoom_label.size().x + DOC_TAB_PAD).max(if is_active { 210.0 } else { 150.0 }).min(max_w);
-        let r = egui::Rect::from_min_size(egui::pos2(x, bar.min.y), vec2(w, 28.0));
-        let resp = ui.interact(r, ui.id().with(("doctab", i)), Sense::click());
-        resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, title));
-        let resp = if elided {
-            resp.on_hover_ui(|ui| {
-                let _ = crate::rtl::label(ui, title);
-            })
-        } else {
-            resp
-        };
-        ui.painter().rect_filled(r, 0.0, if is_active { t.panel } else { t.tab_strip });
-        let cr = egui::Rect::from_center_size(egui::pos2(r.min.x + 18.0, r.center().y), vec2(14.0, 14.0));
-        let cresp = ui.interact(cr, ui.id().with(("docclose", i)), Sense::click());
-        cresp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, format!("{close_label} {title}")));
-        ui.painter().text(
-            cr.center(),
-            egui::Align2::CENTER_CENTER,
-            "×",
-            egui::FontId::proportional(14.0),
-            if cresp.hovered() { t.text_strong } else { t.text_dim },
-        );
-        let name_w = galley.size().x;
-        // Clipped too, for a window narrower than the zoom label.
-        let text = ui.painter().with_clip_rect(r);
-        text.galley(egui::pos2(r.min.x + 32.0, r.center().y - galley.size().y / 2.0), galley, Color32::WHITE);
-        text.galley(egui::pos2(r.min.x + 32.0 + name_w, r.center().y - zoom_label.size().y / 2.0), zoom_label, Color32::WHITE);
-        ui.painter().line_segment([r.right_top(), r.right_bottom()], Stroke::new(1.0, t.border));
-        if cresp.clicked() {
-            close = Some(i);
-        } else if resp.clicked() {
-            activate = Some(i);
-        }
-        x += w;
-    }
-    if let Some(i) = close {
-        crate::menus::close_document(app, Some(i));
-    } else if let Some(i) = activate {
-        let _ = app.run("file.activate", json!({"index": i}));
-    }
-}
-
-/// Show the Preflight panel. `window.panel` toggles a panel that is already open, so it runs
-/// only when Preflight isn't showing.
-fn show_preflight(app: &mut DesignApp) {
-    if app.ui.open_panel.as_deref() != Some("preflight")
-        && let Err(e) = app.run("window.panel", json!({"panel": "preflight"}))
-    {
-        app.status(e);
-    }
-}
-
-pub fn status_bar(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    let resp = egui::Panel::bottom("status_bar")
-        .exact_size(17.0)
-        .frame(egui::Frame::NONE.fill(t.panel).inner_margin(egui::Margin::symmetric(8, 0)))
-        .show(ui, |ui| {
-            ui.spacing_mut().item_spacing.x = 4.0;
-            ui.horizontal_centered(|ui| {
-                let small = egui::FontId::proportional(10.5);
-                if app.session.active().is_none() {
-                    ui.label(egui::RichText::new(&app.ui.status).font(small).color(t.text_dim));
-                    return;
-                }
-                let z = app.view().map(|v| v.zoom).unwrap_or(1.0);
-                crate::menus::menu_button(ui, egui::RichText::new(format!("{:.2}% ▾", z * 100.0)).font(small.clone()), |ui| {
-                    for p in [0.05, 0.125, 0.25, 0.5, 0.75, 1.0, 2.0, 4.0, 8.0, 16.0] {
-                        if ui.button(format!("{}%", p * 100.0)).clicked() {
-                            let _ = app.run("view.zoom", json!({"zoom": p}));
-                            ui.close();
-                        }
-                    }
-                });
-                ui.add_space(8.0);
-                let n = app.session.active().map(|d| d.doc.page_count()).unwrap_or(1);
-                let cur = crate::canvas::current_page(app).unwrap_or(0);
-                if icons::button(ui, "first", 14.0, false, crate::i18n::tr(&app.ui.language, "First Spread")).clicked() {
-                    crate::canvas::go_to_page(app, 0);
-                }
-                if icons::button(ui, "prev", 14.0, false, crate::i18n::tr(&app.ui.language, "Previous Spread")).clicked() {
-                    crate::canvas::go_to_page(app, cur.saturating_sub(1));
-                }
-                let name = app.session.page_label(cur);
-                let (fr, fresp) = ui.allocate_exact_size(vec2(80.0, 14.0), Sense::click());
-                ui.painter().rect(fr, 0.0, t.input, Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
-                ui.painter().text(fr.left_center() + vec2(5.0, 0.0), egui::Align2::LEFT_CENTER, &name, small.clone(), t.text);
-                ui.painter().text(fr.right_center() - vec2(5.0, 0.0), egui::Align2::RIGHT_CENTER, "▾", small.clone(), t.text);
-                egui::Popup::menu(&fresp).show(|ui| {
-                    let names: Vec<String> = (0..n).map(|i| app.session.page_label(i)).collect();
-                    egui::ScrollArea::vertical().max_height(300.0).show(ui, |ui| {
-                        for (i, nm) in names.iter().enumerate() {
-                            if ui.button(nm).clicked() {
-                                crate::canvas::go_to_page(app, i);
-                                ui.close();
-                            }
-                        }
-                    });
-                });
-                if icons::button(ui, "next", 14.0, false, crate::i18n::tr(&app.ui.language, "Next Spread")).clicked() {
-                    crate::canvas::go_to_page(app, (cur + 1).min(n - 1));
-                }
-                if icons::button(ui, "last", 14.0, false, crate::i18n::tr(&app.ui.language, "Last Spread")).clicked() {
-                    crate::canvas::go_to_page(app, n - 1);
-                }
-                ui.add_space(12.0);
-                crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "[Basic] (working) ▾")).font(small.clone()));
-                ui.add_space(8.0);
-                // Preflight: overset text is an error.
-                let errors = panels::preflight_errors(app);
-                let (r, dot) = ui.allocate_exact_size(vec2(9.0, 9.0), Sense::click());
-                ui.painter().circle_filled(
-                    r.center(),
-                    4.0,
-                    if errors == 0 { Color32::from_rgb(60, 200, 90) } else { Color32::from_rgb(235, 50, 50) },
-                );
-                let count = if errors == 0 {
-                    format!("{} ▾", crate::i18n::tr(&app.ui.language, "No errors"))
-                } else {
-                    format!(
-                        "{} ▾",
-                        crate::i18n::count_label(
-                            &app.ui.language,
-                            if errors == 1 && !crate::i18n::category_first(&app.ui.language) { "error" } else { "errors" },
-                            errors
-                        )
-                    )
-                };
-                // As in InDesign, the count opens a menu that leads to the Preflight panel.
-                let menu = crate::menus::menu_button(ui, egui::RichText::new(count).font(small.clone()), |ui| {
-                    if ui.button(crate::i18n::tr(&app.ui.language, "Preflight Panel…")).clicked() {
-                        show_preflight(app);
-                        ui.close();
-                    }
-                });
-                // Double-clicking the light or the count shows the panel straight away (the
-                // second click has closed the menu the first one opened).
-                if dot.double_clicked() || menu.response.double_clicked() {
-                    show_preflight(app);
-                }
-                ui.add_space(12.0);
-                ui.label(egui::RichText::new(&app.ui.status).font(small).color(t.text_dim));
-            });
-        });
-    let r = resp.response.rect;
-    ui.painter().line_segment([r.left_top(), r.right_top()], Stroke::new(1.0, t.border));
-}
-
-pub fn start_screen(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    let r = ui.available_rect_before_wrap();
-    ui.painter().rect_filled(r, 0.0, t.panel_darker);
-    ui.scope_builder(
-        egui::UiBuilder::new().max_rect(r.shrink(48.0)).layout(egui::Layout::top_down(if crate::i18n::is_rtl(&app.ui.language) {
-            egui::Align::Max
-        } else {
-            egui::Align::Min
-        })),
-        |ui| {
-            egui::ScrollArea::vertical().auto_shrink([false, false]).show(ui, |ui| {
-                ui.label(crate::rtl::widget(
-                    ui,
-                    egui::RichText::new(crate::i18n::tr(&app.ui.language, "Welcome to DesignCraft")).font(semibold(28.0)).color(t.text_strong),
-                ));
-                ui.label(crate::rtl::widget(
-                    ui,
-                    egui::RichText::new(crate::i18n::tr(&app.ui.language, "Page layout for print and screen — fast, open and scriptable."))
-                        .size(15.0)
-                        .color(t.text_dim),
-                ));
-                ui.add_space(24.0);
-                ui.horizontal(|ui| {
-                    if ui
-                        .add(
-                            egui::Button::new(crate::rtl::widget(
-                                ui,
-                                egui::RichText::new(crate::i18n::tr(&app.ui.language, "  New file  ")).size(14.0).color(Color32::WHITE),
-                            ))
-                            .fill(t.accent_strong)
-                            .corner_radius(16.0)
-                            .min_size(vec2(0.0, 32.0)),
-                        )
-                        .clicked()
-                    {
-                        let _ = app.run("app.newDocumentDialog", json!({}));
-                    }
-                    if ui
-                        .add(
-                            egui::Button::new(crate::rtl::widget(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "  Open  ")).size(14.0)))
-                                .corner_radius(16.0)
-                                .min_size(vec2(0.0, 32.0)),
-                        )
-                        .clicked()
-                    {
-                        let _ = app.run("app.openDialog", json!({}));
-                    }
-                    if ui
-                        .add(
-                            egui::Button::new(crate::rtl::widget(
-                                ui,
-                                egui::RichText::new(crate::i18n::tr(&app.ui.language, "  Open sample magazine  ")).size(14.0),
-                            ))
-                            .corner_radius(16.0)
-                            .min_size(vec2(0.0, 32.0)),
-                        )
-                        .clicked()
-                    {
-                        let _ = app.run("file.newSample", json!({}));
-                    }
-                });
-                ui.add_space(20.0);
-                community_card(app, ui);
-                recent_files(app, ui);
-                ui.add_space(24.0);
-                ui.label(crate::rtl::widget(
-                    ui,
-                    egui::RichText::new(crate::i18n::tr(&app.ui.language, "Start a new document")).font(semibold(15.0)).color(t.text_strong),
-                ));
-                ui.add_space(8.0);
-                ui.horizontal_wrapped(|ui| {
-                    for p in designcraft_doc::build::PRESETS.iter().filter(|p| p.intent == designcraft_doc::Intent::Print) {
-                        let (cr, resp) = ui.allocate_exact_size(vec2(120.0, 150.0), Sense::click());
-                        let hov = resp.hovered();
-                        ui.painter().rect_filled(cr, 6.0, if hov { t.hover } else { t.panel });
-                        let k = (80.0 / p.width.max(p.height)) as f32;
-                        let pr = egui::Rect::from_center_size(cr.center() - vec2(0.0, 14.0), vec2(p.width as f32 * k, p.height as f32 * k));
-                        ui.painter().rect_filled(pr, 0.0, Color32::from_gray(245));
-                        ui.painter().text(
-                            egui::pos2(cr.center().x, cr.max.y - 26.0),
-                            egui::Align2::CENTER_CENTER,
-                            p.name,
-                            semibold(12.0),
-                            t.text_strong,
-                        );
-                        ui.painter().text(
-                            egui::pos2(cr.center().x, cr.max.y - 11.0),
-                            egui::Align2::CENTER_CENTER,
-                            format!(
-                                "{} × {}",
-                                designcraft_geom::format_measure(p.width, p.units),
-                                designcraft_geom::format_measure(p.height, p.units)
-                            ),
-                            egui::FontId::proportional(10.0),
-                            t.text_dim,
-                        );
-                        if resp.clicked() {
-                            let _ = app.run("file.new", json!({"preset": p.name}));
-                        }
-                    }
-                });
-            });
-        },
-    );
-    let _ = Content::Unassigned;
-}
-
-/// Recent files shown on the start screen (File › Open Recent has them all).
-const START_SCREEN_RECENT: usize = 8;
-
-/// Start screen: the most recent files as cards with the first page's picture (saved in the file)
-/// and the name; the full path is the tooltip. A file that is gone is dimmed and says so when
-/// clicked. Nothing when the list is empty.
-fn recent_files(app: &mut DesignApp, ui: &mut egui::Ui) {
-    if app.session.prefs.recent_files.is_empty() {
-        return;
-    }
-    let t = Tokens::get(ui.ctx());
-    ui.add_space(24.0);
-    ui.label(crate::rtl::widget(
-        ui,
-        egui::RichText::new(crate::i18n::tr(&app.ui.language, "Recent files")).font(semibold(15.0)).color(t.text_strong),
-    ));
-    ui.add_space(8.0);
-    let rows: Vec<(usize, String)> = app.session.prefs.recent_files.iter().take(START_SCREEN_RECENT).cloned().enumerate().collect();
-    let mut open = None;
-    ui.horizontal_wrapped(|ui| {
-        for (i, path) in rows {
-            let stat = recent_file_stat(ui.ctx(), &path);
-            let there = stat.exists;
-            let modified = there.then_some(stat.modified);
-            let (cr, resp) = ui.allocate_exact_size(vec2(140.0, 170.0), Sense::click());
-            let resp = resp.on_hover_text(&path);
-            ui.painter().rect_filled(cr, 6.0, if resp.hovered() { t.hover } else { t.panel });
-            let area = egui::Rect::from_min_size(cr.min + vec2(20.0, 12.0), vec2(100.0, 108.0));
-            match modified.and_then(|m| recent_preview_texture(ui.ctx(), &path, m)) {
-                Some(tex) => {
-                    let size = tex.size_vec2();
-                    let k = (area.width() / size.x).min(area.height() / size.y);
-                    let pr = egui::Rect::from_center_size(area.center(), size * k);
-                    ui.painter().image(tex.id(), pr, egui::Rect::from_min_max(egui::pos2(0.0, 0.0), egui::pos2(1.0, 1.0)), Color32::WHITE);
-                    ui.painter().rect_stroke(pr, 0.0, Stroke::new(1.0, t.border), egui::StrokeKind::Outside);
-                }
-                // No picture (saved before files had one) or the file is gone: a blank page.
-                None => {
-                    let pr = egui::Rect::from_center_size(area.center(), vec2(62.0, 80.0));
-                    ui.painter().rect_filled(pr, 0.0, if there { Color32::from_gray(245) } else { Color32::from_gray(110) });
-                }
-            }
-            let color = if there { t.text_strong } else { t.text_dim };
-            // The name without `.designcraft`, on up to two lines (broken after a space or dash).
-            let label = crate::menus::recent_label(&path);
-            let name = label.strip_suffix(".designcraft").unwrap_or(&label).to_string();
-            let mut job = egui::text::LayoutJob::simple(name, semibold(12.0), color, cr.width() - 12.0);
-            job.wrap.max_rows = 2;
-            job.halign = egui::Align::Center;
-            let galley = ui.painter().layout_job(job);
-            ui.painter().galley(egui::pos2(cr.center().x, area.max.y + 8.0), galley, color);
-            if resp.clicked() {
-                open = Some(i);
-            }
-        }
-    });
-    if let Some(i) = open {
-        let _ = app.run("app.openRecent", json!({"index": i}));
-    }
-}
-
-/// How often a recent file is looked up on disk again, in ms: the start screen and the Open Recent
-/// menu draw every frame and must not touch the file system each time.
-const RECENT_STAT_MS: f64 = 3000.0;
-
-/// A recent file as last seen on disk.
-#[derive(Clone, Debug, PartialEq)]
-pub(crate) struct RecentStat {
-    pub exists: bool,
-    pub modified: Option<std::time::SystemTime>,
-    checked: f64,
-}
-
-/// Whether recent file `path` is there and when it last changed, looked up again at most every
-/// [`RECENT_STAT_MS`].
-pub(crate) fn recent_file_stat(ctx: &egui::Context, path: &str) -> RecentStat {
-    recent_file_stat_at(ctx, path, crate::now_ms())
-}
-
-fn recent_file_stat_at(ctx: &egui::Context, path: &str, now: f64) -> RecentStat {
-    let key = egui::Id::new(("recent_stat", path));
-    if let Some(st) = ctx.data(|d| d.get_temp::<RecentStat>(key))
-        && (0.0..RECENT_STAT_MS).contains(&(now - st.checked))
-    {
-        return st;
-    }
-    let meta = designcraft_engine::io::metadata(path).ok().filter(designcraft_engine::io::Metadata::is_file);
-    let st = RecentStat { exists: meta.is_some(), modified: meta.and_then(|m| m.modified().ok()), checked: now };
-    ctx.data_mut(|d| d.insert_temp(key, st.clone()));
-    st
-}
-
-/// The texture of a recent file's saved first-page picture, decoded once per file version.
-fn recent_preview_texture(ctx: &egui::Context, path: &str, modified: Option<std::time::SystemTime>) -> Option<egui::TextureHandle> {
-    type Cached = (Option<std::time::SystemTime>, Option<egui::TextureHandle>);
-    let key = egui::Id::new(("recent_preview", path));
-    if let Some((m, tex)) = ctx.data(|d| d.get_temp::<Cached>(key))
-        && m == modified
-    {
-        return tex;
-    }
-    let tex = designcraft_engine::cmd::recent_preview(path).and_then(|p| {
-        let size = [usize::try_from(p.width).ok()?, usize::try_from(p.height).ok()?];
-        (size[0].checked_mul(size[1])?.checked_mul(4)? == p.rgba.len()).then(|| {
-            ctx.load_texture(format!("recent_preview:{path}"), egui::ColorImage::from_rgba_unmultiplied(size, &p.rgba), egui::TextureOptions::LINEAR)
-        })
-    });
-    ctx.data_mut(|d| d.insert_temp::<Cached>(key, (modified, tex.clone())));
-    tex
-}
-
-/// Start screen: the ArtCraft community (Discord first) and project links.
-fn community_card(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    egui::Frame::NONE.fill(t.panel).corner_radius(10.0).inner_margin(egui::Margin::same(14)).show(ui, |ui| {
-        // Wide enough for the longer translations of the line under the title, with the button
-        // at the right edge; the text wraps before the button's space rather than run under it.
-        const BUTTON: egui::Vec2 = vec2(190.0, 38.0);
-        ui.set_max_width(760.0);
-        ui.horizontal(|ui| {
-            let (r, _) = ui.allocate_exact_size(vec2(44.0, 44.0), Sense::hover());
-            crate::about::paint_mark(ui, r, crate::about::BRAND);
-            ui.add_space(8.0);
-            let label = crate::i18n::tr(&app.ui.language, "Join our Discord");
-            let button = crate::about::discord_button_size(ui.ctx(), label, BUTTON);
-            let text_width = (ui.available_width() - button.x - 16.0).max(120.0);
-            ui.vertical(|ui| {
-                ui.set_max_width(text_width);
-                ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Wrap);
-                ui.label(crate::rtl::widget(
-                    ui,
-                    egui::RichText::new(crate::i18n::tr(&app.ui.language, "Join the ArtCraft community")).font(semibold(14.0)).color(t.text_strong),
-                ));
-                ui.label(crate::rtl::widget(
-                    ui,
-                    egui::RichText::new(crate::i18n::tr(&app.ui.language, "Get help, share your layouts and shape what we build next."))
-                        .size(12.0)
-                        .color(t.text_dim),
-                ));
-                ui.add_space(4.0);
-                ui.horizontal(|ui| {
-                    for (text, id) in [("DesignCraft page", "help.appPage"), ("GitHub", "help.github"), ("getartcraft.com", "help.website")] {
-                        let url = designcraft_engine::links::get(&id[5..]).unwrap_or_default();
-                        let l = ui
-                            .add(egui::Label::new(egui::RichText::new(text).size(12.0).color(t.accent).underline()).sense(Sense::click()))
-                            .on_hover_text(url)
-                            .on_hover_cursor(egui::CursorIcon::PointingHand);
-                        if l.clicked() {
-                            let _ = app.run(id, json!({}));
-                        }
-                        ui.add_space(8.0);
-                    }
-                });
-            });
-            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                if crate::about::discord_button(ui, label, BUTTON) {
-                    let _ = app.run("help.discord", json!({}));
-                }
-            });
-        });
-    });
-}
-
 #[cfg(test)]
-mod tests {
-
-    /// A Control panel field is labelled by its icon, so assistive technology reads "Tracking"
-    /// (or "Font Size", …) with the value.
-    #[test]
-    fn icon_fields_are_labelled_by_their_icon() {
-        use egui::accesskit::Role;
-        let ctx = egui::Context::default();
-        crate::theme::install_fonts(&ctx, "en");
-        ctx.enable_accesskit();
-        let mut update = None;
-        for _ in 0..2 {
-            let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
-                icon_field(ui, "tracking", "Tracking", NumField::number("tracking_test", Some(0.0), "", 0));
-            });
-            out.textures_delta.clear();
-            update = out.platform_output.accesskit_update;
-        }
-        let update = update.expect("an AccessKit tree");
-        let named = |n: &egui::accesskit::Node| n.label() == Some("Tracking") || n.value() == Some("Tracking");
-        let icon = update.nodes.iter().find(|(_, n)| named(n)).map(|(id, _)| *id).expect("the icon's node");
-        assert!(update.nodes.iter().any(|(_, n)| n.role() == Role::TextInput && n.labelled_by().contains(&icon)), "the editor names its icon");
-    }
-    use egui::{pos2, vec2};
-    use egui_kittest::kittest::{NodeT, Queryable};
-
-    use super::*;
-    use crate::test_window::{self, wheel};
-
-    /// The Control panel's last control with no text frame selected.
-    const LAST_CONTROL: &str = "Align bottom edges";
-    const FIRST_CONTROL: &str = "Rotate 90° Counterclockwise";
-
-    /// The start screen and Open Recent menu look a recent file up on disk at most every few
-    /// seconds, not every frame.
-    #[test]
-    fn recent_files_are_looked_up_on_disk_every_few_seconds() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("a.designcraft");
-        std::fs::write(&path, b"x").unwrap();
-        let path = path.to_string_lossy().to_string();
-        let ctx = egui::Context::default();
-        let first = super::recent_file_stat_at(&ctx, &path, 10_000.0);
-        assert!(first.exists && first.modified.is_some());
-        std::fs::remove_file(&path).unwrap();
-        assert_eq!(super::recent_file_stat_at(&ctx, &path, 10_000.0 + super::RECENT_STAT_MS - 1.0), first, "cached");
-        assert!(!super::recent_file_stat_at(&ctx, &path, 10_000.0 + super::RECENT_STAT_MS).exists, "looked up again");
-    }
-
-    fn app() -> crate::DesignApp {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.ui.control_bar = true;
-        app
-    }
-
-    /// A document with a rectangle selected, so the object controls are enabled.
-    fn app_with_selection() -> crate::DesignApp {
-        let mut app = app();
-        app.run("file.new", serde_json::json!({})).unwrap();
-        app.run("frame.create", serde_json::json!({"rect": [72, 72, 300, 200]})).unwrap();
-        app.run("edit.selectAll", serde_json::json!({})).unwrap();
-        app
-    }
-
-    /// The rect of an object Control panel group.
-    fn group(h: &egui_kittest::Harness<'static, test_window::Window>, id: &str) -> egui::Rect {
-        h.ctx.read_response(egui::Id::new(("object_control", id))).unwrap().rect
-    }
-
-    /// The rect of the node with this label, preferring the one in the Control bar's row: the
-    /// Properties panel has buttons with the same names.
-    fn rect(h: &egui_kittest::Harness<'static, test_window::Window>, label: &str) -> egui::Rect {
-        let bar = test_window::panel_rect(h, "control_bar");
-        h.query_all_by_label(label).map(|n| n.rect()).find(|r| bar.y_range().contains(r.center().y)).unwrap_or_else(|| h.get_by_label(label).rect())
-    }
-
-    /// The application bar's search field (German interface).
-    fn search_node<'h>(h: &'h egui_kittest::Harness<'static, test_window::Window>) -> egui_kittest::Node<'h> {
-        h.get_by(|n| n.role() == egui::accesskit::Role::TextInput && n.placeholder() == Some(crate::i18n::tr("de", "Search")))
-    }
-
-    /// A document with two frames, the Selection tool, German menus, and the search field clicked.
-    fn searching() -> egui_kittest::Harness<'static, test_window::Window> {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.ui.language = "de".into();
-        let mut h = test_window::open(app, vec2(1440.0, 900.0));
-        let app = &mut h.state_mut().app;
-        app.run("frame.create", serde_json::json!({"rect": [36, 36, 200, 200]})).unwrap();
-        app.run("frame.create", serde_json::json!({"rect": [236, 36, 400, 200]})).unwrap();
-        app.run("edit.deselectAll", serde_json::json!({})).unwrap();
-        h.run_steps(4);
-        let field = search_node(&h).rect();
-        test_window::click_at(&mut h, field.center());
-        assert!(h.ctx.memory(|m| m.has_focus(super::search_id())), "a click gives the field the keyboard");
-        h
-    }
-
-    /// A match in the search's list, whose accessible label ends in its shortcut.
-    fn row<'h>(h: &'h egui_kittest::Harness<'static, test_window::Window>, label: &'static str) -> Option<egui_kittest::Node<'h>> {
-        h.query_by(move |n| n.label().is_some_and(|l| l == label || l.starts_with(&format!("{label} "))))
-    }
-
-    fn items(h: &egui_kittest::Harness<'static, test_window::Window>) -> (usize, usize) {
-        let d = h.state().app.session.active().unwrap();
-        (d.doc.spreads.iter().flat_map(|sp| &sp.items).count(), d.selection.items.len())
-    }
-
-    #[test]
-    fn the_search_field_finds_and_runs_menu_commands() {
-        let mut h = searching();
-        let group = crate::i18n::tr("de", "Group");
-        h.event(egui::Event::Text(group.to_lowercase()));
-        h.run_steps(4);
-        assert!(row(&h, group).is_some(), "the German label is listed");
-        // Nothing is selected, so Group is off and Return doesn't run it.
-        assert!(row(&h, group).is_some_and(|n| n.accesskit_node().is_disabled()));
-        h.key_press(egui::Key::Enter);
-        h.run_steps(4);
-        assert_eq!(items(&h), (2, 0), "a disabled command doesn't run");
-        // Select both frames, then ↓ ↑ Return runs the first match, as Object › Group would.
-        h.state_mut().app.run("edit.selectAll", serde_json::json!({})).unwrap();
-        h.key_press(egui::Key::ArrowDown);
-        h.run_steps(2);
-        h.key_press(egui::Key::ArrowUp);
-        h.run_steps(2);
-        h.key_press(egui::Key::Enter);
-        h.run_steps(4);
-        assert_eq!(items(&h).0, 1, "the two frames are grouped");
-        assert!(row(&h, group).is_none(), "the matches closed");
-        assert!(!h.ctx.memory(|m| m.has_focus(super::search_id())), "the field gave the keyboard back");
-    }
-
-    #[test]
-    fn keys_typed_in_the_search_field_stay_out_of_the_document() {
-        let mut h = searching();
-        h.state_mut().app.run("edit.selectAll", serde_json::json!({})).unwrap();
-        // Escape would switch this tool back to the Selection tool.
-        h.state_mut().app.run("tool.select", serde_json::json!({"tool": "rectangleFrame"})).unwrap();
-        h.run_steps(2);
-        // Tool keys, Delete and Backspace edit the query; the tool and the frames stay.
-        for key in [egui::Key::P, egui::Key::T, egui::Key::M, egui::Key::Delete, egui::Key::Backspace] {
-            h.key_press(key);
-            h.run_steps(2);
-        }
-        h.key_press_modifiers(egui::Modifiers::COMMAND, egui::Key::A);
-        h.run_steps(2);
-        assert_eq!(h.state().app.session.tool_id(), "rectangleFrame");
-        assert_eq!(items(&h), (2, 2), "nothing was deleted or deselected");
-        h.event(egui::Event::Text("zz-no-such-command".into()));
-        h.run_steps(4);
-        assert!(h.query_by_label(crate::i18n::tr("de", "No matching commands")).is_some());
-        // Escape closes the matches and clears the field without touching the document.
-        h.key_press(egui::Key::Escape);
-        h.run_steps(4);
-        assert!(h.query_by_label(crate::i18n::tr("de", "No matching commands")).is_none());
-        assert!(!h.ctx.text_edit_focused());
-        assert_eq!(h.state().app.session.tool_id(), "rectangleFrame");
-        assert_eq!(items(&h), (2, 2));
-        let field = search_node(&h);
-        assert_eq!(field.value().unwrap_or_default(), "", "the query is cleared");
-    }
-
-    /// The status bar's preflight count is a menu; its Preflight Panel entry shows the panel.
-    #[test]
-    fn status_bar_error_count_opens_the_preflight_panel() {
-        let mut app = app();
-        app.run("file.new", serde_json::json!({})).unwrap();
-        app.ui.dock_tab = "properties".into();
-        let mut h = test_window::open(app, vec2(1200.0, 700.0));
-        h.get_by_label("No errors ▾").click();
-        h.run_steps(3);
-        h.get_by_label("Preflight Panel…").click();
-        h.run_steps(3);
-        // Preflight is not a dock tab: `window.panel` shows it as its own panel.
-        assert_eq!(h.state().app.ui.open_panel.as_deref(), Some("preflight"));
-        h.get_by_label("Preflight");
-        // With the panel already showing, the entry keeps it open.
-        h.get_by_label("No errors ▾").click();
-        h.run_steps(3);
-        h.get_by_label("Preflight Panel…").click();
-        h.run_steps(3);
-        assert_eq!(h.state().app.ui.open_panel.as_deref(), Some("preflight"));
-    }
-
-    /// As in InDesign, double-clicking the preflight count (or its light) shows the panel.
-    #[test]
-    fn double_clicking_the_status_bar_error_count_opens_the_preflight_panel() {
-        let mut app = app();
-        app.run("file.new", serde_json::json!({})).unwrap();
-        app.ui.dock_tab = "properties".into();
-        let mut h = test_window::open_stepped(app, vec2(1200.0, 700.0), 1.0, 1.0 / 60.0);
-        let count = h.get_by_label("No errors ▾");
-        count.click();
-        count.click();
-        h.run_steps(3);
-        assert_eq!(h.state().app.ui.open_panel.as_deref(), Some("preflight"));
-        h.get_by_label("Preflight");
-        assert!(h.query_by_label("Preflight Panel…").is_none(), "the menu isn't left open");
-        // A double-click with the panel already showing keeps it open.
-        let count = h.get_by_label("No errors ▾");
-        count.click();
-        count.click();
-        h.run_steps(3);
-        assert_eq!(h.state().app.ui.open_panel.as_deref(), Some("preflight"));
-    }
-
-    /// A very long document name made its tab grow past the window, hiding the close button
-    /// and the tabs after it (#603).
-    #[test]
-    fn long_document_names_keep_tabs_short_and_close_buttons_visible() {
-        let latin = "Quarterly report with a very long file name ".repeat(6);
-        let hebrew = "דוח רבעוני עם שם קובץ ארוך מאוד ".repeat(6);
-        let mut app = app();
-        for title in [latin.as_str(), hebrew.as_str(), "Short"] {
-            app.run("file.new", serde_json::json!({ "title": title })).unwrap();
-        }
-        let h = test_window::open(app, vec2(1200.0, 600.0));
-        for title in [latin.as_str(), hebrew.as_str()] {
-            let tab = rect(&h, title);
-            assert!(tab.width() <= super::DOC_TAB_MAX_W, "{title:?} tab is {} wide", tab.width());
-            let close = rect(&h, &format!("Close {title}"));
-            assert!(tab.contains_rect(close), "close button {close:?} outside its tab {tab:?}");
-        }
-        let (first, short) = (rect(&h, &latin), rect(&h, "Short"));
-        assert!(short.min.x - first.min.x <= 2.0 * super::DOC_TAB_MAX_W, "the last tab {short:?} starts too far right");
-    }
-
-    /// Zero2Graphic's page layout video (0:48): with the Type tool, the Control panel's font size
-    /// has a list of sizes; the instructor picks 72 pt from it. Leading has the same list.
-    #[test]
-    fn the_type_control_panel_lists_font_sizes_and_leadings() {
-        let mut app = app();
-        app.run("file.new", serde_json::json!({})).unwrap();
-        let f = app.run("frame.create", serde_json::json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Headline"})).unwrap();
-        app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 8})).unwrap();
-        app.session.set_tool("type");
-        let mut h = test_window::open(app, vec2(1800.0, 700.0));
-        let bar = test_window::panel_rect(&h, "control_bar");
-        let in_bar = |r: &egui::Rect| bar.y_range().contains(r.center().y);
-        let field = |h: &egui_kittest::Harness<'static, test_window::Window>, value: &str| {
-            h.query_all_by_value(value).map(|n| n.rect()).find(in_bar).unwrap_or_else(|| panic!("no {value:?} field in the Control panel"))
-        };
-        let press = |h: &mut egui_kittest::Harness<'static, test_window::Window>, p: egui::Pos2| {
-            h.hover_at(p);
-            h.drag_at(p);
-            h.drop_at(p);
-        };
-        let size_of = |h: &egui_kittest::Harness<'static, test_window::Window>| {
-            let st = h.state().app.session.doc().unwrap();
-            let sid = designcraft_doc::StoryId(f["story"].as_u64().unwrap());
-            st.doc.story(sid).unwrap().format_after(0).over.size
-        };
-        // The ⌄ segment right of the size field opens the list; choosing 72 pt sets the size.
-        let size = field(&h, "12 pt");
-        let chevron = pos2(size.max.x + 1.0 + crate::widgets::SEG_W / 2.0, size.center().y);
-        press(&mut h, chevron);
-        h.run_steps(3);
-        h.get_by_label("72 pt").click();
-        h.run_steps(3);
-        assert_eq!(size_of(&h), Some(72.0));
-        // Auto leading shows in parentheses, with the same list beside it.
-        let lead = field(&h, "(86.4 pt)");
-        press(&mut h, pos2(lead.max.x + 1.0 + crate::widgets::SEG_W / 2.0, lead.center().y));
-        h.run_steps(3);
-        h.get_by_label("60 pt").click();
-        h.run_steps(3);
-        let st = h.state().app.session.doc().unwrap();
-        let sid = designcraft_doc::StoryId(f["story"].as_u64().unwrap());
-        assert_eq!(st.doc.story(sid).unwrap().format_after(0).over.leading, Some(designcraft_doc::Leading::Points(60.0)));
-        // The spinner left of the size steps it by a point.
-        let size = field(&h, "72 pt");
-        press(&mut h, pos2(size.min.x - 5.0 - crate::widgets::SEG_W / 2.0, size.min.y + 3.0));
-        h.run_steps(3);
-        assert_eq!(size_of(&h), Some(73.0));
-        // Typing the automatic value itself over "(87.6 pt)" fixes the leading at it.
-        h.state_mut().app.run("type.char", serde_json::json!({"attrs": {"leading": {"kind": "auto"}}})).unwrap();
-        h.run_steps(3);
-        let lead = field(&h, "(87.6 pt)");
-        press(&mut h, lead.center());
-        h.run_steps(2);
-        h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
-        h.event(egui::Event::Text("87.6".into()));
-        h.key_press(egui::Key::Enter);
-        h.run_steps(3);
-        let st = h.state().app.session.doc().unwrap();
-        let sid = designcraft_doc::StoryId(f["story"].as_u64().unwrap());
-        assert_eq!(st.doc.story(sid).unwrap().format_after(0).over.leading, Some(designcraft_doc::Leading::Points(87.6)));
-        // Escape cancels: the same typing, then Escape, leaves the leading automatic.
-        h.state_mut().app.run("type.char", serde_json::json!({"attrs": {"leading": {"kind": "auto"}}})).unwrap();
-        h.run_steps(3);
-        let auto = h.state().app.session.doc().unwrap().doc.story(sid).unwrap().format_after(0).over.leading;
-        let lead = field(&h, "(87.6 pt)");
-        press(&mut h, lead.center());
-        h.run_steps(2);
-        h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
-        h.event(egui::Event::Text("87.6".into()));
-        h.key_press(egui::Key::Escape);
-        h.run_steps(3);
-        assert_eq!(h.state().app.session.doc().unwrap().doc.story(sid).unwrap().format_after(0).over.leading, auto, "Escape leaves it automatic");
-        // Escape also reverts a different number, in the leading field and in a plain one. (It
-        // leaves the text too, so each try selects it again.)
-        for (shown, typed) in [("(87.6 pt)", "20"), ("73 pt", "50")] {
-            h.state_mut().app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 8})).unwrap();
-            h.state_mut().app.session.set_tool("type");
-            h.run_steps(3);
-            let r = field(&h, shown);
-            press(&mut h, r.center());
-            h.run_steps(2);
-            h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
-            h.event(egui::Event::Text(typed.into()));
-            h.key_press(egui::Key::Escape);
-            h.run_steps(3);
-        }
-        assert_eq!(h.state().app.session.doc().unwrap().doc.story(sid).unwrap().format_after(0).over.leading, auto, "still automatic");
-        assert_eq!(size_of(&h), Some(73.0), "the size is unchanged");
-    }
-
-    /// The Control panel's ¶ mode on a First Line Only paragraph: Align to Baseline Grid shows
-    /// pressed, and a click turns alignment off instead of making it All Lines.
-    #[test]
-    fn the_control_panel_grid_button_keeps_first_line_only() {
-        use egui_kittest::kittest::{NodeT, Queryable};
-        let mut app = app();
-        app.run("file.new", serde_json::json!({})).unwrap();
-        let f = app.run("frame.create", serde_json::json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Bulbs"})).unwrap();
-        app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 5})).unwrap();
-        app.run("type.para", serde_json::json!({"attrs": {"gridAlign": "firstLineOnly"}})).unwrap();
-        app.session.set_tool("type");
-        let mut h = test_window::open(app, vec2(2400.0, 700.0));
-        let bar = test_window::panel_rect(&h, "control_bar");
-        let in_bar = move |r: egui::Rect| bar.y_range().contains(r.center().y);
-        let click = |h: &mut egui_kittest::Harness<'static, test_window::Window>, label: &str| {
-            let r = h.query_all_by_label(label).map(|n| n.rect()).find(|r| in_bar(*r)).unwrap_or_else(|| panic!("no {label:?} in the Control panel"));
-            h.hover_at(r.center());
-            h.drag_at(r.center());
-            h.drop_at(r.center());
-            h.run_steps(3);
-        };
-        click(&mut h, "Paragraph Formatting Controls");
-        let pressed = h.query_all_by_label("Align to Baseline Grid").find(|n| in_bar(n.rect())).map(|n| n.accesskit_node().toggled());
-        assert_eq!(pressed, Some(Some(egui::accesskit::Toggled::True)));
-        assert_eq!(crate::panels::text_attrs(&mut h.state_mut().app).unwrap()["para"]["gridAlign"], "firstLineOnly");
-        click(&mut h, "Align to Baseline Grid");
-        assert_eq!(crate::panels::text_attrs(&mut h.state_mut().app).unwrap()["para"]["gridAlign"], "none");
-    }
-
-    /// The course's chapter 16: the text Control panel has InDesign's two modes. A shows the
-    /// Character Formatting Controls (the case buttons, kerning and tracking, the scales…), ¶ the
-    /// Paragraph Formatting Controls (alignment, indents, spacing, the drop cap…).
-    #[test]
-    fn the_type_control_panel_has_character_and_paragraph_modes() {
-        let mut app = app();
-        app.run("file.new", serde_json::json!({})).unwrap();
-        let f = app.run("frame.create", serde_json::json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Bulbs"})).unwrap();
-        app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 5})).unwrap();
-        app.session.set_tool("type");
-        let mut h = test_window::open(app, vec2(2400.0, 700.0));
-        let bar = test_window::panel_rect(&h, "control_bar");
-        let in_bar = move |r: egui::Rect| bar.y_range().contains(r.center().y);
-        let click = |h: &mut egui_kittest::Harness<'static, test_window::Window>, label: &str| {
-            let r = h.query_all_by_label(label).map(|n| n.rect()).find(|r| in_bar(*r)).unwrap_or_else(|| panic!("no {label:?} in the Control panel"));
-            h.hover_at(r.center());
-            h.drag_at(r.center());
-            h.drop_at(r.center());
-            h.run_steps(3);
-        };
-        let has = |h: &egui_kittest::Harness<'static, test_window::Window>, label: &str| h.query_all_by_label(label).any(|n| in_bar(n.rect()));
-        assert!(has(&h, "Small Caps") && has(&h, "Vertical Scale") && !has(&h, "Drop Cap Number of Lines"));
-        click(&mut h, "Small Caps");
-        click(&mut h, "Paragraph Formatting Controls");
-        assert!(has(&h, "Drop Cap Number of Lines") && has(&h, "Space Before") && !has(&h, "Small Caps"));
-        click(&mut h, "Align to Baseline Grid");
-        click(&mut h, "Align center");
-        let a = crate::panels::text_attrs(&mut h.state_mut().app).unwrap();
-        assert_eq!(a["chars"]["capitalization"], "smallCaps");
-        assert_eq!(a["para"]["gridAlign"], "allLines");
-        assert_eq!(a["para"]["align"], "center");
-        click(&mut h, "Character Formatting Controls");
-        assert!(has(&h, "Small Caps"));
-    }
-
-    /// The course's chapter 21: the ¶ Control panel has InDesign's Bulleted and Numbered List
-    /// buttons (with the default hanging indent), and Shading and Border with their colours and
-    /// the Paragraph Borders and Shading dialog.
-    #[test]
-    fn the_paragraph_control_panel_has_lists_shading_and_border() {
-        let mut app = app();
-        app.run("file.new", serde_json::json!({})).unwrap();
-        let f = app
-            .run(
-                "frame.create",
-                serde_json::json!({"rect": [72, 72, 400, 300], "content": "text", "text": "4 eggs
-1 cup milk"}),
-            )
-            .unwrap();
-        app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 15})).unwrap();
-        app.session.set_tool("type");
-        let mut h = test_window::open(app, vec2(2400.0, 700.0));
-        let bar = test_window::panel_rect(&h, "control_bar");
-        let in_bar = move |r: egui::Rect| bar.y_range().contains(r.center().y);
-        let click = |h: &mut egui_kittest::Harness<'static, test_window::Window>, label: &str, nth: usize| {
-            let r = h
-                .query_all_by_label(label)
-                .map(|n| n.rect())
-                .filter(|r| in_bar(*r))
-                .nth(nth)
-                .unwrap_or_else(|| panic!("no {label:?} in the Control panel"));
-            h.hover_at(r.center());
-            h.drag_at(r.center());
-            h.drop_at(r.center());
-            h.run_steps(3);
-        };
-        click(&mut h, "Paragraph Formatting Controls", 0);
-        click(&mut h, "Bulleted List", 0);
-        let a = crate::panels::text_attrs(&mut h.state_mut().app).unwrap();
-        assert_eq!(
-            (a["para"]["listType"].as_str(), a["para"]["leftIndent"].as_f64(), a["para"]["firstLineIndent"].as_f64()),
-            (Some("bullets"), Some(18.0), Some(-18.0))
-        );
-        click(&mut h, "Numbered List", 0);
-        assert_eq!(crate::panels::text_attrs(&mut h.state_mut().app).unwrap()["para"]["listType"], "numbers");
-        click(&mut h, "Shading", 0);
-        click(&mut h, "Border", 0);
-        let a = crate::panels::text_attrs(&mut h.state_mut().app).unwrap();
-        assert_eq!((a["para"]["shadingOn"].as_bool(), a["para"]["borderOn"].as_bool()), (Some(true), Some(true)));
-        assert!(h.query_all_by_label("Paragraph Shading").any(|n| in_bar(n.rect())), "the shading colour");
-        // The icon beside Border opens the dialog on its Border tab.
-        click(&mut h, "Paragraph Borders and Shading…", 1);
-        let d = h.state().app.ui.dialog.clone().expect("the dialog");
-        assert_eq!((d.id.as_str(), d.s("section").as_str()), ("paragraphLocal", "border"));
-        // The Last Line Right Indent takes a negative value, as the First Line Left Indent does.
-        h.state_mut().app.ui.dialog = None;
-        h.state_mut().app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 15})).unwrap();
-        h.state_mut().app.session.set_tool("type");
-        h.run_steps(3);
-        // The field is labelled by its icon.
-        let at = h
-            .query_all_by_label("Last Line Right Indent")
-            .filter(|n| n.accesskit_node().role() == egui::accesskit::Role::TextInput)
-            .map(|n| n.rect())
-            .find(|r| in_bar(*r))
-            .expect("the last line indent")
-            .center();
-        h.hover_at(at);
-        h.drag_at(at);
-        h.drop_at(at);
-        h.run_steps(2);
-        h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
-        h.event(egui::Event::Text("-0p6".into()));
-        h.key_press(egui::Key::Enter);
-        h.run_steps(3);
-        assert_eq!(crate::panels::text_attrs(&mut h.state_mut().app).unwrap()["para"]["lastLineIndent"].as_f64(), Some(-6.0));
-    }
-
-    #[test]
-    fn the_page_tool_has_its_own_control_panel() {
-        // Chris Cicchino's Page Tool and Liquid Layout video (1:02): with the Page tool, the
-        // Control panel shows the page's size, preset, orientation and liquid page rule.
-        let mut app = app();
-        app.run("file.new", serde_json::json!({"width": 252, "height": 144, "facingPages": false})).unwrap();
-        app.session.set_tool("page");
-        let mut h = test_window::open(app, vec2(1800.0, 600.0));
-        let _ = h.get_by_label("Liquid Page Rule:");
-        // Pages don't move within their spread, so there is no "Objects Move with Page" option, and
-        // no "Controlled by Parent" rule until parent pages have rules of their own.
-        assert!(h.query_by_label("Objects Move with Page").is_none());
-        assert!(!crate::panels::interactive::LIQUID_RULES.iter().any(|(r, _)| *r == designcraft_doc::LiquidRule::ControlledByParent));
-        assert_eq!(crate::panels::properties::preset_name(252.0, 144.0), "US Business Card");
-        h.get_by_label("Show Parent Page Overlay").click();
-        h.run_steps(4);
-        assert!(h.state().app.session.doc().unwrap().doc.spreads[0].pages[0].show_parent_overlay);
-    }
-
-    #[test]
-    fn a_narrow_window_scrolls_the_control_bar() {
-        let w = 700.0;
-        let mut h = test_window::open(app_with_selection(), vec2(w, 600.0));
-        let bar = test_window::panel_rect(&h, "control_bar");
-        assert!(rect(&h, LAST_CONTROL).max.x > w, "the controls are wider than the window");
-        // A plain mouse wheel scrolls the bar sideways.
-        let first = rect(&h, FIRST_CONTROL).center();
-        wheel(&mut h, first, vec2(0.0, -3000.0));
-        let last = rect(&h, LAST_CONTROL);
-        let window = egui::Rect::from_min_size(pos2(0.0, 0.0), vec2(w, 600.0));
-        assert!(window.contains_rect(last) && bar.contains_rect(last), "{last:?} outside the bar {bar:?}");
-        assert_eq!(test_window::panel_rect(&h, "control_bar").height(), bar.height(), "the bar keeps its height");
-        // A popup opened from a scrolled control opens at that control.
-        let appearance = group(&h, "appearance");
-        let fill = egui::Rect::from_min_size(appearance.min, vec2(30.0, crate::widgets::FIELD_H));
-        let chip = pos2(fill.min.x + 9.0, fill.center().y);
-        h.hover_at(chip);
-        h.drag_at(chip);
-        h.drop_at(chip);
-        h.run_steps(4);
-        let item = rect(&h, "[Black]");
-        assert!(item.min.y > fill.max.y && (item.min.x - chip.x).abs() < 120.0, "popup item at {item:?}, control at {chip:?}");
-    }
-
-    #[test]
-    fn the_mac_app_bar_centres_and_clears_the_traffic_lights() {
-        use super::{MAC_APP_BAR, MAC_CONTENT_LEFT, MAC_LIGHT, MAC_LIGHT_PITCH, MAC_LIGHTS_LEFT};
-        // Content keeps the same gap after the lights as the lights keep from the top.
-        let margin = (MAC_APP_BAR - MAC_LIGHT) / 2.0;
-        assert_eq!(MAC_CONTENT_LEFT - (MAC_LIGHTS_LEFT + 2.0 * MAC_LIGHT_PITCH + MAC_LIGHT), margin);
-        // `egui::Margin` is in `i8`.
-        assert!(MAC_CONTENT_LEFT <= f32::from(i8::MAX));
-        let mut app = app();
-        app.integrated_titlebar = true;
-        let h = test_window::open(app, vec2(1400.0, 900.0));
-        // The bar's controls share the lights' centre line and start after them (relative to the
-        // bar, which the test window insets).
-        let bar = test_window::panel_rect(&h, "app_bar").min.to_vec2();
-        let home = rect(&h, "Home").translate(-bar);
-        assert_eq!(home.center().y, MAC_APP_BAR / 2.0, "{home:?}");
-        assert!(home.min.y >= 2.0 && home.min.x >= MAC_CONTENT_LEFT, "{home:?}");
-        for label in ["File", "Help", "Share"] {
-            let r = rect(&h, label).translate(-bar);
-            assert!((r.center().y - MAC_APP_BAR / 2.0).abs() <= 0.5 && r.max.y <= MAC_APP_BAR, "{label} at {r:?}");
-        }
-    }
-
-    fn press(h: &egui_kittest::Harness<'static, test_window::Window>, pos: egui::Pos2, pressed: bool) {
-        h.event(egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE });
-    }
-
-    /// The window commands the app sends over the next `steps` frames.
-    fn window_commands(h: &mut egui_kittest::Harness<'static, test_window::Window>, steps: usize) -> Vec<egui::ViewportCommand> {
-        let mut out = Vec::new();
-        for _ in 0..steps {
-            h.step();
-            if let Some(v) = h.output().viewport_output.get(&egui::ViewportId::ROOT) {
-                out.extend(v.commands.iter().cloned());
-            }
-        }
-        out
-    }
-
-    fn double_click(h: &mut egui_kittest::Harness<'static, test_window::Window>, pos: egui::Pos2) -> Vec<egui::ViewportCommand> {
-        h.hover_at(pos);
-        h.step();
-        // One frame: the harness gives each queued event a frame of its own, longer apart than a
-        // double-click allows.
-        for pressed in [true, false, true, false] {
-            h.input_mut().events.push(egui::Event::PointerButton {
-                pos,
-                button: egui::PointerButton::Primary,
-                pressed,
-                modifiers: egui::Modifiers::NONE,
-            });
-        }
-        window_commands(h, 3)
-    }
-
-    fn drag(h: &mut egui_kittest::Harness<'static, test_window::Window>, from: egui::Pos2) -> Vec<egui::ViewportCommand> {
-        h.hover_at(from);
-        h.step();
-        press(h, from, true);
-        let mut out = window_commands(h, 1);
-        for i in 1..=6 {
-            h.hover_at(from + vec2(8.0 * i as f32, 3.0));
-            out.extend(window_commands(h, 1));
-        }
-        press(h, from + vec2(48.0, 3.0), false);
-        out.extend(window_commands(h, 2));
-        out
-    }
-
-    #[test]
-    fn the_empty_mac_title_bar_zooms_and_moves_the_window() {
-        use super::{MAC_APP_BAR, MAC_CONTENT_LEFT};
-        use egui::ViewportCommand::{Maximized, Minimized, StartDrag};
-        let mut app = app();
-        app.integrated_titlebar = true;
-        let mut h = test_window::open(app, vec2(1400.0, 900.0));
-        let bar = test_window::panel_rect(&h, "app_bar");
-        // Under the centred title, and between the traffic lights and the Home button.
-        let empty = [pos2(bar.center().x, bar.min.y + MAC_APP_BAR / 2.0), pos2(bar.min.x + MAC_CONTENT_LEFT - 4.0, bar.min.y + 4.0)];
-        for at in empty {
-            // Tests read the setting as its default, zoom.
-            let cmds = double_click(&mut h, at);
-            assert_eq!(cmds, vec![Maximized(true)], "double-click at {at:?}");
-            let cmds = drag(&mut h, at);
-            assert_eq!(cmds, vec![StartDrag], "drag from {at:?}");
-        }
-        // The bar's controls keep their clicks and drags.
-        for label in ["Home", "Share", "File"] {
-            let at = rect(&h, label).center();
-            let cmds = double_click(&mut h, at);
-            assert!(!cmds.iter().any(|c| matches!(c, Maximized(_) | Minimized(_))), "double-click on {label}: {cmds:?}");
-            if label == "Home" {
-                assert_eq!(h.state().app.ui.status, "Home", "Home took its clicks");
-            }
-            h.key_press(egui::Key::Escape);
-            h.run_steps(2);
-            let cmds = drag(&mut h, at);
-            assert!(!cmds.contains(&StartDrag), "drag from {label}: {cmds:?}");
-            h.key_press(egui::Key::Escape);
-            h.run_steps(2);
-        }
-    }
-
-    #[test]
-    fn the_mac_window_is_not_movable_on_the_title_bar_controls() {
-        use super::{MAC_APP_BAR, MAC_CONTENT_LEFT};
-        let mut app = app();
-        app.integrated_titlebar = true;
-        let mut h = test_window::open(app, vec2(1400.0, 900.0));
-        let bar = test_window::panel_rect(&h, "app_bar");
-        let mid = bar.min.y + MAC_APP_BAR / 2.0;
-        // The search field is the bar's last control: 125 wide, 4 from the 10-wide right margin.
-        let search = pos2(bar.max.x - 10.0 - 4.0 - 60.0, mid);
-        let controls = [rect(&h, "Home").center(), rect(&h, "Share").center(), rect(&h, "File").center(), search];
-        let mut movable_at = |at: egui::Pos2| {
-            h.hover_at(at);
-            h.run_steps(2);
-            crate::title_bar::window_movable(&h.ctx)
-        };
-        for at in [pos2(bar.center().x, mid), pos2(bar.min.x + MAC_CONTENT_LEFT - 4.0, bar.min.y + 4.0), pos2(bar.center().x, 500.0)] {
-            assert!(movable_at(at), "empty title bar or the page at {at:?}");
-        }
-        for at in controls {
-            assert!(!movable_at(at), "control at {at:?}");
-        }
-    }
-
-    #[test]
-    fn a_narrow_window_scrolls_the_app_bar() {
-        let w = 640.0;
-        let mut h = test_window::open(app(), vec2(w, 600.0));
-        let (help, share) = (rect(&h, "Help"), rect(&h, "Share"));
-        assert!(help.max.x <= share.min.x, "the menus ({help:?}) and the workspace controls ({share:?}) overlap");
-        wheel(&mut h, help.center(), vec2(0.0, -3000.0));
-        let share = rect(&h, "Share");
-        let window = egui::Rect::from_min_size(pos2(0.0, 0.0), vec2(w, 600.0));
-        assert!(window.contains_rect(share), "{share:?} outside the window");
-    }
-
-    #[test]
-    fn a_wide_window_does_not_scroll_the_bars() {
-        let mut h = test_window::open(app(), vec2(1400.0, 900.0));
-        let before = [rect(&h, FIRST_CONTROL), rect(&h, LAST_CONTROL), rect(&h, "Help"), rect(&h, "Share")];
-        assert!(before.iter().all(|r| r.max.x <= 1400.0), "{before:?}");
-        wheel(&mut h, before[0].center(), vec2(0.0, -3000.0));
-        wheel(&mut h, before[2].center(), vec2(0.0, -3000.0));
-        let after = [rect(&h, FIRST_CONTROL), rect(&h, LAST_CONTROL), rect(&h, "Help"), rect(&h, "Share")];
-        assert_eq!(after, before);
-    }
-
-    /// At 115% the app bar fits a wide window exactly: it must not scroll sideways by a rounding error.
-    #[test]
-    fn the_app_bar_does_not_scroll_at_115_percent() {
-        let w = 1400.0;
-        let mut h = test_window::open_scaled(app(), vec2(w, 900.0), 1.15);
-        assert_eq!(h.ctx.pixels_per_point(), 1.15);
-        let before = [rect(&h, "Help"), rect(&h, "Share")];
-        assert!(before.iter().all(|r| r.max.x <= w), "{before:?}");
-        wheel(&mut h, before[0].center(), vec2(0.0, -3000.0));
-        wheel(&mut h, before[0].center(), vec2(-3000.0, 0.0));
-        let after = [rect(&h, "Help"), rect(&h, "Share")];
-        assert_eq!(after, before, "the app bar scrolled sideways although everything fits");
-    }
-
-    #[test]
-    fn a_scrolled_bar_keeps_its_captions_on_one_line() {
-        let mut app = app();
-        app.run("file.new", serde_json::json!({})).unwrap();
-        let f = app.run("frame.create", serde_json::json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hello"})).unwrap();
-        app.run("selection.set", serde_json::json!({"ids": [f["id"]]})).unwrap();
-        let mut h = test_window::open(app, vec2(700.0, 600.0));
-        let bar = test_window::panel_rect(&h, "control_bar").center();
-        wheel(&mut h, bar, vec2(0.0, -3000.0));
-        // The text frame's last group keeps its full size, not only what is left of the row.
-        let columns = group(&h, "columns");
-        assert!(columns.width() >= 48.0 && columns.max.x <= 700.0, "Columns group squeezed or off screen: {columns:?}");
-    }
-
-    struct WindowHarness {
-        ctx: egui::Context,
-        app: DesignApp,
-        time: f64,
-        maximized: bool,
-        size: egui::Vec2,
-    }
-
-    impl WindowHarness {
-        fn new() -> Self {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.custom_titlebar = true;
-            let ctx = egui::Context::default();
-            crate::theme::install_fonts(&ctx, "");
-            let mut harness = Self { ctx, app, time: 0.0, maximized: false, size: vec2(1440.0, 900.0) };
-            harness.frame(vec![]);
-            harness.frame(vec![]);
-            harness
-        }
-
-        fn frame(&mut self, events: Vec<egui::Event>) -> Vec<egui::ViewportCommand> {
-            self.time += 0.1;
-            let mut input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, self.size)),
-                time: Some(self.time),
-                events,
-                ..Default::default()
-            };
-            input.viewports.entry(egui::ViewportId::ROOT).or_default().maximized = Some(self.maximized);
-            let mut output = self.ctx.run_ui(input, |ui| {
-                app_bar(&mut self.app, ui);
-                resize_borders(&mut self.app, ui);
-            });
-            output.textures_delta.clear();
-            output.viewport_output.get(&egui::ViewportId::ROOT).map(|v| v.commands.clone()).unwrap_or_default()
-        }
-
-        fn press(&mut self, pos: egui::Pos2) -> Vec<egui::ViewportCommand> {
-            self.frame(vec![
-                egui::Event::PointerMoved(pos),
-                egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() },
-            ])
-        }
-
-        fn click(&mut self, pos: egui::Pos2) -> Vec<egui::ViewportCommand> {
-            let mut commands = self.press(pos);
-            commands.extend(self.frame(vec![egui::Event::PointerButton {
-                pos,
-                button: egui::PointerButton::Primary,
-                pressed: false,
-                modifiers: Default::default(),
-            }]));
-            commands
-        }
-
-        fn caption_center(&self, id: &str) -> egui::Pos2 {
-            self.ctx.read_response(egui::Id::new(id)).unwrap().rect.center()
-        }
-    }
-
-    #[test]
-    fn caption_buttons_minimize_maximize_restore_and_close() {
-        let mut h = WindowHarness::new();
-        for (id, command) in
-            [("window.minimize", egui::ViewportCommand::Minimized(true)), ("window.maximize", egui::ViewportCommand::Maximized(true))]
-        {
-            let p = h.caption_center(id);
-            assert!(h.click(p).contains(&command), "{id}");
-        }
-        h.maximized = true;
-        h.frame(vec![]);
-        let p = h.caption_center("window.maximize");
-        assert!(h.click(p).contains(&egui::ViewportCommand::Maximized(false)));
-        let p = h.caption_center("window.close");
-        assert!(h.click(p).contains(&egui::ViewportCommand::Close));
-    }
-
-    #[test]
-    fn title_area_drags_and_double_clicks_but_menus_do_not_drag() {
-        let mut h = WindowHarness::new();
-        let title = h.ctx.read_response(egui::Id::new("window_title_drag")).unwrap().rect;
-        assert!(title.width() > 0.0, "there is a drag region between menus and tools");
-        let p = title.center();
-        let mut commands = h.press(p);
-        commands.extend(h.frame(vec![egui::Event::PointerMoved(p + vec2(20.0, 0.0))]));
-        assert!(commands.contains(&egui::ViewportCommand::StartDrag));
-
-        let mut h = WindowHarness::new();
-        h.click(p);
-        assert!(h.click(p).contains(&egui::ViewportCommand::Maximized(true)));
-
-        let mut h = WindowHarness::new();
-        let p = egui::pos2(70.0, 18.0); // File menu, outside the title's drag region.
-        let mut commands = h.press(p);
-        commands.extend(h.frame(vec![egui::Event::PointerMoved(title.center())]));
-        assert!(!commands.contains(&egui::ViewportCommand::StartDrag));
-    }
-
-    #[test]
-    fn edges_resize_only_when_the_window_is_restored() {
-        let mut h = WindowHarness::new();
-        let p = egui::pos2(1438.0, 400.0);
-        let mut commands = h.press(p);
-        commands.extend(h.frame(vec![egui::Event::PointerMoved(p + vec2(-20.0, 0.0))]));
-        assert!(commands.contains(&egui::ViewportCommand::BeginResize(egui::ResizeDirection::East)));
-        let mut h = WindowHarness::new();
-        h.maximized = true;
-        h.frame(vec![]);
-        let mut commands = h.press(p);
-        commands.extend(h.frame(vec![egui::Event::PointerMoved(p + vec2(-20.0, 0.0))]));
-        assert!(!commands.iter().any(|c| matches!(c, egui::ViewportCommand::BeginResize(_))));
-    }
-
-    #[test]
-    fn native_window_actions_are_unavailable_without_custom_chrome() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        assert!(!crate::menus::enabled(&app, "window.close"));
-        assert!(app.run("window.close", json!({})).is_err());
-        assert!(app.pending_window_commands.is_empty());
-        app.custom_titlebar = true;
-        assert!(app.run("window.resize", json!({"edge": "invalid"})).is_err());
-        assert!(app.pending_window_commands.is_empty());
-    }
-
-    #[test]
-    fn caption_buttons_stay_put_while_a_narrow_app_bar_scrolls() {
-        let mut h = WindowHarness::new();
-        h.size = vec2(640.0, 560.0);
-        h.frame(vec![]);
-        h.frame(vec![]);
-        let rect = |h: &WindowHarness, id: &str| h.ctx.read_response(egui::Id::new(id)).unwrap().rect;
-        let menus_end = |h: &WindowHarness| h.ctx.data(|d| d.get_temp::<f32>(egui::Id::new("app_bar_menus_end"))).unwrap();
-        let (close, menus0) = (rect(&h, "window.close"), menus_end(&h));
-        assert!(close.left() >= 0.0 && close.right() <= h.size.x, "{close:?}");
-        let p = egui::pos2(200.0, 18.0);
-        h.frame(vec![
-            egui::Event::PointerMoved(p),
-            egui::Event::MouseWheel {
-                unit: egui::MouseWheelUnit::Point,
-                delta: vec2(0.0, -3000.0),
-                phase: egui::TouchPhase::Move,
-                modifiers: egui::Modifiers::NONE,
-            },
-        ]);
-        for _ in 0..10 {
-            h.frame(vec![]);
-        }
-        assert!(menus_end(&h) < menus0, "the menus scrolled");
-        assert_eq!(rect(&h, "window.close"), close, "the caption buttons did not");
-        assert!(h.click(close.center()).contains(&egui::ViewportCommand::Close));
-    }
-
-    #[test]
-    fn the_window_drags_from_its_lower_band_at_the_minimum_width() {
-        // At 900 px the menus and tools fill the bar's row; its lower band still moves the window,
-        // and it isn't drawn over the caption buttons.
-        let mut h = WindowHarness::new();
-        h.size = vec2(900.0, 560.0);
-        h.frame(vec![]);
-        h.frame(vec![]);
-        let drag = h.ctx.read_response(egui::Id::new("window_title_drag")).unwrap().rect;
-        let close = h.ctx.read_response(egui::Id::new("window.close")).unwrap().rect;
-        assert!(drag.right() <= close.left() + 0.5, "{drag:?} {close:?}");
-        let p = egui::pos2(450.0, APP_BAR + APP_BAR_BAND / 2.0);
-        assert!(drag.contains(p), "{drag:?}");
-        let mut commands = h.press(p);
-        commands.extend(h.frame(vec![egui::Event::PointerMoved(p + vec2(20.0, 0.0))]));
-        assert!(commands.contains(&egui::ViewportCommand::StartDrag));
-    }
-
-    #[test]
-    fn caption_buttons_fit_the_minimum_window_width() {
-        let mut h = WindowHarness::new();
-        h.size = vec2(900.0, 560.0);
-        h.frame(vec![]);
-        h.frame(vec![]);
-        for id in ["window.minimize", "window.maximize", "window.close"] {
-            let rect = h.ctx.read_response(egui::Id::new(id)).unwrap().rect;
-            assert!(rect.left() >= 0.0 && rect.right() <= h.size.x, "{id}: {rect:?}");
-            let p = rect.center();
-            assert!(!h.click(p).is_empty(), "{id} remains clickable");
-        }
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/chrome/app_bar.rs b/crates/ui-egui/src/chrome/app_bar.rs
new file mode 100644
index 000000000..b93113d05
--- /dev/null
+++ b/crates/ui-egui/src/chrome/app_bar.rs
@@ -0,0 +1,413 @@
+use super::{
+    APP_BAR, APP_BAR_BAND, Color32, DesignApp, MAC_APP_BAR, MAC_CONTENT_LEFT, SEPARATOR, Sense, Stroke, Tokens, icons, json, semibold, vec2,
+};
+
+pub(super) fn search_id() -> egui::Id {
+    egui::Id::unique("app_bar_search")
+}
+
+/// Whether the application bar's search field had the keyboard last frame. Escape takes egui's
+/// focus away before any widget runs, so that press must not reach the global shortcuts.
+pub fn search_had_focus(ctx: &egui::Context) -> bool {
+    ctx.memory(|m| m.had_focus_last_frame(search_id()))
+}
+
+/// The search field's state between frames: the query, the highlighted match, whether the matches
+/// are shown, and the widget that had the keyboard before the field took it.
+#[derive(Clone, Default)]
+struct SearchState {
+    query: String,
+    highlight: usize,
+    open: bool,
+    previous_focus: Option<egui::Id>,
+}
+
+/// The application bar's search field: finds menu commands by their labels in the interface
+/// language. ↑/↓ move through the matches; Return or a click runs one as its menu item would.
+/// Running one or pressing Escape clears the field and gives the keyboard back to the widget that
+/// had it. While the field has the keyboard, no key reaches the shortcuts or the document.
+fn search_field(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    let id = search_id();
+    let state_id = id.with("state");
+    let mut st: SearchState = ui.data(|d| d.get_temp(state_id)).unwrap_or_default();
+    let (r, _) = ui.allocate_exact_size(vec2(125.0, 18.0), Sense::hover());
+    ui.painter().rect(r, 1.0, t.input, Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
+    icons::paint(ui.painter(), egui::Rect::from_min_size(r.min + vec2(3.0, 2.0), vec2(14.0, 14.0)), "search", t.icon);
+    let focused = ui.memory(|m| m.has_focus(id));
+    let had_focus = search_had_focus(ui.ctx());
+    if !focused && !had_focus {
+        st.previous_focus = ui.memory(|m| m.focused());
+    }
+    let none = egui::Modifiers::NONE;
+    let (down, up, enter, escape) = if focused || had_focus {
+        ui.input_mut(|i| {
+            (
+                i.consume_key(none, egui::Key::ArrowDown),
+                i.consume_key(none, egui::Key::ArrowUp),
+                i.consume_key(none, egui::Key::Enter),
+                i.consume_key(none, egui::Key::Escape),
+            )
+        })
+    } else {
+        (false, false, false, false)
+    };
+    let lang = app.ui.language.clone();
+    let hint = crate::rtl::widget(ui, egui::RichText::new(crate::i18n::tr(&lang, "Search")).color(t.text_dim));
+    let field = egui::Rect::from_min_max(r.min + vec2(19.0, 0.0), r.max - vec2(3.0, 0.0));
+    let resp = ui
+        .put(
+            field,
+            egui::TextEdit::singleline(&mut st.query)
+                .id(id)
+                .frame(egui::Frame::NONE)
+                .margin(egui::Margin::ZERO)
+                .font(egui::FontId::proportional(11.0))
+                .text_color(t.text)
+                .hint_text(hint)
+                .desired_width(field.width())
+                .align(egui::Align2::LEFT_CENTER)
+                // Return runs the highlighted match instead of leaving the field.
+                .return_key(None),
+        )
+        .on_hover_text(crate::i18n::tr(&lang, "Search commands"));
+    if resp.changed() {
+        st.highlight = 0;
+        st.open = true;
+    }
+    if resp.gained_focus() {
+        st.open = true;
+    }
+    let items = if st.open { crate::menus::command_search(app, &st.query) } else { Vec::new() };
+    let last = items.len().saturating_sub(1);
+    if down {
+        st.highlight = st.highlight.saturating_add(1);
+    }
+    if up {
+        st.highlight = st.highlight.saturating_sub(1);
+    }
+    st.highlight = st.highlight.min(last);
+    let mut run = None;
+    if enter && let Some(it) = items.get(st.highlight).filter(|it| crate::menus::menu_enabled(app, &it.id)) {
+        run = Some(it.id.clone());
+    }
+    let mut over_matches = false;
+    if st.open && !st.query.trim().is_empty() {
+        let shown = egui::Area::new(id.with("matches"))
+            .order(egui::Order::Foreground)
+            .pivot(egui::Align2::RIGHT_TOP)
+            .fixed_pos(r.right_bottom() + vec2(0.0, 2.0))
+            .show(ui.ctx(), |ui| {
+                egui::Frame::menu(ui.style()).show(ui, |ui| {
+                    let size = vec2(300.0, 22.0);
+                    ui.set_width(size.x);
+                    if items.is_empty() {
+                        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&lang, "No matching commands")).color(t.text_dim));
+                    }
+                    for (k, it) in items.iter().enumerate() {
+                        let mut b = egui::Button::new(crate::rtl::widget(ui, it.label.as_str())).frame(false).min_size(size);
+                        if let Some(sc) = &it.shortcut {
+                            b = b.shortcut_text(crate::menus::shortcut_text(sc));
+                        }
+                        if k == st.highlight {
+                            ui.painter().rect_filled(egui::Rect::from_min_size(ui.cursor().min, size), 2.0, t.hover);
+                        }
+                        let enabled = crate::menus::menu_enabled(app, &it.id);
+                        // The button aligns its label by the layout it's in: left, like the menus.
+                        let row = ui.allocate_ui_with_layout(
+                            size,
+                            egui::Layout::left_to_right(egui::Align::Center).with_main_align(egui::Align::Min),
+                            |ui| ui.add_enabled(enabled, b),
+                        );
+                        if row.inner.clicked() {
+                            run = Some(it.id.clone());
+                        }
+                    }
+                });
+            });
+        over_matches = shown.response.contains_pointer();
+    }
+    if escape || run.is_some() {
+        st.query.clear();
+        st.open = false;
+        let previous = st.previous_focus.take();
+        ui.memory_mut(|m| match previous {
+            Some(p) => m.request_focus(p),
+            None => m.surrender_focus(id),
+        });
+    } else if !resp.has_focus() && !over_matches {
+        // A click elsewhere or Tab took the keyboard: the matches close, the query stays.
+        st.open = false;
+    }
+    ui.data_mut(|d| d.insert_temp(state_id, st));
+    if let Some(cmd) = run {
+        crate::menus::activate(app, &cmd, &serde_json::Value::Null);
+    }
+}
+
+/// Width of the app bar's right-hand slot: what is left of the row, minus a pixel of slack so
+/// that rounding at fractional scales (115%) never makes the row a hair wider than the scroll
+/// area and shows a needless scroll bar. Never narrower than the controls themselves.
+fn tools_slot_width(available: f32, tools_w: f32) -> f32 {
+    (available - 1.0).max(tools_w)
+}
+
+/// Lay out the application bar, native/custom title handling, menu and tool scrolling, drag region, caption controls and search.
+pub fn app_bar(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    let mac = app.integrated_titlebar;
+    let left = if mac { MAC_CONTENT_LEFT as i8 } else { 8 };
+    let bar = if mac { MAC_APP_BAR } else { APP_BAR };
+    // The tallest control keeps a margin above and below it in the shorter macOS bar.
+    let home = if mac { 22.0 } else { 24.0 };
+    let resp = egui::Panel::top("app_bar")
+        .exact_size(bar + APP_BAR_BAND)
+        .frame(egui::Frame::NONE.fill(t.app_bar).inner_margin(egui::Margin {
+            left,
+            right: if app.custom_titlebar { 0 } else { 10 },
+            top: 0,
+            bottom: (APP_BAR_BAND - SEPARATOR) as i8,
+        }))
+        .show(ui, |ui| {
+            let full = ui.max_rect();
+            if mac {
+                // The whole title-bar band, margins included; the controls drawn below take
+                // their own clicks.
+                let band = egui::Rect::from_min_max(
+                    egui::pos2(full.min.x - f32::from(left), full.min.y),
+                    egui::pos2(full.max.x + 10.0, full.min.y + MAC_APP_BAR),
+                );
+                let _ = craft_window::title_bar::empty_area(ui, band);
+            }
+            let mut menus_end = full.min.x;
+            let mut tools_start = full.max.x;
+            // Windows caption buttons stay at the right edge; the rest of the bar scrolls.
+            let caption_w = if app.custom_titlebar { CAPTION_W } else { 0.0 };
+            // Undecorated window: the bar moves it. The drag area is the whole bar but the caption
+            // buttons, lower band included, registered before the menus and tools so they stay on
+            // top of it: any gap drags, and the lower band is always there, however narrow the
+            // window (the menus and tools scroll).
+            if app.custom_titlebar {
+                let drag = egui::Rect::from_min_max(
+                    egui::pos2(full.min.x - left as f32, full.min.y),
+                    egui::pos2(full.max.x - caption_w, full.min.y + bar + APP_BAR_BAND),
+                );
+                let response = ui.interact(drag, egui::Id::unique("window_title_drag"), Sense::click_and_drag());
+                // Only from an empty part of the bar: the lower band, or the gap between the menus
+                // and the tools (as they were last frame). A menu title pressed and dragged doesn't
+                // move the window, as with native title bars.
+                let (gap0, gap1) = ui
+                    .data(|d| (d.get_temp::<f32>(egui::Id::unique("app_bar_menus_end")), d.get_temp::<f32>(egui::Id::unique("app_bar_tools_start"))));
+                let empty = |p: egui::Pos2| p.y >= full.min.y + bar || matches!((gap0, gap1), (Some(a), Some(b)) if p.x >= a && p.x <= b);
+                let from_empty = ui.input(|i| i.pointer.press_origin().or(i.pointer.interact_pos())).is_some_and(empty);
+                if response.double_clicked() && from_empty {
+                    let on = !ui.input(|i| i.viewport().maximized.unwrap_or(false));
+                    let _ = app.run("window.maximize", json!({"on": on}));
+                } else if response.drag_started_by(egui::PointerButton::Primary) && from_empty {
+                    let _ = app.run("window.drag", json!({}));
+                }
+                app.flush_window_commands(ui.ctx());
+            }
+            if app.custom_titlebar {
+                let caption = egui::Rect::from_min_max(egui::pos2(full.max.x - caption_w, full.min.y), full.max);
+                ui.scope_builder(egui::UiBuilder::new().max_rect(caption).layout(egui::Layout::right_to_left(egui::Align::Center)), |ui| {
+                    caption_buttons(app, ui);
+                });
+            }
+            let scrolled = egui::Rect::from_min_max(full.min, egui::pos2(full.max.x - caption_w, full.max.y));
+            ui.scope_builder(egui::UiBuilder::new().max_rect(scrolled), |ui| {
+                // The right-hand controls' width, measured last frame: in a window too narrow for them
+                // and the menus they follow the menus, and the bar scrolls sideways.
+                let tools_w_id = ui.scope_id().with("tools_width");
+                let tools_w: f32 = ui.data(|d| d.get_temp(tools_w_id)).unwrap_or(0.0);
+                crate::widgets::overflow_scrolling(ui);
+                // (Drag-scrolling is touch-only by default, so a mouse drag on the bar moves the window.)
+                egui::ScrollArea::horizontal().id_salt("app_bar_scroll").auto_shrink([false, false]).show(ui, |ui| {
+                    ui.horizontal_centered(|ui| {
+                        if icons::button(ui, "home", home, app.session.active().is_none(), crate::i18n::tr(&app.ui.language, "Home")).clicked() {
+                            app.session_home();
+                        }
+                        ui.add_space(6.0);
+                        if !app.native_menu {
+                            ui.style_mut().visuals.widgets.inactive.weak_bg_fill = Color32::TRANSPARENT;
+                            ui.style_mut().visuals.widgets.inactive.bg_stroke = Stroke::NONE;
+                            ui.style_mut().visuals.widgets.hovered.bg_stroke = Stroke::NONE;
+                            ui.style_mut().spacing.button_padding = vec2(7.0, 3.0);
+                            crate::menus::menu_bar(app, ui);
+                        }
+                        menus_end = ui.min_rect().max.x;
+                        // Where the menus end on screen (moves as a narrow bar scrolls).
+                        ui.data_mut(|d| d.insert_temp(egui::Id::unique("app_bar_menus_end"), menus_end));
+                        let size = vec2(tools_slot_width(ui.available_width(), tools_w), ui.available_height());
+                        let tools = ui.allocate_ui_with_layout(size, egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                            ui.add_space(4.0);
+                            search_field(app, ui);
+                            ui.add_space(8.0);
+                            let current = app.ui.workspace.clone();
+                            let shown = crate::i18n::workspace_name(&app.ui.language, &current);
+                            crate::menus::menu_button(
+                                ui,
+                                crate::rtl::widget(ui, egui::RichText::new(format!("{shown} ▾")).font(semibold(11.5)).color(t.text)),
+                                |ui| {
+                                    let customs: Vec<String> = app.ui.custom_workspaces.iter().map(|w| w.name.clone()).collect();
+                                    for w in crate::menus::WORKSPACES.iter().map(|w| w.to_string()).chain(customs.iter().cloned()) {
+                                        if ui
+                                            .selectable_label(w == current, crate::rtl::widget(ui, crate::i18n::workspace_name(&app.ui.language, &w)))
+                                            .clicked()
+                                        {
+                                            let _ = app.run("window.workspace", json!({"name": w}));
+                                            ui.close();
+                                        }
+                                    }
+                                    ui.separator();
+                                    if ui
+                                        .button(crate::rtl::widget(
+                                            ui,
+                                            format!(
+                                                "{} {}",
+                                                crate::i18n::tr(&app.ui.language, "Reset"),
+                                                crate::i18n::workspace_name(&app.ui.language, &current)
+                                            ),
+                                        ))
+                                        .clicked()
+                                    {
+                                        let _ = app.run("window.resetWorkspace", json!({}));
+                                        ui.close();
+                                    }
+                                    if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "New Workspace…"))).clicked() {
+                                        let _ = app.run("window.newWorkspace", json!({}));
+                                        ui.close();
+                                    }
+                                    if !customs.is_empty() {
+                                        crate::menus::menu_button(
+                                            ui,
+                                            crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Delete Workspace")),
+                                            |ui| {
+                                                for w in &customs {
+                                                    if ui.button(w).clicked() {
+                                                        let _ = app.run("window.deleteWorkspace", json!({"name": w}));
+                                                        ui.close();
+                                                    }
+                                                }
+                                            },
+                                        );
+                                    }
+                                },
+                            );
+                            ui.add_space(6.0);
+                            if icons::button(ui, "share", 22.0, false, crate::i18n::tr(&app.ui.language, "Share")).clicked() {
+                                app.status(crate::i18n::tr(&app.ui.language, "Export a PDF, IDML or package to share — no cloud account needed."));
+                            }
+                            ui.add_space(8.0);
+                            // Always one click away: the ArtCraft community Discord.
+                            if crate::about::discord_button(ui, "Discord", vec2(78.0, 22.0)) {
+                                let _ = app.run("help.discord", json!({}));
+                            }
+                            tools_start = ui.min_rect().min.x;
+                            ui.data_mut(|d| d.insert_temp(egui::Id::unique("app_bar_tools_start"), tools_start));
+                            ui.min_rect().width()
+                        });
+                        if (tools.inner - tools_w).abs() > 0.5 {
+                            ui.data_mut(|d| d.insert_temp(tools_w_id, tools.inner));
+                            ui.ctx().request_discard("app bar: the right-hand controls changed width");
+                        }
+                    });
+                });
+            });
+            // Centred title.
+            let title = match app.session.active() {
+                Some(d) => format!("DesignCraft — {}", crate::rtl::isolate(&d.title())),
+                None => "DesignCraft".to_string(),
+            };
+            // Centred between the menus and the right-hand controls; left out when it won't fit.
+            let galley = crate::rtl::plain(ui.ctx(), &title, egui::FontId::proportional(11.5), t.text);
+            let w = galley.size().x;
+            let cx = full.center().x;
+            if cx - w / 2.0 > menus_end + 12.0 && cx + w / 2.0 < tools_start - 12.0 {
+                ui.painter().galley(egui::pos2(cx - w / 2.0, full.center().y - galley.size().y / 2.0), galley, t.text);
+            }
+        });
+    let r = resp.response.rect;
+    ui.painter().rect_filled(egui::Rect::from_min_max(egui::pos2(r.min.x, r.max.y - APP_BAR_BAND), r.max), 0.0, t.pasteboard);
+    ui.painter().line_segment([egui::pos2(r.min.x, r.max.y), egui::pos2(r.max.x, r.max.y)], Stroke::new(1.0, t.border));
+}
+
+const CAPTION_BUTTON_W: f32 = 46.0;
+
+/// Minimize, maximize and close, and the space after them.
+const CAPTION_W: f32 = 3.0 * CAPTION_BUTTON_W + 8.0;
+
+/// Windows caption buttons. The macOS traffic lights remain native.
+fn caption_buttons(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    let maximized = ui.input(|i| i.viewport().maximized.unwrap_or(false));
+    let spacing = ui.spacing().item_spacing.x;
+    ui.spacing_mut().item_spacing.x = 0.0;
+    for (command, label) in
+        [("window.close", "Close"), ("window.maximize", if maximized { "Restore" } else { "Maximize" }), ("window.minimize", "Minimize")]
+    {
+        let (rect, _) = ui.allocate_exact_size(vec2(CAPTION_BUTTON_W, APP_BAR), Sense::hover());
+        let response = ui.interact(rect, egui::Id::unique(command), Sense::click());
+        response.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, ui.is_enabled(), label));
+        let hovered = response.hovered();
+        if hovered {
+            ui.painter().rect_filled(rect, 0.0, if command == "window.close" { t.caption_close } else { t.hover });
+        }
+        let color = if hovered && command == "window.close" { t.caption_close_text } else { t.text };
+        let stroke = Stroke::new(1.0, color);
+        let icon = egui::Rect::from_center_size(rect.center(), vec2(10.0, 10.0));
+        match command {
+            "window.close" => {
+                ui.painter().line_segment([icon.left_top(), icon.right_bottom()], stroke);
+                ui.painter().line_segment([icon.right_top(), icon.left_bottom()], stroke);
+            }
+            "window.maximize" if maximized => {
+                let back = icon.translate(vec2(2.0, -2.0));
+                ui.painter().line_segment([back.left_top(), back.right_top()], stroke);
+                ui.painter().line_segment([back.right_top(), back.right_bottom()], stroke);
+                ui.painter().rect_stroke(icon, 0.0, stroke, egui::StrokeKind::Inside);
+            }
+            "window.maximize" => {
+                ui.painter().rect_stroke(icon, 0.0, stroke, egui::StrokeKind::Inside);
+            }
+            _ => {
+                ui.painter().line_segment([icon.left_center(), icon.right_center()], stroke);
+            }
+        }
+        if response.clicked() {
+            let params = if command == "window.maximize" { json!({"on": !maximized}) } else { json!({}) };
+            let _ = app.run(command, params);
+            app.flush_window_commands(ui.ctx());
+        }
+        response.on_hover_text(crate::i18n::tr(&app.ui.language, label));
+    }
+    ui.spacing_mut().item_spacing.x = spacing;
+    ui.add_space(8.0);
+}
+
+/// Undecorated Windows windows need resize grips as well as caption controls.
+pub(crate) fn resize_borders(app: &mut DesignApp, ui: &mut egui::Ui) {
+    if ui.input(|i| i.viewport().maximized.unwrap_or(false) || i.viewport().fullscreen.unwrap_or(false)) {
+        return;
+    }
+    let r = ui.ctx().content_rect();
+    let edge = 4.0;
+    let corner = 10.0;
+    let rect = |x0, y0, x1, y1| egui::Rect::from_min_max(egui::pos2(x0, y0), egui::pos2(x1, y1));
+    for (name, region, cursor) in [
+        ("northWest", rect(r.left(), r.top(), r.left() + corner, r.top() + corner), egui::CursorIcon::ResizeNwSe),
+        ("northEast", rect(r.right() - corner, r.top(), r.right(), r.top() + corner), egui::CursorIcon::ResizeNeSw),
+        ("southWest", rect(r.left(), r.bottom() - corner, r.left() + corner, r.bottom()), egui::CursorIcon::ResizeNeSw),
+        ("southEast", rect(r.right() - corner, r.bottom() - corner, r.right(), r.bottom()), egui::CursorIcon::ResizeNwSe),
+        ("north", rect(r.left() + corner, r.top(), r.right() - corner, r.top() + edge), egui::CursorIcon::ResizeVertical),
+        ("south", rect(r.left() + corner, r.bottom() - edge, r.right() - corner, r.bottom()), egui::CursorIcon::ResizeVertical),
+        ("west", rect(r.left(), r.top() + corner, r.left() + edge, r.bottom() - corner), egui::CursorIcon::ResizeHorizontal),
+        ("east", rect(r.right() - edge, r.top() + corner, r.right(), r.bottom() - corner), egui::CursorIcon::ResizeHorizontal),
+    ] {
+        let response = ui.interact(region, egui::Id::unique(("window_resize", name)), Sense::drag()).on_hover_cursor(cursor);
+        if response.drag_started_by(egui::PointerButton::Primary) {
+            let _ = app.run("window.resize", json!({"edge": name}));
+            app.flush_window_commands(ui.ctx());
+        }
+    }
+}
diff --git a/crates/ui-egui/src/chrome/control_bar.rs b/crates/ui-egui/src/chrome/control_bar.rs
new file mode 100644
index 000000000..36a7521fe
--- /dev/null
+++ b/crates/ui-egui/src/chrome/control_bar.rs
@@ -0,0 +1,614 @@
+use super::{Align, Color32, DesignApp, NumField, Sense, Stroke, Tokens, Unit, caption, icons, json, measure, panels, semibold, vec2};
+
+fn vsep(ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    let (r, _) = ui.allocate_exact_size(vec2(9.0, 46.0), Sense::hover());
+    ui.painter().line_segment([r.center_top() + vec2(0.0, 4.0), r.center_bottom() - vec2(0.0, 4.0)], Stroke::new(1.0, t.divider));
+}
+
+/// Two-row context-sensitive Control panel.
+pub fn control_bar(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    egui::Panel::top("control_bar")
+        .exact_size(59.0)
+        .frame(
+            egui::Frame::NONE.fill(t.panel).inner_margin(egui::Margin { left: 8, right: 8, top: 5, bottom: 3 }).stroke(Stroke::new(1.0, t.divider)),
+        )
+        .show(ui, |ui| {
+            // Wider than the window: the bar scrolls sideways.
+            crate::widgets::overflow_scrolling(ui);
+            egui::ScrollArea::horizontal().id_salt("control_bar_scroll").auto_shrink([false, true]).show(ui, |ui| {
+                ui.horizontal_top(|ui| {
+                    let text_mode =
+                        matches!(app.session.tool_id(), "type" | "verticalType") || app.session.active().is_some_and(|d| d.selection.text.is_some());
+                    if app.session.tool_id() == "page" {
+                        control_page(app, ui);
+                    } else if text_mode {
+                        control_text(app, ui);
+                    } else {
+                        crate::object_control::show(app, ui);
+                    }
+                });
+            });
+        });
+}
+
+/// Page-size preset menu and the portrait / landscape toggles of the Control panel.
+fn page_preset_and_orientation(app: &mut DesignApp, ui: &mut egui::Ui, lang: &str, size: (f64, f64), n: usize, anchor: u8) {
+    let landscape = size.0 > size.1;
+    ui.vertical(|ui| {
+        let cur = panels::properties::preset_name(size.0, size.1);
+        craft_ui::ComboBox::from_id_salt("ctl_page_preset").selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, cur))).width(130.0).show_ui(
+            ui,
+            |ui| {
+                for (name, w, h) in panels::properties::PAGE_PRESETS {
+                    if ui.selectable_label(cur == *name, crate::rtl::widget(ui, crate::i18n::tr(lang, name))).clicked() {
+                        let (w, h) = if landscape { (h, w) } else { (w, h) };
+                        let _ = app.run("layout.pageSize", json!({"pages": [n], "width": w, "height": h, "anchor": anchor}));
+                    }
+                }
+            },
+        );
+        ui.horizontal(|ui| {
+            for (icon, tip, want) in [("orient-portrait", "Portrait", false), ("orient-landscape", "Landscape", true)] {
+                if crate::widgets::icon_toggle(ui, icon, landscape == want, crate::i18n::tr(lang, tip)).clicked() && landscape != want {
+                    let _ = app.run("layout.pageSize", json!({"pages": [n], "width": size.1, "height": size.0, "anchor": anchor}));
+                }
+            }
+        });
+    });
+}
+
+/// The Control panel with the Page tool, as InDesign's: reference point, X/Y, W/H, page-size
+/// preset, orientation, Liquid Page Rule and Show Parent Page Overlay, for
+/// the page the Page tool selected (else the page in view). W/H keep the reference point in place.
+fn control_page(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let lang = app.ui.language.clone();
+    let Some(st) = app.session.active() else { return };
+    let units = st.doc.settings.horizontal_units;
+    let Some(page) = st.selection.page.or_else(|| crate::canvas::current_page(app)) else { return };
+    let Some(st) = app.session.active() else { return };
+    let d = st.doc.clone();
+    let Some((si, pi)) = d.page_loc(page) else { return };
+    let pg = d.spreads[si].pages[pi].clone();
+    let n = page + 1;
+    // Reference point: W/H edits keep it in place.
+    let (r, _) = ui.allocate_exact_size(vec2(30.0, 44.0), Sense::hover());
+    if let Some(p) = panels::properties::ref_point_proxy(ui, egui::Rect::from_center_size(r.center(), vec2(27.0, 27.0)), app.ui.ref_point) {
+        app.ui.ref_point = p;
+    }
+    let anchor = app.ui.ref_point.min(8);
+    let (fx, fy) = ((anchor % 3) as f64 / 2.0, (anchor / 3) as f64 / 2.0);
+    // The reference point's position: from the spine across, from the top down.
+    let (x, y) = (pg.x - d.spreads[si].spine_x() + fx * pg.width, fy * pg.height);
+    egui::Grid::new("ctl_page_xywh").num_columns(4).spacing(vec2(4.0, 4.0)).show(ui, |ui| {
+        caption(ui, crate::i18n::tr(&lang, "X:"));
+        // Pages don't move within their spread yet.
+        ui.add_enabled_ui(false, |ui| measure(ui, "cpx", Some(x), units, 64.0));
+        caption(ui, crate::i18n::tr(&lang, "W:"));
+        if let Some(v) = measure(ui, "cpw", Some(pg.width), units, 64.0) {
+            let _ = app.run("layout.pageSize", json!({"pages": [n], "width": v, "anchor": anchor}));
+        }
+        ui.end_row();
+        caption(ui, crate::i18n::tr(&lang, "Y:"));
+        ui.add_enabled_ui(false, |ui| measure(ui, "cpy", Some(y), units, 64.0));
+        caption(ui, crate::i18n::tr(&lang, "H:"));
+        if let Some(v) = measure(ui, "cph", Some(pg.height), units, 64.0) {
+            let _ = app.run("layout.pageSize", json!({"pages": [n], "height": v, "anchor": anchor}));
+        }
+        ui.end_row();
+    });
+    vsep(ui);
+    // Page-size preset and orientation.
+    page_preset_and_orientation(app, ui, &lang, (pg.width, pg.height), n, anchor);
+    vsep(ui);
+    ui.vertical(|ui| {
+        caption(ui, crate::i18n::tr(&lang, "Liquid Page Rule:"));
+        let label = panels::interactive::liquid_rule_label(pg.liquid);
+        craft_ui::ComboBox::from_id_salt("ctl_page_rule").selected_text(crate::rtl::widget(ui, crate::i18n::tr(&lang, label))).width(150.0).show_ui(
+            ui,
+            |ui| {
+                for (r, l) in panels::interactive::LIQUID_RULES {
+                    if ui.selectable_label(pg.liquid == r, crate::rtl::widget(ui, crate::i18n::tr(&lang, l))).clicked() && pg.liquid != r {
+                        let _ = app.run("liquid.pageRule", json!({"rule": r, "pages": [n]}));
+                    }
+                }
+            },
+        );
+    });
+    vsep(ui);
+    ui.vertical(|ui| {
+        let mut overlay = pg.show_parent_overlay;
+        if ui.checkbox(&mut overlay, crate::rtl::widget(ui, crate::i18n::tr(&lang, "Show Parent Page Overlay"))).changed() {
+            let _ = app.run("layout.pageOptions", json!({"pages": [n], "showParentOverlay": overlay}));
+        }
+    });
+}
+
+/// The Control panel's font sizes (and leadings), as InDesign lists them.
+const SIZES: &[f64] = &[6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 14.0, 18.0, 24.0, 30.0, 36.0, 48.0, 60.0, 72.0];
+
+/// The Control panel's tracking values (1/1000 em).
+const TRACKING: &[f64] = &[-100.0, -75.0, -50.0, -25.0, -10.0, -5.0, 0.0, 5.0, 10.0, 25.0, 50.0, 75.0, 100.0, 200.0];
+
+/// Whether the text Control panel shows Paragraph Formatting Controls (¶) rather than Character
+/// Formatting Controls (A).
+const PARA_MODE: &str = "ctl_text_para_mode";
+
+/// An icon and a field after it, as the Control panel lays its fields out.
+pub(crate) fn icon_field(ui: &mut egui::Ui, icon: &str, tip: &str, field: NumField) -> Option<f64> {
+    let t = Tokens::get(ui.ctx());
+    let (r, resp) = ui.allocate_exact_size(vec2(18.0, 18.0), Sense::hover());
+    icons::paint(ui.painter(), r, icon, t.icon);
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, tip));
+    let label = resp.id;
+    resp.on_hover_text(tip);
+    field.spinner().labelled_by(label).show(ui)
+}
+
+/// A column of two rows (the Control panel's two-row groups).
+fn rows(ui: &mut egui::Ui, mut row: impl FnMut(&mut egui::Ui, usize)) {
+    ui.vertical(|ui| {
+        ui.spacing_mut().item_spacing.y = 3.0;
+        ui.horizontal(|ui| row(ui, 0));
+        ui.horizontal(|ui| row(ui, 1));
+    });
+}
+
+/// A small toggle button showing `text` (the case and position buttons).
+fn text_toggle(ui: &mut egui::Ui, text: &str, strike: bool, on: bool, tip: &str) -> bool {
+    let t = Tokens::get(ui.ctx());
+    let (r, resp) = ui.allocate_exact_size(vec2(24.0, 20.0), Sense::click());
+    if on {
+        ui.painter().rect_filled(r, 2.0, t.tool_active);
+    } else if resp.hovered() {
+        ui.painter().rect_filled(r, 2.0, t.hover);
+    }
+    let col = if on { t.text_strong } else { t.icon };
+    if text == "small-caps" {
+        crate::icons::paint(ui.painter(), r, "small-caps", col);
+    } else {
+        ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, egui::FontId::proportional(13.0), col);
+    }
+    if strike {
+        ui.painter().line_segment([r.center() + vec2(-6.0, 0.5), r.center() + vec2(6.0, 0.5)], Stroke::new(1.2, col));
+    }
+    resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, on, tip));
+    resp.on_hover_text(tip).clicked()
+}
+
+/// The text Control panel, as InDesign's: A shows the Character Formatting Controls (font, size
+/// and leading, the case and position buttons, kerning and tracking, the scales, baseline shift
+/// and skew, the character style and language); ¶ the Paragraph Formatting Controls (alignment,
+/// the indents, space before and after, the drop cap, the paragraph style, Hyphenate and Align to
+/// Baseline Grid).
+fn control_text(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    let lang = app.ui.language.clone();
+    let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
+    let attrs = panels::text_attrs(app);
+    let chars = attrs.as_ref().map(|a| a["chars"].clone()).unwrap_or_default();
+    let para = attrs.as_ref().map(|a| a["para"].clone()).unwrap_or_default();
+    let mode_id = egui::Id::unique(PARA_MODE);
+    let para_mode = ui.data(|d| d.get_temp::<bool>(mode_id)).unwrap_or(false);
+    ui.vertical(|ui| {
+        ui.spacing_mut().item_spacing.y = 3.0;
+        for (para, text, tip) in [(false, "A", "Character Formatting Controls"), (true, "¶", "Paragraph Formatting Controls")] {
+            let on = para_mode == para;
+            let (r, resp) = ui.allocate_exact_size(vec2(24.0, 22.0), Sense::click());
+            if on {
+                ui.painter().rect_filled(r, 2.0, t.tool_active);
+            } else if resp.hovered() {
+                ui.painter().rect_filled(r, 2.0, t.hover);
+            }
+            ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, semibold(15.0), if on { t.text_strong } else { t.text_dim });
+            let tip = tr(tip);
+            resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, on, &tip));
+            if resp.on_hover_text(&tip).clicked() {
+                ui.data_mut(|d| d.insert_temp(mode_id, para));
+            }
+        }
+    });
+    vsep(ui);
+    if para_mode {
+        control_paragraph(app, ui, &attrs, &para, &tr);
+    } else {
+        control_character(app, ui, &attrs, &chars, &para, &tr);
+    }
+}
+
+/// Draw the character-mode controls and issue their corresponding text commands.
+fn control_character(
+    app: &mut DesignApp,
+    ui: &mut egui::Ui,
+    attrs: &Option<serde_json::Value>,
+    chars: &serde_json::Value,
+    para: &serde_json::Value,
+    tr: &dyn Fn(&str) -> String,
+) {
+    ui.vertical(|ui| {
+        let fam = chars["fontFamily"].as_str().unwrap_or("").to_string();
+        let sty = chars["fontStyle"].as_str().unwrap_or("").to_string();
+        panels::font_family_picker(app, ui, &fam, 170.0);
+        panels::font_style_picker(app, ui, &fam, &sty, 170.0);
+    });
+    vsep(ui);
+    // Size and leading: a spinner on the left and a list of common values on the right;
+    // automatic leading in parentheses.
+    rows(ui, |ui, row| {
+        if row == 0 {
+            if let Some(v) = icon_field(
+                ui,
+                "font-size",
+                &tr("Font Size"),
+                NumField::number("csize", chars["size"].as_f64(), " pt", 2).width(84.0).presets(SIZES).range(0.1, 1296.0),
+            ) {
+                let _ = app.run("type.char", json!({"attrs": {"size": v}}));
+            }
+        } else {
+            let auto = chars["leading"]["kind"].as_str() != Some("points");
+            let lead = if auto {
+                chars["size"].as_f64().map(|s| s * para["autoLeading"].as_f64().unwrap_or(1.2))
+            } else {
+                chars["leading"]["value"].as_f64()
+            };
+            let lead = lead.map(|v| (v * 100.0).round() / 100.0);
+            let key = if auto { "cleadauto" } else { "clead" };
+            if let Some(v) = icon_field(
+                ui,
+                "leading",
+                &tr("Leading"),
+                NumField::number(key, lead, " pt", 2).width(84.0).presets(SIZES).range(0.0, 5000.0).parens(auto),
+            ) {
+                let _ = app.run("type.char", json!({"attrs": {"leading": {"kind": "points", "value": v}}}));
+            }
+        }
+    });
+    vsep(ui);
+    // All Caps, Superscript, Underline / Small Caps, Subscript, Strikethrough.
+    let caps = chars["capitalization"].as_str().unwrap_or("normal").to_string();
+    let pos = chars["position"].as_str().unwrap_or("normal").to_string();
+    let (ul, st) = (chars["underline"].as_bool().unwrap_or(false), chars["strikethrough"].as_bool().unwrap_or(false));
+    let mut set = None;
+    rows(ui, |ui, row| {
+        if row == 0 {
+            if text_toggle(ui, "TT", false, caps == "allCaps", &tr("All Caps")) {
+                set = Some(json!({"capitalization": if caps == "allCaps" { "normal" } else { "allCaps" }}));
+            }
+            if text_toggle(ui, "T¹", false, pos == "superscript", &tr("Superscript")) {
+                set = Some(json!({"position": if pos == "superscript" { "normal" } else { "superscript" }}));
+            }
+            if text_toggle(ui, "T̲", false, ul, &tr("Underline")) {
+                set = Some(json!({"underline": !ul}));
+            }
+        } else {
+            if text_toggle(ui, "small-caps", false, caps == "smallCaps", &tr("Small Caps")) {
+                set = Some(json!({"capitalization": if caps == "smallCaps" { "normal" } else { "smallCaps" }}));
+            }
+            if text_toggle(ui, "T₁", false, pos == "subscript", &tr("Subscript")) {
+                set = Some(json!({"position": if pos == "subscript" { "normal" } else { "subscript" }}));
+            }
+            if text_toggle(ui, "T", true, st, &tr("Strikethrough")) {
+                set = Some(json!({"strikethrough": !st}));
+            }
+        }
+    });
+    if let Some(a) = set {
+        let _ = app.run("type.char", json!({"attrs": a}));
+    }
+    vsep(ui);
+    rows(ui, |ui, row| {
+        if row == 0 {
+            let t = Tokens::get(ui.ctx());
+            let (r, resp) = ui.allocate_exact_size(vec2(18.0, 18.0), Sense::hover());
+            icons::paint(ui.painter(), r, "kerning", t.icon);
+            resp.on_hover_text(tr("Kerning"));
+            crate::panels::properties::kerning_control(app, ui, "ckern", &chars["kerning"], 92.0);
+        } else {
+            if let Some(v) = icon_field(
+                ui,
+                "tracking",
+                &tr("Tracking"),
+                NumField::number("ctrack", chars["tracking"].as_f64(), "", 0).width(92.0).presets(TRACKING).step(5.0).range(-1000.0, 10000.0),
+            ) {
+                let _ = app.run("type.char", json!({"attrs": {"tracking": v}}));
+            }
+        }
+    });
+    vsep(ui);
+    const SCALES: &[f64] = &[25.0, 50.0, 75.0, 80.0, 90.0, 100.0, 110.0, 120.0, 125.0, 150.0, 200.0];
+    let pct = |v: &serde_json::Value| v.as_f64().map(|s| (s * 1000.0).round() / 10.0);
+    rows(ui, |ui, row| {
+        if row == 0 {
+            if let Some(v) = icon_field(
+                ui,
+                "vscale",
+                &tr("Vertical Scale"),
+                NumField::number("cvs", pct(&chars["vScale"]), "%", 1).width(84.0).presets(SCALES).range(1.0, 1000.0),
+            ) {
+                let _ = app.run("type.char", json!({"attrs": {"vScale": v / 100.0}}));
+            }
+        } else {
+            if let Some(v) = icon_field(
+                ui,
+                "hscale",
+                &tr("Horizontal Scale"),
+                NumField::number("chs", pct(&chars["hScale"]), "%", 1).width(84.0).presets(SCALES).range(1.0, 1000.0),
+            ) {
+                let _ = app.run("type.char", json!({"attrs": {"hScale": v / 100.0}}));
+            }
+        }
+    });
+    vsep(ui);
+    rows(ui, |ui, row| {
+        if row == 0 {
+            if let Some(v) = icon_field(
+                ui,
+                "baseline-shift",
+                &tr("Baseline Shift"),
+                NumField::number("cbs", chars["baselineShift"].as_f64(), " pt", 2).width(76.0).range(-5000.0, 5000.0),
+            ) {
+                let _ = app.run("type.char", json!({"attrs": {"baselineShift": v}}));
+            }
+        } else {
+            if let Some(v) = icon_field(
+                ui,
+                "skew",
+                &tr("Skew (False Italic)"),
+                NumField::number("csk", chars["skew"].as_f64(), "°", 1).width(76.0).range(-85.0, 85.0),
+            ) {
+                let _ = app.run("type.char", json!({"attrs": {"skew": v}}));
+            }
+        }
+    });
+    vsep(ui);
+    ui.vertical(|ui| {
+        ui.spacing_mut().item_spacing.y = 3.0;
+        // The character style, then the language.
+        let cs = attrs.as_ref().and_then(|a| a["characterStyle"].as_str()).unwrap_or(designcraft_doc::NO_CHAR_STYLE).to_string();
+        let names: Vec<String> = app.session.active().map(|d| d.doc.styles.character.iter().map(|c| c.name.clone()).collect()).unwrap_or_default();
+        let mut pick = None;
+        craft_ui::ComboBox::from_id_salt("ctl_char_style")
+            .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, &cs)))
+            .width(150.0)
+            .show_ui(ui, |ui| {
+                for n in &names {
+                    if ui.selectable_label(*n == cs, crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, n))).clicked() {
+                        pick = Some(n.clone());
+                    }
+                }
+            });
+        if let Some(n) = pick {
+            let _ = app.run("style.character.apply", json!({"name": n}));
+        }
+        let lang = chars["language"].as_str().unwrap_or("English: USA").to_string();
+        craft_ui::ComboBox::from_id_salt("ctl_language").selected_text(crate::rtl::widget(ui, tr(&lang))).width(150.0).show_ui(ui, |ui| {
+            egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| crate::panels::properties::language_menu(app, ui, &lang));
+        });
+    });
+}
+
+fn control_paragraph(
+    app: &mut DesignApp,
+    ui: &mut egui::Ui,
+    attrs: &Option<serde_json::Value>,
+    para: &serde_json::Value,
+    tr: &dyn Fn(&str) -> String,
+) {
+    let cur: Align = serde_json::from_value(para["align"].clone()).unwrap_or_default();
+    if let Some(a) = align_buttons(ui, cur, tr) {
+        let _ = app.run("type.para", json!({"attrs": {"align": a}}));
+    }
+    vsep(ui);
+    let units = app.session.active().map(|d| d.doc.settings.horizontal_units).unwrap_or(Unit::Picas);
+    if let Some((k, v)) = indent_space_fields(ui, para, units, tr) {
+        let _ = app.run("type.para", json!({"attrs": {k: v}}));
+    }
+    if let Some((k, v)) = drop_cap_fields(ui, para, tr) {
+        let _ = app.run("type.para", json!({"attrs": {k: v.max(0.0) as u64}}));
+    }
+    vsep(ui);
+    // Bulleted List over Numbered List, as InDesign's (a list with the default hanging indent, or,
+    // pressed, none). Pressed when every selected paragraph has it, as Type › Apply Bullets shows.
+    use designcraft_doc::ListType;
+    let pressed = [ListType::Bullets, ListType::Numbers].map(|k| app.session.selection_has_list(k));
+    let mut list = None;
+    rows(ui, |ui, row| {
+        let (icon, cmd, tip) = if row == 0 { ("bullets", "list.bullets", "Bulleted List") } else { ("numbering", "list.numbers", "Numbered List") };
+        let on = pressed.get(row).copied().unwrap_or(false);
+        if crate::widgets::icon_toggle(ui, icon, on, &tr(tip)).clicked() {
+            list = Some((cmd, !on));
+        }
+    });
+    if let Some((cmd, on)) = list {
+        let _ = app.run(cmd, json!({"on": on}));
+    }
+    vsep(ui);
+    let (shade, dialog) = shading_buttons(app, ui, para, tr);
+    if let Some(attrs) = shade {
+        let _ = app.run("type.para", json!({ "attrs": attrs }));
+    }
+    if let Some(tab) = dialog {
+        let _ = app.run("app.paragraphBordersDialog", json!({ "tab": tab }));
+    }
+    vsep(ui);
+    ui.vertical(|ui| {
+        ui.spacing_mut().item_spacing.y = 3.0;
+        let ps = attrs.as_ref().and_then(|a| a["paragraphStyle"].as_str()).unwrap_or("").to_string();
+        let ov = attrs.as_ref().and_then(|a| a["paraOverrides"].as_u64()).unwrap_or(0)
+            + attrs.as_ref().and_then(|a| a["charOverrides"].as_u64()).unwrap_or(0);
+        panels::para_style_picker(app, ui, &ps, ov > 0, 170.0);
+        ui.horizontal(|ui| {
+            let mut h = para["hyphenate"].as_bool().unwrap_or(true);
+            if crate::widgets::checkbox(ui, &mut h, &tr("Hyphenate")).changed() {
+                let _ = app.run("type.para", json!({"attrs": {"hyphenate": h}}));
+            }
+            // First Line Only is aligned too: the button shows it pressed, and a click turns alignment off.
+            let grid = matches!(para["gridAlign"].as_str(), Some("allLines" | "firstLineOnly"));
+            if crate::widgets::icon_toggle(ui, "grid-baseline", grid, &tr("Align to Baseline Grid")).clicked() {
+                let _ = app.run("type.para", json!({"attrs": {"gridAlign": if grid { "none" } else { "allLines" }}}));
+            }
+        });
+    });
+}
+
+/// The paragraph alignment buttons, in two rows: the alignment picked this frame, if any.
+fn align_buttons(ui: &mut egui::Ui, cur: Align, tr: &dyn Fn(&str) -> String) -> Option<Align> {
+    let mut align = None;
+    rows(ui, |ui, row| {
+        if row == 0 {
+            for (a, icon) in [
+                (Align::Left, "palign-left"),
+                (Align::Center, "palign-center"),
+                (Align::Right, "palign-right"),
+                (Align::TowardsSpine, "palign-spine-towards"),
+            ] {
+                if icons::button(ui, icon, 20.0, cur == a, &tr(a.label())).clicked() {
+                    align = Some(a);
+                }
+            }
+        } else {
+            for (a, icon) in [
+                (Align::LeftJustified, "palign-justify-left"),
+                (Align::CenterJustified, "palign-justify-center"),
+                (Align::RightJustified, "palign-justify-right"),
+                (Align::FullyJustified, "palign-justify-all"),
+                (Align::AwayFromSpine, "palign-spine-away"),
+            ] {
+                if icons::button(ui, icon, 20.0, cur == a, &tr(a.label())).clicked() {
+                    align = Some(a);
+                }
+            }
+        }
+    });
+    align
+}
+
+/// The indents and space before and after, two per column. Returns the one field changed this
+/// frame, with its paragraph attribute and value.
+fn indent_space_fields(ui: &mut egui::Ui, para: &serde_json::Value, units: Unit, tr: &dyn Fn(&str) -> String) -> Option<(&'static str, f64)> {
+    let mut set = None;
+    for ((ia, ta, ka), (ib, tb, kb)) in [
+        (("indent-left", "Left Indent", "leftIndent"), ("indent-first", "First Line Left Indent", "firstLineIndent")),
+        (("indent-right", "Right Indent", "rightIndent"), ("indent-last", "Last Line Right Indent", "lastLineIndent")),
+        (("space-before", "Space Before", "spaceBefore"), ("space-after", "Space After", "spaceAfter")),
+    ] {
+        rows(ui, |ui, row| {
+            if row == 0 {
+                if let Some(v) = icon_field(ui, ia, &tr(ta), NumField::measure(ka, para[ka].as_f64(), units).width(84.0).range(0.0, 10_000.0)) {
+                    set = Some((ka, v));
+                }
+            } else {
+                let min = crate::panels::properties::para_field_min(kb);
+                if let Some(v) = icon_field(ui, ib, &tr(tb), NumField::measure(kb, para[kb].as_f64(), units).width(84.0).range(min, 10_000.0)) {
+                    set = Some((kb, v));
+                }
+            }
+        });
+        vsep(ui);
+    }
+    set
+}
+
+/// The drop cap's line and character counts. Returns the one changed this frame, with its
+/// paragraph attribute and value.
+fn drop_cap_fields(ui: &mut egui::Ui, para: &serde_json::Value, tr: &dyn Fn(&str) -> String) -> Option<(&'static str, f64)> {
+    let mut drop = None;
+    rows(ui, |ui, row| {
+        if row == 0 {
+            let max = designcraft_compose::MAX_DROP_CAP_LINES as f64;
+            if let Some(v) = icon_field(
+                ui,
+                "drop-lines",
+                &tr("Drop Cap Number of Lines"),
+                NumField::number("cdl", para["dropCapLines"].as_f64(), "", 0).width(64.0).range(0.0, max),
+            ) {
+                drop = Some(("dropCapLines", v));
+            }
+        } else {
+            let max = designcraft_compose::MAX_DROP_CAP_CHARS as f64;
+            if let Some(v) = icon_field(
+                ui,
+                "drop-chars",
+                &tr("Drop Cap One or More Characters"),
+                NumField::number("cdc", para["dropCapChars"].as_f64(), "", 0).width(64.0).range(0.0, max),
+            ) {
+                drop = Some(("dropCapChars", v));
+            }
+        }
+    });
+    drop
+}
+
+/// Shading over Border: the on/off checkboxes, the colour swatches and the Paragraph Borders and
+/// Shading buttons. Returns the attributes to set and the dialog tab to open, if any.
+fn shading_buttons(
+    app: &DesignApp,
+    ui: &mut egui::Ui,
+    para: &serde_json::Value,
+    tr: &dyn Fn(&str) -> String,
+) -> (Option<serde_json::Value>, Option<&'static str>) {
+    // On or off, the Paragraph Borders and Shading dialog on its tab, and the colour, as InDesign's.
+    let doc = app.session.active().map(|d| d.doc.clone());
+    let mut shade = None;
+    let mut dialog = None;
+    // Both checkboxes as wide as the wider label, so the icons and colours line up in columns.
+    let check_w = ["Shading", "Border"]
+        .iter()
+        .map(|l| ui.fonts_mut(|f| f.layout_no_wrap(tr(l), egui::FontId::proportional(11.5), Color32::WHITE).size().x))
+        .fold(0.0, f32::max)
+        + 28.0;
+    rows(ui, |ui, row| {
+        let (on_key, color_key, label, icon, tab) = if row == 0 {
+            ("shadingOn", "shadingColor", "Shading", "para-shading", "shading")
+        } else {
+            ("borderOn", "borderColor", "Border", "para-border", "border")
+        };
+        let mut on = para[on_key].as_bool().unwrap_or(false);
+        ui.allocate_ui_with_layout(vec2(check_w, crate::widgets::FIELD_H), egui::Layout::left_to_right(egui::Align::Center), |ui| {
+            ui.set_min_width(check_w);
+            if crate::widgets::checkbox(ui, &mut on, &tr(label)).changed() {
+                shade = Some(json!({ on_key: on }));
+            }
+        });
+        if crate::widgets::icon_toggle(ui, icon, false, &tr("Paragraph Borders and Shading…")).clicked() {
+            dialog = Some(tab);
+        }
+        if let Some(doc) = &doc {
+            let cur = para[color_key].as_str().unwrap_or("[Black]").to_string();
+            if let Some(w) = swatch_field(ui, doc, &cur, 96.0, &tr(if row == 0 { "Paragraph Shading" } else { "Paragraph Border" })) {
+                shade = Some(json!({ color_key: w }));
+            }
+        }
+    });
+    (shade, dialog)
+}
+
+/// A swatch field of the Control panel (Shading and Border colours): the swatch's chip and name,
+/// and the document's swatches in its menu. Returns the swatch picked.
+pub(crate) fn swatch_field(ui: &mut egui::Ui, doc: &designcraft_doc::Document, cur: &str, width: f32, label: &str) -> Option<String> {
+    let t = Tokens::get(ui.ctx());
+    let (r, resp) = ui.allocate_exact_size(vec2(width, crate::widgets::FIELD_H), Sense::click());
+    let resp = resp.on_hover_text(label);
+    resp.widget_info(|| {
+        let mut info = egui::WidgetInfo::labeled(egui::Role::ComboBox, true, label);
+        info.current_text_value = Some(cur.to_string());
+        info
+    });
+    let p = ui.painter();
+    p.rect_filled(r, 0.0, if resp.hovered() { t.hover } else { t.input });
+    p.rect_stroke(r, 0.0, Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
+    let seg = egui::Rect::from_min_max(egui::pos2(r.max.x - crate::widgets::SEG_W, r.min.y), r.max);
+    p.line_segment([seg.left_top(), seg.left_bottom()], Stroke::new(1.0, t.field_border));
+    icons::paint(p, egui::Rect::from_center_size(seg.center(), vec2(12.0, 12.0)), "chevron-down", t.icon);
+    let (c, g) = crate::widgets::swatch_colors(doc, cur, 1.0);
+    let chip = egui::Rect::from_min_size(egui::pos2(r.min.x + 4.0, r.center().y - 6.0), vec2(12.0, 12.0));
+    crate::widgets::paint_chip(p, chip, c, g);
+    let clip = egui::Rect::from_min_max(r.min, egui::pos2(seg.min.x - 2.0, r.max.y));
+    p.with_clip_rect(clip).text(egui::pos2(chip.max.x + 5.0, r.center().y), egui::Align2::LEFT_CENTER, cur, egui::FontId::proportional(11.5), t.text);
+    let mut picked = None;
+    egui::Popup::menu(&resp).show(|ui| {
+        picked = crate::panels::swatch_list(ui, doc, cur);
+    });
+    picked
+}
diff --git a/crates/ui-egui/src/chrome/start_screen.rs b/crates/ui-egui/src/chrome/start_screen.rs
new file mode 100644
index 000000000..6e5248724
--- /dev/null
+++ b/crates/ui-egui/src/chrome/start_screen.rs
@@ -0,0 +1,272 @@
+use super::{Color32, Content, DesignApp, Sense, Stroke, Tokens, json, semibold, vec2};
+
+pub fn start_screen(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    let r = ui.available_rect_before_wrap();
+    ui.painter().rect_filled(r, 0.0, t.panel_darker);
+    ui.scope_builder(
+        egui::UiBuilder::new().max_rect(r.shrink(48.0)).layout(egui::Layout::top_down(if crate::i18n::is_rtl(&app.ui.language) {
+            egui::Align::Max
+        } else {
+            egui::Align::Min
+        })),
+        |ui| {
+            egui::ScrollArea::vertical().auto_shrink([false, false]).show(ui, |ui| {
+                ui.label(crate::rtl::widget(
+                    ui,
+                    egui::RichText::new(crate::i18n::tr(&app.ui.language, "Welcome to DesignCraft")).font(semibold(28.0)).color(t.text_strong),
+                ));
+                ui.label(crate::rtl::widget(
+                    ui,
+                    egui::RichText::new(crate::i18n::tr(&app.ui.language, "Page layout for print and screen — fast, open and scriptable."))
+                        .size(15.0)
+                        .color(t.text_dim),
+                ));
+                ui.add_space(24.0);
+                ui.horizontal(|ui| {
+                    if ui
+                        .add(
+                            egui::Button::new(crate::rtl::widget(
+                                ui,
+                                egui::RichText::new(crate::i18n::tr(&app.ui.language, "  New file  ")).size(14.0).color(Color32::WHITE),
+                            ))
+                            .fill(t.accent_strong)
+                            .corner_radius(16.0)
+                            .min_size(vec2(0.0, 32.0)),
+                        )
+                        .clicked()
+                    {
+                        let _ = app.run("app.newDocumentDialog", json!({}));
+                    }
+                    if ui
+                        .add(
+                            egui::Button::new(crate::rtl::widget(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "  Open  ")).size(14.0)))
+                                .corner_radius(16.0)
+                                .min_size(vec2(0.0, 32.0)),
+                        )
+                        .clicked()
+                    {
+                        let _ = app.run("app.openDialog", json!({}));
+                    }
+                    if ui
+                        .add(
+                            egui::Button::new(crate::rtl::widget(
+                                ui,
+                                egui::RichText::new(crate::i18n::tr(&app.ui.language, "  Open sample magazine  ")).size(14.0),
+                            ))
+                            .corner_radius(16.0)
+                            .min_size(vec2(0.0, 32.0)),
+                        )
+                        .clicked()
+                    {
+                        let _ = app.run("file.newSample", json!({}));
+                    }
+                });
+                ui.add_space(20.0);
+                community_card(app, ui);
+                recent_files(app, ui);
+                ui.add_space(24.0);
+                ui.label(crate::rtl::widget(
+                    ui,
+                    egui::RichText::new(crate::i18n::tr(&app.ui.language, "Start a new document")).font(semibold(15.0)).color(t.text_strong),
+                ));
+                ui.add_space(8.0);
+                ui.horizontal_wrapped(|ui| {
+                    for p in designcraft_doc::build::PRESETS.iter().filter(|p| p.intent == designcraft_doc::Intent::Print) {
+                        let (cr, resp) = ui.allocate_exact_size(vec2(120.0, 150.0), Sense::click());
+                        let hov = resp.hovered();
+                        ui.painter().rect_filled(cr, 6.0, if hov { t.hover } else { t.panel });
+                        let k = (80.0 / p.width.max(p.height)) as f32;
+                        let pr = egui::Rect::from_center_size(cr.center() - vec2(0.0, 14.0), vec2(p.width as f32 * k, p.height as f32 * k));
+                        ui.painter().rect_filled(pr, 0.0, Color32::from_gray(245));
+                        ui.painter().text(
+                            egui::pos2(cr.center().x, cr.max.y - 26.0),
+                            egui::Align2::CENTER_CENTER,
+                            p.name,
+                            semibold(12.0),
+                            t.text_strong,
+                        );
+                        ui.painter().text(
+                            egui::pos2(cr.center().x, cr.max.y - 11.0),
+                            egui::Align2::CENTER_CENTER,
+                            format!(
+                                "{} × {}",
+                                designcraft_geom::format_measure(p.width, p.units),
+                                designcraft_geom::format_measure(p.height, p.units)
+                            ),
+                            egui::FontId::proportional(10.0),
+                            t.text_dim,
+                        );
+                        if resp.clicked() {
+                            let _ = app.run("file.new", json!({"preset": p.name}));
+                        }
+                    }
+                });
+            });
+        },
+    );
+    let _ = Content::Unassigned;
+}
+
+/// Recent files shown on the start screen (File › Open Recent has them all).
+const START_SCREEN_RECENT: usize = 8;
+
+/// Start screen: the most recent files as cards with the first page's picture (saved in the file)
+/// and the name; the full path is the tooltip. A file that is gone is dimmed and says so when
+/// clicked. Nothing when the list is empty.
+fn recent_files(app: &mut DesignApp, ui: &mut egui::Ui) {
+    if app.session.prefs.recent_files.is_empty() {
+        return;
+    }
+    let t = Tokens::get(ui.ctx());
+    ui.add_space(24.0);
+    ui.label(crate::rtl::widget(
+        ui,
+        egui::RichText::new(crate::i18n::tr(&app.ui.language, "Recent files")).font(semibold(15.0)).color(t.text_strong),
+    ));
+    ui.add_space(8.0);
+    let rows: Vec<(usize, String)> = app.session.prefs.recent_files.iter().take(START_SCREEN_RECENT).cloned().enumerate().collect();
+    let mut open = None;
+    ui.horizontal_wrapped(|ui| {
+        for (i, path) in rows {
+            let stat = recent_file_stat(ui.ctx(), &path);
+            let there = stat.exists;
+            let modified = there.then_some(stat.modified);
+            let (cr, resp) = ui.allocate_exact_size(vec2(140.0, 170.0), Sense::click());
+            let resp = resp.on_hover_text(&path);
+            ui.painter().rect_filled(cr, 6.0, if resp.hovered() { t.hover } else { t.panel });
+            let area = egui::Rect::from_min_size(cr.min + vec2(20.0, 12.0), vec2(100.0, 108.0));
+            match modified.and_then(|m| recent_preview_texture(ui.ctx(), &path, m)) {
+                Some(tex) => {
+                    let size = tex.size_vec2();
+                    let k = (area.width() / size.x).min(area.height() / size.y);
+                    let pr = egui::Rect::from_center_size(area.center(), size * k);
+                    ui.painter().image(tex.id(), pr, egui::Rect::from_min_max(egui::pos2(0.0, 0.0), egui::pos2(1.0, 1.0)), Color32::WHITE);
+                    ui.painter().rect_stroke(pr, 0.0, Stroke::new(1.0, t.border), egui::StrokeKind::Outside);
+                }
+                // No picture (saved before files had one) or the file is gone: a blank page.
+                None => {
+                    let pr = egui::Rect::from_center_size(area.center(), vec2(62.0, 80.0));
+                    ui.painter().rect_filled(pr, 0.0, if there { Color32::from_gray(245) } else { Color32::from_gray(110) });
+                }
+            }
+            let color = if there { t.text_strong } else { t.text_dim };
+            // The name without `.designcraft`, on up to two lines (broken after a space or dash).
+            let label = crate::menus::recent_label(&path);
+            let name = label.strip_suffix(".designcraft").unwrap_or(&label).to_string();
+            let mut job = egui::text::LayoutJob::simple(name, semibold(12.0), color, cr.width() - 12.0);
+            job.wrap.max_rows = 2;
+            job.halign = egui::Align::Center;
+            let galley = ui.painter().layout_job(job);
+            ui.painter().galley(egui::pos2(cr.center().x, area.max.y + 8.0), galley, color);
+            if resp.clicked() {
+                open = Some(i);
+            }
+        }
+    });
+    if let Some(i) = open {
+        let _ = app.run("app.openRecent", json!({"index": i}));
+    }
+}
+
+/// How often a recent file is looked up on disk again, in ms: the start screen and the Open Recent
+/// menu draw every frame and must not touch the file system each time.
+pub(super) const RECENT_STAT_MS: f64 = 3000.0;
+
+/// A recent file as last seen on disk.
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct RecentStat {
+    pub exists: bool,
+    pub modified: Option<std::time::SystemTime>,
+    checked: f64,
+}
+
+/// Whether recent file `path` is there and when it last changed, looked up again at most every
+/// [`RECENT_STAT_MS`].
+pub(crate) fn recent_file_stat(ctx: &egui::Context, path: &str) -> RecentStat {
+    recent_file_stat_at(ctx, path, crate::now_ms())
+}
+
+pub(super) fn recent_file_stat_at(ctx: &egui::Context, path: &str, now: f64) -> RecentStat {
+    let key = egui::Id::unique(("recent_stat", path));
+    if let Some(st) = ctx.data(|d| d.get_temp::<RecentStat>(key))
+        && (0.0..RECENT_STAT_MS).contains(&(now - st.checked))
+    {
+        return st;
+    }
+    let meta = designcraft_engine::io::metadata(path).ok().filter(designcraft_engine::io::Metadata::is_file);
+    let st = RecentStat { exists: meta.is_some(), modified: meta.and_then(|m| m.modified().ok()), checked: now };
+    ctx.data_mut(|d| d.insert_temp(key, st.clone()));
+    st
+}
+
+/// The texture of a recent file's saved first-page picture, decoded once per file version.
+fn recent_preview_texture(ctx: &egui::Context, path: &str, modified: Option<std::time::SystemTime>) -> Option<egui::TextureHandle> {
+    type Cached = (Option<std::time::SystemTime>, Option<egui::TextureHandle>);
+    let key = egui::Id::unique(("recent_preview", path));
+    if let Some((m, tex)) = ctx.data(|d| d.get_temp::<Cached>(key))
+        && m == modified
+    {
+        return tex;
+    }
+    let tex = designcraft_engine::cmd::recent_preview(path).and_then(|p| {
+        let size = [usize::try_from(p.width).ok()?, usize::try_from(p.height).ok()?];
+        (size[0].checked_mul(size[1])?.checked_mul(4)? == p.rgba.len()).then(|| {
+            ctx.load_texture(format!("recent_preview:{path}"), egui::ColorImage::from_rgba_unmultiplied(size, &p.rgba), egui::TextureOptions::LINEAR)
+        })
+    });
+    ctx.data_mut(|d| d.insert_temp::<Cached>(key, (modified, tex.clone())));
+    tex
+}
+
+/// Start screen: the ArtCraft community (Discord first) and project links.
+fn community_card(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    egui::Frame::NONE.fill(t.panel).corner_radius(10.0).inner_margin(egui::Margin::same(14)).show(ui, |ui| {
+        // Wide enough for the longer translations of the line under the title, with the button
+        // at the right edge; the text wraps before the button's space rather than run under it.
+        const BUTTON: egui::Vec2 = vec2(190.0, 38.0);
+        ui.set_max_width(760.0);
+        ui.horizontal(|ui| {
+            let (r, _) = ui.allocate_exact_size(vec2(44.0, 44.0), Sense::hover());
+            crate::about::paint_mark(ui, r, crate::about::BRAND);
+            ui.add_space(8.0);
+            let label = crate::i18n::tr(&app.ui.language, "Join our Discord");
+            let button = crate::about::discord_button_size(ui.ctx(), label, BUTTON);
+            let text_width = (ui.available_width() - button.x - 16.0).max(120.0);
+            ui.vertical(|ui| {
+                ui.set_max_width(text_width);
+                ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Wrap);
+                ui.label(crate::rtl::widget(
+                    ui,
+                    egui::RichText::new(crate::i18n::tr(&app.ui.language, "Join the ArtCraft community")).font(semibold(14.0)).color(t.text_strong),
+                ));
+                ui.label(crate::rtl::widget(
+                    ui,
+                    egui::RichText::new(crate::i18n::tr(&app.ui.language, "Get help, share your layouts and shape what we build next."))
+                        .size(12.0)
+                        .color(t.text_dim),
+                ));
+                ui.add_space(4.0);
+                ui.horizontal(|ui| {
+                    for (text, id) in [("DesignCraft page", "help.appPage"), ("GitHub", "help.github"), ("getartcraft.com", "help.website")] {
+                        let url = designcraft_engine::links::get(&id[5..]).unwrap_or_default();
+                        let l = ui
+                            .add(egui::Label::new(egui::RichText::new(text).size(12.0).color(t.accent).underline()).sense(Sense::click()))
+                            .on_hover_text(url)
+                            .on_hover_cursor(egui::CursorIcon::PointingHand);
+                        if l.clicked() {
+                            let _ = app.run(id, json!({}));
+                        }
+                        ui.add_space(8.0);
+                    }
+                });
+            });
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                if crate::about::discord_button(ui, label, BUTTON) {
+                    let _ = app.run("help.discord", json!({}));
+                }
+            });
+        });
+    });
+}
diff --git a/crates/ui-egui/src/chrome/status_bar.rs b/crates/ui-egui/src/chrome/status_bar.rs
new file mode 100644
index 000000000..e0a9d27e2
--- /dev/null
+++ b/crates/ui-egui/src/chrome/status_bar.rs
@@ -0,0 +1,180 @@
+use super::{Color32, DesignApp, Sense, Stroke, Tokens, icons, json, panels, semibold, vec2};
+
+/// The widest a document tab grows: a longer name is shortened so its close button and the
+/// tabs after it stay in view.
+pub(super) const DOC_TAB_MAX_W: f32 = 260.0;
+
+/// Close button and padding around a tab's title.
+const DOC_TAB_PAD: f32 = 44.0;
+
+/// Draw bounded document tabs with active, dirty, preview and zoom state, plus activation and close actions.
+pub fn doc_tabs(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    let (bar, _) = ui.allocate_exact_size(vec2(ui.available_width(), 28.0), Sense::hover());
+    let max_w = DOC_TAB_MAX_W.min(bar.width());
+    let close_label = crate::i18n::tr(&app.ui.language, "Close");
+    ui.painter().rect_filled(bar, 0.0, t.tab_strip);
+    ui.painter().line_segment([bar.left_bottom(), bar.right_bottom()], Stroke::new(1.0, t.border));
+    let mut x = bar.min.x;
+    let active = app.session.active_index();
+    let zoom = app.view().map(|v| v.zoom).unwrap_or(1.0);
+    let mut activate = None;
+    let mut close = None;
+    let titles: Vec<(String, bool)> = app.session.documents().iter().map(|d| (d.title(), d.is_dirty())).collect();
+    for (i, (title, dirty)) in titles.iter().enumerate() {
+        let is_active = Some(i) == active;
+        // `*` = unsaved; the view-mode suffix only in Preview (InDesign shows its GPU mode there).
+        let suffix = if is_active && app.ui.screen_mode == crate::ScreenMode::Preview { " [Preview]" } else { "" };
+        let color = if is_active { t.text_strong } else { t.text_dim };
+        // The name gives way first; the dirty marker and zoom stay readable.
+        let zoom_label = crate::rtl::plain(ui.ctx(), &format!(" @ {:.0}%{suffix}", zoom * 100.0), semibold(11.5), color);
+        let name = format!("{}{}", if *dirty { "*" } else { "" }, crate::rtl::isolate(title));
+        let name_max = max_w - DOC_TAB_PAD - zoom_label.size().x;
+        let galley = crate::rtl::truncated(ui.ctx(), &name, semibold(11.5), color, name_max);
+        let elided = galley.elided;
+        let w = (galley.size().x + zoom_label.size().x + DOC_TAB_PAD).max(if is_active { 210.0 } else { 150.0 }).min(max_w);
+        let r = egui::Rect::from_min_size(egui::pos2(x, bar.min.y), vec2(w, 28.0));
+        let resp = ui.interact(r, ui.scope_id().with(("doctab", i)), Sense::click());
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, title));
+        let resp = if elided {
+            resp.on_hover_ui(|ui| {
+                let _ = crate::rtl::label(ui, title);
+            })
+        } else {
+            resp
+        };
+        ui.painter().rect_filled(r, 0.0, if is_active { t.panel } else { t.tab_strip });
+        let cr = egui::Rect::from_center_size(egui::pos2(r.min.x + 18.0, r.center().y), vec2(14.0, 14.0));
+        let cresp = ui.interact(cr, ui.scope_id().with(("docclose", i)), Sense::click());
+        cresp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, format!("{close_label} {title}")));
+        ui.painter().text(
+            cr.center(),
+            egui::Align2::CENTER_CENTER,
+            "×",
+            egui::FontId::proportional(14.0),
+            if cresp.hovered() { t.text_strong } else { t.text_dim },
+        );
+        let name_w = galley.size().x;
+        // Clipped too, for a window narrower than the zoom label.
+        let text = ui.painter().with_clip_rect(r);
+        text.galley(egui::pos2(r.min.x + 32.0, r.center().y - galley.size().y / 2.0), galley, Color32::WHITE);
+        text.galley(egui::pos2(r.min.x + 32.0 + name_w, r.center().y - zoom_label.size().y / 2.0), zoom_label, Color32::WHITE);
+        ui.painter().line_segment([r.right_top(), r.right_bottom()], Stroke::new(1.0, t.border));
+        if cresp.clicked() {
+            close = Some(i);
+        } else if resp.clicked() {
+            activate = Some(i);
+        }
+        x += w;
+    }
+    if let Some(i) = close {
+        crate::menus::close_document(app, Some(i));
+    } else if let Some(i) = activate {
+        let _ = app.run("file.activate", json!({"index": i}));
+    }
+}
+
+/// Show the Preflight panel. An open Preflight flyout stays: `window.panel` would close it.
+fn show_preflight(app: &mut DesignApp) {
+    if app.ui.docking_flyout.as_deref() != Some("preflight")
+        && let Err(e) = app.run("window.panel", json!({"panel": "preflight"}))
+    {
+        app.status(e);
+    }
+}
+
+pub fn status_bar(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    let resp = egui::Panel::bottom("status_bar")
+        .exact_size(17.0)
+        .frame(egui::Frame::NONE.fill(t.panel).inner_margin(egui::Margin::symmetric(8, 0)))
+        .show(ui, |ui| {
+            ui.spacing_mut().item_spacing.x = 4.0;
+            ui.horizontal_centered(|ui| {
+                let small = egui::FontId::proportional(10.5);
+                if app.session.active().is_none() {
+                    ui.label(egui::RichText::new(&app.ui.status).font(small).color(t.text_dim));
+                    return;
+                }
+                let z = app.view().map(|v| v.zoom).unwrap_or(1.0);
+                crate::menus::menu_button(ui, egui::RichText::new(format!("{:.2}% ▾", z * 100.0)).font(small.clone()), |ui| {
+                    for p in [0.05, 0.125, 0.25, 0.5, 0.75, 1.0, 2.0, 4.0, 8.0, 16.0] {
+                        if ui.button(format!("{}%", p * 100.0)).clicked() {
+                            let _ = app.run("view.zoom", json!({"zoom": p}));
+                            ui.close();
+                        }
+                    }
+                });
+                ui.add_space(8.0);
+                let n = app.session.active().map(|d| d.doc.page_count()).unwrap_or(1);
+                let cur = crate::canvas::current_page(app).unwrap_or(0);
+                if icons::button(ui, "first", 14.0, false, crate::i18n::tr(&app.ui.language, "First Spread")).clicked() {
+                    crate::canvas::go_to_page(app, 0);
+                }
+                if icons::button(ui, "prev", 14.0, false, crate::i18n::tr(&app.ui.language, "Previous Spread")).clicked() {
+                    crate::canvas::go_to_page(app, cur.saturating_sub(1));
+                }
+                let name = app.session.page_label(cur);
+                let (fr, fresp) = ui.allocate_exact_size(vec2(80.0, 14.0), Sense::click());
+                ui.painter().rect(fr, 0.0, t.input, Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
+                ui.painter().text(fr.left_center() + vec2(5.0, 0.0), egui::Align2::LEFT_CENTER, &name, small.clone(), t.text);
+                ui.painter().text(fr.right_center() - vec2(5.0, 0.0), egui::Align2::RIGHT_CENTER, "▾", small.clone(), t.text);
+                egui::Popup::menu(&fresp).show(|ui| {
+                    let names: Vec<String> = (0..n).map(|i| app.session.page_label(i)).collect();
+                    egui::ScrollArea::vertical().max_height(300.0).show(ui, |ui| {
+                        for (i, nm) in names.iter().enumerate() {
+                            if ui.button(nm).clicked() {
+                                crate::canvas::go_to_page(app, i);
+                                ui.close();
+                            }
+                        }
+                    });
+                });
+                if icons::button(ui, "next", 14.0, false, crate::i18n::tr(&app.ui.language, "Next Spread")).clicked() {
+                    crate::canvas::go_to_page(app, (cur + 1).min(n - 1));
+                }
+                if icons::button(ui, "last", 14.0, false, crate::i18n::tr(&app.ui.language, "Last Spread")).clicked() {
+                    crate::canvas::go_to_page(app, n - 1);
+                }
+                ui.add_space(12.0);
+                crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "[Basic] (working) ▾")).font(small.clone()));
+                ui.add_space(8.0);
+                // Preflight: overset text is an error.
+                let errors = panels::preflight_errors(app);
+                let (r, dot) = ui.allocate_exact_size(vec2(9.0, 9.0), Sense::click());
+                ui.painter().circle_filled(
+                    r.center(),
+                    4.0,
+                    if errors == 0 { Color32::from_rgb(60, 200, 90) } else { Color32::from_rgb(235, 50, 50) },
+                );
+                let count = if errors == 0 {
+                    format!("{} ▾", crate::i18n::tr(&app.ui.language, "No errors"))
+                } else {
+                    format!(
+                        "{} ▾",
+                        crate::i18n::count_label(
+                            &app.ui.language,
+                            if errors == 1 && !crate::i18n::category_first(&app.ui.language) { "error" } else { "errors" },
+                            errors
+                        )
+                    )
+                };
+                // As in InDesign, the count opens a menu that leads to the Preflight panel.
+                let menu = crate::menus::menu_button(ui, egui::RichText::new(count).font(small.clone()), |ui| {
+                    if ui.button(crate::i18n::tr(&app.ui.language, "Preflight Panel…")).clicked() {
+                        show_preflight(app);
+                        ui.close();
+                    }
+                });
+                // Double-clicking the light or the count shows the panel straight away (the
+                // second click has closed the menu the first one opened).
+                if dot.double_clicked() || menu.response.double_clicked() {
+                    show_preflight(app);
+                }
+                ui.add_space(12.0);
+                ui.label(egui::RichText::new(&app.ui.status).font(small).color(t.text_dim));
+            });
+        });
+    let r = resp.response.rect;
+    ui.painter().line_segment([r.left_top(), r.right_top()], Stroke::new(1.0, t.border));
+}
diff --git a/crates/ui-egui/src/chrome/tests.rs b/crates/ui-egui/src/chrome/tests.rs
new file mode 100644
index 000000000..5e420de98
--- /dev/null
+++ b/crates/ui-egui/src/chrome/tests.rs
@@ -0,0 +1,868 @@
+/// A Control panel field is labelled by its icon, so assistive technology reads "Tracking"
+/// (or "Font Size", …) with the value.
+#[test]
+fn icon_fields_are_labelled_by_their_icon() {
+    use egui::accesskit::Role;
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx, "en");
+    ctx.enable_accesskit();
+    let mut update = None;
+    for _ in 0..2 {
+        let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
+            icon_field(ui, "tracking", "Tracking", NumField::number("tracking_test", Some(0.0), "", 0));
+        });
+        out.textures_delta.clear();
+        update = out.platform_output.accesskit_update;
+    }
+    let update = update.expect("an AccessKit tree");
+    let named = |n: &egui::accesskit::Node| n.label() == Some("Tracking") || n.value() == Some("Tracking");
+    let icon = update.nodes.iter().find(|(_, n)| named(n)).map(|(id, _)| *id).expect("the icon's node");
+    assert!(update.nodes.iter().any(|(_, n)| n.role() == Role::TextInput && n.labelled_by().contains(&icon)), "the editor names its icon");
+}
+use egui::{pos2, vec2};
+use egui_kittest::kittest::{NodeT, Queryable};
+
+use super::*;
+use crate::test_window::{self, wheel};
+
+/// The Control panel's last control with no text frame selected.
+const LAST_CONTROL: &str = "Align bottom edges";
+const FIRST_CONTROL: &str = "Rotate 90° Counterclockwise";
+
+/// The start screen and Open Recent menu look a recent file up on disk at most every few
+/// seconds, not every frame.
+#[test]
+fn recent_files_are_looked_up_on_disk_every_few_seconds() {
+    let dir = tempfile::tempdir().unwrap();
+    let path = dir.path().join("a.designcraft");
+    std::fs::write(&path, b"x").unwrap();
+    let path = path.to_string_lossy().to_string();
+    let ctx = egui::Context::default();
+    let first = super::recent_file_stat_at(&ctx, &path, 10_000.0);
+    assert!(first.exists && first.modified.is_some());
+    std::fs::remove_file(&path).unwrap();
+    assert_eq!(super::recent_file_stat_at(&ctx, &path, 10_000.0 + super::RECENT_STAT_MS - 1.0), first, "cached");
+    assert!(!super::recent_file_stat_at(&ctx, &path, 10_000.0 + super::RECENT_STAT_MS).exists, "looked up again");
+}
+
+fn app() -> crate::DesignApp {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui.control_bar = true;
+    app
+}
+
+/// A document with a rectangle selected, so the object controls are enabled.
+fn app_with_selection() -> crate::DesignApp {
+    let mut app = app();
+    app.run("file.new", serde_json::json!({})).unwrap();
+    app.run("frame.create", serde_json::json!({"rect": [72, 72, 300, 200]})).unwrap();
+    app.run("edit.selectAll", serde_json::json!({})).unwrap();
+    app
+}
+
+/// The rect of an object Control panel group.
+fn group(h: &egui_kittest::Harness<'static, test_window::Window>, id: &str) -> egui::Rect {
+    h.ctx.read_response(egui::Id::unique(("object_control", id))).unwrap().rect
+}
+
+/// The rect of the node with this label, preferring the one in the Control bar's row: the
+/// Properties panel has buttons with the same names.
+fn rect(h: &egui_kittest::Harness<'static, test_window::Window>, label: &str) -> egui::Rect {
+    let bar = test_window::panel_rect(h, "control_bar");
+    h.query_all_by_label(label).map(|n| n.rect()).find(|r| bar.y_range().contains(r.center().y)).unwrap_or_else(|| h.get_by_label(label).rect())
+}
+
+/// The application bar's search field (German interface).
+fn search_node<'h>(h: &'h egui_kittest::Harness<'static, test_window::Window>) -> egui_kittest::Node<'h> {
+    h.get_by(|n| n.role() == egui::accesskit::Role::TextInput && n.placeholder() == Some(crate::i18n::tr("de", "Search")))
+}
+
+/// A document with two frames, the Selection tool, German menus, and the search field clicked.
+fn searching() -> egui_kittest::Harness<'static, test_window::Window> {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui.language = "de".into();
+    let mut h = test_window::open(app, vec2(1440.0, 900.0));
+    let app = &mut h.state_mut().app;
+    app.run("frame.create", serde_json::json!({"rect": [36, 36, 200, 200]})).unwrap();
+    app.run("frame.create", serde_json::json!({"rect": [236, 36, 400, 200]})).unwrap();
+    app.run("edit.deselectAll", serde_json::json!({})).unwrap();
+    h.run_steps(4);
+    let field = search_node(&h).rect();
+    test_window::click_at(&mut h, field.center());
+    assert!(h.ctx.memory(|m| m.has_focus(super::search_id())), "a click gives the field the keyboard");
+    h
+}
+
+/// A match in the search's list, whose accessible label ends in its shortcut.
+fn row<'h>(h: &'h egui_kittest::Harness<'static, test_window::Window>, label: &'static str) -> Option<egui_kittest::Node<'h>> {
+    h.query_by(move |n| n.label().is_some_and(|l| l == label || l.starts_with(&format!("{label} "))))
+}
+
+fn items(h: &egui_kittest::Harness<'static, test_window::Window>) -> (usize, usize) {
+    let d = h.state().app.session.active().unwrap();
+    (d.doc.spreads.iter().flat_map(|sp| &sp.items).count(), d.selection.items.len())
+}
+
+#[test]
+fn the_search_field_finds_and_runs_menu_commands() {
+    let mut h = searching();
+    let group = crate::i18n::tr("de", "Group");
+    h.event(egui::Event::Text(group.to_lowercase()));
+    h.run_steps(4);
+    assert!(row(&h, group).is_some(), "the German label is listed");
+    // Nothing is selected, so Group is off and Return doesn't run it.
+    assert!(row(&h, group).is_some_and(|n| n.accesskit_node().is_disabled()));
+    h.key_press(egui::Key::Enter);
+    h.run_steps(4);
+    assert_eq!(items(&h), (2, 0), "a disabled command doesn't run");
+    // Select both frames, then ↓ ↑ Return runs the first match, as Object › Group would.
+    h.state_mut().app.run("edit.selectAll", serde_json::json!({})).unwrap();
+    h.key_press(egui::Key::ArrowDown);
+    h.run_steps(2);
+    h.key_press(egui::Key::ArrowUp);
+    h.run_steps(2);
+    h.key_press(egui::Key::Enter);
+    h.run_steps(4);
+    assert_eq!(items(&h).0, 1, "the two frames are grouped");
+    assert!(row(&h, group).is_none(), "the matches closed");
+    assert!(!h.ctx.memory(|m| m.has_focus(super::search_id())), "the field gave the keyboard back");
+}
+
+#[test]
+fn keys_typed_in_the_search_field_stay_out_of_the_document() {
+    let mut h = searching();
+    h.state_mut().app.run("edit.selectAll", serde_json::json!({})).unwrap();
+    // Escape would switch this tool back to the Selection tool.
+    h.state_mut().app.run("tool.select", serde_json::json!({"tool": "rectangleFrame"})).unwrap();
+    h.run_steps(2);
+    // Tool keys, Delete and Backspace edit the query; the tool and the frames stay.
+    for key in [egui::Key::P, egui::Key::T, egui::Key::M, egui::Key::Delete, egui::Key::Backspace] {
+        h.key_press(key);
+        h.run_steps(2);
+    }
+    h.key_press_modifiers(egui::Modifiers::COMMAND, egui::Key::A);
+    h.run_steps(2);
+    assert_eq!(h.state().app.session.tool_id(), "rectangleFrame");
+    assert_eq!(items(&h), (2, 2), "nothing was deleted or deselected");
+    h.event(egui::Event::Text("zz-no-such-command".into()));
+    h.run_steps(4);
+    assert!(h.query_by_label(crate::i18n::tr("de", "No matching commands")).is_some());
+    // Escape closes the matches and clears the field without touching the document.
+    h.key_press(egui::Key::Escape);
+    h.run_steps(4);
+    assert!(h.query_by_label(crate::i18n::tr("de", "No matching commands")).is_none());
+    assert!(!h.ctx.text_edit_focused());
+    assert_eq!(h.state().app.session.tool_id(), "rectangleFrame");
+    assert_eq!(items(&h), (2, 2));
+    let field = search_node(&h);
+    assert_eq!(field.value().unwrap_or_default(), "", "the query is cleared");
+}
+
+/// The status bar's preflight count is a menu; its Preflight Panel entry shows the panel.
+#[test]
+fn status_bar_error_count_opens_the_preflight_panel() {
+    let mut app = app();
+    app.run("file.new", serde_json::json!({})).unwrap();
+    app.ui.dock_tab = "properties".into();
+    let mut h = test_window::open(app, vec2(1200.0, 700.0));
+    h.get_by_label("No errors ▾").click();
+    h.run_steps(3);
+    h.get_by_label("Preflight Panel…").click();
+    h.run_steps(3);
+    // Preflight is in the iconic column: `window.panel` shows it.
+    assert!(crate::panel_docking::showing(&h.state().app, "preflight"));
+    assert!(h.query_all_by_label("Preflight").count() >= 2, "its icon and its tab in the flyout");
+    // With the panel already showing, the entry keeps it open.
+    h.get_by_label("No errors ▾").click();
+    h.run_steps(3);
+    h.get_by_label("Preflight Panel…").click();
+    h.run_steps(3);
+    assert!(crate::panel_docking::showing(&h.state().app, "preflight"));
+}
+
+/// As in InDesign, double-clicking the preflight count (or its light) shows the panel.
+#[test]
+fn double_clicking_the_status_bar_error_count_opens_the_preflight_panel() {
+    let mut app = app();
+    app.run("file.new", serde_json::json!({})).unwrap();
+    app.ui.dock_tab = "properties".into();
+    let mut h = test_window::open_stepped(app, vec2(1200.0, 700.0), 1.0, 1.0 / 60.0);
+    let count = h.get_by_label("No errors ▾");
+    count.click();
+    count.click();
+    h.run_steps(3);
+    assert!(crate::panel_docking::showing(&h.state().app, "preflight"));
+    assert!(h.query_all_by_label("Preflight").count() >= 2, "its icon and its tab in the flyout");
+    assert!(h.query_by_label("Preflight Panel…").is_none(), "the menu isn't left open");
+    // A double-click with the panel already showing keeps it open (the first click closes
+    // its flyout, the double-click opens it again). Past the double-click time, so the
+    // clicks are not counted with the ones before.
+    h.run_steps(30);
+    let count = h.get_by_label("No errors ▾");
+    count.click();
+    count.click();
+    h.run_steps(3);
+    assert!(crate::panel_docking::showing(&h.state().app, "preflight"));
+}
+
+/// A very long document name made its tab grow past the window, hiding the close button
+/// and the tabs after it (#603).
+#[test]
+fn long_document_names_keep_tabs_short_and_close_buttons_visible() {
+    let latin = "Quarterly report with a very long file name ".repeat(6);
+    let hebrew = "דוח רבעוני עם שם קובץ ארוך מאוד ".repeat(6);
+    // Use the bundled or pinned test face; optional-input builds without either skip
+    // the Hebrew tab explicitly instead of rendering tofu under the strict glyph policy.
+    let hebrew_ok = test_window::install_test_hebrew_face();
+    if !hebrew_ok {
+        eprintln!("skipped the Hebrew tab: set DESIGNCRAFT_TEST_HEBREW_FONT to the pinned NotoSansHebrew.ttf");
+    }
+    let mut app = app();
+    app.run("file.new", serde_json::json!({ "title": latin })).unwrap();
+    if hebrew_ok {
+        app.run("file.new", serde_json::json!({ "title": hebrew })).unwrap();
+    }
+    app.run("file.new", serde_json::json!({ "title": "Short" })).unwrap();
+    let h = test_window::open(app, vec2(1200.0, 600.0));
+    let titles = if hebrew_ok { vec![latin.as_str(), hebrew.as_str()] } else { vec![latin.as_str()] };
+    for title in titles {
+        let tab = rect(&h, title);
+        assert!(tab.width() <= super::DOC_TAB_MAX_W, "{title:?} tab is {} wide", tab.width());
+        let close = rect(&h, &format!("Close {title}"));
+        assert!(tab.contains_rect(close), "close button {close:?} outside its tab {tab:?}");
+    }
+    let (first, short) = (rect(&h, &latin), rect(&h, "Short"));
+    assert!(short.min.x - first.min.x <= 2.0 * super::DOC_TAB_MAX_W, "the last tab {short:?} starts too far right");
+}
+
+/// Zero2Graphic's page layout video (0:48): with the Type tool, the Control panel's font size
+/// has a list of sizes; the instructor picks 72 pt from it. Leading has the same list.
+#[test]
+fn the_type_control_panel_lists_font_sizes_and_leadings() {
+    let mut app = app();
+    app.run("file.new", serde_json::json!({})).unwrap();
+    let f = app.run("frame.create", serde_json::json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Headline"})).unwrap();
+    app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 8})).unwrap();
+    app.session.set_tool("type");
+    let mut h = test_window::open(app, vec2(1800.0, 700.0));
+    let bar = test_window::panel_rect(&h, "control_bar");
+    let in_bar = |r: &egui::Rect| bar.y_range().contains(r.center().y);
+    let field = |h: &egui_kittest::Harness<'static, test_window::Window>, value: &str| {
+        h.query_all_by_value(value).map(|n| n.rect()).find(in_bar).unwrap_or_else(|| panic!("no {value:?} field in the Control panel"))
+    };
+    let press = |h: &mut egui_kittest::Harness<'static, test_window::Window>, p: egui::Pos2| {
+        h.hover_at(p);
+        h.drag_at(p);
+        h.drop_at(p);
+    };
+    let size_of = |h: &egui_kittest::Harness<'static, test_window::Window>| {
+        let st = h.state().app.session.doc().unwrap();
+        let sid = designcraft_doc::StoryId(f["story"].as_u64().unwrap());
+        st.doc.story(sid).unwrap().format_after(0).over.size
+    };
+    // The ⌄ segment right of the size field opens the list; choosing 72 pt sets the size.
+    let size = field(&h, "12 pt");
+    let chevron = pos2(size.max.x + 1.0 + crate::widgets::SEG_W / 2.0, size.center().y);
+    press(&mut h, chevron);
+    h.run_steps(3);
+    h.get_by_label("72 pt").click();
+    h.run_steps(3);
+    assert_eq!(size_of(&h), Some(72.0));
+    // Auto leading shows in parentheses, with the same list beside it.
+    let lead = field(&h, "(86.4 pt)");
+    press(&mut h, pos2(lead.max.x + 1.0 + crate::widgets::SEG_W / 2.0, lead.center().y));
+    h.run_steps(3);
+    h.get_by_label("60 pt").click();
+    h.run_steps(3);
+    let st = h.state().app.session.doc().unwrap();
+    let sid = designcraft_doc::StoryId(f["story"].as_u64().unwrap());
+    assert_eq!(st.doc.story(sid).unwrap().format_after(0).over.leading, Some(designcraft_doc::Leading::Points(60.0)));
+    // The spinner left of the size steps it by a point.
+    let size = field(&h, "72 pt");
+    press(&mut h, pos2(size.min.x - 5.0 - crate::widgets::SEG_W / 2.0, size.min.y + 3.0));
+    h.run_steps(3);
+    assert_eq!(size_of(&h), Some(73.0));
+    // Typing the automatic value itself over "(87.6 pt)" fixes the leading at it.
+    h.state_mut().app.run("type.char", serde_json::json!({"attrs": {"leading": {"kind": "auto"}}})).unwrap();
+    h.run_steps(3);
+    let lead = field(&h, "(87.6 pt)");
+    press(&mut h, lead.center());
+    h.run_steps(2);
+    h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
+    h.event(egui::Event::Text("87.6".into()));
+    h.key_press(egui::Key::Enter);
+    h.run_steps(3);
+    let st = h.state().app.session.doc().unwrap();
+    let sid = designcraft_doc::StoryId(f["story"].as_u64().unwrap());
+    assert_eq!(st.doc.story(sid).unwrap().format_after(0).over.leading, Some(designcraft_doc::Leading::Points(87.6)));
+    // Escape cancels: the same typing, then Escape, leaves the leading automatic.
+    h.state_mut().app.run("type.char", serde_json::json!({"attrs": {"leading": {"kind": "auto"}}})).unwrap();
+    h.run_steps(3);
+    let auto = h.state().app.session.doc().unwrap().doc.story(sid).unwrap().format_after(0).over.leading;
+    let lead = field(&h, "(87.6 pt)");
+    press(&mut h, lead.center());
+    h.run_steps(2);
+    h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
+    h.event(egui::Event::Text("87.6".into()));
+    h.key_press(egui::Key::Escape);
+    h.run_steps(3);
+    assert_eq!(h.state().app.session.doc().unwrap().doc.story(sid).unwrap().format_after(0).over.leading, auto, "Escape leaves it automatic");
+    // Escape also reverts a different number, in the leading field and in a plain one. (It
+    // leaves the text too, so each try selects it again.)
+    for (shown, typed) in [("(87.6 pt)", "20"), ("73 pt", "50")] {
+        h.state_mut().app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 8})).unwrap();
+        h.state_mut().app.session.set_tool("type");
+        h.run_steps(3);
+        let r = field(&h, shown);
+        press(&mut h, r.center());
+        h.run_steps(2);
+        h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
+        h.event(egui::Event::Text(typed.into()));
+        h.key_press(egui::Key::Escape);
+        h.run_steps(3);
+    }
+    assert_eq!(h.state().app.session.doc().unwrap().doc.story(sid).unwrap().format_after(0).over.leading, auto, "still automatic");
+    assert_eq!(size_of(&h), Some(73.0), "the size is unchanged");
+}
+
+/// The Control panel's ¶ mode on a First Line Only paragraph: Align to Baseline Grid shows
+/// pressed, and a click turns alignment off instead of making it All Lines.
+#[test]
+fn the_control_panel_grid_button_keeps_first_line_only() {
+    use egui_kittest::kittest::{NodeT, Queryable};
+    let mut app = app();
+    app.run("file.new", serde_json::json!({})).unwrap();
+    let f = app.run("frame.create", serde_json::json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Bulbs"})).unwrap();
+    app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 5})).unwrap();
+    app.run("type.para", serde_json::json!({"attrs": {"gridAlign": "firstLineOnly"}})).unwrap();
+    app.session.set_tool("type");
+    let mut h = test_window::open(app, vec2(2400.0, 700.0));
+    let bar = test_window::panel_rect(&h, "control_bar");
+    let in_bar = move |r: egui::Rect| bar.y_range().contains(r.center().y);
+    let click = |h: &mut egui_kittest::Harness<'static, test_window::Window>, label: &str| {
+        let r = h.query_all_by_label(label).map(|n| n.rect()).find(|r| in_bar(*r)).unwrap_or_else(|| panic!("no {label:?} in the Control panel"));
+        h.hover_at(r.center());
+        h.drag_at(r.center());
+        h.drop_at(r.center());
+        h.run_steps(3);
+    };
+    click(&mut h, "Paragraph Formatting Controls");
+    let pressed = h.query_all_by_label("Align to Baseline Grid").find(|n| in_bar(n.rect())).map(|n| n.accesskit_node().toggled());
+    assert_eq!(pressed, Some(Some(egui::accesskit::Toggled::True)));
+    assert_eq!(crate::panels::text_attrs(&mut h.state_mut().app).unwrap()["para"]["gridAlign"], "firstLineOnly");
+    click(&mut h, "Align to Baseline Grid");
+    assert_eq!(crate::panels::text_attrs(&mut h.state_mut().app).unwrap()["para"]["gridAlign"], "none");
+}
+
+/// The course's chapter 16: the text Control panel has InDesign's two modes. A shows the
+/// Character Formatting Controls (the case buttons, kerning and tracking, the scales…), ¶ the
+/// Paragraph Formatting Controls (alignment, indents, spacing, the drop cap…).
+#[test]
+fn the_type_control_panel_has_character_and_paragraph_modes() {
+    let mut app = app();
+    app.run("file.new", serde_json::json!({})).unwrap();
+    let f = app.run("frame.create", serde_json::json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Bulbs"})).unwrap();
+    app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 5})).unwrap();
+    app.session.set_tool("type");
+    let mut h = test_window::open(app, vec2(2400.0, 700.0));
+    let bar = test_window::panel_rect(&h, "control_bar");
+    let in_bar = move |r: egui::Rect| bar.y_range().contains(r.center().y);
+    let click = |h: &mut egui_kittest::Harness<'static, test_window::Window>, label: &str| {
+        let r = h.query_all_by_label(label).map(|n| n.rect()).find(|r| in_bar(*r)).unwrap_or_else(|| panic!("no {label:?} in the Control panel"));
+        h.hover_at(r.center());
+        h.drag_at(r.center());
+        h.drop_at(r.center());
+        h.run_steps(3);
+    };
+    let has = |h: &egui_kittest::Harness<'static, test_window::Window>, label: &str| h.query_all_by_label(label).any(|n| in_bar(n.rect()));
+    assert!(has(&h, "Small Caps") && has(&h, "Vertical Scale") && !has(&h, "Drop Cap Number of Lines"));
+    click(&mut h, "Small Caps");
+    click(&mut h, "Paragraph Formatting Controls");
+    assert!(has(&h, "Drop Cap Number of Lines") && has(&h, "Space Before") && !has(&h, "Small Caps"));
+    click(&mut h, "Align to Baseline Grid");
+    click(&mut h, "Align center");
+    let a = crate::panels::text_attrs(&mut h.state_mut().app).unwrap();
+    assert_eq!(a["chars"]["capitalization"], "smallCaps");
+    assert_eq!(a["para"]["gridAlign"], "allLines");
+    assert_eq!(a["para"]["align"], "center");
+    click(&mut h, "Character Formatting Controls");
+    assert!(has(&h, "Small Caps"));
+}
+
+/// The course's chapter 21: the ¶ Control panel has InDesign's Bulleted and Numbered List
+/// buttons (with the default hanging indent), and Shading and Border with their colours and
+/// the Paragraph Borders and Shading dialog.
+#[test]
+fn the_paragraph_control_panel_has_lists_shading_and_border() {
+    let mut app = app();
+    app.run("file.new", serde_json::json!({})).unwrap();
+    let f = app
+        .run(
+            "frame.create",
+            serde_json::json!({"rect": [72, 72, 400, 300], "content": "text", "text": "4 eggs
+1 cup milk"}),
+        )
+        .unwrap();
+    app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 15})).unwrap();
+    app.session.set_tool("type");
+    let mut h = test_window::open(app, vec2(2400.0, 700.0));
+    let bar = test_window::panel_rect(&h, "control_bar");
+    let in_bar = move |r: egui::Rect| bar.y_range().contains(r.center().y);
+    let click = |h: &mut egui_kittest::Harness<'static, test_window::Window>, label: &str, nth: usize| {
+        let r = h
+            .query_all_by_label(label)
+            .map(|n| n.rect())
+            .filter(|r| in_bar(*r))
+            .nth(nth)
+            .unwrap_or_else(|| panic!("no {label:?} in the Control panel"));
+        h.hover_at(r.center());
+        h.drag_at(r.center());
+        h.drop_at(r.center());
+        h.run_steps(3);
+    };
+    click(&mut h, "Paragraph Formatting Controls", 0);
+    click(&mut h, "Bulleted List", 0);
+    let a = crate::panels::text_attrs(&mut h.state_mut().app).unwrap();
+    assert_eq!(
+        (a["para"]["listType"].as_str(), a["para"]["leftIndent"].as_f64(), a["para"]["firstLineIndent"].as_f64()),
+        (Some("bullets"), Some(18.0), Some(-18.0))
+    );
+    click(&mut h, "Numbered List", 0);
+    assert_eq!(crate::panels::text_attrs(&mut h.state_mut().app).unwrap()["para"]["listType"], "numbers");
+    click(&mut h, "Shading", 0);
+    click(&mut h, "Border", 0);
+    let a = crate::panels::text_attrs(&mut h.state_mut().app).unwrap();
+    assert_eq!((a["para"]["shadingOn"].as_bool(), a["para"]["borderOn"].as_bool()), (Some(true), Some(true)));
+    assert!(h.query_all_by_label("Paragraph Shading").any(|n| in_bar(n.rect())), "the shading colour");
+    // The icon beside Border opens the dialog on its Border tab.
+    click(&mut h, "Paragraph Borders and Shading…", 1);
+    let d = h.state().app.ui.dialog.clone().expect("the dialog");
+    assert_eq!((d.id.as_str(), d.s("section").as_str()), ("paragraphLocal", "border"));
+    // The Last Line Right Indent takes a negative value, as the First Line Left Indent does.
+    h.state_mut().app.ui.dialog = None;
+    h.state_mut().app.run("text.select", serde_json::json!({"story": f["story"], "anchor": 0, "focus": 15})).unwrap();
+    h.state_mut().app.session.set_tool("type");
+    h.run_steps(3);
+    // The field is labelled by its icon.
+    let at = h
+        .query_all_by_label("Last Line Right Indent")
+        .filter(|n| n.accesskit_node().role() == egui::accesskit::Role::TextInput)
+        .map(|n| n.rect())
+        .find(|r| in_bar(*r))
+        .expect("the last line indent")
+        .center();
+    h.hover_at(at);
+    h.drag_at(at);
+    h.drop_at(at);
+    h.run_steps(2);
+    h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
+    h.event(egui::Event::Text("-0p6".into()));
+    h.key_press(egui::Key::Enter);
+    h.run_steps(3);
+    assert_eq!(crate::panels::text_attrs(&mut h.state_mut().app).unwrap()["para"]["lastLineIndent"].as_f64(), Some(-6.0));
+}
+
+#[test]
+fn the_page_tool_has_its_own_control_panel() {
+    // Chris Cicchino's Page Tool and Liquid Layout video (1:02): with the Page tool, the
+    // Control panel shows the page's size, preset, orientation and liquid page rule.
+    let mut app = app();
+    app.run("file.new", serde_json::json!({"width": 252, "height": 144, "facingPages": false})).unwrap();
+    app.session.set_tool("page");
+    let mut h = test_window::open(app, vec2(1800.0, 600.0));
+    let _ = h.get_by_label("Liquid Page Rule:");
+    // Pages don't move within their spread, so there is no "Objects Move with Page" option, and
+    // no "Controlled by Parent" rule until parent pages have rules of their own.
+    assert!(h.query_by_label("Objects Move with Page").is_none());
+    assert!(!crate::panels::interactive::LIQUID_RULES.iter().any(|(r, _)| *r == designcraft_doc::LiquidRule::ControlledByParent));
+    assert_eq!(crate::panels::properties::preset_name(252.0, 144.0), "US Business Card");
+    h.get_by_label("Show Parent Page Overlay").click();
+    h.run_steps(4);
+    assert!(h.state().app.session.doc().unwrap().doc.spreads[0].pages[0].show_parent_overlay);
+}
+
+#[test]
+fn a_narrow_window_scrolls_the_control_bar() {
+    let w = 700.0;
+    let mut h = test_window::open(app_with_selection(), vec2(w, 600.0));
+    let bar = test_window::panel_rect(&h, "control_bar");
+    assert!(rect(&h, LAST_CONTROL).max.x > w, "the controls are wider than the window");
+    // A plain mouse wheel scrolls the bar sideways.
+    let first = rect(&h, FIRST_CONTROL).center();
+    wheel(&mut h, first, vec2(0.0, -3000.0));
+    let last = rect(&h, LAST_CONTROL);
+    let window = egui::Rect::from_min_size(pos2(0.0, 0.0), vec2(w, 600.0));
+    assert!(window.contains_rect(last) && bar.contains_rect(last), "{last:?} outside the bar {bar:?}");
+    assert_eq!(test_window::panel_rect(&h, "control_bar").height(), bar.height(), "the bar keeps its height");
+    // A popup opened from a scrolled control opens at that control.
+    let appearance = group(&h, "appearance");
+    let fill = egui::Rect::from_min_size(appearance.min, vec2(30.0, crate::widgets::FIELD_H));
+    let chip = pos2(fill.min.x + 9.0, fill.center().y);
+    h.hover_at(chip);
+    h.drag_at(chip);
+    h.drop_at(chip);
+    h.run_steps(4);
+    let item = rect(&h, "[Black]");
+    assert!(item.min.y > fill.max.y && (item.min.x - chip.x).abs() < 120.0, "popup item at {item:?}, control at {chip:?}");
+}
+
+#[test]
+fn the_mac_app_bar_centres_and_clears_the_traffic_lights() {
+    use super::{MAC_APP_BAR, MAC_CONTENT_LEFT, MAC_LIGHT, MAC_LIGHT_PITCH, MAC_LIGHTS_LEFT};
+    // Content keeps the same gap after the lights as the lights keep from the top.
+    let margin = (MAC_APP_BAR - MAC_LIGHT) / 2.0;
+    assert_eq!(MAC_CONTENT_LEFT - (MAC_LIGHTS_LEFT + 2.0 * MAC_LIGHT_PITCH + MAC_LIGHT), margin);
+    // `egui::Margin` is in `i8`.
+    assert!(MAC_CONTENT_LEFT <= f32::from(i8::MAX));
+    let mut app = app();
+    app.integrated_titlebar = true;
+    let h = test_window::open(app, vec2(1400.0, 900.0));
+    // The bar's controls share the lights' centre line and start after them (relative to the
+    // bar, which the test window insets).
+    let bar = test_window::panel_rect(&h, "app_bar").min.to_vec2();
+    let home = rect(&h, "Home").translate(-bar);
+    assert_eq!(home.center().y, MAC_APP_BAR / 2.0, "{home:?}");
+    assert!(home.min.y >= 2.0 && home.min.x >= MAC_CONTENT_LEFT, "{home:?}");
+    for label in ["File", "Help", "Share"] {
+        let r = rect(&h, label).translate(-bar);
+        assert!((r.center().y - MAC_APP_BAR / 2.0).abs() <= 0.5 && r.max.y <= MAC_APP_BAR, "{label} at {r:?}");
+    }
+}
+
+fn press(h: &egui_kittest::Harness<'static, test_window::Window>, pos: egui::Pos2, pressed: bool) {
+    h.event(egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE });
+}
+
+/// The window commands the app sends over the next `steps` frames.
+fn window_commands(h: &mut egui_kittest::Harness<'static, test_window::Window>, steps: usize) -> Vec<egui::ViewportCommand> {
+    let mut out = Vec::new();
+    for _ in 0..steps {
+        h.step();
+        if let Some(v) = h.output().viewport_output.get(&egui::ViewportId::ROOT) {
+            out.extend(v.commands.iter().cloned());
+        }
+    }
+    out
+}
+
+fn double_click(h: &mut egui_kittest::Harness<'static, test_window::Window>, pos: egui::Pos2) -> Vec<egui::ViewportCommand> {
+    h.hover_at(pos);
+    h.step();
+    // One frame: the harness gives each queued event a frame of its own, longer apart than a
+    // double-click allows.
+    for pressed in [true, false, true, false] {
+        h.input_mut().events.push(egui::Event::PointerButton {
+            pos,
+            button: egui::PointerButton::Primary,
+            pressed,
+            modifiers: egui::Modifiers::NONE,
+        });
+    }
+    window_commands(h, 3)
+}
+
+fn drag(h: &mut egui_kittest::Harness<'static, test_window::Window>, from: egui::Pos2) -> Vec<egui::ViewportCommand> {
+    h.hover_at(from);
+    h.step();
+    press(h, from, true);
+    let mut out = window_commands(h, 1);
+    for i in 1..=6 {
+        h.hover_at(from + vec2(8.0 * i as f32, 3.0));
+        out.extend(window_commands(h, 1));
+    }
+    press(h, from + vec2(48.0, 3.0), false);
+    out.extend(window_commands(h, 2));
+    out
+}
+
+#[test]
+fn the_empty_mac_title_bar_zooms_and_moves_the_window() {
+    use super::{MAC_APP_BAR, MAC_CONTENT_LEFT};
+    use egui::ViewportCommand::{Maximized, Minimized, StartDrag};
+    let mut app = app();
+    app.integrated_titlebar = true;
+    let mut h = test_window::open(app, vec2(1400.0, 900.0));
+    let bar = test_window::panel_rect(&h, "app_bar");
+    // Under the centred title, and between the traffic lights and the Home button.
+    let empty = [pos2(bar.center().x, bar.min.y + MAC_APP_BAR / 2.0), pos2(bar.min.x + MAC_CONTENT_LEFT - 4.0, bar.min.y + 4.0)];
+    for at in empty {
+        // Tests read the setting as its default, zoom.
+        let cmds = double_click(&mut h, at);
+        assert_eq!(cmds, vec![Maximized(true)], "double-click at {at:?}");
+        let cmds = drag(&mut h, at);
+        assert_eq!(cmds, vec![StartDrag], "drag from {at:?}");
+    }
+    // The bar's controls keep their clicks and drags.
+    for label in ["Home", "Share", "File"] {
+        let at = rect(&h, label).center();
+        let cmds = double_click(&mut h, at);
+        assert!(!cmds.iter().any(|c| matches!(c, Maximized(_) | Minimized(_))), "double-click on {label}: {cmds:?}");
+        if label == "Home" {
+            assert_eq!(h.state().app.ui.status, "Home", "Home took its clicks");
+        }
+        h.key_press(egui::Key::Escape);
+        h.run_steps(2);
+        let cmds = drag(&mut h, at);
+        assert!(!cmds.contains(&StartDrag), "drag from {label}: {cmds:?}");
+        h.key_press(egui::Key::Escape);
+        h.run_steps(2);
+    }
+}
+
+#[test]
+fn the_mac_window_is_not_movable_on_the_title_bar_controls() {
+    use super::{MAC_APP_BAR, MAC_CONTENT_LEFT};
+    let mut app = app();
+    app.integrated_titlebar = true;
+    let mut h = test_window::open(app, vec2(1400.0, 900.0));
+    let bar = test_window::panel_rect(&h, "app_bar");
+    let mid = bar.min.y + MAC_APP_BAR / 2.0;
+    // The search field is the bar's last control: 125 wide, 4 from the 10-wide right margin.
+    let search = pos2(bar.max.x - 10.0 - 4.0 - 60.0, mid);
+    let controls = [rect(&h, "Home").center(), rect(&h, "Share").center(), rect(&h, "File").center(), search];
+    let mut movable_at = |at: egui::Pos2| {
+        h.hover_at(at);
+        h.run_steps(2);
+        craft_window::title_bar::window_movable(&h.ctx)
+    };
+    for at in [pos2(bar.center().x, mid), pos2(bar.min.x + MAC_CONTENT_LEFT - 4.0, bar.min.y + 4.0), pos2(bar.center().x, 500.0)] {
+        assert!(movable_at(at), "empty title bar or the page at {at:?}");
+    }
+    for at in controls {
+        assert!(!movable_at(at), "control at {at:?}");
+    }
+}
+
+#[test]
+fn a_narrow_window_scrolls_the_app_bar() {
+    let w = 640.0;
+    let mut h = test_window::open(app(), vec2(w, 600.0));
+    let (help, share) = (rect(&h, "Help"), rect(&h, "Share"));
+    assert!(help.max.x <= share.min.x, "the menus ({help:?}) and the workspace controls ({share:?}) overlap");
+    wheel(&mut h, help.center(), vec2(0.0, -3000.0));
+    let share = rect(&h, "Share");
+    let window = egui::Rect::from_min_size(pos2(0.0, 0.0), vec2(w, 600.0));
+    assert!(window.contains_rect(share), "{share:?} outside the window");
+}
+
+#[test]
+fn a_wide_window_does_not_scroll_the_bars() {
+    let mut h = test_window::open(app(), vec2(1400.0, 900.0));
+    let before = [rect(&h, FIRST_CONTROL), rect(&h, LAST_CONTROL), rect(&h, "Help"), rect(&h, "Share")];
+    assert!(before.iter().all(|r| r.max.x <= 1400.0), "{before:?}");
+    wheel(&mut h, before[0].center(), vec2(0.0, -3000.0));
+    wheel(&mut h, before[2].center(), vec2(0.0, -3000.0));
+    let after = [rect(&h, FIRST_CONTROL), rect(&h, LAST_CONTROL), rect(&h, "Help"), rect(&h, "Share")];
+    assert_eq!(after, before);
+}
+
+/// At 115% the app bar fits a wide window exactly: it must not scroll sideways by a rounding error.
+#[test]
+fn the_app_bar_does_not_scroll_at_115_percent() {
+    let w = 1400.0;
+    let mut h = test_window::open_scaled(app(), vec2(w, 900.0), 1.15);
+    assert_eq!(h.ctx.pixels_per_point(), 1.15);
+    let before = [rect(&h, "Help"), rect(&h, "Share")];
+    assert!(before.iter().all(|r| r.max.x <= w), "{before:?}");
+    wheel(&mut h, before[0].center(), vec2(0.0, -3000.0));
+    wheel(&mut h, before[0].center(), vec2(-3000.0, 0.0));
+    let after = [rect(&h, "Help"), rect(&h, "Share")];
+    assert_eq!(after, before, "the app bar scrolled sideways although everything fits");
+}
+
+#[test]
+fn a_scrolled_bar_keeps_its_captions_on_one_line() {
+    let mut app = app();
+    app.run("file.new", serde_json::json!({})).unwrap();
+    let f = app.run("frame.create", serde_json::json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hello"})).unwrap();
+    app.run("selection.set", serde_json::json!({"ids": [f["id"]]})).unwrap();
+    let mut h = test_window::open(app, vec2(700.0, 600.0));
+    let bar = test_window::panel_rect(&h, "control_bar").center();
+    wheel(&mut h, bar, vec2(0.0, -3000.0));
+    // The text frame's last group keeps its full size, not only what is left of the row.
+    let columns = group(&h, "columns");
+    assert!(columns.width() >= 48.0 && columns.max.x <= 700.0, "Columns group squeezed or off screen: {columns:?}");
+}
+
+struct WindowHarness {
+    ctx: egui::Context,
+    app: DesignApp,
+    time: f64,
+    maximized: bool,
+    size: egui::Vec2,
+}
+
+impl WindowHarness {
+    fn new() -> Self {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.custom_titlebar = true;
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx, "");
+        let mut harness = Self { ctx, app, time: 0.0, maximized: false, size: vec2(1440.0, 900.0) };
+        harness.frame(vec![]);
+        harness.frame(vec![]);
+        harness
+    }
+
+    fn frame(&mut self, events: Vec<egui::Event>) -> Vec<egui::ViewportCommand> {
+        self.time += 0.1;
+        let mut input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, self.size)),
+            time: Some(self.time),
+            events,
+            ..Default::default()
+        };
+        input.viewports.entry(egui::ViewportId::ROOT).or_default().maximized = Some(self.maximized);
+        let mut output = self.ctx.run_ui(input, |ui| {
+            app_bar(&mut self.app, ui);
+            resize_borders(&mut self.app, ui);
+        });
+        output.textures_delta.clear();
+        output.viewport_output.get(&egui::ViewportId::ROOT).map(|v| v.commands.clone()).unwrap_or_default()
+    }
+
+    fn press(&mut self, pos: egui::Pos2) -> Vec<egui::ViewportCommand> {
+        self.frame(vec![
+            egui::Event::PointerMoved(pos),
+            egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() },
+        ])
+    }
+
+    fn click(&mut self, pos: egui::Pos2) -> Vec<egui::ViewportCommand> {
+        let mut commands = self.press(pos);
+        commands.extend(self.frame(vec![egui::Event::PointerButton {
+            pos,
+            button: egui::PointerButton::Primary,
+            pressed: false,
+            modifiers: Default::default(),
+        }]));
+        commands
+    }
+
+    fn caption_center(&self, id: &str) -> egui::Pos2 {
+        self.ctx.read_response(egui::Id::unique(id)).unwrap().rect.center()
+    }
+}
+
+#[test]
+fn caption_buttons_minimize_maximize_restore_and_close() {
+    let mut h = WindowHarness::new();
+    for (id, command) in [("window.minimize", egui::ViewportCommand::Minimized(true)), ("window.maximize", egui::ViewportCommand::Maximized(true))] {
+        let p = h.caption_center(id);
+        assert!(h.click(p).contains(&command), "{id}");
+    }
+    h.maximized = true;
+    h.frame(vec![]);
+    let p = h.caption_center("window.maximize");
+    assert!(h.click(p).contains(&egui::ViewportCommand::Maximized(false)));
+    let p = h.caption_center("window.close");
+    assert!(h.click(p).contains(&egui::ViewportCommand::Close));
+}
+
+#[test]
+fn title_area_drags_and_double_clicks_but_menus_do_not_drag() {
+    let mut h = WindowHarness::new();
+    let title = h.ctx.read_response(egui::Id::unique("window_title_drag")).unwrap().rect;
+    assert!(title.width() > 0.0, "there is a drag region between menus and tools");
+    let p = title.center();
+    let mut commands = h.press(p);
+    commands.extend(h.frame(vec![egui::Event::PointerMoved(p + vec2(20.0, 0.0))]));
+    assert!(commands.contains(&egui::ViewportCommand::StartDrag));
+
+    let mut h = WindowHarness::new();
+    h.click(p);
+    assert!(h.click(p).contains(&egui::ViewportCommand::Maximized(true)));
+
+    let mut h = WindowHarness::new();
+    let p = egui::pos2(70.0, 18.0); // File menu, outside the title's drag region.
+    let mut commands = h.press(p);
+    commands.extend(h.frame(vec![egui::Event::PointerMoved(title.center())]));
+    assert!(!commands.contains(&egui::ViewportCommand::StartDrag));
+}
+
+#[test]
+fn edges_resize_only_when_the_window_is_restored() {
+    let mut h = WindowHarness::new();
+    let p = egui::pos2(1438.0, 400.0);
+    let mut commands = h.press(p);
+    commands.extend(h.frame(vec![egui::Event::PointerMoved(p + vec2(-20.0, 0.0))]));
+    assert!(commands.contains(&egui::ViewportCommand::BeginResize(egui::ResizeDirection::East)));
+    let mut h = WindowHarness::new();
+    h.maximized = true;
+    h.frame(vec![]);
+    let mut commands = h.press(p);
+    commands.extend(h.frame(vec![egui::Event::PointerMoved(p + vec2(-20.0, 0.0))]));
+    assert!(!commands.iter().any(|c| matches!(c, egui::ViewportCommand::BeginResize(_))));
+}
+
+#[test]
+fn native_window_actions_are_unavailable_without_custom_chrome() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    assert!(!crate::menus::enabled(&app, "window.close"));
+    assert!(app.run("window.close", json!({})).is_err());
+    assert!(app.pending_window_commands.is_empty());
+    app.custom_titlebar = true;
+    assert!(app.run("window.resize", json!({"edge": "invalid"})).is_err());
+    assert!(app.pending_window_commands.is_empty());
+}
+
+#[test]
+fn caption_buttons_stay_put_while_a_narrow_app_bar_scrolls() {
+    let mut h = WindowHarness::new();
+    h.size = vec2(640.0, 560.0);
+    h.frame(vec![]);
+    h.frame(vec![]);
+    let rect = |h: &WindowHarness, id: &str| h.ctx.read_response(egui::Id::unique(id)).unwrap().rect;
+    let menus_end = |h: &WindowHarness| h.ctx.data(|d| d.get_temp::<f32>(egui::Id::unique("app_bar_menus_end"))).unwrap();
+    let (close, menus0) = (rect(&h, "window.close"), menus_end(&h));
+    assert!(close.left() >= 0.0 && close.right() <= h.size.x, "{close:?}");
+    let p = egui::pos2(200.0, 18.0);
+    h.frame(vec![
+        egui::Event::PointerMoved(p),
+        egui::Event::MouseWheel {
+            unit: egui::MouseWheelUnit::Point,
+            delta: vec2(0.0, -3000.0),
+            phase: egui::TouchPhase::Move,
+            modifiers: egui::Modifiers::NONE,
+            source: egui::MouseWheelSource::Unknown,
+        },
+    ]);
+    for _ in 0..10 {
+        h.frame(vec![]);
+    }
+    assert!(menus_end(&h) < menus0, "the menus scrolled");
+    assert_eq!(rect(&h, "window.close"), close, "the caption buttons did not");
+    assert!(h.click(close.center()).contains(&egui::ViewportCommand::Close));
+}
+
+#[test]
+fn the_window_drags_from_its_lower_band_at_the_minimum_width() {
+    // At 900 px the menus and tools fill the bar's row; its lower band still moves the window,
+    // and it isn't drawn over the caption buttons.
+    let mut h = WindowHarness::new();
+    h.size = vec2(900.0, 560.0);
+    h.frame(vec![]);
+    h.frame(vec![]);
+    let drag = h.ctx.read_response(egui::Id::unique("window_title_drag")).unwrap().rect;
+    let close = h.ctx.read_response(egui::Id::unique("window.close")).unwrap().rect;
+    assert!(drag.right() <= close.left() + 0.5, "{drag:?} {close:?}");
+    let p = egui::pos2(450.0, APP_BAR + APP_BAR_BAND / 2.0);
+    assert!(drag.contains(p), "{drag:?}");
+    let mut commands = h.press(p);
+    commands.extend(h.frame(vec![egui::Event::PointerMoved(p + vec2(20.0, 0.0))]));
+    assert!(commands.contains(&egui::ViewportCommand::StartDrag));
+}
+
+#[test]
+fn caption_buttons_fit_the_minimum_window_width() {
+    let mut h = WindowHarness::new();
+    h.size = vec2(900.0, 560.0);
+    h.frame(vec![]);
+    h.frame(vec![]);
+    for id in ["window.minimize", "window.maximize", "window.close"] {
+        let rect = h.ctx.read_response(egui::Id::unique(id)).unwrap().rect;
+        assert!(rect.left() >= 0.0 && rect.right() <= h.size.x, "{id}: {rect:?}");
+        let p = rect.center();
+        assert!(!h.click(p).is_empty(), "{id} remains clickable");
+    }
+}
diff --git a/crates/ui-egui/src/clock.rs b/crates/ui-egui/src/clock.rs
new file mode 100644
index 000000000..d42d95210
--- /dev/null
+++ b/crates/ui-egui/src/clock.rs
@@ -0,0 +1,10 @@
+/// Milliseconds from a monotonic process-local origin, on native and web alike.
+///
+/// Screenshot settlement, deadlines and retries must not use wall time: an NTP/manual clock jump
+/// would expire or postpone a capture, and `Context::input(i.time)` is stale inside `run_logic`.
+/// `web_time::Instant` is `std::time::Instant` natively and `performance.now()` on wasm.
+pub fn now_ms() -> f64 {
+    use std::sync::OnceLock;
+    static START: OnceLock<web_time::Instant> = OnceLock::new();
+    START.get_or_init(web_time::Instant::now).elapsed().as_secs_f64() * 1000.0
+}
diff --git a/crates/ui-egui/src/control.rs b/crates/ui-egui/src/control.rs
index 1cb7395c0..e4c6fe723 100644
--- a/crates/ui-egui/src/control.rs
+++ b/crates/ui-egui/src/control.rs
@@ -4,6 +4,7 @@
 //! - `engine.execute {command, params}` / `ui.menu.invoke {command|id, params}`: run any command
 //! - `engine.commands`: engine + UI commands with enablement
 //! - `document.inspect`: document summary; `ui.inspect`: UI state
+//! - `ui.docking`: the panel layout in use and the focused panel
 //! - `ui.menu.list`: flattened menu tree
 //! - `ui.tool.select {tool}`, `ui.tool.list`
 //! - `ui.pointer {events:[{kind: down|drag|up|move|doubleclick, x, y, space?: "doc"|"screen"}], mods?}`:
@@ -77,6 +78,7 @@ pub fn inspect(app: &DesignApp, ctx: &egui::Context) -> Value {
         "ui": serde_json::to_value(&app.ui).unwrap_or_default(),
         "view": app.view().map(|v| serde_json::to_value(v).unwrap_or_default()),
         "canvasRect": app.canvas_rect.map(|c| json!([c.left(), c.top(), c.width(), c.height()])),
+        "docking": crate::panel_docking::inspect(app, ctx),
         "window": [r.width(), r.height()],
         "documents": app
             .session
@@ -91,6 +93,7 @@ pub fn inspect(app: &DesignApp, ctx: &egui::Context) -> Value {
             })
             .collect::<Vec<_>>(),
         "currentPage": crate::canvas::current_page(app),
+        "separations": crate::separations::inspect(app),
         "dialog": app.ui.dialog.as_ref().map(|d| serde_json::to_value(d).unwrap_or_default()),
         "activeDocument": app.session.active_index(),
         "perf": {"frameMs": app.perf.frame_ms, "renderMs": app.perf.render_ms, "fps": app.perf.fps, "patches": app.canvas.patches},
@@ -146,6 +149,83 @@ pub fn handle(app: &mut DesignApp, ctx: &egui::Context, req: &ControlRequest) ->
     out
 }
 
+/// `ui.pointer`: canvas-space pointer events straight to the tool.
+fn control_pointer(app: &mut DesignApp, ctx: &egui::Context, p: &Value) -> Outcome {
+    let Some(events) = p.get("events").and_then(Value::as_array) else { return err("missing `events`") };
+    let base_mods: Mods = p.get("mods").and_then(|m| serde_json::from_value(m.clone()).ok()).unwrap_or_default();
+    let view = app.view_info();
+    let xf = app.canvas_rect.zip(app.view().copied()).map(|(rect, v)| Xf::new(rect, &v));
+    let mut last = None;
+    for e in events {
+        let kind = match e.get("kind").and_then(Value::as_str).unwrap_or("") {
+            "down" => PointerKind::Down,
+            "drag" => PointerKind::Drag,
+            "up" => PointerKind::Up,
+            "move" => PointerKind::Move,
+            "doubleclick" | "dblclick" => PointerKind::DoubleClick,
+            other => return err(format!("unknown pointer kind `{other}`")),
+        };
+        let x = e.get("x").and_then(Value::as_f64).unwrap_or(0.0);
+        let y = e.get("y").and_then(Value::as_f64).unwrap_or(0.0);
+        let pos = if e.get("space").and_then(Value::as_str) == Some("screen") {
+            match xf {
+                Some(xf) => xf.to_canvas(egui::pos2(x as f32, y as f32)),
+                None => return err("no canvas yet"),
+            }
+        } else {
+            designcraft_geom::Point::new(x, y)
+        };
+        let mods = e.get("mods").and_then(|m| serde_json::from_value(m.clone()).ok()).unwrap_or(base_mods);
+        let clicks = e.get("clicks").and_then(Value::as_u64).map_or(1, |n| n.clamp(1, 255) as u8);
+        if let Err(e) = app.session.pointer(&PointerEvent { kind, pos, mods, clicks }, view) {
+            return err(e);
+        }
+        app.after_engine();
+        last = Some((pos, mods));
+    }
+    ctx.request_repaint();
+    // The tool's cursor where the last event was.
+    let cursor = last.map(|(pos, mods)| app.session.cursor(pos, mods, view));
+    wrap(app.run("document.inspect", json!({})).map(|d| json!({"selection": d["selection"], "tool": app.session.tool_id(), "cursor": cursor})))
+}
+
+/// `ui.click` and `ui.drag`: screen-space pointer input through egui itself, which reaches every widget.
+fn control_click(app: &mut DesignApp, ctx: &egui::Context, req: &ControlRequest) -> Outcome {
+    let p = &req.params;
+    let s = |k: &str| p.get(k).and_then(Value::as_str);
+    // Screen-space (egui points) pointer input through egui itself: reaches every widget.
+    let (count, steps) = match pointer_counts(p, req.method == "ui.drag", app.control_synthetic.len().saturating_add(app.synthetic.len())) {
+        Ok(counts) => counts,
+        Err(e) => return err(e),
+    };
+    let f = |k: &str| p.get(k).and_then(Value::as_f64).unwrap_or(0.0) as f32;
+    let button = match s("button") {
+        Some("right") | Some("secondary") => egui::PointerButton::Secondary,
+        Some("middle") => egui::PointerButton::Middle,
+        _ => egui::PointerButton::Primary,
+    };
+    let b = |n: &str| p.get(n).and_then(Value::as_bool).unwrap_or(false);
+    let modifiers =
+        egui::Modifiers { alt: b("alt"), ctrl: b("ctrl"), shift: b("shift"), mac_cmd: b("cmd") && cfg!(target_os = "macos"), command: b("cmd") };
+    let a = egui::pos2(f("x"), f("y"));
+    let end = if req.method == "ui.drag" { egui::pos2(f("toX"), f("toY")) } else { a };
+    app.control_synthetic.push(egui::Event::PointerMoved(a));
+    app.control_synthetic.push(egui::Event::PointerButton { pos: a, button, pressed: true, modifiers });
+    if req.method == "ui.drag" {
+        for i in 1..=steps {
+            let t = i as f32 / steps as f32;
+            app.control_synthetic.push(egui::Event::PointerMoved(a + (end - a) * t));
+        }
+    }
+    app.control_synthetic.push(egui::Event::PointerButton { pos: end, button, pressed: false, modifiers });
+    for _ in 1..count {
+        app.control_synthetic.push(egui::Event::PointerButton { pos: end, button, pressed: true, modifiers });
+        app.control_synthetic.push(egui::Event::PointerButton { pos: end, button, pressed: false, modifiers });
+    }
+    ctx.request_repaint();
+    ok(Value::Null)
+}
+
 fn handle_request(app: &mut DesignApp, ctx: &egui::Context, req: &ControlRequest) -> Outcome {
     let p = &req.params;
     let s = |k: &str| p.get(k).and_then(Value::as_str);
@@ -169,49 +249,11 @@ fn handle_request(app: &mut DesignApp, ctx: &egui::Context, req: &ControlRequest
         "engine.commands" => ok(all_commands(app)),
         "document.inspect" => wrap(app.run("document.inspect", json!({}))),
         "ui.inspect" => ok(inspect(app, ctx)),
+        "ui.docking" => ok(crate::panel_docking::inspect(app, ctx)),
         "ui.menu.list" => ok(serde_json::to_value(menus::MENUS).unwrap_or_default()),
         "ui.tool.select" => wrap(app.run("tool.select", json!({"tool": s("tool").unwrap_or("")}))),
         "ui.tool.list" => ok(serde_json::to_value(designcraft_tools::TOOL_GROUPS).unwrap_or_default()),
-        "ui.pointer" => {
-            let Some(events) = p.get("events").and_then(Value::as_array) else { return err("missing `events`") };
-            let base_mods: Mods = p.get("mods").and_then(|m| serde_json::from_value(m.clone()).ok()).unwrap_or_default();
-            let view = app.view_info();
-            let xf = app.canvas_rect.zip(app.view().copied()).map(|(rect, v)| Xf::new(rect, &v));
-            let mut last = None;
-            for e in events {
-                let kind = match e.get("kind").and_then(Value::as_str).unwrap_or("") {
-                    "down" => PointerKind::Down,
-                    "drag" => PointerKind::Drag,
-                    "up" => PointerKind::Up,
-                    "move" => PointerKind::Move,
-                    "doubleclick" | "dblclick" => PointerKind::DoubleClick,
-                    other => return err(format!("unknown pointer kind `{other}`")),
-                };
-                let x = e.get("x").and_then(Value::as_f64).unwrap_or(0.0);
-                let y = e.get("y").and_then(Value::as_f64).unwrap_or(0.0);
-                let pos = if e.get("space").and_then(Value::as_str) == Some("screen") {
-                    match xf {
-                        Some(xf) => xf.to_canvas(egui::pos2(x as f32, y as f32)),
-                        None => return err("no canvas yet"),
-                    }
-                } else {
-                    designcraft_geom::Point::new(x, y)
-                };
-                let mods = e.get("mods").and_then(|m| serde_json::from_value(m.clone()).ok()).unwrap_or(base_mods);
-                let clicks = e.get("clicks").and_then(Value::as_u64).map_or(1, |n| n.clamp(1, 255) as u8);
-                if let Err(e) = app.session.pointer(&PointerEvent { kind, pos, mods, clicks }, view) {
-                    return err(e);
-                }
-                app.after_engine();
-                last = Some((pos, mods));
-            }
-            ctx.request_repaint();
-            // The tool's cursor where the last event was.
-            let cursor = last.map(|(pos, mods)| app.session.cursor(pos, mods, view));
-            wrap(
-                app.run("document.inspect", json!({})).map(|d| json!({"selection": d["selection"], "tool": app.session.tool_id(), "cursor": cursor})),
-            )
-        }
+        "ui.pointer" => control_pointer(app, ctx, p),
         "ui.key" => {
             let Some(k) = s("key").and_then(key_from) else { return err("unknown or missing `key`") };
             let b = |n: &str| p.get(n).and_then(Value::as_bool).unwrap_or(false);
@@ -244,44 +286,7 @@ fn handle_request(app: &mut DesignApp, ctx: &egui::Context, req: &ControlRequest
             ctx.request_repaint();
             ok(Value::Null)
         }
-        "ui.click" | "ui.drag" => {
-            // Screen-space (egui points) pointer input through egui itself: reaches every widget.
-            let (count, steps) = match pointer_counts(p, req.method == "ui.drag", app.control_synthetic.len().saturating_add(app.synthetic.len())) {
-                Ok(counts) => counts,
-                Err(e) => return err(e),
-            };
-            let f = |k: &str| p.get(k).and_then(Value::as_f64).unwrap_or(0.0) as f32;
-            let button = match s("button") {
-                Some("right") | Some("secondary") => egui::PointerButton::Secondary,
-                Some("middle") => egui::PointerButton::Middle,
-                _ => egui::PointerButton::Primary,
-            };
-            let b = |n: &str| p.get(n).and_then(Value::as_bool).unwrap_or(false);
-            let modifiers = egui::Modifiers {
-                alt: b("alt"),
-                ctrl: b("ctrl"),
-                shift: b("shift"),
-                mac_cmd: b("cmd") && cfg!(target_os = "macos"),
-                command: b("cmd"),
-            };
-            let a = egui::pos2(f("x"), f("y"));
-            let end = if req.method == "ui.drag" { egui::pos2(f("toX"), f("toY")) } else { a };
-            app.control_synthetic.push(egui::Event::PointerMoved(a));
-            app.control_synthetic.push(egui::Event::PointerButton { pos: a, button, pressed: true, modifiers });
-            if req.method == "ui.drag" {
-                for i in 1..=steps {
-                    let t = i as f32 / steps as f32;
-                    app.control_synthetic.push(egui::Event::PointerMoved(a + (end - a) * t));
-                }
-            }
-            app.control_synthetic.push(egui::Event::PointerButton { pos: end, button, pressed: false, modifiers });
-            for _ in 1..count {
-                app.control_synthetic.push(egui::Event::PointerButton { pos: end, button, pressed: true, modifiers });
-                app.control_synthetic.push(egui::Event::PointerButton { pos: end, button, pressed: false, modifiers });
-            }
-            ctx.request_repaint();
-            ok(Value::Null)
-        }
+        "ui.click" | "ui.drag" => control_click(app, ctx, req),
         "ui.text" => {
             let Some(text) = s("text") else { return err("missing `text`") };
             // Focused widgets retain the synthetic keyboard route. Document automation uses
@@ -361,7 +366,7 @@ fn handle_request(app: &mut DesignApp, ctx: &egui::Context, req: &ControlRequest
                 r = crate::panel_docking::close_visible(app).map(|_| Value::Null);
             }
             if let Some(v) = p.get("dockExpanded").and_then(Value::as_bool) {
-                app.ui.dock_expanded = v;
+                r = crate::panel_docking::set_iconic(app, !v);
             }
             wrap(r)
         }
@@ -600,7 +605,7 @@ mod automation_contract_tests {
         assert_eq!(app.control_synthetic, queued);
         // The ordinary input hook consumes one pointer event per frame, freeing
         // enough room for a complete click without dropping earlier input.
-        app.raw_input_hook(&mut egui::RawInput::default());
+        app.raw_input_hook(&ctx, &mut egui::RawInput::default());
         assert_eq!(app.control_synthetic.len(), 10000);
         assert_eq!(call(&mut app, &ctx, "ui.click", json!({}))["ok"], true);
         assert_eq!(app.control_synthetic.len(), 10003);
@@ -786,7 +791,7 @@ mod deferred_clipboard_tests {
         assert!(!app.in_control);
         for step in 0..3 {
             let mut raw = egui::RawInput { time: Some(step as f64 * 0.05), ..Default::default() };
-            app.raw_input_hook(&mut raw);
+            app.raw_input_hook(&ctx, &mut raw);
             ctx.run_ui(raw, |ui| menus::shortcuts(&mut app, ui.ctx())).textures_delta.clear();
         }
         let texts: Vec<String> = app.session.active().unwrap().doc.stories.values().map(|story| story.text.clone()).collect();
@@ -794,7 +799,7 @@ mod deferred_clipboard_tests {
         assert!(!texts.iter().any(|text| text.contains("SYNTHETIC_CLIPBOARD_SENTINEL")));
         // Once control input is drained, an ordinary user paste still reads its clipboard.
         let mut raw = egui::RawInput::default();
-        app.raw_input_hook(&mut raw);
+        app.raw_input_hook(&ctx, &mut raw);
         app.run("edit.paste", json!({})).unwrap();
         assert_eq!(reads.load(Ordering::SeqCst), 1);
     }
@@ -805,12 +810,12 @@ mod deferred_clipboard_tests {
         let (req, _) = ControlRequest::new("ui.move", json!({"x":10,"y":10}));
         let _ = handle(&mut app, &ctx, &req);
         let mut raw = egui::RawInput::default();
-        app.raw_input_hook(&mut raw);
+        app.raw_input_hook(&ctx, &mut raw);
         let mut private = ctx.run_ui(raw, |ui| ui.ctx().copy_text("control field".into()));
         assert!(!private.platform_output.commands.iter().any(|cmd| matches!(cmd, egui::OutputCommand::CopyText(_))));
         private.textures_delta.clear();
         let mut raw = egui::RawInput::default();
-        app.raw_input_hook(&mut raw);
+        app.raw_input_hook(&ctx, &mut raw);
         let mut native = ctx.run_ui(raw, |ui| ui.ctx().copy_text("native field".into()));
         assert!(native.platform_output.commands.iter().any(|cmd| matches!(cmd, egui::OutputCommand::CopyText(text) if text=="native field")));
         native.textures_delta.clear();
diff --git a/crates/ui-egui/src/credits.rs b/crates/ui-egui/src/credits.rs
index d4828b1f4..45f821b09 100644
--- a/crates/ui-egui/src/credits.rs
+++ b/crates/ui-egui/src/credits.rs
@@ -223,7 +223,7 @@ fn controls(ui: &mut egui::Ui, v: &mut View, lang: &str) {
         }
         ui.separator();
         ui.label(tr(lang, "Sort"));
-        egui::ComboBox::from_id_salt("credits_sort").selected_text(tr(lang, v.key.label().0)).show_ui(ui, |ui| {
+        craft_ui::ComboBox::from_id_salt("credits_sort").selected_text(tr(lang, v.key.label().0)).show_ui(ui, |ui| {
             for k in SortKey::ALL {
                 if ui.selectable_label(v.key == k, tr(lang, k.label().0)).clicked() {
                     v.key = k;
@@ -246,7 +246,7 @@ fn controls(ui: &mut egui::Ui, v: &mut View, lang: &str) {
 
 /// About ▸ Contributors: a name toggle, a sort, and the list as a grab bag or a table.
 pub fn contributors_ui(ui: &mut egui::Ui, lang: &str) {
-    let id = egui::Id::new("credits_view");
+    let id = egui::Id::unique("credits_view");
     let mut v = ui.data_mut(|d| d.get_temp::<View>(id)).unwrap_or_default();
     controls(ui, &mut v, lang);
     let list = sorted(CONTRIBUTORS, v.names, v.key, v.ascending);
diff --git a/crates/ui-egui/src/cursors.rs b/crates/ui-egui/src/cursors.rs
index 28f98a5e0..3487a2673 100644
--- a/crates/ui-egui/src/cursors.rs
+++ b/crates/ui-egui/src/cursors.rs
@@ -7,6 +7,11 @@
 //! so they never trail the pointer. macOS sizes a cursor bitmap in points (a Retina one would show
 //! twice as big, or blurred) and a Wayland session (native or through XWayland) scales it by its own
 //! rules, so there the canvas paints the glyph at the pointer. The web build keeps the system cursors.
+//!
+//! A painted glyph needs a live pointer position. macOS sends a window no pointer-left event when
+//! the pointer moves onto another of the app's windows lying over it (a panel floating in its own
+//! OS window), so the window's egui pointer stays where it was last seen; [`pointer_elsewhere`]
+//! tells the canvas to paint nothing there.
 
 use egui::epaint::{Mesh, TessellationOptions, Tessellator, Vertex};
 use egui::{Color32, CustomCursorImage, Pos2, Shape, Stroke, Vec2, pos2, vec2};
@@ -318,7 +323,7 @@ pub fn show(ctx: &egui::Context, images: &mut Images, c: Cursor, hover: Pos2) ->
             system(c)
         }
         Mode::Painted => {
-            let layer = egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("tool-cursor"));
+            let layer = egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("tool-cursor"));
             // Divide by the zoom factor so the glyph keeps its size in physical pixels.
             let scale = 1.0 / ctx.zoom_factor().max(0.01);
             let painter = ctx.layer_painter(layer);
@@ -338,10 +343,78 @@ pub fn show(ctx: &egui::Context, images: &mut Images, c: Cursor, hover: Pos2) ->
     }
 }
 
+/// Whether the pointer this viewport last saw has moved on to another of the app's windows,
+/// `others` (the current viewport among them is skipped): from the frame one of them reports the
+/// pointer until this viewport gets a pointer event again. That covers the pointer moving on from
+/// the other window to the desktop too, where this one still hears nothing. Always false where
+/// egui embeds viewports, so all of them share one window's pointer.
+pub(crate) fn pointer_elsewhere(ctx: &egui::Context, others: &[egui::ViewportId]) -> bool {
+    let own = ctx.viewport_id();
+    let key = egui::Id::unique(("pointer-elsewhere", own));
+    let before = ctx.data(|d| d.get_temp::<bool>(key)).unwrap_or(false);
+    let here = ctx
+        .input(|i| i.events.iter().any(|e| matches!(e, egui::Event::PointerMoved(_) | egui::Event::PointerButton { .. } | egui::Event::PointerGone)));
+    // A pointer that arrived: moving or pressing there. A pointer that only stayed (a hidden
+    // window keeps its last one) does not count, so it never takes the pointer from this window.
+    let arrived = |i: &egui::InputState| {
+        i.pointer.has_pointer() && i.events.iter().any(|e| matches!(e, egui::Event::PointerMoved(_) | egui::Event::PointerButton { .. }))
+    };
+    let separate = !ctx.embed_viewports() && others.iter().any(|&v| v != own);
+    // Where this window has pointer events of its own too, another window's report counts only
+    // if this window's pointer lies inside that window: one just outside it (its edge, where
+    // both may hear the pointer) keeps belonging here, frame after frame.
+    let at = ctx.input(|i| i.viewport().inner_rect.zip(i.pointer.latest_pos()).map(|(r, p)| r.min + p.to_vec2()));
+    let there = separate && others.iter().any(|&v| v != own && ctx.input_for(v, |i| arrived(i) && (!here || covers(i.viewport().inner_rect, at))));
+    let now = separate && elsewhere(before, here, there);
+    if now != before {
+        ctx.data_mut(|d| d.insert_temp(key, now));
+    }
+    now
+}
+
+/// Whether a window at `rect` (desktop points) lies over the desktop point `at`; unknown when
+/// either is, which counts as covering.
+fn covers(rect: Option<egui::Rect>, at: Option<egui::Pos2>) -> bool {
+    rect.zip(at).is_none_or(|(r, p)| r.contains(p))
+}
+
+/// [`pointer_elsewhere`] for one frame: whether the pointer belonged to another window `before`,
+/// whether this window got a pointer event (`here`) and whether another window reports the
+/// pointer arriving (`there`). Both in one frame mean the pointer just crossed into the other
+/// window: this window's last events come from before the crossing.
+fn elsewhere(before: bool, here: bool, there: bool) -> bool {
+    there || (before && !here)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[test]
+    fn the_pointer_belongs_elsewhere_from_another_windows_report_until_this_one_hears_it_again() {
+        // Main window, then a floating panel's window over it, then the desktop, then back.
+        let mut state = false;
+        let mut frame = |here, there| {
+            state = elsewhere(state, here, there);
+            state
+        };
+        assert!(!frame(true, false), "over the main window");
+        assert!(frame(true, true), "crossing into the floating window");
+        assert!(frame(false, true), "moving in the floating window");
+        assert!(frame(false, false), "on the desktop: the main window still heard nothing");
+        assert!(frame(false, false), "the next frame too");
+        assert!(!frame(true, false), "back over the main window");
+        assert!(!frame(false, false), "and resting there");
+    }
+
+    #[test]
+    fn a_pointer_just_outside_another_window_stays_this_windows() {
+        let float = Some(egui::Rect::from_min_size(egui::pos2(100.0, 100.0), egui::vec2(200.0, 300.0)));
+        assert!(covers(float, Some(egui::pos2(150.0, 150.0))), "over the floating window");
+        assert!(!covers(float, Some(egui::pos2(98.0, 150.0))), "beside its left edge");
+        assert!(covers(None, Some(egui::pos2(98.0, 150.0))) && covers(float, None), "unknown places count as covered");
+    }
+
     /// Every cursor with a glyph.
     const GLYPHS: [Cursor; 9] = [
         Cursor::Arrow,
diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs
index 3a1818f91..bb3077103 100644
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value, json};
 
 use crate::DesignApp;
+use crate::app::file_dialogs::{Bound, with_path};
 use crate::theme::semibold;
 
 mod options;
@@ -32,6 +33,7 @@ impl Dialog {
         let defaults = match id {
             "newDocument" => crate::new_document::defaults(),
             "goToPage" => json!({"page": "1"}),
+            "epubExport" => json!({"split": false, "mode": "style", "style": designcraft_doc::BASIC_PARAGRAPH}),
             "qrCode" => json!({"type": "url", "content": "https://", "color": "[Black]"}),
             "insertTable" => json!({"bodyRows": 4, "columns": 4, "headerRows": 0, "footerRows": 0}),
             "insertXref" => json!({"linkTo": "paragraph", "style": "", "target": "", "format": ""}),
@@ -132,7 +134,17 @@ impl Dialog {
 
 fn text_field(ui: &mut egui::Ui, d: &mut Dialog, key: &str, w: f32) {
     let mut s = d.s(key);
-    if ui.add(egui::TextEdit::singleline(&mut s).desired_width(w).horizontal_align(egui::Align::Min)).changed() {
+    if ui.add(egui::TextEdit::singleline(&mut s).desired_width(w).align(egui::Align2::LEFT_TOP)).changed() {
+        d.fields.insert(key.into(), Value::String(s));
+    }
+}
+
+/// [`text_field`] with the visible caption's text as its accessible name (a text field with no
+/// label, hint or `labelled_by` is an unnamed input).
+fn text_field_named(ui: &mut egui::Ui, d: &mut Dialog, key: &str, w: f32, name: &str) {
+    let mut s = d.s(key);
+    let resp = ui.add(egui::TextEdit::singleline(&mut s).desired_width(w).align(egui::Align2::LEFT_TOP)).accessible_name(name.to_owned());
+    if resp.changed() {
         d.fields.insert(key.into(), Value::String(s));
     }
 }
@@ -197,8 +209,6 @@ mod color_theme_tests {
     }
 }
 
-/// Edit › Keyboard Shortcuts: every command and its shortcut; click a shortcut, then press the
-/// new keys (Esc cancels, Backspace clears).
 /// Edit › Spelling › User Dictionary: added words and hyphenation exceptions (applied at once).
 fn user_dictionary(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
     crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Hyphenation Exceptions")).font(semibold(12.0)));
@@ -238,95 +248,6 @@ fn user_dictionary(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
     });
 }
 
-fn is_modifier_key(key: egui::Key) -> bool {
-    use egui::Key::*;
-    matches!(key, ShiftLeft | ShiftRight | ControlLeft | ControlRight | AltLeft | AltRight | SuperLeft | SuperRight)
-}
-
-fn keyboard_shortcuts(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
-    let mut q = d.s("query");
-    ui.add(
-        egui::TextEdit::singleline(&mut q)
-            .hint_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Search commands")))
-            .desired_width(f32::INFINITY),
-    );
-    d.fields.insert("query".into(), json!(q));
-    let recording = d.s("recording");
-    // Capture the next key press for the command being recorded. Pressing a modifier
-    // reports the modifier itself as a key; skip it and wait for the key it modifies.
-    if !recording.is_empty() {
-        let pressed = ui.input(|i| {
-            i.events.iter().find_map(|e| match e {
-                egui::Event::Key { key, pressed: true, modifiers, .. } if !is_modifier_key(*key) => Some((*key, *modifiers)),
-                _ => None,
-            })
-        });
-        if let Some((key, m)) = pressed {
-            let sc = match key {
-                egui::Key::Escape => None,
-                egui::Key::Backspace if !m.any() => Some(String::new()),
-                _ => Some(crate::menus::shortcut_string(m, key)),
-            };
-            if let Some(sc) = sc {
-                let msg = match app.run("window.setShortcut", json!({"id": recording, "shortcut": sc})) {
-                    Ok(v) => match v["conflicts"].as_array().filter(|c| !c.is_empty()) {
-                        Some(c) => format!("Also used by: {}", c.iter().filter_map(|x| x.as_str()).collect::<Vec<_>>().join(", ")),
-                        None => String::new(),
-                    },
-                    Err(e) => e,
-                };
-                d.fields.insert("message".into(), json!(msg));
-            }
-            d.fields.insert("recording".into(), json!(""));
-        }
-    }
-    let ql = q.to_lowercase();
-    let mut rows: Vec<(String, String, String)> = designcraft_engine::command_specs()
-        .iter()
-        .filter(|c| !c.menu.is_empty() || c.shortcut.is_some())
-        .map(|c| (c.id.to_string(), c.label.to_string(), c.menu.join(" › ")))
-        .chain(crate::menus::UI_COMMANDS.iter().map(|c| (c.0.to_string(), c.1.to_string(), String::new())))
-        .filter(|(id, l, _)| ql.is_empty() || l.to_lowercase().contains(&ql) || id.to_lowercase().contains(&ql))
-        .collect();
-    rows.sort_by(|a, b| a.1.cmp(&b.1));
-    egui::ScrollArea::vertical().max_height(360.0).show(ui, |ui| {
-        egui::Grid::new("shortcuts").num_columns(3).striped(true).spacing([12.0, 4.0]).show(ui, |ui| {
-            for (id, label, menu) in &rows {
-                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, label.trim_end_matches('…')))
-                    .on_hover_text(format!("{id}{}", if menu.is_empty() { String::new() } else { format!("  ({menu})") }));
-                let cur = crate::menus::shortcut_of(app, id).map(|s| crate::menus::shortcut_text(&s)).unwrap_or_else(|| "—".into());
-                let text = if recording == *id { crate::i18n::tr(&app.ui.language, "Press keys…").to_string() } else { cur };
-                if ui.add(egui::Button::new(text).min_size(egui::vec2(110.0, 0.0))).clicked() {
-                    d.fields.insert("recording".into(), json!(id));
-                    d.fields.insert("message".into(), json!(""));
-                }
-                if app.ui.shortcuts.contains_key(id) {
-                    if ui.small_button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Default"))).clicked() {
-                        let _ = app.run("window.setShortcut", json!({"id": id, "shortcut": null}));
-                    }
-                } else {
-                    ui.label("");
-                }
-                ui.end_row();
-            }
-        });
-    });
-    let msg = d.s("message");
-    if !msg.is_empty() {
-        ui.label(egui::RichText::new(msg).color(egui::Color32::from_rgb(240, 180, 60)));
-    }
-    ui.horizontal(|ui| {
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Reset All to Defaults"))).clicked() {
-            let _ = app.run("window.resetShortcuts", json!({}));
-        }
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Import InDesign Set…"))).clicked()
-            && let Some(msg) = crate::shortcut_import::pick_and_import(app)
-        {
-            d.fields.insert("message".into(), json!(msg));
-        }
-    });
-}
-
 /// File › Print, with the printers the system knows.
 pub fn open_print(app: &mut DesignApp) {
     let p = app.session.execute("file.printers", &json!({})).unwrap_or_default();
@@ -338,13 +259,13 @@ pub fn open_print(app: &mut DesignApp) {
 }
 
 /// File › Export PDF…: the "Export PDF" options dialog, seeded from the persisted settings
-/// (`UiState.pdf_export`) and the active document. `pages` is per-job (not persisted); `flatten`
-/// falls back to the global flattener preset when the persisted value is empty.
+/// (`UiState.pdf_export`). `pages` is per-job (not persisted); `flatten` falls back to the global
+/// flattener preset when the persisted value is empty. `title` starts empty: a title given to the
+/// dialog is the PDF's title and names the file, and without one the file is named after the
+/// document and the PDF takes its title from File Info.
 pub fn open_pdf_export(app: &mut DesignApp) {
     let mut fields = serde_json::to_value(&app.ui.pdf_export).unwrap_or_else(|_| json!({}));
     if let Value::Object(m) = &mut fields {
-        let title = app.session.active().map(|st| st.doc.title.clone()).unwrap_or_default();
-        m.insert("title".into(), json!(title));
         m.insert("pages".into(), json!("all"));
         if app.ui.pdf_export.flatten.is_empty() {
             m.insert("flatten".into(), json!(app.ui.flattener));
@@ -353,6 +274,63 @@ pub fn open_pdf_export(app: &mut DesignApp) {
     app.ui.dialog = Some(Dialog::new("pdfExport", fields));
 }
 
+/// File › Export EPUB…: the EPUB Export Options dialog, seeded from the document's Split
+/// Document setting.
+pub fn open_epub_export(app: &mut DesignApp) {
+    use designcraft_doc::EpubSplit;
+    let split = app.session.active().map(|st| st.doc.settings.epub_split.clone()).unwrap_or_default();
+    let fields = match split {
+        EpubSplit::Off => json!({}),
+        EpubSplit::Style(name) => json!({"split": true, "mode": "style", "style": name}),
+        EpubSplit::ExportTags => json!({"split": true, "mode": "exportTags"}),
+    };
+    app.ui.dialog = Some(Dialog::new("epubExport", fields));
+}
+
+/// The Split Document setting the EPUB Export Options dialog's fields describe.
+fn epub_export_split(d: &Dialog) -> designcraft_doc::EpubSplit {
+    use designcraft_doc::EpubSplit;
+    if !d.b("split") {
+        EpubSplit::Off
+    } else if d.s("mode") == "exportTags" {
+        EpubSplit::ExportTags
+    } else {
+        EpubSplit::Style(d.s("style"))
+    }
+}
+
+fn epub_export(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
+    let lang = app.ui.language.as_str();
+    let styles: Vec<String> = app
+        .session
+        .active()
+        .map(|st| st.doc.styles.paragraph.iter().map(|s| s.name.clone()).filter(|n| n != designcraft_doc::NO_PARA_STYLE).collect())
+        .unwrap_or_default();
+    check(ui, d, "split", crate::i18n::tr(lang, "Split Document"));
+    ui.add_enabled_ui(d.b("split"), |ui| {
+        ui.indent("epub_split", |ui| {
+            let mode = d.s("mode");
+            ui.horizontal(|ui| {
+                if ui.radio(mode != "exportTags", crate::rtl::widget(ui, crate::i18n::tr(lang, "Single Paragraph Style"))).clicked() {
+                    d.fields.insert("mode".into(), json!("style"));
+                }
+                let cur = d.s("style");
+                craft_ui::ComboBox::from_id_salt("epub_split_style").selected_text(crate::rtl::widget(ui, &cur)).width(180.0).show_ui(ui, |ui| {
+                    for name in &styles {
+                        if ui.selectable_label(cur == *name, crate::rtl::widget(ui, name)).clicked() {
+                            d.fields.insert("style".into(), json!(name));
+                            d.fields.insert("mode".into(), json!("style"));
+                        }
+                    }
+                });
+            });
+            if ui.radio(mode == "exportTags", crate::rtl::widget(ui, crate::i18n::tr(lang, "Based on Paragraph Style Export Tags"))).clicked() {
+                d.fields.insert("mode".into(), json!("exportTags"));
+            }
+        });
+    });
+}
+
 fn print_dialog(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
     let printers: Vec<String> = d
         .fields
@@ -366,7 +344,7 @@ fn print_dialog(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
         if printers.is_empty() {
             crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "System default")).italics());
         } else {
-            egui::ComboBox::from_id_salt("printer").selected_text(&cur).width(220.0).show_ui(ui, |ui| {
+            craft_ui::ComboBox::from_id_salt("printer").selected_text(&cur).width(220.0).show_ui(ui, |ui| {
                 for p in &printers {
                     if ui.selectable_label(*p == cur, p).clicked() {
                         d.fields.insert("printer".into(), json!(p));
@@ -404,15 +382,17 @@ fn print_dialog(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
 
 /// The presets offered by the Export PDF dialog, in display order. The stored value is the
 /// English name; the caption is translated.
-const PDF_EXPORT_PRESETS: &[&str] = &["Desktop Printing", "Commercial Printing", "Screen and Email", "PDF/X-4", "PDF/A-2b", "Custom"];
+const PDF_EXPORT_PRESETS: &[&str] =
+    &["Desktop Printing", "Commercial Printing", "Screen and Email", "PDF/X-1a:2003", "PDF/X-4", "PDF/A-2b", "Custom"];
 
-/// Apply a preset's dependent fields. Flatten is only touched by "Screen and Email"; "Custom"
-/// (and any unknown value) changes nothing.
+/// Apply a preset's dependent fields. Flatten is only touched by "Screen and Email" and
+/// "PDF/X-1a:2003" (High Resolution); "Custom" (and any unknown value) changes nothing.
 fn apply_pdf_preset(d: &mut Dialog, preset: &str) {
     let (standard, compress, crop, bleed, page_info, flatten) = match preset {
         "Desktop Printing" => ("none", false, false, false, false, None),
         "Commercial Printing" => ("none", true, true, true, false, None),
         "Screen and Email" => ("none", true, false, false, false, Some("low")),
+        "PDF/X-1a:2003" => ("x1a", false, true, true, false, Some("high")),
         "PDF/X-4" => ("x4", false, true, true, false, None),
         "PDF/A-2b" => ("a2b", false, false, false, false, None),
         _ => return,
@@ -444,7 +424,7 @@ fn pdf_export(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
     ui.horizontal(|ui| {
         crate::rtl::label(ui, crate::i18n::tr(lang, "Preset:"));
         let cur = d.s("preset");
-        egui::ComboBox::from_id_salt("pdf_preset").selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, &cur))).width(200.0).show_ui(
+        craft_ui::ComboBox::from_id_salt("pdf_preset").selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, &cur))).width(200.0).show_ui(
             ui,
             |ui| {
                 for p in PDF_EXPORT_PRESETS {
@@ -485,7 +465,20 @@ fn pdf_export(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
     head(ui, "Advanced");
     ui.horizontal(|ui| {
         crate::rtl::label(ui, crate::i18n::tr(lang, "Standard:"));
-        translated_combo(lang, ui, d, "standard", &[("none", "None"), ("x4", "PDF/X-4"), ("a2b", "PDF/A-2b")]);
+        translated_combo(lang, ui, d, "standard", &[("none", "None"), ("x1a", "PDF/X-1a:2003"), ("x4", "PDF/X-4"), ("a2b", "PDF/A-2b")]);
+    });
+    // Spreads with transparency are rasterized at the preset's resolution; in PDF/X-1a it is the
+    // resolution craft-prepress rasterizes complex transparent regions at.
+    head(ui, "Transparency Flattener");
+    ui.horizontal(|ui| {
+        crate::rtl::label(ui, crate::i18n::tr(lang, "Preset:"));
+        translated_combo(
+            lang,
+            ui,
+            d,
+            "flatten",
+            &[("", "None"), ("high", "High Resolution"), ("medium", "Medium Resolution"), ("low", "Low Resolution")],
+        );
     });
     check(ui, d, "tagged", crate::i18n::tr(lang, "Tagged PDF"));
 
@@ -527,6 +520,15 @@ fn seed_text_frame_options(app: &DesignApp, d: &mut Dialog) {
         _ => ((inner - o.gutter * (n - 1.0)) / n).max(0.0),
     };
     let kind = |v: Value| v.as_str().unwrap_or_default().to_string();
+    // A frame without a custom baseline grid shows the document grid's start and increment.
+    let grid = o.baseline_grid.unwrap_or_else(|| {
+        let g = app.session.active().map(|s| s.doc.settings.baseline_grid.clone()).unwrap_or_default();
+        let relative_to = match g.relative_to {
+            designcraft_doc::GridRelative::TopOfPage => designcraft_doc::FrameGridRelative::TopOfPage,
+            designcraft_doc::GridRelative::TopMargin => designcraft_doc::FrameGridRelative::TopMargin,
+        };
+        designcraft_doc::FrameBaselineGrid { start: g.start, increment: g.increment, relative_to }
+    });
     let shown = json!({
         "columns": o.columns, "gutter": fm(o.gutter),
         "columnsKind": kind(serde_json::to_value(o.columns_kind).unwrap_or_default()), "columnWidth": fm(width),
@@ -542,6 +544,8 @@ fn seed_text_frame_options(app: &DesignApp, d: &mut Dialog) {
         "useMinimumHeight": o.auto_size_use_min_height, "minimumHeight": fm(o.auto_size_min_height),
         "useMinimumWidth": o.auto_size_use_min_width, "minimumWidth": fm(o.auto_size_min_width),
         "noLineBreaks": o.auto_size_no_line_breaks,
+        "customGrid": o.baseline_grid.is_some(), "gridStart": fm(grid.start), "gridIncrement": fm(grid.increment),
+        "gridRelativeTo": grid.relative_to.name(),
     });
     if let Value::Object(m) = &shown {
         for (k, v) in m {
@@ -593,6 +597,28 @@ fn text_frame_options_dialog(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog)
                     text_field(ui, d, "firstBaselineMin", 70.0);
                     ui.end_row();
                 });
+                ui.add_space(8.0);
+                crate::rtl::label(ui, egui::RichText::new(tr("Baseline Grid")).font(semibold(12.0)));
+                check(ui, d, "customGrid", tr("Use Custom Baseline Grid"));
+                ui.add_enabled_ui(d.b("customGrid"), |ui| {
+                    egui::Grid::new("tfo_grid").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
+                        crate::rtl::label(ui, tr("Start:"));
+                        text_field(ui, d, "gridStart", 70.0);
+                        ui.end_row();
+                        crate::rtl::label(ui, tr("Relative To:"));
+                        translated_combo(
+                            &lang,
+                            ui,
+                            d,
+                            "gridRelativeTo",
+                            &[("page", "Top of Page"), ("margin", "Top Margin"), ("frame", "Top of Frame"), ("inset", "Top Inset")],
+                        );
+                        ui.end_row();
+                        crate::rtl::label(ui, tr("Increment Every:"));
+                        text_field(ui, d, "gridIncrement", 70.0);
+                        ui.end_row();
+                    });
+                });
             }
             "autosize" => auto_size(&lang, ui, d),
             "rules" => column_rules(app, ui, d),
@@ -751,7 +777,7 @@ fn reference_point(ui: &mut egui::Ui, d: &mut Dialog, key: &str) {
     for (i, name) in designcraft_engine::autosize::REFERENCES.iter().enumerate() {
         let c = r.min + egui::vec2(5.0 + 18.0 * (i % 3) as f32, 5.0 + 18.0 * (i / 3) as f32);
         let dot = egui::Rect::from_center_size(c, egui::vec2(8.0, 8.0));
-        let resp = ui.interact(dot.expand(2.0), ui.id().with((key, i)), egui::Sense::click());
+        let resp = ui.interact(dot.expand(2.0), ui.scope_id().with((key, i)), egui::Sense::click());
         if resp.clicked() {
             d.fields.insert(key.into(), json!(name));
         }
@@ -774,6 +800,33 @@ fn edited(d: &Dialog, key: &str) -> bool {
     d.fields.contains_key(key) && d.s(key).trim() != shown.trim()
 }
 
+/// The custom baseline grid of Text Frame Options: `None` if nothing about it was edited, else off
+/// (null) or the fields the user changed.
+fn text_frame_baseline_grid(d: &Dialog, bad: &dyn Fn(&str) -> String) -> Result<Option<Value>, String> {
+    let grid_keys = ["customGrid", "gridStart", "gridIncrement", "gridRelativeTo"];
+    if !grid_keys.iter().any(|k| edited(d, k)) {
+        return Ok(None);
+    }
+    if !d.b("customGrid") {
+        return Ok(Some(Value::Null));
+    }
+    let all = edited(d, "customGrid");
+    let mut g = Map::new();
+    if all || edited(d, "gridStart") {
+        g.insert("start".into(), json!(d.m("gridStart").ok_or_else(|| bad("the baseline grid start is not a measure"))?));
+    }
+    if all || edited(d, "gridIncrement") {
+        g.insert(
+            "increment".into(),
+            json!(d.m("gridIncrement").filter(|v| *v > 0.0).ok_or_else(|| bad("the baseline grid increment must be a measure greater than zero"))?),
+        );
+    }
+    if all || edited(d, "gridRelativeTo") {
+        g.insert("relativeTo".into(), json!(d.s("gridRelativeTo")));
+    }
+    Ok(Some(Value::Object(g)))
+}
+
 fn confirm_text_frame_options(app: &mut DesignApp, d: &mut Dialog) -> Result<Value, String> {
     seed_text_frame_options(app, d);
     let d = &*d;
@@ -857,6 +910,11 @@ fn confirm_text_frame_options(app: &mut DesignApp, d: &mut Dialog) -> Result<Val
             p.insert(key.into(), json!(d.m(key).filter(|v| *v >= 0.0).ok_or_else(|| bad(what))?));
         }
     }
+    // The custom baseline grid: off, or the fields the user changed (all of them when it is
+    // turned on, since it shows the document grid's).
+    if let Some(grid) = text_frame_baseline_grid(d, &bad)? {
+        p.insert("baselineGrid".into(), grid);
+    }
     if p.is_empty() {
         return Ok(Value::Null);
     }
@@ -994,7 +1052,7 @@ fn margins_and_columns_dialog(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Di
                             crate::icons::button(ui, if linked { "link" } else { "link-broken" }, 20.0, linked, &tip)
                         })
                         .inner;
-                    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &tip));
+                    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &tip));
                     if resp.clicked() {
                         d.fields.insert("link".into(), json!(!linked));
                     }
@@ -1103,7 +1161,7 @@ fn create_guides_dialog(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog)
 /// InDesign shows it ("click in another field to see the value multiplied by two").
 fn measure_field(ui: &mut egui::Ui, d: &mut Dialog, key: &str, w: f32) {
     let mut s = d.s(key);
-    let r = ui.add(egui::TextEdit::singleline(&mut s).desired_width(w).horizontal_align(egui::Align::Min));
+    let r = ui.add(egui::TextEdit::singleline(&mut s).desired_width(w).align(egui::Align2::LEFT_TOP));
     if r.changed() {
         d.fields.insert(key.into(), Value::String(s));
     }
@@ -1248,6 +1306,98 @@ pub fn open_document_setup(app: &mut DesignApp) {
     app.ui.dialog = Some(d);
 }
 
+/// The fields of File › File Info, in the order the dialog shows them, with their labels.
+const FILE_INFO_FIELDS: [(&str, &str); 6] = [
+    ("documentTitle", "Document Title:"),
+    ("author", "Author:"),
+    ("description", "Description:"),
+    ("keywords", "Keywords:"),
+    ("copyrightNotice", "Copyright Notice:"),
+    ("copyrightInfoUrl", "Copyright Info URL:"),
+];
+
+/// File › File Info, filled from the document. Keywords show as one line, separated by semicolons.
+pub fn open_file_info(app: &mut DesignApp) {
+    let Ok(cur) = app.session.execute("file.info.get", &json!({})) else { return };
+    let mut f = Map::new();
+    for (key, _) in FILE_INFO_FIELDS {
+        let v = match &cur[key] {
+            Value::Array(words) => words.iter().filter_map(Value::as_str).collect::<Vec<_>>().join("; "),
+            v => v.as_str().unwrap_or_default().to_string(),
+        };
+        f.insert(key.into(), Value::String(v));
+    }
+    // The keywords as shown and as stored: OK sends them only when they were edited, and then a
+    // stored keyword holding a semicolon or comma that is still there whole stays one keyword.
+    let shown = f.get("keywords").cloned().unwrap_or_default();
+    f.insert("keywordsShown".into(), shown);
+    f.insert("keywordsStored".into(), cur["keywords"].clone());
+    // The document the fields belong to, should another one become active before OK.
+    f.insert("uid".into(), json!(app.session.active().map(|doc| doc.uid)));
+    app.ui.dialog = Some(Dialog::new("fileInfo", Value::Object(f)));
+}
+
+fn file_info_dialog(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
+    egui::Grid::new("file_info").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
+        for (key, label) in FILE_INFO_FIELDS {
+            crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, label));
+            if key == "description" {
+                let mut s = d.s(key);
+                if ui.add(egui::TextEdit::multiline(&mut s).desired_rows(3).desired_width(320.0)).changed() {
+                    d.fields.insert(key.into(), Value::String(s));
+                }
+            } else {
+                text_field(ui, d, key, 320.0);
+            }
+            ui.end_row();
+        }
+    });
+}
+
+/// File Info's OK: every field the dialog holds, as typed (an empty one clears it); the keywords
+/// only when they were edited. A field that is not text (a keyword list, or `null` from
+/// `ui.dialog.open`) goes to `file.info` as it is. The fields go to the document the dialog was
+/// opened for, even when another one became active meanwhile, and the active document stays
+/// active; when the dialog's document has closed, nothing is stored.
+fn confirm_file_info(app: &mut DesignApp, d: &Dialog) -> Result<Value, String> {
+    let keywords_edited = d.fields.get("keywordsShown").and_then(Value::as_str) != Some(d.s("keywords").as_str());
+    let stored: Vec<String> = match d.fields.get("keywordsStored") {
+        Some(Value::Array(words)) => words.iter().filter_map(Value::as_str).map(str::to_string).collect(),
+        _ => Vec::new(),
+    };
+    let p: Map<String, Value> = FILE_INFO_FIELDS
+        .iter()
+        .filter(|(key, _)| d.fields.contains_key(*key))
+        .filter(|(key, _)| *key != "keywords" || keywords_edited)
+        .map(|(key, _)| {
+            let v = match d.fields.get(*key) {
+                Some(Value::String(s)) if *key == "keywords" => json!(designcraft_doc::file_info::parse_keywords_keeping(s, &stored)),
+                Some(v) => v.clone(),
+                None => Value::Null,
+            };
+            (key.to_string(), v)
+        })
+        .collect();
+    let uid = d.fields.get("uid").and_then(Value::as_u64);
+    let active = app.session.active().map(|doc| doc.uid);
+    if uid.is_none() || uid == active {
+        return app.run("file.info", Value::Object(p));
+    }
+    let index = |app: &DesignApp, uid: Option<u64>| app.session.documents().iter().position(|doc| Some(doc.uid) == uid);
+    let Some(i) = index(app, uid) else { return Ok(Value::Null) };
+    // Switching documents ends the active document's Data Merge preview; it is shown again after.
+    let preview = app.session.active().and_then(|doc| doc.preview_record);
+    app.run("file.activate", json!({"index": i}))?;
+    let r = app.run("file.info", Value::Object(p));
+    if let Some(back) = index(app, active) {
+        app.run("file.activate", json!({"index": back}))?;
+        if let Some(record) = preview {
+            app.run("data.preview", json!({"record": record}))?;
+        }
+    }
+    r
+}
+
 /// The edges of Document Setup's margins, bleed and slug (field suffixes).
 const SETUP_EDGES: [&str; 4] = ["Top", "Bottom", "Inside", "Outside"];
 
@@ -1277,7 +1427,7 @@ fn setup_spin(ui: &mut egui::Ui, d: &mut Dialog, key: &str, width: f32, min: f64
         (1.0, egui::Rect::from_min_max(seg.min, egui::pos2(seg.max.x, seg.center().y))),
         (-1.0, egui::Rect::from_min_max(egui::pos2(seg.min.x, seg.center().y), seg.max)),
     ] {
-        let resp = ui.interact(half, ui.id().with((key, dir < 0.0)), egui::Sense::click());
+        let resp = ui.interact(half, ui.scope_id().with((key, dir < 0.0)), egui::Sense::click());
         if resp.hovered() {
             ui.painter().rect_filled(half.shrink(1.0), 1.0, t.hover);
         }
@@ -1296,7 +1446,8 @@ fn setup_spin(ui: &mut egui::Ui, d: &mut Dialog, key: &str, width: f32, min: f64
     let text = egui::Rect::from_min_max(egui::pos2(seg.right() + 5.0, r.top() + 1.0), egui::pos2(r.right() - 3.0, r.bottom() - 1.0));
     let mut s = d.s(key);
     let mut child = ui.new_child(egui::UiBuilder::new().max_rect(text).layout(egui::Layout::left_to_right(egui::Align::Center)));
-    let resp = child.add(egui::TextEdit::singleline(&mut s).id(ui.id().with((key, "text"))).frame(egui::Frame::NONE).desired_width(text.width()));
+    let resp =
+        child.add(egui::TextEdit::singleline(&mut s).id(ui.scope_id().with((key, "text"))).frame(egui::Frame::NONE).desired_width(text.width()));
     if resp.changed() {
         d.fields.insert(key.into(), Value::String(s));
         changed = true;
@@ -1362,7 +1513,7 @@ fn document_setup(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog) ->
     setup_row(ui, rtl, |ui| {
         setup_caption(ui, tr("Intent:"), label_w);
         let cur = d.s("intent");
-        egui::ComboBox::from_id_salt("ds_intent")
+        craft_ui::ComboBox::from_id_salt("ds_intent")
             .selected_text(crate::rtl::widget(
                 ui,
                 tr(match cur.as_str() {
@@ -1396,7 +1547,7 @@ fn document_setup(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog) ->
     setup_row(ui, rtl, |ui| {
         setup_caption(ui, tr("Binding:"), label_w);
         let right_to_left = d.s("binding") == "rightToLeft";
-        egui::ComboBox::from_id_salt("ds_binding")
+        craft_ui::ComboBox::from_id_salt("ds_binding")
             .selected_text(crate::rtl::widget(ui, tr(if right_to_left { "Right to Left" } else { "Left to Right" })))
             .width(150.0)
             .show_ui(ui, |ui| {
@@ -1417,7 +1568,7 @@ fn document_setup(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog) ->
     setup_group(ui, |ui| {
         setup_row(ui, rtl, |ui| {
             crate::rtl::label(ui, egui::RichText::new(tr("Page Size:")).color(t.text_strong));
-            egui::ComboBox::from_id_salt("ds_preset").selected_text(crate::rtl::widget(ui, &preset)).width(260.0).show_ui(ui, |ui| {
+            craft_ui::ComboBox::from_id_salt("ds_preset").selected_text(crate::rtl::widget(ui, &preset)).width(260.0).show_ui(ui, |ui| {
                 for p in designcraft_doc::build::PRESETS {
                     if ui.selectable_label(tr(p.name) == preset, crate::rtl::widget(ui, tr(p.name))).clicked() {
                         // Keep the orientation; the preset's size in the document's units.
@@ -1769,7 +1920,7 @@ fn preferences(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog, max_he
                     ui.horizontal(|ui| {
                         crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "On Screen:"));
                         let rich = d.b("richBlack");
-                        egui::ComboBox::from_id_salt("pref_black")
+                        craft_ui::ComboBox::from_id_salt("pref_black")
                             .selected_text(crate::rtl::widget(
                                 ui,
                                 crate::i18n::tr(
@@ -1789,7 +1940,7 @@ fn preferences(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog, max_he
                     ui.horizontal(|ui| {
                         crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Printing / Exporting:"));
                         let rich = d.b("richBlackOutput");
-                        egui::ComboBox::from_id_salt("pref_black_out")
+                        craft_ui::ComboBox::from_id_salt("pref_black_out")
                             .selected_text(crate::rtl::widget(
                                 ui,
                                 crate::i18n::tr(
@@ -1824,6 +1975,9 @@ fn preferences(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog, max_he
                             d.fields.insert("uiScale".into(), json!(v));
                         }
                     });
+                    ui.add_space(8.0);
+                    crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Panels")).font(semibold(12.0)));
+                    check(ui, d, "autoCollapseIconicPanels", crate::i18n::tr(&app.ui.language, "Auto-Collapse Iconic Panels"));
                 }
                 "grids" => {
                     crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Baseline Grid")).font(semibold(12.0)));
@@ -1836,7 +1990,7 @@ fn preferences(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog, max_he
                         ui.end_row();
                         crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Relative To:"));
                         let cur = d.s("bg.relativeTo");
-                        egui::ComboBox::from_id_salt("bg_rel")
+                        craft_ui::ComboBox::from_id_salt("bg_rel")
                             .selected_text(crate::rtl::widget(
                                 ui,
                                 crate::i18n::tr(&app.ui.language, if cur == "topMargin" { "Top Margin" } else { "Top of Page" }),
@@ -1917,7 +2071,7 @@ fn preferences(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog, max_he
                     let cur = d.s("displayQuality");
                     ui.horizontal(|ui| {
                         crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Default View:"));
-                        egui::ComboBox::from_id_salt("pref_dq")
+                        craft_ui::ComboBox::from_id_salt("pref_dq")
                             .selected_text(match cur.as_str() {
                                 "fast" => crate::i18n::tr(&app.ui.language, "Fast"),
                                 "typical" => crate::i18n::tr(&app.ui.language, "Typical"),
@@ -1939,7 +2093,7 @@ fn preferences(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog, max_he
                         let cur = d.fields.get("rulerOrigin").and_then(Value::as_str).unwrap_or("spread").to_string();
                         const ORIGINS: [(&str, &str); 3] = [("spread", "Spread"), ("page", "Page"), ("spine", "Spine")];
                         let shown = ORIGINS.iter().find(|o| o.0 == cur).map_or("Spread", |o| o.1);
-                        egui::ComboBox::from_id_salt("rulerOrigin")
+                        craft_ui::ComboBox::from_id_salt("rulerOrigin")
                             .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, shown)))
                             .width(140.0)
                             .show_ui(ui, |ui| {
@@ -1953,7 +2107,7 @@ fn preferences(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog, max_he
                         for (key, label) in [("horizontalUnits", "Horizontal:"), ("verticalUnits", "Vertical:")] {
                             crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, label));
                             let cur: Unit = d.fields.get(key).and_then(|v| serde_json::from_value(v.clone()).ok()).unwrap_or_default();
-                            egui::ComboBox::from_id_salt(key)
+                            craft_ui::ComboBox::from_id_salt(key)
                                 .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, cur.label())))
                                 .width(140.0)
                                 .show_ui(ui, |ui| {
@@ -1988,17 +2142,18 @@ fn preferences(app: &crate::DesignApp, ui: &mut egui::Ui, d: &mut Dialog, max_he
                     crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Interface Language")).font(semibold(12.0)));
                     // Each language by its own name, so the list reads the same in every interface language.
                     let current = crate::i18n::LANGUAGES.iter().find(|(code, _)| *code == app.ui.language).map_or("English", |(_, name)| *name);
-                    egui::ComboBox::from_id_salt("pref_language").width(180.0).height(400.0).selected_text(crate::rtl::widget(ui, current)).show_ui(
-                        ui,
-                        |ui| {
+                    craft_ui::ComboBox::from_id_salt("pref_language")
+                        .width(180.0)
+                        .height(400.0)
+                        .selected_text(crate::rtl::widget(ui, current))
+                        .show_ui(ui, |ui| {
                             for (code, name) in crate::i18n::picker_languages() {
                                 if ui.selectable_label(code == app.ui.language, crate::rtl::widget(ui, name)).clicked() {
                                     // Applied by `show` right after this frame, which has `&mut DesignApp`.
                                     d.fields.insert("applyLanguage".into(), json!(code));
                                 }
                             }
-                        },
-                    );
+                        });
                     ui.add_space(6.0);
                     crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "When Scaling")).font(semibold(12.0)));
                     check(ui, d, "scaleStrokes", crate::i18n::tr(&app.ui.language, "Include Stroke Weight"));
@@ -2031,7 +2186,17 @@ fn check(ui: &mut egui::Ui, d: &mut Dialog, key: &str, label: &str) {
     }
 }
 
+/// Draw the active localized dialog; open popups own Enter/Escape, and result handling drives confirm or cancel.
 pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
+    let shortcuts = app.ui.dialog.as_ref().is_some_and(|d| d.id == crate::shortcuts_dialog::DIALOG_ID);
+    if shortcuts {
+        crate::shortcuts_dialog::show(app, ctx);
+        return;
+    }
+    if app.shortcut_dialog.is_some() {
+        // Another dialog took its place: its edits are cancelled.
+        let _ = crate::shortcuts_dialog::close(app, false);
+    }
     let Some(mut d) = app.ui.dialog.clone() else { return };
     // Enter and Escape belong to an open popup (a menu, a name field) rather than the dialog.
     // Read before the dialog draws: a popup closed by this frame's Escape is still open here.
@@ -2051,6 +2216,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
         "textFrameOptions" => crate::i18n::tr(&app.ui.language, "Text Frame Options"),
         "colorTheme" => crate::i18n::tr(&app.ui.language, "Color Theme"),
         "documentSetup" => crate::i18n::tr(&app.ui.language, "Document Setup"),
+        "fileInfo" => crate::i18n::tr(&app.ui.language, "File Info"),
         "numberingSection" => crate::i18n::tr(&app.ui.language, "Numbering & Section Options…").trim_end_matches('…'),
         "findChange" => crate::i18n::tr(&app.ui.language, "Find/Change"),
         "paragraphStyleOptions" => crate::i18n::tr(&app.ui.language, "Paragraph Style Options"),
@@ -2090,9 +2256,9 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
         "print" => crate::i18n::tr(&app.ui.language, "Print"),
         "pdfImport" => crate::i18n::tr(&app.ui.language, "Place PDF"),
         "pdfExport" => crate::i18n::tr(&app.ui.language, "Export PDF"),
+        "epubExport" => crate::i18n::tr(&app.ui.language, "EPUB Export Options"),
         "colorSettings" => crate::i18n::tr(&app.ui.language, "Color Settings"),
         "layerOptions" => crate::i18n::tr(&app.ui.language, "Object Layer Options"),
-        "keyboardShortcuts" => crate::i18n::tr(&app.ui.language, "Keyboard Shortcuts"),
         "colorPicker" => crate::i18n::tr(&app.ui.language, "Color Picker"),
         "swatchOptions" => crate::i18n::tr(&app.ui.language, "Swatch Options"),
         "colorGroupOptions" => crate::i18n::tr(&app.ui.language, "Color Group Options"),
@@ -2104,7 +2270,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
         },
     };
     // No dimmed backdrop: the page behind a dialog is what its settings and colours are judged against.
-    let host = egui::Id::new("dialog");
+    let host = egui::Id::unique("dialog");
     let instance = host.with(&d.id);
     crate::modal_drag::modal(ctx, host, instance).backdrop_color(egui::Color32::TRANSPARENT).show(ctx, |ui| {
         let frame_margin = egui::Frame::popup(ui.style()).total_margin().sum();
@@ -2232,7 +2398,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                                 for (key, label, any) in [("objFill", "Find fill:", "(any)"), ("objChangeFill", "Change fill to:", "(unchanged)")] {
                                     crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, label));
                                     let cur = d.s(key);
-                                    egui::ComboBox::from_id_salt(key)
+                                    craft_ui::ComboBox::from_id_salt(key)
                                         .selected_text(if cur.is_empty() { crate::i18n::tr(&app.ui.language, any) } else { cur.as_str() })
                                         .width(180.0)
                                         .show_ui(ui, |ui| {
@@ -2252,7 +2418,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                                 }
                                 crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Kind:"));
                                 let cur = d.s("objKind");
-                                egui::ComboBox::from_id_salt("objKind")
+                                craft_ui::ComboBox::from_id_salt("objKind")
                                     .selected_text(if cur.is_empty() { crate::i18n::tr(&app.ui.language, "(any)") } else { cur.as_str() })
                                     .show_ui(ui, |ui| {
                                         for v in ["", "text", "graphic", "shape", "line", "group"] {
@@ -2301,7 +2467,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                                 ui.end_row();
                                 crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Search:"));
                                 let cur = d.s("scope");
-                                egui::ComboBox::from_id_salt("fcscope")
+                                craft_ui::ComboBox::from_id_salt("fcscope")
                                     .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, &cur)))
                                     .show_ui(ui, |ui| {
                                         for v in ["document", "story", "selection"] {
@@ -2411,7 +2577,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                                 "media" => crate::i18n::tr(&app.ui.language, "Media"),
                                 _ => crate::i18n::tr(&app.ui.language, "Crop"),
                             };
-                            egui::ComboBox::from_id_salt("pdf_crop").selected_text(crate::rtl::widget(ui, label(&cur))).show_ui(ui, |ui| {
+                            craft_ui::ComboBox::from_id_salt("pdf_crop").selected_text(crate::rtl::widget(ui, label(&cur))).show_ui(ui, |ui| {
                                 for v in designcraft_doc::PdfCrop::ALL.map(designcraft_doc::PdfCrop::name) {
                                     if ui.selectable_label(label(&cur) == label(v), label(v)).clicked() {
                                         d.fields.insert("crop".into(), json!(v));
@@ -2431,8 +2597,15 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                                 && let Some(o) = l.as_object_mut()
                             {
                                 o.insert("visible".into(), json!(on));
+                                d.fields.insert("useDefaults".into(), json!(false));
                             }
                         }
+                        if ui.button(crate::i18n::tr(&app.ui.language, "Use File Defaults")).clicked() {
+                            for layer in &mut layers {
+                                layer["visible"] = layer["default"].clone();
+                            }
+                            d.fields.insert("useDefaults".into(), json!(true));
+                        }
                         d.fields.insert("layers".into(), json!(layers));
                     }
                     "colorSettings" => {
@@ -2441,7 +2614,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                             for (key, label, kind) in [("rgb", "RGB:", "rgb"), ("cmyk", "CMYK:", "cmyk")] {
                                 crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, label));
                                 let cur = d.s(key);
-                                egui::ComboBox::from_id_salt(("ws", key)).selected_text(&cur).width(260.0).show_ui(ui, |ui| {
+                                craft_ui::ComboBox::from_id_salt(("ws", key)).selected_text(&cur).width(260.0).show_ui(ui, |ui| {
                                     for pr in profiles.iter().filter(|p| p["kind"] == kind) {
                                         let name = pr["name"].as_str().unwrap_or("");
                                         if ui.selectable_label(name == cur, name).clicked() {
@@ -2453,7 +2626,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                             }
                             crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Intent:"));
                             let cur = d.s("intent");
-                            egui::ComboBox::from_id_salt("ws_intent")
+                            craft_ui::ComboBox::from_id_salt("ws_intent")
                                 .selected_text(crate::rtl::widget(
                                     ui,
                                     crate::i18n::tr(&app.ui.language, designcraft_color::cms::Intent::parse(&cur).map_or("", |i| i.label())),
@@ -2472,21 +2645,11 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                         });
                         check(ui, &mut d, "bpc", crate::i18n::tr(&app.ui.language, "Use Black Point Compensation"));
                         if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Load Profile…"))).clicked()
-                            && let Some(path) = app.services.pick_open.as_mut().and_then(|f| f("icc"))
+                            && let Err(e) = app.ask_open("icc", Bound::App, load_color_profile)
                         {
-                            match app.session.execute("color.loadProfile", &json!({"path": path})) {
-                                Ok(_) => {
-                                    // Replayed in load order at start-up, so the latest load of a path comes last.
-                                    app.ui.color_profiles.retain(|p| p != &path);
-                                    app.ui.color_profiles.push(path);
-                                    let f = app.session.execute("color.settings", &json!({})).unwrap_or_default();
-                                    d.fields.insert("profiles".into(), f["profiles"].clone());
-                                }
-                                Err(e) => app.status_error("Color Settings", e),
-                            }
+                            app.status_error("Color Settings", e);
                         }
                     }
-                    "keyboardShortcuts" => keyboard_shortcuts(app, ui, &mut d),
                     "userDictionary" => user_dictionary(app, ui, &mut d),
                     "menus" => {
                         text_field(ui, &mut d, "query", 260.0);
@@ -2565,7 +2728,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                                         } else {
                                             mapped.clone()
                                         };
-                                        egui::ComboBox::from_id_salt(("imp_map", w))
+                                        craft_ui::ComboBox::from_id_salt(("imp_map", w))
                                             .selected_text(crate::rtl::widget(ui, &shown))
                                             .width(170.0)
                                             .show_ui(ui, |ui| {
@@ -2686,7 +2849,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                         };
                         ui.horizontal(|ui| {
                             crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Fitting:"));
-                            egui::ComboBox::from_id_salt("ff_fit").selected_text(crate::rtl::widget(ui, label(&cur))).width(200.0).show_ui(
+                            craft_ui::ComboBox::from_id_salt("ff_fit").selected_text(crate::rtl::widget(ui, label(&cur))).width(200.0).show_ui(
                                 ui,
                                 |ui| {
                                     for v in ["none", "fillProportionally", "fitProportionally", "fitContentToFrame", "centerContent"] {
@@ -2744,7 +2907,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                                 "vcard" => crate::i18n::tr(&app.ui.language, "Business Card"),
                                 _ => crate::i18n::tr(&app.ui.language, "Web Hyperlink"),
                             };
-                            egui::ComboBox::from_id_salt("qr_type").selected_text(crate::rtl::widget(ui, label(&cur))).width(160.0).show_ui(
+                            craft_ui::ComboBox::from_id_salt("qr_type").selected_text(crate::rtl::widget(ui, label(&cur))).width(160.0).show_ui(
                                 ui,
                                 |ui| {
                                     for v in ["url", "text", "sms", "email", "vcard"] {
@@ -2826,8 +2989,10 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                             result = Some(true);
                         }
                     }
+                    "fileInfo" => file_info_dialog(app, ui, &mut d),
                     "numberingSection" => crate::section_options::body(app, ui, &mut d),
                     "pdfExport" => pdf_export(app, ui, &mut d),
+                    "epubExport" => epub_export(app, ui, &mut d),
                     "alert" => {
                         let file = d.s("file");
                         if !file.is_empty() {
@@ -3035,6 +3200,9 @@ pub fn cancel(app: &mut DesignApp) {
         app.session.reset_find_scope();
     }
     let d = app.ui.dialog.take();
+    if d.as_ref().is_some_and(|d| d.id == crate::shortcuts_dialog::DIALOG_ID) {
+        let _ = crate::shortcuts_dialog::close(app, false);
+    }
     crate::new_document::end_preview(app);
     if d.as_ref().is_some_and(|d| d.fields.contains_key(PREVIEWED)) {
         app.session.cancel_interaction();
@@ -3063,6 +3231,9 @@ fn find_change_params(d: &Dialog) -> Value {
 /// Apply the open dialog.
 pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
     let Some(d) = app.ui.dialog.take() else { return Err("no dialog open".into()) };
+    if d.id == crate::shortcuts_dialog::DIALOG_ID {
+        return crate::shortcuts_dialog::close(app, true).map(|()| Value::Null);
+    }
     if matches!(d.id.as_str(), "paragraphStyleOptions" | "characterStyleOptions") && d.fields.contains_key(PREVIEWED) {
         // Restore the original before the ordinary command commits one undoable edit.
         app.session.cancel_interaction();
@@ -3070,6 +3241,11 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
     if d.id != "pdfImport" || !d.b("async") {
         app.cancel_pdf_import();
     }
+    confirm_part1(app, d)
+}
+
+/// One slice of the dialogs' Apply; later slices take the ids this one doesn't.
+fn confirm_part1(app: &mut DesignApp, d: Dialog) -> Result<Value, String> {
     match d.id.as_str() {
         "colorTheme" => {
             let result = app.run("swatch.addColorTheme", json!({"name": d.s("name"), "colors": d.fields.get("colors")}));
@@ -3165,6 +3341,14 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
             }
             r
         }
+        "fileInfo" => {
+            let r = confirm_file_info(app, &d);
+            if let Err(e) = &r {
+                app.status(e.clone());
+                app.ui.dialog = Some(d);
+            }
+            r
+        }
         "paragraphStyleOptions" => {
             let mut d = d;
             let r = confirm_paragraph_style_options(app, &mut d);
@@ -3178,6 +3362,13 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
             }
             r
         }
+        _ => confirm_part2(app, d),
+    }
+}
+
+/// One slice of the dialogs' Apply; later slices take the ids this one doesn't.
+fn confirm_part2(app: &mut DesignApp, d: Dialog) -> Result<Value, String> {
+    match d.id.as_str() {
         "deleteParagraphStyle" => {
             let name = d.s("name");
             let replace = d.s("replaceWith");
@@ -3293,6 +3484,13 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
             }
             r
         }
+        _ => confirm_part3(app, d),
+    }
+}
+
+/// One slice of the dialogs' Apply; later slices take the ids this one doesn't.
+fn confirm_part3(app: &mut DesignApp, d: Dialog) -> Result<Value, String> {
+    match d.id.as_str() {
         // Nothing edited: OK leaves the fill or stroke as it was (its swatch and tint).
         "colorPicker" if !d.b("edited") => Ok(Value::Null),
         "colorPicker" => {
@@ -3306,8 +3504,18 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
             app.run("object.color", json!({"color": color, "target": d.s("target"), "text": d.b("text")}))
         }
         "layerOptions" => {
-            let hidden: Vec<Value> = d.fields.get("layers").and_then(Value::as_array).map(|a| a.iter().filter(|l| l["visible"] == false).map(|l| l["name"].clone()).collect()).unwrap_or_default();
-            app.run("object.layerOptions", json!({"hidden": hidden}))
+            let hidden: Vec<Value> = d
+                .fields
+                .get("layers")
+                .and_then(Value::as_array)
+                .map(|a| a.iter().filter(|l| l["visible"] == false).map(|l| l["name"].clone()).collect())
+                .unwrap_or_default();
+            // A dialog opened without the menu's fields has no `useDefaults` at all: confirming it
+            // with no layer unticked resets file defaults, as it did before all-on existed, rather
+            // than making every layer explicitly visible. Only an explicit `false` means all-on.
+            let use_defaults = d.fields.get("useDefaults").and_then(Value::as_bool).unwrap_or(hidden.is_empty());
+            let hidden = if use_defaults { Vec::new() } else { hidden };
+            app.run("object.layerOptions", json!({"hidden": hidden, "useDefaults": use_defaults}))
         }
         "colorSettings" => {
             let r = app.run("color.settings", json!({"rgb": d.s("rgb"), "cmyk": d.s("cmyk"), "intent": d.s("intent"), "bpc": d.b("bpc")}))?;
@@ -3350,9 +3558,22 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
                     "pages": pages, "spreads": d.b("spreads"), "marks": d.b("marks"), "bleed": d.b("bleed")}),
             )?;
             let printer = r["printer"].as_str().unwrap_or_else(|| crate::i18n::tr(&app.ui.language, "the default printer"));
-            app.status(crate::i18n::tr(&app.ui.language, "Sent {count} page(s) to {printer}").replace("{count}", &r["pages"].to_string()).replace("{printer}", printer));
+            app.status(
+                crate::i18n::tr(&app.ui.language, "Sent {count} page(s) to {printer}")
+                    .replace("{count}", &r["pages"].to_string())
+                    .replace("{printer}", printer),
+            );
             Ok(r)
         }
+        "epubExport" => {
+            let split = epub_export_split(&d);
+            let stored = app.session.active().map(|st| st.doc.settings.epub_split.clone());
+            if stored.as_ref() != Some(&split) {
+                let v = serde_json::to_value(&split).map_err(|e| e.to_string())?;
+                app.run("document.epubSplit", json!({"split": v}))?;
+            }
+            crate::menus::export_epub(app, &json!({}))
+        }
         "pdfExport" => {
             // Remember the last-used options; `pages` and `title` are per-job and not persisted.
             app.ui.pdf_export.preset = d.s("preset");
@@ -3391,19 +3612,40 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
                 params["pages"] = json!(pages);
             }
             let title = d.s("title");
+            // Without a title the document's name names the file, and the PDF's title comes from
+            // File Info.
+            let doc_name = app.session.active().map(|st| st.doc.title.clone()).unwrap_or_default();
             if !title.is_empty() {
                 params["title"] = json!(title);
             }
-            let name = if title.is_empty() { "Export.pdf".to_string() } else { format!("{title}.pdf") };
-            match app.pick_save(&name) {
-                Some(path) => {
-                    params["path"] = json!(path);
-                    crate::menus::export_pdf(app, &params)
-                }
-                // The user cancelled the save dialog: export nothing.
-                None => Ok(Value::Null),
-            }
+            let stem = if title.is_empty() { doc_name } else { title };
+            let name = if stem.is_empty() { "Export.pdf".to_string() } else { format!("{stem}.pdf") };
+            app.ask_save(&name, Bound::Document, move |app, path| crate::menus::export_pdf(app, &with_path(&params, "path", path)))
         }
+        _ => confirm_part4(app, d),
+    }
+}
+
+/// Color Settings › Load Profile…: load the chosen profile and list it in the dialog if it is
+/// still open.
+fn load_color_profile(app: &mut DesignApp, path: String) -> Result<Value, String> {
+    if let Err(e) = app.session.execute("color.loadProfile", &json!({"path": path})) {
+        app.status_error("Color Settings", e);
+        return Ok(Value::Null);
+    }
+    // Replayed in load order at start-up, so the latest load of a path comes last.
+    app.ui.color_profiles.retain(|p| p != &path);
+    app.ui.color_profiles.push(path);
+    let f = app.session.execute("color.settings", &json!({})).unwrap_or_default();
+    if let Some(d) = app.ui.dialog.as_mut().filter(|d| d.id == "colorSettings") {
+        d.fields.insert("profiles".into(), f["profiles"].clone());
+    }
+    Ok(Value::Null)
+}
+
+/// One slice of the dialogs' Apply; later slices take the ids this one doesn't.
+fn confirm_part4(app: &mut DesignApp, d: Dialog) -> Result<Value, String> {
+    match d.id.as_str() {
         "preferences" => {
             let mut prefs = json!({"scaleStrokes": d.b("scaleStrokes"), "dimensionsIncludeStroke": d.b("dimensionsIncludeStroke"), "transformationsAreTotals": d.b("transformationsAreTotals"), "absolutePageNumbers": d.b("absolutePageNumbers"), "highlightHj": d.b("highlightHj"), "highlightKeeps": d.b("highlightKeeps"), "highlightCustomTracking": d.b("highlightCustomTracking"), "highlightSubstitutedFonts": d.b("highlightSubstitutedFonts"), "richBlackOutput": d.b("richBlackOutput"), "typographersQuotes": d.b("typographersQuotes"), "showFontNamesInEnglish": d.b("showFontNamesInEnglish"), "smartTextReflow": d.b("smartTextReflow"),
                     "autocorrect": d.b("autocorrect"), "showAddedText": d.b("showAddedText"), "showNoteAnchors": d.b("showNoteAnchors"),
@@ -3439,6 +3681,9 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
             if let Some(v) = d.n("uiScale") {
                 app.run("window.uiScale", json!({"scale": v / 100.0}))?;
             }
+            if let Some(on) = d.fields.get("autoCollapseIconicPanels").and_then(Value::as_bool) {
+                app.ui.dock_auto_collapse = on;
+            }
             if d.fields.contains_key("snap.alignEdges") {
                 let mut snap = json!({
                     "alignEdges": d.b("snap.alignEdges"),
@@ -3506,6 +3751,13 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
             doc["glyphFallback"] = json!(d.b("glyphFallback"));
             app.run("document.preferences", doc)
         }
+        _ => confirm_part5(app, d),
+    }
+}
+
+/// One slice of the dialogs' Apply; later slices take the ids this one doesn't.
+fn confirm_part5(app: &mut DesignApp, d: Dialog) -> Result<Value, String> {
+    match d.id.as_str() {
         "newWorkspace" => app.run(
             "window.newWorkspace",
             json!({"name": d.s("name"), "panelLocations": d.b("panelLocations"), "menuCustomization": d.b("menuCustomization")}),
@@ -3535,20 +3787,20 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
             if d.b("quitting") {
                 return app.confirm_quit_document(uid.ok_or("Missing document in quit confirmation")?, d.b("discard"));
             }
-            let index = |app: &DesignApp| app.session.documents().iter().position(|doc| Some(doc.uid) == uid);
+            let index = move |app: &DesignApp| app.session.documents().iter().position(|doc| Some(doc.uid) == uid);
             let Some(i) = index(app) else { return Ok(Value::Null) };
-            if !d.b("discard") {
-                app.run("file.activate", json!({"index": i}))?;
-                app.run("app.save", json!({}))?;
-                // Still unsaved: the save was cancelled (no file chosen). Keep the document open.
-                if app.session.documents().get(i).is_none_or(|doc| doc.is_dirty()) {
-                    return Ok(Value::Null);
-                }
-            }
-            match index(app) {
-                Some(i) => app.run("file.close", json!({"index": i})),
-                None => Ok(Value::Null),
+            let discard = d.b("discard");
+            // Closes the document once it is saved (or at once, for Don't Save). Still unsaved, the
+            // save failed: the document stays open.
+            let close = move |app: &mut DesignApp| match index(app) {
+                Some(i) if discard || app.session.documents().get(i).is_some_and(|doc| !doc.is_dirty()) => app.run("file.close", json!({"index": i})),
+                _ => Ok(Value::Null),
+            };
+            if discard {
+                return close(app);
             }
+            app.run("file.activate", json!({"index": i}))?;
+            crate::menus::save_then(app, close)
         }
         "loadStyles" => {
             let checked = |key: &str| -> Vec<&str> {
@@ -3600,6 +3852,13 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
             app.ui.dialog = Some(d);
             result
         }
+        _ => confirm_part6(app, d),
+    }
+}
+
+/// One slice of the dialogs' Apply; later slices take the ids this one doesn't.
+fn confirm_part6(app: &mut DesignApp, d: Dialog) -> Result<Value, String> {
+    match d.id.as_str() {
         "insertXref" => {
             let format = d.s("format");
             let target = d.s("target");
@@ -3750,9 +4009,9 @@ fn confirm_paragraph_style_options(app: &mut DesignApp, d: &mut Dialog) -> Resul
     }
     let (para, chars) = style_option_maps(d);
     let based = d.s("basedOn");
-    let rename = d.s("rename");
+    let rename = d.s("rename").trim().to_string();
     let (r, style) = if d.b("new") {
-        let mut params = json!({"name": if rename.trim().is_empty() { "Paragraph Style 1" } else { rename.trim() }, "para": para, "chars": chars});
+        let mut params = json!({"name": if rename.is_empty() { "Paragraph Style 1" } else { rename.as_str() }, "para": para, "chars": chars});
         if !based.is_empty() && based != designcraft_doc::NO_PARA_STYLE {
             params["basedOn"] = json!(based);
         }
@@ -3764,11 +4023,17 @@ fn confirm_paragraph_style_options(app: &mut DesignApp, d: &mut Dialog) -> Resul
         if !based.is_empty() {
             params["basedOn"] = if based == designcraft_doc::NO_PARA_STYLE { Value::Null } else { json!(based) };
         }
-        if !rename.is_empty() && rename != name {
+        let renaming = !rename.is_empty() && rename != name;
+        if renaming {
             params["rename"] = json!(rename);
         }
-        let style = if !rename.is_empty() && rename != name { rename } else { name };
-        (app.run("style.paragraph.edit", params)?, style)
+        let r = app.run("style.paragraph.edit", params).inspect_err(|_| {
+            // A refused name is shown next to the name field.
+            if renaming {
+                d.fields.insert("section".into(), json!("general"));
+            }
+        })?;
+        (r, if renaming { rename } else { name })
     };
     // The style now exists under `style`: if a later step fails, the dialog stays open on it and
     // a second OK edits it rather than creating another one.
@@ -3778,7 +4043,7 @@ fn confirm_paragraph_style_options(app: &mut DesignApp, d: &mut Dialog) -> Resul
     if d.fields.contains_key("x.tag") {
         let tag = d.s("x.tag");
         let tag = if tag == "[Automatic]" { String::new() } else { tag };
-        app.run("style.exportTag", json!({"style": style, "tag": tag, "class": d.s("x.class")}))?;
+        app.run("style.exportTag", json!({"style": style, "tag": tag, "class": d.s("x.class"), "split": d.b("x.split")}))?;
     }
     Ok(r)
 }
@@ -3929,11 +4194,12 @@ fn paragraph_style_options(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
                 if !d.fields.contains_key("x.tag") {
                     d.fields.insert("x.tag".into(), json!(if et.tag.is_empty() { "[Automatic]" } else { et.tag.as_str() }));
                     d.fields.insert("x.class".into(), json!(et.class));
+                    d.fields.insert("x.split".into(), json!(et.split));
                 }
                 ui.horizontal(|ui| {
                     crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Tag:"));
                     let cur = d.s("x.tag");
-                    egui::ComboBox::from_id_salt("export_tag")
+                    craft_ui::ComboBox::from_id_salt("export_tag")
                         .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, &cur)))
                         .show_ui(ui, |ui| {
                             for t in ["[Automatic]", "p", "h1", "h2", "h3", "h4", "h5", "h6", "blockquote", "pre", "li", "figcaption", "aside", "div"]
@@ -3948,15 +4214,16 @@ fn paragraph_style_options(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
                     crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Class:"));
                     text_field(ui, d, "x.class", 160.0);
                 });
+                check(ui, d, "x.split", crate::i18n::tr(&app.ui.language, "Split Document (EPUB only)"));
             }
             "nested" => drop_caps_and_nested_styles(&app.ui.language, ui, d, &pv, &cnames),
             "grep" => grep_styles(&app.ui.language, ui, d, &pv, &cnames),
             "chars" => basic_character_formats(app, ui, d, &CharFields { base: &cv, sparse: false }),
             "indents" => {
                 egui::Grid::new("psi").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
-                    crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Alignment:"));
+                    let alignment_label = crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Alignment:"));
                     let a: designcraft_doc::Align = serde_json::from_value(cur(d, "p.align", &pv["align"])).unwrap_or_default();
-                    egui::ComboBox::from_id_salt("psalign")
+                    craft_ui::ComboBox::from_id_salt("psalign")
                         .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, a.label())))
                         .width(240.0)
                         .show_ui(ui, |ui| {
@@ -3965,7 +4232,9 @@ fn paragraph_style_options(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
                                     d.fields.insert("p.align".into(), serde_json::to_value(al).unwrap_or_default());
                                 }
                             }
-                        });
+                        })
+                        .response
+                        .labelled_by(alignment_label.id);
                     ui.end_row();
                     for (label, key) in [
                         ("Left Indent:", "leftIndent"),
@@ -3981,7 +4250,34 @@ fn paragraph_style_options(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
                         }
                         ui.end_row();
                     }
+                    // The CJK Grid Settings section edits the same `p.gridAlign` field.
+                    use designcraft_doc::GridAlign;
+                    const GRID_ALIGN: [(GridAlign, &str); 3] =
+                        [(GridAlign::None, "None"), (GridAlign::AllLines, "All Lines"), (GridAlign::FirstLineOnly, "First Line Only")];
+                    let grid_label = crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Align to Grid:"));
+                    let g: GridAlign = serde_json::from_value(cur(d, "p.gridAlign", &pv["gridAlign"])).unwrap_or_default();
+                    let shown = GRID_ALIGN.iter().find(|o| o.0 == g).map_or("", |o| o.1);
+                    craft_ui::ComboBox::from_id_salt("psgridalign")
+                        .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, shown)))
+                        .width(240.0)
+                        .show_ui(ui, |ui| {
+                            for (v, label) in GRID_ALIGN {
+                                if ui.selectable_label(v == g, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked()
+                                    && let Ok(v) = serde_json::to_value(v)
+                                {
+                                    d.fields.insert("p.gridAlign".into(), v);
+                                }
+                            }
+                        })
+                        .response
+                        .labelled_by(grid_label.id);
+                    ui.end_row();
                 });
+                ui.add_space(6.0);
+                let mut ignore = cur(d, "p.ignoreOpticalMargin", &pv["ignoreOpticalMargin"]).as_bool().unwrap_or(false);
+                if ui.checkbox(&mut ignore, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Ignore Optical Margin"))).changed() {
+                    d.fields.insert("p.ignoreOpticalMargin".into(), json!(ignore));
+                }
             }
             "tabs" => style_tabs(&app.ui.language, ui, d, &pv, &doc),
             "rules" => paragraph_rules(app, ui, d, "p.", &pv),
@@ -4010,7 +4306,10 @@ fn paragraph_style_options(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
                         d.fields.insert("rename".into(), json!(name));
                     }
                     let mut rn = d.s("rename");
-                    if ui.add(egui::TextEdit::singleline(&mut rn).desired_width(220.0)).changed() {
+                    let name_field = ui
+                        .add(egui::TextEdit::singleline(&mut rn).desired_width(220.0))
+                        .accessible_name(crate::i18n::tr(&app.ui.language, "Style Name").to_owned());
+                    if name_field.changed() {
                         d.fields.insert("rename".into(), json!(rn));
                     }
                     ui.end_row();
@@ -4022,7 +4321,7 @@ fn paragraph_style_options(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
                         .map(str::to_string)
                         .or(style.based_on.clone())
                         .unwrap_or_else(|| "[No Paragraph Style]".into());
-                    egui::ComboBox::from_id_salt("psbased")
+                    let combo = craft_ui::ComboBox::from_id_salt("psbased")
                         .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, &based)))
                         .width(220.0)
                         .show_ui(ui, |ui| {
@@ -4032,6 +4331,7 @@ fn paragraph_style_options(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
                                 }
                             }
                         });
+                    let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Based On"));
                     ui.end_row();
                 });
                 ui.add_space(8.0);
@@ -4128,7 +4428,7 @@ fn delete_paragraph_style(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog
         d.fields.insert("replaceWith".into(), json!(designcraft_doc::BASIC_PARAGRAPH));
     }
     let replace = d.s("replaceWith");
-    egui::ComboBox::from_id_salt("del_para_replace")
+    craft_ui::ComboBox::from_id_salt("del_para_replace")
         .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, &replace)))
         .width(260.0)
         .show_ui(ui, |ui| {
@@ -4175,12 +4475,16 @@ fn style_tabs(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, doc: &d
             });
         }
         crate::rtl::label(ui, crate::i18n::tr(lang, "Leader:"));
-        if let (Some(l), Some(i)) = (text_commit(ui, "psleader", stop.as_ref().map_or("", |s| s.leader.as_str()), 36.0, stop.is_some()), sel) {
+        let leader_name = crate::i18n::tr(lang, "Leader:");
+        let leader = text_commit(ui, "psleader", stop.as_ref().map_or("", |s| s.leader.as_str()), 36.0, stop.is_some(), leader_name);
+        if let (Some(l), Some(i)) = (leader, sel) {
             result = Some(tabs::leader_value(&l, "tabs").map_err(|e| e.to_string()).and_then(|l| tabs::change(&mut list, i, None, Some(l), None)));
         }
         crate::rtl::label(ui, crate::i18n::tr(lang, "Align On:"));
         let on_char = stop.as_ref().is_some_and(|s| s.align == designcraft_doc::TabAlign::Char);
-        if let (Some(c), Some(i)) = (text_commit(ui, "psalignon", stop.as_ref().map_or("", |s| s.align_on.as_str()), 18.0, on_char), sel) {
+        let align_name = crate::i18n::tr(lang, "Align On:");
+        let align_on = text_commit(ui, "psalignon", stop.as_ref().map_or("", |s| s.align_on.as_str()), 18.0, on_char, align_name);
+        if let (Some(c), Some(i)) = (align_on, sel) {
             result = Some(tabs::align_on_value(&c, "tabs").map_err(|e| e.to_string()).and_then(|c| tabs::change(&mut list, i, None, None, Some(c))));
         }
         ui.add_space(6.0);
@@ -4258,7 +4562,7 @@ fn para_measure(ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, key: &str, unit:
 fn para_choice(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, key: &str, opts: &[(&str, &str)]) {
     let cur = para_value(d, pv, key);
     let shown = opts.iter().find(|o| cur == o.0).map_or("", |o| crate::i18n::tr(lang, o.1));
-    egui::ComboBox::from_id_salt(("pschoice", key)).selected_text(crate::rtl::widget(ui, shown)).width(200.0).show_ui(ui, |ui| {
+    craft_ui::ComboBox::from_id_salt(("pschoice", key)).selected_text(crate::rtl::widget(ui, shown)).width(200.0).show_ui(ui, |ui| {
         for (v, label) in opts {
             if ui.selectable_label(cur == *v, crate::rtl::widget(ui, crate::i18n::tr(lang, label))).clicked() {
                 para_set(d, key, json!(v));
@@ -4295,7 +4599,7 @@ fn para_sides(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, key: &s
 /// picked.
 fn swatch_menu(ui: &mut egui::Ui, doc: &designcraft_doc::Document, id: impl egui::AsIdSalt, current: &str, width: f32) -> Option<String> {
     let mut picked = None;
-    egui::ComboBox::from_id_salt(id).selected_text(current).width(width).show_ui(ui, |ui| {
+    craft_ui::ComboBox::from_id_salt(id).selected_text(current).width(width).show_ui(ui, |ui| {
         for w in doc.swatches.iter().filter(|w| !w.hidden) {
             let (c, g) = crate::widgets::swatch_colors(doc, &w.name, 1.0);
             ui.horizontal(|ui| {
@@ -4322,7 +4626,7 @@ fn border_type_menu(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, d
         StrokeType::Style { name } => name.clone(),
         k => crate::i18n::tr(lang, k.label()).to_string(),
     };
-    egui::ComboBox::from_id_salt("psbordertype").selected_text(crate::rtl::widget(ui, shown)).width(160.0).show_ui(ui, |ui| {
+    craft_ui::ComboBox::from_id_salt("psbordertype").selected_text(crate::rtl::widget(ui, shown)).width(160.0).show_ui(ui, |ui| {
         for k in BORDER_TYPES {
             let ty = if k == "dashed" { json!({"kind": k, "pattern": []}) } else { json!({"kind": k}) };
             let Ok(t) = serde_json::from_value::<StrokeType>(ty.clone()) else { continue };
@@ -4354,7 +4658,7 @@ fn para_corners(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, key:
                 c.size = if v.is_finite() { v.clamp(0.0, 10_000.0) } else { 0.0 };
                 changed = true;
             }
-            egui::ComboBox::from_id_salt(("pscornershape", key, i))
+            craft_ui::ComboBox::from_id_salt(("pscornershape", key, i))
                 .selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, c.shape.label())))
                 .width(130.0)
                 .show_ui(ui, |ui| {
@@ -4481,9 +4785,22 @@ fn border_shading(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, doc
     });
 }
 
+/// The value of dialog field `k`, or `base` when the dialog has not set it.
+fn field_or(d: &Dialog, k: &str, base: &Value) -> Value {
+    d.fields.get(k).cloned().unwrap_or_else(|| base.clone())
+}
+
 /// Drop Caps and Nested Styles: the drop cap, nested styles and nested line styles (`p.` fields).
 fn drop_caps_and_nested_styles(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, cnames: &[String]) {
-    let cur = |d: &Dialog, k: &str, base: &Value| d.fields.get(k).cloned().unwrap_or_else(|| base.clone());
+    drop_cap_fields(lang, ui, d, pv, cnames);
+    ui.add_space(8.0);
+    nested_style_rows(lang, ui, d, pv, cnames);
+    ui.add_space(8.0);
+    nested_line_style_rows(lang, ui, d, pv, cnames);
+}
+
+/// The drop cap's lines, characters, character style and alignment options (`p.` fields).
+fn drop_cap_fields(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, cnames: &[String]) {
     crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(lang, "Drop Caps")).font(semibold(12.0)));
     egui::Grid::new("psdc").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
         for (label, key, max) in [
@@ -4491,16 +4808,16 @@ fn drop_caps_and_nested_styles(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv
             ("Characters:", "dropCapChars", designcraft_compose::MAX_DROP_CAP_CHARS),
         ] {
             crate::rtl::label(ui, crate::i18n::tr(lang, label));
-            let v = cur(d, &format!("p.{key}"), &pv[key]).as_f64();
+            let v = field_or(d, &format!("p.{key}"), &pv[key]).as_f64();
             if let Some(n) = crate::widgets::number(ui, &format!("ps{key}"), v, "", 60.0, 0) {
                 d.fields.insert(format!("p.{key}"), json!((n.max(0.0) as u64).min(max as u64)));
             }
             ui.end_row();
         }
         crate::rtl::label(ui, crate::i18n::tr(lang, "Character Style:"));
-        let style = cur(d, "p.dropCapStyle", &pv["dropCapStyle"]).as_str().unwrap_or("").to_string();
+        let style = field_or(d, "p.dropCapStyle", &pv["dropCapStyle"]).as_str().unwrap_or("").to_string();
         let style = if style.is_empty() { designcraft_doc::NO_CHAR_STYLE.to_string() } else { style };
-        egui::ComboBox::from_id_salt("ps_dropcap_style")
+        craft_ui::ComboBox::from_id_salt("ps_dropcap_style")
             .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, &style)))
             .width(160.0)
             .show_ui(ui, |ui| {
@@ -4513,93 +4830,25 @@ fn drop_caps_and_nested_styles(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv
         ui.end_row();
     });
     for (label, key) in [("Align Left Edge", "dropCapAlignLeft"), ("Scale for Descenders", "dropCapScaleDescenders")] {
-        let mut on = cur(d, &format!("p.{key}"), &pv[key]).as_bool().unwrap_or(false);
+        let mut on = field_or(d, &format!("p.{key}"), &pv[key]).as_bool().unwrap_or(false);
         if ui.checkbox(&mut on, crate::rtl::widget(ui, crate::i18n::tr(lang, label))).changed() {
             d.fields.insert(format!("p.{key}"), json!(on));
         }
     }
-    ui.add_space(8.0);
+}
+
+/// The nested styles list (`p.nestedStyles`), with its add button.
+fn nested_style_rows(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, cnames: &[String]) {
     crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(lang, "Nested Styles")).font(semibold(12.0)));
-    let mut list: Vec<Value> = cur(d, "p.nestedStyles", &pv["nestedStyles"]).as_array().cloned().unwrap_or_default();
+    let mut list: Vec<Value> = field_or(d, "p.nestedStyles", &pv["nestedStyles"]).as_array().cloned().unwrap_or_default();
     let mut changed = false;
     let mut remove = None;
     for (i, ns) in list.iter_mut().enumerate() {
-        ui.horizontal(|ui| {
-            let style = ns["style"].as_str().unwrap_or("[None]").to_string();
-            egui::ComboBox::from_id_salt(("ns_style", i))
-                .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, &style)))
-                .width(110.0)
-                .show_ui(ui, |ui| {
-                    for c in cnames {
-                        if ui.selectable_label(*c == style, crate::rtl::widget(ui, crate::i18n::style_name(lang, c))).clicked() {
-                            ns["style"] = json!(c);
-                            changed = true;
-                        }
-                    }
-                });
-            let through = ns["through"].as_bool().unwrap_or(true);
-            egui::ComboBox::from_id_salt(("ns_thr", i))
-                .selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, if through { "through" } else { "up to" })))
-                .width(70.0)
-                .show_ui(ui, |ui| {
-                    for (v, l) in [(true, "through"), (false, "up to")] {
-                        if ui.selectable_label(v == through, crate::rtl::widget(ui, crate::i18n::tr(lang, l))).clicked() {
-                            ns["through"] = json!(v);
-                            changed = true;
-                        }
-                    }
-                });
-            let mut n = ns["count"].as_u64().unwrap_or(1) as u32;
-            let mut count_value = |ui: &mut egui::Ui, ns: &mut Value, changed: &mut bool| {
-                if ui.add(egui::DragValue::new(&mut n).range(1..=999)).changed() {
-                    ns["count"] = json!(n);
-                    *changed = true;
-                }
-            };
-            if !crate::i18n::category_first(lang) {
-                count_value(ui, ns, &mut changed);
-            }
-            let kind = ns["until"]["kind"].as_str().unwrap_or("words").to_string();
-            egui::ComboBox::from_id_salt(("ns_until", i))
-                .selected_text(crate::rtl::widget(
-                    ui,
-                    if crate::i18n::category_first(lang) {
-                        format!("{}:", crate::i18n::tr(lang, &kind))
-                    } else {
-                        crate::i18n::tr(lang, &kind).to_owned()
-                    },
-                ))
-                .width(100.0)
-                .show_ui(ui, |ui| {
-                    for k in
-                        ["sentences", "words", "characters", "letters", "digits", "tab", "forcedLineBreak", "emSpace", "enSpace", "dropcap", "chars"]
-                    {
-                        if ui.selectable_label(k == kind, crate::rtl::widget(ui, crate::i18n::tr(lang, k))).clicked() {
-                            ns["until"] = if k == "chars" { json!({"kind": "chars", "chars": ":"}) } else { json!({"kind": k}) };
-                            changed = true;
-                        }
-                    }
-                });
-            if crate::i18n::category_first(lang) {
-                count_value(ui, ns, &mut changed);
-            }
-            if kind == "chars" {
-                let mut c = ns["until"]["chars"].as_str().unwrap_or("").to_string();
-                if ui.add(egui::TextEdit::singleline(&mut c).desired_width(40.0)).changed() {
-                    ns["until"]["chars"] = json!(c);
-                    changed = true;
-                }
-            }
-            if ui
-                .small_button("×")
-                .on_hover_ui(|ui| {
-                    crate::rtl::label(ui, crate::i18n::tr(lang, "Delete"));
-                })
-                .clicked()
-            {
-                remove = Some(i);
-            }
-        });
+        let (row_changed, delete) = ui.horizontal(|ui| nested_style_row(lang, ui, ns, i, cnames)).inner;
+        changed |= row_changed;
+        if delete {
+            remove = Some(i);
+        }
     }
     if let Some(i) = remove {
         list.remove(i);
@@ -4612,51 +4861,92 @@ fn drop_caps_and_nested_styles(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv
     if changed {
         d.fields.insert("p.nestedStyles".into(), Value::Array(list));
     }
-    ui.add_space(8.0);
+}
+
+/// One row of the nested styles list. Returns whether the row changed and whether its delete
+/// button was pressed.
+fn nested_style_row(lang: &str, ui: &mut egui::Ui, ns: &mut Value, i: usize, cnames: &[String]) -> (bool, bool) {
+    let mut changed = false;
+    let style = ns["style"].as_str().unwrap_or("[None]").to_string();
+    craft_ui::ComboBox::from_id_salt(("ns_style", i))
+        .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, &style)))
+        .width(110.0)
+        .show_ui(ui, |ui| {
+            for c in cnames {
+                if ui.selectable_label(*c == style, crate::rtl::widget(ui, crate::i18n::style_name(lang, c))).clicked() {
+                    ns["style"] = json!(c);
+                    changed = true;
+                }
+            }
+        });
+    let through = ns["through"].as_bool().unwrap_or(true);
+    craft_ui::ComboBox::from_id_salt(("ns_thr", i))
+        .selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, if through { "through" } else { "up to" })))
+        .width(70.0)
+        .show_ui(ui, |ui| {
+            for (v, l) in [(true, "through"), (false, "up to")] {
+                if ui.selectable_label(v == through, crate::rtl::widget(ui, crate::i18n::tr(lang, l))).clicked() {
+                    ns["through"] = json!(v);
+                    changed = true;
+                }
+            }
+        });
+    let mut n = ns["count"].as_u64().unwrap_or(1) as u32;
+    let mut count_value = |ui: &mut egui::Ui, ns: &mut Value, changed: &mut bool| {
+        if ui.add(egui::DragValue::new(&mut n).range(1..=999)).changed() {
+            ns["count"] = json!(n);
+            *changed = true;
+        }
+    };
+    if !crate::i18n::category_first(lang) {
+        count_value(ui, ns, &mut changed);
+    }
+    let kind = ns["until"]["kind"].as_str().unwrap_or("words").to_string();
+    craft_ui::ComboBox::from_id_salt(("ns_until", i))
+        .selected_text(crate::rtl::widget(
+            ui,
+            if crate::i18n::category_first(lang) { format!("{}:", crate::i18n::tr(lang, &kind)) } else { crate::i18n::tr(lang, &kind).to_owned() },
+        ))
+        .width(100.0)
+        .show_ui(ui, |ui| {
+            for k in ["sentences", "words", "characters", "letters", "digits", "tab", "forcedLineBreak", "emSpace", "enSpace", "dropcap", "chars"] {
+                if ui.selectable_label(k == kind, crate::rtl::widget(ui, crate::i18n::tr(lang, k))).clicked() {
+                    ns["until"] = if k == "chars" { json!({"kind": "chars", "chars": ":"}) } else { json!({"kind": k}) };
+                    changed = true;
+                }
+            }
+        });
+    if crate::i18n::category_first(lang) {
+        count_value(ui, ns, &mut changed);
+    }
+    if kind == "chars" {
+        let mut c = ns["until"]["chars"].as_str().unwrap_or("").to_string();
+        if ui.add(egui::TextEdit::singleline(&mut c).desired_width(40.0)).changed() {
+            ns["until"]["chars"] = json!(c);
+            changed = true;
+        }
+    }
+    let delete = ui
+        .small_button("×")
+        .on_hover_ui(|ui| {
+            crate::rtl::label(ui, crate::i18n::tr(lang, "Delete"));
+        })
+        .clicked();
+    (changed, delete)
+}
+
+/// The nested line styles list (`p.nestedLineStyles`), with its add button.
+fn nested_line_style_rows(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, cnames: &[String]) {
     crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(lang, "Nested Line Styles")).font(semibold(12.0)));
-    let mut lines: Vec<Value> = cur(d, "p.nestedLineStyles", &pv["nestedLineStyles"]).as_array().cloned().unwrap_or_default();
+    let mut lines: Vec<Value> = field_or(d, "p.nestedLineStyles", &pv["nestedLineStyles"]).as_array().cloned().unwrap_or_default();
     let mut changed = false;
     let mut remove = None;
     for (i, l) in lines.iter_mut().enumerate() {
-        ui.horizontal(|ui| {
-            let style = l["style"].as_str().unwrap_or("").to_string();
-            egui::ComboBox::from_id_salt(("nls_style", i))
-                .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, &style)))
-                .width(130.0)
-                .show_ui(ui, |ui| {
-                    for c in cnames {
-                        if ui.selectable_label(*c == style, crate::rtl::widget(ui, crate::i18n::style_name(lang, c))).clicked() {
-                            l["style"] = json!(c);
-                            changed = true;
-                        }
-                    }
-                });
-            crate::rtl::label(
-                ui,
-                if crate::i18n::category_first(lang) {
-                    format!("{}:", crate::i18n::tr(lang, "lines"))
-                } else {
-                    crate::i18n::tr(lang, "for").to_owned()
-                },
-            );
-            let mut n = l["lines"].as_u64().unwrap_or(1) as u32;
-            if ui.add(egui::DragValue::new(&mut n).range(1..=999)).changed() {
-                l["lines"] = json!(n);
-                changed = true;
-            }
-            if !crate::i18n::category_first(lang) {
-                crate::rtl::label(ui, crate::i18n::tr(lang, if n == 1 { "line" } else { "lines" }));
-            }
-            if ui
-                .small_button("×")
-                .on_hover_ui(|ui| {
-                    crate::rtl::label(ui, crate::i18n::tr(lang, "Delete"));
-                })
-                .clicked()
-            {
-                remove = Some(i);
-            }
-        });
+        let (row_changed, delete) = ui.horizontal(|ui| nested_line_style_row(lang, ui, l, i, cnames)).inner;
+        changed |= row_changed;
+        if delete {
+            remove = Some(i);
+        }
     }
     if let Some(i) = remove {
         lines.remove(i);
@@ -4671,6 +4961,43 @@ fn drop_caps_and_nested_styles(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv
     }
 }
 
+/// One row of the nested line styles list. Returns whether the row changed and whether its delete
+/// button was pressed.
+fn nested_line_style_row(lang: &str, ui: &mut egui::Ui, l: &mut Value, i: usize, cnames: &[String]) -> (bool, bool) {
+    let mut changed = false;
+    let style = l["style"].as_str().unwrap_or("").to_string();
+    craft_ui::ComboBox::from_id_salt(("nls_style", i))
+        .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, &style)))
+        .width(130.0)
+        .show_ui(ui, |ui| {
+            for c in cnames {
+                if ui.selectable_label(*c == style, crate::rtl::widget(ui, crate::i18n::style_name(lang, c))).clicked() {
+                    l["style"] = json!(c);
+                    changed = true;
+                }
+            }
+        });
+    crate::rtl::label(
+        ui,
+        if crate::i18n::category_first(lang) { format!("{}:", crate::i18n::tr(lang, "lines")) } else { crate::i18n::tr(lang, "for").to_owned() },
+    );
+    let mut n = l["lines"].as_u64().unwrap_or(1) as u32;
+    if ui.add(egui::DragValue::new(&mut n).range(1..=999)).changed() {
+        l["lines"] = json!(n);
+        changed = true;
+    }
+    if !crate::i18n::category_first(lang) {
+        crate::rtl::label(ui, crate::i18n::tr(lang, if n == 1 { "line" } else { "lines" }));
+    }
+    let delete = ui
+        .small_button("×")
+        .on_hover_ui(|ui| {
+            crate::rtl::label(ui, crate::i18n::tr(lang, "Delete"));
+        })
+        .clicked();
+    (changed, delete)
+}
+
 /// GREP Styles: a character style applied to text matching each pattern (`p.` fields).
 fn grep_styles(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, cnames: &[String]) {
     let cur = |d: &Dialog, k: &str, base: &Value| d.fields.get(k).cloned().unwrap_or_else(|| base.clone());
@@ -4682,7 +5009,7 @@ fn grep_styles(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, cnames
         ui.horizontal(|ui| {
             crate::rtl::label(ui, crate::i18n::tr(lang, "Apply Style:"));
             let style = g["style"].as_str().unwrap_or("").to_string();
-            egui::ComboBox::from_id_salt(("gs_style", i))
+            craft_ui::ComboBox::from_id_salt(("gs_style", i))
                 .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, &style)))
                 .width(110.0)
                 .show_ui(ui, |ui| {
@@ -4797,7 +5124,7 @@ fn span_columns(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, doc:
         // "Span Columns" names both the section and this option, which some languages word differently.
         let kind_label = |k: &'static str| -> &'static str { crate::i18n::tr_context(lang, k, "paragraphLayout") };
         let shown = kinds.iter().find(|k| same(&k.1, &cur)).map_or("", |k| kind_label(k.0));
-        egui::ComboBox::from_id_salt("psspankind").selected_text(crate::rtl::widget(ui, shown)).width(200.0).show_ui(ui, |ui| {
+        craft_ui::ComboBox::from_id_salt("psspankind").selected_text(crate::rtl::widget(ui, shown)).width(200.0).show_ui(ui, |ui| {
             for (label, v) in kinds {
                 if ui.selectable_label(same(&v, &cur), crate::rtl::widget(ui, kind_label(label))).clicked() && !same(&v, &cur) {
                     next = Some(v);
@@ -4810,7 +5137,7 @@ fn span_columns(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, doc:
             SpanColumns::Span(n) => {
                 crate::rtl::label(ui, crate::i18n::tr(lang, "Columns:"));
                 let shown = if n == 0 { crate::i18n::tr(lang, "All").to_string() } else { n.to_string() };
-                egui::ComboBox::from_id_salt("psspann").selected_text(crate::rtl::widget(ui, shown)).width(80.0).show_ui(ui, |ui| {
+                craft_ui::ComboBox::from_id_salt("psspann").selected_text(crate::rtl::widget(ui, shown)).width(80.0).show_ui(ui, |ui| {
                     if ui.selectable_label(n == 0, crate::rtl::widget(ui, crate::i18n::tr(lang, "All"))).clicked() {
                         next = Some(SpanColumns::Span(0));
                     }
@@ -4903,9 +5230,10 @@ impl ListUi<'_> {
 /// A character style for a bullet or number (`key`), [None] first.
 fn list_char_style(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, key: &str, styles: &[String]) {
     let cur = para_value(d, pv, key).as_str().unwrap_or(designcraft_doc::NO_CHAR_STYLE).to_string();
-    egui::ComboBox::from_id_salt(("pslistcs", key)).selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, &cur))).width(200.0).show_ui(
-        ui,
-        |ui| {
+    craft_ui::ComboBox::from_id_salt(("pslistcs", key))
+        .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, &cur)))
+        .width(200.0)
+        .show_ui(ui, |ui| {
             for n in std::iter::once(designcraft_doc::NO_CHAR_STYLE)
                 .chain(styles.iter().map(String::as_str).filter(|n| *n != designcraft_doc::NO_CHAR_STYLE))
             {
@@ -4913,8 +5241,7 @@ fn list_char_style(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, ke
                     para_set(d, key, json!(n));
                 }
             }
-        },
-    );
+        });
 }
 
 /// The bullet character: common bullets, a field, and the font's glyphs in a grid to pick from.
@@ -4973,7 +5300,7 @@ fn bullet_font(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, lu: &L
     let font = para_value(d, pv, "bulletFont").as_str().unwrap_or("").to_string();
     let inherit = crate::i18n::tr(lang, "(Paragraph Font)");
     crate::rtl::label(ui, crate::i18n::tr(lang, "Font Family:"));
-    egui::ComboBox::from_id_salt("psbulletfont").selected_text(if font.is_empty() { inherit } else { font.as_str() }).width(200.0).show_ui(
+    craft_ui::ComboBox::from_id_salt("psbulletfont").selected_text(if font.is_empty() { inherit } else { font.as_str() }).width(200.0).show_ui(
         ui,
         |ui| {
             if ui.selectable_label(font.is_empty(), inherit).clicked() {
@@ -4992,7 +5319,7 @@ fn bullet_font(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value, lu: &L
     crate::rtl::label(ui, crate::i18n::tr(lang, "Font Style:"));
     let style = para_value(d, pv, "bulletFontStyle").as_str().unwrap_or("").to_string();
     ui.add_enabled_ui(!font.is_empty(), |ui| {
-        egui::ComboBox::from_id_salt("psbulletstyle").selected_text(style.as_str()).width(200.0).show_ui(ui, |ui| {
+        craft_ui::ComboBox::from_id_salt("psbulletstyle").selected_text(style.as_str()).width(200.0).show_ui(ui, |ui| {
             for st in lu.fonts.styles(&font) {
                 if ui.selectable_label(st == style, &st).clicked() {
                     para_set(d, "bulletFontStyle", json!(st));
@@ -5035,7 +5362,7 @@ fn bullets_and_numbering(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Val
                     let list = para_value(d, pv, "listName").as_str().unwrap_or("").to_string();
                     // "" is the story's own list.
                     let name = |n: &str| if n.is_empty() { crate::i18n::tr(lang, "[Default]").to_string() } else { n.to_string() };
-                    egui::ComboBox::from_id_salt("pslist").selected_text(name(&list)).width(200.0).show_ui(ui, |ui| {
+                    craft_ui::ComboBox::from_id_salt("pslist").selected_text(name(&list)).width(200.0).show_ui(ui, |ui| {
                         for n in std::iter::once("").chain(doc.settings.lists.iter().map(|l| l.name.as_str())) {
                             if ui.selectable_label(n == list, name(n)).clicked() {
                                 para_set(d, "listName", json!(n));
@@ -5054,7 +5381,7 @@ fn bullets_and_numbering(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Val
                     let start = para_value(d, pv, "startAt").as_u64();
                     ui.horizontal(|ui| {
                         let shown = crate::i18n::tr(lang, if start.is_some() { "Start At" } else { "Continue from Previous Number" });
-                        egui::ComboBox::from_id_salt("psmode").selected_text(crate::rtl::widget(ui, shown)).width(200.0).show_ui(ui, |ui| {
+                        craft_ui::ComboBox::from_id_salt("psmode").selected_text(crate::rtl::widget(ui, shown)).width(200.0).show_ui(ui, |ui| {
                             if ui
                                 .selectable_label(start.is_none(), crate::rtl::widget(ui, crate::i18n::tr(lang, "Continue from Previous Number")))
                                 .clicked()
@@ -5081,16 +5408,16 @@ fn bullets_and_numbering(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Val
                             para_check(ui, d, pv, "restartNumbers", crate::i18n::tr(lang, "Restart Numbers at This Level After:"));
                             let after = para_value(d, pv, "restartAfterLevel").as_u64().unwrap_or(0) as u32;
                             let label = |n: u32| if n == 0 { crate::i18n::tr(lang, "Any Previous Level").to_string() } else { n.to_string() };
-                            egui::ComboBox::from_id_salt("psrestartafter").selected_text(crate::rtl::widget(ui, label(after))).width(140.0).show_ui(
-                                ui,
-                                |ui| {
+                            craft_ui::ComboBox::from_id_salt("psrestartafter")
+                                .selected_text(crate::rtl::widget(ui, label(after)))
+                                .width(140.0)
+                                .show_ui(ui, |ui| {
                                     for n in 0..level {
                                         if ui.selectable_label(n == after, crate::rtl::widget(ui, label(n))).clicked() {
                                             para_set(d, "restartAfterLevel", json!(n));
                                         }
                                     }
-                                },
-                            );
+                                });
                         });
                     });
                     ui.end_row();
@@ -5223,20 +5550,21 @@ fn character_style_general(
     let (name, new) = (d.s("name"), d.b("new"));
     egui::Grid::new("csg").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
         crate::rtl::label(ui, crate::i18n::tr(lang, "Style Name:"));
-        text_field(ui, d, "rename", 220.0);
+        text_field_named(ui, d, "rename", 220.0, crate::i18n::tr(lang, "Style Name"));
         ui.end_row();
         crate::rtl::label(ui, crate::i18n::tr(lang, "Based On:"));
-        egui::ComboBox::from_id_salt("csbased").selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, based))).width(220.0).show_ui(
-            ui,
-            |ui| {
+        let combo = craft_ui::ComboBox::from_id_salt("csbased")
+            .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(lang, based)))
+            .width(220.0)
+            .show_ui(ui, |ui| {
                 // Not itself, nor a style based on it.
                 for s in styles.character.iter().filter(|s| new || !styles.char_based_on_cycles(&name, &s.name)) {
                     if ui.selectable_label(s.name == based, crate::rtl::widget(ui, crate::i18n::style_name(lang, &s.name))).clicked() {
                         d.fields.insert("basedOn".into(), json!(s.name));
                     }
                 }
-            },
-        );
+            });
+        let _ = crate::widgets::name_combo(combo, crate::i18n::tr(lang, "Based On"));
         ui.end_row();
     });
     let status = d.s("status");
@@ -5384,7 +5712,7 @@ fn char_number(ui: &mut egui::Ui, d: &mut Dialog, cf: &CharFields, key: &str, su
 fn char_choice(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, cf: &CharFields, key: &str, opts: &[(Value, &str)]) {
     let cur = cf.get(d, key);
     let shown = opts.iter().find(|o| o.0 == cur).map_or("", |o| crate::i18n::tr(lang, o.1));
-    egui::ComboBox::from_id_salt(("cs", key)).selected_text(crate::rtl::widget(ui, shown)).width(200.0).show_ui(ui, |ui| {
+    craft_ui::ComboBox::from_id_salt(("cs", key)).selected_text(crate::rtl::widget(ui, shown)).width(200.0).show_ui(ui, |ui| {
         if cf.sparse && ui.selectable_label(cur.is_null(), " ").clicked() {
             cf.set(d, key, Value::Null);
         }
@@ -5431,22 +5759,29 @@ fn basic_character_formats(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
         crate::rtl::label(ui, crate::i18n::tr(lang, "Font Family:"));
         let fam = cf.get(d, "fontFamily").as_str().unwrap_or("").to_string();
         let shown = if fam.is_empty() { "—".to_string() } else { crate::panels::font_label(app, &menu, &fam) };
-        egui::ComboBox::from_id_salt("psfam")
+        let picked = craft_ui::ComboBox::from_id_salt("psfam")
             .selected_text(shown)
             .width(200.0)
             .height(440.0)
             .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
-            .show_ui(ui, |ui| {
-                if cf.sparse && ui.selectable_label(fam.is_empty(), " ").clicked() {
-                    cf.set(d, "fontFamily", Value::Null);
-                }
-                if let Some(f) = crate::panels::font_menu_body(app, ui, &menu, &fam, 200.0) {
-                    cf.set(d, "fontFamily", json!(f.family));
-                    if let Some(style) = f.style {
-                        cf.set(d, "fontStyle", json!(style));
+            .show_ui_with_header(
+                ui,
+                |ui| {
+                    if cf.sparse && ui.selectable_label(fam.is_empty(), " ").clicked() {
+                        cf.set(d, "fontFamily", Value::Null);
                     }
-                }
-            });
+                    crate::panels::font_menu_header(app, ui, &menu, &fam, 200.0)
+                },
+                crate::panels::font_menu_list,
+            )
+            .inner
+            .flatten();
+        if let Some(f) = picked {
+            cf.set(d, "fontFamily", json!(f.family));
+            if let Some(style) = f.style {
+                cf.set(d, "fontStyle", json!(style));
+            }
+        }
         ui.end_row();
         crate::rtl::label(ui, crate::i18n::tr(lang, "Font Style:"));
         let sty = cf.get(d, "fontStyle").as_str().unwrap_or("").to_string();
@@ -5457,7 +5792,7 @@ fn basic_character_formats(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
                 cf.set(d, "fontStyle", if s.trim().is_empty() { Value::Null } else { json!(s) });
             }
         } else {
-            egui::ComboBox::from_id_salt("pssty").selected_text(&sty).width(200.0).show_ui(ui, |ui| {
+            craft_ui::ComboBox::from_id_salt("pssty").selected_text(&sty).width(200.0).show_ui(ui, |ui| {
                 if cf.sparse && ui.selectable_label(sty.is_empty(), " ").clicked() {
                     cf.set(d, "fontStyle", Value::Null);
                 }
@@ -5565,7 +5900,7 @@ fn advanced_character_formats(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, cf:
         let labels: Vec<String> = crate::panels::properties::DIGIT_OPTIONS.iter().map(|o| crate::panels::properties::digit_label(lang, *o)).collect();
         let cur = cf.get(d, "digits");
         let shown = crate::panels::properties::DIGIT_OPTIONS.iter().position(|o| json!(o.0) == cur).map_or(String::new(), |i| labels[i].clone());
-        egui::ComboBox::from_id_salt(("cs", "digits")).selected_text(crate::rtl::widget(ui, &shown)).width(200.0).show_ui(ui, |ui| {
+        craft_ui::ComboBox::from_id_salt(("cs", "digits")).selected_text(crate::rtl::widget(ui, &shown)).width(200.0).show_ui(ui, |ui| {
             if cf.sparse && ui.selectable_label(cur.is_null(), " ").clicked() {
                 cf.set(d, "digits", Value::Null);
             }
@@ -5641,14 +5976,18 @@ fn open_type_features(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, cf: &CharFi
         crate::rtl::label(ui, crate::i18n::tr(lang, "Figure Style:"));
         let fig = otf::figures(&list);
         let shown = otf::FIGURES.iter().find(|f| f.0 == fig).map_or("", |f| f.1);
-        egui::ComboBox::from_id_salt("csfig").selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, shown))).width(180.0).show_ui(ui, |ui| {
-            for (id, label, ..) in otf::FIGURES {
-                if ui.selectable_label(fig == *id, crate::rtl::widget(ui, crate::i18n::tr(lang, label))).clicked() && otf::set_figures(&mut list, id)
-                {
-                    changed = true;
+        craft_ui::ComboBox::from_id_salt("csfig").selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, shown))).width(180.0).show_ui(
+            ui,
+            |ui| {
+                for (id, label, ..) in otf::FIGURES {
+                    if ui.selectable_label(fig == *id, crate::rtl::widget(ui, crate::i18n::tr(lang, label))).clicked()
+                        && otf::set_figures(&mut list, id)
+                    {
+                        changed = true;
+                    }
                 }
-            }
-        });
+            },
+        );
     });
     ui.add_space(4.0);
     crate::rtl::label(ui, crate::i18n::tr(lang, "Stylistic Sets"));
@@ -5723,7 +6062,7 @@ fn delete_character_style(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog
         d.fields.insert("replaceWith".into(), json!(designcraft_doc::NO_CHAR_STYLE));
     }
     let replace = d.s("replaceWith");
-    egui::ComboBox::from_id_salt("del_char_replace")
+    craft_ui::ComboBox::from_id_salt("del_char_replace")
         .selected_text(crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, &replace)))
         .width(260.0)
         .show_ui(ui, |ui| {
@@ -5738,7 +6077,7 @@ fn delete_character_style(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog
 fn combo(ui: &mut egui::Ui, d: &mut Dialog, key: &str, opts: &[(&str, &str)]) {
     let cur = d.s(key);
     let shown = opts.iter().find(|o| o.0 == cur).map_or(cur.as_str(), |o| o.1).to_string();
-    egui::ComboBox::from_id_salt(key).selected_text(crate::rtl::widget(ui, &shown)).width(170.0).show_ui(ui, |ui| {
+    craft_ui::ComboBox::from_id_salt(key).selected_text(crate::rtl::widget(ui, &shown)).width(170.0).show_ui(ui, |ui| {
         for (v, label) in opts {
             if ui.selectable_label(cur == *v, crate::rtl::widget(ui, *label)).clicked() {
                 d.fields.insert(key.into(), json!(v));
@@ -6079,7 +6418,7 @@ fn paragraph_rules(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog, prefix: &
     };
     ui.horizontal(|ui| {
         let shown = RULES.iter().find(|r| r.0 == which).map_or(which, |r| r.1);
-        egui::ComboBox::from_id_salt("rule_which").selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, shown))).width(130.0).show_ui(
+        craft_ui::ComboBox::from_id_salt("rule_which").selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, shown))).width(130.0).show_ui(
             ui,
             |ui| {
                 for (v, label) in RULES {
@@ -6115,7 +6454,7 @@ fn paragraph_rules(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog, prefix: &
             }
             crate::rtl::label(ui, crate::i18n::tr(lang, "Width:"));
             let column = rule["columnWidth"].as_bool().unwrap_or(true);
-            egui::ComboBox::from_id_salt(("rule_width", which))
+            craft_ui::ComboBox::from_id_salt(("rule_width", which))
                 .selected_text(crate::rtl::widget(ui, crate::i18n::tr(lang, if column { "Column" } else { "Text" })))
                 .width(130.0)
                 .show_ui(ui, |ui| {
@@ -6522,7 +6861,7 @@ fn toc_params(app: &DesignApp, d: &Dialog) -> Value {
 fn toc_style_combo(ui: &mut egui::Ui, salt: &str, styles: &[String], auto: &str, cur: &mut String) -> bool {
     let shown = if cur.is_empty() { auto.to_string() } else { cur.clone() };
     let mut changed = false;
-    egui::ComboBox::from_id_salt(("toc_style", salt)).selected_text(shown).width(200.0).show_ui(ui, |ui| {
+    craft_ui::ComboBox::from_id_salt(("toc_style", salt)).selected_text(shown).width(200.0).show_ui(ui, |ui| {
         if ui.selectable_label(cur.is_empty(), auto).clicked() {
             cur.clear();
             changed = true;
@@ -6613,7 +6952,7 @@ fn toc_dialog(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
             crate::rtl::label(ui, tr("Page Number:"));
             let choices = [("after", "After Entry"), ("before", "Before Entry"), ("none", "No Page Number")];
             let cur = choices.iter().find(|(v, _)| *v == r.page_number).map_or("After Entry", |(_, l)| l);
-            egui::ComboBox::from_id_salt("toc_page_number").selected_text(tr(cur)).width(200.0).show_ui(ui, |ui| {
+            craft_ui::ComboBox::from_id_salt("toc_page_number").selected_text(tr(cur)).width(200.0).show_ui(ui, |ui| {
                 for (v, l) in choices {
                     if ui.selectable_label(r.page_number == v, tr(l)).clicked() {
                         r.page_number = v.into();
@@ -6624,7 +6963,7 @@ fn toc_dialog(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
             toc_style_combo(ui, "page_number", &char_styles, none, &mut r.page_number_style);
             ui.end_row();
             crate::rtl::label(ui, tr("Between Entry and Number:"));
-            ui.add(egui::TextEdit::singleline(&mut r.separator).desired_width(80.0).horizontal_align(egui::Align::Min));
+            ui.add(egui::TextEdit::singleline(&mut r.separator).desired_width(80.0).align(egui::Align2::LEFT_TOP));
             crate::rtl::label(ui, tr("Style:"));
             toc_style_combo(ui, "separator", &char_styles, none, &mut r.separator_style);
             ui.end_row();
@@ -6632,7 +6971,7 @@ fn toc_dialog(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
             ui.checkbox(&mut r.sort, tr("Sort Entries in Alphabetical Order"));
             ui.end_row();
             crate::rtl::label(ui, tr("Level:"));
-            egui::ComboBox::from_id_salt("toc_level").selected_text(r.level.to_string()).width(60.0).show_ui(ui, |ui| {
+            craft_ui::ComboBox::from_id_salt("toc_level").selected_text(r.level.to_string()).width(60.0).show_ui(ui, |ui| {
                 for l in 1..=9u8 {
                     if ui.selectable_label(r.level == l, l.to_string()).clicked() {
                         r.level = l;
@@ -6903,7 +7242,7 @@ fn color_picker(ui: &mut egui::Ui, d: &mut Dialog) {
     let mut cmyk = nums::<4>(d, "cmyk").unwrap_or_else(|| cmyk_of(rgb));
     let mut model = if d.s("model") == "cmyk" || (!d.fields.contains_key("model") && d.fields.contains_key("cmyk")) { "cmyk" } else { "rgb" };
     let mut edit = ColorEdit::None;
-    let hex_id = egui::Id::new("color_picker_hex");
+    let hex_id = egui::Id::unique("color_picker_hex");
     ui.horizontal_top(|ui| {
         let mut c = egui::Color32::from_rgb(to8(rgb[0]), to8(rgb[1]), to8(rgb[2]));
         let shown = c;
@@ -6917,7 +7256,9 @@ fn color_picker(ui: &mut egui::Ui, d: &mut Dialog) {
                 for (v, l) in cmyk.iter_mut().zip(["C", "M", "Y", "K"]) {
                     if let Some((rv, rl)) = rgb_rows.next() {
                         ui.label(rl);
-                        if ui.add(egui::DragValue::new(rv).range(0.0..=255.0).max_decimals(1)).changed() {
+                        // The channel letter is a label beside a bare spinner: name the spinner.
+                        let field = ui.add(egui::DragValue::new(rv).range(0.0..=255.0).max_decimals(1)).accessible_name(rl.to_owned());
+                        if field.changed() {
                             edit = ColorEdit::Rgb;
                         }
                     } else {
@@ -6925,7 +7266,8 @@ fn color_picker(ui: &mut egui::Ui, d: &mut Dialog) {
                         ui.label("");
                     }
                     ui.label(l);
-                    if ui.add(egui::DragValue::new(v).range(0.0..=100.0).max_decimals(1).suffix("%")).changed() {
+                    let field = ui.add(egui::DragValue::new(v).range(0.0..=100.0).max_decimals(1).suffix("%")).accessible_name(l.to_owned());
+                    if field.changed() {
                         edit = ColorEdit::Cmyk;
                     }
                     ui.end_row();
@@ -6936,7 +7278,8 @@ fn color_picker(ui: &mut egui::Ui, d: &mut Dialog) {
                 ui.label("#");
                 let editing = ui.memory(|m| m.has_focus(hex_id));
                 let mut h = if editing { d.s("hexEdit") } else { format!("{:02x}{:02x}{:02x}", to8(rgb[0]), to8(rgb[1]), to8(rgb[2])) };
-                if ui.add(egui::TextEdit::singleline(&mut h).id(hex_id).desired_width(70.0)).changed()
+                let hex_field = ui.add(egui::TextEdit::singleline(&mut h).id(hex_id).desired_width(70.0)).accessible_name("Hex".to_owned());
+                if hex_field.changed()
                     && let Some(v) = hex_rgb(&h)
                 {
                     rgb = v;
@@ -7130,3187 +7473,4 @@ fn find_font(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn paragraph_style_settings_show_captured_color_and_pending_spacing_without_changing_the_document() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let f = app.run("frame.create", json!({"rect":[36,36,300,200],"content":"text","text":"Heading"})).unwrap();
-        app.run("text.select", json!({"story":f["story"],"anchor":0,"focus":7})).unwrap();
-        app.run("type.char", json!({"fontFamily":"Source Sans 3","fontStyle":"Bold","size":16,"fill":"[Paper]"})).unwrap();
-        app.run("style.paragraph.create", json!({"name":"Header","fromSelection":true})).unwrap();
-        let doc = app.session.doc().unwrap().doc.clone();
-        let style = doc.styles.para("Header").unwrap();
-        let mut d = Dialog::new("paragraphStyleOptions", json!({"name":"Header"}));
-        let summary = paragraph_style_summary("", &d, style, &doc.styles);
-        for value in ["Source Sans 3", "Bold", "16 pt", "[Paper]"] {
-            assert!(summary.contains(value), "{summary}");
-        }
-        assert!(summary.len() < 250, "default attributes do not swamp the captured settings: {summary}");
-        d.fields.insert("c.fill".into(), json!("[Registration]"));
-        d.fields.insert("p.spaceAfter".into(), json!(4.5));
-        let summary = paragraph_style_summary("", &d, style, &doc.styles);
-        assert!(summary.contains("[Registration]") && !summary.contains("[Paper]"), "{summary}");
-        assert!(summary.contains("4.5 pt"), "{summary}");
-        assert_eq!(app.session.doc().unwrap().doc, doc);
-    }
-
-    #[test]
-    fn paragraph_style_settings_compare_with_the_chosen_parent() {
-        let mut styles = designcraft_doc::Styles::default();
-        styles.paragraph.push(designcraft_doc::ParagraphStyle {
-            name: "Parent".into(),
-            chars: designcraft_doc::CharAttrs { size: Some(20.0), ..Default::default() },
-            based_on: None,
-            next_style: None,
-            para: Default::default(),
-            shortcut: String::new(),
-        });
-        let style = designcraft_doc::ParagraphStyle {
-            name: "Child".into(),
-            based_on: Some("Parent".into()),
-            next_style: None,
-            para: Default::default(),
-            chars: Default::default(),
-            shortcut: String::new(),
-        };
-        let d = Dialog::new("paragraphStyleOptions", json!({"name":"Child"}));
-        assert_eq!(paragraph_style_summary("", &d, &style, &styles), "Parent");
-    }
-
-    #[test]
-    fn step_and_repeat_dialog_previews_and_makes_the_copies_as_one_undo_step() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let id = app.run("frame.create", json!({"rect": [72, 600, 540, 640]})).unwrap()["id"].as_u64().unwrap();
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        let open = |app: &mut DesignApp| {
-            crate::menus::activate(app, "edit.stepAndRepeat", &Value::Null);
-            assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some(STEP_AND_REPEAT));
-        };
-        let set = |app: &mut DesignApp, k: &str, v: Value| {
-            app.ui.dialog.as_mut().unwrap().fields.insert(k.into(), v);
-        };
-        let items = |app: &DesignApp| app.session.doc().unwrap().doc.spreads[0].items.len();
-        let undo = |app: &DesignApp| app.session.doc().unwrap().history.undo.len();
-        let (n0, u0) = (items(&app), undo(&app));
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1200.0, 800.0));
-        open(&mut app);
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        for expected in ["Step and Repeat", "Repeat", "Count:", "Create as a grid", "Offset", "Vertical:", "Horizontal:", "Preview", "OK", "Cancel"] {
-            visible_label(&labels, screen, expected);
-        }
-        // Preview: the copies show, and change with the fields, without an undo step.
-        set(&mut app, "count", json!("5"));
-        set(&mut app, "vertical", json!("-0.75 in"));
-        set(&mut app, "horizontal", json!("0"));
-        set(&mut app, "preview", json!(true));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        assert_eq!((items(&app), undo(&app)), (n0 + 5, u0));
-        set(&mut app, "count", json!("3"));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        assert_eq!(items(&app), n0 + 3);
-        set(&mut app, "preview", json!(false));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        assert_eq!(items(&app), n0, "Preview off takes them away");
-        set(&mut app, "preview", json!(true));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        assert_eq!(items(&app), n0 + 3);
-        // Cancel puts the document back.
-        cancel(&mut app);
-        assert!(app.ui.dialog.is_none());
-        assert_eq!((items(&app), undo(&app)), (n0, u0));
-        // OK after a preview makes the copies once, as one undo step, 0.75 in apart.
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        open(&mut app);
-        set(&mut app, "count", json!("2"));
-        set(&mut app, "vertical", json!("-0.75 in"));
-        set(&mut app, "horizontal", json!("0"));
-        set(&mut app, "preview", json!(true));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        let r = confirm(&mut app).unwrap();
-        assert_eq!((items(&app), undo(&app)), (n0 + 2, u0 + 1));
-        let last = r["ids"][1].as_u64().unwrap();
-        let top = app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(last)).unwrap().bounds().min_y();
-        assert!((top - (600.0 - 108.0)).abs() < 1e-6, "{top}");
-        // Create as a grid: Rows × Columns cells, the original being one.
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        open(&mut app);
-        set(&mut app, "grid", json!(true));
-        set(&mut app, "rows", json!("2"));
-        set(&mut app, "columns", json!("3"));
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        visible_label(&labels, screen, "Rows:");
-        visible_label(&labels, screen, "Columns:");
-        assert_eq!(confirm(&mut app).unwrap()["created"], 5);
-        // A value that isn't a measure keeps the dialog open and says so.
-        open(&mut app);
-        set(&mut app, "vertical", json!("up"));
-        assert!(confirm(&mut app).is_err());
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!(d.s("status"), "Invalid value: up");
-    }
-
-    /// A three-page document in `units` with Document Setup open.
-    fn document_setup_app(units: &str) -> DesignApp {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 3})).unwrap();
-        app.run("document.preferences", json!({"horizontalUnits": units, "verticalUnits": units})).unwrap();
-        crate::menus::activate(&mut app, "layout.documentSetup", &Value::Null);
-        app
-    }
-
-    fn setup_fields(app: &mut DesignApp, fields: Value) {
-        let d = app.ui.dialog.as_mut().unwrap();
-        for (k, v) in fields.as_object().unwrap() {
-            d.fields.insert(k.clone(), v.clone());
-        }
-    }
-
-    #[test]
-    fn document_setup_ok_applies_margins_bleed_and_size_in_one_step() {
-        let mut app = document_setup_app("millimeters");
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!(d.id, "documentSetup");
-        assert_eq!((d.s("marginTop"), d.b("marginLinked")), ("12.7 mm".to_string(), true), "the document's margins, in its units");
-        setup_fields(
-            &mut app,
-            json!({"marginTop": "20 mm", "marginBottom": "20 mm", "marginInside": "20 mm", "marginOutside": "20 mm", "bleedTop": "3 mm",
-            "bleedBottom": "3 mm", "bleedInside": "3 mm", "bleedOutside": "3 mm", "width": "210 mm", "height": "297 mm"}),
-        );
-        confirm(&mut app).unwrap();
-        assert!(app.ui.dialog.is_none());
-        let mm = designcraft_geom::units::PT_PER_MM;
-        let doc = &app.session.active().unwrap().doc;
-        assert!((doc.settings.page_width - 210.0 * mm).abs() < 1e-6 && (doc.settings.bleed[2] - 3.0 * mm).abs() < 1e-6);
-        assert!(doc.spreads.iter().flat_map(|s| &s.pages).all(|p| (p.margins.top - 20.0 * mm).abs() < 1e-6), "every page");
-        app.run("edit.undo", json!({})).unwrap();
-        let doc = &app.session.active().unwrap().doc;
-        assert!((doc.settings.page_width - 612.0).abs() < 1e-6 && doc.settings.bleed[0] == 0.0, "one undo step");
-    }
-
-    #[test]
-    fn document_setup_reads_a_bare_number_in_the_documents_units() {
-        let mut app = document_setup_app("millimeters");
-        setup_fields(&mut app, json!({"bleedTop": "5", "bleedBottom": "5", "bleedInside": "5", "bleedOutside": "5", "width": "210"}));
-        confirm(&mut app).unwrap();
-        let mm = designcraft_geom::units::PT_PER_MM;
-        let settings = &app.session.active().unwrap().doc.settings;
-        assert!(settings.bleed.iter().all(|b| (b - 5.0 * mm).abs() < 1e-6), "5 mm, not 5 picas: {:?}", settings.bleed);
-        assert!((settings.page_width - 210.0 * mm).abs() < 1e-6, "{}", settings.page_width);
-    }
-
-    #[test]
-    fn document_setup_keeps_each_pages_margins_unless_they_are_edited() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 3, "margins": 36})).unwrap();
-        app.run("layout.marginsAndColumns", json!({"pages": [1], "margins": 90})).unwrap();
-        let margins =
-            |app: &DesignApp| app.session.active().unwrap().doc.spreads.iter().flat_map(|s| &s.pages).map(|p| p.margins.top).collect::<Vec<_>>();
-        // Only the page count changes: every page keeps its own margins.
-        crate::menus::activate(&mut app, "layout.documentSetup", &Value::Null);
-        setup_fields(&mut app, json!({"pages": "4"}));
-        confirm(&mut app).unwrap();
-        assert_eq!(margins(&app), [36.0, 90.0, 36.0, 36.0]);
-        // Edited margins go to every page.
-        crate::menus::activate(&mut app, "layout.documentSetup", &Value::Null);
-        setup_fields(&mut app, json!({"marginTop": "1p0"}));
-        confirm(&mut app).unwrap();
-        assert_eq!(margins(&app), [12.0; 4]);
-    }
-
-    #[test]
-    fn document_setup_keeps_a_value_it_cannot_read_and_changes_nothing() {
-        for (key, value) in [("width", "wide"), ("marginTop", "-"), ("pages", "0"), ("bleedTop", "x")] {
-            let mut app = document_setup_app("points");
-            setup_fields(&mut app, json!({key: value, "bleedInside": "9"}));
-            assert!(confirm(&mut app).is_err(), "{key}");
-            assert!(app.ui.dialog.is_some(), "{key}: the dialog stays open");
-            assert_eq!(app.session.active().unwrap().doc.settings.bleed, [0.0; 4], "{key}: nothing changed");
-        }
-    }
-
-    #[test]
-    fn document_setup_links_edges_and_adjust_layout_applies() {
-        let mut app = document_setup_app("points");
-        let f = app.run("frame.create", json!({"rect": [36, 36, 576, 756], "content": "text"})).unwrap();
-        crate::menus::activate(&mut app, "layout.documentSetup", &Value::Null);
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 900.0));
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        // Typing in a linked margin sets all four.
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let top = labels.iter().filter(|(t, _, _)| t == "36 pt").map(|(_, r, _)| *r).next().expect("the top margin");
-        click_dialog(&mut app, &ctx, screen, top.center());
-        let select_all =
-            egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND };
-        dialog_frame(&mut app, &ctx, screen, vec![select_all, egui::Event::Text("72 pt".into())]);
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert!(["Top", "Bottom", "Inside", "Outside"].iter().all(|e| d.s(&format!("margin{e}")) == "72 pt"), "linked: {:?}", d.fields);
-        // Adjust Layout applies at once, and the frame follows the margins.
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "Adjust Layout").center());
-        assert!(app.ui.dialog.is_none(), "applied");
-        let doc = &app.session.active().unwrap().doc;
-        let b = doc.item(designcraft_doc::ItemId(f["id"].as_u64().unwrap())).unwrap().bounds();
-        assert!((b.y0 - 72.0).abs() < 1e-6 && doc.page(0).unwrap().margins.outside == 72.0, "{b:?}");
-    }
-
-    #[test]
-    fn cell_options_dialog_draws_and_applies_only_changed_values_to_the_chosen_edges() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "caret": true})).unwrap();
-        let tid = app.run("table.insert", json!({"rows": 2, "cols": 2})).unwrap()["table"].as_u64().unwrap();
-        app.run("table.select", json!({"what": "table"})).unwrap();
-        app.run("app.cellOptionsDialog", json!({})).unwrap();
-        let ctx = dialog_context("");
-        dialog_frame(&mut app, &ctx, egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(900.0, 700.0)), vec![]);
-        let d = app.ui.dialog.as_mut().unwrap();
-        assert_eq!(d.id, "cellOptions");
-        assert_eq!(d.fields["weight"], json!(1.0));
-        d.fields.insert("edges".into(), json!(["top", "bottom", "left", "right"]));
-        d.fields.insert("gapColor".into(), json!("[Paper]"));
-        d.fields.insert("fill".into(), json!("[Black]"));
-        d.fields.insert("fillTint".into(), json!(0.2));
-        confirm(&mut app).unwrap();
-        let st = app.session.active().unwrap();
-        let t = st.doc.stories.values().find_map(|s| s.tables.get(&tid)).unwrap();
-        let gap = |r: usize, c: usize, side: usize| t.cell(r, c).unwrap().strokes[side].gap_color.clone();
-        assert_eq!([gap(0, 0, 0), gap(0, 0, 1), gap(1, 1, 2), gap(1, 1, 3)], ["[Paper]"; 4].map(String::from), "outer edges");
-        assert_eq!([gap(0, 0, 2), gap(0, 0, 3)], ["[None]"; 2].map(String::from), "inner edges keep theirs");
-        assert!(t.cells.iter().all(|c| c.fill == "[Black]" && (c.fill_tint - 0.2).abs() < 1e-6));
-        assert!(t.cells.iter().all(|c| c.strokes.iter().all(|e| e.weight == 1.0)), "unchanged values are not applied");
-    }
-
-    #[test]
-    fn cell_options_edge_changes_reseed_every_stroke_field_and_survive_a_bad_seed() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "caret": true})).unwrap();
-        let tid = app.run("table.insert", json!({"rows": 2, "cols": 2})).unwrap()["table"].as_u64().unwrap();
-        app.run("table.select", json!({"what": "table"})).unwrap();
-        app.run("table.setCell", json!({"stroke": {"weight": 3, "edges": "innerHorizontal"}})).unwrap();
-        app.run("app.cellOptionsDialog", json!({})).unwrap();
-        let mut d = app.ui.dialog.take().unwrap();
-        d.fields.insert("seed".into(), json!(5));
-        let outer = [true, true, true, true, false, false];
-        cell_options_edges_changed(&mut app, &mut d, &outer);
-        assert_eq!((&d.fields["weight"], &d.fields["seed"]["weight"]), (&json!(1.0), &json!(1.0)));
-        // A weight typed for the outer edges, then the inner horizontal edges (3 pt) chosen
-        // and 1 pt typed: 1 pt differs from what those edges show, so OK applies it.
-        d.fields.insert("weight".into(), json!(5.0));
-        cell_options_edges_changed(&mut app, &mut d, &[false, false, false, false, true, false]);
-        assert_eq!((&d.fields["weight"], &d.fields["seed"]["weight"]), (&json!(5.0), &json!(3.0)));
-        d.fields.insert("weight".into(), json!(1.0));
-        app.ui.dialog = Some(d);
-        confirm(&mut app).unwrap();
-        let st = app.session.active().unwrap();
-        let t = st.doc.stories.values().find_map(|s| s.tables.get(&tid)).unwrap();
-        assert_eq!([t.cell(0, 0).unwrap().strokes[2].weight, t.cell(1, 1).unwrap().strokes[0].weight], [1.0; 2]);
-    }
-
-    #[test]
-    fn preferences_ok_saves_a_story_editor_size_that_loads_back() {
-        // `ui.dialog.set` takes any value; a size that isn't finite is saved as `null`.
-        let sizes = [(json!("nan"), 20.0), (json!("inf"), 20.0), (json!(null), 20.0), (json!(1e39), 36.0), (json!(3), 8.0), (json!(11), 11.0)];
-        for (size, want) in sizes {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.run("file.new", json!({})).unwrap();
-            app.ui.story_editor_size = 20.0;
-            app.run("app.preferences", json!({})).unwrap();
-            app.ui.dialog.as_mut().unwrap().fields.insert("storyEditorSize".into(), size);
-            confirm(&mut app).unwrap();
-            let saved = serde_json::to_vec(&app.ui).unwrap();
-            assert_eq!(crate::UiState::from_preferences_json(&saved).unwrap().story_editor_size, want);
-        }
-    }
-
-    #[test]
-    fn preferences_ok_sets_only_the_ruler_units_it_is_given() {
-        // `ui.dialog.open` takes any fields, so the vertical units can be missing.
-        for (vertical, want) in [(None, "inches"), (Some("points"), "points")] {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.run("file.new", json!({})).unwrap();
-            app.run("document.preferences", json!({"verticalUnits": "inches"})).unwrap();
-            let mut fields = json!({"horizontalUnits": "millimeters", "bg.relativeTo": "topOfPage"});
-            if let Some(vertical) = vertical {
-                fields["verticalUnits"] = json!(vertical);
-            }
-            app.ui.dialog = Some(Dialog::new("preferences", fields));
-            confirm(&mut app).unwrap();
-            let units = app.run("document.preferences", json!({})).unwrap();
-            assert_eq!((units["horizontalUnits"].as_str(), units["verticalUnits"].as_str()), (Some("millimeters"), Some(want)));
-        }
-    }
-
-    #[test]
-    fn enter_and_escape_close_the_style_menu_not_numbering_and_section_options() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 2})).unwrap();
-        crate::menus::activate(&mut app, "layout.section", &Value::Null);
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 814.0));
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        let key = |key| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE };
-        for pressed in [egui::Key::Enter, egui::Key::Escape] {
-            let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-            // The section's Style menu (the first of the two).
-            let style = labels.iter().filter(|(t, r, c)| t.trim() == "1, 2, 3, 4…" && c.contains_rect(*r)).map(|(_, r, _)| *r).next().unwrap();
-            click_dialog(&mut app, &ctx, screen, style.center());
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-            assert!(egui::Popup::is_any_open(&ctx), "the Style menu opened");
-            dialog_frame(&mut app, &ctx, screen, vec![key(pressed)]);
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-            assert!(app.ui.dialog.is_some(), "{pressed:?} with the menu open leaves the dialog open");
-            assert!(app.session.active().unwrap().doc.sections.iter().all(|s| s.start_number != Some(0)));
-            if egui::Popup::is_any_open(&ctx) {
-                egui::Popup::close_all(&ctx);
-                dialog_frame(&mut app, &ctx, screen, vec![]);
-            }
-        }
-        // With no menu open, Escape closes the dialog.
-        dialog_frame(&mut app, &ctx, screen, vec![key(egui::Key::Escape)]);
-        assert!(app.ui.dialog.is_none());
-    }
-
-    #[test]
-    fn numbering_and_section_options_keep_their_actions_in_view() {
-        for language in ["en", "ar"] {
-            for size in [egui::vec2(1178.0, 814.0), egui::vec2(392.0, 271.0)] {
-                let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-                app.ui.language = language.into();
-                app.run("file.new", json!({"pages": 2})).unwrap();
-                crate::menus::activate(&mut app, "layout.section", &Value::Null);
-                let ctx = dialog_context(language);
-                let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, size);
-                for _ in 0..3 {
-                    dialog_frame(&mut app, &ctx, screen, vec![]);
-                }
-                let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-                let tr = |s| crate::i18n::tr(language, s);
-                for expected in [tr("Numbering & Section Options…").trim_end_matches('…'), tr("OK"), tr("Cancel"), tr("Start Section")] {
-                    visible_label(&labels, screen, expected);
-                }
-                if size.x > 1000.0 {
-                    // Every option fits without scrolling, and choosing one then OK applies it.
-                    visible_label(&labels, screen, &format!("{} {}", tr("Book Name:"), tr("N/A")));
-                    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, tr("Automatic Page Numbering")).center());
-                    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-                    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, tr("OK")).center());
-                    assert!(app.ui.dialog.is_none(), "{language}: OK closes the dialog");
-                    let doc = &app.session.active().unwrap().doc;
-                    assert!(doc.sections.iter().all(|s| s.start != 0 || s.start_number.is_none()), "{language}: page 1 numbers automatically");
-                }
-            }
-        }
-    }
-
-    fn select_all_key() -> egui::Event {
-        egui::Event::Key {
-            key: egui::Key::A,
-            physical_key: None,
-            pressed: true,
-            repeat: false,
-            modifiers: egui::Modifiers { ctrl: true, command: true, ..Default::default() },
-        }
-    }
-
-    /// The Color Picker over a new document's selected frame, a few frames in.
-    fn picker(fields: Value) -> (DesignApp, egui::Context, egui::Rect, u64) {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let id = app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap()["id"].as_u64().unwrap();
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        app.ui.dialog = Some(Dialog::new("colorPicker", fields));
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(700.0, 500.0));
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        (app, ctx, screen, id)
-    }
-
-    /// The rightmost painted `text`: the picker's own field, right of egui's colour editor (which
-    /// has R/G/B fields of its own).
-    fn rightmost(labels: &[(String, egui::Rect, egui::Rect)], text: &str) -> egui::Pos2 {
-        labels
-            .iter()
-            .filter(|(t, _, _)| t.trim() == text)
-            .map(|(_, r, _)| r.center())
-            .max_by(|a, b| a.x.total_cmp(&b.x))
-            .unwrap_or_else(|| panic!("{text} is painted"))
-    }
-
-    /// Types `text` one character per frame, with an idle frame after each.
-    fn type_slowly(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, text: &str) {
-        for ch in text.chars() {
-            dialog_frame(app, ctx, screen, vec![egui::Event::Text(ch.into())]);
-            dialog_frame(app, ctx, screen, vec![]);
-        }
-    }
-
-    fn fill(app: &DesignApp, id: u64) -> designcraft_color::Color {
-        let d = &app.session.active().unwrap().doc;
-        d.resolve_color(&d.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch, 1.0).unwrap()
-    }
-
-    #[test]
-    fn the_hex_field_keeps_typed_text_and_commits_a_valid_code() {
-        let (mut app, ctx, screen, _) = picker(json!({"target": "fill", "hex": "#ffffff"}));
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "ffffff").center());
-        dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
-        type_slowly(&mut app, &ctx, screen, "#f5");
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!((d.s("hexEdit").as_str(), d.s("hex").as_str()), ("#f5", "#ffffff"), "half-typed text stays; the colour waits");
-        type_slowly(&mut app, &ctx, screen, "9019");
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!((d.s("hexEdit").as_str(), d.s("hex").as_str()), ("#f59019", "#f59019"), "a 7-character #rrggbb commits");
-        // Invalid text is replaced by the colour when focus leaves.
-        dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
-        type_slowly(&mut app, &ctx, screen, "zz");
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "#").center());
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        visible_label(&labels, screen, "f59019");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("hex"), "#f59019");
-    }
-
-    #[test]
-    fn typed_channel_values_are_kept_while_typing() {
-        let (mut app, ctx, screen, id) = picker(json!({"target": "fill", "hex": "#010203", "model": "rgb", "rgb": [1, 2, 3]}));
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        click_dialog(&mut app, &ctx, screen, rightmost(&labels, "1"));
-        dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
-        type_slowly(&mut app, &ctx, screen, "12.5");
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        assert!(rightmost(&labels, "12.5").x > rightmost(&labels, "2").x - 1.0, "the typed text stays in the R field");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("hex"), "#0d0203");
-        confirm(&mut app).unwrap();
-        let designcraft_color::Color::Rgb { r, .. } = fill(&app, id) else { panic!("not RGB") };
-        assert!((r - 12.5 / 255.0).abs() < 1e-6, "{r}");
-    }
-
-    #[test]
-    fn a_cmyk_colour_stays_cmyk_unless_rgb_values_are_typed() {
-        let cmyk = json!({"target": "fill", "hex": "#ff8000", "model": "cmyk", "cmyk": [0, 50, 100, 0]});
-        // Picked by hex: converted to CMYK.
-        let (mut app, ctx, screen, id) = picker(cmyk.clone());
-        let hex = app.ui.dialog.as_ref().unwrap().s("hex");
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, hex.trim_start_matches('#')).center());
-        dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
-        type_slowly(&mut app, &ctx, screen, "3366cc");
-        confirm(&mut app).unwrap();
-        assert!(matches!(fill(&app, id), designcraft_color::Color::Cmyk { .. }), "{:?}", fill(&app, id));
-        // A typed C/M/Y/K percent is a percent: M 1 is 1 %.
-        let (mut app, ctx, screen, id) = picker(cmyk.clone());
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        click_dialog(&mut app, &ctx, screen, rightmost(&labels, "50"));
-        dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
-        type_slowly(&mut app, &ctx, screen, "1");
-        confirm(&mut app).unwrap();
-        let designcraft_color::Color::Cmyk { c, m, y, k } = fill(&app, id) else { panic!("not CMYK") };
-        assert!(c == 0.0 && (m - 0.01).abs() < 1e-6 && (y - 1.0).abs() < 1e-6 && k == 0.0, "{c} {m} {y} {k}");
-        // Typed R/G/B values: RGB.
-        let (mut app, ctx, screen, id) = picker(cmyk);
-        let r = app.ui.dialog.as_ref().unwrap().fields["rgb"][0].as_f64().unwrap();
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        click_dialog(&mut app, &ctx, screen, rightmost(&labels, &r.to_string()));
-        dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
-        type_slowly(&mut app, &ctx, screen, "10");
-        confirm(&mut app).unwrap();
-        assert!(matches!(fill(&app, id), designcraft_color::Color::Rgb { .. }), "{:?}", fill(&app, id));
-    }
-
-    #[test]
-    fn ok_without_edits_leaves_the_fill_alone() {
-        let (mut app, _, _, id) = picker(json!({"target": "fill", "hex": "#ff8000", "model": "cmyk", "cmyk": [0, 50, 100, 0]}));
-        let before = app.session.active().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().fill.clone();
-        confirm(&mut app).unwrap();
-        assert_eq!(app.session.active().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().fill, before);
-    }
-
-    #[test]
-    fn dialogs_do_not_dim_the_page() {
-        let (mut app, ctx, screen, _) = picker(json!({"target": "fill", "hex": "#ff8000"}));
-        let time = ctx.input(|i| i.time) + 1.0 / 60.0;
-        let output = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(time), ..Default::default() }, |ui| show(&mut app, ui.ctx()));
-        fn covers(shape: &egui::Shape, screen: egui::Rect) -> bool {
-            match shape {
-                egui::Shape::Rect(r) => r.rect.contains_rect(screen) && r.fill.a() > 0,
-                egui::Shape::Vec(v) => v.iter().any(|s| covers(s, screen)),
-                _ => false,
-            }
-        }
-        assert!(app.ui.dialog.is_some());
-        assert!(!output.shapes.iter().any(|s| covers(&s.shape, screen)), "nothing paints over the whole window");
-    }
-
-    fn draw(app: &mut DesignApp, ctx: &egui::Context) {
-        let input =
-            egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
-        let mut out = ctx.run_ui(input, |ui| {
-            app.logic(&ui.ctx().clone());
-            app.ui(ui);
-        });
-        out.textures_delta.clear();
-    }
-
-    /// A paragraph styled "Ruled Child", whose Rule Below comes from its parent "Ruled".
-    fn ruled_paragraph() -> (DesignApp, Value) {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let rule = json!({"on": true, "weight": 3.0, "color": "[Black]", "tint": 0.5, "columnWidth": false, "offset": 4.0, "leftIndent": 6.0, "rightIndent": 2.0});
-        app.run("style.paragraph.create", json!({"name": "Ruled", "para": {"ruleBelow": rule}})).unwrap();
-        app.run("style.paragraph.create", json!({"name": "Ruled Child", "basedOn": "Ruled"})).unwrap();
-        let r = app.run("frame.create", json!({"rect": [72, 72, 300, 400], "content": "text", "text": "One"})).unwrap();
-        app.run("text.select", json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        app.run("style.paragraph.apply", json!({"name": "Ruled Child"})).unwrap();
-        (app, rule)
-    }
-
-    fn undo_steps(app: &DesignApp) -> usize {
-        app.session.doc().map_or(0, |st| st.history.undo.len())
-    }
-
-    #[test]
-    fn paragraph_rules_dialog_shows_the_rule_and_applies_one_field() {
-        let (mut app, rule) = ruled_paragraph();
-        let ctx = egui::Context::default();
-        app.run("app.paragraphRulesDialog", json!({"rule": "ruleBelow"})).unwrap();
-        draw(&mut app, &ctx);
-        let d = app.ui.dialog.clone().unwrap();
-        assert_eq!(d.id, "paragraphRules");
-        let current = d.fields["current"].clone();
-        assert_eq!(shown_rule(&d, "", "ruleBelow", &current), rule, "the inherited rule");
-        assert_eq!(shown_rule(&d, "", "ruleAbove", &current)["on"], false);
-        // Pick a colour, as the Color menu does.
-        app.ui.dialog.as_mut().unwrap().fields.insert("ruleBelow.color".into(), json!("[Registration]"));
-        draw(&mut app, &ctx);
-        let before = undo_steps(&app);
-        confirm(&mut app).unwrap();
-        assert_eq!(undo_steps(&app), before + 1, "one undo step");
-        let mut want = rule.clone();
-        want["color"] = json!("[Registration]");
-        assert_eq!(app.run("type.selectionAttrs", json!({})).unwrap()["para"]["ruleBelow"], want);
-        app.run("edit.undo", json!({})).unwrap();
-        assert_eq!(app.run("type.selectionAttrs", json!({})).unwrap()["para"]["ruleBelow"], rule);
-    }
-
-    #[test]
-    fn paragraph_style_options_edit_one_rule_field() {
-        let (mut app, rule) = ruled_paragraph();
-        let ctx = egui::Context::default();
-        app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Ruled Child", "section": "rules", "rule": "ruleBelow"})));
-        draw(&mut app, &ctx);
-        let resolved = |app: &DesignApp| serde_json::to_value(app.session.doc().unwrap().doc.styles.resolve_para_style("Ruled Child").0).unwrap();
-        let d = app.ui.dialog.clone().unwrap();
-        assert_eq!(shown_rule(&d, "p.", "ruleBelow", &resolved(&app)), rule, "inherited from the parent style");
-        app.ui.dialog.as_mut().unwrap().fields.insert("p.ruleBelow.weight".into(), json!(1.5));
-        draw(&mut app, &ctx);
-        let before = undo_steps(&app);
-        confirm(&mut app).unwrap();
-        assert_eq!(undo_steps(&app), before + 1, "one undo step");
-        let mut want = rule.clone();
-        want["weight"] = json!(1.5);
-        assert_eq!(resolved(&app)["ruleBelow"], want);
-        assert_eq!(app.run("type.selectionAttrs", json!({})).unwrap()["para"]["ruleBelow"], want, "the paragraph follows its style");
-        app.run("edit.undo", json!({})).unwrap();
-        assert_eq!(resolved(&app)["ruleBelow"], rule);
-    }
-
-    /// Opens Paragraph Style Options on "Ruled Child" at each of `sections`, sets `fields` and
-    /// clicks OK; returns the resolved attributes of the paragraph styled with it.
-    fn style_section_edit(sections: &[&str], fields: Value) -> Value {
-        let (mut app, _) = ruled_paragraph();
-        let ctx = egui::Context::default();
-        app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Ruled Child"})));
-        for section in sections {
-            app.ui.dialog.as_mut().unwrap().fields.insert("section".into(), json!(section));
-            draw(&mut app, &ctx);
-        }
-        for (k, v) in fields.as_object().unwrap() {
-            app.ui.dialog.as_mut().unwrap().fields.insert(k.clone(), v.clone());
-        }
-        draw(&mut app, &ctx);
-        let before = undo_steps(&app);
-        confirm(&mut app).unwrap();
-        assert_eq!(undo_steps(&app), before + 1, "one undo step");
-        let style = app.session.doc().unwrap().doc.styles.para("Ruled Child").cloned().unwrap();
-        let own = serde_json::to_value(&style.para).unwrap();
-        for (k, v) in fields.as_object().unwrap() {
-            assert_eq!(own[k.trim_start_matches("p.")], *v, "the style sets {k}");
-        }
-        app.run("type.selectionAttrs", json!({})).unwrap()["para"].clone()
-    }
-
-    #[test]
-    fn paragraph_style_options_keep_and_border_sections_reach_the_styled_paragraph() {
-        let para = style_section_edit(
-            &["keep", "border"],
-            json!({"p.keepWithNext": 2, "p.keepLinesTogether": true, "p.keepAllLines": false, "p.keepFirst": 3,
-                "p.startParagraph": "nextPage", "p.borderOn": true, "p.borderWeights": [2.0, 0.0, 2.0, 0.0]}),
-        );
-        assert_eq!(para["keepWithNext"], 2);
-        assert_eq!(para["keepLinesTogether"], true);
-        assert_eq!(para["keepAllLines"], false);
-        assert_eq!(para["keepFirst"], 3);
-        assert_eq!(para["startParagraph"], "nextPage");
-        assert_eq!(para["borderOn"], true);
-        assert_eq!(para["borderWeights"], json!([2.0, 0.0, 2.0, 0.0]));
-        // Fields not edited keep the resolved value.
-        assert_eq!(para["keepLast"], 2);
-        assert_eq!(para["ruleBelow"]["weight"], 3.0);
-    }
-
-    #[test]
-    fn paragraph_style_options_bullets_and_span_sections_reach_the_styled_paragraph() {
-        let para = style_section_edit(
-            &["bullets", "span"],
-            json!({"p.listType": "numbers", "p.numberStyle": "upperRoman", "p.numberExpression": "^#)^t", "p.startAt": 3,
-                "p.spanColumns": {"kind": "split", "columns": 3}}),
-        );
-        assert_eq!(para["listType"], "numbers");
-        assert_eq!(para["numberStyle"], "upperRoman");
-        assert_eq!(para["numberExpression"], "^#)^t");
-        assert_eq!(para["startAt"], 3);
-        assert_eq!(para["spanColumns"], json!({"kind": "split", "columns": 3}));
-        let props: designcraft_doc::ParaProps = serde_json::from_value(para).unwrap();
-        assert_eq!(props.number_label(3), "III)\t");
-    }
-
-    #[test]
-    fn paragraph_style_options_keep_a_bad_grep_pattern_open_with_the_error() {
-        let (mut app, _) = ruled_paragraph();
-        let ctx = egui::Context::default();
-        app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Ruled", "section": "general"})));
-        draw(&mut app, &ctx);
-        app.ui.dialog.as_mut().unwrap().fields.insert("p.grepStyles".into(), json!([{"style": "[None]", "pattern": "(?<=x"}]));
-        let e = confirm(&mut app).unwrap_err();
-        assert!(e.contains("bad GREP"), "{e}");
-        let d = app.ui.dialog.clone().expect("the dialog stays open");
-        assert_eq!((d.s("section").as_str(), d.s("status").contains("bad GREP")), ("grep", true));
-        assert!(app.session.doc().unwrap().doc.styles.para("Ruled").unwrap().para.grep_styles.is_none(), "nothing saved");
-        draw(&mut app, &ctx);
-    }
-
-    /// A frame with two paragraphs of [Basic Paragraph]; the first has a local Word Spacing minimum.
-    fn two_paragraphs() -> (DesignApp, Value) {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let r = app.run("frame.create", json!({"rect": [72, 72, 300, 400], "content": "text", "text": "One\nTwo"})).unwrap();
-        app.run("text.select", json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
-        app.run("type.para", json!({"attrs": {"wordSpaceMin": 0.7}})).unwrap();
-        (app, r["story"].clone())
-    }
-
-    /// The resolved paragraph attribute `key` of the paragraph at byte `at`.
-    fn para_attr(app: &mut DesignApp, story: &Value, at: usize, key: &str) -> Value {
-        app.run("text.select", json!({"story": story, "anchor": at, "focus": at})).unwrap();
-        app.run("type.selectionAttrs", json!({})).unwrap()["para"][key].clone()
-    }
-
-    /// The hyphenation video (Graphd Tutorials, 0:39–1:13): the Paragraph panel menu's
-    /// Hyphenation… opens InDesign's Hyphenation Settings for the selected paragraphs. Preview
-    /// shows the slider moved to Fewer Hyphens on the page without an undo step, OK makes it one
-    /// step on the selected paragraph only, and Cancel puts it back.
-    #[test]
-    fn hyphenation_settings_preview_apply_and_cancel_on_the_selected_paragraph() {
-        let (mut app, story) = two_paragraphs();
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0));
-        let sid = designcraft_doc::StoryId(story.as_u64().unwrap());
-        let weight = |app: &DesignApp, para: usize| {
-            let d = &app.session.doc().unwrap().doc;
-            d.styles.resolve_para(&d.story(sid).unwrap().paras[para]).0.hyph_weight
-        };
-        assert!(crate::menus::menu_enabled(&app, "app.hyphenationDialog"));
-        app.run("app.hyphenationDialog", json!({})).unwrap();
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let d = app.ui.dialog.clone().unwrap();
-        assert_eq!(
-            (d.id.as_str(), d.fields["current"]["hyphWeight"].as_f64(), d.fields["current"]["hyphenate"].as_bool()),
-            ("hyphenation", Some(0.5), Some(true))
-        );
-        for label in [
-            "Hyphenation Settings",
-            "Hyphenate",
-            "Words with at Least:",
-            "letters",
-            "Hyphen Limit:",
-            "hyphens",
-            "Hyphenation Zone:",
-            "Better Spacing",
-            "Fewer Hyphens",
-            "Hyphenate Capitalized Words",
-            "Hyphenate Last Word",
-            "Hyphenate Across Column",
-            "Preview",
-        ] {
-            assert!(labels.iter().any(|(t, _, _)| t == label), "{label}: {labels:?}");
-        }
-        // Fewer Hyphens (9 of 10) with Preview: on the page, no undo step.
-        let before = undo_steps(&app);
-        let d = app.ui.dialog.as_mut().unwrap();
-        d.fields.insert("hyphWeight".into(), json!(0.9));
-        d.fields.insert("preview".into(), json!(true));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        assert_eq!(weight(&app, 0), 0.9, "previewed");
-        assert_eq!(undo_steps(&app), before, "a preview is no step");
-        // Cancel: back as it was.
-        cancel(&mut app);
-        assert_eq!(weight(&app, 0), 0.5);
-        // Again, and OK: one step, the selected paragraph only.
-        app.run("app.hyphenationDialog", json!({})).unwrap();
-        let d = app.ui.dialog.as_mut().unwrap();
-        d.fields.insert("hyphWeight".into(), json!(0.9));
-        d.fields.insert("preview".into(), json!(true));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        confirm(&mut app).unwrap();
-        assert_eq!((weight(&app, 0), weight(&app, 1)), (0.9, 0.5));
-        assert_eq!(undo_steps(&app), before + 1, "one undo step");
-        // Paragraph Style Options › Hyphenation has the same form.
-        app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": designcraft_doc::story::BASIC_PARAGRAPH, "section": "hyph"})));
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        for label in ["Hyphenation Zone:", "Better Spacing", "Fewer Hyphens", "Hyphenate Last Word", "Hyphenate Across Column"] {
-            assert!(labels.iter().any(|(t, _, _)| t == label), "style options: {label}");
-        }
-        app.ui.dialog = None;
-        app.run("edit.deselectAll", json!({})).unwrap();
-        assert!(!crate::menus::menu_enabled(&app, "app.hyphenationDialog"), "no paragraph");
-    }
-
-    /// Hyphenate differs across the selection: it shows mixed, and the first click turns it on for
-    /// all. Settings the command refuses show why: a preview goes back and isn't retried until they
-    /// change, and OK keeps the dialog open.
-    /// A mixed Better Spacing ↔ Fewer Hyphens slider: a click on its middle step sets every
-    /// selected paragraph to it, though the knob already sat there.
-    #[test]
-    fn hyphenation_settings_mixed_slider_click_sets_the_step() {
-        let (mut app, story) = two_paragraphs();
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0));
-        app.run("type.para", json!({"attrs": {"hyphWeight": 0.2}})).unwrap();
-        app.run("text.select", json!({"story": story, "anchor": 0, "focus": 7})).unwrap();
-        app.run("app.hyphenationDialog", json!({})).unwrap();
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let rect = |l: &str| labels.iter().find(|(t, _, _)| t == l).map(|(_, r, _)| *r).unwrap();
-        let (better, fewer) = (rect("Better Spacing"), rect("Fewer Hyphens"));
-        click_dialog(&mut app, &ctx, screen, egui::pos2((better.right() + fewer.left()) / 2.0, better.center().y));
-        assert_eq!(app.ui.dialog.as_ref().unwrap().fields.get("hyphWeight"), Some(&json!(0.5)));
-    }
-
-    #[test]
-    fn hyphenation_settings_mixed_checkbox_and_refused_settings() {
-        let (mut app, story) = two_paragraphs();
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0));
-        app.run("type.para", json!({"attrs": {"hyphenate": false}})).unwrap();
-        app.run("text.select", json!({"story": story, "anchor": 0, "focus": 7})).unwrap();
-        app.run("app.hyphenationDialog", json!({})).unwrap();
-        assert!(app.ui.dialog.as_ref().unwrap().fields["current"]["hyphenate"].is_null(), "mixed");
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let at = labels.iter().find(|(t, _, _)| t == "Hyphenate").map(|(_, r, _)| r.left_center() - egui::vec2(10.0, 0.0)).unwrap();
-        click_dialog(&mut app, &ctx, screen, at);
-        assert_eq!(app.ui.dialog.as_ref().unwrap().fields.get("hyphenate"), Some(&json!(true)), "the first click turns it on");
-        // A refused setting (as a control-channel caller could send it): no preview, the reason.
-        let before = undo_steps(&app);
-        let d = app.ui.dialog.as_mut().unwrap();
-        d.fields.insert("hyphWeight".into(), json!("heavy"));
-        d.fields.insert("preview".into(), json!(true));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert!(!d.fields.contains_key(PREVIEWED) && d.fields.contains_key("status"), "{:?}", d.fields);
-        assert!(app.session.doc().unwrap().interaction.is_none(), "the preview went back");
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        assert!(app.session.doc().unwrap().interaction.is_none(), "not tried again");
-        // OK with it: an error, and the dialog stays open with the reason.
-        assert!(confirm(&mut app).is_err());
-        let d = app.ui.dialog.as_ref().expect("the dialog stays open");
-        assert!(d.fields.contains_key("status"));
-        assert_eq!(undo_steps(&app), before);
-        // Corrected, it previews and applies.
-        app.ui.dialog.as_mut().unwrap().fields.insert("hyphWeight".into(), json!(0.9));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        assert!(!app.ui.dialog.as_ref().unwrap().fields.contains_key("status"));
-        confirm(&mut app).unwrap();
-        assert_eq!(para_attr(&mut app, &story, 0, "hyphenate"), true);
-        assert_eq!(para_attr(&mut app, &story, 4, "hyphWeight"), 0.9);
-    }
-
-    #[test]
-    fn justification_dialog_applies_to_a_local_paragraph_and_cancel_changes_nothing() {
-        let (mut app, story) = two_paragraphs();
-        let ctx = egui::Context::default();
-        assert!(crate::menus::menu_enabled(&app, "app.justificationDialog"));
-        app.run("app.justificationDialog", json!({})).unwrap();
-        draw(&mut app, &ctx);
-        let d = app.ui.dialog.clone().unwrap();
-        assert_eq!(d.id, "justification");
-        assert_eq!(d.fields["current"]["wordSpaceMin"], 0.7);
-        assert_eq!(d.fields["current"]["wordSpaceDesired"], 1.0);
-        app.ui.dialog.as_mut().unwrap().fields.insert("wordSpaceDesired".into(), json!(1.1));
-        draw(&mut app, &ctx);
-        let before = undo_steps(&app);
-        confirm(&mut app).unwrap();
-        assert_eq!(undo_steps(&app), before + 1, "one undo step");
-        assert_eq!(para_attr(&mut app, &story, 0, "wordSpaceDesired"), 1.1);
-        assert_eq!(para_attr(&mut app, &story, 0, "wordSpaceMin"), 0.7, "unedited fields stay");
-        assert_eq!(para_attr(&mut app, &story, 4, "wordSpaceDesired"), 1.0, "only the selected paragraph");
-        let style = app.session.doc().unwrap().doc.styles.resolve_para_style(designcraft_doc::story::BASIC_PARAGRAPH).0.word_space_desired;
-        assert_eq!(style, 1.0, "the paragraph style keeps its value");
-
-        // Cancel (Escape) leaves the paragraph alone.
-        app.run("text.select", json!({"story": story, "anchor": 0, "focus": 0})).unwrap();
-        app.run("app.justificationDialog", json!({})).unwrap();
-        app.ui.dialog.as_mut().unwrap().fields.insert("wordSpaceDesired".into(), json!(1.2));
-        let before = undo_steps(&app);
-        let escape = egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() };
-        let input = egui::RawInput {
-            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-            events: vec![escape],
-            ..Default::default()
-        };
-        let mut out = ctx.run_ui(input, |ui| {
-            app.logic(&ui.ctx().clone());
-            app.ui(ui);
-        });
-        out.textures_delta.clear();
-        assert!(app.ui.dialog.is_none(), "cancelled");
-        assert_eq!(undo_steps(&app), before);
-        assert_eq!(para_attr(&mut app, &story, 0, "wordSpaceDesired"), 1.1);
-
-        app.run("edit.deselectAll", json!({})).unwrap();
-        assert!(!crate::menus::menu_enabled(&app, "app.justificationDialog"), "nothing to justify");
-        assert!(app.run("app.justificationDialog", json!({})).is_err());
-    }
-
-    #[test]
-    fn justification_dialog_leaves_mixed_fields_alone_and_refuses_bad_values() {
-        let (mut app, story) = two_paragraphs();
-        let ctx = egui::Context::default();
-        app.run("text.select", json!({"story": story, "anchor": 0, "focus": 7})).unwrap();
-        app.run("app.justificationDialog", json!({})).unwrap();
-        draw(&mut app, &ctx);
-        let d = app.ui.dialog.clone().unwrap();
-        assert_eq!(d.fields["current"]["wordSpaceMin"], Value::Null, "mixed shows empty");
-        assert_eq!(d.fields["current"]["wordSpaceMax"], 1.33);
-
-        // Out of range, and minimum above desired: an error, the dialog stays open, nothing changes.
-        let before = undo_steps(&app);
-        for (key, v) in [("wordSpaceMax", 20.0), ("glyphScaleMin", 0.2), ("letterSpaceDesired", f64::NAN)] {
-            app.ui.dialog = Some(d.clone());
-            app.ui.dialog.as_mut().unwrap().fields.insert(key.into(), json!(v));
-            assert!(confirm(&mut app).is_err(), "{key} = {v}");
-            assert!(app.ui.dialog.as_ref().is_some_and(|d| d.fields.contains_key("justifyError")), "{key}: the dialog shows why");
-        }
-        app.ui.dialog = Some(d.clone());
-        app.ui.dialog.as_mut().unwrap().fields.insert("letterSpaceMin".into(), json!(0.1));
-        assert!(confirm(&mut app).is_err(), "letter spacing minimum above desired");
-        draw(&mut app, &ctx);
-        assert_eq!(undo_steps(&app), before);
-
-        app.ui.dialog = Some(d);
-        app.ui.dialog.as_mut().unwrap().fields.insert("wordSpaceMax".into(), json!(1.5));
-        confirm(&mut app).unwrap();
-        assert_eq!(undo_steps(&app), before + 1);
-        for (at, min) in [(0, 0.7), (4, 0.8)] {
-            assert_eq!(para_attr(&mut app, &story, at, "wordSpaceMax"), 1.5);
-            assert_eq!(para_attr(&mut app, &story, at, "wordSpaceMin"), min, "each paragraph keeps its own minimum");
-        }
-    }
-
-    fn command_app(id: &str, fields: Value) -> DesignApp {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.ui.dialog = Some(Dialog::new(&format!("cmd:{id}"), fields));
-        app
-    }
-
-    #[test]
-    fn generic_new_document_preserves_typed_values_and_text_entry() {
-        for pages in [json!(2), json!(" 2 ")] {
-            let mut app = command_app(
-                "file.new",
-                json!({
-                    "preset": "A4", "pages": pages, "facingPages": false, "gutter": 0,
-                    "margins": {"top": 10, "bottom": 20, "inside": 30, "outside": 40},
-                    "title": "  ", "status": "internal", "primaryTextFrame": true
-                }),
-            );
-            confirm(&mut app).unwrap();
-            let doc = &app.session.active().unwrap().doc;
-            assert_eq!(doc.page_count(), 2);
-            assert!(!doc.settings.facing_pages);
-            assert!(doc.title.starts_with("Untitled-"));
-            for page in doc.spreads.iter().flat_map(|s| &s.pages) {
-                assert!((page.width - 595.2755905511812).abs() < 0.01);
-                assert!((page.height - 841.8897637795277).abs() < 0.01);
-                assert_eq!(page.columns.gutter, 0.0);
-                assert_eq!(page.margins.top, 10.0);
-                assert_eq!(page.margins.outside, 40.0);
-            }
-            // `primaryTextFrame` is documented since #776, so the dialog passes it on (`status` isn't).
-            assert!(doc.spreads.iter().any(|s| !s.items.is_empty()), "documented fields reach the command");
-            assert!(app.ui.dialog.is_none());
-        }
-    }
-
-    #[test]
-    fn numbering_commands_document_their_fields() {
-        let names = |id: &str| command_fields(designcraft_engine::find_command(id).unwrap().params).into_iter().map(|f| f.key).collect::<Vec<_>>();
-        assert_eq!(names("layout.section"), ["page", "startNumber", "style", "prefix", "includePrefix", "marker", "remove"]);
-        assert_eq!(names("layout.chapterNumbering"), ["style", "start", "source"]);
-    }
-
-    #[test]
-    fn generic_command_preserves_array_geometry() {
-        let mut app = command_app("file.new", json!({}));
-        confirm(&mut app).unwrap();
-        app.ui.dialog = Some(Dialog::new("cmd:frame.create", json!({"rect": [10, 20, 110, 220]})));
-        confirm(&mut app).unwrap();
-        let doc = &app.session.active().unwrap().doc;
-        let item = doc.spreads.iter().flat_map(|s| &s.items).next().unwrap();
-        assert_eq!(item.bounds(), designcraft_geom::Rect::new(10.0, 20.0, 110.0, 220.0));
-    }
-
-    #[test]
-    fn generic_explicit_null_uses_the_commands_existing_semantics() {
-        // file.new accepts null width by using the selected preset's width.
-        for width in [Value::Null, json!("null")] {
-            let mut app = command_app("file.new", json!({"preset": "A4", "width": width, "title": "  Sample layout  "}));
-            confirm(&mut app).unwrap();
-            let doc = &app.session.active().unwrap().doc;
-            assert_eq!(doc.title, "Sample layout");
-            assert!((doc.settings.page_width - 595.2755905511812).abs() < 0.01);
-        }
-    }
-
-    #[test]
-    fn generic_invalid_number_retains_dialog_without_creating_document() {
-        let mut app = command_app("file.new", json!({"width": 0}));
-        assert!(confirm(&mut app).is_err());
-        assert!(app.session.active().is_none());
-        let dialog = app.ui.dialog.as_ref().unwrap();
-        assert_eq!(dialog.fields["width"], 0);
-        assert!(dialog.fields["status"].as_str().unwrap().contains("page size out of range"));
-    }
-
-    #[test]
-    fn style_options_preview_choice_is_remembered_on_reopen() {
-        use egui_kittest::{Harness, kittest::Queryable};
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("style.paragraph.create", json!({"name":"Tutorial","chars":{"size":10}})).unwrap();
-        open_style_options(&mut app, true, "Tutorial");
-        let mut h = Harness::builder().with_size(egui::vec2(1000.0, 800.0)).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let key = egui::Id::new("style_preview_remember_fonts");
-                if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
-                    crate::theme::install_fonts(ui.ctx(), "");
-                    ui.data_mut(|d| d.insert_temp(key, true));
-                    return;
-                }
-                show(app, ui.ctx());
-            },
-            app,
-        );
-        h.run_steps(3);
-        h.get_by_label("Preview").click();
-        h.run_steps(3);
-        cancel(h.state_mut());
-        open_style_options(h.state_mut(), true, "Tutorial");
-        assert!(h.state().ui.dialog.as_ref().unwrap().b("preview"), "Preview stays checked on reopen");
-    }
-
-    #[test]
-    fn style_options_preview_updates_all_uses_cancels_and_commits_once() {
-        use egui_kittest::{Harness, kittest::Queryable};
-        for paragraph in [true, false] {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.run("file.new", json!({})).unwrap();
-            let f = app.run("frame.create", json!({"rect":[36,36,300,300],"content":"text","text":"First\nSecond"})).unwrap();
-            app.run("text.select", json!({"story":f["story"],"anchor":0,"focus":12})).unwrap();
-            let kind = if paragraph { "paragraph" } else { "character" };
-            app.run(&format!("style.{kind}.create"), json!({"name":"Tutorial","chars":{"size":10}})).unwrap();
-            app.run(&format!("style.{kind}.apply"), json!({"name":"Tutorial"})).unwrap();
-            let before = app.session.doc().unwrap().doc.clone();
-            let undo = app.session.doc().unwrap().history.undo.len();
-            let journal = app.session.journal.len();
-            open_style_options(&mut app, paragraph, "Tutorial");
-            let mut h = Harness::builder().with_size(egui::vec2(1000.0, 800.0)).build_ui_state(
-                |ui, app: &mut DesignApp| {
-                    let key = egui::Id::new("style_preview_test_fonts");
-                    if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
-                        crate::theme::install_fonts(ui.ctx(), "");
-                        ui.data_mut(|d| d.insert_temp(key, true));
-                        return;
-                    }
-                    show(app, ui.ctx());
-                },
-                app,
-            );
-            h.run_steps(3);
-            h.get_by_label("Preview").click();
-            h.run_steps(3);
-            h.state_mut().ui.dialog.as_mut().unwrap().fields.insert("c.size".into(), json!(18));
-            h.run_steps(3);
-            let app = h.state_mut();
-            assert_eq!(app.run("type.selectionAttrs", json!({})).unwrap()["chars"]["size"], 18.0);
-            assert_eq!(app.session.doc().unwrap().history.undo.len(), undo);
-            assert_eq!(app.session.journal.len(), journal);
-            // Repeated previews replace each other, never accumulate undo entries.
-            app.ui.dialog.as_mut().unwrap().fields.insert("c.size".into(), json!(20));
-            h.run_steps(3);
-            assert_eq!(h.state_mut().run("type.selectionAttrs", json!({})).unwrap()["chars"]["size"], 20.0);
-            h.get_by_label("Preview").click();
-            h.run_steps(3);
-            assert_eq!(h.state().session.doc().unwrap().doc, before);
-            h.get_by_label("Preview").click();
-            h.run_steps(3);
-            cancel(h.state_mut());
-            assert_eq!(h.state().session.doc().unwrap().doc, before);
-            assert_eq!(h.state().session.doc().unwrap().history.undo.len(), undo);
-            open_style_options(h.state_mut(), paragraph, "Tutorial");
-            let d = h.state_mut().ui.dialog.as_mut().unwrap();
-            d.fields.insert("preview".into(), json!(true));
-            d.fields.insert("c.size".into(), json!(24));
-            h.run_steps(3);
-            confirm(h.state_mut()).unwrap();
-            assert_eq!(h.state().session.doc().unwrap().history.undo.len(), undo + 1);
-            // Both paragraphs/character runs still use the globally edited definition.
-            for pos in [0, 6] {
-                h.state_mut().run("text.select", json!({"story":f["story"],"anchor":pos,"focus":pos+1})).unwrap();
-                assert_eq!(h.state_mut().run("type.selectionAttrs", json!({})).unwrap()["chars"]["size"], 24.0);
-            }
-            h.state_mut().run("edit.undo", json!({})).unwrap();
-            assert_eq!(h.state().session.doc().unwrap().doc, before);
-        }
-    }
-
-    #[test]
-    fn style_preview_refuses_justification_spacing_ok_would_refuse() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let before = app.session.doc().unwrap().doc.clone();
-        let mut d =
-            Dialog::new("paragraphStyleOptions", json!({"name": designcraft_doc::BASIC_PARAGRAPH, "preview": true, "p.wordSpaceDesired": 1.1}));
-        style_options_preview(&mut app, &mut d);
-        assert_ne!(app.session.doc().unwrap().doc, before, "a valid value previews");
-        // Minimum above Desired: the page goes back and the dialog says why.
-        d.fields.insert("p.wordSpaceMin".into(), json!(1.5));
-        style_options_preview(&mut app, &mut d);
-        assert_eq!(app.session.doc().unwrap().doc, before);
-        assert!(d.s("status").contains("Word Spacing"), "{:?}", d.fields.get("status"));
-        assert!(app.session.doc().unwrap().interaction.is_none());
-    }
-
-    #[test]
-    fn invalid_style_preview_leaves_the_starting_document_and_can_be_cancelled() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("style.character.create", json!({"name":"Emphasis"})).unwrap();
-        let before = app.session.doc().unwrap().doc.clone();
-        let mut d = Dialog::new("characterStyleOptions", json!({"name":"Emphasis","preview":true,"basedOn":"Emphasis"}));
-        style_options_preview(&mut app, &mut d);
-        assert!(d.fields.contains_key("status"));
-        assert_eq!(app.session.doc().unwrap().doc, before);
-        app.ui.dialog = Some(d);
-        cancel(&mut app);
-        assert_eq!(app.session.doc().unwrap().doc, before);
-        assert!(app.session.doc().unwrap().interaction.is_none());
-    }
-
-    #[test]
-    fn style_preview_rejects_conflicting_scalar_and_nested_rule_fields_without_panicking() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let before = app.session.doc().unwrap().doc.clone();
-        let mut dialog = Dialog::new(
-            "paragraphStyleOptions",
-            json!({
-                "name": designcraft_doc::BASIC_PARAGRAPH, "preview": true,
-                "p.ruleAbove": false, "p.ruleAbove.weight": 2
-            }),
-        );
-        style_options_preview(&mut app, &mut dialog);
-        assert!(dialog.fields.contains_key("status"));
-        assert_eq!(app.session.doc().unwrap().doc, before);
-        app.ui.dialog = Some(dialog);
-        cancel(&mut app);
-        assert!(app.session.doc().unwrap().interaction.is_none());
-    }
-
-    #[test]
-    fn text_frame_options_set_columns_baseline_and_wrap_as_indesign_does() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        // A 300 pt frame, 2 columns, 12 pt gutter (picas in the dialog).
-        let r = app.run("frame.create", json!({"rect": [36, 36, 336, 236], "content": "text", "text": "Hello"})).unwrap();
-        let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
-        app.run("object.textFrameOptions", json!({"ids": [id.0], "columns": 2, "gutter": 12})).unwrap();
-        let opts = |app: &DesignApp| app.session.doc().unwrap().doc.item(id).unwrap().text_frame().unwrap().options.clone();
-        let mut d = Dialog::new("textFrameOptions", json!({}));
-        seed_text_frame_options(&app, &mut d);
-        // Fixed Number shows each column's width: (300 - 12) / 2 = 144 pt.
-        assert_eq!((d.s("columnsKind"), d.s("columnWidth"), d.s("firstBaseline")), ("fixedNumber".into(), "12p0".into(), "ascent".into()));
-        for (k, v) in [
-            ("columnsKind", json!("fixedWidth")),
-            ("columnWidth", json!("10p0")),
-            ("firstBaseline", json!("capHeight")),
-            ("firstBaselineMin", json!("0p6")),
-            ("balanceColumns", json!(true)),
-            ("ignoreWrap", json!(true)),
-        ] {
-            d.fields.insert(k.into(), v);
-        }
-        app.ui.dialog = Some(d);
-        confirm(&mut app).unwrap();
-        let o = opts(&app);
-        assert_eq!(o.columns_kind, designcraft_doc::ColumnsKind::FixedWidth);
-        assert_eq!((o.column_width, o.first_baseline_min, o.columns), (120.0, 6.0, 2));
-        assert_eq!(o.first_baseline, designcraft_doc::FirstBaseline::CapHeight);
-        assert!(o.balance_columns && o.ignore_wrap);
-        // Fixed Number again: the width isn't sent.
-        let mut d = Dialog::new("textFrameOptions", json!({}));
-        seed_text_frame_options(&app, &mut d);
-        assert_eq!(d.s("columnWidth"), "10p0", "Fixed Width shows its own width");
-        d.fields.insert("columnsKind".into(), json!("fixedNumber"));
-        app.ui.dialog = Some(d);
-        confirm(&mut app).unwrap();
-        assert_eq!((opts(&app).columns_kind, opts(&app).column_width), (designcraft_doc::ColumnsKind::FixedNumber, 120.0));
-    }
-
-    #[test]
-    fn text_frame_options_change_only_what_was_edited() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let r = app.run("frame.create", json!({"rect": [36, 36, 336, 236], "content": "text", "text": "Hello"})).unwrap();
-        let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
-        app.run("object.textFrameOptions", json!({"ids": [id.0], "columns": 2, "inset": [1, 2, 3, 4]})).unwrap();
-        let opts = |app: &DesignApp| app.session.doc().unwrap().doc.item(id).unwrap().text_frame().unwrap().options.clone();
-        let before = opts(&app);
-        let open = |app: &mut DesignApp, fields: &[(&str, Value)]| {
-            app.ui.dialog = Some(Dialog::new("textFrameOptions", json!({})));
-            let mut d = app.ui.dialog.take().unwrap();
-            seed_text_frame_options(app, &mut d);
-            for (k, v) in fields {
-                d.fields.insert((*k).into(), v.clone());
-            }
-            app.ui.dialog = Some(d);
-            confirm(app)
-        };
-        // OK without edits changes nothing (no undo step either).
-        assert_eq!(open(&mut app, &[]).unwrap(), Value::Null);
-        assert_eq!(opts(&app), before);
-        // The rule's weight is in points; unequal insets the user didn't touch stay.
-        open(&mut app, &[("columnRule", json!(true)), ("columnRuleWeight", json!("6"))]).unwrap();
-        let o = opts(&app);
-        assert!(o.column_rule && o.column_rule_weight == 6.0, "{o:?}");
-        assert_eq!((o.inset, o.columns, o.gutter), (before.inset, before.columns, before.gutter));
-        // One of the rule's insets edited: the other rule settings stay.
-        open(&mut app, &[("columnRuleBottomInset", json!("0p9")), ("columnRuleTint", json!("40"))]).unwrap();
-        let o = opts(&app);
-        assert_eq!((o.column_rule_bottom_inset, o.column_rule_top_inset, o.column_rule_offset, o.column_rule_weight), (9.0, 0.0, 0.0, 6.0));
-        assert!((o.column_rule_tint - 0.4).abs() < 1e-6 && o.column_rule);
-        // One inset side edited: the others keep their values.
-        open(&mut app, &[("insetLeft", json!("1p0"))]).unwrap();
-        assert_eq!(opts(&app).inset, [1.0, 12.0, 3.0, 4.0]);
-        open(&mut app, &[("balanceColumns", json!(true))]).unwrap();
-        let o = opts(&app);
-        assert!(o.balance_columns && o.column_rule && o.columns == 2, "{o:?}");
-        // An unknown swatch is an error and the dialog stays open.
-        let e = open(&mut app, &[("columnRuleColor", json!("Mauve"))]).unwrap_err();
-        assert!(e.contains("Mauve") && app.ui.dialog.is_some(), "{e}");
-        assert_eq!(opts(&app).column_rule_color, designcraft_color::swatch::BLACK);
-        // Each OK is one undo step.
-        for _ in 0..4 {
-            app.run("edit.undo", json!({})).unwrap();
-        }
-        assert_eq!(opts(&app), before);
-    }
-
-    #[test]
-    fn toc_dialog_adds_a_style_and_ok_makes_the_table_of_contents() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.newSample", json!({})).unwrap();
-        crate::menus::activate(&mut app, "toc.generate", &Value::Null);
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some(TOC));
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1200.0, 800.0));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        for expected in
-            ["Table of Contents", "Title:", "Include Paragraph Styles:", "Other Styles:", "« Add", "Remove »", "Replace Existing Table of Contents"]
-        {
-            visible_label(&labels, screen, expected);
-        }
-        click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "Headline").center());
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "« Add").center());
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        for expected in ["Entry Style:", "TOC Level 1", "After Entry", "Between Entry and Number:", "Level:"] {
-            visible_label(&labels, screen, expected);
-        }
-        let undo = app.session.doc().unwrap().history.undo.len();
-        click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "OK").center());
-        assert!(app.ui.dialog.is_none());
-        let d = &app.session.doc().unwrap().doc;
-        let toc = d.toc.clone().unwrap();
-        assert_eq!(toc.entries, vec![designcraft_doc::TocEntry::new("Headline", 1)]);
-        let text = &d.story(toc.story).unwrap().text;
-        assert!(text.starts_with("Contents\n") && text.contains("\nNotes on the Grid\t"), "{text}");
-        assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 1);
-        // Reopened, the dialog shows the table of contents and replaces it.
-        crate::menus::activate(&mut app, "toc.generate", &Value::Null);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert!(d.b("replace"));
-        assert_eq!(toc_rows(d).iter().map(|r| r.style.as_str()).collect::<Vec<_>>(), ["Headline"]);
-    }
-
-    #[test]
-    fn margins_and_columns_link_arithmetic_preview_and_one_undo_step() {
-        // Adobe's "Set up a modern magazine layout" (1:41–3:04): linked margins to 0.4375 in, then
-        // 5 columns with a 0.1875 in gutter, unlinked, and "*2" typed after the outside margin.
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"preset": "A4", "pages": 3, "facingPages": true, "margins": 36})).unwrap();
-        app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1000.0, 800.0)));
-        open_margins_and_columns(&mut app);
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 814.0));
-        let mut labels = vec![];
-        for _ in 0..3 {
-            labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        for expected in
-            ["Margins and Columns", "Margins", "Top:", "Bottom:", "Inside:", "Outside:", "Columns", "Number:", "Gutter:", "Adjust Layout", "Preview"]
-        {
-            visible_label(&labels, screen, expected);
-        }
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert!(d.b("link"), "four equal margins open linked");
-        // Linked: one margin typed is all four.
-        app.ui.dialog.as_mut().unwrap().fields.insert("marginTop".into(), json!("0.4375 in"));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert!(MARGIN_FIELDS.iter().all(|(k, _, _)| d.s(k) == "0.4375 in"), "{:?}", d.fields);
-        // Preview: the page changes, with no undo step.
-        let undo = app.session.doc().unwrap().history.undo.len();
-        app.ui.dialog.as_mut().unwrap().fields.insert("preview".into(), json!(true));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        let top = |app: &DesignApp| app.session.doc().unwrap().doc.spreads[0].pages[0].margins.top;
-        assert!((top(&app) - 31.5).abs() < 1e-6, "previewed: {}", top(&app));
-        assert_eq!(app.session.doc().unwrap().history.undo.len(), undo);
-        // Unlinked (the link button), the outside margin alone: "*2" typed after it is worked out
-        // when the field is left.
-        app.ui.dialog.as_mut().unwrap().fields.insert("link".into(), json!(false));
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let key = |k| egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE };
-        let field = labels
-            .iter()
-            .filter(|(t, _, _)| t.trim() == "0.4375 in")
-            .map(|(_, r, _)| *r)
-            .max_by(|a, b| (a.max.x + a.max.y).total_cmp(&(b.max.x + b.max.y)))
-            .unwrap();
-        click_dialog(&mut app, &ctx, screen, field.center());
-        dialog_frame(&mut app, &ctx, screen, vec![key(egui::Key::End), egui::Event::Text("*2".into())]);
-        dialog_frame(&mut app, &ctx, screen, vec![key(egui::Key::Tab)]);
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert!(
-            !d.s("marginOutside").contains('*') && (d.m("marginOutside").unwrap() - 63.0).abs() < 1e-6,
-            "worked out on leaving the field: {}",
-            d.s("marginOutside")
-        );
-        let d = app.ui.dialog.as_mut().unwrap();
-        d.fields.insert("link".into(), json!(false));
-        for (k, v) in [("marginOutside", "0.4375 in*2"), ("columns", "5"), ("gutter", "0.1875 in"), ("target", "all")] {
-            d.fields.insert(k.into(), json!(v));
-        }
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        confirm(&mut app).unwrap();
-        let pg = app.session.doc().unwrap().doc.spreads[1].pages[0].clone();
-        assert_eq!((pg.margins.top, pg.margins.outside, pg.columns.count), (31.5, 63.0, 5));
-        assert!((pg.columns.gutter - 13.5).abs() < 1e-6);
-        assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 1, "one undo step");
-        // Cancel after a preview puts the page back.
-        open_margins_and_columns(&mut app);
-        let d = app.ui.dialog.as_mut().unwrap();
-        d.fields.insert("preview".into(), json!(true));
-        d.fields.insert("columns".into(), json!("2"));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        cancel(&mut app);
-        assert_eq!(app.session.doc().unwrap().doc.spreads[1].pages[0].columns.count, 5);
-    }
-
-    #[test]
-    fn create_guides_reads_like_indesigns_and_previews() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 1, "facingPages": false})).unwrap();
-        app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1000.0, 800.0)));
-        open_create_guides(&mut app);
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 814.0));
-        let mut labels = vec![];
-        for _ in 0..3 {
-            labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        for expected in
-            ["Create Guides", "Rows", "Columns", "Options", "Fit Guides to:", "Margins", "Page", "Remove Existing Ruler Guides", "Preview"]
-        {
-            visible_label(&labels, screen, expected);
-        }
-        // Rows and Columns side by side.
-        let (r, c) = (visible_label(&labels, screen, "Rows"), visible_label(&labels, screen, "Columns"));
-        assert!((r.center().y - c.center().y).abs() < 2.0 && r.center().x < c.center().x);
-        // Thirds, single guides, fitted to the page: clicking the Page radio.
-        click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "Page").center());
-        let d = app.ui.dialog.as_mut().unwrap();
-        assert_eq!(d.s("fitTo"), "page");
-        d.fields.insert("rows".into(), json!("3"));
-        d.fields.insert("rowGutter".into(), json!("0"));
-        d.fields.insert("preview".into(), json!(true));
-        dialog_frame(&mut app, &ctx, screen, vec![]);
-        let guides = |app: &DesignApp| app.session.doc().unwrap().doc.spreads[0].pages[0].guides.len();
-        assert_eq!(guides(&app), 2, "previewed");
-        confirm(&mut app).unwrap();
-        assert_eq!(guides(&app), 2, "made once");
-        app.run("edit.undo", json!({})).unwrap();
-        assert_eq!(guides(&app), 0, "one undo step");
-    }
-
-    fn dialog_context(language: &str) -> egui::Context {
-        let ctx = egui::Context::default();
-        crate::theme::install_fonts(&ctx, language);
-        crate::theme::apply(&ctx, &crate::theme::Tokens::for_brightness(crate::theme::Brightness::default()));
-        ctx
-    }
-
-    fn dialog_frame(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, events: Vec<egui::Event>) -> Vec<(String, egui::Rect, egui::Rect)> {
-        let time = ctx.input(|i| i.time) + 1.0 / 60.0;
-        let mut output = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(time), events, ..Default::default() }, |ui| {
-            show(app, ui.ctx());
-        });
-        output.textures_delta.clear();
-        fn collect(shape: &egui::Shape, clip: egui::Rect, labels: &mut Vec<(String, egui::Rect, egui::Rect)>) {
-            match shape {
-                egui::Shape::Text(t) => labels.push((t.galley.job.text.clone(), t.visual_bounding_rect(), clip)),
-                egui::Shape::Vec(shapes) => {
-                    for s in shapes {
-                        collect(s, clip, labels);
-                    }
-                }
-                _ => {}
-            }
-        }
-        let mut labels = Vec::new();
-        for shape in output.shapes {
-            collect(&shape.shape, shape.clip_rect, &mut labels);
-        }
-        labels
-    }
-
-    fn visible_label(labels: &[(String, egui::Rect, egui::Rect)], screen: egui::Rect, expected: &str) -> egui::Rect {
-        let (_, rect, clip) = labels.iter().find(|(text, _, _)| text.trim() == expected).unwrap_or_else(|| panic!("{expected} is painted"));
-        assert!(screen.contains_rect(*rect), "{expected} must stay on screen: {rect:?}");
-        assert!(clip.contains_rect(*rect), "{expected} must not be clipped: {rect:?}, {clip:?}");
-        *rect
-    }
-
-    fn click_dialog(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, pos: egui::Pos2) {
-        for pressed in [true, false] {
-            dialog_frame(
-                app,
-                ctx,
-                screen,
-                vec![
-                    egui::Event::PointerMoved(pos),
-                    egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
-                ],
-            );
-        }
-    }
-
-    fn scroll_dialog(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, pos: egui::Pos2, delta: egui::Vec2) {
-        dialog_frame(
-            app,
-            ctx,
-            screen,
-            vec![
-                egui::Event::PointerMoved(pos),
-                egui::Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta, phase: egui::TouchPhase::Move, modifiers: egui::Modifiers::NONE },
-            ],
-        );
-        // Let smooth wheel scrolling and scrollbar visibility settle before clicking.
-        for _ in 0..30 {
-            dialog_frame(app, ctx, screen, vec![]);
-        }
-    }
-
-    fn scope_control(app: &mut DesignApp, ctx: &egui::Context, method: &str, params: Value) -> Value {
-        let (request, _reply) = crate::control::ControlRequest::new(method, params);
-        let crate::control::Outcome::Done(value) = crate::control::handle(app, ctx, &request) else { panic!("ordinary control response") };
-        assert_eq!(value["ok"], true, "{value}");
-        value["result"].clone()
-    }
-
-    fn scope_click(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, label: &str) {
-        let labels = dialog_frame(app, ctx, screen, vec![]);
-        let pos = visible_label(&labels, screen, label).center();
-        click_dialog(app, ctx, screen, pos);
-    }
-
-    fn scope_dialog() -> (DesignApp, egui::Context, egui::Rect, designcraft_engine::doc::StoryId) {
-        scope_dialog_with_selection("red red | red", 7)
-    }
-
-    fn scope_dialog_with_selection(text: &str, end: usize) -> (DesignApp, egui::Context, egui::Rect, designcraft_engine::doc::StoryId) {
-        scope_dialog_with_tool(text, end, None)
-    }
-
-    fn scope_dialog_with_tool(
-        text: &str,
-        end: usize,
-        tool: Option<&str>,
-    ) -> (DesignApp, egui::Context, egui::Rect, designcraft_engine::doc::StoryId) {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.ui.language = "en".into();
-        app.run("file.new", json!({})).unwrap();
-        let frame = app.run("frame.create", json!({"rect": [36, 36, 100, 100], "content": "text", "text": text})).unwrap();
-        let sid = designcraft_engine::doc::StoryId(frame["story"].as_u64().unwrap());
-        let ctx = dialog_context("en");
-        if let Some(tool) = tool {
-            scope_control(&mut app, &ctx, "ui.tool.select", json!({"tool": tool}));
-        }
-        app.run("text.select", json!({"story": sid.0, "anchor": 0, "focus": end})).unwrap();
-        app.run("app.findChange", json!({})).unwrap();
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 814.0));
-        for (field, value) in [("find", "red"), ("change", "unused")] {
-            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": field, "value": value}));
-        }
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        scope_click(&mut app, &ctx, screen, "document");
-        scope_click(&mut app, &ctx, screen, "selection");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("scope"), "selection");
-        (app, ctx, screen, sid)
-    }
-
-    fn scope_selected(app: &DesignApp, sid: designcraft_engine::doc::StoryId, a: usize, b: usize) {
-        let t = app.session.doc().unwrap().selection.text.unwrap();
-        assert_eq!((t.story, t.range(), t.cell), (sid, a..b, None));
-    }
-
-    fn scope_state_unchanged(app: &DesignApp, before: &designcraft_engine::DocState) {
-        let after = app.session.doc().unwrap();
-        assert!(std::sync::Arc::ptr_eq(&before.doc, &after.doc));
-        assert_eq!(after.uid, before.uid);
-        assert_eq!(after.revision, before.revision);
-        assert_eq!(after.selection, before.selection);
-        assert_eq!(after.history.limit, before.history.limit);
-        for (actual, expected) in [(&after.history.undo, &before.history.undo), (&after.history.redo, &before.history.redo)] {
-            assert_eq!(actual.len(), expected.len());
-            for (a, b) in actual.iter().zip(expected) {
-                assert_eq!(a.label, b.label);
-                assert_eq!(a.selection, b.selection);
-                assert!(std::sync::Arc::ptr_eq(&a.doc, &b.doc));
-            }
-        }
-    }
-
-    #[test]
-    fn find_scope_dialog_control_effective_noops_retain_bounds() {
-        for (field, value) in [("objectMode", json!(false)), ("story", Value::Null)] {
-            let (mut app, ctx, screen, sid) = scope_dialog();
-            assert!(!app.ui.dialog.as_ref().unwrap().fields.contains_key(field));
-            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
-            scope_click(&mut app, &ctx, screen, "Count");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 0, 3);
-            let before = app.session.doc().unwrap().clone();
-            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": field, "value": value}));
-            assert_eq!(app.ui.dialog.as_ref().unwrap().fields[field], value);
-            scope_state_unchanged(&app, &before);
-            scope_click(&mut app, &ctx, screen, "Count");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 4, 7);
-            scope_click(&mut app, &ctx, screen, "Change All");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 replacement(s) made");
-            assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
-            assert_eq!(app.session.doc().unwrap().history.undo.len(), before.history.undo.len() + 1);
-        }
-    }
-
-    #[test]
-    fn find_scope_dialog_explicit_story_ignored_scope_preserves_grep_cursor() {
-        for physical in [false, true] {
-            for (text, pattern, hits, changed) in [
-                ("é", "é|(?:)", vec![(0, 2)], "X"),
-                ("é🙂", "é|(?:)", vec![(0, 2), (6, 6)], "X🙂X"),
-                ("é🙂", "(?:)", vec![(0, 0), (2, 2), (6, 6)], "XéX🙂X"),
-            ] {
-                let (mut app, ctx, screen, sid) = scope_dialog_with_selection(text, 0);
-                for (field, value) in [("find", json!(pattern)), ("change", json!("X")), ("story", json!(sid.0))] {
-                    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": field, "value": value}));
-                }
-                scope_click(&mut app, &ctx, screen, "GREP");
-                scope_click(&mut app, &ctx, screen, "Count");
-                assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), format!("{} match(es)", hits.len()));
-                for &(a, b) in &hits {
-                    scope_click(&mut app, &ctx, screen, "Find Next");
-                    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "Found");
-                    scope_selected(&app, sid, a, b);
-                    let before = app.session.doc().unwrap().clone();
-                    let cur = app.ui.dialog.as_ref().unwrap().s("scope");
-                    let next = if cur == "selection" { "document" } else { "selection" };
-                    if physical {
-                        scope_click(&mut app, &ctx, screen, &cur);
-                        scope_click(&mut app, &ctx, screen, next);
-                    } else {
-                        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "scope", "value": next}));
-                    }
-                    assert_eq!(app.ui.dialog.as_ref().unwrap().s("scope"), next);
-                    assert_eq!(app.ui.dialog.as_ref().unwrap().fields["story"], json!(sid.0));
-                    scope_state_unchanged(&app, &before);
-                    scope_click(&mut app, &ctx, screen, "Count");
-                    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), format!("{} match(es)", hits.len()));
-                }
-                scope_click(&mut app, &ctx, screen, "Find Next");
-                assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "No matches");
-                // An ignored scope change must not revive an exhausted endpoint either.
-                let before = app.session.doc().unwrap().clone();
-                let cur = app.ui.dialog.as_ref().unwrap().s("scope");
-                let next = if cur == "selection" { "document" } else { "selection" };
-                if physical {
-                    scope_click(&mut app, &ctx, screen, &cur);
-                    scope_click(&mut app, &ctx, screen, next);
-                } else {
-                    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "scope", "value": next}));
-                }
-                scope_click(&mut app, &ctx, screen, "Find Next");
-                assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "No matches");
-                scope_state_unchanged(&app, &before);
-                scope_click(&mut app, &ctx, screen, "Change All");
-                assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), format!("{} replacement(s) made", hits.len()));
-                assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, changed);
-            }
-        }
-    }
-
-    #[test]
-    fn find_scope_dialog_explicit_story_transitions_reset_cursor() {
-        for remove_override in [false, true] {
-            let (mut app, ctx, screen, sid) = scope_dialog_with_selection("é🙂", 0);
-            let other = app.run("frame.create", json!({"rect": [180, 36, 100, 100], "content": "text", "text": "other"})).unwrap();
-            app.run("text.select", json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
-            for (field, value) in [("find", json!("(?:)")), ("story", json!(sid.0))] {
-                scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": field, "value": value}));
-            }
-            scope_click(&mut app, &ctx, screen, "GREP");
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 0, 0);
-            let before = app.session.doc().unwrap().clone();
-            let value = if remove_override { Value::Null } else { other["story"].clone() };
-            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "story", "value": value}));
-            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "story", "value": sid.0}));
-            scope_state_unchanged(&app, &before);
-            // Away and back still releases continuation even if no Find command intervenes.
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 0, 0);
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 2, 2);
-            assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "é🙂");
-            let other_sid = designcraft_engine::doc::StoryId(other["story"].as_u64().unwrap());
-            assert_eq!(app.session.doc().unwrap().doc.story(other_sid).unwrap().text, "other");
-        }
-    }
-
-    #[test]
-    fn find_scope_dialog_control_mode_changes_release_bounds() {
-        for object_mode in [false, true] {
-            let (mut app, ctx, _, sid) = scope_dialog();
-            if object_mode {
-                scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "objectMode", "value": true}));
-            }
-            // Direct Session consumers share the retained domain even while Object is shown.
-            let p = json!({"find": "red", "change": "blue", "scope": "selection"});
-            let count = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.find", "params": p}));
-            assert_eq!(count.as_array().unwrap().len(), 2);
-            scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.next", "params": p}));
-            scope_selected(&app, sid, 0, 3);
-            let before = app.session.doc().unwrap().clone();
-            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "objectMode", "value": !object_mode}));
-            assert_eq!(app.ui.dialog.as_ref().unwrap().b("objectMode"), !object_mode);
-            scope_state_unchanged(&app, &before);
-            let count = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.find", "params": p}));
-            assert_eq!(count, json!([{"story": sid.0, "start": 0, "end": 3, "text": "red"}]));
-            let changed = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.change", "params": p}));
-            assert_eq!(changed, json!({"count": 1}));
-            assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
-        }
-    }
-
-    #[test]
-    fn find_scope_dialog_tool_replacement_releases_bounds() {
-        for (tool, replacement) in [("page", "cmd:layout.pageSize"), ("rectangleFrame", "frameSize")] {
-            let (mut app, ctx, screen, sid) = scope_dialog_with_tool("red red | red", 7, Some(tool));
-            assert_eq!(app.session.tool_id(), tool);
-            scope_click(&mut app, &ctx, screen, "Count");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 0, 3);
-            let before = app.session.doc().unwrap().clone();
-            let active = (app.session.active_index(), app.session.documents().len());
-            let off = app.session.layout().xf(designcraft_engine::doc::SpreadRef::Doc(0)).translation();
-            let x = off.x + before.doc.spreads[0].pages[0].x + 200.0;
-            let y = off.y + 200.0;
-            // The Page tool opens Page Size on a double-click (a click selects the page).
-            let events = if tool == "page" {
-                json!([{"kind": "doubleclick", "x": x, "y": y}])
-            } else {
-                json!([{"kind": "down", "x": x, "y": y}, {"kind": "up", "x": x, "y": y}])
-            };
-            // Real tool -> Action::Dialog -> after_engine; no injected UI request.
-            scope_control(&mut app, &ctx, "ui.pointer", json!({"events": events}));
-            assert_eq!(app.ui.dialog.as_ref().unwrap().id, replacement);
-            assert!(app.session.ui_requests.is_empty());
-            assert_eq!((app.session.active_index(), app.session.documents().len()), active);
-            scope_state_unchanged(&app, &before);
-            scope_click(&mut app, &ctx, screen, "Cancel");
-            assert!(app.ui.dialog.is_none());
-            assert_eq!((app.session.active_index(), app.session.documents().len()), active);
-            scope_state_unchanged(&app, &before);
-            let p = json!({"find": "red", "change": "blue", "scope": "selection"});
-            let count = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.find", "params": p}));
-            assert_eq!(count, json!([{"story": sid.0, "start": 0, "end": 3, "text": "red"}]));
-            scope_state_unchanged(&app, &before);
-            let changed = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.change", "params": p}));
-            assert_eq!(changed, json!({"count": 1}));
-            assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
-            assert_eq!(app.session.doc().unwrap().history.undo.len(), before.history.undo.len() + 1);
-        }
-    }
-
-    #[test]
-    fn find_scope_dialog_tool_without_replacement_retains_bounds() {
-        for tool in ["page", "rectangleFrame"] {
-            let (mut app, ctx, screen, sid) = scope_dialog_with_tool("red red | red", 7, Some(tool));
-            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
-            scope_click(&mut app, &ctx, screen, "Count");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 0, 3);
-            let before = app.session.doc().unwrap().clone();
-            let fields = app.ui.dialog.as_ref().unwrap().fields.clone();
-            scope_control(&mut app, &ctx, "ui.pointer", json!({"events": [{"kind": "move", "x": 200, "y": 200}]}));
-            assert_eq!(app.ui.dialog.as_ref().unwrap().id, "findChange");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().fields, fields);
-            scope_state_unchanged(&app, &before);
-            scope_click(&mut app, &ctx, screen, "Count");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 4, 7);
-            scope_click(&mut app, &ctx, screen, "Change All");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 replacement(s) made");
-            assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
-        }
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    #[test]
-    fn find_scope_dialog_native_pdf_replacement_releases_bounds() {
-        let directory = tempfile::tempdir().unwrap();
-        let path = directory.path().join("three.pdf");
-        std::fs::write(&path, crate::browser_import_tests::pdf()).unwrap();
-        for dismissal in ["Cancel", "Escape", "control"] {
-            let (mut app, ctx, screen, sid) = scope_dialog();
-            let picked = std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0));
-            let read = std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0));
-            let seen_pick = picked.clone();
-            let seen_read = read.clone();
-            let pick_path = path.to_string_lossy().to_string();
-            let read_path = pick_path.clone();
-            app.services.pick_open = Some(Box::new(move |purpose| {
-                assert_eq!(purpose, "place");
-                seen_pick.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
-                Some(pick_path.clone())
-            }));
-            app.services.read = Some(Box::new(move |path| {
-                assert_eq!(path, read_path);
-                seen_read.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
-                std::fs::read(path).map_err(|e| e.to_string())
-            }));
-            scope_click(&mut app, &ctx, screen, "Count");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 0, 3);
-            let before = app.session.doc().unwrap().clone();
-            let active = (app.session.active_index(), app.session.documents().len());
-            // Exercise engine.execute -> UiRequest::Pick -> native host PDF replacement.
-            scope_control(&mut app, &ctx, "engine.execute", json!({"command": "file.place", "params": {}}));
-            assert_eq!(picked.load(std::sync::atomic::Ordering::SeqCst), 1);
-            assert_eq!(read.load(std::sync::atomic::Ordering::SeqCst), 1);
-            let dialog = app.ui.dialog.as_ref().unwrap();
-            assert_eq!(dialog.id, "pdfImport");
-            assert_eq!(dialog.s("path"), path.to_string_lossy());
-            assert_eq!(dialog.fields["pages"], 3);
-            assert_eq!(dialog.s("page"), "1");
-            assert!(!dialog.b("async"));
-            assert_eq!(dialog.fields["target"], json!(before.uid));
-            assert!(app.session.ui_requests.is_empty());
-            assert!(app.pending_pdf.is_none());
-            assert_eq!((app.session.active_index(), app.session.documents().len()), active);
-            scope_state_unchanged(&app, &before);
-            match dismissal {
-                "Cancel" => scope_click(&mut app, &ctx, screen, "Cancel"),
-                "Escape" => {
-                    dialog_frame(
-                        &mut app,
-                        &ctx,
-                        screen,
-                        vec![egui::Event::Key {
-                            key: egui::Key::Escape,
-                            physical_key: None,
-                            pressed: true,
-                            repeat: false,
-                            modifiers: egui::Modifiers::NONE,
-                        }],
-                    );
-                }
-                "control" => {
-                    scope_control(&mut app, &ctx, "ui.dialog.cancel", json!({}));
-                }
-                _ => panic!("known dismissal"),
-            }
-            assert!(app.ui.dialog.is_none());
-            assert!(app.pending_pdf.is_none());
-            assert_eq!(picked.load(std::sync::atomic::Ordering::SeqCst), 1);
-            assert_eq!(read.load(std::sync::atomic::Ordering::SeqCst), 1);
-            assert_eq!((app.session.active_index(), app.session.documents().len()), active);
-            scope_state_unchanged(&app, &before);
-            let p = json!({"find": "red", "change": "blue", "scope": "selection"});
-            let count = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.find", "params": p}));
-            assert_eq!(count, json!([{"story": sid.0, "start": 0, "end": 3, "text": "red"}]));
-            scope_state_unchanged(&app, &before);
-            let changed = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.change", "params": p}));
-            assert_eq!(changed, json!({"count": 1}));
-            assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
-            assert_eq!(app.session.doc().unwrap().history.undo.len(), before.history.undo.len() + 1);
-        }
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    #[test]
-    fn find_scope_dialog_native_picker_cancel_retains_bounds() {
-        let (mut app, ctx, screen, sid) = scope_dialog();
-        let picked = std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0));
-        let seen = picked.clone();
-        app.services.pick_open = Some(Box::new(move |purpose| {
-            assert_eq!(purpose, "place");
-            seen.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
-            None
-        }));
-        let read = std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0));
-        let seen_read = read.clone();
-        app.services.read = Some(Box::new(move |_| {
-            seen_read.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
-            Err("canceled picker must not read".into())
-        }));
-        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 0, 3);
-        let before = app.session.doc().unwrap().clone();
-        let active = (app.session.active_index(), app.session.documents().len());
-        let fields = app.ui.dialog.as_ref().unwrap().fields.clone();
-        scope_control(&mut app, &ctx, "engine.execute", json!({"command": "file.place", "params": {}}));
-        assert_eq!(picked.load(std::sync::atomic::Ordering::SeqCst), 1);
-        assert_eq!(read.load(std::sync::atomic::Ordering::SeqCst), 0);
-        assert_eq!(app.ui.dialog.as_ref().unwrap().id, "findChange");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().fields, fields);
-        assert_eq!((app.session.active_index(), app.session.documents().len()), active);
-        scope_state_unchanged(&app, &before);
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 4, 7);
-        scope_click(&mut app, &ctx, screen, "Change All");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 replacement(s) made");
-        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
-        assert_eq!(app.session.doc().unwrap().history.undo.len(), before.history.undo.len() + 1);
-    }
-
-    #[test]
-    fn find_scope_dialog_exact_baseline_buttons() {
-        let (mut app, ctx, screen, sid) = scope_dialog_with_selection("red red", 3);
-        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 match(es)");
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 0, 3);
-        scope_click(&mut app, &ctx, screen, "Change All");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 replacement(s) made");
-        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red");
-    }
-
-    #[test]
-    fn find_scope_dialog_grep_tab_alone_restarts_original_selection() {
-        let (mut app, ctx, screen, sid) = scope_dialog();
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 0, 3);
-        scope_click(&mut app, &ctx, screen, "GREP");
-        assert!(app.ui.dialog.as_ref().unwrap().b("grep"));
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("find"), "red");
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 0, 3);
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 4, 7);
-        scope_click(&mut app, &ctx, screen, "Text");
-        assert!(!app.ui.dialog.as_ref().unwrap().b("grep"));
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 0, 3);
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-    }
-
-    #[test]
-    fn find_scope_dialog_buttons_retain_nonempty_hits_and_change_all() {
-        let (mut app, ctx, screen, sid) = scope_dialog();
-        let history = app.session.doc().unwrap().history.undo.len();
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 0, 3);
-        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 4, 7);
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "No matches");
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-        assert_eq!(app.session.doc().unwrap().history.undo.len(), history);
-        scope_click(&mut app, &ctx, screen, "Change All");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 replacement(s) made");
-        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
-        assert_eq!(app.session.doc().unwrap().history.undo.len(), history + 1);
-        scope_click(&mut app, &ctx, screen, "Cancel");
-        assert!(app.ui.dialog.is_none());
-        app.run("edit.undo", json!({})).unwrap();
-        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
-        app.run("edit.redo", json!({})).unwrap();
-        let native = app.run("file.serialize", json!({})).unwrap();
-        app.run("file.openBytes", json!({"name": "scope.designcraft", "base64": native["base64"]})).unwrap();
-        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
-    }
-
-    fn scope_confirm_case(action: &str) {
-        let (mut app, ctx, screen, sid) = scope_dialog();
-        scope_click(&mut app, &ctx, screen, "Count");
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 0, 3);
-        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
-        match action {
-            "OK" => scope_click(&mut app, &ctx, screen, "OK"),
-            "Enter" => {
-                dialog_frame(
-                    &mut app,
-                    &ctx,
-                    screen,
-                    vec![egui::Event::Key {
-                        key: egui::Key::Enter,
-                        physical_key: None,
-                        pressed: true,
-                        repeat: false,
-                        modifiers: egui::Modifiers::NONE,
-                    }],
-                );
-            }
-            "control" => {
-                assert_eq!(scope_control(&mut app, &ctx, "ui.dialog.confirm", json!({}))["count"], 2);
-            }
-            _ => panic!("known confirmation route"),
-        }
-        assert!(app.ui.dialog.is_none());
-        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
-        // The closed dialog cannot leave its old seven-byte range for a later direct query.
-        let matches = app.run("find.find", json!({"find": "blue", "scope": "selection"})).unwrap();
-        assert_eq!(matches.as_array().unwrap().len(), 0);
-    }
-
-    #[test]
-    fn find_scope_dialog_ok_consumes_retained_bounds() {
-        scope_confirm_case("OK");
-    }
-
-    #[test]
-    fn find_scope_dialog_enter_consumes_retained_bounds() {
-        scope_confirm_case("Enter");
-    }
-
-    #[test]
-    fn find_scope_dialog_control_confirm_consumes_retained_bounds() {
-        scope_confirm_case("control");
-    }
-
-    #[test]
-    fn find_scope_dialog_query_reselection_cancel_and_reopen() {
-        let (mut app, ctx, screen, sid) = scope_dialog();
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 0, 3);
-        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "grep", "value": true}));
-        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "find", "value": "r.d"}));
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 0, 3);
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-        scope_control(&mut app, &ctx, "ui.dialog.cancel", json!({}));
-        assert_eq!(app.run("find.find", json!({"find": "red", "scope": "selection"})).unwrap().as_array().unwrap().len(), 1);
-        app.run("text.select", json!({"story": sid.0, "anchor": 0, "focus": 7})).unwrap();
-        app.run("find.next", json!({"find": "red", "scope": "selection"})).unwrap();
-        scope_control(&mut app, &ctx, "ui.dialog.open", json!({"id": "findChange", "fields": {"find": "red", "scope": "selection"}}));
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 match(es)");
-        app.run("text.select", json!({"story": sid.0, "anchor": 4, "focus": 7})).unwrap();
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 4, 7);
-        app.run("app.findChange", json!({})).unwrap();
-        for (field, value) in [("find", "red"), ("scope", "selection")] {
-            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": field, "value": value}));
-        }
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 match(es)");
-    }
-
-    #[test]
-    fn find_scope_dialog_word_reselection_limits_count_and_change_buttons() {
-        let (mut app, ctx, screen, sid) = scope_dialog();
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-        scope_click(&mut app, &ctx, screen, "Find Next");
-        scope_selected(&app, sid, 0, 3);
-        let selected = app.session.doc().unwrap().selection.clone();
-        let frame = selected.text.unwrap().frame.unwrap();
-        let point = {
-            let st = app.session.doc().unwrap();
-            let cs = app.session.cache.get(&st.doc, sid, None);
-            let (fi, x, baseline, ascent, _) = designcraft_compose::caret(&cs, 1).unwrap();
-            let inner = designcraft_geom::Point::new(x, baseline - ascent * 0.5);
-            assert_eq!(cs.frames[fi].frame, frame);
-            assert_eq!(designcraft_compose::hit(&cs, fi, inner), Some(1));
-            let loc = st.doc.find(frame).unwrap();
-            st.doc.parent_xf(&loc) * st.doc.text_xf(st.doc.item(frame).unwrap()) * inner
-        };
-        let before = app.session.doc().unwrap().doc.clone();
-        let revision = app.session.doc().unwrap().revision;
-        app.run("text.selectWord", json!({"frame": frame.0, "point": [point.x, point.y]})).unwrap();
-        assert_eq!(app.session.doc().unwrap().selection, selected);
-        assert!(app.session.doc().unwrap().revision > revision, "a new revision");
-        assert!(std::sync::Arc::ptr_eq(&before, &app.session.doc().unwrap().doc));
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 match(es)");
-        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
-        scope_click(&mut app, &ctx, screen, "Change All");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 replacement(s) made");
-        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    #[test]
-    fn find_scope_dialog_failed_native_drop_alert_releases_bounds() {
-        let directory = tempfile::tempdir().unwrap();
-        let path = directory.path().join("broken.designcraft");
-        std::fs::write(&path, b"not a native document").unwrap();
-        for dismissal in ["OK", "Escape", "control"] {
-            let (mut app, ctx, screen, sid) = scope_dialog();
-            scope_click(&mut app, &ctx, screen, "Count");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 0, 3);
-            let before = app.session.doc().unwrap().doc.clone();
-            let selected = app.session.doc().unwrap().selection.clone();
-            let revision = app.session.doc().unwrap().revision;
-            let history = app.session.doc().unwrap().history.undo.len();
-            let uid = app.session.doc().unwrap().uid;
-            let error = app.open_dropped(&path.to_string_lossy()).unwrap_err();
-            let alert = app.ui.dialog.as_ref().unwrap();
-            assert_eq!(alert.id, "alert");
-            assert_eq!(alert.s("title"), "Can't Open the File");
-            assert_eq!(alert.s("message"), error);
-            assert!(std::sync::Arc::ptr_eq(&before, &app.session.doc().unwrap().doc));
-            assert_eq!(app.session.doc().unwrap().selection, selected);
-            assert_eq!(app.session.doc().unwrap().revision, revision);
-            assert_eq!(app.session.doc().unwrap().uid, uid);
-            assert_eq!(app.session.doc().unwrap().history.undo.len(), history);
-            match dismissal {
-                "OK" => scope_click(&mut app, &ctx, screen, "OK"),
-                "Escape" => {
-                    dialog_frame(
-                        &mut app,
-                        &ctx,
-                        screen,
-                        vec![egui::Event::Key {
-                            key: egui::Key::Escape,
-                            physical_key: None,
-                            pressed: true,
-                            repeat: false,
-                            modifiers: egui::Modifiers::NONE,
-                        }],
-                    );
-                }
-                "control" => {
-                    scope_control(&mut app, &ctx, "ui.dialog.cancel", json!({}));
-                }
-                _ => panic!("known dismissal"),
-            }
-            assert!(app.ui.dialog.is_none());
-            let p = json!({"find": "red", "change": "blue", "scope": "selection"});
-            assert_eq!(app.run("find.find", p.clone()).unwrap(), json!([{"story": sid.0, "start": 0, "end": 3, "text": "red"}]));
-            assert_eq!(app.run("find.change", p).unwrap(), json!({"count": 1}));
-            assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
-            assert_eq!(app.session.doc().unwrap().history.undo.len(), history + 1);
-        }
-    }
-
-    #[test]
-    fn find_scope_dialog_child_errors_and_explicit_parent() {
-        let (mut app, ctx, screen, sid) = scope_dialog();
-        app.run("text.select", json!({"story": sid.0, "anchor": 13, "focus": 13})).unwrap();
-        app.run("table.insert", json!({"rows": 1, "cols": 1})).unwrap();
-        app.run("text.insert", json!({"text": "red child", "raw": true})).unwrap();
-        let child = app.session.doc().unwrap().selection.text.unwrap();
-        let before = app.session.doc().unwrap().doc.clone();
-        let selection = app.session.doc().unwrap().selection.clone();
-        let history = app.session.doc().unwrap().history.undo.len();
-        for label in ["Count", "Find Next", "Change All"] {
-            scope_click(&mut app, &ctx, screen, label);
-            assert!(app.ui.dialog.as_ref().unwrap().s("status").contains("not supported"));
-            assert!(std::sync::Arc::ptr_eq(&before, &app.session.doc().unwrap().doc));
-            assert_eq!(app.session.doc().unwrap().selection, selection);
-            assert_eq!(app.session.doc().unwrap().history.undo.len(), history);
-        }
-        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
-        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "story", "value": sid.0}));
-        scope_click(&mut app, &ctx, screen, "Count");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "3 match(es)");
-        scope_click(&mut app, &ctx, screen, "Change All");
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "3 replacement(s) made");
-        assert_eq!(app.session.doc().unwrap().doc.text_story(sid, child.cell).unwrap().text, "red child");
-        assert!(app.session.doc().unwrap().doc.story(sid).unwrap().text.starts_with("blue blue | blue"));
-    }
-
-    #[test]
-    fn find_scope_dialog_error_confirmation_and_escape_release_context() {
-        for escape in [false, true] {
-            let (mut app, ctx, screen, sid) = scope_dialog();
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            scope_selected(&app, sid, 0, 3);
-            if escape {
-                dialog_frame(
-                    &mut app,
-                    &ctx,
-                    screen,
-                    vec![egui::Event::Key {
-                        key: egui::Key::Escape,
-                        physical_key: None,
-                        pressed: true,
-                        repeat: false,
-                        modifiers: egui::Modifiers::NONE,
-                    }],
-                );
-            } else {
-                scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "find", "value": "["}));
-                scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "grep", "value": true}));
-                scope_click(&mut app, &ctx, screen, "OK");
-            }
-            assert!(app.ui.dialog.is_none());
-            assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
-            assert_eq!(app.run("find.find", json!({"find": "red", "scope": "selection"})).unwrap().as_array().unwrap().len(), 1);
-        }
-    }
-
-    #[test]
-    fn find_scope_dialog_domain_and_object_changes_release_original_range() {
-        for route in ["scope", "object", "menu", "command"] {
-            let (mut app, ctx, screen, _) = scope_dialog();
-            scope_click(&mut app, &ctx, screen, "Find Next");
-            match route {
-                "scope" => {
-                    for scope in ["story", "selection"] {
-                        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "scope", "value": scope}));
-                    }
-                }
-                "object" => {
-                    scope_click(&mut app, &ctx, screen, "Object");
-                    scope_click(&mut app, &ctx, screen, "Text");
-                }
-                "menu" => crate::menus::activate(&mut app, "app.newDocumentDialog", &Value::Null),
-                "command" => {
-                    app.run("app.newDocumentDialog", json!({})).unwrap();
-                }
-                _ => panic!("known reset route"),
-            }
-            assert_eq!(app.run("find.find", json!({"find": "red", "scope": "selection"})).unwrap().as_array().unwrap().len(), 1);
-        }
-    }
-
-    #[test]
-    fn dialog_title_and_actions_fit_scaled_viewports() {
-        for language in ["en", "ar"] {
-            for size in [egui::vec2(1178.0, 814.0), egui::vec2(589.0, 407.0), egui::vec2(392.0, 271.0), egui::vec2(450.0, 280.0)] {
-                for (command, title, ok, cancel) in
-                    [("app.preferences", "Preferences", "OK", "Cancel"), ("app.newDocumentDialog", "New Document", "Create", "Close")]
-                {
-                    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-                    app.ui.language = language.into();
-                    app.run("file.new", json!({})).unwrap();
-                    app.run(command, json!({})).unwrap();
-                    let ctx = dialog_context(language);
-                    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, size);
-                    for _ in 0..3 {
-                        dialog_frame(&mut app, &ctx, screen, vec![]);
-                    }
-                    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-                    for expected in [title, ok, cancel] {
-                        visible_label(&labels, screen, crate::i18n::tr(language, expected));
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn preferences_first_setting_switches_interface_language() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("app.preferences", json!({})).unwrap();
-        let ctx = dialog_context("");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 814.0));
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let heading = visible_label(&labels, screen, "Interface Language");
-        let combo = visible_label(&labels, screen, "English");
-        let scaling = visible_label(&labels, screen, "When Scaling");
-        assert!(heading.bottom() <= combo.top() && combo.bottom() <= scaling.top(), "the language comes first: {heading:?} {combo:?} {scaling:?}");
-        let pane = labels.iter().filter(|(_, rect, _)| rect.left() >= heading.left() - 1.0 && rect.top() < heading.top());
-        assert!(pane.clone().all(|(text, _, _)| text == "Preferences"), "nothing above it: {:?}", pane.collect::<Vec<_>>());
-
-        // Choosing a language applies it at once; the dialog stays open.
-        click_dialog(&mut app, &ctx, screen, combo.center());
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        for (_, name) in crate::i18n::LANGUAGES {
-            assert!(labels.iter().any(|(text, _, _)| text == name), "{name} is listed by its own name");
-        }
-        let deutsch = visible_label(&labels, screen, "Deutsch").center();
-        click_dialog(&mut app, &ctx, screen, deutsch);
-        assert_eq!(app.ui.language, "de");
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("preferences"));
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let heading = visible_label(&labels, screen, crate::i18n::tr("de", "Interface Language"));
-        let combo = visible_label(&labels, screen, "Deutsch");
-
-        // The names stay endonyms in the German interface.
-        click_dialog(&mut app, &ctx, screen, combo.center());
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        for name in ["English", "Français", "日本語", "Українська"] {
-            assert!(labels.iter().any(|(text, _, _)| text == name), "{name}");
-        }
-        click_dialog(&mut app, &ctx, screen, heading.center());
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        assert!(!labels.iter().any(|(text, _, _)| text == "Français"), "the list closes");
-
-        // The control channel's command and the combo show the same setting.
-        app.run("app.language", json!({"lang": "ja"})).unwrap();
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        assert!(labels.iter().any(|(text, _, _)| text == "日本語"));
-        assert!(labels.iter().any(|(text, _, _)| text == crate::i18n::tr("ja", "Interface Language")));
-
-        // Cancel puts back the language the dialog opened with; OK keeps the choice.
-        let cancel_button = visible_label(&labels, screen, crate::i18n::tr("ja", "Cancel")).center();
-        click_dialog(&mut app, &ctx, screen, cancel_button);
-        assert!(app.ui.dialog.is_none());
-        assert_eq!(app.ui.language, "");
-        app.run("app.preferences", json!({})).unwrap();
-        app.run("app.language", json!({"lang": "it"})).unwrap();
-        confirm(&mut app).unwrap();
-        assert_eq!(app.ui.language, "it");
-        app.run("app.preferences", json!({})).unwrap();
-        app.run("app.language", json!({"lang": "uk"})).unwrap();
-        cancel(&mut app);
-        assert_eq!(app.ui.language, "it");
-    }
-
-    #[test]
-    fn preferences_sidebar_scroll_keeps_selected_options_visible() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("app.preferences", json!({})).unwrap();
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(589.0, 407.0));
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let sidebar = visible_label(&labels, screen, "General").center();
-        assert!(
-            !labels.iter().any(|(text, rect, clip)| text == "File Handling" && clip.contains_rect(*rect)),
-            "last section starts below the sidebar"
-        );
-        scroll_dialog(&mut app, &ctx, screen, sidebar, egui::vec2(0.0, -600.0));
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let files = visible_label(&labels, screen, "File Handling").center();
-        click_dialog(&mut app, &ctx, screen, files);
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("section"), "files");
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        for expected in ["Document Recovery Data", "Save recovery data every:", "OK", "Cancel"] {
-            visible_label(&labels, screen, expected);
-        }
-    }
-
-    #[test]
-    fn preferences_horizontal_scroll_reaches_clipped_options() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("app.preferences", json!({})).unwrap();
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(450.0, 280.0));
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let body = visible_label(&labels, screen, "When Scaling").center();
-        // The last General option sits below this short viewport.
-        scroll_dialog(&mut app, &ctx, screen, body, egui::vec2(0.0, -600.0));
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let option = "Absolute Numbering (instead of Section Numbering)";
-        let (_, rect, clip) = labels.iter().find(|(text, _, _)| text == option).unwrap();
-        assert!(rect.right() > clip.right(), "rightmost option starts horizontally clipped: {rect:?}, {clip:?}");
-        scroll_dialog(&mut app, &ctx, screen, body, egui::vec2(-600.0, 0.0));
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        for expected in [option, "Preferences", "OK", "Cancel"] {
-            visible_label(&labels, screen, expected);
-        }
-        click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, option).center());
-        assert!(app.ui.dialog.as_ref().unwrap().b("absolutePageNumbers"));
-    }
-
-    /// Scroll the dialog body down at `at` until `text` is painted unclipped on screen.
-    fn scroll_to_label(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, at: egui::Pos2, text: &str) -> egui::Rect {
-        for _ in 0..40 {
-            let labels = dialog_frame(app, ctx, screen, vec![]);
-            if let Some((_, rect, _)) = labels.iter().find(|(t, r, clip)| t.trim() == text && screen.contains_rect(*r) && clip.contains_rect(*r)) {
-                return *rect;
-            }
-            scroll_dialog(app, ctx, screen, at, egui::vec2(0.0, -60.0));
-        }
-        panic!("{text} never scrolled into view");
-    }
-
-    #[test]
-    fn new_document_vertical_scroll_reaches_every_field_and_preset() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("app.newDocumentDialog", json!({})).unwrap();
-        let ctx = dialog_context("en");
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(392.0, 271.0));
-        for _ in 0..3 {
-            dialog_frame(&mut app, &ctx, screen, vec![]);
-        }
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        let body = visible_label(&labels, screen, "Width").center();
-        let shown =
-            |labels: &[(String, egui::Rect, egui::Rect)]| labels.iter().any(|(t, r, clip)| t == "Primary Text Frame" && clip.contains_rect(*r));
-        assert!(!shown(&labels), "the details start vertically clipped");
-        let ptf = scroll_to_label(&mut app, &ctx, screen, body, "Primary Text Frame");
-        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-        for expected in ["New Document", "Create", "Close"] {
-            visible_label(&labels, screen, expected);
-        }
-        click_dialog(&mut app, &ctx, screen, ptf.center());
-        assert!(app.ui.dialog.as_ref().unwrap().b("primaryTextFrame"), "the caption toggles its checkbox");
-        // Below the details: the preset tabs and cards.
-        scroll_to_label(&mut app, &ctx, screen, body, "[Default]");
-    }
-
-    #[test]
-    fn arabic_new_document_fields_remain_reachable_and_editable() {
-        for size in [egui::vec2(392.0, 271.0), egui::vec2(450.0, 280.0), egui::vec2(1178.0, 814.0)] {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.ui.language = "ar".into();
-            app.run("app.newDocumentDialog", json!({})).unwrap();
-            let fields = [("height", "66p1"), ("gutter", "1p2"), ("marginBottom", "3p3"), ("marginOutside", "3p4")];
-            for (field, value) in fields {
-                app.ui.dialog.as_mut().unwrap().fields.insert(field.into(), json!(value));
-            }
-            let ctx = dialog_context("ar");
-            let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, size);
-            for _ in 0..3 {
-                dialog_frame(&mut app, &ctx, screen, vec![]);
-            }
-            // With craft-fonts' Noto Sans Arabic the rows above are taller, so at the smallest size the
-            // Height field starts partly below the body's clip: scroll to it like the other fields.
-            let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-            let (_, _, body) = labels.iter().find(|(text, _, _)| text.trim() == "66p1").expect("66p1 is painted");
-            let height = scroll_to_label(&mut app, &ctx, screen, body.center(), "66p1");
-            click_dialog(&mut app, &ctx, screen, height.center());
-            dialog_frame(
-                &mut app,
-                &ctx,
-                screen,
-                vec![
-                    egui::Event::Key {
-                        key: egui::Key::A,
-                        physical_key: None,
-                        pressed: true,
-                        repeat: false,
-                        modifiers: egui::Modifiers { ctrl: true, command: true, ..Default::default() },
-                    },
-                    egui::Event::Text("88p8".into()),
-                ],
-            );
-            assert_eq!(app.ui.dialog.as_ref().unwrap().s("height"), "88p8", "numeric fields accept edits");
-            let caption = scroll_to_label(&mut app, &ctx, screen, height.center(), crate::i18n::tr("ar", "Primary Text Frame"));
-            click_dialog(&mut app, &ctx, screen, caption.center());
-            assert!(app.ui.dialog.as_ref().unwrap().b("primaryTextFrame"), "checkboxes remain clickable");
-            for (_, value) in &fields[1..] {
-                scroll_to_label(&mut app, &ctx, screen, height.center(), value);
-            }
-        }
-    }
-
-    #[test]
-    fn resized_dialogs_cancel_and_reopen_without_applying_edits() {
-        for (command, title, field, ok, cancel) in [
-            ("app.preferences", "Preferences", "recoveryMinutes", "OK", "Cancel"),
-            ("app.newDocumentDialog", "New Document", "pages", "Create", "Close"),
-        ] {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.run(command, json!({})).unwrap();
-            let original = app.ui.dialog.as_ref().unwrap().fields[field].clone();
-            app.ui.dialog.as_mut().unwrap().fields.insert(field.into(), json!(42));
-            let ctx = dialog_context("en");
-            for size in [egui::vec2(1178.0, 814.0), egui::vec2(392.0, 271.0), egui::vec2(589.0, 407.0)] {
-                let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, size);
-                for _ in 0..3 {
-                    dialog_frame(&mut app, &ctx, screen, vec![]);
-                }
-                let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-                for expected in [title, ok, cancel] {
-                    visible_label(&labels, screen, expected);
-                }
-            }
-            let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(589.0, 407.0));
-            let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-            click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, cancel).center());
-            assert!(app.ui.dialog.is_none());
-            assert!(app.session.active().is_none(), "cancelling must not create a document");
-            app.run(command, json!({})).unwrap();
-            assert_eq!(app.ui.dialog.as_ref().unwrap().fields[field], original, "cancelled edits must not survive reopening");
-            for _ in 0..3 {
-                dialog_frame(&mut app, &ctx, screen, vec![]);
-            }
-            let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
-            visible_label(&labels, screen, title);
-            dialog_frame(
-                &mut app,
-                &ctx,
-                screen,
-                vec![egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE }],
-            );
-            assert!(app.ui.dialog.is_none(), "Escape must also close the reopened dialog");
-        }
-    }
-
-    #[test]
-    fn paragraph_style_options_tabs_section_adds_a_stop_on_its_ruler() {
-        use egui_kittest::kittest::Queryable;
-        let (app, _) = ruled_paragraph();
-        let mut h = crate::test_window::open(app, egui::vec2(1400.0, 900.0));
-        h.state_mut().app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Ruled Child", "section": "tabs"})));
-        h.run_steps(4);
-        h.get_by_label("Clear All");
-        // The ruler sits below the row of alignment buttons; its strip takes the click.
-        let b = h.get_by_label("Right-aligned tab").rect();
-        h.get_by_label("Right-aligned tab").click();
-        h.run_steps(2);
-        let left = h.get_by_label("Left-aligned tab").rect();
-        let at = egui::pos2(left.min.x + crate::panels::tabs::PAD + 100.0, b.max.y + 14.0);
-        crate::test_window::click_at(&mut h, at);
-        let d = h.state().app.ui.dialog.clone().unwrap();
-        let tabs = d.fields.get("p.tabs").cloned().unwrap_or_default();
-        assert_eq!(tabs.as_array().map(Vec::len), Some(1), "{tabs}");
-        assert_eq!(tabs[0]["align"], "right");
-        confirm(&mut h.state_mut().app).unwrap();
-        let app = &mut h.state_mut().app;
-        let style = app.session.execute("type.tabs.get", &json!({"style": "Ruled Child"})).unwrap();
-        assert_eq!(style["tabs"], tabs);
-        assert_eq!(app.session.execute("type.tabs.get", &json!({})).unwrap()["tabs"], tabs, "the paragraph follows its style");
-    }
-
-    #[test]
-    fn parses_command_params() {
-        let f = command_fields("{name, type: custom|lastPageNumber|chapterNumber, text?, rule?: {on, weight}, flag?: bool} — creates");
-        let keys: Vec<&str> = f.iter().map(|f| f.key.as_str()).collect();
-        assert_eq!(keys, ["name", "type", "text", "rule", "flag"]);
-        assert_eq!(f[1].choices, ["custom", "lastPageNumber", "chapterNumber"]);
-        assert!(!f[0].optional && f[2].optional);
-        assert!(f[4].boolean);
-        assert!(command_fields("{}").is_empty());
-        assert!(command_fields("no params").is_empty());
-        // A parenthetical after the key describes the value.
-        let f = command_fields("{angle (degrees, CCW), ids?}");
-        let keys: Vec<&str> = f.iter().map(|f| f.key.as_str()).collect();
-        assert_eq!(keys, ["angle", "ids"]);
-        assert!(!f[0].optional && f[1].optional);
-        assert_eq!(f[0].hint, "degrees, CCW");
-        let f = command_fields("{scaleX? (%), ref?: 0..8, ids?: parent items (default: all)}");
-        let keys: Vec<&str> = f.iter().map(|f| f.key.as_str()).collect();
-        assert_eq!(keys, ["scaleX", "ref", "ids"]);
-        assert!(f.iter().all(|f| f.optional));
-        assert_eq!(f[0].hint, "%");
-        assert_eq!(f[2].hint, "parent items (default: all)");
-        // Every command with a "…" label parses without panicking.
-        for c in designcraft_engine::command_specs() {
-            let _ = command_fields(c.params);
-        }
-    }
-
-    fn test_app() -> crate::DesignApp {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({"pages": 1})).unwrap();
-        app
-    }
-
-    #[test]
-    fn toc_dialog_keeps_the_character_styles_and_sorting_of_its_entries() {
-        let mut app = test_app();
-        app.session.execute("style.paragraph.create", &json!({"name": "Head"})).unwrap();
-        app.session.execute("style.character.create", &json!({"name": "Number"})).unwrap();
-        app.session.execute("style.character.create", &json!({"name": "Dots"})).unwrap();
-        let sid =
-            app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Pears\nApples"})).unwrap()["story"]
-                .clone();
-        app.session.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 8})).unwrap();
-        app.session.execute("style.paragraph.apply", &json!({"name": "Head"})).unwrap();
-        app.session.execute("layout.pages.insert", &json!({"count": 1})).unwrap();
-        let entries = json!([{"style": "Head", "pageNumberStyle": "Number", "separatorStyle": "Dots", "sort": true}]);
-        app.session.execute("toc.generate", &json!({"page": 2, "entries": entries})).unwrap();
-        let before = app.session.active().unwrap().doc.toc.clone().unwrap();
-        // The dialog shows the options, and OK (Replace Existing) writes them back unchanged.
-        open_toc(&mut app);
-        let d = app.ui.dialog.as_ref().unwrap();
-        let row = &toc_rows(d)[0];
-        assert_eq!((row.page_number_style.as_str(), row.separator_style.as_str(), row.sort), ("Number", "Dots", true));
-        let chars: Vec<String> = serde_json::from_value(d.fields["charStyles"].clone()).unwrap();
-        assert_eq!(chars, ["Number", "Dots"], "[None] is the menu's first choice, not a style");
-        let p = toc_params(&app, d);
-        assert_eq!(
-            (&p["entries"][0]["pageNumberStyle"], &p["entries"][0]["separatorStyle"], &p["entries"][0]["sort"]),
-            (&json!("Number"), &json!("Dots"), &json!(true))
-        );
-        confirm(&mut app).expect("OK regenerates the table of contents");
-        let st = app.session.active().unwrap();
-        assert_eq!(st.doc.toc.as_ref().unwrap().entries, before.entries);
-        // [None] and unsorted are left out of the params.
-        let mut d = Dialog::new(TOC, json!({"included": [{"style": "Head", "level": 1, "separator": "^t"}]}));
-        d.fields.insert("replace".into(), json!(true));
-        let p = toc_params(&app, &d);
-        assert!(p["entries"][0].get("pageNumberStyle").is_none() && p["entries"][0].get("sort").is_none(), "{p}");
-    }
-
-    #[test]
-    fn paragraph_style_options_dialog_saves_edits() {
-        let mut app = test_app();
-        let name = app.session.execute("style.paragraph.create", &json!({"name": "Body Copy"})).unwrap()["name"].as_str().unwrap().to_string();
-        app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": name, "p.align": "center"})));
-        confirm(&mut app).expect("OK saves the style edit");
-        let st = app.session.active().unwrap();
-        assert_eq!(st.doc.styles.para(&name).unwrap().para.align, Some(designcraft_doc::Align::Center));
-    }
-
-    #[test]
-    fn delete_paragraph_style_dialog_removes_the_style_and_reassigns_text() {
-        let mut app = test_app();
-        let name = app.session.execute("style.paragraph.create", &json!({"name": "Caption"})).unwrap()["name"].as_str().unwrap().to_string();
-        let sid = app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text"})).unwrap()["story"].as_u64().unwrap();
-        app.session.execute("text.insert", &json!({"text": "Hello"})).unwrap();
-        app.session.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
-        app.session.execute("style.paragraph.apply", &json!({"name": name})).unwrap();
-        app.ui.dialog = Some(Dialog::new("deleteParagraphStyle", json!({"name": name, "replaceWith": designcraft_doc::BASIC_PARAGRAPH})));
-        confirm(&mut app).expect("OK deletes the style");
-        let st = app.session.active().unwrap();
-        assert!(st.doc.styles.para(&name).is_none(), "style removed");
-        let story = st.doc.stories.get(&designcraft_doc::StoryId(sid)).unwrap();
-        assert_eq!(story.paras[0].style, designcraft_doc::BASIC_PARAGRAPH, "text reassigned to the replacement style");
-    }
-
-    #[test]
-    fn delete_paragraph_style_dialog_defaults_replacement_to_basic_paragraph() {
-        let mut app = test_app();
-        let name = app.session.execute("style.paragraph.create", &json!({"name": "Caption"})).unwrap()["name"].as_str().unwrap().to_string();
-        // No `replaceWith` set — the dialog's default field.
-        app.ui.dialog = Some(Dialog::new("deleteParagraphStyle", json!({"name": name})));
-        confirm(&mut app).expect("OK deletes the style with the default replacement");
-        let st = app.session.active().unwrap();
-        assert!(st.doc.styles.para(&name).is_none());
-    }
-
-    #[test]
-    fn character_style_options_dialog_saves_edits() {
-        let mut app = test_app();
-        let name = app.session.execute("style.character.create", &json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
-        app.ui.dialog = Some(Dialog::new("characterStyleOptions", json!({"name": name, "c.tracking": 20.0})));
-        confirm(&mut app).expect("OK saves the style edit");
-        let st = app.session.active().unwrap();
-        assert_eq!(st.doc.styles.char_style(&name).unwrap().chars.tracking, Some(20.0));
-    }
-
-    #[test]
-    fn delete_character_style_dialog_removes_the_style_and_reassigns_text() {
-        let mut app = test_app();
-        let name = app.session.execute("style.character.create", &json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
-        let sid = app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text"})).unwrap()["story"].as_u64().unwrap();
-        app.session.execute("text.insert", &json!({"text": "Hello"})).unwrap();
-        app.session.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 5})).unwrap();
-        app.session.execute("style.character.apply", &json!({"name": name})).unwrap();
-        app.ui.dialog = Some(Dialog::new("deleteCharacterStyle", json!({"name": name, "replaceWith": designcraft_doc::NO_CHAR_STYLE})));
-        confirm(&mut app).expect("OK deletes the style");
-        let st = app.session.active().unwrap();
-        assert!(st.doc.styles.char_style(&name).is_none(), "style removed");
-        let story = st.doc.stories.get(&designcraft_doc::StoryId(sid)).unwrap();
-        assert_eq!(story.chars[0].format.style, designcraft_doc::NO_CHAR_STYLE, "text reassigned to the replacement style");
-    }
-
-    #[test]
-    fn delete_character_style_dialog_defaults_replacement_to_none() {
-        let mut app = test_app();
-        let name = app.session.execute("style.character.create", &json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
-        // No `replaceWith` set — the dialog's default field.
-        app.ui.dialog = Some(Dialog::new("deleteCharacterStyle", json!({"name": name})));
-        confirm(&mut app).expect("OK deletes the style with the default replacement");
-        let st = app.session.active().unwrap();
-        assert!(st.doc.styles.char_style(&name).is_none());
-    }
-
-    #[test]
-    fn pdf_export_defaults() {
-        let d = Dialog::new("pdfExport", json!({}));
-        let keys: Vec<&str> = d.fields.iter().map(|(k, _)| k.as_str()).collect();
-        // serde_json::Map keeps keys sorted.
-        let expected = [
-            "bleed",
-            "compressImages",
-            "flatten",
-            "marksBleed",
-            "marksCrop",
-            "marksOffset",
-            "marksPageInfo",
-            "marksWeight",
-            "preset",
-            "spreads",
-            "standard",
-            "tagged",
-        ];
-        assert_eq!(keys, expected);
-        assert_eq!(d.fields["preset"].as_str(), Some("Desktop Printing"));
-        assert_eq!(d.fields["standard"].as_str(), Some("none"));
-        assert_eq!(d.fields["compressImages"].as_bool(), Some(false));
-        assert_eq!(d.fields["flatten"].as_str(), Some(""));
-        assert_eq!(d.fields["spreads"].as_bool(), Some(false));
-        assert_eq!(d.fields["bleed"].as_bool(), Some(true));
-        assert_eq!(d.fields["marksCrop"].as_bool(), Some(false));
-        assert_eq!(d.fields["marksBleed"].as_bool(), Some(false));
-        assert_eq!(d.fields["marksPageInfo"].as_bool(), Some(false));
-        assert_eq!(d.fields["marksWeight"].as_str(), Some("0.25"));
-        assert_eq!(d.fields["marksOffset"].as_str(), Some("6"));
-        assert_eq!(d.fields["tagged"].as_bool(), Some(true));
-    }
-
-    #[test]
-    fn pdf_export_override_keeps_override() {
-        let d = Dialog::new("pdfExport", json!({"bleed": false}));
-        assert_eq!(d.fields["bleed"].as_bool(), Some(false));
-        assert_eq!(d.fields["preset"].as_str(), Some("Desktop Printing"));
-        assert_eq!(d.fields["tagged"].as_bool(), Some(true));
-    }
-
-    #[test]
-    fn pdf_export_preset_high_quality_print_keeps_flatten() {
-        let mut d = Dialog::new("pdfExport", json!({}));
-        d.fields.insert("flatten".into(), json!("medium"));
-        apply_pdf_preset(&mut d, "Desktop Printing");
-        assert_eq!(d.s("standard"), "none");
-        assert!(!d.b("compressImages"));
-        assert!(!d.b("marksCrop"));
-        assert!(!d.b("marksBleed"));
-        assert!(!d.b("marksPageInfo"));
-        assert_eq!(d.s("flatten"), "medium", "a leave-unchanged preset must not touch flatten");
-    }
-
-    #[test]
-    fn pdf_export_preset_press_quality_keeps_flatten() {
-        let mut d = Dialog::new("pdfExport", json!({}));
-        d.fields.insert("flatten".into(), json!("high"));
-        apply_pdf_preset(&mut d, "Commercial Printing");
-        assert_eq!(d.s("standard"), "none");
-        assert!(d.b("compressImages"));
-        assert!(d.b("marksCrop"));
-        assert!(d.b("marksBleed"));
-        assert!(!d.b("marksPageInfo"));
-        assert_eq!(d.s("flatten"), "high");
-    }
-
-    #[test]
-    fn pdf_export_preset_smallest_file_size_sets_flatten_low() {
-        let mut d = Dialog::new("pdfExport", json!({}));
-        apply_pdf_preset(&mut d, "Screen and Email");
-        assert_eq!(d.s("standard"), "none");
-        assert!(d.b("compressImages"));
-        assert!(!d.b("marksCrop"));
-        assert!(!d.b("marksBleed"));
-        assert!(!d.b("marksPageInfo"));
-        assert_eq!(d.s("flatten"), "low");
-    }
-
-    #[test]
-    fn pdf_export_preset_pdf_x4_keeps_flatten() {
-        let mut d = Dialog::new("pdfExport", json!({}));
-        d.fields.insert("flatten".into(), json!("medium"));
-        apply_pdf_preset(&mut d, "PDF/X-4");
-        assert_eq!(d.s("standard"), "x4");
-        assert!(!d.b("compressImages"));
-        assert!(d.b("marksCrop"));
-        assert!(d.b("marksBleed"));
-        assert!(!d.b("marksPageInfo"));
-        assert_eq!(d.s("flatten"), "medium");
-    }
-
-    #[test]
-    fn pdf_export_preset_pdf_a2b_keeps_flatten() {
-        let mut d = Dialog::new("pdfExport", json!({}));
-        d.fields.insert("flatten".into(), json!("low"));
-        apply_pdf_preset(&mut d, "PDF/A-2b");
-        assert_eq!(d.s("standard"), "a2b");
-        assert!(!d.b("compressImages"));
-        assert!(!d.b("marksCrop"));
-        assert!(!d.b("marksBleed"));
-        assert!(!d.b("marksPageInfo"));
-        assert_eq!(d.s("flatten"), "low");
-    }
-
-    #[test]
-    fn open_pdf_export_seeds_fields_from_settings() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.ui.pdf_export.standard = "x4".into();
-        app.ui.pdf_export.tagged = false;
-        app.ui.pdf_export.marks_crop = true;
-        app.ui.pdf_export.flatten = String::new();
-        app.ui.flattener = "medium".into();
-        open_pdf_export(&mut app);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!(d.id, "pdfExport");
-        assert_eq!(d.s("standard"), "x4");
-        assert!(!d.b("tagged"));
-        assert!(d.b("marksCrop"));
-        assert_eq!(d.s("pages"), "all");
-        assert_eq!(d.s("flatten"), "medium", "empty flatten falls back to the global flattener");
-        assert_eq!(d.s("title"), "", "no document → empty title");
-
-        // A non-empty persisted flatten is used verbatim, not the global fallback.
-        app.ui.pdf_export.flatten = "low".into();
-        app.ui.flattener = "medium".into();
-        open_pdf_export(&mut app);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!(d.s("flatten"), "low");
-    }
-
-    #[test]
-    fn pdf_export_preset_custom_changes_nothing() {
-        let mut d = Dialog::new("pdfExport", json!({}));
-        d.fields.insert("standard".into(), json!("x4"));
-        d.fields.insert("compressImages".into(), json!(true));
-        d.fields.insert("marksCrop".into(), json!(true));
-        d.fields.insert("marksBleed".into(), json!(true));
-        d.fields.insert("marksPageInfo".into(), json!(true));
-        d.fields.insert("flatten".into(), json!("high"));
-        let before = d.fields.clone();
-        apply_pdf_preset(&mut d, "Custom");
-        assert_eq!(d.fields, before);
-    }
-
-    #[test]
-    fn confirm_pdf_export_writes_file_and_persists_settings() {
-        use std::sync::{Arc, Mutex};
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let writes: Arc<Mutex<Vec<(String, Vec<u8>)>>> = Arc::new(Mutex::new(Vec::new()));
-        let sink = writes.clone();
-        app.services.write = Some(Box::new(move |path: &str, bytes: &[u8]| {
-            sink.lock().unwrap().push((path.to_string(), bytes.to_vec()));
-            Ok(())
-        }));
-        app.services.pick_save = Some(Box::new(|_name: &str| Some("/tmp/designcraft-test.pdf".to_string())));
-
-        app.ui.dialog = Some(Dialog::new("pdfExport", json!({})));
-        {
-            let d = app.ui.dialog.as_mut().unwrap();
-            d.fields.insert("standard".into(), json!("x4"));
-            d.fields.insert("bleed".into(), json!(false));
-            d.fields.insert("marksCrop".into(), json!(true));
-            d.fields.insert("tagged".into(), json!(false));
-            d.fields.insert("title".into(), json!("Report"));
-        }
-        confirm(&mut app).unwrap();
-
-        let got = writes.lock().unwrap();
-        assert_eq!(got.len(), 1, "confirming the dialog writes exactly one file");
-        assert_eq!(got[0].0, "/tmp/designcraft-test.pdf");
-        assert!(got[0].1.starts_with(b"%PDF"), "the written bytes are a PDF");
-        drop(got);
-
-        assert_eq!(app.ui.pdf_export.standard, "x4");
-        assert!(!app.ui.pdf_export.bleed);
-        assert!(app.ui.pdf_export.marks_crop);
-        assert!(!app.ui.pdf_export.tagged);
-    }
-
-    #[test]
-    fn update_link_asks_before_replacing_edits_made_in_the_layout() {
-        let dir = std::env::temp_dir().join(format!("dc-update-link-dialog-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("note.txt");
-        std::fs::write(&path, "One").unwrap();
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let r = app.session.execute("file.place", &json!({"path": path.to_string_lossy(), "link": true, "rect": [72, 72, 300, 200]})).unwrap();
-        let sid = r["story"].as_u64().unwrap();
-        let text = |app: &crate::DesignApp| app.session.doc().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().text.clone();
-
-        // Not edited in the layout: updates without asking.
-        std::fs::write(&path, "Two").unwrap();
-        crate::panels::properties::update_links(&mut app, json!({"story": sid}));
-        assert!(app.ui.dialog.is_none());
-        assert_eq!(text(&app), "Two");
-
-        // Edited in the layout: asks first; Cancel changes nothing.
-        app.session.execute("story.setText", &json!({"story": sid, "text": "Mine"})).unwrap();
-        std::fs::write(&path, "Three").unwrap();
-        crate::panels::properties::update_links(&mut app, json!({"story": sid}));
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!((d.id.as_str(), d.s("files").as_str()), ("updateLink", "note.txt"));
-        app.ui.dialog = None;
-        assert_eq!(text(&app), "Mine");
-
-        // Window › Links › Update Link (all links) asks too; confirming updates.
-        crate::menus::activate(&mut app, "links.update", &Value::Null);
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("updateLink"));
-        confirm(&mut app).unwrap();
-        assert!(app.ui.dialog.is_none());
-        assert_eq!(text(&app), "Three");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn confirm_pdf_export_cancelled_save_writes_nothing() {
-        use std::sync::{Arc, Mutex};
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let writes: Arc<Mutex<Vec<(String, Vec<u8>)>>> = Arc::new(Mutex::new(Vec::new()));
-        let sink = writes.clone();
-        app.services.write = Some(Box::new(move |path: &str, bytes: &[u8]| {
-            sink.lock().unwrap().push((path.to_string(), bytes.to_vec()));
-            Ok(())
-        }));
-        app.services.pick_save = Some(Box::new(|_name: &str| None));
-
-        app.ui.dialog = Some(Dialog::new("pdfExport", json!({})));
-        let r = confirm(&mut app).unwrap();
-        assert_eq!(r, Value::Null);
-        assert!(writes.lock().unwrap().is_empty(), "cancelling the save picker must not write");
-    }
-
-    use designcraft_doc::{CharAttrs, CharacterStyle};
-
-    /// A document with character styles Base (bold) and Emphasis (italic) on the first two letters.
-    fn styled_app() -> DesignApp {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("style.character.create", json!({"name": "Base", "chars": {"fontStyle": "Bold"}})).unwrap();
-        app.run("style.character.create", json!({"name": "Emphasis", "chars": {"fontStyle": "Italic"}})).unwrap();
-        let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hi there"})).unwrap();
-        app.run("text.select", json!({"story": r["story"], "anchor": 0, "focus": 2})).unwrap();
-        app.run("style.character.apply", json!({"name": "Emphasis"})).unwrap();
-        app
-    }
-
-    /// One control-channel request, as the control port or MCP would send it.
-    fn ctl(app: &mut DesignApp, method: &str, params: Value) -> Value {
-        let (req, _reply) = crate::control::ControlRequest::new(method, params);
-        match crate::control::handle(app, &egui::Context::default(), &req) {
-            crate::control::Outcome::Done(v) => v,
-            crate::control::Outcome::Screenshot { .. } => Value::Null,
-        }
-    }
-
-    fn char_style(app: &DesignApp, name: &str) -> Option<CharacterStyle> {
-        app.session.active().and_then(|st| st.doc.styles.char_style(name).cloned())
-    }
-
-    #[test]
-    fn character_style_options_set_exactly_the_edited_attributes() {
-        let mut app = styled_app();
-        assert_eq!(ctl(&mut app, "ui.dialog.open", json!({"id": "characterStyleOptions", "fields": {"name": "Emphasis"}}))["ok"], true);
-        ctl(&mut app, "ui.dialog.set", json!({"field": "c.size", "value": 14}));
-        ctl(&mut app, "ui.dialog.set", json!({"field": "c.fill", "value": "[Paper]"}));
-        ctl(&mut app, "ui.dialog.set", json!({"field": "basedOn", "value": "Base"}));
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
-        assert!(app.ui.dialog.is_none());
-        let st = char_style(&app, "Emphasis").unwrap();
-        assert_eq!(st.based_on.as_deref(), Some("Base"));
-        assert_eq!(st.chars, CharAttrs { font_style: Some("Italic".into()), size: Some(14.0), fill: Some("[Paper]".into()), ..Default::default() });
-    }
-
-    #[test]
-    fn character_style_options_unset_cleared_fields_and_rename_every_use() {
-        let mut app = styled_app();
-        ctl(&mut app, "ui.dialog.open", json!({"id": "characterStyleOptions", "fields": {"name": "Emphasis"}}));
-        ctl(&mut app, "ui.dialog.set", json!({"field": "c.fontStyle", "value": null}));
-        ctl(&mut app, "ui.dialog.set", json!({"field": "rename", "value": "Strong"}));
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
-        assert!(char_style(&app, "Emphasis").is_none());
-        assert!(char_style(&app, "Strong").unwrap().chars.is_empty());
-        let st = app.session.active().unwrap();
-        let story = st.doc.stories.values().next().unwrap();
-        assert!(story.chars.iter().any(|r| r.format.style == "Strong"));
-        // A taken name keeps the dialog open with the reason.
-        ctl(&mut app, "ui.dialog.open", json!({"id": "characterStyleOptions", "fields": {"name": "Strong"}}));
-        ctl(&mut app, "ui.dialog.set", json!({"field": "rename", "value": "Base"}));
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], false);
-        assert!(app.ui.dialog.as_ref().is_some_and(|d| !d.s("status").is_empty()));
-        assert!(char_style(&app, "Strong").is_some());
-    }
-
-    #[test]
-    fn new_character_style_opens_its_options_and_creates_the_style() {
-        let mut app = styled_app();
-        crate::menus::activate(&mut app, "style.character.create", &Value::Null);
-        let d = app.ui.dialog.clone().unwrap();
-        assert_eq!((d.id.as_str(), d.b("new"), d.s("rename").as_str()), ("characterStyleOptions", true, "Character Style 1"));
-        ctl(&mut app, "ui.dialog.set", json!({"field": "c.size", "value": 9}));
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
-        let st = char_style(&app, "Character Style 1").unwrap();
-        assert_eq!((st.based_on, st.chars), (None, CharAttrs { size: Some(9.0), ..Default::default() }));
-        crate::menus::activate(&mut app, "style.character.create", &Value::Null);
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("rename"), "Character Style 2");
-    }
-
-    #[test]
-    fn new_paragraph_style_opens_its_options_and_creates_the_style() {
-        let mut app = styled_app();
-        crate::menus::activate(&mut app, "style.paragraph.create", &Value::Null);
-        let d = app.ui.dialog.clone().unwrap();
-        assert_eq!((d.id.as_str(), d.b("new"), d.s("rename").as_str()), ("paragraphStyleOptions", true, "Paragraph Style 1"));
-        ctl(&mut app, "ui.dialog.set", json!({"field": "c.size", "value": 20}));
-        ctl(&mut app, "ui.dialog.set", json!({"field": "basedOn", "value": designcraft_doc::BASIC_PARAGRAPH}));
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
-        let st = app.session.active().unwrap().doc.styles.para("Paragraph Style 1").cloned().unwrap();
-        assert_eq!(st.based_on.as_deref(), Some(designcraft_doc::BASIC_PARAGRAPH));
-        assert_eq!(st.chars, CharAttrs { size: Some(20.0), ..Default::default() });
-    }
-
-    #[test]
-    fn style_rows_open_their_options_except_none() {
-        let mut app = styled_app();
-        open_style_options(&mut app, false, "Emphasis");
-        let d = app.ui.dialog.take().unwrap();
-        assert_eq!((d.id.as_str(), d.s("name").as_str()), ("characterStyleOptions", "Emphasis"));
-        open_style_options(&mut app, false, designcraft_doc::NO_CHAR_STYLE);
-        assert!(app.ui.dialog.is_none());
-        open_style_options(&mut app, true, designcraft_doc::BASIC_PARAGRAPH);
-        assert_eq!(app.ui.dialog.take().unwrap().id, "paragraphStyleOptions");
-    }
-
-    #[test]
-    fn style_options_sections_draw() {
-        let mut app = styled_app();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut DesignApp| {
-            for _ in 0..2 {
-                let raw = egui::RawInput {
-                    screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1440.0, 900.0))),
-                    max_texture_side: Some(8192),
-                    ..Default::default()
-                };
-                let mut out = ctx.run_ui(raw, |ui| {
-                    app.logic(&ui.ctx().clone());
-                    app.ui(ui);
-                });
-                out.textures_delta.clear();
-            }
-        };
-        for lang in ["", "ar"] {
-            app.run("app.language", json!({"lang": lang})).unwrap();
-            for fields in [json!({"name": "Emphasis"}), json!({"new": true}), json!({"name": "Emphasis", "c.size": null, "c.underline": false})] {
-                for section in ["general", "chars", "advanced", "color", "openType", "underline", "strikethrough"] {
-                    let mut f = fields.clone();
-                    f["section"] = json!(section);
-                    app.ui.dialog = Some(Dialog::new("characterStyleOptions", f));
-                    frame(&mut app);
-                    assert!(app.ui.dialog.is_some(), "{section} stays open");
-                }
-            }
-            for section in
-                ["general", "chars", "advanced", "border", "shading", "keep", "span", "bullets", "color", "openType", "underline", "strikethrough"]
-            {
-                for fields in [
-                    json!({"new": true}),
-                    json!({"new": true, "p.listType": "bullets", "p.spanColumns": {"kind": "span", "columns": 0}, "p.borderOn": true}),
-                    json!({"new": true, "p.listType": "numbers", "p.startAt": 1, "p.spanColumns": {"kind": "split", "columns": 2}, "p.keepLinesTogether": true}),
-                ] {
-                    let mut f = fields;
-                    f["section"] = json!(section);
-                    app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", f));
-                    frame(&mut app);
-                    assert!(app.ui.dialog.is_some(), "{section} stays open");
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn shortcut_recorder_waits_for_the_key_after_its_modifiers() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let mut d = Dialog::new("keyboardShortcuts", json!({"query": "", "recording": "app.palette"}));
-        let ctx = egui::Context::default();
-        let key = |key, modifiers| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers };
-        // Holding Ctrl reports Ctrl itself as a key press, then Ctrl+K arrives.
-        for event in [key(egui::Key::ControlLeft, egui::Modifiers::COMMAND), key(egui::Key::K, egui::Modifiers::COMMAND)] {
-            let input = egui::RawInput { events: vec![event], ..Default::default() };
-            ctx.run_ui(input, |ui| keyboard_shortcuts(&mut app, ui, &mut d)).textures_delta.clear();
-        }
-        assert_eq!(crate::menus::shortcut_of(&app, "app.palette").as_deref(), Some("Cmd+K"));
-        assert_eq!(d.s("recording"), "", "recording ends with the recorded shortcut");
-    }
-
-    #[test]
-    fn dragging_the_title_moves_the_dialog_and_dragging_the_body_does_not() {
-        use egui::{Event, Modifiers, PointerButton, Pos2, vec2};
-        use egui_kittest::{Harness, kittest::Queryable};
-        fn drag(h: &mut Harness<'static, DesignApp>, from: Pos2, to: Pos2) {
-            h.event(Event::PointerMoved(from));
-            h.run_steps(1);
-            h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-            h.run_steps(1);
-            for step in 1..=8 {
-                h.event(Event::PointerMoved(from + (to - from) * (step as f32 / 8.0)));
-                h.run_steps(1);
-            }
-            h.event(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-            h.run_steps(3);
-        }
-        let rect = |h: &Harness<'static, DesignApp>| h.ctx.memory(|m| m.area_rect(egui::Id::new("dialog"))).unwrap();
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.ui.dialog = Some(Dialog::new("insertTable", Value::Null));
-        let mut ready = false;
-        let mut h = Harness::builder().with_size(vec2(1200.0, 800.0)).with_step_dt(1.0 / 60.0).build_ui_state(
-            move |ui, app: &mut DesignApp| {
-                if !ready {
-                    crate::theme::install_fonts(ui.ctx(), &app.ui.language);
-                    crate::theme::apply(ui.ctx(), &crate::theme::Tokens::for_brightness(crate::theme::Brightness::default()));
-                    ready = true;
-                    return;
-                }
-                show(app, ui.ctx());
-            },
-            app,
-        );
-        h.run_steps(4);
-        let centred = rect(&h);
-        assert!((centred.center() - egui::pos2(600.0, 400.0)).length() < 1.0, "{centred:?}");
-        assert!(centred.width() < 1000.0 && centred.height() < 700.0, "the area is the dialog, not the backdrop: {centred:?}");
-
-        let title = h.get_by_label("Create Table").rect().center();
-        drag(&mut h, title, title + vec2(100.0, 60.0));
-        let moved = rect(&h);
-        assert!((moved.min - centred.min - vec2(100.0, 60.0)).length() < 2.0, "{centred:?} -> {moved:?}");
-
-        let body = egui::pos2(moved.right() - 40.0, moved.center().y);
-        drag(&mut h, body, body + vec2(-150.0, 80.0));
-        assert_eq!(rect(&h), moved, "a drag in the body leaves the dialog in place");
-
-        // The title row stays inside the top edge.
-        let title = h.get_by_label("Create Table").rect().center();
-        drag(&mut h, title, title - vec2(0.0, 1000.0));
-        assert!(rect(&h).top().abs() < 1.0, "{:?}", rect(&h));
-
-        // Opened again, the dialog starts centred.
-        h.state_mut().ui.dialog = None;
-        h.run_steps(2);
-        h.state_mut().ui.dialog = Some(Dialog::new("insertTable", Value::Null));
-        h.run_steps(4);
-        assert!((rect(&h).center() - centred.center()).length() < 1.0, "{:?}", rect(&h));
-
-        // Past the left edge, about 100 px of the title row stays inside.
-        let title = h.get_by_label("Create Table").rect().center();
-        drag(&mut h, title, title - vec2(900.0, 0.0));
-        assert!((rect(&h).right() - 100.0).abs() < 2.0, "{:?}", rect(&h));
-    }
-
-    #[test]
-    fn the_new_document_window_drags_mostly_aside_and_keeps_its_preview() {
-        use egui::{Event, Modifiers, PointerButton, vec2};
-        use egui_kittest::{Harness, kittest::Queryable};
-        let rect = |h: &Harness<'static, DesignApp>| h.ctx.memory(|m| m.area_rect(egui::Id::new("dialog"))).unwrap();
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"title": "A"})).unwrap();
-        app.ui.new_document_preview = true;
-        app.run("app.newDocumentDialog", json!({})).unwrap();
-        let mut ready = false;
-        let mut h = Harness::builder().with_size(vec2(1400.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(
-            move |ui, app: &mut DesignApp| {
-                if !ready {
-                    crate::theme::install_fonts(ui.ctx(), &app.ui.language);
-                    crate::theme::apply(ui.ctx(), &crate::theme::Tokens::for_brightness(crate::theme::Brightness::default()));
-                    ready = true;
-                    return;
-                }
-                show(app, ui.ctx());
-            },
-            app,
-        );
-        h.run_steps(6);
-        let preview = h.state().session.new_document_preview();
-        assert!(preview.is_some(), "Preview is on");
-        let centred = rect(&h);
-        assert!(centred.width() > 900.0, "{centred:?}");
-        let from = h.get_all_by_label("New Document").map(|n| n.rect().center()).min_by(|a, b| a.y.total_cmp(&b.y)).unwrap();
-        let to = from + vec2(1300.0, 0.0);
-        h.event(Event::PointerMoved(from));
-        h.run_steps(1);
-        h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-        h.run_steps(1);
-        for step in 1..=8 {
-            h.event(Event::PointerMoved(from + (to - from) * (step as f32 / 8.0)));
-            h.run_steps(1);
-        }
-        h.event(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-        h.run_steps(3);
-        // All but 100 px of the window's width is past the right edge, over the preview.
-        assert!((rect(&h).left() - 1300.0).abs() < 2.0, "{:?}", rect(&h));
-        let app = h.state();
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("newDocument"));
-        assert_eq!(app.session.new_document_preview(), preview, "moving the window keeps the preview");
-        assert_eq!(app.session.documents().len(), 2);
-    }
-
-    #[test]
-    fn margins_dialog_reads_bare_numbers_in_the_ruler_unit() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("document.preferences", json!({"horizontalUnits": "millimeters"})).unwrap();
-        crate::menus::activate(&mut app, "layout.marginsAndColumns", &Value::Null);
-        for k in ["marginTop", "marginBottom", "marginInside", "marginOutside"] {
-            ctl(&mut app, "ui.dialog.set", json!({"field": k, "value": "15"}));
-        }
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
-        let top = app.session.active().unwrap().doc.page(0).unwrap().margins.top;
-        assert!((top - 15.0 * 72.0 / 25.4).abs() < 0.01, "top margin was {top} pt");
-    }
-    fn facing_app(pages: u64) -> DesignApp {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": pages, "facingPages": true})).unwrap();
-        app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0)));
-        app
-    }
-
-    fn guide_counts(app: &DesignApp) -> Vec<usize> {
-        let doc = &app.session.active().unwrap().doc;
-        (0..doc.page_count()).map(|abs| doc.page(abs).unwrap().guides.len()).collect()
-    }
-
-    #[test]
-    fn create_guides_dialog_targets_the_page_in_view() {
-        let mut app = facing_app(6);
-        crate::canvas::go_to_page(&mut app, 4);
-        crate::menus::activate(&mut app, "layout.createGuides", &Value::Null);
-        ctl(&mut app, "ui.dialog.set", json!({"field": "columns", "value": "3"}));
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
-        assert_eq!(guide_counts(&app), vec![0, 0, 0, 0, 4, 0]);
-        // "Both pages of the spread" covers the facing pair.
-        crate::canvas::go_to_page(&mut app, 1);
-        crate::menus::activate(&mut app, "layout.createGuides", &Value::Null);
-        ctl(&mut app, "ui.dialog.set", json!({"field": "columns", "value": "2"}));
-        ctl(&mut app, "ui.dialog.set", json!({"field": "target", "value": "spread"}));
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
-        assert_eq!(guide_counts(&app), vec![0, 2, 2, 0, 4, 0]);
-    }
-
-    #[test]
-    fn parent_dialogs_cover_both_pages_of_the_parent_spread_by_default() {
-        let mut app = facing_app(4);
-        app.run("layout.parents.edit", json!({"on": true})).unwrap();
-        crate::menus::activate(&mut app, "layout.marginsAndColumns", &Value::Null);
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("target"), "spread");
-        for k in ["marginTop", "marginBottom", "marginInside", "marginOutside"] {
-            ctl(&mut app, "ui.dialog.set", json!({"field": k, "value": "20 pt"}));
-        }
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
-        crate::menus::activate(&mut app, "layout.createGuides", &Value::Null);
-        ctl(&mut app, "ui.dialog.set", json!({"field": "columns", "value": "2"}));
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
-        let doc = &app.session.active().unwrap().doc;
-        for pg in &doc.parents[0].pages {
-            assert_eq!((pg.margins.top, pg.margins.outside, pg.guides.len()), (20.0, 20.0, 2));
-        }
-        // Every document page shows the parent's guides.
-        assert!((0..doc.page_count()).all(|abs| doc.inherited_guides(abs).len() == 2));
-    }
-
-    #[test]
-    fn other_dialogs_keep_reading_bare_numbers_as_picas() {
-        let mut app = facing_app(2);
-        app.run("document.preferences", json!({"horizontalUnits": "millimeters"})).unwrap();
-        app.ui.dialog = Some(Dialog::new("newDocument", json!({"width": "15"})));
-        assert_eq!(app.ui.dialog.as_ref().unwrap().m("width"), Some(180.0));
-    }
-    #[test]
-    fn character_style_options_set_the_digits() {
-        let mut app = styled_app();
-        ctl(&mut app, "ui.dialog.open", json!({"id": "characterStyleOptions", "fields": {"name": "Emphasis"}}));
-        ctl(&mut app, "ui.dialog.set", json!({"field": "c.digits", "value": "farsi"}));
-        assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
-        assert_eq!(char_style(&app, "Emphasis").unwrap().chars.digits, Some(designcraft_doc::Digits::Farsi));
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/dialogs/options.rs b/crates/ui-egui/src/dialogs/options.rs
index d8aba2bea..191436fa4 100644
--- a/crates/ui-egui/src/dialogs/options.rs
+++ b/crates/ui-egui/src/dialogs/options.rs
@@ -3,7 +3,7 @@
 use designcraft_color::{Color, ColorType, SwatchValue};
 use serde_json::{Map, Value, json};
 
-use super::{Dialog, check, text_field};
+use super::{Dialog, check, text_field_named};
 use crate::DesignApp;
 use crate::i18n::tr;
 
@@ -94,10 +94,15 @@ fn caption(ui: &mut egui::Ui, lang: &str, s: &str) {
     crate::rtl::label(ui, tr(lang, s));
 }
 
+/// Render a labelled, bounded colour-channel spinner, name it for accessibility and write changed values to dialog fields.
 fn channel(ui: &mut egui::Ui, d: &mut Dialog, key: &str, label: &str, max: f64, suffix: &str) {
     ui.label(egui::RichText::new(label).monospace());
     let mut v = d.n(key).unwrap_or(0.0);
-    if ui.add(egui::DragValue::new(&mut v).range(0.0..=max).speed(0.5).max_decimals(1).suffix(suffix)).changed() {
+    let resp = ui.add(egui::DragValue::new(&mut v).range(0.0..=max).speed(0.5).max_decimals(1).suffix(suffix));
+    let changed = resp.changed();
+    // The channel name is a painted label beside a bare spinner: name the spinner too.
+    let _ = resp.accessible_name(label.to_owned());
+    if changed {
         d.fields.insert(key.into(), json!(v));
     }
     ui.end_row();
@@ -112,7 +117,7 @@ pub fn swatch_options(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
     }
     egui::Grid::new("swatch_options").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
         caption(ui, lang, "Swatch Name:");
-        ui.add_enabled_ui(!d.b("locked") && !auto, |ui| text_field(ui, d, "swatchName", 220.0));
+        ui.add_enabled_ui(!d.b("locked") && !auto, |ui| text_field_named(ui, d, "swatchName", 220.0, tr(lang, "Swatch Name")));
         ui.end_row();
     });
     if kind == "color" {
@@ -125,7 +130,7 @@ pub fn swatch_options(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
                 if kind == "color" {
                     caption(ui, lang, "Color Type:");
                     let cur = d.s("colorType");
-                    egui::ComboBox::from_id_salt("swatch_color_type")
+                    let combo = craft_ui::ComboBox::from_id_salt("swatch_color_type")
                         .selected_text(crate::rtl::widget(ui, tr(lang, if cur == "spot" { "Spot" } else { "Process" })))
                         .show_ui(ui, |ui| {
                             for (v, l) in [("process", "Process"), ("spot", "Spot")] {
@@ -134,6 +139,7 @@ pub fn swatch_options(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
                                 }
                             }
                         });
+                    let _ = crate::widgets::name_combo(combo, tr(lang, "Color Type"));
                     ui.end_row();
                 }
                 caption(ui, lang, "Color Mode:");
@@ -143,16 +149,19 @@ pub fn swatch_options(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
                     "gray" => "Gray",
                     _ => "CMYK",
                 };
-                egui::ComboBox::from_id_salt("swatch_color_mode").selected_text(crate::rtl::widget(ui, tr(lang, label(&cur)))).show_ui(ui, |ui| {
-                    for m in ["cmyk", "rgb", "gray"] {
-                        if ui.selectable_label(cur == m, crate::rtl::widget(ui, tr(lang, label(m)))).clicked()
-                            && cur != m
-                            && let Some(c) = dialog_color(&d.fields)
-                        {
-                            set_color(&mut d.fields, c, Some(m));
+                let combo = craft_ui::ComboBox::from_id_salt("swatch_color_mode")
+                    .selected_text(crate::rtl::widget(ui, tr(lang, label(&cur))))
+                    .show_ui(ui, |ui| {
+                        for m in ["cmyk", "rgb", "gray"] {
+                            if ui.selectable_label(cur == m, crate::rtl::widget(ui, tr(lang, label(m)))).clicked()
+                                && cur != m
+                                && let Some(c) = dialog_color(&d.fields)
+                            {
+                                set_color(&mut d.fields, c, Some(m));
+                            }
                         }
-                    }
-                });
+                    });
+                let _ = crate::widgets::name_combo(combo, tr(lang, "Color Mode"));
                 ui.end_row();
                 match d.s("mode").as_str() {
                     "rgb" => {
@@ -182,7 +191,7 @@ pub fn swatch_options(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
                 ui.end_row();
                 caption(ui, lang, "Tint:");
                 let mut v = d.n("tint").unwrap_or(100.0);
-                if ui.add(egui::Slider::new(&mut v, 0.0..=100.0).suffix("%").integer()).changed() {
+                if ui.add(egui::Slider::new(&mut v, 0.0..=100.0).suffix("%").integer()).accessible_name(tr(lang, "Tint")).changed() {
                     d.fields.insert("tint".into(), json!(v));
                 }
                 ui.end_row();
@@ -239,7 +248,7 @@ pub fn open_color_group_options(app: &mut DesignApp, name: &str) -> Result<(), S
 pub fn color_group_options(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
     ui.horizontal(|ui| {
         caption(ui, &app.ui.language, "Name:");
-        text_field(ui, d, "groupName", 220.0);
+        text_field_named(ui, d, "groupName", 220.0, tr(&app.ui.language, "Name"));
     });
     status(ui, d);
 }
@@ -269,11 +278,11 @@ pub fn layer_options(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
     let named = designcraft_doc::LAYER_COLORS.iter().find(|(_, c)| *c == rgb).map(|(n, _)| *n);
     egui::Grid::new("layer_options").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
         caption(ui, lang, "Name:");
-        text_field(ui, d, "name", 220.0);
+        text_field_named(ui, d, "name", 220.0, tr(lang, "Name"));
         ui.end_row();
         caption(ui, lang, "Color:");
         ui.horizontal(|ui| {
-            egui::ComboBox::from_id_salt("layer_color")
+            let combo = craft_ui::ComboBox::from_id_salt("layer_color")
                 .selected_text(crate::rtl::widget(ui, tr(lang, named.unwrap_or("Custom"))))
                 .width(140.0)
                 .show_ui(ui, |ui| {
@@ -287,6 +296,7 @@ pub fn layer_options(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
                         }
                     }
                 });
+            let _ = crate::widgets::name_combo(combo, tr(lang, "Color"));
             super::color_field(ui, d, "rgb");
         });
         ui.end_row();
@@ -326,7 +336,7 @@ mod tests {
         let mut h = Harness::builder().with_size(vec2(360.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(
             move |ui, app: &mut DesignApp| {
                 // The fonts are installed before the first frame that draws.
-                let id = egui::Id::new("test_fonts");
+                let id = egui::Id::unique("test_fonts");
                 if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
                     crate::theme::install_fonts(ui.ctx(), "");
                     ui.data_mut(|d| d.insert_temp(id, true));
diff --git a/crates/ui-egui/src/dialogs/style_cjk.rs b/crates/ui-egui/src/dialogs/style_cjk.rs
index 674cf44a7..acb6a6bc7 100644
--- a/crates/ui-egui/src/dialogs/style_cjk.rs
+++ b/crates/ui-egui/src/dialogs/style_cjk.rs
@@ -143,33 +143,40 @@ fn font_fields(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog, cf: &Char
     };
     crate::rtl::label(ui, tr(lang, "Font Family:"));
     ui.add_enabled_ui(enabled, |ui| {
-        egui::ComboBox::from_id_salt(("cjkfam", fam_key))
+        let picked = craft_ui::ComboBox::from_id_salt(("cjkfam", fam_key))
             .selected_text(shown)
             .width(200.0)
             .height(440.0)
             .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
-            .show_ui(ui, |ui| {
-                if cf.sparse && ui.selectable_label(raw.is_null(), " ").clicked() {
-                    cf.set(d, fam_key, Value::Null);
-                    cf.set(d, style_key, Value::Null);
-                }
-                if ui.selectable_label(!raw.is_null() && fam.is_empty(), crate::rtl::widget(ui, parent.as_str())).clicked() {
-                    cf.set(d, fam_key, json!(""));
-                    cf.set(d, style_key, json!(""));
-                }
-                if let Some(f) = crate::panels::font_menu_body(app, ui, &menu, &fam, 200.0) {
-                    cf.set(d, fam_key, json!(f.family));
-                    if let Some(style) = f.style {
-                        cf.set(d, style_key, json!(style));
+            .show_ui_with_header(
+                ui,
+                |ui| {
+                    if cf.sparse && ui.selectable_label(raw.is_null(), " ").clicked() {
+                        cf.set(d, fam_key, Value::Null);
+                        cf.set(d, style_key, Value::Null);
                     }
-                }
-            });
+                    if ui.selectable_label(!raw.is_null() && fam.is_empty(), crate::rtl::widget(ui, parent.as_str())).clicked() {
+                        cf.set(d, fam_key, json!(""));
+                        cf.set(d, style_key, json!(""));
+                    }
+                    crate::panels::font_menu_header(app, ui, &menu, &fam, 200.0)
+                },
+                crate::panels::font_menu_list,
+            )
+            .inner
+            .flatten();
+        if let Some(f) = picked {
+            cf.set(d, fam_key, json!(f.family));
+            if let Some(style) = f.style {
+                cf.set(d, style_key, json!(style));
+            }
+        }
     });
     ui.end_row();
     crate::rtl::label(ui, tr(lang, "Font Style:"));
     let sty = cf.get(d, style_key).as_str().unwrap_or("").to_string();
     ui.add_enabled_ui(enabled && !fam.is_empty(), |ui| {
-        egui::ComboBox::from_id_salt(("cjksty", style_key)).selected_text(&sty).width(200.0).show_ui(ui, |ui| {
+        craft_ui::ComboBox::from_id_salt(("cjksty", style_key)).selected_text(&sty).width(200.0).show_ui(ui, |ui| {
             for s in fonts.styles(&fam) {
                 if ui.selectable_label(s == sty, &s).clicked() {
                     cf.set(d, style_key, json!(s));
@@ -527,7 +534,7 @@ fn kenten(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog, cf: &CharField
             Some(false) => tr(lang, "None").to_string(),
             Some(true) => tr(lang, kenten_label(kind)).to_string(),
         };
-        egui::ComboBox::from_id_salt("cjkkententype").selected_text(crate::rtl::widget(ui, shown)).width(200.0).show_ui(ui, |ui| {
+        craft_ui::ComboBox::from_id_salt("cjkkententype").selected_text(crate::rtl::widget(ui, shown)).width(200.0).show_ui(ui, |ui| {
             if cf.sparse && ui.selectable_label(on.is_none(), " ").clicked() {
                 for key in ["kenten", "kentenKind", "kentenCharacter"] {
                     cf.set(d, key, Value::Null);
@@ -654,7 +661,7 @@ fn para_value(d: &Dialog, pv: &Value, key: &str) -> Value {
 /// A paragraph attribute from `opts` (value, label); `current` is the value shown.
 fn para_choice(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, key: &str, current: &str, opts: &[(&str, &str)]) {
     let shown = opts.iter().find(|o| o.0 == current).map_or("", |o| crate::i18n::tr(lang, o.1));
-    egui::ComboBox::from_id_salt(("cjkp", key)).selected_text(crate::rtl::widget(ui, shown)).width(220.0).show_ui(ui, |ui| {
+    craft_ui::ComboBox::from_id_salt(("cjkp", key)).selected_text(crate::rtl::widget(ui, shown)).width(220.0).show_ui(ui, |ui| {
         for (v, label) in opts {
             if ui.selectable_label(*v == current, crate::rtl::widget(ui, crate::i18n::tr(lang, label))).clicked() {
                 d.fields.insert(format!("p.{key}"), json!(v));
@@ -731,7 +738,7 @@ fn japanese_composition(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, cf: &Char
         // `null`: no set given, so the composer's default rules apply.
         let name = para_value(d, pv, "kinsoku").get("name").and_then(Value::as_str).map(str::to_string);
         let shown = name.as_deref().map_or_else(|| crate::i18n::tr(lang, "Default Rules").to_string(), |n| kinsoku_label(lang, n));
-        egui::ComboBox::from_id_salt("cjkkinsoku").selected_text(crate::rtl::widget(ui, shown)).width(220.0).show_ui(ui, |ui| {
+        craft_ui::ComboBox::from_id_salt("cjkkinsoku").selected_text(crate::rtl::widget(ui, shown)).width(220.0).show_ui(ui, |ui| {
             // `style.paragraph.edit` takes `null` as the default rules, also over a Based On set.
             if ui.selectable_label(name.is_none(), crate::rtl::widget(ui, crate::i18n::tr(lang, "Default Rules"))).clicked() {
                 d.fields.insert("p.kinsoku".into(), Value::Null);
@@ -780,7 +787,7 @@ fn japanese_composition(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, cf: &Char
         let sets = mojikumi_sets(doc, &current);
         let label = |l: &str| if l.is_empty() { crate::i18n::tr(lang, "None").to_string() } else { l.to_string() };
         let shown = sets.iter().find(|s| s.0 == current).map_or_else(String::new, |s| label(s.1.as_str()));
-        egui::ComboBox::from_id_salt("cjkmojikumi").selected_text(crate::rtl::widget(ui, shown)).width(220.0).show_ui(ui, |ui| {
+        craft_ui::ComboBox::from_id_salt("cjkmojikumi").selected_text(crate::rtl::widget(ui, shown)).width(220.0).show_ui(ui, |ui| {
             for (v, l) in &sets {
                 if ui.selectable_label(*v == current, crate::rtl::widget(ui, label(l.as_str()))).clicked() {
                     d.fields.insert("p.mojikumi".into(), json!(v));
@@ -834,7 +841,7 @@ fn grid_settings(lang: &str, ui: &mut egui::Ui, d: &mut Dialog, pv: &Value) {
     grid("cjkgrid").show(ui, |ui| {
         crate::rtl::label(ui, tr(lang, "Grid Alignment:"));
         let shown = if on { REFERENCES.iter().find(|r| r.0 == reference).map_or("", |r| r.1) } else { "None" };
-        egui::ComboBox::from_id_salt("cjkgridalign").selected_text(crate::rtl::widget(ui, tr(lang, shown))).width(220.0).show_ui(ui, |ui| {
+        craft_ui::ComboBox::from_id_salt("cjkgridalign").selected_text(crate::rtl::widget(ui, tr(lang, shown))).width(220.0).show_ui(ui, |ui| {
             if ui.selectable_label(!on, crate::rtl::widget(ui, tr(lang, "None"))).clicked() {
                 set(d, GridAlign::None);
             }
diff --git a/crates/ui-egui/src/dialogs/tests.rs b/crates/ui-egui/src/dialogs/tests.rs
new file mode 100644
index 000000000..84cbf3bea
--- /dev/null
+++ b/crates/ui-egui/src/dialogs/tests.rs
@@ -0,0 +1,3523 @@
+use super::*;
+
+#[test]
+fn paragraph_style_settings_show_captured_color_and_pending_spacing_without_changing_the_document() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let f = app.run("frame.create", json!({"rect":[36,36,300,200],"content":"text","text":"Heading"})).unwrap();
+    app.run("text.select", json!({"story":f["story"],"anchor":0,"focus":7})).unwrap();
+    app.run("type.char", json!({"fontFamily":"Source Sans 3","fontStyle":"Bold","size":16,"fill":"[Paper]"})).unwrap();
+    app.run("style.paragraph.create", json!({"name":"Header","fromSelection":true})).unwrap();
+    let doc = app.session.doc().unwrap().doc.clone();
+    let style = doc.styles.para("Header").unwrap();
+    let mut d = Dialog::new("paragraphStyleOptions", json!({"name":"Header"}));
+    let summary = paragraph_style_summary("", &d, style, &doc.styles);
+    for value in ["Source Sans 3", "Bold", "16 pt", "[Paper]"] {
+        assert!(summary.contains(value), "{summary}");
+    }
+    assert!(summary.len() < 250, "default attributes do not swamp the captured settings: {summary}");
+    d.fields.insert("c.fill".into(), json!("[Registration]"));
+    d.fields.insert("p.spaceAfter".into(), json!(4.5));
+    let summary = paragraph_style_summary("", &d, style, &doc.styles);
+    assert!(summary.contains("[Registration]") && !summary.contains("[Paper]"), "{summary}");
+    assert!(summary.contains("4.5 pt"), "{summary}");
+    assert_eq!(app.session.doc().unwrap().doc, doc);
+}
+
+/// A dialog opened without the menu's fields has no `useDefaults` field at all. Confirming it
+/// with no layer unticked must keep the file's defaults, not choose every layer explicitly:
+/// an implicit all-on choice is rejected for a PDF without layers, so the command's error
+/// tells the two apart.
+#[test]
+fn layer_options_confirm_without_the_menu_fields_keeps_file_defaults() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"width": 100, "height": 100, "pages": 1})).unwrap();
+    let pdf = app.run("file.exportPdf", json!({})).unwrap()["base64"].clone();
+    let placed = app.run("file.place", json!({"base64": pdf, "name": "plain.pdf", "x": 0, "y": 0, "width": 100})).unwrap();
+    let id = designcraft_doc::ItemId(placed["id"].as_u64().unwrap());
+    app.run("selection.set", json!({"ids": [placed["id"]]})).unwrap();
+    app.ui.dialog = Some(Dialog::new("layerOptions", json!({})));
+    confirm(&mut app).unwrap();
+    assert!(!app.session.doc().unwrap().doc.item(id).unwrap().has_pdf_layer_override(), "an untouched dialog keeps the file defaults");
+    // The menu's own dialog still asks for an explicit all-on choice when that is the state
+    // it was opened in; a layerless PDF refuses it rather than accepting an empty override.
+    app.ui.dialog = Some(Dialog::new("layerOptions", json!({"useDefaults": false, "layers": []})));
+    let err = confirm(&mut app).unwrap_err();
+    assert!(err.contains("could not be changed"), "{err}");
+    assert!(!app.session.doc().unwrap().doc.item(id).unwrap().has_pdf_layer_override(), "a layerless PDF never takes an explicit choice");
+}
+
+#[test]
+fn paragraph_style_settings_compare_with_the_chosen_parent() {
+    let mut styles = designcraft_doc::Styles::default();
+    styles.paragraph.push(designcraft_doc::ParagraphStyle {
+        name: "Parent".into(),
+        chars: designcraft_doc::CharAttrs { size: Some(20.0), ..Default::default() },
+        based_on: None,
+        next_style: None,
+        para: Default::default(),
+        shortcut: String::new(),
+    });
+    let style = designcraft_doc::ParagraphStyle {
+        name: "Child".into(),
+        based_on: Some("Parent".into()),
+        next_style: None,
+        para: Default::default(),
+        chars: Default::default(),
+        shortcut: String::new(),
+    };
+    let d = Dialog::new("paragraphStyleOptions", json!({"name":"Child"}));
+    assert_eq!(paragraph_style_summary("", &d, &style, &styles), "Parent");
+}
+
+#[test]
+fn step_and_repeat_dialog_previews_and_makes_the_copies_as_one_undo_step() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let id = app.run("frame.create", json!({"rect": [72, 600, 540, 640]})).unwrap()["id"].as_u64().unwrap();
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    let open = |app: &mut DesignApp| {
+        crate::menus::activate(app, "edit.stepAndRepeat", &Value::Null);
+        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some(STEP_AND_REPEAT));
+    };
+    let set = |app: &mut DesignApp, k: &str, v: Value| {
+        app.ui.dialog.as_mut().unwrap().fields.insert(k.into(), v);
+    };
+    let items = |app: &DesignApp| app.session.doc().unwrap().doc.spreads[0].items.len();
+    let undo = |app: &DesignApp| app.session.doc().unwrap().history.undo.len();
+    let (n0, u0) = (items(&app), undo(&app));
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1200.0, 800.0));
+    open(&mut app);
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    for expected in ["Step and Repeat", "Repeat", "Count:", "Create as a grid", "Offset", "Vertical:", "Horizontal:", "Preview", "OK", "Cancel"] {
+        visible_label(&labels, screen, expected);
+    }
+    // Preview: the copies show, and change with the fields, without an undo step.
+    set(&mut app, "count", json!("5"));
+    set(&mut app, "vertical", json!("-0.75 in"));
+    set(&mut app, "horizontal", json!("0"));
+    set(&mut app, "preview", json!(true));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    assert_eq!((items(&app), undo(&app)), (n0 + 5, u0));
+    set(&mut app, "count", json!("3"));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    assert_eq!(items(&app), n0 + 3);
+    set(&mut app, "preview", json!(false));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    assert_eq!(items(&app), n0, "Preview off takes them away");
+    set(&mut app, "preview", json!(true));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    assert_eq!(items(&app), n0 + 3);
+    // Cancel puts the document back.
+    cancel(&mut app);
+    assert!(app.ui.dialog.is_none());
+    assert_eq!((items(&app), undo(&app)), (n0, u0));
+    // OK after a preview makes the copies once, as one undo step, 0.75 in apart.
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    open(&mut app);
+    set(&mut app, "count", json!("2"));
+    set(&mut app, "vertical", json!("-0.75 in"));
+    set(&mut app, "horizontal", json!("0"));
+    set(&mut app, "preview", json!(true));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    let r = confirm(&mut app).unwrap();
+    assert_eq!((items(&app), undo(&app)), (n0 + 2, u0 + 1));
+    let last = r["ids"][1].as_u64().unwrap();
+    let top = app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(last)).unwrap().bounds().min_y();
+    assert!((top - (600.0 - 108.0)).abs() < 1e-6, "{top}");
+    // Create as a grid: Rows × Columns cells, the original being one.
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    open(&mut app);
+    set(&mut app, "grid", json!(true));
+    set(&mut app, "rows", json!("2"));
+    set(&mut app, "columns", json!("3"));
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    visible_label(&labels, screen, "Rows:");
+    visible_label(&labels, screen, "Columns:");
+    assert_eq!(confirm(&mut app).unwrap()["created"], 5);
+    // A value that isn't a measure keeps the dialog open and says so.
+    open(&mut app);
+    set(&mut app, "vertical", json!("up"));
+    assert!(confirm(&mut app).is_err());
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!(d.s("status"), "Invalid value: up");
+}
+
+/// A three-page document in `units` with Document Setup open.
+fn document_setup_app(units: &str) -> DesignApp {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 3})).unwrap();
+    app.run("document.preferences", json!({"horizontalUnits": units, "verticalUnits": units})).unwrap();
+    crate::menus::activate(&mut app, "layout.documentSetup", &Value::Null);
+    app
+}
+
+fn setup_fields(app: &mut DesignApp, fields: Value) {
+    let d = app.ui.dialog.as_mut().unwrap();
+    for (k, v) in fields.as_object().unwrap() {
+        d.fields.insert(k.clone(), v.clone());
+    }
+}
+
+/// File › File Info opens filled from the document and OK stores what was typed; Export PDF
+/// then names the file after the document and takes the PDF's title from File Info.
+#[test]
+fn file_info_dialog_stores_the_fields_and_titles_the_pdf() {
+    use std::sync::{Arc, Mutex};
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"title": "flyer-v3"})).unwrap();
+    app.run("file.info", json!({"author": "Ana Ruiz", "keywords": ["spring", "shoes"]})).unwrap();
+    crate::menus::activate(&mut app, "file.info", &Value::Null);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!(d.id, "fileInfo");
+    assert_eq!((d.s("documentTitle"), d.s("author"), d.s("keywords")), (String::new(), "Ana Ruiz".into(), "spring; shoes".into()));
+    setup_fields(&mut app, json!({"documentTitle": "Spring Catalog", "author": "", "keywords": "spring, catalog", "description": "Shoes"}));
+    confirm(&mut app).unwrap();
+    assert!(app.ui.dialog.is_none());
+    let info = app.session.active().unwrap().doc.file_info.clone();
+    assert_eq!((info.document_title.as_str(), info.author.as_str(), info.description.as_str()), ("Spring Catalog", "", "Shoes"));
+    assert_eq!(info.keywords, ["spring", "catalog"]);
+    // Keywords left as shown stay as they are, even one with a comma in it.
+    app.run("file.info", json!({"keywords": ["Washington, DC", "map"]})).unwrap();
+    crate::menus::activate(&mut app, "file.info", &Value::Null);
+    setup_fields(&mut app, json!({"author": "Studio"}));
+    confirm(&mut app).unwrap();
+    let info = app.session.active().unwrap().doc.file_info.clone();
+    assert_eq!((info.author.as_str(), info.keywords.clone()), ("Studio", vec!["Washington, DC".to_string(), "map".to_string()]));
+    // Another keyword edited: the one with a comma in it still stays one keyword.
+    crate::menus::activate(&mut app, "file.info", &Value::Null);
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("keywords"), "Washington, DC; map");
+    setup_fields(&mut app, json!({"keywords": "Washington, DC; atlas"}));
+    confirm(&mut app).unwrap();
+    assert_eq!(app.session.active().unwrap().doc.file_info.keywords, ["Washington, DC", "atlas"]);
+
+    let writes: Arc<Mutex<Vec<Vec<u8>>>> = Arc::new(Mutex::new(Vec::new()));
+    let sink = writes.clone();
+    app.services.write = Some(Box::new(move |_: &str, bytes: &[u8]| {
+        sink.lock().unwrap().push(bytes.to_vec());
+        Ok(())
+    }));
+    let names: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(Vec::new()));
+    let asked = names.clone();
+    app.answer_dialogs(move |request| match request {
+        craft_dialogs::Request::File(dialog) => {
+            asked.lock().unwrap().push(dialog.file_name.clone().unwrap_or_default());
+            craft_dialogs::Answer::Paths(vec!["/tmp/designcraft-file-info.pdf".into()])
+        }
+        craft_dialogs::Request::Message(_) => craft_dialogs::Answer::Message(craft_dialogs::MessageResult::Yes),
+    });
+    open_pdf_export(&mut app);
+    confirm(&mut app).unwrap();
+    app.settle_dialogs();
+    assert_eq!(names.lock().unwrap().as_slice(), ["flyer-v3.pdf"]);
+    let pdf = String::from_utf8_lossy(&writes.lock().unwrap()[0]).into_owned();
+    assert!(pdf.contains("/Title(Spring Catalog)") && !pdf.contains("/Title(flyer-v3)"), "the PDF's title is File Info's");
+    // A title given to the export is the PDF's title, even when it is the document's name.
+    open_pdf_export(&mut app);
+    setup_fields(&mut app, json!({"title": "flyer-v3"}));
+    confirm(&mut app).unwrap();
+    app.settle_dialogs();
+    let asked = names.lock().unwrap().last().cloned().unwrap_or_default();
+    assert_eq!(std::path::Path::new(&asked).file_name().and_then(|n| n.to_str()), Some("flyer-v3.pdf"), "{asked}");
+    let pdf = String::from_utf8_lossy(&writes.lock().unwrap()[1]).into_owned();
+    assert!(pdf.contains("/Title(flyer-v3)") && !pdf.contains("/Title(Spring Catalog)"), "the given title wins");
+}
+
+/// File Info's OK stores the fields in the document the dialog was opened for, even when
+/// another document became active meanwhile; once that document has closed, OK stores nothing.
+#[test]
+fn file_info_dialog_stores_into_the_document_it_was_opened_for() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"title": "first"})).unwrap();
+    crate::menus::activate(&mut app, "file.info", &Value::Null);
+    app.run("file.new", json!({"title": "second"})).unwrap();
+    setup_fields(&mut app, json!({"author": "Ana Ruiz"}));
+    confirm(&mut app).unwrap();
+    let docs = app.session.documents();
+    let author = |title: &str| docs.iter().find(|d| d.doc.title == title).map(|d| d.doc.file_info.author.clone());
+    assert_eq!((author("first").as_deref(), author("second").as_deref()), (Some("Ana Ruiz"), Some("")));
+    assert_eq!(app.session.active().map(|d| d.doc.title.as_str()), Some("second"), "the active document stays active");
+
+    crate::menus::activate(&mut app, "file.info", &Value::Null);
+    app.run("file.close", json!({})).unwrap();
+    setup_fields(&mut app, json!({"author": "Studio"}));
+    confirm(&mut app).unwrap();
+    assert!(app.session.documents().iter().all(|d| d.doc.file_info.author != "Studio"), "the dialog's document closed");
+}
+
+/// File Info opened through `ui.dialog.open` with only some fields stores only those fields;
+/// the others keep what the document holds.
+#[test]
+fn file_info_opened_with_some_fields_keeps_the_others() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("file.info", json!({"documentTitle": "Spring Catalog", "keywords": ["spring", "shoes"]})).unwrap();
+    assert_eq!(ctl(&mut app, "ui.dialog.open", json!({"id": "fileInfo", "fields": {"author": "Ana Ruiz", "description": ""}}))["ok"], true);
+    confirm(&mut app).unwrap();
+    let info = app.session.active().unwrap().doc.file_info.clone();
+    assert_eq!((info.document_title.as_str(), info.author.as_str(), info.description.as_str()), ("Spring Catalog", "Ana Ruiz", ""));
+    assert_eq!(info.keywords, ["spring", "shoes"]);
+}
+
+/// Fields given to `ui.dialog.open` as JSON other than text reach `file.info` as they are: a
+/// keyword list stays a list, and `null` clears a field.
+#[test]
+fn file_info_opened_with_a_keyword_list_stores_the_list() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("file.info", json!({"author": "Ana Ruiz"})).unwrap();
+    let fields = json!({"keywords": ["Washington, DC", "map"], "author": null});
+    assert_eq!(ctl(&mut app, "ui.dialog.open", json!({"id": "fileInfo", "fields": fields}))["ok"], true);
+    confirm(&mut app).unwrap();
+    let info = app.session.active().unwrap().doc.file_info.clone();
+    assert_eq!(info.keywords, ["Washington, DC", "map"]);
+    assert_eq!(info.author, "");
+}
+
+/// File Info's OK for a document that is not the active one leaves the active document's
+/// Data Merge preview showing the record it showed.
+#[test]
+fn file_info_for_another_document_keeps_the_active_preview() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"title": "first"})).unwrap();
+    crate::menus::activate(&mut app, "file.info", &Value::Null);
+    app.run("file.new", json!({"title": "second"})).unwrap();
+    let csv = designcraft_engine::cmd::base64_encode(b"Name\nAda\nGrace\n");
+    app.run("data.source.select", json!({"bytes": csv, "name": "people.csv"})).unwrap();
+    app.run("data.preview", json!({"record": 2})).unwrap();
+    setup_fields(&mut app, json!({"author": "Ana Ruiz"}));
+    confirm(&mut app).unwrap();
+    let active = app.session.active().unwrap();
+    assert_eq!((active.doc.title.as_str(), active.preview_record), ("second", Some(2)), "the preview still shows record 2");
+    let first = app.session.documents().iter().find(|d| d.doc.title == "first").map(|d| d.doc.file_info.author.clone());
+    assert_eq!(first.as_deref(), Some("Ana Ruiz"));
+}
+
+#[test]
+fn document_setup_ok_applies_margins_bleed_and_size_in_one_step() {
+    let mut app = document_setup_app("millimeters");
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!(d.id, "documentSetup");
+    assert_eq!((d.s("marginTop"), d.b("marginLinked")), ("12.7 mm".to_string(), true), "the document's margins, in its units");
+    setup_fields(
+        &mut app,
+        json!({"marginTop": "20 mm", "marginBottom": "20 mm", "marginInside": "20 mm", "marginOutside": "20 mm", "bleedTop": "3 mm",
+        "bleedBottom": "3 mm", "bleedInside": "3 mm", "bleedOutside": "3 mm", "width": "210 mm", "height": "297 mm"}),
+    );
+    confirm(&mut app).unwrap();
+    assert!(app.ui.dialog.is_none());
+    let mm = designcraft_geom::units::PT_PER_MM;
+    let doc = &app.session.active().unwrap().doc;
+    assert!((doc.settings.page_width - 210.0 * mm).abs() < 1e-6 && (doc.settings.bleed[2] - 3.0 * mm).abs() < 1e-6);
+    assert!(doc.spreads.iter().flat_map(|s| &s.pages).all(|p| (p.margins.top - 20.0 * mm).abs() < 1e-6), "every page");
+    app.run("edit.undo", json!({})).unwrap();
+    let doc = &app.session.active().unwrap().doc;
+    assert!((doc.settings.page_width - 612.0).abs() < 1e-6 && doc.settings.bleed[0] == 0.0, "one undo step");
+}
+
+#[test]
+fn document_setup_reads_a_bare_number_in_the_documents_units() {
+    let mut app = document_setup_app("millimeters");
+    setup_fields(&mut app, json!({"bleedTop": "5", "bleedBottom": "5", "bleedInside": "5", "bleedOutside": "5", "width": "210"}));
+    confirm(&mut app).unwrap();
+    let mm = designcraft_geom::units::PT_PER_MM;
+    let settings = &app.session.active().unwrap().doc.settings;
+    assert!(settings.bleed.iter().all(|b| (b - 5.0 * mm).abs() < 1e-6), "5 mm, not 5 picas: {:?}", settings.bleed);
+    assert!((settings.page_width - 210.0 * mm).abs() < 1e-6, "{}", settings.page_width);
+}
+
+#[test]
+fn document_setup_keeps_each_pages_margins_unless_they_are_edited() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 3, "margins": 36})).unwrap();
+    app.run("layout.marginsAndColumns", json!({"pages": [1], "margins": 90})).unwrap();
+    let margins =
+        |app: &DesignApp| app.session.active().unwrap().doc.spreads.iter().flat_map(|s| &s.pages).map(|p| p.margins.top).collect::<Vec<_>>();
+    // Only the page count changes: every page keeps its own margins.
+    crate::menus::activate(&mut app, "layout.documentSetup", &Value::Null);
+    setup_fields(&mut app, json!({"pages": "4"}));
+    confirm(&mut app).unwrap();
+    assert_eq!(margins(&app), [36.0, 90.0, 36.0, 36.0]);
+    // Edited margins go to every page.
+    crate::menus::activate(&mut app, "layout.documentSetup", &Value::Null);
+    setup_fields(&mut app, json!({"marginTop": "1p0"}));
+    confirm(&mut app).unwrap();
+    assert_eq!(margins(&app), [12.0; 4]);
+}
+
+#[test]
+fn document_setup_keeps_a_value_it_cannot_read_and_changes_nothing() {
+    for (key, value) in [("width", "wide"), ("marginTop", "-"), ("pages", "0"), ("bleedTop", "x")] {
+        let mut app = document_setup_app("points");
+        setup_fields(&mut app, json!({key: value, "bleedInside": "9"}));
+        assert!(confirm(&mut app).is_err(), "{key}");
+        assert!(app.ui.dialog.is_some(), "{key}: the dialog stays open");
+        assert_eq!(app.session.active().unwrap().doc.settings.bleed, [0.0; 4], "{key}: nothing changed");
+    }
+}
+
+#[test]
+fn document_setup_links_edges_and_adjust_layout_applies() {
+    let mut app = document_setup_app("points");
+    let f = app.run("frame.create", json!({"rect": [36, 36, 576, 756], "content": "text"})).unwrap();
+    crate::menus::activate(&mut app, "layout.documentSetup", &Value::Null);
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 900.0));
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    // Typing in a linked margin sets all four.
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let top = labels.iter().filter(|(t, _, _)| t == "36 pt").map(|(_, r, _)| *r).next().expect("the top margin");
+    click_dialog(&mut app, &ctx, screen, top.center());
+    let select_all = egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND };
+    dialog_frame(&mut app, &ctx, screen, vec![select_all, egui::Event::Text("72 pt".into())]);
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert!(["Top", "Bottom", "Inside", "Outside"].iter().all(|e| d.s(&format!("margin{e}")) == "72 pt"), "linked: {:?}", d.fields);
+    // Adjust Layout applies at once, and the frame follows the margins.
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "Adjust Layout").center());
+    assert!(app.ui.dialog.is_none(), "applied");
+    let doc = &app.session.active().unwrap().doc;
+    let b = doc.item(designcraft_doc::ItemId(f["id"].as_u64().unwrap())).unwrap().bounds();
+    assert!((b.y0 - 72.0).abs() < 1e-6 && doc.page(0).unwrap().margins.outside == 72.0, "{b:?}");
+}
+
+#[test]
+fn cell_options_dialog_draws_and_applies_only_changed_values_to_the_chosen_edges() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "caret": true})).unwrap();
+    let tid = app.run("table.insert", json!({"rows": 2, "cols": 2})).unwrap()["table"].as_u64().unwrap();
+    app.run("table.select", json!({"what": "table"})).unwrap();
+    app.run("app.cellOptionsDialog", json!({})).unwrap();
+    let ctx = dialog_context("");
+    dialog_frame(&mut app, &ctx, egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(900.0, 700.0)), vec![]);
+    let d = app.ui.dialog.as_mut().unwrap();
+    assert_eq!(d.id, "cellOptions");
+    assert_eq!(d.fields["weight"], json!(1.0));
+    d.fields.insert("edges".into(), json!(["top", "bottom", "left", "right"]));
+    d.fields.insert("gapColor".into(), json!("[Paper]"));
+    d.fields.insert("fill".into(), json!("[Black]"));
+    d.fields.insert("fillTint".into(), json!(0.2));
+    confirm(&mut app).unwrap();
+    let st = app.session.active().unwrap();
+    let t = st.doc.stories.values().find_map(|s| s.tables.get(&tid)).unwrap();
+    let gap = |r: usize, c: usize, side: usize| t.cell(r, c).unwrap().strokes[side].gap_color.clone();
+    assert_eq!([gap(0, 0, 0), gap(0, 0, 1), gap(1, 1, 2), gap(1, 1, 3)], ["[Paper]"; 4].map(String::from), "outer edges");
+    assert_eq!([gap(0, 0, 2), gap(0, 0, 3)], ["[None]"; 2].map(String::from), "inner edges keep theirs");
+    assert!(t.cells.iter().all(|c| c.fill == "[Black]" && (c.fill_tint - 0.2).abs() < 1e-6));
+    assert!(t.cells.iter().all(|c| c.strokes.iter().all(|e| e.weight == 1.0)), "unchanged values are not applied");
+}
+
+#[test]
+fn cell_options_edge_changes_reseed_every_stroke_field_and_survive_a_bad_seed() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "caret": true})).unwrap();
+    let tid = app.run("table.insert", json!({"rows": 2, "cols": 2})).unwrap()["table"].as_u64().unwrap();
+    app.run("table.select", json!({"what": "table"})).unwrap();
+    app.run("table.setCell", json!({"stroke": {"weight": 3, "edges": "innerHorizontal"}})).unwrap();
+    app.run("app.cellOptionsDialog", json!({})).unwrap();
+    let mut d = app.ui.dialog.take().unwrap();
+    d.fields.insert("seed".into(), json!(5));
+    let outer = [true, true, true, true, false, false];
+    cell_options_edges_changed(&mut app, &mut d, &outer);
+    assert_eq!((&d.fields["weight"], &d.fields["seed"]["weight"]), (&json!(1.0), &json!(1.0)));
+    // A weight typed for the outer edges, then the inner horizontal edges (3 pt) chosen
+    // and 1 pt typed: 1 pt differs from what those edges show, so OK applies it.
+    d.fields.insert("weight".into(), json!(5.0));
+    cell_options_edges_changed(&mut app, &mut d, &[false, false, false, false, true, false]);
+    assert_eq!((&d.fields["weight"], &d.fields["seed"]["weight"]), (&json!(5.0), &json!(3.0)));
+    d.fields.insert("weight".into(), json!(1.0));
+    app.ui.dialog = Some(d);
+    confirm(&mut app).unwrap();
+    let st = app.session.active().unwrap();
+    let t = st.doc.stories.values().find_map(|s| s.tables.get(&tid)).unwrap();
+    assert_eq!([t.cell(0, 0).unwrap().strokes[2].weight, t.cell(1, 1).unwrap().strokes[0].weight], [1.0; 2]);
+}
+
+#[test]
+fn preferences_ok_saves_a_story_editor_size_that_loads_back() {
+    // `ui.dialog.set` takes any value; a size that isn't finite is saved as `null`.
+    let sizes = [(json!("nan"), 20.0), (json!("inf"), 20.0), (json!(null), 20.0), (json!(1e39), 36.0), (json!(3), 8.0), (json!(11), 11.0)];
+    for (size, want) in sizes {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        app.ui.story_editor_size = 20.0;
+        app.run("app.preferences", json!({})).unwrap();
+        app.ui.dialog.as_mut().unwrap().fields.insert("storyEditorSize".into(), size);
+        confirm(&mut app).unwrap();
+        let saved = serde_json::to_vec(&app.ui).unwrap();
+        assert_eq!(crate::UiState::from_preferences_json(&saved).unwrap().story_editor_size, want);
+    }
+}
+
+#[test]
+fn preferences_ok_sets_only_the_ruler_units_it_is_given() {
+    // `ui.dialog.open` takes any fields, so the vertical units can be missing.
+    for (vertical, want) in [(None, "inches"), (Some("points"), "points")] {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        app.run("document.preferences", json!({"verticalUnits": "inches"})).unwrap();
+        let mut fields = json!({"horizontalUnits": "millimeters", "bg.relativeTo": "topOfPage"});
+        if let Some(vertical) = vertical {
+            fields["verticalUnits"] = json!(vertical);
+        }
+        app.ui.dialog = Some(Dialog::new("preferences", fields));
+        confirm(&mut app).unwrap();
+        let units = app.run("document.preferences", json!({})).unwrap();
+        assert_eq!((units["horizontalUnits"].as_str(), units["verticalUnits"].as_str()), (Some("millimeters"), Some(want)));
+    }
+}
+
+#[test]
+fn enter_and_escape_close_the_style_menu_not_numbering_and_section_options() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 2})).unwrap();
+    crate::menus::activate(&mut app, "layout.section", &Value::Null);
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 814.0));
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    let key = |key| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE };
+    for pressed in [egui::Key::Enter, egui::Key::Escape] {
+        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+        // The section's Style menu (the first of the two).
+        let style = labels.iter().filter(|(t, r, c)| t.trim() == "1, 2, 3, 4…" && c.contains_rect(*r)).map(|(_, r, _)| *r).next().unwrap();
+        click_dialog(&mut app, &ctx, screen, style.center());
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+        assert!(egui::Popup::is_any_open(&ctx), "the Style menu opened");
+        dialog_frame(&mut app, &ctx, screen, vec![key(pressed)]);
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+        assert!(app.ui.dialog.is_some(), "{pressed:?} with the menu open leaves the dialog open");
+        assert!(app.session.active().unwrap().doc.sections.iter().all(|s| s.start_number != Some(0)));
+        if egui::Popup::is_any_open(&ctx) {
+            egui::Popup::close_all(&ctx);
+            dialog_frame(&mut app, &ctx, screen, vec![]);
+        }
+    }
+    // With no menu open, Escape closes the dialog.
+    dialog_frame(&mut app, &ctx, screen, vec![key(egui::Key::Escape)]);
+    assert!(app.ui.dialog.is_none());
+}
+
+#[test]
+fn numbering_and_section_options_keep_their_actions_in_view() {
+    for language in ["en", "ar"] {
+        for size in [egui::vec2(1178.0, 814.0), egui::vec2(392.0, 271.0)] {
+            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+            app.ui.language = language.into();
+            app.run("file.new", json!({"pages": 2})).unwrap();
+            crate::menus::activate(&mut app, "layout.section", &Value::Null);
+            let ctx = dialog_context(language);
+            let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, size);
+            for _ in 0..3 {
+                dialog_frame(&mut app, &ctx, screen, vec![]);
+            }
+            let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+            let tr = |s| crate::i18n::tr(language, s);
+            for expected in [tr("Numbering & Section Options…").trim_end_matches('…'), tr("OK"), tr("Cancel"), tr("Start Section")] {
+                visible_label(&labels, screen, expected);
+            }
+            if size.x > 1000.0 {
+                // Every option fits without scrolling, and choosing one then OK applies it.
+                visible_label(&labels, screen, &format!("{} {}", tr("Book Name:"), tr("N/A")));
+                click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, tr("Automatic Page Numbering")).center());
+                let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+                click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, tr("OK")).center());
+                assert!(app.ui.dialog.is_none(), "{language}: OK closes the dialog");
+                let doc = &app.session.active().unwrap().doc;
+                assert!(doc.sections.iter().all(|s| s.start != 0 || s.start_number.is_none()), "{language}: page 1 numbers automatically");
+            }
+        }
+    }
+}
+
+fn select_all_key() -> egui::Event {
+    egui::Event::Key {
+        key: egui::Key::A,
+        physical_key: None,
+        pressed: true,
+        repeat: false,
+        modifiers: egui::Modifiers { ctrl: true, command: true, ..Default::default() },
+    }
+}
+
+/// The Color Picker over a new document's selected frame, a few frames in.
+fn picker(fields: Value) -> (DesignApp, egui::Context, egui::Rect, u64) {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let id = app.run("frame.create", json!({"rect": [36, 36, 200, 200]})).unwrap()["id"].as_u64().unwrap();
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    app.ui.dialog = Some(Dialog::new("colorPicker", fields));
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(700.0, 500.0));
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    (app, ctx, screen, id)
+}
+
+/// The rightmost painted `text`: the picker's own field, right of egui's colour editor (which
+/// has R/G/B fields of its own).
+fn rightmost(labels: &[(String, egui::Rect, egui::Rect)], text: &str) -> egui::Pos2 {
+    labels
+        .iter()
+        .filter(|(t, _, _)| t.trim() == text)
+        .map(|(_, r, _)| r.center())
+        .max_by(|a, b| a.x.total_cmp(&b.x))
+        .unwrap_or_else(|| panic!("{text} is painted"))
+}
+
+/// Types `text` one character per frame, with an idle frame after each.
+fn type_slowly(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, text: &str) {
+    for ch in text.chars() {
+        dialog_frame(app, ctx, screen, vec![egui::Event::Text(ch.into())]);
+        dialog_frame(app, ctx, screen, vec![]);
+    }
+}
+
+fn fill(app: &DesignApp, id: u64) -> designcraft_color::Color {
+    let d = &app.session.active().unwrap().doc;
+    d.resolve_color(&d.item(designcraft_doc::ItemId(id)).unwrap().fill.swatch, 1.0).unwrap()
+}
+
+#[test]
+fn the_hex_field_keeps_typed_text_and_commits_a_valid_code() {
+    let (mut app, ctx, screen, _) = picker(json!({"target": "fill", "hex": "#ffffff"}));
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "ffffff").center());
+    dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
+    type_slowly(&mut app, &ctx, screen, "#f5");
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!((d.s("hexEdit").as_str(), d.s("hex").as_str()), ("#f5", "#ffffff"), "half-typed text stays; the colour waits");
+    type_slowly(&mut app, &ctx, screen, "9019");
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!((d.s("hexEdit").as_str(), d.s("hex").as_str()), ("#f59019", "#f59019"), "a 7-character #rrggbb commits");
+    // Invalid text is replaced by the colour when focus leaves.
+    dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
+    type_slowly(&mut app, &ctx, screen, "zz");
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "#").center());
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    visible_label(&labels, screen, "f59019");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("hex"), "#f59019");
+}
+
+#[test]
+fn typed_channel_values_are_kept_while_typing() {
+    let (mut app, ctx, screen, id) = picker(json!({"target": "fill", "hex": "#010203", "model": "rgb", "rgb": [1, 2, 3]}));
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    click_dialog(&mut app, &ctx, screen, rightmost(&labels, "1"));
+    dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
+    type_slowly(&mut app, &ctx, screen, "12.5");
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    assert!(rightmost(&labels, "12.5").x > rightmost(&labels, "2").x - 1.0, "the typed text stays in the R field");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("hex"), "#0d0203");
+    confirm(&mut app).unwrap();
+    let designcraft_color::Color::Rgb { r, .. } = fill(&app, id) else { panic!("not RGB") };
+    assert!((r - 12.5 / 255.0).abs() < 1e-6, "{r}");
+}
+
+#[test]
+fn a_cmyk_colour_stays_cmyk_unless_rgb_values_are_typed() {
+    let cmyk = json!({"target": "fill", "hex": "#ff8000", "model": "cmyk", "cmyk": [0, 50, 100, 0]});
+    // Picked by hex: converted to CMYK.
+    let (mut app, ctx, screen, id) = picker(cmyk.clone());
+    let hex = app.ui.dialog.as_ref().unwrap().s("hex");
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, hex.trim_start_matches('#')).center());
+    dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
+    type_slowly(&mut app, &ctx, screen, "3366cc");
+    confirm(&mut app).unwrap();
+    assert!(matches!(fill(&app, id), designcraft_color::Color::Cmyk { .. }), "{:?}", fill(&app, id));
+    // A typed C/M/Y/K percent is a percent: M 1 is 1 %.
+    let (mut app, ctx, screen, id) = picker(cmyk.clone());
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    click_dialog(&mut app, &ctx, screen, rightmost(&labels, "50"));
+    dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
+    type_slowly(&mut app, &ctx, screen, "1");
+    confirm(&mut app).unwrap();
+    let designcraft_color::Color::Cmyk { c, m, y, k } = fill(&app, id) else { panic!("not CMYK") };
+    assert!(c == 0.0 && (m - 0.01).abs() < 1e-6 && (y - 1.0).abs() < 1e-6 && k == 0.0, "{c} {m} {y} {k}");
+    // Typed R/G/B values: RGB.
+    let (mut app, ctx, screen, id) = picker(cmyk);
+    let r = app.ui.dialog.as_ref().unwrap().fields["rgb"][0].as_f64().unwrap();
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    click_dialog(&mut app, &ctx, screen, rightmost(&labels, &r.to_string()));
+    dialog_frame(&mut app, &ctx, screen, vec![select_all_key()]);
+    type_slowly(&mut app, &ctx, screen, "10");
+    confirm(&mut app).unwrap();
+    assert!(matches!(fill(&app, id), designcraft_color::Color::Rgb { .. }), "{:?}", fill(&app, id));
+}
+
+#[test]
+fn ok_without_edits_leaves_the_fill_alone() {
+    let (mut app, _, _, id) = picker(json!({"target": "fill", "hex": "#ff8000", "model": "cmyk", "cmyk": [0, 50, 100, 0]}));
+    let before = app.session.active().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().fill.clone();
+    confirm(&mut app).unwrap();
+    assert_eq!(app.session.active().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().fill, before);
+}
+
+#[test]
+fn dialogs_do_not_dim_the_page() {
+    let (mut app, ctx, screen, _) = picker(json!({"target": "fill", "hex": "#ff8000"}));
+    let time = ctx.input(|i| i.time) + 1.0 / 60.0;
+    let output = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(time), ..Default::default() }, |ui| show(&mut app, ui.ctx()));
+    fn covers(shape: &egui::Shape, screen: egui::Rect) -> bool {
+        match shape {
+            egui::Shape::Rect(r) => r.rect.contains_rect(screen) && r.fill.a() > 0,
+            egui::Shape::Vec(v) => v.iter().any(|s| covers(s, screen)),
+            _ => false,
+        }
+    }
+    assert!(app.ui.dialog.is_some());
+    assert!(!output.shapes.iter().any(|s| covers(&s.shape, screen)), "nothing paints over the whole window");
+}
+
+fn draw(app: &mut DesignApp, ctx: &egui::Context) {
+    let input = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
+    let mut out = ctx.run_ui(input, |ui| {
+        app.logic(&ui.ctx().clone());
+        app.ui(ui);
+    });
+    out.textures_delta.clear();
+}
+
+/// A paragraph styled "Ruled Child", whose Rule Below comes from its parent "Ruled".
+fn ruled_paragraph() -> (DesignApp, Value) {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let rule = json!({"on": true, "weight": 3.0, "color": "[Black]", "tint": 0.5, "columnWidth": false, "offset": 4.0, "leftIndent": 6.0, "rightIndent": 2.0});
+    app.run("style.paragraph.create", json!({"name": "Ruled", "para": {"ruleBelow": rule}})).unwrap();
+    app.run("style.paragraph.create", json!({"name": "Ruled Child", "basedOn": "Ruled"})).unwrap();
+    let r = app.run("frame.create", json!({"rect": [72, 72, 300, 400], "content": "text", "text": "One"})).unwrap();
+    app.run("text.select", json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+    app.run("style.paragraph.apply", json!({"name": "Ruled Child"})).unwrap();
+    (app, rule)
+}
+
+fn undo_steps(app: &DesignApp) -> usize {
+    app.session.doc().map_or(0, |st| st.history.undo.len())
+}
+
+#[test]
+fn paragraph_rules_dialog_shows_the_rule_and_applies_one_field() {
+    let (mut app, rule) = ruled_paragraph();
+    let ctx = egui::Context::default();
+    app.run("app.paragraphRulesDialog", json!({"rule": "ruleBelow"})).unwrap();
+    draw(&mut app, &ctx);
+    let d = app.ui.dialog.clone().unwrap();
+    assert_eq!(d.id, "paragraphRules");
+    let current = d.fields["current"].clone();
+    assert_eq!(shown_rule(&d, "", "ruleBelow", &current), rule, "the inherited rule");
+    assert_eq!(shown_rule(&d, "", "ruleAbove", &current)["on"], false);
+    // Pick a colour, as the Color menu does.
+    app.ui.dialog.as_mut().unwrap().fields.insert("ruleBelow.color".into(), json!("[Registration]"));
+    draw(&mut app, &ctx);
+    let before = undo_steps(&app);
+    confirm(&mut app).unwrap();
+    assert_eq!(undo_steps(&app), before + 1, "one undo step");
+    let mut want = rule.clone();
+    want["color"] = json!("[Registration]");
+    assert_eq!(app.run("type.selectionAttrs", json!({})).unwrap()["para"]["ruleBelow"], want);
+    app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(app.run("type.selectionAttrs", json!({})).unwrap()["para"]["ruleBelow"], rule);
+}
+
+#[test]
+fn paragraph_style_options_edit_one_rule_field() {
+    let (mut app, rule) = ruled_paragraph();
+    let ctx = egui::Context::default();
+    app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Ruled Child", "section": "rules", "rule": "ruleBelow"})));
+    draw(&mut app, &ctx);
+    let resolved = |app: &DesignApp| serde_json::to_value(app.session.doc().unwrap().doc.styles.resolve_para_style("Ruled Child").0).unwrap();
+    let d = app.ui.dialog.clone().unwrap();
+    assert_eq!(shown_rule(&d, "p.", "ruleBelow", &resolved(&app)), rule, "inherited from the parent style");
+    app.ui.dialog.as_mut().unwrap().fields.insert("p.ruleBelow.weight".into(), json!(1.5));
+    draw(&mut app, &ctx);
+    let before = undo_steps(&app);
+    confirm(&mut app).unwrap();
+    assert_eq!(undo_steps(&app), before + 1, "one undo step");
+    let mut want = rule.clone();
+    want["weight"] = json!(1.5);
+    assert_eq!(resolved(&app)["ruleBelow"], want);
+    assert_eq!(app.run("type.selectionAttrs", json!({})).unwrap()["para"]["ruleBelow"], want, "the paragraph follows its style");
+    app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(resolved(&app)["ruleBelow"], rule);
+}
+
+/// Opens Paragraph Style Options on "Ruled Child" at each of `sections`, sets `fields` and
+/// clicks OK; returns the resolved attributes of the paragraph styled with it.
+fn style_section_edit(sections: &[&str], fields: Value) -> Value {
+    let (mut app, _) = ruled_paragraph();
+    let ctx = egui::Context::default();
+    app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Ruled Child"})));
+    for section in sections {
+        app.ui.dialog.as_mut().unwrap().fields.insert("section".into(), json!(section));
+        draw(&mut app, &ctx);
+    }
+    for (k, v) in fields.as_object().unwrap() {
+        app.ui.dialog.as_mut().unwrap().fields.insert(k.clone(), v.clone());
+    }
+    draw(&mut app, &ctx);
+    let before = undo_steps(&app);
+    confirm(&mut app).unwrap();
+    assert_eq!(undo_steps(&app), before + 1, "one undo step");
+    let style = app.session.doc().unwrap().doc.styles.para("Ruled Child").cloned().unwrap();
+    let own = serde_json::to_value(&style.para).unwrap();
+    for (k, v) in fields.as_object().unwrap() {
+        assert_eq!(own[k.trim_start_matches("p.")], *v, "the style sets {k}");
+    }
+    app.run("type.selectionAttrs", json!({})).unwrap()["para"].clone()
+}
+
+#[test]
+fn paragraph_style_options_keep_and_border_sections_reach_the_styled_paragraph() {
+    let para = style_section_edit(
+        &["keep", "border"],
+        json!({"p.keepWithNext": 2, "p.keepLinesTogether": true, "p.keepAllLines": false, "p.keepFirst": 3,
+            "p.startParagraph": "nextPage", "p.borderOn": true, "p.borderWeights": [2.0, 0.0, 2.0, 0.0]}),
+    );
+    assert_eq!(para["keepWithNext"], 2);
+    assert_eq!(para["keepLinesTogether"], true);
+    assert_eq!(para["keepAllLines"], false);
+    assert_eq!(para["keepFirst"], 3);
+    assert_eq!(para["startParagraph"], "nextPage");
+    assert_eq!(para["borderOn"], true);
+    assert_eq!(para["borderWeights"], json!([2.0, 0.0, 2.0, 0.0]));
+    // Fields not edited keep the resolved value.
+    assert_eq!(para["keepLast"], 2);
+    assert_eq!(para["ruleBelow"]["weight"], 3.0);
+}
+
+#[test]
+fn paragraph_style_options_bullets_and_span_sections_reach_the_styled_paragraph() {
+    let para = style_section_edit(
+        &["bullets", "span"],
+        json!({"p.listType": "numbers", "p.numberStyle": "upperRoman", "p.numberExpression": "^#)^t", "p.startAt": 3,
+            "p.spanColumns": {"kind": "split", "columns": 3}}),
+    );
+    assert_eq!(para["listType"], "numbers");
+    assert_eq!(para["numberStyle"], "upperRoman");
+    assert_eq!(para["numberExpression"], "^#)^t");
+    assert_eq!(para["startAt"], 3);
+    assert_eq!(para["spanColumns"], json!({"kind": "split", "columns": 3}));
+    let props: designcraft_doc::ParaProps = serde_json::from_value(para).unwrap();
+    assert_eq!(props.number_label(3), "III)\t");
+}
+
+#[test]
+fn paragraph_style_options_ignore_optical_margin_is_set_on_ok() {
+    use egui_kittest::{Harness, kittest::Queryable};
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("style.paragraph.create", json!({"name": "Flush"})).unwrap();
+    app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Flush", "section": "indents"})));
+    let mut h = Harness::builder().with_size(egui::vec2(1000.0, 800.0)).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let key = egui::Id::unique("ignore_optical_margin_fonts");
+            if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
+                crate::theme::install_fonts(ui.ctx(), "");
+                ui.data_mut(|d| d.insert_temp(key, true));
+                return;
+            }
+            show(app, ui.ctx());
+        },
+        app,
+    );
+    h.run_steps(3);
+    h.get_by_label("Ignore Optical Margin").click();
+    h.run_steps(3);
+    h.get_by_label("  OK  ").click();
+    h.run_steps(3);
+    let app = h.state();
+    assert!(app.ui.dialog.is_none());
+    assert_eq!(app.session.doc().unwrap().doc.styles.para("Flush").unwrap().para.ignore_optical_margin, Some(true));
+}
+
+#[test]
+fn paragraph_style_options_keep_a_bad_grep_pattern_open_with_the_error() {
+    let (mut app, _) = ruled_paragraph();
+    let ctx = egui::Context::default();
+    app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Ruled", "section": "general"})));
+    draw(&mut app, &ctx);
+    app.ui.dialog.as_mut().unwrap().fields.insert("p.grepStyles".into(), json!([{"style": "[None]", "pattern": "(?<=x"}]));
+    let e = confirm(&mut app).unwrap_err();
+    assert!(e.contains("bad GREP"), "{e}");
+    let d = app.ui.dialog.clone().expect("the dialog stays open");
+    assert_eq!((d.s("section").as_str(), d.s("status").contains("bad GREP")), ("grep", true));
+    assert!(app.session.doc().unwrap().doc.styles.para("Ruled").unwrap().para.grep_styles.is_none(), "nothing saved");
+    draw(&mut app, &ctx);
+}
+
+#[test]
+fn paragraph_style_options_show_a_refused_rename_on_general_and_trim_a_new_name() {
+    let (mut app, _) = ruled_paragraph();
+    let ctx = egui::Context::default();
+    app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Ruled", "section": "rules"})));
+    draw(&mut app, &ctx);
+    app.ui.dialog.as_mut().unwrap().fields.insert("rename".into(), json!("Ruled Child"));
+    let e = confirm(&mut app).unwrap_err();
+    let d = app.ui.dialog.clone().expect("the dialog stays open");
+    assert_eq!(d.s("section"), "general", "the name field is on General");
+    assert!(d.s("status").contains("already exists"), "{e}");
+
+    app.ui.dialog.as_mut().unwrap().fields.insert("rename".into(), json!("  Fresh "));
+    app.ui.dialog.as_mut().unwrap().fields.insert("x.tag".into(), json!("h3"));
+    confirm(&mut app).unwrap();
+    let st = &app.session.doc().unwrap().doc.styles;
+    assert!(st.para("Fresh").is_some());
+    assert_eq!(st.export_tag("Fresh", false).map(|t| t.tag.as_str()), Some("h3"));
+}
+
+/// A frame with two paragraphs of [Basic Paragraph]; the first has a local Word Spacing minimum.
+fn two_paragraphs() -> (DesignApp, Value) {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let r = app.run("frame.create", json!({"rect": [72, 72, 300, 400], "content": "text", "text": "One\nTwo"})).unwrap();
+    app.run("text.select", json!({"story": r["story"], "anchor": 0, "focus": 0})).unwrap();
+    app.run("type.para", json!({"attrs": {"wordSpaceMin": 0.7}})).unwrap();
+    (app, r["story"].clone())
+}
+
+/// The resolved paragraph attribute `key` of the paragraph at byte `at`.
+fn para_attr(app: &mut DesignApp, story: &Value, at: usize, key: &str) -> Value {
+    app.run("text.select", json!({"story": story, "anchor": at, "focus": at})).unwrap();
+    app.run("type.selectionAttrs", json!({})).unwrap()["para"][key].clone()
+}
+
+/// The hyphenation video (Graphd Tutorials, 0:39–1:13): the Paragraph panel menu's
+/// Hyphenation… opens InDesign's Hyphenation Settings for the selected paragraphs. Preview
+/// shows the slider moved to Fewer Hyphens on the page without an undo step, OK makes it one
+/// step on the selected paragraph only, and Cancel puts it back.
+#[test]
+fn hyphenation_settings_preview_apply_and_cancel_on_the_selected_paragraph() {
+    let (mut app, story) = two_paragraphs();
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0));
+    let sid = designcraft_doc::StoryId(story.as_u64().unwrap());
+    let weight = |app: &DesignApp, para: usize| {
+        let d = &app.session.doc().unwrap().doc;
+        d.styles.resolve_para(&d.story(sid).unwrap().paras[para]).0.hyph_weight
+    };
+    assert!(crate::menus::menu_enabled(&app, "app.hyphenationDialog"));
+    app.run("app.hyphenationDialog", json!({})).unwrap();
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let d = app.ui.dialog.clone().unwrap();
+    assert_eq!(
+        (d.id.as_str(), d.fields["current"]["hyphWeight"].as_f64(), d.fields["current"]["hyphenate"].as_bool()),
+        ("hyphenation", Some(0.5), Some(true))
+    );
+    for label in [
+        "Hyphenation Settings",
+        "Hyphenate",
+        "Words with at Least:",
+        "letters",
+        "Hyphen Limit:",
+        "hyphens",
+        "Hyphenation Zone:",
+        "Better Spacing",
+        "Fewer Hyphens",
+        "Hyphenate Capitalized Words",
+        "Hyphenate Last Word",
+        "Hyphenate Across Column",
+        "Preview",
+    ] {
+        assert!(labels.iter().any(|(t, _, _)| t == label), "{label}: {labels:?}");
+    }
+    // Fewer Hyphens (9 of 10) with Preview: on the page, no undo step.
+    let before = undo_steps(&app);
+    let d = app.ui.dialog.as_mut().unwrap();
+    d.fields.insert("hyphWeight".into(), json!(0.9));
+    d.fields.insert("preview".into(), json!(true));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    assert_eq!(weight(&app, 0), 0.9, "previewed");
+    assert_eq!(undo_steps(&app), before, "a preview is no step");
+    // Cancel: back as it was.
+    cancel(&mut app);
+    assert_eq!(weight(&app, 0), 0.5);
+    // Again, and OK: one step, the selected paragraph only.
+    app.run("app.hyphenationDialog", json!({})).unwrap();
+    let d = app.ui.dialog.as_mut().unwrap();
+    d.fields.insert("hyphWeight".into(), json!(0.9));
+    d.fields.insert("preview".into(), json!(true));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    confirm(&mut app).unwrap();
+    assert_eq!((weight(&app, 0), weight(&app, 1)), (0.9, 0.5));
+    assert_eq!(undo_steps(&app), before + 1, "one undo step");
+    // Paragraph Style Options › Hyphenation has the same form.
+    app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": designcraft_doc::story::BASIC_PARAGRAPH, "section": "hyph"})));
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    for label in ["Hyphenation Zone:", "Better Spacing", "Fewer Hyphens", "Hyphenate Last Word", "Hyphenate Across Column"] {
+        assert!(labels.iter().any(|(t, _, _)| t == label), "style options: {label}");
+    }
+    app.ui.dialog = None;
+    app.run("edit.deselectAll", json!({})).unwrap();
+    assert!(!crate::menus::menu_enabled(&app, "app.hyphenationDialog"), "no paragraph");
+}
+
+/// Hyphenate differs across the selection: it shows mixed, and the first click turns it on for
+/// all. Settings the command refuses show why: a preview goes back and isn't retried until they
+/// change, and OK keeps the dialog open.
+/// A mixed Better Spacing ↔ Fewer Hyphens slider: a click on its middle step sets every
+/// selected paragraph to it, though the knob already sat there.
+#[test]
+fn hyphenation_settings_mixed_slider_click_sets_the_step() {
+    let (mut app, story) = two_paragraphs();
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0));
+    app.run("type.para", json!({"attrs": {"hyphWeight": 0.2}})).unwrap();
+    app.run("text.select", json!({"story": story, "anchor": 0, "focus": 7})).unwrap();
+    app.run("app.hyphenationDialog", json!({})).unwrap();
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let rect = |l: &str| labels.iter().find(|(t, _, _)| t == l).map(|(_, r, _)| *r).unwrap();
+    let (better, fewer) = (rect("Better Spacing"), rect("Fewer Hyphens"));
+    click_dialog(&mut app, &ctx, screen, egui::pos2((better.right() + fewer.left()) / 2.0, better.center().y));
+    assert_eq!(app.ui.dialog.as_ref().unwrap().fields.get("hyphWeight"), Some(&json!(0.5)));
+}
+
+#[test]
+fn hyphenation_settings_mixed_checkbox_and_refused_settings() {
+    let (mut app, story) = two_paragraphs();
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0));
+    app.run("type.para", json!({"attrs": {"hyphenate": false}})).unwrap();
+    app.run("text.select", json!({"story": story, "anchor": 0, "focus": 7})).unwrap();
+    app.run("app.hyphenationDialog", json!({})).unwrap();
+    assert!(app.ui.dialog.as_ref().unwrap().fields["current"]["hyphenate"].is_null(), "mixed");
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let at = labels.iter().find(|(t, _, _)| t == "Hyphenate").map(|(_, r, _)| r.left_center() - egui::vec2(10.0, 0.0)).unwrap();
+    click_dialog(&mut app, &ctx, screen, at);
+    assert_eq!(app.ui.dialog.as_ref().unwrap().fields.get("hyphenate"), Some(&json!(true)), "the first click turns it on");
+    // A refused setting (as a control-channel caller could send it): no preview, the reason.
+    let before = undo_steps(&app);
+    let d = app.ui.dialog.as_mut().unwrap();
+    d.fields.insert("hyphWeight".into(), json!("heavy"));
+    d.fields.insert("preview".into(), json!(true));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert!(!d.fields.contains_key(PREVIEWED) && d.fields.contains_key("status"), "{:?}", d.fields);
+    assert!(app.session.doc().unwrap().interaction.is_none(), "the preview went back");
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    assert!(app.session.doc().unwrap().interaction.is_none(), "not tried again");
+    // OK with it: an error, and the dialog stays open with the reason.
+    assert!(confirm(&mut app).is_err());
+    let d = app.ui.dialog.as_ref().expect("the dialog stays open");
+    assert!(d.fields.contains_key("status"));
+    assert_eq!(undo_steps(&app), before);
+    // Corrected, it previews and applies.
+    app.ui.dialog.as_mut().unwrap().fields.insert("hyphWeight".into(), json!(0.9));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    assert!(!app.ui.dialog.as_ref().unwrap().fields.contains_key("status"));
+    confirm(&mut app).unwrap();
+    assert_eq!(para_attr(&mut app, &story, 0, "hyphenate"), true);
+    assert_eq!(para_attr(&mut app, &story, 4, "hyphWeight"), 0.9);
+}
+
+#[test]
+fn justification_dialog_applies_to_a_local_paragraph_and_cancel_changes_nothing() {
+    let (mut app, story) = two_paragraphs();
+    let ctx = egui::Context::default();
+    assert!(crate::menus::menu_enabled(&app, "app.justificationDialog"));
+    app.run("app.justificationDialog", json!({})).unwrap();
+    draw(&mut app, &ctx);
+    let d = app.ui.dialog.clone().unwrap();
+    assert_eq!(d.id, "justification");
+    assert_eq!(d.fields["current"]["wordSpaceMin"], 0.7);
+    assert_eq!(d.fields["current"]["wordSpaceDesired"], 1.0);
+    app.ui.dialog.as_mut().unwrap().fields.insert("wordSpaceDesired".into(), json!(1.1));
+    draw(&mut app, &ctx);
+    let before = undo_steps(&app);
+    confirm(&mut app).unwrap();
+    assert_eq!(undo_steps(&app), before + 1, "one undo step");
+    assert_eq!(para_attr(&mut app, &story, 0, "wordSpaceDesired"), 1.1);
+    assert_eq!(para_attr(&mut app, &story, 0, "wordSpaceMin"), 0.7, "unedited fields stay");
+    assert_eq!(para_attr(&mut app, &story, 4, "wordSpaceDesired"), 1.0, "only the selected paragraph");
+    let style = app.session.doc().unwrap().doc.styles.resolve_para_style(designcraft_doc::story::BASIC_PARAGRAPH).0.word_space_desired;
+    assert_eq!(style, 1.0, "the paragraph style keeps its value");
+
+    // Cancel (Escape) leaves the paragraph alone.
+    app.run("text.select", json!({"story": story, "anchor": 0, "focus": 0})).unwrap();
+    app.run("app.justificationDialog", json!({})).unwrap();
+    app.ui.dialog.as_mut().unwrap().fields.insert("wordSpaceDesired".into(), json!(1.2));
+    let before = undo_steps(&app);
+    let escape = egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() };
+    let input = egui::RawInput {
+        screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+        events: vec![escape],
+        ..Default::default()
+    };
+    let mut out = ctx.run_ui(input, |ui| {
+        app.logic(&ui.ctx().clone());
+        app.ui(ui);
+    });
+    out.textures_delta.clear();
+    assert!(app.ui.dialog.is_none(), "cancelled");
+    assert_eq!(undo_steps(&app), before);
+    assert_eq!(para_attr(&mut app, &story, 0, "wordSpaceDesired"), 1.1);
+
+    app.run("edit.deselectAll", json!({})).unwrap();
+    assert!(!crate::menus::menu_enabled(&app, "app.justificationDialog"), "nothing to justify");
+    assert!(app.run("app.justificationDialog", json!({})).is_err());
+}
+
+#[test]
+fn justification_dialog_leaves_mixed_fields_alone_and_refuses_bad_values() {
+    let (mut app, story) = two_paragraphs();
+    let ctx = egui::Context::default();
+    app.run("text.select", json!({"story": story, "anchor": 0, "focus": 7})).unwrap();
+    app.run("app.justificationDialog", json!({})).unwrap();
+    draw(&mut app, &ctx);
+    let d = app.ui.dialog.clone().unwrap();
+    assert_eq!(d.fields["current"]["wordSpaceMin"], Value::Null, "mixed shows empty");
+    assert_eq!(d.fields["current"]["wordSpaceMax"], 1.33);
+
+    // Out of range, and minimum above desired: an error, the dialog stays open, nothing changes.
+    let before = undo_steps(&app);
+    for (key, v) in [("wordSpaceMax", 20.0), ("glyphScaleMin", 0.2), ("letterSpaceDesired", f64::NAN)] {
+        app.ui.dialog = Some(d.clone());
+        app.ui.dialog.as_mut().unwrap().fields.insert(key.into(), json!(v));
+        assert!(confirm(&mut app).is_err(), "{key} = {v}");
+        assert!(app.ui.dialog.as_ref().is_some_and(|d| d.fields.contains_key("justifyError")), "{key}: the dialog shows why");
+    }
+    app.ui.dialog = Some(d.clone());
+    app.ui.dialog.as_mut().unwrap().fields.insert("letterSpaceMin".into(), json!(0.1));
+    assert!(confirm(&mut app).is_err(), "letter spacing minimum above desired");
+    draw(&mut app, &ctx);
+    assert_eq!(undo_steps(&app), before);
+
+    app.ui.dialog = Some(d);
+    app.ui.dialog.as_mut().unwrap().fields.insert("wordSpaceMax".into(), json!(1.5));
+    confirm(&mut app).unwrap();
+    assert_eq!(undo_steps(&app), before + 1);
+    for (at, min) in [(0, 0.7), (4, 0.8)] {
+        assert_eq!(para_attr(&mut app, &story, at, "wordSpaceMax"), 1.5);
+        assert_eq!(para_attr(&mut app, &story, at, "wordSpaceMin"), min, "each paragraph keeps its own minimum");
+    }
+}
+
+fn command_app(id: &str, fields: Value) -> DesignApp {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui.dialog = Some(Dialog::new(&format!("cmd:{id}"), fields));
+    app
+}
+
+#[test]
+fn generic_new_document_preserves_typed_values_and_text_entry() {
+    for pages in [json!(2), json!(" 2 ")] {
+        let mut app = command_app(
+            "file.new",
+            json!({
+                "preset": "A4", "pages": pages, "facingPages": false, "gutter": 0,
+                "margins": {"top": 10, "bottom": 20, "inside": 30, "outside": 40},
+                "title": "  ", "status": "internal", "primaryTextFrame": true
+            }),
+        );
+        confirm(&mut app).unwrap();
+        let doc = &app.session.active().unwrap().doc;
+        assert_eq!(doc.page_count(), 2);
+        assert!(!doc.settings.facing_pages);
+        assert!(doc.title.starts_with("Untitled-"));
+        for page in doc.spreads.iter().flat_map(|s| &s.pages) {
+            assert!((page.width - 595.2755905511812).abs() < 0.01);
+            assert!((page.height - 841.8897637795277).abs() < 0.01);
+            assert_eq!(page.columns.gutter, 0.0);
+            assert_eq!(page.margins.top, 10.0);
+            assert_eq!(page.margins.outside, 40.0);
+        }
+        // `primaryTextFrame` is documented since #776, so the dialog passes it on (`status` isn't).
+        assert!(doc.spreads.iter().any(|s| !s.items.is_empty()), "documented fields reach the command");
+        assert!(app.ui.dialog.is_none());
+    }
+}
+
+#[test]
+fn numbering_commands_document_their_fields() {
+    let names = |id: &str| command_fields(designcraft_engine::find_command(id).unwrap().params).into_iter().map(|f| f.key).collect::<Vec<_>>();
+    assert_eq!(names("layout.section"), ["page", "startNumber", "style", "prefix", "includePrefix", "marker", "remove"]);
+    assert_eq!(names("layout.chapterNumbering"), ["style", "start", "source"]);
+}
+
+#[test]
+fn generic_command_preserves_array_geometry() {
+    let mut app = command_app("file.new", json!({}));
+    confirm(&mut app).unwrap();
+    app.ui.dialog = Some(Dialog::new("cmd:frame.create", json!({"rect": [10, 20, 110, 220]})));
+    confirm(&mut app).unwrap();
+    let doc = &app.session.active().unwrap().doc;
+    let item = doc.spreads.iter().flat_map(|s| &s.items).next().unwrap();
+    assert_eq!(item.bounds(), designcraft_geom::Rect::new(10.0, 20.0, 110.0, 220.0));
+}
+
+#[test]
+fn generic_explicit_null_uses_the_commands_existing_semantics() {
+    // file.new accepts null width by using the selected preset's width.
+    for width in [Value::Null, json!("null")] {
+        let mut app = command_app("file.new", json!({"preset": "A4", "width": width, "title": "  Sample layout  "}));
+        confirm(&mut app).unwrap();
+        let doc = &app.session.active().unwrap().doc;
+        assert_eq!(doc.title, "Sample layout");
+        assert!((doc.settings.page_width - 595.2755905511812).abs() < 0.01);
+    }
+}
+
+#[test]
+fn generic_invalid_number_retains_dialog_without_creating_document() {
+    let mut app = command_app("file.new", json!({"width": 0}));
+    assert!(confirm(&mut app).is_err());
+    assert!(app.session.active().is_none());
+    let dialog = app.ui.dialog.as_ref().unwrap();
+    assert_eq!(dialog.fields["width"], 0);
+    assert!(dialog.fields["status"].as_str().unwrap().contains("page size out of range"));
+}
+
+#[test]
+fn style_options_preview_choice_is_remembered_on_reopen() {
+    use egui_kittest::{Harness, kittest::Queryable};
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("style.paragraph.create", json!({"name":"Tutorial","chars":{"size":10}})).unwrap();
+    open_style_options(&mut app, true, "Tutorial");
+    let mut h = Harness::builder().with_size(egui::vec2(1000.0, 800.0)).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let key = egui::Id::unique("style_preview_remember_fonts");
+            if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
+                crate::theme::install_fonts(ui.ctx(), "");
+                ui.data_mut(|d| d.insert_temp(key, true));
+                return;
+            }
+            show(app, ui.ctx());
+        },
+        app,
+    );
+    h.run_steps(3);
+    h.get_by_label("Preview").click();
+    h.run_steps(3);
+    cancel(h.state_mut());
+    open_style_options(h.state_mut(), true, "Tutorial");
+    assert!(h.state().ui.dialog.as_ref().unwrap().b("preview"), "Preview stays checked on reopen");
+}
+
+#[test]
+fn style_options_preview_updates_all_uses_cancels_and_commits_once() {
+    use egui_kittest::{Harness, kittest::Queryable};
+    for paragraph in [true, false] {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        let f = app.run("frame.create", json!({"rect":[36,36,300,300],"content":"text","text":"First\nSecond"})).unwrap();
+        app.run("text.select", json!({"story":f["story"],"anchor":0,"focus":12})).unwrap();
+        let kind = if paragraph { "paragraph" } else { "character" };
+        app.run(&format!("style.{kind}.create"), json!({"name":"Tutorial","chars":{"size":10}})).unwrap();
+        app.run(&format!("style.{kind}.apply"), json!({"name":"Tutorial"})).unwrap();
+        let before = app.session.doc().unwrap().doc.clone();
+        let undo = app.session.doc().unwrap().history.undo.len();
+        let journal = app.session.journal.len();
+        open_style_options(&mut app, paragraph, "Tutorial");
+        let mut h = Harness::builder().with_size(egui::vec2(1000.0, 800.0)).build_ui_state(
+            |ui, app: &mut DesignApp| {
+                let key = egui::Id::unique("style_preview_test_fonts");
+                if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
+                    crate::theme::install_fonts(ui.ctx(), "");
+                    ui.data_mut(|d| d.insert_temp(key, true));
+                    return;
+                }
+                show(app, ui.ctx());
+            },
+            app,
+        );
+        h.run_steps(3);
+        h.get_by_label("Preview").click();
+        h.run_steps(3);
+        h.state_mut().ui.dialog.as_mut().unwrap().fields.insert("c.size".into(), json!(18));
+        h.run_steps(3);
+        let app = h.state_mut();
+        assert_eq!(app.run("type.selectionAttrs", json!({})).unwrap()["chars"]["size"], 18.0);
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), undo);
+        assert_eq!(app.session.journal.len(), journal);
+        // Repeated previews replace each other, never accumulate undo entries.
+        app.ui.dialog.as_mut().unwrap().fields.insert("c.size".into(), json!(20));
+        h.run_steps(3);
+        assert_eq!(h.state_mut().run("type.selectionAttrs", json!({})).unwrap()["chars"]["size"], 20.0);
+        h.get_by_label("Preview").click();
+        h.run_steps(3);
+        assert_eq!(h.state().session.doc().unwrap().doc, before);
+        h.get_by_label("Preview").click();
+        h.run_steps(3);
+        cancel(h.state_mut());
+        assert_eq!(h.state().session.doc().unwrap().doc, before);
+        assert_eq!(h.state().session.doc().unwrap().history.undo.len(), undo);
+        open_style_options(h.state_mut(), paragraph, "Tutorial");
+        let d = h.state_mut().ui.dialog.as_mut().unwrap();
+        d.fields.insert("preview".into(), json!(true));
+        d.fields.insert("c.size".into(), json!(24));
+        h.run_steps(3);
+        confirm(h.state_mut()).unwrap();
+        assert_eq!(h.state().session.doc().unwrap().history.undo.len(), undo + 1);
+        // Both paragraphs/character runs still use the globally edited definition.
+        for pos in [0, 6] {
+            h.state_mut().run("text.select", json!({"story":f["story"],"anchor":pos,"focus":pos+1})).unwrap();
+            assert_eq!(h.state_mut().run("type.selectionAttrs", json!({})).unwrap()["chars"]["size"], 24.0);
+        }
+        h.state_mut().run("edit.undo", json!({})).unwrap();
+        assert_eq!(h.state().session.doc().unwrap().doc, before);
+    }
+}
+
+#[test]
+fn style_preview_refuses_justification_spacing_ok_would_refuse() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let before = app.session.doc().unwrap().doc.clone();
+    let mut d = Dialog::new("paragraphStyleOptions", json!({"name": designcraft_doc::BASIC_PARAGRAPH, "preview": true, "p.wordSpaceDesired": 1.1}));
+    style_options_preview(&mut app, &mut d);
+    assert_ne!(app.session.doc().unwrap().doc, before, "a valid value previews");
+    // Minimum above Desired: the page goes back and the dialog says why.
+    d.fields.insert("p.wordSpaceMin".into(), json!(1.5));
+    style_options_preview(&mut app, &mut d);
+    assert_eq!(app.session.doc().unwrap().doc, before);
+    assert!(d.s("status").contains("Word Spacing"), "{:?}", d.fields.get("status"));
+    assert!(app.session.doc().unwrap().interaction.is_none());
+}
+
+#[test]
+fn invalid_style_preview_leaves_the_starting_document_and_can_be_cancelled() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("style.character.create", json!({"name":"Emphasis"})).unwrap();
+    let before = app.session.doc().unwrap().doc.clone();
+    let mut d = Dialog::new("characterStyleOptions", json!({"name":"Emphasis","preview":true,"basedOn":"Emphasis"}));
+    style_options_preview(&mut app, &mut d);
+    assert!(d.fields.contains_key("status"));
+    assert_eq!(app.session.doc().unwrap().doc, before);
+    app.ui.dialog = Some(d);
+    cancel(&mut app);
+    assert_eq!(app.session.doc().unwrap().doc, before);
+    assert!(app.session.doc().unwrap().interaction.is_none());
+}
+
+#[test]
+fn style_preview_rejects_conflicting_scalar_and_nested_rule_fields_without_panicking() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let before = app.session.doc().unwrap().doc.clone();
+    let mut dialog = Dialog::new(
+        "paragraphStyleOptions",
+        json!({
+            "name": designcraft_doc::BASIC_PARAGRAPH, "preview": true,
+            "p.ruleAbove": false, "p.ruleAbove.weight": 2
+        }),
+    );
+    style_options_preview(&mut app, &mut dialog);
+    assert!(dialog.fields.contains_key("status"));
+    assert_eq!(app.session.doc().unwrap().doc, before);
+    app.ui.dialog = Some(dialog);
+    cancel(&mut app);
+    assert!(app.session.doc().unwrap().interaction.is_none());
+}
+
+#[test]
+fn text_frame_options_set_columns_baseline_and_wrap_as_indesign_does() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    // A 300 pt frame, 2 columns, 12 pt gutter (picas in the dialog).
+    let r = app.run("frame.create", json!({"rect": [36, 36, 336, 236], "content": "text", "text": "Hello"})).unwrap();
+    let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
+    app.run("object.textFrameOptions", json!({"ids": [id.0], "columns": 2, "gutter": 12})).unwrap();
+    let opts = |app: &DesignApp| app.session.doc().unwrap().doc.item(id).unwrap().text_frame().unwrap().options.clone();
+    let mut d = Dialog::new("textFrameOptions", json!({}));
+    seed_text_frame_options(&app, &mut d);
+    // Fixed Number shows each column's width: (300 - 12) / 2 = 144 pt.
+    assert_eq!((d.s("columnsKind"), d.s("columnWidth"), d.s("firstBaseline")), ("fixedNumber".into(), "12p0".into(), "ascent".into()));
+    for (k, v) in [
+        ("columnsKind", json!("fixedWidth")),
+        ("columnWidth", json!("10p0")),
+        ("firstBaseline", json!("capHeight")),
+        ("firstBaselineMin", json!("0p6")),
+        ("balanceColumns", json!(true)),
+        ("ignoreWrap", json!(true)),
+    ] {
+        d.fields.insert(k.into(), v);
+    }
+    app.ui.dialog = Some(d);
+    confirm(&mut app).unwrap();
+    let o = opts(&app);
+    assert_eq!(o.columns_kind, designcraft_doc::ColumnsKind::FixedWidth);
+    assert_eq!((o.column_width, o.first_baseline_min, o.columns), (120.0, 6.0, 2));
+    assert_eq!(o.first_baseline, designcraft_doc::FirstBaseline::CapHeight);
+    assert!(o.balance_columns && o.ignore_wrap);
+    // Fixed Number again: the width isn't sent.
+    let mut d = Dialog::new("textFrameOptions", json!({}));
+    seed_text_frame_options(&app, &mut d);
+    assert_eq!(d.s("columnWidth"), "10p0", "Fixed Width shows its own width");
+    d.fields.insert("columnsKind".into(), json!("fixedNumber"));
+    app.ui.dialog = Some(d);
+    confirm(&mut app).unwrap();
+    assert_eq!((opts(&app).columns_kind, opts(&app).column_width), (designcraft_doc::ColumnsKind::FixedNumber, 120.0));
+}
+
+#[test]
+fn baseline_grid_increment_error_explains_the_positive_measure_rule() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let r = app.run("frame.create", json!({"rect": [36, 36, 336, 236], "content": "text", "text": "Hello"})).unwrap();
+    let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
+    for increment in ["0", "-1 pt", "not a measure"] {
+        let mut d = Dialog::new("textFrameOptions", json!({}));
+        seed_text_frame_options(&app, &mut d);
+        d.fields.insert("customGrid".into(), json!(true));
+        d.fields.insert("gridIncrement".into(), json!(increment));
+        app.ui.dialog = Some(d);
+        let error = confirm(&mut app).unwrap_err().to_string();
+        assert!(error.contains("the baseline grid increment must be a measure greater than zero"), "{increment}: {error}");
+        assert!(app.session.doc().unwrap().doc.item(id).unwrap().text_frame().unwrap().options.baseline_grid.is_none());
+    }
+}
+
+#[test]
+fn text_frame_options_set_a_custom_baseline_grid_relative_to() {
+    use designcraft_doc::{FrameBaselineGrid, FrameGridRelative};
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let r = app.run("frame.create", json!({"rect": [36, 36, 336, 236], "content": "text", "text": "Hello"})).unwrap();
+    let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
+    let grid = |app: &DesignApp| app.session.doc().unwrap().doc.item(id).unwrap().text_frame().unwrap().options.baseline_grid;
+    let open = |app: &mut DesignApp, fields: &[(&str, Value)]| {
+        let mut d = Dialog::new("textFrameOptions", json!({}));
+        seed_text_frame_options(app, &mut d);
+        for (k, v) in fields {
+            d.fields.insert((*k).into(), v.clone());
+        }
+        app.ui.dialog = Some(d);
+        confirm(app)
+    };
+    app.run("selection.set", json!({"ids": [id.0]})).unwrap();
+    // Turned on, the grid takes the shown start and increment (the document grid's: 3p0 and 1p0).
+    open(&mut app, &[("customGrid", json!(true)), ("gridRelativeTo", json!("frame"))]).unwrap();
+    assert_eq!(grid(&app), Some(FrameBaselineGrid { start: 36.0, increment: 12.0, relative_to: FrameGridRelative::TopOfFrame }));
+    // The dialog shows the frame's grid; changing Relative To keeps its start and increment.
+    open(&mut app, &[("gridStart", json!("0p10"))]).unwrap();
+    open(&mut app, &[("gridRelativeTo", json!("inset"))]).unwrap();
+    assert_eq!(grid(&app), Some(FrameBaselineGrid { start: 10.0, increment: 12.0, relative_to: FrameGridRelative::TopInset }));
+    open(&mut app, &[("customGrid", json!(false))]).unwrap();
+    assert_eq!(grid(&app), None);
+}
+
+#[test]
+fn text_frame_options_change_only_what_was_edited() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let r = app.run("frame.create", json!({"rect": [36, 36, 336, 236], "content": "text", "text": "Hello"})).unwrap();
+    let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
+    app.run("object.textFrameOptions", json!({"ids": [id.0], "columns": 2, "inset": [1, 2, 3, 4]})).unwrap();
+    let opts = |app: &DesignApp| app.session.doc().unwrap().doc.item(id).unwrap().text_frame().unwrap().options.clone();
+    let before = opts(&app);
+    let open = |app: &mut DesignApp, fields: &[(&str, Value)]| {
+        app.ui.dialog = Some(Dialog::new("textFrameOptions", json!({})));
+        let mut d = app.ui.dialog.take().unwrap();
+        seed_text_frame_options(app, &mut d);
+        for (k, v) in fields {
+            d.fields.insert((*k).into(), v.clone());
+        }
+        app.ui.dialog = Some(d);
+        confirm(app)
+    };
+    // OK without edits changes nothing (no undo step either).
+    assert_eq!(open(&mut app, &[]).unwrap(), Value::Null);
+    assert_eq!(opts(&app), before);
+    // The rule's weight is in points; unequal insets the user didn't touch stay.
+    open(&mut app, &[("columnRule", json!(true)), ("columnRuleWeight", json!("6"))]).unwrap();
+    let o = opts(&app);
+    assert!(o.column_rule && o.column_rule_weight == 6.0, "{o:?}");
+    assert_eq!((o.inset, o.columns, o.gutter), (before.inset, before.columns, before.gutter));
+    // One of the rule's insets edited: the other rule settings stay.
+    open(&mut app, &[("columnRuleBottomInset", json!("0p9")), ("columnRuleTint", json!("40"))]).unwrap();
+    let o = opts(&app);
+    assert_eq!((o.column_rule_bottom_inset, o.column_rule_top_inset, o.column_rule_offset, o.column_rule_weight), (9.0, 0.0, 0.0, 6.0));
+    assert!((o.column_rule_tint - 0.4).abs() < 1e-6 && o.column_rule);
+    // One inset side edited: the others keep their values.
+    open(&mut app, &[("insetLeft", json!("1p0"))]).unwrap();
+    assert_eq!(opts(&app).inset, [1.0, 12.0, 3.0, 4.0]);
+    open(&mut app, &[("balanceColumns", json!(true))]).unwrap();
+    let o = opts(&app);
+    assert!(o.balance_columns && o.column_rule && o.columns == 2, "{o:?}");
+    // An unknown swatch is an error and the dialog stays open.
+    let e = open(&mut app, &[("columnRuleColor", json!("Mauve"))]).unwrap_err();
+    assert!(e.contains("Mauve") && app.ui.dialog.is_some(), "{e}");
+    assert_eq!(opts(&app).column_rule_color, designcraft_color::swatch::BLACK);
+    // Each OK is one undo step.
+    for _ in 0..4 {
+        app.run("edit.undo", json!({})).unwrap();
+    }
+    assert_eq!(opts(&app), before);
+}
+
+#[test]
+fn toc_dialog_adds_a_style_and_ok_makes_the_table_of_contents() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.newSample", json!({})).unwrap();
+    crate::menus::activate(&mut app, "toc.generate", &Value::Null);
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some(TOC));
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1200.0, 800.0));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    for expected in
+        ["Table of Contents", "Title:", "Include Paragraph Styles:", "Other Styles:", "« Add", "Remove »", "Replace Existing Table of Contents"]
+    {
+        visible_label(&labels, screen, expected);
+    }
+    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "Headline").center());
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "« Add").center());
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    for expected in ["Entry Style:", "TOC Level 1", "After Entry", "Between Entry and Number:", "Level:"] {
+        visible_label(&labels, screen, expected);
+    }
+    let undo = app.session.doc().unwrap().history.undo.len();
+    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "OK").center());
+    assert!(app.ui.dialog.is_none());
+    let d = &app.session.doc().unwrap().doc;
+    let toc = d.toc.clone().unwrap();
+    assert_eq!(toc.entries, vec![designcraft_doc::TocEntry::new("Headline", 1)]);
+    let text = &d.story(toc.story).unwrap().text;
+    assert!(text.starts_with("Contents\n") && text.contains("\nNotes on the Grid\t"), "{text}");
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 1);
+    // Reopened, the dialog shows the table of contents and replaces it.
+    crate::menus::activate(&mut app, "toc.generate", &Value::Null);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert!(d.b("replace"));
+    assert_eq!(toc_rows(d).iter().map(|r| r.style.as_str()).collect::<Vec<_>>(), ["Headline"]);
+}
+
+#[test]
+fn margins_and_columns_link_arithmetic_preview_and_one_undo_step() {
+    // Adobe's "Set up a modern magazine layout" (1:41–3:04): linked margins to 0.4375 in, then
+    // 5 columns with a 0.1875 in gutter, unlinked, and "*2" typed after the outside margin.
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"preset": "A4", "pages": 3, "facingPages": true, "margins": 36})).unwrap();
+    app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1000.0, 800.0)));
+    open_margins_and_columns(&mut app);
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 814.0));
+    let mut labels = vec![];
+    for _ in 0..3 {
+        labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    for expected in
+        ["Margins and Columns", "Margins", "Top:", "Bottom:", "Inside:", "Outside:", "Columns", "Number:", "Gutter:", "Adjust Layout", "Preview"]
+    {
+        visible_label(&labels, screen, expected);
+    }
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert!(d.b("link"), "four equal margins open linked");
+    // Linked: one margin typed is all four.
+    app.ui.dialog.as_mut().unwrap().fields.insert("marginTop".into(), json!("0.4375 in"));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert!(MARGIN_FIELDS.iter().all(|(k, _, _)| d.s(k) == "0.4375 in"), "{:?}", d.fields);
+    // Preview: the page changes, with no undo step.
+    let undo = app.session.doc().unwrap().history.undo.len();
+    app.ui.dialog.as_mut().unwrap().fields.insert("preview".into(), json!(true));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    let top = |app: &DesignApp| app.session.doc().unwrap().doc.spreads[0].pages[0].margins.top;
+    assert!((top(&app) - 31.5).abs() < 1e-6, "previewed: {}", top(&app));
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), undo);
+    // Unlinked (the link button), the outside margin alone: "*2" typed after it is worked out
+    // when the field is left.
+    app.ui.dialog.as_mut().unwrap().fields.insert("link".into(), json!(false));
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let key = |k| egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE };
+    let field = labels
+        .iter()
+        .filter(|(t, _, _)| t.trim() == "0.4375 in")
+        .map(|(_, r, _)| *r)
+        .max_by(|a, b| (a.max.x + a.max.y).total_cmp(&(b.max.x + b.max.y)))
+        .unwrap();
+    click_dialog(&mut app, &ctx, screen, field.center());
+    dialog_frame(&mut app, &ctx, screen, vec![key(egui::Key::End), egui::Event::Text("*2".into())]);
+    dialog_frame(&mut app, &ctx, screen, vec![key(egui::Key::Tab)]);
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert!(
+        !d.s("marginOutside").contains('*') && (d.m("marginOutside").unwrap() - 63.0).abs() < 1e-6,
+        "worked out on leaving the field: {}",
+        d.s("marginOutside")
+    );
+    let d = app.ui.dialog.as_mut().unwrap();
+    d.fields.insert("link".into(), json!(false));
+    for (k, v) in [("marginOutside", "0.4375 in*2"), ("columns", "5"), ("gutter", "0.1875 in"), ("target", "all")] {
+        d.fields.insert(k.into(), json!(v));
+    }
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    confirm(&mut app).unwrap();
+    let pg = app.session.doc().unwrap().doc.spreads[1].pages[0].clone();
+    assert_eq!((pg.margins.top, pg.margins.outside, pg.columns.count), (31.5, 63.0, 5));
+    assert!((pg.columns.gutter - 13.5).abs() < 1e-6);
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 1, "one undo step");
+    // Cancel after a preview puts the page back.
+    open_margins_and_columns(&mut app);
+    let d = app.ui.dialog.as_mut().unwrap();
+    d.fields.insert("preview".into(), json!(true));
+    d.fields.insert("columns".into(), json!("2"));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    cancel(&mut app);
+    assert_eq!(app.session.doc().unwrap().doc.spreads[1].pages[0].columns.count, 5);
+}
+
+#[test]
+fn create_guides_reads_like_indesigns_and_previews() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 1, "facingPages": false})).unwrap();
+    app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1000.0, 800.0)));
+    open_create_guides(&mut app);
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 814.0));
+    let mut labels = vec![];
+    for _ in 0..3 {
+        labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    for expected in ["Create Guides", "Rows", "Columns", "Options", "Fit Guides to:", "Margins", "Page", "Remove Existing Ruler Guides", "Preview"] {
+        visible_label(&labels, screen, expected);
+    }
+    // Rows and Columns side by side.
+    let (r, c) = (visible_label(&labels, screen, "Rows"), visible_label(&labels, screen, "Columns"));
+    assert!((r.center().y - c.center().y).abs() < 2.0 && r.center().x < c.center().x);
+    // Thirds, single guides, fitted to the page: clicking the Page radio.
+    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, "Page").center());
+    let d = app.ui.dialog.as_mut().unwrap();
+    assert_eq!(d.s("fitTo"), "page");
+    d.fields.insert("rows".into(), json!("3"));
+    d.fields.insert("rowGutter".into(), json!("0"));
+    d.fields.insert("preview".into(), json!(true));
+    dialog_frame(&mut app, &ctx, screen, vec![]);
+    let guides = |app: &DesignApp| app.session.doc().unwrap().doc.spreads[0].pages[0].guides.len();
+    assert_eq!(guides(&app), 2, "previewed");
+    confirm(&mut app).unwrap();
+    assert_eq!(guides(&app), 2, "made once");
+    app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(guides(&app), 0, "one undo step");
+}
+
+fn dialog_context(language: &str) -> egui::Context {
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx, language);
+    crate::theme::apply(&ctx, &crate::theme::Tokens::for_brightness(crate::theme::Brightness::default()));
+    ctx
+}
+
+fn dialog_frame(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, events: Vec<egui::Event>) -> Vec<(String, egui::Rect, egui::Rect)> {
+    let time = ctx.input(|i| i.time) + 1.0 / 60.0;
+    let mut output = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(time), events, ..Default::default() }, |ui| {
+        show(app, ui.ctx());
+    });
+    output.textures_delta.clear();
+    fn collect(shape: &egui::Shape, clip: egui::Rect, labels: &mut Vec<(String, egui::Rect, egui::Rect)>) {
+        match shape {
+            egui::Shape::Text(t) => labels.push((t.galley.job.text.clone(), t.visual_bounding_rect(), clip)),
+            egui::Shape::Vec(shapes) => {
+                for s in shapes {
+                    collect(s, clip, labels);
+                }
+            }
+            _ => {}
+        }
+    }
+    let mut labels = Vec::new();
+    for shape in output.shapes {
+        collect(&shape.shape, shape.clip_rect, &mut labels);
+    }
+    labels
+}
+
+fn visible_label(labels: &[(String, egui::Rect, egui::Rect)], screen: egui::Rect, expected: &str) -> egui::Rect {
+    let (_, rect, clip) = labels.iter().find(|(text, _, _)| text.trim() == expected).unwrap_or_else(|| panic!("{expected} is painted"));
+    assert!(screen.contains_rect(*rect), "{expected} must stay on screen: {rect:?}");
+    assert!(clip.contains_rect(*rect), "{expected} must not be clipped: {rect:?}, {clip:?}");
+    *rect
+}
+
+fn click_dialog(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, pos: egui::Pos2) {
+    for pressed in [true, false] {
+        dialog_frame(
+            app,
+            ctx,
+            screen,
+            vec![
+                egui::Event::PointerMoved(pos),
+                egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
+            ],
+        );
+    }
+}
+
+fn scroll_dialog(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, pos: egui::Pos2, delta: egui::Vec2) {
+    dialog_frame(
+        app,
+        ctx,
+        screen,
+        vec![
+            egui::Event::PointerMoved(pos),
+            egui::Event::MouseWheel {
+                unit: egui::MouseWheelUnit::Point,
+                delta,
+                phase: egui::TouchPhase::Move,
+                modifiers: egui::Modifiers::NONE,
+                source: egui::MouseWheelSource::Unknown,
+            },
+        ],
+    );
+    // Let smooth wheel scrolling and scrollbar visibility settle before clicking.
+    for _ in 0..30 {
+        dialog_frame(app, ctx, screen, vec![]);
+    }
+}
+
+fn scope_control(app: &mut DesignApp, ctx: &egui::Context, method: &str, params: Value) -> Value {
+    let (request, _reply) = crate::control::ControlRequest::new(method, params);
+    let crate::control::Outcome::Done(value) = crate::control::handle(app, ctx, &request) else { panic!("ordinary control response") };
+    assert_eq!(value["ok"], true, "{value}");
+    value["result"].clone()
+}
+
+fn scope_click(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, label: &str) {
+    let labels = dialog_frame(app, ctx, screen, vec![]);
+    let pos = visible_label(&labels, screen, label).center();
+    click_dialog(app, ctx, screen, pos);
+}
+
+fn scope_dialog() -> (DesignApp, egui::Context, egui::Rect, designcraft_engine::doc::StoryId) {
+    scope_dialog_with_selection("red red | red", 7)
+}
+
+fn scope_dialog_with_selection(text: &str, end: usize) -> (DesignApp, egui::Context, egui::Rect, designcraft_engine::doc::StoryId) {
+    scope_dialog_with_tool(text, end, None)
+}
+
+fn scope_dialog_with_tool(text: &str, end: usize, tool: Option<&str>) -> (DesignApp, egui::Context, egui::Rect, designcraft_engine::doc::StoryId) {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui.language = "en".into();
+    app.run("file.new", json!({})).unwrap();
+    let frame = app.run("frame.create", json!({"rect": [36, 36, 100, 100], "content": "text", "text": text})).unwrap();
+    let sid = designcraft_engine::doc::StoryId(frame["story"].as_u64().unwrap());
+    let ctx = dialog_context("en");
+    if let Some(tool) = tool {
+        scope_control(&mut app, &ctx, "ui.tool.select", json!({"tool": tool}));
+    }
+    app.run("text.select", json!({"story": sid.0, "anchor": 0, "focus": end})).unwrap();
+    app.run("app.findChange", json!({})).unwrap();
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 814.0));
+    for (field, value) in [("find", "red"), ("change", "unused")] {
+        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": field, "value": value}));
+    }
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    scope_click(&mut app, &ctx, screen, "document");
+    scope_click(&mut app, &ctx, screen, "selection");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("scope"), "selection");
+    (app, ctx, screen, sid)
+}
+
+fn scope_selected(app: &DesignApp, sid: designcraft_engine::doc::StoryId, a: usize, b: usize) {
+    let t = app.session.doc().unwrap().selection.text.unwrap();
+    assert_eq!((t.story, t.range(), t.cell), (sid, a..b, None));
+}
+
+fn scope_state_unchanged(app: &DesignApp, before: &designcraft_engine::DocState) {
+    let after = app.session.doc().unwrap();
+    assert!(std::sync::Arc::ptr_eq(&before.doc, &after.doc));
+    assert_eq!(after.uid, before.uid);
+    assert_eq!(after.revision, before.revision);
+    assert_eq!(after.selection, before.selection);
+    assert_eq!(after.history.limit, before.history.limit);
+    for (actual, expected) in [(&after.history.undo, &before.history.undo), (&after.history.redo, &before.history.redo)] {
+        assert_eq!(actual.len(), expected.len());
+        for (a, b) in actual.iter().zip(expected) {
+            assert_eq!(a.label, b.label);
+            assert_eq!(a.selection, b.selection);
+            assert!(std::sync::Arc::ptr_eq(&a.doc, &b.doc));
+        }
+    }
+}
+
+#[test]
+fn find_scope_dialog_control_effective_noops_retain_bounds() {
+    for (field, value) in [("objectMode", json!(false)), ("story", Value::Null)] {
+        let (mut app, ctx, screen, sid) = scope_dialog();
+        assert!(!app.ui.dialog.as_ref().unwrap().fields.contains_key(field));
+        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
+        scope_click(&mut app, &ctx, screen, "Count");
+        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 0, 3);
+        let before = app.session.doc().unwrap().clone();
+        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": field, "value": value}));
+        assert_eq!(app.ui.dialog.as_ref().unwrap().fields[field], value);
+        scope_state_unchanged(&app, &before);
+        scope_click(&mut app, &ctx, screen, "Count");
+        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 4, 7);
+        scope_click(&mut app, &ctx, screen, "Change All");
+        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 replacement(s) made");
+        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), before.history.undo.len() + 1);
+    }
+}
+
+#[test]
+fn find_scope_dialog_explicit_story_ignored_scope_preserves_grep_cursor() {
+    for physical in [false, true] {
+        for (text, pattern, hits, changed) in [
+            ("é", "é|(?:)", vec![(0, 2)], "X"),
+            ("é🙂", "é|(?:)", vec![(0, 2), (6, 6)], "X🙂X"),
+            ("é🙂", "(?:)", vec![(0, 0), (2, 2), (6, 6)], "XéX🙂X"),
+        ] {
+            let (mut app, ctx, screen, sid) = scope_dialog_with_selection(text, 0);
+            for (field, value) in [("find", json!(pattern)), ("change", json!("X")), ("story", json!(sid.0))] {
+                scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": field, "value": value}));
+            }
+            scope_click(&mut app, &ctx, screen, "GREP");
+            scope_click(&mut app, &ctx, screen, "Count");
+            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), format!("{} match(es)", hits.len()));
+            for &(a, b) in &hits {
+                scope_click(&mut app, &ctx, screen, "Find Next");
+                assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "Found");
+                scope_selected(&app, sid, a, b);
+                let before = app.session.doc().unwrap().clone();
+                let cur = app.ui.dialog.as_ref().unwrap().s("scope");
+                let next = if cur == "selection" { "document" } else { "selection" };
+                if physical {
+                    scope_click(&mut app, &ctx, screen, &cur);
+                    scope_click(&mut app, &ctx, screen, next);
+                } else {
+                    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "scope", "value": next}));
+                }
+                assert_eq!(app.ui.dialog.as_ref().unwrap().s("scope"), next);
+                assert_eq!(app.ui.dialog.as_ref().unwrap().fields["story"], json!(sid.0));
+                scope_state_unchanged(&app, &before);
+                scope_click(&mut app, &ctx, screen, "Count");
+                assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), format!("{} match(es)", hits.len()));
+            }
+            scope_click(&mut app, &ctx, screen, "Find Next");
+            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "No matches");
+            // An ignored scope change must not revive an exhausted endpoint either.
+            let before = app.session.doc().unwrap().clone();
+            let cur = app.ui.dialog.as_ref().unwrap().s("scope");
+            let next = if cur == "selection" { "document" } else { "selection" };
+            if physical {
+                scope_click(&mut app, &ctx, screen, &cur);
+                scope_click(&mut app, &ctx, screen, next);
+            } else {
+                scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "scope", "value": next}));
+            }
+            scope_click(&mut app, &ctx, screen, "Find Next");
+            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "No matches");
+            scope_state_unchanged(&app, &before);
+            scope_click(&mut app, &ctx, screen, "Change All");
+            assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), format!("{} replacement(s) made", hits.len()));
+            assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, changed);
+        }
+    }
+}
+
+#[test]
+fn find_scope_dialog_explicit_story_transitions_reset_cursor() {
+    for remove_override in [false, true] {
+        let (mut app, ctx, screen, sid) = scope_dialog_with_selection("é🙂", 0);
+        let other = app.run("frame.create", json!({"rect": [180, 36, 100, 100], "content": "text", "text": "other"})).unwrap();
+        app.run("text.select", json!({"story": sid.0, "anchor": 0, "focus": 0})).unwrap();
+        for (field, value) in [("find", json!("(?:)")), ("story", json!(sid.0))] {
+            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": field, "value": value}));
+        }
+        scope_click(&mut app, &ctx, screen, "GREP");
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 0, 0);
+        let before = app.session.doc().unwrap().clone();
+        let value = if remove_override { Value::Null } else { other["story"].clone() };
+        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "story", "value": value}));
+        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "story", "value": sid.0}));
+        scope_state_unchanged(&app, &before);
+        // Away and back still releases continuation even if no Find command intervenes.
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 0, 0);
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 2, 2);
+        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "é🙂");
+        let other_sid = designcraft_engine::doc::StoryId(other["story"].as_u64().unwrap());
+        assert_eq!(app.session.doc().unwrap().doc.story(other_sid).unwrap().text, "other");
+    }
+}
+
+#[test]
+fn find_scope_dialog_control_mode_changes_release_bounds() {
+    for object_mode in [false, true] {
+        let (mut app, ctx, _, sid) = scope_dialog();
+        if object_mode {
+            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "objectMode", "value": true}));
+        }
+        // Direct Session consumers share the retained domain even while Object is shown.
+        let p = json!({"find": "red", "change": "blue", "scope": "selection"});
+        let count = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.find", "params": p}));
+        assert_eq!(count.as_array().unwrap().len(), 2);
+        scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.next", "params": p}));
+        scope_selected(&app, sid, 0, 3);
+        let before = app.session.doc().unwrap().clone();
+        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "objectMode", "value": !object_mode}));
+        assert_eq!(app.ui.dialog.as_ref().unwrap().b("objectMode"), !object_mode);
+        scope_state_unchanged(&app, &before);
+        let count = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.find", "params": p}));
+        assert_eq!(count, json!([{"story": sid.0, "start": 0, "end": 3, "text": "red"}]));
+        let changed = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.change", "params": p}));
+        assert_eq!(changed, json!({"count": 1}));
+        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
+    }
+}
+
+#[test]
+fn find_scope_dialog_tool_replacement_releases_bounds() {
+    for (tool, replacement) in [("page", "cmd:layout.pageSize"), ("rectangleFrame", "frameSize")] {
+        let (mut app, ctx, screen, sid) = scope_dialog_with_tool("red red | red", 7, Some(tool));
+        assert_eq!(app.session.tool_id(), tool);
+        scope_click(&mut app, &ctx, screen, "Count");
+        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 0, 3);
+        let before = app.session.doc().unwrap().clone();
+        let active = (app.session.active_index(), app.session.documents().len());
+        let off = app.session.layout().xf(designcraft_engine::doc::SpreadRef::Doc(0)).translation();
+        let x = off.x + before.doc.spreads[0].pages[0].x + 200.0;
+        let y = off.y + 200.0;
+        // The Page tool opens Page Size on a double-click (a click selects the page).
+        let events = if tool == "page" {
+            json!([{"kind": "doubleclick", "x": x, "y": y}])
+        } else {
+            json!([{"kind": "down", "x": x, "y": y}, {"kind": "up", "x": x, "y": y}])
+        };
+        // Real tool -> Action::Dialog -> after_engine; no injected UI request.
+        scope_control(&mut app, &ctx, "ui.pointer", json!({"events": events}));
+        assert_eq!(app.ui.dialog.as_ref().unwrap().id, replacement);
+        assert!(app.session.ui_requests.is_empty());
+        assert_eq!((app.session.active_index(), app.session.documents().len()), active);
+        scope_state_unchanged(&app, &before);
+        scope_click(&mut app, &ctx, screen, "Cancel");
+        assert!(app.ui.dialog.is_none());
+        assert_eq!((app.session.active_index(), app.session.documents().len()), active);
+        scope_state_unchanged(&app, &before);
+        let p = json!({"find": "red", "change": "blue", "scope": "selection"});
+        let count = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.find", "params": p}));
+        assert_eq!(count, json!([{"story": sid.0, "start": 0, "end": 3, "text": "red"}]));
+        scope_state_unchanged(&app, &before);
+        let changed = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.change", "params": p}));
+        assert_eq!(changed, json!({"count": 1}));
+        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), before.history.undo.len() + 1);
+    }
+}
+
+#[test]
+fn find_scope_dialog_tool_without_replacement_retains_bounds() {
+    for tool in ["page", "rectangleFrame"] {
+        let (mut app, ctx, screen, sid) = scope_dialog_with_tool("red red | red", 7, Some(tool));
+        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
+        scope_click(&mut app, &ctx, screen, "Count");
+        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 0, 3);
+        let before = app.session.doc().unwrap().clone();
+        let fields = app.ui.dialog.as_ref().unwrap().fields.clone();
+        scope_control(&mut app, &ctx, "ui.pointer", json!({"events": [{"kind": "move", "x": 200, "y": 200}]}));
+        assert_eq!(app.ui.dialog.as_ref().unwrap().id, "findChange");
+        assert_eq!(app.ui.dialog.as_ref().unwrap().fields, fields);
+        scope_state_unchanged(&app, &before);
+        scope_click(&mut app, &ctx, screen, "Count");
+        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 4, 7);
+        scope_click(&mut app, &ctx, screen, "Change All");
+        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 replacement(s) made");
+        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn find_scope_dialog_native_pdf_replacement_releases_bounds() {
+    let directory = tempfile::tempdir().unwrap();
+    let path = directory.path().join("three.pdf");
+    std::fs::write(&path, crate::browser_import_tests::pdf()).unwrap();
+    for dismissal in ["Cancel", "Escape", "control"] {
+        let (mut app, ctx, screen, sid) = scope_dialog();
+        let picked = std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0));
+        let read = std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0));
+        let seen_pick = picked.clone();
+        let seen_read = read.clone();
+        let pick_path = path.to_string_lossy().to_string();
+        let read_path = pick_path.clone();
+        app.answer_dialogs(move |request| {
+            assert_eq!(place_filter(request), Some("Graphics and text"));
+            seen_pick.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+            craft_dialogs::Answer::Paths(vec![pick_path.clone().into()])
+        });
+        app.services.read = Some(Box::new(move |path| {
+            assert_eq!(path, read_path);
+            seen_read.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+            std::fs::read(path).map_err(|e| e.to_string())
+        }));
+        scope_click(&mut app, &ctx, screen, "Count");
+        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 0, 3);
+        let before = app.session.doc().unwrap().clone();
+        let active = (app.session.active_index(), app.session.documents().len());
+        // Exercise engine.execute -> UiRequest::Pick -> native host PDF replacement.
+        scope_control(&mut app, &ctx, "engine.execute", json!({"command": "file.place", "params": {}}));
+        app.settle_dialogs();
+        assert_eq!(picked.load(std::sync::atomic::Ordering::SeqCst), 1);
+        assert_eq!(read.load(std::sync::atomic::Ordering::SeqCst), 1);
+        let dialog = app.ui.dialog.as_ref().unwrap();
+        assert_eq!(dialog.id, "pdfImport");
+        assert_eq!(dialog.s("path"), path.to_string_lossy());
+        assert_eq!(dialog.fields["pages"], 3);
+        assert_eq!(dialog.s("page"), "1");
+        assert!(!dialog.b("async"));
+        assert_eq!(dialog.fields["target"], json!(before.uid));
+        assert!(app.session.ui_requests.is_empty());
+        assert!(app.pending_pdf.is_none());
+        assert_eq!((app.session.active_index(), app.session.documents().len()), active);
+        scope_state_unchanged(&app, &before);
+        match dismissal {
+            "Cancel" => scope_click(&mut app, &ctx, screen, "Cancel"),
+            "Escape" => {
+                dialog_frame(
+                    &mut app,
+                    &ctx,
+                    screen,
+                    vec![egui::Event::Key {
+                        key: egui::Key::Escape,
+                        physical_key: None,
+                        pressed: true,
+                        repeat: false,
+                        modifiers: egui::Modifiers::NONE,
+                    }],
+                );
+            }
+            "control" => {
+                scope_control(&mut app, &ctx, "ui.dialog.cancel", json!({}));
+            }
+            _ => panic!("known dismissal"),
+        }
+        assert!(app.ui.dialog.is_none());
+        assert!(app.pending_pdf.is_none());
+        assert_eq!(picked.load(std::sync::atomic::Ordering::SeqCst), 1);
+        assert_eq!(read.load(std::sync::atomic::Ordering::SeqCst), 1);
+        assert_eq!((app.session.active_index(), app.session.documents().len()), active);
+        scope_state_unchanged(&app, &before);
+        let p = json!({"find": "red", "change": "blue", "scope": "selection"});
+        let count = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.find", "params": p}));
+        assert_eq!(count, json!([{"story": sid.0, "start": 0, "end": 3, "text": "red"}]));
+        scope_state_unchanged(&app, &before);
+        let changed = scope_control(&mut app, &ctx, "engine.execute", json!({"command": "find.change", "params": p}));
+        assert_eq!(changed, json!({"count": 1}));
+        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), before.history.undo.len() + 1);
+    }
+}
+
+/// The first file type an open dialog offers: Place's is "Graphics and text".
+fn place_filter(request: &craft_dialogs::Request) -> Option<&str> {
+    let craft_dialogs::Request::File(dialog) = request else { return None };
+    dialog.filters.first().map(|filter| filter.name.as_str())
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn find_scope_dialog_native_picker_cancel_retains_bounds() {
+    let (mut app, ctx, screen, sid) = scope_dialog();
+    let picked = std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0));
+    let seen = picked.clone();
+    app.answer_dialogs(move |request| {
+        assert_eq!(place_filter(request), Some("Graphics and text"));
+        seen.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+        craft_dialogs::Answer::Cancelled
+    });
+    let read = std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0));
+    let seen_read = read.clone();
+    app.services.read = Some(Box::new(move |_| {
+        seen_read.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+        Err("canceled picker must not read".into())
+    }));
+    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 0, 3);
+    let before = app.session.doc().unwrap().clone();
+    let active = (app.session.active_index(), app.session.documents().len());
+    let fields = app.ui.dialog.as_ref().unwrap().fields.clone();
+    scope_control(&mut app, &ctx, "engine.execute", json!({"command": "file.place", "params": {}}));
+    app.settle_dialogs();
+    assert_eq!(picked.load(std::sync::atomic::Ordering::SeqCst), 1);
+    assert_eq!(read.load(std::sync::atomic::Ordering::SeqCst), 0);
+    assert_eq!(app.ui.dialog.as_ref().unwrap().id, "findChange");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().fields, fields);
+    assert_eq!((app.session.active_index(), app.session.documents().len()), active);
+    scope_state_unchanged(&app, &before);
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 4, 7);
+    scope_click(&mut app, &ctx, screen, "Change All");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 replacement(s) made");
+    assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), before.history.undo.len() + 1);
+}
+
+#[test]
+fn find_scope_dialog_exact_baseline_buttons() {
+    let (mut app, ctx, screen, sid) = scope_dialog_with_selection("red red", 3);
+    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 match(es)");
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 0, 3);
+    scope_click(&mut app, &ctx, screen, "Change All");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 replacement(s) made");
+    assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red");
+}
+
+#[test]
+fn find_scope_dialog_grep_tab_alone_restarts_original_selection() {
+    let (mut app, ctx, screen, sid) = scope_dialog();
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 0, 3);
+    scope_click(&mut app, &ctx, screen, "GREP");
+    assert!(app.ui.dialog.as_ref().unwrap().b("grep"));
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("find"), "red");
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 0, 3);
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 4, 7);
+    scope_click(&mut app, &ctx, screen, "Text");
+    assert!(!app.ui.dialog.as_ref().unwrap().b("grep"));
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 0, 3);
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+}
+
+#[test]
+fn find_scope_dialog_buttons_retain_nonempty_hits_and_change_all() {
+    let (mut app, ctx, screen, sid) = scope_dialog();
+    let history = app.session.doc().unwrap().history.undo.len();
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 0, 3);
+    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 4, 7);
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "No matches");
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), history);
+    scope_click(&mut app, &ctx, screen, "Change All");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 replacement(s) made");
+    assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), history + 1);
+    scope_click(&mut app, &ctx, screen, "Cancel");
+    assert!(app.ui.dialog.is_none());
+    app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
+    app.run("edit.redo", json!({})).unwrap();
+    let native = app.run("file.serialize", json!({})).unwrap();
+    app.run("file.openBytes", json!({"name": "scope.designcraft", "base64": native["base64"]})).unwrap();
+    assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
+}
+
+fn scope_confirm_case(action: &str) {
+    let (mut app, ctx, screen, sid) = scope_dialog();
+    scope_click(&mut app, &ctx, screen, "Count");
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 0, 3);
+    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
+    match action {
+        "OK" => scope_click(&mut app, &ctx, screen, "OK"),
+        "Enter" => {
+            dialog_frame(
+                &mut app,
+                &ctx,
+                screen,
+                vec![egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE }],
+            );
+        }
+        "control" => {
+            assert_eq!(scope_control(&mut app, &ctx, "ui.dialog.confirm", json!({}))["count"], 2);
+        }
+        _ => panic!("known confirmation route"),
+    }
+    assert!(app.ui.dialog.is_none());
+    assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue blue | red");
+    // The closed dialog cannot leave its old seven-byte range for a later direct query.
+    let matches = app.run("find.find", json!({"find": "blue", "scope": "selection"})).unwrap();
+    assert_eq!(matches.as_array().unwrap().len(), 0);
+}
+
+#[test]
+fn find_scope_dialog_ok_consumes_retained_bounds() {
+    scope_confirm_case("OK");
+}
+
+#[test]
+fn find_scope_dialog_enter_consumes_retained_bounds() {
+    scope_confirm_case("Enter");
+}
+
+#[test]
+fn find_scope_dialog_control_confirm_consumes_retained_bounds() {
+    scope_confirm_case("control");
+}
+
+#[test]
+fn find_scope_dialog_query_reselection_cancel_and_reopen() {
+    let (mut app, ctx, screen, sid) = scope_dialog();
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 0, 3);
+    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "grep", "value": true}));
+    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "find", "value": "r.d"}));
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 0, 3);
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+    scope_control(&mut app, &ctx, "ui.dialog.cancel", json!({}));
+    assert_eq!(app.run("find.find", json!({"find": "red", "scope": "selection"})).unwrap().as_array().unwrap().len(), 1);
+    app.run("text.select", json!({"story": sid.0, "anchor": 0, "focus": 7})).unwrap();
+    app.run("find.next", json!({"find": "red", "scope": "selection"})).unwrap();
+    scope_control(&mut app, &ctx, "ui.dialog.open", json!({"id": "findChange", "fields": {"find": "red", "scope": "selection"}}));
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 match(es)");
+    app.run("text.select", json!({"story": sid.0, "anchor": 4, "focus": 7})).unwrap();
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 4, 7);
+    app.run("app.findChange", json!({})).unwrap();
+    for (field, value) in [("find", "red"), ("scope", "selection")] {
+        scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": field, "value": value}));
+    }
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 match(es)");
+}
+
+#[test]
+fn find_scope_dialog_word_reselection_limits_count_and_change_buttons() {
+    let (mut app, ctx, screen, sid) = scope_dialog();
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+    scope_click(&mut app, &ctx, screen, "Find Next");
+    scope_selected(&app, sid, 0, 3);
+    let selected = app.session.doc().unwrap().selection.clone();
+    let frame = selected.text.unwrap().frame.unwrap();
+    let point = {
+        let st = app.session.doc().unwrap();
+        let cs = app.session.cache.get(&st.doc, sid, None);
+        let (fi, x, baseline, ascent, _) = designcraft_compose::caret(&cs, 1).unwrap();
+        let inner = designcraft_geom::Point::new(x, baseline - ascent * 0.5);
+        assert_eq!(cs.frames[fi].frame, frame);
+        assert_eq!(designcraft_compose::hit(&cs, fi, inner), Some(1));
+        let loc = st.doc.find(frame).unwrap();
+        st.doc.parent_xf(&loc) * st.doc.text_xf(st.doc.item(frame).unwrap()) * inner
+    };
+    let before = app.session.doc().unwrap().doc.clone();
+    let revision = app.session.doc().unwrap().revision;
+    app.run("text.selectWord", json!({"frame": frame.0, "point": [point.x, point.y]})).unwrap();
+    assert_eq!(app.session.doc().unwrap().selection, selected);
+    assert!(app.session.doc().unwrap().revision > revision, "a new revision");
+    assert!(std::sync::Arc::ptr_eq(&before, &app.session.doc().unwrap().doc));
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 match(es)");
+    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
+    scope_click(&mut app, &ctx, screen, "Change All");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "1 replacement(s) made");
+    assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn find_scope_dialog_failed_native_drop_alert_releases_bounds() {
+    let directory = tempfile::tempdir().unwrap();
+    let path = directory.path().join("broken.designcraft");
+    std::fs::write(&path, b"not a native document").unwrap();
+    for dismissal in ["OK", "Escape", "control"] {
+        let (mut app, ctx, screen, sid) = scope_dialog();
+        scope_click(&mut app, &ctx, screen, "Count");
+        assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "2 match(es)");
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 0, 3);
+        let before = app.session.doc().unwrap().doc.clone();
+        let selected = app.session.doc().unwrap().selection.clone();
+        let revision = app.session.doc().unwrap().revision;
+        let history = app.session.doc().unwrap().history.undo.len();
+        let uid = app.session.doc().unwrap().uid;
+        let error = app.open_dropped(&path.to_string_lossy()).unwrap_err();
+        let alert = app.ui.dialog.as_ref().unwrap();
+        assert_eq!(alert.id, "alert");
+        assert_eq!(alert.s("title"), "Can't Open the File");
+        assert_eq!(alert.s("message"), error);
+        assert!(std::sync::Arc::ptr_eq(&before, &app.session.doc().unwrap().doc));
+        assert_eq!(app.session.doc().unwrap().selection, selected);
+        assert_eq!(app.session.doc().unwrap().revision, revision);
+        assert_eq!(app.session.doc().unwrap().uid, uid);
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), history);
+        match dismissal {
+            "OK" => scope_click(&mut app, &ctx, screen, "OK"),
+            "Escape" => {
+                dialog_frame(
+                    &mut app,
+                    &ctx,
+                    screen,
+                    vec![egui::Event::Key {
+                        key: egui::Key::Escape,
+                        physical_key: None,
+                        pressed: true,
+                        repeat: false,
+                        modifiers: egui::Modifiers::NONE,
+                    }],
+                );
+            }
+            "control" => {
+                scope_control(&mut app, &ctx, "ui.dialog.cancel", json!({}));
+            }
+            _ => panic!("known dismissal"),
+        }
+        assert!(app.ui.dialog.is_none());
+        let p = json!({"find": "red", "change": "blue", "scope": "selection"});
+        assert_eq!(app.run("find.find", p.clone()).unwrap(), json!([{"story": sid.0, "start": 0, "end": 3, "text": "red"}]));
+        assert_eq!(app.run("find.change", p).unwrap(), json!({"count": 1}));
+        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "blue red | red");
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), history + 1);
+    }
+}
+
+#[test]
+fn find_scope_dialog_child_errors_and_explicit_parent() {
+    let (mut app, ctx, screen, sid) = scope_dialog();
+    app.run("text.select", json!({"story": sid.0, "anchor": 13, "focus": 13})).unwrap();
+    app.run("table.insert", json!({"rows": 1, "cols": 1})).unwrap();
+    app.run("text.insert", json!({"text": "red child", "raw": true})).unwrap();
+    let child = app.session.doc().unwrap().selection.text.unwrap();
+    let before = app.session.doc().unwrap().doc.clone();
+    let selection = app.session.doc().unwrap().selection.clone();
+    let history = app.session.doc().unwrap().history.undo.len();
+    for label in ["Count", "Find Next", "Change All"] {
+        scope_click(&mut app, &ctx, screen, label);
+        assert!(app.ui.dialog.as_ref().unwrap().s("status").contains("not supported"));
+        assert!(std::sync::Arc::ptr_eq(&before, &app.session.doc().unwrap().doc));
+        assert_eq!(app.session.doc().unwrap().selection, selection);
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), history);
+    }
+    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "change", "value": "blue"}));
+    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "story", "value": sid.0}));
+    scope_click(&mut app, &ctx, screen, "Count");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "3 match(es)");
+    scope_click(&mut app, &ctx, screen, "Change All");
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("status"), "3 replacement(s) made");
+    assert_eq!(app.session.doc().unwrap().doc.text_story(sid, child.cell).unwrap().text, "red child");
+    assert!(app.session.doc().unwrap().doc.story(sid).unwrap().text.starts_with("blue blue | blue"));
+}
+
+#[test]
+fn find_scope_dialog_error_confirmation_and_escape_release_context() {
+    for escape in [false, true] {
+        let (mut app, ctx, screen, sid) = scope_dialog();
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        scope_selected(&app, sid, 0, 3);
+        if escape {
+            dialog_frame(
+                &mut app,
+                &ctx,
+                screen,
+                vec![egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE }],
+            );
+        } else {
+            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "find", "value": "["}));
+            scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "grep", "value": true}));
+            scope_click(&mut app, &ctx, screen, "OK");
+        }
+        assert!(app.ui.dialog.is_none());
+        assert_eq!(app.session.doc().unwrap().doc.story(sid).unwrap().text, "red red | red");
+        assert_eq!(app.run("find.find", json!({"find": "red", "scope": "selection"})).unwrap().as_array().unwrap().len(), 1);
+    }
+}
+
+#[test]
+fn find_scope_dialog_domain_and_object_changes_release_original_range() {
+    for route in ["scope", "object", "menu", "command"] {
+        let (mut app, ctx, screen, _) = scope_dialog();
+        scope_click(&mut app, &ctx, screen, "Find Next");
+        match route {
+            "scope" => {
+                for scope in ["story", "selection"] {
+                    scope_control(&mut app, &ctx, "ui.dialog.set", json!({"field": "scope", "value": scope}));
+                }
+            }
+            "object" => {
+                scope_click(&mut app, &ctx, screen, "Object");
+                scope_click(&mut app, &ctx, screen, "Text");
+            }
+            "menu" => crate::menus::activate(&mut app, "app.newDocumentDialog", &Value::Null),
+            "command" => {
+                app.run("app.newDocumentDialog", json!({})).unwrap();
+            }
+            _ => panic!("known reset route"),
+        }
+        assert_eq!(app.run("find.find", json!({"find": "red", "scope": "selection"})).unwrap().as_array().unwrap().len(), 1);
+    }
+}
+
+#[test]
+fn dialog_title_and_actions_fit_scaled_viewports() {
+    for language in ["en", "ar"] {
+        for size in [egui::vec2(1178.0, 814.0), egui::vec2(589.0, 407.0), egui::vec2(392.0, 271.0), egui::vec2(450.0, 280.0)] {
+            for (command, title, ok, cancel) in
+                [("app.preferences", "Preferences", "OK", "Cancel"), ("app.newDocumentDialog", "New Document", "Create", "Close")]
+            {
+                let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+                app.ui.language = language.into();
+                app.run("file.new", json!({})).unwrap();
+                app.run(command, json!({})).unwrap();
+                let ctx = dialog_context(language);
+                let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, size);
+                for _ in 0..3 {
+                    dialog_frame(&mut app, &ctx, screen, vec![]);
+                }
+                let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+                for expected in [title, ok, cancel] {
+                    visible_label(&labels, screen, crate::i18n::tr(language, expected));
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn preferences_first_setting_switches_interface_language() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("app.preferences", json!({})).unwrap();
+    let ctx = dialog_context("");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1178.0, 814.0));
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let heading = visible_label(&labels, screen, "Interface Language");
+    let combo = visible_label(&labels, screen, "English");
+    let scaling = visible_label(&labels, screen, "When Scaling");
+    assert!(heading.bottom() <= combo.top() && combo.bottom() <= scaling.top(), "the language comes first: {heading:?} {combo:?} {scaling:?}");
+    let pane = labels.iter().filter(|(_, rect, _)| rect.left() >= heading.left() - 1.0 && rect.top() < heading.top());
+    assert!(pane.clone().all(|(text, _, _)| text == "Preferences"), "nothing above it: {:?}", pane.collect::<Vec<_>>());
+
+    // Choosing a language applies it at once; the dialog stays open.
+    click_dialog(&mut app, &ctx, screen, combo.center());
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    for (_, name) in crate::i18n::LANGUAGES {
+        assert!(labels.iter().any(|(text, _, _)| text == name), "{name} is listed by its own name");
+    }
+    let deutsch = visible_label(&labels, screen, "Deutsch").center();
+    click_dialog(&mut app, &ctx, screen, deutsch);
+    assert_eq!(app.ui.language, "de");
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("preferences"));
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let heading = visible_label(&labels, screen, crate::i18n::tr("de", "Interface Language"));
+    let combo = visible_label(&labels, screen, "Deutsch");
+
+    // The names stay endonyms in the German interface.
+    click_dialog(&mut app, &ctx, screen, combo.center());
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    for name in ["English", "Français", "日本語", "Українська"] {
+        assert!(labels.iter().any(|(text, _, _)| text == name), "{name}");
+    }
+    click_dialog(&mut app, &ctx, screen, heading.center());
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    assert!(!labels.iter().any(|(text, _, _)| text == "Français"), "the list closes");
+
+    // The control channel's command and the combo show the same setting.
+    app.run("app.language", json!({"lang": "ja"})).unwrap();
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    assert!(labels.iter().any(|(text, _, _)| text == "日本語"));
+    assert!(labels.iter().any(|(text, _, _)| text == crate::i18n::tr("ja", "Interface Language")));
+
+    // Cancel puts back the language the dialog opened with; OK keeps the choice.
+    let cancel_button = visible_label(&labels, screen, crate::i18n::tr("ja", "Cancel")).center();
+    click_dialog(&mut app, &ctx, screen, cancel_button);
+    assert!(app.ui.dialog.is_none());
+    assert_eq!(app.ui.language, "");
+    app.run("app.preferences", json!({})).unwrap();
+    app.run("app.language", json!({"lang": "it"})).unwrap();
+    confirm(&mut app).unwrap();
+    assert_eq!(app.ui.language, "it");
+    app.run("app.preferences", json!({})).unwrap();
+    app.run("app.language", json!({"lang": "uk"})).unwrap();
+    cancel(&mut app);
+    assert_eq!(app.ui.language, "it");
+}
+
+/// Preferences › Interface › Panels holds Auto-Collapse Iconic Panels, the same setting as the
+/// iconic column's menu.
+#[test]
+fn preferences_set_auto_collapse_iconic_panels() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("app.preferences", json!({})).unwrap();
+    assert_eq!(app.ui.dialog.as_ref().unwrap().fields["autoCollapseIconicPanels"], json!(false));
+    app.ui.dialog.as_mut().unwrap().fields.insert("autoCollapseIconicPanels".into(), json!(true));
+    confirm(&mut app).unwrap();
+    assert!(app.ui.dock_auto_collapse);
+    app.run("app.preferences", json!({})).unwrap();
+    assert_eq!(app.ui.dialog.as_ref().unwrap().fields["autoCollapseIconicPanels"], json!(true));
+}
+
+#[test]
+fn preferences_sidebar_scroll_keeps_selected_options_visible() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("app.preferences", json!({})).unwrap();
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(589.0, 407.0));
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let sidebar = visible_label(&labels, screen, "General").center();
+    assert!(!labels.iter().any(|(text, rect, clip)| text == "File Handling" && clip.contains_rect(*rect)), "last section starts below the sidebar");
+    scroll_dialog(&mut app, &ctx, screen, sidebar, egui::vec2(0.0, -600.0));
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let files = visible_label(&labels, screen, "File Handling").center();
+    click_dialog(&mut app, &ctx, screen, files);
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("section"), "files");
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    for expected in ["Document Recovery Data", "Save recovery data every:", "OK", "Cancel"] {
+        visible_label(&labels, screen, expected);
+    }
+}
+
+#[test]
+fn preferences_horizontal_scroll_reaches_clipped_options() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("app.preferences", json!({})).unwrap();
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(450.0, 280.0));
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let body = visible_label(&labels, screen, "When Scaling").center();
+    // The last General option sits below this short viewport.
+    scroll_dialog(&mut app, &ctx, screen, body, egui::vec2(0.0, -600.0));
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let option = "Absolute Numbering (instead of Section Numbering)";
+    let (_, rect, clip) = labels.iter().find(|(text, _, _)| text == option).unwrap();
+    assert!(rect.right() > clip.right(), "rightmost option starts horizontally clipped: {rect:?}, {clip:?}");
+    scroll_dialog(&mut app, &ctx, screen, body, egui::vec2(-600.0, 0.0));
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    for expected in [option, "Preferences", "OK", "Cancel"] {
+        visible_label(&labels, screen, expected);
+    }
+    click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, option).center());
+    assert!(app.ui.dialog.as_ref().unwrap().b("absolutePageNumbers"));
+}
+
+/// Scroll the dialog body down at `at` until `text` is painted unclipped on screen.
+fn scroll_to_label(app: &mut DesignApp, ctx: &egui::Context, screen: egui::Rect, at: egui::Pos2, text: &str) -> egui::Rect {
+    for _ in 0..40 {
+        let labels = dialog_frame(app, ctx, screen, vec![]);
+        if let Some((_, rect, _)) = labels.iter().find(|(t, r, clip)| t.trim() == text && screen.contains_rect(*r) && clip.contains_rect(*r)) {
+            return *rect;
+        }
+        scroll_dialog(app, ctx, screen, at, egui::vec2(0.0, -60.0));
+    }
+    panic!("{text} never scrolled into view");
+}
+
+#[test]
+fn new_document_vertical_scroll_reaches_every_field_and_preset() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("app.newDocumentDialog", json!({})).unwrap();
+    let ctx = dialog_context("en");
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(392.0, 271.0));
+    for _ in 0..3 {
+        dialog_frame(&mut app, &ctx, screen, vec![]);
+    }
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    let body = visible_label(&labels, screen, "Width").center();
+    let shown = |labels: &[(String, egui::Rect, egui::Rect)]| labels.iter().any(|(t, r, clip)| t == "Primary Text Frame" && clip.contains_rect(*r));
+    assert!(!shown(&labels), "the details start vertically clipped");
+    let ptf = scroll_to_label(&mut app, &ctx, screen, body, "Primary Text Frame");
+    let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+    for expected in ["New Document", "Create", "Close"] {
+        visible_label(&labels, screen, expected);
+    }
+    click_dialog(&mut app, &ctx, screen, ptf.center());
+    assert!(app.ui.dialog.as_ref().unwrap().b("primaryTextFrame"), "the caption toggles its checkbox");
+    // Below the details: the preset tabs and cards.
+    scroll_to_label(&mut app, &ctx, screen, body, "[Default]");
+}
+
+#[test]
+fn arabic_new_document_fields_remain_reachable_and_editable() {
+    for size in [egui::vec2(392.0, 271.0), egui::vec2(450.0, 280.0), egui::vec2(1178.0, 814.0)] {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.ui.language = "ar".into();
+        app.run("app.newDocumentDialog", json!({})).unwrap();
+        let fields = [("height", "66p1"), ("gutter", "1p2"), ("marginBottom", "3p3"), ("marginOutside", "3p4")];
+        for (field, value) in fields {
+            app.ui.dialog.as_mut().unwrap().fields.insert(field.into(), json!(value));
+        }
+        let ctx = dialog_context("ar");
+        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, size);
+        for _ in 0..3 {
+            dialog_frame(&mut app, &ctx, screen, vec![]);
+        }
+        // With craft-fonts' Noto Sans Arabic the rows above are taller, so at the smallest size the
+        // Height field starts partly below the body's clip: scroll to it like the other fields.
+        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+        let (_, _, body) = labels.iter().find(|(text, _, _)| text.trim() == "66p1").expect("66p1 is painted");
+        let height = scroll_to_label(&mut app, &ctx, screen, body.center(), "66p1");
+        click_dialog(&mut app, &ctx, screen, height.center());
+        dialog_frame(
+            &mut app,
+            &ctx,
+            screen,
+            vec![
+                egui::Event::Key {
+                    key: egui::Key::A,
+                    physical_key: None,
+                    pressed: true,
+                    repeat: false,
+                    modifiers: egui::Modifiers { ctrl: true, command: true, ..Default::default() },
+                },
+                egui::Event::Text("88p8".into()),
+            ],
+        );
+        assert_eq!(app.ui.dialog.as_ref().unwrap().s("height"), "88p8", "numeric fields accept edits");
+        let caption = scroll_to_label(&mut app, &ctx, screen, height.center(), crate::i18n::tr("ar", "Primary Text Frame"));
+        click_dialog(&mut app, &ctx, screen, caption.center());
+        assert!(app.ui.dialog.as_ref().unwrap().b("primaryTextFrame"), "checkboxes remain clickable");
+        for (_, value) in &fields[1..] {
+            scroll_to_label(&mut app, &ctx, screen, height.center(), value);
+        }
+    }
+}
+
+#[test]
+fn resized_dialogs_cancel_and_reopen_without_applying_edits() {
+    for (command, title, field, ok, cancel) in
+        [("app.preferences", "Preferences", "recoveryMinutes", "OK", "Cancel"), ("app.newDocumentDialog", "New Document", "pages", "Create", "Close")]
+    {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run(command, json!({})).unwrap();
+        let original = app.ui.dialog.as_ref().unwrap().fields[field].clone();
+        app.ui.dialog.as_mut().unwrap().fields.insert(field.into(), json!(42));
+        let ctx = dialog_context("en");
+        for size in [egui::vec2(1178.0, 814.0), egui::vec2(392.0, 271.0), egui::vec2(589.0, 407.0)] {
+            let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, size);
+            for _ in 0..3 {
+                dialog_frame(&mut app, &ctx, screen, vec![]);
+            }
+            let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+            for expected in [title, ok, cancel] {
+                visible_label(&labels, screen, expected);
+            }
+        }
+        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(589.0, 407.0));
+        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+        click_dialog(&mut app, &ctx, screen, visible_label(&labels, screen, cancel).center());
+        assert!(app.ui.dialog.is_none());
+        assert!(app.session.active().is_none(), "cancelling must not create a document");
+        app.run(command, json!({})).unwrap();
+        assert_eq!(app.ui.dialog.as_ref().unwrap().fields[field], original, "cancelled edits must not survive reopening");
+        for _ in 0..3 {
+            dialog_frame(&mut app, &ctx, screen, vec![]);
+        }
+        let labels = dialog_frame(&mut app, &ctx, screen, vec![]);
+        visible_label(&labels, screen, title);
+        dialog_frame(
+            &mut app,
+            &ctx,
+            screen,
+            vec![egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE }],
+        );
+        assert!(app.ui.dialog.is_none(), "Escape must also close the reopened dialog");
+    }
+}
+
+#[test]
+fn paragraph_style_options_tabs_section_adds_a_stop_on_its_ruler() {
+    use egui_kittest::kittest::Queryable;
+    let (app, _) = ruled_paragraph();
+    let mut h = crate::test_window::open(app, egui::vec2(1400.0, 900.0));
+    h.state_mut().app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Ruled Child", "section": "tabs"})));
+    h.run_steps(4);
+    h.get_by_label("Clear All");
+    // The ruler sits below the row of alignment buttons; its strip takes the click.
+    let b = h.get_by_label("Right-aligned tab").rect();
+    h.get_by_label("Right-aligned tab").click();
+    h.run_steps(2);
+    let left = h.get_by_label("Left-aligned tab").rect();
+    let at = egui::pos2(left.min.x + crate::panels::tabs::PAD + 100.0, b.max.y + 14.0);
+    crate::test_window::click_at(&mut h, at);
+    let d = h.state().app.ui.dialog.clone().unwrap();
+    let tabs = d.fields.get("p.tabs").cloned().unwrap_or_default();
+    assert_eq!(tabs.as_array().map(Vec::len), Some(1), "{tabs}");
+    assert_eq!(tabs[0]["align"], "right");
+    confirm(&mut h.state_mut().app).unwrap();
+    let app = &mut h.state_mut().app;
+    let style = app.session.execute("type.tabs.get", &json!({"style": "Ruled Child"})).unwrap();
+    assert_eq!(style["tabs"], tabs);
+    assert_eq!(app.session.execute("type.tabs.get", &json!({})).unwrap()["tabs"], tabs, "the paragraph follows its style");
+}
+
+#[test]
+fn parses_command_params() {
+    let f = command_fields("{name, type: custom|lastPageNumber|chapterNumber, text?, rule?: {on, weight}, flag?: bool} — creates");
+    let keys: Vec<&str> = f.iter().map(|f| f.key.as_str()).collect();
+    assert_eq!(keys, ["name", "type", "text", "rule", "flag"]);
+    assert_eq!(f[1].choices, ["custom", "lastPageNumber", "chapterNumber"]);
+    assert!(!f[0].optional && f[2].optional);
+    assert!(f[4].boolean);
+    assert!(command_fields("{}").is_empty());
+    assert!(command_fields("no params").is_empty());
+    // A parenthetical after the key describes the value.
+    let f = command_fields("{angle (degrees, CCW), ids?}");
+    let keys: Vec<&str> = f.iter().map(|f| f.key.as_str()).collect();
+    assert_eq!(keys, ["angle", "ids"]);
+    assert!(!f[0].optional && f[1].optional);
+    assert_eq!(f[0].hint, "degrees, CCW");
+    let f = command_fields("{scaleX? (%), ref?: 0..8, ids?: parent items (default: all)}");
+    let keys: Vec<&str> = f.iter().map(|f| f.key.as_str()).collect();
+    assert_eq!(keys, ["scaleX", "ref", "ids"]);
+    assert!(f.iter().all(|f| f.optional));
+    assert_eq!(f[0].hint, "%");
+    assert_eq!(f[2].hint, "parent items (default: all)");
+    // Every command with a "…" label parses without panicking.
+    for c in designcraft_engine::command_specs() {
+        let _ = command_fields(c.params);
+    }
+}
+
+fn test_app() -> crate::DesignApp {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({"pages": 1})).unwrap();
+    app
+}
+
+#[test]
+fn toc_dialog_keeps_the_character_styles_and_sorting_of_its_entries() {
+    let mut app = test_app();
+    app.session.execute("style.paragraph.create", &json!({"name": "Head"})).unwrap();
+    app.session.execute("style.character.create", &json!({"name": "Number"})).unwrap();
+    app.session.execute("style.character.create", &json!({"name": "Dots"})).unwrap();
+    let sid = app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Pears\nApples"})).unwrap()["story"]
+        .clone();
+    app.session.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 8})).unwrap();
+    app.session.execute("style.paragraph.apply", &json!({"name": "Head"})).unwrap();
+    app.session.execute("layout.pages.insert", &json!({"count": 1})).unwrap();
+    let entries = json!([{"style": "Head", "pageNumberStyle": "Number", "separatorStyle": "Dots", "sort": true}]);
+    app.session.execute("toc.generate", &json!({"page": 2, "entries": entries})).unwrap();
+    let before = app.session.active().unwrap().doc.toc.clone().unwrap();
+    // The dialog shows the options, and OK (Replace Existing) writes them back unchanged.
+    open_toc(&mut app);
+    let d = app.ui.dialog.as_ref().unwrap();
+    let row = &toc_rows(d)[0];
+    assert_eq!((row.page_number_style.as_str(), row.separator_style.as_str(), row.sort), ("Number", "Dots", true));
+    let chars: Vec<String> = serde_json::from_value(d.fields["charStyles"].clone()).unwrap();
+    assert_eq!(chars, ["Number", "Dots"], "[None] is the menu's first choice, not a style");
+    let p = toc_params(&app, d);
+    assert_eq!(
+        (&p["entries"][0]["pageNumberStyle"], &p["entries"][0]["separatorStyle"], &p["entries"][0]["sort"]),
+        (&json!("Number"), &json!("Dots"), &json!(true))
+    );
+    confirm(&mut app).expect("OK regenerates the table of contents");
+    let st = app.session.active().unwrap();
+    assert_eq!(st.doc.toc.as_ref().unwrap().entries, before.entries);
+    // [None] and unsorted are left out of the params.
+    let mut d = Dialog::new(TOC, json!({"included": [{"style": "Head", "level": 1, "separator": "^t"}]}));
+    d.fields.insert("replace".into(), json!(true));
+    let p = toc_params(&app, &d);
+    assert!(p["entries"][0].get("pageNumberStyle").is_none() && p["entries"][0].get("sort").is_none(), "{p}");
+}
+
+#[test]
+fn paragraph_style_options_dialog_saves_edits() {
+    let mut app = test_app();
+    let name = app.session.execute("style.paragraph.create", &json!({"name": "Body Copy"})).unwrap()["name"].as_str().unwrap().to_string();
+    app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": name, "p.align": "center"})));
+    confirm(&mut app).expect("OK saves the style edit");
+    let st = app.session.active().unwrap();
+    assert_eq!(st.doc.styles.para(&name).unwrap().para.align, Some(designcraft_doc::Align::Center));
+}
+
+#[test]
+fn paragraph_style_options_align_to_grid_shows_and_sets_the_style_grid_alignment() {
+    use designcraft_doc::GridAlign;
+    use egui_kittest::kittest::Queryable;
+    let mut app = test_app();
+    app.session.execute("style.paragraph.create", &json!({"name": "Grid Body", "para": {"gridAlign": "firstLineOnly"}})).unwrap();
+    app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Grid Body", "section": "indents"})));
+    let mut h = crate::test_window::open(app, egui::vec2(1400.0, 900.0));
+    let grid = |h: &egui_kittest::Harness<'static, crate::test_window::Window>| {
+        h.state().app.session.active().unwrap().doc.styles.para("Grid Body").unwrap().para.grid_align
+    };
+    h.run_steps(4);
+    h.get_by_value("First Line Only");
+    confirm(&mut h.state_mut().app).unwrap();
+    assert_eq!(grid(&h), Some(GridAlign::FirstLineOnly), "OK without edits keeps the style's alignment");
+    h.state_mut().app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": "Grid Body", "section": "indents"})));
+    h.run_steps(4);
+    h.get_by_value("First Line Only").click();
+    h.run_steps(3);
+    h.get_by_label("All Lines").click();
+    h.run_steps(3);
+    confirm(&mut h.state_mut().app).unwrap();
+    assert_eq!(grid(&h), Some(GridAlign::AllLines));
+}
+
+#[test]
+fn delete_paragraph_style_dialog_removes_the_style_and_reassigns_text() {
+    let mut app = test_app();
+    let name = app.session.execute("style.paragraph.create", &json!({"name": "Caption"})).unwrap()["name"].as_str().unwrap().to_string();
+    let sid = app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text"})).unwrap()["story"].as_u64().unwrap();
+    app.session.execute("text.insert", &json!({"text": "Hello"})).unwrap();
+    app.session.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
+    app.session.execute("style.paragraph.apply", &json!({"name": name})).unwrap();
+    app.ui.dialog = Some(Dialog::new("deleteParagraphStyle", json!({"name": name, "replaceWith": designcraft_doc::BASIC_PARAGRAPH})));
+    confirm(&mut app).expect("OK deletes the style");
+    let st = app.session.active().unwrap();
+    assert!(st.doc.styles.para(&name).is_none(), "style removed");
+    let story = st.doc.stories.get(&designcraft_doc::StoryId(sid)).unwrap();
+    assert_eq!(story.paras[0].style, designcraft_doc::BASIC_PARAGRAPH, "text reassigned to the replacement style");
+}
+
+#[test]
+fn delete_paragraph_style_dialog_defaults_replacement_to_basic_paragraph() {
+    let mut app = test_app();
+    let name = app.session.execute("style.paragraph.create", &json!({"name": "Caption"})).unwrap()["name"].as_str().unwrap().to_string();
+    // No `replaceWith` set — the dialog's default field.
+    app.ui.dialog = Some(Dialog::new("deleteParagraphStyle", json!({"name": name})));
+    confirm(&mut app).expect("OK deletes the style with the default replacement");
+    let st = app.session.active().unwrap();
+    assert!(st.doc.styles.para(&name).is_none());
+}
+
+#[test]
+fn character_style_options_dialog_saves_edits() {
+    let mut app = test_app();
+    let name = app.session.execute("style.character.create", &json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
+    app.ui.dialog = Some(Dialog::new("characterStyleOptions", json!({"name": name, "c.tracking": 20.0})));
+    confirm(&mut app).expect("OK saves the style edit");
+    let st = app.session.active().unwrap();
+    assert_eq!(st.doc.styles.char_style(&name).unwrap().chars.tracking, Some(20.0));
+}
+
+#[test]
+fn delete_character_style_dialog_removes_the_style_and_reassigns_text() {
+    let mut app = test_app();
+    let name = app.session.execute("style.character.create", &json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
+    let sid = app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text"})).unwrap()["story"].as_u64().unwrap();
+    app.session.execute("text.insert", &json!({"text": "Hello"})).unwrap();
+    app.session.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 5})).unwrap();
+    app.session.execute("style.character.apply", &json!({"name": name})).unwrap();
+    app.ui.dialog = Some(Dialog::new("deleteCharacterStyle", json!({"name": name, "replaceWith": designcraft_doc::NO_CHAR_STYLE})));
+    confirm(&mut app).expect("OK deletes the style");
+    let st = app.session.active().unwrap();
+    assert!(st.doc.styles.char_style(&name).is_none(), "style removed");
+    let story = st.doc.stories.get(&designcraft_doc::StoryId(sid)).unwrap();
+    assert_eq!(story.chars[0].format.style, designcraft_doc::NO_CHAR_STYLE, "text reassigned to the replacement style");
+}
+
+#[test]
+fn delete_character_style_dialog_defaults_replacement_to_none() {
+    let mut app = test_app();
+    let name = app.session.execute("style.character.create", &json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
+    // No `replaceWith` set — the dialog's default field.
+    app.ui.dialog = Some(Dialog::new("deleteCharacterStyle", json!({"name": name})));
+    confirm(&mut app).expect("OK deletes the style with the default replacement");
+    let st = app.session.active().unwrap();
+    assert!(st.doc.styles.char_style(&name).is_none());
+}
+
+/// File › Export EPUB… opens EPUB Export Options from the document's setting; OK stores a
+/// changed Split Document as one undo step, and an unchanged one adds none.
+#[test]
+fn epub_export_passes_its_options_to_the_engine() {
+    use std::io::Read;
+    use std::sync::{Arc, Mutex};
+    let mut app = test_app();
+    app.session.execute("style.paragraph.create", &json!({"name": "Chapter"})).unwrap();
+    let r = app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 300], "content": "text", "text": "One\nTwo"})).unwrap();
+    let sid = r["story"].as_u64().unwrap();
+    for anchor in [0, 4] {
+        app.session.execute("text.select", &json!({"story": sid, "anchor": anchor, "focus": anchor})).unwrap();
+        app.session.execute("style.paragraph.apply", &json!({"name": "Chapter"})).unwrap();
+    }
+    let written: Arc<Mutex<Vec<u8>>> = Arc::new(Mutex::new(Vec::new()));
+    let sink = written.clone();
+    app.services.write = Some(Box::new(move |_: &str, bytes: &[u8]| {
+        *sink.lock().unwrap() = bytes.to_vec();
+        Ok(())
+    }));
+    crate::menus::export_epub(&mut app, &json!({"path": "book.epub", "split": {"style": "Chapter"}})).unwrap();
+    let bytes = written.lock().unwrap().clone();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
+    let mut opf = String::new();
+    z.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut opf).unwrap();
+    assert!(opf.contains("properties=\"cover-image\""), "the first page is the cover: {opf}");
+    assert!(z.by_name("OEBPS/content2.xhtml").is_ok(), "the split override reaches the export");
+    assert_eq!(app.session.active().unwrap().doc.settings.epub_split, designcraft_doc::EpubSplit::Off, "an override is not stored");
+    crate::menus::export_epub(&mut app, &json!({"path": "book.epub", "cover": false})).unwrap();
+    let bytes = written.lock().unwrap().clone();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).unwrap();
+    let mut opf = String::new();
+    z.by_name("OEBPS/content.opf").unwrap().read_to_string(&mut opf).unwrap();
+    assert!(!opf.contains("cover-image"), "a caller's cover: false stays: {opf}");
+}
+
+#[test]
+fn epub_export_options_store_split_document() {
+    use designcraft_doc::EpubSplit;
+    let mut app = test_app();
+    app.session.execute("style.paragraph.create", &json!({"name": "Chapter"})).unwrap();
+    let undo_steps = |app: &crate::DesignApp| app.session.active().map(|st| st.history.undo.len());
+    app.run("app.exportEpub", json!({})).unwrap();
+    let d = app.ui.dialog.as_mut().unwrap();
+    assert_eq!((d.id.as_str(), d.b("split"), d.s("style").as_str()), ("epubExport", false, designcraft_doc::BASIC_PARAGRAPH));
+    d.fields.insert("split".into(), json!(true));
+    d.fields.insert("style".into(), json!("Chapter"));
+    let before = undo_steps(&app);
+    confirm(&mut app).unwrap();
+    assert_eq!(app.session.active().unwrap().doc.settings.epub_split, EpubSplit::Style("Chapter".into()));
+    assert_eq!(undo_steps(&app), before.map(|n| n + 1));
+    open_epub_export(&mut app);
+    assert_eq!(app.ui.dialog.as_ref().map(|d| (d.b("split"), d.s("mode"), d.s("style"))), Some((true, "style".into(), "Chapter".into())));
+    confirm(&mut app).unwrap();
+    assert_eq!(undo_steps(&app), before.map(|n| n + 1), "unchanged: no undo step");
+    open_epub_export(&mut app);
+    app.ui.dialog.as_mut().unwrap().fields.insert("mode".into(), json!("exportTags"));
+    confirm(&mut app).unwrap();
+    assert_eq!(app.session.active().unwrap().doc.settings.epub_split, EpubSplit::ExportTags);
+    open_epub_export(&mut app);
+    cancel(&mut app);
+    assert_eq!(app.session.active().unwrap().doc.settings.epub_split, EpubSplit::ExportTags, "Cancel stores nothing");
+}
+
+#[test]
+fn pdf_export_defaults() {
+    let d = Dialog::new("pdfExport", json!({}));
+    let keys: Vec<&str> = d.fields.iter().map(|(k, _)| k.as_str()).collect();
+    // serde_json::Map keeps keys sorted.
+    let expected = [
+        "bleed",
+        "compressImages",
+        "flatten",
+        "marksBleed",
+        "marksCrop",
+        "marksOffset",
+        "marksPageInfo",
+        "marksWeight",
+        "preset",
+        "spreads",
+        "standard",
+        "tagged",
+    ];
+    assert_eq!(keys, expected);
+    assert_eq!(d.fields["preset"].as_str(), Some("Desktop Printing"));
+    assert_eq!(d.fields["standard"].as_str(), Some("none"));
+    assert_eq!(d.fields["compressImages"].as_bool(), Some(false));
+    assert_eq!(d.fields["flatten"].as_str(), Some(""));
+    assert_eq!(d.fields["spreads"].as_bool(), Some(false));
+    assert_eq!(d.fields["bleed"].as_bool(), Some(true));
+    assert_eq!(d.fields["marksCrop"].as_bool(), Some(false));
+    assert_eq!(d.fields["marksBleed"].as_bool(), Some(false));
+    assert_eq!(d.fields["marksPageInfo"].as_bool(), Some(false));
+    assert_eq!(d.fields["marksWeight"].as_str(), Some("0.25"));
+    assert_eq!(d.fields["marksOffset"].as_str(), Some("6"));
+    assert_eq!(d.fields["tagged"].as_bool(), Some(true));
+}
+
+#[test]
+fn pdf_export_override_keeps_override() {
+    let d = Dialog::new("pdfExport", json!({"bleed": false}));
+    assert_eq!(d.fields["bleed"].as_bool(), Some(false));
+    assert_eq!(d.fields["preset"].as_str(), Some("Desktop Printing"));
+    assert_eq!(d.fields["tagged"].as_bool(), Some(true));
+}
+
+#[test]
+fn pdf_export_preset_high_quality_print_keeps_flatten() {
+    let mut d = Dialog::new("pdfExport", json!({}));
+    d.fields.insert("flatten".into(), json!("medium"));
+    apply_pdf_preset(&mut d, "Desktop Printing");
+    assert_eq!(d.s("standard"), "none");
+    assert!(!d.b("compressImages"));
+    assert!(!d.b("marksCrop"));
+    assert!(!d.b("marksBleed"));
+    assert!(!d.b("marksPageInfo"));
+    assert_eq!(d.s("flatten"), "medium", "a leave-unchanged preset must not touch flatten");
+}
+
+#[test]
+fn pdf_export_preset_press_quality_keeps_flatten() {
+    let mut d = Dialog::new("pdfExport", json!({}));
+    d.fields.insert("flatten".into(), json!("high"));
+    apply_pdf_preset(&mut d, "Commercial Printing");
+    assert_eq!(d.s("standard"), "none");
+    assert!(d.b("compressImages"));
+    assert!(d.b("marksCrop"));
+    assert!(d.b("marksBleed"));
+    assert!(!d.b("marksPageInfo"));
+    assert_eq!(d.s("flatten"), "high");
+}
+
+#[test]
+fn pdf_export_preset_smallest_file_size_sets_flatten_low() {
+    let mut d = Dialog::new("pdfExport", json!({}));
+    apply_pdf_preset(&mut d, "Screen and Email");
+    assert_eq!(d.s("standard"), "none");
+    assert!(d.b("compressImages"));
+    assert!(!d.b("marksCrop"));
+    assert!(!d.b("marksBleed"));
+    assert!(!d.b("marksPageInfo"));
+    assert_eq!(d.s("flatten"), "low");
+}
+
+/// The PDF/X-1a preset exports X-1a with the High Resolution flattener and printer's marks.
+#[test]
+fn pdf_export_preset_pdf_x1a_flattens_at_high_resolution() {
+    let mut d = Dialog::new("pdfExport", json!({}));
+    apply_pdf_preset(&mut d, "PDF/X-1a:2003");
+    assert_eq!(d.s("standard"), "x1a");
+    assert_eq!(d.s("flatten"), "high");
+    assert!(d.b("marksCrop") && d.b("marksBleed"));
+    assert!(PDF_EXPORT_PRESETS.contains(&"PDF/X-1a:2003"));
+}
+
+#[test]
+fn pdf_export_preset_pdf_x4_keeps_flatten() {
+    let mut d = Dialog::new("pdfExport", json!({}));
+    d.fields.insert("flatten".into(), json!("medium"));
+    apply_pdf_preset(&mut d, "PDF/X-4");
+    assert_eq!(d.s("standard"), "x4");
+    assert!(!d.b("compressImages"));
+    assert!(d.b("marksCrop"));
+    assert!(d.b("marksBleed"));
+    assert!(!d.b("marksPageInfo"));
+    assert_eq!(d.s("flatten"), "medium");
+}
+
+#[test]
+fn pdf_export_preset_pdf_a2b_keeps_flatten() {
+    let mut d = Dialog::new("pdfExport", json!({}));
+    d.fields.insert("flatten".into(), json!("low"));
+    apply_pdf_preset(&mut d, "PDF/A-2b");
+    assert_eq!(d.s("standard"), "a2b");
+    assert!(!d.b("compressImages"));
+    assert!(!d.b("marksCrop"));
+    assert!(!d.b("marksBleed"));
+    assert!(!d.b("marksPageInfo"));
+    assert_eq!(d.s("flatten"), "low");
+}
+
+#[test]
+fn open_pdf_export_seeds_fields_from_settings() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui.pdf_export.standard = "x4".into();
+    app.ui.pdf_export.tagged = false;
+    app.ui.pdf_export.marks_crop = true;
+    app.ui.pdf_export.flatten = String::new();
+    app.ui.flattener = "medium".into();
+    open_pdf_export(&mut app);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!(d.id, "pdfExport");
+    assert_eq!(d.s("standard"), "x4");
+    assert!(!d.b("tagged"));
+    assert!(d.b("marksCrop"));
+    assert_eq!(d.s("pages"), "all");
+    assert_eq!(d.s("flatten"), "medium", "empty flatten falls back to the global flattener");
+    assert_eq!(d.s("title"), "", "no document → empty title");
+
+    // A non-empty persisted flatten is used verbatim, not the global fallback.
+    app.ui.pdf_export.flatten = "low".into();
+    app.ui.flattener = "medium".into();
+    open_pdf_export(&mut app);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!(d.s("flatten"), "low");
+}
+
+#[test]
+fn pdf_export_preset_custom_changes_nothing() {
+    let mut d = Dialog::new("pdfExport", json!({}));
+    d.fields.insert("standard".into(), json!("x4"));
+    d.fields.insert("compressImages".into(), json!(true));
+    d.fields.insert("marksCrop".into(), json!(true));
+    d.fields.insert("marksBleed".into(), json!(true));
+    d.fields.insert("marksPageInfo".into(), json!(true));
+    d.fields.insert("flatten".into(), json!("high"));
+    let before = d.fields.clone();
+    apply_pdf_preset(&mut d, "Custom");
+    assert_eq!(d.fields, before);
+}
+
+#[test]
+fn confirm_pdf_export_writes_file_and_persists_settings() {
+    use std::sync::{Arc, Mutex};
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let writes: Arc<Mutex<Vec<(String, Vec<u8>)>>> = Arc::new(Mutex::new(Vec::new()));
+    let sink = writes.clone();
+    app.services.write = Some(Box::new(move |path: &str, bytes: &[u8]| {
+        sink.lock().unwrap().push((path.to_string(), bytes.to_vec()));
+        Ok(())
+    }));
+    app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(Some("/tmp/designcraft-test.pdf".into())));
+
+    app.ui.dialog = Some(Dialog::new("pdfExport", json!({})));
+    {
+        let d = app.ui.dialog.as_mut().unwrap();
+        d.fields.insert("standard".into(), json!("x4"));
+        d.fields.insert("bleed".into(), json!(false));
+        d.fields.insert("marksCrop".into(), json!(true));
+        d.fields.insert("tagged".into(), json!(false));
+        d.fields.insert("title".into(), json!("Report"));
+    }
+    confirm(&mut app).unwrap();
+    app.settle_dialogs();
+
+    let got = writes.lock().unwrap();
+    assert_eq!(got.len(), 1, "confirming the dialog writes exactly one file");
+    assert_eq!(got[0].0, "/tmp/designcraft-test.pdf");
+    assert!(got[0].1.starts_with(b"%PDF"), "the written bytes are a PDF");
+    drop(got);
+
+    assert_eq!(app.ui.pdf_export.standard, "x4");
+    assert!(!app.ui.pdf_export.bleed);
+    assert!(app.ui.pdf_export.marks_crop);
+    assert!(!app.ui.pdf_export.tagged);
+}
+
+#[test]
+fn update_link_asks_before_replacing_edits_made_in_the_layout() {
+    let dir = std::env::temp_dir().join(format!("dc-update-link-dialog-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("note.txt");
+    std::fs::write(&path, "One").unwrap();
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let r = app.session.execute("file.place", &json!({"path": path.to_string_lossy(), "link": true, "rect": [72, 72, 300, 200]})).unwrap();
+    let sid = r["story"].as_u64().unwrap();
+    let text = |app: &crate::DesignApp| app.session.doc().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().text.clone();
+
+    // Not edited in the layout: updates without asking.
+    std::fs::write(&path, "Two").unwrap();
+    crate::panels::properties::update_links(&mut app, json!({"story": sid}));
+    assert!(app.ui.dialog.is_none());
+    assert_eq!(text(&app), "Two");
+
+    // Edited in the layout: asks first; Cancel changes nothing.
+    app.session.execute("story.setText", &json!({"story": sid, "text": "Mine"})).unwrap();
+    std::fs::write(&path, "Three").unwrap();
+    crate::panels::properties::update_links(&mut app, json!({"story": sid}));
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!((d.id.as_str(), d.s("files").as_str()), ("updateLink", "note.txt"));
+    app.ui.dialog = None;
+    assert_eq!(text(&app), "Mine");
+
+    // Window › Links › Update Link (all links) asks too; confirming updates.
+    crate::menus::activate(&mut app, "links.update", &Value::Null);
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("updateLink"));
+    confirm(&mut app).unwrap();
+    assert!(app.ui.dialog.is_none());
+    assert_eq!(text(&app), "Three");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+#[test]
+fn confirm_pdf_export_cancelled_save_writes_nothing() {
+    use std::sync::{Arc, Mutex};
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let writes: Arc<Mutex<Vec<(String, Vec<u8>)>>> = Arc::new(Mutex::new(Vec::new()));
+    let sink = writes.clone();
+    app.services.write = Some(Box::new(move |path: &str, bytes: &[u8]| {
+        sink.lock().unwrap().push((path.to_string(), bytes.to_vec()));
+        Ok(())
+    }));
+    app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(None));
+
+    app.ui.dialog = Some(Dialog::new("pdfExport", json!({})));
+    let r = confirm(&mut app).unwrap();
+    assert_eq!(r, Value::Null);
+    app.settle_dialogs();
+    assert!(writes.lock().unwrap().is_empty(), "cancelling the save picker must not write");
+}
+
+use designcraft_doc::{CharAttrs, CharacterStyle};
+
+/// A document with character styles Base (bold) and Emphasis (italic) on the first two letters.
+fn styled_app() -> DesignApp {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("style.character.create", json!({"name": "Base", "chars": {"fontStyle": "Bold"}})).unwrap();
+    app.run("style.character.create", json!({"name": "Emphasis", "chars": {"fontStyle": "Italic"}})).unwrap();
+    let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hi there"})).unwrap();
+    app.run("text.select", json!({"story": r["story"], "anchor": 0, "focus": 2})).unwrap();
+    app.run("style.character.apply", json!({"name": "Emphasis"})).unwrap();
+    app
+}
+
+/// One control-channel request, as the control port or MCP would send it.
+fn ctl(app: &mut DesignApp, method: &str, params: Value) -> Value {
+    let (req, _reply) = crate::control::ControlRequest::new(method, params);
+    match crate::control::handle(app, &egui::Context::default(), &req) {
+        crate::control::Outcome::Done(v) => v,
+        crate::control::Outcome::Screenshot { .. } => Value::Null,
+    }
+}
+
+fn char_style(app: &DesignApp, name: &str) -> Option<CharacterStyle> {
+    app.session.active().and_then(|st| st.doc.styles.char_style(name).cloned())
+}
+
+#[test]
+fn character_style_options_set_exactly_the_edited_attributes() {
+    let mut app = styled_app();
+    assert_eq!(ctl(&mut app, "ui.dialog.open", json!({"id": "characterStyleOptions", "fields": {"name": "Emphasis"}}))["ok"], true);
+    ctl(&mut app, "ui.dialog.set", json!({"field": "c.size", "value": 14}));
+    ctl(&mut app, "ui.dialog.set", json!({"field": "c.fill", "value": "[Paper]"}));
+    ctl(&mut app, "ui.dialog.set", json!({"field": "basedOn", "value": "Base"}));
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
+    assert!(app.ui.dialog.is_none());
+    let st = char_style(&app, "Emphasis").unwrap();
+    assert_eq!(st.based_on.as_deref(), Some("Base"));
+    assert_eq!(st.chars, CharAttrs { font_style: Some("Italic".into()), size: Some(14.0), fill: Some("[Paper]".into()), ..Default::default() });
+}
+
+#[test]
+fn character_style_options_unset_cleared_fields_and_rename_every_use() {
+    let mut app = styled_app();
+    ctl(&mut app, "ui.dialog.open", json!({"id": "characterStyleOptions", "fields": {"name": "Emphasis"}}));
+    ctl(&mut app, "ui.dialog.set", json!({"field": "c.fontStyle", "value": null}));
+    ctl(&mut app, "ui.dialog.set", json!({"field": "rename", "value": "Strong"}));
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
+    assert!(char_style(&app, "Emphasis").is_none());
+    assert!(char_style(&app, "Strong").unwrap().chars.is_empty());
+    let st = app.session.active().unwrap();
+    let story = st.doc.stories.values().next().unwrap();
+    assert!(story.chars.iter().any(|r| r.format.style == "Strong"));
+    // A taken name keeps the dialog open with the reason.
+    ctl(&mut app, "ui.dialog.open", json!({"id": "characterStyleOptions", "fields": {"name": "Strong"}}));
+    ctl(&mut app, "ui.dialog.set", json!({"field": "rename", "value": "Base"}));
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], false);
+    assert!(app.ui.dialog.as_ref().is_some_and(|d| !d.s("status").is_empty()));
+    assert!(char_style(&app, "Strong").is_some());
+}
+
+#[test]
+fn new_character_style_opens_its_options_and_creates_the_style() {
+    let mut app = styled_app();
+    crate::menus::activate(&mut app, "style.character.create", &Value::Null);
+    let d = app.ui.dialog.clone().unwrap();
+    assert_eq!((d.id.as_str(), d.b("new"), d.s("rename").as_str()), ("characterStyleOptions", true, "Character Style 1"));
+    ctl(&mut app, "ui.dialog.set", json!({"field": "c.size", "value": 9}));
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
+    let st = char_style(&app, "Character Style 1").unwrap();
+    assert_eq!((st.based_on, st.chars), (None, CharAttrs { size: Some(9.0), ..Default::default() }));
+    crate::menus::activate(&mut app, "style.character.create", &Value::Null);
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("rename"), "Character Style 2");
+}
+
+#[test]
+fn new_paragraph_style_opens_its_options_and_creates_the_style() {
+    let mut app = styled_app();
+    crate::menus::activate(&mut app, "style.paragraph.create", &Value::Null);
+    let d = app.ui.dialog.clone().unwrap();
+    assert_eq!((d.id.as_str(), d.b("new"), d.s("rename").as_str()), ("paragraphStyleOptions", true, "Paragraph Style 1"));
+    ctl(&mut app, "ui.dialog.set", json!({"field": "c.size", "value": 20}));
+    ctl(&mut app, "ui.dialog.set", json!({"field": "basedOn", "value": designcraft_doc::BASIC_PARAGRAPH}));
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
+    let st = app.session.active().unwrap().doc.styles.para("Paragraph Style 1").cloned().unwrap();
+    assert_eq!(st.based_on.as_deref(), Some(designcraft_doc::BASIC_PARAGRAPH));
+    assert_eq!(st.chars, CharAttrs { size: Some(20.0), ..Default::default() });
+}
+
+#[test]
+fn style_rows_open_their_options_except_none() {
+    let mut app = styled_app();
+    open_style_options(&mut app, false, "Emphasis");
+    let d = app.ui.dialog.take().unwrap();
+    assert_eq!((d.id.as_str(), d.s("name").as_str()), ("characterStyleOptions", "Emphasis"));
+    open_style_options(&mut app, false, designcraft_doc::NO_CHAR_STYLE);
+    assert!(app.ui.dialog.is_none());
+    open_style_options(&mut app, true, designcraft_doc::BASIC_PARAGRAPH);
+    assert_eq!(app.ui.dialog.take().unwrap().id, "paragraphStyleOptions");
+}
+
+#[test]
+fn style_options_sections_draw() {
+    let mut app = styled_app();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut DesignApp| {
+        for _ in 0..2 {
+            let raw = egui::RawInput {
+                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1440.0, 900.0))),
+                max_texture_side: Some(8192),
+                ..Default::default()
+            };
+            let mut out = ctx.run_ui(raw, |ui| {
+                app.logic(&ui.ctx().clone());
+                app.ui(ui);
+            });
+            out.textures_delta.clear();
+        }
+    };
+    for lang in ["", "ar"] {
+        app.run("app.language", json!({"lang": lang})).unwrap();
+        for fields in [json!({"name": "Emphasis"}), json!({"new": true}), json!({"name": "Emphasis", "c.size": null, "c.underline": false})] {
+            for section in ["general", "chars", "advanced", "color", "openType", "underline", "strikethrough"] {
+                let mut f = fields.clone();
+                f["section"] = json!(section);
+                app.ui.dialog = Some(Dialog::new("characterStyleOptions", f));
+                frame(&mut app);
+                assert!(app.ui.dialog.is_some(), "{section} stays open");
+            }
+        }
+        for section in
+            ["general", "chars", "advanced", "border", "shading", "keep", "span", "bullets", "color", "openType", "underline", "strikethrough"]
+        {
+            for fields in [
+                json!({"new": true}),
+                json!({"new": true, "p.listType": "bullets", "p.spanColumns": {"kind": "span", "columns": 0}, "p.borderOn": true}),
+                json!({"new": true, "p.listType": "numbers", "p.startAt": 1, "p.spanColumns": {"kind": "split", "columns": 2}, "p.keepLinesTogether": true}),
+            ] {
+                let mut f = fields;
+                f["section"] = json!(section);
+                app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", f));
+                frame(&mut app);
+                assert!(app.ui.dialog.is_some(), "{section} stays open");
+            }
+        }
+    }
+}
+
+#[test]
+fn dragging_the_title_moves_the_dialog_and_dragging_the_body_does_not() {
+    use egui::{Event, Modifiers, PointerButton, Pos2, vec2};
+    use egui_kittest::{Harness, kittest::Queryable};
+    fn drag(h: &mut Harness<'static, DesignApp>, from: Pos2, to: Pos2) {
+        h.event(Event::PointerMoved(from));
+        h.run_steps(1);
+        h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+        h.run_steps(1);
+        for step in 1..=8 {
+            h.event(Event::PointerMoved(from + (to - from) * (step as f32 / 8.0)));
+            h.run_steps(1);
+        }
+        h.event(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+        h.run_steps(3);
+    }
+    let rect = |h: &Harness<'static, DesignApp>| h.ctx.memory(|m| m.area_rect(egui::Id::unique("dialog"))).unwrap();
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.ui.dialog = Some(Dialog::new("insertTable", Value::Null));
+    let mut ready = false;
+    let mut h = Harness::builder().with_size(vec2(1200.0, 800.0)).with_step_dt(1.0 / 60.0).build_ui_state(
+        move |ui, app: &mut DesignApp| {
+            if !ready {
+                crate::theme::install_fonts(ui.ctx(), &app.ui.language);
+                crate::theme::apply(ui.ctx(), &crate::theme::Tokens::for_brightness(crate::theme::Brightness::default()));
+                ready = true;
+                return;
+            }
+            show(app, ui.ctx());
+        },
+        app,
+    );
+    h.run_steps(4);
+    let centred = rect(&h);
+    assert!((centred.center() - egui::pos2(600.0, 400.0)).length() < 1.0, "{centred:?}");
+    assert!(centred.width() < 1000.0 && centred.height() < 700.0, "the area is the dialog, not the backdrop: {centred:?}");
+
+    let title = h.get_by_label("Create Table").rect().center();
+    drag(&mut h, title, title + vec2(100.0, 60.0));
+    let moved = rect(&h);
+    assert!((moved.min - centred.min - vec2(100.0, 60.0)).length() < 2.0, "{centred:?} -> {moved:?}");
+
+    let body = egui::pos2(moved.right() - 40.0, moved.center().y);
+    drag(&mut h, body, body + vec2(-150.0, 80.0));
+    assert_eq!(rect(&h), moved, "a drag in the body leaves the dialog in place");
+
+    // The title row stays inside the top edge.
+    let title = h.get_by_label("Create Table").rect().center();
+    drag(&mut h, title, title - vec2(0.0, 1000.0));
+    assert!(rect(&h).top().abs() < 1.0, "{:?}", rect(&h));
+
+    // Opened again, the dialog starts centred.
+    h.state_mut().ui.dialog = None;
+    h.run_steps(2);
+    h.state_mut().ui.dialog = Some(Dialog::new("insertTable", Value::Null));
+    h.run_steps(4);
+    assert!((rect(&h).center() - centred.center()).length() < 1.0, "{:?}", rect(&h));
+
+    // Past the left edge, about 100 px of the title row stays inside.
+    let title = h.get_by_label("Create Table").rect().center();
+    drag(&mut h, title, title - vec2(900.0, 0.0));
+    assert!((rect(&h).right() - 100.0).abs() < 2.0, "{:?}", rect(&h));
+}
+
+#[test]
+fn the_new_document_window_drags_mostly_aside_and_keeps_its_preview() {
+    use egui::{Event, Modifiers, PointerButton, vec2};
+    use egui_kittest::{Harness, kittest::Queryable};
+    let rect = |h: &Harness<'static, DesignApp>| h.ctx.memory(|m| m.area_rect(egui::Id::unique("dialog"))).unwrap();
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"title": "A"})).unwrap();
+    app.ui.new_document_preview = true;
+    app.run("app.newDocumentDialog", json!({})).unwrap();
+    let mut ready = false;
+    let mut h = Harness::builder().with_size(vec2(1400.0, 900.0)).with_step_dt(1.0 / 60.0).build_ui_state(
+        move |ui, app: &mut DesignApp| {
+            if !ready {
+                crate::theme::install_fonts(ui.ctx(), &app.ui.language);
+                crate::theme::apply(ui.ctx(), &crate::theme::Tokens::for_brightness(crate::theme::Brightness::default()));
+                ready = true;
+                return;
+            }
+            show(app, ui.ctx());
+        },
+        app,
+    );
+    h.run_steps(6);
+    let preview = h.state().session.new_document_preview();
+    assert!(preview.is_some(), "Preview is on");
+    let centred = rect(&h);
+    assert!(centred.width() > 900.0, "{centred:?}");
+    let from = h.get_all_by_label("New Document").map(|n| n.rect().center()).min_by(|a, b| a.y.total_cmp(&b.y)).unwrap();
+    let to = from + vec2(1300.0, 0.0);
+    h.event(Event::PointerMoved(from));
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    for step in 1..=8 {
+        h.event(Event::PointerMoved(from + (to - from) * (step as f32 / 8.0)));
+        h.run_steps(1);
+    }
+    h.event(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+    // All but 100 px of the window's width is past the right edge, over the preview.
+    assert!((rect(&h).left() - 1300.0).abs() < 2.0, "{:?}", rect(&h));
+    let app = h.state();
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("newDocument"));
+    assert_eq!(app.session.new_document_preview(), preview, "moving the window keeps the preview");
+    assert_eq!(app.session.documents().len(), 2);
+}
+
+#[test]
+fn margins_dialog_reads_bare_numbers_in_the_ruler_unit() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("document.preferences", json!({"horizontalUnits": "millimeters"})).unwrap();
+    crate::menus::activate(&mut app, "layout.marginsAndColumns", &Value::Null);
+    for k in ["marginTop", "marginBottom", "marginInside", "marginOutside"] {
+        ctl(&mut app, "ui.dialog.set", json!({"field": k, "value": "15"}));
+    }
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
+    let top = app.session.active().unwrap().doc.page(0).unwrap().margins.top;
+    assert!((top - 15.0 * 72.0 / 25.4).abs() < 0.01, "top margin was {top} pt");
+}
+fn facing_app(pages: u64) -> DesignApp {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": pages, "facingPages": true})).unwrap();
+    app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0)));
+    app
+}
+
+fn guide_counts(app: &DesignApp) -> Vec<usize> {
+    let doc = &app.session.active().unwrap().doc;
+    (0..doc.page_count()).map(|abs| doc.page(abs).unwrap().guides.len()).collect()
+}
+
+#[test]
+fn create_guides_dialog_targets_the_page_in_view() {
+    let mut app = facing_app(6);
+    crate::canvas::go_to_page(&mut app, 4);
+    crate::menus::activate(&mut app, "layout.createGuides", &Value::Null);
+    ctl(&mut app, "ui.dialog.set", json!({"field": "columns", "value": "3"}));
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
+    assert_eq!(guide_counts(&app), vec![0, 0, 0, 0, 4, 0]);
+    // "Both pages of the spread" covers the facing pair.
+    crate::canvas::go_to_page(&mut app, 1);
+    crate::menus::activate(&mut app, "layout.createGuides", &Value::Null);
+    ctl(&mut app, "ui.dialog.set", json!({"field": "columns", "value": "2"}));
+    ctl(&mut app, "ui.dialog.set", json!({"field": "target", "value": "spread"}));
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
+    assert_eq!(guide_counts(&app), vec![0, 2, 2, 0, 4, 0]);
+}
+
+#[test]
+fn parent_dialogs_cover_both_pages_of_the_parent_spread_by_default() {
+    let mut app = facing_app(4);
+    app.run("layout.parents.edit", json!({"on": true})).unwrap();
+    crate::menus::activate(&mut app, "layout.marginsAndColumns", &Value::Null);
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("target"), "spread");
+    for k in ["marginTop", "marginBottom", "marginInside", "marginOutside"] {
+        ctl(&mut app, "ui.dialog.set", json!({"field": k, "value": "20 pt"}));
+    }
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
+    crate::menus::activate(&mut app, "layout.createGuides", &Value::Null);
+    ctl(&mut app, "ui.dialog.set", json!({"field": "columns", "value": "2"}));
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
+    let doc = &app.session.active().unwrap().doc;
+    for pg in &doc.parents[0].pages {
+        assert_eq!((pg.margins.top, pg.margins.outside, pg.guides.len()), (20.0, 20.0, 2));
+    }
+    // Every document page shows the parent's guides.
+    assert!((0..doc.page_count()).all(|abs| doc.inherited_guides(abs).len() == 2));
+}
+
+#[test]
+fn other_dialogs_keep_reading_bare_numbers_as_picas() {
+    let mut app = facing_app(2);
+    app.run("document.preferences", json!({"horizontalUnits": "millimeters"})).unwrap();
+    app.ui.dialog = Some(Dialog::new("newDocument", json!({"width": "15"})));
+    assert_eq!(app.ui.dialog.as_ref().unwrap().m("width"), Some(180.0));
+}
+#[test]
+fn character_style_options_set_the_digits() {
+    let mut app = styled_app();
+    ctl(&mut app, "ui.dialog.open", json!({"id": "characterStyleOptions", "fields": {"name": "Emphasis"}}));
+    ctl(&mut app, "ui.dialog.set", json!({"field": "c.digits", "value": "farsi"}));
+    assert_eq!(ctl(&mut app, "ui.dialog.confirm", json!({}))["ok"], true);
+    assert_eq!(char_style(&app, "Emphasis").unwrap().chars.digits, Some(designcraft_doc::Digits::Farsi));
+}
diff --git a/crates/ui-egui/src/dock.rs b/crates/ui-egui/src/dock.rs
index d4551e813..74dc37651 100644
--- a/crates/ui-egui/src/dock.rs
+++ b/crates/ui-egui/src/dock.rs
@@ -1,16 +1,16 @@
-//! The right dock: an expanded panel group (Properties · Pages · Layers) and a collapsed icon
-//! column whose panels open as flyouts beside the dock.
+//! The panels: their ids, names, icons and contents, and the windows of the float-only panels.
+//! `panel_docking` places the others in the docking layout.
 
-use egui::{Color32, Sense, Stroke, vec2};
+use egui::{Sense, vec2};
 
 use crate::theme::{Tokens, semibold};
-use crate::{DesignApp, icons, panels};
+use crate::{DesignApp, panels};
 
-/// (id, label, icon) of the tabs in the expanded group.
+/// (id, label, icon) of the Properties · Pages · Layers group of the default dock.
 pub const DOCK_TABS: &[(&str, &str, &str)] =
     &[("properties", "Properties", "panel-properties"), ("pages", "Pages", "panel-pages"), ("layers", "Layers", "panel-layers")];
 
-/// Panels in the collapsed icon column.
+/// (id, label, icon) of the other dock panels, which start in the iconic column.
 pub const ICON_PANELS: &[(&str, &str, &str)] = &[
     ("stroke", "Stroke", "panel-stroke"),
     ("swatches", "Swatches", "panel-swatches"),
@@ -23,6 +23,7 @@ pub const ICON_PANELS: &[(&str, &str, &str)] = &[
     ("typography", "Typography", "panel-typography"),
     ("glyphs", "Glyphs", "panel-character"),
     ("paragraph", "Paragraph", "panel-paragraph"),
+    ("story", "Story", "panel-text-frame"),
     ("textWrap", "Text Wrap", "panel-wrap"),
     ("table", "Table", "panel-table"),
     ("align", "Align", "panel-align"),
@@ -31,6 +32,7 @@ pub const ICON_PANELS: &[(&str, &str, &str)] = &[
     ("links", "Links", "panel-links"),
     ("info", "Info", "panel-info"),
     ("preflight", "Preflight", "panel-preflight"),
+    ("separations", "Separations Preview", "panel-swatches"),
     ("attributes", "Attributes", "panel-attributes"),
     ("conditions", "Conditional Text", "panel-conditions"),
     ("notes", "Notes", "panel-notes"),
@@ -50,7 +52,7 @@ pub const ICON_PANELS: &[(&str, &str, &str)] = &[
     ("dataMerge", "Data Merge", "panel-datamerge"),
 ];
 
-/// Panels that only float (they open from a menu, not from the icon column).
+/// Panels that only float, outside the docking layout (they open from a menu).
 pub const FLOATING_PANELS: &[(&str, &str)] = &[("tabs", "Tabs")];
 
 /// The English name of panel `id`.
@@ -58,204 +60,6 @@ pub fn panel_label(id: &str) -> &'static str {
     DOCK_TABS.iter().chain(ICON_PANELS).map(|p| (p.0, p.1)).chain(FLOATING_PANELS.iter().copied()).find(|p| p.0 == id).map_or("Panel", |p| p.1)
 }
 
-pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
-    if crate::panel_docking::show(app, ui) {
-        return;
-    }
-    let t = Tokens::get(ui.ctx());
-    // Expanded panel stack (outermost, 253 pt) — declared first so it sits at the far right.
-    if app.ui.dock_expanded {
-        egui::Panel::right("dock").default_size(253.0).size_range(220.0..=420.0).resizable(true).frame(egui::Frame::NONE.fill(t.panel)).show(
-            ui,
-            |ui| {
-                if dock_header(ui, &t, "»").clicked() {
-                    let _ = app.run("window.collapseToIcons", serde_json::json!({}));
-                }
-                // Tab strip (27 pt).
-                let (strip, _) = ui.allocate_exact_size(vec2(ui.available_width(), 27.0), Sense::hover());
-                ui.painter().rect_filled(strip, 0.0, t.tab_strip);
-                let mut x = strip.min.x;
-                for (id, label, _) in DOCK_TABS {
-                    let active = app.ui.dock_tab == *id;
-                    let g = crate::rtl::plain(
-                        ui.ctx(),
-                        crate::i18n::tr(&app.ui.language, label),
-                        semibold(11.5),
-                        if active { t.text_strong } else { t.text_dim },
-                    );
-                    let w = g.size().x + 26.0;
-                    let r = egui::Rect::from_min_size(egui::pos2(x, strip.min.y), vec2(w, 27.0));
-                    if active {
-                        ui.painter().rect_filled(r, 0.0, t.panel);
-                    }
-                    ui.painter().galley(egui::pos2(r.min.x + 13.0, r.center().y - g.size().y / 2.0), g, Color32::WHITE);
-                    ui.painter().line_segment([r.right_top(), r.right_bottom()], Stroke::new(1.0, t.border));
-                    let response = craft_ui::tabs::Tab::new(ui.id().with(("docktab", *id)), label, active).sense(Sense::click_and_drag()).show_at(
-                        ui,
-                        r,
-                        |_, _| {},
-                    );
-                    if response.clicked() {
-                        app.ui.dock_tab = id.to_string();
-                    }
-                    crate::panel_docking::legacy_tab(app, ui, id, &response);
-                    x += w;
-                }
-                let menu_r = egui::Rect::from_min_size(egui::pos2(strip.max.x - 24.0, strip.min.y + 4.0), vec2(18.0, 18.0));
-                let menu = ui.interact(menu_r, ui.id().with("dock-menu"), Sense::click());
-                if menu.hovered() {
-                    ui.painter().rect_filled(menu_r, 3.0, t.hover);
-                }
-                icons::paint(ui.painter(), menu_r, "menu", t.icon);
-                let tab = app.ui.dock_tab.clone();
-                egui::Popup::menu(&menu)
-                    .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
-                    .show(|ui| crate::panel_docking::three_line_menu(app, ui, &tab));
-                egui::Frame::NONE.inner_margin(egui::Margin { left: 10, right: 10, top: 4, bottom: 6 }).show(ui, |ui| {
-                    // The Pages panel scrolls its parts itself and keeps its footer at the bottom.
-                    if app.ui.dock_tab == "pages" {
-                        panels::pages::show(app, ui);
-                        return;
-                    }
-                    egui::ScrollArea::vertical().auto_shrink([false, false]).show(ui, |ui| match app.ui.dock_tab.as_str() {
-                        "layers" => panels::layers::show(app, ui),
-                        _ => panels::properties::show(app, ui),
-                    });
-                });
-            },
-        );
-    }
-    // Collapsed icon strip (37 pt) to the left of the panel stack; a workspace's iconic groups
-    // (Essentials Classic) show their names.
-    let groups = app.ui.icon_groups.clone();
-    egui::Panel::right("icon_column").exact_size(icon_column_width(app)).resizable(false).frame(egui::Frame::NONE.fill(t.panel)).show(ui, |ui| {
-        if dock_header(ui, &t, "«").clicked() {
-            app.ui.dock_expanded = true;
-        }
-        ui.add_space(4.0);
-        match &groups {
-            Some(groups) => {
-                for (i, group) in groups.iter().enumerate() {
-                    if i > 0 {
-                        let (r, _) = ui.allocate_exact_size(vec2(ui.available_width(), 7.0), Sense::hover());
-                        ui.painter().line_segment([r.left_center(), r.right_center()], Stroke::new(1.0, t.border));
-                    }
-                    for (id, label, icon) in group.iter().filter_map(|id| panel_entry(id)) {
-                        let on = app.ui.open_panel.as_deref() == Some(id) || app.ui.floating.iter().any(|(p, _)| p == id);
-                        let (r, response) = ui.allocate_exact_size(vec2(ui.available_width(), 26.0), Sense::click_and_drag());
-                        if on {
-                            ui.painter().rect_filled(r.shrink2(vec2(3.0, 1.0)), 3.0, t.tool_active);
-                        } else if response.hovered() {
-                            ui.painter().rect_filled(r.shrink2(vec2(3.0, 1.0)), 3.0, t.hover);
-                        }
-                        icons::paint(ui.painter(), egui::Rect::from_min_size(r.min + vec2(8.0, 4.0), vec2(18.0, 18.0)), icon, t.icon);
-                        crate::rtl::paint(
-                            ui.painter(),
-                            r.left_center() + vec2(32.0, 0.0),
-                            egui::Align2::LEFT_CENTER,
-                            crate::i18n::tr(&app.ui.language, label),
-                            semibold(11.5),
-                            t.text,
-                        );
-                        icon_clicked(app, ui, id, &response);
-                    }
-                }
-            }
-            None => {
-                ui.vertical_centered(|ui| {
-                    for (id, label, icon) in ICON_PANELS {
-                        let on = app.ui.open_panel.as_deref() == Some(*id) || app.ui.floating.iter().any(|(p, _)| p == id);
-                        let response = icons::button(ui, icon, 28.0, on, crate::i18n::tr(&app.ui.language, label)).interact(Sense::click_and_drag());
-                        icon_clicked(app, ui, id, &response);
-                        ui.add_space(1.0);
-                    }
-                });
-            }
-        }
-    });
-}
-
-/// Width of the icon column: icons only, or icons with names for a workspace's groups.
-fn icon_column_width(app: &DesignApp) -> f32 {
-    if app.ui.icon_groups.is_some() { 150.0 } else { 37.0 }
-}
-
-/// (id, label, icon) of any dock panel.
-fn panel_entry(id: &str) -> Option<(&'static str, &'static str, &'static str)> {
-    DOCK_TABS.iter().chain(ICON_PANELS).find(|p| p.0 == id).copied()
-}
-
-/// A click on a panel's icon: raise it when it floats, else open or close its flyout.
-fn icon_clicked(app: &mut DesignApp, ui: &mut egui::Ui, id: &str, response: &egui::Response) {
-    if response.clicked() {
-        if app.ui.floating.iter().any(|(p, _)| p == id) {
-            ui.ctx().move_to_top(egui::LayerId::new(egui::Order::Middle, egui::Id::new(("floating_panel", id))));
-        } else {
-            let open = app.ui.open_panel.as_deref() == Some(id);
-            app.ui.open_panel = if open { None } else { Some(id.to_string()) };
-        }
-    }
-    crate::panel_docking::legacy_tab(app, ui, id, response);
-}
-
-/// 11 pt dock header strip with a collapse chevron; clicking it reports a click on the response.
-fn dock_header(ui: &mut egui::Ui, t: &Tokens, chevron: &str) -> egui::Response {
-    let (r, response) = ui.allocate_exact_size(vec2(ui.available_width(), 11.0), Sense::click());
-    ui.painter().rect_filled(r, 0.0, t.tab_strip);
-    ui.painter().text(egui::pos2(r.max.x - 8.0, r.center().y), egui::Align2::RIGHT_CENTER, chevron, egui::FontId::proportional(9.0), t.text_dim);
-    ui.painter().line_segment([r.left_bottom(), r.right_bottom()], Stroke::new(1.0, t.border));
-    response
-}
-
-/// A panel opened from the icon column, shown as a floating flyout next to the dock.
-pub fn flyout(app: &mut DesignApp, ctx: &egui::Context) {
-    if app.ui.docking.is_some() {
-        return;
-    }
-    let Some(id) = app.ui.open_panel.clone() else { return };
-    let t = Tokens::get(ctx);
-    let label = crate::i18n::tr(&app.ui.language, panel_label(&id)).to_owned();
-    let screen = ctx.content_rect();
-    let dock_w = if app.ui.dock_expanded { ctx.memory(|m| m.area_rect(egui::Id::new("dock")).map(|r| r.width())).unwrap_or(280.0) } else { 0.0 };
-    let pos = egui::pos2(screen.max.x - icon_column_width(app) - dock_w - 262.0, 120.0);
-    let mut open = true;
-    egui::Area::new(egui::Id::new("panel_flyout")).order(egui::Order::Foreground).fixed_pos(pos).show(ctx, |ui| {
-        egui::Frame::popup(ui.style()).fill(t.panel).inner_margin(egui::Margin::same(0)).show(ui, |ui| {
-            ui.set_width(256.0);
-            // A previous shorter flyout must not constrain the next panel's scroll viewport.
-            ui.set_max_height((screen.max.y - pos.y - 12.0).max(80.0));
-            let (strip, _) = ui.allocate_exact_size(vec2(256.0, 26.0), Sense::hover());
-            ui.painter().rect_filled(strip, 0.0, t.panel_darker);
-            crate::rtl::paint(ui.painter(), strip.min + vec2(10.0, 13.0), egui::Align2::LEFT_CENTER, &label, semibold(12.0), t.text_strong);
-            let close = egui::Rect::from_min_size(egui::pos2(strip.max.x - 22.0, strip.min.y + 4.0), vec2(18.0, 18.0));
-            if ui.interact(close, ui.id().with("flyclose"), Sense::click()).clicked() {
-                open = false;
-            }
-            ui.painter().text(close.center(), egui::Align2::CENTER_CENTER, "×", egui::FontId::proportional(15.0), t.text_dim);
-            // Float: the button beside the close box, or drag the header away from the dock.
-            let float_r = egui::Rect::from_min_size(egui::pos2(strip.max.x - 44.0, strip.min.y + 4.0), vec2(18.0, 18.0));
-            let fr = ui.interact(float_r, ui.id().with("flyfloat"), Sense::click()).on_hover_ui(|ui| {
-                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Float panel"));
-            });
-            float_glyph(ui.painter(), float_r, t.text_dim);
-            let head = egui::Rect::from_min_max(strip.min, egui::pos2(float_r.min.x - 2.0, strip.max.y));
-            let hr = ui.interact(head, ui.id().with("flyhead"), Sense::drag());
-            let torn = hr.drag_stopped() && hr.total_drag_delta().is_some_and(|d| d.length() > 24.0);
-            if fr.clicked() || torn {
-                let at = if torn { ui.ctx().pointer_latest_pos().unwrap_or(pos) - vec2(20.0, 10.0) } else { pos - vec2(30.0, -30.0) };
-                float_panel(app, &id, at);
-                return;
-            }
-            egui::Frame::NONE.inner_margin(egui::Margin::same(10)).show(ui, |ui| {
-                scrolled_body(app, ui, &id, screen.height() - 220.0);
-            });
-        });
-    });
-    if !open {
-        app.ui.open_panel = None;
-    }
-}
-
 /// A panel's contents at most `max_h` tall, scrolling past that. The Pages panel scrolls its
 /// parts itself and keeps its footer at the bottom, so it gets the height instead.
 fn scrolled_body(app: &mut DesignApp, ui: &mut egui::Ui, id: &str, max_h: f32) {
@@ -285,6 +89,7 @@ pub fn panel_body(app: &mut DesignApp, ui: &mut egui::Ui, id: &str) {
         "typography" => panels::typography::show(app, ui),
         "glyphs" => panels::glyphs::show(app, ui),
         "paragraph" => panels::properties::paragraph_panel(app, ui),
+        "story" => panels::story::show(app, ui),
         "textWrap" => panels::properties::wrap_panel(app, ui),
         "align" => panels::properties::align_panel(app, ui),
         "pathfinder" => panels::properties::pathfinder_panel(app, ui),
@@ -297,6 +102,7 @@ pub fn panel_body(app: &mut DesignApp, ui: &mut egui::Ui, id: &str) {
         "attributes" => panels::properties::attributes_panel(app, ui),
         "conditions" => panels::conditions::show(app, ui),
         "notes" => panels::notes::show(app, ui),
+        "separations" => panels::separations::show(app, ui),
         "library" => panels::library::show(app, ui),
         "hyperlinks" => panels::interactive::hyperlinks(app, ui),
         "bookmarks" => panels::interactive::bookmarks(app, ui),
@@ -322,44 +128,18 @@ pub(crate) fn float_only(id: &str) -> bool {
     FLOATING_PANELS.iter().any(|p| p.0 == id)
 }
 
-/// Tear panel `id` off the dock into a floating window at `at`.
-pub fn float_panel(app: &mut DesignApp, id: &str, at: egui::Pos2) {
-    if float_only(id) {
-        app.ui.floating.retain(|(p, _)| p != id);
-        app.ui.floating.push((id.to_string(), [at.x, at.y]));
-        return;
-    }
-    if let Some(Err(error)) = crate::panel_docking::command(app, "window.panel.float", &serde_json::json!({"panel":id,"x":at.x,"y":at.y})) {
-        app.status(error);
-    }
-}
-
-/// Put a floating panel back in the dock's icon column.
-pub fn dock_panel(app: &mut DesignApp, id: &str) {
-    if app.ui.docking.is_some() && !float_only(id) {
-        if let Some(Err(error)) = crate::panel_docking::command(app, "window.panel.dock", &serde_json::json!({"panel":id})) {
-            app.status(error);
-        }
-        return;
-    }
-    app.ui.floating.retain(|(p, _)| p != id);
-}
-
-/// Floating panels: movable, resizable windows; "Dock" returns one to the icon column.
-pub fn floating(app: &mut DesignApp, ctx: &egui::Context) {
-    // A customized layout draws its own floating groups; float-only panels are drawn here.
-    let customized = app.ui.docking.is_some();
+/// The float-only panels' windows (the Tabs panel). The docking layout draws the other
+/// floating panels.
+pub fn float_only_windows(app: &mut DesignApp, ctx: &egui::Context) {
     let t = Tokens::get(ctx);
     for (id, at) in app.ui.floating.clone() {
-        if customized && !float_only(&id) {
+        if !float_only(&id) {
             continue;
         }
         let label = crate::i18n::tr(&app.ui.language, panel_label(&id)).to_owned();
-        let docks = !float_only(&id);
         let mut open = true;
-        let mut dock = false;
         let mut w = egui::Window::new(label.clone())
-            .id(egui::Id::new(("floating_panel", &id)))
+            .id(egui::Id::unique(("floating_panel", &id)))
             .title_bar(false)
             .default_pos(egui::pos2(at[0], at[1]))
             .default_width(if id == "tabs" { 560.0 } else { 256.0 })
@@ -372,13 +152,13 @@ pub fn floating(app: &mut DesignApp, ctx: &egui::Context) {
             w = w.current_pos(pos).min_width(width).max_width(width);
         }
         let r = w.show(ctx, |ui| {
-            // Header strip (drag it to move the panel): name, Dock, close.
+            // Header strip (drag it to move the panel): name and close.
             let (strip, _) = ui.allocate_exact_size(vec2(ui.available_width().max(200.0), 24.0), Sense::hover());
             ui.painter().rect_filled(strip, 0.0, t.panel_darker);
             crate::rtl::paint(ui.painter(), strip.min + vec2(10.0, 12.0), egui::Align2::LEFT_CENTER, &label, semibold(12.0), t.text_strong);
             let close = egui::Rect::from_min_size(egui::pos2(strip.max.x - 22.0, strip.min.y + 3.0), vec2(18.0, 18.0));
             if ui
-                .interact(close, ui.id().with("fclose"), Sense::click())
+                .interact(close, ui.scope_id().with("fclose"), Sense::click())
                 .on_hover_ui(|ui| {
                     crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Close"));
                 })
@@ -387,20 +167,6 @@ pub fn floating(app: &mut DesignApp, ctx: &egui::Context) {
                 open = false;
             }
             ui.painter().text(close.center(), egui::Align2::CENTER_CENTER, "×", egui::FontId::proportional(15.0), t.text_dim);
-            let dock_r = egui::Rect::from_min_size(egui::pos2(strip.max.x - 44.0, strip.min.y + 3.0), vec2(18.0, 18.0));
-            if docks
-                && ui
-                    .interact(dock_r, ui.id().with("fdock"), Sense::click())
-                    .on_hover_ui(|ui| {
-                        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Dock panel"));
-                    })
-                    .clicked()
-            {
-                dock = true;
-            }
-            if docks {
-                dock_glyph(ui.painter(), dock_r, t.text_dim);
-            }
             egui::Frame::NONE.inner_margin(egui::Margin::same(10)).show(ui, |ui| {
                 scrolled_body(app, ui, &id, ctx.content_rect().height() - 160.0);
             });
@@ -411,29 +177,16 @@ pub fn floating(app: &mut DesignApp, ctx: &egui::Context) {
         {
             f.1 = [r.response.rect.min.x, r.response.rect.min.y];
         }
-        if !open || dock {
-            dock_panel(app, &id);
+        if !open {
+            app.ui.floating.retain(|(p, _)| *p != id);
         }
     }
 }
 
-/// Two overlapping boxes: "float this panel".
-fn float_glyph(p: &egui::Painter, r: egui::Rect, c: Color32) {
-    let s = Stroke::new(1.0, c);
-    p.rect_stroke(egui::Rect::from_min_size(r.min + vec2(3.5, 6.5), vec2(9.0, 8.0)), 0.0, s, egui::StrokeKind::Middle);
-    p.rect_stroke(egui::Rect::from_min_size(r.min + vec2(6.5, 3.5), vec2(9.0, 8.0)), 0.0, s, egui::StrokeKind::Middle);
-}
-
-/// A box with a bar on its right: "back into the dock".
-fn dock_glyph(p: &egui::Painter, r: egui::Rect, c: Color32) {
-    let b = egui::Rect::from_min_size(r.min + vec2(3.5, 4.5), vec2(11.0, 9.0));
-    p.rect_stroke(b, 0.0, Stroke::new(1.0, c), egui::StrokeKind::Middle);
-    p.rect_filled(egui::Rect::from_min_max(egui::pos2(b.max.x - 3.5, b.min.y), b.max), 0.0, c);
-}
-
 #[cfg(test)]
 mod visual_regressions {
     use super::*;
+    use egui::Color32;
 
     fn scaled_input(size: egui::Vec2, scale: f32) -> egui::RawInput {
         let mut input = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, size)), ..Default::default() };
@@ -449,9 +202,7 @@ mod visual_regressions {
         for brightness in crate::theme::Brightness::ALL {
             for width in [800.0, 1280.0] {
                 for scale in [1.0, 1.5, 2.0] {
-                    let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
-                    app.ui.dock_expanded = true;
-                    app.ui.dock_tab = "properties".into();
+                    let app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
                     let mut ready = false;
                     let mut harness =
                         egui_kittest::Harness::builder().with_size(vec2(width, 640.0)).with_pixels_per_point(scale).wgpu().build_ui_state(
@@ -462,7 +213,7 @@ mod visual_regressions {
                                     ready = true;
                                     return;
                                 }
-                                show(app, ui);
+                                crate::panel_docking::show(app, ui);
                             },
                             app,
                         );
@@ -470,10 +221,11 @@ mod visual_regressions {
                     harness.run_steps(4);
                     let stem = format!("designcraft-dock-{}-{width}-{scale}x", brightness.id());
                     harness.render().unwrap().save(directory.join(format!("{stem}.png"))).unwrap();
-                    let panel = egui::containers::panel::PanelState::load(&harness.ctx, egui::Id::new("dock")).unwrap().outer_rect;
+                    let tab = crate::panel_docking::tab_id("properties");
+                    let tab = harness.ctx.read_response(tab).unwrap().rect;
                     let region = serde_json::json!({
                         "screen": [width, 640.0], "scale": scale,
-                        "regions": {"dock-tabs": [panel.left(), panel.top(), panel.width(), 45.0]}
+                        "regions": {"dock-tabs": [tab.left(), tab.top(), (width - tab.left()), tab.height()]}
                     });
                     std::fs::write(directory.join(format!("{stem}.json")), serde_json::to_vec_pretty(&region).unwrap()).unwrap();
                 }
@@ -499,9 +251,9 @@ mod visual_regressions {
                     let tokens = Tokens::for_brightness(brightness);
                     crate::theme::apply(&ctx, &tokens);
                     let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
-                    app.ui.dock_expanded = true;
-                    app.ui.dock_tab = "properties".into();
-                    let mut output = ctx.run_ui(scaled_input(vec2(width, 640.0), scale), |ui| show(&mut app, ui));
+                    let mut output = ctx.run_ui(scaled_input(vec2(width, 640.0), scale), |ui| crate::panel_docking::show(&mut app, ui));
+                    output.textures_delta.clear();
+                    let mut output = ctx.run_ui(scaled_input(vec2(width, 640.0), scale), |ui| crate::panel_docking::show(&mut app, ui));
                     output.textures_delta.clear();
                     assert_eq!(ctx.content_rect().size(), vec2(width, 640.0));
                     assert_eq!(ctx.pixels_per_point(), scale);
@@ -523,50 +275,3 @@ mod visual_regressions {
         }
     }
 }
-
-#[cfg(test)]
-mod chevron_tests {
-    use super::*;
-    use egui_kittest::Harness;
-
-    fn click(harness: &mut Harness<'_, DesignApp>, at: egui::Pos2) {
-        harness.hover_at(at);
-        harness.run_steps(1);
-        harness.drag_at(at);
-        harness.run_steps(1);
-        harness.drop_at(at);
-        harness.run_steps(3);
-    }
-
-    /// The » / « chevron painted at the right end of a panel's 11 pt header.
-    fn chevron(harness: &Harness<'_, DesignApp>, panel: &str) -> egui::Pos2 {
-        let r = egui::containers::panel::PanelState::load(&harness.ctx, egui::Id::new(panel)).expect("the panel is laid out").outer_rect;
-        egui::pos2(r.max.x - 10.0, r.min.y + 5.0)
-    }
-
-    /// Issue #1203: the header chevrons were painted text; clicking them did nothing.
-    #[test]
-    fn the_dock_chevron_collapses_and_expands_the_dock() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
-        app.ui.dock_expanded = true;
-        let mut ready = false;
-        let mut harness = Harness::builder().with_size(vec2(1280.0, 640.0)).build_ui_state(
-            move |ui, app: &mut DesignApp| {
-                if !ready {
-                    crate::theme::install_fonts(ui.ctx(), "en");
-                    ready = true;
-                    return;
-                }
-                show(app, ui);
-            },
-            app,
-        );
-        harness.run_steps(4);
-        let at = chevron(&harness, "dock");
-        click(&mut harness, at);
-        assert!(!harness.state().ui.dock_expanded, "» collapses the dock to icons");
-        let at = chevron(&harness, "icon_column");
-        click(&mut harness, at);
-        assert!(harness.state().ui.dock_expanded, "« expands the dock again");
-    }
-}
diff --git a/crates/ui-egui/src/effects_dialog.rs b/crates/ui-egui/src/effects_dialog.rs
index dfc345346..fbf8c185a 100644
--- a/crates/ui-egui/src/effects_dialog.rs
+++ b/crates/ui-egui/src/effects_dialog.rs
@@ -116,10 +116,17 @@ fn is_on(fx: &Value, page: &str) -> bool {
 
 /// The `object.effects` params the dialog stands for.
 pub fn params(d: &Dialog) -> Value {
-    json!({"ids": d.fields.get("ids").cloned().unwrap_or(json!([])), "effects": d.fields.get("fx").cloned().unwrap_or(json!({})),
-        "opacity": d.fields.get("opacity").and_then(Value::as_f64).unwrap_or(1.0), "blend": d.fields.get("blend").and_then(Value::as_str).unwrap_or("Normal")})
+    let mut p = json!({"ids": d.fields.get("ids").cloned().unwrap_or(json!([])), "effects": d.fields.get("fx").cloned().unwrap_or(json!({})),
+        "opacity": d.fields.get("opacity").and_then(Value::as_f64).unwrap_or(1.0), "blend": d.fields.get("blend").and_then(Value::as_str).unwrap_or("Normal")});
+    if let Some(a) = d.fields.get(GLOBAL_LIGHT).and_then(Value::as_f64) {
+        p["globalLight"] = json!(a);
+    }
+    p
 }
 
+/// The global light angle as changed in the dialog (an Angle field with Use Global Light on).
+const GLOBAL_LIGHT: &str = "globalLight";
+
 /// Apply: the preview goes and the settings are made once, as one undo step.
 pub fn confirm(app: &mut DesignApp, d: &Dialog) -> Result<Value, String> {
     if d.fields.contains_key(PREVIEWED) {
@@ -202,12 +209,19 @@ fn percent(ui: &mut egui::Ui, d: &mut Dialog, path: &[&str]) {
     }
 }
 
-fn angle(ui: &mut egui::Ui, d: &mut Dialog, path: &[&str], enabled: bool, global: f64) {
-    let mut v = if enabled { num(d, path) } else { global };
-    let r = ui.add_enabled(enabled, egui::DragValue::new(&mut v).range(-180.0..=180.0).suffix("°").max_decimals(1));
+/// The effect's own angle at `path`, or with Use Global Light (`own` false) the document's
+/// global light angle: editing it then changes that one, for every effect that uses it.
+fn angle(ui: &mut egui::Ui, d: &mut Dialog, path: &[&str], own: bool, global: f64) -> egui::Response {
+    let mut v = if own { num(d, path) } else { global };
+    let r = ui.add(egui::DragValue::new(&mut v).range(-180.0..=180.0).suffix("°").max_decimals(1));
     if r.changed() {
-        set(d, path, json!(v));
+        if own {
+            set(d, path, json!(v));
+        } else {
+            d.fields.insert(GLOBAL_LIGHT.into(), json!(v));
+        }
     }
+    r
 }
 
 fn flag(ui: &mut egui::Ui, d: &mut Dialog, path: &[&str], label: &str) {
@@ -236,7 +250,7 @@ fn swatch(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog, path: &[&str]) {
         .session
         .active()
         .map_or_else(Vec::new, |st| st.doc.swatches.iter().filter(|w| !w.hidden || w.name == cur).map(|w| w.name.clone()).collect());
-    egui::ComboBox::from_id_salt(("fx_swatch", path.join("."))).selected_text(&cur).width(150.0).show_ui(ui, |ui| {
+    craft_ui::ComboBox::from_id_salt(("fx_swatch", path.join("."))).selected_text(&cur).width(150.0).show_ui(ui, |ui| {
         for n in names {
             if ui.selectable_label(n == cur, &n).clicked() {
                 set(d, path, json!(n));
@@ -273,7 +287,9 @@ fn page_ui(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog, page: &str) {
     let lang = app.ui.language.clone();
     let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
     let unit = app.session.active().map_or(Unit::Points, |st| st.doc.settings.horizontal_units);
-    let global = app.session.active().map_or(120.0, |st| st.doc.settings.global_light);
+    // The global light angle as the dialog will set it (an edit in it shows at once).
+    let global =
+        d.fields.get(GLOBAL_LIGHT).and_then(Value::as_f64).unwrap_or_else(|| app.session.active().map_or(120.0, |st| st.doc.settings.global_light));
     let row = |ui: &mut egui::Ui, l: &str| crate::rtl::label(ui, tr(l));
     crate::rtl::label(ui, egui::RichText::new(tr(PAGES.iter().find(|p| p.0 == page).map_or("Transparency", |p| p.1))).font(semibold(14.0)));
     let grid = |id: &str| egui::Grid::new(("fx_grid", id.to_string())).num_columns(4).spacing([8.0, 6.0]);
@@ -283,7 +299,7 @@ fn page_ui(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog, page: &str) {
             grid("t").show(ui, |ui| {
                 row(ui, "Mode:");
                 let cur = d.fields.get("blend").and_then(Value::as_str).unwrap_or("Normal").to_string();
-                egui::ComboBox::from_id_salt("fx_blend").selected_text(tr(&cur)).width(150.0).show_ui(ui, |ui| {
+                craft_ui::ComboBox::from_id_salt("fx_blend").selected_text(tr(&cur)).width(150.0).show_ui(ui, |ui| {
                     for m in designcraft_color::BlendMode::ALL {
                         if ui.selectable_label(m.label() == cur, tr(m.label())).clicked() {
                             d.fields.insert("blend".into(), json!(m.label()));
@@ -344,7 +360,23 @@ fn page_ui(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog, page: &str) {
             let key = page;
             heading(ui, &tr("Blending"));
             grid("b").show(ui, |ui| {
-                mode_row(ui, d, key, &tr);
+                // Inner Glow: its blend mode (Screen, as InDesign starts it).
+                if key == "innerGlow" {
+                    row(ui, "Mode:");
+                    let cur = d.fields.get("fx").and_then(|f| f["innerGlow"]["mode"].as_str()).unwrap_or("Screen").to_string();
+                    let label = |m: &designcraft_color::BlendMode| {
+                        serde_json::to_value(m).ok().and_then(|v| v.as_str().map(str::to_string)).unwrap_or_default()
+                    };
+                    let shown = designcraft_color::BlendMode::ALL.iter().find(|m| label(m) == cur).map_or("Screen", |m| m.label());
+                    craft_ui::ComboBox::from_id_salt("fx_glow_mode").selected_text(tr(shown)).width(150.0).show_ui(ui, |ui| {
+                        for m in designcraft_color::BlendMode::ALL {
+                            if ui.selectable_label(label(&m) == cur, tr(m.label())).clicked() {
+                                set(d, &["innerGlow", "mode"], json!(label(&m)));
+                            }
+                        }
+                    });
+                    ui.end_row();
+                }
                 row(ui, "Color:");
                 swatch(app, ui, d, &[key, "color"]);
                 row(ui, "Opacity:");
@@ -364,7 +396,7 @@ fn page_ui(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog, page: &str) {
                     ui.end_row();
                     row(ui, "Technique:");
                     let cur = d.fields.get("fx").and_then(|f| f["innerGlow"]["technique"].as_str()).unwrap_or("softer").to_string();
-                    egui::ComboBox::from_id_salt("fx_technique").selected_text(tr(if cur == "precise" { "Precise" } else { "Softer" })).show_ui(
+                    craft_ui::ComboBox::from_id_salt("fx_technique").selected_text(tr(if cur == "precise" { "Precise" } else { "Softer" })).show_ui(
                         ui,
                         |ui| {
                             for (v, l) in [("softer", "Softer"), ("precise", "Precise")] {
@@ -378,7 +410,7 @@ fn page_ui(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog, page: &str) {
                     row(ui, "Source:");
                     let mut center = d.fields.get("fx").is_some_and(|f| f["innerGlow"]["center"].as_bool().unwrap_or(false));
                     let label = |c: bool| tr(if c { "Center" } else { "Edge" });
-                    egui::ComboBox::from_id_salt("fx_source").selected_text(label(center)).show_ui(ui, |ui| {
+                    craft_ui::ComboBox::from_id_salt("fx_source").selected_text(label(center)).show_ui(ui, |ui| {
                         for c in [false, true] {
                             if ui.selectable_value(&mut center, c, label(c)).clicked() {
                                 set(d, &["innerGlow", "center"], json!(c));
@@ -459,7 +491,7 @@ fn page_ui(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog, page: &str) {
                     "rounded" => "Rounded",
                     _ => "Diffused",
                 };
-                egui::ComboBox::from_id_salt("fx_corners").selected_text(tr(shown)).show_ui(ui, |ui| {
+                craft_ui::ComboBox::from_id_salt("fx_corners").selected_text(tr(shown)).show_ui(ui, |ui| {
                     for (v, l) in [("sharp", "Sharp"), ("rounded", "Rounded"), ("diffused", "Diffused")] {
                         if ui.selectable_label(cur == v, tr(l)).clicked() {
                             set(d, &["featherOptions", "corners"], json!(v));
@@ -508,7 +540,7 @@ fn page_ui(app: &DesignApp, ui: &mut egui::Ui, d: &mut Dialog, page: &str) {
                 row(ui, "Type:");
                 let mut radial = d.fields.get("fx").is_some_and(|f| f["gradientFeather"]["radial"].as_bool().unwrap_or(false));
                 let label = |r: bool| tr(if r { "Radial" } else { "Linear" });
-                egui::ComboBox::from_id_salt("fx_gtype").selected_text(label(radial)).show_ui(ui, |ui| {
+                craft_ui::ComboBox::from_id_salt("fx_gtype").selected_text(label(radial)).show_ui(ui, |ui| {
                     for r in [false, true] {
                         if ui.selectable_value(&mut radial, r, label(r)).clicked() {
                             set(d, &["gradientFeather", "radial"], json!(r));
@@ -564,7 +596,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
         crate::rtl::label(ui, tr("Settings for:"));
         // Stroke, Fill and Text levels aren't in the document model yet: the object only.
         ui.add_enabled_ui(false, |ui| {
-            egui::ComboBox::from_id_salt("fx_level").selected_text(tr("Object")).width(110.0).show_ui(ui, |_| {});
+            craft_ui::ComboBox::from_id_salt("fx_level").selected_text(tr("Object")).width(110.0).show_ui(ui, |_| {});
         });
     });
     ui.add_space(6.0);
@@ -664,6 +696,32 @@ mod tests {
         texts
     }
 
+    /// With Use Global Light on, the Angle is the document's global light and stays editable:
+    /// a change there is applied to the document with the effects (it was greyed out).
+    #[test]
+    fn the_angle_with_global_light_sets_the_global_light() {
+        let (mut app, _) = app_with_frame();
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx, "en");
+        crate::menus::activate(&mut app, "object.dropShadow", &Value::Null);
+        let d = app.ui.dialog.as_mut().unwrap();
+        set(d, &["dropShadow", "globalLight"], json!(true));
+        frame(&mut app, &ctx);
+        // The field shows the global angle and is enabled: a DragValue that isn't disabled.
+        let global = app.session.doc().unwrap().doc.settings.global_light;
+        let mut d = app.ui.dialog.clone().unwrap();
+        let ui_ctx = egui::Context::default();
+        let mut enabled = false;
+        let mut out = ui_ctx.run_ui(egui::RawInput::default(), |ui| {
+            enabled = angle(ui, &mut d, &["dropShadow", "angle"], false, global).enabled();
+        });
+        out.textures_delta.clear();
+        assert!(enabled, "the Angle stays editable with Use Global Light");
+        d.fields.insert(GLOBAL_LIGHT.into(), json!(15.0));
+        confirm(&mut app, &d).unwrap();
+        assert_eq!(app.session.doc().unwrap().doc.settings.global_light, 15.0);
+    }
+
     #[test]
     fn set_makes_the_path_and_ignores_an_empty_one() {
         let mut d = Dialog::new(ID, json!({"fx": {}}));
diff --git a/crates/ui-egui/src/guide_selection_tests.rs b/crates/ui-egui/src/guide_selection_tests.rs
index d69026712..626a7b826 100644
--- a/crates/ui-egui/src/guide_selection_tests.rs
+++ b/crates/ui-egui/src/guide_selection_tests.rs
@@ -4,7 +4,10 @@
 use egui::{Event, Modifiers, PointerButton};
 use egui_kittest::Harness;
 
-use super::*;
+use super::{
+    CanvasLayout, DesignApp, GuideDrag, GuidePress, Mods, Overlay, Point, Pos2, RULER, SpreadRef, ToolKey, Xf, guide_drag_delta, guide_spot, json,
+    moving_guides, pos2, vec2,
+};
 
 fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
     let mut h = Harness::builder().with_size(vec2(1440.0, 900.0)).build_ui_state(
diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs
index e74cc0f73..3c2565052 100644
--- a/crates/ui-egui/src/i18n.rs
+++ b/crates/ui-egui/src/i18n.rs
@@ -4,6 +4,10 @@
 
 use std::{collections::HashMap, sync::OnceLock};
 
+mod table;
+
+use table::TABLE;
+
 mod ar;
 mod cs;
 mod de;
@@ -44,4560 +48,6 @@ pub fn picker_languages() -> Vec<(&'static str, &'static str)> {
     std::iter::once(LANGUAGES[0]).chain(rest).collect()
 }
 
-/// English → [German, French, Spanish, Japanese, Simplified Chinese].
-const TABLE: &[(&str, [&str; 5])] = &[
-    (
-        "Character Formatting Controls",
-        [
-            "Steuerelemente für Zeichenformatierung",
-            "Commandes de mise en forme des caractères",
-            "Controles de formato de carácter",
-            "文字形式コントロール",
-            "字符格式控制",
-        ],
-    ),
-    (
-        "Paragraph Formatting Controls",
-        [
-            "Steuerelemente für Absatzformatierung",
-            "Commandes de mise en forme des paragraphes",
-            "Controles de formato de párrafo",
-            "段落形式コントロール",
-            "段落格式控制",
-        ],
-    ),
-    ("Font Size", ["Schriftgrad", "Corps", "Tamaño de fuente", "フォントサイズ", "字体大小"]),
-    ("Vertical Scale", ["Vertikal skalieren", "Échelle verticale", "Escala vertical", "垂直比率", "垂直缩放"]),
-    ("Horizontal Scale", ["Horizontal skalieren", "Échelle horizontale", "Escala horizontal", "水平比率", "水平缩放"]),
-    ("Baseline Shift", ["Grundlinienversatz", "Décalage vertical", "Desplazamiento vertical", "ベースラインシフト", "基线偏移"]),
-    (
-        "Skew (False Italic)",
-        ["Verzerren (falscher Kursivstil)", "Inclinaison (faux italique)", "Sesgar (cursiva falsa)", "歪み（斜体）", "倾斜（伪斜体）"],
-    ),
-    ("Left Indent", ["Einzug links", "Retrait gauche", "Sangría izquierda", "左インデント", "左缩进"]),
-    ("Right Indent", ["Einzug rechts", "Retrait droit", "Sangría derecha", "右インデント", "右缩进"]),
-    (
-        "First Line Left Indent",
-        ["Einzug links in erster Zeile", "Retrait gauche de première ligne", "Sangría izquierda en primera línea", "1行目左インデント", "首行左缩进"],
-    ),
-    (
-        "Last Line Right Indent",
-        ["Einzug rechts in letzter Zeile", "Retrait droit de dernière ligne", "Sangría derecha en última línea", "最終行右インデント", "末行右缩进"],
-    ),
-    (
-        "Drop Cap Number of Lines",
-        ["Initiale: Anzahl der Zeilen", "Lettrine (nombre de lignes)", "Capitular: número de líneas", "ドロップキャップの行数", "首字下沉行数"],
-    ),
-    (
-        "Drop Cap One or More Characters",
-        [
-            "Initiale: ein oder mehrere Zeichen",
-            "Lettrine (un ou plusieurs caractères)",
-            "Capitular: uno o más caracteres",
-            "ドロップキャップの文字数",
-            "首字下沉一个或多个字符",
-        ],
-    ),
-    (
-        "Align to Baseline Grid",
-        [
-            "An Grundlinienraster ausrichten",
-            "Aligner sur la grille de ligne de base",
-            "Alinear con cuadrícula base",
-            "ベースライングリッドに揃える",
-            "对齐基线网格",
-        ],
-    ),
-    // Properties › Paragraph (•••).
-    ("Space Before", ["Abstand davor", "Espace avant", "Espacio anterior", "段落前の間隔", "段前间距"]),
-    ("Space After", ["Abstand danach", "Espace après", "Espacio posterior", "段落後の間隔", "段后间距"]),
-    // Menus.
-    ("File", ["Datei", "Fichier", "Archivo", "ファイル", "文件"]),
-    ("Edit", ["Bearbeiten", "Édition", "Edición", "編集", "编辑"]),
-    ("Layout", ["Layout", "Page", "Maquetación", "レイアウト", "版面"]),
-    ("Type", ["Schrift", "Texte", "Texto", "書式", "文字"]),
-    ("Object", ["Objekt", "Objet", "Objeto", "オブジェクト", "对象"]),
-    ("Table", ["Tabelle", "Tableau", "Tabla", "表", "表"]),
-    ("View", ["Ansicht", "Affichage", "Ver", "表示", "视图"]),
-    ("Window", ["Fenster", "Fenêtre", "Ventana", "ウィンドウ", "窗口"]),
-    ("Help", ["Hilfe", "Aide", "Ayuda", "ヘルプ", "帮助"]),
-    // File.
-    ("New", ["Neu", "Nouveau", "Nuevo", "新規", "新建"]),
-    ("New Document…", ["Neues Dokument …", "Nouveau document…", "Nuevo documento…", "新規ドキュメント…", "新建文档…"]),
-    ("Open…", ["Öffnen …", "Ouvrir…", "Abrir…", "開く…", "打开…"]),
-    (
-        "Open Recent",
-        ["Zuletzt verwendete Datei öffnen", "Ouvrir les fichiers récents", "Abrir recientes", "最近使用したファイルを開く", "打开最近的文件"],
-    ),
-    (
-        "Open Recent File",
-        ["Zuletzt verwendete Datei öffnen", "Ouvrir un fichier récent", "Abrir archivo reciente", "最近使用したファイルを開く", "打开最近的文件"],
-    ),
-    (
-        "Clear Recent Files",
-        ["Liste leeren", "Effacer les fichiers récents", "Borrar archivos recientes", "最近使用したファイルをクリア", "清除最近的文件"],
-    ),
-    ("Recent files", ["Zuletzt geöffnet", "Fichiers récents", "Archivos recientes", "最近使用したファイル", "最近的文件"]),
-    (
-        "Number of Recent Items to Display:",
-        [
-            "Anzahl zuletzt verwendeter Dateien:",
-            "Nombre de fichiers récents à afficher :",
-            "Número de elementos recientes:",
-            "最近使用したファイルの表示数:",
-            "最近项目显示数量：",
-        ],
-    ),
-    ("Close", ["Schließen", "Fermer", "Cerrar", "閉じる", "关闭"]),
-    ("Save", ["Speichern", "Enregistrer", "Guardar", "保存", "保存"]),
-    ("Save As…", ["Speichern unter …", "Enregistrer sous…", "Guardar como…", "別名で保存…", "另存为…"]),
-    ("Save a Copy…", ["Kopie speichern …", "Enregistrer une copie…", "Guardar una copia…", "コピーを保存…", "保存副本…"]),
-    ("Revert", ["Zurück zur letzten Version", "Version précédente", "Volver a la versión guardada", "復帰", "恢复到上次保存"]),
-    ("Place…", ["Platzieren …", "Importer…", "Colocar…", "配置…", "置入…"]),
-    ("Export PDF…", ["PDF exportieren …", "Exporter en PDF…", "Exportar PDF…", "PDF を書き出し…", "导出PDF…"]),
-    ("Print…", ["Drucken …", "Imprimer…", "Imprimir…", "プリント…", "打印…"]),
-    ("Document Setup…", ["Dokument einrichten …", "Format de document…", "Ajustar documento…", "ドキュメント設定…", "文档设置…"]),
-    ("Package…", ["Verpacken …", "Assemblage…", "Empaquetar…", "パッケージ…", "打包…"]),
-    // Edit.
-    ("Undo", ["Rückgängig", "Annuler", "Deshacer", "取り消し", "还原"]),
-    ("Redo", ["Wiederholen", "Rétablir", "Rehacer", "やり直し", "重做"]),
-    ("Cut", ["Ausschneiden", "Couper", "Cortar", "カット", "剪切"]),
-    ("Copy", ["Kopieren", "Copier", "Copiar", "コピー", "复制"]),
-    ("Paste", ["Einfügen", "Coller", "Pegar", "ペースト", "粘贴"]),
-    ("Hide Rulers", ["Lineale ausblenden", "Masquer les règles", "Ocultar reglas", "定規を隠す", "隐藏标尺"]),
-    ("Inches Decimal", ["Zoll dezimal", "Pouces décimaux", "Pulgadas decimales", "インチ（10 進）", "十进制英寸"]),
-    (
-        "Paste Vector Art",
-        ["Vektorgrafik einfügen", "Coller l’illustration vectorielle", "Pegar ilustración vectorial", "ベクトルアートをペースト", "粘贴矢量图稿"],
-    ),
-    ("Back", ["Zurück", "Retour", "Atrás", "戻る", "返回"]),
-    ("Margins and Columns", ["Ränder und Spalten", "Marges et colonnes", "Márgenes y columnas", "マージン・段組", "边距和分栏"]),
-    ("Warning", ["Warnung", "Avertissement", "Advertencia", "警告", "警告"]),
-    ("Don't show again", ["Nicht mehr anzeigen", "Ne plus afficher", "No volver a mostrar", "今後表示しない", "不再显示"]),
-    (
-        "The affected page contains objects. Delete the page anyway?",
-        [
-            "Die betroffene Seite enthält Objekte. Seite trotzdem löschen?",
-            "La page concernée contient des objets. Supprimer quand même la page ?",
-            "La página afectada contiene objetos. ¿Desea eliminarla de todos modos?",
-            "対象のページにはオブジェクトが含まれています。ページを削除しますか？",
-            "受影响的页面包含对象。仍要删除该页面吗？",
-        ],
-    ),
-    (
-        "The affected pages contain objects. Delete the pages anyway?",
-        [
-            "Die betroffenen Seiten enthalten Objekte. Seiten trotzdem löschen?",
-            "Les pages concernées contiennent des objets. Supprimer quand même les pages ?",
-            "Las páginas afectadas contienen objetos. ¿Desea eliminarlas de todos modos?",
-            "対象のページにはオブジェクトが含まれています。ページを削除しますか？",
-            "受影响的页面包含对象。仍要删除这些页面吗？",
-        ],
-    ),
-    ("Capture", ["Erfassen", "Capturer", "Capturar", "取り込み", "捕捉"]),
-    ("Panel Locations", ["Bedienfeldpositionen", "Emplacements des panneaux", "Ubicaciones de paneles", "パネルの位置", "面板位置"]),
-    ("First Page", ["Erste Seite", "Première page", "Primera página", "最初のページ", "第一页"]),
-    ("Previous Page", ["Vorherige Seite", "Page précédente", "Página anterior", "前のページ", "上一页"]),
-    ("Next Page", ["Nächste Seite", "Page suivante", "Página siguiente", "次のページ", "下一页"]),
-    ("Last Page", ["Letzte Seite", "Dernière page", "Última página", "最後のページ", "最后一页"]),
-    (
-        "Close Tab Group",
-        ["Registerkartengruppe schließen", "Fermer le groupe d'onglets", "Cerrar grupo de fichas", "タブグループを閉じる", "关闭选项卡组"],
-    ),
-    ("Minimize", ["Minimieren", "Réduire", "Minimizar", "最小化", "最小化"]),
-    ("Collapse to Icons", ["Auf Symbole minimieren", "Réduire en icônes", "Contraer a iconos", "アイコンパネルに折りたたむ", "折叠为图标"]),
-    ("Panel Options", ["Bedienfeldoptionen", "Options du panneau", "Opciones de panel", "パネルオプション", "面板选项"]),
-    ("Panel Options…", ["Bedienfeldoptionen…", "Options du panneau…", "Opciones de panel…", "パネルオプション…", "面板选项…"]),
-    ("Show Thumbnails", ["Miniaturen anzeigen", "Afficher les vignettes", "Mostrar miniaturas", "サムネールを表示", "显示缩览图"]),
-    ("Show Vertically", ["Vertikal anzeigen", "Afficher verticalement", "Mostrar verticalmente", "縦に表示", "垂直显示"]),
-    ("Panel Layout", ["Bedienfeldlayout", "Disposition du panneau", "Diseño del panel", "パネルレイアウト", "面板版面"]),
-    ("Pages on Top", ["Seiten oben", "Pages en haut", "Páginas en la parte superior", "ページを上に表示", "页面在上"]),
-    (
-        "Parents on Top",
-        ["Übergeordnete Seiten oben", "Gabarits en haut", "Páginas principales en la parte superior", "親ページを上に表示", "父页面在上"],
-    ),
-    ("Resize:", ["Größe ändern:", "Redimensionner :", "Cambiar tamaño:", "サイズ変更:", "调整大小："]),
-    ("Extra Small", ["Sehr klein", "Très petite", "Extra pequeño", "極小", "特小"]),
-    ("Small", ["Klein", "Petite", "Pequeño", "小", "小"]),
-    ("Medium", ["Mittel", "Moyenne", "Mediano", "中", "中"]),
-    ("Large", ["Groß", "Grande", "Grande", "大", "大"]),
-    ("Extra Large", ["Sehr groß", "Très grande", "Extra grande", "特大", "特大"]),
-    ("Jumbo", ["Riesig", "Géante", "Gigante", "最大", "巨大"]),
-    ("Proportional", ["Proportional", "Proportionnel", "Proporcional", "比例", "按比例"]),
-    ("Pages Fixed", ["Seiten fixiert", "Pages fixes", "Páginas fijas", "ページを固定", "页面固定"]),
-    ("Parents Fixed", ["Übergeordnete fixiert", "Gabarits fixes", "Páginas principales fijas", "親ページを固定", "父页面固定"]),
-    ("Parents", ["Übergeordnete Seiten", "Gabarits", "Páginas principales", "親ページ", "父页面"]),
-    (
-        "Bulleted & Numbered Lists",
-        [
-            "Aufzählungszeichen und nummerierte Listen",
-            "Listes à puces et numérotées",
-            "Listas con viñetas y numeradas",
-            "箇条書き",
-            "项目符号列表和编号列表",
-        ],
-    ),
-    ("Current Page Number", ["Aktuelle Seitenzahl", "Numéro de page actuelle", "Número de página actual", "現在のページ番号", "当前页码"]),
-    ("Apply Color (,)", ["Farbe anwenden (,)", "Appliquer la couleur (,)", "Aplicar color (,)", "カラーを適用 (,)", "应用颜色 (,)"]),
-    ("Apply Gradient (.)", ["Verlauf anwenden (.)", "Appliquer le dégradé (.)", "Aplicar degradado (.)", "グラデーションを適用 (.)", "应用渐变 (.)"]),
-    ("View Options", ["Ansichtsoptionen", "Options d’affichage", "Opciones de visualización", "表示オプション", "视图选项"]),
-    ("Frame Edges", ["Rahmenkanten", "Bords du bloc", "Bordes del marco", "フレーム枠", "框架边缘"]),
-    ("Rulers", ["Lineale", "Règles", "Reglas", "定規", "标尺"]),
-    ("Hidden Characters", ["Verborgene Zeichen", "Caractères masqués", "Caracteres ocultos", "制御文字", "隐藏字符"]),
-    ("Flex Layout", ["Flex-Layout", "Mise en page flexible", "Diseño flexible", "フレックスレイアウト", "弹性布局"]),
-    (
-        "Create Flex Layout",
-        ["Flex-Layout erstellen", "Créer une mise en page flexible", "Crear diseño flexible", "フレックスレイアウトを作成", "创建弹性布局"],
-    ),
-    (
-        "Add to Flex Layout",
-        [
-            "Zu Flex-Layout hinzufügen",
-            "Ajouter à la mise en page flexible",
-            "Añadir a diseño flexible",
-            "フレックスレイアウトに追加",
-            "添加到弹性布局",
-        ],
-    ),
-    (
-        "Convert to Flex Layout",
-        [
-            "In Flex-Layout umwandeln",
-            "Convertir en mise en page flexible",
-            "Convertir en diseño flexible",
-            "フレックスレイアウトに変換",
-            "转换为弹性布局",
-        ],
-    ),
-    (
-        "Remove Flex Layout",
-        ["Flex-Layout entfernen", "Supprimer la mise en page flexible", "Quitar diseño flexible", "フレックスレイアウトを削除", "移除弹性布局"],
-    ),
-    (
-        "Show Flex Controls",
-        [
-            "Flex-Steuerelemente einblenden",
-            "Afficher les commandes flexibles",
-            "Mostrar controles flexibles",
-            "フレックスコントロールを表示",
-            "显示弹性控件",
-        ],
-    ),
-    (
-        "Flex Layout Options",
-        ["Flex-Layout-Optionen", "Options de mise en page flexible", "Opciones de diseño flexible", "フレックスレイアウトオプション", "弹性布局选项"],
-    ),
-    (
-        "Reorder in Flex Layout",
-        [
-            "Im Flex-Layout umordnen",
-            "Réorganiser dans la mise en page flexible",
-            "Reordenar en diseño flexible",
-            "フレックスレイアウト内で並べ替え",
-            "在弹性布局中重新排序",
-        ],
-    ),
-    ("Flex Start", ["Flex-Anfang", "Début flexible", "Inicio flexible", "フレックス開始", "弹性起点"]),
-    ("Flex End", ["Flex-Ende", "Fin flexible", "Fin flexible", "フレックス終了", "弹性终点"]),
-    ("Space Between", ["Abstand dazwischen", "Espace entre", "Espacio entre", "間隔を均等", "两端对齐"]),
-    ("Space Around", ["Abstand ringsum", "Espace autour", "Espacio alrededor", "周囲に間隔", "周围间距"]),
-    ("Space Evenly", ["Gleichmäßig verteilen", "Espace uniforme", "Espacio uniforme", "均等に配置", "均匀分布"]),
-    ("Row", ["Zeile", "Ligne", "Fila", "行", "行"]),
-    ("Reverse Row", ["Zeile umgekehrt", "Ligne inversée", "Fila invertida", "行（逆方向）", "反向行"]),
-    ("Reverse Column", ["Spalte umgekehrt", "Colonne inversée", "Columna invertida", "列（逆方向）", "反向列"]),
-    ("Wrap Content", ["Inhalt umbrechen", "Renvoyer le contenu à la ligne", "Ajustar contenido", "コンテンツを折り返す", "内容换行"]),
-    ("Spacing", ["Abstände", "Espacement", "Espaciado", "間隔", "间距"]),
-    ("Horizontal Spacing", ["Horizontaler Abstand", "Espacement horizontal", "Espaciado horizontal", "水平方向の間隔", "水平间距"]),
-    ("Vertical Spacing", ["Vertikaler Abstand", "Espacement vertical", "Espaciado vertical", "垂直方向の間隔", "垂直间距"]),
-    ("Constrain proportions", ["Proportionen beibehalten", "Conserver les proportions", "Restringir proporciones", "縦横比を固定", "约束比例"]),
-    ("Auto", ["Automatisch", "Automatique", "Automático", "自動", "自动"]),
-    ("W:", ["B:", "L :", "An.:", "幅:", "宽:"]),
-    ("H:", ["H:", "H :", "Al.:", "高さ:", "高:"]),
-    ("Number:", ["Zahl:", "Numéro:", "Número:", "番号:", "编号："]),
-    ("Gutter:", ["Steg:", "Gouttière :", "Medianil:", "間隔:", "栏间距："]),
-    ("Fit Guides to:", ["Hilfslinien einpassen in:", "Ajuster les repères à :", "Ajustar guías a:", "ガイドの適用先:", "参考线适合："]),
-    ("Top:", ["Oben:", "Haut :", "Superior:", "天:", "上："]),
-    ("Bottom:", ["Unten:", "Bas :", "Inferior:", "地:", "下："]),
-    ("Inside:", ["Innen:", "Intérieur :", "Interior:", "ノド:", "内："]),
-    ("Outside:", ["Außen:", "Extérieur :", "Exterior:", "小口:", "外："]),
-    ("Left:", ["Links:", "Gauche :", "Izquierda:", "左:", "左："]),
-    ("Right:", ["Rechts:", "Droite :", "Derecha:", "右:", "右："]),
-    ("Paths:", ["Pfade:", "Tracés :", "Trazados:", "パス:", "路径："]),
-    ("Pathfinder:", ["Pathfinder:", "Pathfinder :", "Buscatrazos:", "パスファインダー:", "路径查找器："]),
-    ("Convert Shape:", ["Form konvertieren:", "Convertir la forme :", "Convertir forma:", "シェイプを変換:", "转换形状："]),
-    ("Convert Point:", ["Punkt konvertieren:", "Convertir le point :", "Convertir punto:", "ポイントを変換:", "转换点："]),
-    ("Join Path", ["Pfad zusammenfügen", "Joindre le tracé", "Unir trazado", "パスを連結", "连接路径"]),
-    ("Open Path", ["Pfad öffnen", "Ouvrir le tracé", "Abrir trazado", "パスをオープン", "开放路径"]),
-    ("Plain", ["Einfach", "Simple", "Normal", "プレーン", "普通"]),
-    ("Symmetrical", ["Symmetrisch", "Symétrique", "Simétrico", "対称", "对称"]),
-    (
-        "The stroke isn't a gradient.",
-        [
-            "Die Kontur ist kein Verlauf.",
-            "Le contour n’est pas un dégradé.",
-            "El trazo no es un degradado.",
-            "線はグラデーションではありません。",
-            "描边不是渐变。",
-        ],
-    ),
-    ("Baseline Options", ["Grundlinienoptionen", "Options de ligne de base", "Opciones de línea de base", "ベースラインオプション", "基线选项"]),
-    ("Fixed Number", ["Feste Anzahl", "Nombre fixe", "Número fijo", "固定数", "固定数字"]),
-    ("Fixed Width", ["Feste Breite", "Largeur fixe", "Anchura fija", "固定幅", "固定宽度"]),
-    ("Inset Spacing", ["Versatzabstand", "Marge intérieure", "Espaciado de margen interior", "フレーム内マージン", "内边距"]),
-    ("Vertical Justification", ["Vertikale Ausrichtung", "Justification verticale", "Justificación vertical", "垂直比率", "垂直对齐"]),
-    ("Align:", ["Ausrichten:", "Alignement :", "Alinear:", "整列:", "对齐："]),
-    ("Ignore Text Wrap", ["Textumfluss ignorieren", "Ignorer l’habillage", "Ignorar ceñir texto", "テキストの回り込みを無視", "忽略文本绕排"]),
-    ("Technique:", ["Technik:", "Technique :", "Técnica:", "テクニック:", "方法："]),
-    ("Softer", ["Weicher", "Plus flou", "Más suave", "さらにソフトに", "柔和"]),
-    ("Precise", ["Präzise", "Précis", "Precisa", "精細", "精确"]),
-    ("Corners:", ["Ecken:", "Angles :", "Esquinas:", "角:", "角点："]),
-    ("Sharp", ["Spitz", "Vifs", "Nítidas", "シャープ", "锐利"]),
-    ("Diffused", ["Weich", "Diffus", "Difusas", "拡散", "扩散"]),
-    ("Reverse Path", ["Pfadrichtung umkehren", "Inverser le tracé", "Invertir trazado", "パスの方向反転", "反转路径"]),
-    ("Set Anchor", ["Ankerpunkt festlegen", "Définir le point d’ancrage", "Definir punto de ancla", "アンカーポイントを設定", "设置锚点"]),
-    ("Effects…", ["Effekte…", "Effets…", "Efectos…", "効果…", "效果…"]),
-    ("Settings for:", ["Einstellungen für:", "Paramètres pour :", "Ajustes para:", "設定対象：", "设置："]),
-    ("Transparency", ["Transparenz", "Transparence", "Transparencia", "透明", "透明度"]),
-    ("Transparency…", ["Transparenz…", "Transparence…", "Transparencia…", "透明…", "透明度…"]),
-    ("Basic Blending", ["Grundlegendes Füllen", "Fusion de base", "Fusión básica", "基本的な描画モード", "基本混合"]),
-    ("Opacity:", ["Deckkraft:", "Opacité :", "Opacidad:", "不透明度：", "不透明度："]),
-    ("Blending", ["Füllmethode", "Fusion", "Fusión", "描画モード", "混合"]),
-    ("Distance:", ["Abstand:", "Distance :", "Distancia:", "距離：", "距离："]),
-    ("X Offset:", ["X-Versatz:", "Décalage X :", "Desplazamiento X:", "X オフセット：", "X 位移："]),
-    ("Y Offset:", ["Y-Versatz:", "Décalage Y :", "Desplazamiento Y:", "Y オフセット：", "Y 位移："]),
-    ("Spread:", ["Größe ändern:", "Étendue :", "Extensión:", "スプレッド：", "扩展："]),
-    ("Choke:", ["Unterfüllen:", "Contraction :", "Contracción:", "チョーク：", "收缩："]),
-    ("Source:", ["Quelle:", "Source :", "Origen:", "ソース：", "源："]),
-    ("Edge", ["Kante", "Contour", "Borde", "エッジ", "边缘"]),
-    ("Depth:", ["Tiefe:", "Profondeur :", "Profundidad:", "深さ：", "深度："]),
-    ("Highlight:", ["Lichter:", "Lumière :", "Iluminación:", "ハイライト：", "高光："]),
-    ("Shadow:", ["Tiefen:", "Ombre :", "Sombra:", "シャドウ：", "阴影："]),
-    ("Feather Width:", ["Breite der weichen Kante:", "Largeur du contour progressif :", "Anchura de desvanecimiento:", "ぼかしの幅：", "羽化宽度："]),
-    ("Feather Widths", ["Breiten der weichen Kante", "Largeurs du contour progressif", "Anchuras de desvanecimiento", "ぼかしの幅", "羽化宽度"]),
-    ("Gradient Stops", ["Verlaufsregler", "Arrêts de dégradé", "Paradas de degradado", "グラデーション分岐点", "渐变色标"]),
-    ("Start Opacity:", ["Anfangsdeckkraft:", "Opacité de début :", "Opacidad inicial:", "開始の不透明度：", "起始不透明度："]),
-    ("End Opacity:", ["Enddeckkraft:", "Opacité de fin :", "Opacidad final:", "終了の不透明度：", "结束不透明度："]),
-    ("(no effects)", ["(keine Effekte)", "(aucun effet)", "(sin efectos)", "(効果なし)", "(无效果)"]),
-    ("OBJECT", ["OBJEKT", "OBJET", "OBJETO", "オブジェクト", "对象"]),
-    (
-        "Add an object effect to the selected target",
-        [
-            "Dem ausgewählten Ziel einen Objekteffekt hinzufügen",
-            "Ajouter un effet d’objet à la cible sélectionnée",
-            "Añadir un efecto de objeto al destino seleccionado",
-            "選択した対象にオブジェクト効果を追加",
-            "为所选目标添加对象效果",
-        ],
-    ),
-    ("Clear", ["Löschen", "Effacer", "Borrar", "消去", "清除"]),
-    ("Duplicate", ["Duplizieren", "Dupliquer", "Duplicar", "複製", "重复"]),
-    ("Select All", ["Alles auswählen", "Tout sélectionner", "Seleccionar todo", "すべてを選択", "全选"]),
-    ("Deselect All", ["Auswahl aufheben", "Tout désélectionner", "Deseleccionar todo", "すべての選択を解除", "取消全选"]),
-    (
-        "Select All Guides",
-        ["Alle Hilfslinien auswählen", "Sélectionner tous les repères", "Seleccionar todas las guías", "すべてのガイドを選択", "选择所有参考线"],
-    ),
-    ("Ruler Guide", ["Hilfslinie", "Repère de règle", "Guía de regla", "定規ガイド", "标尺参考线"]),
-    ("Find/Change…", ["Suchen/Ersetzen …", "Rechercher/Remplacer…", "Buscar/Cambiar…", "検索と置換…", "查找/更改…"]),
-    ("Check Spelling…", ["Rechtschreibprüfung …", "Vérifier l'orthographe…", "Revisar ortografía…", "スペルチェック…", "拼写检查…"]),
-    ("Preferences…", ["Voreinstellungen …", "Préférences…", "Preferencias…", "環境設定…", "首选项…"]),
-    ("Settings…", ["Einstellungen …", "Réglages…", "Ajustes…", "設定…", "设置…"]),
-    (
-        "Keyboard Shortcuts…",
-        ["Tastaturbefehle …", "Raccourcis clavier…", "Métodos abreviados de teclado…", "キーボードショートカット…", "键盘快捷键…"],
-    ),
-    ("Interface Language", ["Sprache der Oberfläche", "Langue de l'interface", "Idioma de la interfaz", "インターフェイスの言語", "界面语言"]),
-    // Layout.
-    ("Pages", ["Seiten", "Pages", "Páginas", "ページ", "页面"]),
-    ("Margins and Columns…", ["Ränder und Spalten …", "Marges et colonnes…", "Márgenes y columnas…", "マージン・段組…", "边距和分栏…"]),
-    ("Create Guides…", ["Hilfslinien erstellen …", "Créer des repères…", "Crear guías…", "ガイドを作成…", "创建参考线…"]),
-    (
-        "Numbering & Section Options…",
-        [
-            "Nummerierungs- und Abschnittsoptionen …",
-            "Options de numérotation et de section…",
-            "Opciones de numeración y sección…",
-            "ノンブルとセクション設定…",
-            "页码和章节选项…",
-        ],
-    ),
-    // Type.
-    ("Story Direction", ["Textrichtung", "Sens du texte", "Dirección del texto", "組み方向", "文章方向"]),
-    ("Horizontal", ["Horizontal", "Horizontal", "Horizontal", "横書き", "水平"]),
-    ("Vertical", ["Vertikal", "Vertical", "Vertical", "縦書き", "垂直"]),
-    ("Tate-Chu-Yoko", ["Tate-Chu-Yoko", "Tate-Chu-Yoko", "Tate-Chu-Yoko", "縦中横", "纵中横"]),
-    ("Ruby…", ["Ruby …", "Ruby…", "Ruby…", "ルビ…", "旁注…"]),
-    ("Kenten", ["Kenten", "Kenten", "Kenten", "圏点", "圈点"]),
-    ("Warichu", ["Warichu", "Warichu", "Warichu", "割り注", "割注"]),
-    // Style Options: CJK sections.
-    ("Tate-chu-yoko Settings", ["Tate-Chu-Yoko-Einstellungen", "Paramètres Tate-Chu-Yoko", "Ajustes de Tate-Chu-Yoko", "縦中横設定", "纵中横设置"]),
-    ("Kenten Settings", ["Kenten-Einstellungen", "Paramètres Kenten", "Ajustes de Kenten", "圏点設定", "圈点设置"]),
-    (
-        "Japanese Composition Settings",
-        ["Japanischer Satz", "Paramètres de composition japonaise", "Ajustes de composición japonesa", "日本語文字組版", "日文排版设置"],
-    ),
-    ("Grid Settings", ["Rastereinstellungen", "Paramètres de grille", "Ajustes de cuadrícula", "グリッド設定", "网格设置"]),
-    ("Warichu Settings", ["Warichu-Einstellungen", "Paramètres Warichu", "Ajustes de Warichu", "割注設定", "割注设置"]),
-    (
-        "Auto Tate-chu-yoko Settings",
-        [
-            "Automatische Tate-Chu-Yoko-Einstellungen",
-            "Paramètres Tate-Chu-Yoko automatiques",
-            "Ajustes de Tate-Chu-Yoko automático",
-            "自動縦中横設定",
-            "自动纵中横设置",
-        ],
-    ),
-    (
-        "Ruby Placement and Spacing",
-        ["Ruby-Position und -Abstand", "Position et espacement ruby", "Posición y espaciado de ruby", "ルビの位置と間隔", "注音位置和间距"],
-    ),
-    (
-        "Ruby Font and Size",
-        ["Ruby-Schrift und -Größe", "Police et taille ruby", "Fuente y tamaño de ruby", "ルビのフォントとサイズ", "注音字体和大小"],
-    ),
-    (
-        "Adjustment When Ruby Is Longer Than Parent",
-        [
-            "Anpassung bei Ruby länger als Grundtext",
-            "Ajustement si le ruby dépasse le texte parent",
-            "Ajuste cuando el ruby es más largo que la base",
-            "ルビが親文字より長い時の調整",
-            "注音长于基础文字时的调整",
-        ],
-    ),
-    ("Ruby Color", ["Ruby-Farbe", "Couleur ruby", "Color de ruby", "ルビカラー", "注音颜色"]),
-    ("Kenten Color", ["Kenten-Farbe", "Couleur kenten", "Color de kenten", "圏点カラー", "圈点颜色"]),
-    ("Shatai", ["Shatai", "Shatai", "Shatai", "斜体", "斜体"]),
-    ("Tate-chu-yoko Digits:", ["Tate-Chu-Yoko-Ziffern:", "Chiffres Tate-Chu-Yoko:", "Dígitos Tate-Chu-Yoko:", "組数字（桁まで）:", "纵中横位数："]),
-    (
-        "Include Roman Characters",
-        ["Lateinische Zeichen einbeziehen", "Inclure les caractères latins", "Incluir caracteres latinos", "欧文も含める", "包括罗马字符"],
-    ),
-    ("Ruby Type:", ["Ruby-Art:", "Type de ruby:", "Tipo de ruby:", "種類:", "注音类型："]),
-    ("Per-Character Ruby", ["Einzelzeichen-Ruby", "Ruby par caractère", "Ruby por carácter", "モノルビ", "单字注音"]),
-    ("Group Ruby", ["Gruppen-Ruby", "Ruby de groupe", "Ruby de grupo", "グループルビ", "组注音"]),
-    ("Left/Top", ["Links/oben", "Gauche/haut", "Izquierda/arriba", "肩付き", "左/上"]),
-    ("Centered", ["Zentriert", "Centré", "Centrado", "中付き", "居中"]),
-    ("Right/Bottom", ["Rechts/unten", "Droite/bas", "Derecha/abajo", "右／下揃え", "右/下"]),
-    ("Full Justify", ["Blocksatz", "Justifié", "Justificado", "両端揃え", "两端对齐"]),
-    ("1-2-1 (JIS) Rule", ["1-2-1-Regel (JIS)", "Règle 1-2-1 (JIS)", "Regla 1-2-1 (JIS)", "1-2-1(JIS)ルール", "1-2-1 (JIS) 规则"]),
-    ("Equal Aki", ["Gleicher Abstand", "Espacement égal", "Espaciado igual", "均等アキ", "均等间距"]),
-    (
-        "1 Ruby Character Aki",
-        ["1 Ruby-Zeichen Abstand", "Espace de 1 caractère ruby", "Espacio de 1 carácter ruby", "1ルビ文字アキ", "1注音字符间距"],
-    ),
-    ("Above/Right", ["Oben/rechts", "Au-dessus/à droite", "Arriba/derecha", "上／右", "上/右"]),
-    ("Below/Left", ["Unten/links", "En dessous/à gauche", "Abajo/izquierda", "下／左", "下/左"]),
-    (
-        "Offset from Parent",
-        [
-            "Versatz zum Grundtext",
-            "Décalage par rapport au texte parent",
-            "Desplazamiento respecto a la base",
-            "親文字からのオフセット",
-            "与基础文字的偏移",
-        ],
-    ),
-    ("Across the Line:", ["Quer zur Zeile:", "Perpendiculaire à la ligne:", "Perpendicular a la línea:", "横組み上下／縦組み左右:", "垂直于行："]),
-    ("Along the Line:", ["Entlang der Zeile:", "Le long de la ligne:", "A lo largo de la línea:", "横組み左右／縦組み上下:", "沿行方向："]),
-    ("Parent's Font", ["Schrift des Grundtexts", "Police du texte parent", "Fuente de la base", "親文字と同じ", "基础文字的字体"]),
-    (
-        "Use OpenType Pro Ruby Glyphs",
-        [
-            "OpenType-Pro-Ruby-Glyphen verwenden",
-            "Utiliser les glyphes ruby OpenType Pro",
-            "Usar glifos ruby de OpenType Pro",
-            "OpenType Pro のルビ字形を使用",
-            "使用 OpenType Pro 注音字形",
-        ],
-    ),
-    ("Fit to Width", ["An Breite anpassen", "Ajuster à la largeur", "Ajustar al ancho", "幅に合わせる", "适合宽度"]),
-    ("Ruby Overhang:", ["Ruby-Überhang:", "Débordement ruby:", "Desbordamiento de ruby:", "文字かけ処理:", "注音悬挂："]),
-    ("1 Ruby Character", ["1 Ruby-Zeichen", "1 caractère ruby", "1 carácter ruby", "ルビ1文字分", "1个注音字符"]),
-    ("1/2 Ruby Character", ["1/2 Ruby-Zeichen", "1/2 caractère ruby", "1/2 carácter ruby", "ルビ半文字分", "1/2个注音字符"]),
-    ("1 Parent Character", ["1 Grundzeichen", "1 caractère parent", "1 carácter base", "親1文字分", "1个基础字符"]),
-    ("1/2 Parent Character", ["1/2 Grundzeichen", "1/2 caractère parent", "1/2 carácter base", "親半文字分", "1/2个基础字符"]),
-    ("Unlimited", ["Unbegrenzt", "Illimité", "Ilimitado", "無制限", "无限制"]),
-    (
-        "Parent Character Spacing:",
-        ["Abstand im Grundtext:", "Espacement du texte parent:", "Espaciado de la base:", "親文字間の調整:", "基础文字间距调整："],
-    ),
-    ("No Adjustment", ["Keine Anpassung", "Aucun ajustement", "Sin ajuste", "調整しない", "不调整"]),
-    ("Both Sides", ["Beide Seiten", "Des deux côtés", "Ambos lados", "両サイド", "两侧"]),
-    ("1-2-1 Aki", ["1-2-1-Abstand", "Espacement 1-2-1", "Espaciado 1-2-1", "1-2-1アキ", "1-2-1 间距"]),
-    (
-        "Shrink Ruby Width Automatically",
-        [
-            "Ruby-Breite automatisch verringern",
-            "Réduire automatiquement la largeur ruby",
-            "Reducir automáticamente el ancho de ruby",
-            "ルビの文字幅を自動的に詰める",
-            "自动压缩注音宽度",
-        ],
-    ),
-    ("Minimum Scale:", ["Minimale Skalierung:", "Échelle minimale:", "Escala mínima:", "最小比率:", "最小比例："]),
-    (
-        "Auto Align at Line Start/End",
-        [
-            "Am Zeilenanfang/-ende automatisch ausrichten",
-            "Alignement auto en début/fin de ligne",
-            "Alinear automáticamente al inicio/fin de línea",
-            "自動行頭／行末揃え",
-            "行首/行尾自动对齐",
-        ],
-    ),
-    ("Text Color", ["Textfarbe", "Couleur du texte", "Color del texto", "[自動]", "文字颜色"]),
-    (
-        "Distance from Parent:",
-        ["Abstand zum Grundtext:", "Distance au texte parent:", "Distancia a la base:", "親文字からの間隔:", "与基础文字的距离："],
-    ),
-    ("Fisheye", ["Fischauge", "Œil de poisson", "Ojo de pez", "蛇の目", "蛇目"]),
-    ("Magnification:", ["Verkleinerung:", "Réduction:", "Reducción:", "縮小率:", "缩小率："]),
-    ("Adjust Rotation", ["Drehung anpassen", "Ajuster la rotation", "Ajustar rotación", "ライン揃え", "调整旋转"]),
-    ("Adjust Tsume", ["Tsume anpassen", "Ajuster le tsume", "Ajustar tsume", "ツメの調整", "调整字距压缩"]),
-    (
-        "Rotate Roman Characters in Vertical Text",
-        [
-            "Lateinische Zeichen in vertikalem Text drehen",
-            "Faire pivoter les caractères latins en texte vertical",
-            "Girar caracteres latinos en texto vertical",
-            "縦組み中の欧文回転",
-            "直排中旋转罗马字符",
-        ],
-    ),
-    (
-        "Roman Word Break",
-        ["Lateinische Wörter beliebig trennen", "Coupure libre des mots latins", "Corte libre de palabras latinas", "欧文泣き別れ", "西文单词断开"],
-    ),
-    ("ICF Top", ["ICF oben", "Haut ICF", "Parte superior ICF", "平均字面の上", "平均字面上"]),
-    ("ICF Bottom", ["ICF unten", "Bas ICF", "Parte inferior ICF", "平均字面の下", "平均字面下"]),
-    ("Gyoudori:", ["Gyoudori:", "Gyoudori :", "Gyoudori:", "行取り:", "行取："]),
-    (
-        "Use Paragraph Gyoudori",
-        ["Absatz-Gyoudori verwenden", "Utiliser le gyoudori de paragraphe", "Usar gyoudori de párrafo", "段落行取りを使用", "使用段落行取"],
-    ),
-    ("Up/Down Position:", ["Position oben/unten:", "Position haut/bas:", "Posición arriba/abajo:", "上下位置:", "上下位置："]),
-    ("Left/Right Position:", ["Position links/rechts:", "Position gauche/droite:", "Posición izquierda/derecha:", "左右位置:", "左右位置："]),
-    ("Kenten Type:", ["Kenten-Art:", "Type de kenten:", "Tipo de kenten:", "圏点種類:", "圈点类型："]),
-    ("Sesame Dot", ["Sesampunkt", "Point sésame", "Punto de sésamo", "ゴマ", "芝麻点"]),
-    ("White Sesame Dot", ["Weißer Sesampunkt", "Point sésame blanc", "Punto de sésamo blanco", "白ゴマ", "空心芝麻点"]),
-    ("Bullseye", ["Zielscheibe", "Cible", "Diana", "蛇の目", "靶心"]),
-    ("Black Circle", ["Schwarzer Kreis", "Cercle noir", "Círculo negro", "黒丸", "实心圆"]),
-    ("Small Black Circle", ["Kleiner schwarzer Kreis", "Petit cercle noir", "Círculo negro pequeño", "小さい黒丸", "小实心圆"]),
-    ("Double Circle", ["Doppelkreis", "Double cercle", "Círculo doble", "二重丸", "双圆"]),
-    ("Black Triangle", ["Schwarzes Dreieck", "Triangle noir", "Triángulo negro", "黒三角", "实心三角"]),
-    ("White Triangle", ["Weißes Dreieck", "Triangle blanc", "Triángulo blanco", "白三角", "空心三角"]),
-    ("White Circle", ["Weißer Kreis", "Cercle blanc", "Círculo blanco", "白丸", "空心圆"]),
-    ("Small White Circle", ["Kleiner weißer Kreis", "Petit cercle blanc", "Círculo blanco pequeño", "小さい白丸", "小空心圆"]),
-    ("Character:", ["Zeichen:", "Caractère:", "Carácter:", "文字:", "字符："]),
-    ("Kinsoku Set:", ["Kinsoku-Satz:", "Jeu kinsoku:", "Conjunto kinsoku:", "禁則処理セット:", "避头尾集："]),
-    ("Default Rules", ["Standardregeln", "Règles par défaut", "Reglas predeterminadas", "既定の規則", "默认规则"]),
-    ("Hard Kinsoku", ["Hartes Kinsoku", "Kinsoku strict", "Kinsoku estricto", "強い禁則", "严格避头尾"]),
-    ("Soft Kinsoku", ["Weiches Kinsoku", "Kinsoku souple", "Kinsoku flexible", "弱い禁則", "宽松避头尾"]),
-    (
-        "Simplified Chinese Kinsoku",
-        ["Kinsoku für vereinfachtes Chinesisch", "Kinsoku chinois simplifié", "Kinsoku de chino simplificado", "簡体中国語禁則", "简体中文避头尾"],
-    ),
-    (
-        "Traditional Chinese Kinsoku",
-        ["Kinsoku für traditionelles Chinesisch", "Kinsoku chinois traditionnel", "Kinsoku de chino tradicional", "繁体中国語禁則", "繁体中文避头尾"],
-    ),
-    ("Korean Kinsoku", ["Koreanisches Kinsoku", "Kinsoku coréen", "Kinsoku coreano", "韓国語禁則", "韩文避头尾"]),
-    ("Kinsoku Type:", ["Kinsoku-Methode:", "Type de kinsoku:", "Tipo de kinsoku:", "禁則調整方式:", "避头尾调整方式："]),
-    ("Push In First", ["Zuerst einziehen", "Rentrer d'abord", "Primero hacia dentro", "追い込み優先", "先推入"]),
-    ("Push Out First", ["Zuerst hinausschieben", "Repousser d'abord", "Primero hacia fuera", "追い出し優先", "先推出"]),
-    ("Push Out Only", ["Nur hinausschieben", "Repousser uniquement", "Solo hacia fuera", "追い出しのみ", "仅推出"]),
-    (
-        "Prioritize Adjustment Amount",
-        ["Anpassungsbetrag bevorzugen", "Priorité à la valeur d'ajustement", "Priorizar la cantidad de ajuste", "調整量を優先", "优先调整量"],
-    ),
-    ("Hanging Type:", ["Hängende Interpunktion:", "Ponctuation suspendue:", "Puntuación colgante:", "ぶら下がり方法:", "悬挂方式："]),
-    ("Force", ["Erzwingen", "Forcer", "Forzar", "強制", "强制"]),
-    ("Bunri-Kinshi", ["Bunri-Kinshi", "Bunri-Kinshi", "Bunri-Kinshi", "分離禁止処理", "分离禁止"]),
-    ("Mojikumi Set:", ["Mojikumi-Satz:", "Jeu mojikumi:", "Conjunto mojikumi:", "文字組み:", "标点挤压集："]),
-    ("Leading Model:", ["Zeilenabstandsmodell:", "Modèle d'interlignage:", "Modelo de interlineado:", "行送りの基準位置:", "行距基准位置："]),
-    (
-        "Em Box Top/Right",
-        ["Geviert oben/rechts", "Haut/droite du cadratin", "Parte superior/derecha del cuadratín", "仮想ボディの上／右", "全角字框上/右"],
-    ),
-    ("Em Box Center", ["Geviert Mitte", "Centre du cadratin", "Centro del cuadratín", "仮想ボディの中央", "全角字框居中"]),
-    (
-        "Em Box Bottom/Left",
-        ["Geviert unten/links", "Bas/gauche du cadratin", "Parte inferior/izquierda del cuadratín", "仮想ボディの下／左", "全角字框下/左"],
-    ),
-    (
-        "Em Box Center (Down)",
-        ["Geviert Mitte (unten)", "Centre du cadratin (bas)", "Centro del cuadratín (abajo)", "仮想ボディの中央（下）", "全角字框居中（下）"],
-    ),
-    ("Roman Baseline", ["Lateinische Grundlinie", "Ligne de base romaine", "Línea de base romana", "欧文ベースライン", "罗马字基线"]),
-    ("Rensuuji", ["Rensuuji", "Rensuuji", "Rensuuji", "連数字処理", "连数字处理"]),
-    (
-        "Absorb Ideographic Space at Line End",
-        [
-            "Ideografisches Leerzeichen am Zeilenende absorbieren",
-            "Absorber l'espace idéographique en fin de ligne",
-            "Absorber el espacio ideográfico al final de línea",
-            "全角スペースを行末吸収",
-            "行尾吸收全角空格",
-        ],
-    ),
-    ("Grid Alignment:", ["Am Raster ausrichten:", "Alignement sur la grille:", "Alineación con cuadrícula:", "グリッド揃え:", "网格对齐："]),
-    (
-        "Align Only First Line to Grid",
-        [
-            "Nur erste Zeile am Raster ausrichten",
-            "Aligner uniquement la première ligne sur la grille",
-            "Alinear solo la primera línea con la cuadrícula",
-            "1 行目のみグリッドに揃える",
-            "仅首行对齐网格",
-        ],
-    ),
-    ("Warichu Size:", ["Warichu-Größe:", "Taille warichu:", "Tamaño de warichu:", "割注サイズ:", "割注大小："]),
-    ("Line Spacing:", ["Zeilenabstand:", "Interligne:", "Interlineado:", "行の間隔:", "行间距："]),
-    ("Line Break Options", ["Umbruchoptionen", "Options de saut de ligne", "Opciones de salto de línea", "改行オプション", "换行选项"]),
-    (
-        "Characters Before Break:",
-        ["Zeichen vor dem Umbruch:", "Caractères avant le saut:", "Caracteres antes del salto:", "1 行目の最小文字数:", "换行前最少字符数："],
-    ),
-    (
-        "Characters After Break:",
-        ["Zeichen nach dem Umbruch:", "Caractères après le saut:", "Caracteres después del salto:", "最終行の最小文字数:", "换行后最少字符数："],
-    ),
-    ("Font", ["Schriftart", "Police", "Fuente", "フォント", "字体"]),
-    ("Size", ["Schriftgrad", "Corps", "Tamaño", "サイズ", "大小"]),
-    ("Character", ["Zeichen", "Caractère", "Carácter", "文字", "字符"]),
-    ("Paragraph", ["Absatz", "Paragraphe", "Párrafo", "段落", "段落"]),
-    ("Tabs", ["Tabulatoren", "Tabulations", "Tabulaciones", "タブ", "制表符"]),
-    (
-        "Left-aligned tab",
-        ["Linksbündiger Tabulator", "Tabulation alignée à gauche", "Tabulación alineada a la izquierda", "左揃えタブ", "左对齐制表符"],
-    ),
-    ("Centered tab", ["Zentrierter Tabulator", "Tabulation centrée", "Tabulación centrada", "中央揃えタブ", "居中对齐制表符"]),
-    (
-        "Right-aligned tab",
-        ["Rechtsbündiger Tabulator", "Tabulation alignée à droite", "Tabulación alineada a la derecha", "右揃えタブ", "右对齐制表符"],
-    ),
-    (
-        "Tab aligned on a character",
-        [
-            "Am Zeichen ausgerichteter Tabulator",
-            "Tabulation alignée sur un caractère",
-            "Tabulación alineada en un carácter",
-            "文字揃えタブ",
-            "按字符对齐制表符",
-        ],
-    ),
-    ("X:", ["X:", "X :", "X:", "X:", "X:"]),
-    ("Leader:", ["Füllzeichen:", "Points de suite :", "Carácter de relleno:", "リーダー:", "前导符:"]),
-    ("Align On:", ["Ausrichten an:", "Aligner sur :", "Alinear en:", "揃える文字:", "对齐位置:"]),
-    (
-        "Position panel above text frame",
-        [
-            "Bedienfeld über dem Textrahmen platzieren",
-            "Placer le panneau au-dessus du bloc de texte",
-            "Colocar el panel sobre el marco de texto",
-            "パネルをテキストフレームの上に配置",
-            "将面板置于文本框上方",
-        ],
-    ),
-    ("Clear All", ["Alle löschen", "Tout effacer", "Borrar todo", "すべてを消去", "全部清除"]),
-    ("Delete Tab", ["Tabulator löschen", "Supprimer la tabulation", "Eliminar tabulación", "タブを削除", "删除制表符"]),
-    ("Repeat Tab", ["Tabulator wiederholen", "Répéter la tabulation", "Repetir tabulación", "タブを繰り返し", "重复制表符"]),
-    ("Reset Indents", ["Einzüge zurücksetzen", "Réinitialiser les retraits", "Restablecer sangrías", "インデントをリセット", "重置缩进"]),
-    ("Glyphs", ["Glyphen", "Glyphes", "Glifos", "字形", "字形"]),
-    ("Story", ["Textabschnitt", "Article", "Artículo", "ストーリー", "文章"]),
-    ("Character Styles", ["Zeichenformate", "Styles de caractère", "Estilos de carácter", "文字スタイル", "字符样式"]),
-    ("Paragraph Styles", ["Absatzformate", "Styles de paragraphe", "Estilos de párrafo", "段落スタイル", "段落样式"]),
-    ("Create Outlines", ["In Pfade umwandeln", "Vectoriser", "Crear contornos", "アウトラインを作成", "创建轮廓"]),
-    (
-        "Show Hidden Characters",
-        ["Verborgene Zeichen einblenden", "Afficher les caractères masqués", "Mostrar caracteres ocultos", "制御文字を表示", "显示隐藏字符"],
-    ),
-    // Object.
-    ("Transform", ["Transformieren", "Transformation", "Transformar", "変形", "变换"]),
-    ("Arrange", ["Anordnen", "Disposition", "Organizar", "重ね順", "排列"]),
-    ("Group", ["Gruppieren", "Associer", "Agrupar", "グループ", "编组"]),
-    ("Ungroup", ["Gruppierung aufheben", "Dissocier", "Desagrupar", "グループ解除", "取消编组"]),
-    ("Lock", ["Sperren", "Verrouiller", "Bloquear", "ロック", "锁定"]),
-    ("Hide", ["Ausblenden", "Masquer", "Ocultar", "隠す", "隐藏"]),
-    ("Effects", ["Effekte", "Effets", "Efectos", "効果", "效果"]),
-    ("Fitting", ["Anpassen", "Ajustement", "Encaje", "オブジェクトサイズの調整", "适合"]),
-    (
-        "Text Frame Options…",
-        ["Textrahmenoptionen …", "Options de bloc de texte…", "Opciones de marco de texto…", "テキストフレーム設定…", "文本框架选项…"],
-    ),
-    // Table.
-    ("Insert Table…", ["Tabelle einfügen …", "Insérer un tableau…", "Insertar tabla…", "表を挿入…", "插入表…"]),
-    ("Merge Cells", ["Zellen verbinden", "Fusionner les cellules", "Combinar celdas", "セルを結合", "合并单元格"]),
-    ("Unmerge Cells", ["Zellverbindung aufheben", "Annuler la fusion des cellules", "Separar celdas", "セルの結合解除", "取消合并单元格"]),
-    ("Insert", ["Einfügen", "Insérer", "Insertar", "挿入", "插入"]),
-    ("Delete", ["Löschen", "Supprimer", "Eliminar", "削除", "删除"]),
-    // View.
-    ("Zoom In", ["Einzoomen", "Zoom avant", "Acercar", "ズームイン", "放大"]),
-    ("Zoom Out", ["Auszoomen", "Zoom arrière", "Alejar", "ズームアウト", "缩小"]),
-    (
-        "Fit Page in Window",
-        ["Seite in Fenster einpassen", "Ajuster la page à la fenêtre", "Encajar página en ventana", "ページ全体", "使页面适合窗口"],
-    ),
-    (
-        "Fit Spread in Window",
-        ["Druckbogen in Fenster einpassen", "Ajuster la planche à la fenêtre", "Encajar pliego en ventana", "スプレッド全体", "使跨页适合窗口"],
-    ),
-    ("Actual Size", ["Originalgröße", "Taille réelle", "Tamaño real", "100%", "实际大小"]),
-    ("Screen Mode", ["Bildschirmmodus", "Mode de l'écran", "Modo de pantalla", "スクリーンモード", "屏幕模式"]),
-    ("Grids & Guides", ["Raster und Hilfslinien", "Grilles et repères", "Cuadrículas y guías", "グリッドとガイド", "网格和参考线"]),
-    ("Show Rulers", ["Lineale einblenden", "Afficher les règles", "Mostrar reglas", "定規を表示", "显示标尺"]),
-    ("Snap to Guides", ["An Hilfslinien ausrichten", "Magnétisme des repères", "Ajustar a las guías", "ガイドにスナップ", "靠齐参考线"]),
-    (
-        "Snap to Document Grid",
-        [
-            "Am Dokumentraster ausrichten",
-            "Magnétisme de la grille du document",
-            "Ajustar a la cuadrícula del documento",
-            "ドキュメントグリッドにスナップ",
-            "靠齐文档网格",
-        ],
-    ),
-    ("Smart Guides", ["Smarte Hilfslinien", "Repères commentés", "Guías inteligentes", "スマートガイド", "智能参考线"]),
-    (
-        "Align to Object Edges",
-        [
-            "An Objektkanten ausrichten",
-            "Aligner sur les bords des objets",
-            "Alinear a los bordes del objeto",
-            "オブジェクトの端に揃える",
-            "对齐对象边缘",
-        ],
-    ),
-    (
-        "Align to Object Centers",
-        [
-            "An Objektmitten ausrichten",
-            "Aligner sur les centres des objets",
-            "Alinear a los centros del objeto",
-            "オブジェクトの中心に揃える",
-            "对齐对象中心",
-        ],
-    ),
-    ("Smart Dimensions", ["Smarte Maße", "Dimensions commentées", "Dimensiones inteligentes", "スマートサイズ", "智能尺寸"]),
-    ("Smart Spacing", ["Smarte Abstände", "Espacement commenté", "Espaciado inteligente", "スマート間隔", "智能间距"]),
-    ("Snap to Zone", ["Fangzone", "Zone de magnétisme", "Zona de ajuste", "スナップゾーン", "靠齐区域"]),
-    // Window and panels.
-    ("Properties", ["Eigenschaften", "Propriétés", "Propiedades", "プロパティ", "属性"]),
-    ("Layers", ["Ebenen", "Calques", "Capas", "レイヤー", "图层"]),
-    ("Links", ["Verknüpfungen", "Liens", "Vínculos", "リンク", "链接"]),
-    ("Swatches", ["Farbfelder", "Nuancier", "Muestras", "スウォッチ", "色板"]),
-    ("Color", ["Farbe", "Couleur", "Color", "カラー", "颜色"]),
-    ("Stroke", ["Kontur", "Contour", "Trazo", "線", "描边"]),
-    ("Gradient", ["Verlauf", "Dégradé", "Degradado", "グラデーション", "渐变"]),
-    ("Align", ["Ausrichten", "Alignement", "Alinear", "整列", "对齐"]),
-    ("Pathfinder", ["Pathfinder", "Pathfinder", "Buscatrazos", "パスファインダー", "路径查找器"]),
-    ("Info", ["Info", "Informations", "Información", "情報", "信息"]),
-    ("Library", ["Bibliothek", "Bibliothèque", "Biblioteca", "ライブラリ", "库"]),
-    ("Book", ["Buch", "Livre", "Libro", "ブック", "书籍"]),
-    ("Index", ["Index", "Index", "Índice", "索引", "索引"]),
-    ("Hyperlinks", ["Hyperlinks", "Hyperliens", "Hipervínculos", "ハイパーリンク", "超链接"]),
-    ("Bookmarks", ["Lesezeichen", "Signets", "Marcadores", "ブックマーク", "书签"]),
-    ("Articles", ["Artikel", "Articles", "Artículos", "アーティクル", "文章"]),
-    ("Tags", ["Tags", "Balises", "Etiquetas", "タグ", "标签"]),
-    ("Media", ["Medien", "Multimédia", "Medios", "メディア", "媒体"]),
-    ("Object States", ["Objektstatus", "États d'objet", "Estados de objeto", "オブジェクトステート", "对象状态"]),
-    ("Buttons and Forms", ["Schaltflächen und Formulare", "Boutons et formulaires", "Botones y formularios", "ボタンとフォーム", "按钮和表单"]),
-    ("Liquid Layout", ["Flüssiges Layout", "Mise en page liquide", "Maquetación líquida", "リキッドレイアウト", "自适应版面"]),
-    ("Workspace", ["Arbeitsbereich", "Espace de travail", "Espacio de trabajo", "ワークスペース", "工作区"]),
-    ("Editorial", ["Redaktion", "Éditorial", "Editorial", "エディトリアル", "编辑"]),
-    ("Object & Layout", ["Objekt und Layout", "Objet et mise en page", "Objeto y diseño", "オブジェクト＆レイアウト", "对象和版面"]),
-    ("Styles", ["Formate", "Styles", "Estilos", "スタイル", "样式"]),
-    ("Essentials Classic", ["Essentials Classic", "Les indispensables (classique)", "Essentials Classic", "Essentials Classic", "基本功能（经典）"]),
-    ("Split Window", ["Fenster teilen", "Fractionner la fenêtre", "Dividir ventana", "ウィンドウを分割", "拆分窗口"]),
-    ("New Window", ["Neues Fenster", "Nouvelle fenêtre", "Nueva ventana", "新規ウィンドウ", "新建窗口"]),
-    (
-        "Show All Menu Items",
-        [
-            "Alle Menüelemente anzeigen",
-            "Afficher toutes les commandes",
-            "Mostrar todos los elementos de menú",
-            "すべてのメニュー項目を表示",
-            "显示所有菜单项",
-        ],
-    ),
-    ("Accept All", ["Accept All", "Tout accepter", "Accept All", "Accept All", "全部接受"]),
-    ("Add", ["Add", "Ajouter", "Add", "Add", "添加"]),
-    ("Add Document…", ["Add Document…", "Ajouter un document…", "Add Document…", "Add Document…", "添加文档…"]),
-    (
-        "Add to Previous Spread",
-        ["Add to Previous Spread", "Ajouter à la planche précédente", "Add to Previous Spread", "Add to Previous Spread", "添加到上一个跨页"],
-    ),
-    ("Align From:", ["Align From:", "Aligner depuis :", "Align From:", "Align From:", "对齐自："]),
-    (
-        "Align to baseline grid",
-        ["Align to baseline grid", "Aligner sur la grille de ligne de base", "Align to baseline grid", "Align to baseline grid", "对齐基线网格"],
-    ),
-    ("Alignment:", ["Alignment:", "Alignement :", "Alignment:", "Alignment:", "对齐："]),
-    (
-        "All Spots to Process",
-        ["All Spots to Process", "Tous les tons directs en quadrichromie", "All Spots to Process", "All Spots to Process", "所有专色转四色"],
-    ),
-    (
-        "Allow Spread to Shuffle",
-        [
-            "Allow Spread to Shuffle",
-            "Autoriser la réorganisation des pages de la planche",
-            "Allow Spread to Shuffle",
-            "Allow Spread to Shuffle",
-            "允许跨页无序",
-        ],
-    ),
-    (
-        "Alternating Row Fills",
-        ["Alternating Row Fills", "Fonds de ligne en alternance", "Alternating Row Fills", "Alternating Row Fills", "交替行填色"],
-    ),
-    ("Appearance", ["Appearance", "Apparence", "Appearance", "Appearance", "外观"]),
-    ("Apply Gradient", ["Apply Gradient", "Appliquer le dégradé", "Apply Gradient", "Apply Gradient", "应用渐变"]),
-    ("Apply Parent", ["Apply Parent", "Appliquer le gabarit", "Apply Parent", "Apply Parent", "应用主页"]),
-    ("Apply Style:", ["Apply Style:", "Appliquer le style :", "Apply Style:", "Apply Style:", "应用样式："]),
-    (
-        "Apply to All Spreads",
-        ["Apply to All Spreads", "Appliquer à toutes les planches", "Apply to All Spreads", "Apply to All Spreads", "应用到所有跨页"],
-    ),
-    ("Apply to Stroke", ["Apply to Stroke", "Appliquer au contour", "Apply to Stroke", "Apply to Stroke", "应用到描边"]),
-    ("Art", ["Art", "Illustration", "Art", "Art", "画板"]),
-    ("Based On:", ["Based On:", "Basé sur :", "Based On:", "Based On:", "基于："]),
-    ("Bleed", ["Bleed", "Fond perdu", "Bleed", "Bleed", "出血"]),
-    ("Bleed Marks", ["Beschnittmarken", "Repères de fond perdu", "Marcas de sangrado", "塗り足しマーク", "出血标记"]),
-    ("Body Rows", ["Body Rows", "Lignes de corps", "Body Rows", "Body Rows", "表体行"]),
-    ("Bottom", ["Bottom", "Bas", "Bottom", "Bottom", "底部"]),
-    (
-        "Break Link to Style",
-        ["Break Link to Style", "Rompre le lien avec le style", "Break Link to Style", "Break Link to Style", "断开与样式的链接"],
-    ),
-    ("Redefine Style", ["Format neu definieren", "Redéfinir le style", "Redefinir estilo", "スタイルを再定義", "重新定义样式"]),
-    ("Bullets and Numbering", ["Bullets and Numbering", "Puces et numérotation", "Bullets and Numbering", "Bullets and Numbering", "项目符号和编号"]),
-    ("Business Card", ["Business Card", "Carte de visite", "Business Card", "Business Card", "名片"]),
-    ("CMYK", ["CMYK", "CMJN", "CMYK", "CMYK", "CMYK"]),
-    ("Cancel", ["Cancel", "Annuler", "Cancel", "Cancel", "取消"]),
-    (
-        "Can't Open the File",
-        [
-            "Datei kann nicht geöffnet werden",
-            "Impossible d'ouvrir le fichier",
-            "No se puede abrir el archivo",
-            "ファイルを開けません",
-            "无法打开文件",
-        ],
-    ),
-    (
-        "Can't Place the File",
-        [
-            "Datei kann nicht platziert werden",
-            "Impossible d'importer le fichier",
-            "No se puede colocar el archivo",
-            "ファイルを配置できません",
-            "无法置入文件",
-        ],
-    ),
-    ("Center Content", ["Center Content", "Centrer le contenu", "Center Content", "Center Content", "内容居中"]),
-    ("Change All", ["Change All", "Tout remplacer", "Change All", "Change All", "全部更改"]),
-    ("Change to:", ["Change to:", "Remplacer par :", "Change to:", "Change to:", "更改为："]),
-    ("Character Style:", ["Character Style:", "Style de caractère :", "Character Style:", "Character Style:", "字符样式："]),
-    ("Checked by default", ["Checked by default", "Cochée par défaut", "Checked by default", "Checked by default", "默认选中"]),
-    ("Choices", ["Choices", "Choix", "Choices", "Choices", "选项"]),
-    ("Choose Image…", ["Choose Image…", "Choisir une image…", "Choose Image…", "Choose Image…", "选择图像…"]),
-    ("Class:", ["Class:", "Classe :", "Class:", "Class:", "类别："]),
-    ("Color Picker", ["Color Picker", "Sélecteur de couleurs", "Color Picker", "Color Picker", "拾色器"]),
-    ("Color Settings", ["Color Settings", "Réglages des couleurs", "Color Settings", "Color Settings", "颜色设置"]),
-    ("Color:", ["Color:", "Couleur :", "Color:", "Color:", "颜色："]),
-    ("Columns", ["Columns", "Colonnes", "Columns", "Columns", "栏"]),
-    ("Composer:", ["Composer:", "Compositeur :", "Composer:", "Composer:", "排版器："]),
-    ("Copies:", ["Copies:", "Copies :", "Copies:", "Copies:", "份数："]),
-    ("Count", ["Count", "Compter", "Count", "Count", "数量"]),
-    ("Create", ["Create", "Créer", "Create", "Create", "创建"]),
-    ("Create Table", ["Create Table", "Créer un tableau", "Create Table", "Create Table", "创建表"]),
-    ("Create Table…", ["Create Table…", "Créer un tableau…", "Create Table…", "Create Table…", "创建表…"]),
-    ("Crop", ["Crop", "Recadrage", "Crop", "Crop", "裁剪"]),
-    ("Crop Marks", ["Schnittmarken", "Traits de coupe", "Marcas de recorte", "トンボ", "裁切标记"]),
-    ("Crop to:", ["Crop to:", "Recadrer selon :", "Crop to:", "Crop to:", "裁剪到："]),
-    ("Cursor Key:", ["Cursor Key:", "Touche fléchée :", "Cursor Key:", "Cursor Key:", "光标键："]),
-    ("Default", ["Default", "Par défaut", "Default", "Default", "默认"]),
-    ("Default View:", ["Default View:", "Affichage par défaut :", "Default View:", "Default View:", "默认视图："]),
-    ("Delete Column", ["Delete Column", "Supprimer la colonne", "Delete Column", "Delete Column", "删除列"]),
-    ("Delete Condition", ["Delete Condition", "Supprimer la condition", "Delete Condition", "Delete Condition", "删除条件"]),
-    ("Delete Layer", ["Delete Layer", "Supprimer le calque", "Delete Layer", "Delete Layer", "删除图层"]),
-    ("Delete Page", ["Delete Page", "Supprimer la page", "Delete Page", "Delete Page", "删除页面"]),
-    ("Delete Row", ["Delete Row", "Supprimer la ligne", "Delete Row", "Delete Row", "删除行"]),
-    ("Delete Swatch", ["Delete Swatch", "Supprimer la nuance", "Delete Swatch", "Delete Swatch", "删除色板"]),
-    (
-        "Delete Unused Layers",
-        ["Delete Unused Layers", "Supprimer les calques inutilisés", "Delete Unused Layers", "Delete Unused Layers", "删除未使用的图层"],
-    ),
-    ("Desired", ["Desired", "Optimal", "Desired", "Desired", "最佳"]),
-    ("Dialog", ["Dialog", "Boîte de dialogue", "Dialog", "Dialog", "对话框"]),
-    ("Document", ["Document", "Document", "Document", "Document", "文档"]),
-    ("Document Setup", ["Document Setup", "Format de document", "Document Setup", "Document Setup", "文档设置"]),
-    ("Drop Shadow", ["Drop Shadow", "Ombre portée", "Drop Shadow", "Drop Shadow", "投影"]),
-    ("Duplicate Spread", ["Duplicate Spread", "Dupliquer la planche", "Duplicate Spread", "Duplicate Spread", "复制跨页"]),
-    (
-        "Duplicate Spread at End of Document",
-        [
-            "Druckbogen am Dokumentende duplizieren",
-            "Dupliquer la planche à la fin du document",
-            "Duplicar pliego al final del documento",
-            "ドキュメントの最後にスプレッドを複製",
-            "在文档末尾复制跨页",
-        ],
-    ),
-    ("Delete Spread", ["Druckbogen löschen", "Supprimer la planche", "Eliminar pliego", "スプレッドを削除", "删除跨页"]),
-    ("Parent Pages", ["Übergeordnete Seiten", "Gabarits", "Páginas principales", "親ページ", "父页面"]),
-    (
-        "Apply Parent to Pages",
-        [
-            "Übergeordnete Seite auf Seiten anwenden",
-            "Appliquer le gabarit aux pages",
-            "Aplicar principal a páginas",
-            "親ページを適用",
-            "将父页面应用于页面",
-        ],
-    ),
-    ("Email", ["Email", "E-mail", "Email", "Email", "电子邮件"]),
-    ("Embed", ["Embed", "Incorporer", "Embed", "Embed", "嵌入"]),
-    ("Export PDF", ["PDF exportieren", "Exporter en PDF", "Exportar PDF", "PDF を書き出し", "导出PDF"]),
-    ("Export XML…", ["Export XML…", "Exporter en XML…", "Export XML…", "Export XML…", "导出XML…"]),
-    ("Fast", ["Fast", "Rapide", "Fast", "Fast", "快速"]),
-    (
-        "Fill Frame Proportionally",
-        [
-            "Fill Frame Proportionally",
-            "Remplir le bloc proportionnellement",
-            "Fill Frame Proportionally",
-            "Fill Frame Proportionally",
-            "按比例填充框架",
-        ],
-    ),
-    ("Find All", ["Find All", "Tout rechercher", "Find All", "Find All", "查找全部"]),
-    ("Find Next", ["Find Next", "Rechercher suivant", "Find Next", "Find Next", "查找下一个"]),
-    ("Find what:", ["Find what:", "Rechercher :", "Find what:", "Find what:", "查找内容："]),
-    ("Find/Change", ["Find/Change", "Rechercher/Remplacer", "Find/Change", "Find/Change", "查找/更改"]),
-    ("Find/Replace Font", ["Find/Replace Font", "Rechercher/Remplacer une police", "Find/Replace Font", "Find/Replace Font", "查找/替换字体"]),
-    (
-        "Fit Content Proportionally",
-        [
-            "Fit Content Proportionally",
-            "Ajuster le contenu proportionnellement",
-            "Fit Content Proportionally",
-            "Fit Content Proportionally",
-            "按比例适合内容",
-        ],
-    ),
-    ("Fit Content to Frame", ["Fit Content to Frame", "Ajuster le contenu au bloc", "Fit Content to Frame", "Fit Content to Frame", "内容适合框架"]),
-    ("Fitting:", ["Fitting:", "Ajustement :", "Fitting:", "Fitting:", "适合："]),
-    (
-        "Flattener preset",
-        ["Voreinstellung für Transparenzreduzierung", "Préréglage d'aplatissement", "Preajuste de acoplado", "透明分割プリセット", "拼合器预设"],
-    ),
-    ("Font Family:", ["Font Family:", "Famille de polices :", "Font Family:", "Font Family:", "字体系列："]),
-    ("Font Size:", ["Font Size:", "Corps :", "Font Size:", "Font Size:", "字体大小："]),
-    ("Font Style:", ["Font Style:", "Style de police :", "Font Style:", "Font Style:", "字体样式："]),
-    ("Footer Rows", ["Footer Rows", "Lignes de pied de tableau", "Footer Rows", "Footer Rows", "表尾行"]),
-    ("Footnote Options", ["Footnote Options", "Options des notes de bas de page", "Footnote Options", "Footnote Options", "脚注选项"]),
-    ("Form Field", ["Form Field", "Champ de formulaire", "Form Field", "Form Field", "表单字段"]),
-    ("Format:", ["Format:", "Format :", "Format:", "Format:", "格式："]),
-    ("Frame Fitting", ["Frame Fitting", "Ajustement au bloc", "Frame Fitting", "Frame Fitting", "框架适合"]),
-    (
-        "Frame Fitting Options",
-        ["Frame Fitting Options", "Options d'ajustement au bloc", "Frame Fitting Options", "Frame Fitting Options", "框架适合选项"],
-    ),
-    ("Generate QR Code", ["Generate QR Code", "Générer un code QR", "Generate QR Code", "Generate QR Code", "生成二维码"]),
-    ("Go To", ["Go To", "Atteindre", "Go To", "Go To", "转到"]),
-    ("Go to Page", ["Go to Page", "Atteindre la page", "Go to Page", "Go to Page", "转到页面"]),
-    ("Gutter", ["Gutter", "Gouttière", "Gutter", "Gutter", "栏间距"]),
-    ("Header Rows", ["Header Rows", "Lignes d'en-tête", "Header Rows", "Header Rows", "表头行"]),
-    ("Height", ["Height", "Hauteur", "Height", "Height", "高度"]),
-    ("Height:", ["Height:", "Hauteur :", "Height:", "Height:", "高度："]),
-    ("High Quality", ["High Quality", "Qualité supérieure", "High Quality", "High Quality", "高品质"]),
-    ("Desktop Printing", ["Bürodruck", "Impression bureautique", "Impresión de oficina", "オフィス印刷", "办公打印"]),
-    (
-        "Horizontal Gridline Every:",
-        [
-            "Horizontal Gridline Every:",
-            "Ligne de grille horizontale tous les :",
-            "Horizontal Gridline Every:",
-            "Horizontal Gridline Every:",
-            "水平网格线间隔：",
-        ],
-    ),
-    ("Horizontal Margins:", ["Horizontal Margins:", "Marges horizontales :", "Horizontal Margins:", "Horizontal Margins:", "水平边距："]),
-    ("Hyphenate", ["Hyphenate", "Césure", "Hyphenate", "Hyphenate", "连字符"]),
-    ("Import Options", ["Import Options", "Options d'importation", "Import Options", "Import Options", "导入选项"]),
-    ("Import XML…", ["Import XML…", "Importer XML…", "Import XML…", "Import XML…", "导入XML…"]),
-    (
-        "Include document bleed",
-        [
-            "Dokumentbeschnitt einschließen",
-            "Inclure le fond perdu du document",
-            "Incluir sangrado del documento",
-            "ドキュメントの塗り足しを含める",
-            "包含文档出血",
-        ],
-    ),
-    ("Increment Every:", ["Increment Every:", "Ligne de grille tous les :", "Increment Every:", "Increment Every:", "递增步长："]),
-    ("Ink Manager", ["Ink Manager", "Gestionnaire d'encres", "Ink Manager", "Ink Manager", "油墨管理器"]),
-    ("Insert Column", ["Insert Column", "Insérer une colonne", "Insert Column", "Insert Column", "插入列"]),
-    ("Insert Page After", ["Insert Page After", "Insérer une page après", "Insert Page After", "Insert Page After", "在后面插入页面"]),
-    ("Insert Row", ["Insert Row", "Insérer une ligne", "Insert Row", "Insert Row", "插入行"]),
-    ("Inset spacing", ["Inset spacing", "Espacement de retrait", "Inset spacing", "Inset spacing", "内边距"]),
-    ("Inside", ["Inside", "Intérieur", "Inside", "Inside", "内侧"]),
-    ("Intent:", ["Intent:", "Mode :", "Intent:", "Intent:", "意图："]),
-    ("Keyboard Shortcuts", ["Keyboard Shortcuts", "Raccourcis clavier", "Keyboard Shortcuts", "Keyboard Shortcuts", "键盘快捷键"]),
-    ("Kind:", ["Kind:", "Type :", "Kind:", "Kind:", "类型："]),
-    ("Lab", ["Lab", "Lab", "Lab", "Lab", "Lab"]),
-    ("Leading:", ["Leading:", "Interligne :", "Leading:", "Leading:", "行距："]),
-    ("Left Indent:", ["Left Indent:", "Retrait à gauche :", "Left Indent:", "Left Indent:", "左缩进："]),
-    ("Link To:", ["Link To:", "Lien vers :", "Link To:", "Link To:", "链接到："]),
-    ("Load Profile…", ["Load Profile…", "Charger un profil…", "Load Profile…", "Load Profile…", "加载配置文件…"]),
-    ("Load Swatches…", ["Load Swatches…", "Charger des nuances…", "Load Swatches…", "Load Swatches…", "加载色板…"]),
-    (
-        "Load Paragraph Styles…",
-        ["Absatzformate laden…", "Charger les styles de paragraphe…", "Cargar estilos de párrafo…", "段落スタイルを読み込み…", "加载段落样式…"],
-    ),
-    (
-        "Load Character Styles…",
-        ["Zeichenformate laden…", "Charger les styles de caractère…", "Cargar estilos de carácter…", "文字スタイルを読み込み…", "加载字符样式…"],
-    ),
-    (
-        "Load All Text Styles…",
-        [
-            "Alle Textformate laden…",
-            "Charger tous les styles de texte…",
-            "Cargar todos los estilos de texto…",
-            "すべてのテキストスタイルを読み込み…",
-            "加载所有文本样式…",
-        ],
-    ),
-    ("Load Styles", ["Formate laden", "Charger les styles", "Cargar estilos", "スタイルを読み込み", "加载样式"]),
-    ("Restart Numbering", ["Nummerierung neu beginnen", "Recommencer la numérotation", "Reiniciar numeración", "番号の振り直し", "重新开始编号"]),
-    ("Continue Numbering", ["Nummerierung fortführen", "Poursuivre la numérotation", "Continuar numeración", "番号の継続", "继续编号"]),
-    ("Keep Options…", ["Umbruchoptionen …", "Options d'enchaînement…", "Opciones de separación…", "段落分離禁止オプション…", "保持选项…"]),
-    (
-        "Space Between Paragraphs Using Same Style",
-        [
-            "Abstand zwischen Absätzen mit gleichem Format",
-            "Espace entre les paragraphes de même style",
-            "Espacio entre párrafos con el mismo estilo",
-            "同じスタイルの段落間のスペース",
-            "使用相同样式的段落间距",
-        ],
-    ),
-    ("Ignore", ["Ignorieren", "Ignorer", "Ignorar", "無視", "忽略"]),
-    (
-        "Do Not Align to Baseline Grid",
-        [
-            "Nicht am Grundlinienraster ausrichten",
-            "Ne pas aligner sur la grille de ligne de base",
-            "No alinear con cuadrícula base",
-            "ベースライングリッドに揃えない",
-            "不对齐基线网格",
-        ],
-    ),
-    (
-        "Only Align First Line to Grid",
-        [
-            "Nur erste Zeile am Raster ausrichten",
-            "Aligner uniquement la première ligne sur la grille",
-            "Alinear solo primera línea con cuadrícula",
-            "最初の行のみグリッドに揃える",
-            "仅首行对齐网格",
-        ],
-    ),
-    (
-        "Balance Ragged Lines",
-        ["Unausgeglichene Zeilen ausgleichen", "Équilibrer les lignes irrégulières", "Equilibrar líneas desiguales", "行末を調整", "平衡未对齐的行"],
-    ),
-    (
-        "Drop Caps and Nested Styles…",
-        [
-            "Initialen und verschachtelte Formate …",
-            "Lettrines et styles imbriqués…",
-            "Capitulares y estilos anidados…",
-            "ドロップキャップと先頭文字スタイル…",
-            "首字下沉和嵌套样式…",
-        ],
-    ),
-    ("GREP Styles…", ["GREP-Stile …", "Styles GREP…", "Estilos GREP…", "正規表現スタイル…", "GREP 样式…"]),
-    (
-        "Restart/Continue Numbering",
-        [
-            "Nummerierung neu beginnen/fortführen",
-            "Recommencer/Poursuivre la numérotation",
-            "Reiniciar/Continuar numeración",
-            "番号の振り直し/継続",
-            "重新开始/继续编号",
-        ],
-    ),
-    (
-        "Convert Bullets and Numbering to Text",
-        [
-            "Aufzählungszeichen und Nummerierung in Text konvertieren",
-            "Convertir les puces et la numérotation en texte",
-            "Convertir viñetas y numeración en texto",
-            "箇条書きと段落番号をテキストに変換",
-            "将项目符号和编号转换为文本",
-        ],
-    ),
-    ("Hyphenation…", ["Silbentrennung …", "Césure…", "Separación por sílabas…", "ハイフネーション…", "连字…"]),
-    (
-        "Hyphenation Settings",
-        ["Silbentrennungseinstellungen", "Paramètres de césure", "Configuración de separación por sílabas", "ハイフネーション設定", "连字设置"],
-    ),
-    ("hyphens", ["Trennstriche", "tirets", "guiones", "ハイフン", "连字符"]),
-    ("Hyphenation Zone:", ["Silbentrennungsbereich:", "Zone de césure :", "Zona de separación:", "ハイフネーション領域 :", "连字区："]),
-    ("Better Spacing", ["Bessere Abstände", "Meilleur espacement", "Mejor espaciado", "スペースを優先", "更好的间距"]),
-    ("Fewer Hyphens", ["Weniger Trennstriche", "Moins de tirets", "Menos guiones", "ハイフンを減らす", "更少的连字符"]),
-    (
-        "Hyphenate Capitalized Words",
-        [
-            "Großgeschriebene Wörter trennen",
-            "Césure des mots en capitales",
-            "Separar palabras en mayúscula",
-            "大文字で始まる単語をハイフネーション",
-            "连字大写的单词",
-        ],
-    ),
-    (
-        "Hyphenate Last Word",
-        ["Letztes Wort trennen", "Césure du dernier mot", "Separar última palabra", "最後の単語をハイフネーション", "连字最后一个单词"],
-    ),
-    (
-        "Hyphenate Across Column",
-        ["Über Spalten trennen", "Césure entre colonnes", "Separar entre columnas", "段をまたいでハイフネーション", "跨栏连字"],
-    ),
-    (
-        "Differs from this document",
-        ["Weicht von diesem Dokument ab", "Diffère de ce document", "Difiere de este documento", "このドキュメントと異なります", "与此文档不同"],
-    ),
-    (
-        "Redefine Document Style",
-        [
-            "Dokumentformat neu definieren",
-            "Redéfinir le style du document",
-            "Redefinir el estilo del documento",
-            "ドキュメントのスタイルを再定義",
-            "重新定义文档样式",
-        ],
-    ),
-    (
-        "Use Document Style Definition",
-        [
-            "Formatdefinition des Dokuments verwenden",
-            "Utiliser la définition de style du document",
-            "Usar la definición de estilo del documento",
-            "ドキュメントのスタイル定義を使用",
-            "使用文档样式定义",
-        ],
-    ),
-    ("Auto Rename", ["Automatisch umbenennen", "Renommer automatiquement", "Cambiar nombre automáticamente", "自動的に名前を変更", "自动重命名"]),
-    ("Load…", ["Load…", "Charger…", "Load…", "Load…", "加载…"]),
-    ("Make Compound", ["Make Compound", "Créer un tracé transparent", "Make Compound", "Make Compound", "建立复合路径"]),
-    ("Margins", ["Margins", "Marges", "Margins", "Margins", "边距"]),
-    ("Marks and Bleeds", ["Marken und Beschnitt", "Repères et fonds perdus", "Marcas y sangrado", "トンボと塗り足し", "标记和出血"]),
-    ("Maximum", ["Maximum", "Maximum", "Maximum", "Maximum", "最大"]),
-    ("Menu Customization", ["Menu Customization", "Personnalisation des menus", "Menu Customization", "Menu Customization", "菜单自定"]),
-    (
-        "Merge into Active Layer",
-        ["Merge into Active Layer", "Fusionner dans le calque actif", "Merge into Active Layer", "Merge into Active Layer", "合并到活动图层"],
-    ),
-    ("Min:", ["Min:", "Min. :", "Min:", "Min:", "最小："]),
-    ("Minimum", ["Minimum", "Minimum", "Minimum", "Minimum", "最小"]),
-    (
-        "Minimum Space Before First Footnote:",
-        [
-            "Minimum Space Before First Footnote:",
-            "Espace minimal avant la première note de bas de page :",
-            "Minimum Space Before First Footnote:",
-            "Minimum Space Before First Footnote:",
-            "第一个脚注前最小间距：",
-        ],
-    ),
-    (
-        "Misspelled word → Correction (one per line):",
-        [
-            "Misspelled word → Correction (one per line):",
-            "Mot mal orthographié → correction (un par ligne) :",
-            "Misspelled word → Correction (one per line):",
-            "Misspelled word → Correction (one per line):",
-            "拼写错误的单词 → 更正（每行一个）：",
-        ],
-    ),
-    ("Mobile", ["Mobile", "Mobile", "Mobile", "Mobile", "移动设备"]),
-    ("Move Selection Here", ["Move Selection Here", "Déplacer la sélection ici", "Move Selection Here", "Move Selection Here", "将所选内容移至此处"]),
-    (
-        "Select; drag to move the selection to another layer",
-        [
-            "Auswählen; ziehen, um die Auswahl auf eine andere Ebene zu verschieben",
-            "Sélectionner ; faire glisser pour déplacer la sélection vers un autre calque",
-            "Seleccionar; arrastre para mover la selección a otra capa",
-            "選択（ドラッグで選択範囲を別のレイヤーへ移動）",
-            "选择；拖动可将所选内容移至其他图层",
-        ],
-    ),
-    (
-        "Move to Color Group",
-        ["Move to Color Group", "Déplacer vers le groupe de couleurs", "Move to Color Group", "Move to Color Group", "移动到颜色组"],
-    ),
-    ("Move to Group", ["Move to Group", "Déplacer vers le groupe", "Move to Group", "Move to Group", "移动到组"]),
-    ("Multiline", ["Multiline", "Multiligne", "Multiline", "Multiline", "多行"]),
-    ("Name", ["Name", "Nom", "Name", "Name", "名称"]),
-    ("Name:", ["Name:", "Nom :", "Name:", "Name:", "名称："]),
-    (
-        "New Bookmark for This Page",
-        [
-            "New Bookmark for This Page",
-            "Nouveau signet pour cette page",
-            "New Bookmark for This Page",
-            "New Bookmark for This Page",
-            "为此页面新建书签",
-        ],
-    ),
-    ("New Book…", ["New Book…", "Nouveau livre…", "New Book…", "New Book…", "新建书籍…"]),
-    ("New Color Group", ["New Color Group", "Nouveau groupe de couleurs", "New Color Group", "New Color Group", "新建颜色组"]),
-    (
-        "New Color Group with Swatch",
-        [
-            "New Color Group with Swatch",
-            "Nouveau groupe de couleurs avec la nuance",
-            "New Color Group with Swatch",
-            "New Color Group with Swatch",
-            "使用色板新建颜色组",
-        ],
-    ),
-    ("New Cross-Reference", ["New Cross-Reference", "Nouvelle référence croisée", "New Cross-Reference", "New Cross-Reference", "新建交叉引用"]),
-    ("New Document", ["New Document", "Nouveau document", "New Document", "New Document", "新建文档"]),
-    ("New GREP Style", ["New GREP Style", "Nouveau style GREP", "New GREP Style", "New GREP Style", "新建 GREP 样式"]),
-    ("New Library…", ["New Library…", "Nouvelle bibliothèque…", "New Library…", "New Library…", "新建库…"]),
-    ("New Line Style", ["New Line Style", "Nouveau style de ligne", "New Line Style", "New Line Style", "新建线型"]),
-    ("New Nested Style", ["New Nested Style", "Nouveau style imbriqué", "New Nested Style", "New Nested Style", "新建嵌套样式"]),
-    ("New Workspace", ["New Workspace", "Nouvel espace de travail", "New Workspace", "New Workspace", "新建工作区"]),
-    ("No spot inks", ["No spot inks", "Aucun ton direct", "No spot inks", "No spot inks", "无专色"]),
-    ("None", ["None", "Aucun", "None", "None", "无"]),
-    ("Number of Pages:", ["Number of Pages:", "Nombre de pages :", "Number of Pages:", "Number of Pages:", "页数："]),
-    ("Number of Sides:", ["Number of Sides:", "Nombre de côtés :", "Number of Sides:", "Number of Sides:", "边数："]),
-    ("Number of columns", ["Number of columns", "Nombre de colonnes", "Number of columns", "Number of columns", "栏数"]),
-    ("Object Layer Options", ["Object Layer Options", "Options de calque d'objet", "Object Layer Options", "Object Layer Options", "对象图层选项"]),
-    ("Offset:", ["Offset:", "Décalage :", "Offset:", "Offset:", "偏移："]),
-    ("On Release", ["On Release", "Au relâchement", "On Release", "On Release", "释放时"]),
-    ("On Screen:", ["On Screen:", "À l'écran :", "On Screen:", "On Screen:", "屏幕显示："]),
-    ("OpenType", ["OpenType", "OpenType", "OpenType", "OpenType", "OpenType"]),
-    ("Orientation:", ["Orientation:", "Orientation :", "Orientation:", "Orientation:", "方向："]),
-    ("Outside", ["Outside", "Extérieur", "Outside", "Outside", "外侧"]),
-    ("Page Information", ["Seiteninformationen", "Informations sur la page", "Información de página", "ページ情報", "页面信息"]),
-    ("Page Range", ["Seitenbereich", "Plage de pages", "Intervalo de páginas", "ページ範囲", "页面范围"]),
-    ("Page Range:", ["Seitenbereich:", "Plage de pages :", "Intervalo de páginas:", "ページ範囲:", "页面范围："]),
-    ("Pages:", ["Pages:", "Pages :", "Pages:", "Pages:", "页面："]),
-    ("Paragraph Composer", ["Paragraph Composer", "Compositeur de paragraphe", "Paragraph Composer", "Paragraph Composer", "段落排版器"]),
-    (
-        "Paragraph Style Options",
-        ["Paragraph Style Options", "Options de style de paragraphe", "Paragraph Style Options", "Paragraph Style Options", "段落样式选项"],
-    ),
-    ("Paragraph Style:", ["Paragraph Style:", "Style de paragraphe :", "Paragraph Style:", "Paragraph Style:", "段落样式："]),
-    ("PDF/A-2b", ["PDF/A-2b", "PDF/A-2b", "PDF/A-2b", "PDF/A-2b", "PDF/A-2b"]),
-    ("PDF/X-4", ["PDF/X-4", "PDF/X-4", "PDF/X-4", "PDF/X-4", "PDF/X-4"]),
-    ("Place PDF", ["Place PDF", "Importer un PDF", "Place PDF", "Place PDF", "置入PDF"]),
-    ("Plain Text", ["Plain Text", "Texte brut", "Plain Text", "Plain Text", "纯文本"]),
-    ("Polygon Settings", ["Polygon Settings", "Paramètres du polygone", "Polygon Settings", "Polygon Settings", "多边形设置"]),
-    ("Position", ["Position", "Position", "Position", "Position", "位置"]),
-    ("Position:", ["Position:", "Position :", "Position:", "Position:", "位置："]),
-    ("Poster", ["Poster", "Affiche", "Poster", "Poster", "海报"]),
-    ("Preferences", ["Preferences", "Préférences", "Preferences", "Preferences", "首选项"]),
-    ("Prefix:", ["Prefix:", "Préfixe :", "Prefix:", "Prefix:", "前缀："]),
-    ("Preset", ["Preset", "Paramètre prédéfini", "Preset", "Preset", "预设"]),
-    ("Preset:", ["Voreinstellung:", "Paramètre prédéfini :", "Preajuste:", "プリセット:", "预设："]),
-    ("Commercial Printing", ["Druckerei", "Impression commerciale", "Impresión comercial", "商業印刷", "商业印刷"]),
-    ("Print", ["Print", "Imprimer", "Print", "Print", "打印"]),
-    ("Printer:", ["Printer:", "Imprimante :", "Printer:", "Printer:", "打印机："]),
-    (
-        "Printing / Exporting:",
-        ["Printing / Exporting:", "Impression / Exportation :", "Printing / Exporting:", "Printing / Exporting:", "打印/导出："],
-    ),
-    ("Quick Actions", ["Quick Actions", "Actions rapides", "Quick Actions", "Quick Actions", "快速操作"]),
-    ("RGB", ["RGB", "RVB", "RGB", "RGB", "RGB"]),
-    ("Rectangle", ["Rectangle", "Rectangle", "Rectangle", "Rectangle", "矩形"]),
-    ("Reject All", ["Reject All", "Tout refuser", "Reject All", "Reject All", "全部拒绝"]),
-    ("Relative To:", ["Relative To:", "Relatif à :", "Relative To:", "Relative To:", "相对于："]),
-    ("Release", ["Release", "Libérer", "Release", "Release", "释放"]),
-    ("Relink to Folder…", ["Relink to Folder…", "Rééditer le lien au dossier…", "Relink to Folder…", "Relink to Folder…", "重新链接到文件夹…"]),
-    ("Relink…", ["Relink…", "Rééditer le lien…", "Relink…", "Relink…", "重新链接…"]),
-    (
-        "Remove Conditions from Selection",
-        [
-            "Remove Conditions from Selection",
-            "Supprimer les conditions de la sélection",
-            "Remove Conditions from Selection",
-            "Remove Conditions from Selection",
-            "从选择中移除条件",
-        ],
-    ),
-    ("Repeat Header Rows", ["Repeat Header Rows", "Répéter les lignes d'en-tête", "Repeat Header Rows", "Repeat Header Rows", "重复表头行"]),
-    ("Required", ["Required", "Obligatoire", "Required", "Required", "必填"]),
-    (
-        "Reset All to Defaults",
-        ["Reset All to Defaults", "Rétablir toutes les valeurs par défaut", "Reset All to Defaults", "Reset All to Defaults", "全部恢复为默认值"],
-    ),
-    (
-        "Restart Numbering Every:",
-        [
-            "Restart Numbering Every:",
-            "Recommencer la numérotation à chaque :",
-            "Restart Numbering Every:",
-            "Restart Numbering Every:",
-            "重新编号起点：",
-        ],
-    ),
-    ("Reverse", ["Reverse", "Inverser", "Reverse", "Reverse", "反转"]),
-    (
-        "Save Swatches for Exchange…",
-        [
-            "Save Swatches for Exchange…",
-            "Enregistrer les nuances pour échange…",
-            "Save Swatches for Exchange…",
-            "Save Swatches for Exchange…",
-            "保存交换用色板…",
-        ],
-    ),
-    (
-        "Save recovery data every:",
-        [
-            "Save recovery data every:",
-            "Enregistrer les données de récupération toutes les :",
-            "Save recovery data every:",
-            "Save recovery data every:",
-            "保存恢复数据间隔：",
-        ],
-    ),
-    ("Search:", ["Search:", "Rechercher :", "Search:", "Search:", "搜索："]),
-    ("Select an object.", ["Select an object.", "Sélectionnez un objet.", "Select an object.", "Select an object.", "选择一个对象。"]),
-    (
-        "Select text or a text frame.",
-        [
-            "Select text or a text frame.",
-            "Sélectionnez du texte ou un bloc de texte.",
-            "Select text or a text frame.",
-            "Select text or a text frame.",
-            "选择文本或文本框架。",
-        ],
-    ),
-    ("Separator:", ["Separator:", "Séparateur :", "Separator:", "Separator:", "分隔符："]),
-    (
-        "Show Prefix/Suffix in:",
-        ["Show Prefix/Suffix in:", "Afficher le préfixe/suffixe dans :", "Show Prefix/Suffix in:", "Show Prefix/Suffix in:", "显示前缀/后缀位置："],
-    ),
-    ("Show Tag Markers", ["Show Tag Markers", "Afficher les marqueurs de balise", "Show Tag Markers", "Show Tag Markers", "显示标签标志符"]),
-    ("Single-line", ["Single-line", "Ligne simple", "Single-line", "Single-line", "单行"]),
-    ("Single-line Composer", ["Single-line Composer", "Compositeur ligne simple", "Single-line Composer", "Single-line Composer", "单行排版器"]),
-    ("Size:", ["Size:", "Taille :", "Size:", "Size:", "大小："]),
-    ("Screen and Email", ["Bildschirm und E-Mail", "Écran et e-mail", "Pantalla y correo", "画面とメール", "屏幕和电子邮件"]),
-    (
-        "Space Between Footnotes:",
-        ["Space Between Footnotes:", "Espace entre les notes de bas de page :", "Space Between Footnotes:", "Space Between Footnotes:", "脚注间距："],
-    ),
-    ("Speed", ["Speed", "Vitesse", "Speed", "Speed", "速度"]),
-    ("Standard", ["Standard", "Norme", "Estándar", "標準", "标准"]),
-    ("Standard:", ["Standard:", "Norme :", "Estándar:", "標準:", "标准："]),
-    ("Star Inset:", ["Star Inset:", "Renfoncement des branches :", "Star Inset:", "Star Inset:", "星形内边距："]),
-    ("Start Page #:", ["Start Page #:", "N° de la première page :", "Start Page #:", "Start Page #:", "起始页码："]),
-    ("Start at:", ["Start at:", "Commencer à :", "Start at:", "Start at:", "起始编号："]),
-    ("Start:", ["Start:", "Début :", "Start:", "Start:", "开始："]),
-    ("Style Name:", ["Style Name:", "Nom du style :", "Style Name:", "Style Name:", "样式名称："]),
-    ("Style:", ["Style:", "Style :", "Style:", "Style:", "样式："]),
-    ("Stylistic Sets", ["Stylistic Sets", "Jeux stylistiques", "Stylistic Sets", "Stylistic Sets", "样式集"]),
-    ("Subdivisions:", ["Subdivisions:", "Subdivisions :", "Subdivisions:", "Subdivisions:", "细分："]),
-    ("Suffix:", ["Suffix:", "Suffixe :", "Suffix:", "Suffix:", "后缀："]),
-    ("Synchronize", ["Synchronize", "Synchroniser", "Synchronize", "Synchronize", "同步"]),
-    ("Tag:", ["Tag:", "Balise :", "Tag:", "Tag:", "标签："]),
-    ("Tagged PDF", ["Markiertes PDF", "PDF balisé", "PDF etiquetado", "タグ付き PDF", "带标签的 PDF"]),
-    ("Text Frame", ["Text Frame", "Bloc de texte", "Text Frame", "Text Frame", "文本框架"]),
-    ("Text Frame Options", ["Text Frame Options", "Options de bloc de texte", "Text Frame Options", "Text Frame Options", "文本框架选项"]),
-    ("Text Message", ["Text Message", "SMS", "Text Message", "Text Message", "短信"]),
-    ("Text Style", ["Text Style", "Style de texte", "Text Style", "Text Style", "文字样式"]),
-    ("Text Wrap", ["Text Wrap", "Habillage", "Text Wrap", "Text Wrap", "文本绕排"]),
-    (
-        "This PDF has no layers.",
-        ["This PDF has no layers.", "Ce PDF ne contient aucun calque.", "This PDF has no layers.", "This PDF has no layers.", "此 PDF 没有图层。"],
-    ),
-    ("To Text:", ["To Text:", "Au texte :", "To Text:", "To Text:", "文本转为："]),
-    ("Top", ["Top", "Haut", "Top", "Top", "顶部"]),
-    (
-        "Track Changes in All Stories",
-        [
-            "Track Changes in All Stories",
-            "Suivre les modifications dans tous les articles",
-            "Track Changes in All Stories",
-            "Track Changes in All Stories",
-            "跟踪所有文章中的更改",
-        ],
-    ),
-    ("Trim", ["Trim", "Rognage", "Trim", "Trim", "裁切"]),
-    (
-        "Bounding Box (Visible Layers Only)",
-        [
-            "Begrenzungsrahmen (nur sichtbare Ebenen)",
-            "Cadre de sélection (calques visibles uniquement)",
-            "Cuadro delimitador (solo capas visibles)",
-            "バウンディングボックス（表示レイヤーのみ）",
-            "边界框（仅可见图层）",
-        ],
-    ),
-    (
-        "Bounding Box (All Layers)",
-        [
-            "Begrenzungsrahmen (alle Ebenen)",
-            "Cadre de sélection (tous les calques)",
-            "Cuadro delimitador (todas las capas)",
-            "バウンディングボックス（すべてのレイヤー）",
-            "边界框（所有图层）",
-        ],
-    ),
-    ("Type:", ["Type:", "Type :", "Type:", "Type:", "类型："]),
-    ("Typical", ["Typical", "Standard", "Typical", "Typical", "典型"]),
-    ("UI Size:", ["UI Size:", "Taille de l'interface :", "UI Size:", "UI Size:", "UI 大小："]),
-    ("Ungroup Color Group", ["Ungroup Color Group", "Dissocier le groupe de couleurs", "Ungroup Color Group", "Ungroup Color Group", "取消颜色组"]),
-    ("Unmerge", ["Unmerge", "Annuler la fusion", "Unmerge", "Unmerge", "取消合并"]),
-    ("Update", ["Update", "Mettre à jour", "Update", "Update", "更新"]),
-    ("Update Numbering", ["Update Numbering", "Mettre à jour la numérotation", "Update Numbering", "Update Numbering", "更新编号"]),
-    ("Use Global Light", ["Use Global Light", "Utiliser la lumière globale", "Use Global Light", "Use Global Light", "使用全局光"]),
-    ("User Dictionary", ["User Dictionary", "Dictionnaire utilisateur", "User Dictionary", "User Dictionary", "用户词典"]),
-    (
-        "Vertical Gridline Every:",
-        [
-            "Vertical Gridline Every:",
-            "Ligne de grille verticale tous les :",
-            "Vertical Gridline Every:",
-            "Vertical Gridline Every:",
-            "垂直网格线间隔：",
-        ],
-    ),
-    ("Vertical Margins:", ["Vertical Margins:", "Marges verticales :", "Vertical Margins:", "Vertical Margins:", "垂直边距："]),
-    ("Vertical justification", ["Vertical justification", "Justification verticale", "Vertical justification", "Vertical justification", "垂直对齐"]),
-    ("View Threshold:", ["View Threshold:", "Seuil d'affichage :", "View Threshold:", "View Threshold:", "视图阈值："]),
-    ("Web", ["Web", "Web", "Web", "Web", "Web"]),
-    ("Web Hyperlink", ["Web Hyperlink", "Hyperlien Web", "Web Hyperlink", "Web Hyperlink", "Web 超链接"]),
-    ("Weight:", ["Weight:", "Épaisseur :", "Weight:", "Weight:", "粗细："]),
-    ("Width", ["Width", "Largeur", "Width", "Width", "宽度"]),
-    ("Width:", ["Width:", "Largeur :", "Width:", "Width:", "宽度："]),
-    ("Words, one per line:", ["Words, one per line:", "Mots, un par ligne :", "Words, one per line:", "Words, one per line:", "单词，每行一个："]),
-    ("Multiple Objects", ["Multiple Objects", "Plusieurs objets", "Multiple Objects", "Multiple Objects", "多个对象"]),
-    ("Ellipse", ["Ellipse", "Ellipse", "Ellipse", "Ellipse", "椭圆"]),
-    ("Polygon", ["Polygon", "Polygone", "Polygon", "Polygon", "多边形"]),
-    ("Characters", ["Characters", "Caractères", "Characters", "Characters", "字符"]),
-    ("Image", ["Image", "Image", "Image", "Image", "图像"]),
-    ("Line", ["Line", "Trait", "Line", "Line", "直线"]),
-    ("Path", ["Path", "Tracé", "Path", "Path", "路径"]),
-    ("No Selection", ["No Selection", "Aucune sélection", "No Selection", "No Selection", "未选择"]),
-    ("Adjust Layout", ["Adjust Layout", "Ajuster la mise en page", "Adjust Layout", "Adjust Layout", "调整版面"]),
-    ("Edit Page", ["Edit Page", "Modifier la page", "Edit Page", "Edit Page", "编辑页面"]),
-    ("Import File", ["Import File", "Importer un fichier", "Import File", "Import File", "导入文件"]),
-    ("Insert Page", ["Insert Page", "Insérer une page", "Insert Page", "Insert Page", "插入页面"]),
-    (
-        "Delete selected pages",
-        ["Ausgewählte Seiten löschen", "Supprimer les pages sélectionnées", "Eliminar páginas seleccionadas", "選択したページを削除", "删除选定页面"],
-    ),
-    ("Create new page", ["Neue Seite erstellen", "Créer une page", "Crear página nueva", "新規ページを作成", "新建页面"]),
-    ("Edit page size", ["Seitenformat bearbeiten", "Modifier le format de page", "Editar tamaño de página", "ページサイズを編集", "编辑页面大小"]),
-    (
-        "Custom Page Size…",
-        [
-            "Benutzerdefiniertes Seitenformat …",
-            "Format de page personnalisé…",
-            "Tamaño de página personalizado…",
-            "カスタムページサイズ…",
-            "自定页面大小…",
-        ],
-    ),
-    ("Hide Bar", ["Hide Bar", "Masquer la barre", "Hide Bar", "Hide Bar", "隐藏栏"]),
-    ("Properties Panel", ["Properties Panel", "Panneau Propriétés", "Properties Panel", "Properties Panel", "属性面板"]),
-    ("New Workspace…", ["New Workspace…", "Nouvel espace de travail…", "New Workspace…", "New Workspace…", "新建工作区…"]),
-    ("Float panel", ["Float panel", "Détacher le panneau", "Float panel", "Float panel", "浮动面板"]),
-    ("Dock panel", ["Dock panel", "Ancrer le panneau", "Dock panel", "Dock panel", "停靠面板"]),
-    (
-        "Fit frame height to text",
-        [
-            "Fit frame height to text",
-            "Ajuster la hauteur du bloc au texte",
-            "Fit frame height to text",
-            "Fit frame height to text",
-            "适合框架高度到文本",
-        ],
-    ),
-    ("More Options", ["More Options", "Plus d'options", "More Options", "More Options", "更多选项"]),
-    ("Flip Horizontal", ["Flip Horizontal", "Retourner horizontalement", "Flip Horizontal", "Flip Horizontal", "水平翻转"]),
-    (
-        "Rotate 90° Clockwise",
-        ["Rotate 90° Clockwise", "Rotation de 90° dans le sens horaire", "Rotate 90° Clockwise", "Rotate 90° Clockwise", "顺时针旋转90°"],
-    ),
-    ("Flip Vertical", ["Flip Vertical", "Retourner verticalement", "Flip Vertical", "Flip Vertical", "垂直翻转"]),
-    (
-        "Default Fill and Stroke (D)",
-        [
-            "Default Fill and Stroke (D)",
-            "Fond et contour par défaut (D)",
-            "Default Fill and Stroke (D)",
-            "Default Fill and Stroke (D)",
-            "默认填色和描边 (D)",
-        ],
-    ),
-    (
-        "Swap Fill and Stroke (Shift+X)",
-        [
-            "Swap Fill and Stroke (Shift+X)",
-            "Permuter fond et contour (Shift+X)",
-            "Swap Fill and Stroke (Shift+X)",
-            "Swap Fill and Stroke (Shift+X)",
-            "交换填色和描边 (Shift+X)",
-        ],
-    ),
-    ("Fill (X)", ["Fill (X)", "Fond (X)", "Fill (X)", "Fill (X)", "填色 (X)"]),
-    ("Stroke (X)", ["Stroke (X)", "Contour (X)", "Stroke (X)", "Stroke (X)", "描边 (X)"]),
-    ("Apply None (/)", ["Apply None (/)", "Appliquer Aucun (/)", "Apply None (/)", "Apply None (/)", "应用无 (/)"]),
-    (
-        "Default Fill and Stroke",
-        ["Default Fill and Stroke", "Fond et contour par défaut", "Default Fill and Stroke", "Default Fill and Stroke", "默认填色和描边"],
-    ),
-    ("Swap Fill and Stroke", ["Swap Fill and Stroke", "Permuter fond et contour", "Swap Fill and Stroke", "Swap Fill and Stroke", "交换填色和描边"]),
-    (
-        "Toggle Fill and Stroke",
-        ["Toggle Fill and Stroke", "Basculer fond/contour", "Toggle Fill and Stroke", "Toggle Fill and Stroke", "切换填色和描边"],
-    ),
-    ("Reverse the gradient", ["Reverse the gradient", "Inverser le dégradé", "Reverse the gradient", "Reverse the gradient", "反转渐变"]),
-    ("Style source", ["Style source", "Source du style", "Style source", "Style source", "样式源"]),
-    ("Open", ["Open", "Ouvrir", "Open", "Open", "打开"]),
-    ("All Caps", ["All Caps", "Tout en capitales", "All Caps", "All Caps", "全部大写"]),
-    ("Underline", ["Underline", "Souligné", "Underline", "Underline", "下划线"]),
-    ("Strikethrough", ["Strikethrough", "Barré", "Strikethrough", "Strikethrough", "删除线"]),
-    ("Superscript", ["Superscript", "Exposant", "Superscript", "Superscript", "上标"]),
-    (
-        "Pick a file in the folder holding the moved graphics",
-        [
-            "Pick a file in the folder holding the moved graphics",
-            "Choisissez un fichier dans le dossier qui contient les graphiques déplacés",
-            "Pick a file in the folder holding the moved graphics",
-            "Pick a file in the folder holding the moved graphics",
-            "在包含移动图形的文件夹中选择一个文件",
-        ],
-    ),
-    ("Show Favorites Only", ["Show Favorites Only", "Afficher uniquement les favoris", "Show Favorites Only", "Show Favorites Only", "仅显示收藏夹"]),
-    ("Select", ["Select", "Sélectionner", "Select", "Select", "选择"]),
-    (
-        "Hyperlink from the selected text or frames",
-        [
-            "Hyperlink from the selected text or frames",
-            "Hyperlien à partir du texte ou des blocs sélectionnés",
-            "Hyperlink from the selected text or frames",
-            "Hyperlink from the selected text or frames",
-            "从所选文本或框架建立超链接",
-        ],
-    ),
-    (
-        "Include when exporting",
-        ["Include when exporting", "Inclure à l'exportation", "Include when exporting", "Include when exporting", "导出时包含"],
-    ),
-    ("Add the selection", ["Add the selection", "Ajouter la sélection", "Add the selection", "Add the selection", "添加选择"]),
-    ("Tag the selection", ["Tag the selection", "Baliser la sélection", "Tag the selection", "Tag the selection", "标记选择"]),
-    ("Separated by commas", ["Separated by commas", "Séparés par des virgules", "Separated by commas", "Separated by commas", "用逗号分隔"]),
-    ("Show in the text", ["Show in the text", "Afficher dans le texte", "Show in the text", "Show in the text", "在文本中显示"]),
-    (
-        "Show / hide text with this condition",
-        [
-            "Show / hide text with this condition",
-            "Afficher / masquer le texte avec cette condition",
-            "Show / hide text with this condition",
-            "Show / hide text with this condition",
-            "使用此条件显示/隐藏文本",
-        ],
-    ),
-    (
-        "Spreads of up to 10 pages",
-        ["Spreads of up to 10 pages", "Planches de 10 pages maximum", "Spreads of up to 10 pages", "Spreads of up to 10 pages", "最多10页的跨页"],
-    ),
-    ("for", ["for", "pour", "por", "に対して", "行"]),
-    ("About DesignCraft", ["About DesignCraft", "À propos de DesignCraft", "About DesignCraft", "About DesignCraft", "关于 DesignCraft"]),
-    ("Quit DesignCraft", ["DesignCraft beenden", "Quitter DesignCraft", "Salir de DesignCraft", "DesignCraft を終了", "退出 DesignCraft"]),
-    ("Accept All Changes", ["Accept All Changes", "Accepter toutes les modifications", "Accept All Changes", "Accept All Changes", "接受所有更改"]),
-    ("Activate Document", ["Activate Document", "Activer le document", "Activate Document", "Activate Document", "激活文档"]),
-    ("Add Anchor Point", ["Add Anchor Point", "Ajouter un point d'ancrage", "Add Anchor Point", "Add Anchor Point", "添加锚点"]),
-    ("Add Document", ["Add Document", "Ajouter un document", "Add Document", "Add Document", "添加文档"]),
-    (
-        "Add Hyphenation Exception",
-        ["Add Hyphenation Exception", "Ajouter une exception de césure", "Add Hyphenation Exception", "Add Hyphenation Exception", "添加断字例外"],
-    ),
-    ("Add Item", ["Add Item", "Ajouter un élément", "Add Item", "Add Item", "添加项目"]),
-    ("Add Page to Spread", ["Add Page to Spread", "Ajouter une page à la planche", "Add Page to Spread", "Add Page to Spread", "添加页面至跨页"]),
-    ("Add to Swatches", ["Add to Swatches", "Ajouter au nuancier", "Add to Swatches", "Add to Swatches", "添加到色板"]),
-    (
-        "Allow Selected Spread to Shuffle",
-        [
-            "Allow Selected Spread to Shuffle",
-            "Autoriser la réorganisation des pages de la planche sélectionnée",
-            "Allow Selected Spread to Shuffle",
-            "Allow Selected Spread to Shuffle",
-            "允许所选跨页随机排布",
-        ],
-    ),
-    (
-        "Anchored Object Options…",
-        ["Anchored Object Options…", "Options d'objet ancré…", "Anchored Object Options…", "Anchored Object Options…", "锚定对象选项…"],
-    ),
-    ("Anchored Objects", ["Anchored Objects", "Objets ancrés", "Anchored Objects", "Anchored Objects", "锚定对象"]),
-    ("Appearance of Black", ["Appearance of Black", "Aspect du noir", "Appearance of Black", "Appearance of Black", "黑色的外观"]),
-    (
-        "Apply Attributes (Eyedropper)",
-        [
-            "Apply Attributes (Eyedropper)",
-            "Appliquer les attributs (Pipette)",
-            "Apply Attributes (Eyedropper)",
-            "Apply Attributes (Eyedropper)",
-            "应用属性 (吸管)",
-        ],
-    ),
-    ("Apply Cell Style", ["Apply Cell Style", "Appliquer le style de cellule", "Apply Cell Style", "Apply Cell Style", "应用单元格样式"]),
-    ("Apply Color", ["Apply Color", "Appliquer la couleur", "Apply Color", "Apply Color", "应用颜色"]),
-    ("Repeat", ["Wiederholen", "Répéter", "Repetir", "繰り返し", "重复"]),
-    ("Count:", ["Anzahl:", "Nombre :", "Recuento:", "繰り返し数:", "计数:"]),
-    ("Create as a grid", ["Als Raster erstellen", "Créer en tant que grille", "Crear como cuadrícula", "グリッドとして作成", "创建为网格"]),
-    ("Rows:", ["Zeilen:", "Rangées :", "Filas:", "行:", "行:"]),
-    ("Vertical:", ["Vertikal:", "Vertical :", "Vertical:", "垂直方向:", "垂直:"]),
-    ("Horizontal:", ["Horizontal:", "Horizontal :", "Horizontal:", "水平方向:", "水平:"]),
-    ("Invalid value", ["Ungültiger Wert", "Valeur non valide", "Valor no válido", "無効な値", "无效值"]),
-    ("Isolate Blending", ["Füllmethode isolieren", "Isoler le mode de fusion", "Aislar fusión", "描画モードを分離", "分离混合"]),
-    ("Knockout Group", ["Aussparungsgruppe", "Groupe de masquage", "Grupo de exclusión", "グループの抜き", "挖空组"]),
-    ("Object:", ["Objekt:", "Objet :", "Objeto:", "オブジェクト:", "对象:"]),
-    ("Group:", ["Gruppe:", "Groupe :", "Grupo:", "グループ:", "编组:"]),
-    (
-        "Sample Color (Eyedropper)",
-        ["Farbe aufnehmen (Pipette)", "Prélever la couleur (Pipette)", "Tomar color (Cuentagotas)", "カラーを抽出 (スポイト)", "取样颜色 (吸管)"],
-    ),
-    ("Apply Condition", ["Apply Condition", "Appliquer la condition", "Apply Condition", "Apply Condition", "应用条件"]),
-    (
-        "Apply Parent to Pages…",
-        ["Apply Parent to Pages…", "Appliquer le gabarit aux pages…", "Apply Parent to Pages…", "Apply Parent to Pages…", "将主页应用于页面…"],
-    ),
-    (
-        "ArtCraft App Page…",
-        ["ArtCraft App Page…", "Page de l'application ArtCraft…", "ArtCraft App Page…", "ArtCraft App Page…", "ArtCraft 应用页面…"],
-    ),
-    ("ArtCraft Website…", ["ArtCraft Website…", "Site web d'ArtCraft…", "ArtCraft Website…", "ArtCraft Website…", "ArtCraft 网站…"]),
-    ("Attributes", ["Attributes", "Attributs", "Attributes", "Attributes", "属性"]),
-    ("Bevel and Emboss", ["Bevel and Emboss", "Biseautage et estampage", "Bevel and Emboss", "Bevel and Emboss", "斜面和浮雕"]),
-    ("Buttons", ["Buttons", "Boutons", "Buttons", "Buttons", "按钮"]),
-    ("Cell Options", ["Cell Options", "Options de cellule", "Cell Options", "Cell Options", "单元格选项"]),
-    ("Cell Style Options…", ["Cell Style Options…", "Options de style de cellule…", "Cell Style Options…", "Cell Style Options…", "单元格样式选项…"]),
-    ("Change All (Object)", ["Change All (Object)", "Tout remplacer (objet)", "Change All (Object)", "Change All (Object)", "全部更改 (对象)"]),
-    ("Change Case", ["Change Case", "Modifier la casse", "Change Case", "Change Case", "更改大小写"]),
-    ("Changes", ["Changes", "Modifications", "Changes", "Changes", "更改"]),
-    ("Character Formatting", ["Character Formatting", "Mise en forme des caractères", "Character Formatting", "Character Formatting", "字符格式"]),
-    ("Clear Conveyor", ["Clear Conveyor", "Vider le convoyeur", "Clear Conveyor", "Clear Conveyor", "清除传送带"]),
-    ("Clear Transformations", ["Clear Transformations", "Effacer les transformations", "Clear Transformations", "Clear Transformations", "清除变换"]),
-    ("Clipping Path…", ["Clipping Path…", "Masque…", "Clipping Path…", "Clipping Path…", "剪切路径…"]),
-    ("Close Book", ["Close Book", "Fermer le livre", "Close Book", "Close Book", "关闭书籍"]),
-    ("Close Library", ["Close Library", "Fermer la bibliothèque", "Close Library", "Close Library", "关闭库"]),
-    ("Collect", ["Collect", "Collecter", "Collect", "Collect", "收集"]),
-    ("Color Settings…", ["Color Settings…", "Réglages des couleurs…", "Color Settings…", "Color Settings…", "颜色设置…"]),
-    (
-        "Community & Project Links",
-        ["Community & Project Links", "Communauté et liens du projet", "Community & Project Links", "Community & Project Links", "社区与项目链接"],
-    ),
-    ("Compress images", ["Bilder komprimieren", "Compresser les images", "Comprimir imágenes", "画像を圧縮", "压缩图像"]),
-    ("Compression", ["Komprimierung", "Compression", "Compresión", "圧縮", "压缩"]),
-    ("Conditions", ["Conditions", "Conditions", "Conditions", "Conditions", "条件"]),
-    ("Container", ["Container", "Conteneur", "Container", "Container", "容器"]),
-    ("Content", ["Content", "Contenu", "Content", "Content", "内容"]),
-    ("Contextual Task Bar", ["Contextual Task Bar", "Barre des tâches contextuelle", "Contextual Task Bar", "Contextual Task Bar", "上下文任务栏"]),
-    ("Control", ["Control", "Contrôle", "Control", "Control", "控制"]),
-    (
-        "Convert Cell to Graphic Cell",
-        [
-            "Convert Cell to Graphic Cell",
-            "Convertir la cellule en cellule graphique",
-            "Convert Cell to Graphic Cell",
-            "Convert Cell to Graphic Cell",
-            "将单元格转换为图形单元格",
-        ],
-    ),
-    (
-        "Convert Cell to Graphic Cell…",
-        [
-            "Convert Cell to Graphic Cell…",
-            "Convertir la cellule en cellule graphique…",
-            "Convert Cell to Graphic Cell…",
-            "Convert Cell to Graphic Cell…",
-            "将单元格转换为图形单元格…",
-        ],
-    ),
-    (
-        "Convert Cell to Text Cell",
-        [
-            "Convert Cell to Text Cell",
-            "Convertir la cellule en cellule de texte",
-            "Convert Cell to Text Cell",
-            "Convert Cell to Text Cell",
-            "将单元格转换为文本单元格",
-        ],
-    ),
-    ("Convert Color", ["Convert Color", "Convertir la couleur", "Convert Color", "Convert Color", "转换颜色"]),
-    (
-        "Convert Direction Point",
-        ["Convert Direction Point", "Convertir le point directeur", "Convert Direction Point", "Convert Direction Point", "转换方向点"],
-    ),
-    (
-        "Convert Note to Text",
-        ["Convert Note to Text", "Convertir la note en texte", "Convert Note to Text", "Convert Note to Text", "将注释转换为文本"],
-    ),
-    (
-        "Convert Selection to Multi-State Object",
-        [
-            "Convert Selection to Multi-State Object",
-            "Convertir la sélection en objet à états multiples",
-            "Convert Selection to Multi-State Object",
-            "Convert Selection to Multi-State Object",
-            "将选区转换为多状态对象",
-        ],
-    ),
-    ("Convert Shape", ["Convert Shape", "Convertir la forme", "Convert Shape", "Convert Shape", "转换形状"]),
-    (
-        "Convert Table to Text",
-        ["Convert Table to Text", "Convertir le tableau en texte", "Convert Table to Text", "Convert Table to Text", "将表格转换为文本"],
-    ),
-    (
-        "Convert Text to Table",
-        ["Convert Text to Table", "Convertir le texte en tableau", "Convert Text to Table", "Convert Text to Table", "将文本转换为表格"],
-    ),
-    ("Convert to Button", ["Convert to Button", "Convertir en bouton", "Convert to Button", "Convert to Button", "转换为按钮"]),
-    (
-        "Convert to Form Field",
-        ["Convert to Form Field", "Convertir en champ de formulaire", "Convert to Form Field", "Convert to Form Field", "转换为表单域"],
-    ),
-    ("Conveyor", ["Conveyor", "Convoyeur", "Conveyor", "Conveyor", "传送带"]),
-    ("Copy Link(s) To…", ["Copy Link(s) To…", "Copier les liens vers…", "Copy Link(s) To…", "Copy Link(s) To…", "复制链接至…"]),
-    ("Corner Options…", ["Corner Options…", "Options d'arrondi…", "Corner Options…", "Corner Options…", "角选项…"]),
-    (
-        "Create Alternate Layout…",
-        ["Create Alternate Layout…", "Créer une variante de mise en page…", "Create Alternate Layout…", "Create Alternate Layout…", "创建替代版面…"],
-    ),
-    ("Create Frame", ["Create Frame", "Créer un bloc", "Create Frame", "Create Frame", "创建框架"]),
-    (
-        "Create Merged Document…",
-        [
-            "Zusammengeführtes Dokument erstellen …",
-            "Créer un document fusionné…",
-            "Crear documento combinado…",
-            "結合ドキュメントを作成…",
-            "创建合并文档…",
-        ],
-    ),
-    (
-        "Cross-Reference Formats",
-        ["Cross-Reference Formats", "Formats de référence croisée", "Cross-Reference Formats", "Cross-Reference Formats", "交叉引用格式"],
-    ),
-    ("Cross-References", ["Cross-References", "Références croisées", "Cross-References", "Cross-References", "交叉引用"]),
-    ("Data Merge Fields", ["Data Merge Fields", "Champs de fusion des données", "Data Merge Fields", "Data Merge Fields", "数据合并字段"]),
-    (
-        "Define Cross-Reference Format…",
-        [
-            "Define Cross-Reference Format…",
-            "Définir un format de référence croisée…",
-            "Define Cross-Reference Format…",
-            "Define Cross-Reference Format…",
-            "定义交叉引用格式…",
-        ],
-    ),
-    ("Define Lists…", ["Define Lists…", "Définir des listes…", "Define Lists…", "Define Lists…", "定义列表…"]),
-    ("Apply Bullets", ["Aufzählungszeichen anwenden", "Appliquer des puces", "Aplicar viñetas", "箇条書きを適用", "应用项目符号"]),
-    ("Apply Numbers", ["Nummerierung anwenden", "Appliquer la numérotation", "Aplicar números", "段落番号を適用", "应用编号"]),
-    (
-        "Define Text Variable…",
-        ["Define Text Variable…", "Définir une variable de texte…", "Define Text Variable…", "Define Text Variable…", "定义文本变量…"],
-    ),
-    (
-        "Delete All Guides on Spread",
-        [
-            "Delete All Guides on Spread",
-            "Supprimer tous les repères de la planche",
-            "Delete All Guides on Spread",
-            "Delete All Guides on Spread",
-            "删除跨页上的所有参考线",
-        ],
-    ),
-    ("Delete Anchor Point", ["Delete Anchor Point", "Supprimer le point d'ancrage", "Delete Anchor Point", "Delete Anchor Point", "删除锚点"]),
-    ("Delete Item", ["Delete Item", "Supprimer l'élément", "Delete Item", "Delete Item", "删除项目"]),
-    (
-        "Delete Text Variable",
-        ["Delete Text Variable", "Supprimer la variable de texte", "Delete Text Variable", "Delete Text Variable", "删除文本变量"],
-    ),
-    ("Delete Workspace…", ["Delete Workspace…", "Supprimer l'espace de travail…", "Delete Workspace…", "Delete Workspace…", "删除工作区…"]),
-    (
-        "DesignCraft Website…",
-        ["DesignCraft Website…", "Site web de DesignCraft…", "DesignCraft Website…", "DesignCraft Website…", "DesignCraft 网站…"],
-    ),
-    (
-        "DesignCraft on GitHub…",
-        ["DesignCraft on GitHub…", "DesignCraft sur GitHub…", "DesignCraft on GitHub…", "DesignCraft on GitHub…", "DesignCraft 在 GitHub 上…"],
-    ),
-    (
-        "Detach All Objects from Parent",
-        [
-            "Detach All Objects from Parent",
-            "Détacher tous les objets du gabarit",
-            "Detach All Objects from Parent",
-            "Detach All Objects from Parent",
-            "从主页分离所有对象",
-        ],
-    ),
-    ("Directional Feather", ["Directional Feather", "Contour progressif directionnel", "Directional Feather", "Directional Feather", "定向羽化"]),
-    ("Distribute", ["Distribute", "Répartir", "Distribute", "Distribute", "分布"]),
-    ("Dock Panel", ["Dock Panel", "Ancrer le panneau", "Dock Panel", "Dock Panel", "停靠面板"]),
-    (
-        "Document Endnote Options…",
-        [
-            "Document Endnote Options…",
-            "Options de notes de fin de document…",
-            "Document Endnote Options…",
-            "Document Endnote Options…",
-            "文档尾注选项…",
-        ],
-    ),
-    (
-        "Document Footnote Options…",
-        [
-            "Document Footnote Options…",
-            "Options de notes de bas de page du document…",
-            "Document Footnote Options…",
-            "Document Footnote Options…",
-            "文档脚注选项…",
-        ],
-    ),
-    ("Document Preferences", ["Document Preferences", "Préférences du document", "Document Preferences", "Document Preferences", "文档首选项"]),
-    ("Document Presets", ["Document Presets", "Paramètres prédéfinis de document", "Document Presets", "Document Presets", "文档预设"]),
-    ("Document…", ["Document…", "Document…", "Document…", "Document…", "文档…"]),
-    ("Dynamic Spelling", ["Dynamic Spelling", "Orthographe dynamique", "Dynamic Spelling", "Dynamic Spelling", "动态拼写"]),
-    ("Edit Parents", ["Edit Parents", "Modifier les gabarits", "Edit Parents", "Edit Parents", "编辑主页"]),
-    ("Edit Story", ["Edit Story", "Modifier l'article", "Edit Story", "Edit Story", "编辑文章"]),
-    (
-        "Edit in Story Editor",
-        ["Edit in Story Editor", "Modifier en mode éditeur", "Edit in Story Editor", "Edit in Story Editor", "在文章编辑器中编辑"],
-    ),
-    ("Endnotes", ["Endnotes", "Notes de fin", "Endnotes", "Endnotes", "尾注"]),
-    ("Entire Pasteboard", ["Entire Pasteboard", "Table de montage entière", "Entire Pasteboard", "Entire Pasteboard", "完整粘贴板"]),
-    ("Erase", ["Erase", "Effacer", "Erase", "Erase", "擦除"]),
-    ("Export Book to PDF…", ["Export Book to PDF…", "Exporter le livre en PDF…", "Export Book to PDF…", "Export Book to PDF…", "将书籍导出为 PDF…"]),
-    (
-        "Export EPUB (Fixed Layout)…",
-        [
-            "Export EPUB (Fixed Layout)…",
-            "Exporter en EPUB (mise en page fixe)…",
-            "Export EPUB (Fixed Layout)…",
-            "Export EPUB (Fixed Layout)…",
-            "导出 EPUB (固定版面)…",
-        ],
-    ),
-    (
-        "Export EPUB (Reflowable)…",
-        [
-            "Export EPUB (Reflowable)…",
-            "Exporter en EPUB (redistribuable)…",
-            "Export EPUB (Reflowable)…",
-            "Export EPUB (Reflowable)…",
-            "导出 EPUB (可回流)…",
-        ],
-    ),
-    ("Export EPUB…", ["Export EPUB…", "Exporter en EPUB…", "Export EPUB…", "Export EPUB…", "导出 EPUB…"]),
-    ("Export HTML…", ["Export HTML…", "Exporter en HTML…", "Export HTML…", "Export HTML…", "导出 HTML…"]),
-    ("Export IDML…", ["Export IDML…", "Exporter en IDML…", "Export IDML…", "Export IDML…", "导出 IDML…"]),
-    (
-        "Export PDF (Interactive)…",
-        [
-            "Export PDF (Interactive)…",
-            "Exporter en PDF (interactif)…",
-            "Export PDF (Interactive)…",
-            "Export PDF (Interactive)…",
-            "导出 PDF (交互式)…",
-        ],
-    ),
-    ("Export Page as PNG…", ["Export Page as PNG…", "Exporter la page en PNG…", "Export Page as PNG…", "Export Page as PNG…", "将页面导出为 PNG…"]),
-    (
-        "Export Selection as Snippet",
-        [
-            "Export Selection as Snippet",
-            "Exporter la sélection en tant qu'extrait",
-            "Export Selection as Snippet",
-            "Export Selection as Snippet",
-            "将所选内容导出为片段",
-        ],
-    ),
-    ("Export Tagging", ["Export Tagging", "Balisage d'exportation", "Export Tagging", "Export Tagging", "导出标记"]),
-    ("Export Text…", ["Export Text…", "Exporter le texte…", "Export Text…", "Export Text…", "导出文本…"]),
-    (
-        "Extend Text Selection",
-        ["Extend Text Selection", "Étendre la sélection de texte", "Extend Text Selection", "Extend Text Selection", "扩展文本选区"],
-    ),
-    ("Fast Display", ["Fast Display", "Affichage rapide", "Fast Display", "Fast Display", "快速显示"]),
-    ("Find", ["Find", "Rechercher", "Find", "Find", "查找"]),
-    ("Find Object", ["Find Object", "Rechercher un objet", "Find Object", "Find Object", "查找对象"]),
-    (
-        "Find by Script Label",
-        ["Find by Script Label", "Rechercher par étiquette de script", "Find by Script Label", "Find by Script Label", "按脚本标签查找"],
-    ),
-    ("Find/Replace Font…", ["Find/Replace Font…", "Rechercher/Remplacer une police…", "Find/Replace Font…", "Find/Replace Font…", "查找/替换字体…"]),
-    ("First Object Above", ["First Object Above", "Premier objet au-dessus", "First Object Above", "First Object Above", "上方第一个对象"]),
-    (
-        "Fit Selection in Window",
-        [
-            "Fit Selection in Window",
-            "Ajuster la sélection à la fenêtre",
-            "Fit Selection in Window",
-            "Fit Selection in Window",
-            "窗口大小适应所选内容",
-        ],
-    ),
-    ("Flattener Preview", ["Flattener Preview", "Aperçu de l'aplatissement", "Flattener Preview", "Flattener Preview", "拼合器预览"]),
-    ("Float Panel", ["Float Panel", "Détacher le panneau", "Float Panel", "Float Panel", "浮动面板"]),
-    ("Fonts in Document", ["Fonts in Document", "Polices du document", "Fonts in Document", "Fonts in Document", "文档中的字体"]),
-    ("Footnotes", ["Footnotes", "Notes de bas de page", "Footnotes", "Footnotes", "脚注"]),
-    ("Form Fields", ["Form Fields", "Champs de formulaire", "Form Fields", "Form Fields", "表单域"]),
-    (
-        "Frame Fitting Options…",
-        ["Frame Fitting Options…", "Options d'ajustement au bloc…", "Frame Fitting Options…", "Frame Fitting Options…", "框架适合选项…"],
-    ),
-    ("Generate Index…", ["Generate Index…", "Générer l'index…", "Generate Index…", "Generate Index…", "生成索引…"]),
-    ("Generate QR Code…", ["Generate QR Code…", "Générer un code QR…", "Generate QR Code…", "Generate QR Code…", "生成二维码…"]),
-    (
-        "Generate Static Caption",
-        ["Generate Static Caption", "Générer une légende statique", "Generate Static Caption", "Generate Static Caption", "生成静态题注"],
-    ),
-    ("Get Story", ["Get Story", "Obtenir l'article", "Get Story", "Get Story", "获取文章"]),
-    ("Get Table", ["Get Table", "Obtenir le tableau", "Get Table", "Get Table", "获取表格"]),
-    ("Global Light…", ["Global Light…", "Lumière globale…", "Global Light…", "Global Light…", "全局光…"]),
-    ("Go To Link", ["Go To Link", "Atteindre le lien", "Go To Link", "Go To Link", "转到链接"]),
-    ("Go To Source", ["Go To Source", "Atteindre la source", "Go To Source", "Go To Source", "转到源"]),
-    (
-        "Go to Footnote Reference",
-        [
-            "Go to Footnote Reference",
-            "Atteindre la référence de note de bas de page",
-            "Go to Footnote Reference",
-            "Go to Footnote Reference",
-            "转到脚注引用",
-        ],
-    ),
-    ("Go to Page…", ["Go to Page…", "Atteindre la page…", "Go to Page…", "Go to Page…", "转到页面…"]),
-    ("Gradient Feather", ["Gradient Feather", "Contour progressif dégradé", "Gradient Feather", "Gradient Feather", "渐变羽化"]),
-    ("Gridify", ["Gridify", "Mettre en grille", "Gridify", "Gridify", "网格化"]),
-    ("Group Transparency", ["Group Transparency", "Transparence du groupe", "Group Transparency", "Group Transparency", "编组透明度"]),
-    ("Guides", ["Guides", "Repères", "Guides", "Guides", "参考线"]),
-    ("Hide Menu Item", ["Hide Menu Item", "Masquer la commande de menu", "Hide Menu Item", "Hide Menu Item", "隐藏菜单项"]),
-    ("Hide/Lock Others", ["Hide/Lock Others", "Masquer/verrouiller les autres", "Hide/Lock Others", "Hide/Lock Others", "隐藏/锁定其他"]),
-    (
-        "High Quality Display",
-        ["High Quality Display", "Affichage de qualité supérieure", "High Quality Display", "High Quality Display", "高品质显示"],
-    ),
-    ("History", ["History", "Historique", "History", "History", "历史记录"]),
-    ("Hyphenation Exceptions", ["Hyphenation Exceptions", "Exceptions de césure", "Hyphenation Exceptions", "Hyphenation Exceptions", "断字例外"]),
-    (
-        "Import Options: Styles",
-        ["Import Options: Styles", "Options d'importation : styles", "Import Options: Styles", "Import Options: Styles", "导入选项: 样式"],
-    ),
-    (
-        "Index Page References",
-        ["Index Page References", "Références de page de l'index", "Index Page References", "Index Page References", "索引页引用"],
-    ),
-    ("Inner Glow", ["Inner Glow", "Lueur interne", "Inner Glow", "Inner Glow", "内发光"]),
-    ("Inner Shadow", ["Inner Shadow", "Ombre interne", "Inner Shadow", "Inner Shadow", "内阴影"]),
-    (
-        "Insert Anchored Object…",
-        ["Insert Anchored Object…", "Insérer un objet ancré…", "Insert Anchored Object…", "Insert Anchored Object…", "插入锚定对象…"],
-    ),
-    (
-        "Insert Cross-Reference…",
-        ["Insert Cross-Reference…", "Insérer une référence croisée…", "Insert Cross-Reference…", "Insert Cross-Reference…", "插入交叉引用…"],
-    ),
-    ("Insert Endnote", ["Insert Endnote", "Insérer une note de fin", "Insert Endnote", "Insert Endnote", "插入尾注"]),
-    ("Insert Footnote", ["Insert Footnote", "Insérer une note de bas de page", "Insert Footnote", "Insert Footnote", "插入脚注"]),
-    (
-        "Insert Math Expression…",
-        ["Insert Math Expression…", "Insérer une expression mathématique…", "Insert Math Expression…", "Insert Math Expression…", "插入数学公式…"],
-    ),
-    ("Insert Pages…", ["Insert Pages…", "Insérer des pages…", "Insert Pages…", "Insert Pages…", "插入页面…"]),
-    ("Insert Variable", ["Insert Variable", "Insérer une variable", "Insert Variable", "Insert Variable", "插入变量"]),
-    ("Inspect Document", ["Inspect Document", "Inspecter le document", "Inspect Document", "Inspect Document", "检查文档"]),
-    (
-        "Interface Color Theme",
-        ["Interface Color Theme", "Thème de couleur de l'interface", "Interface Color Theme", "Interface Color Theme", "界面颜色主题"],
-    ),
-    (
-        "Join the ArtCraft Discord…",
-        [
-            "Join the ArtCraft Discord…",
-            "Rejoindre le Discord d'ArtCraft…",
-            "Join the ArtCraft Discord…",
-            "Join the ArtCraft Discord…",
-            "加入 ArtCraft Discord…",
-        ],
-    ),
-    ("Last Object Below", ["Last Object Below", "Dernier objet en dessous", "Last Object Below", "Last Object Below", "下方最后一个对象"]),
-    ("Library Contents", ["Library Contents", "Contenu de la bibliothèque", "Library Contents", "Library Contents", "库内容"]),
-    ("Library Items", ["Library Items", "Éléments de la bibliothèque", "Library Items", "Library Items", "库项目"]),
-    ("Linked Stories", ["Linked Stories", "Articles liés", "Linked Stories", "Linked Stories", "链接的文章"]),
-    ("Liquid Page Rule", ["Liquid Page Rule", "Règle de page liquide", "Liquid Page Rule", "Liquid Page Rule", "自适应页面规则"]),
-    ("List Documents", ["List Documents", "Lister les documents", "List Documents", "List Documents", "列出文档"]),
-    ("List Styles", ["List Styles", "Lister les styles", "List Styles", "List Styles", "列表样式"]),
-    ("List Tools", ["List Tools", "Lister les outils", "List Tools", "List Tools", "列出工具"]),
-    ("Load Place Cursor", ["Load Place Cursor", "Charger le curseur d'importation", "Load Place Cursor", "Load Place Cursor", "加载放置光标"]),
-    ("Make Compound Path", ["Make Compound Path", "Créer un tracé transparent", "Make Compound Path", "Make Compound Path", "建立复合路径"]),
-    ("Map Styles to Tags", ["Map Styles to Tags", "Associer les styles aux balises", "Map Styles to Tags", "Map Styles to Tags", "将样式映射到标签"]),
-    ("Math Expression SVG", ["Math Expression SVG", "SVG d'expression mathématique", "Math Expression SVG", "Math Expression SVG", "数学公式 SVG"]),
-    ("Media Options", ["Media Options", "Options multimédia", "Media Options", "Media Options", "媒体选项"]),
-    ("Menus…", ["Menus…", "Menus…", "Menus…", "Menus…", "菜单…"]),
-    ("Merge Layers", ["Merge Layers", "Fusionner les calques", "Merge Layers", "Merge Layers", "合并图层"]),
-    ("Move Caret", ["Move Caret", "Déplacer le curseur", "Move Caret", "Move Caret", "移动插入点"]),
-    ("Move Gap", ["Move Gap", "Déplacer l'espace", "Move Gap", "Move Gap", "移动间隙"]),
-    ("Move Row", ["Move Row", "Déplacer la ligne", "Move Row", "Move Row", "移动行"]),
-    ("New Book", ["New Book", "Nouveau livre", "New Book", "New Book", "新建书籍"]),
-    ("New Cell Style…", ["New Cell Style…", "Nouveau style de cellule…", "New Cell Style…", "New Cell Style…", "新建单元格样式…"]),
-    ("New Color Swatch…", ["New Color Swatch…", "Nouvelle nuance de couleur…", "New Color Swatch…", "New Color Swatch…", "新建颜色色板…"]),
-    ("New Condition…", ["New Condition…", "Nouvelle condition…", "New Condition…", "New Condition…", "新建条件…"]),
-    ("New Guide", ["New Guide", "Nouveau repère", "New Guide", "New Guide", "新建参考线"]),
-    (
-        "New Hyperlink Destination…",
-        [
-            "New Hyperlink Destination…",
-            "Nouvelle destination d'hyperlien…",
-            "New Hyperlink Destination…",
-            "New Hyperlink Destination…",
-            "新建超链接目标…",
-        ],
-    ),
-    ("New Hyperlink…", ["New Hyperlink…", "Nouvel hyperlien…", "New Hyperlink…", "New Hyperlink…", "新建超链接…"]),
-    ("New Library", ["New Library", "Nouvelle bibliothèque", "New Library", "New Library", "新建库"]),
-    ("New Page Reference…", ["New Page Reference…", "Nouvelle référence de page…", "New Page Reference…", "New Page Reference…", "新建页面引用…"]),
-    (
-        "New Paragraph Style…",
-        ["New Paragraph Style…", "Nouveau style de paragraphe…", "New Paragraph Style…", "New Paragraph Style…", "新建段落样式…"],
-    ),
-    ("New Stroke Style…", ["New Stroke Style…", "Nouveau style de contour…", "New Stroke Style…", "New Stroke Style…", "新建描边样式…"]),
-    ("New Table Style…", ["New Table Style…", "Nouveau style de tableau…", "New Table Style…", "New Table Style…", "新建表样式…"]),
-    ("Next Cell", ["Next Cell", "Cellule suivante", "Next Cell", "Next Cell", "下一个单元格"]),
-    ("Next Document", ["Next Document", "Document suivant", "Next Document", "Next Document", "下一个文档"]),
-    ("Next Object Above", ["Next Object Above", "Objet suivant au-dessus", "Next Object Above", "Next Object Above", "上方下一个对象"]),
-    ("Next Object Below", ["Next Object Below", "Objet suivant en dessous", "Next Object Below", "Next Object Below", "下方下一个对象"]),
-    (
-        "Next Object in Group",
-        ["Next Object in Group", "Objet suivant dans le groupe", "Next Object in Group", "Next Object in Group", "组中的下一个对象"],
-    ),
-    ("Notes", ["Notes", "Notes", "Notes", "Notes", "注释"]),
-    (
-        "Object Export Options",
-        ["Object Export Options", "Options d'exportation de l'objet", "Object Export Options", "Object Export Options", "对象导出选项"],
-    ),
-    (
-        "Object Export Options…",
-        ["Object Export Options…", "Options d'exportation de l'objet…", "Object Export Options…", "Object Export Options…", "对象导出选项…"],
-    ),
-    (
-        "Object Layer Options…",
-        ["Object Layer Options…", "Options de calque d'objet…", "Object Layer Options…", "Object Layer Options…", "对象图层选项…"],
-    ),
-    ("Object Layers", ["Object Layers", "Calques d'objet", "Object Layers", "Object Layers", "对象图层"]),
-    (
-        "Object Liquid Settings",
-        [
-            "Object Liquid Settings",
-            "Réglages de mise en page liquide de l'objet",
-            "Object Liquid Settings",
-            "Object Liquid Settings",
-            "对象自适应设置",
-        ],
-    ),
-    ("Open Book", ["Open Book", "Ouvrir le livre", "Open Book", "Open Book", "打开书籍"]),
-    ("Open Bytes", ["Open Bytes", "Ouvrir les octets", "Open Bytes", "Open Bytes", "打开字节"]),
-    ("Open IDML", ["Open IDML", "Ouvrir un fichier IDML", "Open IDML", "Open IDML", "打开 IDML"]),
-    ("Open Library", ["Open Library", "Ouvrir la bibliothèque", "Open Library", "Open Library", "打开库"]),
-    ("Outer Glow", ["Outer Glow", "Lueur externe", "Outer Glow", "Outer Glow", "外发光"]),
-    ("Overprint Preview", ["Overprint Preview", "Aperçu de la surimpression", "Overprint Preview", "Overprint Preview", "叠印预览"]),
-    (
-        "Override All Parent Page Items",
-        [
-            "Override All Parent Page Items",
-            "Remplacer tous les éléments du gabarit",
-            "Override All Parent Page Items",
-            "Override All Parent Page Items",
-            "覆盖所有主页项目",
-        ],
-    ),
-    ("Page Size", ["Page Size", "Format de page", "Page Size", "Page Size", "页面大小"]),
-    ("Page Transition", ["Page Transition", "Transition de page", "Page Transition", "Page Transition", "页面过渡"]),
-    ("Page Transitions", ["Page Transitions", "Transitions de page", "Page Transitions", "Page Transitions", "页面过渡"]),
-    ("Paragraph Formatting", ["Paragraph Formatting", "Mise en forme des paragraphes", "Paragraph Formatting", "Paragraph Formatting", "段落格式"]),
-    (
-        "Paragraph Style Options…",
-        ["Paragraph Style Options…", "Options de style de paragraphe…", "Paragraph Style Options…", "Paragraph Style Options…", "段落样式选项…"],
-    ),
-    ("Paste Into", ["Paste Into", "Coller dedans", "Paste Into", "Paste Into", "贴入内部"]),
-    (
-        "Paste without Formatting",
-        ["Paste without Formatting", "Coller sans mise en forme", "Paste without Formatting", "Paste without Formatting", "粘贴时不包含格式"],
-    ),
-    ("Place", ["Place", "Importer", "Place", "Place", "置入"]),
-    ("Place Caret", ["Place Caret", "Placer le curseur", "Place Caret", "Place Caret", "放置光标"]),
-    ("Place Item", ["Place Item", "Importer l'élément", "Place Item", "Place Item", "置入项目"]),
-    ("Place Snippet", ["Place Snippet", "Importer un extrait", "Place Snippet", "Place Snippet", "置入片段"]),
-    ("Place and Link", ["Place and Link", "Importer et lier", "Place and Link", "Place and Link", "置入并链接"]),
-    (
-        "Place with Import Options…",
-        [
-            "Place with Import Options…",
-            "Importer avec les options d'importation…",
-            "Place with Import Options…",
-            "Place with Import Options…",
-            "连同导入选项置入…",
-        ],
-    ),
-    ("Polygon Settings…", ["Polygon Settings…", "Paramètres du polygone…", "Polygon Settings…", "Polygon Settings…", "多边形设置…"]),
-    ("Preflight Document", ["Preflight Document", "Contrôle en amont du document", "Preflight Document", "Preflight Document", "预检文档"]),
-    ("Previous Cell", ["Previous Cell", "Cellule précédente", "Previous Cell", "Previous Cell", "上一个单元格"]),
-    ("Previous Document", ["Previous Document", "Document précédent", "Previous Document", "Previous Document", "上一个文档"]),
-    (
-        "Previous Object in Group",
-        ["Previous Object in Group", "Objet précédent du groupe", "Previous Object in Group", "Previous Object in Group", "组中的上一个对象"],
-    ),
-    ("Primary Text Frame", ["Primary Text Frame", "Bloc de texte principal", "Primary Text Frame", "Primary Text Frame", "主文本框架"]),
-    ("Print Booklet…", ["Print Booklet…", "Imprimer le cahier…", "Print Booklet…", "Print Booklet…", "打印小册子…"]),
-    ("Printers", ["Printers", "Imprimantes", "Printers", "Printers", "打印机"]),
-    ("Proof Colors", ["Proof Colors", "Couleurs d'épreuve", "Proof Colors", "Proof Colors", "校样颜色"]),
-    ("Proof Setup", ["Proof Setup", "Format d'épreuve", "Proof Setup", "Proof Setup", "校样设置"]),
-    ("Quick Apply…", ["Quick Apply…", "Application rapide…", "Quick Apply…", "Quick Apply…", "快速应用…"]),
-    ("Recover Documents", ["Recover Documents", "Récupérer des documents", "Recover Documents", "Recover Documents", "恢复文档"]),
-    ("Recovery Data", ["Recovery Data", "Données de récupération", "Recovery Data", "Recovery Data", "恢复数据"]),
-    ("Reject All Changes", ["Reject All Changes", "Refuser toutes les modifications", "Reject All Changes", "Reject All Changes", "拒绝所有更改"]),
-    (
-        "Release Compound Path",
-        ["Release Compound Path", "Libérer le tracé transparent", "Release Compound Path", "Release Compound Path", "释放复合路径"],
-    ),
-    (
-        "Remove All Local Overrides",
-        [
-            "Remove All Local Overrides",
-            "Supprimer tous les remplacements locaux",
-            "Remove All Local Overrides",
-            "Remove All Local Overrides",
-            "移除所有本地覆盖",
-        ],
-    ),
-    ("Remove Document", ["Remove Document", "Retirer le document", "Remove Document", "Remove Document", "移除文档"]),
-    ("Report an Issue…", ["Report an Issue…", "Signaler un problème…", "Report an Issue…", "Report an Issue…", "报告问题…"]),
-    ("Reset Shortcuts", ["Reset Shortcuts", "Réinitialiser les raccourcis", "Reset Shortcuts", "Reset Shortcuts", "重置快捷键"]),
-    ("Reset Workspace", ["Reset Workspace", "Réinitialiser l'espace de travail", "Reset Workspace", "Reset Workspace", "重置工作区"]),
-    ("Resize", ["Resize", "Redimensionner", "Resize", "Resize", "调整大小"]),
-    ("Rotate Spread", ["Rotate Spread", "Faire pivoter la planche", "Rotate Spread", "Rotate Spread", "旋转跨页"]),
-    ("Run Script", ["Run Script", "Exécuter le script", "Run Script", "Run Script", "运行脚本"]),
-    ("Sample Document", ["Sample Document", "Document d'exemple", "Sample Document", "Sample Document", "示例文档"]),
-    ("Satin", ["Satin", "Satin", "Satin", "Satin", "光泽"]),
-    (
-        "Save Recovery Data",
-        ["Save Recovery Data", "Enregistrer les données de récupération", "Save Recovery Data", "Save Recovery Data", "保存恢复数据"],
-    ),
-    ("Script Label", ["Script Label", "Étiquette de script", "Script Label", "Script Label", "脚本标签"]),
-    ("Select All on Layer", ["Select All on Layer", "Tout sélectionner sur le calque", "Select All on Layer", "Select All on Layer", "全选当前图层"]),
-    ("Select Cells", ["Select Cells", "Sélectionner les cellules", "Select Cells", "Select Cells", "选择单元格"]),
-    ("Select Column", ["Select Column", "Sélectionner la colonne", "Select Column", "Select Column", "选择列"]),
-    ("Select Frame", ["Select Frame", "Sélectionner le bloc", "Select Frame", "Select Frame", "选择框架"]),
-    ("Select Row", ["Select Row", "Sélectionner la ligne", "Select Row", "Select Row", "选择行"]),
-    ("Select Table", ["Select Table", "Sélectionner le tableau", "Select Table", "Select Table", "选择表格"]),
-    ("Select Text", ["Select Text", "Sélectionner le texte", "Select Text", "Select Text", "选择文本"]),
-    ("Select Tool", ["Select Tool", "Sélectionner un outil", "Select Tool", "Select Tool", "选择工具"]),
-    ("Select Word", ["Select Word", "Sélectionner le mot", "Select Word", "Select Word", "选择单词"]),
-    ("Selection Attributes", ["Selection Attributes", "Attributs de la sélection", "Selection Attributes", "Selection Attributes", "选择属性"]),
-    ("Separations Preview", ["Separations Preview", "Aperçu des séparations", "Separations Preview", "Separations Preview", "分色预览"]),
-    ("Serialize", ["Serialize", "Sérialiser", "Serialize", "Serialize", "序列化"]),
-    ("Set Active Layer", ["Set Active Layer", "Définir le calque actif", "Set Active Layer", "Set Active Layer", "设置活动图层"]),
-    ("Set Shortcut", ["Set Shortcut", "Définir le raccourci", "Set Shortcut", "Set Shortcut", "设置快捷键"]),
-    (
-        "Set Visibility / Lock",
-        ["Set Visibility / Lock", "Définir visibilité / verrouillage", "Set Visibility / Lock", "Set Visibility / Lock", "设置可见性/锁定"],
-    ),
-    ("Show Panel", ["Show Panel", "Afficher le panneau", "Show Panel", "Show Panel", "显示面板"]),
-    (
-        "Show/Hide Baseline Grid",
-        [
-            "Show/Hide Baseline Grid",
-            "Afficher/Masquer la grille de ligne de base",
-            "Show/Hide Baseline Grid",
-            "Show/Hide Baseline Grid",
-            "显示/隐藏基线网格",
-        ],
-    ),
-    (
-        "Show/Hide Document Grid",
-        [
-            "Show/Hide Document Grid",
-            "Afficher/Masquer la grille du document",
-            "Show/Hide Document Grid",
-            "Show/Hide Document Grid",
-            "显示/隐藏文档网格",
-        ],
-    ),
-    (
-        "Show/Hide Frame Edges",
-        ["Show/Hide Frame Edges", "Afficher/Masquer les contours de bloc", "Show/Hide Frame Edges", "Show/Hide Frame Edges", "显示/隐藏框架边缘"],
-    ),
-    ("Show/Hide Guides", ["Show/Hide Guides", "Afficher/Masquer les repères", "Show/Hide Guides", "Show/Hide Guides", "显示/隐藏参考线"]),
-    (
-        "Show/Hide Hidden Characters",
-        [
-            "Show/Hide Hidden Characters",
-            "Afficher/Masquer les caractères masqués",
-            "Show/Hide Hidden Characters",
-            "Show/Hide Hidden Characters",
-            "显示/隐藏隐藏字符",
-        ],
-    ),
-    ("Show/Hide Panels", ["Show/Hide Panels", "Afficher/Masquer les panneaux", "Show/Hide Panels", "Show/Hide Panels", "显示/隐藏面板"]),
-    (
-        "Show/Hide Panels Except Tools",
-        [
-            "Show/Hide Panels Except Tools",
-            "Afficher/Masquer les panneaux sauf Outils",
-            "Show/Hide Panels Except Tools",
-            "Show/Hide Panels Except Tools",
-            "显示/隐藏面板(工具除外)",
-        ],
-    ),
-    ("Show/Hide Rulers", ["Show/Hide Rulers", "Afficher/Masquer les règles", "Show/Hide Rulers", "Show/Hide Rulers", "显示/隐藏标尺"]),
-    (
-        "Show/Hide Tagged Frames",
-        [
-            "Show/Hide Tagged Frames",
-            "Afficher/Masquer les blocs balisés",
-            "Show/Hide Tagged Frames",
-            "Show/Hide Tagged Frames",
-            "显示/隐藏标记的框架",
-        ],
-    ),
-    (
-        "Show/Hide Text Threads",
-        ["Show/Hide Text Threads", "Afficher/Masquer le chaînage du texte", "Show/Hide Text Threads", "Show/Hide Text Threads", "显示/隐藏文本串接"],
-    ),
-    ("Smooth", ["Smooth", "Lisse", "Smooth", "Smooth", "平滑"]),
-    ("Sort", ["Sort", "Trier", "Sort", "Sort", "排序"]),
-    (
-        "Split Cell Horizontally",
-        ["Split Cell Horizontally", "Scinder la cellule horizontalement", "Split Cell Horizontally", "Split Cell Horizontally", "水平拆分单元格"],
-    ),
-    (
-        "Split Cell Vertically",
-        ["Split Cell Vertically", "Scinder la cellule verticalement", "Split Cell Vertically", "Split Cell Vertically", "垂直拆分单元格"],
-    ),
-    ("Split Path", ["Split Path", "Fractionner le tracé", "Split Path", "Split Path", "拆分路径"]),
-    ("Step and Repeat…", ["Step and Repeat…", "Exécuter et répéter…", "Step and Repeat…", "Step and Repeat…", "步进和重复…"]),
-    ("Stroke Styles", ["Stroke Styles", "Styles de contour", "Stroke Styles", "Stroke Styles", "描边样式"]),
-    ("Structure", ["Structure", "Structure", "Structure", "Structure", "结构"]),
-    ("Style Source", ["Style Source", "Source du style", "Style Source", "Style Source", "样式源"]),
-    ("Synchronize Book", ["Synchronize Book", "Synchroniser le livre", "Synchronize Book", "Synchronize Book", "同步书籍"]),
-    ("Table Options", ["Table Options", "Options de tableau", "Table Options", "Table Options", "表选项"]),
-    ("Table Panel", ["Table Panel", "Panneau Tableau", "Table Panel", "Table Panel", "表格面板"]),
-    ("Table Style Options…", ["Table Style Options…", "Options de style de tableau…", "Table Style Options…", "Table Style Options…", "表样式选项…"]),
-    (
-        "Table of Contents Entries",
-        ["Table of Contents Entries", "Entrées de la table des matières", "Table of Contents Entries", "Table of Contents Entries", "目录条目"],
-    ),
-    ("Table of Contents…", ["Table of Contents…", "Table des matières…", "Table of Contents…", "Table of Contents…", "目录…"]),
-    ("Text Anchors", ["Text Anchors", "Ancres de texte", "Text Anchors", "Text Anchors", "文本锚点"]),
-    ("Text Variables", ["Text Variables", "Variables de texte", "Text Variables", "Text Variables", "文本变量"]),
-    ("Toggle Normal/Preview", ["Toggle Normal/Preview", "Basculer Normal/Aperçu", "Toggle Normal/Preview", "Toggle Normal/Preview", "切换正常/预览"]),
-    (
-        "Toggle Presentation",
-        [
-            "Präsentation ein/aus",
-            "Activer/désactiver la présentation",
-            "Activar/desactivar presentación",
-            "プレゼンテーションを切り替え",
-            "切换演示模式",
-        ],
-    ),
-    ("Toggle Selection", ["Toggle Selection", "Basculer la sélection", "Toggle Selection", "Toggle Selection", "切换选择"]),
-    ("Tools: Double Column", ["Tools: Double Column", "Outils : double colonne", "Tools: Double Column", "Tools: Double Column", "工具: 双列"]),
-    ("Transform Again", ["Transform Again", "Répéter la transformation", "Transform Again", "Transform Again", "再次变换"]),
-    ("Transform Panel", ["Transform Panel", "Panneau Transformation", "Transform Panel", "Transform Panel", "变换面板"]),
-    ("Transform Values", ["Transform Values", "Valeurs de transformation", "Transform Values", "Transform Values", "变换值"]),
-    (
-        "Transparency Blend Space",
-        ["Transparency Blend Space", "Espace de fusion de la transparence", "Transparency Blend Space", "Transparency Blend Space", "透明度混合空间"],
-    ),
-    (
-        "Transparency Flattener Presets",
-        [
-            "Transparency Flattener Presets",
-            "Préréglages d'aplatissement de la transparence",
-            "Transparency Flattener Presets",
-            "Transparency Flattener Presets",
-            "透明度拼合器预设",
-        ],
-    ),
-    ("Type on a Path", ["Type on a Path", "Texte curviligne", "Type on a Path", "Type on a Path", "路径文字"]),
-    (
-        "Type on a Path Options…",
-        ["Type on a Path Options…", "Options de texte curviligne…", "Type on a Path Options…", "Type on a Path Options…", "路径文字选项…"],
-    ),
-    ("Typical Display", ["Typical Display", "Affichage standard", "Typical Display", "Typical Display", "典型显示"]),
-    ("UI Scaling", ["UI Scaling", "Mise à l'échelle de l'interface", "UI Scaling", "UI Scaling", "UI 缩放"]),
-    ("Update Link", ["Update Link", "Mettre à jour le lien", "Update Link", "Update Link", "更新链接"]),
-    (
-        "User Dictionary Words",
-        ["User Dictionary Words", "Mots du dictionnaire utilisateur", "User Dictionary Words", "User Dictionary Words", "用户词典单词"],
-    ),
-    ("User Dictionary…", ["User Dictionary…", "Dictionnaire utilisateur…", "User Dictionary…", "User Dictionary…", "用户词典…"]),
-    ("Zoom To", ["Zoom To", "Zoom sur", "Zoom To", "Zoom To", "缩放至"]),
-    ("⇧", ["⇧", "⇧", "⇧", "⇧", "⇧"]),
-    ("⌃", ["⌃", "⌃", "⌃", "⌃", "⌃"]),
-    ("⌘", ["⌘", "⌘", "⌘", "⌘", "⌘"]),
-    ("⌥", ["⌥", "⌥", "⌥", "⌥", "⌥"]),
-    ("Accept Change", ["Accept Change", "Accepter la modification", "Accept Change", "Accept Change", "接受更改"]),
-    ("Add Anchor", ["Add Anchor", "Ajouter un point d'ancrage", "Add Anchor", "Add Anchor", "添加锚点"]),
-    (
-        "Add Selection to Article",
-        ["Add Selection to Article", "Ajouter la sélection à l'article", "Add Selection to Article", "Add Selection to Article", "将选择添加到文章"],
-    ),
-    ("Add Unnamed Colors", ["Add Unnamed Colors", "Ajouter les couleurs sans nom", "Add Unnamed Colors", "Add Unnamed Colors", "添加未命名颜色"]),
-    ("Add to Dictionary", ["Add to Dictionary", "Ajouter au dictionnaire", "Add to Dictionary", "Add to Dictionary", "添加到字典"]),
-    ("Align Center", ["Align Center", "Aligner au centre", "Align Center", "Align Center", "居中对齐"]),
-    ("Align Left", ["Align Left", "Aligner à gauche", "Align Left", "Align Left", "左对齐"]),
-    ("Align Right", ["Align Right", "Aligner à droite", "Align Right", "Align Right", "右对齐"]),
-    (
-        "Apply Character Style",
-        ["Apply Character Style", "Appliquer le style de caractère", "Apply Character Style", "Apply Character Style", "应用字符样式"],
-    ),
-    ("Apply Object Style", ["Apply Object Style", "Appliquer le style d'objet", "Apply Object Style", "Apply Object Style", "应用对象样式"]),
-    (
-        "Apply Paragraph Style",
-        ["Apply Paragraph Style", "Appliquer le style de paragraphe", "Apply Paragraph Style", "Apply Paragraph Style", "应用段落样式"],
-    ),
-    ("Apply Table Style", ["Apply Table Style", "Appliquer le style de tableau", "Apply Table Style", "Apply Table Style", "应用表样式"]),
-    ("Article Options", ["Article Options", "Options d'article", "Article Options", "Article Options", "文章选项"]),
-    ("Basic Feather", ["Basic Feather", "Contour progressif simple", "Basic Feather", "Basic Feather", "基本羽化"]),
-    ("Bold", ["Bold", "Gras", "Bold", "Bold", "加粗"]),
-    ("Bring Forward", ["Bring Forward", "En avant", "Bring Forward", "Bring Forward", "向前移动"]),
-    ("Bring to Front", ["Bring to Front", "Premier plan", "Bring to Front", "Bring to Front", "置于顶层"]),
-    ("Change", ["Change", "Remplacer", "Change", "Change", "更改"]),
-    (
-        "Character Style Options…",
-        ["Character Style Options…", "Options de style de caractère…", "Character Style Options…", "Character Style Options…", "字符样式选项…"],
-    ),
-    ("Close Path", ["Close Path", "Fermer le tracé", "Close Path", "Close Path", "闭合路径"]),
-    ("Color Group Options", ["Color Group Options", "Options du groupe de couleurs", "Color Group Options", "Color Group Options", "颜色组选项"]),
-    ("Column Width", ["Column Width", "Largeur de colonne", "Column Width", "Column Width", "列宽"]),
-    ("Balance Columns", ["Spalten ausgleichen", "Équilibrer les colonnes", "Equilibrar columnas", "段の高さを揃える", "平衡栏高"]),
-    ("Column Rules", ["Spaltenlinien", "Filets de colonne", "Filetes de columna", "段間罫線", "栏间线"]),
-    ("Insert Column Rule", ["Spaltenlinie einfügen", "Insérer un filet de colonne", "Insertar filete de columna", "段間罫線を挿入", "插入栏间线"]),
-    ("Tint %", ["Farbton %", "Teinte %", "Matiz %", "濃淡 %", "色调 %"]),
-    ("Top Inset", ["Oberer Einzug", "Retrait supérieur", "Sangría superior", "上インセット", "顶部内边距"]),
-    ("Bottom Inset", ["Unterer Einzug", "Retrait inférieur", "Sangría inferior", "下インセット", "底部内边距"]),
-    ("Horizontal Offset", ["Horizontaler Versatz", "Décalage horizontal", "Desplazamiento horizontal", "水平オフセット", "水平偏移"]),
-    ("Condition Options…", ["Condition Options…", "Options de condition…", "Condition Options…", "Condition Options…", "条件选项…"]),
-    (
-        "Convert to Liquid Guide",
-        ["Convert to Liquid Guide", "Convertir en repère liquide", "Convert to Liquid Guide", "Convert to Liquid Guide", "转换为自适应参考线"],
-    ),
-    ("Convert to Object", ["Convert to Object", "Convertir en objet", "Convert to Object", "Convert to Object", "转换为对象"]),
-    ("Create Line", ["Create Line", "Créer un trait", "Create Line", "Create Line", "创建线条"]),
-    ("Create Path", ["Create Path", "Créer un tracé", "Create Path", "Create Path", "创建路径"]),
-    ("Decrease Point Size", ["Decrease Point Size", "Diminuer le corps", "Decrease Point Size", "Decrease Point Size", "减小字号"]),
-    ("Delete Article", ["Delete Article", "Supprimer l'article", "Delete Article", "Delete Article", "删除文章"]),
-    ("Delete Bookmark", ["Delete Bookmark", "Supprimer le signet", "Delete Bookmark", "Delete Bookmark", "删除书签"]),
-    ("Delete Endnote", ["Delete Endnote", "Supprimer la note de fin", "Delete Endnote", "Delete Endnote", "删除尾注"]),
-    ("Delete Footnote", ["Delete Footnote", "Supprimer la note de bas de page", "Delete Footnote", "Delete Footnote", "删除脚注"]),
-    ("Delete Guide", ["Delete Guide", "Supprimer le repère", "Delete Guide", "Delete Guide", "删除参考线"]),
-    ("Delete Hyperlink", ["Delete Hyperlink", "Supprimer l'hyperlien", "Delete Hyperlink", "Delete Hyperlink", "删除超链接"]),
-    ("Delete List", ["Delete List", "Supprimer la liste", "Delete List", "Delete List", "删除列表"]),
-    ("Delete Note", ["Delete Note", "Supprimer la note", "Delete Note", "Delete Note", "删除注释"]),
-    ("Delete Pages", ["Delete Pages", "Supprimer les pages", "Delete Pages", "Delete Pages", "删除页面"]),
-    (
-        "Delete Paragraph Style",
-        ["Delete Paragraph Style", "Supprimer le style de paragraphe", "Delete Paragraph Style", "Delete Paragraph Style", "删除段落样式"],
-    ),
-    ("Delete Stroke Style", ["Delete Stroke Style", "Supprimer le style de contour", "Delete Stroke Style", "Delete Stroke Style", "删除描边样式"]),
-    ("Delete Table", ["Delete Table", "Supprimer le tableau", "Delete Table", "Delete Table", "删除表格"]),
-    ("Delete Tag", ["Delete Tag", "Supprimer la balise", "Delete Tag", "Delete Tag", "删除标记"]),
-    ("Delete Text", ["Delete Text", "Supprimer le texte", "Delete Text", "Delete Text", "删除文本"]),
-    (
-        "Distribute Columns Evenly",
-        ["Distribute Columns Evenly", "Répartir les colonnes uniformément", "Distribute Columns Evenly", "Distribute Columns Evenly", "均匀分布列"],
-    ),
-    ("Edit Endnote", ["Edit Endnote", "Modifier la note de fin", "Edit Endnote", "Edit Endnote", "编辑尾注"]),
-    ("Edit Note", ["Edit Note", "Modifier la note", "Edit Note", "Edit Note", "编辑注释"]),
-    ("Embed Link", ["Embed Link", "Incorporer le lien", "Embed Link", "Embed Link", "嵌入链接"]),
-    ("Fill", ["Fill", "Fond", "Fill", "Fill", "填色"]),
-    (
-        "Fill with Placeholder Text",
-        [
-            "Fill with Placeholder Text",
-            "Remplir avec le texte de substitution",
-            "Fill with Placeholder Text",
-            "Fill with Placeholder Text",
-            "用占位符文本填充",
-        ],
-    ),
-    ("Flip", ["Flip", "Retourner", "Flip", "Flip", "翻转"]),
-    ("Hyperlink Options…", ["Hyperlink Options…", "Options d'hyperlien…", "Hyperlink Options…", "Hyperlink Options…", "超链接选项…"]),
-    ("Increase Point Size", ["Increase Point Size", "Augmenter le corps", "Increase Point Size", "Increase Point Size", "增大字号"]),
-    ("Insert Column Left", ["Insert Column Left", "Insérer une colonne à gauche", "Insert Column Left", "Insert Column Left", "在左侧插入列"]),
-    ("Insert Column Right", ["Insert Column Right", "Insérer une colonne à droite", "Insert Column Right", "Insert Column Right", "在右侧插入列"]),
-    ("Insert Row Above", ["Insert Row Above", "Insérer une ligne au-dessus", "Insert Row Above", "Insert Row Above", "在上方插入行"]),
-    ("Insert Row Below", ["Insert Row Below", "Insérer une ligne en dessous", "Insert Row Below", "Insert Row Below", "在下方插入行"]),
-    ("Italic", ["Italic", "Italique", "Italic", "Italic", "斜体"]),
-    ("Justify Left", ["Justify Left", "Justifier à gauche", "Justify Left", "Justify Left", "左对齐齐行"]),
-    ("Layer Options…", ["Layer Options…", "Options de calque…", "Layer Options…", "Layer Options…", "图层选项…"]),
-    ("Move", ["Move", "Déplacer", "Move", "Move", "移动"]),
-    ("Move Anchors", ["Move Anchors", "Déplacer les points d'ancrage", "Move Anchors", "Move Anchors", "移动锚点"]),
-    ("Move Column", ["Move Column", "Déplacer la colonne", "Move Column", "Move Column", "移动列"]),
-    ("Move Guide", ["Move Guide", "Déplacer le repère", "Move Guide", "Move Guide", "移动参考线"]),
-    ("Move Layer", ["Move Layer", "Déplacer le calque", "Move Layer", "Move Layer", "移动图层"]),
-    ("Move Pages…", ["Move Pages…", "Déplacer des pages…", "Move Pages…", "Move Pages…", "移动页面…"]),
-    ("Move to Layer", ["Move to Layer", "Déplacer vers le calque", "Move to Layer", "Move to Layer", "移动到图层"]),
-    ("New Article", ["New Article", "Nouvel article", "New Article", "New Article", "新建文章"]),
-    ("New Bookmark", ["New Bookmark", "Nouveau signet", "New Bookmark", "New Bookmark", "新建书签"]),
-    (
-        "New Character Style…",
-        ["New Character Style…", "Nouveau style de caractère…", "New Character Style…", "New Character Style…", "新建字符样式…"],
-    ),
-    ("New Layer…", ["New Layer…", "Nouveau calque…", "New Layer…", "New Layer…", "新建图层…"]),
-    ("New Note", ["New Note", "Nouvelle note", "New Note", "New Note", "新建注释"]),
-    ("New Object Style…", ["New Object Style…", "Nouveau style d'objet…", "New Object Style…", "New Object Style…", "新建对象样式…"]),
-    ("New Parent…", ["New Parent…", "Nouveau gabarit…", "New Parent…", "New Parent…", "新建主页…"]),
-    ("New Tag", ["New Tag", "Nouvelle balise", "New Tag", "New Tag", "新建标记"]),
-    ("Opacity", ["Opacity", "Opacité", "Opacity", "Opacity", "不透明度"]),
-    ("Paste in Place", ["Paste in Place", "Coller sur place", "Paste in Place", "Paste in Place", "原位粘贴"]),
-    (
-        "Place Loaded Graphic",
-        ["Place Loaded Graphic", "Importer le graphique chargé", "Place Loaded Graphic", "Place Loaded Graphic", "置入已加载的图形"],
-    ),
-    ("Reject Change", ["Reject Change", "Refuser la modification", "Reject Change", "Reject Change", "拒绝更改"]),
-    (
-        "Release State to Objects",
-        ["Release State to Objects", "Libérer l'état en objets", "Release State to Objects", "Release State to Objects", "将状态释放为对象"],
-    ),
-    (
-        "Remove Hyphenation Exception",
-        [
-            "Remove Hyphenation Exception",
-            "Supprimer l'exception de césure",
-            "Remove Hyphenation Exception",
-            "Remove Hyphenation Exception",
-            "移除断字例外",
-        ],
-    ),
-    ("Remove from Article", ["Remove from Article", "Retirer de l'article", "Remove from Article", "Remove from Article", "从文章中移除"]),
-    ("Rename", ["Rename", "Renommer", "Rename", "Rename", "重命名"]),
-    ("Rename Bookmark", ["Rename Bookmark", "Renommer le signet", "Rename Bookmark", "Rename Bookmark", "重命名书签"]),
-    ("Rotate", ["Rotate", "Rotation", "Rotate", "Rotate", "旋转"]),
-    ("Row Height", ["Row Height", "Hauteur de ligne", "Row Height", "Row Height", "行高"]),
-    ("Scale", ["Scale", "Échelle", "Scale", "Scale", "缩放"]),
-    ("Send Backward", ["Send Backward", "En arrière", "Send Backward", "Send Backward", "向后移动"]),
-    ("Send to Back", ["Send to Back", "Arrière-plan", "Send to Back", "Send to Back", "置于底层"]),
-    (
-        "Set Cross-Reference Format",
-        [
-            "Set Cross-Reference Format",
-            "Définir le format de référence croisée",
-            "Set Cross-Reference Format",
-            "Set Cross-Reference Format",
-            "设置交叉引用格式",
-        ],
-    ),
-    (
-        "Set Footnote Text",
-        ["Set Footnote Text", "Définir le texte de la note de bas de page", "Set Footnote Text", "Set Footnote Text", "设置脚注文本"],
-    ),
-    ("Set Story Text", ["Set Story Text", "Définir le texte de l'article", "Set Story Text", "Set Story Text", "设置文章文本"]),
-    ("Shear", ["Shear", "Déformation", "Shear", "Shear", "切变"]),
-    ("Show All on Spread", ["Show All on Spread", "Tout afficher sur la planche", "Show All on Spread", "Show All on Spread", "在跨页上全部显示"]),
-    ("Show State", ["Show State", "Afficher l'état", "Show State", "Show State", "显示状态"]),
-    ("State Options", ["State Options", "Options d'état", "State Options", "State Options", "状态选项"]),
-    ("Tag Frame", ["Tag Frame", "Baliser le bloc", "Tag Frame", "Tag Frame", "标记框架"]),
-    ("Tag Text", ["Tag Text", "Baliser le texte", "Tag Text", "Tag Text", "标记文本"]),
-    ("Track Changes", ["Track Changes", "Suivi des modifications", "Track Changes", "Track Changes", "修订"]),
-    ("Unlink", ["Unlink", "Délier", "Unlink", "Unlink", "取消链接"]),
-    (
-        "Unlock All on Spread",
-        ["Unlock All on Spread", "Tout déverrouiller sur la planche", "Unlock All on Spread", "Unlock All on Spread", "解锁跨页上的所有内容"],
-    ),
-    ("Update Index", ["Update Index", "Mettre à jour l'index", "Update Index", "Update Index", "更新索引"]),
-    (
-        "Update Table of Contents",
-        ["Update Table of Contents", "Mettre à jour la table des matières", "Update Table of Contents", "Update Table of Contents", "更新目录"],
-    ),
-    (
-        "Bulleted and Numbered Lists",
-        [
-            "Bulleted and Numbered Lists",
-            "Listes à puces et numérotées",
-            "Bulleted and Numbered Lists",
-            "Bulleted and Numbered Lists",
-            "项目符号和编号列表",
-        ],
-    ),
-    (
-        "Insert Special Character",
-        ["Insert Special Character", "Insérer un caractère spécial", "Insert Special Character", "Insert Special Character", "插入特殊字符"],
-    ),
-    ("Insert White Space", ["Insert White Space", "Insérer un espace", "Insert White Space", "Insert White Space", "插入空格"]),
-    (
-        "Insert Break Character",
-        ["Insert Break Character", "Insérer un caractère de saut", "Insert Break Character", "Insert Break Character", "插入分隔符"],
-    ),
-    (
-        "Hyperlinks Cross-References",
-        [
-            "Hyperlinks Cross-References",
-            "Hyperliens et références croisées",
-            "Hyperlinks Cross-References",
-            "Hyperlinks Cross-References",
-            "超链接交叉引用",
-        ],
-    ),
-    (
-        "Document Footnote Options...",
-        [
-            "Document Footnote Options...",
-            "Options de notes de bas de page du document...",
-            "Document Footnote Options...",
-            "Document Footnote Options...",
-            "文档脚注选项…",
-        ],
-    ),
-    ("  Close  ", ["  Close  ", "  Fermer  ", "  Close  ", "  Close  ", "  关闭  "]),
-    ("  New file  ", ["  New file  ", "  Nouveau fichier  ", "  New file  ", "  New file  ", "  新建文件  "]),
-    ("  OK  ", ["  OK  ", "  OK  ", "  OK  ", "  OK  ", "  确定  "]),
-    ("  Open  ", ["  Open  ", "  Ouvrir  ", "  Open  ", "  Open  ", "  打开  "]),
-    (
-        "  Open sample magazine  ",
-        ["  Open sample magazine  ", "  Ouvrir un magazine d'exemple  ", "  Open sample magazine  ", "  Open sample magazine  ", "  打开示例杂志  "],
-    ),
-    ("(Top Level)", ["(Top Level)", "(Niveau supérieur)", "(Top Level)", "(Top Level)", "(顶层)"]),
-    ("(import)", ["(import)", "(importation)", "(import)", "(import)", "(导入)"]),
-    ("Anchored Object", ["Anchored Object", "Objet ancré", "Anchored Object", "Anchored Object", "锚定对象"]),
-    (
-        "Apply Attributes (Eyedropper",
-        [
-            "Apply Attributes (Eyedropper",
-            "Appliquer les attributs (Pipette",
-            "Apply Attributes (Eyedropper",
-            "Apply Attributes (Eyedropper",
-            "应用属性 (吸管",
-        ],
-    ),
-    ("Baseline Grid", ["Baseline Grid", "Grille de ligne de base", "Baseline Grid", "Baseline Grid", "基线网格"]),
-    ("Bleed and Slug", ["Bleed and Slug", "Fond perdu et ligne-bloc", "Bleed and Slug", "Bleed and Slug", "出血和辅助信息区"]),
-    (
-        "Buttons act in interactive PDF export.",
-        [
-            "Buttons act in interactive PDF export.",
-            "Les boutons sont actifs dans l'export PDF interactif.",
-            "Buttons act in interactive PDF export.",
-            "Buttons act in interactive PDF export.",
-            "按钮在交互式 PDF 导出中起作用。",
-        ],
-    ),
-    ("Captions", ["Captions", "Légendes", "Captions", "Captions", "题注"]),
-    ("Change All (Object", ["Change All (Object", "Tout remplacer (objet", "Change All (Object", "Change All (Object", "全部更改 (对象"]),
-    ("Character Settings", ["Character Settings", "Réglages des caractères", "Character Settings", "Character Settings", "字符设置"]),
-    ("Choose a link.", ["Choose a link.", "Choisissez un lien.", "Choose a link.", "Choose a link.", "选择一个链接。"]),
-    ("Clipping Path", ["Clipping Path", "Masque", "Clipping Path", "Clipping Path", "剪切路径"]),
-    (
-        "Collect objects with the Content Collector (B); place them with the Content Placer.",
-        [
-            "Collect objects with the Content Collector (B); place them with the Content Placer.",
-            "Collectez des objets avec l'outil Collecteur de contenu (B) ; placez-les avec l'outil Placeur de contenu.",
-            "Collect objects with the Content Collector (B); place them with the Content Placer.",
-            "Collect objects with the Content Collector (B); place them with the Content Placer.",
-            "使用内容收集器 (B) 收集对象；使用内容放置器放置它们。",
-        ],
-    ),
-    ("Content Fitting", ["Content Fitting", "Ajustement du contenu", "Content Fitting", "Content Fitting", "内容适合"]),
-    ("Convert Cell Type", ["Convert Cell Type", "Convertir le type de cellule", "Convert Cell Type", "Convert Cell Type", "转换单元格类型"]),
-    ("Copy Link(s", ["Copy Link(s", "Copier lien(s", "Copy Link(s", "Copy Link(s", "复制链接("]),
-    (
-        "Create Alternate Layout",
-        ["Create Alternate Layout", "Créer une variante de mise en page", "Create Alternate Layout", "Create Alternate Layout", "创建替代版面"],
-    ),
-    ("Crop Amount", ["Crop Amount", "Valeur de recadrage", "Crop Amount", "Crop Amount", "裁剪量"]),
-    (
-        "Cross-Reference Format",
-        ["Cross-Reference Format", "Format de référence croisée", "Cross-Reference Format", "Cross-Reference Format", "交叉引用格式"],
-    ),
-    ("Delete Workspace", ["Delete Workspace", "Supprimer l'espace de travail", "Delete Workspace", "Delete Workspace", "删除工作区"]),
-    ("DesignCraft", ["DesignCraft", "DesignCraft", "DesignCraft", "DesignCraft", "DesignCraft"]),
-    ("Display Performance", ["Display Performance", "Performances d'affichage", "Display Performance", "Display Performance", "显示性能"]),
-    ("Document Grid", ["Document Grid", "Grille du document", "Document Grid", "Document Grid", "文档网格"]),
-    (
-        "Document Recovery Data",
-        ["Document Recovery Data", "Données de récupération du document", "Document Recovery Data", "Document Recovery Data", "文档恢复数据"],
-    ),
-    ("EPUB and HTML", ["EPUB and HTML", "EPUB et HTML", "EPUB and HTML", "EPUB and HTML", "EPUB 和 HTML"]),
-    ("Export", ["Export", "Exporter", "Export", "Export", "导出"]),
-    (
-        "Export EPUB (Fixed Layout",
-        [
-            "Export EPUB (Fixed Layout",
-            "Exporter en EPUB (mise en page fixe",
-            "Export EPUB (Fixed Layout",
-            "Export EPUB (Fixed Layout",
-            "导出 EPUB (固定版面",
-        ],
-    ),
-    (
-        "Export EPUB (Reflowable",
-        ["Export EPUB (Reflowable", "Exporter en EPUB (redistribuable", "Export EPUB (Reflowable", "Export EPUB (Reflowable", "导出 EPUB (可回流"],
-    ),
-    ("Facing Pages", ["Facing Pages", "Pages en vis-à-vis", "Facing Pages", "Facing Pages", "对页"]),
-    ("GREP Styles", ["GREP Styles", "Styles GREP", "GREP Styles", "GREP Styles", "GREP 样式"]),
-    (
-        "Get help, share your layouts and shape what we build next.",
-        [
-            "Get help, share your layouts and shape what we build next.",
-            "Obtenez de l'aide, partagez vos mises en page et influencez ce que nous construirons ensuite.",
-            "Get help, share your layouts and shape what we build next.",
-            "Get help, share your layouts and shape what we build next.",
-            "获取帮助，分享您的布局，共同塑造我们的未来。",
-        ],
-    ),
-    ("Highlight", ["Highlight", "Surlignage", "Highlight", "Highlight", "高亮显示"]),
-    (
-        "Hyperlinks & Cross-References",
-        [
-            "Hyperlinks & Cross-References",
-            "Hyperliens et références croisées",
-            "Hyperlinks & Cross-References",
-            "Hyperlinks & Cross-References",
-            "超链接和交叉引用",
-        ],
-    ),
-    ("Hyphens and Dashes", ["Hyphens and Dashes", "Traits d'union et tirets", "Hyphens and Dashes", "Hyphens and Dashes", "连字符和破折号"]),
-    ("Interactive", ["Interactive", "Interactif", "Interactive", "Interactive", "交互式"]),
-    ("Invert", ["Invert", "Inverser", "Invert", "Invert", "反相"]),
-    (
-        "Join the ArtCraft community",
-        [
-            "Join the ArtCraft community",
-            "Rejoindre la communauté ArtCraft",
-            "Join the ArtCraft community",
-            "Join the ArtCraft community",
-            "加入 ArtCraft 社区",
-        ],
-    ),
-    ("Keyboard Increments", ["Keyboard Increments", "Incréments au clavier", "Keyboard Increments", "Keyboard Increments", "键盘增量"]),
-    ("Liquid guides", ["Liquid guides", "Repères liquides", "Liquid guides", "Liquid guides", "自适应参考线"]),
-    ("Markers", ["Markers", "Marqueurs", "Markers", "Markers", "标记"]),
-    ("More ArtCraft apps", ["More ArtCraft apps", "Autres applications ArtCraft", "More ArtCraft apps", "More ArtCraft apps", "更多 ArtCraft 应用"]),
-    ("Nested Line Styles", ["Nested Line Styles", "Styles de ligne imbriqués", "Nested Line Styles", "Nested Line Styles", "嵌套行样式"]),
-    ("Nested Styles", ["Nested Styles", "Styles imbriqués", "Nested Styles", "Nested Styles", "嵌套样式"]),
-    (
-        "No articles: exports follow page order.",
-        [
-            "No articles: exports follow page order.",
-            "Aucun article : les exports suivent l'ordre des pages.",
-            "No articles: exports follow page order.",
-            "No articles: exports follow page order.",
-            "没有文章：导出遵循页面顺序。",
-        ],
-    ),
-    ("No book open.", ["No book open.", "Aucun livre ouvert.", "No book open.", "No book open.", "没有打开的书籍。"]),
-    (
-        "No bookmarks. They become the PDF outline.",
-        [
-            "No bookmarks. They become the PDF outline.",
-            "Aucun signet. Ils forment le plan du PDF.",
-            "No bookmarks. They become the PDF outline.",
-            "No bookmarks. They become the PDF outline.",
-            "没有书签。它们将成为 PDF 大纲。",
-        ],
-    ),
-    ("No changes.", ["No changes.", "Aucune modification.", "No changes.", "No changes.", "没有更改。"]),
-    (
-        "No conditions. Create one, then select text and click it to apply.",
-        [
-            "No conditions. Create one, then select text and click it to apply.",
-            "Aucune condition. Créez-en une, puis sélectionnez du texte et cliquez dessus pour l'appliquer.",
-            "No conditions. Create one, then select text and click it to apply.",
-            "No conditions. Create one, then select text and click it to apply.",
-            "没有条件。创建一个条件，然后选择文本并单击以应用。",
-        ],
-    ),
-    ("No document open", ["No document open", "Aucun document ouvert", "No document open", "No document open", "未打开任何文档"]),
-    ("No document.", ["No document.", "Aucun document.", "No document.", "No document.", "没有文档。"]),
-    (
-        "No hyperlinks. Select text or a frame, type a URL and click New.",
-        [
-            "No hyperlinks. Select text or a frame, type a URL and click New.",
-            "Aucun hyperlien. Sélectionnez du texte ou un bloc, saisissez une URL et cliquez sur Nouveau.",
-            "No hyperlinks. Select text or a frame, type a URL and click New.",
-            "No hyperlinks. Select text or a frame, type a URL and click New.",
-            "没有超链接。选择文本或框架，键入 URL，然后单击新建。",
-        ],
-    ),
-    ("No library open.", ["No library open.", "Aucune bibliothèque ouverte.", "No library open.", "No library open.", "没有打开的库。"]),
-    (
-        "No notes in this document.",
-        [
-            "No notes in this document.",
-            "Aucune note dans ce document.",
-            "No notes in this document.",
-            "No notes in this document.",
-            "本文档中没有注释。",
-        ],
-    ),
-    ("No placed graphics.", ["No placed graphics.", "Aucun graphique importé.", "No placed graphics.", "No placed graphics.", "没有置入的图形。"]),
-    (
-        "No scripts. Add one below.",
-        [
-            "No scripts. Add one below.",
-            "Aucun script. Ajoutez-en un ci-dessous.",
-            "No scripts. Add one below.",
-            "No scripts. Add one below.",
-            "没有脚本。在下方添加一个。",
-        ],
-    ),
-    (
-        "No text anchors in this document.",
-        [
-            "No text anchors in this document.",
-            "Aucune ancre de texte dans ce document.",
-            "No text anchors in this document.",
-            "No text anchors in this document.",
-            "本文档中没有文本锚点。",
-        ],
-    ),
-    (
-        "OK changes all: text and paragraph/character styles.",
-        [
-            "OK changes all: text and paragraph/character styles.",
-            "OK modifie tout : texte et styles de paragraphe/caractère.",
-            "OK changes all: text and paragraph/character styles.",
-            "OK changes all: text and paragraph/character styles.",
-            "确定将更改所有：文本和段落/字符样式。",
-        ],
-    ),
-    ("OVERSET", ["OVERSET", "EN EXCÈS", "OVERSET", "OVERSET", "溢流"]),
-    (
-        "Open source. No telemetry.",
-        [
-            "Open source. No telemetry.",
-            "Open source. Aucune télémétrie.",
-            "Open source. No telemetry.",
-            "Open source. No telemetry.",
-            "开源。无遥测。",
-        ],
-    ),
-    ("Options", ["Options", "Options", "Options", "Options", "选项"]),
-    (
-        "Options for Black on RGB and Grayscale Devices",
-        [
-            "Options for Black on RGB and Grayscale Devices",
-            "Options du noir sur les périphériques RVB et en niveaux de gris",
-            "Options for Black on RGB and Grayscale Devices",
-            "Options for Black on RGB and Grayscale Devices",
-            "RGB 和灰度设备上的黑色选项",
-        ],
-    ),
-    ("Other", ["Other", "Autre", "Other", "Other", "其他"]),
-    ("Output", ["Output", "Sortie", "Output", "Output", "输出"]),
-    ("Page Numbering", ["Page Numbering", "Numérotation des pages", "Page Numbering", "Page Numbering", "页码编排"]),
-    (
-        "Page layout for print and screen — fast, open and scriptable.",
-        [
-            "Page layout for print and screen — fast, open and scriptable.",
-            "Mise en page pour l'impression et l'écran : rapide, ouverte, scriptable.",
-            "Page layout for print and screen — fast, open and scriptable.",
-            "Page layout for print and screen — fast, open and scriptable.",
-            "用于打印和屏幕的页面布局——快速、开放且可编写脚本。",
-        ],
-    ),
-    ("Page · PPI", ["Page · PPI", "Page · PPP", "Page · PPI", "Page · PPI", "页面 · PPI"]),
-    (
-        "Part of the ArtCraft suite of open creative tools.",
-        [
-            "Part of the ArtCraft suite of open creative tools.",
-            "Fait partie de la suite ArtCraft d'outils créatifs ouverts.",
-            "Part of the ArtCraft suite of open creative tools.",
-            "Part of the ArtCraft suite of open creative tools.",
-            "ArtCraft 开源创意工具套件的一部分。",
-        ],
-    ),
-    ("Pasteboard Options", ["Pasteboard Options", "Options de la table de montage", "Pasteboard Options", "Pasteboard Options", "粘贴板选项"]),
-    ("Paths", ["Paths", "Tracés", "Paths", "Paths", "路径"]),
-    (
-        "Place the insertion point in a table, or create one.",
-        [
-            "Place the insertion point in a table, or create one.",
-            "Placez le point d'insertion dans un tableau ou créez-en un.",
-            "Place the insertion point in a table, or create one.",
-            "Place the insertion point in a table, or create one.",
-            "将插入点置于表格中，或创建一个表格。",
-        ],
-    ),
-    (
-        "Plays in EPUB export; print and PDF show the poster.",
-        [
-            "Plays in EPUB export; print and PDF show the poster.",
-            "Lu dans l'export EPUB ; l'impression et le PDF montrent l'affiche.",
-            "Plays in EPUB export; print and PDF show the poster.",
-            "Plays in EPUB export; print and PDF show the poster.",
-            "在 EPUB 导出中播放；打印和 PDF 显示海报。",
-        ],
-    ),
-    ("Quotation Marks", ["Quotation Marks", "Guillemets", "Quotation Marks", "Quotation Marks", "引号"]),
-    ("Recently Used", ["Recently Used", "Récemment utilisés", "Recently Used", "Recently Used", "最近使用"]),
-    ("Replace With", ["Replace With", "Remplacer par", "Replace With", "Replace With", "替换为"]),
-    (
-        "Right-click: stroke, groups",
-        [
-            "Right-click: stroke, groups",
-            "Clic droit : contour, groupes",
-            "Right-click: stroke, groups",
-            "Right-click: stroke, groups",
-            "右键单击：描边、组",
-        ],
-    ),
-    ("Ruler Units", ["Ruler Units", "Unités des règles", "Ruler Units", "Ruler Units", "标尺单位"]),
-    ("Origin:", ["Ursprung:", "Origine :", "Origen:", "原点:", "原点:"]),
-    ("Spine", ["Bund", "Dos", "Lomo", "ノド", "书脊"]),
-    ("Lock Zero Point", ["Nullpunkt fixieren", "Verrouiller le point zéro", "Bloquear punto cero", "ゼロ点をロック", "锁定零点"]),
-    ("Unlock Zero Point", ["Nullpunkt lösen", "Déverrouiller le point zéro", "Desbloquear punto cero", "ゼロ点のロックを解除", "解锁零点"]),
-    (
-        "Saves which bars show and where the panels are.",
-        [
-            "Saves which bars show and where the panels are.",
-            "Enregistre les barres affichées et l'emplacement des panneaux.",
-            "Saves which bars show and where the panels are.",
-            "Saves which bars show and where the panels are.",
-            "保存显示哪些栏以及面板所在的位置。",
-        ],
-    ),
-    (
-        "Select a placed video or sound (File › Place a .mp4, .mov, .mp3, .wav …).",
-        [
-            "Select a placed video or sound (File › Place a .mp4, .mov, .mp3, .wav …).",
-            "Sélectionnez une vidéo ou un son importé (Fichier › Importer un .mp4, .mov, .mp3, .wav …).",
-            "Select a placed video or sound (File › Place a .mp4, .mov, .mp3, .wav …).",
-            "Select a placed video or sound (File › Place a .mp4, .mov, .mp3, .wav …).",
-            "选择已置入的视频或声音 (文件 › 置入 .mp4, .mov, .mp3, .wav …)。",
-        ],
-    ),
-    (
-        "Select an object or text to color its fill or stroke.",
-        [
-            "Select an object or text to color its fill or stroke.",
-            "Sélectionnez un objet ou du texte pour colorer son fond ou son contour.",
-            "Select an object or text to color its fill or stroke.",
-            "Select an object or text to color its fill or stroke.",
-            "选择一个对象或文本以设置其填色或描边颜色。",
-        ],
-    ),
-    (
-        "Select an object to give its fill a gradient.",
-        [
-            "Select an object to give its fill a gradient.",
-            "Sélectionnez un objet pour appliquer un dégradé à son fond.",
-            "Select an object to give its fill a gradient.",
-            "Select an object to give its fill a gradient.",
-            "选择一个对象以为其填色应用渐变。",
-        ],
-    ),
-    (
-        "Select an object to make it a button.",
-        [
-            "Select an object to make it a button.",
-            "Sélectionnez un objet pour en faire un bouton.",
-            "Select an object to make it a button.",
-            "Select an object to make it a button.",
-            "选择一个对象使其成为按钮。",
-        ],
-    ),
-    (
-        "Select two or more objects (or a group) to make a multi-state object.",
-        [
-            "Select two or more objects (or a group) to make a multi-state object.",
-            "Sélectionnez au moins deux objets (ou un groupe) pour créer un objet à états multiples.",
-            "Select two or more objects (or a group) to make a multi-state object.",
-            "Select two or more objects (or a group) to make a multi-state object.",
-            "选择两个或多个对象 (或一个组) 以制作多状态对象。",
-        ],
-    ),
-    ("Show", ["Show", "Afficher", "Show", "Show", "显示"]),
-    ("Smart Text Reflow", ["Smart Text Reflow", "Redistribution intelligente du texte", "Smart Text Reflow", "Smart Text Reflow", "智能文本重排"]),
-    ("Spelling", ["Spelling", "Orthographe", "Spelling", "Spelling", "拼写"]),
-    ("Start a new document", ["Start a new document", "Créer un nouveau document", "Start a new document", "Start a new document", "开始新文档"]),
-    ("Status", ["Status", "État", "Status", "Status", "状态"]),
-    ("Style Mapping", ["Style Mapping", "Association de styles", "Style Mapping", "Style Mapping", "样式映射"]),
-    ("Style Name Conflicts", ["Style Name Conflicts", "Conflits de noms de style", "Style Name Conflicts", "Style Name Conflicts", "样式名称冲突"]),
-    ("Symbols", ["Symbols", "Symboles", "Symbols", "Symbols", "符号"]),
-    ("System default", ["System default", "Valeur par défaut du système", "System default", "System default", "系统默认"]),
-    ("Table Dimensions", ["Table Dimensions", "Dimensions du tableau", "Table Dimensions", "Table Dimensions", "表格尺寸"]),
-    (
-        "Text Display Options",
-        ["Text Display Options", "Options d'affichage du texte", "Text Display Options", "Text Display Options", "文本显示选项"],
-    ),
-    (
-        "The fill isn't a gradient.",
-        ["The fill isn't a gradient.", "Le fond n'est pas un dégradé.", "The fill isn't a gradient.", "The fill isn't a gradient.", "填色不是渐变。"],
-    ),
-    (
-        "The library is empty. Select objects and Add Selection.",
-        [
-            "The library is empty. Select objects and Add Selection.",
-            "La bibliothèque est vide. Sélectionnez des objets et utilisez Ajouter la sélection.",
-            "The library is empty. Select objects and Add Selection.",
-            "The library is empty. Select objects and Add Selection.",
-            "库为空。选择对象并添加所选内容。",
-        ],
-    ),
-    (
-        "Transitions play in interactive PDF (full-screen mode).",
-        [
-            "Transitions play in interactive PDF (full-screen mode).",
-            "Les transitions sont lues dans le PDF interactif (mode plein écran).",
-            "Transitions play in interactive PDF (full-screen mode).",
-            "Transitions play in interactive PDF (full-screen mode).",
-            "在交互式 PDF (全屏模式) 中播放过渡。",
-        ],
-    ),
-    ("Type & Tables", ["Type & Tables", "Texte et tableaux", "Type & Tables", "Type & Tables", "文字和表格"]),
-    ("Type Options", ["Type Options", "Options de texte", "Type Options", "Type Options", "文字选项"]),
-    (
-        "Type a word with ~ at each allowed break (ex~am~ple); without ~ the word is never hyphenated.",
-        [
-            "Type a word with ~ at each allowed break (ex~am~ple); without ~ the word is never hyphenated.",
-            "Saisissez un mot avec ~ à chaque coupure autorisée (ex~em~ple) ; sans ~, le mot n'est jamais coupé.",
-            "Type a word with ~ at each allowed break (ex~am~ple); without ~ the word is never hyphenated.",
-            "Type a word with ~ at each allowed break (ex~am~ple); without ~ the word is never hyphenated.",
-            "在每个允许的断字处用 ~ 键入一个单词 (例如 ex~am~ple)；如果没有 ~，该单词将永远不会断字。",
-        ],
-    ),
-    (
-        "User Dictionary (this document)",
-        [
-            "User Dictionary (this document)",
-            "Dictionnaire utilisateur (ce document)",
-            "User Dictionary (this document)",
-            "User Dictionary (this document)",
-            "用户词典 (本文档)",
-        ],
-    ),
-    ("Utilities", ["Utilities", "Utilitaires", "Utilities", "Utilities", "实用程序"]),
-    ("Variable Font", ["Variable Font", "Police variable", "Variable Font", "Variable Font", "可变字体"]),
-    (
-        "Welcome to DesignCraft",
-        ["Welcome to DesignCraft", "Bienvenue dans DesignCraft", "Welcome to DesignCraft", "Welcome to DesignCraft", "欢迎使用 DesignCraft"],
-    ),
-    ("When Scaling", ["When Scaling", "Lors du redimensionnement", "When Scaling", "When Scaling", "缩放时"]),
-    ("[Basic] (working) ▾", ["[Basic] (working) ▾", "[De base] (de travail) ▾", "[Basic] (working) ▾", "[Basic] (working) ▾", "[基本] (工作区) ▾"]),
-    ("[Black] Overprint", ["[Black] Overprint", "Surimpression de [Noir]", "[Black] Overprint", "[Black] Overprint", "[黑] 叠印"]),
-    ("[No Group]", ["[No Group]", "[Aucun groupe]", "[No Group]", "[No Group]", "[无组]"]),
-    ("[None]", ["[None]", "[Aucun]", "[None]", "[None]", "[无]"]),
-    (
-        "[None] — choose a colour on the ramp.",
-        [
-            "[None] — choose a colour on the ramp.",
-            "[Aucun] : choisissez une couleur sur le spectre.",
-            "[None] — choose a colour on the ramp.",
-            "[None] — choose a colour on the ramp.",
-            "[无] — 在色带上选择一种颜色。",
-        ],
-    ),
-    (
-        "discord.gg/artcraft — help, feedback and show-and-tell",
-        [
-            "discord.gg/artcraft — help, feedback and show-and-tell",
-            "discord.gg/artcraft : aide, retours et présentation de vos créations",
-            "discord.gg/artcraft — help, feedback and show-and-tell",
-            "discord.gg/artcraft — help, feedback and show-and-tell",
-            "discord.gg/artcraft — 帮助、反馈和展示",
-        ],
-    ),
-    (
-        "⌥-click clears overrides",
-        ["⌥-click clears overrides", "⌥-clic efface les remplacements", "⌥-click clears overrides", "⌥-click clears overrides", "⌥-单击清除覆盖"],
-    ),
-    (
-        "Alt-click clears overrides",
-        [
-            "Alt-Klick entfernt Abweichungen",
-            "Alt-clic efface les remplacements",
-            "Alt-clic borra las modificaciones",
-            "Alt を押しながらクリックするとオーバーライドを消去します",
-            "Alt-单击清除覆盖",
-        ],
-    ),
-    (
-        "Apply \"{name}\", Clear Overrides",
-        [
-            "„{name}“ anwenden, Abweichungen löschen",
-            "Appliquer « {name} », effacer les remplacements",
-            "Aplicar \"{name}\", borrar modificaciones",
-            "\"{name}\" を適用、オーバーライドを消去",
-            "应用\"{name}\"，清除覆盖",
-        ],
-    ),
-    ("⚠ out of date", ["⚠ out of date", "⚠ obsolète", "⚠ out of date", "⚠ out of date", "⚠ 已过期"]),
-    ("General", ["General", "Général", "General", "General", "常规"]),
-    (
-        "Basic Character Formats",
-        ["Basic Character Formats", "Formats de caractère de base", "Basic Character Formats", "Basic Character Formats", "基本字符格式"],
-    ),
-    ("Indents and Spacing", ["Indents and Spacing", "Retraits et espacement", "Indents and Spacing", "Indents and Spacing", "缩进和间距"]),
-    ("Hyphenation", ["Hyphenation", "Césure", "Hyphenation", "Hyphenation", "断字"]),
-    ("Justification", ["Blocksatzeinstellungen", "Justification", "Justificación", "両端揃え", "两端对齐"]),
-    (
-        "Drop Caps and Nested Styles",
-        [
-            "Drop Caps and Nested Styles",
-            "Lettrines et styles imbriqués",
-            "Drop Caps and Nested Styles",
-            "Drop Caps and Nested Styles",
-            "首字下沉和嵌套样式",
-        ],
-    ),
-    ("GREP Style", ["GREP Style", "Style GREP", "GREP Style", "GREP Style", "GREP 样式"]),
-    ("Character Color", ["Character Color", "Couleur du caractère", "Character Color", "Character Color", "字符颜色"]),
-    (
-        "Numbering and Formatting",
-        ["Numbering and Formatting", "Numérotation et mise en forme", "Numbering and Formatting", "Numbering and Formatting", "编号和格式"],
-    ),
-    ("Spacing Options", ["Spacing Options", "Options d'espacement", "Spacing Options", "Spacing Options", "间距选项"]),
-    ("First Baseline", ["First Baseline", "Première ligne de base", "First Baseline", "First Baseline", "首行基线"]),
-    ("Rule Above", ["Rule Above", "Filet au-dessus", "Rule Above", "Rule Above", "上方横线"]),
-    ("Numbering", ["Numbering", "Numérotation", "Numbering", "Numbering", "编号"]),
-    (
-        "Footnote Reference Number in Text",
-        [
-            "Footnote Reference Number in Text",
-            "Numéro de référence de note de bas de page dans le texte",
-            "Footnote Reference Number in Text",
-            "Footnote Reference Number in Text",
-            "正文中的脚注引用编号",
-        ],
-    ),
-    (
-        "Footnote Formatting",
-        ["Footnote Formatting", "Mise en forme des notes de bas de page", "Footnote Formatting", "Footnote Formatting", "脚注格式"],
-    ),
-    (
-        "Span Footnotes Across Columns",
-        [
-            "Span Footnotes Across Columns",
-            "Étendre les notes de bas de page sur toutes les colonnes",
-            "Span Footnotes Across Columns",
-            "Span Footnotes Across Columns",
-            "跨栏分布脚注",
-        ],
-    ),
-    ("Rule On", ["Rule On", "Filet activé", "Rule On", "Rule On", "启用横线"]),
-    ("Ascent", ["Ascent", "Ascendante", "Ascent", "Ascent", "上升高度"]),
-    ("Cap Height", ["Cap Height", "Hauteur de capitale", "Cap Height", "Cap Height", "大写字母高度"]),
-    ("Leading", ["Leading", "Interligne", "Leading", "Leading", "行距"]),
-    ("x Height", ["x Height", "Hauteur d'x", "x Height", "x Height", "x 字高"]),
-    ("Em Box Height", ["Em Box Height", "Hauteur du cadratin", "Em Box Height", "Em Box Height", "全角字框高度"]),
-    ("Fixed", ["Fixed", "Fixe", "Fixed", "Fixed", "固定"]),
-    ("Never (continuous)", ["Never (continuous)", "Jamais (continu)", "Never (continuous)", "Never (continuous)", "从不（连续编号）"]),
-    ("Page", ["Page", "Page", "Page", "Page", "页面"]),
-    ("Spread", ["Spread", "Planche", "Spread", "Spread", "跨页"]),
-    ("Section", ["Section", "Section", "Section", "Section", "章节"]),
-    ("Footnote Reference", ["Footnote Reference", "Référence de note de bas de page", "Footnote Reference", "Footnote Reference", "脚注引用"]),
-    ("Footnote Text", ["Footnote Text", "Texte de la note de bas de page", "Footnote Text", "Footnote Text", "脚注文本"]),
-    ("Both", ["Both", "Les deux", "Both", "Both", "两者"]),
-    ("Apply Superscript", ["Apply Superscript", "Appliquer l'exposant", "Apply Superscript", "Apply Superscript", "应用上标"]),
-    ("Apply Subscript", ["Apply Subscript", "Appliquer l'indice", "Apply Subscript", "Apply Subscript", "应用下标"]),
-    ("Apply Normal", ["Apply Normal", "Appliquer Normal", "Apply Normal", "Apply Normal", "应用正常位置"]),
-    ("OpenType Superscript", ["OpenType Superscript", "Exposant OpenType", "OpenType Superscript", "OpenType Superscript", "OpenType 上标"]),
-    ("through", ["through", "sur", "through", "through", "直到（包含）"]),
-    ("up to", ["up to", "jusqu'à", "up to", "up to", "直到（不包含）"]),
-    ("line", ["line", "ligne", "line", "line", "行"]),
-    ("lines", ["lines", "lignes", "lines", "lines", "行"]),
-    ("sentences", ["sentences", "phrases", "sentences", "sentences", "句子"]),
-    ("words", ["words", "mots", "words", "words", "单词"]),
-    ("characters", ["characters", "caractères", "characters", "characters", "字符"]),
-    ("letters", ["letters", "lettres", "letters", "letters", "字母"]),
-    ("digits", ["digits", "chiffres", "digits", "digits", "数字"]),
-    ("tab", ["tab", "tabulation", "tab", "tab", "制表符"]),
-    ("forcedLineBreak", ["forcedLineBreak", "saut de ligne forcé", "forcedLineBreak", "forcedLineBreak", "强制换行符"]),
-    ("emSpace", ["emSpace", "espace cadratin", "emSpace", "emSpace", "全角空格"]),
-    ("enSpace", ["enSpace", "espace demi-cadratin", "enSpace", "enSpace", "半角空格"]),
-    ("dropcap", ["Initiale", "lettrine", "capitular", "ドロップキャップ", "首字下沉"]),
-    ("Drop Caps", ["Initialen", "Lettrines", "Capitulares", "ドロップキャップ", "首字下沉"]),
-    ("Lines:", ["Zeilen:", "Lignes :", "Líneas:", "行数：", "行数："]),
-    ("Characters:", ["Zeichen:", "Caractères :", "Caracteres:", "文字数：", "字符数："]),
-    ("Drop Lines", ["Initialzeilen", "Lignes lettrine", "Líneas capitular", "ドロップ行数", "下沉行数"]),
-    ("Drop Chars", ["Initialzeichen", "Car. lettrine", "Car. capitular", "ドロップ文字数", "下沉字符数"]),
-    ("Align Left Edge", ["Linke Kante ausrichten", "Aligner le bord gauche", "Alinear borde izquierdo", "左端揃え", "左边缘对齐"]),
-    (
-        "Scale for Descenders",
-        [
-            "Für Unterlängen skalieren",
-            "Mise à l'échelle pour les jambages",
-            "Escalar para trazos descendentes",
-            "ディセンダーに合わせて拡大・縮小",
-            "为下伸部分缩放",
-        ],
-    ),
-    ("chars", ["chars", "caractères saisis", "chars", "chars", "指定字符"]),
-    ("[Automatic]", ["[Automatic]", "[Automatique]", "[Automatic]", "[Automatic]", "[自动]"]),
-    ("Tracking:", ["Tracking:", "Approche :", "Tracking:", "Tracking:", "字距调整："]),
-    ("Right Indent:", ["Right Indent:", "Retrait à droite :", "Right Indent:", "Right Indent:", "右缩进："]),
-    ("First Line Indent:", ["First Line Indent:", "Retrait de première ligne :", "First Line Indent:", "First Line Indent:", "首行缩进："]),
-    ("Space Before:", ["Space Before:", "Espace avant :", "Space Before:", "Space Before:", "段前间距："]),
-    ("Space After:", ["Space After:", "Espace après :", "Space After:", "Space After:", "段后间距："]),
-    ("Words with at Least:", ["Words with at Least:", "Mots d'au moins :", "Words with at Least:", "Words with at Least:", "单词最少字符数："]),
-    ("After First:", ["After First:", "Après les premières :", "After First:", "After First:", "连字符前最少字符数："]),
-    ("Before Last:", ["Before Last:", "Avant les dernières :", "Before Last:", "Before Last:", "连字符后最少字符数："]),
-    ("Hyphen Limit:", ["Hyphen Limit:", "Limite de césure :", "Hyphen Limit:", "Hyphen Limit:", "连字符限制："]),
-    ("Word Spacing:", ["Word Spacing:", "Espacement des mots :", "Word Spacing:", "Word Spacing:", "单词间距："]),
-    ("Letter Spacing:", ["Letter Spacing:", "Espacement des lettres :", "Letter Spacing:", "Letter Spacing:", "字母间距："]),
-    ("Glyph Scaling:", ["Glyph Scaling:", "Échelle des glyphes :", "Glyph Scaling:", "Glyph Scaling:", "字形缩放比例："]),
-    ("Insert Kashidas:", ["Insert Kashidas:", "Insérer des kashidas :", "Insert Kashidas:", "Insert Kashidas:", "插入延长线："]),
-    (
-        "In justified Arabic text",
-        [
-            "In justified Arabic text",
-            "Dans le texte arabe justifié",
-            "In justified Arabic text",
-            "In justified Arabic text",
-            "在两端对齐的阿拉伯语文本中",
-        ],
-    ),
-    ("Korean Line Breaks:", ["Korean Line Breaks:", "Retours à la ligne en coréen :", "Korean Line Breaks:", "Korean Line Breaks:", "韩文换行："]),
-    (
-        "Between syllables (not only at spaces)",
-        [
-            "Between syllables (not only at spaces)",
-            "Entre les syllabes (pas seulement aux espaces)",
-            "Between syllables (not only at spaces)",
-            "Between syllables (not only at spaces)",
-            "在音节之间（不仅在空格处）",
-        ],
-    ),
-    ("Binding:", ["Binding:", "Reliure :", "Binding:", "Binding:", "装订方向："]),
-    ("Ruby:", ["Ruby:", "Ruby :", "Ruby:", "Ruby:", "旁注："]),
-    (
-        "Set over the selected text; empty removes it.",
-        [
-            "Set over the selected text; empty removes it.",
-            "Composé au-dessus du texte sélectionné ; vide, il est supprimé.",
-            "Set over the selected text; empty removes it.",
-            "Set over the selected text; empty removes it.",
-            "在所选文本上方添加注音；留空可移除。",
-        ],
-    ),
-    ("[Basic Paragraph]", ["[Basic Paragraph]", "[Paragraphe standard]", "[Basic Paragraph]", "[Basic Paragraph]", "[基本段落]"]),
-    ("[No Paragraph Style]", ["[No Paragraph Style]", "[Aucun style de paragraphe]", "[No Paragraph Style]", "[No Paragraph Style]", "[无段落样式]"]),
-    ("Align left", ["Align left", "Aligner à gauche", "Align left", "Align left", "左对齐"]),
-    ("Align center", ["Align center", "Aligner au centre", "Align center", "Align center", "居中对齐"]),
-    ("Align right", ["Align right", "Aligner à droite", "Align right", "Align right", "右对齐"]),
-    (
-        "Justify with last line aligned left",
-        [
-            "Justify with last line aligned left",
-            "Justifier avec dernière ligne alignée à gauche",
-            "Justify with last line aligned left",
-            "Justify with last line aligned left",
-            "两端对齐，末行左对齐",
-        ],
-    ),
-    (
-        "Justify with last line aligned center",
-        [
-            "Justify with last line aligned center",
-            "Justifier avec dernière ligne centrée",
-            "Justify with last line aligned center",
-            "Justify with last line aligned center",
-            "两端对齐，末行居中",
-        ],
-    ),
-    (
-        "Justify with last line aligned right",
-        [
-            "Justify with last line aligned right",
-            "Justifier avec dernière ligne alignée à droite",
-            "Justify with last line aligned right",
-            "Justify with last line aligned right",
-            "两端对齐，末行右对齐",
-        ],
-    ),
-    ("Justify all lines", ["Justify all lines", "Justifier toutes les lignes", "Justify all lines", "Justify all lines", "所有行两端对齐"]),
-    ("Align towards spine", ["Align towards spine", "Aligner vers le dos", "Align towards spine", "Align towards spine", "朝向书脊对齐"]),
-    (
-        "Align away from spine",
-        ["Align away from spine", "Aligner à l'opposé du dos", "Align away from spine", "Align away from spine", "背向书脊对齐"],
-    ),
-    (
-        "Create New Style from Selection",
-        [
-            "Create New Style from Selection",
-            "Créer un style à partir de la sélection",
-            "Create New Style from Selection",
-            "Create New Style from Selection",
-            "从所选内容创建新样式",
-        ],
-    ),
-    ("No text selected", ["No text selected", "Aucun texte sélectionné", "No text selected", "No text selected", "未选择文本"]),
-    ("Search", ["Suchen", "Rechercher", "Buscar", "Search", "搜索"]),
-    ("Essentials", ["Essentials", "Les indispensables", "Essentials", "Essentials", "基本功能"]),
-    ("Advanced", ["Advanced", "Avancé", "Advanced", "Advanced", "高级"]),
-    ("Digital Publishing", ["Digital Publishing", "Publication numérique", "Digital Publishing", "Digital Publishing", "数字出版"]),
-    ("Interactive for PDF", ["Interactive for PDF", "PDF interactif", "Interactive for PDF", "Interactive for PDF", "PDF 交互"]),
-    ("Printing and Proofing", ["Printing and Proofing", "Impression et épreuvage", "Printing and Proofing", "Printing and Proofing", "打印和校样"]),
-    ("Typography", ["Typography", "Typographie", "Typography", "Typography", "文字排版"]),
-    ("Rulers & Grids", ["Rulers & Grids", "Règles et grilles", "Rulers & Grids", "Rulers & Grids", "标尺和网格"]),
-    ("No errors", ["No errors", "Aucune erreur", "No errors", "No errors", "无错误"]),
-    ("error", ["error", "erreur", "error", "error", "个错误"]),
-    ("errors", ["errors", "erreurs", "errors", "errors", "个错误"]),
-    ("Reset", ["Reset", "Réinitialiser", "Reset", "Reset", "重置"]),
-    ("Right to Left", ["Right to Left", "De droite à gauche", "Right to Left", "Right to Left", "从右向左"]),
-    ("Left to Right", ["Left to Right", "De gauche à droite", "Left to Right", "Left to Right", "从左向右"]),
-    ("Portrait", ["Portrait", "Portrait", "Portrait", "Portrait", "纵向"]),
-    ("Landscape", ["Landscape", "Paysage", "Landscape", "Landscape", "横向"]),
-    (
-        "Display All Blacks as Rich Black",
-        [
-            "Display All Blacks as Rich Black",
-            "Afficher tous les noirs en noir intense",
-            "Display All Blacks as Rich Black",
-            "Display All Blacks as Rich Black",
-            "所有黑色显示为浓黑",
-        ],
-    ),
-    (
-        "Display All Blacks Accurately",
-        [
-            "Display All Blacks Accurately",
-            "Afficher tous les noirs avec précision",
-            "Display All Blacks Accurately",
-            "Display All Blacks Accurately",
-            "准确显示所有黑色",
-        ],
-    ),
-    (
-        "Output All Blacks as Rich Black",
-        [
-            "Output All Blacks as Rich Black",
-            "Sortir tous les noirs en noir intense",
-            "Output All Blacks as Rich Black",
-            "Output All Blacks as Rich Black",
-            "所有黑色输出为浓黑",
-        ],
-    ),
-    (
-        "Output All Blacks Accurately",
-        [
-            "Output All Blacks Accurately",
-            "Sortir tous les noirs avec précision",
-            "Output All Blacks Accurately",
-            "Output All Blacks Accurately",
-            "准确输出所有黑色",
-        ],
-    ),
-    ("Top Margin", ["Top Margin", "Marge supérieure", "Top Margin", "Top Margin", "上边距"]),
-    ("Top of Page", ["Top of Page", "Haut de la page", "Top of Page", "Top of Page", "页面顶部"]),
-    (
-        "Paragraph Styles panel",
-        ["Paragraph Styles panel", "Panneau Styles de paragraphe", "Paragraph Styles panel", "Paragraph Styles panel", "段落样式面板"],
-    ),
-    (
-        "Character Styles panel",
-        ["Character Styles panel", "Panneau Styles de caractère", "Character Styles panel", "Character Styles panel", "字符样式面板"],
-    ),
-    ("Create new style", ["Create new style", "Créer un style", "Create new style", "Create new style", "创建新样式"]),
-    ("Clear overrides", ["Clear overrides", "Effacer les remplacements", "Clear overrides", "Clear overrides", "清除覆盖"]),
-    ("Apply", ["Apply", "Appliquer", "Apply", "Apply", "应用"]),
-    ("Accept", ["Accept", "Accepter", "Accept", "Accept", "接受"]),
-    ("Reject", ["Reject", "Refuser", "Reject", "Reject", "拒绝"]),
-    ("Add Selection", ["Add Selection", "Ajouter la sélection", "Add Selection", "Add Selection", "添加所选内容"]),
-    ("Align Stroke:", ["Align Stroke:", "Aligner le contour :", "Align Stroke:", "Align Stroke:", "描边对齐："]),
-    ("Angle", ["Angle", "Angle", "Angle", "Angle", "角度"]),
-    ("Angle:", ["Angle:", "Angle :", "Angle:", "Angle:", "角度："]),
-    ("Baseline", ["Baseline", "Ligne de base", "Baseline", "Baseline", "基线"]),
-    ("Cap:", ["Cap:", "Extrémité :", "Cap:", "Cap:", "端点："]),
-    ("Cell Text", ["Cell Text", "Texte de la cellule", "Cell Text", "Cell Text", "单元格文本"]),
-    ("Cell Type", ["Cell Type", "Type de cellule", "Cell Type", "Cell Type", "单元格类型"]),
-    ("Composer", ["Composer", "Compositeur", "Composer", "Composer", "排版器"]),
-    ("Convert to Text", ["Convert to Text", "Convertir en texte", "Convert to Text", "Convert to Text", "转换为文本"]),
-    ("Create New Layer", ["Create New Layer", "Créer un calque", "Create New Layer", "Create New Layer", "创建新图层"]),
-    ("Delete DTD", ["Delete DTD", "Supprimer la DTD", "Delete DTD", "Delete DTD", "删除 DTD"]),
-    ("Digits", ["Digits", "Chiffres", "Digits", "Digits", "数字"]),
-    ("Direction", ["Direction", "Direction", "Direction", "Direction", "方向"]),
-    ("Distance", ["Distance", "Distance", "Distance", "Distance", "距离"]),
-    ("Distribute ↔", ["Distribute ↔", "Répartir ↔", "Distribute ↔", "Distribute ↔", "水平分布"]),
-    ("Distribute ↕", ["Distribute ↕", "Répartir ↕", "Distribute ↕", "Distribute ↕", "垂直分布"]),
-    ("Effects: Drop Shadow", ["Effects: Drop Shadow", "Effets : ombre portée", "Effects: Drop Shadow", "Effects: Drop Shadow", "效果：投影"]),
-    ("Favorites", ["Favorites", "Favoris", "Favorites", "Favorites", "收藏"]),
-    ("First Spread", ["First Spread", "Première planche", "First Spread", "First Spread", "第一个跨页"]),
-    ("Gap Color:", ["Gap Color:", "Couleur de l'espace :", "Gap Color:", "Gap Color:", "间隙颜色："]),
-    ("Graphic…", ["Graphic…", "Graphique…", "Graphic…", "Graphic…", "图形…"]),
-    ("Home", ["Home", "Accueil", "Home", "Home", "主页"]),
-    ("Join:", ["Join:", "Sommet :", "Join:", "Join:", "连接："]),
-    ("Language", ["Sprache", "Langue", "Idioma", "言語", "语言"]),
-    ("Last Spread", ["Last Spread", "Dernière planche", "Last Spread", "Last Spread", "最后一个跨页"]),
-    ("Load DTD…", ["Load DTD…", "Charger la DTD…", "Load DTD…", "Load DTD…", "载入 DTD…"]),
-    ("Location:", ["Location:", "Emplacement :", "Location:", "Location:", "位置："]),
-    (
-        "Lock Column Guides",
-        ["Spaltenhilfslinien sperren", "Verrouiller les repères de colonne", "Bloquear guías de columna", "列ガイドをロック", "锁定栏参考线"],
-    ),
-    ("Lock Guides", ["Lock Guides", "Verrouiller les repères", "Lock Guides", "Lock Guides", "锁定参考线"]),
-    ("Miter Limit:", ["Miter Limit:", "Limite de pointe :", "Miter Limit:", "Miter Limit:", "斜接限制："]),
-    (
-        "New Article from Selection",
-        [
-            "New Article from Selection",
-            "Nouvel article à partir de la sélection",
-            "New Article from Selection",
-            "New Article from Selection",
-            "从所选内容新建文章",
-        ],
-    ),
-    ("New Note at Cursor", ["New Note at Cursor", "Nouvelle note au curseur", "New Note at Cursor", "New Note at Cursor", "在光标处新建附注"]),
-    ("New Swatch", ["New Swatch", "Nouvelle nuance", "New Swatch", "New Swatch", "新建色板"]),
-    ("New condition name", ["New condition name", "Nom de la nouvelle condition", "New condition name", "New condition name", "新条件名称"]),
-    ("New group…", ["New group…", "Nouveau groupe…", "New group…", "New group…", "新建组…"]),
-    ("New tag", ["New tag", "Nouvelle balise", "New tag", "New tag", "新建标签"]),
-    ("Next Spread", ["Next Spread", "Planche suivante", "Next Spread", "Next Spread", "下一个跨页"]),
-    ("Note text", ["Note text", "Texte de la note", "Note text", "Note text", "附注文本"]),
-    ("Offset", ["Offset", "Décalage", "Offset", "Offset", "偏移"]),
-    ("Offsets", ["Offsets", "Décalages", "Offsets", "Offsets", "偏移量"]),
-    ("Paragraph alignment", ["Paragraph alignment", "Alignement du paragraphe", "Paragraph alignment", "Paragraph alignment", "段落对齐"]),
-    ("Previous Spread", ["Previous Spread", "Planche précédente", "Previous Spread", "Previous Spread", "上一个跨页"]),
-    ("Release to Objects", ["Release to Objects", "Libérer en objets", "Release to Objects", "Release to Objects", "释放为对象"]),
-    ("Remove", ["Remove", "Retirer", "Remove", "Remove", "移除"]),
-    (
-        "Rotate 90° Counterclockwise",
-        [
-            "Rotate 90° Counterclockwise",
-            "Rotation de 90° dans le sens antihoraire",
-            "Rotate 90° Counterclockwise",
-            "Rotate 90° Counterclockwise",
-            "逆时针旋转 90°",
-        ],
-    ),
-    ("Rotate 180°", ["180° drehen", "Rotation à 180°", "Girar 180°", "180°回転", "旋转 180°"]),
-    ("Rotation Angle", ["Rotation Angle", "Angle de rotation", "Rotation Angle", "Rotation Angle", "旋转角度"]),
-    ("Rows", ["Rows", "Lignes", "Rows", "Rows", "行数"]),
-    ("Run", ["Run", "Exécuter", "Run", "Run", "运行"]),
-    ("Scale X Percentage", ["Scale X Percentage", "Échelle X en pourcentage", "Scale X Percentage", "Scale X Percentage", "水平缩放百分比"]),
-    ("Scale Y Percentage", ["Scale Y Percentage", "Échelle Y en pourcentage", "Scale Y Percentage", "Scale Y Percentage", "垂直缩放百分比"]),
-    ("Search commands", ["Befehle suchen", "Rechercher des commandes", "Buscar comandos", "Search commands", "搜索命令"]),
-    (
-        "No matching commands",
-        ["Keine passenden Befehle", "Aucune commande correspondante", "Ningún comando coincide", "一致するコマンドはありません", "没有匹配的命令"],
-    ),
-    ("Search fonts", ["Search fonts", "Rechercher des polices", "Search fonts", "Search fonts", "搜索字体"]),
-    (
-        "Search styles and commands…",
-        [
-            "Search styles and commands…",
-            "Rechercher des styles et des commandes…",
-            "Search styles and commands…",
-            "Search styles and commands…",
-            "搜索样式和命令…",
-        ],
-    ),
-    (
-        "Search: character or U+code",
-        [
-            "Search: character or U+code",
-            "Rechercher : caractère ou code U+",
-            "Search: character or U+code",
-            "Search: character or U+code",
-            "搜索字符或 U+ 编码",
-        ],
-    ),
-    ("Share", ["Share", "Partager", "Share", "Share", "分享"]),
-    ("Shear X Angle", ["Shear X Angle", "Angle de déformation X", "Shear X Angle", "Shear X Angle", "水平倾斜角度"]),
-    ("Show Baseline Grid", ["Show Baseline Grid", "Afficher la grille de ligne de base", "Show Baseline Grid", "Show Baseline Grid", "显示基线网格"]),
-    ("Show Document Grid", ["Show Document Grid", "Afficher la grille du document", "Show Document Grid", "Show Document Grid", "显示文档网格"]),
-    ("Show Guides", ["Show Guides", "Afficher les repères", "Show Guides", "Show Guides", "显示参考线"]),
-    ("Stop Color:", ["Stop Color:", "Couleur d'arrêt :", "Stop Color:", "Stop Color:", "停止点颜色："]),
-    ("Style", ["Style", "Style", "Style", "Style", "样式"]),
-    ("Styles panel", ["Styles panel", "Panneau Styles", "Styles panel", "Styles panel", "样式面板"]),
-    ("Text", ["Text", "Texte", "Text", "Text", "文本"]),
-    (
-        "The structure is valid.",
-        ["The structure is valid.", "La structure est valide.", "The structure is valid.", "The structure is valid.", "结构有效。"],
-    ),
-    ("Toggle double column", ["Toggle double column", "Basculer en double colonne", "Toggle double column", "Toggle double column", "切换双列布局"]),
-    ("Tracking", ["Tracking", "Approche", "Tracking", "Tracking", "字距调整"]),
-    ("Untag Selection", ["Untag Selection", "Retirer la balise de la sélection", "Untag Selection", "Untag Selection", "移除所选内容的标签"]),
-    ("Validate", ["Validate", "Valider", "Validate", "Validate", "验证"]),
-    ("Weight", ["Weight", "Épaisseur", "Weight", "Weight", "粗细"]),
-    ("Subtract", ["Subtract", "Soustraire", "Subtract", "Subtract", "减去"]),
-    ("Intersect", ["Intersect", "Intersection", "Intersect", "Intersect", "交集"]),
-    ("Exclude Overlap", ["Exclude Overlap", "Exclure le chevauchement", "Exclude Overlap", "Exclude Overlap", "排除重叠"]),
-    ("Minus Back", ["Minus Back", "Soustraire l'arrière", "Minus Back", "Minus Back", "减去后方对象"]),
-    ("Align left edges", ["Align left edges", "Aligner les bords gauches", "Align left edges", "Align left edges", "左边缘对齐"]),
-    (
-        "Align horizontal centers",
-        ["Align horizontal centers", "Aligner les centres horizontaux", "Align horizontal centers", "Align horizontal centers", "水平居中对齐"],
-    ),
-    ("Align right edges", ["Align right edges", "Aligner les bords droits", "Align right edges", "Align right edges", "右边缘对齐"]),
-    ("Align top edges", ["Align top edges", "Aligner les bords supérieurs", "Align top edges", "Align top edges", "顶边缘对齐"]),
-    (
-        "Align vertical centers",
-        ["Align vertical centers", "Aligner les centres verticaux", "Align vertical centers", "Align vertical centers", "垂直居中对齐"],
-    ),
-    ("Align bottom edges", ["Align bottom edges", "Aligner les bords inférieurs", "Align bottom edges", "Align bottom edges", "底边缘对齐"]),
-    ("Align to Selection", ["Align to Selection", "Aligner sur la sélection", "Align to Selection", "Align to Selection", "对齐到所选对象"]),
-    ("Align to Key Object", ["Align to Key Object", "Aligner sur l'objet clé", "Align to Key Object", "Align to Key Object", "对齐到关键对象"]),
-    ("Align to Margins", ["Align to Margins", "Aligner sur les marges", "Align to Margins", "Align to Margins", "对齐到边距"]),
-    ("Align to Page", ["Align to Page", "Aligner sur la page", "Align to Page", "Align to Page", "对齐到页面"]),
-    ("Align to Spread", ["Align to Spread", "Aligner sur la planche", "Align to Spread", "Align to Spread", "对齐到跨页"]),
-    ("No Text Wrap", ["No Text Wrap", "Sans habillage", "No Text Wrap", "No Text Wrap", "无文本绕排"]),
-    (
-        "Wrap Around Bounding Box",
-        ["Wrap Around Bounding Box", "Habiller le cadre de sélection", "Wrap Around Bounding Box", "Wrap Around Bounding Box", "绕排定界框"],
-    ),
-    (
-        "Wrap Around Object Shape",
-        ["Wrap Around Object Shape", "Habiller la forme de l'objet", "Wrap Around Object Shape", "Wrap Around Object Shape", "绕排对象形状"],
-    ),
-    ("Jump Object", ["Jump Object", "Sauter l'objet", "Jump Object", "Jump Object", "跳过对象"]),
-    ("Jump to Next Column", ["Jump to Next Column", "Sauter à la colonne suivante", "Jump to Next Column", "Jump to Next Column", "跳至下一栏"]),
-    ("Bulleted List", ["Bulleted List", "Liste à puces", "Bulleted List", "Bulleted List", "项目符号列表"]),
-    ("Numbered List", ["Numbered List", "Liste numérotée", "Numbered List", "Numbered List", "编号列表"]),
-    ("UPPERCASE", ["UPPERCASE", "MAJUSCULES", "UPPERCASE", "UPPERCASE", "大写"]),
-    ("Small Caps", ["Small Caps", "Petites capitales", "Small Caps", "Small Caps", "小型大写字母"]),
-    ("Normal", ["Normal", "Normal", "Normal", "Normal", "正常"]),
-    ("Butt", ["Butt", "Aboutée", "Butt", "Butt", "平头"]),
-    ("Round", ["Round", "Arrondie", "Round", "Round", "圆形"]),
-    ("Projecting", ["Projecting", "Projetée", "Projecting", "Projecting", "突出"]),
-    ("Miter", ["Miter", "En pointe", "Miter", "Miter", "斜接"]),
-    ("Bevel", ["Bevel", "Biseau", "Bevel", "Bevel", "斜角"]),
-    ("Center", ["Center", "Centre", "Center", "Center", "居中"]),
-    ("Start/End:", ["Start/End:", "Début/Fin :", "Start/End:", "Start/End:", "起点/终点："]),
-    ("Left", ["Left", "Gauche", "Left", "Left", "左"]),
-    ("Right", ["Right", "Droite", "Right", "Right", "右"]),
-    ("First", ["First", "Premier", "First", "First", "首行"]),
-    ("Last", ["Last", "Dernier", "Last", "Last", "末行"]),
-    ("Before", ["Before", "Avant", "Before", "Before", "段前"]),
-    ("After", ["After", "Après", "After", "After", "段后"]),
-    ("Shading", ["Shading", "Tramage", "Shading", "Shading", "底纹"]),
-    ("Border", ["Border", "Bordure", "Border", "Border", "边框"]),
-    ("Overprint Fill", ["Overprint Fill", "Surimpression du fond", "Overprint Fill", "Overprint Fill", "叠印填色"]),
-    ("Overprint Stroke", ["Overprint Stroke", "Surimpression du contour", "Overprint Stroke", "Overprint Stroke", "叠印描边"]),
-    ("Overprint Gap", ["Overprint Gap", "Surimpression de l'espace", "Overprint Gap", "Overprint Gap", "叠印间隙"]),
-    ("Nonprinting", ["Nonprinting", "Non imprimable", "Nonprinting", "Nonprinting", "非打印"]),
-    ("At Least", ["At Least", "Au moins", "At Least", "At Least", "至少"]),
-    ("Exactly", ["Exactly", "Exactement", "Exactly", "Exactly", "固定"]),
-    ("Justify", ["Justify", "Justifier", "Justify", "Justify", "两端对齐"]),
-    ("Underline Options", ["Underline Options", "Options de soulignement", "Underline Options", "Underline Options", "下划线选项"]),
-    ("Strikethrough Options", ["Strikethrough Options", "Options de barré", "Strikethrough Options", "Strikethrough Options", "删除线选项"]),
-    (
-        "Character Style Options",
-        ["Character Style Options", "Options de style de caractère", "Character Style Options", "Character Style Options", "字符样式选项"],
-    ),
-    (
-        "Advanced Character Formats",
-        ["Advanced Character Formats", "Formats de caractère avancés", "Advanced Character Formats", "Advanced Character Formats", "高级字符格式"],
-    ),
-    ("OpenType Features", ["OpenType Features", "Fonctions OpenType", "OpenType Features", "OpenType Features", "OpenType 功能"]),
-    ("Style Settings:", ["Style Settings:", "Paramètres du style :", "Style Settings:", "Style Settings:", "样式设置："]),
-    ("Kerning:", ["Kerning:", "Crénage :", "Kerning:", "Kerning:", "字偶间距："]),
-    ("Case:", ["Case:", "Casse :", "Case:", "Case:", "大小写："]),
-    (
-        "OpenType All Small Caps",
-        [
-            "OpenType All Small Caps",
-            "Tout en petites capitales OpenType",
-            "OpenType All Small Caps",
-            "OpenType All Small Caps",
-            "OpenType 全部小型大写字母",
-        ],
-    ),
-    ("Subscript", ["Subscript", "Indice", "Subscript", "Subscript", "下标"]),
-    ("OpenType Subscript", ["OpenType Subscript", "Indice OpenType", "OpenType Subscript", "OpenType Subscript", "OpenType 下标"]),
-    ("OpenType Numerator", ["OpenType Numerator", "Numérateur OpenType", "OpenType Numerator", "OpenType Numerator", "OpenType 分子"]),
-    ("OpenType Denominator", ["OpenType Denominator", "Dénominateur OpenType", "OpenType Denominator", "OpenType Denominator", "OpenType 分母"]),
-    ("Ligatures", ["Ligatures", "Ligatures", "Ligatures", "Ligatures", "连字"]),
-    ("No Break", ["No Break", "Sans retour automatique", "No Break", "No Break", "不换行"]),
-    ("Horizontal Scale:", ["Horizontal Scale:", "Échelle horizontale :", "Horizontal Scale:", "Horizontal Scale:", "水平缩放："]),
-    ("Vertical Scale:", ["Vertical Scale:", "Échelle verticale :", "Vertical Scale:", "Vertical Scale:", "垂直缩放："]),
-    ("Baseline Shift:", ["Baseline Shift:", "Décalage vertical :", "Baseline Shift:", "Baseline Shift:", "基线偏移："]),
-    ("Skew:", ["Skew:", "Inclinaison :", "Skew:", "Skew:", "倾斜："]),
-    ("Language:", ["Language:", "Langue :", "Language:", "Language:", "语言："]),
-    ("Digits:", ["Ziffern:", "Chiffres :", "Dígitos:", "数字：", "数字："]),
-    ("Figure Style:", ["Figure Style:", "Style de chiffres :", "Figure Style:", "Figure Style:", "数字样式："]),
-    ("Underline On", ["Underline On", "Souligné activé", "Underline On", "Underline On", "启用下划线"]),
-    ("Strikethrough On", ["Strikethrough On", "Barré activé", "Strikethrough On", "Strikethrough On", "启用删除线"]),
-    ("Edit \"{name}\"…", ["„{name}“ bearbeiten…", "Modifier « {name} »…", "Editar \"{name}\"…", "\"{name}\" を編集…", "编辑\"{name}\"…"]),
-    (
-        "Discretionary Ligatures",
-        ["Discretionary Ligatures", "Ligatures conditionnelles", "Discretionary Ligatures", "Discretionary Ligatures", "自由连字"],
-    ),
-    ("Fractions", ["Fractions", "Fractions", "Fractions", "Fractions", "分数"]),
-    ("Ordinal", ["Ordinal", "Ordinaux", "Ordinal", "Ordinal", "序数"]),
-    ("Swash", ["Swash", "Lettres italiques ornées", "Swash", "Swash", "花体"]),
-    ("Titling Alternates", ["Titling Alternates", "Variantes de titrage", "Titling Alternates", "Titling Alternates", "标题替代字形"]),
-    (
-        "Contextual Alternates",
-        ["Contextual Alternates", "Variantes contextuelles", "Contextual Alternates", "Contextual Alternates", "上下文替代字形"],
-    ),
-    ("Slashed Zero", ["Slashed Zero", "Zéro barré", "Slashed Zero", "Slashed Zero", "斜线零"]),
-    ("Tabular Lining", ["Tabular Lining", "Chiffres alignés tabulaires", "Tabular Lining", "Tabular Lining", "等宽齐线数字"]),
-    (
-        "Proportional Oldstyle",
-        ["Proportional Oldstyle", "Chiffres elzéviriens proportionnels", "Proportional Oldstyle", "Proportional Oldstyle", "比例旧式数字"],
-    ),
-    ("Proportional Lining", ["Proportional Lining", "Chiffres alignés proportionnels", "Proportional Lining", "Proportional Lining", "比例齐线数字"]),
-    ("Tabular Oldstyle", ["Tabular Oldstyle", "Chiffres elzéviriens tabulaires", "Tabular Oldstyle", "Tabular Oldstyle", "等宽旧式数字"]),
-    (
-        "Default Figure Style",
-        ["Default Figure Style", "Style de chiffres par défaut", "Default Figure Style", "Default Figure Style", "默认数字样式"],
-    ),
-    ("Not a button", ["Not a button", "Pas un bouton", "Not a button", "Not a button", "非按钮"]),
-    ("Go To Next Page", ["Go To Next Page", "Atteindre la page suivante", "Go To Next Page", "Go To Next Page", "转到下一页"]),
-    ("Go To Previous Page", ["Go To Previous Page", "Atteindre la page précédente", "Go To Previous Page", "Go To Previous Page", "转到上一页"]),
-    ("Go To First Page", ["Go To First Page", "Atteindre la première page", "Go To First Page", "Go To First Page", "转到第一页"]),
-    ("Go To Last Page", ["Go To Last Page", "Atteindre la dernière page", "Go To Last Page", "Go To Last Page", "转到最后一页"]),
-    ("Go To Page", ["Go To Page", "Atteindre la page", "Go To Page", "Go To Page", "转到页面"]),
-    ("Go To URL", ["Go To URL", "Atteindre l'URL", "Go To URL", "Go To URL", "转到网址"]),
-    ("Not a form field", ["Not a form field", "Pas un champ de formulaire", "Not a form field", "Not a form field", "非表单域"]),
-    ("Text Field", ["Text Field", "Champ de texte", "Text Field", "Text Field", "文本域"]),
-    ("Check Box", ["Check Box", "Case à cocher", "Check Box", "Check Box", "复选框"]),
-    ("Radio Button", ["Radio Button", "Bouton radio", "Radio Button", "Radio Button", "单选按钮"]),
-    ("Combo Box", ["Combo Box", "Liste déroulante", "Combo Box", "Combo Box", "组合框"]),
-    ("List Box", ["List Box", "Zone de liste", "List Box", "List Box", "列表框"]),
-    ("Signature", ["Signature", "Signature", "Signature", "Signature", "签名"]),
-    ("Resize width", ["Resize width", "Redimensionner la largeur", "Resize width", "Resize width", "调整宽度"]),
-    ("Resize height", ["Resize height", "Redimensionner la hauteur", "Resize height", "Resize height", "调整高度"]),
-    ("Pin top", ["Pin top", "Épingler en haut", "Pin top", "Pin top", "固定顶部"]),
-    ("Pin bottom", ["Pin bottom", "Épingler en bas", "Pin bottom", "Pin bottom", "固定底部"]),
-    ("Pin left", ["Pin left", "Épingler à gauche", "Pin left", "Pin left", "固定左侧"]),
-    ("Pin right", ["Pin right", "Épingler à droite", "Pin right", "Pin right", "固定右侧"]),
-    ("Inward", ["Inward", "Vers l'intérieur", "Inward", "Inward", "向内"]),
-    ("Metrics", ["Metrics", "Métrique", "Metrics", "Metrics", "度量"]),
-    ("Optical", ["Optical", "Optique", "Optical", "Optical", "视觉"]),
-    (
-        "Optical Margin Alignment",
-        ["Optischer Randausgleich", "Marges optiques", "Alineación de márgenes ópticos", "オプティカルマージン揃え", "视觉边距对齐"],
-    ),
-    ("Applies to fill", ["Applies to fill", "S'applique au fond", "Applies to fill", "Applies to fill", "应用于填色"]),
-    ("Applies to text", ["Applies to text", "S'applique au texte", "Applies to text", "Applies to text", "应用于文本"]),
-    ("Gray", ["Gray", "Gris", "Gray", "Gray", "灰度"]),
-    ("Linear", ["Linear", "Linéaire", "Linear", "Linear", "线性"]),
-    ("Radial", ["Radial", "Radial", "Radial", "Radial", "径向"]),
-    ("Arabic", ["Arabic", "Arabe", "Arabic", "Arabic", "阿拉伯语"]),
-    ("Kanji", ["Kanji", "Kanji", "Kanji", "漢数字", "汉字数字"]),
-    ("Beveled Rectangle", ["Beveled Rectangle", "Rectangle biseauté", "Beveled Rectangle", "Beveled Rectangle", "斜角矩形"]),
-    ("Chinese", ["Chinese", "Chinois", "Chinese", "Chinese", "中文"]),
-    (
-        "Constrain proportions for width and height",
-        [
-            "Constrain proportions for width and height",
-            "Conserver les proportions de la largeur et de la hauteur",
-            "Constrain proportions for width and height",
-            "Constrain proportions for width and height",
-            "约束宽高比例",
-        ],
-    ),
-    ("Corner", ["Corner", "Angles", "Corner", "Corner", "角"]),
-    ("Custom", ["Custom", "Personnalisé", "Custom", "Custom", "自定义"]),
-    ("Czech", ["Czech", "Tchèque", "Czech", "Czech", "捷克语"]),
-    ("Danish", ["Danish", "Danois", "Danish", "Danish", "丹麦语"]),
-    ("Dashed", ["Dashed", "Tirets", "Dashed", "Dashed", "虚线"]),
-    ("Dotted", ["Dotted", "Pointillé", "Dotted", "Dotted", "点线"]),
-    (
-        "Dutch: 2005 Reform",
-        ["Dutch: 2005 Reform", "Néerlandais : réforme de 2005", "Dutch: 2005 Reform", "Dutch: 2005 Reform", "荷兰语：2005 年拼写改革"],
-    ),
-    ("Embedded", ["Embedded", "Incorporé", "Embedded", "Embedded", "已嵌入"]),
-    ("English: Canadian", ["English: Canadian", "Anglais : Canada", "English: Canadian", "English: Canadian", "英语：加拿大"]),
-    ("English: UK", ["English: UK", "Anglais : Royaume-Uni", "English: UK", "English: UK", "英语：英国"]),
-    ("English: USA", ["English: USA", "Anglais : États-Unis", "English: USA", "English: USA", "英语：美国"]),
-    ("Farsi", ["Farsi", "Persan", "Farsi", "Farsi", "波斯语"]),
-    ("Finnish", ["Finnish", "Finnois", "Finnish", "Finnish", "芬兰语"]),
-    (
-        "Fit Frame to Content",
-        ["Fit Frame to Content", "Ajuster le bloc au contenu", "Fit Frame to Content", "Fit Frame to Content", "使框架适合内容"],
-    ),
-    ("French", ["French", "Français", "French", "French", "法语"]),
-    ("French: Canadian", ["French: Canadian", "Français : Canada", "French: Canadian", "French: Canadian", "法语：加拿大"]),
-    (
-        "German: 2006 Reform",
-        ["German: 2006 Reform", "Allemand : réforme de 2006", "German: 2006 Reform", "German: 2006 Reform", "德语：2006 年拼写改革"],
-    ),
-    (
-        "German: Swiss 2006 Reform",
-        [
-            "German: Swiss 2006 Reform",
-            "Allemand : réforme suisse 2006",
-            "German: Swiss 2006 Reform",
-            "German: Swiss 2006 Reform",
-            "德语：瑞士 2006 年拼写改革",
-        ],
-    ),
-    ("Greek", ["Greek", "Grec", "Greek", "Greek", "希腊语"]),
-    ("Hebrew", ["Hebrew", "Hébreu", "Hebrew", "Hebrew", "希伯来语"]),
-    ("Hindi", ["Hindi", "Hindi", "Hindi", "Hindi", "印地语"]),
-    ("Hungarian", ["Hungarian", "Hongrois", "Hungarian", "Hungarian", "匈牙利语"]),
-    (
-        "Inverse Rounded Rectangle",
-        ["Inverse Rounded Rectangle", "Rectangle arrondi inversé", "Inverse Rounded Rectangle", "Inverse Rounded Rectangle", "内凹圆角矩形"],
-    ),
-    ("Italian", ["Italian", "Italien", "Italian", "Italian", "意大利语"]),
-    ("Japanese", ["Japanese", "Japonais", "Japanese", "Japanese", "日语"]),
-    ("Korean", ["Korean", "Coréen", "Korean", "Korean", "韩语"]),
-    (
-        "Make all settings the same",
-        [
-            "Make all settings the same",
-            "Rendre tous les réglages identiques",
-            "Make all settings the same",
-            "Make all settings the same",
-            "统一所有设置",
-        ],
-    ),
-    ("Native", ["Native", "Natif", "Native", "Native", "本地数字"]),
-    ("Norwegian: Bokmål", ["Norwegian: Bokmål", "Norvégien : bokmål", "Norwegian: Bokmål", "Norwegian: Bokmål", "挪威语：书面语"]),
-    ("Orthogonal Line", ["Orthogonal Line", "Trait orthogonal", "Orthogonal Line", "Orthogonal Line", "正交线"]),
-    ("Polish", ["Polish", "Polonais", "Polish", "Polish", "波兰语"]),
-    ("Portuguese", ["Portuguese", "Portugais", "Portuguese", "Portuguese", "葡萄牙语"]),
-    ("Portuguese: Brazilian", ["Portuguese: Brazilian", "Portugais : Brésil", "Portuguese: Brazilian", "Portuguese: Brazilian", "葡萄牙语：巴西"]),
-    ("Rounded Rectangle", ["Rounded Rectangle", "Rectangle arrondi", "Rounded Rectangle", "Rounded Rectangle", "圆角矩形"]),
-    ("Russian", ["Russian", "Russe", "Russian", "Russian", "俄语"]),
-    ("Solid", ["Solid", "Continu", "Solid", "Solid", "实线"]),
-    ("Spanish", ["Spanish", "Espagnol", "Spanish", "Spanish", "西班牙语"]),
-    ("Story Editor", ["Story Editor", "Mode éditeur", "Story Editor", "Story Editor", "文章编辑器"]),
-    ("Swedish", ["Swedish", "Suédois", "Swedish", "Swedish", "瑞典语"]),
-    ("Thick - Thick", ["Thick - Thick", "Épais - épais", "Thick - Thick", "Thick - Thick", "粗线－粗线"]),
-    ("Thick - Thin", ["Thick - Thin", "Épais - fin", "Thick - Thin", "Thick - Thin", "粗线－细线"]),
-    ("Thin - Thick", ["Thin - Thick", "Fin - épais", "Thin - Thick", "Thin - Thick", "细线－粗线"]),
-    ("Thin - Thin", ["Thin - Thin", "Fin - fin", "Thin - Thin", "Thin - Thin", "细线－细线"]),
-    ("Thin - Thick - Thin", ["Thin - Thick - Thin", "Fin - épais - fin", "Thin - Thick - Thin", "Thin - Thick - Thin", "细线－粗线－细线"]),
-    ("Thick - Thin - Thick", ["Thick - Thin - Thick", "Épais - fin - épais", "Thick - Thin - Thick", "Thick - Thin - Thick", "粗线－细线－粗线"]),
-    ("Wavy", ["Wavy", "Ondulé", "Wavy", "Wavy", "波浪线"]),
-    ("Straight Hash", ["Straight Hash", "Hachures droites", "Straight Hash", "Straight Hash", "直斜线"]),
-    ("Stripes", ["Stripes", "Rayures", "Stripes", "Stripes", "条纹"]),
-    ("Triangle", ["Triangle", "Triangle", "Triangle", "Triangle", "三角形"]),
-    ("Turkish", ["Turkish", "Turc", "Turkish", "Turkish", "土耳其语"]),
-    ("Ukrainian", ["Ukrainian", "Ukrainien", "Ukrainian", "Ukrainian", "乌克兰语"]),
-    ("Cell Style", ["Cell Style", "Style de cellule", "Cell Style", "Cell Style", "单元格样式"]),
-    ("Table Style", ["Table Style", "Style de tableau", "Table Style", "Table Style", "表样式"]),
-    ("Col ←", ["Col ←", "Col. ←", "Col ←", "Col ←", "左侧插入列"]),
-    ("Col →", ["Col →", "Col. →", "Col →", "Col →", "右侧插入列"]),
-    ("Row ↑", ["Row ↑", "Ligne ↑", "Row ↑", "Row ↑", "上方插入行"]),
-    ("Row ↓", ["Row ↓", "Ligne ↓", "Row ↓", "Row ↓", "下方插入行"]),
-    ("Hide Others", ["Hide Others", "Masquer les autres", "Hide Others", "Hide Others", "隐藏其他图层"]),
-    ("Lock Others", ["Lock Others", "Verrouiller les autres", "Lock Others", "Lock Others", "锁定其他图层"]),
-    ("Show All Layers", ["Show All Layers", "Afficher tous les calques", "Show All Layers", "Show All Layers", "显示所有图层"]),
-    ("Unlock", ["Unlock", "Déverrouiller", "Unlock", "Unlock", "解锁"]),
-    ("Unlock All Layers", ["Unlock All Layers", "Déverrouiller tous les calques", "Unlock All Layers", "Unlock All Layers", "解锁所有图层"]),
-    ("Added", ["Added", "Ajouté", "Added", "Added", "已添加"]),
-    ("Deleted", ["Deleted", "Supprimé", "Deleted", "Deleted", "已删除"]),
-    ("Guide-based", ["Guide-based", "Basé sur les repères", "Guide-based", "Guide-based", "基于参考线"]),
-    ("Object-Based", ["Object-Based", "Basé sur les objets", "Object-Based", "Object-Based", "基于对象"]),
-    ("Guide-Based", ["Guide-Based", "Basé sur les repères", "Guide-Based", "Guide-Based", "基于参考线"]),
-    ("Page:", ["Seite:", "Page :", "Página:", "ページ:", "页面："]),
-    ("Content:", ["Inhalt:", "Contenu :", "Contenido:", "コンテンツ:", "内容："]),
-    ("Object Constraints:", ["Objektbeschränkungen:", "Contraintes d’objet :", "Restricciones de objeto:", "オブジェクトの制約:", "对象约束："]),
-    (
-        "Resize with Page:",
-        ["Mit Seite skalieren:", "Redimensionner avec la page :", "Cambiar tamaño con la página:", "ページと共にサイズ変更:", "随页面调整大小："],
-    ),
-    ("Pin:", ["Fixieren:", "Épingler :", "Fijar:", "固定:", "固定："]),
-    ("Resize Page", ["Seitengröße ändern", "Redimensionner la page", "Cambiar tamaño de página", "ページのサイズを変更", "调整页面大小"]),
-    (
-        "Liquid Page Rule:",
-        ["Regel für flüssige Seiten:", "Règle de page liquide :", "Regla de página líquida:", "リキッドページルール:", "自适应页面规则："],
-    ),
-    (
-        "Show Parent Page Overlay",
-        [
-            "Überlagerung der übergeordneten Seite anzeigen",
-            "Afficher la superposition du gabarit",
-            "Mostrar superposición de página principal",
-            "親ページオーバーレイを表示",
-            "显示父页面叠加",
-        ],
-    ),
-    (
-        "Controlled by Parent",
-        ["Durch übergeordnete Seite gesteuert", "Contrôlé par le gabarit", "Controlado por principal", "親ページで制御", "由父页面控制"],
-    ),
-    ("US Business Card", ["US-Visitenkarte", "Carte de visite US", "Tarjeta de visita EE. UU.", "US 名刺", "美国名片"]),
-    (
-        "Object is pinned relative to the page edge. Click to release.",
-        [
-            "Das Objekt ist relativ zum Seitenrand fixiert. Zum Lösen klicken.",
-            "L’objet est épinglé par rapport au bord de la page. Cliquez pour le libérer.",
-            "El objeto está fijado respecto al borde de la página. Haga clic para soltarlo.",
-            "オブジェクトはページの端を基準に固定されています。クリックすると解除します。",
-            "对象已相对于页面边缘固定。单击可释放。",
-        ],
-    ),
-    (
-        "Click to pin the object relative to the page edge.",
-        [
-            "Klicken, um das Objekt relativ zum Seitenrand zu fixieren.",
-            "Cliquez pour épingler l’objet par rapport au bord de la page.",
-            "Haga clic para fijar el objeto respecto al borde de la página.",
-            "クリックすると、オブジェクトをページの端を基準に固定します。",
-            "单击可将对象相对于页面边缘固定。",
-        ],
-    ),
-    (
-        "The object changes width as the page changes width. Click to lock the object width.",
-        [
-            "Die Objektbreite ändert sich mit der Seitenbreite. Zum Sperren der Breite klicken.",
-            "La largeur de l’objet suit celle de la page. Cliquez pour verrouiller la largeur.",
-            "El ancho del objeto cambia con el de la página. Haga clic para bloquear el ancho.",
-            "オブジェクトの幅はページの幅に合わせて変わります。クリックすると幅をロックします。",
-            "对象宽度随页面宽度变化。单击可锁定对象宽度。",
-        ],
-    ),
-    (
-        "The object's width is locked. Click to let the object change width as the page changes width.",
-        [
-            "Die Objektbreite ist gesperrt. Klicken, damit sie sich mit der Seitenbreite ändert.",
-            "La largeur de l’objet est verrouillée. Cliquez pour qu’elle suive celle de la page.",
-            "El ancho del objeto está bloqueado. Haga clic para que cambie con el de la página.",
-            "オブジェクトの幅はロックされています。クリックすると、ページの幅に合わせて変わります。",
-            "对象宽度已锁定。单击可让其随页面宽度变化。",
-        ],
-    ),
-    (
-        "The object changes height as the page changes height. Click to lock the object height.",
-        [
-            "Die Objekthöhe ändert sich mit der Seitenhöhe. Zum Sperren der Höhe klicken.",
-            "La hauteur de l’objet suit celle de la page. Cliquez pour verrouiller la hauteur.",
-            "El alto del objeto cambia con el de la página. Haga clic para bloquear el alto.",
-            "オブジェクトの高さはページの高さに合わせて変わります。クリックすると高さをロックします。",
-            "对象高度随页面高度变化。单击可锁定对象高度。",
-        ],
-    ),
-    (
-        "The object's height is locked. Click to let the object change height as the page changes height.",
-        [
-            "Die Objekthöhe ist gesperrt. Klicken, damit sie sich mit der Seitenhöhe ändert.",
-            "La hauteur de l’objet est verrouillée. Cliquez pour qu’elle suive celle de la page.",
-            "El alto del objeto está bloqueado. Haga clic para que cambie con el de la página.",
-            "オブジェクトの高さはロックされています。クリックすると、ページの高さに合わせて変わります。",
-            "对象高度已锁定。单击可让其随页面高度变化。",
-        ],
-    ),
-    ("Loop", ["Loop", "Boucle", "Loop", "Loop", "循环播放"]),
-    ("Object-based", ["Object-based", "Basé sur les objets", "Object-based", "Object-based", "基于对象"]),
-    ("Off", ["Off", "Désactivé", "Off", "Off", "关闭"]),
-    ("Play on Page Load", ["Play on Page Load", "Lire au chargement de la page", "Play on Page Load", "Play on Page Load", "页面载入时播放"]),
-    ("Re-center", ["Re-center", "Recentrer", "Re-center", "Re-center", "重新居中"]),
-    ("Show Controls", ["Show Controls", "Afficher les commandes", "Show Controls", "Show Controls", "显示控件"]),
-    ("Signature Field", ["Signature Field", "Champ de signature", "Signature Field", "Signature Field", "签名域"]),
-    (
-        "Select text to apply a condition",
-        [
-            "Select text to apply a condition",
-            "Sélectionnez du texte pour appliquer une condition",
-            "Select text to apply a condition",
-            "Select text to apply a condition",
-            "选择文本以应用条件",
-        ],
-    ),
-    ("Blinds", ["Blinds", "Stores", "Blinds", "Blinds", "百叶窗"]),
-    ("Box", ["Box", "Boîte", "Box", "Box", "方框"]),
-    ("Comb", ["Comb", "Peigne", "Comb", "Comb", "梳状"]),
-    ("Cover", ["Cover", "Recouvrir", "Cover", "Cover", "覆盖"]),
-    ("Dissolve", ["Dissolve", "Dissolution", "Dissolve", "Dissolve", "溶解"]),
-    ("Fade", ["Fade", "Fondu", "Fade", "Fade", "淡入淡出"]),
-    ("Push", ["Push", "Pousser", "Push", "Push", "推入"]),
-    ("Split", ["Split", "Fractionner", "Split", "Split", "分割"]),
-    ("Uncover", ["Uncover", "Découvrir", "Uncover", "Uncover", "揭开"]),
-    ("Wipe", ["Wipe", "Balayage", "Wipe", "Wipe", "擦除"]),
-    ("Simple", ["Simple", "Simple", "Simple", "Simple", "简单"]),
-    ("Simple - Wide", ["Simple - Wide", "Simple - large", "Simple - Wide", "Simple - Wide", "简单－宽"]),
-    ("Triangle - Wide", ["Triangle - Wide", "Triangle - large", "Triangle - Wide", "Triangle - Wide", "三角形－宽"]),
-    ("Barbed", ["Barbed", "Barbelée", "Barbed", "Barbed", "倒钩"]),
-    ("Curved", ["Curved", "Courbe", "Curved", "Curved", "曲线"]),
-    ("Circle", ["Circle", "Cercle", "Circle", "Circle", "圆形"]),
-    ("Circle - Solid", ["Circle - Solid", "Cercle - plein", "Circle - Solid", "Circle - Solid", "实心圆"]),
-    ("Square", ["Square", "Carré", "Square", "Square", "正方形"]),
-    ("Square - Solid", ["Square - Solid", "Carré - plein", "Square - Solid", "Square - Solid", "实心正方形"]),
-    ("Bar", ["Bar", "Barre", "Bar", "Bar", "短线"]),
-    ("Fit Text", ["Fit Text", "Ajuster le texte", "Fit Text", "Fit Text", "适合文本"]),
-    ("Preview (W)", ["Preview (W)", "Aperçu (W)", "Preview (W)", "Preview (W)", "预览 (W)"]),
-    ("Normal (W)", ["Normal (W)", "Normal (W)", "Normal (W)", "Normal (W)", "正常 (W)"]),
-    ("objects", ["objects", "objets", "objects", "objects", "个对象"]),
-    ("pages", ["pages", "pages", "pages", "pages", "页"]),
-    ("stories", ["stories", "articles", "stories", "stories", "篇文章"]),
-    ("items", ["items", "éléments", "items", "items", "个项目"]),
-    ("warnings", ["warnings", "avertissements", "warnings", "warnings", "个警告"]),
-    ("Render", ["Render", "Rendu", "Render", "Render", "渲染"]),
-    ("Set", ["Set", "Jeu", "Set", "Set", "样式集"]),
-    ("unused", ["unused", "inutilisé", "unused", "unused", "未使用"]),
-    ("⚠ Missing", ["⚠ Missing", "⚠ Manquant", "⚠ Missing", "⚠ Missing", "⚠ 缺失"]),
-    ("▲ Modified", ["▲ Modified", "▲ Modifié", "▲ Modified", "▲ Modified", "▲ 已修改"]),
-    ("(Text Color)", ["(Text Color)", "(Couleur du texte)", "(Text Color)", "(Text Color)", "（文本颜色）"]),
-    (
-        "{count} glyphs — click to insert at the text cursor",
-        [
-            "{count} glyphs — click to insert at the text cursor",
-            "{count} glyphes : cliquez pour insérer à l'emplacement du curseur",
-            "{count} glyphs — click to insert at the text cursor",
-            "{count} glyphs — click to insert at the text cursor",
-            "{count} 个字形 — 单击插入到文本光标处",
-        ],
-    ),
-    (
-        "{pages} Pages in {spreads} Spreads",
-        [
-            "{pages} Pages in {spreads} Spreads",
-            "{pages} pages sur {spreads} planches",
-            "{pages} Pages in {spreads} Spreads",
-            "{pages} Pages in {spreads} Spreads",
-            "共 {pages} 页，{spreads} 个跨页",
-        ],
-    ),
-    (" (auto)", [" (auto)", " (auto)", " (auto)", " (auto)", "（自动）"]),
-    (
-        "Absolute Numbering (instead of Section Numbering)",
-        [
-            "Absolute Numbering (instead of Section Numbering)",
-            "Numérotation absolue (au lieu de la numérotation par section)",
-            "Absolute Numbering (instead of Section Numbering)",
-            "Absolute Numbering (instead of Section Numbering)",
-            "绝对页码（而非章节页码）",
-        ],
-    ),
-    (
-        "Add and remove pages as the primary text frame's story grows and shrinks",
-        [
-            "Add and remove pages as the primary text frame's story grows and shrinks",
-            "Ajouter et supprimer des pages à mesure que l'article du bloc de texte principal s'allonge ou se raccourcit",
-            "Add and remove pages as the primary text frame's story grows and shrinks",
-            "Add and remove pages as the primary text frame's story grows and shrinks",
-            "随主文本框架内容增减自动添加或删除页面",
-        ],
-    ),
-    (
-        "Added Text (highlighted)",
-        ["Added Text (highlighted)", "Texte ajouté (surligné)", "Added Text (highlighted)", "Added Text (highlighted)", "新增文本（高亮）"],
-    ),
-    (
-        "Adjust Layout (objects follow the new page size)",
-        [
-            "Adjust Layout (objects follow the new page size)",
-            "Ajuster la mise en page (les objets suivent le nouveau format de page)",
-            "Adjust Layout (objects follow the new page size)",
-            "Adjust Layout (objects follow the new page size)",
-            "调整版面（对象随页面尺寸调整）",
-        ],
-    ),
-    ("Auto-Fit", ["Auto-Fit", "Ajustement automatique", "Auto-Fit", "Auto-Fit", "自动适合"]),
-    ("Case sensitive", ["Case sensitive", "Respecter la casse", "Case sensitive", "Case sensitive", "区分大小写"]),
-    (
-        "Custom Tracking/Kerning",
-        [
-            "Custom Tracking/Kerning",
-            "Approche/crénage personnalisés",
-            "Custom Tracking/Kerning",
-            "Custom Tracking/Kerning",
-            "自定义字距调整/字距微调",
-        ],
-    ),
-    (
-        "Dimensions Include Stroke Weight",
-        [
-            "Dimensions Include Stroke Weight",
-            "Les dimensions incluent l'épaisseur du contour",
-            "Dimensions Include Stroke Weight",
-            "Dimensions Include Stroke Weight",
-            "尺寸包括描边粗细",
-        ],
-    ),
-    ("Enable Autocorrect", ["Enable Autocorrect", "Activer la correction automatique", "Enable Autocorrect", "Enable Autocorrect", "启用自动更正"]),
-    (
-        "Enable Dynamic Spelling (underline misspelled words)",
-        [
-            "Enable Dynamic Spelling (underline misspelled words)",
-            "Activer l'orthographe dynamique (souligner les mots mal orthographiés)",
-            "Enable Dynamic Spelling (underline misspelled words)",
-            "Enable Dynamic Spelling (underline misspelled words)",
-            "启用动态拼写检查（在拼写错误下加线）",
-        ],
-    ),
-    ("Grids in Back", ["Grids in Back", "Grilles en arrière-plan", "Grids in Back", "Grids in Back", "网格置于后方"]),
-    ("H&J Violations", ["H&J Violations", "Infractions de C&J", "H&J Violations", "H&J Violations", "断字与对齐违规"]),
-    ("Include Bleed", ["Include Bleed", "Inclure le fond perdu", "Include Bleed", "Include Bleed", "包含出血"]),
-    (
-        "Include Stroke Weight",
-        ["Include Stroke Weight", "Inclure l'épaisseur du contour", "Include Stroke Weight", "Include Stroke Weight", "包含描边粗细"],
-    ),
-    ("Join our Discord", ["Join our Discord", "Rejoindre notre Discord", "Join our Discord", "Join our Discord", "加入我们的 Discord 社区"]),
-    ("Keep Violations", ["Keep Violations", "Infractions d'enchaînement", "Keep Violations", "Keep Violations", "保持选项违规"]),
-    (
-        "Overprint [Black] Swatch at 100%",
-        [
-            "Overprint [Black] Swatch at 100%",
-            "Surimpression de la nuance [Noir] à 100 %",
-            "Overprint [Black] Swatch at 100%",
-            "Overprint [Black] Swatch at 100%",
-            "100% 黑色色板叠印",
-        ],
-    ),
-    ("Printer's Marks", ["Printer's Marks", "Repères d'impression", "Printer's Marks", "Printer's Marks", "打印标记"]),
-    (
-        "Remove Styles and Formatting from Text and Tables",
-        [
-            "Remove Styles and Formatting from Text and Tables",
-            "Supprimer les styles et la mise en forme du texte et des tableaux",
-            "Remove Styles and Formatting from Text and Tables",
-            "Remove Styles and Formatting from Text and Tables",
-            "从文本和表格中删除样式和格式",
-        ],
-    ),
-    ("Ruby", ["Ruby", "Ruby", "Ruby", "Ruby", "旁注"]),
-    (
-        "Show Note Anchors in Layout View",
-        [
-            "Show Note Anchors in Layout View",
-            "Afficher les ancres de note dans l'affichage Mise en page",
-            "Show Note Anchors in Layout View",
-            "Show Note Anchors in Layout View",
-            "在版面视图显示附注锚点",
-        ],
-    ),
-    ("Spreads", ["Spreads", "Planches", "Spreads", "Spreads", "跨页"]),
-    ("Substituted Fonts", ["Substituted Fonts", "Polices substituées", "Substituted Fonts", "Substituted Fonts", "替换字体"]),
-    (
-        "Transformations are Totals",
-        [
-            "Transformations are Totals",
-            "Les transformations sont des totaux",
-            "Transformations are Totals",
-            "Transformations are Totals",
-            "变换为总计",
-        ],
-    ),
-    (
-        "Use Black Point Compensation",
-        [
-            "Use Black Point Compensation",
-            "Utiliser la compensation du point noir",
-            "Use Black Point Compensation",
-            "Use Black Point Compensation",
-            "使用黑场补偿",
-        ],
-    ),
-    (
-        "Use Typographer's Quotes",
-        [
-            "Use Typographer's Quotes",
-            "Utiliser les guillemets typographiques",
-            "Use Typographer's Quotes",
-            "Use Typographer's Quotes",
-            "使用排版引号",
-        ],
-    ),
-    ("Whole word", ["Whole word", "Mot entier", "Whole word", "Whole word", "全字匹配"]),
-    ("Interface", ["Interface", "Interface", "Interface", "Interface", "界面"]),
-    ("Advanced Type", ["Advanced Type", "Texte avancé", "Advanced Type", "Advanced Type", "高级文字"]),
-    ("Composition", ["Composition", "Composition", "Composition", "Composition", "排版"]),
-    (
-        "Show Font Names in English",
-        [
-            "Schriftnamen auf Englisch anzeigen",
-            "Afficher les noms de police en anglais",
-            "Mostrar nombres de fuentes en inglés",
-            "フォント名を英語で表示",
-            "以英文显示字体名称",
-        ],
-    ),
-    ("Show CJK Features", ["CJK-Funktionen anzeigen", "Afficher les fonctions CJK", "Mostrar funciones CJK", "CJK 機能を表示", "显示中日韩功能"]),
-    ("Missing Glyphs", ["Fehlende Glyphen", "Glyphes manquants", "Glifos que faltan", "欠落グリフ", "缺失字形"]),
-    (
-        "Draw Missing Glyphs from Fallback Fonts",
-        [
-            "Fehlende Glyphen aus Ersatzschriften zeichnen",
-            "Dessiner les glyphes manquants avec des polices de substitution",
-            "Dibujar los glifos que faltan con fuentes alternativas",
-            "欠落グリフを代替フォントで表示",
-            "用后备字体绘制缺失字形",
-        ],
-    ),
-    ("Units & Increments", ["Units & Increments", "Unités et incréments", "Units & Increments", "Units & Increments", "单位和增量"]),
-    ("Grids", ["Grids", "Grilles", "Grids", "Grids", "网格"]),
-    ("Guides & Pasteboard", ["Guides & Pasteboard", "Repères et table de montage", "Guides & Pasteboard", "Guides & Pasteboard", "参考线和粘贴板"]),
-    ("Dictionary", ["Dictionary", "Dictionnaire", "Dictionary", "Dictionary", "词典"]),
-    ("Autocorrect", ["Autocorrect", "Correction automatique", "Autocorrect", "Autocorrect", "自动更正"]),
-    ("Story Editor Display", ["Story Editor Display", "Affichage du mode éditeur", "Story Editor Display", "Story Editor Display", "文章编辑器显示"]),
-    ("File Handling", ["File Handling", "Gestion des fichiers", "File Handling", "File Handling", "文件处理"]),
-    (
-        "Formatting affects container (J)",
-        [
-            "Formatting affects container (J)",
-            "La mise en forme agit sur le conteneur (J)",
-            "Formatting affects container (J)",
-            "Formatting affects container (J)",
-            "格式应用于容器 (J)",
-        ],
-    ),
-    (
-        "Formatting affects text (J)",
-        [
-            "Formatting affects text (J)",
-            "La mise en forme agit sur le texte (J)",
-            "Formatting affects text (J)",
-            "Formatting affects text (J)",
-            "格式应用于文字 (J)",
-        ],
-    ),
-    ("Apply None", ["Apply None", "Appliquer Aucun", "Apply None", "Apply None", "应用无色"]),
-    ("Height Only", ["Height Only", "Hauteur uniquement", "Height Only", "Height Only", "仅高度"]),
-    ("Width Only", ["Width Only", "Largeur uniquement", "Width Only", "Width Only", "仅宽度"]),
-    ("Height and Width", ["Height and Width", "Hauteur et largeur", "Height and Width", "Height and Width", "高度和宽度"]),
-    ("Height only", ["Height only", "Hauteur uniquement", "Height only", "Height only", "仅高度"]),
-    ("Width only", ["Width only", "Largeur uniquement", "Width only", "Width only", "仅宽度"]),
-    ("Height and width", ["Height and width", "Hauteur et largeur", "Height and width", "Height and width", "高度和宽度"]),
-    ("Version", ["Version", "Version", "Version", "Version", "版本"]),
-    (
-        "{count} characters don't fit",
-        [
-            "{count} characters don't fit",
-            "{count} caractères ne tiennent pas",
-            "{count} characters don't fit",
-            "{count} characters don't fit",
-            "有 {count} 个字符溢出",
-        ],
-    ),
-    ("document", ["document", "document", "document", "document", "文档"]),
-    ("story", ["story", "article", "story", "story", "文章"]),
-    ("selection", ["selection", "sélection", "selection", "selection", "选区"]),
-    ("top", ["top", "haut", "top", "top", "顶部"]),
-    ("center", ["center", "centre", "center", "center", "居中"]),
-    ("bottom", ["bottom", "bas", "bottom", "bottom", "底部"]),
-    ("justify", ["justify", "justifié", "justify", "justify", "两端对齐"]),
-    ("text", ["text", "texte", "text", "text", "文字"]),
-    ("graphic", ["graphic", "graphique", "graphic", "graphic", "图形"]),
-    ("unassigned", ["unassigned", "non attribué", "unassigned", "unassigned", "未指定"]),
-    ("Perceptual", ["Perceptual", "Perception", "Perceptual", "Perceptual", "可感知"]),
-    ("Relative Colorimetric", ["Relative Colorimetric", "Colorimétrie relative", "Relative Colorimetric", "Relative Colorimetric", "相对比色"]),
-    ("Saturation", ["Saturation", "Saturation", "Saturation", "Saturation", "饱和度"]),
-    ("Absolute Colorimetric", ["Absolute Colorimetric", "Colorimétrie absolue", "Absolute Colorimetric", "Absolute Colorimetric", "绝对比色"]),
-    ("No conflicts", ["No conflicts", "Aucun conflit", "No conflicts", "No conflicts", "没有冲突"]),
-    ("Page (1–{count}):", ["Page (1–{count}):", "Page (1–{count}) :", "Page (1–{count}):", "Page (1–{count}):", "页码 (1–{count})："]),
-    (
-        "Fonts in Document: {count}    Missing: {missing}",
-        [
-            "Fonts in Document: {count}    Missing: {missing}",
-            "Polices du document : {count}    Manquantes : {missing}",
-            "Fonts in Document: {count}    Missing: {missing}",
-            "Fonts in Document: {count}    Missing: {missing}",
-            "文档中的字体：{count}    缺失：{missing}",
-        ],
-    ),
-    ("No data source", ["Keine Datenquelle", "Aucune source de données", "No hay fuente de datos", "データソースがありません", "没有数据源"]),
-    (
-        "Select Data Source…",
-        ["Datenquelle auswählen …", "Choisir une source de données…", "Seleccionar fuente de datos…", "データソースを選択…", "选择数据源…"],
-    ),
-    ("Data Merge", ["Datenzusammenführung", "Fusion des données", "Combinación de datos", "データ結合", "数据合并"]),
-    ("Preview", ["Vorschau", "Aperçu", "Previsualización", "プレビュー", "预览"]),
-    ("Previous", ["Zurück", "Précédent", "Anterior", "前へ", "上一条"]),
-    ("Next", ["Weiter", "Suivant", "Siguiente", "次へ", "下一条"]),
-    ("Record", ["Datensatz", "Enregistrement", "Registro", "レコード", "记录"]),
-    ("Merge options", ["Optionen für die Zusammenführung", "Options de fusion", "Opciones de combinación", "結合オプション", "合并选项"]),
-    ("All records", ["Alle Datensätze", "Tous les enregistrements", "Todos los registros", "すべてのレコード", "全部记录"]),
-    ("One record", ["Ein Datensatz", "Un enregistrement", "Un registro", "1件のレコード", "一条记录"]),
-    ("Range", ["Bereich", "Plage", "Intervalo", "範囲", "范围"]),
-    ("Records per page", ["Datensätze pro Seite", "Enregistrements par page", "Registros por página", "ページあたりのレコード", "每页记录数"]),
-    ("Single record", ["Einzelner Datensatz", "Un seul enregistrement", "Un solo registro", "単一レコード", "单条记录"]),
-    ("Multiple records", ["Mehrere Datensätze", "Plusieurs enregistrements", "Varios registros", "複数レコード", "多条记录"]),
-    ("Rows first", ["Zeilen zuerst", "Lignes d'abord", "Filas primero", "行を優先", "先行后列"]),
-    ("Columns first", ["Spalten zuerst", "Colonnes d'abord", "Columnas primero", "列を優先", "先列后行"]),
-    ("Column spacing", ["Spaltenabstand", "Espacement des colonnes", "Espacio entre columnas", "列の間隔", "列间距"]),
-    ("Row spacing", ["Zeilenabstand", "Espacement des lignes", "Espacio entre filas", "行の間隔", "行间距"]),
-    (
-        "Fit proportionally",
-        ["Proportional einpassen", "Ajuster proportionnellement", "Encajar proporcionalmente", "縦横比を保持して合わせる", "按比例适合"],
-    ),
-    (
-        "Fill proportionally",
-        ["Proportional füllen", "Remplir proportionnellement", "Llenar proporcionalmente", "縦横比を保持して塗りつぶす", "按比例填充"],
-    ),
-    (
-        "Fit content to frame",
-        ["Inhalt an Rahmen anpassen", "Ajuster le contenu au bloc", "Ajustar el contenido al marco", "内容をフレームに合わせる", "内容适合框架"],
-    ),
-    ("Center in frame", ["Im Rahmen zentrieren", "Centrer dans le bloc", "Centrar en el marco", "フレーム内で中央", "在框架中居中"]),
-    ("Link images", ["Bilder verknüpfen", "Lier les images", "Vincular imágenes", "画像をリンク", "链接图像"]),
-    ("Limit", ["Obergrenze", "Limite", "Límite", "上限", "上限"]),
-    ("Bind to frame", ["An Rahmen binden", "Lier au bloc", "Vincular al marco", "フレームにバインド", "绑定到框架"]),
-    ("Insert field", ["Feld einfügen", "Insérer le champ", "Insertar campo", "フィールドを挿入", "插入字段"]),
-    (
-        "Pass csv, rows, or bytes from the control channel.",
-        [
-            "csv, rows oder bytes über den Steuerkanal übergeben.",
-            "Transmettez csv, rows ou bytes par le canal de contrôle.",
-            "Pase csv, rows o bytes por el canal de control.",
-            "制御チャネルから csv、rows または bytes を渡します。",
-            "请通过控制通道传入 csv、rows 或 bytes。",
-        ],
-    ),
-    // Paragraph Rules.
-    ("Paragraph Rules…", ["Absatzlinien …", "Filets de paragraphe…", "Filetes de párrafo…", "段落境界線…", "段落线…"]),
-    ("Paragraph Rules", ["Absatzlinien", "Filets de paragraphe", "Filetes de párrafo", "段落境界線", "段落线"]),
-    ("Justification…", ["Blocksatzeinstellungen …", "Justification…", "Justificación…", "両端揃え…", "两端对齐…"]),
-    ("Rule Below", ["Linie unterhalb", "Filet au-dessous", "Filete después", "後境界線", "下方横线"]),
-    ("Tint:", ["Farbton:", "Teinte :", "Matiz:", "濃淡:", "色调："]),
-    ("Apply To:", ["Anwenden auf:", "Appliquer à :", "Aplicar a:", "適用先:", "应用于："]),
-    ("Frame", ["Rahmen", "Bloc", "Marco", "フレーム", "框架"]),
-    ("Slug", ["Infobereich", "Ligne-bloc", "Indicaciones", "印刷可能領域", "辅助信息区"]),
-    ("Presentation", ["Präsentation", "Présentation", "Presentación", "プレゼンテーション", "演示文稿"]),
-    ("Extras", ["Extras", "Extras", "Extras", "エクストラ", "附加"]),
-    ("Column", ["Spalte", "Colonne", "Columna", "段", "栏"]),
-    // File › New › Document
-    ("Recent", ["Zuletzt verwendet", "Récents", "Recientes", "最近使用", "最近"]),
-    ("Saved", ["Gespeichert", "Enregistrés", "Guardados", "保存済み", "已保存"]),
-    ("[Default]", ["[Standard]", "[Par défaut]", "[Predeterminado]", "[初期設定]", "[默认]"]),
-    ("Your Recent Items", ["Zuletzt verwendete Elemente", "Éléments récents", "Elementos recientes", "最近使用した項目", "最近使用的项目"]),
-    (
-        "Saved Presets",
-        ["Gespeicherte Vorgaben", "Paramètres prédéfinis enregistrés", "Ajustes preestablecidos guardados", "保存済みプリセット", "已保存的预设"],
-    ),
-    (
-        "Blank Document Presets",
-        [
-            "Vorgaben für leere Dokumente",
-            "Paramètres prédéfinis de document vierge",
-            "Ajustes preestablecidos de documento en blanco",
-            "空のドキュメントプリセット",
-            "空白文档预设",
-        ],
-    ),
-    ("Delete Preset", ["Vorgabe löschen", "Supprimer le paramètre prédéfini", "Eliminar ajuste preestablecido", "プリセットを削除", "删除预设"]),
-    (
-        "Preset Details",
-        ["Vorgabedetails", "Détails du paramètre prédéfini", "Detalles del ajuste preestablecido", "プリセットの詳細", "预设详细信息"],
-    ),
-    ("Document Name", ["Dokumentname", "Nom du document", "Nombre del documento", "ドキュメント名", "文档名称"]),
-    (
-        "Save Document Preset",
-        [
-            "Dokumentvorgabe speichern",
-            "Enregistrer le paramètre prédéfini de document",
-            "Guardar ajuste preestablecido de documento",
-            "ドキュメントプリセットを保存",
-            "存储文档预设",
-        ],
-    ),
-    (
-        "Save Document Preset As:",
-        [
-            "Dokumentvorgabe speichern unter:",
-            "Enregistrer le paramètre prédéfini de document sous :",
-            "Guardar ajuste preestablecido de documento como:",
-            "ドキュメントプリセットの保存名:",
-            "存储文档预设为：",
-        ],
-    ),
-    ("Preset Name", ["Vorgabename", "Nom du paramètre prédéfini", "Nombre del ajuste preestablecido", "プリセット名", "预设名称"]),
-    ("Save Preset", ["Vorgabe speichern", "Enregistrer le paramètre prédéfini", "Guardar ajuste preestablecido", "プリセットを保存", "存储预设"]),
-    ("Start #", ["Startseitennr.", "N° de début", "N.º inicial", "開始ページ番号", "起始页码"]),
-    ("Column Gutter", ["Spaltenabstand", "Gouttière", "Medianil", "列間隔", "栏间距"]),
-    // Layout › Numbering & Section Options
-    ("Start Section", ["Abschnittsanfang", "Début de section", "Iniciar sección", "セクション開始", "开始新章节"]),
-    (
-        "Automatic Page Numbering",
-        [
-            "Automatische Seitennummerierung",
-            "Numérotation automatique des pages",
-            "Numeración de páginas automática",
-            "自動ページ番号",
-            "自动编排页码",
-        ],
-    ),
-    (
-        "Start Page Numbering at:",
-        ["Seitennummerierung beginnen bei:", "Commencer la numérotation à :", "Iniciar numeración de páginas en:", "開始ページ番号:", "起始页码："],
-    ),
-    ("Section Prefix:", ["Abschnittspräfix:", "Préfixe de section :", "Prefijo de sección:", "セクションプレフィックス:", "章节前缀："]),
-    ("Section Marker:", ["Abschnittsmarke:", "Marqueur de section :", "Marcador de sección:", "セクションマーカー:", "章节标志符："]),
-    (
-        "Include Prefix when Numbering Pages",
-        [
-            "Präfix in Seitennummerierung einschließen",
-            "Inclure le préfixe lors de la numérotation des pages",
-            "Incluir prefijo al numerar páginas",
-            "ページ番号にプレフィックスを含める",
-            "编排页码时包含前缀",
-        ],
-    ),
-    (
-        "Document Chapter Numbering",
-        [
-            "Kapitelnummerierung des Dokuments",
-            "Numérotation des chapitres du document",
-            "Numeración de capítulos del documento",
-            "ドキュメントの章番号",
-            "文档章节编号",
-        ],
-    ),
-    (
-        "Automatic Chapter Numbering",
-        [
-            "Automatische Kapitelnummerierung",
-            "Numérotation automatique des chapitres",
-            "Numeración de capítulos automática",
-            "自動章番号",
-            "自动为章节编号",
-        ],
-    ),
-    (
-        "Start Chapter Numbering at:",
-        [
-            "Kapitelnummerierung beginnen bei:",
-            "Commencer la numérotation des chapitres à :",
-            "Iniciar numeración de capítulos en:",
-            "開始章番号:",
-            "起始章节编号：",
-        ],
-    ),
-    (
-        "Same as Previous Document in the Book",
-        [
-            "Wie vorheriges Dokument im Buch",
-            "Identique au document précédent du livre",
-            "Igual que el documento anterior del libro",
-            "ブック内の前のドキュメントと同じ",
-            "与书籍中的上一文档相同",
-        ],
-    ),
-    ("Book Name:", ["Buchname:", "Nom du livre :", "Nombre del libro:", "ブック名:", "书籍名称："]),
-    ("N/A", ["–", "S.O.", "N/D", "なし", "不适用"]),
-    // Paragraph Style Options: Paragraph Border, Paragraph Shading, Keep Options, Span Columns, Bullets and Numbering.
-    ("Paragraph Border", ["Absatzrahmen", "Contour de paragraphe", "Borde de párrafo", "段落囲み罫", "段落边框"]),
-    ("Paragraph Shading", ["Absatzschattierung", "Ombrage de paragraphe", "Sombreado de párrafo", "段落の背景色", "段落底纹"]),
-    ("Keep Options", ["Umbruchoptionen", "Options d'enchaînement", "Opciones de separación", "段落分離禁止オプション", "保持选项"]),
-    ("Span Columns", ["Spalten überspannen", "Étendre sur les colonnes", "Abarcar columnas", "段抜きと段分割", "跨栏"]),
-    ("Keep with Next:", ["Nicht trennen von nächsten:", "Lier aux suivantes:", "Conservar con siguientes:", "次の段落と分離禁止:", "与下一段保持："]),
-    ("Keep Lines Together", ["Zeilen nicht trennen", "Lignes solidaires", "Conservar líneas juntas", "行を分離しない", "保持各行同页"]),
-    (
-        "All Lines in Paragraph",
-        ["Alle Zeilen im Absatz", "Toutes les lignes du paragraphe", "Todas las líneas del párrafo", "段落のすべての行", "段落中所有行"],
-    ),
-    (
-        "At Start/End of Paragraph",
-        ["Am Anfang/Ende des Absatzes", "Au début/à la fin du paragraphe", "Al inicio/final del párrafo", "段落の始めと終わり", "在段落开头/结尾"],
-    ),
-    ("End:", ["Ende:", "Fin:", "Final:", "終了位置:", "结束："]),
-    ("Start Paragraph:", ["Absatzbeginn:", "Début de paragraphe:", "Inicio de párrafo:", "段落の開始位置:", "段落开始："]),
-    ("Anywhere", ["Überall", "N'importe où", "En cualquier lugar", "任意の位置", "任意位置"]),
-    ("In Next Column", ["In nächster Spalte", "Dans la colonne suivante", "En la siguiente columna", "次の段", "于下一栏"]),
-    ("In Next Frame", ["In nächstem Rahmen", "Dans le bloc suivant", "En el siguiente marco", "次のフレーム", "于下一框架"]),
-    ("On Next Page", ["Auf nächster Seite", "Sur la page suivante", "En la página siguiente", "次のページ", "于下一页"]),
-    (
-        "On Next Odd Page",
-        ["Auf nächster ungerader Seite", "Sur la page impaire suivante", "En la siguiente página impar", "次の奇数ページ", "于下一奇数页"],
-    ),
-    (
-        "On Next Even Page",
-        ["Auf nächster gerader Seite", "Sur la page paire suivante", "En la siguiente página par", "次の偶数ページ", "于下一偶数页"],
-    ),
-    ("Paragraph Layout:", ["Absatzlayout:", "Disposition du paragraphe:", "Diseño de párrafo:", "段落レイアウト:", "段落版面："]),
-    ("Single Column", ["Eine Spalte", "Colonne simple", "Una columna", "単一段", "单栏"]),
-    ("Split Column", ["Spalte unterteilen", "Diviser la colonne", "Dividir columna", "段分割", "拆分栏"]),
-    ("Columns:", ["Spalten:", "Colonnes :", "Columnas:", "段:", "栏数："]),
-    ("All", ["Alle", "Toutes", "Todas", "すべて", "全部"]),
-    ("Inside Gutter:", ["Innerer Spaltenabstand:", "Gouttière intérieure:", "Medianil interior:", "内側の間隔:", "内栏间距："]),
-    ("Outside Gutter:", ["Äußerer Spaltenabstand:", "Gouttière extérieure:", "Medianil exterior:", "外側の間隔:", "外栏间距："]),
-    ("List Type:", ["Listentyp:", "Type de liste:", "Tipo de lista:", "リストタイプ:", "列表类型："]),
-    ("Bullets", ["Aufzählungszeichen", "Puces", "Viñetas", "箇条書き記号", "项目符号"]),
-    ("Numbers", ["Nummerierung", "Numéros", "Números", "自動番号", "编号"]),
-    ("Bullet Character:", ["Aufzählungszeichen:", "Caractère de puce:", "Carácter de viñeta:", "箇条書き記号:", "项目符号字符："]),
-    ("Text After:", ["Text danach:", "Texte après:", "Texto después:", "後続テキスト:", "后续文本："]),
-    ("Gap Tint:", ["Lückenfarbton:", "Teinte de l'espace:", "Matiz del hueco:", "すき間の濃淡:", "间隙色调："]),
-    (
-        "Corner Size and Shape",
-        ["Eckengröße und -form", "Taille et forme des angles", "Tamaño y forma de esquinas", "角のサイズとシェイプ", "角大小和形状"],
-    ),
-    ("Top Left:", ["Oben links:", "En haut à gauche:", "Superior izquierda:", "左上:", "左上："]),
-    ("Top Right:", ["Oben rechts:", "En haut à droite:", "Superior derecha:", "右上:", "右上："]),
-    ("Bottom Right:", ["Unten rechts:", "En bas à droite:", "Inferior derecha:", "右下:", "右下："]),
-    ("Bottom Left:", ["Unten links:", "En bas à gauche:", "Inferior izquierda:", "左下:", "左下："]),
-    ("Rounded", ["Abgerundet", "Arrondi", "Redondeado", "角丸", "圆角"]),
-    ("Inverse Rounded", ["Umgekehrt abgerundet", "Arrondi inversé", "Redondeado inverso", "逆角丸", "反向圆角"]),
-    ("Inset", ["Eingezogen", "En retrait", "Hundido", "内側に切り欠き", "内凹"]),
-    ("Fancy", ["Verziert", "Fantaisie", "Decorativo", "装飾", "花式"]),
-    ("Top Edge:", ["Obere Kante:", "Bord supérieur:", "Borde superior:", "上端:", "上边缘："]),
-    ("Bottom Edge:", ["Untere Kante:", "Bord inférieur:", "Borde inferior:", "下端:", "下边缘："]),
-    ("Em Box Top", ["Geviert oben", "Haut du cadratin", "Parte superior del cuadratín", "仮想ボディの上", "全角框顶部"]),
-    ("Descent", ["Unterlänge", "Jambage inférieur", "Descendente", "ディセント", "下伸部"]),
-    ("Em Box Bottom", ["Geviert unten", "Bas du cadratin", "Parte inferior del cuadratín", "仮想ボディの下", "全角框底部"]),
-    (
-        "Display Border if Paragraph Splits Across Frames/Columns",
-        [
-            "Rahmen anzeigen, wenn der Absatz auf Rahmen/Spalten verteilt ist",
-            "Afficher le contour si le paragraphe est réparti sur plusieurs blocs/colonnes",
-            "Mostrar borde si el párrafo se divide entre marcos/columnas",
-            "段落がフレームや段をまたぐときに囲み罫を表示",
-            "段落跨框架/栏拆分时显示边框",
-        ],
-    ),
-    (
-        "Merge Consecutive Borders and Shading",
-        [
-            "Aufeinanderfolgende Rahmen und Schattierungen zusammenführen",
-            "Fusionner les contours et trames consécutifs",
-            "Combinar bordes y sombreados consecutivos",
-            "連続する囲み罫と背景色を結合",
-            "合并连续的边框和底纹",
-        ],
-    ),
-    ("Clip to Frame", ["Auf Rahmen beschneiden", "Découper selon le bloc", "Recortar al marco", "フレームでクリップ", "剪切到框架"]),
-    (
-        "Do not Print or Export",
-        ["Nicht drucken oder exportieren", "Ne pas imprimer ni exporter", "No imprimir ni exportar", "印刷・書き出ししない", "不打印或导出"],
-    ),
-    ("Space Before Span:", ["Abstand vor Überspannung:", "Espace avant l'étendue:", "Espacio antes de abarcar:", "段抜き前のアキ:", "跨栏前间距："]),
-    (
-        "Space After Span:",
-        ["Abstand nach Überspannung:", "Espace après l'étendue:", "Espacio después de abarcar:", "段抜き後のアキ:", "跨栏后间距："],
-    ),
-    ("Space Before Split:", ["Abstand vor Teilung:", "Espace avant la division:", "Espacio antes de dividir:", "段分割前のアキ:", "拆分前间距："]),
-    ("Space After Split:", ["Abstand nach Teilung:", "Espace après la division:", "Espacio después de dividir:", "段分割後のアキ:", "拆分后间距："]),
-    ("Level:", ["Ebene:", "Niveau:", "Nivel:", "レベル:", "级别："]),
-    ("Glyphs…", ["Glyphen…", "Glyphes…", "Glifos…", "字形…", "字形…"]),
-    ("(Paragraph Font)", ["(Absatzschrift)", "(Police du paragraphe)", "(Fuente del párrafo)", "(段落のフォント)", "(段落字体)"]),
-    (
-        "Restart Numbers at This Level After:",
-        [
-            "Nummerierung auf dieser Ebene neu beginnen nach:",
-            "Recommencer la numérotation à ce niveau après:",
-            "Reiniciar números en este nivel después de:",
-            "このレベルの番号を振り直すきっかけ:",
-            "在此级别后重新编号：",
-        ],
-    ),
-    (
-        "Any Previous Level",
-        ["Einer beliebigen höheren Ebene", "Tout niveau précédent", "Cualquier nivel anterior", "任意の上位レベル", "任何上一级别"],
-    ),
-    ("Tab Position:", ["Tabulatorposition:", "Position de la tabulation:", "Posición de tabulación:", "タブ位置:", "制表符位置："]),
-    (
-        "Paragraph Borders and Shading…",
-        [
-            "Absatzrahmen und -schattierung…",
-            "Contours et trames de paragraphe…",
-            "Bordes y sombreado de párrafo…",
-            "段落囲み罫と段落背景色…",
-            "段落边框和底纹…",
-        ],
-    ),
-    (
-        "Paragraph Borders and Shading",
-        [
-            "Absatzrahmen und -schattierung",
-            "Contours et trames de paragraphe",
-            "Bordes y sombreado de párrafo",
-            "段落囲み罫と段落背景色",
-            "段落边框和底纹",
-        ],
-    ),
-    ("Span Columns…", ["Spalten überspannen…", "Étendre sur les colonnes…", "Abarcar columnas…", "段抜きと段分割…", "跨栏…"]),
-    (
-        "Bullets and Numbering…",
-        ["Aufzählungszeichen und Nummerierung…", "Puces et numérotation…", "Viñetas y numeración…", "箇条書き記号と番号付け…", "项目符号和编号…"],
-    ),
-    ("List:", ["Liste:", "Liste :", "Lista:", "リスト:", "列表："]),
-    ("Mode:", ["Modus:", "Mode :", "Modo:", "モード:", "模式："]),
-    (
-        "Continue from Previous Number",
-        [
-            "Ab vorheriger Zahl fortfahren",
-            "Continuer à partir du numéro précédent",
-            "Continuar desde el número anterior",
-            "前の番号から継続",
-            "从上一编号继续",
-        ],
-    ),
-    ("Start At", ["Beginnen bei", "Commencer à", "Empezar en", "開始番号", "起始编号"]),
-    // Cell strokes.
-    ("Strokes and Fills…", ["Konturen und Flächen …", "Contours et fonds…", "Trazos y rellenos…", "線と塗り…", "描边和填色…"]),
-    ("Cell Stroke", ["Zellkontur", "Contour de cellule", "Trazo de celda", "セルの線", "单元格描边"]),
-    ("Cell Fill", ["Zellfläche", "Fond de cellule", "Relleno de celda", "セルの塗り", "单元格填色"]),
-    ("Cell edges", ["Zellkanten", "Bords de cellule", "Bordes de celda", "セルの境界線", "单元格边缘"]),
-    (
-        "Click a line to include or exclude it. Double-click selects all outer or all inner lines; triple-click selects or clears all.",
-        [
-            "Klicken Sie auf eine Linie, um sie ein- oder auszuschließen. Doppelklick wählt alle äußeren oder alle inneren Linien; Dreifachklick wählt alle aus oder hebt die Auswahl auf.",
-            "Cliquez sur une ligne pour l'inclure ou l'exclure. Un double-clic sélectionne toutes les lignes extérieures ou intérieures ; un triple-clic sélectionne ou désélectionne tout.",
-            "Haga clic en una línea para incluirla o excluirla. Doble clic selecciona todas las líneas exteriores o interiores; triple clic selecciona o borra todas.",
-            "線をクリックすると、含めるか除外するかを切り替えます。ダブルクリックで外側または内側の線をすべて選択し、トリプルクリックですべてを選択または解除します。",
-            "单击线条可将其包含或排除。双击选择所有外侧或所有内侧线条；三击选择或清除全部。",
-        ],
-    ),
-    ("Swatch Options…", ["Farbfeldoptionen …", "Options de nuance…", "Opciones de muestra…", "スウォッチオプション…", "色板选项…"]),
-    ("Swatch Options", ["Farbfeldoptionen", "Options de nuance", "Opciones de muestra", "スウォッチオプション", "色板选项"]),
-    (
-        "Color Group Options…",
-        ["Farbgruppenoptionen …", "Options du groupe de couleurs…", "Opciones de grupo de colores…", "カラーグループオプション…", "颜色组选项…"],
-    ),
-    ("Layer Options", ["Ebenenoptionen", "Options de calque", "Opciones de capa", "レイヤーオプション", "图层选项"]),
-    (
-        "Layer Options for \"{name}\"…",
-        [
-            "Ebenenoptionen für „{name}“ …",
-            "Options du calque « {name} »…",
-            "Opciones de capa para «{name}»…",
-            "「{name}」のレイヤーオプション…",
-            "“{name}”的图层选项…",
-        ],
-    ),
-    ("Swatch Name:", ["Farbfeldname:", "Nom de la nuance :", "Nombre de muestra:", "スウォッチ名:", "色板名称:"]),
-    (
-        "Name with Color Value",
-        ["Name mit Farbwert", "Nommer d'après la valeur chromatique", "Nombre con valor de color", "カラー値を名前にする", "以颜色值命名"],
-    ),
-    ("Color Type:", ["Farbtyp:", "Type de couleur :", "Tipo de color:", "カラータイプ:", "颜色类型:"]),
-    ("Process", ["Prozessfarbe", "Quadrichromie", "Cuatricromía", "プロセス", "印刷色"]),
-    ("Spot", ["Volltonfarbe", "Ton direct", "Tinta plana", "特色", "专色"]),
-    ("Color Mode:", ["Farbmodus:", "Mode colorimétrique :", "Modo de color:", "カラーモード:", "颜色模式:"]),
-    ("Base Color:", ["Grundfarbe:", "Couleur de base :", "Color base:", "ベースカラー:", "基准颜色:"]),
-    (
-        "Edit the gradient's stops in the Gradient panel.",
-        [
-            "Die Verlaufsregler bearbeiten Sie im Verlaufsbedienfeld.",
-            "Modifiez les arrêts du dégradé dans le panneau Dégradé.",
-            "Edite las paradas del degradado en el panel Degradado.",
-            "グラデーションの分岐点はグラデーションパネルで編集します。",
-            "在“渐变”面板中编辑渐变的色标。",
-        ],
-    ),
-    (
-        "This swatch can't be edited.",
-        [
-            "Dieses Farbfeld kann nicht bearbeitet werden.",
-            "Cette nuance ne peut pas être modifiée.",
-            "Esta muestra no se puede editar.",
-            "このスウォッチは編集できません。",
-            "此色板无法编辑。",
-        ],
-    ),
-    ("Light Blue", ["Hellblau", "Bleu clair", "Azul claro", "ライトブルー", "浅蓝色"]),
-    ("Red", ["Rot", "Rouge", "Rojo", "レッド", "红色"]),
-    ("Green", ["Grün", "Vert", "Verde", "グリーン", "绿色"]),
-    ("Blue", ["Blau", "Bleu", "Azul", "ブルー", "蓝色"]),
-    ("Yellow", ["Gelb", "Jaune", "Amarillo", "イエロー", "黄色"]),
-    ("Magenta", ["Magenta", "Magenta", "Magenta", "マゼンタ", "洋红色"]),
-    ("Cyan", ["Cyan", "Cyan", "Cian", "シアン", "青色"]),
-    ("Black", ["Schwarz", "Noir", "Negro", "ブラック", "黑色"]),
-    ("Orange", ["Orange", "Orange", "Naranja", "オレンジ", "橙色"]),
-    ("Dark Green", ["Dunkelgrün", "Vert foncé", "Verde oscuro", "ダークグリーン", "深绿色"]),
-    ("Teal", ["Blaugrün", "Bleu canard", "Verde azulado", "ティール", "蓝绿色"]),
-    ("Tan", ["Hellbraun", "Fauve", "Tostado", "タン", "棕褐色"]),
-    ("Brown", ["Braun", "Marron", "Marrón", "ブラウン", "褐色"]),
-    ("Violet", ["Violett", "Violet", "Violeta", "バイオレット", "紫罗兰色"]),
-    ("Gold", ["Gold", "Or", "Dorado", "ゴールド", "金色"]),
-    ("Show Layer", ["Ebene einblenden", "Afficher le calque", "Mostrar capa", "レイヤーを表示", "显示图层"]),
-    ("Lock Layer", ["Ebene fixieren", "Verrouiller le calque", "Bloquear capa", "レイヤーをロック", "锁定图层"]),
-    ("Print Layer", ["Ebene drucken", "Imprimer le calque", "Imprimir capa", "レイヤーをプリント", "打印图层"]),
-    (
-        "Suppress Text Wrap When Layer is Hidden",
-        [
-            "Textumfluss bei ausgeblendeter Ebene unterdrücken",
-            "Supprimer l'habillage quand le calque est masqué",
-            "Suprimir ceñir texto cuando la capa está oculta",
-            "非表示レイヤーのテキストの回り込みを無視",
-            "图层隐藏时禁止文本绕排",
-        ],
-    ),
-    // Document Setup
-    ("Page Size:", ["Seitenformat:", "Format de page :", "Tamaño de página:", "ページサイズ:", "页面大小："]),
-    (
-        "Adjust page elements to document changes",
-        [
-            "Seitenelemente an Dokumentänderungen anpassen",
-            "Adapter les éléments de page aux modifications du document",
-            "Ajustar los elementos de página a los cambios del documento",
-            "ページ要素をドキュメントの変更に合わせて調整",
-            "根据文档更改调整页面元素",
-        ],
-    ),
-    (
-        "Apply the changes; objects follow the new page size and margins",
-        [
-            "Änderungen anwenden; Objekte folgen dem neuen Seitenformat und den Rändern",
-            "Appliquer les modifications ; les objets suivent le nouveau format et les marges",
-            "Aplicar los cambios; los objetos siguen el nuevo tamaño de página y los márgenes",
-            "変更を適用し、オブジェクトを新しいページサイズとマージンに合わせます",
-            "应用更改；对象跟随新的页面大小和边距",
-        ],
-    ),
-    ("Bleed:", ["Anschnitt:", "Fond perdu :", "Sangrado:", "裁ち落とし:", "出血："]),
-    ("Slug:", ["Infobereich:", "Ligne-bloc :", "Indicaciones:", "印刷可能領域:", "辅助信息区："]),
-    // Font menu
-    ("Filters:", ["Filter:", "Filtres :", "Filtros:", "フィルター:", "过滤器："]),
-    ("All Classes", ["Alle Klassen", "Toutes les classes", "Todas las clases", "すべての分類", "所有分类"]),
-    ("Serif", ["Serifenschrift", "Serif", "Con serifa", "セリフ", "衬线"]),
-    ("Slab Serif", ["Egyptienne", "Slab serif", "Serifa cuadrada", "スラブセリフ", "粗衬线"]),
-    ("Sans Serif", ["Serifenlos", "Sans serif", "Sin serifa", "サンセリフ", "无衬线"]),
-    ("Script", ["Schreibschrift", "Script", "Manuscrita", "スクリプト", "手写体"]),
-    ("Monospaced", ["Dicktengleich", "Chasse fixe", "Monoespaciada", "等幅", "等宽"]),
-    ("Decorative", ["Dekorativ", "Décorative", "Decorativa", "装飾", "装饰"]),
-    ("Symbol", ["Symbol", "Symbole", "Símbolo", "記号", "符号"]),
-    (
-        "Show Recently Added",
-        [
-            "Zuletzt hinzugefügte anzeigen",
-            "Afficher les polices ajoutées récemment",
-            "Mostrar añadidas recientemente",
-            "最近追加したフォントを表示",
-            "显示最近添加的字体",
-        ],
-    ),
-    (
-        "Small Sample Text Size",
-        ["Kleine Beispieltextgröße", "Petite taille de l'exemple", "Tamaño de muestra pequeño", "サンプルテキスト（小）", "小号示例文本"],
-    ),
-    (
-        "Medium Sample Text Size",
-        ["Mittlere Beispieltextgröße", "Taille moyenne de l'exemple", "Tamaño de muestra mediano", "サンプルテキスト（中）", "中号示例文本"],
-    ),
-    (
-        "Large Sample Text Size",
-        ["Große Beispieltextgröße", "Grande taille de l'exemple", "Tamaño de muestra grande", "サンプルテキスト（大）", "大号示例文本"],
-    ),
-    ("Selected Text", ["Ausgewählter Text", "Texte sélectionné", "Texto seleccionado", "選択したテキスト", "所选文本"]),
-    ("Sample", ["Beispiel", "Exemple", "Muestra", "サンプル", "示例"]),
-    ("Similar to {family}", ["Ähnlich wie {family}", "Semblables à {family}", "Similares a {family}", "{family} に類似", "与 {family} 相似"]),
-    (
-        "No fonts match",
-        ["Keine passenden Schriften", "Aucune police ne correspond", "Ninguna fuente coincide", "一致するフォントはありません", "没有匹配的字体"],
-    ),
-    (
-        "Show Similar Fonts",
-        ["Ähnliche Schriften anzeigen", "Afficher les polices semblables", "Mostrar fuentes similares", "類似フォントを表示", "显示相似字体"],
-    ),
-    ("Loading fonts…", ["Schriften werden geladen…", "Chargement des polices…", "Cargando fuentes…", "フォントを読み込み中…", "正在加载字体…"]),
-    ("Show Styles", ["Schnitte einblenden", "Afficher les styles", "Mostrar estilos", "スタイルを表示", "显示样式"]),
-    ("Hide Styles", ["Schnitte ausblenden", "Masquer les styles", "Ocultar estilos", "スタイルを隠す", "隐藏样式"]),
-    ("TrueType font", ["TrueType-Schrift", "Police TrueType", "Fuente TrueType", "TrueType フォント", "TrueType 字体"]),
-    ("OpenType font", ["OpenType-Schrift", "Police OpenType", "Fuente OpenType", "OpenType フォント", "OpenType 字体"]),
-    ("Variable font", ["Variable Schrift", "Police variable", "Fuente variable", "バリアブルフォント", "可变字体"]),
-    ("Color font", ["Farbschrift", "Police couleur", "Fuente de color", "カラーフォント", "彩色字体"]),
-    // Table of Contents.
-    (
-        "Sort Entries in Alphabetical Order",
-        [
-            "Einträge alphabetisch sortieren",
-            "Trier les entrées par ordre alphabétique",
-            "Ordenar entradas alfabéticamente",
-            "項目をアルファベット順に並べ替え",
-            "按字母顺序排列条目",
-        ],
-    ),
-];
-
 /// Interface direction; independent of document binding and paragraph direction.
 pub fn is_rtl(lang: &str) -> bool {
     lang == "ar"
@@ -4779,345 +229,7 @@ pub fn workspace_name<'a>(lang: &str, name: &'a str) -> &'a str {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use std::collections::HashSet;
-
-    /// Every per-language table `tr` looks up, by interface language.
-    const LANGUAGE_TABLES: &[(&str, &[(&str, &str)])] = &[
-        ("ar", ar::TABLE),
-        ("cs", cs::TABLE),
-        ("de", de::TABLE),
-        ("fr", fr::TABLE),
-        ("it", it::TABLE),
-        ("ja", ja::TABLE),
-        ("ka", ka::TABLE),
-        ("pl", pl::TABLE),
-        ("pt-br", pt_br::TABLE),
-        ("ru", ru::TABLE),
-        ("uk", uk::TABLE),
-    ];
-
-    /// Every per-language table `tr_context` looks up.
-    const CONTEXT_TABLES: &[(&str, &[(&str, &str, &str)])] =
-        &[("ar", ar::CONTEXT), ("cs", cs::CONTEXT), ("ja", ja::CONTEXT), ("pl", pl::CONTEXT), ("ru", ru::CONTEXT), ("uk", uk::CONTEXT)];
-
-    /// The languages of the shared tables' columns, in column order.
-    const SHARED_COLUMNS: [&str; 5] = ["de", "fr", "es", "ja", "zh"];
-
-    /// The German and Japanese tables translate the whole interface and win over the shared columns.
-    const WHOLE_INTERFACE: [&str; 2] = ["de", "ja"];
-
-    /// What `tr` shows for a row: an empty one is still untranslated.
-    fn or_english<'a>(text: &'a str, english: &'a str) -> &'a str {
-        if text.trim().is_empty() { english } else { text }
-    }
-
-    #[test]
-    fn cached_lookup_preserves_every_translation_across_language_switches() {
-        let own = |lang: &str, key: &str| {
-            LANGUAGE_TABLES.iter().find(|(code, _)| *code == lang).and_then(|(_, table)| table.iter().find(|(k, _)| *k == key)).map(|(_, text)| *text)
-        };
-        for (key, translations) in TABLE {
-            for (lang, shared) in SHARED_COLUMNS.into_iter().zip(translations) {
-                // A language's own table is looked up before the shared column.
-                let expected = own(lang, key).filter(|text| !text.trim().is_empty()).unwrap_or(*shared);
-                assert_eq!(tr(lang, key), or_english(expected, key), "{lang}: {key}");
-            }
-            assert_eq!(tr("", key), *key);
-        }
-        for (lang, table) in LANGUAGE_TABLES {
-            for (key, expected) in *table {
-                if !expected.trim().is_empty() {
-                    assert_eq!(tr(lang, key), *expected, "{lang}: {key}");
-                }
-                assert_eq!(tr("", key), *key);
-            }
-        }
-        // Strings no catalog has stay as they are, in every language.
-        let unknown = String::from("A user-defined untranslated label");
-        for lang in LANGUAGES.iter().map(|(code, _)| *code).chain(["en", "unknown"]) {
-            assert!(std::ptr::eq(tr(lang, &unknown), unknown.as_str()), "{lang}");
-            // Fixed standard names stay identical.
-            assert_eq!(tr(lang, "PDF/X-4"), "PDF/X-4", "{lang}");
-        }
-    }
-
-    #[test]
-    fn context_captions_come_from_their_context_or_the_plain_translation() {
-        for (lang, table) in CONTEXT_TABLES {
-            for (key, scope, text) in *table {
-                if !text.trim().is_empty() {
-                    assert_eq!(tr_context(lang, key, scope), *text, "{lang}: {key} ({scope})");
-                }
-            }
-        }
-        for (key, scope, row) in CONTEXT {
-            for (lang, shared) in SHARED_COLUMNS.into_iter().zip(row) {
-                // A language's own context table is looked up before the shared one.
-                let own = CONTEXT_TABLES
-                    .iter()
-                    .filter(|(code, _)| *code == lang)
-                    .flat_map(|(_, table)| table.iter())
-                    .find(|(k, s, _)| k == key && s == scope)
-                    .map(|(_, _, text)| *text)
-                    .filter(|text| !text.trim().is_empty());
-                let expected = own.or(Some(*shared).filter(|text| !text.trim().is_empty())).unwrap_or_else(|| tr(lang, key));
-                assert_eq!(tr_context(lang, key, scope), expected, "{lang}: {key} ({scope})");
-            }
-        }
-        // An unknown context, or a language without one, keeps the plain translation.
-        let keys = CONTEXT.iter().map(|(key, _, _)| *key).chain(CONTEXT_TABLES.iter().flat_map(|(_, table)| table.iter().map(|(key, _, _)| *key)));
-        for key in keys {
-            for lang in LANGUAGES.iter().map(|(code, _)| *code).chain(["en"]) {
-                assert_eq!(tr_context(lang, key, "no such context"), tr(lang, key), "{lang}: {key}");
-            }
-            assert_eq!(tr_context("", key, "count"), key);
-        }
-    }
-
-    /// The tables `tr` reads, as (language, key, translation), context captions included.
-    fn entries() -> Vec<(&'static str, &'static str, &'static str)> {
-        let mut entries: Vec<_> = LANGUAGE_TABLES.iter().flat_map(|(lang, table)| table.iter().map(|(key, text)| (*lang, *key, *text))).collect();
-        for (lang, i) in SHARED_COLUMNS.into_iter().zip(0..) {
-            entries.extend(TABLE.iter().filter_map(|(key, row)| row.get(i).map(|text| (lang, *key, *text))));
-            entries.extend(CONTEXT.iter().filter_map(|(key, _, row)| row.get(i).map(|text| (lang, *key, *text))));
-        }
-        entries.extend(CONTEXT_TABLES.iter().flat_map(|(lang, table)| table.iter().map(|(key, _, text)| (*lang, *key, *text))));
-        entries
-    }
-
-    /// Every catalog has one row per key and keeps the English placeholders. A string a catalog
-    /// doesn't translate shows in English, so a missing or empty row fails nothing here; the
-    /// `missing_translations_report` lists them.
-    #[test]
-    fn every_catalog_has_unique_keys_and_keeps_placeholders() {
-        for (lang, i) in SHARED_COLUMNS.iter().zip(0..) {
-            assert_eq!(column(lang), Some(i), "{lang}");
-        }
-        for (lang, table) in LANGUAGE_TABLES {
-            let keys: HashSet<_> = table.iter().map(|(key, _)| *key).collect();
-            assert_eq!(keys.len(), table.len(), "{lang}: duplicate keys");
-        }
-        let shared: HashSet<_> = TABLE.iter().map(|(key, _)| *key).collect();
-        assert_eq!(shared.len(), TABLE.len(), "duplicate keys in the shared table");
-        let shared_contexts: HashSet<_> = CONTEXT.iter().map(|(key, scope, _)| (*key, *scope)).collect();
-        assert_eq!(shared_contexts.len(), CONTEXT.len(), "duplicate keys in the shared context table");
-        for (lang, table) in CONTEXT_TABLES {
-            let keys: HashSet<_> = table.iter().map(|(key, scope, _)| (*key, *scope)).collect();
-            assert_eq!(keys.len(), table.len(), "{lang}: duplicate context keys");
-        }
-        // A per-language table is looked up before the shared table, so a key in both hides the
-        // shared column, except in the tables that translate the whole interface.
-        for (lang, table) in LANGUAGE_TABLES.iter().filter(|(lang, _)| column(lang).is_some() && !WHOLE_INTERFACE.contains(lang)) {
-            let both: Vec<_> = table.iter().map(|(key, _)| *key).filter(|key| shared.contains(key)).collect();
-            assert!(both.is_empty(), "{lang} keys also in the shared table: {both:?}");
-        }
-
-        let placeholders = |s: &'static str| {
-            let mut names: Vec<_> = s.split('{').skip(1).filter_map(|part| part.split_once('}').map(|(name, _)| name)).collect();
-            names.sort_unstable();
-            names
-        };
-        for (lang, key, text) in entries().into_iter().filter(|(_, _, text)| !text.trim().is_empty()) {
-            assert_eq!(placeholders(key), placeholders(text), "{lang}: placeholders of {key:?}");
-        }
-    }
-
-    /// The strings each interface language shows in English, for the `cargo xtask ci` log. It
-    /// always passes: `cargo xtask i18n-report` runs it.
-    #[test]
-    #[ignore = "a report, run by `cargo xtask i18n-report`"]
-    fn missing_translations_report() {
-        let interface = interface_strings();
-        let catalogs: Vec<(&str, HashSet<&str>)> = LANGUAGE_TABLES
-            .iter()
-            .map(|(lang, table)| (*lang, table.iter().map(|(key, _)| *key).collect()))
-            .chain([("shared", TABLE.iter().map(|(key, _)| *key).collect())])
-            .collect();
-        let mut keys: Vec<&str> = interface.iter().copied().chain(catalogs.iter().flat_map(|(_, keys)| keys.iter().copied())).collect();
-        keys.sort_unstable();
-        keys.dedup();
-        // `tr` hands back the string it was given when it has no translation.
-        let missing = |lang: &str| -> Vec<&str> {
-            keys.iter()
-                .copied()
-                .filter(|key| {
-                    let english = (*key).to_owned();
-                    std::ptr::eq(tr(lang, &english), english.as_str())
-                })
-                .collect()
-        };
-        let report: Vec<(&str, Vec<&str>)> = LANGUAGES.iter().filter(|(code, _)| !code.is_empty()).map(|(code, _)| (*code, missing(code))).collect();
-        println!("i18n report: {} interface strings; a missing translation shows in English.", keys.len());
-        for (lang, missing) in &report {
-            println!("  {lang:<6} {:>5} missing", missing.len());
-        }
-        for (lang, missing) in report.iter().filter(|(_, missing)| !missing.is_empty()) {
-            println!("{lang} ({}): {}", missing.len(), missing.iter().map(|key| format!("{key:?}")).collect::<Vec<_>>().join(", "));
-        }
-        // A catalog key neither the interface list nor another catalog knows is stale, or a label
-        // `interface_strings` doesn't list yet.
-        for (name, own) in &catalogs {
-            let mut unknown: Vec<_> = own
-                .iter()
-                .filter(|key| !interface.contains(*key) && !catalogs.iter().any(|(other, keys)| other != name && keys.contains(*key)))
-                .collect();
-            unknown.sort_unstable();
-            if !unknown.is_empty() {
-                println!("{name}: {} rows for keys the interface list doesn't have: {unknown:?}", unknown.len());
-            }
-        }
-    }
-
-    #[test]
-    fn only_arabic_lays_out_right_to_left() {
-        for (code, _) in LANGUAGES {
-            assert_eq!(is_rtl(code), *code == "ar", "{code}");
-        }
-    }
-
-    /// Built-in style and workspace names follow the interface language; names people give their
-    /// own styles and workspaces are document data and stay as typed.
-    #[test]
-    fn only_built_in_style_and_workspace_names_are_translated() {
-        for (code, _) in LANGUAGES {
-            for name in [designcraft_doc::NO_PARA_STYLE, designcraft_doc::BASIC_PARAGRAPH, designcraft_doc::NO_CHAR_STYLE] {
-                assert_eq!(style_name(code, name), tr(code, name), "{code}");
-            }
-            assert_eq!(workspace_name(code, "Essentials"), tr(code, "Essentials"), "{code}");
-            for custom in ["Group", "Columns", "My layout style"] {
-                assert_eq!(style_name(code, custom), custom, "{code}");
-                assert_eq!(workspace_name(code, custom), custom, "{code}");
-            }
-        }
-    }
-
-    /// Languages with several plural forms put the category first, so every number reads the same.
-    #[test]
-    fn category_first_counts_put_the_category_before_every_number() {
-        assert!(!category_first("de") && !category_first(""));
-        for lang in ["ka", "uk", "ru", "pl"] {
-            assert!(category_first(lang), "{lang}");
-            for noun in ["pages", "objects", "errors"] {
-                for n in [0, 1, 2, 4, 5, 11, 12, 21, 22, 25, 101, 111] {
-                    assert_eq!(count_label(lang, noun, n), format!("{}: {n}", tr(lang, noun)), "{lang}: {noun}");
-                }
-            }
-        }
-        assert_eq!(count_label("", "objects", 2), "2 objects");
-    }
-
-    /// Every English string the interface passes to `tr`, as far as the command and tool tables and
-    /// the list of UI-only labels know them.
-    fn interface_strings() -> HashSet<&'static str> {
-        let mut keys = HashSet::new();
-        // Command labels and menu names reach `tr` from the engine and the UI command table.
-        for spec in designcraft_engine::command_specs() {
-            keys.insert(spec.label);
-            keys.extend(spec.menu.iter().copied());
-        }
-        keys.extend(crate::menus::UI_COMMANDS.iter().map(|(_, label, _, _)| *label));
-        // Tool names reach `tr` from the Tools panel.
-        keys.extend(designcraft_tools::TOOL_GROUPS.iter().flat_map(|group| group.iter()).map(|tool| tool.label));
-        // So do the About window's tab names, app descriptions and the credits' column and sort labels.
-        keys.extend(crate::about::ABOUT_TABS);
-        keys.extend(crate::about::SIBLINGS.iter().map(|(_, _, what)| *what));
-        keys.extend(crate::credits::NameMode::ALL.iter().map(|mode| mode.label()));
-        keys.extend(crate::credits::SortKey::ALL.iter().flat_map(|key| [key.label().0, key.label().1]));
-        // UI labels passed to `tr` that no other catalog has yet.
-        keys.extend([
-            "(any)",
-            "(unchanged)",
-            "[No Language]",
-            "Cell Number:",
-            "Differs from this document",
-            "Digits:",
-            "Change fill to:",
-            "Chinese: Simplified",
-            "Chinese: Traditional",
-            "Don't Save",
-            "Email Address:",
-            "Email:",
-            "Find fill:",
-            "Group with",
-            "H:",
-            "Message:",
-            "Organization:",
-            "Phone:",
-            "W:",
-            "Resize panel window",
-            "Resize panels",
-            "Subject:",
-            "Text:",
-            "Unsaved Changes",
-            "“{}” has changes that are not saved. Save them before closing?",
-            "% of all commits",
-            "{count} conflict(s): {names}",
-            "{count} match(es)",
-            "{count} replacement(s) made",
-            "{contributors} contributors · {commits} commits",
-            "{label}: {name} (double-click: Color Picker)",
-            "All",
-            "Align To",
-            "Auto Rename",
-            "Character Style",
-            "Company",
-            "DesignCraft page",
-            "Equal fixed heights for the selected rows; cell text may become overset.",
-            "Found",
-            "Grab bag",
-            "Key Object",
-            "Load Styles",
-            "layer",
-            "layers",
-            "Lines +/−",
-            "New Cell Style",
-            "New Table Style",
-            "No contributor data was built into this copy.",
-            "No matches",
-            "No model credits were built into this copy.",
-            "Object Style",
-            "Paragraph Style",
-            "Press keys…",
-            "Range:",
-            "Redefine Document Style",
-            "Report an issue",
-            "Reverse the order",
-            "Sort Entries in Alphabetical Order",
-            "Story {story} ← story {parent}",
-            "Story Editor — {count} words",
-            "Text Anchor",
-            "Use Document Style Definition",
-            // Status-bar messages.
-            "Alternate layout",
-            "Couldn't write recovery data: {error}",
-            "Export a PDF, IDML or package to share — no cloud account needed.",
-            "Import cancelled: the originating document has closed",
-            "Invalid panel layout; restored the default dock",
-            "PDF import cancelled: the originating document has closed",
-            "Packaged {count} files into {dir}",
-            "Relinked {count}",
-            "Sent {count} page(s) to {printer}",
-            "the default printer",
-            "{name}: import cancelled while a dialog is open; choose the file again",
-            "{name}: {count} step(s) done",
-        ]);
-        keys
-    }
-
-    #[test]
-    fn czech_counts_use_the_plural_form_for_the_number() {
-        for (noun, [one, few, other]) in cs::PLURALS {
-            for (n, form) in [(0, other), (1, one), (2, few), (4, few), (5, other), (11, other), (22, other)] {
-                let expected = if form.trim().is_empty() { format!("{n} {}", tr("cs", noun)) } else { format!("{n} {form}") };
-                assert_eq!(count_label("cs", noun, n), expected, "{noun}");
-            }
-        }
-        // A noun without plural forms keeps the plain translation.
-        assert_eq!(count_label("cs", "a new noun", 3), "3 a new noun");
-    }
-}
+mod tests;
 
 /// `name` lowercased with the Latin accents that occur in language names folded away, so a
 /// byte-wise sort reads alphabetically. Other scripts are left as they are.
diff --git a/crates/ui-egui/src/i18n/ar.rs b/crates/ui-egui/src/i18n/ar.rs
index 49fd3046e..202de0df4 100644
--- a/crates/ui-egui/src/i18n/ar.rs
+++ b/crates/ui-egui/src/i18n/ar.rs
@@ -14,6 +14,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Document", "مستند جديد"),
     ("Open…", "فتح…"),
     ("Close", "إغلاق"),
+    ("Dismiss", "تجاهل"),
     ("Save", "حفظ"),
     ("Save As…", "حفظ باسم…"),
     ("Save a Copy…", "حفظ نسخة…"),
@@ -207,6 +208,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Previous Page", "الصفحة السابقة"),
     ("First Page", "الصفحة الأولى"),
     ("Last Page", "الصفحة الأخيرة"),
+    ("Go Back", "رجوع"),
+    ("Go Forward", "تقدم"),
     ("Font", "خط"),
     ("Size", "الحجم"),
     ("Character", "حرف"),
@@ -1378,6 +1381,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert Text to Table", "تحويل النص إلى جدول"),
     ("Convert to Button", "تحويل إلى زر"),
     ("Convert to Form Field", "تحويل إلى حقل نموذج"),
+    ("Convert to Note", "تحويل إلى ملاحظة"),
     ("Copy Link(s) To…", "نسخ الروابط إلى…"),
     ("Corner Options…", "خيارات الزوايا…"),
     ("Create Alternate Layout…", "إنشاء تخطيط بديل…"),
@@ -1448,6 +1452,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Insert Math Expression…", "إدراج تعبير رياضي…"),
     ("Insert Pages…", "إدراج صفحات…"),
     ("Insert Variable", "إدراج متغير"),
+    ("Convert Variable to Text", "تحويل المتغير إلى نص"),
     ("Inspect Document", "فحص المستند"),
     ("Interface Color Theme", "نسق ألوان الواجهة"),
     ("Join the ArtCraft Discord…", "الانضمام إلى Discord الخاص بـ ArtCraft…"),
@@ -1481,6 +1486,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Table Style…", "نمط جدول جديد…"),
     ("Next Cell", "الخلية التالية"),
     ("Next Document", "المستند التالي"),
+    ("Next Note", "الملاحظة التالية"),
     ("Next Object Above", "الكائن التالي أعلى"),
     ("Next Object Below", "الكائن التالي أسفل"),
     ("Next Object in Group", "الكائن التالي في المجموعة"),
@@ -1509,6 +1515,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Preflight Document", "فحص المستند قبل الطباعة"),
     ("Previous Cell", "الخلية السابقة"),
     ("Previous Document", "المستند السابق"),
+    ("Previous Note", "الملاحظة السابقة"),
     ("Previous Object in Group", "الكائن السابق في المجموعة"),
     ("Printers", "طابعات"),
     ("Proof Colors", "ألوان المعاينة الطباعية"),
@@ -1547,6 +1554,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Set Visibility / Lock", "تعيين الظهور / القفل"),
     ("Show Panel", "إظهار اللوحة"),
     ("Show/Hide Baseline Grid", "إظهار/إخفاء شبكة خط الأساس"),
+    ("Show/Hide Depth Ruler", "إظهار/إخفاء مسطرة العمق"),
     ("Show/Hide Document Grid", "إظهار/إخفاء شبكة المستند"),
     ("Show/Hide Frame Edges", "إظهار/إخفاء حواف الإطارات"),
     ("Show/Hide Guides", "إظهار/إخفاء الأدلة"),
@@ -1558,6 +1566,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Show/Hide Text Threads", "إظهار/إخفاء روابط الإطارات النصية"),
     ("Smooth", "تنعيم"),
     ("Sort", "فرز"),
+    ("Split Note", "تقسيم الملاحظة"),
     ("Split Path", "تقسيم المسار"),
     ("Step and Repeat…", "خطوة وتكرار…"),
     ("Stroke Styles", "أنماط الحدود"),
@@ -1842,6 +1851,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("All records", "كل السجلات"),
     ("Alpha Channel", "قناة ألفا"),
     ("Anchored Object Options", "خيارات الكائن المرسّى"),
+    ("Arrangement", "الترتيب"),
     ("ArtCraft App Page", "صفحة تطبيق ArtCraft"),
     ("ArtCraft Website", "موقع ArtCraft"),
     ("Bind to frame", "ربط بالإطار"),
@@ -1915,6 +1925,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Import XML", "استيراد XML"),
     ("Indent to Here", "إزاحة بادئة إلى هنا"),
     ("Ink Limit 300%", "حد الحبر 300%"),
+    ("All Inks", "جميع الأحبار"),
     ("Insert Anchored Object", "إدراج كائن مرسّى"),
     ("Insert Cross-Reference", "إدراج مرجع متصالب"),
     ("Insert Math Expression", "إدراج تعبير رياضي"),
diff --git a/crates/ui-egui/src/i18n/cs.rs b/crates/ui-egui/src/i18n/cs.rs
index 6f47fdaff..76e2df932 100644
--- a/crates/ui-egui/src/i18n/cs.rs
+++ b/crates/ui-egui/src/i18n/cs.rs
@@ -16,6 +16,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Document…", "Nový dokument…"),
     ("Open…", "Otevřít…"),
     ("Close", "Zavřít"),
+    ("Dismiss", "Skrýt"),
     ("Quit DesignCraft", "Ukončit DesignCraft"),
     ("Save", "Uložit"),
     ("Save As…", "Uložit jako…"),
@@ -507,6 +508,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert Text to Table", "Převést text na tabulku"),
     ("Convert to Button", "Převést na tlačítko"),
     ("Convert to Form Field", "Převést na pole formuláře"),
+    ("Convert to Note", "Převést na poznámku"),
     ("Conveyor", "Dopravník"),
     ("Copy Link(s) To…", "Kopírovat propojení do…"),
     ("Corner Options…", "Možnosti rohů…"),
@@ -597,6 +599,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Insert Math Expression…", "Vložit matematický výraz…"),
     ("Insert Pages…", "Vložit stránky…"),
     ("Insert Variable", "Vložit proměnnou"),
+    ("Convert Variable to Text", "Převést proměnnou na text"),
     ("Inspect Document", "Prozkoumat dokument"),
     ("Interface Color Theme", "Barevný motiv rozhraní"),
     ("Join the ArtCraft Discord…", "Připojit se k Discordu ArtCraft…"),
@@ -632,6 +635,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Table Style…", "Nový styl tabulky…"),
     ("Next Cell", "Další buňka"),
     ("Next Document", "Další dokument"),
+    ("Next Note", "Další poznámka"),
     ("Next Object Above", "Další objekt nad"),
     ("Next Object Below", "Další objekt pod"),
     ("Next Object in Group", "Další objekt ve skupině"),
@@ -665,6 +669,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Preflight Document", "Předtisková kontrola dokumentu"),
     ("Previous Cell", "Předchozí buňka"),
     ("Previous Document", "Předchozí dokument"),
+    ("Previous Note", "Předchozí poznámka"),
     ("Previous Object in Group", "Předchozí objekt ve skupině"),
     ("Primary Text Frame", "Primární textový rámeček"),
     ("Print Booklet…", "Tisk brožury…"),
@@ -705,6 +710,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Set Visibility / Lock", "Nastavit viditelnost / zámek"),
     ("Show Panel", "Zobrazit panel"),
     ("Show/Hide Baseline Grid", "Zobrazit/skrýt mřížku účaří"),
+    ("Show/Hide Depth Ruler", "Zobrazit/skrýt pravítko hloubky"),
     ("Show/Hide Frame Edges", "Zobrazit/skrýt okraje rámečků"),
     ("Show/Hide Guides", "Zobrazit/skrýt vodítka"),
     ("Show/Hide Hidden Characters", "Zobrazit/skrýt skryté znaky"),
@@ -717,6 +723,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Sort", "Seřadit"),
     ("Split Cell Horizontally", "Rozdělit buňku vodorovně"),
     ("Split Cell Vertically", "Rozdělit buňku svisle"),
+    ("Split Note", "Rozdělit poznámku"),
     ("Split Path", "Rozdělit cestu"),
     ("Step and Repeat…", "Krokovat a opakovat…"),
     ("Stroke Styles", "Styly tahu"),
@@ -1462,6 +1469,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Records per page", "Záznamů na stránku"),
     ("Single record", "Jeden záznam"),
     ("Multiple records", "Více záznamů"),
+    ("Arrangement", "Uspořádání"),
     ("Rows first", "Nejdřív řádky"),
     ("Columns first", "Nejdřív sloupce"),
     ("Column spacing", "Mezera mezi sloupci"),
@@ -1480,6 +1488,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Previous Page", "Předchozí stránka"),
     ("First Page", "První stránka"),
     ("Last Page", "Poslední stránka"),
+    ("Go Back", "Přejít zpět"),
+    ("Go Forward", "Přejít vpřed"),
     ("Object Styles", "Styly objektů"),
     ("Row", "Řádek"),
     ("Column", "Sloupec"),
@@ -1729,6 +1739,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("I, II, III, IV...", "I, II, III, IV..."),
     ("Indent to Here", "Odsadit sem"),
     ("Ink Limit 300%", "Limit nánosu barev 300 %"),
+    ("All Inks", "Všechny barvy"),
     ("Internet Standard RGB (sRGB)", "Standardní internetové RGB (sRGB)"),
     ("Left:", "Vlevo:"),
     ("Legacy Macintosh RGB", "Starší Macintosh RGB"),
diff --git a/crates/ui-egui/src/i18n/de.rs b/crates/ui-egui/src/i18n/de.rs
index 97b48316b..24dc45c4c 100644
--- a/crates/ui-egui/src/i18n/de.rs
+++ b/crates/ui-egui/src/i18n/de.rs
@@ -544,6 +544,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert Text to Table", "Text in Tabelle umwandeln"),
     ("Convert to Button", "In Schaltfläche umwandeln"),
     ("Convert to Form Field", "In Formularfeld umwandeln"),
+    ("Convert to Note", "In Notiz umwandeln"),
     ("Conveyor", "Förderband"),
     ("Copy Link(s) To…", "Verknüpfung(en) kopieren nach …"),
     ("Corner Options…", "Eckenoptionen …"),
@@ -634,6 +635,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Insert Math Expression…", "Mathematischen Ausdruck einfügen …"),
     ("Insert Pages…", "Seiten einfügen …"),
     ("Insert Variable", "Variable einfügen"),
+    ("Convert Variable to Text", "Variable in Text konvertieren"),
     ("Inspect Document", "Dokument untersuchen"),
     ("Interface Color Theme", "Farbschema der Oberfläche"),
     ("Join the ArtCraft Discord…", "Dem ArtCraft-Discord beitreten …"),
@@ -669,6 +671,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Table Style…", "Neues Tabellenformat …"),
     ("Next Cell", "Nächste Zelle"),
     ("Next Document", "Nächstes Dokument"),
+    ("Next Note", "Nächste Notiz"),
     ("Next Object Above", "Nächstes Objekt darüber"),
     ("Next Object Below", "Nächstes Objekt darunter"),
     ("Next Object in Group", "Nächstes Objekt in der Gruppe"),
@@ -702,6 +705,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Preflight Document", "Preflight für Dokument"),
     ("Previous Cell", "Vorherige Zelle"),
     ("Previous Document", "Vorheriges Dokument"),
+    ("Previous Note", "Vorherige Notiz"),
     ("Previous Object in Group", "Vorheriges Objekt in der Gruppe"),
     ("Primary Text Frame", "Primärer Textrahmen"),
     ("Print Booklet…", "Broschüre drucken …"),
@@ -742,6 +746,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Set Visibility / Lock", "Sichtbarkeit/Sperre festlegen"),
     ("Show Panel", "Bedienfeld einblenden"),
     ("Show/Hide Baseline Grid", "Grundlinienraster ein-/ausblenden"),
+    ("Show/Hide Depth Ruler", "Tiefenlineal ein-/ausblenden"),
     ("Show/Hide Frame Edges", "Rahmenkanten ein-/ausblenden"),
     ("Show/Hide Guides", "Hilfslinien ein-/ausblenden"),
     ("Show/Hide Hidden Characters", "Verborgene Zeichen ein-/ausblenden"),
@@ -754,6 +759,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Sort", "Sortieren"),
     ("Split Cell Horizontally", "Zelle horizontal teilen"),
     ("Split Cell Vertically", "Zelle vertikal teilen"),
+    ("Split Note", "Notiz teilen"),
     ("Split Path", "Pfad teilen"),
     ("Step and Repeat…", "Duplizieren und versetzt einfügen …"),
     ("Stroke Styles", "Konturformate"),
@@ -1751,6 +1757,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("I, II, III, IV...", "I, II, III, IV..."),
     ("Indent to Here", "Einzug bis hierhin"),
     ("Ink Limit 300%", "Farbauftrag max. 300 %"),
+    ("All Inks", "Alle Druckfarben"),
     ("Internet Standard RGB (sRGB)", "Internet-Standard-RGB (sRGB)"),
     ("Left:", "Links:"),
     ("Legacy Macintosh RGB", "Älteres Macintosh-RGB"),
diff --git a/crates/ui-egui/src/i18n/fr.rs b/crates/ui-egui/src/i18n/fr.rs
index d19a5b56e..b7123a7ae 100644
--- a/crates/ui-egui/src/i18n/fr.rs
+++ b/crates/ui-egui/src/i18n/fr.rs
@@ -151,7 +151,6 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Gradient Feather Tool", "Outil Contour progressif dégradé"),
     ("Gradient Swatch Tool", "Outil Dégradé de nuance"),
     ("Graphic", "Graphique"),
-    ("Group with", "Grouper avec"),
     ("Hair Space", "Espace ultrafine"),
     ("Hand Tool", "Outil Main"),
     ("Hide Guides", "Masquer les repères"),
@@ -164,6 +163,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Indent", "Retrait"),
     ("Indent to Here", "Retrait jusqu'à ce point"),
     ("Ink Limit 300%", "Limite d'encre 300 %"),
+    ("All Inks", "Toutes les encres"),
     ("Insert Anchored Object", "Insérer un objet ancré"),
     ("Insert Cross-Reference", "Insérer une référence croisée"),
     ("Insert Field", "Insérer un champ"),
@@ -258,7 +258,6 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Page Break", "Saut de page"),
     ("Page Options", "Options de page"),
     ("Page Tool", "Outil Page"),
-    ("Panels", "Panneaux"),
     ("Paragraph Return", "Retour de paragraphe"),
     ("Paragraph Style", "Style de paragraphe"),
     ("Paragraph Symbol", "Symbole de paragraphe"),
@@ -303,8 +302,6 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Reset Bar Position", "Réinitialiser la position de la barre"),
     ("Resize Row or Column", "Redimensionner la ligne ou la colonne"),
     ("Resize Window", "Redimensionner la fenêtre"),
-    ("Resize panel window", "Redimensionner la fenêtre du panneau"),
-    ("Resize panels", "Redimensionner les panneaux"),
     ("Reverse the order", "Inverser l'ordre"),
     ("Right Indent Tab", "Tabulation de retrait à droite"),
     ("Rotate Tool", "Outil Rotation"),
diff --git a/crates/ui-egui/src/i18n/it.rs b/crates/ui-egui/src/i18n/it.rs
index 4a3656699..885568696 100644
--- a/crates/ui-egui/src/i18n/it.rs
+++ b/crates/ui-egui/src/i18n/it.rs
@@ -14,6 +14,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Document…", "Nuovo documento…"),
     ("Open…", "Apri…"),
     ("Close", "Chiudi"),
+    ("Dismiss", "Ignora"),
     ("Save", "Salva"),
     ("Save As…", "Salva con nome…"),
     ("Save a Copy…", "Salva una copia…"),
@@ -635,6 +636,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert Text to Table", "Converti testo in tabella"),
     ("Convert to Button", "Converti in pulsante"),
     ("Convert to Form Field", "Converti in campo modulo"),
+    ("Convert to Note", "Converti in nota"),
     ("Conveyor", "Nastro"),
     ("Copy Link(s) To…", "Copia collegamenti in…"),
     ("Corner Options…", "Opzioni angoli…"),
@@ -725,6 +727,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Insert Math Expression…", "Inserisci espressione matematica…"),
     ("Insert Pages…", "Inserisci pagine…"),
     ("Insert Variable", "Inserisci variabile"),
+    ("Convert Variable to Text", "Converti variabile in testo"),
     ("Inspect Document", "Ispeziona documento"),
     ("Interface Color Theme", "Tema colore dell'interfaccia"),
     ("Join the ArtCraft Discord…", "Unisciti al Discord di ArtCraft…"),
@@ -760,6 +763,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Table Style…", "Nuovo stile tabella…"),
     ("Next Cell", "Cella successiva"),
     ("Next Document", "Documento successivo"),
+    ("Next Note", "Nota successiva"),
     ("Next Object Above", "Oggetto successivo sopra"),
     ("Next Object Below", "Oggetto successivo sotto"),
     ("Next Object in Group", "Oggetto successivo nel gruppo"),
@@ -793,6 +797,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Preflight Document", "Verifica preliminare documento"),
     ("Previous Cell", "Cella precedente"),
     ("Previous Document", "Documento precedente"),
+    ("Previous Note", "Nota precedente"),
     ("Previous Object in Group", "Oggetto precedente nel gruppo"),
     ("Primary Text Frame", "Cornice di testo principale"),
     ("Print Booklet…", "Stampa opuscolo…"),
@@ -833,6 +838,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Set Visibility / Lock", "Imposta visibilità / blocco"),
     ("Show Panel", "Mostra pannello"),
     ("Show/Hide Baseline Grid", "Mostra/nascondi griglia linee di base"),
+    ("Show/Hide Depth Ruler", "Mostra/nascondi righello profondità"),
     ("Show/Hide Document Grid", "Mostra/nascondi griglia documento"),
     ("Show/Hide Frame Edges", "Mostra/nascondi bordi cornice"),
     ("Show/Hide Guides", "Mostra/nascondi guide"),
@@ -846,6 +852,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Sort", "Ordina"),
     ("Split Cell Horizontally", "Dividi cella orizzontalmente"),
     ("Split Cell Vertically", "Dividi cella verticalmente"),
+    ("Split Note", "Dividi nota"),
     ("Split Path", "Dividi tracciato"),
     ("Step and Repeat…", "Duplica e ripeti…"),
     ("Stroke Styles", "Stili traccia"),
@@ -1636,6 +1643,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Records per page", "Record per pagina"),
     ("Single record", "Record singolo"),
     ("Multiple records", "Record multipli"),
+    ("Arrangement", "Disposizione"),
     ("Rows first", "Prima le righe"),
     ("Columns first", "Prima le colonne"),
     ("Column spacing", "Spaziatura colonne"),
@@ -1654,6 +1662,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Previous Page", "Pagina precedente"),
     ("First Page", "Prima pagina"),
     ("Last Page", "Ultima pagina"),
+    ("Go Back", "Torna indietro"),
+    ("Go Forward", "Vai avanti"),
     ("Object Styles", "Stili oggetto"),
     ("Row", "Riga"),
     ("Column", "Colonna"),
diff --git a/crates/ui-egui/src/i18n/ja.rs b/crates/ui-egui/src/i18n/ja.rs
index 6180858af..f06f85725 100644
--- a/crates/ui-egui/src/i18n/ja.rs
+++ b/crates/ui-egui/src/i18n/ja.rs
@@ -736,6 +736,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert Text to Table", "テキストを表に変換"),
     ("Convert to Button", "ボタンに変換"),
     ("Convert to Form Field", "フォームフィールドに変換"),
+    ("Convert to Note", "注釈に変換"),
     ("Conveyor", "コンベヤー"),
     ("Copy Link(s) To…", "リンクを指定先にコピー…"),
     ("Corner Options…", "角のオプション…"),
@@ -826,6 +827,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Insert Math Expression…", "数式を挿入…"),
     ("Insert Pages…", "ページを挿入…"),
     ("Insert Variable", "変数を挿入"),
+    ("Convert Variable to Text", "変数をテキストに変換"),
     ("Inspect Document", "ドキュメントを調査"),
     ("Interface Color Theme", "インターフェイスのカラーテーマ"),
     ("Join the ArtCraft Discord…", "ArtCraft の Discord に参加…"),
@@ -861,6 +863,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Table Style…", "新規表スタイル…"),
     ("Next Cell", "次のセル"),
     ("Next Document", "次のドキュメント"),
+    ("Next Note", "次の注釈"),
     ("Next Object Above", "1つ前面のオブジェクト"),
     ("Next Object Below", "1つ背面のオブジェクト"),
     ("Next Object in Group", "グループ内の次のオブジェクト"),
@@ -894,6 +897,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Preflight Document", "ドキュメントのプリフライト"),
     ("Previous Cell", "前のセル"),
     ("Previous Document", "前のドキュメント"),
+    ("Previous Note", "前の注釈"),
     ("Previous Object in Group", "グループ内の前のオブジェクト"),
     ("Primary Text Frame", "主テキストフレーム"),
     ("Print Booklet…", "小冊子をプリント…"),
@@ -934,6 +938,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Set Visibility / Lock", "表示・ロックを設定"),
     ("Show Panel", "パネルを表示"),
     ("Show/Hide Baseline Grid", "ベースライングリッドを表示・非表示"),
+    ("Show/Hide Depth Ruler", "深さ定規を表示・非表示"),
     ("Show/Hide Document Grid", "ドキュメントグリッドを表示・非表示"),
     ("Show/Hide Frame Edges", "フレームの枠を表示・非表示"),
     ("Show/Hide Guides", "ガイドを表示・非表示"),
@@ -947,6 +952,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Sort", "並べ替え"),
     ("Split Cell Horizontally", "セルを横方向に分割"),
     ("Split Cell Vertically", "セルを縦方向に分割"),
+    ("Split Note", "注釈を分割"),
     ("Split Path", "パスを分割"),
     ("Step and Repeat…", "間隔を指定して複製…"),
     ("Stroke Styles", "線スタイル"),
@@ -1949,6 +1955,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("I, II, III, IV...", "I, II, III, IV..."),
     ("Indent to Here", "ここまでインデント"),
     ("Ink Limit 300%", "インキ量の上限 300%"),
+    ("All Inks", "すべてのインキ"),
     ("Internet Standard RGB (sRGB)", "インターネット標準 RGB (sRGB)"),
     ("Left:", "左:"),
     ("Legacy Macintosh RGB", "旧 Macintosh RGB"),
diff --git a/crates/ui-egui/src/i18n/ka.rs b/crates/ui-egui/src/i18n/ka.rs
index 4767b6c30..436c157f4 100644
--- a/crates/ui-egui/src/i18n/ka.rs
+++ b/crates/ui-egui/src/i18n/ka.rs
@@ -17,6 +17,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Document…", "ახალი დოკუმენტი…"),
     ("Open…", "გახსნა…"),
     ("Close", "დახურვა"),
+    ("Dismiss", "დამალვა"),
     ("Save", "შენახვა"),
     ("Save As…", "შენახვა როგორც…"),
     ("Save a Copy…", "ასლის შენახვა…"),
@@ -68,24 +69,24 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Align to Baseline Grid", "საბაზო ბადეზე სწორება"),
     ("Apply Bullets", "მარკერების გამოყენება"),
     ("Apply Numbers", "ნუმერაციის გამოყენება"),
-    ("Inches Decimal", "ინჩები (ათობითი)"),
+    ("Inches Decimal", "დუიმები (ათობითი)"),
     ("Back", "უკან"),
     ("Warning", "გაფრთხილება"),
     ("Don't show again", "აღარ აჩვენო"),
     ("The affected page contains objects. Delete the page anyway?", "გვერდი შეიცავს ობიექტებს. მაინც წავშალო გვერდი?"),
     ("The affected pages contain objects. Delete the pages anyway?", "გვერდები შეიცავს ობიექტებს. მაინც წავშალო გვერდები?"),
-    ("Capture", "შენახვა"),
+    ("Capture", "ჩაწერა"),
     ("Panel Locations", "პანელების მდებარეობა"),
     ("Close Tab Group", "ჩანართების ჯგუფის დახურვა"),
     ("Minimize", "ჩაკეცვა"),
     ("Collapse to Icons", "ხატულებად ჩაკეცვა"),
     ("Panel Options", "პანელის პარამეტრები"),
     ("Panel Options…", "პანელის პარამეტრები…"),
-    ("Show Thumbnails", "მინიატურების ჩვენება"),
+    ("Show Thumbnails", "ესკიზების ჩვენება"),
     ("Show Vertically", "ვერტიკალურად ჩვენება"),
     ("Panel Layout", "პანელის განლაგება"),
     ("Pages on Top", "გვერდები ზემოთ"),
-    ("Parents on Top", "მშობლები ზემოთ"),
+    ("Parents on Top", "საბაზო გვერდები ზემოთ"),
     ("Resize:", "ზომის შეცვლა:"),
     ("Extra Small", "ძალიან პატარა"),
     ("Small", "პატარა"),
@@ -95,8 +96,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Jumbo", "უზარმაზარი"),
     ("Proportional", "პროპორციული"),
     ("Pages Fixed", "გვერდები ფიქსირებული"),
-    ("Parents Fixed", "მშობლები ფიქსირებული"),
-    ("Parents", "მშობელი გვერდები"),
+    ("Parents Fixed", "საბაზო გვერდები ფიქსირებული"),
+    ("Parents", "საბაზო გვერდები"),
     ("Reverse Path", "ტრაექტორიის შებრუნება"),
     ("Set Anchor", "საყრდენი წერტილის დაყენება"),
     ("Clear", "გასუფთავება"),
@@ -562,6 +563,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert Text to Table", "ტექსტის ცხრილად გარდაქმნა"),
     ("Convert to Button", "ღილაკად გარდაქმნა"),
     ("Convert to Form Field", "ფორმის ველად გარდაქმნა"),
+    ("Convert to Note", "შენიშვნად გარდაქმნა"),
     ("Conveyor", "კონვეიერი"),
     ("Copy Link(s) To…", "ბმული ფაილების კოპირება…"),
     ("Corner Options…", "კუთხეების პარამეტრები…"),
@@ -653,6 +655,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Insert Math Expression…", "მათემატიკური გამოსახულების ჩასმა…"),
     ("Insert Pages…", "გვერდების ჩასმა…"),
     ("Insert Variable", "ცვლადის ჩასმა"),
+    ("Convert Variable to Text", "ცვლადის ტექსტად გარდაქმნა"),
     ("Inspect Document", "დოკუმენტის შემოწმება"),
     ("Interface Color Theme", "ინტერფეისის ფერთა თემა"),
     ("Join the ArtCraft Discord…", "შემოუერთდით ArtCraft-ის Discord-ს…"),
@@ -688,6 +691,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Table Style…", "ცხრილის ახალი სტილი…"),
     ("Next Cell", "შემდეგი უჯრა"),
     ("Next Document", "შემდეგი დოკუმენტი"),
+    ("Next Note", "შემდეგი შენიშვნა"),
     ("Next Object Above", "შემდეგი ობიექტი ზემოთ"),
     ("Next Object Below", "შემდეგი ობიექტი ქვემოთ"),
     ("Next Object in Group", "ჯგუფის შემდეგი ობიექტი"),
@@ -721,6 +725,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Preflight Document", "დოკუმენტის წინასწარი შემოწმება"),
     ("Previous Cell", "წინა უჯრა"),
     ("Previous Document", "წინა დოკუმენტი"),
+    ("Previous Note", "წინა შენიშვნა"),
     ("Previous Object in Group", "ჯგუფის წინა ობიექტი"),
     ("Primary Text Frame", "ძირითადი ტექსტური ჩარჩო"),
     ("Print Booklet…", "ბროშურის დაბეჭდვა…"),
@@ -761,6 +766,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Set Visibility / Lock", "ხილვადობის / ჩაკეტვის დაყენება"),
     ("Show Panel", "პანელის ჩვენება"),
     ("Show/Hide Baseline Grid", "საბაზისო ხაზების ბადის ჩვენება/დამალვა"),
+    ("Show/Hide Depth Ruler", "სიღრმის სახაზავის ჩვენება/დამალვა"),
     ("Show/Hide Frame Edges", "ჩარჩოს კიდეების ჩვენება/დამალვა"),
     ("Show/Hide Guides", "დამხმარე ხაზების ჩვენება/დამალვა"),
     ("Show/Hide Hidden Characters", "დამალული სიმბოლოების ჩვენება/დამალვა"),
@@ -773,6 +779,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Sort", "სორტირება"),
     ("Split Cell Horizontally", "უჯრის ჰორიზონტალურად გაყოფა"),
     ("Split Cell Vertically", "უჯრის ვერტიკალურად გაყოფა"),
+    ("Split Note", "შენიშვნის გაყოფა"),
     ("Split Path", "ტრაექტორიის გაყოფა"),
     ("Step and Repeat…", "ბიჯით გამეორება…"),
     ("Stroke Styles", "კონტურის სტილები"),
@@ -1542,9 +1549,9 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("graphic", "გრაფიკა"),
     ("unassigned", "მიუნიჭებელი"),
     ("Perceptual", "აღქმითი"),
-    ("Relative Colorimetric", "შეფარდებით კოლორიმეტრული"),
+    ("Relative Colorimetric", "ფარდობითი კოლორიმეტრიული"),
     ("Saturation", "გაჯერება"),
-    ("Absolute Colorimetric", "აბსოლუტური კოლორიმეტრული"),
+    ("Absolute Colorimetric", "აბსოლუტური კოლორიმეტრიული"),
     ("No conflicts", "კონფლიქტები არ არის"),
     ("Page (1–{count}):", "გვერდი (1–{count}):"),
     ("Fonts in Document: {count}    Missing: {missing}", "დოკუმენტის შრიფტები: {count}    აკლია: {missing}"),
@@ -1562,6 +1569,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Records per page", "ჩანაწერი გვერდზე"),
     ("Single record", "ერთი ჩანაწერი"),
     ("Multiple records", "რამდენიმე ჩანაწერი"),
+    ("Arrangement", "განლაგება"),
     ("Rows first", "ჯერ სტრიქონები"),
     ("Columns first", "ჯერ სვეტები"),
     ("Column spacing", "სვეტებს შორის დაშორება"),
@@ -1586,6 +1594,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Previous Page", "წინა გვერდი"),
     ("First Page", "პირველი გვერდი"),
     ("Last Page", "ბოლო გვერდი"),
+    ("Go Back", "უკან დაბრუნება"),
+    ("Go Forward", "წინ გადასვლა"),
     ("Object Styles", "ობიექტის სტილები"),
     ("Row", "სტრიქონი"),
     ("Rulers", "სახაზავები"),
@@ -1776,6 +1786,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("I, II, III, IV...", "I, II, III, IV..."),
     ("Indent to Here", "აქამდე შეწევა"),
     ("Ink Limit 300%", "საღებავის ზღვარი 300%"),
+    ("All Inks", "ყველა საღებავი"),
     ("Internet Standard RGB (sRGB)", "ინტერნეტის სტანდარტული RGB (sRGB)"),
     ("Left:", "მარცხნივ:"),
     ("Legacy Macintosh RGB", "მოძველებული Macintosh RGB"),
@@ -1909,10 +1920,559 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert to Flex Layout", "მოქნილ განლაგებად გარდაქმნა"),
     ("Remove Flex Layout", "მოქნილი განლაგების წაშლა"),
     ("Show Flex Controls", "მოქნილი მართვის ელემენტების ჩვენება"),
-    ("Export PowerPoint…", "PowerPoint-ად ექსპორტი…"),
+    ("Export PowerPoint…", "PowerPoint ექსპორტი…"),
     ("Open Recent", "ბოლო ფაილების გახსნა"),
     ("Clear Recent Files", "ბოლო ფაილების სიის გასუფთავება"),
     ("Transparency…", "გამჭვირვალობა…"),
     ("Strokes and Fills…", "კონტურები და შევსებები…"),
     ("Show/Hide Document Grid", "დოკუმენტის ბადის ჩვენება/დამალვა"),
+    ("% of all commits", "ყველა კომიტის %"),
+    ("(Paragraph Font)", "(აბზაცის შრიფტი)"),
+    ("(any)", "(ნებისმიერი)"),
+    ("(no effects)", "(ეფექტების გარეშე)"),
+    ("(unchanged)", "(უცვლელი)"),
+    ("1 Parent Character", "ძირითადი ტექსტის 1 სიმბოლო"),
+    ("1 Ruby Character", "რუბის 1 სიმბოლო"),
+    ("1 Ruby Character Aki", "რუბის 1 სიმბოლოს აკი"),
+    ("1-2-1 (JIS) Rule", "1-2-1 (JIS) წესი"),
+    ("1-2-1 Aki", "1-2-1 აკი"),
+    ("1/2 Parent Character", "ძირითადი ტექსტის 1/2 სიმბოლო"),
+    ("1/2 Ruby Character", "რუბის 1/2 სიმბოლო"),
+    ("About", "პროგრამის შესახებ"),
+    ("Above/Right", "ზემოთ/მარჯვნივ"),
+    ("Absorb Ideographic Space at Line End", "იეროგლიფური შორისის შთანთქმა სტრიქონის ბოლოს"),
+    ("Across the Line:", "სტრიქონის გასწვრივ:"),
+    ("Activate Panel", "პანელის გააქტიურება"),
+    ("Add Anchor Point Tool", "საყრდენი წერტილის დამატების ხელსაწყო"),
+    ("Add an object effect to the selected target", "ობიექტის ეფექტის დამატება მონიშნულ სამიზნეზე"),
+    ("Adjust Rotation", "შემობრუნების კორექცია"),
+    ("Adjust Tsume", "ცუმეს კორექცია"),
+    ("Adjust page elements to document changes", "გვერდის ელემენტების დოკუმენტის ცვლილებებზე მორგება"),
+    ("Adjustment When Ruby Is Longer Than Parent", "კორექცია, როცა რუბი ძირითად ტექსტზე გრძელია"),
+    ("Align On:", "სწორება მიმართ:"),
+    ("Align Only First Line to Grid", "ბადეზე მხოლოდ პირველი სტრიქონის სწორება"),
+    ("Align To", "სწორება მიმართ"),
+    ("Align:", "სწორება:"),
+    ("All", "ყველა"),
+    ("All Classes", "ყველა კლასი"),
+    ("All Lines in Paragraph", "აბზაცის ყველა სტრიქონი"),
+    ("Along the Line:", "სტრიქონის გაყოლებით:"),
+    ("Alternate layout", "ალტერნატიული განლაგება"),
+    ("Any Previous Level", "ნებისმიერი წინა დონე"),
+    ("Anywhere", "ნებისმიერ ადგილას"),
+    ("Apply Color (,)", "ფერის გამოყენება (,)"),
+    ("Apply Gradient (.)", "გრადიენტის გამოყენება (.)"),
+    ("Apply To:", "გამოყენება:"),
+    ("Apply the changes; objects follow the new page size and margins", "ცვლილებების გამოყენება; ობიექტები გვერდის ახალ ზომასა და ველებს მიჰყვება"),
+    ("At Start/End of Paragraph", "აბზაცის დასაწყისში/ბოლოს"),
+    ("Auto", "ავტომატური"),
+    ("Auto Align at Line Start/End", "ავტომატური სწორება სტრიქონის დასაწყისში/ბოლოს"),
+    ("Auto Rename", "სახელის ავტომატური შეცვლა"),
+    ("Auto Tate-chu-yoko Settings", "ავტომატური ტატე-ჩუ-იოკოს პარამეტრები"),
+    ("Automatic Chapter Numbering", "თავების ავტომატური დანომვრა"),
+    ("Automatic Page Numbering", "გვერდების ავტომატური დანომვრა"),
+    ("Balance Columns", "სვეტების დაბალანსება"),
+    ("Base Color:", "საბაზისო ფერი:"),
+    ("Baseline Options", "საბაზისო ხაზის პარამეტრები"),
+    ("Basic Blending", "საბაზო შერევა"),
+    ("Below/Left", "ქვემოთ/მარცხნივ"),
+    ("Binary assets added", "დამატებული ბინარული ფაილები"),
+    ("Binary assets removed", "წაშლილი ბინარული ფაილები"),
+    ("Black Circle", "შავი წრე"),
+    ("Black Triangle", "შავი სამკუთხედი"),
+    ("Blank Document Presets", "ცარიელი დოკუმენტის პრესეტები"),
+    ("Blending", "შერევა"),
+    ("Blue", "ლურჯი"),
+    ("Book Name:", "წიგნის სახელი:"),
+    ("Both Sides", "ორივე მხარე"),
+    ("Bottom Edge:", "ქვედა კიდე:"),
+    ("Bottom Left:", "ქვედა მარცხენა:"),
+    ("Bottom Right:", "ქვედა მარჯვენა:"),
+    ("Bounding Box (All Layers)", "შემომსაზღვრელი ჩარჩო (ყველა შრე)"),
+    ("Bounding Box (Visible Layers Only)", "შემომსაზღვრელი ჩარჩო (მხოლოდ ხილული შრეები)"),
+    ("Brown", "ყავისფერი"),
+    ("Bullet Character:", "ბურთულის სიმბოლო:"),
+    ("Bullets", "ბურთულები"),
+    ("Bullets and Numbering…", "ბურთულები და დანომვრა…"),
+    ("Bullseye", "სამიზნე"),
+    ("Bunri-Kinshi", "ბუნრი-კინში"),
+    ("Cell Fill", "უჯრის შევსება"),
+    ("Cell Number:", "უჯრის ნომერი:"),
+    ("Cell Stroke", "უჯრის კონტური"),
+    ("Cell edges", "უჯრის კიდეები"),
+    ("Centered", "ცენტრში"),
+    ("Centered tab", "ცენტრში სწორებული ტაბულაცია"),
+    ("Change Panel Layout", "პანელების განლაგების შეცვლა"),
+    ("Change fill to:", "შევსების შეცვლა:"),
+    ("Character Style", "სიმბოლოს სტილი"),
+    ("Character:", "სიმბოლო:"),
+    ("Characters After Break:", "სიმბოლო წყვეტის შემდეგ:"),
+    ("Characters Before Break:", "სიმბოლო წყვეტამდე:"),
+    ("Chinese: Simplified", "ჩინური: გამარტივებული"),
+    ("Chinese: Traditional", "ჩინური: ტრადიციული"),
+    ("Choke:", "შევიწროება:"),
+    ("Clear All", "ყველას გასუფთავება"),
+    (
+        "Click a line to include or exclude it. Double-click selects all outer or all inner lines; triple-click selects or clears all.",
+        "დაწკაპეთ ხაზზე მის ჩასართავად ან გამოსართავად. ორმაგი დაწკაპუნება მონიშნავს ყველა გარე ან ყველა შიდა ხაზს; სამმაგი დაწკაპუნება ყველას მონიშნავს ან მონიშვნას მოხსნის.",
+    ),
+    ("Clip to Frame", "ჩარჩოზე მოჭრა"),
+    ("Color Group Options…", "ფერების ჯგუფის პარამეტრები…"),
+    ("Color Mode:", "ფერის რეჟიმი:"),
+    ("Color Theme Tool", "ფერთა თემის ხელსაწყო"),
+    ("Color Type:", "ფერის ტიპი:"),
+    ("Color font", "ფერადი შრიფტი"),
+    ("Column Gutter", "სვეტებს შორის შუალედი"),
+    ("Commits", "კომიტები"),
+    ("Company", "კომპანია"),
+    ("Constrain proportions", "პროპორციების შენარჩუნება"),
+    ("Content Collector Tool", "შიგთავსის შემგროვებლის ხელსაწყო"),
+    ("Content Placer Tool", "შიგთავსის განმათავსებლის ხელსაწყო"),
+    ("Continue from Previous Number", "წინა ნომრიდან გაგრძელება"),
+    ("Contributors", "მონაწილეები"),
+    ("Convert Direction Point Tool", "მიმართულების წერტილის გარდაქმნის ხელსაწყო"),
+    ("Convert Point:", "წერტილის გარდაქმნა:"),
+    ("Convert Shape:", "ფიგურის გარდაქმნა:"),
+    ("Corner Size and Shape", "კუთხის ზომა და ფორმა"),
+    ("Corners:", "კუთხეები:"),
+    ("Couldn't write recovery data: {error}", "აღდგენის მონაცემები ვერ ჩაიწერა: {error}"),
+    ("Create Flex Layout", "მოქნილი განლაგების შექმნა"),
+    ("Dark Green", "მუქი მწვანე"),
+    ("Decorative", "დეკორატიული"),
+    ("Default Rules", "ნაგულისხმევი წესები"),
+    ("Delete Anchor Point Tool", "საყრდენი წერტილის წაშლის ხელსაწყო"),
+    ("Delete Preset", "პრესეტის წაშლა"),
+    ("Delete Tab", "ტაბულაციის წაშლა"),
+    ("Depth:", "სიღრმე:"),
+    ("Descent", "დაშვება"),
+    ("DesignCraft page", "DesignCraft-ის გვერდი"),
+    ("Differs from this document", "განსხვავდება ამ დოკუმენტისგან"),
+    ("Diffused", "გაბნეული"),
+    ("Digits:", "ციფრები:"),
+    ("Direct Selection Tool", "პირდაპირი მონიშვნის ხელსაწყო"),
+    ("Display Border if Paragraph Splits Across Frames/Columns", "ჩარჩოს ჩვენება, თუ აბზაცი ჩარჩოებსა/სვეტებზე იყოფა"),
+    ("Display name", "საჩვენებელი სახელი"),
+    ("Distance from Parent:", "მანძილი ძირითად ტექსტამდე:"),
+    ("Distance:", "მანძილი:"),
+    ("Do not Print or Export", "არ დაიბეჭდოს და არ გაიტანოს ექსპორტით"),
+    ("Document Chapter Numbering", "დოკუმენტის თავების დანომვრა"),
+    ("Document Name", "დოკუმენტის სახელი"),
+    ("Double Circle", "ორმაგი წრე"),
+    ("Edge", "კიდე"),
+    ("Edit the gradient's stops in the Gradient panel.", "გრადიენტის გადასვლის წერტილების რედაქტირება გრადიენტის პანელშია."),
+    ("Effects…", "ეფექტები…"),
+    ("Ellipse Frame Tool", "ელიფსური ჩარჩოს ხელსაწყო"),
+    ("Ellipse Tool", "ელიფსის ხელსაწყო"),
+    ("Em Box Bottom", "em-კვადრატის ქვედა კიდე"),
+    ("Em Box Bottom/Left", "em-კვადრატის ქვედა/მარცხენა კიდე"),
+    ("Em Box Center", "em-კვადრატის ცენტრი"),
+    ("Em Box Center (Down)", "em-კვადრატის ცენტრი (ქვემოთ)"),
+    ("Em Box Top", "em-კვადრატის ზედა კიდე"),
+    ("Em Box Top/Right", "em-კვადრატის ზედა/მარჯვენა კიდე"),
+    ("Email Address:", "ელფოსტის მისამართი:"),
+    ("Email:", "ელფოსტა:"),
+    ("End Opacity:", "საბოლოო გაუმჭვირვალობა:"),
+    ("End:", "დასასრული:"),
+    ("Equal Aki", "თანაბარი აკი"),
+    (
+        "Equal fixed heights for the selected rows; cell text may become overset.",
+        "მონიშნული სტრიქონების თანაბარი ფიქსირებული სიმაღლე; უჯრის ტექსტი შეიძლება აღარ დაეტიოს.",
+    ),
+    ("Erase Tool", "წაშლის ხელსაწყო"),
+    (
+        "Export a PDF, IDML or package to share — no cloud account needed.",
+        "გასაზიარებლად PDF-ის, IDML-ის ან პაკეტის ექსპორტი — ღრუბლოვანი ანგარიში საჭირო არ არის.",
+    ),
+    ("Eyedropper Tool", "პიპეტის ხელსაწყო"),
+    ("Fancy", "მოხატული"),
+    ("Feather Width:", "შერბილების სიგანე:"),
+    ("Feather Widths", "შერბილების სიგანეები"),
+    ("Filters:", "ფილტრები:"),
+    ("Find fill:", "შევსების ძებნა:"),
+    ("First commit", "პირველი კომიტი"),
+    ("Fisheye", "თევზის თვალი"),
+    ("Fit Guides to:", "დამხმარე ხაზების მორგება:"),
+    ("Fit to Width", "სიგანეში ჩატევა"),
+    ("Fixed Number", "ფიქსირებული რაოდენობა"),
+    ("Fixed Width", "ფიქსირებული სიგანე"),
+    ("Flex End", "ბოლოში"),
+    ("Flex Layout Options", "მოქნილი განლაგების პარამეტრები"),
+    ("Flex Start", "დასაწყისში"),
+    ("Force", "იძულებითი"),
+    ("Found", "ნაპოვნია"),
+    ("Frame", "ჩარჩო"),
+    ("Frame Edges", "ჩარჩოს კიდეები"),
+    ("Free Transform Tool", "თავისუფალი გარდაქმნის ხელსაწყო"),
+    ("Full Justify", "სრული ორმხრივი სწორება"),
+    ("Gap Tint:", "შუალედის ტონირება:"),
+    ("Gap Tool", "შუალედის ხელსაწყო"),
+    ("Glyphs…", "გლიფები…"),
+    ("Gold", "ოქროსფერი"),
+    ("Grab bag", "სხვადასხვა"),
+    ("Gradient Feather Tool", "კიდეების გრადიენტული შერბილების ხელსაწყო"),
+    ("Gradient Stops", "გრადიენტის გადასვლის წერტილები"),
+    ("Gradient Swatch Tool", "გრადიენტის ხელსაწყო"),
+    ("Green", "მწვანე"),
+    ("Grid Alignment:", "ბადეზე სწორება:"),
+    ("Grid Settings", "ბადის პარამეტრები"),
+    ("Group Ruby", "ჯგუფური რუბი"),
+    ("Gutter:", "შუალედი:"),
+    ("Gyoudori:", "გიოდორი:"),
+    ("H:", "სიმ.:"),
+    ("Hand Tool", "ხელის ხელსაწყო"),
+    ("Hanging Type:", "გამოწევის ტიპი:"),
+    ("Hard Kinsoku", "მკაცრი კინსოკუ"),
+    ("Hidden Characters", "უხილავი სიმბოლოები"),
+    ("Hide Styles", "სტილების დამალვა"),
+    ("Highlight:", "გამოკვეთა:"),
+    ("Horizontal Spacing", "ჰორიზონტალური დაშორება"),
+    ("ICF Bottom", "ICF-ის ქვედა კიდე"),
+    ("ICF Top", "ICF-ის ზედა კიდე"),
+    ("Ignore Text Wrap", "ტექსტით გარშემოვლების უგულებელყოფა"),
+    ("Import cancelled: the originating document has closed", "იმპორტი გაუქმდა: საწყისი დოკუმენტი დაიხურა"),
+    ("In Next Column", "შემდეგ სვეტში"),
+    ("In Next Frame", "შემდეგ ჩარჩოში"),
+    ("Include Prefix when Numbering Pages", "პრეფიქსის ჩართვა გვერდების დანომვრისას"),
+    ("Include Roman Characters", "ლათინური სიმბოლოების ჩართვა"),
+    ("Inset", "ჩაზნექილი"),
+    ("Inset Spacing", "შიდა დაშორება"),
+    ("Inside Gutter:", "შიდა შუალედი:"),
+    ("Inside:", "შიგნით:"),
+    ("Invalid panel layout; restored the default dock", "პანელების განლაგება არასწორია; აღდგა ნაგულისხმევი დოკი"),
+    ("Inverse Rounded", "შებრუნებული მომრგვალებული"),
+    ("Japanese Composition Settings", "იაპონური აწყობის პარამეტრები"),
+    ("Join Path", "ტრაექტორიის შეერთება"),
+    ("Justification…", "სწორება…"),
+    ("Kanji", "კანჯი"),
+    ("Keep Lines Together", "სტრიქონების ერთად დატოვება"),
+    ("Keep Options", "ერთად შენარჩუნების პარამეტრები"),
+    ("Keep with Next:", "შემდეგთან ერთად:"),
+    ("Kenten Color", "კენტენის ფერი"),
+    ("Kenten Settings", "კენტენის პარამეტრები"),
+    ("Kenten Type:", "კენტენის ტიპი:"),
+    ("Key Object", "საკვანძო ობიექტი"),
+    ("Kinsoku Set:", "კინსოკუს ნაკრები:"),
+    ("Kinsoku Type:", "კინსოკუს ტიპი:"),
+    ("Korean Kinsoku", "კორეული კინსოკუ"),
+    ("Large Sample Text Size", "ნიმუშის ტექსტის დიდი ზომა"),
+    ("Last commit", "ბოლო კომიტი"),
+    ("Layer Options", "შრის პარამეტრები"),
+    ("Layer Options for \"{name}\"…", "შრის პარამეტრები: „{name}“…"),
+    ("Leader:", "მიმთითებელი:"),
+    ("Leading Model:", "სტრიქონთაშორისი ინტერვალის მოდელი:"),
+    ("Left-aligned tab", "მარცხნივ სწორებული ტაბულაცია"),
+    ("Left/Right Position:", "პოზიცია მარცხნივ/მარჯვნივ:"),
+    ("Left/Top", "მარცხნივ/ზემოთ"),
+    ("Level:", "დონე:"),
+    ("Light Blue", "ღია ლურჯი"),
+    ("Line Break Options", "სტრიქონის წყვეტის პარამეტრები"),
+    ("Line Spacing:", "სტრიქონთა დაშორება:"),
+    ("Line Tool", "ხაზის ხელსაწყო"),
+    ("Line delta", "სტრიქონების სხვაობა"),
+    ("Lines +/−", "სტრიქონები +/−"),
+    ("Lines added", "დამატებული სტრიქონები"),
+    ("Lines deleted", "წაშლილი სტრიქონები"),
+    ("List Type:", "სიის ტიპი:"),
+    ("List:", "სია:"),
+    ("Load All Text Styles…", "ყველა ტექსტური სტილის ჩატვირთვა…"),
+    ("Load Character Styles…", "სიმბოლოს სტილების ჩატვირთვა…"),
+    ("Load Paragraph Styles…", "აბზაცის სტილების ჩატვირთვა…"),
+    ("Load Styles", "სტილების ჩატვირთვა"),
+    ("Loading fonts…", "შრიფტები იტვირთება…"),
+    ("Lock Layer", "შრის ჩაკეტვა"),
+    ("Lock Zero Point", "ნულოვანი წერტილის ჩაკეტვა"),
+    ("Magnification:", "გადიდების ხარისხი:"),
+    ("Measure Tool", "საზომი ხელსაწყო"),
+    ("Medium Sample Text Size", "ნიმუშის ტექსტის საშუალო ზომა"),
+    ("Merge Consecutive Borders and Shading", "მიყოლებული ჩარჩოებისა და ფონის გაერთიანება"),
+    ("Merged PRs", "გაერთიანებული PR-ები"),
+    ("Message:", "შეტყობინება:"),
+    ("Minimum Scale:", "მინიმალური მასშტაბი:"),
+    ("Mode:", "რეჟიმი:"),
+    ("Models", "მოდელები"),
+    ("Mojikumi Set:", "მოჯიკუმის ნაკრები:"),
+    ("Monospaced", "მონოსიგანიანი"),
+    ("Move Panel", "პანელის გადაადგილება"),
+    ("N/A", "არ ეხება"),
+    ("Name (A–Z)", "სახელი (ა–ჰ)"),
+    ("Name with Color Value", "სახელი ფერის მნიშვნელობით"),
+    ("New Cell Style", "უჯრის ახალი სტილი"),
+    ("New Table Style", "ცხრილის ახალი სტილი"),
+    ("No Adjustment", "კორექციის გარეშე"),
+    ("No contributor data was built into this copy.", "ამ ასლში მონაწილეების მონაცემები არ არის ჩაშენებული."),
+    ("No fonts match", "შესაბამისი შრიფტი არ მოიძებნა"),
+    ("No matches", "დამთხვევა არ არის"),
+    ("No matching commands", "შესაბამისი ბრძანება ვერ მოიძებნა"),
+    ("No model credits were built into this copy.", "ამ ასლში მოდელების მონაცემები არ არის ჩაშენებული."),
+    ("Note Tool", "შენიშვნის ხელსაწყო"),
+    ("Number of Recent Items to Display:", "საჩვენებელი ბოლო ელემენტების რაოდენობა:"),
+    ("Number:", "ნომერი:"),
+    ("Numbers", "რიცხვები"),
+    ("OBJECT", "ობიექტი"),
+    ("Object Style", "ობიექტის სტილი"),
+    ("Offset from Parent", "წანაცვლება ძირითადი ტექსტიდან"),
+    ("On Next Even Page", "შემდეგ ლუწ გვერდზე"),
+    ("On Next Odd Page", "შემდეგ კენტ გვერდზე"),
+    ("On Next Page", "შემდეგ გვერდზე"),
+    ("Opacity:", "გაუმჭვირვალობა:"),
+    ("Open Recent File", "ბოლო ფაილის გახსნა"),
+    ("OpenType font", "OpenType შრიფტი"),
+    ("Optical Margin Alignment", "ველის ოპტიკური სწორება"),
+    ("Orange", "ნარინჯისფერი"),
+    ("Organization:", "ორგანიზაცია:"),
+    ("Origin:", "სათავე:"),
+    ("Outside Gutter:", "გარე შუალედი:"),
+    ("Outside:", "გარეთ:"),
+    ("PDF import cancelled: the originating document has closed", "PDF-ის იმპორტი გაუქმდა: საწყისი დოკუმენტი დაიხურა"),
+    ("Packaged {count} files into {dir}", "შეიფუთა ფაილი: {count}, საქაღალდე: {dir}"),
+    ("Page Size:", "გვერდის ზომა:"),
+    ("Page Tool", "გვერდის ხელსაწყო"),
+    ("Paragraph Border", "აბზაცის ჩარჩო"),
+    ("Paragraph Borders and Shading", "აბზაცის ჩარჩოები და ფონი"),
+    ("Paragraph Borders and Shading…", "აბზაცის ჩარჩოები და ფონი…"),
+    ("Paragraph Layout:", "აბზაცის განლაგება:"),
+    ("Paragraph Shading", "აბზაცის ფონი"),
+    ("Paragraph Style", "აბზაცის სტილი"),
+    ("Parent Character Spacing:", "ძირითადი ტექსტის სიმბოლოთა ინტერვალი:"),
+    ("Parent's Font", "ძირითადი ტექსტის შრიფტი"),
+    ("Paste Vector Art", "ვექტორული გრაფიკის ჩასმა"),
+    ("Pathfinder:", "ტრაექტორიების ოპერაციები:"),
+    ("Paths:", "ტრაექტორიები:"),
+    ("Pen Tool", "კალმის ხელსაწყო"),
+    ("Pencil Tool", "ფანქრის ხელსაწყო"),
+    ("Per-Character Ruby", "სიმბოლოობრივი რუბი"),
+    ("Phone:", "ტელეფონი:"),
+    ("Plain", "უბრალო"),
+    ("Polygon Frame Tool", "მრავალკუთხა ჩარჩოს ხელსაწყო"),
+    ("Polygon Tool", "მრავალკუთხედის ხელსაწყო"),
+    ("Position panel above text frame", "პანელის ტექსტური ჩარჩოს ზემოთ განთავსება"),
+    ("Precise", "ზუსტი"),
+    ("Preset Details", "პრესეტის დეტალები"),
+    ("Preset Name", "პრესეტის სახელი"),
+    ("Press keys…", "დააჭირეთ კლავიშებს…"),
+    ("Print Layer", "შრის დაბეჭდვა"),
+    ("Prioritize Adjustment Amount", "კორექციის სიდიდის პრიორიტეტი"),
+    ("Process", "პროცესი"),
+    ("Push In First", "ჯერ შეწევა"),
+    ("Push Out First", "ჯერ გამოწევა"),
+    ("Push Out Only", "მხოლოდ გამოწევა"),
+    ("Range:", "დიაპაზონი:"),
+    ("Real name", "ნამდვილი სახელი"),
+    ("Recent", "ბოლოდროინდელი"),
+    ("Recent files", "ბოლო ფაილები"),
+    ("Rectangle Frame Tool", "მართკუთხა ჩარჩოს ხელსაწყო"),
+    ("Rectangle Tool", "მართკუთხედის ხელსაწყო"),
+    ("Red", "წითელი"),
+    ("Redefine Document Style", "დოკუმენტის სტილის ხელახლა განსაზღვრა"),
+    ("Relinked {count}", "ხელახლა დაკავშირდა: {count}"),
+    ("Rensuuji", "რენსუუჯი"),
+    ("Reorder in Flex Layout", "მოქნილ განლაგებაში რიგის შეცვლა"),
+    ("Repeat Tab", "ტაბულაციის გამეორება"),
+    ("Report an issue", "ხარვეზის შეტყობინება"),
+    ("Reset Indents", "შეწევების ჩამოყრა"),
+    ("Restart Numbers at This Level After:", "ამ დონეზე დანომვრის თავიდან დაწყება შემდეგის მერე:"),
+    ("Reverse Column", "შებრუნებული სვეტი"),
+    ("Reverse Row", "შებრუნებული სტრიქონი"),
+    ("Reverse the order", "რიგის შებრუნება"),
+    ("Right-aligned tab", "მარჯვნივ სწორებული ტაბულაცია"),
+    ("Right/Bottom", "მარჯვნივ/ქვემოთ"),
+    ("Roman Baseline", "ლათინური საბაზისო ხაზი"),
+    ("Roman Word Break", "ლათინური სიტყვის წყვეტა"),
+    ("Rotate 180°", "180°-ით შემობრუნება"),
+    ("Rotate Roman Characters in Vertical Text", "ლათინური სიმბოლოების შემობრუნება ვერტიკალურ ტექსტში"),
+    ("Rotate Tool", "შემობრუნების ხელსაწყო"),
+    ("Rounded", "მომრგვალებული"),
+    ("Ruby Color", "რუბის ფერი"),
+    ("Ruby Font and Size", "რუბის შრიფტი და ზომა"),
+    ("Ruby Overhang:", "რუბის გადმოშვერა:"),
+    ("Ruby Placement and Spacing", "რუბის განთავსება და დაშორება"),
+    ("Ruby Type:", "რუბის ტიპი:"),
+    ("Same as Previous Document in the Book", "როგორც წიგნის წინა დოკუმენტში"),
+    ("Sample", "ნიმუში"),
+    ("Sans Serif", "უსერიფო"),
+    ("Save Document Preset", "დოკუმენტის პრესეტის შენახვა"),
+    ("Save Document Preset As:", "დოკუმენტის პრესეტის შენახვა სახელით:"),
+    ("Save Preset", "პრესეტის შენახვა"),
+    ("Saved", "შენახული"),
+    ("Saved Presets", "შენახული პრესეტები"),
+    ("Scale Tool", "მასშტაბირების ხელსაწყო"),
+    ("Scissors Tool", "მაკრატლის ხელსაწყო"),
+    ("Script", "სკრიპტი"),
+    ("Section Marker:", "სექციის მარკერი:"),
+    ("Section Prefix:", "სექციის პრეფიქსი:"),
+    ("Select an object to color its fill or stroke.", "მონიშნეთ ობიექტი მისი შევსების ან კონტურის ფერის შესაცვლელად."),
+    ("Select; drag to move the selection to another layer", "მონიშვნა; გადაათრიეთ მონიშნულის სხვა შრეზე გადასატანად"),
+    ("Selected Text", "მონიშნული ტექსტი"),
+    ("Selection Tool", "მონიშვნის ხელსაწყო"),
+    ("Sent {count} page(s) to {printer}", "გაიგზავნა გვერდი: {count}, პრინტერი: {printer}"),
+    ("Serif", "სერიფიანი"),
+    ("Sesame Dot", "სეზამის წერტილი"),
+    ("Settings for:", "პარამეტრები:"),
+    ("Settings…", "პარამეტრები…"),
+    ("Shadow:", "ჩრდილი:"),
+    ("Sharp", "მკვეთრი"),
+    ("Shatai", "შატაი"),
+    ("Shear Tool", "დახრის ხელსაწყო"),
+    ("Show CJK Features", "CJK შესაძლებლობების ჩვენება"),
+    ("Show Layer", "შრის ჩვენება"),
+    ("Show Recently Added", "ბოლოს დამატებულის ჩვენება"),
+    ("Show Similar Fonts", "მსგავსი შრიფტების ჩვენება"),
+    ("Show Styles", "სტილების ჩვენება"),
+    ("Shrink Ruby Width Automatically", "რუბის სიგანის ავტომატური შემცირება"),
+    ("Similar to {family}", "{family}-ის მსგავსი"),
+    ("Simplified Chinese Kinsoku", "გამარტივებული ჩინურის კინსოკუ"),
+    ("Single Column", "ერთი სვეტი"),
+    ("Slab Serif", "სლაბ-სერიფი"),
+    ("Small Black Circle", "პატარა შავი წრე"),
+    ("Small Sample Text Size", "ნიმუშის ტექსტის მცირე ზომა"),
+    ("Small White Circle", "პატარა თეთრი წრე"),
+    ("Smooth Tool", "გაგლუვების ხელსაწყო"),
+    ("Soft Kinsoku", "რბილი კინსოკუ"),
+    ("Softer", "უფრო რბილი"),
+    ("Sort Entries in Alphabetical Order", "ჩანაწერების ანბანურად დალაგება"),
+    ("Source:", "წყარო:"),
+    ("Space After Span:", "დაშორება გაშლის შემდეგ:"),
+    ("Space After Split:", "დაშორება გაყოფის შემდეგ:"),
+    ("Space Around", "დაშორება გარშემო"),
+    ("Space Before Span:", "დაშორება გაშლამდე:"),
+    ("Space Before Split:", "დაშორება გაყოფამდე:"),
+    ("Space Between", "დაშორება შორის"),
+    ("Space Evenly", "თანაბარი დაშორება"),
+    ("Spacing", "ინტერვალი"),
+    ("Span Columns", "სვეტებზე გაშლა"),
+    ("Span Columns…", "სვეტებზე გაშლა…"),
+    ("Spine", "ყუა"),
+    ("Split Column", "სვეტის გაყოფა"),
+    ("Spot", "სპოტ-ფერი"),
+    ("Spread:", "გავრცობა:"),
+    ("Start #", "საწყისი №"),
+    ("Start At", "დაწყება"),
+    ("Start Chapter Numbering at:", "თავების დანომვრის დაწყება:"),
+    ("Start Opacity:", "საწყისი გაუმჭვირვალობა:"),
+    ("Start Page Numbering at:", "გვერდების დანომვრის დაწყება:"),
+    ("Start Paragraph:", "საწყისი აბზაცი:"),
+    ("Start Section", "სექციის დაწყება"),
+    ("Story Editor — {count} words", "ტექსტის რედაქტორი — სიტყვა: {count}"),
+    ("Story {story} ← story {parent}", "ნაკადი {story} ← ნაკადი {parent}"),
+    ("Subject:", "თემა:"),
+    ("Suppress Text Wrap When Layer is Hidden", "ტექსტით გარშემოვლების გამორთვა, როცა შრე დამალულია"),
+    ("Swatch Name:", "ფერის ნიმუშის სახელი:"),
+    ("Swatch Options", "ფერის ნიმუშის პარამეტრები"),
+    ("Swatch Options…", "ფერის ნიმუშის პარამეტრები…"),
+    ("Symbol", "სიმბოლური"),
+    ("Symmetrical", "სიმეტრიული"),
+    ("Tab Position:", "ტაბულაციის პოზიცია:"),
+    ("Tab aligned on a character", "სიმბოლოზე სწორებული ტაბულაცია"),
+    ("Tan", "ღია ყავისფერი"),
+    ("Tate-chu-yoko Digits:", "ტატე-ჩუ-იოკოს ციფრები:"),
+    ("Tate-chu-yoko Settings", "ტატე-ჩუ-იოკოს პარამეტრები"),
+    ("Teal", "ზღვისფერი"),
+    ("Technique:", "ტექნიკა:"),
+    ("Text After:", "ტექსტი შემდეგ:"),
+    ("Text Anchor", "ტექსტის ღუზა"),
+    ("Text Color", "ტექსტის ფერი"),
+    ("Text:", "ტექსტი:"),
+    ("The stroke isn't a gradient.", "კონტური გრადიენტი არ არის."),
+    ("This swatch can't be edited.", "ამ ფერის ნიმუშის რედაქტირება შეუძლებელია."),
+    ("Toggle Presentation", "პრეზენტაციის ჩართვა/გამორთვა"),
+    ("Top Edge:", "ზედა კიდე:"),
+    ("Top Left:", "ზედა მარცხენა:"),
+    ("Top Right:", "ზედა მარჯვენა:"),
+    ("Traditional Chinese Kinsoku", "ტრადიციული ჩინურის კინსოკუ"),
+    ("TrueType font", "TrueType შრიფტი"),
+    ("Type Tool", "ტექსტის ხელსაწყო"),
+    ("Type on a Path Tool", "ტრაექტორიაზე ტექსტის ხელსაწყო"),
+    ("Type/Proof Setup", "ტექსტი/საცდელი ჩვენების პარამეტრები"),
+    ("Type/Rotate Spread", "ტექსტი/გაშლის შემობრუნება"),
+    ("Type/Separations Preview", "ტექსტი/სეპარაციის წინასწარი ნახვა"),
+    ("Unlimited", "შეუზღუდავი"),
+    ("Unlock Zero Point", "ნულოვანი წერტილის განბლოკვა"),
+    ("Up/Down Position:", "პოზიცია ზემოთ/ქვემოთ:"),
+    ("Use Document Style Definition", "დოკუმენტის სტილის განსაზღვრების გამოყენება"),
+    ("Use OpenType Pro Ruby Glyphs", "OpenType Pro-ს რუბის გლიფების გამოყენება"),
+    ("Use Paragraph Gyoudori", "აბზაცის გიოდორის გამოყენება"),
+    ("Username", "მომხმარებლის სახელი"),
+    ("Variable font", "ცვლადი შრიფტი"),
+    ("Vertical Justification", "ვერტიკალური სწორება"),
+    ("Vertical Spacing", "ვერტიკალური დაშორება"),
+    ("Vertical Type Tool", "ვერტიკალური ტექსტის ხელსაწყო"),
+    ("Vertical Type on a Path Tool", "ტრაექტორიაზე ვერტიკალური ტექსტის ხელსაწყო"),
+    ("View Options", "ხედის პარამეტრები"),
+    ("Violet", "იისფერი"),
+    ("W:", "სიგ.:"),
+    ("Warichu Settings", "ვარიჩუს პარამეტრები"),
+    ("Warichu Size:", "ვარიჩუს ზომა:"),
+    ("White Circle", "თეთრი წრე"),
+    ("White Sesame Dot", "თეთრი სეზამის წერტილი"),
+    ("White Triangle", "თეთრი სამკუთხედი"),
+    ("Wrap Content", "შიგთავსის გადატანა"),
+    ("X Offset:", "X წანაცვლება:"),
+    ("X:", "X:"),
+    ("Y Offset:", "Y წანაცვლება:"),
+    ("Your Recent Items", "თქვენი ბოლო ელემენტები"),
+    ("Zoom Tool", "მასშტაბის ხელსაწყო"),
+    ("[Default]", "[ნაგულისხმევი]"),
+    ("[No Language]", "[ენის გარეშე]"),
+    ("image editing", "გამოსახულებების რედაქტირება"),
+    ("layer", "შრე"),
+    ("layers", "შრე"),
+    ("motion graphics and visual effects", "მოძრავი გრაფიკა და ვიზუალური ეფექტები"),
+    ("photo library and raw development", "ფოტობიბლიოთეკა და RAW-ის დამუშავება"),
+    ("reading, organizing and protecting PDFs", "PDF-ების კითხვა, ორგანიზება და დაცვა"),
+    ("the default printer", "ნაგულისხმევი პრინტერი"),
+    ("vector illustration", "ვექტორული ილუსტრაცია"),
+    ("video editing, color and sound", "ვიდეოს მონტაჟი, ფერი და ხმა"),
+    ("{contributors} contributors · {commits} commits", "მონაწილე: {contributors} · კომიტი: {commits}"),
+    ("{count} conflict(s): {names}", "კონფლიქტი: {count} — {names}"),
+    ("{count} match(es)", "დამთხვევა: {count}"),
+    ("{count} replacement(s) made", "ჩანაცვლება: {count}"),
+    ("{label}: {name} (double-click: Color Picker)", "{label}: {name} (ორმაგი დაწკაპუნება: ფერის ამრჩევი)"),
+    ("{name}: import cancelled while a dialog is open; choose the file again", "{name}: იმპორტი გაუქმდა, რადგან დიალოგი ღიაა; აირჩიეთ ფაილი ხელახლა"),
+    ("{name}: {count} step(s) done", "{name}: შესრულდა ნაბიჯი: {count}"),
+    ("Add Tab", "ტაბულაციის დამატება"),
+    ("Apply Numbering & Section Options", "დანომვრისა და სექციის პარამეტრების გამოყენება"),
+    ("Apply Text Attributes (Eyedropper)", "ტექსტის ატრიბუტების გამოყენება (პიპეტი)"),
+    ("Auto Tate-Chu-Yoko", "ავტომატური ტატე-ჩუ-იოკო"),
+    ("Break Thread", "კავშირის გაწყვეტა"),
+    ("Cancel Preview", "წინასწარი ნახვის გაუქმება"),
+    ("Change Tab", "ტაბულაციის შეცვლა"),
+    ("Clear All Tabs", "ყველა ტაბულაციის გასუფთავება"),
+    ("Clear Object Style Overrides", "ობიექტის სტილის გადაფარვების გასუფთავება"),
+    ("Clipping Path Options…", "ჩაჭრის ტრაექტორიის პარამეტრები…"),
+    ("Close Window", "ფანჯრის დახურვა"),
+    ("Color Theme…", "ფერთა თემა…"),
+    ("Commit Preview", "წინასწარი ნახვის დადასტურება"),
+    ("Convert Point", "წერტილის გარდაქმნა"),
+    ("Delete Character Style", "სიმბოლოს სტილის წაშლა"),
+    ("Delete Document Preset", "დოკუმენტის პრესეტის წაშლა"),
+    ("Extract Color Theme", "ფერთა თემის ამოღება"),
+    ("Get Cell Stroke", "უჯრის კონტურის მიღება"),
+    ("Get Tabs", "ტაბულაციის მიღება"),
+    ("Join", "შეერთება"),
+    ("Kerning/Tracking Step", "კერნინგის/ტრეკინგის ბიჯი"),
+    ("List Styles in File", "ფაილში არსებული სტილების სია"),
+    ("Load Styles…", "სტილების ჩატვირთვა…"),
+    ("Maximize/Restore Window", "ფანჯრის გაშლა/აღდგენა"),
+    ("Minimize Window", "ფანჯრის ჩაკეცვა"),
+    ("Move Tab", "ტაბულაციის გადატანა"),
+    ("Move Window", "ფანჯრის გადაადგილება"),
+    ("Object Style Options…", "ობიექტის სტილის პარამეტრები…"),
+    ("Page Options", "გვერდის პარამეტრები"),
+    ("Parent Options…", "საბაზო გვერდის პარამეტრები…"),
+    ("Preview Change", "ცვლილების წინასწარი ნახვა"),
+    ("Recent Files", "ბოლო ფაილები"),
+    ("Redefine Character Style", "სიმბოლოს სტილის ხელახლა განსაზღვრა"),
+    ("Redefine Paragraph Style", "აბზაცის სტილის ხელახლა განსაზღვრა"),
+    ("Remove Frame from Thread", "ჩარჩოს კავშირიდან ამოღება"),
+    ("Reorder Objects", "ობიექტების რიგის შეცვლა"),
+    ("Resize Row or Column", "სტრიქონის ან სვეტის ზომის შეცვლა"),
+    ("Resize Window", "ფანჯრის ზომის შეცვლა"),
+    ("Select Page", "გვერდის მონიშვნა"),
+    ("Select Paragraph", "აბზაცის მონიშვნა"),
+    ("Select Sentence", "წინადადების მონიშვნა"),
+    ("Select Story", "ტექსტური ნაკადის მონიშვნა"),
+    ("Select Text Unit", "ტექსტის ერთეულის მონიშვნა"),
+    ("Set OpenType Features", "OpenType შესაძლებლობების დაყენება"),
+    ("Swap Text Fill and Stroke", "ტექსტის შევსებისა და კონტურის გაცვლა"),
+    ("Thread Text Frames", "ტექსტური ჩარჩოების დაკავშირება"),
 ];
diff --git a/crates/ui-egui/src/i18n/pl.rs b/crates/ui-egui/src/i18n/pl.rs
index bf0c7600b..a5eee9e94 100644
--- a/crates/ui-egui/src/i18n/pl.rs
+++ b/crates/ui-egui/src/i18n/pl.rs
@@ -15,6 +15,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Document…", "Nowy dokument…"),
     ("Open…", "Otwórz…"),
     ("Close", "Zamknij"),
+    ("Dismiss", "Ukryj"),
     ("Save", "Zapisz"),
     ("Save As…", "Zapisz jako…"),
     ("Save a Copy…", "Zapisz kopię…"),
@@ -514,6 +515,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert Text to Table", "Zamień tekst na tabelę"),
     ("Convert to Button", "Zamień na przycisk"),
     ("Convert to Form Field", "Zamień na pole formularza"),
+    ("Convert to Note", "Zamień na notatkę"),
     ("Conveyor", "Przenośnik"),
     ("Copy Link(s) To…", "Kopiuj łącza do…"),
     ("Corner Options…", "Opcje narożników…"),
@@ -604,6 +606,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Insert Math Expression…", "Wstaw wyrażenie matematyczne…"),
     ("Insert Pages…", "Wstaw strony…"),
     ("Insert Variable", "Wstaw zmienną"),
+    ("Convert Variable to Text", "Zamień zmienną na tekst"),
     ("Inspect Document", "Sprawdź dokument"),
     ("Interface Color Theme", "Motyw kolorystyczny interfejsu"),
     ("Join the ArtCraft Discord…", "Dołącz do Discorda ArtCraft…"),
@@ -639,6 +642,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Table Style…", "Nowy styl tabeli…"),
     ("Next Cell", "Następna komórka"),
     ("Next Document", "Następny dokument"),
+    ("Next Note", "Następna notatka"),
     ("Next Object Above", "Następny obiekt powyżej"),
     ("Next Object Below", "Następny obiekt poniżej"),
     ("Next Object in Group", "Następny obiekt w grupie"),
@@ -672,6 +676,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Preflight Document", "Inspekcja wstępna dokumentu"),
     ("Previous Cell", "Poprzednia komórka"),
     ("Previous Document", "Poprzedni dokument"),
+    ("Previous Note", "Poprzednia notatka"),
     ("Previous Object in Group", "Poprzedni obiekt w grupie"),
     ("Primary Text Frame", "Główna ramka tekstowa"),
     ("Print Booklet…", "Drukuj broszurę…"),
@@ -712,6 +717,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Set Visibility / Lock", "Ustaw widoczność / blokadę"),
     ("Show Panel", "Pokaż panel"),
     ("Show/Hide Baseline Grid", "Pokaż/ukryj siatkę linii bazowych"),
+    ("Show/Hide Depth Ruler", "Pokaż/ukryj linijkę głębokości"),
     ("Show/Hide Frame Edges", "Pokaż/ukryj krawędzie ramek"),
     ("Show/Hide Guides", "Pokaż/ukryj linie pomocnicze"),
     ("Show/Hide Hidden Characters", "Pokaż/ukryj ukryte znaki"),
@@ -724,6 +730,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Sort", "Sortuj"),
     ("Split Cell Horizontally", "Podziel komórkę w poziomie"),
     ("Split Cell Vertically", "Podziel komórkę w pionie"),
+    ("Split Note", "Podziel notatkę"),
     ("Split Path", "Podziel ścieżkę"),
     ("Step and Repeat…", "Krok i powtórzenie…"),
     ("Stroke Styles", "Style obrysu"),
@@ -1494,6 +1501,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Records per page", "Rekordy na stronę"),
     ("Single record", "Pojedynczy rekord"),
     ("Multiple records", "Wiele rekordów"),
+    ("Arrangement", "Rozmieszczenie"),
     ("Rows first", "Najpierw wiersze"),
     ("Columns first", "Najpierw kolumny"),
     ("Column spacing", "Odstęp między kolumnami"),
@@ -1517,6 +1525,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Previous Page", "Poprzednia strona"),
     ("First Page", "Pierwsza strona"),
     ("Last Page", "Ostatnia strona"),
+    ("Go Back", "Przejdź wstecz"),
+    ("Go Forward", "Przejdź dalej"),
     ("Object Styles", "Style obiektów"),
     ("Row", "Wiersz"),
     ("Rulers", "Linijki"),
@@ -1701,6 +1711,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("I, II, III, IV...", "I, II, III, IV..."),
     ("Indent to Here", "Wcięcie do tego miejsca"),
     ("Ink Limit 300%", "Limit farby 300%"),
+    ("All Inks", "Wszystkie farby"),
     ("Internet Standard RGB (sRGB)", "Standardowe internetowe RGB (sRGB)"),
     ("Left:", "Lewy:"),
     ("Legacy Macintosh RGB", "Starsze RGB komputerów Macintosh"),
diff --git a/crates/ui-egui/src/i18n/pt_br.rs b/crates/ui-egui/src/i18n/pt_br.rs
index 59c4f2e23..688ae2339 100644
--- a/crates/ui-egui/src/i18n/pt_br.rs
+++ b/crates/ui-egui/src/i18n/pt_br.rs
@@ -15,6 +15,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Document", "Novo documento"),
     ("Open…", "Abrir…"),
     ("Close", "Fechar"),
+    ("Dismiss", "Dispensar"),
     ("Save", "Salvar"),
     ("Save As…", "Salvar como…"),
     ("Save a Copy…", "Salvar uma cópia…"),
@@ -213,6 +214,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Previous Page", "Página anterior"),
     ("First Page", "Primeira página"),
     ("Last Page", "Última página"),
+    ("Go Back", "Voltar"),
+    ("Go Forward", "Avançar"),
     ("Font", "Fonte"),
     ("Size", "Tamanho"),
     ("Character", "Caractere"),
@@ -1515,6 +1518,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert Text to Table", "Converter texto em tabela"),
     ("Convert to Button", "Converter em botão"),
     ("Convert to Form Field", "Converter em campo de formulário"),
+    ("Convert to Note", "Converter em nota"),
     ("Copy Link(s) To…", "Copiar link(s) para…"),
     ("Corner Options…", "Opções de canto…"),
     ("Create Frame", "Criar quadro"),
@@ -1581,6 +1585,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Insert Cross-Reference…", "Inserir referência cruzada…"),
     ("Insert Math Expression…", "Inserir expressão matemática…"),
     ("Insert Variable", "Inserir variável"),
+    ("Convert Variable to Text", "Converter variável em texto"),
     ("Inspect Document", "Inspecionar documento"),
     ("Interface Color Theme", "Tema de cores da interface"),
     ("Join the ArtCraft Discord…", "Entrar no Discord do ArtCraft…"),
@@ -1614,6 +1619,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Table Style…", "Novo estilo de tabela…"),
     ("Next Cell", "Próxima célula"),
     ("Next Document", "Próximo documento"),
+    ("Next Note", "Próxima nota"),
     ("Next Object Above", "Próximo objeto acima"),
     ("Next Object Below", "Próximo objeto abaixo"),
     ("Next Object in Group", "Próximo objeto no grupo"),
@@ -1641,6 +1647,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Preflight Document", "Verificar documento (preflight)"),
     ("Previous Cell", "Célula anterior"),
     ("Previous Document", "Documento anterior"),
+    ("Previous Note", "Nota anterior"),
     ("Previous Object in Group", "Objeto anterior no grupo"),
     ("Printers", "Impressoras"),
     ("Proof Colors", "Cores de prova"),
@@ -1678,6 +1685,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Set Visibility / Lock", "Definir visibilidade / bloqueio"),
     ("Show Panel", "Mostrar painel"),
     ("Show/Hide Baseline Grid", "Mostrar/ocultar grade de linha de base"),
+    ("Show/Hide Depth Ruler", "Mostrar/ocultar régua de profundidade"),
     ("Show/Hide Frame Edges", "Mostrar/ocultar bordas dos quadros"),
     ("Show/Hide Guides", "Mostrar/ocultar guias"),
     ("Show/Hide Hidden Characters", "Mostrar/ocultar caracteres ocultos"),
@@ -1687,6 +1695,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Show/Hide Tagged Frames", "Mostrar/ocultar quadros marcados"),
     ("Show/Hide Text Threads", "Mostrar/ocultar encadeamentos de texto"),
     ("Sort", "Ordenar"),
+    ("Split Note", "Dividir nota"),
     ("Split Path", "Dividir traçado"),
     ("Step and Repeat…", "Passo e repetição…"),
     ("Stroke Styles", "Estilos de traço"),
@@ -1840,6 +1849,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Records per page", "Registros por página"),
     ("Single record", "Registro único"),
     ("Multiple records", "Vários registros"),
+    ("Arrangement", "Organização"),
     ("Rows first", "Linhas primeiro"),
     ("Columns first", "Colunas primeiro"),
     ("Column spacing", "Espaçamento entre colunas"),
diff --git a/crates/ui-egui/src/i18n/ru.rs b/crates/ui-egui/src/i18n/ru.rs
index 412faea7e..c37e44bcb 100644
--- a/crates/ui-egui/src/i18n/ru.rs
+++ b/crates/ui-egui/src/i18n/ru.rs
@@ -18,6 +18,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Document…", "Новый документ…"),
     ("Open…", "Открыть…"),
     ("Close", "Закрыть"),
+    ("Dismiss", "Скрыть"),
     ("Quit DesignCraft", "Выйти из DesignCraft"),
     ("Save", "Сохранить"),
     ("Save As…", "Сохранить как…"),
@@ -494,6 +495,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert Text to Table", "Преобразовать текст в таблицу"),
     ("Convert to Button", "Преобразовать в кнопку"),
     ("Convert to Form Field", "Преобразовать в поле формы"),
+    ("Convert to Note", "Преобразовать в заметку"),
     ("Conveyor", "Конвейер"),
     ("Copy Link(s) To…", "Копировать связанные файлы в…"),
     ("Corner Options…", "Параметры углов…"),
@@ -584,6 +586,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Insert Math Expression…", "Вставить математическое выражение…"),
     ("Insert Pages…", "Вставить страницы…"),
     ("Insert Variable", "Вставить переменную"),
+    ("Convert Variable to Text", "Преобразовать переменную в текст"),
     ("Inspect Document", "Проверить документ"),
     ("Interface Color Theme", "Цветовая тема интерфейса"),
     ("Join the ArtCraft Discord…", "Присоединиться к Discord ArtCraft…"),
@@ -619,6 +622,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Table Style…", "Новый стиль таблицы…"),
     ("Next Cell", "Следующая ячейка"),
     ("Next Document", "Следующий документ"),
+    ("Next Note", "Следующая заметка"),
     ("Next Object Above", "Следующий объект выше"),
     ("Next Object Below", "Следующий объект ниже"),
     ("Next Object in Group", "Следующий объект в группе"),
@@ -652,6 +656,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Preflight Document", "Предпечатная проверка документа"),
     ("Previous Cell", "Предыдущая ячейка"),
     ("Previous Document", "Предыдущий документ"),
+    ("Previous Note", "Предыдущая заметка"),
     ("Previous Object in Group", "Предыдущий объект в группе"),
     ("Primary Text Frame", "Основная текстовая рамка"),
     ("Print Booklet…", "Печать буклета…"),
@@ -692,6 +697,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Set Visibility / Lock", "Задать видимость / блокировку"),
     ("Show Panel", "Показать панель"),
     ("Show/Hide Baseline Grid", "Показать/скрыть сетку базовых линий"),
+    ("Show/Hide Depth Ruler", "Показать/скрыть линейку глубины"),
     ("Show/Hide Frame Edges", "Показать/скрыть границы рамок"),
     ("Show/Hide Guides", "Показать/скрыть направляющие"),
     ("Show/Hide Hidden Characters", "Показать/скрыть скрытые символы"),
@@ -704,6 +710,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Sort", "Сортировать"),
     ("Split Cell Horizontally", "Разделить ячейку по горизонтали"),
     ("Split Cell Vertically", "Разделить ячейку по вертикали"),
+    ("Split Note", "Разделить заметку"),
     ("Split Path", "Разделить контур"),
     ("Step and Repeat…", "Шаг и повтор…"),
     ("Stroke Styles", "Стили обводки"),
@@ -1450,6 +1457,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Records per page", "Записей на страницу"),
     ("Single record", "Одна запись"),
     ("Multiple records", "Несколько записей"),
+    ("Arrangement", "Расположение"),
     ("Rows first", "Сначала строки"),
     ("Columns first", "Сначала столбцы"),
     ("Column spacing", "Интервал между столбцами"),
@@ -1468,6 +1476,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Previous Page", "Предыдущая страница"),
     ("First Page", "Первая страница"),
     ("Last Page", "Последняя страница"),
+    ("Go Back", "Назад"),
+    ("Go Forward", "Вперёд"),
     ("Object Styles", "Стили объектов"),
     ("Row", "Строка"),
     ("Column", "Столбец"),
@@ -1711,6 +1721,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("I, II, III, IV...", "I, II, III, IV..."),
     ("Indent to Here", "Отступ до этого места"),
     ("Ink Limit 300%", "Предел красок 300%"),
+    ("All Inks", "Все краски"),
     ("Internet Standard RGB (sRGB)", "Стандартный RGB для Интернета (sRGB)"),
     ("Left:", "Слева:"),
     ("Legacy Macintosh RGB", "Устаревший Macintosh RGB"),
diff --git a/crates/ui-egui/src/i18n/table.rs b/crates/ui-egui/src/i18n/table.rs
new file mode 100644
index 000000000..fc1618bf2
--- /dev/null
+++ b/crates/ui-egui/src/i18n/table.rs
@@ -0,0 +1,4678 @@
+/// English → [German, French, Spanish, Japanese, Simplified Chinese].
+pub(super) const TABLE: &[(&str, [&str; 5])] = &[
+    (
+        "Character Formatting Controls",
+        [
+            "Steuerelemente für Zeichenformatierung",
+            "Commandes de mise en forme des caractères",
+            "Controles de formato de carácter",
+            "文字形式コントロール",
+            "字符格式控制",
+        ],
+    ),
+    (
+        "Paragraph Formatting Controls",
+        [
+            "Steuerelemente für Absatzformatierung",
+            "Commandes de mise en forme des paragraphes",
+            "Controles de formato de párrafo",
+            "段落形式コントロール",
+            "段落格式控制",
+        ],
+    ),
+    ("Font Size", ["Schriftgrad", "Corps", "Tamaño de fuente", "フォントサイズ", "字体大小"]),
+    ("Vertical Scale", ["Vertikal skalieren", "Échelle verticale", "Escala vertical", "垂直比率", "垂直缩放"]),
+    ("Horizontal Scale", ["Horizontal skalieren", "Échelle horizontale", "Escala horizontal", "水平比率", "水平缩放"]),
+    ("Baseline Shift", ["Grundlinienversatz", "Décalage vertical", "Desplazamiento vertical", "ベースラインシフト", "基线偏移"]),
+    (
+        "Skew (False Italic)",
+        ["Verzerren (falscher Kursivstil)", "Inclinaison (faux italique)", "Sesgar (cursiva falsa)", "歪み（斜体）", "倾斜（伪斜体）"],
+    ),
+    ("Left Indent", ["Einzug links", "Retrait gauche", "Sangría izquierda", "左インデント", "左缩进"]),
+    ("Right Indent", ["Einzug rechts", "Retrait droit", "Sangría derecha", "右インデント", "右缩进"]),
+    (
+        "First Line Left Indent",
+        ["Einzug links in erster Zeile", "Retrait gauche de première ligne", "Sangría izquierda en primera línea", "1行目左インデント", "首行左缩进"],
+    ),
+    (
+        "Last Line Right Indent",
+        ["Einzug rechts in letzter Zeile", "Retrait droit de dernière ligne", "Sangría derecha en última línea", "最終行右インデント", "末行右缩进"],
+    ),
+    (
+        "Drop Cap Number of Lines",
+        ["Initiale: Anzahl der Zeilen", "Lettrine (nombre de lignes)", "Capitular: número de líneas", "ドロップキャップの行数", "首字下沉行数"],
+    ),
+    (
+        "Drop Cap One or More Characters",
+        [
+            "Initiale: ein oder mehrere Zeichen",
+            "Lettrine (un ou plusieurs caractères)",
+            "Capitular: uno o más caracteres",
+            "ドロップキャップの文字数",
+            "首字下沉一个或多个字符",
+        ],
+    ),
+    (
+        "Align to Baseline Grid",
+        [
+            "An Grundlinienraster ausrichten",
+            "Aligner sur la grille de ligne de base",
+            "Alinear con cuadrícula base",
+            "ベースライングリッドに揃える",
+            "对齐基线网格",
+        ],
+    ),
+    // Properties › Paragraph (•••).
+    ("Space Before", ["Abstand davor", "Espace avant", "Espacio anterior", "段落前の間隔", "段前间距"]),
+    ("Space After", ["Abstand danach", "Espace après", "Espacio posterior", "段落後の間隔", "段后间距"]),
+    // Menus.
+    ("File", ["Datei", "Fichier", "Archivo", "ファイル", "文件"]),
+    ("Edit", ["Bearbeiten", "Édition", "Edición", "編集", "编辑"]),
+    ("Layout", ["Layout", "Page", "Maquetación", "レイアウト", "版面"]),
+    ("Type", ["Schrift", "Texte", "Texto", "書式", "文字"]),
+    ("Object", ["Objekt", "Objet", "Objeto", "オブジェクト", "对象"]),
+    ("Table", ["Tabelle", "Tableau", "Tabla", "表", "表"]),
+    ("View", ["Ansicht", "Affichage", "Ver", "表示", "视图"]),
+    ("Window", ["Fenster", "Fenêtre", "Ventana", "ウィンドウ", "窗口"]),
+    ("Help", ["Hilfe", "Aide", "Ayuda", "ヘルプ", "帮助"]),
+    // File.
+    ("New", ["Neu", "Nouveau", "Nuevo", "新規", "新建"]),
+    ("New Document…", ["Neues Dokument …", "Nouveau document…", "Nuevo documento…", "新規ドキュメント…", "新建文档…"]),
+    ("Open…", ["Öffnen …", "Ouvrir…", "Abrir…", "開く…", "打开…"]),
+    (
+        "Open Recent",
+        ["Zuletzt verwendete Datei öffnen", "Ouvrir les fichiers récents", "Abrir recientes", "最近使用したファイルを開く", "打开最近的文件"],
+    ),
+    (
+        "Open Recent File",
+        ["Zuletzt verwendete Datei öffnen", "Ouvrir un fichier récent", "Abrir archivo reciente", "最近使用したファイルを開く", "打开最近的文件"],
+    ),
+    (
+        "Clear Recent Files",
+        ["Liste leeren", "Effacer les fichiers récents", "Borrar archivos recientes", "最近使用したファイルをクリア", "清除最近的文件"],
+    ),
+    ("Recent files", ["Zuletzt geöffnet", "Fichiers récents", "Archivos recientes", "最近使用したファイル", "最近的文件"]),
+    (
+        "Number of Recent Items to Display:",
+        [
+            "Anzahl zuletzt verwendeter Dateien:",
+            "Nombre de fichiers récents à afficher :",
+            "Número de elementos recientes:",
+            "最近使用したファイルの表示数:",
+            "最近项目显示数量：",
+        ],
+    ),
+    ("Close", ["Schließen", "Fermer", "Cerrar", "閉じる", "关闭"]),
+    ("Dismiss", ["Ausblenden", "Ignorer", "Descartar", "閉じる", "关闭"]),
+    ("Save", ["Speichern", "Enregistrer", "Guardar", "保存", "保存"]),
+    ("Save As…", ["Speichern unter …", "Enregistrer sous…", "Guardar como…", "別名で保存…", "另存为…"]),
+    ("Save a Copy…", ["Kopie speichern …", "Enregistrer une copie…", "Guardar una copia…", "コピーを保存…", "保存副本…"]),
+    ("Revert", ["Zurück zur letzten Version", "Version précédente", "Volver a la versión guardada", "復帰", "恢复到上次保存"]),
+    ("Place…", ["Platzieren …", "Importer…", "Colocar…", "配置…", "置入…"]),
+    ("Export PDF…", ["PDF exportieren …", "Exporter en PDF…", "Exportar PDF…", "PDF を書き出し…", "导出PDF…"]),
+    ("Print…", ["Drucken …", "Imprimer…", "Imprimir…", "プリント…", "打印…"]),
+    ("Document Setup…", ["Dokument einrichten …", "Format de document…", "Ajustar documento…", "ドキュメント設定…", "文档设置…"]),
+    ("File Info…", ["Dateiinformationen …", "Informations sur le fichier…", "Información de archivo…", "ファイル情報…", "文件信息…"]),
+    ("File Info", ["Dateiinformationen", "Informations sur le fichier", "Información de archivo", "ファイル情報", "文件信息"]),
+    ("Package…", ["Verpacken …", "Assemblage…", "Empaquetar…", "パッケージ…", "打包…"]),
+    // Edit.
+    ("Undo", ["Rückgängig", "Annuler", "Deshacer", "取り消し", "还原"]),
+    ("Redo", ["Wiederholen", "Rétablir", "Rehacer", "やり直し", "重做"]),
+    ("Cut", ["Ausschneiden", "Couper", "Cortar", "カット", "剪切"]),
+    ("Copy", ["Kopieren", "Copier", "Copiar", "コピー", "复制"]),
+    ("Paste", ["Einfügen", "Coller", "Pegar", "ペースト", "粘贴"]),
+    ("Hide Rulers", ["Lineale ausblenden", "Masquer les règles", "Ocultar reglas", "定規を隠す", "隐藏标尺"]),
+    ("Inches Decimal", ["Zoll dezimal", "Pouces décimaux", "Pulgadas decimales", "インチ（10 進）", "十进制英寸"]),
+    (
+        "Paste Vector Art",
+        ["Vektorgrafik einfügen", "Coller l’illustration vectorielle", "Pegar ilustración vectorial", "ベクトルアートをペースト", "粘贴矢量图稿"],
+    ),
+    ("Back", ["Zurück", "Retour", "Atrás", "戻る", "返回"]),
+    ("Margins and Columns", ["Ränder und Spalten", "Marges et colonnes", "Márgenes y columnas", "マージン・段組", "边距和分栏"]),
+    ("Warning", ["Warnung", "Avertissement", "Advertencia", "警告", "警告"]),
+    ("Don't show again", ["Nicht mehr anzeigen", "Ne plus afficher", "No volver a mostrar", "今後表示しない", "不再显示"]),
+    (
+        "The affected page contains objects. Delete the page anyway?",
+        [
+            "Die betroffene Seite enthält Objekte. Seite trotzdem löschen?",
+            "La page concernée contient des objets. Supprimer quand même la page ?",
+            "La página afectada contiene objetos. ¿Desea eliminarla de todos modos?",
+            "対象のページにはオブジェクトが含まれています。ページを削除しますか？",
+            "受影响的页面包含对象。仍要删除该页面吗？",
+        ],
+    ),
+    (
+        "The affected pages contain objects. Delete the pages anyway?",
+        [
+            "Die betroffenen Seiten enthalten Objekte. Seiten trotzdem löschen?",
+            "Les pages concernées contiennent des objets. Supprimer quand même les pages ?",
+            "Las páginas afectadas contienen objetos. ¿Desea eliminarlas de todos modos?",
+            "対象のページにはオブジェクトが含まれています。ページを削除しますか？",
+            "受影响的页面包含对象。仍要删除这些页面吗？",
+        ],
+    ),
+    ("Capture", ["Erfassen", "Capturer", "Capturar", "取り込み", "捕捉"]),
+    ("Panel Locations", ["Bedienfeldpositionen", "Emplacements des panneaux", "Ubicaciones de paneles", "パネルの位置", "面板位置"]),
+    ("First Page", ["Erste Seite", "Première page", "Primera página", "最初のページ", "第一页"]),
+    ("Previous Page", ["Vorherige Seite", "Page précédente", "Página anterior", "前のページ", "上一页"]),
+    ("Next Page", ["Nächste Seite", "Page suivante", "Página siguiente", "次のページ", "下一页"]),
+    ("Last Page", ["Letzte Seite", "Dernière page", "Última página", "最後のページ", "最后一页"]),
+    ("Go Back", ["Zurück gehen", "Revenir", "Retroceder", "前に戻る", "后退"]),
+    ("Go Forward", ["Vorwärts gehen", "Avancer", "Avanzar", "次に進む", "前进"]),
+    (
+        "Close Tab Group",
+        ["Registerkartengruppe schließen", "Fermer le groupe d'onglets", "Cerrar grupo de fichas", "タブグループを閉じる", "关闭选项卡组"],
+    ),
+    ("Minimize", ["Minimieren", "Réduire", "Minimizar", "最小化", "最小化"]),
+    ("Collapse to Icons", ["Auf Symbole minimieren", "Réduire en icônes", "Contraer a iconos", "アイコンパネルに折りたたむ", "折叠为图标"]),
+    // Docking chrome (craft-ui labels in DesignCraft's wording, `panel_docking::DOCK_LABELS`).
+    ("Group with", ["Gruppieren mit", "Grouper avec", "Agrupar con", "次とグループ化", "编组到"]),
+    ("Panels", ["Bedienfelder", "Panneaux", "Paneles", "パネル", "面板"]),
+    (
+        "Resize panels",
+        ["Größe der Bedienfelder ändern", "Redimensionner les panneaux", "Cambiar tamaño de los paneles", "パネルのサイズを変更", "调整面板大小"],
+    ),
+    (
+        "Resize panel window",
+        [
+            "Größe des Bedienfeldfensters ändern",
+            "Redimensionner la fenêtre de panneau",
+            "Cambiar tamaño de la ventana de panel",
+            "パネルウィンドウのサイズを変更",
+            "调整面板窗口大小",
+        ],
+    ),
+    (
+        "Move tab group",
+        ["Registerkartengruppe verschieben", "Déplacer le groupe d'onglets", "Mover grupo de fichas", "タブグループを移動", "移动选项卡组"],
+    ),
+    ("Expand", ["Erweitern", "Développer", "Expandir", "展開", "展开"]),
+    (
+        "Float Tab Group",
+        [
+            "Registerkartengruppe lösen",
+            "Détacher le groupe d'onglets",
+            "Hacer flotante el grupo de fichas",
+            "タブグループをフローティング表示",
+            "浮动选项卡组",
+        ],
+    ),
+    (
+        "Group Tab Group with",
+        [
+            "Registerkartengruppe gruppieren mit",
+            "Grouper le groupe d'onglets avec",
+            "Agrupar grupo de fichas con",
+            "タブグループを次とグループ化",
+            "将选项卡组编组到",
+        ],
+    ),
+    (
+        "Move panel column",
+        ["Bedienfeldspalte verschieben", "Déplacer la colonne de panneaux", "Mover columna de paneles", "パネル列を移動", "移动面板列"],
+    ),
+    ("Expand Panels", ["Bedienfelder erweitern", "Développer les panneaux", "Expandir paneles", "パネルを展開", "展开面板"]),
+    (
+        "Move panel window",
+        ["Bedienfeldfenster verschieben", "Déplacer la fenêtre de panneau", "Mover ventana de panel", "パネルウィンドウを移動", "移动面板窗口"],
+    ),
+    (
+        "Close panel window",
+        ["Bedienfeldfenster schließen", "Fermer la fenêtre de panneau", "Cerrar ventana de panel", "パネルウィンドウを閉じる", "关闭面板窗口"],
+    ),
+    (
+        "Close Other Panels in Group",
+        [
+            "Andere Bedienfelder der Gruppe schließen",
+            "Fermer les autres panneaux du groupe",
+            "Cerrar los demás paneles del grupo",
+            "グループ内の他のパネルを閉じる",
+            "关闭组中的其他面板",
+        ],
+    ),
+    ("Maximize Frame", ["Bereich maximieren", "Agrandir la zone", "Maximizar área", "領域を最大化", "最大化区域"]),
+    (
+        "Restore Frame Size",
+        ["Bereichsgröße wiederherstellen", "Restaurer la taille de la zone", "Restaurar tamaño del área", "領域のサイズを元に戻す", "恢复区域大小"],
+    ),
+    (
+        "Move Panel to New Window",
+        [
+            "Bedienfeld in neues Fenster verschieben",
+            "Déplacer le panneau dans une nouvelle fenêtre",
+            "Mover panel a una ventana nueva",
+            "パネルを新規ウィンドウに移動",
+            "将面板移到新窗口",
+        ],
+    ),
+    (
+        "Auto-Collapse Iconic Panels",
+        [
+            "Symbolbedienfelder automatisch minimieren",
+            "Réduire automatiquement les panneaux d’icônes",
+            "Contraer automáticamente los paneles de iconos",
+            "アイコンパネルを自動的に折りたたむ",
+            "自动折叠图标面板",
+        ],
+    ),
+    ("Panel Options", ["Bedienfeldoptionen", "Options du panneau", "Opciones de panel", "パネルオプション", "面板选项"]),
+    ("Panel Options…", ["Bedienfeldoptionen…", "Options du panneau…", "Opciones de panel…", "パネルオプション…", "面板选项…"]),
+    ("Show Thumbnails", ["Miniaturen anzeigen", "Afficher les vignettes", "Mostrar miniaturas", "サムネールを表示", "显示缩览图"]),
+    ("Show Vertically", ["Vertikal anzeigen", "Afficher verticalement", "Mostrar verticalmente", "縦に表示", "垂直显示"]),
+    ("Panel Layout", ["Bedienfeldlayout", "Disposition du panneau", "Diseño del panel", "パネルレイアウト", "面板版面"]),
+    ("Pages on Top", ["Seiten oben", "Pages en haut", "Páginas en la parte superior", "ページを上に表示", "页面在上"]),
+    (
+        "Parents on Top",
+        ["Übergeordnete Seiten oben", "Gabarits en haut", "Páginas principales en la parte superior", "親ページを上に表示", "父页面在上"],
+    ),
+    ("Resize:", ["Größe ändern:", "Redimensionner :", "Cambiar tamaño:", "サイズ変更:", "调整大小："]),
+    ("Extra Small", ["Sehr klein", "Très petite", "Extra pequeño", "極小", "特小"]),
+    ("Small", ["Klein", "Petite", "Pequeño", "小", "小"]),
+    ("Medium", ["Mittel", "Moyenne", "Mediano", "中", "中"]),
+    ("Large", ["Groß", "Grande", "Grande", "大", "大"]),
+    ("Extra Large", ["Sehr groß", "Très grande", "Extra grande", "特大", "特大"]),
+    ("Jumbo", ["Riesig", "Géante", "Gigante", "最大", "巨大"]),
+    ("Proportional", ["Proportional", "Proportionnel", "Proporcional", "比例", "按比例"]),
+    ("Pages Fixed", ["Seiten fixiert", "Pages fixes", "Páginas fijas", "ページを固定", "页面固定"]),
+    ("Parents Fixed", ["Übergeordnete fixiert", "Gabarits fixes", "Páginas principales fijas", "親ページを固定", "父页面固定"]),
+    ("Parents", ["Übergeordnete Seiten", "Gabarits", "Páginas principales", "親ページ", "父页面"]),
+    (
+        "Bulleted & Numbered Lists",
+        [
+            "Aufzählungszeichen und nummerierte Listen",
+            "Listes à puces et numérotées",
+            "Listas con viñetas y numeradas",
+            "箇条書き",
+            "项目符号列表和编号列表",
+        ],
+    ),
+    ("Current Page Number", ["Aktuelle Seitenzahl", "Numéro de page actuelle", "Número de página actual", "現在のページ番号", "当前页码"]),
+    ("Apply Color (,)", ["Farbe anwenden (,)", "Appliquer la couleur (,)", "Aplicar color (,)", "カラーを適用 (,)", "应用颜色 (,)"]),
+    ("Apply Gradient (.)", ["Verlauf anwenden (.)", "Appliquer le dégradé (.)", "Aplicar degradado (.)", "グラデーションを適用 (.)", "应用渐变 (.)"]),
+    ("View Options", ["Ansichtsoptionen", "Options d’affichage", "Opciones de visualización", "表示オプション", "视图选项"]),
+    ("Frame Edges", ["Rahmenkanten", "Bords du bloc", "Bordes del marco", "フレーム枠", "框架边缘"]),
+    ("Rulers", ["Lineale", "Règles", "Reglas", "定規", "标尺"]),
+    ("Hidden Characters", ["Verborgene Zeichen", "Caractères masqués", "Caracteres ocultos", "制御文字", "隐藏字符"]),
+    ("Flex Layout", ["Flex-Layout", "Mise en page flexible", "Diseño flexible", "フレックスレイアウト", "弹性布局"]),
+    (
+        "Create Flex Layout",
+        ["Flex-Layout erstellen", "Créer une mise en page flexible", "Crear diseño flexible", "フレックスレイアウトを作成", "创建弹性布局"],
+    ),
+    (
+        "Add to Flex Layout",
+        [
+            "Zu Flex-Layout hinzufügen",
+            "Ajouter à la mise en page flexible",
+            "Añadir a diseño flexible",
+            "フレックスレイアウトに追加",
+            "添加到弹性布局",
+        ],
+    ),
+    (
+        "Convert to Flex Layout",
+        [
+            "In Flex-Layout umwandeln",
+            "Convertir en mise en page flexible",
+            "Convertir en diseño flexible",
+            "フレックスレイアウトに変換",
+            "转换为弹性布局",
+        ],
+    ),
+    (
+        "Remove Flex Layout",
+        ["Flex-Layout entfernen", "Supprimer la mise en page flexible", "Quitar diseño flexible", "フレックスレイアウトを削除", "移除弹性布局"],
+    ),
+    (
+        "Show Flex Controls",
+        [
+            "Flex-Steuerelemente einblenden",
+            "Afficher les commandes flexibles",
+            "Mostrar controles flexibles",
+            "フレックスコントロールを表示",
+            "显示弹性控件",
+        ],
+    ),
+    (
+        "Flex Layout Options",
+        ["Flex-Layout-Optionen", "Options de mise en page flexible", "Opciones de diseño flexible", "フレックスレイアウトオプション", "弹性布局选项"],
+    ),
+    (
+        "Reorder in Flex Layout",
+        [
+            "Im Flex-Layout umordnen",
+            "Réorganiser dans la mise en page flexible",
+            "Reordenar en diseño flexible",
+            "フレックスレイアウト内で並べ替え",
+            "在弹性布局中重新排序",
+        ],
+    ),
+    ("Flex Start", ["Flex-Anfang", "Début flexible", "Inicio flexible", "フレックス開始", "弹性起点"]),
+    ("Flex End", ["Flex-Ende", "Fin flexible", "Fin flexible", "フレックス終了", "弹性终点"]),
+    ("Space Between", ["Abstand dazwischen", "Espace entre", "Espacio entre", "間隔を均等", "两端对齐"]),
+    ("Space Around", ["Abstand ringsum", "Espace autour", "Espacio alrededor", "周囲に間隔", "周围间距"]),
+    ("Space Evenly", ["Gleichmäßig verteilen", "Espace uniforme", "Espacio uniforme", "均等に配置", "均匀分布"]),
+    ("Row", ["Zeile", "Ligne", "Fila", "行", "行"]),
+    ("Reverse Row", ["Zeile umgekehrt", "Ligne inversée", "Fila invertida", "行（逆方向）", "反向行"]),
+    ("Reverse Column", ["Spalte umgekehrt", "Colonne inversée", "Columna invertida", "列（逆方向）", "反向列"]),
+    ("Wrap Content", ["Inhalt umbrechen", "Renvoyer le contenu à la ligne", "Ajustar contenido", "コンテンツを折り返す", "内容换行"]),
+    ("Spacing", ["Abstände", "Espacement", "Espaciado", "間隔", "间距"]),
+    ("Horizontal Spacing", ["Horizontaler Abstand", "Espacement horizontal", "Espaciado horizontal", "水平方向の間隔", "水平间距"]),
+    ("Vertical Spacing", ["Vertikaler Abstand", "Espacement vertical", "Espaciado vertical", "垂直方向の間隔", "垂直间距"]),
+    ("Constrain proportions", ["Proportionen beibehalten", "Conserver les proportions", "Restringir proporciones", "縦横比を固定", "约束比例"]),
+    ("Auto", ["Automatisch", "Automatique", "Automático", "自動", "自动"]),
+    ("W:", ["B:", "L :", "An.:", "幅:", "宽:"]),
+    ("H:", ["H:", "H :", "Al.:", "高さ:", "高:"]),
+    ("Number:", ["Zahl:", "Numéro:", "Número:", "番号:", "编号："]),
+    ("Gutter:", ["Steg:", "Gouttière :", "Medianil:", "間隔:", "栏间距："]),
+    ("Fit Guides to:", ["Hilfslinien einpassen in:", "Ajuster les repères à :", "Ajustar guías a:", "ガイドの適用先:", "参考线适合："]),
+    ("Top:", ["Oben:", "Haut :", "Superior:", "天:", "上："]),
+    ("Bottom:", ["Unten:", "Bas :", "Inferior:", "地:", "下："]),
+    ("Inside:", ["Innen:", "Intérieur :", "Interior:", "ノド:", "内："]),
+    ("Outside:", ["Außen:", "Extérieur :", "Exterior:", "小口:", "外："]),
+    ("Left:", ["Links:", "Gauche :", "Izquierda:", "左:", "左："]),
+    ("Right:", ["Rechts:", "Droite :", "Derecha:", "右:", "右："]),
+    ("Paths:", ["Pfade:", "Tracés :", "Trazados:", "パス:", "路径："]),
+    ("Pathfinder:", ["Pathfinder:", "Pathfinder :", "Buscatrazos:", "パスファインダー:", "路径查找器："]),
+    ("Convert Shape:", ["Form konvertieren:", "Convertir la forme :", "Convertir forma:", "シェイプを変換:", "转换形状："]),
+    ("Convert Point:", ["Punkt konvertieren:", "Convertir le point :", "Convertir punto:", "ポイントを変換:", "转换点："]),
+    ("Join Path", ["Pfad zusammenfügen", "Joindre le tracé", "Unir trazado", "パスを連結", "连接路径"]),
+    ("Open Path", ["Pfad öffnen", "Ouvrir le tracé", "Abrir trazado", "パスをオープン", "开放路径"]),
+    ("Plain", ["Einfach", "Simple", "Normal", "プレーン", "普通"]),
+    ("Symmetrical", ["Symmetrisch", "Symétrique", "Simétrico", "対称", "对称"]),
+    (
+        "The stroke isn't a gradient.",
+        [
+            "Die Kontur ist kein Verlauf.",
+            "Le contour n’est pas un dégradé.",
+            "El trazo no es un degradado.",
+            "線はグラデーションではありません。",
+            "描边不是渐变。",
+        ],
+    ),
+    ("Baseline Options", ["Grundlinienoptionen", "Options de ligne de base", "Opciones de línea de base", "ベースラインオプション", "基线选项"]),
+    ("Fixed Number", ["Feste Anzahl", "Nombre fixe", "Número fijo", "固定数", "固定数字"]),
+    ("Fixed Width", ["Feste Breite", "Largeur fixe", "Anchura fija", "固定幅", "固定宽度"]),
+    ("Inset Spacing", ["Versatzabstand", "Marge intérieure", "Espaciado de margen interior", "フレーム内マージン", "内边距"]),
+    ("Vertical Justification", ["Vertikale Ausrichtung", "Justification verticale", "Justificación vertical", "垂直比率", "垂直对齐"]),
+    ("Align:", ["Ausrichten:", "Alignement :", "Alinear:", "整列:", "对齐："]),
+    ("Ignore Text Wrap", ["Textumfluss ignorieren", "Ignorer l’habillage", "Ignorar ceñir texto", "テキストの回り込みを無視", "忽略文本绕排"]),
+    ("Technique:", ["Technik:", "Technique :", "Técnica:", "テクニック:", "方法："]),
+    ("Softer", ["Weicher", "Plus flou", "Más suave", "さらにソフトに", "柔和"]),
+    ("Precise", ["Präzise", "Précis", "Precisa", "精細", "精确"]),
+    ("Corners:", ["Ecken:", "Angles :", "Esquinas:", "角:", "角点："]),
+    ("Sharp", ["Spitz", "Vifs", "Nítidas", "シャープ", "锐利"]),
+    ("Diffused", ["Weich", "Diffus", "Difusas", "拡散", "扩散"]),
+    ("Reverse Path", ["Pfadrichtung umkehren", "Inverser le tracé", "Invertir trazado", "パスの方向反転", "反转路径"]),
+    ("Set Anchor", ["Ankerpunkt festlegen", "Définir le point d’ancrage", "Definir punto de ancla", "アンカーポイントを設定", "设置锚点"]),
+    ("Effects…", ["Effekte…", "Effets…", "Efectos…", "効果…", "效果…"]),
+    ("Settings for:", ["Einstellungen für:", "Paramètres pour :", "Ajustes para:", "設定対象：", "设置："]),
+    ("Transparency", ["Transparenz", "Transparence", "Transparencia", "透明", "透明度"]),
+    ("Transparency…", ["Transparenz…", "Transparence…", "Transparencia…", "透明…", "透明度…"]),
+    (
+        "Transparency Flattener",
+        ["Transparenzreduzierung", "Aplatissement de la transparence", "Acoplador de transparencia", "透明の分割・統合", "透明度拼合"],
+    ),
+    ("Basic Blending", ["Grundlegendes Füllen", "Fusion de base", "Fusión básica", "基本的な描画モード", "基本混合"]),
+    ("Opacity:", ["Deckkraft:", "Opacité :", "Opacidad:", "不透明度：", "不透明度："]),
+    ("Blending", ["Füllmethode", "Fusion", "Fusión", "描画モード", "混合"]),
+    ("Distance:", ["Abstand:", "Distance :", "Distancia:", "距離：", "距离："]),
+    ("X Offset:", ["X-Versatz:", "Décalage X :", "Desplazamiento X:", "X オフセット：", "X 位移："]),
+    ("Y Offset:", ["Y-Versatz:", "Décalage Y :", "Desplazamiento Y:", "Y オフセット：", "Y 位移："]),
+    ("Spread:", ["Größe ändern:", "Étendue :", "Extensión:", "スプレッド：", "扩展："]),
+    ("Choke:", ["Unterfüllen:", "Contraction :", "Contracción:", "チョーク：", "收缩："]),
+    ("Source:", ["Quelle:", "Source :", "Origen:", "ソース：", "源："]),
+    ("Edge", ["Kante", "Contour", "Borde", "エッジ", "边缘"]),
+    ("Depth:", ["Tiefe:", "Profondeur :", "Profundidad:", "深さ：", "深度："]),
+    ("Highlight:", ["Lichter:", "Lumière :", "Iluminación:", "ハイライト：", "高光："]),
+    ("Shadow:", ["Tiefen:", "Ombre :", "Sombra:", "シャドウ：", "阴影："]),
+    ("Feather Width:", ["Breite der weichen Kante:", "Largeur du contour progressif :", "Anchura de desvanecimiento:", "ぼかしの幅：", "羽化宽度："]),
+    ("Feather Widths", ["Breiten der weichen Kante", "Largeurs du contour progressif", "Anchuras de desvanecimiento", "ぼかしの幅", "羽化宽度"]),
+    ("Gradient Stops", ["Verlaufsregler", "Arrêts de dégradé", "Paradas de degradado", "グラデーション分岐点", "渐变色标"]),
+    ("Start Opacity:", ["Anfangsdeckkraft:", "Opacité de début :", "Opacidad inicial:", "開始の不透明度：", "起始不透明度："]),
+    ("End Opacity:", ["Enddeckkraft:", "Opacité de fin :", "Opacidad final:", "終了の不透明度：", "结束不透明度："]),
+    ("(no effects)", ["(keine Effekte)", "(aucun effet)", "(sin efectos)", "(効果なし)", "(无效果)"]),
+    ("OBJECT", ["OBJEKT", "OBJET", "OBJETO", "オブジェクト", "对象"]),
+    (
+        "Add an object effect to the selected target",
+        [
+            "Dem ausgewählten Ziel einen Objekteffekt hinzufügen",
+            "Ajouter un effet d’objet à la cible sélectionnée",
+            "Añadir un efecto de objeto al destino seleccionado",
+            "選択した対象にオブジェクト効果を追加",
+            "为所选目标添加对象效果",
+        ],
+    ),
+    ("Clear", ["Löschen", "Effacer", "Borrar", "消去", "清除"]),
+    ("Duplicate", ["Duplizieren", "Dupliquer", "Duplicar", "複製", "重复"]),
+    ("Select All", ["Alles auswählen", "Tout sélectionner", "Seleccionar todo", "すべてを選択", "全选"]),
+    ("Deselect All", ["Auswahl aufheben", "Tout désélectionner", "Deseleccionar todo", "すべての選択を解除", "取消全选"]),
+    (
+        "Select All Guides",
+        ["Alle Hilfslinien auswählen", "Sélectionner tous les repères", "Seleccionar todas las guías", "すべてのガイドを選択", "选择所有参考线"],
+    ),
+    ("Ruler Guide", ["Hilfslinie", "Repère de règle", "Guía de regla", "定規ガイド", "标尺参考线"]),
+    ("Find/Change…", ["Suchen/Ersetzen …", "Rechercher/Remplacer…", "Buscar/Cambiar…", "検索と置換…", "查找/更改…"]),
+    ("Check Spelling…", ["Rechtschreibprüfung …", "Vérifier l'orthographe…", "Revisar ortografía…", "スペルチェック…", "拼写检查…"]),
+    ("Preferences…", ["Voreinstellungen …", "Préférences…", "Preferencias…", "環境設定…", "首选项…"]),
+    ("Settings…", ["Einstellungen …", "Réglages…", "Ajustes…", "設定…", "设置…"]),
+    (
+        "Keyboard Shortcuts…",
+        ["Tastaturbefehle …", "Raccourcis clavier…", "Métodos abreviados de teclado…", "キーボードショートカット…", "键盘快捷键…"],
+    ),
+    ("Interface Language", ["Sprache der Oberfläche", "Langue de l'interface", "Idioma de la interfaz", "インターフェイスの言語", "界面语言"]),
+    // Layout.
+    ("Pages", ["Seiten", "Pages", "Páginas", "ページ", "页面"]),
+    ("Margins and Columns…", ["Ränder und Spalten …", "Marges et colonnes…", "Márgenes y columnas…", "マージン・段組…", "边距和分栏…"]),
+    ("Create Guides…", ["Hilfslinien erstellen …", "Créer des repères…", "Crear guías…", "ガイドを作成…", "创建参考线…"]),
+    (
+        "Numbering & Section Options…",
+        [
+            "Nummerierungs- und Abschnittsoptionen …",
+            "Options de numérotation et de section…",
+            "Opciones de numeración y sección…",
+            "ノンブルとセクション設定…",
+            "页码和章节选项…",
+        ],
+    ),
+    // Type.
+    ("Story Direction", ["Textrichtung", "Sens du texte", "Dirección del texto", "組み方向", "文章方向"]),
+    ("Horizontal", ["Horizontal", "Horizontal", "Horizontal", "横書き", "水平"]),
+    ("Vertical", ["Vertikal", "Vertical", "Vertical", "縦書き", "垂直"]),
+    ("Tate-Chu-Yoko", ["Tate-Chu-Yoko", "Tate-Chu-Yoko", "Tate-Chu-Yoko", "縦中横", "纵中横"]),
+    ("Ruby…", ["Ruby …", "Ruby…", "Ruby…", "ルビ…", "旁注…"]),
+    ("Kenten", ["Kenten", "Kenten", "Kenten", "圏点", "圈点"]),
+    ("Warichu", ["Warichu", "Warichu", "Warichu", "割り注", "割注"]),
+    // Style Options: CJK sections.
+    ("Tate-chu-yoko Settings", ["Tate-Chu-Yoko-Einstellungen", "Paramètres Tate-Chu-Yoko", "Ajustes de Tate-Chu-Yoko", "縦中横設定", "纵中横设置"]),
+    ("Kenten Settings", ["Kenten-Einstellungen", "Paramètres Kenten", "Ajustes de Kenten", "圏点設定", "圈点设置"]),
+    (
+        "Japanese Composition Settings",
+        ["Japanischer Satz", "Paramètres de composition japonaise", "Ajustes de composición japonesa", "日本語文字組版", "日文排版设置"],
+    ),
+    ("Grid Settings", ["Rastereinstellungen", "Paramètres de grille", "Ajustes de cuadrícula", "グリッド設定", "网格设置"]),
+    ("Warichu Settings", ["Warichu-Einstellungen", "Paramètres Warichu", "Ajustes de Warichu", "割注設定", "割注设置"]),
+    (
+        "Auto Tate-chu-yoko Settings",
+        [
+            "Automatische Tate-Chu-Yoko-Einstellungen",
+            "Paramètres Tate-Chu-Yoko automatiques",
+            "Ajustes de Tate-Chu-Yoko automático",
+            "自動縦中横設定",
+            "自动纵中横设置",
+        ],
+    ),
+    (
+        "Ruby Placement and Spacing",
+        ["Ruby-Position und -Abstand", "Position et espacement ruby", "Posición y espaciado de ruby", "ルビの位置と間隔", "注音位置和间距"],
+    ),
+    (
+        "Ruby Font and Size",
+        ["Ruby-Schrift und -Größe", "Police et taille ruby", "Fuente y tamaño de ruby", "ルビのフォントとサイズ", "注音字体和大小"],
+    ),
+    (
+        "Adjustment When Ruby Is Longer Than Parent",
+        [
+            "Anpassung bei Ruby länger als Grundtext",
+            "Ajustement si le ruby dépasse le texte parent",
+            "Ajuste cuando el ruby es más largo que la base",
+            "ルビが親文字より長い時の調整",
+            "注音长于基础文字时的调整",
+        ],
+    ),
+    ("Ruby Color", ["Ruby-Farbe", "Couleur ruby", "Color de ruby", "ルビカラー", "注音颜色"]),
+    ("Kenten Color", ["Kenten-Farbe", "Couleur kenten", "Color de kenten", "圏点カラー", "圈点颜色"]),
+    ("Shatai", ["Shatai", "Shatai", "Shatai", "斜体", "斜体"]),
+    ("Tate-chu-yoko Digits:", ["Tate-Chu-Yoko-Ziffern:", "Chiffres Tate-Chu-Yoko:", "Dígitos Tate-Chu-Yoko:", "組数字（桁まで）:", "纵中横位数："]),
+    (
+        "Include Roman Characters",
+        ["Lateinische Zeichen einbeziehen", "Inclure les caractères latins", "Incluir caracteres latinos", "欧文も含める", "包括罗马字符"],
+    ),
+    ("Ruby Type:", ["Ruby-Art:", "Type de ruby:", "Tipo de ruby:", "種類:", "注音类型："]),
+    ("Per-Character Ruby", ["Einzelzeichen-Ruby", "Ruby par caractère", "Ruby por carácter", "モノルビ", "单字注音"]),
+    ("Group Ruby", ["Gruppen-Ruby", "Ruby de groupe", "Ruby de grupo", "グループルビ", "组注音"]),
+    ("Left/Top", ["Links/oben", "Gauche/haut", "Izquierda/arriba", "肩付き", "左/上"]),
+    ("Centered", ["Zentriert", "Centré", "Centrado", "中付き", "居中"]),
+    ("Right/Bottom", ["Rechts/unten", "Droite/bas", "Derecha/abajo", "右／下揃え", "右/下"]),
+    ("Full Justify", ["Blocksatz", "Justifié", "Justificado", "両端揃え", "两端对齐"]),
+    ("1-2-1 (JIS) Rule", ["1-2-1-Regel (JIS)", "Règle 1-2-1 (JIS)", "Regla 1-2-1 (JIS)", "1-2-1(JIS)ルール", "1-2-1 (JIS) 规则"]),
+    ("Equal Aki", ["Gleicher Abstand", "Espacement égal", "Espaciado igual", "均等アキ", "均等间距"]),
+    (
+        "1 Ruby Character Aki",
+        ["1 Ruby-Zeichen Abstand", "Espace de 1 caractère ruby", "Espacio de 1 carácter ruby", "1ルビ文字アキ", "1注音字符间距"],
+    ),
+    ("Above/Right", ["Oben/rechts", "Au-dessus/à droite", "Arriba/derecha", "上／右", "上/右"]),
+    ("Below/Left", ["Unten/links", "En dessous/à gauche", "Abajo/izquierda", "下／左", "下/左"]),
+    (
+        "Offset from Parent",
+        [
+            "Versatz zum Grundtext",
+            "Décalage par rapport au texte parent",
+            "Desplazamiento respecto a la base",
+            "親文字からのオフセット",
+            "与基础文字的偏移",
+        ],
+    ),
+    ("Across the Line:", ["Quer zur Zeile:", "Perpendiculaire à la ligne:", "Perpendicular a la línea:", "横組み上下／縦組み左右:", "垂直于行："]),
+    ("Along the Line:", ["Entlang der Zeile:", "Le long de la ligne:", "A lo largo de la línea:", "横組み左右／縦組み上下:", "沿行方向："]),
+    ("Parent's Font", ["Schrift des Grundtexts", "Police du texte parent", "Fuente de la base", "親文字と同じ", "基础文字的字体"]),
+    (
+        "Use OpenType Pro Ruby Glyphs",
+        [
+            "OpenType-Pro-Ruby-Glyphen verwenden",
+            "Utiliser les glyphes ruby OpenType Pro",
+            "Usar glifos ruby de OpenType Pro",
+            "OpenType Pro のルビ字形を使用",
+            "使用 OpenType Pro 注音字形",
+        ],
+    ),
+    ("Fit to Width", ["An Breite anpassen", "Ajuster à la largeur", "Ajustar al ancho", "幅に合わせる", "适合宽度"]),
+    ("Ruby Overhang:", ["Ruby-Überhang:", "Débordement ruby:", "Desbordamiento de ruby:", "文字かけ処理:", "注音悬挂："]),
+    ("1 Ruby Character", ["1 Ruby-Zeichen", "1 caractère ruby", "1 carácter ruby", "ルビ1文字分", "1个注音字符"]),
+    ("1/2 Ruby Character", ["1/2 Ruby-Zeichen", "1/2 caractère ruby", "1/2 carácter ruby", "ルビ半文字分", "1/2个注音字符"]),
+    ("1 Parent Character", ["1 Grundzeichen", "1 caractère parent", "1 carácter base", "親1文字分", "1个基础字符"]),
+    ("1/2 Parent Character", ["1/2 Grundzeichen", "1/2 caractère parent", "1/2 carácter base", "親半文字分", "1/2个基础字符"]),
+    ("Unlimited", ["Unbegrenzt", "Illimité", "Ilimitado", "無制限", "无限制"]),
+    (
+        "Parent Character Spacing:",
+        ["Abstand im Grundtext:", "Espacement du texte parent:", "Espaciado de la base:", "親文字間の調整:", "基础文字间距调整："],
+    ),
+    ("No Adjustment", ["Keine Anpassung", "Aucun ajustement", "Sin ajuste", "調整しない", "不调整"]),
+    ("Both Sides", ["Beide Seiten", "Des deux côtés", "Ambos lados", "両サイド", "两侧"]),
+    ("1-2-1 Aki", ["1-2-1-Abstand", "Espacement 1-2-1", "Espaciado 1-2-1", "1-2-1アキ", "1-2-1 间距"]),
+    (
+        "Shrink Ruby Width Automatically",
+        [
+            "Ruby-Breite automatisch verringern",
+            "Réduire automatiquement la largeur ruby",
+            "Reducir automáticamente el ancho de ruby",
+            "ルビの文字幅を自動的に詰める",
+            "自动压缩注音宽度",
+        ],
+    ),
+    ("Minimum Scale:", ["Minimale Skalierung:", "Échelle minimale:", "Escala mínima:", "最小比率:", "最小比例："]),
+    (
+        "Auto Align at Line Start/End",
+        [
+            "Am Zeilenanfang/-ende automatisch ausrichten",
+            "Alignement auto en début/fin de ligne",
+            "Alinear automáticamente al inicio/fin de línea",
+            "自動行頭／行末揃え",
+            "行首/行尾自动对齐",
+        ],
+    ),
+    ("Text Color", ["Textfarbe", "Couleur du texte", "Color del texto", "[自動]", "文字颜色"]),
+    (
+        "Distance from Parent:",
+        ["Abstand zum Grundtext:", "Distance au texte parent:", "Distancia a la base:", "親文字からの間隔:", "与基础文字的距离："],
+    ),
+    ("Fisheye", ["Fischauge", "Œil de poisson", "Ojo de pez", "蛇の目", "蛇目"]),
+    ("Magnification:", ["Verkleinerung:", "Réduction:", "Reducción:", "縮小率:", "缩小率："]),
+    ("Adjust Rotation", ["Drehung anpassen", "Ajuster la rotation", "Ajustar rotación", "ライン揃え", "调整旋转"]),
+    ("Adjust Tsume", ["Tsume anpassen", "Ajuster le tsume", "Ajustar tsume", "ツメの調整", "调整字距压缩"]),
+    (
+        "Rotate Roman Characters in Vertical Text",
+        [
+            "Lateinische Zeichen in vertikalem Text drehen",
+            "Faire pivoter les caractères latins en texte vertical",
+            "Girar caracteres latinos en texto vertical",
+            "縦組み中の欧文回転",
+            "直排中旋转罗马字符",
+        ],
+    ),
+    (
+        "Roman Word Break",
+        ["Lateinische Wörter beliebig trennen", "Coupure libre des mots latins", "Corte libre de palabras latinas", "欧文泣き別れ", "西文单词断开"],
+    ),
+    ("ICF Top", ["ICF oben", "Haut ICF", "Parte superior ICF", "平均字面の上", "平均字面上"]),
+    ("ICF Bottom", ["ICF unten", "Bas ICF", "Parte inferior ICF", "平均字面の下", "平均字面下"]),
+    ("Gyoudori:", ["Gyoudori:", "Gyoudori :", "Gyoudori:", "行取り:", "行取："]),
+    (
+        "Use Paragraph Gyoudori",
+        ["Absatz-Gyoudori verwenden", "Utiliser le gyoudori de paragraphe", "Usar gyoudori de párrafo", "段落行取りを使用", "使用段落行取"],
+    ),
+    ("Up/Down Position:", ["Position oben/unten:", "Position haut/bas:", "Posición arriba/abajo:", "上下位置:", "上下位置："]),
+    ("Left/Right Position:", ["Position links/rechts:", "Position gauche/droite:", "Posición izquierda/derecha:", "左右位置:", "左右位置："]),
+    ("Kenten Type:", ["Kenten-Art:", "Type de kenten:", "Tipo de kenten:", "圏点種類:", "圈点类型："]),
+    ("Sesame Dot", ["Sesampunkt", "Point sésame", "Punto de sésamo", "ゴマ", "芝麻点"]),
+    ("White Sesame Dot", ["Weißer Sesampunkt", "Point sésame blanc", "Punto de sésamo blanco", "白ゴマ", "空心芝麻点"]),
+    ("Bullseye", ["Zielscheibe", "Cible", "Diana", "蛇の目", "靶心"]),
+    ("Black Circle", ["Schwarzer Kreis", "Cercle noir", "Círculo negro", "黒丸", "实心圆"]),
+    ("Small Black Circle", ["Kleiner schwarzer Kreis", "Petit cercle noir", "Círculo negro pequeño", "小さい黒丸", "小实心圆"]),
+    ("Double Circle", ["Doppelkreis", "Double cercle", "Círculo doble", "二重丸", "双圆"]),
+    ("Black Triangle", ["Schwarzes Dreieck", "Triangle noir", "Triángulo negro", "黒三角", "实心三角"]),
+    ("White Triangle", ["Weißes Dreieck", "Triangle blanc", "Triángulo blanco", "白三角", "空心三角"]),
+    ("White Circle", ["Weißer Kreis", "Cercle blanc", "Círculo blanco", "白丸", "空心圆"]),
+    ("Small White Circle", ["Kleiner weißer Kreis", "Petit cercle blanc", "Círculo blanco pequeño", "小さい白丸", "小空心圆"]),
+    ("Character:", ["Zeichen:", "Caractère:", "Carácter:", "文字:", "字符："]),
+    ("Kinsoku Set:", ["Kinsoku-Satz:", "Jeu kinsoku:", "Conjunto kinsoku:", "禁則処理セット:", "避头尾集："]),
+    ("Default Rules", ["Standardregeln", "Règles par défaut", "Reglas predeterminadas", "既定の規則", "默认规则"]),
+    ("Hard Kinsoku", ["Hartes Kinsoku", "Kinsoku strict", "Kinsoku estricto", "強い禁則", "严格避头尾"]),
+    ("Soft Kinsoku", ["Weiches Kinsoku", "Kinsoku souple", "Kinsoku flexible", "弱い禁則", "宽松避头尾"]),
+    (
+        "Simplified Chinese Kinsoku",
+        ["Kinsoku für vereinfachtes Chinesisch", "Kinsoku chinois simplifié", "Kinsoku de chino simplificado", "簡体中国語禁則", "简体中文避头尾"],
+    ),
+    (
+        "Traditional Chinese Kinsoku",
+        ["Kinsoku für traditionelles Chinesisch", "Kinsoku chinois traditionnel", "Kinsoku de chino tradicional", "繁体中国語禁則", "繁体中文避头尾"],
+    ),
+    ("Korean Kinsoku", ["Koreanisches Kinsoku", "Kinsoku coréen", "Kinsoku coreano", "韓国語禁則", "韩文避头尾"]),
+    ("Kinsoku Type:", ["Kinsoku-Methode:", "Type de kinsoku:", "Tipo de kinsoku:", "禁則調整方式:", "避头尾调整方式："]),
+    ("Push In First", ["Zuerst einziehen", "Rentrer d'abord", "Primero hacia dentro", "追い込み優先", "先推入"]),
+    ("Push Out First", ["Zuerst hinausschieben", "Repousser d'abord", "Primero hacia fuera", "追い出し優先", "先推出"]),
+    ("Push Out Only", ["Nur hinausschieben", "Repousser uniquement", "Solo hacia fuera", "追い出しのみ", "仅推出"]),
+    (
+        "Prioritize Adjustment Amount",
+        ["Anpassungsbetrag bevorzugen", "Priorité à la valeur d'ajustement", "Priorizar la cantidad de ajuste", "調整量を優先", "优先调整量"],
+    ),
+    ("Hanging Type:", ["Hängende Interpunktion:", "Ponctuation suspendue:", "Puntuación colgante:", "ぶら下がり方法:", "悬挂方式："]),
+    ("Force", ["Erzwingen", "Forcer", "Forzar", "強制", "强制"]),
+    ("Bunri-Kinshi", ["Bunri-Kinshi", "Bunri-Kinshi", "Bunri-Kinshi", "分離禁止処理", "分离禁止"]),
+    ("Mojikumi Set:", ["Mojikumi-Satz:", "Jeu mojikumi:", "Conjunto mojikumi:", "文字組み:", "标点挤压集："]),
+    ("Leading Model:", ["Zeilenabstandsmodell:", "Modèle d'interlignage:", "Modelo de interlineado:", "行送りの基準位置:", "行距基准位置："]),
+    (
+        "Em Box Top/Right",
+        ["Geviert oben/rechts", "Haut/droite du cadratin", "Parte superior/derecha del cuadratín", "仮想ボディの上／右", "全角字框上/右"],
+    ),
+    ("Em Box Center", ["Geviert Mitte", "Centre du cadratin", "Centro del cuadratín", "仮想ボディの中央", "全角字框居中"]),
+    (
+        "Em Box Bottom/Left",
+        ["Geviert unten/links", "Bas/gauche du cadratin", "Parte inferior/izquierda del cuadratín", "仮想ボディの下／左", "全角字框下/左"],
+    ),
+    (
+        "Em Box Center (Down)",
+        ["Geviert Mitte (unten)", "Centre du cadratin (bas)", "Centro del cuadratín (abajo)", "仮想ボディの中央（下）", "全角字框居中（下）"],
+    ),
+    ("Roman Baseline", ["Lateinische Grundlinie", "Ligne de base romaine", "Línea de base romana", "欧文ベースライン", "罗马字基线"]),
+    ("Rensuuji", ["Rensuuji", "Rensuuji", "Rensuuji", "連数字処理", "连数字处理"]),
+    (
+        "Absorb Ideographic Space at Line End",
+        [
+            "Ideografisches Leerzeichen am Zeilenende absorbieren",
+            "Absorber l'espace idéographique en fin de ligne",
+            "Absorber el espacio ideográfico al final de línea",
+            "全角スペースを行末吸収",
+            "行尾吸收全角空格",
+        ],
+    ),
+    ("Grid Alignment:", ["Am Raster ausrichten:", "Alignement sur la grille:", "Alineación con cuadrícula:", "グリッド揃え:", "网格对齐："]),
+    (
+        "Align Only First Line to Grid",
+        [
+            "Nur erste Zeile am Raster ausrichten",
+            "Aligner uniquement la première ligne sur la grille",
+            "Alinear solo la primera línea con la cuadrícula",
+            "1 行目のみグリッドに揃える",
+            "仅首行对齐网格",
+        ],
+    ),
+    ("Warichu Size:", ["Warichu-Größe:", "Taille warichu:", "Tamaño de warichu:", "割注サイズ:", "割注大小："]),
+    ("Line Spacing:", ["Zeilenabstand:", "Interligne:", "Interlineado:", "行の間隔:", "行间距："]),
+    ("Line Break Options", ["Umbruchoptionen", "Options de saut de ligne", "Opciones de salto de línea", "改行オプション", "换行选项"]),
+    (
+        "Characters Before Break:",
+        ["Zeichen vor dem Umbruch:", "Caractères avant le saut:", "Caracteres antes del salto:", "1 行目の最小文字数:", "换行前最少字符数："],
+    ),
+    (
+        "Characters After Break:",
+        ["Zeichen nach dem Umbruch:", "Caractères après le saut:", "Caracteres después del salto:", "最終行の最小文字数:", "换行后最少字符数："],
+    ),
+    ("Font", ["Schriftart", "Police", "Fuente", "フォント", "字体"]),
+    ("Size", ["Schriftgrad", "Corps", "Tamaño", "サイズ", "大小"]),
+    ("Character", ["Zeichen", "Caractère", "Carácter", "文字", "字符"]),
+    ("Paragraph", ["Absatz", "Paragraphe", "Párrafo", "段落", "段落"]),
+    ("Tabs", ["Tabulatoren", "Tabulations", "Tabulaciones", "タブ", "制表符"]),
+    (
+        "Left-aligned tab",
+        ["Linksbündiger Tabulator", "Tabulation alignée à gauche", "Tabulación alineada a la izquierda", "左揃えタブ", "左对齐制表符"],
+    ),
+    ("Centered tab", ["Zentrierter Tabulator", "Tabulation centrée", "Tabulación centrada", "中央揃えタブ", "居中对齐制表符"]),
+    (
+        "Right-aligned tab",
+        ["Rechtsbündiger Tabulator", "Tabulation alignée à droite", "Tabulación alineada a la derecha", "右揃えタブ", "右对齐制表符"],
+    ),
+    (
+        "Tab aligned on a character",
+        [
+            "Am Zeichen ausgerichteter Tabulator",
+            "Tabulation alignée sur un caractère",
+            "Tabulación alineada en un carácter",
+            "文字揃えタブ",
+            "按字符对齐制表符",
+        ],
+    ),
+    ("X:", ["X:", "X :", "X:", "X:", "X:"]),
+    ("Leader:", ["Füllzeichen:", "Points de suite :", "Carácter de relleno:", "リーダー:", "前导符:"]),
+    ("Align On:", ["Ausrichten an:", "Aligner sur :", "Alinear en:", "揃える文字:", "对齐位置:"]),
+    (
+        "Position panel above text frame",
+        [
+            "Bedienfeld über dem Textrahmen platzieren",
+            "Placer le panneau au-dessus du bloc de texte",
+            "Colocar el panel sobre el marco de texto",
+            "パネルをテキストフレームの上に配置",
+            "将面板置于文本框上方",
+        ],
+    ),
+    ("Clear All", ["Alle löschen", "Tout effacer", "Borrar todo", "すべてを消去", "全部清除"]),
+    ("Delete Tab", ["Tabulator löschen", "Supprimer la tabulation", "Eliminar tabulación", "タブを削除", "删除制表符"]),
+    ("Repeat Tab", ["Tabulator wiederholen", "Répéter la tabulation", "Repetir tabulación", "タブを繰り返し", "重复制表符"]),
+    ("Reset Indents", ["Einzüge zurücksetzen", "Réinitialiser les retraits", "Restablecer sangrías", "インデントをリセット", "重置缩进"]),
+    ("Glyphs", ["Glyphen", "Glyphes", "Glifos", "字形", "字形"]),
+    ("Story", ["Textabschnitt", "Article", "Artículo", "ストーリー", "文章"]),
+    ("Character Styles", ["Zeichenformate", "Styles de caractère", "Estilos de carácter", "文字スタイル", "字符样式"]),
+    ("Paragraph Styles", ["Absatzformate", "Styles de paragraphe", "Estilos de párrafo", "段落スタイル", "段落样式"]),
+    ("Create Outlines", ["In Pfade umwandeln", "Vectoriser", "Crear contornos", "アウトラインを作成", "创建轮廓"]),
+    (
+        "Show Hidden Characters",
+        ["Verborgene Zeichen einblenden", "Afficher les caractères masqués", "Mostrar caracteres ocultos", "制御文字を表示", "显示隐藏字符"],
+    ),
+    // Object.
+    ("Transform", ["Transformieren", "Transformation", "Transformar", "変形", "变换"]),
+    ("Arrange", ["Anordnen", "Disposition", "Organizar", "重ね順", "排列"]),
+    ("Group", ["Gruppieren", "Associer", "Agrupar", "グループ", "编组"]),
+    ("Ungroup", ["Gruppierung aufheben", "Dissocier", "Desagrupar", "グループ解除", "取消编组"]),
+    ("Lock", ["Sperren", "Verrouiller", "Bloquear", "ロック", "锁定"]),
+    ("Hide", ["Ausblenden", "Masquer", "Ocultar", "隠す", "隐藏"]),
+    ("Effects", ["Effekte", "Effets", "Efectos", "効果", "效果"]),
+    ("Fitting", ["Anpassen", "Ajustement", "Encaje", "オブジェクトサイズの調整", "适合"]),
+    (
+        "Text Frame Options…",
+        ["Textrahmenoptionen …", "Options de bloc de texte…", "Opciones de marco de texto…", "テキストフレーム設定…", "文本框架选项…"],
+    ),
+    // Table.
+    ("Insert Table…", ["Tabelle einfügen …", "Insérer un tableau…", "Insertar tabla…", "表を挿入…", "插入表…"]),
+    ("Merge Cells", ["Zellen verbinden", "Fusionner les cellules", "Combinar celdas", "セルを結合", "合并单元格"]),
+    ("Unmerge Cells", ["Zellverbindung aufheben", "Annuler la fusion des cellules", "Separar celdas", "セルの結合解除", "取消合并单元格"]),
+    ("Insert", ["Einfügen", "Insérer", "Insertar", "挿入", "插入"]),
+    ("Delete", ["Löschen", "Supprimer", "Eliminar", "削除", "删除"]),
+    // View.
+    ("Zoom In", ["Einzoomen", "Zoom avant", "Acercar", "ズームイン", "放大"]),
+    ("Zoom Out", ["Auszoomen", "Zoom arrière", "Alejar", "ズームアウト", "缩小"]),
+    (
+        "Fit Page in Window",
+        ["Seite in Fenster einpassen", "Ajuster la page à la fenêtre", "Encajar página en ventana", "ページ全体", "使页面适合窗口"],
+    ),
+    (
+        "Fit Spread in Window",
+        ["Druckbogen in Fenster einpassen", "Ajuster la planche à la fenêtre", "Encajar pliego en ventana", "スプレッド全体", "使跨页适合窗口"],
+    ),
+    ("Actual Size", ["Originalgröße", "Taille réelle", "Tamaño real", "100%", "实际大小"]),
+    ("Screen Mode", ["Bildschirmmodus", "Mode de l'écran", "Modo de pantalla", "スクリーンモード", "屏幕模式"]),
+    ("Grids & Guides", ["Raster und Hilfslinien", "Grilles et repères", "Cuadrículas y guías", "グリッドとガイド", "网格和参考线"]),
+    ("Show Rulers", ["Lineale einblenden", "Afficher les règles", "Mostrar reglas", "定規を表示", "显示标尺"]),
+    ("Snap to Guides", ["An Hilfslinien ausrichten", "Magnétisme des repères", "Ajustar a las guías", "ガイドにスナップ", "靠齐参考线"]),
+    (
+        "Snap to Document Grid",
+        [
+            "Am Dokumentraster ausrichten",
+            "Magnétisme de la grille du document",
+            "Ajustar a la cuadrícula del documento",
+            "ドキュメントグリッドにスナップ",
+            "靠齐文档网格",
+        ],
+    ),
+    ("Smart Guides", ["Smarte Hilfslinien", "Repères commentés", "Guías inteligentes", "スマートガイド", "智能参考线"]),
+    (
+        "Align to Object Edges",
+        [
+            "An Objektkanten ausrichten",
+            "Aligner sur les bords des objets",
+            "Alinear a los bordes del objeto",
+            "オブジェクトの端に揃える",
+            "对齐对象边缘",
+        ],
+    ),
+    (
+        "Align to Object Centers",
+        [
+            "An Objektmitten ausrichten",
+            "Aligner sur les centres des objets",
+            "Alinear a los centros del objeto",
+            "オブジェクトの中心に揃える",
+            "对齐对象中心",
+        ],
+    ),
+    ("Smart Dimensions", ["Smarte Maße", "Dimensions commentées", "Dimensiones inteligentes", "スマートサイズ", "智能尺寸"]),
+    ("Smart Spacing", ["Smarte Abstände", "Espacement commenté", "Espaciado inteligente", "スマート間隔", "智能间距"]),
+    ("Snap to Zone", ["Fangzone", "Zone de magnétisme", "Zona de ajuste", "スナップゾーン", "靠齐区域"]),
+    // Window and panels.
+    ("Properties", ["Eigenschaften", "Propriétés", "Propiedades", "プロパティ", "属性"]),
+    ("Layers", ["Ebenen", "Calques", "Capas", "レイヤー", "图层"]),
+    ("Links", ["Verknüpfungen", "Liens", "Vínculos", "リンク", "链接"]),
+    ("Swatches", ["Farbfelder", "Nuancier", "Muestras", "スウォッチ", "色板"]),
+    ("Color", ["Farbe", "Couleur", "Color", "カラー", "颜色"]),
+    ("Stroke", ["Kontur", "Contour", "Trazo", "線", "描边"]),
+    ("Gradient", ["Verlauf", "Dégradé", "Degradado", "グラデーション", "渐变"]),
+    ("Align", ["Ausrichten", "Alignement", "Alinear", "整列", "对齐"]),
+    ("Pathfinder", ["Pathfinder", "Pathfinder", "Buscatrazos", "パスファインダー", "路径查找器"]),
+    ("Info", ["Info", "Informations", "Información", "情報", "信息"]),
+    ("Library", ["Bibliothek", "Bibliothèque", "Biblioteca", "ライブラリ", "库"]),
+    ("Book", ["Buch", "Livre", "Libro", "ブック", "书籍"]),
+    ("Index", ["Index", "Index", "Índice", "索引", "索引"]),
+    ("Hyperlinks", ["Hyperlinks", "Hyperliens", "Hipervínculos", "ハイパーリンク", "超链接"]),
+    ("Bookmarks", ["Lesezeichen", "Signets", "Marcadores", "ブックマーク", "书签"]),
+    ("Articles", ["Artikel", "Articles", "Artículos", "アーティクル", "文章"]),
+    ("Tags", ["Tags", "Balises", "Etiquetas", "タグ", "标签"]),
+    ("Media", ["Medien", "Multimédia", "Medios", "メディア", "媒体"]),
+    ("Object States", ["Objektstatus", "États d'objet", "Estados de objeto", "オブジェクトステート", "对象状态"]),
+    ("Buttons and Forms", ["Schaltflächen und Formulare", "Boutons et formulaires", "Botones y formularios", "ボタンとフォーム", "按钮和表单"]),
+    ("Liquid Layout", ["Flüssiges Layout", "Mise en page liquide", "Maquetación líquida", "リキッドレイアウト", "自适应版面"]),
+    ("Workspace", ["Arbeitsbereich", "Espace de travail", "Espacio de trabajo", "ワークスペース", "工作区"]),
+    ("Editorial", ["Redaktion", "Éditorial", "Editorial", "エディトリアル", "编辑"]),
+    ("Object & Layout", ["Objekt und Layout", "Objet et mise en page", "Objeto y diseño", "オブジェクト＆レイアウト", "对象和版面"]),
+    ("Styles", ["Formate", "Styles", "Estilos", "スタイル", "样式"]),
+    ("Essentials Classic", ["Essentials Classic", "Les indispensables (classique)", "Essentials Classic", "Essentials Classic", "基本功能（经典）"]),
+    ("Split Window", ["Fenster teilen", "Fractionner la fenêtre", "Dividir ventana", "ウィンドウを分割", "拆分窗口"]),
+    ("New Window", ["Neues Fenster", "Nouvelle fenêtre", "Nueva ventana", "新規ウィンドウ", "新建窗口"]),
+    (
+        "Show All Menu Items",
+        [
+            "Alle Menüelemente anzeigen",
+            "Afficher toutes les commandes",
+            "Mostrar todos los elementos de menú",
+            "すべてのメニュー項目を表示",
+            "显示所有菜单项",
+        ],
+    ),
+    ("Accept All", ["Accept All", "Tout accepter", "Accept All", "Accept All", "全部接受"]),
+    ("Add", ["Add", "Ajouter", "Add", "Add", "添加"]),
+    ("Add Document…", ["Add Document…", "Ajouter un document…", "Add Document…", "Add Document…", "添加文档…"]),
+    (
+        "Add to Previous Spread",
+        ["Add to Previous Spread", "Ajouter à la planche précédente", "Add to Previous Spread", "Add to Previous Spread", "添加到上一个跨页"],
+    ),
+    ("Align From:", ["Align From:", "Aligner depuis :", "Align From:", "Align From:", "对齐自："]),
+    (
+        "Align to baseline grid",
+        ["Align to baseline grid", "Aligner sur la grille de ligne de base", "Align to baseline grid", "Align to baseline grid", "对齐基线网格"],
+    ),
+    ("Alignment:", ["Alignment:", "Alignement :", "Alignment:", "Alignment:", "对齐："]),
+    (
+        "All Spots to Process",
+        ["All Spots to Process", "Tous les tons directs en quadrichromie", "All Spots to Process", "All Spots to Process", "所有专色转四色"],
+    ),
+    (
+        "Allow Spread to Shuffle",
+        [
+            "Allow Spread to Shuffle",
+            "Autoriser la réorganisation des pages de la planche",
+            "Allow Spread to Shuffle",
+            "Allow Spread to Shuffle",
+            "允许跨页无序",
+        ],
+    ),
+    (
+        "Alternating Row Fills",
+        ["Alternating Row Fills", "Fonds de ligne en alternance", "Alternating Row Fills", "Alternating Row Fills", "交替行填色"],
+    ),
+    ("Appearance", ["Appearance", "Apparence", "Appearance", "Appearance", "外观"]),
+    ("Apply Gradient", ["Apply Gradient", "Appliquer le dégradé", "Apply Gradient", "Apply Gradient", "应用渐变"]),
+    ("Apply Parent", ["Apply Parent", "Appliquer le gabarit", "Apply Parent", "Apply Parent", "应用主页"]),
+    ("Apply Style:", ["Apply Style:", "Appliquer le style :", "Apply Style:", "Apply Style:", "应用样式："]),
+    (
+        "Apply to All Spreads",
+        ["Apply to All Spreads", "Appliquer à toutes les planches", "Apply to All Spreads", "Apply to All Spreads", "应用到所有跨页"],
+    ),
+    ("Apply to Stroke", ["Apply to Stroke", "Appliquer au contour", "Apply to Stroke", "Apply to Stroke", "应用到描边"]),
+    ("Art", ["Art", "Illustration", "Art", "Art", "画板"]),
+    ("Based On:", ["Based On:", "Basé sur :", "Based On:", "Based On:", "基于："]),
+    ("Bleed", ["Bleed", "Fond perdu", "Bleed", "Bleed", "出血"]),
+    ("Bleed Marks", ["Beschnittmarken", "Repères de fond perdu", "Marcas de sangrado", "塗り足しマーク", "出血标记"]),
+    ("Body Rows", ["Body Rows", "Lignes de corps", "Body Rows", "Body Rows", "表体行"]),
+    ("Bottom", ["Bottom", "Bas", "Bottom", "Bottom", "底部"]),
+    (
+        "Break Link to Style",
+        ["Break Link to Style", "Rompre le lien avec le style", "Break Link to Style", "Break Link to Style", "断开与样式的链接"],
+    ),
+    ("Redefine Style", ["Format neu definieren", "Redéfinir le style", "Redefinir estilo", "スタイルを再定義", "重新定义样式"]),
+    ("Bullets and Numbering", ["Bullets and Numbering", "Puces et numérotation", "Bullets and Numbering", "Bullets and Numbering", "项目符号和编号"]),
+    ("Business Card", ["Business Card", "Carte de visite", "Business Card", "Business Card", "名片"]),
+    ("CMYK", ["CMYK", "CMJN", "CMYK", "CMYK", "CMYK"]),
+    ("Cancel", ["Cancel", "Annuler", "Cancel", "Cancel", "取消"]),
+    (
+        "Can't Open the File",
+        [
+            "Datei kann nicht geöffnet werden",
+            "Impossible d'ouvrir le fichier",
+            "No se puede abrir el archivo",
+            "ファイルを開けません",
+            "无法打开文件",
+        ],
+    ),
+    (
+        "Can't Place the File",
+        [
+            "Datei kann nicht platziert werden",
+            "Impossible d'importer le fichier",
+            "No se puede colocar el archivo",
+            "ファイルを配置できません",
+            "无法置入文件",
+        ],
+    ),
+    ("Center Content", ["Center Content", "Centrer le contenu", "Center Content", "Center Content", "内容居中"]),
+    ("Change All", ["Change All", "Tout remplacer", "Change All", "Change All", "全部更改"]),
+    ("Change to:", ["Change to:", "Remplacer par :", "Change to:", "Change to:", "更改为："]),
+    ("Character Style:", ["Character Style:", "Style de caractère :", "Character Style:", "Character Style:", "字符样式："]),
+    ("Checked by default", ["Checked by default", "Cochée par défaut", "Checked by default", "Checked by default", "默认选中"]),
+    ("Choices", ["Choices", "Choix", "Choices", "Choices", "选项"]),
+    ("Choose Image…", ["Choose Image…", "Choisir une image…", "Choose Image…", "Choose Image…", "选择图像…"]),
+    ("Class:", ["Class:", "Classe :", "Class:", "Class:", "类别："]),
+    ("Color Picker", ["Color Picker", "Sélecteur de couleurs", "Color Picker", "Color Picker", "拾色器"]),
+    ("Color Settings", ["Color Settings", "Réglages des couleurs", "Color Settings", "Color Settings", "颜色设置"]),
+    ("Color:", ["Color:", "Couleur :", "Color:", "Color:", "颜色："]),
+    ("Columns", ["Columns", "Colonnes", "Columns", "Columns", "栏"]),
+    ("Composer:", ["Composer:", "Compositeur :", "Composer:", "Composer:", "排版器："]),
+    ("Copies:", ["Copies:", "Copies :", "Copies:", "Copies:", "份数："]),
+    ("Count", ["Count", "Compter", "Count", "Count", "数量"]),
+    ("Create", ["Create", "Créer", "Create", "Create", "创建"]),
+    ("Create Table", ["Create Table", "Créer un tableau", "Create Table", "Create Table", "创建表"]),
+    ("Create Table…", ["Create Table…", "Créer un tableau…", "Create Table…", "Create Table…", "创建表…"]),
+    ("Crop", ["Crop", "Recadrage", "Crop", "Crop", "裁剪"]),
+    ("Crop Marks", ["Schnittmarken", "Traits de coupe", "Marcas de recorte", "トンボ", "裁切标记"]),
+    ("Crop to:", ["Crop to:", "Recadrer selon :", "Crop to:", "Crop to:", "裁剪到："]),
+    ("Cursor Key:", ["Cursor Key:", "Touche fléchée :", "Cursor Key:", "Cursor Key:", "光标键："]),
+    ("Default", ["Default", "Par défaut", "Default", "Default", "默认"]),
+    ("Default View:", ["Default View:", "Affichage par défaut :", "Default View:", "Default View:", "默认视图："]),
+    ("Delete Column", ["Delete Column", "Supprimer la colonne", "Delete Column", "Delete Column", "删除列"]),
+    ("Delete Condition", ["Delete Condition", "Supprimer la condition", "Delete Condition", "Delete Condition", "删除条件"]),
+    ("Delete Layer", ["Delete Layer", "Supprimer le calque", "Delete Layer", "Delete Layer", "删除图层"]),
+    ("Delete Page", ["Delete Page", "Supprimer la page", "Delete Page", "Delete Page", "删除页面"]),
+    ("Delete Row", ["Delete Row", "Supprimer la ligne", "Delete Row", "Delete Row", "删除行"]),
+    ("Delete Swatch", ["Delete Swatch", "Supprimer la nuance", "Delete Swatch", "Delete Swatch", "删除色板"]),
+    (
+        "Delete Unused Layers",
+        ["Delete Unused Layers", "Supprimer les calques inutilisés", "Delete Unused Layers", "Delete Unused Layers", "删除未使用的图层"],
+    ),
+    ("Desired", ["Desired", "Optimal", "Desired", "Desired", "最佳"]),
+    ("Dialog", ["Dialog", "Boîte de dialogue", "Dialog", "Dialog", "对话框"]),
+    ("Document", ["Document", "Document", "Document", "Document", "文档"]),
+    ("Document Setup", ["Document Setup", "Format de document", "Document Setup", "Document Setup", "文档设置"]),
+    ("Drop Shadow", ["Drop Shadow", "Ombre portée", "Drop Shadow", "Drop Shadow", "投影"]),
+    ("Duplicate Spread", ["Duplicate Spread", "Dupliquer la planche", "Duplicate Spread", "Duplicate Spread", "复制跨页"]),
+    (
+        "Duplicate Spread at End of Document",
+        [
+            "Druckbogen am Dokumentende duplizieren",
+            "Dupliquer la planche à la fin du document",
+            "Duplicar pliego al final del documento",
+            "ドキュメントの最後にスプレッドを複製",
+            "在文档末尾复制跨页",
+        ],
+    ),
+    ("Delete Spread", ["Druckbogen löschen", "Supprimer la planche", "Eliminar pliego", "スプレッドを削除", "删除跨页"]),
+    ("Parent Pages", ["Übergeordnete Seiten", "Gabarits", "Páginas principales", "親ページ", "父页面"]),
+    (
+        "Apply Parent to Pages",
+        [
+            "Übergeordnete Seite auf Seiten anwenden",
+            "Appliquer le gabarit aux pages",
+            "Aplicar principal a páginas",
+            "親ページを適用",
+            "将父页面应用于页面",
+        ],
+    ),
+    ("Email", ["Email", "E-mail", "Email", "Email", "电子邮件"]),
+    ("Embed", ["Embed", "Incorporer", "Embed", "Embed", "嵌入"]),
+    ("Export PDF", ["PDF exportieren", "Exporter en PDF", "Exportar PDF", "PDF を書き出し", "导出PDF"]),
+    ("Export XML…", ["Export XML…", "Exporter en XML…", "Export XML…", "Export XML…", "导出XML…"]),
+    ("Fast", ["Fast", "Rapide", "Fast", "Fast", "快速"]),
+    (
+        "Fill Frame Proportionally",
+        [
+            "Fill Frame Proportionally",
+            "Remplir le bloc proportionnellement",
+            "Fill Frame Proportionally",
+            "Fill Frame Proportionally",
+            "按比例填充框架",
+        ],
+    ),
+    ("Find All", ["Find All", "Tout rechercher", "Find All", "Find All", "查找全部"]),
+    ("Find Next", ["Find Next", "Rechercher suivant", "Find Next", "Find Next", "查找下一个"]),
+    ("Find what:", ["Find what:", "Rechercher :", "Find what:", "Find what:", "查找内容："]),
+    ("Find/Change", ["Find/Change", "Rechercher/Remplacer", "Find/Change", "Find/Change", "查找/更改"]),
+    ("Find/Replace Font", ["Find/Replace Font", "Rechercher/Remplacer une police", "Find/Replace Font", "Find/Replace Font", "查找/替换字体"]),
+    (
+        "Fit Content Proportionally",
+        [
+            "Fit Content Proportionally",
+            "Ajuster le contenu proportionnellement",
+            "Fit Content Proportionally",
+            "Fit Content Proportionally",
+            "按比例适合内容",
+        ],
+    ),
+    ("Fit Content to Frame", ["Fit Content to Frame", "Ajuster le contenu au bloc", "Fit Content to Frame", "Fit Content to Frame", "内容适合框架"]),
+    ("Fitting:", ["Fitting:", "Ajustement :", "Fitting:", "Fitting:", "适合："]),
+    (
+        "Flattener preset",
+        ["Voreinstellung für Transparenzreduzierung", "Préréglage d'aplatissement", "Preajuste de acoplado", "透明分割プリセット", "拼合器预设"],
+    ),
+    ("Font Family:", ["Font Family:", "Famille de polices :", "Font Family:", "Font Family:", "字体系列："]),
+    ("Font Size:", ["Font Size:", "Corps :", "Font Size:", "Font Size:", "字体大小："]),
+    ("Font Style:", ["Font Style:", "Style de police :", "Font Style:", "Font Style:", "字体样式："]),
+    ("Footer Rows", ["Footer Rows", "Lignes de pied de tableau", "Footer Rows", "Footer Rows", "表尾行"]),
+    ("Footnote Options", ["Footnote Options", "Options des notes de bas de page", "Footnote Options", "Footnote Options", "脚注选项"]),
+    ("Form Field", ["Form Field", "Champ de formulaire", "Form Field", "Form Field", "表单字段"]),
+    ("Format:", ["Format:", "Format :", "Format:", "Format:", "格式："]),
+    ("Frame Fitting", ["Frame Fitting", "Ajustement au bloc", "Frame Fitting", "Frame Fitting", "框架适合"]),
+    (
+        "Frame Fitting Options",
+        ["Frame Fitting Options", "Options d'ajustement au bloc", "Frame Fitting Options", "Frame Fitting Options", "框架适合选项"],
+    ),
+    ("Generate QR Code", ["Generate QR Code", "Générer un code QR", "Generate QR Code", "Generate QR Code", "生成二维码"]),
+    ("Go To", ["Go To", "Atteindre", "Go To", "Go To", "转到"]),
+    ("Go to Page", ["Go to Page", "Atteindre la page", "Go to Page", "Go to Page", "转到页面"]),
+    ("Gutter", ["Gutter", "Gouttière", "Gutter", "Gutter", "栏间距"]),
+    ("Header Rows", ["Header Rows", "Lignes d'en-tête", "Header Rows", "Header Rows", "表头行"]),
+    ("Height", ["Height", "Hauteur", "Height", "Height", "高度"]),
+    ("Height:", ["Height:", "Hauteur :", "Height:", "Height:", "高度："]),
+    ("High Quality", ["High Quality", "Qualité supérieure", "High Quality", "High Quality", "高品质"]),
+    ("Desktop Printing", ["Bürodruck", "Impression bureautique", "Impresión de oficina", "オフィス印刷", "办公打印"]),
+    (
+        "Horizontal Gridline Every:",
+        [
+            "Horizontal Gridline Every:",
+            "Ligne de grille horizontale tous les :",
+            "Horizontal Gridline Every:",
+            "Horizontal Gridline Every:",
+            "水平网格线间隔：",
+        ],
+    ),
+    ("Horizontal Margins:", ["Horizontal Margins:", "Marges horizontales :", "Horizontal Margins:", "Horizontal Margins:", "水平边距："]),
+    ("Hyphenate", ["Hyphenate", "Césure", "Hyphenate", "Hyphenate", "连字符"]),
+    ("Import Options", ["Import Options", "Options d'importation", "Import Options", "Import Options", "导入选项"]),
+    ("Import XML…", ["Import XML…", "Importer XML…", "Import XML…", "Import XML…", "导入XML…"]),
+    (
+        "Include document bleed",
+        [
+            "Dokumentbeschnitt einschließen",
+            "Inclure le fond perdu du document",
+            "Incluir sangrado del documento",
+            "ドキュメントの塗り足しを含める",
+            "包含文档出血",
+        ],
+    ),
+    ("Increment Every:", ["Increment Every:", "Ligne de grille tous les :", "Increment Every:", "Increment Every:", "递增步长："]),
+    ("Ink Manager", ["Ink Manager", "Gestionnaire d'encres", "Ink Manager", "Ink Manager", "油墨管理器"]),
+    ("Insert Column", ["Insert Column", "Insérer une colonne", "Insert Column", "Insert Column", "插入列"]),
+    ("Insert Page After", ["Insert Page After", "Insérer une page après", "Insert Page After", "Insert Page After", "在后面插入页面"]),
+    ("Insert Row", ["Insert Row", "Insérer une ligne", "Insert Row", "Insert Row", "插入行"]),
+    ("Inset spacing", ["Inset spacing", "Espacement de retrait", "Inset spacing", "Inset spacing", "内边距"]),
+    ("Inside", ["Inside", "Intérieur", "Inside", "Inside", "内侧"]),
+    ("Intent:", ["Intent:", "Mode :", "Intent:", "Intent:", "意图："]),
+    ("Keyboard Shortcuts", ["Keyboard Shortcuts", "Raccourcis clavier", "Keyboard Shortcuts", "Keyboard Shortcuts", "键盘快捷键"]),
+    ("Kind:", ["Kind:", "Type :", "Kind:", "Kind:", "类型："]),
+    ("Lab", ["Lab", "Lab", "Lab", "Lab", "Lab"]),
+    ("Leading:", ["Leading:", "Interligne :", "Leading:", "Leading:", "行距："]),
+    ("Left Indent:", ["Left Indent:", "Retrait à gauche :", "Left Indent:", "Left Indent:", "左缩进："]),
+    ("Link To:", ["Link To:", "Lien vers :", "Link To:", "Link To:", "链接到："]),
+    ("Load Profile…", ["Load Profile…", "Charger un profil…", "Load Profile…", "Load Profile…", "加载配置文件…"]),
+    ("Load Swatches…", ["Load Swatches…", "Charger des nuances…", "Load Swatches…", "Load Swatches…", "加载色板…"]),
+    (
+        "Load Paragraph Styles…",
+        ["Absatzformate laden…", "Charger les styles de paragraphe…", "Cargar estilos de párrafo…", "段落スタイルを読み込み…", "加载段落样式…"],
+    ),
+    (
+        "Load Character Styles…",
+        ["Zeichenformate laden…", "Charger les styles de caractère…", "Cargar estilos de carácter…", "文字スタイルを読み込み…", "加载字符样式…"],
+    ),
+    (
+        "Load All Text Styles…",
+        [
+            "Alle Textformate laden…",
+            "Charger tous les styles de texte…",
+            "Cargar todos los estilos de texto…",
+            "すべてのテキストスタイルを読み込み…",
+            "加载所有文本样式…",
+        ],
+    ),
+    ("Load Styles", ["Formate laden", "Charger les styles", "Cargar estilos", "スタイルを読み込み", "加载样式"]),
+    ("Restart Numbering", ["Nummerierung neu beginnen", "Recommencer la numérotation", "Reiniciar numeración", "番号の振り直し", "重新开始编号"]),
+    ("Continue Numbering", ["Nummerierung fortführen", "Poursuivre la numérotation", "Continuar numeración", "番号の継続", "继续编号"]),
+    ("Keep Options…", ["Umbruchoptionen …", "Options d'enchaînement…", "Opciones de separación…", "段落分離禁止オプション…", "保持选项…"]),
+    (
+        "Space Between Paragraphs Using Same Style",
+        [
+            "Abstand zwischen Absätzen mit gleichem Format",
+            "Espace entre les paragraphes de même style",
+            "Espacio entre párrafos con el mismo estilo",
+            "同じスタイルの段落間のスペース",
+            "使用相同样式的段落间距",
+        ],
+    ),
+    ("Ignore", ["Ignorieren", "Ignorer", "Ignorar", "無視", "忽略"]),
+    (
+        "Do Not Align to Baseline Grid",
+        [
+            "Nicht am Grundlinienraster ausrichten",
+            "Ne pas aligner sur la grille de ligne de base",
+            "No alinear con cuadrícula base",
+            "ベースライングリッドに揃えない",
+            "不对齐基线网格",
+        ],
+    ),
+    (
+        "Only Align First Line to Grid",
+        [
+            "Nur erste Zeile am Raster ausrichten",
+            "Aligner uniquement la première ligne sur la grille",
+            "Alinear solo primera línea con cuadrícula",
+            "最初の行のみグリッドに揃える",
+            "仅首行对齐网格",
+        ],
+    ),
+    (
+        "Balance Ragged Lines",
+        ["Unausgeglichene Zeilen ausgleichen", "Équilibrer les lignes irrégulières", "Equilibrar líneas desiguales", "行末を調整", "平衡未对齐的行"],
+    ),
+    (
+        "Drop Caps and Nested Styles…",
+        [
+            "Initialen und verschachtelte Formate …",
+            "Lettrines et styles imbriqués…",
+            "Capitulares y estilos anidados…",
+            "ドロップキャップと先頭文字スタイル…",
+            "首字下沉和嵌套样式…",
+        ],
+    ),
+    ("GREP Styles…", ["GREP-Stile …", "Styles GREP…", "Estilos GREP…", "正規表現スタイル…", "GREP 样式…"]),
+    (
+        "Restart/Continue Numbering",
+        [
+            "Nummerierung neu beginnen/fortführen",
+            "Recommencer/Poursuivre la numérotation",
+            "Reiniciar/Continuar numeración",
+            "番号の振り直し/継続",
+            "重新开始/继续编号",
+        ],
+    ),
+    (
+        "Convert Bullets and Numbering to Text",
+        [
+            "Aufzählungszeichen und Nummerierung in Text konvertieren",
+            "Convertir les puces et la numérotation en texte",
+            "Convertir viñetas y numeración en texto",
+            "箇条書きと段落番号をテキストに変換",
+            "将项目符号和编号转换为文本",
+        ],
+    ),
+    ("Hyphenation…", ["Silbentrennung …", "Césure…", "Separación por sílabas…", "ハイフネーション…", "连字…"]),
+    (
+        "Hyphenation Settings",
+        ["Silbentrennungseinstellungen", "Paramètres de césure", "Configuración de separación por sílabas", "ハイフネーション設定", "连字设置"],
+    ),
+    ("hyphens", ["Trennstriche", "tirets", "guiones", "ハイフン", "连字符"]),
+    ("Hyphenation Zone:", ["Silbentrennungsbereich:", "Zone de césure :", "Zona de separación:", "ハイフネーション領域 :", "连字区："]),
+    ("Better Spacing", ["Bessere Abstände", "Meilleur espacement", "Mejor espaciado", "スペースを優先", "更好的间距"]),
+    ("Fewer Hyphens", ["Weniger Trennstriche", "Moins de tirets", "Menos guiones", "ハイフンを減らす", "更少的连字符"]),
+    (
+        "Hyphenate Capitalized Words",
+        [
+            "Großgeschriebene Wörter trennen",
+            "Césure des mots en capitales",
+            "Separar palabras en mayúscula",
+            "大文字で始まる単語をハイフネーション",
+            "连字大写的单词",
+        ],
+    ),
+    (
+        "Hyphenate Last Word",
+        ["Letztes Wort trennen", "Césure du dernier mot", "Separar última palabra", "最後の単語をハイフネーション", "连字最后一个单词"],
+    ),
+    (
+        "Hyphenate Across Column",
+        ["Über Spalten trennen", "Césure entre colonnes", "Separar entre columnas", "段をまたいでハイフネーション", "跨栏连字"],
+    ),
+    (
+        "Differs from this document",
+        ["Weicht von diesem Dokument ab", "Diffère de ce document", "Difiere de este documento", "このドキュメントと異なります", "与此文档不同"],
+    ),
+    (
+        "Redefine Document Style",
+        [
+            "Dokumentformat neu definieren",
+            "Redéfinir le style du document",
+            "Redefinir el estilo del documento",
+            "ドキュメントのスタイルを再定義",
+            "重新定义文档样式",
+        ],
+    ),
+    (
+        "Use Document Style Definition",
+        [
+            "Formatdefinition des Dokuments verwenden",
+            "Utiliser la définition de style du document",
+            "Usar la definición de estilo del documento",
+            "ドキュメントのスタイル定義を使用",
+            "使用文档样式定义",
+        ],
+    ),
+    ("Auto Rename", ["Automatisch umbenennen", "Renommer automatiquement", "Cambiar nombre automáticamente", "自動的に名前を変更", "自动重命名"]),
+    ("Load…", ["Load…", "Charger…", "Load…", "Load…", "加载…"]),
+    ("Make Compound", ["Make Compound", "Créer un tracé transparent", "Make Compound", "Make Compound", "建立复合路径"]),
+    ("Margins", ["Margins", "Marges", "Margins", "Margins", "边距"]),
+    ("Marks and Bleeds", ["Marken und Beschnitt", "Repères et fonds perdus", "Marcas y sangrado", "トンボと塗り足し", "标记和出血"]),
+    ("Maximum", ["Maximum", "Maximum", "Maximum", "Maximum", "最大"]),
+    ("Menu Customization", ["Menu Customization", "Personnalisation des menus", "Menu Customization", "Menu Customization", "菜单自定"]),
+    (
+        "Merge into Active Layer",
+        ["Merge into Active Layer", "Fusionner dans le calque actif", "Merge into Active Layer", "Merge into Active Layer", "合并到活动图层"],
+    ),
+    ("Min:", ["Min:", "Min. :", "Min:", "Min:", "最小："]),
+    ("Minimum", ["Minimum", "Minimum", "Minimum", "Minimum", "最小"]),
+    (
+        "Minimum Space Before First Footnote:",
+        [
+            "Minimum Space Before First Footnote:",
+            "Espace minimal avant la première note de bas de page :",
+            "Minimum Space Before First Footnote:",
+            "Minimum Space Before First Footnote:",
+            "第一个脚注前最小间距：",
+        ],
+    ),
+    (
+        "Misspelled word → Correction (one per line):",
+        [
+            "Misspelled word → Correction (one per line):",
+            "Mot mal orthographié → correction (un par ligne) :",
+            "Misspelled word → Correction (one per line):",
+            "Misspelled word → Correction (one per line):",
+            "拼写错误的单词 → 更正（每行一个）：",
+        ],
+    ),
+    ("Mobile", ["Mobile", "Mobile", "Mobile", "Mobile", "移动设备"]),
+    ("Move Selection Here", ["Move Selection Here", "Déplacer la sélection ici", "Move Selection Here", "Move Selection Here", "将所选内容移至此处"]),
+    (
+        "Select; drag to move the selection to another layer",
+        [
+            "Auswählen; ziehen, um die Auswahl auf eine andere Ebene zu verschieben",
+            "Sélectionner ; faire glisser pour déplacer la sélection vers un autre calque",
+            "Seleccionar; arrastre para mover la selección a otra capa",
+            "選択（ドラッグで選択範囲を別のレイヤーへ移動）",
+            "选择；拖动可将所选内容移至其他图层",
+        ],
+    ),
+    (
+        "Move to Color Group",
+        ["Move to Color Group", "Déplacer vers le groupe de couleurs", "Move to Color Group", "Move to Color Group", "移动到颜色组"],
+    ),
+    ("Move to Group", ["Move to Group", "Déplacer vers le groupe", "Move to Group", "Move to Group", "移动到组"]),
+    ("Multiline", ["Multiline", "Multiligne", "Multiline", "Multiline", "多行"]),
+    ("Name", ["Name", "Nom", "Name", "Name", "名称"]),
+    ("Name:", ["Name:", "Nom :", "Name:", "Name:", "名称："]),
+    (
+        "New Bookmark for This Page",
+        [
+            "New Bookmark for This Page",
+            "Nouveau signet pour cette page",
+            "New Bookmark for This Page",
+            "New Bookmark for This Page",
+            "为此页面新建书签",
+        ],
+    ),
+    ("New Book…", ["New Book…", "Nouveau livre…", "New Book…", "New Book…", "新建书籍…"]),
+    ("New Color Group", ["New Color Group", "Nouveau groupe de couleurs", "New Color Group", "New Color Group", "新建颜色组"]),
+    (
+        "New Color Group with Swatch",
+        [
+            "New Color Group with Swatch",
+            "Nouveau groupe de couleurs avec la nuance",
+            "New Color Group with Swatch",
+            "New Color Group with Swatch",
+            "使用色板新建颜色组",
+        ],
+    ),
+    ("New Cross-Reference", ["New Cross-Reference", "Nouvelle référence croisée", "New Cross-Reference", "New Cross-Reference", "新建交叉引用"]),
+    ("New Document", ["New Document", "Nouveau document", "New Document", "New Document", "新建文档"]),
+    ("New GREP Style", ["New GREP Style", "Nouveau style GREP", "New GREP Style", "New GREP Style", "新建 GREP 样式"]),
+    ("New Library…", ["New Library…", "Nouvelle bibliothèque…", "New Library…", "New Library…", "新建库…"]),
+    ("New Line Style", ["New Line Style", "Nouveau style de ligne", "New Line Style", "New Line Style", "新建线型"]),
+    ("New Nested Style", ["New Nested Style", "Nouveau style imbriqué", "New Nested Style", "New Nested Style", "新建嵌套样式"]),
+    ("New Workspace", ["New Workspace", "Nouvel espace de travail", "New Workspace", "New Workspace", "新建工作区"]),
+    ("No spot inks", ["No spot inks", "Aucun ton direct", "No spot inks", "No spot inks", "无专色"]),
+    ("None", ["None", "Aucun", "None", "None", "无"]),
+    ("Number of Pages:", ["Number of Pages:", "Nombre de pages :", "Number of Pages:", "Number of Pages:", "页数："]),
+    ("Number of Sides:", ["Number of Sides:", "Nombre de côtés :", "Number of Sides:", "Number of Sides:", "边数："]),
+    ("Number of columns", ["Number of columns", "Nombre de colonnes", "Number of columns", "Number of columns", "栏数"]),
+    ("Object Layer Options", ["Object Layer Options", "Options de calque d'objet", "Object Layer Options", "Object Layer Options", "对象图层选项"]),
+    ("Offset:", ["Offset:", "Décalage :", "Offset:", "Offset:", "偏移："]),
+    ("On Release", ["On Release", "Au relâchement", "On Release", "On Release", "释放时"]),
+    ("On Screen:", ["On Screen:", "À l'écran :", "On Screen:", "On Screen:", "屏幕显示："]),
+    ("OpenType", ["OpenType", "OpenType", "OpenType", "OpenType", "OpenType"]),
+    ("Orientation:", ["Orientation:", "Orientation :", "Orientation:", "Orientation:", "方向："]),
+    ("Outside", ["Outside", "Extérieur", "Outside", "Outside", "外侧"]),
+    ("Page Information", ["Seiteninformationen", "Informations sur la page", "Información de página", "ページ情報", "页面信息"]),
+    ("Page Range", ["Seitenbereich", "Plage de pages", "Intervalo de páginas", "ページ範囲", "页面范围"]),
+    ("Page Range:", ["Seitenbereich:", "Plage de pages :", "Intervalo de páginas:", "ページ範囲:", "页面范围："]),
+    ("Pages:", ["Pages:", "Pages :", "Pages:", "Pages:", "页面："]),
+    ("Paragraph Composer", ["Paragraph Composer", "Compositeur de paragraphe", "Paragraph Composer", "Paragraph Composer", "段落排版器"]),
+    (
+        "Paragraph Style Options",
+        ["Paragraph Style Options", "Options de style de paragraphe", "Paragraph Style Options", "Paragraph Style Options", "段落样式选项"],
+    ),
+    ("Paragraph Style:", ["Paragraph Style:", "Style de paragraphe :", "Paragraph Style:", "Paragraph Style:", "段落样式："]),
+    ("PDF/A-2b", ["PDF/A-2b", "PDF/A-2b", "PDF/A-2b", "PDF/A-2b", "PDF/A-2b"]),
+    ("PDF/X-1a:2003", ["PDF/X-1a:2003", "PDF/X-1a:2003", "PDF/X-1a:2003", "PDF/X-1a:2003", "PDF/X-1a:2003"]),
+    ("PDF/X-4", ["PDF/X-4", "PDF/X-4", "PDF/X-4", "PDF/X-4", "PDF/X-4"]),
+    ("Place PDF", ["Place PDF", "Importer un PDF", "Place PDF", "Place PDF", "置入PDF"]),
+    ("Plain Text", ["Plain Text", "Texte brut", "Plain Text", "Plain Text", "纯文本"]),
+    ("Polygon Settings", ["Polygon Settings", "Paramètres du polygone", "Polygon Settings", "Polygon Settings", "多边形设置"]),
+    ("Position", ["Position", "Position", "Position", "Position", "位置"]),
+    ("Position:", ["Position:", "Position :", "Position:", "Position:", "位置："]),
+    ("Poster", ["Poster", "Affiche", "Poster", "Poster", "海报"]),
+    ("Preferences", ["Preferences", "Préférences", "Preferences", "Preferences", "首选项"]),
+    ("Prefix:", ["Prefix:", "Préfixe :", "Prefix:", "Prefix:", "前缀："]),
+    ("Preset", ["Preset", "Paramètre prédéfini", "Preset", "Preset", "预设"]),
+    ("Preset:", ["Voreinstellung:", "Paramètre prédéfini :", "Preajuste:", "プリセット:", "预设："]),
+    ("Commercial Printing", ["Druckerei", "Impression commerciale", "Impresión comercial", "商業印刷", "商业印刷"]),
+    ("Print", ["Print", "Imprimer", "Print", "Print", "打印"]),
+    ("Printer:", ["Printer:", "Imprimante :", "Printer:", "Printer:", "打印机："]),
+    (
+        "Printing / Exporting:",
+        ["Printing / Exporting:", "Impression / Exportation :", "Printing / Exporting:", "Printing / Exporting:", "打印/导出："],
+    ),
+    ("Quick Actions", ["Quick Actions", "Actions rapides", "Quick Actions", "Quick Actions", "快速操作"]),
+    ("RGB", ["RGB", "RVB", "RGB", "RGB", "RGB"]),
+    ("Rectangle", ["Rectangle", "Rectangle", "Rectangle", "Rectangle", "矩形"]),
+    ("Reject All", ["Reject All", "Tout refuser", "Reject All", "Reject All", "全部拒绝"]),
+    ("Relative To:", ["Relative To:", "Relatif à :", "Relative To:", "Relative To:", "相对于："]),
+    ("Release", ["Release", "Libérer", "Release", "Release", "释放"]),
+    ("Relink to Folder…", ["Relink to Folder…", "Rééditer le lien au dossier…", "Relink to Folder…", "Relink to Folder…", "重新链接到文件夹…"]),
+    ("Relink…", ["Relink…", "Rééditer le lien…", "Relink…", "Relink…", "重新链接…"]),
+    (
+        "Remove Conditions from Selection",
+        [
+            "Remove Conditions from Selection",
+            "Supprimer les conditions de la sélection",
+            "Remove Conditions from Selection",
+            "Remove Conditions from Selection",
+            "从选择中移除条件",
+        ],
+    ),
+    ("Repeat Header Rows", ["Repeat Header Rows", "Répéter les lignes d'en-tête", "Repeat Header Rows", "Repeat Header Rows", "重复表头行"]),
+    ("Required", ["Required", "Obligatoire", "Required", "Required", "必填"]),
+    (
+        "Reset All to Defaults",
+        ["Reset All to Defaults", "Rétablir toutes les valeurs par défaut", "Reset All to Defaults", "Reset All to Defaults", "全部恢复为默认值"],
+    ),
+    (
+        "Restart Numbering Every:",
+        [
+            "Restart Numbering Every:",
+            "Recommencer la numérotation à chaque :",
+            "Restart Numbering Every:",
+            "Restart Numbering Every:",
+            "重新编号起点：",
+        ],
+    ),
+    ("Reverse", ["Reverse", "Inverser", "Reverse", "Reverse", "反转"]),
+    (
+        "Save Swatches for Exchange…",
+        [
+            "Save Swatches for Exchange…",
+            "Enregistrer les nuances pour échange…",
+            "Save Swatches for Exchange…",
+            "Save Swatches for Exchange…",
+            "保存交换用色板…",
+        ],
+    ),
+    (
+        "Save recovery data every:",
+        [
+            "Save recovery data every:",
+            "Enregistrer les données de récupération toutes les :",
+            "Save recovery data every:",
+            "Save recovery data every:",
+            "保存恢复数据间隔：",
+        ],
+    ),
+    ("Search:", ["Search:", "Rechercher :", "Search:", "Search:", "搜索："]),
+    ("Select an object.", ["Select an object.", "Sélectionnez un objet.", "Select an object.", "Select an object.", "选择一个对象。"]),
+    (
+        "Select text or a text frame.",
+        [
+            "Select text or a text frame.",
+            "Sélectionnez du texte ou un bloc de texte.",
+            "Select text or a text frame.",
+            "Select text or a text frame.",
+            "选择文本或文本框架。",
+        ],
+    ),
+    ("Separator:", ["Separator:", "Séparateur :", "Separator:", "Separator:", "分隔符："]),
+    (
+        "Show Prefix/Suffix in:",
+        ["Show Prefix/Suffix in:", "Afficher le préfixe/suffixe dans :", "Show Prefix/Suffix in:", "Show Prefix/Suffix in:", "显示前缀/后缀位置："],
+    ),
+    ("Show Tag Markers", ["Show Tag Markers", "Afficher les marqueurs de balise", "Show Tag Markers", "Show Tag Markers", "显示标签标志符"]),
+    ("Single-line", ["Single-line", "Ligne simple", "Single-line", "Single-line", "单行"]),
+    ("Single-line Composer", ["Single-line Composer", "Compositeur ligne simple", "Single-line Composer", "Single-line Composer", "单行排版器"]),
+    ("Size:", ["Size:", "Taille :", "Size:", "Size:", "大小："]),
+    ("Screen and Email", ["Bildschirm und E-Mail", "Écran et e-mail", "Pantalla y correo", "画面とメール", "屏幕和电子邮件"]),
+    (
+        "Space Between Footnotes:",
+        ["Space Between Footnotes:", "Espace entre les notes de bas de page :", "Space Between Footnotes:", "Space Between Footnotes:", "脚注间距："],
+    ),
+    ("Speed", ["Speed", "Vitesse", "Speed", "Speed", "速度"]),
+    ("Standard", ["Standard", "Norme", "Estándar", "標準", "标准"]),
+    ("Standard:", ["Standard:", "Norme :", "Estándar:", "標準:", "标准："]),
+    ("Star Inset:", ["Star Inset:", "Renfoncement des branches :", "Star Inset:", "Star Inset:", "星形内边距："]),
+    ("Start Page #:", ["Start Page #:", "N° de la première page :", "Start Page #:", "Start Page #:", "起始页码："]),
+    ("Start at:", ["Start at:", "Commencer à :", "Start at:", "Start at:", "起始编号："]),
+    ("Start:", ["Start:", "Début :", "Start:", "Start:", "开始："]),
+    ("Style Name:", ["Style Name:", "Nom du style :", "Style Name:", "Style Name:", "样式名称："]),
+    ("Style:", ["Style:", "Style :", "Style:", "Style:", "样式："]),
+    ("Stylistic Sets", ["Stylistic Sets", "Jeux stylistiques", "Stylistic Sets", "Stylistic Sets", "样式集"]),
+    ("Subdivisions:", ["Subdivisions:", "Subdivisions :", "Subdivisions:", "Subdivisions:", "细分："]),
+    ("Suffix:", ["Suffix:", "Suffixe :", "Suffix:", "Suffix:", "后缀："]),
+    ("Synchronize", ["Synchronize", "Synchroniser", "Synchronize", "Synchronize", "同步"]),
+    ("Tag:", ["Tag:", "Balise :", "Tag:", "Tag:", "标签："]),
+    ("Tagged PDF", ["Markiertes PDF", "PDF balisé", "PDF etiquetado", "タグ付き PDF", "带标签的 PDF"]),
+    ("Text Frame", ["Text Frame", "Bloc de texte", "Text Frame", "Text Frame", "文本框架"]),
+    ("Text Frame Options", ["Text Frame Options", "Options de bloc de texte", "Text Frame Options", "Text Frame Options", "文本框架选项"]),
+    ("Text Message", ["Text Message", "SMS", "Text Message", "Text Message", "短信"]),
+    ("Text Style", ["Text Style", "Style de texte", "Text Style", "Text Style", "文字样式"]),
+    ("Text Wrap", ["Text Wrap", "Habillage", "Text Wrap", "Text Wrap", "文本绕排"]),
+    (
+        "This PDF has no layers.",
+        ["This PDF has no layers.", "Ce PDF ne contient aucun calque.", "This PDF has no layers.", "This PDF has no layers.", "此 PDF 没有图层。"],
+    ),
+    ("To Text:", ["To Text:", "Au texte :", "To Text:", "To Text:", "文本转为："]),
+    ("Top", ["Top", "Haut", "Top", "Top", "顶部"]),
+    (
+        "Track Changes in All Stories",
+        [
+            "Track Changes in All Stories",
+            "Suivre les modifications dans tous les articles",
+            "Track Changes in All Stories",
+            "Track Changes in All Stories",
+            "跟踪所有文章中的更改",
+        ],
+    ),
+    ("Trim", ["Trim", "Rognage", "Trim", "Trim", "裁切"]),
+    (
+        "Bounding Box (Visible Layers Only)",
+        [
+            "Begrenzungsrahmen (nur sichtbare Ebenen)",
+            "Cadre de sélection (calques visibles uniquement)",
+            "Cuadro delimitador (solo capas visibles)",
+            "バウンディングボックス（表示レイヤーのみ）",
+            "边界框（仅可见图层）",
+        ],
+    ),
+    (
+        "Bounding Box (All Layers)",
+        [
+            "Begrenzungsrahmen (alle Ebenen)",
+            "Cadre de sélection (tous les calques)",
+            "Cuadro delimitador (todas las capas)",
+            "バウンディングボックス（すべてのレイヤー）",
+            "边界框（所有图层）",
+        ],
+    ),
+    ("Type:", ["Type:", "Type :", "Type:", "Type:", "类型："]),
+    ("Typical", ["Typical", "Standard", "Typical", "Typical", "典型"]),
+    ("UI Size:", ["UI Size:", "Taille de l'interface :", "UI Size:", "UI Size:", "UI 大小："]),
+    ("Ungroup Color Group", ["Ungroup Color Group", "Dissocier le groupe de couleurs", "Ungroup Color Group", "Ungroup Color Group", "取消颜色组"]),
+    ("Unmerge", ["Unmerge", "Annuler la fusion", "Unmerge", "Unmerge", "取消合并"]),
+    ("Update", ["Update", "Mettre à jour", "Update", "Update", "更新"]),
+    ("Update Numbering", ["Update Numbering", "Mettre à jour la numérotation", "Update Numbering", "Update Numbering", "更新编号"]),
+    ("Use Global Light", ["Use Global Light", "Utiliser la lumière globale", "Use Global Light", "Use Global Light", "使用全局光"]),
+    ("User Dictionary", ["User Dictionary", "Dictionnaire utilisateur", "User Dictionary", "User Dictionary", "用户词典"]),
+    (
+        "Vertical Gridline Every:",
+        [
+            "Vertical Gridline Every:",
+            "Ligne de grille verticale tous les :",
+            "Vertical Gridline Every:",
+            "Vertical Gridline Every:",
+            "垂直网格线间隔：",
+        ],
+    ),
+    ("Vertical Margins:", ["Vertical Margins:", "Marges verticales :", "Vertical Margins:", "Vertical Margins:", "垂直边距："]),
+    ("Vertical justification", ["Vertical justification", "Justification verticale", "Vertical justification", "Vertical justification", "垂直对齐"]),
+    ("View Threshold:", ["View Threshold:", "Seuil d'affichage :", "View Threshold:", "View Threshold:", "视图阈值："]),
+    ("Web", ["Web", "Web", "Web", "Web", "Web"]),
+    ("Web Hyperlink", ["Web Hyperlink", "Hyperlien Web", "Web Hyperlink", "Web Hyperlink", "Web 超链接"]),
+    ("Weight:", ["Weight:", "Épaisseur :", "Weight:", "Weight:", "粗细："]),
+    ("Width", ["Width", "Largeur", "Width", "Width", "宽度"]),
+    ("Width:", ["Width:", "Largeur :", "Width:", "Width:", "宽度："]),
+    ("Words, one per line:", ["Words, one per line:", "Mots, un par ligne :", "Words, one per line:", "Words, one per line:", "单词，每行一个："]),
+    ("Multiple Objects", ["Multiple Objects", "Plusieurs objets", "Multiple Objects", "Multiple Objects", "多个对象"]),
+    ("Ellipse", ["Ellipse", "Ellipse", "Ellipse", "Ellipse", "椭圆"]),
+    ("Polygon", ["Polygon", "Polygone", "Polygon", "Polygon", "多边形"]),
+    ("Characters", ["Characters", "Caractères", "Characters", "Characters", "字符"]),
+    ("Image", ["Image", "Image", "Image", "Image", "图像"]),
+    ("Line", ["Line", "Trait", "Line", "Line", "直线"]),
+    ("Path", ["Path", "Tracé", "Path", "Path", "路径"]),
+    ("No Selection", ["No Selection", "Aucune sélection", "No Selection", "No Selection", "未选择"]),
+    ("Adjust Layout", ["Adjust Layout", "Ajuster la mise en page", "Adjust Layout", "Adjust Layout", "调整版面"]),
+    ("Edit Page", ["Edit Page", "Modifier la page", "Edit Page", "Edit Page", "编辑页面"]),
+    ("Import File", ["Import File", "Importer un fichier", "Import File", "Import File", "导入文件"]),
+    ("Insert Page", ["Insert Page", "Insérer une page", "Insert Page", "Insert Page", "插入页面"]),
+    (
+        "Delete selected pages",
+        ["Ausgewählte Seiten löschen", "Supprimer les pages sélectionnées", "Eliminar páginas seleccionadas", "選択したページを削除", "删除选定页面"],
+    ),
+    ("Create new page", ["Neue Seite erstellen", "Créer une page", "Crear página nueva", "新規ページを作成", "新建页面"]),
+    ("Edit page size", ["Seitenformat bearbeiten", "Modifier le format de page", "Editar tamaño de página", "ページサイズを編集", "编辑页面大小"]),
+    (
+        "Custom Page Size…",
+        [
+            "Benutzerdefiniertes Seitenformat …",
+            "Format de page personnalisé…",
+            "Tamaño de página personalizado…",
+            "カスタムページサイズ…",
+            "自定页面大小…",
+        ],
+    ),
+    ("Hide Bar", ["Hide Bar", "Masquer la barre", "Hide Bar", "Hide Bar", "隐藏栏"]),
+    ("Properties Panel", ["Properties Panel", "Panneau Propriétés", "Properties Panel", "Properties Panel", "属性面板"]),
+    ("New Workspace…", ["New Workspace…", "Nouvel espace de travail…", "New Workspace…", "New Workspace…", "新建工作区…"]),
+    ("Float panel", ["Float panel", "Détacher le panneau", "Float panel", "Float panel", "浮动面板"]),
+    ("Dock panel", ["Dock panel", "Ancrer le panneau", "Dock panel", "Dock panel", "停靠面板"]),
+    (
+        "Fit frame height to text",
+        [
+            "Fit frame height to text",
+            "Ajuster la hauteur du bloc au texte",
+            "Fit frame height to text",
+            "Fit frame height to text",
+            "适合框架高度到文本",
+        ],
+    ),
+    ("More Options", ["More Options", "Plus d'options", "More Options", "More Options", "更多选项"]),
+    ("Flip Horizontal", ["Flip Horizontal", "Retourner horizontalement", "Flip Horizontal", "Flip Horizontal", "水平翻转"]),
+    (
+        "Rotate 90° Clockwise",
+        ["Rotate 90° Clockwise", "Rotation de 90° dans le sens horaire", "Rotate 90° Clockwise", "Rotate 90° Clockwise", "顺时针旋转90°"],
+    ),
+    ("Flip Vertical", ["Flip Vertical", "Retourner verticalement", "Flip Vertical", "Flip Vertical", "垂直翻转"]),
+    (
+        "Default Fill and Stroke (D)",
+        [
+            "Default Fill and Stroke (D)",
+            "Fond et contour par défaut (D)",
+            "Default Fill and Stroke (D)",
+            "Default Fill and Stroke (D)",
+            "默认填色和描边 (D)",
+        ],
+    ),
+    (
+        "Swap Fill and Stroke (Shift+X)",
+        [
+            "Swap Fill and Stroke (Shift+X)",
+            "Permuter fond et contour (Shift+X)",
+            "Swap Fill and Stroke (Shift+X)",
+            "Swap Fill and Stroke (Shift+X)",
+            "交换填色和描边 (Shift+X)",
+        ],
+    ),
+    ("Fill (X)", ["Fill (X)", "Fond (X)", "Fill (X)", "Fill (X)", "填色 (X)"]),
+    ("Stroke (X)", ["Stroke (X)", "Contour (X)", "Stroke (X)", "Stroke (X)", "描边 (X)"]),
+    ("Apply None (/)", ["Apply None (/)", "Appliquer Aucun (/)", "Apply None (/)", "Apply None (/)", "应用无 (/)"]),
+    (
+        "Default Fill and Stroke",
+        ["Default Fill and Stroke", "Fond et contour par défaut", "Default Fill and Stroke", "Default Fill and Stroke", "默认填色和描边"],
+    ),
+    ("Swap Fill and Stroke", ["Swap Fill and Stroke", "Permuter fond et contour", "Swap Fill and Stroke", "Swap Fill and Stroke", "交换填色和描边"]),
+    (
+        "Toggle Fill and Stroke",
+        ["Toggle Fill and Stroke", "Basculer fond/contour", "Toggle Fill and Stroke", "Toggle Fill and Stroke", "切换填色和描边"],
+    ),
+    ("Reverse the gradient", ["Reverse the gradient", "Inverser le dégradé", "Reverse the gradient", "Reverse the gradient", "反转渐变"]),
+    ("Style source", ["Style source", "Source du style", "Style source", "Style source", "样式源"]),
+    ("Open", ["Open", "Ouvrir", "Open", "Open", "打开"]),
+    ("All Caps", ["All Caps", "Tout en capitales", "All Caps", "All Caps", "全部大写"]),
+    ("Underline", ["Underline", "Souligné", "Underline", "Underline", "下划线"]),
+    ("Strikethrough", ["Strikethrough", "Barré", "Strikethrough", "Strikethrough", "删除线"]),
+    ("Superscript", ["Superscript", "Exposant", "Superscript", "Superscript", "上标"]),
+    (
+        "Pick a file in the folder holding the moved graphics",
+        [
+            "Pick a file in the folder holding the moved graphics",
+            "Choisissez un fichier dans le dossier qui contient les graphiques déplacés",
+            "Pick a file in the folder holding the moved graphics",
+            "Pick a file in the folder holding the moved graphics",
+            "在包含移动图形的文件夹中选择一个文件",
+        ],
+    ),
+    ("Show Favorites Only", ["Show Favorites Only", "Afficher uniquement les favoris", "Show Favorites Only", "Show Favorites Only", "仅显示收藏夹"]),
+    ("Select", ["Select", "Sélectionner", "Select", "Select", "选择"]),
+    (
+        "Hyperlink from the selected text or frames",
+        [
+            "Hyperlink from the selected text or frames",
+            "Hyperlien à partir du texte ou des blocs sélectionnés",
+            "Hyperlink from the selected text or frames",
+            "Hyperlink from the selected text or frames",
+            "从所选文本或框架建立超链接",
+        ],
+    ),
+    (
+        "Include when exporting",
+        ["Include when exporting", "Inclure à l'exportation", "Include when exporting", "Include when exporting", "导出时包含"],
+    ),
+    ("Add the selection", ["Add the selection", "Ajouter la sélection", "Add the selection", "Add the selection", "添加选择"]),
+    ("Tag the selection", ["Tag the selection", "Baliser la sélection", "Tag the selection", "Tag the selection", "标记选择"]),
+    ("Separated by commas", ["Separated by commas", "Séparés par des virgules", "Separated by commas", "Separated by commas", "用逗号分隔"]),
+    ("Show in the text", ["Show in the text", "Afficher dans le texte", "Show in the text", "Show in the text", "在文本中显示"]),
+    (
+        "Show / hide text with this condition",
+        [
+            "Show / hide text with this condition",
+            "Afficher / masquer le texte avec cette condition",
+            "Show / hide text with this condition",
+            "Show / hide text with this condition",
+            "使用此条件显示/隐藏文本",
+        ],
+    ),
+    (
+        "Spreads of up to 10 pages",
+        ["Spreads of up to 10 pages", "Planches de 10 pages maximum", "Spreads of up to 10 pages", "Spreads of up to 10 pages", "最多10页的跨页"],
+    ),
+    ("for", ["for", "pour", "por", "に対して", "行"]),
+    ("About DesignCraft", ["About DesignCraft", "À propos de DesignCraft", "About DesignCraft", "About DesignCraft", "关于 DesignCraft"]),
+    ("Quit DesignCraft", ["DesignCraft beenden", "Quitter DesignCraft", "Salir de DesignCraft", "DesignCraft を終了", "退出 DesignCraft"]),
+    ("Accept All Changes", ["Accept All Changes", "Accepter toutes les modifications", "Accept All Changes", "Accept All Changes", "接受所有更改"]),
+    ("Activate Document", ["Activate Document", "Activer le document", "Activate Document", "Activate Document", "激活文档"]),
+    ("Add Anchor Point", ["Add Anchor Point", "Ajouter un point d'ancrage", "Add Anchor Point", "Add Anchor Point", "添加锚点"]),
+    ("Add Document", ["Add Document", "Ajouter un document", "Add Document", "Add Document", "添加文档"]),
+    (
+        "Add Hyphenation Exception",
+        ["Add Hyphenation Exception", "Ajouter une exception de césure", "Add Hyphenation Exception", "Add Hyphenation Exception", "添加断字例外"],
+    ),
+    ("Add Item", ["Add Item", "Ajouter un élément", "Add Item", "Add Item", "添加项目"]),
+    ("Add Page to Spread", ["Add Page to Spread", "Ajouter une page à la planche", "Add Page to Spread", "Add Page to Spread", "添加页面至跨页"]),
+    ("Add to Swatches", ["Add to Swatches", "Ajouter au nuancier", "Add to Swatches", "Add to Swatches", "添加到色板"]),
+    (
+        "Allow Selected Spread to Shuffle",
+        [
+            "Allow Selected Spread to Shuffle",
+            "Autoriser la réorganisation des pages de la planche sélectionnée",
+            "Allow Selected Spread to Shuffle",
+            "Allow Selected Spread to Shuffle",
+            "允许所选跨页随机排布",
+        ],
+    ),
+    (
+        "Anchored Object Options…",
+        ["Anchored Object Options…", "Options d'objet ancré…", "Anchored Object Options…", "Anchored Object Options…", "锚定对象选项…"],
+    ),
+    ("Anchored Objects", ["Anchored Objects", "Objets ancrés", "Anchored Objects", "Anchored Objects", "锚定对象"]),
+    ("Appearance of Black", ["Appearance of Black", "Aspect du noir", "Appearance of Black", "Appearance of Black", "黑色的外观"]),
+    (
+        "Apply Attributes (Eyedropper)",
+        [
+            "Apply Attributes (Eyedropper)",
+            "Appliquer les attributs (Pipette)",
+            "Apply Attributes (Eyedropper)",
+            "Apply Attributes (Eyedropper)",
+            "应用属性 (吸管)",
+        ],
+    ),
+    ("Apply Cell Style", ["Apply Cell Style", "Appliquer le style de cellule", "Apply Cell Style", "Apply Cell Style", "应用单元格样式"]),
+    ("Apply Color", ["Apply Color", "Appliquer la couleur", "Apply Color", "Apply Color", "应用颜色"]),
+    ("Repeat", ["Wiederholen", "Répéter", "Repetir", "繰り返し", "重复"]),
+    ("Count:", ["Anzahl:", "Nombre :", "Recuento:", "繰り返し数:", "计数:"]),
+    ("Create as a grid", ["Als Raster erstellen", "Créer en tant que grille", "Crear como cuadrícula", "グリッドとして作成", "创建为网格"]),
+    ("Rows:", ["Zeilen:", "Rangées :", "Filas:", "行:", "行:"]),
+    ("Vertical:", ["Vertikal:", "Vertical :", "Vertical:", "垂直方向:", "垂直:"]),
+    ("Horizontal:", ["Horizontal:", "Horizontal :", "Horizontal:", "水平方向:", "水平:"]),
+    ("Invalid value", ["Ungültiger Wert", "Valeur non valide", "Valor no válido", "無効な値", "无效值"]),
+    ("Isolate Blending", ["Füllmethode isolieren", "Isoler le mode de fusion", "Aislar fusión", "描画モードを分離", "分离混合"]),
+    ("Knockout Group", ["Aussparungsgruppe", "Groupe de masquage", "Grupo de exclusión", "グループの抜き", "挖空组"]),
+    ("Object:", ["Objekt:", "Objet :", "Objeto:", "オブジェクト:", "对象:"]),
+    ("Group:", ["Gruppe:", "Groupe :", "Grupo:", "グループ:", "编组:"]),
+    (
+        "Sample Color (Eyedropper)",
+        ["Farbe aufnehmen (Pipette)", "Prélever la couleur (Pipette)", "Tomar color (Cuentagotas)", "カラーを抽出 (スポイト)", "取样颜色 (吸管)"],
+    ),
+    ("Apply Condition", ["Apply Condition", "Appliquer la condition", "Apply Condition", "Apply Condition", "应用条件"]),
+    (
+        "Apply Parent to Pages…",
+        ["Apply Parent to Pages…", "Appliquer le gabarit aux pages…", "Apply Parent to Pages…", "Apply Parent to Pages…", "将主页应用于页面…"],
+    ),
+    (
+        "ArtCraft App Page…",
+        ["ArtCraft App Page…", "Page de l'application ArtCraft…", "ArtCraft App Page…", "ArtCraft App Page…", "ArtCraft 应用页面…"],
+    ),
+    ("ArtCraft Website…", ["ArtCraft Website…", "Site web d'ArtCraft…", "ArtCraft Website…", "ArtCraft Website…", "ArtCraft 网站…"]),
+    ("Attributes", ["Attributes", "Attributs", "Attributes", "Attributes", "属性"]),
+    ("Bevel and Emboss", ["Bevel and Emboss", "Biseautage et estampage", "Bevel and Emboss", "Bevel and Emboss", "斜面和浮雕"]),
+    ("Buttons", ["Buttons", "Boutons", "Buttons", "Buttons", "按钮"]),
+    ("Cell Options", ["Cell Options", "Options de cellule", "Cell Options", "Cell Options", "单元格选项"]),
+    ("Cell Style Options…", ["Cell Style Options…", "Options de style de cellule…", "Cell Style Options…", "Cell Style Options…", "单元格样式选项…"]),
+    ("Change All (Object)", ["Change All (Object)", "Tout remplacer (objet)", "Change All (Object)", "Change All (Object)", "全部更改 (对象)"]),
+    ("Change Case", ["Change Case", "Modifier la casse", "Change Case", "Change Case", "更改大小写"]),
+    ("Changes", ["Changes", "Modifications", "Changes", "Changes", "更改"]),
+    ("Character Formatting", ["Character Formatting", "Mise en forme des caractères", "Character Formatting", "Character Formatting", "字符格式"]),
+    ("Clear Conveyor", ["Clear Conveyor", "Vider le convoyeur", "Clear Conveyor", "Clear Conveyor", "清除传送带"]),
+    ("Clear Transformations", ["Clear Transformations", "Effacer les transformations", "Clear Transformations", "Clear Transformations", "清除变换"]),
+    ("Clipping Path…", ["Clipping Path…", "Masque…", "Clipping Path…", "Clipping Path…", "剪切路径…"]),
+    ("Close Book", ["Close Book", "Fermer le livre", "Close Book", "Close Book", "关闭书籍"]),
+    ("Close Library", ["Close Library", "Fermer la bibliothèque", "Close Library", "Close Library", "关闭库"]),
+    ("Collect", ["Collect", "Collecter", "Collect", "Collect", "收集"]),
+    ("Color Settings…", ["Color Settings…", "Réglages des couleurs…", "Color Settings…", "Color Settings…", "颜色设置…"]),
+    (
+        "Community & Project Links",
+        ["Community & Project Links", "Communauté et liens du projet", "Community & Project Links", "Community & Project Links", "社区与项目链接"],
+    ),
+    ("Compress images", ["Bilder komprimieren", "Compresser les images", "Comprimir imágenes", "画像を圧縮", "压缩图像"]),
+    ("Compression", ["Komprimierung", "Compression", "Compresión", "圧縮", "压缩"]),
+    ("Conditions", ["Conditions", "Conditions", "Conditions", "Conditions", "条件"]),
+    ("Container", ["Container", "Conteneur", "Container", "Container", "容器"]),
+    ("Content", ["Content", "Contenu", "Content", "Content", "内容"]),
+    ("Contextual Task Bar", ["Contextual Task Bar", "Barre des tâches contextuelle", "Contextual Task Bar", "Contextual Task Bar", "上下文任务栏"]),
+    ("Control", ["Control", "Contrôle", "Control", "Control", "控制"]),
+    (
+        "Convert Cell to Graphic Cell",
+        [
+            "Convert Cell to Graphic Cell",
+            "Convertir la cellule en cellule graphique",
+            "Convert Cell to Graphic Cell",
+            "Convert Cell to Graphic Cell",
+            "将单元格转换为图形单元格",
+        ],
+    ),
+    (
+        "Convert Cell to Graphic Cell…",
+        [
+            "Convert Cell to Graphic Cell…",
+            "Convertir la cellule en cellule graphique…",
+            "Convert Cell to Graphic Cell…",
+            "Convert Cell to Graphic Cell…",
+            "将单元格转换为图形单元格…",
+        ],
+    ),
+    (
+        "Convert Cell to Text Cell",
+        [
+            "Convert Cell to Text Cell",
+            "Convertir la cellule en cellule de texte",
+            "Convert Cell to Text Cell",
+            "Convert Cell to Text Cell",
+            "将单元格转换为文本单元格",
+        ],
+    ),
+    ("Convert Color", ["Convert Color", "Convertir la couleur", "Convert Color", "Convert Color", "转换颜色"]),
+    (
+        "Convert Direction Point",
+        ["Convert Direction Point", "Convertir le point directeur", "Convert Direction Point", "Convert Direction Point", "转换方向点"],
+    ),
+    (
+        "Convert Note to Text",
+        ["Convert Note to Text", "Convertir la note en texte", "Convert Note to Text", "Convert Note to Text", "将注释转换为文本"],
+    ),
+    (
+        "Convert Selection to Multi-State Object",
+        [
+            "Convert Selection to Multi-State Object",
+            "Convertir la sélection en objet à états multiples",
+            "Convert Selection to Multi-State Object",
+            "Convert Selection to Multi-State Object",
+            "将选区转换为多状态对象",
+        ],
+    ),
+    ("Convert Shape", ["Convert Shape", "Convertir la forme", "Convert Shape", "Convert Shape", "转换形状"]),
+    (
+        "Convert Table to Text",
+        ["Convert Table to Text", "Convertir le tableau en texte", "Convert Table to Text", "Convert Table to Text", "将表格转换为文本"],
+    ),
+    (
+        "Convert Text to Table",
+        ["Convert Text to Table", "Convertir le texte en tableau", "Convert Text to Table", "Convert Text to Table", "将文本转换为表格"],
+    ),
+    ("Convert to Button", ["Convert to Button", "Convertir en bouton", "Convert to Button", "Convert to Button", "转换为按钮"]),
+    (
+        "Convert to Form Field",
+        ["Convert to Form Field", "Convertir en champ de formulaire", "Convert to Form Field", "Convert to Form Field", "转换为表单域"],
+    ),
+    ("Convert to Note", ["Convert to Note", "Convertir en note", "Convert to Note", "Convert to Note", "转换为注释"]),
+    ("Conveyor", ["Conveyor", "Convoyeur", "Conveyor", "Conveyor", "传送带"]),
+    ("Copy Link(s) To…", ["Copy Link(s) To…", "Copier les liens vers…", "Copy Link(s) To…", "Copy Link(s) To…", "复制链接至…"]),
+    ("Corner Options…", ["Corner Options…", "Options d'arrondi…", "Corner Options…", "Corner Options…", "角选项…"]),
+    (
+        "Create Alternate Layout…",
+        ["Create Alternate Layout…", "Créer une variante de mise en page…", "Create Alternate Layout…", "Create Alternate Layout…", "创建替代版面…"],
+    ),
+    ("Create Frame", ["Create Frame", "Créer un bloc", "Create Frame", "Create Frame", "创建框架"]),
+    (
+        "Create Merged Document…",
+        [
+            "Zusammengeführtes Dokument erstellen …",
+            "Créer un document fusionné…",
+            "Crear documento combinado…",
+            "結合ドキュメントを作成…",
+            "创建合并文档…",
+        ],
+    ),
+    (
+        "Cross-Reference Formats",
+        ["Cross-Reference Formats", "Formats de référence croisée", "Cross-Reference Formats", "Cross-Reference Formats", "交叉引用格式"],
+    ),
+    ("Cross-References", ["Cross-References", "Références croisées", "Cross-References", "Cross-References", "交叉引用"]),
+    ("Data Merge Fields", ["Data Merge Fields", "Champs de fusion des données", "Data Merge Fields", "Data Merge Fields", "数据合并字段"]),
+    (
+        "Define Cross-Reference Format…",
+        [
+            "Define Cross-Reference Format…",
+            "Définir un format de référence croisée…",
+            "Define Cross-Reference Format…",
+            "Define Cross-Reference Format…",
+            "定义交叉引用格式…",
+        ],
+    ),
+    ("Define Lists…", ["Define Lists…", "Définir des listes…", "Define Lists…", "Define Lists…", "定义列表…"]),
+    ("Apply Bullets", ["Aufzählungszeichen anwenden", "Appliquer des puces", "Aplicar viñetas", "箇条書きを適用", "应用项目符号"]),
+    ("Apply Numbers", ["Nummerierung anwenden", "Appliquer la numérotation", "Aplicar números", "段落番号を適用", "应用编号"]),
+    (
+        "Define Text Variable…",
+        ["Define Text Variable…", "Définir une variable de texte…", "Define Text Variable…", "Define Text Variable…", "定义文本变量…"],
+    ),
+    (
+        "Delete All Guides on Spread",
+        [
+            "Delete All Guides on Spread",
+            "Supprimer tous les repères de la planche",
+            "Delete All Guides on Spread",
+            "Delete All Guides on Spread",
+            "删除跨页上的所有参考线",
+        ],
+    ),
+    ("Delete Anchor Point", ["Delete Anchor Point", "Supprimer le point d'ancrage", "Delete Anchor Point", "Delete Anchor Point", "删除锚点"]),
+    ("Delete Item", ["Delete Item", "Supprimer l'élément", "Delete Item", "Delete Item", "删除项目"]),
+    (
+        "Delete Text Variable",
+        ["Delete Text Variable", "Supprimer la variable de texte", "Delete Text Variable", "Delete Text Variable", "删除文本变量"],
+    ),
+    ("Delete Workspace…", ["Delete Workspace…", "Supprimer l'espace de travail…", "Delete Workspace…", "Delete Workspace…", "删除工作区…"]),
+    (
+        "DesignCraft Website…",
+        ["DesignCraft Website…", "Site web de DesignCraft…", "DesignCraft Website…", "DesignCraft Website…", "DesignCraft 网站…"],
+    ),
+    (
+        "DesignCraft on GitHub…",
+        ["DesignCraft on GitHub…", "DesignCraft sur GitHub…", "DesignCraft on GitHub…", "DesignCraft on GitHub…", "DesignCraft 在 GitHub 上…"],
+    ),
+    (
+        "Detach All Objects from Parent",
+        [
+            "Detach All Objects from Parent",
+            "Détacher tous les objets du gabarit",
+            "Detach All Objects from Parent",
+            "Detach All Objects from Parent",
+            "从主页分离所有对象",
+        ],
+    ),
+    ("Directional Feather", ["Directional Feather", "Contour progressif directionnel", "Directional Feather", "Directional Feather", "定向羽化"]),
+    ("Distribute", ["Distribute", "Répartir", "Distribute", "Distribute", "分布"]),
+    ("Dock Panel", ["Dock Panel", "Ancrer le panneau", "Dock Panel", "Dock Panel", "停靠面板"]),
+    (
+        "Document Endnote Options…",
+        [
+            "Document Endnote Options…",
+            "Options de notes de fin de document…",
+            "Document Endnote Options…",
+            "Document Endnote Options…",
+            "文档尾注选项…",
+        ],
+    ),
+    (
+        "Document Footnote Options…",
+        [
+            "Document Footnote Options…",
+            "Options de notes de bas de page du document…",
+            "Document Footnote Options…",
+            "Document Footnote Options…",
+            "文档脚注选项…",
+        ],
+    ),
+    ("Document Preferences", ["Document Preferences", "Préférences du document", "Document Preferences", "Document Preferences", "文档首选项"]),
+    ("Document Presets", ["Document Presets", "Paramètres prédéfinis de document", "Document Presets", "Document Presets", "文档预设"]),
+    ("Document…", ["Document…", "Document…", "Document…", "Document…", "文档…"]),
+    ("Dynamic Spelling", ["Dynamic Spelling", "Orthographe dynamique", "Dynamic Spelling", "Dynamic Spelling", "动态拼写"]),
+    ("Edit Parents", ["Edit Parents", "Modifier les gabarits", "Edit Parents", "Edit Parents", "编辑主页"]),
+    ("Edit Story", ["Edit Story", "Modifier l'article", "Edit Story", "Edit Story", "编辑文章"]),
+    (
+        "Edit in Story Editor",
+        ["Edit in Story Editor", "Modifier en mode éditeur", "Edit in Story Editor", "Edit in Story Editor", "在文章编辑器中编辑"],
+    ),
+    ("Endnotes", ["Endnotes", "Notes de fin", "Endnotes", "Endnotes", "尾注"]),
+    ("Entire Pasteboard", ["Entire Pasteboard", "Table de montage entière", "Entire Pasteboard", "Entire Pasteboard", "完整粘贴板"]),
+    ("Erase", ["Erase", "Effacer", "Erase", "Erase", "擦除"]),
+    ("Export Book to PDF…", ["Export Book to PDF…", "Exporter le livre en PDF…", "Export Book to PDF…", "Export Book to PDF…", "将书籍导出为 PDF…"]),
+    (
+        "Export EPUB (Fixed Layout)…",
+        [
+            "Export EPUB (Fixed Layout)…",
+            "Exporter en EPUB (mise en page fixe)…",
+            "Export EPUB (Fixed Layout)…",
+            "Export EPUB (Fixed Layout)…",
+            "导出 EPUB (固定版面)…",
+        ],
+    ),
+    (
+        "Export EPUB (Reflowable)…",
+        [
+            "Export EPUB (Reflowable)…",
+            "Exporter en EPUB (redistribuable)…",
+            "Export EPUB (Reflowable)…",
+            "Export EPUB (Reflowable)…",
+            "导出 EPUB (可回流)…",
+        ],
+    ),
+    ("Export EPUB…", ["Export EPUB…", "Exporter en EPUB…", "Export EPUB…", "Export EPUB…", "导出 EPUB…"]),
+    ("Export HTML…", ["Export HTML…", "Exporter en HTML…", "Export HTML…", "Export HTML…", "导出 HTML…"]),
+    ("Export IDML…", ["Export IDML…", "Exporter en IDML…", "Export IDML…", "Export IDML…", "导出 IDML…"]),
+    (
+        "Export PDF (Interactive)…",
+        [
+            "Export PDF (Interactive)…",
+            "Exporter en PDF (interactif)…",
+            "Export PDF (Interactive)…",
+            "Export PDF (Interactive)…",
+            "导出 PDF (交互式)…",
+        ],
+    ),
+    ("Export Page as PNG…", ["Export Page as PNG…", "Exporter la page en PNG…", "Export Page as PNG…", "Export Page as PNG…", "将页面导出为 PNG…"]),
+    (
+        "Export Selection as Snippet",
+        [
+            "Export Selection as Snippet",
+            "Exporter la sélection en tant qu'extrait",
+            "Export Selection as Snippet",
+            "Export Selection as Snippet",
+            "将所选内容导出为片段",
+        ],
+    ),
+    ("Export Tagging", ["Export Tagging", "Balisage d'exportation", "Export Tagging", "Export Tagging", "导出标记"]),
+    ("Export Text…", ["Export Text…", "Exporter le texte…", "Export Text…", "Export Text…", "导出文本…"]),
+    (
+        "Extend Text Selection",
+        ["Extend Text Selection", "Étendre la sélection de texte", "Extend Text Selection", "Extend Text Selection", "扩展文本选区"],
+    ),
+    ("Fast Display", ["Fast Display", "Affichage rapide", "Fast Display", "Fast Display", "快速显示"]),
+    ("Find", ["Find", "Rechercher", "Find", "Find", "查找"]),
+    ("Find Object", ["Find Object", "Rechercher un objet", "Find Object", "Find Object", "查找对象"]),
+    (
+        "Find by Script Label",
+        ["Find by Script Label", "Rechercher par étiquette de script", "Find by Script Label", "Find by Script Label", "按脚本标签查找"],
+    ),
+    ("Find/Replace Font…", ["Find/Replace Font…", "Rechercher/Remplacer une police…", "Find/Replace Font…", "Find/Replace Font…", "查找/替换字体…"]),
+    ("First Object Above", ["First Object Above", "Premier objet au-dessus", "First Object Above", "First Object Above", "上方第一个对象"]),
+    (
+        "Fit Selection in Window",
+        [
+            "Fit Selection in Window",
+            "Ajuster la sélection à la fenêtre",
+            "Fit Selection in Window",
+            "Fit Selection in Window",
+            "窗口大小适应所选内容",
+        ],
+    ),
+    ("Flattener Preview", ["Flattener Preview", "Aperçu de l'aplatissement", "Flattener Preview", "Flattener Preview", "拼合器预览"]),
+    ("Float Panel", ["Bedienfeld lösen", "Détacher le panneau", "Hacer flotante el panel", "パネルをフローティング表示", "浮动面板"]),
+    ("Fonts in Document", ["Fonts in Document", "Polices du document", "Fonts in Document", "Fonts in Document", "文档中的字体"]),
+    ("Footnotes", ["Footnotes", "Notes de bas de page", "Footnotes", "Footnotes", "脚注"]),
+    ("Form Fields", ["Form Fields", "Champs de formulaire", "Form Fields", "Form Fields", "表单域"]),
+    (
+        "Frame Fitting Options…",
+        ["Frame Fitting Options…", "Options d'ajustement au bloc…", "Frame Fitting Options…", "Frame Fitting Options…", "框架适合选项…"],
+    ),
+    ("Generate Index…", ["Generate Index…", "Générer l'index…", "Generate Index…", "Generate Index…", "生成索引…"]),
+    ("Generate QR Code…", ["Generate QR Code…", "Générer un code QR…", "Generate QR Code…", "Generate QR Code…", "生成二维码…"]),
+    (
+        "Generate Static Caption",
+        ["Generate Static Caption", "Générer une légende statique", "Generate Static Caption", "Generate Static Caption", "生成静态题注"],
+    ),
+    ("Get Story", ["Get Story", "Obtenir l'article", "Get Story", "Get Story", "获取文章"]),
+    ("Get Table", ["Get Table", "Obtenir le tableau", "Get Table", "Get Table", "获取表格"]),
+    ("Global Light…", ["Global Light…", "Lumière globale…", "Global Light…", "Global Light…", "全局光…"]),
+    ("Go To Link", ["Go To Link", "Atteindre le lien", "Go To Link", "Go To Link", "转到链接"]),
+    ("Go To Source", ["Go To Source", "Atteindre la source", "Go To Source", "Go To Source", "转到源"]),
+    (
+        "Go to Footnote Reference",
+        [
+            "Go to Footnote Reference",
+            "Atteindre la référence de note de bas de page",
+            "Go to Footnote Reference",
+            "Go to Footnote Reference",
+            "转到脚注引用",
+        ],
+    ),
+    ("Go to Page…", ["Go to Page…", "Atteindre la page…", "Go to Page…", "Go to Page…", "转到页面…"]),
+    ("Gradient Feather", ["Gradient Feather", "Contour progressif dégradé", "Gradient Feather", "Gradient Feather", "渐变羽化"]),
+    ("Gridify", ["Gridify", "Mettre en grille", "Gridify", "Gridify", "网格化"]),
+    ("Group Transparency", ["Group Transparency", "Transparence du groupe", "Group Transparency", "Group Transparency", "编组透明度"]),
+    ("Guides", ["Guides", "Repères", "Guides", "Guides", "参考线"]),
+    ("Hide Menu Item", ["Hide Menu Item", "Masquer la commande de menu", "Hide Menu Item", "Hide Menu Item", "隐藏菜单项"]),
+    ("Hide/Lock Others", ["Hide/Lock Others", "Masquer/verrouiller les autres", "Hide/Lock Others", "Hide/Lock Others", "隐藏/锁定其他"]),
+    (
+        "High Quality Display",
+        ["High Quality Display", "Affichage de qualité supérieure", "High Quality Display", "High Quality Display", "高品质显示"],
+    ),
+    ("History", ["History", "Historique", "History", "History", "历史记录"]),
+    ("Hyphenation Exceptions", ["Hyphenation Exceptions", "Exceptions de césure", "Hyphenation Exceptions", "Hyphenation Exceptions", "断字例外"]),
+    (
+        "Import Options: Styles",
+        ["Import Options: Styles", "Options d'importation : styles", "Import Options: Styles", "Import Options: Styles", "导入选项: 样式"],
+    ),
+    (
+        "Index Page References",
+        ["Index Page References", "Références de page de l'index", "Index Page References", "Index Page References", "索引页引用"],
+    ),
+    ("Inner Glow", ["Inner Glow", "Lueur interne", "Inner Glow", "Inner Glow", "内发光"]),
+    ("Inner Shadow", ["Inner Shadow", "Ombre interne", "Inner Shadow", "Inner Shadow", "内阴影"]),
+    (
+        "Insert Anchored Object…",
+        ["Insert Anchored Object…", "Insérer un objet ancré…", "Insert Anchored Object…", "Insert Anchored Object…", "插入锚定对象…"],
+    ),
+    (
+        "Insert Cross-Reference…",
+        ["Insert Cross-Reference…", "Insérer une référence croisée…", "Insert Cross-Reference…", "Insert Cross-Reference…", "插入交叉引用…"],
+    ),
+    ("Insert Endnote", ["Insert Endnote", "Insérer une note de fin", "Insert Endnote", "Insert Endnote", "插入尾注"]),
+    ("Insert Footnote", ["Insert Footnote", "Insérer une note de bas de page", "Insert Footnote", "Insert Footnote", "插入脚注"]),
+    (
+        "Insert Math Expression…",
+        ["Insert Math Expression…", "Insérer une expression mathématique…", "Insert Math Expression…", "Insert Math Expression…", "插入数学公式…"],
+    ),
+    ("Insert Pages…", ["Insert Pages…", "Insérer des pages…", "Insert Pages…", "Insert Pages…", "插入页面…"]),
+    ("Insert Variable", ["Insert Variable", "Insérer une variable", "Insert Variable", "Insert Variable", "插入变量"]),
+    (
+        "Convert Variable to Text",
+        [
+            "Variable in Text konvertieren",
+            "Convertir la variable en texte",
+            "Convertir variable en texto",
+            "変数をテキストに変換",
+            "将变量转换为文本",
+        ],
+    ),
+    ("Inspect Document", ["Inspect Document", "Inspecter le document", "Inspect Document", "Inspect Document", "检查文档"]),
+    (
+        "Interface Color Theme",
+        ["Interface Color Theme", "Thème de couleur de l'interface", "Interface Color Theme", "Interface Color Theme", "界面颜色主题"],
+    ),
+    (
+        "Join the ArtCraft Discord…",
+        [
+            "Join the ArtCraft Discord…",
+            "Rejoindre le Discord d'ArtCraft…",
+            "Join the ArtCraft Discord…",
+            "Join the ArtCraft Discord…",
+            "加入 ArtCraft Discord…",
+        ],
+    ),
+    ("Last Object Below", ["Last Object Below", "Dernier objet en dessous", "Last Object Below", "Last Object Below", "下方最后一个对象"]),
+    ("Library Contents", ["Library Contents", "Contenu de la bibliothèque", "Library Contents", "Library Contents", "库内容"]),
+    ("Library Items", ["Library Items", "Éléments de la bibliothèque", "Library Items", "Library Items", "库项目"]),
+    ("Linked Stories", ["Linked Stories", "Articles liés", "Linked Stories", "Linked Stories", "链接的文章"]),
+    ("Liquid Page Rule", ["Liquid Page Rule", "Règle de page liquide", "Liquid Page Rule", "Liquid Page Rule", "自适应页面规则"]),
+    ("List Documents", ["List Documents", "Lister les documents", "List Documents", "List Documents", "列出文档"]),
+    ("List Styles", ["List Styles", "Lister les styles", "List Styles", "List Styles", "列表样式"]),
+    ("List Tools", ["List Tools", "Lister les outils", "List Tools", "List Tools", "列出工具"]),
+    ("Load Place Cursor", ["Load Place Cursor", "Charger le curseur d'importation", "Load Place Cursor", "Load Place Cursor", "加载放置光标"]),
+    ("Make Compound Path", ["Make Compound Path", "Créer un tracé transparent", "Make Compound Path", "Make Compound Path", "建立复合路径"]),
+    ("Map Styles to Tags", ["Map Styles to Tags", "Associer les styles aux balises", "Map Styles to Tags", "Map Styles to Tags", "将样式映射到标签"]),
+    ("Math Expression SVG", ["Math Expression SVG", "SVG d'expression mathématique", "Math Expression SVG", "Math Expression SVG", "数学公式 SVG"]),
+    ("Media Options", ["Media Options", "Options multimédia", "Media Options", "Media Options", "媒体选项"]),
+    ("Menus…", ["Menus…", "Menus…", "Menus…", "Menus…", "菜单…"]),
+    ("Merge Layers", ["Merge Layers", "Fusionner les calques", "Merge Layers", "Merge Layers", "合并图层"]),
+    ("Move Caret", ["Move Caret", "Déplacer le curseur", "Move Caret", "Move Caret", "移动插入点"]),
+    ("Move Gap", ["Move Gap", "Déplacer l'espace", "Move Gap", "Move Gap", "移动间隙"]),
+    ("Move Row", ["Move Row", "Déplacer la ligne", "Move Row", "Move Row", "移动行"]),
+    ("New Book", ["New Book", "Nouveau livre", "New Book", "New Book", "新建书籍"]),
+    ("New Cell Style…", ["New Cell Style…", "Nouveau style de cellule…", "New Cell Style…", "New Cell Style…", "新建单元格样式…"]),
+    ("New Color Swatch…", ["New Color Swatch…", "Nouvelle nuance de couleur…", "New Color Swatch…", "New Color Swatch…", "新建颜色色板…"]),
+    ("New Condition…", ["New Condition…", "Nouvelle condition…", "New Condition…", "New Condition…", "新建条件…"]),
+    ("New Guide", ["New Guide", "Nouveau repère", "New Guide", "New Guide", "新建参考线"]),
+    (
+        "New Hyperlink Destination…",
+        [
+            "New Hyperlink Destination…",
+            "Nouvelle destination d'hyperlien…",
+            "New Hyperlink Destination…",
+            "New Hyperlink Destination…",
+            "新建超链接目标…",
+        ],
+    ),
+    ("New Hyperlink…", ["New Hyperlink…", "Nouvel hyperlien…", "New Hyperlink…", "New Hyperlink…", "新建超链接…"]),
+    ("New Library", ["New Library", "Nouvelle bibliothèque", "New Library", "New Library", "新建库"]),
+    ("New Page Reference…", ["New Page Reference…", "Nouvelle référence de page…", "New Page Reference…", "New Page Reference…", "新建页面引用…"]),
+    (
+        "New Paragraph Style…",
+        ["New Paragraph Style…", "Nouveau style de paragraphe…", "New Paragraph Style…", "New Paragraph Style…", "新建段落样式…"],
+    ),
+    ("New Stroke Style…", ["New Stroke Style…", "Nouveau style de contour…", "New Stroke Style…", "New Stroke Style…", "新建描边样式…"]),
+    ("New Table Style…", ["New Table Style…", "Nouveau style de tableau…", "New Table Style…", "New Table Style…", "新建表样式…"]),
+    ("Next Cell", ["Next Cell", "Cellule suivante", "Next Cell", "Next Cell", "下一个单元格"]),
+    ("Next Document", ["Next Document", "Document suivant", "Next Document", "Next Document", "下一个文档"]),
+    ("Next Note", ["Next Note", "Note suivante", "Next Note", "Next Note", "下一个注释"]),
+    ("Next Object Above", ["Next Object Above", "Objet suivant au-dessus", "Next Object Above", "Next Object Above", "上方下一个对象"]),
+    ("Next Object Below", ["Next Object Below", "Objet suivant en dessous", "Next Object Below", "Next Object Below", "下方下一个对象"]),
+    (
+        "Next Object in Group",
+        ["Next Object in Group", "Objet suivant dans le groupe", "Next Object in Group", "Next Object in Group", "组中的下一个对象"],
+    ),
+    ("Notes", ["Notes", "Notes", "Notes", "Notes", "注释"]),
+    (
+        "Object Export Options",
+        ["Object Export Options", "Options d'exportation de l'objet", "Object Export Options", "Object Export Options", "对象导出选项"],
+    ),
+    (
+        "Object Export Options…",
+        ["Object Export Options…", "Options d'exportation de l'objet…", "Object Export Options…", "Object Export Options…", "对象导出选项…"],
+    ),
+    (
+        "Object Layer Options…",
+        ["Object Layer Options…", "Options de calque d'objet…", "Object Layer Options…", "Object Layer Options…", "对象图层选项…"],
+    ),
+    ("Object Layers", ["Object Layers", "Calques d'objet", "Object Layers", "Object Layers", "对象图层"]),
+    (
+        "Object Liquid Settings",
+        [
+            "Object Liquid Settings",
+            "Réglages de mise en page liquide de l'objet",
+            "Object Liquid Settings",
+            "Object Liquid Settings",
+            "对象自适应设置",
+        ],
+    ),
+    ("Open Book", ["Open Book", "Ouvrir le livre", "Open Book", "Open Book", "打开书籍"]),
+    ("Open Bytes", ["Open Bytes", "Ouvrir les octets", "Open Bytes", "Open Bytes", "打开字节"]),
+    ("Open IDML", ["Open IDML", "Ouvrir un fichier IDML", "Open IDML", "Open IDML", "打开 IDML"]),
+    ("Open Library", ["Open Library", "Ouvrir la bibliothèque", "Open Library", "Open Library", "打开库"]),
+    ("Outer Glow", ["Outer Glow", "Lueur externe", "Outer Glow", "Outer Glow", "外发光"]),
+    ("Overprint Preview", ["Overprint Preview", "Aperçu de la surimpression", "Overprint Preview", "Overprint Preview", "叠印预览"]),
+    (
+        "Override All Parent Page Items",
+        [
+            "Override All Parent Page Items",
+            "Remplacer tous les éléments du gabarit",
+            "Override All Parent Page Items",
+            "Override All Parent Page Items",
+            "覆盖所有主页项目",
+        ],
+    ),
+    ("Page Size", ["Page Size", "Format de page", "Page Size", "Page Size", "页面大小"]),
+    ("Page Transition", ["Page Transition", "Transition de page", "Page Transition", "Page Transition", "页面过渡"]),
+    ("Page Transitions", ["Page Transitions", "Transitions de page", "Page Transitions", "Page Transitions", "页面过渡"]),
+    ("Paragraph Formatting", ["Paragraph Formatting", "Mise en forme des paragraphes", "Paragraph Formatting", "Paragraph Formatting", "段落格式"]),
+    (
+        "Paragraph Style Options…",
+        ["Paragraph Style Options…", "Options de style de paragraphe…", "Paragraph Style Options…", "Paragraph Style Options…", "段落样式选项…"],
+    ),
+    ("Paste Into", ["Paste Into", "Coller dedans", "Paste Into", "Paste Into", "贴入内部"]),
+    (
+        "Paste without Formatting",
+        ["Paste without Formatting", "Coller sans mise en forme", "Paste without Formatting", "Paste without Formatting", "粘贴时不包含格式"],
+    ),
+    ("Place", ["Place", "Importer", "Place", "Place", "置入"]),
+    ("Place Caret", ["Place Caret", "Placer le curseur", "Place Caret", "Place Caret", "放置光标"]),
+    ("Place Item", ["Place Item", "Importer l'élément", "Place Item", "Place Item", "置入项目"]),
+    ("Place Snippet", ["Place Snippet", "Importer un extrait", "Place Snippet", "Place Snippet", "置入片段"]),
+    ("Place and Link", ["Place and Link", "Importer et lier", "Place and Link", "Place and Link", "置入并链接"]),
+    (
+        "Place with Import Options…",
+        [
+            "Place with Import Options…",
+            "Importer avec les options d'importation…",
+            "Place with Import Options…",
+            "Place with Import Options…",
+            "连同导入选项置入…",
+        ],
+    ),
+    ("Polygon Settings…", ["Polygon Settings…", "Paramètres du polygone…", "Polygon Settings…", "Polygon Settings…", "多边形设置…"]),
+    ("Preflight Document", ["Preflight Document", "Contrôle en amont du document", "Preflight Document", "Preflight Document", "预检文档"]),
+    ("Previous Cell", ["Previous Cell", "Cellule précédente", "Previous Cell", "Previous Cell", "上一个单元格"]),
+    ("Previous Document", ["Previous Document", "Document précédent", "Previous Document", "Previous Document", "上一个文档"]),
+    ("Previous Note", ["Previous Note", "Note précédente", "Previous Note", "Previous Note", "上一个注释"]),
+    (
+        "Previous Object in Group",
+        ["Previous Object in Group", "Objet précédent du groupe", "Previous Object in Group", "Previous Object in Group", "组中的上一个对象"],
+    ),
+    ("Primary Text Frame", ["Primary Text Frame", "Bloc de texte principal", "Primary Text Frame", "Primary Text Frame", "主文本框架"]),
+    ("Print Booklet…", ["Print Booklet…", "Imprimer le cahier…", "Print Booklet…", "Print Booklet…", "打印小册子…"]),
+    ("Printers", ["Printers", "Imprimantes", "Printers", "Printers", "打印机"]),
+    ("Proof Colors", ["Proof Colors", "Couleurs d'épreuve", "Proof Colors", "Proof Colors", "校样颜色"]),
+    ("Proof Setup", ["Proof Setup", "Format d'épreuve", "Proof Setup", "Proof Setup", "校样设置"]),
+    ("Quick Apply…", ["Quick Apply…", "Application rapide…", "Quick Apply…", "Quick Apply…", "快速应用…"]),
+    ("Recover Documents", ["Recover Documents", "Récupérer des documents", "Recover Documents", "Recover Documents", "恢复文档"]),
+    ("Recovery Data", ["Recovery Data", "Données de récupération", "Recovery Data", "Recovery Data", "恢复数据"]),
+    ("Reject All Changes", ["Reject All Changes", "Refuser toutes les modifications", "Reject All Changes", "Reject All Changes", "拒绝所有更改"]),
+    (
+        "Release Compound Path",
+        ["Release Compound Path", "Libérer le tracé transparent", "Release Compound Path", "Release Compound Path", "释放复合路径"],
+    ),
+    (
+        "Remove All Local Overrides",
+        [
+            "Remove All Local Overrides",
+            "Supprimer tous les remplacements locaux",
+            "Remove All Local Overrides",
+            "Remove All Local Overrides",
+            "移除所有本地覆盖",
+        ],
+    ),
+    ("Remove Document", ["Remove Document", "Retirer le document", "Remove Document", "Remove Document", "移除文档"]),
+    ("Report an Issue…", ["Report an Issue…", "Signaler un problème…", "Report an Issue…", "Report an Issue…", "报告问题…"]),
+    ("Reset Shortcuts", ["Reset Shortcuts", "Réinitialiser les raccourcis", "Reset Shortcuts", "Reset Shortcuts", "重置快捷键"]),
+    ("Reset Workspace", ["Reset Workspace", "Réinitialiser l'espace de travail", "Reset Workspace", "Reset Workspace", "重置工作区"]),
+    ("Resize", ["Resize", "Redimensionner", "Resize", "Resize", "调整大小"]),
+    ("Rotate Spread", ["Rotate Spread", "Faire pivoter la planche", "Rotate Spread", "Rotate Spread", "旋转跨页"]),
+    ("Run Script", ["Run Script", "Exécuter le script", "Run Script", "Run Script", "运行脚本"]),
+    ("Sample Document", ["Sample Document", "Document d'exemple", "Sample Document", "Sample Document", "示例文档"]),
+    ("Satin", ["Satin", "Satin", "Satin", "Satin", "光泽"]),
+    (
+        "Save Recovery Data",
+        ["Save Recovery Data", "Enregistrer les données de récupération", "Save Recovery Data", "Save Recovery Data", "保存恢复数据"],
+    ),
+    ("Script Label", ["Script Label", "Étiquette de script", "Script Label", "Script Label", "脚本标签"]),
+    ("Select All on Layer", ["Select All on Layer", "Tout sélectionner sur le calque", "Select All on Layer", "Select All on Layer", "全选当前图层"]),
+    ("Select Cells", ["Select Cells", "Sélectionner les cellules", "Select Cells", "Select Cells", "选择单元格"]),
+    ("Select Column", ["Select Column", "Sélectionner la colonne", "Select Column", "Select Column", "选择列"]),
+    ("Select Frame", ["Select Frame", "Sélectionner le bloc", "Select Frame", "Select Frame", "选择框架"]),
+    ("Select Row", ["Select Row", "Sélectionner la ligne", "Select Row", "Select Row", "选择行"]),
+    ("Select Table", ["Select Table", "Sélectionner le tableau", "Select Table", "Select Table", "选择表格"]),
+    ("Select Text", ["Select Text", "Sélectionner le texte", "Select Text", "Select Text", "选择文本"]),
+    ("Select Tool", ["Select Tool", "Sélectionner un outil", "Select Tool", "Select Tool", "选择工具"]),
+    ("Select Word", ["Select Word", "Sélectionner le mot", "Select Word", "Select Word", "选择单词"]),
+    ("Selection Attributes", ["Selection Attributes", "Attributs de la sélection", "Selection Attributes", "Selection Attributes", "选择属性"]),
+    ("Separations Preview", ["Separations Preview", "Aperçu des séparations", "Separations Preview", "Separations Preview", "分色预览"]),
+    ("Serialize", ["Serialize", "Sérialiser", "Serialize", "Serialize", "序列化"]),
+    ("Set Active Layer", ["Set Active Layer", "Définir le calque actif", "Set Active Layer", "Set Active Layer", "设置活动图层"]),
+    ("Set Shortcut", ["Set Shortcut", "Définir le raccourci", "Set Shortcut", "Set Shortcut", "设置快捷键"]),
+    (
+        "Set Visibility / Lock",
+        ["Set Visibility / Lock", "Définir visibilité / verrouillage", "Set Visibility / Lock", "Set Visibility / Lock", "设置可见性/锁定"],
+    ),
+    ("Show Panel", ["Show Panel", "Afficher le panneau", "Show Panel", "Show Panel", "显示面板"]),
+    (
+        "Show/Hide Baseline Grid",
+        [
+            "Show/Hide Baseline Grid",
+            "Afficher/Masquer la grille de ligne de base",
+            "Show/Hide Baseline Grid",
+            "Show/Hide Baseline Grid",
+            "显示/隐藏基线网格",
+        ],
+    ),
+    (
+        "Show/Hide Depth Ruler",
+        [
+            "Show/Hide Depth Ruler",
+            "Afficher/Masquer la règle de profondeur",
+            "Mostrar/ocultar regla de profundidad",
+            "Show/Hide Depth Ruler",
+            "显示/隐藏深度标尺",
+        ],
+    ),
+    (
+        "Show/Hide Document Grid",
+        [
+            "Show/Hide Document Grid",
+            "Afficher/Masquer la grille du document",
+            "Show/Hide Document Grid",
+            "Show/Hide Document Grid",
+            "显示/隐藏文档网格",
+        ],
+    ),
+    (
+        "Show/Hide Frame Edges",
+        ["Show/Hide Frame Edges", "Afficher/Masquer les contours de bloc", "Show/Hide Frame Edges", "Show/Hide Frame Edges", "显示/隐藏框架边缘"],
+    ),
+    ("Show/Hide Guides", ["Show/Hide Guides", "Afficher/Masquer les repères", "Show/Hide Guides", "Show/Hide Guides", "显示/隐藏参考线"]),
+    (
+        "Show/Hide Hidden Characters",
+        [
+            "Show/Hide Hidden Characters",
+            "Afficher/Masquer les caractères masqués",
+            "Show/Hide Hidden Characters",
+            "Show/Hide Hidden Characters",
+            "显示/隐藏隐藏字符",
+        ],
+    ),
+    ("Show/Hide Panels", ["Show/Hide Panels", "Afficher/Masquer les panneaux", "Show/Hide Panels", "Show/Hide Panels", "显示/隐藏面板"]),
+    (
+        "Show/Hide Panels Except Tools",
+        [
+            "Show/Hide Panels Except Tools",
+            "Afficher/Masquer les panneaux sauf Outils",
+            "Show/Hide Panels Except Tools",
+            "Show/Hide Panels Except Tools",
+            "显示/隐藏面板(工具除外)",
+        ],
+    ),
+    ("Show/Hide Rulers", ["Show/Hide Rulers", "Afficher/Masquer les règles", "Show/Hide Rulers", "Show/Hide Rulers", "显示/隐藏标尺"]),
+    (
+        "Show/Hide Tagged Frames",
+        [
+            "Show/Hide Tagged Frames",
+            "Afficher/Masquer les blocs balisés",
+            "Show/Hide Tagged Frames",
+            "Show/Hide Tagged Frames",
+            "显示/隐藏标记的框架",
+        ],
+    ),
+    (
+        "Show/Hide Text Threads",
+        ["Show/Hide Text Threads", "Afficher/Masquer le chaînage du texte", "Show/Hide Text Threads", "Show/Hide Text Threads", "显示/隐藏文本串接"],
+    ),
+    ("Smooth", ["Smooth", "Lisse", "Smooth", "Smooth", "平滑"]),
+    ("Sort", ["Sort", "Trier", "Sort", "Sort", "排序"]),
+    (
+        "Split Cell Horizontally",
+        ["Split Cell Horizontally", "Scinder la cellule horizontalement", "Split Cell Horizontally", "Split Cell Horizontally", "水平拆分单元格"],
+    ),
+    (
+        "Split Cell Vertically",
+        ["Split Cell Vertically", "Scinder la cellule verticalement", "Split Cell Vertically", "Split Cell Vertically", "垂直拆分单元格"],
+    ),
+    ("Split Note", ["Split Note", "Scinder la note", "Split Note", "Split Note", "拆分注释"]),
+    ("Split Path", ["Split Path", "Fractionner le tracé", "Split Path", "Split Path", "拆分路径"]),
+    ("Step and Repeat…", ["Step and Repeat…", "Exécuter et répéter…", "Step and Repeat…", "Step and Repeat…", "步进和重复…"]),
+    ("Stroke Styles", ["Stroke Styles", "Styles de contour", "Stroke Styles", "Stroke Styles", "描边样式"]),
+    ("Structure", ["Structure", "Structure", "Structure", "Structure", "结构"]),
+    ("Style Source", ["Style Source", "Source du style", "Style Source", "Style Source", "样式源"]),
+    ("Synchronize Book", ["Synchronize Book", "Synchroniser le livre", "Synchronize Book", "Synchronize Book", "同步书籍"]),
+    ("Table Options", ["Table Options", "Options de tableau", "Table Options", "Table Options", "表选项"]),
+    ("Table Panel", ["Table Panel", "Panneau Tableau", "Table Panel", "Table Panel", "表格面板"]),
+    ("Table Style Options…", ["Table Style Options…", "Options de style de tableau…", "Table Style Options…", "Table Style Options…", "表样式选项…"]),
+    (
+        "Table of Contents Entries",
+        ["Table of Contents Entries", "Entrées de la table des matières", "Table of Contents Entries", "Table of Contents Entries", "目录条目"],
+    ),
+    ("Table of Contents…", ["Table of Contents…", "Table des matières…", "Table of Contents…", "Table of Contents…", "目录…"]),
+    ("Text Anchors", ["Text Anchors", "Ancres de texte", "Text Anchors", "Text Anchors", "文本锚点"]),
+    ("Text Variables", ["Text Variables", "Variables de texte", "Text Variables", "Text Variables", "文本变量"]),
+    ("Toggle Normal/Preview", ["Toggle Normal/Preview", "Basculer Normal/Aperçu", "Toggle Normal/Preview", "Toggle Normal/Preview", "切换正常/预览"]),
+    (
+        "Toggle Presentation",
+        [
+            "Präsentation ein/aus",
+            "Activer/désactiver la présentation",
+            "Activar/desactivar presentación",
+            "プレゼンテーションを切り替え",
+            "切换演示模式",
+        ],
+    ),
+    ("Toggle Selection", ["Toggle Selection", "Basculer la sélection", "Toggle Selection", "Toggle Selection", "切换选择"]),
+    ("Tools: Double Column", ["Tools: Double Column", "Outils : double colonne", "Tools: Double Column", "Tools: Double Column", "工具: 双列"]),
+    ("Transform Again", ["Transform Again", "Répéter la transformation", "Transform Again", "Transform Again", "再次变换"]),
+    ("Transform Panel", ["Transform Panel", "Panneau Transformation", "Transform Panel", "Transform Panel", "变换面板"]),
+    ("Transform Values", ["Transform Values", "Valeurs de transformation", "Transform Values", "Transform Values", "变换值"]),
+    (
+        "Transparency Blend Space",
+        ["Transparency Blend Space", "Espace de fusion de la transparence", "Transparency Blend Space", "Transparency Blend Space", "透明度混合空间"],
+    ),
+    (
+        "Transparency Flattener Presets",
+        [
+            "Transparency Flattener Presets",
+            "Préréglages d'aplatissement de la transparence",
+            "Transparency Flattener Presets",
+            "Transparency Flattener Presets",
+            "透明度拼合器预设",
+        ],
+    ),
+    ("Type on a Path", ["Type on a Path", "Texte curviligne", "Type on a Path", "Type on a Path", "路径文字"]),
+    (
+        "Type on a Path Options…",
+        ["Type on a Path Options…", "Options de texte curviligne…", "Type on a Path Options…", "Type on a Path Options…", "路径文字选项…"],
+    ),
+    ("Typical Display", ["Typical Display", "Affichage standard", "Typical Display", "Typical Display", "典型显示"]),
+    ("UI Scaling", ["UI Scaling", "Mise à l'échelle de l'interface", "UI Scaling", "UI Scaling", "UI 缩放"]),
+    ("Update Link", ["Update Link", "Mettre à jour le lien", "Update Link", "Update Link", "更新链接"]),
+    (
+        "User Dictionary Words",
+        ["User Dictionary Words", "Mots du dictionnaire utilisateur", "User Dictionary Words", "User Dictionary Words", "用户词典单词"],
+    ),
+    ("User Dictionary…", ["User Dictionary…", "Dictionnaire utilisateur…", "User Dictionary…", "User Dictionary…", "用户词典…"]),
+    ("Zoom To", ["Zoom To", "Zoom sur", "Zoom To", "Zoom To", "缩放至"]),
+    ("⇧", ["⇧", "⇧", "⇧", "⇧", "⇧"]),
+    ("⌃", ["⌃", "⌃", "⌃", "⌃", "⌃"]),
+    ("⌘", ["⌘", "⌘", "⌘", "⌘", "⌘"]),
+    ("⌥", ["⌥", "⌥", "⌥", "⌥", "⌥"]),
+    ("Accept Change", ["Accept Change", "Accepter la modification", "Accept Change", "Accept Change", "接受更改"]),
+    ("Add Anchor", ["Add Anchor", "Ajouter un point d'ancrage", "Add Anchor", "Add Anchor", "添加锚点"]),
+    (
+        "Add Selection to Article",
+        ["Add Selection to Article", "Ajouter la sélection à l'article", "Add Selection to Article", "Add Selection to Article", "将选择添加到文章"],
+    ),
+    ("Add Unnamed Colors", ["Add Unnamed Colors", "Ajouter les couleurs sans nom", "Add Unnamed Colors", "Add Unnamed Colors", "添加未命名颜色"]),
+    ("Add to Dictionary", ["Add to Dictionary", "Ajouter au dictionnaire", "Add to Dictionary", "Add to Dictionary", "添加到字典"]),
+    ("Align Center", ["Align Center", "Aligner au centre", "Align Center", "Align Center", "居中对齐"]),
+    ("Align Left", ["Align Left", "Aligner à gauche", "Align Left", "Align Left", "左对齐"]),
+    ("Align Right", ["Align Right", "Aligner à droite", "Align Right", "Align Right", "右对齐"]),
+    (
+        "Apply Character Style",
+        ["Apply Character Style", "Appliquer le style de caractère", "Apply Character Style", "Apply Character Style", "应用字符样式"],
+    ),
+    ("Apply Object Style", ["Apply Object Style", "Appliquer le style d'objet", "Apply Object Style", "Apply Object Style", "应用对象样式"]),
+    (
+        "Apply Paragraph Style",
+        ["Apply Paragraph Style", "Appliquer le style de paragraphe", "Apply Paragraph Style", "Apply Paragraph Style", "应用段落样式"],
+    ),
+    ("Apply Table Style", ["Apply Table Style", "Appliquer le style de tableau", "Apply Table Style", "Apply Table Style", "应用表样式"]),
+    ("Article Options", ["Article Options", "Options d'article", "Article Options", "Article Options", "文章选项"]),
+    ("Basic Feather", ["Basic Feather", "Contour progressif simple", "Basic Feather", "Basic Feather", "基本羽化"]),
+    ("Bold", ["Bold", "Gras", "Bold", "Bold", "加粗"]),
+    ("Bring Forward", ["Bring Forward", "En avant", "Bring Forward", "Bring Forward", "向前移动"]),
+    ("Bring to Front", ["Bring to Front", "Premier plan", "Bring to Front", "Bring to Front", "置于顶层"]),
+    ("Change", ["Change", "Remplacer", "Change", "Change", "更改"]),
+    (
+        "Character Style Options…",
+        ["Character Style Options…", "Options de style de caractère…", "Character Style Options…", "Character Style Options…", "字符样式选项…"],
+    ),
+    ("Close Path", ["Close Path", "Fermer le tracé", "Close Path", "Close Path", "闭合路径"]),
+    ("Color Group Options", ["Color Group Options", "Options du groupe de couleurs", "Color Group Options", "Color Group Options", "颜色组选项"]),
+    ("Column Width", ["Column Width", "Largeur de colonne", "Column Width", "Column Width", "列宽"]),
+    ("Balance Columns", ["Spalten ausgleichen", "Équilibrer les colonnes", "Equilibrar columnas", "段の高さを揃える", "平衡栏高"]),
+    ("Column Rules", ["Spaltenlinien", "Filets de colonne", "Filetes de columna", "段間罫線", "栏间线"]),
+    ("Insert Column Rule", ["Spaltenlinie einfügen", "Insérer un filet de colonne", "Insertar filete de columna", "段間罫線を挿入", "插入栏间线"]),
+    ("Tint %", ["Farbton %", "Teinte %", "Matiz %", "濃淡 %", "色调 %"]),
+    ("Top Inset", ["Oberer Einzug", "Retrait supérieur", "Sangría superior", "上インセット", "顶部内边距"]),
+    ("Bottom Inset", ["Unterer Einzug", "Retrait inférieur", "Sangría inferior", "下インセット", "底部内边距"]),
+    ("Horizontal Offset", ["Horizontaler Versatz", "Décalage horizontal", "Desplazamiento horizontal", "水平オフセット", "水平偏移"]),
+    ("Condition Options…", ["Condition Options…", "Options de condition…", "Condition Options…", "Condition Options…", "条件选项…"]),
+    (
+        "Convert to Liquid Guide",
+        ["Convert to Liquid Guide", "Convertir en repère liquide", "Convert to Liquid Guide", "Convert to Liquid Guide", "转换为自适应参考线"],
+    ),
+    ("Convert to Object", ["Convert to Object", "Convertir en objet", "Convert to Object", "Convert to Object", "转换为对象"]),
+    ("Create Line", ["Create Line", "Créer un trait", "Create Line", "Create Line", "创建线条"]),
+    ("Create Path", ["Create Path", "Créer un tracé", "Create Path", "Create Path", "创建路径"]),
+    ("Decrease Point Size", ["Decrease Point Size", "Diminuer le corps", "Decrease Point Size", "Decrease Point Size", "减小字号"]),
+    ("Delete Article", ["Delete Article", "Supprimer l'article", "Delete Article", "Delete Article", "删除文章"]),
+    ("Delete Bookmark", ["Delete Bookmark", "Supprimer le signet", "Delete Bookmark", "Delete Bookmark", "删除书签"]),
+    ("Delete Endnote", ["Delete Endnote", "Supprimer la note de fin", "Delete Endnote", "Delete Endnote", "删除尾注"]),
+    ("Delete Footnote", ["Delete Footnote", "Supprimer la note de bas de page", "Delete Footnote", "Delete Footnote", "删除脚注"]),
+    ("Delete Guide", ["Delete Guide", "Supprimer le repère", "Delete Guide", "Delete Guide", "删除参考线"]),
+    ("Delete Hyperlink", ["Delete Hyperlink", "Supprimer l'hyperlien", "Delete Hyperlink", "Delete Hyperlink", "删除超链接"]),
+    ("Delete List", ["Delete List", "Supprimer la liste", "Delete List", "Delete List", "删除列表"]),
+    ("Delete Note", ["Delete Note", "Supprimer la note", "Delete Note", "Delete Note", "删除注释"]),
+    ("Delete Pages", ["Delete Pages", "Supprimer les pages", "Delete Pages", "Delete Pages", "删除页面"]),
+    (
+        "Delete Paragraph Style",
+        ["Delete Paragraph Style", "Supprimer le style de paragraphe", "Delete Paragraph Style", "Delete Paragraph Style", "删除段落样式"],
+    ),
+    ("Delete Stroke Style", ["Delete Stroke Style", "Supprimer le style de contour", "Delete Stroke Style", "Delete Stroke Style", "删除描边样式"]),
+    ("Delete Table", ["Delete Table", "Supprimer le tableau", "Delete Table", "Delete Table", "删除表格"]),
+    ("Delete Tag", ["Delete Tag", "Supprimer la balise", "Delete Tag", "Delete Tag", "删除标记"]),
+    ("Delete Text", ["Delete Text", "Supprimer le texte", "Delete Text", "Delete Text", "删除文本"]),
+    (
+        "Distribute Columns Evenly",
+        ["Distribute Columns Evenly", "Répartir les colonnes uniformément", "Distribute Columns Evenly", "Distribute Columns Evenly", "均匀分布列"],
+    ),
+    ("Edit Endnote", ["Edit Endnote", "Modifier la note de fin", "Edit Endnote", "Edit Endnote", "编辑尾注"]),
+    ("Edit Note", ["Edit Note", "Modifier la note", "Edit Note", "Edit Note", "编辑注释"]),
+    ("Embed Link", ["Embed Link", "Incorporer le lien", "Embed Link", "Embed Link", "嵌入链接"]),
+    ("Fill", ["Fill", "Fond", "Fill", "Fill", "填色"]),
+    (
+        "Fill with Placeholder Text",
+        [
+            "Fill with Placeholder Text",
+            "Remplir avec le texte de substitution",
+            "Fill with Placeholder Text",
+            "Fill with Placeholder Text",
+            "用占位符文本填充",
+        ],
+    ),
+    ("Flip", ["Flip", "Retourner", "Flip", "Flip", "翻转"]),
+    ("Hyperlink Options…", ["Hyperlink Options…", "Options d'hyperlien…", "Hyperlink Options…", "Hyperlink Options…", "超链接选项…"]),
+    ("Increase Point Size", ["Increase Point Size", "Augmenter le corps", "Increase Point Size", "Increase Point Size", "增大字号"]),
+    ("Insert Column Left", ["Insert Column Left", "Insérer une colonne à gauche", "Insert Column Left", "Insert Column Left", "在左侧插入列"]),
+    ("Insert Column Right", ["Insert Column Right", "Insérer une colonne à droite", "Insert Column Right", "Insert Column Right", "在右侧插入列"]),
+    ("Insert Row Above", ["Insert Row Above", "Insérer une ligne au-dessus", "Insert Row Above", "Insert Row Above", "在上方插入行"]),
+    ("Insert Row Below", ["Insert Row Below", "Insérer une ligne en dessous", "Insert Row Below", "Insert Row Below", "在下方插入行"]),
+    ("Italic", ["Italic", "Italique", "Italic", "Italic", "斜体"]),
+    ("Justify Left", ["Justify Left", "Justifier à gauche", "Justify Left", "Justify Left", "左对齐齐行"]),
+    ("Layer Options…", ["Layer Options…", "Options de calque…", "Layer Options…", "Layer Options…", "图层选项…"]),
+    ("Move", ["Move", "Déplacer", "Move", "Move", "移动"]),
+    ("Move Anchors", ["Move Anchors", "Déplacer les points d'ancrage", "Move Anchors", "Move Anchors", "移动锚点"]),
+    ("Move Column", ["Move Column", "Déplacer la colonne", "Move Column", "Move Column", "移动列"]),
+    ("Move Guide", ["Move Guide", "Déplacer le repère", "Move Guide", "Move Guide", "移动参考线"]),
+    ("Move Layer", ["Move Layer", "Déplacer le calque", "Move Layer", "Move Layer", "移动图层"]),
+    ("Move Pages…", ["Move Pages…", "Déplacer des pages…", "Move Pages…", "Move Pages…", "移动页面…"]),
+    ("Move to Layer", ["Move to Layer", "Déplacer vers le calque", "Move to Layer", "Move to Layer", "移动到图层"]),
+    ("New Article", ["New Article", "Nouvel article", "New Article", "New Article", "新建文章"]),
+    ("New Bookmark", ["New Bookmark", "Nouveau signet", "New Bookmark", "New Bookmark", "新建书签"]),
+    (
+        "New Character Style…",
+        ["New Character Style…", "Nouveau style de caractère…", "New Character Style…", "New Character Style…", "新建字符样式…"],
+    ),
+    ("New Layer…", ["New Layer…", "Nouveau calque…", "New Layer…", "New Layer…", "新建图层…"]),
+    ("New Note", ["New Note", "Nouvelle note", "New Note", "New Note", "新建注释"]),
+    ("New Object Style…", ["New Object Style…", "Nouveau style d'objet…", "New Object Style…", "New Object Style…", "新建对象样式…"]),
+    ("New Parent…", ["New Parent…", "Nouveau gabarit…", "New Parent…", "New Parent…", "新建主页…"]),
+    ("New Tag", ["New Tag", "Nouvelle balise", "New Tag", "New Tag", "新建标记"]),
+    ("Opacity", ["Opacity", "Opacité", "Opacity", "Opacity", "不透明度"]),
+    ("Paste in Place", ["Paste in Place", "Coller sur place", "Paste in Place", "Paste in Place", "原位粘贴"]),
+    (
+        "Place Loaded Graphic",
+        ["Place Loaded Graphic", "Importer le graphique chargé", "Place Loaded Graphic", "Place Loaded Graphic", "置入已加载的图形"],
+    ),
+    ("Reject Change", ["Reject Change", "Refuser la modification", "Reject Change", "Reject Change", "拒绝更改"]),
+    (
+        "Release State to Objects",
+        ["Release State to Objects", "Libérer l'état en objets", "Release State to Objects", "Release State to Objects", "将状态释放为对象"],
+    ),
+    (
+        "Remove Hyphenation Exception",
+        [
+            "Remove Hyphenation Exception",
+            "Supprimer l'exception de césure",
+            "Remove Hyphenation Exception",
+            "Remove Hyphenation Exception",
+            "移除断字例外",
+        ],
+    ),
+    ("Remove from Article", ["Remove from Article", "Retirer de l'article", "Remove from Article", "Remove from Article", "从文章中移除"]),
+    ("Rename", ["Rename", "Renommer", "Rename", "Rename", "重命名"]),
+    ("Rename Bookmark", ["Rename Bookmark", "Renommer le signet", "Rename Bookmark", "Rename Bookmark", "重命名书签"]),
+    ("Rotate", ["Rotate", "Rotation", "Rotate", "Rotate", "旋转"]),
+    ("Row Height", ["Row Height", "Hauteur de ligne", "Row Height", "Row Height", "行高"]),
+    ("Scale", ["Scale", "Échelle", "Scale", "Scale", "缩放"]),
+    ("Send Backward", ["Send Backward", "En arrière", "Send Backward", "Send Backward", "向后移动"]),
+    ("Send to Back", ["Send to Back", "Arrière-plan", "Send to Back", "Send to Back", "置于底层"]),
+    (
+        "Set Cross-Reference Format",
+        [
+            "Set Cross-Reference Format",
+            "Définir le format de référence croisée",
+            "Set Cross-Reference Format",
+            "Set Cross-Reference Format",
+            "设置交叉引用格式",
+        ],
+    ),
+    (
+        "Set Footnote Text",
+        ["Set Footnote Text", "Définir le texte de la note de bas de page", "Set Footnote Text", "Set Footnote Text", "设置脚注文本"],
+    ),
+    ("Set Story Text", ["Set Story Text", "Définir le texte de l'article", "Set Story Text", "Set Story Text", "设置文章文本"]),
+    ("Shear", ["Shear", "Déformation", "Shear", "Shear", "切变"]),
+    ("Show All on Spread", ["Show All on Spread", "Tout afficher sur la planche", "Show All on Spread", "Show All on Spread", "在跨页上全部显示"]),
+    ("Show State", ["Show State", "Afficher l'état", "Show State", "Show State", "显示状态"]),
+    ("State Options", ["State Options", "Options d'état", "State Options", "State Options", "状态选项"]),
+    ("Tag Frame", ["Tag Frame", "Baliser le bloc", "Tag Frame", "Tag Frame", "标记框架"]),
+    ("Tag Text", ["Tag Text", "Baliser le texte", "Tag Text", "Tag Text", "标记文本"]),
+    ("Track Changes", ["Track Changes", "Suivi des modifications", "Track Changes", "Track Changes", "修订"]),
+    ("Unlink", ["Unlink", "Délier", "Unlink", "Unlink", "取消链接"]),
+    (
+        "Unlock All on Spread",
+        ["Unlock All on Spread", "Tout déverrouiller sur la planche", "Unlock All on Spread", "Unlock All on Spread", "解锁跨页上的所有内容"],
+    ),
+    ("Update Index", ["Update Index", "Mettre à jour l'index", "Update Index", "Update Index", "更新索引"]),
+    (
+        "Update Table of Contents",
+        ["Update Table of Contents", "Mettre à jour la table des matières", "Update Table of Contents", "Update Table of Contents", "更新目录"],
+    ),
+    (
+        "Bulleted and Numbered Lists",
+        [
+            "Bulleted and Numbered Lists",
+            "Listes à puces et numérotées",
+            "Bulleted and Numbered Lists",
+            "Bulleted and Numbered Lists",
+            "项目符号和编号列表",
+        ],
+    ),
+    (
+        "Insert Special Character",
+        ["Insert Special Character", "Insérer un caractère spécial", "Insert Special Character", "Insert Special Character", "插入特殊字符"],
+    ),
+    ("Insert White Space", ["Insert White Space", "Insérer un espace", "Insert White Space", "Insert White Space", "插入空格"]),
+    (
+        "Insert Break Character",
+        ["Insert Break Character", "Insérer un caractère de saut", "Insert Break Character", "Insert Break Character", "插入分隔符"],
+    ),
+    (
+        "Hyperlinks Cross-References",
+        [
+            "Hyperlinks Cross-References",
+            "Hyperliens et références croisées",
+            "Hyperlinks Cross-References",
+            "Hyperlinks Cross-References",
+            "超链接交叉引用",
+        ],
+    ),
+    (
+        "Document Footnote Options...",
+        [
+            "Document Footnote Options...",
+            "Options de notes de bas de page du document...",
+            "Document Footnote Options...",
+            "Document Footnote Options...",
+            "文档脚注选项…",
+        ],
+    ),
+    ("  Close  ", ["  Close  ", "  Fermer  ", "  Close  ", "  Close  ", "  关闭  "]),
+    ("  New file  ", ["  New file  ", "  Nouveau fichier  ", "  New file  ", "  New file  ", "  新建文件  "]),
+    ("  OK  ", ["  OK  ", "  OK  ", "  OK  ", "  OK  ", "  确定  "]),
+    ("  Open  ", ["  Open  ", "  Ouvrir  ", "  Open  ", "  Open  ", "  打开  "]),
+    (
+        "  Open sample magazine  ",
+        ["  Open sample magazine  ", "  Ouvrir un magazine d'exemple  ", "  Open sample magazine  ", "  Open sample magazine  ", "  打开示例杂志  "],
+    ),
+    ("(Top Level)", ["(Top Level)", "(Niveau supérieur)", "(Top Level)", "(Top Level)", "(顶层)"]),
+    ("(import)", ["(import)", "(importation)", "(import)", "(import)", "(导入)"]),
+    ("Anchored Object", ["Anchored Object", "Objet ancré", "Anchored Object", "Anchored Object", "锚定对象"]),
+    (
+        "Apply Attributes (Eyedropper",
+        [
+            "Apply Attributes (Eyedropper",
+            "Appliquer les attributs (Pipette",
+            "Apply Attributes (Eyedropper",
+            "Apply Attributes (Eyedropper",
+            "应用属性 (吸管",
+        ],
+    ),
+    ("Baseline Grid", ["Baseline Grid", "Grille de ligne de base", "Baseline Grid", "Baseline Grid", "基线网格"]),
+    ("Bleed and Slug", ["Bleed and Slug", "Fond perdu et ligne-bloc", "Bleed and Slug", "Bleed and Slug", "出血和辅助信息区"]),
+    (
+        "Buttons act in interactive PDF export.",
+        [
+            "Buttons act in interactive PDF export.",
+            "Les boutons sont actifs dans l'export PDF interactif.",
+            "Buttons act in interactive PDF export.",
+            "Buttons act in interactive PDF export.",
+            "按钮在交互式 PDF 导出中起作用。",
+        ],
+    ),
+    ("Captions", ["Captions", "Légendes", "Captions", "Captions", "题注"]),
+    ("Change All (Object", ["Change All (Object", "Tout remplacer (objet", "Change All (Object", "Change All (Object", "全部更改 (对象"]),
+    ("Character Settings", ["Character Settings", "Réglages des caractères", "Character Settings", "Character Settings", "字符设置"]),
+    ("Choose a link.", ["Choose a link.", "Choisissez un lien.", "Choose a link.", "Choose a link.", "选择一个链接。"]),
+    ("Clipping Path", ["Clipping Path", "Masque", "Clipping Path", "Clipping Path", "剪切路径"]),
+    (
+        "Collect objects with the Content Collector (B); place them with the Content Placer.",
+        [
+            "Collect objects with the Content Collector (B); place them with the Content Placer.",
+            "Collectez des objets avec l'outil Collecteur de contenu (B) ; placez-les avec l'outil Placeur de contenu.",
+            "Collect objects with the Content Collector (B); place them with the Content Placer.",
+            "Collect objects with the Content Collector (B); place them with the Content Placer.",
+            "使用内容收集器 (B) 收集对象；使用内容放置器放置它们。",
+        ],
+    ),
+    ("Content Fitting", ["Content Fitting", "Ajustement du contenu", "Content Fitting", "Content Fitting", "内容适合"]),
+    ("Convert Cell Type", ["Convert Cell Type", "Convertir le type de cellule", "Convert Cell Type", "Convert Cell Type", "转换单元格类型"]),
+    ("Copy Link(s", ["Copy Link(s", "Copier lien(s", "Copy Link(s", "Copy Link(s", "复制链接("]),
+    (
+        "Create Alternate Layout",
+        ["Create Alternate Layout", "Créer une variante de mise en page", "Create Alternate Layout", "Create Alternate Layout", "创建替代版面"],
+    ),
+    ("Crop Amount", ["Crop Amount", "Valeur de recadrage", "Crop Amount", "Crop Amount", "裁剪量"]),
+    (
+        "Cross-Reference Format",
+        ["Cross-Reference Format", "Format de référence croisée", "Cross-Reference Format", "Cross-Reference Format", "交叉引用格式"],
+    ),
+    ("Delete Workspace", ["Delete Workspace", "Supprimer l'espace de travail", "Delete Workspace", "Delete Workspace", "删除工作区"]),
+    ("DesignCraft", ["DesignCraft", "DesignCraft", "DesignCraft", "DesignCraft", "DesignCraft"]),
+    ("Display Performance", ["Display Performance", "Performances d'affichage", "Display Performance", "Display Performance", "显示性能"]),
+    ("Document Grid", ["Document Grid", "Grille du document", "Document Grid", "Document Grid", "文档网格"]),
+    (
+        "Document Recovery Data",
+        ["Document Recovery Data", "Données de récupération du document", "Document Recovery Data", "Document Recovery Data", "文档恢复数据"],
+    ),
+    ("EPUB and HTML", ["EPUB and HTML", "EPUB et HTML", "EPUB and HTML", "EPUB and HTML", "EPUB 和 HTML"]),
+    ("Export", ["Export", "Exporter", "Export", "Export", "导出"]),
+    (
+        "Export EPUB (Fixed Layout",
+        [
+            "Export EPUB (Fixed Layout",
+            "Exporter en EPUB (mise en page fixe",
+            "Export EPUB (Fixed Layout",
+            "Export EPUB (Fixed Layout",
+            "导出 EPUB (固定版面",
+        ],
+    ),
+    (
+        "Export EPUB (Reflowable",
+        ["Export EPUB (Reflowable", "Exporter en EPUB (redistribuable", "Export EPUB (Reflowable", "Export EPUB (Reflowable", "导出 EPUB (可回流"],
+    ),
+    ("Facing Pages", ["Facing Pages", "Pages en vis-à-vis", "Facing Pages", "Facing Pages", "对页"]),
+    ("GREP Styles", ["GREP Styles", "Styles GREP", "GREP Styles", "GREP Styles", "GREP 样式"]),
+    (
+        "Get help, share your layouts and shape what we build next.",
+        [
+            "Get help, share your layouts and shape what we build next.",
+            "Obtenez de l'aide, partagez vos mises en page et influencez ce que nous construirons ensuite.",
+            "Get help, share your layouts and shape what we build next.",
+            "Get help, share your layouts and shape what we build next.",
+            "获取帮助，分享您的布局，共同塑造我们的未来。",
+        ],
+    ),
+    ("Highlight", ["Highlight", "Surlignage", "Highlight", "Highlight", "高亮显示"]),
+    (
+        "Hyperlinks & Cross-References",
+        [
+            "Hyperlinks & Cross-References",
+            "Hyperliens et références croisées",
+            "Hyperlinks & Cross-References",
+            "Hyperlinks & Cross-References",
+            "超链接和交叉引用",
+        ],
+    ),
+    ("Hyphens and Dashes", ["Hyphens and Dashes", "Traits d'union et tirets", "Hyphens and Dashes", "Hyphens and Dashes", "连字符和破折号"]),
+    ("Interactive", ["Interactive", "Interactif", "Interactive", "Interactive", "交互式"]),
+    ("Invert", ["Invert", "Inverser", "Invert", "Invert", "反相"]),
+    (
+        "Join the ArtCraft community",
+        [
+            "Join the ArtCraft community",
+            "Rejoindre la communauté ArtCraft",
+            "Join the ArtCraft community",
+            "Join the ArtCraft community",
+            "加入 ArtCraft 社区",
+        ],
+    ),
+    ("Keyboard Increments", ["Keyboard Increments", "Incréments au clavier", "Keyboard Increments", "Keyboard Increments", "键盘增量"]),
+    ("Liquid guides", ["Liquid guides", "Repères liquides", "Liquid guides", "Liquid guides", "自适应参考线"]),
+    ("Markers", ["Markers", "Marqueurs", "Markers", "Markers", "标记"]),
+    ("More ArtCraft apps", ["More ArtCraft apps", "Autres applications ArtCraft", "More ArtCraft apps", "More ArtCraft apps", "更多 ArtCraft 应用"]),
+    ("Nested Line Styles", ["Nested Line Styles", "Styles de ligne imbriqués", "Nested Line Styles", "Nested Line Styles", "嵌套行样式"]),
+    ("Nested Styles", ["Nested Styles", "Styles imbriqués", "Nested Styles", "Nested Styles", "嵌套样式"]),
+    (
+        "No articles: exports follow page order.",
+        [
+            "No articles: exports follow page order.",
+            "Aucun article : les exports suivent l'ordre des pages.",
+            "No articles: exports follow page order.",
+            "No articles: exports follow page order.",
+            "没有文章：导出遵循页面顺序。",
+        ],
+    ),
+    ("No book open.", ["No book open.", "Aucun livre ouvert.", "No book open.", "No book open.", "没有打开的书籍。"]),
+    (
+        "No bookmarks. They become the PDF outline.",
+        [
+            "No bookmarks. They become the PDF outline.",
+            "Aucun signet. Ils forment le plan du PDF.",
+            "No bookmarks. They become the PDF outline.",
+            "No bookmarks. They become the PDF outline.",
+            "没有书签。它们将成为 PDF 大纲。",
+        ],
+    ),
+    ("No changes.", ["No changes.", "Aucune modification.", "No changes.", "No changes.", "没有更改。"]),
+    (
+        "No conditions. Create one, then select text and click it to apply.",
+        [
+            "No conditions. Create one, then select text and click it to apply.",
+            "Aucune condition. Créez-en une, puis sélectionnez du texte et cliquez dessus pour l'appliquer.",
+            "No conditions. Create one, then select text and click it to apply.",
+            "No conditions. Create one, then select text and click it to apply.",
+            "没有条件。创建一个条件，然后选择文本并单击以应用。",
+        ],
+    ),
+    ("No document open", ["No document open", "Aucun document ouvert", "No document open", "No document open", "未打开任何文档"]),
+    ("No document.", ["No document.", "Aucun document.", "No document.", "No document.", "没有文档。"]),
+    (
+        "No hyperlinks. Select text or a frame, type a URL and click New.",
+        [
+            "No hyperlinks. Select text or a frame, type a URL and click New.",
+            "Aucun hyperlien. Sélectionnez du texte ou un bloc, saisissez une URL et cliquez sur Nouveau.",
+            "No hyperlinks. Select text or a frame, type a URL and click New.",
+            "No hyperlinks. Select text or a frame, type a URL and click New.",
+            "没有超链接。选择文本或框架，键入 URL，然后单击新建。",
+        ],
+    ),
+    ("No library open.", ["No library open.", "Aucune bibliothèque ouverte.", "No library open.", "No library open.", "没有打开的库。"]),
+    (
+        "No notes in this document.",
+        [
+            "No notes in this document.",
+            "Aucune note dans ce document.",
+            "No notes in this document.",
+            "No notes in this document.",
+            "本文档中没有注释。",
+        ],
+    ),
+    ("No placed graphics.", ["No placed graphics.", "Aucun graphique importé.", "No placed graphics.", "No placed graphics.", "没有置入的图形。"]),
+    (
+        "No scripts. Add one below.",
+        [
+            "No scripts. Add one below.",
+            "Aucun script. Ajoutez-en un ci-dessous.",
+            "No scripts. Add one below.",
+            "No scripts. Add one below.",
+            "没有脚本。在下方添加一个。",
+        ],
+    ),
+    (
+        "No text anchors in this document.",
+        [
+            "No text anchors in this document.",
+            "Aucune ancre de texte dans ce document.",
+            "No text anchors in this document.",
+            "No text anchors in this document.",
+            "本文档中没有文本锚点。",
+        ],
+    ),
+    (
+        "OK changes all: text and paragraph/character styles.",
+        [
+            "OK changes all: text and paragraph/character styles.",
+            "OK modifie tout : texte et styles de paragraphe/caractère.",
+            "OK changes all: text and paragraph/character styles.",
+            "OK changes all: text and paragraph/character styles.",
+            "确定将更改所有：文本和段落/字符样式。",
+        ],
+    ),
+    ("OVERSET", ["OVERSET", "EN EXCÈS", "OVERSET", "OVERSET", "溢流"]),
+    (
+        "Open source. No telemetry.",
+        [
+            "Open source. No telemetry.",
+            "Open source. Aucune télémétrie.",
+            "Open source. No telemetry.",
+            "Open source. No telemetry.",
+            "开源。无遥测。",
+        ],
+    ),
+    ("Options", ["Options", "Options", "Options", "Options", "选项"]),
+    (
+        "Options for Black on RGB and Grayscale Devices",
+        [
+            "Options for Black on RGB and Grayscale Devices",
+            "Options du noir sur les périphériques RVB et en niveaux de gris",
+            "Options for Black on RGB and Grayscale Devices",
+            "Options for Black on RGB and Grayscale Devices",
+            "RGB 和灰度设备上的黑色选项",
+        ],
+    ),
+    ("Other", ["Other", "Autre", "Other", "Other", "其他"]),
+    ("Output", ["Output", "Sortie", "Output", "Output", "输出"]),
+    ("Page Numbering", ["Page Numbering", "Numérotation des pages", "Page Numbering", "Page Numbering", "页码编排"]),
+    (
+        "Page layout for print and screen — fast, open and scriptable.",
+        [
+            "Page layout for print and screen — fast, open and scriptable.",
+            "Mise en page pour l'impression et l'écran : rapide, ouverte, scriptable.",
+            "Page layout for print and screen — fast, open and scriptable.",
+            "Page layout for print and screen — fast, open and scriptable.",
+            "用于打印和屏幕的页面布局——快速、开放且可编写脚本。",
+        ],
+    ),
+    ("Page · PPI", ["Page · PPI", "Page · PPP", "Page · PPI", "Page · PPI", "页面 · PPI"]),
+    (
+        "Part of the ArtCraft suite of open creative tools.",
+        [
+            "Part of the ArtCraft suite of open creative tools.",
+            "Fait partie de la suite ArtCraft d'outils créatifs ouverts.",
+            "Part of the ArtCraft suite of open creative tools.",
+            "Part of the ArtCraft suite of open creative tools.",
+            "ArtCraft 开源创意工具套件的一部分。",
+        ],
+    ),
+    ("Pasteboard Options", ["Pasteboard Options", "Options de la table de montage", "Pasteboard Options", "Pasteboard Options", "粘贴板选项"]),
+    ("Paths", ["Paths", "Tracés", "Paths", "Paths", "路径"]),
+    (
+        "Place the insertion point in a table, or create one.",
+        [
+            "Place the insertion point in a table, or create one.",
+            "Placez le point d'insertion dans un tableau ou créez-en un.",
+            "Place the insertion point in a table, or create one.",
+            "Place the insertion point in a table, or create one.",
+            "将插入点置于表格中，或创建一个表格。",
+        ],
+    ),
+    (
+        "Plays in EPUB export; print and PDF show the poster.",
+        [
+            "Plays in EPUB export; print and PDF show the poster.",
+            "Lu dans l'export EPUB ; l'impression et le PDF montrent l'affiche.",
+            "Plays in EPUB export; print and PDF show the poster.",
+            "Plays in EPUB export; print and PDF show the poster.",
+            "在 EPUB 导出中播放；打印和 PDF 显示海报。",
+        ],
+    ),
+    ("Quotation Marks", ["Quotation Marks", "Guillemets", "Quotation Marks", "Quotation Marks", "引号"]),
+    ("Recently Used", ["Recently Used", "Récemment utilisés", "Recently Used", "Recently Used", "最近使用"]),
+    ("Replace With", ["Replace With", "Remplacer par", "Replace With", "Replace With", "替换为"]),
+    (
+        "Right-click: stroke, groups",
+        [
+            "Right-click: stroke, groups",
+            "Clic droit : contour, groupes",
+            "Right-click: stroke, groups",
+            "Right-click: stroke, groups",
+            "右键单击：描边、组",
+        ],
+    ),
+    ("Ruler Units", ["Ruler Units", "Unités des règles", "Ruler Units", "Ruler Units", "标尺单位"]),
+    ("Origin:", ["Ursprung:", "Origine :", "Origen:", "原点:", "原点:"]),
+    ("Spine", ["Bund", "Dos", "Lomo", "ノド", "书脊"]),
+    ("Lock Zero Point", ["Nullpunkt fixieren", "Verrouiller le point zéro", "Bloquear punto cero", "ゼロ点をロック", "锁定零点"]),
+    ("Unlock Zero Point", ["Nullpunkt lösen", "Déverrouiller le point zéro", "Desbloquear punto cero", "ゼロ点のロックを解除", "解锁零点"]),
+    (
+        "Saves which bars show and where the panels are.",
+        [
+            "Saves which bars show and where the panels are.",
+            "Enregistre les barres affichées et l'emplacement des panneaux.",
+            "Saves which bars show and where the panels are.",
+            "Saves which bars show and where the panels are.",
+            "保存显示哪些栏以及面板所在的位置。",
+        ],
+    ),
+    (
+        "Select a placed video or sound (File › Place a .mp4, .mov, .mp3, .wav …).",
+        [
+            "Select a placed video or sound (File › Place a .mp4, .mov, .mp3, .wav …).",
+            "Sélectionnez une vidéo ou un son importé (Fichier › Importer un .mp4, .mov, .mp3, .wav …).",
+            "Select a placed video or sound (File › Place a .mp4, .mov, .mp3, .wav …).",
+            "Select a placed video or sound (File › Place a .mp4, .mov, .mp3, .wav …).",
+            "选择已置入的视频或声音 (文件 › 置入 .mp4, .mov, .mp3, .wav …)。",
+        ],
+    ),
+    (
+        "Select an object or text to color its fill or stroke.",
+        [
+            "Select an object or text to color its fill or stroke.",
+            "Sélectionnez un objet ou du texte pour colorer son fond ou son contour.",
+            "Select an object or text to color its fill or stroke.",
+            "Select an object or text to color its fill or stroke.",
+            "选择一个对象或文本以设置其填色或描边颜色。",
+        ],
+    ),
+    (
+        "Select an object to give its fill a gradient.",
+        [
+            "Select an object to give its fill a gradient.",
+            "Sélectionnez un objet pour appliquer un dégradé à son fond.",
+            "Select an object to give its fill a gradient.",
+            "Select an object to give its fill a gradient.",
+            "选择一个对象以为其填色应用渐变。",
+        ],
+    ),
+    (
+        "Select an object to make it a button.",
+        [
+            "Select an object to make it a button.",
+            "Sélectionnez un objet pour en faire un bouton.",
+            "Select an object to make it a button.",
+            "Select an object to make it a button.",
+            "选择一个对象使其成为按钮。",
+        ],
+    ),
+    (
+        "Select two or more objects (or a group) to make a multi-state object.",
+        [
+            "Select two or more objects (or a group) to make a multi-state object.",
+            "Sélectionnez au moins deux objets (ou un groupe) pour créer un objet à états multiples.",
+            "Select two or more objects (or a group) to make a multi-state object.",
+            "Select two or more objects (or a group) to make a multi-state object.",
+            "选择两个或多个对象 (或一个组) 以制作多状态对象。",
+        ],
+    ),
+    ("Show", ["Show", "Afficher", "Show", "Show", "显示"]),
+    ("Smart Text Reflow", ["Smart Text Reflow", "Redistribution intelligente du texte", "Smart Text Reflow", "Smart Text Reflow", "智能文本重排"]),
+    ("Spelling", ["Spelling", "Orthographe", "Spelling", "Spelling", "拼写"]),
+    ("Start a new document", ["Start a new document", "Créer un nouveau document", "Start a new document", "Start a new document", "开始新文档"]),
+    ("Status", ["Status", "État", "Status", "Status", "状态"]),
+    ("Style Mapping", ["Style Mapping", "Association de styles", "Style Mapping", "Style Mapping", "样式映射"]),
+    ("Style Name Conflicts", ["Style Name Conflicts", "Conflits de noms de style", "Style Name Conflicts", "Style Name Conflicts", "样式名称冲突"]),
+    ("Symbols", ["Symbols", "Symboles", "Symbols", "Symbols", "符号"]),
+    ("System default", ["System default", "Valeur par défaut du système", "System default", "System default", "系统默认"]),
+    ("Table Dimensions", ["Table Dimensions", "Dimensions du tableau", "Table Dimensions", "Table Dimensions", "表格尺寸"]),
+    (
+        "Text Display Options",
+        ["Text Display Options", "Options d'affichage du texte", "Text Display Options", "Text Display Options", "文本显示选项"],
+    ),
+    (
+        "The fill isn't a gradient.",
+        ["The fill isn't a gradient.", "Le fond n'est pas un dégradé.", "The fill isn't a gradient.", "The fill isn't a gradient.", "填色不是渐变。"],
+    ),
+    (
+        "The library is empty. Select objects and Add Selection.",
+        [
+            "The library is empty. Select objects and Add Selection.",
+            "La bibliothèque est vide. Sélectionnez des objets et utilisez Ajouter la sélection.",
+            "The library is empty. Select objects and Add Selection.",
+            "The library is empty. Select objects and Add Selection.",
+            "库为空。选择对象并添加所选内容。",
+        ],
+    ),
+    (
+        "Transitions play in interactive PDF (full-screen mode).",
+        [
+            "Transitions play in interactive PDF (full-screen mode).",
+            "Les transitions sont lues dans le PDF interactif (mode plein écran).",
+            "Transitions play in interactive PDF (full-screen mode).",
+            "Transitions play in interactive PDF (full-screen mode).",
+            "在交互式 PDF (全屏模式) 中播放过渡。",
+        ],
+    ),
+    ("Type & Tables", ["Type & Tables", "Texte et tableaux", "Type & Tables", "Type & Tables", "文字和表格"]),
+    ("Type Options", ["Type Options", "Options de texte", "Type Options", "Type Options", "文字选项"]),
+    (
+        "Type a word with ~ at each allowed break (ex~am~ple); without ~ the word is never hyphenated.",
+        [
+            "Type a word with ~ at each allowed break (ex~am~ple); without ~ the word is never hyphenated.",
+            "Saisissez un mot avec ~ à chaque coupure autorisée (ex~em~ple) ; sans ~, le mot n'est jamais coupé.",
+            "Type a word with ~ at each allowed break (ex~am~ple); without ~ the word is never hyphenated.",
+            "Type a word with ~ at each allowed break (ex~am~ple); without ~ the word is never hyphenated.",
+            "在每个允许的断字处用 ~ 键入一个单词 (例如 ex~am~ple)；如果没有 ~，该单词将永远不会断字。",
+        ],
+    ),
+    (
+        "User Dictionary (this document)",
+        [
+            "User Dictionary (this document)",
+            "Dictionnaire utilisateur (ce document)",
+            "User Dictionary (this document)",
+            "User Dictionary (this document)",
+            "用户词典 (本文档)",
+        ],
+    ),
+    ("Utilities", ["Utilities", "Utilitaires", "Utilities", "Utilities", "实用程序"]),
+    ("Variable Font", ["Variable Font", "Police variable", "Variable Font", "Variable Font", "可变字体"]),
+    (
+        "Welcome to DesignCraft",
+        ["Welcome to DesignCraft", "Bienvenue dans DesignCraft", "Welcome to DesignCraft", "Welcome to DesignCraft", "欢迎使用 DesignCraft"],
+    ),
+    ("When Scaling", ["When Scaling", "Lors du redimensionnement", "When Scaling", "When Scaling", "缩放时"]),
+    ("[Basic] (working) ▾", ["[Basic] (working) ▾", "[De base] (de travail) ▾", "[Basic] (working) ▾", "[Basic] (working) ▾", "[基本] (工作区) ▾"]),
+    ("[Black] Overprint", ["[Black] Overprint", "Surimpression de [Noir]", "[Black] Overprint", "[Black] Overprint", "[黑] 叠印"]),
+    ("[No Group]", ["[No Group]", "[Aucun groupe]", "[No Group]", "[No Group]", "[无组]"]),
+    ("[None]", ["[None]", "[Aucun]", "[None]", "[None]", "[无]"]),
+    (
+        "[None] — choose a colour on the ramp.",
+        [
+            "[None] — choose a colour on the ramp.",
+            "[Aucun] : choisissez une couleur sur le spectre.",
+            "[None] — choose a colour on the ramp.",
+            "[None] — choose a colour on the ramp.",
+            "[无] — 在色带上选择一种颜色。",
+        ],
+    ),
+    (
+        "discord.gg/artcraft — help, feedback and show-and-tell",
+        [
+            "discord.gg/artcraft — help, feedback and show-and-tell",
+            "discord.gg/artcraft : aide, retours et présentation de vos créations",
+            "discord.gg/artcraft — help, feedback and show-and-tell",
+            "discord.gg/artcraft — help, feedback and show-and-tell",
+            "discord.gg/artcraft — 帮助、反馈和展示",
+        ],
+    ),
+    (
+        "⌥-click clears overrides",
+        ["⌥-click clears overrides", "⌥-clic efface les remplacements", "⌥-click clears overrides", "⌥-click clears overrides", "⌥-单击清除覆盖"],
+    ),
+    (
+        "Alt-click clears overrides",
+        [
+            "Alt-Klick entfernt Abweichungen",
+            "Alt-clic efface les remplacements",
+            "Alt-clic borra las modificaciones",
+            "Alt を押しながらクリックするとオーバーライドを消去します",
+            "Alt-单击清除覆盖",
+        ],
+    ),
+    (
+        "Apply \"{name}\", Clear Overrides",
+        [
+            "„{name}“ anwenden, Abweichungen löschen",
+            "Appliquer « {name} », effacer les remplacements",
+            "Aplicar \"{name}\", borrar modificaciones",
+            "\"{name}\" を適用、オーバーライドを消去",
+            "应用\"{name}\"，清除覆盖",
+        ],
+    ),
+    ("⚠ out of date", ["⚠ out of date", "⚠ obsolète", "⚠ out of date", "⚠ out of date", "⚠ 已过期"]),
+    ("General", ["General", "Général", "General", "General", "常规"]),
+    (
+        "Basic Character Formats",
+        ["Basic Character Formats", "Formats de caractère de base", "Basic Character Formats", "Basic Character Formats", "基本字符格式"],
+    ),
+    ("Indents and Spacing", ["Indents and Spacing", "Retraits et espacement", "Indents and Spacing", "Indents and Spacing", "缩进和间距"]),
+    ("Hyphenation", ["Hyphenation", "Césure", "Hyphenation", "Hyphenation", "断字"]),
+    ("Justification", ["Blocksatzeinstellungen", "Justification", "Justificación", "両端揃え", "两端对齐"]),
+    (
+        "Drop Caps and Nested Styles",
+        [
+            "Drop Caps and Nested Styles",
+            "Lettrines et styles imbriqués",
+            "Drop Caps and Nested Styles",
+            "Drop Caps and Nested Styles",
+            "首字下沉和嵌套样式",
+        ],
+    ),
+    ("GREP Style", ["GREP Style", "Style GREP", "GREP Style", "GREP Style", "GREP 样式"]),
+    ("Character Color", ["Character Color", "Couleur du caractère", "Character Color", "Character Color", "字符颜色"]),
+    (
+        "Numbering and Formatting",
+        ["Numbering and Formatting", "Numérotation et mise en forme", "Numbering and Formatting", "Numbering and Formatting", "编号和格式"],
+    ),
+    ("Spacing Options", ["Spacing Options", "Options d'espacement", "Spacing Options", "Spacing Options", "间距选项"]),
+    ("First Baseline", ["First Baseline", "Première ligne de base", "First Baseline", "First Baseline", "首行基线"]),
+    ("Rule Above", ["Rule Above", "Filet au-dessus", "Rule Above", "Rule Above", "上方横线"]),
+    ("Numbering", ["Numbering", "Numérotation", "Numbering", "Numbering", "编号"]),
+    (
+        "Footnote Reference Number in Text",
+        [
+            "Footnote Reference Number in Text",
+            "Numéro de référence de note de bas de page dans le texte",
+            "Footnote Reference Number in Text",
+            "Footnote Reference Number in Text",
+            "正文中的脚注引用编号",
+        ],
+    ),
+    (
+        "Footnote Formatting",
+        ["Footnote Formatting", "Mise en forme des notes de bas de page", "Footnote Formatting", "Footnote Formatting", "脚注格式"],
+    ),
+    (
+        "Span Footnotes Across Columns",
+        [
+            "Span Footnotes Across Columns",
+            "Étendre les notes de bas de page sur toutes les colonnes",
+            "Span Footnotes Across Columns",
+            "Span Footnotes Across Columns",
+            "跨栏分布脚注",
+        ],
+    ),
+    ("Rule On", ["Rule On", "Filet activé", "Rule On", "Rule On", "启用横线"]),
+    ("Ascent", ["Ascent", "Ascendante", "Ascent", "Ascent", "上升高度"]),
+    ("Cap Height", ["Cap Height", "Hauteur de capitale", "Cap Height", "Cap Height", "大写字母高度"]),
+    ("Leading", ["Leading", "Interligne", "Leading", "Leading", "行距"]),
+    ("x Height", ["x Height", "Hauteur d'x", "x Height", "x Height", "x 字高"]),
+    ("Em Box Height", ["Em Box Height", "Hauteur du cadratin", "Em Box Height", "Em Box Height", "全角字框高度"]),
+    ("Fixed", ["Fixed", "Fixe", "Fixed", "Fixed", "固定"]),
+    ("Never (continuous)", ["Never (continuous)", "Jamais (continu)", "Never (continuous)", "Never (continuous)", "从不（连续编号）"]),
+    ("Page", ["Page", "Page", "Page", "Page", "页面"]),
+    ("Spread", ["Spread", "Planche", "Spread", "Spread", "跨页"]),
+    ("Section", ["Section", "Section", "Section", "Section", "章节"]),
+    ("Footnote Reference", ["Footnote Reference", "Référence de note de bas de page", "Footnote Reference", "Footnote Reference", "脚注引用"]),
+    ("Footnote Text", ["Footnote Text", "Texte de la note de bas de page", "Footnote Text", "Footnote Text", "脚注文本"]),
+    ("Both", ["Both", "Les deux", "Both", "Both", "两者"]),
+    ("Apply Superscript", ["Apply Superscript", "Appliquer l'exposant", "Apply Superscript", "Apply Superscript", "应用上标"]),
+    ("Apply Subscript", ["Apply Subscript", "Appliquer l'indice", "Apply Subscript", "Apply Subscript", "应用下标"]),
+    ("Apply Normal", ["Apply Normal", "Appliquer Normal", "Apply Normal", "Apply Normal", "应用正常位置"]),
+    ("OpenType Superscript", ["OpenType Superscript", "Exposant OpenType", "OpenType Superscript", "OpenType Superscript", "OpenType 上标"]),
+    ("through", ["through", "sur", "through", "through", "直到（包含）"]),
+    ("up to", ["up to", "jusqu'à", "up to", "up to", "直到（不包含）"]),
+    ("line", ["line", "ligne", "line", "line", "行"]),
+    ("lines", ["lines", "lignes", "lines", "lines", "行"]),
+    ("sentences", ["sentences", "phrases", "sentences", "sentences", "句子"]),
+    ("words", ["words", "mots", "words", "words", "单词"]),
+    ("characters", ["characters", "caractères", "characters", "characters", "字符"]),
+    ("letters", ["letters", "lettres", "letters", "letters", "字母"]),
+    ("digits", ["digits", "chiffres", "digits", "digits", "数字"]),
+    ("tab", ["tab", "tabulation", "tab", "tab", "制表符"]),
+    ("forcedLineBreak", ["forcedLineBreak", "saut de ligne forcé", "forcedLineBreak", "forcedLineBreak", "强制换行符"]),
+    ("emSpace", ["emSpace", "espace cadratin", "emSpace", "emSpace", "全角空格"]),
+    ("enSpace", ["enSpace", "espace demi-cadratin", "enSpace", "enSpace", "半角空格"]),
+    ("dropcap", ["Initiale", "lettrine", "capitular", "ドロップキャップ", "首字下沉"]),
+    ("Drop Caps", ["Initialen", "Lettrines", "Capitulares", "ドロップキャップ", "首字下沉"]),
+    ("Lines:", ["Zeilen:", "Lignes :", "Líneas:", "行数：", "行数："]),
+    ("Characters:", ["Zeichen:", "Caractères :", "Caracteres:", "文字数：", "字符数："]),
+    ("Drop Lines", ["Initialzeilen", "Lignes lettrine", "Líneas capitular", "ドロップ行数", "下沉行数"]),
+    ("Drop Chars", ["Initialzeichen", "Car. lettrine", "Car. capitular", "ドロップ文字数", "下沉字符数"]),
+    ("Align Left Edge", ["Linke Kante ausrichten", "Aligner le bord gauche", "Alinear borde izquierdo", "左端揃え", "左边缘对齐"]),
+    (
+        "Scale for Descenders",
+        [
+            "Für Unterlängen skalieren",
+            "Mise à l'échelle pour les jambages",
+            "Escalar para trazos descendentes",
+            "ディセンダーに合わせて拡大・縮小",
+            "为下伸部分缩放",
+        ],
+    ),
+    ("chars", ["chars", "caractères saisis", "chars", "chars", "指定字符"]),
+    ("[Automatic]", ["[Automatic]", "[Automatique]", "[Automatic]", "[Automatic]", "[自动]"]),
+    ("Tracking:", ["Tracking:", "Approche :", "Tracking:", "Tracking:", "字距调整："]),
+    ("Right Indent:", ["Right Indent:", "Retrait à droite :", "Right Indent:", "Right Indent:", "右缩进："]),
+    ("First Line Indent:", ["First Line Indent:", "Retrait de première ligne :", "First Line Indent:", "First Line Indent:", "首行缩进："]),
+    ("Space Before:", ["Space Before:", "Espace avant :", "Space Before:", "Space Before:", "段前间距："]),
+    ("Space After:", ["Space After:", "Espace après :", "Space After:", "Space After:", "段后间距："]),
+    ("Words with at Least:", ["Words with at Least:", "Mots d'au moins :", "Words with at Least:", "Words with at Least:", "单词最少字符数："]),
+    ("After First:", ["After First:", "Après les premières :", "After First:", "After First:", "连字符前最少字符数："]),
+    ("Before Last:", ["Before Last:", "Avant les dernières :", "Before Last:", "Before Last:", "连字符后最少字符数："]),
+    ("Hyphen Limit:", ["Hyphen Limit:", "Limite de césure :", "Hyphen Limit:", "Hyphen Limit:", "连字符限制："]),
+    ("Word Spacing:", ["Word Spacing:", "Espacement des mots :", "Word Spacing:", "Word Spacing:", "单词间距："]),
+    ("Letter Spacing:", ["Letter Spacing:", "Espacement des lettres :", "Letter Spacing:", "Letter Spacing:", "字母间距："]),
+    ("Glyph Scaling:", ["Glyph Scaling:", "Échelle des glyphes :", "Glyph Scaling:", "Glyph Scaling:", "字形缩放比例："]),
+    ("Insert Kashidas:", ["Insert Kashidas:", "Insérer des kashidas :", "Insert Kashidas:", "Insert Kashidas:", "插入延长线："]),
+    (
+        "In justified Arabic text",
+        [
+            "In justified Arabic text",
+            "Dans le texte arabe justifié",
+            "In justified Arabic text",
+            "In justified Arabic text",
+            "在两端对齐的阿拉伯语文本中",
+        ],
+    ),
+    ("Korean Line Breaks:", ["Korean Line Breaks:", "Retours à la ligne en coréen :", "Korean Line Breaks:", "Korean Line Breaks:", "韩文换行："]),
+    (
+        "Between syllables (not only at spaces)",
+        [
+            "Between syllables (not only at spaces)",
+            "Entre les syllabes (pas seulement aux espaces)",
+            "Between syllables (not only at spaces)",
+            "Between syllables (not only at spaces)",
+            "在音节之间（不仅在空格处）",
+        ],
+    ),
+    ("Binding:", ["Binding:", "Reliure :", "Binding:", "Binding:", "装订方向："]),
+    ("Ruby:", ["Ruby:", "Ruby :", "Ruby:", "Ruby:", "旁注："]),
+    (
+        "Set over the selected text; empty removes it.",
+        [
+            "Set over the selected text; empty removes it.",
+            "Composé au-dessus du texte sélectionné ; vide, il est supprimé.",
+            "Set over the selected text; empty removes it.",
+            "Set over the selected text; empty removes it.",
+            "在所选文本上方添加注音；留空可移除。",
+        ],
+    ),
+    ("[Basic Paragraph]", ["[Basic Paragraph]", "[Paragraphe standard]", "[Basic Paragraph]", "[Basic Paragraph]", "[基本段落]"]),
+    ("[No Paragraph Style]", ["[No Paragraph Style]", "[Aucun style de paragraphe]", "[No Paragraph Style]", "[No Paragraph Style]", "[无段落样式]"]),
+    ("Align left", ["Align left", "Aligner à gauche", "Align left", "Align left", "左对齐"]),
+    ("Align center", ["Align center", "Aligner au centre", "Align center", "Align center", "居中对齐"]),
+    ("Align right", ["Align right", "Aligner à droite", "Align right", "Align right", "右对齐"]),
+    (
+        "Justify with last line aligned left",
+        [
+            "Justify with last line aligned left",
+            "Justifier avec dernière ligne alignée à gauche",
+            "Justify with last line aligned left",
+            "Justify with last line aligned left",
+            "两端对齐，末行左对齐",
+        ],
+    ),
+    (
+        "Justify with last line aligned center",
+        [
+            "Justify with last line aligned center",
+            "Justifier avec dernière ligne centrée",
+            "Justify with last line aligned center",
+            "Justify with last line aligned center",
+            "两端对齐，末行居中",
+        ],
+    ),
+    (
+        "Justify with last line aligned right",
+        [
+            "Justify with last line aligned right",
+            "Justifier avec dernière ligne alignée à droite",
+            "Justify with last line aligned right",
+            "Justify with last line aligned right",
+            "两端对齐，末行右对齐",
+        ],
+    ),
+    ("Justify all lines", ["Justify all lines", "Justifier toutes les lignes", "Justify all lines", "Justify all lines", "所有行两端对齐"]),
+    ("Align towards spine", ["Align towards spine", "Aligner vers le dos", "Align towards spine", "Align towards spine", "朝向书脊对齐"]),
+    (
+        "Align away from spine",
+        ["Align away from spine", "Aligner à l'opposé du dos", "Align away from spine", "Align away from spine", "背向书脊对齐"],
+    ),
+    (
+        "Create New Style from Selection",
+        [
+            "Create New Style from Selection",
+            "Créer un style à partir de la sélection",
+            "Create New Style from Selection",
+            "Create New Style from Selection",
+            "从所选内容创建新样式",
+        ],
+    ),
+    ("No text selected", ["No text selected", "Aucun texte sélectionné", "No text selected", "No text selected", "未选择文本"]),
+    ("Search", ["Suchen", "Rechercher", "Buscar", "Search", "搜索"]),
+    ("Essentials", ["Essentials", "Les indispensables", "Essentials", "Essentials", "基本功能"]),
+    ("Advanced", ["Advanced", "Avancé", "Advanced", "Advanced", "高级"]),
+    ("Digital Publishing", ["Digital Publishing", "Publication numérique", "Digital Publishing", "Digital Publishing", "数字出版"]),
+    ("Interactive for PDF", ["Interactive for PDF", "PDF interactif", "Interactive for PDF", "Interactive for PDF", "PDF 交互"]),
+    ("Printing and Proofing", ["Printing and Proofing", "Impression et épreuvage", "Printing and Proofing", "Printing and Proofing", "打印和校样"]),
+    ("Typography", ["Typography", "Typographie", "Typography", "Typography", "文字排版"]),
+    ("Rulers & Grids", ["Rulers & Grids", "Règles et grilles", "Rulers & Grids", "Rulers & Grids", "标尺和网格"]),
+    ("No errors", ["No errors", "Aucune erreur", "No errors", "No errors", "无错误"]),
+    ("error", ["error", "erreur", "error", "error", "个错误"]),
+    ("errors", ["errors", "erreurs", "errors", "errors", "个错误"]),
+    ("Reset", ["Reset", "Réinitialiser", "Reset", "Reset", "重置"]),
+    ("Right to Left", ["Right to Left", "De droite à gauche", "Right to Left", "Right to Left", "从右向左"]),
+    ("Left to Right", ["Left to Right", "De gauche à droite", "Left to Right", "Left to Right", "从左向右"]),
+    ("Portrait", ["Portrait", "Portrait", "Portrait", "Portrait", "纵向"]),
+    ("Landscape", ["Landscape", "Paysage", "Landscape", "Landscape", "横向"]),
+    (
+        "Display All Blacks as Rich Black",
+        [
+            "Display All Blacks as Rich Black",
+            "Afficher tous les noirs en noir intense",
+            "Display All Blacks as Rich Black",
+            "Display All Blacks as Rich Black",
+            "所有黑色显示为浓黑",
+        ],
+    ),
+    (
+        "Display All Blacks Accurately",
+        [
+            "Display All Blacks Accurately",
+            "Afficher tous les noirs avec précision",
+            "Display All Blacks Accurately",
+            "Display All Blacks Accurately",
+            "准确显示所有黑色",
+        ],
+    ),
+    (
+        "Output All Blacks as Rich Black",
+        [
+            "Output All Blacks as Rich Black",
+            "Sortir tous les noirs en noir intense",
+            "Output All Blacks as Rich Black",
+            "Output All Blacks as Rich Black",
+            "所有黑色输出为浓黑",
+        ],
+    ),
+    (
+        "Output All Blacks Accurately",
+        [
+            "Output All Blacks Accurately",
+            "Sortir tous les noirs avec précision",
+            "Output All Blacks Accurately",
+            "Output All Blacks Accurately",
+            "准确输出所有黑色",
+        ],
+    ),
+    ("Top Margin", ["Top Margin", "Marge supérieure", "Top Margin", "Top Margin", "上边距"]),
+    ("Top of Page", ["Top of Page", "Haut de la page", "Top of Page", "Top of Page", "页面顶部"]),
+    (
+        "Paragraph Styles panel",
+        ["Paragraph Styles panel", "Panneau Styles de paragraphe", "Paragraph Styles panel", "Paragraph Styles panel", "段落样式面板"],
+    ),
+    (
+        "Character Styles panel",
+        ["Character Styles panel", "Panneau Styles de caractère", "Character Styles panel", "Character Styles panel", "字符样式面板"],
+    ),
+    ("Create new style", ["Create new style", "Créer un style", "Create new style", "Create new style", "创建新样式"]),
+    ("Clear overrides", ["Clear overrides", "Effacer les remplacements", "Clear overrides", "Clear overrides", "清除覆盖"]),
+    ("Apply", ["Apply", "Appliquer", "Apply", "Apply", "应用"]),
+    ("Accept", ["Accept", "Accepter", "Accept", "Accept", "接受"]),
+    ("Reject", ["Reject", "Refuser", "Reject", "Reject", "拒绝"]),
+    ("Add Selection", ["Add Selection", "Ajouter la sélection", "Add Selection", "Add Selection", "添加所选内容"]),
+    ("Align Stroke:", ["Align Stroke:", "Aligner le contour :", "Align Stroke:", "Align Stroke:", "描边对齐："]),
+    ("Angle", ["Angle", "Angle", "Angle", "Angle", "角度"]),
+    ("Angle:", ["Angle:", "Angle :", "Angle:", "Angle:", "角度："]),
+    ("Baseline", ["Baseline", "Ligne de base", "Baseline", "Baseline", "基线"]),
+    ("Cap:", ["Cap:", "Extrémité :", "Cap:", "Cap:", "端点："]),
+    ("Cell Text", ["Cell Text", "Texte de la cellule", "Cell Text", "Cell Text", "单元格文本"]),
+    ("Cell Type", ["Cell Type", "Type de cellule", "Cell Type", "Cell Type", "单元格类型"]),
+    ("Composer", ["Composer", "Compositeur", "Composer", "Composer", "排版器"]),
+    ("Convert to Text", ["Convert to Text", "Convertir en texte", "Convert to Text", "Convert to Text", "转换为文本"]),
+    ("Create New Layer", ["Create New Layer", "Créer un calque", "Create New Layer", "Create New Layer", "创建新图层"]),
+    ("Delete DTD", ["Delete DTD", "Supprimer la DTD", "Delete DTD", "Delete DTD", "删除 DTD"]),
+    ("Digits", ["Digits", "Chiffres", "Digits", "Digits", "数字"]),
+    ("Direction", ["Direction", "Direction", "Direction", "Direction", "方向"]),
+    ("Distance", ["Distance", "Distance", "Distance", "Distance", "距离"]),
+    ("Distribute ↔", ["Distribute ↔", "Répartir ↔", "Distribute ↔", "Distribute ↔", "水平分布"]),
+    ("Distribute ↕", ["Distribute ↕", "Répartir ↕", "Distribute ↕", "Distribute ↕", "垂直分布"]),
+    ("Effects: Drop Shadow", ["Effects: Drop Shadow", "Effets : ombre portée", "Effects: Drop Shadow", "Effects: Drop Shadow", "效果：投影"]),
+    ("Favorites", ["Favorites", "Favoris", "Favorites", "Favorites", "收藏"]),
+    ("First Spread", ["First Spread", "Première planche", "First Spread", "First Spread", "第一个跨页"]),
+    ("Gap Color:", ["Gap Color:", "Couleur de l'espace :", "Gap Color:", "Gap Color:", "间隙颜色："]),
+    ("Graphic…", ["Graphic…", "Graphique…", "Graphic…", "Graphic…", "图形…"]),
+    ("Home", ["Home", "Accueil", "Home", "Home", "主页"]),
+    ("Join:", ["Join:", "Sommet :", "Join:", "Join:", "连接："]),
+    ("Language", ["Sprache", "Langue", "Idioma", "言語", "语言"]),
+    ("Last Spread", ["Last Spread", "Dernière planche", "Last Spread", "Last Spread", "最后一个跨页"]),
+    ("Load DTD…", ["Load DTD…", "Charger la DTD…", "Load DTD…", "Load DTD…", "载入 DTD…"]),
+    ("Location:", ["Location:", "Emplacement :", "Location:", "Location:", "位置："]),
+    (
+        "Lock Column Guides",
+        ["Spaltenhilfslinien sperren", "Verrouiller les repères de colonne", "Bloquear guías de columna", "列ガイドをロック", "锁定栏参考线"],
+    ),
+    ("Lock Guides", ["Lock Guides", "Verrouiller les repères", "Lock Guides", "Lock Guides", "锁定参考线"]),
+    ("Miter Limit:", ["Miter Limit:", "Limite de pointe :", "Miter Limit:", "Miter Limit:", "斜接限制："]),
+    (
+        "New Article from Selection",
+        [
+            "New Article from Selection",
+            "Nouvel article à partir de la sélection",
+            "New Article from Selection",
+            "New Article from Selection",
+            "从所选内容新建文章",
+        ],
+    ),
+    ("New Note at Cursor", ["New Note at Cursor", "Nouvelle note au curseur", "New Note at Cursor", "New Note at Cursor", "在光标处新建附注"]),
+    ("New Swatch", ["New Swatch", "Nouvelle nuance", "New Swatch", "New Swatch", "新建色板"]),
+    ("New condition name", ["New condition name", "Nom de la nouvelle condition", "New condition name", "New condition name", "新条件名称"]),
+    ("New group…", ["New group…", "Nouveau groupe…", "New group…", "New group…", "新建组…"]),
+    ("New tag", ["New tag", "Nouvelle balise", "New tag", "New tag", "新建标签"]),
+    ("Next Spread", ["Next Spread", "Planche suivante", "Next Spread", "Next Spread", "下一个跨页"]),
+    ("Note text", ["Note text", "Texte de la note", "Note text", "Note text", "附注文本"]),
+    ("Offset", ["Offset", "Décalage", "Offset", "Offset", "偏移"]),
+    ("Offsets", ["Offsets", "Décalages", "Offsets", "Offsets", "偏移量"]),
+    ("Paragraph alignment", ["Paragraph alignment", "Alignement du paragraphe", "Paragraph alignment", "Paragraph alignment", "段落对齐"]),
+    ("Previous Spread", ["Previous Spread", "Planche précédente", "Previous Spread", "Previous Spread", "上一个跨页"]),
+    ("Release to Objects", ["Release to Objects", "Libérer en objets", "Release to Objects", "Release to Objects", "释放为对象"]),
+    ("Remove", ["Remove", "Retirer", "Remove", "Remove", "移除"]),
+    (
+        "Rotate 90° Counterclockwise",
+        [
+            "Rotate 90° Counterclockwise",
+            "Rotation de 90° dans le sens antihoraire",
+            "Rotate 90° Counterclockwise",
+            "Rotate 90° Counterclockwise",
+            "逆时针旋转 90°",
+        ],
+    ),
+    ("Rotate 180°", ["180° drehen", "Rotation à 180°", "Girar 180°", "180°回転", "旋转 180°"]),
+    ("Rotation Angle", ["Rotation Angle", "Angle de rotation", "Rotation Angle", "Rotation Angle", "旋转角度"]),
+    ("Rows", ["Rows", "Lignes", "Rows", "Rows", "行数"]),
+    ("Run", ["Run", "Exécuter", "Run", "Run", "运行"]),
+    ("Scale X Percentage", ["Scale X Percentage", "Échelle X en pourcentage", "Scale X Percentage", "Scale X Percentage", "水平缩放百分比"]),
+    ("Scale Y Percentage", ["Scale Y Percentage", "Échelle Y en pourcentage", "Scale Y Percentage", "Scale Y Percentage", "垂直缩放百分比"]),
+    ("Search commands", ["Befehle suchen", "Rechercher des commandes", "Buscar comandos", "Search commands", "搜索命令"]),
+    (
+        "No matching commands",
+        ["Keine passenden Befehle", "Aucune commande correspondante", "Ningún comando coincide", "一致するコマンドはありません", "没有匹配的命令"],
+    ),
+    ("Search fonts", ["Search fonts", "Rechercher des polices", "Search fonts", "Search fonts", "搜索字体"]),
+    (
+        "Search styles and commands…",
+        [
+            "Search styles and commands…",
+            "Rechercher des styles et des commandes…",
+            "Search styles and commands…",
+            "Search styles and commands…",
+            "搜索样式和命令…",
+        ],
+    ),
+    (
+        "Search: character or U+code",
+        [
+            "Search: character or U+code",
+            "Rechercher : caractère ou code U+",
+            "Search: character or U+code",
+            "Search: character or U+code",
+            "搜索字符或 U+ 编码",
+        ],
+    ),
+    ("Share", ["Share", "Partager", "Share", "Share", "分享"]),
+    ("Shear X Angle", ["Shear X Angle", "Angle de déformation X", "Shear X Angle", "Shear X Angle", "水平倾斜角度"]),
+    ("Show Baseline Grid", ["Show Baseline Grid", "Afficher la grille de ligne de base", "Show Baseline Grid", "Show Baseline Grid", "显示基线网格"]),
+    ("Show Document Grid", ["Show Document Grid", "Afficher la grille du document", "Show Document Grid", "Show Document Grid", "显示文档网格"]),
+    ("Show Guides", ["Show Guides", "Afficher les repères", "Show Guides", "Show Guides", "显示参考线"]),
+    ("Stop Color:", ["Stop Color:", "Couleur d'arrêt :", "Stop Color:", "Stop Color:", "停止点颜色："]),
+    ("Style", ["Style", "Style", "Style", "Style", "样式"]),
+    ("Styles panel", ["Styles panel", "Panneau Styles", "Styles panel", "Styles panel", "样式面板"]),
+    ("Text", ["Text", "Texte", "Text", "Text", "文本"]),
+    (
+        "The structure is valid.",
+        ["The structure is valid.", "La structure est valide.", "The structure is valid.", "The structure is valid.", "结构有效。"],
+    ),
+    ("Toggle double column", ["Toggle double column", "Basculer en double colonne", "Toggle double column", "Toggle double column", "切换双列布局"]),
+    ("Tracking", ["Tracking", "Approche", "Tracking", "Tracking", "字距调整"]),
+    ("Untag Selection", ["Untag Selection", "Retirer la balise de la sélection", "Untag Selection", "Untag Selection", "移除所选内容的标签"]),
+    ("Validate", ["Validate", "Valider", "Validate", "Validate", "验证"]),
+    ("Weight", ["Weight", "Épaisseur", "Weight", "Weight", "粗细"]),
+    ("Subtract", ["Subtract", "Soustraire", "Subtract", "Subtract", "减去"]),
+    ("Intersect", ["Intersect", "Intersection", "Intersect", "Intersect", "交集"]),
+    ("Exclude Overlap", ["Exclude Overlap", "Exclure le chevauchement", "Exclude Overlap", "Exclude Overlap", "排除重叠"]),
+    ("Minus Back", ["Minus Back", "Soustraire l'arrière", "Minus Back", "Minus Back", "减去后方对象"]),
+    ("Align left edges", ["Align left edges", "Aligner les bords gauches", "Align left edges", "Align left edges", "左边缘对齐"]),
+    (
+        "Align horizontal centers",
+        ["Align horizontal centers", "Aligner les centres horizontaux", "Align horizontal centers", "Align horizontal centers", "水平居中对齐"],
+    ),
+    ("Align right edges", ["Align right edges", "Aligner les bords droits", "Align right edges", "Align right edges", "右边缘对齐"]),
+    ("Align top edges", ["Align top edges", "Aligner les bords supérieurs", "Align top edges", "Align top edges", "顶边缘对齐"]),
+    (
+        "Align vertical centers",
+        ["Align vertical centers", "Aligner les centres verticaux", "Align vertical centers", "Align vertical centers", "垂直居中对齐"],
+    ),
+    ("Align bottom edges", ["Align bottom edges", "Aligner les bords inférieurs", "Align bottom edges", "Align bottom edges", "底边缘对齐"]),
+    ("Align to Selection", ["Align to Selection", "Aligner sur la sélection", "Align to Selection", "Align to Selection", "对齐到所选对象"]),
+    ("Align to Key Object", ["Align to Key Object", "Aligner sur l'objet clé", "Align to Key Object", "Align to Key Object", "对齐到关键对象"]),
+    ("Align to Margins", ["Align to Margins", "Aligner sur les marges", "Align to Margins", "Align to Margins", "对齐到边距"]),
+    ("Align to Page", ["Align to Page", "Aligner sur la page", "Align to Page", "Align to Page", "对齐到页面"]),
+    ("Align to Spread", ["Align to Spread", "Aligner sur la planche", "Align to Spread", "Align to Spread", "对齐到跨页"]),
+    ("No Text Wrap", ["No Text Wrap", "Sans habillage", "No Text Wrap", "No Text Wrap", "无文本绕排"]),
+    (
+        "Wrap Around Bounding Box",
+        ["Wrap Around Bounding Box", "Habiller le cadre de sélection", "Wrap Around Bounding Box", "Wrap Around Bounding Box", "绕排定界框"],
+    ),
+    (
+        "Wrap Around Object Shape",
+        ["Wrap Around Object Shape", "Habiller la forme de l'objet", "Wrap Around Object Shape", "Wrap Around Object Shape", "绕排对象形状"],
+    ),
+    ("Jump Object", ["Jump Object", "Sauter l'objet", "Jump Object", "Jump Object", "跳过对象"]),
+    ("Jump to Next Column", ["Jump to Next Column", "Sauter à la colonne suivante", "Jump to Next Column", "Jump to Next Column", "跳至下一栏"]),
+    ("Bulleted List", ["Bulleted List", "Liste à puces", "Bulleted List", "Bulleted List", "项目符号列表"]),
+    ("Numbered List", ["Numbered List", "Liste numérotée", "Numbered List", "Numbered List", "编号列表"]),
+    ("UPPERCASE", ["UPPERCASE", "MAJUSCULES", "UPPERCASE", "UPPERCASE", "大写"]),
+    ("Small Caps", ["Small Caps", "Petites capitales", "Small Caps", "Small Caps", "小型大写字母"]),
+    ("Normal", ["Normal", "Normal", "Normal", "Normal", "正常"]),
+    ("Butt", ["Butt", "Aboutée", "Butt", "Butt", "平头"]),
+    ("Round", ["Round", "Arrondie", "Round", "Round", "圆形"]),
+    ("Projecting", ["Projecting", "Projetée", "Projecting", "Projecting", "突出"]),
+    ("Miter", ["Miter", "En pointe", "Miter", "Miter", "斜接"]),
+    ("Bevel", ["Bevel", "Biseau", "Bevel", "Bevel", "斜角"]),
+    ("Center", ["Center", "Centre", "Center", "Center", "居中"]),
+    ("Start/End:", ["Start/End:", "Début/Fin :", "Start/End:", "Start/End:", "起点/终点："]),
+    ("Left", ["Left", "Gauche", "Left", "Left", "左"]),
+    ("Right", ["Right", "Droite", "Right", "Right", "右"]),
+    ("First", ["First", "Premier", "First", "First", "首行"]),
+    ("Last", ["Last", "Dernier", "Last", "Last", "末行"]),
+    ("Before", ["Before", "Avant", "Before", "Before", "段前"]),
+    ("After", ["After", "Après", "After", "After", "段后"]),
+    ("Shading", ["Shading", "Tramage", "Shading", "Shading", "底纹"]),
+    ("Border", ["Border", "Bordure", "Border", "Border", "边框"]),
+    ("Overprint Fill", ["Overprint Fill", "Surimpression du fond", "Overprint Fill", "Overprint Fill", "叠印填色"]),
+    ("Overprint Stroke", ["Overprint Stroke", "Surimpression du contour", "Overprint Stroke", "Overprint Stroke", "叠印描边"]),
+    ("Overprint Gap", ["Overprint Gap", "Surimpression de l'espace", "Overprint Gap", "Overprint Gap", "叠印间隙"]),
+    ("Nonprinting", ["Nonprinting", "Non imprimable", "Nonprinting", "Nonprinting", "非打印"]),
+    ("At Least", ["At Least", "Au moins", "At Least", "At Least", "至少"]),
+    ("Exactly", ["Exactly", "Exactement", "Exactly", "Exactly", "固定"]),
+    ("Justify", ["Justify", "Justifier", "Justify", "Justify", "两端对齐"]),
+    ("Underline Options", ["Underline Options", "Options de soulignement", "Underline Options", "Underline Options", "下划线选项"]),
+    ("Strikethrough Options", ["Strikethrough Options", "Options de barré", "Strikethrough Options", "Strikethrough Options", "删除线选项"]),
+    (
+        "Character Style Options",
+        ["Character Style Options", "Options de style de caractère", "Character Style Options", "Character Style Options", "字符样式选项"],
+    ),
+    (
+        "Advanced Character Formats",
+        ["Advanced Character Formats", "Formats de caractère avancés", "Advanced Character Formats", "Advanced Character Formats", "高级字符格式"],
+    ),
+    ("OpenType Features", ["OpenType Features", "Fonctions OpenType", "OpenType Features", "OpenType Features", "OpenType 功能"]),
+    ("Style Settings:", ["Style Settings:", "Paramètres du style :", "Style Settings:", "Style Settings:", "样式设置："]),
+    ("Kerning:", ["Kerning:", "Crénage :", "Kerning:", "Kerning:", "字偶间距："]),
+    ("Case:", ["Case:", "Casse :", "Case:", "Case:", "大小写："]),
+    (
+        "OpenType All Small Caps",
+        [
+            "OpenType All Small Caps",
+            "Tout en petites capitales OpenType",
+            "OpenType All Small Caps",
+            "OpenType All Small Caps",
+            "OpenType 全部小型大写字母",
+        ],
+    ),
+    ("Subscript", ["Subscript", "Indice", "Subscript", "Subscript", "下标"]),
+    ("OpenType Subscript", ["OpenType Subscript", "Indice OpenType", "OpenType Subscript", "OpenType Subscript", "OpenType 下标"]),
+    ("OpenType Numerator", ["OpenType Numerator", "Numérateur OpenType", "OpenType Numerator", "OpenType Numerator", "OpenType 分子"]),
+    ("OpenType Denominator", ["OpenType Denominator", "Dénominateur OpenType", "OpenType Denominator", "OpenType Denominator", "OpenType 分母"]),
+    ("Ligatures", ["Ligatures", "Ligatures", "Ligatures", "Ligatures", "连字"]),
+    ("No Break", ["No Break", "Sans retour automatique", "No Break", "No Break", "不换行"]),
+    ("Horizontal Scale:", ["Horizontal Scale:", "Échelle horizontale :", "Horizontal Scale:", "Horizontal Scale:", "水平缩放："]),
+    ("Vertical Scale:", ["Vertical Scale:", "Échelle verticale :", "Vertical Scale:", "Vertical Scale:", "垂直缩放："]),
+    ("Baseline Shift:", ["Baseline Shift:", "Décalage vertical :", "Baseline Shift:", "Baseline Shift:", "基线偏移："]),
+    ("Skew:", ["Skew:", "Inclinaison :", "Skew:", "Skew:", "倾斜："]),
+    ("Language:", ["Language:", "Langue :", "Language:", "Language:", "语言："]),
+    ("Digits:", ["Ziffern:", "Chiffres :", "Dígitos:", "数字：", "数字："]),
+    ("Figure Style:", ["Figure Style:", "Style de chiffres :", "Figure Style:", "Figure Style:", "数字样式："]),
+    ("Underline On", ["Underline On", "Souligné activé", "Underline On", "Underline On", "启用下划线"]),
+    ("Strikethrough On", ["Strikethrough On", "Barré activé", "Strikethrough On", "Strikethrough On", "启用删除线"]),
+    ("Edit \"{name}\"…", ["„{name}“ bearbeiten…", "Modifier « {name} »…", "Editar \"{name}\"…", "\"{name}\" を編集…", "编辑\"{name}\"…"]),
+    (
+        "Discretionary Ligatures",
+        ["Discretionary Ligatures", "Ligatures conditionnelles", "Discretionary Ligatures", "Discretionary Ligatures", "自由连字"],
+    ),
+    ("Fractions", ["Fractions", "Fractions", "Fractions", "Fractions", "分数"]),
+    ("Ordinal", ["Ordinal", "Ordinaux", "Ordinal", "Ordinal", "序数"]),
+    ("Swash", ["Swash", "Lettres italiques ornées", "Swash", "Swash", "花体"]),
+    ("Titling Alternates", ["Titling Alternates", "Variantes de titrage", "Titling Alternates", "Titling Alternates", "标题替代字形"]),
+    (
+        "Contextual Alternates",
+        ["Contextual Alternates", "Variantes contextuelles", "Contextual Alternates", "Contextual Alternates", "上下文替代字形"],
+    ),
+    ("Slashed Zero", ["Slashed Zero", "Zéro barré", "Slashed Zero", "Slashed Zero", "斜线零"]),
+    ("Tabular Lining", ["Tabular Lining", "Chiffres alignés tabulaires", "Tabular Lining", "Tabular Lining", "等宽齐线数字"]),
+    (
+        "Proportional Oldstyle",
+        ["Proportional Oldstyle", "Chiffres elzéviriens proportionnels", "Proportional Oldstyle", "Proportional Oldstyle", "比例旧式数字"],
+    ),
+    ("Proportional Lining", ["Proportional Lining", "Chiffres alignés proportionnels", "Proportional Lining", "Proportional Lining", "比例齐线数字"]),
+    ("Tabular Oldstyle", ["Tabular Oldstyle", "Chiffres elzéviriens tabulaires", "Tabular Oldstyle", "Tabular Oldstyle", "等宽旧式数字"]),
+    (
+        "Default Figure Style",
+        ["Default Figure Style", "Style de chiffres par défaut", "Default Figure Style", "Default Figure Style", "默认数字样式"],
+    ),
+    ("Not a button", ["Not a button", "Pas un bouton", "Not a button", "Not a button", "非按钮"]),
+    ("Go To Next Page", ["Go To Next Page", "Atteindre la page suivante", "Go To Next Page", "Go To Next Page", "转到下一页"]),
+    ("Go To Previous Page", ["Go To Previous Page", "Atteindre la page précédente", "Go To Previous Page", "Go To Previous Page", "转到上一页"]),
+    ("Go To First Page", ["Go To First Page", "Atteindre la première page", "Go To First Page", "Go To First Page", "转到第一页"]),
+    ("Go To Last Page", ["Go To Last Page", "Atteindre la dernière page", "Go To Last Page", "Go To Last Page", "转到最后一页"]),
+    ("Go To Page", ["Go To Page", "Atteindre la page", "Go To Page", "Go To Page", "转到页面"]),
+    ("Go To URL", ["Go To URL", "Atteindre l'URL", "Go To URL", "Go To URL", "转到网址"]),
+    ("Not a form field", ["Not a form field", "Pas un champ de formulaire", "Not a form field", "Not a form field", "非表单域"]),
+    ("Text Field", ["Text Field", "Champ de texte", "Text Field", "Text Field", "文本域"]),
+    ("Check Box", ["Check Box", "Case à cocher", "Check Box", "Check Box", "复选框"]),
+    ("Radio Button", ["Radio Button", "Bouton radio", "Radio Button", "Radio Button", "单选按钮"]),
+    ("Combo Box", ["Combo Box", "Liste déroulante", "Combo Box", "Combo Box", "组合框"]),
+    ("List Box", ["List Box", "Zone de liste", "List Box", "List Box", "列表框"]),
+    ("Signature", ["Signature", "Signature", "Signature", "Signature", "签名"]),
+    ("Resize width", ["Resize width", "Redimensionner la largeur", "Resize width", "Resize width", "调整宽度"]),
+    ("Resize height", ["Resize height", "Redimensionner la hauteur", "Resize height", "Resize height", "调整高度"]),
+    ("Pin top", ["Pin top", "Épingler en haut", "Pin top", "Pin top", "固定顶部"]),
+    ("Pin bottom", ["Pin bottom", "Épingler en bas", "Pin bottom", "Pin bottom", "固定底部"]),
+    ("Pin left", ["Pin left", "Épingler à gauche", "Pin left", "Pin left", "固定左侧"]),
+    ("Pin right", ["Pin right", "Épingler à droite", "Pin right", "Pin right", "固定右侧"]),
+    ("Inward", ["Inward", "Vers l'intérieur", "Inward", "Inward", "向内"]),
+    ("Metrics", ["Metrics", "Métrique", "Metrics", "Metrics", "度量"]),
+    ("Optical", ["Optical", "Optique", "Optical", "Optical", "视觉"]),
+    (
+        "Optical Margin Alignment",
+        ["Optischer Randausgleich", "Marges optiques", "Alineación de márgenes ópticos", "オプティカルマージン揃え", "视觉边距对齐"],
+    ),
+    ("Applies to fill", ["Applies to fill", "S'applique au fond", "Applies to fill", "Applies to fill", "应用于填色"]),
+    ("Applies to text", ["Applies to text", "S'applique au texte", "Applies to text", "Applies to text", "应用于文本"]),
+    ("Gray", ["Gray", "Gris", "Gray", "Gray", "灰度"]),
+    ("Linear", ["Linear", "Linéaire", "Linear", "Linear", "线性"]),
+    ("Radial", ["Radial", "Radial", "Radial", "Radial", "径向"]),
+    ("Arabic", ["Arabic", "Arabe", "Arabic", "Arabic", "阿拉伯语"]),
+    ("Kanji", ["Kanji", "Kanji", "Kanji", "漢数字", "汉字数字"]),
+    ("Beveled Rectangle", ["Beveled Rectangle", "Rectangle biseauté", "Beveled Rectangle", "Beveled Rectangle", "斜角矩形"]),
+    ("Chinese", ["Chinese", "Chinois", "Chinese", "Chinese", "中文"]),
+    (
+        "Constrain proportions for width and height",
+        [
+            "Constrain proportions for width and height",
+            "Conserver les proportions de la largeur et de la hauteur",
+            "Constrain proportions for width and height",
+            "Constrain proportions for width and height",
+            "约束宽高比例",
+        ],
+    ),
+    ("Corner", ["Corner", "Angles", "Corner", "Corner", "角"]),
+    ("Custom", ["Custom", "Personnalisé", "Custom", "Custom", "自定义"]),
+    ("Czech", ["Czech", "Tchèque", "Czech", "Czech", "捷克语"]),
+    ("Danish", ["Danish", "Danois", "Danish", "Danish", "丹麦语"]),
+    ("Dashed", ["Dashed", "Tirets", "Dashed", "Dashed", "虚线"]),
+    ("Dotted", ["Dotted", "Pointillé", "Dotted", "Dotted", "点线"]),
+    (
+        "Dutch: 2005 Reform",
+        ["Dutch: 2005 Reform", "Néerlandais : réforme de 2005", "Dutch: 2005 Reform", "Dutch: 2005 Reform", "荷兰语：2005 年拼写改革"],
+    ),
+    ("Embedded", ["Embedded", "Incorporé", "Embedded", "Embedded", "已嵌入"]),
+    ("English: Canadian", ["English: Canadian", "Anglais : Canada", "English: Canadian", "English: Canadian", "英语：加拿大"]),
+    ("English: UK", ["English: UK", "Anglais : Royaume-Uni", "English: UK", "English: UK", "英语：英国"]),
+    ("English: USA", ["English: USA", "Anglais : États-Unis", "English: USA", "English: USA", "英语：美国"]),
+    ("Farsi", ["Farsi", "Persan", "Farsi", "Farsi", "波斯语"]),
+    ("Finnish", ["Finnish", "Finnois", "Finnish", "Finnish", "芬兰语"]),
+    (
+        "Fit Frame to Content",
+        ["Fit Frame to Content", "Ajuster le bloc au contenu", "Fit Frame to Content", "Fit Frame to Content", "使框架适合内容"],
+    ),
+    ("French", ["French", "Français", "French", "French", "法语"]),
+    ("French: Canadian", ["French: Canadian", "Français : Canada", "French: Canadian", "French: Canadian", "法语：加拿大"]),
+    (
+        "German: 2006 Reform",
+        ["German: 2006 Reform", "Allemand : réforme de 2006", "German: 2006 Reform", "German: 2006 Reform", "德语：2006 年拼写改革"],
+    ),
+    (
+        "German: Swiss 2006 Reform",
+        [
+            "German: Swiss 2006 Reform",
+            "Allemand : réforme suisse 2006",
+            "German: Swiss 2006 Reform",
+            "German: Swiss 2006 Reform",
+            "德语：瑞士 2006 年拼写改革",
+        ],
+    ),
+    ("Greek", ["Greek", "Grec", "Greek", "Greek", "希腊语"]),
+    ("Hebrew", ["Hebrew", "Hébreu", "Hebrew", "Hebrew", "希伯来语"]),
+    ("Hindi", ["Hindi", "Hindi", "Hindi", "Hindi", "印地语"]),
+    ("Hungarian", ["Hungarian", "Hongrois", "Hungarian", "Hungarian", "匈牙利语"]),
+    (
+        "Inverse Rounded Rectangle",
+        ["Inverse Rounded Rectangle", "Rectangle arrondi inversé", "Inverse Rounded Rectangle", "Inverse Rounded Rectangle", "内凹圆角矩形"],
+    ),
+    ("Italian", ["Italian", "Italien", "Italian", "Italian", "意大利语"]),
+    ("Japanese", ["Japanese", "Japonais", "Japanese", "Japanese", "日语"]),
+    ("Korean", ["Korean", "Coréen", "Korean", "Korean", "韩语"]),
+    (
+        "Make all settings the same",
+        [
+            "Make all settings the same",
+            "Rendre tous les réglages identiques",
+            "Make all settings the same",
+            "Make all settings the same",
+            "统一所有设置",
+        ],
+    ),
+    ("Native", ["Native", "Natif", "Native", "Native", "本地数字"]),
+    ("Norwegian: Bokmål", ["Norwegian: Bokmål", "Norvégien : bokmål", "Norwegian: Bokmål", "Norwegian: Bokmål", "挪威语：书面语"]),
+    ("Orthogonal Line", ["Orthogonal Line", "Trait orthogonal", "Orthogonal Line", "Orthogonal Line", "正交线"]),
+    ("Polish", ["Polish", "Polonais", "Polish", "Polish", "波兰语"]),
+    ("Portuguese", ["Portuguese", "Portugais", "Portuguese", "Portuguese", "葡萄牙语"]),
+    ("Portuguese: Brazilian", ["Portuguese: Brazilian", "Portugais : Brésil", "Portuguese: Brazilian", "Portuguese: Brazilian", "葡萄牙语：巴西"]),
+    ("Rounded Rectangle", ["Rounded Rectangle", "Rectangle arrondi", "Rounded Rectangle", "Rounded Rectangle", "圆角矩形"]),
+    ("Russian", ["Russian", "Russe", "Russian", "Russian", "俄语"]),
+    ("Solid", ["Solid", "Continu", "Solid", "Solid", "实线"]),
+    ("Spanish", ["Spanish", "Espagnol", "Spanish", "Spanish", "西班牙语"]),
+    ("Story Editor", ["Story Editor", "Mode éditeur", "Story Editor", "Story Editor", "文章编辑器"]),
+    ("Swedish", ["Swedish", "Suédois", "Swedish", "Swedish", "瑞典语"]),
+    ("Thick - Thick", ["Thick - Thick", "Épais - épais", "Thick - Thick", "Thick - Thick", "粗线－粗线"]),
+    ("Thick - Thin", ["Thick - Thin", "Épais - fin", "Thick - Thin", "Thick - Thin", "粗线－细线"]),
+    ("Thin - Thick", ["Thin - Thick", "Fin - épais", "Thin - Thick", "Thin - Thick", "细线－粗线"]),
+    ("Thin - Thin", ["Thin - Thin", "Fin - fin", "Thin - Thin", "Thin - Thin", "细线－细线"]),
+    ("Thin - Thick - Thin", ["Thin - Thick - Thin", "Fin - épais - fin", "Thin - Thick - Thin", "Thin - Thick - Thin", "细线－粗线－细线"]),
+    ("Thick - Thin - Thick", ["Thick - Thin - Thick", "Épais - fin - épais", "Thick - Thin - Thick", "Thick - Thin - Thick", "粗线－细线－粗线"]),
+    ("Wavy", ["Wavy", "Ondulé", "Wavy", "Wavy", "波浪线"]),
+    ("Straight Hash", ["Straight Hash", "Hachures droites", "Straight Hash", "Straight Hash", "直斜线"]),
+    ("Stripes", ["Stripes", "Rayures", "Stripes", "Stripes", "条纹"]),
+    ("Triangle", ["Triangle", "Triangle", "Triangle", "Triangle", "三角形"]),
+    ("Turkish", ["Turkish", "Turc", "Turkish", "Turkish", "土耳其语"]),
+    ("Ukrainian", ["Ukrainian", "Ukrainien", "Ukrainian", "Ukrainian", "乌克兰语"]),
+    ("Cell Style", ["Cell Style", "Style de cellule", "Cell Style", "Cell Style", "单元格样式"]),
+    ("Table Style", ["Table Style", "Style de tableau", "Table Style", "Table Style", "表样式"]),
+    ("Col ←", ["Col ←", "Col. ←", "Col ←", "Col ←", "左侧插入列"]),
+    ("Col →", ["Col →", "Col. →", "Col →", "Col →", "右侧插入列"]),
+    ("Row ↑", ["Row ↑", "Ligne ↑", "Row ↑", "Row ↑", "上方插入行"]),
+    ("Row ↓", ["Row ↓", "Ligne ↓", "Row ↓", "Row ↓", "下方插入行"]),
+    ("Hide Others", ["Hide Others", "Masquer les autres", "Hide Others", "Hide Others", "隐藏其他图层"]),
+    ("Lock Others", ["Lock Others", "Verrouiller les autres", "Lock Others", "Lock Others", "锁定其他图层"]),
+    ("Show All Layers", ["Show All Layers", "Afficher tous les calques", "Show All Layers", "Show All Layers", "显示所有图层"]),
+    ("Unlock", ["Unlock", "Déverrouiller", "Unlock", "Unlock", "解锁"]),
+    ("Unlock All Layers", ["Unlock All Layers", "Déverrouiller tous les calques", "Unlock All Layers", "Unlock All Layers", "解锁所有图层"]),
+    ("Added", ["Added", "Ajouté", "Added", "Added", "已添加"]),
+    ("Deleted", ["Deleted", "Supprimé", "Deleted", "Deleted", "已删除"]),
+    ("Guide-based", ["Guide-based", "Basé sur les repères", "Guide-based", "Guide-based", "基于参考线"]),
+    ("Object-Based", ["Object-Based", "Basé sur les objets", "Object-Based", "Object-Based", "基于对象"]),
+    ("Guide-Based", ["Guide-Based", "Basé sur les repères", "Guide-Based", "Guide-Based", "基于参考线"]),
+    ("Page:", ["Seite:", "Page :", "Página:", "ページ:", "页面："]),
+    ("Content:", ["Inhalt:", "Contenu :", "Contenido:", "コンテンツ:", "内容："]),
+    ("Object Constraints:", ["Objektbeschränkungen:", "Contraintes d’objet :", "Restricciones de objeto:", "オブジェクトの制約:", "对象约束："]),
+    (
+        "Resize with Page:",
+        ["Mit Seite skalieren:", "Redimensionner avec la page :", "Cambiar tamaño con la página:", "ページと共にサイズ変更:", "随页面调整大小："],
+    ),
+    ("Pin:", ["Fixieren:", "Épingler :", "Fijar:", "固定:", "固定："]),
+    ("Resize Page", ["Seitengröße ändern", "Redimensionner la page", "Cambiar tamaño de página", "ページのサイズを変更", "调整页面大小"]),
+    (
+        "Liquid Page Rule:",
+        ["Regel für flüssige Seiten:", "Règle de page liquide :", "Regla de página líquida:", "リキッドページルール:", "自适应页面规则："],
+    ),
+    (
+        "Show Parent Page Overlay",
+        [
+            "Überlagerung der übergeordneten Seite anzeigen",
+            "Afficher la superposition du gabarit",
+            "Mostrar superposición de página principal",
+            "親ページオーバーレイを表示",
+            "显示父页面叠加",
+        ],
+    ),
+    (
+        "Controlled by Parent",
+        ["Durch übergeordnete Seite gesteuert", "Contrôlé par le gabarit", "Controlado por principal", "親ページで制御", "由父页面控制"],
+    ),
+    ("US Business Card", ["US-Visitenkarte", "Carte de visite US", "Tarjeta de visita EE. UU.", "US 名刺", "美国名片"]),
+    (
+        "Object is pinned relative to the page edge. Click to release.",
+        [
+            "Das Objekt ist relativ zum Seitenrand fixiert. Zum Lösen klicken.",
+            "L’objet est épinglé par rapport au bord de la page. Cliquez pour le libérer.",
+            "El objeto está fijado respecto al borde de la página. Haga clic para soltarlo.",
+            "オブジェクトはページの端を基準に固定されています。クリックすると解除します。",
+            "对象已相对于页面边缘固定。单击可释放。",
+        ],
+    ),
+    (
+        "Click to pin the object relative to the page edge.",
+        [
+            "Klicken, um das Objekt relativ zum Seitenrand zu fixieren.",
+            "Cliquez pour épingler l’objet par rapport au bord de la page.",
+            "Haga clic para fijar el objeto respecto al borde de la página.",
+            "クリックすると、オブジェクトをページの端を基準に固定します。",
+            "单击可将对象相对于页面边缘固定。",
+        ],
+    ),
+    (
+        "The object changes width as the page changes width. Click to lock the object width.",
+        [
+            "Die Objektbreite ändert sich mit der Seitenbreite. Zum Sperren der Breite klicken.",
+            "La largeur de l’objet suit celle de la page. Cliquez pour verrouiller la largeur.",
+            "El ancho del objeto cambia con el de la página. Haga clic para bloquear el ancho.",
+            "オブジェクトの幅はページの幅に合わせて変わります。クリックすると幅をロックします。",
+            "对象宽度随页面宽度变化。单击可锁定对象宽度。",
+        ],
+    ),
+    (
+        "The object's width is locked. Click to let the object change width as the page changes width.",
+        [
+            "Die Objektbreite ist gesperrt. Klicken, damit sie sich mit der Seitenbreite ändert.",
+            "La largeur de l’objet est verrouillée. Cliquez pour qu’elle suive celle de la page.",
+            "El ancho del objeto está bloqueado. Haga clic para que cambie con el de la página.",
+            "オブジェクトの幅はロックされています。クリックすると、ページの幅に合わせて変わります。",
+            "对象宽度已锁定。单击可让其随页面宽度变化。",
+        ],
+    ),
+    (
+        "The object changes height as the page changes height. Click to lock the object height.",
+        [
+            "Die Objekthöhe ändert sich mit der Seitenhöhe. Zum Sperren der Höhe klicken.",
+            "La hauteur de l’objet suit celle de la page. Cliquez pour verrouiller la hauteur.",
+            "El alto del objeto cambia con el de la página. Haga clic para bloquear el alto.",
+            "オブジェクトの高さはページの高さに合わせて変わります。クリックすると高さをロックします。",
+            "对象高度随页面高度变化。单击可锁定对象高度。",
+        ],
+    ),
+    (
+        "The object's height is locked. Click to let the object change height as the page changes height.",
+        [
+            "Die Objekthöhe ist gesperrt. Klicken, damit sie sich mit der Seitenhöhe ändert.",
+            "La hauteur de l’objet est verrouillée. Cliquez pour qu’elle suive celle de la page.",
+            "El alto del objeto está bloqueado. Haga clic para que cambie con el de la página.",
+            "オブジェクトの高さはロックされています。クリックすると、ページの高さに合わせて変わります。",
+            "对象高度已锁定。单击可让其随页面高度变化。",
+        ],
+    ),
+    ("Loop", ["Loop", "Boucle", "Loop", "Loop", "循环播放"]),
+    ("Object-based", ["Object-based", "Basé sur les objets", "Object-based", "Object-based", "基于对象"]),
+    ("Off", ["Off", "Désactivé", "Off", "Off", "关闭"]),
+    ("Play on Page Load", ["Play on Page Load", "Lire au chargement de la page", "Play on Page Load", "Play on Page Load", "页面载入时播放"]),
+    ("Re-center", ["Re-center", "Recentrer", "Re-center", "Re-center", "重新居中"]),
+    ("Show Controls", ["Show Controls", "Afficher les commandes", "Show Controls", "Show Controls", "显示控件"]),
+    ("Signature Field", ["Signature Field", "Champ de signature", "Signature Field", "Signature Field", "签名域"]),
+    (
+        "Select text to apply a condition",
+        [
+            "Select text to apply a condition",
+            "Sélectionnez du texte pour appliquer une condition",
+            "Select text to apply a condition",
+            "Select text to apply a condition",
+            "选择文本以应用条件",
+        ],
+    ),
+    ("Blinds", ["Blinds", "Stores", "Blinds", "Blinds", "百叶窗"]),
+    ("Box", ["Box", "Boîte", "Box", "Box", "方框"]),
+    ("Comb", ["Comb", "Peigne", "Comb", "Comb", "梳状"]),
+    ("Cover", ["Cover", "Recouvrir", "Cover", "Cover", "覆盖"]),
+    ("Dissolve", ["Dissolve", "Dissolution", "Dissolve", "Dissolve", "溶解"]),
+    ("Fade", ["Fade", "Fondu", "Fade", "Fade", "淡入淡出"]),
+    ("Push", ["Push", "Pousser", "Push", "Push", "推入"]),
+    ("Split", ["Split", "Fractionner", "Split", "Split", "分割"]),
+    ("Uncover", ["Uncover", "Découvrir", "Uncover", "Uncover", "揭开"]),
+    ("Wipe", ["Wipe", "Balayage", "Wipe", "Wipe", "擦除"]),
+    ("Simple", ["Simple", "Simple", "Simple", "Simple", "简单"]),
+    ("Simple - Wide", ["Simple - Wide", "Simple - large", "Simple - Wide", "Simple - Wide", "简单－宽"]),
+    ("Triangle - Wide", ["Triangle - Wide", "Triangle - large", "Triangle - Wide", "Triangle - Wide", "三角形－宽"]),
+    ("Barbed", ["Barbed", "Barbelée", "Barbed", "Barbed", "倒钩"]),
+    ("Curved", ["Curved", "Courbe", "Curved", "Curved", "曲线"]),
+    ("Circle", ["Circle", "Cercle", "Circle", "Circle", "圆形"]),
+    ("Circle - Solid", ["Circle - Solid", "Cercle - plein", "Circle - Solid", "Circle - Solid", "实心圆"]),
+    ("Square", ["Square", "Carré", "Square", "Square", "正方形"]),
+    ("Square - Solid", ["Square - Solid", "Carré - plein", "Square - Solid", "Square - Solid", "实心正方形"]),
+    ("Bar", ["Bar", "Barre", "Bar", "Bar", "短线"]),
+    ("Fit Text", ["Fit Text", "Ajuster le texte", "Fit Text", "Fit Text", "适合文本"]),
+    ("Preview (W)", ["Preview (W)", "Aperçu (W)", "Preview (W)", "Preview (W)", "预览 (W)"]),
+    ("Normal (W)", ["Normal (W)", "Normal (W)", "Normal (W)", "Normal (W)", "正常 (W)"]),
+    ("objects", ["objects", "objets", "objects", "objects", "个对象"]),
+    ("pages", ["pages", "pages", "pages", "pages", "页"]),
+    ("stories", ["stories", "articles", "stories", "stories", "篇文章"]),
+    ("items", ["items", "éléments", "items", "items", "个项目"]),
+    ("warnings", ["warnings", "avertissements", "warnings", "warnings", "个警告"]),
+    ("Render", ["Render", "Rendu", "Render", "Render", "渲染"]),
+    ("Set", ["Set", "Jeu", "Set", "Set", "样式集"]),
+    ("unused", ["unused", "inutilisé", "unused", "unused", "未使用"]),
+    ("⚠ Missing", ["⚠ Missing", "⚠ Manquant", "⚠ Missing", "⚠ Missing", "⚠ 缺失"]),
+    ("▲ Modified", ["▲ Modified", "▲ Modifié", "▲ Modified", "▲ Modified", "▲ 已修改"]),
+    ("(Text Color)", ["(Text Color)", "(Couleur du texte)", "(Text Color)", "(Text Color)", "（文本颜色）"]),
+    (
+        "{count} glyphs — click to insert at the text cursor",
+        [
+            "{count} glyphs — click to insert at the text cursor",
+            "{count} glyphes : cliquez pour insérer à l'emplacement du curseur",
+            "{count} glyphs — click to insert at the text cursor",
+            "{count} glyphs — click to insert at the text cursor",
+            "{count} 个字形 — 单击插入到文本光标处",
+        ],
+    ),
+    (
+        "{pages} Pages in {spreads} Spreads",
+        [
+            "{pages} Pages in {spreads} Spreads",
+            "{pages} pages sur {spreads} planches",
+            "{pages} Pages in {spreads} Spreads",
+            "{pages} Pages in {spreads} Spreads",
+            "共 {pages} 页，{spreads} 个跨页",
+        ],
+    ),
+    (" (auto)", [" (auto)", " (auto)", " (auto)", " (auto)", "（自动）"]),
+    (
+        "Absolute Numbering (instead of Section Numbering)",
+        [
+            "Absolute Numbering (instead of Section Numbering)",
+            "Numérotation absolue (au lieu de la numérotation par section)",
+            "Absolute Numbering (instead of Section Numbering)",
+            "Absolute Numbering (instead of Section Numbering)",
+            "绝对页码（而非章节页码）",
+        ],
+    ),
+    (
+        "Add and remove pages as the primary text frame's story grows and shrinks",
+        [
+            "Add and remove pages as the primary text frame's story grows and shrinks",
+            "Ajouter et supprimer des pages à mesure que l'article du bloc de texte principal s'allonge ou se raccourcit",
+            "Add and remove pages as the primary text frame's story grows and shrinks",
+            "Add and remove pages as the primary text frame's story grows and shrinks",
+            "随主文本框架内容增减自动添加或删除页面",
+        ],
+    ),
+    (
+        "Added Text (highlighted)",
+        ["Added Text (highlighted)", "Texte ajouté (surligné)", "Added Text (highlighted)", "Added Text (highlighted)", "新增文本（高亮）"],
+    ),
+    (
+        "Adjust Layout (objects follow the new page size)",
+        [
+            "Adjust Layout (objects follow the new page size)",
+            "Ajuster la mise en page (les objets suivent le nouveau format de page)",
+            "Adjust Layout (objects follow the new page size)",
+            "Adjust Layout (objects follow the new page size)",
+            "调整版面（对象随页面尺寸调整）",
+        ],
+    ),
+    ("Auto-Fit", ["Auto-Fit", "Ajustement automatique", "Auto-Fit", "Auto-Fit", "自动适合"]),
+    ("Case sensitive", ["Case sensitive", "Respecter la casse", "Case sensitive", "Case sensitive", "区分大小写"]),
+    (
+        "Custom Tracking/Kerning",
+        [
+            "Custom Tracking/Kerning",
+            "Approche/crénage personnalisés",
+            "Custom Tracking/Kerning",
+            "Custom Tracking/Kerning",
+            "自定义字距调整/字距微调",
+        ],
+    ),
+    (
+        "Dimensions Include Stroke Weight",
+        [
+            "Dimensions Include Stroke Weight",
+            "Les dimensions incluent l'épaisseur du contour",
+            "Dimensions Include Stroke Weight",
+            "Dimensions Include Stroke Weight",
+            "尺寸包括描边粗细",
+        ],
+    ),
+    ("Enable Autocorrect", ["Enable Autocorrect", "Activer la correction automatique", "Enable Autocorrect", "Enable Autocorrect", "启用自动更正"]),
+    (
+        "Enable Dynamic Spelling (underline misspelled words)",
+        [
+            "Enable Dynamic Spelling (underline misspelled words)",
+            "Activer l'orthographe dynamique (souligner les mots mal orthographiés)",
+            "Enable Dynamic Spelling (underline misspelled words)",
+            "Enable Dynamic Spelling (underline misspelled words)",
+            "启用动态拼写检查（在拼写错误下加线）",
+        ],
+    ),
+    ("Grids in Back", ["Grids in Back", "Grilles en arrière-plan", "Grids in Back", "Grids in Back", "网格置于后方"]),
+    ("H&J Violations", ["H&J Violations", "Infractions de C&J", "H&J Violations", "H&J Violations", "断字与对齐违规"]),
+    ("Include Bleed", ["Include Bleed", "Inclure le fond perdu", "Include Bleed", "Include Bleed", "包含出血"]),
+    (
+        "Include Stroke Weight",
+        ["Include Stroke Weight", "Inclure l'épaisseur du contour", "Include Stroke Weight", "Include Stroke Weight", "包含描边粗细"],
+    ),
+    ("Join our Discord", ["Join our Discord", "Rejoindre notre Discord", "Join our Discord", "Join our Discord", "加入我们的 Discord 社区"]),
+    ("Keep Violations", ["Keep Violations", "Infractions d'enchaînement", "Keep Violations", "Keep Violations", "保持选项违规"]),
+    (
+        "Overprint [Black] Swatch at 100%",
+        [
+            "Overprint [Black] Swatch at 100%",
+            "Surimpression de la nuance [Noir] à 100 %",
+            "Overprint [Black] Swatch at 100%",
+            "Overprint [Black] Swatch at 100%",
+            "100% 黑色色板叠印",
+        ],
+    ),
+    ("Printer's Marks", ["Printer's Marks", "Repères d'impression", "Printer's Marks", "Printer's Marks", "打印标记"]),
+    (
+        "Remove Styles and Formatting from Text and Tables",
+        [
+            "Remove Styles and Formatting from Text and Tables",
+            "Supprimer les styles et la mise en forme du texte et des tableaux",
+            "Remove Styles and Formatting from Text and Tables",
+            "Remove Styles and Formatting from Text and Tables",
+            "从文本和表格中删除样式和格式",
+        ],
+    ),
+    ("Ruby", ["Ruby", "Ruby", "Ruby", "Ruby", "旁注"]),
+    (
+        "Show Note Anchors in Layout View",
+        [
+            "Show Note Anchors in Layout View",
+            "Afficher les ancres de note dans l'affichage Mise en page",
+            "Show Note Anchors in Layout View",
+            "Show Note Anchors in Layout View",
+            "在版面视图显示附注锚点",
+        ],
+    ),
+    ("Spreads", ["Spreads", "Planches", "Spreads", "Spreads", "跨页"]),
+    ("Substituted Fonts", ["Substituted Fonts", "Polices substituées", "Substituted Fonts", "Substituted Fonts", "替换字体"]),
+    (
+        "Transformations are Totals",
+        [
+            "Transformations are Totals",
+            "Les transformations sont des totaux",
+            "Transformations are Totals",
+            "Transformations are Totals",
+            "变换为总计",
+        ],
+    ),
+    (
+        "Use Black Point Compensation",
+        [
+            "Use Black Point Compensation",
+            "Utiliser la compensation du point noir",
+            "Use Black Point Compensation",
+            "Use Black Point Compensation",
+            "使用黑场补偿",
+        ],
+    ),
+    (
+        "Use Typographer's Quotes",
+        [
+            "Use Typographer's Quotes",
+            "Utiliser les guillemets typographiques",
+            "Use Typographer's Quotes",
+            "Use Typographer's Quotes",
+            "使用排版引号",
+        ],
+    ),
+    ("Whole word", ["Whole word", "Mot entier", "Whole word", "Whole word", "全字匹配"]),
+    ("Interface", ["Interface", "Interface", "Interface", "Interface", "界面"]),
+    ("Advanced Type", ["Advanced Type", "Texte avancé", "Advanced Type", "Advanced Type", "高级文字"]),
+    ("Composition", ["Composition", "Composition", "Composition", "Composition", "排版"]),
+    (
+        "Show Font Names in English",
+        [
+            "Schriftnamen auf Englisch anzeigen",
+            "Afficher les noms de police en anglais",
+            "Mostrar nombres de fuentes en inglés",
+            "フォント名を英語で表示",
+            "以英文显示字体名称",
+        ],
+    ),
+    ("Show CJK Features", ["CJK-Funktionen anzeigen", "Afficher les fonctions CJK", "Mostrar funciones CJK", "CJK 機能を表示", "显示中日韩功能"]),
+    ("Missing Glyphs", ["Fehlende Glyphen", "Glyphes manquants", "Glifos que faltan", "欠落グリフ", "缺失字形"]),
+    (
+        "Draw Missing Glyphs from Fallback Fonts",
+        [
+            "Fehlende Glyphen aus Ersatzschriften zeichnen",
+            "Dessiner les glyphes manquants avec des polices de substitution",
+            "Dibujar los glifos que faltan con fuentes alternativas",
+            "欠落グリフを代替フォントで表示",
+            "用后备字体绘制缺失字形",
+        ],
+    ),
+    ("Units & Increments", ["Units & Increments", "Unités et incréments", "Units & Increments", "Units & Increments", "单位和增量"]),
+    ("Grids", ["Grids", "Grilles", "Grids", "Grids", "网格"]),
+    ("Guides & Pasteboard", ["Guides & Pasteboard", "Repères et table de montage", "Guides & Pasteboard", "Guides & Pasteboard", "参考线和粘贴板"]),
+    ("Dictionary", ["Dictionary", "Dictionnaire", "Dictionary", "Dictionary", "词典"]),
+    ("Autocorrect", ["Autocorrect", "Correction automatique", "Autocorrect", "Autocorrect", "自动更正"]),
+    ("Story Editor Display", ["Story Editor Display", "Affichage du mode éditeur", "Story Editor Display", "Story Editor Display", "文章编辑器显示"]),
+    ("File Handling", ["File Handling", "Gestion des fichiers", "File Handling", "File Handling", "文件处理"]),
+    (
+        "Formatting affects container (J)",
+        [
+            "Formatting affects container (J)",
+            "La mise en forme agit sur le conteneur (J)",
+            "Formatting affects container (J)",
+            "Formatting affects container (J)",
+            "格式应用于容器 (J)",
+        ],
+    ),
+    (
+        "Formatting affects text (J)",
+        [
+            "Formatting affects text (J)",
+            "La mise en forme agit sur le texte (J)",
+            "Formatting affects text (J)",
+            "Formatting affects text (J)",
+            "格式应用于文字 (J)",
+        ],
+    ),
+    ("Apply None", ["Apply None", "Appliquer Aucun", "Apply None", "Apply None", "应用无色"]),
+    ("Height Only", ["Height Only", "Hauteur uniquement", "Height Only", "Height Only", "仅高度"]),
+    ("Width Only", ["Width Only", "Largeur uniquement", "Width Only", "Width Only", "仅宽度"]),
+    ("Height and Width", ["Height and Width", "Hauteur et largeur", "Height and Width", "Height and Width", "高度和宽度"]),
+    ("Height only", ["Height only", "Hauteur uniquement", "Height only", "Height only", "仅高度"]),
+    ("Width only", ["Width only", "Largeur uniquement", "Width only", "Width only", "仅宽度"]),
+    ("Height and width", ["Height and width", "Hauteur et largeur", "Height and width", "Height and width", "高度和宽度"]),
+    ("Version", ["Version", "Version", "Version", "Version", "版本"]),
+    (
+        "{count} characters don't fit",
+        [
+            "{count} characters don't fit",
+            "{count} caractères ne tiennent pas",
+            "{count} characters don't fit",
+            "{count} characters don't fit",
+            "有 {count} 个字符溢出",
+        ],
+    ),
+    ("document", ["document", "document", "document", "document", "文档"]),
+    ("story", ["story", "article", "story", "story", "文章"]),
+    ("selection", ["selection", "sélection", "selection", "selection", "选区"]),
+    ("top", ["top", "haut", "top", "top", "顶部"]),
+    ("center", ["center", "centre", "center", "center", "居中"]),
+    ("bottom", ["bottom", "bas", "bottom", "bottom", "底部"]),
+    ("justify", ["justify", "justifié", "justify", "justify", "两端对齐"]),
+    ("text", ["text", "texte", "text", "text", "文字"]),
+    ("graphic", ["graphic", "graphique", "graphic", "graphic", "图形"]),
+    ("unassigned", ["unassigned", "non attribué", "unassigned", "unassigned", "未指定"]),
+    ("Perceptual", ["Perceptual", "Perception", "Perceptual", "Perceptual", "可感知"]),
+    ("Relative Colorimetric", ["Relative Colorimetric", "Colorimétrie relative", "Relative Colorimetric", "Relative Colorimetric", "相对比色"]),
+    ("Saturation", ["Saturation", "Saturation", "Saturation", "Saturation", "饱和度"]),
+    ("Absolute Colorimetric", ["Absolute Colorimetric", "Colorimétrie absolue", "Absolute Colorimetric", "Absolute Colorimetric", "绝对比色"]),
+    ("No conflicts", ["No conflicts", "Aucun conflit", "No conflicts", "No conflicts", "没有冲突"]),
+    ("Page (1–{count}):", ["Page (1–{count}):", "Page (1–{count}) :", "Page (1–{count}):", "Page (1–{count}):", "页码 (1–{count})："]),
+    (
+        "Fonts in Document: {count}    Missing: {missing}",
+        [
+            "Fonts in Document: {count}    Missing: {missing}",
+            "Polices du document : {count}    Manquantes : {missing}",
+            "Fonts in Document: {count}    Missing: {missing}",
+            "Fonts in Document: {count}    Missing: {missing}",
+            "文档中的字体：{count}    缺失：{missing}",
+        ],
+    ),
+    ("No data source", ["Keine Datenquelle", "Aucune source de données", "No hay fuente de datos", "データソースがありません", "没有数据源"]),
+    (
+        "Select Data Source…",
+        ["Datenquelle auswählen …", "Choisir une source de données…", "Seleccionar fuente de datos…", "データソースを選択…", "选择数据源…"],
+    ),
+    ("Data Merge", ["Datenzusammenführung", "Fusion des données", "Combinación de datos", "データ結合", "数据合并"]),
+    ("Preview", ["Vorschau", "Aperçu", "Previsualización", "プレビュー", "预览"]),
+    ("Previous", ["Zurück", "Précédent", "Anterior", "前へ", "上一条"]),
+    ("Next", ["Weiter", "Suivant", "Siguiente", "次へ", "下一条"]),
+    ("Record", ["Datensatz", "Enregistrement", "Registro", "レコード", "记录"]),
+    ("Merge options", ["Optionen für die Zusammenführung", "Options de fusion", "Opciones de combinación", "結合オプション", "合并选项"]),
+    ("All records", ["Alle Datensätze", "Tous les enregistrements", "Todos los registros", "すべてのレコード", "全部记录"]),
+    ("One record", ["Ein Datensatz", "Un enregistrement", "Un registro", "1件のレコード", "一条记录"]),
+    ("Range", ["Bereich", "Plage", "Intervalo", "範囲", "范围"]),
+    ("Records per page", ["Datensätze pro Seite", "Enregistrements par page", "Registros por página", "ページあたりのレコード", "每页记录数"]),
+    ("Single record", ["Einzelner Datensatz", "Un seul enregistrement", "Un solo registro", "単一レコード", "单条记录"]),
+    ("Multiple records", ["Mehrere Datensätze", "Plusieurs enregistrements", "Varios registros", "複数レコード", "多条记录"]),
+    ("Arrangement", ["Anordnung", "Disposition", "Disposición", "配置", "排列"]),
+    ("Rows first", ["Zeilen zuerst", "Lignes d'abord", "Filas primero", "行を優先", "先行后列"]),
+    ("Columns first", ["Spalten zuerst", "Colonnes d'abord", "Columnas primero", "列を優先", "先列后行"]),
+    ("Column spacing", ["Spaltenabstand", "Espacement des colonnes", "Espacio entre columnas", "列の間隔", "列间距"]),
+    ("Row spacing", ["Zeilenabstand", "Espacement des lignes", "Espacio entre filas", "行の間隔", "行间距"]),
+    (
+        "Fit proportionally",
+        ["Proportional einpassen", "Ajuster proportionnellement", "Encajar proporcionalmente", "縦横比を保持して合わせる", "按比例适合"],
+    ),
+    (
+        "Fill proportionally",
+        ["Proportional füllen", "Remplir proportionnellement", "Llenar proporcionalmente", "縦横比を保持して塗りつぶす", "按比例填充"],
+    ),
+    (
+        "Fit content to frame",
+        ["Inhalt an Rahmen anpassen", "Ajuster le contenu au bloc", "Ajustar el contenido al marco", "内容をフレームに合わせる", "内容适合框架"],
+    ),
+    ("Center in frame", ["Im Rahmen zentrieren", "Centrer dans le bloc", "Centrar en el marco", "フレーム内で中央", "在框架中居中"]),
+    ("Link images", ["Bilder verknüpfen", "Lier les images", "Vincular imágenes", "画像をリンク", "链接图像"]),
+    ("Limit", ["Obergrenze", "Limite", "Límite", "上限", "上限"]),
+    ("Bind to frame", ["An Rahmen binden", "Lier au bloc", "Vincular al marco", "フレームにバインド", "绑定到框架"]),
+    ("Insert field", ["Feld einfügen", "Insérer le champ", "Insertar campo", "フィールドを挿入", "插入字段"]),
+    (
+        "Pass csv, rows, or bytes from the control channel.",
+        [
+            "csv, rows oder bytes über den Steuerkanal übergeben.",
+            "Transmettez csv, rows ou bytes par le canal de contrôle.",
+            "Pase csv, rows o bytes por el canal de control.",
+            "制御チャネルから csv、rows または bytes を渡します。",
+            "请通过控制通道传入 csv、rows 或 bytes。",
+        ],
+    ),
+    // Paragraph Rules.
+    ("Paragraph Rules…", ["Absatzlinien …", "Filets de paragraphe…", "Filetes de párrafo…", "段落境界線…", "段落线…"]),
+    ("Paragraph Rules", ["Absatzlinien", "Filets de paragraphe", "Filetes de párrafo", "段落境界線", "段落线"]),
+    ("Justification…", ["Blocksatzeinstellungen …", "Justification…", "Justificación…", "両端揃え…", "两端对齐…"]),
+    ("Rule Below", ["Linie unterhalb", "Filet au-dessous", "Filete después", "後境界線", "下方横线"]),
+    ("Tint:", ["Farbton:", "Teinte :", "Matiz:", "濃淡:", "色调："]),
+    ("Apply To:", ["Anwenden auf:", "Appliquer à :", "Aplicar a:", "適用先:", "应用于："]),
+    ("Frame", ["Rahmen", "Bloc", "Marco", "フレーム", "框架"]),
+    ("Slug", ["Infobereich", "Ligne-bloc", "Indicaciones", "印刷可能領域", "辅助信息区"]),
+    ("Presentation", ["Präsentation", "Présentation", "Presentación", "プレゼンテーション", "演示文稿"]),
+    ("Extras", ["Extras", "Extras", "Extras", "エクストラ", "附加"]),
+    ("Column", ["Spalte", "Colonne", "Columna", "段", "栏"]),
+    // File › New › Document
+    ("Recent", ["Zuletzt verwendet", "Récents", "Recientes", "最近使用", "最近"]),
+    ("Saved", ["Gespeichert", "Enregistrés", "Guardados", "保存済み", "已保存"]),
+    ("[Default]", ["[Standard]", "[Par défaut]", "[Predeterminado]", "[初期設定]", "[默认]"]),
+    ("Your Recent Items", ["Zuletzt verwendete Elemente", "Éléments récents", "Elementos recientes", "最近使用した項目", "最近使用的项目"]),
+    (
+        "Saved Presets",
+        ["Gespeicherte Vorgaben", "Paramètres prédéfinis enregistrés", "Ajustes preestablecidos guardados", "保存済みプリセット", "已保存的预设"],
+    ),
+    (
+        "Blank Document Presets",
+        [
+            "Vorgaben für leere Dokumente",
+            "Paramètres prédéfinis de document vierge",
+            "Ajustes preestablecidos de documento en blanco",
+            "空のドキュメントプリセット",
+            "空白文档预设",
+        ],
+    ),
+    ("Delete Preset", ["Vorgabe löschen", "Supprimer le paramètre prédéfini", "Eliminar ajuste preestablecido", "プリセットを削除", "删除预设"]),
+    (
+        "Preset Details",
+        ["Vorgabedetails", "Détails du paramètre prédéfini", "Detalles del ajuste preestablecido", "プリセットの詳細", "预设详细信息"],
+    ),
+    ("Document Name", ["Dokumentname", "Nom du document", "Nombre del documento", "ドキュメント名", "文档名称"]),
+    (
+        "Save Document Preset",
+        [
+            "Dokumentvorgabe speichern",
+            "Enregistrer le paramètre prédéfini de document",
+            "Guardar ajuste preestablecido de documento",
+            "ドキュメントプリセットを保存",
+            "存储文档预设",
+        ],
+    ),
+    (
+        "Save Document Preset As:",
+        [
+            "Dokumentvorgabe speichern unter:",
+            "Enregistrer le paramètre prédéfini de document sous :",
+            "Guardar ajuste preestablecido de documento como:",
+            "ドキュメントプリセットの保存名:",
+            "存储文档预设为：",
+        ],
+    ),
+    ("Preset Name", ["Vorgabename", "Nom du paramètre prédéfini", "Nombre del ajuste preestablecido", "プリセット名", "预设名称"]),
+    ("Save Preset", ["Vorgabe speichern", "Enregistrer le paramètre prédéfini", "Guardar ajuste preestablecido", "プリセットを保存", "存储预设"]),
+    ("Start #", ["Startseitennr.", "N° de début", "N.º inicial", "開始ページ番号", "起始页码"]),
+    ("Column Gutter", ["Spaltenabstand", "Gouttière", "Medianil", "列間隔", "栏间距"]),
+    // Layout › Numbering & Section Options
+    ("Start Section", ["Abschnittsanfang", "Début de section", "Iniciar sección", "セクション開始", "开始新章节"]),
+    (
+        "Automatic Page Numbering",
+        [
+            "Automatische Seitennummerierung",
+            "Numérotation automatique des pages",
+            "Numeración de páginas automática",
+            "自動ページ番号",
+            "自动编排页码",
+        ],
+    ),
+    (
+        "Start Page Numbering at:",
+        ["Seitennummerierung beginnen bei:", "Commencer la numérotation à :", "Iniciar numeración de páginas en:", "開始ページ番号:", "起始页码："],
+    ),
+    ("Section Prefix:", ["Abschnittspräfix:", "Préfixe de section :", "Prefijo de sección:", "セクションプレフィックス:", "章节前缀："]),
+    ("Section Marker:", ["Abschnittsmarke:", "Marqueur de section :", "Marcador de sección:", "セクションマーカー:", "章节标志符："]),
+    (
+        "Include Prefix when Numbering Pages",
+        [
+            "Präfix in Seitennummerierung einschließen",
+            "Inclure le préfixe lors de la numérotation des pages",
+            "Incluir prefijo al numerar páginas",
+            "ページ番号にプレフィックスを含める",
+            "编排页码时包含前缀",
+        ],
+    ),
+    (
+        "Document Chapter Numbering",
+        [
+            "Kapitelnummerierung des Dokuments",
+            "Numérotation des chapitres du document",
+            "Numeración de capítulos del documento",
+            "ドキュメントの章番号",
+            "文档章节编号",
+        ],
+    ),
+    (
+        "Automatic Chapter Numbering",
+        [
+            "Automatische Kapitelnummerierung",
+            "Numérotation automatique des chapitres",
+            "Numeración de capítulos automática",
+            "自動章番号",
+            "自动为章节编号",
+        ],
+    ),
+    (
+        "Start Chapter Numbering at:",
+        [
+            "Kapitelnummerierung beginnen bei:",
+            "Commencer la numérotation des chapitres à :",
+            "Iniciar numeración de capítulos en:",
+            "開始章番号:",
+            "起始章节编号：",
+        ],
+    ),
+    (
+        "Same as Previous Document in the Book",
+        [
+            "Wie vorheriges Dokument im Buch",
+            "Identique au document précédent du livre",
+            "Igual que el documento anterior del libro",
+            "ブック内の前のドキュメントと同じ",
+            "与书籍中的上一文档相同",
+        ],
+    ),
+    ("Book Name:", ["Buchname:", "Nom du livre :", "Nombre del libro:", "ブック名:", "书籍名称："]),
+    ("N/A", ["–", "S.O.", "N/D", "なし", "不适用"]),
+    // Paragraph Style Options: Paragraph Border, Paragraph Shading, Keep Options, Span Columns, Bullets and Numbering.
+    ("Paragraph Border", ["Absatzrahmen", "Contour de paragraphe", "Borde de párrafo", "段落囲み罫", "段落边框"]),
+    ("Paragraph Shading", ["Absatzschattierung", "Ombrage de paragraphe", "Sombreado de párrafo", "段落の背景色", "段落底纹"]),
+    ("Keep Options", ["Umbruchoptionen", "Options d'enchaînement", "Opciones de separación", "段落分離禁止オプション", "保持选项"]),
+    ("Span Columns", ["Spalten überspannen", "Étendre sur les colonnes", "Abarcar columnas", "段抜きと段分割", "跨栏"]),
+    ("Keep with Next:", ["Nicht trennen von nächsten:", "Lier aux suivantes:", "Conservar con siguientes:", "次の段落と分離禁止:", "与下一段保持："]),
+    ("Keep Lines Together", ["Zeilen nicht trennen", "Lignes solidaires", "Conservar líneas juntas", "行を分離しない", "保持各行同页"]),
+    (
+        "All Lines in Paragraph",
+        ["Alle Zeilen im Absatz", "Toutes les lignes du paragraphe", "Todas las líneas del párrafo", "段落のすべての行", "段落中所有行"],
+    ),
+    (
+        "At Start/End of Paragraph",
+        ["Am Anfang/Ende des Absatzes", "Au début/à la fin du paragraphe", "Al inicio/final del párrafo", "段落の始めと終わり", "在段落开头/结尾"],
+    ),
+    ("End:", ["Ende:", "Fin:", "Final:", "終了位置:", "结束："]),
+    ("Start Paragraph:", ["Absatzbeginn:", "Début de paragraphe:", "Inicio de párrafo:", "段落の開始位置:", "段落开始："]),
+    ("Anywhere", ["Überall", "N'importe où", "En cualquier lugar", "任意の位置", "任意位置"]),
+    ("In Next Column", ["In nächster Spalte", "Dans la colonne suivante", "En la siguiente columna", "次の段", "于下一栏"]),
+    ("In Next Frame", ["In nächstem Rahmen", "Dans le bloc suivant", "En el siguiente marco", "次のフレーム", "于下一框架"]),
+    ("On Next Page", ["Auf nächster Seite", "Sur la page suivante", "En la página siguiente", "次のページ", "于下一页"]),
+    (
+        "On Next Odd Page",
+        ["Auf nächster ungerader Seite", "Sur la page impaire suivante", "En la siguiente página impar", "次の奇数ページ", "于下一奇数页"],
+    ),
+    (
+        "On Next Even Page",
+        ["Auf nächster gerader Seite", "Sur la page paire suivante", "En la siguiente página par", "次の偶数ページ", "于下一偶数页"],
+    ),
+    ("Paragraph Layout:", ["Absatzlayout:", "Disposition du paragraphe:", "Diseño de párrafo:", "段落レイアウト:", "段落版面："]),
+    ("Single Column", ["Eine Spalte", "Colonne simple", "Una columna", "単一段", "单栏"]),
+    ("Split Column", ["Spalte unterteilen", "Diviser la colonne", "Dividir columna", "段分割", "拆分栏"]),
+    ("Columns:", ["Spalten:", "Colonnes :", "Columnas:", "段:", "栏数："]),
+    ("All", ["Alle", "Toutes", "Todas", "すべて", "全部"]),
+    ("Inside Gutter:", ["Innerer Spaltenabstand:", "Gouttière intérieure:", "Medianil interior:", "内側の間隔:", "内栏间距："]),
+    ("Outside Gutter:", ["Äußerer Spaltenabstand:", "Gouttière extérieure:", "Medianil exterior:", "外側の間隔:", "外栏间距："]),
+    ("List Type:", ["Listentyp:", "Type de liste:", "Tipo de lista:", "リストタイプ:", "列表类型："]),
+    ("Bullets", ["Aufzählungszeichen", "Puces", "Viñetas", "箇条書き記号", "项目符号"]),
+    ("Numbers", ["Nummerierung", "Numéros", "Números", "自動番号", "编号"]),
+    ("Bullet Character:", ["Aufzählungszeichen:", "Caractère de puce:", "Carácter de viñeta:", "箇条書き記号:", "项目符号字符："]),
+    ("Text After:", ["Text danach:", "Texte après:", "Texto después:", "後続テキスト:", "后续文本："]),
+    ("Gap Tint:", ["Lückenfarbton:", "Teinte de l'espace:", "Matiz del hueco:", "すき間の濃淡:", "间隙色调："]),
+    (
+        "Corner Size and Shape",
+        ["Eckengröße und -form", "Taille et forme des angles", "Tamaño y forma de esquinas", "角のサイズとシェイプ", "角大小和形状"],
+    ),
+    ("Top Left:", ["Oben links:", "En haut à gauche:", "Superior izquierda:", "左上:", "左上："]),
+    ("Top Right:", ["Oben rechts:", "En haut à droite:", "Superior derecha:", "右上:", "右上："]),
+    ("Bottom Right:", ["Unten rechts:", "En bas à droite:", "Inferior derecha:", "右下:", "右下："]),
+    ("Bottom Left:", ["Unten links:", "En bas à gauche:", "Inferior izquierda:", "左下:", "左下："]),
+    ("Rounded", ["Abgerundet", "Arrondi", "Redondeado", "角丸", "圆角"]),
+    ("Inverse Rounded", ["Umgekehrt abgerundet", "Arrondi inversé", "Redondeado inverso", "逆角丸", "反向圆角"]),
+    ("Inset", ["Eingezogen", "En retrait", "Hundido", "内側に切り欠き", "内凹"]),
+    ("Fancy", ["Verziert", "Fantaisie", "Decorativo", "装飾", "花式"]),
+    ("Top Edge:", ["Obere Kante:", "Bord supérieur:", "Borde superior:", "上端:", "上边缘："]),
+    ("Bottom Edge:", ["Untere Kante:", "Bord inférieur:", "Borde inferior:", "下端:", "下边缘："]),
+    ("Em Box Top", ["Geviert oben", "Haut du cadratin", "Parte superior del cuadratín", "仮想ボディの上", "全角框顶部"]),
+    ("Descent", ["Unterlänge", "Jambage inférieur", "Descendente", "ディセント", "下伸部"]),
+    ("Em Box Bottom", ["Geviert unten", "Bas du cadratin", "Parte inferior del cuadratín", "仮想ボディの下", "全角框底部"]),
+    (
+        "Display Border if Paragraph Splits Across Frames/Columns",
+        [
+            "Rahmen anzeigen, wenn der Absatz auf Rahmen/Spalten verteilt ist",
+            "Afficher le contour si le paragraphe est réparti sur plusieurs blocs/colonnes",
+            "Mostrar borde si el párrafo se divide entre marcos/columnas",
+            "段落がフレームや段をまたぐときに囲み罫を表示",
+            "段落跨框架/栏拆分时显示边框",
+        ],
+    ),
+    (
+        "Merge Consecutive Borders and Shading",
+        [
+            "Aufeinanderfolgende Rahmen und Schattierungen zusammenführen",
+            "Fusionner les contours et trames consécutifs",
+            "Combinar bordes y sombreados consecutivos",
+            "連続する囲み罫と背景色を結合",
+            "合并连续的边框和底纹",
+        ],
+    ),
+    ("Clip to Frame", ["Auf Rahmen beschneiden", "Découper selon le bloc", "Recortar al marco", "フレームでクリップ", "剪切到框架"]),
+    (
+        "Do not Print or Export",
+        ["Nicht drucken oder exportieren", "Ne pas imprimer ni exporter", "No imprimir ni exportar", "印刷・書き出ししない", "不打印或导出"],
+    ),
+    ("Space Before Span:", ["Abstand vor Überspannung:", "Espace avant l'étendue:", "Espacio antes de abarcar:", "段抜き前のアキ:", "跨栏前间距："]),
+    (
+        "Space After Span:",
+        ["Abstand nach Überspannung:", "Espace après l'étendue:", "Espacio después de abarcar:", "段抜き後のアキ:", "跨栏后间距："],
+    ),
+    ("Space Before Split:", ["Abstand vor Teilung:", "Espace avant la division:", "Espacio antes de dividir:", "段分割前のアキ:", "拆分前间距："]),
+    ("Space After Split:", ["Abstand nach Teilung:", "Espace après la division:", "Espacio después de dividir:", "段分割後のアキ:", "拆分后间距："]),
+    ("Level:", ["Ebene:", "Niveau:", "Nivel:", "レベル:", "级别："]),
+    ("Glyphs…", ["Glyphen…", "Glyphes…", "Glifos…", "字形…", "字形…"]),
+    ("(Paragraph Font)", ["(Absatzschrift)", "(Police du paragraphe)", "(Fuente del párrafo)", "(段落のフォント)", "(段落字体)"]),
+    (
+        "Restart Numbers at This Level After:",
+        [
+            "Nummerierung auf dieser Ebene neu beginnen nach:",
+            "Recommencer la numérotation à ce niveau après:",
+            "Reiniciar números en este nivel después de:",
+            "このレベルの番号を振り直すきっかけ:",
+            "在此级别后重新编号：",
+        ],
+    ),
+    (
+        "Any Previous Level",
+        ["Einer beliebigen höheren Ebene", "Tout niveau précédent", "Cualquier nivel anterior", "任意の上位レベル", "任何上一级别"],
+    ),
+    ("Tab Position:", ["Tabulatorposition:", "Position de la tabulation:", "Posición de tabulación:", "タブ位置:", "制表符位置："]),
+    (
+        "Paragraph Borders and Shading…",
+        [
+            "Absatzrahmen und -schattierung…",
+            "Contours et trames de paragraphe…",
+            "Bordes y sombreado de párrafo…",
+            "段落囲み罫と段落背景色…",
+            "段落边框和底纹…",
+        ],
+    ),
+    (
+        "Paragraph Borders and Shading",
+        [
+            "Absatzrahmen und -schattierung",
+            "Contours et trames de paragraphe",
+            "Bordes y sombreado de párrafo",
+            "段落囲み罫と段落背景色",
+            "段落边框和底纹",
+        ],
+    ),
+    ("Span Columns…", ["Spalten überspannen…", "Étendre sur les colonnes…", "Abarcar columnas…", "段抜きと段分割…", "跨栏…"]),
+    (
+        "Bullets and Numbering…",
+        ["Aufzählungszeichen und Nummerierung…", "Puces et numérotation…", "Viñetas y numeración…", "箇条書き記号と番号付け…", "项目符号和编号…"],
+    ),
+    ("List:", ["Liste:", "Liste :", "Lista:", "リスト:", "列表："]),
+    ("Mode:", ["Modus:", "Mode :", "Modo:", "モード:", "模式："]),
+    (
+        "Continue from Previous Number",
+        [
+            "Ab vorheriger Zahl fortfahren",
+            "Continuer à partir du numéro précédent",
+            "Continuar desde el número anterior",
+            "前の番号から継続",
+            "从上一编号继续",
+        ],
+    ),
+    ("Start At", ["Beginnen bei", "Commencer à", "Empezar en", "開始番号", "起始编号"]),
+    // Cell strokes.
+    ("Strokes and Fills…", ["Konturen und Flächen …", "Contours et fonds…", "Trazos y rellenos…", "線と塗り…", "描边和填色…"]),
+    ("Cell Stroke", ["Zellkontur", "Contour de cellule", "Trazo de celda", "セルの線", "单元格描边"]),
+    ("Cell Fill", ["Zellfläche", "Fond de cellule", "Relleno de celda", "セルの塗り", "单元格填色"]),
+    ("Cell edges", ["Zellkanten", "Bords de cellule", "Bordes de celda", "セルの境界線", "单元格边缘"]),
+    (
+        "Click a line to include or exclude it. Double-click selects all outer or all inner lines; triple-click selects or clears all.",
+        [
+            "Klicken Sie auf eine Linie, um sie ein- oder auszuschließen. Doppelklick wählt alle äußeren oder alle inneren Linien; Dreifachklick wählt alle aus oder hebt die Auswahl auf.",
+            "Cliquez sur une ligne pour l'inclure ou l'exclure. Un double-clic sélectionne toutes les lignes extérieures ou intérieures ; un triple-clic sélectionne ou désélectionne tout.",
+            "Haga clic en una línea para incluirla o excluirla. Doble clic selecciona todas las líneas exteriores o interiores; triple clic selecciona o borra todas.",
+            "線をクリックすると、含めるか除外するかを切り替えます。ダブルクリックで外側または内側の線をすべて選択し、トリプルクリックですべてを選択または解除します。",
+            "单击线条可将其包含或排除。双击选择所有外侧或所有内侧线条；三击选择或清除全部。",
+        ],
+    ),
+    ("Swatch Options…", ["Farbfeldoptionen …", "Options de nuance…", "Opciones de muestra…", "スウォッチオプション…", "色板选项…"]),
+    ("Swatch Options", ["Farbfeldoptionen", "Options de nuance", "Opciones de muestra", "スウォッチオプション", "色板选项"]),
+    (
+        "Color Group Options…",
+        ["Farbgruppenoptionen …", "Options du groupe de couleurs…", "Opciones de grupo de colores…", "カラーグループオプション…", "颜色组选项…"],
+    ),
+    ("Layer Options", ["Ebenenoptionen", "Options de calque", "Opciones de capa", "レイヤーオプション", "图层选项"]),
+    (
+        "Layer Options for \"{name}\"…",
+        [
+            "Ebenenoptionen für „{name}“ …",
+            "Options du calque « {name} »…",
+            "Opciones de capa para «{name}»…",
+            "「{name}」のレイヤーオプション…",
+            "“{name}”的图层选项…",
+        ],
+    ),
+    ("Swatch Name:", ["Farbfeldname:", "Nom de la nuance :", "Nombre de muestra:", "スウォッチ名:", "色板名称:"]),
+    (
+        "Name with Color Value",
+        ["Name mit Farbwert", "Nommer d'après la valeur chromatique", "Nombre con valor de color", "カラー値を名前にする", "以颜色值命名"],
+    ),
+    ("Color Type:", ["Farbtyp:", "Type de couleur :", "Tipo de color:", "カラータイプ:", "颜色类型:"]),
+    ("Process", ["Prozessfarbe", "Quadrichromie", "Cuatricromía", "プロセス", "印刷色"]),
+    ("Spot", ["Volltonfarbe", "Ton direct", "Tinta plana", "特色", "专色"]),
+    ("Color Mode:", ["Farbmodus:", "Mode colorimétrique :", "Modo de color:", "カラーモード:", "颜色模式:"]),
+    ("Base Color:", ["Grundfarbe:", "Couleur de base :", "Color base:", "ベースカラー:", "基准颜色:"]),
+    (
+        "Edit the gradient's stops in the Gradient panel.",
+        [
+            "Die Verlaufsregler bearbeiten Sie im Verlaufsbedienfeld.",
+            "Modifiez les arrêts du dégradé dans le panneau Dégradé.",
+            "Edite las paradas del degradado en el panel Degradado.",
+            "グラデーションの分岐点はグラデーションパネルで編集します。",
+            "在“渐变”面板中编辑渐变的色标。",
+        ],
+    ),
+    (
+        "This swatch can't be edited.",
+        [
+            "Dieses Farbfeld kann nicht bearbeitet werden.",
+            "Cette nuance ne peut pas être modifiée.",
+            "Esta muestra no se puede editar.",
+            "このスウォッチは編集できません。",
+            "此色板无法编辑。",
+        ],
+    ),
+    ("Light Blue", ["Hellblau", "Bleu clair", "Azul claro", "ライトブルー", "浅蓝色"]),
+    ("Red", ["Rot", "Rouge", "Rojo", "レッド", "红色"]),
+    ("Green", ["Grün", "Vert", "Verde", "グリーン", "绿色"]),
+    ("Blue", ["Blau", "Bleu", "Azul", "ブルー", "蓝色"]),
+    ("Yellow", ["Gelb", "Jaune", "Amarillo", "イエロー", "黄色"]),
+    ("Magenta", ["Magenta", "Magenta", "Magenta", "マゼンタ", "洋红色"]),
+    ("Cyan", ["Cyan", "Cyan", "Cian", "シアン", "青色"]),
+    ("Black", ["Schwarz", "Noir", "Negro", "ブラック", "黑色"]),
+    ("Orange", ["Orange", "Orange", "Naranja", "オレンジ", "橙色"]),
+    ("Dark Green", ["Dunkelgrün", "Vert foncé", "Verde oscuro", "ダークグリーン", "深绿色"]),
+    ("Teal", ["Blaugrün", "Bleu canard", "Verde azulado", "ティール", "蓝绿色"]),
+    ("Tan", ["Hellbraun", "Fauve", "Tostado", "タン", "棕褐色"]),
+    ("Brown", ["Braun", "Marron", "Marrón", "ブラウン", "褐色"]),
+    ("Violet", ["Violett", "Violet", "Violeta", "バイオレット", "紫罗兰色"]),
+    ("Gold", ["Gold", "Or", "Dorado", "ゴールド", "金色"]),
+    ("Show Layer", ["Ebene einblenden", "Afficher le calque", "Mostrar capa", "レイヤーを表示", "显示图层"]),
+    ("Lock Layer", ["Ebene fixieren", "Verrouiller le calque", "Bloquear capa", "レイヤーをロック", "锁定图层"]),
+    ("Print Layer", ["Ebene drucken", "Imprimer le calque", "Imprimir capa", "レイヤーをプリント", "打印图层"]),
+    (
+        "Suppress Text Wrap When Layer is Hidden",
+        [
+            "Textumfluss bei ausgeblendeter Ebene unterdrücken",
+            "Supprimer l'habillage quand le calque est masqué",
+            "Suprimir ceñir texto cuando la capa está oculta",
+            "非表示レイヤーのテキストの回り込みを無視",
+            "图层隐藏时禁止文本绕排",
+        ],
+    ),
+    // Document Setup
+    ("Page Size:", ["Seitenformat:", "Format de page :", "Tamaño de página:", "ページサイズ:", "页面大小："]),
+    (
+        "Adjust page elements to document changes",
+        [
+            "Seitenelemente an Dokumentänderungen anpassen",
+            "Adapter les éléments de page aux modifications du document",
+            "Ajustar los elementos de página a los cambios del documento",
+            "ページ要素をドキュメントの変更に合わせて調整",
+            "根据文档更改调整页面元素",
+        ],
+    ),
+    (
+        "Apply the changes; objects follow the new page size and margins",
+        [
+            "Änderungen anwenden; Objekte folgen dem neuen Seitenformat und den Rändern",
+            "Appliquer les modifications ; les objets suivent le nouveau format et les marges",
+            "Aplicar los cambios; los objetos siguen el nuevo tamaño de página y los márgenes",
+            "変更を適用し、オブジェクトを新しいページサイズとマージンに合わせます",
+            "应用更改；对象跟随新的页面大小和边距",
+        ],
+    ),
+    ("Bleed:", ["Anschnitt:", "Fond perdu :", "Sangrado:", "裁ち落とし:", "出血："]),
+    ("Slug:", ["Infobereich:", "Ligne-bloc :", "Indicaciones:", "印刷可能領域:", "辅助信息区："]),
+    // Font menu
+    ("Filters:", ["Filter:", "Filtres :", "Filtros:", "フィルター:", "过滤器："]),
+    ("All Classes", ["Alle Klassen", "Toutes les classes", "Todas las clases", "すべての分類", "所有分类"]),
+    ("Serif", ["Serifenschrift", "Serif", "Con serifa", "セリフ", "衬线"]),
+    ("Slab Serif", ["Egyptienne", "Slab serif", "Serifa cuadrada", "スラブセリフ", "粗衬线"]),
+    ("Sans Serif", ["Serifenlos", "Sans serif", "Sin serifa", "サンセリフ", "无衬线"]),
+    ("Script", ["Schreibschrift", "Script", "Manuscrita", "スクリプト", "手写体"]),
+    ("Monospaced", ["Dicktengleich", "Chasse fixe", "Monoespaciada", "等幅", "等宽"]),
+    ("Decorative", ["Dekorativ", "Décorative", "Decorativa", "装飾", "装饰"]),
+    ("Symbol", ["Symbol", "Symbole", "Símbolo", "記号", "符号"]),
+    (
+        "Show Recently Added",
+        [
+            "Zuletzt hinzugefügte anzeigen",
+            "Afficher les polices ajoutées récemment",
+            "Mostrar añadidas recientemente",
+            "最近追加したフォントを表示",
+            "显示最近添加的字体",
+        ],
+    ),
+    (
+        "Small Sample Text Size",
+        ["Kleine Beispieltextgröße", "Petite taille de l'exemple", "Tamaño de muestra pequeño", "サンプルテキスト（小）", "小号示例文本"],
+    ),
+    (
+        "Medium Sample Text Size",
+        ["Mittlere Beispieltextgröße", "Taille moyenne de l'exemple", "Tamaño de muestra mediano", "サンプルテキスト（中）", "中号示例文本"],
+    ),
+    (
+        "Large Sample Text Size",
+        ["Große Beispieltextgröße", "Grande taille de l'exemple", "Tamaño de muestra grande", "サンプルテキスト（大）", "大号示例文本"],
+    ),
+    ("Selected Text", ["Ausgewählter Text", "Texte sélectionné", "Texto seleccionado", "選択したテキスト", "所选文本"]),
+    ("Sample", ["Beispiel", "Exemple", "Muestra", "サンプル", "示例"]),
+    ("Similar to {family}", ["Ähnlich wie {family}", "Semblables à {family}", "Similares a {family}", "{family} に類似", "与 {family} 相似"]),
+    (
+        "No fonts match",
+        ["Keine passenden Schriften", "Aucune police ne correspond", "Ninguna fuente coincide", "一致するフォントはありません", "没有匹配的字体"],
+    ),
+    (
+        "Show Similar Fonts",
+        ["Ähnliche Schriften anzeigen", "Afficher les polices semblables", "Mostrar fuentes similares", "類似フォントを表示", "显示相似字体"],
+    ),
+    ("Loading fonts…", ["Schriften werden geladen…", "Chargement des polices…", "Cargando fuentes…", "フォントを読み込み中…", "正在加载字体…"]),
+    ("Show Styles", ["Schnitte einblenden", "Afficher les styles", "Mostrar estilos", "スタイルを表示", "显示样式"]),
+    ("Hide Styles", ["Schnitte ausblenden", "Masquer les styles", "Ocultar estilos", "スタイルを隠す", "隐藏样式"]),
+    ("TrueType font", ["TrueType-Schrift", "Police TrueType", "Fuente TrueType", "TrueType フォント", "TrueType 字体"]),
+    ("OpenType font", ["OpenType-Schrift", "Police OpenType", "Fuente OpenType", "OpenType フォント", "OpenType 字体"]),
+    ("Variable font", ["Variable Schrift", "Police variable", "Fuente variable", "バリアブルフォント", "可变字体"]),
+    ("Color font", ["Farbschrift", "Police couleur", "Fuente de color", "カラーフォント", "彩色字体"]),
+    // Table of Contents.
+    (
+        "Sort Entries in Alphabetical Order",
+        [
+            "Einträge alphabetisch sortieren",
+            "Trier les entrées par ordre alphabétique",
+            "Ordenar entradas alfabéticamente",
+            "項目をアルファベット順に並べ替え",
+            "按字母顺序排列条目",
+        ],
+    ),
+];
diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs
new file mode 100644
index 000000000..db13138cf
--- /dev/null
+++ b/crates/ui-egui/src/i18n/tests.rs
@@ -0,0 +1,357 @@
+use super::*;
+use std::collections::HashSet;
+
+/// Every per-language table `tr` looks up, by interface language.
+const LANGUAGE_TABLES: &[(&str, &[(&str, &str)])] = &[
+    ("ar", ar::TABLE),
+    ("cs", cs::TABLE),
+    ("de", de::TABLE),
+    ("fr", fr::TABLE),
+    ("it", it::TABLE),
+    ("ja", ja::TABLE),
+    ("ka", ka::TABLE),
+    ("pl", pl::TABLE),
+    ("pt-br", pt_br::TABLE),
+    ("ru", ru::TABLE),
+    ("uk", uk::TABLE),
+];
+
+/// Every per-language table `tr_context` looks up.
+const CONTEXT_TABLES: &[(&str, &[(&str, &str, &str)])] =
+    &[("ar", ar::CONTEXT), ("cs", cs::CONTEXT), ("ja", ja::CONTEXT), ("pl", pl::CONTEXT), ("ru", ru::CONTEXT), ("uk", uk::CONTEXT)];
+
+/// The languages of the shared tables' columns, in column order.
+const SHARED_COLUMNS: [&str; 5] = ["de", "fr", "es", "ja", "zh"];
+
+/// The German and Japanese tables translate the whole interface and win over the shared columns.
+const WHOLE_INTERFACE: [&str; 2] = ["de", "ja"];
+
+/// What `tr` shows for a row: an empty one is still untranslated.
+fn or_english<'a>(text: &'a str, english: &'a str) -> &'a str {
+    if text.trim().is_empty() { english } else { text }
+}
+
+#[test]
+fn cached_lookup_preserves_every_translation_across_language_switches() {
+    let own = |lang: &str, key: &str| {
+        LANGUAGE_TABLES.iter().find(|(code, _)| *code == lang).and_then(|(_, table)| table.iter().find(|(k, _)| *k == key)).map(|(_, text)| *text)
+    };
+    for (key, translations) in TABLE {
+        for (lang, shared) in SHARED_COLUMNS.into_iter().zip(translations) {
+            // A language's own table is looked up before the shared column.
+            let expected = own(lang, key).filter(|text| !text.trim().is_empty()).unwrap_or(*shared);
+            assert_eq!(tr(lang, key), or_english(expected, key), "{lang}: {key}");
+        }
+        assert_eq!(tr("", key), *key);
+    }
+    for (lang, table) in LANGUAGE_TABLES {
+        for (key, expected) in *table {
+            if !expected.trim().is_empty() {
+                assert_eq!(tr(lang, key), *expected, "{lang}: {key}");
+            }
+            assert_eq!(tr("", key), *key);
+        }
+    }
+    // Strings no catalog has stay as they are, in every language.
+    let unknown = String::from("A user-defined untranslated label");
+    for lang in LANGUAGES.iter().map(|(code, _)| *code).chain(["en", "unknown"]) {
+        assert!(std::ptr::eq(tr(lang, &unknown), unknown.as_str()), "{lang}");
+        // Fixed standard names stay identical.
+        assert_eq!(tr(lang, "PDF/X-4"), "PDF/X-4", "{lang}");
+    }
+}
+
+/// The Data Merge arrangement combo takes its accessible name from `tr(lang, "Arrangement")`.
+/// A row in only the shared table leaves the languages whose lookup returns directly with the
+/// English name.
+#[test]
+fn arrangement_accessible_name_is_localized_in_every_interface_language() {
+    for (code, name) in LANGUAGES {
+        let label = tr(code, "Arrangement");
+        if code.is_empty() {
+            assert_eq!(label, "Arrangement", "{name}");
+        } else {
+            assert_ne!(label, "Arrangement", "{name} still announces the English accessible name");
+            assert!(!label.trim().is_empty(), "{name}");
+        }
+    }
+}
+
+#[test]
+fn context_captions_come_from_their_context_or_the_plain_translation() {
+    for (lang, table) in CONTEXT_TABLES {
+        for (key, scope, text) in *table {
+            if !text.trim().is_empty() {
+                assert_eq!(tr_context(lang, key, scope), *text, "{lang}: {key} ({scope})");
+            }
+        }
+    }
+    for (key, scope, row) in CONTEXT {
+        for (lang, shared) in SHARED_COLUMNS.into_iter().zip(row) {
+            // A language's own context table is looked up before the shared one.
+            let own = CONTEXT_TABLES
+                .iter()
+                .filter(|(code, _)| *code == lang)
+                .flat_map(|(_, table)| table.iter())
+                .find(|(k, s, _)| k == key && s == scope)
+                .map(|(_, _, text)| *text)
+                .filter(|text| !text.trim().is_empty());
+            let expected = own.or(Some(*shared).filter(|text| !text.trim().is_empty())).unwrap_or_else(|| tr(lang, key));
+            assert_eq!(tr_context(lang, key, scope), expected, "{lang}: {key} ({scope})");
+        }
+    }
+    // An unknown context, or a language without one, keeps the plain translation.
+    let keys = CONTEXT.iter().map(|(key, _, _)| *key).chain(CONTEXT_TABLES.iter().flat_map(|(_, table)| table.iter().map(|(key, _, _)| *key)));
+    for key in keys {
+        for lang in LANGUAGES.iter().map(|(code, _)| *code).chain(["en"]) {
+            assert_eq!(tr_context(lang, key, "no such context"), tr(lang, key), "{lang}: {key}");
+        }
+        assert_eq!(tr_context("", key, "count"), key);
+    }
+}
+
+/// The tables `tr` reads, as (language, key, translation), context captions included.
+fn entries() -> Vec<(&'static str, &'static str, &'static str)> {
+    let mut entries: Vec<_> = LANGUAGE_TABLES.iter().flat_map(|(lang, table)| table.iter().map(|(key, text)| (*lang, *key, *text))).collect();
+    for (lang, i) in SHARED_COLUMNS.into_iter().zip(0..) {
+        entries.extend(TABLE.iter().filter_map(|(key, row)| row.get(i).map(|text| (lang, *key, *text))));
+        entries.extend(CONTEXT.iter().filter_map(|(key, _, row)| row.get(i).map(|text| (lang, *key, *text))));
+    }
+    entries.extend(CONTEXT_TABLES.iter().flat_map(|(lang, table)| table.iter().map(|(key, _, text)| (*lang, *key, *text))));
+    entries
+}
+
+/// Every catalog has one row per key and keeps the English placeholders. A string a catalog
+/// doesn't translate shows in English, so a missing or empty row fails nothing here; the
+/// `missing_translations_report` lists them.
+#[test]
+fn every_catalog_has_unique_keys_and_keeps_placeholders() {
+    for (lang, i) in SHARED_COLUMNS.iter().zip(0..) {
+        assert_eq!(column(lang), Some(i), "{lang}");
+    }
+    for (lang, table) in LANGUAGE_TABLES {
+        let keys: HashSet<_> = table.iter().map(|(key, _)| *key).collect();
+        assert_eq!(keys.len(), table.len(), "{lang}: duplicate keys");
+    }
+    let shared: HashSet<_> = TABLE.iter().map(|(key, _)| *key).collect();
+    assert_eq!(shared.len(), TABLE.len(), "duplicate keys in the shared table");
+    let shared_contexts: HashSet<_> = CONTEXT.iter().map(|(key, scope, _)| (*key, *scope)).collect();
+    assert_eq!(shared_contexts.len(), CONTEXT.len(), "duplicate keys in the shared context table");
+    for (lang, table) in CONTEXT_TABLES {
+        let keys: HashSet<_> = table.iter().map(|(key, scope, _)| (*key, *scope)).collect();
+        assert_eq!(keys.len(), table.len(), "{lang}: duplicate context keys");
+    }
+    // A per-language table is looked up before the shared table, so a key in both hides the
+    // shared column, except in the tables that translate the whole interface.
+    for (lang, table) in LANGUAGE_TABLES.iter().filter(|(lang, _)| column(lang).is_some() && !WHOLE_INTERFACE.contains(lang)) {
+        let both: Vec<_> = table.iter().map(|(key, _)| *key).filter(|key| shared.contains(key)).collect();
+        assert!(both.is_empty(), "{lang} keys also in the shared table: {both:?}");
+    }
+
+    let placeholders = |s: &'static str| {
+        let mut names: Vec<_> = s.split('{').skip(1).filter_map(|part| part.split_once('}').map(|(name, _)| name)).collect();
+        names.sort_unstable();
+        names
+    };
+    for (lang, key, text) in entries().into_iter().filter(|(_, _, text)| !text.trim().is_empty()) {
+        assert_eq!(placeholders(key), placeholders(text), "{lang}: placeholders of {key:?}");
+    }
+}
+
+/// The strings each interface language shows in English, for the `cargo xtask ci` log. It
+/// always passes: `cargo xtask i18n-report` runs it.
+#[test]
+#[ignore = "a report, run by `cargo xtask i18n-report`"]
+fn missing_translations_report() {
+    let interface = interface_strings();
+    let catalogs: Vec<(&str, HashSet<&str>)> = LANGUAGE_TABLES
+        .iter()
+        .map(|(lang, table)| (*lang, table.iter().map(|(key, _)| *key).collect()))
+        .chain([("shared", TABLE.iter().map(|(key, _)| *key).collect())])
+        .collect();
+    let mut keys: Vec<&str> = interface.iter().copied().chain(catalogs.iter().flat_map(|(_, keys)| keys.iter().copied())).collect();
+    keys.sort_unstable();
+    keys.dedup();
+    // `tr` hands back the string it was given when it has no translation.
+    let missing = |lang: &str| -> Vec<&str> {
+        keys.iter()
+            .copied()
+            .filter(|key| {
+                let english = (*key).to_owned();
+                std::ptr::eq(tr(lang, &english), english.as_str())
+            })
+            .collect()
+    };
+    let report: Vec<(&str, Vec<&str>)> = LANGUAGES.iter().filter(|(code, _)| !code.is_empty()).map(|(code, _)| (*code, missing(code))).collect();
+    println!("i18n report: {} interface strings; a missing translation shows in English.", keys.len());
+    for (lang, missing) in &report {
+        println!("  {lang:<6} {:>5} missing", missing.len());
+    }
+    for (lang, missing) in report.iter().filter(|(_, missing)| !missing.is_empty()) {
+        println!("{lang} ({}): {}", missing.len(), missing.iter().map(|key| format!("{key:?}")).collect::<Vec<_>>().join(", "));
+    }
+    // A catalog key neither the interface list nor another catalog knows is stale, or a label
+    // `interface_strings` doesn't list yet.
+    for (name, own) in &catalogs {
+        let mut unknown: Vec<_> = own
+            .iter()
+            .filter(|key| !interface.contains(*key) && !catalogs.iter().any(|(other, keys)| other != name && keys.contains(*key)))
+            .collect();
+        unknown.sort_unstable();
+        if !unknown.is_empty() {
+            println!("{name}: {} rows for keys the interface list doesn't have: {unknown:?}", unknown.len());
+        }
+    }
+}
+
+#[test]
+fn only_arabic_lays_out_right_to_left() {
+    for (code, _) in LANGUAGES {
+        assert_eq!(is_rtl(code), *code == "ar", "{code}");
+    }
+}
+
+/// Built-in style and workspace names follow the interface language; names people give their
+/// own styles and workspaces are document data and stay as typed.
+#[test]
+fn only_built_in_style_and_workspace_names_are_translated() {
+    for (code, _) in LANGUAGES {
+        for name in [designcraft_doc::NO_PARA_STYLE, designcraft_doc::BASIC_PARAGRAPH, designcraft_doc::NO_CHAR_STYLE] {
+            assert_eq!(style_name(code, name), tr(code, name), "{code}");
+        }
+        assert_eq!(workspace_name(code, "Essentials"), tr(code, "Essentials"), "{code}");
+        for custom in ["Group", "Columns", "My layout style"] {
+            assert_eq!(style_name(code, custom), custom, "{code}");
+            assert_eq!(workspace_name(code, custom), custom, "{code}");
+        }
+    }
+}
+
+/// Languages with several plural forms put the category first, so every number reads the same.
+#[test]
+fn category_first_counts_put_the_category_before_every_number() {
+    assert!(!category_first("de") && !category_first(""));
+    for lang in ["ka", "uk", "ru", "pl"] {
+        assert!(category_first(lang), "{lang}");
+        for noun in ["pages", "objects", "errors"] {
+            for n in [0, 1, 2, 4, 5, 11, 12, 21, 22, 25, 101, 111] {
+                assert_eq!(count_label(lang, noun, n), format!("{}: {n}", tr(lang, noun)), "{lang}: {noun}");
+            }
+        }
+    }
+    assert_eq!(count_label("", "objects", 2), "2 objects");
+}
+
+/// Every English string the interface passes to `tr`, as far as the command and tool tables and
+/// the list of UI-only labels know them.
+fn interface_strings() -> HashSet<&'static str> {
+    let mut keys = HashSet::new();
+    // Command labels and menu names reach `tr` from the engine and the UI command table.
+    for spec in designcraft_engine::command_specs() {
+        keys.insert(spec.label);
+        keys.extend(spec.menu.iter().copied());
+    }
+    keys.extend(crate::menus::UI_COMMANDS.iter().map(|(_, label, _, _)| *label));
+    // Tool names reach `tr` from the Tools panel.
+    keys.extend(designcraft_tools::TOOL_GROUPS.iter().flat_map(|group| group.iter()).map(|tool| tool.label));
+    // So do the About window's tab names, app descriptions and the credits' column and sort labels.
+    keys.extend(crate::about::ABOUT_TABS);
+    keys.extend(crate::about::SIBLINGS.iter().map(|(_, _, what)| *what));
+    keys.extend(crate::credits::NameMode::ALL.iter().map(|mode| mode.label()));
+    keys.extend(crate::credits::SortKey::ALL.iter().flat_map(|key| [key.label().0, key.label().1]));
+    // Docking chrome labels reach `tr` through craft-ui's localizer.
+    keys.extend(crate::panel_docking::DOCK_LABELS.iter().map(|(_, english)| *english));
+    // UI labels passed to `tr` that no other catalog has yet.
+    keys.extend([
+        "(any)",
+        "(unchanged)",
+        "[No Language]",
+        "Cell Number:",
+        "Differs from this document",
+        "Digits:",
+        "Change fill to:",
+        "Chinese: Simplified",
+        "Chinese: Traditional",
+        "Don't Save",
+        "Email Address:",
+        "Email:",
+        "Find fill:",
+        "H:",
+        "Message:",
+        "Organization:",
+        "Phone:",
+        "W:",
+        "Subject:",
+        "Text:",
+        "Unsaved Changes",
+        "“{}” has changes that are not saved. Save them before closing?",
+        "% of all commits",
+        "{count} conflict(s): {names}",
+        "{count} match(es)",
+        "{count} replacement(s) made",
+        "{contributors} contributors · {commits} commits",
+        "{label}: {name} (double-click: Color Picker)",
+        "All",
+        "Align To",
+        "Arrangement",
+        "Auto Rename",
+        "Character Style",
+        "Company",
+        "DesignCraft page",
+        "Equal fixed heights for the selected rows; cell text may become overset.",
+        "Found",
+        "Grab bag",
+        "Key Object",
+        "Load Styles",
+        "layer",
+        "layers",
+        "Lines +/−",
+        "New Cell Style",
+        "New Table Style",
+        "No contributor data was built into this copy.",
+        "No matches",
+        "No model credits were built into this copy.",
+        "Object Style",
+        "Paragraph Style",
+        "PDF/X-1a:2003",
+        "Press keys…",
+        "Range:",
+        "Redefine Document Style",
+        "Report an issue",
+        "Reverse the order",
+        "Sort Entries in Alphabetical Order",
+        "Story {story} ← story {parent}",
+        "Story Editor — {count} words",
+        "Text Anchor",
+        "Transparency Flattener",
+        "Use Document Style Definition",
+        // Status-bar messages.
+        "Alternate layout",
+        "Couldn't write recovery data: {error}",
+        "Export a PDF, IDML or package to share — no cloud account needed.",
+        "Import cancelled: the originating document has closed",
+        "Invalid panel layout; restored the default dock",
+        "PDF import cancelled: the originating document has closed",
+        "Packaged {count} files into {dir}",
+        "Relinked {count}",
+        "Sent {count} page(s) to {printer}",
+        "the default printer",
+        "{name}: import cancelled while a dialog is open; choose the file again",
+        "{name}: {count} step(s) done",
+    ]);
+    // The Keyboard Shortcuts dialog's strings (craft-keymap) reach `tr` too.
+    keys.extend(crate::shortcuts_dialog::strings());
+    keys
+}
+
+#[test]
+fn czech_counts_use_the_plural_form_for_the_number() {
+    for (noun, [one, few, other]) in cs::PLURALS {
+        for (n, form) in [(0, other), (1, one), (2, few), (4, few), (5, other), (11, other), (22, other)] {
+            let expected = if form.trim().is_empty() { format!("{n} {}", tr("cs", noun)) } else { format!("{n} {form}") };
+            assert_eq!(count_label("cs", noun, n), expected, "{noun}");
+        }
+    }
+    // A noun without plural forms keeps the plain translation.
+    assert_eq!(count_label("cs", "a new noun", 3), "3 a new noun");
+}
diff --git a/crates/ui-egui/src/i18n/uk.rs b/crates/ui-egui/src/i18n/uk.rs
index 62c594fd1..8f9e67d02 100644
--- a/crates/ui-egui/src/i18n/uk.rs
+++ b/crates/ui-egui/src/i18n/uk.rs
@@ -15,6 +15,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Document…", "Новий документ…"),
     ("Open…", "Відкрити…"),
     ("Close", "Закрити"),
+    ("Dismiss", "Приховати"),
     ("Save", "Зберегти"),
     ("Save As…", "Зберегти як…"),
     ("Save a Copy…", "Зберегти копію…"),
@@ -638,6 +639,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Convert Text to Table", "Перетворити текст на таблицю"),
     ("Convert to Button", "Перетворити на кнопку"),
     ("Convert to Form Field", "Перетворити на поле форми"),
+    ("Convert to Note", "Перетворити на примітку"),
     ("Conveyor", "Конвеєр"),
     ("Copy Link(s) To…", "Копіювати пов’язані файли до…"),
     ("Corner Options…", "Параметри кутів…"),
@@ -728,6 +730,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Insert Math Expression…", "Вставити математичний вираз…"),
     ("Insert Pages…", "Вставити сторінки…"),
     ("Insert Variable", "Вставити змінну"),
+    ("Convert Variable to Text", "Перетворити змінну на текст"),
     ("Inspect Document", "Перевірити документ"),
     ("Interface Color Theme", "Колірна тема інтерфейсу"),
     ("Join the ArtCraft Discord…", "Приєднатися до Discord ArtCraft…"),
@@ -763,6 +766,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("New Table Style…", "Новий стиль таблиці…"),
     ("Next Cell", "Наступна клітинка"),
     ("Next Document", "Наступний документ"),
+    ("Next Note", "Наступна примітка"),
     ("Next Object Above", "Наступний об’єкт вище"),
     ("Next Object Below", "Наступний об’єкт нижче"),
     ("Next Object in Group", "Наступний об’єкт у групі"),
@@ -796,6 +800,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Preflight Document", "Перевірити документ перед друком"),
     ("Previous Cell", "Попередня клітинка"),
     ("Previous Document", "Попередній документ"),
+    ("Previous Note", "Попередня примітка"),
     ("Previous Object in Group", "Попередній об’єкт у групі"),
     ("Primary Text Frame", "Основний текстовий фрейм"),
     ("Print Booklet…", "Друк буклета…"),
@@ -836,6 +841,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Set Visibility / Lock", "Установити видимість / блокування"),
     ("Show Panel", "Показати панель"),
     ("Show/Hide Baseline Grid", "Показати/приховати сітку базових ліній"),
+    ("Show/Hide Depth Ruler", "Показати/приховати лінійку глибини"),
     ("Show/Hide Document Grid", "Показати/приховати сітку документа"),
     ("Show/Hide Frame Edges", "Показати/приховати межі фреймів"),
     ("Show/Hide Guides", "Показати/приховати напрямні"),
@@ -849,6 +855,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Sort", "Сортувати"),
     ("Split Cell Horizontally", "Розділити клітинку горизонтально"),
     ("Split Cell Vertically", "Розділити клітинку вертикально"),
+    ("Split Note", "Розділити примітку"),
     ("Split Path", "Розділити контур"),
     ("Step and Repeat…", "Крок і повторення…"),
     ("Stroke Styles", "Стилі обведення"),
@@ -1633,6 +1640,7 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Records per page", "Записів на сторінку"),
     ("Single record", "Один запис"),
     ("Multiple records", "Кілька записів"),
+    ("Arrangement", "Упорядкування"),
     ("Rows first", "Спочатку рядки"),
     ("Columns first", "Спочатку стовпці"),
     ("Column spacing", "Інтервал між стовпцями"),
@@ -1651,6 +1659,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[
     ("Previous Page", "Попередня сторінка"),
     ("First Page", "Перша сторінка"),
     ("Last Page", "Остання сторінка"),
+    ("Go Back", "Назад"),
+    ("Go Forward", "Вперед"),
     ("Object Styles", "Стилі об’єктів"),
     ("Row", "Рядок"),
     ("Column", "Стовпець"),
diff --git a/crates/ui-egui/src/icons.rs b/crates/ui-egui/src/icons.rs
index 72c37fc83..7ffbbee5a 100644
--- a/crates/ui-egui/src/icons.rs
+++ b/crates/ui-egui/src/icons.rs
@@ -74,12 +74,11 @@ fn arrow(pen: &Pen, hollow: bool) {
     }
 }
 
-/// Paint icon `name` into `r`.
-pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
-    let mut pen = Pen { p, r, c, w: 1.3 };
+/// Icons of one family: paints `name` and says whether it is one of them.
+fn paint_tools(pen: &mut Pen, name: &str) -> bool {
     match name {
-        "tool-selection" => arrow(&pen, false),
-        "tool-direct" => arrow(&pen, true),
+        "tool-selection" => arrow(pen, false),
+        "tool-direct" => arrow(pen, true),
         "tool-page" => {
             pen.closed(&[(5.0, 3.0), (12.0, 3.0), (15.0, 6.0), (15.0, 17.0), (5.0, 17.0)]);
             pen.line(&[(12.0, 3.0), (12.0, 6.0), (15.0, 6.0)]);
@@ -156,14 +155,14 @@ pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
         }
         "tool-scale" => {
             // A small square grown into a larger one from their shared corner.
-            Pen { p, r, c: c.gamma_multiply(0.45), w: 1.0 }.rect(3.0, 3.0, 17.0, 17.0);
+            Pen { p: pen.p, r: pen.r, c: pen.c.gamma_multiply(0.45), w: 1.0 }.rect(3.0, 3.0, 17.0, 17.0);
             pen.rect(3.0, 10.0, 10.0, 17.0);
             pen.line(&[(10.0, 10.0), (15.0, 5.0)]);
             pen.line(&[(11.5, 5.0), (15.0, 5.0), (15.0, 8.5)]);
         }
         "tool-shear" => {
             // A rectangle slanted into a parallelogram along its base.
-            Pen { p, r, c: c.gamma_multiply(0.45), w: 1.0 }.rect(3.0, 8.0, 13.0, 17.0);
+            Pen { p: pen.p, r: pen.r, c: pen.c.gamma_multiply(0.45), w: 1.0 }.rect(3.0, 8.0, 13.0, 17.0);
             pen.closed(&[(7.0, 8.0), (17.0, 8.0), (13.0, 17.0), (3.0, 17.0)]);
             pen.line(&[(7.0, 4.0), (16.0, 4.0)]);
             pen.line(&[(13.5, 2.0), (16.0, 4.0), (13.5, 6.0)]);
@@ -192,7 +191,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
         "tool-gradient" | "tool-gradient-feather" => {
             for i in 0..6 {
                 let a = 30 + i * 35;
-                let pc = Pen { p, r, c: c.gamma_multiply(a as f32 / 255.0 * 1.2), w: 1.0 };
+                let pc = Pen { p: pen.p, r: pen.r, c: pen.c.gamma_multiply(a as f32 / 255.0 * 1.2), w: 1.0 };
                 pc.frect(3.0 + i as f32 * 2.33, 4.0, 3.0 + (i + 1) as f32 * 2.33, 16.0);
             }
             pen.rect(3.0, 4.0, 17.0, 16.0);
@@ -283,7 +282,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
         }
         "panel-gradient" => {
             for i in 0..7 {
-                let pc = Pen { p, r, c: c.gamma_multiply(0.15 + i as f32 * 0.14), w: 1.0 };
+                let pc = Pen { p: pen.p, r: pen.r, c: pen.c.gamma_multiply(0.15 + i as f32 * 0.14), w: 1.0 };
                 pc.frect(3.0 + i as f32 * 2.0, 5.0, 5.0 + i as f32 * 2.0, 15.0);
             }
         }
@@ -331,6 +330,14 @@ pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
             pen.line(&[(12.5, 10.0), (11.0, 8.5)]);
             pen.line(&[(12.5, 10.0), (11.0, 11.5)]);
         }
+        _ => return false,
+    }
+    true
+}
+
+/// Icons of one family: paints `name` and says whether it is one of them.
+fn paint_panels(pen: &mut Pen, name: &str) -> bool {
+    match name {
         "objdistribute-v" => {
             pen.frect(5.0, 2.5, 15.0, 6.0);
             pen.frect(5.0, 14.0, 15.0, 17.5);
@@ -600,6 +607,14 @@ pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
                 }
             }
         }
+        _ => return false,
+    }
+    true
+}
+
+/// Icons of one family: paints `name` and says whether it is one of them.
+fn paint_shapes(pen: &mut Pen, name: &str) -> bool {
+    match name {
         // Flex Layout panel (original drawings): direction arrows, wrap, justification, spacing.
         "flex-right" | "flex-left" | "flex-down" | "flex-up" => {
             let pts: [(f32, f32); 5] = match name {
@@ -748,6 +763,14 @@ pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
             pen.line(&[(10.0, 3.0), (10.0, 13.0)]);
             pen.line(&[(6.5, 9.5), (10.0, 13.0), (13.5, 9.5)]);
         }
+        _ => return false,
+    }
+    true
+}
+
+/// Icons of one family: paints `name` and says whether it is one of them.
+fn paint_page(pen: &mut Pen, name: &str) -> bool {
+    match name {
         "orient-portrait" => {
             pen.rect(5.5, 3.0, 14.5, 17.0);
             pen.fcircle(10.0, 8.0, 1.8);
@@ -911,6 +934,14 @@ pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
                 pen.line(&[(15.5, 2.0), (15.5, 18.0)]);
             }
         }
+        _ => return false,
+    }
+    true
+}
+
+/// Icons of one family: paints `name` and says whether it is one of them.
+fn paint_text(pen: &mut Pen, name: &str) -> bool {
+    match name {
         "text-columns" => {
             pen.rect(2.5, 3.5, 17.5, 16.5);
             pen.line(&[(7.5, 3.5), (7.5, 16.5)]);
@@ -922,6 +953,13 @@ pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
             pen.line(&[(12.0, 3.5), (12.0, 16.5)]);
             pen.line(&[(9.0, 10.0), (11.0, 10.0)]);
         }
+        "small-caps" => {
+            // Two original T shapes share a baseline; no phonetic small-cap glyph is required.
+            pen.line(&[(3.0, 5.0), (10.0, 5.0)]);
+            pen.line(&[(6.5, 5.0), (6.5, 15.0)]);
+            pen.line(&[(12.0, 8.0), (17.0, 8.0)]);
+            pen.line(&[(14.5, 8.0), (14.5, 15.0)]);
+        }
         "font-size" => {
             pen.text(6.0, 12.5, "T", 10.0);
             pen.text(13.0, 10.5, "T", 17.0);
@@ -1140,9 +1178,21 @@ pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
             pen.rect(3.0, 4.0, 17.0, 16.0);
             pen.line(&[(3.0, 7.0), (17.0, 7.0)]);
         }
-        _ => {
-            pen.rect(4.0, 4.0, 16.0, 16.0);
-        }
+        _ => return false,
+    }
+    true
+}
+
+/// Paint icon `name` into `r`.
+pub fn paint(p: &Painter, r: Rect, name: &str, c: Color32) {
+    let mut pen = Pen { p, r, c, w: 1.3 };
+    if !(paint_tools(&mut pen, name)
+        || paint_panels(&mut pen, name)
+        || paint_shapes(&mut pen, name)
+        || paint_page(&mut pen, name)
+        || paint_text(&mut pen, name))
+    {
+        pen.rect(4.0, 4.0, 16.0, 16.0);
     }
 }
 
@@ -1158,7 +1208,7 @@ pub fn button(ui: &mut egui::Ui, name: &str, size: f32, selected: bool, tip: &st
     let pad = size * 0.16;
     paint(ui.painter(), r.shrink(pad), name, if selected { t.text_strong } else { t.icon });
     let enabled = ui.is_enabled();
-    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, enabled, selected, tip));
+    resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, enabled, selected, tip));
     if tip.is_empty() {
         resp
     } else {
diff --git a/crates/ui-egui/src/key_names.rs b/crates/ui-egui/src/key_names.rs
new file mode 100644
index 000000000..7e9c49e3c
--- /dev/null
+++ b/crates/ui-egui/src/key_names.rs
@@ -0,0 +1,47 @@
+/// Named `KeyboardEvent.key` values (W3C UI Events) that a browser reports for a key that types
+/// nothing, separated by spaces. eframe's web backend sends the ones it doesn't know as text.
+const KEY_NAMES: &str = "\
+    Unidentified Alt AltGraph CapsLock Control Fn FnLock Hyper Meta NumLock ScrollLock Shift Super Symbol SymbolLock OS Win Enter \
+    Tab ArrowDown ArrowLeft ArrowRight ArrowUp End Home PageDown PageUp Backspace Clear Copy CrSel Cut Delete EraseEof ExSel \
+    Insert Paste Redo Undo Accept Again Attn Cancel ContextMenu Esc Escape Execute Find Finish Help Pause Play Props Select \
+    ZoomIn ZoomOut BrightnessDown BrightnessUp Eject LogOff Power PowerOff PrintScreen Hibernate Standby WakeUp AllCandidates \
+    Alphanumeric CodeInput Compose Convert Dead FinalMode GroupFirst GroupLast GroupNext GroupPrevious ModeChange NextCandidate \
+    NonConvert PreviousCandidate Process SingleCandidate HangulMode HanjaMode JunjaMode Eisu Hankaku Hiragana HiraganaKatakana \
+    KanaMode KanjiMode Katakana Romaji Zenkaku ZenkakuHankaku Soft1 Soft2 Soft3 Soft4 ChannelDown ChannelUp Close MailForward \
+    MailReply MailSend MediaClose MediaFastForward MediaPause MediaPlay MediaPlayPause MediaRecord MediaRewind MediaStop \
+    MediaTrackNext MediaTrackPrevious New Open Print Save SpellCheck Key11 Key12 AudioBalanceLeft AudioBalanceRight \
+    AudioBassBoostDown AudioBassBoostToggle AudioBassBoostUp AudioFaderFront AudioFaderRear AudioSurroundModeNext AudioTrebleDown \
+    AudioTrebleUp AudioVolumeDown AudioVolumeUp AudioVolumeMute MicrophoneToggle MicrophoneVolumeDown MicrophoneVolumeUp \
+    MicrophoneVolumeMute SpeechCorrectionList SpeechInputToggle LaunchApplication1 LaunchApplication2 LaunchCalendar \
+    LaunchContacts LaunchMail LaunchMediaPlayer LaunchMusicPlayer LaunchPhone LaunchScreenSaver LaunchSpreadsheet \
+    LaunchWebBrowser LaunchWebCam LaunchWordProcessor BrowserBack BrowserFavorites BrowserForward BrowserHome BrowserRefresh \
+    BrowserSearch BrowserStop AppSwitch Call Camera CameraFocus EndCall GoBack GoHome HeadsetHook LastNumberRedial Notification \
+    MannerMode VoiceDial TV TV3DMode TVAntennaCable TVAudioDescription TVAudioDescriptionMixDown TVAudioDescriptionMixUp \
+    TVContentsMenu TVDataService TVInput TVInputComponent1 TVInputComponent2 TVInputComposite1 TVInputComposite2 TVInputHDMI1 \
+    TVInputHDMI2 TVInputHDMI3 TVInputHDMI4 TVInputVGA1 TVMediaContext TVNetwork TVNumberEntry TVPower TVRadioService TVSatellite \
+    TVSatelliteBS TVSatelliteCS TVSatelliteToggle TVTerrestrialAnalog TVTerrestrialDigital TVTimer AVRInput AVRPower ColorF0Red \
+    ColorF1Green ColorF2Yellow ColorF3Blue ColorF4Grey ColorF5Brown ClosedCaptionToggle Dimmer DisplaySwap DVR Exit \
+    FavoriteClear0 FavoriteClear1 FavoriteClear2 FavoriteClear3 FavoriteRecall0 FavoriteRecall1 FavoriteRecall2 FavoriteRecall3 \
+    FavoriteStore0 FavoriteStore1 FavoriteStore2 FavoriteStore3 Guide GuideNextDay GuidePreviousDay Info InstantReplay Link \
+    ListProgram LiveContent Lock MediaApps MediaAudioTrack MediaLast MediaSkipBackward MediaSkipForward MediaStepBackward \
+    MediaStepForward MediaTopMenu NavigateIn NavigateNext NavigateOut NavigatePrevious NextFavoriteChannel NextUserProfile \
+    OnDemand Pairing PinPDown PinPMove PinPToggle PinPUp PlaySpeedDown PlaySpeedReset PlaySpeedUp RandomToggle RcLowBattery \
+    RecordSpeedNext RfBypass ScanChannelsToggle ScreenModeNext Settings SplitScreenToggle STBInput STBPower Subtitle Teletext \
+    VideoModeNext Wink ZoomToggle";
+
+/// Is `text` the name of a key ("AltGraph", "Dead", "F13") instead of typed text?
+pub fn is_key_name(text: &str) -> bool {
+    let function_key = text.strip_prefix('F').is_some_and(|n| !n.is_empty() && n.bytes().all(|b| b.is_ascii_digit()));
+    function_key || KEY_NAMES.split_ascii_whitespace().any(|k| k == text)
+}
+
+/// Drop text events that are key names: eframe's web backend sends the name of every key it
+/// doesn't know as text, so AltGr typed "AltGraph" into the story. `text_input_focused`: an egui
+/// text field or the canvas's text caret has the keyboard, so the browser's hidden text input
+/// sends the text, which holds only typed text (whole words from autocompletion too) and is left
+/// alone.
+pub fn drop_key_name_text(raw: &mut egui::RawInput, text_input_focused: bool) {
+    if !text_input_focused {
+        raw.events.retain(|e| !matches!(e, egui::Event::Text(t) if is_key_name(t)));
+    }
+}
diff --git a/crates/ui-egui/src/keys.rs b/crates/ui-egui/src/keys.rs
new file mode 100644
index 000000000..72d133f44
--- /dev/null
+++ b/crates/ui-egui/src/keys.rs
@@ -0,0 +1,581 @@
+//! Keyboard shortcuts on `craft-keymap`: the catalog (UI commands, engine commands, panels and
+//! tools with their default keys and menu paths), shortcut text, and the edits that
+//! `window.setShortcut` and the shortcut-set importer make.
+
+use std::collections::{HashMap, HashSet};
+use std::sync::OnceLock;
+use std::sync::atomic::{AtomicU8, Ordering};
+
+use craft_keymap::{AssignError, Bindable, Binding, Chord, CommandRef, Key, Keymap, Kind, Mods, Overrides, Platform, Policy, Scope, Scopes, Trigger};
+use serde_json::{Value, json};
+
+use crate::DesignApp;
+use crate::menus::{self, Item};
+
+/// The context bindings such as `Text: Cmd+B` name; active while text is being typed on the canvas.
+pub const TEXT_CONTEXT: &str = "Text";
+
+/// The command that opens a panel; a binding on it carries the panel id.
+pub const PANEL_COMMAND: &str = "window.panel";
+/// The command that selects a tool; a binding on it carries the tool id.
+pub const TOOL_COMMAND: &str = "tool.select";
+
+/// InDesign's default keys for the panels DesignCraft has, where DesignCraft's own defaults leave
+/// the key free.
+const PANEL_KEYS: &[(&str, &str)] = &[
+    ("swatches", "F5"),
+    ("color", "F6"),
+    ("layers", "F7"),
+    ("info", "F8"),
+    ("stroke", "F10"),
+    ("paragraphStyles", "F11"),
+    ("characterStyles", "Shift+F11"),
+    ("pages", "F12"),
+    ("align", "Shift+F7"),
+];
+
+/// Other names shortcut sets use for a command (InDesign's feature names), by command id.
+const IMPORT_ALIASES: &[(&str, &str)] = &[
+    ("app.quit", "Exit"),
+    ("app.preferences", "Preferences: General…"),
+    ("app.insertTableDialog", "Insert Table"),
+    ("view.togglePresentation", "Presentation"),
+    ("color.defaultFillStroke", "Apply Default Fill and Stroke Colors"),
+    ("color.swapFillStroke", "Swap Fill and Stroke Colors"),
+    ("view.togglePreview", "Toggle View Setting Between Default and Preview"),
+    ("type.bold", "Apply Bold"),
+    ("type.italic", "Apply Italic"),
+    ("window.hidePanels", "Show/Hide All Panels"),
+    ("window.hidePanelsExceptTools", "Show/Hide All Panels Except Toolbox"),
+    ("window.nextDocument", "Next Window"),
+    ("window.previousDocument", "Previous Window"),
+];
+
+/// Commands that show and hide something without "Show/Hide" in their label. A shortcut set may
+/// name a toggle by what it does now (`Hide Hidden Characters`); the importer matches such names
+/// only to toggles.
+const TOGGLES: &[&str] = &["view.hiddenCharacters", "view.tagMarkers"];
+
+/// Paths only the importer reads, where an alias would leave two commands on one name: InDesign's
+/// Tools area has Apply Color, which is also `object.color`'s label.
+const IMPORT_PATHS: &[(&str, &[&str])] = &[("color.applyColor", &["Tools", "Apply Color"])];
+
+/// Commands on text-editing chords (Cmd+Z, Cmd+A, and Ctrl+Y off macOS) that run while typing on the
+/// canvas too: the text tool has no undo or select-all of its own, and Story Editor toggles from the
+/// text. Their defaults get a copy in the Text context, which takes the chords from the text field.
+const TYPING_COMMANDS: &[&str] = &["edit.undo", "edit.redo", "edit.selectAll", "app.storyEditor"];
+
+/// Commands that open a panel, by panel id. The panel's binding gets the command's default key
+/// too, so the two are twins: a shortcut set that gives either one the key leaves both with it.
+const PANEL_TWINS: &[(&str, &str)] = &[
+    ("character", "app.characterPanel"),
+    ("paragraph", "app.paragraphPanel"),
+    ("glyphs", "app.glyphsPanel"),
+    ("characterStyles", "app.characterStylesPanel"),
+    ("paragraphStyles", "app.paragraphStylesPanel"),
+    ("table", "app.tablePanel"),
+    ("textWrap", "object.textWrap"),
+];
+
+pub fn panel(id: &str) -> CommandRef {
+    CommandRef::with_params(PANEL_COMMAND, json!({ "panel": id }))
+}
+
+pub fn tool(id: &str) -> CommandRef {
+    CommandRef::with_params(TOOL_COMMAND, json!({ "tool": id }))
+}
+
+/// The command a menu row or a `window.setShortcut` call names.
+pub fn command_ref(id: &str, params: &Value) -> CommandRef {
+    match params {
+        Value::Null => CommandRef::new(id),
+        Value::Object(m) if m.is_empty() => CommandRef::new(id),
+        p => CommandRef::with_params(id, p.clone()),
+    }
+}
+
+/// The browser's operating system as [`note_platform`] recorded it, by [`platform_code`]; 0
+/// before the first frame.
+static WEB_PLATFORM: AtomicU8 = AtomicU8::new(0);
+
+fn platform_code(p: Platform) -> u8 {
+    match p {
+        Platform::Mac => 1,
+        Platform::Windows => 2,
+        Platform::Linux => 3,
+        _ => 0,
+    }
+}
+
+/// The platform shortcuts follow: the build's, and on the web the browser's operating system, so a
+/// browser on a Mac reads ⌘ as Cmd and leaves Control as Control.
+pub fn platform() -> Platform {
+    if !cfg!(target_arch = "wasm32") {
+        return Platform::current();
+    }
+    match WEB_PLATFORM.load(Ordering::Relaxed) {
+        1 => Platform::Mac,
+        2 => Platform::Windows,
+        3 => Platform::Linux,
+        _ => Platform::current(),
+    }
+}
+
+/// Records the platform egui reports, which the web build reads from the browser's user agent.
+pub fn note_platform(ctx: &egui::Context) {
+    if cfg!(target_arch = "wasm32") {
+        WEB_PLATFORM.store(platform_code(craft_keymap::egui::platform(ctx)), Ordering::Relaxed);
+    }
+}
+
+/// The keymap with the user's overrides, for [`platform`].
+pub fn new_keymap(overrides: Overrides) -> Keymap {
+    keymap_for(platform(), overrides)
+}
+
+/// The keymap for `platform`: the system's own chords are reserved, so neither a user edit nor an
+/// imported set can take them.
+pub fn keymap_for(platform: Platform, overrides: Overrides) -> Keymap {
+    Keymap::new(catalog().to_vec(), Scopes::new().with_context(TEXT_CONTEXT), platform)
+        .with_reserved(craft_keymap::reserved::system(platform))
+        .with_overrides(overrides)
+}
+
+/// Every bindable command, in dispatch order: where two share keys the earlier one runs. UI
+/// commands come first (⌘N is the New Document dialog, not a bare `file.new`), then engine
+/// commands, panels and tools.
+pub fn catalog() -> &'static [Bindable] {
+    &built().0
+}
+
+/// Whether the Keyboard Shortcuts dialog lists `b`. Engine commands with neither a menu row nor a
+/// default key are for scripts and the control channel (`file.save`, `selection.set`): the dialog
+/// leaves them out, and they still take keys and count in conflicts.
+pub fn listed(b: &Bindable) -> bool {
+    !(b.command.params.is_null() && built().1.contains(b.command.id.as_str()))
+}
+
+fn built() -> &'static (Vec<Bindable>, HashSet<&'static str>) {
+    static CATALOG: OnceLock<(Vec<Bindable>, HashSet<&'static str>)> = OnceLock::new();
+    CATALOG.get_or_init(build_catalog)
+}
+
+/// The catalog and the engine commands [`listed`] leaves out.
+fn build_catalog() -> (Vec<Bindable>, HashSet<&'static str>) {
+    let paths = menu_paths();
+    // An engine command's own menu placement counts only where no menu row stands: a row there
+    // runs a UI command in its place (File › Save is the Save dialog when needed), and two
+    // commands on one path leave the importer unable to pick either.
+    let normalized = |path: &[String]| path.iter().map(|s| craft_keymap::import::normalize_label(s)).collect::<Vec<_>>();
+    let rows: HashSet<Vec<String>> = paths.values().flatten().map(|p| normalized(p)).collect();
+    let app = Scope::app();
+    let mut out = Vec::new();
+    let mut add = |command: CommandRef, label: &str, defaults: &[&str], fallback_path: Option<Vec<String>>, kind: Kind| {
+        let mut b = Bindable::new(command, label, app.clone()).with_kind(kind);
+        match paths.get(&b.command.key()) {
+            Some(found) => b.paths.extend(found.iter().cloned()),
+            None => b.paths.extend(fallback_path.filter(|p| !rows.contains(&normalized(p)))),
+        }
+        for binding in defaults.iter().filter_map(|d| Binding::parse(d).ok()) {
+            b = b.with_default(binding);
+        }
+        out.push(b);
+    };
+    for (id, label, _, _) in menus::UI_COMMANDS {
+        add(CommandRef::new(*id), label, menus::default_shortcut(id).as_slice(), None, Kind::Command);
+    }
+    // A UI command's default key runs it, never the engine command it stands in for (⌘S is the
+    // Save dialog when needed, not a bare `file.save`): the engine command does not get that key.
+    let ui_keys: Vec<Trigger> = menus::UI_COMMANDS
+        .iter()
+        .filter_map(|(id, ..)| menus::default_shortcut(id))
+        .filter_map(|d| Binding::parse(d).ok())
+        .map(|b| b.trigger)
+        .collect();
+    let mut internal = HashSet::new();
+    for c in designcraft_engine::command_specs() {
+        let shortcut = c.shortcut.filter(|d| Binding::parse(d).is_ok_and(|b| !ui_keys.contains(&b.trigger)));
+        if c.menu.is_empty() && shortcut.is_none() && !paths.contains_key(c.id) {
+            internal.insert(c.id);
+        }
+        let path = (!c.menu.is_empty()).then(|| c.menu.iter().map(|s| s.to_string()).chain([c.label.to_string()]).collect());
+        add(CommandRef::new(c.id), c.label, shortcut.as_slice(), path, Kind::Command);
+    }
+    let mut seen = Vec::new();
+    for (id, label, _) in crate::dock::DOCK_TABS.iter().chain(crate::dock::ICON_PANELS) {
+        if seen.contains(id) {
+            continue;
+        }
+        seen.push(id);
+        let own = PANEL_KEYS.iter().find(|(p, _)| p == id).map(|(_, k)| *k);
+        let twin = PANEL_TWINS.iter().find(|(p, _)| p == id).and_then(|(_, c)| menus::default_shortcut(c));
+        let defaults: Vec<&str> = own.into_iter().chain(twin).collect();
+        add(panel(id), label, &defaults, Some(vec!["Window".into(), (*label).into()]), Kind::Command);
+    }
+    for group in designcraft_tools::TOOL_GROUPS {
+        let Some(first) = group.first() else { continue };
+        for t in group.iter() {
+            let kind = Kind::Tool { group: Some(first.id.to_string()) };
+            add(tool(t.id), t.label, t.shortcut.as_slice(), None, kind);
+        }
+    }
+    for b in &mut out {
+        // Shortcut sets file tools under Tools, which is no menu here.
+        if matches!(b.kind, Kind::Tool { .. }) {
+            b.import_paths.push(vec!["Tools".into(), b.label.clone()]);
+        }
+        if !b.command.params.is_null() {
+            continue;
+        }
+        let id = b.command.id.as_str();
+        b.is_toggle = b.label.starts_with("Show/Hide ") || TOGGLES.contains(&id);
+        if TYPING_COMMANDS.contains(&id)
+            && let Some(text) = Scope::new(TEXT_CONTEXT)
+        {
+            let copies: Vec<Binding> = b.defaults.iter().filter(|d| d.scope.is_none()).map(|d| Binding::in_scope(d.trigger, text.clone())).collect();
+            b.defaults.extend(copies);
+        }
+        b.aliases.extend(IMPORT_ALIASES.iter().filter(|(c, _)| *c == id).map(|(_, a)| a.to_string()));
+        b.import_paths.extend(IMPORT_PATHS.iter().filter(|(c, _)| *c == id).map(|(_, p)| p.iter().map(|s| s.to_string()).collect()));
+    }
+    (out, internal)
+}
+
+/// Menu paths (menu, submenus, label) of every menu row, by command key.
+fn menu_paths() -> HashMap<String, Vec<Vec<String>>> {
+    fn walk(items: &[Item], path: &mut Vec<String>, out: &mut HashMap<String, Vec<Vec<String>>>) {
+        for it in items {
+            match it {
+                Item::Sub(name, children) => {
+                    path.push(name.clone());
+                    walk(children, path, out);
+                    path.pop();
+                }
+                Item::Cmd { label, id, params, .. } => {
+                    let mut full = path.clone();
+                    full.push(label.clone());
+                    out.entry(command_ref(id, params).key()).or_default().push(full);
+                }
+                Item::Sep => {}
+            }
+        }
+    }
+    let mut out = HashMap::new();
+    for (menu, entries) in menus::menu_tree() {
+        walk(&entries, &mut vec![menu.to_string()], &mut out);
+    }
+    out
+}
+
+/// The binding a command shows: the first in its home scope, else its first.
+fn shown_binding(keymap: &Keymap, cmd: &CommandRef) -> Option<Binding> {
+    let bindings = keymap.bindings(cmd);
+    bindings.iter().find(|b| b.scope.is_none()).or_else(|| bindings.first()).cloned()
+}
+
+/// The shortcut in effect for a command, as stored and sent ("Cmd+Alt+K", "Text: F7").
+pub fn shortcut(keymap: &Keymap, cmd: &CommandRef) -> Option<String> {
+    let b = shown_binding(keymap, cmd)?;
+    let home = keymap.bindable(cmd).map_or_else(Scope::app, |c| c.scope.clone());
+    Some(b.text(&home))
+}
+
+/// The shortcut in effect for a command, for menus and lists (⌥⌘K on macOS, Ctrl+Alt+K elsewhere).
+pub fn shortcut_display(keymap: &Keymap, cmd: &CommandRef) -> Option<String> {
+    shown_binding(keymap, cmd).map(|b| b.trigger.display(keymap.platform()))
+}
+
+/// A key press as shortcut text ("Cmd+Shift+K"); `None` for a key the keymap has no name for.
+pub fn chord_text(m: egui::Modifiers, key: egui::Key) -> Option<String> {
+    let key = Key::from_egui(key)?;
+    Some(Chord::new(Mods::from_egui(&m, platform()), key).to_string())
+}
+
+/// Copies the keymap's overrides to the saved UI state and, outside the Keyboard Shortcuts
+/// dialog (which saves sets itself), to the active shortcut set.
+pub fn store(app: &mut DesignApp) {
+    if app.ui.shortcuts != *app.keymap.overrides() {
+        app.ui.shortcuts = app.keymap.overrides().clone();
+    }
+    if app.shortcut_dialog.is_none() {
+        store_in_set(&mut app.ui);
+    }
+}
+
+/// Saves `ui.shortcuts` to the active shortcut set when they differ. Edits of the built-in set go
+/// to a new set, Custom, which becomes active.
+pub fn store_in_set(ui: &mut crate::UiState) {
+    let builtins = &crate::shortcuts_dialog::BUILTINS;
+    if ui.shortcut_sets.active_overrides(builtins) == &ui.shortcuts {
+        return;
+    }
+    let custom = crate::i18n::tr(&ui.language, crate::shortcuts_dialog::CUSTOM_SET);
+    // Refused only with the most sets already made: ui.json still saves the shortcuts themselves,
+    // and the next frame tries again.
+    let _ = ui.shortcut_sets.store(ui.shortcuts.clone(), builtins, custom);
+}
+
+/// Gives a command keys (replacing its others), no keys (`""`), or its defaults back (`None`).
+/// Other commands on the same keys keep them unless `policy` is [`Policy::Steal`]. Returns the
+/// commands it took the keys from.
+pub fn set(app: &mut DesignApp, cmd: &CommandRef, shortcut: Option<&str>, policy: Policy) -> Result<Vec<CommandRef>, String> {
+    app.sync_keymap();
+    if app.keymap.bindable(cmd).is_none() {
+        return Err(format!("unknown command `{cmd}`"));
+    }
+    let mut taken = Vec::new();
+    match shortcut.map(str::trim) {
+        None => {
+            app.keymap.reset(cmd);
+        }
+        Some("") => {
+            if !app.keymap.clear(cmd) {
+                return Err("too many changed shortcuts".into());
+            }
+        }
+        Some(sc) => {
+            let binding = Binding::parse(sc).map_err(|e| format!("can't read shortcut `{sc}`: {e}"))?;
+            let done = app.keymap.set_bindings(cmd, vec![binding], policy).map_err(|e| assign_error(&app.keymap, sc, &e))?;
+            taken = done.taken_from.into_iter().map(|h| h.command).collect();
+        }
+    }
+    store(app);
+    Ok(taken)
+}
+
+/// Why the keymap refused `sc`. A chord the system takes is named as the menus show it
+/// ("⌘Tab is reserved by the system").
+fn assign_error(keymap: &Keymap, sc: &str, e: &AssignError) -> String {
+    match e {
+        AssignError::Reserved(t) => format!("{} is reserved by the system", t.display(keymap.platform())),
+        e => format!("can't assign `{sc}`: {e}"),
+    }
+}
+
+/// Whether `a` and `b` are a panel and the command that opens it ([`PANEL_TWINS`]).
+pub fn twins(a: &CommandRef, b: &CommandRef) -> bool {
+    let one_way = |p: &CommandRef, c: &CommandRef| {
+        p.id == PANEL_COMMAND
+            && c.params.is_null()
+            && p.params.get("panel").and_then(Value::as_str).is_some_and(|id| PANEL_TWINS.contains(&(id, c.id.as_str())))
+    };
+    one_way(a, b) || one_way(b, a)
+}
+
+/// Other commands on the keys `cmd` holds, by command key. A panel's twin is not a conflict: both
+/// open the panel.
+pub fn conflicts(keymap: &Keymap, cmd: &CommandRef) -> Vec<String> {
+    let mut out: Vec<String> = Vec::new();
+    for c in keymap.conflicts_with(cmd) {
+        if twins(cmd, &c.b.0) {
+            continue;
+        }
+        let key = c.b.0.key();
+        if !out.contains(&key) {
+            out.push(key);
+        }
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const PLATFORMS: [Platform; 3] = [Platform::Mac, Platform::Windows, Platform::Linux];
+
+    /// No default shortcut sits on a chord an operating system takes before the app sees it.
+    #[test]
+    fn defaults_avoid_reserved_chords() {
+        for p in PLATFORMS {
+            let km = keymap_for(p, Overrides::new());
+            let reserved: Vec<String> = km
+                .catalog()
+                .iter()
+                .flat_map(|b| km.default_bindings(&b.command).into_iter().map(move |d| (b.command.key(), d)))
+                .filter(|(_, d)| km.is_reserved(&d.trigger.chord))
+                .map(|(k, d)| format!("{k} {}", d.trigger))
+                .collect();
+            assert_eq!(reserved, Vec::<String>::new(), "{p:?}: defaults on reserved chords");
+        }
+    }
+
+    /// A chord the operating system takes, per platform.
+    fn os_chord(p: Platform) -> &'static str {
+        match p {
+            Platform::Mac => "Cmd+Tab",
+            Platform::Windows => "Alt+F4",
+            _ => "Cmd+Alt+F2",
+        }
+    }
+
+    /// Binding a chord the system takes is refused with a message naming it, and a saved override
+    /// on one leaves the command its default.
+    #[test]
+    fn a_reserved_chord_is_refused() {
+        let cmd = CommandRef::new("app.palette");
+        for p in PLATFORMS {
+            let mut km = keymap_for(p, Overrides::new());
+            let before = km.bindings(&cmd);
+            let sc = os_chord(p);
+            let binding = Binding::parse(sc).unwrap();
+            let shown = binding.trigger.display(p);
+            let err = km.set_bindings(&cmd, vec![binding], Policy::Steal).unwrap_err();
+            assert_eq!(assign_error(&km, sc, &err), format!("{shown} is reserved by the system"), "{p:?}");
+            assert_eq!(km.bindings(&cmd), before, "{p:?}");
+            let mut saved = Overrides::new();
+            saved.insert(cmd.key(), vec![sc.to_string()]);
+            assert_eq!(keymap_for(p, saved).bindings(&cmd), before, "{p:?}: a saved reserved chord");
+        }
+        // Through `window.setShortcut`, as the Keyboard Shortcuts dialog and the control channel set keys.
+        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        let sc = os_chord(platform());
+        let r = menus::run_ui(&mut app, "window.setShortcut", &json!({"id": "app.palette", "shortcut": sc, "steal": true})).unwrap();
+        assert!(r.unwrap_err().ends_with("is reserved by the system"));
+        assert_eq!(menus::shortcut_of(&app, "app.palette").as_deref(), Some("Cmd+Enter"));
+    }
+
+    /// The web build follows the operating system in the browser's user agent; an iPad counts as a
+    /// Mac.
+    #[test]
+    fn browser_user_agent_picks_the_platform() {
+        use egui::os::OperatingSystem as Os;
+        let ctx = egui::Context::default();
+        let of = |ua: &str| {
+            ctx.set_os(Os::from_user_agent(ua));
+            craft_keymap::egui::platform(&ctx)
+        };
+        let mac = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Safari/605.1.15";
+        let ipad = "Mozilla/5.0 (iPad; CPU OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Mobile/15E148 Safari/604.1";
+        let windows = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36";
+        let linux = "Mozilla/5.0 (X11; Linux x86_64; rv:125.0) Gecko/20100101 Firefox/125.0";
+        let android = "Mozilla/5.0 (Linux; Android 14; Pixel 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36";
+        assert_eq!(of(mac), Platform::Mac);
+        assert_eq!(of(ipad), Platform::Mac);
+        assert_eq!(of(windows), Platform::Windows);
+        assert_eq!(of(linux), Platform::Linux);
+        assert_eq!(of(android), Platform::Linux);
+        // Native builds keep their own platform whatever egui reports.
+        if !cfg!(target_arch = "wasm32") {
+            ctx.set_os(Os::Mac);
+            note_platform(&ctx);
+            assert_eq!(platform(), Platform::current());
+        }
+    }
+
+    /// An app typing in a text frame holding "Page ", with the caret at its end, and a function
+    /// that runs one frame of the whole UI with `events` and `modifiers` held.
+    fn typing_in_a_text_frame() -> (DesignApp, Value, impl FnMut(&mut DesignApp, egui::Modifiers, Vec<egui::Event>)) {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        let story = app.run("frame.create", json!({"rect": [36, 36, 300, 200], "content": "text", "text": "Page "})).unwrap()["story"].clone();
+        app.select_tool("type");
+        app.run("text.select", json!({"story": story, "anchor": 5, "focus": 5})).unwrap();
+        assert!(app.session.wants_text());
+        let ctx = egui::Context::default();
+        let frame = move |app: &mut DesignApp, modifiers: egui::Modifiers, events: Vec<egui::Event>| {
+            let input = egui::RawInput {
+                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+                events: [egui::Event::ModifiersChanged(modifiers)].into_iter().chain(events).collect(),
+                ..Default::default()
+            };
+            let mut out = ctx.run_ui(input, |ui| {
+                app.logic(&ui.ctx().clone());
+                app.ui(ui);
+            });
+            out.textures_delta.clear();
+        };
+        (app, story, frame)
+    }
+
+    fn story_text(app: &mut DesignApp, story: &Value) -> String {
+        app.session.execute("story.get", &json!({"story": story})).unwrap()["text"].as_str().unwrap().to_string()
+    }
+
+    /// A key press as egui sends it, with its release.
+    fn press(key: egui::Key, modifiers: egui::Modifiers) -> Vec<egui::Event> {
+        [true, false].map(|pressed| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers }).into()
+    }
+
+    /// The command modifier as egui reports it on this platform.
+    fn cmd() -> egui::Modifiers {
+        if platform().is_mac() { egui::Modifiers::MAC_CMD | egui::Modifiers::COMMAND } else { egui::Modifiers::CTRL | egui::Modifiers::COMMAND }
+    }
+
+    /// Off macOS, Ctrl+Alt+Shift+N inserts the page number while typing; AltGr+E, which a browser
+    /// on Windows reports as Ctrl+Alt+E (Fit Content to Frame) followed by the text it typed,
+    /// types `€`.
+    #[test]
+    fn ctrl_alt_chords_run_while_typing_unless_they_type_text() {
+        if platform().is_mac() {
+            return;
+        }
+        let (mut app, story, mut frame) = typing_in_a_text_frame();
+        frame(&mut app, Default::default(), vec![]);
+        let ctrl_alt = egui::Modifiers::CTRL | egui::Modifiers::COMMAND | egui::Modifiers::ALT;
+        frame(&mut app, ctrl_alt | egui::Modifiers::SHIFT, press(egui::Key::N, ctrl_alt | egui::Modifiers::SHIFT));
+        assert_eq!(story_text(&mut app, &story), "Page \u{e000}");
+        let mut altgr = press(egui::Key::E, ctrl_alt);
+        altgr.insert(1, egui::Event::Text("€".into()));
+        frame(&mut app, ctrl_alt, altgr);
+        assert_eq!(story_text(&mut app, &story), "Page \u{e000}€");
+    }
+
+    /// While typing, Cmd+Z undoes the document's last edit and Cmd+A selects the story's text: the
+    /// text tool has neither of its own.
+    #[test]
+    fn undo_and_select_all_work_while_typing() {
+        let (mut app, story, mut frame) = typing_in_a_text_frame();
+        frame(&mut app, Default::default(), vec![]);
+        frame(&mut app, Default::default(), vec![egui::Event::Text("X".into())]);
+        assert_eq!(story_text(&mut app, &story), "Page X");
+        frame(&mut app, cmd(), press(egui::Key::Z, cmd()));
+        assert_eq!(story_text(&mut app, &story), "Page ");
+        assert!(app.session.wants_text(), "the caret stays");
+        frame(&mut app, cmd(), press(egui::Key::A, cmd()));
+        frame(&mut app, Default::default(), vec![egui::Event::Text("Y".into())]);
+        assert_eq!(story_text(&mut app, &story), "Y");
+    }
+
+    /// Cmd+Shift+C centers the paragraph while typing, both as egui-winit sends it (a Copy event
+    /// with the modifiers held) and as the web build does (the press, then Copy); nothing is
+    /// copied.
+    #[test]
+    fn cmd_shift_c_centers_the_paragraph_while_typing() {
+        let cmd_shift = cmd() | egui::Modifiers::SHIFT;
+        let mut web = press(egui::Key::C, cmd_shift);
+        web.insert(1, egui::Event::Copy);
+        for (form, events) in [("desktop", vec![egui::Event::Copy]), ("web", web)] {
+            let (mut app, _, mut frame) = typing_in_a_text_frame();
+            frame(&mut app, Default::default(), vec![]);
+            frame(&mut app, cmd_shift, events);
+            let align = crate::panels::text_attrs(&mut app).unwrap()["para"]["align"].clone();
+            assert_eq!(align, "center", "{form}");
+        }
+    }
+
+    /// An engine command only scripts run has no row in the dialog, yet takes keys and conflicts.
+    #[test]
+    fn an_unlisted_engine_command_is_still_bindable_and_conflicts() {
+        let find = |id: &str| catalog().iter().find(|b| b.command == CommandRef::new(id));
+        let internal = find("selection.set").unwrap();
+        assert!(!listed(internal));
+        assert!(listed(find("edit.undo").unwrap()));
+        assert!(catalog().iter().filter(|b| matches!(b.kind, Kind::Tool { .. })).all(listed));
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        let r = menus::run_ui(&mut app, "window.setShortcut", &json!({"id": "selection.set", "shortcut": "Cmd+Z"})).unwrap().unwrap();
+        assert_eq!(r["conflicts"], json!(["edit.undo"]));
+    }
+
+    /// A panel and the command that opens it share their key without a reported conflict.
+    #[test]
+    fn a_panels_twin_is_not_a_conflict() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        for steal in [false, true] {
+            let r = menus::run_ui(&mut app, "window.setShortcut", &json!({"id": "app.characterPanel", "shortcut": "Cmd+T", "steal": steal}))
+                .unwrap()
+                .unwrap();
+            assert_eq!(r["conflicts"], json!([]), "steal: {steal}");
+        }
+    }
+}
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 6a60da26e..0221aa257 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -17,22 +17,26 @@ pub mod dock;
 pub mod effects_dialog;
 pub mod i18n;
 pub mod icons;
+pub mod keys;
 pub mod menus;
 mod modal_drag;
 mod new_document;
 mod object_control;
+mod page_history;
 mod panel_docking;
 pub mod panels;
 mod prefs;
 pub mod render_worker;
 mod rtl;
 mod section_options;
+pub mod separations;
 mod shortcut_import;
+mod shortcuts_dialog;
 pub mod story_editor;
 pub mod taskbar;
 pub mod theme;
-pub mod title_bar;
 pub mod toolbar;
+pub mod updates_ui;
 pub mod widgets;
 
 use std::collections::HashMap;
@@ -44,534 +48,97 @@ use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 
 pub use control::{ControlRequest, ControlResponse};
+pub use prefs::ReadPreferences;
 
-pub type ReadFn = Box<dyn Fn(&str) -> Result<Vec<u8>, String>>;
-pub type WriteFn = Box<dyn FnMut(&str, &[u8]) -> Result<(), String>>;
-pub type PickFn = Box<dyn FnMut(&str) -> Option<String>>;
-/// Context captured before any host file-picker or read await.
+mod app;
+mod clock;
+mod key_names;
+mod services;
+mod state;
+
+#[cfg(test)]
+use app::browser_import_tests;
+pub use app::opens_as_document;
+pub use clock::now_ms;
+pub use key_names::{drop_key_name_text, is_key_name};
+pub use services::{ClipboardFn, DownloadFn, Inbox, OpenAsyncFn, ReadFn, Services, WriteFn};
+pub(crate) use state::second_window_viewport;
+pub use state::{CanvasCache, HiddenPanels, ImportRequest, ImportedFile, PdfExportSettings, Perf, SavedWorkspace, ScreenMode, Shown, UiState, View};
+
+/// The bounded admission policy for `ui.screenshot` captures.
+pub(crate) const SCREENSHOT_MAX_REQUESTS: usize = 4;
+pub(crate) const SCREENSHOT_MAX_IMAGE_BYTES: usize = 128 * 1024 * 1024;
+pub(crate) const SCREENSHOT_MAX_AGGREGATE_BYTES: usize = 256 * 1024 * 1024;
+
+/// The viewport geometry a capture was admitted for.
+#[derive(Clone, Copy, PartialEq, Debug)]
+struct ScreenshotGeometry {
+    width: usize,
+    height: usize,
+    /// The active document state epoch at admission; a switch or Revert invalidates it.
+    document: u64,
+    /// Logical size, DPI, zoom and fullscreen state. The window position is deliberately absent:
+    /// moving the window does not change the captured surface or its content. eframe 0.37 exposes
+    /// no portable surface-generation identity, so a same-size surface recreation is still a
+    /// documented qualification gap.
+    signature: [u32; 6],
+}
+
+/// The document, dialog and keyboard focus an injected input batch was captured for. If any of
+/// them changed before a settled UI pass took the batch, the batch no longer belongs to the new
+/// state and is discarded instead of replaying stale clicks or text.
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)]
+struct InputGeneration {
+    document: u64,
+    dialog: Option<egui::Id>,
+    focus: Option<egui::Id>,
+}
+
+/// One native file drop captured from the raw input. The generation travelled with it so a
+/// document, dialog or focus change before the next settled UI pass discards the stale drop.
+#[cfg(not(target_arch = "wasm32"))]
 #[derive(Clone, Debug)]
-pub struct ImportRequest {
-    pub purpose: String,
-    pub target: Option<u64>,
-}
-pub struct ImportedFile {
-    pub request: ImportRequest,
-    pub name: String,
-    pub bytes: Vec<u8>,
-}
-pub type OpenAsyncFn = Box<dyn FnMut(ImportRequest)>;
-/// Starts a browser download; an error means no file was handed to the user.
-pub type DownloadFn = Box<dyn FnMut(&str, &[u8]) -> Result<(), String>>;
-pub type ClipboardFn = Box<dyn FnMut() -> Option<String>>;
-/// Files delivered asynchronously with their original operation and document identity.
-pub type Inbox = std::sync::Arc<std::sync::Mutex<Vec<ImportedFile>>>;
-
-/// Platform services injected by the host (desktop or web).
-#[derive(Default)]
-pub struct Services {
-    /// Open-file dialog for a purpose (`open`, `place`) → path.
-    pub pick_open: Option<PickFn>,
-    /// Save dialog with a suggested name → path. The name may start with the folder the dialog
-    /// opens in (see [`DesignApp::pick_save`]).
-    pub pick_save: Option<PickFn>,
-    pub read: Option<ReadFn>,
-    pub write: Option<WriteFn>,
-    /// Asynchronous open dialog for a purpose (`open`, `place`); the chosen file arrives later
-    /// through [`Services::inbox`]. Used when `pick_open` is unset (web).
-    pub open_async: Option<OpenAsyncFn>,
-    /// Hand bytes to the user as a named file (browser download). When set, Save uses it
-    /// instead of writing to a path.
-    pub download: Option<DownloadFn>,
-    /// Files delivered asynchronously, drained every frame with their captured request context.
-    pub inbox: Option<Inbox>,
-    /// The system clipboard's text, for Paste chosen from a menu (egui only delivers it with the
-    /// paste keys, which a native menu bar takes first).
-    pub clipboard_text: Option<ClipboardFn>,
+struct PendingDrop {
+    path: String,
+    pointer: Option<egui::Pos2>,
+    generation: InputGeneration,
 }
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum ScreenMode {
-    #[default]
-    Normal,
-    Preview,
-    Bleed,
-    Slug,
-    Presentation,
-}
-
-/// A saved workspace: which bars show and where the panels are.
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
-#[serde(default, rename_all = "camelCase")]
-pub struct SavedWorkspace {
-    pub name: String,
-    pub control_bar: bool,
-    pub task_bar: bool,
-    pub task_bar_pin: Option<[f32; 2]>,
-    pub tools_double_column: bool,
-    pub dock_tab: String,
-    pub dock_expanded: bool,
-    pub open_panel: Option<String>,
-    pub floating: Vec<(String, [f32; 2])>,
-    /// Custom panel membership and placement; absent in older workspace files.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub docking: Option<craft_ui::docking::Layout<String>>,
-    #[serde(default, skip_serializing_if = "std::collections::BTreeMap::is_empty")]
-    pub docking_hidden: std::collections::BTreeMap<String, craft_ui::docking::Location<String>>,
-    /// The workspace's own icon column (see [`UiState::icon_groups`]).
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub icon_groups: Option<Vec<Vec<String>>>,
-    /// Saved with New Workspace › Capture › Panel Locations off: choosing the workspace leaves the
-    /// bars and panels where they are.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub keep_panels: bool,
-    /// New Workspace › Capture › Menu Customization: the menu items hidden with Edit › Menus.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub hidden_menu_items: Option<Vec<String>>,
-}
-
-/// A missing on-by-default bool stays on. `bool::default` is false.
-fn default_true() -> bool {
-    true
-}
-
-/// A missing snap zone stays at the factory width, in screen pixels.
-fn default_zone() -> f64 {
-    4.0
-}
-
-/// File › Export PDF… options: the values persisted in `UiState.pdf_export` and used as the
-/// dialog's defaults. Serialised as `pdfExport` with camelCase field names.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(default, rename_all = "camelCase")]
-pub struct PdfExportSettings {
-    /// Preset (one of the five presets, or "Custom" after a manual edit).
-    pub preset: String,
-    /// PDF standard (`none`, `x4`, `a2b`).
-    pub standard: String,
-    /// Compression › Compress images (JPEG).
-    pub compress_images: bool,
-    /// Transparency flattener preset (`""` = none, `high`, `medium`, `low`).
-    pub flatten: String,
-    pub spreads: bool,
-    pub bleed: bool,
-    pub marks_crop: bool,
-    pub marks_bleed: bool,
-    pub marks_page_info: bool,
-    pub marks_weight: String,
-    pub marks_offset: String,
-    /// File › Export PDF › Advanced › Tagged PDF.
-    pub tagged: bool,
-}
-
-impl Default for PdfExportSettings {
-    fn default() -> Self {
-        PdfExportSettings {
-            preset: "Desktop Printing".into(),
-            standard: "none".into(),
-            compress_images: false,
-            flatten: "".into(),
-            spreads: false,
-            bleed: true,
-            marks_crop: false,
-            marks_bleed: false,
-            marks_page_info: false,
-            marks_weight: "0.25".into(),
-            marks_offset: "6".into(),
-            tagged: true,
-        }
-    }
-}
-
-/// Persisted UI state.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(default, rename_all = "camelCase")]
-pub struct UiState {
-    pub brightness: theme::Brightness,
-    pub screen_mode: ScreenMode,
-    /// The screen mode leaving Presentation returns to: the one it was entered from.
-    pub presentation_return: ScreenMode,
-    /// The view (by its `views` key) Presentation was entered from; leaving puts it back.
-    #[serde(skip)]
-    pub presentation_view: Option<(u64, View)>,
-    pub frame_edges: bool,
-    pub rulers: bool,
-    pub guides: bool,
-    pub baseline_grid: bool,
-    pub document_grid: bool,
-    pub text_threads: bool,
-    pub hidden_characters: bool,
-    /// View › Structure › Show Tagged Frames.
-    pub tagged_frames: bool,
-    /// Edit › Menus: hidden menu items (`menu/label`), and Show Full Menus.
-    pub hidden_menu_items: Vec<String>,
-    pub show_full_menus: bool,
-    /// Scripts panel: saved scripts (name, text).
-    pub scripts: Vec<(String, String)>,
-    /// View › Structure › Show Tag Markers.
-    pub tag_markers: bool,
-    /// View › Flattener Preview: objects that involve transparency highlighted in red.
-    #[serde(skip)]
-    pub flattener_preview: bool,
-    /// Tab / Shift+Tab: 1 = every panel hidden, 2 = all but the Tools panel (0 = shown).
-    pub hidden_panels: u8,
-    /// "Don't show again" in the warning before deleting pages that contain objects.
-    pub skip_delete_pages_warning: bool,
-    /// The Pages panel's parents part as its divider was last dragged, and the height the two
-    /// parts shared then (None: a few rows).
-    pub pages_parents_height: Option<[f32; 2]>,
-    /// The Pages panel's Panel Options.
-    pub pages_panel: panels::pages::PanelOptions,
-    /// Edit › Color Settings (re-applied at start).
-    pub color_settings: Option<designcraft_color::cms::ColorSettings>,
-    /// ICC files loaded with Edit › Color Settings › Load Profile… (loaded again at start, before
-    /// `color_settings`, so a loaded working space stays chosen).
-    pub color_profiles: Vec<String>,
-    /// View › Proof Colors and View › Proof Setup.
-    pub proof_colors: bool,
-    pub proof_setup: designcraft_color::cms::ProofSetup,
-    /// Edit › Spelling › Dynamic Spelling: misspelled words underlined on the canvas.
-    pub dynamic_spelling: bool,
-    /// Preferences › Story Editor Display: text size (points).
-    pub story_editor_size: f32,
-    /// Preferences › General › Interface Language: supported codes are listed in `i18n::LANGUAGES`.
-    pub language: String,
-    /// Edit › Transparency Flattener Presets: "" (none), "high", "medium" or "low" for PDF export.
-    pub flattener: String,
-    /// File › Export PDF… options (persisted; see `PdfExportSettings`).
-    pub pdf_export: PdfExportSettings,
-    /// The Preview checkbox of Paragraph/Character Style Options, remembered between openings.
-    pub style_preview: bool,
-    /// View › Separations Preview: a process plate (0–3) and/or an ink limit (total, 0–4).
-    #[serde(skip)]
-    pub separation: Option<u8>,
-    #[serde(skip)]
-    pub ink_limit: Option<f32>,
-    /// View › Display Performance.
-    pub display_quality: designcraft_render::DisplayQuality,
-    /// Preferences › Interface › UI scaling (1 = 100%).
-    pub ui_scale: f32,
-    /// Preferences › Appearance of Black: 100% K on screen as rich black (InDesign's default,
-    /// Display All Blacks as Rich Black; off: accurately, as dark grey).
-    pub rich_black: bool,
-    /// View › Overprint Preview.
-    pub overprint_preview: bool,
-    /// Edit › Keyboard Shortcuts: command id → shortcut ("" = none), over the defaults.
-    pub shortcuts: std::collections::BTreeMap<String, String>,
-    pub control_bar: bool,
-    pub tools_double_column: bool,
-    /// Expanded right-dock panel group tab.
-    pub dock_tab: String,
-    /// Panel opened from the collapsed icon column (flyout).
-    pub open_panel: Option<String>,
-    /// Panels torn off the dock into their own floating windows: (panel id, top-left position).
-    pub floating: Vec<(String, [f32; 2])>,
-    /// Shared panel layout after the user customizes the legacy dock.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub docking: Option<craft_ui::docking::Layout<String>>,
-    #[serde(default, skip_serializing_if = "std::collections::BTreeMap::is_empty")]
-    pub docking_hidden: std::collections::BTreeMap<String, craft_ui::docking::Location<String>>,
-    /// Invalidates in-flight gestures when a workspace is replaced.
-    #[serde(skip)]
-    pub docking_generation: u64,
-    /// One-frame reveal request; z-order is never persisted.
-    #[serde(skip)]
-    pub docking_raise: Option<String>,
-    /// Last explicitly revealed customized panel, for the legacy closePanel control.
-    #[serde(skip)]
-    pub docking_opened: Option<String>,
-    pub dock_expanded: bool,
-    /// A workspace's iconic panel groups (Essentials Classic), shown with their names in the icon
-    /// column instead of every panel; `None` is the full icon column.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub icon_groups: Option<Vec<Vec<String>>>,
-    pub units: Unit,
-    pub workspace: String,
-    /// Window › Workspace › New Workspace: saved panel arrangements.
-    pub custom_workspaces: Vec<SavedWorkspace>,
-    /// File › New › Document › Recent: the settings of the last documents made, newest first.
-    pub recent_new_documents: Vec<designcraft_doc::build::NewDocument>,
-    /// The folder of the last file saved or exported: where the save dialog starts for a
-    /// document never saved.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub last_save_folder: Option<String>,
-    /// The font menus' sample text (a key of `panels::FONT_SAMPLES`) and size (0–2).
-    pub font_sample: String,
-    pub font_preview_size: u8,
-    /// File › New › Document › Preview, kept for the session.
-    #[serde(skip)]
-    pub new_document_preview: bool,
-    /// Transform reference point (0..8, row-major; 0 = top-left).
-    pub ref_point: u8,
-    /// Align To target (`selection`, `keyObject`, `margins`, `page`, `spread`).
-    pub align_to: String,
-    /// Properties > Text Style tab: 0 = Paragraph Styles, 1 = Character Styles.
-    pub text_style_tab: u8,
-    /// View › Grids & Guides › Lock Guides: ruler guides can't be dragged.
-    pub guides_locked: bool,
-    pub smart_guides: bool,
-    #[serde(default = "default_true")]
-    pub snap_to_guides: bool,
-    pub snap_to_document_grid: bool,
-    #[serde(default = "default_true")]
-    pub align_edges: bool,
-    #[serde(default = "default_true")]
-    pub align_centers: bool,
-    #[serde(default = "default_true")]
-    pub smart_dimensions: bool,
-    #[serde(default = "default_true")]
-    pub smart_spacing: bool,
-    #[serde(default = "default_zone")]
-    pub snap_zone: f64,
-    /// Tools panel: Formatting Affects Text (J): with text frames selected, colour edits go to
-    /// their text instead of the frames.
-    pub formatting_affects_text: bool,
-    /// Window > Contextual Task Bar.
-    pub task_bar: bool,
-    /// Where the Contextual Task Bar is pinned: its top-left, in points from the canvas's top-left
-    /// (`None`: it follows the selection).
-    pub task_bar_pin: Option<[f32; 2]>,
-    /// Where the Contextual Task Bar was last shown, like [`Self::task_bar_pin`].
-    #[serde(skip)]
-    pub task_bar_at: Option<[f32; 2]>,
-    /// Help › About DesignCraft is open.
-    pub about: bool,
-    /// The About window's tab: 0 About, 1 Contributors, 2 Models (`about::ABOUT_TABS`).
-    #[serde(skip)]
-    pub about_tab: u8,
-    /// URLs to open in the browser on the next frame (Help links, About, start screen).
-    pub pending_urls: Vec<String>,
-    #[serde(skip)]
-    pub status: String,
-    #[serde(skip)]
-    pub dialog: Option<dialogs::Dialog>,
-    #[serde(skip)]
-    pub palette: Option<String>,
-    #[serde(skip)]
-    pub flyout: Option<usize>,
-    /// Type › Tabs: the selected stop and where the panel sits.
-    #[serde(skip)]
-    pub tabs_panel: panels::tabs::PanelState,
-    /// The colour and gradient swatches applied last: what Apply Color (,) and Apply Gradient (.)
-    /// apply again.
-    #[serde(skip)]
-    pub last_color: Option<String>,
-    #[serde(skip)]
-    pub last_gradient: Option<String>,
-    /// Fill/Stroke proxy (Tools and Color panels): the stroke is in front, so Apply None and the
-    /// Color panel act on it (X toggles).
-    #[serde(skip)]
-    pub stroke_front: bool,
-}
-
-impl Default for UiState {
-    fn default() -> Self {
-        UiState {
-            brightness: theme::Brightness::MediumDark,
-            screen_mode: ScreenMode::Normal,
-            presentation_return: ScreenMode::Normal,
-            presentation_view: None,
-            frame_edges: true,
-            rulers: true,
-            guides: true,
-            baseline_grid: false,
-            document_grid: false,
-            text_threads: false,
-            hidden_characters: false,
-            tagged_frames: false,
-            hidden_menu_items: Vec::new(),
-            show_full_menus: false,
-            story_editor_size: 14.0,
-            scripts: vec![
-                ("Number the pages".into(), "# A page-number frame at the bottom of the current page.\nframe.create {\"rect\": [288, 740, 324, 760], \"content\": \"text\", \"text\": \"\"}\ntext.select {\"story\": \"$0.story\", \"anchor\": 0, \"focus\": 0}\ntext.insert {\"text\": \"\\ue000\", \"raw\": true}".into()),
-                ("Two-column grid".into(), "# Four text frames in a 2 × 2 grid.\nframe.grid {\"rect\": [36, 36, 576, 756], \"cols\": 2, \"rows\": 2, \"gutter\": 12}".into()),
-            ],
-            tag_markers: false,
-            flattener_preview: false,
-            hidden_panels: 0,
-            skip_delete_pages_warning: false,
-            pages_parents_height: None,
-            pages_panel: Default::default(),
-            color_settings: None,
-            color_profiles: Vec::new(),
-            proof_colors: false,
-            proof_setup: Default::default(),
-            dynamic_spelling: false,
-            language: String::new(),
-            flattener: String::new(),
-            pdf_export: PdfExportSettings::default(),
-            style_preview: false,
-            separation: None,
-            ink_limit: None,
-            display_quality: designcraft_render::DisplayQuality::High,
-            ui_scale: 1.0,
-            rich_black: true,
-            overprint_preview: false,
-            shortcuts: Default::default(),
-            control_bar: false,
-            tools_double_column: false,
-            dock_tab: "properties".into(),
-            open_panel: None,
-            floating: Vec::new(),
-            docking: None,
-            docking_hidden: Default::default(),
-            docking_generation: 0,
-            docking_raise: None,
-            docking_opened: None,
-            dock_expanded: true,
-            icon_groups: None,
-            units: Unit::Picas,
-            workspace: "Essentials".into(),
-            custom_workspaces: Vec::new(),
-            recent_new_documents: Vec::new(),
-            last_save_folder: None,
-            font_sample: "selected".into(),
-            font_preview_size: 1,
-            new_document_preview: false,
-            ref_point: 0,
-            align_to: "selection".into(),
-            text_style_tab: 0,
-            guides_locked: false,
-            smart_guides: true,
-            snap_to_guides: true,
-            snap_to_document_grid: false,
-            align_edges: true,
-            align_centers: true,
-            smart_dimensions: true,
-            smart_spacing: true,
-            snap_zone: 4.0,
-            formatting_affects_text: false,
-            task_bar: true,
-            task_bar_pin: None,
-            task_bar_at: None,
-            about: false,
-            about_tab: 0,
-            pending_urls: Vec::new(),
-            status: String::new(),
-            dialog: None,
-            palette: None,
-            flyout: None,
-            tabs_panel: Default::default(),
-            last_color: None,
-            last_gradient: None,
-            stroke_front: false,
-        }
-    }
-}
-
-impl UiState {
-    /// Copies the live view switches into the snap engine's view.
-    pub fn snap_view(&self) -> SnapView {
-        SnapView {
-            snap_to_guides: self.snap_to_guides,
-            snap_to_document_grid: self.snap_to_document_grid,
-            show_guides: self.guides,
-            smart_guides: self.smart_guides,
-            align_edges: self.align_edges,
-            align_centers: self.align_centers,
-            smart_dimensions: self.smart_dimensions,
-            smart_spacing: self.smart_spacing,
-            zone_px: self.snap_zone,
-            guides_locked: self.guides_locked,
-        }
-    }
-}
-
-/// Per-document view: zoom (screen points per document point) and the canvas point at the
-/// top-left of the canvas area.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
-pub struct View {
-    pub zoom: f64,
-    pub origin: Point,
-    pub fitted: bool,
-    /// View › Rotate Spread: quarter turns clockwise (0–3).
-    pub rotation: u8,
-}
-
-impl Default for View {
-    fn default() -> Self {
-        View { zoom: 0.5, origin: Point::new(-100.0, -100.0), fitted: false, rotation: 0 }
-    }
-}
-
-/// What the canvas texture currently shows.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Shown {
-    /// (doc uid, doc pointer, revision, preview).
-    pub doc: (u64, u64, u64, bool),
-    /// Parent and document spreads have different canvas placement and content.
-    pub editing_parents: bool,
-    /// Canvas point at the texture's top-left, zoom, and texture size in screen points.
-    pub origin: Point,
-    pub zoom: f64,
-    pub size: (f32, f32),
-}
-
-impl CanvasCache {
-    pub fn new() -> Self {
-        let mut renderer = designcraft_render::Renderer::new();
-        renderer.threads = designcraft_render::default_threads();
-        CanvasCache {
-            renderer,
-            texture: None,
-            shown: None,
-            pending: None,
-            token: 0,
-            #[cfg(not(target_arch = "wasm32"))]
-            worker: None,
-            worker_started: false,
-            last_ms: 0.0,
-            shown_doc: None,
-            pending_doc: None,
-            display_key: None,
-            patcher: designcraft_render::Renderer::new(),
-            patches: 0,
-        }
-    }
-}
-
-impl Default for CanvasCache {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-pub struct CanvasCache {
-    pub renderer: designcraft_render::Renderer,
-    pub texture: Option<egui::TextureHandle>,
-    pub shown: Option<Shown>,
-    /// The request in flight on the worker.
-    pub pending: Option<(u64, Shown)>,
-    pub token: u64,
-    #[cfg(not(target_arch = "wasm32"))]
-    pub worker: Option<render_worker::Worker>,
-    pub worker_started: bool,
-    pub last_ms: f64,
-    /// The document the texture shows (to repaint only what an edit changed).
-    pub shown_doc: Option<std::sync::Arc<designcraft_doc::Document>>,
-    /// Document of the request in flight.
-    pub pending_doc: Option<std::sync::Arc<designcraft_doc::Document>>,
-    /// Display options the texture and the request in flight were rendered with.
-    pub display_key: Option<canvas::DisplayKey>,
-    /// Renders damaged regions (its own context: region sizes vary).
-    pub patcher: designcraft_render::Renderer,
-    /// Partial repaints / full renders since start (perf readout).
-    pub patches: u64,
-}
-
-#[derive(Default, Clone, Copy, Debug, Serialize)]
-pub struct Perf {
-    pub frame_ms: f64,
-    pub render_ms: f64,
-    pub fps: f64,
+/// One admitted `ui.screenshot` request. The token, path, deadline and epoch are app-owned; the
+/// shared capture slot only correlates one completion with this record.
+struct ShotRequest {
+    token: u64,
+    path: Option<String>,
+    reply: Sender<ControlResponse>,
+    deadline: f64,
+    viewport: egui::ViewportId,
+    epoch: u64,
+    geometry: ScreenshotGeometry,
+    reserved_bytes: usize,
+    slot: Option<craft_ui::capture::CaptureSlot>,
 }
 
 pub struct DesignApp {
     pending_pdf: Option<ImportedFile>,
+    /// File and message dialogs: asked for during a frame, shown by the host at its end, answered
+    /// on a later frame (see `app/file_dialogs.rs`).
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) file_dialogs: app::file_dialogs::Dialogs,
+    /// The dialogs asked for and not yet answered, in order: the same one isn't asked twice.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) asked: Vec<app::file_dialogs::AskKey>,
+    /// Dialog answers waiting for an egui dialog to close.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) held_answers: Vec<app::file_dialogs::Held>,
+    /// The context the dialogs' wake-up repaints, once the first frame has run.
+    #[cfg(not(target_arch = "wasm32"))]
+    dialog_wake: std::sync::Arc<std::sync::OnceLock<egui::Context>>,
     pub session: Session,
     pub ui: UiState,
     pub services: Services,
     pub views: HashMap<u64, View>,
+    /// Layout ▸ Go Back / Go Forward, by view (like `views`).
+    pub(crate) page_history: HashMap<u64, page_history::PageHistory>,
     /// The canvas cache and rect of the pane in `pane` (the other pane's are in `other_pane`).
     pub canvas: CanvasCache,
     pub canvas_rect: Option<egui::Rect>,
@@ -592,14 +159,47 @@ pub struct DesignApp {
     pub synthetic: Vec<egui::Event>,
     /// Control input stays separate from native-menu input until its frame is processed.
     pub(crate) control_synthetic: Vec<egui::Event>,
+    /// Resolved native menu choices, kept stable across menu rebuilds until input settles.
+    native_actions: std::collections::VecDeque<(String, Value)>,
+    native_events_pending: std::sync::Arc<std::sync::atomic::AtomicBool>,
     control_input_frame: std::sync::Arc<std::sync::atomic::AtomicBool>,
     clipboard_guard_installed: bool,
     /// Story open in the Story Editor.
     pub story_editor: Option<story_editor::Target>,
     control_rx: Option<Receiver<ControlRequest>>,
-    pending_shots: Vec<(u64, Option<String>, Sender<ControlResponse>, f64)>,
+    pending_shots: Vec<ShotRequest>,
     queued_shots: Vec<(u64, f64, u32)>,
     shot_token: u64,
+    /// The viewport geometry the live screenshot requests were admitted for.
+    screenshot_geometry: Option<ScreenshotGeometry>,
+    /// Advanced whenever the viewport size, DPI, zoom or surface changes (even back again).
+    screenshot_epoch: u64,
+    /// A synthetic input step was injected and has not yet reached a settled UI pass.
+    synthetic_injected: bool,
+    /// The exact events of that batch, so a generation change can remove them from the host's
+    /// pending raw input before they reach a UI pass.
+    injected_events: Vec<egui::Event>,
+    /// The batch came from the control channel (private clipboard and provenance).
+    injected_private: bool,
+    /// What the document, dialog and focus were when that batch was injected.
+    injected_generation: InputGeneration,
+    /// The batch is in the host's pending raw input and not yet consumed by a settled pass.
+    injected_pending: std::sync::Arc<std::sync::atomic::AtomicBool>,
+    /// A settled `run_ui` pass ended since the batch was injected; the next host iteration
+    /// acknowledges it. This also covers harnesses that consume the raw input without `app.ui`.
+    injected_settled: std::sync::Arc<std::sync::atomic::AtomicBool>,
+    /// The end-of-pass settlement observer is installed on the egui context.
+    injected_settle_hook: bool,
+    /// Native dropped files with the input generation they were captured for, buffered from the
+    /// raw input before a pass so hidden logic cannot replay a previous drop.
+    #[cfg(not(target_arch = "wasm32"))]
+    pending_drops: Vec<PendingDrop>,
+    #[cfg(test)]
+    logic_tick_ticks: u32,
+    #[cfg(test)]
+    logic_frame_ticks: u32,
+    #[cfg(test)]
+    input_ticks: u32,
     styled: bool,
     /// The interface language the UI fonts were installed for (it orders the CJK fallbacks).
     fonts_lang: String,
@@ -618,12 +218,20 @@ pub struct DesignApp {
     pub(crate) pending_window_commands: Vec<egui::ViewportCommand>,
     /// The host installed a native menu bar (macOS): don't draw menus in the window.
     pub native_menu: bool,
-    /// Shortcuts the native menu handles (skip them in the egui shortcut handler).
-    pub native_shortcuts: std::collections::HashSet<String>,
+    /// The commands the native menu bar gives a key equivalent, with that shortcut: the egui
+    /// shortcut handler leaves that key to the bar and runs the command's other bindings itself.
+    pub native_shortcuts: std::collections::HashMap<String, String>,
+    /// Every command's shortcuts, with the user's changes (`ui.shortcuts`) applied.
+    pub keymap: craft_keymap::Keymap,
+    pub(crate) key_dispatcher: craft_keymap::egui::Dispatcher,
+    /// The open Keyboard Shortcuts dialog.
+    pub(crate) shortcut_dialog: Option<Box<shortcuts_dialog::Host>>,
+    /// Answers the user gave in an import review (item → command), for later imports.
+    pub(crate) shortcut_answers: std::collections::BTreeMap<String, craft_keymap::CommandRef>,
     last_time: f64,
-    /// When recovery data was last written (seconds, egui time).
+    /// When recovery data was last written (seconds on the monotonic clock; see [`now_ms`]).
     pub last_recovery: f64,
-    /// The egui context (set by the first frame): copied text goes to the system clipboard through it.
+    /// The egui context (set by the first UI pass): copied text goes to the system clipboard through it.
     egui_ctx: Option<egui::Context>,
     /// A control-channel request is being handled: commands it runs never read or write the
     /// user's system clipboard (a control client must not see or replace it).
@@ -640,8 +248,21 @@ pub struct DesignApp {
     /// The canvas asked for the system IME in the last frame (the web build's text input has the
     /// keyboard then).
     pub(crate) canvas_ime: bool,
+    /// Owner/generation/cause bookkeeping for the canvas story's custom IME producer.
+    pub(crate) ime_tracker: egui::ime_context::ImeContextTracker,
+    /// An IME delete-surrounding request waiting for the Commit in the same event batch.
+    pub(crate) pending_ime_delete: Option<(usize, usize, bool)>,
+    /// The owner the current composition began in: a late commit may only land there.
+    pub(crate) ime_target: Option<egui::ime_context::ImeTarget>,
+    /// This pass dropped a late commit or delete for a composition that had already ended: the
+    /// system IME must interrupt its copy (as for a click away).
+    pub(crate) ime_interrupt: bool,
+    /// What the canvas recorded for this pass's IME observation, applied at the end of the pass.
+    pub(crate) ime_canvas: Option<canvas::CanvasIme>,
     /// Quit was chosen: close the window on the next frame, as its close button does.
     quit_requested: bool,
+    /// An OS close event deferred while a synthetic gesture or native action is pending.
+    close_requested_pending: bool,
     /// Close the window without asking about unsaved changes (the control channel's `app.quit`).
     pub(crate) quit_without_asking: bool,
     /// No document is discarded until every unsaved document has an up-to-date approval.
@@ -650,6 +271,7 @@ pub struct DesignApp {
     pub cursors: cursors::Images,
     /// A panel's live preview (a slider being dragged), committed when it is let go.
     live_preview: LivePreview,
+    pub(crate) updates_rt: updates_ui::Runtime,
 }
 
 /// The preview a panel opened with `edit.preview`: it stays open while a panel holds it each frame.
@@ -663,1077 +285,8 @@ struct QuitState {
     original_active: Option<u64>,
     accepted: HashMap<u64, u64>,
     pending: Option<u64>,
-}
-
-impl DesignApp {
-    pub fn new(session: Session, services: Services) -> Self {
-        // The font menus and the first file opened need the installed fonts: catalog them now.
-        designcraft_fonts::FontDb::global().scan_in_background();
-        DesignApp {
-            pending_pdf: None,
-            session,
-            ui: UiState::default(),
-            services,
-            views: HashMap::new(),
-            canvas: CanvasCache::new(),
-            canvas_rect: None,
-            split: false,
-            second_window: false,
-            pane: 0,
-            focus_pane: 0,
-            other_pane: None,
-            power_zoom: None,
-            color_applied: false,
-            perf: Perf::default(),
-            synthetic: vec![],
-            control_synthetic: vec![],
-            control_input_frame: Default::default(),
-            clipboard_guard_installed: false,
-            story_editor: None,
-            control_rx: None,
-            pending_shots: vec![],
-            queued_shots: vec![],
-            shot_token: 0,
-            styled: false,
-            fonts_lang: String::new(),
-            fonts_system: false,
-            restyle: false,
-            fonts_ready: false,
-            os_documents: Vec::new(),
-            integrated_titlebar: false,
-            custom_titlebar: false,
-            window_maximized: false,
-            pending_window_commands: vec![],
-            native_menu: false,
-            native_shortcuts: Default::default(),
-            last_time: 0.0,
-            last_recovery: 0.0,
-            egui_ctx: None,
-            in_control: false,
-            object_clip_text: None,
-            ime_marked: None,
-            ime_discard: false,
-            canvas_ime: false,
-            quit_requested: false,
-            quit_without_asking: false,
-            quitting: None,
-            cursors: cursors::Images::default(),
-            live_preview: LivePreview::default(),
-        }
-    }
-
-    pub fn with_control(mut self, rx: Receiver<ControlRequest>) -> Self {
-        self.control_rx = Some(rx);
-        self
-    }
-
-    /// The view key of the active document in the current pane.
-    fn view_key(&self) -> Option<u64> {
-        let uid = self.session.active()?.uid;
-        Some(if self.pane == 1 { uid ^ (1 << 63) } else { uid })
-    }
-    pub fn view(&self) -> Option<&View> {
-        self.views.get(&self.view_key()?)
-    }
-    pub fn view_mut(&mut self) -> Option<&mut View> {
-        let k = self.view_key()?;
-        Some(self.views.entry(k).or_default())
-    }
-    /// Make `pane` current: its canvas cache and rect move in.
-    pub fn switch_pane(&mut self, pane: u8) {
-        if pane == self.pane {
-            return;
-        }
-        let (c, r) = self.other_pane.take().unwrap_or_default();
-        let old = (std::mem::replace(&mut self.canvas, c), std::mem::replace(&mut self.canvas_rect, r));
-        self.other_pane = Some(old);
-        self.pane = pane;
-    }
-    pub fn view_info(&self) -> ViewInfo {
-        ViewInfo {
-            zoom: self.view().map(|v| v.zoom).unwrap_or(1.0),
-            snap: self.ui.snap_view(),
-            // Tool readouts (sizes, smart-guide distances) measure in the document's ruler units,
-            // as its Control and Properties fields do.
-            unit: self.session.active().map_or(self.ui.units, |st| st.doc.settings.horizontal_units),
-            stroke_in_front: self.ui.stroke_front,
-        }
-    }
-
-    pub fn status(&mut self, s: impl Into<String>) {
-        self.ui.status = s.into();
-    }
-
-    /// The host's save dialog for `name`, started beside the active document once it has been
-    /// saved, else in the folder of the last file saved or exported (#1653). The answer's folder
-    /// is remembered for the next one.
-    pub(crate) fn pick_save(&mut self, name: &str) -> Option<String> {
-        use std::path::{Path, PathBuf};
-        let folder_of = |path: &str| Path::new(path).parent().filter(|f| !f.as_os_str().is_empty()).map(Path::to_path_buf);
-        let folder = self
-            .session
-            .active()
-            .and_then(|d| d.path.as_deref())
-            .and_then(folder_of)
-            .or_else(|| self.ui.last_save_folder.as_ref().map(PathBuf::from));
-        // Only the last part of a name goes after the folder: a title may hold a slash, and an
-        // empty name would make the folder itself the suggested file.
-        let file = Path::new(name).file_name();
-        let suggested = match (folder, file) {
-            (Some(f), Some(file)) => f.join(file).to_string_lossy().to_string(),
-            _ => name.to_string(),
-        };
-        let picked = self.services.pick_save.as_mut().and_then(|f| f(&suggested))?;
-        if let Some(folder) = folder_of(&picked) {
-            self.ui.last_save_folder = Some(folder.to_string_lossy().to_string());
-        }
-        Some(picked)
-    }
-
-    /// Did an IME composition end outside the IME this frame (a click, a tool switch)? egui's
-    /// `should_interrupt_composition` toggles winit's IME, which doesn't reach the macOS input
-    /// context: it keeps the marked text and types it again into the next composition, so the
-    /// host discards it there.
-    pub fn take_ime_discard(&mut self) -> bool {
-        std::mem::take(&mut self.ime_discard)
-    }
-
-    /// Did the canvas ask for the system IME in the last frame (a Type tool caret)? The web
-    /// build's hidden text input has the keyboard then, so text events hold what the browser
-    /// typed (see [`drop_key_name_text`]).
-    pub fn canvas_ime(&self) -> bool {
-        self.canvas_ime
-    }
-
-    /// "<feature>: <error>" in the status bar: the feature name is translated, the engine's own
-    /// error text stays as the engine wrote it.
-    pub fn status_error(&mut self, feature: &str, error: impl std::fmt::Display) {
-        self.ui.status = format!("{}: {error}", crate::i18n::tr(&self.ui.language, feature));
-    }
-
-    /// THE entry point for every action (menus, shortcuts, palette, panels, control channel).
-    pub fn run(&mut self, id: &str, params: Value) -> Result<Value, String> {
-        if let Some(r) = menus::run_ui(self, id, &params) {
-            return r;
-        }
-        // Only user-initiated runs touch the system clipboard, never the control channel's.
-        let system_clipboard = !self.in_control && !self.control_input_frame.load(std::sync::atomic::Ordering::Relaxed);
-        let mut params = if system_clipboard { self.with_system_clipboard(id, params) } else { params };
-        // Vector art copied in another app (Illustrator, VectorCraft, Figma) is SVG markup on the
-        // system clipboard: with no insertion point it pastes as editable paths where text would go.
-        let typing = self.session.active().is_some_and(|d| d.selection.text.is_some());
-        let id = match params.as_object_mut() {
-            Some(o) if id == "edit.paste" && !typing && o.get("text").and_then(Value::as_str).is_some_and(designcraft_engine::cmd::is_svg_markup) => {
-                if let Some(svg) = o.remove("text") {
-                    o.insert("svg".into(), svg);
-                }
-                "edit.pasteSvg"
-            }
-            _ => id,
-        };
-        // Copied objects paste on the spread in view.
-        if matches!(id, "edit.paste" | "edit.pasteInPlace" | "edit.pasteSvg")
-            && let Some(spread) = canvas::current_spread(self)
-            && let Some(p) = params.as_object_mut()
-        {
-            p.entry("spread").or_insert(json!(spread));
-        }
-        let r = self.session.execute(id, &params).map_err(|e| e.to_string());
-        self.after_engine();
-        match &r {
-            Err(e) => self.status(e.clone()),
-            // Copied text goes to the system clipboard too, whichever way Copy was chosen.
-            Ok(v) if system_clipboard && matches!(id, "edit.copy" | "edit.cut") => {
-                let text = match v.get("text").and_then(Value::as_str) {
-                    Some(t) => {
-                        self.object_clip_text = None;
-                        Some(t.to_string())
-                    }
-                    None if !self.native_menu => {
-                        self.object_clip_text = Some(designcraft_engine::cmd::copied_objects_text(&self.session));
-                        self.object_clip_text.clone()
-                    }
-                    None => {
-                        self.object_clip_text = self.services.clipboard_text.as_mut().and_then(|f| f());
-                        None
-                    }
-                };
-                if let (Some(t), Some(ctx)) = (text, &self.egui_ctx) {
-                    ctx.copy_text(t);
-                    ctx.request_repaint();
-                }
-            }
-            Ok(_) => {}
-        }
-        if r.is_ok() && matches!(id, "file.open" | "file.openIdml" | "file.openBytes") {
-            if self.ui.dialog.as_ref().is_some_and(|d| d.id == "findFont") {
-                self.ui.dialog = None;
-            }
-            match self.session.execute("font.list", &json!({})) {
-                Ok(fonts) if fonts.as_array().is_some_and(|fonts| fonts.iter().any(|f| f["missing"] == true || f["styleMissing"] == true)) => {
-                    self.ui.dialog = Some(dialogs::Dialog::new("findFont", json!({"_fonts": fonts, "onOpen": true})));
-                }
-                Err(e) => self.status(e.to_string()),
-                _ => {}
-            }
-        }
-        if r.is_ok()
-            && matches!(id, "font.replace" | "font.reload" | "edit.undo" | "edit.redo")
-            && let Some(dialog) = self.ui.dialog.as_mut().filter(|d| d.id == "findFont")
-        {
-            dialog.fields.remove("_fonts");
-        }
-        r
-    }
-
-    /// Show `command` on the page as a live preview named `label` (the undo step's name): each call
-    /// replaces the last, and nothing reaches the undo history until [`Self::end_live_preview`]. A
-    /// panel calls this, or [`Self::hold_live_preview`], every frame its control is held; a frame
-    /// without either commits the preview.
-    pub fn live_preview(&mut self, label: &str, command: &str, params: Value) {
-        if self.run("edit.preview", json!({"label": label, "command": command, "params": params})).is_ok() {
-            self.live_preview = LivePreview { open: true, held: true };
-        }
-    }
-
-    /// The control showing the live preview is still held (pressed, though not moved this frame).
-    pub fn hold_live_preview(&mut self) {
-        self.live_preview.held = self.live_preview.open;
-    }
-
-    /// Commit the live preview, if one is open, as one undo step.
-    pub fn end_live_preview(&mut self) {
-        if std::mem::take(&mut self.live_preview).open {
-            let _ = self.run("edit.commitPreview", json!({}));
-        }
-    }
-
-    /// Start of a frame: a live preview no panel held last frame (its control was let go, or the
-    /// panel closed) is committed, so it never swallows later edits' undo steps.
-    pub(crate) fn settle_live_preview(&mut self) {
-        if !std::mem::take(&mut self.live_preview.held) {
-            self.end_live_preview();
-        }
-    }
-
-    /// Paste without the clipboard's text (a menu, not the paste keys): read it here. With no
-    /// insertion point, text that doesn't stand for copied objects becomes a new text frame
-    /// centred in the view.
-    fn with_system_clipboard(&mut self, id: &str, mut params: Value) -> Value {
-        let typing = self.session.active().is_some_and(|d| d.selection.text.is_some());
-        if !matches!(id, "edit.paste" | "edit.pasteWithoutFormatting") || !(typing || id == "edit.paste") {
-            return params;
-        }
-        if params.get("text").is_none()
-            && let Some(text) = self.services.clipboard_text.as_mut().and_then(|f| f())
-            && let Some(o) = params.as_object_mut()
-        {
-            o.insert("text".into(), Value::String(text));
-        }
-        // Still what an object copy put there: paste those objects, not the placeholder text.
-        let norm = |t: &str| t.replace("\r\n", "\n");
-        if let Some(copied) = &self.object_clip_text
-            && params.get("text").and_then(Value::as_str).is_some_and(|t| norm(t) == norm(copied))
-            && let Some(o) = params.as_object_mut()
-        {
-            o.remove("text");
-        }
-        if !typing
-            && params.get("text").and_then(Value::as_str).is_some_and(|t| !t.is_empty())
-            && let Some((spread, at)) = canvas::view_centre(self)
-            && let Ok(spread) = serde_json::to_value(spread)
-            && let Some(o) = params.as_object_mut()
-        {
-            o.entry("spread").or_insert(spread);
-            o.entry("at").or_insert(json!([at.x, at.y]));
-        }
-        params
-    }
-
-    /// Handle requests produced by tools/commands (dialogs, view changes, file pickers).
-    pub fn after_engine(&mut self) {
-        let reqs = std::mem::take(&mut self.session.ui_requests);
-        for r in reqs {
-            let was_find = self.ui.dialog.as_ref().is_some_and(|d| d.id == "findChange");
-            match r {
-                UiRequest::Dialog { id, params } if id == "colorTheme" => dialogs::open_color_theme(self, params),
-                UiRequest::Dialog { id, params } => self.ui.dialog = Some(dialogs::Dialog::new(&id, params)),
-                UiRequest::View { params } => canvas::apply_view_request(self, &params),
-                UiRequest::Pick { purpose, params } => {
-                    let _ = params;
-                    let _ = self.pick_and_open(&purpose);
-                }
-            }
-            // Release only when the request actually replaces Find, including a native PDF picker.
-            if was_find && self.ui.dialog.as_ref().is_none_or(|d| d.id != "findChange") {
-                self.session.reset_find_scope();
-            }
-        }
-        // New documents get a fitted view.
-        if let Some(st) = self.session.active() {
-            let uid = st.uid;
-            self.views.entry(uid).or_default();
-        }
-    }
-
-    /// Ask the host for a file to open (`open`) or place (`place`). Synchronous pickers run the
-    /// command right away; asynchronous ones (web) deliver the file through the inbox.
-    pub fn pick_and_open(&mut self, purpose: &str) -> Result<Value, String> {
-        let target = self.session.active().map(|d| d.uid);
-        if let Some(pick) = self.services.pick_open.as_mut() {
-            return match pick(purpose) {
-                // Image Import Options: a multi-page PDF asks which page.
-                Some(path) if purpose == "place" && path.to_ascii_lowercase().ends_with(".pdf") => {
-                    let pages =
-                        self.services.read.as_mut().and_then(|r| r(&path).ok()).and_then(|b| designcraft_render::pdf_page_count(&b)).unwrap_or(1);
-                    if pages > 1 {
-                        self.ui.dialog =
-                            Some(dialogs::Dialog::new("pdfImport", json!({"path": path, "page": "1", "pages": pages, "target": target})));
-                        Ok(Value::Null)
-                    } else {
-                        self.place_file(json!({"path": path}))
-                    }
-                }
-                Some(path) if purpose == "place" => self.place_file(json!({"path": path})),
-                Some(path) => self.open_file("file.open", json!({"path": path})),
-                None => Ok(Value::Null),
-            };
-        }
-        let request = self.import_request(purpose);
-        if let Some(open) = self.services.open_async.as_mut() {
-            open(request);
-        }
-        Ok(Value::Null)
-    }
-
-    /// Load Styles: ask the host for a document whose styles to load; `kind` is `paragraph`,
-    /// `character` or empty for both. A synchronous picker opens the dialog that chooses among
-    /// the file's styles; an asynchronous one (web) loads them all when the file arrives.
-    pub fn pick_styles(&mut self, kind: &str) -> Result<Value, String> {
-        designcraft_engine::cmd::has_doc(&self.session)?;
-        if let Some(pick) = self.services.pick_open.as_mut() {
-            let Some(path) = pick("styles") else { return Ok(Value::Null) };
-            let found = self.run("style.load.list", json!({"path": path}))?;
-            let of = |k: &str| if kind.is_empty() || kind == k { found[k].clone() } else { json!([]) };
-            self.ui.dialog = Some(dialogs::Dialog::new(
-                "loadStyles",
-                json!({"path": path, "paragraph": of("paragraph"), "character": of("character"), "conflicts": "redefine"}),
-            ));
-            return Ok(Value::Null);
-        }
-        let request = self.import_request(&if kind.is_empty() { "styles".to_string() } else { format!("styles:{kind}") });
-        if let Some(open) = self.services.open_async.as_mut() {
-            open(request);
-        }
-        Ok(Value::Null)
-    }
-
-    pub fn import_request(&self, purpose: &str) -> ImportRequest {
-        ImportRequest { purpose: purpose.into(), target: self.session.active().map(|d| d.uid) }
-    }
-
-    pub(crate) fn activate_import_target(&mut self, request: &ImportRequest) -> Result<(), String> {
-        let Some(index) = request.target.and_then(|uid| self.session.documents().iter().position(|d| d.uid == uid)) else {
-            let message = "Import cancelled: the originating document has closed";
-            self.status(crate::i18n::tr(&self.ui.language, message));
-            return Err(message.into());
-        };
-        self.run("file.activate", json!({"index": index}))?;
-        Ok(())
-    }
-
-    pub(crate) fn cancel_pdf_import(&mut self) {
-        self.pending_pdf = None;
-    }
-
-    pub(crate) fn confirm_pdf_import(&mut self, page: u64, crop: String) -> Result<Value, String> {
-        let file = self.pending_pdf.take().ok_or("PDF import cancelled: no pending file")?;
-        self.activate_import_target(&file.request)?;
-        let params = json!({"name": file.name, "base64": designcraft_engine::cmd::base64_encode(&file.bytes), "pdfPage": page, "pdfCrop": crop});
-        if file.request.purpose == "place" { self.place_file(params) } else { self.open_file("file.place", params) }
-    }
-
-    /// A single unresolved PDF owns its bytes. Later deliveries cancel explicitly rather than
-    /// replacing its options. Cancellation, replacement and target closure release its payload.
-    fn drain_inbox(&mut self) {
-        if let Some(file) = &self.pending_pdf {
-            let target_exists = self.session.documents().iter().any(|d| Some(d.uid) == file.request.target);
-            let owns_dialog =
-                self.ui.dialog.as_ref().is_some_and(|d| d.id == "pdfImport" && d.fields.get("async").and_then(Value::as_bool) == Some(true));
-            if !target_exists || !owns_dialog {
-                self.pending_pdf = None;
-                if !target_exists {
-                    if owns_dialog {
-                        self.ui.dialog = None;
-                    }
-                    self.status(crate::i18n::tr(&self.ui.language, "PDF import cancelled: the originating document has closed"));
-                }
-            }
-        }
-        let Some(inbox) = self.services.inbox.clone() else { return };
-        let files = std::mem::take(&mut *inbox.lock().unwrap_or_else(std::sync::PoisonError::into_inner));
-        for file in files {
-            if file.request.purpose == "shortcuts" {
-                shortcut_import::import_delivered(self, &file.bytes);
-                continue;
-            }
-            if self.ui.dialog.is_some() {
-                self.status(
-                    crate::i18n::tr(&self.ui.language, "{name}: import cancelled while a dialog is open; choose the file again")
-                        .replace("{name}", &file.name),
-                );
-                continue;
-            }
-            let name = file.name.clone();
-            if let Err(e) = self.import_file(file) {
-                self.status(format!("{name}: {e}"));
-            }
-        }
-    }
-
-    fn import_file(&mut self, file: ImportedFile) -> Result<Value, String> {
-        let lower = file.name.to_ascii_lowercase();
-        if let Some(kind) = file.request.purpose.strip_prefix("styles") {
-            self.activate_import_target(&file.request)?;
-            let mut params = json!({"name": file.name, "base64": designcraft_engine::cmd::base64_encode(&file.bytes)});
-            match kind {
-                ":paragraph" => params["character"] = json!([]),
-                ":character" => params["paragraph"] = json!([]),
-                _ => {}
-            }
-            return self.run("style.load", params);
-        }
-        let layout = opens_as_document(&file.name)
-            || (std::path::Path::new(&file.name).extension().is_none() && designcraft_engine::cmd::is_document(&file.bytes));
-        let place =
-            file.request.purpose == "place" || (matches!(file.request.purpose.as_str(), "drop" | "open") && !layout && !lower.ends_with(".ase"));
-        if place || lower.ends_with(".ase") || file.request.purpose == "swatches" {
-            self.activate_import_target(&file.request)?;
-        }
-        if place && lower.ends_with(".pdf") {
-            let pages = designcraft_render::pdf_page_count(&file.bytes).unwrap_or(1);
-            if pages > 1 {
-                self.ui.dialog =
-                    Some(dialogs::Dialog::new("pdfImport", json!({"async": true, "name": file.name.clone(), "page": "1", "pages": pages})));
-                self.pending_pdf = Some(file);
-                return Ok(Value::Null);
-            }
-        }
-        let b64 = designcraft_engine::cmd::base64_encode(&file.bytes);
-        if lower.ends_with(".ase") || file.request.purpose == "swatches" {
-            self.run("swatch.load", json!({"base64": b64}))
-        } else if file.request.purpose == "place" {
-            self.place_file(json!({"name": file.name, "base64": b64}))
-        } else if place {
-            self.open_file("file.place", json!({"name": file.name, "base64": b64}))
-        } else {
-            let title = file.name.rsplit_once('.').map_or(file.name.as_str(), |(stem, _)| stem);
-            self.open_file("file.openBytes", json!({"name": title, "base64": b64}))
-        }
-    }
-
-    pub fn select_tool(&mut self, id: &str) {
-        let _ = self.run("tool.select", json!({"tool": id}));
-        self.ui.flyout = None;
-    }
-
-    /// Per-frame logic before layout.
-    pub fn logic(&mut self, ctx: &egui::Context) {
-        if self.egui_ctx.is_none() {
-            self.egui_ctx = Some(ctx.clone());
-        }
-        self.window_maximized = ctx.input(|i| i.viewport().maximized.unwrap_or(false));
-        if !self.color_applied {
-            self.color_applied = true;
-            for path in self.ui.color_profiles.clone() {
-                if let Err(e) = self.session.execute("color.loadProfile", &json!({"path": path})) {
-                    log::warn!("Color Settings: {e}");
-                    self.status_error("Color Settings", e);
-                }
-            }
-            if let Some(cs) = self.ui.color_settings.clone() {
-                let known = cs.with_known_profiles();
-                for (saved, used) in [(&cs.rgb, &known.rgb), (&cs.cmyk, &known.cmyk)] {
-                    if saved != used {
-                        let e = format!("saved profile {saved} is not available; using {used}");
-                        log::warn!("Color Settings: {e}");
-                        self.status_error("Color Settings", e);
-                    }
-                }
-                let _ = designcraft_color::cms::set_active(&known);
-            }
-        }
-        let scale = self.ui.ui_scale.clamp(0.5, 3.0);
-        if (ctx.zoom_factor() - scale).abs() > 1e-3 {
-            ctx.set_zoom_factor(scale);
-        }
-        if !self.styled {
-            // The UI scale is a preference (applied above); egui's own Cmd+Plus/Minus/0 would rescale the
-            // whole window instead of the canvas, only to be reset next frame.
-            ctx.options_mut(|o| o.zoom_with_keyboard = false);
-            self.fonts_system = theme::install_fonts(ctx, &self.ui.language);
-            self.fonts_lang = self.ui.language.clone();
-            self.styled = true;
-            self.restyle = true;
-        } else {
-            if self.fonts_lang != self.ui.language || (!self.fonts_system && theme::system_fonts_ready()) {
-                self.fonts_system = theme::install_fonts(ctx, &self.ui.language);
-                self.fonts_lang = self.ui.language.clone();
-            }
-            self.fonts_ready = true;
-        }
-        if !self.fonts_system {
-            // The font scan runs in the background: look again shortly.
-            ctx.request_repaint_after(std::time::Duration::from_millis(250));
-        }
-        if self.restyle {
-            theme::apply(ctx, &theme::Tokens::for_brightness(self.ui.brightness));
-            self.restyle = false;
-        }
-        let now = ctx.input(|i| i.time);
-        // Crash recovery: unsaved documents are written to the recovery folder every 30 s.
-        #[cfg(not(target_arch = "wasm32"))]
-        if self.session.recovery_dir.is_some() && now - self.last_recovery > (self.session.prefs.recovery_minutes * 60.0).max(5.0) {
-            self.last_recovery = now;
-            if self.session.documents().iter().any(|d| d.is_dirty())
-                && let Err(e) = self.session.execute("file.recovery.save", &json!({}))
-            {
-                self.status(crate::i18n::tr(&self.ui.language, "Couldn't write recovery data: {error}").replace("{error}", &e.to_string()));
-            }
-        }
-        let dt = now - self.last_time;
-        if dt > 0.0 {
-            self.perf.fps = self.perf.fps * 0.9 + (1.0 / dt).min(240.0) * 0.1;
-        }
-        self.last_time = now;
-        self.drain_control(ctx);
-        new_document::end_stale_preview(self);
-        if self.fonts_ready {
-            self.drain_inbox();
-            self.open_os_documents();
-        }
-        if !self.synthetic.is_empty() || !self.control_synthetic.is_empty() {
-            ctx.request_repaint();
-        }
-        self.collect_screenshots(ctx);
-        self.issue_screenshots(ctx);
-        if self.fonts_ready {
-            menus::shortcuts(self, ctx);
-        }
-        self.flush_window_commands(ctx);
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            let (dropped, pointer) = ctx.input(|i| (i.raw.dropped_files.clone(), i.pointer.hover_pos()));
-            for f in dropped {
-                let p = f.path().to_string_lossy().to_string();
-                if !p.is_empty() {
-                    let _ = self.open_dropped_at(&p, pointer);
-                }
-            }
-        }
-        self.handle_quit(ctx);
-    }
-
-    /// Quit: close the window the way its close button does, so unsaved documents ask first.
-    pub fn request_quit(&mut self) {
-        self.quit_requested = true;
-    }
-
-    /// Ask about unsaved documents without closing any of them yet. A later Cancel must also
-    /// keep documents whose earlier answer was Don't Save, including their history and recovery.
-    fn handle_quit(&mut self, ctx: &egui::Context) {
-        if std::mem::take(&mut self.quit_requested) {
-            ctx.send_viewport_cmd(egui::ViewportCommand::Close);
-        }
-        if ctx.input(|i| i.viewport().close_requested()) {
-            if self.quit_without_asking {
-                self.quitting = None;
-                return;
-            }
-            if self.quitting.is_none() && !self.session.documents().iter().any(|d| d.is_dirty()) {
-                return;
-            }
-            let approved =
-                self.quitting.as_ref().is_some_and(|q| q.pending.is_none()) && self.ui.dialog.is_none() && self.next_unapproved_document().is_none();
-            if approved {
-                // Commit only when the backend receives the final close, after checking for
-                // edits that arrived since the last answer. Closing also discards recovery data.
-                if let Err(e) = self.finish_confirmed_quit() {
-                    self.status(e);
-                    self.cancel_quit();
-                    ctx.send_viewport_cmd(egui::ViewportCommand::CancelClose);
-                }
-                return;
-            }
-            ctx.send_viewport_cmd(egui::ViewportCommand::CancelClose);
-            // Dock Quit can arrive while the app is hidden or minimized. Make its question
-            // visible through the normal safe window commands before asking about documents.
-            ctx.send_viewport_cmd(egui::ViewportCommand::Visible(true));
-            ctx.send_viewport_cmd(egui::ViewportCommand::Minimized(false));
-            ctx.send_viewport_cmd(egui::ViewportCommand::Focus);
-            if self.quitting.is_none() {
-                self.quitting = Some(QuitState { original_active: self.session.active().map(|d| d.uid), accepted: HashMap::new(), pending: None });
-            }
-        }
-        let Some(q) = self.quitting.as_ref() else { return };
-        if let Some(uid) = q.pending {
-            let asking = self.ui.dialog.as_ref().is_some_and(|d| {
-                d.id == "closeDocument"
-                    && d.fields.get("quitting").and_then(Value::as_bool) == Some(true)
-                    && d.fields.get("uid").and_then(Value::as_u64) == Some(uid)
-            });
-            if !asking {
-                self.cancel_quit();
-            }
-            return;
-        }
-        if self.ui.dialog.is_some() {
-            self.cancel_quit();
-            return;
-        }
-        self.ask_next_unsaved(ctx);
-    }
-
-    /// Finalize a complete, still-current quit plan at an orderly host exit. The host can
-    /// terminate before egui receives its queued Close; an unfinished/stale plan leaves every
-    /// document live so the host can preserve its recovery data instead.
-    pub fn finish_confirmed_quit(&mut self) -> Result<(), String> {
-        let approved =
-            self.quitting.as_ref().is_some_and(|q| q.pending.is_none()) && self.ui.dialog.is_none() && self.next_unapproved_document().is_none();
-        if !approved {
-            return Ok(());
-        }
-        while !self.session.documents().is_empty() {
-            self.run("file.close", json!({"index": 0}))?;
-        }
-        self.quitting = None;
-        Ok(())
-    }
-
-    fn next_unapproved_document(&self) -> Option<(usize, u64)> {
-        let q = self.quitting.as_ref()?;
-        self.session
-            .documents()
-            .iter()
-            .enumerate()
-            .find(|(_, d)| d.is_dirty() && q.accepted.get(&d.uid) != Some(&d.revision))
-            .map(|(i, d)| (i, d.uid))
-    }
-
-    fn cancel_quit(&mut self) {
-        let Some(q) = self.quitting.take() else { return };
-        if let Some(i) = q.original_active.and_then(|uid| self.session.documents().iter().position(|d| d.uid == uid)) {
-            let _ = self.run("file.activate", json!({"index": i}));
-        }
-    }
-
-    /// Save/Don't Save during Quit approves this UID's current revision, without destroying it.
-    pub(crate) fn confirm_quit_document(&mut self, uid: u64, discard: bool) -> Result<Value, String> {
-        if self.quitting.as_ref().and_then(|q| q.pending) != Some(uid) {
-            return Err("Quit confirmation is no longer active".into());
-        }
-        let Some(i) = self.session.documents().iter().position(|d| d.uid == uid) else {
-            if let Some(q) = self.quitting.as_mut() {
-                q.pending = None;
-            }
-            return Ok(Value::Null);
-        };
-        if !discard {
-            let saved = self.run("file.activate", json!({"index": i})).and_then(|_| self.run("app.save", json!({})));
-            if let Err(e) = saved {
-                self.cancel_quit();
-                return Err(e);
-            }
-            if self.session.documents().iter().find(|d| d.uid == uid).is_none_or(|d| d.is_dirty()) {
-                // No file chosen (or an asynchronous host save has not completed): stop quitting.
-                self.cancel_quit();
-                return Ok(Value::Null);
-            }
-        }
-        if let Some(q) = self.quitting.as_mut() {
-            if let Some(d) = self.session.documents().iter().find(|d| d.uid == uid) {
-                q.accepted.insert(uid, d.revision);
-            }
-            q.pending = None;
-        }
-        Ok(Value::Null)
-    }
-
-    /// Show the next unapproved document, or request a final close that revalidates all approvals.
-    fn ask_next_unsaved(&mut self, ctx: &egui::Context) {
-        let Some((i, uid)) = self.next_unapproved_document() else {
-            ctx.send_viewport_cmd(egui::ViewportCommand::Close);
-            return;
-        };
-        if self.run("file.activate", json!({"index": i})).is_err() {
-            self.cancel_quit();
-            return;
-        }
-        menus::close_document(self, Some(i));
-        if let Some(d) = self.ui.dialog.as_mut() {
-            d.fields.insert("quitting".into(), json!(true));
-        }
-        if let Some(q) = self.quitting.as_mut() {
-            q.pending = Some(uid);
-        }
-    }
-
-    /// A file dropped on the window: documents open, the swatches in a swatch exchange (.ase) file
-    /// are loaded, and anything else is placed on the spread in view (a parent spread while parents
-    /// are being edited). A file without an extension opens when its content is a DesignCraft or
-    /// IDML document.
-    pub fn open_dropped(&mut self, path: &str) -> Result<Value, String> {
-        self.open_dropped_at(path, None)
-    }
-
-    /// [`Self::open_dropped`] at the pointer: a graphic's top left lands where the file was
-    /// dropped on the canvas, text goes to a new frame on the document page there.
-    pub fn open_dropped_at(&mut self, path: &str, pointer: Option<egui::Pos2>) -> Result<Value, String> {
-        if path.to_ascii_lowercase().ends_with(".ase") {
-            return self.run("swatch.load", json!({"path": path}));
-        }
-        let document = opens_as_document(path)
-            || (std::path::Path::new(path).extension().is_none()
-                && designcraft_engine::io::read_capped(path, designcraft_engine::cmd::DOCUMENT_SNIFF_BYTES)
-                    .is_ok_and(|b| designcraft_engine::cmd::is_document(&b)));
-        if document {
-            return self.open_file("file.open", json!({"path": path}));
-        }
-        let mut params = json!({"path": path});
-        if let (Some((sr, at)), Some(o)) = (canvas::drop_point(self, pointer), params.as_object_mut()) {
-            o.insert("spread".into(), serde_json::to_value(sr).unwrap_or(Value::Null));
-            o.insert("x".into(), json!(at.x));
-            o.insert("y".into(), json!(at.y));
-            if let (designcraft_doc::SpreadRef::Doc(si), Some(st)) = (sr, self.session.active()) {
-                let pi = st.doc.spreads.get(si).and_then(|s| s.page_at_x(at.x)).unwrap_or(0);
-                o.insert("page".into(), json!(st.doc.first_page_of_spread(si) + pi + 1));
-            }
-        }
-        self.open_file("file.place", params)
-    }
-
-    /// Queue files the operating system asked the app to open. They can arrive before the window
-    /// exists (the event that launched the app); the first ready frame opens them, each as a new
-    /// document through `file.open`, as File › Open does.
-    pub fn open_documents_later(&mut self, paths: impl IntoIterator<Item = String>) {
-        self.os_documents.extend(paths);
-    }
-
-    fn open_os_documents(&mut self) {
-        for path in std::mem::take(&mut self.os_documents) {
-            if let Err(e) = self.open_file("file.open", json!({"path": path})) {
-                log::warn!("{path}: {e}");
-            }
-        }
-    }
-
-    /// File › Place: the file fills the selected empty or graphic frame; with none, an image loads
-    /// into the place cursor (click to place at its natural size, drag to draw the frame).
-    pub(crate) fn place_file(&mut self, mut params: Value) -> Result<Value, String> {
-        if let Some(o) = params.as_object_mut() {
-            o.insert("loadCursor".into(), json!(true));
-        }
-        self.open_file("file.place", params)
-    }
-
-    /// Open (`file.open`, `file.openBytes`) or place (`file.place`) a file the user chose. A file
-    /// that can't be opened or placed gets an alert with the reason, as well as the status line.
-    /// A successful import with warnings keeps the document and shows the warnings in an alert.
-    pub fn open_file(&mut self, cmd: &str, params: Value) -> Result<Value, String> {
-        let file = match params.get("path").and_then(Value::as_str) {
-            Some(path) => std::path::Path::new(path).file_name().map_or_else(|| path.to_string(), |n| n.to_string_lossy().to_string()),
-            None => params.get("name").and_then(Value::as_str).unwrap_or_default().to_string(),
-        };
-        self.open_named_file(cmd, params, file)
-    }
-
-    /// [`Self::open_file`] for a command whose params don't name the file: `file` is shown in the
-    /// alert or warnings.
-    pub fn open_named_file(&mut self, cmd: &str, params: Value, file: String) -> Result<Value, String> {
-        let r = self.run(cmd, params);
-        if let Err(e) = &r {
-            let title = if cmd == "file.place" { "Can't Place the File" } else { "Can't Open the File" };
-            if self.ui.dialog.as_ref().is_some_and(|d| d.id == "findChange") {
-                self.session.reset_find_scope();
-            }
-            self.ui.dialog = Some(dialogs::Dialog::new("alert", json!({"title": title, "file": file, "message": e})));
-        } else if let Ok(result) = &r {
-            let warnings: Vec<&str> = result
-                .get("warnings")
-                .and_then(Value::as_array)
-                .into_iter()
-                .flatten()
-                .filter_map(Value::as_str)
-                .filter(|warning| !warning.is_empty())
-                .collect();
-            if !warnings.is_empty() {
-                self.status(format!("{file}: {}", warnings.join("; ")));
-                // Find Font, offered for the document's missing fonts, stays up: the status line
-                // keeps the warnings.
-                if self.ui.dialog.as_ref().is_none_or(|d| d.id != "findFont") {
-                    self.ui.dialog =
-                        Some(dialogs::Dialog::new("alert", json!({"title": "Import Warnings", "file": file, "message": warnings.join("\n")})));
-                }
-            }
-        }
-        r
-    }
-
-    /// Deliver window actions to the host without persisting them in UI preferences.
-    pub(crate) fn flush_window_commands(&mut self, ctx: &egui::Context) {
-        for command in std::mem::take(&mut self.pending_window_commands) {
-            ctx.send_viewport_cmd(command);
-        }
-    }
-
-    /// Keep widget clipboard output private while a queued control event is running.
-    pub(crate) fn install_clipboard_guard(&mut self, ctx: &egui::Context) {
-        if self.clipboard_guard_installed {
-            return;
-        }
-        let private = self.control_input_frame.clone();
-        ctx.on_end_pass(
-            "control clipboard",
-            std::sync::Arc::new(move |ui| {
-                if private.load(std::sync::atomic::Ordering::Relaxed) {
-                    ui.ctx().output_mut(|o| {
-                        o.commands.retain(|cmd| !matches!(cmd, egui::OutputCommand::CopyText(_) | egui::OutputCommand::CopyImage(_)))
-                    });
-                }
-            }),
-        );
-        self.clipboard_guard_installed = true;
-    }
-
-    /// Inject synthetic events (one pointer event per frame), retaining control provenance.
-    pub fn raw_input_hook(&mut self, raw: &mut egui::RawInput) {
-        let private = !self.control_synthetic.is_empty();
-        self.control_input_frame.store(private, std::sync::atomic::Ordering::Relaxed);
-        let events = if private { &mut self.control_synthetic } else { &mut self.synthetic };
-        let Some(first) = events.first() else { return };
-        let n = match first {
-            egui::Event::PointerMoved(_) | egui::Event::PointerButton { .. } => 1,
-            _ => events.iter().position(|e| matches!(e, egui::Event::Key { pressed: false, .. })).map_or(events.len(), |i| i + 1),
-        };
-        if let egui::Event::PointerMoved(p) | egui::Event::PointerButton { pos: p, .. } = first {
-            raw.events.push(egui::Event::PointerMoved(*p));
-        }
-        raw.events.extend(events.drain(..n));
-    }
-
-    /// Lay out the whole window.
-    pub fn ui(&mut self, ui: &mut egui::Ui) {
-        let ctx = ui.ctx().clone();
-        self.canvas_ime = false;
-        if !self.fonts_ready {
-            ctx.request_repaint();
-            return;
-        }
-        self.settle_live_preview();
-        let t0 = now_ms();
-        let t = theme::Tokens::get(&ctx);
-        let presenting = self.ui.screen_mode == ScreenMode::Presentation;
-        if presenting || self.ui.hidden_panels != 0 {
-            panel_docking::cancel_gesture(self, &ctx);
-        }
-        canvas::begin_frame(&ctx);
-        let dbg = std::env::var_os("DESIGNCRAFT_DEBUG_LAYOUT").is_some();
-        if dbg {
-            eprintln!("root start {:?}", ui.available_rect_before_wrap());
-        }
-        if !presenting {
-            chrome::app_bar(self, ui);
-            if dbg {
-                eprintln!("after app bar {:?}", ui.available_rect_before_wrap());
-            }
-            if self.ui.control_bar && self.session.active().is_some() && self.ui.hidden_panels == 0 {
-                chrome::control_bar(self, ui);
-            }
-            chrome::status_bar(self, ui);
-            if dbg {
-                eprintln!("after status {:?}", ui.available_rect_before_wrap());
-            }
-            if self.ui.hidden_panels != 1 {
-                toolbar::show(self, ui);
-            }
-            if self.ui.hidden_panels == 0 {
-                dock::show(self, ui);
-            }
-        }
-        egui::CentralPanel::default().frame(egui::Frame::NONE.fill(t.pasteboard)).show(ui, |ui| {
-            if self.session.active().is_none() {
-                chrome::start_screen(self, ui);
-                return;
-            }
-            if !presenting {
-                chrome::doc_tabs(self, ui);
-            }
-            let split_layout = (self.split && !presenting)
-                .then(|| {
-                    craft_ui::layout::split_rect(
-                        ui.available_rect_before_wrap(),
-                        craft_ui::layout::SplitAxis::Horizontal,
-                        craft_ui::layout::SplitSize::Ratio(0.5),
-                        2.0,
-                        0.0,
-                    )
-                })
-                .flatten();
-            if let Some(layout) = split_layout {
-                // Two panes with a divider; each has its own view (zoom, scroll) and render cache.
-                ui.painter().rect_filled(layout.divider, 0.0, t.border);
-                // Resolve the clicked pane before either canvas handles this frame's keys.
-                if let Some(p) = ui.input(|i| i.pointer.any_pressed().then(|| i.pointer.interact_pos()).flatten()) {
-                    if layout.first.contains(p) {
-                        self.focus_pane = 0;
-                    } else if layout.second.contains(p) {
-                        self.focus_pane = 1;
-                    }
-                }
-                for (k, half) in [layout.first, layout.second].into_iter().enumerate() {
-                    self.switch_pane(k as u8);
-                    // A new pane starts at the other pane's view.
-                    if k == 1 && self.view().is_none() {
-                        self.switch_pane(0);
-                        let v = self.view().copied();
-                        self.switch_pane(1);
-                        if let (Some(mut v), Some(m)) = (v, self.view_mut()) {
-                            v.fitted = false;
-                            *m = v;
-                        }
-                    }
-                    ui.scope_builder(egui::UiBuilder::new().max_rect(half), |ui| canvas::show(self, ui));
-                }
-                self.switch_pane(self.focus_pane);
-            } else {
-                self.switch_pane(0);
-                // With a second window, the main one takes the focus back when clicked.
-                if !self.second_window || (ui.input(|i| i.pointer.any_pressed()) && ui.ui_contains_pointer()) {
-                    self.focus_pane = 0;
-                }
-                canvas::show(self, ui);
-            }
-        });
-        // New Window: pane 1 in a window of its own.
-        if self.second_window
-            && !presenting
-            && let Some(title) = self.session.active().map(|d| format!("{} — 2", d.doc.title))
-        {
-            let fill = t.pasteboard;
-            let ctx = ui.ctx().clone();
-            ctx.show_viewport_immediate(
-                egui::ViewportId::from_hash_of("designcraft_second_window"),
-                egui::ViewportBuilder::default().with_title(title).with_inner_size([960.0, 720.0]),
-                |ui, _class| {
-                    egui::CentralPanel::default().frame(egui::Frame::NONE.fill(fill)).show(ui, |ui| {
-                        self.switch_pane(1);
-                        if self.view().is_none() {
-                            self.switch_pane(0);
-                            let v = self.view().copied();
-                            self.switch_pane(1);
-                            if let (Some(mut v), Some(m)) = (v, self.view_mut()) {
-                                v.fitted = false;
-                                *m = v;
-                            }
-                        }
-                        if ui.input(|i| i.pointer.any_pressed()) {
-                            self.focus_pane = 1;
-                        }
-                        canvas::show(self, ui);
-                    });
-                    if ui.input(|i| i.viewport().close_requested()) {
-                        self.second_window = false;
-                        self.focus_pane = 0;
-                    }
-                },
-            );
-            self.switch_pane(self.focus_pane);
-        }
-        // Tab, Shift+Tab and Presentation hide the floating panels with the docked ones.
-        if !presenting && self.ui.hidden_panels == 0 {
-            dock::flyout(self, &ctx);
-            dock::floating(self, &ctx);
-        }
-        story_editor::show(self, &ctx);
-        dialogs::show(self, &ctx);
-        about::show(self, &ctx);
-        menus::palette(self, &ctx);
-        if self.custom_titlebar {
-            chrome::resize_borders(self, ui);
-        }
-        for url in std::mem::take(&mut self.ui.pending_urls) {
-            ctx.open_url(egui::OpenUrl::new_tab(url));
-        }
-        self.perf.frame_ms = now_ms() - t0;
-    }
-
-    fn drain_control(&mut self, ctx: &egui::Context) {
-        let Some(rx) = self.control_rx.take() else { return };
-        while let Ok(req) = rx.try_recv() {
-            let reply = req.reply.clone();
-            match control::handle(self, ctx, &req) {
-                control::Outcome::Done(v) => {
-                    let _ = reply.send(v);
-                }
-                control::Outcome::Screenshot { path } => {
-                    self.shot_token += 1;
-                    let token = self.shot_token;
-                    self.queued_shots.push((token, now_ms() + 120.0, 0));
-                    self.pending_shots.push((token, path, reply, now_ms() + 8000.0));
-                }
-            }
-        }
-        self.control_rx = Some(rx);
-    }
-
-    fn issue_screenshots(&mut self, ctx: &egui::Context) {
-        let now = now_ms();
-        self.queued_shots.retain_mut(|(token, at, frames)| {
-            *frames += 1;
-            if now >= *at && *frames >= 3 {
-                ctx.send_viewport_cmd(egui::ViewportCommand::Screenshot(egui::UserData::new(*token)));
-                false
-            } else {
-                true
-            }
-        });
-        if !self.queued_shots.is_empty() || !self.pending_shots.is_empty() {
-            ctx.request_repaint_after(std::time::Duration::from_millis(16));
-        }
-    }
-
-    fn collect_screenshots(&mut self, ctx: &egui::Context) {
-        if self.pending_shots.is_empty() {
-            return;
-        }
-        let events: Vec<_> = ctx.input(|i| {
-            i.raw
-                .events
-                .iter()
-                .filter_map(|e| match e {
-                    egui::Event::Screenshot { user_data, image, .. } => {
-                        let token = user_data.data.as_ref().and_then(|d| d.downcast_ref::<u64>()).copied()?;
-                        Some((token, image.clone()))
-                    }
-                    _ => None,
-                })
-                .collect()
-        });
-        for (token, image) in events {
-            if let Some(i) = self.pending_shots.iter().position(|(t, ..)| *t == token) {
-                let (_, path, reply, _) = self.pending_shots.remove(i);
-                let _ = reply.send(control::save_screenshot(self, &image, path.as_deref()));
-            }
-        }
-        let now = now_ms();
-        self.pending_shots.retain(|(_, _, reply, deadline)| {
-            if now < *deadline {
-                return true;
-            }
-            let _ = reply.send(json!({"ok": false, "error": "no frame was presented (screen locked or window hidden); use ui.render"}));
-            false
-        });
-    }
+    /// The document whose Save answer went to a save dialog that hasn't answered yet.
+    saving: Option<u64>,
 }
 
 /// Whether CJK-only interface is shown (Preferences › Type › Show CJK Features): the explicit
@@ -1748,1085 +301,8 @@ pub fn cjk_features(app: &DesignApp) -> bool {
     app.session.prefs.cjk_features.unwrap_or_else(|| i18n::is_cjk(&app.ui.language))
 }
 
-/// Files that open as documents (when dropped or picked) rather than being placed: DesignCraft,
-/// IDML, and InDesign documents and templates (converted to IDML on open).
-pub fn opens_as_document(name: &str) -> bool {
-    let n = name.to_ascii_lowercase();
-    [".designcraft", ".idml", ".indd", ".indt"].iter().any(|ext| n.ends_with(ext))
-}
-
-pub fn now_ms() -> f64 {
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        use std::time::{SystemTime, UNIX_EPOCH};
-        SystemTime::now().duration_since(UNIX_EPOCH).map(|d| d.as_secs_f64() * 1000.0).unwrap_or(0.0)
-    }
-    #[cfg(target_arch = "wasm32")]
-    {
-        0.0
-    }
-}
-
-/// Named `KeyboardEvent.key` values (W3C UI Events) that a browser reports for a key that types
-/// nothing, separated by spaces. eframe's web backend sends the ones it doesn't know as text.
-const KEY_NAMES: &str = "\
-    Unidentified Alt AltGraph CapsLock Control Fn FnLock Hyper Meta NumLock ScrollLock Shift Super Symbol SymbolLock OS Win Enter \
-    Tab ArrowDown ArrowLeft ArrowRight ArrowUp End Home PageDown PageUp Backspace Clear Copy CrSel Cut Delete EraseEof ExSel \
-    Insert Paste Redo Undo Accept Again Attn Cancel ContextMenu Esc Escape Execute Find Finish Help Pause Play Props Select \
-    ZoomIn ZoomOut BrightnessDown BrightnessUp Eject LogOff Power PowerOff PrintScreen Hibernate Standby WakeUp AllCandidates \
-    Alphanumeric CodeInput Compose Convert Dead FinalMode GroupFirst GroupLast GroupNext GroupPrevious ModeChange NextCandidate \
-    NonConvert PreviousCandidate Process SingleCandidate HangulMode HanjaMode JunjaMode Eisu Hankaku Hiragana HiraganaKatakana \
-    KanaMode KanjiMode Katakana Romaji Zenkaku ZenkakuHankaku Soft1 Soft2 Soft3 Soft4 ChannelDown ChannelUp Close MailForward \
-    MailReply MailSend MediaClose MediaFastForward MediaPause MediaPlay MediaPlayPause MediaRecord MediaRewind MediaStop \
-    MediaTrackNext MediaTrackPrevious New Open Print Save SpellCheck Key11 Key12 AudioBalanceLeft AudioBalanceRight \
-    AudioBassBoostDown AudioBassBoostToggle AudioBassBoostUp AudioFaderFront AudioFaderRear AudioSurroundModeNext AudioTrebleDown \
-    AudioTrebleUp AudioVolumeDown AudioVolumeUp AudioVolumeMute MicrophoneToggle MicrophoneVolumeDown MicrophoneVolumeUp \
-    MicrophoneVolumeMute SpeechCorrectionList SpeechInputToggle LaunchApplication1 LaunchApplication2 LaunchCalendar \
-    LaunchContacts LaunchMail LaunchMediaPlayer LaunchMusicPlayer LaunchPhone LaunchScreenSaver LaunchSpreadsheet \
-    LaunchWebBrowser LaunchWebCam LaunchWordProcessor BrowserBack BrowserFavorites BrowserForward BrowserHome BrowserRefresh \
-    BrowserSearch BrowserStop AppSwitch Call Camera CameraFocus EndCall GoBack GoHome HeadsetHook LastNumberRedial Notification \
-    MannerMode VoiceDial TV TV3DMode TVAntennaCable TVAudioDescription TVAudioDescriptionMixDown TVAudioDescriptionMixUp \
-    TVContentsMenu TVDataService TVInput TVInputComponent1 TVInputComponent2 TVInputComposite1 TVInputComposite2 TVInputHDMI1 \
-    TVInputHDMI2 TVInputHDMI3 TVInputHDMI4 TVInputVGA1 TVMediaContext TVNetwork TVNumberEntry TVPower TVRadioService TVSatellite \
-    TVSatelliteBS TVSatelliteCS TVSatelliteToggle TVTerrestrialAnalog TVTerrestrialDigital TVTimer AVRInput AVRPower ColorF0Red \
-    ColorF1Green ColorF2Yellow ColorF3Blue ColorF4Grey ColorF5Brown ClosedCaptionToggle Dimmer DisplaySwap DVR Exit \
-    FavoriteClear0 FavoriteClear1 FavoriteClear2 FavoriteClear3 FavoriteRecall0 FavoriteRecall1 FavoriteRecall2 FavoriteRecall3 \
-    FavoriteStore0 FavoriteStore1 FavoriteStore2 FavoriteStore3 Guide GuideNextDay GuidePreviousDay Info InstantReplay Link \
-    ListProgram LiveContent Lock MediaApps MediaAudioTrack MediaLast MediaSkipBackward MediaSkipForward MediaStepBackward \
-    MediaStepForward MediaTopMenu NavigateIn NavigateNext NavigateOut NavigatePrevious NextFavoriteChannel NextUserProfile \
-    OnDemand Pairing PinPDown PinPMove PinPToggle PinPUp PlaySpeedDown PlaySpeedReset PlaySpeedUp RandomToggle RcLowBattery \
-    RecordSpeedNext RfBypass ScanChannelsToggle ScreenModeNext Settings SplitScreenToggle STBInput STBPower Subtitle Teletext \
-    VideoModeNext Wink ZoomToggle";
-
-/// Is `text` the name of a key ("AltGraph", "Dead", "F13") instead of typed text?
-pub fn is_key_name(text: &str) -> bool {
-    let function_key = text.strip_prefix('F').is_some_and(|n| !n.is_empty() && n.bytes().all(|b| b.is_ascii_digit()));
-    function_key || KEY_NAMES.split_ascii_whitespace().any(|k| k == text)
-}
-
-/// Drop text events that are key names: eframe's web backend sends the name of every key it
-/// doesn't know as text, so AltGr typed "AltGraph" into the story. `text_input_focused`: an egui
-/// text field or the canvas's text caret has the keyboard, so the browser's hidden text input
-/// sends the text, which holds only typed text (whole words from autocompletion too) and is left
-/// alone.
-pub fn drop_key_name_text(raw: &mut egui::RawInput, text_input_focused: bool) {
-    if !text_input_focused {
-        raw.events.retain(|e| !matches!(e, egui::Event::Text(t) if is_key_name(t)));
-    }
-}
-
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// The Control panel's two-row groups were centred as if they were one row tall, so the second
-    /// row hung below the panel and was cut off.
-    #[test]
-    fn control_bar_shows_its_second_row() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
-        app.run("file.newSample", json!({})).unwrap();
-        app.ui.control_bar = true;
-        let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1440.0, 900.0)).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let ctx = ui.ctx().clone();
-                app.logic(&ctx);
-                app.ui(ui);
-            },
-            app,
-        );
-        h.run_steps(4);
-        let bar = egui::containers::panel::PanelState::load(&h.ctx, egui::Id::new("control_bar")).unwrap().outer_rect;
-        assert!(bar.height() > 40.0, "{bar:?}");
-        // The X/Y/W/H group: its second row holds Y: and H:.
-        let group = h.ctx.read_response(egui::Id::new(("object_control", "dimensions"))).unwrap().rect;
-        assert!(bar.contains(group.left_top()), "the X/Y/W/H group {group:?} is in the Control panel {bar:?}");
-        assert!(group.bottom() <= bar.bottom(), "X/Y/W/H group {group:?} hangs below the Control panel {bar:?}");
-    }
-
-    #[test]
-    fn key_names_sent_as_text_are_dropped() {
-        let text = |t: &str| egui::Event::Text(t.to_string());
-        let events = || {
-            vec![text("AltGraph"), text("é"), text("Dead"), text("A"), text("Unidentified"), text("ß"), text("AudioVolumeUp"), text("ab"), text("Æ")]
-        };
-        let mut raw = egui::RawInput { events: events(), ..Default::default() };
-        drop_key_name_text(&mut raw, false);
-        assert_eq!(raw.events, vec![text("é"), text("A"), text("ß"), text("ab"), text("Æ")]);
-        assert!(is_key_name("F13") && is_key_name("Escape") && is_key_name("ZoomToggle") && !is_key_name("F") && !is_key_name("Fx"));
-        // Capitalised words (mobile autocompletion) are text.
-        let words = vec![text("Hello"), text("Tokyo"), text("OK"), text("Hi there")];
-        let mut raw = egui::RawInput { events: words.clone(), ..Default::default() };
-        drop_key_name_text(&mut raw, false);
-        assert_eq!(raw.events, words);
-        // A focused text field or a canvas text caret gets its text from the browser's input
-        // events, which hold whole words, key-name-like ones too ("Help").
-        let mut raw = egui::RawInput { events: events(), ..Default::default() };
-        drop_key_name_text(&mut raw, true);
-        assert_eq!(raw.events, events());
-    }
-
-    /// InDesign shows 100% K as pure black on screen unless Appearance of Black says otherwise
-    /// (Display All Blacks as Rich Black is its default); settings saved without the field get it too.
-    #[test]
-    fn black_shows_as_rich_black_by_default() {
-        assert!(UiState::default().rich_black);
-        let saved: UiState = serde_json::from_str("{}").unwrap();
-        assert!(saved.rich_black);
-        let accurate: UiState = serde_json::from_str(r#"{"richBlack": false}"#).unwrap();
-        assert!(!accurate.rich_black, "a saved choice is kept");
-    }
-
-    /// Tool readouts measured in picas whatever the document's units (the UI's unit is never set):
-    /// they follow the active document's ruler units.
-    #[test]
-    fn tool_readouts_measure_in_the_documents_units() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
-        assert_eq!(app.view_info().unit, Unit::Picas, "no document: the UI's default");
-        app.run("file.new", json!({})).unwrap();
-        app.run("document.preferences", json!({"horizontalUnits": "inches", "verticalUnits": "millimeters"})).unwrap();
-        assert_eq!(app.view_info().unit, Unit::Inches);
-    }
-
-    /// Save and Export PDF dialogs started in the home folder (#1653): they start beside a saved
-    /// document, and for one never saved in the folder of the last save or export.
-    #[test]
-    fn save_dialogs_start_beside_the_document_or_in_the_last_folder() {
-        use std::{cell::RefCell, rc::Rc};
-        let home = tempfile::tempdir().unwrap();
-        let elsewhere = tempfile::tempdir().unwrap();
-        let asked: Rc<RefCell<Vec<String>>> = Rc::default();
-        let answer: Rc<RefCell<Option<String>>> = Rc::default();
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
-        let (seen, reply) = (asked.clone(), answer.clone());
-        app.services.pick_save = Some(Box::new(move |name: &str| {
-            seen.borrow_mut().push(name.to_string());
-            reply.borrow().clone()
-        }));
-        app.services.write = Some(Box::new(|_: &str, _: &[u8]| Ok(())));
-        let last = |asked: &Rc<RefCell<Vec<String>>>| asked.borrow().last().cloned().unwrap_or_default();
-        let export_pdf = |app: &mut DesignApp| {
-            app.ui.dialog = Some(dialogs::Dialog::new("pdfExport", json!({})));
-            app.ui.dialog.as_mut().unwrap().fields.insert("title".into(), json!("Report"));
-            dialogs::confirm(app).unwrap();
-        };
-
-        app.run("file.new", json!({})).unwrap();
-        let untitled = format!("{}.designcraft", app.session.active().unwrap().doc.title);
-        app.run("app.saveDialog", json!({})).unwrap();
-        assert_eq!(last(&asked), untitled, "never saved, nothing remembered: the system's own folder");
-
-        let saved = home.path().join("Brochure.designcraft");
-        *answer.borrow_mut() = Some(saved.to_string_lossy().to_string());
-        app.run("app.saveDialog", json!({})).unwrap();
-        assert_eq!(app.session.active().unwrap().path.as_deref(), Some(&*saved.to_string_lossy()));
-        // An export into another folder becomes the last folder used.
-        *answer.borrow_mut() = Some(elsewhere.path().join("Proof.pdf").to_string_lossy().to_string());
-        export_pdf(&mut app);
-        *answer.borrow_mut() = None;
-        export_pdf(&mut app);
-        assert_eq!(last(&asked), home.path().join("Report.pdf").to_string_lossy(), "a saved document exports beside itself");
-
-        app.run("file.new", json!({})).unwrap();
-        let untitled = format!("{}.designcraft", app.session.active().unwrap().doc.title);
-        app.run("app.saveDialog", json!({})).unwrap();
-        assert_eq!(last(&asked), elsewhere.path().join(untitled).to_string_lossy(), "a new document starts in the last folder used");
-    }
-
-    /// No name (Save with no document) suggested the remembered folder itself as the file, and a
-    /// title with a slash moved the suggestion out of the document's folder.
-    #[test]
-    fn save_dialog_suggestions_keep_the_folder_and_only_a_file_name() {
-        use std::{cell::RefCell, rc::Rc};
-        let folder = tempfile::tempdir().unwrap();
-        let asked: Rc<RefCell<Vec<String>>> = Rc::default();
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
-        let seen = asked.clone();
-        app.services.pick_save = Some(Box::new(move |name: &str| {
-            seen.borrow_mut().push(name.to_string());
-            None
-        }));
-        app.ui.last_save_folder = Some(folder.path().join("Docs").to_string_lossy().to_string());
-        app.pick_save("");
-        app.pick_save("Q1/Q2.pdf");
-        assert_eq!(*asked.borrow(), ["".to_string(), folder.path().join("Docs").join("Q2.pdf").to_string_lossy().to_string()]);
-    }
-
-    /// An app with one document that has an unsaved edit.
-    fn app_with_unsaved_document() -> DesignApp {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
-        app.run("file.new", json!({})).unwrap();
-        assert!(!app.session.documents()[0].is_dirty(), "a new document has nothing to save");
-        app.run("frame.create", json!({"rect": [36, 36, 136, 136]})).unwrap();
-        assert!(app.session.documents()[0].is_dirty());
-        app
-    }
-
-    /// File ▸ Close (and its shortcut) closed a document with unsaved changes without asking, and
-    /// closing discards the document's recovery data too.
-    #[test]
-    fn closing_an_unsaved_document_asks_first() {
-        let mut app = app_with_unsaved_document();
-        menus::activate(&mut app, "file.close", &Value::Null);
-        assert_eq!(app.session.documents().len(), 1, "the document stays open until the user answers");
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("closeDocument"));
-        // Cancel: nothing happens.
-        app.ui.dialog = None;
-        assert!(app.session.documents()[0].is_dirty());
-        // The tab's × asks too.
-        menus::close_document(&mut app, Some(0));
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("closeDocument"));
-        assert_eq!(app.session.documents().len(), 1);
-    }
-
-    #[test]
-    fn closing_without_saving_discards_the_document() {
-        let mut app = app_with_unsaved_document();
-        menus::close_document(&mut app, None);
-        app.ui.dialog.as_mut().unwrap().fields.insert("discard".into(), json!(true));
-        dialogs::confirm(&mut app).unwrap();
-        assert!(app.session.documents().is_empty());
-        assert!(app.ui.dialog.is_none());
-    }
-
-    #[test]
-    fn closing_with_save_writes_the_file_then_closes() {
-        let mut app = app_with_unsaved_document();
-        let path = std::env::temp_dir().join(format!("designcraft-close-test-{}.designcraft", std::process::id()));
-        app.run("file.saveAs", json!({"path": path})).unwrap();
-        let saved = std::fs::metadata(&path).unwrap().len();
-        app.run("frame.create", json!({"rect": [200, 200, 300, 300]})).unwrap();
-        menus::close_document(&mut app, None);
-        dialogs::confirm(&mut app).unwrap();
-        assert!(app.session.documents().is_empty());
-        let written = std::fs::metadata(&path).unwrap().len();
-        std::fs::remove_file(&path).unwrap();
-        assert!(written > saved, "the second frame was saved ({saved} → {written} bytes)");
-    }
-
-    /// Save on a document that has no file opens the file picker; cancelling it must not close the
-    /// document. (No picker service here: the same as cancelling.)
-    #[test]
-    fn a_cancelled_save_keeps_the_document_open() {
-        let mut app = app_with_unsaved_document();
-        menus::close_document(&mut app, None);
-        dialogs::confirm(&mut app).unwrap();
-        assert_eq!(app.session.documents().len(), 1);
-        assert!(app.session.documents()[0].is_dirty());
-    }
-
-    #[test]
-    fn closing_a_saved_document_does_not_ask() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
-        app.run("file.new", json!({})).unwrap();
-        menus::activate(&mut app, "file.close", &Value::Null);
-        assert!(app.session.documents().is_empty());
-        assert!(app.ui.dialog.is_none());
-    }
-
-    /// One frame of the quit handling, with the window asked to close when `close`; returns the
-    /// commands sent to the window.
-    fn quit_frame(app: &mut DesignApp, ctx: &egui::Context, close: bool) -> Vec<egui::ViewportCommand> {
-        let mut raw = egui::RawInput::default();
-        if close {
-            raw.viewports.entry(egui::ViewportId::ROOT).or_default().events.push(egui::ViewportEvent::Close);
-        }
-        let mut out = ctx.run_ui(raw, |ui| app.handle_quit(ui.ctx()));
-        out.textures_delta.clear();
-        out.viewport_output.get(&egui::ViewportId::ROOT).map(|v| v.commands.clone()).unwrap_or_default()
-    }
-
-    fn dialog_uid(app: &DesignApp) -> Option<u64> {
-        app.ui.dialog.as_ref().filter(|d| d.id == "closeDocument").and_then(|d| d.fields.get("uid")?.as_u64())
-    }
-
-    /// Quitting closed the window at once, losing unsaved changes (#544).
-    #[test]
-    fn quitting_with_unsaved_changes_asks_and_cancel_keeps_everything() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        let cmds = quit_frame(&mut app, &ctx, true);
-        assert!(cmds.contains(&egui::ViewportCommand::CancelClose), "{cmds:?}");
-        assert_eq!(dialog_uid(&app), Some(app.session.documents()[0].uid));
-        // Cancel: the window and the document stay as they were.
-        app.ui.dialog = None;
-        for _ in 0..2 {
-            assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        }
-        assert_eq!(app.session.documents().len(), 1);
-        assert!(app.session.documents()[0].is_dirty());
-        // A Save whose file picker is cancelled stops quitting too.
-        quit_frame(&mut app, &ctx, true);
-        dialogs::confirm(&mut app).unwrap();
-        assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert!(app.session.documents()[0].is_dirty());
-    }
-
-    #[test]
-    fn quitting_asks_about_each_unsaved_document_then_closes() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [36, 36, 136, 136]})).unwrap();
-        app.run("file.new", json!({})).unwrap();
-        let uids: Vec<u64> = app.session.documents().iter().map(|d| d.uid).collect();
-        assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
-        for (n, uid) in uids.iter().take(2).enumerate() {
-            assert_eq!(dialog_uid(&app), Some(*uid), "question {n}");
-            assert_eq!(app.session.active().map(|d| d.uid), Some(*uid), "the document asked about is shown");
-            app.ui.dialog.as_mut().unwrap().fields.insert("discard".into(), json!(true));
-            dialogs::confirm(&mut app).unwrap();
-            let cmds = quit_frame(&mut app, &ctx, false);
-            assert_eq!(cmds.contains(&egui::ViewportCommand::Close), n == 1, "{cmds:?}");
-        }
-        // All documents stay open until the backend's final close commits the decision.
-        assert_eq!(app.session.documents().len(), 3);
-        assert!(quit_frame(&mut app, &ctx, true).is_empty());
-        assert!(app.session.documents().is_empty());
-    }
-
-    /// A later Cancel must not destroy documents already approved for discard.
-    #[test]
-    fn quitting_later_cancel_retains_every_document_and_active_tab() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [20, 20, 120, 120]})).unwrap();
-        let uids: Vec<u64> = app.session.documents().iter().map(|d| d.uid).collect();
-        let active = app.session.active().unwrap().uid;
-        let revisions: Vec<u64> = app.session.documents().iter().map(|d| d.revision).collect();
-        let docs: Vec<_> = app.session.documents().iter().map(|d| d.doc.clone()).collect();
-        quit_frame(&mut app, &ctx, true);
-        app.ui.dialog.as_mut().unwrap().fields.insert("discard".into(), json!(true));
-        dialogs::confirm(&mut app).unwrap();
-        quit_frame(&mut app, &ctx, false);
-        assert_eq!(dialog_uid(&app), Some(uids[1]));
-        app.ui.dialog = None;
-        assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert_eq!(app.session.documents().iter().map(|d| d.uid).collect::<Vec<_>>(), uids);
-        assert_eq!(app.session.active().unwrap().uid, active);
-        assert_eq!(app.session.documents().iter().map(|d| d.revision).collect::<Vec<_>>(), revisions);
-        for (d, original) in app.session.documents().iter().zip(docs) {
-            assert!(std::sync::Arc::ptr_eq(&d.doc, &original));
-            assert!(d.is_dirty());
-            assert!(!d.history.undo.is_empty());
-        }
-    }
-
-    fn second_unsaved_document(app: &mut DesignApp) {
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [20, 20, 120, 120]})).unwrap();
-    }
-
-    fn discard_quit_dialog(app: &mut DesignApp) {
-        app.ui.dialog.as_mut().unwrap().fields.insert("discard".into(), json!(true));
-        dialogs::confirm(app).unwrap();
-    }
-
-    #[test]
-    fn native_quit_prompts_restore_window_visibility_without_focusing_completed_quits() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        let commands = quit_frame(&mut app, &ctx, true);
-        assert!(commands.contains(&egui::ViewportCommand::CancelClose));
-        for command in [egui::ViewportCommand::Visible(true), egui::ViewportCommand::Minimized(false), egui::ViewportCommand::Focus] {
-            assert!(commands.contains(&command), "unsaved prompt must restore the window: {commands:?}");
-        }
-        discard_quit_dialog(&mut app);
-        let approved = quit_frame(&mut app, &ctx, false);
-        assert!(approved.contains(&egui::ViewportCommand::Close));
-        let completed = quit_frame(&mut app, &ctx, true);
-        assert!(app.session.documents().is_empty());
-
-        let mut clean = DesignApp::new(designcraft_engine::Session::new(), Services::default());
-        clean.run("file.new", json!({})).unwrap();
-        let clean_close = quit_frame(&mut clean, &ctx, true);
-        let mut control = app_with_unsaved_document();
-        control.quit_without_asking = true;
-        let control_close = quit_frame(&mut control, &ctx, true);
-        for commands in [&approved, &completed, &clean_close, &control_close] {
-            assert!(
-                !commands.iter().any(|command| matches!(
-                    command,
-                    egui::ViewportCommand::Visible(true) | egui::ViewportCommand::Minimized(false) | egui::ViewportCommand::Focus
-                )),
-                "completed and immediate quits must not activate the window: {commands:?}"
-            );
-        }
-    }
-
-    /// Dock Quit may arrive again while the first request's dialogs are still open.
-    #[test]
-    fn repeated_native_quit_requests_preserve_partial_approvals_and_cancel() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        second_unsaved_document(&mut app);
-        let original_active = app.session.active().unwrap().uid;
-        let uids: Vec<_> = app.session.documents().iter().map(|d| d.uid).collect();
-        let docs: Vec<_> = app.session.documents().iter().map(|d| d.doc.clone()).collect();
-        let directory = tempfile::tempdir().unwrap();
-        app.session.recovery_dir = Some(directory.path().to_path_buf());
-        app.run("file.recovery.save", json!({})).unwrap();
-        assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
-        assert_eq!(dialog_uid(&app), Some(uids[0]));
-        discard_quit_dialog(&mut app);
-        quit_frame(&mut app, &ctx, false);
-        assert_eq!(dialog_uid(&app), Some(uids[1]));
-        for _ in 0..3 {
-            assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
-            assert_eq!(dialog_uid(&app), Some(uids[1]));
-        }
-        app.ui.dialog = None; // Cancel the second document, retaining the first Don't Save answer.
-        assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert_eq!(app.session.active().unwrap().uid, original_active);
-        assert_eq!(app.session.documents().iter().map(|d| d.uid).collect::<Vec<_>>(), uids);
-        for (document, original) in app.session.documents().iter().zip(docs) {
-            assert!(std::sync::Arc::ptr_eq(&document.doc, &original));
-            assert!(document.is_dirty());
-            assert!(!document.history.undo.is_empty());
-            assert!(directory.path().join(format!("{}.designcraft", document.uid)).exists());
-        }
-        // A fresh Dock Quit must ask about the first document again after cancellation.
-        assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
-        assert_eq!(dialog_uid(&app), Some(uids[0]));
-    }
-
-    #[test]
-    fn repeated_native_quit_requests_save_and_discard_only_after_all_answers() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        second_unsaved_document(&mut app);
-        let uids: Vec<_> = app.session.documents().iter().map(|d| d.uid).collect();
-        let directory = tempfile::tempdir().unwrap();
-        let path = directory.path().join("saved.designcraft");
-        let chosen = path.to_string_lossy().to_string();
-        app.services.pick_save = Some(Box::new(move |_| Some(chosen.clone())));
-        app.session.recovery_dir = Some(directory.path().join("recovery"));
-        app.run("file.recovery.save", json!({})).unwrap();
-        quit_frame(&mut app, &ctx, true);
-        assert_eq!(dialog_uid(&app), Some(uids[0]));
-        dialogs::confirm(&mut app).unwrap(); // Save the first document.
-        assert!(!app.session.documents()[0].is_dirty());
-        quit_frame(&mut app, &ctx, false);
-        assert_eq!(dialog_uid(&app), Some(uids[1]));
-        assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
-        assert_eq!(dialog_uid(&app), Some(uids[1]));
-        discard_quit_dialog(&mut app);
-        assert!(quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert_eq!(app.session.documents().len(), 2);
-        assert!(app.session.recovery_dir.as_ref().unwrap().join(format!("{}.designcraft", uids[1])).exists());
-        assert!(quit_frame(&mut app, &ctx, true).is_empty());
-        assert!(app.session.documents().is_empty());
-        assert!(path.exists());
-        assert_eq!(designcraft_engine::Session::new().execute("file.open", &json!({"path": path})).unwrap()["index"], 0);
-        assert_eq!(std::fs::read_dir(app.session.recovery_dir.as_ref().unwrap()).unwrap().count(), 0);
-    }
-
-    #[test]
-    fn quitting_first_cancel_restores_original_clean_active_document() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        app.run("file.new", json!({})).unwrap();
-        let original_active = app.session.active().unwrap().uid;
-        quit_frame(&mut app, &ctx, true);
-        assert_ne!(app.session.active().unwrap().uid, original_active);
-        app.ui.dialog = None;
-        assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert_eq!(app.session.active().unwrap().uid, original_active);
-        assert_eq!(app.session.documents().len(), 2);
-    }
-
-    #[test]
-    fn quitting_save_as_cancel_after_discard_keeps_all_documents() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        second_unsaved_document(&mut app);
-        let active = app.session.active().unwrap().uid;
-        quit_frame(&mut app, &ctx, true);
-        discard_quit_dialog(&mut app);
-        quit_frame(&mut app, &ctx, false);
-        dialogs::confirm(&mut app).unwrap(); // No picker: Save As was cancelled.
-        assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert_eq!(app.session.documents().len(), 2);
-        assert!(app.session.documents().iter().all(|d| d.is_dirty()));
-        assert_eq!(app.session.active().unwrap().uid, active);
-    }
-
-    #[test]
-    fn quitting_save_failure_after_discard_keeps_documents_and_can_retry() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        second_unsaved_document(&mut app);
-        let path = std::env::temp_dir()
-            .join(format!("designcraft-quit-missing-{}-{}", std::process::id(), app.session.active().unwrap().uid))
-            .join("missing")
-            .join("document.designcraft");
-        assert!(!path.parent().unwrap().exists());
-        let picked = path.to_string_lossy().to_string();
-        app.services.pick_save = Some(Box::new(move |_| Some(picked.clone())));
-        quit_frame(&mut app, &ctx, true);
-        discard_quit_dialog(&mut app);
-        quit_frame(&mut app, &ctx, false);
-        assert!(dialogs::confirm(&mut app).is_err());
-        assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert_eq!(app.session.documents().len(), 2);
-        assert!(app.session.documents().iter().all(|d| d.is_dirty()));
-        // Starting over must ask about the previously discarded first document again.
-        quit_frame(&mut app, &ctx, true);
-        assert_eq!(dialog_uid(&app), Some(app.session.documents()[0].uid));
-    }
-
-    #[test]
-    fn quitting_save_then_later_cancel_keeps_saved_document_open() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        second_unsaved_document(&mut app);
-        let first = app.session.documents()[0].uid;
-        let path = std::env::temp_dir().join(format!("designcraft-quit-save-{}-{first}.designcraft", std::process::id()));
-        let picked = path.to_string_lossy().to_string();
-        app.services.pick_save = Some(Box::new(move |_| Some(picked.clone())));
-        quit_frame(&mut app, &ctx, true);
-        dialogs::confirm(&mut app).unwrap();
-        quit_frame(&mut app, &ctx, false);
-        assert_eq!(app.session.documents().len(), 2);
-        assert!(!app.session.documents()[0].is_dirty());
-        assert!(path.exists());
-        app.ui.dialog = None;
-        assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert_eq!(app.session.documents()[0].uid, first);
-        assert!(app.session.documents()[1].is_dirty());
-        std::fs::remove_file(path).unwrap();
-    }
-
-    #[test]
-    fn quitting_rechecks_discard_approval_after_a_later_edit() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        second_unsaved_document(&mut app);
-        let first = app.session.documents()[0].uid;
-        quit_frame(&mut app, &ctx, true);
-        discard_quit_dialog(&mut app);
-        quit_frame(&mut app, &ctx, false);
-        app.run("file.activate", json!({"index": 0})).unwrap();
-        app.run("frame.create", json!({"rect": [200, 200, 300, 300]})).unwrap();
-        discard_quit_dialog(&mut app); // Approval is bound to the second UID, despite the switch.
-        assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert_eq!(dialog_uid(&app), Some(first), "new edit needs a fresh decision");
-        assert_eq!(app.session.documents().len(), 2);
-    }
-
-    #[test]
-    fn quitting_final_close_rechecks_new_unsaved_document() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        quit_frame(&mut app, &ctx, true);
-        discard_quit_dialog(&mut app);
-        assert!(quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        second_unsaved_document(&mut app); // Arrives after Close was queued, before its event.
-        let new_uid = app.session.active().unwrap().uid;
-        assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
-        assert_eq!(dialog_uid(&app), Some(new_uid));
-        assert_eq!(app.session.documents().len(), 2);
-    }
-
-    #[test]
-    fn quitting_pending_save_uses_dialog_uid_after_tab_switch() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        second_unsaved_document(&mut app);
-        let first = app.session.documents()[0].uid;
-        let path = std::env::temp_dir().join(format!("designcraft-quit-uid-{}-{first}.designcraft", std::process::id()));
-        let picked = path.to_string_lossy().to_string();
-        app.services.pick_save = Some(Box::new(move |_| Some(picked.clone())));
-        quit_frame(&mut app, &ctx, true);
-        app.run("file.activate", json!({"index": 1})).unwrap();
-        dialogs::confirm(&mut app).unwrap();
-        assert_eq!(app.session.documents()[0].path.as_deref(), path.to_str());
-        assert!(!app.session.documents()[0].is_dirty());
-        assert!(app.session.documents()[1].is_dirty());
-        quit_frame(&mut app, &ctx, false);
-        assert_eq!(dialog_uid(&app), Some(app.session.documents()[1].uid));
-        std::fs::remove_file(path).unwrap();
-    }
-
-    #[test]
-    fn quitting_discard_preserves_recovery_until_final_commit() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        let uid = app.session.active().unwrap().uid;
-        let dir = std::env::temp_dir().join(format!("designcraft-quit-recovery-{}-{uid}", std::process::id()));
-        app.session.recovery_dir = Some(dir.clone());
-        app.run("file.recovery.save", json!({})).unwrap();
-        let entry = dir.join(format!("{uid}.designcraft"));
-        quit_frame(&mut app, &ctx, true);
-        discard_quit_dialog(&mut app);
-        assert!(quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert!(entry.exists(), "a queued close is not a committed close");
-        assert!(quit_frame(&mut app, &ctx, true).is_empty());
-        assert!(!entry.exists(), "accepted Don't Save must not be recovered on restart");
-        assert!(app.session.documents().is_empty());
-        std::fs::remove_dir_all(dir).unwrap();
-    }
-
-    #[test]
-    fn quitting_native_exit_commits_completed_approvals_before_close_event() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        quit_frame(&mut app, &ctx, true);
-        discard_quit_dialog(&mut app);
-        assert!(quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert_eq!(app.session.documents().len(), 1);
-        app.finish_confirmed_quit().unwrap();
-        assert!(app.session.documents().is_empty());
-    }
-
-    #[test]
-    fn quitting_native_exit_retains_incomplete_stale_and_new_document_plans() {
-        for case in ["incomplete", "stale", "new document"] {
-            let ctx = egui::Context::default();
-            let mut app = app_with_unsaved_document();
-            if case == "incomplete" {
-                second_unsaved_document(&mut app);
-            }
-            quit_frame(&mut app, &ctx, true);
-            discard_quit_dialog(&mut app);
-            quit_frame(&mut app, &ctx, false);
-            if case == "stale" {
-                app.run("frame.create", json!({"rect": [200, 200, 300, 300]})).unwrap();
-            } else if case == "new document" {
-                second_unsaved_document(&mut app);
-            }
-            let active = app.session.active().unwrap().uid;
-            let before: Vec<_> = app
-                .session
-                .documents()
-                .iter()
-                .map(|d| (d.uid, d.revision, d.doc.clone(), d.selection.items.clone(), d.history.undo.len(), d.history.redo.len()))
-                .collect();
-            app.finish_confirmed_quit().unwrap();
-            assert_eq!(app.session.documents().len(), before.len(), "{case}");
-            assert_eq!(app.session.active().unwrap().uid, active, "{case}");
-            for (d, (uid, revision, doc, selection, undo, redo)) in app.session.documents().iter().zip(before) {
-                assert_eq!(
-                    (d.uid, d.revision, &d.selection.items, d.history.undo.len(), d.history.redo.len()),
-                    (uid, revision, &selection, undo, redo),
-                    "{case}"
-                );
-                assert!(std::sync::Arc::ptr_eq(&d.doc, &doc), "{case}");
-            }
-        }
-    }
-
-    #[test]
-    fn quitting_without_unsaved_changes_closes_at_once() {
-        let ctx = egui::Context::default();
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
-        app.run("file.new", json!({})).unwrap();
-        // Quit (⌘Q) closes the window like its close button.
-        app.run("app.quit", json!({})).unwrap();
-        assert!(quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
-        assert!(quit_frame(&mut app, &ctx, true).is_empty());
-        assert!(app.ui.dialog.is_none());
-    }
-
-    /// Scripts must not hang on a question: the control channel's quit never asks.
-    #[test]
-    fn control_channel_quit_does_not_ask() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_unsaved_document();
-        let (req, _rx) = control::ControlRequest::new("app.quit", json!({}));
-        let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
-            control::handle(&mut app, ui.ctx(), &req);
-        });
-        out.textures_delta.clear();
-        assert!(quit_frame(&mut app, &ctx, true).is_empty());
-        assert!(app.ui.dialog.is_none());
-    }
-
-    /// The Control panel's two-row groups were centred as if they were one row tall, so the second
-    /// row hung below the panel and was cut off.
-    #[test]
-    fn opening_missing_fonts_offers_repeated_replacement_and_keeps_errors_visible() {
-        let mut app = DesignApp::new(Session::new(), Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect":[0,0,200,200], "content":"text", "text":"Sample"})).unwrap();
-        let d = std::sync::Arc::make_mut(&mut app.session.doc_mut().unwrap().doc);
-        let sid = *d.stories.keys().next().unwrap();
-        d.story_mut(sid).unwrap().format_chars(0..6, |f| {
-            f.over.font_family = Some("Unavailable Test Family".into());
-            f.over.font_style = Some("Regular".into());
-        });
-        let path = std::env::temp_dir().join(format!("designcraft-font-open-{}.designcraft", std::process::id()));
-        app.run("file.save", json!({"path":path})).unwrap();
-        app.run("file.open", json!({"path":path})).unwrap();
-        let dialog = app.ui.dialog.as_mut().unwrap();
-        assert_eq!(dialog.id, "findFont");
-        assert_eq!(dialog.fields["onOpen"], true);
-        dialog.fields.insert("family".into(), json!("Unavailable Test Family"));
-        dialog.fields.insert("style".into(), json!("Regular"));
-        dialog.fields.insert("toFamily".into(), json!("Unavailable Target"));
-        dialog.fields.insert("toStyle".into(), json!("Regular"));
-        assert!(dialogs::confirm(&mut app).is_err());
-        assert!(app.ui.dialog.as_ref().unwrap().fields.contains_key("error"));
-        app.ui.dialog.as_mut().unwrap().fields.insert("toFamily".into(), json!("Source Sans 3"));
-        dialogs::confirm(&mut app).unwrap();
-        assert!(!app.ui.dialog.as_ref().unwrap().fields.contains_key("_fonts"));
-        assert!(app.run("font.list", json!({})).unwrap().as_array().unwrap().iter().all(|f| f["missing"] == false));
-        app.ui.dialog = None;
-        app.run("file.save", json!({"path":path})).unwrap();
-        app.run("file.open", json!({"path":path})).unwrap();
-        assert!(app.ui.dialog.is_none());
-        std::fs::remove_file(path).unwrap();
-    }
-
-    #[test]
-    fn snap_view_uses_the_saved_switches() {
-        let mut ui = UiState::default();
-        assert!(ui.snap_view().snap_to_guides);
-        assert!(!ui.snap_view().snap_to_document_grid);
-        assert_eq!(ui.snap_view().zone_px, 4.0);
-        ui.snap_to_guides = false;
-        ui.snap_zone = 0.0;
-        assert!(!ui.snap_view().snap_to_guides);
-        assert_eq!(ui.snap_view().zone_px, 0.0);
-    }
-
-    #[test]
-    fn pdf_export_settings_round_trip() {
-        let ui = UiState::default();
-        let json = serde_json::to_string(&ui).unwrap();
-        let parsed: UiState = serde_json::from_str(&json).unwrap();
-        assert_eq!(parsed.pdf_export, PdfExportSettings::default());
-    }
-
-    #[test]
-    fn pdf_export_settings_defaults() {
-        let settings = PdfExportSettings::default();
-        assert_eq!(settings.preset, "Desktop Printing");
-        assert_eq!(settings.standard, "none");
-        assert!(!settings.compress_images);
-        assert_eq!(settings.flatten, "");
-        assert!(!settings.spreads);
-        assert!(settings.bleed);
-        assert!(!settings.marks_crop);
-        assert!(!settings.marks_bleed);
-        assert!(!settings.marks_page_info);
-        assert_eq!(settings.marks_weight, "0.25");
-        assert_eq!(settings.marks_offset, "6");
-        assert!(settings.tagged);
-    }
-
-    #[test]
-    fn pdf_export_settings_survive_missing_key() {
-        let json = r#"{ "language": "en" }"#;
-        let ui: UiState = serde_json::from_str(json).unwrap();
-        assert_eq!(ui.pdf_export, PdfExportSettings::default());
-    }
-
-    /// A temporary file named `name` whose bytes aren't a document or a graphic.
-    fn unreadable_file(name: &str) -> std::path::PathBuf {
-        let path = std::env::temp_dir().join(format!("designcraft-ui-{}-{name}", std::process::id()));
-        std::fs::write(&path, b"neither a document nor a graphic").unwrap();
-        path
-    }
-
-    /// The open alert dialog: (title, message).
-    fn alert(app: &DesignApp) -> (String, String) {
-        let d = app.ui.dialog.as_ref().expect("an alert is open");
-        assert_eq!(d.id, "alert");
-        (d.fields["title"].as_str().unwrap().to_string(), d.fields["message"].as_str().unwrap().to_string())
-    }
-
-    #[test]
-    fn dropped_documents_open_and_the_rest_is_placed() {
-        for name in ["a.designcraft", "B.IDML", "c.indd", "D.INDT"] {
-            assert!(opens_as_document(name), "{name}");
-        }
-        for name in ["a.png", "b.pdf", "idml.txt", "c.idml.zip", "e.indd.zip"] {
-            assert!(!opens_as_document(name), "{name}");
-        }
-    }
-
-    /// Files without an extension: dropped, a document opens and anything else is placed; asked
-    /// for by the operating system, they wait for the window and then open as documents.
-    #[test]
-    fn extensionless_documents_open_by_content() {
-        let path = std::env::temp_dir().join(format!("designcraft-ui-{}-Brochure", std::process::id()));
-        let mut app = DesignApp::new(Session::new(), Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let bytes = designcraft_engine::cmd::base64_decode(app.run("file.serialize", json!({})).unwrap()["base64"].as_str().unwrap());
-        std::fs::write(&path, bytes).unwrap();
-        let p = path.to_string_lossy().to_string();
-        app.open_dropped(&p).unwrap();
-        assert_eq!(app.session.documents().len(), 2, "a document opens, it isn't placed");
-        app.open_documents_later([p.clone()]);
-        assert_eq!(app.session.documents().len(), 2, "queued until the window is ready");
-        app.open_os_documents();
-        assert_eq!(app.session.documents().len(), 3);
-        assert_eq!(app.session.active().and_then(|d| d.path.clone()), Some(p));
-        let _ = std::fs::remove_file(&path);
-        let notes = unreadable_file("notes");
-        let e = app.open_dropped(&notes.to_string_lossy()).unwrap_err();
-        let _ = std::fs::remove_file(&notes);
-        assert_eq!(alert(&app), ("Can't Place the File".to_string(), e));
-    }
-
-    #[test]
-    fn status_messages_follow_the_interface_language_but_engine_errors_stay_english() {
-        let mut app = DesignApp::new(Session::new(), Services::default());
-        app.status_error("Table", "No table selected");
-        assert_eq!(app.ui.status, "Table: No table selected");
-        app.ui.language = "cs".into();
-        app.status_error("Table", "No table selected");
-        assert_eq!(app.ui.status, format!("{}: No table selected", crate::i18n::tr("cs", "Table")));
-    }
-
-    #[test]
-    fn dropping_an_unreadable_file_alerts() {
-        // A document opens, so it says it can't be opened.
-        let path = unreadable_file("broken.designcraft");
-        let mut app = DesignApp::new(Session::new(), Services::default());
-        let r = app.open_dropped(&path.to_string_lossy());
-        let _ = std::fs::remove_file(&path);
-        let e = r.unwrap_err();
-        let (title, message) = alert(&app);
-        assert_eq!(title, "Can't Open the File", "a document opens, it isn't placed");
-        assert_eq!(message, e);
-        assert!(app.ui.status.contains(&e), "the status line says it too");
-        assert!(app.session.documents().is_empty());
-        dialogs::confirm(&mut app).unwrap();
-        assert!(app.ui.dialog.is_none(), "OK closes the alert");
-        // Anything else is placed, so it says it can't be placed.
-        app.run("file.new", json!({})).unwrap();
-        let path = unreadable_file("notes.xyz");
-        let r = app.open_dropped(&path.to_string_lossy());
-        let _ = std::fs::remove_file(&path);
-        let e = r.unwrap_err();
-        assert_eq!(alert(&app), ("Can't Place the File".to_string(), e));
-    }
-
-    #[test]
-    fn a_dropped_indd_file_the_converter_rejects_alerts() {
-        let path = unreadable_file("brochure.indd");
-        let mut app = DesignApp::new(Session::new(), Services::default());
-        let r = app.open_dropped(&path.to_string_lossy());
-        let _ = std::fs::remove_file(&path);
-        let e = r.unwrap_err();
-        assert!(e.contains("InDesign file"), "{e}");
-        assert_eq!(alert(&app), ("Can't Open the File".to_string(), e));
-        assert!(app.session.documents().is_empty());
-    }
-
-    #[test]
-    fn dropping_an_ase_file_loads_its_swatches() {
-        let mut source = Session::new();
-        source.execute("file.new", &json!({})).unwrap();
-        source.execute("swatch.create", &json!({"name": "Dropped Teal", "color": "#108080"})).unwrap();
-        let data = source.execute("swatch.save", &json!({"names": ["Dropped Teal"]})).unwrap();
-        let bytes = designcraft_engine::cmd::base64_decode(data["base64"].as_str().unwrap());
-        for name in ["palette.ase", "PALETTE.ASE"] {
-            let path = std::env::temp_dir().join(format!("designcraft-ui-{}-{name}", std::process::id()));
-            std::fs::write(&path, &bytes).unwrap();
-            let mut app = DesignApp::new(Session::new(), Services::default());
-            app.run("file.new", json!({})).unwrap();
-            let r = app.open_dropped(&path.to_string_lossy());
-            let _ = std::fs::remove_file(&path);
-            assert!(app.ui.dialog.is_none(), "{name}: {:?}", app.ui.dialog.as_ref().map(|d| &d.fields));
-            assert_eq!(r, Ok(json!({"added": 1, "replaced": 0})), "{name}");
-            let doc = &app.session.doc().unwrap().doc;
-            assert!(doc.swatches.iter().any(|s| s.name == "Dropped Teal"), "{name}");
-            assert!(doc.assets.is_empty(), "{name} isn't placed");
-        }
-    }
-
-    #[test]
-    fn a_file_dropped_while_a_parent_is_open_lands_on_the_parent() {
-        let mut app = DesignApp::new(Session::new(), Services::default());
-        app.run("file.new", json!({"pages": 3})).unwrap();
-        app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0)));
-        app.run("layout.parents.edit", json!({"on": true})).unwrap();
-        let _ = app.view_mut();
-        let path = std::env::temp_dir().join(format!("designcraft-ui-{}-drop.png", std::process::id()));
-        std::fs::write(&path, designcraft_render::Rendered { width: 10, height: 10, pixels: vec![200; 400] }.to_png()).unwrap();
-        let r = app.open_dropped(&path.to_string_lossy());
-        let _ = std::fs::remove_file(&path);
-        r.unwrap();
-        let d = &app.session.doc().unwrap().doc;
-        assert_eq!(d.parents[0].items.len(), 1, "the graphic is on the parent spread");
-        assert!(d.spreads.iter().all(|s| s.items.is_empty()), "no document page gets it");
-    }
-
-    #[test]
-    fn file_open_failures_show_an_alert() {
-        let path = unreadable_file("open.designcraft");
-        let picked = path.to_string_lossy().to_string();
-        let services = Services { pick_open: Some(Box::new(move |_| Some(picked.clone()))), ..Default::default() };
-        let mut app = DesignApp::new(Session::new(), services);
-        let e = app.run("app.openDialog", json!({})).unwrap_err();
-        assert_eq!(alert(&app), ("Can't Open the File".to_string(), e));
-        // Placing it says so too.
-        app.ui.dialog = None;
-        app.run("file.new", json!({})).unwrap();
-        let e = app.run("app.placeDialog", json!({})).unwrap_err();
-        let _ = std::fs::remove_file(&path);
-        assert_eq!(alert(&app), ("Can't Place the File".to_string(), e));
-    }
-
-    #[test]
-    fn other_command_errors_stay_in_the_status_line() {
-        let mut app = DesignApp::new(Session::new(), Services::default());
-        assert!(app.run("file.open", json!({"path": "/nonexistent/x.designcraft"})).is_err());
-        assert!(app.ui.dialog.is_none(), "a scripted file.open doesn't raise an alert");
-        assert!(!app.ui.status.is_empty());
-        // The control channel's app.open answers with the error; no alert waits for a click.
-        let (req, _rx) = control::ControlRequest::new("app.open", json!({"path": "/nonexistent/x.designcraft"}));
-        let control::Outcome::Done(r) = control::handle(&mut app, &egui::Context::default(), &req) else { panic!("app.open answers") };
-        assert_eq!(r["ok"], json!(false), "{r}");
-        assert!(app.ui.dialog.is_none(), "a control-channel app.open doesn't raise an alert");
-    }
-
-    /// Copied objects were pasted on the first spread whatever page was in view.
-    #[test]
-    fn paste_lands_on_the_spread_in_view() {
-        let mut app = DesignApp::new(Session::new(), Services::default());
-        app.run("file.new", json!({"pages": 3, "facingPages": false})).unwrap();
-        let id = app.run("frame.create", json!({"rect": [36, 36, 136, 136]})).unwrap()["id"].clone();
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        app.run("edit.copy", json!({})).unwrap();
-        let pasted_on = |app: &DesignApp| {
-            let st = app.session.active().unwrap();
-            st.doc.find(st.selection.items[0]).unwrap().spread
-        };
-        // Nothing is in view before the canvas is laid out: the first spread, as in a script.
-        app.run("edit.paste", json!({})).unwrap();
-        assert_eq!(pasted_on(&app), designcraft_doc::SpreadRef::Doc(0));
-        app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0)));
-        canvas::go_to_page(&mut app, 2);
-        menus::activate(&mut app, "edit.pasteInPlace", &Value::Null);
-        assert_eq!(pasted_on(&app), designcraft_doc::SpreadRef::Doc(2));
-        canvas::go_to_page(&mut app, 1);
-        app.run("edit.paste", json!({})).unwrap();
-        assert_eq!(pasted_on(&app), designcraft_doc::SpreadRef::Doc(1));
-        // A parent spread while parents are edited.
-        app.run("layout.parents.edit", json!({"on": true})).unwrap();
-        app.run("edit.paste", json!({})).unwrap();
-        assert_eq!(pasted_on(&app), designcraft_doc::SpreadRef::Parent(0));
-        // With an insertion point Paste still goes into the text, where the object is anchored.
-        let story = app.run("frame.create", json!({"rect": [36, 200, 300, 400], "content": "text", "text": "ab"})).unwrap()["story"].clone();
-        app.run("text.select", json!({"story": story, "anchor": 2})).unwrap();
-        assert_eq!(app.run("edit.paste", json!({})).unwrap()["anchored"], 1);
-    }
-}
-
-#[cfg(test)]
-mod import_warning_tests {
-    use super::*;
-    use std::io::Write;
-
-    fn idml(missing_parts: bool) -> Vec<u8> {
-        let missing = if missing_parts { r#"<idPkg:Spread src="Spreads/missing.xml"/><idPkg:Story src="Stories/missing.xml"/>"# } else { "" };
-        let map = format!(
-            r#"<Document xmlns:idPkg="http://ns.adobe.com/AdobeInDesign/idml/1.0/packaging" Self="d"><idPkg:Spread src="Spreads/one.xml"/>{missing}</Document>"#
-        );
-        let spread = r#"<idPkg:Spread xmlns:idPkg="http://ns.adobe.com/AdobeInDesign/idml/1.0/packaging"><Spread Self="s"><Page Self="p" GeometricBounds="0 0 100 100" ItemTransform="1 0 0 1 0 0"/><Rectangle Self="r" ItemTransform="1 0 0 1 0 0"/></Spread></idPkg:Spread>"#;
-        let mut zip = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
-        let options = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
-        for (name, text) in [("mimetype", designcraft_idml::MIMETYPE), ("designmap.xml", &map), ("Spreads/one.xml", spread)] {
-            zip.start_file(name, options).unwrap();
-            zip.write_all(text.as_bytes()).unwrap();
-        }
-        zip.finish().unwrap().into_inner()
-    }
-
-    fn app() -> DesignApp {
-        let mut app = DesignApp::new(Session::new(), Services { inbox: Some(Inbox::default()), ..Default::default() });
-        app.run("file.new", json!({"title": "Existing work"})).unwrap();
-        app.run("frame.create", json!({"rect": [10, 10, 50, 50]})).unwrap();
-        app
-    }
-
-    fn assert_partial_import_warning(app: &mut DesignApp, file: &str) {
-        let dialog = app.ui.dialog.as_ref().expect("partial import must show an alert");
-        assert_eq!(dialog.id, "alert");
-        assert_eq!(dialog.fields["title"], "Import Warnings");
-        assert_eq!(dialog.fields["file"], file);
-        for part in ["Spreads/missing.xml", "Stories/missing.xml"] {
-            assert!(dialog.fields["message"].as_str().unwrap().contains(part), "every missing part is named");
-            assert!(app.ui.status.contains(part), "the status line retains the warning");
-        }
-        assert_eq!(app.session.documents().len(), 2);
-        assert_eq!(app.session.documents()[0].doc.title, "Existing work");
-        assert!(app.session.documents()[0].is_dirty(), "existing unsaved work stays intact");
-        assert_eq!(app.session.documents()[0].doc.spreads[0].items.len(), 1);
-        assert_eq!(app.session.doc().unwrap().doc.spreads.len(), 1);
-        assert_eq!(app.session.doc().unwrap().doc.spreads[0].items.len(), 1, "available document content is kept");
-        dialogs::confirm(app).unwrap();
-        assert!(app.ui.dialog.is_none(), "OK dismisses the warning");
-        assert_eq!(app.session.documents().len(), 2, "dismissing the warning keeps the imported document");
-    }
-
-    #[test]
-    fn byte_open_reports_partial_import_warnings_without_losing_documents() {
-        let mut app = app();
-        let result =
-            app.open_file("file.openBytes", json!({"name": "partial.idml", "base64": designcraft_engine::cmd::base64_encode(&idml(true))})).unwrap();
-        assert_eq!(result["warnings"].as_array().unwrap().len(), 2);
-        assert_partial_import_warning(&mut app, "partial.idml");
-    }
-
-    #[test]
-    fn native_open_reports_partial_import_warnings_without_losing_documents() {
-        let path = std::env::temp_dir().join(format!("designcraft-partial-import-{}", std::process::id())).join("partial.idml");
-        std::fs::create_dir_all(path.parent().unwrap()).unwrap();
-        std::fs::write(&path, idml(true)).unwrap();
-        let picked = path.to_string_lossy().to_string();
-        let mut app = app();
-        app.services.pick_open = Some(Box::new(move |_| Some(picked.clone())));
-        let result = app.run("app.openDialog", json!({}));
-        std::fs::remove_file(&path).unwrap();
-        std::fs::remove_dir(path.parent().unwrap()).unwrap();
-        assert_eq!(result.unwrap()["warnings"].as_array().unwrap().len(), 2);
-        assert_partial_import_warning(&mut app, "partial.idml");
-    }
-
-    #[test]
-    fn inbox_open_reports_partial_import_warnings_without_losing_documents() {
-        let mut app = app();
-        let request = app.import_request("open");
-        app.services.inbox.as_ref().unwrap().lock().unwrap().push(ImportedFile { request, name: "partial.idml".into(), bytes: idml(true) });
-        app.drain_inbox();
-        assert_partial_import_warning(&mut app, "partial");
-    }
-
-    #[test]
-    fn find_font_on_open_outranks_the_warning_alert() {
-        let mut app = app();
-        app.run("frame.create", json!({"rect": [0, 0, 200, 200], "content": "text", "text": "Sample"})).unwrap();
-        let d = std::sync::Arc::make_mut(&mut app.session.doc_mut().unwrap().doc);
-        let sid = *d.stories.keys().next().unwrap();
-        let story = d.story_mut(sid).unwrap();
-        story.format_chars(0..6, |f| f.over.font_family = Some("Unavailable Test Family".into()));
-        story.paras[0].para.grep_styles = Some(vec![designcraft_doc::GrepStyle { style: "Keep".into(), pattern: "[a-".into() }]);
-        let path = std::env::temp_dir().join(format!("designcraft-font-warning-{}.designcraft", std::process::id()));
-        app.run("file.save", json!({"path": path})).unwrap();
-        let result = app.open_file("file.open", json!({"path": path}));
-        std::fs::remove_file(&path).unwrap();
-        assert_eq!(result.unwrap()["warnings"].as_array().unwrap().len(), 1);
-        assert_eq!(app.ui.dialog.as_ref().unwrap().id, "findFont");
-        assert!(app.ui.status.contains("GREP style not applied"), "{}", app.ui.status);
-    }
-
-    #[test]
-    fn complete_import_does_not_show_a_warning() {
-        let mut app = app();
-        let result = app
-            .open_file("file.openBytes", json!({"name": "complete.idml", "base64": designcraft_engine::cmd::base64_encode(&idml(false))}))
-            .unwrap();
-        assert_eq!(result["warnings"], json!([]));
-        assert!(app.ui.dialog.is_none());
-        assert!(app.ui.status.is_empty());
-        assert_eq!(app.session.documents().len(), 2);
-    }
-}
+mod tests;
 
 /// The whole window in a headless test harness, at a chosen window size.
 #[cfg(test)]
@@ -2881,13 +357,32 @@ pub(crate) mod test_window {
             delta,
             phase: egui::TouchPhase::Move,
             modifiers: egui::Modifiers::NONE,
+            source: egui::MouseWheelSource::Unknown,
         });
         h.run_steps(10);
     }
 
+    /// Ensure a Hebrew face is available for the interface's glyph assertions.
+    ///
+    /// Canonical craft-fonts builds bundle the face. Optional-input builds can pass
+    /// `DESIGNCRAFT_TEST_HEBREW_FONT=/abs/path/NotoSansHebrew.ttf` (the pinned OFL fixture)
+    /// and otherwise skip their Hebrew-only assertions explicitly.
+    pub fn install_test_hebrew_face() -> bool {
+        let db = designcraft_fonts::FontDb::global();
+        if db.has_family("Noto Sans Hebrew") {
+            return true;
+        }
+        let Ok(path) = std::env::var("DESIGNCRAFT_TEST_HEBREW_FONT") else { return false };
+        designcraft_engine::io::read(path).is_ok_and(|bytes| db.add_font(bytes) > 0)
+    }
+
     /// The outer rect of a side or top panel, from egui's memory.
+    ///
+    /// 0.37 keys a panel by its *parent Ui's* scope: `Ui::scope_id().with_salt(salt)`. In this
+    /// harness the app draws into a Ui the harness owns (a child of the viewport root Ui), so
+    /// `Harness::ui_id()` — not the viewport's root id — is the parent to salt.
     pub fn panel_rect(h: &Harness<'static, Window>, id: &str) -> egui::Rect {
-        egui::containers::panel::PanelState::load(&h.ctx, egui::Id::new(id)).map(|s| s.outer_rect).unwrap()
+        egui::containers::panel::PanelState::load(&h.ctx, h.ui_id().with(id)).map(|s| s.outer_rect).unwrap()
     }
 
     /// A primary click at `pos`, then a few frames.
@@ -2898,433 +393,3 @@ pub(crate) mod test_window {
         h.run_steps(4);
     }
 }
-
-#[cfg(test)]
-mod browser_import_tests {
-    use super::*;
-
-    fn app() -> DesignApp {
-        let mut app = DesignApp::new(Session::new(), Services { inbox: Some(Inbox::default()), ..Default::default() });
-        app.run("file.new", json!({"title": "A"})).unwrap();
-        app
-    }
-    fn deliver(app: &mut DesignApp, request: ImportRequest, name: &str, bytes: Vec<u8>) {
-        app.services.inbox.as_ref().unwrap().lock().unwrap().push(ImportedFile { request, name: name.into(), bytes });
-        app.drain_inbox();
-    }
-    fn image() -> Vec<u8> {
-        br##"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="10" height="10" fill="#ff0000"/></svg>"##.to_vec()
-    }
-    fn pdf_pages(count: usize) -> Vec<u8> {
-        let kids = (0..count).map(|i| format!("{} 0 R", 3 + i * 2)).collect::<Vec<_>>().join(" ");
-        let mut objects = vec!["<< /Type /Catalog /Pages 2 0 R >>".to_string(), format!("<< /Type /Pages /Kids [{kids}] /Count {count} >>")];
-        for (i, color) in ["1 0 0", "0 1 0", "0 0 1"].iter().take(count).enumerate() {
-            let content = format!("{color} rg 0 0 200 200 re f\n");
-            objects.push(format!("<< /Type /Page /Parent 2 0 R /MediaBox [0 0 200 200] /Resources << >> /Contents {} 0 R >>", 4 + i * 2));
-            objects.push(format!("<< /Length {} >>\nstream\n{content}endstream", content.len()));
-        }
-        let mut result = "%PDF-1.4\n".to_string();
-        let mut offsets = Vec::new();
-        for (i, object) in objects.iter().enumerate() {
-            offsets.push(result.len());
-            result.push_str(&format!("{} 0 obj\n{object}\nendobj\n", i + 1));
-        }
-        let xref = result.len();
-        result.push_str(&format!("xref\n0 {}\n0000000000 65535 f \n", offsets.len() + 1));
-        for offset in offsets {
-            result.push_str(&format!("{offset:010} 00000 n \n"));
-        }
-        result.push_str(&format!("trailer\n<< /Size {} /Root 1 0 R >>\nstartxref\n{xref}\n%%EOF\n", objects.len() + 1));
-        result.into_bytes()
-    }
-    pub(super) fn pdf() -> Vec<u8> {
-        pdf_pages(3)
-    }
-
-    #[test]
-    fn picker_receives_context_before_returning_and_cancel_does_not_edit() {
-        let captured = std::sync::Arc::new(std::sync::Mutex::new(None));
-        let copy = captured.clone();
-        let mut app = app();
-        app.services.open_async = Some(Box::new(move |request| *copy.lock().unwrap() = Some(request)));
-        let uid = app.session.doc().unwrap().uid;
-        app.pick_and_open("place").unwrap();
-        app.run("file.new", json!({"title": "B"})).unwrap();
-        let request = captured.lock().unwrap().take().unwrap();
-        assert_eq!(request.purpose, "place");
-        assert_eq!(request.target, Some(uid));
-        assert!(app.session.documents().iter().all(|d| d.doc.assets.is_empty()));
-        deliver(&mut app, request, "broken.pdf", b"not a PDF".to_vec());
-        assert!(app.session.documents().iter().all(|d| d.doc.assets.is_empty()));
-        assert!(app.pending_pdf.is_none());
-    }
-
-    #[test]
-    fn delayed_place_activates_original_document_and_undo_belongs_to_it() {
-        let mut app = app();
-        let request = app.import_request("place");
-        app.run("file.new", json!({"title": "B"})).unwrap();
-        deliver(&mut app, request, "red.svg", image());
-        assert_eq!(app.session.active_index(), Some(0));
-        assert_eq!(app.session.documents()[0].doc.assets.len(), 1);
-        assert!(app.session.documents()[1].doc.assets.is_empty());
-        app.run("edit.undo", json!({})).unwrap();
-        assert!(app.session.doc().unwrap().doc.assets.is_empty());
-        app.run("edit.redo", json!({})).unwrap();
-        assert_eq!(app.session.doc().unwrap().doc.assets.len(), 1);
-    }
-
-    #[test]
-    fn closed_target_is_not_replaced_by_a_reused_tab_index() {
-        let mut app = app();
-        let request = app.import_request("place");
-        app.run("file.close", json!({})).unwrap();
-        app.run("file.new", json!({"title": "replacement"})).unwrap();
-        deliver(&mut app, request, "red.svg", image());
-        assert!(app.session.doc().unwrap().doc.assets.is_empty());
-    }
-
-    #[test]
-    fn closing_earlier_tab_does_not_shift_import_target() {
-        let mut app = app();
-        app.run("file.new", json!({"title": "target"})).unwrap();
-        let request = app.import_request("place");
-        app.run("file.new", json!({"title": "other"})).unwrap();
-        app.run("file.close", json!({"index": 0})).unwrap();
-        deliver(&mut app, request, "red.svg", image());
-        assert_eq!(app.session.doc().unwrap().doc.title, "target");
-        assert_eq!(app.session.documents()[0].doc.assets.len(), 1);
-        assert!(app.session.documents()[1].doc.assets.is_empty());
-    }
-
-    #[test]
-    fn layout_place_and_open_preserve_explicit_intent() {
-        let mut source = Session::new();
-        source.execute("file.new", &json!({"title": "source"})).unwrap();
-        source.execute("frame.create", &json!({"rect": [10, 10, 50, 50], "content": "text", "text": "placed"})).unwrap();
-        let native = designcraft_engine::cmd::to_bytes(&source.doc().unwrap().doc).unwrap();
-        let idml = designcraft_idml::export_idml(&source.doc().unwrap().doc);
-        for (name, bytes) in [("source.designcraft", native), ("source.idml", idml)] {
-            let mut app = app();
-            let request = app.import_request("place");
-            deliver(&mut app, request, name, bytes.clone());
-            assert_eq!(app.session.documents().len(), 1);
-            assert_eq!(app.session.doc().unwrap().doc.title, "A");
-            assert!(app.session.doc().unwrap().doc.stories.values().any(|s| s.text == "placed"));
-            app.run("edit.undo", json!({})).unwrap();
-            assert!(app.session.doc().unwrap().doc.stories.is_empty());
-            app.run("edit.redo", json!({})).unwrap();
-            assert!(!app.session.doc().unwrap().doc.stories.is_empty());
-            let request = app.import_request("open");
-            deliver(&mut app, request, name, bytes);
-            assert_eq!(app.session.documents().len(), 2);
-        }
-    }
-
-    #[test]
-    fn pdf_options_keep_bytes_target_and_selected_page() {
-        let mut app = app();
-        let bytes = pdf();
-        let request = app.import_request("place");
-        deliver(&mut app, request, "three.pdf", bytes.clone());
-        assert!(app.session.doc().unwrap().doc.assets.is_empty());
-        assert_eq!(app.ui.dialog.as_ref().unwrap().id, "pdfImport");
-        app.run("file.new", json!({"title": "B"})).unwrap();
-        app.ui.dialog.as_mut().unwrap().fields.insert("page".into(), json!("2"));
-        dialogs::confirm(&mut app).unwrap();
-        assert_eq!(app.session.active_index(), Some(0));
-        let asset = app.session.doc().unwrap().doc.assets.values().next().unwrap();
-        assert_eq!(asset.page, 1);
-        assert_eq!(*asset.data, bytes);
-        assert!(app.pending_pdf.is_none());
-        assert!(app.session.documents()[1].doc.assets.is_empty());
-        app.run("place.drop", json!({"x": 36, "y": 36})).unwrap();
-        let exported = app.run("file.exportPdf", json!({})).unwrap();
-        let exported = designcraft_engine::cmd::base64_decode(exported["base64"].as_str().unwrap());
-        let pixels = designcraft_render::render_pdf_page(&exported, 0, 400).unwrap();
-        assert!(pixels.data().iter().filter(|p| p.g > 240 && p.r < 10 && p.b < 10).count() > 1000);
-        assert_eq!(pixels.data().iter().filter(|p| p.r > 240 && p.g < 10 && p.b < 10).count(), 0);
-    }
-
-    #[test]
-    fn pdf_options_refuse_a_page_range_instead_of_placing_page_one() {
-        for spec in ["4-5", "2,5", "2-3", "2.5", "-3", "0", "nan", "inf"] {
-            let mut app = app();
-            let request = app.import_request("place");
-            deliver(&mut app, request, "three.pdf", pdf());
-            app.ui.dialog.as_mut().unwrap().fields.insert("page".into(), json!(spec));
-            assert!(dialogs::confirm(&mut app).is_err(), "{spec}");
-            assert!(app.session.doc().unwrap().doc.assets.is_empty(), "{spec}");
-            assert_eq!(app.ui.dialog.as_ref().unwrap().id, "pdfImport", "{spec}");
-        }
-    }
-
-    #[test]
-    fn place_loads_the_cursor_unless_a_frame_can_take_the_graphic() {
-        let mut app = app();
-        let items = |app: &DesignApp| app.session.doc().unwrap().doc.spreads[0].items.len();
-        // Nothing selected: the graphic waits in the place cursor; Escape unloads it.
-        let request = app.import_request("place");
-        deliver(&mut app, request, "red.svg", image());
-        assert_eq!(app.session.tool_id(), "placeGun");
-        assert!(app.session.loaded.is_some());
-        assert_eq!(items(&app), 0);
-        let mods = designcraft_tools::Mods::default();
-        app.session.tool_key(designcraft_tools::ToolKey::Escape, mods, designcraft_engine::ViewInfo::at_zoom(1.0)).unwrap();
-        assert_eq!(app.session.tool_id(), "selection");
-        assert!(app.session.loaded.is_none());
-        // A click with the loaded cursor places the graphic at its natural size.
-        let request = app.import_request("place");
-        deliver(&mut app, request, "red.svg", image());
-        app.run("place.drop", json!({"x": 100, "y": 100})).unwrap();
-        let it = app.session.doc().unwrap().doc.spreads[0].items.last().unwrap();
-        assert_eq!(it.bounds(), designcraft_geom::Rect::new(100.0, 100.0, 107.5, 107.5), "10 CSS px = 7.5 pt");
-        // An empty graphic frame selected: the graphic fills it.
-        let f = app.run("frame.create", json!({"rect": [200, 200, 300, 300], "content": "graphic"})).unwrap()["id"].as_u64().unwrap();
-        app.run("selection.set", json!({"ids": [f]})).unwrap();
-        let request = app.import_request("place");
-        deliver(&mut app, request, "red.svg", image());
-        assert_eq!(app.session.tool_id(), "selection");
-        assert!(app.session.loaded.is_none());
-        assert_eq!(items(&app), 2);
-        let frame = app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(f)).unwrap();
-        assert!(matches!(frame.content, designcraft_doc::Content::Graphic(_)));
-    }
-
-    #[test]
-    fn pdf_options_reject_oversized_page_without_editing() {
-        let mut app = app();
-        for page in [0_u64, 4, 4_294_967_296, 4_294_967_297, u64::MAX] {
-            let request = app.import_request("place");
-            deliver(&mut app, request, "three.pdf", pdf());
-            app.ui.dialog.as_mut().unwrap().fields.insert("page".into(), json!(page.to_string()));
-            // The native dialog clamps zero to one; positive invalid pages must fail.
-            if page == 0 {
-                assert!(app.confirm_pdf_import(page, "crop".into()).is_err());
-            } else {
-                assert!(dialogs::confirm(&mut app).is_err());
-            }
-            app.ui.dialog = None;
-            assert!(app.session.doc().unwrap().doc.assets.is_empty());
-            assert!(app.pending_pdf.is_none());
-        }
-        let request = app.import_request("place");
-        deliver(&mut app, request, "three.pdf", pdf());
-        app.ui.dialog.as_mut().unwrap().fields.insert("page".into(), json!("2"));
-        dialogs::confirm(&mut app).unwrap();
-        assert_eq!(app.session.doc().unwrap().doc.assets.values().next().unwrap().page, 1);
-    }
-
-    #[test]
-    fn drop_routing_and_nonlayout_open_remain_compatible() {
-        let mut app = app();
-        let native = designcraft_engine::cmd::to_bytes(&app.session.doc().unwrap().doc).unwrap();
-        let request = app.import_request("drop");
-        deliver(&mut app, request, "document.designcraft", native);
-        assert_eq!(app.session.documents().len(), 2);
-        let request = app.import_request("drop");
-        app.run("file.activate", json!({"index": 0})).unwrap();
-        deliver(&mut app, request, "red.svg", image());
-        assert_eq!(app.session.active_index(), Some(1));
-        assert_eq!(app.session.doc().unwrap().doc.assets.len(), 1);
-        let request = app.import_request("open");
-        deliver(&mut app, request, "single.pdf", pdf_pages(1));
-        assert_eq!(app.session.documents().len(), 2);
-        assert!(app.pending_pdf.is_none());
-        assert!(app.ui.dialog.is_none());
-    }
-
-    #[test]
-    fn ase_swatches_keep_purpose_and_target() {
-        let mut source = Session::new();
-        source.execute("file.new", &json!({})).unwrap();
-        source.execute("swatch.create", &json!({"name": "Import Teal", "color": "#108080"})).unwrap();
-        let data = source.execute("swatch.save", &json!({"names": ["Import Teal"]})).unwrap();
-        let bytes = designcraft_engine::cmd::base64_decode(data["base64"].as_str().unwrap());
-        for (purpose, name) in [("swatches", "picker-file"), ("drop", "palette.ase")] {
-            let mut app = app();
-            let request = app.import_request(purpose);
-            app.run("file.new", json!({"title": "B"})).unwrap();
-            deliver(&mut app, request, name, bytes.clone());
-            assert_eq!(app.session.active_index(), Some(0));
-            assert!(app.session.documents()[0].doc.swatches.iter().any(|s| s.name == "Import Teal"));
-            assert!(!app.session.documents()[1].doc.swatches.iter().any(|s| s.name == "Import Teal"));
-        }
-    }
-
-    #[test]
-    fn native_pdf_dialog_keeps_path_and_uid_at_confirmation() {
-        let mut app = app();
-        let path = std::env::temp_dir().join(format!("designcraft-native-import-{}-{}.pdf", std::process::id(), app.session.doc().unwrap().uid));
-        std::fs::write(&path, pdf()).unwrap();
-        let pick_path = path.to_string_lossy().to_string();
-        app.services.pick_open = Some(Box::new(move |_| Some(pick_path.clone())));
-        app.services.read = Some(Box::new(|path| std::fs::read(path).map_err(|e| e.to_string())));
-        app.pick_and_open("place").unwrap();
-        assert_eq!(app.ui.dialog.as_ref().unwrap().id, "pdfImport");
-        app.run("file.new", json!({"title": "B"})).unwrap();
-        app.ui.dialog.as_mut().unwrap().fields.insert("page".into(), json!("2"));
-        dialogs::confirm(&mut app).unwrap();
-        assert_eq!(app.session.active_index(), Some(0));
-        assert_eq!(app.session.doc().unwrap().doc.assets.values().next().unwrap().page, 1);
-        assert!(app.session.documents()[1].doc.assets.is_empty());
-        std::fs::remove_file(path).unwrap();
-    }
-
-    #[test]
-    fn pending_pdf_cancel_close_supersession_and_second_delivery_release_bytes() {
-        let mut app = app();
-        let request = app.import_request("place");
-        deliver(&mut app, request.clone(), "first.pdf", pdf());
-        deliver(&mut app, request.clone(), "second.svg", image());
-        assert_eq!(app.pending_pdf.as_ref().unwrap().name, "first.pdf");
-        assert!(app.session.doc().unwrap().doc.assets.is_empty());
-        app.ui.dialog = None;
-        app.drain_inbox();
-        assert!(app.pending_pdf.is_none());
-        deliver(&mut app, request.clone(), "first.pdf", pdf());
-        app.ui.dialog = Some(dialogs::Dialog::new("newDocument", json!({})));
-        app.drain_inbox();
-        assert!(app.pending_pdf.is_none());
-        app.ui.dialog = None;
-        deliver(&mut app, request, "first.pdf", pdf());
-        app.run("file.close", json!({})).unwrap();
-        app.run("file.new", json!({})).unwrap();
-        assert!(dialogs::confirm(&mut app).is_err());
-        assert!(app.pending_pdf.is_none());
-        assert!(app.session.doc().unwrap().doc.assets.is_empty());
-    }
-}
-
-#[cfg(test)]
-mod load_styles_tests {
-    use super::*;
-
-    /// A client's document on disk: Head based on Body, and a Lead character style.
-    fn client_bytes() -> Vec<u8> {
-        let mut s = Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Body", "chars": {"size": 10}})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Head", "basedOn": "Body", "chars": {"size": 20}})).unwrap();
-        s.execute("style.character.create", &json!({"name": "Lead", "chars": {"size": 9}})).unwrap();
-        designcraft_engine::cmd::base64_decode(s.execute("file.serialize", &json!({})).unwrap()["base64"].as_str().unwrap())
-    }
-
-    /// An app with a document that has its own 8 pt Body, and a picker that answers with the client's file.
-    fn app_and_file(test: &str) -> (DesignApp, std::path::PathBuf) {
-        let path = std::env::temp_dir().join(format!("designcraft-load-styles-{}-{test}.designcraft", std::process::id()));
-        std::fs::write(&path, client_bytes()).unwrap();
-        let picked = path.to_string_lossy().to_string();
-        let services = Services { pick_open: Some(Box::new(move |purpose| (purpose == "styles").then(|| picked.clone()))), ..Default::default() };
-        let mut app = DesignApp::new(Session::new(), services);
-        app.run("file.new", json!({})).unwrap();
-        app.run("style.paragraph.create", json!({"name": "Body", "chars": {"size": 8}})).unwrap();
-        (app, path)
-    }
-
-    fn names(app: &DesignApp) -> (Vec<String>, Vec<String>) {
-        let st = &app.session.doc().unwrap().doc.styles;
-        (st.paragraph.iter().skip(2).map(|s| s.name.clone()).collect(), st.character.iter().skip(1).map(|s| s.name.clone()).collect())
-    }
-
-    #[test]
-    fn load_all_text_styles_asks_which_styles_of_the_picked_file_to_load() {
-        let (mut app, path) = app_and_file("all");
-        app.run("app.loadTextStyles", json!({})).unwrap();
-        let d = app.ui.dialog.as_mut().expect("the Load Styles dialog");
-        let row = |name: &str, conflict: bool| json!({"name": name, "conflict": conflict});
-        assert_eq!(d.id, "loadStyles");
-        assert_eq!(d.fields["paragraph"], json!([row("[Basic Paragraph]", false), row("Body", true), row("Head", false)]));
-        assert_eq!(d.fields["character"], json!([row("Lead", false)]));
-        // Lead is unchecked; the rest loads, and Body takes the file's definition.
-        d.fields["character"][0]["on"] = json!(false);
-        dialogs::confirm(&mut app).unwrap();
-        std::fs::remove_file(&path).unwrap();
-        assert!(app.ui.dialog.is_none());
-        assert_eq!(names(&app), (vec!["Body".to_string(), "Head".to_string()], vec![]));
-        assert_eq!(app.session.doc().unwrap().doc.styles.para("Body").unwrap().chars.size, Some(10.0));
-    }
-
-    #[test]
-    fn the_dialog_applies_the_chosen_conflict_rule() {
-        let (mut app, path) = app_and_file("rename");
-        app.run("app.loadParagraphStyles", json!({})).unwrap();
-        let d = app.ui.dialog.as_mut().unwrap();
-        assert_eq!(d.fields["character"], json!([]), "Load Paragraph Styles offers no character styles");
-        assert_eq!(d.fields["conflicts"], "redefine");
-        d.fields.insert("conflicts".into(), json!("autoRename"));
-        dialogs::confirm(&mut app).unwrap();
-        std::fs::remove_file(&path).unwrap();
-        assert_eq!(names(&app), (vec!["Body".to_string(), "Body 2".to_string(), "Head".to_string()], vec![]));
-        assert_eq!(app.session.doc().unwrap().doc.styles.para("Body").unwrap().chars.size, Some(8.0));
-    }
-
-    #[test]
-    fn load_character_styles_offers_only_character_styles() {
-        let (mut app, path) = app_and_file("character");
-        app.run("app.loadCharacterStyles", json!({})).unwrap();
-        assert_eq!(app.ui.dialog.as_ref().unwrap().fields["paragraph"], json!([]));
-        dialogs::confirm(&mut app).unwrap();
-        std::fs::remove_file(&path).unwrap();
-        assert_eq!(names(&app), (vec!["Body".to_string()], vec!["Lead".to_string()]));
-    }
-
-    /// A script can put anything into the dialog's rows: drawing and ticking them must not panic.
-    #[test]
-    fn the_dialog_draws_and_ticks_rows_that_are_no_style_rows() {
-        use egui_kittest::kittest::Queryable as _;
-        let mut h = test_window::open(DesignApp::new(Session::new(), Services::default()), egui::vec2(1200.0, 800.0));
-        h.state_mut().app.ui.dialog = Some(dialogs::Dialog::new(
-            "loadStyles",
-            json!({"path": "x", "conflicts": 3, "paragraph": [1, "Body", null, {"name": 7}, {"name": "Head", "conflict": true}], "character": "none"}),
-        ));
-        h.run_steps(3);
-        let button = h.get_by_label("Deselect All").rect().center();
-        test_window::click_at(&mut h, button);
-        let d = h.state().app.ui.dialog.as_ref().unwrap();
-        assert_eq!(d.fields["paragraph"][4]["on"], false);
-        assert_eq!(d.fields["paragraph"][0], 1, "what is no style row stays as it is");
-        assert!(dialogs::confirm(&mut h.state_mut().app).is_err(), "there is no file `x`");
-    }
-
-    #[test]
-    fn no_file_or_no_document_opens_no_dialog() {
-        let (mut app, path) = app_and_file("none");
-        std::fs::remove_file(&path).unwrap();
-        // The picked file can't be read.
-        assert!(app.run("app.loadTextStyles", json!({})).is_err());
-        assert!(app.ui.dialog.as_ref().is_none_or(|d| d.id != "loadStyles"));
-        // The picker is cancelled.
-        app.ui.dialog = None;
-        app.services.pick_open = Some(Box::new(|_| None));
-        app.run("app.loadTextStyles", json!({})).unwrap();
-        assert!(app.ui.dialog.is_none());
-        // No document: the picker isn't shown at all.
-        app.run("file.close", json!({})).unwrap();
-        app.services.pick_open = Some(Box::new(|_| panic!("asked for a file without a document")));
-        assert!(app.run("app.loadTextStyles", json!({})).is_err());
-    }
-
-    #[test]
-    fn styles_from_an_asynchronous_picker_load_into_the_document_that_asked() {
-        let asked = std::sync::Arc::new(std::sync::Mutex::new(Vec::new()));
-        let seen = asked.clone();
-        let services = Services {
-            inbox: Some(Inbox::default()),
-            open_async: Some(Box::new(move |request| seen.lock().unwrap().push(request))),
-            ..Default::default()
-        };
-        let mut app = DesignApp::new(Session::new(), services);
-        app.run("file.new", json!({"title": "A"})).unwrap();
-        app.run("app.loadCharacterStyles", json!({})).unwrap();
-        let request = asked.lock().unwrap().pop().expect("the picker was asked");
-        assert_eq!(request.purpose, "styles:character");
-        // Another document is in front when the file arrives.
-        app.run("file.new", json!({"title": "B"})).unwrap();
-        app.services.inbox.as_ref().unwrap().lock().unwrap().push(ImportedFile { request, name: "client.designcraft".into(), bytes: client_bytes() });
-        app.drain_inbox();
-        assert_eq!(app.session.active_index(), Some(0));
-        assert_eq!(names(&app), (vec![], vec!["Lead".to_string()]));
-        assert!(app.session.documents()[1].doc.styles.char_style("Lead").is_none());
-    }
-}
diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs
index 75053ef1b..ffcfa0988 100644
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@ -4,2232 +4,44 @@ use serde_json::{Value, json};
 
 use crate::{DesignApp, ScreenMode};
 
-/// Menu and Quick Apply entries that only CJK typesetting uses: hidden unless
-/// [`crate::cjk_features`]. The commands still run from scripts, the control channel and MCP.
-pub const CJK_ONLY: &[&str] = &["type.tateChuYoko", "app.rubyDialog", "type.kenten", "type.warichu"];
+mod bar;
+mod context;
+mod export;
+mod invoke;
+mod keys;
+mod quick_apply;
+mod run;
+mod state;
+mod tables;
+mod tree;
+mod ui_commands;
 
-/// Whether command `id` has a menu item or Quick Apply entry in the current interface (CJK-only
-/// ones need [`crate::cjk_features`]).
-pub fn shown(app: &DesignApp, id: &str) -> bool {
-    !CJK_ONLY.contains(&id) || crate::cjk_features(app)
-}
-
-/// UI commands: (id, label, shortcut, params).
-pub const UI_COMMANDS: &[(&str, &str, Option<&str>, &str)] = &[
-    ("app.newDocumentDialog", "New Document…", Some("Cmd+N"), "{}"),
-    ("app.openDialog", "Open…", Some("Cmd+O"), "{}"),
-    ("app.openRecent", "Open Recent File", None, "{index} — file.openRecent, with an alert when the file can't be opened"),
-    ("app.placeDialog", "Place…", Some("Cmd+D"), "{}"),
-    ("app.saveDialog", "Save As…", Some("Cmd+Shift+S"), "{}"),
-    ("app.save", "Save", Some("Cmd+S"), "{}"),
-    ("app.quit", "Quit DesignCraft", Some("Cmd+Q"), "{} — close the window; each document with unsaved changes asks first"),
-    ("app.saveCopyDialog", "Save a Copy…", Some("Cmd+Alt+S"), "{} — choose where to write a copy (the document stays as it is)"),
-    ("app.loadSwatches", "Load Swatches…", None, "{} — pick a swatch exchange (.ase) file"),
-    (
-        "app.loadParagraphStyles",
-        "Load Paragraph Styles…",
-        None,
-        "{} — pick a document (.designcraft or .idml) and choose which of its paragraph styles to load (style.load)",
-    ),
-    ("app.loadCharacterStyles", "Load Character Styles…", None, "{} — the same for its character styles"),
-    ("app.loadTextStyles", "Load All Text Styles…", None, "{} — the same for its paragraph and character styles"),
-    (
-        "effects.dialog",
-        "Effects…",
-        None,
-        "{page?: transparency|dropShadow|innerShadow|outerGlow|innerGlow|bevel|satin|feather|directionalFeather|gradientFeather} — the Effects dialog for the selected objects",
-    ),
-    ("app.packageDialog", "Package…", Some("Cmd+Alt+Shift+P"), "{} — choose the package folder to create (file.package)"),
-    ("app.saveSwatches", "Save Swatches for Exchange…", None, "{path?} — write the colour swatches as .ase"),
-    ("app.exportPng", "Export Page as PNG…", Some("Cmd+E"), "{}"),
-    ("app.exportIdml", "Export IDML…", None, "{path?} — InDesign Markup (IDML) package"),
-    ("app.exportEpub", "Export EPUB…", None, "{path?} — reflowable EPUB 3 (with the first page as its cover)"),
-    (
-        "app.exportInteractivePdf",
-        "Export PDF (Interactive)…",
-        None,
-        "{path?, fullScreen?, advanceSeconds?} — single pages fitted, bookmarks panel open, buttons, forms, transitions",
-    ),
-    ("app.exportFixedEpub", "Export EPUB (Fixed Layout)…", None, "{path?} — pre-paginated EPUB 3"),
-    ("app.exportHtml", "Export HTML…", None, "{path?} — one self-contained web page"),
-    ("app.exportPptx", "Export PowerPoint…", None, "{path?} — every page as a slide of editable shapes, pictures and text"),
-    ("app.exportXml", "Export XML…", None, "{path?} — the tagged content"),
-    ("app.printBooklet", "Print Booklet…", None, "{path?} — saddle-stitched printer spreads as PDF"),
-    ("app.qrCode", "Generate QR Code…", None, "{} — the QR Code dialog (object.qrCode does the work)"),
-    ("app.userDictionary", "User Dictionary…", None, "{} — hyphenation exceptions (hyphenation.* commands)"),
-    ("app.fittingOptions", "Frame Fitting Options…", None, "{} — the dialog for object.fittingOptions"),
-    ("app.menus", "Menus…", None, "{} — show or hide menu items"),
-    ("window.hideMenuItem", "Hide Menu Item", None, "{item: \"Menu/Label\", hidden?: bool}"),
-    ("edit.dynamicSpelling", "Dynamic Spelling", None, "{on?: bool} — underline misspelled words on the canvas"),
-    (
-        "app.language",
-        "Interface Language",
-        None,
-        "{lang?: \"\"|de|fr|es|ja|zh|ar|pt-br|it|uk|ru|cs|pl|ka} — menus and panel names (the macOS menu bar follows at once); without lang, opens Preferences, where it is the first setting",
-    ),
-    (
-        "app.flattener",
-        "Transparency Flattener Presets",
-        None,
-        "{preset: \"\"|high|medium|low} — PDF export rasterises spreads with transparency at 300 / 150 / 72 ppi",
-    ),
-    ("app.graphicCell", "Convert Cell to Graphic Cell…", None, "{} — pick an image for the target table cell"),
-    ("app.placeAndLink", "Place and Link", None, "{} — a linked copy of the selected frame's story, beside it"),
-    ("app.placeWithOptions", "Place with Import Options…", Some("Cmd+Shift+D"), "{} — Word/RTF style mapping before placing"),
-    ("app.exportText", "Export Text…", None, "{path?} — the story being edited, as Text Only (.txt) or Rich Text Format (.rtf)"),
-    ("app.exportPdf", "Export PDF…", None, "{path?, …file.exportPdf options} — asks for a path when none is given"),
-    ("app.palette", "Quick Apply…", Some("Cmd+Return"), "{} — search styles and commands"),
-    ("app.preferences", "Preferences…", Some("Cmd+K"), "{}"),
-    ("window.uiScale", "UI Scaling", None, "{scale: 0.5–3 (1 = 100%)} — the size of the whole interface"),
-    ("app.keyboardShortcuts", "Keyboard Shortcuts…", None, "{} — view and change the shortcut of any command"),
-    ("window.richBlack", "Appearance of Black", None, "{on: bool} — show 100% black as rich black on screen (off: accurately)"),
-    ("window.setShortcut", "Set Shortcut", None, "{id, shortcut: \"Cmd+Alt+J\" | \"\" (none) | null (default)} → {shortcut, conflicts: [ids]}"),
-    ("window.resetShortcuts", "Reset Shortcuts", None, "{} — every command back to its default shortcut"),
-    (
-        "window.importShortcuts",
-        "Import InDesign Shortcut Set",
-        None,
-        "{path | text} — a set saved by InDesign's Show Set (.txt): matched commands take its Default shortcuts (or none), other commands lose keys it takes → {set, imported, changed, conflictsCleared, skipped (an earlier item whose keys a later one took), unmatched, unmatchedWithoutShortcut, unreadable}",
-    ),
-    ("app.findChange", "Find/Change…", Some("Cmd+F"), "{}"),
-    ("app.insertTableDialog", "Create Table…", None, "{} — Insert Table dialog (body/header/footer rows, columns)"),
-    (
-        "app.cellOptionsDialog",
-        "Strokes and Fills…",
-        None,
-        "{} — Cell Options › Strokes and Fills of the target cells: edge proxy, stroke weight, type, colour, tint, gap colour, gap tint, and cell fill (table.setCell)",
-    ),
-    ("app.footnoteOptionsDialog", "Document Footnote Options…", None, "{} — numbering, formatting and layout of footnotes"),
-    ("app.rubyDialog", "Ruby…", None, "{} — the reading set over the selected text"),
-    (
-        "app.paragraphRulesDialog",
-        "Paragraph Rules…",
-        None,
-        "{rule?: ruleAbove|ruleBelow} — Rule Above / Rule Below of the selected paragraphs (type.para)",
-    ),
-    (
-        "app.paragraphBordersDialog",
-        "Paragraph Borders and Shading…",
-        None,
-        "{tab?: border|shading} — border and shading of the selected paragraphs (type.para)",
-    ),
-    ("app.spanColumnsDialog", "Span Columns…", None, "{} — span or split columns of the selected paragraphs (type.para)"),
-    ("app.keepOptionsDialog", "Keep Options…", None, "{} — Keep with Next and Keep Lines Together of the selected paragraphs (type.para)"),
-    (
-        "app.nestedStylesDialog",
-        "Drop Caps and Nested Styles…",
-        None,
-        "{} — drop cap, nested styles and nested line styles of the selected paragraphs (type.para)",
-    ),
-    ("app.grepStylesDialog", "GREP Styles…", None, "{} — GREP styles of the selected paragraphs (type.para)"),
-    ("app.bulletsNumberingDialog", "Bullets and Numbering…", None, "{} — bullets or numbers of the selected paragraphs (type.para)"),
-    (
-        "app.hyphenationDialog",
-        "Hyphenation…",
-        None,
-        "{} — Hyphenation Settings of the selected paragraphs (type.para): limits, zone, Better Spacing ↔ Fewer Hyphens, Preview",
-    ),
-    (
-        "app.justificationDialog",
-        "Justification…",
-        Some("Cmd+Alt+Shift+J"),
-        "{} — word and letter spacing, glyph scaling and composer of the selected paragraphs (type.para)",
-    ),
-    ("app.findFontDialog", "Find/Replace Font…", None, "{} — fonts used (missing ones flagged) and replacing them"),
-    ("app.insertXrefDialog", "Insert Cross-Reference…", None, "{} — New Cross-Reference dialog (paragraph or text anchor, format)"),
-    ("app.deleteAllGuides", "Delete All Guides on Spread", None, "{} — the spread in view"),
-    ("app.deletePage", "Delete Page", None, "{} — deletes the page in view"),
-    ("app.duplicateSpread", "Duplicate Spread", None, "{} — duplicates the spread in view (pages and items)"),
-    ("app.tablePanel", "Table Panel", Some("Shift+F9"), "{}"),
-    ("app.tabsPanel", "Tabs", Some("Cmd+Shift+T"), "{} — show or hide the Tabs panel (it opens above the selected text frame)"),
-    ("app.characterPanel", "Character", Some("Cmd+T"), "{} — the Character panel"),
-    ("app.paragraphPanel", "Paragraph", Some("Cmd+Alt+T"), "{} — the Paragraph panel"),
-    ("app.glyphsPanel", "Glyphs", Some("Alt+Shift+F11"), "{} — the Glyphs panel"),
-    ("app.characterStylesPanel", "Character Styles", Some("Cmd+Shift+F11"), "{} — the Character Styles panel"),
-    ("app.paragraphStylesPanel", "Paragraph Styles", Some("Cmd+F11"), "{} — the Paragraph Styles panel"),
-    ("app.insertCurrentPageNumber", "Current Page Number", Some("Cmd+Alt+Shift+N"), "{} — the Current Page Number marker at the insertion point"),
-    ("app.storyEditor", "Edit in Story Editor", Some("Cmd+Y"), "{story?}"),
-    ("view.zoomIn", "Zoom In", Some("Cmd+="), "{}"),
-    ("view.zoomOut", "Zoom Out", Some("Cmd+-"), "{}"),
-    ("view.fitPage", "Fit Page in Window", Some("Cmd+0"), "{}"),
-    ("view.fitSelection", "Fit Selection in Window", Some("Cmd+Alt+="), "{}"),
-    ("view.fitSpread", "Fit Spread in Window", Some("Cmd+Alt+0"), "{}"),
-    ("view.actualSize", "Actual Size", Some("Cmd+1"), "{}"),
-    ("view.entirePasteboard", "Entire Pasteboard", Some("Cmd+Alt+Shift+0"), "{}"),
-    ("view.zoom", "Zoom To", None, "{zoom: 1.0 = 100%}"),
-    ("view.screenMode", "Screen Mode", None, "{mode: normal|preview|bleed|slug|presentation}"),
-    ("view.togglePreview", "Toggle Normal/Preview", Some("W"), "{}"),
-    (
-        "view.togglePresentation",
-        "Toggle Presentation",
-        Some("Shift+W"),
-        "{} — enters Presentation, or returns to the mode it was entered from; Esc also leaves it",
-    ),
-    (
-        "app.formattingAffectsText",
-        "Formatting Affects Text",
-        Some("J"),
-        "{on?: bool} — with text frames selected, colours go to their text (on) or the frames (off); toggles without `on`",
-    ),
-    (
-        "color.defaultFillStroke",
-        "Default Fill and Stroke",
-        Some("D"),
-        "{} — the selection gets no fill and a black stroke (object.defaultFillStroke); text colour edits (Formatting Affects Text) get a black fill and no stroke",
-    ),
-    (
-        "color.swapFillStroke",
-        "Swap Fill and Stroke",
-        Some("Shift+X"),
-        "{} — each selected object's fill and stroke colours (and tints) trade places (object.swapFillStroke), or the text's with Formatting Affects Text",
-    ),
-    ("color.toggleFillStroke", "Toggle Fill and Stroke", Some("X"), "{} → {strokeFront} — which of fill and stroke the proxy has in front"),
-    (
-        "color.applyNone",
-        "Apply None",
-        Some("/"),
-        "{} — [None] for the fill or stroke in front of the proxy, of the objects or the text (Formatting Affects Text)",
-    ),
-    ("color.applyColor", "Apply Color", Some(","), "{} — the colour applied last ([Black] at first) to the fill or stroke in front of the proxy"),
-    (
-        "color.applyGradient",
-        "Apply Gradient",
-        Some("."),
-        "{} — the gradient applied last (else the document's first, else white to black) to the fill or stroke in front of the proxy",
-    ),
-    ("view.frameEdges", "Show/Hide Frame Edges", Some("Cmd+H"), "{}"),
-    ("view.rulers", "Show/Hide Rulers", Some("Cmd+R"), "{}"),
-    ("view.guides", "Show/Hide Guides", Some("Cmd+;"), "{}"),
-    ("view.lockGuides", "Lock Guides", Some("Cmd+Alt+;"), "{on?: bool} — ruler guides can't be dragged; toggles without `on`"),
-    ("view.snapToGuides", "Snap to Guides", Some("Cmd+Shift+;"), "{}"),
-    ("view.snapToDocumentGrid", "Snap to Document Grid", None, "{}"),
-    ("view.smartGuides", "Smart Guides", None, "{}"),
-    (
-        "view.snapPreferences",
-        "Smart Guide Options",
-        None,
-        "{alignEdges?, alignCenters?, smartDimensions?, smartSpacing?: bool, zone?: px} — what smart guides snap to and how close; returns the current values",
-    ),
-    ("view.baselineGrid", "Show/Hide Baseline Grid", Some("Cmd+Alt+'"), "{}"),
-    ("view.documentGrid", "Show/Hide Document Grid", Some("Cmd+'"), "{}"),
-    ("view.textThreads", "Show/Hide Text Threads", Some("Cmd+Alt+Y"), "{}"),
-    ("view.hiddenCharacters", "Show Hidden Characters", Some("Cmd+Alt+I"), "{}"),
-    ("view.taggedFrames", "Show/Hide Tagged Frames", None, "{} — XML-tagged frames outlined in their tag colour"),
-    ("window.hidePanels", "Show/Hide Panels", Some("Tab"), "{} — every panel, the Tools panel included"),
-    ("window.hidePanelsExceptTools", "Show/Hide Panels Except Tools", Some("Shift+Tab"), "{}"),
-    ("window.nextDocument", "Next Document", Some("Cmd+F6"), "{}"),
-    ("window.previousDocument", "Previous Document", Some("Cmd+Shift+F6"), "{}"),
-    ("app.layerOptions", "Object Layer Options…", None, "{} — show or hide the layers of the selected placed PDF"),
-    (
-        "app.layerOptionsDialog",
-        "Layer Options…",
-        None,
-        "{id?} (default: the active layer) — name, colour, show, lock, print, guides, text wrap (layer.set)",
-    ),
-    ("app.swatchOptionsDialog", "Swatch Options…", None, "{name} — name, colour type, mode and values, tint (swatch.options)"),
-    ("app.colorGroupOptionsDialog", "Color Group Options…", None, "{name} — rename a colour group (swatch.renameColorGroup)"),
-    ("view.tagMarkers", "Show Tag Markers", None, "{on?: bool} — brackets around inline-tagged text"),
-    ("view.flattenerPreview", "Flattener Preview", None, "{on?: bool} — highlight objects that involve transparency"),
-    ("view.rotateSpread", "Rotate Spread", None, "{angle: 90 (clockwise) | -90 | 180 | 0 (clear)} — turn the view in quarter turns"),
-    ("view.proofColors", "Proof Colors", None, "{on?: bool} — simulate the proof target on screen"),
-    (
-        "view.proofSetup",
-        "Proof Setup",
-        None,
-        "{target?: workingCmyk|srgb|legacyMacRgb|monitorRgb|protanopia|deuteranopia|cmyk:<profile>, intent?, simulatePaper?: bool|\"toggle\"}",
-    ),
-    ("app.colorSettings", "Color Settings…", None, "{} — the working spaces, intent and black-point compensation"),
-    ("view.separations", "Separations Preview", None, "{plate?: cyan|magenta|yellow|black|null, inkLimit?: percent|null}"),
-    ("view.overprintPreview", "Overprint Preview", Some("Cmd+Alt+Shift+Y"), "{} — show how overprinting inks mix"),
-    ("view.fastDisplay", "Fast Display", Some("Cmd+Alt+Shift+Z"), "{} — placed graphics as grey boxes, no effects"),
-    ("view.typicalDisplay", "Typical Display", Some("Cmd+Alt+Z"), "{} — low-resolution image proxies"),
-    ("view.highQualityDisplay", "High Quality Display", Some("Cmd+Alt+H"), "{} — full-resolution images"),
-    ("view.firstPage", "First Page", Some("Cmd+Shift+PageUp"), "{} — scroll to the document's first page (zoom kept)"),
-    ("view.previousPage", "Previous Page", Some("Shift+PageUp"), "{} — scroll to the page before the one in view"),
-    ("view.nextPage", "Next Page", Some("Shift+PageDown"), "{} — scroll to the page after the one in view"),
-    ("view.lastPage", "Last Page", Some("Cmd+Shift+PageDown"), "{} — scroll to the document's last page"),
-    ("view.nextSpread", "Next Spread", Some("Alt+PageDown"), "{} — centre the spread after the one in view"),
-    ("view.previousSpread", "Previous Spread", Some("Alt+PageUp"), "{} — centre the spread before the one in view"),
-    ("view.goToPage", "Go to Page…", Some("Cmd+J"), "{page: number (position) | \"name\" (section page name, or \"+n\" for a position)}"),
-    (
-        "window.panel",
-        "Show Panel",
-        None,
-        "{panel: properties|pages|layers|swatches|paragraphStyles|characterStyles|stroke|character|paragraph|textWrap|links|table|preflight}",
-    ),
-    ("window.floatPanel", "Float Panel", None, "{panel, x?, y?} — the panel in its own movable window"),
-    (
-        "window.panel.layout",
-        "Change Panel Layout",
-        None,
-        "{action} — serialized docking action, including floating geometry, divider sizes and accordion state",
-    ),
-    (
-        "window.panel.move",
-        "Move Panel",
-        None,
-        "{panel, anchor, zone?: tab|center|left|right|top|bottom, before?: panel} — group, split or reorder a panel",
-    ),
-    ("window.panel.float", "Float Panel", None, "{panel, x?, y?, width?, height?} — detach a panel inside the application window"),
-    ("window.panel.dock", "Dock Panel", None, "{panel, anchor?, zone?, before?} — return a floating panel to a dock group"),
-    ("window.panel.activate", "Activate Panel", None, "{panel} — show and select a panel in its current group"),
-    ("window.panel.close", "Close Panel", None, "{panel} — hide a panel"),
-    ("window.panel.closeGroup", "Close Tab Group", None, "{panel} — hide the panel and the panels tabbed with it"),
-    ("window.collapseToIcons", "Collapse to Icons", None, "{} — the panel dock shrinks to its column of icons"),
-    ("window.dockPanel", "Dock Panel", None, "{panel} — back into the dock's icon column"),
-    ("window.controlBar", "Control", Some("Cmd+Alt+6"), "{}"),
-    // Object › Fitting with InDesign's shortcuts (one `object.fit` mode each).
-    ("fit.fillFrameProportionally", "Fill Frame Proportionally", Some("Cmd+Alt+Shift+C"), "{} — object.fit {mode: fillProportionally}"),
-    ("fit.contentProportionally", "Fit Content Proportionally", Some("Cmd+Alt+Shift+E"), "{} — object.fit {mode: fitProportionally}"),
-    ("fit.frameToContent", "Fit Frame to Content", Some("Cmd+Alt+C"), "{} — object.fit {mode: fitFrameToContent}"),
-    ("fit.contentToFrame", "Fit Content to Frame", Some("Cmd+Alt+E"), "{} — object.fit {mode: fitContentToFrame}"),
-    ("fit.centerContent", "Center Content", Some("Cmd+Shift+E"), "{} — object.fit {mode: centerContent}"),
-    ("window.split", "Split Window", None, "{on?: bool} — two views of the document side by side, each with its own zoom and scroll"),
-    ("window.newWindow", "New Window", None, "{on?: bool} — another view of the active document in its own window"),
-    ("window.minimize", "Minimize Window", None, "{} — minimize the desktop window"),
-    ("window.maximize", "Maximize/Restore Window", None, "{on?: bool} — toggle maximization when omitted"),
-    ("window.close", "Close Window", None, "{} — request that the desktop window close"),
-    ("window.drag", "Move Window", None, "{} — begin a native window drag while the primary mouse button is held"),
-    ("window.resize", "Resize Window", None, "{edge: north|south|east|west|northEast|southEast|northWest|southWest} — begin a native edge drag"),
-    ("window.taskBar", "Contextual Task Bar", None, "{}"),
-    (
-        "window.taskBarPin",
-        "Pin Bar Position",
-        None,
-        "{on?: bool, at?: [x, y] (points from the canvas's top-left)} — the Contextual Task Bar stays where it is (or at `at`) instead of following the selection; with neither, toggles",
-    ),
-    ("window.taskBarReset", "Reset Bar Position", None, "{} — the Contextual Task Bar follows the selection again, under it"),
-    ("help.discord", "Join the ArtCraft Discord…", None, "{} — opens https://discord.gg/artcraft in the browser"),
-    ("help.appPage", "DesignCraft Website…", None, "{} — opens https://getartcraft.com/apps/designcraft"),
-    ("help.github", "DesignCraft on GitHub…", None, "{} — opens https://github.com/storytold/designcraft"),
-    ("help.issues", "Report an Issue…", None, "{} — opens the GitHub issue tracker"),
-    ("help.website", "ArtCraft Website…", None, "{} — opens https://getartcraft.com"),
-    ("help.app", "ArtCraft App Page…", None, "{app} — opens https://getartcraft.com/apps/{app} (e.g. photocraft)"),
-    (
-        "help.about",
-        "About DesignCraft",
-        None,
-        "{open?: true, tab?: \"about\"|\"contributors\"|\"models\"} — the About window: splash with community links, contributor and model credits (open: false closes it)",
-    ),
-    ("window.toolsDoubleColumn", "Tools: Double Column", None, "{}"),
-    (
-        "window.workspace",
-        "Workspace",
-        None,
-        "{name: Advanced|Book|Digital Publishing|Essentials|Essentials Classic|Interactive for PDF|Printing and Proofing|Typography or a saved workspace}",
-    ),
-    (
-        "window.newWorkspace",
-        "New Workspace…",
-        None,
-        "{name, panelLocations?: bool (default true: the bars and panels), menuCustomization?: bool (default true: the menu items hidden with Edit › Menus)} — saves the workspace",
-    ),
-    ("window.deleteWorkspace", "Delete Workspace…", None, "{name}"),
-    ("window.resetWorkspace", "Reset Workspace", None, "{} — back to the current workspace as saved (or its defaults)"),
-    ("window.brightness", "Interface Color Theme", None, "{brightness: dark|mediumDark|mediumLight|light|highContrast}"),
-];
-
-/// Menu bar: (menu, entries). Entries: `cmd:<id>`, `ui:<id>`, `-` separator, `>Submenu` … `<`.
-pub const MENUS: &[(&str, &[&str])] = &[
-    (
-        "File",
-        &[
-            "ui:app.newDocumentDialog",
-            "ui:app.openDialog",
-            ">Open Recent",
-            "cmd:file.clearRecent",
-            "<",
-            "-",
-            "cmd:file.close",
-            "ui:app.save",
-            "ui:app.saveDialog",
-            "ui:app.saveCopyDialog",
-            "cmd:file.revert",
-            "-",
-            "ui:app.placeDialog",
-            "ui:app.placeWithOptions",
-            "-",
-            "ui:app.exportPdf",
-            "ui:app.packageDialog",
-            "ui:app.printBooklet",
-            "ui:app.exportPng",
-            "ui:app.exportIdml",
-            "ui:app.exportEpub",
-            "ui:app.exportFixedEpub",
-            "ui:app.exportInteractivePdf",
-            "ui:app.exportHtml",
-            "ui:app.exportPptx",
-            "ui:app.exportXml",
-            "ui:app.exportText",
-            ">Export",
-            "cmd:snippet.export",
-            "<",
-            "-",
-            "cmd:layout.documentSetup",
-        ],
-    ),
-    (
-        "Edit",
-        &[
-            "cmd:edit.undo",
-            "cmd:edit.redo",
-            "-",
-            "cmd:edit.cut",
-            "cmd:edit.copy",
-            "cmd:edit.paste",
-            "cmd:edit.pasteWithoutFormatting",
-            "cmd:edit.pasteInto",
-            "cmd:edit.pasteInPlace",
-            "cmd:edit.clear",
-            "-",
-            "cmd:edit.duplicate",
-            "ui:app.placeAndLink",
-            "cmd:edit.stepAndRepeat",
-            "-",
-            "cmd:edit.selectAll",
-            "cmd:guide.selectAll",
-            "cmd:edit.deselectAll",
-            "-",
-            "ui:app.findChange",
-            "cmd:find.next",
-            "ui:app.storyEditor",
-            "-",
-            ">Spelling",
-            "cmd:spelling.check",
-            "ui:edit.dynamicSpelling",
-            "cmd:spelling.addWord",
-            "ui:app.userDictionary",
-            "<",
-            ">Transparency Blend Space",
-            "cmd:edit.transparencyBlendSpace|Document RGB|{\"space\": \"rgb\"}",
-            "cmd:edit.transparencyBlendSpace|Document CMYK|{\"space\": \"cmyk\"}",
-            "<",
-            "ui:app.colorSettings",
-            ">Transparency Flattener Presets",
-            "ui:app.flattener|None (keep transparency)|{\"preset\": \"\"}",
-            "ui:app.flattener|High Resolution|{\"preset\": \"high\"}",
-            "ui:app.flattener|Medium Resolution|{\"preset\": \"medium\"}",
-            "ui:app.flattener|Low Resolution|{\"preset\": \"low\"}",
-            "<",
-            "-",
-            "ui:app.palette",
-            "ui:app.keyboardShortcuts",
-            "ui:app.menus",
-            "ui:app.preferences",
-        ],
-    ),
-    (
-        "Layout",
-        &[
-            ">Pages",
-            "cmd:layout.pages.insert",
-            "cmd:layout.pages.move",
-            "ui:app.duplicateSpread",
-            "ui:app.deletePage",
-            "-",
-            "cmd:layout.pages.applyParent",
-            "cmd:layout.parents.new",
-            "<",
-            "cmd:layout.marginsAndColumns",
-            "cmd:layout.createGuides",
-            "cmd:layout.createAlternate",
-            "-",
-            "ui:view.firstPage",
-            "ui:view.previousPage",
-            "ui:view.nextPage",
-            "ui:view.lastPage",
-            "ui:view.nextSpread",
-            "ui:view.previousSpread",
-            "ui:view.goToPage",
-            "-",
-            "cmd:layout.section",
-            "cmd:toc.generate",
-            "cmd:toc.update",
-            ">Index",
-            "cmd:index.addReference",
-            "cmd:index.generate",
-            "cmd:index.update",
-            "<",
-        ],
-    ),
-    (
-        "Type",
-        &[
-            ">Size",
-            "cmd:type.char|6 pt|{\"attrs\": {\"size\": 6}}",
-            "cmd:type.char|7 pt|{\"attrs\": {\"size\": 7}}",
-            "cmd:type.char|8 pt|{\"attrs\": {\"size\": 8}}",
-            "cmd:type.char|9 pt|{\"attrs\": {\"size\": 9}}",
-            "cmd:type.char|10 pt|{\"attrs\": {\"size\": 10}}",
-            "cmd:type.char|11 pt|{\"attrs\": {\"size\": 11}}",
-            "cmd:type.char|12 pt|{\"attrs\": {\"size\": 12}}",
-            "cmd:type.char|14 pt|{\"attrs\": {\"size\": 14}}",
-            "cmd:type.char|18 pt|{\"attrs\": {\"size\": 18}}",
-            "cmd:type.char|24 pt|{\"attrs\": {\"size\": 24}}",
-            "cmd:type.char|30 pt|{\"attrs\": {\"size\": 30}}",
-            "cmd:type.char|36 pt|{\"attrs\": {\"size\": 36}}",
-            "cmd:type.char|48 pt|{\"attrs\": {\"size\": 48}}",
-            "cmd:type.char|60 pt|{\"attrs\": {\"size\": 60}}",
-            "cmd:type.char|72 pt|{\"attrs\": {\"size\": 72}}",
-            "<",
-            "-",
-            "ui:app.characterPanel",
-            "ui:app.paragraphPanel",
-            "ui:app.tabsPanel",
-            "ui:app.glyphsPanel",
-            "-",
-            "ui:app.characterStylesPanel",
-            "ui:app.paragraphStylesPanel",
-            "-",
-            "cmd:type.createOutlines",
-            "ui:app.findFontDialog",
-            "cmd:font.reload",
-            ">Change Case",
-            "cmd:type.changeCase|UPPERCASE|{\"case\": \"upper\"}",
-            "cmd:type.changeCase|lowercase|{\"case\": \"lower\"}",
-            "cmd:type.changeCase|Title Case|{\"case\": \"title\"}",
-            "cmd:type.changeCase|Sentence case|{\"case\": \"sentence\"}",
-            "<",
-            "-",
-            ">Type on a Path",
-            "cmd:type.pathOptions",
-            "cmd:type.pathOptions|Delete Type from Path|{\"delete\": true}",
-            "<",
-            "-",
-            ">Notes",
-            "cmd:note.new",
-            "ui:window.panel|Notes|{\"panel\": \"notes\"}",
-            "<",
-            ">Track Changes",
-            "cmd:changes.track",
-            "cmd:changes.acceptAll",
-            "cmd:changes.rejectAll",
-            "<",
-            "-",
-            "cmd:footnote.insert",
-            "ui:app.footnoteOptionsDialog",
-            "cmd:endnote.insert",
-            "cmd:footnote.goToReference",
-            "-",
-            ">Hyperlinks & Cross-References",
-            "cmd:hyperlink.create",
-            "cmd:anchor.create",
-            "-",
-            "ui:app.insertXrefDialog",
-            "cmd:xref.defineFormat",
-            "<",
-            ">Text Variables",
-            "cmd:variables.define",
-            "cmd:variables.insert",
-            "<",
-            "-",
-            ">Bulleted & Numbered Lists",
-            "cmd:list.bullets",
-            "cmd:list.numbers",
-            "-",
-            "cmd:list.define",
-            "<",
-            "-",
-            ">Insert Special Character",
-            ">Symbols",
-            "cmd:text.insert|Bullet Character|{\"text\": \"\u{2022}\", \"raw\": true}",
-            "cmd:text.insert|Copyright Symbol|{\"text\": \"\u{a9}\", \"raw\": true}",
-            "cmd:text.insert|Ellipsis|{\"text\": \"\u{2026}\", \"raw\": true}",
-            "cmd:text.insert|Paragraph Symbol|{\"text\": \"\u{b6}\", \"raw\": true}",
-            "cmd:text.insert|Registered Trademark Symbol|{\"text\": \"\u{ae}\", \"raw\": true}",
-            "cmd:text.insert|Section Symbol|{\"text\": \"\u{a7}\", \"raw\": true}",
-            "cmd:text.insert|Trademark Symbol|{\"text\": \"\u{2122}\", \"raw\": true}",
-            "<",
-            ">Markers",
-            "ui:app.insertCurrentPageNumber",
-            "cmd:text.insert|Next Page Number|{\"text\": \"\u{e007}\", \"raw\": true}",
-            "cmd:text.insert|Previous Page Number|{\"text\": \"\u{e008}\", \"raw\": true}",
-            "cmd:text.insert|Section Marker|{\"text\": \"\u{e001}\", \"raw\": true}",
-            "<",
-            ">Hyphens and Dashes",
-            "cmd:text.insert|Em Dash|{\"text\": \"\u{2014}\", \"raw\": true}",
-            "cmd:text.insert|En Dash|{\"text\": \"\u{2013}\", \"raw\": true}",
-            "cmd:text.insert|Discretionary Hyphen|{\"text\": \"\u{ad}\", \"raw\": true}",
-            "cmd:text.insert|Nonbreaking Hyphen|{\"text\": \"\u{2011}\", \"raw\": true}",
-            "<",
-            ">Quotation Marks",
-            "cmd:text.insert|Double Left Quotation Marks|{\"text\": \"\u{201c}\", \"raw\": true}",
-            "cmd:text.insert|Double Right Quotation Marks|{\"text\": \"\u{201d}\", \"raw\": true}",
-            "cmd:text.insert|Single Left Quotation Mark|{\"text\": \"\u{2018}\", \"raw\": true}",
-            "cmd:text.insert|Single Right Quotation Mark|{\"text\": \"\u{2019}\", \"raw\": true}",
-            "cmd:text.insert|Straight Double Quotation Marks|{\"text\": \"\\\"\", \"raw\": true}",
-            "cmd:text.insert|Straight Single Quotation Mark (Apostrophe)|{\"text\": \"'\", \"raw\": true}",
-            "<",
-            ">Other",
-            "cmd:text.insert|Tab|{\"text\": \"\\t\", \"raw\": true}",
-            "cmd:text.insert|Right Indent Tab|{\"text\": \"\u{e006}\", \"raw\": true}",
-            "cmd:text.insert|Indent to Here|{\"text\": \"\u{e005}\", \"raw\": true}",
-            "<",
-            "<",
-            ">Insert White Space",
-            "cmd:text.insert|Em Space|{\"text\": \"\u{2003}\", \"raw\": true}",
-            "cmd:text.insert|En Space|{\"text\": \"\u{2002}\", \"raw\": true}",
-            "cmd:text.insert|Nonbreaking Space|{\"text\": \"\u{a0}\", \"raw\": true}",
-            "cmd:text.insert|Hair Space|{\"text\": \"\u{200a}\", \"raw\": true}",
-            "cmd:text.insert|Sixth Space|{\"text\": \"\u{2006}\", \"raw\": true}",
-            "cmd:text.insert|Thin Space|{\"text\": \"\u{2009}\", \"raw\": true}",
-            "cmd:text.insert|Quarter Space|{\"text\": \"\u{2005}\", \"raw\": true}",
-            "cmd:text.insert|Third Space|{\"text\": \"\u{2004}\", \"raw\": true}",
-            "cmd:text.insert|Punctuation Space|{\"text\": \"\u{2008}\", \"raw\": true}",
-            "cmd:text.insert|Figure Space|{\"text\": \"\u{2007}\", \"raw\": true}",
-            "cmd:text.insert|Flush Space|{\"text\": \"\u{2001}\", \"raw\": true}",
-            "<",
-            ">Insert Break Character",
-            "cmd:text.insert|Column Break|{\"text\": \"\u{e002}\", \"raw\": true}",
-            "cmd:text.insert|Frame Break|{\"text\": \"\u{e003}\", \"raw\": true}",
-            "cmd:text.insert|Page Break|{\"text\": \"\u{e004}\", \"raw\": true}",
-            "cmd:text.insert|Odd Page Break|{\"text\": \"\u{e011}\", \"raw\": true}",
-            "cmd:text.insert|Even Page Break|{\"text\": \"\u{e012}\", \"raw\": true}",
-            "cmd:text.insert|Paragraph Return|{\"text\": \"\\n\", \"raw\": true}",
-            "cmd:text.insert|Forced Line Break|{\"text\": \"\u{2028}\", \"raw\": true}",
-            "<",
-            "cmd:type.fillWithPlaceholder",
-            "-",
-            "ui:view.hiddenCharacters",
-            "-",
-            "cmd:math.insert",
-            ">Story Direction",
-            "cmd:type.storyDirection|Horizontal|{\"vertical\": false}",
-            "cmd:type.storyDirection|Vertical|{\"vertical\": true}",
-            "<",
-            "cmd:type.tateChuYoko",
-            "ui:app.rubyDialog",
-            "cmd:type.kenten",
-            "cmd:type.warichu",
-        ],
-    ),
-    (
-        "Object",
-        &[
-            ">Transform",
-            "cmd:transform.move",
-            "cmd:transform.scale",
-            "cmd:transform.rotate",
-            "cmd:transform.shear",
-            "-",
-            "cmd:transform.flip",
-            "-",
-            "cmd:transform.clear",
-            "<",
-            ">Transform Again",
-            "cmd:transform.again",
-            "cmd:transform.again|Transform Again Individually|{\"individually\": true}",
-            "cmd:transform.again|Transform Sequence Again|{\"sequence\": true}",
-            "cmd:transform.again|Transform Sequence Again Individually|{\"sequence\": true, \"individually\": true}",
-            "<",
-            ">Flex Layout",
-            "cmd:flex.add",
-            "cmd:flex.convert",
-            "cmd:flex.remove",
-            "-",
-            "ui:window.panel|Show Flex Controls|{\"panel\": \"flexLayout\"}",
-            "<",
-            ">Paths",
-            "cmd:object.makeCompoundPath",
-            "cmd:object.releaseCompoundPath",
-            "-",
-            "cmd:path.reverse",
-            "<",
-            ">Pathfinder",
-            "cmd:object.pathfinder|Add|{\"op\": \"add\"}",
-            "cmd:object.pathfinder|Subtract|{\"op\": \"subtract\"}",
-            "cmd:object.pathfinder|Intersect|{\"op\": \"intersect\"}",
-            "cmd:object.pathfinder|Exclude Overlap|{\"op\": \"exclude\"}",
-            "cmd:object.pathfinder|Minus Back|{\"op\": \"minusBack\"}",
-            "<",
-            ">Arrange",
-            "cmd:object.bringToFront",
-            "cmd:object.bringForward",
-            "cmd:object.sendBackward",
-            "cmd:object.sendToBack",
-            "<",
-            "-",
-            "cmd:object.group",
-            "cmd:object.ungroup",
-            "cmd:object.lock",
-            "cmd:object.unlockAll",
-            "cmd:object.hide",
-            "cmd:object.showAll",
-            "-",
-            "cmd:object.textFrameOptions",
-            "ui:app.layerOptions",
-            "cmd:object.exportOptions",
-            "cmd:object.primaryTextFrame",
-            "cmd:object.cornerOptions",
-            "-",
-            ">Effects",
-            "ui:effects.dialog|Transparency…|{\"page\": \"transparency\"}",
-            "cmd:object.dropShadow",
-            "cmd:object.innerShadow",
-            "cmd:object.outerGlow",
-            "cmd:object.innerGlow",
-            "cmd:object.bevel",
-            "cmd:object.satin",
-            "cmd:object.feather",
-            "cmd:object.directionalFeather",
-            "<",
-            ">Select",
-            "cmd:select.firstAbove",
-            "cmd:select.nextAbove",
-            "cmd:select.nextBelow",
-            "cmd:select.lastBelow",
-            "-",
-            "cmd:select.container",
-            "cmd:select.content",
-            "-",
-            "cmd:select.previousInGroup",
-            "cmd:select.nextInGroup",
-            "<",
-            ">Convert Shape",
-            "cmd:object.convertShape|Rectangle|{\"to\": \"rectangle\"}",
-            "cmd:object.convertShape|Rounded Rectangle|{\"to\": \"roundedRectangle\"}",
-            "cmd:object.convertShape|Beveled Rectangle|{\"to\": \"beveledRectangle\"}",
-            "cmd:object.convertShape|Inverse Rounded Rectangle|{\"to\": \"inverseRoundedRectangle\"}",
-            "cmd:object.convertShape|Ellipse|{\"to\": \"ellipse\"}",
-            "cmd:object.convertShape|Triangle|{\"to\": \"triangle\"}",
-            "cmd:object.convertShape|Polygon|{\"to\": \"polygon\"}",
-            "cmd:object.convertShape|Line|{\"to\": \"line\"}",
-            "cmd:object.convertShape|Orthogonal Line|{\"to\": \"orthogonalLine\"}",
-            "-",
-            "cmd:object.convertShape|Open Path|{\"to\": \"openPath\"}",
-            "cmd:object.convertShape|Closed Path|{\"to\": \"closedPath\"}",
-            "<",
-            "ui:app.qrCode",
-            ">Clipping Path",
-            "cmd:object.clippingPathOptions|None|{\"type\": \"none\"}",
-            "cmd:object.clippingPath|Alpha Channel|{\"type\": \"alpha\"}",
-            "cmd:object.clippingPath|Detect Edges|{\"type\": \"edges\"}",
-            "<",
-            ">Captions",
-            "cmd:object.caption",
-            "cmd:object.caption|Generate Live Caption|{\"live\": true}",
-            "<",
-            ">Anchored Object",
-            "cmd:anchored.options",
-            "cmd:anchored.release",
-            "<",
-            ">Fitting",
-            "ui:fit.fillFrameProportionally",
-            "ui:fit.contentProportionally",
-            "ui:fit.frameToContent",
-            "ui:fit.contentToFrame",
-            "ui:fit.centerContent",
-            "-",
-            "ui:app.fittingOptions",
-            "<",
-            ">Content",
-            "cmd:object.content|Graphic|{\"type\":\"graphic\"}",
-            "cmd:object.content|Text|{\"type\":\"text\"}",
-            "cmd:object.content|Unassigned|{\"type\":\"unassigned\"}",
-            "<",
-        ],
-    ),
-    (
-        "Table",
-        &[
-            "ui:app.insertTableDialog",
-            "cmd:table.convertFromText",
-            "cmd:table.convertToText",
-            "-",
-            ">Insert",
-            "cmd:table.insertRowAbove",
-            "cmd:table.insertRowBelow",
-            "cmd:table.insertColumnLeft",
-            "cmd:table.insertColumnRight",
-            "<",
-            ">Delete",
-            "cmd:table.deleteRow",
-            "cmd:table.deleteColumn",
-            "cmd:table.delete",
-            "<",
-            ">Select",
-            "cmd:table.selectRow",
-            "cmd:table.selectColumn",
-            "cmd:table.selectTable",
-            "<",
-            "-",
-            ">Cell Options",
-            "ui:app.cellOptionsDialog",
-            "<",
-            "cmd:table.merge",
-            "cmd:table.unmerge",
-            ">Convert Cell Type",
-            "ui:app.graphicCell|Convert Cell to Graphic Cell…",
-            "cmd:table.textCell",
-            "<",
-            ">Convert Rows",
-            "cmd:table.convertRowsToHeader",
-            "cmd:table.convertRowsToBody",
-            "cmd:table.convertRowsToFooter",
-            "<",
-            "cmd:table.splitHorizontally",
-            "cmd:table.splitVertically",
-            "cmd:table.distributeColumns",
-            "cmd:table.distributeRows",
-            "-",
-            "ui:app.tablePanel",
-        ],
-    ),
-    (
-        "View",
-        &[
-            "ui:view.overprintPreview",
-            ">Proof Setup",
-            "ui:view.proofSetup|Working CMYK|{\"target\": \"workingCmyk\"}",
-            "ui:view.proofSetup|Internet Standard RGB (sRGB)|{\"target\": \"srgb\"}",
-            "ui:view.proofSetup|Legacy Macintosh RGB|{\"target\": \"legacyMacRgb\"}",
-            "ui:view.proofSetup|Monitor RGB|{\"target\": \"monitorRgb\"}",
-            "ui:view.proofSetup|Color Blindness – Protanopia|{\"target\": \"protanopia\"}",
-            "ui:view.proofSetup|Color Blindness – Deuteranopia|{\"target\": \"deuteranopia\"}",
-            "-",
-            "ui:view.proofSetup|Simulate Paper Color|{\"simulatePaper\": \"toggle\"}",
-            "<",
-            "ui:view.proofColors",
-            ">Separations Preview",
-            "ui:view.separations|Off|{\"plate\": null, \"inkLimit\": null}",
-            "ui:view.separations|Cyan|{\"plate\": \"cyan\"}",
-            "ui:view.separations|Magenta|{\"plate\": \"magenta\"}",
-            "ui:view.separations|Yellow|{\"plate\": \"yellow\"}",
-            "ui:view.separations|Black|{\"plate\": \"black\"}",
-            "ui:view.separations|Ink Limit 300%|{\"inkLimit\": 300}",
-            "<",
-            "ui:view.flattenerPreview",
-            "-",
-            "ui:view.zoomIn",
-            "ui:view.zoomOut",
-            "ui:view.fitPage",
-            "ui:view.fitSelection",
-            "ui:view.fitSpread",
-            "ui:view.actualSize",
-            "ui:view.entirePasteboard",
-            "-",
-            ">Rotate Spread",
-            "ui:view.rotateSpread|90° CW|{\"angle\": 90}",
-            "ui:view.rotateSpread|90° CCW|{\"angle\": -90}",
-            "ui:view.rotateSpread|180°|{\"angle\": 180}",
-            "ui:view.rotateSpread|Clear Rotation|{\"angle\": 0}",
-            "<",
-            "-",
-            ">Screen Mode",
-            "ui:view.screenMode|Normal|{\"mode\": \"normal\"}",
-            "ui:view.screenMode|Preview|{\"mode\": \"preview\"}",
-            "ui:view.screenMode|Bleed|{\"mode\": \"bleed\"}",
-            "ui:view.screenMode|Slug|{\"mode\": \"slug\"}",
-            "ui:view.screenMode|Presentation|{\"mode\": \"presentation\"}",
-            "<",
-            ">Display Performance",
-            "ui:view.fastDisplay",
-            "ui:view.typicalDisplay",
-            "ui:view.highQualityDisplay",
-            "<",
-            "-",
-            "ui:view.rulers",
-            "-",
-            ">Extras",
-            "ui:view.frameEdges",
-            "ui:view.textThreads",
-            "<",
-            ">Grids & Guides",
-            "ui:view.guides",
-            "ui:view.lockGuides",
-            "cmd:view.lockColumnGuides",
-            "ui:view.snapToGuides",
-            "ui:view.snapToDocumentGrid",
-            "ui:view.smartGuides",
-            "ui:view.baselineGrid",
-            "ui:view.documentGrid",
-            "-",
-            "ui:app.deleteAllGuides",
-            "<",
-            "-",
-            ">Structure",
-            "ui:view.taggedFrames",
-            "ui:view.tagMarkers",
-            "<",
-        ],
-    ),
-    (
-        "Window",
-        // InDesign's order: Arrange, Workspace, then the panels alphabetically with their groups.
-        &[
-            ">Arrange",
-            "ui:window.newWindow",
-            "ui:window.split",
-            "-",
-            "ui:window.nextDocument",
-            "ui:window.previousDocument",
-            "<",
-            "ui:window.workspace",
-            "-",
-            "ui:window.panel|Articles|{\"panel\": \"articles\"}",
-            ">Color",
-            "ui:window.panel|Color|{\"panel\": \"color\"}",
-            "ui:window.panel|Gradient|{\"panel\": \"gradient\"}",
-            "ui:window.panel|Swatches|{\"panel\": \"swatches\"}",
-            "<",
-            "ui:window.taskBar",
-            "ui:window.controlBar",
-            ">Editorial",
-            "ui:window.panel|Notes|{\"panel\": \"notes\"}",
-            "ui:window.panel|Track Changes|{\"panel\": \"trackChanges\"}",
-            "<",
-            "ui:window.panel|Effects|{\"panel\": \"effects\"}",
-            "ui:window.panel|Info|{\"panel\": \"info\"}",
-            ">Interactive",
-            "ui:window.panel|Bookmarks|{\"panel\": \"bookmarks\"}",
-            "ui:window.panel|Buttons and Forms|{\"panel\": \"buttons\"}",
-            "ui:window.panel|Hyperlinks|{\"panel\": \"hyperlinks\"}",
-            "ui:window.panel|Liquid Layout|{\"panel\": \"liquid\"}",
-            "ui:window.panel|Media|{\"panel\": \"media\"}",
-            "ui:window.panel|Object States|{\"panel\": \"states\"}",
-            "ui:window.panel|Page Transitions|{\"panel\": \"transitions\"}",
-            "<",
-            "ui:window.panel|Layers|{\"panel\": \"layers\"}",
-            "ui:window.panel|Links|{\"panel\": \"links\"}",
-            ">Object & Layout",
-            "ui:window.panel|Align|{\"panel\": \"align\"}",
-            "ui:window.panel|Flex Layout|{\"panel\": \"flexLayout\"}",
-            "ui:window.panel|Pathfinder|{\"panel\": \"pathfinder\"}",
-            "<",
-            ">Output",
-            "ui:window.panel|Attributes|{\"panel\": \"attributes\"}",
-            "ui:window.panel|Preflight|{\"panel\": \"preflight\"}",
-            "<",
-            "ui:window.panel|Pages|{\"panel\": \"pages\"}",
-            "ui:window.panel|Properties|{\"panel\": \"properties\"}",
-            "ui:window.panel|Stroke|{\"panel\": \"stroke\"}",
-            ">Styles",
-            "ui:window.panel|Character Styles|{\"panel\": \"characterStyles\"}",
-            "ui:window.panel|Paragraph Styles|{\"panel\": \"paragraphStyles\"}",
-            "<",
-            "ui:window.panel|Text Wrap|{\"panel\": \"textWrap\"}",
-            ">Type & Tables",
-            "ui:window.panel|Character|{\"panel\": \"character\"}",
-            "ui:window.panel|Conditional Text|{\"panel\": \"conditions\"}",
-            "ui:window.panel|Glyphs|{\"panel\": \"glyphs\"}",
-            "ui:window.panel|Paragraph|{\"panel\": \"paragraph\"}",
-            "ui:window.panel|Table|{\"panel\": \"table\"}",
-            "ui:app.tabsPanel",
-            "ui:window.panel|Typography|{\"panel\": \"typography\"}",
-            "<",
-            ">Utilities",
-            "ui:window.panel|Book|{\"panel\": \"book\"}",
-            "ui:window.panel|Data Merge|{\"panel\": \"dataMerge\"}",
-            "ui:window.panel|Library|{\"panel\": \"library\"}",
-            "ui:window.panel|Scripts|{\"panel\": \"scripts\"}",
-            "ui:window.panel|Tags|{\"panel\": \"tags\"}",
-            "<",
-            "-",
-            "ui:window.hidePanels",
-            "ui:window.hidePanelsExceptTools",
-            "ui:window.toolsDoubleColumn",
-            "-",
-            "ui:window.brightness",
-        ],
-    ),
-    (
-        "Help",
-        &[
-            "ui:help.discord",
-            "-",
-            "ui:help.appPage",
-            "ui:help.github",
-            "ui:help.issues",
-            "ui:help.website",
-            "-",
-            "cmd:file.newSample",
-            "-",
-            "ui:help.about",
-        ],
-    ),
-];
-
-/// The built-in workspaces, in InDesign's order.
-pub const WORKSPACES: &[&str] =
-    &["Advanced", "Book", "Digital Publishing", "Essentials", "Essentials Classic", "Interactive for PDF", "Printing and Proofing", "Typography"];
-
-/// Essentials Classic's icon column: InDesign's iconic panel groups, top to bottom.
-pub const CLASSIC_GROUPS: &[&[&str]] = &[
-    &["pages", "layers", "links"],
-    &["stroke", "color"],
-    &["swatches"],
-    &["effects"],
-    &["paragraph"],
-    &["textWrap"],
-    &["characterStyles", "paragraphStyles"],
-    &["gradient"],
-];
-
-/// The Typography preset's available panels in the order observed in InDesign's workspace.
-/// CC Libraries and the separate Story panel have no corresponding DesignCraft panel.
-pub const TYPOGRAPHY_GROUPS: &[&[&str]] = &[
-    &["pages", "layers", "swatches"],
-    &["glyphs", "textWrap"],
-    &["stroke", "gradient"],
-    &["hyperlinks", "effects"],
-    &["paragraph", "paragraphStyles"],
-    &["character", "characterStyles"],
-];
-
-pub fn ui_label(id: &str) -> Option<(&'static str, Option<&'static str>)> {
-    UI_COMMANDS.iter().find(|c| c.0 == id).map(|c| (c.1, c.2))
-}
-
-/// Type › Tabs: float the Tabs panel (placed above the selected text frame) or close it.
-fn toggle_tabs_panel(app: &mut DesignApp) {
-    if app.ui.floating.iter().any(|(p, _)| p == "tabs") {
-        crate::dock::dock_panel(app, "tabs");
-    } else {
-        let at = app.canvas_rect.map_or(egui::pos2(300.0, 140.0), |r| r.min + egui::vec2(80.0, 60.0));
-        crate::dock::float_panel(app, "tabs", at);
-        app.ui.tabs_panel.snap_request = 2;
-    }
-}
-
-/// Run a UI command; `None` if `id` isn't one.
-pub fn run_ui(app: &mut DesignApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
-    let was_find = app.ui.dialog.as_ref().is_some_and(|d| d.id == "findChange");
-    let result = run_ui_inner(app, id, p);
-    if was_find && app.ui.dialog.as_ref().is_none_or(|d| d.id != "findChange") {
-        app.session.reset_find_scope();
-    }
-    result
-}
-
-fn run_ui_inner(app: &mut DesignApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
-    if is_window_control(id) && !window_control_available(app, id) {
-        return Some(Err("custom window controls are not available in this host".into()));
-    }
-    if let Some(result) = crate::panel_docking::command(app, id, p) {
-        return Some(result);
-    }
-    let rect = app.canvas_rect;
-    let flag = |b: &mut bool| {
-        *b = !*b;
-        Ok(json!(*b))
-    };
-    Some(match id {
-        "window.minimize" => {
-            app.pending_window_commands.push(egui::ViewportCommand::Minimized(true));
-            Ok(Value::Null)
-        }
-        "window.maximize" => {
-            let on = p.get("on").and_then(Value::as_bool).unwrap_or(!app.window_maximized);
-            app.pending_window_commands.push(egui::ViewportCommand::Maximized(on));
-            Ok(json!(on))
-        }
-        "window.close" => {
-            app.pending_window_commands.push(egui::ViewportCommand::Close);
-            Ok(Value::Null)
-        }
-        "window.drag" => {
-            app.pending_window_commands.push(egui::ViewportCommand::StartDrag);
-            Ok(Value::Null)
-        }
-        "window.resize" => {
-            let edge = match p.get("edge").and_then(Value::as_str) {
-                Some("north") => egui::ResizeDirection::North,
-                Some("south") => egui::ResizeDirection::South,
-                Some("east") => egui::ResizeDirection::East,
-                Some("west") => egui::ResizeDirection::West,
-                Some("northEast") => egui::ResizeDirection::NorthEast,
-                Some("southEast") => egui::ResizeDirection::SouthEast,
-                Some("northWest") => egui::ResizeDirection::NorthWest,
-                Some("southWest") => egui::ResizeDirection::SouthWest,
-                _ => return Some(Err("invalid window resize edge".into())),
-            };
-            app.pending_window_commands.push(egui::ViewportCommand::BeginResize(edge));
-            Ok(Value::Null)
-        }
-        "app.newDocumentDialog" => {
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("newDocument", json!({})));
-            Ok(Value::Null)
-        }
-        "app.openDialog" => app.pick_and_open("open"),
-        "app.openRecent" => {
-            let index = p.get("index").cloned().unwrap_or(Value::Null);
-            let name = index
-                .as_u64()
-                .and_then(|i| usize::try_from(i).ok())
-                .and_then(|i| app.session.prefs.recent_files.get(i))
-                .map(|path| recent_label(path))
-                .unwrap_or_default();
-            app.open_named_file("file.openRecent", json!({"index": index}), name)
-        }
-        "app.placeDialog" => app.pick_and_open("place"),
-        "app.placeWithOptions" => {
-            // Word/RTF Import Options: style mapping and conflicts before the text lands.
-            let Some(path) = app.services.pick_open.as_mut().and_then(|f| f("place")) else { return Some(Ok(Value::Null)) };
-            let l = path.to_lowercase();
-            if !(l.ends_with(".docx") || l.ends_with(".rtf")) {
-                return Some(app.place_file(json!({"path": path})));
-            }
-            let info = match app.run("place.styles", json!({"path": path})) {
-                Ok(v) => v,
-                Err(e) => return Some(Err(e)),
-            };
-            app.ui.dialog = Some(crate::dialogs::Dialog::new(
-                "importOptions",
-                json!({"path": path, "styles": info["paragraph"], "charStyles": info["character"], "conflicts": info["conflicts"], "styleConflicts": "useExisting", "removeStyles": false, "map": {}}),
-            ));
-            Ok(Value::Null)
-        }
-        "app.save" | "app.saveDialog" if app.services.download.is_some() => download_document(app),
-        "app.save" => {
-            if app.session.active().is_some_and(|d| d.path.is_some()) {
-                return Some(app.run("file.save", json!({})));
-            }
-            return run_ui(app, "app.saveDialog", p);
-        }
-        "app.saveDialog" => {
-            let name = app.session.active().map(|d| format!("{}.designcraft", d.doc.title)).unwrap_or_default();
-            if let Some(path) = app.pick_save(&name) {
-                return Some(app.run("file.saveAs", json!({"path": path})));
-            }
-            Ok(Value::Null)
-        }
-        "app.quit" => {
-            app.request_quit();
-            Ok(Value::Null)
-        }
-        "app.saveCopyDialog" => {
-            let name = app.session.active().map(|d| format!("{} copy.designcraft", d.doc.title)).unwrap_or_default();
-            if let Some(path) = app.pick_save(&name) {
-                return Some(app.run("file.saveACopy", json!({"path": path})));
-            }
-            Ok(Value::Null)
-        }
-        "app.exportPng" => export_png(app, p),
-        "app.exportIdml" => export_idml(app, p),
-        "app.exportEpub" => {
-            let mut q = if p.is_object() { p.clone() } else { json!({}) };
-            q["cover"] = json!(true);
-            export_bytes(app, &q, "epub", "file.exportEpub")
-        }
-        "app.exportInteractivePdf" => {
-            let mut q = if p.is_object() { p.clone() } else { json!({}) };
-            for (k, v) in [("pageLayout", json!("single")), ("view", json!("fitPage")), ("bookmarksPanel", json!(true)), ("media", json!(true))] {
-                q.as_object_mut().map(|o| o.entry(k).or_insert(v));
-            }
-            export_pdf(app, &q)
-        }
-        "app.exportFixedEpub" => export_bytes(app, p, "epub", "file.exportFixedEpub"),
-        "app.exportHtml" => export_bytes(app, p, "html", "file.exportHtml"),
-        "app.exportPptx" => export_bytes(app, p, "pptx", "file.exportPptx"),
-        "app.exportXml" => export_bytes(app, p, "xml", "file.exportXml"),
-        "app.printBooklet" => export_bytes(app, p, "pdf", "file.printBooklet"),
-        "app.menus" => {
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("menus", json!({"query": ""})));
-            Ok(Value::Null)
-        }
-        "app.cellOptionsDialog" => crate::dialogs::open_cell_options(app),
-        "window.hideMenuItem" => {
-            let Some(item) = p.get("item").and_then(Value::as_str) else { return Some(Err("missing item".into())) };
-            let hide = p.get("hidden").and_then(Value::as_bool).unwrap_or(true);
-            app.ui.hidden_menu_items.retain(|x| x != item);
-            if hide {
-                app.ui.hidden_menu_items.push(item.to_string());
-            }
-            app.ui.show_full_menus = false;
-            Ok(Value::Null)
-        }
-        "app.placeAndLink" => {
-            let target = app.session.active().and_then(|d| {
-                let id = *d.selection.items.first()?;
-                let it = d.doc.item(id)?;
-                let loc = d.doc.find(id)?;
-                Some((it.text_frame()?.story, it.bounds(), loc.spread))
-            });
-            let Some((sid, b, sr)) = target else { return Some(Err("select a text frame".into())) };
-            Ok(app
-                .run("story.placeAndLink", json!({"story": sid.0, "rect": [b.x0 + 24.0, b.y0 + 24.0, b.x1 + 24.0, b.y1 + 24.0], "spread": sr}))
-                .unwrap_or(Value::Null))
-        }
-        "app.fittingOptions" => {
-            let g = app.session.active().and_then(|d| d.selection.items.first().and_then(|id| d.doc.item(*id)).and_then(|it| it.graphic().cloned()));
-            let Some(g) = g else { return Some(Err("select a frame with a placed graphic".into())) };
-            let fitting = serde_json::to_value(g.auto_fit).unwrap_or(json!("none"));
-            let c = |v: f64| json!(designcraft_geom::format_measure(v, designcraft_geom::Unit::Points));
-            app.ui.dialog = Some(crate::dialogs::Dialog::new(
-                "fittingOptions",
-                json!({"autoFit": g.auto_fit != designcraft_doc::Fitting::None, "fitting": fitting, "align": g.fit_align,
-                    "cropTop": c(g.crop[0]), "cropLeft": c(g.crop[1]), "cropBottom": c(g.crop[2]), "cropRight": c(g.crop[3])}),
-            ));
-            Ok(Value::Null)
-        }
-        "app.userDictionary" => {
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("userDictionary", json!({"word": ""})));
-            Ok(Value::Null)
-        }
-        "app.qrCode" => {
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("qrCode", json!({})));
-            Ok(Value::Null)
-        }
-        "app.exportText" => export_bytes(app, p, "rtf", "file.exportText"),
-        "app.packageDialog" => {
-            let name = app.session.active().map(|d| format!("{} Folder", d.doc.title)).unwrap_or_default();
-            match app.pick_save(&name) {
-                Some(dir) => {
-                    let r = app.run("file.package", json!({"dir": dir}));
-                    if let Ok(v) = &r {
-                        app.status(
-                            crate::i18n::tr(&app.ui.language, "Packaged {count} files into {dir}")
-                                .replace("{count}", &v["files"].as_array().map_or(0, |f| f.len()).to_string())
-                                .replace("{dir}", v["dir"].as_str().unwrap_or("")),
-                        );
-                    }
-                    r
-                }
-                None => Ok(Value::Null),
-            }
-        }
-        "app.language" => {
-            let Some(v) = p.get("lang").and_then(Value::as_str) else { return Some(app.run("app.preferences", json!({}))) };
-            if !crate::i18n::LANGUAGES.iter().any(|(c, _)| *c == v) {
-                return Some(Err(format!("unknown language `{v}`")));
-            }
-            app.ui.language = v.to_string();
-            Ok(json!(v))
-        }
-        "app.flattener" => {
-            let v = p.get("preset").and_then(Value::as_str).unwrap_or("");
-            if !["", "high", "medium", "low"].contains(&v) {
-                return Some(Err(format!("unknown preset `{v}`")));
-            }
-            app.ui.flattener = v.to_string();
-            Ok(json!(v))
-        }
-        "app.graphicCell" => {
-            let Some(pick) = app.services.pick_open.as_mut() else { return Some(Err("needs a file picker".into())) };
-            match pick("place") {
-                Some(path) => app.run("table.placeGraphic", json!({"path": path})),
-                None => Ok(Value::Null),
-            }
-        }
-        "effects.dialog" => {
-            crate::effects_dialog::open(app, p.get("page").and_then(Value::as_str).unwrap_or("transparency"));
-            Ok(Value::Null)
-        }
-        "app.loadSwatches" => {
-            if let Some(pick) = app.services.pick_open.as_mut() {
-                return Some(match pick("swatches") {
-                    Some(path) => app.run("swatch.load", json!({"path": path})),
-                    None => Ok(Value::Null),
-                });
-            }
-            let request = app.import_request("swatches");
-            if let Some(open) = app.services.open_async.as_mut() {
-                open(request);
-            }
-            Ok(Value::Null)
-        }
-        "app.loadParagraphStyles" => app.pick_styles("paragraph"),
-        "app.loadCharacterStyles" => app.pick_styles("character"),
-        "app.loadTextStyles" => app.pick_styles(""),
-        "app.saveSwatches" => {
-            let path = match p.get("path").and_then(Value::as_str) {
-                Some(s) => Some(s.to_string()),
-                None => app.pick_save("Swatches.ase"),
-            };
-            let Some(path) = path else { return Some(Ok(Value::Null)) };
-            let r = match app.run("swatch.save", json!({})) {
-                Ok(r) => r,
-                Err(e) => return Some(Err(e)),
-            };
-            let bytes = designcraft_engine::cmd::base64_decode(r["base64"].as_str().unwrap_or_default());
-            match app.services.write.as_mut() {
-                Some(w) => w(&path, &bytes).map(|_| json!({"path": path, "bytes": bytes.len()})),
-                None => Err("no writer".into()),
-            }
-        }
-        "app.storyEditor" => {
-            let target = app.session.active().and_then(|st| {
-                let story = p.get("story").and_then(Value::as_u64).map(designcraft_doc::StoryId).or_else(|| {
-                    st.selection
-                        .text
-                        .map(|t| t.story)
-                        .or_else(|| st.selection.items.iter().find_map(|i| st.doc.item(*i)?.text_frame().map(|t| t.story)))
-                })?;
-                Some(crate::story_editor::Target { doc: st.uid, story })
-            });
-            match target {
-                Some(t) => {
-                    app.story_editor = if app.story_editor == Some(t) { None } else { Some(t) };
-                    Ok(Value::Null)
-                }
-                None => Err("select a text frame or place the cursor in text".into()),
-            }
-        }
-        "app.findChange" => {
-            app.session.reset_find_scope();
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("findChange", json!({})));
-            Ok(Value::Null)
-        }
-        "app.insertTableDialog" => {
-            if app.session.active().is_none_or(|d| d.selection.text.is_none()) {
-                return Some(Err("place the insertion point in a text frame to create a table".into()));
-            }
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("insertTable", p.clone()));
-            Ok(Value::Null)
-        }
-        "app.rubyDialog" => {
-            let Some(st) = app.session.active() else { return Some(Err("no document open".into())) };
-            let cur = st.selection.text.and_then(|t| {
-                let story = st.doc.text_story(t.story, t.cell)?;
-                let at = if t.range().is_empty() { t.range().start } else { t.range().start + 1 };
-                story.char_format_at(at).over.ruby.clone()
-            });
-            let cur = cur.unwrap_or_default();
-            // The ruby settings the panes show: the selection's resolved character attributes.
-            let base = crate::panels::text_attrs(app).and_then(|a| a.get("chars").cloned()).unwrap_or(Value::Null);
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("ruby", json!({"text": cur, "base": base})));
-            Ok(Value::Null)
-        }
-        "app.paragraphRulesDialog" => {
-            let Some(a) = crate::panels::text_attrs(app) else { return Some(Err("select text or a text frame".into())) };
-            let rule = if p.get("rule").and_then(Value::as_str) == Some("ruleBelow") { "ruleBelow" } else { "ruleAbove" };
-            let current = json!({"ruleAbove": a["para"]["ruleAbove"], "ruleBelow": a["para"]["ruleBelow"]});
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("paragraphRules", json!({"rule": rule, "current": current})));
-            Ok(Value::Null)
-        }
-        "app.paragraphBordersDialog"
-        | "app.spanColumnsDialog"
-        | "app.bulletsNumberingDialog"
-        | "app.keepOptionsDialog"
-        | "app.nestedStylesDialog"
-        | "app.grepStylesDialog" => {
-            let Some(a) = crate::panels::text_attrs(app) else { return Some(Err("select text or a text frame".into())) };
-            let section = match id {
-                "app.spanColumnsDialog" => "span",
-                "app.bulletsNumberingDialog" => "bullets",
-                "app.keepOptionsDialog" => "keep",
-                "app.nestedStylesDialog" => "nested",
-                "app.grepStylesDialog" => "grep",
-                _ if p.get("tab").and_then(Value::as_str) == Some("shading") => "shading",
-                _ => "border",
-            };
-            let fields = json!({
-                "section": section,
-                "current": a["para"],
-                "family": a["chars"]["fontFamily"],
-                "style": a["chars"]["fontStyle"],
-            });
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("paragraphLocal", fields));
-            Ok(Value::Null)
-        }
-        "app.hyphenationDialog" => {
-            let Some(a) = app.session.execute("type.selectionAttrs", &json!({"mixed": true})).ok().filter(|a| !a.is_null()) else {
-                return Some(Err("select text or a text frame".into()));
-            };
-            let mixed: Vec<&str> = a["paraMixed"].as_array().map(|m| m.iter().filter_map(Value::as_str).collect()).unwrap_or_default();
-            let current: serde_json::Map<String, Value> = crate::dialogs::HYPH_ATTRS
-                .iter()
-                .map(|k| (k.to_string(), if mixed.contains(k) { Value::Null } else { a["para"][*k].clone() }))
-                .collect();
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("hyphenation", json!({"current": current})));
-            Ok(Value::Null)
-        }
-        "app.justificationDialog" => {
-            let Some(a) = app.session.execute("type.selectionAttrs", &json!({"mixed": true})).ok().filter(|a| !a.is_null()) else {
-                return Some(Err("select text or a text frame".into()));
-            };
-            let mixed: Vec<&str> = a["paraMixed"].as_array().map(|m| m.iter().filter_map(Value::as_str).collect()).unwrap_or_default();
-            let current: serde_json::Map<String, Value> = crate::dialogs::JUSTIFY_ATTRS
-                .iter()
-                .map(|k| (k.to_string(), if mixed.contains(k) { Value::Null } else { a["para"][*k].clone() }))
-                .collect();
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("justification", json!({"current": current})));
-            Ok(Value::Null)
-        }
-        "app.footnoteOptionsDialog" => {
-            let Some(st) = app.session.active() else { return Some(Err("no document open".into())) };
-            let o = serde_json::to_value(&st.doc.footnote_options).unwrap_or_default();
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("footnoteOptions", o));
-            Ok(Value::Null)
-        }
-        "app.findFontDialog" => {
-            if app.session.active().is_none() {
-                return Some(Err("no document open".into()));
-            }
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("findFont", json!({})));
-            Ok(Value::Null)
-        }
-        "app.insertXrefDialog" => {
-            if app.session.active().is_none_or(|d| d.selection.text.is_none()) {
-                return Some(Err("place the insertion point in text to insert a cross-reference".into()));
-            }
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("insertXref", json!({})));
-            Ok(Value::Null)
-        }
-        "app.deleteAllGuides" => {
-            let Some(spread) = guide_spread(app) else { return Some(Err("no document open".into())) };
-            return Some(app.run("guide.deleteAll", json!({"spread": spread})));
-        }
-        "app.deletePage" | "app.duplicateSpread" => {
-            let Some(st) = app.session.active() else { return Some(Err("no document open".into())) };
-            let page = crate::canvas::current_page(app).unwrap_or(0);
-            let r = if id == "app.deletePage" {
-                crate::dialogs::delete_pages(app, vec![page])
-            } else {
-                let spread = st.doc.page_loc(page).map_or(0, |l| l.0);
-                app.run("layout.pages.duplicateSpread", json!({"spread": spread}))
-            };
-            return Some(r);
-        }
-        "app.tablePanel" => {
-            app.ui.open_panel = if app.ui.open_panel.as_deref() == Some("table") { None } else { Some("table".into()) };
-            Ok(Value::Null)
-        }
-        "app.tabsPanel" => {
-            toggle_tabs_panel(app);
-            Ok(Value::Null)
-        }
-        "app.exportPdf" => {
-            if p.is_null() || p.as_object().is_none_or(|m| m.is_empty()) {
-                crate::dialogs::open_pdf_export(app);
-                Ok(Value::Null)
-            } else {
-                export_pdf(app, p)
-            }
-        }
-        "app.palette" => {
-            app.ui.palette = Some(String::new());
-            Ok(Value::Null)
-        }
-        "app.preferences" => {
-            let mut f = app.session.execute("prefs.set", &json!({})).unwrap_or_default();
-            if app.session.active().is_some() {
-                let doc = app.session.execute("document.preferences", &json!({})).unwrap_or_default();
-                f["horizontalUnits"] = doc["horizontalUnits"].clone();
-                f["rulerOrigin"] = doc["rulerOrigin"].clone();
-                f["overprintBlack"] = doc["overprintBlack"].clone();
-                f["glyphFallback"] = doc["glyphFallback"].clone();
-                for k in ["superscriptSize", "superscriptPosition", "subscriptSize", "subscriptPosition"] {
-                    f[format!("adv.{k}")] = json!(format!("{}", doc["advancedType"][k].as_f64().unwrap_or(0.0)));
-                }
-                f["verticalUnits"] = doc["verticalUnits"].clone();
-                let words = app.session.execute("spelling.words", &json!({})).unwrap_or_default();
-                f["userWords"] =
-                    json!(words.as_array().map(|a| a.iter().filter_map(Value::as_str).collect::<Vec<_>>().join("\n")).unwrap_or_default());
-                let inc = doc["keyboardIncrement"].as_f64().unwrap_or(1.0);
-                f["keyboardIncrement"] = json!(designcraft_geom::format_measure(inc, designcraft_geom::Unit::Points));
-                f["kerningIncrement"] = json!(format!("{}", doc["kerningIncrement"].as_f64().unwrap_or(20.0)));
-                let units = app.session.active().map(|d| d.doc.settings.horizontal_units).unwrap_or_default();
-                let m = |v: &Value| json!(designcraft_geom::format_measure(v.as_f64().unwrap_or(0.0), units));
-                let (bg, g) = (&doc["baselineGrid"], &doc["grid"]);
-                f["bg.start"] = m(&bg["start"]);
-                f["bg.increment"] = m(&bg["increment"]);
-                f["bg.relativeTo"] = bg["relativeTo"].clone();
-                f["bg.viewThreshold"] = json!((bg["viewThreshold"].as_f64().unwrap_or(0.75) * 100.0).round());
-                f["bg.color"] = bg["color"].clone();
-                f["grid.horizontal"] = m(&g["horizontal"]);
-                f["grid.vertical"] = m(&g["vertical"]);
-                f["grid.subdivisions"] = g["subdivisions"].clone();
-                f["grid.inBack"] = g["inBack"].clone();
-                f["grid.color"] = g["color"].clone();
-                for k in ["marginColor", "columnColor", "bleedColor", "slugColor"] {
-                    f[k] = doc[k].clone();
-                }
-                f["pasteboard.h"] = m(&doc["pasteboard"][0]);
-                f["pasteboard.v"] = m(&doc["pasteboard"][1]);
-            }
-            f["snap.alignEdges"] = json!(app.ui.align_edges);
-            f["snap.alignCenters"] = json!(app.ui.align_centers);
-            f["snap.dimensions"] = json!(app.ui.smart_dimensions);
-            f["snap.spacing"] = json!(app.ui.smart_spacing);
-            f["snap.zone"] = json!(app.ui.snap_zone);
-            f["displayQuality"] = json!(match app.ui.display_quality {
-                designcraft_render::DisplayQuality::Fast => "fast",
-                designcraft_render::DisplayQuality::Typical => "typical",
-                designcraft_render::DisplayQuality::High => "high",
-            });
-            f["uiScale"] = json!((app.ui.ui_scale * 100.0).round());
-            f["richBlack"] = json!(app.ui.rich_black);
-            f["dynamicSpelling"] = json!(app.ui.dynamic_spelling);
-            f["storyEditorSize"] = json!(app.ui.story_editor_size);
-            let list = app.session.prefs.autocorrect_list.iter().map(|(a, b)| format!("{a} → {b}")).collect::<Vec<_>>().join("\n");
-            f["autocorrectText"] = json!(list);
-            // The effective setting; it becomes an explicit preference only when the user changes it,
-            // so an untouched one keeps following the interface language.
-            let cjk = crate::cjk_features(app);
-            f["cjkFeatures"] = json!(cjk);
-            f["cjkFeatures.initial"] = json!(cjk);
-            f["section"] = json!("general");
-            // The language previews as it changes; Cancel goes back to this one.
-            f["openedLanguage"] = json!(app.ui.language);
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("preferences", f));
-            Ok(Value::Null)
-        }
-        "view.zoomIn" | "view.zoomOut" => {
-            if let Some(r) = rect {
-                crate::canvas::zoom_at(app, r.center(), if id == "view.zoomIn" { 1.5 } else { 1.0 / 1.5 });
-            }
-            Ok(Value::Null)
-        }
-        "view.fitSelection" => {
-            if let Some(r) = rect {
-                crate::canvas::fit(app, r, "selection");
-            }
-            Ok(Value::Null)
-        }
-        "view.fitPage" | "view.fitSpread" | "view.entirePasteboard" => {
-            if let Some(r) = rect {
-                crate::canvas::fit(
-                    app,
-                    r,
-                    if id == "view.fitPage" {
-                        "page"
-                    } else if id == "view.fitSpread" {
-                        "spread"
-                    } else {
-                        "all"
-                    },
-                );
-            }
-            Ok(Value::Null)
-        }
-        "view.actualSize" => {
-            crate::canvas::set_zoom(app, 1.0);
-            Ok(Value::Null)
-        }
-        "view.zoom" => {
-            crate::canvas::set_zoom(app, p.get("zoom").and_then(Value::as_f64).unwrap_or(1.0));
-            Ok(Value::Null)
-        }
-        "view.screenMode" => {
-            let mode = match p.get("mode").and_then(Value::as_str).unwrap_or("normal") {
-                "preview" => ScreenMode::Preview,
-                "bleed" => ScreenMode::Bleed,
-                "slug" => ScreenMode::Slug,
-                "presentation" => ScreenMode::Presentation,
-                _ => ScreenMode::Normal,
-            };
-            set_screen_mode(app, mode);
-            Ok(Value::Null)
-        }
-        "view.togglePreview" => {
-            let mode = if app.ui.screen_mode == ScreenMode::Normal { ScreenMode::Preview } else { ScreenMode::Normal };
-            set_screen_mode(app, mode);
-            Ok(Value::Null)
-        }
-        "view.togglePresentation" => {
-            let mode = match (app.ui.screen_mode, app.ui.presentation_return) {
-                // A settings file can hold Presentation as the return mode; leaving must still leave.
-                (ScreenMode::Presentation, ScreenMode::Presentation) => ScreenMode::Normal,
-                (ScreenMode::Presentation, back) => back,
-                _ => ScreenMode::Presentation,
-            };
-            set_screen_mode(app, mode);
-            Ok(Value::Null)
-        }
-        "color.defaultFillStroke" => crate::toolbar::default_fill_stroke(app),
-        "color.swapFillStroke" => crate::toolbar::swap_fill_stroke(app),
-        "color.toggleFillStroke" => crate::toolbar::toggle_fill_stroke(app),
-        "color.applyColor" => crate::toolbar::apply_color(app),
-        "color.applyGradient" => crate::toolbar::apply_gradient(app),
-        "color.applyNone" => crate::toolbar::apply_none(app),
-        "view.frameEdges" => flag(&mut app.ui.frame_edges),
-        "view.overprintPreview" => {
-            app.canvas.shown = None;
-            flag(&mut app.ui.overprint_preview)
-        }
-        "view.fastDisplay" | "view.typicalDisplay" | "view.highQualityDisplay" => {
-            use designcraft_render::DisplayQuality as Q;
-            app.ui.display_quality = match id {
-                "view.fastDisplay" => Q::Fast,
-                "view.typicalDisplay" => Q::Typical,
-                _ => Q::High,
-            };
-            // Redraw everything at the new quality.
-            app.canvas.shown = None;
-            Ok(Value::Null)
-        }
-        "view.rulers" => flag(&mut app.ui.rulers),
-        "view.guides" => flag(&mut app.ui.guides),
-        "view.lockGuides" => {
-            app.ui.guides_locked = p.get("on").and_then(Value::as_bool).unwrap_or(!app.ui.guides_locked);
-            Ok(json!(app.ui.guides_locked))
-        }
-        "view.snapToGuides" => flag(&mut app.ui.snap_to_guides),
-        "view.snapToDocumentGrid" => flag(&mut app.ui.snap_to_document_grid),
-        "view.smartGuides" => flag(&mut app.ui.smart_guides),
-        "view.baselineGrid" => flag(&mut app.ui.baseline_grid),
-        "view.documentGrid" => {
-            // The grid is drawn into the canvas texture.
-            app.canvas.shown = None;
-            flag(&mut app.ui.document_grid)
-        }
-        "view.textThreads" => flag(&mut app.ui.text_threads),
-        "view.hiddenCharacters" => flag(&mut app.ui.hidden_characters),
-        "view.taggedFrames" => flag(&mut app.ui.tagged_frames),
-        "window.hidePanels" | "window.hidePanelsExceptTools" => {
-            let mode = if id == "window.hidePanels" { 1 } else { 2 };
-            app.ui.hidden_panels = if app.ui.hidden_panels == mode { 0 } else { mode };
-            Ok(json!(app.ui.hidden_panels))
-        }
-        "window.nextDocument" | "window.previousDocument" => {
-            let n = app.session.documents().len();
-            if n > 1 {
-                let cur = app.session.active_index().unwrap_or(0);
-                let next = if id == "window.nextDocument" { (cur + 1) % n } else { (cur + n - 1) % n };
-                app.session.set_active(next);
-            }
-            Ok(json!(app.session.active_index()))
-        }
-        "app.layerOptionsDialog" => crate::dialogs::open_layer_options(app, p.get("id").and_then(Value::as_u64)).map(|()| Value::Null),
-        "app.swatchOptionsDialog" => {
-            crate::dialogs::open_swatch_options(app, p.get("name").and_then(Value::as_str).unwrap_or("")).map(|()| Value::Null)
-        }
-        "app.colorGroupOptionsDialog" => {
-            crate::dialogs::open_color_group_options(app, p.get("name").and_then(Value::as_str).unwrap_or("")).map(|()| Value::Null)
-        }
-        "app.layerOptions" => {
-            let layers = match app.session.execute("object.pdfLayers", &json!({})) {
-                Ok(v) => v,
-                Err(e) => return Some(Err(e.to_string())),
-            };
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("layerOptions", json!({"layers": layers})));
-            Ok(Value::Null)
-        }
-        "view.rotateSpread" => {
-            // Turns the spread in the middle of the view (InDesign's Rotate Spread).
-            let angle = p.get("angle").and_then(Value::as_i64).unwrap_or(90);
-            let Some(st) = app.session.active() else { return Some(Err("no document".into())) };
-            let layout = designcraft_tools::CanvasLayout::new(&st.doc, st.editing_parents);
-            let Some(slot) = crate::canvas::current_slot(app, &layout).and_then(|i| layout.slots.get(i).copied()) else {
-                return Some(Err("no spread".into()));
-            };
-            let designcraft_doc::SpreadRef::Doc(si) = slot.spread else { return Some(Err("parent spreads don't turn".into())) };
-            let r = app.run("layout.rotateSpreadView", json!({"spread": si, "angle": angle}));
-            if let Some(rect) = app.canvas_rect {
-                crate::canvas::fit(app, rect, "spread");
-            }
-            app.canvas.shown = None;
-            r.map(|v| v["rotation"].clone())
-        }
-        "view.proofColors" => {
-            app.ui.proof_colors = p.get("on").and_then(Value::as_bool).unwrap_or(!app.ui.proof_colors);
-            app.canvas.shown = None;
-            Ok(json!(app.ui.proof_colors))
-        }
-        "view.proofSetup" => {
-            if let Some(t) = p.get("target").and_then(Value::as_str) {
-                let Some(t) = designcraft_color::cms::ProofTarget::parse(t) else { return Some(Err(format!("unknown proof target `{t}`"))) };
-                app.ui.proof_setup.target = t;
-                app.ui.proof_colors = true;
-            }
-            if let Some(i) = p.get("intent").and_then(Value::as_str) {
-                let Some(i) = designcraft_color::cms::Intent::parse(i) else { return Some(Err(format!("unknown intent `{i}`"))) };
-                app.ui.proof_setup.intent = i;
-            }
-            match p.get("simulatePaper") {
-                Some(Value::Bool(b)) => app.ui.proof_setup.simulate_paper = *b,
-                Some(Value::String(s)) if s == "toggle" => app.ui.proof_setup.simulate_paper = !app.ui.proof_setup.simulate_paper,
-                _ => {}
-            }
-            app.canvas.shown = None;
-            Ok(json!({"target": app.ui.proof_setup.target.id(), "simulatePaper": app.ui.proof_setup.simulate_paper, "on": app.ui.proof_colors}))
-        }
-        "app.colorSettings" => {
-            let f = app.session.execute("color.settings", &json!({})).unwrap_or_default();
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("colorSettings", f));
-            Ok(Value::Null)
-        }
-        "view.separations" => {
-            if let Some(v) = p.get("plate") {
-                app.ui.separation = v.as_str().and_then(|s| ["cyan", "magenta", "yellow", "black"].iter().position(|x| *x == s)).map(|i| i as u8);
-            }
-            if let Some(v) = p.get("inkLimit") {
-                app.ui.ink_limit = v.as_f64().map(|l| (l / 100.0) as f32);
-            }
-            app.canvas.shown = None;
-            Ok(Value::Null)
-        }
-        "view.firstPage" | "view.previousPage" | "view.nextPage" | "view.lastPage" => {
-            let n = app.session.active().map_or(0, |d| d.doc.page_count());
-            if n > 0 {
-                let cur = crate::canvas::current_page(app).unwrap_or(0);
-                let to = match id {
-                    "view.firstPage" => 0,
-                    "view.previousPage" => cur.saturating_sub(1),
-                    "view.nextPage" => cur.saturating_add(1).min(n - 1),
-                    _ => n - 1,
-                };
-                crate::canvas::go_to_page(app, to);
-            }
-            Ok(Value::Null)
-        }
-        "view.nextSpread" | "view.previousSpread" => {
-            crate::canvas::step_spread(app, if id == "view.nextSpread" { 1 } else { -1 });
-            Ok(Value::Null)
-        }
-        "view.goToPage" => {
-            match p.get("page") {
-                Some(Value::Number(n)) => crate::canvas::go_to_page(app, (n.as_u64().unwrap_or(1) as usize).saturating_sub(1)),
-                Some(Value::String(s)) => match app.session.resolve_page(s) {
-                    Some(abs) => crate::canvas::go_to_page(app, abs),
-                    None => return Some(Err(format!("no page \"{s}\""))),
-                },
-                _ => app.ui.dialog = Some(crate::dialogs::Dialog::new("goToPage", json!({}))),
-            }
-            Ok(Value::Null)
-        }
-        "app.characterPanel" | "app.paragraphPanel" | "app.glyphsPanel" | "app.characterStylesPanel" | "app.paragraphStylesPanel" => {
-            let panel = match id {
-                "app.characterPanel" => "character",
-                "app.paragraphPanel" => "paragraph",
-                "app.glyphsPanel" => "glyphs",
-                "app.characterStylesPanel" => "characterStyles",
-                _ => "paragraphStyles",
-            };
-            run_ui(app, "window.panel", &json!({"panel": panel})).unwrap_or(Ok(Value::Null))
-        }
-        "app.insertCurrentPageNumber" => app.run("text.insert", json!({"text": "\u{e000}", "raw": true})),
-        "window.panel" => {
-            let panel = p.get("panel").and_then(Value::as_str).unwrap_or("properties").to_string();
-            // A panel in the workspace's icon groups opens from there (Essentials Classic's Pages).
-            let iconic = app.ui.icon_groups.as_ref().is_some_and(|g| g.iter().flatten().any(|p| *p == panel));
-            if panel == "tabs" {
-                toggle_tabs_panel(app);
-            } else if !iconic && crate::dock::DOCK_TABS.iter().any(|(id, _, _)| *id == panel) {
-                app.ui.dock_tab = panel;
-                app.ui.dock_expanded = true;
-                app.ui.open_panel = None;
-            } else if !app.ui.floating.iter().any(|(p, _)| *p == panel) {
-                app.ui.open_panel = if app.ui.open_panel.as_deref() == Some(panel.as_str()) { None } else { Some(panel) };
-            }
-            Ok(Value::Null)
-        }
-        "fit.fillFrameProportionally" | "fit.contentProportionally" | "fit.frameToContent" | "fit.contentToFrame" | "fit.centerContent" => {
-            let mode = match id {
-                "fit.fillFrameProportionally" => "fillProportionally",
-                "fit.contentProportionally" => "fitProportionally",
-                "fit.frameToContent" => "fitFrameToContent",
-                "fit.contentToFrame" => "fitContentToFrame",
-                _ => "centerContent",
-            };
-            app.run("object.fit", json!({"mode": mode}))
-        }
-        "app.keyboardShortcuts" => {
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("keyboardShortcuts", json!({"query": "", "recording": ""})));
-            Ok(Value::Null)
-        }
-        "window.setShortcut" => {
-            let Some(cmd) = p.get("id").and_then(Value::as_str) else { return Some(Err("missing id".into())) };
-            if designcraft_engine::find_command(cmd).is_none() && ui_label(cmd).is_none() {
-                return Some(Err(format!("unknown command `{cmd}`")));
-            }
-            match p.get("shortcut") {
-                None | Some(Value::Null) => {
-                    app.ui.shortcuts.remove(cmd);
-                }
-                Some(Value::String(sc)) if sc.is_empty() => {
-                    app.ui.shortcuts.insert(cmd.to_string(), String::new());
-                }
-                Some(Value::String(sc)) => {
-                    if parse_shortcut(sc).is_none() {
-                        return Some(Err(format!("can't read shortcut `{sc}`")));
-                    }
-                    app.ui.shortcuts.insert(cmd.to_string(), sc.clone());
-                }
-                Some(_) => return Some(Err("shortcut: a string or null".into())),
-            }
-            let sc = shortcut_of(app, cmd);
-            let conflicts: Vec<String> =
-                effective_shortcuts(app).into_iter().filter(|(i, s)| i != cmd && Some(s) == sc.as_ref()).map(|(i, _)| i).collect();
-            Ok(json!({"shortcut": sc, "conflicts": conflicts}))
-        }
-        "window.resetShortcuts" => {
-            app.ui.shortcuts.clear();
-            Ok(Value::Null)
-        }
-        "window.importShortcuts" => {
-            let text = match (p.get("text").and_then(Value::as_str), p.get("path").and_then(Value::as_str)) {
-                (Some(text), _) => text.to_string(),
-                (None, Some(path)) => match crate::shortcut_import::read_file(path) {
-                    Ok(text) => text,
-                    Err(e) => return Some(Err(e)),
-                },
-                (None, None) => return Some(Err("give the set's path or text".into())),
-            };
-            crate::shortcut_import::import(app, &text)
-        }
-        "view.snapPreferences" => {
-            let b = |k: &str| p.get(k).and_then(Value::as_bool);
-            let ui = &mut app.ui;
-            ui.align_edges = b("alignEdges").unwrap_or(ui.align_edges);
-            ui.align_centers = b("alignCenters").unwrap_or(ui.align_centers);
-            ui.smart_dimensions = b("smartDimensions").unwrap_or(ui.smart_dimensions);
-            ui.smart_spacing = b("smartSpacing").unwrap_or(ui.smart_spacing);
-            if let Some(z) = p.get("zone").and_then(Value::as_f64).filter(|z| z.is_finite()) {
-                ui.snap_zone = z.max(0.0);
-            }
-            Ok(json!({
-                "alignEdges": ui.align_edges,
-                "alignCenters": ui.align_centers,
-                "smartDimensions": ui.smart_dimensions,
-                "smartSpacing": ui.smart_spacing,
-                "zone": ui.snap_zone,
-            }))
-        }
-        "app.formattingAffectsText" => {
-            app.ui.formatting_affects_text = p.get("on").and_then(Value::as_bool).unwrap_or(!app.ui.formatting_affects_text);
-            Ok(json!({"on": app.ui.formatting_affects_text}))
-        }
-        "window.richBlack" => {
-            app.ui.rich_black = p.get("on").and_then(Value::as_bool).unwrap_or(!app.ui.rich_black);
-            app.canvas.shown = None;
-            Ok(json!({"on": app.ui.rich_black}))
-        }
-        "window.uiScale" => {
-            let v = p.get("scale").and_then(Value::as_f64).unwrap_or(1.0) as f32;
-            app.ui.ui_scale = v.clamp(0.5, 3.0);
-            Ok(json!({"scale": app.ui.ui_scale}))
-        }
-        "window.floatPanel" | "window.dockPanel" => {
-            let panel = p.get("panel").and_then(Value::as_str).unwrap_or("");
-            if !crate::dock::ICON_PANELS.iter().any(|(id, _, _)| *id == panel) && !crate::dock::FLOATING_PANELS.iter().any(|(id, _)| *id == panel) {
-                return Some(Err(format!("{id}: unknown panel `{panel}`")));
-            }
-            if id == "window.floatPanel" {
-                let at = egui::pos2(
-                    p.get("x").and_then(Value::as_f64).unwrap_or(400.0) as f32,
-                    p.get("y").and_then(Value::as_f64).unwrap_or(160.0) as f32,
-                );
-                crate::dock::float_panel(app, panel, at);
-            } else {
-                crate::dock::dock_panel(app, panel);
-            }
-            Ok(json!({"floating": app.ui.floating.iter().map(|(p, _)| p.clone()).collect::<Vec<_>>()}))
-        }
-        "window.controlBar" => flag(&mut app.ui.control_bar),
-        "view.flattenerPreview" => flag(&mut app.ui.flattener_preview),
-        "view.tagMarkers" => {
-            app.canvas.shown = None;
-            flag(&mut app.ui.tag_markers)
-        }
-        "edit.dynamicSpelling" => flag(&mut app.ui.dynamic_spelling),
-        "window.split" => {
-            let on = p.get("on").and_then(Value::as_bool).unwrap_or(!app.split);
-            app.split = on;
-            if on {
-                app.second_window = false;
-            } else {
-                app.switch_pane(0);
-                app.focus_pane = 0;
-            }
-            Ok(json!(on))
-        }
-        "window.newWindow" => {
-            // The second view moves into its own window (on the web: a floating window).
-            app.second_window = p.get("on").and_then(Value::as_bool).unwrap_or(true);
-            app.split = false;
-            if !app.second_window {
-                app.switch_pane(0);
-                app.focus_pane = 0;
-            }
-            Ok(json!(app.second_window))
-        }
-        "window.taskBar" => flag(&mut app.ui.task_bar),
-        "window.taskBarPin" => {
-            let at = match p.get("at") {
-                None | Some(Value::Null) => None,
-                Some(v) => match v.as_array().map(|a| a.iter().map(Value::as_f64).collect::<Vec<_>>()).as_deref() {
-                    Some([Some(x), Some(y)]) if x.is_finite() && y.is_finite() => Some([x.clamp(-1e6, 1e6) as f32, y.clamp(-1e6, 1e6) as f32]),
-                    _ => return Some(Err("window.taskBarPin: `at` is [x, y] in points".into())),
-                },
-            };
-            let on = p.get("on").and_then(Value::as_bool).unwrap_or(at.is_some() || app.ui.task_bar_pin.is_none());
-            app.ui.task_bar_pin = match (on, at.or(app.ui.task_bar_pin).or(app.ui.task_bar_at)) {
-                (false, _) => None,
-                (true, Some(at)) => Some(at),
-                (true, None) => return Some(Err("window.taskBarPin: the Contextual Task Bar isn't showing; give `at`".into())),
-            };
-            Ok(json!(app.ui.task_bar_pin))
-        }
-        "window.taskBarReset" => {
-            app.ui.task_bar_pin = None;
-            Ok(Value::Null)
-        }
-        "help.about" => {
-            if let Some(tab) = p.get("tab").and_then(Value::as_str) {
-                let Some(i) = crate::about::ABOUT_TABS.iter().position(|t| t.eq_ignore_ascii_case(tab)) else {
-                    return Some(Err(format!("help.about: unknown tab `{tab}` (about, contributors, models)")));
-                };
-                app.ui.about_tab = u8::try_from(i).unwrap_or(0);
-            }
-            app.ui.about = p.get("open").and_then(Value::as_bool).unwrap_or(true);
-            Ok(json!(app.ui.about))
-        }
-        "help.app" => match p.get("app").and_then(Value::as_str) {
-            Some(slug) if !slug.is_empty() && slug.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') => {
-                let url = format!("{}/apps/{slug}", designcraft_engine::links::WEBSITE);
-                app.ui.pending_urls.push(url.clone());
-                Ok(json!({"url": url}))
-            }
-            _ => Err("help.app: give `app` (e.g. \"photocraft\")".into()),
-        },
-        h if h.starts_with("help.") && designcraft_engine::links::get(&h[5..]).is_some() => {
-            let url = designcraft_engine::links::get(&h[5..]).unwrap_or_default().to_string();
-            app.ui.pending_urls.push(url.clone());
-            Ok(json!({"url": url}))
-        }
-        "window.toolsDoubleColumn" => flag(&mut app.ui.tools_double_column),
-        "window.collapseToIcons" => {
-            app.ui.dock_expanded = false;
-            app.ui.open_panel = None;
-            Ok(Value::Null)
-        }
-        "window.newWorkspace" => {
-            let Some(name) = p.get("name").and_then(Value::as_str).map(str::trim).filter(|n| !n.is_empty()) else {
-                app.ui.dialog =
-                    Some(crate::dialogs::Dialog::new("newWorkspace", json!({"name": "", "panelLocations": true, "menuCustomization": true})));
-                return Some(Ok(Value::Null));
-            };
-            let u = &app.ui;
-            let w = crate::SavedWorkspace {
-                name: name.to_string(),
-                control_bar: u.control_bar,
-                task_bar: u.task_bar,
-                task_bar_pin: u.task_bar_pin,
-                tools_double_column: u.tools_double_column,
-                dock_tab: u.dock_tab.clone(),
-                dock_expanded: u.dock_expanded,
-                open_panel: u.open_panel.clone(),
-                floating: u.floating.clone(),
-                docking: u.docking.clone(),
-                docking_hidden: u.docking_hidden.clone(),
-                icon_groups: u.icon_groups.clone(),
-                keep_panels: !p.get("panelLocations").and_then(Value::as_bool).unwrap_or(true),
-                hidden_menu_items: p.get("menuCustomization").and_then(Value::as_bool).unwrap_or(true).then(|| u.hidden_menu_items.clone()),
-            };
-            app.ui.custom_workspaces.retain(|x| x.name != name);
-            app.ui.custom_workspaces.push(w);
-            app.ui.workspace = name.to_string();
-            Ok(Value::Null)
-        }
-        "window.deleteWorkspace" => {
-            let name = p.get("name").and_then(Value::as_str).unwrap_or("");
-            let n = app.ui.custom_workspaces.len();
-            app.ui.custom_workspaces.retain(|x| x.name != name);
-            if app.ui.custom_workspaces.len() == n {
-                return Some(Err(format!("no saved workspace `{name}`")));
-            }
-            if app.ui.workspace == name {
-                app.ui.workspace = "Essentials".into();
-            }
-            Ok(Value::Null)
-        }
-        "window.resetWorkspace" => {
-            let name = app.ui.workspace.clone();
-            return run_ui(app, "window.workspace", &json!({"name": name}));
-        }
-        "window.workspace" => {
-            app.ui.docking_generation = app.ui.docking_generation.wrapping_add(1);
-            app.ui.docking_raise = None;
-            app.ui.docking_opened = None;
-            let name = p.get("name").and_then(Value::as_str).unwrap_or("Essentials");
-            if let Some(w) = app.ui.custom_workspaces.iter().find(|w| w.name == name).cloned() {
-                if let Some(hidden) = w.hidden_menu_items {
-                    app.ui.hidden_menu_items = hidden;
-                }
-                if w.keep_panels {
-                    app.ui.workspace = w.name;
-                    return Some(Ok(Value::Null));
-                }
-                app.ui.control_bar = w.control_bar;
-                app.ui.task_bar = w.task_bar;
-                app.ui.task_bar_pin = w.task_bar_pin;
-                app.ui.tools_double_column = w.tools_double_column;
-                app.ui.dock_tab = w.dock_tab;
-                app.ui.dock_expanded = w.dock_expanded;
-                app.ui.open_panel = w.open_panel;
-                app.ui.floating = w.floating;
-                app.ui.docking = w.docking;
-                app.ui.docking_hidden = w.docking_hidden;
-                app.ui.icon_groups = w.icon_groups;
-                app.ui.workspace = w.name;
-                return Some(Ok(Value::Null));
-            }
-            // Workspaces choose which bars and panels are visible.
-            if app.ui.docking.is_some() {
-                app.ui.floating.clear();
-            }
-            app.ui.docking = None;
-            app.ui.docking_hidden.clear();
-            app.ui.control_bar = matches!(name, "Advanced" | "Typography" | "Printing and Proofing" | "Book" | "Essentials Classic");
-            // Essentials Classic: the Control panel and an icon column of grouped panels, no
-            // Properties stack.
-            let groups = match name {
-                "Essentials Classic" => Some(CLASSIC_GROUPS),
-                "Typography" => Some(TYPOGRAPHY_GROUPS),
-                _ => None,
-            };
-            app.ui.icon_groups = groups.map(|groups| groups.iter().map(|g| g.iter().map(ToString::to_string).collect()).collect());
-            app.ui.dock_expanded = groups.is_none();
-            let dock_tab = match name {
-                "Interactive for PDF" | "Digital Publishing" => Some("pages"),
-                _ => None,
-            };
-            if let Some(tab) = dock_tab {
-                app.ui.dock_tab = tab.into();
-                app.ui.dock_expanded = true;
-            }
-            app.ui.open_panel = match name {
-                "Printing and Proofing" => Some("swatches".into()),
-                "Interactive for PDF" => Some("buttons".into()),
-                "Digital Publishing" => Some("liquid".into()),
-                _ => None,
-            };
-            app.ui.workspace = name.to_string();
-            Ok(Value::Null)
-        }
-        "window.brightness" => {
-            let b = p.get("brightness").and_then(Value::as_str).and_then(crate::theme::Brightness::parse).unwrap_or(crate::theme::Brightness::Dark);
-            app.ui.brightness = b;
-            app.restyle = true;
-            Ok(Value::Null)
-        }
-        _ => return None,
-    })
-}
-
-/// Save by handing the serialized document to the host as a download (web).
-/// Switch screen modes; entering Presentation remembers the mode to return to.
-fn set_screen_mode(app: &mut DesignApp, mode: ScreenMode) {
-    let presenting = app.ui.screen_mode == ScreenMode::Presentation;
-    if mode == ScreenMode::Presentation && !presenting {
-        app.ui.presentation_return = app.ui.screen_mode;
-        // Presentation fits the spread to the screen; leaving it puts the user's view back.
-        app.ui.presentation_view = app.view_key().zip(app.view().copied());
-    }
-    if mode != ScreenMode::Presentation
-        && presenting
-        && let Some((k, v)) = app.ui.presentation_view.take()
-        && let Some(view) = app.views.get_mut(&k)
-    {
-        *view = v;
-    }
-    app.ui.screen_mode = mode;
-}
-
-fn download_document(app: &mut DesignApp) -> Result<Value, String> {
-    let name = app.session.active().map(|d| format!("{}.designcraft", d.doc.title)).ok_or("no document")?;
-    let ser = app.run("file.serialize", json!({}))?;
-    let bytes = designcraft_engine::cmd::base64_decode(ser["base64"].as_str().unwrap_or_default());
-    let download = app.services.download.as_mut().ok_or("no download service")?;
-    download(&name, &bytes).map_err(|e| format!("could not download {name}: {e}"))?;
-    // Marks the document saved; on the web the engine doesn't touch a file system.
-    app.run("file.saveAs", json!({"path": name}))
-}
-
-fn export_png(app: &mut DesignApp, p: &Value) -> Result<Value, String> {
-    let st = app.session.active().ok_or("no document")?;
-    let page = crate::control::page_index(p, crate::canvas::current_page(app).unwrap_or(0), st.doc.page_count())?;
-    let scale = p.get("scale").and_then(Value::as_f64).unwrap_or(2.0);
-    let mut r = designcraft_render::Renderer::new();
-    let img = r
-        .render_page(
-            &st.doc,
-            &app.session.cache,
-            page,
-            scale,
-            false,
-            &designcraft_render::RenderOptions { printing_only: true, rich_black: app.session.prefs.rich_black_output, ..Default::default() },
-        )
-        .ok_or("no such page")?;
-    let png = img.to_png();
-    let path = match p.get("path").and_then(Value::as_str) {
-        Some(s) => Some(s.to_string()),
-        None => {
-            let name = format!("{}-p{}.png", st.doc.title, page + 1);
-            app.pick_save(&name)
-        }
-    };
-    let Some(path) = path else { return Ok(Value::Null) };
-    match app.services.write.as_mut() {
-        Some(w) => w(&path, &png).map(|_| json!({"path": path, "width": img.width, "height": img.height})),
-        None => Err("no writer".into()),
-    }
-}
-
-/// File › Export IDML…: ask for a path, export through `file.exportIdml` and write the bytes with
-/// the platform writer (a download on the web).
-fn export_idml(app: &mut DesignApp, p: &Value) -> Result<Value, String> {
-    let st = app.session.active().ok_or("no document")?;
-    let path = match p.get("path").and_then(Value::as_str) {
-        Some(s) => Some(s.to_string()),
-        None => {
-            let name = format!("{}.idml", st.doc.title);
-            app.pick_save(&name)
-        }
-    };
-    let Some(path) = path else { return Ok(Value::Null) };
-    let r = app.run("file.exportIdml", json!({}))?;
-    let bytes = designcraft_engine::cmd::base64_decode(r["base64"].as_str().unwrap_or_default());
-    match app.services.write.as_mut() {
-        Some(w) => w(&path, &bytes).map(|_| json!({"path": path, "bytes": bytes.len()})),
-        None => Err("no writer".into()),
-    }
-}
-
-/// Export EPUB / Text: ask for a path (default extension `ext`), run `cmd` without one and write
-/// what it returns (`base64` or `text`) with the platform writer.
-fn export_bytes(app: &mut DesignApp, p: &Value, ext: &str, cmd: &str) -> Result<Value, String> {
-    let st = app.session.active().ok_or("no document")?;
-    let path = match p.get("path").and_then(Value::as_str) {
-        Some(s) => Some(s.to_string()),
-        None => {
-            let name = format!("{}.{ext}", st.doc.title);
-            app.pick_save(&name)
-        }
-    };
-    let Some(path) = path else { return Ok(Value::Null) };
-    let mut params = json!({});
-    if cmd == "file.exportText" {
-        let txt = path.to_ascii_lowercase().ends_with(".txt");
-        params["format"] = json!(if txt { "txt" } else { "rtf" });
-    }
-    let r = app.run(cmd, params)?;
-    let bytes = match r["text"].as_str() {
-        Some(t) => t.as_bytes().to_vec(),
-        None => designcraft_engine::cmd::base64_decode(r["base64"].as_str().unwrap_or_default()),
-    };
-    match app.services.write.as_mut() {
-        Some(w) => w(&path, &bytes).map(|_| json!({"path": path, "bytes": bytes.len()})),
-        None => Err("no writer".into()),
-    }
-}
-
-/// File › Export PDF…: ask for a path, export through `file.exportPdf` and write the bytes with the
-/// platform writer (a download on the web).
-pub(crate) fn export_pdf(app: &mut DesignApp, p: &Value) -> Result<Value, String> {
-    let st = app.session.active().ok_or("no document")?;
-    let path = match p.get("path").and_then(Value::as_str) {
-        Some(s) => Some(s.to_string()),
-        None => {
-            let name = format!("{}.pdf", st.doc.title);
-            app.pick_save(&name)
-        }
-    };
-    let Some(path) = path else { return Ok(Value::Null) };
-    let mut params = if p.is_object() { p.clone() } else { json!({}) };
-    if let Some(o) = params.as_object_mut() {
-        o.remove("path");
-        o.entry("bleed").or_insert(json!(true));
-        o.entry("tagged").or_insert(json!(true));
-        if !app.ui.flattener.is_empty() {
-            o.entry("flatten").or_insert(json!(app.ui.flattener));
-        }
-    }
-    let r = app.run("file.exportPdf", params)?;
-    let bytes = designcraft_engine::cmd::base64_decode(r["base64"].as_str().unwrap_or_default());
-    match app.services.write.as_mut() {
-        Some(w) => w(&path, &bytes).map(|_| json!({"path": path, "bytes": bytes.len(), "pages": r["pages"], "warnings": r["warnings"]})),
-        None => Err("no writer".into()),
-    }
-}
-
-/// Commands that act on the text being typed wait while an IME composes at the caret (its marked
-/// text isn't typed yet): Undo and Redo (the native menu takes ⌘Z ahead of the IME), the clipboard
-/// and the selection.
-pub(crate) fn waits_for_ime(app: &DesignApp, id: &str) -> bool {
-    app.session.tool_composing()
-        && (matches!(
-            id,
-            "edit.undo" | "edit.redo" | "edit.cut" | "edit.copy" | "edit.clear" | "edit.duplicate" | "edit.selectAll" | "edit.deselectAll"
-        ) || id.starts_with("edit.paste"))
-}
-
-/// The commands that act on the desktop window itself.
-fn is_window_control(id: &str) -> bool {
-    matches!(id, "window.minimize" | "window.maximize" | "window.close" | "window.drag" | "window.resize")
-}
-
-/// Whether the host can run a window command: all of them with our own title bar, and Minimize
-/// with the macOS menu bar (Window › Minimize, ⌘M).
-fn window_control_available(app: &DesignApp, id: &str) -> bool {
-    app.custom_titlebar || (app.native_menu && id == "window.minimize")
-}
-
-/// Is a command enabled (for menu greying)?
-pub fn enabled(app: &DesignApp, id: &str) -> bool {
-    if waits_for_ime(app, id) {
-        return false;
-    }
-    if is_window_control(id) {
-        return window_control_available(app, id);
-    }
-    match designcraft_engine::find_command(id) {
-        Some(c) => (c.enabled)(&app.session).is_ok(),
-        None => true,
-    }
-}
-
-/// The default shortcut of a command.
-pub fn default_shortcut(id: &str) -> Option<&'static str> {
-    designcraft_engine::find_command(id).and_then(|c| c.shortcut).or_else(|| ui_label(id).and_then(|(_, s)| s))
-}
-
-/// The shortcut in effect for a command (the user's, else the default).
-pub fn shortcut_of(app: &DesignApp, id: &str) -> Option<String> {
-    match app.ui.shortcuts.get(id) {
-        Some(s) if s.is_empty() => None,
-        Some(s) => Some(s.clone()),
-        None => default_shortcut(id).map(str::to_string),
-    }
-}
-
-/// Every command with a shortcut in effect: (id, shortcut). UI commands come first: where one
-/// shares keys with an engine command (⌘N, ⌘O…) it's the one with the dialog.
-pub fn effective_shortcuts(app: &DesignApp) -> Vec<(String, String)> {
-    UI_COMMANDS
-        .iter()
-        .map(|c| c.0)
-        .chain(designcraft_engine::command_specs().iter().map(|c| c.id))
-        .filter_map(|id| shortcut_of(app, id).map(|s| (id.to_string(), s)))
-        .collect()
-}
-
-/// A shortcut as written in this app ("Cmd+Alt+Shift+K") from a key press.
-pub fn shortcut_string(m: egui::Modifiers, key: egui::Key) -> String {
-    let mut s = String::new();
-    if m.command {
-        s += "Cmd+";
-    }
-    if m.alt {
-        s += "Alt+";
-    }
-    if m.shift {
-        s += "Shift+";
-    }
-    s += key.name();
-    s
-}
-
-/// A shortcut for display: ⌃⌥⇧⌘ order on macOS, Ctrl+Alt+Shift+ elsewhere.
-pub fn shortcut_text(sc: &str) -> String {
-    let mac = cfg!(target_os = "macos");
-    // The key is the last part ("Cmd+-" ends in an empty part before "-").
-    let (mods, key) = match sc.rsplit_once('+') {
-        Some((m, "")) => (m.trim_end_matches('+'), "+"),
-        Some((m, k)) => (m, k),
-        None => ("", sc),
-    };
-    let has = |m: &str| mods.split('+').any(|x| x == m);
-    let mut out = String::new();
-    for (m, sym, word) in [("Ctrl", "⌃", "Ctrl+"), ("Alt", "⌥", "Alt+"), ("Shift", "⇧", "Shift+"), ("Cmd", "⌘", "Ctrl+")] {
-        if has(m) && !(m == "Cmd" && !mac && has("Ctrl")) {
-            out += if mac { sym } else { word };
-        }
-    }
-    out + key
-}
+pub use bar::{menu_bar, menu_button};
+#[cfg(test)]
+use bar::{menu_bar_submenu, menu_column};
+#[cfg(test)]
+use context::{CONTEXT_CANVAS, CONTEXT_GRAPHIC_FRAME, CONTEXT_OBJECT, CONTEXT_OBJECT_TAIL, CONTEXT_TEXT, CONTEXT_TEXT_FRAME, context_parse};
+pub use context::{ContextMenu, context_menu};
+pub(crate) use export::{export_epub, export_pdf};
+pub use invoke::{activate, activate_native, close_document};
+#[cfg(not(target_arch = "wasm32"))]
+pub use keys::paste_chord_command;
+pub use keys::{forwarded_shortcuts, shortcuts};
+#[cfg(test)]
+use quick_apply::quick_commands;
+pub use quick_apply::{QuickItem, command_search, palette, quick_apply_items};
+pub use run::run_ui;
+pub(crate) use run::save_then;
+pub use state::{
+    checked, default_shortcut, enabled, menu_enabled, native_menu_enabled, shortcut_label, shortcut_of, shortcut_text, tool_shortcut_label,
+};
+pub use tables::{CLASSIC_GROUPS, MENUS, TYPOGRAPHY_GROUPS, WORKSPACE_OPEN_PANELS, WORKSPACES, workspace_open_panel};
+#[cfg(test)]
+use tree::menu_items;
+pub use tree::{
+    AppMenuItem, MAC_APP_MENU, OPEN_RECENT, all_menu_items, menu_key, menu_tree, native_label, native_menu_tree, recent_items, recent_label,
+};
+pub use ui_commands::{CJK_ONLY, UI_COMMANDS, shown, ui_label};
 
 /// A menu entry, shared by the in-window menu bar and the native macOS menu.
 #[derive(Clone, Debug)]
@@ -2250,3545 +62,5 @@ fn cmd_item(id: &str, params: Value) -> Item {
     Item::Cmd { label, id: id.to_string(), params, shortcut }
 }
 
-fn parse_entries(entries: &[&str]) -> Vec<Item> {
-    let mut out = Vec::new();
-    let mut i = 0;
-    while i < entries.len() {
-        let e = entries[i];
-        i += 1;
-        if e == "-" {
-            out.push(Item::Sep);
-        } else if let Some(name) = e.strip_prefix('>') {
-            // Find the matching `<` (submenus nest).
-            let start = i;
-            let mut depth = 1;
-            while i < entries.len() {
-                if entries[i].starts_with('>') {
-                    depth += 1;
-                } else if entries[i] == "<" {
-                    depth -= 1;
-                    if depth == 0 {
-                        break;
-                    }
-                }
-                i += 1;
-            }
-            let sub = parse_entries(&entries[start..i]);
-            i += 1;
-            out.push(Item::Sub(name.to_string(), sub));
-        } else if e == "ui:window.panel" {
-            let items = crate::dock::DOCK_TABS
-                .iter()
-                .chain(crate::dock::ICON_PANELS)
-                .map(|(id, label, _)| Item::Cmd { label: label.to_string(), id: "window.panel".into(), params: json!({"panel": id}), shortcut: None })
-                .collect();
-            out.push(Item::Sub("Panels".into(), items));
-        } else if e == "ui:window.workspace" {
-            // Shown as InDesign's "[Essentials]"; Reset names the current workspace (see `menu_items`).
-            let mut items: Vec<Item> = WORKSPACES
-                .iter()
-                .map(|w| Item::Cmd { label: w.to_string(), id: "window.workspace".into(), params: json!({"name": w}), shortcut: None })
-                .collect();
-            items.push(Item::Sep);
-            items.push(cmd_item("window.resetWorkspace", Value::Null));
-            items.push(cmd_item("window.newWorkspace", Value::Null));
-            out.push(Item::Sub("Workspace".into(), items));
-        } else if e == "ui:window.brightness" {
-            let items = crate::theme::Brightness::ALL
-                .iter()
-                .map(|b| Item::Cmd {
-                    label: b.label().to_string(),
-                    id: "window.brightness".into(),
-                    params: json!({"brightness": b.id()}),
-                    shortcut: None,
-                })
-                .collect();
-            out.push(Item::Sub("Interface Color Theme".into(), items));
-        } else {
-            let (_, id) = e.split_once(':').unwrap_or(("cmd", e));
-            // `id|Label|{params}`: a fixed-parameter variant of a command.
-            let mut parts = id.splitn(3, '|');
-            let id = parts.next().unwrap_or(id);
-            match (parts.next(), parts.next().and_then(|j| serde_json::from_str::<Value>(j).ok())) {
-                (Some(label), Some(params)) => {
-                    let mut it = cmd_item(id, params);
-                    if let Item::Cmd { label: l, .. } = &mut it {
-                        *l = label.to_string();
-                    }
-                    out.push(it);
-                }
-                _ => out.push(cmd_item(id, Value::Null)),
-            }
-        }
-    }
-    out
-}
-
-/// The whole menu tree (InDesign order).
-pub fn menu_tree() -> Vec<(&'static str, Vec<Item>)> {
-    MENUS.iter().map(|(m, e)| (*m, parse_entries(e))).collect()
-}
-
-/// A row of the macOS application menu (the menu named after the app).
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum AppMenuItem {
-    /// Runs `command` (no parameters); `id` is the native menu item id, `label` goes through `i18n::tr`.
-    Cmd {
-        id: &'static str,
-        label: &'static str,
-        command: &'static str,
-    },
-    Sep,
-    /// Interface language: a submenu with each UI language in its own name, the current one
-    /// checked (`app.language {lang}`).
-    Language,
-    Services,
-    Hide,
-    HideOthers,
-    ShowAll,
-}
-
-/// The macOS application menu. Settings… is `app.preferences`, which `native_menu_tree` leaves out of Edit.
-pub const MAC_APP_MENU: &[AppMenuItem] = &[
-    AppMenuItem::Cmd { id: "dc-about", label: "About DesignCraft", command: "help.about" },
-    AppMenuItem::Cmd { id: "dc-discord", label: "Join the ArtCraft Discord…", command: "help.discord" },
-    AppMenuItem::Sep,
-    AppMenuItem::Cmd { id: "dc-settings", label: "Settings…", command: "app.preferences" },
-    AppMenuItem::Language,
-    AppMenuItem::Sep,
-    AppMenuItem::Services,
-    AppMenuItem::Sep,
-    AppMenuItem::Hide,
-    AppMenuItem::HideOthers,
-    AppMenuItem::ShowAll,
-    AppMenuItem::Sep,
-    // Not the predefined Quit: it terminates the app at once, past the unsaved-changes prompt.
-    AppMenuItem::Cmd { id: "dc-quit", label: "Quit DesignCraft", command: "app.quit" },
-];
-
-/// A label as the macOS menu bar library takes it: it reads "&" as a mnemonic marker and drops
-/// it, and shows "&&" as one "&".
-pub fn native_label(label: &str) -> String {
-    label.replace('&', "&&")
-}
-
-/// The menu tree for the macOS menu bar: `menu_tree` without the commands `MAC_APP_MENU` holds,
-/// so each command (and its shortcut) appears once, and with the standard Window › Minimize (⌘M)
-/// at the top of the Window menu.
-pub fn native_menu_tree() -> Vec<(&'static str, Vec<Item>)> {
-    let in_app_menu = |id: &str| MAC_APP_MENU.iter().any(|m| matches!(m, AppMenuItem::Cmd { command, .. } if *command == id));
-    let mut tree = menu_tree();
-    for (title, entries) in &mut tree {
-        without_commands(entries, &in_app_menu);
-        if *title == "Window" {
-            let minimize = Item::Cmd { label: "Minimize".into(), id: "window.minimize".into(), params: Value::Null, shortcut: Some("Cmd+M") };
-            entries.splice(0..0, [minimize, Item::Sep]);
-        }
-    }
-    tree
-}
-
-/// Drops the parameterless commands `drop` matches from `entries` (recursively), then any separator
-/// the removal left at an end or next to another.
-fn without_commands(entries: &mut Vec<Item>, drop: &dyn Fn(&str) -> bool) {
-    let before = entries.len();
-    entries.retain(|e| !matches!(e, Item::Cmd { id, params, .. } if params.is_null() && drop(id)));
-    for e in entries.iter_mut() {
-        if let Item::Sub(_, children) = e {
-            without_commands(children, drop);
-        }
-    }
-    if entries.len() == before {
-        return;
-    }
-    let mut tidy: Vec<Item> = Vec::with_capacity(entries.len());
-    for e in entries.drain(..) {
-        if matches!(e, Item::Sep) && tidy.last().is_none_or(|l| matches!(l, Item::Sep)) {
-            continue;
-        }
-        tidy.push(e);
-    }
-    if matches!(tidy.last(), Some(Item::Sep)) {
-        tidy.pop();
-    }
-    *entries = tidy;
-}
-
-/// Check state of a toggle command (None = not a toggle).
-pub fn checked(app: &DesignApp, id: &str, params: &Value) -> Option<bool> {
-    Some(match id {
-        "window.workspace" => params.get("name").and_then(Value::as_str) == Some(app.ui.workspace.as_str()),
-        "view.rulers" => app.ui.rulers,
-        "view.frameEdges" => app.ui.frame_edges,
-        "view.overprintPreview" => app.ui.overprint_preview,
-        "view.fastDisplay" => app.ui.display_quality == designcraft_render::DisplayQuality::Fast,
-        "view.typicalDisplay" => app.ui.display_quality == designcraft_render::DisplayQuality::Typical,
-        "view.highQualityDisplay" => app.ui.display_quality == designcraft_render::DisplayQuality::High,
-        "view.guides" => app.ui.guides,
-        "view.lockGuides" => app.ui.guides_locked,
-        "view.lockColumnGuides" => app.session.active().is_some_and(|d| d.doc.settings.column_guides_locked),
-        "view.snapToGuides" => app.ui.snap_to_guides,
-        "view.snapToDocumentGrid" => app.ui.snap_to_document_grid,
-        "view.smartGuides" => app.ui.smart_guides,
-        "view.baselineGrid" => app.ui.baseline_grid,
-        "view.documentGrid" => app.ui.document_grid,
-        "view.textThreads" => app.ui.text_threads,
-        "view.hiddenCharacters" => app.ui.hidden_characters,
-        "view.taggedFrames" => app.ui.tagged_frames,
-        "changes.track" => app.session.active().is_some_and(|d| d.doc.settings.track_changes),
-        // Pressed, as the Bulleted and Numbered List buttons: every paragraph the command applies
-        // to (selected text, cells or text frames) has it.
-        "list.bullets" | "list.numbers" => {
-            app.session.selection_has_list(if id == "list.bullets" { designcraft_doc::ListType::Bullets } else { designcraft_doc::ListType::Numbers })
-        }
-        "window.controlBar" => app.ui.control_bar,
-        "window.split" => app.split,
-        "window.newWindow" => app.second_window,
-        "view.proofColors" => app.ui.proof_colors,
-        "view.flattenerPreview" => app.ui.flattener_preview,
-        "view.tagMarkers" => app.ui.tag_markers,
-        "view.screenMode" => {
-            let mode = match params.get("mode").and_then(Value::as_str) {
-                Some("normal") => crate::ScreenMode::Normal,
-                Some("preview") => crate::ScreenMode::Preview,
-                Some("bleed") => crate::ScreenMode::Bleed,
-                Some("slug") => crate::ScreenMode::Slug,
-                Some("presentation") => crate::ScreenMode::Presentation,
-                _ => return None,
-            };
-            app.ui.screen_mode == mode
-        }
-        "view.rotateSpread" => match params.get("angle").and_then(Value::as_i64) {
-            Some(0) => app.session.active().is_some_and(|st| st.doc.spreads.iter().all(|sp| sp.pages.first().is_none_or(|p| p.view_rotation == 0))),
-            _ => return None,
-        },
-        "view.proofSetup" => match (params.get("target").and_then(Value::as_str), params.get("simulatePaper")) {
-            (Some(t), _) => app.ui.proof_setup.target.id() == t,
-            (None, Some(_)) => app.ui.proof_setup.simulate_paper,
-            _ => return None,
-        },
-        "edit.dynamicSpelling" => app.ui.dynamic_spelling,
-        "app.language" => app.ui.language == params.get("lang").and_then(Value::as_str).unwrap_or(""),
-        "app.flattener" => app.ui.flattener == params.get("preset").and_then(Value::as_str).unwrap_or(""),
-        "window.taskBar" => app.ui.task_bar,
-        "window.taskBarPin" => app.ui.task_bar_pin.is_some(),
-        "window.toolsDoubleColumn" => app.ui.tools_double_column,
-        "view.togglePreview" => app.ui.screen_mode == crate::ScreenMode::Preview,
-        "view.togglePresentation" => app.ui.screen_mode == crate::ScreenMode::Presentation,
-        "window.brightness" => params.get("brightness").and_then(Value::as_str) == Some(app.ui.brightness.id()),
-        "type.storyDirection" => {
-            let st = app.session.active()?;
-            let sid = st
-                .selection
-                .text
-                .map(|t| t.story)
-                .or_else(|| st.selection.items.iter().find_map(|i| st.doc.item(*i)?.text_frame().map(|t| t.story)))?;
-            st.doc.story(sid)?.vertical == params.get("vertical").and_then(Value::as_bool)?
-        }
-        _ => return None,
-    })
-}
-
-/// Enablement for menu display (UI commands need a document unless they're app/window-level).
-pub fn menu_enabled(app: &DesignApp, id: &str) -> bool {
-    if waits_for_ime(app, id) {
-        return false;
-    }
-    if is_window_control(id) {
-        return window_control_available(app, id);
-    }
-    if matches!(id, "app.justificationDialog" | "app.hyphenationDialog") {
-        return enabled(app, "type.para");
-    }
-    if id.starts_with("fit.") {
-        return enabled(app, "object.fit");
-    }
-    if id == "guide.selectAll" && (!app.ui.guides || app.ui.guides_locked) {
-        return false;
-    }
-    if ui_label(id).is_some() {
-        return app.session.active().is_some() || id.starts_with("app.") || id.starts_with("window.") || id.starts_with("help.");
-    }
-    enabled(app, id)
-}
-
-/// Close document `index` (the active one when `None`) the way the user asks for it: with the
-/// tab's ×, File ▸ Close or its shortcut. A document with unsaved changes asks first, because
-/// closing also discards its recovery data. Scripts and agents use `file.close`, which never asks.
-pub fn close_document(app: &mut DesignApp, index: Option<usize>) {
-    let Some(i) = index.or(app.session.active_index()) else { return };
-    match app.session.documents().get(i) {
-        Some(d) if d.is_dirty() => {
-            app.ui.dialog = Some(crate::dialogs::Dialog::new("closeDocument", json!({"uid": d.uid, "title": d.title(), "discard": false})));
-        }
-        _ => {
-            let _ = app.run("file.close", json!({"index": i}));
-        }
-    }
-}
-
-/// A menu item was chosen. An engine command whose label ends in "…" and that takes parameters
-/// opens a dialog built from its parameter documentation (see [`crate::dialogs::command_fields`]).
-pub fn activate(app: &mut DesignApp, id: &str, params: &Value) {
-    if waits_for_ime(app, id) {
-        return;
-    }
-    let was_find = app.ui.dialog.as_ref().is_some_and(|d| d.id == "findChange");
-    activate_inner(app, id, params);
-    if was_find && app.ui.dialog.as_ref().is_none_or(|d| d.id != "findChange") {
-        app.session.reset_find_scope();
-    }
-}
-
-fn activate_inner(app: &mut DesignApp, id: &str, params: &Value) {
-    // Object › Effects › Drop Shadow… (and its shortcut): the Effects dialog on that page.
-    if params.is_null()
-        && let Some(page) = crate::effects_dialog::page_of_command(id)
-    {
-        crate::effects_dialog::open(app, page);
-        return;
-    }
-    if params.is_null() && id == "swatch.addColorTheme" {
-        crate::dialogs::open_color_theme(app, json!({}));
-        return;
-    }
-    if params.is_null() && id == "file.close" {
-        close_document(app, None);
-        return;
-    }
-    if params.is_null() && id == "layout.documentSetup" {
-        crate::dialogs::open_document_setup(app);
-        return;
-    }
-    if params.is_null() && id == "toc.generate" {
-        crate::dialogs::open_toc(app);
-        return;
-    }
-    if params.is_null() && id == "file.print" {
-        crate::dialogs::open_print(app);
-        return;
-    }
-    if params.is_null() && id == "layout.section" {
-        crate::section_options::open(app);
-        return;
-    }
-    if params.is_null() && id == "layout.createGuides" {
-        crate::dialogs::open_create_guides(app);
-        return;
-    }
-    if params.is_null() && id == "layout.marginsAndColumns" {
-        crate::dialogs::open_margins_and_columns(app);
-        return;
-    }
-    if params.is_null() && id == "object.textFrameOptions" {
-        app.ui.dialog = Some(crate::dialogs::Dialog::new("textFrameOptions", json!({})));
-        return;
-    }
-    // New Paragraph/Character Style…: the style options for the new style.
-    if params.is_null() && matches!(id, "style.paragraph.create" | "style.character.create") {
-        crate::dialogs::open_new_style(app, id == "style.paragraph.create");
-        return;
-    }
-    // Paragraph/Character Style Options…: those of the selected text's style.
-    if params.is_null() && matches!(id, "style.paragraph.edit" | "style.character.edit") {
-        let para = id == "style.paragraph.edit";
-        let cur = crate::panels::text_attrs(app).and_then(|a| a[if para { "paragraphStyle" } else { "characterStyle" }].as_str().map(str::to_string));
-        if let Some(name) = cur {
-            crate::dialogs::open_style_options(app, para, &name);
-            return;
-        }
-    }
-    if params.is_null()
-        && ui_label(id).is_none()
-        && let Some(c) = designcraft_engine::find_command(id)
-        && !crate::dialogs::command_fields(c.params).is_empty()
-        && (c.label.ends_with('…') || crate::dialogs::command_fields(c.params).iter().any(|f| !f.optional))
-    {
-        app.ui.dialog = Some(crate::dialogs::Dialog::new(&format!("cmd:{id}"), json!({})));
-        return;
-    }
-    // Select All Guides: on the spread in view, while guides are shown and not locked.
-    if params.is_null() && id == "guide.selectAll" {
-        if app.ui.guides
-            && !app.ui.guides_locked
-            && let Some(spread) = guide_spread(app)
-        {
-            let _ = app.run(id, json!({"spread": spread}));
-        }
-        return;
-    }
-    let p = if params.is_null() { json!({}) } else { params.clone() };
-    // Update Link asks before replacing edits made to linked text in the layout.
-    if id == "links.update" {
-        crate::panels::properties::update_links(app, p);
-        return;
-    }
-    let _ = app.run(id, p);
-}
-
-/// The spread the guide commands of the menus act on: the one in view (a parent spread while
-/// parents are edited).
-fn guide_spread(app: &DesignApp) -> Option<Value> {
-    let st = app.session.active()?;
-    let page = crate::canvas::current_page(app).unwrap_or(0);
-    Some(if st.editing_parents {
-        let layout = designcraft_tools::CanvasLayout::new(&st.doc, true);
-        let shown = crate::canvas::current_slot(app, &layout).and_then(|i| layout.slots.get(i)).map(|s| s.spread);
-        json!(shown.unwrap_or(designcraft_doc::SpreadRef::Parent(0)))
-    } else {
-        json!(st.doc.page_loc(page).map_or(0, |l| l.0))
-    })
-}
-
-/// A menu button whose popup stays within the viewport and scrolls when needed.
-/// All menu buttons share this wrapper, including workspace, zoom and panel menus.
-pub fn menu_button<'a, R>(
-    ui: &mut egui::Ui,
-    atoms: impl egui::IntoAtoms<'a>,
-    add_contents: impl FnOnce(&mut egui::Ui) -> R,
-) -> egui::InnerResponse<Option<R>> {
-    use egui::containers::menu::{MenuButton, MenuConfig};
-
-    // A menu opens from a button already shown in the previous frame. Base its height on
-    // that anchor, not the popup's eventual position, so placement cannot oscillate.
-    let button = ui.ctx().read_response(ui.next_auto_id()).map(|response| response.rect);
-    let max_height = menu_max_height(ui, button);
-    let contents = |ui: &mut egui::Ui| {
-        // Override the popup's initial available height, including when it opens upwards.
-        ui.set_max_height(max_height);
-        let mut scroll = egui::ScrollArea::vertical().max_height(max_height).min_scrolled_height(1.0);
-        if ui.is_sizing_pass() {
-            // Closing and reopening a menu starts at its first command again.
-            scroll = scroll.vertical_scroll_offset(0.0);
-        }
-        scroll.show(ui, add_contents).inner
-    };
-    // Scrollbar clicks must not dismiss the popup; command rows close it explicitly.
-    let config = MenuConfig::find(ui).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside);
-    let (response, inner) = if egui::containers::menu::is_in_menu(ui) {
-        clipped_submenu(ui, atoms, config, contents)
-    } else {
-        MenuButton::new(atoms).config(config).ui(ui, contents)
-    };
-    egui::InnerResponse { response, inner: inner.map(|response| response.inner) }
-}
-
-/// The tallest menu that fits on either side of its anchor, including the popup frame.
-fn menu_max_height(ui: &egui::Ui, button: Option<egui::Rect>) -> f32 {
-    let screen = ui.ctx().content_rect();
-    let space = match button {
-        // Submenus open beside their row, aligned with its top or bottom.
-        Some(rect) if egui::containers::menu::is_in_menu(ui) => (screen.bottom() - rect.top()).max(rect.bottom() - screen.top()),
-        Some(rect) => (screen.bottom() - rect.bottom()).max(rect.top() - screen.top()),
-        None => screen.height(),
-    };
-    let chrome = egui::Frame::menu(ui.style()).total_margin().sum().y + 8.0;
-    (space.min(screen.height()) - chrome).max(1.0)
-}
-
-/// egui's submenu hover test uses the full row rect, even outside a scroll area's clip.
-fn clipped_submenu<'a, R>(
-    ui: &mut egui::Ui,
-    atoms: impl egui::IntoAtoms<'a>,
-    config: egui::containers::menu::MenuConfig,
-    contents: impl FnOnce(&mut egui::Ui) -> R,
-) -> (egui::Response, Option<egui::InnerResponse<R>>) {
-    use egui::containers::menu::{MenuState, SubMenu, SubMenuButton};
-
-    let id = SubMenu::id_from_widget_id(ui.next_auto_id());
-    let open = MenuState::from_ui(ui, |state, _| state.open_item == Some(id));
-    let inactive = ui.style().visuals.widgets.inactive;
-    if open {
-        ui.style_mut().visuals.widgets.inactive = ui.style().visuals.widgets.open;
-    }
-    let button = SubMenuButton::new(atoms).config(config);
-    let response = ui.add(button.button);
-    ui.style_mut().visuals.widgets.inactive = inactive;
-    let clip = ui.clip_rect();
-    if !response.rect.intersect(clip).is_positive() {
-        if open {
-            MenuState::from_ui(ui, |state, _| state.open_item = None);
-        }
-        return (response, None);
-    }
-    // Undo the half-spacing expansion used by SubMenu::show after clamping to the clip.
-    let hover_margin = ui.spacing().item_spacing / 2.0;
-    let mut clipped = response.clone();
-    clipped.rect = response.rect.expand2(hover_margin).intersect(clip).shrink2(hover_margin);
-    clipped.interact_rect = response.interact_rect.intersect(clip);
-    let inner = button.sub_menu.show(ui, &clipped, contents);
-    (response, inner)
-}
-
-/// A native menu bar item was chosen (macOS): like [`activate`], except that the menu bar takes
-/// ⌘A, ⌘C, ⌘X, ⌘V, ⌘Z and ⇧⌘Z before the window sees them, so while a text field has keyboard
-/// focus, Select All, Copy, Cut, Paste, Undo and Redo act on that field, as in any Mac app.
-pub fn activate_native(app: &mut DesignApp, ctx: &egui::Context, id: &str, params: &Value) {
-    if params.is_null() && ctx.text_edit_focused() && forward_to_text_edit(app, ctx, id) {
-        return;
-    }
-    // The canvas text editor is not an egui TextEdit, so its clipboard events must pass through
-    // egui for the desktop integration to read/write the macOS clipboard.
-    if params.is_null() && app.session.wants_text() && matches!(id, "edit.copy" | "edit.cut" | "edit.paste") && forward_to_text_edit(app, ctx, id) {
-        return;
-    }
-    activate(app, id, params);
-}
-
-/// Whether a native menu bar item can be chosen: as in the in-window menus, but the editing
-/// commands a focused text field takes are always available to it.
-pub fn native_menu_enabled(app: &DesignApp, ctx: &egui::Context, id: &str) -> bool {
-    (ctx.text_edit_focused() && TEXT_FIELD_COMMANDS.contains(&id)) || menu_enabled(app, id)
-}
-
-/// The editing commands a focused text field takes from the native menu bar.
-const TEXT_FIELD_COMMANDS: [&str; 6] = ["edit.selectAll", "edit.copy", "edit.cut", "edit.paste", "edit.undo", "edit.redo"];
-
-/// Hand a standard editing command to the focused text field as next frame's input; false when
-/// `id` isn't one of them.
-fn forward_to_text_edit(app: &mut DesignApp, ctx: &egui::Context, id: &str) -> bool {
-    let key = |key: egui::Key, modifiers: egui::Modifiers| {
-        [true, false].map(|pressed| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers })
-    };
-    match id {
-        "edit.selectAll" => app.synthetic.extend(key(egui::Key::A, egui::Modifiers::COMMAND)),
-        "edit.undo" => app.synthetic.extend(key(egui::Key::Z, egui::Modifiers::COMMAND)),
-        "edit.redo" => app.synthetic.extend(key(egui::Key::Z, egui::Modifiers::COMMAND | egui::Modifiers::SHIFT)),
-        "edit.copy" => app.synthetic.push(egui::Event::Copy),
-        "edit.cut" => app.synthetic.push(egui::Event::Cut),
-        // Only the integration reads the system clipboard: it answers with an `Event::Paste`.
-        "edit.paste" => ctx.send_viewport_cmd(egui::ViewportCommand::RequestPaste),
-        _ => return false,
-    }
-    ctx.request_repaint();
-    true
-}
-
-/// The menu bar contents (inside the app bar; macOS uses the native menu instead).
-pub fn menu_bar(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let lang = app.ui.language.clone();
-    let mut menus = menu_tree();
-    if crate::i18n::is_rtl(&lang) {
-        menus.reverse();
-    }
-    for (menu, entries) in menus {
-        menu_button(ui, crate::rtl::widget(ui, crate::i18n::tr(&lang, menu)), |ui| menu_column(app, ui, &[(menu, entries)]));
-    }
-}
-
-/// One menu's rows, as the menu bar and the canvas context menus show them: runs of items, each
-/// with the menu path its rows are hidden by (Edit › Menus).
-fn menu_column<P: AsRef<str>>(app: &mut DesignApp, ui: &mut egui::Ui, runs: &[(P, Vec<Item>)]) {
-    let lang = app.ui.language.clone();
-    let rtl = crate::i18n::is_rtl(&lang);
-    if rtl {
-        ui.set_max_width(320.0);
-    }
-    ui.with_layout(egui::Layout::top_down_justified(if rtl { egui::Align::Max } else { egui::Align::Min }), |ui| {
-        ui.set_min_width(240.0);
-        let mut hidden = 0;
-        for (path, items) in runs {
-            hidden += menu_items(app, ui, items, path.as_ref());
-        }
-        if hidden > 0 && !app.ui.show_full_menus {
-            ui.separator();
-            if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&lang, "Show All Menu Items"))).clicked() {
-                app.ui.show_full_menus = true;
-            }
-        }
-    });
-}
-
-/// What a right-click on the canvas opens a menu for.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum ContextMenu {
-    /// The selected objects.
-    Object,
-    /// The text being edited with the Type tool.
-    Text,
-    /// The page or pasteboard, where nothing was hit.
-    Canvas,
-}
-
-// Canvas context menus, in the menu bar's entry syntax; `menu:Menu/Submenu` inserts that menu bar
-// submenu as it is.
-const CONTEXT_OBJECT: &[&str] = &[
-    "cmd:edit.undo",
-    "cmd:edit.redo",
-    "-",
-    "cmd:edit.cut",
-    "cmd:edit.copy",
-    "cmd:edit.paste",
-    "cmd:edit.pasteInto",
-    "cmd:edit.pasteInPlace",
-    "-",
-    ">Transform",
-    "cmd:transform.rotate|Rotate 90° Clockwise|{\"angle\": -90}",
-    "cmd:transform.rotate|Rotate 90° Counterclockwise|{\"angle\": 90}",
-    "cmd:transform.rotate|Rotate 180°|{\"angle\": 180}",
-    "-",
-    "cmd:transform.flip|Flip Horizontal|{\"axis\": \"horizontal\"}",
-    "cmd:transform.flip|Flip Vertical|{\"axis\": \"vertical\"}",
-    "-",
-    "cmd:transform.clear",
-    "<",
-    "menu:Object/Arrange",
-    "menu:Object/Select",
-    "-",
-    "cmd:object.group",
-    "cmd:object.ungroup",
-    "cmd:object.lock",
-    "cmd:object.unlockAll",
-    "cmd:object.hide",
-    "cmd:object.showAll",
-    "-",
-];
-/// Added to the object menu when a graphic frame is selected.
-const CONTEXT_GRAPHIC_FRAME: &[&str] = &["menu:Object/Fitting"];
-const CONTEXT_OBJECT_TAIL: &[&str] = &["menu:Object/Content", "menu:Object/Effects"];
-/// Added to the object menu when a text frame is selected.
-const CONTEXT_TEXT_FRAME: &[&str] = &["-", "cmd:type.fillWithPlaceholder", "cmd:object.textFrameOptions"];
-const CONTEXT_TEXT: &[&str] = &[
-    "cmd:edit.cut",
-    "cmd:edit.copy",
-    "cmd:edit.paste",
-    "cmd:edit.pasteWithoutFormatting",
-    "-",
-    "menu:Type/Insert Special Character",
-    "menu:Type/Insert White Space",
-    "menu:Type/Insert Break Character",
-    "cmd:type.fillWithPlaceholder",
-    "-",
-    "menu:Type/Change Case",
-    "-",
-    "ui:view.hiddenCharacters",
-    "ui:app.storyEditor",
-    "-",
-    "cmd:edit.selectAll",
-];
-const CONTEXT_CANVAS: &[&str] = &[
-    "cmd:edit.undo",
-    "cmd:edit.redo",
-    "-",
-    "cmd:edit.paste",
-    "cmd:edit.pasteInPlace",
-    "-",
-    "ui:view.zoomIn",
-    "ui:view.zoomOut",
-    "ui:view.fitPage",
-    "ui:view.fitSpread",
-    "ui:view.actualSize",
-    "-",
-    "ui:view.rulers",
-    "menu:View/Grids & Guides",
-    "-",
-    "cmd:edit.selectAll",
-];
-
-/// The menu-bar path context menu rows are keyed by (Edit › Menus doesn't list them); rows
-/// inserted with `menu:` keep their menu bar path.
-const CONTEXT_PATH: &str = "Context";
-
-/// The entries of a canvas context menu for the current selection.
-fn context_entries(app: &DesignApp, kind: ContextMenu) -> Vec<&'static str> {
-    match kind {
-        ContextMenu::Object => {
-            let (graphic, text) = app.session.active().map_or((false, false), |st| {
-                let items = || st.selection.items.iter().filter_map(|i| st.doc.item(*i));
-                (items().any(|it| matches!(it.content, designcraft_doc::Content::Graphic(_))), items().any(|it| it.is_text_frame()))
-            });
-            let mut v = CONTEXT_OBJECT.to_vec();
-            if graphic {
-                v.extend(CONTEXT_GRAPHIC_FRAME);
-            }
-            v.extend(CONTEXT_OBJECT_TAIL);
-            if text {
-                v.extend(CONTEXT_TEXT_FRAME);
-            }
-            v
-        }
-        ContextMenu::Text => CONTEXT_TEXT.to_vec(),
-        ContextMenu::Canvas => CONTEXT_CANVAS.to_vec(),
-    }
-}
-
-/// Parses context menu entries: the menu bar's syntax plus `menu:Menu/Submenu` (not inside a `>`
-/// submenu). Returns runs of items with the menu path they are hidden by: `Context`, or for an
-/// inserted submenu its menu bar menu, so hiding a row in the menu bar hides it here too.
-fn context_parse(entries: &[&str]) -> Vec<(String, Vec<Item>)> {
-    let tree = menu_tree();
-    let mut out = Vec::new();
-    let mut run: Vec<&str> = Vec::new();
-    for e in entries {
-        if let Some(path) = e.strip_prefix("menu:") {
-            out.push((CONTEXT_PATH.to_owned(), parse_entries(&std::mem::take(&mut run))));
-            let menu = path.rsplit_once('/').map_or(path, |(menu, _)| menu);
-            out.push((menu.to_owned(), menu_bar_submenu(&tree, path).into_iter().collect()));
-        } else {
-            run.push(e);
-        }
-    }
-    out.push((CONTEXT_PATH.to_owned(), parse_entries(&run)));
-    out
-}
-
-/// The menu bar's submenu at `Menu/Submenu`.
-fn menu_bar_submenu(tree: &[(&str, Vec<Item>)], path: &str) -> Option<Item> {
-    let (menu, sub) = path.split_once('/')?;
-    tree.iter().find(|(m, _)| *m == menu)?.1.iter().find(|it| matches!(it, Item::Sub(name, _) if name == sub)).cloned()
-}
-
-/// A canvas context menu: the menu bar's rows (labels, shortcuts, check marks, greyed when they
-/// can't run), scrolling when taller than the window.
-pub fn context_menu(app: &mut DesignApp, ui: &mut egui::Ui, kind: ContextMenu) {
-    let runs = context_parse(&context_entries(app, kind));
-    let max_height = menu_max_height(ui, None);
-    let mut scroll = egui::ScrollArea::vertical().max_height(max_height).min_scrolled_height(1.0);
-    if ui.is_sizing_pass() {
-        scroll = scroll.vertical_scroll_offset(0.0);
-    }
-    scroll.show(ui, |ui| menu_column(app, ui, &runs));
-}
-
-/// The key a menu item is hidden by (Edit › Menus).
-pub fn menu_key(menu: &str, label: &str) -> String {
-    format!("{menu}/{label}")
-}
-
-/// Draws a menu's items; returns how many were hidden.
-fn menu_items(app: &mut DesignApp, ui: &mut egui::Ui, items: &[Item], path: &str) -> usize {
-    let mut hidden = 0;
-    for it in items {
-        match it {
-            Item::Sep => {
-                ui.separator();
-            }
-            Item::Sub(name, children) => {
-                let sub = format!("{path}/{name}");
-                let shown = crate::i18n::tr(&app.ui.language, name).to_owned();
-                menu_button(ui, crate::rtl::widget(ui, shown), |ui| {
-                    if sub == OPEN_RECENT {
-                        recent_menu_items(app, ui);
-                    }
-                    hidden += menu_items(app, ui, children, &sub);
-                });
-            }
-            Item::Cmd { id, .. } if !shown(app, id) => {}
-            Item::Cmd { label, .. } if !app.ui.show_full_menus && app.ui.hidden_menu_items.contains(&menu_key(path, label)) => hidden += 1,
-            Item::Cmd { label, id, params, shortcut: _ } => {
-                let lang = &app.ui.language;
-                let label = match id.as_str() {
-                    "window.workspace" => format!("[{}]", crate::i18n::workspace_name(lang, label)),
-                    "window.resetWorkspace" => format!("{} {}", crate::i18n::tr(lang, "Reset"), crate::i18n::workspace_name(lang, &app.ui.workspace)),
-                    _ => crate::i18n::tr(lang, label).to_owned(),
-                };
-                let text = match checked(app, id, params) {
-                    Some(true) => format!("✓ {label}"),
-                    Some(false) => format!("   {label}"),
-                    None => label.to_owned(),
-                };
-                let mut b = egui::Button::new(crate::rtl::widget(ui, text));
-                if let Some(sc) = shortcut_of(app, id) {
-                    b = b.shortcut_text(shortcut_text(&sc));
-                }
-                if ui.add_enabled(menu_enabled(app, id), b).clicked() {
-                    activate(app, id, params);
-                    ui.close();
-                }
-            }
-        }
-    }
-    hidden
-}
-
-/// The File › Open Recent submenu, whose files come before its fixed items.
-pub const OPEN_RECENT: &str = "File/Open Recent";
-
-/// A recent file's menu label: its file name.
-pub fn recent_label(path: &str) -> String {
-    std::path::Path::new(path).file_name().map_or_else(|| path.to_string(), |n| n.to_string_lossy().to_string())
-}
-
-/// File › Open Recent's files (`app.openRecent {index}`), then a separator; nothing when empty.
-pub fn recent_items(app: &DesignApp) -> Vec<Item> {
-    let mut out: Vec<Item> = app
-        .session
-        .prefs
-        .recent_files
-        .iter()
-        .enumerate()
-        .map(|(i, path)| Item::Cmd { label: recent_label(path), id: "app.openRecent".into(), params: json!({"index": i}), shortcut: None })
-        .collect();
-    if !out.is_empty() {
-        out.push(Item::Sep);
-    }
-    out
-}
-
-/// The recent files at the top of File › Open Recent: file names (not translated), the full path
-/// as tooltip, dimmed when the file is gone (choosing it then says so).
-fn recent_menu_items(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let dim = crate::theme::Tokens::get(ui.ctx()).text_dim;
-    for it in recent_items(app) {
-        match it {
-            Item::Cmd { label, id, params, .. } => {
-                let path = params["index"].as_u64().and_then(|i| app.session.prefs.recent_files.get(i as usize)).cloned().unwrap_or_default();
-                let mut text = egui::RichText::new(label);
-                if !crate::chrome::recent_file_stat(ui.ctx(), &path).exists {
-                    text = text.color(dim);
-                }
-                if ui.button(crate::rtl::widget(ui, text)).on_hover_text(&path).clicked() {
-                    activate(app, &id, &params);
-                    ui.close();
-                }
-            }
-            Item::Sep => {
-                ui.separator();
-            }
-            Item::Sub(..) => {}
-        }
-    }
-}
-
-/// Every menu item as (menu path, label), for Edit › Menus.
-pub fn all_menu_items() -> Vec<(String, String)> {
-    fn walk(items: &[Item], path: &str, out: &mut Vec<(String, String)>) {
-        for it in items {
-            match it {
-                Item::Sub(name, children) => walk(children, &format!("{path}/{name}"), out),
-                Item::Cmd { label, .. } => out.push((path.to_string(), label.clone())),
-                Item::Sep => {}
-            }
-        }
-    }
-    let mut out = Vec::new();
-    for (menu, entries) in menu_tree() {
-        walk(&entries, menu, &mut out);
-    }
-    out
-}
-
-pub(crate) fn parse_shortcut(sc: &str) -> Option<(egui::Modifiers, egui::Key)> {
-    let mut m = egui::Modifiers::NONE;
-    let mut key = None;
-    for part in sc.split('+').filter(|s| !s.is_empty()) {
-        match part {
-            "Cmd" => m.command = true,
-            "Shift" => m.shift = true,
-            "Alt" => m.alt = true,
-            "Ctrl" => m.ctrl = true,
-            "=" => key = Some(egui::Key::Equals),
-            "-" => key = Some(egui::Key::Minus),
-            "[" => key = Some(egui::Key::OpenBracket),
-            "]" => key = Some(egui::Key::CloseBracket),
-            ";" => key = Some(egui::Key::Semicolon),
-            "'" => key = Some(egui::Key::Quote),
-            "," => key = Some(egui::Key::Comma),
-            "." => key = Some(egui::Key::Period),
-            "\\" => key = Some(egui::Key::Backslash),
-            "/" => key = Some(egui::Key::Slash),
-            "Delete" => key = Some(egui::Key::Delete),
-            k => key = egui::Key::from_name(k),
-        }
-    }
-    if sc.ends_with("+-") || sc == "-" {
-        key = Some(egui::Key::Minus);
-    }
-    key.map(|k| (m, k))
-}
-
-/// Whether a key press matches a parsed shortcut `m`+`k`: `None` when it doesn't, `Some(true)` for
-/// the shortcut's own key and modifiers, `Some(false)` for the Plus key standing in for `=`. On
-/// layouts with a dedicated + key (German) or Shift+= (US), Cmd+= arrives as Plus.
-fn key_matches(m: egui::Modifiers, k: egui::Key, key: egui::Key, modifiers: egui::Modifiers) -> Option<bool> {
-    let plus_for_equals = key == egui::Key::Plus;
-    let matches = (k == key || (plus_for_equals && k == egui::Key::Equals))
-        && m.command == modifiers.command
-        && (m.shift == modifiers.shift || (plus_for_equals && !m.shift))
-        && m.alt == modifiers.alt;
-    matches.then_some(k == key && m.shift == modifiers.shift)
-}
-
-/// The command a paste event stands for besides plain Paste. egui-winit turns every ⌘+V chord into
-/// `Event::Paste` with the clipboard's text and drops the key press, so the shortcut table never
-/// sees Paste in Place's chord; the modifiers held when it went down tell them apart. `None` when
-/// the chord is another one, or the native menu's accelerator takes it.
-#[cfg(not(target_arch = "wasm32"))]
-pub fn paste_chord_command(app: &DesignApp, modifiers: egui::Modifiers) -> Option<&'static str> {
-    let id = "edit.pasteInPlace";
-    if app.native_menu && !app.ui.shortcuts.contains_key(id) {
-        return None;
-    }
-    let (m, k) = shortcut_of(app, id).as_deref().and_then(parse_shortcut)?;
-    (k == egui::Key::V && key_matches(m, k, egui::Key::V, modifiers) == Some(true)).then_some(id)
-}
-
-/// Global keyboard shortcuts: menu commands and single-key tool shortcuts.
-pub fn shortcuts(app: &mut DesignApp, ctx: &egui::Context) {
-    // Only a focused text field takes the keys: the canvas (or a button) having focus after a click
-    // must not swallow tool shortcuts until Esc clears it.
-    // While an IME composes at the text caret, the keyboard is its own. An open canvas context menu
-    // takes the keys (Escape closes it), as a native menu would.
-    if ctx.text_edit_focused()
-        || app.ui.dialog.is_some()
-        || app.ui.palette.is_some()
-        || app.session.tool_composing()
-        || crate::canvas::context_menu_open(ctx)
-        || crate::chrome::search_had_focus(ctx)
-    {
-        return;
-    }
-    let typing = app.session.wants_text();
-    let events = ctx.input(|i| i.events.clone());
-    for e in events {
-        let egui::Event::Key { key, pressed: true, modifiers, repeat: false, .. } = e else { continue };
-        // Presentation hides every control, so Esc always leaves it, and only that: the canvas must
-        // not also see the press and switch tools or deselect.
-        if key == egui::Key::Escape && app.ui.screen_mode == ScreenMode::Presentation {
-            ctx.input_mut(|i| i.consume_key(modifiers, key));
-            let _ = app.run("view.togglePresentation", json!({}));
-            continue;
-        }
-        // Presentation goes through the spreads with the arrow keys, Page Up/Down, Home and End.
-        if app.ui.screen_mode == ScreenMode::Presentation && !modifiers.command && !modifiers.alt {
-            let step = match key {
-                egui::Key::ArrowRight | egui::Key::ArrowDown | egui::Key::PageDown => Some(1),
-                egui::Key::ArrowLeft | egui::Key::ArrowUp | egui::Key::PageUp => Some(-1),
-                egui::Key::Home => Some(isize::MIN),
-                egui::Key::End => Some(isize::MAX),
-                _ => None,
-            };
-            if let Some(step) = step {
-                ctx.input_mut(|i| i.consume_key(modifiers, key));
-                crate::canvas::step_spread(app, step);
-                continue;
-            }
-        }
-        // Command shortcuts.
-        let mut fired: Option<(String, bool)> = None;
-        let all = effective_shortcuts(app);
-        for (id, sc) in &all {
-            let id = id.as_str();
-            if let Some((m, k)) = parse_shortcut(sc)
-                && let Some(exact) = key_matches(m, k, key, modifiers)
-                && (m.command || m.alt || !typing)
-                && !(id == "edit.clear" && typing)
-            {
-                // Single-key shortcuts (W) only when not typing.
-                if !m.command && !m.alt && !m.shift && typing {
-                    continue;
-                }
-                if id == "edit.clear" || (typing && matches!(id, "edit.copy" | "edit.cut" | "edit.paste" | "edit.pasteInPlace")) {
-                    continue; // Handled by the active tool / text clipboard events.
-                }
-                fired = Some((id.to_string(), exact));
-                break;
-            }
-        }
-        if let Some((id, exact)) = fired {
-            // The native menu bar carries the shortcuts in effect, the user's included, and its
-            // accelerator fires only for the shortcut's own key and modifiers; the Plus key standing
-            // in for = never reaches it.
-            if exact && app.native_shortcuts.contains(&id) {
-                continue; // The native menu handles it.
-            }
-            // The key press belongs to the shortcut: what it opens (Quick Apply's list, a dialog's
-            // default button) must not see the same press as Enter or Space this frame.
-            ctx.input_mut(|i| i.consume_key(modifiers, key));
-            // Like choosing the menu item: "…" commands open their dialog.
-            activate(app, &id, &Value::Null);
-            continue;
-        }
-        // Tool shortcuts (single keys, Shift+key).
-        if !typing && !modifiers.command && !modifiers.alt {
-            let name = key.name();
-            let sc = if modifiers.shift { format!("Shift+{name}") } else { name.to_string() };
-            if let Some(tool) = designcraft_tools::tool_for_shortcut(&sc) {
-                log::debug!("tool shortcut {sc} -> {tool}");
-                if std::env::var_os("DESIGNCRAFT_DEBUG_KEYS").is_some() {
-                    eprintln!("tool shortcut {sc} ({key:?}, {modifiers:?}) -> {tool}");
-                }
-                app.select_tool(tool);
-            } else if key == egui::Key::Escape && app.session.tool_id() != "selection" && !app.session.tool_busy() && app.ui.flyout.is_none() {
-                app.select_tool("selection");
-            }
-        }
-    }
-}
-
-/// Quick Apply (⌘Return): the document's styles and every command, searched by name.
-pub fn palette(app: &mut DesignApp, ctx: &egui::Context) {
-    let Some(mut q) = app.ui.palette.clone() else { return };
-    let mut close = false;
-    let mut run: Option<(String, Value)> = None;
-    egui::Modal::new(egui::Id::new("palette")).show(ctx, |ui| {
-        ui.set_width(480.0);
-        let r = ui.add(
-            egui::TextEdit::singleline(&mut q)
-                .hint_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Search styles and commands…")))
-                .desired_width(f32::INFINITY),
-        );
-        r.request_focus();
-        let items = quick_apply_items(&app.session, &q, crate::cjk_features(app));
-        // Only a fresh Return runs the first entry: ⌘Return pressed again or held down (repeats) is
-        // the shortcut, not a choice.
-        let enter = ui.input(|i| {
-            i.events
-                .iter()
-                .any(|e| matches!(e, egui::Event::Key { key: egui::Key::Enter, pressed: true, repeat: false, modifiers, .. } if !modifiers.command))
-        });
-        egui::ScrollArea::vertical().max_height(340.0).show(ui, |ui| {
-            for (i, it) in items.iter().enumerate() {
-                let mut b = egui::Button::new(it.label.as_str()).frame(false);
-                if let Some(sc) = &it.shortcut {
-                    b = b.shortcut_text(shortcut_text(sc));
-                } else if !it.kind.is_empty() {
-                    b = b.shortcut_text(crate::i18n::tr(&app.ui.language, it.kind));
-                }
-                // The button aligns its label by the layout it's in: left, like the rows with a shortcut.
-                let size = egui::vec2(460.0, 22.0);
-                let row =
-                    ui.allocate_ui_with_layout(size, egui::Layout::left_to_right(egui::Align::Center).with_main_align(egui::Align::Min), |ui| {
-                        ui.add(b.min_size(size))
-                    });
-                if row.inner.clicked() || (i == 0 && enter) {
-                    run = Some((it.id.clone(), it.params.clone()));
-                }
-            }
-        });
-        if ui.input(|i| i.key_pressed(egui::Key::Escape)) {
-            close = true;
-        }
-    });
-    app.ui.palette = if close || run.is_some() { None } else { Some(q) };
-    if let Some((id, params)) = run {
-        let _ = app.run(&id, params);
-    }
-}
-
-/// One Quick Apply entry: a style to apply or a command to run.
-#[derive(Clone, Debug, PartialEq)]
-pub struct QuickItem {
-    pub label: String,
-    pub id: String,
-    pub params: Value,
-    pub shortcut: Option<String>,
-    /// "Paragraph Style", "Character Style", "Object Style", or "" for commands.
-    pub kind: &'static str,
-}
-
-/// Quick Apply matches (styles first, as InDesign lists them), at most 14.
-pub fn quick_apply_items(session: &designcraft_engine::Session, query: &str, cjk: bool) -> Vec<QuickItem> {
-    let ql = query.to_lowercase();
-    let hit = |label: &str, id: &str| quick_match(&ql, &[label, id]);
-    let mut out = Vec::new();
-    if let Some(st) = session.active() {
-        let styles = &st.doc.styles;
-        let mut add = |name: &str, id: &str, kind: &'static str| {
-            if name.starts_with('[') || !hit(name, "") {
-                return;
-            }
-            out.push(QuickItem { label: name.to_string(), id: id.into(), params: json!({"name": name}), shortcut: None, kind });
-        };
-        for p in &styles.paragraph {
-            add(&p.name, "style.paragraph.apply", "Paragraph Style");
-        }
-        for c in &styles.character {
-            add(&c.name, "style.character.apply", "Character Style");
-        }
-        for o in &styles.object {
-            add(&o.name, "style.object.apply", "Object Style");
-        }
-    }
-    // Styles need a query, else they would crowd out the commands.
-    if ql.is_empty() {
-        out.clear();
-    }
-    let commands = quick_commands().filter(|(id, l, _)| hit(l, id) && (cjk || !CJK_ONLY.contains(id))).map(|(id, l, sc)| QuickItem {
-        label: l.to_string(),
-        id: id.to_string(),
-        params: json!({}),
-        shortcut: sc.map(str::to_string),
-        kind: "",
-    });
-    out.extend(commands);
-    out.truncate(14);
-    out
-}
-
-/// The commands Quick Apply and the application bar's search find: (id, label, default shortcut).
-fn quick_commands() -> impl Iterator<Item = (&'static str, &'static str, Option<&'static str>)> {
-    designcraft_engine::command_specs()
-        .iter()
-        .filter(|c| !c.menu.is_empty() || c.shortcut.is_some())
-        .map(|c| (c.id, c.label, c.shortcut))
-        .chain(UI_COMMANDS.iter().map(|c| (c.0, c.1, c.2)))
-}
-
-/// Whether any of `texts` contains the lowercased query (an empty query matches everything).
-fn quick_match(query_lower: &str, texts: &[&str]) -> bool {
-    query_lower.is_empty() || texts.iter().any(|t| t.to_lowercase().contains(query_lower))
-}
-
-/// The application bar's search: the commands whose label in the interface language, English
-/// label or id contains `query`, labelled in the interface language with the shortcut in effect.
-/// Nothing for an empty query; at most 14.
-pub fn command_search(app: &DesignApp, query: &str) -> Vec<QuickItem> {
-    let ql = query.trim().to_lowercase();
-    if ql.is_empty() {
-        return Vec::new();
-    }
-    let lang = app.ui.language.as_str();
-    let mut out: Vec<QuickItem> = Vec::new();
-    for (id, label, _) in quick_commands() {
-        let shown = crate::i18n::tr(lang, label);
-        if out.len() >= 14 || !self::shown(app, id) || out.iter().any(|it| it.id == id) || !quick_match(&ql, &[shown, label, id]) {
-            continue;
-        }
-        out.push(QuickItem { label: shown.to_string(), id: id.to_string(), params: Value::Null, shortcut: shortcut_of(app, id), kind: "" });
-    }
-    out
-}
-
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// The entries (command ids) of a menu bar menu, submenus included.
-    fn menu_ids(title: &str) -> Vec<&'static str> {
-        let items = MENUS.iter().find(|(t, _)| *t == title).map(|(_, items)| *items).unwrap_or_default();
-        items.iter().filter_map(|e| e.split_once(':').map(|(_, rest)| rest.split('|').next().unwrap_or(rest))).collect()
-    }
-
-    #[test]
-    fn view_items_are_in_the_view_menu_as_in_indesign() {
-        let (view, typ) = (menu_ids("View"), menu_ids("Type"));
-        for id in [
-            "view.rotateSpread",
-            "view.proofSetup",
-            "view.proofColors",
-            "view.flattenerPreview",
-            "view.separations",
-            "view.taggedFrames",
-            "view.tagMarkers",
-        ] {
-            assert!(view.contains(&id), "{id} is in View");
-            assert!(!typ.contains(&id), "{id} isn't in Type");
-        }
-        // Screen Mode and Extras are View submenus; Show Hidden Characters stays in Type.
-        assert!(view.contains(&"view.screenMode") && view.contains(&"view.frameEdges"));
-        assert!(typ.contains(&"view.hiddenCharacters") && !view.contains(&"view.hiddenCharacters"));
-        // W still toggles Normal / Preview without a menu entry.
-        assert_eq!(ui_label("view.togglePreview").and_then(|c| c.1), Some("W"));
-    }
-
-    /// The submenu paths of a menu bar menu ("View/Screen Mode"), as Edit › Menus keys them.
-    fn submenu_paths(title: &str) -> Vec<String> {
-        let items = MENUS.iter().find(|(t, _)| *t == title).map(|(_, items)| *items).unwrap_or_default();
-        let mut stack = vec![title.to_string()];
-        let mut out = Vec::new();
-        for e in items {
-            if let Some(name) = e.strip_prefix('>') {
-                let path = format!("{}/{name}", stack.last().map_or("", String::as_str));
-                out.push(path.clone());
-                stack.push(path);
-            } else if *e == "<" {
-                stack.pop();
-            }
-        }
-        out
-    }
-
-    /// A command's menu path names the menu entries that really hold it.
-    #[test]
-    fn define_lists_command_path_matches_the_type_menu() {
-        let spec = designcraft_engine::command_specs().iter().find(|c| c.id == "list.define").expect("list.define is a command");
-        assert_eq!(spec.menu[0], "Type");
-        assert!(submenu_paths("Type").contains(&spec.menu.join("/")), "{:?} is not a Type submenu", spec.menu);
-        assert!(menu_ids("Type").contains(&"list.define"));
-    }
-
-    #[test]
-    fn screen_mode_shows_the_current_mode() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let mode = |app: &DesignApp, m: &str| checked(app, "view.screenMode", &json!({ "mode": m }));
-        assert_eq!((mode(&app, "normal"), mode(&app, "preview")), (Some(true), Some(false)));
-        app.ui.screen_mode = crate::ScreenMode::Preview;
-        assert_eq!((mode(&app, "normal"), mode(&app, "preview")), (Some(false), Some(true)));
-    }
-
-    fn walk(items: &[Item], out: &mut Vec<(String, String, Value)>) {
-        for it in items {
-            match it {
-                Item::Sub(_, c) => walk(c, out),
-                Item::Cmd { label, id, params, .. } => out.push((label.clone(), id.clone(), params.clone())),
-                Item::Sep => {}
-            }
-        }
-    }
-
-    /// Exercise the real dropdown, including clipping and wheel input, on a short viewport.
-    #[test]
-    fn oversized_edit_menu_scrolls_to_preferences() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let ctx = egui::Context::default();
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(700.0, 260.0));
-        let mut tick = 0;
-        let mut frame = |app: &mut DesignApp, events: Vec<egui::Event>| {
-            tick += 1;
-            let mut output =
-                ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
-                    egui::MenuBar::new().ui(ui, |ui| menu_bar(app, ui));
-                });
-            output.textures_delta.clear();
-            let mut labels = Vec::new();
-            fn collect(shape: &egui::Shape, clip: egui::Rect, labels: &mut Vec<(String, egui::Rect, egui::Rect)>) {
-                match shape {
-                    egui::Shape::Text(t) => labels.push((t.galley.job.text.clone(), t.visual_bounding_rect(), clip)),
-                    egui::Shape::Vec(shapes) => {
-                        for shape in shapes {
-                            collect(shape, clip, labels);
-                        }
-                    }
-                    _ => {}
-                }
-            }
-            for shape in output.shapes {
-                collect(&shape.shape, shape.clip_rect, &mut labels);
-            }
-            labels
-        };
-        frame(&mut app, vec![]);
-        let labels = frame(&mut app, vec![]);
-        let edit = labels.iter().find(|(text, _, _)| text == "Edit").unwrap().1.center();
-        for pressed in [true, false] {
-            frame(
-                &mut app,
-                vec![
-                    egui::Event::PointerMoved(edit),
-                    egui::Event::PointerButton { pos: edit, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
-                ],
-            );
-        }
-        for _ in 0..3 {
-            frame(&mut app, vec![]);
-        }
-        let layer = ctx.layer_id_at(egui::pos2(edit.x + 80.0, 100.0)).expect("menu layer");
-        let bounds = ctx.memory(|m| m.area_rect(layer.id)).expect("menu bounds");
-        let track = egui::pos2(bounds.right() - 9.0, bounds.bottom() - 25.0);
-        for pressed in [true, false] {
-            frame(
-                &mut app,
-                vec![
-                    egui::Event::PointerMoved(track),
-                    egui::Event::PointerButton { pos: track, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
-                ],
-            );
-        }
-        assert!(egui::Popup::is_any_open(&ctx), "clicking the scroll track must not dismiss the menu");
-        frame(
-            &mut app,
-            vec![
-                egui::Event::PointerMoved(egui::pos2(edit.x + 80.0, 100.0)),
-                egui::Event::MouseWheel {
-                    unit: egui::MouseWheelUnit::Point,
-                    delta: egui::vec2(0.0, -3000.0),
-                    phase: egui::TouchPhase::Move,
-                    modifiers: egui::Modifiers::NONE,
-                },
-            ],
-        );
-        let mut labels = Vec::new();
-        for _ in 0..60 {
-            labels = frame(&mut app, vec![]);
-        }
-        let (_, rect, clip) = labels.iter().find(|(text, _, _)| text == "Preferences…").expect("Preferences is rendered");
-        assert!(screen.contains_rect(*rect) && clip.contains_rect(*rect), "Preferences must be visible after scrolling: {rect:?}, {clip:?}");
-        let pos = rect.center();
-        for pressed in [true, false] {
-            frame(
-                &mut app,
-                vec![
-                    egui::Event::PointerMoved(pos),
-                    egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
-                ],
-            );
-        }
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("preferences"));
-        assert!(!egui::Popup::is_any_open(&ctx), "choosing a command dismisses the menu");
-    }
-
-    #[test]
-    fn formatting_affects_text_sends_swatches_to_the_text() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        for (name, color) in [("Cyan", "#00ffff"), ("Magenta", "#ff00ff")] {
-            let created = app.run("swatch.create", json!({"name": name, "color": color})).unwrap();
-            assert_eq!(created["name"], name);
-        }
-        let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "words", "caret": false})).unwrap();
-        let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
-        app.run("selection.set", json!({"ids": [fid]})).unwrap();
-        let text_fill = |app: &crate::DesignApp| {
-            let st = app.session.active().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().clone();
-            st.char_format_at(2).over.fill.clone()
-        };
-        let frame_fill = |app: &crate::DesignApp| app.session.active().unwrap().doc.item(designcraft_doc::ItemId(fid)).unwrap().fill.swatch.clone();
-        assert!(!crate::panels::colors_affect_text(&app));
-        crate::panels::apply_swatch(&mut app, false, "C=100 M=0 Y=0 K=0", None).unwrap();
-        assert_eq!(frame_fill(&app), "C=100 M=0 Y=0 K=0");
-        assert_eq!(text_fill(&app), None);
-        let r = run_ui(&mut app, "app.formattingAffectsText", &json!({})).unwrap().unwrap();
-        assert_eq!(r["on"], true, "toggles on");
-        assert!(crate::panels::colors_affect_text(&app));
-        crate::panels::apply_swatch(&mut app, false, "C=0 M=100 Y=0 K=0", Some(0.5)).unwrap();
-        assert_eq!(frame_fill(&app), "C=100 M=0 Y=0 K=0", "the frame is left alone");
-        assert_eq!(text_fill(&app).as_deref(), Some("C=0 M=100 Y=0 K=0"));
-        assert_eq!(crate::panels::color_target(&mut app).map(|t| (t.0, t.1)), Some(("C=0 M=100 Y=0 K=0".to_string(), 0.5)));
-    }
-
-    #[test]
-    fn transform_menu_items_open_their_dialogs() {
-        for id in ["transform.move", "transform.scale", "transform.rotate", "transform.shear"] {
-            let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            activate(&mut app, id, &Value::Null);
-            let dialog = app.ui.dialog.as_ref().map(|d| d.id.clone());
-            assert_eq!(dialog.as_deref(), Some(format!("cmd:{id}").as_str()), "{id} opens its dialog");
-        }
-    }
-
-    #[test]
-    fn pdf_export_menu_item_opens_the_dialog_or_exports() {
-        // No params: the menu item opens the options dialog.
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        activate(&mut app, "app.exportPdf", &Value::Null);
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("pdfExport"));
-        // Explicit options: programmatic callers still export directly, opening no dialog.
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        activate(&mut app, "app.exportPdf", &json!({"path": "/tmp/x.pdf"}));
-        assert!(app.ui.dialog.is_none());
-    }
-
-    #[test]
-    fn snap_preferences_are_a_command() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let r = run_ui(&mut app, "view.snapPreferences", &json!({"smartSpacing": false, "zone": 8})).unwrap().unwrap();
-        assert_eq!(r["smartSpacing"], false);
-        assert_eq!(r["alignEdges"], true, "unnamed switches keep their value");
-        assert_eq!(r["zone"], 8.0);
-        assert!(!app.ui.smart_spacing && (app.ui.snap_zone - 8.0).abs() < 1e-9);
-        let r = run_ui(&mut app, "view.snapPreferences", &json!({"zone": -3})).unwrap().unwrap();
-        assert_eq!(r["zone"], 0.0, "a negative zone turns snapping off");
-    }
-
-    #[test]
-    fn custom_shortcuts_override_defaults() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        assert_eq!(shortcut_of(&app, "app.preferences").as_deref(), Some("Cmd+K"));
-        let r = run_ui(&mut app, "window.setShortcut", &json!({"id": "app.preferences", "shortcut": "Cmd+Alt+Shift+9"})).unwrap().unwrap();
-        assert_eq!(r["shortcut"], "Cmd+Alt+Shift+9");
-        assert!(effective_shortcuts(&app).contains(&("app.preferences".into(), "Cmd+Alt+Shift+9".into())));
-        // Taking another command's keys reports the conflict.
-        let r = run_ui(&mut app, "window.setShortcut", &json!({"id": "app.palette", "shortcut": "Cmd+Alt+Shift+9"})).unwrap().unwrap();
-        assert_eq!(r["conflicts"], json!(["app.preferences"]));
-        run_ui(&mut app, "window.setShortcut", &json!({"id": "app.palette", "shortcut": ""})).unwrap().unwrap();
-        assert_eq!(shortcut_of(&app, "app.palette"), None);
-        assert!(run_ui(&mut app, "window.setShortcut", &json!({"id": "app.palette", "shortcut": "Cmd+Nope"})).unwrap().is_err());
-        run_ui(&mut app, "window.resetShortcuts", &json!({})).unwrap().unwrap();
-        // ⌘N is the New Document dialog, not a bare file.new.
-        let first_cmd_n = effective_shortcuts(&app).into_iter().find(|(_, s)| s == "Cmd+N").map(|(i, _)| i);
-        assert_eq!(first_cmd_n.as_deref(), Some("app.newDocumentDialog"));
-        assert_eq!(shortcut_of(&app, "app.palette").as_deref(), Some("Cmd+Return"));
-        assert_eq!(shortcut_string(egui::Modifiers { command: true, shift: true, ..Default::default() }, egui::Key::K), "Cmd+Shift+K");
-        if cfg!(target_os = "macos") {
-            assert_eq!(shortcut_text("Cmd+Alt+3"), "⌥⌘3");
-            assert_eq!(shortcut_text("Cmd+Shift+."), "⇧⌘.");
-        } else {
-            assert_eq!(shortcut_text("Cmd+Alt+3"), "Alt+Ctrl+3");
-        }
-    }
-
-    #[test]
-    fn split_window_panes_have_their_own_views() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp| {
-            let input =
-                egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        frame(&mut app);
-        assert_eq!(run_ui(&mut app, "window.split", &json!({})).unwrap().unwrap(), json!(true));
-        frame(&mut app);
-        frame(&mut app);
-        // Both panes have a canvas, each half as wide.
-        let r0 = app.canvas_rect.unwrap();
-        let r1 = app.other_pane.as_ref().and_then(|o| o.1).unwrap();
-        assert!(r0.width() < 800.0 && r1.width() < 800.0 && (r0.center().x - r1.center().x).abs() > 300.0, "{r0:?} {r1:?}");
-        // Zooming the right pane leaves the left alone.
-        app.switch_pane(1);
-        let z0 = app.view().unwrap().zoom;
-        crate::canvas::set_zoom(&mut app, z0 * 3.0);
-        app.switch_pane(0);
-        assert!((app.view().unwrap().zoom - z0).abs() < 1e-9);
-        app.switch_pane(1);
-        assert!((app.view().unwrap().zoom - z0 * 3.0).abs() < 1e-6);
-        assert_eq!(run_ui(&mut app, "window.split", &json!({})).unwrap().unwrap(), json!(false));
-        assert_eq!(app.pane, 0);
-        frame(&mut app);
-    }
-
-    #[test]
-    fn split_window_dispatches_text_once_to_the_shared_document() {
-        for focus_pane in [0, 1] {
-            let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.run("file.new", json!({})).unwrap();
-            let made = app.run("frame.create", json!({"rect": [36, 36, 300, 200], "content": "text"})).unwrap();
-            let story = made["story"].as_u64().unwrap();
-            app.session.set_tool("type");
-            app.run("text.select", json!({"story": story, "anchor": 0, "focus": 0})).unwrap();
-            assert!(app.session.wants_text());
-            app.run("window.split", json!({"on": true})).unwrap();
-            app.focus_pane = focus_pane;
-
-            let ctx = egui::Context::default();
-            let frame = |app: &mut crate::DesignApp, events| {
-                let input = egui::RawInput {
-                    screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                    events,
-                    ..Default::default()
-                };
-                let mut out = ctx.run_ui(input, |ui| {
-                    app.logic(&ui.ctx().clone());
-                    app.ui(ui);
-                });
-                out.textures_delta.clear();
-            };
-            frame(&mut app, vec![]);
-            frame(&mut app, vec![]);
-            frame(&mut app, vec![]);
-            let undo_before = app.session.active().unwrap().history.undo.len();
-            frame(&mut app, vec![egui::Event::Text("A".into())]);
-            let text = app.run("story.get", json!({"story": story})).unwrap();
-            assert_eq!(text["text"], "A", "one key press with pane {focus_pane} focused");
-            assert_eq!(app.session.active().unwrap().history.undo.len(), undo_before + 1);
-            app.run("edit.undo", json!({})).unwrap();
-            assert_eq!(app.run("story.get", json!({"story": story})).unwrap()["text"], "");
-
-            // A press and key arriving together must use the newly focused pane, whichever
-            // canvas is drawn first. Middle-click changes pane focus without moving the caret.
-            let other = app.other_pane.as_ref().and_then(|p| p.1).unwrap().center();
-            frame(&mut app, vec![egui::Event::PointerMoved(other)]);
-            frame(
-                &mut app,
-                vec![
-                    egui::Event::PointerButton { pos: other, button: egui::PointerButton::Middle, pressed: true, modifiers: egui::Modifiers::NONE },
-                    egui::Event::Text("B".into()),
-                ],
-            );
-            assert_eq!(app.focus_pane, 1 - focus_pane);
-            assert_eq!(app.run("story.get", json!({"story": story})).unwrap()["text"], "B", "a key in the pane-switch frame is dispatched once");
-            assert_eq!(app.session.active().unwrap().history.undo.len(), undo_before + 1);
-        }
-    }
-
-    #[test]
-    fn split_window_click_focus_routes_menu_zoom_but_hover_scroll_stays_local() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("window.split", json!({"on": true})).unwrap();
-        let ctx = egui::Context::default();
-        let mut time = 0.0;
-        let mut frame = |app: &mut crate::DesignApp, events| {
-            time += 0.1;
-            let input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                time: Some(time),
-                events,
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        for _ in 0..3 {
-            frame(&mut app, vec![]);
-        }
-        let left = app.canvas_rect.unwrap().center();
-        let right = app.other_pane.as_ref().and_then(|p| p.1).unwrap().center();
-        let cameras = |app: &mut crate::DesignApp| {
-            let current = app.pane;
-            app.switch_pane(0);
-            let left = *app.view().unwrap();
-            app.switch_pane(1);
-            let right = *app.view().unwrap();
-            app.switch_pane(current);
-            [left, right]
-        };
-        let button =
-            |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };
-        frame(&mut app, vec![egui::Event::PointerMoved(right)]);
-        frame(&mut app, vec![button(right, true)]);
-        frame(&mut app, vec![button(right, false)]);
-        assert_eq!((app.pane, app.focus_pane), (1, 1));
-        let before = cameras(&mut app);
-        app.run("view.zoom", json!({"zoom": 2.0})).unwrap();
-        let zoomed = cameras(&mut app);
-        assert_eq!(zoomed[0], before[0], "menu zoom leaves the other camera alone");
-        assert!((zoomed[1].zoom - 2.0).abs() < 1e-9);
-
-        frame(&mut app, vec![egui::Event::PointerMoved(left)]);
-        frame(
-            &mut app,
-            vec![egui::Event::MouseWheel {
-                unit: egui::MouseWheelUnit::Point,
-                delta: egui::vec2(0.0, -40.0),
-                phase: egui::TouchPhase::Move,
-                modifiers: egui::Modifiers::NONE,
-            }],
-        );
-        let scrolled = cameras(&mut app);
-        assert_eq!(scrolled[1], zoomed[1], "hover scroll leaves the focused camera alone");
-        assert_ne!(scrolled[0].origin, zoomed[0].origin);
-        assert_eq!((app.pane, app.focus_pane), (1, 1), "hovering does not move menu focus");
-
-        frame(&mut app, vec![button(left, true)]);
-        frame(&mut app, vec![button(left, false)]);
-        assert_eq!((app.pane, app.focus_pane), (0, 0));
-        app.run("view.zoom", json!({"zoom": 1.0})).unwrap();
-        let final_views = cameras(&mut app);
-        assert!((final_views[0].zoom - 1.0).abs() < 1e-9);
-        assert_eq!(final_views[1], scrolled[1]);
-    }
-
-    #[test]
-    fn split_window_contextual_bars_have_independent_widget_ids() {
-        fn id_warnings(shape: &egui::Shape, found: &mut Vec<String>) {
-            match shape {
-                egui::Shape::Vec(shapes) => shapes.iter().for_each(|shape| id_warnings(shape, found)),
-                egui::Shape::Text(text) if text.galley.text().contains("use of widget ID") => found.push(text.galley.text().to_string()),
-                _ => {}
-            }
-        }
-
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        for rect in [[36, 36, 280, 180], [300, 36, 550, 180]] {
-            app.run("frame.create", json!({"rect": rect, "content": "unassigned"})).unwrap();
-        }
-        app.run("edit.selectAll", json!({})).unwrap();
-        app.run("window.split", json!({"on": true})).unwrap();
-        let ctx = egui::Context::default();
-        ctx.options_mut(|options| options.warn_on_id_clash = true);
-        let mut warnings = Vec::new();
-        for _ in 0..4 {
-            let input =
-                egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
-            let mut output = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            warnings.clear();
-            for shape in &output.shapes {
-                id_warnings(&shape.shape, &mut warnings);
-            }
-            output.textures_delta.clear();
-        }
-        assert!(warnings.is_empty(), "both bars reused the same interactive widget IDs: {warnings:?}");
-        let bars: Vec<_> =
-            (0_u8..2).map(|pane| ctx.memory(|memory| memory.area_rect(egui::Id::new(("task_bar", egui::ViewportId::ROOT, pane)))).unwrap()).collect();
-        assert!(!bars[0].intersects(bars[1]), "each pane keeps its own bar: {bars:?}");
-    }
-
-    #[test]
-    fn show_document_grid_toggles_from_the_grids_and_guides_menu() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let tree = menu_tree();
-        let mut items = vec![];
-        for (_, entries) in &tree {
-            walk(entries, &mut items);
-        }
-        assert!(items.iter().any(|(label, id, _)| id == "view.documentGrid" && label == "Show/Hide Document Grid"));
-        assert_eq!(shortcut_of(&app, "view.documentGrid").as_deref(), Some("Cmd+'"));
-        assert_eq!(checked(&app, "view.documentGrid", &json!({})), Some(false));
-        assert_eq!(run_ui(&mut app, "view.documentGrid", &json!({})).unwrap().unwrap(), json!(true));
-        assert!(app.ui.document_grid);
-        assert_eq!(checked(&app, "view.documentGrid", &json!({})), Some(true));
-        run_ui(&mut app, "view.documentGrid", &json!({})).unwrap().unwrap();
-        assert!(!app.ui.document_grid);
-    }
-
-    #[test]
-    fn interface_language_switches_and_validates() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        run_ui(&mut app, "app.language", &json!({"lang": "de"})).unwrap().unwrap();
-        assert_eq!(app.ui.language, "de");
-        assert_eq!(checked(&app, "app.language", &json!({"lang": "de"})), Some(true));
-        assert!(run_ui(&mut app, "app.language", &json!({"lang": "xx"})).unwrap().is_err());
-        assert_eq!(app.ui.language, "de");
-        // The language is set in Preferences, not from a menu; without `lang` the command opens it.
-        let mut items = Vec::new();
-        for (_, entries) in menu_tree() {
-            walk(&entries, &mut items);
-        }
-        assert!(!items.iter().any(|(_, id, _)| id == "app.language"), "no menu item sets the language");
-        run_ui(&mut app, "app.language", &json!({})).unwrap().unwrap();
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("preferences"));
-        assert_eq!(app.ui.language, "de");
-    }
-
-    #[test]
-    fn every_interface_language_is_selectable_persisted_and_keeps_document_data() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 4, "facingPages": true})).unwrap();
-        app.run("frame.create", json!({"rect": [36, 36, 200, 200], "content": "text", "text": "My words · Мої слова · Zażółć gęślą jaźń"})).unwrap();
-        let before = serde_json::to_value(&app.session.doc().unwrap().doc).unwrap();
-        for (code, _) in crate::i18n::LANGUAGES {
-            run_ui(&mut app, "app.language", &json!({"lang": code})).unwrap().unwrap();
-            assert_eq!(app.ui.language, *code);
-            assert_eq!(checked(&app, "app.language", &json!({"lang": code})), Some(true), "{code}");
-            assert_eq!(before, serde_json::to_value(&app.session.doc().unwrap().doc).unwrap(), "{code}");
-            let bytes = serde_json::to_vec(&app.ui).unwrap();
-            let restored: crate::UiState = serde_json::from_slice(&bytes).unwrap();
-            assert_eq!(restored.language, *code);
-        }
-    }
-
-    #[test]
-    fn arabic_dialog_and_language_switch_keep_finite_widget_geometry() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp| {
-            for _ in 0..4 {
-                let mut output = ctx.run_ui(
-                    egui::RawInput {
-                        screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1440.0, 900.0))),
-                        max_texture_side: Some(8192),
-                        ..Default::default()
-                    },
-                    |ui| {
-                        app.logic(&ui.ctx().clone());
-                        app.ui(ui);
-                    },
-                );
-                output.textures_delta.clear();
-            }
-        };
-        app.run("app.language", json!({"lang": "ar"})).unwrap();
-        frame(&mut app);
-        app.run("app.newDocumentDialog", json!({})).unwrap();
-        frame(&mut app); // egui asserts that all allocated rectangles are finite.
-        crate::dialogs::confirm(&mut app).unwrap();
-        frame(&mut app);
-        assert_eq!(app.session.documents().len(), 1);
-        for lang in ["uk", "ru", "zh", "", "ar", "pt-br", "it", "cs", "pl", "ka"] {
-            app.run("app.language", json!({"lang": lang})).unwrap();
-            frame(&mut app);
-        }
-    }
-
-    #[test]
-    fn story_direction_is_checked() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        app.session.execute("frame.create", &json!({"rect": [72, 72, 200, 400], "content": "text", "text": "縦", "vertical": true})).unwrap();
-        assert_eq!(checked(&app, "type.storyDirection", &json!({"vertical": true})), Some(true));
-        assert_eq!(checked(&app, "type.storyDirection", &json!({"vertical": false})), Some(false));
-    }
-
-    #[test]
-    fn proof_setup_and_colors() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        assert_eq!(checked(&app, "view.proofColors", &Value::Null), Some(false));
-        let r = run_ui(&mut app, "view.proofSetup", &json!({"target": "deuteranopia"})).unwrap().unwrap();
-        assert_eq!(r["on"], true);
-        assert_eq!(checked(&app, "view.proofSetup", &json!({"target": "deuteranopia"})), Some(true));
-        run_ui(&mut app, "view.proofSetup", &json!({"simulatePaper": "toggle"})).unwrap().unwrap();
-        assert!(app.ui.proof_setup.simulate_paper);
-        run_ui(&mut app, "view.proofColors", &json!({})).unwrap().unwrap();
-        assert!(!app.ui.proof_colors);
-        assert!(run_ui(&mut app, "view.proofSetup", &json!({"target": "nope"})).unwrap().is_err());
-    }
-
-    #[test]
-    fn lock_guides_and_lock_column_guides_are_checked_in_grids_and_guides() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let view = menu_ids("View");
-        assert!(view.contains(&"view.lockGuides") && view.contains(&"view.lockColumnGuides"));
-        assert_eq!(ui_label("view.lockGuides").and_then(|c| c.1), Some("Cmd+Alt+;"));
-        // Lock Guides: off at first, toggles, and `on` sets it.
-        assert_eq!(checked(&app, "view.lockGuides", &Value::Null), Some(false));
-        assert_eq!(app.run("view.lockGuides", json!({})).unwrap(), json!(true));
-        assert!(app.ui.guides_locked);
-        assert_eq!(app.run("view.lockGuides", json!({"on": true})).unwrap(), json!(true));
-        assert_eq!(checked(&app, "view.lockGuides", &Value::Null), Some(true));
-        assert_eq!(app.run("view.lockGuides", json!({"on": false})).unwrap(), json!(false));
-        // Lock Column Guides: the document's setting, on in new documents.
-        assert_eq!(checked(&app, "view.lockColumnGuides", &Value::Null), Some(true));
-        app.run("view.lockColumnGuides", json!({})).unwrap();
-        assert_eq!(checked(&app, "view.lockColumnGuides", &Value::Null), Some(false));
-    }
-
-    #[test]
-    fn fitting_has_indesigns_shortcuts() {
-        // LYH Studio episode 6 (7:00): "Fit Content to Frame (Ctrl + Shift + Alt + C)" fills the
-        // photo frames proportionally.
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let png = designcraft_render::Rendered { width: 40, height: 20, pixels: vec![200; 40 * 20 * 4] }.to_png();
-        let f = app.run("frame.create", json!({"rect": [100, 100, 300, 300]})).unwrap()["id"].as_u64().unwrap();
-        app.run("file.place", json!({"base64": designcraft_engine::cmd::base64_encode(&png), "name": "a.png", "frame": f})).unwrap();
-        app.run("selection.set", json!({"ids": [f]})).unwrap();
-        let width = |app: &crate::DesignApp| {
-            let it = app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(f)).unwrap().clone();
-            let designcraft_doc::Content::Graphic(g) = &it.content else { panic!("graphic") };
-            it.xf.transform_rect_bbox(g.xf.transform_rect_bbox(designcraft_geom::Rect::new(0.0, 0.0, g.size.0, g.size.1))).width()
-        };
-        for (id, keys) in [
-            ("fit.fillFrameProportionally", "Cmd+Alt+Shift+C"),
-            ("fit.contentProportionally", "Cmd+Alt+Shift+E"),
-            ("fit.frameToContent", "Cmd+Alt+C"),
-            ("fit.contentToFrame", "Cmd+Alt+E"),
-            ("fit.centerContent", "Cmd+Shift+E"),
-        ] {
-            assert_eq!(shortcut_of(&app, id).as_deref(), Some(keys));
-        }
-        let ctx = egui::Context::default();
-        let press = |app: &mut crate::DesignApp, key: egui::Key| {
-            let modifiers =
-                egui::Modifiers { alt: true, ctrl: !cfg!(target_os = "macos"), shift: true, mac_cmd: cfg!(target_os = "macos"), command: true };
-            let input = egui::RawInput {
-                events: vec![egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers }],
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| shortcuts(app, &ui.ctx().clone()));
-            out.textures_delta.clear();
-        };
-        press(&mut app, egui::Key::C);
-        assert!((width(&app) - 400.0).abs() < 1e-6, "filled: {}", width(&app));
-        press(&mut app, egui::Key::E);
-        assert!((width(&app) - 200.0).abs() < 1e-6, "fitted: {}", width(&app));
-    }
-
-    #[test]
-    fn tab_and_presentation_hide_floating_panels_too() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp| {
-            for _ in 0..2 {
-                let input = egui::RawInput {
-                    screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                    ..Default::default()
-                };
-                let mut out = ctx.run_ui(input, |ui| {
-                    app.logic(&ui.ctx().clone());
-                    app.ui(ui);
-                });
-                out.textures_delta.clear();
-            }
-        };
-        // The icon column's flyout (the classic dock) and a floating panel group (the docking layout).
-        let flyout = egui::LayerId::new(egui::Order::Foreground, egui::Id::new("panel_flyout"));
-        let group = egui::LayerId::new(egui::Order::Middle, egui::Id::new("designcraft-panel-docking").with(("floating", "preflight")));
-        let shown = |layer: egui::LayerId| ctx.memory(|m| m.areas().is_visible(&layer));
-        let toggles = [
-            ("window.hidePanels", json!({}), json!({})),
-            ("window.hidePanelsExceptTools", json!({}), json!({})),
-            ("view.screenMode", json!({"mode": "presentation"}), json!({"mode": "normal"})),
-        ];
-        app.run("window.panel", json!({"panel": "preflight"})).unwrap();
-        frame(&mut app);
-        assert!(app.ui.docking.is_none() && shown(flyout));
-        for (id, hide, show) in &toggles {
-            app.run(id, hide.clone()).unwrap();
-            frame(&mut app);
-            assert!(!shown(flyout), "{id} hides the flyout");
-            app.run(id, show.clone()).unwrap();
-            frame(&mut app);
-            assert!(shown(flyout), "{id} again brings it back");
-        }
-        app.run("window.floatPanel", json!({"panel": "preflight", "x": 400, "y": 200})).unwrap();
-        frame(&mut app);
-        assert!(app.ui.docking.is_some() && shown(group));
-        for (id, hide, show) in &toggles {
-            app.run(id, hide.clone()).unwrap();
-            frame(&mut app);
-            assert!(!shown(group), "{id} hides the floating panel");
-            app.run(id, show.clone()).unwrap();
-            frame(&mut app);
-            assert!(shown(group), "{id} again brings it back");
-        }
-    }
-
-    #[test]
-    fn tab_hides_panels_and_documents_cycle() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        assert_eq!(shortcut_of(&app, "window.hidePanels").as_deref(), Some("Tab"));
-        run_ui(&mut app, "window.hidePanels", &json!({})).unwrap().unwrap();
-        assert_eq!(app.ui.hidden_panels, 1);
-        run_ui(&mut app, "window.hidePanelsExceptTools", &json!({})).unwrap().unwrap();
-        assert_eq!(app.ui.hidden_panels, 2);
-        run_ui(&mut app, "window.hidePanelsExceptTools", &json!({})).unwrap().unwrap();
-        assert_eq!(app.ui.hidden_panels, 0);
-        for _ in 0..3 {
-            app.session.execute("file.new", &json!({})).unwrap();
-        }
-        assert_eq!(app.session.active_index(), Some(2));
-        run_ui(&mut app, "window.nextDocument", &json!({})).unwrap().unwrap();
-        assert_eq!(app.session.active_index(), Some(0));
-        run_ui(&mut app, "window.previousDocument", &json!({})).unwrap().unwrap();
-        assert_eq!(app.session.active_index(), Some(2));
-    }
-
-    #[test]
-    fn rotate_spread_view() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({"pages": 3})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp| {
-            let input =
-                egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        frame(&mut app);
-        frame(&mut app);
-        assert_eq!(run_ui(&mut app, "view.rotateSpread", &json!({"angle": 90})).unwrap().unwrap(), json!(90));
-        frame(&mut app);
-        // Only the spread in view turns: its canvas footprint swaps width and height.
-        let d = app.session.active().unwrap().doc.clone();
-        let turned: Vec<usize> = d.spreads.iter().enumerate().filter(|(_, sp)| sp.pages[0].view_rotation == 1).map(|(i, _)| i).collect();
-        assert_eq!(turned.len(), 1);
-        let layout = designcraft_tools::CanvasLayout::new(&d, false);
-        let slot = layout.slots[turned[0]];
-        let b = d.spreads[turned[0]].bounds();
-        assert!((slot.bounds.width() - b.height()).abs() < 1e-6 && (slot.bounds.height() - b.width()).abs() < 1e-6);
-        assert_eq!(checked(&app, "view.rotateSpread", &json!({"angle": 0})), Some(false));
-        run_ui(&mut app, "view.rotateSpread", &json!({"angle": 0})).unwrap().unwrap();
-        assert_eq!(checked(&app, "view.rotateSpread", &json!({"angle": 0})), Some(true));
-        frame(&mut app);
-    }
-
-    #[test]
-    fn hand_tool_hold_starts_power_zoom() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp, t: f64, events: Vec<egui::Event>| {
-            let input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                time: Some(t),
-                events,
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        frame(&mut app, 0.0, vec![]);
-        frame(&mut app, 0.05, vec![]);
-        app.select_tool("hand");
-        let r = app.canvas_rect.unwrap();
-        let p = r.center();
-        let z0 = app.view().unwrap().zoom;
-        frame(&mut app, 0.1, vec![egui::Event::PointerMoved(p)]);
-        frame(
-            &mut app,
-            0.2,
-            vec![egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() }],
-        );
-        frame(&mut app, 0.4, vec![]);
-        assert!(app.power_zoom.is_none(), "not yet");
-        frame(&mut app, 0.8, vec![]);
-        assert!(app.power_zoom.is_some(), "holding still starts Power Zoom");
-        frame(
-            &mut app,
-            0.9,
-            vec![egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() }],
-        );
-        assert!(app.power_zoom.is_none());
-        assert!((app.view().unwrap().zoom - z0).abs() < 1e-9, "back at the zoom it started from");
-    }
-
-    #[test]
-    fn middle_drag_pans_with_any_tool() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
-            let input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                events,
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        frame(&mut app, vec![]);
-        frame(&mut app, vec![]);
-        // A drawing tool: a primary drag would make a frame, a middle drag must not.
-        app.select_tool("rectangleFrame");
-        let p = app.canvas_rect.unwrap().center();
-        let v0 = *app.view().unwrap();
-        let items = |app: &crate::DesignApp| app.session.active().unwrap().doc.spreads.iter().map(|s| s.items.len()).sum::<usize>();
-        let items0 = items(&app);
-        let button = |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Middle, pressed, modifiers: Default::default() };
-        frame(&mut app, vec![egui::Event::PointerMoved(p), button(p, true)]);
-        for i in 1..=8 {
-            frame(&mut app, vec![egui::Event::PointerMoved(p + egui::vec2(10.0 * i as f32, 5.0 * i as f32))]);
-        }
-        frame(&mut app, vec![button(p + egui::vec2(80.0, 40.0), false)]);
-        let v = *app.view().unwrap();
-        assert!((v.zoom - v0.zoom).abs() < 1e-9, "panning keeps the zoom");
-        assert!(v.origin.x < v0.origin.x && v.origin.y < v0.origin.y, "dragging right/down moves the view: {v0:?} -> {v:?}");
-        assert_eq!(items(&app), items0, "the tool saw nothing");
-    }
-
-    #[test]
-    fn layout_menu_goes_through_pages_and_spreads_with_their_shortcuts() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({"pages": 7, "facingPages": true})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
-            let input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                events,
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        let key = |k: egui::Key, modifiers: egui::Modifiers| {
-            vec![
-                egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers },
-                egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers },
-            ]
-        };
-        let page = |app: &crate::DesignApp| crate::canvas::current_page(app).unwrap();
-        let spread = |app: &crate::DesignApp| {
-            let st = app.session.active().unwrap();
-            crate::canvas::current_slot(app, &designcraft_tools::layout::CanvasLayout::new(&st.doc, false)).unwrap()
-        };
-        frame(&mut app, vec![]);
-        frame(&mut app, vec![]);
-        // The Layout menu lists them, as InDesign's does, before Go to Page.
-        let layout = MENUS.iter().find(|m| m.0 == "Layout").unwrap().1;
-        let at = |id: &str| layout.iter().position(|e| e.starts_with(&format!("ui:{id}"))).unwrap();
-        assert!(at("view.firstPage") < at("view.previousPage"));
-        assert!(at("view.previousPage") < at("view.nextPage"));
-        assert!(at("view.nextPage") < at("view.lastPage"));
-        assert!(at("view.lastPage") < at("view.nextSpread"));
-        assert!(at("view.nextSpread") < at("view.previousSpread"));
-        assert!(at("view.previousSpread") < at("view.goToPage"));
-        let shift = egui::Modifiers::SHIFT;
-        let cmd_shift = egui::Modifiers { shift: true, command: true, ctrl: true, ..Default::default() };
-        let alt = egui::Modifiers::ALT;
-        // Pages 1 | 2-3 | 4-5 | 6-7.
-        frame(&mut app, key(egui::Key::PageDown, shift));
-        assert_eq!(page(&app), 1, "Next Page");
-        frame(&mut app, key(egui::Key::PageDown, shift));
-        assert_eq!(page(&app), 2, "Next Page goes to the right page of the spread");
-        frame(&mut app, key(egui::Key::PageUp, shift));
-        assert_eq!(page(&app), 1, "Previous Page");
-        frame(&mut app, key(egui::Key::PageDown, cmd_shift));
-        assert_eq!(page(&app), 6, "Last Page");
-        frame(&mut app, key(egui::Key::PageDown, shift));
-        assert_eq!(page(&app), 6, "Next Page stops at the last page");
-        frame(&mut app, key(egui::Key::PageUp, cmd_shift));
-        assert_eq!(page(&app), 0, "First Page");
-        frame(&mut app, key(egui::Key::PageUp, shift));
-        assert_eq!(page(&app), 0, "Previous Page stops at the first page");
-        frame(&mut app, key(egui::Key::PageDown, alt));
-        assert_eq!(spread(&app), 1, "Next Spread");
-        frame(&mut app, key(egui::Key::PageDown, alt));
-        frame(&mut app, key(egui::Key::PageDown, alt));
-        frame(&mut app, key(egui::Key::PageDown, alt));
-        assert_eq!(spread(&app), 3, "Next Spread stops at the last spread");
-        frame(&mut app, key(egui::Key::PageUp, alt));
-        assert_eq!(spread(&app), 2, "Previous Spread");
-        // The spread is centred, the zoom kept.
-        let zoom = app.view().unwrap().zoom;
-        app.run("view.previousSpread", json!({})).unwrap();
-        let st = app.session.active().unwrap();
-        let slot = designcraft_tools::layout::CanvasLayout::new(&st.doc, false).slots[1];
-        let (v, r) = (*app.view().unwrap(), app.canvas_rect.unwrap());
-        let centre = (v.origin.x + r.width() as f64 / 2.0 / v.zoom, v.origin.y + r.height() as f64 / 2.0 / v.zoom);
-        assert!((centre.0 - slot.bounds.center().x).abs() < 1e-6 && (centre.1 - slot.bounds.center().y).abs() < 1e-6);
-        assert_eq!(v.zoom, zoom);
-    }
-
-    #[test]
-    fn presentation_shows_one_spread_and_goes_through_them_with_keys_and_clicks() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({"pages": 7, "facingPages": true})).unwrap();
-        app.session.execute("frame.create", &json!({"rect": [100, 100, 300, 300]})).unwrap();
-        let id = app.session.active().unwrap().selection.items[0];
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
-            let input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                events,
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        let key = |k: egui::Key| {
-            vec![
-                egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() },
-                egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers: Default::default() },
-            ]
-        };
-        let click = |pos: egui::Pos2, modifiers: egui::Modifiers| {
-            vec![
-                egui::Event::PointerMoved(pos),
-                egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: true, modifiers },
-                egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: false, modifiers },
-            ]
-        };
-        let spread = |app: &crate::DesignApp| {
-            let st = app.session.active().unwrap();
-            crate::canvas::current_slot(app, &designcraft_tools::layout::CanvasLayout::new(&st.doc, false)).unwrap()
-        };
-        // The spread fills the screen: as wide or as tall as it, centred.
-        let fills = |app: &crate::DesignApp| {
-            let st = app.session.active().unwrap();
-            let b = designcraft_tools::layout::CanvasLayout::new(&st.doc, false).slots[spread(app)].bounds;
-            let (v, r) = (*app.view().unwrap(), app.canvas_rect.unwrap());
-            let (w, h) = (b.width() * v.zoom, b.height() * v.zoom);
-            let x0 = (b.x0 - v.origin.x) * v.zoom;
-            let y0 = (b.y0 - v.origin.y) * v.zoom;
-            ((w - r.width() as f64).abs() < 0.01 || (h - r.height() as f64).abs() < 0.01)
-                && w <= r.width() as f64 + 0.01
-                && h <= r.height() as f64 + 0.01
-                && (x0 * 2.0 + w - r.width() as f64).abs() < 0.01
-                && (y0 * 2.0 + h - r.height() as f64).abs() < 0.01
-        };
-        frame(&mut app, vec![]);
-        frame(&mut app, vec![]);
-        // The user's own view (zoomed in, scrolled) comes back after Presentation.
-        let view = app.view_mut().unwrap();
-        view.zoom = 2.0;
-        view.origin.x += 150.0;
-        view.origin.y += 300.0;
-        let before = *app.view().unwrap();
-        app.run("view.screenMode", json!({"mode": "presentation"})).unwrap();
-        frame(&mut app, vec![]);
-        frame(&mut app, vec![]);
-        assert_eq!(app.canvas_rect.unwrap().size(), egui::vec2(1400.0, 900.0), "the whole window");
-        assert_eq!(spread(&app), 0);
-        assert!(fills(&app));
-        let bounds = app.session.active().unwrap().doc.item(id).unwrap().bounds();
-        frame(&mut app, key(egui::Key::ArrowRight));
-        frame(&mut app, vec![]);
-        assert_eq!(spread(&app), 1, "Right Arrow shows the next spread");
-        assert!(fills(&app));
-        assert_eq!(app.session.active().unwrap().doc.item(id).unwrap().bounds(), bounds, "the arrow doesn't nudge the selection");
-        frame(&mut app, key(egui::Key::PageDown));
-        assert_eq!(spread(&app), 2, "Page Down");
-        frame(&mut app, key(egui::Key::ArrowLeft));
-        assert_eq!(spread(&app), 1, "Left Arrow");
-        frame(&mut app, key(egui::Key::End));
-        assert_eq!(spread(&app), 3, "End");
-        frame(&mut app, key(egui::Key::ArrowRight));
-        assert_eq!(spread(&app), 3, "the last spread stays");
-        frame(&mut app, key(egui::Key::Home));
-        assert_eq!(spread(&app), 0, "Home");
-        frame(&mut app, key(egui::Key::PageUp));
-        assert_eq!(spread(&app), 0, "the first spread stays");
-        let c = app.canvas_rect.unwrap().center();
-        frame(&mut app, click(c, egui::Modifiers::NONE));
-        frame(&mut app, vec![]);
-        assert_eq!(spread(&app), 1, "a click shows the next spread");
-        assert!(fills(&app));
-        frame(&mut app, click(c, egui::Modifiers::SHIFT));
-        frame(&mut app, vec![]);
-        assert_eq!(spread(&app), 0, "Shift-click the previous one");
-        assert_eq!(app.session.active().unwrap().selection.items, vec![id], "clicks don't select");
-        assert_eq!(app.session.tool_id(), "selection");
-        // Out of Presentation, the view is the one it was entered from, and the arrow keys nudge
-        // again.
-        app.run("view.screenMode", json!({"mode": "normal"})).unwrap();
-        assert_eq!(*app.view().unwrap(), before);
-        frame(&mut app, vec![]);
-        frame(&mut app, key(egui::Key::ArrowRight));
-        assert_ne!(app.session.active().unwrap().doc.item(id).unwrap().bounds(), bounds);
-    }
-
-    #[test]
-    fn tool_shortcuts_work_after_drawing_on_the_canvas() {
-        // Clicking the canvas gives it keyboard focus; single-key tool shortcuts must still switch
-        // tools without pressing Esc first (#1).
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
-            let input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                events,
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        let key = |k: egui::Key| {
-            vec![
-                egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() },
-                egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers: Default::default() },
-            ]
-        };
-        let button = |pos: egui::Pos2, pressed: bool| egui::Event::PointerButton {
-            pos,
-            button: egui::PointerButton::Primary,
-            pressed,
-            modifiers: Default::default(),
-        };
-        frame(&mut app, vec![]);
-        frame(&mut app, vec![]);
-        frame(&mut app, key(egui::Key::F));
-        assert_eq!(app.session.tool_id(), "rectangleFrame");
-        // Draw a frame.
-        let a = app.canvas_rect.unwrap().center();
-        let b = a + egui::vec2(120.0, 80.0);
-        frame(&mut app, vec![egui::Event::PointerMoved(a), button(a, true)]);
-        for i in 1..=4 {
-            frame(&mut app, vec![egui::Event::PointerMoved(a + (b - a) * (i as f32 / 4.0))]);
-        }
-        frame(&mut app, vec![button(b, false)]);
-        frame(&mut app, vec![]);
-        assert!(app.session.active().is_some_and(|d| !d.selection.items.is_empty()), "drew a frame");
-        frame(&mut app, key(egui::Key::V));
-        assert_eq!(app.session.tool_id(), "selection", "V switches tools straight after drawing");
-        frame(&mut app, key(egui::Key::F));
-        assert_eq!(app.session.tool_id(), "rectangleFrame");
-    }
-
-    #[test]
-    fn escape_and_shift_w_leave_presentation_for_the_previous_mode() {
-        // Presentation hides every control, so the keyboard must get out of it (#493).
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "graphic"})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
-            let input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                events,
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        let key = |k: egui::Key, modifiers: egui::Modifiers| {
-            vec![
-                egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers },
-                egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers },
-            ]
-        };
-        let selected = |app: &crate::DesignApp| app.session.active().map(|d| d.selection.items.len()).unwrap_or(0);
-        frame(&mut app, vec![]);
-        frame(&mut app, vec![]);
-        app.run("view.screenMode", json!({"mode": "preview"})).unwrap();
-        app.select_tool("rectangleFrame");
-        assert_eq!(selected(&app), 1, "the new frame is selected");
-
-        frame(&mut app, key(egui::Key::W, egui::Modifiers::SHIFT));
-        assert_eq!(app.ui.screen_mode, ScreenMode::Presentation, "Shift+W enters Presentation");
-        assert_eq!(app.session.tool_id(), "rectangleFrame", "Shift+W is not a tool shortcut");
-        frame(&mut app, key(egui::Key::Escape, egui::Modifiers::NONE));
-        assert_eq!(app.ui.screen_mode, ScreenMode::Preview, "Esc returns to the mode Presentation was entered from");
-        assert_eq!(app.session.tool_id(), "rectangleFrame", "Esc only left Presentation");
-        assert_eq!(selected(&app), 1, "Esc only left Presentation");
-
-        frame(&mut app, key(egui::Key::W, egui::Modifiers::SHIFT));
-        frame(&mut app, key(egui::Key::W, egui::Modifiers::SHIFT));
-        assert_eq!(app.ui.screen_mode, ScreenMode::Preview, "Shift+W leaves Presentation for the previous mode");
-
-        app.run("view.screenMode", json!({"mode": "presentation"})).unwrap();
-        frame(&mut app, key(egui::Key::W, egui::Modifiers::NONE));
-        assert_eq!(app.ui.screen_mode, ScreenMode::Normal, "W from any mode but Normal goes to Normal");
-
-        // Outside Presentation, Esc keeps its usual meaning.
-        frame(&mut app, key(egui::Key::Escape, egui::Modifiers::NONE));
-        assert_eq!(app.ui.screen_mode, ScreenMode::Normal);
-        assert_eq!(app.session.tool_id(), "selection");
-    }
-
-    #[test]
-    fn cmd_plus_zooms_the_canvas_not_the_window() {
-        // A German keyboard has its own + key, so Cmd+= arrives as Plus; it must zoom the canvas like
-        // Cmd+- does, not hand the key to egui's whole-window zoom.
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
-            let input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                events,
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        let key = |k: egui::Key, modifiers: egui::Modifiers| {
-            vec![
-                egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers },
-                egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers },
-            ]
-        };
-        frame(&mut app, vec![]);
-        frame(&mut app, vec![]);
-        let scale = ctx.zoom_factor();
-        for (k, m, zooms_in) in [
-            (egui::Key::Plus, egui::Modifiers::COMMAND, true),
-            (egui::Key::Plus, egui::Modifiers::COMMAND | egui::Modifiers::SHIFT, true),
-            (egui::Key::Equals, egui::Modifiers::COMMAND, true),
-            (egui::Key::Minus, egui::Modifiers::COMMAND, false),
-        ] {
-            let z0 = app.view().unwrap().zoom;
-            frame(&mut app, key(k, m));
-            frame(&mut app, vec![]);
-            let z = app.view().unwrap().zoom;
-            assert!(if zooms_in { z > z0 } else { z < z0 }, "{k:?} {m:?}: {z0} -> {z}");
-            assert_eq!(ctx.zoom_factor(), scale, "{k:?} {m:?} leaves the UI scale alone");
-        }
-        // With a native menu (macOS) its accelerator takes Cmd+= itself, but never sees the Plus key
-        // standing in for = (#781).
-        app.native_shortcuts.insert("view.zoomIn".to_string());
-        for (k, m, zooms_in) in [
-            (egui::Key::Plus, egui::Modifiers::COMMAND, true),
-            (egui::Key::Plus, egui::Modifiers::COMMAND | egui::Modifiers::SHIFT, true),
-            (egui::Key::Equals, egui::Modifiers::COMMAND, false),
-        ] {
-            let z0 = app.view().unwrap().zoom;
-            frame(&mut app, key(k, m));
-            frame(&mut app, vec![]);
-            let z = app.view().unwrap().zoom;
-            assert_eq!(z > z0, zooms_in, "native menu, {k:?} {m:?}: {z0} -> {z}");
-        }
-        // A shortcut the user set runs here until the native menu bar carries it as its key
-        // equivalent; then only the bar runs it, once.
-        run_ui(&mut app, "window.setShortcut", &json!({"id": "view.zoomOut", "shortcut": "Cmd+9"})).unwrap().unwrap();
-        for (native, zooms_out) in [(false, true), (true, false)] {
-            if native {
-                app.native_shortcuts.insert("view.zoomOut".to_string());
-            }
-            let z0 = app.view().unwrap().zoom;
-            frame(&mut app, key(egui::Key::Num9, egui::Modifiers::COMMAND));
-            frame(&mut app, vec![]);
-            let z = app.view().unwrap().zoom;
-            assert_eq!(z < z0, zooms_out, "native {native}: {z0} -> {z}");
-        }
-    }
-
-    #[test]
-    fn the_quick_apply_shortcut_opens_it_without_running_an_entry() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
-            let input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                events,
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        let cmd_return =
-            |pressed| egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed, repeat: false, modifiers: egui::Modifiers::COMMAND };
-        frame(&mut app, vec![]);
-        frame(&mut app, vec![]);
-        frame(&mut app, vec![cmd_return(true), cmd_return(false)]);
-        frame(&mut app, vec![]);
-        assert_eq!(app.ui.palette.as_deref(), Some(""), "Quick Apply stays open");
-        assert_eq!(app.session.documents().len(), 1, "the first entry (New Document) didn't run");
-        // Pressing the shortcut again, or holding it until it repeats, doesn't run it either.
-        frame(&mut app, vec![cmd_return(true), cmd_return(false)]);
-        let repeat = egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: true, modifiers: egui::Modifiers::COMMAND };
-        frame(&mut app, vec![repeat, cmd_return(false)]);
-        assert_eq!(app.ui.palette.as_deref(), Some(""), "Quick Apply stays open");
-        assert_eq!(app.session.documents().len(), 1, "a second ⌘Return or a repeat doesn't run the first entry");
-        // A plain Return still does.
-        let enter =
-            |pressed| egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed, repeat: false, modifiers: egui::Modifiers::NONE };
-        frame(&mut app, vec![enter(true), enter(false)]);
-        assert_eq!(app.ui.palette, None, "Return runs the first entry and closes Quick Apply");
-        assert_eq!(app.session.documents().len(), 2);
-    }
-
-    #[test]
-    fn quick_apply_rows_are_left_aligned() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        app.ui.palette = Some(String::new());
-        let ctx = egui::Context::default();
-        let mut shapes = Vec::new();
-        for _ in 0..3 {
-            let input =
-                egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-            shapes = out.shapes;
-        }
-        let label_x = |label: &str| {
-            // The palette is painted last, over anything else with the same text.
-            shapes.iter().rev().find_map(|s| match &s.shape {
-                egui::Shape::Text(t) if t.galley.text() == label => Some(t.pos.x),
-                _ => None,
-            })
-        };
-        // Rows that show a shortcut or a style kind, and rows that show neither, among the first visible ones.
-        let items = quick_apply_items(&app.session, "", false);
-        let first = items.iter().take(10);
-        let plain = first.clone().find(|it| it.shortcut.is_none() && it.kind.is_empty()).expect("a row without a shortcut");
-        let with_sc = first.clone().find(|it| it.shortcut.is_some()).expect("a row with a shortcut");
-        let (a, b) = (label_x(&plain.label).expect("plain row drawn"), label_x(&with_sc.label).expect("shortcut row drawn"));
-        assert!((a - b).abs() < 0.5, "{:?} at x {a}, {:?} at x {b}", plain.label, with_sc.label);
-    }
-
-    #[test]
-    fn copy_and_paste_keys_work_for_objects_without_a_native_menu() {
-        // Without a native menu the paste key arrives only as a paste event, which needs text on
-        // the system clipboard (#164, #185).
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
-            let input = egui::RawInput {
-                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-                events,
-                ..Default::default()
-            };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-            out.platform_output.commands
-        };
-        let count = |app: &crate::DesignApp| app.session.active().unwrap().doc.spreads[0].items.len();
-        frame(&mut app, vec![]);
-        frame(&mut app, vec![]);
-        let id = app.session.execute("frame.create", &json!({"rect": [72, 72, 200, 160]})).unwrap()["id"].clone();
-        app.session.execute("selection.set", &json!({"ids": [id]})).unwrap();
-        let n = count(&app);
-        let copied = frame(&mut app, vec![egui::Event::Copy])
-            .into_iter()
-            .find_map(|c| match c {
-                egui::OutputCommand::CopyText(t) => Some(t),
-                _ => None,
-            })
-            .expect("copying objects puts text on the system clipboard");
-        assert!(!copied.is_empty());
-        frame(&mut app, vec![egui::Event::Paste(copied.clone())]);
-        assert_eq!(count(&app), n + 1, "the paste key pastes the copied rectangle");
-
-        // Pasting into text anchors the copied object; the clipboard placeholder isn't typed.
-        let r = app.session.execute("frame.create", &json!({"rect": [72, 300, 400, 400], "content": "text", "text": "Hello"})).unwrap();
-        let story = r["story"].as_u64().unwrap();
-        app.session.execute("tool.select", &json!({"tool": "type"})).unwrap();
-        app.session.execute("text.select", &json!({"story": story, "anchor": 5, "focus": 5})).unwrap();
-        frame(&mut app, vec![egui::Event::Paste(copied.clone())]);
-        // Shift pastes without formatting.
-        frame(&mut app, vec![egui::Event::ModifiersChanged(egui::Modifiers::SHIFT), egui::Event::Paste(copied)]);
-        let text = app.session.active().unwrap().doc.story(designcraft_doc::StoryId(story)).unwrap().text.clone();
-        assert!(text.starts_with("Hello") && !text.contains('\u{FFFC}'), "{text:?}");
-        assert!(text.contains(designcraft_doc::OBJECT_MARK), "{text:?}");
-    }
-
-    #[test]
-    fn paste_with_no_insertion_point_makes_a_text_frame_from_other_apps_text() {
-        // #518: text copied in another app pastes as a new, selected text frame; the text an
-        // object copy stands for still pastes the objects. One paste each way, with and without
-        // a native menu.
-        let selected_text = |app: &crate::DesignApp| {
-            let d = app.session.active().unwrap();
-            let it = d.doc.item(*d.selection.items.first()?)?;
-            Some(d.doc.story(it.text_frame()?.story)?.text.clone())
-        };
-        let ctx = egui::Context::default();
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        native_frame(&mut app, &ctx, vec![], None);
-        native_frame(&mut app, &ctx, vec![], None);
-        // The paste keys without a native menu: a paste event.
-        native_frame(&mut app, &ctx, vec![egui::Event::Paste("From elsewhere".into())], None);
-        assert_eq!(document_items(&app), (1, 1), "pasted once");
-        assert_eq!(selected_text(&app).as_deref(), Some("From elsewhere"));
-        let id = app.session.execute("frame.create", &json!({"rect": [72, 72, 200, 160]})).unwrap()["id"].clone();
-        app.session.execute("selection.set", &json!({"ids": [id]})).unwrap();
-        let copied = native_frame(&mut app, &ctx, vec![egui::Event::Copy], None)
-            .platform_output
-            .commands
-            .into_iter()
-            .find_map(|c| match c {
-                egui::OutputCommand::CopyText(t) => Some(t),
-                _ => None,
-            })
-            .expect("copying objects puts text on the system clipboard");
-        native_frame(&mut app, &ctx, vec![egui::Event::Paste(copied)], None);
-        assert_eq!(document_items(&app), (3, 1));
-        assert_eq!(selected_text(&app), None, "the copied rectangle, not a text frame");
-
-        // A native menu: Paste reads the system clipboard.
-        let clip = std::rc::Rc::new(std::cell::RefCell::new(Some("Menu text".to_string())));
-        let read = clip.clone();
-        let services = crate::Services { clipboard_text: Some(Box::new(move || read.borrow().clone())), ..Default::default() };
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), services);
-        app.native_menu = true;
-        app.session.execute("file.new", &json!({})).unwrap();
-        native_frame(&mut app, &ctx, vec![], None);
-        native_frame(&mut app, &ctx, vec![], None);
-        native_frame(&mut app, &ctx, vec![], Some("edit.paste"));
-        native_frame(&mut app, &ctx, vec![], None);
-        assert_eq!(document_items(&app), (1, 1), "pasted once");
-        assert_eq!(selected_text(&app).as_deref(), Some("Menu text"));
-        // Objects copied since that text was copied paste as objects.
-        let id = app.session.execute("frame.create", &json!({"rect": [72, 72, 200, 160]})).unwrap()["id"].clone();
-        app.session.execute("selection.set", &json!({"ids": [id]})).unwrap();
-        native_frame(&mut app, &ctx, vec![], Some("edit.copy"));
-        native_frame(&mut app, &ctx, vec![], Some("edit.paste"));
-        assert_eq!(document_items(&app), (3, 1));
-        assert_eq!(selected_text(&app), None, "the copied rectangle, not a text frame");
-        // Newer text from another app wins.
-        *clip.borrow_mut() = Some("Newer".into());
-        native_frame(&mut app, &ctx, vec![], Some("edit.paste"));
-        assert_eq!(document_items(&app), (4, 1));
-        assert_eq!(selected_text(&app).as_deref(), Some("Newer"));
-    }
-
-    #[test]
-    fn sample_scripts_run() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        for (name, text) in app.ui.scripts.clone() {
-            let r = app.session.execute("script.run", &json!({"text": text}));
-            assert!(r.is_ok(), "{name}: {r:?}");
-        }
-    }
-
-    #[test]
-    fn new_window_shows_a_second_view() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        let ctx = egui::Context::default();
-        let frame = |app: &mut crate::DesignApp| {
-            let input =
-                egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-        };
-        frame(&mut app);
-        assert_eq!(run_ui(&mut app, "window.newWindow", &json!({})).unwrap().unwrap(), json!(true));
-        assert!(!app.split);
-        frame(&mut app);
-        frame(&mut app);
-        // Pane 1 was drawn (its rect is held for it) and has its own view.
-        assert!(app.other_pane.as_ref().and_then(|o| o.1).is_some() || app.pane == 1);
-        app.switch_pane(1);
-        assert!(app.view().is_some(), "the second window has a view");
-        app.switch_pane(0);
-        assert_eq!(checked(&app, "window.newWindow", &Value::Null), Some(true));
-        run_ui(&mut app, "window.newWindow", &json!({"on": false})).unwrap().unwrap();
-        frame(&mut app);
-    }
-
-    #[test]
-    fn panels_float_and_dock() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let r = run_ui(&mut app, "window.floatPanel", &json!({"panel": "swatches", "x": 50, "y": 60})).unwrap().unwrap();
-        assert_eq!(r["floating"], json!(["swatches"]));
-        assert_eq!(app.ui.floating[0].1, [50.0, 60.0]);
-        // Showing a floating panel doesn't also open its flyout.
-        run_ui(&mut app, "window.panel", &json!({"panel": "swatches"})).unwrap().unwrap();
-        assert_eq!(app.ui.open_panel, None);
-        run_ui(&mut app, "window.dockPanel", &json!({"panel": "swatches"})).unwrap().unwrap();
-        assert!(app.ui.floating.is_empty());
-        assert!(run_ui(&mut app, "window.floatPanel", &json!({"panel": "nope"})).unwrap().is_err());
-    }
-
-    /// One frame as the desktop app runs it: queued synthetic input, then the native menu item
-    /// chosen during the frame (`menu`), then the app's logic and ui.
-    fn native_frame(app: &mut crate::DesignApp, ctx: &egui::Context, events: Vec<egui::Event>, menu: Option<&str>) -> egui::FullOutput {
-        let mut input = egui::RawInput {
-            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
-            events,
-            ..Default::default()
-        };
-        app.raw_input_hook(&mut input);
-        let mut menu = menu;
-        let mut out = ctx.run_ui(input, |ui| {
-            let ctx = ui.ctx().clone();
-            if let Some(id) = menu.take() {
-                activate_native(app, &ctx, id, &Value::Null);
-            }
-            app.logic(&ctx);
-            app.ui(ui);
-        });
-        out.textures_delta.clear();
-        out
-    }
-
-    /// A document with two frames, nothing selected, and Quick Apply's search field focused
-    /// holding `text`.
-    fn app_with_focused_field(ctx: &egui::Context, text: &str) -> crate::DesignApp {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        app.session.execute("frame.create", &json!({"rect": [36, 36, 200, 200]})).unwrap();
-        app.session.execute("frame.create", &json!({"rect": [236, 36, 400, 200]})).unwrap();
-        app.session.execute("edit.deselectAll", &json!({})).unwrap();
-        app.ui.palette = Some(text.into());
-        for _ in 0..3 {
-            native_frame(&mut app, ctx, vec![], None);
-        }
-        assert!(ctx.text_edit_focused());
-        app
-    }
-
-    fn field_selection(ctx: &egui::Context) -> Option<(usize, usize)> {
-        let id = ctx.memory(|m| m.focused())?;
-        let r = egui::TextEdit::load_state(ctx, id)?.cursor.char_range()?;
-        Some((r.primary.index.min(r.secondary.index).into(), r.primary.index.max(r.secondary.index).into()))
-    }
-
-    fn document_items(app: &crate::DesignApp) -> (usize, usize) {
-        let d = app.session.active().unwrap();
-        (d.doc.spreads.iter().flat_map(|sp| &sp.items).count(), d.selection.items.len())
-    }
-
-    #[test]
-    fn native_select_all_selects_the_focused_fields_text() {
-        // The Mac menu bar takes ⌘A before the window sees it (#30).
-        let ctx = egui::Context::default();
-        let mut app = app_with_focused_field(&ctx, "frame");
-        native_frame(&mut app, &ctx, vec![], Some("edit.selectAll"));
-        native_frame(&mut app, &ctx, vec![], None);
-        assert_eq!(field_selection(&ctx), Some((0, 5)), "the field's whole text is selected");
-        assert_eq!(document_items(&app), (2, 0), "the document selection is unchanged");
-    }
-
-    #[test]
-    fn native_paste_and_copy_act_on_the_focused_field() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_focused_field(&ctx, "frame");
-        native_frame(&mut app, &ctx, vec![], Some("edit.selectAll"));
-        native_frame(&mut app, &ctx, vec![], None);
-        // Copy puts the field's selected text on the clipboard.
-        native_frame(&mut app, &ctx, vec![], Some("edit.copy"));
-        let out = native_frame(&mut app, &ctx, vec![], None);
-        assert!(out.platform_output.commands.contains(&egui::OutputCommand::CopyText("frame".into())), "{:?}", out.platform_output.commands);
-        // Paste asks the integration for the clipboard, which it hands to the field as a paste.
-        let out = native_frame(&mut app, &ctx, vec![], Some("edit.paste"));
-        let commands = &out.viewport_output[&egui::ViewportId::ROOT].commands;
-        assert!(commands.contains(&egui::ViewportCommand::RequestPaste), "{commands:?}");
-        native_frame(&mut app, &ctx, vec![egui::Event::Paste("text".into())], None);
-        assert_eq!(app.ui.palette.as_deref(), Some("text"));
-        assert_eq!(document_items(&app), (2, 0), "nothing was pasted into the document");
-    }
-
-    #[test]
-    fn native_copy_and_paste_use_the_system_clipboard_for_canvas_text() {
-        let ctx = egui::Context::default();
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.session.execute("file.new", &json!({})).unwrap();
-        app.session.execute("frame.create", &json!({"rect": [36, 36, 200, 200], "content": "text", "text": "hello"})).unwrap();
-        let story = *app.session.active().unwrap().doc.stories.keys().next().unwrap();
-        app.select_tool("type");
-        app.run("text.select", json!({"story": story.0, "anchor": 0, "focus": 5})).unwrap();
-        for _ in 0..3 {
-            native_frame(&mut app, &ctx, vec![], None);
-        }
-        assert!(app.session.wants_text());
-
-        native_frame(&mut app, &ctx, vec![], Some("edit.copy"));
-        let copied = native_frame(&mut app, &ctx, vec![], None);
-        assert!(copied.platform_output.commands.contains(&egui::OutputCommand::CopyText("hello".into())));
-
-        let paste = native_frame(&mut app, &ctx, vec![], Some("edit.paste"));
-        let commands = &paste.viewport_output[&egui::ViewportId::ROOT].commands;
-        assert!(commands.contains(&egui::ViewportCommand::RequestPaste), "{commands:?}");
-        native_frame(&mut app, &ctx, vec![egui::Event::Paste("world".into())], None);
-        assert_eq!(app.session.active().unwrap().doc.story(story).unwrap().text, "world");
-    }
-
-    #[test]
-    fn native_undo_and_redo_act_on_the_focused_field() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_focused_field(&ctx, "");
-        native_frame(&mut app, &ctx, vec![egui::Event::Text("abc".into())], None);
-        assert_eq!(app.ui.palette.as_deref(), Some("abc"));
-        native_frame(&mut app, &ctx, vec![], Some("edit.undo"));
-        native_frame(&mut app, &ctx, vec![], None);
-        assert_eq!(app.ui.palette.as_deref(), Some(""), "the field's typing is undone");
-        assert_eq!(document_items(&app), (2, 0), "the document's last frame is still there");
-        native_frame(&mut app, &ctx, vec![], Some("edit.redo"));
-        native_frame(&mut app, &ctx, vec![], None);
-        assert_eq!(app.ui.palette.as_deref(), Some("abc"));
-        assert_eq!(document_items(&app), (2, 0));
-    }
-
-    #[test]
-    fn native_editing_items_are_enabled_for_a_focused_field() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_focused_field(&ctx, "frame");
-        // Nothing is selected in the document, so its Copy and Cut are off; the field's are on.
-        assert!(!menu_enabled(&app, "edit.copy") && !menu_enabled(&app, "edit.cut"));
-        for id in ["edit.selectAll", "edit.copy", "edit.cut", "edit.paste", "edit.undo", "edit.redo"] {
-            assert!(native_menu_enabled(&app, &ctx, id), "{id}");
-        }
-        assert!(!native_menu_enabled(&app, &ctx, "edit.duplicate"), "other items follow the document");
-        app.ui.palette = None;
-        native_frame(&mut app, &ctx, vec![], None);
-        native_frame(&mut app, &ctx, vec![], None);
-        assert!(!native_menu_enabled(&app, &ctx, "edit.copy"), "without a focused field, as the document says");
-    }
-
-    #[test]
-    fn native_select_all_without_a_focused_field_selects_the_documents_items() {
-        let ctx = egui::Context::default();
-        let mut app = app_with_focused_field(&ctx, "frame");
-        app.ui.palette = None;
-        native_frame(&mut app, &ctx, vec![], None);
-        native_frame(&mut app, &ctx, vec![], None);
-        assert!(!ctx.text_edit_focused());
-        native_frame(&mut app, &ctx, vec![], Some("edit.selectAll"));
-        assert_eq!(document_items(&app), (2, 2));
-    }
-
-    #[test]
-    fn command_search_matches_labels_in_the_interface_language() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.ui.language = "de".into();
-        let label = crate::i18n::tr("de", "Group");
-        let items = command_search(&app, &label.to_lowercase());
-        let group = items.iter().find(|i| i.id == "object.group").unwrap();
-        assert_eq!(group.label, label);
-        assert_eq!(group.shortcut.as_deref(), Some("Cmd+G"));
-        assert!(command_search(&app, "group").iter().any(|i| i.id == "object.group"), "English labels match too");
-        assert!(command_search(&app, "  ").is_empty());
-        assert!(command_search(&app, "e").len() <= 14);
-    }
-
-    #[test]
-    fn quick_apply_lists_styles_then_commands() {
-        let mut s = designcraft_engine::Session::new();
-        s.execute("file.new", &json!({})).unwrap();
-        s.execute("style.paragraph.create", &json!({"name": "Body Copy"})).unwrap();
-        let items = quick_apply_items(&s, "body", false);
-        assert_eq!(items[0].id, "style.paragraph.apply");
-        assert_eq!(items[0].params, json!({"name": "Body Copy"}));
-        assert_eq!(items[0].kind, "Paragraph Style");
-        assert!(quick_apply_items(&s, "", false).iter().all(|i| i.kind.is_empty()));
-        assert!(quick_apply_items(&s, "preferences", false).iter().any(|i| i.id == "app.preferences"));
-    }
-
-    #[test]
-    fn distribute_rows_menu_dispatches_an_undoable_edit() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let frame = app.run("frame.create", json!({"rect": [72, 72, 500, 700], "content": "text", "text": ""})).unwrap();
-        app.run("text.select", json!({"story": frame["story"], "anchor": 0, "focus": 0})).unwrap();
-        app.run("table.insert", json!({"rows": 2, "cols": 2})).unwrap();
-        app.run("table.setRowHeight", json!({"row": 0, "height": 40, "mode": "exactly"})).unwrap();
-        app.run("table.setRowHeight", json!({"row": 1, "height": 80, "mode": "exactly"})).unwrap();
-        app.run("table.selectTable", json!({})).unwrap();
-        activate(&mut app, "table.distributeRows", &Value::Null);
-        assert!(app.ui.dialog.is_none());
-        let info = app.run("table.get", json!({})).unwrap();
-        assert_eq!(info["rows"][0]["height"], 60.0);
-        assert_eq!(info["rows"][1]["height"], 60.0);
-        app.run("edit.undo", json!({})).unwrap();
-        assert_eq!(app.run("table.get", json!({})).unwrap()["rows"][0]["height"], 40.0);
-    }
-
-    #[test]
-    fn every_menu_entry_is_a_command() {
-        let mut all = Vec::new();
-        for (_, items) in menu_tree() {
-            walk(&items, &mut all);
-        }
-        assert!(all.len() > 80, "{}", all.len());
-        assert!(all.iter().any(|(label, id, _)| label == "Distribute Rows Evenly" && id == "table.distributeRows"));
-        for (label, id, params) in &all {
-            assert!(ui_label(id).is_some() || designcraft_engine::find_command(id).is_some(), "menu entry {label}: unknown command {id}");
-            assert!(!label.is_empty() && label != id, "menu entry {id} has no label");
-            if let Some(o) = params.as_object() {
-                assert!(!o.is_empty(), "{id}: empty fixed params");
-            }
-        }
-        // Nested submenus parse (Type › Insert Special Character › Symbols › …).
-        let ty = menu_tree().into_iter().find(|(m, _)| *m == "Type").unwrap().1;
-        let special = ty.iter().find_map(|i| match i {
-            Item::Sub(n, c) if n == "Insert Special Character" => Some(c.clone()),
-            _ => None,
-        });
-        assert!(special.is_some_and(|c| c.iter().any(|i| matches!(i, Item::Sub(n, _) if n == "Symbols"))));
-        // Fixed-parameter variants keep their own labels.
-        assert!(all.iter().any(|(l, id, _)| l == "Fill Frame Proportionally" && id == "fit.fillFrameProportionally"));
-    }
-
-    #[test]
-    fn context_menus_hold_commands_and_menu_bar_submenus() {
-        let tree = menu_tree();
-        for entries in [CONTEXT_OBJECT, CONTEXT_GRAPHIC_FRAME, CONTEXT_OBJECT_TAIL, CONTEXT_TEXT_FRAME, CONTEXT_TEXT, CONTEXT_CANVAS] {
-            for path in entries.iter().filter_map(|e| e.strip_prefix("menu:")) {
-                assert!(menu_bar_submenu(&tree, path).is_some(), "no menu bar submenu {path}");
-            }
-            let mut all = Vec::new();
-            for (_, items) in context_parse(entries) {
-                walk(&items, &mut all);
-            }
-            for (label, id, _) in &all {
-                assert!(ui_label(id).is_some() || designcraft_engine::find_command(id).is_some(), "context entry {label}: unknown command {id}");
-            }
-        }
-    }
-
-    #[test]
-    fn the_type_menu_follows_indesigns_order() {
-        // InDesign's Type menu, as Chris Nielsen opens it in "Numbering Page Sections" (2:09).
-        let ty = menu_tree().into_iter().find(|(m, _)| *m == "Type").unwrap().1;
-        let labels: Vec<String> = ty
-            .iter()
-            .map(|i| match i {
-                Item::Sep => "-".to_string(),
-                Item::Sub(n, _) => format!("{n} >"),
-                Item::Cmd { label, .. } => label.clone(),
-            })
-            .collect();
-        let expected = [
-            "Size >",
-            "-",
-            "Character",
-            "Paragraph",
-            "Tabs",
-            "Glyphs",
-            "-",
-            "Character Styles",
-            "Paragraph Styles",
-            "-",
-            "Create Outlines",
-            "Find/Replace Font…",
-            "Reload Fonts",
-            "Change Case >",
-            "-",
-            "Type on a Path >",
-            "-",
-            "Notes >",
-            "Track Changes >",
-            "-",
-            "Insert Footnote",
-            "Document Footnote Options…",
-            "Insert Endnote",
-        ];
-        assert_eq!(&labels[..expected.len()], expected, "{labels:?}");
-        let pos = |l: &str| labels.iter().position(|x| x == l).unwrap_or_else(|| panic!("{l} in {labels:?}"));
-        assert!(pos("Hyperlinks & Cross-References >") < pos("Text Variables >"));
-        assert!(pos("Text Variables >") < pos("Bulleted & Numbered Lists >"));
-        assert!(pos("Bulleted & Numbered Lists >") < pos("Insert Special Character >"));
-        assert!(pos("Insert Special Character >") < pos("Insert White Space >"));
-        assert!(pos("Insert Break Character >") < pos("Fill with Placeholder Text"));
-        assert!(pos("Fill with Placeholder Text") < pos("Show Hidden Characters"));
-        // Alignment, styles and point sizes keep their shortcuts, out of the menu as in InDesign.
-        for gone in ["Align Left", "Bold", "Increase Point Size", "Paragraph Rules…"] {
-            assert!(!labels.iter().any(|l| l == gone), "{gone}");
-        }
-        let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let all = effective_shortcuts(&app);
-        for (id, sc) in [
-            ("type.alignLeft", "Cmd+Shift+L"),
-            ("app.characterPanel", "Cmd+T"),
-            ("app.paragraphPanel", "Cmd+Alt+T"),
-            ("app.insertCurrentPageNumber", "Cmd+Alt+Shift+N"),
-        ] {
-            assert_eq!(all.iter().find(|(i, _)| i == id).map(|(_, s)| s.as_str()), Some(sc), "{id}");
-        }
-        // Markers › Current Page Number carries ⌥⇧⌘N.
-        let markers = ty
-            .iter()
-            .find_map(|i| match i {
-                Item::Sub(n, c) if n == "Insert Special Character" => {
-                    c.iter().find_map(|i| if let Item::Sub(n, c) = i { (n == "Markers").then(|| c.clone()) } else { None })
-                }
-                _ => None,
-            })
-            .unwrap();
-        assert!(matches!(&markers[0], Item::Cmd { label, shortcut: Some("Cmd+Alt+Shift+N"), .. } if label == "Current Page Number"));
-    }
-
-    #[test]
-    fn type_panel_items_open_their_panels_and_the_marker_shortcut_inserts_a_page_number() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        activate(&mut app, "app.characterPanel", &Value::Null);
-        assert_eq!(app.ui.open_panel.as_deref(), Some("character"));
-        // Paragraph Styles opens floating, grouped with Character Styles, as in InDesign.
-        activate(&mut app, "app.paragraphStylesPanel", &Value::Null);
-        let layout = app.ui.docking.as_ref().unwrap();
-        assert!(layout.floating.iter().any(|g| g.panels == ["characterStyles", "paragraphStyles"] && g.active == 1));
-        let story = app.run("frame.create", json!({"rect": [36, 36, 200, 100], "content": "text", "text": "Page "})).unwrap()["story"].clone();
-        app.run("text.select", json!({"story": story, "anchor": 5, "focus": 5})).unwrap();
-        activate(&mut app, "app.insertCurrentPageNumber", &Value::Null);
-        let d = &app.session.doc().unwrap().doc;
-        assert_eq!(d.story(designcraft_doc::StoryId(story.as_u64().unwrap())).unwrap().text, "Page \u{e000}");
-    }
-
-    #[test]
-    fn custom_workspaces_save_apply_and_delete() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.ui.dock_tab = "swatches".into();
-        app.ui.control_bar = true;
-        run_ui(&mut app, "window.newWorkspace", &json!({"name": "Mine"})).unwrap().unwrap();
-        run_ui(&mut app, "window.workspace", &json!({"name": "Essentials"})).unwrap().unwrap();
-        app.ui.dock_tab = "properties".into();
-        run_ui(&mut app, "window.workspace", &json!({"name": "Mine"})).unwrap().unwrap();
-        assert_eq!((app.ui.dock_tab.as_str(), app.ui.control_bar, app.ui.workspace.as_str()), ("swatches", true, "Mine"));
-        app.ui.dock_tab = "layers".into();
-        run_ui(&mut app, "window.resetWorkspace", &json!({})).unwrap().unwrap();
-        assert_eq!(app.ui.dock_tab, "swatches", "reset to the saved arrangement");
-        run_ui(&mut app, "window.deleteWorkspace", &json!({"name": "Mine"})).unwrap().unwrap();
-        assert!(app.ui.custom_workspaces.is_empty());
-        assert_eq!(app.ui.workspace, "Essentials");
-    }
-
-    /// New Workspace › Capture (Learn Skills Daily's InDesign course, 11:40): Panel Locations and
-    /// Menu Customization, both on by default.
-    #[test]
-    fn new_workspace_captures_panel_locations_and_menu_customization() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        // The dialog offers both, checked.
-        run_ui(&mut app, "window.newWorkspace", &json!({})).unwrap().unwrap();
-        let d = app.ui.dialog.take().unwrap();
-        assert_eq!(
-            (d.id.as_str(), d.fields["panelLocations"].clone(), d.fields["menuCustomization"].clone()),
-            ("newWorkspace", json!(true), json!(true))
-        );
-        // Both captured.
-        app.ui.dock_tab = "swatches".into();
-        app.ui.hidden_menu_items = vec!["Type/Glyphs".into()];
-        run_ui(&mut app, "window.newWorkspace", &json!({"name": "All"})).unwrap().unwrap();
-        // Menus only: choosing it leaves the panels where they are.
-        app.ui.hidden_menu_items = vec!["Layout/Pages".into()];
-        run_ui(&mut app, "window.newWorkspace", &json!({"name": "Menus", "panelLocations": false})).unwrap().unwrap();
-        // Panels only: the menus stay as they are.
-        app.ui.dock_tab = "layers".into();
-        run_ui(&mut app, "window.newWorkspace", &json!({"name": "Panels", "menuCustomization": false})).unwrap().unwrap();
-        app.ui.dock_tab = "properties".into();
-        app.ui.hidden_menu_items.clear();
-        run_ui(&mut app, "window.workspace", &json!({"name": "Menus"})).unwrap().unwrap();
-        assert_eq!((app.ui.dock_tab.as_str(), app.ui.hidden_menu_items.clone()), ("properties", vec!["Layout/Pages".to_string()]));
-        run_ui(&mut app, "window.workspace", &json!({"name": "Panels"})).unwrap().unwrap();
-        assert_eq!((app.ui.dock_tab.as_str(), app.ui.hidden_menu_items.clone()), ("layers", vec!["Layout/Pages".to_string()]));
-        run_ui(&mut app, "window.workspace", &json!({"name": "All"})).unwrap().unwrap();
-        assert_eq!((app.ui.dock_tab.as_str(), app.ui.hidden_menu_items.clone()), ("swatches", vec!["Type/Glyphs".to_string()]));
-        // A workspace saved before the options existed restores its panels.
-        let old: crate::SavedWorkspace = serde_json::from_value(json!({"name": "Old", "dockTab": "pages"})).unwrap();
-        assert!(!old.keep_panels && old.hidden_menu_items.is_none());
-    }
-
-    #[test]
-    fn essentials_classic_is_the_control_panel_and_iconic_groups() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        run_ui(&mut app, "window.workspace", &json!({"name": "Essentials Classic"})).unwrap().unwrap();
-        assert!(app.ui.control_bar && !app.ui.dock_expanded);
-        let groups = app.ui.icon_groups.clone().unwrap();
-        assert_eq!(groups[0], ["pages", "layers", "links"]);
-        assert_eq!(groups.last().unwrap(), &["gradient"]);
-        assert_eq!(checked(&app, "window.workspace", &json!({"name": "Essentials Classic"})), Some(true));
-        assert_eq!(checked(&app, "window.workspace", &json!({"name": "Essentials"})), Some(false));
-        // Window › Pages opens Pages from its icon group, not the Properties stack.
-        run_ui(&mut app, "window.panel", &json!({"panel": "pages"})).unwrap().unwrap();
-        assert_eq!((app.ui.open_panel.as_deref(), app.ui.dock_expanded), (Some("pages"), false));
-        // A workspace saved from it keeps the groups.
-        run_ui(&mut app, "window.newWorkspace", &json!({"name": "Mine"})).unwrap().unwrap();
-        run_ui(&mut app, "window.workspace", &json!({"name": "Essentials"})).unwrap().unwrap();
-        assert_eq!((app.ui.icon_groups.as_ref(), app.ui.dock_expanded, app.ui.control_bar), (None, true, false));
-        run_ui(&mut app, "window.workspace", &json!({"name": "Mine"})).unwrap().unwrap();
-        assert_eq!(app.ui.icon_groups, Some(groups));
-    }
-
-    #[test]
-    fn typography_workspace_opens_its_panels_from_named_icon_groups_and_resets() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        run_ui(&mut app, "window.workspace", &json!({"name":"Typography"})).unwrap().unwrap();
-        assert!(app.ui.control_bar);
-        assert!(!app.ui.dock_expanded);
-        assert!(app.ui.open_panel.is_none());
-        let groups = app.ui.icon_groups.clone().unwrap();
-        assert_eq!(groups[0], ["pages", "layers", "swatches"]);
-        assert_eq!(groups[4], ["paragraph", "paragraphStyles"]);
-        assert_eq!(groups[5], ["character", "characterStyles"]);
-        for panel in ["pages", "paragraphStyles", "characterStyles"] {
-            run_ui(&mut app, "window.panel", &json!({"panel":panel})).unwrap().unwrap();
-            assert_eq!(app.ui.open_panel.as_deref(), Some(panel));
-            assert!(!app.ui.dock_expanded);
-        }
-        run_ui(&mut app, "window.resetWorkspace", &json!({})).unwrap().unwrap();
-        assert_eq!(app.ui.icon_groups, Some(groups));
-        assert!(app.ui.open_panel.is_none());
-        assert!(!app.ui.dock_expanded);
-        run_ui(&mut app, "window.workspace", &json!({"name":"Essentials"})).unwrap().unwrap();
-        assert!(app.ui.icon_groups.is_none());
-        assert!(app.ui.dock_expanded);
-    }
-
-    #[test]
-    fn the_window_menu_is_in_indesigns_order_and_reaches_every_panel() {
-        let window = menu_tree().into_iter().find(|(m, _)| *m == "Window").unwrap().1;
-        let names: Vec<&str> = window
-            .iter()
-            .filter_map(|i| match i {
-                Item::Sub(n, _) => Some(n.as_str()),
-                Item::Cmd { label, .. } => Some(label.as_str()),
-                Item::Sep => None,
-            })
-            .collect();
-        assert_eq!(&names[..4], ["Arrange", "Workspace", "Articles", "Color"]);
-        let sub = |name: &str| {
-            window
-                .iter()
-                .find_map(|i| match i {
-                    Item::Sub(n, c) if n == name => Some(c.clone()),
-                    _ => None,
-                })
-                .unwrap()
-        };
-        // Window › Workspace › Essentials Classic, Window › Color › Gradient & Swatches.
-        assert!(
-            sub("Workspace")
-                .iter()
-                .any(|i| matches!(i, Item::Cmd { id, params, .. } if id == "window.workspace" && params["name"] == "Essentials Classic"))
-        );
-        let color: Vec<String> =
-            sub("Color").iter().filter_map(|i| if let Item::Cmd { label, .. } = i { Some(label.clone()) } else { None }).collect();
-        assert_eq!(color, ["Color", "Gradient", "Swatches"]);
-        // Every panel is in the menu.
-        fn panels(items: &[Item], out: &mut Vec<String>) {
-            for i in items {
-                match i {
-                    Item::Sub(_, c) => panels(c, out),
-                    Item::Cmd { id, params, .. } if id == "window.panel" => out.extend(params["panel"].as_str().map(str::to_string)),
-                    _ => {}
-                }
-            }
-        }
-        let mut found = Vec::new();
-        panels(&window, &mut found);
-        for (id, _, _) in crate::dock::DOCK_TABS.iter().chain(crate::dock::ICON_PANELS) {
-            assert!(found.iter().any(|p| p == id), "Window menu misses the {id} panel");
-        }
-    }
-
-    #[test]
-    fn interactive_workspaces_show_their_panels() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.ui.dock_expanded = false;
-        run_ui(&mut app, "window.workspace", &json!({"name": "Interactive for PDF"})).unwrap().unwrap();
-        assert_eq!((app.ui.dock_tab.as_str(), app.ui.dock_expanded, app.ui.open_panel.as_deref()), ("pages", true, Some("buttons")));
-        run_ui(&mut app, "window.workspace", &json!({"name": "Digital Publishing"})).unwrap().unwrap();
-        assert_eq!((app.ui.dock_tab.as_str(), app.ui.open_panel.as_deref()), ("pages", Some("liquid")));
-        run_ui(&mut app, "window.workspace", &json!({"name": "Essentials"})).unwrap().unwrap();
-        assert_eq!(app.ui.open_panel, None);
-    }
-
-    #[test]
-    fn hide_and_show_menu_items() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let items = all_menu_items();
-        let (menu, label) = items.iter().find(|(m, _)| m == "Edit").cloned().expect("Edit items");
-        let key = menu_key(&menu, &label);
-        run_ui(&mut app, "window.hideMenuItem", &json!({"item": key})).unwrap().unwrap();
-        assert!(app.ui.hidden_menu_items.contains(&key));
-        run_ui(&mut app, "window.hideMenuItem", &json!({"item": key, "hidden": false})).unwrap().unwrap();
-        assert!(app.ui.hidden_menu_items.is_empty());
-        assert!(items.len() > 100, "every menu's items are listed: {}", items.len());
-    }
-
-    /// The Type menu as drawn: every item label.
-    fn drawn_type_menu(app: &mut DesignApp) -> Vec<String> {
-        let ty = menu_tree().into_iter().find(|(m, _)| *m == "Type").unwrap().1;
-        let ctx = egui::Context::default();
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(400.0, 4000.0));
-        let mut out = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), ..Default::default() }, |ui| {
-            menu_items(app, ui, &ty, "Type");
-        });
-        out.textures_delta.clear();
-        fn collect(shape: &egui::Shape, out: &mut Vec<String>) {
-            match shape {
-                egui::Shape::Text(t) => out.push(t.galley.job.text.trim().to_string()),
-                egui::Shape::Vec(v) => v.iter().for_each(|s| collect(s, out)),
-                _ => {}
-            }
-        }
-        let mut labels = Vec::new();
-        out.shapes.iter().for_each(|s| collect(&s.shape, &mut labels));
-        labels
-    }
-
-    /// Tate-Chu-Yoko, Ruby, Kenten and Warichu are in the Type menu of InDesign's Japanese edition
-    /// only: they show while Show CJK Features is on, which follows the interface language until
-    /// the user sets it. Hidden, they still run.
-    #[test]
-    fn cjk_menu_items_follow_show_cjk_features() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let ty = menu_tree().into_iter().find(|(m, _)| *m == "Type").unwrap().1;
-        let cjk: Vec<String> = ty
-            .iter()
-            .filter_map(|i| match i {
-                Item::Cmd { label, id, .. } if CJK_ONLY.contains(&id.as_str()) => Some(label.clone()),
-                _ => None,
-            })
-            .collect();
-        assert_eq!(cjk.len(), 4, "{cjk:?}");
-        let drawn = |app: &mut DesignApp| {
-            let labels = drawn_type_menu(app);
-            assert!(labels.iter().any(|l| l == crate::i18n::tr(&app.ui.language, "Story Direction")), "in both editions: {labels:?}");
-            let shown: Vec<bool> = cjk.iter().map(|l| labels.iter().any(|d| d == crate::i18n::tr(&app.ui.language, l))).collect();
-            assert!(shown.iter().all(|s| *s == shown[0]), "{shown:?}");
-            shown[0]
-        };
-        for (lang, on) in [("", false), ("de", false), ("ja", true), ("zh", true), ("ko", true)] {
-            app.ui.language = lang.into();
-            assert_eq!(crate::cjk_features(&app), on, "{lang}");
-            assert_eq!(drawn(&mut app), on, "{lang}");
-        }
-        app.run("prefs.set", json!({"cjkFeatures": false})).unwrap();
-        assert!(!drawn(&mut app), "off in a Korean interface");
-        app.ui.language = String::new();
-        app.run("prefs.set", json!({"cjkFeatures": true})).unwrap();
-        assert!(drawn(&mut app), "on in an English interface");
-        assert!(quick_apply_items(&app.session, "ruby", crate::cjk_features(&app)).iter().any(|i| i.id == "app.rubyDialog"));
-        app.run("prefs.set", json!({"cjkFeatures": false})).unwrap();
-        assert!(!drawn(&mut app));
-        assert!(!quick_apply_items(&app.session, "ruby", crate::cjk_features(&app)).iter().any(|i| i.id == "app.rubyDialog"));
-        app.run("app.rubyDialog", json!({})).unwrap();
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("ruby"), "hidden, not removed");
-    }
-
-    /// Preferences › Type › Show CJK Features: left as it is, it keeps following the interface
-    /// language; changed, it is kept in prefs.json.
-    #[test]
-    fn show_cjk_features_is_a_persisted_preference() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.ui.language = "ja".into();
-        run_ui(&mut app, "app.preferences", &json!({})).unwrap().unwrap();
-        assert_eq!(app.ui.dialog.as_ref().unwrap().fields["cjkFeatures"], true);
-        crate::dialogs::confirm(&mut app).unwrap();
-        assert_eq!(app.session.prefs.cjk_features, None, "untouched: follows the language");
-        run_ui(&mut app, "app.preferences", &json!({})).unwrap().unwrap();
-        app.ui.dialog.as_mut().unwrap().fields.insert("cjkFeatures".into(), json!(false));
-        crate::dialogs::confirm(&mut app).unwrap();
-        assert_eq!(app.session.prefs.cjk_features, Some(false));
-        assert!(!crate::cjk_features(&app));
-        // prefs.json round trip; a file from before the setting follows the language.
-        let saved = serde_json::to_vec(&app.session.prefs).unwrap();
-        assert_eq!(serde_json::from_slice::<designcraft_engine::Prefs>(&saved).unwrap().cjk_features, Some(false));
-        assert_eq!(serde_json::from_str::<designcraft_engine::Prefs>(r#"{"scaleStrokes": false}"#).unwrap().cjk_features, None);
-        assert_eq!(app.run("prefs.set", json!({"cjkFeatures": null})).unwrap()["cjkFeatures"], Value::Null);
-        assert!(crate::cjk_features(&app), "follows the Japanese interface again");
-    }
-
-    #[test]
-    fn menu_button_fits_its_anchor_and_resets_scroll_on_reopen() {
-        // Workspace/panel menus may be in the middle; the status-bar zoom menu opens upwards.
-        for anchor_y in [0.0, 130.0, 260.0] {
-            let ctx = egui::Context::default();
-            let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(400.0, 300.0));
-            let mut tick = 0;
-            let mut frame = |events: Vec<egui::Event>| {
-                tick += 1;
-                let mut button = None;
-                let mut first = None;
-                let mut last = None;
-                let mut output =
-                    ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
-                        ui.add_space(anchor_y);
-                        let response = menu_button(ui, "Long menu", |ui| {
-                            for i in 0..60 {
-                                let response = ui.button(format!("Item {i}"));
-                                if i == 0 {
-                                    first = Some((response.rect, ui.clip_rect()));
-                                }
-                                if i == 59 {
-                                    last = Some((response.rect, ui.clip_rect()));
-                                }
-                            }
-                        });
-                        button = Some(response.response);
-                    });
-                output.textures_delta.clear();
-                (button.expect("menu button"), first, last)
-            };
-            let click =
-                |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };
-            frame(vec![]);
-            let (button, _, _) = frame(vec![]);
-            let anchor = button.rect;
-            for pressed in [true, false] {
-                frame(vec![egui::Event::PointerMoved(anchor.center()), click(anchor.center(), pressed)]);
-            }
-            for _ in 0..3 {
-                frame(vec![]);
-            }
-            let popup = ctx.memory(|memory| memory.area_rect(egui::Popup::default_response_id(&button))).expect("open menu");
-            assert!(screen.contains_rect(popup), "menu at {anchor_y} fits in the viewport: {popup:?}");
-            assert!(
-                popup.top() >= anchor.bottom() - 1.0 || popup.bottom() <= anchor.top() + 1.0,
-                "menu at {anchor_y} stays on one side of its button: {popup:?}, {anchor:?}"
-            );
-            let (_, first, last) = frame(vec![]);
-            let (first, clip) = first.expect("first row");
-            assert!(clip.contains_rect(first), "newly opened menu starts at the first row");
-            assert!(!clip.intersects(last.expect("last row").0), "last row starts below the scroll area");
-
-            frame(vec![
-                egui::Event::PointerMoved(popup.center()),
-                egui::Event::MouseWheel {
-                    unit: egui::MouseWheelUnit::Point,
-                    delta: egui::vec2(0.0, -5000.0),
-                    phase: egui::TouchPhase::Move,
-                    modifiers: egui::Modifiers::NONE,
-                },
-            ]);
-            for _ in 0..60 {
-                frame(vec![]);
-            }
-            let (_, first, last) = frame(vec![]);
-            let (last, clip) = last.expect("scrolled last row");
-            assert!(popup.contains_rect(last) && clip.contains_rect(last), "last row is reachable: {last:?}, {popup:?}, {clip:?}");
-            assert!(!clip.intersects(first.expect("scrolled first row").0), "menu really scrolled away from its start");
-
-            let outside = egui::pos2(screen.right() - 10.0, screen.center().y);
-            for pressed in [true, false] {
-                frame(vec![egui::Event::PointerMoved(outside), click(outside, pressed)]);
-            }
-            assert!(!egui::Popup::is_any_open(&ctx), "outside click closes the menu");
-            assert!(frame(vec![]).1.is_none(), "closed menu is no longer drawn");
-            for pressed in [true, false] {
-                frame(vec![egui::Event::PointerMoved(anchor.center()), click(anchor.center(), pressed)]);
-            }
-            for _ in 0..3 {
-                frame(vec![]);
-            }
-            let (_, first, last) = frame(vec![]);
-            let (first, clip) = first.expect("reopened first row");
-            assert!(popup.contains_rect(first) && clip.contains_rect(first), "reopening resets to the first row: {first:?}, {clip:?}");
-            assert!(!clip.intersects(last.expect("reopened last row").0), "reopening discards the old scroll offset");
-        }
-    }
-
-    #[test]
-    fn tiny_menu_viewport_does_not_force_the_default_scroll_height() {
-        let ctx = egui::Context::default();
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(400.0, 100.0));
-        let mut tick = 0;
-        let mut frame = |events: Vec<egui::Event>| {
-            tick += 1;
-            let mut button = None;
-            let mut output =
-                ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
-                    ui.add_space(35.0);
-                    let response = menu_button(ui, "Long menu", |ui| {
-                        for i in 0..20 {
-                            let _ = ui.button(format!("Item {i}"));
-                        }
-                    });
-                    button = Some(response.response);
-                });
-            output.textures_delta.clear();
-            button.expect("menu button")
-        };
-        frame(vec![]);
-        let button = frame(vec![]);
-        let pos = button.rect.center();
-        for pressed in [true, false] {
-            frame(vec![
-                egui::Event::PointerMoved(pos),
-                egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
-            ]);
-        }
-        for _ in 0..3 {
-            frame(vec![]);
-        }
-        let popup = ctx.memory(|memory| memory.area_rect(egui::Popup::default_response_id(&button))).expect("open menu");
-        let space = (screen.bottom() - button.rect.bottom()).max(button.rect.top() - screen.top());
-        assert!(space < 64.0, "fixture has less space than egui's default minimum scroll height");
-        // A complete command row may not fit, but the scroll area's minimum must not make
-        // the popup exceed its height budget or cover the button that dismisses it.
-        assert!(popup.height() <= space, "tiny menu respects its available height: {popup:?}, {space}");
-        assert!(screen.contains_rect(popup), "tiny menu remains inside the viewport: {popup:?}");
-        assert!(
-            popup.top() >= button.rect.bottom() - 1.0 || popup.bottom() <= button.rect.top() + 1.0,
-            "tiny menu stays beside its anchor: {popup:?}, {:?}",
-            button.rect
-        );
-    }
-
-    #[test]
-    fn clipped_submenu_does_not_open_when_hovering_outside_menu() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let ctx = egui::Context::default();
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1000.0, 900.0));
-        let entries = vec![Item::Sub("Hidden submenu".into(), vec![cmd_item("app.preferences", Value::Null)])];
-        let mut tick = 0;
-        let mut frame = |spacing: f32, events: Vec<egui::Event>| {
-            tick += 1;
-            let mut button_rect = egui::Rect::NOTHING;
-            let mut hidden_submenu = None;
-            let mut output =
-                ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
-                    egui::MenuBar::new().ui(ui, |ui| {
-                        let response = ui.menu_button("Menu", |ui| {
-                            egui::ScrollArea::vertical().max_height(400.0).show(ui, |ui| {
-                                ui.add_space(spacing);
-                                let button_id = ui.next_auto_id();
-                                menu_items(&mut app, ui, &entries, "Test");
-                                let response = ui.ctx().read_response(button_id).expect("submenu button response");
-                                let open = egui::containers::menu::MenuState::from_ui(ui, |state, _| state.open_item.is_some());
-                                hidden_submenu = Some((response.rect, ui.clip_rect(), open));
-                            });
-                        });
-                        button_rect = response.response.rect;
-                    });
-                });
-            output.textures_delta.clear();
-            (button_rect, hidden_submenu)
-        };
-        frame(500.0, vec![]);
-        let button = frame(500.0, vec![]).0.center();
-        for pressed in [true, false] {
-            frame(
-                500.0,
-                vec![
-                    egui::Event::PointerMoved(button),
-                    egui::Event::PointerButton { pos: button, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
-                ],
-            );
-        }
-        for _ in 0..3 {
-            frame(500.0, vec![]);
-        }
-        let (_, Some((hidden, clip, open))) = frame(500.0, vec![]) else { panic!("test menu is open") };
-        assert!(!open, "submenu starts closed");
-        assert!(screen.contains_rect(hidden), "hidden row remains inside the screen: {hidden:?}");
-        assert!(!clip.intersects(hidden), "submenu must be fully clipped: {hidden:?}, {clip:?}");
-        let (_, Some((_, _, open))) = frame(500.0, vec![egui::Event::PointerMoved(hidden.center())]) else { panic!("test menu remains open") };
-        assert!(!open, "hovering the clipped row's position outside the menu must not open its submenu");
-
-        let partial_spacing = 500.0 - (hidden.top() - clip.bottom()) - 6.0;
-        let (_, Some((partial, clip, open))) = frame(partial_spacing, vec![]) else { panic!("test menu remains open") };
-        assert!(!open);
-        assert!(partial.top() < clip.bottom() && partial.bottom() > clip.bottom(), "row must be partially clipped: {partial:?}, {clip:?}");
-        let outside = egui::pos2(partial.center().x, clip.bottom() + 1.0);
-        let (_, Some((_, _, open))) = frame(partial_spacing, vec![egui::Event::PointerMoved(outside)]) else { panic!("test menu remains open") };
-        assert!(!open, "hovering the clipped portion of a partially visible row must not open its submenu");
-        let visible = partial.intersect(clip).center();
-        let (_, Some((_, _, open))) = frame(partial_spacing, vec![egui::Event::PointerMoved(visible)]) else { panic!("test menu remains open") };
-        assert!(open, "hovering the visible portion still opens the submenu");
-        let (_, Some((_, _, open))) = frame(500.0, vec![]) else { panic!("test menu remains open") };
-        assert!(!open, "an open submenu closes when its row becomes fully clipped");
-    }
-
-    #[test]
-    fn native_labels_keep_their_ampersands() {
-        assert_eq!(native_label("Numbering & Section Options…"), "Numbering && Section Options…");
-        assert_eq!(native_label("A&&B"), "A&&&&B");
-        assert_eq!(native_label("Pages"), "Pages");
-    }
-
-    #[test]
-    fn the_mac_window_menu_minimizes_with_cmd_m() {
-        let window = native_menu_tree().into_iter().find(|(t, _)| *t == "Window").map(|(_, e)| e).unwrap_or_default();
-        assert!(matches!(window.first(), Some(Item::Cmd { id, shortcut: Some("Cmd+M"), .. }) if id == "window.minimize"), "{:?}", window.first());
-        assert!(matches!(window.get(1), Some(Item::Sep)));
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        assert!(run_ui(&mut app, "window.minimize", &Value::Null).is_some_and(|r| r.is_err()), "no host window controls");
-        app.native_menu = true;
-        assert!(menu_enabled(&app, "window.minimize") && !menu_enabled(&app, "window.maximize"));
-        run_ui(&mut app, "window.minimize", &Value::Null).unwrap().unwrap();
-        assert_eq!(app.pending_window_commands, [egui::ViewportCommand::Minimized(true)]);
-    }
-
-    #[test]
-    fn mac_settings_follow_about_in_the_app_menu_and_leave_edit() {
-        let pos = |command: &str| MAC_APP_MENU.iter().position(|m| matches!(m, AppMenuItem::Cmd { command: c, .. } if *c == command));
-        let (Some(about), Some(settings)) = (pos("help.about"), pos("app.preferences")) else { panic!("About and Settings are in the app menu") };
-        assert!(about < settings);
-        assert_eq!(MAC_APP_MENU.get(settings - 1), Some(&AppMenuItem::Sep));
-        // Language follows Settings, as in the suite's other apps, titled in the interface language.
-        assert_eq!(MAC_APP_MENU.get(settings + 1), Some(&AppMenuItem::Language));
-        assert_eq!(MAC_APP_MENU.get(settings + 2), Some(&AppMenuItem::Sep));
-        let label = |command: &str| {
-            MAC_APP_MENU.iter().find_map(|m| match m {
-                AppMenuItem::Cmd { label, command: c, .. } if *c == command => Some(*label),
-                _ => None,
-            })
-        };
-        assert_eq!(label("app.preferences"), Some("Settings…"));
-        let ids = MAC_APP_MENU.iter().filter_map(|m| if let AppMenuItem::Cmd { id, .. } = m { Some(*id) } else { None }).collect::<Vec<_>>();
-        assert!(ids.iter().enumerate().all(|(i, id)| !ids[..i].contains(id)), "native ids are unique: {ids:?}");
-
-        let edit = |tree: Vec<(&'static str, Vec<Item>)>| {
-            let mut out = Vec::new();
-            walk(&tree.into_iter().find(|(t, _)| *t == "Edit").map(|(_, e)| e).unwrap_or_default(), &mut out);
-            out.into_iter().map(|(_, id, _)| id).collect::<Vec<_>>()
-        };
-        assert!(edit(menu_tree()).iter().any(|id| id == "app.preferences"), "the in-window Edit menu keeps Preferences");
-        let native = native_menu_tree();
-        let mut all = Vec::new();
-        for (_, entries) in &native {
-            walk(entries, &mut all);
-        }
-        assert!(!all.iter().any(|(_, id, _)| id == "app.preferences"), "the macOS menu bar has Settings only in the app menu");
-        assert!(edit(native_menu_tree()).iter().any(|id| id == "app.keyboardShortcuts"));
-        for (title, entries) in &native {
-            assert!(!matches!(entries.first(), Some(Item::Sep)) && !matches!(entries.last(), Some(Item::Sep)), "{title}: separator at an end");
-            assert!(entries.windows(2).all(|w| !matches!(w, [Item::Sep, Item::Sep])), "{title}: doubled separator");
-        }
-    }
-
-    /// Web save: a download that couldn't start is an error and leaves the document unsaved; one
-    /// that started marks it saved.
-    #[test]
-    fn web_save_marks_the_document_saved_only_after_the_download_starts() {
-        let dir = tempfile::tempdir().unwrap();
-        // The title names a temporary path: on native, file.saveAs writes where the web build doesn't.
-        let title = dir.path().join("doc").to_string_lossy().to_string();
-        let fails = std::rc::Rc::new(std::cell::Cell::new(true));
-        let f = fails.clone();
-        let services = crate::Services {
-            download: Some(Box::new(move |_: &str, _: &[u8]| if f.get() { Err("blocked".into()) } else { Ok(()) })),
-            ..Default::default()
-        };
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), services);
-        app.run("file.new", json!({"title": title})).unwrap();
-        app.run("frame.create", json!({"rect": [36, 36, 300, 200]})).unwrap();
-        assert!(app.session.active().unwrap().is_dirty());
-
-        let e = app.run("app.save", json!({})).unwrap_err();
-        assert!(e.contains("blocked"), "{e}");
-        assert!(app.session.active().unwrap().is_dirty(), "a failed download leaves the document unsaved");
-
-        fails.set(false);
-        app.run("app.save", json!({})).unwrap();
-        assert!(!app.session.active().unwrap().is_dirty());
-    }
-
-    fn start_screen_texts(app: &mut crate::DesignApp) -> Vec<String> {
-        let ctx = egui::Context::default();
-        crate::theme::install_fonts(&ctx, "");
-        let mut shapes = Vec::new();
-        for _ in 0..3 {
-            let input =
-                egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-            shapes = out.shapes;
-        }
-        shapes
-            .iter()
-            .filter_map(|s| match &s.shape {
-                egui::Shape::Text(t) => Some(t.galley.text().to_string()),
-                _ => None,
-            })
-            .collect()
-    }
-
-    /// File › Open Recent: the files first (`app.openRecent {index}`), then Clear Recent Files.
-    #[test]
-    fn open_recent_lists_the_files_then_clear() {
-        let tree = menu_tree();
-        let file = &tree.iter().find(|(m, _)| *m == "File").unwrap().1;
-        let Some(Item::Sub(name, children)) = file.get(2) else { panic!("Open Recent after Open…: {:?}", file.get(2)) };
-        assert_eq!(format!("File/{name}"), OPEN_RECENT);
-        assert!(matches!(children.as_slice(), [Item::Cmd { id, .. }] if id == "file.clearRecent"));
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        assert!(recent_items(&app).is_empty());
-        assert!(!menu_enabled(&app, "file.clearRecent"));
-        app.session.prefs.note_recent_file("/work/a.designcraft");
-        app.session.prefs.note_recent_file("/work/b.idml");
-        let items = recent_items(&app);
-        let labels: Vec<_> = items
-            .iter()
-            .map(|i| match i {
-                Item::Cmd { label, id, params, .. } => format!("{label} {id} {params}"),
-                Item::Sep => "-".into(),
-                Item::Sub(..) => "sub".into(),
-            })
-            .collect();
-        assert_eq!(labels, ["b.idml app.openRecent {\"index\":0}", "a.designcraft app.openRecent {\"index\":1}", "-"]);
-        assert!(menu_enabled(&app, "file.clearRecent"));
-        assert!(menu_enabled(&app, "app.openRecent"));
-    }
-
-    /// A recent file that is gone says so in an alert (and the start screen still lists it).
-    #[test]
-    fn open_recent_of_a_missing_file_alerts_and_the_start_screen_lists_recent_files() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        assert!(!start_screen_texts(&mut app).iter().any(|t| t == "Recent files"), "no section without recent files");
-        app.session.prefs.note_recent_file("/nonexistent/dc-recent/gone.designcraft");
-        assert!(app.run("app.openRecent", json!({"index": 0})).is_err());
-        let d = app.ui.dialog.take().expect("an alert");
-        assert_eq!(d.fields["title"], "Can't Open the File");
-        assert_eq!(d.fields["file"], "gone.designcraft");
-        assert!(d.fields["message"].as_str().unwrap().contains("can't be found"));
-        assert!(app.run("app.openRecent", json!({"index": 9})).is_err(), "out of range: an error, not a panic");
-        app.ui.dialog = None;
-        let texts = start_screen_texts(&mut app);
-        assert!(texts.iter().any(|t| t == "Recent files"), "{texts:?}");
-        assert!(texts.iter().any(|t| t == "gone"), "the card names it without `.designcraft`: {texts:?}");
-    }
-
-    /// On a short window (1366 x 768 laptops) the start screen is taller than the window; the part
-    /// below the fold has to be reachable by scrolling instead of being cut off.
-    #[test]
-    fn start_screen_scrolls_when_the_window_is_too_short() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let ctx = egui::Context::default();
-        crate::theme::install_fonts(&ctx, "");
-        let size = egui::vec2(1366.0, 300.0);
-        let mut tile_y = |events: Vec<egui::Event>| {
-            let input = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, size)), events, ..Default::default() };
-            let mut out = ctx.run_ui(input, |ui| {
-                app.logic(&ui.ctx().clone());
-                app.ui(ui);
-            });
-            out.textures_delta.clear();
-            out.shapes.iter().find_map(|s| match &s.shape {
-                // The preset tiles paint their names even when scrolled out of view (labels skip that).
-                egui::Shape::Text(t) if t.galley.text() == "Tabloid" => Some(t.pos.y),
-                _ => None,
-            })
-        };
-        let at = egui::pos2(600.0, 150.0);
-        let mut before = None;
-        for _ in 0..3 {
-            before = tile_y(vec![egui::Event::PointerMoved(at)]);
-        }
-        let before = before.expect("the Tabloid tile is laid out");
-        let wheel = egui::Event::MouseWheel {
-            unit: egui::MouseWheelUnit::Point,
-            delta: egui::vec2(0.0, -400.0),
-            phase: egui::TouchPhase::Move,
-            modifiers: egui::Modifiers::NONE,
-        };
-        let mut after = tile_y(vec![egui::Event::PointerMoved(at), wheel]);
-        for _ in 0..30 {
-            after = tile_y(Vec::new());
-        }
-        let after = after.expect("the Tabloid tile is laid out");
-        assert!(after < before - 50.0, "the start screen should scroll: {before} -> {after}");
-    }
-
-    // Regression test for #329: on the start screen (no document) the Help menu's links were greyed out.
-    #[test]
-    fn help_links_are_enabled_without_a_document() {
-        let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        assert!(app.session.active().is_none());
-        let ids: Vec<&str> = UI_COMMANDS.iter().map(|c| c.0).filter(|id| id.starts_with("help.")).collect();
-        assert!(ids.contains(&"help.discord") && ids.contains(&"help.github"), "{ids:?}");
-        for id in ids {
-            assert!(menu_enabled(&app, id), "{id} must work from the start screen");
-        }
-        assert!(!menu_enabled(&app, "view.rulers"), "other UI commands still need a document");
-    }
-
-    // Regression test for #248: the start screen offered no A6 sheet (it listed only the first ten presets).
-    #[test]
-    fn start_screen_offers_every_print_preset_including_a6() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let texts = start_screen_texts(&mut app);
-        for p in designcraft_doc::build::PRESETS.iter().filter(|p| p.intent == designcraft_doc::Intent::Print) {
-            assert!(texts.iter().any(|t| t == p.name), "start screen lacks the {} card: {texts:?}", p.name);
-        }
-        assert!(texts.iter().any(|t| t == "A6"), "{texts:?}");
-        let a6 = designcraft_doc::build::PRESETS.iter().find(|p| p.name == "A6").unwrap();
-        assert!((a6.width - 105.0 * 72.0 / 25.4).abs() < 0.01 && (a6.height - 148.0 * 72.0 / 25.4).abs() < 0.01, "{a6:?}");
-        let page = crate::panels::properties::PAGE_PRESETS.iter().find(|p| p.0 == "A6").expect("Properties page-size list has A6");
-        assert!((page.1 - a6.width).abs() < 0.01 && (page.2 - a6.height).abs() < 0.01, "{page:?} vs {a6:?}");
-    }
-
-    // Regression test for #249: a menu row only reacted over its text, not across the whole row.
-    #[test]
-    fn menu_rows_are_selectable_across_the_full_width() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let ctx = egui::Context::default();
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(600.0, 400.0));
-        let entries = vec![cmd_item("app.preferences", Value::Null)];
-        let mut tick = 0;
-        let mut frame = |app: &mut DesignApp, events: Vec<egui::Event>| {
-            tick += 1;
-            let mut row = egui::Rect::NOTHING;
-            let mut output =
-                ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
-                    egui::Area::new(egui::Id::new("menu_rows")).fixed_pos(egui::pos2(50.0, 50.0)).show(ui.ctx(), |ui| {
-                        let before = ui.cursor().min;
-                        menu_column(app, ui, &[("Test", entries.clone())]);
-                        row = egui::Rect::from_min_max(before, ui.min_rect().max);
-                    });
-                });
-            output.textures_delta.clear();
-            row
-        };
-        frame(&mut app, vec![]);
-        let row = frame(&mut app, vec![]);
-        assert!(row.width() >= 239.0, "the column is at least 240 wide: {row:?}");
-        let far = egui::pos2(row.right() - 6.0, row.top() + 8.0);
-        for pressed in [true, false] {
-            frame(
-                &mut app,
-                vec![
-                    egui::Event::PointerMoved(far),
-                    egui::Event::PointerButton { pos: far, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
-                ],
-            );
-        }
-        assert!(app.ui.dialog.is_some(), "clicking the empty end of the Preferences… row must choose it");
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/menus/bar.rs b/crates/ui-egui/src/menus/bar.rs
new file mode 100644
index 000000000..6a85d6fa9
--- /dev/null
+++ b/crates/ui-egui/src/menus/bar.rs
@@ -0,0 +1,123 @@
+use super::tree::{menu_items, menu_tree};
+use super::{DesignApp, Item};
+
+/// A menu button whose popup stays within the viewport and scrolls when needed.
+/// All menu buttons share this wrapper, including workspace, zoom and panel menus.
+pub fn menu_button<'a, R>(
+    ui: &mut egui::Ui,
+    atoms: impl egui::IntoAtoms<'a>,
+    add_contents: impl FnOnce(&mut egui::Ui) -> R,
+) -> egui::InnerResponse<Option<R>> {
+    use egui::containers::menu::{MenuButton, MenuConfig};
+
+    // A menu opens from a button already shown in the previous frame. Base its height on
+    // that anchor, not the popup's eventual position, so placement cannot oscillate.
+    let button = ui.ctx().read_response(ui.next_auto_id()).map(|response| response.rect);
+    let max_height = menu_max_height(ui, button);
+    let contents = |ui: &mut egui::Ui| {
+        // Override the popup's initial available height, including when it opens upwards.
+        ui.set_max_height(max_height);
+        let mut scroll = egui::ScrollArea::vertical().max_height(max_height).min_scrolled_height(1.0);
+        if ui.is_sizing_pass() {
+            // Closing and reopening a menu starts at its first command again.
+            scroll = scroll.vertical_scroll_offset(0.0);
+        }
+        scroll.show(ui, add_contents).inner
+    };
+    // Scrollbar clicks must not dismiss the popup; command rows close it explicitly.
+    let config = MenuConfig::find(ui).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside);
+    let (response, inner) = if egui::containers::menu::is_in_menu(ui) {
+        clipped_submenu(ui, atoms, config, contents)
+    } else {
+        MenuButton::new(atoms).config(config).ui(ui, contents)
+    };
+    egui::InnerResponse { response, inner: inner.map(|response| response.inner) }
+}
+
+/// The tallest menu that fits on either side of its anchor, including the popup frame.
+pub(super) fn menu_max_height(ui: &egui::Ui, button: Option<egui::Rect>) -> f32 {
+    let screen = ui.ctx().content_rect();
+    let space = match button {
+        // Submenus open beside their row, aligned with its top or bottom.
+        Some(rect) if egui::containers::menu::is_in_menu(ui) => (screen.bottom() - rect.top()).max(rect.bottom() - screen.top()),
+        Some(rect) => (screen.bottom() - rect.bottom()).max(rect.top() - screen.top()),
+        None => screen.height(),
+    };
+    let chrome = egui::Frame::menu(ui.style()).total_margin().sum().y + 8.0;
+    (space.min(screen.height()) - chrome).max(1.0)
+}
+
+/// egui's submenu hover test uses the full row rect, even outside a scroll area's clip.
+fn clipped_submenu<'a, R>(
+    ui: &mut egui::Ui,
+    atoms: impl egui::IntoAtoms<'a>,
+    config: egui::containers::menu::MenuConfig,
+    contents: impl FnOnce(&mut egui::Ui) -> R,
+) -> (egui::Response, Option<egui::InnerResponse<R>>) {
+    use egui::containers::menu::{MenuState, SubMenu, SubMenuButton};
+
+    let id = SubMenu::id_from_widget_id(ui.next_auto_id());
+    let open = MenuState::from_ui(ui, |state, _| state.open_item == Some(id));
+    let inactive = ui.style().visuals.widgets.inactive;
+    if open {
+        ui.style_mut().visuals.widgets.inactive = ui.style().visuals.widgets.open;
+    }
+    let button = SubMenuButton::new(atoms).config(config);
+    let response = ui.add(button.button);
+    ui.style_mut().visuals.widgets.inactive = inactive;
+    let clip = ui.clip_rect();
+    if !response.rect.intersect(clip).is_positive() {
+        if open {
+            MenuState::from_ui(ui, |state, _| state.open_item = None);
+        }
+        return (response, None);
+    }
+    // Undo the half-spacing expansion used by SubMenu::show after clamping to the clip.
+    let hover_margin = ui.spacing().item_spacing / 2.0;
+    let mut clipped = response.clone();
+    clipped.rect = response.rect.expand2(hover_margin).intersect(clip).shrink2(hover_margin);
+    clipped.interact_rect = response.interact_rect.intersect(clip);
+    let inner = button.sub_menu.show(ui, &clipped, contents);
+    (response, inner)
+}
+
+/// The menu bar contents (inside the app bar; macOS uses the native menu instead).
+pub fn menu_bar(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let lang = app.ui.language.clone();
+    let mut menus = menu_tree();
+    if crate::i18n::is_rtl(&lang) {
+        menus.reverse();
+    }
+    for (menu, entries) in menus {
+        menu_button(ui, crate::rtl::widget(ui, crate::i18n::tr(&lang, menu)), |ui| menu_column(app, ui, &[(menu, entries)]));
+    }
+}
+
+/// One menu's rows, as the menu bar and the canvas context menus show them: runs of items, each
+/// with the menu path its rows are hidden by (Edit › Menus).
+pub(super) fn menu_column<P: AsRef<str>>(app: &mut DesignApp, ui: &mut egui::Ui, runs: &[(P, Vec<Item>)]) {
+    let lang = app.ui.language.clone();
+    let rtl = crate::i18n::is_rtl(&lang);
+    if rtl {
+        ui.set_max_width(320.0);
+    }
+    ui.with_layout(egui::Layout::top_down_justified(if rtl { egui::Align::Max } else { egui::Align::Min }), |ui| {
+        ui.set_min_width(240.0);
+        let mut hidden = 0;
+        for (path, items) in runs {
+            hidden += menu_items(app, ui, items, path.as_ref());
+        }
+        if hidden > 0 && !app.ui.show_full_menus {
+            ui.separator();
+            if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&lang, "Show All Menu Items"))).clicked() {
+                app.ui.show_full_menus = true;
+            }
+        }
+    });
+}
+
+/// The menu bar's submenu at `Menu/Submenu`.
+pub(super) fn menu_bar_submenu(tree: &[(&str, Vec<Item>)], path: &str) -> Option<Item> {
+    let (menu, sub) = path.split_once('/')?;
+    tree.iter().find(|(m, _)| *m == menu)?.1.iter().find(|it| matches!(it, Item::Sub(name, _) if name == sub)).cloned()
+}
diff --git a/crates/ui-egui/src/menus/context.rs b/crates/ui-egui/src/menus/context.rs
new file mode 100644
index 000000000..a8ce474df
--- /dev/null
+++ b/crates/ui-egui/src/menus/context.rs
@@ -0,0 +1,153 @@
+use super::bar::{menu_bar_submenu, menu_column, menu_max_height};
+use super::tree::{menu_tree, parse_entries};
+use super::{DesignApp, Item};
+
+/// What a right-click on the canvas opens a menu for.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ContextMenu {
+    /// The selected objects.
+    Object,
+    /// The text being edited with the Type tool.
+    Text,
+    /// The page or pasteboard, where nothing was hit.
+    Canvas,
+}
+
+// Canvas context menus, in the menu bar's entry syntax; `menu:Menu/Submenu` inserts that menu bar
+// submenu as it is.
+pub(super) const CONTEXT_OBJECT: &[&str] = &[
+    "cmd:edit.undo",
+    "cmd:edit.redo",
+    "-",
+    "cmd:edit.cut",
+    "cmd:edit.copy",
+    "cmd:edit.paste",
+    "cmd:edit.pasteInto",
+    "cmd:edit.pasteInPlace",
+    "-",
+    ">Transform",
+    "cmd:transform.rotate|Rotate 90° Clockwise|{\"angle\": -90}",
+    "cmd:transform.rotate|Rotate 90° Counterclockwise|{\"angle\": 90}",
+    "cmd:transform.rotate|Rotate 180°|{\"angle\": 180}",
+    "-",
+    "cmd:transform.flip|Flip Horizontal|{\"axis\": \"horizontal\"}",
+    "cmd:transform.flip|Flip Vertical|{\"axis\": \"vertical\"}",
+    "-",
+    "cmd:transform.clear",
+    "<",
+    "menu:Object/Arrange",
+    "menu:Object/Select",
+    "-",
+    "cmd:object.group",
+    "cmd:object.ungroup",
+    "cmd:object.lock",
+    "cmd:object.unlockAll",
+    "cmd:object.hide",
+    "cmd:object.showAll",
+    "-",
+];
+
+/// Added to the object menu when a graphic frame is selected.
+pub(super) const CONTEXT_GRAPHIC_FRAME: &[&str] = &["menu:Object/Fitting"];
+
+pub(super) const CONTEXT_OBJECT_TAIL: &[&str] = &["menu:Object/Content", "menu:Object/Effects"];
+
+/// Added to the object menu when a text frame is selected.
+pub(super) const CONTEXT_TEXT_FRAME: &[&str] = &["-", "cmd:type.fillWithPlaceholder", "cmd:object.textFrameOptions"];
+
+pub(super) const CONTEXT_TEXT: &[&str] = &[
+    "cmd:edit.cut",
+    "cmd:edit.copy",
+    "cmd:edit.paste",
+    "cmd:edit.pasteWithoutFormatting",
+    "-",
+    "menu:Type/Insert Special Character",
+    "menu:Type/Insert White Space",
+    "menu:Type/Insert Break Character",
+    "cmd:type.fillWithPlaceholder",
+    "-",
+    "menu:Type/Change Case",
+    "-",
+    "ui:view.hiddenCharacters",
+    "ui:app.storyEditor",
+    "-",
+    "cmd:edit.selectAll",
+];
+
+pub(super) const CONTEXT_CANVAS: &[&str] = &[
+    "cmd:edit.undo",
+    "cmd:edit.redo",
+    "-",
+    "cmd:edit.paste",
+    "cmd:edit.pasteInPlace",
+    "-",
+    "ui:view.zoomIn",
+    "ui:view.zoomOut",
+    "ui:view.fitPage",
+    "ui:view.fitSpread",
+    "ui:view.actualSize",
+    "-",
+    "ui:view.rulers",
+    "menu:View/Grids & Guides",
+    "-",
+    "cmd:edit.selectAll",
+];
+
+/// The menu-bar path context menu rows are keyed by (Edit › Menus doesn't list them); rows
+/// inserted with `menu:` keep their menu bar path.
+const CONTEXT_PATH: &str = "Context";
+
+/// The entries of a canvas context menu for the current selection.
+fn context_entries(app: &DesignApp, kind: ContextMenu) -> Vec<&'static str> {
+    match kind {
+        ContextMenu::Object => {
+            let (graphic, text) = app.session.active().map_or((false, false), |st| {
+                let items = || st.selection.items.iter().filter_map(|i| st.doc.item(*i));
+                (items().any(|it| matches!(it.content, designcraft_doc::Content::Graphic(_))), items().any(|it| it.is_text_frame()))
+            });
+            let mut v = CONTEXT_OBJECT.to_vec();
+            if graphic {
+                v.extend(CONTEXT_GRAPHIC_FRAME);
+            }
+            v.extend(CONTEXT_OBJECT_TAIL);
+            if text {
+                v.extend(CONTEXT_TEXT_FRAME);
+            }
+            v
+        }
+        ContextMenu::Text => CONTEXT_TEXT.to_vec(),
+        ContextMenu::Canvas => CONTEXT_CANVAS.to_vec(),
+    }
+}
+
+/// Parses context menu entries: the menu bar's syntax plus `menu:Menu/Submenu` (not inside a `>`
+/// submenu). Returns runs of items with the menu path they are hidden by: `Context`, or for an
+/// inserted submenu its menu bar menu, so hiding a row in the menu bar hides it here too.
+pub(super) fn context_parse(entries: &[&str]) -> Vec<(String, Vec<Item>)> {
+    let tree = menu_tree();
+    let mut out = Vec::new();
+    let mut run: Vec<&str> = Vec::new();
+    for e in entries {
+        if let Some(path) = e.strip_prefix("menu:") {
+            out.push((CONTEXT_PATH.to_owned(), parse_entries(&std::mem::take(&mut run))));
+            let menu = path.rsplit_once('/').map_or(path, |(menu, _)| menu);
+            out.push((menu.to_owned(), menu_bar_submenu(&tree, path).into_iter().collect()));
+        } else {
+            run.push(e);
+        }
+    }
+    out.push((CONTEXT_PATH.to_owned(), parse_entries(&run)));
+    out
+}
+
+/// A canvas context menu: the menu bar's rows (labels, shortcuts, check marks, greyed when they
+/// can't run), scrolling when taller than the window.
+pub fn context_menu(app: &mut DesignApp, ui: &mut egui::Ui, kind: ContextMenu) {
+    let runs = context_parse(&context_entries(app, kind));
+    let max_height = menu_max_height(ui, None);
+    let mut scroll = egui::ScrollArea::vertical().max_height(max_height).min_scrolled_height(1.0);
+    if ui.is_sizing_pass() {
+        scroll = scroll.vertical_scroll_offset(0.0);
+    }
+    scroll.show(ui, |ui| menu_column(app, ui, &runs));
+}
diff --git a/crates/ui-egui/src/menus/export.rs b/crates/ui-egui/src/menus/export.rs
new file mode 100644
index 000000000..2c1946d4f
--- /dev/null
+++ b/crates/ui-egui/src/menus/export.rs
@@ -0,0 +1,187 @@
+use super::{DesignApp, Value, json};
+use crate::app::file_dialogs::{Bound, with_path};
+
+pub(super) fn download_document(app: &mut DesignApp) -> Result<Value, String> {
+    let name = app.session.active().map(|d| format!("{}.designcraft", d.doc.title)).ok_or("no document")?;
+    let ser = app.run("file.serialize", json!({}))?;
+    let bytes = designcraft_engine::cmd::base64_decode(ser["base64"].as_str().unwrap_or_default());
+    let download = app.services.download.as_mut().ok_or("no download service")?;
+    download(&name, &bytes).map_err(|e| format!("could not download {name}: {e}"))?;
+    // Marks the document saved; on the web the engine doesn't touch a file system.
+    app.run("file.saveAs", json!({"path": name}))
+}
+
+/// Asks where to save `name`, then runs `export` with `p` and the chosen path.
+#[track_caller]
+fn ask_then_export(
+    app: &mut DesignApp,
+    name: &str,
+    p: Value,
+    export: impl FnOnce(&mut DesignApp, &Value) -> Result<Value, String> + 'static,
+) -> Result<Value, String> {
+    app.ask_save(name, Bound::Document, move |app, path| export(app, &with_path(&p, "path", path)))
+}
+
+pub(super) fn export_png(app: &mut DesignApp, p: &Value) -> Result<Value, String> {
+    let st = app.session.active().ok_or("no document")?;
+    let page = crate::control::page_index(p, crate::canvas::current_page(app).unwrap_or(0), st.doc.page_count())?;
+    let Some(path) = p.get("path").and_then(Value::as_str).map(str::to_string) else {
+        // The page in view now is the one exported once the dialog answers.
+        let name = format!("{}-p{}.png", st.doc.title, page + 1);
+        let mut q = if p.is_object() { p.clone() } else { json!({}) };
+        q["page"] = json!(page);
+        return ask_then_export(app, &name, q, export_png);
+    };
+    let scale = p.get("scale").and_then(Value::as_f64).unwrap_or(2.0);
+    let mut r = designcraft_render::Renderer::new();
+    let img = r
+        .render_page(
+            &st.doc,
+            &app.session.cache,
+            page,
+            scale,
+            false,
+            &designcraft_render::RenderOptions { printing_only: true, rich_black: app.session.prefs.rich_black_output, ..Default::default() },
+        )
+        .ok_or("no such page")?;
+    let png = img.to_png();
+    match app.services.write.as_mut() {
+        Some(w) => w(&path, &png).map(|_| json!({"path": path, "width": img.width, "height": img.height})),
+        None => Err("no writer".into()),
+    }
+}
+
+/// File › Export IDML…: ask for a path, export through `file.exportIdml` and write the bytes with
+/// the platform writer (a download on the web).
+pub(super) fn export_idml(app: &mut DesignApp, p: &Value) -> Result<Value, String> {
+    let st = app.session.active().ok_or("no document")?;
+    let Some(path) = p.get("path").and_then(Value::as_str).map(str::to_string) else {
+        let name = format!("{}.idml", st.doc.title);
+        return ask_then_export(app, &name, p.clone(), export_idml);
+    };
+    let r = app.run("file.exportIdml", json!({}))?;
+    let bytes = designcraft_engine::cmd::base64_decode(r["base64"].as_str().unwrap_or_default());
+    match app.services.write.as_mut() {
+        Some(w) => w(&path, &bytes).map(|_| json!({"path": path, "bytes": bytes.len()})),
+        None => Err("no writer".into()),
+    }
+}
+
+/// Export EPUB / Text: ask for a path (default extension `ext`), run `cmd` without one and write
+/// what it returns (`base64` or `text`) with the platform writer.
+/// File › Export EPUB…: export through `file.exportEpub` (the first page as its cover) to `path`,
+/// else to a file the user picks.
+pub(crate) fn export_epub(app: &mut DesignApp, p: &Value) -> Result<Value, String> {
+    let mut q = if p.is_object() { p.clone() } else { json!({}) };
+    if let Some(o) = q.as_object_mut() {
+        o.entry("cover").or_insert(json!(true));
+    }
+    export_bytes(app, &q, "epub", "file.exportEpub")
+}
+
+pub(super) fn export_bytes(app: &mut DesignApp, p: &Value, ext: &str, cmd: &str) -> Result<Value, String> {
+    let st = app.session.active().ok_or("no document")?;
+    let Some(path) = p.get("path").and_then(Value::as_str).map(str::to_string) else {
+        let name = format!("{}.{ext}", st.doc.title);
+        let (ext, cmd) = (ext.to_string(), cmd.to_string());
+        return ask_then_export(app, &name, p.clone(), move |app, q| export_bytes(app, q, &ext, &cmd));
+    };
+    // The caller's options go to the engine command; the path is ours.
+    let mut params = match p {
+        Value::Object(o) => Value::Object(o.iter().filter(|(k, _)| k.as_str() != "path").map(|(k, v)| (k.clone(), v.clone())).collect()),
+        _ => json!({}),
+    };
+    if cmd == "file.exportText" {
+        let txt = path.to_ascii_lowercase().ends_with(".txt");
+        params["format"] = json!(if txt { "txt" } else { "rtf" });
+    }
+    let r = app.run(cmd, params)?;
+    let bytes = match r["text"].as_str() {
+        Some(t) => t.as_bytes().to_vec(),
+        None => designcraft_engine::cmd::base64_decode(r["base64"].as_str().unwrap_or_default()),
+    };
+    match app.services.write.as_mut() {
+        Some(w) => w(&path, &bytes).map(|_| json!({"path": path, "bytes": bytes.len()})),
+        None => Err("no writer".into()),
+    }
+}
+
+/// View › Separations Preview (`view.separations`): updates the plate and the ink limit and
+/// reports the plates of the spread nearest the view center.
+pub(super) fn separations_view(app: &mut DesignApp, p: &Value) -> Result<Value, String> {
+    let mut sep = app.ui.separations.clone().unwrap_or_default();
+    let mut on = app.ui.separations.is_some();
+    match p.get("plate") {
+        Some(Value::String(s)) if s.eq_ignore_ascii_case("all") || s.is_empty() => {
+            sep.plate = None;
+            on = true;
+        }
+        Some(Value::String(s)) => {
+            let process = ["Cyan", "Magenta", "Yellow", "Black"].into_iter().find(|n| n.eq_ignore_ascii_case(s));
+            sep.plate = Some(process.map_or_else(|| s.clone(), str::to_string));
+            on = true;
+        }
+        Some(Value::Null) => {
+            sep.plate = None;
+            on = false;
+        }
+        Some(v) => return Err(format!("`plate`: an ink name, \"all\" or null, not {v}")),
+        None => {}
+    }
+    match p.get("inkLimit") {
+        Some(Value::Null) => sep.ink_limit = None,
+        Some(v) => {
+            let l = v.as_f64().filter(|l| l.is_finite() && *l >= 0.0).ok_or_else(|| format!("`inkLimit`: a percentage, not {v}"))?;
+            sep.ink_limit = Some(l as f32);
+            on = true;
+        }
+        None => {}
+    }
+    on |= sep.ink_limit.is_some();
+    if let Some(v) = p.get("on").and_then(Value::as_bool) {
+        on = v;
+    }
+    app.ui.separations = on.then_some(sep.clone());
+    let mut out = json!({"on": on, "plate": sep.plate.as_deref().unwrap_or("all"), "inkLimit": sep.ink_limit});
+    if on && app.session.active().is_some() {
+        match crate::separations::current_sheet(app) {
+            Ok(sheet) => {
+                if let Some(name) = &sep.plate
+                    && sheet.ink(name).is_none()
+                {
+                    out["warning"] = json!(format!("this spread prints no `{name}` plate"));
+                }
+                out["spread"] = json!(sheet.spread);
+                out["dpi"] = json!(sheet.plates.dpi);
+                out["inks"] = sheet.inks().into_iter().map(|(name, spot)| json!({"name": name, "spot": spot})).collect();
+            }
+            Err(e) => out["error"] = json!(e),
+        }
+    }
+    Ok(out)
+}
+
+/// File › Export PDF…: ask for a path, export through `file.exportPdf` and write the bytes with the
+/// platform writer (a download on the web).
+pub(crate) fn export_pdf(app: &mut DesignApp, p: &Value) -> Result<Value, String> {
+    let st = app.session.active().ok_or("no document")?;
+    let Some(path) = p.get("path").and_then(Value::as_str).map(str::to_string) else {
+        let name = format!("{}.pdf", st.doc.title);
+        return ask_then_export(app, &name, p.clone(), export_pdf);
+    };
+    let mut params = if p.is_object() { p.clone() } else { json!({}) };
+    if let Some(o) = params.as_object_mut() {
+        o.remove("path");
+        o.entry("bleed").or_insert(json!(true));
+        o.entry("tagged").or_insert(json!(true));
+        if !app.ui.flattener.is_empty() {
+            o.entry("flatten").or_insert(json!(app.ui.flattener));
+        }
+    }
+    let r = app.run("file.exportPdf", params)?;
+    let bytes = designcraft_engine::cmd::base64_decode(r["base64"].as_str().unwrap_or_default());
+    match app.services.write.as_mut() {
+        Some(w) => w(&path, &bytes).map(|_| json!({"path": path, "bytes": bytes.len(), "pages": r["pages"], "warnings": r["warnings"]})),
+        None => Err("no writer".into()),
+    }
+}
diff --git a/crates/ui-egui/src/menus/invoke.rs b/crates/ui-egui/src/menus/invoke.rs
new file mode 100644
index 000000000..d11b8deaa
--- /dev/null
+++ b/crates/ui-egui/src/menus/invoke.rs
@@ -0,0 +1,173 @@
+use super::state::waits_for_ime;
+use super::ui_commands::ui_label;
+use super::{DesignApp, Value, json};
+
+/// Close document `index` (the active one when `None`) the way the user asks for it: with the
+/// tab's ×, File ▸ Close or its shortcut. A document with unsaved changes asks first, because
+/// closing also discards its recovery data. Scripts and agents use `file.close`, which never asks.
+pub fn close_document(app: &mut DesignApp, index: Option<usize>) {
+    let Some(i) = index.or(app.session.active_index()) else { return };
+    match app.session.documents().get(i) {
+        Some(d) if d.is_dirty() => {
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("closeDocument", json!({"uid": d.uid, "title": d.title(), "discard": false})));
+        }
+        _ => {
+            let _ = app.run("file.close", json!({"index": i}));
+        }
+    }
+}
+
+/// A menu item was chosen. An engine command whose label ends in "…" and that takes parameters
+/// opens a dialog built from its parameter documentation (see [`crate::dialogs::command_fields`]).
+pub fn activate(app: &mut DesignApp, id: &str, params: &Value) {
+    if waits_for_ime(app, id) {
+        return;
+    }
+    let was_find = app.ui.dialog.as_ref().is_some_and(|d| d.id == "findChange");
+    activate_inner(app, id, params);
+    if was_find && app.ui.dialog.as_ref().is_none_or(|d| d.id != "findChange") {
+        app.session.reset_find_scope();
+    }
+}
+
+fn activate_inner(app: &mut DesignApp, id: &str, params: &Value) {
+    // Object › Effects › Drop Shadow… (and its shortcut): the Effects dialog on that page.
+    if params.is_null()
+        && let Some(page) = crate::effects_dialog::page_of_command(id)
+    {
+        crate::effects_dialog::open(app, page);
+        return;
+    }
+    if params.is_null() && id == "swatch.addColorTheme" {
+        crate::dialogs::open_color_theme(app, json!({}));
+        return;
+    }
+    if params.is_null() && id == "file.close" {
+        close_document(app, None);
+        return;
+    }
+    if params.is_null() && id == "layout.documentSetup" {
+        crate::dialogs::open_document_setup(app);
+        return;
+    }
+    if params.is_null() && id == "file.info" {
+        crate::dialogs::open_file_info(app);
+        return;
+    }
+    if params.is_null() && id == "toc.generate" {
+        crate::dialogs::open_toc(app);
+        return;
+    }
+    if params.is_null() && id == "file.print" {
+        crate::dialogs::open_print(app);
+        return;
+    }
+    if params.is_null() && id == "layout.section" {
+        crate::section_options::open(app);
+        return;
+    }
+    if params.is_null() && id == "layout.createGuides" {
+        crate::dialogs::open_create_guides(app);
+        return;
+    }
+    if params.is_null() && id == "layout.marginsAndColumns" {
+        crate::dialogs::open_margins_and_columns(app);
+        return;
+    }
+    if params.is_null() && id == "object.textFrameOptions" {
+        app.ui.dialog = Some(crate::dialogs::Dialog::new("textFrameOptions", json!({})));
+        return;
+    }
+    // New Paragraph/Character Style…: the style options for the new style.
+    if params.is_null() && matches!(id, "style.paragraph.create" | "style.character.create") {
+        crate::dialogs::open_new_style(app, id == "style.paragraph.create");
+        return;
+    }
+    // Paragraph/Character Style Options…: those of the selected text's style.
+    if params.is_null() && matches!(id, "style.paragraph.edit" | "style.character.edit") {
+        let para = id == "style.paragraph.edit";
+        let cur = crate::panels::text_attrs(app).and_then(|a| a[if para { "paragraphStyle" } else { "characterStyle" }].as_str().map(str::to_string));
+        if let Some(name) = cur {
+            crate::dialogs::open_style_options(app, para, &name);
+            return;
+        }
+    }
+    if params.is_null()
+        && ui_label(id).is_none()
+        && let Some(c) = designcraft_engine::find_command(id)
+        && !crate::dialogs::command_fields(c.params).is_empty()
+        && (c.label.ends_with('…') || crate::dialogs::command_fields(c.params).iter().any(|f| !f.optional))
+    {
+        app.ui.dialog = Some(crate::dialogs::Dialog::new(&format!("cmd:{id}"), json!({})));
+        return;
+    }
+    // Select All Guides: on the spread in view, while guides are shown and not locked.
+    if params.is_null() && id == "guide.selectAll" {
+        if app.ui.guides
+            && !app.ui.guides_locked
+            && let Some(spread) = guide_spread(app)
+        {
+            let _ = app.run(id, json!({"spread": spread}));
+        }
+        return;
+    }
+    let p = if params.is_null() { json!({}) } else { params.clone() };
+    // Update Link asks before replacing edits made to linked text in the layout.
+    if id == "links.update" {
+        crate::panels::properties::update_links(app, p);
+        return;
+    }
+    let _ = app.run(id, p);
+}
+
+/// The spread the guide commands of the menus act on: the one in view (a parent spread while
+/// parents are edited).
+pub(super) fn guide_spread(app: &DesignApp) -> Option<Value> {
+    let st = app.session.active()?;
+    let page = crate::canvas::current_page(app).unwrap_or(0);
+    Some(if st.editing_parents {
+        let layout = designcraft_tools::CanvasLayout::new(&st.doc, true);
+        let shown = crate::canvas::current_slot(app, &layout).and_then(|i| layout.slots.get(i)).map(|s| s.spread);
+        json!(shown.unwrap_or(designcraft_doc::SpreadRef::Parent(0)))
+    } else {
+        json!(st.doc.page_loc(page).map_or(0, |l| l.0))
+    })
+}
+
+/// A native menu bar item was chosen (macOS): like [`activate`], except that the menu bar takes
+/// ⌘A, ⌘C, ⌘X, ⌘V, ⌘Z and ⇧⌘Z before the window sees them, so while a text field has keyboard
+/// focus, Select All, Copy, Cut, Paste, Undo and Redo act on that field, as in any Mac app.
+pub fn activate_native(app: &mut DesignApp, ctx: &egui::Context, id: &str, params: &Value) {
+    if params.is_null() && ctx.text_edit_focused() && forward_to_text_edit(app, ctx, id) {
+        return;
+    }
+    // The canvas text editor is not an egui TextEdit, so its clipboard events must pass through
+    // egui for the desktop integration to read/write the macOS clipboard.
+    if params.is_null() && app.session.wants_text() && matches!(id, "edit.copy" | "edit.cut" | "edit.paste") && forward_to_text_edit(app, ctx, id) {
+        return;
+    }
+    activate(app, id, params);
+}
+
+/// The editing commands a focused text field takes from the native menu bar.
+pub(super) const TEXT_FIELD_COMMANDS: [&str; 6] = ["edit.selectAll", "edit.copy", "edit.cut", "edit.paste", "edit.undo", "edit.redo"];
+
+/// Hand a standard editing command to the focused text field as next frame's input; false when
+/// `id` isn't one of them.
+fn forward_to_text_edit(app: &mut DesignApp, ctx: &egui::Context, id: &str) -> bool {
+    let key = |key: egui::Key, modifiers: egui::Modifiers| {
+        [true, false].map(|pressed| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers })
+    };
+    match id {
+        "edit.selectAll" => app.synthetic.extend(key(egui::Key::A, egui::Modifiers::COMMAND)),
+        "edit.undo" => app.synthetic.extend(key(egui::Key::Z, egui::Modifiers::COMMAND)),
+        "edit.redo" => app.synthetic.extend(key(egui::Key::Z, egui::Modifiers::COMMAND | egui::Modifiers::SHIFT)),
+        "edit.copy" => app.synthetic.push(egui::Event::Copy),
+        "edit.cut" => app.synthetic.push(egui::Event::Cut),
+        // Only the integration reads the system clipboard: it answers with an `Event::Paste`.
+        "edit.paste" => ctx.send_viewport_cmd(egui::ViewportCommand::RequestPaste),
+        _ => return false,
+    }
+    ctx.request_repaint();
+    true
+}
diff --git a/crates/ui-egui/src/menus/keys.rs b/crates/ui-egui/src/menus/keys.rs
new file mode 100644
index 000000000..b7e1fa539
--- /dev/null
+++ b/crates/ui-egui/src/menus/keys.rs
@@ -0,0 +1,177 @@
+use super::invoke::activate;
+use super::{DesignApp, ScreenMode, Value, json};
+
+/// The command a paste event stands for besides plain Paste. egui-winit turns every ⌘+V chord into
+/// `Event::Paste` with the clipboard's text and drops the key press, and the keymap reads the chord
+/// from the frame's final modifiers, which miss a chord released within the frame; the modifiers
+/// held when it went down tell them apart. `None` when the chord is another one, or the native
+/// menu's accelerator takes it.
+#[cfg(not(target_arch = "wasm32"))]
+pub fn paste_chord_command(app: &DesignApp, modifiers: egui::Modifiers) -> Option<&'static str> {
+    let id = "edit.pasteInPlace";
+    if app.native_menu && app.keymap.overrides().get(id).is_none() {
+        return None;
+    }
+    let platform = app.keymap.platform();
+    let held = craft_keymap::Mods::from_egui(&modifiers, platform);
+    let pressed = craft_keymap::Chord::new(held, craft_keymap::Key::V);
+    // A shortcut the user set is the menu bar's key equivalent once the bar carries it.
+    let on_bar = app
+        .native_shortcuts
+        .get(id)
+        .and_then(|sc| craft_keymap::Binding::parse(sc).ok())
+        .is_some_and(|b| !b.trigger.double && b.trigger.chord.effective(platform) == pressed);
+    if app.native_menu && on_bar {
+        return None;
+    }
+    let bound =
+        app.keymap.bindings(&craft_keymap::CommandRef::new(id)).iter().any(|b| !b.trigger.double && b.trigger.chord.effective(platform) == pressed);
+    bound.then_some(id)
+}
+
+/// Global keyboard shortcuts: menu commands, panels and tools, through the keymap.
+pub fn shortcuts(app: &mut DesignApp, ctx: &egui::Context) {
+    app.sync_keymap();
+    // Only a focused text field takes the keys: the canvas (or a button) having focus after a click
+    // must not swallow tool shortcuts until Esc clears it.
+    if ctx.text_edit_focused() || keys_taken(app, ctx) {
+        return;
+    }
+    let typing = app.session.wants_text();
+    let keys = ctx.input_mut(|i| take_keys(app, i, typing));
+    run_keys(app, keys, typing);
+}
+
+/// Keys that a floating panel in its own OS window left over (craft-ui's
+/// `DockOutput::forwarded_events`, with the modifiers held in that window): they run the main
+/// window's shortcuts, clipboard and tool keys in the frame they arrive, so the keyboard works
+/// while a floating window has focus. craft-ui forwards nothing while one of that window's
+/// widgets has keyboard focus.
+pub fn forwarded_shortcuts(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>, modifiers: egui::Modifiers) {
+    if events.is_empty() || keys_taken(app, ctx) {
+        return;
+    }
+    app.sync_keymap();
+    let typing = app.session.wants_text();
+    // The keymap dispatches from an input state: the main window's, with the floating window's
+    // keys and modifiers in place of its own.
+    let mut input = ctx.input(|i| i.clone());
+    input.events = events;
+    input.modifiers = modifiers;
+    let keys = take_keys(app, &mut input, typing);
+    run_keys(app, keys, typing);
+    crate::canvas::forwarded_keys(app, input.events, modifiers);
+}
+
+/// Whether something other than the shortcuts has the keyboard: a dialog or Quick Apply, an input
+/// method composing at the text caret, an open canvas context menu (Escape closes it, as a
+/// native menu would) or the menu search.
+fn keys_taken(app: &DesignApp, ctx: &egui::Context) -> bool {
+    app.ui.dialog.is_some()
+        || app.ui.palette.is_some()
+        || app.session.tool_composing()
+        || crate::canvas::context_menu_open(ctx)
+        || crate::chrome::search_had_focus(ctx)
+}
+
+/// The key presses [`take_keys`] took from an input, run by [`run_keys`] once the input is
+/// released: commands may read the context.
+struct Keys {
+    /// Presentation keys in order: `None` leaves Presentation, `Some(step)` moves through the spreads.
+    presentation: Vec<Option<isize>>,
+    hits: Vec<craft_keymap::egui::Hit>,
+    /// An Esc press that nothing took.
+    escape: bool,
+}
+
+/// Takes the presentation keys and the command, panel and tool shortcuts out of `input`'s key
+/// presses.
+fn take_keys(app: &mut DesignApp, input: &mut egui::InputState, typing: bool) -> Keys {
+    let presentation = if app.ui.screen_mode == ScreenMode::Presentation { presentation_keys(input) } else { Vec::new() };
+    let contexts: &[&str] = if typing { &[crate::keys::TEXT_CONTEXT] } else { &[] };
+    let active = craft_keymap::Active { panel: None, contexts, typing };
+    let native = &app.native_shortcuts;
+    // Presses the dispatcher leaves alone: Clear (the active tool deletes) and the keys the
+    // native menu's accelerators already handled. An item holds one key equivalent, its
+    // command's first shortcut in effect, and fires only for it exactly: the Plus key standing
+    // in for = never reaches it, and a command's other bindings run here.
+    // Copy, Cut and Paste stay too (the dispatcher's default): the canvas and text tools
+    // handle them, and Paste carries the text.
+    let accept = |hit: &craft_keymap::egui::Hit| {
+        let c = &hit.command;
+        let on_bar =
+            || c.params.is_null() && native.get(&c.id).and_then(|sc| craft_keymap::Binding::parse(sc).ok()).is_some_and(|b| b.trigger == hit.trigger);
+        let leave = hit.exact && hit.cycle.is_empty() && (c.id == "edit.clear" || on_bar());
+        !leave
+    };
+    let hits = app.key_dispatcher.dispatch_filtered(input, &app.keymap, &active, accept);
+    let escape = input.events.iter().any(
+        |e| matches!(e, egui::Event::Key { key: egui::Key::Escape, pressed: true, repeat: false, modifiers, .. } if !modifiers.command && !modifiers.alt),
+    );
+    Keys { presentation, hits, escape }
+}
+
+/// Runs what [`take_keys`] took, then Esc's return to the Selection tool.
+fn run_keys(app: &mut DesignApp, keys: Keys, typing: bool) {
+    for step in keys.presentation {
+        match step {
+            None => {
+                let _ = app.run("view.togglePresentation", json!({}));
+            }
+            Some(step) => crate::canvas::step_spread(app, step),
+        }
+    }
+    for hit in keys.hits {
+        if !hit.cycle.is_empty() {
+            // Tools sharing a key: the press after the group's current tool selects the next one.
+            let current = app.session.tool_id();
+            let tools: Vec<&str> = hit.cycle.iter().filter_map(|c| c.params.get("tool").and_then(Value::as_str)).collect();
+            let next = tools.iter().position(|t| *t == current).and_then(|i| tools.get((i + 1) % tools.len())).or(tools.first());
+            if let Some(tool) = next.map(|t| t.to_string()) {
+                log::debug!("tool shortcut -> {tool}");
+                app.select_tool(&tool);
+            }
+        } else if hit.command.id == crate::keys::TOOL_COMMAND
+            && let Some(tool) = hit.command.params.get("tool").and_then(Value::as_str).map(str::to_string)
+        {
+            log::debug!("tool shortcut -> {tool}");
+            app.select_tool(&tool);
+        } else {
+            // Like choosing the menu item: "…" commands open their dialog.
+            activate(app, &hit.command.id, &hit.command.params);
+        }
+    }
+    // Esc with no shortcut of its own goes back to the Selection tool.
+    if keys.escape && !typing && app.session.tool_id() != "selection" && !app.session.tool_busy() && app.ui.flyout.is_none() {
+        app.select_tool("selection");
+    }
+}
+
+/// Takes the Presentation keys out of `input`. Presentation hides every control, so Esc always
+/// leaves it, and only that: the canvas must not also see the press and switch tools or deselect.
+/// The arrow keys, Page Up/Down, Home and End go through the spreads.
+fn presentation_keys(input: &mut egui::InputState) -> Vec<Option<isize>> {
+    let mut steps = Vec::new();
+    for e in input.events.clone() {
+        let egui::Event::Key { key, pressed: true, modifiers, repeat: false, .. } = e else { continue };
+        if key == egui::Key::Escape {
+            input.consume_key(modifiers, key);
+            steps.push(None);
+            continue;
+        }
+        if !modifiers.command && !modifiers.alt {
+            let step = match key {
+                egui::Key::ArrowRight | egui::Key::ArrowDown | egui::Key::PageDown => Some(1),
+                egui::Key::ArrowLeft | egui::Key::ArrowUp | egui::Key::PageUp => Some(-1),
+                egui::Key::Home => Some(isize::MIN),
+                egui::Key::End => Some(isize::MAX),
+                _ => None,
+            };
+            if let Some(step) = step {
+                input.consume_key(modifiers, key);
+                steps.push(Some(step));
+            }
+        }
+    }
+    steps
+}
diff --git a/crates/ui-egui/src/menus/quick_apply.rs b/crates/ui-egui/src/menus/quick_apply.rs
new file mode 100644
index 000000000..ec91a2c8a
--- /dev/null
+++ b/crates/ui-egui/src/menus/quick_apply.rs
@@ -0,0 +1,190 @@
+use super::state::{shortcut_of, shortcut_text};
+use super::ui_commands::{CJK_ONLY, UI_COMMANDS, shown};
+use super::{DesignApp, Value, json};
+
+/// Quick Apply (⌘Return): the document's styles and every command, searched by name.
+pub fn palette(app: &mut DesignApp, ctx: &egui::Context) {
+    let Some(mut q) = app.ui.palette.clone() else { return };
+    let mut close = false;
+    let mut run: Option<(String, Value)> = None;
+    egui::Modal::new(egui::Id::unique("palette")).show(ctx, |ui| {
+        ui.set_width(480.0);
+        let r = ui.add(
+            egui::TextEdit::singleline(&mut q)
+                .hint_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Search styles and commands…")))
+                .desired_width(f32::INFINITY),
+        );
+        r.request_focus();
+        let items = quick_apply_items(&app.session, &q, crate::cjk_features(app));
+        // Only a fresh Return runs the first entry: ⌘Return pressed again or held down (repeats) is
+        // the shortcut, not a choice.
+        let enter = ui.input(|i| {
+            i.events
+                .iter()
+                .any(|e| matches!(e, egui::Event::Key { key: egui::Key::Enter, pressed: true, repeat: false, modifiers, .. } if !modifiers.command))
+        });
+        egui::ScrollArea::vertical().max_height(340.0).show(ui, |ui| {
+            for (i, it) in items.iter().enumerate() {
+                let mut b = egui::Button::new(it.label.as_str()).frame(false);
+                if let Some(sc) = &it.shortcut {
+                    b = b.shortcut_text(shortcut_text(sc));
+                } else if !it.kind.is_empty() {
+                    b = b.shortcut_text(crate::i18n::tr(&app.ui.language, it.kind));
+                }
+                // The button aligns its label by the layout it's in: left, like the rows with a shortcut.
+                let size = egui::vec2(460.0, 22.0);
+                let row =
+                    ui.allocate_ui_with_layout(size, egui::Layout::left_to_right(egui::Align::Center).with_main_align(egui::Align::Min), |ui| {
+                        ui.add(b.min_size(size))
+                    });
+                if row.inner.clicked() || (i == 0 && enter) {
+                    run = Some((it.id.clone(), it.params.clone()));
+                }
+            }
+        });
+        if ui.input(|i| i.key_pressed(egui::Key::Escape)) {
+            close = true;
+        }
+    });
+    app.ui.palette = if close || run.is_some() { None } else { Some(q) };
+    if let Some((id, params)) = run {
+        let _ = app.run(&id, params);
+    }
+}
+
+/// One Quick Apply entry: a style to apply or a command to run.
+#[derive(Clone, Debug, PartialEq)]
+pub struct QuickItem {
+    pub label: String,
+    pub id: String,
+    pub params: Value,
+    pub shortcut: Option<String>,
+    /// "Paragraph Style", "Character Style", "Object Style", or "" for commands.
+    pub kind: &'static str,
+}
+
+/// Quick Apply matches (styles first, as InDesign lists them), at most 14.
+pub fn quick_apply_items(session: &designcraft_engine::Session, query: &str, cjk: bool) -> Vec<QuickItem> {
+    let ql = query.to_lowercase();
+    let hit = |label: &str, id: &str| quick_match(&ql, &[label, id]);
+    let mut out = Vec::new();
+    if let Some(st) = session.active() {
+        let styles = &st.doc.styles;
+        let mut add = |name: &str, id: &str, kind: &'static str| {
+            if name.starts_with('[') || !hit(name, "") {
+                return;
+            }
+            out.push(QuickItem { label: name.to_string(), id: id.into(), params: json!({"name": name}), shortcut: None, kind });
+        };
+        for p in &styles.paragraph {
+            add(&p.name, "style.paragraph.apply", "Paragraph Style");
+        }
+        for c in &styles.character {
+            add(&c.name, "style.character.apply", "Character Style");
+        }
+        for o in &styles.object {
+            add(&o.name, "style.object.apply", "Object Style");
+        }
+    }
+    // Styles need a query, else they would crowd out the commands.
+    if ql.is_empty() {
+        out.clear();
+    }
+    let commands = quick_commands().filter(|(id, l, _)| hit(l, id) && (cjk || !CJK_ONLY.contains(id))).map(|(id, l, sc)| QuickItem {
+        label: l.to_string(),
+        id: id.to_string(),
+        params: json!({}),
+        shortcut: sc.map(str::to_string),
+        kind: "",
+    });
+    out.extend(commands);
+    out.truncate(14);
+    out
+}
+
+/// UI commands search leaves out: they only run with a parameter search can't supply and have no
+/// dialog to ask for it, or without one they reset a setting. Each stays in the menu, panel or
+/// dialog that gives it the value (the workspace menus, Keyboard Shortcuts, Preferences…).
+const NOT_SEARCHED: &[&str] = &[
+    // The workspace to switch to or delete.
+    "window.workspace",
+    "window.deleteWorkspace",
+    // A command and its shortcut, a menu item, a shortcut set; Reset Shortcuts clears every
+    // custom shortcut, and the Keyboard Shortcuts dialog offers it.
+    "window.setShortcut",
+    "window.resetShortcuts",
+    "window.importShortcuts",
+    "window.hideMenuItem",
+    // Without a value these reset the interface to 100% and the dark theme.
+    "window.uiScale",
+    "window.brightness",
+    // A panel, and where it goes.
+    "window.floatPanel",
+    "window.dockPanel",
+    "window.panel.layout",
+    "window.panel.move",
+    "window.panel.float",
+    "window.panel.dock",
+    "window.panel.activate",
+    "window.panel.close",
+    "window.panel.closeGroup",
+    // A window edge, an app page, a recent file, a swatch or color group.
+    "window.resize",
+    "help.app",
+    "app.openRecent",
+    "app.swatchOptionsDialog",
+    "app.colorGroupOptionsDialog",
+    // Without a value these clear the flattener preset, go to Normal screen mode or 100% zoom.
+    "app.flattener",
+    "view.screenMode",
+    "view.zoom",
+    // Where to pin the Contextual Task Bar.
+    "window.taskBarPin",
+    // Shared docking commands DesignCraft doesn't provide, those that need a panel or a name,
+    // and older ids that share a label with a searched docking command.
+    "window.panel",
+    "window.panel.window",
+    "window.workspace.lock",
+    "window.panel.closeOthers",
+    "window.panel.minimize",
+    "window.panel.iconic",
+    "window.workspace.new",
+    "window.workspace.delete",
+    "ui.dock",
+    "ui.dock.reset",
+    "window.resetWorkspace",
+];
+
+/// The commands Quick Apply and the application bar's search find: (id, label, default shortcut).
+pub(super) fn quick_commands() -> impl Iterator<Item = (&'static str, &'static str, Option<&'static str>)> {
+    designcraft_engine::command_specs()
+        .iter()
+        .filter(|c| !c.menu.is_empty() || c.shortcut.is_some())
+        .map(|c| (c.id, c.label, c.shortcut))
+        .chain(UI_COMMANDS.iter().filter(|c| !NOT_SEARCHED.contains(&c.0)).map(|c| (c.0, c.1, c.2)))
+}
+
+/// Whether any of `texts` contains the lowercased query (an empty query matches everything).
+fn quick_match(query_lower: &str, texts: &[&str]) -> bool {
+    query_lower.is_empty() || texts.iter().any(|t| t.to_lowercase().contains(query_lower))
+}
+
+/// The application bar's search: the commands whose label in the interface language, English
+/// label or id contains `query`, labelled in the interface language with the shortcut in effect.
+/// Nothing for an empty query; at most 14.
+pub fn command_search(app: &DesignApp, query: &str) -> Vec<QuickItem> {
+    let ql = query.trim().to_lowercase();
+    if ql.is_empty() {
+        return Vec::new();
+    }
+    let lang = app.ui.language.as_str();
+    let mut out: Vec<QuickItem> = Vec::new();
+    for (id, label, _) in quick_commands() {
+        let shown = crate::i18n::tr(lang, label);
+        if out.len() >= 14 || !self::shown(app, id) || out.iter().any(|it| it.id == id) || !quick_match(&ql, &[shown, label, id]) {
+            continue;
+        }
+        out.push(QuickItem { label: shown.to_string(), id: id.to_string(), params: Value::Null, shortcut: shortcut_of(app, id), kind: "" });
+    }
+    out
+}
diff --git a/crates/ui-egui/src/menus/run.rs b/crates/ui-egui/src/menus/run.rs
new file mode 100644
index 000000000..6a8d797b5
--- /dev/null
+++ b/crates/ui-egui/src/menus/run.rs
@@ -0,0 +1,1128 @@
+use super::export::{download_document, export_bytes, export_epub, export_idml, export_pdf, export_png, separations_view};
+use super::invoke::guide_spread;
+use super::state::{is_window_control, window_control_available};
+use super::tables::{CLASSIC_GROUPS, TYPOGRAPHY_GROUPS, workspace_open_panel};
+use super::tree::recent_label;
+use super::{DesignApp, ScreenMode, Value, json};
+use crate::app::file_dialogs::{Bound, with_path};
+
+/// Type › Tabs: float the Tabs panel (placed above the selected text frame) or close it.
+fn toggle_tabs_panel(app: &mut DesignApp) {
+    if app.ui.floating.iter().any(|(p, _)| p == "tabs") {
+        app.ui.floating.retain(|(p, _)| p != "tabs");
+    } else {
+        let at = app.canvas_rect.map_or(egui::pos2(300.0, 140.0), |r| r.min + egui::vec2(80.0, 60.0));
+        app.ui.floating.push(("tabs".into(), [at.x, at.y]));
+        app.ui.tabs_panel.snap_request = 2;
+    }
+}
+
+/// Asks for a file to open for `purpose`, then runs the UI command `id` again with `p` and the
+/// chosen file under `key`.
+#[track_caller]
+fn rerun_with_path(app: &mut DesignApp, purpose: &str, id: &str, p: &Value, key: &'static str) -> Result<Value, String> {
+    let (id, p) = (id.to_string(), p.clone());
+    app.ask_open(purpose, Bound::Document, move |app, path| run_ui(app, &id, &with_path(&p, key, path)).unwrap_or(Ok(Value::Null)))
+}
+
+/// File › Save As: asks where, saves there, then runs `after`.
+#[track_caller]
+fn save_as_dialog(app: &mut DesignApp, after: impl FnOnce(&mut DesignApp) -> Result<Value, String> + 'static) -> Result<Value, String> {
+    let name = app.session.active().map(|d| format!("{}.designcraft", d.doc.title)).unwrap_or_default();
+    app.ask_save(&name, Bound::Document, move |app, path| {
+        app.run("file.saveAs", json!({"path": path}))?;
+        after(app)
+    })
+}
+
+/// Save the active document (a download in a browser; Save As for one never saved), then run
+/// `after` once it is written. A save dialog answers on a later frame; Cancel runs nothing.
+#[track_caller]
+pub(crate) fn save_then(app: &mut DesignApp, after: impl FnOnce(&mut DesignApp) -> Result<Value, String> + 'static) -> Result<Value, String> {
+    if app.services.download.is_some() {
+        download_document(app)?;
+        return after(app);
+    }
+    if app.session.active().is_some_and(|d| d.path.is_some()) {
+        app.run("file.save", json!({}))?;
+        return after(app);
+    }
+    save_as_dialog(app, after)
+}
+
+/// Run a UI command; `None` if `id` isn't one.
+pub fn run_ui(app: &mut DesignApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
+    let was_find = app.ui.dialog.as_ref().is_some_and(|d| d.id == "findChange");
+    let result = run_ui_inner(app, id, p);
+    if was_find && app.ui.dialog.as_ref().is_none_or(|d| d.id != "findChange") {
+        app.session.reset_find_scope();
+    }
+    result
+}
+
+fn run_ui_inner(app: &mut DesignApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
+    if is_window_control(id) && !window_control_available(app, id) {
+        return Some(Err("custom window controls are not available in this host".into()));
+    }
+    if let Some(result) = crate::panel_docking::command(app, id, p) {
+        return Some(result);
+    }
+    run_ui_part1(app, id, p)
+        .or_else(|| run_ui_part2(app, id, p))
+        .or_else(|| run_ui_part3(app, id, p))
+        .or_else(|| run_ui_part4(app, id, p))
+        .or_else(|| run_ui_part5(app, id, p))
+}
+
+/// Toggle `b`, answering its new value.
+fn flag(b: &mut bool) -> Result<Value, String> {
+    *b = !*b;
+    Ok(json!(*b))
+}
+
+/// One slice of the UI commands: `None` if `id` isn't one of them.
+fn run_ui_part1(app: &mut DesignApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
+    Some(match id {
+        "window.minimize" => {
+            app.pending_window_commands.push(egui::ViewportCommand::Minimized(true));
+            Ok(Value::Null)
+        }
+        "window.maximize" => {
+            let on = p.get("on").and_then(Value::as_bool).unwrap_or(!app.window_maximized);
+            app.pending_window_commands.push(egui::ViewportCommand::Maximized(on));
+            Ok(json!(on))
+        }
+        "window.close" => {
+            app.pending_window_commands.push(egui::ViewportCommand::Close);
+            Ok(Value::Null)
+        }
+        "window.drag" => {
+            app.pending_window_commands.push(egui::ViewportCommand::StartDrag);
+            Ok(Value::Null)
+        }
+        "window.resize" => {
+            let edge = match p.get("edge").and_then(Value::as_str) {
+                Some("north") => egui::ResizeDirection::North,
+                Some("south") => egui::ResizeDirection::South,
+                Some("east") => egui::ResizeDirection::East,
+                Some("west") => egui::ResizeDirection::West,
+                Some("northEast") => egui::ResizeDirection::NorthEast,
+                Some("southEast") => egui::ResizeDirection::SouthEast,
+                Some("northWest") => egui::ResizeDirection::NorthWest,
+                Some("southWest") => egui::ResizeDirection::SouthWest,
+                _ => return Some(Err("invalid window resize edge".into())),
+            };
+            app.pending_window_commands.push(egui::ViewportCommand::BeginResize(edge));
+            Ok(Value::Null)
+        }
+        "app.newDocumentDialog" => {
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("newDocument", json!({})));
+            Ok(Value::Null)
+        }
+        "app.openDialog" => match p.get("path").and_then(Value::as_str) {
+            Some(path) => app.open_picked("open", path.to_string()),
+            None => app.pick_and_open("open"),
+        },
+        "app.openRecent" => {
+            let index = p.get("index").cloned().unwrap_or(Value::Null);
+            let name = index
+                .as_u64()
+                .and_then(|i| usize::try_from(i).ok())
+                .and_then(|i| app.session.prefs.recent_files.get(i))
+                .map(|path| recent_label(path))
+                .unwrap_or_default();
+            app.open_named_file("file.openRecent", json!({"index": index}), name)
+        }
+        "app.placeDialog" => match p.get("path").and_then(Value::as_str) {
+            Some(path) => app.open_picked("place", path.to_string()),
+            None => app.pick_and_open("place"),
+        },
+        "app.placeWithOptions" => {
+            // Word/RTF Import Options: style mapping and conflicts before the text lands.
+            let Some(path) = p.get("path").and_then(Value::as_str) else { return Some(rerun_with_path(app, "place", id, p, "path")) };
+            let l = path.to_lowercase();
+            if !(l.ends_with(".docx") || l.ends_with(".rtf")) {
+                return Some(app.place_file(json!({"path": path})));
+            }
+            let info = match app.run("place.styles", json!({"path": path})) {
+                Ok(v) => v,
+                Err(e) => return Some(Err(e)),
+            };
+            app.ui.dialog = Some(crate::dialogs::Dialog::new(
+                "importOptions",
+                json!({"path": path, "styles": info["paragraph"], "charStyles": info["character"], "conflicts": info["conflicts"], "styleConflicts": "useExisting", "removeStyles": false, "map": {}}),
+            ));
+            Ok(Value::Null)
+        }
+        "app.save" | "app.saveDialog" if app.services.download.is_some() => download_document(app),
+        "app.save" => {
+            if app.session.active().is_some_and(|d| d.path.is_some()) {
+                return Some(app.run("file.save", json!({})));
+            }
+            return run_ui(app, "app.saveDialog", p);
+        }
+        "app.saveDialog" => match p.get("path").and_then(Value::as_str) {
+            Some(path) => app.run("file.saveAs", json!({"path": path})),
+            None => save_as_dialog(app, |_| Ok(Value::Null)),
+        },
+        "app.quit" => {
+            app.request_quit();
+            Ok(Value::Null)
+        }
+        "app.saveCopyDialog" => match p.get("path").and_then(Value::as_str) {
+            Some(path) => app.run("file.saveACopy", json!({"path": path})),
+            None => {
+                let name = app.session.active().map(|d| format!("{} copy.designcraft", d.doc.title)).unwrap_or_default();
+                app.ask_save(&name, Bound::Document, |app, path| app.run("file.saveACopy", json!({"path": path})))
+            }
+        },
+        "app.exportPng" => export_png(app, p),
+        "app.exportIdml" => export_idml(app, p),
+        // From the menu, EPUB Export Options first; with a path, straight to the file.
+        "app.exportEpub" if p.get("path").is_some() => export_epub(app, p),
+        "app.exportEpub" => {
+            crate::dialogs::open_epub_export(app);
+            Ok(Value::Null)
+        }
+        "app.exportInteractivePdf" => {
+            let mut q = if p.is_object() { p.clone() } else { json!({}) };
+            for (k, v) in [("pageLayout", json!("single")), ("view", json!("fitPage")), ("bookmarksPanel", json!(true)), ("media", json!(true))] {
+                q.as_object_mut().map(|o| o.entry(k).or_insert(v));
+            }
+            export_pdf(app, &q)
+        }
+        "app.exportFixedEpub" => export_bytes(app, p, "epub", "file.exportFixedEpub"),
+        "app.exportHtml" => export_bytes(app, p, "html", "file.exportHtml"),
+        "app.exportPptx" => export_bytes(app, p, "pptx", "file.exportPptx"),
+        "app.exportXml" => export_bytes(app, p, "xml", "file.exportXml"),
+        "app.printBooklet" => export_bytes(app, p, "pdf", "file.printBooklet"),
+        "app.menus" => {
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("menus", json!({"query": ""})));
+            Ok(Value::Null)
+        }
+        "app.cellOptionsDialog" => crate::dialogs::open_cell_options(app),
+        "window.hideMenuItem" => {
+            let Some(item) = p.get("item").and_then(Value::as_str) else { return Some(Err("missing item".into())) };
+            let hide = p.get("hidden").and_then(Value::as_bool).unwrap_or(true);
+            app.ui.hidden_menu_items.retain(|x| x != item);
+            if hide {
+                app.ui.hidden_menu_items.push(item.to_string());
+            }
+            app.ui.show_full_menus = false;
+            Ok(Value::Null)
+        }
+        "app.placeAndLink" => {
+            let target = app.session.active().and_then(|d| {
+                let id = *d.selection.items.first()?;
+                let it = d.doc.item(id)?;
+                let loc = d.doc.find(id)?;
+                Some((it.text_frame()?.story, it.bounds(), loc.spread))
+            });
+            let Some((sid, b, sr)) = target else { return Some(Err("select a text frame".into())) };
+            Ok(app
+                .run("story.placeAndLink", json!({"story": sid.0, "rect": [b.x0 + 24.0, b.y0 + 24.0, b.x1 + 24.0, b.y1 + 24.0], "spread": sr}))
+                .unwrap_or(Value::Null))
+        }
+        "app.fittingOptions" => {
+            let g = app.session.active().and_then(|d| d.selection.items.first().and_then(|id| d.doc.item(*id)).and_then(|it| it.graphic().cloned()));
+            let Some(g) = g else { return Some(Err("select a frame with a placed graphic".into())) };
+            let fitting = serde_json::to_value(g.auto_fit).unwrap_or(json!("none"));
+            let c = |v: f64| json!(designcraft_geom::format_measure(v, designcraft_geom::Unit::Points));
+            app.ui.dialog = Some(crate::dialogs::Dialog::new(
+                "fittingOptions",
+                json!({"autoFit": g.auto_fit != designcraft_doc::Fitting::None, "fitting": fitting, "align": g.fit_align,
+                    "cropTop": c(g.crop[0]), "cropLeft": c(g.crop[1]), "cropBottom": c(g.crop[2]), "cropRight": c(g.crop[3])}),
+            ));
+            Ok(Value::Null)
+        }
+        "app.userDictionary" => {
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("userDictionary", json!({"word": ""})));
+            Ok(Value::Null)
+        }
+        "app.qrCode" => {
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("qrCode", json!({})));
+            Ok(Value::Null)
+        }
+        "app.exportText" => export_bytes(app, p, "rtf", "file.exportText"),
+        "app.packageDialog" => {
+            let Some(dir) = p.get("dir").and_then(Value::as_str) else {
+                let name = app.session.active().map(|d| format!("{} Folder", d.doc.title)).unwrap_or_default();
+                let p = p.clone();
+                return Some(app.ask_save(&name, Bound::Document, move |app, dir| {
+                    run_ui(app, "app.packageDialog", &with_path(&p, "dir", dir)).unwrap_or(Ok(Value::Null))
+                }));
+            };
+            let r = app.run("file.package", json!({"dir": dir}));
+            if let Ok(v) = &r {
+                app.status(
+                    crate::i18n::tr(&app.ui.language, "Packaged {count} files into {dir}")
+                        .replace("{count}", &v["files"].as_array().map_or(0, |f| f.len()).to_string())
+                        .replace("{dir}", v["dir"].as_str().unwrap_or("")),
+                );
+            }
+            r
+        }
+        "app.language" => {
+            let Some(v) = p.get("lang").and_then(Value::as_str) else { return Some(app.run("app.preferences", json!({}))) };
+            if !crate::i18n::LANGUAGES.iter().any(|(c, _)| *c == v) {
+                return Some(Err(format!("unknown language `{v}`")));
+            }
+            app.ui.language = v.to_string();
+            Ok(json!(v))
+        }
+        "app.flattener" => {
+            let v = p.get("preset").and_then(Value::as_str).unwrap_or("");
+            if !["", "high", "medium", "low"].contains(&v) {
+                return Some(Err(format!("unknown preset `{v}`")));
+            }
+            app.ui.flattener = v.to_string();
+            Ok(json!(v))
+        }
+        "app.graphicCell" => match p.get("path").and_then(Value::as_str) {
+            Some(path) => app.run("table.placeGraphic", json!({"path": path})),
+            None => rerun_with_path(app, "place", id, p, "path"),
+        },
+        "effects.dialog" => {
+            crate::effects_dialog::open(app, p.get("page").and_then(Value::as_str).unwrap_or("transparency"));
+            Ok(Value::Null)
+        }
+        "app.loadSwatches" => {
+            if let Some(path) = p.get("path").and_then(Value::as_str) {
+                return Some(app.run("swatch.load", json!({"path": path})));
+            }
+            let request = app.import_request("swatches");
+            if let Some(open) = app.services.open_async.as_mut() {
+                open(request);
+                return Some(Ok(Value::Null));
+            }
+            app.ask_open("swatches", Bound::Document, |app, path| app.run("swatch.load", json!({"path": path})))
+        }
+        _ => return None,
+    })
+}
+
+/// One slice of the UI commands: `None` if `id` isn't one of them.
+fn run_ui_part2(app: &mut DesignApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
+    Some(match id {
+        "app.loadParagraphStyles" => app.pick_styles("paragraph"),
+        "app.loadCharacterStyles" => app.pick_styles("character"),
+        "app.loadTextStyles" => app.pick_styles(""),
+        "app.saveSwatches" => {
+            let Some(path) = p.get("path").and_then(Value::as_str).map(str::to_string) else {
+                let p = p.clone();
+                return Some(app.ask_save("Swatches.ase", Bound::Document, move |app, path| {
+                    run_ui(app, "app.saveSwatches", &with_path(&p, "path", path)).unwrap_or(Ok(Value::Null))
+                }));
+            };
+            let r = match app.run("swatch.save", json!({})) {
+                Ok(r) => r,
+                Err(e) => return Some(Err(e)),
+            };
+            let bytes = designcraft_engine::cmd::base64_decode(r["base64"].as_str().unwrap_or_default());
+            match app.services.write.as_mut() {
+                Some(w) => w(&path, &bytes).map(|_| json!({"path": path, "bytes": bytes.len()})),
+                None => Err("no writer".into()),
+            }
+        }
+        "app.storyEditor" => {
+            let target = app.session.active().and_then(|st| {
+                let story = p.get("story").and_then(Value::as_u64).map(designcraft_doc::StoryId).or_else(|| {
+                    st.selection
+                        .text
+                        .map(|t| t.story)
+                        .or_else(|| st.selection.items.iter().find_map(|i| st.doc.item(*i)?.text_frame().map(|t| t.story)))
+                })?;
+                Some(crate::story_editor::Target { doc: st.uid, story })
+            });
+            match target {
+                Some(t) => {
+                    app.story_editor = if app.story_editor == Some(t) { None } else { Some(t) };
+                    Ok(Value::Null)
+                }
+                None => Err("select a text frame or place the cursor in text".into()),
+            }
+        }
+        "app.findChange" => {
+            app.session.reset_find_scope();
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("findChange", json!({})));
+            Ok(Value::Null)
+        }
+        "app.insertTableDialog" => {
+            if app.session.active().is_none_or(|d| d.selection.text.is_none()) {
+                return Some(Err("place the insertion point in a text frame to create a table".into()));
+            }
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("insertTable", p.clone()));
+            Ok(Value::Null)
+        }
+        "app.rubyDialog" => {
+            let Some(st) = app.session.active() else { return Some(Err("no document open".into())) };
+            let cur = st.selection.text.and_then(|t| {
+                let story = st.doc.text_story(t.story, t.cell)?;
+                let at = if t.range().is_empty() { t.range().start } else { t.range().start + 1 };
+                story.char_format_at(at).over.ruby.clone()
+            });
+            let cur = cur.unwrap_or_default();
+            // The ruby settings the panes show: the selection's resolved character attributes.
+            let base = crate::panels::text_attrs(app).and_then(|a| a.get("chars").cloned()).unwrap_or(Value::Null);
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("ruby", json!({"text": cur, "base": base})));
+            Ok(Value::Null)
+        }
+        "app.paragraphRulesDialog" => {
+            let Some(a) = crate::panels::text_attrs(app) else { return Some(Err("select text or a text frame".into())) };
+            let rule = if p.get("rule").and_then(Value::as_str) == Some("ruleBelow") { "ruleBelow" } else { "ruleAbove" };
+            let current = json!({"ruleAbove": a["para"]["ruleAbove"], "ruleBelow": a["para"]["ruleBelow"]});
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("paragraphRules", json!({"rule": rule, "current": current})));
+            Ok(Value::Null)
+        }
+        "app.paragraphBordersDialog"
+        | "app.spanColumnsDialog"
+        | "app.bulletsNumberingDialog"
+        | "app.keepOptionsDialog"
+        | "app.nestedStylesDialog"
+        | "app.grepStylesDialog" => {
+            let Some(a) = crate::panels::text_attrs(app) else { return Some(Err("select text or a text frame".into())) };
+            let section = match id {
+                "app.spanColumnsDialog" => "span",
+                "app.bulletsNumberingDialog" => "bullets",
+                "app.keepOptionsDialog" => "keep",
+                "app.nestedStylesDialog" => "nested",
+                "app.grepStylesDialog" => "grep",
+                _ if p.get("tab").and_then(Value::as_str) == Some("shading") => "shading",
+                _ => "border",
+            };
+            let fields = json!({
+                "section": section,
+                "current": a["para"],
+                "family": a["chars"]["fontFamily"],
+                "style": a["chars"]["fontStyle"],
+            });
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("paragraphLocal", fields));
+            Ok(Value::Null)
+        }
+        "app.hyphenationDialog" => {
+            let Some(a) = app.session.execute("type.selectionAttrs", &json!({"mixed": true})).ok().filter(|a| !a.is_null()) else {
+                return Some(Err("select text or a text frame".into()));
+            };
+            let mixed: Vec<&str> = a["paraMixed"].as_array().map(|m| m.iter().filter_map(Value::as_str).collect()).unwrap_or_default();
+            let current: serde_json::Map<String, Value> = crate::dialogs::HYPH_ATTRS
+                .iter()
+                .map(|k| (k.to_string(), if mixed.contains(k) { Value::Null } else { a["para"][*k].clone() }))
+                .collect();
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("hyphenation", json!({"current": current})));
+            Ok(Value::Null)
+        }
+        "app.justificationDialog" => {
+            let Some(a) = app.session.execute("type.selectionAttrs", &json!({"mixed": true})).ok().filter(|a| !a.is_null()) else {
+                return Some(Err("select text or a text frame".into()));
+            };
+            let mixed: Vec<&str> = a["paraMixed"].as_array().map(|m| m.iter().filter_map(Value::as_str).collect()).unwrap_or_default();
+            let current: serde_json::Map<String, Value> = crate::dialogs::JUSTIFY_ATTRS
+                .iter()
+                .map(|k| (k.to_string(), if mixed.contains(k) { Value::Null } else { a["para"][*k].clone() }))
+                .collect();
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("justification", json!({"current": current})));
+            Ok(Value::Null)
+        }
+        "app.footnoteOptionsDialog" => {
+            let Some(st) = app.session.active() else { return Some(Err("no document open".into())) };
+            let o = serde_json::to_value(&st.doc.footnote_options).unwrap_or_default();
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("footnoteOptions", o));
+            Ok(Value::Null)
+        }
+        "app.findFontDialog" => {
+            if app.session.active().is_none() {
+                return Some(Err("no document open".into()));
+            }
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("findFont", json!({})));
+            Ok(Value::Null)
+        }
+        "app.insertXrefDialog" => {
+            if app.session.active().is_none_or(|d| d.selection.text.is_none()) {
+                return Some(Err("place the insertion point in text to insert a cross-reference".into()));
+            }
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("insertXref", json!({})));
+            Ok(Value::Null)
+        }
+        "app.deleteAllGuides" => {
+            let Some(spread) = guide_spread(app) else { return Some(Err("no document open".into())) };
+            return Some(app.run("guide.deleteAll", json!({"spread": spread})));
+        }
+        "app.deletePage" | "app.duplicateSpread" => {
+            let Some(st) = app.session.active() else { return Some(Err("no document open".into())) };
+            let page = crate::canvas::current_page(app).unwrap_or(0);
+            let r = if id == "app.deletePage" {
+                crate::dialogs::delete_pages(app, vec![page])
+            } else {
+                let spread = st.doc.page_loc(page).map_or(0, |l| l.0);
+                app.run("layout.pages.duplicateSpread", json!({"spread": spread}))
+            };
+            return Some(r);
+        }
+        "app.tabsPanel" => {
+            toggle_tabs_panel(app);
+            Ok(Value::Null)
+        }
+        "app.exportPdf" => {
+            if p.is_null() || p.as_object().is_none_or(|m| m.is_empty()) {
+                crate::dialogs::open_pdf_export(app);
+                Ok(Value::Null)
+            } else {
+                export_pdf(app, p)
+            }
+        }
+        "app.palette" => {
+            app.ui.palette = Some(String::new());
+            Ok(Value::Null)
+        }
+        "app.preferences" => {
+            let mut f = app.session.execute("prefs.set", &json!({})).unwrap_or_default();
+            if app.session.active().is_some() {
+                let doc = app.session.execute("document.preferences", &json!({})).unwrap_or_default();
+                f["horizontalUnits"] = doc["horizontalUnits"].clone();
+                f["rulerOrigin"] = doc["rulerOrigin"].clone();
+                f["overprintBlack"] = doc["overprintBlack"].clone();
+                f["glyphFallback"] = doc["glyphFallback"].clone();
+                for k in ["superscriptSize", "superscriptPosition", "subscriptSize", "subscriptPosition"] {
+                    f[format!("adv.{k}")] = json!(format!("{}", doc["advancedType"][k].as_f64().unwrap_or(0.0)));
+                }
+                f["verticalUnits"] = doc["verticalUnits"].clone();
+                let words = app.session.execute("spelling.words", &json!({})).unwrap_or_default();
+                f["userWords"] =
+                    json!(words.as_array().map(|a| a.iter().filter_map(Value::as_str).collect::<Vec<_>>().join("\n")).unwrap_or_default());
+                let inc = doc["keyboardIncrement"].as_f64().unwrap_or(1.0);
+                f["keyboardIncrement"] = json!(designcraft_geom::format_measure(inc, designcraft_geom::Unit::Points));
+                f["kerningIncrement"] = json!(format!("{}", doc["kerningIncrement"].as_f64().unwrap_or(20.0)));
+                let units = app.session.active().map(|d| d.doc.settings.horizontal_units).unwrap_or_default();
+                let m = |v: &Value| json!(designcraft_geom::format_measure(v.as_f64().unwrap_or(0.0), units));
+                let (bg, g) = (&doc["baselineGrid"], &doc["grid"]);
+                f["bg.start"] = m(&bg["start"]);
+                f["bg.increment"] = m(&bg["increment"]);
+                f["bg.relativeTo"] = bg["relativeTo"].clone();
+                f["bg.viewThreshold"] = json!((bg["viewThreshold"].as_f64().unwrap_or(0.75) * 100.0).round());
+                f["bg.color"] = bg["color"].clone();
+                f["grid.horizontal"] = m(&g["horizontal"]);
+                f["grid.vertical"] = m(&g["vertical"]);
+                f["grid.subdivisions"] = g["subdivisions"].clone();
+                f["grid.inBack"] = g["inBack"].clone();
+                f["grid.color"] = g["color"].clone();
+                for k in ["marginColor", "columnColor", "bleedColor", "slugColor"] {
+                    f[k] = doc[k].clone();
+                }
+                f["pasteboard.h"] = m(&doc["pasteboard"][0]);
+                f["pasteboard.v"] = m(&doc["pasteboard"][1]);
+            }
+            f["snap.alignEdges"] = json!(app.ui.align_edges);
+            f["snap.alignCenters"] = json!(app.ui.align_centers);
+            f["snap.dimensions"] = json!(app.ui.smart_dimensions);
+            f["snap.spacing"] = json!(app.ui.smart_spacing);
+            f["snap.zone"] = json!(app.ui.snap_zone);
+            f["displayQuality"] = json!(match app.ui.display_quality {
+                designcraft_render::DisplayQuality::Fast => "fast",
+                designcraft_render::DisplayQuality::Typical => "typical",
+                designcraft_render::DisplayQuality::High => "high",
+            });
+            f["uiScale"] = json!((app.ui.ui_scale * 100.0).round());
+            f["autoCollapseIconicPanels"] = json!(app.ui.dock_auto_collapse);
+            f["richBlack"] = json!(app.ui.rich_black);
+            f["dynamicSpelling"] = json!(app.ui.dynamic_spelling);
+            f["storyEditorSize"] = json!(app.ui.story_editor_size);
+            let list = app.session.prefs.autocorrect_list.iter().map(|(a, b)| format!("{a} → {b}")).collect::<Vec<_>>().join("\n");
+            f["autocorrectText"] = json!(list);
+            // The effective setting; it becomes an explicit preference only when the user changes it,
+            // so an untouched one keeps following the interface language.
+            let cjk = crate::cjk_features(app);
+            f["cjkFeatures"] = json!(cjk);
+            f["cjkFeatures.initial"] = json!(cjk);
+            f["section"] = json!("general");
+            // The language previews as it changes; Cancel goes back to this one.
+            f["openedLanguage"] = json!(app.ui.language);
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("preferences", f));
+            Ok(Value::Null)
+        }
+        _ => return None,
+    })
+}
+
+/// One slice of the UI commands: `None` if `id` isn't one of them.
+fn run_ui_part3(app: &mut DesignApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
+    let rect = app.canvas_rect;
+    Some(match id {
+        "view.zoomIn" | "view.zoomOut" => {
+            if let Some(r) = rect {
+                crate::canvas::zoom_at(app, r.center(), if id == "view.zoomIn" { 1.5 } else { 1.0 / 1.5 });
+            }
+            Ok(Value::Null)
+        }
+        "view.fitSelection" => {
+            if let Some(r) = rect {
+                crate::canvas::fit(app, r, "selection");
+            }
+            Ok(Value::Null)
+        }
+        "view.fitPage" | "view.fitSpread" | "view.entirePasteboard" => {
+            if let Some(r) = rect {
+                crate::canvas::fit(
+                    app,
+                    r,
+                    if id == "view.fitPage" {
+                        "page"
+                    } else if id == "view.fitSpread" {
+                        "spread"
+                    } else {
+                        "all"
+                    },
+                );
+            }
+            Ok(Value::Null)
+        }
+        "view.actualSize" => {
+            crate::canvas::set_zoom(app, 1.0);
+            Ok(Value::Null)
+        }
+        "view.zoom" => {
+            crate::canvas::set_zoom(app, p.get("zoom").and_then(Value::as_f64).unwrap_or(1.0));
+            Ok(Value::Null)
+        }
+        "view.screenMode" => {
+            let mode = match p.get("mode").and_then(Value::as_str).unwrap_or("normal") {
+                "preview" => ScreenMode::Preview,
+                "bleed" => ScreenMode::Bleed,
+                "slug" => ScreenMode::Slug,
+                "presentation" => ScreenMode::Presentation,
+                _ => ScreenMode::Normal,
+            };
+            set_screen_mode(app, mode);
+            Ok(Value::Null)
+        }
+        "view.togglePreview" => {
+            let mode = if app.ui.screen_mode == ScreenMode::Normal { ScreenMode::Preview } else { ScreenMode::Normal };
+            set_screen_mode(app, mode);
+            Ok(Value::Null)
+        }
+        "view.togglePresentation" => {
+            let mode = match (app.ui.screen_mode, app.ui.presentation_return) {
+                // A settings file can hold Presentation as the return mode; leaving must still leave.
+                (ScreenMode::Presentation, ScreenMode::Presentation) => ScreenMode::Normal,
+                (ScreenMode::Presentation, back) => back,
+                _ => ScreenMode::Presentation,
+            };
+            set_screen_mode(app, mode);
+            Ok(Value::Null)
+        }
+        "color.defaultFillStroke" => crate::toolbar::default_fill_stroke(app),
+        "color.swapFillStroke" => crate::toolbar::swap_fill_stroke(app),
+        "color.toggleFillStroke" => crate::toolbar::toggle_fill_stroke(app),
+        "color.applyColor" => crate::toolbar::apply_color(app),
+        "color.applyGradient" => crate::toolbar::apply_gradient(app),
+        "color.applyNone" => crate::toolbar::apply_none(app),
+        "view.frameEdges" => flag(&mut app.ui.frame_edges),
+        "view.overprintPreview" => {
+            app.canvas.shown = None;
+            flag(&mut app.ui.overprint_preview)
+        }
+        "view.fastDisplay" | "view.typicalDisplay" | "view.highQualityDisplay" => {
+            use designcraft_render::DisplayQuality as Q;
+            app.ui.display_quality = match id {
+                "view.fastDisplay" => Q::Fast,
+                "view.typicalDisplay" => Q::Typical,
+                _ => Q::High,
+            };
+            // Redraw everything at the new quality.
+            app.canvas.shown = None;
+            Ok(Value::Null)
+        }
+        "view.rulers" => flag(&mut app.ui.rulers),
+        "view.guides" => flag(&mut app.ui.guides),
+        "view.lockGuides" => {
+            app.ui.guides_locked = p.get("on").and_then(Value::as_bool).unwrap_or(!app.ui.guides_locked);
+            Ok(json!(app.ui.guides_locked))
+        }
+        "view.snapToGuides" => flag(&mut app.ui.snap_to_guides),
+        "view.snapToDocumentGrid" => flag(&mut app.ui.snap_to_document_grid),
+        "view.smartGuides" => flag(&mut app.ui.smart_guides),
+        "view.baselineGrid" => flag(&mut app.ui.baseline_grid),
+        "view.documentGrid" => {
+            // The grid is drawn into the canvas texture.
+            app.canvas.shown = None;
+            flag(&mut app.ui.document_grid)
+        }
+        "view.textThreads" => flag(&mut app.ui.text_threads),
+        "view.hiddenCharacters" => flag(&mut app.ui.hidden_characters),
+        "view.taggedFrames" => flag(&mut app.ui.tagged_frames),
+        "view.storyEditorDepthRuler" => flag(&mut app.ui.story_editor_depth_ruler),
+        "window.hidePanels" | "window.hidePanelsExceptTools" => {
+            let mode = if id == "window.hidePanels" { 1 } else { 2 };
+            app.ui.hidden_panels = if app.ui.hidden_panels == mode { 0 } else { mode };
+            Ok(json!(app.ui.hidden_panels))
+        }
+        "window.nextDocument" | "window.previousDocument" => {
+            let n = app.session.documents().len();
+            if n > 1 {
+                let cur = app.session.active_index().unwrap_or(0);
+                let next = if id == "window.nextDocument" { (cur + 1) % n } else { (cur + n - 1) % n };
+                app.session.set_active(next);
+            }
+            Ok(json!(app.session.active_index()))
+        }
+        "app.layerOptionsDialog" => crate::dialogs::open_layer_options(app, p.get("id").and_then(Value::as_u64)).map(|()| Value::Null),
+        "app.swatchOptionsDialog" => {
+            crate::dialogs::open_swatch_options(app, p.get("name").and_then(Value::as_str).unwrap_or("")).map(|()| Value::Null)
+        }
+        "app.colorGroupOptionsDialog" => {
+            crate::dialogs::open_color_group_options(app, p.get("name").and_then(Value::as_str).unwrap_or("")).map(|()| Value::Null)
+        }
+        "app.layerOptions" => {
+            let layers = match app.session.execute("object.pdfLayers", &json!({})) {
+                Ok(v) => v,
+                Err(e) => return Some(Err(e.to_string())),
+            };
+            app.ui.dialog = Some(crate::dialogs::Dialog::new(
+                "layerOptions",
+                json!({"useDefaults": !layers.as_array().and_then(|a| a.first()).and_then(|l| l["overridden"].as_bool()).unwrap_or(false), "layers": layers}),
+            ));
+            Ok(Value::Null)
+        }
+        "view.rotateSpread" => {
+            // Turns the spread in the middle of the view (InDesign's Rotate Spread).
+            let angle = p.get("angle").and_then(Value::as_i64).unwrap_or(90);
+            let Some(st) = app.session.active() else { return Some(Err("no document".into())) };
+            let layout = designcraft_tools::CanvasLayout::new(&st.doc, st.editing_parents);
+            let Some(slot) = crate::canvas::current_slot(app, &layout).and_then(|i| layout.slots.get(i).copied()) else {
+                return Some(Err("no spread".into()));
+            };
+            let designcraft_doc::SpreadRef::Doc(si) = slot.spread else { return Some(Err("parent spreads don't turn".into())) };
+            let r = app.run("layout.rotateSpreadView", json!({"spread": si, "angle": angle}));
+            if let Some(rect) = app.canvas_rect {
+                crate::canvas::fit(app, rect, "spread");
+            }
+            app.canvas.shown = None;
+            r.map(|v| v["rotation"].clone())
+        }
+        _ => return None,
+    })
+}
+
+/// One slice of the UI commands: `None` if `id` isn't one of them.
+fn run_ui_part4(app: &mut DesignApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
+    Some(match id {
+        "view.proofColors" => {
+            app.ui.proof_colors = p.get("on").and_then(Value::as_bool).unwrap_or(!app.ui.proof_colors);
+            app.canvas.shown = None;
+            Ok(json!(app.ui.proof_colors))
+        }
+        "view.proofSetup" => {
+            if let Some(t) = p.get("target").and_then(Value::as_str) {
+                let Some(t) = designcraft_color::cms::ProofTarget::parse(t) else { return Some(Err(format!("unknown proof target `{t}`"))) };
+                app.ui.proof_setup.target = t;
+                app.ui.proof_colors = true;
+            }
+            if let Some(i) = p.get("intent").and_then(Value::as_str) {
+                let Some(i) = designcraft_color::cms::Intent::parse(i) else { return Some(Err(format!("unknown intent `{i}`"))) };
+                app.ui.proof_setup.intent = i;
+            }
+            match p.get("simulatePaper") {
+                Some(Value::Bool(b)) => app.ui.proof_setup.simulate_paper = *b,
+                Some(Value::String(s)) if s == "toggle" => app.ui.proof_setup.simulate_paper = !app.ui.proof_setup.simulate_paper,
+                _ => {}
+            }
+            app.canvas.shown = None;
+            Ok(json!({"target": app.ui.proof_setup.target.id(), "simulatePaper": app.ui.proof_setup.simulate_paper, "on": app.ui.proof_colors}))
+        }
+        "app.colorSettings" => {
+            let f = app.session.execute("color.settings", &json!({})).unwrap_or_default();
+            app.ui.dialog = Some(crate::dialogs::Dialog::new("colorSettings", f));
+            Ok(Value::Null)
+        }
+        "view.separations" => separations_view(app, p),
+        "view.firstPage" | "view.previousPage" | "view.nextPage" | "view.lastPage" => {
+            let n = app.session.active().map_or(0, |d| d.doc.page_count());
+            if n > 0 {
+                let cur = crate::canvas::current_page(app).unwrap_or(0);
+                let to = match id {
+                    "view.firstPage" => 0,
+                    "view.previousPage" => cur.saturating_sub(1),
+                    "view.nextPage" => cur.saturating_add(1).min(n - 1),
+                    _ => n - 1,
+                };
+                crate::canvas::go_to_page(app, to);
+            }
+            Ok(Value::Null)
+        }
+        "view.goBack" | "view.goForward" => {
+            crate::canvas::go_through_history(app, if id == "view.goBack" { -1 } else { 1 });
+            Ok(Value::Null)
+        }
+        "view.nextSpread" | "view.previousSpread" => {
+            crate::canvas::step_spread(app, if id == "view.nextSpread" { 1 } else { -1 });
+            Ok(Value::Null)
+        }
+        "view.goToPage" => {
+            match p.get("page") {
+                Some(Value::Number(n)) => crate::canvas::go_to_page(app, (n.as_u64().unwrap_or(1) as usize).saturating_sub(1)),
+                Some(Value::String(s)) => match app.session.resolve_page(s) {
+                    Some(abs) => crate::canvas::go_to_page(app, abs),
+                    None => return Some(Err(format!("no page \"{s}\""))),
+                },
+                _ => app.ui.dialog = Some(crate::dialogs::Dialog::new("goToPage", json!({}))),
+            }
+            Ok(Value::Null)
+        }
+        "app.characterPanel" | "app.paragraphPanel" | "app.glyphsPanel" | "app.characterStylesPanel" | "app.paragraphStylesPanel" => {
+            let panel = match id {
+                "app.characterPanel" => "character",
+                "app.paragraphPanel" => "paragraph",
+                "app.glyphsPanel" => "glyphs",
+                "app.characterStylesPanel" => "characterStyles",
+                _ => "paragraphStyles",
+            };
+            run_ui(app, "window.panel", &json!({"panel": panel})).unwrap_or(Ok(Value::Null))
+        }
+        "app.insertCurrentPageNumber" => app.run("text.insert", json!({"text": "\u{e000}", "raw": true})),
+        // `panel_docking::command` takes the dock panels (and the Window › Styles group) first.
+        "window.panel" => {
+            let panel = p.get("panel").and_then(Value::as_str).unwrap_or("properties");
+            if panel != "tabs" {
+                return crate::panel_docking::command(app, "window.panel.activate", &json!({"panel": panel}));
+            }
+            toggle_tabs_panel(app);
+            Ok(Value::Null)
+        }
+        "fit.fillFrameProportionally" | "fit.contentProportionally" | "fit.frameToContent" | "fit.contentToFrame" | "fit.centerContent" => {
+            let mode = match id {
+                "fit.fillFrameProportionally" => "fillProportionally",
+                "fit.contentProportionally" => "fitProportionally",
+                "fit.frameToContent" => "fitFrameToContent",
+                "fit.contentToFrame" => "fitContentToFrame",
+                _ => "centerContent",
+            };
+            app.run("object.fit", json!({"mode": mode}))
+        }
+        "app.keyboardShortcuts" => {
+            let select = p.get("command").and_then(Value::as_str).map(|id| crate::keys::command_ref(id, p.get("params").unwrap_or(&Value::Null)));
+            crate::shortcuts_dialog::open(app, select.as_ref());
+            Ok(Value::Null)
+        }
+        "window.shortcutSets" => {
+            let builtins = &crate::shortcuts_dialog::BUILTINS;
+            if let Some(name) = p.get("select").and_then(Value::as_str) {
+                if app.shortcut_dialog.is_some() {
+                    return Some(Err("close the Keyboard Shortcuts dialog first".into()));
+                }
+                if let Err(e) = app.ui.shortcut_sets.select(name, builtins) {
+                    return Some(Err(format!("{name}: {e}")));
+                }
+                crate::shortcuts_dialog::load_active_set(app);
+            }
+            let sets = &app.ui.shortcut_sets;
+            Ok(
+                json!({"active": sets.active_name(builtins), "sets": sets.names(builtins), "builtIn": builtins.iter().map(|(n, _)| *n).collect::<Vec<_>>()}),
+            )
+        }
+        // The open Keyboard Shortcuts dialog edits the keys itself, and its Cancel puts back the
+        // ones it started with, which would undo a change made here.
+        "window.setShortcut" | "window.resetShortcuts" | "window.importShortcuts" if app.shortcut_dialog.is_some() => {
+            Err("close the Keyboard Shortcuts dialog first".into())
+        }
+        "window.setShortcut" => {
+            let Some(id) = p.get("id").and_then(Value::as_str) else { return Some(Err("missing id".into())) };
+            let mut cmd = crate::keys::command_ref(id, p.get("params").unwrap_or(&Value::Null));
+            // A bare tool id ("pen") names its tool.
+            if app.keymap.bindable(&cmd).is_none() && designcraft_tools::tool_info(id).is_some() {
+                cmd = crate::keys::tool(id);
+            }
+            let shortcut = match p.get("shortcut") {
+                None | Some(Value::Null) => None,
+                Some(Value::String(sc)) => Some(sc.as_str()),
+                Some(_) => return Some(Err("shortcut: a string or null".into())),
+            };
+            let steal = p.get("steal").and_then(Value::as_bool).unwrap_or(false);
+            let policy = if steal { craft_keymap::Policy::Steal } else { craft_keymap::Policy::Keep };
+            let taken = match crate::keys::set(app, &cmd, shortcut, policy) {
+                Ok(t) => t,
+                Err(e) => return Some(Err(e)),
+            };
+            let mut conflicts: Vec<String> = taken.iter().filter(|c| !crate::keys::twins(&cmd, c)).map(|c| c.key()).collect();
+            for key in crate::keys::conflicts(&app.keymap, &cmd) {
+                if !conflicts.contains(&key) {
+                    conflicts.push(key);
+                }
+            }
+            Ok(json!({"shortcut": crate::keys::shortcut(&app.keymap, &cmd), "conflicts": conflicts}))
+        }
+        "window.resetShortcuts" => {
+            app.keymap.reset_all();
+            crate::keys::store(app);
+            Ok(Value::Null)
+        }
+        "window.importShortcuts" => {
+            let text = match (p.get("text").and_then(Value::as_str), p.get("path").and_then(Value::as_str)) {
+                (Some(text), _) => text.to_string(),
+                (None, Some(path)) => match crate::shortcut_import::read_file(path) {
+                    Ok(text) => text,
+                    Err(e) => return Some(Err(e)),
+                },
+                (None, None) => return Some(Err("give the set's path or text".into())),
+            };
+            crate::shortcut_import::import(app, &text)
+        }
+        "view.snapPreferences" => {
+            let b = |k: &str| p.get(k).and_then(Value::as_bool);
+            let ui = &mut app.ui;
+            ui.align_edges = b("alignEdges").unwrap_or(ui.align_edges);
+            ui.align_centers = b("alignCenters").unwrap_or(ui.align_centers);
+            ui.smart_dimensions = b("smartDimensions").unwrap_or(ui.smart_dimensions);
+            ui.smart_spacing = b("smartSpacing").unwrap_or(ui.smart_spacing);
+            if let Some(z) = p.get("zone").and_then(Value::as_f64).filter(|z| z.is_finite()) {
+                ui.snap_zone = z.max(0.0);
+            }
+            Ok(json!({
+                "alignEdges": ui.align_edges,
+                "alignCenters": ui.align_centers,
+                "smartDimensions": ui.smart_dimensions,
+                "smartSpacing": ui.smart_spacing,
+                "zone": ui.snap_zone,
+            }))
+        }
+        _ => return None,
+    })
+}
+
+/// One slice of the UI commands: `None` if `id` isn't one of them.
+fn run_ui_part5(app: &mut DesignApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
+    Some(match id {
+        "app.formattingAffectsText" => {
+            app.ui.formatting_affects_text = p.get("on").and_then(Value::as_bool).unwrap_or(!app.ui.formatting_affects_text);
+            Ok(json!({"on": app.ui.formatting_affects_text}))
+        }
+        "window.richBlack" => {
+            app.ui.rich_black = p.get("on").and_then(Value::as_bool).unwrap_or(!app.ui.rich_black);
+            app.canvas.shown = None;
+            Ok(json!({"on": app.ui.rich_black}))
+        }
+        "window.uiScale" => {
+            let v = p.get("scale").and_then(Value::as_f64).unwrap_or(1.0) as f32;
+            app.ui.ui_scale = v.clamp(0.5, 3.0);
+            Ok(json!({"scale": app.ui.ui_scale}))
+        }
+        "window.controlBar" => flag(&mut app.ui.control_bar),
+        "view.flattenerPreview" => flag(&mut app.ui.flattener_preview),
+        "view.tagMarkers" => {
+            app.canvas.shown = None;
+            flag(&mut app.ui.tag_markers)
+        }
+        "edit.dynamicSpelling" => flag(&mut app.ui.dynamic_spelling),
+        "window.split" => {
+            let on = p.get("on").and_then(Value::as_bool).unwrap_or(!app.split);
+            app.split = on;
+            if on {
+                if app.second_window {
+                    app.end_second_ime_viewport();
+                }
+                app.second_window = false;
+            } else {
+                app.switch_pane(0);
+                app.focus_pane = 0;
+            }
+            Ok(json!(on))
+        }
+        "window.newWindow" => {
+            // The second view moves into its own window (on the web: a floating window).
+            let on = p.get("on").and_then(Value::as_bool).unwrap_or(true);
+            if app.second_window && !on {
+                app.end_second_ime_viewport();
+            }
+            app.second_window = on;
+            app.split = false;
+            if !app.second_window {
+                app.switch_pane(0);
+                app.focus_pane = 0;
+            }
+            Ok(json!(app.second_window))
+        }
+        "window.taskBar" => flag(&mut app.ui.task_bar),
+        "window.taskBarPin" => {
+            let at = match p.get("at") {
+                None | Some(Value::Null) => None,
+                Some(v) => match v.as_array().map(|a| a.iter().map(Value::as_f64).collect::<Vec<_>>()).as_deref() {
+                    Some([Some(x), Some(y)]) if x.is_finite() && y.is_finite() => Some([x.clamp(-1e6, 1e6) as f32, y.clamp(-1e6, 1e6) as f32]),
+                    _ => return Some(Err("window.taskBarPin: `at` is [x, y] in points".into())),
+                },
+            };
+            let on = p.get("on").and_then(Value::as_bool).unwrap_or(at.is_some() || app.ui.task_bar_pin.is_none());
+            app.ui.task_bar_pin = match (on, at.or(app.ui.task_bar_pin).or(app.ui.task_bar_at)) {
+                (false, _) => None,
+                (true, Some(at)) => Some(at),
+                (true, None) => return Some(Err("window.taskBarPin: the Contextual Task Bar isn't showing; give `at`".into())),
+            };
+            Ok(json!(app.ui.task_bar_pin))
+        }
+        "window.taskBarReset" => {
+            app.ui.task_bar_pin = None;
+            Ok(Value::Null)
+        }
+        "help.about" => {
+            if let Some(tab) = p.get("tab").and_then(Value::as_str) {
+                let Some(i) = crate::about::ABOUT_TABS.iter().position(|t| t.eq_ignore_ascii_case(tab)) else {
+                    return Some(Err(format!("help.about: unknown tab `{tab}` (about, contributors, models)")));
+                };
+                app.ui.about_tab = u8::try_from(i).unwrap_or(0);
+            }
+            app.ui.about = p.get("open").and_then(Value::as_bool).unwrap_or(true);
+            Ok(json!(app.ui.about))
+        }
+        "help.checkForUpdates" => crate::updates_ui::check(app),
+        "help.app" => match p.get("app").and_then(Value::as_str) {
+            Some(slug) if !slug.is_empty() && slug.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') => {
+                let url = format!("{}/apps/{slug}", designcraft_engine::links::WEBSITE);
+                app.ui.pending_urls.push(url.clone());
+                Ok(json!({"url": url}))
+            }
+            _ => Err("help.app: give `app` (e.g. \"photocraft\")".into()),
+        },
+        h if h.starts_with("help.") && designcraft_engine::links::get(&h[5..]).is_some() => {
+            let url = designcraft_engine::links::get(&h[5..]).unwrap_or_default().to_string();
+            app.ui.pending_urls.push(url.clone());
+            Ok(json!({"url": url}))
+        }
+        "window.toolsDoubleColumn" => flag(&mut app.ui.tools_double_column),
+        "window.newWorkspace" => {
+            let Some(name) = p.get("name").and_then(Value::as_str).map(str::trim).filter(|n| !n.is_empty()) else {
+                app.ui.dialog =
+                    Some(crate::dialogs::Dialog::new("newWorkspace", json!({"name": "", "panelLocations": true, "menuCustomization": true})));
+                return Some(Ok(Value::Null));
+            };
+            let u = &app.ui;
+            let w = crate::SavedWorkspace {
+                name: name.to_string(),
+                control_bar: u.control_bar,
+                task_bar: u.task_bar,
+                task_bar_pin: u.task_bar_pin,
+                tools_double_column: u.tools_double_column,
+                dock_tab: u.dock_tab.clone(),
+                dock_expanded: u.dock_expanded,
+                open_panel: u.open_panel.clone(),
+                floating: u.floating.clone(),
+                docking: u.docking.clone(),
+                docking_hidden: u.docking_hidden.clone(),
+                icon_groups: u.icon_groups.clone(),
+                keep_panels: !p.get("panelLocations").and_then(Value::as_bool).unwrap_or(true),
+                hidden_menu_items: p.get("menuCustomization").and_then(Value::as_bool).unwrap_or(true).then(|| u.hidden_menu_items.clone()),
+            };
+            app.ui.custom_workspaces.retain(|x| x.name != name);
+            app.ui.custom_workspaces.push(w);
+            app.ui.workspace = name.to_string();
+            Ok(Value::Null)
+        }
+        "window.deleteWorkspace" => {
+            let name = p.get("name").and_then(Value::as_str).unwrap_or("");
+            let n = app.ui.custom_workspaces.len();
+            app.ui.custom_workspaces.retain(|x| x.name != name);
+            if app.ui.custom_workspaces.len() == n {
+                return Some(Err(format!("no saved workspace `{name}`")));
+            }
+            if app.ui.workspace == name {
+                app.ui.workspace = "Essentials".into();
+            }
+            Ok(Value::Null)
+        }
+        "window.resetWorkspace" => {
+            let name = app.ui.workspace.clone();
+            return run_ui(app, "window.workspace", &json!({"name": name}));
+        }
+        "window.workspace" => {
+            app.ui.docking_generation = app.ui.docking_generation.wrapping_add(1);
+            crate::panel_docking::forget_panels(app);
+            let name = p.get("name").and_then(Value::as_str).unwrap_or("Essentials");
+            if let Some(w) = app.ui.custom_workspaces.iter().find(|w| w.name == name).cloned() {
+                if let Some(hidden) = w.hidden_menu_items {
+                    app.ui.hidden_menu_items = hidden;
+                }
+                if w.keep_panels {
+                    app.ui.workspace = w.name;
+                    return Some(Ok(Value::Null));
+                }
+                app.ui.control_bar = w.control_bar;
+                app.ui.task_bar = w.task_bar;
+                app.ui.task_bar_pin = w.task_bar_pin;
+                app.ui.tools_double_column = w.tools_double_column;
+                app.ui.dock_tab = w.dock_tab;
+                app.ui.dock_expanded = w.dock_expanded;
+                app.ui.open_panel = w.open_panel;
+                app.ui.floating = w.floating;
+                app.ui.docking = w.docking;
+                app.ui.docking_hidden = w.docking_hidden;
+                app.ui.icon_groups = w.icon_groups;
+                app.ui.workspace = w.name;
+                return Some(Ok(Value::Null));
+            }
+            // Workspaces choose which bars and panels are visible.
+            if app.ui.docking.is_some() {
+                app.ui.floating.clear();
+            }
+            app.ui.docking = None;
+            app.ui.docking_hidden.clear();
+            app.ui.control_bar = matches!(name, "Advanced" | "Typography" | "Printing and Proofing" | "Book" | "Essentials Classic");
+            // Essentials Classic: the Control panel and an iconic column of grouped panels, no
+            // Properties stack.
+            let groups = match name {
+                "Essentials Classic" => Some(CLASSIC_GROUPS),
+                "Typography" => Some(TYPOGRAPHY_GROUPS),
+                _ => None,
+            };
+            app.ui.icon_groups = groups.map(|groups| groups.iter().map(|g| g.iter().map(ToString::to_string).collect()).collect());
+            app.ui.dock_expanded = groups.is_none();
+            let dock_tab = match name {
+                "Interactive for PDF" | "Digital Publishing" => Some("pages"),
+                _ => None,
+            };
+            if let Some(tab) = dock_tab {
+                app.ui.dock_tab = tab.into();
+                app.ui.dock_expanded = true;
+            }
+            app.ui.open_panel = workspace_open_panel(name).map(str::to_string);
+            app.ui.workspace = name.to_string();
+            Ok(Value::Null)
+        }
+        "window.brightness" => {
+            let b = p.get("brightness").and_then(Value::as_str).and_then(crate::theme::Brightness::parse).unwrap_or(crate::theme::Brightness::Dark);
+            app.ui.brightness = b;
+            app.restyle = true;
+            Ok(Value::Null)
+        }
+        _ => return None,
+    })
+}
+
+/// Save by handing the serialized document to the host as a download (web).
+/// Switch screen modes; entering Presentation remembers the mode to return to.
+fn set_screen_mode(app: &mut DesignApp, mode: ScreenMode) {
+    let presenting = app.ui.screen_mode == ScreenMode::Presentation;
+    if mode == ScreenMode::Presentation && !presenting {
+        app.ui.presentation_return = app.ui.screen_mode;
+        // Presentation fits the spread to the screen; leaving it puts the user's view back.
+        app.ui.presentation_view = app.view_key().zip(app.view().copied());
+        app.ui.presentation_page = crate::canvas::page_in_view(app);
+        app.ui.presentation_history = app.page_history().cloned();
+    }
+    if mode != ScreenMode::Presentation
+        && presenting
+        && let Some((k, v)) = app.ui.presentation_view.take()
+        && app.views.contains_key(&k)
+    {
+        // Go Back sees the presentation as one jump to the last spread presented, and putting the
+        // view back as a jump from there: the spreads in between would otherwise have replaced the
+        // place the view was at with the presentation's.
+        let shown = app.ui.presentation_page.take().zip(crate::canvas::page_in_view(app)).filter(|_| app.view_key() == Some(k));
+        let h = app.page_history.entry(k).or_default();
+        *h = app.ui.presentation_history.take().unwrap_or_default();
+        if let Some(((from, at), (to, offset))) = shown {
+            h.leave(from, at);
+            h.visit(to, offset);
+            h.visit(from, at);
+        }
+        if let Some(view) = app.views.get_mut(&k) {
+            *view = v;
+        }
+    }
+    app.ui.screen_mode = mode;
+}
diff --git a/crates/ui-egui/src/menus/state.rs b/crates/ui-egui/src/menus/state.rs
new file mode 100644
index 000000000..f9e78c28f
--- /dev/null
+++ b/crates/ui-egui/src/menus/state.rs
@@ -0,0 +1,191 @@
+use super::invoke::TEXT_FIELD_COMMANDS;
+use super::ui_commands::ui_label;
+use super::{DesignApp, Value};
+
+/// Commands that act on the text being typed wait while an IME composes at the caret (its marked
+/// text isn't typed yet): Undo and Redo (the native menu takes ⌘Z ahead of the IME), the clipboard
+/// and the selection.
+pub(crate) fn waits_for_ime(app: &DesignApp, id: &str) -> bool {
+    app.session.tool_composing()
+        && (matches!(
+            id,
+            "edit.undo" | "edit.redo" | "edit.cut" | "edit.copy" | "edit.clear" | "edit.duplicate" | "edit.selectAll" | "edit.deselectAll"
+        ) || id.starts_with("edit.paste"))
+}
+
+/// The commands that act on the desktop window itself.
+pub(super) fn is_window_control(id: &str) -> bool {
+    matches!(id, "window.minimize" | "window.maximize" | "window.close" | "window.drag" | "window.resize")
+}
+
+/// Whether the host can run a window command: all of them with our own title bar, and Minimize
+/// with the macOS menu bar (Window › Minimize, ⌘M).
+pub(super) fn window_control_available(app: &DesignApp, id: &str) -> bool {
+    app.custom_titlebar || (app.native_menu && id == "window.minimize")
+}
+
+/// Is a command enabled (for menu greying)?
+pub fn enabled(app: &DesignApp, id: &str) -> bool {
+    if waits_for_ime(app, id) {
+        return false;
+    }
+    if is_window_control(id) {
+        return window_control_available(app, id);
+    }
+    // Shared docking commands DesignCraft does not provide (native panel windows, Lock Workspace).
+    if matches!(id, "window.panel.window" | "window.workspace.lock") {
+        return false;
+    }
+    match designcraft_engine::find_command(id) {
+        Some(c) => (c.enabled)(&app.session).is_ok(),
+        None => true,
+    }
+}
+
+/// The default shortcut of a command.
+pub fn default_shortcut(id: &str) -> Option<&'static str> {
+    designcraft_engine::find_command(id).and_then(|c| c.shortcut).or_else(|| ui_label(id).and_then(|(_, s)| s))
+}
+
+/// The shortcut in effect for a command (the user's, else the default), as stored ("Cmd+Alt+K").
+pub fn shortcut_of(app: &DesignApp, id: &str) -> Option<String> {
+    crate::keys::shortcut(&app.keymap, &craft_keymap::CommandRef::new(id))
+}
+
+/// The shortcut a menu row shows: its own binding (a panel's), else its command's.
+pub fn shortcut_label(app: &DesignApp, id: &str, params: &Value) -> Option<String> {
+    let cmd = crate::keys::command_ref(id, params);
+    let cmd = if app.keymap.bindable(&cmd).is_some() { cmd } else { craft_keymap::CommandRef::new(id) };
+    crate::keys::shortcut_display(&app.keymap, &cmd)
+}
+
+/// The shortcut of a tool, for its button's tooltip.
+pub fn tool_shortcut_label(app: &DesignApp, tool: &str) -> Option<String> {
+    crate::keys::shortcut_display(&app.keymap, &crate::keys::tool(tool))
+}
+
+/// A shortcut for display: ⌃⌥⇧⌘K on macOS, Ctrl+Alt+Shift+K elsewhere.
+pub fn shortcut_text(sc: &str) -> String {
+    match craft_keymap::Binding::parse(sc) {
+        Ok(b) => b.trigger.display(crate::keys::platform()),
+        Err(_) => sc.to_string(),
+    }
+}
+
+/// Check state of a toggle command (None = not a toggle).
+pub fn checked(app: &DesignApp, id: &str, params: &Value) -> Option<bool> {
+    Some(match id {
+        "window.workspace" => params.get("name").and_then(Value::as_str) == Some(app.ui.workspace.as_str()),
+        "view.rulers" => app.ui.rulers,
+        "view.frameEdges" => app.ui.frame_edges,
+        "view.overprintPreview" => app.ui.overprint_preview,
+        "view.separations" => {
+            let sep = app.ui.separations.as_ref();
+            match (params.get("plate"), params.get("inkLimit")) {
+                (Some(Value::Null), _) => sep.is_none(),
+                (Some(Value::String(s)), _) if s == "all" => sep.is_some_and(|x| x.plate.is_none()),
+                (Some(Value::String(s)), _) => sep.and_then(|x| x.plate.as_deref()).is_some_and(|p| p.eq_ignore_ascii_case(s)),
+                (None, Some(v)) => sep.and_then(|x| x.ink_limit).is_some_and(|l| Some(f64::from(l)) == v.as_f64()),
+                _ => false,
+            }
+        }
+        "view.fastDisplay" => app.ui.display_quality == designcraft_render::DisplayQuality::Fast,
+        "view.typicalDisplay" => app.ui.display_quality == designcraft_render::DisplayQuality::Typical,
+        "view.highQualityDisplay" => app.ui.display_quality == designcraft_render::DisplayQuality::High,
+        "view.guides" => app.ui.guides,
+        "view.lockGuides" => app.ui.guides_locked,
+        "view.lockColumnGuides" => app.session.active().is_some_and(|d| d.doc.settings.column_guides_locked),
+        "view.snapToGuides" => app.ui.snap_to_guides,
+        "view.snapToDocumentGrid" => app.ui.snap_to_document_grid,
+        "view.smartGuides" => app.ui.smart_guides,
+        "view.baselineGrid" => app.ui.baseline_grid,
+        "view.documentGrid" => app.ui.document_grid,
+        "view.textThreads" => app.ui.text_threads,
+        "view.hiddenCharacters" => app.ui.hidden_characters,
+        "view.taggedFrames" => app.ui.tagged_frames,
+        "view.storyEditorDepthRuler" => app.ui.story_editor_depth_ruler,
+        "changes.track" => app.session.active().is_some_and(|d| d.doc.settings.track_changes),
+        // Pressed, as the Bulleted and Numbered List buttons: every paragraph the command applies
+        // to (selected text, cells or text frames) has it.
+        "list.bullets" | "list.numbers" => {
+            app.session.selection_has_list(if id == "list.bullets" { designcraft_doc::ListType::Bullets } else { designcraft_doc::ListType::Numbers })
+        }
+        "window.controlBar" => app.ui.control_bar,
+        "window.split" => app.split,
+        "window.newWindow" => app.second_window,
+        "view.proofColors" => app.ui.proof_colors,
+        "view.flattenerPreview" => app.ui.flattener_preview,
+        "view.tagMarkers" => app.ui.tag_markers,
+        "view.screenMode" => {
+            let mode = match params.get("mode").and_then(Value::as_str) {
+                Some("normal") => crate::ScreenMode::Normal,
+                Some("preview") => crate::ScreenMode::Preview,
+                Some("bleed") => crate::ScreenMode::Bleed,
+                Some("slug") => crate::ScreenMode::Slug,
+                Some("presentation") => crate::ScreenMode::Presentation,
+                _ => return None,
+            };
+            app.ui.screen_mode == mode
+        }
+        "view.rotateSpread" => match params.get("angle").and_then(Value::as_i64) {
+            Some(0) => app.session.active().is_some_and(|st| st.doc.spreads.iter().all(|sp| sp.pages.first().is_none_or(|p| p.view_rotation == 0))),
+            _ => return None,
+        },
+        "view.proofSetup" => match (params.get("target").and_then(Value::as_str), params.get("simulatePaper")) {
+            (Some(t), _) => app.ui.proof_setup.target.id() == t,
+            (None, Some(_)) => app.ui.proof_setup.simulate_paper,
+            _ => return None,
+        },
+        "edit.dynamicSpelling" => app.ui.dynamic_spelling,
+        "app.language" => app.ui.language == params.get("lang").and_then(Value::as_str).unwrap_or(""),
+        "app.flattener" => app.ui.flattener == params.get("preset").and_then(Value::as_str).unwrap_or(""),
+        "window.taskBar" => app.ui.task_bar,
+        "window.taskBarPin" => app.ui.task_bar_pin.is_some(),
+        "window.toolsDoubleColumn" => app.ui.tools_double_column,
+        "view.togglePreview" => app.ui.screen_mode == crate::ScreenMode::Preview,
+        "view.togglePresentation" => app.ui.screen_mode == crate::ScreenMode::Presentation,
+        "window.brightness" => params.get("brightness").and_then(Value::as_str) == Some(app.ui.brightness.id()),
+        "type.storyDirection" => {
+            let st = app.session.active()?;
+            let sid = st
+                .selection
+                .text
+                .map(|t| t.story)
+                .or_else(|| st.selection.items.iter().find_map(|i| st.doc.item(*i)?.text_frame().map(|t| t.story)))?;
+            st.doc.story(sid)?.vertical == params.get("vertical").and_then(Value::as_bool)?
+        }
+        _ => return None,
+    })
+}
+
+/// Enablement for menu display (UI commands need a document unless they're app/window-level).
+pub fn menu_enabled(app: &DesignApp, id: &str) -> bool {
+    if waits_for_ime(app, id) {
+        return false;
+    }
+    if is_window_control(id) {
+        return window_control_available(app, id);
+    }
+    if matches!(id, "app.justificationDialog" | "app.hyphenationDialog") {
+        return enabled(app, "type.para");
+    }
+    if id.starts_with("fit.") {
+        return enabled(app, "object.fit");
+    }
+    if id == "guide.selectAll" && (!app.ui.guides || app.ui.guides_locked) {
+        return false;
+    }
+    if id == "view.goBack" || id == "view.goForward" {
+        return crate::canvas::can_go_through_history(app, if id == "view.goBack" { -1 } else { 1 });
+    }
+    if ui_label(id).is_some() {
+        return app.session.active().is_some() || id.starts_with("app.") || id.starts_with("window.") || id.starts_with("help.");
+    }
+    enabled(app, id)
+}
+
+/// Whether a native menu bar item can be chosen: as in the in-window menus, but the editing
+/// commands a focused text field takes are always available to it.
+pub fn native_menu_enabled(app: &DesignApp, ctx: &egui::Context, id: &str) -> bool {
+    (ctx.text_edit_focused() && TEXT_FIELD_COMMANDS.contains(&id)) || menu_enabled(app, id)
+}
diff --git a/crates/ui-egui/src/menus/tables.rs b/crates/ui-egui/src/menus/tables.rs
new file mode 100644
index 000000000..4d63d485f
--- /dev/null
+++ b/crates/ui-egui/src/menus/tables.rs
@@ -0,0 +1,671 @@
+/// Menu bar: (menu, entries). Entries: `cmd:<id>`, `ui:<id>`, `-` separator, `>Submenu` … `<`.
+pub const MENUS: &[(&str, &[&str])] = &[
+    (
+        "File",
+        &[
+            "ui:app.newDocumentDialog",
+            "ui:app.openDialog",
+            ">Open Recent",
+            "cmd:file.clearRecent",
+            "<",
+            "-",
+            "cmd:file.close",
+            "ui:app.save",
+            "ui:app.saveDialog",
+            "ui:app.saveCopyDialog",
+            "cmd:file.revert",
+            "-",
+            "ui:app.placeDialog",
+            "ui:app.placeWithOptions",
+            "-",
+            "ui:app.exportPdf",
+            "ui:app.packageDialog",
+            "ui:app.printBooklet",
+            "ui:app.exportPng",
+            "ui:app.exportIdml",
+            "ui:app.exportEpub",
+            "ui:app.exportFixedEpub",
+            "ui:app.exportInteractivePdf",
+            "ui:app.exportHtml",
+            "ui:app.exportPptx",
+            "ui:app.exportXml",
+            "ui:app.exportText",
+            ">Export",
+            "cmd:snippet.export",
+            "<",
+            "-",
+            "cmd:layout.documentSetup",
+            "cmd:file.info",
+        ],
+    ),
+    (
+        "Edit",
+        &[
+            "cmd:edit.undo",
+            "cmd:edit.redo",
+            "-",
+            "cmd:edit.cut",
+            "cmd:edit.copy",
+            "cmd:edit.paste",
+            "cmd:edit.pasteWithoutFormatting",
+            "cmd:edit.pasteInto",
+            "cmd:edit.pasteInPlace",
+            "cmd:edit.clear",
+            "-",
+            "cmd:edit.duplicate",
+            "ui:app.placeAndLink",
+            "cmd:edit.stepAndRepeat",
+            "-",
+            "cmd:edit.selectAll",
+            "cmd:guide.selectAll",
+            "cmd:edit.deselectAll",
+            "-",
+            "ui:app.findChange",
+            "cmd:find.next",
+            "ui:app.storyEditor",
+            "-",
+            ">Spelling",
+            "cmd:spelling.check",
+            "ui:edit.dynamicSpelling",
+            "cmd:spelling.addWord",
+            "ui:app.userDictionary",
+            "<",
+            ">Transparency Blend Space",
+            "cmd:edit.transparencyBlendSpace|Document RGB|{\"space\": \"rgb\"}",
+            "cmd:edit.transparencyBlendSpace|Document CMYK|{\"space\": \"cmyk\"}",
+            "<",
+            "ui:app.colorSettings",
+            ">Transparency Flattener Presets",
+            "ui:app.flattener|None (keep transparency)|{\"preset\": \"\"}",
+            "ui:app.flattener|High Resolution|{\"preset\": \"high\"}",
+            "ui:app.flattener|Medium Resolution|{\"preset\": \"medium\"}",
+            "ui:app.flattener|Low Resolution|{\"preset\": \"low\"}",
+            "<",
+            "-",
+            "ui:app.palette",
+            "ui:app.keyboardShortcuts",
+            "ui:app.menus",
+            "ui:app.preferences",
+        ],
+    ),
+    (
+        "Layout",
+        &[
+            ">Pages",
+            "cmd:layout.pages.insert",
+            "cmd:layout.pages.move",
+            "ui:app.duplicateSpread",
+            "ui:app.deletePage",
+            "-",
+            "cmd:layout.pages.applyParent",
+            "cmd:layout.parents.new",
+            "<",
+            "cmd:layout.marginsAndColumns",
+            "cmd:layout.createGuides",
+            "cmd:layout.createAlternate",
+            "-",
+            "ui:view.firstPage",
+            "ui:view.previousPage",
+            "ui:view.nextPage",
+            "ui:view.lastPage",
+            "ui:view.nextSpread",
+            "ui:view.previousSpread",
+            "ui:view.goToPage",
+            "ui:view.goBack",
+            "ui:view.goForward",
+            "-",
+            "cmd:layout.section",
+            "cmd:toc.generate",
+            "cmd:toc.update",
+            ">Index",
+            "cmd:index.addReference",
+            "cmd:index.generate",
+            "cmd:index.update",
+            "<",
+        ],
+    ),
+    (
+        "Type",
+        &[
+            ">Size",
+            "cmd:type.char|6 pt|{\"attrs\": {\"size\": 6}}",
+            "cmd:type.char|7 pt|{\"attrs\": {\"size\": 7}}",
+            "cmd:type.char|8 pt|{\"attrs\": {\"size\": 8}}",
+            "cmd:type.char|9 pt|{\"attrs\": {\"size\": 9}}",
+            "cmd:type.char|10 pt|{\"attrs\": {\"size\": 10}}",
+            "cmd:type.char|11 pt|{\"attrs\": {\"size\": 11}}",
+            "cmd:type.char|12 pt|{\"attrs\": {\"size\": 12}}",
+            "cmd:type.char|14 pt|{\"attrs\": {\"size\": 14}}",
+            "cmd:type.char|18 pt|{\"attrs\": {\"size\": 18}}",
+            "cmd:type.char|24 pt|{\"attrs\": {\"size\": 24}}",
+            "cmd:type.char|30 pt|{\"attrs\": {\"size\": 30}}",
+            "cmd:type.char|36 pt|{\"attrs\": {\"size\": 36}}",
+            "cmd:type.char|48 pt|{\"attrs\": {\"size\": 48}}",
+            "cmd:type.char|60 pt|{\"attrs\": {\"size\": 60}}",
+            "cmd:type.char|72 pt|{\"attrs\": {\"size\": 72}}",
+            "<",
+            "-",
+            "ui:app.characterPanel",
+            "ui:app.paragraphPanel",
+            "ui:app.tabsPanel",
+            "ui:app.glyphsPanel",
+            "-",
+            "ui:app.characterStylesPanel",
+            "ui:app.paragraphStylesPanel",
+            "-",
+            "cmd:type.createOutlines",
+            "ui:app.findFontDialog",
+            "cmd:font.reload",
+            ">Change Case",
+            "cmd:type.changeCase|UPPERCASE|{\"case\": \"upper\"}",
+            "cmd:type.changeCase|lowercase|{\"case\": \"lower\"}",
+            "cmd:type.changeCase|Title Case|{\"case\": \"title\"}",
+            "cmd:type.changeCase|Sentence case|{\"case\": \"sentence\"}",
+            "<",
+            "-",
+            ">Type on a Path",
+            "cmd:type.pathOptions",
+            "cmd:type.pathOptions|Delete Type from Path|{\"delete\": true}",
+            "<",
+            "-",
+            ">Notes",
+            "cmd:note.new",
+            "cmd:note.convertFromText",
+            "ui:window.panel|Notes|{\"panel\": \"notes\"}",
+            "-",
+            "cmd:note.previous",
+            "cmd:note.next",
+            "<",
+            ">Track Changes",
+            "cmd:changes.track",
+            "cmd:changes.acceptAll",
+            "cmd:changes.rejectAll",
+            "<",
+            "-",
+            "cmd:footnote.insert",
+            "ui:app.footnoteOptionsDialog",
+            "cmd:endnote.insert",
+            "cmd:footnote.goToReference",
+            "-",
+            ">Hyperlinks & Cross-References",
+            "cmd:hyperlink.create",
+            "cmd:anchor.create",
+            "-",
+            "ui:app.insertXrefDialog",
+            "cmd:xref.defineFormat",
+            "<",
+            ">Text Variables",
+            "cmd:variables.define",
+            "cmd:variables.insert",
+            "cmd:variables.convertToText",
+            "<",
+            "-",
+            ">Bulleted & Numbered Lists",
+            "cmd:list.bullets",
+            "cmd:list.numbers",
+            "-",
+            "cmd:list.define",
+            "<",
+            "-",
+            ">Insert Special Character",
+            ">Symbols",
+            "cmd:text.insert|Bullet Character|{\"text\": \"\u{2022}\", \"raw\": true}",
+            "cmd:text.insert|Copyright Symbol|{\"text\": \"\u{a9}\", \"raw\": true}",
+            "cmd:text.insert|Ellipsis|{\"text\": \"\u{2026}\", \"raw\": true}",
+            "cmd:text.insert|Paragraph Symbol|{\"text\": \"\u{b6}\", \"raw\": true}",
+            "cmd:text.insert|Registered Trademark Symbol|{\"text\": \"\u{ae}\", \"raw\": true}",
+            "cmd:text.insert|Section Symbol|{\"text\": \"\u{a7}\", \"raw\": true}",
+            "cmd:text.insert|Trademark Symbol|{\"text\": \"\u{2122}\", \"raw\": true}",
+            "<",
+            ">Markers",
+            "ui:app.insertCurrentPageNumber",
+            "cmd:text.insert|Next Page Number|{\"text\": \"\u{e007}\", \"raw\": true}",
+            "cmd:text.insert|Previous Page Number|{\"text\": \"\u{e008}\", \"raw\": true}",
+            "cmd:text.insert|Section Marker|{\"text\": \"\u{e001}\", \"raw\": true}",
+            "<",
+            ">Hyphens and Dashes",
+            "cmd:text.insert|Em Dash|{\"text\": \"\u{2014}\", \"raw\": true}",
+            "cmd:text.insert|En Dash|{\"text\": \"\u{2013}\", \"raw\": true}",
+            "cmd:text.insert|Discretionary Hyphen|{\"text\": \"\u{ad}\", \"raw\": true}",
+            "cmd:text.insert|Nonbreaking Hyphen|{\"text\": \"\u{2011}\", \"raw\": true}",
+            "<",
+            ">Quotation Marks",
+            "cmd:text.insert|Double Left Quotation Marks|{\"text\": \"\u{201c}\", \"raw\": true}",
+            "cmd:text.insert|Double Right Quotation Marks|{\"text\": \"\u{201d}\", \"raw\": true}",
+            "cmd:text.insert|Single Left Quotation Mark|{\"text\": \"\u{2018}\", \"raw\": true}",
+            "cmd:text.insert|Single Right Quotation Mark|{\"text\": \"\u{2019}\", \"raw\": true}",
+            "cmd:text.insert|Straight Double Quotation Marks|{\"text\": \"\\\"\", \"raw\": true}",
+            "cmd:text.insert|Straight Single Quotation Mark (Apostrophe)|{\"text\": \"'\", \"raw\": true}",
+            "<",
+            ">Other",
+            "cmd:text.insert|Tab|{\"text\": \"\\t\", \"raw\": true}",
+            "cmd:text.insert|Right Indent Tab|{\"text\": \"\u{e006}\", \"raw\": true}",
+            "cmd:text.insert|Indent to Here|{\"text\": \"\u{e005}\", \"raw\": true}",
+            "<",
+            "<",
+            ">Insert White Space",
+            "cmd:text.insert|Em Space|{\"text\": \"\u{2003}\", \"raw\": true}",
+            "cmd:text.insert|En Space|{\"text\": \"\u{2002}\", \"raw\": true}",
+            "cmd:text.insert|Nonbreaking Space|{\"text\": \"\u{a0}\", \"raw\": true}",
+            "cmd:text.insert|Hair Space|{\"text\": \"\u{200a}\", \"raw\": true}",
+            "cmd:text.insert|Sixth Space|{\"text\": \"\u{2006}\", \"raw\": true}",
+            "cmd:text.insert|Thin Space|{\"text\": \"\u{2009}\", \"raw\": true}",
+            "cmd:text.insert|Quarter Space|{\"text\": \"\u{2005}\", \"raw\": true}",
+            "cmd:text.insert|Third Space|{\"text\": \"\u{2004}\", \"raw\": true}",
+            "cmd:text.insert|Punctuation Space|{\"text\": \"\u{2008}\", \"raw\": true}",
+            "cmd:text.insert|Figure Space|{\"text\": \"\u{2007}\", \"raw\": true}",
+            "cmd:text.insert|Flush Space|{\"text\": \"\u{2001}\", \"raw\": true}",
+            "<",
+            ">Insert Break Character",
+            "cmd:text.insert|Column Break|{\"text\": \"\u{e002}\", \"raw\": true}",
+            "cmd:text.insert|Frame Break|{\"text\": \"\u{e003}\", \"raw\": true}",
+            "cmd:text.insert|Page Break|{\"text\": \"\u{e004}\", \"raw\": true}",
+            "cmd:text.insert|Odd Page Break|{\"text\": \"\u{e011}\", \"raw\": true}",
+            "cmd:text.insert|Even Page Break|{\"text\": \"\u{e012}\", \"raw\": true}",
+            "cmd:text.insert|Paragraph Return|{\"text\": \"\\n\", \"raw\": true}",
+            "cmd:text.insert|Forced Line Break|{\"text\": \"\u{2028}\", \"raw\": true}",
+            "<",
+            "cmd:type.fillWithPlaceholder",
+            "-",
+            "ui:view.hiddenCharacters",
+            "-",
+            "cmd:math.insert",
+            ">Story Direction",
+            "cmd:type.storyDirection|Horizontal|{\"vertical\": false}",
+            "cmd:type.storyDirection|Vertical|{\"vertical\": true}",
+            "<",
+            "cmd:type.tateChuYoko",
+            "ui:app.rubyDialog",
+            "cmd:type.kenten",
+            "cmd:type.warichu",
+        ],
+    ),
+    (
+        "Object",
+        &[
+            ">Transform",
+            "cmd:transform.move",
+            "cmd:transform.scale",
+            "cmd:transform.rotate",
+            "cmd:transform.shear",
+            "-",
+            "cmd:transform.flip",
+            "-",
+            "cmd:transform.clear",
+            "<",
+            ">Transform Again",
+            "cmd:transform.again",
+            "cmd:transform.again|Transform Again Individually|{\"individually\": true}",
+            "cmd:transform.again|Transform Sequence Again|{\"sequence\": true}",
+            "cmd:transform.again|Transform Sequence Again Individually|{\"sequence\": true, \"individually\": true}",
+            "<",
+            ">Flex Layout",
+            "cmd:flex.add",
+            "cmd:flex.convert",
+            "cmd:flex.remove",
+            "-",
+            "ui:window.panel|Show Flex Controls|{\"panel\": \"flexLayout\"}",
+            "<",
+            ">Paths",
+            "cmd:object.makeCompoundPath",
+            "cmd:object.releaseCompoundPath",
+            "-",
+            "cmd:path.reverse",
+            "<",
+            ">Pathfinder",
+            "cmd:object.pathfinder|Add|{\"op\": \"add\"}",
+            "cmd:object.pathfinder|Subtract|{\"op\": \"subtract\"}",
+            "cmd:object.pathfinder|Intersect|{\"op\": \"intersect\"}",
+            "cmd:object.pathfinder|Exclude Overlap|{\"op\": \"exclude\"}",
+            "cmd:object.pathfinder|Minus Back|{\"op\": \"minusBack\"}",
+            "<",
+            ">Arrange",
+            "cmd:object.bringToFront",
+            "cmd:object.bringForward",
+            "cmd:object.sendBackward",
+            "cmd:object.sendToBack",
+            "<",
+            "-",
+            "cmd:object.group",
+            "cmd:object.ungroup",
+            "cmd:object.lock",
+            "cmd:object.unlockAll",
+            "cmd:object.hide",
+            "cmd:object.showAll",
+            "-",
+            "cmd:object.textFrameOptions",
+            "ui:app.layerOptions",
+            "cmd:object.exportOptions",
+            "cmd:object.primaryTextFrame",
+            "cmd:object.cornerOptions",
+            "-",
+            ">Effects",
+            "ui:effects.dialog|Transparency…|{\"page\": \"transparency\"}",
+            "cmd:object.dropShadow",
+            "cmd:object.innerShadow",
+            "cmd:object.outerGlow",
+            "cmd:object.innerGlow",
+            "cmd:object.bevel",
+            "cmd:object.satin",
+            "cmd:object.feather",
+            "cmd:object.directionalFeather",
+            "<",
+            ">Select",
+            "cmd:select.firstAbove",
+            "cmd:select.nextAbove",
+            "cmd:select.nextBelow",
+            "cmd:select.lastBelow",
+            "-",
+            "cmd:select.container",
+            "cmd:select.content",
+            "-",
+            "cmd:select.previousInGroup",
+            "cmd:select.nextInGroup",
+            "<",
+            ">Convert Shape",
+            "cmd:object.convertShape|Rectangle|{\"to\": \"rectangle\"}",
+            "cmd:object.convertShape|Rounded Rectangle|{\"to\": \"roundedRectangle\"}",
+            "cmd:object.convertShape|Beveled Rectangle|{\"to\": \"beveledRectangle\"}",
+            "cmd:object.convertShape|Inverse Rounded Rectangle|{\"to\": \"inverseRoundedRectangle\"}",
+            "cmd:object.convertShape|Ellipse|{\"to\": \"ellipse\"}",
+            "cmd:object.convertShape|Triangle|{\"to\": \"triangle\"}",
+            "cmd:object.convertShape|Polygon|{\"to\": \"polygon\"}",
+            "cmd:object.convertShape|Line|{\"to\": \"line\"}",
+            "cmd:object.convertShape|Orthogonal Line|{\"to\": \"orthogonalLine\"}",
+            "-",
+            "cmd:object.convertShape|Open Path|{\"to\": \"openPath\"}",
+            "cmd:object.convertShape|Closed Path|{\"to\": \"closedPath\"}",
+            "<",
+            "ui:app.qrCode",
+            ">Clipping Path",
+            "cmd:object.clippingPathOptions|None|{\"type\": \"none\"}",
+            "cmd:object.clippingPath|Alpha Channel|{\"type\": \"alpha\"}",
+            "cmd:object.clippingPath|Detect Edges|{\"type\": \"edges\"}",
+            "<",
+            ">Captions",
+            "cmd:object.caption",
+            "cmd:object.caption|Generate Live Caption|{\"live\": true}",
+            "<",
+            ">Anchored Object",
+            "cmd:anchored.options",
+            "cmd:anchored.release",
+            "<",
+            ">Fitting",
+            "ui:fit.fillFrameProportionally",
+            "ui:fit.contentProportionally",
+            "ui:fit.frameToContent",
+            "ui:fit.contentToFrame",
+            "ui:fit.centerContent",
+            "-",
+            "ui:app.fittingOptions",
+            "<",
+            ">Content",
+            "cmd:object.content|Graphic|{\"type\":\"graphic\"}",
+            "cmd:object.content|Text|{\"type\":\"text\"}",
+            "cmd:object.content|Unassigned|{\"type\":\"unassigned\"}",
+            "<",
+        ],
+    ),
+    (
+        "Table",
+        &[
+            "ui:app.insertTableDialog",
+            "cmd:table.convertFromText",
+            "cmd:table.convertToText",
+            "-",
+            ">Insert",
+            "cmd:table.insertRowAbove",
+            "cmd:table.insertRowBelow",
+            "cmd:table.insertColumnLeft",
+            "cmd:table.insertColumnRight",
+            "<",
+            ">Delete",
+            "cmd:table.deleteRow",
+            "cmd:table.deleteColumn",
+            "cmd:table.delete",
+            "<",
+            ">Select",
+            "cmd:table.selectRow",
+            "cmd:table.selectColumn",
+            "cmd:table.selectTable",
+            "<",
+            "-",
+            ">Cell Options",
+            "ui:app.cellOptionsDialog",
+            "<",
+            "cmd:table.merge",
+            "cmd:table.unmerge",
+            ">Convert Cell Type",
+            "ui:app.graphicCell|Convert Cell to Graphic Cell…",
+            "cmd:table.textCell",
+            "<",
+            ">Convert Rows",
+            "cmd:table.convertRowsToHeader",
+            "cmd:table.convertRowsToBody",
+            "cmd:table.convertRowsToFooter",
+            "<",
+            "cmd:table.splitHorizontally",
+            "cmd:table.splitVertically",
+            "cmd:table.distributeColumns",
+            "cmd:table.distributeRows",
+            "-",
+            "ui:app.tablePanel",
+        ],
+    ),
+    (
+        "View",
+        &[
+            "ui:view.overprintPreview",
+            ">Proof Setup",
+            "ui:view.proofSetup|Working CMYK|{\"target\": \"workingCmyk\"}",
+            "ui:view.proofSetup|Internet Standard RGB (sRGB)|{\"target\": \"srgb\"}",
+            "ui:view.proofSetup|Legacy Macintosh RGB|{\"target\": \"legacyMacRgb\"}",
+            "ui:view.proofSetup|Monitor RGB|{\"target\": \"monitorRgb\"}",
+            "ui:view.proofSetup|Color Blindness – Protanopia|{\"target\": \"protanopia\"}",
+            "ui:view.proofSetup|Color Blindness – Deuteranopia|{\"target\": \"deuteranopia\"}",
+            "-",
+            "ui:view.proofSetup|Simulate Paper Color|{\"simulatePaper\": \"toggle\"}",
+            "<",
+            "ui:view.proofColors",
+            ">Separations Preview",
+            "ui:view.separations|Off|{\"plate\": null, \"inkLimit\": null}",
+            "ui:view.separations|All Inks|{\"plate\": \"all\"}",
+            "ui:view.separations|Cyan|{\"plate\": \"cyan\"}",
+            "ui:view.separations|Magenta|{\"plate\": \"magenta\"}",
+            "ui:view.separations|Yellow|{\"plate\": \"yellow\"}",
+            "ui:view.separations|Black|{\"plate\": \"black\"}",
+            "ui:view.separations|Ink Limit 300%|{\"inkLimit\": 300}",
+            "<",
+            "ui:view.flattenerPreview",
+            "-",
+            "ui:view.zoomIn",
+            "ui:view.zoomOut",
+            "ui:view.fitPage",
+            "ui:view.fitSelection",
+            "ui:view.fitSpread",
+            "ui:view.actualSize",
+            "ui:view.entirePasteboard",
+            "-",
+            ">Rotate Spread",
+            "ui:view.rotateSpread|90° CW|{\"angle\": 90}",
+            "ui:view.rotateSpread|90° CCW|{\"angle\": -90}",
+            "ui:view.rotateSpread|180°|{\"angle\": 180}",
+            "ui:view.rotateSpread|Clear Rotation|{\"angle\": 0}",
+            "<",
+            "-",
+            ">Screen Mode",
+            "ui:view.screenMode|Normal|{\"mode\": \"normal\"}",
+            "ui:view.screenMode|Preview|{\"mode\": \"preview\"}",
+            "ui:view.screenMode|Bleed|{\"mode\": \"bleed\"}",
+            "ui:view.screenMode|Slug|{\"mode\": \"slug\"}",
+            "ui:view.screenMode|Presentation|{\"mode\": \"presentation\"}",
+            "<",
+            ">Display Performance",
+            "ui:view.fastDisplay",
+            "ui:view.typicalDisplay",
+            "ui:view.highQualityDisplay",
+            "<",
+            "-",
+            "ui:view.rulers",
+            "-",
+            ">Extras",
+            "ui:view.frameEdges",
+            "ui:view.textThreads",
+            "<",
+            ">Grids & Guides",
+            "ui:view.guides",
+            "ui:view.lockGuides",
+            "cmd:view.lockColumnGuides",
+            "ui:view.snapToGuides",
+            "ui:view.snapToDocumentGrid",
+            "ui:view.smartGuides",
+            "ui:view.baselineGrid",
+            "ui:view.documentGrid",
+            "-",
+            "ui:app.deleteAllGuides",
+            "<",
+            "-",
+            ">Structure",
+            "ui:view.taggedFrames",
+            "ui:view.tagMarkers",
+            "<",
+            ">Story Editor",
+            "ui:view.storyEditorDepthRuler",
+            "<",
+        ],
+    ),
+    (
+        "Window",
+        // InDesign's order: Arrange, Workspace, then the panels alphabetically with their groups.
+        &[
+            ">Arrange",
+            "ui:window.newWindow",
+            "ui:window.split",
+            "-",
+            "ui:window.nextDocument",
+            "ui:window.previousDocument",
+            "<",
+            "ui:window.workspace",
+            "-",
+            "ui:window.panel|Articles|{\"panel\": \"articles\"}",
+            ">Color",
+            "ui:window.panel|Color|{\"panel\": \"color\"}",
+            "ui:window.panel|Gradient|{\"panel\": \"gradient\"}",
+            "ui:window.panel|Swatches|{\"panel\": \"swatches\"}",
+            "<",
+            "ui:window.taskBar",
+            "ui:window.controlBar",
+            ">Editorial",
+            "ui:window.panel|Notes|{\"panel\": \"notes\"}",
+            "ui:window.panel|Track Changes|{\"panel\": \"trackChanges\"}",
+            "<",
+            "ui:window.panel|Effects|{\"panel\": \"effects\"}",
+            "ui:window.panel|Info|{\"panel\": \"info\"}",
+            ">Interactive",
+            "ui:window.panel|Bookmarks|{\"panel\": \"bookmarks\"}",
+            "ui:window.panel|Buttons and Forms|{\"panel\": \"buttons\"}",
+            "ui:window.panel|Hyperlinks|{\"panel\": \"hyperlinks\"}",
+            "ui:window.panel|Liquid Layout|{\"panel\": \"liquid\"}",
+            "ui:window.panel|Media|{\"panel\": \"media\"}",
+            "ui:window.panel|Object States|{\"panel\": \"states\"}",
+            "ui:window.panel|Page Transitions|{\"panel\": \"transitions\"}",
+            "<",
+            "ui:window.panel|Layers|{\"panel\": \"layers\"}",
+            "ui:window.panel|Links|{\"panel\": \"links\"}",
+            ">Object & Layout",
+            "ui:window.panel|Align|{\"panel\": \"align\"}",
+            "ui:window.panel|Flex Layout|{\"panel\": \"flexLayout\"}",
+            "ui:window.panel|Pathfinder|{\"panel\": \"pathfinder\"}",
+            "<",
+            ">Output",
+            "ui:window.panel|Attributes|{\"panel\": \"attributes\"}",
+            "ui:window.panel|Preflight|{\"panel\": \"preflight\"}",
+            "ui:window.panel|Separations Preview|{\"panel\": \"separations\"}",
+            "<",
+            "ui:window.panel|Pages|{\"panel\": \"pages\"}",
+            "ui:window.panel|Properties|{\"panel\": \"properties\"}",
+            "ui:window.panel|Stroke|{\"panel\": \"stroke\"}",
+            ">Styles",
+            "ui:window.panel|Character Styles|{\"panel\": \"characterStyles\"}",
+            "ui:window.panel|Paragraph Styles|{\"panel\": \"paragraphStyles\"}",
+            "<",
+            "ui:window.panel|Text Wrap|{\"panel\": \"textWrap\"}",
+            ">Type & Tables",
+            "ui:window.panel|Character|{\"panel\": \"character\"}",
+            "ui:window.panel|Conditional Text|{\"panel\": \"conditions\"}",
+            "ui:window.panel|Glyphs|{\"panel\": \"glyphs\"}",
+            "ui:window.panel|Paragraph|{\"panel\": \"paragraph\"}",
+            "ui:window.panel|Story|{\"panel\": \"story\"}",
+            "ui:window.panel|Table|{\"panel\": \"table\"}",
+            "ui:app.tabsPanel",
+            "ui:window.panel|Typography|{\"panel\": \"typography\"}",
+            "<",
+            ">Utilities",
+            "ui:window.panel|Book|{\"panel\": \"book\"}",
+            "ui:window.panel|Data Merge|{\"panel\": \"dataMerge\"}",
+            "ui:window.panel|Library|{\"panel\": \"library\"}",
+            "ui:window.panel|Scripts|{\"panel\": \"scripts\"}",
+            "ui:window.panel|Tags|{\"panel\": \"tags\"}",
+            "<",
+            "-",
+            "ui:window.hidePanels",
+            "ui:window.hidePanelsExceptTools",
+            "ui:window.toolsDoubleColumn",
+            "-",
+            "ui:window.brightness",
+        ],
+    ),
+    (
+        "Help",
+        &[
+            "ui:help.discord",
+            "-",
+            "ui:help.appPage",
+            "ui:help.github",
+            "ui:help.issues",
+            "ui:help.website",
+            "-",
+            "cmd:file.newSample",
+            "-",
+            "ui:help.checkForUpdates",
+            "ui:help.about",
+        ],
+    ),
+];
+
+/// The built-in workspaces, in InDesign's order.
+pub const WORKSPACES: &[&str] =
+    &["Advanced", "Book", "Digital Publishing", "Essentials", "Essentials Classic", "Interactive for PDF", "Printing and Proofing", "Typography"];
+
+/// The built-in workspaces that open a panel below the Properties · Pages · Layers group.
+pub const WORKSPACE_OPEN_PANELS: &[(&str, &str)] =
+    &[("Printing and Proofing", "swatches"), ("Interactive for PDF", "buttons"), ("Digital Publishing", "liquid")];
+
+/// The panel the built-in workspace `name` opens below the Properties · Pages · Layers group.
+pub fn workspace_open_panel(name: &str) -> Option<&'static str> {
+    WORKSPACE_OPEN_PANELS.iter().find(|(workspace, _)| *workspace == name).map(|(_, panel)| *panel)
+}
+
+/// Essentials Classic's iconic column: InDesign's iconic panel groups, top to bottom.
+pub const CLASSIC_GROUPS: &[&[&str]] = &[
+    &["pages", "layers", "links"],
+    &["stroke", "color"],
+    &["swatches"],
+    &["effects"],
+    &["paragraph"],
+    &["textWrap"],
+    &["characterStyles", "paragraphStyles"],
+    &["gradient"],
+];
+
+/// The Typography preset's available panels in the order observed in InDesign's workspace.
+/// CC Libraries has no corresponding DesignCraft panel, and where the Story panel sits in it is
+/// not recorded, so these groups leave it out.
+pub const TYPOGRAPHY_GROUPS: &[&[&str]] = &[
+    &["pages", "layers", "swatches"],
+    &["glyphs", "textWrap"],
+    &["stroke", "gradient"],
+    &["hyperlinks", "effects"],
+    &["paragraph", "paragraphStyles"],
+    &["character", "characterStyles"],
+];
diff --git a/crates/ui-egui/src/menus/tests.rs b/crates/ui-egui/src/menus/tests.rs
new file mode 100644
index 000000000..5e82f6d3f
--- /dev/null
+++ b/crates/ui-egui/src/menus/tests.rs
@@ -0,0 +1,2978 @@
+use super::*;
+
+/// The entries (command ids) of a menu bar menu, submenus included.
+fn menu_ids(title: &str) -> Vec<&'static str> {
+    let items = MENUS.iter().find(|(t, _)| *t == title).map(|(_, items)| *items).unwrap_or_default();
+    items.iter().filter_map(|e| e.split_once(':').map(|(_, rest)| rest.split('|').next().unwrap_or(rest))).collect()
+}
+
+#[test]
+fn view_items_are_in_the_view_menu_as_in_indesign() {
+    let (view, typ) = (menu_ids("View"), menu_ids("Type"));
+    for id in [
+        "view.rotateSpread",
+        "view.proofSetup",
+        "view.proofColors",
+        "view.flattenerPreview",
+        "view.separations",
+        "view.taggedFrames",
+        "view.tagMarkers",
+        "view.storyEditorDepthRuler",
+    ] {
+        assert!(view.contains(&id), "{id} is in View");
+        assert!(!typ.contains(&id), "{id} isn't in Type");
+    }
+    // Screen Mode and Extras are View submenus; Show Hidden Characters stays in Type.
+    assert!(view.contains(&"view.screenMode") && view.contains(&"view.frameEdges"));
+    assert!(typ.contains(&"view.hiddenCharacters") && !view.contains(&"view.hiddenCharacters"));
+    // W still toggles Normal / Preview without a menu entry.
+    assert_eq!(ui_label("view.togglePreview").and_then(|c| c.1), Some("W"));
+}
+
+/// The submenu paths of a menu bar menu ("View/Screen Mode"), as Edit › Menus keys them.
+fn submenu_paths(title: &str) -> Vec<String> {
+    let items = MENUS.iter().find(|(t, _)| *t == title).map(|(_, items)| *items).unwrap_or_default();
+    let mut stack = vec![title.to_string()];
+    let mut out = Vec::new();
+    for e in items {
+        if let Some(name) = e.strip_prefix('>') {
+            let path = format!("{}/{name}", stack.last().map_or("", String::as_str));
+            out.push(path.clone());
+            stack.push(path);
+        } else if *e == "<" {
+            stack.pop();
+        }
+    }
+    out
+}
+
+/// A command's menu path names the menu entries that really hold it.
+#[test]
+fn define_lists_command_path_matches_the_type_menu() {
+    let spec = designcraft_engine::command_specs().iter().find(|c| c.id == "list.define").expect("list.define is a command");
+    assert_eq!(spec.menu[0], "Type");
+    assert!(submenu_paths("Type").contains(&spec.menu.join("/")), "{:?} is not a Type submenu", spec.menu);
+    assert!(menu_ids("Type").contains(&"list.define"));
+}
+
+#[test]
+fn screen_mode_shows_the_current_mode() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let mode = |app: &DesignApp, m: &str| checked(app, "view.screenMode", &json!({ "mode": m }));
+    assert_eq!((mode(&app, "normal"), mode(&app, "preview")), (Some(true), Some(false)));
+    app.ui.screen_mode = crate::ScreenMode::Preview;
+    assert_eq!((mode(&app, "normal"), mode(&app, "preview")), (Some(false), Some(true)));
+}
+
+fn walk(items: &[Item], out: &mut Vec<(String, String, Value)>) {
+    for it in items {
+        match it {
+            Item::Sub(_, c) => walk(c, out),
+            Item::Cmd { label, id, params, .. } => out.push((label.clone(), id.clone(), params.clone())),
+            Item::Sep => {}
+        }
+    }
+}
+
+/// Exercise the real dropdown, including clipping and wheel input, on a short viewport.
+#[test]
+fn oversized_edit_menu_scrolls_to_preferences() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(700.0, 260.0));
+    let mut tick = 0;
+    let mut frame = |app: &mut DesignApp, events: Vec<egui::Event>| {
+        tick += 1;
+        let mut output =
+            ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
+                egui::MenuBar::new().ui(ui, |ui| menu_bar(app, ui));
+            });
+        output.textures_delta.clear();
+        let mut labels = Vec::new();
+        fn collect(shape: &egui::Shape, clip: egui::Rect, labels: &mut Vec<(String, egui::Rect, egui::Rect)>) {
+            match shape {
+                egui::Shape::Text(t) => labels.push((t.galley.job.text.clone(), t.visual_bounding_rect(), clip)),
+                egui::Shape::Vec(shapes) => {
+                    for shape in shapes {
+                        collect(shape, clip, labels);
+                    }
+                }
+                _ => {}
+            }
+        }
+        for shape in output.shapes {
+            collect(&shape.shape, shape.clip_rect, &mut labels);
+        }
+        labels
+    };
+    frame(&mut app, vec![]);
+    let labels = frame(&mut app, vec![]);
+    let edit = labels.iter().find(|(text, _, _)| text == "Edit").unwrap().1.center();
+    for pressed in [true, false] {
+        frame(
+            &mut app,
+            vec![
+                egui::Event::PointerMoved(edit),
+                egui::Event::PointerButton { pos: edit, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
+            ],
+        );
+    }
+    for _ in 0..3 {
+        frame(&mut app, vec![]);
+    }
+    let layer = ctx.layer_id_at(egui::pos2(edit.x + 80.0, 100.0)).expect("menu layer");
+    let bounds = ctx.memory(|m| m.area_rect(layer.id)).expect("menu bounds");
+    let track = egui::pos2(bounds.right() - 9.0, bounds.bottom() - 25.0);
+    for pressed in [true, false] {
+        frame(
+            &mut app,
+            vec![
+                egui::Event::PointerMoved(track),
+                egui::Event::PointerButton { pos: track, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
+            ],
+        );
+    }
+    assert!(egui::Popup::is_any_open(&ctx), "clicking the scroll track must not dismiss the menu");
+    frame(
+        &mut app,
+        vec![
+            egui::Event::PointerMoved(egui::pos2(edit.x + 80.0, 100.0)),
+            egui::Event::MouseWheel {
+                unit: egui::MouseWheelUnit::Point,
+                delta: egui::vec2(0.0, -3000.0),
+                phase: egui::TouchPhase::Move,
+                modifiers: egui::Modifiers::NONE,
+                source: egui::MouseWheelSource::Unknown,
+            },
+        ],
+    );
+    let mut labels = Vec::new();
+    for _ in 0..60 {
+        labels = frame(&mut app, vec![]);
+    }
+    let (_, rect, clip) = labels.iter().find(|(text, _, _)| text == "Preferences…").expect("Preferences is rendered");
+    assert!(screen.contains_rect(*rect) && clip.contains_rect(*rect), "Preferences must be visible after scrolling: {rect:?}, {clip:?}");
+    let pos = rect.center();
+    for pressed in [true, false] {
+        frame(
+            &mut app,
+            vec![
+                egui::Event::PointerMoved(pos),
+                egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
+            ],
+        );
+    }
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("preferences"));
+    assert!(!egui::Popup::is_any_open(&ctx), "choosing a command dismisses the menu");
+}
+
+#[test]
+fn formatting_affects_text_sends_swatches_to_the_text() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    for (name, color) in [("Cyan", "#00ffff"), ("Magenta", "#ff00ff")] {
+        let created = app.run("swatch.create", json!({"name": name, "color": color})).unwrap();
+        assert_eq!(created["name"], name);
+    }
+    let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "words", "caret": false})).unwrap();
+    let (fid, sid) = (r["id"].as_u64().unwrap(), r["story"].as_u64().unwrap());
+    app.run("selection.set", json!({"ids": [fid]})).unwrap();
+    let text_fill = |app: &crate::DesignApp| {
+        let st = app.session.active().unwrap().doc.story(designcraft_doc::StoryId(sid)).unwrap().clone();
+        st.char_format_at(2).over.fill.clone()
+    };
+    let frame_fill = |app: &crate::DesignApp| app.session.active().unwrap().doc.item(designcraft_doc::ItemId(fid)).unwrap().fill.swatch.clone();
+    assert!(!crate::panels::colors_affect_text(&app));
+    crate::panels::apply_swatch(&mut app, false, "C=100 M=0 Y=0 K=0", None).unwrap();
+    assert_eq!(frame_fill(&app), "C=100 M=0 Y=0 K=0");
+    assert_eq!(text_fill(&app), None);
+    let r = run_ui(&mut app, "app.formattingAffectsText", &json!({})).unwrap().unwrap();
+    assert_eq!(r["on"], true, "toggles on");
+    assert!(crate::panels::colors_affect_text(&app));
+    crate::panels::apply_swatch(&mut app, false, "C=0 M=100 Y=0 K=0", Some(0.5)).unwrap();
+    assert_eq!(frame_fill(&app), "C=100 M=0 Y=0 K=0", "the frame is left alone");
+    assert_eq!(text_fill(&app).as_deref(), Some("C=0 M=100 Y=0 K=0"));
+    assert_eq!(crate::panels::color_target(&mut app).map(|t| (t.0, t.1)), Some(("C=0 M=100 Y=0 K=0".to_string(), 0.5)));
+}
+
+#[test]
+fn transform_menu_items_open_their_dialogs() {
+    for id in ["transform.move", "transform.scale", "transform.rotate", "transform.shear"] {
+        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        activate(&mut app, id, &Value::Null);
+        let dialog = app.ui.dialog.as_ref().map(|d| d.id.clone());
+        assert_eq!(dialog.as_deref(), Some(format!("cmd:{id}").as_str()), "{id} opens its dialog");
+    }
+}
+
+#[test]
+fn pdf_export_menu_item_opens_the_dialog_or_exports() {
+    // No params: the menu item opens the options dialog.
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    activate(&mut app, "app.exportPdf", &Value::Null);
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("pdfExport"));
+    // Explicit options: programmatic callers still export directly, opening no dialog.
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    activate(&mut app, "app.exportPdf", &json!({"path": "/tmp/x.pdf"}));
+    assert!(app.ui.dialog.is_none());
+}
+
+#[test]
+fn snap_preferences_are_a_command() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let r = run_ui(&mut app, "view.snapPreferences", &json!({"smartSpacing": false, "zone": 8})).unwrap().unwrap();
+    assert_eq!(r["smartSpacing"], false);
+    assert_eq!(r["alignEdges"], true, "unnamed switches keep their value");
+    assert_eq!(r["zone"], 8.0);
+    assert!(!app.ui.smart_spacing && (app.ui.snap_zone - 8.0).abs() < 1e-9);
+    let r = run_ui(&mut app, "view.snapPreferences", &json!({"zone": -3})).unwrap().unwrap();
+    assert_eq!(r["zone"], 0.0, "a negative zone turns snapping off");
+}
+
+/// Every command with a shortcut in effect: (command key, shortcut), in dispatch order. UI
+/// commands come first: where one shares keys with an engine command (⌘N, ⌘O…) it's the one
+/// with the dialog.
+fn effective_shortcuts(app: &DesignApp) -> Vec<(String, String)> {
+    app.keymap.catalog().iter().filter_map(|b| crate::keys::shortcut(&app.keymap, &b.command).map(|s| (b.command.key(), s))).collect()
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn shortcut_edits_wait_for_the_dialog_and_the_menu_bar_owns_its_paste_chord() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    crate::shortcuts_dialog::open(&mut app, None);
+    for (id, p) in [
+        ("window.setShortcut", json!({"id": "app.palette", "shortcut": "F2"})),
+        ("window.resetShortcuts", json!({})),
+        ("window.importShortcuts", json!({"text": ""})),
+    ] {
+        assert!(run_ui(&mut app, id, &p).unwrap().is_err(), "{id} while the dialog is open");
+    }
+    crate::shortcuts_dialog::close(&mut app, false).unwrap();
+    // A chord of the user's: the default one is the bar's from the start.
+    run_ui(&mut app, "window.setShortcut", &json!({"id": "edit.pasteInPlace", "shortcut": "Cmd+Alt+V", "steal": true})).unwrap().unwrap();
+    let held = egui::Modifiers::COMMAND | egui::Modifiers::ALT;
+    app.native_menu = true;
+    assert_eq!(paste_chord_command(&app, held), Some("edit.pasteInPlace"), "before the bar carries it");
+    app.native_shortcuts.insert("edit.pasteInPlace".into(), "Cmd+Alt+V".into());
+    assert_eq!(paste_chord_command(&app, held), None, "the bar's key equivalent runs it, once");
+}
+
+#[test]
+fn custom_shortcuts_override_defaults() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    assert_eq!(shortcut_of(&app, "app.preferences").as_deref(), Some("Cmd+K"));
+    let r = run_ui(&mut app, "window.setShortcut", &json!({"id": "app.preferences", "shortcut": "Cmd+Alt+Shift+9"})).unwrap().unwrap();
+    assert_eq!(r["shortcut"], "Cmd+Alt+Shift+9");
+    assert!(effective_shortcuts(&app).contains(&("app.preferences".into(), "Cmd+Alt+Shift+9".into())));
+    // Taking another command's keys reports the conflict.
+    let r = run_ui(&mut app, "window.setShortcut", &json!({"id": "app.palette", "shortcut": "Cmd+Alt+Shift+9"})).unwrap().unwrap();
+    assert_eq!(r["conflicts"], json!(["app.preferences"]));
+    run_ui(&mut app, "window.setShortcut", &json!({"id": "app.palette", "shortcut": ""})).unwrap().unwrap();
+    assert_eq!(shortcut_of(&app, "app.palette"), None);
+    assert!(run_ui(&mut app, "window.setShortcut", &json!({"id": "app.palette", "shortcut": "Cmd+Nope"})).unwrap().is_err());
+    run_ui(&mut app, "window.resetShortcuts", &json!({})).unwrap().unwrap();
+    // ⌘N is the New Document dialog, not a bare file.new.
+    let first_cmd_n = effective_shortcuts(&app).into_iter().find(|(_, s)| s == "Cmd+N").map(|(i, _)| i);
+    assert_eq!(first_cmd_n.as_deref(), Some("app.newDocumentDialog"));
+    assert_eq!(shortcut_of(&app, "app.palette").as_deref(), Some("Cmd+Enter"));
+    assert_eq!(
+        crate::keys::chord_text(egui::Modifiers { command: true, shift: true, ..Default::default() }, egui::Key::K).as_deref(),
+        Some("Cmd+Shift+K")
+    );
+    if cfg!(target_os = "macos") {
+        assert_eq!(shortcut_text("Cmd+Alt+3"), "⌥⌘3");
+        assert_eq!(shortcut_text("Cmd+Shift+."), "⇧⌘.");
+    } else {
+        assert_eq!(shortcut_text("Cmd+Alt+3"), "Ctrl+Alt+3");
+    }
+}
+
+/// One frame of key presses through the shortcut dispatcher.
+fn press_keys(app: &mut crate::DesignApp, ctx: &egui::Context, keys: &[(egui::Key, egui::Modifiers)]) {
+    let events = keys
+        .iter()
+        .flat_map(|&(key, modifiers)| [true, false].map(|pressed| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers }))
+        .collect();
+    ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| shortcuts(app, &ui.ctx().clone())).textures_delta.clear();
+}
+
+#[test]
+fn shortcuts_saved_as_a_map_by_older_versions_load_unchanged() {
+    let saved = br#"{"shortcuts": {"app.preferences": "Cmd+Alt+Shift+9", "app.palette": "", "file.close": [""]}}"#;
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui = crate::UiState::from_preferences_json(saved).unwrap();
+    app.sync_keymap();
+    assert_eq!(shortcut_of(&app, "app.preferences").as_deref(), Some("Cmd+Alt+Shift+9"));
+    assert_eq!(shortcut_of(&app, "app.palette"), None, "a removed default stays removed");
+    assert_eq!(shortcut_of(&app, "file.close"), None);
+    assert_eq!(shortcut_of(&app, "app.save").as_deref(), Some("Cmd+S"));
+    // Saved again it reads back the same, in the map form an older version reads.
+    let resaved = serde_json::to_vec(&app.ui).unwrap();
+    assert_eq!(crate::UiState::from_preferences_json(&resaved).unwrap().shortcuts, app.ui.shortcuts);
+    let saved: Value = serde_json::from_slice(&resaved).unwrap();
+    assert_eq!(saved["shortcuts"], json!({"app.preferences": "Cmd+Alt+Shift+9", "app.palette": "", "file.close": ""}));
+}
+
+#[test]
+fn panel_shortcuts_open_their_panels() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let shown = |app: &crate::DesignApp, p: &str| crate::panel_docking::showing(app, p);
+    assert!(!shown(&app, "layers"));
+    press_keys(&mut app, &ctx, &[(egui::Key::F7, egui::Modifiers::NONE)]);
+    assert!(shown(&app, "layers"), "F7 opens Layers");
+    // A panel without a default key takes one.
+    let r = run_ui(&mut app, "window.setShortcut", &json!({"id": "window.panel", "params": {"panel": "links"}, "shortcut": "Shift+F12"}))
+        .unwrap()
+        .unwrap();
+    assert_eq!(r["shortcut"], "Shift+F12");
+    press_keys(&mut app, &ctx, &[(egui::Key::F12, egui::Modifiers::SHIFT)]);
+    assert!(shown(&app, "links"), "the new key opens Links");
+}
+
+#[test]
+fn a_reassigned_tool_key_selects_the_tool_and_the_old_key_does_not() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let none = egui::Modifiers::NONE;
+    run_ui(&mut app, "window.setShortcut", &json!({"id": "pen", "shortcut": "Y"})).unwrap().unwrap();
+    press_keys(&mut app, &ctx, &[(egui::Key::P, none)]);
+    assert_eq!(app.session.tool_id(), "selection", "P no longer selects the Pen");
+    press_keys(&mut app, &ctx, &[(egui::Key::Y, none)]);
+    assert_eq!(app.session.tool_id(), "pen");
+    // Tools sharing a key take turns.
+    press_keys(&mut app, &ctx, &[(egui::Key::B, none)]);
+    assert_eq!(app.session.tool_id(), "contentCollector");
+    press_keys(&mut app, &ctx, &[(egui::Key::B, none)]);
+    assert_eq!(app.session.tool_id(), "contentPlacer");
+}
+
+#[test]
+fn split_window_panes_have_their_own_views() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp| {
+        let input =
+            egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    frame(&mut app);
+    assert_eq!(run_ui(&mut app, "window.split", &json!({})).unwrap().unwrap(), json!(true));
+    frame(&mut app);
+    frame(&mut app);
+    // Both panes have a canvas, each half as wide.
+    let r0 = app.canvas_rect.unwrap();
+    let r1 = app.other_pane.as_ref().and_then(|o| o.1).unwrap();
+    assert!(r0.width() < 800.0 && r1.width() < 800.0 && (r0.center().x - r1.center().x).abs() > 300.0, "{r0:?} {r1:?}");
+    // Zooming the right pane leaves the left alone.
+    app.switch_pane(1);
+    let z0 = app.view().unwrap().zoom;
+    crate::canvas::set_zoom(&mut app, z0 * 3.0);
+    app.switch_pane(0);
+    assert!((app.view().unwrap().zoom - z0).abs() < 1e-9);
+    app.switch_pane(1);
+    assert!((app.view().unwrap().zoom - z0 * 3.0).abs() < 1e-6);
+    assert_eq!(run_ui(&mut app, "window.split", &json!({})).unwrap().unwrap(), json!(false));
+    assert_eq!(app.pane, 0);
+    frame(&mut app);
+}
+
+#[test]
+fn split_window_dispatches_text_once_to_the_shared_document() {
+    for focus_pane in [0, 1] {
+        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        let made = app.run("frame.create", json!({"rect": [36, 36, 300, 200], "content": "text"})).unwrap();
+        let story = made["story"].as_u64().unwrap();
+        app.session.set_tool("type");
+        app.run("text.select", json!({"story": story, "anchor": 0, "focus": 0})).unwrap();
+        assert!(app.session.wants_text());
+        app.run("window.split", json!({"on": true})).unwrap();
+        app.focus_pane = focus_pane;
+
+        let ctx = egui::Context::default();
+        let frame = |app: &mut crate::DesignApp, events| {
+            let input = egui::RawInput {
+                screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+                events,
+                ..Default::default()
+            };
+            let mut out = ctx.run_ui(input, |ui| {
+                app.logic(&ui.ctx().clone());
+                app.ui(ui);
+            });
+            out.textures_delta.clear();
+        };
+        frame(&mut app, vec![]);
+        frame(&mut app, vec![]);
+        frame(&mut app, vec![]);
+        let undo_before = app.session.active().unwrap().history.undo.len();
+        frame(&mut app, vec![egui::Event::Text("A".into())]);
+        let text = app.run("story.get", json!({"story": story})).unwrap();
+        assert_eq!(text["text"], "A", "one key press with pane {focus_pane} focused");
+        assert_eq!(app.session.active().unwrap().history.undo.len(), undo_before + 1);
+        app.run("edit.undo", json!({})).unwrap();
+        assert_eq!(app.run("story.get", json!({"story": story})).unwrap()["text"], "");
+
+        // A press and key arriving together must use the newly focused pane, whichever
+        // canvas is drawn first. Middle-click changes pane focus without moving the caret.
+        let other = app.other_pane.as_ref().and_then(|p| p.1).unwrap().center();
+        frame(&mut app, vec![egui::Event::PointerMoved(other)]);
+        frame(
+            &mut app,
+            vec![
+                egui::Event::PointerButton { pos: other, button: egui::PointerButton::Middle, pressed: true, modifiers: egui::Modifiers::NONE },
+                egui::Event::Text("B".into()),
+            ],
+        );
+        assert_eq!(app.focus_pane, 1 - focus_pane);
+        assert_eq!(app.run("story.get", json!({"story": story})).unwrap()["text"], "B", "a key in the pane-switch frame is dispatched once");
+        assert_eq!(app.session.active().unwrap().history.undo.len(), undo_before + 1);
+    }
+}
+
+#[test]
+fn split_window_click_focus_routes_menu_zoom_but_hover_scroll_stays_local() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("window.split", json!({"on": true})).unwrap();
+    let ctx = egui::Context::default();
+    let mut time = 0.0;
+    let mut frame = |app: &mut crate::DesignApp, events| {
+        time += 0.1;
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            time: Some(time),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    for _ in 0..3 {
+        frame(&mut app, vec![]);
+    }
+    let left = app.canvas_rect.unwrap().center();
+    let right = app.other_pane.as_ref().and_then(|p| p.1).unwrap().center();
+    let cameras = |app: &mut crate::DesignApp| {
+        let current = app.pane;
+        app.switch_pane(0);
+        let left = *app.view().unwrap();
+        app.switch_pane(1);
+        let right = *app.view().unwrap();
+        app.switch_pane(current);
+        [left, right]
+    };
+    let button = |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };
+    frame(&mut app, vec![egui::Event::PointerMoved(right)]);
+    frame(&mut app, vec![button(right, true)]);
+    frame(&mut app, vec![button(right, false)]);
+    assert_eq!((app.pane, app.focus_pane), (1, 1));
+    let before = cameras(&mut app);
+    app.run("view.zoom", json!({"zoom": 2.0})).unwrap();
+    let zoomed = cameras(&mut app);
+    assert_eq!(zoomed[0], before[0], "menu zoom leaves the other camera alone");
+    assert!((zoomed[1].zoom - 2.0).abs() < 1e-9);
+
+    frame(&mut app, vec![egui::Event::PointerMoved(left)]);
+    frame(
+        &mut app,
+        vec![egui::Event::MouseWheel {
+            unit: egui::MouseWheelUnit::Point,
+            delta: egui::vec2(0.0, -40.0),
+            phase: egui::TouchPhase::Move,
+            modifiers: egui::Modifiers::NONE,
+            source: egui::MouseWheelSource::Unknown,
+        }],
+    );
+    let scrolled = cameras(&mut app);
+    assert_eq!(scrolled[1], zoomed[1], "hover scroll leaves the focused camera alone");
+    assert_ne!(scrolled[0].origin, zoomed[0].origin);
+    assert_eq!((app.pane, app.focus_pane), (1, 1), "hovering does not move menu focus");
+
+    frame(&mut app, vec![button(left, true)]);
+    frame(&mut app, vec![button(left, false)]);
+    assert_eq!((app.pane, app.focus_pane), (0, 0));
+    app.run("view.zoom", json!({"zoom": 1.0})).unwrap();
+    let final_views = cameras(&mut app);
+    assert!((final_views[0].zoom - 1.0).abs() < 1e-9);
+    assert_eq!(final_views[1], scrolled[1]);
+}
+
+#[test]
+fn split_window_contextual_bars_have_independent_widget_ids() {
+    fn id_warnings(shape: &egui::Shape, found: &mut Vec<String>) {
+        match shape {
+            egui::Shape::Vec(shapes) => shapes.iter().for_each(|shape| id_warnings(shape, found)),
+            egui::Shape::Text(text) if text.galley.text().contains("use of widget ID") => found.push(text.galley.text().to_string()),
+            _ => {}
+        }
+    }
+
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    for rect in [[36, 36, 280, 180], [300, 36, 550, 180]] {
+        app.run("frame.create", json!({"rect": rect, "content": "unassigned"})).unwrap();
+    }
+    app.run("edit.selectAll", json!({})).unwrap();
+    app.run("window.split", json!({"on": true})).unwrap();
+    let ctx = egui::Context::default();
+    ctx.options_mut(|options| options.warn_on_id_clash = true);
+    let mut warnings = Vec::new();
+    for _ in 0..4 {
+        let input =
+            egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
+        let mut output = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        warnings.clear();
+        for shape in &output.shapes {
+            id_warnings(&shape.shape, &mut warnings);
+        }
+        output.textures_delta.clear();
+    }
+    assert!(warnings.is_empty(), "both bars reused the same interactive widget IDs: {warnings:?}");
+    let bars: Vec<_> =
+        (0_u8..2).map(|pane| ctx.memory(|memory| memory.area_rect(egui::Id::unique(("task_bar", egui::ViewportId::ROOT, pane)))).unwrap()).collect();
+    assert!(!bars[0].intersects(bars[1]), "each pane keeps its own bar: {bars:?}");
+}
+
+#[test]
+fn show_document_grid_toggles_from_the_grids_and_guides_menu() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let tree = menu_tree();
+    let mut items = vec![];
+    for (_, entries) in &tree {
+        walk(entries, &mut items);
+    }
+    assert!(items.iter().any(|(label, id, _)| id == "view.documentGrid" && label == "Show/Hide Document Grid"));
+    assert_eq!(shortcut_of(&app, "view.documentGrid").as_deref(), Some("Cmd+'"));
+    assert_eq!(checked(&app, "view.documentGrid", &json!({})), Some(false));
+    assert_eq!(run_ui(&mut app, "view.documentGrid", &json!({})).unwrap().unwrap(), json!(true));
+    assert!(app.ui.document_grid);
+    assert_eq!(checked(&app, "view.documentGrid", &json!({})), Some(true));
+    run_ui(&mut app, "view.documentGrid", &json!({})).unwrap().unwrap();
+    assert!(!app.ui.document_grid);
+}
+
+#[test]
+fn interface_language_switches_and_validates() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    run_ui(&mut app, "app.language", &json!({"lang": "de"})).unwrap().unwrap();
+    assert_eq!(app.ui.language, "de");
+    assert_eq!(checked(&app, "app.language", &json!({"lang": "de"})), Some(true));
+    assert!(run_ui(&mut app, "app.language", &json!({"lang": "xx"})).unwrap().is_err());
+    assert_eq!(app.ui.language, "de");
+    // The language is set in Preferences, not from a menu; without `lang` the command opens it.
+    let mut items = Vec::new();
+    for (_, entries) in menu_tree() {
+        walk(&entries, &mut items);
+    }
+    assert!(!items.iter().any(|(_, id, _)| id == "app.language"), "no menu item sets the language");
+    run_ui(&mut app, "app.language", &json!({})).unwrap().unwrap();
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("preferences"));
+    assert_eq!(app.ui.language, "de");
+}
+
+#[test]
+fn every_interface_language_is_selectable_persisted_and_keeps_document_data() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 4, "facingPages": true})).unwrap();
+    app.run("frame.create", json!({"rect": [36, 36, 200, 200], "content": "text", "text": "My words · Мої слова · Zażółć gęślą jaźń"})).unwrap();
+    let before = serde_json::to_value(&app.session.doc().unwrap().doc).unwrap();
+    for (code, _) in crate::i18n::LANGUAGES {
+        run_ui(&mut app, "app.language", &json!({"lang": code})).unwrap().unwrap();
+        assert_eq!(app.ui.language, *code);
+        assert_eq!(checked(&app, "app.language", &json!({"lang": code})), Some(true), "{code}");
+        assert_eq!(before, serde_json::to_value(&app.session.doc().unwrap().doc).unwrap(), "{code}");
+        let bytes = serde_json::to_vec(&app.ui).unwrap();
+        let restored: crate::UiState = serde_json::from_slice(&bytes).unwrap();
+        assert_eq!(restored.language, *code);
+    }
+}
+
+#[test]
+fn arabic_dialog_and_language_switch_keep_finite_widget_geometry() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp| {
+        for _ in 0..4 {
+            let mut output = ctx.run_ui(
+                egui::RawInput {
+                    screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1440.0, 900.0))),
+                    max_texture_side: Some(8192),
+                    ..Default::default()
+                },
+                |ui| {
+                    app.logic(&ui.ctx().clone());
+                    app.ui(ui);
+                },
+            );
+            output.textures_delta.clear();
+        }
+    };
+    app.run("app.language", json!({"lang": "ar"})).unwrap();
+    frame(&mut app);
+    app.run("app.newDocumentDialog", json!({})).unwrap();
+    frame(&mut app); // egui asserts that all allocated rectangles are finite.
+    crate::dialogs::confirm(&mut app).unwrap();
+    frame(&mut app);
+    assert_eq!(app.session.documents().len(), 1);
+    for lang in ["uk", "ru", "zh", "", "ar", "pt-br", "it", "cs", "pl", "ka"] {
+        app.run("app.language", json!({"lang": lang})).unwrap();
+        frame(&mut app);
+    }
+}
+
+#[test]
+fn story_direction_is_checked() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    app.session.execute("frame.create", &json!({"rect": [72, 72, 200, 400], "content": "text", "text": "縦", "vertical": true})).unwrap();
+    assert_eq!(checked(&app, "type.storyDirection", &json!({"vertical": true})), Some(true));
+    assert_eq!(checked(&app, "type.storyDirection", &json!({"vertical": false})), Some(false));
+}
+
+#[test]
+fn proof_setup_and_colors() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    assert_eq!(checked(&app, "view.proofColors", &Value::Null), Some(false));
+    let r = run_ui(&mut app, "view.proofSetup", &json!({"target": "deuteranopia"})).unwrap().unwrap();
+    assert_eq!(r["on"], true);
+    assert_eq!(checked(&app, "view.proofSetup", &json!({"target": "deuteranopia"})), Some(true));
+    run_ui(&mut app, "view.proofSetup", &json!({"simulatePaper": "toggle"})).unwrap().unwrap();
+    assert!(app.ui.proof_setup.simulate_paper);
+    run_ui(&mut app, "view.proofColors", &json!({})).unwrap().unwrap();
+    assert!(!app.ui.proof_colors);
+    assert!(run_ui(&mut app, "view.proofSetup", &json!({"target": "nope"})).unwrap().is_err());
+}
+
+#[test]
+fn lock_guides_and_lock_column_guides_are_checked_in_grids_and_guides() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let view = menu_ids("View");
+    assert!(view.contains(&"view.lockGuides") && view.contains(&"view.lockColumnGuides"));
+    assert_eq!(ui_label("view.lockGuides").and_then(|c| c.1), Some("Cmd+Alt+;"));
+    // Lock Guides: off at first, toggles, and `on` sets it.
+    assert_eq!(checked(&app, "view.lockGuides", &Value::Null), Some(false));
+    assert_eq!(app.run("view.lockGuides", json!({})).unwrap(), json!(true));
+    assert!(app.ui.guides_locked);
+    assert_eq!(app.run("view.lockGuides", json!({"on": true})).unwrap(), json!(true));
+    assert_eq!(checked(&app, "view.lockGuides", &Value::Null), Some(true));
+    assert_eq!(app.run("view.lockGuides", json!({"on": false})).unwrap(), json!(false));
+    // Lock Column Guides: the document's setting, on in new documents.
+    assert_eq!(checked(&app, "view.lockColumnGuides", &Value::Null), Some(true));
+    app.run("view.lockColumnGuides", json!({})).unwrap();
+    assert_eq!(checked(&app, "view.lockColumnGuides", &Value::Null), Some(false));
+}
+
+#[test]
+fn fitting_has_indesigns_shortcuts() {
+    // LYH Studio episode 6 (7:00): "Fit Content to Frame (Ctrl + Shift + Alt + C)" fills the
+    // photo frames proportionally.
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let png = designcraft_render::Rendered { width: 40, height: 20, pixels: vec![200; 40 * 20 * 4] }.to_png();
+    let f = app.run("frame.create", json!({"rect": [100, 100, 300, 300]})).unwrap()["id"].as_u64().unwrap();
+    app.run("file.place", json!({"base64": designcraft_engine::cmd::base64_encode(&png), "name": "a.png", "frame": f})).unwrap();
+    app.run("selection.set", json!({"ids": [f]})).unwrap();
+    let width = |app: &crate::DesignApp| {
+        let it = app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(f)).unwrap().clone();
+        let designcraft_doc::Content::Graphic(g) = &it.content else { panic!("graphic") };
+        it.xf.transform_rect_bbox(g.xf.transform_rect_bbox(designcraft_geom::Rect::new(0.0, 0.0, g.size.0, g.size.1))).width()
+    };
+    for (id, keys) in [
+        ("fit.fillFrameProportionally", "Cmd+Alt+Shift+C"),
+        ("fit.contentProportionally", "Cmd+Alt+Shift+E"),
+        ("fit.frameToContent", "Cmd+Alt+C"),
+        ("fit.contentToFrame", "Cmd+Alt+E"),
+        ("fit.centerContent", "Cmd+Shift+E"),
+    ] {
+        assert_eq!(shortcut_of(&app, id).as_deref(), Some(keys));
+    }
+    let ctx = egui::Context::default();
+    let press = |app: &mut crate::DesignApp, key: egui::Key| {
+        let modifiers =
+            egui::Modifiers { alt: true, ctrl: !cfg!(target_os = "macos"), shift: true, mac_cmd: cfg!(target_os = "macos"), command: true };
+        let input = egui::RawInput {
+            events: vec![egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers }],
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| shortcuts(app, &ui.ctx().clone()));
+        out.textures_delta.clear();
+    };
+    press(&mut app, egui::Key::C);
+    assert!((width(&app) - 400.0).abs() < 1e-6, "filled: {}", width(&app));
+    press(&mut app, egui::Key::E);
+    assert!((width(&app) - 200.0).abs() < 1e-6, "fitted: {}", width(&app));
+}
+
+#[test]
+fn tab_and_presentation_hide_floating_panels_too() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp| {
+        for _ in 0..2 {
+            let input =
+                egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
+            let mut out = ctx.run_ui(input, |ui| {
+                app.logic(&ui.ctx().clone());
+                app.ui(ui);
+            });
+            out.textures_delta.clear();
+        }
+    };
+    // The docked panel's tab and a floating panel group.
+    let tab = crate::panel_docking::tab_id("preflight");
+    let docked = || ctx.read_response(tab).is_some();
+    let group = crate::panel_docking::floating_layer("preflight");
+    let shown = |layer: egui::LayerId| ctx.memory(|m| m.areas().is_visible(&layer));
+    let toggles = [
+        ("window.hidePanels", json!({}), json!({})),
+        ("window.hidePanelsExceptTools", json!({}), json!({})),
+        ("view.screenMode", json!({"mode": "presentation"}), json!({"mode": "normal"})),
+    ];
+    app.run("window.panel", json!({"panel": "preflight"})).unwrap();
+    frame(&mut app);
+    assert!(docked());
+    for (id, hide, show) in &toggles {
+        app.run(id, hide.clone()).unwrap();
+        frame(&mut app);
+        assert!(!docked(), "{id} hides the dock");
+        app.run(id, show.clone()).unwrap();
+        frame(&mut app);
+        assert!(docked(), "{id} again brings it back");
+    }
+    app.run("window.floatPanel", json!({"panel": "preflight", "x": 400, "y": 200})).unwrap();
+    frame(&mut app);
+    assert!(app.ui.docking.is_some() && shown(group));
+    for (id, hide, show) in &toggles {
+        app.run(id, hide.clone()).unwrap();
+        frame(&mut app);
+        assert!(!shown(group), "{id} hides the floating panel");
+        app.run(id, show.clone()).unwrap();
+        frame(&mut app);
+        assert!(shown(group), "{id} again brings it back");
+    }
+}
+
+#[test]
+fn tab_hides_panels_and_documents_cycle() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    assert_eq!(shortcut_of(&app, "window.hidePanels").as_deref(), Some("Tab"));
+    run_ui(&mut app, "window.hidePanels", &json!({})).unwrap().unwrap();
+    assert_eq!(app.ui.hidden_panels, 1);
+    run_ui(&mut app, "window.hidePanelsExceptTools", &json!({})).unwrap().unwrap();
+    assert_eq!(app.ui.hidden_panels, 2);
+    run_ui(&mut app, "window.hidePanelsExceptTools", &json!({})).unwrap().unwrap();
+    assert_eq!(app.ui.hidden_panels, 0);
+    for _ in 0..3 {
+        app.session.execute("file.new", &json!({})).unwrap();
+    }
+    assert_eq!(app.session.active_index(), Some(2));
+    run_ui(&mut app, "window.nextDocument", &json!({})).unwrap().unwrap();
+    assert_eq!(app.session.active_index(), Some(0));
+    run_ui(&mut app, "window.previousDocument", &json!({})).unwrap().unwrap();
+    assert_eq!(app.session.active_index(), Some(2));
+}
+
+#[test]
+fn rotate_spread_view() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({"pages": 3})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp| {
+        let input =
+            egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    frame(&mut app);
+    frame(&mut app);
+    assert_eq!(run_ui(&mut app, "view.rotateSpread", &json!({"angle": 90})).unwrap().unwrap(), json!(90));
+    frame(&mut app);
+    // Only the spread in view turns: its canvas footprint swaps width and height.
+    let d = app.session.active().unwrap().doc.clone();
+    let turned: Vec<usize> = d.spreads.iter().enumerate().filter(|(_, sp)| sp.pages[0].view_rotation == 1).map(|(i, _)| i).collect();
+    assert_eq!(turned.len(), 1);
+    let layout = designcraft_tools::CanvasLayout::new(&d, false);
+    let slot = layout.slots[turned[0]];
+    let b = d.spreads[turned[0]].bounds();
+    assert!((slot.bounds.width() - b.height()).abs() < 1e-6 && (slot.bounds.height() - b.width()).abs() < 1e-6);
+    assert_eq!(checked(&app, "view.rotateSpread", &json!({"angle": 0})), Some(false));
+    run_ui(&mut app, "view.rotateSpread", &json!({"angle": 0})).unwrap().unwrap();
+    assert_eq!(checked(&app, "view.rotateSpread", &json!({"angle": 0})), Some(true));
+    frame(&mut app);
+}
+
+#[test]
+fn hand_tool_hold_starts_power_zoom() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, t: f64, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            time: Some(t),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    frame(&mut app, 0.0, vec![]);
+    frame(&mut app, 0.05, vec![]);
+    app.select_tool("hand");
+    let r = app.canvas_rect.unwrap();
+    let p = r.center();
+    let z0 = app.view().unwrap().zoom;
+    frame(&mut app, 0.1, vec![egui::Event::PointerMoved(p)]);
+    frame(
+        &mut app,
+        0.2,
+        vec![egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() }],
+    );
+    frame(&mut app, 0.4, vec![]);
+    assert!(app.power_zoom.is_none(), "not yet");
+    frame(&mut app, 0.8, vec![]);
+    assert!(app.power_zoom.is_some(), "holding still starts Power Zoom");
+    frame(
+        &mut app,
+        0.9,
+        vec![egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() }],
+    );
+    assert!(app.power_zoom.is_none());
+    assert!((app.view().unwrap().zoom - z0).abs() < 1e-9, "back at the zoom it started from");
+}
+
+#[test]
+fn middle_drag_pans_with_any_tool() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    // A drawing tool: a primary drag would make a frame, a middle drag must not.
+    app.select_tool("rectangleFrame");
+    let p = app.canvas_rect.unwrap().center();
+    let v0 = *app.view().unwrap();
+    let items = |app: &crate::DesignApp| app.session.active().unwrap().doc.spreads.iter().map(|s| s.items.len()).sum::<usize>();
+    let items0 = items(&app);
+    let button = |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Middle, pressed, modifiers: Default::default() };
+    frame(&mut app, vec![egui::Event::PointerMoved(p), button(p, true)]);
+    for i in 1..=8 {
+        frame(&mut app, vec![egui::Event::PointerMoved(p + egui::vec2(10.0 * i as f32, 5.0 * i as f32))]);
+    }
+    frame(&mut app, vec![button(p + egui::vec2(80.0, 40.0), false)]);
+    let v = *app.view().unwrap();
+    assert!((v.zoom - v0.zoom).abs() < 1e-9, "panning keeps the zoom");
+    assert!(v.origin.x < v0.origin.x && v.origin.y < v0.origin.y, "dragging right/down moves the view: {v0:?} -> {v:?}");
+    assert_eq!(items(&app), items0, "the tool saw nothing");
+}
+
+#[test]
+fn layout_menu_goes_through_pages_and_spreads_with_their_shortcuts() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({"pages": 7, "facingPages": true})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    let key = |k: egui::Key, modifiers: egui::Modifiers| {
+        vec![
+            egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers },
+            egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers },
+        ]
+    };
+    let page = |app: &crate::DesignApp| crate::canvas::current_page(app).unwrap();
+    let spread = |app: &crate::DesignApp| {
+        let st = app.session.active().unwrap();
+        crate::canvas::current_slot(app, &designcraft_tools::layout::CanvasLayout::new(&st.doc, false)).unwrap()
+    };
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    // The Layout menu lists them, as InDesign's does, before Go to Page.
+    let layout = MENUS.iter().find(|m| m.0 == "Layout").unwrap().1;
+    let at = |id: &str| layout.iter().position(|e| e.starts_with(&format!("ui:{id}"))).unwrap();
+    assert!(at("view.firstPage") < at("view.previousPage"));
+    assert!(at("view.previousPage") < at("view.nextPage"));
+    assert!(at("view.nextPage") < at("view.lastPage"));
+    assert!(at("view.lastPage") < at("view.nextSpread"));
+    assert!(at("view.nextSpread") < at("view.previousSpread"));
+    assert!(at("view.previousSpread") < at("view.goToPage"));
+    let shift = egui::Modifiers::SHIFT;
+    let cmd_shift = egui::Modifiers { shift: true, command: true, ctrl: true, ..Default::default() };
+    let alt = egui::Modifiers::ALT;
+    // Pages 1 | 2-3 | 4-5 | 6-7.
+    frame(&mut app, key(egui::Key::PageDown, shift));
+    assert_eq!(page(&app), 1, "Next Page");
+    frame(&mut app, key(egui::Key::PageDown, shift));
+    assert_eq!(page(&app), 2, "Next Page goes to the right page of the spread");
+    frame(&mut app, key(egui::Key::PageUp, shift));
+    assert_eq!(page(&app), 1, "Previous Page");
+    frame(&mut app, key(egui::Key::PageDown, cmd_shift));
+    assert_eq!(page(&app), 6, "Last Page");
+    frame(&mut app, key(egui::Key::PageDown, shift));
+    assert_eq!(page(&app), 6, "Next Page stops at the last page");
+    frame(&mut app, key(egui::Key::PageUp, cmd_shift));
+    assert_eq!(page(&app), 0, "First Page");
+    frame(&mut app, key(egui::Key::PageUp, shift));
+    assert_eq!(page(&app), 0, "Previous Page stops at the first page");
+    frame(&mut app, key(egui::Key::PageDown, alt));
+    assert_eq!(spread(&app), 1, "Next Spread");
+    frame(&mut app, key(egui::Key::PageDown, alt));
+    frame(&mut app, key(egui::Key::PageDown, alt));
+    frame(&mut app, key(egui::Key::PageDown, alt));
+    assert_eq!(spread(&app), 3, "Next Spread stops at the last spread");
+    frame(&mut app, key(egui::Key::PageUp, alt));
+    assert_eq!(spread(&app), 2, "Previous Spread");
+    // The spread is centred, the zoom kept.
+    let zoom = app.view().unwrap().zoom;
+    app.run("view.previousSpread", json!({})).unwrap();
+    let st = app.session.active().unwrap();
+    let slot = designcraft_tools::layout::CanvasLayout::new(&st.doc, false).slots[1];
+    let (v, r) = (*app.view().unwrap(), app.canvas_rect.unwrap());
+    let centre = (v.origin.x + r.width() as f64 / 2.0 / v.zoom, v.origin.y + r.height() as f64 / 2.0 / v.zoom);
+    assert!((centre.0 - slot.bounds.center().x).abs() < 1e-6 && (centre.1 - slot.bounds.center().y).abs() < 1e-6);
+    assert_eq!(v.zoom, zoom);
+}
+
+#[test]
+fn go_back_and_go_forward_retrace_the_pages_viewed() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({"pages": 7, "facingPages": true})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    let key = |k: egui::Key, modifiers: egui::Modifiers| {
+        vec![
+            egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers },
+            egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers },
+        ]
+    };
+    let page = |app: &crate::DesignApp| crate::canvas::current_page(app).unwrap();
+    let can = |app: &crate::DesignApp| (menu_enabled(app, "view.goBack"), menu_enabled(app, "view.goForward"));
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    // In the Layout menu after Go to Page.
+    let layout = MENUS.iter().find(|m| m.0 == "Layout").unwrap().1;
+    let at = |id: &str| layout.iter().position(|e| *e == format!("ui:{id}")).unwrap();
+    assert_eq!(at("view.goBack"), at("view.goToPage") + 1);
+    assert_eq!(at("view.goForward"), at("view.goBack") + 1);
+    assert_eq!(can(&app), (false, false), "one page viewed: nowhere to go");
+    let cmd = egui::Modifiers { command: true, ctrl: true, ..Default::default() };
+    let cmd_shift = egui::Modifiers { shift: true, ..cmd };
+    let shift = egui::Modifiers::SHIFT;
+    // Pages viewed: 1, 5, 7.
+    app.run("view.goToPage", json!({"page": 5})).unwrap();
+    frame(&mut app, vec![]);
+    frame(&mut app, key(egui::Key::PageDown, cmd_shift));
+    assert_eq!(page(&app), 6);
+    frame(&mut app, vec![]);
+    assert_eq!(can(&app), (true, false));
+    frame(&mut app, key(egui::Key::PageUp, cmd));
+    assert_eq!(page(&app), 4, "Go Back");
+    frame(&mut app, key(egui::Key::PageUp, cmd));
+    assert_eq!(page(&app), 0, "Go Back again");
+    frame(&mut app, vec![]);
+    assert_eq!(can(&app), (false, true), "back at the first page viewed");
+    frame(&mut app, key(egui::Key::PageDown, cmd));
+    assert_eq!(page(&app), 4, "Go Forward");
+    frame(&mut app, key(egui::Key::PageDown, cmd));
+    assert_eq!(page(&app), 6, "Go Forward again");
+    frame(&mut app, vec![]);
+    assert_eq!(can(&app), (true, false));
+    // After going back, viewing another page drops the pages ahead.
+    frame(&mut app, key(egui::Key::PageUp, cmd));
+    assert_eq!(page(&app), 4);
+    frame(&mut app, key(egui::Key::PageDown, shift));
+    assert_eq!(page(&app), 5, "Next Page");
+    frame(&mut app, vec![]);
+    assert_eq!(can(&app), (true, false), "nothing ahead after a new page");
+    frame(&mut app, key(egui::Key::PageDown, cmd));
+    assert_eq!(page(&app), 5, "Go Forward does nothing");
+    frame(&mut app, key(egui::Key::PageUp, cmd));
+    assert_eq!(page(&app), 4, "Go Back returns to the page before Next Page");
+}
+
+#[test]
+fn go_back_waits_for_the_view_to_be_fitted() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({"pages": 7, "facingPages": true})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp| {
+        let input =
+            egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    frame(&mut app);
+    frame(&mut app);
+    app.run("view.goToPage", json!({"page": 5})).unwrap();
+    frame(&mut app);
+    assert!(menu_enabled(&app, "view.goBack"));
+    // Leaving parent pages through the Pages panel: the canvas refits on the next frame.
+    app.view_mut().unwrap().fitted = false;
+    assert!(!menu_enabled(&app, "view.goBack"), "the refit would replace where Go Back went");
+    crate::canvas::go_through_history(&mut app, -1);
+    frame(&mut app);
+    assert!(menu_enabled(&app, "view.goBack"), "the unfitted Go Back used no history entry");
+}
+
+#[test]
+fn next_spread_at_the_last_spread_is_no_jump() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({"pages": 7, "facingPages": true})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    let key = |k: egui::Key, modifiers: egui::Modifiers| {
+        vec![
+            egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers },
+            egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers },
+        ]
+    };
+    let page = |app: &crate::DesignApp| crate::canvas::current_page(app).unwrap();
+    let cmd = egui::Modifiers { command: true, ctrl: true, ..Default::default() };
+    let alt = egui::Modifiers::ALT;
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    // Pages 1 | 2-3 | 4-5 | 6-7: page 6 is the left page of the last spread.
+    app.run("view.goToPage", json!({"page": 6})).unwrap();
+    frame(&mut app, vec![]);
+    assert_eq!(page(&app), 5);
+    // Next Spread has no spread to go to; centring the last one moves the view to its fold.
+    frame(&mut app, key(egui::Key::PageDown, alt));
+    frame(&mut app, key(egui::Key::PageDown, alt));
+    assert_ne!(page(&app), 5, "the view moved to the right page");
+    frame(&mut app, key(egui::Key::PageUp, cmd));
+    assert_eq!(page(&app), 0, "Go Back returns to the page before Go to Page");
+    assert!(!menu_enabled(&app, "view.goBack"));
+}
+
+#[test]
+fn go_back_returns_to_the_view_a_jump_left_and_scrolling_adds_no_entry() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({"pages": 7, "facingPages": true})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    let key = |k: egui::Key, modifiers: egui::Modifiers| {
+        vec![
+            egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers },
+            egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers },
+        ]
+    };
+    let spread = |app: &crate::DesignApp| {
+        let st = app.session.active().unwrap();
+        crate::canvas::current_slot(app, &designcraft_tools::layout::CanvasLayout::new(&st.doc, false)).unwrap()
+    };
+    let cmd = egui::Modifiers { command: true, ctrl: true, ..Default::default() };
+    let alt = egui::Modifiers::ALT;
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    // Pages 1 | 2-3 | 4-5 | 6-7. Spread 2-3 fitted: the view centre is on the fold.
+    frame(&mut app, key(egui::Key::PageDown, alt));
+    app.run("view.fitSpread", json!({})).unwrap();
+    frame(&mut app, vec![]);
+    let before = *app.view().unwrap();
+    frame(&mut app, key(egui::Key::PageDown, alt));
+    assert_eq!(spread(&app), 2, "Next Spread");
+    frame(&mut app, key(egui::Key::PageUp, cmd));
+    let v = *app.view().unwrap();
+    assert!((v.origin - before.origin).hypot() < 1e-6, "Go Back shows the spread as it was: {:?} vs {:?}", v.origin, before.origin);
+    assert_eq!(v.zoom, before.zoom);
+    // Zoomed in after the jump: Go Back keeps the magnification in use, as InDesign's does, and
+    // centres the same place.
+    let centre = |app: &crate::DesignApp| {
+        let (v, r) = (app.view().unwrap(), app.canvas_rect.unwrap());
+        designcraft_geom::Point::new(v.origin.x + r.width() as f64 / 2.0 / v.zoom, v.origin.y + r.height() as f64 / 2.0 / v.zoom)
+    };
+    let place = centre(&app);
+    frame(&mut app, key(egui::Key::PageDown, alt));
+    app.run("view.zoomIn", json!({})).unwrap();
+    let zoomed = app.view().unwrap().zoom;
+    assert!(zoomed > before.zoom);
+    frame(&mut app, key(egui::Key::PageUp, cmd));
+    assert_eq!(app.view().unwrap().zoom, zoomed, "the zoom in use is kept");
+    assert!((centre(&app) - place).hypot() < 1e-6, "the same place: {:?} vs {place:?}", centre(&app));
+    // Scrolling down two spreads is not a jump: Go Forward keeps its page, and Go Back skips
+    // from where the scroll ended straight to the page before the first jump.
+    let slots = designcraft_tools::layout::CanvasLayout::new(&app.session.active().unwrap().doc, false).slots;
+    app.view_mut().unwrap().origin.y += slots[3].bounds.center().y - slots[1].bounds.center().y;
+    frame(&mut app, vec![]);
+    assert_eq!(spread(&app), 3);
+    assert!(menu_enabled(&app, "view.goForward"), "scrolling kept the page ahead");
+    frame(&mut app, key(egui::Key::PageUp, cmd));
+    assert_eq!(spread(&app), 0, "Go Back");
+    assert!(!menu_enabled(&app, "view.goBack"), "the scroll added no entry");
+    frame(&mut app, key(egui::Key::PageDown, cmd));
+    assert_eq!(spread(&app), 3, "Go Forward returns to where the scroll ended");
+    frame(&mut app, key(egui::Key::PageDown, cmd));
+    assert_eq!(spread(&app), 2);
+}
+
+#[test]
+fn go_back_after_presentation_returns_to_the_last_spread_presented() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({"pages": 7, "facingPages": true})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    let key = |k: egui::Key, modifiers: egui::Modifiers| {
+        vec![
+            egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers },
+            egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers },
+        ]
+    };
+    let spread = |app: &crate::DesignApp| {
+        let st = app.session.active().unwrap();
+        crate::canvas::current_slot(app, &designcraft_tools::layout::CanvasLayout::new(&st.doc, false)).unwrap()
+    };
+    let cmd = egui::Modifiers { command: true, ctrl: true, ..Default::default() };
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    // Scrolled off the page's centre, so the place Go Back returns to is not just the page.
+    let view = app.view_mut().unwrap();
+    view.origin.x += 40.0;
+    view.origin.y += 60.0;
+    frame(&mut app, vec![]);
+    assert_eq!(spread(&app), 0);
+    let before = *app.view().unwrap();
+    // Presentation goes on to spreads 1 and 2; leaving it puts spread 0 back as it was.
+    app.run("view.screenMode", json!({"mode": "presentation"})).unwrap();
+    frame(&mut app, vec![]);
+    frame(&mut app, key(egui::Key::ArrowRight, egui::Modifiers::NONE));
+    frame(&mut app, key(egui::Key::ArrowRight, egui::Modifiers::NONE));
+    assert_eq!(spread(&app), 2);
+    app.run("view.screenMode", json!({"mode": "normal"})).unwrap();
+    frame(&mut app, vec![]);
+    assert_eq!(spread(&app), 0);
+    assert!(!menu_enabled(&app, "view.goForward"));
+    frame(&mut app, key(egui::Key::PageUp, cmd));
+    assert_eq!(spread(&app), 2, "Go Back shows the last spread presented");
+    frame(&mut app, key(egui::Key::PageUp, cmd));
+    assert_eq!(spread(&app), 0, "Go Back again, the view Presentation was entered from");
+    let v = *app.view().unwrap();
+    assert!((v.origin - before.origin).hypot() < 1e-6, "where it was: {:?} vs {:?}", v.origin, before.origin);
+    assert!(!menu_enabled(&app, "view.goBack"), "the presentation is one jump: spread 1 isn't kept");
+    frame(&mut app, key(egui::Key::PageDown, cmd));
+    assert_eq!(spread(&app), 2, "Go Forward");
+}
+
+#[test]
+fn presentation_shows_one_spread_and_goes_through_them_with_keys_and_clicks() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({"pages": 7, "facingPages": true})).unwrap();
+    app.session.execute("frame.create", &json!({"rect": [100, 100, 300, 300]})).unwrap();
+    let id = app.session.active().unwrap().selection.items[0];
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    let key = |k: egui::Key| {
+        vec![
+            egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() },
+            egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers: Default::default() },
+        ]
+    };
+    let click = |pos: egui::Pos2, modifiers: egui::Modifiers| {
+        vec![
+            egui::Event::PointerMoved(pos),
+            egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: true, modifiers },
+            egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: false, modifiers },
+        ]
+    };
+    let spread = |app: &crate::DesignApp| {
+        let st = app.session.active().unwrap();
+        crate::canvas::current_slot(app, &designcraft_tools::layout::CanvasLayout::new(&st.doc, false)).unwrap()
+    };
+    // The spread fills the screen: as wide or as tall as it, centred.
+    let fills = |app: &crate::DesignApp| {
+        let st = app.session.active().unwrap();
+        let b = designcraft_tools::layout::CanvasLayout::new(&st.doc, false).slots[spread(app)].bounds;
+        let (v, r) = (*app.view().unwrap(), app.canvas_rect.unwrap());
+        let (w, h) = (b.width() * v.zoom, b.height() * v.zoom);
+        let x0 = (b.x0 - v.origin.x) * v.zoom;
+        let y0 = (b.y0 - v.origin.y) * v.zoom;
+        ((w - r.width() as f64).abs() < 0.01 || (h - r.height() as f64).abs() < 0.01)
+            && w <= r.width() as f64 + 0.01
+            && h <= r.height() as f64 + 0.01
+            && (x0 * 2.0 + w - r.width() as f64).abs() < 0.01
+            && (y0 * 2.0 + h - r.height() as f64).abs() < 0.01
+    };
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    // The user's own view (zoomed in, scrolled) comes back after Presentation.
+    let view = app.view_mut().unwrap();
+    view.zoom = 2.0;
+    view.origin.x += 150.0;
+    view.origin.y += 300.0;
+    let before = *app.view().unwrap();
+    app.run("view.screenMode", json!({"mode": "presentation"})).unwrap();
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    assert_eq!(app.canvas_rect.unwrap().size(), egui::vec2(1400.0, 900.0), "the whole window");
+    assert_eq!(spread(&app), 0);
+    assert!(fills(&app));
+    let bounds = app.session.active().unwrap().doc.item(id).unwrap().bounds();
+    frame(&mut app, key(egui::Key::ArrowRight));
+    frame(&mut app, vec![]);
+    assert_eq!(spread(&app), 1, "Right Arrow shows the next spread");
+    assert!(fills(&app));
+    assert_eq!(app.session.active().unwrap().doc.item(id).unwrap().bounds(), bounds, "the arrow doesn't nudge the selection");
+    frame(&mut app, key(egui::Key::PageDown));
+    assert_eq!(spread(&app), 2, "Page Down");
+    frame(&mut app, key(egui::Key::ArrowLeft));
+    assert_eq!(spread(&app), 1, "Left Arrow");
+    frame(&mut app, key(egui::Key::End));
+    assert_eq!(spread(&app), 3, "End");
+    frame(&mut app, key(egui::Key::ArrowRight));
+    assert_eq!(spread(&app), 3, "the last spread stays");
+    frame(&mut app, key(egui::Key::Home));
+    assert_eq!(spread(&app), 0, "Home");
+    frame(&mut app, key(egui::Key::PageUp));
+    assert_eq!(spread(&app), 0, "the first spread stays");
+    let c = app.canvas_rect.unwrap().center();
+    frame(&mut app, click(c, egui::Modifiers::NONE));
+    frame(&mut app, vec![]);
+    assert_eq!(spread(&app), 1, "a click shows the next spread");
+    assert!(fills(&app));
+    frame(&mut app, click(c, egui::Modifiers::SHIFT));
+    frame(&mut app, vec![]);
+    assert_eq!(spread(&app), 0, "Shift-click the previous one");
+    assert_eq!(app.session.active().unwrap().selection.items, vec![id], "clicks don't select");
+    assert_eq!(app.session.tool_id(), "selection");
+    // Out of Presentation, the view is the one it was entered from, and the arrow keys nudge
+    // again.
+    app.run("view.screenMode", json!({"mode": "normal"})).unwrap();
+    assert_eq!(*app.view().unwrap(), before);
+    frame(&mut app, vec![]);
+    frame(&mut app, key(egui::Key::ArrowRight));
+    assert_ne!(app.session.active().unwrap().doc.item(id).unwrap().bounds(), bounds);
+}
+
+#[test]
+fn tool_shortcuts_work_after_drawing_on_the_canvas() {
+    // Clicking the canvas gives it keyboard focus; single-key tool shortcuts must still switch
+    // tools without pressing Esc first (#1).
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    let key = |k: egui::Key| {
+        vec![
+            egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() },
+            egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers: Default::default() },
+        ]
+    };
+    let button = |pos: egui::Pos2, pressed: bool| egui::Event::PointerButton {
+        pos,
+        button: egui::PointerButton::Primary,
+        pressed,
+        modifiers: Default::default(),
+    };
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    frame(&mut app, key(egui::Key::F));
+    assert_eq!(app.session.tool_id(), "rectangleFrame");
+    // Draw a frame.
+    let a = app.canvas_rect.unwrap().center();
+    let b = a + egui::vec2(120.0, 80.0);
+    frame(&mut app, vec![egui::Event::PointerMoved(a), button(a, true)]);
+    for i in 1..=4 {
+        frame(&mut app, vec![egui::Event::PointerMoved(a + (b - a) * (i as f32 / 4.0))]);
+    }
+    frame(&mut app, vec![button(b, false)]);
+    frame(&mut app, vec![]);
+    assert!(app.session.active().is_some_and(|d| !d.selection.items.is_empty()), "drew a frame");
+    frame(&mut app, key(egui::Key::V));
+    assert_eq!(app.session.tool_id(), "selection", "V switches tools straight after drawing");
+    frame(&mut app, key(egui::Key::F));
+    assert_eq!(app.session.tool_id(), "rectangleFrame");
+}
+
+#[test]
+fn escape_and_shift_w_leave_presentation_for_the_previous_mode() {
+    // Presentation hides every control, so the keyboard must get out of it (#493).
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "graphic"})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    let key = |k: egui::Key, modifiers: egui::Modifiers| {
+        vec![
+            egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers },
+            egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers },
+        ]
+    };
+    let selected = |app: &crate::DesignApp| app.session.active().map(|d| d.selection.items.len()).unwrap_or(0);
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    app.run("view.screenMode", json!({"mode": "preview"})).unwrap();
+    app.select_tool("rectangleFrame");
+    assert_eq!(selected(&app), 1, "the new frame is selected");
+
+    frame(&mut app, key(egui::Key::W, egui::Modifiers::SHIFT));
+    assert_eq!(app.ui.screen_mode, ScreenMode::Presentation, "Shift+W enters Presentation");
+    assert_eq!(app.session.tool_id(), "rectangleFrame", "Shift+W is not a tool shortcut");
+    frame(&mut app, key(egui::Key::Escape, egui::Modifiers::NONE));
+    assert_eq!(app.ui.screen_mode, ScreenMode::Preview, "Esc returns to the mode Presentation was entered from");
+    assert_eq!(app.session.tool_id(), "rectangleFrame", "Esc only left Presentation");
+    assert_eq!(selected(&app), 1, "Esc only left Presentation");
+
+    frame(&mut app, key(egui::Key::W, egui::Modifiers::SHIFT));
+    frame(&mut app, key(egui::Key::W, egui::Modifiers::SHIFT));
+    assert_eq!(app.ui.screen_mode, ScreenMode::Preview, "Shift+W leaves Presentation for the previous mode");
+
+    app.run("view.screenMode", json!({"mode": "presentation"})).unwrap();
+    frame(&mut app, key(egui::Key::W, egui::Modifiers::NONE));
+    assert_eq!(app.ui.screen_mode, ScreenMode::Normal, "W from any mode but Normal goes to Normal");
+
+    // Outside Presentation, Esc keeps its usual meaning.
+    frame(&mut app, key(egui::Key::Escape, egui::Modifiers::NONE));
+    assert_eq!(app.ui.screen_mode, ScreenMode::Normal);
+    assert_eq!(app.session.tool_id(), "selection");
+}
+
+#[test]
+fn cmd_plus_zooms_the_canvas_not_the_window() {
+    // A German keyboard has its own + key, so Cmd+= arrives as Plus; it must zoom the canvas like
+    // Cmd+- does, not hand the key to egui's whole-window zoom.
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    let key = |k: egui::Key, modifiers: egui::Modifiers| {
+        vec![
+            egui::Event::Key { key: k, physical_key: None, pressed: true, repeat: false, modifiers },
+            egui::Event::Key { key: k, physical_key: None, pressed: false, repeat: false, modifiers },
+        ]
+    };
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    let scale = ctx.zoom_factor();
+    for (k, m, zooms_in) in [
+        (egui::Key::Plus, egui::Modifiers::COMMAND, true),
+        (egui::Key::Plus, egui::Modifiers::COMMAND | egui::Modifiers::SHIFT, true),
+        (egui::Key::Equals, egui::Modifiers::COMMAND, true),
+        (egui::Key::Minus, egui::Modifiers::COMMAND, false),
+    ] {
+        let z0 = app.view().unwrap().zoom;
+        frame(&mut app, key(k, m));
+        frame(&mut app, vec![]);
+        let z = app.view().unwrap().zoom;
+        assert!(if zooms_in { z > z0 } else { z < z0 }, "{k:?} {m:?}: {z0} -> {z}");
+        assert_eq!(ctx.zoom_factor(), scale, "{k:?} {m:?} leaves the UI scale alone");
+    }
+    // With a native menu (macOS) its accelerator takes Cmd+= itself, but never sees the Plus key
+    // standing in for = (#781).
+    app.native_shortcuts.insert("view.zoomIn".to_string(), shortcut_of(&app, "view.zoomIn").unwrap());
+    for (k, m, zooms_in) in [
+        (egui::Key::Plus, egui::Modifiers::COMMAND, true),
+        (egui::Key::Plus, egui::Modifiers::COMMAND | egui::Modifiers::SHIFT, true),
+        (egui::Key::Equals, egui::Modifiers::COMMAND, false),
+    ] {
+        let z0 = app.view().unwrap().zoom;
+        frame(&mut app, key(k, m));
+        frame(&mut app, vec![]);
+        let z = app.view().unwrap().zoom;
+        assert_eq!(z > z0, zooms_in, "native menu, {k:?} {m:?}: {z0} -> {z}");
+    }
+    // A shortcut the user set runs here until the native menu bar carries it as its key
+    // equivalent; then only the bar runs it, once.
+    run_ui(&mut app, "window.setShortcut", &json!({"id": "view.zoomOut", "shortcut": "Cmd+9"})).unwrap().unwrap();
+    let zooms_out = |app: &mut crate::DesignApp, k: egui::Key| {
+        let z0 = app.view().unwrap().zoom;
+        frame(app, key(k, egui::Modifiers::COMMAND));
+        frame(app, vec![]);
+        app.view().unwrap().zoom < z0
+    };
+    assert!(zooms_out(&mut app, egui::Key::Num9), "no native bar: the app runs it");
+    app.native_shortcuts.insert("view.zoomOut".to_string(), "Cmd+9".to_string());
+    assert!(!zooms_out(&mut app, egui::Key::Num9), "the bar's key equivalent runs only there");
+    // A second binding of a command whose first the bar holds runs here.
+    let cmd = craft_keymap::CommandRef::new("view.zoomOut");
+    let bindings = ["Cmd+F11", "Cmd+9"].map(|s| craft_keymap::Binding::parse(s).unwrap()).to_vec();
+    app.keymap.set_bindings(&cmd, bindings, craft_keymap::Policy::Steal).unwrap();
+    app.ui.shortcuts = app.keymap.overrides().clone();
+    app.native_shortcuts.insert("view.zoomOut".to_string(), "Cmd+F11".to_string());
+    assert!(!zooms_out(&mut app, egui::Key::F11), "the bar runs its own key");
+    assert!(zooms_out(&mut app, egui::Key::Num9), "the second binding runs in the app");
+}
+
+#[test]
+fn the_quick_apply_shortcut_opens_it_without_running_an_entry() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    let cmd_return =
+        |pressed| egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed, repeat: false, modifiers: egui::Modifiers::COMMAND };
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![cmd_return(true), cmd_return(false)]);
+    frame(&mut app, vec![]);
+    assert_eq!(app.ui.palette.as_deref(), Some(""), "Quick Apply stays open");
+    assert_eq!(app.session.documents().len(), 1, "the first entry (New Document) didn't run");
+    // Pressing the shortcut again, or holding it until it repeats, doesn't run it either.
+    frame(&mut app, vec![cmd_return(true), cmd_return(false)]);
+    let repeat = egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: true, modifiers: egui::Modifiers::COMMAND };
+    frame(&mut app, vec![repeat, cmd_return(false)]);
+    assert_eq!(app.ui.palette.as_deref(), Some(""), "Quick Apply stays open");
+    assert_eq!(app.session.documents().len(), 1, "a second ⌘Return or a repeat doesn't run the first entry");
+    // A plain Return still does.
+    let enter = |pressed| egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed, repeat: false, modifiers: egui::Modifiers::NONE };
+    frame(&mut app, vec![enter(true), enter(false)]);
+    assert_eq!(app.ui.palette, None, "Return runs the first entry and closes Quick Apply");
+    assert_eq!(app.session.documents().len(), 2);
+}
+
+#[test]
+fn quick_apply_rows_are_left_aligned() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    app.ui.palette = Some(String::new());
+    let ctx = egui::Context::default();
+    let mut shapes = Vec::new();
+    for _ in 0..3 {
+        let input =
+            egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+        shapes = out.shapes;
+    }
+    let label_x = |label: &str| {
+        // The palette is painted last, over anything else with the same text.
+        shapes.iter().rev().find_map(|s| match &s.shape {
+            egui::Shape::Text(t) if t.galley.text() == label => Some(t.pos.x),
+            _ => None,
+        })
+    };
+    // Rows that show a shortcut or a style kind, and rows that show neither, among the first visible ones.
+    let items = quick_apply_items(&app.session, "", false);
+    let first = items.iter().take(10);
+    let plain = first.clone().find(|it| it.shortcut.is_none() && it.kind.is_empty()).expect("a row without a shortcut");
+    let with_sc = first.clone().find(|it| it.shortcut.is_some()).expect("a row with a shortcut");
+    let (a, b) = (label_x(&plain.label).expect("plain row drawn"), label_x(&with_sc.label).expect("shortcut row drawn"));
+    assert!((a - b).abs() < 0.5, "{:?} at x {a}, {:?} at x {b}", plain.label, with_sc.label);
+}
+
+#[test]
+fn copy_and_paste_keys_work_for_objects_without_a_native_menu() {
+    // Without a native menu the paste key arrives only as a paste event, which needs text on
+    // the system clipboard (#164, #185).
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp, events: Vec<egui::Event>| {
+        let input = egui::RawInput {
+            screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))),
+            events,
+            ..Default::default()
+        };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+        out.platform_output.commands
+    };
+    let count = |app: &crate::DesignApp| app.session.active().unwrap().doc.spreads[0].items.len();
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![]);
+    let id = app.session.execute("frame.create", &json!({"rect": [72, 72, 200, 160]})).unwrap()["id"].clone();
+    app.session.execute("selection.set", &json!({"ids": [id]})).unwrap();
+    let n = count(&app);
+    let copied = frame(&mut app, vec![egui::Event::Copy])
+        .into_iter()
+        .find_map(|c| match c {
+            egui::OutputCommand::CopyText(t) => Some(t),
+            _ => None,
+        })
+        .expect("copying objects puts text on the system clipboard");
+    assert!(!copied.is_empty());
+    frame(&mut app, vec![egui::Event::Paste(copied.clone())]);
+    assert_eq!(count(&app), n + 1, "the paste key pastes the copied rectangle");
+
+    // Pasting into text anchors the copied object; the clipboard placeholder isn't typed.
+    let r = app.session.execute("frame.create", &json!({"rect": [72, 300, 400, 400], "content": "text", "text": "Hello"})).unwrap();
+    let story = r["story"].as_u64().unwrap();
+    app.session.execute("tool.select", &json!({"tool": "type"})).unwrap();
+    app.session.execute("text.select", &json!({"story": story, "anchor": 5, "focus": 5})).unwrap();
+    frame(&mut app, vec![egui::Event::Paste(copied.clone())]);
+    // Shift pastes without formatting.
+    frame(&mut app, vec![egui::Event::ModifiersChanged(egui::Modifiers::SHIFT), egui::Event::Paste(copied)]);
+    let text = app.session.active().unwrap().doc.story(designcraft_doc::StoryId(story)).unwrap().text.clone();
+    assert!(text.starts_with("Hello") && !text.contains('\u{FFFC}'), "{text:?}");
+    assert!(text.contains(designcraft_doc::OBJECT_MARK), "{text:?}");
+}
+
+#[test]
+fn paste_with_no_insertion_point_makes_a_text_frame_from_other_apps_text() {
+    // #518: text copied in another app pastes as a new, selected text frame; the text an
+    // object copy stands for still pastes the objects. One paste each way, with and without
+    // a native menu.
+    let selected_text = |app: &crate::DesignApp| {
+        let d = app.session.active().unwrap();
+        let it = d.doc.item(*d.selection.items.first()?)?;
+        Some(d.doc.story(it.text_frame()?.story)?.text.clone())
+    };
+    let ctx = egui::Context::default();
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    native_frame(&mut app, &ctx, vec![], None);
+    native_frame(&mut app, &ctx, vec![], None);
+    // The paste keys without a native menu: a paste event.
+    native_frame(&mut app, &ctx, vec![egui::Event::Paste("From elsewhere".into())], None);
+    assert_eq!(document_items(&app), (1, 1), "pasted once");
+    assert_eq!(selected_text(&app).as_deref(), Some("From elsewhere"));
+    let id = app.session.execute("frame.create", &json!({"rect": [72, 72, 200, 160]})).unwrap()["id"].clone();
+    app.session.execute("selection.set", &json!({"ids": [id]})).unwrap();
+    let copied = native_frame(&mut app, &ctx, vec![egui::Event::Copy], None)
+        .platform_output
+        .commands
+        .into_iter()
+        .find_map(|c| match c {
+            egui::OutputCommand::CopyText(t) => Some(t),
+            _ => None,
+        })
+        .expect("copying objects puts text on the system clipboard");
+    native_frame(&mut app, &ctx, vec![egui::Event::Paste(copied)], None);
+    assert_eq!(document_items(&app), (3, 1));
+    assert_eq!(selected_text(&app), None, "the copied rectangle, not a text frame");
+
+    // A native menu: Paste reads the system clipboard.
+    let clip = std::rc::Rc::new(std::cell::RefCell::new(Some("Menu text".to_string())));
+    let read = clip.clone();
+    let services = crate::Services { clipboard_text: Some(Box::new(move || read.borrow().clone())), ..Default::default() };
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), services);
+    app.native_menu = true;
+    app.session.execute("file.new", &json!({})).unwrap();
+    native_frame(&mut app, &ctx, vec![], None);
+    native_frame(&mut app, &ctx, vec![], None);
+    native_frame(&mut app, &ctx, vec![], Some("edit.paste"));
+    native_frame(&mut app, &ctx, vec![], None);
+    assert_eq!(document_items(&app), (1, 1), "pasted once");
+    assert_eq!(selected_text(&app).as_deref(), Some("Menu text"));
+    // Objects copied since that text was copied paste as objects.
+    let id = app.session.execute("frame.create", &json!({"rect": [72, 72, 200, 160]})).unwrap()["id"].clone();
+    app.session.execute("selection.set", &json!({"ids": [id]})).unwrap();
+    native_frame(&mut app, &ctx, vec![], Some("edit.copy"));
+    native_frame(&mut app, &ctx, vec![], Some("edit.paste"));
+    assert_eq!(document_items(&app), (3, 1));
+    assert_eq!(selected_text(&app), None, "the copied rectangle, not a text frame");
+    // Newer text from another app wins.
+    *clip.borrow_mut() = Some("Newer".into());
+    native_frame(&mut app, &ctx, vec![], Some("edit.paste"));
+    assert_eq!(document_items(&app), (4, 1));
+    assert_eq!(selected_text(&app).as_deref(), Some("Newer"));
+}
+
+#[test]
+fn sample_scripts_run() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    for (name, text) in app.ui.scripts.clone() {
+        let r = app.session.execute("script.run", &json!({"text": text}));
+        assert!(r.is_ok(), "{name}: {r:?}");
+    }
+}
+
+#[test]
+fn new_window_shows_a_second_view() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let ctx = egui::Context::default();
+    let frame = |app: &mut crate::DesignApp| {
+        let input =
+            egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+    };
+    frame(&mut app);
+    assert_eq!(run_ui(&mut app, "window.newWindow", &json!({})).unwrap().unwrap(), json!(true));
+    assert!(!app.split);
+    frame(&mut app);
+    frame(&mut app);
+    // Pane 1 was drawn (its rect is held for it) and has its own view.
+    assert!(app.other_pane.as_ref().and_then(|o| o.1).is_some() || app.pane == 1);
+    app.switch_pane(1);
+    assert!(app.view().is_some(), "the second window has a view");
+    app.switch_pane(0);
+    assert_eq!(checked(&app, "window.newWindow", &Value::Null), Some(true));
+    run_ui(&mut app, "window.newWindow", &json!({"on": false})).unwrap().unwrap();
+    frame(&mut app);
+}
+
+#[test]
+fn panels_float_and_dock() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let r = run_ui(&mut app, "window.floatPanel", &json!({"panel": "swatches", "x": 50, "y": 60})).unwrap().unwrap();
+    assert_eq!(r["floating"], json!(["swatches"]));
+    let window = &app.ui.docking.as_ref().unwrap().floating[0];
+    assert_eq!([window.rect[0], window.rect[1]], [50.0, 60.0]);
+    // Showing a floating panel leaves it where it is.
+    run_ui(&mut app, "window.panel", &json!({"panel": "swatches"})).unwrap().unwrap();
+    assert_eq!(app.ui.open_panel, None);
+    let r = run_ui(&mut app, "window.dockPanel", &json!({"panel": "swatches"})).unwrap().unwrap();
+    assert_eq!(r["floating"], json!([]));
+    assert!(app.ui.docking.as_ref().unwrap().floating.is_empty());
+    assert!(run_ui(&mut app, "window.floatPanel", &json!({"panel": "nope"})).unwrap().is_err());
+    // Float-only panels (Type › Tabs) have their own windows outside the layout.
+    let r = run_ui(&mut app, "window.floatPanel", &json!({"panel": "tabs", "x": 10, "y": 20})).unwrap().unwrap();
+    assert_eq!(r["floating"], json!(["tabs"]));
+    assert_eq!(app.ui.floating, [("tabs".to_string(), [10.0, 20.0])]);
+    run_ui(&mut app, "window.dockPanel", &json!({"panel": "tabs"})).unwrap().unwrap();
+    assert!(app.ui.floating.is_empty());
+}
+
+/// One frame as the desktop app runs it: queued synthetic input, then the native menu item
+/// chosen during the frame (`menu`), then the app's logic and ui.
+fn native_frame(app: &mut crate::DesignApp, ctx: &egui::Context, events: Vec<egui::Event>, menu: Option<&str>) -> egui::FullOutput {
+    let mut input =
+        egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), events, ..Default::default() };
+    app.raw_input_hook(ctx, &mut input);
+    let mut menu = menu;
+    let mut out = ctx.run_ui(input, |ui| {
+        let ctx = ui.ctx().clone();
+        if let Some(id) = menu.take() {
+            activate_native(app, &ctx, id, &Value::Null);
+        }
+        app.logic(&ctx);
+        app.ui(ui);
+    });
+    out.textures_delta.clear();
+    out
+}
+
+/// A document with two frames, nothing selected, and Quick Apply's search field focused
+/// holding `text`.
+fn app_with_focused_field(ctx: &egui::Context, text: &str) -> crate::DesignApp {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    app.session.execute("frame.create", &json!({"rect": [36, 36, 200, 200]})).unwrap();
+    app.session.execute("frame.create", &json!({"rect": [236, 36, 400, 200]})).unwrap();
+    app.session.execute("edit.deselectAll", &json!({})).unwrap();
+    app.ui.palette = Some(text.into());
+    for _ in 0..3 {
+        native_frame(&mut app, ctx, vec![], None);
+    }
+    assert!(ctx.text_edit_focused());
+    app
+}
+
+fn field_selection(ctx: &egui::Context) -> Option<(usize, usize)> {
+    let id = ctx.memory(|m| m.focused())?;
+    let r = egui::TextEdit::load_state(ctx, id)?.cursor.char_range()?;
+    Some((r.primary.index.min(r.secondary.index).into(), r.primary.index.max(r.secondary.index).into()))
+}
+
+fn document_items(app: &crate::DesignApp) -> (usize, usize) {
+    let d = app.session.active().unwrap();
+    (d.doc.spreads.iter().flat_map(|sp| &sp.items).count(), d.selection.items.len())
+}
+
+#[test]
+fn native_select_all_selects_the_focused_fields_text() {
+    // The Mac menu bar takes ⌘A before the window sees it (#30).
+    let ctx = egui::Context::default();
+    let mut app = app_with_focused_field(&ctx, "frame");
+    native_frame(&mut app, &ctx, vec![], Some("edit.selectAll"));
+    native_frame(&mut app, &ctx, vec![], None);
+    assert_eq!(field_selection(&ctx), Some((0, 5)), "the field's whole text is selected");
+    assert_eq!(document_items(&app), (2, 0), "the document selection is unchanged");
+}
+
+#[test]
+fn native_paste_and_copy_act_on_the_focused_field() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_focused_field(&ctx, "frame");
+    native_frame(&mut app, &ctx, vec![], Some("edit.selectAll"));
+    native_frame(&mut app, &ctx, vec![], None);
+    // Copy puts the field's selected text on the clipboard.
+    native_frame(&mut app, &ctx, vec![], Some("edit.copy"));
+    let out = native_frame(&mut app, &ctx, vec![], None);
+    assert!(out.platform_output.commands.contains(&egui::OutputCommand::CopyText("frame".into())), "{:?}", out.platform_output.commands);
+    // Paste asks the integration for the clipboard, which it hands to the field as a paste.
+    let out = native_frame(&mut app, &ctx, vec![], Some("edit.paste"));
+    let commands = &out.viewport_output[&egui::ViewportId::ROOT].commands;
+    assert!(commands.contains(&egui::ViewportCommand::RequestPaste), "{commands:?}");
+    native_frame(&mut app, &ctx, vec![egui::Event::Paste("text".into())], None);
+    assert_eq!(app.ui.palette.as_deref(), Some("text"));
+    assert_eq!(document_items(&app), (2, 0), "nothing was pasted into the document");
+}
+
+#[test]
+fn native_copy_and_paste_use_the_system_clipboard_for_canvas_text() {
+    let ctx = egui::Context::default();
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    app.session.execute("frame.create", &json!({"rect": [36, 36, 200, 200], "content": "text", "text": "hello"})).unwrap();
+    let story = *app.session.active().unwrap().doc.stories.keys().next().unwrap();
+    app.select_tool("type");
+    app.run("text.select", json!({"story": story.0, "anchor": 0, "focus": 5})).unwrap();
+    for _ in 0..3 {
+        native_frame(&mut app, &ctx, vec![], None);
+    }
+    assert!(app.session.wants_text());
+
+    native_frame(&mut app, &ctx, vec![], Some("edit.copy"));
+    let copied = native_frame(&mut app, &ctx, vec![], None);
+    assert!(copied.platform_output.commands.contains(&egui::OutputCommand::CopyText("hello".into())));
+
+    let paste = native_frame(&mut app, &ctx, vec![], Some("edit.paste"));
+    let commands = &paste.viewport_output[&egui::ViewportId::ROOT].commands;
+    assert!(commands.contains(&egui::ViewportCommand::RequestPaste), "{commands:?}");
+    native_frame(&mut app, &ctx, vec![egui::Event::Paste("world".into())], None);
+    assert_eq!(app.session.active().unwrap().doc.story(story).unwrap().text, "world");
+}
+
+#[test]
+fn native_undo_and_redo_act_on_the_focused_field() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_focused_field(&ctx, "");
+    native_frame(&mut app, &ctx, vec![egui::Event::Text("abc".into())], None);
+    assert_eq!(app.ui.palette.as_deref(), Some("abc"));
+    native_frame(&mut app, &ctx, vec![], Some("edit.undo"));
+    native_frame(&mut app, &ctx, vec![], None);
+    assert_eq!(app.ui.palette.as_deref(), Some(""), "the field's typing is undone");
+    assert_eq!(document_items(&app), (2, 0), "the document's last frame is still there");
+    native_frame(&mut app, &ctx, vec![], Some("edit.redo"));
+    native_frame(&mut app, &ctx, vec![], None);
+    assert_eq!(app.ui.palette.as_deref(), Some("abc"));
+    assert_eq!(document_items(&app), (2, 0));
+}
+
+#[test]
+fn native_editing_items_are_enabled_for_a_focused_field() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_focused_field(&ctx, "frame");
+    // Nothing is selected in the document, so its Copy and Cut are off; the field's are on.
+    assert!(!menu_enabled(&app, "edit.copy") && !menu_enabled(&app, "edit.cut"));
+    for id in ["edit.selectAll", "edit.copy", "edit.cut", "edit.paste", "edit.undo", "edit.redo"] {
+        assert!(native_menu_enabled(&app, &ctx, id), "{id}");
+    }
+    assert!(!native_menu_enabled(&app, &ctx, "edit.duplicate"), "other items follow the document");
+    app.ui.palette = None;
+    native_frame(&mut app, &ctx, vec![], None);
+    native_frame(&mut app, &ctx, vec![], None);
+    assert!(!native_menu_enabled(&app, &ctx, "edit.copy"), "without a focused field, as the document says");
+}
+
+#[test]
+fn native_select_all_without_a_focused_field_selects_the_documents_items() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_focused_field(&ctx, "frame");
+    app.ui.palette = None;
+    native_frame(&mut app, &ctx, vec![], None);
+    native_frame(&mut app, &ctx, vec![], None);
+    assert!(!ctx.text_edit_focused());
+    native_frame(&mut app, &ctx, vec![], Some("edit.selectAll"));
+    assert_eq!(document_items(&app), (2, 2));
+}
+
+#[test]
+fn command_search_matches_labels_in_the_interface_language() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui.language = "de".into();
+    let label = crate::i18n::tr("de", "Group");
+    let items = command_search(&app, &label.to_lowercase());
+    let group = items.iter().find(|i| i.id == "object.group").unwrap();
+    assert_eq!(group.label, label);
+    assert_eq!(group.shortcut.as_deref(), Some("Cmd+G"));
+    assert!(command_search(&app, "group").iter().any(|i| i.id == "object.group"), "English labels match too");
+    assert!(command_search(&app, "  ").is_empty());
+    assert!(command_search(&app, "e").len() <= 14);
+}
+
+#[test]
+fn quick_apply_lists_styles_then_commands() {
+    let mut s = designcraft_engine::Session::new();
+    s.execute("file.new", &json!({})).unwrap();
+    s.execute("style.paragraph.create", &json!({"name": "Body Copy"})).unwrap();
+    let items = quick_apply_items(&s, "body", false);
+    assert_eq!(items[0].id, "style.paragraph.apply");
+    assert_eq!(items[0].params, json!({"name": "Body Copy"}));
+    assert_eq!(items[0].kind, "Paragraph Style");
+    assert!(quick_apply_items(&s, "", false).iter().all(|i| i.kind.is_empty()));
+    assert!(quick_apply_items(&s, "preferences", false).iter().any(|i| i.id == "app.preferences"));
+}
+
+#[test]
+fn searched_ui_commands_run_without_parameters_and_keep_preferences() {
+    // Without a value these reset a setting or need a place the test host always has.
+    let searched: Vec<&str> = quick_commands().map(|c| c.0).collect();
+    for id in ["app.flattener", "view.screenMode", "view.zoom", "window.taskBarPin"] {
+        assert!(!searched.contains(&id), "{id} is searched");
+    }
+    // A placed PDF: a graphic with layers.
+    let mut scratch = designcraft_engine::Session::new();
+    scratch.execute("file.new", &json!({})).unwrap();
+    let pdf = scratch.execute("file.exportPdf", &json!({})).unwrap()["base64"].clone();
+    let contexts = ["nothing selected", "text insertion point", "text frame selected", "table cell", "placed PDF selected"];
+    // A two-page document, a saved workspace and non-default preferences, a host with window
+    // controls, and file dialogs that are dismissed.
+    let setup = |context: usize| {
+        let services = crate::Services { clipboard_text: Some(Box::new(|| None)), ..Default::default() };
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), services);
+        app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(None));
+        app.custom_titlebar = true;
+        app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(900.0, 700.0)));
+        app.run("file.new", json!({"pages": 2})).unwrap();
+        app.session.prefs.recent_files.push("/nowhere/recent.dcraft".into());
+        app.ui.shortcuts.insert("view.rulers", vec!["Ctrl+Alt+R".into()]);
+        app.ui.hidden_menu_items.push("view.guides".into());
+        app.ui.ui_scale = 1.25;
+        app.ui.brightness = crate::theme::Brightness::Light;
+        app.ui.task_bar_at = Some([200.0, 200.0]);
+        run_ui(&mut app, "window.newWorkspace", &json!({"name": "Mine"})).unwrap().unwrap();
+        match context {
+            1 => {
+                app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "text": "One", "caret": true})).unwrap();
+            }
+            2 => {
+                let f = app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "text": "One"})).unwrap()["id"].clone();
+                app.run("selection.set", json!({"ids": [f]})).unwrap();
+            }
+            3 => {
+                app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "caret": true})).unwrap();
+                app.run("table.insert", json!({"rows": 2, "cols": 2})).unwrap();
+            }
+            4 => {
+                let f = app.run("frame.create", json!({"rect": [72, 72, 400, 400]})).unwrap()["id"].clone();
+                app.run("file.place", json!({"base64": pdf, "name": "a.pdf", "frame": f})).unwrap();
+                app.run("selection.set", json!({"ids": [f]})).unwrap();
+            }
+            _ => {}
+        }
+        app.ui.dialog = None;
+        app
+    };
+    let prefs = |app: &DesignApp| {
+        let u = &app.ui;
+        json!({
+            "shortcuts": u.shortcuts, "hiddenMenuItems": u.hidden_menu_items, "uiScale": u.ui_scale,
+            "brightness": u.brightness, "workspace": u.workspace, "customWorkspaces": u.custom_workspaces,
+            "docking": u.docking, "dockingHidden": u.docking_hidden, "floating": u.floating,
+        })
+    };
+    let quick = quick_apply_items(&setup(0).session, "workspace", false);
+    assert!(quick.iter().any(|i| i.id == "window.newWorkspace"));
+    // Deleting needs a workspace name: the application bar's workspace menu lists them.
+    assert!(!quick.iter().any(|i| i.id == "window.deleteWorkspace"));
+    // Each command runs as Quick Apply runs an entry. One that needs a selection may fail
+    // without it, but runs in one of the contexts; none changes a preference it wasn't asked to.
+    // Opening a panel or collapsing the dock to icons changes where the panels are, as it should.
+    let opens_a_panel = [
+        "app.tabsPanel",
+        "app.characterStylesPanel",
+        "app.paragraphStylesPanel",
+        "app.characterPanel",
+        "app.paragraphPanel",
+        "app.glyphsPanel",
+        "app.tablePanel",
+        "window.collapseToIcons",
+    ];
+    let arrangement = ["docking", "dockingHidden", "floating"];
+    let mut failed = Vec::new();
+    for (id, ..) in quick_commands().filter(|(id, ..)| UI_COMMANDS.iter().any(|c| c.0 == *id)) {
+        let mut errors = Vec::new();
+        for (i, context) in contexts.iter().enumerate() {
+            let mut app = setup(i);
+            let before = prefs(&app);
+            match app.run(id, json!({})) {
+                Err(e) => errors.push(format!("{context}: {e}")),
+                Ok(_) => {
+                    let after = prefs(&app);
+                    let changed: Vec<&String> =
+                        before.as_object().unwrap().iter().filter(|(k, v)| after.get(k.as_str()) != Some(*v)).map(|(k, _)| k).collect();
+                    let changed: Vec<&String> =
+                        changed.into_iter().filter(|k| !(opens_a_panel.contains(&id) && arrangement.contains(&k.as_str()))).collect();
+                    if !changed.is_empty() {
+                        failed.push(format!("{id} ({context}): changed {changed:?}"));
+                    }
+                }
+            }
+        }
+        if errors.len() == contexts.len() {
+            failed.push(format!("{id}: {errors:?}"));
+        }
+    }
+    assert!(failed.is_empty(), "{failed:#?}");
+}
+
+#[test]
+fn distribute_rows_menu_dispatches_an_undoable_edit() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let frame = app.run("frame.create", json!({"rect": [72, 72, 500, 700], "content": "text", "text": ""})).unwrap();
+    app.run("text.select", json!({"story": frame["story"], "anchor": 0, "focus": 0})).unwrap();
+    app.run("table.insert", json!({"rows": 2, "cols": 2})).unwrap();
+    app.run("table.setRowHeight", json!({"row": 0, "height": 40, "mode": "exactly"})).unwrap();
+    app.run("table.setRowHeight", json!({"row": 1, "height": 80, "mode": "exactly"})).unwrap();
+    app.run("table.selectTable", json!({})).unwrap();
+    activate(&mut app, "table.distributeRows", &Value::Null);
+    assert!(app.ui.dialog.is_none());
+    let info = app.run("table.get", json!({})).unwrap();
+    assert_eq!(info["rows"][0]["height"], 60.0);
+    assert_eq!(info["rows"][1]["height"], 60.0);
+    app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(app.run("table.get", json!({})).unwrap()["rows"][0]["height"], 40.0);
+}
+
+#[test]
+fn every_menu_entry_is_a_command() {
+    let mut all = Vec::new();
+    for (_, items) in menu_tree() {
+        walk(&items, &mut all);
+    }
+    assert!(all.len() > 80, "{}", all.len());
+    assert!(all.iter().any(|(label, id, _)| label == "Distribute Rows Evenly" && id == "table.distributeRows"));
+    for (label, id, params) in &all {
+        assert!(ui_label(id).is_some() || designcraft_engine::find_command(id).is_some(), "menu entry {label}: unknown command {id}");
+        assert!(!label.is_empty() && label != id, "menu entry {id} has no label");
+        if let Some(o) = params.as_object() {
+            assert!(!o.is_empty(), "{id}: empty fixed params");
+        }
+    }
+    // Nested submenus parse (Type › Insert Special Character › Symbols › …).
+    let ty = menu_tree().into_iter().find(|(m, _)| *m == "Type").unwrap().1;
+    let special = ty.iter().find_map(|i| match i {
+        Item::Sub(n, c) if n == "Insert Special Character" => Some(c.clone()),
+        _ => None,
+    });
+    assert!(special.is_some_and(|c| c.iter().any(|i| matches!(i, Item::Sub(n, _) if n == "Symbols"))));
+    // Fixed-parameter variants keep their own labels.
+    assert!(all.iter().any(|(l, id, _)| l == "Fill Frame Proportionally" && id == "fit.fillFrameProportionally"));
+}
+
+#[test]
+fn context_menus_hold_commands_and_menu_bar_submenus() {
+    let tree = menu_tree();
+    for entries in [CONTEXT_OBJECT, CONTEXT_GRAPHIC_FRAME, CONTEXT_OBJECT_TAIL, CONTEXT_TEXT_FRAME, CONTEXT_TEXT, CONTEXT_CANVAS] {
+        for path in entries.iter().filter_map(|e| e.strip_prefix("menu:")) {
+            assert!(menu_bar_submenu(&tree, path).is_some(), "no menu bar submenu {path}");
+        }
+        let mut all = Vec::new();
+        for (_, items) in context_parse(entries) {
+            walk(&items, &mut all);
+        }
+        for (label, id, _) in &all {
+            assert!(ui_label(id).is_some() || designcraft_engine::find_command(id).is_some(), "context entry {label}: unknown command {id}");
+        }
+    }
+}
+
+#[test]
+fn the_type_menu_follows_indesigns_order() {
+    // InDesign's Type menu, as Chris Nielsen opens it in "Numbering Page Sections" (2:09).
+    let ty = menu_tree().into_iter().find(|(m, _)| *m == "Type").unwrap().1;
+    let labels: Vec<String> = ty
+        .iter()
+        .map(|i| match i {
+            Item::Sep => "-".to_string(),
+            Item::Sub(n, _) => format!("{n} >"),
+            Item::Cmd { label, .. } => label.clone(),
+        })
+        .collect();
+    let expected = [
+        "Size >",
+        "-",
+        "Character",
+        "Paragraph",
+        "Tabs",
+        "Glyphs",
+        "-",
+        "Character Styles",
+        "Paragraph Styles",
+        "-",
+        "Create Outlines",
+        "Find/Replace Font…",
+        "Reload Fonts",
+        "Change Case >",
+        "-",
+        "Type on a Path >",
+        "-",
+        "Notes >",
+        "Track Changes >",
+        "-",
+        "Insert Footnote",
+        "Document Footnote Options…",
+        "Insert Endnote",
+    ];
+    assert_eq!(&labels[..expected.len()], expected, "{labels:?}");
+    let pos = |l: &str| labels.iter().position(|x| x == l).unwrap_or_else(|| panic!("{l} in {labels:?}"));
+    assert!(pos("Hyperlinks & Cross-References >") < pos("Text Variables >"));
+    assert!(pos("Text Variables >") < pos("Bulleted & Numbered Lists >"));
+    assert!(pos("Bulleted & Numbered Lists >") < pos("Insert Special Character >"));
+    assert!(pos("Insert Special Character >") < pos("Insert White Space >"));
+    assert!(pos("Insert Break Character >") < pos("Fill with Placeholder Text"));
+    assert!(pos("Fill with Placeholder Text") < pos("Show Hidden Characters"));
+    // Alignment, styles and point sizes keep their shortcuts, out of the menu as in InDesign.
+    for gone in ["Align Left", "Bold", "Increase Point Size", "Paragraph Rules…"] {
+        assert!(!labels.iter().any(|l| l == gone), "{gone}");
+    }
+    let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let all = effective_shortcuts(&app);
+    for (id, sc) in [
+        ("type.alignLeft", "Cmd+Shift+L"),
+        ("app.characterPanel", "Cmd+T"),
+        ("app.paragraphPanel", "Cmd+Alt+T"),
+        ("app.insertCurrentPageNumber", "Cmd+Alt+Shift+N"),
+    ] {
+        assert_eq!(all.iter().find(|(i, _)| i == id).map(|(_, s)| s.as_str()), Some(sc), "{id}");
+    }
+    // Markers › Current Page Number carries ⌥⇧⌘N.
+    let markers = ty
+        .iter()
+        .find_map(|i| match i {
+            Item::Sub(n, c) if n == "Insert Special Character" => {
+                c.iter().find_map(|i| if let Item::Sub(n, c) = i { (n == "Markers").then(|| c.clone()) } else { None })
+            }
+            _ => None,
+        })
+        .unwrap();
+    assert!(matches!(&markers[0], Item::Cmd { label, shortcut: Some("Cmd+Alt+Shift+N"), .. } if label == "Current Page Number"));
+}
+
+#[test]
+fn type_panel_items_open_their_panels_and_the_marker_shortcut_inserts_a_page_number() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    activate(&mut app, "app.characterPanel", &Value::Null);
+    assert!(crate::panel_docking::showing(&app, "character"));
+    // Paragraph Styles opens floating, grouped with Character Styles, as in InDesign.
+    activate(&mut app, "app.paragraphStylesPanel", &Value::Null);
+    let layout = app.ui.docking.as_ref().unwrap();
+    assert!(
+        layout
+            .floating
+            .iter()
+            .flat_map(crate::panel_docking::window_groups)
+            .any(|g| g.panels == ["characterStyles", "paragraphStyles"] && g.active == 1)
+    );
+    let story = app.run("frame.create", json!({"rect": [36, 36, 200, 100], "content": "text", "text": "Page "})).unwrap()["story"].clone();
+    app.run("text.select", json!({"story": story, "anchor": 5, "focus": 5})).unwrap();
+    activate(&mut app, "app.insertCurrentPageNumber", &Value::Null);
+    let d = &app.session.doc().unwrap().doc;
+    assert_eq!(d.story(designcraft_doc::StoryId(story.as_u64().unwrap())).unwrap().text, "Page \u{e000}");
+}
+
+#[test]
+fn custom_workspaces_save_apply_and_delete() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui.dock_tab = "swatches".into();
+    app.ui.control_bar = true;
+    run_ui(&mut app, "window.newWorkspace", &json!({"name": "Mine"})).unwrap().unwrap();
+    run_ui(&mut app, "window.workspace", &json!({"name": "Essentials"})).unwrap().unwrap();
+    app.ui.dock_tab = "properties".into();
+    run_ui(&mut app, "window.workspace", &json!({"name": "Mine"})).unwrap().unwrap();
+    assert_eq!((app.ui.dock_tab.as_str(), app.ui.control_bar, app.ui.workspace.as_str()), ("swatches", true, "Mine"));
+    app.ui.dock_tab = "layers".into();
+    run_ui(&mut app, "window.resetWorkspace", &json!({})).unwrap().unwrap();
+    assert_eq!(app.ui.dock_tab, "swatches", "reset to the saved arrangement");
+    run_ui(&mut app, "window.deleteWorkspace", &json!({"name": "Mine"})).unwrap().unwrap();
+    assert!(app.ui.custom_workspaces.is_empty());
+    assert_eq!(app.ui.workspace, "Essentials");
+}
+
+/// New Workspace › Capture (Learn Skills Daily's InDesign course, 11:40): Panel Locations and
+/// Menu Customization, both on by default.
+#[test]
+fn new_workspace_captures_panel_locations_and_menu_customization() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    // The dialog offers both, checked.
+    run_ui(&mut app, "window.newWorkspace", &json!({})).unwrap().unwrap();
+    let d = app.ui.dialog.take().unwrap();
+    assert_eq!(
+        (d.id.as_str(), d.fields["panelLocations"].clone(), d.fields["menuCustomization"].clone()),
+        ("newWorkspace", json!(true), json!(true))
+    );
+    // Both captured.
+    app.ui.dock_tab = "swatches".into();
+    app.ui.hidden_menu_items = vec!["Type/Glyphs".into()];
+    run_ui(&mut app, "window.newWorkspace", &json!({"name": "All"})).unwrap().unwrap();
+    // Menus only: choosing it leaves the panels where they are.
+    app.ui.hidden_menu_items = vec!["Layout/Pages".into()];
+    run_ui(&mut app, "window.newWorkspace", &json!({"name": "Menus", "panelLocations": false})).unwrap().unwrap();
+    // Panels only: the menus stay as they are.
+    app.ui.dock_tab = "layers".into();
+    run_ui(&mut app, "window.newWorkspace", &json!({"name": "Panels", "menuCustomization": false})).unwrap().unwrap();
+    app.ui.dock_tab = "properties".into();
+    app.ui.hidden_menu_items.clear();
+    run_ui(&mut app, "window.workspace", &json!({"name": "Menus"})).unwrap().unwrap();
+    assert_eq!((app.ui.dock_tab.as_str(), app.ui.hidden_menu_items.clone()), ("properties", vec!["Layout/Pages".to_string()]));
+    run_ui(&mut app, "window.workspace", &json!({"name": "Panels"})).unwrap().unwrap();
+    assert_eq!((app.ui.dock_tab.as_str(), app.ui.hidden_menu_items.clone()), ("layers", vec!["Layout/Pages".to_string()]));
+    run_ui(&mut app, "window.workspace", &json!({"name": "All"})).unwrap().unwrap();
+    assert_eq!((app.ui.dock_tab.as_str(), app.ui.hidden_menu_items.clone()), ("swatches", vec!["Type/Glyphs".to_string()]));
+    // A workspace saved before the options existed restores its panels.
+    let old: crate::SavedWorkspace = serde_json::from_value(json!({"name": "Old", "dockTab": "pages"})).unwrap();
+    assert!(!old.keep_panels && old.hidden_menu_items.is_none());
+}
+
+#[test]
+fn essentials_classic_is_the_control_panel_and_iconic_groups() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    run_ui(&mut app, "window.workspace", &json!({"name": "Essentials Classic"})).unwrap().unwrap();
+    assert!(app.ui.control_bar && !app.ui.dock_expanded);
+    let groups = app.ui.icon_groups.clone().unwrap();
+    assert_eq!(groups[0], ["pages", "layers", "links"]);
+    assert_eq!(groups.last().unwrap(), &["gradient"]);
+    assert_eq!(checked(&app, "window.workspace", &json!({"name": "Essentials Classic"})), Some(true));
+    assert_eq!(checked(&app, "window.workspace", &json!({"name": "Essentials"})), Some(false));
+    // Window › Pages opens Pages from its icon group, not the Properties stack.
+    run_ui(&mut app, "window.panel", &json!({"panel": "pages"})).unwrap().unwrap();
+    assert!(crate::panel_docking::showing(&app, "pages"));
+    let layout = app.ui.docking.clone().unwrap();
+    assert!(!layout.contains(&"properties".to_string()));
+    assert_eq!(crate::panel_docking::tab_group(&layout, "pages"), ["pages", "layers", "links"]);
+    // A workspace saved from it keeps the groups.
+    run_ui(&mut app, "window.newWorkspace", &json!({"name": "Mine"})).unwrap().unwrap();
+    run_ui(&mut app, "window.workspace", &json!({"name": "Essentials"})).unwrap().unwrap();
+    assert_eq!((app.ui.icon_groups.as_ref(), app.ui.dock_expanded, app.ui.control_bar), (None, true, false));
+    run_ui(&mut app, "window.workspace", &json!({"name": "Mine"})).unwrap().unwrap();
+    assert_eq!(app.ui.icon_groups, Some(groups));
+}
+
+#[test]
+fn typography_workspace_opens_its_panels_from_named_icon_groups_and_resets() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    run_ui(&mut app, "window.workspace", &json!({"name":"Typography"})).unwrap().unwrap();
+    assert!(app.ui.control_bar);
+    assert!(!app.ui.dock_expanded);
+    assert!(app.ui.open_panel.is_none());
+    let groups = app.ui.icon_groups.clone().unwrap();
+    assert_eq!(groups[0], ["pages", "layers", "swatches"]);
+    assert_eq!(groups[4], ["paragraph", "paragraphStyles"]);
+    assert_eq!(groups[5], ["character", "characterStyles"]);
+    for panel in ["pages", "paragraphStyles", "characterStyles"] {
+        run_ui(&mut app, "window.panel", &json!({"panel":panel})).unwrap().unwrap();
+        assert!(crate::panel_docking::showing(&app, panel), "{panel}");
+        assert!(app.ui.docking.as_ref().unwrap().floating.is_empty(), "{panel} opens from its icon group");
+    }
+    run_ui(&mut app, "window.resetWorkspace", &json!({})).unwrap().unwrap();
+    assert_eq!(app.ui.icon_groups, Some(groups));
+    assert!(app.ui.open_panel.is_none());
+    assert!(!app.ui.dock_expanded);
+    run_ui(&mut app, "window.workspace", &json!({"name":"Essentials"})).unwrap().unwrap();
+    assert!(app.ui.icon_groups.is_none());
+    assert!(app.ui.dock_expanded);
+}
+
+#[test]
+fn the_window_menu_is_in_indesigns_order_and_reaches_every_panel() {
+    let window = menu_tree().into_iter().find(|(m, _)| *m == "Window").unwrap().1;
+    let names: Vec<&str> = window
+        .iter()
+        .filter_map(|i| match i {
+            Item::Sub(n, _) => Some(n.as_str()),
+            Item::Cmd { label, .. } => Some(label.as_str()),
+            Item::Sep => None,
+        })
+        .collect();
+    assert_eq!(&names[..4], ["Arrange", "Workspace", "Articles", "Color"]);
+    let sub = |name: &str| {
+        window
+            .iter()
+            .find_map(|i| match i {
+                Item::Sub(n, c) if n == name => Some(c.clone()),
+                _ => None,
+            })
+            .unwrap()
+    };
+    // Window › Workspace › Essentials Classic, Window › Color › Gradient & Swatches.
+    assert!(
+        sub("Workspace")
+            .iter()
+            .any(|i| matches!(i, Item::Cmd { id, params, .. } if id == "window.workspace" && params["name"] == "Essentials Classic"))
+    );
+    let color: Vec<String> = sub("Color").iter().filter_map(|i| if let Item::Cmd { label, .. } = i { Some(label.clone()) } else { None }).collect();
+    assert_eq!(color, ["Color", "Gradient", "Swatches"]);
+    // Every panel is in the menu.
+    fn panels(items: &[Item], out: &mut Vec<String>) {
+        for i in items {
+            match i {
+                Item::Sub(_, c) => panels(c, out),
+                Item::Cmd { id, params, .. } if id == "window.panel" => out.extend(params["panel"].as_str().map(str::to_string)),
+                _ => {}
+            }
+        }
+    }
+    let mut found = Vec::new();
+    panels(&window, &mut found);
+    for (id, _, _) in crate::dock::DOCK_TABS.iter().chain(crate::dock::ICON_PANELS) {
+        assert!(found.iter().any(|p| p == id), "Window menu misses the {id} panel");
+    }
+}
+
+#[test]
+fn interactive_workspaces_show_their_panels() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui.dock_expanded = false;
+    run_ui(&mut app, "window.workspace", &json!({"name": "Interactive for PDF"})).unwrap().unwrap();
+    assert_eq!((app.ui.dock_tab.as_str(), app.ui.dock_expanded, app.ui.open_panel.as_deref()), ("pages", true, Some("buttons")));
+    run_ui(&mut app, "window.workspace", &json!({"name": "Digital Publishing"})).unwrap().unwrap();
+    assert_eq!((app.ui.dock_tab.as_str(), app.ui.open_panel.as_deref()), ("pages", Some("liquid")));
+    run_ui(&mut app, "window.workspace", &json!({"name": "Essentials"})).unwrap().unwrap();
+    assert_eq!(app.ui.open_panel, None);
+}
+
+#[test]
+fn hide_and_show_menu_items() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let items = all_menu_items();
+    let (menu, label) = items.iter().find(|(m, _)| m == "Edit").cloned().expect("Edit items");
+    let key = menu_key(&menu, &label);
+    run_ui(&mut app, "window.hideMenuItem", &json!({"item": key})).unwrap().unwrap();
+    assert!(app.ui.hidden_menu_items.contains(&key));
+    run_ui(&mut app, "window.hideMenuItem", &json!({"item": key, "hidden": false})).unwrap().unwrap();
+    assert!(app.ui.hidden_menu_items.is_empty());
+    assert!(items.len() > 100, "every menu's items are listed: {}", items.len());
+}
+
+/// The Type menu as drawn: every item label.
+fn drawn_type_menu(app: &mut DesignApp) -> Vec<String> {
+    let ty = menu_tree().into_iter().find(|(m, _)| *m == "Type").unwrap().1;
+    let ctx = egui::Context::default();
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(400.0, 4000.0));
+    let mut out = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), ..Default::default() }, |ui| {
+        menu_items(app, ui, &ty, "Type");
+    });
+    out.textures_delta.clear();
+    fn collect(shape: &egui::Shape, out: &mut Vec<String>) {
+        match shape {
+            egui::Shape::Text(t) => out.push(t.galley.job.text.trim().to_string()),
+            egui::Shape::Vec(v) => v.iter().for_each(|s| collect(s, out)),
+            _ => {}
+        }
+    }
+    let mut labels = Vec::new();
+    out.shapes.iter().for_each(|s| collect(&s.shape, &mut labels));
+    labels
+}
+
+/// Tate-Chu-Yoko, Ruby, Kenten and Warichu are in the Type menu of InDesign's Japanese edition
+/// only: they show while Show CJK Features is on, which follows the interface language until
+/// the user sets it. Hidden, they still run.
+#[test]
+fn cjk_menu_items_follow_show_cjk_features() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let ty = menu_tree().into_iter().find(|(m, _)| *m == "Type").unwrap().1;
+    let cjk: Vec<String> = ty
+        .iter()
+        .filter_map(|i| match i {
+            Item::Cmd { label, id, .. } if CJK_ONLY.contains(&id.as_str()) => Some(label.clone()),
+            _ => None,
+        })
+        .collect();
+    assert_eq!(cjk.len(), 4, "{cjk:?}");
+    let drawn = |app: &mut DesignApp| {
+        let labels = drawn_type_menu(app);
+        assert!(labels.iter().any(|l| l == crate::i18n::tr(&app.ui.language, "Story Direction")), "in both editions: {labels:?}");
+        let shown: Vec<bool> = cjk.iter().map(|l| labels.iter().any(|d| d == crate::i18n::tr(&app.ui.language, l))).collect();
+        assert!(shown.iter().all(|s| *s == shown[0]), "{shown:?}");
+        shown[0]
+    };
+    for (lang, on) in [("", false), ("de", false), ("ja", true), ("zh", true), ("ko", true)] {
+        app.ui.language = lang.into();
+        assert_eq!(crate::cjk_features(&app), on, "{lang}");
+        assert_eq!(drawn(&mut app), on, "{lang}");
+    }
+    app.run("prefs.set", json!({"cjkFeatures": false})).unwrap();
+    assert!(!drawn(&mut app), "off in a Korean interface");
+    app.ui.language = String::new();
+    app.run("prefs.set", json!({"cjkFeatures": true})).unwrap();
+    assert!(drawn(&mut app), "on in an English interface");
+    assert!(quick_apply_items(&app.session, "ruby", crate::cjk_features(&app)).iter().any(|i| i.id == "app.rubyDialog"));
+    app.run("prefs.set", json!({"cjkFeatures": false})).unwrap();
+    assert!(!drawn(&mut app));
+    assert!(!quick_apply_items(&app.session, "ruby", crate::cjk_features(&app)).iter().any(|i| i.id == "app.rubyDialog"));
+    app.run("app.rubyDialog", json!({})).unwrap();
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("ruby"), "hidden, not removed");
+}
+
+/// Preferences › Type › Show CJK Features: left as it is, it keeps following the interface
+/// language; changed, it is kept in prefs.json.
+#[test]
+fn show_cjk_features_is_a_persisted_preference() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui.language = "ja".into();
+    run_ui(&mut app, "app.preferences", &json!({})).unwrap().unwrap();
+    assert_eq!(app.ui.dialog.as_ref().unwrap().fields["cjkFeatures"], true);
+    crate::dialogs::confirm(&mut app).unwrap();
+    assert_eq!(app.session.prefs.cjk_features, None, "untouched: follows the language");
+    run_ui(&mut app, "app.preferences", &json!({})).unwrap().unwrap();
+    app.ui.dialog.as_mut().unwrap().fields.insert("cjkFeatures".into(), json!(false));
+    crate::dialogs::confirm(&mut app).unwrap();
+    assert_eq!(app.session.prefs.cjk_features, Some(false));
+    assert!(!crate::cjk_features(&app));
+    // prefs.json round trip; a file from before the setting follows the language.
+    let saved = serde_json::to_vec(&app.session.prefs).unwrap();
+    assert_eq!(serde_json::from_slice::<designcraft_engine::Prefs>(&saved).unwrap().cjk_features, Some(false));
+    assert_eq!(serde_json::from_str::<designcraft_engine::Prefs>(r#"{"scaleStrokes": false}"#).unwrap().cjk_features, None);
+    assert_eq!(app.run("prefs.set", json!({"cjkFeatures": null})).unwrap()["cjkFeatures"], Value::Null);
+    assert!(crate::cjk_features(&app), "follows the Japanese interface again");
+}
+
+#[test]
+fn menu_button_fits_its_anchor_and_resets_scroll_on_reopen() {
+    // Workspace/panel menus may be in the middle; the status-bar zoom menu opens upwards.
+    for anchor_y in [0.0, 130.0, 260.0] {
+        let ctx = egui::Context::default();
+        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(400.0, 300.0));
+        let mut tick = 0;
+        let mut frame = |events: Vec<egui::Event>| {
+            tick += 1;
+            let mut button = None;
+            let mut first = None;
+            let mut last = None;
+            let mut output =
+                ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
+                    ui.add_space(anchor_y);
+                    let response = menu_button(ui, "Long menu", |ui| {
+                        for i in 0..60 {
+                            let response = ui.button(format!("Item {i}"));
+                            if i == 0 {
+                                first = Some((response.rect, ui.clip_rect()));
+                            }
+                            if i == 59 {
+                                last = Some((response.rect, ui.clip_rect()));
+                            }
+                        }
+                    });
+                    button = Some(response.response);
+                });
+            output.textures_delta.clear();
+            (button.expect("menu button"), first, last)
+        };
+        let click =
+            |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };
+        frame(vec![]);
+        let (button, _, _) = frame(vec![]);
+        let anchor = button.rect;
+        for pressed in [true, false] {
+            frame(vec![egui::Event::PointerMoved(anchor.center()), click(anchor.center(), pressed)]);
+        }
+        for _ in 0..3 {
+            frame(vec![]);
+        }
+        let popup = ctx.memory(|memory| memory.area_rect(egui::Popup::default_response_id(&button))).expect("open menu");
+        assert!(screen.contains_rect(popup), "menu at {anchor_y} fits in the viewport: {popup:?}");
+        assert!(
+            popup.top() >= anchor.bottom() - 1.0 || popup.bottom() <= anchor.top() + 1.0,
+            "menu at {anchor_y} stays on one side of its button: {popup:?}, {anchor:?}"
+        );
+        let (_, first, last) = frame(vec![]);
+        let (first, clip) = first.expect("first row");
+        assert!(clip.contains_rect(first), "newly opened menu starts at the first row");
+        assert!(!clip.intersects(last.expect("last row").0), "last row starts below the scroll area");
+
+        frame(vec![
+            egui::Event::PointerMoved(popup.center()),
+            egui::Event::MouseWheel {
+                unit: egui::MouseWheelUnit::Point,
+                delta: egui::vec2(0.0, -5000.0),
+                phase: egui::TouchPhase::Move,
+                modifiers: egui::Modifiers::NONE,
+                source: egui::MouseWheelSource::Unknown,
+            },
+        ]);
+        for _ in 0..60 {
+            frame(vec![]);
+        }
+        let (_, first, last) = frame(vec![]);
+        let (last, clip) = last.expect("scrolled last row");
+        assert!(popup.contains_rect(last) && clip.contains_rect(last), "last row is reachable: {last:?}, {popup:?}, {clip:?}");
+        assert!(!clip.intersects(first.expect("scrolled first row").0), "menu really scrolled away from its start");
+
+        let outside = egui::pos2(screen.right() - 10.0, screen.center().y);
+        for pressed in [true, false] {
+            frame(vec![egui::Event::PointerMoved(outside), click(outside, pressed)]);
+        }
+        assert!(!egui::Popup::is_any_open(&ctx), "outside click closes the menu");
+        assert!(frame(vec![]).1.is_none(), "closed menu is no longer drawn");
+        for pressed in [true, false] {
+            frame(vec![egui::Event::PointerMoved(anchor.center()), click(anchor.center(), pressed)]);
+        }
+        for _ in 0..3 {
+            frame(vec![]);
+        }
+        let (_, first, last) = frame(vec![]);
+        let (first, clip) = first.expect("reopened first row");
+        assert!(popup.contains_rect(first) && clip.contains_rect(first), "reopening resets to the first row: {first:?}, {clip:?}");
+        assert!(!clip.intersects(last.expect("reopened last row").0), "reopening discards the old scroll offset");
+    }
+}
+
+#[test]
+fn tiny_menu_viewport_does_not_force_the_default_scroll_height() {
+    let ctx = egui::Context::default();
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(400.0, 100.0));
+    let mut tick = 0;
+    let mut frame = |events: Vec<egui::Event>| {
+        tick += 1;
+        let mut button = None;
+        let mut output =
+            ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
+                ui.add_space(35.0);
+                let response = menu_button(ui, "Long menu", |ui| {
+                    for i in 0..20 {
+                        let _ = ui.button(format!("Item {i}"));
+                    }
+                });
+                button = Some(response.response);
+            });
+        output.textures_delta.clear();
+        button.expect("menu button")
+    };
+    frame(vec![]);
+    let button = frame(vec![]);
+    let pos = button.rect.center();
+    for pressed in [true, false] {
+        frame(vec![
+            egui::Event::PointerMoved(pos),
+            egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
+        ]);
+    }
+    for _ in 0..3 {
+        frame(vec![]);
+    }
+    let popup = ctx.memory(|memory| memory.area_rect(egui::Popup::default_response_id(&button))).expect("open menu");
+    let space = (screen.bottom() - button.rect.bottom()).max(button.rect.top() - screen.top());
+    assert!(space < 64.0, "fixture has less space than egui's default minimum scroll height");
+    // A complete command row may not fit, but the scroll area's minimum must not make
+    // the popup exceed its height budget or cover the button that dismisses it.
+    assert!(popup.height() <= space, "tiny menu respects its available height: {popup:?}, {space}");
+    assert!(screen.contains_rect(popup), "tiny menu remains inside the viewport: {popup:?}");
+    assert!(
+        popup.top() >= button.rect.bottom() - 1.0 || popup.bottom() <= button.rect.top() + 1.0,
+        "tiny menu stays beside its anchor: {popup:?}, {:?}",
+        button.rect
+    );
+}
+
+#[test]
+fn clipped_submenu_does_not_open_when_hovering_outside_menu() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1000.0, 900.0));
+    let entries = vec![Item::Sub("Hidden submenu".into(), vec![cmd_item("app.preferences", Value::Null)])];
+    let mut tick = 0;
+    let mut frame = |spacing: f32, events: Vec<egui::Event>| {
+        tick += 1;
+        let mut button_rect = egui::Rect::NOTHING;
+        let mut hidden_submenu = None;
+        let mut output =
+            ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
+                egui::MenuBar::new().ui(ui, |ui| {
+                    let response = ui.menu_button("Menu", |ui| {
+                        egui::ScrollArea::vertical().max_height(400.0).show(ui, |ui| {
+                            ui.add_space(spacing);
+                            let button_id = ui.next_auto_id();
+                            menu_items(&mut app, ui, &entries, "Test");
+                            let response = ui.ctx().read_response(button_id).expect("submenu button response");
+                            let open = egui::containers::menu::MenuState::from_ui(ui, |state, _| state.open_item.is_some());
+                            hidden_submenu = Some((response.rect, ui.clip_rect(), open));
+                        });
+                    });
+                    button_rect = response.response.rect;
+                });
+            });
+        output.textures_delta.clear();
+        (button_rect, hidden_submenu)
+    };
+    frame(500.0, vec![]);
+    let button = frame(500.0, vec![]).0.center();
+    for pressed in [true, false] {
+        frame(
+            500.0,
+            vec![
+                egui::Event::PointerMoved(button),
+                egui::Event::PointerButton { pos: button, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
+            ],
+        );
+    }
+    for _ in 0..3 {
+        frame(500.0, vec![]);
+    }
+    let (_, Some((hidden, clip, open))) = frame(500.0, vec![]) else { panic!("test menu is open") };
+    assert!(!open, "submenu starts closed");
+    assert!(screen.contains_rect(hidden), "hidden row remains inside the screen: {hidden:?}");
+    assert!(!clip.intersects(hidden), "submenu must be fully clipped: {hidden:?}, {clip:?}");
+    let (_, Some((_, _, open))) = frame(500.0, vec![egui::Event::PointerMoved(hidden.center())]) else { panic!("test menu remains open") };
+    assert!(!open, "hovering the clipped row's position outside the menu must not open its submenu");
+
+    let partial_spacing = 500.0 - (hidden.top() - clip.bottom()) - 6.0;
+    let (_, Some((partial, clip, open))) = frame(partial_spacing, vec![]) else { panic!("test menu remains open") };
+    assert!(!open);
+    assert!(partial.top() < clip.bottom() && partial.bottom() > clip.bottom(), "row must be partially clipped: {partial:?}, {clip:?}");
+    let outside = egui::pos2(partial.center().x, clip.bottom() + 1.0);
+    let (_, Some((_, _, open))) = frame(partial_spacing, vec![egui::Event::PointerMoved(outside)]) else { panic!("test menu remains open") };
+    assert!(!open, "hovering the clipped portion of a partially visible row must not open its submenu");
+    let visible = partial.intersect(clip).center();
+    let (_, Some((_, _, open))) = frame(partial_spacing, vec![egui::Event::PointerMoved(visible)]) else { panic!("test menu remains open") };
+    assert!(open, "hovering the visible portion still opens the submenu");
+    let (_, Some((_, _, open))) = frame(500.0, vec![]) else { panic!("test menu remains open") };
+    assert!(!open, "an open submenu closes when its row becomes fully clipped");
+}
+
+#[test]
+fn native_labels_keep_their_ampersands() {
+    assert_eq!(native_label("Numbering & Section Options…"), "Numbering && Section Options…");
+    assert_eq!(native_label("A&&B"), "A&&&&B");
+    assert_eq!(native_label("Pages"), "Pages");
+}
+
+#[test]
+fn the_mac_window_menu_minimizes_with_cmd_m() {
+    let window = native_menu_tree().into_iter().find(|(t, _)| *t == "Window").map(|(_, e)| e).unwrap_or_default();
+    assert!(matches!(window.first(), Some(Item::Cmd { id, shortcut: Some("Cmd+M"), .. }) if id == "window.minimize"), "{:?}", window.first());
+    assert!(matches!(window.get(1), Some(Item::Sep)));
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    assert!(run_ui(&mut app, "window.minimize", &Value::Null).is_some_and(|r| r.is_err()), "no host window controls");
+    app.native_menu = true;
+    assert!(menu_enabled(&app, "window.minimize") && !menu_enabled(&app, "window.maximize"));
+    run_ui(&mut app, "window.minimize", &Value::Null).unwrap().unwrap();
+    assert_eq!(app.pending_window_commands, [egui::ViewportCommand::Minimized(true)]);
+}
+
+#[test]
+fn mac_settings_follow_about_in_the_app_menu_and_leave_edit() {
+    let pos = |command: &str| MAC_APP_MENU.iter().position(|m| matches!(m, AppMenuItem::Cmd { command: c, .. } if *c == command));
+    let (Some(about), Some(settings)) = (pos("help.about"), pos("app.preferences")) else { panic!("About and Settings are in the app menu") };
+    assert!(about < settings);
+    assert_eq!(MAC_APP_MENU.get(settings - 1), Some(&AppMenuItem::Sep));
+    // Language follows Settings, as in the suite's other apps, titled in the interface language.
+    assert_eq!(MAC_APP_MENU.get(settings + 1), Some(&AppMenuItem::Language));
+    assert_eq!(MAC_APP_MENU.get(settings + 2), Some(&AppMenuItem::Sep));
+    let label = |command: &str| {
+        MAC_APP_MENU.iter().find_map(|m| match m {
+            AppMenuItem::Cmd { label, command: c, .. } if *c == command => Some(*label),
+            _ => None,
+        })
+    };
+    assert_eq!(label("app.preferences"), Some("Settings…"));
+    let ids = MAC_APP_MENU.iter().filter_map(|m| if let AppMenuItem::Cmd { id, .. } = m { Some(*id) } else { None }).collect::<Vec<_>>();
+    assert!(ids.iter().enumerate().all(|(i, id)| !ids[..i].contains(id)), "native ids are unique: {ids:?}");
+
+    let edit = |tree: Vec<(&'static str, Vec<Item>)>| {
+        let mut out = Vec::new();
+        walk(&tree.into_iter().find(|(t, _)| *t == "Edit").map(|(_, e)| e).unwrap_or_default(), &mut out);
+        out.into_iter().map(|(_, id, _)| id).collect::<Vec<_>>()
+    };
+    assert!(edit(menu_tree()).iter().any(|id| id == "app.preferences"), "the in-window Edit menu keeps Preferences");
+    let native = native_menu_tree();
+    let mut all = Vec::new();
+    for (_, entries) in &native {
+        walk(entries, &mut all);
+    }
+    assert!(!all.iter().any(|(_, id, _)| id == "app.preferences"), "the macOS menu bar has Settings only in the app menu");
+    assert!(edit(native_menu_tree()).iter().any(|id| id == "app.keyboardShortcuts"));
+    for (title, entries) in &native {
+        assert!(!matches!(entries.first(), Some(Item::Sep)) && !matches!(entries.last(), Some(Item::Sep)), "{title}: separator at an end");
+        assert!(entries.windows(2).all(|w| !matches!(w, [Item::Sep, Item::Sep])), "{title}: doubled separator");
+    }
+}
+
+/// Web save: a download that couldn't start is an error and leaves the document unsaved; one
+/// that started marks it saved.
+#[test]
+fn web_save_marks_the_document_saved_only_after_the_download_starts() {
+    let dir = tempfile::tempdir().unwrap();
+    // The title names a temporary path: on native, file.saveAs writes where the web build doesn't.
+    let title = dir.path().join("doc").to_string_lossy().to_string();
+    let fails = std::rc::Rc::new(std::cell::Cell::new(true));
+    let f = fails.clone();
+    let services = crate::Services {
+        download: Some(Box::new(move |_: &str, _: &[u8]| if f.get() { Err("blocked".into()) } else { Ok(()) })),
+        ..Default::default()
+    };
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), services);
+    app.run("file.new", json!({"title": title})).unwrap();
+    app.run("frame.create", json!({"rect": [36, 36, 300, 200]})).unwrap();
+    assert!(app.session.active().unwrap().is_dirty());
+
+    let e = app.run("app.save", json!({})).unwrap_err();
+    assert!(e.contains("blocked"), "{e}");
+    assert!(app.session.active().unwrap().is_dirty(), "a failed download leaves the document unsaved");
+
+    fails.set(false);
+    app.run("app.save", json!({})).unwrap();
+    assert!(!app.session.active().unwrap().is_dirty());
+}
+
+fn start_screen_texts(app: &mut crate::DesignApp) -> Vec<String> {
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx, "");
+    let mut shapes = Vec::new();
+    for _ in 0..3 {
+        let input =
+            egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0))), ..Default::default() };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+        shapes = out.shapes;
+    }
+    shapes
+        .iter()
+        .filter_map(|s| match &s.shape {
+            egui::Shape::Text(t) => Some(t.galley.text().to_string()),
+            _ => None,
+        })
+        .collect()
+}
+
+/// File › Open Recent: the files first (`app.openRecent {index}`), then Clear Recent Files.
+#[test]
+fn open_recent_lists_the_files_then_clear() {
+    let tree = menu_tree();
+    let file = &tree.iter().find(|(m, _)| *m == "File").unwrap().1;
+    let Some(Item::Sub(name, children)) = file.get(2) else { panic!("Open Recent after Open…: {:?}", file.get(2)) };
+    assert_eq!(format!("File/{name}"), OPEN_RECENT);
+    assert!(matches!(children.as_slice(), [Item::Cmd { id, .. }] if id == "file.clearRecent"));
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    assert!(recent_items(&app).is_empty());
+    assert!(!menu_enabled(&app, "file.clearRecent"));
+    app.session.prefs.note_recent_file("/work/a.designcraft");
+    app.session.prefs.note_recent_file("/work/b.idml");
+    let items = recent_items(&app);
+    let labels: Vec<_> = items
+        .iter()
+        .map(|i| match i {
+            Item::Cmd { label, id, params, .. } => format!("{label} {id} {params}"),
+            Item::Sep => "-".into(),
+            Item::Sub(..) => "sub".into(),
+        })
+        .collect();
+    assert_eq!(labels, ["b.idml app.openRecent {\"index\":0}", "a.designcraft app.openRecent {\"index\":1}", "-"]);
+    assert!(menu_enabled(&app, "file.clearRecent"));
+    assert!(menu_enabled(&app, "app.openRecent"));
+}
+
+/// A recent file that is gone says so in an alert (and the start screen still lists it).
+#[test]
+fn open_recent_of_a_missing_file_alerts_and_the_start_screen_lists_recent_files() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    assert!(!start_screen_texts(&mut app).iter().any(|t| t == "Recent files"), "no section without recent files");
+    app.session.prefs.note_recent_file("/nonexistent/dc-recent/gone.designcraft");
+    assert!(app.run("app.openRecent", json!({"index": 0})).is_err());
+    let d = app.ui.dialog.take().expect("an alert");
+    assert_eq!(d.fields["title"], "Can't Open the File");
+    assert_eq!(d.fields["file"], "gone.designcraft");
+    assert!(d.fields["message"].as_str().unwrap().contains("can't be found"));
+    assert!(app.run("app.openRecent", json!({"index": 9})).is_err(), "out of range: an error, not a panic");
+    app.ui.dialog = None;
+    let texts = start_screen_texts(&mut app);
+    assert!(texts.iter().any(|t| t == "Recent files"), "{texts:?}");
+    assert!(texts.iter().any(|t| t == "gone"), "the card names it without `.designcraft`: {texts:?}");
+}
+
+/// On a short window (1366 x 768 laptops) the start screen is taller than the window; the part
+/// below the fold has to be reachable by scrolling instead of being cut off.
+#[test]
+fn start_screen_scrolls_when_the_window_is_too_short() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx, "");
+    let size = egui::vec2(1366.0, 300.0);
+    let mut tile_y = |events: Vec<egui::Event>| {
+        let input = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, size)), events, ..Default::default() };
+        let mut out = ctx.run_ui(input, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        });
+        out.textures_delta.clear();
+        out.shapes.iter().find_map(|s| match &s.shape {
+            // The preset tiles paint their names even when scrolled out of view (labels skip that).
+            egui::Shape::Text(t) if t.galley.text() == "Tabloid" => Some(t.pos.y),
+            _ => None,
+        })
+    };
+    let at = egui::pos2(600.0, 150.0);
+    let mut before = None;
+    for _ in 0..3 {
+        before = tile_y(vec![egui::Event::PointerMoved(at)]);
+    }
+    let before = before.expect("the Tabloid tile is laid out");
+    let wheel = egui::Event::MouseWheel {
+        unit: egui::MouseWheelUnit::Point,
+        delta: egui::vec2(0.0, -400.0),
+        phase: egui::TouchPhase::Move,
+        modifiers: egui::Modifiers::NONE,
+        source: egui::MouseWheelSource::Unknown,
+    };
+    let mut after = tile_y(vec![egui::Event::PointerMoved(at), wheel]);
+    for _ in 0..30 {
+        after = tile_y(Vec::new());
+    }
+    let after = after.expect("the Tabloid tile is laid out");
+    assert!(after < before - 50.0, "the start screen should scroll: {before} -> {after}");
+}
+
+// Regression test for #329: on the start screen (no document) the Help menu's links were greyed out.
+#[test]
+fn help_links_are_enabled_without_a_document() {
+    let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    assert!(app.session.active().is_none());
+    let ids: Vec<&str> = UI_COMMANDS.iter().map(|c| c.0).filter(|id| id.starts_with("help.")).collect();
+    assert!(ids.contains(&"help.discord") && ids.contains(&"help.github"), "{ids:?}");
+    for id in ids {
+        assert!(menu_enabled(&app, id), "{id} must work from the start screen");
+    }
+    assert!(!menu_enabled(&app, "view.rulers"), "other UI commands still need a document");
+}
+
+// Regression test for #248: the start screen offered no A6 sheet (it listed only the first ten presets).
+#[test]
+fn start_screen_offers_every_print_preset_including_a6() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let texts = start_screen_texts(&mut app);
+    for p in designcraft_doc::build::PRESETS.iter().filter(|p| p.intent == designcraft_doc::Intent::Print) {
+        assert!(texts.iter().any(|t| t == p.name), "start screen lacks the {} card: {texts:?}", p.name);
+    }
+    assert!(texts.iter().any(|t| t == "A6"), "{texts:?}");
+    let a6 = designcraft_doc::build::PRESETS.iter().find(|p| p.name == "A6").unwrap();
+    assert!((a6.width - 105.0 * 72.0 / 25.4).abs() < 0.01 && (a6.height - 148.0 * 72.0 / 25.4).abs() < 0.01, "{a6:?}");
+    let page = crate::panels::properties::PAGE_PRESETS.iter().find(|p| p.0 == "A6").expect("Properties page-size list has A6");
+    assert!((page.1 - a6.width).abs() < 0.01 && (page.2 - a6.height).abs() < 0.01, "{page:?} vs {a6:?}");
+}
+
+// Regression test for #249: a menu row only reacted over its text, not across the whole row.
+#[test]
+fn menu_rows_are_selectable_across_the_full_width() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(600.0, 400.0));
+    let entries = vec![cmd_item("app.preferences", Value::Null)];
+    let mut tick = 0;
+    let mut frame = |app: &mut DesignApp, events: Vec<egui::Event>| {
+        tick += 1;
+        let mut row = egui::Rect::NOTHING;
+        let mut output =
+            ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(tick as f64 / 60.0), events, ..Default::default() }, |ui| {
+                egui::Area::new(egui::Id::unique("menu_rows")).fixed_pos(egui::pos2(50.0, 50.0)).show(ui.ctx(), |ui| {
+                    let before = ui.cursor().min;
+                    menu_column(app, ui, &[("Test", entries.clone())]);
+                    row = egui::Rect::from_min_max(before, ui.min_rect().max);
+                });
+            });
+        output.textures_delta.clear();
+        row
+    };
+    frame(&mut app, vec![]);
+    let row = frame(&mut app, vec![]);
+    assert!(row.width() >= 239.0, "the column is at least 240 wide: {row:?}");
+    let far = egui::pos2(row.right() - 6.0, row.top() + 8.0);
+    for pressed in [true, false] {
+        frame(
+            &mut app,
+            vec![
+                egui::Event::PointerMoved(far),
+                egui::Event::PointerButton { pos: far, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
+            ],
+        );
+    }
+    assert!(app.ui.dialog.is_some(), "clicking the empty end of the Preferences… row must choose it");
+}
+
+/// Quick Apply and the menu search list no unavailable docking command and no label twice
+/// among the UI commands.
+#[test]
+fn searched_ui_commands_are_available_and_named_once() {
+    let ui_ids: Vec<&str> = UI_COMMANDS.iter().map(|c| c.0).collect();
+    let searched: Vec<(&str, &str)> = quick_commands().filter(|c| ui_ids.contains(&c.0)).map(|c| (c.0, c.1)).collect();
+    assert!(!searched.iter().any(|c| matches!(c.0, "window.panel.window" | "window.workspace.lock" | "window.workspace")), "{searched:?}");
+    assert!(searched.iter().any(|c| c.0 == "window.collapseToIcons"), "Collapse to Icons is searched");
+    // Quick Apply runs an entry as `app.run(id, {})`, so each docking command it lists must
+    // work without params.
+    let docking = |id: &str| {
+        id.starts_with("window.panel")
+            || id.starts_with("window.workspace")
+            || id.starts_with("ui.dock")
+            || matches!(id, "window.floatPanel" | "window.dockPanel" | "window.collapseToIcons" | "window.resetWorkspace")
+    };
+    let failing: Vec<(&str, String)> = searched
+        .iter()
+        .filter(|c| docking(c.0))
+        .filter_map(|c| {
+            let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+            app.run(c.0, json!({})).err().map(|e| (c.0, e))
+        })
+        .collect();
+    assert!(failing.is_empty(), "searched docking commands that fail with {{}}: {failing:?}");
+    let mut labels: Vec<&str> = searched.iter().map(|c| c.1).collect();
+    labels.sort_unstable();
+    let before = labels.len();
+    labels.dedup();
+    assert_eq!(labels.len(), before, "a label twice: {searched:?}");
+}
+
+/// Keys a floating panel's own OS window left over run the main window's tool shortcuts,
+/// Escape and the active tool's keys.
+#[test]
+fn forwarded_keys_run_shortcuts() {
+    use egui::{Event, Key, Modifiers};
+    fn press(key: Key) -> Vec<Event> {
+        [true, false].map(|pressed| Event::Key { key, physical_key: Some(key), pressed, repeat: false, modifiers: Modifiers::NONE }).to_vec()
+    }
+    let ctx = egui::Context::default();
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.session.execute("file.new", &json!({})).unwrap();
+    let frame = app.session.execute("frame.create", &json!({"rect": [36, 36, 200, 200]})).unwrap();
+    app.session.execute("selection.set", &json!({"ids": [frame["id"]]})).unwrap();
+    forwarded_shortcuts(&mut app, &ctx, press(Key::P), Modifiers::NONE);
+    assert_ne!(app.session.tool_id(), "selection", "P picks a tool");
+    forwarded_shortcuts(&mut app, &ctx, press(Key::Escape), Modifiers::NONE);
+    assert_eq!(app.session.tool_id(), "selection", "Escape goes back to the Selection tool");
+    app.session.execute("selection.set", &json!({"ids": [frame["id"]]})).unwrap();
+    forwarded_shortcuts(&mut app, &ctx, press(Key::Delete), Modifiers::NONE);
+    assert!(app.session.active().unwrap().doc.item(designcraft_doc::ItemId(frame["id"].as_u64().unwrap())).is_none(), "Delete clears the selection");
+}
diff --git a/crates/ui-egui/src/menus/tree.rs b/crates/ui-egui/src/menus/tree.rs
new file mode 100644
index 000000000..b711b8376
--- /dev/null
+++ b/crates/ui-egui/src/menus/tree.rs
@@ -0,0 +1,289 @@
+use super::bar::menu_button;
+use super::invoke::activate;
+use super::state::{checked, menu_enabled, shortcut_label};
+use super::tables::{MENUS, WORKSPACES};
+use super::ui_commands::shown;
+use super::{DesignApp, Item, Value, cmd_item, json};
+
+pub(super) fn parse_entries(entries: &[&str]) -> Vec<Item> {
+    let mut out = Vec::new();
+    let mut i = 0;
+    while i < entries.len() {
+        let e = entries[i];
+        i += 1;
+        if e == "-" {
+            out.push(Item::Sep);
+        } else if let Some(name) = e.strip_prefix('>') {
+            // Find the matching `<` (submenus nest).
+            let start = i;
+            let mut depth = 1;
+            while i < entries.len() {
+                if entries[i].starts_with('>') {
+                    depth += 1;
+                } else if entries[i] == "<" {
+                    depth -= 1;
+                    if depth == 0 {
+                        break;
+                    }
+                }
+                i += 1;
+            }
+            let sub = parse_entries(&entries[start..i]);
+            i += 1;
+            out.push(Item::Sub(name.to_string(), sub));
+        } else if e == "ui:window.panel" {
+            let items = crate::dock::DOCK_TABS
+                .iter()
+                .chain(crate::dock::ICON_PANELS)
+                .map(|(id, label, _)| Item::Cmd { label: label.to_string(), id: "window.panel".into(), params: json!({"panel": id}), shortcut: None })
+                .collect();
+            out.push(Item::Sub("Panels".into(), items));
+        } else if e == "ui:window.workspace" {
+            // Shown as InDesign's "[Essentials]"; Reset names the current workspace (see `menu_items`).
+            let mut items: Vec<Item> = WORKSPACES
+                .iter()
+                .map(|w| Item::Cmd { label: w.to_string(), id: "window.workspace".into(), params: json!({"name": w}), shortcut: None })
+                .collect();
+            items.push(Item::Sep);
+            items.push(cmd_item("window.resetWorkspace", Value::Null));
+            items.push(cmd_item("window.newWorkspace", Value::Null));
+            out.push(Item::Sub("Workspace".into(), items));
+        } else if e == "ui:window.brightness" {
+            let items = crate::theme::Brightness::ALL
+                .iter()
+                .map(|b| Item::Cmd {
+                    label: b.label().to_string(),
+                    id: "window.brightness".into(),
+                    params: json!({"brightness": b.id()}),
+                    shortcut: None,
+                })
+                .collect();
+            out.push(Item::Sub("Interface Color Theme".into(), items));
+        } else {
+            let (_, id) = e.split_once(':').unwrap_or(("cmd", e));
+            // `id|Label|{params}`: a fixed-parameter variant of a command.
+            let mut parts = id.splitn(3, '|');
+            let id = parts.next().unwrap_or(id);
+            match (parts.next(), parts.next().and_then(|j| serde_json::from_str::<Value>(j).ok())) {
+                (Some(label), Some(params)) => {
+                    let mut it = cmd_item(id, params);
+                    if let Item::Cmd { label: l, .. } = &mut it {
+                        *l = label.to_string();
+                    }
+                    out.push(it);
+                }
+                _ => out.push(cmd_item(id, Value::Null)),
+            }
+        }
+    }
+    out
+}
+
+/// The whole menu tree (InDesign order).
+pub fn menu_tree() -> Vec<(&'static str, Vec<Item>)> {
+    MENUS.iter().map(|(m, e)| (*m, parse_entries(e))).collect()
+}
+
+/// A row of the macOS application menu (the menu named after the app).
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum AppMenuItem {
+    /// Runs `command` (no parameters); `id` is the native menu item id, `label` goes through `i18n::tr`.
+    Cmd {
+        id: &'static str,
+        label: &'static str,
+        command: &'static str,
+    },
+    Sep,
+    /// Interface language: a submenu with each UI language in its own name, the current one
+    /// checked (`app.language {lang}`).
+    Language,
+    Services,
+    Hide,
+    HideOthers,
+    ShowAll,
+}
+
+/// The macOS application menu. Settings… is `app.preferences`, which `native_menu_tree` leaves out of Edit.
+pub const MAC_APP_MENU: &[AppMenuItem] = &[
+    AppMenuItem::Cmd { id: "dc-about", label: "About DesignCraft", command: "help.about" },
+    AppMenuItem::Cmd { id: "dc-updates", label: "Check for Updates…", command: "help.checkForUpdates" },
+    AppMenuItem::Cmd { id: "dc-discord", label: "Join the ArtCraft Discord…", command: "help.discord" },
+    AppMenuItem::Sep,
+    AppMenuItem::Cmd { id: "dc-settings", label: "Settings…", command: "app.preferences" },
+    AppMenuItem::Language,
+    AppMenuItem::Sep,
+    AppMenuItem::Services,
+    AppMenuItem::Sep,
+    AppMenuItem::Hide,
+    AppMenuItem::HideOthers,
+    AppMenuItem::ShowAll,
+    AppMenuItem::Sep,
+    // Not the predefined Quit: it terminates the app at once, past the unsaved-changes prompt.
+    AppMenuItem::Cmd { id: "dc-quit", label: "Quit DesignCraft", command: "app.quit" },
+];
+
+/// A label as the macOS menu bar library takes it: it reads "&" as a mnemonic marker and drops
+/// it, and shows "&&" as one "&".
+pub fn native_label(label: &str) -> String {
+    label.replace('&', "&&")
+}
+
+/// The menu tree for the macOS menu bar: `menu_tree` without the commands `MAC_APP_MENU` holds,
+/// so each command (and its shortcut) appears once, and with the standard Window › Minimize (⌘M)
+/// at the top of the Window menu.
+pub fn native_menu_tree() -> Vec<(&'static str, Vec<Item>)> {
+    let in_app_menu = |id: &str| MAC_APP_MENU.iter().any(|m| matches!(m, AppMenuItem::Cmd { command, .. } if *command == id));
+    let mut tree = menu_tree();
+    for (title, entries) in &mut tree {
+        without_commands(entries, &in_app_menu);
+        if *title == "Window" {
+            let minimize = Item::Cmd { label: "Minimize".into(), id: "window.minimize".into(), params: Value::Null, shortcut: Some("Cmd+M") };
+            entries.splice(0..0, [minimize, Item::Sep]);
+        }
+    }
+    tree
+}
+
+/// Drops the parameterless commands `drop` matches from `entries` (recursively), then any separator
+/// the removal left at an end or next to another.
+fn without_commands(entries: &mut Vec<Item>, drop: &dyn Fn(&str) -> bool) {
+    let before = entries.len();
+    entries.retain(|e| !matches!(e, Item::Cmd { id, params, .. } if params.is_null() && drop(id)));
+    for e in entries.iter_mut() {
+        if let Item::Sub(_, children) = e {
+            without_commands(children, drop);
+        }
+    }
+    if entries.len() == before {
+        return;
+    }
+    let mut tidy: Vec<Item> = Vec::with_capacity(entries.len());
+    for e in entries.drain(..) {
+        if matches!(e, Item::Sep) && tidy.last().is_none_or(|l| matches!(l, Item::Sep)) {
+            continue;
+        }
+        tidy.push(e);
+    }
+    if matches!(tidy.last(), Some(Item::Sep)) {
+        tidy.pop();
+    }
+    *entries = tidy;
+}
+
+/// The key a menu item is hidden by (Edit › Menus).
+pub fn menu_key(menu: &str, label: &str) -> String {
+    format!("{menu}/{label}")
+}
+
+/// Draws a menu's items; returns how many were hidden.
+pub(super) fn menu_items(app: &mut DesignApp, ui: &mut egui::Ui, items: &[Item], path: &str) -> usize {
+    let mut hidden = 0;
+    for it in items {
+        match it {
+            Item::Sep => {
+                ui.separator();
+            }
+            Item::Sub(name, children) => {
+                let sub = format!("{path}/{name}");
+                let shown = crate::i18n::tr(&app.ui.language, name).to_owned();
+                menu_button(ui, crate::rtl::widget(ui, shown), |ui| {
+                    if sub == OPEN_RECENT {
+                        recent_menu_items(app, ui);
+                    }
+                    hidden += menu_items(app, ui, children, &sub);
+                });
+            }
+            Item::Cmd { id, .. } if !shown(app, id) => {}
+            Item::Cmd { label, .. } if !app.ui.show_full_menus && app.ui.hidden_menu_items.contains(&menu_key(path, label)) => hidden += 1,
+            Item::Cmd { label, id, params, shortcut: _ } => {
+                let lang = &app.ui.language;
+                let label = match id.as_str() {
+                    "window.workspace" => format!("[{}]", crate::i18n::workspace_name(lang, label)),
+                    "window.resetWorkspace" => format!("{} {}", crate::i18n::tr(lang, "Reset"), crate::i18n::workspace_name(lang, &app.ui.workspace)),
+                    _ => crate::i18n::tr(lang, label).to_owned(),
+                };
+                let text = match checked(app, id, params) {
+                    Some(true) => format!("✓ {label}"),
+                    Some(false) => format!("   {label}"),
+                    None => label.to_owned(),
+                };
+                let mut b = egui::Button::new(crate::rtl::widget(ui, text));
+                if let Some(sc) = shortcut_label(app, id, params) {
+                    b = b.shortcut_text(sc);
+                }
+                if ui.add_enabled(menu_enabled(app, id), b).clicked() {
+                    activate(app, id, params);
+                    ui.close();
+                }
+            }
+        }
+    }
+    hidden
+}
+
+/// The File › Open Recent submenu, whose files come before its fixed items.
+pub const OPEN_RECENT: &str = "File/Open Recent";
+
+/// A recent file's menu label: its file name.
+pub fn recent_label(path: &str) -> String {
+    std::path::Path::new(path).file_name().map_or_else(|| path.to_string(), |n| n.to_string_lossy().to_string())
+}
+
+/// File › Open Recent's files (`app.openRecent {index}`), then a separator; nothing when empty.
+pub fn recent_items(app: &DesignApp) -> Vec<Item> {
+    let mut out: Vec<Item> = app
+        .session
+        .prefs
+        .recent_files
+        .iter()
+        .enumerate()
+        .map(|(i, path)| Item::Cmd { label: recent_label(path), id: "app.openRecent".into(), params: json!({"index": i}), shortcut: None })
+        .collect();
+    if !out.is_empty() {
+        out.push(Item::Sep);
+    }
+    out
+}
+
+/// The recent files at the top of File › Open Recent: file names (not translated), the full path
+/// as tooltip, dimmed when the file is gone (choosing it then says so).
+fn recent_menu_items(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let dim = crate::theme::Tokens::get(ui.ctx()).text_dim;
+    for it in recent_items(app) {
+        match it {
+            Item::Cmd { label, id, params, .. } => {
+                let path = params["index"].as_u64().and_then(|i| app.session.prefs.recent_files.get(i as usize)).cloned().unwrap_or_default();
+                let mut text = egui::RichText::new(label);
+                if !crate::chrome::recent_file_stat(ui.ctx(), &path).exists {
+                    text = text.color(dim);
+                }
+                if ui.button(crate::rtl::widget(ui, text)).on_hover_text(&path).clicked() {
+                    activate(app, &id, &params);
+                    ui.close();
+                }
+            }
+            Item::Sep => {
+                ui.separator();
+            }
+            Item::Sub(..) => {}
+        }
+    }
+}
+
+/// Every menu item as (menu path, label), for Edit › Menus.
+pub fn all_menu_items() -> Vec<(String, String)> {
+    fn walk(items: &[Item], path: &str, out: &mut Vec<(String, String)>) {
+        for it in items {
+            match it {
+                Item::Sub(name, children) => walk(children, &format!("{path}/{name}"), out),
+                Item::Cmd { label, .. } => out.push((path.to_string(), label.clone())),
+                Item::Sep => {}
+            }
+        }
+    }
+    let mut out = Vec::new();
+    for (menu, entries) in menu_tree() {
+        walk(&entries, menu, &mut out);
+    }
+    out
+}
diff --git a/crates/ui-egui/src/menus/ui_commands.rs b/crates/ui-egui/src/menus/ui_commands.rs
new file mode 100644
index 000000000..649469f30
--- /dev/null
+++ b/crates/ui-egui/src/menus/ui_commands.rs
@@ -0,0 +1,395 @@
+use super::DesignApp;
+
+/// Menu and Quick Apply entries that only CJK typesetting uses: hidden unless
+/// [`crate::cjk_features`]. The commands still run from scripts, the control channel and MCP.
+pub const CJK_ONLY: &[&str] = &["type.tateChuYoko", "app.rubyDialog", "type.kenten", "type.warichu"];
+
+/// Whether command `id` has a menu item or Quick Apply entry in the current interface (CJK-only
+/// ones need [`crate::cjk_features`]).
+pub fn shown(app: &DesignApp, id: &str) -> bool {
+    !CJK_ONLY.contains(&id) || crate::cjk_features(app)
+}
+
+/// UI commands: (id, label, shortcut, params).
+pub const UI_COMMANDS: &[(&str, &str, Option<&str>, &str)] = &[
+    ("app.newDocumentDialog", "New Document…", Some("Cmd+N"), "{}"),
+    ("app.openDialog", "Open…", Some("Cmd+O"), "{path?} — without a path, choose the file in a dialog"),
+    ("app.openRecent", "Open Recent File", None, "{index} — file.openRecent, with an alert when the file can't be opened"),
+    ("app.placeDialog", "Place…", Some("Cmd+D"), "{path?} — without a path, choose the file in a dialog"),
+    ("app.saveDialog", "Save As…", Some("Cmd+Shift+S"), "{path?} — without a path, choose where in a dialog"),
+    ("app.save", "Save", Some("Cmd+S"), "{}"),
+    ("app.quit", "Quit DesignCraft", Some("Cmd+Q"), "{} — close the window; each document with unsaved changes asks first"),
+    ("app.saveCopyDialog", "Save a Copy…", Some("Cmd+Alt+S"), "{path?} — choose where to write a copy (the document stays as it is)"),
+    ("app.loadSwatches", "Load Swatches…", None, "{path?} — pick a swatch exchange (.ase) file"),
+    (
+        "app.loadParagraphStyles",
+        "Load Paragraph Styles…",
+        None,
+        "{} — pick a document (.designcraft or .idml) and choose which of its paragraph styles to load (style.load)",
+    ),
+    ("app.loadCharacterStyles", "Load Character Styles…", None, "{} — the same for its character styles"),
+    ("app.loadTextStyles", "Load All Text Styles…", None, "{} — the same for its paragraph and character styles"),
+    (
+        "effects.dialog",
+        "Effects…",
+        None,
+        "{page?: transparency|dropShadow|innerShadow|outerGlow|innerGlow|bevel|satin|feather|directionalFeather|gradientFeather} — the Effects dialog for the selected objects",
+    ),
+    ("app.packageDialog", "Package…", Some("Cmd+Alt+Shift+P"), "{dir?} — choose the package folder to create (file.package)"),
+    ("app.saveSwatches", "Save Swatches for Exchange…", None, "{path?} — write the colour swatches as .ase"),
+    ("app.exportPng", "Export Page as PNG…", Some("Cmd+E"), "{}"),
+    ("app.exportIdml", "Export IDML…", None, "{path?} — InDesign Markup (IDML) package"),
+    (
+        "app.exportEpub",
+        "Export EPUB…",
+        None,
+        "{path?} — reflowable EPUB 3 (with the first page as its cover); without a path, EPUB Export Options (Split Document) and then the save dialog",
+    ),
+    (
+        "app.exportInteractivePdf",
+        "Export PDF (Interactive)…",
+        None,
+        "{path?, fullScreen?, advanceSeconds?} — single pages fitted, bookmarks panel open, buttons, forms, transitions",
+    ),
+    ("app.exportFixedEpub", "Export EPUB (Fixed Layout)…", None, "{path?} — pre-paginated EPUB 3"),
+    ("app.exportHtml", "Export HTML…", None, "{path?} — one self-contained web page"),
+    ("app.exportPptx", "Export PowerPoint…", None, "{path?} — every page as a slide of editable shapes, pictures and text"),
+    ("app.exportXml", "Export XML…", None, "{path?} — the tagged content"),
+    ("app.printBooklet", "Print Booklet…", None, "{path?} — saddle-stitched printer spreads as PDF"),
+    ("app.qrCode", "Generate QR Code…", None, "{} — the QR Code dialog (object.qrCode does the work)"),
+    ("app.userDictionary", "User Dictionary…", None, "{} — hyphenation exceptions (hyphenation.* commands)"),
+    ("app.fittingOptions", "Frame Fitting Options…", None, "{} — the dialog for object.fittingOptions"),
+    ("app.menus", "Menus…", None, "{} — show or hide menu items"),
+    ("window.hideMenuItem", "Hide Menu Item", None, "{item: \"Menu/Label\", hidden?: bool}"),
+    ("edit.dynamicSpelling", "Dynamic Spelling", None, "{on?: bool} — underline misspelled words on the canvas"),
+    (
+        "app.language",
+        "Interface Language",
+        None,
+        "{lang?: \"\"|de|fr|es|ja|zh|ar|pt-br|it|uk|ru|cs|pl|ka} — menus and panel names (the macOS menu bar follows at once); without lang, opens Preferences, where it is the first setting",
+    ),
+    (
+        "app.flattener",
+        "Transparency Flattener Presets",
+        None,
+        "{preset: \"\"|high|medium|low} — PDF export rasterises spreads with transparency at 300 / 150 / 72 ppi",
+    ),
+    ("app.graphicCell", "Convert Cell to Graphic Cell…", None, "{path?} — pick an image for the target table cell"),
+    ("app.placeAndLink", "Place and Link", None, "{} — a linked copy of the selected frame's story, beside it"),
+    ("app.placeWithOptions", "Place with Import Options…", Some("Cmd+Shift+D"), "{path?} — Word/RTF style mapping before placing"),
+    ("app.exportText", "Export Text…", None, "{path?} — the story being edited, as Text Only (.txt) or Rich Text Format (.rtf)"),
+    ("app.exportPdf", "Export PDF…", None, "{path?, …file.exportPdf options} — asks for a path when none is given"),
+    ("app.palette", "Quick Apply…", Some("Cmd+Return"), "{} — search styles and commands"),
+    ("app.preferences", "Preferences…", Some("Cmd+K"), "{}"),
+    ("window.uiScale", "UI Scaling", None, "{scale: 0.5–3 (1 = 100%)} — the size of the whole interface"),
+    (
+        "app.keyboardShortcuts",
+        "Keyboard Shortcuts…",
+        None,
+        "{command?, params?} — view and change the shortcut of any command, and the shortcut sets; with command, the dialog opens on it",
+    ),
+    (
+        "window.shortcutSets",
+        "Shortcut Sets",
+        None,
+        "{select?: name} — the shortcut sets (Default is built in; Edit › Keyboard Shortcuts makes the others); select makes one active → {active, sets, builtIn}",
+    ),
+    ("window.richBlack", "Appearance of Black", None, "{on: bool} — show 100% black as rich black on screen (off: accurately)"),
+    (
+        "window.setShortcut",
+        "Set Shortcut",
+        None,
+        "{id, params?, shortcut: \"Cmd+Alt+J\" | \"\" (none) | null (default), steal?} — id is a command; a panel is id \"window.panel\" with params {panel: \"layers\"}, a tool is id \"tool.select\" with params {tool: \"pen\"} (or its tool id, \"pen\"); steal: true takes the keys from the commands holding them → {shortcut, conflicts: [command keys: ids, or `window.panel {\"panel\":\"layers\"}`]}",
+    ),
+    ("window.resetShortcuts", "Reset Shortcuts", None, "{} — every command of the active shortcut set back to its default shortcut"),
+    (
+        "window.importShortcuts",
+        "Import InDesign Shortcut Set",
+        None,
+        "{path | text} — a set saved by InDesign's Show Set (.txt), imported as a new shortcut set, which becomes active: matched commands, panels (Window menu items) and tools (Tools items) take its Default shortcuts (an item without Default keys takes its Text keys), or none when every item matched to them has none; other commands lose keys it takes unless they share them as defaults → {set, imported, changed [{id, label, item, line, from, to}], conflictsCleared [{id, label, shortcut}], skipped [{id, item, line, shortcut, takenBy, reason}] (an earlier item whose keys a later one took, or a reserved key), failed [{id, label, change, shortcuts}], unmatched [{item, line, keys, reason: noMatch | ambiguous | tool | context}], unmatchedWithoutShortcut, unreadable [{item, line, keys, reason}], approximated [{item, line, keys, note}] (numeric keypad keys bound as the main keys), suggestions [{item, line, candidates}] (never applied), matchedWithoutChange [{id, label, item, line, reason}] (a keyless panel-menu item that clears nothing), truncated, shortcutSet (the new set's name)}; ids are command keys (`window.panel {\"panel\":\"layers\"}`)",
+    ),
+    ("app.findChange", "Find/Change…", Some("Cmd+F"), "{}"),
+    ("app.insertTableDialog", "Create Table…", None, "{} — Insert Table dialog (body/header/footer rows, columns)"),
+    (
+        "app.cellOptionsDialog",
+        "Strokes and Fills…",
+        None,
+        "{} — Cell Options › Strokes and Fills of the target cells: edge proxy, stroke weight, type, colour, tint, gap colour, gap tint, and cell fill (table.setCell)",
+    ),
+    ("app.footnoteOptionsDialog", "Document Footnote Options…", None, "{} — numbering, formatting and layout of footnotes"),
+    ("app.rubyDialog", "Ruby…", None, "{} — the reading set over the selected text"),
+    (
+        "app.paragraphRulesDialog",
+        "Paragraph Rules…",
+        None,
+        "{rule?: ruleAbove|ruleBelow} — Rule Above / Rule Below of the selected paragraphs (type.para)",
+    ),
+    (
+        "app.paragraphBordersDialog",
+        "Paragraph Borders and Shading…",
+        None,
+        "{tab?: border|shading} — border and shading of the selected paragraphs (type.para)",
+    ),
+    ("app.spanColumnsDialog", "Span Columns…", None, "{} — span or split columns of the selected paragraphs (type.para)"),
+    ("app.keepOptionsDialog", "Keep Options…", None, "{} — Keep with Next and Keep Lines Together of the selected paragraphs (type.para)"),
+    (
+        "app.nestedStylesDialog",
+        "Drop Caps and Nested Styles…",
+        None,
+        "{} — drop cap, nested styles and nested line styles of the selected paragraphs (type.para)",
+    ),
+    ("app.grepStylesDialog", "GREP Styles…", None, "{} — GREP styles of the selected paragraphs (type.para)"),
+    ("app.bulletsNumberingDialog", "Bullets and Numbering…", None, "{} — bullets or numbers of the selected paragraphs (type.para)"),
+    (
+        "app.hyphenationDialog",
+        "Hyphenation…",
+        None,
+        "{} — Hyphenation Settings of the selected paragraphs (type.para): limits, zone, Better Spacing ↔ Fewer Hyphens, Preview",
+    ),
+    (
+        "app.justificationDialog",
+        "Justification…",
+        Some("Cmd+Alt+Shift+J"),
+        "{} — word and letter spacing, glyph scaling and composer of the selected paragraphs (type.para)",
+    ),
+    ("app.findFontDialog", "Find/Replace Font…", None, "{} — fonts used (missing ones flagged) and replacing them"),
+    ("app.insertXrefDialog", "Insert Cross-Reference…", None, "{} — New Cross-Reference dialog (paragraph or text anchor, format)"),
+    ("app.deleteAllGuides", "Delete All Guides on Spread", None, "{} — the spread in view"),
+    ("app.deletePage", "Delete Page", None, "{} — deletes the page in view"),
+    ("app.duplicateSpread", "Duplicate Spread", None, "{} — duplicates the spread in view (pages and items)"),
+    ("app.tablePanel", "Table Panel", Some("Shift+F9"), "{}"),
+    ("app.tabsPanel", "Tabs", Some("Cmd+Shift+T"), "{} — show or hide the Tabs panel (it opens above the selected text frame)"),
+    ("app.characterPanel", "Character", Some("Cmd+T"), "{} — the Character panel"),
+    ("app.paragraphPanel", "Paragraph", Some("Cmd+Alt+T"), "{} — the Paragraph panel"),
+    ("app.glyphsPanel", "Glyphs", Some("Alt+Shift+F11"), "{} — the Glyphs panel"),
+    ("app.characterStylesPanel", "Character Styles", Some("Cmd+Shift+F11"), "{} — the Character Styles panel"),
+    ("app.paragraphStylesPanel", "Paragraph Styles", Some("Cmd+F11"), "{} — the Paragraph Styles panel"),
+    ("app.insertCurrentPageNumber", "Current Page Number", Some("Cmd+Alt+Shift+N"), "{} — the Current Page Number marker at the insertion point"),
+    ("app.storyEditor", "Edit in Story Editor", Some("Cmd+Y"), "{story?}"),
+    ("view.zoomIn", "Zoom In", Some("Cmd+="), "{}"),
+    ("view.zoomOut", "Zoom Out", Some("Cmd+-"), "{}"),
+    ("view.fitPage", "Fit Page in Window", Some("Cmd+0"), "{}"),
+    ("view.fitSelection", "Fit Selection in Window", Some("Cmd+Alt+="), "{}"),
+    ("view.fitSpread", "Fit Spread in Window", Some("Cmd+Alt+0"), "{}"),
+    ("view.actualSize", "Actual Size", Some("Cmd+1"), "{}"),
+    ("view.entirePasteboard", "Entire Pasteboard", Some("Cmd+Alt+Shift+0"), "{}"),
+    ("view.zoom", "Zoom To", None, "{zoom: 1.0 = 100%}"),
+    ("view.screenMode", "Screen Mode", None, "{mode: normal|preview|bleed|slug|presentation}"),
+    ("view.togglePreview", "Toggle Normal/Preview", Some("W"), "{}"),
+    (
+        "view.togglePresentation",
+        "Toggle Presentation",
+        Some("Shift+W"),
+        "{} — enters Presentation, or returns to the mode it was entered from; Esc also leaves it",
+    ),
+    (
+        "app.formattingAffectsText",
+        "Formatting Affects Text",
+        Some("J"),
+        "{on?: bool} — with text frames selected, colours go to their text (on) or the frames (off); toggles without `on`",
+    ),
+    (
+        "color.defaultFillStroke",
+        "Default Fill and Stroke",
+        Some("D"),
+        "{} — the selection gets no fill and a black stroke (object.defaultFillStroke); text colour edits (Formatting Affects Text) get a black fill and no stroke",
+    ),
+    (
+        "color.swapFillStroke",
+        "Swap Fill and Stroke",
+        Some("Shift+X"),
+        "{} — each selected object's fill and stroke colours (and tints) trade places (object.swapFillStroke), or the text's with Formatting Affects Text",
+    ),
+    ("color.toggleFillStroke", "Toggle Fill and Stroke", Some("X"), "{} → {strokeFront} — which of fill and stroke the proxy has in front"),
+    (
+        "color.applyNone",
+        "Apply None",
+        Some("/"),
+        "{} — [None] for the fill or stroke in front of the proxy, of the objects or the text (Formatting Affects Text)",
+    ),
+    ("color.applyColor", "Apply Color", Some(","), "{} — the colour applied last ([Black] at first) to the fill or stroke in front of the proxy"),
+    (
+        "color.applyGradient",
+        "Apply Gradient",
+        Some("."),
+        "{} — the gradient applied last (else the document's first, else white to black) to the fill or stroke in front of the proxy",
+    ),
+    ("view.frameEdges", "Show/Hide Frame Edges", Some("Cmd+H"), "{}"),
+    ("view.rulers", "Show/Hide Rulers", Some("Cmd+R"), "{}"),
+    ("view.guides", "Show/Hide Guides", Some("Cmd+;"), "{}"),
+    ("view.lockGuides", "Lock Guides", Some("Cmd+Alt+;"), "{on?: bool} — ruler guides can't be dragged; toggles without `on`"),
+    ("view.snapToGuides", "Snap to Guides", Some("Cmd+Shift+;"), "{}"),
+    ("view.snapToDocumentGrid", "Snap to Document Grid", None, "{}"),
+    ("view.smartGuides", "Smart Guides", None, "{}"),
+    (
+        "view.snapPreferences",
+        "Smart Guide Options",
+        None,
+        "{alignEdges?, alignCenters?, smartDimensions?, smartSpacing?: bool, zone?: px} — what smart guides snap to and how close; returns the current values",
+    ),
+    ("view.baselineGrid", "Show/Hide Baseline Grid", Some("Cmd+Alt+'"), "{}"),
+    ("view.documentGrid", "Show/Hide Document Grid", Some("Cmd+'"), "{}"),
+    ("view.textThreads", "Show/Hide Text Threads", Some("Cmd+Alt+Y"), "{}"),
+    ("view.hiddenCharacters", "Show Hidden Characters", Some("Cmd+Alt+I"), "{}"),
+    ("view.taggedFrames", "Show/Hide Tagged Frames", None, "{} — XML-tagged frames outlined in their tag colour"),
+    (
+        "view.storyEditorDepthRuler",
+        "Show/Hide Depth Ruler",
+        None,
+        "{} — the Story Editor's vertical ruler of how deep the text reaches in its frames",
+    ),
+    ("window.hidePanels", "Show/Hide Panels", Some("Tab"), "{} — every panel, the Tools panel included"),
+    ("window.hidePanelsExceptTools", "Show/Hide Panels Except Tools", Some("Shift+Tab"), "{}"),
+    ("window.nextDocument", "Next Document", Some("Cmd+F6"), "{}"),
+    ("window.previousDocument", "Previous Document", Some("Cmd+Shift+F6"), "{}"),
+    ("app.layerOptions", "Object Layer Options…", None, "{} — show or hide the layers of the selected placed PDF"),
+    (
+        "app.layerOptionsDialog",
+        "Layer Options…",
+        None,
+        "{id?} (default: the active layer) — name, colour, show, lock, print, guides, text wrap (layer.set)",
+    ),
+    ("app.swatchOptionsDialog", "Swatch Options…", None, "{name} — name, colour type, mode and values, tint (swatch.options)"),
+    ("app.colorGroupOptionsDialog", "Color Group Options…", None, "{name} — rename a colour group (swatch.renameColorGroup)"),
+    ("view.tagMarkers", "Show Tag Markers", None, "{on?: bool} — brackets around inline-tagged text"),
+    ("view.flattenerPreview", "Flattener Preview", None, "{on?: bool} — highlight objects that involve transparency"),
+    ("view.rotateSpread", "Rotate Spread", None, "{angle: 90 (clockwise) | -90 | 180 | 0 (clear)} — turn the view in quarter turns"),
+    ("view.proofColors", "Proof Colors", None, "{on?: bool} — simulate the proof target on screen"),
+    (
+        "view.proofSetup",
+        "Proof Setup",
+        None,
+        "{target?: workingCmyk|srgb|legacyMacRgb|monitorRgb|protanopia|deuteranopia|cmyk:<profile>, intent?, simulatePaper?: bool|\"toggle\"}",
+    ),
+    ("app.colorSettings", "Color Settings…", None, "{} — the working spaces, intent and black-point compensation"),
+    (
+        "view.separations",
+        "Separations Preview",
+        None,
+        "{on?: bool, plate?: all|cyan|magenta|yellow|black|spot ink name|null (null: all inks, and off unless an ink limit stays), inkLimit?: percent|null} — the plates of the PDF Export PDF writes → {on, plate, inkLimit, spread, inks: [{name, spot}], dpi, warning?, error?}",
+    ),
+    ("view.overprintPreview", "Overprint Preview", Some("Cmd+Alt+Shift+Y"), "{} — show how overprinting inks mix"),
+    ("view.fastDisplay", "Fast Display", Some("Cmd+Alt+Shift+Z"), "{} — placed graphics as grey boxes, no effects"),
+    ("view.typicalDisplay", "Typical Display", Some("Cmd+Alt+Z"), "{} — low-resolution image proxies"),
+    ("view.highQualityDisplay", "High Quality Display", Some("Cmd+Alt+H"), "{} — full-resolution images"),
+    ("view.firstPage", "First Page", Some("Cmd+Shift+PageUp"), "{} — scroll to the document's first page (zoom kept)"),
+    ("view.previousPage", "Previous Page", Some("Shift+PageUp"), "{} — scroll to the page before the one in view"),
+    ("view.nextPage", "Next Page", Some("Shift+PageDown"), "{} — scroll to the page after the one in view"),
+    ("view.lastPage", "Last Page", Some("Cmd+Shift+PageDown"), "{} — scroll to the document's last page"),
+    ("view.nextSpread", "Next Spread", Some("Alt+PageDown"), "{} — centre the spread after the one in view"),
+    ("view.previousSpread", "Previous Spread", Some("Alt+PageUp"), "{} — centre the spread before the one in view"),
+    ("view.goToPage", "Go to Page…", Some("Cmd+J"), "{page: number (position) | \"name\" (section page name, or \"+n\" for a position)}"),
+    ("view.goBack", "Go Back", Some("Cmd+PageUp"), "{} — show the page viewed before this one in the window"),
+    ("view.goForward", "Go Forward", Some("Cmd+PageDown"), "{} — show the page viewed after this one (after Go Back)"),
+    (
+        "window.panel",
+        "Show Panel",
+        None,
+        "{panel: properties|pages|layers|swatches|paragraphStyles|characterStyles|stroke|character|paragraph|textWrap|links|table|preflight}",
+    ),
+    ("window.floatPanel", "Float Panel", None, "{panel, x?, y?, width?, height?} — the panel in its own floating window (window.panel.float)"),
+    (
+        "window.panel.layout",
+        "Change Panel Layout",
+        None,
+        "{action} — serialized docking action, including floating geometry, divider sizes and accordion state",
+    ),
+    (
+        "window.panel.move",
+        "Move Panel",
+        None,
+        "{panel, anchor, zone?: tab|center|left|right|top|bottom|above|below, before?: panel|null, group?, placement?} — group, split or reorder a panel (group: its whole tab group)",
+    ),
+    (
+        "window.panel.float",
+        "Float Panel",
+        None,
+        "{panel, x?, y?, width?, height?, group?, column?} — detach a panel (or its group, or its dock column) into a floating window",
+    ),
+    (
+        "window.panel.dock",
+        "Dock Panel",
+        None,
+        "{panel, anchor?, zone?, before?, group?, column?, side?: Start|End} — dock a floating panel: beside anchor, in a new column at side, or back where it floated from",
+    ),
+    ("window.panel.activate", "Activate Panel", None, "{panel} — show and select a panel in its current group"),
+    ("window.panel.close", "Close Panel", None, "{panel} — hide a panel"),
+    ("window.panel.closeGroup", "Close Tab Group", None, "{panel} — hide the panel and the panels tabbed with it"),
+    ("window.panel.closeOthers", "Close Other Panels in Group", None, "{panel} — hide the panels tabbed with it"),
+    ("window.panel.minimize", "Minimize", None, "{panel, minimized?} — minimize the panel's group to its tab strip (toggles without minimized)"),
+    ("window.panel.iconic", "Collapse to Icons", None, "{panel, iconic?} — collapse the panel's dock column to icons (toggles without iconic)"),
+    (
+        "window.panel.window",
+        "Move Panel to New Window",
+        None,
+        "{panel, native?} — not available: a floating panel has its own window on the desktop and stays in the page on the web",
+    ),
+    ("window.workspace.new", "New Workspace", None, "{name} — save the current workspace (window.newWorkspace)"),
+    ("window.workspace.delete", "Delete Workspace", None, "{name} — delete a saved workspace (window.deleteWorkspace)"),
+    ("window.workspace.reset", "Reset Workspace", None, "{} — back to the current workspace as saved (window.resetWorkspace)"),
+    ("window.workspace.lock", "Lock Workspace", None, "{locked?} — not available in DesignCraft"),
+    (
+        "ui.dock",
+        "Change Panel Layout",
+        None,
+        "{action} | {operation: open|close|activate|float|moveFloating|move|setStackOpen|resizeStack|resizeSplit, …} — craft-ui's shared ui.dock shape",
+    ),
+    ("ui.dock.reset", "Reset Workspace", None, "{} — window.workspace.reset"),
+    ("window.collapseToIcons", "Collapse to Icons", None, "{} — the panel dock shrinks to its column of icons"),
+    ("window.dockPanel", "Dock Panel", None, "{panel} — back to its place in the dock (window.panel.dock)"),
+    ("window.controlBar", "Control", Some("Cmd+Alt+6"), "{}"),
+    // Object › Fitting with InDesign's shortcuts (one `object.fit` mode each).
+    ("fit.fillFrameProportionally", "Fill Frame Proportionally", Some("Cmd+Alt+Shift+C"), "{} — object.fit {mode: fillProportionally}"),
+    ("fit.contentProportionally", "Fit Content Proportionally", Some("Cmd+Alt+Shift+E"), "{} — object.fit {mode: fitProportionally}"),
+    ("fit.frameToContent", "Fit Frame to Content", Some("Cmd+Alt+C"), "{} — object.fit {mode: fitFrameToContent}"),
+    ("fit.contentToFrame", "Fit Content to Frame", Some("Cmd+Alt+E"), "{} — object.fit {mode: fitContentToFrame}"),
+    ("fit.centerContent", "Center Content", Some("Cmd+Shift+E"), "{} — object.fit {mode: centerContent}"),
+    ("window.split", "Split Window", None, "{on?: bool} — two views of the document side by side, each with its own zoom and scroll"),
+    ("window.newWindow", "New Window", None, "{on?: bool} — another view of the active document in its own window"),
+    ("window.minimize", "Minimize Window", None, "{} — minimize the desktop window"),
+    ("window.maximize", "Maximize/Restore Window", None, "{on?: bool} — toggle maximization when omitted"),
+    ("window.close", "Close Window", None, "{} — request that the desktop window close"),
+    ("window.drag", "Move Window", None, "{} — begin a native window drag while the primary mouse button is held"),
+    ("window.resize", "Resize Window", None, "{edge: north|south|east|west|northEast|southEast|northWest|southWest} — begin a native edge drag"),
+    ("window.taskBar", "Contextual Task Bar", None, "{}"),
+    (
+        "window.taskBarPin",
+        "Pin Bar Position",
+        None,
+        "{on?: bool, at?: [x, y] (points from the canvas's top-left)} — the Contextual Task Bar stays where it is (or at `at`) instead of following the selection; with neither, toggles",
+    ),
+    ("window.taskBarReset", "Reset Bar Position", None, "{} — the Contextual Task Bar follows the selection again, under it"),
+    ("help.discord", "Join the ArtCraft Discord…", None, "{} — opens https://discord.gg/artcraft in the browser"),
+    ("help.appPage", "DesignCraft Website…", None, "{} — opens https://getartcraft.com/apps/designcraft"),
+    ("help.github", "DesignCraft on GitHub…", None, "{} — opens https://github.com/storytold/designcraft"),
+    ("help.issues", "Report an Issue…", None, "{} — opens the GitHub issue tracker"),
+    ("help.website", "ArtCraft Website…", None, "{} — opens https://getartcraft.com"),
+    ("help.app", "ArtCraft App Page…", None, "{app} — opens https://getartcraft.com/apps/{app} (e.g. photocraft)"),
+    (
+        "help.about",
+        "About DesignCraft",
+        None,
+        "{open?: true, tab?: \"about\"|\"contributors\"|\"models\"} — the About window: splash with community links, contributor and model credits (open: false closes it)",
+    ),
+    ("help.checkForUpdates", "Check for Updates…", None, "{} — checks for newer releases and offers to update"),
+    ("window.toolsDoubleColumn", "Tools: Double Column", None, "{}"),
+    (
+        "window.workspace",
+        "Workspace",
+        None,
+        "{name: Advanced|Book|Digital Publishing|Essentials|Essentials Classic|Interactive for PDF|Printing and Proofing|Typography or a saved workspace}",
+    ),
+    (
+        "window.newWorkspace",
+        "New Workspace…",
+        None,
+        "{name, panelLocations?: bool (default true: the bars and panels), menuCustomization?: bool (default true: the menu items hidden with Edit › Menus)} — saves the workspace",
+    ),
+    ("window.deleteWorkspace", "Delete Workspace…", None, "{name}"),
+    ("window.resetWorkspace", "Reset Workspace", None, "{} — back to the current workspace as saved (or its defaults)"),
+    ("window.brightness", "Interface Color Theme", None, "{brightness: dark|mediumDark|mediumLight|light|highContrast}"),
+];
+
+pub fn ui_label(id: &str) -> Option<(&'static str, Option<&'static str>)> {
+    UI_COMMANDS.iter().find(|c| c.0 == id).map(|c| (c.1, c.2))
+}
diff --git a/crates/ui-egui/src/new_document.rs b/crates/ui-egui/src/new_document.rs
index ee59de800..08b1a3e69 100644
--- a/crates/ui-egui/src/new_document.rs
+++ b/crates/ui-egui/src/new_document.rs
@@ -278,11 +278,13 @@ pub(crate) fn end_stale_preview(app: &mut DesignApp) {
     }
 }
 
-/// Drop the views (one per pane) of a preview document that has gone.
+/// Drop the views and page histories (one per pane) of a preview document that has gone.
 fn forget_view(app: &mut DesignApp, uid: Option<u64>) {
     if let Some(uid) = uid.filter(|uid| app.session.documents().iter().all(|d| d.uid != *uid)) {
         app.views.remove(&uid);
         app.views.remove(&(uid ^ (1 << 63)));
+        app.page_history.remove(&uid);
+        app.page_history.remove(&(uid ^ (1 << 63)));
     }
 }
 
@@ -409,7 +411,7 @@ fn card(ui: &mut Ui, c: &Card, units: Unit, selected: bool) -> egui::Response {
         FontId::proportional(11.0),
         t.text_dim,
     );
-    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, selected, &c.label));
+    resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, selected, &c.label));
     resp
 }
 
@@ -455,7 +457,7 @@ fn tabs(app: &DesignApp, ui: &mut Ui, d: &mut Dialog) {
                     select(d, &c);
                 }
             }
-            resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, on, text));
+            resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, on, text));
         }
         ui.min_rect()
     });
@@ -567,7 +569,7 @@ fn spin(ui: &mut Ui, d: &mut Dialog, key: &str, width: f32, step: Step) -> bool
     for (dir, half) in
         [(1.0, Rect::from_min_max(seg.min, pos2(seg.max.x, seg.center().y))), (-1.0, Rect::from_min_max(pos2(seg.min.x, seg.center().y), seg.max))]
     {
-        let resp = ui.interact(half, ui.id().with((key, dir < 0.0)), Sense::click());
+        let resp = ui.interact(half, ui.scope_id().with((key, dir < 0.0)), Sense::click());
         if resp.hovered() {
             ui.painter().rect_filled(half.shrink(1.0), 1.0, t.hover);
         }
@@ -587,11 +589,10 @@ fn spin(ui: &mut Ui, d: &mut Dialog, key: &str, width: f32, step: Step) -> bool
     let mut child = ui.new_child(egui::UiBuilder::new().max_rect(text_rect).layout(Layout::left_to_right(Align::Center)));
     let resp = child.add(
         egui::TextEdit::singleline(&mut s)
-            .id(ui.id().with((key, "text")))
+            .id(ui.scope_id().with((key, "text")))
             .frame(egui::Frame::NONE)
             .desired_width(text_rect.width())
-            .horizontal_align(Align::Min)
-            .vertical_align(Align::Center),
+            .align(egui::Align2::LEFT_CENTER),
     );
     if resp.changed() {
         d.fields.insert(key.into(), Value::String(s));
@@ -734,19 +735,19 @@ fn details(app: &mut DesignApp, ui: &mut Ui, d: &mut Dialog) {
         let mut name = d.s("name");
         let hint = app.session.next_untitled_title();
         let resp = ui.add(egui::TextEdit::singleline(&mut name).hint_text(hint).desired_width(2.0 * COLUMN_W - 10.0).font(semibold(13.0)));
-        resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::TextEdit, true, tr("Document Name")));
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::TextInput, true, tr("Document Name")));
         if resp.changed() {
             d.fields.insert("name".into(), json!(name));
         }
         let save = crate::widgets::icon_toggle_sized(ui, "preset-save", false, tr("Save Document Preset"), vec2(30.0, 26.0));
-        save.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tr("Save Document Preset")));
+        save.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, tr("Save Document Preset")));
         // It holds a text field: clicks inside it don't close it.
         egui::Popup::menu(&save).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
             ui.set_min_width(220.0);
             crate::rtl::label(ui, tr("Save Document Preset As:"));
             let mut preset = d.s("presetName");
             let field = ui.add(egui::TextEdit::singleline(&mut preset).hint_text(tr("Custom")).desired_width(200.0));
-            field.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::TextEdit, true, tr("Preset Name")));
+            field.widget_info(|| egui::WidgetInfo::labeled(egui::Role::TextInput, true, tr("Preset Name")));
             // Type the name as soon as the popup opens.
             if save.clicked() {
                 field.request_focus();
@@ -770,14 +771,17 @@ fn details(app: &mut DesignApp, ui: &mut Ui, d: &mut Dialog) {
     row(ui, rtl, |ui| {
         cell(ui, rtl, tr("Width"), |ui| spin(ui, d, "width", COLUMN_W - 8.0, Step::Measure(1.0)));
         cell(ui, rtl, tr("Units"), |ui| {
-            egui::ComboBox::from_id_salt("nd_units").selected_text(crate::rtl::widget(ui, tr(u.label()))).width(COLUMN_W - 8.0).show_ui(ui, |ui| {
-                // InDesign's eight; a preset in another unit keeps it on the list.
-                for v in NEW_DOCUMENT_UNITS.into_iter().chain((!NEW_DOCUMENT_UNITS.contains(&u)).then_some(u)) {
-                    if ui.selectable_label(v == u, crate::rtl::widget(ui, tr(v.label()))).clicked() && v != u {
-                        set_units(d, v);
+            craft_ui::ComboBox::from_id_salt("nd_units").selected_text(crate::rtl::widget(ui, tr(u.label()))).width(COLUMN_W - 8.0).show_ui(
+                ui,
+                |ui| {
+                    // InDesign's eight; a preset in another unit keeps it on the list.
+                    for v in NEW_DOCUMENT_UNITS.into_iter().chain((!NEW_DOCUMENT_UNITS.contains(&u)).then_some(u)) {
+                        if ui.selectable_label(v == u, crate::rtl::widget(ui, tr(v.label()))).clicked() && v != u {
+                            set_units(d, v);
+                        }
                     }
-                }
-            });
+                },
+            );
         });
     });
     row(ui, rtl, |ui| {
@@ -874,409 +878,4 @@ pub(crate) fn body(app: &mut DesignApp, ui: &mut Ui, d: &mut Dialog, width: f32,
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn app() -> DesignApp {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("app.newDocumentDialog", json!({})).unwrap();
-        app
-    }
-
-    fn context() -> egui::Context {
-        let ctx = egui::Context::default();
-        crate::theme::install_fonts(&ctx, "");
-        crate::theme::apply(&ctx, &Tokens::for_brightness(crate::theme::Brightness::default()));
-        ctx
-    }
-
-    /// One frame of the open dialog → the painted texts and where.
-    fn frame(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>) -> Vec<(String, Rect)> {
-        frame_after(app, ctx, events, 1.0 / 60.0)
-    }
-
-    /// One frame `dt` seconds after the last.
-    fn frame_after(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>, dt: f64) -> Vec<(String, Rect)> {
-        let raw = egui::RawInput {
-            screen_rect: Some(Rect::from_min_size(egui::Pos2::ZERO, vec2(1440.0, 900.0))),
-            time: Some(ctx.input(|i| i.time) + dt),
-            events,
-            ..Default::default()
-        };
-        let mut out = ctx.run_ui(raw, |ui| crate::dialogs::show(app, ui.ctx()));
-        out.textures_delta.clear();
-        fn collect(shape: &egui::Shape, texts: &mut Vec<(String, Rect)>) {
-            match shape {
-                egui::Shape::Text(t) => texts.push((t.galley.job.text.clone(), t.visual_bounding_rect())),
-                egui::Shape::Vec(v) => v.iter().for_each(|s| collect(s, texts)),
-                _ => {}
-            }
-        }
-        let mut texts = Vec::new();
-        out.shapes.iter().for_each(|s| collect(&s.shape, &mut texts));
-        texts
-    }
-
-    fn settle(app: &mut DesignApp, ctx: &egui::Context) -> Vec<(String, Rect)> {
-        for _ in 0..3 {
-            frame(app, ctx, vec![]);
-        }
-        frame(app, ctx, vec![])
-    }
-
-    fn click(app: &mut DesignApp, ctx: &egui::Context, pos: egui::Pos2, times: usize) {
-        frame(app, ctx, vec![egui::Event::PointerMoved(pos)]);
-        for _ in 0..times {
-            for pressed in [true, false] {
-                frame(
-                    app,
-                    ctx,
-                    vec![egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE }],
-                );
-            }
-        }
-    }
-
-    /// The card whose name is `name` (its page, above the name).
-    fn card_at(texts: &[(String, Rect)], name: &str) -> egui::Pos2 {
-        let (_, r) = texts.iter().find(|(t, _)| t == name).unwrap_or_else(|| panic!("card {name}"));
-        r.center() - vec2(0.0, 50.0)
-    }
-
-    #[test]
-    fn a_print_preset_fills_the_details_and_creates_its_document() {
-        let mut app = app();
-        let ctx = context();
-        app.ui.dialog.as_mut().unwrap().fields.insert("tab".into(), json!("print"));
-        let texts = settle(&mut app, &ctx);
-        // A4 sits below the poster sizes: scroll the presets to it.
-        let over = card_at(&texts, "Letter");
-        frame(&mut app, &ctx, vec![egui::Event::PointerMoved(over)]);
-        let wheel = egui::Event::MouseWheel {
-            unit: egui::MouseWheelUnit::Point,
-            delta: vec2(0.0, -400.0),
-            phase: egui::TouchPhase::Move,
-            modifiers: egui::Modifiers::NONE,
-        };
-        frame(&mut app, &ctx, vec![wheel]);
-        let texts = settle(&mut app, &ctx);
-        click(&mut app, &ctx, card_at(&texts, "A4"), 1);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!((d.s("preset"), d.s("width"), d.s("height"), units(d)), ("A4".into(), "210 mm".into(), "297 mm".into(), Unit::Millimeters));
-        let d = app.ui.dialog.as_mut().unwrap();
-        for (k, v) in [("startPage", json!(3)), ("bleedTop", json!("3 mm")), ("slugBottom", json!("10 mm")), ("name", json!("Flyer"))] {
-            d.fields.insert(k.into(), v);
-        }
-        crate::dialogs::confirm(&mut app).unwrap();
-        let doc = &app.session.active().unwrap().doc;
-        assert_eq!(doc.title, "Flyer");
-        assert!((doc.settings.page_width - 210.0 * PT_PER_MM).abs() < 1e-6);
-        assert_eq!(doc.settings.horizontal_units, Unit::Millimeters);
-        assert_eq!(doc.page_name(0), "3");
-        assert!((doc.settings.bleed[0] - 3.0 * PT_PER_MM).abs() < 1e-6 && doc.settings.bleed[1] == 0.0);
-        assert!((doc.settings.slug[1] - 10.0 * PT_PER_MM).abs() < 1e-6);
-        // The Recent tab now shows it, by its preset's name.
-        let recent = cards(&app, "recent");
-        assert_eq!(recent.iter().map(|c| c.label.as_str()).collect::<Vec<_>>(), [DEFAULT_CARD, "A4"]);
-        assert_eq!(recent[1].nd.start_page, 3);
-    }
-
-    #[test]
-    fn a_tab_shows_its_first_preset_as_indesign_does() {
-        let mut app = app();
-        let ctx = context();
-        // A tab's name, a little above its painted text's box (which reaches below the strip).
-        let tab = |texts: &[(String, Rect)], name: &str| texts.iter().find(|(t, _)| t == name).map(|(_, r)| r.center() - vec2(0.0, 12.0)).unwrap();
-        let texts = settle(&mut app, &ctx);
-        app.ui.dialog.as_mut().unwrap().fields.insert("name".into(), json!("Poster"));
-        click(&mut app, &ctx, tab(&texts, "Web"), 1);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!((d.s("tab"), d.s("preset")), ("web".into(), "Web 1920 \u{d7} 1080".into()));
-        assert_eq!((d.s("width"), d.s("height"), units(d)), ("1920 px".into(), "1080 px".into(), Unit::Pixels), "Web is in pixels");
-        assert!(!d.b("facingPages") && !d.b("primaryTextFrame"));
-        assert_eq!(d.s("name"), "Poster", "the typed name stays");
-        // Mobile is in pixels too, without a primary text frame (its autoflow is an open gap).
-        let texts = settle(&mut app, &ctx);
-        click(&mut app, &ctx, tab(&texts, "Mobile"), 1);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!((d.s("tab"), units(d), d.b("primaryTextFrame")), ("mobile".into(), Unit::Pixels, false));
-        let texts = settle(&mut app, &ctx);
-        click(&mut app, &ctx, tab(&texts, "Print"), 1);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!((d.s("preset"), units(d)), ("Letter".into(), Unit::Picas));
-        // Clicking the open tab again keeps what was picked on it.
-        let texts = settle(&mut app, &ctx);
-        click(&mut app, &ctx, card_at(&texts, "A4"), 1);
-        click(&mut app, &ctx, tab(&texts, "Print"), 1);
-        assert_eq!(app.ui.dialog.as_ref().unwrap().s("preset"), "A4");
-        // Saved starts with [Default], as in InDesign, and selects it.
-        let texts = settle(&mut app, &ctx);
-        click(&mut app, &ctx, tab(&texts, "Saved"), 1);
-        let d = app.ui.dialog.as_ref().unwrap();
-        assert_eq!((d.s("preset"), d.s("width")), (DEFAULT_CARD.into(), "51p0".into()));
-        let texts = settle(&mut app, &ctx);
-        assert!(texts.iter().any(|(t, _)| t == "SAVED PRESETS (1)"));
-    }
-
-    #[test]
-    fn double_clicking_a_card_creates_the_document() {
-        let mut app = app();
-        let ctx = context();
-        app.ui.dialog.as_mut().unwrap().fields.insert("tab".into(), json!("web"));
-        let texts = settle(&mut app, &ctx);
-        click(&mut app, &ctx, card_at(&texts, "Web 1366 \u{d7} 768"), 2);
-        assert!(app.ui.dialog.is_none(), "the dialog closed");
-        let doc = &app.session.active().unwrap().doc;
-        assert_eq!((doc.settings.page_width, doc.settings.intent), (1366.0, Intent::Web));
-        assert!(!doc.settings.facing_pages);
-    }
-
-    #[test]
-    fn card_sizes_follow_the_dialog_units() {
-        let card = NewDocument::from_preset("Business Card").unwrap();
-        assert_eq!(size_text(&card, Unit::Millimeters), "88.9 × 50.8 mm");
-        assert_ne!(size_text(&card, Unit::Millimeters), size_text(&card, Unit::Picas));
-    }
-
-    #[test]
-    fn units_reformat_the_measures_and_linked_edges_follow() {
-        // InDesign's Units list.
-        assert_eq!(NEW_DOCUMENT_UNITS.map(|u| u.label()), ["Points", "Picas", "Inches", "Millimeters", "Centimeters", "Ciceros", "Agates", "Pixels"]);
-        let mut d = Dialog::new("newDocument", json!({}));
-        set_units(&mut d, Unit::Millimeters);
-        assert_eq!((d.s("width"), d.s("marginTop")), ("215.9 mm".into(), "12.7 mm".into()));
-        d.fields.insert("marginInside".into(), json!("20 mm"));
-        link_edges(&mut d, "margin", "marginInside");
-        assert!(EDGES.iter().all(|e| d.s(&format!("margin{e}")) == "20 mm"));
-        let p = params(&d);
-        assert!((p["margins"]["outside"].as_f64().unwrap() - 20.0 * PT_PER_MM).abs() < 1e-9);
-        // Typed nonsense falls back to the defaults instead of reaching the document.
-        d.fields.insert("gutter".into(), json!("wide"));
-        d.fields.insert("pages".into(), json!("-4"));
-        let p = params(&d);
-        assert_eq!((p["gutter"].as_f64(), p["pages"].as_u64()), (Some(12.0), Some(1)));
-    }
-
-    /// The app's window (with a document) with the New Document dialog and its Save Document Preset
-    /// popup open.
-    fn window_with_preset_popup() -> egui_kittest::Harness<'static, crate::test_window::Window> {
-        use egui_kittest::kittest::Queryable as _;
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("app.newDocumentDialog", json!({})).unwrap();
-        let mut h = crate::test_window::open(app, vec2(1440.0, 900.0));
-        // The dialog takes a couple of frames to settle where it opens.
-        h.run_steps(4);
-        let button = h.get_by_label("Save Document Preset").rect().center();
-        crate::test_window::click_at(&mut h, button);
-        assert!(egui::Popup::is_any_open(&h.ctx), "the popup opened");
-        h
-    }
-
-    #[test]
-    fn enter_in_the_preset_popup_saves_the_preset_and_keeps_the_dialog() {
-        use egui_kittest::kittest::Queryable as _;
-        let mut h = window_with_preset_popup();
-        let field = h.get_by_label("Preset Name").rect().center();
-        crate::test_window::click_at(&mut h, field);
-        h.get_by_label("Preset Name").type_text("Brochure");
-        h.run_steps(2);
-        h.key_press(egui::Key::Enter);
-        h.run_steps(4);
-        let app = &mut h.state_mut().app;
-        let d = app.ui.dialog.as_ref().expect("Enter saves the preset; it doesn't create the document");
-        assert_eq!(app.session.documents().len(), 1, "no document was made (the window opens with one)");
-        assert_eq!(app.session.prefs.document_presets.iter().map(|p| p.title.as_str()).collect::<Vec<_>>(), ["Brochure"]);
-        assert_eq!((d.s("tab"), d.s("preset")), ("saved".into(), "saved:Brochure".into()));
-        // The saved preset makes documents by name, as file.new {preset} does from anywhere.
-        app.run("file.new", json!({"preset": "Brochure"})).unwrap();
-        assert!(!egui::Popup::is_any_open(&h.ctx), "the popup closed");
-    }
-
-    #[test]
-    fn escape_in_the_preset_popup_closes_only_the_popup() {
-        let mut h = window_with_preset_popup();
-        h.key_press(egui::Key::Escape);
-        h.run_steps(4);
-        assert!(!egui::Popup::is_any_open(&h.ctx), "Escape closed the popup");
-        assert!(h.state().app.ui.dialog.is_some(), "and left the dialog open");
-        // With no popup open, Escape closes the dialog as before.
-        h.key_press(egui::Key::Escape);
-        h.run_steps(4);
-        assert!(h.state().app.ui.dialog.is_none());
-    }
-
-    /// Set dialog fields, then let the preview settle.
-    fn set(app: &mut DesignApp, ctx: &egui::Context, fields: &[(&str, Value)]) {
-        let d = app.ui.dialog.as_mut().unwrap();
-        for (k, v) in fields {
-            d.fields.insert((*k).into(), v.clone());
-        }
-        frame(app, ctx, vec![]);
-        frame_after(app, ctx, vec![], 2.0 * SETTLE_SECONDS);
-    }
-
-    fn shown(app: &DesignApp) -> (usize, f64, u32) {
-        let doc = &app.session.active().unwrap().doc;
-        (app.session.documents().len(), doc.settings.page_width, doc.page(0).unwrap().columns.count)
-    }
-
-    fn escape(app: &mut DesignApp, ctx: &egui::Context) {
-        frame(
-            app,
-            ctx,
-            vec![egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE }],
-        );
-        assert!(app.ui.dialog.is_none());
-    }
-
-    /// Documents A and B with A active, and the New Document window open over them.
-    fn two_documents() -> (DesignApp, egui::Context, designcraft_engine::DocState) {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"title": "A"})).unwrap();
-        app.run("file.new", json!({"title": "B"})).unwrap();
-        app.session.set_active(0);
-        let a = app.session.active().unwrap().clone();
-        app.run("app.newDocumentDialog", json!({})).unwrap();
-        (app, context(), a)
-    }
-
-    #[test]
-    fn preview_shows_the_settings_live_and_close_restores_the_workspace() {
-        let (mut app, ctx, a) = two_documents();
-        settle(&mut app, &ctx);
-        assert_eq!(app.session.documents().len(), 2, "Preview starts off");
-        set(&mut app, &ctx, &[("preview", json!(true))]);
-        assert_eq!(shown(&app), (3, 612.0, 1), "a third tab shows the dialog's settings");
-        let uid = app.session.new_document_preview();
-        settle(&mut app, &ctx);
-        assert_eq!(app.session.new_document_preview(), uid, "unchanged settings keep the same preview");
-        // A change waits for the typing to stop.
-        app.ui.dialog.as_mut().unwrap().fields.insert("width".into(), json!("300 pt"));
-        frame(&mut app, &ctx, vec![]);
-        assert_eq!(shown(&app).1, 612.0);
-        set(&mut app, &ctx, &[("columns", json!("3"))]);
-        assert_eq!(shown(&app), (3, 300.0, 3), "and then follows them");
-        // Half-typed and refused values keep the last preview.
-        for width in ["", "-5", "0"] {
-            set(&mut app, &ctx, &[("width", json!(width))]);
-            assert_eq!(shown(&app), (3, 300.0, 3), "{width:?}");
-        }
-        // Escape closes the window: the preview goes and A is shown again, untouched.
-        escape(&mut app, &ctx);
-        let back = app.session.active().unwrap();
-        assert_eq!(app.session.documents().len(), 2);
-        assert_eq!((back.uid, back.revision, back.history.undo.len(), back.is_dirty()), (a.uid, a.revision, 0, false));
-        // Preview is remembered; turning it off removes the preview.
-        app.run("app.newDocumentDialog", json!({})).unwrap();
-        frame(&mut app, &ctx, vec![]);
-        assert_eq!(app.session.documents().len(), 3);
-        set(&mut app, &ctx, &[("preview", json!(false))]);
-        assert_eq!((app.session.documents().len(), app.session.active().unwrap().uid), (2, a.uid));
-        // `ui.dialog.cancel` removes it too.
-        set(&mut app, &ctx, &[("preview", json!(true))]);
-        assert_eq!(app.session.documents().len(), 3);
-        let (req, _) = crate::control::ControlRequest::new("ui.dialog.cancel", json!({}));
-        let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
-            crate::control::handle(&mut app, ui.ctx(), &req);
-        });
-        out.textures_delta.clear();
-        assert_eq!((app.session.documents().len(), app.session.active().unwrap().uid), (2, a.uid));
-    }
-
-    #[test]
-    fn the_update_loop_ends_a_preview_whose_window_has_gone() {
-        let (mut app, ctx, a) = two_documents();
-        set(&mut app, &ctx, &[("preview", json!(true))]);
-        assert_eq!(app.session.documents().len(), 3);
-        app.ui.dialog = None;
-        let mut out = ctx.run_ui(egui::RawInput::default(), |ui| app.logic(ui.ctx()));
-        out.textures_delta.clear();
-        assert_eq!((app.session.documents().len(), app.session.active().unwrap().uid), (2, a.uid));
-    }
-
-    #[test]
-    fn closing_leaves_a_document_activated_or_edited_meanwhile() {
-        let (mut app, ctx, _) = two_documents();
-        set(&mut app, &ctx, &[("preview", json!(true))]);
-        // A file opened (here: made) by a script while the window is open stays active.
-        app.run("file.new", json!({"title": "Opened"})).unwrap();
-        escape(&mut app, &ctx);
-        let titles: Vec<String> = app.session.documents().iter().map(|d| d.title()).collect();
-        assert_eq!((titles, app.session.active().unwrap().title()), (vec!["A".into(), "B".into(), "Opened".into()], "Opened".into()));
-        // A preview edited by a menu or script is kept as a document, with its Untitled number.
-        app.run("app.newDocumentDialog", json!({})).unwrap();
-        frame(&mut app, &ctx, vec![]);
-        let preview = app.session.new_document_preview();
-        app.run("frame.create", json!({"rect": [10, 10, 100, 100]})).unwrap();
-        escape(&mut app, &ctx);
-        let st = app.session.active().unwrap();
-        assert_eq!((app.session.documents().len(), Some(st.uid), st.is_dirty()), (4, preview, true));
-        assert_ne!(st.doc.title, app.session.next_untitled_title());
-    }
-
-    #[test]
-    fn closing_the_start_screen_preview_leaves_no_document() {
-        let mut app = app();
-        let ctx = context();
-        set(&mut app, &ctx, &[("preview", json!(true))]);
-        assert_eq!(app.session.documents().len(), 1);
-        escape(&mut app, &ctx);
-        assert!(app.session.documents().is_empty() && app.session.active().is_none());
-    }
-
-    #[test]
-    fn create_keeps_the_previewed_document_with_the_final_settings() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"title": "A"})).unwrap();
-        app.run("app.newDocumentDialog", json!({})).unwrap();
-        let ctx = context();
-        set(&mut app, &ctx, &[("preview", json!(true)), ("width", json!("400 pt"))]);
-        set(&mut app, &ctx, &[("pages", json!("4")), ("facingPages", json!(false))]);
-        let preview = app.session.new_document_preview();
-        // An invalid field refuses Create: the window and the preview stay.
-        set(&mut app, &ctx, &[("pages", json!(""))]);
-        assert!(crate::dialogs::confirm(&mut app).is_err());
-        assert!(app.ui.dialog.as_ref().unwrap().s("status").contains("Invalid value"));
-        assert_eq!((app.session.documents().len(), app.session.new_document_preview()), (2, preview));
-        // A size file.new refuses also keeps them.
-        set(&mut app, &ctx, &[("pages", json!("4")), ("width", json!("0"))]);
-        assert!(crate::dialogs::confirm(&mut app).is_err());
-        assert_eq!((app.session.documents().len(), app.session.new_document_preview()), (2, preview));
-        // With the previewed settings, the preview becomes the document.
-        set(&mut app, &ctx, &[("width", json!("400 pt"))]);
-        crate::dialogs::confirm(&mut app).unwrap();
-        let st = app.session.active().unwrap();
-        assert_eq!((app.session.documents().len(), st.doc.settings.page_width, st.doc.page_count()), (2, 400.0, 4));
-        assert!(!st.doc.settings.facing_pages && app.ui.dialog.is_none());
-        assert_eq!((Some(st.uid), st.doc.title.as_str(), st.history.undo.len(), st.is_dirty()), (preview, "Untitled-2", 0, false));
-        assert_eq!(app.session.new_document_preview(), None);
-        // Settings changed just before Create (the preview not made yet) make a new document.
-        app.run("app.newDocumentDialog", json!({})).unwrap();
-        set(&mut app, &ctx, &[]);
-        app.ui.dialog.as_mut().unwrap().fields.insert("pages".into(), json!("2"));
-        frame(&mut app, &ctx, vec![]);
-        crate::dialogs::confirm(&mut app).unwrap();
-        let st = app.session.active().unwrap();
-        assert_eq!((app.session.documents().len(), st.doc.page_count(), st.doc.title.as_str()), (3, 2, "Untitled-3"));
-    }
-
-    #[test]
-    fn presets_are_saved_by_name_and_recent_documents_once() {
-        let mut app = app();
-        let mut d = app.ui.dialog.clone().unwrap();
-        save_preset(&mut app, &mut d, " Newsletter ").unwrap();
-        d.fields.insert("pages".into(), json!(8));
-        save_preset(&mut app, &mut d, "Newsletter").unwrap();
-        assert_eq!(app.session.prefs.document_presets.len(), 1, "the same name replaces the preset");
-        assert!(save_preset(&mut app, &mut d, "Letter").is_err(), "a built-in name is refused");
-        assert_eq!((d.s("tab"), d.s("preset")), ("saved".into(), "saved:Newsletter".into()));
-        let saved = cards(&app, "saved");
-        assert_eq!(saved.len(), 2);
-        assert_eq!((saved[0].key.as_str(), saved[0].nd.pages), (DEFAULT_CARD, 1), "[Default] comes first, as in InDesign");
-        assert_eq!((saved[1].label.as_str(), saved[1].nd.pages), ("Newsletter", 8));
-        let p = params(&d);
-        remember(&mut app, &p);
-        remember(&mut app, &p);
-        assert_eq!(app.ui.recent_new_documents.len(), 1, "a repeat moves to the front");
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/new_document/tests.rs b/crates/ui-egui/src/new_document/tests.rs
new file mode 100644
index 000000000..5785aed54
--- /dev/null
+++ b/crates/ui-egui/src/new_document/tests.rs
@@ -0,0 +1,405 @@
+use super::*;
+
+fn app() -> DesignApp {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("app.newDocumentDialog", json!({})).unwrap();
+    app
+}
+
+fn context() -> egui::Context {
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx, "");
+    crate::theme::apply(&ctx, &Tokens::for_brightness(crate::theme::Brightness::default()));
+    ctx
+}
+
+/// One frame of the open dialog → the painted texts and where.
+fn frame(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>) -> Vec<(String, Rect)> {
+    frame_after(app, ctx, events, 1.0 / 60.0)
+}
+
+/// One frame `dt` seconds after the last.
+fn frame_after(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>, dt: f64) -> Vec<(String, Rect)> {
+    let raw = egui::RawInput {
+        screen_rect: Some(Rect::from_min_size(egui::Pos2::ZERO, vec2(1440.0, 900.0))),
+        time: Some(ctx.input(|i| i.time) + dt),
+        events,
+        ..Default::default()
+    };
+    let mut out = ctx.run_ui(raw, |ui| crate::dialogs::show(app, ui.ctx()));
+    out.textures_delta.clear();
+    fn collect(shape: &egui::Shape, texts: &mut Vec<(String, Rect)>) {
+        match shape {
+            egui::Shape::Text(t) => texts.push((t.galley.job.text.clone(), t.visual_bounding_rect())),
+            egui::Shape::Vec(v) => v.iter().for_each(|s| collect(s, texts)),
+            _ => {}
+        }
+    }
+    let mut texts = Vec::new();
+    out.shapes.iter().for_each(|s| collect(&s.shape, &mut texts));
+    texts
+}
+
+fn settle(app: &mut DesignApp, ctx: &egui::Context) -> Vec<(String, Rect)> {
+    for _ in 0..3 {
+        frame(app, ctx, vec![]);
+    }
+    frame(app, ctx, vec![])
+}
+
+fn click(app: &mut DesignApp, ctx: &egui::Context, pos: egui::Pos2, times: usize) {
+    frame(app, ctx, vec![egui::Event::PointerMoved(pos)]);
+    for _ in 0..times {
+        for pressed in [true, false] {
+            frame(
+                app,
+                ctx,
+                vec![egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE }],
+            );
+        }
+    }
+}
+
+/// The card whose name is `name` (its page, above the name).
+fn card_at(texts: &[(String, Rect)], name: &str) -> egui::Pos2 {
+    let (_, r) = texts.iter().find(|(t, _)| t == name).unwrap_or_else(|| panic!("card {name}"));
+    r.center() - vec2(0.0, 50.0)
+}
+
+#[test]
+fn a_print_preset_fills_the_details_and_creates_its_document() {
+    let mut app = app();
+    let ctx = context();
+    app.ui.dialog.as_mut().unwrap().fields.insert("tab".into(), json!("print"));
+    let texts = settle(&mut app, &ctx);
+    // A4 sits below the poster sizes: scroll the presets to it.
+    let over = card_at(&texts, "Letter");
+    frame(&mut app, &ctx, vec![egui::Event::PointerMoved(over)]);
+    let wheel = egui::Event::MouseWheel {
+        unit: egui::MouseWheelUnit::Point,
+        delta: vec2(0.0, -400.0),
+        phase: egui::TouchPhase::Move,
+        modifiers: egui::Modifiers::NONE,
+        source: egui::MouseWheelSource::Unknown,
+    };
+    frame(&mut app, &ctx, vec![wheel]);
+    let texts = settle(&mut app, &ctx);
+    click(&mut app, &ctx, card_at(&texts, "A4"), 1);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!((d.s("preset"), d.s("width"), d.s("height"), units(d)), ("A4".into(), "210 mm".into(), "297 mm".into(), Unit::Millimeters));
+    let d = app.ui.dialog.as_mut().unwrap();
+    for (k, v) in [("startPage", json!(3)), ("bleedTop", json!("3 mm")), ("slugBottom", json!("10 mm")), ("name", json!("Flyer"))] {
+        d.fields.insert(k.into(), v);
+    }
+    crate::dialogs::confirm(&mut app).unwrap();
+    let doc = &app.session.active().unwrap().doc;
+    assert_eq!(doc.title, "Flyer");
+    assert!((doc.settings.page_width - 210.0 * PT_PER_MM).abs() < 1e-6);
+    assert_eq!(doc.settings.horizontal_units, Unit::Millimeters);
+    assert_eq!(doc.page_name(0), "3");
+    assert!((doc.settings.bleed[0] - 3.0 * PT_PER_MM).abs() < 1e-6 && doc.settings.bleed[1] == 0.0);
+    assert!((doc.settings.slug[1] - 10.0 * PT_PER_MM).abs() < 1e-6);
+    // The Recent tab now shows it, by its preset's name.
+    let recent = cards(&app, "recent");
+    assert_eq!(recent.iter().map(|c| c.label.as_str()).collect::<Vec<_>>(), [DEFAULT_CARD, "A4"]);
+    assert_eq!(recent[1].nd.start_page, 3);
+}
+
+#[test]
+fn a_tab_shows_its_first_preset_as_indesign_does() {
+    let mut app = app();
+    let ctx = context();
+    // A tab's name, a little above its painted text's box (which reaches below the strip).
+    let tab = |texts: &[(String, Rect)], name: &str| texts.iter().find(|(t, _)| t == name).map(|(_, r)| r.center() - vec2(0.0, 12.0)).unwrap();
+    let texts = settle(&mut app, &ctx);
+    app.ui.dialog.as_mut().unwrap().fields.insert("name".into(), json!("Poster"));
+    click(&mut app, &ctx, tab(&texts, "Web"), 1);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!((d.s("tab"), d.s("preset")), ("web".into(), "Web 1920 \u{d7} 1080".into()));
+    assert_eq!((d.s("width"), d.s("height"), units(d)), ("1920 px".into(), "1080 px".into(), Unit::Pixels), "Web is in pixels");
+    assert!(!d.b("facingPages") && !d.b("primaryTextFrame"));
+    assert_eq!(d.s("name"), "Poster", "the typed name stays");
+    // Mobile is in pixels too, without a primary text frame (its autoflow is an open gap).
+    let texts = settle(&mut app, &ctx);
+    click(&mut app, &ctx, tab(&texts, "Mobile"), 1);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!((d.s("tab"), units(d), d.b("primaryTextFrame")), ("mobile".into(), Unit::Pixels, false));
+    let texts = settle(&mut app, &ctx);
+    click(&mut app, &ctx, tab(&texts, "Print"), 1);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!((d.s("preset"), units(d)), ("Letter".into(), Unit::Picas));
+    // Clicking the open tab again keeps what was picked on it.
+    let texts = settle(&mut app, &ctx);
+    click(&mut app, &ctx, card_at(&texts, "A4"), 1);
+    click(&mut app, &ctx, tab(&texts, "Print"), 1);
+    assert_eq!(app.ui.dialog.as_ref().unwrap().s("preset"), "A4");
+    // Saved starts with [Default], as in InDesign, and selects it.
+    let texts = settle(&mut app, &ctx);
+    click(&mut app, &ctx, tab(&texts, "Saved"), 1);
+    let d = app.ui.dialog.as_ref().unwrap();
+    assert_eq!((d.s("preset"), d.s("width")), (DEFAULT_CARD.into(), "51p0".into()));
+    let texts = settle(&mut app, &ctx);
+    assert!(texts.iter().any(|(t, _)| t == "SAVED PRESETS (1)"));
+}
+
+#[test]
+fn double_clicking_a_card_creates_the_document() {
+    let mut app = app();
+    let ctx = context();
+    app.ui.dialog.as_mut().unwrap().fields.insert("tab".into(), json!("web"));
+    let texts = settle(&mut app, &ctx);
+    click(&mut app, &ctx, card_at(&texts, "Web 1366 \u{d7} 768"), 2);
+    assert!(app.ui.dialog.is_none(), "the dialog closed");
+    let doc = &app.session.active().unwrap().doc;
+    assert_eq!((doc.settings.page_width, doc.settings.intent), (1366.0, Intent::Web));
+    assert!(!doc.settings.facing_pages);
+}
+
+#[test]
+fn card_sizes_follow_the_dialog_units() {
+    let card = NewDocument::from_preset("Business Card").unwrap();
+    assert_eq!(size_text(&card, Unit::Millimeters), "88.9 × 50.8 mm");
+    assert_ne!(size_text(&card, Unit::Millimeters), size_text(&card, Unit::Picas));
+}
+
+#[test]
+fn units_reformat_the_measures_and_linked_edges_follow() {
+    // InDesign's Units list.
+    assert_eq!(NEW_DOCUMENT_UNITS.map(|u| u.label()), ["Points", "Picas", "Inches", "Millimeters", "Centimeters", "Ciceros", "Agates", "Pixels"]);
+    let mut d = Dialog::new("newDocument", json!({}));
+    set_units(&mut d, Unit::Millimeters);
+    assert_eq!((d.s("width"), d.s("marginTop")), ("215.9 mm".into(), "12.7 mm".into()));
+    d.fields.insert("marginInside".into(), json!("20 mm"));
+    link_edges(&mut d, "margin", "marginInside");
+    assert!(EDGES.iter().all(|e| d.s(&format!("margin{e}")) == "20 mm"));
+    let p = params(&d);
+    assert!((p["margins"]["outside"].as_f64().unwrap() - 20.0 * PT_PER_MM).abs() < 1e-9);
+    // Typed nonsense falls back to the defaults instead of reaching the document.
+    d.fields.insert("gutter".into(), json!("wide"));
+    d.fields.insert("pages".into(), json!("-4"));
+    let p = params(&d);
+    assert_eq!((p["gutter"].as_f64(), p["pages"].as_u64()), (Some(12.0), Some(1)));
+}
+
+/// The app's window (with a document) with the New Document dialog and its Save Document Preset
+/// popup open.
+fn window_with_preset_popup() -> egui_kittest::Harness<'static, crate::test_window::Window> {
+    use egui_kittest::kittest::Queryable as _;
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("app.newDocumentDialog", json!({})).unwrap();
+    let mut h = crate::test_window::open(app, vec2(1440.0, 900.0));
+    // The dialog takes a couple of frames to settle where it opens.
+    h.run_steps(4);
+    let button = h.get_by_label("Save Document Preset").rect().center();
+    crate::test_window::click_at(&mut h, button);
+    assert!(egui::Popup::is_any_open(&h.ctx), "the popup opened");
+    h
+}
+
+#[test]
+fn enter_in_the_preset_popup_saves_the_preset_and_keeps_the_dialog() {
+    use egui_kittest::kittest::Queryable as _;
+    let mut h = window_with_preset_popup();
+    let field = h.get_by_label("Preset Name").rect().center();
+    crate::test_window::click_at(&mut h, field);
+    h.get_by_label("Preset Name").type_text("Brochure");
+    h.run_steps(2);
+    h.key_press(egui::Key::Enter);
+    h.run_steps(4);
+    let app = &mut h.state_mut().app;
+    let d = app.ui.dialog.as_ref().expect("Enter saves the preset; it doesn't create the document");
+    assert_eq!(app.session.documents().len(), 1, "no document was made (the window opens with one)");
+    assert_eq!(app.session.prefs.document_presets.iter().map(|p| p.title.as_str()).collect::<Vec<_>>(), ["Brochure"]);
+    assert_eq!((d.s("tab"), d.s("preset")), ("saved".into(), "saved:Brochure".into()));
+    // The saved preset makes documents by name, as file.new {preset} does from anywhere.
+    app.run("file.new", json!({"preset": "Brochure"})).unwrap();
+    assert!(!egui::Popup::is_any_open(&h.ctx), "the popup closed");
+}
+
+#[test]
+fn escape_in_the_preset_popup_closes_only_the_popup() {
+    let mut h = window_with_preset_popup();
+    h.key_press(egui::Key::Escape);
+    h.run_steps(4);
+    assert!(!egui::Popup::is_any_open(&h.ctx), "Escape closed the popup");
+    assert!(h.state().app.ui.dialog.is_some(), "and left the dialog open");
+    // With no popup open, Escape closes the dialog as before.
+    h.key_press(egui::Key::Escape);
+    h.run_steps(4);
+    assert!(h.state().app.ui.dialog.is_none());
+}
+
+/// Set dialog fields, then let the preview settle.
+fn set(app: &mut DesignApp, ctx: &egui::Context, fields: &[(&str, Value)]) {
+    let d = app.ui.dialog.as_mut().unwrap();
+    for (k, v) in fields {
+        d.fields.insert((*k).into(), v.clone());
+    }
+    frame(app, ctx, vec![]);
+    frame_after(app, ctx, vec![], 2.0 * SETTLE_SECONDS);
+}
+
+fn shown(app: &DesignApp) -> (usize, f64, u32) {
+    let doc = &app.session.active().unwrap().doc;
+    (app.session.documents().len(), doc.settings.page_width, doc.page(0).unwrap().columns.count)
+}
+
+fn escape(app: &mut DesignApp, ctx: &egui::Context) {
+    frame(
+        app,
+        ctx,
+        vec![egui::Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE }],
+    );
+    assert!(app.ui.dialog.is_none());
+}
+
+/// Documents A and B with A active, and the New Document window open over them.
+fn two_documents() -> (DesignApp, egui::Context, designcraft_engine::DocState) {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"title": "A"})).unwrap();
+    app.run("file.new", json!({"title": "B"})).unwrap();
+    app.session.set_active(0);
+    let a = app.session.active().unwrap().clone();
+    app.run("app.newDocumentDialog", json!({})).unwrap();
+    (app, context(), a)
+}
+
+#[test]
+fn preview_shows_the_settings_live_and_close_restores_the_workspace() {
+    let (mut app, ctx, a) = two_documents();
+    settle(&mut app, &ctx);
+    assert_eq!(app.session.documents().len(), 2, "Preview starts off");
+    set(&mut app, &ctx, &[("preview", json!(true))]);
+    assert_eq!(shown(&app), (3, 612.0, 1), "a third tab shows the dialog's settings");
+    let uid = app.session.new_document_preview();
+    settle(&mut app, &ctx);
+    assert_eq!(app.session.new_document_preview(), uid, "unchanged settings keep the same preview");
+    // A change waits for the typing to stop.
+    app.ui.dialog.as_mut().unwrap().fields.insert("width".into(), json!("300 pt"));
+    frame(&mut app, &ctx, vec![]);
+    assert_eq!(shown(&app).1, 612.0);
+    set(&mut app, &ctx, &[("columns", json!("3"))]);
+    assert_eq!(shown(&app), (3, 300.0, 3), "and then follows them");
+    // Half-typed and refused values keep the last preview.
+    for width in ["", "-5", "0"] {
+        set(&mut app, &ctx, &[("width", json!(width))]);
+        assert_eq!(shown(&app), (3, 300.0, 3), "{width:?}");
+    }
+    // Escape closes the window: the preview goes and A is shown again, untouched.
+    escape(&mut app, &ctx);
+    let back = app.session.active().unwrap();
+    assert_eq!(app.session.documents().len(), 2);
+    assert_eq!((back.uid, back.revision, back.history.undo.len(), back.is_dirty()), (a.uid, a.revision, 0, false));
+    // Preview is remembered; turning it off removes the preview.
+    app.run("app.newDocumentDialog", json!({})).unwrap();
+    frame(&mut app, &ctx, vec![]);
+    assert_eq!(app.session.documents().len(), 3);
+    set(&mut app, &ctx, &[("preview", json!(false))]);
+    assert_eq!((app.session.documents().len(), app.session.active().unwrap().uid), (2, a.uid));
+    // `ui.dialog.cancel` removes it too.
+    set(&mut app, &ctx, &[("preview", json!(true))]);
+    assert_eq!(app.session.documents().len(), 3);
+    let (req, _) = crate::control::ControlRequest::new("ui.dialog.cancel", json!({}));
+    let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
+        crate::control::handle(&mut app, ui.ctx(), &req);
+    });
+    out.textures_delta.clear();
+    assert_eq!((app.session.documents().len(), app.session.active().unwrap().uid), (2, a.uid));
+}
+
+#[test]
+fn the_update_loop_ends_a_preview_whose_window_has_gone() {
+    let (mut app, ctx, a) = two_documents();
+    set(&mut app, &ctx, &[("preview", json!(true))]);
+    assert_eq!(app.session.documents().len(), 3);
+    app.ui.dialog = None;
+    let mut out = ctx.run_ui(egui::RawInput::default(), |ui| app.logic(ui.ctx()));
+    out.textures_delta.clear();
+    assert_eq!((app.session.documents().len(), app.session.active().unwrap().uid), (2, a.uid));
+}
+
+#[test]
+fn closing_leaves_a_document_activated_or_edited_meanwhile() {
+    let (mut app, ctx, _) = two_documents();
+    set(&mut app, &ctx, &[("preview", json!(true))]);
+    // A file opened (here: made) by a script while the window is open stays active.
+    app.run("file.new", json!({"title": "Opened"})).unwrap();
+    escape(&mut app, &ctx);
+    let titles: Vec<String> = app.session.documents().iter().map(|d| d.title()).collect();
+    assert_eq!((titles, app.session.active().unwrap().title()), (vec!["A".into(), "B".into(), "Opened".into()], "Opened".into()));
+    // A preview edited by a menu or script is kept as a document, with its Untitled number.
+    app.run("app.newDocumentDialog", json!({})).unwrap();
+    frame(&mut app, &ctx, vec![]);
+    let preview = app.session.new_document_preview();
+    app.run("frame.create", json!({"rect": [10, 10, 100, 100]})).unwrap();
+    escape(&mut app, &ctx);
+    let st = app.session.active().unwrap();
+    assert_eq!((app.session.documents().len(), Some(st.uid), st.is_dirty()), (4, preview, true));
+    assert_ne!(st.doc.title, app.session.next_untitled_title());
+}
+
+#[test]
+fn closing_the_start_screen_preview_leaves_no_document() {
+    let mut app = app();
+    let ctx = context();
+    set(&mut app, &ctx, &[("preview", json!(true))]);
+    assert_eq!(app.session.documents().len(), 1);
+    escape(&mut app, &ctx);
+    assert!(app.session.documents().is_empty() && app.session.active().is_none());
+}
+
+#[test]
+fn create_keeps_the_previewed_document_with_the_final_settings() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"title": "A"})).unwrap();
+    app.run("app.newDocumentDialog", json!({})).unwrap();
+    let ctx = context();
+    set(&mut app, &ctx, &[("preview", json!(true)), ("width", json!("400 pt"))]);
+    set(&mut app, &ctx, &[("pages", json!("4")), ("facingPages", json!(false))]);
+    let preview = app.session.new_document_preview();
+    // An invalid field refuses Create: the window and the preview stay.
+    set(&mut app, &ctx, &[("pages", json!(""))]);
+    assert!(crate::dialogs::confirm(&mut app).is_err());
+    assert!(app.ui.dialog.as_ref().unwrap().s("status").contains("Invalid value"));
+    assert_eq!((app.session.documents().len(), app.session.new_document_preview()), (2, preview));
+    // A size file.new refuses also keeps them.
+    set(&mut app, &ctx, &[("pages", json!("4")), ("width", json!("0"))]);
+    assert!(crate::dialogs::confirm(&mut app).is_err());
+    assert_eq!((app.session.documents().len(), app.session.new_document_preview()), (2, preview));
+    // With the previewed settings, the preview becomes the document.
+    set(&mut app, &ctx, &[("width", json!("400 pt"))]);
+    crate::dialogs::confirm(&mut app).unwrap();
+    let st = app.session.active().unwrap();
+    assert_eq!((app.session.documents().len(), st.doc.settings.page_width, st.doc.page_count()), (2, 400.0, 4));
+    assert!(!st.doc.settings.facing_pages && app.ui.dialog.is_none());
+    assert_eq!((Some(st.uid), st.doc.title.as_str(), st.history.undo.len(), st.is_dirty()), (preview, "Untitled-2", 0, false));
+    assert_eq!(app.session.new_document_preview(), None);
+    // Settings changed just before Create (the preview not made yet) make a new document.
+    app.run("app.newDocumentDialog", json!({})).unwrap();
+    set(&mut app, &ctx, &[]);
+    app.ui.dialog.as_mut().unwrap().fields.insert("pages".into(), json!("2"));
+    frame(&mut app, &ctx, vec![]);
+    crate::dialogs::confirm(&mut app).unwrap();
+    let st = app.session.active().unwrap();
+    assert_eq!((app.session.documents().len(), st.doc.page_count(), st.doc.title.as_str()), (3, 2, "Untitled-3"));
+}
+
+#[test]
+fn presets_are_saved_by_name_and_recent_documents_once() {
+    let mut app = app();
+    let mut d = app.ui.dialog.clone().unwrap();
+    save_preset(&mut app, &mut d, " Newsletter ").unwrap();
+    d.fields.insert("pages".into(), json!(8));
+    save_preset(&mut app, &mut d, "Newsletter").unwrap();
+    assert_eq!(app.session.prefs.document_presets.len(), 1, "the same name replaces the preset");
+    assert!(save_preset(&mut app, &mut d, "Letter").is_err(), "a built-in name is refused");
+    assert_eq!((d.s("tab"), d.s("preset")), ("saved".into(), "saved:Newsletter".into()));
+    let saved = cards(&app, "saved");
+    assert_eq!(saved.len(), 2);
+    assert_eq!((saved[0].key.as_str(), saved[0].nd.pages), (DEFAULT_CARD, 1), "[Default] comes first, as in InDesign");
+    assert_eq!((saved[1].label.as_str(), saved[1].nd.pages), ("Newsletter", 8));
+    let p = params(&d);
+    remember(&mut app, &p);
+    remember(&mut app, &p);
+    assert_eq!(app.ui.recent_new_documents.len(), 1, "a repeat moves to the front");
+}
diff --git a/crates/ui-egui/src/object_control.rs b/crates/ui-egui/src/object_control.rs
index 0a845a38d..e95f7cc5a 100644
--- a/crates/ui-egui/src/object_control.rs
+++ b/crates/ui-egui/src/object_control.rs
@@ -13,7 +13,7 @@ pub(crate) const HEIGHT: f32 = ROW_PITCH + FIELD_H;
 
 fn group(ui: &mut Ui, id: &str, width: f32, draw: impl FnOnce(&mut Ui, Rect)) {
     let (rect, _) = ui.allocate_exact_size(vec2(width, HEIGHT), Sense::hover());
-    ui.interact(rect, egui::Id::new(("object_control", id)), Sense::hover());
+    ui.interact(rect, egui::Id::unique(("object_control", id)), Sense::hover());
     let mut child = ui.new_child(egui::UiBuilder::new().id_salt(id).max_rect(rect).layout(egui::Layout::left_to_right(egui::Align::Center)));
     draw(&mut child, rect);
 }
@@ -32,8 +32,8 @@ fn cell<R>(ui: &mut Ui, group: Rect, x: f32, row: usize, width: f32, enabled: bo
 fn icon(ui: &mut Ui, group: Rect, x: f32, row: usize, name: &str, tip: &str) {
     let rect = Rect::from_min_size(group.min + vec2(x, row as f32 * ROW_PITCH + 2.5), vec2(16.0, 16.0));
     icons::paint(ui.painter(), rect, name, Tokens::get(ui.ctx()).icon);
-    let resp = ui.interact(rect, ui.id().with(("caption", name, row)), Sense::hover());
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, tip));
+    let resp = ui.interact(rect, ui.scope_id().with(("caption", name, row)), Sense::hover());
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, tip));
     resp.on_hover_ui(|ui| {
         crate::rtl::label(ui, tip);
     });
@@ -45,7 +45,7 @@ fn separator(ui: &mut Ui) {
 }
 
 fn toggle(ui: &mut Ui, group: Rect, x: f32, key: &str, tip: &str) -> bool {
-    let id = egui::Id::new(key);
+    let id = egui::Id::unique(key);
     let on = ui.data(|d| d.get_temp::<bool>(id)).unwrap_or(false);
     let rect = Rect::from_min_size(group.min + vec2(x, 12.5), vec2(20.0, FIELD_H));
     if properties::place(ui, rect, |ui| widgets::icon_toggle(ui, if on { "link" } else { "link-broken" }, on, tip)).clicked() {
@@ -56,6 +56,7 @@ fn toggle(ui: &mut Ui, group: Rect, x: f32, key: &str, tip: &str) -> bool {
     }
 }
 
+/// Lay out the fixed two-row control groups for reference, geometry, transform, rotate/flip, appearance, wrap, corners, fitting, alignment and conditional columns.
 pub(crate) fn show(app: &mut DesignApp, ui: &mut Ui) {
     let language = app.ui.language.clone();
     let tr = |text: &str| crate::i18n::tr(&language, text).to_owned();
@@ -184,7 +185,7 @@ pub(crate) fn show(app: &mut DesignApp, ui: &mut Ui) {
                 }
                 if let Some(resp) = chip_resp {
                     let label = tr(if stroke { "Stroke" } else { "Fill" });
-                    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &label));
+                    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &label));
                     resp.on_hover_text(label);
                 }
             });
@@ -362,7 +363,7 @@ mod tests {
     fn bottom_row_spinner_edits_height_inside_the_control_panel() {
         let (ctx, mut app) = fixture(true);
         let before = panels::sel_info(&app).unwrap().page_rect.height();
-        let group = ctx.read_response(egui::Id::new(("object_control", "dimensions"))).unwrap().rect;
+        let group = ctx.read_response(egui::Id::unique(("object_control", "dimensions"))).unwrap().rect;
         assert!(group.bottom() <= 59.0, "second row is inside the panel: {group:?}");
         let height_up = group.min + vec2(123.0 + widgets::SEG_W / 2.0, ROW_PITCH + FIELD_H / 4.0);
         click(&ctx, &mut app, height_up);
@@ -374,7 +375,7 @@ mod tests {
     fn empty_selection_keeps_numeric_controls_inactive() {
         let (ctx, mut app) = fixture(false);
         let status = app.ui.status.clone();
-        let group = ctx.read_response(egui::Id::new(("object_control", "dimensions"))).unwrap().rect;
+        let group = ctx.read_response(egui::Id::unique(("object_control", "dimensions"))).unwrap().rect;
         click(&ctx, &mut app, group.min + vec2(24.0, FIELD_H / 4.0));
         assert_eq!(app.ui.status, status, "disabled spinners do not attempt transforms");
         assert!(panels::sel_info(&app).is_none());
@@ -385,7 +386,7 @@ mod tests {
         let (ctx, mut app) = fixture(true);
         frame_with_width(&ctx, &mut app, vec![], 900.0);
         frame_with_width(&ctx, &mut app, vec![], 900.0);
-        let id = egui::Id::new(("object_control", "align"));
+        let id = egui::Id::unique(("object_control", "align"));
         let before = ctx.read_response(id).unwrap().rect;
         assert!(before.right() > 900.0, "the toolbar overflows at the minimum width");
         frame_with_width(
@@ -398,6 +399,7 @@ mod tests {
                     delta: vec2(-500.0, 0.0),
                     phase: egui::TouchPhase::Move,
                     modifiers: Default::default(),
+                    source: egui::MouseWheelSource::Unknown,
                 },
             ],
             900.0,
diff --git a/crates/ui-egui/src/page_history.rs b/crates/ui-egui/src/page_history.rs
new file mode 100644
index 000000000..177bfcf9c
--- /dev/null
+++ b/crates/ui-egui/src/page_history.rs
@@ -0,0 +1,148 @@
+//! Layout ▸ Go Back / Go Forward: the pages a window has jumped between, in the order it showed them.
+//! InDesign keeps this order for the session, like a web browser's Back and Forward.
+
+use designcraft_doc::ids::PageId;
+use designcraft_geom::Vec2;
+
+/// Entries kept: the oldest go first.
+const LIMIT: usize = 256;
+
+#[derive(Clone, Debug, Default)]
+pub struct PageHistory {
+    /// Each page with where the view centre was on it, as an offset from the page's centre.
+    pages: Vec<(PageId, Vec2)>,
+    /// The entry in view.
+    at: usize,
+}
+
+impl PageHistory {
+    /// A jump or Go Back starts from `page`, the view centre `offset` from the page's centre: the
+    /// entry in view takes that place, wherever scrolling has moved the view since it was recorded,
+    /// as a browser keeps a page's scroll position.
+    pub fn leave(&mut self, page: PageId, offset: Vec2) {
+        match self.pages.get_mut(self.at) {
+            Some(e) => *e = (page, offset),
+            None => self.visit(page, offset),
+        }
+    }
+
+    /// A jump has brought the view to `page`, its centre `offset` from the page's centre. Another page
+    /// than the entry in view drops the entries ahead of it, as a browser does when a link is followed
+    /// after going back.
+    pub fn visit(&mut self, page: PageId, offset: Vec2) {
+        if let Some(e) = self.pages.get_mut(self.at)
+            && e.0 == page
+        {
+            e.1 = offset;
+            return;
+        }
+        self.pages.truncate(self.at.saturating_add(1));
+        self.pages.push((page, offset));
+        if self.pages.len() > LIMIT {
+            self.pages.remove(0);
+        }
+        self.at = self.pages.len().saturating_sub(1);
+    }
+
+    /// The entry Go Back (`step` < 0) or Go Forward goes to: the nearest one that way whose page is
+    /// still in the document and isn't the page in view.
+    fn target(&self, step: isize, exists: impl Fn(PageId) -> bool) -> Option<usize> {
+        let current = self.pages.get(self.at).map(|e| e.0);
+        let usable = |i: &usize| self.pages.get(*i).is_some_and(|&(p, _)| Some(p) != current && exists(p));
+        if step < 0 { (0..self.at).rev().find(usable) } else { (self.at.saturating_add(1)..self.pages.len()).find(usable) }
+    }
+
+    /// Whether Go Back (`step` < 0) or Go Forward has a page to go to.
+    pub fn can_go(&self, step: isize, exists: impl Fn(PageId) -> bool) -> bool {
+        self.target(step, exists).is_some()
+    }
+
+    /// Go Back (`step` < 0) or Go Forward: the page to show and where the view was on it. It becomes
+    /// the entry in view.
+    pub fn go(&mut self, step: isize, exists: impl Fn(PageId) -> bool) -> Option<(PageId, Vec2)> {
+        let i = self.target(step, exists)?;
+        self.at = i;
+        self.pages.get(i).copied()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const ALL: fn(PageId) -> bool = |_| true;
+
+    fn visited(pages: &[u64]) -> PageHistory {
+        let mut h = PageHistory::default();
+        for &p in pages {
+            h.visit(PageId(p), Vec2::ZERO);
+        }
+        h
+    }
+
+    fn page(e: Option<(PageId, Vec2)>) -> Option<u64> {
+        e.map(|(p, _)| p.0)
+    }
+
+    #[test]
+    fn go_back_and_forward_retrace_the_pages_in_the_order_they_were_viewed() {
+        let mut h = visited(&[1, 5, 3]);
+        assert!(!h.can_go(1, ALL), "nothing ahead of the last page viewed");
+        assert_eq!(page(h.go(-1, ALL)), Some(5));
+        assert_eq!(page(h.go(-1, ALL)), Some(1));
+        assert_eq!(h.go(-1, ALL), None, "the first page viewed has nothing before it");
+        assert_eq!(page(h.go(1, ALL)), Some(5));
+        assert_eq!(page(h.go(1, ALL)), Some(3));
+        assert_eq!(h.go(1, ALL), None);
+    }
+
+    #[test]
+    fn going_back_does_not_record_the_page_it_shows() {
+        let mut h = visited(&[1, 5, 3]);
+        let (p, offset) = h.go(-1, ALL).unwrap();
+        // The next jump starts from it.
+        h.leave(p, offset);
+        assert_eq!(page(h.go(1, ALL)), Some(3), "Go Forward still has the page left");
+    }
+
+    #[test]
+    fn an_entry_keeps_the_place_a_jump_left_it_at() {
+        let mut h = visited(&[1, 5]);
+        // Scrolled from page 5 to page 7, then jumped.
+        h.leave(PageId(7), Vec2::new(-200.0, 30.0));
+        h.visit(PageId(9), Vec2::ZERO);
+        assert_eq!(h.go(-1, ALL), Some((PageId(7), Vec2::new(-200.0, 30.0))), "back to where the view was");
+        assert_eq!(page(h.go(-1, ALL)), Some(1), "scrolling added no entry");
+        assert_eq!(page(h.go(1, ALL)), Some(7));
+        assert_eq!(page(h.go(1, ALL)), Some(9), "nor dropped the ones ahead");
+    }
+
+    #[test]
+    fn viewing_another_page_after_going_back_clears_go_forward() {
+        let mut h = visited(&[1, 5, 3]);
+        h.go(-1, ALL);
+        h.visit(PageId(7), Vec2::ZERO);
+        assert_eq!(page(h.go(-1, ALL)), Some(5), "the page gone back to stays behind the new one");
+        assert_eq!(page(h.go(1, ALL)), Some(7));
+        assert!(!h.can_go(1, ALL), "the page that was ahead is gone");
+    }
+
+    #[test]
+    fn deleted_pages_are_skipped() {
+        let mut h = visited(&[1, 5, 3]);
+        let exists = |p: PageId| p != PageId(5);
+        assert_eq!(page(h.go(-1, exists)), Some(1));
+        assert_eq!(page(h.go(1, exists)), Some(3));
+        assert!(!visited(&[5, 3]).can_go(-1, exists), "no page left to go back to");
+    }
+
+    #[test]
+    fn the_history_is_bounded() {
+        let mut h = visited(&(0..LIMIT as u64 + 10).collect::<Vec<_>>());
+        let mut back = 0;
+        while h.go(-1, ALL).is_some() {
+            back += 1;
+        }
+        assert_eq!(back, LIMIT - 1);
+    }
+}
diff --git a/crates/ui-egui/src/panel_docking.rs b/crates/ui-egui/src/panel_docking.rs
index bec168ea1..801a96ae3 100644
--- a/crates/ui-egui/src/panel_docking.rs
+++ b/crates/ui-egui/src/panel_docking.rs
@@ -1,38 +1,54 @@
 //! Application-owned panel IDs and commands around the shared docking layout.
+//!
+//! The window's panels and the canvas are one craft-ui layout: a horizontal split of the
+//! protected `canvas` panel and a dock at the logical end edge (the right in left-to-right
+//! languages, the left in right-to-left ones).
 
-use craft_ui::docking::{Action, Floating, Layout, Node, Placement, Zone};
+use craft_ui::docking::{
+    Action, Column, DockCommand, DockOperation, FloatSpace, Floating, Group, Layout, Node, Permissions, Placement, Side, Target, UiDock, Workspace,
+};
 use serde_json::{Value, json};
 
 use crate::DesignApp;
 
-#[derive(Clone, Default)]
-struct LegacyDrag {
-    layout: Option<Layout<String>>,
-    open_panel: Option<String>,
-    floating: Vec<(String, [f32; 2])>,
-    generation: u64,
+/// The id of the dock area that draws the panels.
+fn area_id() -> egui::Id {
+    egui::Id::unique("designcraft-panel-docking")
 }
 
-pub(crate) fn cancel_gesture(app: &mut DesignApp, ctx: &egui::Context) {
-    cancel_legacy_drag(app, ctx);
-    craft_ui::docking::cancel_drag::<String>(ctx, egui::Id::new("designcraft-panel-docking"));
+/// The dock area a headless app floats into, before it ever drew a frame.
+const HEADLESS_AREA: egui::Rect = egui::Rect::from_min_max(egui::Pos2::ZERO, egui::pos2(1400.0, 900.0));
+
+/// The egui id of a docking control, for tests that press it or read its response.
+#[cfg(test)]
+pub(crate) fn hit_id(hit: &craft_ui::docking::Hit<String>) -> egui::Id {
+    craft_ui::docking::DockArea::<String>::hit_id(area_id(), hit)
 }
 
-fn cancel_legacy_drag(app: &mut DesignApp, ctx: &egui::Context) -> bool {
-    let key = egui::Id::new("designcraft-panel-docking").with("legacy-origin");
-    let previous = ctx.data_mut(|data| data.remove_temp::<LegacyDrag>(key));
-    if let Some(previous) = previous {
-        craft_ui::docking::cancel_drag::<String>(ctx, egui::Id::new("designcraft-panel-docking"));
-        if previous.generation != app.ui.docking_generation {
-            return false;
-        }
-        app.ui.open_panel = previous.open_panel;
-        app.ui.floating = previous.floating;
-        app.ui.docking = previous.layout;
-        true
-    } else {
-        false
+/// The egui id of a panel's tab.
+#[cfg(test)]
+pub(crate) fn tab_id(panel: &str) -> egui::Id {
+    hit_id(&craft_ui::docking::Hit::Tab(panel.to_owned()))
+}
+
+/// The viewports of the floating windows that may have OS windows of their own. Where egui
+/// embeds viewports every floating window stays in the main window.
+pub(crate) fn native_viewports(app: &DesignApp, ctx: &egui::Context) -> Vec<egui::ViewportId> {
+    if ctx.embed_viewports() {
+        return Vec::new();
     }
+    layout_of(app).floating.iter().map(|window| craft_ui::docking::DockArea::<String>::window_viewport(area_id(), window.id)).collect()
+}
+
+/// The egui layer of the floating window whose first panel is `panel`.
+#[cfg(test)]
+pub(crate) fn floating_layer(panel: &str) -> egui::LayerId {
+    let window = Floating::single(vec![panel.to_owned()], 0, [0.0, 0.0, 1.0, 1.0]);
+    craft_ui::docking::DockArea::<String>::floating_layer(area_id(), &window).unwrap_or_else(egui::LayerId::background)
+}
+
+pub(crate) fn cancel_gesture(ctx: &egui::Context) {
+    craft_ui::docking::cancel_drag::<String>(ctx, area_id());
 }
 
 fn normalize(raw: &str) -> Option<&'static str> {
@@ -43,36 +59,320 @@ fn normalize(raw: &str) -> Option<&'static str> {
         .map(|(id, _, _)| *id)
 }
 
-pub(crate) fn valid(layout: &Layout<String>) -> bool {
-    layout.validate().is_ok() && layout.panels().iter().all(|id| normalize(id) == Some(id.as_str()))
+/// The panel that holds the document area. It never moves, floats, closes or takes tabs.
+pub(crate) const CANVAS: &str = "canvas";
+/// Width of an expanded dock column.
+const COLUMN_WIDTH: f32 = 260.0;
+/// Width of an iconic column of bare icons, and of one whose groups show their names.
+const ICON_WIDTH: f32 = 37.0;
+const NAMED_ICON_WIDTH: f32 = 150.0;
+/// Height of the group a workspace opens below Properties · Pages · Layers.
+const OPEN_PANEL_HEIGHT: f32 = 260.0;
+
+fn registered(id: &str) -> bool {
+    id == CANVAS || normalize(id) == Some(id)
 }
 
-fn legacy(app: &DesignApp) -> Layout<String> {
-    let panels: Vec<String> = crate::dock::DOCK_TABS.iter().map(|p| p.0.to_string()).collect();
-    let active = panels.iter().position(|p| p == &app.ui.dock_tab).unwrap_or(0);
-    let mut layout = Layout { root: Some(Node::Tabs { panels, active }), floating: Vec::new() };
-    for (id, at) in &app.ui.floating {
-        if normalize(id).is_some() && !layout.contains(id) && at.iter().all(|v| v.is_finite()) {
-            layout.floating.push(Floating { panels: vec![id.clone()], active: 0, rect: [at[0], at[1], 280.0, 360.0] });
+/// The policy commands and the renderer apply: the canvas is protected.
+fn model_permissions(id: &String) -> Permissions {
+    if id == CANVAS { Permissions::PROTECTED } else { Permissions::default() }
+}
+
+pub(crate) fn valid(layout: &Layout<String>) -> bool {
+    layout.validate().is_ok()
+        && layout.panels().iter().all(|id| registered(id))
+        && Layout { root: layout.root.clone(), floating: Vec::new() }.contains(&CANVAS.to_string())
+}
+
+/// Panels already given a place, so each appears once.
+#[derive(Default)]
+struct Placed(Vec<String>);
+
+impl Placed {
+    /// The registered id of `raw` if no other place holds it yet.
+    fn take(&mut self, raw: &str) -> Option<String> {
+        let id = normalize(raw)?;
+        if self.0.iter().any(|p| p == id) {
+            return None;
+        }
+        self.0.push(id.to_string());
+        Some(id.to_string())
+    }
+
+    /// A group of the unplaced registered panels of `panels`, with the one at `active` in front
+    /// when it is among them.
+    fn group(&mut self, panels: &[impl AsRef<str>], active: usize) -> Option<Group<String>> {
+        let front = panels.get(active).and_then(|p| normalize(p.as_ref()));
+        let kept: Vec<String> = panels.iter().filter_map(|p| self.take(p.as_ref())).collect();
+        let active = front.and_then(|f| kept.iter().position(|p| p == f)).unwrap_or(0);
+        (!kept.is_empty()).then(|| Group::new(kept, active))
+    }
+}
+
+/// The iconic column's groups, top to bottom, in a workspace without its own `icon_groups`:
+/// InDesign's panel families, with a separator only between families.
+const ICON_GROUPS: &[&[&str]] = &[
+    &["stroke", "color", "swatches", "gradient"],
+    &["effects"],
+    &["characterStyles", "paragraphStyles"],
+    &["character", "paragraph", "typography"],
+    &["glyphs", "story"],
+    &["table"],
+    &["textWrap"],
+    &["align", "pathfinder"],
+    &["flexLayout", "liquid"],
+    &["links", "library"],
+    &["info"],
+    &["attributes", "preflight", "separations"],
+    &["notes", "trackChanges", "conditions"],
+    &["hyperlinks", "bookmarks"],
+    &["buttons", "states"],
+    &["media", "transitions"],
+    &["articles", "tags"],
+    &["book", "dataMerge", "scripts"],
+];
+
+/// A workspace's iconic column of the panels not placed yet: its named `icon_groups`
+/// (Essentials Classic, Typography), or [`ICON_GROUPS`] followed by any other dock panel as a
+/// group of its own.
+fn icon_column(icon_groups: Option<&[Vec<String>]>, placed: &mut Placed) -> Option<Column<String>> {
+    let (groups, width): (Vec<Group<String>>, f32) = match icon_groups {
+        Some(groups) => (groups.iter().filter_map(|g| placed.group(g, 0)).collect(), NAMED_ICON_WIDTH),
+        None => {
+            let mut groups: Vec<Group<String>> = ICON_GROUPS.iter().filter_map(|g| placed.group(g, 0)).collect();
+            groups.extend(
+                crate::dock::DOCK_TABS.iter().chain(crate::dock::ICON_PANELS).filter_map(|p| placed.take(p.0)).map(|id| Group::new(vec![id], 0)),
+            );
+            (groups, ICON_WIDTH)
+        }
+    };
+    (!groups.is_empty()).then_some(Column { groups, width: COLUMN_WIDTH, iconic: true, iconic_width: Some(width) })
+}
+
+/// The canvas beside a dock of `columns` (from the window edge inwards) at the logical end edge.
+fn with_canvas(columns: Vec<Column<String>>, floating: Vec<Floating<String>>) -> Layout<String> {
+    let width: f32 = columns.iter().map(|c| if c.iconic { c.iconic_width.unwrap_or(ICON_WIDTH) } else { c.width }).sum();
+    Layout {
+        root: Some(Node::Split {
+            axis: craft_ui::layout::SplitAxis::Horizontal,
+            size: craft_ui::layout::SplitSize::FixedSecond(width),
+            first: Box::new(Node::Tabs { panels: vec![CANVAS.to_string()], active: 0 }),
+            second: Box::new(Node::Dock { side: Side::End, columns }),
+        }),
+        floating,
+    }
+}
+
+/// The layout of a workspace that has not been customized, from its panel settings: the
+/// canvas beside a dock whose outer column is the Properties · Pages · Layers group (with an
+/// the panel the workspace opens stacked below it) and whose inner column is iconic. Essentials Classic
+/// and Typography (`icon_groups`) have the iconic column only.
+pub(crate) fn default_layout(ui: &crate::UiState) -> Layout<String> {
+    let mut placed = Placed::default();
+    let mut floating = Vec::new();
+    for (id, at) in &ui.floating {
+        if at.iter().all(|v| v.is_finite())
+            && let Some(id) = placed.take(id)
+        {
+            // The layout is rebuilt every frame, so each window keeps an id of its panel's (a
+            // native window lives as long as its id).
+            let window = default_window_id(&id);
+            floating.push(Floating::single(vec![id], 0, [at[0], at[1], 280.0, 360.0]).with_id(window));
         }
     }
-    if let Some(id) = &app.ui.open_panel
-        && normalize(id).is_some()
-        && !layout.contains(id)
-    {
-        // Preserve the visible flyout when the first unrelated docking gesture succeeds.
-        if let Some(Node::Tabs { panels, active }) = &mut layout.root {
-            panels.push(id.clone());
-            *active = panels.len().saturating_sub(1);
+    let mut columns = Vec::new();
+    if ui.icon_groups.is_none() {
+        let panels: Vec<String> = crate::dock::DOCK_TABS.iter().filter_map(|p| placed.take(p.0)).collect();
+        let active = panels.iter().position(|p| p == &ui.dock_tab).unwrap_or(0);
+        let mut groups = Vec::new();
+        if !panels.is_empty() {
+            groups.push(Group::new(panels, active));
+        }
+        // The panel a workspace opens (Printing and Proofing: Swatches) goes below at a fixed
+        // height, so Properties keeps most of the column.
+        if let Some(id) = ui.open_panel.as_deref().and_then(|id| placed.take(id)) {
+            groups.push(Group { height: Some(OPEN_PANEL_HEIGHT), ..Group::new(vec![id], 0) });
+        }
+        if !groups.is_empty() {
+            columns.push(Column { groups, width: COLUMN_WIDTH, iconic: !ui.dock_expanded, iconic_width: Some(ICON_WIDTH) });
         }
     }
-    layout
+    columns.extend(icon_column(ui.icon_groups.as_deref(), &mut placed));
+    with_canvas(columns, floating)
+}
+
+/// The window id of a default layout's floating `panel`: the same every time, with the top bit
+/// set, where craft-ui's fresh ids never reach.
+fn default_window_id(panel: &str) -> u64 {
+    use std::hash::{Hash, Hasher};
+    let mut h = std::collections::hash_map::DefaultHasher::new();
+    ("designcraft-default-float", panel).hash(&mut h);
+    h.finish() | 1 << 63
+}
+
+/// Is `layout` from before the canvas joined the panel layout? Those layouts held only the
+/// right dock's panels and floating windows; every later one holds the canvas.
+pub(crate) fn dock_only(layout: &Layout<String>) -> bool {
+    !layout.panels().iter().any(|p| p.as_str() == CANVAS)
+}
+
+/// A [`dock_only`] layout in the current shape: its tab groups, accordions and splits become
+/// the dock's expanded columns (collapsed to icons when the dock was), the panels it does not
+/// hold form the iconic column, and its floating windows stay. Panels closed with a remembered
+/// place (`hidden`) stay closed. None when the layout is invalid.
+pub(crate) fn from_dock_only<'a>(
+    old: &Layout<String>,
+    hidden: impl IntoIterator<Item = &'a String>,
+    dock_expanded: bool,
+    icon_groups: Option<&[Vec<String>]>,
+) -> Option<Layout<String>> {
+    old.validate().ok()?;
+    let mut placed = Placed::default();
+    // Reading order (start to end); a dock lists its columns from the window edge inwards.
+    let mut reading = old.root.as_ref().map(|root| dock_only_columns(root, 0, &mut placed)).unwrap_or_default();
+    reading.reverse();
+    let mut columns: Vec<Column<String>> =
+        reading.into_iter().map(|groups| Column { groups, width: COLUMN_WIDTH, iconic: !dock_expanded, iconic_width: Some(ICON_WIDTH) }).collect();
+    let mut floating = Vec::new();
+    for window in &old.floating {
+        if let Some(root) = unplaced_tree(&window.root, 0, &mut placed) {
+            floating.push(Floating { minimized: window.minimized, ..Floating::new(root, window.rect) });
+        }
+    }
+    for panel in hidden {
+        let _ = placed.take(panel);
+    }
+    columns.extend(icon_column(icon_groups, &mut placed));
+    let layout = with_canvas(columns, floating);
+    valid(&layout).then_some(layout)
+}
+
+/// A floating window's tree with only the panels not placed yet; a split that loses one side
+/// becomes its other side. None when no panel is left.
+fn unplaced_tree(node: &Node<String>, depth: usize, placed: &mut Placed) -> Option<Node<String>> {
+    if depth > craft_ui::docking::MAX_DEPTH {
+        return None;
+    }
+    match node {
+        Node::Tabs { panels, active } => placed.group(panels, *active).map(|g| Node::Tabs { panels: g.panels, active: g.active }),
+        Node::Stack { entries } => {
+            let entries: Vec<_> =
+                entries.iter().filter_map(|e| placed.take(&e.panel).map(|panel| craft_ui::docking::StackEntry { panel, ..e.clone() })).collect();
+            (!entries.is_empty()).then_some(Node::Stack { entries })
+        }
+        Node::Split { axis, size, first, second } => {
+            let first = unplaced_tree(first, depth.saturating_add(1), placed);
+            let second = unplaced_tree(second, depth.saturating_add(1), placed);
+            match (first, second) {
+                (Some(first), Some(second)) => Some(Node::Split { axis: *axis, size: *size, first: Box::new(first), second: Box::new(second) }),
+                (one, other) => one.or(other),
+            }
+        }
+        _ => None,
+    }
+}
+
+/// The groups of a floating window, first to last: its tab groups and accordions.
+pub(crate) fn window_groups(window: &Floating<String>) -> Vec<Group<String>> {
+    let mut out = Vec::new();
+    let mut visit = vec![(&window.root, 0usize)];
+    while let Some((node, depth)) = visit.pop() {
+        if depth > craft_ui::docking::MAX_DEPTH || out.len() > craft_ui::docking::MAX_PANELS {
+            break;
+        }
+        match node {
+            Node::Split { first, second, .. } => {
+                visit.push((second, depth.saturating_add(1)));
+                visit.push((first, depth.saturating_add(1)));
+            }
+            Node::Tabs { panels, active } => out.push(Group::new(panels.clone(), *active)),
+            Node::Stack { entries } => out.push(Group::new(entries.iter().map(|e| e.panel.clone()).collect(), 0)),
+            _ => {}
+        }
+    }
+    out
+}
+
+/// The groups of a dock-only layout's node, column by column in reading order. A vertical split
+/// stacks its parts in one column; a horizontal split puts them side by side.
+fn dock_only_columns(node: &Node<String>, depth: usize, placed: &mut Placed) -> Vec<Vec<Group<String>>> {
+    if depth > craft_ui::docking::MAX_DEPTH {
+        return Vec::new();
+    }
+    let column = |groups: Vec<Group<String>>| if groups.is_empty() { Vec::new() } else { vec![groups] };
+    match node {
+        Node::Tabs { panels, active } => column(placed.group(panels, *active).into_iter().collect()),
+        Node::Stack { entries } => column(
+            entries
+                .iter()
+                .filter_map(|e| placed.take(&e.panel).map(|id| Group { minimized: !e.open, height: e.height, ..Group::new(vec![id], 0) }))
+                .collect(),
+        ),
+        Node::Split { axis, first, second, .. } => {
+            let mut parts = dock_only_columns(first, depth.saturating_add(1), placed);
+            parts.extend(dock_only_columns(second, depth.saturating_add(1), placed));
+            match axis {
+                craft_ui::layout::SplitAxis::Horizontal => parts,
+                _ => column(parts.into_iter().flatten().collect()),
+            }
+        }
+        Node::Dock { columns, .. } => columns
+            .iter()
+            .rev()
+            .filter_map(|c| {
+                let groups: Vec<Group<String>> = c.groups.iter().filter_map(|g| placed.group(&g.panels, g.active)).collect();
+                (!groups.is_empty()).then_some(groups)
+            })
+            .collect(),
+        _ => Vec::new(),
+    }
+}
+
+/// The layout in use: the customized one, or the workspace's default.
+fn layout_of(app: &DesignApp) -> Layout<String> {
+    app.ui.docking.clone().unwrap_or_else(|| default_layout(&app.ui))
+}
+
+/// Is `panel` showing: in front of its group and not in a column collapsed to icons, or in
+/// the open flyout of an iconic column?
+pub(crate) fn showing(app: &DesignApp, panel: &str) -> bool {
+    let layout = layout_of(app);
+    layout.panel_state(&panel.to_string()) == craft_ui::docking::PanelState::Front
+        || (app.ui.docking_flyout.as_deref() == Some(panel) && in_iconic_column(&layout, panel))
+}
+
+/// Is `panel` in a dock column collapsed to icons?
+fn in_iconic_column(layout: &Layout<String>, panel: &str) -> bool {
+    dock_columns(layout).iter().any(|c| c.iconic && c.groups.iter().any(|g| g.panels.iter().any(|p| p == panel)))
+}
+
+/// Every dock column, from each dock's window edge inwards.
+fn dock_columns(layout: &Layout<String>) -> Vec<&Column<String>> {
+    let mut out = Vec::new();
+    let mut visit: Vec<&Node<String>> = layout.root.iter().collect();
+    let mut seen = 0usize;
+    while let Some(node) = visit.pop() {
+        seen = seen.saturating_add(1);
+        if seen > 2 * craft_ui::docking::MAX_PANELS {
+            break;
+        }
+        match node {
+            Node::Split { first, second, .. } => {
+                visit.push(second);
+                visit.push(first);
+            }
+            Node::Dock { columns, .. } => out.extend(columns),
+            _ => {}
+        }
+    }
+    out
 }
 
 /// The panels tabbed with `panel`: its floating group, or its tab group in the dock. A panel in
 /// an accordion, or not in the layout, is a group of its own.
-fn tab_group(layout: &Layout<String>, panel: &str) -> Vec<String> {
-    if let Some(group) = layout.floating.iter().find(|g| g.panels.iter().any(|p| p == panel)) {
+#[cfg(test)]
+pub(crate) fn tab_group(layout: &Layout<String>, panel: &str) -> Vec<String> {
+    if let Some(group) = layout.floating.iter().flat_map(window_groups).find(|g| g.panels.iter().any(|p| p == panel)) {
         return group.panels.clone();
     }
     let mut visit: Vec<&Node<String>> = layout.root.iter().collect();
@@ -88,12 +388,63 @@ fn tab_group(layout: &Layout<String>, panel: &str) -> Vec<String> {
                 visit.push(second);
             }
             Node::Tabs { panels, .. } if panels.iter().any(|p| p == panel) => return panels.clone(),
+            Node::Dock { columns, .. } => {
+                if let Some(group) = columns.iter().flat_map(|c| &c.groups).find(|g| g.panels.iter().any(|p| p == panel)) {
+                    return group.panels.clone();
+                }
+            }
             _ => {}
         }
     }
     vec![panel.to_string()]
 }
 
+/// Where a panel is: its floating window and group, or the path to its tab group, accordion or
+/// dock in the tree with the dock column and group. A different place means the panel moved.
+#[derive(Debug, PartialEq)]
+enum Place {
+    Floating { window: usize, group: usize },
+    Tree { path: Vec<bool>, column: usize, group: usize },
+}
+
+fn place(layout: &Layout<String>, panel: &str) -> Option<Place> {
+    let has = |group: &Group<String>| group.panels.iter().any(|p| p == panel);
+    for (window, floating) in layout.floating.iter().enumerate() {
+        if let Some(group) = window_groups(floating).iter().position(has) {
+            return Some(Place::Floating { window, group });
+        }
+    }
+    let mut visit: Vec<(&Node<String>, Vec<bool>)> = layout.root.iter().map(|node| (node, Vec::new())).collect();
+    let mut seen = 0usize;
+    while let Some((node, path)) = visit.pop() {
+        seen = seen.saturating_add(1);
+        if seen > 2 * craft_ui::docking::MAX_PANELS || path.len() > craft_ui::docking::MAX_DEPTH {
+            return None;
+        }
+        match node {
+            Node::Split { first, second, .. } => {
+                let mut second_path = path.clone();
+                second_path.push(true);
+                let mut first_path = path;
+                first_path.push(false);
+                visit.push((second, second_path));
+                visit.push((first, first_path));
+            }
+            Node::Tabs { panels, .. } if panels.iter().any(|p| p == panel) => return Some(Place::Tree { path, column: 0, group: 0 }),
+            Node::Stack { entries } if entries.iter().any(|e| e.panel == panel) => return Some(Place::Tree { path, column: 0, group: 0 }),
+            Node::Dock { columns, .. } => {
+                for (column, c) in columns.iter().enumerate() {
+                    if let Some(group) = c.groups.iter().position(has) {
+                        return Some(Place::Tree { path, column, group });
+                    }
+                }
+            }
+            _ => {}
+        }
+    }
+    None
+}
+
 /// Is `panel` an open entry of an accordion (which Minimize closes)?
 fn open_in_stack(layout: &Layout<String>, panel: &str) -> bool {
     let mut visit: Vec<&Node<String>> = layout.root.iter().collect();
@@ -113,20 +464,27 @@ fn open_in_stack(layout: &Layout<String>, panel: &str) -> bool {
                     return e.open;
                 }
             }
-            Node::Tabs { .. } => {}
+            _ => {}
         }
     }
     false
 }
 
-fn first_root(layout: &Layout<String>, except: &str) -> Option<String> {
-    let root = Layout { root: layout.root.clone(), floating: Vec::new() };
-    root.panels().into_iter().find(|p| p.as_str() != except).cloned()
+/// Where a panel with no other destination goes: a panel of the first expanded dock column,
+/// else of any column, else of the root.
+fn first_dock_panel(layout: &Layout<String>, except: &str) -> Option<String> {
+    let usable = |p: &&String| p.as_str() != except && p.as_str() != CANVAS;
+    let columns = dock_columns(layout);
+    let in_columns =
+        |iconic: bool| columns.iter().filter(|c| c.iconic == iconic).flat_map(|c| &c.groups).flat_map(|g| &g.panels).find(usable).cloned();
+    in_columns(false).or_else(|| in_columns(true)).or_else(|| {
+        let root = Layout { root: layout.root.clone(), floating: Vec::new() };
+        root.panels().into_iter().find(usable).cloned()
+    })
 }
 
-fn ensure(layout: &mut Layout<String>, panel: &str) -> Result<(), String> {
-    let anchor = first_root(layout, panel);
-    layout.apply(Action::Open { panel: panel.into(), anchor }).map_err(|e| e.to_string())
+fn apply(layout: &mut Layout<String>, action: Action<String>) -> Result<Vec<String>, String> {
+    layout.apply_with_permissions(action, model_permissions).map_err(|e| e.to_string())
 }
 
 fn number(params: &Value, key: &str, default: f32) -> Result<f32, String> {
@@ -140,73 +498,370 @@ fn number(params: &Value, key: &str, default: f32) -> Result<f32, String> {
     }
 }
 
-fn placement(params: &Value) -> Result<Placement<String>, String> {
-    if let Some(before) = params.get("before") {
-        let id = before.as_str().and_then(normalize).ok_or("before must name a panel")?;
-        return Ok(Placement::Tab { before: Some(id.into()) });
+/// The shared docking command a DesignCraft command id names. `window.floatPanel` and
+/// `window.dockPanel` are DesignCraft's names for Float Panel and Dock Panel. `window.workspace`
+/// stays DesignCraft's own command (same id and params), with the other workspace commands.
+fn shared_id(id: &str) -> Option<&'static str> {
+    match id {
+        "window.floatPanel" => Some("window.panel.float"),
+        "window.dockPanel" => Some("window.panel.dock"),
+        "window.workspace" => None,
+        _ => DockCommand::<String>::IDS.iter().copied().find(|known| *known == id),
     }
-    let zone = match params.get("zone") {
-        None => "tab",
-        Some(value) => value.as_str().ok_or("zone must be a string")?,
-    };
-    Ok(match zone {
-        "tab" => Placement::Tab { before: None },
-        "center" => Placement::Split(Zone::Center),
-        "left" => Placement::Split(Zone::Left),
-        "right" => Placement::Split(Zone::Right),
-        "top" => Placement::Split(Zone::Top),
-        "bottom" => Placement::Split(Zone::Bottom),
-        _ => return Err("zone must be tab, center, left, right, top or bottom".into()),
-    })
 }
 
 pub(crate) fn command(app: &mut DesignApp, id: &str, params: &Value) -> Option<Result<Value, String>> {
-    if id == "app.tablePanel" && app.ui.docking.is_some() {
-        let panel = "table".to_string();
-        let visible = app.ui.docking.as_ref().is_some_and(|layout| layout.contains(&panel));
-        return Some(change(app, if visible { "close" } else { "activate" }, &json!({"panel": panel})));
+    if id == "app.tablePanel" {
+        // A Table flyout closes; the panel stays in its icon group.
+        if flyout_open(app, "table") {
+            return Some(Ok(close_flyout(app)));
+        }
+        let id = if showing(app, "table") { "window.panel.close" } else { "window.panel.activate" };
+        return Some(shared_command(app, id, &json!({"panel": "table"})));
     }
-    if id == "window.panel.closeGroup" {
-        return Some(close_group(app, params));
+    if id == "window.collapseToIcons" {
+        return Some(set_iconic(app, true));
     }
-    if id == "window.panel"
-        && let Some(result) = open_floating_group(app, params)
+    if matches!(id, "window.floatPanel" | "window.dockPanel" | "window.panel.float" | "window.panel.dock")
+        && let Some(panel) = params.get("panel").and_then(Value::as_str).filter(|p| crate::dock::float_only(p))
     {
-        return Some(result);
+        return Some(float_only_panel(app, id, panel, params));
     }
-    if id == "window.panel.layout" {
-        return Some(
-            params
-                .get("action")
-                .ok_or_else(|| "action is required".to_string())
-                .and_then(|value| serde_json::from_value::<Action<String>>(value.clone()).map_err(|error| error.to_string()))
-                .and_then(|action| apply_action(app, action)),
-        );
+    if id == "window.panel" {
+        if let Some(result) = open_floating_group(app, params) {
+            return Some(result);
+        }
+        // Float-only panels (Type › Tabs) are not in the layout.
+        let panel = params.get("panel").and_then(Value::as_str).and_then(normalize)?;
+        // Choosing a panel whose flyout is open closes the flyout, as the panel's icon does.
+        if flyout_open(app, panel) {
+            return Some(Ok(close_flyout(app)));
+        }
+        return Some(shared_command(app, "window.panel.activate", params));
     }
-    let operation = match id {
-        "window.panel.move" => "move",
-        "window.panel.float" | "window.floatPanel" => "float",
-        "window.panel.dock" | "window.dockPanel" => "dock",
-        "window.panel.activate" => "activate",
-        "window.panel.close" => "close",
-        "window.panel" if app.ui.docking.is_some() => "activate",
-        _ => return None,
-    };
-    Some(change(app, operation, params))
+    let id = shared_id(id)?;
+    Some(shared_command(app, id, params))
 }
 
-// UI output and automation share this atomic dispatcher. The application owns the registry
-// and saved return locations; craft-ui owns tree validation and structural changes.
-fn apply_action(app: &mut DesignApp, action: Action<String>) -> Result<Value, String> {
-    let registered = |id: &String| normalize(id) == Some(id.as_str());
-    let known = match &action {
+/// Is `panel` showing in the open flyout of an iconic column?
+fn flyout_open(app: &DesignApp, panel: &str) -> bool {
+    app.ui.docking_flyout.as_deref() == Some(panel) && in_iconic_column(&layout_of(app), panel)
+}
+
+/// Close the open flyout; the layout is unchanged.
+fn close_flyout(app: &mut DesignApp) -> Value {
+    app.ui.docking_flyout = None;
+    if let Some(ctx) = app.egui_ctx.as_ref() {
+        craft_ui::docking::close_flyout::<String>(ctx, area_id());
+    }
+    json!({"layout": layout_of(app), "closed": [], "floating": floating_panels(app)})
+}
+
+/// Command params with DesignCraft's panel names resolved (a panel id or English name, in any
+/// case) and `onto` read as `anchor`.
+fn resolve_panels(params: &Value) -> Result<Value, String> {
+    let mut params = if params.is_null() { json!({}) } else { params.clone() };
+    let fields = params.as_object_mut().ok_or("params must be an object")?;
+    if let Some(onto) = fields.remove("onto") {
+        fields.entry("anchor").or_insert(onto);
+    }
+    for key in ["panel", "anchor", "target", "before"] {
+        let Some(value) = fields.get_mut(key) else { continue };
+        if key == "before" && value.is_null() {
+            continue;
+        }
+        let id = value.as_str().and_then(normalize).ok_or_else(|| format!("{key} must name a registered panel"))?;
+        *value = Value::String(id.to_owned());
+    }
+    Ok(params)
+}
+
+/// A shared docking command (`window.panel.*`, `window.workspace.*`, `ui.dock`) on the layout in
+/// use, all or nothing. craft-ui's `DockCommand` parses it and makes the layout actions;
+/// DesignCraft resolves panel names, shows a hidden panel before moving, floating or docking
+/// it, and returns a floated panel to its dock place on Dock Panel.
+fn shared_command(app: &mut DesignApp, id: &str, params: &Value) -> Result<Value, String> {
+    let mut params = resolve_panels(params)?;
+    if let Some(fields) = params.as_object_mut() {
+        fields.insert("command".into(), Value::String(id.to_owned()));
+    }
+    let command: DockCommand<String> = serde_json::from_value(params).map_err(|e| e.to_string())?;
+    match &command {
+        DockCommand::Workspace { name } => return app.run("window.workspace", json!({"name": name})),
+        DockCommand::NewWorkspace { name } => return app.run("window.newWorkspace", json!({"name": name})),
+        DockCommand::DeleteWorkspace { name } => return app.run("window.deleteWorkspace", json!({"name": name})),
+        DockCommand::ResetWorkspace {} => return app.run("window.resetWorkspace", json!({})),
+        DockCommand::Lock { .. } => return Err("Lock Workspace is not available in DesignCraft".into()),
+        DockCommand::Window { .. } => {
+            return Err(
+                "Move Panel to New Window is not available: a floating panel has its own window on the desktop and stays in the page on the web"
+                    .into(),
+            );
+        }
+        _ => {}
+    }
+    // A zone is a side of `anchor`. DesignCraft's docks are columns beside the canvas, so a dock at
+    // a window edge is a `side`, not a frame on the outer edge (craft-ui's `Placement::Edge`).
+    if let DockCommand::Dock { anchor: None, side: None, zone: Some(_), .. } = &command {
+        return Err("zone needs an anchor: dock beside a panel with anchor, or in a new dock column with side (Start or End)".into());
+    }
+    let rtl = crate::i18n::is_rtl(&app.ui.language);
+    let space = float_space(app);
+    let mut txn = Transaction::begin(app)?;
+    let shows = match &command {
+        DockCommand::Activate { panel }
+        | DockCommand::Move { panel, .. }
+        | DockCommand::Float { panel, .. }
+        | DockCommand::Dock { panel, .. }
+        | DockCommand::UiDock(UiDock::Operation(DockOperation::Open { panel } | DockOperation::Activate { panel })) => Some(panel.clone()),
+        _ => None,
+    };
+    let mut shown = false;
+    if let Some(panel) = shows.as_ref().filter(|p| !txn.workspace.layout.contains(p)) {
+        let fallback = first_dock_panel(&txn.workspace.layout, panel);
+        txn.workspace.set_visible(panel.clone(), true, fallback, model_permissions).map_err(|e| e.to_string())?;
+        shown = true;
+    }
+    let returned = match &command {
+        DockCommand::Dock { panel, anchor: None, side: None, group, column: false, .. } if !shown => {
+            txn.dock_group_back(panel)? || (!group && txn.dock_back(panel)?)
+        }
+        _ => false,
+    };
+    let actions = match &command {
+        // Showing it was the whole command (craft-ui's `DockCommand::apply` does the same).
+        DockCommand::Dock { anchor: None, side: None, .. } if shown || returned => Vec::new(),
+        _ => command.to_actions(&txn.workspace, rtl, &space).map_err(|e| e.to_string())?,
+    };
+    let reveal = match &command {
+        DockCommand::Layout { action } | DockCommand::UiDock(UiDock::Action { action }) => match action {
+            Action::Activate { panel } | Action::Open { panel, .. } | Action::OpenAt { panel, .. } => Some(panel.clone()),
+            _ => None,
+        },
+        DockCommand::UiDock(UiDock::Operation(
+            DockOperation::Float { panel, .. } | DockOperation::MoveFloating { panel, .. } | DockOperation::Move { panel, .. },
+        )) => Some(panel.clone()),
+        _ => shows,
+    };
+    let mut closed = Vec::new();
+    for action in actions {
+        closed.extend(txn.apply(action)?);
+    }
+    Ok(txn.commit(app, closed, reveal))
+}
+
+/// Where floating windows may go: the window, below the title-bar strip when DesignCraft draws
+/// its own title bar under macOS's transparent one. A floating window in that strip would take
+/// presses that move the whole app window.
+fn float_bounds(app: &DesignApp, ctx: &egui::Context) -> egui::Rect {
+    let mut r = ctx.content_rect();
+    if app.integrated_titlebar {
+        r.min.y = (r.min.y + crate::chrome::MAC_APP_BAR).min(r.max.y);
+    }
+    r
+}
+
+/// Where a command floats a panel, group or column it gives no rect: inside the dock area as
+/// last drawn, else inside the window, else (headless, before any frame) inside
+/// [`HEADLESS_AREA`].
+/// Seeded with every panel's own size, so a panel the area never drew (shown from hidden by the
+/// same command, or headless) floats at that size too.
+fn float_space(app: &DesignApp) -> FloatSpace<String> {
+    let space = match app.egui_ctx.as_ref() {
+        Some(ctx) => craft_ui::docking::float_space::<String>(ctx, area_id()).unwrap_or_else(|| FloatSpace::new(float_bounds(app, ctx))),
+        None => FloatSpace::new(HEADLESS_AREA),
+    };
+    crate::dock::DOCK_TABS
+        .iter()
+        .chain(crate::dock::ICON_PANELS)
+        .fold(space, |space, (id, _, _)| space.with_panel_size((*id).to_owned(), floating_size(id)))
+}
+
+/// A change to the layout in use, committed only when every step succeeded.
+struct Transaction {
+    /// The layout, and the closed panels with where each one goes back.
+    workspace: Workspace<String>,
+    /// Where each floating panel was docked before it floated, for Dock Panel.
+    returns: crate::HiddenPanels,
+}
+
+impl Transaction {
+    fn begin(app: &DesignApp) -> Result<Self, String> {
+        if app.ui.docking.as_ref().is_some_and(|layout| !valid(layout)) {
+            return Err("saved panel layout is invalid; reset the workspace first".into());
+        }
+        let layout = layout_of(app);
+        let mut workspace = Workspace::new(layout);
+        let mut returns = crate::HiddenPanels::default();
+        for (panel, location) in
+            app.ui.docking_hidden.0.iter().filter(|(id, _)| normalize(id) == Some(id.as_str())).take(craft_ui::docking::MAX_PANELS)
+        {
+            if !workspace.layout.contains(panel) {
+                workspace.hidden.push((panel.clone(), location.clone()));
+            } else if workspace.layout.floating.iter().any(|w| w.contains(panel)) {
+                returns.insert(panel.clone(), location.clone());
+            }
+        }
+        Ok(Self { workspace, returns })
+    }
+
+    /// Dock Panel for a floating panel that floated from the dock: back to that place, while
+    /// the panel it was beside is still docked. True when it went back.
+    fn dock_back(&mut self, panel: &String) -> Result<bool, String> {
+        let layout = &self.workspace.layout;
+        if !layout.floating.iter().any(|w| w.contains(panel)) {
+            return Ok(false);
+        }
+        let docked = Layout { root: layout.root.clone(), floating: Vec::new() };
+        let Some(location) = self
+            .returns
+            .get(panel)
+            .filter(|location| location.floating.is_none() && location.anchor.as_ref().is_none_or(|anchor| docked.contains(anchor)))
+        else {
+            return Ok(false);
+        };
+        let mut candidate = layout.clone();
+        apply(&mut candidate, Action::Close { panel: panel.clone() })?;
+        if candidate.restore(panel.clone(), location).is_err() {
+            return Ok(false);
+        }
+        self.workspace.layout = candidate;
+        self.returns.remove(panel);
+        Ok(true)
+    }
+
+    /// Dock Panel for a panel of a floating group that floated from the dock as one: the whole
+    /// group back to that place, in the same column beside the same neighbour, while that
+    /// neighbour is still docked. True when it went back.
+    fn dock_group_back(&mut self, panel: &String) -> Result<bool, String> {
+        let layout = &self.workspace.layout;
+        let Some(group) = layout.floating.iter().flat_map(window_groups).find(|g| g.panels.contains(panel)) else {
+            return Ok(false);
+        };
+        let Some(location) = self.returns.get(panel).cloned() else {
+            return Ok(false);
+        };
+        // A group of one docks back as a panel. Every member keeps the same group place only
+        // while the group is the one that floated.
+        if group.panels.len() < 2 || !group.panels.iter().all(|p| self.returns.get(p) == Some(&location)) {
+            return Ok(false);
+        }
+        let docked = Layout { root: layout.root.clone(), floating: Vec::new() };
+        let Some(anchor) = location.anchor.clone().filter(|anchor| docked.contains(anchor)) else {
+            return Ok(false);
+        };
+        if !matches!(location.placement, Placement::Group { .. } | Placement::Column { .. }) {
+            return Ok(false);
+        }
+        let mut candidate = layout.clone();
+        let to = Target::At { anchor, placement: location.placement.clone() };
+        if apply(&mut candidate, Action::MoveGroup { panel: panel.clone(), to }).is_err() {
+            return Ok(false);
+        }
+        let mut state = Vec::new();
+        if let Some(saved) = &location.group {
+            state.push(Action::ResizeGroup { panel: panel.clone(), height: saved.height });
+            state.push(Action::SetMinimized { panel: panel.clone(), minimized: saved.minimized });
+            // A group that had a column of its own gets that column back as it was.
+            if let (Placement::Column { .. }, Some(column)) = (&location.placement, saved.column) {
+                state.push(Action::ResizeColumn { panel: panel.clone(), width: column.width });
+                state.push(Action::SetIconic { panel: panel.clone(), iconic: column.iconic });
+            }
+        }
+        for action in state {
+            apply(&mut candidate, action)?;
+        }
+        self.workspace.layout = candidate;
+        for member in &group.panels {
+            self.returns.remove(member);
+        }
+        Ok(true)
+    }
+
+    /// One action from a command or the renderer, for registered panels only. Floating a
+    /// docked panel, or its whole group, remembers its place for Dock Panel.
+    fn apply(&mut self, action: Action<String>) -> Result<Vec<String>, String> {
+        if !known(&action) {
+            return Err("docking action contains an unknown panel or an excessive split path".into());
+        }
+        if let Action::Float { panel, .. } = &action
+            && let Ok(location) = self.workspace.layout.location(panel)
+            && location.floating.is_none()
+        {
+            self.returns.insert(panel.clone(), location);
+        }
+        if let Action::MoveGroup { panel, to: Target::Float { .. } } = &action
+            && let Some((members, location)) = docked_group_place(&self.workspace.layout, panel)
+        {
+            for member in members {
+                self.returns.insert(member, location.clone());
+            }
+        }
+        self.workspace.apply(action, model_permissions).map_err(|e| e.to_string())
+    }
+
+    /// Store the result. `reveal` is the panel the command showed, raised (or its flyout opened)
+    /// on the next frame.
+    fn commit(self, app: &mut DesignApp, closed: Vec<String>, reveal: Option<String>) -> Value {
+        let Self { workspace, returns } = self;
+        let layout = workspace.layout;
+        let floating = |p: &String| layout.floating.iter().any(|w| w.contains(p));
+        let mut hidden = crate::HiddenPanels(workspace.hidden);
+        for (panel, location) in returns.0 {
+            if floating(&panel) && !hidden.contains_key(&panel) {
+                hidden.0.push((panel, location));
+            }
+        }
+        let reveal = reveal.filter(|panel| layout.contains(panel));
+        let flyout = reveal.as_ref().filter(|panel| in_iconic_column(&layout, panel)).cloned();
+        // Focus stays on a panel only while it stays where the user left it, as craft-ui's tab
+        // focus does: a command that moves it gives the focus up.
+        let before = layout_of(app);
+        if app.ui.docking_focused.as_deref().is_some_and(|panel| panel != CANVAS && place(&before, panel) != place(&layout, panel)) {
+            app.ui.docking_focused = None;
+        }
+        app.ui.docking = Some(layout);
+        app.ui.docking_hidden = hidden;
+        release_closed(app, &closed);
+        keep_float_only(app);
+        if let Some(panel) = reveal {
+            app.ui.docking_opened = Some(panel.clone());
+            app.ui.docking_raise = Some(panel);
+            app.ui.docking_flyout = flyout;
+        } else if app.ui.docking_opened.as_ref().is_some_and(|panel| !app.ui.docking.as_ref().is_some_and(|layout| layout.contains(panel))) {
+            app.ui.docking_opened = None;
+        }
+        release_flyout(app);
+        app.ui.open_panel = None;
+        json!({"layout": app.ui.docking, "closed": closed, "floating": floating_panels(app)})
+    }
+}
+
+/// The panels of the docked group holding `panel`, and that group's place as a whole: beside
+/// the group or column next to it, with its group and column state. None when `panel` is not
+/// in a dock.
+fn docked_group_place(layout: &Layout<String>, panel: &String) -> Option<(Vec<String>, craft_ui::docking::Location<String>)> {
+    let members = dock_columns(layout).into_iter().flat_map(|c| &c.groups).find(|g| g.panels.contains(panel))?.panels.clone();
+    // The place of the group's last panel left in it is the group's own place.
+    let mut alone = layout.clone();
+    for other in members.iter().filter(|p| *p != panel) {
+        apply(&mut alone, Action::Close { panel: other.clone() }).ok()?;
+    }
+    let location = alone.location(panel).ok().filter(|l| l.floating.is_none())?;
+    Some((members, location))
+}
+
+/// Whether every panel an action names is registered (and a split path is not excessive).
+/// The application owns the registry; craft-ui owns tree validation and structural changes.
+fn known(action: &Action<String>) -> bool {
+    let registered = |id: &String| self::registered(id);
+    let tab = |placement: &Placement<String>| match placement {
+        Placement::Tab { before: Some(id) } => registered(id),
+        _ => true,
+    };
+    match action {
         Action::Move { panel, anchor, placement } | Action::OpenAt { panel, anchor, placement } => {
-            registered(panel)
-                && registered(anchor)
-                && match placement {
-                    Placement::Tab { before: Some(id) } => registered(id),
-                    _ => true,
-                }
+            registered(panel) && registered(anchor) && tab(placement)
         }
         Action::Open { panel, anchor } => registered(panel) && anchor.as_ref().is_none_or(registered),
         Action::Float { panel, .. }
@@ -216,93 +871,67 @@ fn apply_action(app: &mut DesignApp, action: Action<String>) -> Result<Value, St
         | Action::SetStackOpen { panel, .. }
         | Action::ResizeStack { panel, .. } => registered(panel),
         Action::ResizeSplit { path, .. } => path.len() <= craft_ui::docking::MAX_DEPTH,
-    };
-    if !known {
-        return Err("docking action contains an unknown panel or an excessive split path".into());
-    }
-    if app.ui.docking.as_ref().is_some_and(|layout| !valid(layout)) {
-        return Err("saved panel layout is invalid; reset the workspace first".into());
-    }
-    let mut layout = app.ui.docking.clone().unwrap_or_else(|| legacy(app));
-    let returning = match &action {
-        Action::Close { panel } => layout.location(panel).ok().map(|location| (panel.clone(), location)),
-        Action::Float { panel, .. } => {
-            layout.location(panel).ok().filter(|location| location.floating.is_none()).map(|location| (panel.clone(), location))
-        }
-        _ => None,
-    };
-    let reveal = match &action {
-        Action::Activate { panel } | Action::Open { panel, .. } | Action::OpenAt { panel, .. } => Some(panel.clone()),
-        _ => None,
-    };
-    layout.apply(action).map_err(|error| error.to_string())?;
-    if let Some((panel, location)) = returning {
-        app.ui.docking_hidden.insert(panel, location);
-    }
-    app.ui.docking = Some(layout);
-    sync_legacy(app);
-    if let Some(panel) = reveal {
-        app.ui.docking_opened = Some(panel.clone());
-        app.ui.docking_raise = Some(panel);
-        app.ui.dock_expanded = true;
-    } else if app.ui.docking_opened.as_ref().is_some_and(|panel| !app.ui.docking.as_ref().is_some_and(|layout| layout.contains(panel))) {
-        app.ui.docking_opened = None;
-    }
-    app.ui.open_panel = None;
-    Ok(json!({"layout": app.ui.docking}))
-}
-
-/// The panel in front of each tab group in the dock (not the floating groups).
-fn front_tabs(layout: &Layout<String>) -> Vec<String> {
-    let mut out = Vec::new();
-    let mut visit: Vec<&Node<String>> = layout.root.iter().collect();
-    while let Some(node) = visit.pop() {
-        if out.len() > craft_ui::docking::MAX_PANELS {
-            break;
-        }
-        match node {
-            Node::Split { first, second, .. } => {
-                visit.push(first);
-                visit.push(second);
-            }
-            Node::Tabs { panels, active } => out.extend(panels.get(*active).cloned()),
-            Node::Stack { .. } => {}
-        }
-    }
-    out
-}
-
-/// Bring each of `front` back in front of the dock tab group that holds it.
-fn restore_front_tabs(layout: &mut Layout<String>, front: &[String]) {
-    let mut visit: Vec<&mut Node<String>> = layout.root.iter_mut().collect();
-    let mut seen = 0usize;
-    while let Some(node) = visit.pop() {
-        seen = seen.saturating_add(1);
-        if seen > 2 * craft_ui::docking::MAX_PANELS {
-            break;
-        }
-        match node {
-            Node::Split { first, second, .. } => {
-                visit.push(first);
-                visit.push(second);
-            }
-            Node::Tabs { panels, active } => {
-                if let Some(i) = panels.iter().position(|p| front.contains(p)) {
-                    *active = i;
+        Action::ResizeWindowSplit { panel, path, .. } => registered(panel) && path.len() <= craft_ui::docking::MAX_DEPTH,
+        Action::MovePanel { panel, to } | Action::MoveGroup { panel, to } | Action::MoveColumn { panel, to } | Action::MoveWindow { panel, to } => {
+            registered(panel)
+                && match to {
+                    Target::At { anchor, placement } => registered(anchor) && tab(placement),
+                    _ => true,
                 }
-            }
-            Node::Stack { .. } => {}
         }
+        Action::CloseGroup { panel }
+        | Action::CloseWindow { panel }
+        | Action::CloseOthers { panel }
+        | Action::SetMinimized { panel, .. }
+        | Action::SetIconic { panel, .. }
+        | Action::ResizeColumn { panel, .. }
+        | Action::ResizeGroup { panel, .. }
+        | Action::ResizeIconic { panel, .. }
+        | Action::SetNative { panel, .. }
+        | Action::SetMonitor { panel, .. } => registered(panel),
+        // Actions newer than this list are rejected until DesignCraft checks them.
+        _ => false,
     }
 }
 
+/// Type › Tabs and the other float-only panels: their own windows outside the docking layout,
+/// listed in `UiState::floating` with their top-left positions.
+fn float_only_panel(app: &mut DesignApp, id: &str, panel: &str, params: &Value) -> Result<Value, String> {
+    let at = if matches!(id, "window.floatPanel" | "window.panel.float") {
+        Some([number(params, "x", 400.0)?, number(params, "y", 160.0)?])
+    } else {
+        None
+    };
+    app.ui.floating.retain(|(p, _)| p != panel);
+    if let Some(at) = at {
+        app.ui.floating.push((panel.to_string(), at));
+    }
+    Ok(json!({"panel": panel, "floating": floating_panels(app)}))
+}
+
+/// Once the layout is customized it holds every floating dock panel, so `UiState::floating`
+/// keeps only the float-only panels.
+fn keep_float_only(app: &mut DesignApp) {
+    if app.ui.docking.is_some() {
+        app.ui.floating.retain(|(id, _)| crate::dock::float_only(id));
+    }
+}
+
+/// Every floating panel: the layout's floating windows, then the float-only panels.
+pub(crate) fn floating_panels(app: &DesignApp) -> Vec<String> {
+    let layout = layout_of(app);
+    let docked = layout.floating.iter().flat_map(|w| w.panels().cloned());
+    docked.chain(app.ui.floating.iter().filter(|(id, _)| crate::dock::float_only(id)).map(|(id, _)| id.clone())).collect()
+}
+
 /// Panels InDesign opens together as one floating group from the Window menu, in tab order:
 /// Window › Styles › Paragraph Styles (or Character Styles) brings both.
 const FLOATING_GROUPS: &[&[&str]] = &[&["characterStyles", "paragraphStyles"]];
 
 /// Window › a panel of a [`FLOATING_GROUPS`] group none of whose panels is showing: the group
-/// opens floating over the right of the canvas, with that panel in front. None otherwise (the
-/// panel opens as before).
+/// opens as one floating window over the right of the canvas, with that panel in front. A group
+/// that is an icon group of the default workspaces floats out of the iconic column. None
+/// otherwise (the panel opens as before).
 fn open_floating_group(app: &mut DesignApp, params: &Value) -> Option<Result<Value, String>> {
     let panel = params.get("panel").and_then(Value::as_str).and_then(normalize)?;
     let group = FLOATING_GROUPS.iter().find(|g| g.contains(&panel))?;
@@ -311,127 +940,92 @@ fn open_floating_group(app: &mut DesignApp, params: &Value) -> Option<Result<Val
         return None;
     }
     // A panel closed from a place in the dock comes back there.
-    if group.iter().any(|p| app.ui.docking_hidden.get(*p).is_some_and(|l| l.floating.is_none())) {
+    if group.iter().any(|p| app.ui.docking_hidden.get(p).is_some_and(|l| l.floating.is_none())) {
         return None;
     }
-    let layout = app.ui.docking.clone().unwrap_or_else(|| legacy(app));
+    let layout = layout_of(app);
+    let (w, h) = (290.0, 340.0);
+    let (x, y) = app.canvas_rect.map_or((400.0, 140.0), |r| ((r.right() - w - 24.0).max(r.left()), r.top() + 96.0));
+    let icon_group = dock_columns(&layout)
+        .iter()
+        .filter(|c| c.iconic)
+        .flat_map(|c| &c.groups)
+        .any(|g| g.panels.len() == group.len() && g.panels.iter().all(|p| group.contains(&p.as_str())));
+    if icon_group && !group.iter().any(|p| showing(app, p)) {
+        let float = json!({"panel": panel, "group": true, "x": x, "y": y, "width": w, "height": h});
+        return Some(
+            shared_command(app, "window.panel.float", &float).and_then(|_| shared_command(app, "window.panel.activate", &json!({"panel": panel}))),
+        );
+    }
     if group.iter().any(|p| layout.contains(&p.to_string())) {
         return None;
     }
-    let (w, h) = (290.0, 340.0);
-    let (x, y) = app.canvas_rect.map_or((400.0, 140.0), |r| ((r.right() - w - 24.0).max(r.left()), r.top() + 96.0));
-    let before = (app.ui.docking.clone(), app.ui.docking_hidden.clone(), app.ui.floating.clone(), app.ui.open_panel.clone());
-    // The dock's tab in front stays in front (opening a panel passes through the dock).
-    let front = front_tabs(&layout);
     let open = |app: &mut DesignApp| -> Result<Value, String> {
-        let first = group.first().ok_or("empty panel group")?;
-        change(app, "float", &json!({"panel": first, "x": x, "y": y, "width": w, "height": h}))?;
-        for p in group.get(1..).unwrap_or_default() {
-            change(app, "move", &json!({"panel": p, "anchor": first}))?;
-        }
-        change(app, "activate", &json!({"panel": panel}))
+        let mut txn = Transaction::begin(app)?;
+        let panels: Vec<String> = group.iter().map(|p| (*p).to_string()).collect();
+        let active = group.iter().position(|p| *p == panel).unwrap_or(0);
+        let mut layout = txn.workspace.layout.clone();
+        layout.floating.push(Floating::single(panels, active, [x, y, w, h]));
+        layout.validate().map_err(|e| e.to_string())?;
+        txn.workspace.layout = layout;
+        txn.workspace.hidden.retain(|(p, _)| !group.contains(&p.as_str()));
+        Ok(txn.commit(app, Vec::new(), Some(panel.to_string())))
     };
-    let result = open(app);
-    if result.is_ok()
-        && let Some(layout) = app.ui.docking.as_mut()
-    {
-        restore_front_tabs(layout, &front);
-    }
-    if result.is_err() {
-        // All or nothing.
-        (app.ui.docking, app.ui.docking_hidden, app.ui.floating, app.ui.open_panel) = before;
-    }
-    Some(result)
+    Some(open(app))
 }
 
-fn change(app: &mut DesignApp, operation: &str, params: &Value) -> Result<Value, String> {
-    let panel = params.get("panel").and_then(Value::as_str).and_then(normalize).ok_or("panel must name a registered panel")?;
+/// Forget what DesignCraft keeps about panels that just closed: the focus, the panel last
+/// opened (for `ui.set closePanel`) and a pending raise.
+fn release_closed(app: &mut DesignApp, closed: &[String]) {
+    for slot in [&mut app.ui.docking_focused, &mut app.ui.docking_opened, &mut app.ui.docking_raise, &mut app.ui.docking_flyout] {
+        if slot.as_ref().is_some_and(|panel| closed.contains(panel)) {
+            *slot = None;
+        }
+    }
+}
+
+/// Forget the panel focused, opened, raised or showing as a flyout: the workspace was replaced.
+pub(crate) fn forget_panels(app: &mut DesignApp) {
+    app.ui.docking_focused = None;
+    app.ui.docking_opened = None;
+    app.ui.docking_raise = None;
+    app.ui.docking_flyout = None;
+}
+
+/// A flyout opens only from an iconic column; forget it once its panel is no longer in one.
+fn release_flyout(app: &mut DesignApp) {
+    let layout = layout_of(app);
+    if app.ui.docking_flyout.as_deref().is_some_and(|panel| !in_iconic_column(&layout, panel)) {
+        app.ui.docking_flyout = None;
+    }
+}
+
+/// Window › Collapse to Icons collapses every dock column; `iconic: false` (the control
+/// channel's `dockExpanded`) expands the outer column.
+pub(crate) fn set_iconic(app: &mut DesignApp, iconic: bool) -> Result<Value, String> {
     if app.ui.docking.as_ref().is_some_and(|layout| !valid(layout)) {
         return Err("saved panel layout is invalid; reset the workspace first".into());
     }
-    let mut layout = app.ui.docking.clone().unwrap_or_else(|| legacy(app));
-    let mut hidden: std::collections::BTreeMap<_, _> =
-        app.ui.docking_hidden.iter().filter(|(id, _)| normalize(id).is_some()).take(64).map(|(id, at)| (id.clone(), at.clone())).collect();
-    let mut restored = false;
-    if operation == "dock"
-        && params.get("anchor").or_else(|| params.get("onto")).is_none()
-        && let Some(location) = hidden.get(panel).filter(|location| {
-            location.floating.is_none()
-                && location.anchor.as_ref().is_none_or(|anchor| Layout { root: layout.root.clone(), floating: Vec::new() }.contains(anchor))
-        })
-    {
-        let mut candidate = layout.clone();
-        if candidate.contains(&panel.to_string()) {
-            candidate.apply(Action::Close { panel: panel.into() }).map_err(|e| e.to_string())?;
-        }
-        if candidate.restore(panel.into(), location).is_ok() {
-            layout = candidate;
-            restored = true;
-            hidden.remove(panel);
-        }
-    }
-    match operation {
-        "dock" if restored => {}
-        "float" => {
-            let rect = [number(params, "x", 400.0)?, number(params, "y", 140.0)?, number(params, "width", 300.0)?, number(params, "height", 400.0)?];
-            ensure(&mut layout, panel)?;
-            if let Ok(location) = layout.location(&panel.to_string())
-                && location.floating.is_none()
-            {
-                hidden.insert(panel.into(), location);
-            }
-            layout.apply(Action::Float { panel: panel.into(), rect }).map_err(|e| e.to_string())?;
-        }
-        "move" | "dock" => {
-            if operation == "move" && params.get("anchor").or_else(|| params.get("onto")).is_none() {
-                return Err("move requires a destination panel".into());
-            }
-            let anchor = match params.get("anchor").or_else(|| params.get("onto")) {
-                Some(v) => Some(v.as_str().and_then(normalize).ok_or("anchor must name a registered panel")?.to_string()),
-                None => first_root(&layout, panel),
-            };
-            let placement = placement(params)?;
-            if let Some(anchor) = anchor {
-                ensure(&mut layout, panel)?;
-                layout.apply(Action::Move { panel: panel.into(), anchor, placement }).map_err(|e| e.to_string())?;
-            } else if operation == "dock" {
-                if layout.contains(&panel.to_string()) {
-                    layout.apply(Action::Close { panel: panel.into() }).map_err(|e| e.to_string())?;
-                }
-                layout.apply(Action::Open { panel: panel.into(), anchor: None }).map_err(|e| e.to_string())?;
-            } else {
-                return Err("move requires an existing destination panel".into());
-            }
-        }
-        "close" => {
-            hidden.insert(panel.into(), layout.location(&panel.to_string()).map_err(|e| e.to_string())?);
-            layout.apply(Action::Close { panel: panel.into() }).map_err(|e| e.to_string())?;
-        }
-        _ => {
-            if !layout.contains(&panel.to_string())
-                && let Some(location) = hidden.get(panel)
-            {
-                // A missing neighbor is allowed: the normal visible dock becomes the fallback.
-                let _ = layout.restore(panel.into(), location);
-            }
-            ensure(&mut layout, panel)?;
-            hidden.remove(panel);
-        }
+    let mut layout = layout_of(app);
+    let columns = dock_columns(&layout);
+    let firsts = |c: &&Column<String>| c.groups.first().and_then(|g| g.panels.first()).cloned();
+    let targets: Vec<String> = if iconic {
+        columns.iter().filter(|c| !c.iconic).filter_map(firsts).collect()
+    } else {
+        columns.first().filter(|c| c.iconic).and_then(firsts).into_iter().collect()
+    };
+    for panel in targets {
+        apply(&mut layout, Action::SetIconic { panel, iconic })?;
     }
     app.ui.docking = Some(layout);
-    app.ui.docking_hidden = hidden;
-    sync_legacy(app);
+    app.ui.dock_expanded = !iconic;
     app.ui.open_panel = None;
-    app.ui.docking_opened = if operation == "close" { None } else { Some(panel.to_owned()) };
-    app.ui.docking_raise = if operation == "close" { None } else { Some(panel.to_owned()) };
-    if operation != "close" {
-        app.ui.dock_expanded = true;
-    }
-    Ok(json!({"panel": panel, "floating": app.ui.floating.iter().map(|(id, _)| id).collect::<Vec<_>>(), "layout": app.ui.docking}))
+    release_flyout(app);
+    Ok(Value::Null)
 }
 
-pub(crate) fn show(app: &mut DesignApp, ui: &mut egui::Ui) -> bool {
-    let area = egui::Id::new("designcraft-panel-docking");
+pub(crate) fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let area = area_id();
     let changed_workspace = ui.ctx().data_mut(|data| {
         let previous = data.get_temp::<u64>(area.with("generation"));
         data.insert_temp(area.with("generation"), app.ui.docking_generation);
@@ -439,169 +1033,159 @@ pub(crate) fn show(app: &mut DesignApp, ui: &mut egui::Ui) -> bool {
     });
     if changed_workspace {
         craft_ui::docking::cancel_drag::<String>(ui.ctx(), area);
-        ui.ctx().data_mut(|data| data.remove::<LegacyDrag>(area.with("legacy-origin")));
     }
-
-    let cancelled =
-        ui.input(|input| !input.focused || input.key_pressed(egui::Key::Escape) || (!input.pointer.primary_down() && !input.pointer.any_released()));
-    if cancelled && cancel_legacy_drag(app, ui.ctx()) && app.ui.docking.is_none() {
-        return false;
-    }
-    let Some(layout) = app.ui.docking.as_ref() else { return false };
-    if !valid(layout) {
+    if app.ui.docking.as_ref().is_some_and(|layout| !valid(layout)) {
         app.ui.docking = None;
+        forget_panels(app);
         app.status(crate::i18n::tr(&app.ui.language, "Invalid panel layout; restored the default dock"));
-        return false;
-    }
-    let mut layout = layout.clone();
-    if !app.ui.dock_expanded {
-        layout.root = None;
     }
+    let layout = layout_of(app);
     let raise = app.ui.docking_raise.take();
     let mut blocked = Vec::new();
-    if app.ui.dialog.is_some() || app.ui.about || app.ui.palette.is_some() || egui::Popup::is_any_open(ui.ctx()) {
+    let modal = modal_open(app);
+    if modal || egui::Popup::is_any_open(ui.ctx()) {
         blocked.push(ui.ctx().content_rect());
     } else if crate::story_editor::visible(app) {
         // The editor is rendered after the dock; block its unmeasured first frame conservatively.
-        let rect = ui.ctx().memory(|m| m.area_rect(egui::Id::new("story_editor"))).unwrap_or_else(|| ui.ctx().content_rect());
+        let rect = ui.ctx().memory(|m| m.area_rect(egui::Id::unique("story_editor"))).unwrap_or_else(|| ui.ctx().content_rect());
         blocked.push(rect);
     }
-    let t = crate::theme::Tokens::get(ui.ctx());
-    let language = app.ui.language.clone();
-    let mut draw = |ui: &mut egui::Ui| {
-        let mut style = craft_ui::docking::DockStyle::from_ui(ui);
-        style.tab_height = 27.0;
-        style.background = t.panel;
-        style.tab_background = t.tab_strip;
-        style.active_background = t.panel;
-        style.text = t.text_strong;
-        style.inactive_text = t.text_dim;
-        style.border = egui::Stroke::new(1.0, t.border);
-        style.accent = t.accent;
-        style.float_label = crate::i18n::tr(&language, "Float Panel").to_owned();
-        style.close_label = crate::i18n::tr(&language, "Close Panel").to_owned();
-        style.move_label = crate::i18n::tr(&language, "Group with").to_owned();
-        style.panels_label = crate::i18n::tr(&language, "Panels").to_owned();
-        style.resize_label = crate::i18n::tr(&language, "Resize panels").to_owned();
-        style.resize_window_label = crate::i18n::tr(&language, "Resize panel window").to_owned();
-        let mut area = craft_ui::docking::DockArea::new(egui::Id::new("designcraft-panel-docking")).blocked_rects(&blocked);
-        if let Some(panel) = &raise {
-            area = area.raise_panel(panel.clone());
+    let style = dock_style(ui, &app.ui.language);
+    let mut dock = craft_ui::docking::DockArea::new(area)
+        .float_bounds(float_bounds(app, ui.ctx()))
+        .blocked_rects(&blocked)
+        .input_blocked(modal)
+        .auto_collapse_iconic(app.ui.dock_auto_collapse);
+    if let Some(panel) = raise {
+        dock = dock.raise_panel(panel);
+    }
+    let mut output = dock.show_content(ui, &layout, &style, &mut PanelContent { app: &mut *app });
+    for event in std::mem::take(&mut output.events) {
+        match event {
+            craft_ui::docking::DockEvent::ToggleAutoCollapse => app.ui.dock_auto_collapse = !app.ui.dock_auto_collapse,
+            craft_ui::docking::DockEvent::FlyoutChanged { panel } => app.ui.docking_flyout = panel,
+            _ => {}
         }
-        area.show_customized(
-            ui,
-            &layout,
-            &style,
-            |id| {
-                crate::i18n::tr(
-                    &language,
-                    crate::dock::DOCK_TABS.iter().chain(crate::dock::ICON_PANELS).find(|p| p.0 == id).map(|p| p.1).unwrap_or(id),
-                )
-                .to_owned()
-            },
-            // Close comes from the panel's own tab commands, so the surface doesn't add another.
-            |_| craft_ui::docking::Permissions { closable: false, ..Default::default() },
-            |_| craft_ui::docking::PanelLimits { min: egui::vec2(220.0, 80.0), ..Default::default() },
-            &mut PanelContent(app),
-        )
-    };
-    let output = if layout.root.is_some() {
-        egui::Panel::right("shared-panel-dock")
-            .default_size(310.0)
-            .size_range(220.0..=720.0)
-            .resizable(true)
-            .frame(egui::Frame::NONE.fill(t.panel))
-            .show(ui, &mut draw)
-            .inner
-    } else {
-        draw(ui)
-    };
+    }
     if let Some(panel) = output.focused {
-        app.ui.docking_opened = Some(panel);
+        if panel != CANVAS {
+            app.ui.docking_opened = Some(panel.clone());
+        }
+        app.ui.docking_focused = Some(panel);
     }
     if let Some(error) = output.error {
         app.ui.status = error.to_string();
     }
-    if ui.input(|input| input.pointer.any_released()) {
-        if !output.actions.iter().any(|action| matches!(action, Action::Move { .. } | Action::Float { .. })) && cancel_legacy_drag(app, ui.ctx()) {
-            return app.ui.docking.is_some();
-        }
-        ui.ctx().data_mut(|data| data.remove::<LegacyDrag>(egui::Id::new("designcraft-panel-docking").with("legacy-origin")));
-    }
+    // The user's own gesture keeps the focus on the panel it moves, while that panel stays open.
+    let focused = app.ui.docking_focused.clone();
     for action in output.actions {
         if let Err(error) = app.run("window.panel.layout", json!({"action": action})) {
             app.ui.status = error;
         }
     }
-    icon_rail(app, ui);
-    true
+    if let Some(panel) = focused.filter(|panel| panel == CANVAS || layout_of(app).contains(panel)) {
+        app.ui.docking_focused = Some(panel);
+    }
+    #[cfg(not(target_arch = "wasm32"))]
+    open_window_drops(app, &output.window_files);
+    // Keys pressed in a floating panel's own OS window run the main window's shortcuts.
+    crate::menus::forwarded_shortcuts(app, ui.ctx(), output.forwarded_events, output.forwarded_modifiers.unwrap_or_default());
 }
 
-fn icon_rail(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = crate::theme::Tokens::get(ui.ctx());
-    let column = egui::Panel::right("shared-panel-icons")
-        .exact_size(38.0)
-        .resizable(false)
-        .frame(egui::Frame::NONE.fill(t.panel))
-        .show(ui, |ui| {
-            egui::ScrollArea::vertical().id_salt("shared-panel-icons-scroll").show(ui, |ui| {
-                ui.spacing_mut().item_spacing.y = 2.0;
-                for &(id, label, icon) in crate::dock::DOCK_TABS.iter().chain(crate::dock::ICON_PANELS) {
-                    if app.ui.docking.as_ref().is_some_and(|layout| {
-                        layout.contains(&id.to_string()) && (app.ui.dock_expanded || layout.floating.iter().any(|g| g.panels.iter().any(|p| p == id)))
-                    }) {
-                        continue;
-                    }
-
-                    let response =
-                        crate::icons::button(ui, icon, 28.0, false, crate::i18n::tr(&app.ui.language, label)).interact(egui::Sense::click_and_drag());
-                    if response.clicked() {
-                        let _ = app.run("window.panel.activate", json!({"panel":id}));
-                    }
-                    legacy_tab(app, ui, id, &response);
-                }
-            });
-        })
-        .response
-        .rect;
-    let _ = column;
-}
-
-pub(crate) fn legacy_tab(app: &mut DesignApp, ui: &mut egui::Ui, panel: &str, response: &egui::Response) {
-    let Some(panel) = normalize(panel) else { return };
-    response.context_menu(|ui| panel_menu(app, ui, panel));
-    if response.drag_started()
-        && let Some(id) = normalize(panel)
-    {
-        let mut layout = app.ui.docking.clone().unwrap_or_else(|| legacy(app));
-        let bounds = ui.max_rect();
-        let source = egui::Rect::from_min_size(
-            egui::pos2(bounds.left(), response.rect.top()),
-            egui::vec2(bounds.width().clamp(240.0, 600.0), bounds.height().clamp(200.0, 600.0)),
-        );
-        if ensure(&mut layout, id).is_ok()
-            && craft_ui::docking::begin_drag(ui.ctx(), egui::Id::new("designcraft-panel-docking"), id.to_string(), source)
-        {
-            ui.ctx().data_mut(|data| {
-                data.insert_temp(
-                    egui::Id::new("designcraft-panel-docking").with("legacy-origin"),
-                    LegacyDrag {
-                        layout: app.ui.docking.clone(),
-                        open_panel: app.ui.open_panel.clone(),
-                        floating: app.ui.floating.clone(),
-                        generation: app.ui.docking_generation,
-                    },
-                )
-            });
-            app.ui.docking = Some(layout);
-            app.ui.open_panel = None;
-        }
+/// Files dropped on a floating panel's own OS window open or place as drops on the main window
+/// do. The pointer there is in that window's coordinates, so a placed file gets no canvas point.
+#[cfg(not(target_arch = "wasm32"))]
+fn open_window_drops(app: &mut DesignApp, windows: &[craft_ui::docking::WindowFiles<String>]) {
+    for window in windows {
+        app.open_dropped_files(&window.dropped, None);
     }
 }
 
-/// The menu behind a panel's three-line button, in either dock: the panel's own commands, then
-/// its docking commands.
-pub(crate) fn three_line_menu(app: &mut DesignApp, ui: &mut egui::Ui, panel: &str) {
+/// Whether a modal (a dialog, About or Quick Apply) is open. Floating panels in their own OS
+/// windows take no input then, as the main window behind the modal doesn't.
+pub(crate) fn modal_open(app: &DesignApp) -> bool {
+    app.ui.dialog.is_some() || app.ui.about || app.ui.palette.is_some()
+}
+
+/// What the control channel reports: the layout in use (craft-ui's serialized `Layout`),
+/// whether it is the workspace's default, the panel (or `canvas`) last clicked or selected, the
+/// panels closed with a remembered place, the panel whose flyout is open, and where each
+/// docking gesture starts in the last frame (`hitRects`).
+pub(crate) fn inspect(app: &DesignApp, ctx: &egui::Context) -> Value {
+    let hits = craft_ui::docking::DockArea::<String>::hit_rects(ctx, area_id());
+    let hit_rects: Vec<Value> = hits.iter().map(|(hit, r)| json!({"hit": hit, "rect": [r.left(), r.top(), r.width(), r.height()]})).collect();
+    json!({
+        "layout": layout_of(app),
+        "customized": app.ui.docking.is_some(),
+        "focused": app.ui.docking_focused,
+        "flyout": app.ui.docking_flyout,
+        "autoCollapse": app.ui.dock_auto_collapse,
+        "rightToLeft": crate::i18n::is_rtl(&app.ui.language),
+        "hidden": app.ui.docking_hidden.keys().collect::<Vec<_>>(),
+        "hitRects": hit_rects,
+    })
+}
+
+fn dock_style(ui: &egui::Ui, language: &str) -> craft_ui::docking::DockStyle {
+    let t = crate::theme::Tokens::get(ui.ctx());
+    let mut style = craft_ui::docking::DockStyle::from_ui(ui);
+    style.tab_height = 27.0;
+    style.background = t.panel;
+    style.tab_background = t.tab_strip;
+    style.active_background = t.panel;
+    style.text = t.text_strong;
+    style.inactive_text = t.text_dim;
+    style.border = egui::Stroke::new(1.0, t.border);
+    style.accent = t.accent;
+    style.blocked_dim = t.panel.gamma_multiply(0.6);
+    style.right_to_left = crate::i18n::is_rtl(language);
+    // InDesign's docking: new docks at the docked area's free sides, but no full-height column
+    // from the window's left or right edge; a drop on no target (the canvas) floats, and a
+    // floating window's title bar docks the whole window. No Ctrl/Cmd undock latch or hint, no
+    // Maximize Frame or Close Others items, no wheel or middle-click tab gestures.
+    style.side_edge_zones = false;
+    style.new_dock_zones = true;
+    style.float_on_empty_drop = true;
+    style.title_bar_docks = true;
+    style.command_press_floats = false;
+    style.float_hint = false;
+    style.close_others_item = false;
+    style.maximize_item = false;
+    style.wheel_selects_tabs = false;
+    style.middle_click_closes_tabs = false;
+    style.localized(|key| DOCK_LABELS.iter().find(|(k, _)| *k == key).map(|(_, english)| crate::i18n::tr(language, english).to_owned()))
+}
+
+/// DesignCraft's wording of craft-ui's docking labels, translated through `i18n::tr`.
+pub(crate) const DOCK_LABELS: &[(&str, &str)] = &[
+    ("dock.float", "Float Panel"),
+    ("dock.close", "Close"),
+    ("dock.movePanelTo", "Group with"),
+    ("dock.panels", "Panels"),
+    ("dock.resize", "Resize panels"),
+    ("dock.resizeWindow", "Resize panel window"),
+    ("dock.moveGroup", "Move tab group"),
+    ("dock.closeGroup", "Close Tab Group"),
+    ("dock.minimize", "Minimize"),
+    ("dock.expand", "Expand"),
+    ("dock.floatGroup", "Float Tab Group"),
+    ("dock.moveGroupTo", "Group Tab Group with"),
+    ("dock.moveColumn", "Move panel column"),
+    ("dock.collapseToIcons", "Collapse to Icons"),
+    ("dock.expandPanels", "Expand Panels"),
+    ("dock.collapseColumn", "Collapse to Icons"),
+    ("dock.expandColumn", "Expand Panels"),
+    ("dock.moveWindow", "Move panel window"),
+    ("dock.closeWindow", "Close panel window"),
+    ("dock.closeOthers", "Close Other Panels in Group"),
+    ("dock.maximize", "Maximize Frame"),
+    ("dock.restoreFrame", "Restore Frame Size"),
+    ("dock.autoCollapse", "Auto-Collapse Iconic Panels"),
+];
+
+/// The menu behind a panel's three-line button: the panel's own commands, then its docking
+/// commands.
+fn three_line_menu(app: &mut DesignApp, ui: &mut egui::Ui, panel: &str) {
     if panel == "pages" {
         crate::panels::pages::panel_menu(app, ui);
         ui.separator();
@@ -614,7 +1198,7 @@ fn three_line_button(app: &mut DesignApp, ui: &mut egui::Ui, panel: &str) {
     let t = crate::theme::Tokens::get(ui.ctx());
     let area = ui.max_rect();
     let r = egui::Rect::from_center_size(area.center(), egui::vec2(18.0, 18.0));
-    let menu = ui.interact(r, ui.id().with("panel-menu"), egui::Sense::click());
+    let menu = ui.interact(r, ui.scope_id().with("panel-menu"), egui::Sense::click());
     if menu.hovered() {
         ui.painter().rect_filled(r, 3.0, t.hover);
     }
@@ -634,6 +1218,7 @@ pub(crate) fn panel_menu(app: &mut DesignApp, ui: &mut egui::Ui, panel: &str) {
         }
         ui.close();
     }
+    dock_panel_item(app, ui, panel);
     ui.menu_button(crate::rtl::widget(ui, crate::i18n::tr(&language, "Group with")), |ui| {
         egui::ScrollArea::vertical().max_height(360.0).show(ui, |ui| {
             for (anchor, label, _) in crate::dock::DOCK_TABS.iter().chain(crate::dock::ICON_PANELS) {
@@ -652,34 +1237,89 @@ pub(crate) fn panel_menu(app: &mut DesignApp, ui: &mut egui::Ui, panel: &str) {
     });
 }
 
-struct PanelContent<'a>(&'a mut DesignApp);
+/// Dock Panel, for a floating panel: back to where it floated from (`Transaction::dock_back`),
+/// else into the dock.
+fn dock_panel_item(app: &mut DesignApp, ui: &mut egui::Ui, panel: &str) {
+    if !layout_of(app).floating.iter().any(|w| w.contains(&panel.to_owned())) {
+        return;
+    }
+    if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Dock Panel"))).clicked() {
+        if let Err(error) = app.run("window.panel.dock", json!({"panel": panel})) {
+            app.status(error);
+        }
+        ui.close();
+    }
+}
+
+/// The size a panel floats at (tab strip included), whatever the size of the dock it left.
+fn floating_size(panel: &str) -> egui::Vec2 {
+    match panel {
+        "properties" | "pages" | "layers" => egui::vec2(300.0, 420.0),
+        "characterStyles" | "paragraphStyles" => egui::vec2(290.0, 340.0),
+        "glyphs" | "library" | "links" | "preflight" | "dataMerge" => egui::vec2(320.0, 400.0),
+        _ => egui::vec2(280.0, 360.0),
+    }
+}
+
+/// The name of a dock panel's icon in [`crate::icons`].
+fn panel_icon(panel: &str) -> Option<&'static str> {
+    crate::dock::DOCK_TABS.iter().chain(crate::dock::ICON_PANELS).find(|(id, _, _)| *id == panel).map(|(_, _, icon)| *icon)
+}
+
+/// The panels' content and icons.
+struct PanelContent<'a> {
+    app: &'a mut DesignApp,
+}
 impl craft_ui::docking::DockContent<String> for PanelContent<'_> {
     fn body(&mut self, ui: &mut egui::Ui, id: &String) {
+        if id == CANVAS {
+            let fill = crate::theme::Tokens::get(ui.ctx()).pasteboard;
+            ui.painter().rect_filled(ui.max_rect(), 0.0, fill);
+            self.app.canvas_area(ui, false);
+            return;
+        }
         egui::Frame::NONE.inner_margin(egui::Margin::same(8)).show(ui, |ui| {
             if crate::dock::scrolls_itself(id) {
-                crate::dock::panel_body(self.0, ui, id);
+                crate::dock::panel_body(self.app, ui, id);
                 return;
             }
+            // Shrinking to the content's height lets craft-ui fit a float or flyout to it.
             egui::ScrollArea::vertical()
                 .id_salt(("shared-panel-body", id))
-                .auto_shrink([false, false])
-                .show(ui, |ui| crate::dock::panel_body(self.0, ui, id));
+                .auto_shrink([false, true])
+                .show(ui, |ui| crate::dock::panel_body(self.app, ui, id));
         });
     }
+    fn logical_label(&self, id: &String) -> String {
+        let english = crate::dock::DOCK_TABS.iter().chain(crate::dock::ICON_PANELS).find(|p| p.0 == id).map_or(id.as_str(), |p| p.1);
+        crate::i18n::tr(&self.app.ui.language, english).to_owned()
+    }
+    fn permissions(&self, id: &String) -> Permissions {
+        model_permissions(id)
+    }
+    fn limits(&self, id: &String) -> craft_ui::docking::PanelLimits {
+        let min = if id == CANVAS { egui::vec2(200.0, 120.0) } else { egui::vec2(220.0, 80.0) };
+        craft_ui::docking::PanelLimits { min, ..Default::default() }
+    }
+    fn floating_size(&self, id: &String) -> Option<egui::Vec2> {
+        Some(floating_size(id))
+    }
+    fn paint_icon(&mut self, painter: &egui::Painter, rect: egui::Rect, id: &String, color: egui::Color32) -> bool {
+        let Some(icon) = panel_icon(id) else { return false };
+        crate::icons::paint(painter, rect, icon, color);
+        true
+    }
     fn panel_menu(&mut self, ui: &mut egui::Ui, id: &String) {
-        // The docking surface adds Float Panel and Group with after these, so a tab's menu lists
-        // what the classic dock's does.
         if let Some(panel) = normalize(id) {
-            tab_commands(self.0, ui, panel);
-            ui.separator();
+            dock_panel_item(self.app, ui, panel);
         }
     }
-    fn group_header_width(&self, _: &[String], _: &String, _: bool) -> f32 {
+    fn group_header_width(&self, _: &[String], _: &String, _: bool, _: f32) -> f32 {
         24.0
     }
     fn group_header(&mut self, ui: &mut egui::Ui, _: &[String], active: &String, _: bool) {
         if let Some(panel) = normalize(active) {
-            three_line_button(self.0, ui, panel);
+            three_line_button(self.app, ui, panel);
         }
     }
     fn label(&mut self, ui: &egui::Ui, _: &String, logical: &str, font: &egui::FontId, color: egui::Color32) -> egui::WidgetText {
@@ -690,20 +1330,9 @@ impl craft_ui::docking::DockContent<String> for PanelContent<'_> {
     }
 }
 
-/// Close Tab Group: `panel` and the panels tabbed with it, each restorable from Window as one
-/// closed with Close.
-fn close_group(app: &mut DesignApp, params: &Value) -> Result<Value, String> {
-    let panel = params.get("panel").and_then(Value::as_str).and_then(normalize).ok_or("panel must name a registered panel")?;
-    let layout = app.ui.docking.clone().unwrap_or_else(|| legacy(app));
-    let group = tab_group(&layout, panel);
-    for p in &group {
-        change(app, "close", &json!({"panel": p}))?;
-    }
-    Ok(json!({"closed": group}))
-}
-
-/// InDesign's commands on a panel tab (and at the end of its panel menu): Close, Close Tab Group,
-/// Minimize (an open accordion entry) and Collapse to Icons.
+/// InDesign's panel tab commands at the end of a panel's three-line menu: Close, Close Tab Group,
+/// Minimize (an open accordion entry) and Collapse to Icons. A tab's own context menu is
+/// craft-ui's, which lists the same commands.
 fn tab_commands(app: &mut DesignApp, ui: &mut egui::Ui, panel: &'static str) {
     let language = app.ui.language.clone();
     let tr = |s: &str| crate::i18n::tr(&language, s).to_owned();
@@ -719,43 +1348,26 @@ fn tab_commands(app: &mut DesignApp, ui: &mut egui::Ui, panel: &'static str) {
     if ui.button(crate::rtl::widget(ui, tr("Close Tab Group"))).clicked() {
         run(app, ui, "window.panel.closeGroup", json!({"panel": panel}));
     }
-    let layout = app.ui.docking.clone().unwrap_or_else(|| legacy(app));
+    let layout = layout_of(app);
     let minimizable = open_in_stack(&layout, panel);
     if ui.add_enabled(minimizable, egui::Button::new(crate::rtl::widget(ui, tr("Minimize")))).clicked() {
         run(app, ui, "window.panel.layout", json!({"action": {"SetStackOpen": {"panel": panel, "open": false}}}));
     }
     ui.separator();
-    if ui.add_enabled(app.ui.dock_expanded, egui::Button::new(crate::rtl::widget(ui, tr("Collapse to Icons")))).clicked() {
+    let expanded = dock_columns(&layout).iter().any(|c| !c.iconic);
+    if ui.add_enabled(expanded, egui::Button::new(crate::rtl::widget(ui, tr("Collapse to Icons")))).clicked() {
         run(app, ui, "window.collapseToIcons", json!({}));
     }
 }
 
 /// Close the last explicitly opened panel through the same validated layout transaction.
 pub(crate) fn close_visible(app: &mut DesignApp) -> Result<(), String> {
-    if app.ui.docking.is_some() {
-        if let Some(panel) = app.ui.docking_opened.clone() {
-            change(app, "close", &json!({"panel": panel}))?;
-        }
-    } else {
-        app.ui.open_panel = None;
+    if let Some(panel) = app.ui.docking_opened.clone() {
+        shared_command(app, "window.panel.close", &json!({"panel": panel}))?;
     }
+    app.ui.open_panel = None;
     Ok(())
 }
 
-// Legacy inspection fields are derived from the shared layout after customization.
-fn sync_legacy(app: &mut DesignApp) {
-    if let Some(layout) = &app.ui.docking {
-        // Float-only panels aren't in the layout; they keep their place in the list.
-        let float_only: Vec<(String, [f32; 2])> = app.ui.floating.iter().filter(|(id, _)| crate::dock::float_only(id)).cloned().collect();
-        app.ui.floating = layout
-            .floating
-            .iter()
-            .flat_map(|group| group.panels.iter().map(|id| (id.clone(), [group.rect[0], group.rect[1]])))
-            .chain(float_only)
-            .collect();
-    }
-}
-
 #[cfg(test)]
-#[path = "panel_docking_tests.rs"]
 mod tests;
diff --git a/crates/ui-egui/src/panel_docking/tests.rs b/crates/ui-egui/src/panel_docking/tests.rs
new file mode 100644
index 000000000..77b721098
--- /dev/null
+++ b/crates/ui-egui/src/panel_docking/tests.rs
@@ -0,0 +1,1297 @@
+use super::{
+    CANVAS, Column, DOCK_LABELS, DesignApp, Floating, ICON_GROUPS, Layout, Node, PanelContent, Placed, Side, Value, area_id, cancel_gesture,
+    close_visible, default_layout, dock_columns, hit_id, icon_column, in_iconic_column, json, layout_of, modal_open, open_window_drops, panel_menu,
+    set_iconic, showing, tab_group, tab_id, valid, window_groups,
+};
+use egui::{Event, Modifiers, PointerButton, Pos2, vec2};
+use egui_kittest::{Harness, kittest::Queryable};
+
+fn app() -> DesignApp {
+    DesignApp::new(designcraft_engine::Session::new(), Default::default())
+}
+
+#[test]
+fn panel_commands_group_split_reorder_float_and_restore_without_duplicate_ownership() {
+    let mut app = app();
+    app.run("window.panel.move", json!({"panel":"swatches", "anchor":"layers", "zone":"top"})).unwrap();
+    app.run("window.panel.move", json!({"panel":"properties", "anchor":"swatches", "before":"swatches"})).unwrap();
+    let before_float = app.ui.docking.clone().unwrap();
+    app.run("window.panel.float", json!({"panel":"properties", "x":50,"y":70,"width":330,"height":410})).unwrap();
+    assert!(app.ui.docking.as_ref().unwrap().floating.iter().flat_map(window_groups).any(|g| g.panels == ["properties"]));
+    app.run("window.panel.dock", json!({"panel":"properties"})).unwrap();
+    assert_eq!(app.ui.docking.as_ref().unwrap(), &before_float);
+    app.run("window.panel.close", json!({"panel":"properties"})).unwrap();
+    assert!(!app.ui.docking.as_ref().unwrap().contains(&"properties".into()));
+    app.run("window.panel.activate", json!({"panel":"properties"})).unwrap();
+    assert_eq!(app.ui.docking.as_ref().unwrap(), &before_float);
+    let layout = app.ui.docking.as_ref().unwrap();
+    assert!(valid(layout));
+    let unique: std::collections::HashSet<_> = layout.panels().into_iter().collect();
+    assert_eq!(unique.len(), layout.panels().len());
+    let saved = serde_json::to_value(&app.ui).unwrap();
+    let restored: crate::UiState = serde_json::from_value(saved).unwrap();
+    assert_eq!(restored.docking, app.ui.docking);
+    assert_eq!(restored.docking_hidden, app.ui.docking_hidden);
+}
+
+#[test]
+fn invalid_panel_requests_are_atomic_and_do_not_enter_a_custom_workspace() {
+    let mut app = app();
+    for (id, params) in [
+        ("window.panel.move", json!({"panel":"layers","anchor":"unknown"})),
+        ("window.panel.move", json!({"panel":"layers","anchor":"properties","before":"unknown"})),
+        ("window.panel.move", json!({"panel":"layers","anchor":"properties","zone":42})),
+        ("window.panel.float", json!({"panel":"layers","width":-10})),
+        ("window.panel.float", json!({"panel":"unknown"})),
+        ("window.panel.float", json!({"panel":"layers","x":"invalid"})),
+    ] {
+        let old = app.ui.docking.clone();
+        let hidden = app.ui.docking_hidden.clone();
+        assert!(app.run(id, params).is_err(), "{id}");
+        assert_eq!(app.ui.docking, old);
+        assert_eq!(app.ui.docking_hidden, hidden);
+    }
+}
+
+fn harness(app: DesignApp, size: egui::Vec2) -> Harness<'static, DesignApp> {
+    let mut ready = false;
+    let mut harness = Harness::builder().with_size(size).with_step_dt(1.0 / 60.0).build_ui_state(
+        move |ui, app: &mut DesignApp| {
+            if !ready {
+                crate::theme::install_fonts(ui.ctx(), &app.ui.language);
+                crate::theme::apply(ui.ctx(), &crate::theme::Tokens::for_brightness(crate::theme::Brightness::MediumDark));
+                ready = true;
+                return;
+            }
+            egui::CentralPanel::default().frame(egui::Frame::NONE).show(ui, |ui| crate::panel_docking::show(app, ui));
+        },
+        app,
+    );
+    harness.run_steps(4);
+    harness
+}
+
+fn drag(h: &mut Harness<'static, DesignApp>, from: Pos2, to: Pos2) {
+    h.event(Event::PointerMoved(from));
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    for step in 1..=8 {
+        h.event(Event::PointerMoved(from + (to - from) * (step as f32 / 8.0)));
+        h.run_steps(1);
+    }
+    h.event(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+}
+
+#[test]
+fn ordinary_panel_tab_drag_enters_shared_docking_and_can_redock_into_another_tab_group() {
+    let mut h = harness(app(), vec2(1280.0, 800.0));
+    let source = h.query_all_by_label("Layers").find(|node| node.rect().height() <= 45.0).unwrap().rect().center();
+    drag(&mut h, source, egui::pos2(160.0, 140.0));
+    let layout = h.state().ui.docking.as_ref().expect("ordinary tab drag starts shared docking");
+    assert!(layout.floating.iter().flat_map(window_groups).any(|g| g.panels.contains(&"layers".into())), "{layout:?}");
+    let source = h.ctx.read_response(tab_id("layers")).unwrap().rect.center();
+    let destination = h.ctx.read_response(tab_id("properties")).unwrap().rect.center();
+    drag(&mut h, source, destination);
+    let layout = h.state().ui.docking.as_ref().unwrap();
+    assert!(!layout.floating.iter().flat_map(window_groups).any(|g| g.panels.contains(&"layers".into())));
+    assert!(valid(layout));
+    assert_eq!(h.state().ui.docking_focused.as_deref(), Some("layers"), "the user's drag keeps the focus on the panel it moved");
+}
+
+#[test]
+fn saved_workspace_restores_the_custom_tree_and_hidden_panel_placement() {
+    let mut app = app();
+
+    app.run("window.panel.move", json!({"panel":"swatches","anchor":"layers","zone":"top"})).unwrap();
+    app.run("window.panel.float", json!({"panel":"properties","x":50,"y":80})).unwrap();
+    app.run("window.panel.close", json!({"panel":"swatches"})).unwrap();
+    let layout = app.ui.docking.clone();
+    let hidden = app.ui.docking_hidden.clone();
+    app.run("window.newWorkspace", json!({"name":"Custom docking"})).unwrap();
+    app.run("window.workspace", json!({"name":"Essentials"})).unwrap();
+    assert!(app.ui.docking.is_none());
+    app.run("window.workspace", json!({"name":"Custom docking"})).unwrap();
+    assert_eq!(app.ui.docking, layout);
+    assert_eq!(app.ui.docking_hidden, hidden);
+}
+
+/// Explicit offscreen evidence; this creates no native windows.
+#[test]
+fn capture_custom_panel_docking_visual_fixtures() {
+    let Some(directory) = std::env::var_os("CRAFT_UI_DOCKING_FIXTURES").map(std::path::PathBuf::from) else { return };
+    std::fs::create_dir_all(&directory).unwrap();
+    for theme in crate::theme::Brightness::ALL {
+        for width in [800.0, 1280.0] {
+            for scale in [1.0, 1.5, 2.0] {
+                let mut app = app();
+                app.run("file.new", json!({})).unwrap();
+                app.run("frame.create", json!({"rect":[40,40,280,180],"content":"text","text":"Synthetic layout — مرحبا"})).unwrap();
+                let language = if width == 800.0 && scale == 1.0 { "ar" } else { "en" };
+                app.run("app.language", json!({"lang":if language == "en" { "" } else { language }})).unwrap();
+                app.run("window.panel.move", json!({"panel":"swatches", "anchor":"layers", "zone":"top"})).unwrap();
+                app.run("window.panel.float", json!({"panel":"properties","x":30,"y":90,"width":300,"height":440})).unwrap();
+                let mut ready = false;
+                let mut harness = Harness::builder().with_size(vec2(width, 800.0)).with_pixels_per_point(scale).wgpu().build_ui_state(
+                    move |ui, app: &mut DesignApp| {
+                        if !ready {
+                            crate::theme::install_fonts(ui.ctx(), &app.ui.language);
+                            crate::theme::apply(ui.ctx(), &crate::theme::Tokens::for_brightness(theme));
+                            ready = true;
+                            return;
+                        }
+                        egui::CentralPanel::default().frame(egui::Frame::NONE).show(ui, |ui| crate::panel_docking::show(app, ui));
+                    },
+                    app,
+                );
+                harness.input_mut().max_texture_side = Some(8192);
+                harness.run_steps(5);
+                assert!(valid(harness.state().ui.docking.as_ref().unwrap()));
+                harness
+                    .render()
+                    .unwrap()
+                    .save(directory.join(format!("designcraft-shared-docking-{}-{language}-{width}-{scale}x.png", theme.id())))
+                    .unwrap();
+                if language == "ar" {
+                    let tab = tab_id("swatches");
+                    let at = harness.ctx.read_response(tab).unwrap().rect.center();
+                    harness.input_mut().events.extend([
+                        Event::PointerMoved(at),
+                        Event::PointerButton { pos: at, button: PointerButton::Secondary, pressed: true, modifiers: Modifiers::NONE },
+                    ]);
+                    harness.run_steps(1);
+                    harness.input_mut().events.push(Event::PointerButton {
+                        pos: at,
+                        button: PointerButton::Secondary,
+                        pressed: false,
+                        modifiers: Modifiers::NONE,
+                    });
+                    harness.run_steps(2);
+                    assert!(egui::Popup::is_any_open(&harness.ctx), "actual tab context menu must be open");
+                    for action in ["Float Panel", "Group with", "Close Panel"] {
+                        assert!(harness.query_all_by_label(crate::i18n::tr("ar", action)).count() >= 1, "the menu lists {action}");
+                    }
+                    harness.render().unwrap().save(directory.join(format!("designcraft-dock-context-{}-ar.png", theme.id()))).unwrap();
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn escape_cancels_a_tab_drag_without_customizing_the_workspace() {
+    let mut h = harness(app(), vec2(1280.0, 800.0));
+    let source = h.query_all_by_label("Layers").find(|node| node.rect().height() <= 45.0).unwrap().rect().center();
+    h.event(Event::PointerMoved(source));
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    h.event(Event::PointerMoved(source - vec2(90.0, 0.0)));
+    h.run_steps(2);
+    h.event(Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    assert!(h.state().ui.docking.is_none());
+    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(2);
+    assert!(h.state().ui.docking.is_none());
+}
+
+#[test]
+fn serialized_layout_actions_cover_geometry_reorder_accordion_and_atomic_rejection() {
+    let mut app = app();
+    app.run("window.panel.move", json!({"panel":"swatches","anchor":"layers","zone":"top"})).unwrap();
+    app.run("window.panel.layout", json!({"action":{"ResizeSplit":{"path":[],"size":{"Ratio":0.35}}}})).unwrap();
+    assert!(
+        matches!(app.ui.docking.as_ref().unwrap().root, Some(Node::Split { size: craft_ui::layout::SplitSize::Ratio(value), .. }) if (value - 0.35).abs() < 0.001)
+    );
+    app.run("window.panel.float", json!({"panel":"properties"})).unwrap();
+    app.run("window.panel.layout", json!({"action":{"MoveFloating":{"panel":"properties","rect":[44,66,360,450]}}})).unwrap();
+    assert_eq!(
+        app.ui.docking.as_ref().unwrap().floating.iter().find(|window| window.panels().any(|p| p == "properties")).unwrap().rect,
+        [44.0, 66.0, 360.0, 450.0]
+    );
+    app.run("window.panel.layout", json!({"action":{"Move":{"panel":"properties","anchor":"swatches","placement":{"Tab":{"before":"swatches"}}}}}))
+        .unwrap();
+    assert_eq!(group_members_for_test(app.ui.docking.as_ref().unwrap(), "swatches"), ["properties", "swatches"]);
+    let before = app.ui.docking.clone();
+    let hidden = app.ui.docking_hidden.clone();
+    for action in [
+        json!({"MoveFloating":{"panel":"properties","rect":[0,0,-5,30]}}),
+        json!({"ResizeSplit":{"path":[true,true,true],"size":{"Ratio":0.2}}}),
+        json!({"Open":{"panel":"unknown","anchor":null}}),
+        json!({"Move":{"panel":"properties","anchor":"swatches","placement":{"Tab":{"before":"unknown"}}}}),
+    ] {
+        assert!(app.run("window.panel.layout", json!({"action":action})).is_err());
+        assert_eq!(app.ui.docking, before);
+        assert_eq!(app.ui.docking_hidden, hidden);
+    }
+    let stack = Node::Stack { entries: vec![craft_ui::docking::StackEntry { panel: "layers".into(), open: true, height: Some(100.0) }] };
+    app.ui.docking = Some(Layout {
+        root: Some(Node::Split {
+            axis: craft_ui::layout::SplitAxis::Horizontal,
+            size: craft_ui::layout::SplitSize::Ratio(0.7),
+            first: Box::new(Node::Tabs { panels: vec![CANVAS.into()], active: 0 }),
+            second: Box::new(stack),
+        }),
+        floating: Vec::new(),
+    });
+    app.run("window.panel.layout", json!({"action":{"SetStackOpen":{"panel":"layers","open":false}}})).unwrap();
+    app.run("window.panel.layout", json!({"action":{"ResizeStack":{"panel":"layers","height":150}}})).unwrap();
+    let Some(Node::Split { second, .. }) = &app.ui.docking.as_ref().unwrap().root else { panic!("expected split") };
+    let Node::Stack { entries } = &**second else { panic!("expected stack") };
+    assert!(!entries[0].open);
+    assert_eq!(entries[0].height, Some(150.0));
+}
+
+fn group_members_for_test(layout: &Layout<String>, panel: &str) -> Vec<String> {
+    tab_group(layout, panel)
+}
+
+#[test]
+fn populated_canvas_keeps_a_real_stroke_edit_after_floating_and_redocking() {
+    let mut app = app();
+    app.run("file.new", json!({"width":480,"height":360})).unwrap();
+    let id = app.run("frame.create", json!({"rect":[80,70,330,230],"content":"none"})).unwrap()["id"].as_u64().unwrap();
+    app.run("object.fill", json!({"swatch":"C=100 M=0 Y=0 K=0"})).unwrap();
+    app.run("object.stroke", json!({"weight":8})).unwrap();
+    app.run("window.panel.float", json!({"panel":"stroke","x":40,"y":140,"width":310,"height":490})).unwrap();
+    let directory = std::env::var_os("CRAFT_UI_DOCKING_FIXTURES").map(std::path::PathBuf::from);
+    let builder = Harness::builder().with_size(vec2(1280.0, 800.0));
+    let builder = if directory.is_some() { builder.wgpu() } else { builder };
+    let mut h = builder.build_ui_state(
+        |ui, app: &mut DesignApp| {
+            app.logic(ui.ctx());
+            app.ui(ui);
+        },
+        app,
+    );
+    h.input_mut().max_texture_side = Some(8192);
+    h.run_steps(5);
+    let at = h.get_by_label("Bevel").rect().center();
+    h.hover_at(at);
+    h.run_steps(1);
+    for pressed in [true, false] {
+        h.event(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
+        h.run_steps(1);
+    }
+    h.run_steps(2);
+    assert_eq!(h.state().session.active().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().stroke.join, designcraft_doc::Join::Bevel);
+    if let Some(directory) = &directory {
+        std::fs::create_dir_all(directory).unwrap();
+        h.render().unwrap().save(directory.join("designcraft-populated-stroke-floating.png")).unwrap();
+    }
+    let from = h.ctx.read_response(tab_id("stroke")).unwrap().rect.center();
+    let to = h.ctx.read_response(tab_id("properties")).unwrap().rect.center();
+    drag(&mut h, from, to);
+    assert!(h.state().ui.docking.as_ref().unwrap().floating.is_empty());
+    assert_eq!(h.state().session.active().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().stroke.join, designcraft_doc::Join::Bevel);
+    if let Some(directory) = &directory {
+        h.render().unwrap().save(directory.join("designcraft-populated-stroke-redocked.png")).unwrap();
+    }
+}
+
+#[test]
+fn properties_stroke_link_opens_the_stroke_panel_in_a_custom_workspace() {
+    let mut app = app();
+    app.run("file.new", json!({"width":480,"height":360})).unwrap();
+    app.run("frame.create", json!({"rect":[80,70,330,230],"content":"none"})).unwrap();
+    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
+    // Floating Layers leaves Pages the active tab beside Properties.
+    app.run("window.panel", json!({"panel":"properties"})).unwrap();
+    assert!(in_iconic_column(app.ui.docking.as_ref().unwrap(), "stroke"));
+    let mut h = Harness::builder().with_size(vec2(1280.0, 800.0)).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            app.logic(ui.ctx());
+            app.ui(ui);
+        },
+        app,
+    );
+    h.run_steps(5);
+    let at = h.get_by_role_and_label(egui::accesskit::Role::Link, "Stroke").rect().center();
+    h.hover_at(at);
+    h.run_steps(1);
+    for pressed in [true, false] {
+        h.event(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
+        h.run_steps(1);
+    }
+    h.run_steps(2);
+    // Stroke stays in the iconic column and opens as its flyout.
+    assert!(in_iconic_column(h.state().ui.docking.as_ref().unwrap(), "stroke"));
+    assert_eq!(h.state().ui.docking_flyout.as_deref(), Some("stroke"));
+    assert!(showing(h.state(), "stroke"));
+    assert_eq!(h.state().ui.docking_opened.as_deref(), Some("stroke"));
+}
+
+#[test]
+fn changing_workspace_during_a_drag_cancels_the_stale_gesture() {
+    let mut app = app();
+    app.run("window.panel.move", json!({"panel":"swatches","anchor":"layers","zone":"top"})).unwrap();
+    let destination = app.ui.docking.clone();
+    app.run("window.newWorkspace", json!({"name":"Destination"})).unwrap();
+    app.run("window.workspace", json!({"name":"Essentials"})).unwrap();
+    let mut h = harness(app, vec2(1280.0, 800.0));
+    let source = h.query_all_by_label("Layers").find(|node| node.rect().height() <= 45.0).unwrap().rect().center();
+    h.event(Event::PointerMoved(source));
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    h.event(Event::PointerMoved(source - vec2(90.0, 0.0)));
+    h.run_steps(2);
+    h.state_mut().run("window.workspace", json!({"name":"Destination"})).unwrap();
+    h.event(Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    assert_eq!(h.state().ui.docking, destination);
+    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(2);
+    assert_eq!(h.state().ui.docking, destination);
+}
+
+#[test]
+fn first_customization_keeps_the_panel_the_workspace_opened() {
+    let mut app = app();
+    app.ui.open_panel = Some("paragraphStyles".into());
+    app.ui.dock_expanded = false;
+    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
+    let layout = app.ui.docking.as_ref().unwrap();
+    assert!(layout.contains(&"paragraphStyles".into()));
+    assert!(valid(layout));
+    assert_eq!(layout.panels().iter().filter(|p| p.as_str() == "paragraphStyles").count(), 1);
+}
+
+#[test]
+fn hiding_before_first_destination_frame_does_not_restore_an_old_drag_snapshot() {
+    let mut app = app();
+    app.run("window.panel.move", json!({"panel":"swatches","anchor":"layers","zone":"top"})).unwrap();
+    app.run("window.newWorkspace", json!({"name":"Destination"})).unwrap();
+    app.run("window.workspace", json!({"name":"Essentials"})).unwrap();
+    let mut h = harness(app, vec2(1280.0, 800.0));
+    let source = h.query_all_by_label("Layers").find(|node| node.rect().height() <= 45.0).unwrap().rect().center();
+    h.event(Event::PointerMoved(source));
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    h.event(Event::PointerMoved(source - vec2(90.0, 0.0)));
+    h.run_steps(2);
+    h.state_mut().run("window.workspace", json!({"name":"Destination"})).unwrap();
+    let destination = h.state().ui.docking.clone();
+    let open_panel = h.state().ui.open_panel.clone();
+    let floating = h.state().ui.floating.clone();
+    // The app calls this before dock rendering when panels are hidden or Presentation starts.
+    let ctx = h.ctx.clone();
+    cancel_gesture(&ctx);
+    assert_eq!(h.state().ui.docking, destination);
+    assert_eq!(h.state().ui.open_panel, open_panel);
+    assert_eq!(h.state().ui.floating, floating);
+    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(2);
+    assert_eq!(h.state().ui.docking, destination);
+}
+
+#[test]
+fn table_and_control_visibility_work_after_customization_without_document_edits() {
+    let mut app = app();
+    app.run("file.new", json!({})).unwrap();
+    let doc = serde_json::to_value(&app.session.active().unwrap().doc).unwrap();
+    let undo = app.session.active().unwrap().history.undo.len();
+    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
+    app.run("app.tablePanel", json!({})).unwrap();
+    assert!(showing(&app, "table"));
+    // The Table flyout closes; Table stays in its icon group.
+    app.run("app.tablePanel", json!({})).unwrap();
+    assert!(!showing(&app, "table"));
+    assert!(in_iconic_column(app.ui.docking.as_ref().unwrap(), "table"));
+    app.run("app.tablePanel", json!({})).unwrap();
+    assert!(showing(&app, "table"));
+    let ctx = egui::Context::default();
+    let (req, _) = crate::control::ControlRequest::new("ui.set", json!({"closePanel":true,"dockExpanded":false}));
+    let crate::control::Outcome::Done(result) = crate::control::handle(&mut app, &ctx, &req) else { panic!("expected synchronous control result") };
+    assert_eq!(result["ok"], true);
+    assert!(!app.ui.dock_expanded);
+    assert!(!app.ui.docking.as_ref().unwrap().contains(&"table".into()));
+    app.run("window.panel", json!({"panel":"properties"})).unwrap();
+    assert_eq!(app.ui.docking_flyout.as_deref(), Some("properties"), "it opens as a flyout from the collapsed dock");
+    assert_eq!(app.ui.docking_raise.as_deref(), Some("properties"));
+    set_iconic(&mut app, false).unwrap();
+    assert_eq!(app.ui.docking_flyout, None, "expanding the column closes its flyout");
+    assert_eq!(serde_json::to_value(&app.session.active().unwrap().doc).unwrap(), doc);
+    assert_eq!(app.session.active().unwrap().history.undo.len(), undo);
+}
+
+#[test]
+fn floating_activation_queues_one_transient_raise_and_workspace_switch_clears_it() {
+    let mut app = app();
+    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
+    app.run("window.panel.activate", json!({"panel":"layers"})).unwrap();
+    assert_eq!(app.ui.docking_raise.as_deref(), Some("layers"));
+    assert!(serde_json::to_value(&app.ui).unwrap().get("docking_raise").is_none());
+    app.run("window.workspace", json!({"name":"Typography"})).unwrap();
+    assert!(app.ui.docking_raise.is_none());
+}
+
+#[test]
+fn shaped_panel_label_keeps_the_logical_accessibility_text() {
+    let ctx = egui::Context::default();
+    let logical = "خصائص Pages";
+    crate::theme::install_fonts(&ctx, "ar");
+    let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
+        let galley = crate::rtl::plain(ui.ctx(), logical, egui::FontId::proportional(12.0), egui::Color32::WHITE);
+        assert_eq!(galley.job.text, logical);
+    });
+    output.textures_delta.clear();
+}
+
+#[test]
+fn modal_overlay_blocks_a_real_tab_drag_release() {
+    let mut app = app();
+    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
+    let mut h = harness(app, vec2(1280.0, 800.0));
+    let source = h.ctx.read_response(tab_id("properties")).unwrap().rect.center();
+    h.event(Event::PointerMoved(source));
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    h.event(Event::PointerMoved(source - vec2(90.0, 0.0)));
+    h.run_steps(2);
+    assert_eq!(h.ctx.dragged_id(), Some(tab_id("properties")), "test must start the owned tab gesture");
+    let before = h.state().ui.docking.clone();
+    h.state_mut().ui.dialog = Some(crate::dialogs::Dialog::new("newDocument", json!({})));
+    let destination = egui::pos2(150.0, 150.0);
+    h.event(Event::PointerMoved(destination));
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: destination, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(2);
+    assert_eq!(h.state().ui.docking, before, "release under a modal must not float or dock the panel");
+    h.state_mut().ui.dialog = None;
+    h.run_steps(2);
+    assert_eq!(h.state().ui.docking, before, "closing the overlay must not revive its blocked drag");
+}
+
+#[test]
+fn shift_f9_toggles_table_after_customization_through_the_real_shortcut_path() {
+    let mut app = app();
+    app.run("file.new", json!({})).unwrap();
+    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
+    let before = serde_json::to_value(&app.session.active().unwrap().doc).unwrap();
+    let mut h = crate::test_window::open(app, vec2(1440.0, 900.0));
+    for visible in [true, false] {
+        let modifiers = Modifiers { shift: true, ..Modifiers::NONE };
+        h.event(Event::Key { key: egui::Key::F9, physical_key: None, pressed: true, repeat: false, modifiers });
+        h.run_steps(1);
+        h.event(Event::Key { key: egui::Key::F9, physical_key: None, pressed: false, repeat: false, modifiers });
+        h.run_steps(2);
+        assert_eq!(showing(&h.state().app, "table"), visible);
+        assert!(h.state().app.ui.docking.as_ref().unwrap().contains(&"table".into()), "Table stays in its icon group");
+    }
+    assert_eq!(serde_json::to_value(&h.state().app.session.active().unwrap().doc).unwrap(), before);
+}
+
+#[test]
+fn first_story_editor_frame_conservatively_blocks_owned_tab_release() {
+    let mut app = app();
+    app.run("file.new", json!({})).unwrap();
+    let story = app.run("frame.create", json!({"rect":[72,72,300,200],"content":"text","text":"Story editor overlay fixture"})).unwrap()["story"]
+        .as_u64()
+        .unwrap();
+    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
+    let doc = serde_json::to_value(&app.session.active().unwrap().doc).unwrap();
+    let mut h = crate::test_window::open(app, vec2(1440.0, 900.0));
+    let tab = tab_id("properties");
+    let from = h.ctx.read_response(tab).unwrap().rect.center();
+    h.event(Event::PointerMoved(from));
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    h.event(Event::PointerMoved(from - vec2(90.0, 0.0)));
+    h.run_steps(2);
+    assert_eq!(h.ctx.dragged_id(), Some(tab), "must own a real tab drag before opening editor");
+    assert!(h.ctx.memory(|m| m.area_rect(egui::Id::unique("story_editor"))).is_none());
+    let layout = h.state().app.ui.docking.clone();
+    let frame_before = h.ctx.cumulative_frame_nr();
+    h.state_mut().app.run("app.storyEditor", json!({"story":story})).unwrap();
+    // The unmeasured first frame blocks the full content, even outside the eventual editor.
+    let release = egui::pos2(150.0, 150.0);
+    h.input_mut().events.extend([
+        Event::PointerMoved(release),
+        Event::PointerButton { pos: release, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
+    ]);
+    h.run_steps(1);
+    assert_eq!(h.ctx.cumulative_frame_nr() - frame_before, 1, "release must occur in the first editor frame");
+    let measured = h.ctx.memory(|m| m.area_rect(egui::Id::unique("story_editor"))).unwrap();
+    assert!(!measured.contains(release), "fixture exercises the conservative first-frame guard outside eventual editor bounds");
+    assert_eq!(h.state().app.ui.docking, layout, "first editor frame must block release before it has a measured rectangle");
+    assert_eq!(serde_json::to_value(&h.state().app.session.active().unwrap().doc).unwrap(), doc);
+    h.run_steps(3);
+    let editor = h.ctx.memory(|m| m.area_rect(egui::Id::unique("story_editor"))).unwrap();
+    let screen = h.ctx.content_rect();
+    let outside = [screen.left_bottom() + vec2(80.0, -80.0), screen.right_bottom() + vec2(-450.0, -80.0)]
+        .into_iter()
+        .find(|p| !editor.contains(*p))
+        .expect("fixture has space outside editor");
+    let before_outside = h.state().app.ui.docking.clone();
+    let tab = tab_id("layers");
+    let from = h.ctx.read_response(tab).unwrap().rect.center();
+    h.event(Event::PointerMoved(from));
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    h.event(Event::PointerMoved(from - vec2(90.0, 0.0)));
+    h.run_steps(2);
+    assert_eq!(h.ctx.dragged_id(), Some(tab));
+    h.event(Event::PointerMoved(outside));
+    h.event(Event::PointerButton { pos: outside, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(2);
+    assert_ne!(h.state().app.ui.docking, before_outside, "measured editor must permit ordinary releases outside its bounds");
+    let after = h.state().app.ui.docking.clone();
+    h.state_mut().app.run("app.storyEditor", json!({"story":story})).unwrap();
+    h.run_steps(3);
+    assert_eq!(h.state().app.ui.docking, after, "closing editor must not revive a blocked drag");
+    assert_eq!(serde_json::to_value(&h.state().app.session.active().unwrap().doc).unwrap(), doc);
+}
+
+#[test]
+fn dock_menu_button_opens_the_active_panel_menu() {
+    let mut app = app();
+    app.run("file.new", json!({})).unwrap();
+    app.ui.dock_tab = "pages".into();
+    let pages = app.session.active().unwrap().doc.page_count();
+    let mut h = harness(app, vec2(1280.0, 800.0));
+    assert!(h.state().ui.docking.is_none());
+    let tab = h.query_all_by_label("Pages").find(|node| node.rect().height() <= 45.0).unwrap().rect();
+    // The outer dock column is at the window's right edge; the ≡ ends its tab strip.
+    let at = egui::pos2(1280.0 - 12.0, tab.center().y);
+    h.event(Event::PointerMoved(at));
+    h.run_steps(1);
+    for pressed in [true, false] {
+        h.event(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
+        h.run_steps(1);
+    }
+    h.run_steps(2);
+    assert!(egui::Popup::is_any_open(&h.ctx), "the three-line button must open a menu");
+    h.get_by_label("Duplicate Spread").click();
+    h.run_steps(3);
+    assert_eq!(h.state().session.active().unwrap().doc.page_count(), pages + 1);
+    assert!(!egui::Popup::is_any_open(&h.ctx));
+}
+
+/// InDesign's panel tab menu (Learn Skills Daily's InDesign course, 6:20): Close, Close Tab Group,
+/// Minimize and Collapse to Icons. Close Tab Group hides the panels tabbed together.
+#[test]
+fn close_tab_group_hides_the_panels_tabbed_together() {
+    let mut app = app();
+    // The default dock: Properties, Pages and Layers are one tab group.
+    let r = app.run("window.panel.closeGroup", json!({"panel":"pages"})).unwrap();
+    assert_eq!(r["closed"], json!(["properties", "pages", "layers"]));
+    let layout = app.ui.docking.clone().unwrap();
+    assert!(["properties", "pages", "layers"].iter().all(|p| !layout.contains(&p.to_string())));
+    // Window brings one back.
+    app.run("window.panel.activate", json!({"panel":"pages"})).unwrap();
+    assert!(app.ui.docking.as_ref().unwrap().contains(&"pages".to_string()));
+    // A floating group goes as a whole; the dock keeps its own.
+    app.run("window.panel.float", json!({"panel":"swatches","x":40,"y":60})).unwrap();
+    app.run("window.panel.activate", json!({"panel":"color"})).unwrap();
+    app.run("window.panel.move", json!({"panel":"color", "anchor":"swatches"})).unwrap();
+    app.run("window.panel.closeGroup", json!({"panel":"color"})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    assert!(!layout.contains(&"color".to_string()) && !layout.contains(&"swatches".to_string()));
+    assert!(layout.contains(&"pages".to_string()));
+    assert!(app.run("window.panel.closeGroup", json!({"panel":"nope"})).is_err());
+}
+
+#[test]
+fn collapse_to_icons_shrinks_the_dock_to_its_icons() {
+    let mut app = app();
+    assert!(app.ui.dock_expanded);
+    app.run("window.collapseToIcons", json!({})).unwrap();
+    assert!(!app.ui.dock_expanded);
+    // A panel chosen from Window opens as a flyout beside its icon; the dock stays collapsed.
+    app.run("window.panel", json!({"panel":"pages"})).unwrap();
+    assert_eq!(app.ui.docking_flyout.as_deref(), Some("pages"));
+    assert_eq!(app.ui.docking_raise.as_deref(), Some("pages"));
+    assert!(showing(&app, "pages"));
+    assert!(in_iconic_column(app.ui.docking.as_ref().unwrap(), "pages"));
+    // Choosing it again closes the flyout, and a third time opens it again.
+    app.run("window.panel", json!({"panel":"pages"})).unwrap();
+    assert_eq!(app.ui.docking_flyout, None);
+    assert!(!showing(&app, "pages"));
+    app.run("window.panel", json!({"panel":"pages"})).unwrap();
+    assert_eq!(app.ui.docking_flyout.as_deref(), Some("pages"));
+}
+
+#[test]
+fn a_tabs_context_menu_lists_indesigns_tab_commands_and_close_works() {
+    let mut h = harness(app(), vec2(1280.0, 800.0));
+    let tab = h.query_all_by_label("Layers").find(|node| node.rect().height() <= 45.0).unwrap().rect().center();
+    h.event(Event::PointerMoved(tab));
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: tab, button: PointerButton::Secondary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    h.event(Event::PointerButton { pos: tab, button: PointerButton::Secondary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(2);
+    // The column bar's » button is also labelled Collapse to Icons.
+    for item in ["Close", "Close Tab Group", "Minimize", "Collapse to Icons", "Float Panel"] {
+        assert!(h.query_all_by_label(item).next().is_some(), "{item}");
+    }
+    assert_eq!(h.query_all_by_label("Minimize").count(), 1, "the tab menu lists Minimize once");
+    assert!(h.query_all_by_label("Dock Panel").next().is_none(), "a docked panel has no Dock Panel");
+    h.get_by_label("Close").click();
+    h.run_steps(2);
+    assert!(!h.state().ui.docking.as_ref().unwrap().contains(&"layers".to_string()));
+}
+
+/// A floating panel's tab menu and three-line menu have Dock Panel, which puts it back where it
+/// floated from.
+#[test]
+fn dock_panel_in_a_floating_panels_menus_returns_it_to_the_dock() {
+    let mut app = app();
+    app.run("window.panel.activate", json!({"panel":"layers"})).unwrap();
+    let docked = app.ui.docking.clone().unwrap();
+    app.run("window.panel.float", json!({"panel":"layers","x":200,"y":150})).unwrap();
+    let mut h = harness(app, vec2(1280.0, 800.0));
+    let tab = h.ctx.read_response(tab_id("layers")).unwrap().rect;
+    click(&mut h, tab.center(), PointerButton::Secondary);
+    h.get_by_label("Dock Panel").click();
+    h.run_steps(3);
+    assert_eq!(h.state().ui.docking.as_ref(), Some(&docked), "the tab menu docks it back in its group");
+    let mut app = h.into_state();
+    app.run("window.panel.float", json!({"panel":"layers","x":200,"y":150})).unwrap();
+    let mut menu = Harness::builder().with_size(vec2(300.0, 400.0)).build_ui_state(|ui, app: &mut DesignApp| panel_menu(app, ui, "layers"), app);
+    menu.run_steps(1);
+    menu.get_by_label("Dock Panel").click();
+    menu.run_steps(2);
+    assert_eq!(menu.state().ui.docking.as_ref(), Some(&docked), "so does the three-line menu");
+}
+
+/// Window › Styles › Paragraph Styles opens InDesign's floating Character Styles | Paragraph Styles
+/// group, which stays open while other panels open (Learn Skills Daily's InDesign course, 7:55).
+#[test]
+fn paragraph_styles_open_floating_with_character_styles() {
+    let mut app = app();
+    app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    let group = layout.floating.iter().flat_map(window_groups).find(|g| g.panels.iter().any(|p| p == "paragraphStyles")).expect("a floating group");
+    assert_eq!(group.panels, ["characterStyles", "paragraphStyles"]);
+    assert_eq!(group.panels[group.active], "paragraphStyles", "the one chosen is in front");
+    // The dock still shows Properties in front.
+    assert_eq!(layout.panel_state(&"properties".to_string()), craft_ui::docking::PanelState::Front, "{:?}", layout.root);
+    assert_eq!(layout.floating.len(), 1, "one floating window holds both tabs");
+    // Other panels from Window leave it open.
+    app.run("window.panel", json!({"panel":"color"})).unwrap();
+    app.run("window.panel", json!({"panel":"links"})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    assert!(layout.floating.iter().flat_map(window_groups).any(|g| g.panels == ["characterStyles", "paragraphStyles"]));
+    // Once showing, Window › Character Styles brings that tab forward.
+    app.run("window.panel", json!({"panel":"characterStyles"})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    let group = layout.floating.iter().flat_map(window_groups).find(|g| g.panels.iter().any(|p| p == "characterStyles")).unwrap();
+    assert_eq!(group.panels[group.active], "characterStyles");
+    assert_eq!(layout.panels().iter().filter(|p| p.as_str() == "characterStyles").count(), 1);
+}
+
+/// Window › Styles floats the styles icon group out of the iconic column; Dock Panel puts the
+/// group back as one, at the same place in that column.
+#[test]
+fn dock_panel_returns_the_floated_styles_group_to_its_icon_group() {
+    let mut app = app();
+    let docked = app.ui.docking.clone().unwrap_or_else(|| default_layout(&app.ui));
+    let styles = ["characterStyles", "paragraphStyles"].map(String::from).to_vec();
+    let icon_groups = |layout: &Layout<String>| -> Vec<Vec<String>> {
+        dock_columns(layout).into_iter().filter(|c| c.iconic).flat_map(|c| &c.groups).map(|g| g.panels.clone()).collect()
+    };
+    let before = icon_groups(&docked);
+    let at = before.iter().position(|g| *g == styles).expect("the styles are an icon group");
+    app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    assert!(layout.floating.iter().flat_map(window_groups).any(|g| g.panels == styles), "{:?}", layout.floating);
+    assert!(!icon_groups(&layout).contains(&styles));
+    app.run("window.panel.dock", json!({"panel":"paragraphStyles"})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    assert!(layout.floating.is_empty(), "{:?}", layout.floating);
+    assert_eq!(icon_groups(&layout), before, "both styles are back in their icon group, at the same place");
+    assert_eq!(icon_groups(&layout).get(at), Some(&styles));
+    assert!(valid(&layout));
+}
+
+/// Style panels the user docked and then closed come back in the dock, not floating.
+#[test]
+fn paragraph_styles_closed_from_the_dock_reopen_there() {
+    let mut app = app();
+    app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();
+    for panel in ["characterStyles", "paragraphStyles"] {
+        app.run("window.panel.move", json!({"panel": panel, "anchor": "properties"})).unwrap();
+    }
+    for panel in ["characterStyles", "paragraphStyles"] {
+        app.run("window.panel.close", json!({"panel": panel})).unwrap();
+    }
+    app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    assert!(layout.contains(&"paragraphStyles".to_string()));
+    assert!(layout.floating.iter().flat_map(window_groups).all(|g| !g.panels.iter().any(|p| p == "paragraphStyles")), "{:?}", layout.floating);
+}
+
+fn click(h: &mut Harness<'static, DesignApp>, at: Pos2, button: PointerButton) {
+    h.event(Event::PointerMoved(at));
+    h.run_steps(1);
+    for pressed in [true, false] {
+        h.event(Event::PointerButton { pos: at, button, pressed, modifiers: Modifiers::NONE });
+        h.run_steps(1);
+    }
+    h.run_steps(2);
+}
+
+/// Window › Paragraph Styles switches to the docking layout. After Window › Pages the Pages panel
+/// keeps its three-line panel menu, and its tab menu lists InDesign's tab commands.
+#[test]
+fn pages_keeps_its_panel_menu_in_the_docking_layout() {
+    let mut app = app();
+    app.run("file.new", json!({})).unwrap();
+    app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();
+    app.run("window.panel", json!({"panel":"pages"})).unwrap();
+    assert!(app.ui.docking.is_some());
+    let mut h = harness(app, vec2(1280.0, 800.0));
+    let tab = h.query_all_by_label("Pages").find(|node| node.rect().height() <= 45.0).unwrap().rect();
+    click(&mut h, egui::pos2(1280.0 - 12.0, tab.center().y), PointerButton::Primary);
+    assert!(egui::Popup::is_any_open(&h.ctx), "the three-line button must open a menu");
+    for item in ["Numbering & Section Options…", "Close Tab Group", "Float Panel"] {
+        assert!(h.query_by_label(item).is_some(), "{item}");
+    }
+    h.get_by_label("Panel Options…").click();
+    h.run_steps(3);
+    assert!(h.state().ui.dialog.as_ref().is_some_and(|d| d.id == "pagesPanelOptions"));
+    h.state_mut().ui.dialog = None;
+    h.run_steps(2);
+
+    click(&mut h, tab.center(), PointerButton::Secondary);
+    for item in ["Close", "Close Tab Group", "Minimize", "Collapse to Icons", "Float Panel", "Group with"] {
+        assert!(h.query_all_by_label(item).next().is_some(), "{item}");
+    }
+    assert!(h.query_by_label("Close Panel").is_none());
+    assert!(h.query_by_label("Panel Options…").is_none(), "the panel's own commands stay in its panel menu");
+}
+
+fn group_with(layout: &Layout<String>, panel: &str) -> (bool, Vec<String>, usize) {
+    if let Some(g) = layout.floating.iter().flat_map(window_groups).find(|g| g.panels.iter().any(|p| p == panel)) {
+        return (true, g.panels, g.active);
+    }
+    let mut visit: Vec<&Node<String>> = layout.root.iter().collect();
+    while let Some(node) = visit.pop() {
+        match node {
+            Node::Split { first, second, .. } => visit.extend([&**first, &**second]),
+            Node::Tabs { panels, active } if panels.iter().any(|p| p == panel) => return (false, panels.clone(), *active),
+            Node::Dock { columns, .. } => {
+                if let Some(g) = columns.iter().flat_map(|c| &c.groups).find(|g| g.panels.iter().any(|p| p == panel)) {
+                    return (false, g.panels.clone(), g.active);
+                }
+            }
+            _ => {}
+        }
+    }
+    panic!("{panel} is not in {layout:?}");
+}
+
+fn drag_bar(h: &Harness<'static, DesignApp>, first: &str) -> egui::Rect {
+    h.ctx.read_response(hit_id(&craft_ui::docking::Hit::DragBar(first.to_string()))).expect("the group's drag bar").rect
+}
+
+/// The docked Character Styles | Paragraph Styles group moves as one by its drag bar: dropped on
+/// the canvas it floats, dropped on another strip it joins as tabs. Order and the tab in front
+/// are kept.
+#[test]
+fn dragging_a_docked_group_by_its_bar_moves_every_tab() {
+    let mut app = app();
+    app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();
+    let below = json!({"MoveGroup": {"panel": "characterStyles", "to": {"At": {"anchor": "properties", "placement": {"Group": {"below": true}}}}}});
+    app.run("window.panel.layout", json!({"action": below})).unwrap();
+    let styles = ["characterStyles", "paragraphStyles"];
+    assert_eq!(group_with(app.ui.docking.as_ref().unwrap(), "characterStyles"), (false, styles.map(String::from).to_vec(), 1));
+
+    let mut h = harness(app, vec2(1280.0, 800.0));
+    let bar = drag_bar(&h, "characterStyles");
+    drag(&mut h, bar.center(), egui::pos2(400.0, 400.0));
+    let layout = h.state().ui.docking.as_ref().unwrap();
+    assert_eq!(group_with(layout, "paragraphStyles"), (true, styles.map(String::from).to_vec(), 1), "{layout:?}");
+    assert!(valid(layout));
+
+    let bar = drag_bar(&h, "characterStyles");
+    let properties = h.ctx.read_response(tab_id("properties")).unwrap().rect.center();
+    drag(&mut h, bar.center(), properties);
+    let layout = h.state().ui.docking.as_ref().unwrap();
+    let (floating, panels, active) = group_with(layout, "characterStyles");
+    assert!(!floating, "{layout:?}");
+    let at = panels.iter().position(|p| p == "characterStyles").unwrap();
+    assert_eq!(panels.get(at + 1).map(String::as_str), Some("paragraphStyles"), "{panels:?}");
+    assert_eq!(panels[active], "paragraphStyles");
+    assert!(layout.floating.is_empty(), "{:?}", layout.floating);
+}
+
+fn dock_of(layout: &Layout<String>) -> (Side, &[Column<String>]) {
+    let Some(Node::Split { first, second, .. }) = &layout.root else { panic!("root is not a split: {layout:?}") };
+    assert!(matches!(&**first, Node::Tabs { panels, .. } if panels == &[CANVAS.to_string()]), "{layout:?}");
+    let Node::Dock { side, columns } = &**second else { panic!("second is not a dock: {layout:?}") };
+    (*side, columns)
+}
+
+#[test]
+fn default_workspaces_are_the_canvas_beside_an_end_dock() {
+    let mut app = app();
+    let layout = default_layout(&app.ui);
+    assert!(valid(&layout));
+    let (side, columns) = dock_of(&layout);
+    assert_eq!(side, Side::End);
+    let [outer, icons] = columns else { panic!("{columns:?}") };
+    assert!(!outer.iconic);
+    assert_eq!(outer.groups.len(), 1);
+    assert_eq!(outer.groups[0].panels, ["properties", "pages", "layers"]);
+    assert!(icons.iconic);
+    let groups: Vec<Vec<&str>> = icons.groups.iter().map(|g| g.panels.iter().map(String::as_str).collect()).collect();
+    let expected: Vec<Vec<&str>> = ICON_GROUPS.iter().map(|g| g.to_vec()).collect();
+    assert_eq!(groups, expected, "the iconic column groups InDesign's panel families");
+    // Essentials Classic: only its named icon groups, in one iconic column.
+    app.run("window.workspace", json!({"name": "Essentials Classic"})).unwrap();
+    let layout = default_layout(&app.ui);
+    assert!(valid(&layout));
+    let (_, columns) = dock_of(&layout);
+    let [column] = columns else { panic!("{columns:?}") };
+    assert!(column.iconic);
+    let expected: Vec<Vec<String>> = app.ui.icon_groups.clone().unwrap();
+    let groups: Vec<Vec<String>> = column.groups.iter().map(|g| g.panels.clone()).collect();
+    assert_eq!(groups.len(), expected.len());
+    assert!(groups.iter().flatten().all(|p| expected.iter().flatten().any(|e| e == p)));
+}
+
+/// Every dock panel that starts in the iconic column has one place in [`ICON_GROUPS`], so a new
+/// panel is not left as a group of its own.
+#[test]
+fn every_icon_panel_is_in_one_default_icon_group() {
+    for (id, _, _) in crate::dock::ICON_PANELS {
+        assert_eq!(ICON_GROUPS.iter().flat_map(|g| g.iter()).filter(|p| *p == id).count(), 1, "{id}");
+    }
+    for id in ICON_GROUPS.iter().flat_map(|g| g.iter()) {
+        assert!(crate::dock::ICON_PANELS.iter().any(|p| p.0 == *id), "{id} is not a dock panel");
+    }
+}
+
+/// A panel the workspace places elsewhere leaves its icon group; a group it empties goes.
+#[test]
+fn placed_panels_leave_their_icon_groups() {
+    let mut placed = Placed::default();
+    for id in ["properties", "pages", "layers", "swatches", "effects"] {
+        placed.take(id);
+    }
+    let column = icon_column(None, &mut placed).unwrap();
+    let groups: Vec<Vec<&str>> = column.groups.iter().map(|g| g.panels.iter().map(String::as_str).collect()).collect();
+    assert_eq!(groups.first().unwrap(), &["stroke", "color", "gradient"]);
+    assert_eq!(groups.get(1).unwrap(), &["characterStyles", "paragraphStyles"]);
+    assert_eq!(groups.len(), ICON_GROUPS.len() - 1);
+}
+
+#[test]
+fn the_dock_is_at_the_right_in_english_and_the_left_in_arabic() {
+    let tab = |h: &Harness<'static, DesignApp>| h.ctx.read_response(tab_id("properties")).map(|r| r.rect).unwrap();
+    let h = harness(app(), vec2(1280.0, 800.0));
+    assert!(tab(&h).left() > 640.0, "{:?}", tab(&h));
+    let mut arabic = app();
+    arabic.ui.language = "ar".into();
+    let h = harness(arabic, vec2(1280.0, 800.0));
+    assert!(tab(&h).right() < 640.0, "{:?}", tab(&h));
+}
+
+#[test]
+fn ui_docking_reports_the_layout_and_the_focused_panel() {
+    let mut h = harness(app(), vec2(1280.0, 800.0));
+    let ctx = h.ctx.clone();
+    let docking = |app: &mut DesignApp| {
+        let (req, _rx) = crate::control::ControlRequest::new("ui.docking", json!({}));
+        match crate::control::handle(app, &ctx, &req) {
+            crate::control::Outcome::Done(v) => v,
+            crate::control::Outcome::Screenshot { .. } => panic!("ui.docking took a screenshot"),
+        }
+    };
+    let v = docking(h.state_mut());
+    assert_eq!(v["ok"], true, "{v}");
+    let result = &v["result"];
+    assert_eq!(result["customized"], false);
+    assert_eq!(result["rightToLeft"], false);
+    assert!(result["focused"].is_null());
+    let layout: Layout<String> = serde_json::from_value(result["layout"].clone()).unwrap();
+    assert_eq!(layout, default_layout(&h.state().ui));
+    let at = h.ctx.read_response(tab_id("layers")).unwrap().rect.center();
+    click(&mut h, at, PointerButton::Primary);
+    let v = docking(h.state_mut());
+    assert_eq!(v["result"]["focused"], "layers", "{v}");
+    // Closing the focused panel releases the focus.
+    h.state_mut().run("window.panel.close", json!({"panel": "layers"})).unwrap();
+    let v = docking(h.state_mut());
+    assert!(v["result"]["focused"].is_null(), "{v}");
+    assert_eq!(v["result"]["customized"], true);
+    assert_eq!(v["result"]["hidden"], json!(["layers"]));
+}
+
+/// A reset replaces the panels: none of them stays focused, opened for `ui.set closePanel` or
+/// queued to raise.
+#[test]
+fn workspace_reset_forgets_the_focused_opened_and_raised_panel() {
+    let mut app = app();
+    app.run("window.panel.float", json!({"panel": "layers"})).unwrap();
+    app.ui.docking_focused = Some("layers".into());
+    assert_eq!(app.ui.docking_opened.as_deref(), Some("layers"));
+    assert_eq!(app.ui.docking_raise.as_deref(), Some("layers"));
+    app.run("window.workspace.reset", json!({})).unwrap();
+    assert_eq!(app.ui.docking_focused, None);
+    assert_eq!(app.ui.docking_opened, None);
+    assert_eq!(app.ui.docking_raise, None);
+    close_visible(&mut app).unwrap();
+    assert!(layout_of(&app).contains(&"layers".to_string()), "closePanel after a reset closes nothing");
+}
+
+/// A command that moves the focused panel takes the focus away and leaves it the panel last
+/// opened; one that closes it forgets both.
+#[test]
+fn moving_or_closing_the_focused_panel_by_command_updates_the_panel_state() {
+    let mut app = app();
+    app.ui.docking_focused = Some("layers".into());
+    app.run("window.panel.activate", json!({"panel": "pages"})).unwrap();
+    assert_eq!(app.ui.docking_focused.as_deref(), Some("layers"), "a command that leaves Layers in place keeps its focus");
+    app.ui.docking_opened = Some("layers".into());
+    app.run("window.panel.move", json!({"panel": "layers", "anchor": "swatches", "zone": "tab"})).unwrap();
+    assert_eq!(app.ui.docking_focused, None);
+    assert_eq!(app.ui.docking_opened.as_deref(), Some("layers"));
+    app.ui.docking_focused = Some("layers".into());
+    app.run("window.panel.close", json!({"panel": "layers"})).unwrap();
+    assert_eq!(app.ui.docking_focused, None);
+    assert_eq!(app.ui.docking_opened, None);
+    assert_eq!(app.ui.docking_raise, None);
+}
+
+/// A divider dragged with the pointer gives the keyboard back: the next arrow key nudges the
+/// selection and leaves the dock's size alone.
+#[test]
+fn arrow_after_dragging_a_dock_divider_nudges_the_selection_not_the_dock() {
+    let mut app = app();
+    app.run("file.new", json!({"width":480,"height":360})).unwrap();
+    let id = app.run("frame.create", json!({"rect":[80,70,330,230],"content":"none"})).unwrap()["id"].as_u64().unwrap();
+    let mut h = Harness::builder().with_size(vec2(1280.0, 800.0)).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            app.logic(ui.ctx());
+            app.ui(ui);
+        },
+        app,
+    );
+    h.run_steps(5);
+    let column = craft_ui::docking::Hit::Divider(craft_ui::docking::Divider::Column("properties".to_string()));
+    let divider = hits(&h).into_iter().find_map(|(hit, rect)| (hit == column).then_some(rect)).expect("the main dock column's divider");
+    drag(&mut h, divider.center(), divider.center() - vec2(40.0, 0.0));
+    let resized = h.state().ui.docking.clone().expect("the drag customizes the layout");
+    let bounds = |h: &Harness<'static, DesignApp>| h.state().session.active().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().bounds();
+    let before = bounds(&h);
+    h.event(Event::Key { key: egui::Key::ArrowRight, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    h.event(Event::Key { key: egui::Key::ArrowRight, physical_key: None, pressed: false, repeat: false, modifiers: Modifiers::NONE });
+    h.run_steps(2);
+    assert!(bounds(&h).x0 > before.x0, "the arrow nudges the selection");
+    assert_eq!(h.state().ui.docking.as_ref(), Some(&resized), "the arrow doesn't resize the dock");
+}
+
+fn hits(h: &Harness<'static, DesignApp>) -> Vec<(craft_ui::docking::Hit<String>, egui::Rect)> {
+    craft_ui::docking::DockArea::<String>::hit_rects(&h.ctx, area_id())
+}
+
+/// `window.panel.*` ids and DesignCraft's aliases go through craft-ui's `DockCommand`.
+#[test]
+fn shared_panel_commands_float_dock_and_reject_atomically() {
+    let mut app = app();
+    let docked = default_layout(&app.ui);
+    app.run("window.floatPanel", json!({"panel": "Layers", "x": 60, "y": 90})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    let window = layout.floating.iter().find(|w| w.contains(&"layers".to_string())).expect("Layers floats");
+    assert_eq!(window.rect, [60.0, 90.0, 300.0, 420.0], "at the given place, at its own size");
+    app.run("window.dockPanel", json!({"panel": "layers"})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    assert!(layout.floating.is_empty());
+    assert_eq!(
+        layout.root,
+        docked.root.map(|mut root| {
+            // Back in its place, in front of its group.
+            if let Node::Split { second, .. } = &mut root
+                && let Node::Dock { columns, .. } = &mut **second
+                && let Some(group) = columns.first_mut().and_then(|c| c.groups.first_mut())
+            {
+                group.active = 2;
+            }
+            root
+        }),
+        "Dock Panel returns it where it floated from"
+    );
+    // A docked panel that shares its group leaves it for a new dock at the start edge.
+    let mut tabbed = self::app();
+    tabbed.run("window.panel.dock", json!({"panel": "layers", "side": "Start"})).unwrap();
+    let layout = tabbed.ui.docking.clone().unwrap();
+    assert_eq!(tab_group(&layout, "pages"), ["properties", "pages"]);
+    assert!(matches!(&layout.root, Some(Node::Split { first, .. }) if matches!(&**first, Node::Dock { side: Side::Start, .. })));
+    assert_eq!(tab_group(&layout, "layers"), ["layers"]);
+    // A whole group, by any of its panels, then into a new column of the end dock.
+    app.run("window.panel.float", json!({"panel": "pages", "group": true, "x": 80, "y": 80, "width": 300, "height": 400})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    assert_eq!(layout.floating.len(), 1);
+    assert_eq!(window_groups(&layout.floating[0])[0].panels, ["properties", "pages", "layers"]);
+    app.run("window.panel.dock", json!({"panel": "pages", "group": true, "side": "End"})).unwrap();
+    let layout = app.ui.docking.clone().unwrap();
+    assert!(layout.floating.is_empty());
+    assert_eq!(tab_group(&layout, "pages"), ["properties", "pages", "layers"]);
+    // A lone panel to a new dock at the start edge.
+    app.run("window.panel.float", json!({"panel": "stroke"})).unwrap();
+    app.run("window.panel.dock", json!({"panel": "stroke", "side": "Start"})).unwrap();
+    assert!(
+        matches!(&app.ui.docking.as_ref().unwrap().root, Some(Node::Split { first, .. }) if matches!(&**first, Node::Dock { side: Side::Start, .. }))
+    );
+    // Docking it at that side again leaves it where it is.
+    let before = app.ui.docking.clone();
+    app.run("window.panel.dock", json!({"panel": "stroke", "side": "Start"})).unwrap();
+    assert_eq!(app.ui.docking, before, "it already leads the start dock's last column");
+    // Close Others and Minimize are shared commands too.
+    app.run("window.panel.closeOthers", json!({"panel": "pages"})).unwrap();
+    assert_eq!(tab_group(app.ui.docking.as_ref().unwrap(), "pages"), ["pages"]);
+    assert!(app.ui.docking_hidden.contains_key("properties") && app.ui.docking_hidden.contains_key("layers"));
+    app.run("window.panel.minimize", json!({"panel": "pages"})).unwrap();
+    let location = app.ui.docking.as_ref().unwrap().location(&"pages".to_string()).unwrap();
+    assert!(location.group.is_some_and(|g| g.minimized));
+    // Rejected commands change nothing.
+    let before = (app.ui.docking.clone(), app.ui.docking_hidden.clone());
+    for (id, params) in [
+        ("window.workspace.lock", json!({})),
+        ("window.panel.window", json!({"panel": "pages"})),
+        ("window.panel.move", json!({"panel": "stroke", "anchor": "pages", "zone": "left", "before": "pages"})),
+        ("window.panel.dock", json!({"panel": "stroke", "side": "Middle"})),
+        ("window.panel.dock", json!({"panel": "stroke", "zone": "left"})),
+        ("window.dockPanel", json!({"panel": "properties", "zone": "bottom"})),
+    ] {
+        assert!(app.run(id, params).is_err(), "{id}");
+        assert_eq!((app.ui.docking.clone(), app.ui.docking_hidden.clone()), before, "{id}");
+    }
+    // A zone is a side of an anchor; the error names the two ways to say where.
+    let error = app.run("window.panel.dock", json!({"panel": "stroke", "zone": "right"})).unwrap_err();
+    assert!(error.contains("anchor") && error.contains("side"), "{error}");
+    // Every shared id is registered for the command list and MCP.
+    for id in craft_ui::docking::DockCommand::<String>::IDS {
+        assert!(crate::menus::UI_COMMANDS.iter().any(|c| c.0 == *id), "{id} is not registered");
+    }
+}
+
+/// A tab released over the canvas floats there (craft-ui: the protected canvas takes no tabs or
+/// splits); a lone panel released in the window's left edge band makes a new dock there.
+#[test]
+fn tabs_dropped_on_the_canvas_float_and_at_the_far_edge_make_a_dock() {
+    let mut h = harness(app(), vec2(1280.0, 800.0));
+    let tab = |h: &Harness<'static, DesignApp>, panel: &str| {
+        hits(h).into_iter().find(|(hit, _)| *hit == craft_ui::docking::Hit::Tab(panel.into())).map(|(_, r)| r)
+    };
+    let layers = tab(&h, "layers").expect("the Layers tab");
+    drag(&mut h, layers.center(), egui::pos2(500.0, 400.0));
+    let layout = h.state().ui.docking.clone().unwrap();
+    assert!(layout.floating.iter().any(|w| w.contains(&"layers".to_string())), "{layout:?}");
+    // A new dock takes a panel that is alone in its group: the floating Layers, by its title bar.
+    // The harness's area starts 8 pt in from the window edge.
+    let title = hits(&h).into_iter().find(|(hit, _)| *hit == craft_ui::docking::Hit::Title("layers".into())).expect("the title bar").1;
+    drag(&mut h, title.center(), egui::pos2(12.0, 400.0));
+    let layout = h.state().ui.docking.clone().unwrap();
+    assert!(valid(&layout));
+    let mut docks = Vec::new();
+    let mut nodes: Vec<&Node<String>> = layout.root.iter().collect();
+    while let Some(node) = nodes.pop() {
+        match node {
+            Node::Split { first, second, .. } => nodes.extend([&**first, &**second]),
+            Node::Dock { side, columns } => {
+                docks.push((*side, columns.iter().flat_map(|c| &c.groups).flat_map(|g| g.panels.clone()).collect::<Vec<_>>()))
+            }
+            _ => {}
+        }
+    }
+    assert!(docks.iter().any(|(side, panels)| *side == Side::Start && panels == &["layers"]), "{docks:?} {:?}", layout.floating);
+}
+
+/// `ui.docking` lists where each gesture starts: tabs, drag bars and the iconic column's icons.
+#[test]
+fn ui_docking_reports_hit_rects() {
+    let h = harness(app(), vec2(1280.0, 800.0));
+    let v = crate::panel_docking::inspect(h.state(), &h.ctx);
+    let rects = v["hitRects"].as_array().expect("hitRects");
+    let rect_of = |hit: Value| {
+        let entry = rects.iter().find(|r| r["hit"] == hit).unwrap_or_else(|| panic!("no {hit} in {rects:?}"));
+        let r: Vec<f32> = serde_json::from_value(entry["rect"].clone()).unwrap();
+        egui::Rect::from_min_size(egui::pos2(r[0], r[1]), vec2(r[2], r[3]))
+    };
+    let tab = rect_of(json!({"Tab": "pages"}));
+    let bar = rect_of(json!({"DragBar": "properties"}));
+    let icon = rect_of(json!({"Icon": "stroke"}));
+    assert!(tab.width() > 20.0 && bar.width() >= 24.0 && icon.width() > 20.0, "{tab:?} {bar:?} {icon:?}");
+    assert!((tab.center().y - bar.center().y).abs() < 1.0, "the bar is in the tab strip");
+    assert!(icon.left() > 640.0, "the iconic column is at the end edge");
+}
+
+/// Clicking an icon in the iconic column opens its panel as a flyout on the canvas side; a
+/// second click closes it.
+#[test]
+fn clicking_an_iconic_column_icon_opens_its_flyout() {
+    let mut h = harness(app(), vec2(1280.0, 800.0));
+    let icon = hits(&h).into_iter().find(|(hit, _)| *hit == craft_ui::docking::Hit::Icon("swatches".into())).expect("the Swatches icon").1;
+    click(&mut h, icon.center(), PointerButton::Primary);
+    assert_eq!(h.state().ui.docking_flyout.as_deref(), Some("swatches"));
+    let tab = hits(&h).into_iter().find(|(hit, _)| *hit == craft_ui::docking::Hit::Tab("swatches".into())).expect("the flyout's tab").1;
+    assert!(tab.right() <= icon.left() + 1.0, "the flyout is beside the column, on the canvas side: {tab:?} {icon:?}");
+    assert!(showing(h.state(), "swatches"));
+    click(&mut h, icon.center(), PointerButton::Primary);
+    assert!(h.state().ui.docking_flyout.is_none());
+}
+
+/// Auto-Collapse Iconic Panels is off by default, also for preferences saved while it was on by
+/// default: working on the canvas leaves an open flyout open.
+#[test]
+fn a_canvas_click_leaves_an_open_flyout_open() {
+    let mut h = harness(app(), vec2(1280.0, 800.0));
+    assert!(!h.state().ui.dock_auto_collapse);
+    let icon = hits(&h).into_iter().find(|(hit, _)| *hit == craft_ui::docking::Hit::Icon("swatches".into())).expect("the Swatches icon").1;
+    click(&mut h, icon.center(), PointerButton::Primary);
+    assert_eq!(h.state().ui.docking_flyout.as_deref(), Some("swatches"));
+    click(&mut h, egui::pos2(400.0, 400.0), PointerButton::Primary);
+    assert_eq!(h.state().ui.docking_flyout.as_deref(), Some("swatches"), "the flyout stays open");
+    assert!(showing(h.state(), "swatches"));
+    let saved = crate::UiState::from_preferences_json(br#"{"dockAutoCollapse": true}"#).unwrap();
+    assert!(!saved.dock_auto_collapse, "the older key is not read");
+}
+
+/// Iconic columns paint DesignCraft's own panel icons, in the colour craft-ui passes; a panel
+/// without an icon paints nothing.
+#[test]
+fn panel_icons_are_painted_in_code() {
+    let mut app = app();
+    let mut content = PanelContent { app: &mut app };
+    let ctx = egui::Context::default();
+    let mut paint = |panel: &str| {
+        let mut painted = false;
+        let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
+            let painter = ui.ctx().layer_painter(egui::LayerId::background());
+            let rect = egui::Rect::from_min_size(Pos2::ZERO, vec2(20.0, 20.0));
+            painted = craft_ui::docking::DockContent::paint_icon(&mut content, &painter, rect, &panel.to_string(), egui::Color32::RED);
+        });
+        output.textures_delta.clear();
+        (painted, output.shapes.len())
+    };
+    let (painted, shapes) = paint("pages");
+    assert!(painted && shapes > 0, "{painted} {shapes}");
+    assert_eq!(paint(CANVAS), (false, 0));
+}
+
+/// Every docking label in DesignCraft's wording is translated in the shared catalog's languages.
+#[test]
+fn docking_labels_are_translated() {
+    for language in ["de", "fr", "es", "ja", "zh"] {
+        for (key, english) in DOCK_LABELS {
+            assert_ne!(crate::i18n::tr(language, english), *english, "{key} in {language}");
+        }
+    }
+}
+
+/// With DesignCraft's title bar under macOS's transparent one, a floating window saved in the
+/// title-bar strip is drawn below it, where its title bar can't move the app window.
+#[test]
+fn a_floating_window_saved_in_the_title_bar_strip_is_drawn_below_it() {
+    let mut app = app();
+    app.integrated_titlebar = true;
+    app.run("window.panel.float", json!({"panel":"properties"})).unwrap();
+    let window = app.ui.docking.as_mut().unwrap().floating.iter_mut().find(|w| w.panels().any(|p| p == "properties")).unwrap();
+    window.rect = [200.0, 0.0, 280.0, 360.0];
+    let h = harness(app, egui::vec2(1400.0, 900.0));
+    let drawn = h.ctx.memory(|m| m.area_rect(crate::panel_docking::floating_layer("properties").id)).unwrap();
+    assert!(drawn.min.y >= crate::chrome::MAC_APP_BAR - 0.5, "{drawn:?}");
+}
+
+/// A floating window holds splits like the dock: a panel docked below another one in the
+/// window splits it, the divider between them drags, and the new size is saved.
+#[test]
+fn a_split_inside_a_floating_window_resizes_and_is_saved() {
+    let mut app = app();
+    app.run("window.panel.float", json!({"panel":"swatches", "x":300, "y":120, "width":300, "height":500})).unwrap();
+    app.run("window.panel.move", json!({"panel":"color", "anchor":"swatches", "zone":"bottom"})).unwrap();
+    let window = |app: &DesignApp| app.ui.docking.as_ref().unwrap().floating.iter().find(|w| w.contains("swatches")).cloned().unwrap();
+    let ratio = |window: &Floating<String>| match window.root {
+        Node::Split { size: craft_ui::layout::SplitSize::Ratio(r), .. } => r,
+        ref root => panic!("expected a split window: {root:?}"),
+    };
+    assert_eq!(window_groups(&window(&app)).into_iter().map(|g| g.panels).collect::<Vec<_>>(), [["swatches"], ["color"]]);
+    let before = ratio(&window(&app));
+    let mut h = harness(app, vec2(1400.0, 900.0));
+    let divider = hits(&h)
+        .into_iter()
+        .find_map(|(hit, rect)| {
+            matches!(&hit, craft_ui::docking::Hit::Divider(craft_ui::docking::Divider::WindowSplit(_, path)) if path.is_empty()).then_some(rect)
+        })
+        .expect("the window's divider");
+    drag(&mut h, divider.center(), divider.center() + vec2(0.0, 60.0));
+    let after = ratio(&window(h.state()));
+    assert!(after > before + 0.05, "{before} -> {after}");
+    let saved = serde_json::to_vec(&h.state().ui).unwrap();
+    let loaded = crate::UiState::from_preferences_json(&saved).unwrap();
+    assert_eq!(loaded.docking, h.state().ui.docking);
+}
+
+/// The default layout is rebuilt every frame: its floating windows keep their ids, so their
+/// native windows aren't opened again each frame.
+#[test]
+fn default_layout_floats_keep_their_window_ids() {
+    let mut app = app();
+    app.ui.floating = vec![("swatches".to_string(), [10.0, 20.0])];
+    let ids = |app: &DesignApp| default_layout(&app.ui).floating.iter().map(|w| w.id).collect::<Vec<_>>();
+    let first = ids(&app);
+    assert_eq!(first.len(), 1, "Swatches floats");
+    assert_eq!(ids(&app), first);
+}
+
+#[test]
+fn dialogs_about_and_quick_apply_block_native_floating_windows() {
+    let mut app = app();
+    assert!(!modal_open(&app));
+    app.ui.dialog = Some(crate::dialogs::Dialog::new("newDocument", json!({})));
+    assert!(modal_open(&app), "dialog");
+    app.ui.dialog = None;
+    app.run("help.about", json!({})).unwrap();
+    assert!(modal_open(&app), "About");
+    app.run("help.about", json!({"open": false})).unwrap();
+    assert!(!modal_open(&app));
+    app.ui.palette = Some(String::new());
+    assert!(modal_open(&app), "Quick Apply");
+    app.ui.palette = None;
+    assert!(!modal_open(&app));
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn a_document_dropped_on_a_floating_panel_window_opens() {
+    #[derive(Debug)]
+    struct Dropped(std::path::PathBuf);
+    impl egui::DroppedFile for Dropped {
+        fn path(&self) -> &std::path::Path {
+            &self.0
+        }
+        fn bytes(&self) -> Result<Vec<u8>, String> {
+            std::fs::read(&self.0).map_err(|e| e.to_string())
+        }
+    }
+    let dir = tempfile::tempdir().unwrap();
+    let path = dir.path().join("dropped.designcraft");
+    let mut saved = app();
+    saved.run("file.new", json!({})).unwrap();
+    saved.run("file.save", json!({"path": path})).unwrap();
+
+    let mut app = app();
+    assert!(app.session.documents().is_empty());
+    let files = craft_ui::docking::WindowFiles {
+        window: 1,
+        viewport: egui::ViewportId::from_hash_of("float"),
+        panel: "layers".to_owned(),
+        pos: None,
+        hovered: Vec::new(),
+        dropped: vec![std::sync::Arc::new(Dropped(path.clone())) as egui::DroppedFileHandle],
+    };
+    open_window_drops(&mut app, &[files]);
+    assert_eq!(app.session.documents().len(), 1, "the dropped document opens");
+}
diff --git a/crates/ui-egui/src/panel_docking_tests.rs b/crates/ui-egui/src/panel_docking_tests.rs
deleted file mode 100644
index f436cfb5e..000000000
--- a/crates/ui-egui/src/panel_docking_tests.rs
+++ /dev/null
@@ -1,789 +0,0 @@
-use super::*;
-use egui::{Event, Modifiers, PointerButton, Pos2, vec2};
-use egui_kittest::{Harness, kittest::Queryable};
-
-fn app() -> DesignApp {
-    DesignApp::new(designcraft_engine::Session::new(), Default::default())
-}
-
-#[test]
-fn panel_commands_group_split_reorder_float_and_restore_without_duplicate_ownership() {
-    let mut app = app();
-    app.run("window.panel.move", json!({"panel":"swatches", "anchor":"layers", "zone":"top"})).unwrap();
-    app.run("window.panel.move", json!({"panel":"properties", "anchor":"swatches", "before":"swatches"})).unwrap();
-    let before_float = app.ui.docking.clone().unwrap();
-    app.run("window.panel.float", json!({"panel":"properties", "x":50,"y":70,"width":330,"height":410})).unwrap();
-    assert!(app.ui.docking.as_ref().unwrap().floating.iter().any(|g| g.panels == ["properties"]));
-    app.run("window.panel.dock", json!({"panel":"properties"})).unwrap();
-    assert_eq!(app.ui.docking.as_ref().unwrap(), &before_float);
-    app.run("window.panel.close", json!({"panel":"properties"})).unwrap();
-    assert!(!app.ui.docking.as_ref().unwrap().contains(&"properties".into()));
-    app.run("window.panel.activate", json!({"panel":"properties"})).unwrap();
-    assert_eq!(app.ui.docking.as_ref().unwrap(), &before_float);
-    let layout = app.ui.docking.as_ref().unwrap();
-    assert!(valid(layout));
-    let unique: std::collections::HashSet<_> = layout.panels().into_iter().collect();
-    assert_eq!(unique.len(), layout.panels().len());
-    let saved = serde_json::to_value(&app.ui).unwrap();
-    let restored: crate::UiState = serde_json::from_value(saved).unwrap();
-    assert_eq!(restored.docking, app.ui.docking);
-    assert_eq!(restored.docking_hidden, app.ui.docking_hidden);
-}
-
-#[test]
-fn invalid_panel_requests_are_atomic_and_do_not_enter_a_custom_workspace() {
-    let mut app = app();
-    for (id, params) in [
-        ("window.panel.move", json!({"panel":"layers","anchor":"unknown"})),
-        ("window.panel.move", json!({"panel":"layers","anchor":"properties","before":"unknown"})),
-        ("window.panel.move", json!({"panel":"layers","anchor":"properties","zone":42})),
-        ("window.panel.float", json!({"panel":"layers","width":-10})),
-        ("window.panel.float", json!({"panel":"unknown"})),
-        ("window.panel.float", json!({"panel":"layers","x":"invalid"})),
-    ] {
-        let old = app.ui.docking.clone();
-        let hidden = app.ui.docking_hidden.clone();
-        assert!(app.run(id, params).is_err(), "{id}");
-        assert_eq!(app.ui.docking, old);
-        assert_eq!(app.ui.docking_hidden, hidden);
-    }
-}
-
-fn harness(app: DesignApp, size: egui::Vec2) -> Harness<'static, DesignApp> {
-    let mut ready = false;
-    let mut harness = Harness::builder().with_size(size).with_step_dt(1.0 / 60.0).build_ui_state(
-        move |ui, app: &mut DesignApp| {
-            if !ready {
-                crate::theme::install_fonts(ui.ctx(), &app.ui.language);
-                crate::theme::apply(ui.ctx(), &crate::theme::Tokens::for_brightness(crate::theme::Brightness::MediumDark));
-                ready = true;
-                return;
-            }
-            crate::dock::show(app, ui);
-            egui::CentralPanel::default().show(ui, |_| {});
-        },
-        app,
-    );
-    harness.run_steps(4);
-    harness
-}
-
-fn drag(h: &mut Harness<'static, DesignApp>, from: Pos2, to: Pos2) {
-    h.event(Event::PointerMoved(from));
-    h.run_steps(1);
-    h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    for step in 1..=8 {
-        h.event(Event::PointerMoved(from + (to - from) * (step as f32 / 8.0)));
-        h.run_steps(1);
-    }
-    h.event(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(3);
-}
-
-#[test]
-fn ordinary_panel_tab_drag_enters_shared_docking_and_can_redock_into_another_tab_group() {
-    let mut h = harness(app(), vec2(1280.0, 800.0));
-    let source = h.query_all_by_label("Layers").find(|node| node.rect().height() <= 45.0).unwrap().rect().center();
-    drag(&mut h, source, egui::pos2(160.0, 140.0));
-    let layout = h.state().ui.docking.as_ref().expect("ordinary tab drag starts shared docking");
-    assert!(layout.floating.iter().any(|g| g.panels.contains(&"layers".into())), "{layout:?}");
-    let source = h.ctx.read_response(egui::Id::new("designcraft-panel-docking").with(("tab", &"layers".to_string()))).unwrap().rect.center();
-    let destination = h.ctx.read_response(egui::Id::new("designcraft-panel-docking").with(("tab", &"properties".to_string()))).unwrap().rect.center();
-    drag(&mut h, source, destination);
-    let layout = h.state().ui.docking.as_ref().unwrap();
-    assert!(!layout.floating.iter().any(|g| g.panels.contains(&"layers".into())));
-    assert!(valid(layout));
-}
-
-#[test]
-fn saved_workspace_restores_the_custom_tree_and_hidden_panel_placement() {
-    let mut app = app();
-
-    app.run("window.panel.move", json!({"panel":"swatches","anchor":"layers","zone":"top"})).unwrap();
-    app.run("window.panel.float", json!({"panel":"properties","x":50,"y":80})).unwrap();
-    app.run("window.panel.close", json!({"panel":"swatches"})).unwrap();
-    let layout = app.ui.docking.clone();
-    let hidden = app.ui.docking_hidden.clone();
-    app.run("window.newWorkspace", json!({"name":"Custom docking"})).unwrap();
-    app.run("window.workspace", json!({"name":"Essentials"})).unwrap();
-    assert!(app.ui.docking.is_none());
-    app.run("window.workspace", json!({"name":"Custom docking"})).unwrap();
-    assert_eq!(app.ui.docking, layout);
-    assert_eq!(app.ui.docking_hidden, hidden);
-}
-
-/// Explicit offscreen evidence; this creates no native windows.
-#[test]
-fn capture_custom_panel_docking_visual_fixtures() {
-    let Some(directory) = std::env::var_os("CRAFT_UI_DOCKING_FIXTURES").map(std::path::PathBuf::from) else { return };
-    std::fs::create_dir_all(&directory).unwrap();
-    for theme in crate::theme::Brightness::ALL {
-        for width in [800.0, 1280.0] {
-            for scale in [1.0, 1.5, 2.0] {
-                let mut app = app();
-                app.run("file.new", json!({})).unwrap();
-                app.run("frame.create", json!({"rect":[40,40,280,180],"content":"text","text":"Synthetic layout — مرحبا"})).unwrap();
-                let language = if width == 800.0 && scale == 1.0 { "ar" } else { "en" };
-                app.run("app.language", json!({"lang":if language == "en" { "" } else { language }})).unwrap();
-                app.run("window.panel.move", json!({"panel":"swatches", "anchor":"layers", "zone":"top"})).unwrap();
-                app.run("window.panel.float", json!({"panel":"properties","x":30,"y":90,"width":300,"height":440})).unwrap();
-                let mut ready = false;
-                let mut harness = Harness::builder().with_size(vec2(width, 800.0)).with_pixels_per_point(scale).wgpu().build_ui_state(
-                    move |ui, app: &mut DesignApp| {
-                        if !ready {
-                            crate::theme::install_fonts(ui.ctx(), &app.ui.language);
-                            crate::theme::apply(ui.ctx(), &crate::theme::Tokens::for_brightness(theme));
-                            ready = true;
-                            return;
-                        }
-                        crate::dock::show(app, ui);
-                        egui::CentralPanel::default().show(ui, |ui| {
-                            ui.label("Custom panel workspace");
-                            if app.ui.language == "ar" {
-                                ui.label("Shaped action references:");
-                                for action in ["Float Panel", "Group with", "Close Panel"] {
-                                    crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, action));
-                                }
-                            }
-                        });
-                    },
-                    app,
-                );
-                harness.input_mut().max_texture_side = Some(8192);
-                harness.run_steps(5);
-                assert!(valid(harness.state().ui.docking.as_ref().unwrap()));
-                harness
-                    .render()
-                    .unwrap()
-                    .save(directory.join(format!("designcraft-shared-docking-{}-{language}-{width}-{scale}x.png", theme.id())))
-                    .unwrap();
-                if language == "ar" {
-                    let tab = egui::Id::new("designcraft-panel-docking").with(("tab", &"swatches".to_string()));
-                    let at = harness.ctx.read_response(tab).unwrap().rect.center();
-                    harness.input_mut().events.extend([
-                        Event::PointerMoved(at),
-                        Event::PointerButton { pos: at, button: PointerButton::Secondary, pressed: true, modifiers: Modifiers::NONE },
-                    ]);
-                    harness.run_steps(1);
-                    harness.input_mut().events.push(Event::PointerButton {
-                        pos: at,
-                        button: PointerButton::Secondary,
-                        pressed: false,
-                        modifiers: Modifiers::NONE,
-                    });
-                    harness.run_steps(2);
-                    assert!(egui::Popup::is_any_open(&harness.ctx), "actual tab context menu must be open");
-                    for action in ["Float Panel", "Group with", "Close Panel"] {
-                        assert!(
-                            harness.query_all_by_label(crate::i18n::tr("ar", action)).count() >= 2,
-                            "both logical reference and actual menu label must exist"
-                        );
-                    }
-                    harness.render().unwrap().save(directory.join(format!("designcraft-dock-context-{}-ar.png", theme.id()))).unwrap();
-                }
-            }
-        }
-    }
-}
-
-#[test]
-fn escape_cancels_the_first_drag_without_replacing_the_legacy_workspace() {
-    let mut h = harness(app(), vec2(1280.0, 800.0));
-    let source = h.query_all_by_label("Layers").find(|node| node.rect().height() <= 45.0).unwrap().rect().center();
-    h.event(Event::PointerMoved(source));
-    h.run_steps(1);
-    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    h.event(Event::PointerMoved(source - vec2(90.0, 0.0)));
-    h.run_steps(2);
-    assert!(h.state().ui.docking.is_some());
-    h.event(Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    assert!(h.state().ui.docking.is_none());
-    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(2);
-    assert!(h.state().ui.docking.is_none());
-}
-
-#[test]
-fn serialized_layout_actions_cover_geometry_reorder_accordion_and_atomic_rejection() {
-    let mut app = app();
-    app.run("window.panel.move", json!({"panel":"swatches","anchor":"layers","zone":"top"})).unwrap();
-    app.run("window.panel.layout", json!({"action":{"ResizeSplit":{"path":[],"size":{"Ratio":0.35}}}})).unwrap();
-    assert!(
-        matches!(app.ui.docking.as_ref().unwrap().root, Some(Node::Split { size: craft_ui::layout::SplitSize::Ratio(value), .. }) if (value - 0.35).abs() < 0.001)
-    );
-    app.run("window.panel.float", json!({"panel":"properties"})).unwrap();
-    app.run("window.panel.layout", json!({"action":{"MoveFloating":{"panel":"properties","rect":[44,66,360,450]}}})).unwrap();
-    assert_eq!(
-        app.ui.docking.as_ref().unwrap().floating.iter().find(|group| group.panels.iter().any(|p| p == "properties")).unwrap().rect,
-        [44.0, 66.0, 360.0, 450.0]
-    );
-    app.run("window.panel.layout", json!({"action":{"Move":{"panel":"properties","anchor":"swatches","placement":{"Tab":{"before":"swatches"}}}}}))
-        .unwrap();
-    assert_eq!(group_members_for_test(app.ui.docking.as_ref().unwrap(), "swatches"), ["properties", "swatches"]);
-    let before = app.ui.docking.clone();
-    let hidden = app.ui.docking_hidden.clone();
-    for action in [
-        json!({"MoveFloating":{"panel":"properties","rect":[0,0,-5,30]}}),
-        json!({"ResizeSplit":{"path":[true,true,true],"size":{"Ratio":0.2}}}),
-        json!({"Open":{"panel":"unknown","anchor":null}}),
-        json!({"Move":{"panel":"properties","anchor":"swatches","placement":{"Tab":{"before":"unknown"}}}}),
-    ] {
-        assert!(app.run("window.panel.layout", json!({"action":action})).is_err());
-        assert_eq!(app.ui.docking, before);
-        assert_eq!(app.ui.docking_hidden, hidden);
-    }
-    app.ui.docking = Some(Layout {
-        root: Some(Node::Stack { entries: vec![craft_ui::docking::StackEntry { panel: "layers".into(), open: true, height: Some(100.0) }] }),
-        floating: Vec::new(),
-    });
-    app.run("window.panel.layout", json!({"action":{"SetStackOpen":{"panel":"layers","open":false}}})).unwrap();
-    app.run("window.panel.layout", json!({"action":{"ResizeStack":{"panel":"layers","height":150}}})).unwrap();
-    let Some(Node::Stack { entries }) = &app.ui.docking.as_ref().unwrap().root else { panic!("expected stack") };
-    assert!(!entries[0].open);
-    assert_eq!(entries[0].height, Some(150.0));
-}
-
-fn group_members_for_test(layout: &Layout<String>, panel: &str) -> Vec<String> {
-    let mut pending: Vec<_> = layout.root.iter().collect();
-    while let Some(node) = pending.pop() {
-        match node {
-            Node::Tabs { panels, .. } if panels.iter().any(|p| p == panel) => return panels.clone(),
-            Node::Split { first, second, .. } => pending.extend([first.as_ref(), second.as_ref()]),
-            _ => {}
-        }
-    }
-    Vec::new()
-}
-
-#[test]
-fn populated_canvas_keeps_a_real_stroke_edit_after_floating_and_redocking() {
-    let mut app = app();
-    app.run("file.new", json!({"width":480,"height":360})).unwrap();
-    let id = app.run("frame.create", json!({"rect":[80,70,330,230],"content":"none"})).unwrap()["id"].as_u64().unwrap();
-    app.run("object.fill", json!({"swatch":"C=100 M=0 Y=0 K=0"})).unwrap();
-    app.run("object.stroke", json!({"weight":8})).unwrap();
-    app.run("window.panel.float", json!({"panel":"stroke","x":40,"y":140,"width":310,"height":490})).unwrap();
-    let directory = std::env::var_os("CRAFT_UI_DOCKING_FIXTURES").map(std::path::PathBuf::from);
-    let builder = Harness::builder().with_size(vec2(1280.0, 800.0));
-    let builder = if directory.is_some() { builder.wgpu() } else { builder };
-    let mut h = builder.build_ui_state(
-        |ui, app: &mut DesignApp| {
-            app.logic(ui.ctx());
-            app.ui(ui);
-        },
-        app,
-    );
-    h.input_mut().max_texture_side = Some(8192);
-    h.run_steps(5);
-    let at = h.get_by_label("Bevel").rect().center();
-    h.hover_at(at);
-    h.run_steps(1);
-    for pressed in [true, false] {
-        h.event(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
-        h.run_steps(1);
-    }
-    h.run_steps(2);
-    assert_eq!(h.state().session.active().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().stroke.join, designcraft_doc::Join::Bevel);
-    if let Some(directory) = &directory {
-        std::fs::create_dir_all(directory).unwrap();
-        h.render().unwrap().save(directory.join("designcraft-populated-stroke-floating.png")).unwrap();
-    }
-    let from = h.ctx.read_response(egui::Id::new("designcraft-panel-docking").with(("tab", &"stroke".to_string()))).unwrap().rect.center();
-    let to = h.ctx.read_response(egui::Id::new("designcraft-panel-docking").with(("tab", &"properties".to_string()))).unwrap().rect.center();
-    drag(&mut h, from, to);
-    assert!(h.state().ui.docking.as_ref().unwrap().floating.is_empty());
-    assert_eq!(h.state().session.active().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().stroke.join, designcraft_doc::Join::Bevel);
-    if let Some(directory) = &directory {
-        h.render().unwrap().save(directory.join("designcraft-populated-stroke-redocked.png")).unwrap();
-    }
-}
-
-#[test]
-fn properties_stroke_link_opens_the_stroke_panel_in_a_custom_workspace() {
-    let mut app = app();
-    app.run("file.new", json!({"width":480,"height":360})).unwrap();
-    app.run("frame.create", json!({"rect":[80,70,330,230],"content":"none"})).unwrap();
-    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
-    // Floating Layers leaves Pages the active tab beside Properties.
-    app.run("window.panel", json!({"panel":"properties"})).unwrap();
-    assert!(!app.ui.docking.as_ref().unwrap().contains(&"stroke".into()));
-    let mut h = Harness::builder().with_size(vec2(1280.0, 800.0)).build_ui_state(
-        |ui, app: &mut DesignApp| {
-            app.logic(ui.ctx());
-            app.ui(ui);
-        },
-        app,
-    );
-    h.run_steps(5);
-    let at = h.get_by_role_and_label(egui::accesskit::Role::Link, "Stroke").rect().center();
-    h.hover_at(at);
-    h.run_steps(1);
-    for pressed in [true, false] {
-        h.event(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
-        h.run_steps(1);
-    }
-    h.run_steps(2);
-    assert!(h.state().ui.docking.as_ref().unwrap().contains(&"stroke".into()));
-    assert_eq!(h.state().ui.docking_opened.as_deref(), Some("stroke"));
-}
-
-#[test]
-fn changing_workspace_during_a_drag_cancels_the_stale_gesture() {
-    let mut app = app();
-    app.run("window.panel.move", json!({"panel":"swatches","anchor":"layers","zone":"top"})).unwrap();
-    let destination = app.ui.docking.clone();
-    app.run("window.newWorkspace", json!({"name":"Destination"})).unwrap();
-    app.run("window.workspace", json!({"name":"Essentials"})).unwrap();
-    let mut h = harness(app, vec2(1280.0, 800.0));
-    let source = h.query_all_by_label("Layers").find(|node| node.rect().height() <= 45.0).unwrap().rect().center();
-    h.event(Event::PointerMoved(source));
-    h.run_steps(1);
-    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    h.event(Event::PointerMoved(source - vec2(90.0, 0.0)));
-    h.run_steps(2);
-    h.state_mut().run("window.workspace", json!({"name":"Destination"})).unwrap();
-    h.event(Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    assert_eq!(h.state().ui.docking, destination);
-    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(2);
-    assert_eq!(h.state().ui.docking, destination);
-}
-
-#[test]
-fn first_customization_preserves_the_visible_legacy_flyout() {
-    let mut app = app();
-    app.ui.open_panel = Some("paragraphStyles".into());
-    app.ui.dock_expanded = false;
-    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
-    let layout = app.ui.docking.as_ref().unwrap();
-    assert!(layout.contains(&"paragraphStyles".into()));
-    assert!(valid(layout));
-    assert_eq!(layout.panels().iter().filter(|p| p.as_str() == "paragraphStyles").count(), 1);
-}
-
-#[test]
-fn hiding_before_first_destination_frame_does_not_restore_an_old_drag_snapshot() {
-    let mut app = app();
-    app.run("window.panel.move", json!({"panel":"swatches","anchor":"layers","zone":"top"})).unwrap();
-    app.run("window.newWorkspace", json!({"name":"Destination"})).unwrap();
-    app.run("window.workspace", json!({"name":"Essentials"})).unwrap();
-    let mut h = harness(app, vec2(1280.0, 800.0));
-    let source = h.query_all_by_label("Layers").find(|node| node.rect().height() <= 45.0).unwrap().rect().center();
-    h.event(Event::PointerMoved(source));
-    h.run_steps(1);
-    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    h.event(Event::PointerMoved(source - vec2(90.0, 0.0)));
-    h.run_steps(2);
-    h.state_mut().run("window.workspace", json!({"name":"Destination"})).unwrap();
-    let destination = h.state().ui.docking.clone();
-    let open_panel = h.state().ui.open_panel.clone();
-    let floating = h.state().ui.floating.clone();
-    // The app calls this before dock rendering when panels are hidden or Presentation starts.
-    let ctx = h.ctx.clone();
-    cancel_gesture(h.state_mut(), &ctx);
-    assert_eq!(h.state().ui.docking, destination);
-    assert_eq!(h.state().ui.open_panel, open_panel);
-    assert_eq!(h.state().ui.floating, floating);
-    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(2);
-    assert_eq!(h.state().ui.docking, destination);
-}
-
-#[test]
-fn legacy_table_and_control_visibility_work_after_customization_without_document_edits() {
-    let mut app = app();
-    app.run("file.new", json!({})).unwrap();
-    let doc = serde_json::to_value(&app.session.active().unwrap().doc).unwrap();
-    let undo = app.session.active().unwrap().history.undo.len();
-    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
-    app.run("app.tablePanel", json!({})).unwrap();
-    assert!(app.ui.docking.as_ref().unwrap().contains(&"table".into()));
-    app.run("app.tablePanel", json!({})).unwrap();
-    assert!(!app.ui.docking.as_ref().unwrap().contains(&"table".into()));
-    app.run("app.tablePanel", json!({})).unwrap();
-    let ctx = egui::Context::default();
-    let (req, _) = crate::control::ControlRequest::new("ui.set", json!({"closePanel":true,"dockExpanded":false}));
-    let crate::control::Outcome::Done(result) = crate::control::handle(&mut app, &ctx, &req) else { panic!("expected synchronous control result") };
-    assert_eq!(result["ok"], true);
-    assert!(!app.ui.dock_expanded);
-    assert!(!app.ui.docking.as_ref().unwrap().contains(&"table".into()));
-    app.run("window.panel", json!({"panel":"properties"})).unwrap();
-    assert!(app.ui.dock_expanded);
-    assert_eq!(app.ui.docking_raise.as_deref(), Some("properties"));
-    assert_eq!(serde_json::to_value(&app.session.active().unwrap().doc).unwrap(), doc);
-    assert_eq!(app.session.active().unwrap().history.undo.len(), undo);
-}
-
-#[test]
-fn floating_activation_queues_one_transient_raise_and_workspace_switch_clears_it() {
-    let mut app = app();
-    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
-    app.run("window.panel.activate", json!({"panel":"layers"})).unwrap();
-    assert_eq!(app.ui.docking_raise.as_deref(), Some("layers"));
-    assert!(serde_json::to_value(&app.ui).unwrap().get("docking_raise").is_none());
-    app.run("window.workspace", json!({"name":"Typography"})).unwrap();
-    assert!(app.ui.docking_raise.is_none());
-}
-
-#[test]
-fn shaped_panel_label_keeps_the_logical_accessibility_text() {
-    let ctx = egui::Context::default();
-    let logical = "خصائص Pages";
-    crate::theme::install_fonts(&ctx, "ar");
-    let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
-        let galley = crate::rtl::plain(ui.ctx(), logical, egui::FontId::proportional(12.0), egui::Color32::WHITE);
-        assert_eq!(galley.job.text, logical);
-    });
-    output.textures_delta.clear();
-}
-
-#[test]
-fn modal_overlay_blocks_a_real_tab_drag_release() {
-    let mut app = app();
-    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
-    let mut h = harness(app, vec2(1280.0, 800.0));
-    let area = egui::Id::new("designcraft-panel-docking");
-    let source = h.ctx.read_response(area.with(("tab", &"properties".to_string()))).unwrap().rect.center();
-    h.event(Event::PointerMoved(source));
-    h.run_steps(1);
-    h.event(Event::PointerButton { pos: source, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    h.event(Event::PointerMoved(source - vec2(90.0, 0.0)));
-    h.run_steps(2);
-    assert_eq!(h.ctx.dragged_id(), Some(area.with(("tab", &"properties".to_string()))), "test must start the owned tab gesture");
-    let before = h.state().ui.docking.clone();
-    h.state_mut().ui.dialog = Some(crate::dialogs::Dialog::new("newDocument", json!({})));
-    let destination = egui::pos2(150.0, 150.0);
-    h.event(Event::PointerMoved(destination));
-    h.run_steps(1);
-    h.event(Event::PointerButton { pos: destination, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(2);
-    assert_eq!(h.state().ui.docking, before, "release under a modal must not float or dock the panel");
-    h.state_mut().ui.dialog = None;
-    h.run_steps(2);
-    assert_eq!(h.state().ui.docking, before, "closing the overlay must not revive its blocked drag");
-}
-
-#[test]
-fn shift_f9_toggles_table_after_customization_through_the_real_shortcut_path() {
-    let mut app = app();
-    app.run("file.new", json!({})).unwrap();
-    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
-    let before = serde_json::to_value(&app.session.active().unwrap().doc).unwrap();
-    let mut h = crate::test_window::open(app, vec2(1440.0, 900.0));
-    for visible in [true, false] {
-        let modifiers = Modifiers { shift: true, ..Modifiers::NONE };
-        h.event(Event::Key { key: egui::Key::F9, physical_key: None, pressed: true, repeat: false, modifiers });
-        h.run_steps(1);
-        h.event(Event::Key { key: egui::Key::F9, physical_key: None, pressed: false, repeat: false, modifiers });
-        h.run_steps(2);
-        assert_eq!(h.state().app.ui.docking.as_ref().unwrap().contains(&"table".into()), visible);
-    }
-    assert_eq!(serde_json::to_value(&h.state().app.session.active().unwrap().doc).unwrap(), before);
-}
-
-#[test]
-fn first_story_editor_frame_conservatively_blocks_owned_tab_release() {
-    let mut app = app();
-    app.run("file.new", json!({})).unwrap();
-    let story = app.run("frame.create", json!({"rect":[72,72,300,200],"content":"text","text":"Story editor overlay fixture"})).unwrap()["story"]
-        .as_u64()
-        .unwrap();
-    app.run("window.panel.float", json!({"panel":"layers"})).unwrap();
-    let doc = serde_json::to_value(&app.session.active().unwrap().doc).unwrap();
-    let mut h = crate::test_window::open(app, vec2(1440.0, 900.0));
-    let tab = egui::Id::new("designcraft-panel-docking").with(("tab", &"properties".to_string()));
-    let from = h.ctx.read_response(tab).unwrap().rect.center();
-    h.event(Event::PointerMoved(from));
-    h.run_steps(1);
-    h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    h.event(Event::PointerMoved(from - vec2(90.0, 0.0)));
-    h.run_steps(2);
-    assert_eq!(h.ctx.dragged_id(), Some(tab), "must own a real tab drag before opening editor");
-    assert!(h.ctx.memory(|m| m.area_rect(egui::Id::new("story_editor"))).is_none());
-    let layout = h.state().app.ui.docking.clone();
-    let frame_before = h.ctx.cumulative_frame_nr();
-    h.state_mut().app.run("app.storyEditor", json!({"story":story})).unwrap();
-    // The unmeasured first frame blocks the full content, even outside the eventual editor.
-    let release = egui::pos2(150.0, 150.0);
-    h.input_mut().events.extend([
-        Event::PointerMoved(release),
-        Event::PointerButton { pos: release, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
-    ]);
-    h.run_steps(1);
-    assert_eq!(h.ctx.cumulative_frame_nr() - frame_before, 1, "release must occur in the first editor frame");
-    let measured = h.ctx.memory(|m| m.area_rect(egui::Id::new("story_editor"))).unwrap();
-    assert!(!measured.contains(release), "fixture exercises the conservative first-frame guard outside eventual editor bounds");
-    assert_eq!(h.state().app.ui.docking, layout, "first editor frame must block release before it has a measured rectangle");
-    assert_eq!(serde_json::to_value(&h.state().app.session.active().unwrap().doc).unwrap(), doc);
-    h.run_steps(3);
-    let editor = h.ctx.memory(|m| m.area_rect(egui::Id::new("story_editor"))).unwrap();
-    let screen = h.ctx.content_rect();
-    let outside = [screen.left_bottom() + vec2(80.0, -80.0), screen.right_bottom() + vec2(-450.0, -80.0)]
-        .into_iter()
-        .find(|p| !editor.contains(*p))
-        .expect("fixture has space outside editor");
-    let before_outside = h.state().app.ui.docking.clone();
-    let tab = egui::Id::new("designcraft-panel-docking").with(("tab", &"layers".to_string()));
-    let from = h.ctx.read_response(tab).unwrap().rect.center();
-    h.event(Event::PointerMoved(from));
-    h.run_steps(1);
-    h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    h.event(Event::PointerMoved(from - vec2(90.0, 0.0)));
-    h.run_steps(2);
-    assert_eq!(h.ctx.dragged_id(), Some(tab));
-    h.event(Event::PointerMoved(outside));
-    h.event(Event::PointerButton { pos: outside, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(2);
-    assert_ne!(h.state().app.ui.docking, before_outside, "measured editor must permit ordinary releases outside its bounds");
-    let after = h.state().app.ui.docking.clone();
-    h.state_mut().app.run("app.storyEditor", json!({"story":story})).unwrap();
-    h.run_steps(3);
-    assert_eq!(h.state().app.ui.docking, after, "closing editor must not revive a blocked drag");
-    assert_eq!(serde_json::to_value(&h.state().app.session.active().unwrap().doc).unwrap(), doc);
-}
-
-#[test]
-fn capture_legacy_panel_menu_visual_fixture() {
-    let Some(directory) = std::env::var_os("CRAFT_UI_DOCKING_FIXTURES").map(std::path::PathBuf::from) else { return };
-    std::fs::create_dir_all(&directory).unwrap();
-    let mut app = app();
-    app.run("file.new", json!({})).unwrap();
-    app.run("frame.create", json!({"rect":[40,40,280,180],"content":"text","text":"Legacy Arabic menu fixture"})).unwrap();
-    app.run("app.language", json!({"lang":"ar"})).unwrap();
-    let doc = serde_json::to_value(&app.session.active().unwrap().doc).unwrap();
-    let mut ready = false;
-    let mut h = Harness::builder().with_size(vec2(800.0, 800.0)).wgpu().build_ui_state(
-        move |ui, app: &mut DesignApp| {
-            if !ready {
-                crate::theme::install_fonts(ui.ctx(), &app.ui.language);
-                crate::theme::apply(ui.ctx(), &crate::theme::Tokens::for_brightness(crate::theme::Brightness::Dark));
-                ready = true;
-                return;
-            }
-            crate::dock::show(app, ui);
-            egui::CentralPanel::default().show(ui, |ui| {
-                ui.label("Shaped legacy menu references:");
-                for label in ["Float Panel", "Layers"] {
-                    crate::rtl::label(ui, crate::i18n::tr("ar", label));
-                }
-            });
-        },
-        app,
-    );
-    h.input_mut().max_texture_side = Some(8192);
-    h.run_steps(5);
-    assert!(h.state().ui.docking.is_none(), "fixture must use the actual legacy menu before customization");
-    let at = h.get_by_label("Properties").rect().center();
-    h.input_mut().events.extend([
-        Event::PointerMoved(at),
-        Event::PointerButton { pos: at, button: PointerButton::Secondary, pressed: true, modifiers: Modifiers::NONE },
-    ]);
-    h.run_steps(1);
-    h.input_mut().events.push(Event::PointerButton { pos: at, button: PointerButton::Secondary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(2);
-    assert!(egui::Popup::is_any_open(&h.ctx));
-    assert_eq!(h.query_all_by_label(crate::i18n::tr("ar", "Float Panel")).count(), 2, "reference and actual logical action must be accessible");
-    h.render().unwrap().save(directory.join("designcraft-legacy-context-dark-ar.png")).unwrap();
-    let group = h.get_by_label_contains(crate::i18n::tr("ar", "Group with")).rect().center();
-    h.hover_at(group);
-    h.run_steps(4);
-    assert_eq!(h.query_all_by_label(crate::i18n::tr("ar", "Layers")).count(), 2, "reference and actual target must be accessible");
-    h.render().unwrap().save(directory.join("designcraft-legacy-targets-dark-ar.png")).unwrap();
-    assert!(h.state().ui.docking.is_none());
-    let (last, last_label, _) = crate::dock::ICON_PANELS.last().unwrap();
-    let logical = crate::i18n::tr("ar", last_label);
-    let scroll_at = h.query_all_by_label(crate::i18n::tr("ar", "Layers")).find(|node| node.rect().left() > 500.0).unwrap().rect().center();
-    let submenu_layer = h.ctx.layer_id_at(scroll_at).unwrap();
-    let submenu = h.ctx.memory(|m| m.area_rect(submenu_layer.id)).unwrap();
-    let before = h.query_all_by_label(logical).find(|node| submenu.x_range().contains(node.rect().center().x)).map(|node| node.rect());
-    assert!(before.is_none_or(|rect| !submenu.contains_rect(rect)), "actual submenu must require scrolling to reach its last target");
-    h.input_mut().events.extend([
-        Event::PointerMoved(scroll_at),
-        Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta: vec2(0.0, -1600.0), phase: egui::TouchPhase::Move, modifiers: Modifiers::NONE },
-    ]);
-    h.run_steps(12);
-    let target = h.query_all_by_label(logical).find(|node| submenu.x_range().contains(node.rect().center().x)).unwrap().rect();
-    assert!(submenu.contains_rect(target), "last target must be inside the actual submenu after scrolling");
-    assert!(h.ctx.content_rect().contains_rect(target), "last target must be physically visible after wheel scrolling");
-    h.render().unwrap().save(directory.join("designcraft-legacy-targets-scrolled-dark-ar.png")).unwrap();
-    h.query_all_by_label(logical).find(|node| submenu.contains_rect(node.rect())).unwrap().click();
-    h.run_steps(4);
-    let layout = h.state().ui.docking.as_ref().unwrap();
-    assert_eq!(layout.panels().iter().filter(|panel| panel.as_str() == "properties").count(), 1);
-    assert_eq!(layout.panels().iter().filter(|panel| panel.as_str() == *last).count(), 1);
-    let group = group_members_for_test(layout, last);
-    assert!(group.iter().any(|panel| panel == "properties"));
-    assert_eq!(group.last().map(String::as_str), Some("properties"), "clicked destination must receive the original panel after it");
-    assert_eq!(serde_json::to_value(&h.state().session.active().unwrap().doc).unwrap(), doc);
-    h.render().unwrap().save(directory.join("designcraft-legacy-last-target-selected-dark-ar.png")).unwrap();
-}
-
-#[test]
-fn legacy_dock_menu_button_opens_the_active_panel_menu() {
-    let mut app = app();
-    app.run("file.new", json!({})).unwrap();
-    app.ui.dock_tab = "pages".into();
-    let pages = app.session.active().unwrap().doc.page_count();
-    let mut h = harness(app, vec2(1280.0, 800.0));
-    assert!(h.state().ui.docking.is_none());
-    let tab = h.query_all_by_label("Pages").find(|node| node.rect().height() <= 45.0).unwrap().rect();
-    let dock = egui::containers::panel::PanelState::load(&h.ctx, egui::Id::new("dock")).unwrap().outer_rect;
-    let at = egui::pos2(dock.right() - 15.0, tab.center().y);
-    h.event(Event::PointerMoved(at));
-    h.run_steps(1);
-    for pressed in [true, false] {
-        h.event(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
-        h.run_steps(1);
-    }
-    h.run_steps(2);
-    assert!(egui::Popup::is_any_open(&h.ctx), "the three-line button must open a menu");
-    h.get_by_label("Duplicate Spread").click();
-    h.run_steps(3);
-    assert_eq!(h.state().session.active().unwrap().doc.page_count(), pages + 1);
-    assert!(!egui::Popup::is_any_open(&h.ctx));
-}
-
-/// InDesign's panel tab menu (Learn Skills Daily's InDesign course, 6:20): Close, Close Tab Group,
-/// Minimize and Collapse to Icons. Close Tab Group hides the panels tabbed together.
-#[test]
-fn close_tab_group_hides_the_panels_tabbed_together() {
-    let mut app = app();
-    // The default dock: Properties, Pages and Layers are one tab group.
-    let r = app.run("window.panel.closeGroup", json!({"panel":"pages"})).unwrap();
-    assert_eq!(r["closed"], json!(["properties", "pages", "layers"]));
-    let layout = app.ui.docking.clone().unwrap();
-    assert!(["properties", "pages", "layers"].iter().all(|p| !layout.contains(&p.to_string())));
-    // Window brings one back.
-    app.run("window.panel.activate", json!({"panel":"pages"})).unwrap();
-    assert!(app.ui.docking.as_ref().unwrap().contains(&"pages".to_string()));
-    // A floating group goes as a whole; the dock keeps its own.
-    app.run("window.panel.float", json!({"panel":"swatches","x":40,"y":60})).unwrap();
-    app.run("window.panel.activate", json!({"panel":"color"})).unwrap();
-    app.run("window.panel.move", json!({"panel":"color", "anchor":"swatches"})).unwrap();
-    app.run("window.panel.closeGroup", json!({"panel":"color"})).unwrap();
-    let layout = app.ui.docking.clone().unwrap();
-    assert!(!layout.contains(&"color".to_string()) && !layout.contains(&"swatches".to_string()));
-    assert!(layout.contains(&"pages".to_string()));
-    assert!(app.run("window.panel.closeGroup", json!({"panel":"nope"})).is_err());
-}
-
-#[test]
-fn collapse_to_icons_shrinks_the_dock_to_its_icons() {
-    let mut app = app();
-    assert!(app.ui.dock_expanded);
-    app.run("window.collapseToIcons", json!({})).unwrap();
-    assert!(!app.ui.dock_expanded);
-    // A panel chosen from Window opens the dock again.
-    app.run("window.panel", json!({"panel":"pages"})).unwrap();
-    assert!(app.ui.dock_expanded);
-}
-
-#[test]
-fn a_tabs_context_menu_lists_indesigns_tab_commands_and_close_works() {
-    let mut h = harness(app(), vec2(1280.0, 800.0));
-    let tab = h.query_all_by_label("Layers").find(|node| node.rect().height() <= 45.0).unwrap().rect().center();
-    h.event(Event::PointerMoved(tab));
-    h.run_steps(1);
-    h.event(Event::PointerButton { pos: tab, button: PointerButton::Secondary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    h.event(Event::PointerButton { pos: tab, button: PointerButton::Secondary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(2);
-    for item in ["Close", "Close Tab Group", "Minimize", "Collapse to Icons", "Float Panel"] {
-        assert!(h.query_by_label(item).is_some(), "{item}");
-    }
-    h.get_by_label("Close").click();
-    h.run_steps(2);
-    assert!(!h.state().ui.docking.as_ref().unwrap().contains(&"layers".to_string()));
-}
-
-/// Window › Styles › Paragraph Styles opens InDesign's floating Character Styles | Paragraph Styles
-/// group, which stays open while other panels open (Learn Skills Daily's InDesign course, 7:55).
-#[test]
-fn paragraph_styles_open_floating_with_character_styles() {
-    let mut app = app();
-    app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();
-    let layout = app.ui.docking.clone().unwrap();
-    let group = layout.floating.iter().find(|g| g.panels.iter().any(|p| p == "paragraphStyles")).expect("a floating group");
-    assert_eq!(group.panels, ["characterStyles", "paragraphStyles"]);
-    assert_eq!(group.panels[group.active], "paragraphStyles", "the one chosen is in front");
-    // The dock still shows Properties in front.
-    assert!(matches!(&layout.root, Some(craft_ui::docking::Node::Tabs { panels, active }) if panels[*active] == "properties"), "{:?}", layout.root);
-    // Other panels from Window leave it open.
-    app.run("window.panel", json!({"panel":"color"})).unwrap();
-    app.run("window.panel", json!({"panel":"links"})).unwrap();
-    let layout = app.ui.docking.clone().unwrap();
-    assert!(layout.floating.iter().any(|g| g.panels == ["characterStyles", "paragraphStyles"]));
-    // Once showing, Window › Character Styles brings that tab forward.
-    app.run("window.panel", json!({"panel":"characterStyles"})).unwrap();
-    let layout = app.ui.docking.clone().unwrap();
-    let group = layout.floating.iter().find(|g| g.panels.iter().any(|p| p == "characterStyles")).unwrap();
-    assert_eq!(group.panels[group.active], "characterStyles");
-    assert_eq!(layout.panels().iter().filter(|p| p.as_str() == "characterStyles").count(), 1);
-}
-
-/// Style panels the user docked and then closed come back in the dock, not floating.
-#[test]
-fn paragraph_styles_closed_from_the_dock_reopen_there() {
-    let mut app = app();
-    app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();
-    for panel in ["characterStyles", "paragraphStyles"] {
-        app.run("window.panel.move", json!({"panel": panel, "anchor": "properties"})).unwrap();
-    }
-    for panel in ["characterStyles", "paragraphStyles"] {
-        app.run("window.panel.close", json!({"panel": panel})).unwrap();
-    }
-    app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();
-    let layout = app.ui.docking.clone().unwrap();
-    assert!(layout.contains(&"paragraphStyles".to_string()));
-    assert!(layout.floating.iter().all(|g| !g.panels.iter().any(|p| p == "paragraphStyles")), "{:?}", layout.floating);
-}
-
-fn click(h: &mut Harness<'static, DesignApp>, at: Pos2, button: PointerButton) {
-    h.event(Event::PointerMoved(at));
-    h.run_steps(1);
-    for pressed in [true, false] {
-        h.event(Event::PointerButton { pos: at, button, pressed, modifiers: Modifiers::NONE });
-        h.run_steps(1);
-    }
-    h.run_steps(2);
-}
-
-/// Window › Paragraph Styles switches to the docking layout. After Window › Pages the Pages panel
-/// keeps its three-line panel menu, and its tab menu lists what the classic dock's does.
-#[test]
-fn pages_keeps_its_panel_menu_in_the_docking_layout() {
-    let mut app = app();
-    app.run("file.new", json!({})).unwrap();
-    app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();
-    app.run("window.panel", json!({"panel":"pages"})).unwrap();
-    assert!(app.ui.docking.is_some());
-    let mut h = harness(app, vec2(1280.0, 800.0));
-    let tab = h.query_all_by_label("Pages").find(|node| node.rect().height() <= 45.0).unwrap().rect();
-    let dock = egui::containers::panel::PanelState::load(&h.ctx, egui::Id::new("shared-panel-dock")).unwrap().outer_rect;
-    click(&mut h, egui::pos2(dock.right() - 12.0, tab.center().y), PointerButton::Primary);
-    assert!(egui::Popup::is_any_open(&h.ctx), "the three-line button must open a menu");
-    for item in ["Numbering & Section Options…", "Close Tab Group", "Float Panel"] {
-        assert!(h.query_by_label(item).is_some(), "{item}");
-    }
-    h.get_by_label("Panel Options…").click();
-    h.run_steps(3);
-    assert!(h.state().ui.dialog.as_ref().is_some_and(|d| d.id == "pagesPanelOptions"));
-    h.state_mut().ui.dialog = None;
-    h.run_steps(2);
-
-    click(&mut h, tab.center(), PointerButton::Secondary);
-    for item in ["Close", "Close Tab Group", "Minimize", "Collapse to Icons", "Float Panel", "Group with"] {
-        assert!(h.query_all_by_label(item).next().is_some(), "{item}");
-    }
-    assert!(h.query_by_label("Close Panel").is_none());
-    assert!(h.query_by_label("Panel Options…").is_none(), "the panel's own commands stay in its panel menu");
-}
diff --git a/crates/ui-egui/src/panels/mod.rs b/crates/ui-egui/src/panels.rs
similarity index 60%
rename from crates/ui-egui/src/panels/mod.rs
rename to crates/ui-egui/src/panels.rs
index 85058d7a8..5f1b8829c 100644
--- a/crates/ui-egui/src/panels/mod.rs
+++ b/crates/ui-egui/src/panels.rs
@@ -3,7 +3,7 @@
 pub mod cell_stroke;
 pub mod conditions;
 mod font_menu;
-pub use font_menu::{FontPick, SAMPLES as FONT_SAMPLES, font_menu_body};
+pub use font_menu::{FONT_MENU_HEIGHT, FontMenu, FontPick, SAMPLES as FONT_SAMPLES, font_menu_header, font_menu_list};
 pub mod datamerge;
 pub mod glyphs;
 pub mod interactive;
@@ -12,6 +12,8 @@ pub mod library;
 pub mod notes;
 pub mod pages;
 pub mod properties;
+pub mod separations;
+pub mod story;
 pub mod styles;
 pub mod swatches;
 pub mod table;
@@ -292,7 +294,7 @@ fn swatch_menu_font() -> egui::FontId {
 pub fn swatch_menu_row(ui: &mut egui::Ui, doc: &designcraft_doc::Document, name: &str, current: &str, width: f32) -> bool {
     let t = Tokens::get(ui.ctx());
     let (row, resp) = ui.allocate_exact_size(vec2(width, SWATCH_MENU_ROW_H), egui::Sense::click());
-    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, name == current, name));
+    resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, name == current, name));
     let hovered = resp.hovered();
     if hovered {
         ui.painter().rect_filled(row, 2.0, t.accent_strong);
@@ -381,7 +383,8 @@ pub fn swatch_picker(
     Some(resp)
 }
 
-/// A font family combo box showing `current` by its menu name, with [`font_menu_body`] as its menu.
+/// A font family combo box showing `current` by its menu name, with the Font menu
+/// ([`font_menu_header`]) as its menu.
 /// Returns the font picked.
 pub fn font_combo(
     app: &mut DesignApp,
@@ -392,26 +395,34 @@ pub fn font_combo(
 ) -> Option<FontPick> {
     let menu = font_menu(app);
     let shown = if current.is_empty() { "—".to_string() } else { font_label(app, &menu, current) };
-    // A field and a plain popup rather than egui's combo box: its own scroll area would keep the
-    // menu at the size it last had (a family opening, a filter clearing, wouldn't show).
     let field = ui.push_id(id_salt, |ui| crate::widgets::dropdown(ui, &shown, width)).inner;
-    font_popup(app, &field, &menu, current)
+    font_popup(app, ui, &field, &menu, current)
 }
 
-/// [`font_menu_body`] in a popup under `field` (a font field the caller draws), which screen
-/// readers hear as a combo box with the current family as its value. Returns the font picked.
-pub fn font_popup(app: &mut DesignApp, field: &egui::Response, menu: &[designcraft_fonts::FamilyInfo], current: &str) -> Option<FontPick> {
+/// The Font menu ([`font_menu_header`]) in a menu under `field` (a font field the caller draws in
+/// `ui`), which screen readers hear as a combo box with the current family as its value. Returns
+/// the font picked.
+pub fn font_popup(
+    app: &mut DesignApp,
+    ui: &egui::Ui,
+    field: &egui::Response,
+    menu: &[designcraft_fonts::FamilyInfo],
+    current: &str,
+) -> Option<FontPick> {
     let shown = if current.is_empty() { "—".to_string() } else { font_label(app, menu, current) };
     field.widget_info(|| {
-        let mut info = egui::WidgetInfo::new(egui::WidgetType::ComboBox);
+        let mut info = egui::WidgetInfo::new(egui::Role::ComboBox);
         info.enabled = true;
         info.current_text_value = Some(shown.clone());
+        info.label = Some(crate::i18n::tr(&app.ui.language, "Font Family").to_owned());
         info
     });
-    egui::Popup::menu(field)
+    let width = field.rect.width();
+    craft_ui::combo::Menu::new(ui, field)
+        .height(FONT_MENU_HEIGHT)
         .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
-        .show(|ui| font_menu_body(app, ui, menu, current, field.rect.width()))
-        .and_then(|r| r.inner)
+        .show_ui_with_header(|ui| font_menu_header(app, ui, menu, current, width), font_menu_list)
+        .flatten()
 }
 
 /// The style a pick sets: the one picked, else the family's Regular (else its first).
@@ -451,13 +462,14 @@ pub fn style_shown(current: &str) -> String {
 pub fn font_style_picker(app: &mut DesignApp, ui: &mut egui::Ui, family: &str, current: &str, width: f32) {
     let styles = fonts(app).styles(family);
     let mut pick = None;
-    egui::ComboBox::from_id_salt("font_style").selected_text(style_shown(current)).width(width).show_ui(ui, |ui| {
+    let combo = craft_ui::ComboBox::from_id_salt("font_style").selected_text(style_shown(current)).width(width).show_ui(ui, |ui| {
         for s in &styles {
             if ui.selectable_label(s == current, s).clicked() {
                 pick = Some(s.clone());
             }
         }
     });
+    let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Font Style"));
     if let Some(s) = pick {
         let _ = app.run("type.char", json!({"attrs": {"fontStyle": s}}));
     }
@@ -468,13 +480,14 @@ pub fn para_style_picker(app: &mut DesignApp, ui: &mut egui::Ui, current: &str,
     let mut pick = None;
     let shown = crate::i18n::style_name(&app.ui.language, current);
     let label = if overridden { format!("{shown}+") } else { shown.to_string() };
-    egui::ComboBox::from_id_salt("para_style").selected_text(crate::rtl::widget(ui, label)).width(width).show_ui(ui, |ui| {
+    let combo = craft_ui::ComboBox::from_id_salt("para_style").selected_text(crate::rtl::widget(ui, label)).width(width).show_ui(ui, |ui| {
         for n in names.iter().filter(|n| *n != designcraft_doc::NO_PARA_STYLE) {
             if ui.selectable_label(n == current, crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, n))).clicked() {
                 pick = Some(n.clone());
             }
         }
     });
+    let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Paragraph Style"));
     if let Some(n) = pick {
         let _ = app.run("style.paragraph.apply", json!({"name": n, "clearOverrides": false}));
     }
@@ -499,17 +512,26 @@ mod font_menu_tests {
         const FAMILY: &str = "DC UI Test Mincho";
         let font = font_with(FAMILY, &['a']).unwrap();
         let font = with_names(&font, &[(3, 1, 0x409, 1, FAMILY), (3, 1, 0x409, 2, "Regular"), (3, 1, 0x0411, 1, "UIテスト明朝")]).unwrap();
-        designcraft_fonts::FontDb::global().add_font(font);
+        // A database of this test's own: a font added to the process-wide one stays there, and its
+        // Japanese native name would then need CJK glyphs in every later test that draws the menu.
+        let db = designcraft_fonts::FontDb::with_font_dirs(Vec::new());
+        db.add_font(font);
+        let menu = |app: &DesignApp| {
+            let mut v: Vec<designcraft_fonts::FamilyInfo> = db.scoped(0).family_infos();
+            v.retain(|f| !f.family.starts_with('.'));
+            designcraft_fonts::sort_for_menu(&mut v, app.session.prefs.show_font_names_in_english);
+            v
+        };
         let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let menu = font_menu(&app);
-        let at = menu.iter().position(|f| f.family == FAMILY).unwrap();
-        assert_eq!(menu[at].group, FontGroup::Japanese);
-        assert!(menu[..at].iter().any(|f| f.family == designcraft_fonts::DEFAULT_FAMILY), "Western fonts first");
-        assert!(menu.windows(2).all(|w| w[0].group <= w[1].group), "grouped");
-        assert_eq!(font_label(&app, &menu, FAMILY), "UIテスト明朝");
-        assert_eq!(font_label(&app, &menu, designcraft_fonts::DEFAULT_FAMILY), designcraft_fonts::DEFAULT_FAMILY);
+        let entries = menu(&app);
+        let at = entries.iter().position(|f| f.family == FAMILY).unwrap();
+        assert_eq!(entries[at].group, FontGroup::Japanese);
+        assert!(entries[..at].iter().any(|f| f.family == designcraft_fonts::DEFAULT_FAMILY), "Western fonts first");
+        assert!(entries.windows(2).all(|w| w[0].group <= w[1].group), "grouped");
+        assert_eq!(font_label(&app, &entries, FAMILY), "UIテスト明朝");
+        assert_eq!(font_label(&app, &entries, designcraft_fonts::DEFAULT_FAMILY), designcraft_fonts::DEFAULT_FAMILY);
         app.run("prefs.set", json!({"showFontNamesInEnglish": true})).unwrap();
-        assert_eq!(font_label(&app, &font_menu(&app), FAMILY), FAMILY);
+        assert_eq!(font_label(&app, &menu(&app), FAMILY), FAMILY);
     }
 
     #[test]
@@ -526,308 +548,7 @@ mod font_menu_tests {
 }
 
 #[cfg(test)]
-mod font_menu_ui_tests {
-    use egui::vec2;
-    use egui_kittest::Harness;
-    use egui_kittest::kittest::Queryable;
-    use serde_json::json;
-
-    use crate::test_window::{self, Window, click_at};
-
-    /// The Type tool's selection over a new text frame's text, with the Control bar on. Returns the
-    /// story.
-    fn typing() -> (Harness<'static, Window>, u64) {
-        typing_in("Advanced")
-    }
-
-    /// [`typing`] in the workspace `name`.
-    fn typing_in(name: &str) -> (Harness<'static, Window>, u64) {
-        typing_on(name, vec2(1440.0, 900.0), false)
-    }
-
-    /// [`typing_in`] a window of `size`, with the macOS window chrome (the native menu bar and the
-    /// title bar inside the window) when `mac`.
-    fn typing_on(name: &str, size: egui::Vec2, mac: bool) -> (Harness<'static, Window>, u64) {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("window.workspace", json!({ "name": name })).unwrap();
-        app.native_menu = mac;
-        app.integrated_titlebar = mac;
-        let mut h = test_window::open(app, size);
-        let app = &mut h.state_mut().app;
-        let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hello", "caret": true})).unwrap();
-        app.run("tool.select", json!({"tool": "type"})).unwrap();
-        app.run("text.select", json!({"story": r["story"], "anchor": 0, "focus": 5})).unwrap();
-        h.run_steps(4);
-        (h, r["story"].as_u64().unwrap())
-    }
-
-    fn story_text(h: &mut Harness<'static, Window>, story: u64) -> String {
-        h.state_mut().app.run("story.get", json!({"story": story})).unwrap()["text"].as_str().unwrap().to_string()
-    }
-
-    /// The font fields showing `family`, top to bottom.
-    fn fields(h: &Harness<'static, Window>, family: &str) -> Vec<egui::Rect> {
-        let mut r: Vec<egui::Rect> =
-            h.query_all_by(|n| n.role() == egui::accesskit::Role::ComboBox && n.value().as_deref() == Some(family)).map(|n| n.rect()).collect();
-        r.sort_by(|a, b| a.min.y.total_cmp(&b.min.y).then(a.min.x.total_cmp(&b.min.x)));
-        r
-    }
-
-    /// The Control bar's font field (the topmost), showing `family`.
-    fn field(h: &Harness<'static, Window>, family: &str) -> egui::Rect {
-        *fields(h, family).first().unwrap_or_else(|| panic!("a font field shows {family}"))
-    }
-
-    /// The text in the focused search field.
-    fn search(h: &Harness<'static, Window>) -> String {
-        h.get_by(|n| n.role() == egui::accesskit::Role::TextInput && n.is_focused()).value().unwrap_or_default()
-    }
-
-    fn family(h: &mut Harness<'static, Window>) -> String {
-        h.state_mut().app.run("type.selectionAttrs", json!({})).unwrap()["chars"]["fontFamily"].as_str().unwrap().to_string()
-    }
-
-    /// Run the menu until the filters' font kinds are read (it says Loading fonts… meanwhile).
-    fn settle(h: &mut Harness<'static, Window>) {
-        for _ in 0..3000 {
-            if h.query_by_label("Loading fonts…").is_none() {
-                return;
-            }
-            std::thread::sleep(std::time::Duration::from_millis(10));
-            h.run_steps(1);
-        }
-        panic!("the font kinds were never read");
-    }
-
-    /// Open the Control bar's font menu (showing `family`) and search for `query`.
-    fn open_menu(h: &mut Harness<'static, Window>, family: &str, query: &str) {
-        let at = field(h, family);
-        click_at(h, at.center());
-        if !query.is_empty() {
-            h.event(egui::Event::Text(query.into()));
-        }
-        h.run_steps(4);
-    }
-
-    #[test]
-    fn a_family_opens_to_its_styles_and_a_style_is_picked() {
-        let (mut h, _) = typing();
-        let serif = designcraft_fonts::DEFAULT_FAMILY;
-        open_menu(&mut h, serif, "serif 4");
-        // The arrow before the name opens the family; the menu stays open.
-        {
-            let at = h.get_by_label("Show Styles").rect().center();
-            click_at(&mut h, at);
-        }
-        assert!(h.query_by_label("Bold Italic").is_some(), "its styles are listed");
-        {
-            let at = h.get_by_label("Bold Italic").rect().center();
-            click_at(&mut h, at);
-        }
-        let attrs = h.state_mut().app.run("type.selectionAttrs", json!({})).unwrap();
-        assert_eq!((attrs["chars"]["fontFamily"].as_str(), attrs["chars"]["fontStyle"].as_str()), (Some(serif), Some("Bold Italic")));
-        assert!(!h.ctx.text_edit_focused(), "picking closes the menu");
-    }
-
-    #[test]
-    fn picked_fonts_come_first_as_recently_used() {
-        let (mut h, _) = typing();
-        open_menu(&mut h, designcraft_fonts::DEFAULT_FAMILY, "source sans");
-        {
-            let at = h.get_by_label("Source Sans 3").rect().center();
-            click_at(&mut h, at);
-        }
-        assert_eq!(h.state().app.session.prefs.recent_fonts, ["Source Sans 3"]);
-        // Reopened without a search: Source Sans 3 is listed at the top, and again in its place (on
-        // screen too when few fonts are installed).
-        open_menu(&mut h, "Source Sans 3", "");
-        let recent =
-            h.query_all_by_label("Source Sans 3").map(|n| n.rect()).min_by(|a, b| a.min.y.total_cmp(&b.min.y)).expect("Source Sans 3 is listed");
-        let search = h.get_by(|n| n.role() == egui::accesskit::Role::TextInput && n.is_focused()).rect();
-        assert!(recent.min.y > search.max.y && recent.min.y - search.max.y < 80.0, "the first row, under the filters: {recent:?} vs {search:?}");
-    }
-
-    #[test]
-    fn the_class_filter_and_similar_fonts_narrow_the_list() {
-        let (mut h, _) = typing();
-        open_menu(&mut h, designcraft_fonts::DEFAULT_FAMILY, "");
-        {
-            let at = h.get_by(|n| n.label().is_some_and(|l| l.starts_with("All Classes"))).rect().center();
-            click_at(&mut h, at);
-        }
-        {
-            let at = h.get_by_label("Monospaced").rect().center();
-            click_at(&mut h, at);
-        }
-        settle(&mut h);
-        assert!(h.query_by_label("JetBrains Mono").is_some(), "a monospaced family is listed");
-        assert!(h.query_by_label(designcraft_fonts::DEFAULT_FAMILY).is_none(), "a serif isn't");
-        // Back to all classes, then fonts like the serif: it leads, other serifs follow, no sans.
-        {
-            let at = h.get_by(|n| n.label().is_some_and(|l| l.starts_with("Monospaced ▾"))).rect().center();
-            click_at(&mut h, at);
-        }
-        {
-            let at = h.get_by_label("All Classes").rect().center();
-            click_at(&mut h, at);
-        }
-        h.event(egui::Event::Text("serif 4".into()));
-        h.run_steps(4);
-        let row = h.get_by_label(designcraft_fonts::DEFAULT_FAMILY).rect();
-        h.hover_at(row.center());
-        h.run_steps(2);
-        {
-            let at = h.get_by_label("Show Similar Fonts").rect().center();
-            click_at(&mut h, at);
-        }
-        assert!(h.query_by_label(&format!("Similar to {}", designcraft_fonts::DEFAULT_FAMILY)).is_some());
-        assert!(h.query_by_label("Source Sans 3").is_none() && h.query_by_label("JetBrains Mono").is_none(), "other classes aren't similar");
-        assert!(h.query_by_label(designcraft_fonts::DEFAULT_FAMILY).is_some());
-    }
-
-    #[test]
-    fn every_font_field_reports_as_a_combo_box_showing_the_family() {
-        let (h, _) = typing();
-        let shown = fields(&h, designcraft_fonts::DEFAULT_FAMILY);
-        // The Control bar's, and the hand-drawn ones (Properties, the Contextual Task Bar).
-        assert!(shown.len() >= 2, "{shown:?}");
-    }
-
-    #[test]
-    fn typing_in_the_font_menu_searches_and_never_reaches_the_story() {
-        let (mut h, story) = typing();
-        let before = story_text(&mut h, story);
-        let at = field(&h, designcraft_fonts::DEFAULT_FAMILY);
-        click_at(&mut h, at.center());
-        assert!(h.ctx.text_edit_focused(), "the search field takes the keyboard when the menu opens");
-        h.event(egui::Event::Text("source sans".into()));
-        h.run_steps(4);
-        assert_eq!(search(&h), "source sans");
-        assert_eq!(story_text(&mut h, story), before, "the typing went to the search, not the story");
-        assert!(h.query_by_label("Source Sans 3").is_some(), "a match is listed");
-        assert!(h.query_by_label(designcraft_fonts::DEFAULT_FAMILY).is_none(), "families that don't match aren't");
-        // ↓ and Return pick the first match and close the menu.
-        h.key_press(egui::Key::ArrowDown);
-        h.run_steps(2);
-        h.key_press(egui::Key::Enter);
-        h.run_steps(4);
-        assert_eq!(family(&mut h), "Source Sans 3");
-        assert_eq!(story_text(&mut h, story), before);
-        assert!(!h.ctx.text_edit_focused(), "the menu closed");
-        // Reopened, the search starts empty.
-        let at = field(&h, "Source Sans 3");
-        click_at(&mut h, at.center());
-        assert_eq!(search(&h), "", "the search starts empty");
-        // A click on a family picks it.
-        h.event(egui::Event::Text("serif 4".into()));
-        h.run_steps(4);
-        let row = h.get_by_label(designcraft_fonts::DEFAULT_FAMILY).rect();
-        click_at(&mut h, row.center());
-        assert_eq!(family(&mut h), designcraft_fonts::DEFAULT_FAMILY);
-        // Escape closes the menu and leaves the text as it was.
-        let at = field(&h, designcraft_fonts::DEFAULT_FAMILY);
-        click_at(&mut h, at.center());
-        // A star marks a favourite and keeps the menu open.
-        h.event(egui::Event::Text("serif 4".into()));
-        h.run_steps(4);
-        let row = h.get_by_label(designcraft_fonts::DEFAULT_FAMILY).rect();
-        click_at(&mut h, row.min + vec2(10.0, 12.0));
-        assert!(h.state().app.session.prefs.favorite_fonts.iter().any(|f| f == designcraft_fonts::DEFAULT_FAMILY));
-        assert_eq!(search(&h), "serif 4", "the menu stays open");
-        h.key_press(egui::Key::Escape);
-        h.run_steps(4);
-        assert!(!h.ctx.text_edit_focused(), "the menu closed");
-        assert_eq!(story_text(&mut h, story), before);
-        assert!(h.state().app.session.active().unwrap().selection.text.is_some(), "the text is still selected");
-    }
-
-    /// Opens the font menu of the field at `at`, clicks its search field, types, checks the menu
-    /// stays open and lists only the matches, then picks the first with ↓ and Return.
-    fn search_in_menu(h: &mut Harness<'static, Window>, at: egui::Rect, what: &str) {
-        click_at(h, at.center());
-        let field = h.query_by(|n| n.role() == egui::accesskit::Role::TextInput && n.is_focused()).map(|n| n.rect());
-        let field = field.unwrap_or_else(|| panic!("{what}: the menu opens with the search field focused"));
-        click_at(h, field.center());
-        assert!(h.ctx.text_edit_focused(), "{what}: a click on the search field keeps the menu open");
-        h.event(egui::Event::Text("SOURCE SA".into()));
-        h.run_steps(4);
-        assert_eq!(search(h), "SOURCE SA", "{what}: the typing went to the search");
-        assert!(h.query_by_label("Source Sans 3").is_some(), "{what}: a match is listed");
-        assert!(h.query_by_label(designcraft_fonts::DEFAULT_FAMILY).is_none(), "{what}: families that don't match aren't");
-        h.key_press(egui::Key::ArrowDown);
-        h.run_steps(2);
-        h.key_press(egui::Key::Enter);
-        h.run_steps(4);
-        assert!(!h.ctx.text_edit_focused(), "{what}: the menu closed");
-    }
-
-    /// Every font field over selected text (Control bar, Contextual Task Bar, Properties ›
-    /// Character, Character panel) searches, in the workspaces that show them and in a small
-    /// window with the macOS window chrome.
-    #[test]
-    fn every_font_field_searches_in_every_workspace() {
-        for (name, size, mac, panel) in [
-            ("Advanced", vec2(1440.0, 900.0), false, None),
-            ("Printing and Proofing", vec2(1440.0, 900.0), false, None),
-            ("Essentials", vec2(1440.0, 900.0), false, Some("character")),
-            ("Printing and Proofing", vec2(900.0, 560.0), true, None),
-        ] {
-            let (mut h, story) = typing_on(name, size, mac);
-            if panel.is_some() {
-                h.state_mut().app.ui.open_panel = panel.map(str::to_string);
-                h.run_steps(4);
-            }
-            let name = &format!("{name} {size:?} {panel:?}");
-            let before = story_text(&mut h, story);
-            let count = fields(&h, designcraft_fonts::DEFAULT_FAMILY).len();
-            assert_eq!(count, 3, "{name}: the font fields are shown");
-            for k in 0..count {
-                h.state_mut().app.run("type.char", json!({"attrs": {"fontFamily": designcraft_fonts::DEFAULT_FAMILY}})).unwrap();
-                h.run_steps(4);
-                let at = fields(&h, designcraft_fonts::DEFAULT_FAMILY)[k];
-                search_in_menu(&mut h, at, &format!("{name}, field {k}"));
-                assert_eq!(family(&mut h), "Source Sans 3", "{name}, field {k}");
-                assert_eq!(story_text(&mut h, story), before, "{name}, field {k}");
-            }
-        }
-    }
-
-    /// The font fields away from the text: the Glyphs panel, Paragraph Style Options › Basic
-    /// Character Formats and Find/Replace Font's Replace With.
-    #[test]
-    fn font_fields_in_panels_and_dialogs_search() {
-        let paragraph = json!({"name": designcraft_doc::BASIC_PARAGRAPH, "section": "chars"});
-        for (what, panel, dialog, shown) in [
-            ("Glyphs", Some("glyphs"), None, designcraft_fonts::DEFAULT_FAMILY),
-            ("Paragraph Style Options", None, Some(("paragraphStyleOptions", paragraph)), designcraft_fonts::DEFAULT_FAMILY),
-            (
-                "Find/Replace Font",
-                None,
-                Some(("findFont", json!({"toFamily": designcraft_fonts::DEFAULT_FAMILY}))),
-                designcraft_fonts::DEFAULT_FAMILY,
-            ),
-        ] {
-            let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            let mut h = test_window::open(app, vec2(1440.0, 900.0));
-            let dialog_id = dialog.as_ref().map(|(id, _)| id.to_string());
-            h.state_mut().app.ui.open_panel = panel.map(str::to_string);
-            h.state_mut().app.ui.dialog = dialog.map(|(id, fields)| crate::dialogs::Dialog::new(id, fields));
-            h.run_steps(4);
-            let at = *fields(&h, shown).first().unwrap_or_else(|| panic!("{what}: the font field is shown"));
-            search_in_menu(&mut h, at, what);
-            assert_eq!(h.state().app.ui.dialog.as_ref().map(|d| d.id.clone()), dialog_id, "{what}: Return in the menu leaves the dialog open");
-            assert!(!fields(&h, "Source Sans 3").is_empty(), "{what}: the field shows the family picked");
-            // Escape closes the menu only.
-            let at = fields(&h, "Source Sans 3")[0];
-            click_at(&mut h, at.center());
-            assert!(h.ctx.text_edit_focused(), "{what}: the menu opened");
-            h.key_press(egui::Key::Escape);
-            h.run_steps(4);
-            assert!(!h.ctx.text_edit_focused(), "{what}: Escape closed the menu");
-            assert_eq!(h.state().app.ui.dialog.as_ref().map(|d| d.id.clone()), dialog_id, "{what}: Escape in the menu leaves the dialog open");
-        }
-    }
-}
+mod font_menu_ui_tests;
 
 #[cfg(test)]
 mod swatch_list_tests {
diff --git a/crates/ui-egui/src/panels/cell_stroke.rs b/crates/ui-egui/src/panels/cell_stroke.rs
index 750e180a8..2c99edc34 100644
--- a/crates/ui-egui/src/panels/cell_stroke.rs
+++ b/crates/ui-egui/src/panels/cell_stroke.rs
@@ -111,7 +111,7 @@ pub fn edge_proxy(ui: &mut Ui, id: &str, edges: &mut Edges, lang: &str) -> bool
     let t = Tokens::get(ui.ctx());
     let (r, resp) = ui.allocate_exact_size(vec2(PROXY_SIZE, PROXY_SIZE), Sense::click());
     let label = tr(lang, "Cell edges").to_string();
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Other, true, &label));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Unknown, true, &label));
     let resp = resp.on_hover_text(tr(
         lang,
         "Click a line to include or exclude it. Double-click selects all outer or all inner lines; triple-click selects or clears all.",
@@ -122,8 +122,8 @@ pub fn edge_proxy(ui: &mut Ui, id: &str, edges: &mut Edges, lang: &str) -> bool
         let (double, triple) = (resp.double_clicked(), resp.triple_clicked());
         // A double-click counts only on the line of the click before it; a triple-click
         // decides from the choice before the sequence's first click.
-        let last_key = ui.id().with((id, "proxy_last"));
-        let start_key = ui.id().with((id, "proxy_start"));
+        let last_key = ui.scope_id().with((id, "proxy_last"));
+        let start_key = ui.scope_id().with((id, "proxy_start"));
         let last: Option<usize> = ui.data(|d| d.get_temp(last_key)).flatten();
         if !double && !triple {
             ui.data_mut(|d| d.insert_temp(start_key, *edges));
@@ -192,7 +192,7 @@ pub fn stroke_fields(app: &mut DesignApp, ui: &mut Ui, id: &str, v: &Value) -> O
         ui.end_row();
         caption(ui, tr(&lang, "Type:"));
         let shown = type_label(&lang, &v["type"]);
-        egui::ComboBox::from_id_salt((id, "type")).selected_text(crate::rtl::widget(ui, &shown)).width(140.0).show_ui(ui, |ui| {
+        let combo = craft_ui::ComboBox::from_id_salt((id, "type")).selected_text(crate::rtl::widget(ui, &shown)).width(140.0).show_ui(ui, |ui| {
             for kind in TYPES {
                 let text = tr(&lang, builtin(kind).label());
                 if ui.selectable_label(shown == text, crate::rtl::widget(ui, text)).clicked() {
@@ -208,6 +208,7 @@ pub fn stroke_fields(app: &mut DesignApp, ui: &mut Ui, id: &str, v: &Value) -> O
                 }
             }
         });
+        let _ = crate::widgets::name_combo(combo, tr(&lang, "Type"));
         ui.end_row();
         for (label, key, tint_label, tint_key) in [("Color:", "color", "Tint:", "tint"), ("Gap Color:", "gapColor", "Gap Tint:", "gapTint")] {
             caption(ui, tr(&lang, label));
@@ -238,7 +239,7 @@ pub fn current(app: &mut DesignApp, edges: &Edges) -> Value {
 
 /// The Stroke panel for table cells: the proxy and the stroke fields, applied at once.
 pub fn panel(app: &mut DesignApp, ui: &mut Ui) {
-    let key = egui::Id::new("cell_stroke_edges");
+    let key = egui::Id::unique("cell_stroke_edges");
     let mut edges: Edges = ui.data(|d| d.get_temp(key)).unwrap_or([true; 6]);
     let lang = app.ui.language.clone();
     if edge_proxy(ui, "stroke_panel", &mut edges, &lang) {
@@ -282,7 +283,7 @@ mod tests {
         app.run("table.select", json!({"what": "table"})).unwrap();
         let mut h = Harness::builder().with_size(vec2(320.0, 600.0)).build_ui_state(
             |ui, app: &mut DesignApp| {
-                let id = egui::Id::new("test_fonts");
+                let id = egui::Id::unique("test_fonts");
                 if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
                     crate::theme::install_fonts(ui.ctx(), "");
                     ui.data_mut(|d| d.insert_temp(id, true));
diff --git a/crates/ui-egui/src/panels/conditions.rs b/crates/ui-egui/src/panels/conditions.rs
index a855b4820..f5f2c81c5 100644
--- a/crates/ui-egui/src/panels/conditions.rs
+++ b/crates/ui-egui/src/panels/conditions.rs
@@ -40,7 +40,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         let (row, _) = ui.allocate_exact_size(vec2(ui.available_width(), 22.0), Sense::hover());
         // Visibility (eye).
         let eye = egui::Rect::from_min_size(row.min + vec2(2.0, 3.0), vec2(16.0, 16.0));
-        let er = ui.interact(eye, ui.id().with(("cond_eye", &c.name)), Sense::click()).on_hover_ui(|ui| {
+        let er = ui.interact(eye, ui.scope_id().with(("cond_eye", &c.name)), Sense::click()).on_hover_ui(|ui| {
             crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Show / hide text with this condition"));
         });
         if c.visible {
@@ -59,7 +59,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         }
         // Name (click: toggle on the selected text) and indicator colour.
         let name_r = egui::Rect::from_min_max(row.min + vec2(42.0, 0.0), row.max - vec2(24.0, 0.0));
-        let nr = ui.interact(name_r, ui.id().with(("cond_name", &c.name)), Sense::click());
+        let nr = ui.interact(name_r, ui.scope_id().with(("cond_name", &c.name)), Sense::click());
         if nr.hovered() {
             ui.painter().rect_filled(name_r, 0.0, t.hover);
         }
@@ -77,7 +77,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         });
     }
     ui.add_space(6.0);
-    let id = egui::Id::new("new_condition_name");
+    let id = egui::Id::unique("new_condition_name");
     let mut name: String = ui.data(|d| d.get_temp(id)).unwrap_or_default();
     ui.horizontal(|ui| {
         ui.add(
diff --git a/crates/ui-egui/src/panels/datamerge.rs b/crates/ui-egui/src/panels/datamerge.rs
index f0ae77279..8920698c4 100644
--- a/crates/ui-egui/src/panels/datamerge.rs
+++ b/crates/ui-egui/src/panels/datamerge.rs
@@ -4,6 +4,7 @@ use egui::{Color32, Sense, Stroke, vec2};
 use serde_json::{Value, json};
 
 use crate::DesignApp;
+use crate::app::file_dialogs::Bound;
 use crate::theme::{Tokens, semibold};
 
 pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
@@ -79,10 +80,12 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                 jump = Some(shown.saturating_sub(1).max(1));
             }
             let mut rec = shown;
-            if ui.add(egui::DragValue::new(&mut rec).range(1..=max_record)).changed() {
+            let record = ui.add(egui::DragValue::new(&mut rec).range(1..=max_record));
+            if record.changed() {
                 jump = Some(rec);
             }
-            crate::rtl::label(ui, egui::RichText::new(tr(&lang, "Record")).color(t.text));
+            let label = crate::rtl::label(ui, egui::RichText::new(tr(&lang, "Record")).color(t.text));
+            record.labelled_by(label.id);
             if ui.small_button(w(ui, &lang, "Next")).clicked() {
                 jump = Some(shown.saturating_add(1).min(max_record));
             }
@@ -97,7 +100,9 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     ui.separator();
 
     crate::rtl::label(ui, egui::RichText::new(tr(&lang, "Merge options")).strong().color(t.text_strong));
-    if let Some(records) = choice(ui, "dm_records", &options.records, &[("all", "All records"), ("one", "One record"), ("range", "Range")], &lang) {
+    let records_name = tr(&lang, "Merge options");
+    let record_options = [("all", "All records"), ("one", "One record"), ("range", "Range")];
+    if let Some(records) = choice(ui, "dm_records", &options.records, &record_options, &lang, records_name) {
         let _ = app.run("data.options", json!({"records": records}));
     }
     if options.records == "one" {
@@ -113,11 +118,15 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         }
     }
     crate::rtl::label(ui, egui::RichText::new(tr(&lang, "Records per page")).color(t.text));
-    if let Some(per_page) = choice(ui, "dm_per_page", &options.per_page, &[("single", "Single record"), ("multiple", "Multiple records")], &lang) {
+    let per_page_name = tr(&lang, "Records per page");
+    let per_page_options = [("single", "Single record"), ("multiple", "Multiple records")];
+    if let Some(per_page) = choice(ui, "dm_per_page", &options.per_page, &per_page_options, &lang, per_page_name) {
         let _ = app.run("data.options", json!({"perPage": per_page}));
     }
     if options.per_page == "multiple" {
-        if let Some(arrange) = choice(ui, "dm_arrange", &options.arrange, &[("rows", "Rows first"), ("columns", "Columns first")], &lang) {
+        let arrange_options = [("rows", "Rows first"), ("columns", "Columns first")];
+        let arrange_name = tr(&lang, "Arrangement");
+        if let Some(arrange) = choice(ui, "dm_arrange", &options.arrange, &arrange_options, &lang, arrange_name) {
             let _ = app.run("data.options", json!({"arrange": arrange}));
         }
         let labels = ["Top", "Right", "Bottom", "Left"];
@@ -125,8 +134,8 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         let mut insets_changed = false;
         for (i, label) in labels.iter().enumerate() {
             ui.horizontal(|ui| {
-                crate::rtl::label(ui, egui::RichText::new(tr(&lang, label)).color(t.text));
-                if ui.add(egui::DragValue::new(&mut insets[i]).speed(1.0)).changed() {
+                let label = crate::rtl::label(ui, egui::RichText::new(tr(&lang, label)).color(t.text));
+                if ui.add(egui::DragValue::new(&mut insets[i]).speed(1.0)).labelled_by(label.id).changed() {
                     insets_changed = true;
                 }
             });
@@ -154,6 +163,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
             ("none", "None"),
         ],
         &lang,
+        "Image Fitting",
     ) {
         let _ = app.run("data.options", json!({"fitting": fitting}));
     }
@@ -177,23 +187,27 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
 }
 
 fn select_source(app: &mut DesignApp) {
-    let Some(path) = app.services.pick_open.as_mut().and_then(|f| f("dataMerge")) else {
+    let asked = app.ask_open("dataMerge", Bound::Document, |app, path| {
+        let _ = app.run("data.source.select", json!({"path": path}));
+        Ok(Value::Null)
+    });
+    if asked.is_err() {
         app.status(tr(&app.ui.language, "Pass csv, rows, or bytes from the control channel."));
-        return;
-    };
-    let _ = app.run("data.source.select", json!({"path": path}));
+    }
 }
 
-fn choice(ui: &mut egui::Ui, id: &str, current: &str, options: &[(&str, &str)], lang: &str) -> Option<String> {
+/// Render a localized, named combo and return only a changed selection.
+fn choice(ui: &mut egui::Ui, id: &str, current: &str, options: &[(&str, &str)], lang: &str, name: &str) -> Option<String> {
     let label = options.iter().find(|(value, _)| *value == current).map(|(_, text)| tr(lang, text)).unwrap_or(current);
     let mut picked = None;
-    egui::ComboBox::from_id_salt(id).selected_text(label).width(ui.available_width().min(200.0)).show_ui(ui, |ui| {
+    let combo = craft_ui::ComboBox::from_id_salt(id).selected_text(label).width(ui.available_width().min(200.0)).show_ui(ui, |ui| {
         for (value, text) in options {
             if ui.selectable_label(*value == current, tr(lang, text)).clicked() {
                 picked = Some((*value).to_string());
             }
         }
     });
+    let _ = crate::widgets::name_combo(combo, name.to_owned());
     picked.filter(|value| value != current)
 }
 
@@ -232,3 +246,41 @@ fn tr<'a>(lang: &str, s: &'a str) -> &'a str {
 fn w(ui: &egui::Ui, lang: &str, s: &str) -> egui::WidgetText {
     crate::rtl::widget(ui, tr(lang, s))
 }
+
+#[cfg(test)]
+mod tests {
+    use egui_kittest::{
+        Harness,
+        kittest::{NodeT, Queryable},
+    };
+
+    use super::*;
+
+    /// Records and Arrangement each expose exactly one named combo, and the accessibility check passes.
+    #[test]
+    fn arrangement_combo_is_accessible_and_distinct_from_the_records_combo() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        app.run("data.source.select", json!({"bytes": designcraft_engine::cmd::base64_encode(b"Name\nAda\nGrace\n"), "name": "people.csv"})).unwrap();
+        app.run("data.options", json!({"perPage": "multiple"})).unwrap();
+        let mut h = Harness::builder().with_size(vec2(420.0, 700.0)).build_ui_state(
+            |ui, app: &mut DesignApp| {
+                let key = egui::Id::unique("datamerge_test_fonts");
+                if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
+                    crate::theme::install_fonts(ui.ctx(), "");
+                    ui.data_mut(|d| d.insert_temp(key, true));
+                    return;
+                }
+                show(app, ui);
+            },
+            app,
+        );
+        h.run_steps(3);
+        let combos = |h: &Harness<'_, DesignApp>, label: &str| {
+            h.query_all_by_label(label).filter(|n| n.accesskit_node().role() == egui::accesskit::Role::ComboBox).count()
+        };
+        assert_eq!(combos(&h, "Merge options"), 1, "records selection keeps its name");
+        assert_eq!(combos(&h, "Arrangement"), 1, "the arrangement control has its own name");
+        h.check_accessibility();
+    }
+}
diff --git a/crates/ui-egui/src/panels/font_menu.rs b/crates/ui-egui/src/panels/font_menu.rs
index 84572a335..5f349b2e4 100644
--- a/crates/ui-egui/src/panels/font_menu.rs
+++ b/crates/ui-egui/src/panels/font_menu.rs
@@ -64,7 +64,7 @@ fn regular(styles: &[String]) -> String {
 }
 
 fn meta(ui: &Ui, fonts: &designcraft_fonts::ScopedFonts<'static>, scope: u32, family: &str) -> FamilyMeta {
-    let key = egui::Id::new(("font_meta", family, scope));
+    let key = egui::Id::unique(("font_meta", family, scope));
     if let Some(m) = ui.data(|d| d.get_temp::<FamilyMeta>(key)) {
         return m;
     }
@@ -101,7 +101,7 @@ fn family_kind(fonts: &designcraft_fonts::ScopedFonts<'static>, family: &str) ->
 
 /// The families' kinds, starting to read them the first time they're needed for `scope`.
 fn kinds(ctx: &egui::Context, fonts: &designcraft_fonts::ScopedFonts<'static>, scope: u32) -> SharedKinds {
-    let shared: SharedKinds = ctx.data_mut(|d| d.get_temp_mut_or_default::<SharedKinds>(egui::Id::new("font_kinds")).clone());
+    let shared: SharedKinds = ctx.data_mut(|d| d.get_temp_mut_or_default::<SharedKinds>(egui::Id::unique("font_kinds")).clone());
     let start = {
         let mut k = lock(&shared);
         let start = k.scope != Some(scope);
@@ -217,16 +217,15 @@ fn preview(
     ui: &Ui,
     fonts: &designcraft_fonts::ScopedFonts<'static>,
     scope: u32,
-    family: &str,
-    style: &str,
+    (family, style): (&str, &str),
     text: &str,
     size: f32,
     color: Color32,
 ) -> egui::TextureHandle {
     let ppp = ui.ctx().pixels_per_point();
     let px = (size * ppp).round() as u32;
-    let key = egui::Id::new(("font_preview", family, style, scope, text, px, color.to_array()));
-    let cache_id = egui::Id::new("font_previews");
+    let key = egui::Id::unique(("font_preview", family, style, scope, text, px, color.to_array()));
+    let cache_id = egui::Id::unique("font_previews");
     if let Some(t) = ui.data_mut(|d| d.get_temp_mut_or_default::<Previews>(cache_id).get(key)) {
         return t;
     }
@@ -281,7 +280,7 @@ fn toggle(ui: &mut Ui, on: bool, tip: &str, paint: impl FnOnce(&egui::Painter, R
         ui.painter().rect_filled(r, 3.0, t.hover);
     }
     paint(ui.painter(), r, if on { t.text_strong } else { t.icon });
-    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Checkbox, true, on, tip));
+    resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::CheckBox, true, on, tip));
     resp.on_hover_text(tip).clicked()
 }
 
@@ -297,13 +296,41 @@ fn clock(p: &egui::Painter, r: Rect, color: Color32) {
 /// one. A click on a family picks it (its Regular style), on one of its styles that style; the
 /// arrow opens a family, the star marks a favourite and ≈ shows similar fonts, all keeping the menu
 /// open (it closes on a click outside only).
-pub fn font_menu_body(app: &mut DesignApp, ui: &mut Ui, menu: &[FamilyInfo], current: &str, width: f32) -> Option<FontPick> {
+///
+/// [`font_menu_header`] lays out the search field and the filters, [`font_menu_list`] the rows
+/// under them: the header and list of a [`craft_ui::combo::Menu`] or [`craft_ui::ComboBox`], so
+/// only the rows scroll. Rows a field adds above the search (a blank "no font" row) go in the
+/// header before [`font_menu_header`].
+pub struct FontMenu<'a> {
+    app: &'a mut DesignApp,
+    menu: &'a [FamilyInfo],
+    current: &'a str,
+    st: MenuState,
+    rows: Vec<Row>,
+    highlighted_row: Option<usize>,
+    loading: bool,
+    sample: String,
+    row_h: f32,
+    sample_size: f32,
+    down: bool,
+    up: bool,
+    escape: bool,
+    pick: Option<FontPick>,
+}
+
+/// The Font menu's maximum height, its search field and filters included.
+pub const FONT_MENU_HEIGHT: f32 = 500.0;
+
+const STATE_ID: &str = "font_menu_state";
+
+/// The Font menu's search field and filters, for the header of a menu whose list is
+/// [`font_menu_list`]. See [`FontMenu`].
+pub fn font_menu_header<'a>(app: &'a mut DesignApp, ui: &mut Ui, menu: &'a [FamilyInfo], current: &'a str, width: f32) -> FontMenu<'a> {
     let lang = app.ui.language.clone();
     let tr = |s: &'static str| crate::i18n::tr(&lang, s);
     let (fonts, scope) = (super::fonts(app), super::font_scope(app));
-    let english = app.session.prefs.show_font_names_in_english;
-    let mut favs = app.session.prefs.favorite_fonts.clone();
-    let state_id = egui::Id::new("font_menu_state");
+    let favs = app.session.prefs.favorite_fonts.clone();
+    let state_id = egui::Id::unique(STATE_ID);
     let mut st: MenuState = ui.data(|d| d.get_temp(state_id)).unwrap_or_default();
     let frame = ui.ctx().cumulative_frame_nr();
     if st.frame.is_none_or(|f| f.saturating_add(1) < frame) {
@@ -315,7 +342,6 @@ pub fn font_menu_body(app: &mut DesignApp, ui: &mut Ui, menu: &[FamilyInfo], cur
     let t = Tokens::get(ui.ctx());
     ui.set_width(width.max(560.0));
     let mut pick: Option<FontPick> = None;
-    let mut favs_changed = false;
     // The keys the menu uses are its own: a dialog under it never sees Return or Escape.
     let (down, up, enter, escape) = ui.input_mut(|i| {
         let mut key = |k| i.consume_key(egui::Modifiers::NONE, k);
@@ -506,140 +532,165 @@ pub fn font_menu_body(app: &mut DesignApp, ui: &mut Ui, menu: &[FamilyInfo], cur
         };
     }
 
+    FontMenu { app, menu, current, st, rows, highlighted_row, loading, sample, row_h, sample_size, down, up, escape, pick }
+}
+
+/// A family row's favourite star and (for a family of several styles) its open/close arrow.
+/// `flags`: favourite, expanded, has an arrow. Says which of the two was clicked.
+fn star_and_arrow(
+    ui: &Ui,
+    p: &egui::Painter,
+    r: Rect,
+    (f, recent): (&String, bool),
+    (fav, open, has_arrow): (bool, bool, bool),
+    t: &Tokens,
+    arrow_label: &str,
+) -> (bool, bool) {
+    let cy = r.center().y;
+    let star = Rect::from_center_size(pos2(r.min.x + 10.0, cy), vec2(16.0, 16.0));
+    let sr = ui.interact(star, ui.scope_id().with(("fav", f, recent)), Sense::click());
+    paint_star(p, star.center(), 6.5, fav, if fav { t.accent } else { t.text_dim });
+    let mut arrow_hit = false;
+    // The arrow opens a family of several styles.
+    if has_arrow {
+        let arrow = Rect::from_center_size(pos2(r.min.x + 28.0, cy), vec2(16.0, 16.0));
+        let ar = ui.interact(arrow, ui.scope_id().with(("open", f)), Sense::click());
+        ar.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, arrow_label));
+        crate::icons::paint(p, arrow.shrink(2.0), if open { "chevron-down" } else { "chevron-right" }, t.icon);
+        arrow_hit = ar.clicked();
+    }
+    (sr.clicked(), arrow_hit)
+}
+
+/// Removes `f` from the favourites if it is one, else adds it.
+fn toggle_favorite(favs: &mut Vec<String>, f: String) {
+    if favs.contains(&f) {
+        favs.retain(|x| *x != f);
+    } else {
+        favs.push(f);
+    }
+}
+
+/// Recently used fonts, newest first.
+fn remember_recent(app: &mut DesignApp, family: &str) {
+    let mut recent = app.session.prefs.recent_fonts.clone();
+    recent.retain(|f| f != family);
+    recent.insert(0, family.to_string());
+    recent.truncate(RECENT);
+    let _ = app.run("prefs.set", json!({ "recentFonts": recent }));
+}
+
+/// The Font menu's rows, under [`font_menu_header`]. Returns the font picked.
+pub fn font_menu_list(ui: &mut Ui, m: FontMenu<'_>) -> Option<FontPick> {
+    let FontMenu { app, menu, current, mut st, rows, highlighted_row, loading, sample, row_h, sample_size, down, up, escape, mut pick } = m;
+    let lang = app.ui.language.clone();
+    let tr = |s: &'static str| crate::i18n::tr(&lang, s);
+    let (fonts, scope) = (super::fonts(app), super::font_scope(app));
+    let english = app.session.prefs.show_font_names_in_english;
+    let mut favs = app.session.prefs.favorite_fonts.clone();
+    let state_id = egui::Id::unique(STATE_ID);
+    let t = Tokens::get(ui.ctx());
+    let mut favs_changed = false;
     let mut toggle_expand = None;
     let mut toggle_fav = None;
     let mut similar = None;
-    // A popup only offers last frame's height: ask for the rows' own (a family just opened, a
-    // filter just cleared), up to the list's limit.
-    let list_h: f32 = rows
-        .iter()
-        .map(|r| match r {
-            Row::Family { .. } => row_h + ui.spacing().item_spacing.y,
-            Row::Style { .. } => row_h.min(30.0) + ui.spacing().item_spacing.y,
-            Row::Separator => 8.0,
-        })
-        .sum();
-    egui::ScrollArea::vertical().max_height(420.0).min_scrolled_height(list_h.clamp(24.0, 420.0)).auto_shrink([false, true]).show(ui, |ui| {
-        if loading {
-            crate::rtl::label(ui, egui::RichText::new(tr("Loading fonts…")).color(t.text_dim));
-        } else if rows.is_empty() {
-            crate::rtl::label(ui, egui::RichText::new(tr("No fonts match")).color(t.text_dim));
-        }
-        for (i, row) in rows.iter().enumerate() {
-            let (family, style, recent) = match row {
-                Row::Separator => {
-                    ui.separator();
-                    continue;
-                }
-                Row::Family { info, recent } => (info, None, *recent),
-                Row::Style { family, style } => {
-                    let Some(info) = menu.iter().find(|f| f.family == *family) else { continue };
-                    (info, Some(style.as_str()), false)
-                }
-            };
-            let f = &family.family;
-            let (r, mut resp) =
-                ui.allocate_exact_size(vec2(ui.available_width(), if style.is_some() { row_h.min(30.0) } else { row_h }), Sense::click());
-            let highlighted = highlighted_row == Some(i);
-            if highlighted && (down || up) {
-                ui.scroll_to_rect(r, None);
-            }
-            if !ui.is_rect_visible(r) {
+    if let Some(note) = if loading { Some("Loading fonts…") } else { rows.is_empty().then_some("No fonts match") } {
+        crate::rtl::label(ui, egui::RichText::new(tr(note)).color(t.text_dim));
+    }
+    for (i, row) in rows.iter().enumerate() {
+        let (family, style, recent) = match row {
+            Row::Separator => {
+                ui.separator();
                 continue;
             }
-            let label = match style {
-                Some(s) => s.to_string(),
-                None => family.label(english).to_string(),
-            };
-            let is_current = style.is_none() && f == current;
-            resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, is_current, &label));
-            if style.is_none() && label != *f {
-                resp = resp.on_hover_text(f);
+            Row::Family { info, recent } => (info, None, *recent),
+            Row::Style { family, style } => {
+                let Some(info) = menu.iter().find(|f| f.family == *family) else { continue };
+                (info, Some(style.as_str()), false)
             }
-            // Over the row or one of its buttons (the star, the arrow, ≈ are on top of it).
-            let hovered = resp.contains_pointer();
-            if is_current {
-                ui.painter().rect_filled(r, 0.0, t.row_selected);
-            } else if highlighted || hovered {
-                ui.painter().rect_filled(r, 0.0, t.hover);
+        };
+        let f = &family.family;
+        let (r, mut resp) = ui.allocate_exact_size(vec2(ui.available_width(), if style.is_some() { row_h.min(30.0) } else { row_h }), Sense::click());
+        let highlighted = highlighted_row == Some(i);
+        if highlighted && (down || up) {
+            ui.scroll_to_rect(r, None);
+        }
+        if !ui.is_rect_visible(r) {
+            continue;
+        }
+        let label = match style {
+            Some(s) => s.to_string(),
+            None => family.label(english).to_string(),
+        };
+        let is_current = style.is_none() && f == current;
+        resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, is_current, &label));
+        if style.is_none() && label != *f {
+            resp = resp.on_hover_text(f);
+        }
+        // Over the row or one of its buttons (the star, the arrow, ≈ are on top of it).
+        let hovered = resp.contains_pointer();
+        if is_current {
+            ui.painter().rect_filled(r, 0.0, t.row_selected);
+        } else if highlighted || hovered {
+            ui.painter().rect_filled(r, 0.0, t.hover);
+        }
+        let p = ui.painter_at(r);
+        let m = meta(ui, &fonts, scope, f);
+        let cy = r.center().y;
+        let mut handled = false;
+        if style.is_none() {
+            let expanded = st.expanded.contains(f);
+            let arrow_label = tr(if expanded { "Hide Styles" } else { "Show Styles" });
+            let flags = (favs.contains(f), expanded, m.styles.len() > 1 && !recent);
+            let (star_hit, arrow_hit) = star_and_arrow(ui, &p, r, (f, recent), flags, &t, arrow_label);
+            if star_hit {
+                toggle_fav = Some(f.clone());
+                handled = true;
             }
-            let p = ui.painter_at(r);
-            let m = meta(ui, &fonts, scope, f);
-            let cy = r.center().y;
-            let mut handled = false;
-            if style.is_none() {
-                // Favourite star.
-                let star = Rect::from_center_size(pos2(r.min.x + 10.0, cy), vec2(16.0, 16.0));
-                let fav = favs.contains(f);
-                let sr = ui.interact(star, ui.id().with(("fav", f, recent)), Sense::click());
-                paint_star(&p, star.center(), 6.5, fav, if fav { t.accent } else { t.text_dim });
-                if sr.clicked() {
-                    toggle_fav = Some(f.clone());
-                    handled = true;
-                }
-                // The arrow opens a family of several styles.
-                if m.styles.len() > 1 && !recent {
-                    let arrow = Rect::from_center_size(pos2(r.min.x + 28.0, cy), vec2(16.0, 16.0));
-                    let ar = ui.interact(arrow, ui.id().with(("open", f)), Sense::click());
-                    ar.widget_info(|| {
-                        egui::WidgetInfo::labeled(
-                            egui::WidgetType::Button,
-                            true,
-                            tr(if st.expanded.contains(f) { "Hide Styles" } else { "Show Styles" }),
-                        )
-                    });
-                    let open = st.expanded.contains(f);
-                    crate::icons::paint(&p, arrow.shrink(2.0), if open { "chevron-down" } else { "chevron-right" }, t.icon);
-                    if ar.clicked() {
-                        toggle_expand = Some(f.clone());
-                        handled = true;
-                    }
-                }
-            }
-            // Name (and how many styles), then the sample in the face, then the format.
-            let name_x = r.min.x + if style.is_some() { 48.0 } else { 40.0 };
-            let name = if style.is_none() && m.styles.len() > 1 { format!("{label} ({})", m.styles.len()) } else { label.clone() };
-            p.text(pos2(name_x, cy), Align2::LEFT_CENTER, &name, FontId::proportional(12.5), t.text);
-            let preview_x = r.min.x + (r.width() * 0.42).max(190.0);
-            let icons_x = r.max.x - 52.0;
-            let face_style = style.map_or_else(|| regular(&m.styles), str::to_string);
-            let tex = preview(ui, &fonts, scope, f, &face_style, &sample, sample_size, t.text);
-            let size = tex.size_vec2() / ui.ctx().pixels_per_point();
-            let shown = Rect::from_min_size(pos2(preview_x, cy - size.y / 2.0), size);
-            let clip = Rect::from_min_max(pos2(preview_x, r.min.y), pos2(icons_x - 6.0, r.max.y));
-            ui.painter_at(clip).image(tex.id(), shown, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
-            // Show Similar Fonts (on hover), and the format.
-            if style.is_none() && (hovered || st.similar.as_deref() == Some(f.as_str())) {
-                let sim = Rect::from_center_size(pos2(icons_x + 12.0, cy), vec2(18.0, 18.0));
-                let sr = ui.interact(sim, ui.id().with(("similar", f, recent)), Sense::click());
-                sr.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tr("Show Similar Fonts")));
-                p.text(sim.center(), Align2::CENTER_CENTER, "≈", FontId::proportional(15.0), if sr.hovered() { t.text_strong } else { t.icon });
-                if sr.on_hover_text(tr("Show Similar Fonts")).clicked() {
-                    similar = Some(f.clone());
-                    handled = true;
-                }
-            }
-            if style.is_none() {
-                let badge = Rect::from_center_size(pos2(r.max.x - 16.0, cy), vec2(20.0, 16.0));
-                paint_format(&p, badge, m.kind.format, t.text_dim, t.accent);
-                ui.interact(badge, ui.id().with(("format", f, recent)), Sense::hover()).on_hover_text(tr(format_name(m.kind.format)));
-            }
-            if resp.clicked() && !handled {
-                pick = Some(FontPick { family: f.clone(), style: style.map(str::to_string) });
+            if arrow_hit {
+                toggle_expand = Some(f.clone());
+                handled = true;
             }
         }
-    });
+        // Name (and how many styles), then the sample in the face, then the format.
+        let name_x = r.min.x + if style.is_some() { 48.0 } else { 40.0 };
+        let name = if style.is_none() && m.styles.len() > 1 { format!("{label} ({})", m.styles.len()) } else { label.clone() };
+        p.text(pos2(name_x, cy), Align2::LEFT_CENTER, &name, FontId::proportional(12.5), t.text);
+        let preview_x = r.min.x + (r.width() * 0.42).max(190.0);
+        let icons_x = r.max.x - 52.0;
+        let face_style = style.map_or_else(|| regular(&m.styles), str::to_string);
+        let tex = preview(ui, &fonts, scope, (f, &face_style), &sample, sample_size, t.text);
+        let size = tex.size_vec2() / ui.ctx().pixels_per_point();
+        let shown = Rect::from_min_size(pos2(preview_x, cy - size.y / 2.0), size);
+        let clip = Rect::from_min_max(pos2(preview_x, r.min.y), pos2(icons_x - 6.0, r.max.y));
+        ui.painter_at(clip).image(tex.id(), shown, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
+        // Show Similar Fonts (on hover), and the format.
+        if style.is_none() && (hovered || st.similar.as_deref() == Some(f.as_str())) {
+            let sim = Rect::from_center_size(pos2(icons_x + 12.0, cy), vec2(18.0, 18.0));
+            let sr = ui.interact(sim, ui.scope_id().with(("similar", f, recent)), Sense::click());
+            sr.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, tr("Show Similar Fonts")));
+            p.text(sim.center(), Align2::CENTER_CENTER, "≈", FontId::proportional(15.0), if sr.hovered() { t.text_strong } else { t.icon });
+            if sr.on_hover_text(tr("Show Similar Fonts")).clicked() {
+                similar = Some(f.clone());
+                handled = true;
+            }
+        }
+        if style.is_none() {
+            let badge = Rect::from_center_size(pos2(r.max.x - 16.0, cy), vec2(20.0, 16.0));
+            paint_format(&p, badge, m.kind.format, t.text_dim, t.accent);
+            ui.interact(badge, ui.scope_id().with(("format", f, recent)), Sense::hover()).on_hover_text(tr(format_name(m.kind.format)));
+        }
+        if resp.clicked() && !handled {
+            pick = Some(FontPick { family: f.clone(), style: style.map(str::to_string) });
+        }
+    }
     if let Some(f) = toggle_expand
         && !st.expanded.remove(&f)
     {
         st.expanded.insert(f);
     }
     if let Some(f) = toggle_fav {
-        if favs.contains(&f) {
-            favs.retain(|x| *x != f);
-        } else {
-            favs.push(f);
-        }
+        toggle_favorite(&mut favs, f);
         favs_changed = true;
     }
     if let Some(f) = similar {
@@ -651,12 +702,7 @@ pub fn font_menu_body(app: &mut DesignApp, ui: &mut Ui, menu: &[FamilyInfo], cur
         let _ = app.run("prefs.set", json!({ "favoriteFonts": favs }));
     }
     if let Some(p) = &pick {
-        // Recently used, newest first.
-        let mut recent = app.session.prefs.recent_fonts.clone();
-        recent.retain(|f| *f != p.family);
-        recent.insert(0, p.family.clone());
-        recent.truncate(RECENT);
-        let _ = app.run("prefs.set", json!({ "recentFonts": recent }));
+        remember_recent(app, &p.family);
         ui.close();
     } else if escape {
         ui.close();
@@ -673,7 +719,7 @@ mod preview_cache_tests {
         let ctx = egui::Context::default();
         let tex = |i: usize| ctx.load_texture(format!("t{i}"), egui::ColorImage::new([1, 1], vec![egui::Color32::WHITE]), Default::default());
         let mut c = Previews::default();
-        let key = |i: usize| egui::Id::new(("p", i));
+        let key = |i: usize| egui::Id::unique(("p", i));
         for i in 0..Previews::CAP + 40 {
             c.insert(key(i), tex(i));
             // The first one stays in use, so it is kept.
diff --git a/crates/ui-egui/src/panels/font_menu_ui_tests.rs b/crates/ui-egui/src/panels/font_menu_ui_tests.rs
new file mode 100644
index 000000000..8680ccfdb
--- /dev/null
+++ b/crates/ui-egui/src/panels/font_menu_ui_tests.rs
@@ -0,0 +1,366 @@
+use egui::vec2;
+use egui_kittest::Harness;
+use egui_kittest::kittest::Queryable;
+use serde_json::json;
+
+use crate::test_window::{self, Window, click_at};
+
+/// The Type tool's selection over a new text frame's text, with the Control bar on. Returns the
+/// story.
+fn typing() -> (Harness<'static, Window>, u64) {
+    typing_in("Advanced")
+}
+
+/// [`typing`] in the workspace `name`.
+fn typing_in(name: &str) -> (Harness<'static, Window>, u64) {
+    typing_on(name, vec2(1440.0, 900.0), false)
+}
+
+/// [`typing_in`] a window of `size`, with the macOS window chrome (the native menu bar and the
+/// title bar inside the window) when `mac`.
+fn typing_on(name: &str, size: egui::Vec2, mac: bool) -> (Harness<'static, Window>, u64) {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("window.workspace", json!({ "name": name })).unwrap();
+    app.native_menu = mac;
+    app.integrated_titlebar = mac;
+    let mut h = test_window::open(app, size);
+    let app = &mut h.state_mut().app;
+    let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hello", "caret": true})).unwrap();
+    app.run("tool.select", json!({"tool": "type"})).unwrap();
+    app.run("text.select", json!({"story": r["story"], "anchor": 0, "focus": 5})).unwrap();
+    h.run_steps(4);
+    (h, r["story"].as_u64().unwrap())
+}
+
+fn story_text(h: &mut Harness<'static, Window>, story: u64) -> String {
+    h.state_mut().app.run("story.get", json!({"story": story})).unwrap()["text"].as_str().unwrap().to_string()
+}
+
+/// The font fields showing `family`, top to bottom.
+fn fields(h: &Harness<'static, Window>, family: &str) -> Vec<egui::Rect> {
+    let mut r: Vec<egui::Rect> =
+        h.query_all_by(|n| n.role() == egui::accesskit::Role::ComboBox && n.value().as_deref() == Some(family)).map(|n| n.rect()).collect();
+    r.sort_by(|a, b| a.min.y.total_cmp(&b.min.y).then(a.min.x.total_cmp(&b.min.x)));
+    r
+}
+
+/// The Control bar's font field (the topmost), showing `family`.
+fn field(h: &Harness<'static, Window>, family: &str) -> egui::Rect {
+    *fields(h, family).first().unwrap_or_else(|| panic!("a font field shows {family}"))
+}
+
+/// The text in the focused search field.
+fn search(h: &Harness<'static, Window>) -> String {
+    h.get_by(|n| n.role() == egui::accesskit::Role::TextInput && n.is_focused()).value().unwrap_or_default()
+}
+
+fn family(h: &mut Harness<'static, Window>) -> String {
+    h.state_mut().app.run("type.selectionAttrs", json!({})).unwrap()["chars"]["fontFamily"].as_str().unwrap().to_string()
+}
+
+/// Run the menu until the filters' font kinds are read (it says Loading fonts… meanwhile).
+fn settle(h: &mut Harness<'static, Window>) {
+    for _ in 0..3000 {
+        if h.query_by_label("Loading fonts…").is_none() {
+            return;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(10));
+        h.run_steps(1);
+    }
+    panic!("the font kinds were never read");
+}
+
+/// Open the Control bar's font menu (showing `family`) and search for `query`.
+fn open_menu(h: &mut Harness<'static, Window>, family: &str, query: &str) {
+    let at = field(h, family);
+    click_at(h, at.center());
+    if !query.is_empty() {
+        h.event(egui::Event::Text(query.into()));
+    }
+    h.run_steps(4);
+}
+
+#[test]
+fn a_family_opens_to_its_styles_and_a_style_is_picked() {
+    let (mut h, _) = typing();
+    let serif = designcraft_fonts::DEFAULT_FAMILY;
+    open_menu(&mut h, serif, "serif 4");
+    // The arrow before the name opens the family; the menu stays open.
+    {
+        let at = h.get_by_label("Show Styles").rect().center();
+        click_at(&mut h, at);
+    }
+    assert!(h.query_by_label("Bold Italic").is_some(), "its styles are listed");
+    {
+        let at = h.get_by_label("Bold Italic").rect().center();
+        click_at(&mut h, at);
+    }
+    let attrs = h.state_mut().app.run("type.selectionAttrs", json!({})).unwrap();
+    assert_eq!((attrs["chars"]["fontFamily"].as_str(), attrs["chars"]["fontStyle"].as_str()), (Some(serif), Some("Bold Italic")));
+    assert!(!h.ctx.text_edit_focused(), "picking closes the menu");
+}
+
+#[test]
+fn picked_fonts_come_first_as_recently_used() {
+    let (mut h, _) = typing();
+    open_menu(&mut h, designcraft_fonts::DEFAULT_FAMILY, "source sans");
+    {
+        let at = h.get_by_label("Source Sans 3").rect().center();
+        click_at(&mut h, at);
+    }
+    assert_eq!(h.state().app.session.prefs.recent_fonts, ["Source Sans 3"]);
+    // Reopened without a search: Source Sans 3 is listed at the top, and again in its place (on
+    // screen too when few fonts are installed).
+    open_menu(&mut h, "Source Sans 3", "");
+    let recent = h.query_all_by_label("Source Sans 3").map(|n| n.rect()).min_by(|a, b| a.min.y.total_cmp(&b.min.y)).expect("Source Sans 3 is listed");
+    let search = h.get_by(|n| n.role() == egui::accesskit::Role::TextInput && n.is_focused()).rect();
+    assert!(recent.min.y > search.max.y && recent.min.y - search.max.y < 80.0, "the first row, under the filters: {recent:?} vs {search:?}");
+}
+
+#[test]
+fn the_class_filter_and_similar_fonts_narrow_the_list() {
+    let (mut h, _) = typing();
+    open_menu(&mut h, designcraft_fonts::DEFAULT_FAMILY, "");
+    {
+        let at = h.get_by(|n| n.label().is_some_and(|l| l.starts_with("All Classes"))).rect().center();
+        click_at(&mut h, at);
+    }
+    {
+        let at = h.get_by_label("Monospaced").rect().center();
+        click_at(&mut h, at);
+    }
+    settle(&mut h);
+    assert!(h.query_by_label("JetBrains Mono").is_some(), "a monospaced family is listed");
+    assert!(h.query_by_label(designcraft_fonts::DEFAULT_FAMILY).is_none(), "a serif isn't");
+    // Back to all classes, then fonts like the serif: it leads, other serifs follow, no sans.
+    {
+        let at = h.get_by(|n| n.label().is_some_and(|l| l.starts_with("Monospaced ▾"))).rect().center();
+        click_at(&mut h, at);
+    }
+    {
+        let at = h.get_by_label("All Classes").rect().center();
+        click_at(&mut h, at);
+    }
+    h.event(egui::Event::Text("serif 4".into()));
+    h.run_steps(4);
+    let row = h.get_by_label(designcraft_fonts::DEFAULT_FAMILY).rect();
+    h.hover_at(row.center());
+    h.run_steps(2);
+    {
+        let at = h.get_by_label("Show Similar Fonts").rect().center();
+        click_at(&mut h, at);
+    }
+    assert!(h.query_by_label(&format!("Similar to {}", designcraft_fonts::DEFAULT_FAMILY)).is_some());
+    assert!(h.query_by_label("Source Sans 3").is_none() && h.query_by_label("JetBrains Mono").is_none(), "other classes aren't similar");
+    assert!(h.query_by_label(designcraft_fonts::DEFAULT_FAMILY).is_some());
+}
+
+#[test]
+fn every_font_field_reports_as_a_combo_box_showing_the_family() {
+    let (h, _) = typing();
+    let shown = fields(&h, designcraft_fonts::DEFAULT_FAMILY);
+    // The Control bar's, and the hand-drawn ones (Properties, the Contextual Task Bar).
+    assert!(shown.len() >= 2, "{shown:?}");
+}
+
+#[test]
+fn typing_in_the_font_menu_searches_and_never_reaches_the_story() {
+    let (mut h, story) = typing();
+    let before = story_text(&mut h, story);
+    let at = field(&h, designcraft_fonts::DEFAULT_FAMILY);
+    click_at(&mut h, at.center());
+    assert!(h.ctx.text_edit_focused(), "the search field takes the keyboard when the menu opens");
+    h.event(egui::Event::Text("source sans".into()));
+    h.run_steps(4);
+    assert_eq!(search(&h), "source sans");
+    assert_eq!(story_text(&mut h, story), before, "the typing went to the search, not the story");
+    assert!(h.query_by_label("Source Sans 3").is_some(), "a match is listed");
+    assert!(h.query_by_label(designcraft_fonts::DEFAULT_FAMILY).is_none(), "families that don't match aren't");
+    // ↓ and Return pick the first match and close the menu.
+    h.key_press(egui::Key::ArrowDown);
+    h.run_steps(2);
+    h.key_press(egui::Key::Enter);
+    h.run_steps(4);
+    assert_eq!(family(&mut h), "Source Sans 3");
+    assert_eq!(story_text(&mut h, story), before);
+    assert!(!h.ctx.text_edit_focused(), "the menu closed");
+    // Reopened, the search starts empty.
+    let at = field(&h, "Source Sans 3");
+    click_at(&mut h, at.center());
+    assert_eq!(search(&h), "", "the search starts empty");
+    // A click on a family picks it.
+    h.event(egui::Event::Text("serif 4".into()));
+    h.run_steps(4);
+    let row = h.get_by_label(designcraft_fonts::DEFAULT_FAMILY).rect();
+    click_at(&mut h, row.center());
+    assert_eq!(family(&mut h), designcraft_fonts::DEFAULT_FAMILY);
+    // Escape closes the menu and leaves the text as it was.
+    let at = field(&h, designcraft_fonts::DEFAULT_FAMILY);
+    click_at(&mut h, at.center());
+    // A star marks a favourite and keeps the menu open.
+    h.event(egui::Event::Text("serif 4".into()));
+    h.run_steps(4);
+    let row = h.get_by_label(designcraft_fonts::DEFAULT_FAMILY).rect();
+    click_at(&mut h, row.min + vec2(10.0, 12.0));
+    assert!(h.state().app.session.prefs.favorite_fonts.iter().any(|f| f == designcraft_fonts::DEFAULT_FAMILY));
+    assert_eq!(search(&h), "serif 4", "the menu stays open");
+    h.key_press(egui::Key::Escape);
+    h.run_steps(4);
+    assert!(!h.ctx.text_edit_focused(), "the menu closed");
+    assert_eq!(story_text(&mut h, story), before);
+    assert!(h.state().app.session.active().unwrap().selection.text.is_some(), "the text is still selected");
+}
+
+/// Opens the font menu of the field at `at`, clicks its search field, types, checks the menu
+/// stays open and lists only the matches, then picks the first with ↓ and Return.
+fn search_in_menu(h: &mut Harness<'static, Window>, at: egui::Rect, what: &str) {
+    click_at(h, at.center());
+    let field = h.query_by(|n| n.role() == egui::accesskit::Role::TextInput && n.is_focused()).map(|n| n.rect());
+    let field = field.unwrap_or_else(|| panic!("{what}: the menu opens with the search field focused"));
+    click_at(h, field.center());
+    assert!(h.ctx.text_edit_focused(), "{what}: a click on the search field keeps the menu open");
+    h.event(egui::Event::Text("SOURCE SA".into()));
+    h.run_steps(4);
+    assert_eq!(search(h), "SOURCE SA", "{what}: the typing went to the search");
+    assert!(h.query_by_label("Source Sans 3").is_some(), "{what}: a match is listed");
+    assert!(h.query_by_label(designcraft_fonts::DEFAULT_FAMILY).is_none(), "{what}: families that don't match aren't");
+    h.key_press(egui::Key::ArrowDown);
+    h.run_steps(2);
+    h.key_press(egui::Key::Enter);
+    h.run_steps(4);
+    assert!(!h.ctx.text_edit_focused(), "{what}: the menu closed");
+}
+
+/// Every font field over selected text (Control bar, Contextual Task Bar, Properties ›
+/// Character, Character panel) searches, in the workspaces that show them and in a small
+/// window with the macOS window chrome.
+#[test]
+fn every_font_field_searches_in_every_workspace() {
+    for (name, size, mac, panel) in [
+        ("Advanced", vec2(1440.0, 900.0), false, None),
+        ("Printing and Proofing", vec2(1440.0, 900.0), false, None),
+        ("Essentials", vec2(1440.0, 900.0), false, Some("character")),
+        ("Printing and Proofing", vec2(900.0, 560.0), true, None),
+    ] {
+        let (mut h, story) = typing_on(name, size, mac);
+        if panel.is_some() {
+            h.state_mut().app.ui.open_panel = panel.map(str::to_string);
+            h.run_steps(4);
+        }
+        let name = &format!("{name} {size:?} {panel:?}");
+        let before = story_text(&mut h, story);
+        let count = fields(&h, designcraft_fonts::DEFAULT_FAMILY).len();
+        assert_eq!(count, 3, "{name}: the font fields are shown");
+        for k in 0..count {
+            h.state_mut().app.run("type.char", json!({"attrs": {"fontFamily": designcraft_fonts::DEFAULT_FAMILY}})).unwrap();
+            h.run_steps(4);
+            // A short Properties group (below it, the workspace's open panel) scrolls to the field.
+            let mut nodes: Vec<_> = h
+                .query_all_by(|n| n.role() == egui::accesskit::Role::ComboBox && n.value().as_deref() == Some(designcraft_fonts::DEFAULT_FAMILY))
+                .collect();
+            nodes.sort_by(|a, b| a.rect().min.y.total_cmp(&b.rect().min.y).then(a.rect().min.x.total_cmp(&b.rect().min.x)));
+            if let Some(node) = nodes.get(k) {
+                node.scroll_to_me();
+            }
+            h.run_steps(4);
+            let at = fields(&h, designcraft_fonts::DEFAULT_FAMILY)[k];
+            search_in_menu(&mut h, at, &format!("{name}, field {k}"));
+            assert_eq!(family(&mut h), "Source Sans 3", "{name}, field {k}");
+            assert_eq!(story_text(&mut h, story), before, "{name}, field {k}");
+        }
+    }
+}
+
+/// The font fields away from the text: the Glyphs panel, Paragraph Style Options › Basic
+/// Character Formats and Find/Replace Font's Replace With.
+#[test]
+fn font_fields_in_panels_and_dialogs_search() {
+    let paragraph = json!({"name": designcraft_doc::BASIC_PARAGRAPH, "section": "chars"});
+    for (what, panel, dialog, shown) in [
+        ("Glyphs", Some("glyphs"), None, designcraft_fonts::DEFAULT_FAMILY),
+        ("Paragraph Style Options", None, Some(("paragraphStyleOptions", paragraph)), designcraft_fonts::DEFAULT_FAMILY),
+        ("Find/Replace Font", None, Some(("findFont", json!({"toFamily": designcraft_fonts::DEFAULT_FAMILY}))), designcraft_fonts::DEFAULT_FAMILY),
+    ] {
+        let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        let mut h = test_window::open(app, vec2(1440.0, 900.0));
+        let dialog_id = dialog.as_ref().map(|(id, _)| id.to_string());
+        h.state_mut().app.ui.open_panel = panel.map(str::to_string);
+        h.state_mut().app.ui.dialog = dialog.map(|(id, fields)| crate::dialogs::Dialog::new(id, fields));
+        h.run_steps(4);
+        let at = *fields(&h, shown).first().unwrap_or_else(|| panic!("{what}: the font field is shown"));
+        search_in_menu(&mut h, at, what);
+        assert_eq!(h.state().app.ui.dialog.as_ref().map(|d| d.id.clone()), dialog_id, "{what}: Return in the menu leaves the dialog open");
+        assert!(!fields(&h, "Source Sans 3").is_empty(), "{what}: the field shows the family picked");
+        // Escape closes the menu only.
+        let at = fields(&h, "Source Sans 3")[0];
+        click_at(&mut h, at.center());
+        assert!(h.ctx.text_edit_focused(), "{what}: the menu opened");
+        h.key_press(egui::Key::Escape);
+        h.run_steps(4);
+        assert!(!h.ctx.text_edit_focused(), "{what}: Escape closed the menu");
+        assert_eq!(h.state().app.ui.dialog.as_ref().map(|d| d.id.clone()), dialog_id, "{what}: Escape in the menu leaves the dialog open");
+    }
+}
+
+/// The font rows the open menu shows under its search field `search`: how many, and the bottom
+/// of the lowest.
+fn rows_shown(h: &Harness<'static, Window>, search: egui::Rect) -> (usize, f32) {
+    let families: Vec<String> = crate::panels::font_menu(&h.state().app).iter().map(|f| f.label(true).to_string()).collect();
+    let rows: Vec<egui::Rect> = h
+        .query_all_by(|n| n.role() == egui::accesskit::Role::Button && n.label().is_some_and(|l| families.contains(&l)))
+        .map(|n| n.rect())
+        .filter(|r| r.min.y > search.max.y)
+        .collect();
+    (rows.len(), rows.iter().map(|r| r.max.y).fold(f32::MIN, f32::max))
+}
+
+/// Opens the font menu of the field at `at`, searches for a font that doesn't exist and clears
+/// the search: the menu grows back to the rows it showed, with the search field where it was.
+/// The menu lists every family by its English name: the test UI has no CJK font for a system
+/// CJK family's native name.
+fn menu_regrows_after_a_search_with_no_matches(h: &mut Harness<'static, Window>, at: egui::Rect, what: &str) {
+    h.state_mut().app.session.prefs.show_font_names_in_english = true;
+    click_at(h, at.center());
+    h.run_steps(4);
+    let focused = |h: &Harness<'static, Window>| h.query_by(|n| n.role() == egui::accesskit::Role::TextInput && n.is_focused()).map(|n| n.rect());
+    let field = focused(h).unwrap_or_else(|| panic!("{what}: the menu opens with the search field focused"));
+    let (count, bottom) = rows_shown(h, field);
+    assert!(count > 1, "{what}: the menu lists the fonts: {count}");
+
+    let query = "zzqqxxnomatch";
+    h.event(egui::Event::Text(query.into()));
+    h.run_steps(4);
+    assert!(h.query_by_label("No fonts match").is_some(), "{what}: nothing matches");
+    assert_eq!(rows_shown(h, field).0, 0, "{what}: no rows while nothing matches");
+
+    for _ in query.chars() {
+        h.key_press(egui::Key::Backspace);
+    }
+    h.run_steps(4);
+    assert_eq!(search(h), "", "{what}: the search is cleared");
+    let again = focused(h).unwrap_or_else(|| panic!("{what}: the menu is still open"));
+    assert!((again.min.y - field.min.y).abs() < 0.5, "{what}: the search field stays at {}, not {}", field.min.y, again.min.y);
+    let (count_again, bottom_again) = rows_shown(h, again);
+    assert_eq!(count_again, count, "{what}: the menu shows as many rows as before the search");
+    assert!((bottom_again - bottom).abs() < 1.0, "{what}: the menu grows back to {bottom}, not {bottom_again}");
+}
+
+#[test]
+fn the_font_field_menu_grows_back_after_a_search_with_no_matches() {
+    let (mut h, _) = typing();
+    let at = field(&h, designcraft_fonts::DEFAULT_FAMILY);
+    menu_regrows_after_a_search_with_no_matches(&mut h, at, "Control bar");
+}
+
+/// Paragraph Style Options › Basic Character Formats' Font Family combo box. The CJK style
+/// fields' combo box hosts the same menu the same way.
+#[test]
+fn the_style_dialog_font_menu_grows_back_after_a_search_with_no_matches() {
+    let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let mut h = test_window::open(app, vec2(1440.0, 900.0));
+    let section = json!({"name": designcraft_doc::BASIC_PARAGRAPH, "section": "chars"});
+    h.state_mut().app.ui.dialog = Some(crate::dialogs::Dialog::new("paragraphStyleOptions", section));
+    h.run_steps(4);
+    let at = *fields(&h, designcraft_fonts::DEFAULT_FAMILY).first().expect("the dialog's font field is shown");
+    menu_regrows_after_a_search_with_no_matches(&mut h, at, "Paragraph Style Options");
+}
diff --git a/crates/ui-egui/src/panels/glyphs.rs b/crates/ui-egui/src/panels/glyphs.rs
index 5d91c194f..965509ff4 100644
--- a/crates/ui-egui/src/panels/glyphs.rs
+++ b/crates/ui-egui/src/panels/glyphs.rs
@@ -21,7 +21,7 @@ struct State {
 
 pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     let t = Tokens::get(ui.ctx());
-    let id = egui::Id::new("glyphs_panel");
+    let id = egui::Id::unique("glyphs_panel");
     let mut st: State = ui.data(|d| d.get_temp(id)).unwrap_or_default();
     // Default to the font at the text cursor.
     if st.family.is_empty() {
@@ -38,13 +38,14 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
             st.style = f.style.clone().or_else(|| db.styles(&f.family).into_iter().next()).unwrap_or_else(|| "Regular".into());
             st.family = f.family;
         }
-        egui::ComboBox::from_id_salt("glyph_style").selected_text(&st.style).width(80.0).show_ui(ui, |ui| {
+        let combo = craft_ui::ComboBox::from_id_salt("glyph_style").selected_text(&st.style).width(80.0).show_ui(ui, |ui| {
             for s in db.styles(&st.family) {
                 if ui.selectable_label(s == st.style, &s).clicked() {
                     st.style = s;
                 }
             }
         });
+        let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Font Style"));
     });
     ui.add(
         egui::TextEdit::singleline(&mut st.query)
@@ -120,7 +121,7 @@ pub fn grid(
     let max_rows = (ui.ctx().input(|i| i.max_texture_side) as u32 / cell_px).max(1);
     chars.truncate((max_rows * cols) as usize);
     let ink = t.text_strong;
-    let key = egui::Id::new(("glyph_grid", family, style, scope, q, cols, cell_px, ink.to_array()));
+    let key = egui::Id::unique(("glyph_grid", family, style, scope, q, cols, cell_px, ink.to_array()));
     let tex: egui::TextureHandle = match ui.data(|d| d.get_temp::<egui::TextureHandle>(key)) {
         Some(t) => t,
         None => {
diff --git a/crates/ui-egui/src/panels/interactive.rs b/crates/ui-egui/src/panels/interactive.rs
index 5c3280142..4d5558ffb 100644
--- a/crates/ui-egui/src/panels/interactive.rs
+++ b/crates/ui-egui/src/panels/interactive.rs
@@ -3,6 +3,7 @@
 use serde_json::{Value, json};
 
 use crate::DesignApp;
+use crate::app::file_dialogs::Bound;
 use crate::theme::Tokens;
 
 fn dest_text(lang: &str, d: &Value) -> String {
@@ -20,7 +21,7 @@ fn dest_text(lang: &str, d: &Value) -> String {
 
 pub fn hyperlinks(app: &mut DesignApp, ui: &mut egui::Ui) {
     let t = Tokens::get(ui.ctx());
-    let id = egui::Id::new("new_hyperlink_url");
+    let id = egui::Id::unique("new_hyperlink_url");
     let mut url: String = ui.data(|d| d.get_temp(id)).unwrap_or_else(|| "https://".into());
     let has_target = app.session.active().is_some_and(|d| d.selection.text.is_some_and(|t| !t.is_caret()) || !d.selection.items.is_empty());
     ui.horizontal(|ui| {
@@ -168,7 +169,7 @@ pub fn tags(app: &mut DesignApp, ui: &mut egui::Ui) {
     let has_sel = app.session.active().is_some_and(|d| !d.selection.items.is_empty());
     // Selected text is tagged inline instead of its frame.
     let text_sel = app.session.active().and_then(|d| d.selection.text).is_some_and(|t| !t.range().is_empty());
-    let id = egui::Id::new("new_tag_name");
+    let id = egui::Id::unique("new_tag_name");
     let mut name: String = ui.data(|d| d.get_temp(id)).unwrap_or_default();
     ui.horizontal(|ui| {
         ui.add(
@@ -227,16 +228,13 @@ pub fn tags(app: &mut DesignApp, ui: &mut egui::Ui) {
         }
     }
     // DTD: load, validate (problems listed until the next validation), delete.
-    let vid = egui::Id::new("dtd_problems");
+    let vid = egui::Id::unique("dtd_problems");
     let mut problems: Option<Vec<String>> = ui.data(|d| d.get_temp(vid));
     ui.horizontal(|ui| {
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Load DTD…"))).clicked()
-            && let Some(path) = app.services.pick_open.as_mut().and_then(|f| f("dtd"))
-        {
-            match app.run("xml.loadDtd", json!({"path": path})) {
-                Ok(_) => problems = None,
-                Err(e) => app.status_error("Load DTD", e),
-            }
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Load DTD…"))).clicked() {
+            // A new DTD's problems show at the next validation.
+            problems = None;
+            ask_then_run(app, "dtd", "Load DTD", |path| ("xml.loadDtd", json!({"path": path})));
         }
         let has_dtd = info["dtd"].as_bool().unwrap_or(false);
         if ui.add_enabled(has_dtd, egui::Button::new(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Validate")))).clicked()
@@ -280,15 +278,28 @@ pub fn tags(app: &mut DesignApp, ui: &mut egui::Ui) {
         if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Export XML…"))).clicked() {
             let _ = app.run("app.exportXml", json!({}));
         }
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Import XML…"))).clicked()
-            && let Some(path) = app.services.pick_open.as_mut().and_then(|f| f("xml"))
-            && let Err(e) = app.run("file.importXml", json!({"path": path}))
-        {
-            app.status_error("Import XML", e);
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Import XML…"))).clicked() {
+            ask_then_run(app, "xml", "Import XML", |path| ("file.importXml", json!({"path": path})));
         }
     });
 }
 
+/// Asks for a file for `purpose`, then runs the command `command(path)` names; a failure shows
+/// in the status line as `feature`'s.
+#[track_caller]
+fn ask_then_run(app: &mut DesignApp, purpose: &str, feature: &'static str, command: impl FnOnce(String) -> (&'static str, Value) + 'static) {
+    let asked = app.ask_open(purpose, Bound::Document, move |app, path| {
+        let (id, params) = command(path);
+        if let Err(e) = app.run(id, params) {
+            app.status_error(feature, e);
+        }
+        Ok(Value::Null)
+    });
+    if let Err(e) = asked {
+        app.status_error(feature, e);
+    }
+}
+
 /// Object States panel: the selected multi-state object's states (click to show one).
 pub fn states(app: &mut DesignApp, ui: &mut egui::Ui) {
     let t = Tokens::get(ui.ctx());
@@ -365,7 +376,7 @@ pub fn buttons(app: &mut DesignApp, ui: &mut egui::Ui) {
     let mut pick = None;
     ui.horizontal(|ui| {
         crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "On Release"));
-        egui::ComboBox::from_id_salt("button_action")
+        let combo = craft_ui::ComboBox::from_id_salt("button_action")
             .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, labels.iter().find(|l| l.0 == kind).map_or("", |l| l.1))))
             .show_ui(ui, |ui| {
                 for (k, l) in labels {
@@ -374,6 +385,7 @@ pub fn buttons(app: &mut DesignApp, ui: &mut egui::Ui) {
                     }
                 }
             });
+        let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "On Release Action"));
     });
     let mut params = None;
     if let Some(k) = pick {
@@ -390,7 +402,7 @@ pub fn buttons(app: &mut DesignApp, ui: &mut egui::Ui) {
         });
     }
     if kind == "url" {
-        let key = egui::Id::new(("button_url", id.0));
+        let key = egui::Id::unique(("button_url", id.0));
         let mut u: String = ui.data(|d| d.get_temp(key)).unwrap_or(url.clone());
         let r = ui.add(egui::TextEdit::singleline(&mut u).desired_width(f32::INFINITY));
         if r.lost_focus() && u != url {
@@ -425,7 +437,7 @@ pub fn buttons(app: &mut DesignApp, ui: &mut egui::Ui) {
     let cur = ff.as_ref().map(|f| f.kind);
     ui.horizontal(|ui| {
         crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Form Field"));
-        egui::ComboBox::from_id_salt("form_kind")
+        let combo = craft_ui::ComboBox::from_id_salt("form_kind")
             .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, kinds.iter().find(|k| k.0 == cur).map_or("", |k| k.1))))
             .show_ui(ui, |ui| {
                 for (k, l) in kinds {
@@ -437,9 +449,10 @@ pub fn buttons(app: &mut DesignApp, ui: &mut egui::Ui) {
                     }
                 }
             });
+        let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Form Field Type"));
     });
     if let Some(f) = ff {
-        let key = egui::Id::new(("form_edit", id.0));
+        let key = egui::Id::unique(("form_edit", id.0));
         let (mut name, mut value, mut opts): (String, String, String) =
             ui.data(|d| d.get_temp(key)).unwrap_or((f.name.clone(), f.value.clone(), f.options.join(", ")));
         let mut commit = false;
@@ -537,7 +550,7 @@ pub fn liquid(app: &mut DesignApp, ui: &mut egui::Ui) {
             crate::widgets::caption(ui, &format!("{} {}", crate::i18n::tr(&lang, "Page:"), d.page_name(page)));
         });
     });
-    egui::ComboBox::from_id_salt("liquid_rule")
+    let combo = craft_ui::ComboBox::from_id_salt("liquid_rule")
         .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&lang, liquid_rule_label(pg.liquid))))
         .width(190.0)
         .show_ui(ui, |ui| {
@@ -547,6 +560,7 @@ pub fn liquid(app: &mut DesignApp, ui: &mut egui::Ui) {
                 }
             }
         });
+    let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&lang, "Liquid Page Rule"));
     ui.separator();
     // The selected object (one on this page).
     let item = app
@@ -635,11 +649,8 @@ pub fn media(app: &mut DesignApp, ui: &mut egui::Ui) {
     }
     ui.horizontal(|ui| {
         crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Poster"));
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Choose Image…"))).clicked()
-            && let Some(path) = app.services.pick_open.as_mut().and_then(|f| f("place"))
-            && let Err(e) = app.run("media.options", json!({"poster": {"path": path}}))
-        {
-            app.status_error("Media", e);
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Choose Image…"))).clicked() {
+            ask_then_run(app, "place", "Media", |path| ("media.options", json!({"poster": {"path": path}})));
         }
         if !m["poster"].is_null() && ui.small_button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "None"))).clicked() {
             let _ = app.run("media.options", json!({"poster": null}));
@@ -666,7 +677,7 @@ pub fn transitions(app: &mut DesignApp, ui: &mut egui::Ui) {
     use designcraft_doc::TransitionKind as K;
     crate::rtl::label(ui, egui::RichText::new(format!("{} {}", crate::i18n::tr(&app.ui.language, "Spread"), si + 1)).strong());
     let mut kind = cur.map(|c| c.kind);
-    egui::ComboBox::from_id_salt("transition_kind")
+    let combo = craft_ui::ComboBox::from_id_salt("transition_kind")
         .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, kind.map_or("None", K::label))))
         .show_ui(ui, |ui| {
             ui.selectable_value(&mut kind, None, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "None")));
@@ -674,6 +685,7 @@ pub fn transitions(app: &mut DesignApp, ui: &mut egui::Ui) {
                 ui.selectable_value(&mut kind, Some(k), crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, k.label())));
             }
         });
+    let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Transition"));
     let mut duration = cur.map_or(1.0, |c| c.duration);
     let mut horizontal = cur.is_some_and(|c| c.horizontal);
     let mut changed = kind != cur.map(|c| c.kind);
@@ -789,7 +801,7 @@ mod liquid_panel_tests {
         let id = app.run("frame.create", json!({"rect": [100, 100, 200, 200]})).unwrap()["id"].as_u64().unwrap();
         let mut h = Harness::builder().with_size(egui::vec2(260.0, 420.0)).build_ui_state(
             |ui, app: &mut DesignApp| {
-                let key = egui::Id::new("test_fonts");
+                let key = egui::Id::unique("test_fonts");
                 if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
                     crate::theme::install_fonts(ui.ctx(), "");
                     ui.data_mut(|d| d.insert_temp(key, true));
diff --git a/crates/ui-egui/src/panels/layers.rs b/crates/ui-egui/src/panels/layers.rs
index 657e9b611..1f5382ac2 100644
--- a/crates/ui-egui/src/panels/layers.rs
+++ b/crates/ui-egui/src/panels/layers.rs
@@ -80,10 +80,10 @@ fn eye_lock(
     if locked {
         icons::paint(ui.painter(), Rect::from_center_size(lock.center(), vec2(13.0, 13.0)), "lock", col);
     }
-    let e = ui.interact(eye, ui.id().with(("eye", key)), Sense::click()).on_hover_ui(|ui| {
+    let e = ui.interact(eye, ui.scope_id().with(("eye", key)), Sense::click()).on_hover_ui(|ui| {
         crate::rtl::label(ui, crate::i18n::tr(language, if visible { "Hide" } else { "Show" }));
     });
-    let l = ui.interact(lock, ui.id().with(("lock", key)), Sense::click()).on_hover_ui(|ui| {
+    let l = ui.interact(lock, ui.scope_id().with(("lock", key)), Sense::click()).on_hover_ui(|ui| {
         crate::rtl::label(ui, crate::i18n::tr(language, if locked { "Unlock" } else { "Lock" }));
     });
     (e.clicked(), l.clicked())
@@ -103,7 +103,7 @@ fn selection_square(
     let s = if small { 7.0 } else { 8.0 };
     let r = Rect::from_center_size(pos2(row.max.x - 12.0, row.center().y), vec2(s, s));
     let sense = if selected && !small { Sense::click_and_drag() } else { Sense::click() };
-    let resp = ui.interact(r.expand(4.0), ui.id().with(("selsq", key)), sense);
+    let resp = ui.interact(r.expand(4.0), ui.scope_id().with(("selsq", key)), sense);
     if selected {
         ui.painter().rect_filled(r, 0.0, color);
     } else if resp.hovered() {
@@ -267,16 +267,16 @@ fn object_rows(
         let (eye, lock) = eye_lock(ui, ls.language, row, !it.hidden, it.locked, !ls.layer_visible, ("item", it.id.0));
         let indent = 14.0 * depth as f32;
         let expandable = !it.children().is_empty() && it.states.is_empty() && depth < MAX_DEPTH;
-        let open_id = egui::Id::new(("group_open", it.id.0));
+        let open_id = egui::Id::unique(("group_open", it.id.0));
         let open = expandable && ui.data(|d| d.get_temp(open_id)).unwrap_or(false);
         let mut tri_clicked = false;
         if expandable {
             let tri = Rect::from_min_size(row.min + vec2(2.0 * COL_W + 14.0 + indent, 0.0), vec2(14.0, ROW_H));
             disclosure(ui, tri, open, t.icon);
-            tri_clicked = ui.interact(tri, ui.id().with(("gtri", it.id.0)), Sense::click()).clicked();
+            tri_clicked = ui.interact(tri, ui.scope_id().with(("gtri", it.id.0)), Sense::click()).clicked();
         }
         let name = item_label(ls.doc, it);
-        resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, true, is_sel, &name));
+        resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, is_sel, &name));
         let field = Rect::from_min_max(row.min + vec2(2.0 * COL_W + 28.0 + indent, 3.0), pos2(row.max.x - 28.0, row.max.y - 3.0));
         let renaming = match rename_field(ui, field, it.id.0) {
             // An empty name goes back to the automatic label.
@@ -287,7 +287,7 @@ fn object_rows(
                 false
             }
             Some(None) => false,
-            None => ui.data(|d| d.get_temp::<RenameState>(egui::Id::new(RENAME))).is_some_and(|(k, ..)| k == it.id.0),
+            None => ui.data(|d| d.get_temp::<RenameState>(egui::Id::unique(RENAME))).is_some_and(|(k, ..)| k == it.id.0),
         };
         if !renaming {
             let clip = Rect::from_min_max(row.min, pos2(row.max.x - 26.0, row.max.y));
@@ -323,7 +323,7 @@ fn object_rows(
             // after the double-click delay) renames it; a quick double-click only selects.
             let (now, add) = ui.input(|i| (i.time, i.modifiers.shift || i.modifiers.command));
             let delay = ui.ctx().options(|o| o.input_options.max_double_click_delay);
-            let last_id = egui::Id::new(("layers_last_click", it.id.0));
+            let last_id = egui::Id::unique(("layers_last_click", it.id.0));
             let last: Option<f64> = ui.data(|d| d.get_temp(last_id));
             ui.data_mut(|d| d.insert_temp(last_id, now));
             let slow = !sq && !add && !resp.double_clicked() && last.is_some_and(|t| now - t > delay && now - t < SLOW_RENAME_WINDOW);
@@ -377,7 +377,7 @@ pub fn show(app: &mut DesignApp, ui: &mut Ui) {
     let shown: Vec<ItemId> = selected.iter().map(|i| doc.top_level_of(*i).unwrap_or(*i)).collect();
     // A new selection (made on the canvas or anywhere else) is revealed: its layer opens and its row
     // scrolls into view, once, so the panel can still be scrolled and closed freely afterwards.
-    let last_id = egui::Id::new("layers_revealed_selection");
+    let last_id = egui::Id::unique("layers_revealed_selection");
     let now: Vec<u64> = shown.iter().map(|i| i.0).collect();
     let reveal = !now.is_empty() && ui.data(|d| d.get_temp::<Vec<u64>>(last_id)).as_ref() != Some(&now);
     ui.data_mut(|d| d.insert_temp(last_id, now));
@@ -391,7 +391,7 @@ pub fn show(app: &mut DesignApp, ui: &mut Ui) {
     ui.spacing_mut().item_spacing.y = 0.0;
     // `doc.layers` runs top (frontmost) to bottom, as the panel lists them.
     for (li, l) in doc.layers.iter().enumerate() {
-        let open_id = egui::Id::new(("layer_open", l.id.0));
+        let open_id = egui::Id::unique(("layer_open", l.id.0));
         let mut open: bool = ui.data(|d| d.get_temp(open_id)).unwrap_or(l.id == active);
         if reveal && sel_layers.contains(&l.id) && !open {
             open = true;
@@ -399,7 +399,7 @@ pub fn show(app: &mut DesignApp, ui: &mut Ui) {
         }
         let lc = c32(l.color);
         let (row, resp) = ui.allocate_exact_size(vec2(ui.available_width(), ROW_H), Sense::click_and_drag());
-        resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &l.name));
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &l.name));
         if l.id == active {
             ui.painter().rect_filled(row, 0.0, t.row_selected);
         } else if resp.hovered() {
@@ -408,7 +408,7 @@ pub fn show(app: &mut DesignApp, ui: &mut Ui) {
         let (eye, lock) = eye_lock(ui, &language, row, l.visible, l.locked, false, ("layer", l.id.0));
         let tri = Rect::from_min_size(row.min + vec2(2.0 * COL_W + 2.0, 0.0), vec2(14.0, ROW_H));
         disclosure(ui, tri, open, t.icon);
-        let tri_r = ui.interact(tri, ui.id().with(("tri", l.id.0)), Sense::click());
+        let tri_r = ui.interact(tri, ui.scope_id().with(("tri", l.id.0)), Sense::click());
         // Layer colour chip and name.
         let chip = Rect::from_min_size(row.min + vec2(2.0 * COL_W + 18.0, 7.0), vec2(4.0, 10.0));
         ui.painter().rect_filled(chip, 0.0, lc);
@@ -570,7 +570,7 @@ const RENAME: &str = "layers_rename";
 /// or a click elsewhere confirms it with a changed text, `Some(None)` when Esc cancels or the text
 /// is the one it started with, `None` while typing or when this row isn't being renamed.
 fn rename_field(ui: &mut Ui, r: Rect, key: RenameKey) -> Option<Option<String>> {
-    let id = egui::Id::new(RENAME);
+    let id = egui::Id::unique(RENAME);
     let (k, mut text, start): RenameState = ui.data(|d| d.get_temp(id))?;
     if k != key {
         return None;
@@ -601,7 +601,7 @@ fn rename_field(ui: &mut Ui, r: Rect, key: RenameKey) -> Option<Option<String>>
 
 /// Start renaming row `key`, its field showing `name`.
 fn start_rename(ui: &Ui, key: RenameKey, name: &str) {
-    ui.data_mut(|d| d.insert_temp(egui::Id::new(RENAME), (key, name.to_string(), name.to_string())));
+    ui.data_mut(|d| d.insert_temp(egui::Id::unique(RENAME), (key, name.to_string(), name.to_string())));
 }
 
 #[cfg(test)]
@@ -739,13 +739,13 @@ mod tests {
         app.run("selection.set", json!({"ids": []})).unwrap();
         let mut h = Harness::builder().with_size(egui::vec2(260.0, 400.0)).build_ui_state(|ui, app: &mut DesignApp| show(app, ui), app);
         h.run_steps(2);
-        let open = |h: &Harness<'_, DesignApp>| h.ctx.data(|d| d.get_temp::<bool>(egui::Id::new(("layer_open", first.0)))).unwrap_or(false);
+        let open = |h: &Harness<'_, DesignApp>| h.ctx.data(|d| d.get_temp::<bool>(egui::Id::unique(("layer_open", first.0)))).unwrap_or(false);
         assert!(!open(&h), "closed while nothing on it is selected");
         h.state_mut().run("selection.set", json!({"ids": [id]})).unwrap();
         h.run_steps(2);
         assert!(open(&h), "selecting the object opens its layer");
         // Closed again by hand, it stays closed while the selection stays the same.
-        h.ctx.data_mut(|d| d.insert_temp(egui::Id::new(("layer_open", first.0)), false));
+        h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(("layer_open", first.0)), false));
         h.run_steps(2);
         assert!(!open(&h));
     }
@@ -760,7 +760,7 @@ mod tests {
         app.run("selection.set", json!({"ids": []})).unwrap();
         let mut h =
             Harness::builder().with_size(egui::vec2(260.0, 400.0)).with_step_dt(0.05).build_ui_state(|ui, app: &mut DesignApp| show(app, ui), app);
-        h.ctx.data_mut(|d| d.insert_temp(egui::Id::new(("layer_open", h.state().session.active().unwrap().active_layer.0)), true));
+        h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(("layer_open", h.state().session.active().unwrap().active_layer.0)), true));
         h.run_steps(2);
         let row = h.get_by_label("<rectangle>").rect().center();
         let click = |h: &mut Harness<'_, DesignApp>| {
@@ -799,7 +799,7 @@ mod tests {
         h.run_steps(2);
         let rename = |h: &mut Harness<'_, DesignApp>, key: RenameKey, typed: &str| {
             // As a slow double-click starts it (with an emptied field here, so the typing is the name).
-            h.ctx.data_mut(|d| d.insert_temp(egui::Id::new(RENAME), (key, String::new(), String::new())));
+            h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(RENAME), (key, String::new(), String::new())));
             h.run_steps(2);
             h.get_by_role(egui::accesskit::Role::TextInput).type_text(typed);
             h.run_steps(1);
@@ -809,7 +809,7 @@ mod tests {
         rename(&mut h, id, "Hero bottle");
         assert_eq!(h.state().session.active().unwrap().doc.item(ItemId(id)).unwrap().name, "Hero bottle");
         // Esc leaves the name as it was.
-        h.ctx.data_mut(|d| d.insert_temp(egui::Id::new(RENAME), (id, String::new(), String::new())));
+        h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(RENAME), (id, String::new(), String::new())));
         h.run_steps(2);
         h.get_by_role(egui::accesskit::Role::TextInput).type_text("Oops");
         h.key_press(egui::Key::Escape);
@@ -828,7 +828,7 @@ mod tests {
         let name = |h: &Harness<'_, DesignApp>| h.state().session.active().unwrap().doc.item(ItemId(id)).unwrap().name.clone();
         // As a slow double-click on the unnamed row starts it: the field shows the automatic label.
         let start = |h: &mut Harness<'_, DesignApp>| {
-            h.ctx.data_mut(|d| d.insert_temp(egui::Id::new(RENAME), (id, "Rectangle".to_string(), "Rectangle".to_string())));
+            h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique(RENAME), (id, "Rectangle".to_string(), "Rectangle".to_string())));
             h.run_steps(2);
         };
         start(&mut h);
diff --git a/crates/ui-egui/src/panels/library.rs b/crates/ui-egui/src/panels/library.rs
index 2199e571e..2b19770cf 100644
--- a/crates/ui-egui/src/panels/library.rs
+++ b/crates/ui-egui/src/panels/library.rs
@@ -4,6 +4,7 @@
 use serde_json::json;
 
 use crate::DesignApp;
+use crate::app::file_dialogs::Bound;
 use crate::theme::Tokens;
 
 pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
@@ -33,14 +34,14 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     ui.separator();
     ui.horizontal(|ui| {
         if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "New Library…"))).clicked() {
-            let path = app.pick_save("Library.dclib");
-            let _ = app.run("library.new", json!({"path": path}));
+            let asked = app.ask_save("Library.dclib", Bound::App, |app, path| app.run("library.new", json!({"path": path})));
+            report(app, "Library", asked);
         }
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Open…"))).clicked()
-            && let Some(path) = app.services.pick_open.as_mut().and_then(|f| f("library"))
-            && let Err(e) = app.run("library.open", json!({"path": path}))
-        {
-            app.status_error("Library", e);
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Open…"))).clicked() {
+            let asked = app.ask_open("library", Bound::App, |app, path| {
+                app.run("library.open", json!({"path": path})).or_else(|e| report_err(app, "Library", e))
+            });
+            report(app, "Library", asked);
         }
     });
     let Ok(items) = app.session.execute("library.list", &json!({})) else {
@@ -84,30 +85,57 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     }
 }
 
+/// A dialog that couldn't be asked for, in the status line as `feature`'s error.
+fn report(app: &mut DesignApp, feature: &str, asked: Result<serde_json::Value, String>) {
+    if let Err(e) = asked {
+        app.status_error(feature, e);
+    }
+}
+
+/// A command run with a dialog's answer failed: the status line names `feature`.
+fn report_err(app: &mut DesignApp, feature: &str, e: String) -> Result<serde_json::Value, String> {
+    app.status_error(feature, e);
+    Ok(serde_json::Value::Null)
+}
+
+/// Scripts › Load…: the chosen script becomes a new, selected one. Read through the host's
+/// reader, like every other file the UI opens: this crate has no file system of its own.
+fn load_script(app: &mut DesignApp, path: &str, sel_id: egui::Id) {
+    let read = app.services.read.as_mut().map_or_else(|| Err("no file access".to_string()), |r| r(path));
+    match read.and_then(|bytes| String::from_utf8(bytes).map_err(|e| e.to_string())) {
+        Ok(text) => {
+            let name = std::path::Path::new(path).file_stem().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "Script".into());
+            app.ui.scripts.push((name, text));
+            let sel = app.ui.scripts.len().saturating_sub(1);
+            if let Some(ctx) = &app.egui_ctx {
+                ctx.data_mut(|d| d.insert_temp(sel_id, sel));
+            }
+        }
+        Err(e) => app.status_error("Scripts", e),
+    }
+}
+
 fn book_open_buttons(app: &mut DesignApp, ui: &mut egui::Ui) {
     ui.horizontal(|ui| {
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "New Book…"))).clicked()
-            && let Some(path) = app.pick_save("Book.dcbook")
-            && let Err(e) = app.run("book.new", json!({"path": path}))
-        {
-            app.status_error("Book", e);
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "New Book…"))).clicked() {
+            let asked = app
+                .ask_save("Book.dcbook", Bound::App, |app, path| app.run("book.new", json!({"path": path})).or_else(|e| report_err(app, "Book", e)));
+            report(app, "Book", asked);
         }
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Open…"))).clicked()
-            && let Some(path) = app.services.pick_open.as_mut().and_then(|f| f("book"))
-            && let Err(e) = app.run("book.open", json!({"path": path}))
-        {
-            app.status_error("Book", e);
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Open…"))).clicked() {
+            let asked =
+                app.ask_open("book", Bound::App, |app, path| app.run("book.open", json!({"path": path})).or_else(|e| report_err(app, "Book", e)));
+            report(app, "Book", asked);
         }
     });
 }
 
 fn book_action_buttons(app: &mut DesignApp, ui: &mut egui::Ui) {
     ui.horizontal_wrapped(|ui| {
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Add Document…"))).clicked()
-            && let Some(path) = app.services.pick_open.as_mut().and_then(|f| f("open"))
-            && let Err(e) = app.run("book.add", json!({"path": path}))
-        {
-            app.status_error("Book", e);
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Add Document…"))).clicked() {
+            let asked =
+                app.ask_open("open", Bound::App, |app, path| app.run("book.add", json!({"path": path})).or_else(|e| report_err(app, "Book", e)));
+            report(app, "Book", asked);
         }
         if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Update Numbering"))).clicked() {
             let _ = app.run("book.paginate", json!({}));
@@ -115,11 +143,11 @@ fn book_action_buttons(app: &mut DesignApp, ui: &mut egui::Ui) {
         if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Synchronize"))).clicked() {
             let _ = app.run("book.syncStyles", json!({}));
         }
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Export PDF…"))).clicked()
-            && let Some(path) = app.pick_save("Book.pdf")
-            && let Err(e) = app.run("book.exportPdf", json!({"path": path}))
-        {
-            app.status_error("Book", e);
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Export PDF…"))).clicked() {
+            let asked = app.ask_save("Book.pdf", Bound::App, |app, path| {
+                app.run("book.exportPdf", json!({"path": path})).or_else(|e| report_err(app, "Book", e))
+            });
+            report(app, "Book", asked);
         }
     });
 }
@@ -173,7 +201,7 @@ pub fn book(app: &mut DesignApp, ui: &mut egui::Ui) {
 /// Scripts panel: saved command scripts — run (one undo step), edit, add, delete, load.
 pub fn scripts(app: &mut DesignApp, ui: &mut egui::Ui) {
     let t = Tokens::get(ui.ctx());
-    let sel_id = egui::Id::new("scripts_sel");
+    let sel_id = egui::Id::unique("scripts_sel");
     let mut sel: usize = ui.data(|d| d.get_temp(sel_id)).unwrap_or(0);
     if app.ui.scripts.is_empty() {
         crate::rtl::label(
@@ -200,20 +228,12 @@ pub fn scripts(app: &mut DesignApp, ui: &mut egui::Ui) {
             app.ui.scripts.push((format!("Script {}", app.ui.scripts.len() + 1), "# command.id {json} per line\n".into()));
             sel = app.ui.scripts.len() - 1;
         }
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Load…"))).clicked()
-            && let Some(path) = app.services.pick_open.as_mut().and_then(|f| f("script"))
-        {
-            // Through the host's reader, like every other file the UI opens: this crate has no
-            // file system of its own.
-            let read = app.services.read.as_mut().map_or_else(|| Err("no file access".to_string()), |r| r(&path));
-            match read.and_then(|bytes| String::from_utf8(bytes).map_err(|e| e.to_string())) {
-                Ok(text) => {
-                    let name = std::path::Path::new(&path).file_stem().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "Script".into());
-                    app.ui.scripts.push((name, text));
-                    sel = app.ui.scripts.len() - 1;
-                }
-                Err(e) => app.status_error("Scripts", e),
-            }
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Load…"))).clicked() {
+            let asked = app.ask_open("script", Bound::App, move |app, path| {
+                load_script(app, &path, sel_id);
+                Ok(serde_json::Value::Null)
+            });
+            report(app, "Scripts", asked);
         }
         if ui
             .add_enabled(!app.ui.scripts.is_empty(), egui::Button::new(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Delete"))))
diff --git a/crates/ui-egui/src/panels/notes.rs b/crates/ui-egui/src/panels/notes.rs
index 6eebb7411..ee6cc17a5 100644
--- a/crates/ui-egui/src/panels/notes.rs
+++ b/crates/ui-egui/src/panels/notes.rs
@@ -1,5 +1,5 @@
-//! Notes panel: the document's editorial notes; add one at the text cursor, go to, convert or
-//! delete a note.
+//! Notes panel: the document's editorial notes; add one at the text cursor, go to, convert,
+//! split or delete a note.
 
 use serde_json::json;
 
@@ -11,7 +11,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     let Ok(list) = app.session.execute("note.list", &json!({})) else { return };
     let notes = list.as_array().cloned().unwrap_or_default();
     let has_text = app.session.active().is_some_and(|d| d.selection.text.is_some());
-    let id = egui::Id::new("new_note_text");
+    let id = egui::Id::unique("new_note_text");
     let mut draft: String = ui.data(|d| d.get_temp(id)).unwrap_or_default();
     ui.add(
         egui::TextEdit::multiline(&mut draft)
@@ -46,7 +46,10 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
             if !author.is_empty() {
                 ui.label(egui::RichText::new(author).size(10.5).color(t.text_dim));
             }
-            ui.label(n["text"].as_str().unwrap_or(""));
+            let mut text = n["text"].as_str().unwrap_or("");
+            let text_id = egui::Id::unique(("note_text", story.as_u64(), nid.as_u64()));
+            ui.add(egui::TextEdit::multiline(&mut text).id(text_id).frame(egui::Frame::NONE).desired_rows(1).desired_width(f32::INFINITY));
+            let split_at = split_point(ui.ctx(), text_id, text);
             ui.horizontal(|ui| {
                 if ui.small_button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Go To"))).clicked() {
                     let _ = app.run("text.select", json!({"story": story, "anchor": at, "focus": at + 3}));
@@ -54,6 +57,13 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                 if ui.small_button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Convert to Text"))).clicked() {
                     let _ = app.run("note.convertToText", json!({"story": story, "id": nid}));
                 }
+                let split = egui::Button::new(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Split Note"))).small();
+                if ui.add_enabled(split_at.is_some(), split).clicked()
+                    && let Some(at) = split_at
+                    && let Err(e) = app.run("note.split", json!({"story": story, "id": nid, "at": at}))
+                {
+                    app.status_error("Notes", e);
+                }
                 if ui.small_button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Delete"))).clicked() {
                     let _ = app.run("note.delete", json!({"story": story, "id": nid}));
                 }
@@ -61,3 +71,60 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         });
     }
 }
+
+/// The byte offset of the insertion point in a note's text field, when it lies strictly inside
+/// the text and selects nothing.
+fn split_point(ctx: &egui::Context, id: egui::Id, text: &str) -> Option<usize> {
+    let r = egui::TextEdit::load_state(ctx, id)?.cursor.char_range()?;
+    let k: usize = r.primary.index.into();
+    if r.primary.index != r.secondary.index || k == 0 {
+        return None;
+    }
+    text.char_indices().nth(k).map(|(i, _)| i)
+}
+
+#[cfg(test)]
+mod tests {
+    use egui_kittest::Harness;
+    use egui_kittest::kittest::{NodeT, Queryable};
+
+    use super::*;
+
+    #[test]
+    fn split_note_splits_the_note_at_the_insertion_point_in_its_text() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        let r = app.run("frame.create", json!({"rect": [72, 72, 400, 300], "content": "text", "text": "Draft copy."})).unwrap();
+        app.run("text.select", json!({"story": r["story"], "anchor": 5, "focus": 5})).unwrap();
+        app.run("note.new", json!({"text": "check this", "author": "Ed"})).unwrap();
+        let mut h = Harness::builder().with_size(egui::vec2(320.0, 400.0)).build_ui_state(
+            |ui, app: &mut DesignApp| {
+                let id = egui::Id::unique("test_fonts");
+                if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
+                    crate::theme::install_fonts(ui.ctx(), "");
+                    ui.data_mut(|d| d.insert_temp(id, true));
+                    return;
+                }
+                show(app, ui);
+            },
+            app,
+        );
+        h.run_steps(3);
+        assert!(h.get_by_label("Split Note").accesskit_node().is_disabled(), "no insertion point in the note yet");
+        let field = h.get_by(|n| n.role() == egui::accesskit::Role::MultilineTextInput && n.value().as_deref() == Some("check this")).rect();
+        h.hover_at(field.center());
+        h.drag_at(field.center());
+        h.drop_at(field.center());
+        h.run_steps(2);
+        h.key_press(egui::Key::Home);
+        for _ in 0..6 {
+            h.key_press(egui::Key::ArrowRight);
+        }
+        h.run_steps(2);
+        h.get_by_label("Split Note").click();
+        h.run_steps(3);
+        let list = h.state_mut().session.execute("note.list", &json!({})).unwrap();
+        let texts: Vec<_> = list.as_array().unwrap().iter().map(|n| (n["text"].clone(), n["author"].clone())).collect();
+        assert_eq!(texts, [(json!("check "), json!("Ed")), (json!("this"), json!("Ed"))]);
+    }
+}
diff --git a/crates/ui-egui/src/panels/pages.rs b/crates/ui-egui/src/panels/pages.rs
index 534eb4aa1..22f93ae8c 100644
--- a/crates/ui-egui/src/panels/pages.rs
+++ b/crates/ui-egui/src/panels/pages.rs
@@ -54,7 +54,7 @@ fn thumb(app: &mut DesignApp, ctx: &egui::Context, of: ThumbOf, h: f32) -> Optio
             let view = designcraft_geom::Affine::scale(scale) * designcraft_geom::Affine::translate(-b.origin().to_vec2());
             let o = designcraft_render::RenderOptions { background: Some([255, 255, 255, 255]), ..opts };
             let placed = [designcraft_render::Placed { spread: SpreadRef::Parent(i), xf: designcraft_geom::Affine::IDENTITY }];
-            (r.render(&st.doc, &app.session.cache, &placed, w, h, view, &o), format!("thumbp{}", id.0))
+            (r.render(&st.doc, &app.session.cache, &placed, (w, h), view, &o), format!("thumbp{}", id.0))
         }
     };
     let ci = egui::ColorImage::from_rgba_premultiplied([img.width as usize, img.height as usize], &img.pixels);
@@ -366,7 +366,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                             t.text_strong,
                         );
                     }
-                    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, active, label));
+                    resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, active, label));
                     let resp = if opts.parents_vertical { resp } else { resp.on_hover_text(label) };
                     resp.dnd_set_drag_payload(PageDrag::Parent(row.parent.map(|(_, id)| id)));
                     if resp.double_clicked()
@@ -448,11 +448,11 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                         let abs = first + pi;
                         let x0 = row.min.x + center + (p.x as f32 - spine) * scale;
                         let pr = egui::Rect::from_min_size(egui::pos2(x0, top), vec2(p.width as f32 * scale, p.height as f32 * scale));
-                        let resp = ui.interact(pr, ui.id().with(("page", abs)), Sense::click_and_drag());
+                        let resp = ui.interact(pr, ui.scope_id().with(("page", abs)), Sense::click_and_drag());
                         let selected = abs == cur && !editing_parents;
                         // Screen readers hear "Page 3".
                         resp.widget_info(|| {
-                            egui::WidgetInfo::selected(egui::WidgetType::Button, true, selected, format!("Page {}", app.session.page_label(abs)))
+                            egui::WidgetInfo::selected(egui::Role::Button, true, selected, format!("Page {}", app.session.page_label(abs)))
                         });
                         let tint = if selected { SELECTED_TINT } else { Color32::WHITE };
                         match thumbnails.then(|| thumb(app, ui.ctx(), ThumbOf::Page(abs), th)).flatten() {
@@ -547,7 +547,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
             let dy = dresp.drag_delta().y * if opts.pages_on_top { -1.0 } else { 1.0 };
             app.ui.pages_parents_height = Some([(parents_h + dy).clamp(parents_min, parents_max), space]);
         }
-        dresp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Other, true, "Parents and pages divider"));
+        dresp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Splitter, true, "Parents and pages divider"));
     };
     if opts.pages_on_top {
         pages_part(app, ui);
@@ -771,7 +771,7 @@ fn page_menu(app: &mut DesignApp, ui: &mut egui::Ui, doc: &designcraft_doc::Docu
 /// A small label following the pointer while dragging.
 pub(crate) fn drag_ghost(ui: &egui::Ui, label: &str, t: &Tokens) {
     let Some(p) = ui.ctx().pointer_interact_pos() else { return };
-    let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("page_drag")));
+    let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("page_drag")));
     let g = painter.layout_no_wrap(label.to_string(), egui::FontId::proportional(11.0), t.text_strong);
     let r = egui::Rect::from_min_size(p + vec2(10.0, 8.0), g.size() + vec2(10.0, 6.0));
     painter.rect(r, 2.0, t.panel_darker, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
@@ -779,367 +779,4 @@ pub(crate) fn drag_ghost(ui: &egui::Ui, label: &str, t: &Tokens) {
 }
 
 #[cfg(test)]
-mod tests {
-    use egui::{Event, Modifiers, PointerButton};
-    use egui_kittest::{
-        Harness,
-        kittest::{NodeT, Queryable},
-    };
-
-    use super::*;
-    use crate::test_window;
-
-    #[test]
-    fn parent_context_menu_deletes_the_clicked_id_even_with_a_shared_prefix() {
-        for vertical in [true, false] {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.run("file.new", json!({"pages": 2, "facingPages": false})).unwrap();
-            app.ui.pages_panel.parents_vertical = vertical;
-            let original = app.session.doc().unwrap().doc.parents[0].id;
-            let added = app.run("layout.parents.new", json!({"prefix": "A", "name": "Other"})).unwrap()["id"].as_u64().unwrap();
-            let mut h = harness(app);
-            // Target the actual parent row in either panel layout, not a menu helper.
-            h.get_by_label("A-Other").click_secondary();
-            h.run_steps(3);
-            h.get_by_label("Delete Parent").click();
-            h.run_steps(3);
-            let doc = &h.state().session.doc().unwrap().doc;
-            assert_eq!(doc.parents.len(), 1);
-            assert_eq!(doc.parents[0].id, original);
-            assert!(doc.parents.iter().all(|p| p.id.0 != added));
-            assert_eq!(doc.page_count(), 2, "document pages are not deleted");
-            h.state_mut().run("edit.undo", json!({})).unwrap();
-            assert_eq!(h.state().session.doc().unwrap().doc.parents.len(), 2);
-        }
-    }
-
-    #[test]
-    fn double_clicking_a_parent_shows_that_parent() {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        for prefix in ["B", "C", "D"] {
-            app.run("layout.parents.new", json!({"prefix": prefix})).unwrap();
-        }
-        app.ui.dock_tab = "pages".into();
-        let mut h = test_window::open(app, vec2(1400.0, 900.0));
-        let names = ["A-Parent", "B-Parent", "C-Parent", "D-Parent"];
-        for name in names {
-            assert_ne!(h.get_by_label(name).accesskit_node().toggled(), Some(egui::accesskit::Toggled::True), "{name} is not selected yet");
-        }
-        // Both clicks in one frame: the harness's event queue spaces events too far apart for a
-        // double click.
-        let at = h.get_by_label("C-Parent").rect().center();
-        h.input_mut().events.push(Event::PointerMoved(at));
-        for pressed in [true, false, true, false] {
-            h.input_mut().events.push(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
-        }
-        h.run_steps(4);
-        let app = &h.state().app;
-        assert!(app.session.active().unwrap().editing_parents);
-        let st = app.session.active().unwrap();
-        let layout = designcraft_tools::CanvasLayout::new(&st.doc, true);
-        let slot = crate::canvas::current_slot(app, &layout).unwrap();
-        assert_eq!(layout.slots[slot].spread, designcraft_doc::SpreadRef::Parent(2));
-        for name in names {
-            assert_eq!(h.get_by_label(name).accesskit_node().toggled() == Some(egui::accesskit::Toggled::True), name == "C-Parent", "{name}");
-        }
-        // Parent rows show a rendered thumbnail.
-        let id = st.doc.parents[2].id;
-        let rev = (st.uid, st.revision);
-        let thumbs = super::THUMBS.lock().unwrap();
-        assert!(thumbs.as_ref().unwrap().keys().any(|k| (k.0, k.1) == rev && k.2 == super::ThumbOf::Parent(id)));
-    }
-
-    fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
-        sized_harness(app, vec2(280.0, 520.0))
-    }
-
-    fn sized_harness(app: DesignApp, size: egui::Vec2) -> Harness<'static, DesignApp> {
-        let mut h = Harness::builder().with_size(size).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let key = egui::Id::new("test_fonts");
-                if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
-                    crate::theme::install_fonts(ui.ctx(), "");
-                    ui.data_mut(|d| d.insert_temp(key, true));
-                    return;
-                }
-                show(app, ui);
-            },
-            app,
-        );
-        h.run_steps(3);
-        h
-    }
-
-    /// Release a dragged page over `at`.
-    fn drop_page(h: &mut Harness<'_, DesignApp>, page: usize, at: egui::Pos2, alt: bool) {
-        let modifiers = egui::Modifiers { alt, ..Default::default() };
-        h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: true, modifiers });
-        egui::DragAndDrop::set_payload(&h.ctx, PageDrag::Page(page));
-        h.event(egui::Event::PointerMoved(at));
-        h.run_steps(2);
-        h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: false, modifiers });
-        h.run_steps(3);
-    }
-
-    /// The page menu for page `abs` of spread `si`.
-    fn menu_harness(app: DesignApp, abs: usize, si: usize) -> Harness<'static, DesignApp> {
-        let mut h = Harness::builder().with_size(vec2(320.0, 600.0)).build_ui_state(
-            move |ui, app: &mut DesignApp| {
-                let key = egui::Id::new("test_fonts");
-                if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
-                    crate::theme::install_fonts(ui.ctx(), "");
-                    ui.data_mut(|d| d.insert_temp(key, true));
-                    return;
-                }
-                let doc = app.session.doc().unwrap().doc.clone();
-                page_menu(app, ui, &doc, abs, si);
-            },
-            app,
-        );
-        h.run_steps(3);
-        h
-    }
-
-    #[test]
-    fn a_page_in_a_spread_offers_delete_page_and_delete_spread() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 5, "facingPages": true})).unwrap();
-        let doc = app.session.doc().unwrap().doc.clone();
-        let (si, _) = doc.page_loc(2).unwrap();
-        assert_eq!(doc.spreads[si].pages.len(), 2);
-        let mut h = menu_harness(app, 2, si);
-        let _ = h.get_by_label("Delete Spread");
-        h.get_by_label("Delete Page").click();
-        h.run_steps(3);
-        assert_eq!(h.state().session.doc().unwrap().doc.page_count(), 4, "only the clicked page");
-    }
-
-    /// As in InDesign: deleting a page with objects asks first; an empty page goes at once, and
-    /// "Don't show again" stops the question.
-    #[test]
-    fn deleting_a_page_with_objects_asks_first() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 5, "facingPages": true})).unwrap();
-        let doc = app.session.doc().unwrap().doc.clone();
-        let (si, pi) = doc.page_loc(2).unwrap();
-        let x = doc.spreads[si].pages[pi].x;
-        app.run("frame.create", json!({"spread": si, "rect": [x + 36.0, 36.0, x + 200.0, 200.0]})).unwrap();
-        let count = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().doc.page_count();
-        let mut h = menu_harness(app, 2, si);
-        h.get_by_label("Delete Page").click();
-        h.run_steps(3);
-        assert_eq!(count(&h), 5, "nothing deleted yet");
-        let d = h.state().ui.dialog.clone().unwrap();
-        assert_eq!((d.id.as_str(), d.fields["pages"].clone()), ("deletePages", json!([2])));
-        // Cancel keeps the page.
-        crate::dialogs::cancel(h.state_mut());
-        assert_eq!(count(&h), 5);
-        // The whole spread: one question for both pages.
-        h.get_by_label("Delete Spread").click();
-        h.run_steps(3);
-        assert_eq!(h.state().ui.dialog.as_ref().unwrap().fields["pages"], json!([1, 2]));
-        crate::dialogs::cancel(h.state_mut());
-        // OK deletes it.
-        h.get_by_label("Delete Page").click();
-        h.run_steps(3);
-        crate::dialogs::confirm(h.state_mut()).unwrap();
-        assert_eq!(count(&h), 4);
-        assert!(!h.state().ui.skip_delete_pages_warning);
-        // An empty page goes without a question.
-        let app = h.state_mut();
-        crate::dialogs::delete_pages(app, vec![0]).unwrap();
-        assert!(app.ui.dialog.is_none());
-        assert_eq!(app.session.doc().unwrap().doc.page_count(), 3);
-        // "Don't show again".
-        let doc = app.session.doc().unwrap().doc.clone();
-        let (si, pi) = doc.page_loc(1).unwrap();
-        let x = doc.spreads[si].pages[pi].x;
-        app.run("frame.create", json!({"spread": si, "rect": [x + 36.0, 36.0, x + 200.0, 200.0]})).unwrap();
-        app.run("frame.create", json!({"spread": si, "rect": [x + 36.0, 300.0, x + 200.0, 400.0]})).unwrap();
-        crate::dialogs::delete_pages(app, vec![1]).unwrap();
-        app.ui.dialog.as_mut().unwrap().fields.insert("dontShowAgain".into(), json!(true));
-        crate::dialogs::confirm(app).unwrap();
-        assert!(app.ui.skip_delete_pages_warning);
-        assert_eq!(app.session.doc().unwrap().doc.page_count(), 2);
-        let doc = app.session.doc().unwrap().doc.clone();
-        let (si, pi) = doc.page_loc(0).unwrap();
-        let x = doc.spreads[si].pages[pi].x;
-        app.run("frame.create", json!({"spread": si, "rect": [x + 36.0, 36.0, x + 200.0, 200.0]})).unwrap();
-        crate::dialogs::delete_pages(app, vec![0]).unwrap();
-        assert!(app.ui.dialog.is_none(), "no more questions");
-        assert_eq!(app.session.doc().unwrap().doc.page_count(), 1);
-    }
-
-    /// As InDesign's: the footer stays at the bottom however many pages there are, and the
-    /// divider between parents and pages shows more or fewer parents.
-    #[test]
-    fn the_footer_stays_put_and_the_divider_resizes_the_parents() {
-        use egui::{Event, Modifiers, PointerButton};
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 60, "facingPages": true})).unwrap();
-        for prefix in ["B", "C", "D", "E", "F", "G"] {
-            app.run("layout.parents.new", json!({"prefix": prefix})).unwrap();
-        }
-        app.ui.dock_tab = "pages".into();
-        let mut h = crate::test_window::open(app, vec2(1400.0, 900.0));
-        let window = egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(1400.0, 900.0));
-        for label in ["60 Pages in 31 Spreads", "Create new page", "Delete selected pages"] {
-            assert!(window.contains_rect(h.get_by_label(label).rect()), "{label} is on screen");
-        }
-        // Seven parent rows: four and a half show at first; the rest scroll.
-        let divider = h.get_by_label("Parents and pages divider").rect();
-        let before = divider.center().y;
-        assert!(h.query_by_label("G-Parent").is_none_or(|n| n.rect().top() > divider.top()), "the last parent is scrolled away");
-        let (a, b) = (divider.center(), divider.center() + vec2(0.0, 80.0));
-        h.input_mut().events.push(Event::PointerMoved(a));
-        h.input_mut().events.push(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-        h.step();
-        for k in 1..=4 {
-            h.input_mut().events.push(Event::PointerMoved(a + (b - a) * (k as f32 / 4.0)));
-            h.step();
-        }
-        h.input_mut().events.push(Event::PointerButton { pos: b, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-        h.run_steps(3);
-        let after = h.get_by_label("Parents and pages divider").rect().center().y;
-        assert!(after > before + 40.0, "the divider moved down: {before} → {after}");
-        assert!(h.state().app.ui.pages_parents_height.is_some());
-        assert!(window.contains_rect(h.get_by_label("Create new page").rect()), "the footer is still there");
-    }
-
-    /// InDesign's Panel Options: thumbnail sizes, blank pages without thumbnails, parents side by
-    /// side, pages on top.
-    #[test]
-    fn panel_options_size_and_arrange_the_panel() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 6, "facingPages": true})).unwrap();
-        app.run("layout.parents.new", json!({"prefix": "B"})).unwrap();
-        app.ui.dock_tab = "pages".into();
-        let mut h = crate::test_window::open(app, vec2(1400.0, 900.0));
-        let page = |h: &Harness<'_, crate::test_window::Window>| h.get_by_label("Page 1").rect();
-        let medium = page(&h).height();
-        // The right-click menu on the panel's empty part leads to Panel Options.
-        let empty = h.get_by_label("Create new page").rect().center() - vec2(0.0, 60.0);
-        h.input_mut().events.push(egui::Event::PointerMoved(empty));
-        for pressed in [true, false] {
-            h.input_mut().events.push(egui::Event::PointerButton {
-                pos: empty,
-                button: egui::PointerButton::Secondary,
-                pressed,
-                modifiers: egui::Modifiers::NONE,
-            });
-        }
-        h.run_steps(3);
-        h.get_by_label("Panel Options…").click();
-        h.run_steps(3);
-        let d = h.state().app.ui.dialog.clone().unwrap();
-        assert_eq!(
-            (d.id.as_str(), d.fields["pageSize"].clone(), d.fields["parentSize"].clone(), d.fields["layout"].clone()),
-            ("pagesPanelOptions", json!("medium"), json!("small"), json!("parentsOnTop"))
-        );
-        // Jumbo pages, parents side by side, pages on top.
-        let set = |h: &mut Harness<'_, crate::test_window::Window>, k: &str, v: serde_json::Value| {
-            h.state_mut().app.ui.dialog.as_mut().unwrap().fields.insert(k.into(), v);
-        };
-        set(&mut h, "pageSize", json!("jumbo"));
-        set(&mut h, "parentsVertical", json!(false));
-        set(&mut h, "layout", json!("pagesOnTop"));
-        crate::dialogs::confirm(&mut h.state_mut().app).unwrap();
-        h.run_steps(4);
-        assert!(page(&h).height() > 2.5 * medium, "Jumbo: {} vs {medium}", page(&h).height());
-        let o = &h.state().app.ui.pages_panel;
-        assert_eq!((o.page_size, o.parents_vertical, o.pages_on_top), (IconSize::Jumbo, false, true));
-        // Pages on top: the parents come after the pages; side by side: [None] and A sit in one row.
-        let (none, a) = (h.get_by_label("[None]").rect(), h.get_by_label("A-Parent").rect());
-        assert!(none.top() > page(&h).top(), "parents below the pages");
-        assert!((none.top() - a.top()).abs() < 1.0 && a.left() > none.right(), "side by side");
-        // Extra Small: no thumbnails, just pages.
-        crate::panels::pages::open_panel_options(&mut h.state_mut().app);
-        set(&mut h, "pageSize", json!("extraSmall"));
-        crate::dialogs::confirm(&mut h.state_mut().app).unwrap();
-        h.run_steps(4);
-        assert!(page(&h).height() < 0.5 * medium);
-    }
-
-    /// Panel Options' parent size sets the height of the parents' rendered thumbnails (cached per
-    /// parent and size), and Show Thumbnails off leaves them blank.
-    /// Parent rows taller than the room left for the parents (Extra Large or Jumbo in a short
-    /// panel) draw and drag without a panic.
-    #[test]
-    fn large_parent_rows_in_a_short_panel_do_not_panic() {
-        use egui::{Event, Modifiers, PointerButton};
-        for size in [IconSize::ExtraLarge, IconSize::Jumbo] {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.run("file.new", json!({"pages": 4})).unwrap();
-            app.ui.pages_panel.parent_size = size;
-            let mut h = sized_harness(app, vec2(260.0, 160.0));
-            let a = h.get_by_label("Parents and pages divider").rect().center();
-            h.input_mut().events.push(Event::PointerMoved(a));
-            h.input_mut().events.push(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-            h.step();
-            for dy in [20.0, 40.0, -60.0] {
-                h.input_mut().events.push(Event::PointerMoved(a + vec2(0.0, dy)));
-                h.step();
-            }
-            h.input_mut().events.push(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-            h.run_steps(2);
-            assert!(h.state().ui.pages_parents_height.is_some(), "{size:?}: the divider was dragged");
-        }
-    }
-
-    #[test]
-    fn parent_thumbnails_follow_panel_options() {
-        let parent_thumb_heights = |thumbnails: bool| {
-            let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-            app.run("file.new", json!({})).unwrap();
-            app.ui.dock_tab = "pages".into();
-            app.ui.pages_panel.parent_size = IconSize::Large;
-            app.ui.pages_panel.parent_thumbnails = thumbnails;
-            let h = crate::test_window::open(app, vec2(1400.0, 900.0));
-            let st = h.state().app.session.active().unwrap();
-            let id = st.doc.parents[0].id;
-            let thumbs = super::THUMBS.lock().unwrap();
-            let keys = thumbs.as_ref().map(|m| m.keys().copied().collect::<Vec<_>>()).unwrap_or_default();
-            keys.into_iter().filter(|k| k.0 == st.uid && k.2 == super::ThumbOf::Parent(id)).map(|k| k.3).collect::<Vec<_>>()
-        };
-        assert_eq!(parent_thumb_heights(true), vec![IconSize::Large.row_h() as u32 - 5]);
-        assert_eq!(parent_thumb_heights(false), Vec::<u32>::new());
-    }
-
-    #[test]
-    fn the_panel_menu_follows_indesigns_order() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 2, "facingPages": false})).unwrap();
-        let mut h = menu_harness(app, 0, 0);
-        assert!(h.query_by_label("Delete Spread").is_none(), "a single-page spread has no Delete Spread");
-        // InDesign's items, top to bottom.
-        let ys: Vec<f32> = ["Insert Pages…", "Move Pages…", "Duplicate Spread", "Duplicate Spread at End of Document", "Delete Page", "New Parent…"]
-            .iter()
-            .map(|l| h.get_by_label(l).rect().center().y)
-            .collect();
-        assert!(ys.windows(2).all(|w| w[0] < w[1]), "{ys:?}");
-        h.get_by_label("Duplicate Spread at End of Document").click();
-        h.run_steps(3);
-        assert_eq!(h.state().session.doc().unwrap().doc.page_count(), 3);
-        h.get_by_label("Insert Pages…").click();
-        h.run_steps(3);
-        assert!(h.state().ui.dialog.as_ref().is_some_and(|d| d.id == "cmd:layout.pages.insert"));
-    }
-
-    #[test]
-    fn a_page_dropped_on_create_new_page_is_duplicated_at_the_end() {
-        // Chris Cicchino's Page Tool video (2:06): "click and drag onto my plus sign I can duplicate that".
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"width": 252, "height": 144, "facingPages": false})).unwrap();
-        app.run("layout.pages.insert", json!({"count": 1})).unwrap();
-        app.run("layout.pageSize", json!({"pages": [2], "width": 612, "height": 792})).unwrap();
-        let mut h = harness(app);
-        let plus = h.get_by_label("Create new page").rect().center();
-        drop_page(&mut h, 1, plus, false);
-        let d = h.state().session.doc().unwrap().doc.clone();
-        assert_eq!(d.page_count(), 3);
-        let (si, pi) = d.page_loc(2).unwrap();
-        assert_eq!(d.spreads[si].pages[pi].width, 612.0, "a copy of the letterhead");
-        let _ = h.get_by_label("Edit page size");
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/panels/pages/tests.rs b/crates/ui-egui/src/panels/pages/tests.rs
new file mode 100644
index 000000000..e70c16f9b
--- /dev/null
+++ b/crates/ui-egui/src/panels/pages/tests.rs
@@ -0,0 +1,364 @@
+use egui::{Event, Modifiers, PointerButton};
+use egui_kittest::{
+    Harness,
+    kittest::{NodeT, Queryable},
+};
+
+use super::*;
+use crate::test_window;
+
+#[test]
+fn parent_context_menu_deletes_the_clicked_id_even_with_a_shared_prefix() {
+    for vertical in [true, false] {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({"pages": 2, "facingPages": false})).unwrap();
+        app.ui.pages_panel.parents_vertical = vertical;
+        let original = app.session.doc().unwrap().doc.parents[0].id;
+        let added = app.run("layout.parents.new", json!({"prefix": "A", "name": "Other"})).unwrap()["id"].as_u64().unwrap();
+        let mut h = harness(app);
+        // Target the actual parent row in either panel layout, not a menu helper.
+        h.get_by_label("A-Other").click_secondary();
+        h.run_steps(3);
+        h.get_by_label("Delete Parent").click();
+        h.run_steps(3);
+        let doc = &h.state().session.doc().unwrap().doc;
+        assert_eq!(doc.parents.len(), 1);
+        assert_eq!(doc.parents[0].id, original);
+        assert!(doc.parents.iter().all(|p| p.id.0 != added));
+        assert_eq!(doc.page_count(), 2, "document pages are not deleted");
+        h.state_mut().run("edit.undo", json!({})).unwrap();
+        assert_eq!(h.state().session.doc().unwrap().doc.parents.len(), 2);
+    }
+}
+
+#[test]
+fn double_clicking_a_parent_shows_that_parent() {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    for prefix in ["B", "C", "D"] {
+        app.run("layout.parents.new", json!({"prefix": prefix})).unwrap();
+    }
+    app.ui.dock_tab = "pages".into();
+    let mut h = test_window::open(app, vec2(1400.0, 900.0));
+    let names = ["A-Parent", "B-Parent", "C-Parent", "D-Parent"];
+    for name in names {
+        assert_ne!(h.get_by_label(name).accesskit_node().toggled(), Some(egui::accesskit::Toggled::True), "{name} is not selected yet");
+    }
+    // Both clicks in one frame: the harness's event queue spaces events too far apart for a
+    // double click.
+    let at = h.get_by_label("C-Parent").rect().center();
+    h.input_mut().events.push(Event::PointerMoved(at));
+    for pressed in [true, false, true, false] {
+        h.input_mut().events.push(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
+    }
+    h.run_steps(4);
+    let app = &h.state().app;
+    assert!(app.session.active().unwrap().editing_parents);
+    let st = app.session.active().unwrap();
+    let layout = designcraft_tools::CanvasLayout::new(&st.doc, true);
+    let slot = crate::canvas::current_slot(app, &layout).unwrap();
+    assert_eq!(layout.slots[slot].spread, designcraft_doc::SpreadRef::Parent(2));
+    for name in names {
+        assert_eq!(h.get_by_label(name).accesskit_node().toggled() == Some(egui::accesskit::Toggled::True), name == "C-Parent", "{name}");
+    }
+    // Parent rows show a rendered thumbnail.
+    let id = st.doc.parents[2].id;
+    let rev = (st.uid, st.revision);
+    let thumbs = super::THUMBS.lock().unwrap();
+    assert!(thumbs.as_ref().unwrap().keys().any(|k| (k.0, k.1) == rev && k.2 == super::ThumbOf::Parent(id)));
+}
+
+fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
+    sized_harness(app, vec2(280.0, 520.0))
+}
+
+fn sized_harness(app: DesignApp, size: egui::Vec2) -> Harness<'static, DesignApp> {
+    let mut h = Harness::builder().with_size(size).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let key = egui::Id::unique("test_fonts");
+            if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
+                crate::theme::install_fonts(ui.ctx(), "");
+                ui.data_mut(|d| d.insert_temp(key, true));
+                return;
+            }
+            show(app, ui);
+        },
+        app,
+    );
+    h.run_steps(3);
+    h
+}
+
+/// Release a dragged page over `at`.
+fn drop_page(h: &mut Harness<'_, DesignApp>, page: usize, at: egui::Pos2, alt: bool) {
+    let modifiers = egui::Modifiers { alt, ..Default::default() };
+    h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: true, modifiers });
+    egui::DragAndDrop::set_payload(&h.ctx, PageDrag::Page(page));
+    h.event(egui::Event::PointerMoved(at));
+    h.run_steps(2);
+    h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: false, modifiers });
+    h.run_steps(3);
+}
+
+/// The page menu for page `abs` of spread `si`.
+fn menu_harness(app: DesignApp, abs: usize, si: usize) -> Harness<'static, DesignApp> {
+    let mut h = Harness::builder().with_size(vec2(320.0, 600.0)).build_ui_state(
+        move |ui, app: &mut DesignApp| {
+            let key = egui::Id::unique("test_fonts");
+            if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
+                crate::theme::install_fonts(ui.ctx(), "");
+                ui.data_mut(|d| d.insert_temp(key, true));
+                return;
+            }
+            let doc = app.session.doc().unwrap().doc.clone();
+            page_menu(app, ui, &doc, abs, si);
+        },
+        app,
+    );
+    h.run_steps(3);
+    h
+}
+
+#[test]
+fn a_page_in_a_spread_offers_delete_page_and_delete_spread() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 5, "facingPages": true})).unwrap();
+    let doc = app.session.doc().unwrap().doc.clone();
+    let (si, _) = doc.page_loc(2).unwrap();
+    assert_eq!(doc.spreads[si].pages.len(), 2);
+    let mut h = menu_harness(app, 2, si);
+    let _ = h.get_by_label("Delete Spread");
+    h.get_by_label("Delete Page").click();
+    h.run_steps(3);
+    assert_eq!(h.state().session.doc().unwrap().doc.page_count(), 4, "only the clicked page");
+}
+
+/// As in InDesign: deleting a page with objects asks first; an empty page goes at once, and
+/// "Don't show again" stops the question.
+#[test]
+fn deleting_a_page_with_objects_asks_first() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 5, "facingPages": true})).unwrap();
+    let doc = app.session.doc().unwrap().doc.clone();
+    let (si, pi) = doc.page_loc(2).unwrap();
+    let x = doc.spreads[si].pages[pi].x;
+    app.run("frame.create", json!({"spread": si, "rect": [x + 36.0, 36.0, x + 200.0, 200.0]})).unwrap();
+    let count = |h: &Harness<'_, DesignApp>| h.state().session.doc().unwrap().doc.page_count();
+    let mut h = menu_harness(app, 2, si);
+    h.get_by_label("Delete Page").click();
+    h.run_steps(3);
+    assert_eq!(count(&h), 5, "nothing deleted yet");
+    let d = h.state().ui.dialog.clone().unwrap();
+    assert_eq!((d.id.as_str(), d.fields["pages"].clone()), ("deletePages", json!([2])));
+    // Cancel keeps the page.
+    crate::dialogs::cancel(h.state_mut());
+    assert_eq!(count(&h), 5);
+    // The whole spread: one question for both pages.
+    h.get_by_label("Delete Spread").click();
+    h.run_steps(3);
+    assert_eq!(h.state().ui.dialog.as_ref().unwrap().fields["pages"], json!([1, 2]));
+    crate::dialogs::cancel(h.state_mut());
+    // OK deletes it.
+    h.get_by_label("Delete Page").click();
+    h.run_steps(3);
+    crate::dialogs::confirm(h.state_mut()).unwrap();
+    assert_eq!(count(&h), 4);
+    assert!(!h.state().ui.skip_delete_pages_warning);
+    // An empty page goes without a question.
+    let app = h.state_mut();
+    crate::dialogs::delete_pages(app, vec![0]).unwrap();
+    assert!(app.ui.dialog.is_none());
+    assert_eq!(app.session.doc().unwrap().doc.page_count(), 3);
+    // "Don't show again".
+    let doc = app.session.doc().unwrap().doc.clone();
+    let (si, pi) = doc.page_loc(1).unwrap();
+    let x = doc.spreads[si].pages[pi].x;
+    app.run("frame.create", json!({"spread": si, "rect": [x + 36.0, 36.0, x + 200.0, 200.0]})).unwrap();
+    app.run("frame.create", json!({"spread": si, "rect": [x + 36.0, 300.0, x + 200.0, 400.0]})).unwrap();
+    crate::dialogs::delete_pages(app, vec![1]).unwrap();
+    app.ui.dialog.as_mut().unwrap().fields.insert("dontShowAgain".into(), json!(true));
+    crate::dialogs::confirm(app).unwrap();
+    assert!(app.ui.skip_delete_pages_warning);
+    assert_eq!(app.session.doc().unwrap().doc.page_count(), 2);
+    let doc = app.session.doc().unwrap().doc.clone();
+    let (si, pi) = doc.page_loc(0).unwrap();
+    let x = doc.spreads[si].pages[pi].x;
+    app.run("frame.create", json!({"spread": si, "rect": [x + 36.0, 36.0, x + 200.0, 200.0]})).unwrap();
+    crate::dialogs::delete_pages(app, vec![0]).unwrap();
+    assert!(app.ui.dialog.is_none(), "no more questions");
+    assert_eq!(app.session.doc().unwrap().doc.page_count(), 1);
+}
+
+/// As InDesign's: the footer stays at the bottom however many pages there are, and the
+/// divider between parents and pages shows more or fewer parents.
+#[test]
+fn the_footer_stays_put_and_the_divider_resizes_the_parents() {
+    use egui::{Event, Modifiers, PointerButton};
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 60, "facingPages": true})).unwrap();
+    for prefix in ["B", "C", "D", "E", "F", "G"] {
+        app.run("layout.parents.new", json!({"prefix": prefix})).unwrap();
+    }
+    app.ui.dock_tab = "pages".into();
+    let mut h = crate::test_window::open(app, vec2(1400.0, 900.0));
+    let window = egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(1400.0, 900.0));
+    for label in ["60 Pages in 31 Spreads", "Create new page", "Delete selected pages"] {
+        assert!(window.contains_rect(h.get_by_label(label).rect()), "{label} is on screen");
+    }
+    // Seven parent rows: four and a half show at first; the rest scroll.
+    let divider_node = h.get_by_label("Parents and pages divider");
+    assert_eq!(divider_node.accesskit_node().role(), egui::accesskit::Role::Splitter, "the divider is a splitter, not an unknown node");
+    let divider = divider_node.rect();
+    let before = divider.center().y;
+    assert!(h.query_by_label("G-Parent").is_none_or(|n| n.rect().top() > divider.top()), "the last parent is scrolled away");
+    let (a, b) = (divider.center(), divider.center() + vec2(0.0, 80.0));
+    h.input_mut().events.push(Event::PointerMoved(a));
+    h.input_mut().events.push(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.step();
+    for k in 1..=4 {
+        h.input_mut().events.push(Event::PointerMoved(a + (b - a) * (k as f32 / 4.0)));
+        h.step();
+    }
+    h.input_mut().events.push(Event::PointerButton { pos: b, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+    let after = h.get_by_label("Parents and pages divider").rect().center().y;
+    assert!(after > before + 40.0, "the divider moved down: {before} → {after}");
+    assert!(h.state().app.ui.pages_parents_height.is_some());
+    assert!(window.contains_rect(h.get_by_label("Create new page").rect()), "the footer is still there");
+}
+
+/// InDesign's Panel Options: thumbnail sizes, blank pages without thumbnails, parents side by
+/// side, pages on top.
+#[test]
+fn panel_options_size_and_arrange_the_panel() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 6, "facingPages": true})).unwrap();
+    app.run("layout.parents.new", json!({"prefix": "B"})).unwrap();
+    app.ui.dock_tab = "pages".into();
+    let mut h = crate::test_window::open(app, vec2(1400.0, 900.0));
+    let page = |h: &Harness<'_, crate::test_window::Window>| h.get_by_label("Page 1").rect();
+    let medium = page(&h).height();
+    // The right-click menu on the panel's empty part leads to Panel Options.
+    let empty = h.get_by_label("Create new page").rect().center() - vec2(0.0, 60.0);
+    h.input_mut().events.push(egui::Event::PointerMoved(empty));
+    for pressed in [true, false] {
+        h.input_mut().events.push(egui::Event::PointerButton {
+            pos: empty,
+            button: egui::PointerButton::Secondary,
+            pressed,
+            modifiers: egui::Modifiers::NONE,
+        });
+    }
+    h.run_steps(3);
+    h.get_by_label("Panel Options…").click();
+    h.run_steps(3);
+    let d = h.state().app.ui.dialog.clone().unwrap();
+    assert_eq!(
+        (d.id.as_str(), d.fields["pageSize"].clone(), d.fields["parentSize"].clone(), d.fields["layout"].clone()),
+        ("pagesPanelOptions", json!("medium"), json!("small"), json!("parentsOnTop"))
+    );
+    // Jumbo pages, parents side by side, pages on top.
+    let set = |h: &mut Harness<'_, crate::test_window::Window>, k: &str, v: serde_json::Value| {
+        h.state_mut().app.ui.dialog.as_mut().unwrap().fields.insert(k.into(), v);
+    };
+    set(&mut h, "pageSize", json!("jumbo"));
+    set(&mut h, "parentsVertical", json!(false));
+    set(&mut h, "layout", json!("pagesOnTop"));
+    crate::dialogs::confirm(&mut h.state_mut().app).unwrap();
+    h.run_steps(4);
+    assert!(page(&h).height() > 2.5 * medium, "Jumbo: {} vs {medium}", page(&h).height());
+    let o = &h.state().app.ui.pages_panel;
+    assert_eq!((o.page_size, o.parents_vertical, o.pages_on_top), (IconSize::Jumbo, false, true));
+    // Pages on top: the parents come after the pages; side by side: [None] and A sit in one row.
+    let (none, a) = (h.get_by_label("[None]").rect(), h.get_by_label("A-Parent").rect());
+    assert!(none.top() > page(&h).top(), "parents below the pages");
+    assert!((none.top() - a.top()).abs() < 1.0 && a.left() > none.right(), "side by side");
+    // Extra Small: no thumbnails, just pages.
+    crate::panels::pages::open_panel_options(&mut h.state_mut().app);
+    set(&mut h, "pageSize", json!("extraSmall"));
+    crate::dialogs::confirm(&mut h.state_mut().app).unwrap();
+    h.run_steps(4);
+    assert!(page(&h).height() < 0.5 * medium);
+}
+
+/// Panel Options' parent size sets the height of the parents' rendered thumbnails (cached per
+/// parent and size), and Show Thumbnails off leaves them blank.
+/// Parent rows taller than the room left for the parents (Extra Large or Jumbo in a short
+/// panel) draw and drag without a panic.
+#[test]
+fn large_parent_rows_in_a_short_panel_do_not_panic() {
+    use egui::{Event, Modifiers, PointerButton};
+    for size in [IconSize::ExtraLarge, IconSize::Jumbo] {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({"pages": 4})).unwrap();
+        app.ui.pages_panel.parent_size = size;
+        let mut h = sized_harness(app, vec2(260.0, 160.0));
+        let a = h.get_by_label("Parents and pages divider").rect().center();
+        h.input_mut().events.push(Event::PointerMoved(a));
+        h.input_mut().events.push(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+        h.step();
+        for dy in [20.0, 40.0, -60.0] {
+            h.input_mut().events.push(Event::PointerMoved(a + vec2(0.0, dy)));
+            h.step();
+        }
+        h.input_mut().events.push(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+        h.run_steps(2);
+        assert!(h.state().ui.pages_parents_height.is_some(), "{size:?}: the divider was dragged");
+    }
+}
+
+#[test]
+fn parent_thumbnails_follow_panel_options() {
+    let parent_thumb_heights = |thumbnails: bool| {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        app.ui.dock_tab = "pages".into();
+        app.ui.pages_panel.parent_size = IconSize::Large;
+        app.ui.pages_panel.parent_thumbnails = thumbnails;
+        let h = crate::test_window::open(app, vec2(1400.0, 900.0));
+        let st = h.state().app.session.active().unwrap();
+        let id = st.doc.parents[0].id;
+        let thumbs = super::THUMBS.lock().unwrap();
+        let keys = thumbs.as_ref().map(|m| m.keys().copied().collect::<Vec<_>>()).unwrap_or_default();
+        keys.into_iter().filter(|k| k.0 == st.uid && k.2 == super::ThumbOf::Parent(id)).map(|k| k.3).collect::<Vec<_>>()
+    };
+    assert_eq!(parent_thumb_heights(true), vec![IconSize::Large.row_h() as u32 - 5]);
+    assert_eq!(parent_thumb_heights(false), Vec::<u32>::new());
+}
+
+#[test]
+fn the_panel_menu_follows_indesigns_order() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 2, "facingPages": false})).unwrap();
+    let mut h = menu_harness(app, 0, 0);
+    assert!(h.query_by_label("Delete Spread").is_none(), "a single-page spread has no Delete Spread");
+    // InDesign's items, top to bottom.
+    let ys: Vec<f32> = ["Insert Pages…", "Move Pages…", "Duplicate Spread", "Duplicate Spread at End of Document", "Delete Page", "New Parent…"]
+        .iter()
+        .map(|l| h.get_by_label(l).rect().center().y)
+        .collect();
+    assert!(ys.windows(2).all(|w| w[0] < w[1]), "{ys:?}");
+    h.get_by_label("Duplicate Spread at End of Document").click();
+    h.run_steps(3);
+    assert_eq!(h.state().session.doc().unwrap().doc.page_count(), 3);
+    h.get_by_label("Insert Pages…").click();
+    h.run_steps(3);
+    assert!(h.state().ui.dialog.as_ref().is_some_and(|d| d.id == "cmd:layout.pages.insert"));
+}
+
+#[test]
+fn a_page_dropped_on_create_new_page_is_duplicated_at_the_end() {
+    // Chris Cicchino's Page Tool video (2:06): "click and drag onto my plus sign I can duplicate that".
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"width": 252, "height": 144, "facingPages": false})).unwrap();
+    app.run("layout.pages.insert", json!({"count": 1})).unwrap();
+    app.run("layout.pageSize", json!({"pages": [2], "width": 612, "height": 792})).unwrap();
+    let mut h = harness(app);
+    let plus = h.get_by_label("Create new page").rect().center();
+    drop_page(&mut h, 1, plus, false);
+    let d = h.state().session.doc().unwrap().doc.clone();
+    assert_eq!(d.page_count(), 3);
+    let (si, pi) = d.page_loc(2).unwrap();
+    assert_eq!(d.spreads[si].pages[pi].width, 612.0, "a copy of the letterhead");
+    let _ = h.get_by_label("Edit page size");
+}
diff --git a/crates/ui-egui/src/panels/properties.rs b/crates/ui-egui/src/panels/properties.rs
index 6deace3fc..a05eaccc5 100644
--- a/crates/ui-egui/src/panels/properties.rs
+++ b/crates/ui-egui/src/panels/properties.rs
@@ -16,10 +16,37 @@ use crate::widgets::{
 };
 use crate::{DesignApp, icons};
 
-/// A link to another panel. `window.panel` shows it in the docked layout or as a flyout; it
-/// toggles the flyout, so a flyout that is already open is left as it is.
+mod document;
+mod flex;
+mod links;
+mod object;
+mod object_panels;
+mod text;
+mod typography;
+
+pub(crate) use document::{PAGE_PRESETS, preset_name};
+use document::{document_sections, page_sections};
+pub use flex::flex_panel;
+use flex::flex_section;
+pub(crate) use links::run_update_links;
+pub use links::{info_panel, links_panel, preflight_panel, update_links};
+use object::{align_row, appearance_section, guide_section, quick_actions_object, transform_section, wrap_section};
+pub(crate) use object::{corner_type_dropdown, ref_point_proxy, stroke_type_dropdown};
+use object_panels::pathfinder_row;
+pub use object_panels::{align_panel, attributes_panel, effects_panel, pathfinder_panel, stroke_panel, wrap_panel};
+pub(crate) use text::{LANGUAGES, kerning_control, language_menu};
+use text::{
+    bullets_section, character_section, paragraph_section, quick_actions_text, text_appearance_section, text_frame_section, text_style_section,
+};
+pub use typography::{DIGIT_OPTIONS, character_panel, digit_label, paragraph_panel, show_typography_panel};
+#[cfg(test)]
+use typography::{axis_step, usable_axes, variable_font_style};
+pub(crate) use typography::{composer_choice, para_field_min};
+
+/// A link to another panel: `window.panel` shows it in the docking layout. An open flyout of
+/// that panel stays: `window.panel` would close it.
 fn show_panel(app: &mut DesignApp, panel: &str) {
-    if app.ui.open_panel.as_deref() != Some(panel) {
+    if app.ui.docking_flyout.as_deref() != Some(panel) {
         let _ = app.run("window.panel", json!({"panel": panel}));
     }
 }
@@ -46,11 +73,11 @@ pub(crate) fn place<R>(ui: &mut Ui, r: Rect, f: impl FnOnce(&mut Ui) -> R) -> R
 }
 
 fn temp_bool(ui: &Ui, key: &str, default: bool) -> bool {
-    ui.data(|d| d.get_temp::<bool>(egui::Id::new(key))).unwrap_or(default)
+    ui.data(|d| d.get_temp::<bool>(egui::Id::unique(key))).unwrap_or(default)
 }
 
 fn set_temp_bool(ui: &Ui, key: &str, v: bool) {
-    ui.data_mut(|d| d.insert_temp(egui::Id::new(key), v));
+    ui.data_mut(|d| d.insert_temp(egui::Id::unique(key), v));
 }
 
 /// Label of the current selection for the selection-type band.
@@ -186,4194 +213,5 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     quick_actions_object(app, ui, &i);
 }
 
-// ---------------------------------------------------------------- No Selection
-
-/// Page-size presets for the Document dropdown (portrait, points).
-pub(crate) const PAGE_PRESETS: &[(&str, f64, f64)] = &[
-    ("Letter", 612.0, 792.0),
-    ("Legal", 612.0, 1008.0),
-    ("Tabloid", 792.0, 1224.0),
-    ("Letter - Half", 396.0, 612.0),
-    ("Legal - Half", 504.0, 612.0),
-    ("A0", 841.0 * units::PT_PER_MM, 1189.0 * units::PT_PER_MM),
-    ("A1", 594.0 * units::PT_PER_MM, 841.0 * units::PT_PER_MM),
-    ("A2", 420.0 * units::PT_PER_MM, 594.0 * units::PT_PER_MM),
-    ("A3", 841.89, 1190.55),
-    ("A4", 595.276, 841.89),
-    ("A5", 419.528, 595.276),
-    ("A6", 297.638, 419.528),
-    ("B5", 498.898, 708.661),
-    ("US Business Card", 144.0, 252.0),
-];
-
-pub(crate) fn preset_name(w: f64, h: f64) -> &'static str {
-    let (a, b) = (w.min(h), w.max(h));
-    PAGE_PRESETS.iter().find(|p| (p.1 - a).abs() < 0.6 && (p.2 - b).abs() < 0.6).map(|p| p.0).unwrap_or("Custom")
-}
-
-/// Properties with the Page tool (Properties › Edit Page), as InDesign's: a "Page" band with Back,
-/// Page Size for this page alone (which page, preset, orientation, W/H), Margins and Columns and
-/// Quick Actions. Back returns to the Selection tool and the document's properties.
-fn page_sections(app: &mut DesignApp, ui: &mut Ui, page: usize) {
-    let u = units(app);
-    let lang = app.ui.language.clone();
-    let Some(st) = app.session.active() else { return };
-    let d = st.doc.clone();
-    let Some((si, pi)) = d.page_loc(page) else { return };
-    let Some(pg) = d.spreads.get(si).and_then(|s| s.pages.get(pi)).cloned() else { return };
-    let n = page + 1;
-    let t = Tokens::get(ui.ctx());
-    // The band: "Page", and Back at its end.
-    let band = block(ui, 33.0);
-    crate::rtl::paint(
-        ui.painter(),
-        pos2(band.min.x, band.center().y + 1.0),
-        egui::Align2::LEFT_CENTER,
-        crate::i18n::tr(&lang, "Page"),
-        crate::theme::semibold(11.5),
-        t.text_strong,
-    );
-    let back = place(ui, Rect::from_min_size(pos2(band.max.x - 58.0, band.center().y - 10.0), vec2(54.0, 20.0)), |ui| {
-        outline_button(ui, crate::i18n::tr(&lang, "Back"), 54.0).clicked()
-    });
-    rule(ui);
-    if back {
-        let _ = app.run("layout.selectPage", json!({"page": null}));
-        app.select_tool("selection");
-        return;
-    }
-    section(ui, crate::i18n::tr(&lang, "Page Size"), true);
-    // Which page.
-    let b = block(ui, FIELD_H);
-    let names: Vec<String> = (0..d.page_count()).map(|i| app.session.page_label(i)).collect();
-    let picked = place(ui, sub(b, 0.0, 0.0, 93.0, FIELD_H), |ui| {
-        widgets::dropdown_list(ui, names.get(page).map_or("", String::as_str), 93.0, &names, Some(page))
-    });
-    if let Some(p) = picked {
-        let _ = app.run("layout.selectPage", json!({"page": p + 1}));
-        crate::canvas::go_to_page(app, p);
-        return;
-    }
-    ui.add_space(3.0);
-    // Preset and orientation: this page alone.
-    let (w, h) = (pg.width, pg.height);
-    let landscape = w > h;
-    let b = block(ui, FIELD_H);
-    let mut size = None;
-    place(ui, sub(b, 0.0, 0.0, 93.0, FIELD_H), |ui| {
-        let resp = dropdown(ui, crate::i18n::tr(&lang, preset_name(w, h)), 93.0);
-        egui::Popup::menu(&resp).show(|ui| {
-            ui.set_min_width(140.0);
-            for p in PAGE_PRESETS {
-                if ui.selectable_label(preset_name(w, h) == p.0, crate::i18n::tr(&lang, p.0)).clicked() {
-                    size = Some(if landscape { (p.2, p.1) } else { (p.1, p.2) });
-                    ui.close();
-                }
-            }
-        });
-    });
-    place(ui, sub(b, 126.0, 0.0, 52.0, FIELD_H), |ui| {
-        ui.spacing_mut().item_spacing.x = 4.0;
-        if icon_toggle(ui, "orient-portrait", !landscape, crate::i18n::tr(&lang, "Portrait")).clicked() && landscape {
-            size = Some((h, w));
-        }
-        if icon_toggle(ui, "orient-landscape", landscape, crate::i18n::tr(&lang, "Landscape")).clicked() && !landscape {
-            size = Some((h, w));
-        }
-    });
-    ui.add_space(3.0);
-    let b = block(ui, 2.0 * FIELD_H + 5.0);
-    for (row, (label, v, key)) in [("W:", w, "width"), ("H:", h, "height")].into_iter().enumerate() {
-        let y = row as f32 * 26.0;
-        place(ui, sub(b, 0.0, y, 20.0, FIELD_H), |ui| widgets::caption_w(ui, label, 20.0));
-        let nv = place(ui, sub(b, 21.0, y, 72.0, FIELD_H), |ui| {
-            NumField::measure(&format!("page_{key}"), Some(v), u).width(72.0).spinner().range(1.0, 15552.0).show(ui)
-        });
-        if let Some(nv) = nv {
-            size = Some(if key == "width" { (nv, h) } else { (w, nv) });
-        }
-    }
-    if let Some((nw, nh)) = size {
-        let _ = app.run("layout.pageSize", json!({"pages": [n], "width": nw, "height": nh, "anchor": app.ui.ref_point.min(8)}));
-    }
-    ui.add_space(6.0);
-    let fw = full_width(ui);
-    if outline_button(ui, crate::i18n::tr(&lang, "Margins and Columns"), fw).clicked() {
-        crate::canvas::go_to_page(app, page);
-        crate::menus::activate(app, "layout.marginsAndColumns", &Value::Null);
-    }
-    divider(ui);
-    section(ui, crate::i18n::tr(&lang, "Quick Actions"), true);
-    if outline_button(ui, crate::i18n::tr(&lang, "Import File"), fw).clicked() {
-        let _ = app.run("app.placeDialog", json!({}));
-    }
-}
-
-fn document_sections(app: &mut DesignApp, ui: &mut Ui) {
-    let u = units(app);
-    let Some(st) = app.session.active() else { return };
-    let d = st.doc.clone();
-    let (pw, ph) = (d.settings.page_width, d.settings.page_height);
-    section(ui, crate::i18n::tr(&app.ui.language, "Document"), true);
-    // Preset dropdown + orientation.
-    let b = block(ui, FIELD_H);
-    let mut preset = None;
-    place(ui, sub(b, 0.0, 0.0, 93.0, FIELD_H), |ui| {
-        let resp = dropdown(ui, preset_name(pw, ph), 93.0);
-        egui::Popup::menu(&resp).show(|ui| {
-            ui.set_min_width(140.0);
-            for p in PAGE_PRESETS {
-                if ui.selectable_label(preset_name(pw, ph) == p.0, p.0).clicked() {
-                    preset = Some((p.1, p.2));
-                    ui.close();
-                }
-            }
-        });
-    });
-    let landscape = pw > ph;
-    let mut orient = None;
-    place(ui, sub(b, 126.0, 0.0, 52.0, FIELD_H), |ui| {
-        ui.spacing_mut().item_spacing.x = 4.0;
-        if icon_toggle(ui, "orient-portrait", !landscape, crate::i18n::tr(&app.ui.language, "Portrait")).clicked() && landscape {
-            orient = Some(());
-        }
-        if icon_toggle(ui, "orient-landscape", landscape, crate::i18n::tr(&app.ui.language, "Landscape")).clicked() && !landscape {
-            orient = Some(());
-        }
-    });
-    if let Some((w, h)) = preset {
-        let (w, h) = if landscape { (h, w) } else { (w, h) };
-        let _ = app.run("layout.documentSetup", json!({"width": w, "height": h}));
-    }
-    if orient.is_some() {
-        let _ = app.run("layout.documentSetup", json!({"width": ph, "height": pw}));
-    }
-    ui.add_space(3.0);
-    // W / H, page count, facing pages.
-    let b = block(ui, 2.0 * FIELD_H + 5.0);
-    for (row, (label, v, key)) in [("W:", pw, "width"), ("H:", ph, "height")].into_iter().enumerate() {
-        let y = row as f32 * 26.0;
-        place(ui, sub(b, 0.0, y, 20.0, FIELD_H), |ui| widgets::caption_w(ui, label, 20.0));
-        let nv =
-            place(ui, sub(b, 21.0, y, 72.0, FIELD_H), |ui| NumField::measure(key, Some(v), u).width(72.0).spinner().range(1.0, 15552.0).show(ui));
-        if let Some(nv) = nv {
-            let _ = app.run("layout.documentSetup", json!({key: nv}));
-        }
-    }
-    let n = d.page_count();
-    let t = Tokens::get(ui.ctx());
-    icons::paint(ui.painter(), sub(b, 127.0, 2.0, 17.0, 17.0), "page-count", t.icon);
-    let nv = place(ui, sub(b, 150.0, 0.0, 68.0, FIELD_H), |ui| number(ui, "pagecount", Some(n as f64), "", 68.0, 0));
-    if let Some(nv) = nv {
-        let want = (nv.round() as usize).clamp(1, 9999);
-        if want > n {
-            let _ = app.run("layout.pages.insert", json!({"count": want - n, "after": n - 1}));
-        } else if want < n {
-            let _ = app.run("layout.pages.delete", json!({"pages": (want..n).collect::<Vec<_>>()}));
-        }
-    }
-    let mut facing = d.settings.facing_pages;
-    let changed = place(ui, sub(b, 126.0, 26.0, 100.0, FIELD_H), |ui| {
-        widgets::checkbox(ui, &mut facing, crate::i18n::tr(&app.ui.language, "Facing Pages")).changed()
-    });
-    if changed {
-        let _ = app.run("layout.documentSetup", json!({"facingPages": facing}));
-    }
-    // Margins.
-    section(ui, crate::i18n::tr(&app.ui.language, "Margins"), true);
-    let cur = crate::canvas::current_page(app).unwrap_or(0);
-    // While parent spreads are edited the fields belong to the parent page in view; they used to
-    // show (and change) the document pages instead, so nothing changed on the parent.
-    let parent_target = crate::canvas::current_parent_page(app);
-    let shown = match parent_target {
-        Some((pi, qi)) => d.parents.get(pi).and_then(|s| s.pages.get(qi)).cloned(),
-        None => d.page(cur).cloned(),
-    };
-    if let Some(p) = shown {
-        let linked = temp_bool(ui, "margins_linked", true);
-        let b = block(ui, 2.0 * FIELD_H + 5.0);
-        let mut set: Option<designcraft_doc::Margins> = None;
-        let fields = [
-            ("margin-top", "Top", p.margins.top, 0.0, 0.0),
-            ("margin-bottom", "Bottom", p.margins.bottom, 0.0, 26.0),
-            ("margin-outside", if d.settings.facing_pages { "Outside" } else { "Right" }, p.margins.outside, 127.0, 0.0),
-            ("margin-inside", if d.settings.facing_pages { "Inside" } else { "Left" }, p.margins.inside, 127.0, 26.0),
-        ];
-        for (k, (icon, tip, v, x, y)) in fields.into_iter().enumerate() {
-            let ir = sub(b, x, y + 2.0, 17.0, 17.0);
-            icons::paint(ui.painter(), ir, icon, t.icon);
-            ui.interact(ir, ui.id().with(("micon", k)), Sense::hover()).on_hover_ui(|ui| {
-                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, tip));
-            });
-            let nv = place(ui, sub(b, x + 20.0, y, 73.0, FIELD_H), |ui| {
-                NumField::measure(tip, Some(v), u).width(73.0).spinner().range(0.0, 8000.0).show(ui)
-            });
-            if let Some(nv) = nv {
-                let mut m = p.margins;
-                if linked {
-                    m = designcraft_doc::Margins { top: nv, bottom: nv, inside: nv, outside: nv };
-                } else {
-                    match k {
-                        0 => m.top = nv,
-                        1 => m.bottom = nv,
-                        2 => m.outside = nv,
-                        _ => m.inside = nv,
-                    }
-                }
-                set = Some(m);
-            }
-        }
-        let lr = sub(b, 99.0, 12.5, 22.0, FIELD_H);
-        let clicked = place(ui, lr, |ui| {
-            widgets::icon_toggle_sized(ui, if linked { "link" } else { "link-broken" }, linked, "Make all settings the same", vec2(22.0, 21.0))
-                .clicked()
-        });
-        if clicked {
-            set_temp_bool(ui, "margins_linked", !linked);
-        }
-        if let Some(m) = set {
-            let params = match parent_target {
-                // Both pages of a facing parent spread, so the margins show wherever the parent is used.
-                Some((pi, _)) => {
-                    let n = app.session.active().and_then(|st| st.doc.parents.get(pi)).map_or(1, |sp| sp.pages.len());
-                    json!({"margins": m, "parent": pi, "pages": (0..n).collect::<Vec<_>>()})
-                }
-                None => json!({"margins": m}),
-            };
-            let _ = app.run("layout.marginsAndColumns", params);
-        }
-    }
-    ui.add_space(6.0);
-    let fw = full_width(ui);
-    if outline_button(ui, crate::i18n::tr(&app.ui.language, "Adjust Layout"), fw).clicked() {
-        crate::dialogs::open_document_setup(app);
-    }
-    divider(ui);
-    // Page.
-    section(ui, crate::i18n::tr(&app.ui.language, "Page"), true);
-    let b = block(ui, FIELD_H);
-    let names: Vec<String> = (0..d.page_count()).map(|i| app.session.page_label(i)).collect();
-    let picked = place(ui, sub(b, 0.0, 0.0, 93.0, FIELD_H), |ui| {
-        widgets::dropdown_list(ui, &names[cur.min(names.len().saturating_sub(1))], 93.0, &names, Some(cur))
-    });
-    if let Some(pg) = picked {
-        crate::canvas::go_to_page(app, pg);
-    }
-    let (add, del) = place(ui, sub(b, 172.0, 0.0, 50.0, FIELD_H), |ui| {
-        ui.spacing_mut().item_spacing.x = 4.0;
-        let a = widgets::icon_toggle_sized(ui, "style-new", false, "Insert Page", vec2(22.0, 21.0)).clicked();
-        let d = widgets::icon_toggle_sized(ui, "trash", false, "Delete Page", vec2(22.0, 21.0)).clicked();
-        (a, d)
-    });
-    if add {
-        let _ = app.run("layout.pages.insert", json!({"after": cur, "count": 1}));
-    }
-    if del {
-        let _ = crate::dialogs::delete_pages(app, vec![cur]);
-    }
-    ui.add_space(3.0);
-    if outline_button(ui, crate::i18n::tr(&app.ui.language, "Edit Page"), fw).clicked() {
-        // As in InDesign: the Page tool on this page; Properties shows the page's own settings.
-        app.select_tool("page");
-        let _ = app.run("layout.selectPage", json!({"page": cur + 1}));
-    }
-    divider(ui);
-    // Rulers & Grids / Guides: icon toggle rows.
-    let (mut rulers, mut bl, mut dg) = (app.ui.rulers, app.ui.baseline_grid, app.ui.document_grid);
-    section_row(ui, crate::i18n::tr(&app.ui.language, "Rulers & Grids"), |ui| {
-        ui.spacing_mut().item_spacing.x = 14.0;
-        if icon_toggle(ui, "grid-document", dg, crate::i18n::tr(&app.ui.language, "Show Document Grid")).clicked() {
-            dg = !dg;
-        }
-        if icon_toggle(ui, "grid-baseline", bl, crate::i18n::tr(&app.ui.language, "Show Baseline Grid")).clicked() {
-            bl = !bl;
-        }
-        if icon_toggle(ui, "rulers", rulers, crate::i18n::tr(&app.ui.language, "Show Rulers")).clicked() {
-            rulers = !rulers;
-        }
-    });
-    if rulers != app.ui.rulers {
-        let _ = app.run("view.rulers", json!({}));
-    }
-    if bl != app.ui.baseline_grid {
-        let _ = app.run("view.baselineGrid", json!({}));
-    }
-    if dg != app.ui.document_grid {
-        let _ = app.run("view.documentGrid", json!({}));
-    }
-    rule(ui);
-    let (mut guides, mut locked, mut smart) = (app.ui.guides, app.ui.guides_locked, app.ui.smart_guides);
-    section_row(ui, crate::i18n::tr(&app.ui.language, "Guides"), |ui| {
-        ui.spacing_mut().item_spacing.x = 14.0;
-        if icon_toggle(ui, "guides-smart", smart, crate::i18n::tr(&app.ui.language, "Smart Guides")).clicked() {
-            smart = !smart;
-        }
-        if icon_toggle(ui, "guides-lock", locked, crate::i18n::tr(&app.ui.language, "Lock Guides")).clicked() {
-            locked = !locked;
-        }
-        if icon_toggle(ui, "guides-show", guides, crate::i18n::tr(&app.ui.language, "Show Guides")).clicked() {
-            guides = !guides;
-        }
-    });
-    if guides != app.ui.guides {
-        let _ = app.run("view.guides", json!({}));
-    }
-    if smart != app.ui.smart_guides {
-        let _ = app.run("view.smartGuides", json!({}));
-    }
-    if locked != app.ui.guides_locked {
-        let _ = app.run("view.lockGuides", json!({"on": locked}));
-    }
-    rule(ui);
-    section(ui, crate::i18n::tr(&app.ui.language, "Quick Actions"), true);
-    let (a, b) = button_pair(ui, crate::i18n::tr(&app.ui.language, "Import File"), crate::i18n::tr(&app.ui.language, "Insert Page"));
-    if a {
-        let _ = app.run("app.placeDialog", json!({}));
-    }
-    if b {
-        let _ = app.run("layout.pages.insert", json!({"after": cur, "count": 1}));
-    }
-}
-
-// ---------------------------------------------------------------- Objects
-
-/// The 9-point reference-point proxy; returns a newly picked point (0..8, row-major).
-pub(crate) fn ref_point_proxy(ui: &mut Ui, r: Rect, cur: u8) -> Option<u8> {
-    let t = Tokens::get(ui.ctx());
-    let mut out = None;
-    let pitch = r.width() / 3.0;
-    for i in 0..9u8 {
-        let c = pos2(r.min.x + pitch * (i % 3) as f32 + pitch / 2.0, r.min.y + pitch * (i / 3) as f32 + pitch / 2.0);
-        let sq = Rect::from_center_size(c, vec2(6.0, 6.0));
-        let resp = ui.interact(sq.expand(1.5), ui.id().with(("refpt", i)), Sense::click());
-        if i == cur {
-            ui.painter().rect_filled(sq.expand(0.5), 0.0, egui::Color32::WHITE);
-        } else {
-            ui.painter().rect_stroke(sq, 0.0, Stroke::new(1.0, if resp.hovered() { t.text_strong } else { t.icon }), StrokeKind::Inside);
-        }
-        if resp.clicked() {
-            out = Some(i);
-        }
-    }
-    // Connecting lines between the squares.
-    for k in 0..3 {
-        let y = r.min.y + pitch * k as f32 + pitch / 2.0;
-        let x = r.min.x + pitch * k as f32 + pitch / 2.0;
-        for j in 0..2 {
-            let a = r.min.x + pitch * j as f32 + pitch / 2.0 + 3.0;
-            ui.painter().line_segment([pos2(a, y), pos2(a + pitch - 6.0, y)], Stroke::new(1.0, t.icon));
-            let a = r.min.y + pitch * j as f32 + pitch / 2.0 + 3.0;
-            ui.painter().line_segment([pos2(x, a), pos2(x, a + pitch - 6.0)], Stroke::new(1.0, t.icon));
-        }
-    }
-    out
-}
-
-fn transform_section(app: &mut DesignApp, ui: &mut Ui, i: &SelInfo) {
-    let u = units(app);
-    let rp = app.ui.ref_point;
-    let b = block(ui, 2.0 * FIELD_H + 4.0);
-    // Reference-point position of the bounds.
-    let r = i.page_rect;
-    let (fx, fy) = ((rp % 3) as f64 / 2.0, (rp / 3) as f64 / 2.0);
-    let (x, y) = (r.x0 + r.width() * fx, r.y0 + r.height() * fy);
-    if let Some(p) = ref_point_proxy(ui, sub(b, 5.0, 10.0, 26.0, 26.0), rp) {
-        app.ui.ref_point = p;
-    }
-    let constrain = temp_bool(ui, "constrain_wh", false);
-    let mut set = serde_json::Map::new();
-    for (row, (lx, vx, kx, lw, vw, kw)) in
-        [("X:", x, "x", "W:", r.width(), "width"), ("Y:", y, "y", "H:", r.height(), "height")].into_iter().enumerate()
-    {
-        let yy = row as f32 * 25.0;
-        place(ui, sub(b, 40.0, yy, 18.0, FIELD_H), |ui| widgets::caption_w(ui, lx, 18.0));
-        if let Some(v) = place(ui, sub(b, 59.0, yy, 54.0, FIELD_H), |ui| measure(ui, kx, Some(vx), u, 54.0)) {
-            set.insert(kx.into(), json!(v));
-        }
-        place(ui, sub(b, 120.0, yy, 19.0, FIELD_H), |ui| widgets::caption_w(ui, lw, 19.0));
-        if let Some(v) = place(ui, sub(b, 140.0, yy, 54.0, FIELD_H), |ui| measure(ui, kw, Some(vw), u, 54.0)) {
-            set.insert(kw.into(), json!(v));
-            if constrain && vw > 0.0 {
-                let k = v / vw;
-                let (ok, ov) = if kw == "width" { ("height", r.height()) } else { ("width", r.width()) };
-                set.insert(ok.into(), json!(ov * k));
-            }
-        }
-    }
-    let clicked = place(ui, sub(b, 200.0, 12.0, 22.0, FIELD_H), |ui| {
-        widgets::icon_toggle_sized(
-            ui,
-            if constrain { "link" } else { "link-broken" },
-            constrain,
-            "Constrain proportions for width and height",
-            vec2(22.0, 21.0),
-        )
-        .clicked()
-    });
-    if clicked {
-        set_temp_bool(ui, "constrain_wh", !constrain);
-    }
-    if !set.is_empty() {
-        set.insert("ref".into(), json!(rp));
-        let _ = app.run("transform.set", Value::Object(set));
-    }
-    transform_angles(app, ui, rp);
-    if more_options(ui, &app.ui.language).clicked() {
-        show_panel(app, "info");
-    }
-}
-
-/// Properties › Transform for selected ruler guides: X for one vertical guide, Y for one
-/// horizontal guide; with several guides both fields are empty.
-fn guide_section(app: &mut DesignApp, ui: &mut Ui) {
-    let guide = super::guide_field(app);
-    let b = block(ui, 2.0 * FIELD_H + 4.0);
-    for (row, (label, key)) in [("X:", "gx"), ("Y:", "gy")].into_iter().enumerate() {
-        let yy = row as f32 * 25.0;
-        let on = guide.filter(|g| g.row() == row);
-        place(ui, sub(b, 40.0, yy, 18.0, FIELD_H), |ui| widgets::caption_w(ui, label, 18.0));
-        let typed = place(ui, sub(b, 59.0, yy, 135.0, FIELD_H), |ui| {
-            if on.is_none() {
-                ui.disable();
-            }
-            measure(ui, key, on.map(|g| g.value), on.map_or_else(|| units(app), |g| g.unit), 135.0)
-        });
-        if let (Some(v), Some(g)) = (typed, on) {
-            let _ = app.run("guide.move", g.move_to(v));
-        }
-    }
-}
-
-/// Properties › Transform, below X/Y/W/H as in InDesign: rotation and shear angles beside the
-/// X and Y scales (totals, as Transformations are Totals), then rotate a quarter turn and flip.
-fn transform_angles(app: &mut DesignApp, ui: &mut Ui, rp: u8) {
-    let t = Tokens::get(ui.ctx());
-    let lang = app.ui.language.clone();
-    let tv = app.session.execute("transform.info", &json!({})).ok();
-    let tv_get = |k: &str| tv.as_ref().and_then(|v| v[k].as_f64());
-    ui.add_space(4.0);
-    let b = block(ui, 2.0 * FIELD_H + 4.0);
-    let mut set = serde_json::Map::new();
-    let rows = [
-        [("tool-rotate", "Rotation Angle", "rotation", "°", "p_rot"), ("tool-scale", "Scale X Percentage", "scaleX", "%", "p_sx")],
-        [("tool-shear", "Shear X Angle", "shear", "°", "p_shear"), ("tool-scale", "Scale Y Percentage", "scaleY", "%", "p_sy")],
-    ];
-    for (row, cells) in rows.into_iter().enumerate() {
-        let yy = row as f32 * 25.0;
-        for (col, (icon, tip, key, suffix, id)) in cells.into_iter().enumerate() {
-            let x = if col == 0 { 40.0 } else { 120.0 };
-            let ir = sub(b, x, yy + 2.0, 17.0, 17.0);
-            icons::paint(ui.painter(), ir, icon, t.icon);
-            ui.interact(ir, ui.id().with(id), Sense::hover()).on_hover_text(crate::i18n::tr(&lang, tip));
-            if let Some(v) = place(ui, sub(b, x + 19.0, yy, 54.0, FIELD_H), |ui| widgets::number(ui, id, tv_get(key), suffix, 54.0, 1)) {
-                set.insert(key.into(), json!(v));
-            }
-        }
-    }
-    if !set.is_empty() {
-        set.insert("ref".into(), json!(rp));
-        let _ = app.run("transform.set", Value::Object(set));
-    }
-    ui.add_space(2.0);
-    ui.horizontal(|ui| {
-        ui.add_space(36.0);
-        ui.spacing_mut().item_spacing.x = 10.0;
-        for (icon, tip, cmd, params) in [
-            ("rotate-clockwise", "Rotate 90° Clockwise", "transform.rotate", json!({"angle": -90})),
-            ("tool-rotate", "Rotate 90° Counterclockwise", "transform.rotate", json!({"angle": 90})),
-            ("flip-horizontal", "Flip Horizontal", "transform.flip", json!({"axis": "horizontal"})),
-            ("flip-vertical", "Flip Vertical", "transform.flip", json!({"axis": "vertical"})),
-        ] {
-            let label = crate::i18n::tr(&lang, tip);
-            let resp = icon_toggle(ui, icon, false, label);
-            resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, label));
-            if resp.clicked() {
-                let _ = app.run(cmd, params);
-            }
-        }
-    });
-}
-
-/// A stroke-type preview dropdown (light box with the line style).
-pub(crate) fn stroke_type_dropdown(app: &mut DesignApp, ui: &mut Ui, cur: &str, w: f32) {
-    const TYPES: &[(&str, &str)] = &[
-        ("Solid", "solid"),
-        ("Dashed", "dashed"),
-        ("Dotted", "dotted"),
-        ("Thick - Thin", "thickThin"),
-        ("Thin - Thick", "thinThick"),
-        ("Thin - Thin", "thinThin"),
-        ("Thick - Thick", "thickThick"),
-    ];
-    let resp = preview_dropdown(ui, w, |p, r| paint_stroke_type(p, r, cur));
-    egui::Popup::menu(&resp).show(|ui| {
-        ui.set_min_width(140.0);
-        for (label, kind) in TYPES {
-            if ui.selectable_label(*kind == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
-                let ty = if *kind == "dashed" { json!({"kind": "dashed", "pattern": [12.0, 4.0]}) } else { json!({"kind": kind}) };
-                let _ = app.run("object.stroke", json!({"type": ty}));
-                ui.close();
-            }
-        }
-    });
-}
-
-fn paint_stroke_type(p: &egui::Painter, r: Rect, kind: &str) {
-    let c = egui::Color32::BLACK;
-    let (x0, x1, y) = (r.min.x + 5.0, r.max.x - 5.0, r.center().y);
-    match kind {
-        "dashed" => {
-            let mut x = x0;
-            while x < x1 {
-                p.line_segment([pos2(x, y), pos2((x + 6.0).min(x1), y)], Stroke::new(4.0, c));
-                x += 9.0;
-            }
-        }
-        "dotted" => {
-            let mut x = x0 + 2.0;
-            while x < x1 {
-                p.circle_filled(pos2(x, y), 2.0, c);
-                x += 6.0;
-            }
-        }
-        "thickThin" | "thinThick" | "thinThin" | "thickThick" => {
-            let (a, b) = match kind {
-                "thickThin" => (3.0, 1.0),
-                "thinThick" => (1.0, 3.0),
-                "thinThin" => (1.0, 1.0),
-                _ => (2.5, 2.5),
-            };
-            p.line_segment([pos2(x0, y - 3.0), pos2(x1, y - 3.0)], Stroke::new(a, c));
-            p.line_segment([pos2(x0, y + 3.0), pos2(x1, y + 3.0)], Stroke::new(b, c));
-        }
-        _ => {
-            p.line_segment([pos2(x0, y), pos2(x1, y)], Stroke::new(5.0, c));
-        }
-    }
-}
-
-/// A dropdown whose face is a light preview box (stroke type, corner shape).
-fn preview_dropdown(ui: &mut Ui, w: f32, paint: impl FnOnce(&egui::Painter, Rect)) -> egui::Response {
-    let t = Tokens::get(ui.ctx());
-    let (r, resp) = ui.allocate_exact_size(vec2(w, FIELD_H), Sense::click());
-    let face = Rect::from_min_max(r.min, pos2(r.max.x - widgets::SEG_W, r.max.y));
-    ui.painter().rect_filled(face, 0.0, egui::Color32::from_gray(0xdf));
-    paint(ui.painter(), face);
-    let seg = Rect::from_min_max(pos2(face.max.x, r.min.y), r.max);
-    ui.painter().rect_filled(seg, 0.0, if resp.hovered() { t.hover } else { t.input });
-    widgets::chevron_down(ui.painter(), seg.center(), t.icon);
-    ui.painter().rect_stroke(r, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
-    resp
-}
-
-fn paint_corner_shape(p: &egui::Painter, r: Rect, shape: CornerShape) {
-    let c = egui::Color32::BLACK;
-    let s = Stroke::new(1.5, c);
-    let (x0, y0, x1, y1) = (r.min.x + 4.0, r.min.y + 4.0, r.max.x - 9.0, r.max.y - 3.0);
-    let k = 8.0;
-    let pts: Vec<egui::Pos2> = match shape {
-        CornerShape::None => vec![pos2(x0, y0), pos2(x1, y0), pos2(x1, y1)],
-        CornerShape::Bevel => vec![pos2(x0, y0), pos2(x1 - k, y0), pos2(x1, y0 + k), pos2(x1, y1)],
-        CornerShape::Inset => vec![pos2(x0, y0), pos2(x1 - k, y0), pos2(x1 - k, y0 + k), pos2(x1, y0 + k), pos2(x1, y1)],
-        CornerShape::Rounded | CornerShape::InverseRounded | CornerShape::Fancy => {
-            let mut v = vec![pos2(x0, y0)];
-            for i in 0..=8 {
-                let a = i as f32 / 8.0 * std::f32::consts::FRAC_PI_2;
-                v.push(if shape == CornerShape::InverseRounded {
-                    pos2(x1 - k * a.cos(), y0 + k * a.sin())
-                } else {
-                    pos2(x1 - k + k * a.sin(), y0 + k - k * a.cos())
-                });
-            }
-            v.push(pos2(x1, y1));
-            v
-        }
-    };
-    p.add(egui::Shape::line(pts, s));
-}
-
-pub(crate) fn corner_type_dropdown(app: &mut DesignApp, ui: &mut Ui, shape: CornerShape, size: f64, width: f32) {
-    let resp = preview_dropdown(ui, width, |p, r| paint_corner_shape(p, r, shape));
-    egui::Popup::menu(&resp).show(|ui| {
-        ui.set_min_width(140.0);
-        for s in CornerShape::ALL {
-            if ui.selectable_label(s == shape, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, s.label()))).clicked() {
-                let _ = app.run("object.cornerOptions", json!({"shape": s, "size": if size > 0.0 { size } else { 12.0 }}));
-                ui.close();
-            }
-        }
-    });
-}
-
-fn appearance_section(app: &mut DesignApp, ui: &mut Ui, i: &SelInfo) {
-    let t = Tokens::get(ui.ctx());
-    let Some(doc) = app.session.active().map(|d| d.doc.clone()) else { return };
-    // Fill.
-    let b = block(ui, FIELD_H);
-    let (fc, fg) = widgets::swatch_colors(&doc, &i.fill, 1.0);
-    let chip = sub(b, 4.0, 2.0, 17.0, 17.0);
-    widgets::paint_chip(ui.painter(), chip, fc, fg);
-    ui.painter().rect_stroke(chip, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
-    let resp = ui.interact(chip, ui.id().with("fillchip"), Sense::click()).on_hover_text(format!(
-        "{}: {}",
-        crate::i18n::tr(&app.ui.language, "Fill"),
-        i.fill
-    ));
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Fill swatch"));
-    swatch_menu(app, &resp, &doc, &i.fill, false, i.is_text && i.count == 1, false);
-    crate::rtl::paint(
-        ui.painter(),
-        b.min + vec2(34.0, FIELD_H / 2.0),
-        egui::Align2::LEFT_CENTER,
-        crate::i18n::tr(&app.ui.language, "Fill"),
-        egui::FontId::proportional(11.5),
-        t.text,
-    );
-    ui.add_space(4.0);
-    // Stroke.
-    let b = block(ui, FIELD_H);
-    let (sc, _) = widgets::swatch_colors(&doc, &i.stroke, 1.0);
-    let chip = sub(b, 4.0, 2.0, 17.0, 17.0);
-    widgets::paint_stroke_chip(ui.painter(), chip, sc, egui::Color32::from_gray(20));
-    ui.painter().rect_stroke(chip, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
-    let resp = ui.interact(chip, ui.id().with("strokechip"), Sense::click()).on_hover_text(format!(
-        "{}: {}",
-        crate::i18n::tr(&app.ui.language, "Stroke"),
-        i.stroke
-    ));
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Stroke swatch"));
-    swatch_menu(app, &resp, &doc, &i.stroke, true, i.is_text && i.count == 1, false);
-    if place(ui, sub(b, 34.0, 0.0, 56.0, FIELD_H), |ui| link_label(ui, crate::i18n::tr(&app.ui.language, "Stroke"), 56.0)).clicked() {
-        show_panel(app, "stroke");
-    }
-    const WEIGHTS: &[f64] = &[0.0, 0.25, 0.5, 0.75, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 20.0, 30.0, 40.0, 50.0, 100.0];
-    if let Some(v) = place(ui, sub(b, 96.0, 0.0, 69.0, FIELD_H), |ui| {
-        NumField::number("sw", Some(i.stroke_weight), " pt", 3).width(69.0).spinner().presets(WEIGHTS).range(0.0, 800.0).show(ui)
-    }) {
-        let _ = app.run("object.stroke", json!({"weight": v}));
-    }
-    let kind = i.stroke_kind.clone();
-    place(ui, sub(b, 171.0, 0.0, 54.0, FIELD_H), |ui| stroke_type_dropdown(app, ui, &kind, 54.0));
-    ui.add_space(4.0);
-    // Corner.
-    let b = block(ui, FIELD_H);
-    icons::paint(ui.painter(), sub(b, 3.0, 1.0, 19.0, 19.0), "corner", t.accent);
-    if place(ui, sub(b, 34.0, 0.0, 56.0, FIELD_H), |ui| link_label(ui, crate::i18n::tr(&app.ui.language, "Corner"), 56.0)).clicked() {
-        app.ui.dialog = Some(crate::dialogs::Dialog::new("frameSize", json!({})));
-    }
-    let (shape, size) = i.corner;
-    if let Some(v) = place(ui, sub(b, 96.0, 0.0, 69.0, FIELD_H), |ui| {
-        NumField::measure("corner", Some(size), Unit::Points).width(69.0).spinner().range(0.0, 1000.0).show(ui)
-    }) {
-        let sh = if shape == CornerShape::None { CornerShape::Rounded } else { shape };
-        let _ = app.run("object.cornerOptions", json!({"shape": sh, "size": v}));
-    }
-    place(ui, sub(b, 171.0, 0.0, 54.0, FIELD_H), |ui| {
-        corner_type_dropdown(app, ui, shape, size, 54.0);
-    });
-    ui.add_space(4.0);
-    // Opacity.
-    let b = block(ui, FIELD_H);
-    icons::paint(ui.painter(), sub(b, 3.0, 1.0, 19.0, 19.0), "opacity", t.icon);
-    if place(ui, sub(b, 34.0, 0.0, 56.0, FIELD_H), |ui| link_label(ui, crate::i18n::tr(&app.ui.language, "Opacity"), 56.0)).clicked() {
-        show_panel(app, "effects");
-    }
-    if let Some(v) = place(ui, sub(b, 96.0, 0.0, 51.0, FIELD_H), |ui| {
-        NumField::number("opacity", Some((i.opacity * 100.0).round()), "%", 0).width(51.0).range(0.0, 100.0).show(ui)
-    }) {
-        let _ = app.run("object.opacity", json!({"opacity": v / 100.0}));
-    }
-    let more = sub(b, 147.0, 0.0, 18.0, FIELD_H);
-    let mresp = ui.interact(more, ui.id().with("opmore"), Sense::click());
-    ui.painter().rect(more, 0.0, if mresp.hovered() { t.hover } else { t.input }, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
-    icons::paint(ui.painter(), more.shrink(4.0), "chevron-right", t.icon);
-    if mresp.clicked() {
-        show_panel(app, "effects");
-    }
-    ui.add_space(6.0);
-    ui.horizontal(|ui| {
-        ui.spacing_mut().item_spacing.x = 10.0;
-        if icon_toggle(ui, "frame-dashed", false, crate::i18n::tr(&app.ui.language, "Frame Fitting")).clicked() {
-            show_panel(app, "textWrap");
-        }
-        if icon_toggle(ui, "fx", i.shadow, crate::i18n::tr(&app.ui.language, "Effects: Drop Shadow")).clicked() {
-            let _ = app.run("object.dropShadow", json!({"on": !i.shadow}));
-        }
-    });
-}
-
-/// The Fill (or Stroke) popup of Properties › Appearance, as InDesign's: Apply To (a text frame's
-/// frame or its text), the tint, then the swatches. `cur` is the frame's swatch. With `text_only`
-/// (text selected) it colours the selected text.
-fn swatch_menu(
-    app: &mut DesignApp,
-    resp: &egui::Response,
-    doc: &designcraft_doc::Document,
-    cur: &str,
-    stroke: bool,
-    text_frame: bool,
-    text_only: bool,
-) {
-    let lang = app.ui.language.clone();
-    let tr = |s: &'static str| crate::i18n::tr(&lang, s);
-    let to_text_id = egui::Id::new(("swatch_apply_to_text", stroke));
-    let to_text = text_only || text_frame && resp.ctx.data(|d| d.get_temp::<bool>(to_text_id)).unwrap_or(false);
-    // What the popup shows and changes: the frame's fill or stroke, or its text's.
-    let (key, tint_key) = if stroke { ("stroke", "strokeTint") } else { ("fill", "fillTint") };
-    let (cur, tint) = if to_text {
-        let chars = super::text_attrs(app).map(|a| a["chars"].clone()).unwrap_or_default();
-        (chars[key].as_str().unwrap_or("").to_string(), chars[tint_key].as_f64().unwrap_or(1.0))
-    } else {
-        (cur.to_string(), f64::from(super::sel_tint(app, stroke)))
-    };
-    let mut picked = None;
-    let mut new_tint = None;
-    let mut switch = None;
-    egui::Popup::menu(resp).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
-        if text_frame {
-            ui.horizontal(|ui| {
-                crate::rtl::label(ui, tr("Apply To:"));
-                for (label, text) in [("Frame", false), ("Text", true)] {
-                    if ui.selectable_label(to_text == text, crate::rtl::widget(ui, tr(label))).clicked() {
-                        switch = Some(text);
-                    }
-                }
-            });
-        }
-        ui.horizontal(|ui| {
-            crate::rtl::label(ui, tr("Tint:"));
-            if let Some(v) = NumField::number(if stroke { "stroke_tint" } else { "fill_tint" }, Some((tint * 100.0).round()), "%", 0)
-                .width(60.0)
-                .range(0.0, 100.0)
-                .show(ui)
-            {
-                new_tint = Some(v / 100.0);
-            }
-        });
-        ui.separator();
-        picked = super::swatch_list(ui, doc, &cur);
-    });
-    if let Some(t) = switch {
-        resp.ctx.data_mut(|d| d.insert_temp(to_text_id, t));
-    }
-    let cmd = |app: &mut DesignApp, attrs: Value| {
-        if to_text {
-            let _ = app.run("type.char", json!({ "attrs": attrs }));
-        } else {
-            let mut p = attrs.as_object().cloned().unwrap_or_default();
-            // object.fill / object.stroke name the swatch `swatch` and the tint `tint`.
-            if let Some(v) = p.remove(key) {
-                p.insert("swatch".into(), v);
-            }
-            if let Some(v) = p.remove(tint_key) {
-                p.insert("tint".into(), v);
-            }
-            let _ = app.run(if stroke { "object.stroke" } else { "object.fill" }, Value::Object(p));
-        }
-    };
-    if let Some(n) = picked {
-        cmd(app, json!({ key: n }));
-    } else if let Some(t) = new_tint {
-        cmd(app, json!({ tint_key: t }));
-    }
-}
-
-fn align_row(app: &mut DesignApp, ui: &mut Ui) {
-    let t = Tokens::get(ui.ctx());
-    ui.horizontal(|ui| {
-        ui.spacing_mut().item_spacing.x = 8.0;
-        // A key object switches Align To to Key Object; choosing another target drops the key.
-        let key = app.session.active().and_then(|st| st.selection.key.filter(|_| st.selection.items.len() > 1));
-        let to = if key.is_some() { "keyObject".to_string() } else { app.ui.align_to.clone() };
-        let to_label = match to.as_str() {
-            "selection" => "Selection",
-            "keyObject" => "Key Object",
-            "margins" => "Margins",
-            "page" => "Page",
-            "spread" => "Spread",
-            other => other,
-        };
-        let tip = format!("{}: {}", crate::i18n::tr(&app.ui.language, "Align To"), crate::i18n::tr(&app.ui.language, to_label));
-        let resp = icon_toggle(ui, "align-to", false, &tip);
-        egui::Popup::menu(&resp).show(|ui| {
-            for (label, id) in [
-                ("Align to Selection", "selection"),
-                ("Align to Key Object", "keyObject"),
-                ("Align to Margins", "margins"),
-                ("Align to Page", "page"),
-                ("Align to Spread", "spread"),
-            ] {
-                if ui.selectable_label(to == id, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
-                    if let Some(k) = key.filter(|_| id != "keyObject") {
-                        let _ = app.run("selection.key", json!({"id": k.0}));
-                    }
-                    app.ui.align_to = id.into();
-                    ui.close();
-                }
-            }
-        });
-        let (r, _) = ui.allocate_exact_size(vec2(1.0, FIELD_H), Sense::hover());
-        ui.painter().line_segment([r.center_top(), r.center_bottom()], Stroke::new(1.0, t.section_divider.gamma_multiply(1.6)));
-        for (edge, icon, tip) in [
-            ("left", "objalign-left", "Align left edges"),
-            ("hcenter", "objalign-hcenter", "Align horizontal centers"),
-            ("right", "objalign-right", "Align right edges"),
-            ("top", "objalign-top", "Align top edges"),
-            ("vcenter", "objalign-vcenter", "Align vertical centers"),
-            ("bottom", "objalign-bottom", "Align bottom edges"),
-        ] {
-            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
-                let _ = app.run("object.align", json!({"edge": edge, "to": to}));
-            }
-        }
-    });
-}
-
-fn wrap_section(app: &mut DesignApp, ui: &mut Ui, i: &SelInfo) {
-    ui.horizontal(|ui| {
-        ui.spacing_mut().item_spacing.x = 7.0;
-        for (icon, mode, tip) in [
-            ("wrap-none", "none", "No Text Wrap"),
-            ("wrap-bbox", "boundingBox", "Wrap Around Bounding Box"),
-            ("wrap-contour", "contour", "Wrap Around Object Shape"),
-            ("wrap-jump", "jumpObject", "Jump Object"),
-            ("wrap-next", "jumpToNextColumn", "Jump to Next Column"),
-        ] {
-            if icon_toggle(ui, icon, i.wrap == mode, crate::i18n::tr(&app.ui.language, tip)).clicked() {
-                let _ = app.run("object.textWrap", json!({"mode": mode}));
-            }
-        }
-        ui.add_space(2.0);
-        let mut inv = i.wrap_invert;
-        let enabled = i.wrap != "none";
-        let r = ui.add_enabled_ui(enabled, |ui| widgets::checkbox(ui, &mut inv, crate::i18n::tr(&app.ui.language, "Invert"))).inner;
-        if r.changed() {
-            let _ = app.run("object.textWrap", json!({"mode": i.wrap, "invert": inv}));
-        }
-    });
-    if more_options(ui, &app.ui.language).clicked() {
-        show_panel(app, "textWrap");
-    }
-}
-
-fn arrange_menu(app: &mut DesignApp, resp: &egui::Response) {
-    egui::Popup::menu(resp).show(|ui| {
-        for (label, cmd) in [
-            ("Bring to Front", "object.bringToFront"),
-            ("Bring Forward", "object.bringForward"),
-            ("Send Backward", "object.sendBackward"),
-            ("Send to Back", "object.sendToBack"),
-        ] {
-            if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
-                let _ = app.run(cmd, json!({}));
-                ui.close();
-            }
-        }
-    });
-}
-
-fn convert_shape_menu(app: &mut DesignApp, resp: &egui::Response) {
-    egui::Popup::menu(resp).show(|ui| {
-        for (label, to) in [
-            ("Rectangle", "rectangle"),
-            ("Rounded Rectangle", "roundedRectangle"),
-            ("Beveled Rectangle", "beveledRectangle"),
-            ("Inverse Rounded Rectangle", "inverseRoundedRectangle"),
-            ("Ellipse", "ellipse"),
-            ("Triangle", "triangle"),
-            ("Polygon", "polygon"),
-            ("Line", "line"),
-            ("Orthogonal Line", "orthogonalLine"),
-        ] {
-            if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
-                if let Err(e) = app.run("object.convertShape", json!({"to": to})) {
-                    app.status_error("Convert Shape", e);
-                }
-                ui.close();
-            }
-        }
-    });
-}
-
-fn quick_actions_object(app: &mut DesignApp, ui: &mut Ui, i: &SelInfo) {
-    let fw = full_width(ui);
-    let hw = (fw - 10.0) / 2.0;
-    if i.is_text {
-        ui.horizontal(|ui| {
-            ui.spacing_mut().item_spacing.x = 10.0;
-            let r = outline_button(ui, crate::i18n::tr(&app.ui.language, "Convert Shape"), hw);
-            convert_shape_menu(app, &r);
-            let r = outline_button(ui, crate::i18n::tr(&app.ui.language, "Arrange"), hw);
-            arrange_menu(app, &r);
-        });
-        ui.add_space(4.0);
-        if outline_button(ui, crate::i18n::tr(&app.ui.language, "Fill with Placeholder Text"), fw).clicked() {
-            let _ = app.run("type.fillWithPlaceholder", json!({}));
-        }
-        ui.add_space(4.0);
-        if outline_button(ui, crate::i18n::tr(&app.ui.language, "Edit in Story Editor"), fw).clicked() {
-            let _ = app.run("app.storyEditor", json!({}));
-        }
-        return;
-    }
-    ui.horizontal(|ui| {
-        ui.spacing_mut().item_spacing.x = 10.0;
-        let r = outline_button(ui, crate::i18n::tr(&app.ui.language, "Arrange"), hw);
-        arrange_menu(app, &r);
-        if outline_button(ui, crate::i18n::tr(&app.ui.language, if i.count > 1 { "Group" } else { "Lock" }), hw).clicked() {
-            let _ = app.run(if i.count > 1 { "object.group" } else { "object.lock" }, json!({}));
-        }
-    });
-    ui.add_space(4.0);
-    if i.kind == "<group>" {
-        if outline_button(ui, crate::i18n::tr(&app.ui.language, "Ungroup"), fw).clicked() {
-            let _ = app.run("object.ungroup", json!({}));
-        }
-    } else {
-        let r = outline_button(ui, crate::i18n::tr(&app.ui.language, "Convert Shape"), fw);
-        convert_shape_menu(app, &r);
-    }
-}
-
-// ---------------------------------------------------------------- Text
-
-fn text_style_section(app: &mut DesignApp, ui: &mut Ui) {
-    let t = Tokens::get(ui.ctx());
-    section(ui, crate::i18n::tr(&app.ui.language, "Text Style"), true);
-    let Some(a) = text_attrs(app) else { return };
-    let tab = app.ui.text_style_tab;
-    let fw = full_width(ui);
-    if let Some(k) = widgets::segmented(
-        ui,
-        &[crate::i18n::tr(&app.ui.language, "Paragraph Styles"), crate::i18n::tr(&app.ui.language, "Character Styles")],
-        tab as usize,
-        fw,
-    ) {
-        app.ui.text_style_tab = k as u8;
-    }
-    ui.add_space(5.0);
-    let (names, cur): (Vec<String>, String) = {
-        let Some(st) = app.session.active() else { return };
-        if tab == 0 {
-            (
-                st.doc.styles.paragraph.iter().map(|p| p.name.clone()).filter(|n| n != designcraft_doc::NO_PARA_STYLE).collect(),
-                a["paragraphStyle"].as_str().unwrap_or("").to_string(),
-            )
-        } else {
-            (st.doc.styles.character.iter().map(|p| p.name.clone()).collect(), a["characterStyle"].as_str().unwrap_or("[None]").to_string())
-        }
-    };
-    let ov = if tab == 0 { a["paraOverrides"].as_u64().unwrap_or(0) + a["charOverrides"].as_u64().unwrap_or(0) } else { 0 };
-    let shown = crate::i18n::style_name(&app.ui.language, &cur);
-    let label = if ov > 0 { format!("{shown}+") } else { shown.to_string() };
-    let resp = widgets::dropdown_h(ui, "", fw, 34.0);
-    // "Ag" swatch + style name.
-    let ag = Rect::from_min_size(resp.rect.min + vec2(6.0, 6.0), vec2(22.0, 22.0));
-    ui.painter().rect_filled(ag, 1.0, egui::Color32::WHITE);
-    ui.painter().text(ag.center(), egui::Align2::CENTER_CENTER, "Ag", egui::FontId::new(13.0, egui::FontFamily::Proportional), egui::Color32::BLACK);
-    crate::rtl::paint(
-        &ui.painter().with_clip_rect(resp.rect.shrink2(vec2(20.0, 0.0))),
-        pos2(ag.max.x + 8.0, resp.rect.center().y),
-        egui::Align2::LEFT_CENTER,
-        &label,
-        egui::FontId::proportional(11.5),
-        t.text,
-    );
-    let mut pick = None;
-    egui::Popup::menu(&resp).show(|ui| {
-        ui.set_min_width(fw);
-        egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
-            for n in &names {
-                if ui.selectable_label(*n == cur, crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, n))).clicked() {
-                    pick = Some(n.clone());
-                    ui.close();
-                }
-            }
-        });
-    });
-    if let Some(n) = pick {
-        if tab == 0 {
-            let _ = app.run("style.paragraph.apply", json!({"name": n, "clearOverrides": false}));
-        } else {
-            let _ = app.run("style.character.apply", json!({"name": n}));
-        }
-    }
-    ui.add_space(4.0);
-    ui.horizontal(|ui| {
-        ui.spacing_mut().item_spacing.x = 8.0;
-        if icon_toggle(
-            ui,
-            "pilcrow-menu",
-            false,
-            crate::i18n::tr(&app.ui.language, if tab == 0 { "Paragraph Styles panel" } else { "Character Styles panel" }),
-        )
-        .clicked()
-        {
-            app.ui.open_panel = Some(if tab == 0 { "paragraphStyles" } else { "characterStyles" }.into());
-        }
-        ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-            ui.spacing_mut().item_spacing.x = 12.0;
-            ui.add_space(4.0);
-            if icon_toggle(ui, "style-new", false, crate::i18n::tr(&app.ui.language, crate::i18n::tr(&app.ui.language, "Create new style"))).clicked()
-            {
-                let cmd = if tab == 0 { "style.paragraph.create" } else { "style.character.create" };
-                let _ = app.run(cmd, json!({}));
-            }
-            if icon_toggle(ui, "style-clear", false, crate::i18n::tr(&app.ui.language, crate::i18n::tr(&app.ui.language, "Clear overrides")))
-                .clicked()
-                && tab == 0
-                && !cur.is_empty()
-            {
-                let _ = app.run("style.paragraph.apply", json!({"name": cur, "clearOverrides": true}));
-            }
-            if icon_toggle(ui, "style-load", false, crate::i18n::tr(&app.ui.language, "Styles panel")).clicked() {
-                app.ui.open_panel = Some(if tab == 0 { "paragraphStyles" } else { "characterStyles" }.into());
-            }
-        });
-    });
-}
-
-fn text_appearance_section(app: &mut DesignApp, ui: &mut Ui) {
-    let t = Tokens::get(ui.ctx());
-    let Some(a) = text_attrs(app) else { return };
-    let Some(doc) = app.session.active().map(|d| d.doc.clone()) else { return };
-    let c = &a["chars"];
-    for (k, (key, label)) in [("fill", "Fill"), ("stroke", "Stroke")].into_iter().enumerate() {
-        let sw = c[key].as_str().unwrap_or(designcraft_color::swatch::NONE).to_string();
-        let b = block(ui, FIELD_H);
-        let (col, g) = widgets::swatch_colors(&doc, &sw, 1.0);
-        let chip = sub(b, 4.0, 2.0, 17.0, 17.0);
-        if k == 0 {
-            widgets::paint_chip(ui.painter(), chip, col, g);
-        } else {
-            widgets::paint_stroke_chip(ui.painter(), chip, col, egui::Color32::from_gray(20));
-        }
-        ui.painter().rect_stroke(chip, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
-        // The "T" marks text formatting.
-        let tc = if col.is_some_and(|c| c.r() as u32 + c.g() as u32 + c.b() as u32 > 380) { egui::Color32::BLACK } else { egui::Color32::WHITE };
-        if k == 0 {
-            ui.painter().text(chip.center(), egui::Align2::CENTER_CENTER, "T", crate::theme::semibold(12.0), tc);
-        }
-        let resp = ui.interact(chip, ui.id().with(("tchip", k)), Sense::click()).on_hover_text(format!("{label}: {sw}"));
-        swatch_menu(app, &resp, &doc, &sw, k != 0, false, true);
-        if k == 0 {
-            crate::rtl::paint(
-                ui.painter(),
-                b.min + vec2(34.0, FIELD_H / 2.0),
-                egui::Align2::LEFT_CENTER,
-                crate::i18n::tr(&app.ui.language, label),
-                egui::FontId::proportional(11.5),
-                t.text,
-            );
-        } else {
-            if place(ui, sub(b, 34.0, 0.0, 56.0, FIELD_H), |ui| link_label(ui, crate::i18n::tr(&app.ui.language, label), 56.0)).clicked() {
-                show_panel(app, "stroke");
-            }
-            const WEIGHTS: &[f64] = &[0.0, 0.25, 0.5, 0.75, 1.0, 2.0, 3.0, 4.0, 5.0, 10.0];
-            if let Some(v) = place(ui, sub(b, 96.0, 0.0, 69.0, FIELD_H), |ui| {
-                NumField::number("tsw", c["strokeWeight"].as_f64(), " pt", 3).width(69.0).spinner().presets(WEIGHTS).range(0.0, 100.0).show(ui)
-            }) {
-                let _ = app.run("type.char", json!({"attrs": {"strokeWeight": v}}));
-            }
-        }
-        ui.add_space(4.0);
-    }
-    let mut behind = c["strokeBehindFill"].as_bool().unwrap_or(false);
-    if ui.checkbox(&mut behind, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Stroke Behind Fill"))).changed() {
-        let _ = app.run("type.char", json!({"attrs": {"strokeBehindFill": behind}}));
-    }
-}
-
-/// Character section: font family (with search), style, size/leading, kerning/tracking, •••.
-fn character_section(app: &mut DesignApp, ui: &mut Ui) {
-    let t = Tokens::get(ui.ctx());
-    let Some(a) = text_attrs(app) else { return };
-    let c = a["chars"].clone();
-    let fam = c["fontFamily"].as_str().unwrap_or("").to_string();
-    let sty = c["fontStyle"].as_str().unwrap_or("").to_string();
-    let fw = full_width(ui);
-    // Family dropdown with a search segment on the left.
-    let fonts = super::fonts(app);
-    let menu = super::font_menu(app);
-    let resp = widgets::dropdown(ui, "", fw);
-    let r = resp.rect;
-    icons::paint(ui.painter(), Rect::from_min_size(r.min + vec2(3.0, 3.0), vec2(14.0, 14.0)), "search", t.icon);
-    widgets::chevron_down(ui.painter(), r.min + vec2(22.0, 10.5), t.icon);
-    ui.painter().text(
-        r.min + vec2(30.0, 10.5),
-        egui::Align2::LEFT_CENTER,
-        if fam.is_empty() { "—".to_string() } else { super::font_label(app, &menu, &fam) },
-        egui::FontId::proportional(11.5),
-        t.text,
-    );
-    if let Some(f) = super::font_popup(app, &resp, &menu, &fam) {
-        super::apply_font(app, &f);
-    }
-    ui.add_space(1.0);
-    let styles = fonts.styles(&fam);
-    let cur = styles.iter().position(|s| *s == sty);
-    if let Some(k) = widgets::dropdown_list(ui, if sty.is_empty() { "—" } else { &sty }, fw, &styles, cur) {
-        let _ = app.run("type.char", json!({"attrs": {"fontStyle": styles[k]}}));
-    }
-    ui.add_space(1.0);
-    const SIZES: &[f64] = &[6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 14.0, 18.0, 21.0, 24.0, 30.0, 36.0, 48.0, 60.0, 72.0];
-    let half = (fw - 10.0) / 2.0;
-    let b = block(ui, 2.0 * FIELD_H + 5.0);
-    let size = c["size"].as_f64();
-    let auto = c["leading"]["kind"].as_str() != Some("points");
-    let lv = if auto { size.map(|s| s * a["para"]["autoLeading"].as_f64().unwrap_or(1.2)) } else { c["leading"]["value"].as_f64() };
-    icons::paint(ui.painter(), sub(b, 0.0, 1.0, 19.0, 19.0), "font-size", t.icon);
-    if let Some(v) = place(ui, sub(b, 24.0, 0.0, half - 24.0, FIELD_H), |ui| {
-        NumField::number("csize", size, " pt", 2).width(half - 24.0).spinner().presets(SIZES).range(0.1, 1296.0).show(ui)
-    }) {
-        let _ = app.run("type.char", json!({"attrs": {"size": v}}));
-    }
-    icons::paint(ui.painter(), sub(b, half + 10.0, 1.0, 19.0, 19.0), "leading", t.icon);
-    let lw = half - 24.0;
-    let lshow = lv.map(|v| (v * 100.0).round() / 100.0);
-    if let Some(v) = place(ui, sub(b, half + 34.0, 0.0, lw, FIELD_H), |ui| {
-        let key = if auto { "cleadauto" } else { "clead" };
-        // Auto leading is shown in parentheses, like "(14.4 pt)".
-        NumField::number(key, lshow, " pt", 2).width(lw).spinner().presets(SIZES).range(0.0, 5000.0).parens(auto).show(ui)
-    }) {
-        let _ = app.run("type.char", json!({"attrs": {"leading": {"kind": "points", "value": v}}}));
-    }
-    // Kerning / tracking.
-    icons::paint(ui.painter(), sub(b, 0.0, 27.0, 19.0, 19.0), "kerning", t.icon);
-    place(ui, sub(b, 24.0, 26.0, half - 24.0, FIELD_H), |ui| kerning_control(app, ui, "ckern", &c["kerning"], half - 24.0));
-    icons::paint(ui.painter(), sub(b, half + 10.0, 27.0, 19.0, 19.0), "tracking", t.icon);
-    const TRACK: &[f64] = &[-100.0, -75.0, -50.0, -25.0, -10.0, -5.0, 0.0, 5.0, 10.0, 25.0, 50.0, 75.0, 100.0, 200.0];
-    if let Some(v) = place(ui, sub(b, half + 34.0, 26.0, lw, FIELD_H), |ui| {
-        NumField::number("ctrack", c["tracking"].as_f64(), "", 0).width(lw).spinner().presets(TRACK).step(5.0).range(-1000.0, 10000.0).show(ui)
-    }) {
-        let _ = app.run("type.char", json!({"attrs": {"tracking": v}}));
-    }
-    // ••• shows the rest in place, as InDesign's Properties panel does.
-    let more = temp_bool(ui, "props_char_more", false);
-    if more {
-        character_more(app, ui, &c, fw);
-    }
-    if more_options(ui, &app.ui.language).clicked() {
-        set_temp_bool(ui, "props_char_more", !more);
-    }
-}
-
-/// A percentage or other number field in one half of a two-field row, with its icon.
-#[allow(clippy::too_many_arguments)]
-fn half_field(ui: &mut Ui, b: Rect, right: bool, y: f32, half: f32, icon: &str, tip: &str, field: NumField) -> Option<f64> {
-    half_field_or_clear(ui, b, right, y, half, icon, tip, field).flatten()
-}
-
-/// [`half_field`] for a value that may be unset: emptying the field commits `Some(None)`.
-#[allow(clippy::too_many_arguments)]
-fn half_field_or_clear(ui: &mut Ui, b: Rect, right: bool, y: f32, half: f32, icon: &str, tip: &str, field: NumField) -> Option<Option<f64>> {
-    let t = Tokens::get(ui.ctx());
-    let x = if right { half + 10.0 } else { 0.0 };
-    let ir = sub(b, x, y + 1.0, 19.0, 19.0);
-    icons::paint(ui.painter(), ir, icon, t.icon);
-    let resp = ui.interact(ir, ui.id().with(("half_icon", icon)), Sense::hover());
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, tip));
-    let label = resp.id;
-    resp.on_hover_text(tip);
-    place(ui, sub(b, x + 24.0, y, half - 24.0, FIELD_H), |ui| field.width(half - 24.0).labelled_by(label).show_or_clear(ui))
-}
-
-/// Properties › Character after •••: vertical and horizontal scale, baseline shift and skew,
-/// language and OpenType, then All Caps, Small Caps, Superscript, Subscript, Underline and
-/// Strikethrough, as InDesign lays them out.
-fn character_more(app: &mut DesignApp, ui: &mut Ui, c: &Value, fw: f32) {
-    let lang_ui = app.ui.language.clone();
-    let tr = |s: &str| crate::i18n::tr(&lang_ui, s).to_string();
-    let half = (fw - 10.0) / 2.0;
-    let b = block(ui, 2.0 * FIELD_H + 5.0);
-    const SCALES: &[f64] = &[25.0, 50.0, 75.0, 80.0, 90.0, 100.0, 110.0, 120.0, 125.0, 150.0, 200.0];
-    let pct = |v: &Value| v.as_f64().map(|s| (s * 1000.0).round() / 10.0);
-    let field = |id, v, suffix, decimals| NumField::number(id, v, suffix, decimals).spinner();
-    if let Some(v) = half_field(
-        ui,
-        b,
-        false,
-        0.0,
-        half,
-        "vscale",
-        &tr("Vertical Scale"),
-        field("cvscale", pct(&c["vScale"]), "%", 1).presets(SCALES).range(1.0, 1000.0),
-    ) {
-        let _ = app.run("type.char", json!({"attrs": {"vScale": v / 100.0}}));
-    }
-    if let Some(v) = half_field(
-        ui,
-        b,
-        true,
-        0.0,
-        half,
-        "hscale",
-        &tr("Horizontal Scale"),
-        field("chscale", pct(&c["hScale"]), "%", 1).presets(SCALES).range(1.0, 1000.0),
-    ) {
-        let _ = app.run("type.char", json!({"attrs": {"hScale": v / 100.0}}));
-    }
-    if let Some(v) = half_field(
-        ui,
-        b,
-        false,
-        26.0,
-        half,
-        "baseline-shift",
-        &tr("Baseline Shift"),
-        field("cbshift", c["baselineShift"].as_f64(), " pt", 2).range(-5000.0, 5000.0),
-    ) {
-        let _ = app.run("type.char", json!({"attrs": {"baselineShift": v}}));
-    }
-    if let Some(v) =
-        half_field(ui, b, true, 26.0, half, "skew", &tr("Skew (False Italic)"), field("cskew", c["skew"].as_f64(), "°", 1).range(-85.0, 85.0))
-    {
-        let _ = app.run("type.char", json!({"attrs": {"skew": v}}));
-    }
-    // Language (hyphenation, spelling and typographer's quotes follow it) and OpenType.
-    ui.add_space(4.0);
-    let lang = c["language"].as_str().unwrap_or("English: USA").to_string();
-    let label = tr("Language");
-    let row = block(ui, FIELD_H);
-    let resp = place(ui, sub(row, 0.0, 0.0, half, FIELD_H), |ui| widgets::dropdown(ui, crate::i18n::tr(&lang_ui, &lang), half)).on_hover_ui(|ui| {
-        crate::rtl::label(ui, label.clone());
-    });
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::ComboBox, true, &label));
-    egui::Popup::menu(&resp).show(|ui| {
-        ui.set_min_width(half);
-        egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| language_menu(app, ui, &lang));
-    });
-    if place(ui, sub(row, half + 10.0, 0.0, half, FIELD_H), |ui| widgets::outline_button(ui, &tr("OpenType"), half)).clicked() {
-        show_typography_panel(app);
-    }
-    // The case and position buttons.
-    ui.add_space(8.0);
-    let caps = c["capitalization"].as_str().unwrap_or("normal").to_string();
-    let pos = c["position"].as_str().unwrap_or("normal").to_string();
-    let (ul, st) = (c["underline"].as_bool().unwrap_or(false), c["strikethrough"].as_bool().unwrap_or(false));
-    let buttons: [(&str, &str, bool, Value); 6] = [
-        ("TT", "All Caps", caps == "allCaps", json!({"capitalization": if caps == "allCaps" { "normal" } else { "allCaps" }})),
-        ("Tᴛ", "Small Caps", caps == "smallCaps", json!({"capitalization": if caps == "smallCaps" { "normal" } else { "smallCaps" }})),
-        ("T¹", "Superscript", pos == "superscript", json!({"position": if pos == "superscript" { "normal" } else { "superscript" }})),
-        ("T₁", "Subscript", pos == "subscript", json!({"position": if pos == "subscript" { "normal" } else { "subscript" }})),
-        ("T̲", "Underline", ul, json!({"underline": !ul})),
-        ("T", "Strikethrough", st, json!({"strikethrough": !st})),
-    ];
-    let pitch = fw / 6.0;
-    let row = block(ui, 22.0);
-    for (i, (text, tip, on, attrs)) in buttons.into_iter().enumerate() {
-        let r = Rect::from_center_size(row.min + vec2(pitch * (i as f32 + 0.5), 11.0), vec2(26.0, 22.0));
-        let resp = ui.interact(r, ui.id().with(("case", i)), Sense::click());
-        let t = Tokens::get(ui.ctx());
-        if on {
-            ui.painter().rect_filled(r, 2.0, t.tool_active);
-        } else if resp.hovered() {
-            ui.painter().rect_filled(r, 2.0, t.hover);
-        }
-        let col = if on { t.text_strong } else { t.icon };
-        ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, egui::FontId::proportional(13.0), col);
-        // Strikethrough: the T struck through (a combining stroke doesn't draw in every font).
-        if i == 5 {
-            ui.painter().line_segment([r.center() + vec2(-6.0, 0.5), r.center() + vec2(6.0, 0.5)], Stroke::new(1.2, col));
-        }
-        let tip = tr(tip);
-        resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, true, on, &tip));
-        if resp.on_hover_text(&tip).clicked() {
-            let _ = app.run("type.char", json!({"attrs": attrs}));
-        }
-    }
-    ui.add_space(4.0);
-}
-
-/// Paragraph section: the 9 alignment buttons and •••.
-fn paragraph_section(app: &mut DesignApp, ui: &mut Ui) {
-    let Some(a) = text_attrs(app) else { return };
-    let cur: Align = serde_json::from_value(a["para"]["align"].clone()).unwrap_or_default();
-    let fw = full_width(ui);
-    let pitch = fw / 9.0;
-    ui.horizontal(|ui| {
-        ui.spacing_mut().item_spacing.x = 0.0;
-        for (al, icon) in [
-            (Align::Left, "palign-left"),
-            (Align::Center, "palign-center"),
-            (Align::Right, "palign-right"),
-            (Align::LeftJustified, "palign-justify-left"),
-            (Align::CenterJustified, "palign-justify-center"),
-            (Align::RightJustified, "palign-justify-right"),
-            (Align::FullyJustified, "palign-justify-all"),
-            (Align::TowardsSpine, "palign-spine-towards"),
-            (Align::AwayFromSpine, "palign-spine-away"),
-        ] {
-            if widgets::icon_toggle_sized(ui, icon, cur == al, al.label(), vec2(pitch.min(23.0), 21.0)).clicked() {
-                let _ = app.run("type.para", json!({"attrs": {"align": al}}));
-            }
-            if pitch > 23.0 {
-                ui.add_space(pitch - 23.0);
-            }
-        }
-    });
-    let more = temp_bool(ui, "props_para_more", false);
-    if more {
-        paragraph_more(app, ui, &a["para"], fw);
-    }
-    if more_options(ui, &app.ui.language).clicked() {
-        set_temp_bool(ui, "props_para_more", !more);
-    }
-}
-
-/// Properties › Paragraph after •••: left and right indent, first line and last line indent,
-/// space before and after, drop cap lines and characters, then Hyphenate and Align to Baseline
-/// Grid, as InDesign lays them out.
-fn paragraph_more(app: &mut DesignApp, ui: &mut Ui, p: &Value, fw: f32) {
-    let lang_ui = app.ui.language.clone();
-    let tr = |s: &str| crate::i18n::tr(&lang_ui, s).to_string();
-    let u = units(app);
-    let half = (fw - 10.0) / 2.0;
-    ui.add_space(4.0);
-    let b = block(ui, 4.0 * FIELD_H + 15.0);
-    let rows = [
-        (("indent-left", "Left Indent", "leftIndent"), ("indent-right", "Right Indent", "rightIndent")),
-        (("indent-first", "First Line Left Indent", "firstLineIndent"), ("indent-last", "Last Line Right Indent", "lastLineIndent")),
-        (("space-before", "Space Before", "spaceBefore"), ("space-after", "Space After", "spaceAfter")),
-    ];
-    for (i, (l, r)) in rows.into_iter().enumerate() {
-        let y = i as f32 * (FIELD_H + 5.0);
-        for (right, (icon, tip, key)) in [(false, l), (true, r)] {
-            let min = para_field_min(key);
-            let field = NumField::measure(key, p[key].as_f64(), u).spinner().range(min, 10_000.0);
-            if let Some(v) = half_field(ui, b, right, y, half, icon, &tr(tip), field) {
-                let _ = app.run("type.para", json!({"attrs": {key: v}}));
-            }
-        }
-    }
-    let y = 3.0 * (FIELD_H + 5.0);
-    for (right, icon, tip, key, max) in [
-        (false, "drop-lines", "Drop Cap Number of Lines", "dropCapLines", designcraft_compose::MAX_DROP_CAP_LINES),
-        (true, "drop-chars", "Drop Cap One or More Characters", "dropCapChars", designcraft_compose::MAX_DROP_CAP_CHARS),
-    ] {
-        let field = NumField::number(key, p[key].as_f64(), "", 0).spinner().range(0.0, max as f64);
-        if let Some(v) = half_field(ui, b, right, y, half, icon, &tr(tip), field) {
-            let _ = app.run("type.para", json!({"attrs": {key: (v.max(0.0) as u64).min(max as u64)}}));
-        }
-    }
-    ui.add_space(4.0);
-    ui.horizontal(|ui| {
-        // First Line Only is aligned too: the button shows it pressed, and a click turns alignment off.
-        let grid = matches!(p["gridAlign"].as_str(), Some("allLines" | "firstLineOnly"));
-        if widgets::icon_toggle(ui, "grid-baseline", grid, &tr("Align to Baseline Grid")).clicked() {
-            let _ = app.run("type.para", json!({"attrs": {"gridAlign": if grid { "none" } else { "allLines" }}}));
-        }
-        ui.add_space(12.0);
-        let mut h = p["hyphenate"].as_bool().unwrap_or(true);
-        if widgets::checkbox(ui, &mut h, &tr("Hyphenate")).changed() {
-            let _ = app.run("type.para", json!({"attrs": {"hyphenate": h}}));
-        }
-    });
-    ui.add_space(4.0);
-}
-
-fn bullets_section(app: &mut DesignApp, ui: &mut Ui) {
-    if text_attrs(app).is_none() {
-        return;
-    }
-    ui.horizontal(|ui| {
-        ui.spacing_mut().item_spacing.x = 10.0;
-        // As InDesign's: a list with the default hanging indent, or (pressed: every selected
-        // paragraph has it, as Type › Apply Bullets shows) no list.
-        use designcraft_doc::ListType;
-        for (icon, kind, cmd, tip) in
-            [("bullets", ListType::Bullets, "list.bullets", "Bulleted List"), ("numbering", ListType::Numbers, "list.numbers", "Numbered List")]
-        {
-            let on = app.session.selection_has_list(kind);
-            if icon_toggle(ui, icon, on, crate::i18n::tr(&app.ui.language, tip)).clicked() {
-                let _ = app.run(cmd, json!({"on": !on}));
-            }
-        }
-        ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-            ui.add_space(8.0);
-            if outline_button(ui, crate::i18n::tr(&app.ui.language, "Options"), 66.0).clicked() {
-                show_panel(app, "paragraph");
-            }
-        });
-    });
-}
-
-fn quick_actions_text(app: &mut DesignApp, ui: &mut Ui) {
-    let fw = full_width(ui);
-    let hw = (fw - 10.0) / 2.0;
-    ui.horizontal(|ui| {
-        ui.spacing_mut().item_spacing.x = 10.0;
-        let r = outline_button(ui, crate::i18n::tr(&app.ui.language, "Change Case"), hw);
-        egui::Popup::menu(&r).show(|ui| {
-            for (label, v) in [("UPPERCASE", "allCaps"), ("Small Caps", "smallCaps"), ("Normal", "normal")] {
-                if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
-                    let _ = app.run("type.char", json!({"attrs": {"capitalization": v}}));
-                    ui.close();
-                }
-            }
-        });
-        if outline_button(ui, crate::i18n::tr(&app.ui.language, "Story Editor"), hw).clicked() {
-            let _ = app.run("app.storyEditor", json!({}));
-        }
-    });
-    ui.add_space(4.0);
-    if outline_button(ui, crate::i18n::tr(&app.ui.language, "Fill with Placeholder Text"), fw).clicked() {
-        let _ = app.run("type.fillWithPlaceholder", json!({}));
-    }
-}
-
-/// Text Frame section: columns, gutter, [Options].
-fn text_frame_section(app: &mut DesignApp, ui: &mut Ui) {
-    let t = Tokens::get(ui.ctx());
-    let u = units(app);
-    let Some(st) = app.session.active() else { return };
-    let fid = st.selection.items.first().copied().or_else(|| st.selection.text.and_then(|t| t.frame));
-    let Some(opts) = fid.and_then(|f| st.doc.item(f)).and_then(|i| i.text_frame()).map(|t| t.options.clone()) else { return };
-    let b = block(ui, FIELD_H);
-    icons::paint(ui.painter(), sub(b, 0.0, 1.0, 19.0, 19.0), "text-columns", t.icon);
-    if let Some(v) = place(ui, sub(b, 22.0, 0.0, 54.0, FIELD_H), |ui| {
-        NumField::number("tfcols", Some(opts.columns as f64), "", 0).width(54.0).spinner().range(1.0, 40.0).show(ui)
-    }) {
-        let _ = app.run("object.textFrameOptions", json!({"columns": v.max(1.0) as u64}));
-    }
-    icons::paint(ui.painter(), sub(b, 83.0, 1.0, 19.0, 19.0), "text-gutter", t.icon);
-    if let Some(v) = place(ui, sub(b, 105.0, 0.0, 54.0, FIELD_H), |ui| {
-        NumField::measure("tfgut", Some(opts.gutter), u).width(54.0).spinner().range(0.0, 1440.0).show(ui)
-    }) {
-        let _ = app.run("object.textFrameOptions", json!({"gutter": v}));
-    }
-    let ow = (b.max.x - 8.0) - (b.min.x + 164.0);
-    if place(ui, sub(b, 164.0, 0.5, ow, 20.0), |ui| outline_button(ui, crate::i18n::tr(&app.ui.language, "Options"), ow)).clicked() {
-        app.ui.dialog = Some(crate::dialogs::Dialog::new("textFrameOptions", json!({})));
-    }
-}
-
-/// Languages offered for text (InDesign-style names).
-pub(crate) const LANGUAGES: &[&str] = &[
-    "[No Language]",
-    "English: USA",
-    "English: UK",
-    "English: Canadian",
-    "German: 2006 Reform",
-    "German: Swiss 2006 Reform",
-    "French",
-    "French: Canadian",
-    "Spanish",
-    "Italian",
-    "Portuguese",
-    "Portuguese: Brazilian",
-    "Dutch: 2005 Reform",
-    "Danish",
-    "Swedish",
-    "Norwegian: Bokmål",
-    "Finnish",
-    "Polish",
-    "Czech",
-    "Hungarian",
-    "Greek",
-    "Russian",
-    "Ukrainian",
-    "Georgian",
-    "Turkish",
-    "Japanese",
-    "Chinese",
-    "Chinese: Simplified",
-    "Chinese: Traditional",
-    "Korean",
-    "Arabic",
-    "Hebrew",
-];
-
-/// The Language list (Character panel, Properties ▸ Character): picking one sets the language of
-/// the selected text.
-pub(crate) fn language_menu(app: &mut DesignApp, ui: &mut Ui, cur: &str) {
-    for l in LANGUAGES {
-        if ui.selectable_label(*l == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, l))).clicked() {
-            let _ = app.run("type.char", json!({"attrs": {"language": l}}));
-            ui.close();
-        }
-    }
-}
-
-/// Kerning for the text selection, or at a caret for the pair at the caret: the label shows
-/// Metrics, Optical, 0 or the manual value; its menu sets one of the first three or a manual value
-/// in 1/1000 em (typed or stepped).
-pub(crate) fn kerning_control(app: &mut DesignApp, ui: &mut egui::Ui, id: &str, k: &Value, width: f32) {
-    let kind = k["kind"].as_str().unwrap_or("metrics");
-    let manual = k["value"].as_f64().filter(|v| kind == "manual" && v.is_finite());
-    let label = match (kind, manual) {
-        ("optical", _) => "Optical".to_string(),
-        ("none", _) => "0".to_string(),
-        ("manual", Some(v)) => format!("{v}"),
-        _ => "Metrics".to_string(),
-    };
-    let resp = widgets::dropdown(ui, crate::i18n::tr(&app.ui.language, &label), width);
-    let name = crate::i18n::tr(&app.ui.language, "Kerning");
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::ComboBox, true, name));
-    egui::Popup::menu(&resp).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
-        for (text, v) in [("Metrics", json!({"kind": "metrics"})), ("Optical", json!({"kind": "optical"})), ("0", json!({"kind": "none"}))] {
-            if ui.selectable_label(label == text, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, text))).clicked() {
-                let _ = app.run("type.kernPair", json!({"kerning": v}));
-                ui.close();
-            }
-        }
-        ui.separator();
-        // A manual value in 1/1000 em: after each selected character, or between the two at a caret.
-        let field = format!("{id}_manual");
-        if let Some(v) = NumField::number(&field, Some(manual.unwrap_or(0.0)), "", 0).width(90.0).spinner().step(5.0).range(-1000.0, 10000.0).show(ui)
-        {
-            let _ = app.run("type.kernPair", json!({"kerning": {"kind": "manual", "value": v}}));
-        }
-    });
-}
-
-pub fn character_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let Some(a) = text_attrs(app) else {
-        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Select text or a text frame."));
-        return;
-    };
-    let c = a["chars"].clone();
-    let fam = c["fontFamily"].as_str().unwrap_or("").to_string();
-    let sty = c["fontStyle"].as_str().unwrap_or("").to_string();
-    super::font_family_picker(app, ui, &fam, 220.0);
-    super::font_style_picker(app, ui, &fam, &sty, 220.0);
-    variable_font_axes(app, ui, &fam, &sty);
-    // Language: hyphenation, spelling and typographer's quotes follow it.
-    let lang = c["language"].as_str().unwrap_or("English: USA").to_string();
-    ui.horizontal(|ui| {
-        caption(ui, crate::i18n::tr(&app.ui.language, "Language"));
-        egui::ComboBox::from_id_salt("char_language")
-            .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, &lang)))
-            .width(170.0)
-            .show_ui(ui, |ui| language_menu(app, ui, &lang));
-    });
-    // Digits (World-Ready): how the figures 0-9 are drawn (Arabic 0123, Hindi ٠١٢٣, Farsi ۰۱۲۳).
-    let digits = c["digits"].as_str().unwrap_or("default").to_string();
-    ui.horizontal(|ui| {
-        caption(ui, crate::i18n::tr(&app.ui.language, "Digits"));
-        let cur = DIGIT_OPTIONS
-            .iter()
-            .find(|o| o.0 == digits)
-            .map_or_else(|| digit_label(&app.ui.language, DIGIT_OPTIONS[0]), |o| digit_label(&app.ui.language, *o));
-        egui::ComboBox::from_id_salt("char_digits").selected_text(crate::rtl::widget(ui, cur)).width(150.0).show_ui(ui, |ui| {
-            for o in DIGIT_OPTIONS {
-                if ui.selectable_label(o.0 == digits, crate::rtl::widget(ui, digit_label(&app.ui.language, o))).clicked() {
-                    let _ = app.run("type.char", json!({"attrs": {"digits": o.0}}));
-                }
-            }
-        });
-    });
-    // Two columns: Size, Kerning and Baseline on the left, Leading and Tracking on the right. A
-    // column's captions share the width of its widest one and each field takes the rest of the
-    // column, so they line up.
-    let auto = c["leading"]["kind"].as_str() != Some("points");
-    let lv = if auto { c["size"].as_f64().map(|s| s * a["para"]["autoLeading"].as_f64().unwrap_or(1.2)) } else { c["leading"]["value"].as_f64() };
-    let (left_w, right_w) = (caption_width(app, ui, &["Size", "Kerning", "Baseline"]), caption_width(app, ui, &["Leading", "Tracking"]));
-    ui.columns(2, |cols| {
-        let [left, right] = cols else { return };
-        if let Some(v) = char_field(app, left, "Size", left_w, NumField::number("pcs", c["size"].as_f64(), " pt", 2)) {
-            let _ = app.run("type.char", json!({"attrs": {"size": v}}));
-        }
-        left.horizontal(|ui| {
-            caption_cell(ui, crate::i18n::tr(&app.ui.language, "Kerning"), left_w);
-            let width = (ui.available_width() - ui.spacing().item_spacing.x).max(40.0);
-            kerning_control(app, ui, "pck", &c["kerning"], width);
-        });
-        if let Some(v) = char_field(app, left, "Baseline", left_w, NumField::number("pcb", c["baselineShift"].as_f64(), " pt", 2)) {
-            let _ = app.run("type.char", json!({"attrs": {"baselineShift": v}}));
-        }
-        // Auto leading is shown in parentheses, as the Paragraph panel shows it.
-        if let Some(v) = char_field(app, right, "Leading", right_w, NumField::number("pcl", lv, " pt", 2).parens(auto)) {
-            let _ = app.run("type.char", json!({"attrs": {"leading": {"kind": "points", "value": v}}}));
-        }
-        if let Some(v) = char_field(app, right, "Tracking", right_w, NumField::number("pct", c["tracking"].as_f64(), "", 0)) {
-            let _ = app.run("type.char", json!({"attrs": {"tracking": v}}));
-        }
-    });
-    ui.horizontal(|ui| {
-        caption(ui, crate::i18n::tr(&app.ui.language, "Color"));
-        super::swatch_picker(app, ui, "tfill", c["fill"].as_str().map(str::to_string), |app, n| {
-            let _ = app.run("type.char", json!({"attrs": {"fill": n}}));
-        });
-        crate::rtl::label(ui, c["fill"].as_str().unwrap_or(""));
-    });
-    ui.horizontal(|ui| {
-        // Bold and Italic pick the family's own styles (style linking).
-        let (weight, italic) = super::fonts(app).traits_of(c["fontFamily"].as_str().unwrap_or_default(), c["fontStyle"].as_str().unwrap_or_default());
-        let tip = |app: &DesignApp, name: &str, id: &str| {
-            let name = crate::i18n::tr(&app.ui.language, name);
-            match crate::menus::shortcut_of(app, id) {
-                Some(sc) => format!("{name} ({})", crate::menus::shortcut_text(&sc)),
-                None => name.to_string(),
-            }
-        };
-        let (bold_tip, italic_tip) = (tip(app, "Bold", "type.bold"), tip(app, "Italic", "type.italic"));
-        if ui
-            .selectable_label(weight >= 650.0, egui::RichText::new("B").strong())
-            .on_hover_ui(|ui| {
-                crate::rtl::label(ui, bold_tip);
-            })
-            .clicked()
-        {
-            let _ = app.run("type.bold", json!({}));
-        }
-        if ui
-            .selectable_label(italic, egui::RichText::new("I").italics())
-            .on_hover_ui(|ui| {
-                crate::rtl::label(ui, italic_tip);
-            })
-            .clicked()
-        {
-            let _ = app.run("type.italic", json!({}));
-        }
-        let caps = c["capitalization"].as_str() == Some("allCaps");
-        if ui
-            .selectable_label(caps, "TT")
-            .on_hover_ui(|ui| {
-                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "All Caps"));
-            })
-            .clicked()
-        {
-            let _ = app.run("type.char", json!({"attrs": {"capitalization": if caps { "normal" } else { "allCaps" }}}));
-        }
-        let ul = c["underline"].as_bool().unwrap_or(false);
-        if ui
-            .selectable_label(ul, "U")
-            .on_hover_ui(|ui| {
-                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Underline"));
-            })
-            .clicked()
-        {
-            let _ = app.run("type.char", json!({"attrs": {"underline": !ul}}));
-        }
-        let st = c["strikethrough"].as_bool().unwrap_or(false);
-        if ui
-            .selectable_label(st, "S")
-            .on_hover_ui(|ui| {
-                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Strikethrough"));
-            })
-            .clicked()
-        {
-            let _ = app.run("type.char", json!({"attrs": {"strikethrough": !st}}));
-        }
-        let sup = c["position"].as_str() == Some("superscript");
-        if ui
-            .selectable_label(sup, "T¹")
-            .on_hover_ui(|ui| {
-                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Superscript"));
-            })
-            .clicked()
-        {
-            let _ = app.run("type.char", json!({"attrs": {"position": if sup { "normal" } else { "superscript" }}}));
-        }
-        if ui
-            .button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "OpenType")))
-            .on_hover_ui(|ui| {
-                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Show the Typography panel"));
-            })
-            .clicked()
-        {
-            show_typography_panel(app);
-        }
-    });
-    // Underline / Strikethrough Options.
-    for (key, title) in [("underline", "Underline Options"), ("strikethrough", "Strikethrough Options")] {
-        if !c[key].as_bool().unwrap_or(false) {
-            continue;
-        }
-        egui::CollapsingHeader::new(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, title))).id_salt(key).show(ui, |ui| {
-            let size = c["size"].as_f64().unwrap_or(12.0);
-            let auto_off = if key == "underline" { size * 0.12 } else { size * 0.3 };
-            egui::Grid::new((key, "opts")).num_columns(4).spacing(vec2(6.0, 4.0)).show(ui, |ui| {
-                caption(ui, crate::i18n::tr(&app.ui.language, "Weight"));
-                let w = c[format!("{key}Weight")].as_f64().unwrap_or(size / 14.0);
-                if let Some(v) = number(ui, &format!("{key}w"), Some(w), " pt", 60.0, 2) {
-                    let _ = app.run("type.char", json!({"attrs": {format!("{key}Weight"): v.max(0.0)}}));
-                }
-                caption(ui, crate::i18n::tr(&app.ui.language, "Offset"));
-                let o = c[format!("{key}Offset")].as_f64().unwrap_or(auto_off);
-                if let Some(v) = number(ui, &format!("{key}o"), Some(o), " pt", 60.0, 2) {
-                    let _ = app.run("type.char", json!({"attrs": {format!("{key}Offset"): v}}));
-                }
-                ui.end_row();
-            });
-            ui.horizontal(|ui| {
-                caption(ui, crate::i18n::tr(&app.ui.language, "Color"));
-                let cur = c[format!("{key}Color")].as_str().filter(|s| !s.is_empty()).map(str::to_string);
-                super::swatch_picker(app, ui, &format!("{key}c"), cur.clone(), |app, n| {
-                    let _ = app.run("type.char", json!({"attrs": {format!("{key}Color"): n}}));
-                });
-                crate::rtl::label(ui, cur.unwrap_or_else(|| crate::i18n::tr(&app.ui.language, "(Text Color)").into()));
-            });
-        });
-    }
-}
-
-/// Opens the Typography panel, or focuses it when it is already showing. `window.panel` toggles a
-/// flyout, so it is skipped while the Typography flyout is open.
-pub fn show_typography_panel(app: &mut DesignApp) {
-    if app.ui.open_panel.as_deref() == Some("typography") {
-        return;
-    }
-    let _ = app.run("window.panel", json!({"panel": "typography"}));
-}
-
-/// The paragraph alignments in InDesign's order, with their icons.
-const PARA_ALIGNS: [(Align, &str); 9] = [
-    (Align::Left, "palign-left"),
-    (Align::Center, "palign-center"),
-    (Align::Right, "palign-right"),
-    (Align::LeftJustified, "palign-justify-left"),
-    (Align::CenterJustified, "palign-justify-center"),
-    (Align::RightJustified, "palign-justify-right"),
-    (Align::FullyJustified, "palign-justify-all"),
-    (Align::TowardsSpine, "palign-spine-towards"),
-    (Align::AwayFromSpine, "palign-spine-away"),
-];
-
-/// Space Between Paragraphs Using Same Style's presets (pt), after Ignore.
-const SAME_STYLE_SPACING: &[f64] = &[0.0, 3.0, 6.0, 9.0, 12.0, 18.0, 24.0];
-
-/// The Paragraph panel, laid out as InDesign's: the alignment buttons in groups of 3, 4 and 2;
-/// indents, spacing and drop cap fields by their icons in two columns; Shading and Border with
-/// their colours; Hyphenate and the baseline grid buttons. The rest (composer, grid and ragged
-/// lines options, the paragraph dialogs) is in the panel menu.
-pub fn paragraph_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let Some(a) = text_attrs(app) else {
-        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Select text or a text frame."));
-        return;
-    };
-    let lang_ui = app.ui.language.clone();
-    let tr = |s: &str| crate::i18n::tr(&lang_ui, s).to_string();
-    let u = units(app);
-    let p = a["para"].clone();
-    let fw = full_width(ui);
-    let half = (fw - 10.0) / 2.0;
-    // Alignment, and the panel menu at the right.
-    let cur: Align = serde_json::from_value(p["align"].clone()).unwrap_or_default();
-    const GAP: f32 = 8.0;
-    let pitch = ((fw - 24.0 - 2.0 * GAP) / 9.0).clamp(16.0, 24.0);
-    let b = block(ui, 21.0);
-    let mut x = 0.0;
-    for (i, (al, icon)) in PARA_ALIGNS.into_iter().enumerate() {
-        if i == 3 || i == 7 {
-            x += GAP;
-        }
-        if place(ui, sub(b, x, 0.0, pitch, 21.0), |ui| widgets::icon_toggle_sized(ui, icon, cur == al, &tr(al.label()), vec2(pitch, 21.0))).clicked()
-        {
-            let _ = app.run("type.para", json!({"attrs": {"align": al}}));
-        }
-        x += pitch;
-    }
-    place(ui, sub(b, fw - 20.0, 0.0, 20.0, 21.0), |ui| crate::menus::menu_button(ui, "☰", |ui| paragraph_panel_menu(app, ui, &p)));
-    ui.add_space(6.0);
-    // Indents, spacing and drop cap, two to a row as in InDesign.
-    let row = FIELD_H + 5.0;
-    let b = block(ui, 5.0 * row - 5.0);
-    let rows = [
-        (("indent-left", "Left Indent", "leftIndent"), ("indent-right", "Right Indent", "rightIndent")),
-        (("indent-first", "First Line Left Indent", "firstLineIndent"), ("indent-last", "Last Line Right Indent", "lastLineIndent")),
-        (("space-before", "Space Before", "spaceBefore"), ("space-after", "Space After", "spaceAfter")),
-    ];
-    for (i, (l, r)) in rows.into_iter().enumerate() {
-        for (right, (icon, tip, key)) in [(false, l), (true, r)] {
-            // The first and last line indents may be negative (a hanging line), as InDesign's.
-            let min = if matches!(key, "firstLineIndent" | "lastLineIndent") { -10_000.0 } else { 0.0 };
-            let field = NumField::measure(key, p[key].as_f64(), u).spinner().range(min, 10_000.0);
-            if let Some(v) = half_field(ui, b, right, i as f32 * row, half, icon, &tr(tip), field) {
-                let _ = app.run("type.para", json!({"attrs": {key: v}}));
-            }
-        }
-    }
-    // Space Between Paragraphs Using Same Style: Ignore (unset) or a space that replaces the
-    // space after and before between paragraphs of the same style.
-    let ignore = tr("Ignore");
-    let field = NumField::measure("sameParaStyleSpacing", p["sameParaStyleSpacing"].as_f64(), u)
-        .spinner()
-        .presets(SAME_STYLE_SPACING)
-        .empty_text(&ignore)
-        .range(0.0, 10_000.0);
-    if let Some(v) = half_field_or_clear(ui, b, false, 3.0 * row, half, "space-same", &tr("Space Between Paragraphs Using Same Style"), field) {
-        let _ = app.run("type.para", json!({"attrs": {"sameParaStyleSpacing": v}}));
-    }
-    for (right, icon, tip, key, max) in [
-        (false, "drop-lines", "Drop Cap Number of Lines", "dropCapLines", designcraft_compose::MAX_DROP_CAP_LINES),
-        (true, "drop-chars", "Drop Cap One or More Characters", "dropCapChars", designcraft_compose::MAX_DROP_CAP_CHARS),
-    ] {
-        let field = NumField::number(key, p[key].as_f64(), "", 0).spinner().range(0.0, max as f64);
-        if let Some(v) = half_field(ui, b, right, 4.0 * row, half, icon, &tr(tip), field) {
-            let _ = app.run("type.para", json!({"attrs": {key: (v.max(0.0) as u64).min(max as u64)}}));
-        }
-    }
-    // Shading and Border: on or off at the left; at the right the Paragraph Borders and Shading
-    // dialog on its tab and the colour.
-    ui.add_space(10.0);
-    let doc = app.session.active().map(|d| d.doc.clone());
-    let b = block(ui, 2.0 * row - 5.0);
-    for (i, (on_key, color_key, label, icon, tab, name)) in [
-        ("shadingOn", "shadingColor", "Shading", "para-shading", "shading", "Paragraph Shading"),
-        ("borderOn", "borderColor", "Border", "para-border", "border", "Paragraph Border"),
-    ]
-    .into_iter()
-    .enumerate()
-    {
-        let y = i as f32 * row;
-        let mut on = p[on_key].as_bool().unwrap_or(false);
-        if place(ui, sub(b, 0.0, y, half, FIELD_H), |ui| widgets::checkbox(ui, &mut on, &tr(label))).changed() {
-            let _ = app.run("type.para", json!({"attrs": {on_key: on}}));
-        }
-        if place(ui, sub(b, half + 10.0, y, 23.0, FIELD_H), |ui| widgets::icon_toggle(ui, icon, false, &tr("Paragraph Borders and Shading…")))
-            .clicked()
-        {
-            let _ = app.run("app.paragraphBordersDialog", json!({"tab": tab}));
-        }
-        if let Some(doc) = &doc {
-            let color = p[color_key].as_str().unwrap_or("[Black]").to_string();
-            let w = half - 24.0;
-            if let Some(sw) = place(ui, sub(b, half + 34.0, y, w, FIELD_H), |ui| crate::chrome::swatch_field(ui, doc, &color, w, &tr(name))) {
-                let _ = app.run("type.para", json!({"attrs": {color_key: sw}}));
-            }
-        }
-    }
-    // Hyphenate, and Do Not Align / Align to Baseline Grid.
-    ui.add_space(10.0);
-    let b = block(ui, FIELD_H);
-    let mut h = p["hyphenate"].as_bool().unwrap_or(true);
-    if place(ui, sub(b, 0.0, 0.0, half, FIELD_H), |ui| widgets::checkbox(ui, &mut h, &tr("Hyphenate"))).changed() {
-        let _ = app.run("type.para", json!({"attrs": {"hyphenate": h}}));
-    }
-    let grid = matches!(p["gridAlign"].as_str(), Some("allLines" | "firstLineOnly"));
-    for (i, (icon, tip, on, v)) in
-        [("grid-none", "Do Not Align to Baseline Grid", !grid, "none"), ("grid-baseline", "Align to Baseline Grid", grid, "allLines")]
-            .into_iter()
-            .enumerate()
-    {
-        if place(ui, sub(b, fw - 48.0 + i as f32 * 25.0, 0.0, 23.0, FIELD_H), |ui| widgets::icon_toggle(ui, icon, on, &tr(tip))).clicked() && !on {
-            let _ = app.run("type.para", json!({"attrs": {"gridAlign": v}}));
-        }
-    }
-    ui.add_space(4.0);
-}
-
-/// The Paragraph panel menu, in the order of InDesign's.
-fn paragraph_panel_menu(app: &mut DesignApp, ui: &mut Ui, p: &Value) {
-    let lang = app.ui.language.clone();
-    let item = |ui: &mut Ui, label: &str, check: Option<bool>, enabled: bool| -> bool {
-        let label = crate::i18n::tr(&lang, label);
-        let text = match check {
-            Some(true) => format!("✓ {label}"),
-            Some(false) => format!("   {label}"),
-            None => label.to_string(),
-        };
-        let clicked = ui.add_enabled(enabled, egui::Button::new(crate::rtl::widget(ui, text))).clicked();
-        if clicked {
-            ui.close();
-        }
-        clicked
-    };
-    let mut attrs = None;
-    let mut command = None;
-    let (single, [paragraph, single_line]) = composer_choice(p["composer"].as_str());
-    if item(ui, "Paragraph Composer", Some(!single), true) {
-        attrs = Some(json!({"composer": paragraph}));
-    }
-    if item(ui, "Single-line Composer", Some(single), true) {
-        attrs = Some(json!({"composer": single_line}));
-    }
-    ui.separator();
-    let grid = p["gridAlign"].as_str().unwrap_or("none");
-    if item(ui, "Only Align First Line to Grid", Some(grid == "firstLineOnly"), grid != "none") {
-        attrs = Some(json!({"gridAlign": if grid == "firstLineOnly" { "allLines" } else { "firstLineOnly" }}));
-    }
-    let balance = p["balanceRagged"].as_bool().unwrap_or(false);
-    if item(ui, "Balance Ragged Lines", Some(balance), true) {
-        attrs = Some(json!({"balanceRagged": !balance}));
-    }
-    let optical = p["opticalMargin"].as_bool().unwrap_or(false);
-    if item(ui, "Optical Margin Alignment", Some(optical), true) {
-        attrs = Some(json!({"opticalMargin": !optical}));
-    }
-    ui.separator();
-    for (label, id) in [
-        ("Justification…", "app.justificationDialog"),
-        ("Keep Options…", "app.keepOptionsDialog"),
-        ("Span Columns…", "app.spanColumnsDialog"),
-        ("Hyphenation…", "app.hyphenationDialog"),
-        ("Drop Caps and Nested Styles…", "app.nestedStylesDialog"),
-        ("GREP Styles…", "app.grepStylesDialog"),
-        ("Paragraph Rules…", "app.paragraphRulesDialog"),
-        ("Paragraph Borders and Shading…", "app.paragraphBordersDialog"),
-    ] {
-        if item(ui, label, None, true) {
-            command = Some(id);
-        }
-    }
-    ui.separator();
-    if item(ui, "Bullets and Numbering…", None, true) {
-        command = Some("app.bulletsNumberingDialog");
-    }
-    // Restart Numbering at 1, or Continue Numbering from the paragraph before, for a numbered list.
-    let numbered = p["listType"].as_str() == Some("numbers");
-    let restarts = p["startAt"].is_u64();
-    let label = match (numbered, restarts) {
-        (false, _) => "Restart/Continue Numbering",
-        (true, false) => "Restart Numbering",
-        (true, true) => "Continue Numbering",
-    };
-    if item(ui, label, None, numbered) {
-        attrs = Some(json!({"startAt": if restarts { Value::Null } else { json!(1) }}));
-    }
-    item(ui, "Convert Bullets and Numbering to Text", None, false);
-    if item(ui, "Define Lists…", None, true) {
-        command = Some("list.define");
-    }
-    // Paragraph Direction (World-Ready): switching also mirrors left and right alignment.
-    ui.separator();
-    let rtl = p["direction"] == "rightToLeft";
-    for (on, label, dir) in [(!rtl, "Left to Right", "leftToRight"), (rtl, "Right to Left", "rightToLeft")] {
-        if item(ui, label, Some(on), true) && !on {
-            let align = match serde_json::from_value(p["align"].clone()).unwrap_or_default() {
-                Align::Left => Align::Right,
-                Align::Right => Align::Left,
-                a => a,
-            };
-            attrs = Some(json!({"direction": dir, "align": align}));
-        }
-    }
-    if let Some(attrs) = attrs {
-        let _ = app.run("type.para", json!({"attrs": attrs}));
-    }
-    // As a menu choice: Define Lists… and the other commands open their dialogs.
-    if let Some(id) = command {
-        crate::menus::activate(app, id, &Value::Null);
-    }
-}
-
-/// Stroke panel: weight, cap, miter limit, join, alignment, type, arrowheads, gap colour.
-pub fn stroke_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    if super::cell_stroke::in_cells(app) {
-        super::cell_stroke::panel(app, ui);
-        return;
-    }
-    if super::colors_affect_text(app)
-        && let Some(a) = text_attrs(app)
-    {
-        text_stroke_panel(app, ui, &a["chars"]);
-        return;
-    }
-    let Some(i) = sel_info(app) else {
-        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Select an object."));
-        return;
-    };
-    let Some(st) = app.session.active().and_then(|d| d.selection.items.first().and_then(|id| d.doc.item(*id)).map(|it| it.stroke.clone())) else {
-        return;
-    };
-    let t = Tokens::get(ui.ctx());
-    egui::Grid::new("stroke_panel").num_columns(2).spacing(vec2(8.0, 6.0)).show(ui, |ui| {
-        caption(ui, crate::i18n::tr(&app.ui.language, "Weight:"));
-        if let Some(v) = number(ui, "sw", Some(i.stroke_weight), " pt", 60.0, 3) {
-            let _ = app.run("object.stroke", json!({"weight": v}));
-        }
-        ui.end_row();
-        caption(ui, crate::i18n::tr(&app.ui.language, "Cap:"));
-        ui.horizontal(|ui| {
-            for (label, v, cur) in [("Butt", "butt", Cap::Butt), ("Round", "round", Cap::Round), ("Projecting", "projecting", Cap::Projecting)] {
-                if ui.selectable_label(st.cap == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
-                    let _ = app.run("object.stroke", json!({"cap": v}));
-                }
-            }
-        });
-        ui.end_row();
-        caption(ui, crate::i18n::tr(&app.ui.language, "Join:"));
-        ui.horizontal(|ui| {
-            for (label, v, cur) in [("Miter", "miter", Join::Miter), ("Round", "round", Join::Round), ("Bevel", "bevel", Join::Bevel)] {
-                if ui.selectable_label(st.join == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
-                    let _ = app.run("object.stroke", json!({"join": v}));
-                }
-            }
-        });
-        ui.end_row();
-        caption(ui, crate::i18n::tr(&app.ui.language, "Miter Limit:"));
-        if let Some(v) = number(ui, "smiter", Some(st.miter_limit), " x", 60.0, 0) {
-            let _ = app.run("object.stroke", json!({"miterLimit": v}));
-        }
-        ui.end_row();
-        caption(ui, crate::i18n::tr(&app.ui.language, "Align Stroke:"));
-        ui.horizontal(|ui| {
-            for (label, a, cur) in
-                [("Center", "center", StrokeAlign::Center), ("Inside", "inside", StrokeAlign::Inside), ("Outside", "outside", StrokeAlign::Outside)]
-            {
-                if ui.selectable_label(st.align == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
-                    let _ = app.run("object.stroke", json!({"align": a}));
-                }
-            }
-        });
-        ui.end_row();
-        caption(ui, crate::i18n::tr(&app.ui.language, "Type:"));
-        let custom: Vec<String> = app.session.active().map(|d| d.doc.stroke_styles.iter().map(|x| x.name.clone()).collect()).unwrap_or_default();
-        let shown = match &st.kind {
-            StrokeType::Style { name } => name.clone(),
-            k => k.label().to_string(),
-        };
-        egui::ComboBox::from_id_salt("stype")
-            .selected_text(crate::rtl::widget(
-                ui,
-                if matches!(st.kind, StrokeType::Style { .. }) { &shown } else { crate::i18n::tr(&app.ui.language, &shown) },
-            ))
-            .width(140.0)
-            .show_ui(ui, |ui| {
-                let built_in = [
-                    "solid",
-                    "dashed",
-                    "dotted",
-                    "thickThin",
-                    "thinThick",
-                    "thinThin",
-                    "thickThick",
-                    "thinThickThin",
-                    "thickThinThick",
-                    "wavy",
-                    "hashed",
-                ];
-                for k in built_in {
-                    let ty = if k == "dashed" { json!({"kind": k, "pattern": [12.0, 4.0]}) } else { json!({"kind": k}) };
-                    let label = serde_json::from_value::<StrokeType>(ty.clone()).map(|k| k.label()).unwrap_or("");
-                    if ui.selectable_label(shown == label, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
-                        let _ = app.run("object.stroke", json!({"type": ty}));
-                    }
-                }
-                if !custom.is_empty() {
-                    ui.separator();
-                }
-                for n in &custom {
-                    if ui.selectable_label(shown == *n, n).clicked() {
-                        let _ = app.run("object.stroke", json!({"type": {"kind": "style", "name": n}}));
-                    }
-                }
-            });
-        ui.end_row();
-        for (key, label, cur, flip) in [("start", "Start/End:", st.start, true), ("end", "", st.end, false)] {
-            caption(ui, crate::i18n::tr(&app.ui.language, label));
-            egui::ComboBox::from_id_salt(key)
-                .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, cur.label())))
-                .width(140.0)
-                .show_ui(ui, |ui| {
-                    for a in Arrowhead::ALL {
-                        ui.horizontal(|ui| {
-                            arrow_preview(ui, a, flip, t.text_strong);
-                            if ui.selectable_label(a == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, a.label()))).clicked() {
-                                let _ = app.run("object.stroke", json!({key: a}));
-                            }
-                        });
-                    }
-                });
-            ui.end_row();
-        }
-        caption(ui, crate::i18n::tr(&app.ui.language, "Gap Color:"));
-        super::swatch_picker(app, ui, "sgap", Some(st.gap_swatch.clone()), |app, n| {
-            let _ = app.run("object.stroke", json!({"gapSwatch": n}));
-        });
-        ui.end_row();
-        caption(ui, crate::i18n::tr(&app.ui.language, "Color:"));
-        super::swatch_picker(app, ui, "spick", Some(i.stroke.clone()), |app, n| {
-            let _ = app.run("object.stroke", json!({"swatch": n}));
-        });
-        ui.end_row();
-    });
-}
-
-/// Stroke panel while text is selected: the text's outline colour, weight and whether it sits behind the fill.
-fn text_stroke_panel(app: &mut DesignApp, ui: &mut egui::Ui, c: &Value) {
-    let swatch = c["stroke"].as_str().unwrap_or(designcraft_color::swatch::NONE).to_string();
-    egui::Grid::new("text_stroke_panel").num_columns(2).spacing(vec2(8.0, 6.0)).show(ui, |ui| {
-        caption(ui, crate::i18n::tr(&app.ui.language, "Weight:"));
-        if let Some(v) = number(ui, "tsw_panel", c["strokeWeight"].as_f64(), " pt", 60.0, 3) {
-            let _ = app.run("type.char", json!({"attrs": {"strokeWeight": v}}));
-        }
-        ui.end_row();
-        caption(ui, crate::i18n::tr(&app.ui.language, "Color:"));
-        super::swatch_picker(app, ui, "tspick", Some(swatch), |app, n| {
-            let _ = super::apply_swatch(app, true, &n, None);
-        });
-        ui.end_row();
-    });
-    let mut behind = c["strokeBehindFill"].as_bool().unwrap_or(false);
-    if ui.checkbox(&mut behind, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Stroke Behind Fill"))).changed() {
-        let _ = app.run("type.char", json!({"attrs": {"strokeBehindFill": behind}}));
-    }
-}
-
-/// A short line ending in arrowhead `a` (pointing left for Start, right for End).
-fn arrow_preview(ui: &mut egui::Ui, a: Arrowhead, start: bool, color: egui::Color32) {
-    use designcraft_geom::kurbo;
-    let (r, _) = ui.allocate_exact_size(vec2(56.0, 14.0), Sense::hover());
-    let mut line = kurbo::BezPath::new();
-    let (y, x0, x1) = (r.center().y as f64, r.left() as f64 + 6.0, r.right() as f64 - 6.0);
-    if start {
-        line.move_to((x1, y));
-        line.line_to((x0, y));
-    } else {
-        line.move_to((x0, y));
-        line.line_to((x1, y));
-    }
-    let st = designcraft_doc::Stroke { weight: 1.5, end: a, ..Default::default() };
-    let (line, heads) = designcraft_doc::arrow::apply(&line, &st, false).unwrap_or((line, vec![]));
-    let pts = |p: &kurbo::BezPath| {
-        let mut v = Vec::new();
-        kurbo::flatten(p.iter(), 0.1, |el| match el {
-            kurbo::PathEl::MoveTo(p) | kurbo::PathEl::LineTo(p) => v.push(pos2(p.x as f32, p.y as f32)),
-            _ => {}
-        });
-        v
-    };
-    let painter = ui.painter();
-    painter.add(egui::Shape::line(pts(&line), Stroke::new(1.5, color)));
-    for h in heads {
-        let p = pts(&h.path);
-        match h.outline {
-            Some(w) if matches!(h.path.elements().last(), Some(kurbo::PathEl::ClosePath)) => {
-                painter.add(egui::Shape::closed_line(p, Stroke::new(w as f32, color)));
-            }
-            Some(w) => {
-                painter.add(egui::Shape::line(p, Stroke::new(w as f32, color)));
-            }
-            None => {
-                painter.add(egui::Shape::convex_polygon(p, color, Stroke::NONE));
-            }
-        }
-    }
-}
-
-pub fn wrap_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let info = sel_info(app);
-    let mode = info.as_ref().map_or("none", |i| i.wrap);
-    // As InDesign's Text Wrap panel: the five wrap buttons and Invert, then the four offsets
-    // (top and bottom, left and right) with the link button that makes them all the same.
-    ui.horizontal(|ui| {
-        for (icon, m, tip) in [
-            ("wrap-none", "none", "No Text Wrap"),
-            ("wrap-bbox", "boundingBox", "Wrap Around Bounding Box"),
-            ("wrap-contour", "contour", "Wrap Around Object Shape"),
-            ("wrap-jump", "jumpObject", "Jump Object"),
-            ("wrap-next", "jumpToNextColumn", "Jump to Next Column"),
-        ] {
-            if icons::button(ui, icon, 26.0, mode == m, crate::i18n::tr(&app.ui.language, tip)).clicked() {
-                let _ = app.run("object.textWrap", json!({"mode": m}));
-            }
-        }
-        ui.add_space(6.0);
-        let mut inv = info.as_ref().is_some_and(|i| i.wrap_invert);
-        let r = ui.add_enabled_ui(mode != "none", |ui| widgets::checkbox(ui, &mut inv, crate::i18n::tr(&app.ui.language, "Invert"))).inner;
-        if r.changed() {
-            let _ = app.run("object.textWrap", json!({"mode": mode, "invert": inv}));
-        }
-    });
-    let u = units(app);
-    let offsets = info.as_ref().map(|i| i.wrap_offsets);
-    // Linked while the offsets are all the same, until the link is clicked.
-    let linked_id = egui::Id::new("wrap_offsets_linked");
-    let linked = ui.data(|d| d.get_temp::<bool>(linked_id)).unwrap_or_else(|| offsets.is_none_or(|o| o.iter().all(|v| (v - o[0]).abs() < 1e-9)));
-    let mut set: Option<[f64; 4]> = None;
-    ui.add_enabled_ui(mode != "none" && info.is_some(), |ui| {
-        // Two rows of fixed-width cells: Top | Left, then Bottom | Right; the link between them.
-        let cell = |ui: &mut Ui, w: f32, label: &str| {
-            let x0 = ui.cursor().min.x;
-            caption(ui, crate::i18n::tr(&app.ui.language, label));
-            ui.add_space((w - (ui.cursor().min.x - x0)).max(0.0));
-        };
-        // The second column starts where the first row's does (after the link button).
-        let mut col2_x: Option<f32> = None;
-        for (r, row) in [[(0, "Top"), (1, "Left")], [(2, "Bottom"), (3, "Right")]].into_iter().enumerate() {
-            ui.horizontal(|ui| {
-                for (k, (side, label)) in row.into_iter().enumerate() {
-                    if k == 1 {
-                        match col2_x {
-                            Some(x) => ui.add_space((x - ui.cursor().min.x).max(0.0)),
-                            None => col2_x = Some(ui.cursor().min.x),
-                        }
-                    }
-                    cell(ui, if k == 0 { 56.0 } else { 40.0 }, label);
-                    if let Some(v) = measure(ui, &format!("wo{side}"), offsets.map(|o| o[side]), u, 60.0) {
-                        let mut o = offsets.unwrap_or([0.0; 4]);
-                        if linked {
-                            o = [v; 4];
-                        } else {
-                            o[side] = v;
-                        }
-                        set = Some(o);
-                    }
-                    if k == 0 && r == 0 {
-                        let tip = crate::i18n::tr(&app.ui.language, "Make all settings the same");
-                        let link = widgets::icon_toggle_sized(ui, if linked { "link" } else { "link-broken" }, linked, tip, vec2(22.0, 21.0));
-                        if link.clicked() {
-                            ui.data_mut(|d| d.insert_temp(linked_id, !linked));
-                        }
-                    }
-                }
-            });
-        }
-    });
-    if let Some(o) = set {
-        let _ = app.run("object.textWrap", json!({"mode": mode, "offset": o}));
-    }
-    let Some(i) = info.as_ref().filter(|i| i.wrap == "boundingBox" || i.wrap == "contour") else { return };
-    let sides = [
-        ("bothSides", "Both Right & Left Sides"),
-        ("rightSide", "Right Side"),
-        ("leftSide", "Left Side"),
-        ("towardsSpine", "Side Towards Spine"),
-        ("awayFromSpine", "Side Away from Spine"),
-        ("largestArea", "Largest Area"),
-    ];
-    wrap_combo(app, ui, "wrap_side", "Wrap To", &sides, &[], &i.wrap_side, "side");
-    if i.wrap == "contour" && i.is_graphic {
-        // Detected edges, alpha channels and image paths aren't offered: composition doesn't read
-        // the image. An imported one shows by name and wraps around the frame.
-        let types = [("boundingBox", "Bounding Box"), ("graphicFrame", "Graphic Frame"), ("sameAsClipping", "Same as Clipping")];
-        let shown_only = [("detectEdges", "Detect Edges"), ("alphaChannel", "Alpha Channel"), ("photoshopPath", "Photoshop Path")];
-        wrap_combo(app, ui, "wrap_contour", "Contour Type", &types, &shown_only, &i.wrap_contour, "contour");
-    }
-}
-
-/// A Text Wrap panel choice: `opts` are offered, `shown_only` only name the current value.
-#[allow(clippy::too_many_arguments)]
-fn wrap_combo(
-    app: &mut DesignApp,
-    ui: &mut egui::Ui,
-    salt: &str,
-    caption_text: &str,
-    opts: &[(&str, &str)],
-    shown_only: &[(&str, &str)],
-    cur: &str,
-    key: &str,
-) {
-    ui.horizontal(|ui| {
-        caption(ui, crate::i18n::tr(&app.ui.language, caption_text));
-        let shown = opts.iter().chain(shown_only).find(|o| o.0 == cur).map_or(cur, |o| o.1).to_string();
-        egui::ComboBox::from_id_salt(salt).selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, &shown))).width(170.0).show_ui(
-            ui,
-            |ui| {
-                for (k, l) in opts {
-                    if ui.selectable_label(*k == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, l))).clicked() {
-                        let _ = app.run("object.textWrap", json!({ key: k }));
-                    }
-                }
-            },
-        );
-    });
-}
-
-/// The Pathfinder operations, in the order of InDesign's Pathfinder buttons.
-const PATHFINDER: [(&str, &str, &str); 5] = [
-    ("pf-add", "add", "Add"),
-    ("pf-subtract", "subtract", "Subtract"),
-    ("pf-intersect", "intersect", "Intersect"),
-    ("pf-exclude", "exclude", "Exclude Overlap"),
-    ("pf-minus-back", "minusBack", "Minus Back"),
-];
-
-/// Properties › Pathfinder (several objects selected): combine them into one shape.
-fn pathfinder_row(app: &mut DesignApp, ui: &mut Ui) {
-    ui.horizontal(|ui| {
-        ui.spacing_mut().item_spacing.x = 8.0;
-        for (icon, op, tip) in PATHFINDER {
-            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
-                let _ = app.run("object.pathfinder", json!({"op": op}));
-            }
-        }
-    });
-}
-
-/// Pathfinder panel › Paths: (icon, command, params, tooltip).
-const PATHS: [(&str, &str, &str, &str); 4] = [
-    ("path-join", "path.join", "{}", "Join Path"),
-    ("path-open", "object.convertShape", r#"{"to": "openPath"}"#, "Open Path"),
-    ("path-close", "object.convertShape", r#"{"to": "closedPath"}"#, "Close Path"),
-    ("path-reverse", "path.reverse", "{}", "Reverse Path"),
-];
-
-/// Pathfinder panel › Convert Shape: (icon, shape, tooltip).
-const CONVERT_SHAPE: [(&str, &str, &str); 9] = [
-    ("shape-rect", "rectangle", "Rectangle"),
-    ("shape-rounded", "roundedRectangle", "Rounded Rectangle"),
-    ("shape-beveled", "beveledRectangle", "Beveled Rectangle"),
-    ("shape-inverse", "inverseRoundedRectangle", "Inverse Rounded Rectangle"),
-    ("shape-ellipse", "ellipse", "Ellipse"),
-    ("shape-triangle", "triangle", "Triangle"),
-    ("shape-polygon", "polygon", "Polygon"),
-    ("shape-line", "line", "Line"),
-    ("shape-orthogonal", "orthogonalLine", "Orthogonal Line"),
-];
-
-/// Pathfinder panel › Convert Point: (icon, kind, tooltip).
-const CONVERT_POINT: [(&str, &str, &str); 4] = [
-    ("point-plain", "plain", "Plain"),
-    ("point-corner", "corner", "Corner"),
-    ("point-smooth", "smooth", "Smooth"),
-    ("point-symmetrical", "symmetrical", "Symmetrical"),
-];
-
-/// Pathfinder panel, as InDesign's: Paths, Pathfinder, Convert Shape and Convert Point, each a row of
-/// icon buttons acting on the selection.
-pub fn pathfinder_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let section = |ui: &mut egui::Ui, app: &DesignApp, title: &str| {
-        ui.add_space(4.0);
-        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, title));
-        ui.add_space(2.0);
-    };
-    let row = |ui: &mut egui::Ui, add: &mut dyn FnMut(&mut egui::Ui)| {
-        ui.horizontal_wrapped(|ui| {
-            ui.spacing_mut().item_spacing = egui::vec2(12.0, 8.0);
-            add(ui);
-        });
-    };
-    section(ui, app, "Paths:");
-    row(ui, &mut |ui| {
-        for (icon, cmd, params, tip) in PATHS {
-            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
-                let _ = app.run(cmd, serde_json::from_str(params).unwrap_or_default());
-            }
-        }
-    });
-    section(ui, app, "Pathfinder:");
-    row(ui, &mut |ui| {
-        for (icon, op, tip) in PATHFINDER {
-            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
-                let _ = app.run("object.pathfinder", json!({"op": op}));
-            }
-        }
-    });
-    section(ui, app, "Convert Shape:");
-    row(ui, &mut |ui| {
-        for (icon, to, tip) in CONVERT_SHAPE {
-            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
-                let _ = app.run("object.convertShape", json!({"to": to}));
-            }
-        }
-    });
-    section(ui, app, "Convert Point:");
-    row(ui, &mut |ui| {
-        for (icon, kind, tip) in CONVERT_POINT {
-            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
-                let _ = app.run("path.convertPoints", json!({"kind": kind}));
-            }
-        }
-    });
-}
-
-pub fn align_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    ui.horizontal(|ui| {
-        for (edge, icon, tip) in [
-            ("left", "objalign-left", "Align left edges"),
-            ("hcenter", "objalign-hcenter", "Align horizontal centers"),
-            ("right", "objalign-right", "Align right edges"),
-            ("top", "objalign-top", "Align top edges"),
-            ("vcenter", "objalign-vcenter", "Align vertical centers"),
-            ("bottom", "objalign-bottom", "Align bottom edges"),
-        ] {
-            if widgets::icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
-                let _ = app.run("object.align", json!({"edge": edge}));
-            }
-        }
-    });
-    ui.horizontal(|ui| {
-        if widgets::icon_toggle(ui, "objdistribute-h", false, crate::i18n::tr(&app.ui.language, "Distribute ↔")).clicked() {
-            let _ = app.run("object.distribute", json!({"axis": "horizontal"}));
-        }
-        if widgets::icon_toggle(ui, "objdistribute-v", false, crate::i18n::tr(&app.ui.language, "Distribute ↕")).clicked() {
-            let _ = app.run("object.distribute", json!({"axis": "vertical"}));
-        }
-    });
-}
-
-/// Links: status (missing / modified / embedded), page and effective resolution of every placed
-/// graphic and linked text file; Relink, Go To Link, Update Link, Embed Link for the chosen row.
-pub fn links_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    // Linked stories (Place and Link).
-    let stories = app.session.execute("story.links", &json!({})).ok().and_then(|v| v.as_array().cloned()).unwrap_or_default();
-    if !stories.is_empty() {
-        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Linked Stories")).strong());
-        for l in &stories {
-            let out = l["outOfDate"].as_bool().unwrap_or(false);
-            ui.horizontal(|ui| {
-                crate::rtl::label(
-                    ui,
-                    crate::i18n::tr(&app.ui.language, "Story {story} ← story {parent}")
-                        .replace("{story}", &l["story"].to_string())
-                        .replace("{parent}", &l["parent"].to_string()),
-                );
-                if out {
-                    crate::rtl::label(
-                        ui,
-                        crate::rtl::widget(
-                            ui,
-                            egui::RichText::new(crate::i18n::tr(&app.ui.language, "⚠ out of date")).color(egui::Color32::from_rgb(230, 160, 40)),
-                        ),
-                    );
-                    if ui.small_button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Update"))).clicked() {
-                        let _ = app.run("story.updateLink", json!({"story": l["story"]}));
-                    }
-                }
-            });
-        }
-        ui.separator();
-    }
-    let Some(st) = app.session.active() else { return };
-    let t = Tokens::get(ui.ctx());
-    // The list checks files on disk: refresh it at most twice a second.
-    let key = egui::Id::new("links_panel");
-    let now = ui.input(|i| i.time);
-    let rev = (st.uid, st.revision);
-    let cached: Option<(f64, (u64, u64), Vec<Value>)> = ui.data(|d| d.get_temp(key));
-    let rows = match cached {
-        Some((at, r, rows)) if r == rev && now - at < 0.5 => rows,
-        _ => {
-            let rows = app.session.execute("links.list", &json!({})).ok().and_then(|v| v.as_array().cloned()).unwrap_or_default();
-            ui.data_mut(|d| d.insert_temp(key, (now, rev, rows.clone())));
-            rows
-        }
-    };
-    if rows.is_empty() {
-        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "No placed graphics.")).color(t.text_dim));
-        return;
-    }
-    let sel_key = egui::Id::new("links_panel_sel");
-    let mut chosen: Option<u64> = ui.data(|d| d.get_temp(sel_key));
-    // Leave room for Status and Page/PPI instead of widening the grid for long source paths.
-    let name_width = (ui.available_width() - 160.0).max(50.0);
-    egui::Grid::new("links_grid").num_columns(3).striped(true).spacing([10.0, 4.0]).show(ui, |ui| {
-        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Name")).color(t.text_dim).size(11.0));
-        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Status")).color(t.text_dim).size(11.0));
-        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Page · PPI")).color(t.text_dim).size(11.0));
-        ui.end_row();
-        for r in &rows {
-            // Asset and story ids come from one counter: a row is chosen by either.
-            let aid = r["asset"].as_u64().or_else(|| r["story"].as_u64()).unwrap_or(0);
-            let name = r["name"].as_str().unwrap_or("");
-            let response = ui
-                .vertical(|ui| {
-                    ui.set_width(name_width);
-                    let name = ui.add(egui::Button::selectable(chosen == Some(aid), name).truncate());
-                    match r["path"].as_str().filter(|path| !path.is_empty()) {
-                        Some(path) => name.union(
-                            ui.add(
-                                egui::Label::new(egui::RichText::new(path).color(t.text_dim).size(11.0))
-                                    .truncate()
-                                    .sense(Sense::click())
-                                    .show_tooltip_when_elided(false),
-                            )
-                            .on_hover_text(path),
-                        ),
-                        None => name,
-                    }
-                })
-                .inner;
-            if response.clicked() {
-                chosen = Some(aid);
-            }
-            let (txt, col) = match r["status"].as_str().unwrap_or("") {
-                "missing" => ("\u{26A0} Missing", egui::Color32::from_rgb(0xe5, 0x4b, 0x4b)),
-                "modified" => ("\u{25B2} Modified", egui::Color32::from_rgb(0xe8, 0xb3, 0x2c)),
-                "embedded" => ("Embedded", t.text_dim),
-                "tooLarge" => ("Too large to check", egui::Color32::from_rgb(0xe8, 0xb3, 0x2c)),
-                _ => ("OK", t.text_dim),
-            };
-            let status = crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, txt)).color(col).size(11.0));
-            // Why a link isn't followed (a path on another computer, a device).
-            if let Some(why) = r["refused"].as_str() {
-                status.on_hover_text(why);
-            }
-            let uses = r["uses"].as_array().cloned().unwrap_or_default();
-            let info = match uses.first() {
-                Some(u) => {
-                    let page = u["page"].as_str().unwrap_or("PB");
-                    let ppi = u["ppi"].as_f64().map(|p| format!(" · {p:.0} ppi")).unwrap_or_default();
-                    let more = if uses.len() > 1 { format!(" (+{})", uses.len() - 1) } else { String::new() };
-                    format!("{page}{ppi}{more}")
-                }
-                None => crate::i18n::tr(&app.ui.language, "unused").into(),
-            };
-            // Low effective resolution for print is flagged like the Preflight check.
-            let low = uses.first().and_then(|u| u["ppi"].as_f64()).is_some_and(|p| p < 150.0);
-            crate::rtl::label(
-                ui,
-                egui::RichText::new(info).size(11.0).color(if low { egui::Color32::from_rgb(0xe8, 0xb3, 0x2c) } else { t.text_dim }),
-            );
-            ui.end_row();
-        }
-    });
-    if let Some(c) = chosen {
-        ui.data_mut(|d| d.insert_temp(sel_key, c));
-    }
-    ui.add_space(6.0);
-    if let Some(path) = rows
-        .iter()
-        .find(|r| r["asset"].as_u64().or_else(|| r["story"].as_u64()) == chosen)
-        .and_then(|r| r["path"].as_str())
-        .filter(|path| !path.is_empty())
-    {
-        // A selected link stays distinguishable even if two rows truncate to the same prefix.
-        ui.add(egui::Label::new(egui::RichText::new(path).color(t.text_dim).size(11.0)).wrap());
-        ui.add_space(6.0);
-    }
-    ui.horizontal_wrapped(|ui| {
-        let Some(aid) = chosen else {
-            crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Choose a link.")).color(t.text_dim).size(11.0));
-            return;
-        };
-        // A linked text file is addressed by its story.
-        let is_text = rows.iter().any(|r| r["story"].as_u64() == Some(aid));
-        let target = if is_text { json!({"story": aid}) } else { json!({"asset": aid}) };
-        let with = |k: &str, v: Value| {
-            let mut p = target.clone();
-            p[k] = v;
-            p
-        };
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Relink…"))).clicked()
-            && let Some(path) = app.services.pick_open.as_mut().and_then(|pick| pick("relink"))
-        {
-            let _ = app.run("links.relink", with("path", json!(path)));
-        }
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Go To"))).clicked() {
-            let _ = app.run("links.goTo", target.clone());
-        }
-        let edited = rows.iter().any(|r| r["story"].as_u64() == Some(aid) && r["edited"].as_bool() == Some(true));
-        let update = ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Update")));
-        let update = if edited {
-            update.on_hover_ui(|ui| {
-                crate::rtl::label(
-                    ui,
-                    crate::i18n::tr(&app.ui.language, "This story was edited in the layout: you'll be asked before those edits are replaced"),
-                );
-            })
-        } else {
-            update
-        };
-        if update.clicked() {
-            update_links(app, target.clone());
-        }
-        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, if is_text { "Unlink" } else { "Embed" }))).clicked() {
-            let _ = app.run("links.embed", target.clone());
-        }
-    });
-    ui.horizontal(|ui| {
-        // Choose any file in the folder: missing links are looked up there by name.
-        if ui
-            .button(crate::i18n::tr(&app.ui.language, "Relink to Folder…"))
-            .on_hover_ui(|ui| {
-                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Pick a file in the folder holding the moved graphics"));
-            })
-            .clicked()
-            && let Some(path) = app.services.pick_open.as_mut().and_then(|pick| pick("relink"))
-            && let Some(dir) = std::path::Path::new(&path).parent()
-        {
-            let r = app.run("links.relinkFolder", json!({"dir": dir.to_string_lossy()}));
-            if let Ok(v) = r {
-                app.status(crate::i18n::tr(&app.ui.language, "Relinked {count}").replace("{count}", &v["relinked"].to_string()));
-            }
-        }
-    });
-}
-
-/// Update Link from the Links panel or the menu (`{asset}`, `{story}`, or `{}` for all): asks
-/// first when a linked text story edited in the layout would lose those edits, as InDesign's
-/// Links panel does. The `links.update` command itself doesn't ask (as in InDesign scripting).
-pub fn update_links(app: &mut DesignApp, target: Value) {
-    let rows = app.session.execute("links.list", &json!({})).ok().and_then(|v| v.as_array().cloned()).unwrap_or_default();
-    let one = target.get("story").and_then(Value::as_u64);
-    let all = one.is_none() && target.get("asset").is_none();
-    let edited: Vec<&str> = rows
-        .iter()
-        .filter(|r| (all || (one.is_some() && r["story"].as_u64() == one)) && r["edited"] == true && r["status"] == "modified")
-        .filter_map(|r| r["name"].as_str())
-        .collect();
-    if edited.is_empty() {
-        let _ = run_update_links(app, target);
-    } else {
-        let files = edited.join(", ");
-        app.ui.dialog = Some(crate::dialogs::Dialog::new("updateLink", json!({"target": target, "files": files})));
-    }
-}
-
-/// Run `links.update`; its first warning goes to the status bar.
-pub(crate) fn run_update_links(app: &mut DesignApp, target: Value) -> Result<Value, String> {
-    let r = app.run("links.update", target)?;
-    if let Some(w) = r["warnings"].as_array().and_then(|w| w.first()).and_then(Value::as_str) {
-        app.status(w.to_string());
-    }
-    Ok(r)
-}
-
-pub fn info_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let u = units(app);
-    let t = Tokens::get(ui.ctx());
-    match sel_info(app) {
-        Some(i) => {
-            let f = |v: f64| designcraft_geom::format_measure(v, u);
-            crate::rtl::label(ui, format!("X: {}   Y: {}", f(i.page_rect.x0), f(i.page_rect.y0)));
-            crate::rtl::label(ui, format!("W: {}   H: {}", f(i.page_rect.width()), f(i.page_rect.height())));
-            crate::rtl::label(
-                ui,
-                format!("{}: {}   {}: {}", crate::i18n::tr(&app.ui.language, "Fill"), i.fill, crate::i18n::tr(&app.ui.language, "Stroke"), i.stroke),
-            );
-        }
-        None => {
-            if let Some(st) = app.session.active() {
-                crate::rtl::label(
-                    ui,
-                    format!(
-                        "{} · {} · {}",
-                        crate::i18n::count_label(&app.ui.language, "pages", st.doc.page_count()),
-                        crate::i18n::count_label(&app.ui.language, "stories", st.doc.stories.len()),
-                        crate::i18n::count_label(&app.ui.language, "items", st.doc.all_items().len())
-                    ),
-                );
-            }
-        }
-    }
-    crate::rtl::label(
-        ui,
-        egui::RichText::new(format!("{} {:.1} ms", crate::i18n::tr(&app.ui.language, "Render"), app.perf.render_ms)).color(t.text_dim),
-    );
-}
-
-pub fn effects_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let Some(st) = app.session.active() else { return };
-    let Some(it) = st.selection.items.first().and_then(|i| st.doc.item(*i)).cloned() else {
-        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Select an object."));
-        return;
-    };
-    use designcraft_color::BlendMode as B;
-    const MODES: [B; 16] = [
-        B::Normal,
-        B::Multiply,
-        B::Screen,
-        B::Overlay,
-        B::SoftLight,
-        B::HardLight,
-        B::ColorDodge,
-        B::ColorBurn,
-        B::Darken,
-        B::Lighten,
-        B::Difference,
-        B::Exclusion,
-        B::Hue,
-        B::Saturation,
-        B::Color,
-        B::Luminosity,
-    ];
-    ui.horizontal(|ui| {
-        egui::ComboBox::from_id_salt("blend")
-            .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, it.blend.label())))
-            .width(130.0)
-            .show_ui(ui, |ui| {
-                for m in MODES {
-                    if ui.selectable_label(m == it.blend, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, m.label()))).clicked() {
-                        let _ = app.run("object.opacity", json!({"opacity": it.opacity, "blend": m}));
-                    }
-                }
-            });
-        caption(ui, crate::i18n::tr(&app.ui.language, "Opacity"));
-        if let Some(v) = number(ui, "eop", Some(it.opacity as f64 * 100.0), "%", 46.0, 0) {
-            let _ = app.run("object.opacity", json!({"opacity": (v / 100.0).clamp(0.0, 1.0)}));
-        }
-    });
-    // The level the settings apply to, with its blend mode and opacity ("Group: Color Dodge 100%").
-    let group = it.is_group();
-    ui.horizontal(|ui| {
-        let level = crate::i18n::tr(&app.ui.language, if group { "Group:" } else { "Object:" });
-        crate::rtl::label(ui, egui::RichText::new(level).font(crate::theme::semibold(12.0)));
-        crate::rtl::label(ui, format!("{} {}%", crate::i18n::tr(&app.ui.language, it.blend.label()), (it.opacity * 100.0).round()));
-    });
-    divider(ui);
-    let ds = it.effects.drop_shadow.clone();
-    let mut on = ds.on;
-    if ui.checkbox(&mut on, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Drop Shadow"))).changed() {
-        let _ = app.run("object.dropShadow", json!({"on": on}));
-    }
-    if ds.on {
-        egui::Grid::new("dsg").num_columns(4).spacing(vec2(6.0, 4.0)).show(ui, |ui| {
-            caption(ui, crate::i18n::tr(&app.ui.language, "Distance"));
-            if let Some(v) = number(ui, "dsd", Some(ds.distance), " pt", 56.0, 1) {
-                let _ = app.run("object.dropShadow", json!({"on": true, "distance": v}));
-            }
-            caption(ui, crate::i18n::tr(&app.ui.language, "Angle"));
-            let global = app.session.active().map_or(120.0, |st| st.doc.settings.global_light);
-            if let Some(v) = number(ui, "dsa", Some(if ds.global_light { global } else { ds.angle }), "°", 50.0, 0) {
-                // With Use Global Light on, the angle is the document's (every such shadow moves).
-                let _ = if ds.global_light {
-                    app.run("object.globalLight", json!({"angle": v}))
-                } else {
-                    app.run("object.dropShadow", json!({"on": true, "angle": v}))
-                };
-            }
-            ui.end_row();
-            crate::rtl::label(ui, "");
-            crate::rtl::label(ui, "");
-            caption(ui, "");
-            let mut gl = ds.global_light;
-            if ui.checkbox(&mut gl, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Use Global Light"))).changed() {
-                let _ = app.run("object.dropShadow", json!({"on": true, "globalLight": gl}));
-            }
-            ui.end_row();
-            caption(ui, crate::i18n::tr(&app.ui.language, "Opacity"));
-            if let Some(v) = number(ui, "dso", Some(ds.opacity as f64 * 100.0), "%", 56.0, 0) {
-                let _ = app.run("object.dropShadow", json!({"on": true, "opacity": v / 100.0}));
-            }
-            caption(ui, crate::i18n::tr(&app.ui.language, "Size"));
-            if let Some(v) = number(ui, "dss", Some(ds.size), " pt", 50.0, 1) {
-                let _ = app.run("object.dropShadow", json!({"on": true, "size": v}));
-            }
-            ui.end_row();
-        });
-    }
-    divider(ui);
-    // Groups only, as in InDesign (greyed for other objects).
-    ui.horizontal(|ui| {
-        let mut iso = it.isolate;
-        let label = crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Isolate Blending"));
-        if ui.add_enabled(group, egui::Checkbox::new(&mut iso, label)).changed() {
-            let _ = app.run("object.transparencyGroup", json!({"isolate": iso}));
-        }
-        let mut ko = it.knockout;
-        let label = crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Knockout Group"));
-        if ui.add_enabled(group, egui::Checkbox::new(&mut ko, label)).changed() {
-            let _ = app.run("object.transparencyGroup", json!({"knockout": ko}));
-        }
-    });
-    // The fx button, as at the bottom of InDesign's Effects panel: each effect opens the Effects
-    // dialog on its page.
-    let fx = ui
-        .add(egui::Button::new(egui::RichText::new("fx").italics().strong()).min_size(vec2(28.0, 20.0)))
-        .on_hover_text(crate::i18n::tr(&app.ui.language, "Add an object effect to the selected target"));
-    egui::Popup::menu(&fx).show(|ui| {
-        for (page, label) in crate::effects_dialog::PAGES {
-            let text = format!("{}…", crate::i18n::tr(&app.ui.language, label));
-            if ui.button(crate::rtl::widget(ui, text)).clicked() {
-                crate::effects_dialog::open(app, page);
-                ui.close();
-            }
-        }
-    });
-}
-
-pub fn preflight_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let t = Tokens::get(ui.ctx());
-    let issues = designcraft_engine::cmd::preflight::check(&app.session, 150.0);
-    let errors = issues.iter().filter(|i| i.severity == "error").count();
-    ui.horizontal(|ui| {
-        let (r, _) = ui.allocate_exact_size(vec2(10.0, 10.0), egui::Sense::hover());
-        ui.painter().circle_filled(
-            r.center(),
-            4.5,
-            if errors == 0 { egui::Color32::from_rgb(60, 200, 90) } else { egui::Color32::from_rgb(235, 50, 50) },
-        );
-        crate::rtl::label(
-            ui,
-            if issues.is_empty() {
-                crate::i18n::tr(&app.ui.language, "No errors").to_string()
-            } else {
-                format!(
-                    "{}, {}",
-                    crate::i18n::count_label(&app.ui.language, "errors", errors),
-                    crate::i18n::count_label(&app.ui.language, "warnings", issues.len() - errors)
-                )
-            },
-        );
-    });
-    divider(ui);
-    for i in issues {
-        let page = i.page.filter(|_| app.session.active().is_some()).map(|p| app.session.page_label(p));
-        let text = format!("{}  {}", if i.severity == "error" { "⛔" } else { "⚠" }, i.message);
-        let resp = ui.add(egui::Button::new(egui::RichText::new(text).size(11.0)).frame(false));
-        if let Some(pg) = &page {
-            crate::rtl::label(ui, egui::RichText::new(format!("   page {pg}")).size(10.0).color(t.text_dim));
-        }
-        if resp.clicked() {
-            if let Some(id) = i.item {
-                let _ = app.run("selection.set", json!({"ids": [id]}));
-            }
-            if let Some(p) = i.page {
-                crate::canvas::go_to_page(app, p);
-            }
-        }
-    }
-}
-
-/// Window › Output › Attributes: overprint fill, stroke and gap; nonprinting.
-pub fn attributes_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    let Some(it) = app.session.active().and_then(|d| d.selection.items.first().and_then(|id| d.doc.item(*id)).cloned()) else {
-        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Select an object."));
-        return;
-    };
-    let rows = [
-        ("overprintFill", "Overprint Fill", it.fill.overprint),
-        ("overprintStroke", "Overprint Stroke", it.stroke.overprint),
-        ("nonprinting", "Nonprinting", it.nonprinting),
-        ("overprintGap", "Overprint Gap", it.stroke.gap_overprint),
-    ];
-    egui::Grid::new("attributes_panel").num_columns(2).spacing(vec2(16.0, 6.0)).show(ui, |ui| {
-        for (i, (key, label, on)) in rows.into_iter().enumerate() {
-            let mut v = on;
-            if ui.checkbox(&mut v, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).changed() {
-                let _ = app.run("object.attributes", json!({ key: v }));
-            }
-            if i % 2 == 1 {
-                ui.end_row();
-            }
-        }
-    });
-}
-
-/// Variable Font sliders: one per axis, each with a field for a typed value; the style becomes
-/// `Named {tag:value,…}`. Dragging a slider previews on the page and is one undo step once let go;
-/// a click, an arrow key or a typed value applies at once.
-fn variable_font_axes(app: &mut DesignApp, ui: &mut egui::Ui, family: &str, style: &str) {
-    if family.is_empty() {
-        return;
-    }
-    let db = super::fonts(app);
-    let axes = usable_axes(db.axes(family, style));
-    if axes.is_empty() {
-        return;
-    }
-    let base = designcraft_fonts::base_style(style).to_string();
-    let face = db.face(family, style);
-    let cur = |tag: &str, default: f32| face.coords.iter().find(|(t, _)| t == tag.as_bytes()).map_or(default, |c| c.1);
-    let mut values: Vec<(String, f32)> = axes.iter().map(|a| (a.0.clone(), cur(&a.0, a.3))).collect();
-    crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Variable Font")).size(11.0));
-    // What the sliders did this frame, gathered over every axis before anything is run.
-    let (mut held, mut dragged, mut applied) = (false, false, false);
-    let names: Vec<&str> = axes.iter().map(|a| a.1.as_str()).collect();
-    let label_w = caption_width(app, ui, &names);
-    for ((tag, name, min, _, max), value) in axes.iter().zip(values.iter_mut()) {
-        // Caption, a slider filling the middle, then the value field: every slider is as long.
-        ui.horizontal(|ui| {
-            caption_cell(ui, name, label_w);
-            ui.spacing_mut().slider_width = (ui.available_width() - PANEL_FIELD_W - ui.spacing().item_spacing.x * 2.0).max(40.0);
-            let (step, decimals) = axis_step(*min, *max);
-            // The field beside the slider takes typed values, so the slider's own is hidden.
-            let slider = ui.add(egui::Slider::new(&mut value.1, *min..=*max).step_by(f64::from(step)).show_value(false));
-            // Only the user's own change counts: the slider also reports one when it snaps a value
-            // that is off its steps, which it would then do on every frame.
-            let pressed = slider.is_pointer_button_down_on() || slider.dragged();
-            let changed = slider.changed() && (pressed || slider.has_focus());
-            held |= pressed;
-            dragged |= changed && pressed;
-            applied |= changed && !pressed;
-            if let Some(v) = number(ui, &format!("vf{tag}"), Some(f64::from(value.1)), "", PANEL_FIELD_W, decimals).filter(|v| v.is_finite()) {
-                value.1 = (v as f32).clamp(*min, *max);
-                applied = true;
-            }
-        });
-    }
-    let attrs = json!({"attrs": {"fontStyle": variable_font_style(&base, &values)}});
-    if applied {
-        app.end_live_preview();
-        let _ = app.run("type.char", attrs);
-    } else if dragged {
-        app.live_preview("Variable Font", "type.char", attrs);
-    } else if held {
-        app.hold_live_preview();
-    }
-    // Let go, the preview is committed at the start of the next frame (DesignApp::ui).
-}
-
-/// The slider step and the field's decimals for an axis: whole units, or hundredths for an axis
-/// whose whole range is a few units (Skia's weight runs 0.48–3.2).
-/// The axes a slider can show: a malformed font's axis whose minimum lies above its maximum (or
-/// isn't a number) is left out, since no value fits its range.
-fn usable_axes(axes: Vec<(String, String, f32, f32, f32)>) -> Vec<(String, String, f32, f32, f32)> {
-    axes.into_iter().filter(|a| a.2 <= a.4).collect()
-}
-
-fn axis_step(min: f32, max: f32) -> (f32, usize) {
-    if max - min >= 10.0 { (1.0, 0) } else { (0.01, 2) }
-}
-
-/// The style for the axis values: `base {tag:value,…}`, each value to at most two decimals.
-fn variable_font_style(base: &str, values: &[(String, f32)]) -> String {
-    let spec = values
-        .iter()
-        .map(|(t, v)| {
-            let v = format!("{v:.2}");
-            format!("{t}:{}", v.trim_end_matches('0').trim_end_matches('.'))
-        })
-        .collect::<Vec<_>>()
-        .join(",");
-    format!("{base} {{{spec}}}")
-}
-
-/// The width of the axis sliders' value fields, so the sliders end at the same place.
-const PANEL_FIELD_W: f32 = 52.0;
-
-/// The caption font of the Character panel's rows.
-fn caption_font() -> egui::FontId {
-    egui::FontId::proportional(11.5)
-}
-
-/// The width of the widest of `labels` in the interface language: a column's caption cells.
-fn caption_width(app: &DesignApp, ui: &Ui, labels: &[&str]) -> f32 {
-    let t = Tokens::get(ui.ctx());
-    labels
-        .iter()
-        .map(|l| ui.painter().layout_no_wrap(crate::i18n::tr(&app.ui.language, l).to_string(), caption_font(), t.text).size().x)
-        .fold(0.0, f32::max)
-        .ceil()
-}
-
-/// A Character panel column row: a caption cell `label_w` wide, then the number field filling the
-/// rest of the column. Returns the value committed.
-fn char_field(app: &DesignApp, ui: &mut Ui, label: &str, label_w: f32, field: NumField<'_>) -> Option<f64> {
-    ui.horizontal(|ui| {
-        caption_cell(ui, crate::i18n::tr(&app.ui.language, label), label_w);
-        let width = (ui.available_width() - ui.spacing().item_spacing.x).max(40.0);
-        field.width(width).show(ui)
-    })
-    .inner
-}
-
-/// A left-aligned caption in a cell of fixed width, so the field after it lines up.
-fn caption_cell(ui: &mut Ui, text: &str, width: f32) {
-    let t = Tokens::get(ui.ctx());
-    let (r, _) = ui.allocate_exact_size(vec2(width, crate::widgets::FIELD_H), Sense::hover());
-    crate::rtl::paint(ui.painter(), pos2(r.min.x, r.center().y), egui::Align2::LEFT_CENTER, text, caption_font(), t.text);
-}
-
-/// Whether `composer` (a paragraph's `composer` attribute) is a single-line composer, and the
-/// paragraph and single-line composers of its kind (Japanese or not), for the composer choice.
-pub(crate) fn composer_choice(composer: Option<&str>) -> (bool, [&'static str; 2]) {
-    let single = matches!(composer, Some("singleLine" | "japaneseSingleLine"));
-    let kind = if composer.is_some_and(|c| c.starts_with("japanese")) { ["japanese", "japaneseSingleLine"] } else { ["paragraph", "singleLine"] };
-    (single, kind)
-}
-
-/// The Digits choices: (value, caption, sample of 0–3). The values are the file format's:
-/// `arabic` is 0123, `hindi` the Arabic-Indic ٠١٢٣ and `farsi` the Persian/Urdu ۰۱۲۳; the captions
-/// name them by the script's users.
-pub const DIGIT_OPTIONS: [(&str, &str, &str); 5] =
-    [("default", "Default", ""), ("arabic", "Arabic", "0123"), ("hindi", "Hindi", "٠١٢٣"), ("farsi", "Farsi", "۰۱۲۳"), ("native", "Native", "")];
-
-/// A Digits choice as shown: its translated caption and a sample of the figures.
-pub fn digit_label(lang: &str, o: (&str, &str, &str)) -> String {
-    let name = crate::i18n::tr(lang, o.1);
-    if o.2.is_empty() { name.to_string() } else { format!("{name}  {}", o.2) }
-}
-
-/// The least value a paragraph field takes: the first and last line indents may be negative (a
-/// hanging line, a last line past the right indent), as in InDesign; the others not.
-pub(crate) fn para_field_min(key: &str) -> f64 {
-    if matches!(key, "firstLineIndent" | "lastLineIndent") { -10_000.0 } else { 0.0 }
-}
-
 #[cfg(test)]
-mod tests {
-    use egui_kittest::{
-        Harness,
-        kittest::{NodeT, Queryable},
-    };
-
-    use super::*;
-
-    fn language(app: &mut DesignApp) -> Value {
-        text_attrs(app).unwrap()["chars"]["language"].clone()
-    }
-
-    fn linked_graphics(paths: &[Option<&str>]) -> (DesignApp, Vec<designcraft_doc::ItemId>, Vec<designcraft_doc::AssetId>) {
-        use designcraft_doc::{Asset, AssetId, Content, Graphic, ItemId};
-        use std::sync::Arc;
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"title": "Linked graphics"})).unwrap();
-        let mut items = Vec::new();
-        let mut assets = Vec::new();
-        for (index, path) in paths.iter().enumerate() {
-            let x = 72 + index * 100;
-            let id = ItemId(app.run("frame.create", json!({"rect": [x, 72, x + 72, 144]})).unwrap()["id"].as_u64().unwrap());
-            let doc = Arc::make_mut(&mut app.session.doc_mut().unwrap().doc);
-            let aid = AssetId(doc.alloc());
-            doc.assets.insert(
-                aid,
-                Arc::new(Asset {
-                    id: aid,
-                    name: "photo.svg".into(),
-                    mime: "image/svg+xml".into(),
-                    link: path.map(str::to_owned),
-                    data: Arc::new(
-                        br##"<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><rect width="32" height="32" fill="#4488cc"/></svg>"##
-                            .to_vec(),
-                    ),
-                    pixels: Some((32, 32)),
-                    ..Default::default()
-                }),
-            );
-            doc.item_mut(id).unwrap().content = Content::Graphic(Graphic {
-                asset: aid,
-                size: (72.0, 72.0),
-                xf: designcraft_geom::Affine::IDENTITY,
-                clip: None,
-                auto_fit: Default::default(),
-                fit_align: 4,
-                crop: [0.0; 4],
-                wrap: Default::default(),
-                fill: Default::default(),
-            });
-            items.push(id);
-            assets.push(aid);
-        }
-        (app, items, assets)
-    }
-
-    fn links_harness(app: DesignApp, width: f32) -> Harness<'static, DesignApp> {
-        let mut ready = false;
-        let mut h = Harness::builder().with_size(vec2(width, 600.0)).build_ui_state(
-            move |ui, app: &mut DesignApp| {
-                if !ready {
-                    crate::theme::install_fonts(ui.ctx(), "");
-                    crate::theme::apply(ui.ctx(), &Tokens::for_brightness(Default::default()));
-                    ready = true;
-                    return;
-                }
-                links_panel(app, ui);
-            },
-            app,
-        );
-        h.input_mut().max_texture_side = Some(8192);
-        h.run_steps(3);
-        h
-    }
-
-    /// With the caret in text, the Stroke panel offers the text's stroke options, not an empty panel.
-    /// The first and last line indents take negative values, as InDesign's (and the Paragraph
-    /// panel's) do; the left and right indents and the spacing don't.
-    #[test]
-    fn last_line_indent_may_be_negative() {
-        for key in ["firstLineIndent", "lastLineIndent"] {
-            assert!(super::para_field_min(key) < 0.0, "{key}");
-        }
-        for key in ["leftIndent", "rightIndent", "spaceBefore", "spaceAfter"] {
-            assert_eq!(super::para_field_min(key), 0.0, "{key}");
-        }
-    }
-
-    #[test]
-    fn stroke_panel_shows_the_text_stroke_options_while_text_is_selected() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "caret": true})).unwrap();
-        let mut ready = false;
-        let mut h = Harness::builder().with_size(vec2(320.0, 400.0)).build_ui_state(
-            move |ui, app: &mut DesignApp| {
-                if !ready {
-                    crate::theme::install_fonts(ui.ctx(), "");
-                    crate::theme::apply(ui.ctx(), &Tokens::for_brightness(Default::default()));
-                    ready = true;
-                    return;
-                }
-                stroke_panel(app, ui);
-            },
-            app,
-        );
-        h.run_steps(3);
-        assert!(h.query_by_label("Select an object.").is_none());
-        h.get_by_label("Stroke Behind Fill");
-    }
-
-    /// As InDesign's: Edit Page takes the Page tool to the page in view, and Properties sets that
-    /// page alone; Back returns to the document.
-    #[test]
-    fn edit_page_shows_the_page_and_sets_its_size_alone() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({"pages": 3, "facingPages": false})).unwrap();
-        app.ui.dock_tab = "properties".into();
-        let mut h = crate::test_window::open(app, vec2(1400.0, 900.0));
-        crate::canvas::go_to_page(&mut h.state_mut().app, 1);
-        h.run_steps(3);
-        h.get_by_label("Edit Page").click();
-        h.run_steps(3);
-        let st = h.state().app.session.active().unwrap();
-        assert_eq!((h.state().app.session.tool_id(), st.selection.page), ("page", Some(1)));
-        assert!(h.query_by_label("Document Setup").is_none(), "no dialog");
-        let _ = h.get_by_label("Page Size");
-        let _ = h.get_by_label("Margins and Columns");
-        h.get_by_label("Landscape").click();
-        h.run_steps(3);
-        let doc = &h.state().app.session.active().unwrap().doc;
-        let size = |abs: usize| doc.page(abs).map(|p| (p.width, p.height)).unwrap();
-        assert_eq!(size(1), (792.0, 612.0), "the page turns");
-        assert_eq!((size(0), size(2)), ((612.0, 792.0), (612.0, 792.0)), "the others don't");
-        h.get_by_label("Back").click();
-        h.run_steps(3);
-        let st = h.state().app.session.active().unwrap();
-        assert_eq!((h.state().app.session.tool_id(), st.selection.page), ("selection", None));
-        let _ = h.get_by_label("Edit Page");
-    }
-
-    #[test]
-    fn links_panel_distinguishes_same_named_sources_and_keeps_link_actions() {
-        let first = "/project/assets/studio-a/photo.svg";
-        let second = "/project/assets/studio-b/photo.svg";
-        let (app, items, assets) = linked_graphics(&[Some(first), Some(second), None]);
-        let mut h = links_harness(app, 320.0);
-        assert_eq!(h.get_all_by_label("photo.svg").count(), 3);
-        assert!(h.query_by_label(first).is_some(), "the first source path is visible in the row");
-        h.get_by_label(second).click();
-        h.run_steps(3);
-        h.get_by_label("Go To").click();
-        h.run_steps(3);
-        assert_eq!(h.state().session.active().unwrap().selection.items, vec![items[1]]);
-        h.get_by_label("Embed").click();
-        h.run_steps(3);
-        assert!(h.state().session.active().unwrap().doc.assets[&assets[1]].link.is_none());
-        assert_eq!(h.state().session.active().unwrap().doc.assets[&assets[0]].link.as_deref(), Some(first));
-        assert!(h.query_by_label(second).is_none(), "an embedded graphic no longer shows a source path");
-        assert_eq!(h.get_all_by_label("Embedded").count(), 2);
-        assert_eq!(h.get_all_by_label("photo.svg").count(), 3);
-        h.get_by_label(first).click();
-        h.run_steps(3);
-        h.get_by_label("Go To").click();
-        h.run_steps(3);
-        assert_eq!(h.state().session.active().unwrap().selection.items, vec![items[0]]);
-    }
-
-    #[test]
-    fn links_panel_keeps_long_source_paths_inside_a_narrow_panel() {
-        let path = "/project/assets/studio-a/very-long-folder-name/another-long-folder-name/photo.svg";
-        let (app, _, _) = linked_graphics(&[Some(path)]);
-        let mut h = links_harness(app, 240.0);
-        let source = h.get_by_label(path).rect();
-        assert!(source.width() < 150.0, "the source is truncated to its column: {source:?}");
-        assert!(source.right() <= 240.0, "the source stays inside the narrow panel: {source:?}");
-        assert!(h.get_by_label("Page · PPI").rect().right() <= 240.0);
-        h.get_by_label(path).click();
-        h.run_steps(3);
-        assert!(h.output().shapes.iter().any(|s| matches!(&s.shape, egui::Shape::Text(text) if text.galley.job.text == path && !text.galley.elided && text.visual_bounding_rect().right() <= 240.0)), "the selected path is painted in full and wraps inside the panel");
-    }
-
-    #[test]
-    fn properties_character_section_sets_the_language() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "bunun", "caret": true})).unwrap();
-        app.run("edit.selectAll", json!({})).unwrap();
-        assert_ne!(language(&mut app), "French");
-        let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                // The panel's fonts are installed before its first frame.
-                let id = egui::Id::new("test_fonts");
-                if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
-                    crate::theme::install_fonts(ui.ctx(), "");
-                    ui.data_mut(|d| d.insert_temp(id, true));
-                    return;
-                }
-                show(app, ui);
-            },
-            app,
-        );
-        h.run_steps(3);
-        assert!(h.query_by_label("Language").is_none(), "under •••, as in InDesign");
-        h.get_all_by_label("More Options").next().unwrap().click();
-        h.run_steps(3);
-        h.get_by_label("Language").click();
-        h.run_steps(2);
-        h.get_by_label("French").click();
-        h.run_steps(2);
-        assert_eq!(language(h.state_mut()), "French");
-    }
-
-    /// Properties › Character and Paragraph •••, as in InDesign: the sections expand in place,
-    /// with the scales, baseline shift, skew, language, OpenType and the case buttons, and the
-    /// indents, spacing and drop caps.
-    /// Properties › Paragraph ••• on a First Line Only paragraph: Align to Baseline Grid shows
-    /// pressed, and a click turns alignment off instead of making it All Lines.
-    #[test]
-    fn more_options_grid_button_keeps_first_line_only() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "If fine plants", "caret": true})).unwrap();
-        app.run("edit.selectAll", json!({})).unwrap();
-        app.run("type.para", json!({"attrs": {"gridAlign": "firstLineOnly"}})).unwrap();
-        let mut h = panel_harness(app, show);
-        h.run_steps(3);
-        h.get_all_by_label("More Options").nth(1).unwrap().click();
-        h.run_steps(3);
-        assert_eq!(h.get_by_label("Align to Baseline Grid").accesskit_node().toggled(), Some(egui::accesskit::Toggled::True));
-        assert_eq!(text_attrs(h.state_mut()).unwrap()["para"]["gridAlign"], "firstLineOnly");
-        h.get_by_label("Align to Baseline Grid").click();
-        h.run_steps(3);
-        assert_eq!(text_attrs(h.state_mut()).unwrap()["para"]["gridAlign"], "none");
-    }
-
-    #[test]
-    fn more_options_expand_character_and_paragraph_in_place() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "If fine plants", "caret": true})).unwrap();
-        app.run("edit.selectAll", json!({})).unwrap();
-        let mut h = panel_harness(app, show);
-        h.run_steps(3);
-        for l in ["Vertical Scale", "Small Caps", "Drop Cap Number of Lines", "Space Before"] {
-            assert!(h.query_by_label(l).is_none(), "{l} hidden until •••");
-        }
-        h.get_all_by_label("More Options").next().unwrap().click();
-        h.run_steps(3);
-        h.get_by_label("Small Caps").click();
-        h.run_steps(3);
-        let _ = h.get_by_label("OpenType");
-        let _ = h.get_by_label("Language");
-        h.get_all_by_label("More Options").nth(1).unwrap().click();
-        h.run_steps(3);
-        let _ = h.get_by_label("Hyphenate");
-        h.get_by_label("Align to Baseline Grid").click();
-        h.run_steps(3);
-        let a = text_attrs(h.state_mut()).unwrap();
-        assert_eq!(a["chars"]["capitalization"], "smallCaps");
-        assert_eq!(a["para"]["gridAlign"], "allLines");
-        // ••• again folds the section.
-        h.get_all_by_label("More Options").next().unwrap().click();
-        h.run_steps(3);
-        assert!(h.query_by_label("Small Caps").is_none());
-    }
-
-    /// The Paragraph panel on a First Line Only paragraph: Align to Baseline Grid shows pressed
-    /// and keeps First Line Only, and the panel menu checks Only Align First Line to Grid.
-    #[test]
-    fn paragraph_panel_keeps_first_line_only() {
-        let mut app = text_app();
-        app.run("type.para", json!({"attrs": {"gridAlign": "firstLineOnly"}})).unwrap();
-        let mut h = panel_harness(app, paragraph_panel);
-        h.run_steps(3);
-        assert_eq!(h.get_by_label("Align to Baseline Grid").accesskit_node().toggled(), Some(egui::accesskit::Toggled::True));
-        h.get_by_label("Align to Baseline Grid").click();
-        h.run_steps(3);
-        assert_eq!(text_attrs(h.state_mut()).unwrap()["para"]["gridAlign"], "firstLineOnly");
-        h.get_by_label("☰").click();
-        h.run_steps(3);
-        let _ = h.get_by_label("✓ Only Align First Line to Grid");
-    }
-
-    #[test]
-    fn paragraph_panel_menu_define_lists_opens_its_dialog() {
-        let mut h = panel_harness(text_app(), paragraph_panel);
-        h.run_steps(3);
-        h.get_by_label("☰").click();
-        h.run_steps(3);
-        h.get_by_label("Define Lists…").click();
-        h.run_steps(3);
-        assert!(h.state_mut().ui.dialog.is_some(), "Define Lists");
-    }
-
-    #[test]
-    fn paragraph_panel_is_laid_out_as_indesigns_with_its_panel_menu() {
-        let mut h = panel_harness(text_app(), paragraph_panel);
-        h.run_steps(3);
-        for l in [
-            "Left Indent",
-            "Right Indent",
-            "First Line Left Indent",
-            "Last Line Right Indent",
-            "Space Before",
-            "Space After",
-            "Space Between Paragraphs Using Same Style",
-            "Drop Cap Number of Lines",
-            "Drop Cap One or More Characters",
-            "Paragraph Shading",
-            "Paragraph Border",
-            "Hyphenate",
-            "Do Not Align to Baseline Grid",
-        ] {
-            let _ = h.get_by_label(l);
-        }
-        let para = |h: &mut Harness<'static, DesignApp>| text_attrs(h.state_mut()).unwrap()["para"].clone();
-        // Space Between Paragraphs Using Same Style starts at Ignore; a value is set, and emptying
-        // the field ignores it again.
-        assert!(para(&mut h)["sameParaStyleSpacing"].is_null());
-        let field = h.get_all_by_role(egui::accesskit::Role::TextInput).nth(6).unwrap();
-        field.focus();
-        field.type_text("6 pt");
-        h.run_steps(1);
-        h.key_press(egui::Key::Enter);
-        h.run_steps(3);
-        assert_eq!(para(&mut h)["sameParaStyleSpacing"], 6.0);
-        h.get_all_by_role(egui::accesskit::Role::TextInput).nth(6).unwrap().focus();
-        h.run_steps(1);
-        for _ in 0..8 {
-            h.key_press(egui::Key::Backspace);
-        }
-        h.key_press(egui::Key::Enter);
-        h.run_steps(3);
-        assert!(para(&mut h)["sameParaStyleSpacing"].is_null(), "Ignore");
-        // Shading on, then the grid buttons and Only Align First Line to Grid from the menu.
-        h.get_by_label("Shading").click();
-        h.run_steps(3);
-        assert_eq!(para(&mut h)["shadingOn"], true);
-        h.get_by_label("Align to Baseline Grid").click();
-        h.run_steps(3);
-        assert_eq!(para(&mut h)["gridAlign"], "allLines");
-        h.get_by_label("☰").click();
-        h.run_steps(3);
-        for l in [
-            "   Balance Ragged Lines",
-            "Keep Options…",
-            "Drop Caps and Nested Styles…",
-            "GREP Styles…",
-            "Define Lists…",
-            "Restart/Continue Numbering",
-        ] {
-            let _ = h.get_by_label(l);
-        }
-        h.get_by_label("   Only Align First Line to Grid").click();
-        h.run_steps(3);
-        assert_eq!(para(&mut h)["gridAlign"], "firstLineOnly");
-        h.get_by_label("Do Not Align to Baseline Grid").click();
-        h.run_steps(3);
-        assert_eq!(para(&mut h)["gridAlign"], "none");
-        // Keep Options… opens the selected paragraphs' Keep Options, and OK applies them.
-        h.get_by_label("☰").click();
-        h.run_steps(3);
-        h.get_by_label("Keep Options…").click();
-        h.run_steps(3);
-        let app = h.state_mut();
-        let d = app.ui.dialog.as_mut().expect("Keep Options");
-        assert_eq!((d.id.as_str(), d.s("section").as_str()), ("paragraphLocal", "keep"));
-        d.fields.insert("p.keepWithNext".into(), json!(2));
-        crate::dialogs::confirm(app).unwrap();
-        assert_eq!(para(&mut h)["keepWithNext"], 2);
-    }
-
-    fn kerning(app: &mut DesignApp) -> Value {
-        text_attrs(app).unwrap()["chars"]["kerning"].clone()
-    }
-
-    /// A harness drawing `panel` for `app` (fonts installed before the first frame).
-    fn panel_harness(app: DesignApp, panel: fn(&mut DesignApp, &mut egui::Ui)) -> Harness<'static, DesignApp> {
-        Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
-            move |ui, app: &mut DesignApp| {
-                let id = egui::Id::new("test_fonts");
-                if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
-                    crate::theme::install_fonts(ui.ctx(), "");
-                    ui.data_mut(|d| d.insert_temp(id, true));
-                    return;
-                }
-                panel(app, ui);
-            },
-            app,
-        )
-    }
-
-    fn text_app() -> DesignApp {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "AVATAR", "caret": true})).unwrap();
-        app.run("edit.selectAll", json!({})).unwrap();
-        app
-    }
-
-    #[test]
-    fn properties_kerning_menu_sets_zero_kerning() {
-        let mut h = panel_harness(text_app(), show);
-        h.run_steps(3);
-        assert_eq!(kerning(h.state_mut())["kind"], "metrics");
-        h.get_by_label("Kerning").click();
-        h.run_steps(2);
-        h.get_by_label("0").click();
-        h.run_steps(2);
-        assert_eq!(kerning(h.state_mut())["kind"], "none");
-    }
-
-    fn undo_steps(app: &DesignApp) -> usize {
-        app.session.active().unwrap().history.undo.len()
-    }
-
-    fn font_style(app: &mut DesignApp) -> String {
-        text_attrs(app).unwrap()["chars"]["fontStyle"].as_str().unwrap().to_string()
-    }
-
-    /// The Digits menu uses the reference names (documented as Arabic, Hindi and Farsi), which
-    /// are translated, with a sample of each script's figures.
-    #[test]
-    fn digits_choices_use_the_reference_names() {
-        assert_eq!(DIGIT_OPTIONS.map(|o| o.1), ["Default", "Arabic", "Hindi", "Farsi", "Native"]);
-        for (lang, _) in crate::i18n::LANGUAGES {
-            let tr = |s| crate::i18n::tr(lang, s);
-            let shown: Vec<String> = DIGIT_OPTIONS.iter().map(|o| digit_label(lang, *o)).collect();
-            let expected = [
-                tr("Default").to_string(),
-                format!("{}  0123", tr("Arabic")),
-                format!("{}  ٠١٢٣", tr("Hindi")),
-                format!("{}  ۰۱۲۳", tr("Farsi")),
-                tr("Native").to_string(),
-            ];
-            assert_eq!(shown, expected, "{lang}");
-        }
-    }
-
-    #[test]
-    fn axes_with_an_inverted_or_missing_range_get_no_slider() {
-        let axis = |tag: &str, min: f32, max: f32| (tag.to_string(), tag.to_string(), min, min, max);
-        let kept = usable_axes(vec![axis("wght", 100.0, 900.0), axis("wdth", 125.0, 75.0), axis("opsz", f32::NAN, 72.0), axis("slnt", 0.0, 0.0)]);
-        let tags: Vec<&str> = kept.iter().map(|a| a.0.as_str()).collect();
-        assert_eq!(tags, ["wght", "slnt"]);
-    }
-
-    #[test]
-    fn variable_font_style_keeps_two_decimals_at_most() {
-        let values = [("wght".to_string(), 512.0_f32), ("wdth".to_string(), 1.25), ("opsz".to_string(), 0.4801)];
-        assert_eq!(variable_font_style("Regular", &values), "Regular {wght:512,wdth:1.25,opsz:0.48}");
-        assert_eq!(axis_step(100.0, 900.0), (1.0, 0));
-        assert_eq!(axis_step(0.48, 3.2), (0.01, 2));
-    }
-
-    #[test]
-    fn a_live_preview_held_over_many_frames_is_one_undo_step_once_let_go() {
-        let mut app = text_app();
-        let steps = undo_steps(&app);
-        let size = |app: &mut DesignApp| text_attrs(app).unwrap()["chars"]["size"].as_f64().unwrap();
-        // A drag: a preview on most frames, held without moving on others.
-        for v in [20.0, 24.0, 30.0] {
-            app.settle_live_preview();
-            app.live_preview("Size", "type.char", json!({"attrs": {"size": v}}));
-            app.settle_live_preview();
-            app.hold_live_preview();
-        }
-        assert_eq!(size(&mut app), 30.0, "the page shows the last preview");
-        assert_eq!(undo_steps(&app), steps, "nothing is undoable while held");
-        // Let go: a frame without a hold, then the frame after it commits the preview.
-        app.settle_live_preview();
-        assert_eq!(undo_steps(&app), steps, "the last held frame keeps it open");
-        app.settle_live_preview();
-        assert_eq!(undo_steps(&app), steps + 1);
-        assert!(app.session.active().unwrap().interaction.is_none());
-        app.settle_live_preview();
-        assert_eq!(undo_steps(&app), steps + 1, "committed once");
-        // Later edits get their own undo steps.
-        app.run("type.char", json!({"attrs": {"tracking": 50}})).unwrap();
-        assert_eq!(undo_steps(&app), steps + 2);
-    }
-
-    /// A system variable font with two or more axes (macOS ships some), loaded into the shared fonts.
-    fn system_variable_font() -> Option<&'static str> {
-        let candidates = [("/System/Library/Fonts/Supplemental/Skia.ttf", "Skia"), ("/System/Library/Fonts/NewYork.ttf", "New York")];
-        candidates.into_iter().find_map(|(path, family)| {
-            let bytes = std::fs::read(path).ok()?;
-            let db = designcraft_fonts::FontDb::global();
-            db.add_font(bytes);
-            let style = db.styles(family).first().cloned()?;
-            (db.axes(family, &style).len() >= 2).then_some(family)
-        })
-    }
-
-    #[test]
-    fn dragging_one_of_several_axis_sliders_is_one_undo_step() {
-        let Some(family) = system_variable_font() else {
-            eprintln!("skipped: no variable font with two axes on this system");
-            return;
-        };
-        let mut app = text_app();
-        super::super::apply_font(&mut app, &super::super::FontPick { family: family.into(), style: None });
-        let before = font_style(&mut app);
-        let steps = undo_steps(&app);
-        // The app commits a preview no panel held at the start of each frame (DesignApp::ui).
-        let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let id = egui::Id::new("test_fonts");
-                if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
-                    crate::theme::install_fonts(ui.ctx(), "");
-                    ui.data_mut(|d| d.insert_temp(id, true));
-                    return;
-                }
-                app.settle_live_preview();
-                character_panel(app, ui);
-            },
-            app,
-        );
-        h.run_steps(3);
-        let sliders = h.get_all_by_role(egui::accesskit::Role::Slider).map(|n| n.rect()).collect::<Vec<_>>();
-        assert!(sliders.len() >= 2, "one slider per axis: {sliders:?}");
-        let track = sliders[0];
-        let y = track.center().y;
-        h.hover_at(egui::pos2(track.left() + 2.0, y));
-        h.run_steps(1);
-        h.drag_at(egui::pos2(track.left() + 2.0, y));
-        h.run_steps(1);
-        for k in 1..=10 {
-            h.hover_at(egui::pos2(track.left() + track.width() * k as f32 / 10.0, y));
-            h.run_steps(1);
-            assert_eq!(undo_steps(h.state()), steps, "no undo step while dragging (frame {k})");
-        }
-        let previewed = font_style(h.state_mut());
-        assert_ne!(previewed, before, "the drag previews on the page");
-        h.drop_at(egui::pos2(track.right(), y));
-        h.run_steps(3);
-        assert_eq!(undo_steps(h.state()), steps + 1, "the whole drag is one undo step");
-        assert_eq!(font_style(h.state_mut()), previewed);
-        h.state_mut().run("edit.undo", json!({})).unwrap();
-        assert_eq!(font_style(h.state_mut()), before);
-    }
-
-    #[test]
-    fn character_panel_has_kerning_and_takes_a_typed_manual_value() {
-        let mut h = panel_harness(text_app(), character_panel);
-        h.run_steps(3);
-        // The caption and the control share the name: click the control.
-        h.get_by_role_and_label(egui::accesskit::Role::ComboBox, "Kerning").click();
-        h.run_steps(2);
-        // The menu's field is drawn after the panel's own fields.
-        let field = h.get_all_by_role(egui::accesskit::Role::TextInput).last().unwrap();
-        field.focus();
-        field.type_text("-40");
-        h.run_steps(1);
-        h.key_press(egui::Key::Enter);
-        h.run_steps(3);
-        assert_eq!(kerning(h.state_mut()), json!({"kind": "manual", "value": -40.0}));
-    }
-
-    #[test]
-    fn a_manual_kerning_value_at_a_caret_kerns_the_pair() {
-        let mut app = text_app();
-        let story = app.session.active().unwrap().selection.text.unwrap().story;
-        app.run("text.select", json!({"story": story.0, "anchor": 1, "focus": 1})).unwrap();
-        let mut h = panel_harness(app, character_panel);
-        h.run_steps(3);
-        h.get_by_role_and_label(egui::accesskit::Role::ComboBox, "Kerning").click();
-        h.run_steps(2);
-        let field = h.get_all_by_role(egui::accesskit::Role::TextInput).last().unwrap();
-        field.focus();
-        field.type_text("-80");
-        h.run_steps(1);
-        h.key_press(egui::Key::Enter);
-        h.run_steps(3);
-        let st = h.state_mut().session.active().unwrap().doc.story(story).unwrap().format_after(0).over.kerning;
-        assert_eq!(st, Some(designcraft_doc::Kerning::Manual(-80.0)), "A of the A|V pair");
-        assert_eq!(kerning(h.state_mut()), json!({"kind": "manual", "value": -80.0}));
-    }
-
-    #[test]
-    fn clicking_a_swatch_chip_in_the_appearance_fill_menu_applies_it() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        // A graphic frame: the Appearance section shows a single Fill chip.
-        let id = app.run("frame.create", json!({"rect": [72, 72, 300, 200]})).unwrap()["id"].as_u64().unwrap();
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        let before = app.session.active().unwrap().doc.item(designcraft_doc::ids::ItemId(id)).unwrap().fill.swatch.clone();
-        assert_ne!(before, "[Paper]");
-        let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let id = egui::Id::new("test_fonts");
-                if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
-                    crate::theme::install_fonts(ui.ctx(), "");
-                    ui.data_mut(|d| d.insert_temp(id, true));
-                    return;
-                }
-                show(app, ui);
-            },
-            app,
-        );
-        h.run_steps(3);
-        // Open the Fill menu from the Appearance chip.
-        h.get_by_label("Fill swatch").click();
-        h.run_steps(3);
-        // Click the *chip* (the row's left edge), not the name.
-        let name = "[Paper]".to_string();
-        let row = h.get_by_label(&name).rect();
-        // The row spans the menu (chip + name), not just the name text.
-        assert!(row.width() > 150.0, "the row is the full menu width, chip included: {row:?}");
-        let p = row.min + vec2(8.0, row.height() / 2.0);
-        h.hover_at(p);
-        h.drag_at(p);
-        h.drop_at(p);
-        h.run_steps(4);
-        let after = h.state().session.active().unwrap().doc.item(designcraft_doc::ids::ItemId(id)).unwrap().fill.swatch.clone();
-        assert_eq!(after, name, "clicking the swatch chip applies it");
-    }
-
-    fn panel(app: DesignApp) -> Harness<'static, DesignApp> {
-        let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
-            |ui, app: &mut DesignApp| {
-                let id = egui::Id::new("test_fonts");
-                if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
-                    crate::theme::install_fonts(ui.ctx(), "");
-                    ui.data_mut(|d| d.insert_temp(id, true));
-                    return;
-                }
-                show(app, ui);
-            },
-            app,
-        );
-        h.run_steps(3);
-        h
-    }
-
-    /// The course's chapter 21: Properties' Bulleted List button gives the selected paragraphs
-    /// bullets with InDesign's hanging indent; pressed again, both go.
-    #[test]
-    fn the_bulleted_list_button_applies_a_hanging_indent() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let f = app
-            .run(
-                "frame.create",
-                json!({"rect": [72, 72, 300, 200], "content": "text", "text": "4 eggs
-1 cup milk"}),
-            )
-            .unwrap();
-        app.run("text.select", json!({"story": f["story"], "anchor": 0, "focus": 15})).unwrap();
-        let mut h = panel(app);
-        h.get_by_label("Bulleted List").click();
-        h.run_steps(3);
-        let a = h.state_mut().run("type.selectionAttrs", json!({})).unwrap();
-        assert_eq!(
-            (a["para"]["listType"].as_str(), a["para"]["leftIndent"].as_f64(), a["para"]["firstLineIndent"].as_f64()),
-            (Some("bullets"), Some(18.0), Some(-18.0))
-        );
-        assert_eq!(crate::menus::checked(h.state(), "list.bullets", &json!({})), Some(true), "Type › Apply Bullets shows it");
-        h.get_by_label("Bulleted List").click();
-        h.run_steps(3);
-        let a = h.state_mut().run("type.selectionAttrs", json!({})).unwrap();
-        assert_eq!((a["para"]["listType"].as_str(), a["para"]["leftIndent"].as_f64()), (Some("none"), Some(0.0)));
-    }
-
-    #[test]
-    fn several_shapes_show_pathfinder_and_intersect_combines_them() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let a = app.run("frame.create", json!({"rect": [100, 100, 300, 300], "shape": "ellipse"})).unwrap()["id"].clone();
-        let b = app.run("frame.create", json!({"rect": [200, 100, 300, 200]})).unwrap()["id"].clone();
-        // One shape: no Pathfinder section.
-        app.run("selection.set", json!({"ids": [a]})).unwrap();
-        let mut h = panel(app);
-        assert!(h.query_by_label("Pathfinder").is_none());
-        // Two: the section and its five buttons; Intersect leaves one shape, the ellipse's quarter.
-        h.state_mut().run("selection.set", json!({"ids": [a, b]})).unwrap();
-        h.run_steps(3);
-        assert!(h.query_by_label("Pathfinder").is_some());
-        for op in ["Add", "Subtract", "Intersect", "Exclude Overlap", "Minus Back"] {
-            assert!(h.query_by_label(op).is_some(), "{op}");
-        }
-        h.get_by_label("Intersect").click();
-        h.run_steps(3);
-        let doc = &h.state().session.active().unwrap().doc;
-        let items = &doc.spreads[0].items;
-        assert_eq!(items.len(), 1, "one shape left");
-        let r = items[0].bounds();
-        assert!((r.x0 - 200.0).abs() < 0.5 && (r.y1 - 200.0).abs() < 0.5 && (r.x1 - 300.0).abs() < 0.5, "{r:?}");
-    }
-
-    const CYAN: &str = "C=100 M=0 Y=0 K=0";
-
-    #[test]
-    fn the_fill_menu_sets_a_tint() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let id = app.run("frame.create", json!({"rect": [72, 72, 300, 200]})).unwrap()["id"].as_u64().unwrap();
-        app.run("object.fill", json!({"swatch": CYAN, "ids": [id]})).unwrap();
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        let mut h = panel(app);
-        h.get_by_label("Fill swatch").click();
-        h.run_steps(3);
-        // A frame that isn't a text frame: no Apply To.
-        assert!(h.query_by_label("Apply To:").is_none());
-        // The field on the Tint row (Opacity also reads 100%).
-        let row = h.get_by_label("Tint:").rect();
-        h.query_all_by(|n| n.role() == egui::accesskit::Role::TextInput && n.value().as_deref() == Some("100%"))
-            .find(|n| (n.rect().center().y - row.center().y).abs() < 8.0)
-            .expect("the Tint field")
-            .click();
-        h.run_steps(2);
-        h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
-        h.event(egui::Event::Text("25".into()));
-        h.key_press(egui::Key::Enter);
-        h.run_steps(3);
-        let fill = h.state().session.active().unwrap().doc.item(designcraft_doc::ids::ItemId(id)).unwrap().fill.clone();
-        assert_eq!((fill.swatch.as_str(), fill.tint), (CYAN, 0.25), "the tint, on the same swatch");
-    }
-
-    #[test]
-    fn a_tint_on_several_objects_keeps_each_ones_swatch() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let a = app.run("frame.create", json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].as_u64().unwrap();
-        let b = app.run("frame.create", json!({"rect": [220, 72, 300, 200]})).unwrap()["id"].as_u64().unwrap();
-        app.run("object.fill", json!({"swatch": CYAN, "ids": [a]})).unwrap();
-        app.run("object.fill", json!({"swatch": "[Black]", "ids": [b]})).unwrap();
-        app.run("selection.set", json!({"ids": [a, b]})).unwrap();
-        let mut h = panel(app);
-        h.get_by_label("Fill swatch").click();
-        h.run_steps(3);
-        let row = h.get_by_label("Tint:").rect();
-        h.query_all_by(|n| n.role() == egui::accesskit::Role::TextInput && n.value().as_deref() == Some("100%"))
-            .find(|n| (n.rect().center().y - row.center().y).abs() < 8.0)
-            .expect("the Tint field")
-            .click();
-        h.run_steps(2);
-        h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
-        h.event(egui::Event::Text("25".into()));
-        h.key_press(egui::Key::Enter);
-        h.run_steps(3);
-        let doc = &h.state().session.active().unwrap().doc;
-        let fill = |id: u64| doc.item(designcraft_doc::ids::ItemId(id)).unwrap().fill.clone();
-        assert_eq!((fill(a).swatch.as_str(), fill(a).tint), (CYAN, 0.25));
-        assert_eq!((fill(b).swatch.as_str(), fill(b).tint), ("[Black]", 0.25), "the second keeps its own swatch");
-    }
-
-    #[test]
-    fn apply_to_text_colours_a_text_frames_text_not_the_frame() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Heading"})).unwrap();
-        let (id, story) = (r["id"].as_u64().unwrap(), designcraft_doc::StoryId(r["story"].as_u64().unwrap()));
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        let mut h = panel(app);
-        h.get_by_label("Fill swatch").click();
-        h.run_steps(3);
-        h.get_by_label("Text").click();
-        h.run_steps(3);
-        h.get_by_label(CYAN).click();
-        h.run_steps(3);
-        let doc = &h.state().session.active().unwrap().doc;
-        assert_eq!(doc.story(story).unwrap().char_format_at(0).over.fill.as_deref(), Some(CYAN), "the text is cyan");
-        assert_eq!(doc.item(designcraft_doc::ids::ItemId(id)).unwrap().fill.swatch, "[None]", "the frame isn't");
-    }
-
-    #[test]
-    fn transform_flips_and_rotates_from_properties() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.run("file.new", json!({})).unwrap();
-        let id = app.run("frame.create", json!({"rect": [72, 72, 300, 200]})).unwrap()["id"].as_u64().unwrap();
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        let mut h = panel(app);
-        let xf = |h: &Harness<'_, DesignApp>| h.state().session.active().unwrap().doc.item(designcraft_doc::ids::ItemId(id)).unwrap().xf;
-        // Flip Horizontal mirrors the frame (a negative determinant); Flip Vertical as well brings it
-        // back to a half turn, as in the tutorial's petal.
-        h.get_by_label("Flip Horizontal").click();
-        h.run_steps(3);
-        assert!(xf(&h).determinant() < 0.0, "{:?}", xf(&h));
-        h.get_by_label("Flip Vertical").click();
-        h.run_steps(3);
-        let c = xf(&h).as_coeffs();
-        assert!((c[0] + 1.0).abs() < 1e-9 && (c[3] + 1.0).abs() < 1e-9, "a half turn: {c:?}");
-        let info = h.state_mut().session.execute("transform.info", &json!({})).unwrap();
-        assert!((info["rotation"].as_f64().unwrap().abs() - 180.0).abs() < 1e-6, "{info}");
-        // A quarter turn clockwise from there.
-        h.get_by_label("Rotate 90° Clockwise").click();
-        h.run_steps(3);
-        let info = h.state_mut().session.execute("transform.info", &json!({})).unwrap();
-        assert!((info["rotation"].as_f64().unwrap() - 90.0).abs() < 1e-6, "{info}");
-        // The angle and scale fields are there.
-        assert!(h.query_by(|n| n.role() == egui::accesskit::Role::TextInput && n.value().as_deref() == Some("90°")).is_some());
-    }
-}
-
-#[cfg(test)]
-mod effects_panel_tests {
-    use super::*;
-
-    /// One frame of the Effects panel: the text painted and where.
-    fn frame(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>) -> Vec<(String, egui::Rect)> {
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(320.0, 400.0));
-        let time = ctx.input(|i| i.time) + 1.0 / 60.0;
-        let mut out =
-            ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(time), events, ..Default::default() }, |ui| effects_panel(app, ui));
-        out.textures_delta.clear();
-        let mut v = Vec::new();
-        for s in out.shapes {
-            if let egui::Shape::Text(t) = s.shape {
-                v.push((t.galley.job.text.clone(), t.visual_bounding_rect()));
-            }
-        }
-        v
-    }
-
-    fn click(app: &mut DesignApp, ctx: &egui::Context, label: &str) {
-        let labels = frame(app, ctx, vec![]);
-        let pos = labels.iter().find(|(t, _)| t == label).unwrap_or_else(|| panic!("{label} is painted")).1.center();
-        for pressed in [true, false] {
-            frame(
-                app,
-                ctx,
-                vec![
-                    egui::Event::PointerMoved(pos),
-                    egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
-                ],
-            );
-        }
-    }
-
-    #[test]
-    fn the_effects_panel_shows_the_level_and_isolate_blending_and_knockout_group_for_groups() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
-        app.run("file.new", json!({})).unwrap();
-        let a = app.run("frame.create", json!({"rect": [72, 72, 144, 144]})).unwrap()["id"].as_u64().unwrap();
-        let b = app.run("frame.create", json!({"rect": [100, 100, 200, 200]})).unwrap()["id"].as_u64().unwrap();
-        let g = app.run("object.group", json!({"ids": [a, b]})).unwrap()["id"].as_u64().unwrap();
-        app.run("selection.set", json!({"ids": [g]})).unwrap();
-        app.run("object.opacity", json!({"opacity": 1.0, "blend": "colorDodge"})).unwrap();
-        let ctx = egui::Context::default();
-        crate::theme::install_fonts(&ctx, "en");
-        crate::theme::apply(&ctx, &Tokens::for_brightness(crate::theme::Brightness::default()));
-        let texts: Vec<String> = frame(&mut app, &ctx, vec![]).into_iter().map(|(t, _)| t).collect();
-        for expected in ["Group:", "Color Dodge 100%", "Isolate Blending", "Knockout Group"] {
-            assert!(texts.iter().any(|t| t == expected), "{expected} in {texts:?}");
-        }
-        let item = |app: &DesignApp, id: u64| app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).cloned().unwrap();
-        click(&mut app, &ctx, "Isolate Blending");
-        assert!(item(&app, g).isolate);
-        click(&mut app, &ctx, "Knockout Group");
-        assert!(item(&app, g).knockout);
-        // Another object: the level is Object, and the group options are greyed.
-        app.run("selection.set", json!({"ids": [a]})).unwrap();
-        let texts: Vec<String> = frame(&mut app, &ctx, vec![]).into_iter().map(|(t, _)| t).collect();
-        assert!(texts.iter().any(|t| t == "Object:"), "{texts:?}");
-        click(&mut app, &ctx, "Knockout Group");
-        assert!(!item(&app, a).knockout);
-    }
-
-    #[test]
-    fn pasted_into_frames_keep_object_level_and_disable_group_blending() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
-        app.run("file.new", json!({})).unwrap();
-        let child = app.run("frame.create", json!({"rect": [80, 80, 120, 120]})).unwrap()["id"].clone();
-        app.run("selection.set", json!({"ids": [child]})).unwrap();
-        app.run("edit.copy", json!({})).unwrap();
-        let container = app.run("frame.create", json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].as_u64().unwrap();
-        app.run("selection.set", json!({"ids": [container]})).unwrap();
-        app.run("edit.pasteInto", json!({})).unwrap();
-        app.run("selection.set", json!({"ids": [container]})).unwrap();
-        let ctx = egui::Context::default();
-        crate::theme::install_fonts(&ctx, "en");
-        crate::theme::apply(&ctx, &Tokens::for_brightness(crate::theme::Brightness::default()));
-        let texts: Vec<String> = frame(&mut app, &ctx, vec![]).into_iter().map(|(t, _)| t).collect();
-        assert!(texts.iter().any(|t| t == "Object:"), "a frame remains an object after Paste Into: {texts:?}");
-        let undo = app.session.doc().unwrap().history.undo.len();
-        click(&mut app, &ctx, "Isolate Blending");
-        click(&mut app, &ctx, "Knockout Group");
-        let st = app.session.doc().unwrap();
-        let it = st.doc.item(designcraft_doc::ItemId(container)).unwrap();
-        assert!(it.has_nested_items());
-        assert!(!it.isolate && !it.knockout, "group-only options stay disabled for a frame holding content");
-        assert_eq!(st.history.undo.len(), undo, "disabled controls do not create undo steps");
-    }
-}
-
-#[cfg(test)]
-mod wrap_panel_tests {
-    use super::*;
-
-    /// One frame of the Text Wrap panel: the text painted and where.
-    fn frame(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>) -> Vec<(String, egui::Rect)> {
-        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(360.0, 300.0));
-        let time = ctx.input(|i| i.time) + 1.0 / 60.0;
-        let mut out =
-            ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(time), events, ..Default::default() }, |ui| wrap_panel(app, ui));
-        out.textures_delta.clear();
-        out.shapes
-            .into_iter()
-            .filter_map(|s| if let egui::Shape::Text(t) = s.shape { Some((t.galley.job.text.clone(), t.visual_bounding_rect())) } else { None })
-            .collect()
-    }
-
-    #[test]
-    fn the_text_wrap_panel_shows_each_offset_and_invert() {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
-        app.run("file.new", json!({})).unwrap();
-        let id = app.run("frame.create", json!({"rect": [72, 72, 144, 144]})).unwrap()["id"].as_u64().unwrap();
-        app.run("object.textWrap", json!({"mode": "boundingBox", "offset": [1, 2, 3, 4]})).unwrap();
-        let ctx = egui::Context::default();
-        crate::theme::install_fonts(&ctx, "en");
-        // Top and Left, then Bottom and Right, each with its own value (picas here: 0p1 = 1 pt),
-        // then the Wrap To side.
-        let t: Vec<String> = frame(&mut app, &ctx, vec![]).into_iter().map(|(t, _)| t).filter(|t| !t.is_empty()).collect();
-        assert_eq!(t, ["Invert", "Top", "0p1", "Left", "0p2", "Bottom", "0p3", "Right", "0p4", "Wrap To", "Both Right & Left Sides"]);
-        // Invert, next to the wrap buttons.
-        let pos = frame(&mut app, &ctx, vec![]).into_iter().find(|(t, _)| t == "Invert").unwrap().1.center();
-        for pressed in [true, false] {
-            frame(
-                &mut app,
-                &ctx,
-                vec![
-                    egui::Event::PointerMoved(pos),
-                    egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
-                ],
-            );
-        }
-        assert!(app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().wrap.invert);
-    }
-}
-
-// ---------------------------------------------------------------- Flex Layout
-
-/// (justification, icon, label) in the Justification menu's order.
-const FLEX_JUSTIFY: [(&str, &str, &str); 6] = [
-    ("flexStart", "flex-start", "Flex Start"),
-    ("center", "flex-center", "Center"),
-    ("flexEnd", "flex-end", "Flex End"),
-    ("spaceBetween", "flex-between", "Space Between"),
-    ("spaceAround", "flex-around", "Space Around"),
-    ("spaceEvenly", "flex-evenly", "Space Evenly"),
-];
-
-/// The selected Flex Layout container (the first), with its objects' bounds.
-fn selected_container(app: &DesignApp) -> Option<(designcraft_doc::Item, Vec<designcraft_geom::Rect>)> {
-    let st = app.session.active()?;
-    let it = st.selection.items.iter().filter_map(|i| st.doc.item(*i)).find(|it| it.flex.is_some())?.clone();
-    let kids = match &it.content {
-        designcraft_doc::Content::Group { items } => items.iter().map(|c| c.bounds()).collect(),
-        _ => Vec::new(),
-    };
-    Some((it, kids))
-}
-
-/// The alignment grid: 3 × 3 cells (one column or row of three when a space justification spreads
-/// the objects along the main axis); the chosen cell shows the direction's arrow.
-fn flex_grid(ui: &mut Ui, r: Rect, f: Option<&designcraft_doc::FlexLayout>) -> Option<u8> {
-    use designcraft_doc::{FlexAlign, FlexJustify};
-    let t = Tokens::get(ui.ctx());
-    let resp = ui.interact(r, ui.id().with("flex_grid"), Sense::click());
-    ui.painter().rect_stroke(r, 2.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
-    let cell = r.width() / 3.0;
-    let pos = |a: FlexAlign| match a {
-        FlexAlign::Start => 0,
-        FlexAlign::Center => 1,
-        FlexAlign::End => 2,
-    };
-    // The chosen (column, row), and whether a space justification leaves only one axis.
-    let (chosen, spread_row) = match f {
-        Some(f) => {
-            let main = match f.justify {
-                FlexJustify::Center => 1,
-                FlexJustify::FlexEnd => 2,
-                _ => 0,
-            };
-            let main = if f.direction.is_reverse() { 2 - main } else { main };
-            let cross = pos(f.align);
-            (if f.direction.is_row() { (main, cross) } else { (cross, main) }, f.justify.distributes().then_some(f.direction.is_row()))
-        }
-        None => ((0, 0), None),
-    };
-    let mut picked = None;
-    for row in 0..3usize {
-        for col in 0..3usize {
-            match spread_row {
-                Some(true) if col != 0 => continue,
-                Some(false) if row != 0 => continue,
-                _ => {}
-            }
-            let c = Rect::from_min_size(r.min + vec2(col as f32 * cell, row as f32 * cell), vec2(cell, cell));
-            let on = match spread_row {
-                Some(true) => row == chosen.1,
-                Some(false) => col == chosen.0,
-                None => (col, row) == chosen,
-            };
-            if on && f.is_some() {
-                ui.painter().rect_filled(c.shrink(2.0), 2.0, t.well);
-                let icon = match f.map(|f| f.direction) {
-                    Some(designcraft_doc::FlexDirection::RowReverse) => "flex-left",
-                    Some(designcraft_doc::FlexDirection::Column) => "flex-down",
-                    Some(designcraft_doc::FlexDirection::ColumnReverse) => "flex-up",
-                    _ => "flex-right",
-                };
-                icons::paint(ui.painter(), c.shrink(3.0), icon, t.text_strong);
-            } else {
-                ui.painter().circle_filled(c.center(), 1.5, t.icon);
-            }
-            if resp.clicked() && resp.interact_pointer_pos().is_some_and(|p| c.contains(p)) {
-                picked = Some((row * 3 + col) as u8);
-            }
-        }
-    }
-    picked
-}
-
-/// Flex Layout controls, as InDesign's panel: Create Flex Layout; alignment grid, width and height
-/// (Auto/Fixed); justification, direction and wrap; padding and spacing.
-fn flex_section(app: &mut DesignApp, ui: &mut Ui) {
-    use designcraft_doc::{FlexSize, flex};
-    let t = Tokens::get(ui.ctx());
-    let lang = app.ui.language.clone();
-    let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
-    let u = units(app);
-    let has_sel = app.session.active().is_some_and(|s| !s.selection.items.is_empty());
-    let container = selected_container(app);
-    let f = container.as_ref().and_then(|(it, _)| it.flex.clone());
-    let mut on = f.is_some();
-    let resp = ui.add_enabled_ui(has_sel, |ui| widgets::checkbox(ui, &mut on, &tr("Create Flex Layout"))).inner;
-    if resp.changed() {
-        let _ = app.run(if on { "flex.add" } else { "flex.remove" }, json!({}));
-        return;
-    }
-    ui.add_space(4.0);
-    let enabled = f.is_some();
-    let rect = container.as_ref().map(|(it, _)| it.inner_bounds());
-    let arranged = container.as_ref().and_then(|(it, kids)| it.flex.as_ref().map(|f| flex::arrange(f, it.inner_bounds(), kids)));
-    let mut set: Option<Value> = None;
-    // Alignment grid, W and H with Auto/Fixed, constrain proportions.
-    let b = block(ui, 2.0 * FIELD_H + 5.0);
-    ui.add_enabled_ui(enabled, |ui| {
-        if let Some(c) = flex_grid(ui, sub(b, 0.0, 0.0, 48.0, 48.0), f.as_ref()) {
-            set = Some(json!({"cell": c}));
-        }
-        let linked = temp_bool(ui, "flex_size_linked", false);
-        for (k, (label, key, mode, len)) in [
-            ("W:", "width", f.as_ref().map(|f| f.width), rect.map(|r| r.width())),
-            ("H:", "height", f.as_ref().map(|f| f.height), rect.map(|r| r.height())),
-        ]
-        .into_iter()
-        .enumerate()
-        {
-            let y = k as f32 * (FIELD_H + 5.0);
-            ui.painter().text(
-                sub(b, 56.0, y, 18.0, FIELD_H).right_center(),
-                egui::Align2::RIGHT_CENTER,
-                tr(label),
-                egui::FontId::proportional(11.5),
-                t.text,
-            );
-            let nv = place(ui, sub(b, 78.0, y, 66.0, FIELD_H), |ui| NumField::measure(key, len, u).width(66.0).range(0.0, 100_000.0).show(ui));
-            if let Some(v) = nv {
-                let mut p = json!({ key: v });
-                if linked
-                    && let (Some(r), Some(len)) = (rect, len)
-                    && len > 1e-9
-                {
-                    let other = if key == "width" { ("height", r.height()) } else { ("width", r.width()) };
-                    p[other.0] = json!(other.1 * v / len);
-                }
-                set = Some(p);
-            }
-            let names = [tr("Fixed"), tr("Auto")];
-            let cur = if mode == Some(FlexSize::Auto) { 1 } else { 0 };
-            if let Some(i) = place(ui, sub(b, 148.0, y, 62.0, FIELD_H), |ui| widgets::dropdown_list(ui, &names[cur], 62.0, &names, Some(cur))) {
-                set = Some(json!({ key: if i == 1 { "auto" } else { "fixed" } }));
-            }
-        }
-        let clicked = place(ui, sub(b, 214.0, 12.5, 22.0, FIELD_H), |ui| {
-            widgets::icon_toggle_sized(ui, if linked { "link" } else { "link-broken" }, linked, &tr("Constrain proportions"), vec2(22.0, 21.0))
-                .clicked()
-        });
-        if clicked {
-            set_temp_bool(ui, "flex_size_linked", !linked);
-        }
-    });
-    ui.add_space(6.0);
-    // Justification, direction, wrap.
-    let b = block(ui, FIELD_H);
-    ui.add_enabled_ui(enabled, |ui| {
-        let cur = f.as_ref().map(|f| f.justify).unwrap_or_default();
-        let cur = serde_json::to_value(cur).ok().and_then(|v| v.as_str().map(str::to_string)).unwrap_or_default();
-        let icon = FLEX_JUSTIFY.iter().find(|j| j.0 == cur).map(|j| j.1).unwrap_or("flex-start");
-        let resp = place(ui, sub(b, 0.0, 0.0, 58.0, FIELD_H), |ui| {
-            preview_dropdown(ui, 58.0, |p, r| icons::paint(p, r.shrink2(vec2(6.0, 2.0)), icon, egui::Color32::from_gray(60)))
-        });
-        egui::Popup::menu(&resp).show(|ui| {
-            ui.set_min_width(150.0);
-            for (id, icon, label) in FLEX_JUSTIFY {
-                let r = ui.horizontal(|ui| {
-                    let (ir, _) = ui.allocate_exact_size(vec2(22.0, 16.0), Sense::hover());
-                    icons::paint(ui.painter(), ir, icon, t.icon);
-                    ui.selectable_label(id == cur, crate::rtl::widget(ui, tr(label)))
-                });
-                if r.inner.clicked() {
-                    set = Some(json!({"justify": id}));
-                    ui.close();
-                }
-            }
-        });
-        let dir = f.as_ref().map(|f| f.direction).unwrap_or_default();
-        place(ui, sub(b, 78.0, 0.0, 132.0, FIELD_H), |ui| {
-            ui.spacing_mut().item_spacing.x = 2.0;
-            for (d, icon, tip) in [
-                (designcraft_doc::FlexDirection::Row, "flex-right", "Row"),
-                (designcraft_doc::FlexDirection::RowReverse, "flex-left", "Reverse Row"),
-                (designcraft_doc::FlexDirection::Column, "flex-down", "Column"),
-                (designcraft_doc::FlexDirection::ColumnReverse, "flex-up", "Reverse Column"),
-            ] {
-                if widgets::icon_toggle_sized(ui, icon, enabled && dir == d, &tr(tip), vec2(31.0, 21.0)).clicked() {
-                    set = Some(json!({"direction": d}));
-                }
-            }
-        });
-        let wrap = f.as_ref().is_some_and(|f| f.wrap);
-        if place(ui, sub(b, 214.0, 0.0, 22.0, FIELD_H), |ui| {
-            widgets::icon_toggle_sized(ui, "flex-wrap", wrap, &tr("Wrap Content"), vec2(22.0, 21.0)).clicked()
-        }) {
-            set = Some(json!({"wrap": !wrap}));
-        }
-    });
-    // Spacing: padding (linked by default) and the spacing between objects.
-    section(ui, &tr("Spacing"), true);
-    let b = block(ui, 3.0 * FIELD_H + 10.0);
-    ui.add_enabled_ui(enabled, |ui| {
-        let pad = f.as_ref().map(|f| f.padding).unwrap_or_default();
-        let linked = temp_bool(ui, "flex_padding_linked", true);
-        for (k, (icon, tip, x, y)) in [
-            ("margin-top", "Top", 0.0, 0.0),
-            ("margin-inside", "Left", 112.0, 0.0),
-            ("margin-bottom", "Bottom", 0.0, 26.0),
-            ("margin-outside", "Right", 112.0, 26.0),
-        ]
-        .into_iter()
-        .enumerate()
-        {
-            let ir = sub(b, x, y + 2.0, 17.0, 17.0);
-            icons::paint(ui.painter(), ir, icon, t.icon);
-            ui.interact(ir, ui.id().with(("flex_pad", k)), Sense::hover()).on_hover_ui(|ui| {
-                crate::rtl::label(ui, tr(tip));
-            });
-            let value = f.as_ref().map(|_| pad[k]);
-            let nv = place(ui, sub(b, x + 20.0, y, 76.0, FIELD_H), |ui| {
-                NumField::measure(tip, value, u).width(76.0).spinner().range(0.0, 8000.0).show(ui)
-            });
-            if let Some(v) = nv {
-                let p = if linked {
-                    [v; 4]
-                } else {
-                    let mut p = pad;
-                    p[k] = v;
-                    p
-                };
-                set = Some(json!({"padding": p}));
-            }
-        }
-        if place(ui, sub(b, 214.0, 12.5, 22.0, FIELD_H), |ui| {
-            widgets::icon_toggle_sized(ui, if linked { "link" } else { "link-broken" }, linked, &tr("Make all settings the same"), vec2(22.0, 21.0))
-                .clicked()
-        }) {
-            set_temp_bool(ui, "flex_padding_linked", !linked);
-        }
-        // Spacing between objects: a space justification works the main axis' out (shown greyed);
-        // the cross axis' only counts when objects wrap.
-        let (row, distributes, wrap) = f.as_ref().map(|f| (f.direction.is_row(), f.justify.distributes(), f.wrap)).unwrap_or((true, false, false));
-        let main_gap = arranged.as_ref().map(|a| a.main_gap);
-        for (k, (icon, key, tip, x)) in
-            [("gap-h", "gapH", "Horizontal Spacing", 0.0), ("gap-v", "gapV", "Vertical Spacing", 112.0)].into_iter().enumerate()
-        {
-            let main = (k == 0) == row;
-            let live = if main { !distributes } else { wrap };
-            let value = match &f {
-                Some(_) if main && distributes => main_gap,
-                Some(f) => Some(if k == 0 { f.gap_h } else { f.gap_v }),
-                None => None,
-            };
-            let y = 2.0 * FIELD_H + 10.0;
-            let ir = sub(b, x, y + 2.0, 17.0, 17.0);
-            icons::paint(ui.painter(), ir, icon, if live { t.icon } else { t.text_dim });
-            ui.interact(ir, ui.id().with(("flex_gap", k)), Sense::hover()).on_hover_ui(|ui| {
-                crate::rtl::label(ui, tr(tip));
-            });
-            let nv = place(ui, sub(b, x + 20.0, y, 76.0, FIELD_H), |ui| {
-                NumField::measure(key, value, u).width(76.0).spinner().range(0.0, 8000.0).enabled(live).show(ui)
-            });
-            if let Some(v) = nv {
-                set = Some(json!({ key: v }));
-            }
-        }
-    });
-    if let Some(p) = set {
-        let _ = app.run("flex.set", p);
-    }
-}
-
-/// Window › Flex Layout.
-pub fn flex_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
-    ui.spacing_mut().item_spacing = vec2(6.0, 5.0);
-    flex_section(app, ui);
-}
+mod tests;
diff --git a/crates/ui-egui/src/panels/properties/document.rs b/crates/ui-egui/src/panels/properties/document.rs
new file mode 100644
index 000000000..0a7fdbc5a
--- /dev/null
+++ b/crates/ui-egui/src/panels/properties/document.rs
@@ -0,0 +1,371 @@
+use super::{
+    DesignApp, FIELD_H, NumField, Rect, Sense, Tokens, Ui, Value, block, button_pair, divider, dropdown, full_width, icon_toggle, icons, json,
+    number, outline_button, place, pos2, rule, section, section_row, set_temp_bool, sub, temp_bool, units, vec2, widgets,
+};
+
+// ---------------------------------------------------------------- No Selection
+
+/// Page-size presets for the Document dropdown (portrait, points).
+pub(crate) const PAGE_PRESETS: &[(&str, f64, f64)] = &[
+    ("Letter", 612.0, 792.0),
+    ("Legal", 612.0, 1008.0),
+    ("Tabloid", 792.0, 1224.0),
+    ("Letter - Half", 396.0, 612.0),
+    ("Legal - Half", 504.0, 612.0),
+    ("A0", 841.0 * units::PT_PER_MM, 1189.0 * units::PT_PER_MM),
+    ("A1", 594.0 * units::PT_PER_MM, 841.0 * units::PT_PER_MM),
+    ("A2", 420.0 * units::PT_PER_MM, 594.0 * units::PT_PER_MM),
+    ("A3", 841.89, 1190.55),
+    ("A4", 595.276, 841.89),
+    ("A5", 419.528, 595.276),
+    ("A6", 297.638, 419.528),
+    ("B5", 498.898, 708.661),
+    ("US Business Card", 144.0, 252.0),
+];
+
+pub(crate) fn preset_name(w: f64, h: f64) -> &'static str {
+    let (a, b) = (w.min(h), w.max(h));
+    PAGE_PRESETS.iter().find(|p| (p.1 - a).abs() < 0.6 && (p.2 - b).abs() < 0.6).map(|p| p.0).unwrap_or("Custom")
+}
+
+/// The preset dropdown and orientation toggles for one page; the new (width, height) when one changed.
+fn page_preset_row(ui: &mut Ui, lang: &str, w: f64, h: f64) -> Option<(f64, f64)> {
+    let landscape = w > h;
+    let b = block(ui, FIELD_H);
+    let mut size = None;
+    place(ui, sub(b, 0.0, 0.0, 93.0, FIELD_H), |ui| {
+        let resp = dropdown(ui, crate::i18n::tr(lang, preset_name(w, h)), 93.0);
+        egui::Popup::menu(&resp).show(|ui| {
+            ui.set_min_width(140.0);
+            for p in PAGE_PRESETS {
+                if ui.selectable_label(preset_name(w, h) == p.0, crate::i18n::tr(lang, p.0)).clicked() {
+                    size = Some(if landscape { (p.2, p.1) } else { (p.1, p.2) });
+                    ui.close();
+                }
+            }
+        });
+    });
+    place(ui, sub(b, 126.0, 0.0, 52.0, FIELD_H), |ui| {
+        ui.spacing_mut().item_spacing.x = 4.0;
+        if icon_toggle(ui, "orient-portrait", !landscape, crate::i18n::tr(lang, "Portrait")).clicked() && landscape {
+            size = Some((h, w));
+        }
+        if icon_toggle(ui, "orient-landscape", landscape, crate::i18n::tr(lang, "Landscape")).clicked() && !landscape {
+            size = Some((h, w));
+        }
+    });
+    size
+}
+
+/// Properties with the Page tool (Properties › Edit Page), as InDesign's: a "Page" band with Back,
+/// Page Size for this page alone (which page, preset, orientation, W/H), Margins and Columns and
+/// Quick Actions. Back returns to the Selection tool and the document's properties.
+pub(super) fn page_sections(app: &mut DesignApp, ui: &mut Ui, page: usize) {
+    let u = units(app);
+    let lang = app.ui.language.clone();
+    let Some(st) = app.session.active() else { return };
+    let d = st.doc.clone();
+    let Some((si, pi)) = d.page_loc(page) else { return };
+    let Some(pg) = d.spreads.get(si).and_then(|s| s.pages.get(pi)).cloned() else { return };
+    let n = page + 1;
+    let t = Tokens::get(ui.ctx());
+    // The band: "Page", and Back at its end.
+    let band = block(ui, 33.0);
+    crate::rtl::paint(
+        ui.painter(),
+        pos2(band.min.x, band.center().y + 1.0),
+        egui::Align2::LEFT_CENTER,
+        crate::i18n::tr(&lang, "Page"),
+        crate::theme::semibold(11.5),
+        t.text_strong,
+    );
+    let back = place(ui, Rect::from_min_size(pos2(band.max.x - 58.0, band.center().y - 10.0), vec2(54.0, 20.0)), |ui| {
+        outline_button(ui, crate::i18n::tr(&lang, "Back"), 54.0).clicked()
+    });
+    rule(ui);
+    if back {
+        let _ = app.run("layout.selectPage", json!({"page": null}));
+        app.select_tool("selection");
+        return;
+    }
+    section(ui, crate::i18n::tr(&lang, "Page Size"), true);
+    // Which page.
+    let b = block(ui, FIELD_H);
+    let names: Vec<String> = (0..d.page_count()).map(|i| app.session.page_label(i)).collect();
+    let picked = place(ui, sub(b, 0.0, 0.0, 93.0, FIELD_H), |ui| {
+        widgets::dropdown_list(ui, names.get(page).map_or("", String::as_str), 93.0, &names, Some(page))
+    });
+    if let Some(p) = picked {
+        let _ = app.run("layout.selectPage", json!({"page": p + 1}));
+        crate::canvas::go_to_page(app, p);
+        return;
+    }
+    ui.add_space(3.0);
+    // Preset and orientation: this page alone.
+    let (w, h) = (pg.width, pg.height);
+    let mut size = page_preset_row(ui, &lang, w, h);
+    ui.add_space(3.0);
+    let b = block(ui, 2.0 * FIELD_H + 5.0);
+    for (row, (label, v, key)) in [("W:", w, "width"), ("H:", h, "height")].into_iter().enumerate() {
+        let y = row as f32 * 26.0;
+        place(ui, sub(b, 0.0, y, 20.0, FIELD_H), |ui| widgets::caption_w(ui, label, 20.0));
+        let nv = place(ui, sub(b, 21.0, y, 72.0, FIELD_H), |ui| {
+            NumField::measure(&format!("page_{key}"), Some(v), u).width(72.0).spinner().range(1.0, 15552.0).show(ui)
+        });
+        if let Some(nv) = nv {
+            size = Some(if key == "width" { (nv, h) } else { (w, nv) });
+        }
+    }
+    if let Some((nw, nh)) = size {
+        let _ = app.run("layout.pageSize", json!({"pages": [n], "width": nw, "height": nh, "anchor": app.ui.ref_point.min(8)}));
+    }
+    ui.add_space(6.0);
+    let fw = full_width(ui);
+    if outline_button(ui, crate::i18n::tr(&lang, "Margins and Columns"), fw).clicked() {
+        crate::canvas::go_to_page(app, page);
+        crate::menus::activate(app, "layout.marginsAndColumns", &Value::Null);
+    }
+    divider(ui);
+    section(ui, crate::i18n::tr(&lang, "Quick Actions"), true);
+    if outline_button(ui, crate::i18n::tr(&lang, "Import File"), fw).clicked() {
+        let _ = app.run("app.placeDialog", json!({}));
+    }
+}
+
+/// Page count field: add pages after the last one, or delete from the end, to reach `nv` (from `n`).
+fn resize_document(app: &mut DesignApp, n: usize, nv: f64) {
+    let want = (nv.round() as usize).clamp(1, 9999);
+    if want > n {
+        let _ = app.run("layout.pages.insert", json!({"count": want - n, "after": n - 1}));
+    } else if want < n {
+        let _ = app.run("layout.pages.delete", json!({"pages": (want..n).collect::<Vec<_>>()}));
+    }
+}
+
+/// The margins after field `k` (top, bottom, outside, inside) is set to `nv`; all four when linked.
+fn edited_margins(mut m: designcraft_doc::Margins, linked: bool, k: usize, nv: f64) -> designcraft_doc::Margins {
+    if linked {
+        return designcraft_doc::Margins { top: nv, bottom: nv, inside: nv, outside: nv };
+    }
+    match k {
+        0 => m.top = nv,
+        1 => m.bottom = nv,
+        2 => m.outside = nv,
+        _ => m.inside = nv,
+    }
+    m
+}
+
+/// The page-size preset menu; the width and height of the preset chosen.
+fn page_preset_menu(ui: &mut Ui, pw: f64, ph: f64) -> Option<(f64, f64)> {
+    let mut preset = None;
+    let resp = dropdown(ui, preset_name(pw, ph), 93.0);
+    egui::Popup::menu(&resp).show(|ui| {
+        ui.set_min_width(140.0);
+        for p in PAGE_PRESETS {
+            if ui.selectable_label(preset_name(pw, ph) == p.0, p.0).clicked() {
+                preset = Some((p.1, p.2));
+                ui.close();
+            }
+        }
+    });
+    preset
+}
+
+pub(super) fn document_sections(app: &mut DesignApp, ui: &mut Ui) {
+    let u = units(app);
+    let Some(st) = app.session.active() else { return };
+    let d = st.doc.clone();
+    let (pw, ph) = (d.settings.page_width, d.settings.page_height);
+    section(ui, crate::i18n::tr(&app.ui.language, "Document"), true);
+    // Preset dropdown + orientation.
+    let b = block(ui, FIELD_H);
+    let preset = place(ui, sub(b, 0.0, 0.0, 93.0, FIELD_H), |ui| page_preset_menu(ui, pw, ph));
+    let landscape = pw > ph;
+    let mut orient = None;
+    place(ui, sub(b, 126.0, 0.0, 52.0, FIELD_H), |ui| {
+        ui.spacing_mut().item_spacing.x = 4.0;
+        if icon_toggle(ui, "orient-portrait", !landscape, crate::i18n::tr(&app.ui.language, "Portrait")).clicked() && landscape {
+            orient = Some(());
+        }
+        if icon_toggle(ui, "orient-landscape", landscape, crate::i18n::tr(&app.ui.language, "Landscape")).clicked() && !landscape {
+            orient = Some(());
+        }
+    });
+    if let Some((w, h)) = preset {
+        let (w, h) = if landscape { (h, w) } else { (w, h) };
+        let _ = app.run("layout.documentSetup", json!({"width": w, "height": h}));
+    }
+    if orient.is_some() {
+        let _ = app.run("layout.documentSetup", json!({"width": ph, "height": pw}));
+    }
+    ui.add_space(3.0);
+    // W / H, page count, facing pages.
+    let b = block(ui, 2.0 * FIELD_H + 5.0);
+    for (row, (label, v, key)) in [("W:", pw, "width"), ("H:", ph, "height")].into_iter().enumerate() {
+        let y = row as f32 * 26.0;
+        place(ui, sub(b, 0.0, y, 20.0, FIELD_H), |ui| widgets::caption_w(ui, label, 20.0));
+        let nv =
+            place(ui, sub(b, 21.0, y, 72.0, FIELD_H), |ui| NumField::measure(key, Some(v), u).width(72.0).spinner().range(1.0, 15552.0).show(ui));
+        if let Some(nv) = nv {
+            let _ = app.run("layout.documentSetup", json!({key: nv}));
+        }
+    }
+    let n = d.page_count();
+    let t = Tokens::get(ui.ctx());
+    icons::paint(ui.painter(), sub(b, 127.0, 2.0, 17.0, 17.0), "page-count", t.icon);
+    let nv = place(ui, sub(b, 150.0, 0.0, 68.0, FIELD_H), |ui| number(ui, "pagecount", Some(n as f64), "", 68.0, 0));
+    if let Some(nv) = nv {
+        resize_document(app, n, nv);
+    }
+    let mut facing = d.settings.facing_pages;
+    let changed = place(ui, sub(b, 126.0, 26.0, 100.0, FIELD_H), |ui| {
+        widgets::checkbox(ui, &mut facing, crate::i18n::tr(&app.ui.language, "Facing Pages")).changed()
+    });
+    if changed {
+        let _ = app.run("layout.documentSetup", json!({"facingPages": facing}));
+    }
+    // Margins.
+    section(ui, crate::i18n::tr(&app.ui.language, "Margins"), true);
+    let cur = crate::canvas::current_page(app).unwrap_or(0);
+    // While parent spreads are edited the fields belong to the parent page in view; they used to
+    // show (and change) the document pages instead, so nothing changed on the parent.
+    let parent_target = crate::canvas::current_parent_page(app);
+    let shown = match parent_target {
+        Some((pi, qi)) => d.parents.get(pi).and_then(|s| s.pages.get(qi)).cloned(),
+        None => d.page(cur).cloned(),
+    };
+    if let Some(p) = shown {
+        let linked = temp_bool(ui, "margins_linked", true);
+        let b = block(ui, 2.0 * FIELD_H + 5.0);
+        let mut set: Option<designcraft_doc::Margins> = None;
+        let fields = [
+            ("margin-top", "Top", p.margins.top, 0.0, 0.0),
+            ("margin-bottom", "Bottom", p.margins.bottom, 0.0, 26.0),
+            ("margin-outside", if d.settings.facing_pages { "Outside" } else { "Right" }, p.margins.outside, 127.0, 0.0),
+            ("margin-inside", if d.settings.facing_pages { "Inside" } else { "Left" }, p.margins.inside, 127.0, 26.0),
+        ];
+        for (k, (icon, tip, v, x, y)) in fields.into_iter().enumerate() {
+            let ir = sub(b, x, y + 2.0, 17.0, 17.0);
+            icons::paint(ui.painter(), ir, icon, t.icon);
+            ui.interact(ir, ui.scope_id().with(("micon", k)), Sense::hover()).on_hover_ui(|ui| {
+                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, tip));
+            });
+            let nv = place(ui, sub(b, x + 20.0, y, 73.0, FIELD_H), |ui| {
+                NumField::measure(tip, Some(v), u).width(73.0).spinner().range(0.0, 8000.0).show(ui)
+            });
+            if let Some(nv) = nv {
+                set = Some(edited_margins(p.margins, linked, k, nv));
+            }
+        }
+        let lr = sub(b, 99.0, 12.5, 22.0, FIELD_H);
+        let clicked = place(ui, lr, |ui| {
+            widgets::icon_toggle_sized(ui, if linked { "link" } else { "link-broken" }, linked, "Make all settings the same", vec2(22.0, 21.0))
+                .clicked()
+        });
+        if clicked {
+            set_temp_bool(ui, "margins_linked", !linked);
+        }
+        if let Some(m) = set {
+            let params = match parent_target {
+                // Both pages of a facing parent spread, so the margins show wherever the parent is used.
+                Some((pi, _)) => {
+                    let n = app.session.active().and_then(|st| st.doc.parents.get(pi)).map_or(1, |sp| sp.pages.len());
+                    json!({"margins": m, "parent": pi, "pages": (0..n).collect::<Vec<_>>()})
+                }
+                None => json!({"margins": m}),
+            };
+            let _ = app.run("layout.marginsAndColumns", params);
+        }
+    }
+    ui.add_space(6.0);
+    let fw = full_width(ui);
+    if outline_button(ui, crate::i18n::tr(&app.ui.language, "Adjust Layout"), fw).clicked() {
+        crate::dialogs::open_document_setup(app);
+    }
+    divider(ui);
+    // Page.
+    section(ui, crate::i18n::tr(&app.ui.language, "Page"), true);
+    let b = block(ui, FIELD_H);
+    let names: Vec<String> = (0..d.page_count()).map(|i| app.session.page_label(i)).collect();
+    let picked = place(ui, sub(b, 0.0, 0.0, 93.0, FIELD_H), |ui| {
+        widgets::dropdown_list(ui, &names[cur.min(names.len().saturating_sub(1))], 93.0, &names, Some(cur))
+    });
+    if let Some(pg) = picked {
+        crate::canvas::go_to_page(app, pg);
+    }
+    let (add, del) = place(ui, sub(b, 172.0, 0.0, 50.0, FIELD_H), |ui| {
+        ui.spacing_mut().item_spacing.x = 4.0;
+        let a = widgets::icon_toggle_sized(ui, "style-new", false, "Insert Page", vec2(22.0, 21.0)).clicked();
+        let d = widgets::icon_toggle_sized(ui, "trash", false, "Delete Page", vec2(22.0, 21.0)).clicked();
+        (a, d)
+    });
+    if add {
+        let _ = app.run("layout.pages.insert", json!({"after": cur, "count": 1}));
+    }
+    if del {
+        let _ = crate::dialogs::delete_pages(app, vec![cur]);
+    }
+    ui.add_space(3.0);
+    if outline_button(ui, crate::i18n::tr(&app.ui.language, "Edit Page"), fw).clicked() {
+        // As in InDesign: the Page tool on this page; Properties shows the page's own settings.
+        app.select_tool("page");
+        let _ = app.run("layout.selectPage", json!({"page": cur + 1}));
+    }
+    divider(ui);
+    // Rulers & Grids / Guides: icon toggle rows.
+    let (mut rulers, mut bl, mut dg) = (app.ui.rulers, app.ui.baseline_grid, app.ui.document_grid);
+    section_row(ui, crate::i18n::tr(&app.ui.language, "Rulers & Grids"), |ui| {
+        ui.spacing_mut().item_spacing.x = 14.0;
+        if icon_toggle(ui, "grid-document", dg, crate::i18n::tr(&app.ui.language, "Show Document Grid")).clicked() {
+            dg = !dg;
+        }
+        if icon_toggle(ui, "grid-baseline", bl, crate::i18n::tr(&app.ui.language, "Show Baseline Grid")).clicked() {
+            bl = !bl;
+        }
+        if icon_toggle(ui, "rulers", rulers, crate::i18n::tr(&app.ui.language, "Show Rulers")).clicked() {
+            rulers = !rulers;
+        }
+    });
+    if rulers != app.ui.rulers {
+        let _ = app.run("view.rulers", json!({}));
+    }
+    if bl != app.ui.baseline_grid {
+        let _ = app.run("view.baselineGrid", json!({}));
+    }
+    if dg != app.ui.document_grid {
+        let _ = app.run("view.documentGrid", json!({}));
+    }
+    rule(ui);
+    let (mut guides, mut locked, mut smart) = (app.ui.guides, app.ui.guides_locked, app.ui.smart_guides);
+    section_row(ui, crate::i18n::tr(&app.ui.language, "Guides"), |ui| {
+        ui.spacing_mut().item_spacing.x = 14.0;
+        if icon_toggle(ui, "guides-smart", smart, crate::i18n::tr(&app.ui.language, "Smart Guides")).clicked() {
+            smart = !smart;
+        }
+        if icon_toggle(ui, "guides-lock", locked, crate::i18n::tr(&app.ui.language, "Lock Guides")).clicked() {
+            locked = !locked;
+        }
+        if icon_toggle(ui, "guides-show", guides, crate::i18n::tr(&app.ui.language, "Show Guides")).clicked() {
+            guides = !guides;
+        }
+    });
+    if guides != app.ui.guides {
+        let _ = app.run("view.guides", json!({}));
+    }
+    if smart != app.ui.smart_guides {
+        let _ = app.run("view.smartGuides", json!({}));
+    }
+    if locked != app.ui.guides_locked {
+        let _ = app.run("view.lockGuides", json!({"on": locked}));
+    }
+    rule(ui);
+    section(ui, crate::i18n::tr(&app.ui.language, "Quick Actions"), true);
+    let (a, b) = button_pair(ui, crate::i18n::tr(&app.ui.language, "Import File"), crate::i18n::tr(&app.ui.language, "Insert Page"));
+    if a {
+        let _ = app.run("app.placeDialog", json!({}));
+    }
+    if b {
+        let _ = app.run("layout.pages.insert", json!({"after": cur, "count": 1}));
+    }
+}
diff --git a/crates/ui-egui/src/panels/properties/flex.rs b/crates/ui-egui/src/panels/properties/flex.rs
new file mode 100644
index 000000000..591ce4cfd
--- /dev/null
+++ b/crates/ui-egui/src/panels/properties/flex.rs
@@ -0,0 +1,289 @@
+use super::object::preview_dropdown;
+use super::{
+    DesignApp, FIELD_H, NumField, Rect, Sense, Stroke, StrokeKind, Tokens, Ui, Value, block, icons, json, place, section, set_temp_bool, sub,
+    temp_bool, units, vec2, widgets,
+};
+
+// ---------------------------------------------------------------- Flex Layout
+
+/// (justification, icon, label) in the Justification menu's order.
+const FLEX_JUSTIFY: [(&str, &str, &str); 6] = [
+    ("flexStart", "flex-start", "Flex Start"),
+    ("center", "flex-center", "Center"),
+    ("flexEnd", "flex-end", "Flex End"),
+    ("spaceBetween", "flex-between", "Space Between"),
+    ("spaceAround", "flex-around", "Space Around"),
+    ("spaceEvenly", "flex-evenly", "Space Evenly"),
+];
+
+/// The selected Flex Layout container (the first), with its objects' bounds.
+fn selected_container(app: &DesignApp) -> Option<(designcraft_doc::Item, Vec<designcraft_geom::Rect>)> {
+    let st = app.session.active()?;
+    let it = st.selection.items.iter().filter_map(|i| st.doc.item(*i)).find(|it| it.flex.is_some())?.clone();
+    let kids = match &it.content {
+        designcraft_doc::Content::Group { items } => items.iter().map(|c| c.bounds()).collect(),
+        _ => Vec::new(),
+    };
+    Some((it, kids))
+}
+
+/// The chosen (column, row) of the Flex Layout alignment grid, and whether a space justification
+/// leaves only one axis (`Some(true)` for a row layout).
+fn flex_grid_choice(f: Option<&designcraft_doc::FlexLayout>) -> ((usize, usize), Option<bool>) {
+    use designcraft_doc::{FlexAlign, FlexJustify};
+    let pos = |a: FlexAlign| match a {
+        FlexAlign::Start => 0,
+        FlexAlign::Center => 1,
+        FlexAlign::End => 2,
+    };
+    match f {
+        Some(f) => {
+            let main = match f.justify {
+                FlexJustify::Center => 1,
+                FlexJustify::FlexEnd => 2,
+                _ => 0,
+            };
+            let main = if f.direction.is_reverse() { 2 - main } else { main };
+            let cross = pos(f.align);
+            (if f.direction.is_row() { (main, cross) } else { (cross, main) }, f.justify.distributes().then_some(f.direction.is_row()))
+        }
+        None => ((0, 0), None),
+    }
+}
+
+/// The alignment grid: 3 × 3 cells (one column or row of three when a space justification spreads
+/// the objects along the main axis); the chosen cell shows the direction's arrow.
+fn flex_grid(ui: &mut Ui, r: Rect, f: Option<&designcraft_doc::FlexLayout>) -> Option<u8> {
+    let t = Tokens::get(ui.ctx());
+    let resp = ui.interact(r, ui.scope_id().with("flex_grid"), Sense::click());
+    ui.painter().rect_stroke(r, 2.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
+    let cell = r.width() / 3.0;
+    let (chosen, spread_row) = flex_grid_choice(f);
+    let mut picked = None;
+    for row in 0..3usize {
+        for col in 0..3usize {
+            match spread_row {
+                Some(true) if col != 0 => continue,
+                Some(false) if row != 0 => continue,
+                _ => {}
+            }
+            let c = Rect::from_min_size(r.min + vec2(col as f32 * cell, row as f32 * cell), vec2(cell, cell));
+            let on = match spread_row {
+                Some(true) => row == chosen.1,
+                Some(false) => col == chosen.0,
+                None => (col, row) == chosen,
+            };
+            if on && f.is_some() {
+                ui.painter().rect_filled(c.shrink(2.0), 2.0, t.well);
+                let icon = match f.map(|f| f.direction) {
+                    Some(designcraft_doc::FlexDirection::RowReverse) => "flex-left",
+                    Some(designcraft_doc::FlexDirection::Column) => "flex-down",
+                    Some(designcraft_doc::FlexDirection::ColumnReverse) => "flex-up",
+                    _ => "flex-right",
+                };
+                icons::paint(ui.painter(), c.shrink(3.0), icon, t.text_strong);
+            } else {
+                ui.painter().circle_filled(c.center(), 1.5, t.icon);
+            }
+            if resp.clicked() && resp.interact_pointer_pos().is_some_and(|p| c.contains(p)) {
+                picked = Some((row * 3 + col) as u8);
+            }
+        }
+    }
+    picked
+}
+
+/// Flex Layout controls, as InDesign's panel: Create Flex Layout; alignment grid, width and height
+/// (Auto/Fixed); justification, direction and wrap; padding and spacing.
+pub(super) fn flex_section(app: &mut DesignApp, ui: &mut Ui) {
+    use designcraft_doc::{FlexSize, flex};
+    let t = Tokens::get(ui.ctx());
+    let lang = app.ui.language.clone();
+    let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
+    let u = units(app);
+    let has_sel = app.session.active().is_some_and(|s| !s.selection.items.is_empty());
+    let container = selected_container(app);
+    let f = container.as_ref().and_then(|(it, _)| it.flex.clone());
+    let mut on = f.is_some();
+    let resp = ui.add_enabled_ui(has_sel, |ui| widgets::checkbox(ui, &mut on, &tr("Create Flex Layout"))).inner;
+    if resp.changed() {
+        let _ = app.run(if on { "flex.add" } else { "flex.remove" }, json!({}));
+        return;
+    }
+    ui.add_space(4.0);
+    let enabled = f.is_some();
+    let rect = container.as_ref().map(|(it, _)| it.inner_bounds());
+    let arranged = container.as_ref().and_then(|(it, kids)| it.flex.as_ref().map(|f| flex::arrange(f, it.inner_bounds(), kids)));
+    let mut set: Option<Value> = None;
+    // Alignment grid, W and H with Auto/Fixed, constrain proportions.
+    let b = block(ui, 2.0 * FIELD_H + 5.0);
+    ui.add_enabled_ui(enabled, |ui| {
+        if let Some(c) = flex_grid(ui, sub(b, 0.0, 0.0, 48.0, 48.0), f.as_ref()) {
+            set = Some(json!({"cell": c}));
+        }
+        let linked = temp_bool(ui, "flex_size_linked", false);
+        for (k, (label, key, mode, len)) in [
+            ("W:", "width", f.as_ref().map(|f| f.width), rect.map(|r| r.width())),
+            ("H:", "height", f.as_ref().map(|f| f.height), rect.map(|r| r.height())),
+        ]
+        .into_iter()
+        .enumerate()
+        {
+            let y = k as f32 * (FIELD_H + 5.0);
+            ui.painter().text(
+                sub(b, 56.0, y, 18.0, FIELD_H).right_center(),
+                egui::Align2::RIGHT_CENTER,
+                tr(label),
+                egui::FontId::proportional(11.5),
+                t.text,
+            );
+            let nv = place(ui, sub(b, 78.0, y, 66.0, FIELD_H), |ui| NumField::measure(key, len, u).width(66.0).range(0.0, 100_000.0).show(ui));
+            if let Some(v) = nv {
+                let mut p = json!({ key: v });
+                if linked
+                    && let (Some(r), Some(len)) = (rect, len)
+                    && len > 1e-9
+                {
+                    let other = if key == "width" { ("height", r.height()) } else { ("width", r.width()) };
+                    p[other.0] = json!(other.1 * v / len);
+                }
+                set = Some(p);
+            }
+            let names = [tr("Fixed"), tr("Auto")];
+            let cur = if mode == Some(FlexSize::Auto) { 1 } else { 0 };
+            if let Some(i) = place(ui, sub(b, 148.0, y, 62.0, FIELD_H), |ui| widgets::dropdown_list(ui, &names[cur], 62.0, &names, Some(cur))) {
+                set = Some(json!({ key: if i == 1 { "auto" } else { "fixed" } }));
+            }
+        }
+        let clicked = place(ui, sub(b, 214.0, 12.5, 22.0, FIELD_H), |ui| {
+            widgets::icon_toggle_sized(ui, if linked { "link" } else { "link-broken" }, linked, &tr("Constrain proportions"), vec2(22.0, 21.0))
+                .clicked()
+        });
+        if clicked {
+            set_temp_bool(ui, "flex_size_linked", !linked);
+        }
+    });
+    ui.add_space(6.0);
+    // Justification, direction, wrap.
+    let b = block(ui, FIELD_H);
+    ui.add_enabled_ui(enabled, |ui| {
+        let cur = f.as_ref().map(|f| f.justify).unwrap_or_default();
+        let cur = serde_json::to_value(cur).ok().and_then(|v| v.as_str().map(str::to_string)).unwrap_or_default();
+        let icon = FLEX_JUSTIFY.iter().find(|j| j.0 == cur).map(|j| j.1).unwrap_or("flex-start");
+        let resp = place(ui, sub(b, 0.0, 0.0, 58.0, FIELD_H), |ui| {
+            preview_dropdown(ui, 58.0, |p, r| icons::paint(p, r.shrink2(vec2(6.0, 2.0)), icon, egui::Color32::from_gray(60)))
+        });
+        egui::Popup::menu(&resp).show(|ui| {
+            ui.set_min_width(150.0);
+            for (id, icon, label) in FLEX_JUSTIFY {
+                let r = ui.horizontal(|ui| {
+                    let (ir, _) = ui.allocate_exact_size(vec2(22.0, 16.0), Sense::hover());
+                    icons::paint(ui.painter(), ir, icon, t.icon);
+                    ui.selectable_label(id == cur, crate::rtl::widget(ui, tr(label)))
+                });
+                if r.inner.clicked() {
+                    set = Some(json!({"justify": id}));
+                    ui.close();
+                }
+            }
+        });
+        let dir = f.as_ref().map(|f| f.direction).unwrap_or_default();
+        place(ui, sub(b, 78.0, 0.0, 132.0, FIELD_H), |ui| {
+            ui.spacing_mut().item_spacing.x = 2.0;
+            for (d, icon, tip) in [
+                (designcraft_doc::FlexDirection::Row, "flex-right", "Row"),
+                (designcraft_doc::FlexDirection::RowReverse, "flex-left", "Reverse Row"),
+                (designcraft_doc::FlexDirection::Column, "flex-down", "Column"),
+                (designcraft_doc::FlexDirection::ColumnReverse, "flex-up", "Reverse Column"),
+            ] {
+                if widgets::icon_toggle_sized(ui, icon, enabled && dir == d, &tr(tip), vec2(31.0, 21.0)).clicked() {
+                    set = Some(json!({"direction": d}));
+                }
+            }
+        });
+        let wrap = f.as_ref().is_some_and(|f| f.wrap);
+        if place(ui, sub(b, 214.0, 0.0, 22.0, FIELD_H), |ui| {
+            widgets::icon_toggle_sized(ui, "flex-wrap", wrap, &tr("Wrap Content"), vec2(22.0, 21.0)).clicked()
+        }) {
+            set = Some(json!({"wrap": !wrap}));
+        }
+    });
+    // Spacing: padding (linked by default) and the spacing between objects.
+    section(ui, &tr("Spacing"), true);
+    let b = block(ui, 3.0 * FIELD_H + 10.0);
+    ui.add_enabled_ui(enabled, |ui| {
+        let pad = f.as_ref().map(|f| f.padding).unwrap_or_default();
+        let linked = temp_bool(ui, "flex_padding_linked", true);
+        for (k, (icon, tip, x, y)) in [
+            ("margin-top", "Top", 0.0, 0.0),
+            ("margin-inside", "Left", 112.0, 0.0),
+            ("margin-bottom", "Bottom", 0.0, 26.0),
+            ("margin-outside", "Right", 112.0, 26.0),
+        ]
+        .into_iter()
+        .enumerate()
+        {
+            let ir = sub(b, x, y + 2.0, 17.0, 17.0);
+            icons::paint(ui.painter(), ir, icon, t.icon);
+            ui.interact(ir, ui.scope_id().with(("flex_pad", k)), Sense::hover()).on_hover_ui(|ui| {
+                crate::rtl::label(ui, tr(tip));
+            });
+            let value = f.as_ref().map(|_| pad[k]);
+            let nv = place(ui, sub(b, x + 20.0, y, 76.0, FIELD_H), |ui| {
+                NumField::measure(tip, value, u).width(76.0).spinner().range(0.0, 8000.0).show(ui)
+            });
+            if let Some(v) = nv {
+                let p = if linked {
+                    [v; 4]
+                } else {
+                    let mut p = pad;
+                    p[k] = v;
+                    p
+                };
+                set = Some(json!({"padding": p}));
+            }
+        }
+        if place(ui, sub(b, 214.0, 12.5, 22.0, FIELD_H), |ui| {
+            widgets::icon_toggle_sized(ui, if linked { "link" } else { "link-broken" }, linked, &tr("Make all settings the same"), vec2(22.0, 21.0))
+                .clicked()
+        }) {
+            set_temp_bool(ui, "flex_padding_linked", !linked);
+        }
+        // Spacing between objects: a space justification works the main axis' out (shown greyed);
+        // the cross axis' only counts when objects wrap.
+        let (row, distributes, wrap) = f.as_ref().map(|f| (f.direction.is_row(), f.justify.distributes(), f.wrap)).unwrap_or((true, false, false));
+        let main_gap = arranged.as_ref().map(|a| a.main_gap);
+        for (k, (icon, key, tip, x)) in
+            [("gap-h", "gapH", "Horizontal Spacing", 0.0), ("gap-v", "gapV", "Vertical Spacing", 112.0)].into_iter().enumerate()
+        {
+            let main = (k == 0) == row;
+            let live = if main { !distributes } else { wrap };
+            let value = match &f {
+                Some(_) if main && distributes => main_gap,
+                Some(f) => Some(if k == 0 { f.gap_h } else { f.gap_v }),
+                None => None,
+            };
+            let y = 2.0 * FIELD_H + 10.0;
+            let ir = sub(b, x, y + 2.0, 17.0, 17.0);
+            icons::paint(ui.painter(), ir, icon, if live { t.icon } else { t.text_dim });
+            ui.interact(ir, ui.scope_id().with(("flex_gap", k)), Sense::hover()).on_hover_ui(|ui| {
+                crate::rtl::label(ui, tr(tip));
+            });
+            let nv = place(ui, sub(b, x + 20.0, y, 76.0, FIELD_H), |ui| {
+                NumField::measure(key, value, u).width(76.0).spinner().range(0.0, 8000.0).enabled(live).show(ui)
+            });
+            if let Some(v) = nv {
+                set = Some(json!({ key: v }));
+            }
+        }
+    });
+    if let Some(p) = set {
+        let _ = app.run("flex.set", p);
+    }
+}
+
+/// Window › Flex Layout.
+pub fn flex_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    ui.spacing_mut().item_spacing = vec2(6.0, 5.0);
+    flex_section(app, ui);
+}
diff --git a/crates/ui-egui/src/panels/properties/links.rs b/crates/ui-egui/src/panels/properties/links.rs
new file mode 100644
index 000000000..8d13fe06d
--- /dev/null
+++ b/crates/ui-egui/src/panels/properties/links.rs
@@ -0,0 +1,305 @@
+use super::{DesignApp, Sense, Tokens, Value, divider, json, sel_info, units, vec2};
+use crate::app::file_dialogs::Bound;
+
+/// Links: status (missing / modified / embedded), page and effective resolution of every placed
+/// graphic and linked text file; Relink, Go To Link, Update Link, Embed Link for the chosen row.
+pub fn links_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    // Linked stories (Place and Link).
+    let stories = app.session.execute("story.links", &json!({})).ok().and_then(|v| v.as_array().cloned()).unwrap_or_default();
+    if !stories.is_empty() {
+        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Linked Stories")).strong());
+        for l in &stories {
+            let out = l["outOfDate"].as_bool().unwrap_or(false);
+            ui.horizontal(|ui| {
+                crate::rtl::label(
+                    ui,
+                    crate::i18n::tr(&app.ui.language, "Story {story} ← story {parent}")
+                        .replace("{story}", &l["story"].to_string())
+                        .replace("{parent}", &l["parent"].to_string()),
+                );
+                if out {
+                    crate::rtl::label(
+                        ui,
+                        crate::rtl::widget(
+                            ui,
+                            egui::RichText::new(crate::i18n::tr(&app.ui.language, "⚠ out of date")).color(egui::Color32::from_rgb(230, 160, 40)),
+                        ),
+                    );
+                    if ui.small_button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Update"))).clicked() {
+                        let _ = app.run("story.updateLink", json!({"story": l["story"]}));
+                    }
+                }
+            });
+        }
+        ui.separator();
+    }
+    let Some(st) = app.session.active() else { return };
+    let t = Tokens::get(ui.ctx());
+    // The list checks files on disk: refresh it at most twice a second.
+    let key = egui::Id::unique("links_panel");
+    let now = ui.input(|i| i.time);
+    let rev = (st.uid, st.revision);
+    let cached: Option<(f64, (u64, u64), Vec<Value>)> = ui.data(|d| d.get_temp(key));
+    let rows = match cached {
+        Some((at, r, rows)) if r == rev && now - at < 0.5 => rows,
+        _ => {
+            let rows = app.session.execute("links.list", &json!({})).ok().and_then(|v| v.as_array().cloned()).unwrap_or_default();
+            ui.data_mut(|d| d.insert_temp(key, (now, rev, rows.clone())));
+            rows
+        }
+    };
+    if rows.is_empty() {
+        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "No placed graphics.")).color(t.text_dim));
+        return;
+    }
+    let sel_key = egui::Id::unique("links_panel_sel");
+    let mut chosen: Option<u64> = ui.data(|d| d.get_temp(sel_key));
+    // Leave room for Status and Page/PPI instead of widening the grid for long source paths.
+    let name_width = (ui.available_width() - 160.0).max(50.0);
+    egui::Grid::new("links_grid").num_columns(3).striped(true).spacing([10.0, 4.0]).show(ui, |ui| {
+        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Name")).color(t.text_dim).size(11.0));
+        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Status")).color(t.text_dim).size(11.0));
+        crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Page · PPI")).color(t.text_dim).size(11.0));
+        ui.end_row();
+        for r in &rows {
+            // Asset and story ids come from one counter: a row is chosen by either.
+            let aid = r["asset"].as_u64().or_else(|| r["story"].as_u64()).unwrap_or(0);
+            let name = r["name"].as_str().unwrap_or("");
+            let response = ui
+                .vertical(|ui| {
+                    ui.set_width(name_width);
+                    let name = ui.add(egui::Button::selectable(chosen == Some(aid), name).truncate());
+                    match r["path"].as_str().filter(|path| !path.is_empty()) {
+                        Some(path) => name.union(
+                            ui.add(
+                                egui::Label::new(egui::RichText::new(path).color(t.text_dim).size(11.0))
+                                    .truncate()
+                                    .sense(Sense::click())
+                                    .show_tooltip_when_elided(false),
+                            )
+                            .on_hover_text(path),
+                        ),
+                        None => name,
+                    }
+                })
+                .inner;
+            if response.clicked() {
+                chosen = Some(aid);
+            }
+            let (txt, col) = match r["status"].as_str().unwrap_or("") {
+                "missing" => ("\u{26A0} Missing", egui::Color32::from_rgb(0xe5, 0x4b, 0x4b)),
+                "modified" => ("\u{25B2} Modified", egui::Color32::from_rgb(0xe8, 0xb3, 0x2c)),
+                "embedded" => ("Embedded", t.text_dim),
+                "tooLarge" => ("Too large to check", egui::Color32::from_rgb(0xe8, 0xb3, 0x2c)),
+                _ => ("OK", t.text_dim),
+            };
+            let status = crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, txt)).color(col).size(11.0));
+            // Why a link isn't followed (a path on another computer, a device).
+            if let Some(why) = r["refused"].as_str() {
+                status.on_hover_text(why);
+            }
+            let uses = r["uses"].as_array().cloned().unwrap_or_default();
+            let info = match uses.first() {
+                Some(u) => {
+                    let page = u["page"].as_str().unwrap_or("PB");
+                    let ppi = u["ppi"].as_f64().map(|p| format!(" · {p:.0} ppi")).unwrap_or_default();
+                    let more = if uses.len() > 1 { format!(" (+{})", uses.len() - 1) } else { String::new() };
+                    format!("{page}{ppi}{more}")
+                }
+                None => crate::i18n::tr(&app.ui.language, "unused").into(),
+            };
+            // Low effective resolution for print is flagged like the Preflight check.
+            let low = uses.first().and_then(|u| u["ppi"].as_f64()).is_some_and(|p| p < 150.0);
+            crate::rtl::label(
+                ui,
+                egui::RichText::new(info).size(11.0).color(if low { egui::Color32::from_rgb(0xe8, 0xb3, 0x2c) } else { t.text_dim }),
+            );
+            ui.end_row();
+        }
+    });
+    if let Some(c) = chosen {
+        ui.data_mut(|d| d.insert_temp(sel_key, c));
+    }
+    ui.add_space(6.0);
+    if let Some(path) = rows
+        .iter()
+        .find(|r| r["asset"].as_u64().or_else(|| r["story"].as_u64()) == chosen)
+        .and_then(|r| r["path"].as_str())
+        .filter(|path| !path.is_empty())
+    {
+        // A selected link stays distinguishable even if two rows truncate to the same prefix.
+        ui.add(egui::Label::new(egui::RichText::new(path).color(t.text_dim).size(11.0)).wrap());
+        ui.add_space(6.0);
+    }
+    ui.horizontal_wrapped(|ui| {
+        let Some(aid) = chosen else {
+            crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Choose a link.")).color(t.text_dim).size(11.0));
+            return;
+        };
+        // A linked text file is addressed by its story.
+        let is_text = rows.iter().any(|r| r["story"].as_u64() == Some(aid));
+        let target = if is_text { json!({"story": aid}) } else { json!({"asset": aid}) };
+        let with = |k: &str, v: Value| {
+            let mut p = target.clone();
+            p[k] = v;
+            p
+        };
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Relink…"))).clicked() {
+            let target = with("path", Value::Null);
+            let asked = app.ask_open("relink", Bound::Document, move |app, path| {
+                let _ = app.run("links.relink", crate::app::file_dialogs::with_path(&target, "path", path));
+                Ok(Value::Null)
+            });
+            if let Err(e) = asked {
+                app.status_error("Relink", e);
+            }
+        }
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Go To"))).clicked() {
+            let _ = app.run("links.goTo", target.clone());
+        }
+        let edited = rows.iter().any(|r| r["story"].as_u64() == Some(aid) && r["edited"].as_bool() == Some(true));
+        let update = ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Update")));
+        let update = if edited {
+            update.on_hover_ui(|ui| {
+                crate::rtl::label(
+                    ui,
+                    crate::i18n::tr(&app.ui.language, "This story was edited in the layout: you'll be asked before those edits are replaced"),
+                );
+            })
+        } else {
+            update
+        };
+        if update.clicked() {
+            update_links(app, target.clone());
+        }
+        if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, if is_text { "Unlink" } else { "Embed" }))).clicked() {
+            let _ = app.run("links.embed", target.clone());
+        }
+    });
+    ui.horizontal(|ui| {
+        // Choose any file in the folder: missing links are looked up there by name.
+        if ui
+            .button(crate::i18n::tr(&app.ui.language, "Relink to Folder…"))
+            .on_hover_ui(|ui| {
+                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Pick a file in the folder holding the moved graphics"));
+            })
+            .clicked()
+        {
+            let asked = app.ask_open("relink", Bound::Document, |app, path| {
+                let Some(dir) = std::path::Path::new(&path).parent() else { return Ok(Value::Null) };
+                if let Ok(v) = app.run("links.relinkFolder", json!({"dir": dir.to_string_lossy()})) {
+                    app.status(crate::i18n::tr(&app.ui.language, "Relinked {count}").replace("{count}", &v["relinked"].to_string()));
+                }
+                Ok(Value::Null)
+            });
+            if let Err(e) = asked {
+                app.status_error("Relink", e);
+            }
+        }
+    });
+}
+
+/// Update Link from the Links panel or the menu (`{asset}`, `{story}`, or `{}` for all): asks
+/// first when a linked text story edited in the layout would lose those edits, as InDesign's
+/// Links panel does. The `links.update` command itself doesn't ask (as in InDesign scripting).
+pub fn update_links(app: &mut DesignApp, target: Value) {
+    let rows = app.session.execute("links.list", &json!({})).ok().and_then(|v| v.as_array().cloned()).unwrap_or_default();
+    let one = target.get("story").and_then(Value::as_u64);
+    let all = one.is_none() && target.get("asset").is_none();
+    let edited: Vec<&str> = rows
+        .iter()
+        .filter(|r| (all || (one.is_some() && r["story"].as_u64() == one)) && r["edited"] == true && r["status"] == "modified")
+        .filter_map(|r| r["name"].as_str())
+        .collect();
+    if edited.is_empty() {
+        let _ = run_update_links(app, target);
+    } else {
+        let files = edited.join(", ");
+        app.ui.dialog = Some(crate::dialogs::Dialog::new("updateLink", json!({"target": target, "files": files})));
+    }
+}
+
+/// Run `links.update`; its first warning goes to the status bar.
+pub(crate) fn run_update_links(app: &mut DesignApp, target: Value) -> Result<Value, String> {
+    let r = app.run("links.update", target)?;
+    if let Some(w) = r["warnings"].as_array().and_then(|w| w.first()).and_then(Value::as_str) {
+        app.status(w.to_string());
+    }
+    Ok(r)
+}
+
+pub fn info_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let u = units(app);
+    let t = Tokens::get(ui.ctx());
+    match sel_info(app) {
+        Some(i) => {
+            let f = |v: f64| designcraft_geom::format_measure(v, u);
+            crate::rtl::label(ui, format!("X: {}   Y: {}", f(i.page_rect.x0), f(i.page_rect.y0)));
+            crate::rtl::label(ui, format!("W: {}   H: {}", f(i.page_rect.width()), f(i.page_rect.height())));
+            crate::rtl::label(
+                ui,
+                format!("{}: {}   {}: {}", crate::i18n::tr(&app.ui.language, "Fill"), i.fill, crate::i18n::tr(&app.ui.language, "Stroke"), i.stroke),
+            );
+        }
+        None => {
+            if let Some(st) = app.session.active() {
+                crate::rtl::label(
+                    ui,
+                    format!(
+                        "{} · {} · {}",
+                        crate::i18n::count_label(&app.ui.language, "pages", st.doc.page_count()),
+                        crate::i18n::count_label(&app.ui.language, "stories", st.doc.stories.len()),
+                        crate::i18n::count_label(&app.ui.language, "items", st.doc.all_items().len())
+                    ),
+                );
+            }
+        }
+    }
+    crate::rtl::label(
+        ui,
+        egui::RichText::new(format!("{} {:.1} ms", crate::i18n::tr(&app.ui.language, "Render"), app.perf.render_ms)).color(t.text_dim),
+    );
+}
+
+pub fn preflight_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    let issues = designcraft_engine::cmd::preflight::check(&app.session, 150.0);
+    let errors = issues.iter().filter(|i| i.severity == "error").count();
+    ui.horizontal(|ui| {
+        let (r, _) = ui.allocate_exact_size(vec2(10.0, 10.0), egui::Sense::hover());
+        ui.painter().circle_filled(
+            r.center(),
+            4.5,
+            if errors == 0 { egui::Color32::from_rgb(60, 200, 90) } else { egui::Color32::from_rgb(235, 50, 50) },
+        );
+        crate::rtl::label(
+            ui,
+            if issues.is_empty() {
+                crate::i18n::tr(&app.ui.language, "No errors").to_string()
+            } else {
+                format!(
+                    "{}, {}",
+                    crate::i18n::count_label(&app.ui.language, "errors", errors),
+                    crate::i18n::count_label(&app.ui.language, "warnings", issues.len() - errors)
+                )
+            },
+        );
+    });
+    divider(ui);
+    for i in issues {
+        let page = i.page.filter(|_| app.session.active().is_some()).map(|p| app.session.page_label(p));
+        let text = format!("{}  {}", if i.severity == "error" { "⛔" } else { "⚠" }, i.message);
+        let resp = ui.add(egui::Button::new(egui::RichText::new(text).size(11.0)).frame(false));
+        if let Some(pg) = &page {
+            crate::rtl::label(ui, egui::RichText::new(format!("   page {pg}")).size(10.0).color(t.text_dim));
+        }
+        if resp.clicked() {
+            if let Some(id) = i.item {
+                let _ = app.run("selection.set", json!({"ids": [id]}));
+            }
+            if let Some(p) = i.page {
+                crate::canvas::go_to_page(app, p);
+            }
+        }
+    }
+}
diff --git a/crates/ui-egui/src/panels/properties/object.rs b/crates/ui-egui/src/panels/properties/object.rs
new file mode 100644
index 000000000..3819894fe
--- /dev/null
+++ b/crates/ui-egui/src/panels/properties/object.rs
@@ -0,0 +1,604 @@
+use super::{
+    CornerShape, DesignApp, FIELD_H, NumField, Rect, SelInfo, Sense, Stroke, StrokeKind, Tokens, Ui, Unit, Value, block, full_width, icon_toggle,
+    icons, json, link_label, measure, more_options, outline_button, place, pos2, set_temp_bool, show_panel, sub, temp_bool, units, vec2, widgets,
+};
+
+// ---------------------------------------------------------------- Objects
+
+/// The 9-point reference-point proxy; returns a newly picked point (0..8, row-major).
+pub(crate) fn ref_point_proxy(ui: &mut Ui, r: Rect, cur: u8) -> Option<u8> {
+    let t = Tokens::get(ui.ctx());
+    let mut out = None;
+    let pitch = r.width() / 3.0;
+    for i in 0..9u8 {
+        let c = pos2(r.min.x + pitch * (i % 3) as f32 + pitch / 2.0, r.min.y + pitch * (i / 3) as f32 + pitch / 2.0);
+        let sq = Rect::from_center_size(c, vec2(6.0, 6.0));
+        let resp = ui.interact(sq.expand(1.5), ui.scope_id().with(("refpt", i)), Sense::click());
+        if i == cur {
+            ui.painter().rect_filled(sq.expand(0.5), 0.0, egui::Color32::WHITE);
+        } else {
+            ui.painter().rect_stroke(sq, 0.0, Stroke::new(1.0, if resp.hovered() { t.text_strong } else { t.icon }), StrokeKind::Inside);
+        }
+        if resp.clicked() {
+            out = Some(i);
+        }
+    }
+    // Connecting lines between the squares.
+    for k in 0..3 {
+        let y = r.min.y + pitch * k as f32 + pitch / 2.0;
+        let x = r.min.x + pitch * k as f32 + pitch / 2.0;
+        for j in 0..2 {
+            let a = r.min.x + pitch * j as f32 + pitch / 2.0 + 3.0;
+            ui.painter().line_segment([pos2(a, y), pos2(a + pitch - 6.0, y)], Stroke::new(1.0, t.icon));
+            let a = r.min.y + pitch * j as f32 + pitch / 2.0 + 3.0;
+            ui.painter().line_segment([pos2(x, a), pos2(x, a + pitch - 6.0)], Stroke::new(1.0, t.icon));
+        }
+    }
+    out
+}
+
+pub(super) fn transform_section(app: &mut DesignApp, ui: &mut Ui, i: &SelInfo) {
+    let u = units(app);
+    let rp = app.ui.ref_point;
+    let b = block(ui, 2.0 * FIELD_H + 4.0);
+    // Reference-point position of the bounds.
+    let r = i.page_rect;
+    let (fx, fy) = ((rp % 3) as f64 / 2.0, (rp / 3) as f64 / 2.0);
+    let (x, y) = (r.x0 + r.width() * fx, r.y0 + r.height() * fy);
+    if let Some(p) = ref_point_proxy(ui, sub(b, 5.0, 10.0, 26.0, 26.0), rp) {
+        app.ui.ref_point = p;
+    }
+    let constrain = temp_bool(ui, "constrain_wh", false);
+    let mut set = serde_json::Map::new();
+    for (row, (lx, vx, kx, lw, vw, kw)) in
+        [("X:", x, "x", "W:", r.width(), "width"), ("Y:", y, "y", "H:", r.height(), "height")].into_iter().enumerate()
+    {
+        let yy = row as f32 * 25.0;
+        place(ui, sub(b, 40.0, yy, 18.0, FIELD_H), |ui| widgets::caption_w(ui, lx, 18.0));
+        if let Some(v) = place(ui, sub(b, 59.0, yy, 54.0, FIELD_H), |ui| measure(ui, kx, Some(vx), u, 54.0)) {
+            set.insert(kx.into(), json!(v));
+        }
+        place(ui, sub(b, 120.0, yy, 19.0, FIELD_H), |ui| widgets::caption_w(ui, lw, 19.0));
+        if let Some(v) = place(ui, sub(b, 140.0, yy, 54.0, FIELD_H), |ui| measure(ui, kw, Some(vw), u, 54.0)) {
+            set.insert(kw.into(), json!(v));
+            if constrain && vw > 0.0 {
+                let k = v / vw;
+                let (ok, ov) = if kw == "width" { ("height", r.height()) } else { ("width", r.width()) };
+                set.insert(ok.into(), json!(ov * k));
+            }
+        }
+    }
+    let clicked = place(ui, sub(b, 200.0, 12.0, 22.0, FIELD_H), |ui| {
+        widgets::icon_toggle_sized(
+            ui,
+            if constrain { "link" } else { "link-broken" },
+            constrain,
+            "Constrain proportions for width and height",
+            vec2(22.0, 21.0),
+        )
+        .clicked()
+    });
+    if clicked {
+        set_temp_bool(ui, "constrain_wh", !constrain);
+    }
+    if !set.is_empty() {
+        set.insert("ref".into(), json!(rp));
+        let _ = app.run("transform.set", Value::Object(set));
+    }
+    transform_angles(app, ui, rp);
+    if more_options(ui, &app.ui.language).clicked() {
+        show_panel(app, "info");
+    }
+}
+
+/// Properties › Transform for selected ruler guides: X for one vertical guide, Y for one
+/// horizontal guide; with several guides both fields are empty.
+pub(super) fn guide_section(app: &mut DesignApp, ui: &mut Ui) {
+    let guide = crate::panels::guide_field(app);
+    let b = block(ui, 2.0 * FIELD_H + 4.0);
+    for (row, (label, key)) in [("X:", "gx"), ("Y:", "gy")].into_iter().enumerate() {
+        let yy = row as f32 * 25.0;
+        let on = guide.filter(|g| g.row() == row);
+        place(ui, sub(b, 40.0, yy, 18.0, FIELD_H), |ui| widgets::caption_w(ui, label, 18.0));
+        let typed = place(ui, sub(b, 59.0, yy, 135.0, FIELD_H), |ui| {
+            if on.is_none() {
+                ui.disable();
+            }
+            measure(ui, key, on.map(|g| g.value), on.map_or_else(|| units(app), |g| g.unit), 135.0)
+        });
+        if let (Some(v), Some(g)) = (typed, on) {
+            let _ = app.run("guide.move", g.move_to(v));
+        }
+    }
+}
+
+/// Properties › Transform, below X/Y/W/H as in InDesign: rotation and shear angles beside the
+/// X and Y scales (totals, as Transformations are Totals), then rotate a quarter turn and flip.
+fn transform_angles(app: &mut DesignApp, ui: &mut Ui, rp: u8) {
+    let t = Tokens::get(ui.ctx());
+    let lang = app.ui.language.clone();
+    let tv = app.session.execute("transform.info", &json!({})).ok();
+    let tv_get = |k: &str| tv.as_ref().and_then(|v| v[k].as_f64());
+    ui.add_space(4.0);
+    let b = block(ui, 2.0 * FIELD_H + 4.0);
+    let mut set = serde_json::Map::new();
+    let rows = [
+        [("tool-rotate", "Rotation Angle", "rotation", "°", "p_rot"), ("tool-scale", "Scale X Percentage", "scaleX", "%", "p_sx")],
+        [("tool-shear", "Shear X Angle", "shear", "°", "p_shear"), ("tool-scale", "Scale Y Percentage", "scaleY", "%", "p_sy")],
+    ];
+    for (row, cells) in rows.into_iter().enumerate() {
+        let yy = row as f32 * 25.0;
+        for (col, (icon, tip, key, suffix, id)) in cells.into_iter().enumerate() {
+            let x = if col == 0 { 40.0 } else { 120.0 };
+            let ir = sub(b, x, yy + 2.0, 17.0, 17.0);
+            icons::paint(ui.painter(), ir, icon, t.icon);
+            ui.interact(ir, ui.scope_id().with(id), Sense::hover()).on_hover_text(crate::i18n::tr(&lang, tip));
+            if let Some(v) = place(ui, sub(b, x + 19.0, yy, 54.0, FIELD_H), |ui| widgets::number(ui, id, tv_get(key), suffix, 54.0, 1)) {
+                set.insert(key.into(), json!(v));
+            }
+        }
+    }
+    if !set.is_empty() {
+        set.insert("ref".into(), json!(rp));
+        let _ = app.run("transform.set", Value::Object(set));
+    }
+    ui.add_space(2.0);
+    ui.horizontal(|ui| {
+        ui.add_space(36.0);
+        ui.spacing_mut().item_spacing.x = 10.0;
+        for (icon, tip, cmd, params) in [
+            ("rotate-clockwise", "Rotate 90° Clockwise", "transform.rotate", json!({"angle": -90})),
+            ("tool-rotate", "Rotate 90° Counterclockwise", "transform.rotate", json!({"angle": 90})),
+            ("flip-horizontal", "Flip Horizontal", "transform.flip", json!({"axis": "horizontal"})),
+            ("flip-vertical", "Flip Vertical", "transform.flip", json!({"axis": "vertical"})),
+        ] {
+            let label = crate::i18n::tr(&lang, tip);
+            let resp = icon_toggle(ui, icon, false, label);
+            resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, label));
+            if resp.clicked() {
+                let _ = app.run(cmd, params);
+            }
+        }
+    });
+}
+
+/// A stroke-type preview dropdown (light box with the line style).
+pub(crate) fn stroke_type_dropdown(app: &mut DesignApp, ui: &mut Ui, cur: &str, w: f32) {
+    const TYPES: &[(&str, &str)] = &[
+        ("Solid", "solid"),
+        ("Dashed", "dashed"),
+        ("Dotted", "dotted"),
+        ("Thick - Thin", "thickThin"),
+        ("Thin - Thick", "thinThick"),
+        ("Thin - Thin", "thinThin"),
+        ("Thick - Thick", "thickThick"),
+    ];
+    let resp = preview_dropdown(ui, w, |p, r| paint_stroke_type(p, r, cur));
+    egui::Popup::menu(&resp).show(|ui| {
+        ui.set_min_width(140.0);
+        for (label, kind) in TYPES {
+            if ui.selectable_label(*kind == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
+                let ty = if *kind == "dashed" { json!({"kind": "dashed", "pattern": [12.0, 4.0]}) } else { json!({"kind": kind}) };
+                let _ = app.run("object.stroke", json!({"type": ty}));
+                ui.close();
+            }
+        }
+    });
+}
+
+fn paint_stroke_type(p: &egui::Painter, r: Rect, kind: &str) {
+    let c = egui::Color32::BLACK;
+    let (x0, x1, y) = (r.min.x + 5.0, r.max.x - 5.0, r.center().y);
+    match kind {
+        "dashed" => {
+            let mut x = x0;
+            while x < x1 {
+                p.line_segment([pos2(x, y), pos2((x + 6.0).min(x1), y)], Stroke::new(4.0, c));
+                x += 9.0;
+            }
+        }
+        "dotted" => {
+            let mut x = x0 + 2.0;
+            while x < x1 {
+                p.circle_filled(pos2(x, y), 2.0, c);
+                x += 6.0;
+            }
+        }
+        "thickThin" | "thinThick" | "thinThin" | "thickThick" => {
+            let (a, b) = match kind {
+                "thickThin" => (3.0, 1.0),
+                "thinThick" => (1.0, 3.0),
+                "thinThin" => (1.0, 1.0),
+                _ => (2.5, 2.5),
+            };
+            p.line_segment([pos2(x0, y - 3.0), pos2(x1, y - 3.0)], Stroke::new(a, c));
+            p.line_segment([pos2(x0, y + 3.0), pos2(x1, y + 3.0)], Stroke::new(b, c));
+        }
+        _ => {
+            p.line_segment([pos2(x0, y), pos2(x1, y)], Stroke::new(5.0, c));
+        }
+    }
+}
+
+/// A dropdown whose face is a light preview box (stroke type, corner shape).
+pub(super) fn preview_dropdown(ui: &mut Ui, w: f32, paint: impl FnOnce(&egui::Painter, Rect)) -> egui::Response {
+    let t = Tokens::get(ui.ctx());
+    let (r, resp) = ui.allocate_exact_size(vec2(w, FIELD_H), Sense::click());
+    let face = Rect::from_min_max(r.min, pos2(r.max.x - widgets::SEG_W, r.max.y));
+    ui.painter().rect_filled(face, 0.0, egui::Color32::from_gray(0xdf));
+    paint(ui.painter(), face);
+    let seg = Rect::from_min_max(pos2(face.max.x, r.min.y), r.max);
+    ui.painter().rect_filled(seg, 0.0, if resp.hovered() { t.hover } else { t.input });
+    widgets::chevron_down(ui.painter(), seg.center(), t.icon);
+    ui.painter().rect_stroke(r, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
+    resp
+}
+
+fn paint_corner_shape(p: &egui::Painter, r: Rect, shape: CornerShape) {
+    let c = egui::Color32::BLACK;
+    let s = Stroke::new(1.5, c);
+    let (x0, y0, x1, y1) = (r.min.x + 4.0, r.min.y + 4.0, r.max.x - 9.0, r.max.y - 3.0);
+    let k = 8.0;
+    let pts: Vec<egui::Pos2> = match shape {
+        CornerShape::None => vec![pos2(x0, y0), pos2(x1, y0), pos2(x1, y1)],
+        CornerShape::Bevel => vec![pos2(x0, y0), pos2(x1 - k, y0), pos2(x1, y0 + k), pos2(x1, y1)],
+        CornerShape::Inset => vec![pos2(x0, y0), pos2(x1 - k, y0), pos2(x1 - k, y0 + k), pos2(x1, y0 + k), pos2(x1, y1)],
+        CornerShape::Rounded | CornerShape::InverseRounded | CornerShape::Fancy => {
+            let mut v = vec![pos2(x0, y0)];
+            for i in 0..=8 {
+                let a = i as f32 / 8.0 * std::f32::consts::FRAC_PI_2;
+                v.push(if shape == CornerShape::InverseRounded {
+                    pos2(x1 - k * a.cos(), y0 + k * a.sin())
+                } else {
+                    pos2(x1 - k + k * a.sin(), y0 + k - k * a.cos())
+                });
+            }
+            v.push(pos2(x1, y1));
+            v
+        }
+    };
+    p.add(egui::Shape::line(pts, s));
+}
+
+pub(crate) fn corner_type_dropdown(app: &mut DesignApp, ui: &mut Ui, shape: CornerShape, size: f64, width: f32) {
+    let resp = preview_dropdown(ui, width, |p, r| paint_corner_shape(p, r, shape));
+    egui::Popup::menu(&resp).show(|ui| {
+        ui.set_min_width(140.0);
+        for s in CornerShape::ALL {
+            if ui.selectable_label(s == shape, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, s.label()))).clicked() {
+                let _ = app.run("object.cornerOptions", json!({"shape": s, "size": if size > 0.0 { size } else { 12.0 }}));
+                ui.close();
+            }
+        }
+    });
+}
+
+pub(super) fn appearance_section(app: &mut DesignApp, ui: &mut Ui, i: &SelInfo) {
+    let t = Tokens::get(ui.ctx());
+    let Some(doc) = app.session.active().map(|d| d.doc.clone()) else { return };
+    // Fill.
+    let b = block(ui, FIELD_H);
+    let (fc, fg) = widgets::swatch_colors(&doc, &i.fill, 1.0);
+    let chip = sub(b, 4.0, 2.0, 17.0, 17.0);
+    widgets::paint_chip(ui.painter(), chip, fc, fg);
+    ui.painter().rect_stroke(chip, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
+    let resp = ui.interact(chip, ui.scope_id().with("fillchip"), Sense::click()).on_hover_text(format!(
+        "{}: {}",
+        crate::i18n::tr(&app.ui.language, "Fill"),
+        i.fill
+    ));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, "Fill swatch"));
+    swatch_menu(app, &resp, &doc, &i.fill, false, i.is_text && i.count == 1, false);
+    crate::rtl::paint(
+        ui.painter(),
+        b.min + vec2(34.0, FIELD_H / 2.0),
+        egui::Align2::LEFT_CENTER,
+        crate::i18n::tr(&app.ui.language, "Fill"),
+        egui::FontId::proportional(11.5),
+        t.text,
+    );
+    ui.add_space(4.0);
+    // Stroke.
+    let b = block(ui, FIELD_H);
+    let (sc, _) = widgets::swatch_colors(&doc, &i.stroke, 1.0);
+    let chip = sub(b, 4.0, 2.0, 17.0, 17.0);
+    widgets::paint_stroke_chip(ui.painter(), chip, sc, egui::Color32::from_gray(20));
+    ui.painter().rect_stroke(chip, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
+    let resp = ui.interact(chip, ui.scope_id().with("strokechip"), Sense::click()).on_hover_text(format!(
+        "{}: {}",
+        crate::i18n::tr(&app.ui.language, "Stroke"),
+        i.stroke
+    ));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, "Stroke swatch"));
+    swatch_menu(app, &resp, &doc, &i.stroke, true, i.is_text && i.count == 1, false);
+    if place(ui, sub(b, 34.0, 0.0, 56.0, FIELD_H), |ui| link_label(ui, crate::i18n::tr(&app.ui.language, "Stroke"), 56.0)).clicked() {
+        show_panel(app, "stroke");
+    }
+    const WEIGHTS: &[f64] = &[0.0, 0.25, 0.5, 0.75, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 20.0, 30.0, 40.0, 50.0, 100.0];
+    if let Some(v) = place(ui, sub(b, 96.0, 0.0, 69.0, FIELD_H), |ui| {
+        NumField::number("sw", Some(i.stroke_weight), " pt", 3).width(69.0).spinner().presets(WEIGHTS).range(0.0, 800.0).show(ui)
+    }) {
+        let _ = app.run("object.stroke", json!({"weight": v}));
+    }
+    let kind = i.stroke_kind.clone();
+    place(ui, sub(b, 171.0, 0.0, 54.0, FIELD_H), |ui| stroke_type_dropdown(app, ui, &kind, 54.0));
+    ui.add_space(4.0);
+    // Corner.
+    let b = block(ui, FIELD_H);
+    icons::paint(ui.painter(), sub(b, 3.0, 1.0, 19.0, 19.0), "corner", t.accent);
+    if place(ui, sub(b, 34.0, 0.0, 56.0, FIELD_H), |ui| link_label(ui, crate::i18n::tr(&app.ui.language, "Corner"), 56.0)).clicked() {
+        app.ui.dialog = Some(crate::dialogs::Dialog::new("frameSize", json!({})));
+    }
+    let (shape, size) = i.corner;
+    if let Some(v) = place(ui, sub(b, 96.0, 0.0, 69.0, FIELD_H), |ui| {
+        NumField::measure("corner", Some(size), Unit::Points).width(69.0).spinner().range(0.0, 1000.0).show(ui)
+    }) {
+        let sh = if shape == CornerShape::None { CornerShape::Rounded } else { shape };
+        let _ = app.run("object.cornerOptions", json!({"shape": sh, "size": v}));
+    }
+    place(ui, sub(b, 171.0, 0.0, 54.0, FIELD_H), |ui| {
+        corner_type_dropdown(app, ui, shape, size, 54.0);
+    });
+    ui.add_space(4.0);
+    // Opacity.
+    let b = block(ui, FIELD_H);
+    icons::paint(ui.painter(), sub(b, 3.0, 1.0, 19.0, 19.0), "opacity", t.icon);
+    if place(ui, sub(b, 34.0, 0.0, 56.0, FIELD_H), |ui| link_label(ui, crate::i18n::tr(&app.ui.language, "Opacity"), 56.0)).clicked() {
+        show_panel(app, "effects");
+    }
+    if let Some(v) = place(ui, sub(b, 96.0, 0.0, 51.0, FIELD_H), |ui| {
+        NumField::number("opacity", Some((i.opacity * 100.0).round()), "%", 0).width(51.0).range(0.0, 100.0).show(ui)
+    }) {
+        let _ = app.run("object.opacity", json!({"opacity": v / 100.0}));
+    }
+    let more = sub(b, 147.0, 0.0, 18.0, FIELD_H);
+    let mresp = ui.interact(more, ui.scope_id().with("opmore"), Sense::click());
+    ui.painter().rect(more, 0.0, if mresp.hovered() { t.hover } else { t.input }, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
+    icons::paint(ui.painter(), more.shrink(4.0), "chevron-right", t.icon);
+    if mresp.clicked() {
+        show_panel(app, "effects");
+    }
+    ui.add_space(6.0);
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 10.0;
+        if icon_toggle(ui, "frame-dashed", false, crate::i18n::tr(&app.ui.language, "Frame Fitting")).clicked() {
+            show_panel(app, "textWrap");
+        }
+        if icon_toggle(ui, "fx", i.shadow, crate::i18n::tr(&app.ui.language, "Effects: Drop Shadow")).clicked() {
+            let _ = app.run("object.dropShadow", json!({"on": !i.shadow}));
+        }
+    });
+}
+
+/// The Fill (or Stroke) popup of Properties › Appearance, as InDesign's: Apply To (a text frame's
+/// frame or its text), the tint, then the swatches. `cur` is the frame's swatch. With `text_only`
+/// (text selected) it colours the selected text.
+pub(super) fn swatch_menu(
+    app: &mut DesignApp,
+    resp: &egui::Response,
+    doc: &designcraft_doc::Document,
+    cur: &str,
+    stroke: bool,
+    text_frame: bool,
+    text_only: bool,
+) {
+    let lang = app.ui.language.clone();
+    let tr = |s: &'static str| crate::i18n::tr(&lang, s);
+    let to_text_id = egui::Id::unique(("swatch_apply_to_text", stroke));
+    let to_text = text_only || text_frame && resp.ctx.data(|d| d.get_temp::<bool>(to_text_id)).unwrap_or(false);
+    // What the popup shows and changes: the frame's fill or stroke, or its text's.
+    let (key, tint_key) = if stroke { ("stroke", "strokeTint") } else { ("fill", "fillTint") };
+    let (cur, tint) = if to_text {
+        let chars = crate::panels::text_attrs(app).map(|a| a["chars"].clone()).unwrap_or_default();
+        (chars[key].as_str().unwrap_or("").to_string(), chars[tint_key].as_f64().unwrap_or(1.0))
+    } else {
+        (cur.to_string(), f64::from(crate::panels::sel_tint(app, stroke)))
+    };
+    let mut picked = None;
+    let mut new_tint = None;
+    let mut switch = None;
+    egui::Popup::menu(resp).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
+        if text_frame {
+            ui.horizontal(|ui| {
+                crate::rtl::label(ui, tr("Apply To:"));
+                for (label, text) in [("Frame", false), ("Text", true)] {
+                    if ui.selectable_label(to_text == text, crate::rtl::widget(ui, tr(label))).clicked() {
+                        switch = Some(text);
+                    }
+                }
+            });
+        }
+        ui.horizontal(|ui| {
+            crate::rtl::label(ui, tr("Tint:"));
+            if let Some(v) = NumField::number(if stroke { "stroke_tint" } else { "fill_tint" }, Some((tint * 100.0).round()), "%", 0)
+                .width(60.0)
+                .range(0.0, 100.0)
+                .show(ui)
+            {
+                new_tint = Some(v / 100.0);
+            }
+        });
+        ui.separator();
+        picked = crate::panels::swatch_list(ui, doc, &cur);
+    });
+    if let Some(t) = switch {
+        resp.ctx.data_mut(|d| d.insert_temp(to_text_id, t));
+    }
+    let cmd = |app: &mut DesignApp, attrs: Value| {
+        if to_text {
+            let _ = app.run("type.char", json!({ "attrs": attrs }));
+        } else {
+            let mut p = attrs.as_object().cloned().unwrap_or_default();
+            // object.fill / object.stroke name the swatch `swatch` and the tint `tint`.
+            if let Some(v) = p.remove(key) {
+                p.insert("swatch".into(), v);
+            }
+            if let Some(v) = p.remove(tint_key) {
+                p.insert("tint".into(), v);
+            }
+            let _ = app.run(if stroke { "object.stroke" } else { "object.fill" }, Value::Object(p));
+        }
+    };
+    if let Some(n) = picked {
+        cmd(app, json!({ key: n }));
+    } else if let Some(t) = new_tint {
+        cmd(app, json!({ tint_key: t }));
+    }
+}
+
+pub(super) fn align_row(app: &mut DesignApp, ui: &mut Ui) {
+    let t = Tokens::get(ui.ctx());
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 8.0;
+        // A key object switches Align To to Key Object; choosing another target drops the key.
+        let key = app.session.active().and_then(|st| st.selection.key.filter(|_| st.selection.items.len() > 1));
+        let to = if key.is_some() { "keyObject".to_string() } else { app.ui.align_to.clone() };
+        let to_label = match to.as_str() {
+            "selection" => "Selection",
+            "keyObject" => "Key Object",
+            "margins" => "Margins",
+            "page" => "Page",
+            "spread" => "Spread",
+            other => other,
+        };
+        let tip = format!("{}: {}", crate::i18n::tr(&app.ui.language, "Align To"), crate::i18n::tr(&app.ui.language, to_label));
+        let resp = icon_toggle(ui, "align-to", false, &tip);
+        egui::Popup::menu(&resp).show(|ui| {
+            for (label, id) in [
+                ("Align to Selection", "selection"),
+                ("Align to Key Object", "keyObject"),
+                ("Align to Margins", "margins"),
+                ("Align to Page", "page"),
+                ("Align to Spread", "spread"),
+            ] {
+                if ui.selectable_label(to == id, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
+                    if let Some(k) = key.filter(|_| id != "keyObject") {
+                        let _ = app.run("selection.key", json!({"id": k.0}));
+                    }
+                    app.ui.align_to = id.into();
+                    ui.close();
+                }
+            }
+        });
+        let (r, _) = ui.allocate_exact_size(vec2(1.0, FIELD_H), Sense::hover());
+        ui.painter().line_segment([r.center_top(), r.center_bottom()], Stroke::new(1.0, t.section_divider.gamma_multiply(1.6)));
+        for (edge, icon, tip) in [
+            ("left", "objalign-left", "Align left edges"),
+            ("hcenter", "objalign-hcenter", "Align horizontal centers"),
+            ("right", "objalign-right", "Align right edges"),
+            ("top", "objalign-top", "Align top edges"),
+            ("vcenter", "objalign-vcenter", "Align vertical centers"),
+            ("bottom", "objalign-bottom", "Align bottom edges"),
+        ] {
+            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
+                let _ = app.run("object.align", json!({"edge": edge, "to": to}));
+            }
+        }
+    });
+}
+
+pub(super) fn wrap_section(app: &mut DesignApp, ui: &mut Ui, i: &SelInfo) {
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 7.0;
+        for (icon, mode, tip) in [
+            ("wrap-none", "none", "No Text Wrap"),
+            ("wrap-bbox", "boundingBox", "Wrap Around Bounding Box"),
+            ("wrap-contour", "contour", "Wrap Around Object Shape"),
+            ("wrap-jump", "jumpObject", "Jump Object"),
+            ("wrap-next", "jumpToNextColumn", "Jump to Next Column"),
+        ] {
+            if icon_toggle(ui, icon, i.wrap == mode, crate::i18n::tr(&app.ui.language, tip)).clicked() {
+                let _ = app.run("object.textWrap", json!({"mode": mode}));
+            }
+        }
+        ui.add_space(2.0);
+        let mut inv = i.wrap_invert;
+        let enabled = i.wrap != "none";
+        let r = ui.add_enabled_ui(enabled, |ui| widgets::checkbox(ui, &mut inv, crate::i18n::tr(&app.ui.language, "Invert"))).inner;
+        if r.changed() {
+            let _ = app.run("object.textWrap", json!({"mode": i.wrap, "invert": inv}));
+        }
+    });
+    if more_options(ui, &app.ui.language).clicked() {
+        show_panel(app, "textWrap");
+    }
+}
+
+fn arrange_menu(app: &mut DesignApp, resp: &egui::Response) {
+    egui::Popup::menu(resp).show(|ui| {
+        for (label, cmd) in [
+            ("Bring to Front", "object.bringToFront"),
+            ("Bring Forward", "object.bringForward"),
+            ("Send Backward", "object.sendBackward"),
+            ("Send to Back", "object.sendToBack"),
+        ] {
+            if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
+                let _ = app.run(cmd, json!({}));
+                ui.close();
+            }
+        }
+    });
+}
+
+fn convert_shape_menu(app: &mut DesignApp, resp: &egui::Response) {
+    egui::Popup::menu(resp).show(|ui| {
+        for (label, to) in [
+            ("Rectangle", "rectangle"),
+            ("Rounded Rectangle", "roundedRectangle"),
+            ("Beveled Rectangle", "beveledRectangle"),
+            ("Inverse Rounded Rectangle", "inverseRoundedRectangle"),
+            ("Ellipse", "ellipse"),
+            ("Triangle", "triangle"),
+            ("Polygon", "polygon"),
+            ("Line", "line"),
+            ("Orthogonal Line", "orthogonalLine"),
+        ] {
+            if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
+                if let Err(e) = app.run("object.convertShape", json!({"to": to})) {
+                    app.status_error("Convert Shape", e);
+                }
+                ui.close();
+            }
+        }
+    });
+}
+
+pub(super) fn quick_actions_object(app: &mut DesignApp, ui: &mut Ui, i: &SelInfo) {
+    let fw = full_width(ui);
+    let hw = (fw - 10.0) / 2.0;
+    if i.is_text {
+        ui.horizontal(|ui| {
+            ui.spacing_mut().item_spacing.x = 10.0;
+            let r = outline_button(ui, crate::i18n::tr(&app.ui.language, "Convert Shape"), hw);
+            convert_shape_menu(app, &r);
+            let r = outline_button(ui, crate::i18n::tr(&app.ui.language, "Arrange"), hw);
+            arrange_menu(app, &r);
+        });
+        ui.add_space(4.0);
+        if outline_button(ui, crate::i18n::tr(&app.ui.language, "Fill with Placeholder Text"), fw).clicked() {
+            let _ = app.run("type.fillWithPlaceholder", json!({}));
+        }
+        ui.add_space(4.0);
+        if outline_button(ui, crate::i18n::tr(&app.ui.language, "Edit in Story Editor"), fw).clicked() {
+            let _ = app.run("app.storyEditor", json!({}));
+        }
+        return;
+    }
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 10.0;
+        let r = outline_button(ui, crate::i18n::tr(&app.ui.language, "Arrange"), hw);
+        arrange_menu(app, &r);
+        if outline_button(ui, crate::i18n::tr(&app.ui.language, if i.count > 1 { "Group" } else { "Lock" }), hw).clicked() {
+            let _ = app.run(if i.count > 1 { "object.group" } else { "object.lock" }, json!({}));
+        }
+    });
+    ui.add_space(4.0);
+    if i.kind == "<group>" {
+        if outline_button(ui, crate::i18n::tr(&app.ui.language, "Ungroup"), fw).clicked() {
+            let _ = app.run("object.ungroup", json!({}));
+        }
+    } else {
+        let r = outline_button(ui, crate::i18n::tr(&app.ui.language, "Convert Shape"), fw);
+        convert_shape_menu(app, &r);
+    }
+}
diff --git a/crates/ui-egui/src/panels/properties/object_panels.rs b/crates/ui-egui/src/panels/properties/object_panels.rs
new file mode 100644
index 000000000..9d02bec3f
--- /dev/null
+++ b/crates/ui-egui/src/panels/properties/object_panels.rs
@@ -0,0 +1,728 @@
+use super::{
+    Arrowhead, Cap, DesignApp, Join, Sense, Stroke, StrokeAlign, StrokeType, Tokens, Ui, Value, caption, divider, icon_toggle, icons, json, measure,
+    number, pos2, sel_info, text_attrs, units, vec2, widgets,
+};
+
+/// Stroke panel: weight, cap, miter limit, join, alignment, type, arrowheads, gap colour.
+pub fn stroke_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    if crate::panels::cell_stroke::in_cells(app) {
+        crate::panels::cell_stroke::panel(app, ui);
+        return;
+    }
+    if crate::panels::colors_affect_text(app)
+        && let Some(a) = text_attrs(app)
+    {
+        text_stroke_panel(app, ui, &a["chars"]);
+        return;
+    }
+    let Some(i) = sel_info(app) else {
+        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Select an object."));
+        return;
+    };
+    let Some(st) = app.session.active().and_then(|d| d.selection.items.first().and_then(|id| d.doc.item(*id)).map(|it| it.stroke.clone())) else {
+        return;
+    };
+    let t = Tokens::get(ui.ctx());
+    egui::Grid::new("stroke_panel").num_columns(2).spacing(vec2(8.0, 6.0)).show(ui, |ui| {
+        caption(ui, crate::i18n::tr(&app.ui.language, "Weight:"));
+        if let Some(v) = number(ui, "sw", Some(i.stroke_weight), " pt", 60.0, 3) {
+            let _ = app.run("object.stroke", json!({"weight": v}));
+        }
+        ui.end_row();
+        caption(ui, crate::i18n::tr(&app.ui.language, "Cap:"));
+        ui.horizontal(|ui| {
+            for (label, v, cur) in [("Butt", "butt", Cap::Butt), ("Round", "round", Cap::Round), ("Projecting", "projecting", Cap::Projecting)] {
+                if ui.selectable_label(st.cap == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
+                    let _ = app.run("object.stroke", json!({"cap": v}));
+                }
+            }
+        });
+        ui.end_row();
+        caption(ui, crate::i18n::tr(&app.ui.language, "Join:"));
+        ui.horizontal(|ui| {
+            for (label, v, cur) in [("Miter", "miter", Join::Miter), ("Round", "round", Join::Round), ("Bevel", "bevel", Join::Bevel)] {
+                if ui.selectable_label(st.join == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
+                    let _ = app.run("object.stroke", json!({"join": v}));
+                }
+            }
+        });
+        ui.end_row();
+        caption(ui, crate::i18n::tr(&app.ui.language, "Miter Limit:"));
+        if let Some(v) = number(ui, "smiter", Some(st.miter_limit), " x", 60.0, 0) {
+            let _ = app.run("object.stroke", json!({"miterLimit": v}));
+        }
+        ui.end_row();
+        caption(ui, crate::i18n::tr(&app.ui.language, "Align Stroke:"));
+        ui.horizontal(|ui| {
+            for (label, a, cur) in
+                [("Center", "center", StrokeAlign::Center), ("Inside", "inside", StrokeAlign::Inside), ("Outside", "outside", StrokeAlign::Outside)]
+            {
+                if ui.selectable_label(st.align == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
+                    let _ = app.run("object.stroke", json!({"align": a}));
+                }
+            }
+        });
+        ui.end_row();
+        caption(ui, crate::i18n::tr(&app.ui.language, "Type:"));
+        let custom: Vec<String> = app.session.active().map(|d| d.doc.stroke_styles.iter().map(|x| x.name.clone()).collect()).unwrap_or_default();
+        let shown = match &st.kind {
+            StrokeType::Style { name } => name.clone(),
+            k => k.label().to_string(),
+        };
+        let combo = craft_ui::ComboBox::from_id_salt("stype")
+            .selected_text(crate::rtl::widget(
+                ui,
+                if matches!(st.kind, StrokeType::Style { .. }) { &shown } else { crate::i18n::tr(&app.ui.language, &shown) },
+            ))
+            .width(140.0)
+            .show_ui(ui, |ui| {
+                let built_in = [
+                    "solid",
+                    "dashed",
+                    "dotted",
+                    "thickThin",
+                    "thinThick",
+                    "thinThin",
+                    "thickThick",
+                    "thinThickThin",
+                    "thickThinThick",
+                    "wavy",
+                    "hashed",
+                ];
+                for k in built_in {
+                    let ty = if k == "dashed" { json!({"kind": k, "pattern": [12.0, 4.0]}) } else { json!({"kind": k}) };
+                    let label = serde_json::from_value::<StrokeType>(ty.clone()).map(|k| k.label()).unwrap_or("");
+                    if ui.selectable_label(shown == label, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
+                        let _ = app.run("object.stroke", json!({"type": ty}));
+                    }
+                }
+                if !custom.is_empty() {
+                    ui.separator();
+                }
+                for n in &custom {
+                    if ui.selectable_label(shown == *n, n).clicked() {
+                        let _ = app.run("object.stroke", json!({"type": {"kind": "style", "name": n}}));
+                    }
+                }
+            });
+        let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Type"));
+        ui.end_row();
+        for (key, label, cur, flip) in [("start", "Start/End:", st.start, true), ("end", "", st.end, false)] {
+            caption(ui, crate::i18n::tr(&app.ui.language, label));
+            let combo = craft_ui::ComboBox::from_id_salt(key)
+                .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, cur.label())))
+                .width(140.0)
+                .show_ui(ui, |ui| {
+                    for a in Arrowhead::ALL {
+                        ui.horizontal(|ui| {
+                            arrow_preview(ui, a, flip, t.text_strong);
+                            if ui.selectable_label(a == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, a.label()))).clicked() {
+                                let _ = app.run("object.stroke", json!({key: a}));
+                            }
+                        });
+                    }
+                });
+            // The second arrowhead reuses the shared caption, so it needs its own semantic name.
+            let name = crate::i18n::tr(&app.ui.language, if flip { "Start/End" } else { "End" }).to_owned();
+            let _ = crate::widgets::name_combo(combo, name);
+            ui.end_row();
+        }
+        caption(ui, crate::i18n::tr(&app.ui.language, "Gap Color:"));
+        crate::panels::swatch_picker(app, ui, "sgap", Some(st.gap_swatch.clone()), |app, n| {
+            let _ = app.run("object.stroke", json!({"gapSwatch": n}));
+        });
+        ui.end_row();
+        caption(ui, crate::i18n::tr(&app.ui.language, "Color:"));
+        crate::panels::swatch_picker(app, ui, "spick", Some(i.stroke.clone()), |app, n| {
+            let _ = app.run("object.stroke", json!({"swatch": n}));
+        });
+        ui.end_row();
+    });
+}
+
+/// Stroke panel while text is selected: the text's outline colour, weight and whether it sits behind the fill.
+fn text_stroke_panel(app: &mut DesignApp, ui: &mut egui::Ui, c: &Value) {
+    let swatch = c["stroke"].as_str().unwrap_or(designcraft_color::swatch::NONE).to_string();
+    egui::Grid::new("text_stroke_panel").num_columns(2).spacing(vec2(8.0, 6.0)).show(ui, |ui| {
+        caption(ui, crate::i18n::tr(&app.ui.language, "Weight:"));
+        if let Some(v) = number(ui, "tsw_panel", c["strokeWeight"].as_f64(), " pt", 60.0, 3) {
+            let _ = app.run("type.char", json!({"attrs": {"strokeWeight": v}}));
+        }
+        ui.end_row();
+        caption(ui, crate::i18n::tr(&app.ui.language, "Color:"));
+        crate::panels::swatch_picker(app, ui, "tspick", Some(swatch), |app, n| {
+            let _ = crate::panels::apply_swatch(app, true, &n, None);
+        });
+        ui.end_row();
+    });
+    let mut behind = c["strokeBehindFill"].as_bool().unwrap_or(false);
+    if ui.checkbox(&mut behind, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Stroke Behind Fill"))).changed() {
+        let _ = app.run("type.char", json!({"attrs": {"strokeBehindFill": behind}}));
+    }
+}
+
+/// A short line ending in arrowhead `a` (pointing left for Start, right for End).
+fn arrow_preview(ui: &mut egui::Ui, a: Arrowhead, start: bool, color: egui::Color32) {
+    use designcraft_geom::kurbo;
+    let (r, _) = ui.allocate_exact_size(vec2(56.0, 14.0), Sense::hover());
+    let mut line = kurbo::BezPath::new();
+    let (y, x0, x1) = (r.center().y as f64, r.left() as f64 + 6.0, r.right() as f64 - 6.0);
+    if start {
+        line.move_to((x1, y));
+        line.line_to((x0, y));
+    } else {
+        line.move_to((x0, y));
+        line.line_to((x1, y));
+    }
+    let st = designcraft_doc::Stroke { weight: 1.5, end: a, ..Default::default() };
+    let (line, heads) = designcraft_doc::arrow::apply(&line, &st, false).unwrap_or((line, vec![]));
+    let pts = |p: &kurbo::BezPath| {
+        let mut v = Vec::new();
+        kurbo::flatten(p.iter(), 0.1, |el| match el {
+            kurbo::PathEl::MoveTo(p) | kurbo::PathEl::LineTo(p) => v.push(pos2(p.x as f32, p.y as f32)),
+            _ => {}
+        });
+        v
+    };
+    let painter = ui.painter();
+    painter.add(egui::Shape::line(pts(&line), Stroke::new(1.5, color)));
+    for h in heads {
+        let p = pts(&h.path);
+        match h.outline {
+            Some(w) if matches!(h.path.elements().last(), Some(kurbo::PathEl::ClosePath)) => {
+                painter.add(egui::Shape::closed_line(p, Stroke::new(w as f32, color)));
+            }
+            Some(w) => {
+                painter.add(egui::Shape::line(p, Stroke::new(w as f32, color)));
+            }
+            None => {
+                painter.add(egui::Shape::convex_polygon(p, color, Stroke::NONE));
+            }
+        }
+    }
+}
+
+pub fn wrap_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let info = sel_info(app);
+    let mode = info.as_ref().map_or("none", |i| i.wrap);
+    // As InDesign's Text Wrap panel: the five wrap buttons and Invert, then the four offsets
+    // (top and bottom, left and right) with the link button that makes them all the same.
+    ui.horizontal(|ui| {
+        for (icon, m, tip) in [
+            ("wrap-none", "none", "No Text Wrap"),
+            ("wrap-bbox", "boundingBox", "Wrap Around Bounding Box"),
+            ("wrap-contour", "contour", "Wrap Around Object Shape"),
+            ("wrap-jump", "jumpObject", "Jump Object"),
+            ("wrap-next", "jumpToNextColumn", "Jump to Next Column"),
+        ] {
+            if icons::button(ui, icon, 26.0, mode == m, crate::i18n::tr(&app.ui.language, tip)).clicked() {
+                let _ = app.run("object.textWrap", json!({"mode": m}));
+            }
+        }
+        ui.add_space(6.0);
+        let mut inv = info.as_ref().is_some_and(|i| i.wrap_invert);
+        let r = ui.add_enabled_ui(mode != "none", |ui| widgets::checkbox(ui, &mut inv, crate::i18n::tr(&app.ui.language, "Invert"))).inner;
+        if r.changed() {
+            let _ = app.run("object.textWrap", json!({"mode": mode, "invert": inv}));
+        }
+    });
+    let u = units(app);
+    let offsets = info.as_ref().map(|i| i.wrap_offsets);
+    // Linked while the offsets are all the same, until the link is clicked.
+    let linked_id = egui::Id::unique("wrap_offsets_linked");
+    let linked = ui.data(|d| d.get_temp::<bool>(linked_id)).unwrap_or_else(|| offsets.is_none_or(|o| o.iter().all(|v| (v - o[0]).abs() < 1e-9)));
+    let mut set: Option<[f64; 4]> = None;
+    ui.add_enabled_ui(mode != "none" && info.is_some(), |ui| {
+        // Two rows of fixed-width cells: Top | Left, then Bottom | Right; the link between them.
+        let cell = |ui: &mut Ui, w: f32, label: &str| {
+            let x0 = ui.cursor().min.x;
+            caption(ui, crate::i18n::tr(&app.ui.language, label));
+            ui.add_space((w - (ui.cursor().min.x - x0)).max(0.0));
+        };
+        // The second column starts where the first row's does (after the link button).
+        let mut col2_x: Option<f32> = None;
+        for (r, row) in [[(0, "Top"), (1, "Left")], [(2, "Bottom"), (3, "Right")]].into_iter().enumerate() {
+            ui.horizontal(|ui| {
+                for (k, (side, label)) in row.into_iter().enumerate() {
+                    if k == 1 {
+                        match col2_x {
+                            Some(x) => ui.add_space((x - ui.cursor().min.x).max(0.0)),
+                            None => col2_x = Some(ui.cursor().min.x),
+                        }
+                    }
+                    cell(ui, if k == 0 { 56.0 } else { 40.0 }, label);
+                    if let Some(v) = measure(ui, &format!("wo{side}"), offsets.map(|o| o[side]), u, 60.0) {
+                        let mut o = offsets.unwrap_or([0.0; 4]);
+                        if linked {
+                            o = [v; 4];
+                        } else {
+                            o[side] = v;
+                        }
+                        set = Some(o);
+                    }
+                    if k == 0 && r == 0 {
+                        let tip = crate::i18n::tr(&app.ui.language, "Make all settings the same");
+                        let link = widgets::icon_toggle_sized(ui, if linked { "link" } else { "link-broken" }, linked, tip, vec2(22.0, 21.0));
+                        if link.clicked() {
+                            ui.data_mut(|d| d.insert_temp(linked_id, !linked));
+                        }
+                    }
+                }
+            });
+        }
+    });
+    if let Some(o) = set {
+        let _ = app.run("object.textWrap", json!({"mode": mode, "offset": o}));
+    }
+    let Some(i) = info.as_ref().filter(|i| i.wrap == "boundingBox" || i.wrap == "contour") else { return };
+    let sides = [
+        ("bothSides", "Both Right & Left Sides"),
+        ("rightSide", "Right Side"),
+        ("leftSide", "Left Side"),
+        ("towardsSpine", "Side Towards Spine"),
+        ("awayFromSpine", "Side Away from Spine"),
+        ("largestArea", "Largest Area"),
+    ];
+    wrap_combo(app, ui, "wrap_side", "Wrap To", &sides, &[], &i.wrap_side, "side");
+    if i.wrap == "contour" && i.is_graphic {
+        // Detected edges, alpha channels and image paths aren't offered: composition doesn't read
+        // the image. An imported one shows by name and wraps around the frame.
+        let types = [("boundingBox", "Bounding Box"), ("graphicFrame", "Graphic Frame"), ("sameAsClipping", "Same as Clipping")];
+        let shown_only = [("detectEdges", "Detect Edges"), ("alphaChannel", "Alpha Channel"), ("photoshopPath", "Photoshop Path")];
+        wrap_combo(app, ui, "wrap_contour", "Contour Type", &types, &shown_only, &i.wrap_contour, "contour");
+    }
+}
+
+/// A Text Wrap panel choice: `opts` are offered, `shown_only` only name the current value.
+#[allow(clippy::too_many_arguments)]
+fn wrap_combo(
+    app: &mut DesignApp,
+    ui: &mut egui::Ui,
+    salt: &str,
+    caption_text: &str,
+    opts: &[(&str, &str)],
+    shown_only: &[(&str, &str)],
+    cur: &str,
+    key: &str,
+) {
+    ui.horizontal(|ui| {
+        caption(ui, crate::i18n::tr(&app.ui.language, caption_text));
+        let shown = opts.iter().chain(shown_only).find(|o| o.0 == cur).map_or(cur, |o| o.1).to_string();
+        let combo = craft_ui::ComboBox::from_id_salt(salt)
+            .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, &shown)))
+            .width(170.0)
+            .show_ui(ui, |ui| {
+                for (k, l) in opts {
+                    if ui.selectable_label(*k == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, l))).clicked() {
+                        let _ = app.run("object.textWrap", json!({ key: k }));
+                    }
+                }
+            });
+        let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, caption_text));
+    });
+}
+
+/// The Pathfinder operations, in the order of InDesign's Pathfinder buttons.
+const PATHFINDER: [(&str, &str, &str); 5] = [
+    ("pf-add", "add", "Add"),
+    ("pf-subtract", "subtract", "Subtract"),
+    ("pf-intersect", "intersect", "Intersect"),
+    ("pf-exclude", "exclude", "Exclude Overlap"),
+    ("pf-minus-back", "minusBack", "Minus Back"),
+];
+
+/// Properties › Pathfinder (several objects selected): combine them into one shape.
+pub(super) fn pathfinder_row(app: &mut DesignApp, ui: &mut Ui) {
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 8.0;
+        for (icon, op, tip) in PATHFINDER {
+            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
+                let _ = app.run("object.pathfinder", json!({"op": op}));
+            }
+        }
+    });
+}
+
+/// Pathfinder panel › Paths: (icon, command, params, tooltip).
+const PATHS: [(&str, &str, &str, &str); 4] = [
+    ("path-join", "path.join", "{}", "Join Path"),
+    ("path-open", "object.convertShape", r#"{"to": "openPath"}"#, "Open Path"),
+    ("path-close", "object.convertShape", r#"{"to": "closedPath"}"#, "Close Path"),
+    ("path-reverse", "path.reverse", "{}", "Reverse Path"),
+];
+
+/// Pathfinder panel › Convert Shape: (icon, shape, tooltip).
+const CONVERT_SHAPE: [(&str, &str, &str); 9] = [
+    ("shape-rect", "rectangle", "Rectangle"),
+    ("shape-rounded", "roundedRectangle", "Rounded Rectangle"),
+    ("shape-beveled", "beveledRectangle", "Beveled Rectangle"),
+    ("shape-inverse", "inverseRoundedRectangle", "Inverse Rounded Rectangle"),
+    ("shape-ellipse", "ellipse", "Ellipse"),
+    ("shape-triangle", "triangle", "Triangle"),
+    ("shape-polygon", "polygon", "Polygon"),
+    ("shape-line", "line", "Line"),
+    ("shape-orthogonal", "orthogonalLine", "Orthogonal Line"),
+];
+
+/// Pathfinder panel › Convert Point: (icon, kind, tooltip).
+const CONVERT_POINT: [(&str, &str, &str); 4] = [
+    ("point-plain", "plain", "Plain"),
+    ("point-corner", "corner", "Corner"),
+    ("point-smooth", "smooth", "Smooth"),
+    ("point-symmetrical", "symmetrical", "Symmetrical"),
+];
+
+/// Pathfinder panel, as InDesign's: Paths, Pathfinder, Convert Shape and Convert Point, each a row of
+/// icon buttons acting on the selection.
+pub fn pathfinder_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let section = |ui: &mut egui::Ui, app: &DesignApp, title: &str| {
+        ui.add_space(4.0);
+        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, title));
+        ui.add_space(2.0);
+    };
+    let row = |ui: &mut egui::Ui, add: &mut dyn FnMut(&mut egui::Ui)| {
+        ui.horizontal_wrapped(|ui| {
+            ui.spacing_mut().item_spacing = egui::vec2(12.0, 8.0);
+            add(ui);
+        });
+    };
+    section(ui, app, "Paths:");
+    row(ui, &mut |ui| {
+        for (icon, cmd, params, tip) in PATHS {
+            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
+                let _ = app.run(cmd, serde_json::from_str(params).unwrap_or_default());
+            }
+        }
+    });
+    section(ui, app, "Pathfinder:");
+    row(ui, &mut |ui| {
+        for (icon, op, tip) in PATHFINDER {
+            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
+                let _ = app.run("object.pathfinder", json!({"op": op}));
+            }
+        }
+    });
+    section(ui, app, "Convert Shape:");
+    row(ui, &mut |ui| {
+        for (icon, to, tip) in CONVERT_SHAPE {
+            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
+                let _ = app.run("object.convertShape", json!({"to": to}));
+            }
+        }
+    });
+    section(ui, app, "Convert Point:");
+    row(ui, &mut |ui| {
+        for (icon, kind, tip) in CONVERT_POINT {
+            if icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
+                let _ = app.run("path.convertPoints", json!({"kind": kind}));
+            }
+        }
+    });
+}
+
+pub fn align_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    ui.horizontal(|ui| {
+        for (edge, icon, tip) in [
+            ("left", "objalign-left", "Align left edges"),
+            ("hcenter", "objalign-hcenter", "Align horizontal centers"),
+            ("right", "objalign-right", "Align right edges"),
+            ("top", "objalign-top", "Align top edges"),
+            ("vcenter", "objalign-vcenter", "Align vertical centers"),
+            ("bottom", "objalign-bottom", "Align bottom edges"),
+        ] {
+            if widgets::icon_toggle(ui, icon, false, crate::i18n::tr(&app.ui.language, tip)).clicked() {
+                let _ = app.run("object.align", json!({"edge": edge}));
+            }
+        }
+    });
+    ui.horizontal(|ui| {
+        if widgets::icon_toggle(ui, "objdistribute-h", false, crate::i18n::tr(&app.ui.language, "Distribute ↔")).clicked() {
+            let _ = app.run("object.distribute", json!({"axis": "horizontal"}));
+        }
+        if widgets::icon_toggle(ui, "objdistribute-v", false, crate::i18n::tr(&app.ui.language, "Distribute ↕")).clicked() {
+            let _ = app.run("object.distribute", json!({"axis": "vertical"}));
+        }
+    });
+}
+
+pub fn effects_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let Some(st) = app.session.active() else { return };
+    let Some(it) = st.selection.items.first().and_then(|i| st.doc.item(*i)).cloned() else {
+        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Select an object."));
+        return;
+    };
+    use designcraft_color::BlendMode as B;
+    const MODES: [B; 16] = [
+        B::Normal,
+        B::Multiply,
+        B::Screen,
+        B::Overlay,
+        B::SoftLight,
+        B::HardLight,
+        B::ColorDodge,
+        B::ColorBurn,
+        B::Darken,
+        B::Lighten,
+        B::Difference,
+        B::Exclusion,
+        B::Hue,
+        B::Saturation,
+        B::Color,
+        B::Luminosity,
+    ];
+    ui.horizontal(|ui| {
+        let combo = craft_ui::ComboBox::from_id_salt("blend")
+            .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, it.blend.label())))
+            .width(130.0)
+            .show_ui(ui, |ui| {
+                for m in MODES {
+                    if ui.selectable_label(m == it.blend, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, m.label()))).clicked() {
+                        let _ = app.run("object.opacity", json!({"opacity": it.opacity, "blend": m}));
+                    }
+                }
+            });
+        let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Blending"));
+        caption(ui, crate::i18n::tr(&app.ui.language, "Opacity"));
+        if let Some(v) = number(ui, "eop", Some(it.opacity as f64 * 100.0), "%", 46.0, 0) {
+            let _ = app.run("object.opacity", json!({"opacity": (v / 100.0).clamp(0.0, 1.0)}));
+        }
+    });
+    // The level the settings apply to, with its blend mode and opacity ("Group: Color Dodge 100%").
+    let group = it.is_group();
+    ui.horizontal(|ui| {
+        let level = crate::i18n::tr(&app.ui.language, if group { "Group:" } else { "Object:" });
+        crate::rtl::label(ui, egui::RichText::new(level).font(crate::theme::semibold(12.0)));
+        crate::rtl::label(ui, format!("{} {}%", crate::i18n::tr(&app.ui.language, it.blend.label()), (it.opacity * 100.0).round()));
+    });
+    divider(ui);
+    let ds = it.effects.drop_shadow.clone();
+    let mut on = ds.on;
+    if ui.checkbox(&mut on, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Drop Shadow"))).changed() {
+        let _ = app.run("object.dropShadow", json!({"on": on}));
+    }
+    if ds.on {
+        egui::Grid::new("dsg").num_columns(4).spacing(vec2(6.0, 4.0)).show(ui, |ui| {
+            caption(ui, crate::i18n::tr(&app.ui.language, "Distance"));
+            if let Some(v) = number(ui, "dsd", Some(ds.distance), " pt", 56.0, 1) {
+                let _ = app.run("object.dropShadow", json!({"on": true, "distance": v}));
+            }
+            caption(ui, crate::i18n::tr(&app.ui.language, "Angle"));
+            let global = app.session.active().map_or(120.0, |st| st.doc.settings.global_light);
+            if let Some(v) = number(ui, "dsa", Some(if ds.global_light { global } else { ds.angle }), "°", 50.0, 0) {
+                // With Use Global Light on, the angle is the document's (every such shadow moves).
+                let _ = if ds.global_light {
+                    app.run("object.globalLight", json!({"angle": v}))
+                } else {
+                    app.run("object.dropShadow", json!({"on": true, "angle": v}))
+                };
+            }
+            ui.end_row();
+            crate::rtl::label(ui, "");
+            crate::rtl::label(ui, "");
+            caption(ui, "");
+            let mut gl = ds.global_light;
+            if ui.checkbox(&mut gl, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Use Global Light"))).changed() {
+                let _ = app.run("object.dropShadow", json!({"on": true, "globalLight": gl}));
+            }
+            ui.end_row();
+            caption(ui, crate::i18n::tr(&app.ui.language, "Opacity"));
+            if let Some(v) = number(ui, "dso", Some(ds.opacity as f64 * 100.0), "%", 56.0, 0) {
+                let _ = app.run("object.dropShadow", json!({"on": true, "opacity": v / 100.0}));
+            }
+            caption(ui, crate::i18n::tr(&app.ui.language, "Size"));
+            if let Some(v) = number(ui, "dss", Some(ds.size), " pt", 50.0, 1) {
+                let _ = app.run("object.dropShadow", json!({"on": true, "size": v}));
+            }
+            ui.end_row();
+        });
+    }
+    divider(ui);
+    // Groups only, as in InDesign (greyed for other objects).
+    ui.horizontal(|ui| {
+        let mut iso = it.isolate;
+        let label = crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Isolate Blending"));
+        if ui.add_enabled(group, egui::Checkbox::new(&mut iso, label)).changed() {
+            let _ = app.run("object.transparencyGroup", json!({"isolate": iso}));
+        }
+        let mut ko = it.knockout;
+        let label = crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Knockout Group"));
+        if ui.add_enabled(group, egui::Checkbox::new(&mut ko, label)).changed() {
+            let _ = app.run("object.transparencyGroup", json!({"knockout": ko}));
+        }
+    });
+    // The fx button, as at the bottom of InDesign's Effects panel: each effect opens the Effects
+    // dialog on its page.
+    let fx = ui
+        .add(egui::Button::new(egui::RichText::new("fx").italics().strong()).min_size(vec2(28.0, 20.0)))
+        .on_hover_text(crate::i18n::tr(&app.ui.language, "Add an object effect to the selected target"));
+    egui::Popup::menu(&fx).show(|ui| {
+        for (page, label) in crate::effects_dialog::PAGES {
+            let text = format!("{}…", crate::i18n::tr(&app.ui.language, label));
+            if ui.button(crate::rtl::widget(ui, text)).clicked() {
+                crate::effects_dialog::open(app, page);
+                ui.close();
+            }
+        }
+    });
+}
+
+/// Window › Output › Attributes: overprint fill, stroke and gap; nonprinting.
+pub fn attributes_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let Some(it) = app.session.active().and_then(|d| d.selection.items.first().and_then(|id| d.doc.item(*id)).cloned()) else {
+        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Select an object."));
+        return;
+    };
+    let rows = [
+        ("overprintFill", "Overprint Fill", it.fill.overprint),
+        ("overprintStroke", "Overprint Stroke", it.stroke.overprint),
+        ("nonprinting", "Nonprinting", it.nonprinting),
+        ("overprintGap", "Overprint Gap", it.stroke.gap_overprint),
+    ];
+    egui::Grid::new("attributes_panel").num_columns(2).spacing(vec2(16.0, 6.0)).show(ui, |ui| {
+        for (i, (key, label, on)) in rows.into_iter().enumerate() {
+            let mut v = on;
+            if ui.checkbox(&mut v, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).changed() {
+                let _ = app.run("object.attributes", json!({ key: v }));
+            }
+            if i % 2 == 1 {
+                ui.end_row();
+            }
+        }
+    });
+}
+
+#[cfg(test)]
+mod effects_panel_tests {
+    use super::*;
+
+    /// One frame of the Effects panel: the text painted and where.
+    fn frame(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>) -> Vec<(String, egui::Rect)> {
+        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(320.0, 400.0));
+        let time = ctx.input(|i| i.time) + 1.0 / 60.0;
+        let mut out =
+            ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(time), events, ..Default::default() }, |ui| effects_panel(app, ui));
+        out.textures_delta.clear();
+        let mut v = Vec::new();
+        for s in out.shapes {
+            if let egui::Shape::Text(t) = s.shape {
+                v.push((t.galley.job.text.clone(), t.visual_bounding_rect()));
+            }
+        }
+        v
+    }
+
+    fn click(app: &mut DesignApp, ctx: &egui::Context, label: &str) {
+        let labels = frame(app, ctx, vec![]);
+        let pos = labels.iter().find(|(t, _)| t == label).unwrap_or_else(|| panic!("{label} is painted")).1.center();
+        for pressed in [true, false] {
+            frame(
+                app,
+                ctx,
+                vec![
+                    egui::Event::PointerMoved(pos),
+                    egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
+                ],
+            );
+        }
+    }
+
+    #[test]
+    fn the_effects_panel_shows_the_level_and_isolate_blending_and_knockout_group_for_groups() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+        app.run("file.new", json!({})).unwrap();
+        let a = app.run("frame.create", json!({"rect": [72, 72, 144, 144]})).unwrap()["id"].as_u64().unwrap();
+        let b = app.run("frame.create", json!({"rect": [100, 100, 200, 200]})).unwrap()["id"].as_u64().unwrap();
+        let g = app.run("object.group", json!({"ids": [a, b]})).unwrap()["id"].as_u64().unwrap();
+        app.run("selection.set", json!({"ids": [g]})).unwrap();
+        app.run("object.opacity", json!({"opacity": 1.0, "blend": "colorDodge"})).unwrap();
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx, "en");
+        crate::theme::apply(&ctx, &Tokens::for_brightness(crate::theme::Brightness::default()));
+        let texts: Vec<String> = frame(&mut app, &ctx, vec![]).into_iter().map(|(t, _)| t).collect();
+        for expected in ["Group:", "Color Dodge 100%", "Isolate Blending", "Knockout Group"] {
+            assert!(texts.iter().any(|t| t == expected), "{expected} in {texts:?}");
+        }
+        let item = |app: &DesignApp, id: u64| app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).cloned().unwrap();
+        click(&mut app, &ctx, "Isolate Blending");
+        assert!(item(&app, g).isolate);
+        click(&mut app, &ctx, "Knockout Group");
+        assert!(item(&app, g).knockout);
+        // Another object: the level is Object, and the group options are greyed.
+        app.run("selection.set", json!({"ids": [a]})).unwrap();
+        let texts: Vec<String> = frame(&mut app, &ctx, vec![]).into_iter().map(|(t, _)| t).collect();
+        assert!(texts.iter().any(|t| t == "Object:"), "{texts:?}");
+        click(&mut app, &ctx, "Knockout Group");
+        assert!(!item(&app, a).knockout);
+    }
+
+    #[test]
+    fn pasted_into_frames_keep_object_level_and_disable_group_blending() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+        app.run("file.new", json!({})).unwrap();
+        let child = app.run("frame.create", json!({"rect": [80, 80, 120, 120]})).unwrap()["id"].clone();
+        app.run("selection.set", json!({"ids": [child]})).unwrap();
+        app.run("edit.copy", json!({})).unwrap();
+        let container = app.run("frame.create", json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].as_u64().unwrap();
+        app.run("selection.set", json!({"ids": [container]})).unwrap();
+        app.run("edit.pasteInto", json!({})).unwrap();
+        app.run("selection.set", json!({"ids": [container]})).unwrap();
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx, "en");
+        crate::theme::apply(&ctx, &Tokens::for_brightness(crate::theme::Brightness::default()));
+        let texts: Vec<String> = frame(&mut app, &ctx, vec![]).into_iter().map(|(t, _)| t).collect();
+        assert!(texts.iter().any(|t| t == "Object:"), "a frame remains an object after Paste Into: {texts:?}");
+        let undo = app.session.doc().unwrap().history.undo.len();
+        click(&mut app, &ctx, "Isolate Blending");
+        click(&mut app, &ctx, "Knockout Group");
+        let st = app.session.doc().unwrap();
+        let it = st.doc.item(designcraft_doc::ItemId(container)).unwrap();
+        assert!(it.has_nested_items());
+        assert!(!it.isolate && !it.knockout, "group-only options stay disabled for a frame holding content");
+        assert_eq!(st.history.undo.len(), undo, "disabled controls do not create undo steps");
+    }
+}
+
+#[cfg(test)]
+mod wrap_panel_tests {
+    use super::*;
+
+    /// One frame of the Text Wrap panel: the text painted and where.
+    fn frame(app: &mut DesignApp, ctx: &egui::Context, events: Vec<egui::Event>) -> Vec<(String, egui::Rect)> {
+        let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(360.0, 300.0));
+        let time = ctx.input(|i| i.time) + 1.0 / 60.0;
+        let mut out =
+            ctx.run_ui(egui::RawInput { screen_rect: Some(screen), time: Some(time), events, ..Default::default() }, |ui| wrap_panel(app, ui));
+        out.textures_delta.clear();
+        out.shapes
+            .into_iter()
+            .filter_map(|s| if let egui::Shape::Text(t) = s.shape { Some((t.galley.job.text.clone(), t.visual_bounding_rect())) } else { None })
+            .collect()
+    }
+
+    #[test]
+    fn the_text_wrap_panel_shows_each_offset_and_invert() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+        app.run("file.new", json!({})).unwrap();
+        let id = app.run("frame.create", json!({"rect": [72, 72, 144, 144]})).unwrap()["id"].as_u64().unwrap();
+        app.run("object.textWrap", json!({"mode": "boundingBox", "offset": [1, 2, 3, 4]})).unwrap();
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx, "en");
+        // Top and Left, then Bottom and Right, each with its own value (picas here: 0p1 = 1 pt),
+        // then the Wrap To side.
+        let t: Vec<String> = frame(&mut app, &ctx, vec![]).into_iter().map(|(t, _)| t).filter(|t| !t.is_empty()).collect();
+        assert_eq!(t, ["Invert", "Top", "0p1", "Left", "0p2", "Bottom", "0p3", "Right", "0p4", "Wrap To", "Both Right & Left Sides"]);
+        // Invert, next to the wrap buttons.
+        let pos = frame(&mut app, &ctx, vec![]).into_iter().find(|(t, _)| t == "Invert").unwrap().1.center();
+        for pressed in [true, false] {
+            frame(
+                &mut app,
+                &ctx,
+                vec![
+                    egui::Event::PointerMoved(pos),
+                    egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
+                ],
+            );
+        }
+        assert!(app.session.doc().unwrap().doc.item(designcraft_doc::ItemId(id)).unwrap().wrap.invert);
+    }
+}
diff --git a/crates/ui-egui/src/panels/properties/tests.rs b/crates/ui-egui/src/panels/properties/tests.rs
new file mode 100644
index 000000000..095bd5690
--- /dev/null
+++ b/crates/ui-egui/src/panels/properties/tests.rs
@@ -0,0 +1,815 @@
+use egui_kittest::{
+    Harness,
+    kittest::{NodeT, Queryable},
+};
+
+use super::*;
+
+/// A link to a panel whose flyout is open leaves the flyout open.
+#[test]
+fn a_panel_link_keeps_its_open_flyout() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    show_panel(&mut app, "stroke");
+    assert_eq!(app.ui.docking_flyout.as_deref(), Some("stroke"));
+    show_panel(&mut app, "stroke");
+    assert!(crate::panel_docking::showing(&app, "stroke"));
+}
+
+fn language(app: &mut DesignApp) -> Value {
+    text_attrs(app).unwrap()["chars"]["language"].clone()
+}
+
+fn linked_graphics(paths: &[Option<&str>]) -> (DesignApp, Vec<designcraft_doc::ItemId>, Vec<designcraft_doc::AssetId>) {
+    use designcraft_doc::{Asset, AssetId, Content, Graphic, ItemId};
+    use std::sync::Arc;
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"title": "Linked graphics"})).unwrap();
+    let mut items = Vec::new();
+    let mut assets = Vec::new();
+    for (index, path) in paths.iter().enumerate() {
+        let x = 72 + index * 100;
+        let id = ItemId(app.run("frame.create", json!({"rect": [x, 72, x + 72, 144]})).unwrap()["id"].as_u64().unwrap());
+        let doc = Arc::make_mut(&mut app.session.doc_mut().unwrap().doc);
+        let aid = AssetId(doc.alloc());
+        doc.assets.insert(
+            aid,
+            Arc::new(Asset {
+                id: aid,
+                name: "photo.svg".into(),
+                mime: "image/svg+xml".into(),
+                link: path.map(str::to_owned),
+                data: Arc::new(
+                    br##"<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><rect width="32" height="32" fill="#4488cc"/></svg>"##
+                        .to_vec(),
+                ),
+                pixels: Some((32, 32)),
+                ..Default::default()
+            }),
+        );
+        doc.item_mut(id).unwrap().content = Content::Graphic(Graphic {
+            layer_options: None,
+            asset: aid,
+            size: (72.0, 72.0),
+            xf: designcraft_geom::Affine::IDENTITY,
+            clip: None,
+            auto_fit: Default::default(),
+            fit_align: 4,
+            crop: [0.0; 4],
+            wrap: Default::default(),
+            fill: Default::default(),
+        });
+        items.push(id);
+        assets.push(aid);
+    }
+    (app, items, assets)
+}
+
+fn links_harness(app: DesignApp, width: f32) -> Harness<'static, DesignApp> {
+    let mut ready = false;
+    let mut h = Harness::builder().with_size(vec2(width, 600.0)).build_ui_state(
+        move |ui, app: &mut DesignApp| {
+            if !ready {
+                crate::theme::install_fonts(ui.ctx(), "");
+                crate::theme::apply(ui.ctx(), &Tokens::for_brightness(Default::default()));
+                ready = true;
+                return;
+            }
+            links_panel(app, ui);
+        },
+        app,
+    );
+    h.input_mut().max_texture_side = Some(8192);
+    h.run_steps(3);
+    h
+}
+
+/// With the caret in text, the Stroke panel offers the text's stroke options, not an empty panel.
+/// The first and last line indents take negative values, as InDesign's (and the Paragraph
+/// panel's) do; the left and right indents and the spacing don't.
+#[test]
+fn last_line_indent_may_be_negative() {
+    for key in ["firstLineIndent", "lastLineIndent"] {
+        assert!(super::para_field_min(key) < 0.0, "{key}");
+    }
+    for key in ["leftIndent", "rightIndent", "spaceBefore", "spaceAfter"] {
+        assert_eq!(super::para_field_min(key), 0.0, "{key}");
+    }
+}
+
+#[test]
+fn stroke_panel_shows_the_text_stroke_options_while_text_is_selected() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [72, 72, 400, 400], "content": "text", "caret": true})).unwrap();
+    let mut ready = false;
+    let mut h = Harness::builder().with_size(vec2(320.0, 400.0)).build_ui_state(
+        move |ui, app: &mut DesignApp| {
+            if !ready {
+                crate::theme::install_fonts(ui.ctx(), "");
+                crate::theme::apply(ui.ctx(), &Tokens::for_brightness(Default::default()));
+                ready = true;
+                return;
+            }
+            stroke_panel(app, ui);
+        },
+        app,
+    );
+    h.run_steps(3);
+    assert!(h.query_by_label("Select an object.").is_none());
+    h.get_by_label("Stroke Behind Fill");
+}
+
+/// As InDesign's: Edit Page takes the Page tool to the page in view, and Properties sets that
+/// page alone; Back returns to the document.
+#[test]
+fn edit_page_shows_the_page_and_sets_its_size_alone() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"pages": 3, "facingPages": false})).unwrap();
+    app.ui.dock_tab = "properties".into();
+    let mut h = crate::test_window::open(app, vec2(1400.0, 900.0));
+    crate::canvas::go_to_page(&mut h.state_mut().app, 1);
+    h.run_steps(3);
+    h.get_by_label("Edit Page").click();
+    h.run_steps(3);
+    let st = h.state().app.session.active().unwrap();
+    assert_eq!((h.state().app.session.tool_id(), st.selection.page), ("page", Some(1)));
+    assert!(h.query_by_label("Document Setup").is_none(), "no dialog");
+    let _ = h.get_by_label("Page Size");
+    let _ = h.get_by_label("Margins and Columns");
+    h.get_by_label("Landscape").click();
+    h.run_steps(3);
+    let doc = &h.state().app.session.active().unwrap().doc;
+    let size = |abs: usize| doc.page(abs).map(|p| (p.width, p.height)).unwrap();
+    assert_eq!(size(1), (792.0, 612.0), "the page turns");
+    assert_eq!((size(0), size(2)), ((612.0, 792.0), (612.0, 792.0)), "the others don't");
+    h.get_by_label("Back").click();
+    h.run_steps(3);
+    let st = h.state().app.session.active().unwrap();
+    assert_eq!((h.state().app.session.tool_id(), st.selection.page), ("selection", None));
+    let _ = h.get_by_label("Edit Page");
+}
+
+#[test]
+fn links_panel_distinguishes_same_named_sources_and_keeps_link_actions() {
+    let first = "/project/assets/studio-a/photo.svg";
+    let second = "/project/assets/studio-b/photo.svg";
+    let (app, items, assets) = linked_graphics(&[Some(first), Some(second), None]);
+    let mut h = links_harness(app, 320.0);
+    assert_eq!(h.get_all_by_label("photo.svg").count(), 3);
+    assert!(h.query_by_label(first).is_some(), "the first source path is visible in the row");
+    h.get_by_label(second).click();
+    h.run_steps(3);
+    h.get_by_label("Go To").click();
+    h.run_steps(3);
+    assert_eq!(h.state().session.active().unwrap().selection.items, vec![items[1]]);
+    h.get_by_label("Embed").click();
+    h.run_steps(3);
+    assert!(h.state().session.active().unwrap().doc.assets[&assets[1]].link.is_none());
+    assert_eq!(h.state().session.active().unwrap().doc.assets[&assets[0]].link.as_deref(), Some(first));
+    assert!(h.query_by_label(second).is_none(), "an embedded graphic no longer shows a source path");
+    assert_eq!(h.get_all_by_label("Embedded").count(), 2);
+    assert_eq!(h.get_all_by_label("photo.svg").count(), 3);
+    h.get_by_label(first).click();
+    h.run_steps(3);
+    h.get_by_label("Go To").click();
+    h.run_steps(3);
+    assert_eq!(h.state().session.active().unwrap().selection.items, vec![items[0]]);
+}
+
+#[test]
+fn links_panel_keeps_long_source_paths_inside_a_narrow_panel() {
+    let path = "/project/assets/studio-a/very-long-folder-name/another-long-folder-name/photo.svg";
+    let (app, _, _) = linked_graphics(&[Some(path)]);
+    let mut h = links_harness(app, 240.0);
+    let source = h.get_by_label(path).rect();
+    assert!(source.width() < 150.0, "the source is truncated to its column: {source:?}");
+    assert!(source.right() <= 240.0, "the source stays inside the narrow panel: {source:?}");
+    assert!(h.get_by_label("Page · PPI").rect().right() <= 240.0);
+    h.get_by_label(path).click();
+    h.run_steps(3);
+    assert!(h.output().shapes.iter().any(|s| matches!(&s.shape, egui::Shape::Text(text) if text.galley.job.text == path && !text.galley.elided && text.visual_bounding_rect().right() <= 240.0)), "the selected path is painted in full and wraps inside the panel");
+}
+
+#[test]
+fn properties_character_section_sets_the_language() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "bunun", "caret": true})).unwrap();
+    app.run("edit.selectAll", json!({})).unwrap();
+    assert_ne!(language(&mut app), "French");
+    let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            // The panel's fonts are installed before its first frame.
+            let id = egui::Id::unique("test_fonts");
+            if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
+                crate::theme::install_fonts(ui.ctx(), "");
+                ui.data_mut(|d| d.insert_temp(id, true));
+                return;
+            }
+            show(app, ui);
+        },
+        app,
+    );
+    h.run_steps(3);
+    assert!(h.query_by_label("Language").is_none(), "under •••, as in InDesign");
+    h.get_all_by_label("More Options").next().unwrap().click();
+    h.run_steps(3);
+    h.get_by_label("Language").click();
+    h.run_steps(2);
+    h.get_by_label("French").click();
+    h.run_steps(2);
+    assert_eq!(language(h.state_mut()), "French");
+}
+
+/// Properties › Character and Paragraph •••, as in InDesign: the sections expand in place,
+/// with the scales, baseline shift, skew, language, OpenType and the case buttons, and the
+/// indents, spacing and drop caps.
+/// Properties › Paragraph ••• on a First Line Only paragraph: Align to Baseline Grid shows
+/// pressed, and a click turns alignment off instead of making it All Lines.
+#[test]
+fn more_options_grid_button_keeps_first_line_only() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "If fine plants", "caret": true})).unwrap();
+    app.run("edit.selectAll", json!({})).unwrap();
+    app.run("type.para", json!({"attrs": {"gridAlign": "firstLineOnly"}})).unwrap();
+    let mut h = panel_harness(app, show);
+    h.run_steps(3);
+    h.get_all_by_label("More Options").nth(1).unwrap().click();
+    h.run_steps(3);
+    assert_eq!(h.get_by_label("Align to Baseline Grid").accesskit_node().toggled(), Some(egui::accesskit::Toggled::True));
+    assert_eq!(text_attrs(h.state_mut()).unwrap()["para"]["gridAlign"], "firstLineOnly");
+    h.get_by_label("Align to Baseline Grid").click();
+    h.run_steps(3);
+    assert_eq!(text_attrs(h.state_mut()).unwrap()["para"]["gridAlign"], "none");
+}
+
+#[test]
+fn more_options_expand_character_and_paragraph_in_place() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "If fine plants", "caret": true})).unwrap();
+    app.run("edit.selectAll", json!({})).unwrap();
+    let mut h = panel_harness(app, show);
+    h.run_steps(3);
+    for l in ["Vertical Scale", "Small Caps", "Drop Cap Number of Lines", "Space Before"] {
+        assert!(h.query_by_label(l).is_none(), "{l} hidden until •••");
+    }
+    h.get_all_by_label("More Options").next().unwrap().click();
+    h.run_steps(3);
+    h.get_by_label("Small Caps").click();
+    h.run_steps(3);
+    let _ = h.get_by_label("OpenType");
+    let _ = h.get_by_label("Language");
+    h.get_all_by_label("More Options").nth(1).unwrap().click();
+    h.run_steps(3);
+    let _ = h.get_by_label("Hyphenate");
+    h.get_by_label("Align to Baseline Grid").click();
+    h.run_steps(3);
+    let a = text_attrs(h.state_mut()).unwrap();
+    assert_eq!(a["chars"]["capitalization"], "smallCaps");
+    assert_eq!(a["para"]["gridAlign"], "allLines");
+    // ••• again folds the section.
+    h.get_all_by_label("More Options").next().unwrap().click();
+    h.run_steps(3);
+    assert!(h.query_by_label("Small Caps").is_none());
+}
+
+/// The Paragraph panel on a First Line Only paragraph: Align to Baseline Grid shows pressed
+/// and keeps First Line Only, and the panel menu checks Only Align First Line to Grid.
+#[test]
+fn paragraph_panel_keeps_first_line_only() {
+    let mut app = text_app();
+    app.run("type.para", json!({"attrs": {"gridAlign": "firstLineOnly"}})).unwrap();
+    let mut h = panel_harness(app, paragraph_panel);
+    h.run_steps(3);
+    assert_eq!(h.get_by_label("Align to Baseline Grid").accesskit_node().toggled(), Some(egui::accesskit::Toggled::True));
+    h.get_by_label("Align to Baseline Grid").click();
+    h.run_steps(3);
+    assert_eq!(text_attrs(h.state_mut()).unwrap()["para"]["gridAlign"], "firstLineOnly");
+    h.get_by_label("☰").click();
+    h.run_steps(3);
+    let _ = h.get_by_label("✓ Only Align First Line to Grid");
+}
+
+#[test]
+fn paragraph_panel_menu_toggles_ignore_optical_margin() {
+    let mut h = panel_harness(text_app(), paragraph_panel);
+    h.run_steps(3);
+    h.get_by_label("☰").click();
+    h.run_steps(3);
+    h.get_by_label("   Ignore Optical Margin").click();
+    h.run_steps(3);
+    assert_eq!(text_attrs(h.state_mut()).unwrap()["para"]["ignoreOpticalMargin"], true);
+    h.get_by_label("☰").click();
+    h.run_steps(3);
+    h.get_by_label("✓ Ignore Optical Margin").click();
+    h.run_steps(3);
+    assert_eq!(text_attrs(h.state_mut()).unwrap()["para"]["ignoreOpticalMargin"], false);
+}
+
+#[test]
+fn paragraph_panel_menu_define_lists_opens_its_dialog() {
+    let mut h = panel_harness(text_app(), paragraph_panel);
+    h.run_steps(3);
+    h.get_by_label("☰").click();
+    h.run_steps(3);
+    h.get_by_label("Define Lists…").click();
+    h.run_steps(3);
+    assert!(h.state_mut().ui.dialog.is_some(), "Define Lists");
+}
+
+#[test]
+fn paragraph_panel_is_laid_out_as_indesigns_with_its_panel_menu() {
+    let mut h = panel_harness(text_app(), paragraph_panel);
+    h.run_steps(3);
+    for l in [
+        "Left Indent",
+        "Right Indent",
+        "First Line Left Indent",
+        "Last Line Right Indent",
+        "Space Before",
+        "Space After",
+        "Space Between Paragraphs Using Same Style",
+        "Drop Cap Number of Lines",
+        "Drop Cap One or More Characters",
+        "Paragraph Shading",
+        "Paragraph Border",
+        "Hyphenate",
+        "Do Not Align to Baseline Grid",
+    ] {
+        let _ = h.get_by_label(l);
+    }
+    let para = |h: &mut Harness<'static, DesignApp>| text_attrs(h.state_mut()).unwrap()["para"].clone();
+    // Space Between Paragraphs Using Same Style starts at Ignore; a value is set, and emptying
+    // the field ignores it again.
+    assert!(para(&mut h)["sameParaStyleSpacing"].is_null());
+    let field = h.get_all_by_role(egui::accesskit::Role::TextInput).nth(6).unwrap();
+    field.focus();
+    field.type_text("6 pt");
+    h.run_steps(1);
+    h.key_press(egui::Key::Enter);
+    h.run_steps(3);
+    assert_eq!(para(&mut h)["sameParaStyleSpacing"], 6.0);
+    h.get_all_by_role(egui::accesskit::Role::TextInput).nth(6).unwrap().focus();
+    h.run_steps(1);
+    for _ in 0..8 {
+        h.key_press(egui::Key::Backspace);
+    }
+    h.key_press(egui::Key::Enter);
+    h.run_steps(3);
+    assert!(para(&mut h)["sameParaStyleSpacing"].is_null(), "Ignore");
+    // Shading on, then the grid buttons and Only Align First Line to Grid from the menu.
+    h.get_by_label("Shading").click();
+    h.run_steps(3);
+    assert_eq!(para(&mut h)["shadingOn"], true);
+    h.get_by_label("Align to Baseline Grid").click();
+    h.run_steps(3);
+    assert_eq!(para(&mut h)["gridAlign"], "allLines");
+    h.get_by_label("☰").click();
+    h.run_steps(3);
+    for l in
+        ["   Balance Ragged Lines", "Keep Options…", "Drop Caps and Nested Styles…", "GREP Styles…", "Define Lists…", "Restart/Continue Numbering"]
+    {
+        let _ = h.get_by_label(l);
+    }
+    h.get_by_label("   Only Align First Line to Grid").click();
+    h.run_steps(3);
+    assert_eq!(para(&mut h)["gridAlign"], "firstLineOnly");
+    h.get_by_label("Do Not Align to Baseline Grid").click();
+    h.run_steps(3);
+    assert_eq!(para(&mut h)["gridAlign"], "none");
+    // Keep Options… opens the selected paragraphs' Keep Options, and OK applies them.
+    h.get_by_label("☰").click();
+    h.run_steps(3);
+    h.get_by_label("Keep Options…").click();
+    h.run_steps(3);
+    let app = h.state_mut();
+    let d = app.ui.dialog.as_mut().expect("Keep Options");
+    assert_eq!((d.id.as_str(), d.s("section").as_str()), ("paragraphLocal", "keep"));
+    d.fields.insert("p.keepWithNext".into(), json!(2));
+    crate::dialogs::confirm(app).unwrap();
+    assert_eq!(para(&mut h)["keepWithNext"], 2);
+}
+
+fn kerning(app: &mut DesignApp) -> Value {
+    text_attrs(app).unwrap()["chars"]["kerning"].clone()
+}
+
+/// A harness drawing `panel` for `app` (fonts installed before the first frame).
+fn panel_harness(app: DesignApp, panel: fn(&mut DesignApp, &mut egui::Ui)) -> Harness<'static, DesignApp> {
+    Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
+        move |ui, app: &mut DesignApp| {
+            let id = egui::Id::unique("test_fonts");
+            if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
+                crate::theme::install_fonts(ui.ctx(), "");
+                ui.data_mut(|d| d.insert_temp(id, true));
+                return;
+            }
+            panel(app, ui);
+        },
+        app,
+    )
+}
+
+fn text_app() -> DesignApp {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "AVATAR", "caret": true})).unwrap();
+    app.run("edit.selectAll", json!({})).unwrap();
+    app
+}
+
+#[test]
+fn properties_kerning_menu_sets_zero_kerning() {
+    let mut h = panel_harness(text_app(), show);
+    h.run_steps(3);
+    assert_eq!(kerning(h.state_mut())["kind"], "metrics");
+    h.get_by_label("Kerning").click();
+    h.run_steps(2);
+    h.get_by_label("0").click();
+    h.run_steps(2);
+    assert_eq!(kerning(h.state_mut())["kind"], "none");
+}
+
+fn undo_steps(app: &DesignApp) -> usize {
+    app.session.active().unwrap().history.undo.len()
+}
+
+fn font_style(app: &mut DesignApp) -> String {
+    text_attrs(app).unwrap()["chars"]["fontStyle"].as_str().unwrap().to_string()
+}
+
+/// The Digits menu uses the reference names (documented as Arabic, Hindi and Farsi), which
+/// are translated, with a sample of each script's figures.
+#[test]
+fn digits_choices_use_the_reference_names() {
+    assert_eq!(DIGIT_OPTIONS.map(|o| o.1), ["Default", "Arabic", "Hindi", "Farsi", "Native"]);
+    for (lang, _) in crate::i18n::LANGUAGES {
+        let tr = |s| crate::i18n::tr(lang, s);
+        let shown: Vec<String> = DIGIT_OPTIONS.iter().map(|o| digit_label(lang, *o)).collect();
+        let expected = [
+            tr("Default").to_string(),
+            format!("{}  0123", tr("Arabic")),
+            format!("{}  ٠١٢٣", tr("Hindi")),
+            format!("{}  ۰۱۲۳", tr("Farsi")),
+            tr("Native").to_string(),
+        ];
+        assert_eq!(shown, expected, "{lang}");
+    }
+}
+
+#[test]
+fn axes_with_an_inverted_or_missing_range_get_no_slider() {
+    let axis = |tag: &str, min: f32, max: f32| (tag.to_string(), tag.to_string(), min, min, max);
+    let kept = usable_axes(vec![axis("wght", 100.0, 900.0), axis("wdth", 125.0, 75.0), axis("opsz", f32::NAN, 72.0), axis("slnt", 0.0, 0.0)]);
+    let tags: Vec<&str> = kept.iter().map(|a| a.0.as_str()).collect();
+    assert_eq!(tags, ["wght", "slnt"]);
+}
+
+#[test]
+fn variable_font_style_keeps_two_decimals_at_most() {
+    let values = [("wght".to_string(), 512.0_f32), ("wdth".to_string(), 1.25), ("opsz".to_string(), 0.4801)];
+    assert_eq!(variable_font_style("Regular", &values), "Regular {wght:512,wdth:1.25,opsz:0.48}");
+    assert_eq!(axis_step(100.0, 900.0), (1.0, 0));
+    assert_eq!(axis_step(0.48, 3.2), (0.01, 2));
+}
+
+#[test]
+fn a_live_preview_held_over_many_frames_is_one_undo_step_once_let_go() {
+    let mut app = text_app();
+    let steps = undo_steps(&app);
+    let size = |app: &mut DesignApp| text_attrs(app).unwrap()["chars"]["size"].as_f64().unwrap();
+    // A drag: a preview on most frames, held without moving on others.
+    for v in [20.0, 24.0, 30.0] {
+        app.settle_live_preview();
+        app.live_preview("Size", "type.char", json!({"attrs": {"size": v}}));
+        app.settle_live_preview();
+        app.hold_live_preview();
+    }
+    assert_eq!(size(&mut app), 30.0, "the page shows the last preview");
+    assert_eq!(undo_steps(&app), steps, "nothing is undoable while held");
+    // Let go: a frame without a hold, then the frame after it commits the preview.
+    app.settle_live_preview();
+    assert_eq!(undo_steps(&app), steps, "the last held frame keeps it open");
+    app.settle_live_preview();
+    assert_eq!(undo_steps(&app), steps + 1);
+    assert!(app.session.active().unwrap().interaction.is_none());
+    app.settle_live_preview();
+    assert_eq!(undo_steps(&app), steps + 1, "committed once");
+    // Later edits get their own undo steps.
+    app.run("type.char", json!({"attrs": {"tracking": 50}})).unwrap();
+    assert_eq!(undo_steps(&app), steps + 2);
+}
+
+/// A system variable font with two or more axes (macOS ships some), loaded into the shared fonts.
+fn system_variable_font() -> Option<&'static str> {
+    let candidates = [("/System/Library/Fonts/Supplemental/Skia.ttf", "Skia"), ("/System/Library/Fonts/NewYork.ttf", "New York")];
+    candidates.into_iter().find_map(|(path, family)| {
+        let bytes = std::fs::read(path).ok()?;
+        let db = designcraft_fonts::FontDb::global();
+        db.add_font(bytes);
+        let style = db.styles(family).first().cloned()?;
+        (db.axes(family, &style).len() >= 2).then_some(family)
+    })
+}
+
+#[test]
+fn dragging_one_of_several_axis_sliders_is_one_undo_step() {
+    let Some(family) = system_variable_font() else {
+        eprintln!("skipped: no variable font with two axes on this system");
+        return;
+    };
+    let mut app = text_app();
+    super::super::apply_font(&mut app, &super::super::FontPick { family: family.into(), style: None });
+    let before = font_style(&mut app);
+    let steps = undo_steps(&app);
+    // The app commits a preview no panel held at the start of each frame (DesignApp::ui).
+    let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let id = egui::Id::unique("test_fonts");
+            if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
+                crate::theme::install_fonts(ui.ctx(), "");
+                ui.data_mut(|d| d.insert_temp(id, true));
+                return;
+            }
+            app.settle_live_preview();
+            character_panel(app, ui);
+        },
+        app,
+    );
+    h.run_steps(3);
+    let sliders = h.get_all_by_role(egui::accesskit::Role::Slider).map(|n| n.rect()).collect::<Vec<_>>();
+    assert!(sliders.len() >= 2, "one slider per axis: {sliders:?}");
+    let track = sliders[0];
+    let y = track.center().y;
+    h.hover_at(egui::pos2(track.left() + 2.0, y));
+    h.run_steps(1);
+    h.drag_at(egui::pos2(track.left() + 2.0, y));
+    h.run_steps(1);
+    for k in 1..=10 {
+        h.hover_at(egui::pos2(track.left() + track.width() * k as f32 / 10.0, y));
+        h.run_steps(1);
+        assert_eq!(undo_steps(h.state()), steps, "no undo step while dragging (frame {k})");
+    }
+    let previewed = font_style(h.state_mut());
+    assert_ne!(previewed, before, "the drag previews on the page");
+    h.drop_at(egui::pos2(track.right(), y));
+    h.run_steps(3);
+    assert_eq!(undo_steps(h.state()), steps + 1, "the whole drag is one undo step");
+    assert_eq!(font_style(h.state_mut()), previewed);
+    h.state_mut().run("edit.undo", json!({})).unwrap();
+    assert_eq!(font_style(h.state_mut()), before);
+}
+
+#[test]
+fn character_panel_has_kerning_and_takes_a_typed_manual_value() {
+    let mut h = panel_harness(text_app(), character_panel);
+    h.run_steps(3);
+    // The caption and the control share the name: click the control.
+    h.get_by_role_and_label(egui::accesskit::Role::ComboBox, "Kerning").click();
+    h.run_steps(2);
+    // Address the manual-value editor by semantics, not tree traversal order.
+    let field = h.get_by_role_and_label(egui::accesskit::Role::TextInput, "Manual Kerning");
+    field.focus();
+    field.type_text("-40");
+    h.run_steps(1);
+    h.key_press(egui::Key::Enter);
+    h.run_steps(3);
+    assert_eq!(kerning(h.state_mut()), json!({"kind": "manual", "value": -40.0}));
+}
+
+#[test]
+fn a_manual_kerning_value_at_a_caret_kerns_the_pair() {
+    let mut app = text_app();
+    let story = app.session.active().unwrap().selection.text.unwrap().story;
+    app.run("text.select", json!({"story": story.0, "anchor": 1, "focus": 1})).unwrap();
+    let mut h = panel_harness(app, character_panel);
+    h.run_steps(3);
+    h.get_by_role_and_label(egui::accesskit::Role::ComboBox, "Kerning").click();
+    h.run_steps(2);
+    let field = h.get_by_role_and_label(egui::accesskit::Role::TextInput, "Manual Kerning");
+    field.focus();
+    field.type_text("-80");
+    h.run_steps(1);
+    h.key_press(egui::Key::Enter);
+    h.run_steps(3);
+    let st = h.state_mut().session.active().unwrap().doc.story(story).unwrap().format_after(0).over.kerning;
+    assert_eq!(st, Some(designcraft_doc::Kerning::Manual(-80.0)), "A of the A|V pair");
+    assert_eq!(kerning(h.state_mut()), json!({"kind": "manual", "value": -80.0}));
+}
+
+#[test]
+fn clicking_a_swatch_chip_in_the_appearance_fill_menu_applies_it() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    // A graphic frame: the Appearance section shows a single Fill chip.
+    let id = app.run("frame.create", json!({"rect": [72, 72, 300, 200]})).unwrap()["id"].as_u64().unwrap();
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    let before = app.session.active().unwrap().doc.item(designcraft_doc::ids::ItemId(id)).unwrap().fill.swatch.clone();
+    assert_ne!(before, "[Paper]");
+    let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let id = egui::Id::unique("test_fonts");
+            if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
+                crate::theme::install_fonts(ui.ctx(), "");
+                ui.data_mut(|d| d.insert_temp(id, true));
+                return;
+            }
+            show(app, ui);
+        },
+        app,
+    );
+    h.run_steps(3);
+    // Open the Fill menu from the Appearance chip.
+    h.get_by_label("Fill swatch").click();
+    h.run_steps(3);
+    // Click the *chip* (the row's left edge), not the name.
+    let name = "[Paper]".to_string();
+    let row = h.get_by_label(&name).rect();
+    // The row spans the menu (chip + name), not just the name text.
+    assert!(row.width() > 150.0, "the row is the full menu width, chip included: {row:?}");
+    let p = row.min + vec2(8.0, row.height() / 2.0);
+    h.hover_at(p);
+    h.drag_at(p);
+    h.drop_at(p);
+    h.run_steps(4);
+    let after = h.state().session.active().unwrap().doc.item(designcraft_doc::ids::ItemId(id)).unwrap().fill.swatch.clone();
+    assert_eq!(after, name, "clicking the swatch chip applies it");
+}
+
+fn panel(app: DesignApp) -> Harness<'static, DesignApp> {
+    let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let id = egui::Id::unique("test_fonts");
+            if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
+                crate::theme::install_fonts(ui.ctx(), "");
+                ui.data_mut(|d| d.insert_temp(id, true));
+                return;
+            }
+            show(app, ui);
+        },
+        app,
+    );
+    h.run_steps(3);
+    h
+}
+
+/// The course's chapter 21: Properties' Bulleted List button gives the selected paragraphs
+/// bullets with InDesign's hanging indent; pressed again, both go.
+#[test]
+fn the_bulleted_list_button_applies_a_hanging_indent() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let f = app
+        .run(
+            "frame.create",
+            json!({"rect": [72, 72, 300, 200], "content": "text", "text": "4 eggs
+1 cup milk"}),
+        )
+        .unwrap();
+    app.run("text.select", json!({"story": f["story"], "anchor": 0, "focus": 15})).unwrap();
+    let mut h = panel(app);
+    h.get_by_label("Bulleted List").click();
+    h.run_steps(3);
+    let a = h.state_mut().run("type.selectionAttrs", json!({})).unwrap();
+    assert_eq!(
+        (a["para"]["listType"].as_str(), a["para"]["leftIndent"].as_f64(), a["para"]["firstLineIndent"].as_f64()),
+        (Some("bullets"), Some(18.0), Some(-18.0))
+    );
+    assert_eq!(crate::menus::checked(h.state(), "list.bullets", &json!({})), Some(true), "Type › Apply Bullets shows it");
+    h.get_by_label("Bulleted List").click();
+    h.run_steps(3);
+    let a = h.state_mut().run("type.selectionAttrs", json!({})).unwrap();
+    assert_eq!((a["para"]["listType"].as_str(), a["para"]["leftIndent"].as_f64()), (Some("none"), Some(0.0)));
+}
+
+#[test]
+fn several_shapes_show_pathfinder_and_intersect_combines_them() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let a = app.run("frame.create", json!({"rect": [100, 100, 300, 300], "shape": "ellipse"})).unwrap()["id"].clone();
+    let b = app.run("frame.create", json!({"rect": [200, 100, 300, 200]})).unwrap()["id"].clone();
+    // One shape: no Pathfinder section.
+    app.run("selection.set", json!({"ids": [a]})).unwrap();
+    let mut h = panel(app);
+    assert!(h.query_by_label("Pathfinder").is_none());
+    // Two: the section and its five buttons; Intersect leaves one shape, the ellipse's quarter.
+    h.state_mut().run("selection.set", json!({"ids": [a, b]})).unwrap();
+    h.run_steps(3);
+    assert!(h.query_by_label("Pathfinder").is_some());
+    for op in ["Add", "Subtract", "Intersect", "Exclude Overlap", "Minus Back"] {
+        assert!(h.query_by_label(op).is_some(), "{op}");
+    }
+    h.get_by_label("Intersect").click();
+    h.run_steps(3);
+    let doc = &h.state().session.active().unwrap().doc;
+    let items = &doc.spreads[0].items;
+    assert_eq!(items.len(), 1, "one shape left");
+    let r = items[0].bounds();
+    assert!((r.x0 - 200.0).abs() < 0.5 && (r.y1 - 200.0).abs() < 0.5 && (r.x1 - 300.0).abs() < 0.5, "{r:?}");
+}
+
+const CYAN: &str = "C=100 M=0 Y=0 K=0";
+
+#[test]
+fn the_fill_menu_sets_a_tint() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let id = app.run("frame.create", json!({"rect": [72, 72, 300, 200]})).unwrap()["id"].as_u64().unwrap();
+    app.run("object.fill", json!({"swatch": CYAN, "ids": [id]})).unwrap();
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    let mut h = panel(app);
+    h.get_by_label("Fill swatch").click();
+    h.run_steps(3);
+    // A frame that isn't a text frame: no Apply To.
+    assert!(h.query_by_label("Apply To:").is_none());
+    // The field on the Tint row (Opacity also reads 100%).
+    let row = h.get_by_label("Tint:").rect();
+    h.query_all_by(|n| n.role() == egui::accesskit::Role::TextInput && n.value().as_deref() == Some("100%"))
+        .find(|n| (n.rect().center().y - row.center().y).abs() < 8.0)
+        .expect("the Tint field")
+        .click();
+    h.run_steps(2);
+    h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
+    h.event(egui::Event::Text("25".into()));
+    h.key_press(egui::Key::Enter);
+    h.run_steps(3);
+    let fill = h.state().session.active().unwrap().doc.item(designcraft_doc::ids::ItemId(id)).unwrap().fill.clone();
+    assert_eq!((fill.swatch.as_str(), fill.tint), (CYAN, 0.25), "the tint, on the same swatch");
+}
+
+#[test]
+fn a_tint_on_several_objects_keeps_each_ones_swatch() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let a = app.run("frame.create", json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].as_u64().unwrap();
+    let b = app.run("frame.create", json!({"rect": [220, 72, 300, 200]})).unwrap()["id"].as_u64().unwrap();
+    app.run("object.fill", json!({"swatch": CYAN, "ids": [a]})).unwrap();
+    app.run("object.fill", json!({"swatch": "[Black]", "ids": [b]})).unwrap();
+    app.run("selection.set", json!({"ids": [a, b]})).unwrap();
+    let mut h = panel(app);
+    h.get_by_label("Fill swatch").click();
+    h.run_steps(3);
+    let row = h.get_by_label("Tint:").rect();
+    h.query_all_by(|n| n.role() == egui::accesskit::Role::TextInput && n.value().as_deref() == Some("100%"))
+        .find(|n| (n.rect().center().y - row.center().y).abs() < 8.0)
+        .expect("the Tint field")
+        .click();
+    h.run_steps(2);
+    h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
+    h.event(egui::Event::Text("25".into()));
+    h.key_press(egui::Key::Enter);
+    h.run_steps(3);
+    let doc = &h.state().session.active().unwrap().doc;
+    let fill = |id: u64| doc.item(designcraft_doc::ids::ItemId(id)).unwrap().fill.clone();
+    assert_eq!((fill(a).swatch.as_str(), fill(a).tint), (CYAN, 0.25));
+    assert_eq!((fill(b).swatch.as_str(), fill(b).tint), ("[Black]", 0.25), "the second keeps its own swatch");
+}
+
+#[test]
+fn apply_to_text_colours_a_text_frames_text_not_the_frame() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Heading"})).unwrap();
+    let (id, story) = (r["id"].as_u64().unwrap(), designcraft_doc::StoryId(r["story"].as_u64().unwrap()));
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    let mut h = panel(app);
+    h.get_by_label("Fill swatch").click();
+    h.run_steps(3);
+    h.get_by_label("Text").click();
+    h.run_steps(3);
+    h.get_by_label(CYAN).click();
+    h.run_steps(3);
+    let doc = &h.state().session.active().unwrap().doc;
+    assert_eq!(doc.story(story).unwrap().char_format_at(0).over.fill.as_deref(), Some(CYAN), "the text is cyan");
+    assert_eq!(doc.item(designcraft_doc::ids::ItemId(id)).unwrap().fill.swatch, "[None]", "the frame isn't");
+}
+
+#[test]
+fn transform_flips_and_rotates_from_properties() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let id = app.run("frame.create", json!({"rect": [72, 72, 300, 200]})).unwrap()["id"].as_u64().unwrap();
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    let mut h = panel(app);
+    let xf = |h: &Harness<'_, DesignApp>| h.state().session.active().unwrap().doc.item(designcraft_doc::ids::ItemId(id)).unwrap().xf;
+    // Flip Horizontal mirrors the frame (a negative determinant); Flip Vertical as well brings it
+    // back to a half turn, as in the tutorial's petal.
+    h.get_by_label("Flip Horizontal").click();
+    h.run_steps(3);
+    assert!(xf(&h).determinant() < 0.0, "{:?}", xf(&h));
+    h.get_by_label("Flip Vertical").click();
+    h.run_steps(3);
+    let c = xf(&h).as_coeffs();
+    assert!((c[0] + 1.0).abs() < 1e-9 && (c[3] + 1.0).abs() < 1e-9, "a half turn: {c:?}");
+    let info = h.state_mut().session.execute("transform.info", &json!({})).unwrap();
+    assert!((info["rotation"].as_f64().unwrap().abs() - 180.0).abs() < 1e-6, "{info}");
+    // A quarter turn clockwise from there.
+    h.get_by_label("Rotate 90° Clockwise").click();
+    h.run_steps(3);
+    let info = h.state_mut().session.execute("transform.info", &json!({})).unwrap();
+    assert!((info["rotation"].as_f64().unwrap() - 90.0).abs() < 1e-6, "{info}");
+    // The angle and scale fields are there.
+    assert!(h.query_by(|n| n.role() == egui::accesskit::Role::TextInput && n.value().as_deref() == Some("90°")).is_some());
+}
diff --git a/crates/ui-egui/src/panels/properties/text.rs b/crates/ui-egui/src/panels/properties/text.rs
new file mode 100644
index 000000000..342ad8dda
--- /dev/null
+++ b/crates/ui-egui/src/panels/properties/text.rs
@@ -0,0 +1,623 @@
+use super::object::swatch_menu;
+use super::typography::{para_field_min, show_typography_panel};
+use super::{
+    Align, DesignApp, FIELD_H, NumField, Rect, Sense, Stroke, StrokeKind, Tokens, Ui, Value, block, full_width, icon_toggle, icons, json, link_label,
+    more_options, outline_button, place, pos2, section, set_temp_bool, show_panel, sub, temp_bool, text_attrs, units, vec2, widgets,
+};
+
+// ---------------------------------------------------------------- Text
+
+pub(super) fn text_style_section(app: &mut DesignApp, ui: &mut Ui) {
+    let t = Tokens::get(ui.ctx());
+    section(ui, crate::i18n::tr(&app.ui.language, "Text Style"), true);
+    let Some(a) = text_attrs(app) else { return };
+    let tab = app.ui.text_style_tab;
+    let fw = full_width(ui);
+    if let Some(k) = widgets::segmented(
+        ui,
+        &[crate::i18n::tr(&app.ui.language, "Paragraph Styles"), crate::i18n::tr(&app.ui.language, "Character Styles")],
+        tab as usize,
+        fw,
+    ) {
+        app.ui.text_style_tab = k as u8;
+    }
+    ui.add_space(5.0);
+    let (names, cur): (Vec<String>, String) = {
+        let Some(st) = app.session.active() else { return };
+        if tab == 0 {
+            (
+                st.doc.styles.paragraph.iter().map(|p| p.name.clone()).filter(|n| n != designcraft_doc::NO_PARA_STYLE).collect(),
+                a["paragraphStyle"].as_str().unwrap_or("").to_string(),
+            )
+        } else {
+            (st.doc.styles.character.iter().map(|p| p.name.clone()).collect(), a["characterStyle"].as_str().unwrap_or("[None]").to_string())
+        }
+    };
+    let ov = if tab == 0 { a["paraOverrides"].as_u64().unwrap_or(0) + a["charOverrides"].as_u64().unwrap_or(0) } else { 0 };
+    let shown = crate::i18n::style_name(&app.ui.language, &cur);
+    let label = if ov > 0 { format!("{shown}+") } else { shown.to_string() };
+    let resp = widgets::dropdown_h(ui, "", fw, 34.0);
+    // The row paints its own swatch and name, so the dropdown itself has no text to name it.
+    let style_kind = crate::i18n::tr(&app.ui.language, if tab == 0 { "Paragraph Style" } else { "Character Style" }).to_owned();
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, true, &style_kind));
+    // "Ag" swatch + style name.
+    let ag = Rect::from_min_size(resp.rect.min + vec2(6.0, 6.0), vec2(22.0, 22.0));
+    ui.painter().rect_filled(ag, 1.0, egui::Color32::WHITE);
+    ui.painter().text(ag.center(), egui::Align2::CENTER_CENTER, "Ag", egui::FontId::new(13.0, egui::FontFamily::Proportional), egui::Color32::BLACK);
+    crate::rtl::paint(
+        &ui.painter().with_clip_rect(resp.rect.shrink2(vec2(20.0, 0.0))),
+        pos2(ag.max.x + 8.0, resp.rect.center().y),
+        egui::Align2::LEFT_CENTER,
+        &label,
+        egui::FontId::proportional(11.5),
+        t.text,
+    );
+    let mut pick = None;
+    egui::Popup::menu(&resp).show(|ui| {
+        ui.set_min_width(fw);
+        egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| {
+            for n in &names {
+                if ui.selectable_label(*n == cur, crate::rtl::widget(ui, crate::i18n::style_name(&app.ui.language, n))).clicked() {
+                    pick = Some(n.clone());
+                    ui.close();
+                }
+            }
+        });
+    });
+    if let Some(n) = pick {
+        if tab == 0 {
+            let _ = app.run("style.paragraph.apply", json!({"name": n, "clearOverrides": false}));
+        } else {
+            let _ = app.run("style.character.apply", json!({"name": n}));
+        }
+    }
+    ui.add_space(4.0);
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 8.0;
+        if icon_toggle(
+            ui,
+            "pilcrow-menu",
+            false,
+            crate::i18n::tr(&app.ui.language, if tab == 0 { "Paragraph Styles panel" } else { "Character Styles panel" }),
+        )
+        .clicked()
+        {
+            show_panel(app, if tab == 0 { "paragraphStyles" } else { "characterStyles" });
+        }
+        ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+            ui.spacing_mut().item_spacing.x = 12.0;
+            ui.add_space(4.0);
+            if icon_toggle(ui, "style-new", false, crate::i18n::tr(&app.ui.language, crate::i18n::tr(&app.ui.language, "Create new style"))).clicked()
+            {
+                let cmd = if tab == 0 { "style.paragraph.create" } else { "style.character.create" };
+                let _ = app.run(cmd, json!({}));
+            }
+            if icon_toggle(ui, "style-clear", false, crate::i18n::tr(&app.ui.language, crate::i18n::tr(&app.ui.language, "Clear overrides")))
+                .clicked()
+                && tab == 0
+                && !cur.is_empty()
+            {
+                let _ = app.run("style.paragraph.apply", json!({"name": cur, "clearOverrides": true}));
+            }
+            if icon_toggle(ui, "style-load", false, crate::i18n::tr(&app.ui.language, "Styles panel")).clicked() {
+                show_panel(app, if tab == 0 { "paragraphStyles" } else { "characterStyles" });
+            }
+        });
+    });
+}
+
+pub(super) fn text_appearance_section(app: &mut DesignApp, ui: &mut Ui) {
+    let t = Tokens::get(ui.ctx());
+    let Some(a) = text_attrs(app) else { return };
+    let Some(doc) = app.session.active().map(|d| d.doc.clone()) else { return };
+    let c = &a["chars"];
+    for (k, (key, label)) in [("fill", "Fill"), ("stroke", "Stroke")].into_iter().enumerate() {
+        let sw = c[key].as_str().unwrap_or(designcraft_color::swatch::NONE).to_string();
+        let b = block(ui, FIELD_H);
+        let (col, g) = widgets::swatch_colors(&doc, &sw, 1.0);
+        let chip = sub(b, 4.0, 2.0, 17.0, 17.0);
+        if k == 0 {
+            widgets::paint_chip(ui.painter(), chip, col, g);
+        } else {
+            widgets::paint_stroke_chip(ui.painter(), chip, col, egui::Color32::from_gray(20));
+        }
+        ui.painter().rect_stroke(chip, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
+        // The "T" marks text formatting.
+        let tc = if col.is_some_and(|c| c.r() as u32 + c.g() as u32 + c.b() as u32 > 380) { egui::Color32::BLACK } else { egui::Color32::WHITE };
+        if k == 0 {
+            ui.painter().text(chip.center(), egui::Align2::CENTER_CENTER, "T", crate::theme::semibold(12.0), tc);
+        }
+        let resp = ui.interact(chip, ui.scope_id().with(("tchip", k)), Sense::click()).on_hover_text(format!("{label}: {sw}"));
+        swatch_menu(app, &resp, &doc, &sw, k != 0, false, true);
+        if k == 0 {
+            crate::rtl::paint(
+                ui.painter(),
+                b.min + vec2(34.0, FIELD_H / 2.0),
+                egui::Align2::LEFT_CENTER,
+                crate::i18n::tr(&app.ui.language, label),
+                egui::FontId::proportional(11.5),
+                t.text,
+            );
+        } else {
+            if place(ui, sub(b, 34.0, 0.0, 56.0, FIELD_H), |ui| link_label(ui, crate::i18n::tr(&app.ui.language, label), 56.0)).clicked() {
+                show_panel(app, "stroke");
+            }
+            const WEIGHTS: &[f64] = &[0.0, 0.25, 0.5, 0.75, 1.0, 2.0, 3.0, 4.0, 5.0, 10.0];
+            if let Some(v) = place(ui, sub(b, 96.0, 0.0, 69.0, FIELD_H), |ui| {
+                NumField::number("tsw", c["strokeWeight"].as_f64(), " pt", 3).width(69.0).spinner().presets(WEIGHTS).range(0.0, 100.0).show(ui)
+            }) {
+                let _ = app.run("type.char", json!({"attrs": {"strokeWeight": v}}));
+            }
+        }
+        ui.add_space(4.0);
+    }
+    let mut behind = c["strokeBehindFill"].as_bool().unwrap_or(false);
+    if ui.checkbox(&mut behind, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Stroke Behind Fill"))).changed() {
+        let _ = app.run("type.char", json!({"attrs": {"strokeBehindFill": behind}}));
+    }
+}
+
+/// Character section: font family (with search), style, size/leading, kerning/tracking, •••.
+pub(super) fn character_section(app: &mut DesignApp, ui: &mut Ui) {
+    let t = Tokens::get(ui.ctx());
+    let Some(a) = text_attrs(app) else { return };
+    let c = a["chars"].clone();
+    let fam = c["fontFamily"].as_str().unwrap_or("").to_string();
+    let sty = c["fontStyle"].as_str().unwrap_or("").to_string();
+    let fw = full_width(ui);
+    // Family dropdown with a search segment on the left.
+    let fonts = crate::panels::fonts(app);
+    let menu = crate::panels::font_menu(app);
+    let resp = widgets::dropdown(ui, "", fw);
+    // A painted search icon and family name, as in the font menus: name the field itself.
+    let family_label = crate::i18n::tr(&app.ui.language, "Font Family:").to_owned();
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, true, &family_label));
+    let r = resp.rect;
+    icons::paint(ui.painter(), Rect::from_min_size(r.min + vec2(3.0, 3.0), vec2(14.0, 14.0)), "search", t.icon);
+    widgets::chevron_down(ui.painter(), r.min + vec2(22.0, 10.5), t.icon);
+    ui.painter().text(
+        r.min + vec2(30.0, 10.5),
+        egui::Align2::LEFT_CENTER,
+        if fam.is_empty() { "—".to_string() } else { crate::panels::font_label(app, &menu, &fam) },
+        egui::FontId::proportional(11.5),
+        t.text,
+    );
+    if let Some(f) = crate::panels::font_popup(app, ui, &resp, &menu, &fam) {
+        crate::panels::apply_font(app, &f);
+    }
+    ui.add_space(1.0);
+    let styles = fonts.styles(&fam);
+    let cur = styles.iter().position(|s| *s == sty);
+    if let Some(k) = widgets::dropdown_list(ui, if sty.is_empty() { "—" } else { &sty }, fw, &styles, cur) {
+        let _ = app.run("type.char", json!({"attrs": {"fontStyle": styles[k]}}));
+    }
+    ui.add_space(1.0);
+    const SIZES: &[f64] = &[6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 14.0, 18.0, 21.0, 24.0, 30.0, 36.0, 48.0, 60.0, 72.0];
+    let half = (fw - 10.0) / 2.0;
+    let b = block(ui, 2.0 * FIELD_H + 5.0);
+    let size = c["size"].as_f64();
+    let auto = c["leading"]["kind"].as_str() != Some("points");
+    let lv = if auto { size.map(|s| s * a["para"]["autoLeading"].as_f64().unwrap_or(1.2)) } else { c["leading"]["value"].as_f64() };
+    icons::paint(ui.painter(), sub(b, 0.0, 1.0, 19.0, 19.0), "font-size", t.icon);
+    if let Some(v) = place(ui, sub(b, 24.0, 0.0, half - 24.0, FIELD_H), |ui| {
+        NumField::number("csize", size, " pt", 2).width(half - 24.0).spinner().presets(SIZES).range(0.1, 1296.0).show(ui)
+    }) {
+        let _ = app.run("type.char", json!({"attrs": {"size": v}}));
+    }
+    icons::paint(ui.painter(), sub(b, half + 10.0, 1.0, 19.0, 19.0), "leading", t.icon);
+    let lw = half - 24.0;
+    let lshow = lv.map(|v| (v * 100.0).round() / 100.0);
+    if let Some(v) = place(ui, sub(b, half + 34.0, 0.0, lw, FIELD_H), |ui| {
+        let key = if auto { "cleadauto" } else { "clead" };
+        // Auto leading is shown in parentheses, like "(14.4 pt)".
+        NumField::number(key, lshow, " pt", 2).width(lw).spinner().presets(SIZES).range(0.0, 5000.0).parens(auto).show(ui)
+    }) {
+        let _ = app.run("type.char", json!({"attrs": {"leading": {"kind": "points", "value": v}}}));
+    }
+    // Kerning / tracking.
+    icons::paint(ui.painter(), sub(b, 0.0, 27.0, 19.0, 19.0), "kerning", t.icon);
+    place(ui, sub(b, 24.0, 26.0, half - 24.0, FIELD_H), |ui| kerning_control(app, ui, "ckern", &c["kerning"], half - 24.0));
+    icons::paint(ui.painter(), sub(b, half + 10.0, 27.0, 19.0, 19.0), "tracking", t.icon);
+    const TRACK: &[f64] = &[-100.0, -75.0, -50.0, -25.0, -10.0, -5.0, 0.0, 5.0, 10.0, 25.0, 50.0, 75.0, 100.0, 200.0];
+    if let Some(v) = place(ui, sub(b, half + 34.0, 26.0, lw, FIELD_H), |ui| {
+        NumField::number("ctrack", c["tracking"].as_f64(), "", 0).width(lw).spinner().presets(TRACK).step(5.0).range(-1000.0, 10000.0).show(ui)
+    }) {
+        let _ = app.run("type.char", json!({"attrs": {"tracking": v}}));
+    }
+    // ••• shows the rest in place, as InDesign's Properties panel does.
+    let more = temp_bool(ui, "props_char_more", false);
+    if more {
+        character_more(app, ui, &c, fw);
+    }
+    if more_options(ui, &app.ui.language).clicked() {
+        set_temp_bool(ui, "props_char_more", !more);
+    }
+}
+
+/// A percentage or other number field in one half of a two-field row, with its icon.
+#[allow(clippy::too_many_arguments)]
+pub(super) fn half_field(ui: &mut Ui, b: Rect, right: bool, y: f32, half: f32, icon: &str, tip: &str, field: NumField) -> Option<f64> {
+    half_field_or_clear(ui, b, right, y, half, icon, tip, field).flatten()
+}
+
+/// [`half_field`] for a value that may be unset: emptying the field commits `Some(None)`.
+#[allow(clippy::too_many_arguments)]
+pub(super) fn half_field_or_clear(
+    ui: &mut Ui,
+    b: Rect,
+    right: bool,
+    y: f32,
+    half: f32,
+    icon: &str,
+    tip: &str,
+    field: NumField,
+) -> Option<Option<f64>> {
+    let t = Tokens::get(ui.ctx());
+    let x = if right { half + 10.0 } else { 0.0 };
+    let ir = sub(b, x, y + 1.0, 19.0, 19.0);
+    icons::paint(ui.painter(), ir, icon, t.icon);
+    let resp = ui.interact(ir, ui.scope_id().with(("half_icon", icon)), Sense::hover());
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, tip));
+    let label = resp.id;
+    resp.on_hover_text(tip);
+    place(ui, sub(b, x + 24.0, y, half - 24.0, FIELD_H), |ui| field.width(half - 24.0).labelled_by(label).show_or_clear(ui))
+}
+
+/// Properties › Character after •••: vertical and horizontal scale, baseline shift and skew,
+/// language and OpenType, then All Caps, Small Caps, Superscript, Subscript, Underline and
+/// Strikethrough, as InDesign lays them out.
+fn character_more(app: &mut DesignApp, ui: &mut Ui, c: &Value, fw: f32) {
+    let lang_ui = app.ui.language.clone();
+    let tr = |s: &str| crate::i18n::tr(&lang_ui, s).to_string();
+    let half = (fw - 10.0) / 2.0;
+    let b = block(ui, 2.0 * FIELD_H + 5.0);
+    const SCALES: &[f64] = &[25.0, 50.0, 75.0, 80.0, 90.0, 100.0, 110.0, 120.0, 125.0, 150.0, 200.0];
+    let pct = |v: &Value| v.as_f64().map(|s| (s * 1000.0).round() / 10.0);
+    let field = |id, v, suffix, decimals| NumField::number(id, v, suffix, decimals).spinner();
+    if let Some(v) = half_field(
+        ui,
+        b,
+        false,
+        0.0,
+        half,
+        "vscale",
+        &tr("Vertical Scale"),
+        field("cvscale", pct(&c["vScale"]), "%", 1).presets(SCALES).range(1.0, 1000.0),
+    ) {
+        let _ = app.run("type.char", json!({"attrs": {"vScale": v / 100.0}}));
+    }
+    if let Some(v) = half_field(
+        ui,
+        b,
+        true,
+        0.0,
+        half,
+        "hscale",
+        &tr("Horizontal Scale"),
+        field("chscale", pct(&c["hScale"]), "%", 1).presets(SCALES).range(1.0, 1000.0),
+    ) {
+        let _ = app.run("type.char", json!({"attrs": {"hScale": v / 100.0}}));
+    }
+    if let Some(v) = half_field(
+        ui,
+        b,
+        false,
+        26.0,
+        half,
+        "baseline-shift",
+        &tr("Baseline Shift"),
+        field("cbshift", c["baselineShift"].as_f64(), " pt", 2).range(-5000.0, 5000.0),
+    ) {
+        let _ = app.run("type.char", json!({"attrs": {"baselineShift": v}}));
+    }
+    if let Some(v) =
+        half_field(ui, b, true, 26.0, half, "skew", &tr("Skew (False Italic)"), field("cskew", c["skew"].as_f64(), "°", 1).range(-85.0, 85.0))
+    {
+        let _ = app.run("type.char", json!({"attrs": {"skew": v}}));
+    }
+    // Language (hyphenation, spelling and typographer's quotes follow it) and OpenType.
+    ui.add_space(4.0);
+    let lang = c["language"].as_str().unwrap_or("English: USA").to_string();
+    let label = tr("Language");
+    let row = block(ui, FIELD_H);
+    let resp = place(ui, sub(row, 0.0, 0.0, half, FIELD_H), |ui| widgets::dropdown(ui, crate::i18n::tr(&lang_ui, &lang), half)).on_hover_ui(|ui| {
+        crate::rtl::label(ui, label.clone());
+    });
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, true, &label));
+    egui::Popup::menu(&resp).show(|ui| {
+        ui.set_min_width(half);
+        egui::ScrollArea::vertical().max_height(320.0).show(ui, |ui| language_menu(app, ui, &lang));
+    });
+    if place(ui, sub(row, half + 10.0, 0.0, half, FIELD_H), |ui| widgets::outline_button(ui, &tr("OpenType"), half)).clicked() {
+        show_typography_panel(app);
+    }
+    // The case and position buttons.
+    ui.add_space(8.0);
+    let caps = c["capitalization"].as_str().unwrap_or("normal").to_string();
+    let pos = c["position"].as_str().unwrap_or("normal").to_string();
+    let (ul, st) = (c["underline"].as_bool().unwrap_or(false), c["strikethrough"].as_bool().unwrap_or(false));
+    let buttons: [(&str, &str, bool, Value); 6] = [
+        ("TT", "All Caps", caps == "allCaps", json!({"capitalization": if caps == "allCaps" { "normal" } else { "allCaps" }})),
+        ("small-caps", "Small Caps", caps == "smallCaps", json!({"capitalization": if caps == "smallCaps" { "normal" } else { "smallCaps" }})),
+        ("T¹", "Superscript", pos == "superscript", json!({"position": if pos == "superscript" { "normal" } else { "superscript" }})),
+        ("T₁", "Subscript", pos == "subscript", json!({"position": if pos == "subscript" { "normal" } else { "subscript" }})),
+        ("T̲", "Underline", ul, json!({"underline": !ul})),
+        ("T", "Strikethrough", st, json!({"strikethrough": !st})),
+    ];
+    let pitch = fw / 6.0;
+    let row = block(ui, 22.0);
+    for (i, (text, tip, on, attrs)) in buttons.into_iter().enumerate() {
+        let r = Rect::from_center_size(row.min + vec2(pitch * (i as f32 + 0.5), 11.0), vec2(26.0, 22.0));
+        let resp = ui.interact(r, ui.scope_id().with(("case", i)), Sense::click());
+        let t = Tokens::get(ui.ctx());
+        if on {
+            ui.painter().rect_filled(r, 2.0, t.tool_active);
+        } else if resp.hovered() {
+            ui.painter().rect_filled(r, 2.0, t.hover);
+        }
+        let col = if on { t.text_strong } else { t.icon };
+        if text == "small-caps" {
+            crate::icons::paint(ui.painter(), r, "small-caps", col);
+        } else {
+            ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, text, egui::FontId::proportional(13.0), col);
+        }
+        // Strikethrough: the T struck through (a combining stroke doesn't draw in every font).
+        if i == 5 {
+            ui.painter().line_segment([r.center() + vec2(-6.0, 0.5), r.center() + vec2(6.0, 0.5)], Stroke::new(1.2, col));
+        }
+        let tip = tr(tip);
+        resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, on, &tip));
+        if resp.on_hover_text(&tip).clicked() {
+            let _ = app.run("type.char", json!({"attrs": attrs}));
+        }
+    }
+    ui.add_space(4.0);
+}
+
+/// Paragraph section: the 9 alignment buttons and •••.
+pub(super) fn paragraph_section(app: &mut DesignApp, ui: &mut Ui) {
+    let Some(a) = text_attrs(app) else { return };
+    let cur: Align = serde_json::from_value(a["para"]["align"].clone()).unwrap_or_default();
+    let fw = full_width(ui);
+    let pitch = fw / 9.0;
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 0.0;
+        for (al, icon) in [
+            (Align::Left, "palign-left"),
+            (Align::Center, "palign-center"),
+            (Align::Right, "palign-right"),
+            (Align::LeftJustified, "palign-justify-left"),
+            (Align::CenterJustified, "palign-justify-center"),
+            (Align::RightJustified, "palign-justify-right"),
+            (Align::FullyJustified, "palign-justify-all"),
+            (Align::TowardsSpine, "palign-spine-towards"),
+            (Align::AwayFromSpine, "palign-spine-away"),
+        ] {
+            if widgets::icon_toggle_sized(ui, icon, cur == al, al.label(), vec2(pitch.min(23.0), 21.0)).clicked() {
+                let _ = app.run("type.para", json!({"attrs": {"align": al}}));
+            }
+            if pitch > 23.0 {
+                ui.add_space(pitch - 23.0);
+            }
+        }
+    });
+    let more = temp_bool(ui, "props_para_more", false);
+    if more {
+        paragraph_more(app, ui, &a["para"], fw);
+    }
+    if more_options(ui, &app.ui.language).clicked() {
+        set_temp_bool(ui, "props_para_more", !more);
+    }
+}
+
+/// Properties › Paragraph after •••: left and right indent, first line and last line indent,
+/// space before and after, drop cap lines and characters, then Hyphenate and Align to Baseline
+/// Grid, as InDesign lays them out.
+fn paragraph_more(app: &mut DesignApp, ui: &mut Ui, p: &Value, fw: f32) {
+    let lang_ui = app.ui.language.clone();
+    let tr = |s: &str| crate::i18n::tr(&lang_ui, s).to_string();
+    let u = units(app);
+    let half = (fw - 10.0) / 2.0;
+    ui.add_space(4.0);
+    let b = block(ui, 4.0 * FIELD_H + 15.0);
+    let rows = [
+        (("indent-left", "Left Indent", "leftIndent"), ("indent-right", "Right Indent", "rightIndent")),
+        (("indent-first", "First Line Left Indent", "firstLineIndent"), ("indent-last", "Last Line Right Indent", "lastLineIndent")),
+        (("space-before", "Space Before", "spaceBefore"), ("space-after", "Space After", "spaceAfter")),
+    ];
+    for (i, (l, r)) in rows.into_iter().enumerate() {
+        let y = i as f32 * (FIELD_H + 5.0);
+        for (right, (icon, tip, key)) in [(false, l), (true, r)] {
+            let min = para_field_min(key);
+            let field = NumField::measure(key, p[key].as_f64(), u).spinner().range(min, 10_000.0);
+            if let Some(v) = half_field(ui, b, right, y, half, icon, &tr(tip), field) {
+                let _ = app.run("type.para", json!({"attrs": {key: v}}));
+            }
+        }
+    }
+    let y = 3.0 * (FIELD_H + 5.0);
+    for (right, icon, tip, key, max) in [
+        (false, "drop-lines", "Drop Cap Number of Lines", "dropCapLines", designcraft_compose::MAX_DROP_CAP_LINES),
+        (true, "drop-chars", "Drop Cap One or More Characters", "dropCapChars", designcraft_compose::MAX_DROP_CAP_CHARS),
+    ] {
+        let field = NumField::number(key, p[key].as_f64(), "", 0).spinner().range(0.0, max as f64);
+        if let Some(v) = half_field(ui, b, right, y, half, icon, &tr(tip), field) {
+            let _ = app.run("type.para", json!({"attrs": {key: (v.max(0.0) as u64).min(max as u64)}}));
+        }
+    }
+    ui.add_space(4.0);
+    ui.horizontal(|ui| {
+        // First Line Only is aligned too: the button shows it pressed, and a click turns alignment off.
+        let grid = matches!(p["gridAlign"].as_str(), Some("allLines" | "firstLineOnly"));
+        if widgets::icon_toggle(ui, "grid-baseline", grid, &tr("Align to Baseline Grid")).clicked() {
+            let _ = app.run("type.para", json!({"attrs": {"gridAlign": if grid { "none" } else { "allLines" }}}));
+        }
+        ui.add_space(12.0);
+        let mut h = p["hyphenate"].as_bool().unwrap_or(true);
+        if widgets::checkbox(ui, &mut h, &tr("Hyphenate")).changed() {
+            let _ = app.run("type.para", json!({"attrs": {"hyphenate": h}}));
+        }
+    });
+    ui.add_space(4.0);
+}
+
+pub(super) fn bullets_section(app: &mut DesignApp, ui: &mut Ui) {
+    if text_attrs(app).is_none() {
+        return;
+    }
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 10.0;
+        // As InDesign's: a list with the default hanging indent, or (pressed: every selected
+        // paragraph has it, as Type › Apply Bullets shows) no list.
+        use designcraft_doc::ListType;
+        for (icon, kind, cmd, tip) in
+            [("bullets", ListType::Bullets, "list.bullets", "Bulleted List"), ("numbering", ListType::Numbers, "list.numbers", "Numbered List")]
+        {
+            let on = app.session.selection_has_list(kind);
+            if icon_toggle(ui, icon, on, crate::i18n::tr(&app.ui.language, tip)).clicked() {
+                let _ = app.run(cmd, json!({"on": !on}));
+            }
+        }
+        ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+            ui.add_space(8.0);
+            if outline_button(ui, crate::i18n::tr(&app.ui.language, "Options"), 66.0).clicked() {
+                show_panel(app, "paragraph");
+            }
+        });
+    });
+}
+
+pub(super) fn quick_actions_text(app: &mut DesignApp, ui: &mut Ui) {
+    let fw = full_width(ui);
+    let hw = (fw - 10.0) / 2.0;
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 10.0;
+        let r = outline_button(ui, crate::i18n::tr(&app.ui.language, "Change Case"), hw);
+        egui::Popup::menu(&r).show(|ui| {
+            for (label, v) in [("UPPERCASE", "allCaps"), ("Small Caps", "smallCaps"), ("Normal", "normal")] {
+                if ui.button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, label))).clicked() {
+                    let _ = app.run("type.char", json!({"attrs": {"capitalization": v}}));
+                    ui.close();
+                }
+            }
+        });
+        if outline_button(ui, crate::i18n::tr(&app.ui.language, "Story Editor"), hw).clicked() {
+            let _ = app.run("app.storyEditor", json!({}));
+        }
+    });
+    ui.add_space(4.0);
+    if outline_button(ui, crate::i18n::tr(&app.ui.language, "Fill with Placeholder Text"), fw).clicked() {
+        let _ = app.run("type.fillWithPlaceholder", json!({}));
+    }
+}
+
+/// Text Frame section: columns, gutter, [Options].
+pub(super) fn text_frame_section(app: &mut DesignApp, ui: &mut Ui) {
+    let t = Tokens::get(ui.ctx());
+    let u = units(app);
+    let Some(st) = app.session.active() else { return };
+    let fid = st.selection.items.first().copied().or_else(|| st.selection.text.and_then(|t| t.frame));
+    let Some(opts) = fid.and_then(|f| st.doc.item(f)).and_then(|i| i.text_frame()).map(|t| t.options.clone()) else { return };
+    let b = block(ui, FIELD_H);
+    icons::paint(ui.painter(), sub(b, 0.0, 1.0, 19.0, 19.0), "text-columns", t.icon);
+    if let Some(v) = place(ui, sub(b, 22.0, 0.0, 54.0, FIELD_H), |ui| {
+        NumField::number("tfcols", Some(opts.columns as f64), "", 0).width(54.0).spinner().range(1.0, 40.0).show(ui)
+    }) {
+        let _ = app.run("object.textFrameOptions", json!({"columns": v.max(1.0) as u64}));
+    }
+    icons::paint(ui.painter(), sub(b, 83.0, 1.0, 19.0, 19.0), "text-gutter", t.icon);
+    if let Some(v) = place(ui, sub(b, 105.0, 0.0, 54.0, FIELD_H), |ui| {
+        NumField::measure("tfgut", Some(opts.gutter), u).width(54.0).spinner().range(0.0, 1440.0).show(ui)
+    }) {
+        let _ = app.run("object.textFrameOptions", json!({"gutter": v}));
+    }
+    let ow = (b.max.x - 8.0) - (b.min.x + 164.0);
+    if place(ui, sub(b, 164.0, 0.5, ow, 20.0), |ui| outline_button(ui, crate::i18n::tr(&app.ui.language, "Options"), ow)).clicked() {
+        app.ui.dialog = Some(crate::dialogs::Dialog::new("textFrameOptions", json!({})));
+    }
+}
+
+/// Languages offered for text (InDesign-style names).
+pub(crate) const LANGUAGES: &[&str] = &[
+    "[No Language]",
+    "English: USA",
+    "English: UK",
+    "English: Canadian",
+    "German: 2006 Reform",
+    "German: Swiss 2006 Reform",
+    "French",
+    "French: Canadian",
+    "Spanish",
+    "Italian",
+    "Portuguese",
+    "Portuguese: Brazilian",
+    "Dutch: 2005 Reform",
+    "Danish",
+    "Swedish",
+    "Norwegian: Bokmål",
+    "Finnish",
+    "Polish",
+    "Czech",
+    "Hungarian",
+    "Greek",
+    "Russian",
+    "Ukrainian",
+    "Georgian",
+    "Turkish",
+    "Japanese",
+    "Chinese",
+    "Chinese: Simplified",
+    "Chinese: Traditional",
+    "Korean",
+    "Arabic",
+    "Hebrew",
+];
+
+/// The Language list (Character panel, Properties ▸ Character): picking one sets the language of
+/// the selected text.
+pub(crate) fn language_menu(app: &mut DesignApp, ui: &mut Ui, cur: &str) {
+    for l in LANGUAGES {
+        if ui.selectable_label(*l == cur, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, l))).clicked() {
+            let _ = app.run("type.char", json!({"attrs": {"language": l}}));
+            ui.close();
+        }
+    }
+}
+
+/// Kerning for the text selection, or at a caret for the pair at the caret: the label shows
+/// Metrics, Optical, 0 or the manual value; its menu sets one of the first three or a manual value
+/// in 1/1000 em (typed or stepped).
+pub(crate) fn kerning_control(app: &mut DesignApp, ui: &mut egui::Ui, id: &str, k: &Value, width: f32) {
+    let kind = k["kind"].as_str().unwrap_or("metrics");
+    let manual = k["value"].as_f64().filter(|v| kind == "manual" && v.is_finite());
+    let label = match (kind, manual) {
+        ("optical", _) => "Optical".to_string(),
+        ("none", _) => "0".to_string(),
+        ("manual", Some(v)) => format!("{v}"),
+        _ => "Metrics".to_string(),
+    };
+    let resp = widgets::dropdown(ui, crate::i18n::tr(&app.ui.language, &label), width);
+    let name = crate::i18n::tr(&app.ui.language, "Kerning");
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, true, name));
+    egui::Popup::menu(&resp).close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside).show(|ui| {
+        for (text, v) in [("Metrics", json!({"kind": "metrics"})), ("Optical", json!({"kind": "optical"})), ("0", json!({"kind": "none"}))] {
+            if ui.selectable_label(label == text, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, text))).clicked() {
+                let _ = app.run("type.kernPair", json!({"kerning": v}));
+                ui.close();
+            }
+        }
+        ui.separator();
+        // A manual value in 1/1000 em: after each selected character, or between the two at a caret.
+        let field = format!("{id}_manual");
+        if let Some(v) = NumField::number(&field, Some(manual.unwrap_or(0.0)), "", 0)
+            .name("Manual Kerning")
+            .width(90.0)
+            .spinner()
+            .step(5.0)
+            .range(-1000.0, 10000.0)
+            .show(ui)
+        {
+            let _ = app.run("type.kernPair", json!({"kerning": {"kind": "manual", "value": v}}));
+        }
+    });
+}
diff --git a/crates/ui-egui/src/panels/properties/typography.rs b/crates/ui-egui/src/panels/properties/typography.rs
new file mode 100644
index 000000000..d4959c406
--- /dev/null
+++ b/crates/ui-egui/src/panels/properties/typography.rs
@@ -0,0 +1,569 @@
+use super::text::{half_field, half_field_or_clear, kerning_control, language_menu};
+use super::{
+    Align, DesignApp, FIELD_H, NumField, Sense, Tokens, Ui, Value, block, caption, full_width, json, number, place, pos2, sub, text_attrs, units,
+    vec2, widgets,
+};
+
+pub fn character_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let Some(a) = text_attrs(app) else {
+        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Select text or a text frame."));
+        return;
+    };
+    let c = a["chars"].clone();
+    let fam = c["fontFamily"].as_str().unwrap_or("").to_string();
+    let sty = c["fontStyle"].as_str().unwrap_or("").to_string();
+    crate::panels::font_family_picker(app, ui, &fam, 220.0);
+    crate::panels::font_style_picker(app, ui, &fam, &sty, 220.0);
+    variable_font_axes(app, ui, &fam, &sty);
+    // Language: hyphenation, spelling and typographer's quotes follow it.
+    let lang = c["language"].as_str().unwrap_or("English: USA").to_string();
+    ui.horizontal(|ui| {
+        caption(ui, crate::i18n::tr(&app.ui.language, "Language"));
+        let combo = craft_ui::ComboBox::from_id_salt("char_language")
+            .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, &lang)))
+            .width(170.0)
+            .show_ui(ui, |ui| language_menu(app, ui, &lang));
+        let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Language"));
+    });
+    // Digits (World-Ready): how the figures 0-9 are drawn (Arabic 0123, Hindi ٠١٢٣, Farsi ۰۱۲۳).
+    let digits = c["digits"].as_str().unwrap_or("default").to_string();
+    ui.horizontal(|ui| {
+        caption(ui, crate::i18n::tr(&app.ui.language, "Digits"));
+        let cur = DIGIT_OPTIONS
+            .iter()
+            .find(|o| o.0 == digits)
+            .map_or_else(|| digit_label(&app.ui.language, DIGIT_OPTIONS[0]), |o| digit_label(&app.ui.language, *o));
+        let combo = craft_ui::ComboBox::from_id_salt("char_digits").selected_text(crate::rtl::widget(ui, cur)).width(150.0).show_ui(ui, |ui| {
+            for o in DIGIT_OPTIONS {
+                if ui.selectable_label(o.0 == digits, crate::rtl::widget(ui, digit_label(&app.ui.language, o))).clicked() {
+                    let _ = app.run("type.char", json!({"attrs": {"digits": o.0}}));
+                }
+            }
+        });
+        let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Digits"));
+    });
+    // Two columns: Size, Kerning and Baseline on the left, Leading and Tracking on the right. A
+    // column's captions share the width of its widest one and each field takes the rest of the
+    // column, so they line up.
+    let auto = c["leading"]["kind"].as_str() != Some("points");
+    let lv = if auto { c["size"].as_f64().map(|s| s * a["para"]["autoLeading"].as_f64().unwrap_or(1.2)) } else { c["leading"]["value"].as_f64() };
+    let (left_w, right_w) = (caption_width(app, ui, &["Size", "Kerning", "Baseline"]), caption_width(app, ui, &["Leading", "Tracking"]));
+    ui.columns(2, |cols| {
+        let [left, right] = cols else { return };
+        if let Some(v) = char_field(app, left, "Size", left_w, NumField::number("pcs", c["size"].as_f64(), " pt", 2)) {
+            let _ = app.run("type.char", json!({"attrs": {"size": v}}));
+        }
+        left.horizontal(|ui| {
+            caption_cell(ui, crate::i18n::tr(&app.ui.language, "Kerning"), left_w);
+            let width = (ui.available_width() - ui.spacing().item_spacing.x).max(40.0);
+            kerning_control(app, ui, "pck", &c["kerning"], width);
+        });
+        if let Some(v) = char_field(app, left, "Baseline", left_w, NumField::number("pcb", c["baselineShift"].as_f64(), " pt", 2)) {
+            let _ = app.run("type.char", json!({"attrs": {"baselineShift": v}}));
+        }
+        // Auto leading is shown in parentheses, as the Paragraph panel shows it.
+        if let Some(v) = char_field(app, right, "Leading", right_w, NumField::number("pcl", lv, " pt", 2).parens(auto)) {
+            let _ = app.run("type.char", json!({"attrs": {"leading": {"kind": "points", "value": v}}}));
+        }
+        if let Some(v) = char_field(app, right, "Tracking", right_w, NumField::number("pct", c["tracking"].as_f64(), "", 0)) {
+            let _ = app.run("type.char", json!({"attrs": {"tracking": v}}));
+        }
+    });
+    ui.horizontal(|ui| {
+        caption(ui, crate::i18n::tr(&app.ui.language, "Color:"));
+        crate::panels::swatch_picker(app, ui, "tfill", c["fill"].as_str().map(str::to_string), |app, n| {
+            let _ = app.run("type.char", json!({"attrs": {"fill": n}}));
+        });
+        crate::rtl::label(ui, c["fill"].as_str().unwrap_or(""));
+    });
+    ui.horizontal(|ui| {
+        // Bold and Italic pick the family's own styles (style linking).
+        let (weight, italic) =
+            crate::panels::fonts(app).traits_of(c["fontFamily"].as_str().unwrap_or_default(), c["fontStyle"].as_str().unwrap_or_default());
+        let tip = |app: &DesignApp, name: &str, id: &str| {
+            let name = crate::i18n::tr(&app.ui.language, name);
+            match crate::menus::shortcut_of(app, id) {
+                Some(sc) => format!("{name} ({})", crate::menus::shortcut_text(&sc)),
+                None => name.to_string(),
+            }
+        };
+        let (bold_tip, italic_tip) = (tip(app, "Bold", "type.bold"), tip(app, "Italic", "type.italic"));
+        if ui
+            .selectable_label(weight >= 650.0, egui::RichText::new("B").strong())
+            .on_hover_ui(|ui| {
+                crate::rtl::label(ui, bold_tip);
+            })
+            .clicked()
+        {
+            let _ = app.run("type.bold", json!({}));
+        }
+        if ui
+            .selectable_label(italic, egui::RichText::new("I").italics())
+            .on_hover_ui(|ui| {
+                crate::rtl::label(ui, italic_tip);
+            })
+            .clicked()
+        {
+            let _ = app.run("type.italic", json!({}));
+        }
+        let caps = c["capitalization"].as_str() == Some("allCaps");
+        if ui
+            .selectable_label(caps, "TT")
+            .on_hover_ui(|ui| {
+                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "All Caps"));
+            })
+            .clicked()
+        {
+            let _ = app.run("type.char", json!({"attrs": {"capitalization": if caps { "normal" } else { "allCaps" }}}));
+        }
+        let ul = c["underline"].as_bool().unwrap_or(false);
+        if ui
+            .selectable_label(ul, "U")
+            .on_hover_ui(|ui| {
+                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Underline"));
+            })
+            .clicked()
+        {
+            let _ = app.run("type.char", json!({"attrs": {"underline": !ul}}));
+        }
+        let st = c["strikethrough"].as_bool().unwrap_or(false);
+        if ui
+            .selectable_label(st, "S")
+            .on_hover_ui(|ui| {
+                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Strikethrough"));
+            })
+            .clicked()
+        {
+            let _ = app.run("type.char", json!({"attrs": {"strikethrough": !st}}));
+        }
+        let sup = c["position"].as_str() == Some("superscript");
+        if ui
+            .selectable_label(sup, "T¹")
+            .on_hover_ui(|ui| {
+                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Superscript"));
+            })
+            .clicked()
+        {
+            let _ = app.run("type.char", json!({"attrs": {"position": if sup { "normal" } else { "superscript" }}}));
+        }
+        if ui
+            .button(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "OpenType")))
+            .on_hover_ui(|ui| {
+                crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Show the Typography panel"));
+            })
+            .clicked()
+        {
+            show_typography_panel(app);
+        }
+    });
+    // Underline / Strikethrough Options.
+    for (key, title) in [("underline", "Underline Options"), ("strikethrough", "Strikethrough Options")] {
+        if !c[key].as_bool().unwrap_or(false) {
+            continue;
+        }
+        egui::CollapsingHeader::new(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, title))).id_salt(key).show(ui, |ui| {
+            let size = c["size"].as_f64().unwrap_or(12.0);
+            let auto_off = if key == "underline" { size * 0.12 } else { size * 0.3 };
+            egui::Grid::new((key, "opts")).num_columns(4).spacing(vec2(6.0, 4.0)).show(ui, |ui| {
+                caption(ui, crate::i18n::tr(&app.ui.language, "Weight"));
+                let w = c[format!("{key}Weight")].as_f64().unwrap_or(size / 14.0);
+                if let Some(v) = number(ui, &format!("{key}w"), Some(w), " pt", 60.0, 2) {
+                    let _ = app.run("type.char", json!({"attrs": {format!("{key}Weight"): v.max(0.0)}}));
+                }
+                caption(ui, crate::i18n::tr(&app.ui.language, "Offset"));
+                let o = c[format!("{key}Offset")].as_f64().unwrap_or(auto_off);
+                if let Some(v) = number(ui, &format!("{key}o"), Some(o), " pt", 60.0, 2) {
+                    let _ = app.run("type.char", json!({"attrs": {format!("{key}Offset"): v}}));
+                }
+                ui.end_row();
+            });
+            ui.horizontal(|ui| {
+                caption(ui, crate::i18n::tr(&app.ui.language, "Color:"));
+                let cur = c[format!("{key}Color")].as_str().filter(|s| !s.is_empty()).map(str::to_string);
+                crate::panels::swatch_picker(app, ui, &format!("{key}c"), cur.clone(), |app, n| {
+                    let _ = app.run("type.char", json!({"attrs": {format!("{key}Color"): n}}));
+                });
+                crate::rtl::label(ui, cur.unwrap_or_else(|| crate::i18n::tr(&app.ui.language, "(Text Color)").into()));
+            });
+        });
+    }
+}
+
+/// Opens the Typography panel, or brings it to the front when it is already open.
+pub fn show_typography_panel(app: &mut DesignApp) {
+    let _ = app.run("window.panel", json!({"panel": "typography"}));
+}
+
+/// The paragraph alignments in InDesign's order, with their icons.
+const PARA_ALIGNS: [(Align, &str); 9] = [
+    (Align::Left, "palign-left"),
+    (Align::Center, "palign-center"),
+    (Align::Right, "palign-right"),
+    (Align::LeftJustified, "palign-justify-left"),
+    (Align::CenterJustified, "palign-justify-center"),
+    (Align::RightJustified, "palign-justify-right"),
+    (Align::FullyJustified, "palign-justify-all"),
+    (Align::TowardsSpine, "palign-spine-towards"),
+    (Align::AwayFromSpine, "palign-spine-away"),
+];
+
+/// Space Between Paragraphs Using Same Style's presets (pt), after Ignore.
+const SAME_STYLE_SPACING: &[f64] = &[0.0, 3.0, 6.0, 9.0, 12.0, 18.0, 24.0];
+
+/// The Paragraph panel, laid out as InDesign's: the alignment buttons in groups of 3, 4 and 2;
+/// indents, spacing and drop cap fields by their icons in two columns; Shading and Border with
+/// their colours; Hyphenate and the baseline grid buttons. The rest (composer, grid and ragged
+/// lines options, the paragraph dialogs) is in the panel menu.
+pub fn paragraph_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let Some(a) = text_attrs(app) else {
+        crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Select text or a text frame."));
+        return;
+    };
+    let lang_ui = app.ui.language.clone();
+    let tr = |s: &str| crate::i18n::tr(&lang_ui, s).to_string();
+    let u = units(app);
+    let p = a["para"].clone();
+    let fw = full_width(ui);
+    let half = (fw - 10.0) / 2.0;
+    // Alignment, and the panel menu at the right.
+    let cur: Align = serde_json::from_value(p["align"].clone()).unwrap_or_default();
+    const GAP: f32 = 8.0;
+    let pitch = ((fw - 24.0 - 2.0 * GAP) / 9.0).clamp(16.0, 24.0);
+    let b = block(ui, 21.0);
+    let mut x = 0.0;
+    for (i, (al, icon)) in PARA_ALIGNS.into_iter().enumerate() {
+        if i == 3 || i == 7 {
+            x += GAP;
+        }
+        if place(ui, sub(b, x, 0.0, pitch, 21.0), |ui| widgets::icon_toggle_sized(ui, icon, cur == al, &tr(al.label()), vec2(pitch, 21.0))).clicked()
+        {
+            let _ = app.run("type.para", json!({"attrs": {"align": al}}));
+        }
+        x += pitch;
+    }
+    place(ui, sub(b, fw - 20.0, 0.0, 20.0, 21.0), |ui| crate::menus::menu_button(ui, "☰", |ui| paragraph_panel_menu(app, ui, &p)));
+    ui.add_space(6.0);
+    // Indents, spacing and drop cap, two to a row as in InDesign.
+    let row = FIELD_H + 5.0;
+    let b = block(ui, 5.0 * row - 5.0);
+    let rows = [
+        (("indent-left", "Left Indent", "leftIndent"), ("indent-right", "Right Indent", "rightIndent")),
+        (("indent-first", "First Line Left Indent", "firstLineIndent"), ("indent-last", "Last Line Right Indent", "lastLineIndent")),
+        (("space-before", "Space Before", "spaceBefore"), ("space-after", "Space After", "spaceAfter")),
+    ];
+    for (i, (l, r)) in rows.into_iter().enumerate() {
+        for (right, (icon, tip, key)) in [(false, l), (true, r)] {
+            // The first and last line indents may be negative (a hanging line), as InDesign's.
+            let min = if matches!(key, "firstLineIndent" | "lastLineIndent") { -10_000.0 } else { 0.0 };
+            let field = NumField::measure(key, p[key].as_f64(), u).spinner().range(min, 10_000.0);
+            if let Some(v) = half_field(ui, b, right, i as f32 * row, half, icon, &tr(tip), field) {
+                let _ = app.run("type.para", json!({"attrs": {key: v}}));
+            }
+        }
+    }
+    // Space Between Paragraphs Using Same Style: Ignore (unset) or a space that replaces the
+    // space after and before between paragraphs of the same style.
+    let ignore = tr("Ignore");
+    let field = NumField::measure("sameParaStyleSpacing", p["sameParaStyleSpacing"].as_f64(), u)
+        .spinner()
+        .presets(SAME_STYLE_SPACING)
+        .empty_text(&ignore)
+        .range(0.0, 10_000.0);
+    if let Some(v) = half_field_or_clear(ui, b, false, 3.0 * row, half, "space-same", &tr("Space Between Paragraphs Using Same Style"), field) {
+        let _ = app.run("type.para", json!({"attrs": {"sameParaStyleSpacing": v}}));
+    }
+    for (right, icon, tip, key, max) in [
+        (false, "drop-lines", "Drop Cap Number of Lines", "dropCapLines", designcraft_compose::MAX_DROP_CAP_LINES),
+        (true, "drop-chars", "Drop Cap One or More Characters", "dropCapChars", designcraft_compose::MAX_DROP_CAP_CHARS),
+    ] {
+        let field = NumField::number(key, p[key].as_f64(), "", 0).spinner().range(0.0, max as f64);
+        if let Some(v) = half_field(ui, b, right, 4.0 * row, half, icon, &tr(tip), field) {
+            let _ = app.run("type.para", json!({"attrs": {key: (v.max(0.0) as u64).min(max as u64)}}));
+        }
+    }
+    // Shading and Border: on or off at the left; at the right the Paragraph Borders and Shading
+    // dialog on its tab and the colour.
+    ui.add_space(10.0);
+    let doc = app.session.active().map(|d| d.doc.clone());
+    let b = block(ui, 2.0 * row - 5.0);
+    for (i, (on_key, color_key, label, icon, tab, name)) in [
+        ("shadingOn", "shadingColor", "Shading", "para-shading", "shading", "Paragraph Shading"),
+        ("borderOn", "borderColor", "Border", "para-border", "border", "Paragraph Border"),
+    ]
+    .into_iter()
+    .enumerate()
+    {
+        let y = i as f32 * row;
+        let mut on = p[on_key].as_bool().unwrap_or(false);
+        if place(ui, sub(b, 0.0, y, half, FIELD_H), |ui| widgets::checkbox(ui, &mut on, &tr(label))).changed() {
+            let _ = app.run("type.para", json!({"attrs": {on_key: on}}));
+        }
+        if place(ui, sub(b, half + 10.0, y, 23.0, FIELD_H), |ui| widgets::icon_toggle(ui, icon, false, &tr("Paragraph Borders and Shading…")))
+            .clicked()
+        {
+            let _ = app.run("app.paragraphBordersDialog", json!({"tab": tab}));
+        }
+        if let Some(doc) = &doc {
+            let color = p[color_key].as_str().unwrap_or("[Black]").to_string();
+            let w = half - 24.0;
+            if let Some(sw) = place(ui, sub(b, half + 34.0, y, w, FIELD_H), |ui| crate::chrome::swatch_field(ui, doc, &color, w, &tr(name))) {
+                let _ = app.run("type.para", json!({"attrs": {color_key: sw}}));
+            }
+        }
+    }
+    // Hyphenate, and Do Not Align / Align to Baseline Grid.
+    ui.add_space(10.0);
+    let b = block(ui, FIELD_H);
+    let mut h = p["hyphenate"].as_bool().unwrap_or(true);
+    if place(ui, sub(b, 0.0, 0.0, half, FIELD_H), |ui| widgets::checkbox(ui, &mut h, &tr("Hyphenate"))).changed() {
+        let _ = app.run("type.para", json!({"attrs": {"hyphenate": h}}));
+    }
+    let grid = matches!(p["gridAlign"].as_str(), Some("allLines" | "firstLineOnly"));
+    for (i, (icon, tip, on, v)) in
+        [("grid-none", "Do Not Align to Baseline Grid", !grid, "none"), ("grid-baseline", "Align to Baseline Grid", grid, "allLines")]
+            .into_iter()
+            .enumerate()
+    {
+        if place(ui, sub(b, fw - 48.0 + i as f32 * 25.0, 0.0, 23.0, FIELD_H), |ui| widgets::icon_toggle(ui, icon, on, &tr(tip))).clicked() && !on {
+            let _ = app.run("type.para", json!({"attrs": {"gridAlign": v}}));
+        }
+    }
+    ui.add_space(4.0);
+}
+
+/// The Paragraph panel menu, in the order of InDesign's.
+fn paragraph_panel_menu(app: &mut DesignApp, ui: &mut Ui, p: &Value) {
+    let lang = app.ui.language.clone();
+    let item = |ui: &mut Ui, label: &str, check: Option<bool>, enabled: bool| -> bool {
+        let label = crate::i18n::tr(&lang, label);
+        let text = match check {
+            Some(true) => format!("✓ {label}"),
+            Some(false) => format!("   {label}"),
+            None => label.to_string(),
+        };
+        let clicked = ui.add_enabled(enabled, egui::Button::new(crate::rtl::widget(ui, text))).clicked();
+        if clicked {
+            ui.close();
+        }
+        clicked
+    };
+    let mut attrs = None;
+    let mut command = None;
+    let (single, [paragraph, single_line]) = composer_choice(p["composer"].as_str());
+    if item(ui, "Paragraph Composer", Some(!single), true) {
+        attrs = Some(json!({"composer": paragraph}));
+    }
+    if item(ui, "Single-line Composer", Some(single), true) {
+        attrs = Some(json!({"composer": single_line}));
+    }
+    ui.separator();
+    let grid = p["gridAlign"].as_str().unwrap_or("none");
+    if item(ui, "Only Align First Line to Grid", Some(grid == "firstLineOnly"), grid != "none") {
+        attrs = Some(json!({"gridAlign": if grid == "firstLineOnly" { "allLines" } else { "firstLineOnly" }}));
+    }
+    let balance = p["balanceRagged"].as_bool().unwrap_or(false);
+    if item(ui, "Balance Ragged Lines", Some(balance), true) {
+        attrs = Some(json!({"balanceRagged": !balance}));
+    }
+    // Story-wide Optical Margin Alignment is in the Story panel.
+    let ignore = p["ignoreOpticalMargin"].as_bool().unwrap_or(false);
+    if item(ui, "Ignore Optical Margin", Some(ignore), true) {
+        attrs = Some(json!({"ignoreOpticalMargin": !ignore}));
+    }
+    ui.separator();
+    for (label, id) in [
+        ("Justification…", "app.justificationDialog"),
+        ("Keep Options…", "app.keepOptionsDialog"),
+        ("Span Columns…", "app.spanColumnsDialog"),
+        ("Hyphenation…", "app.hyphenationDialog"),
+        ("Drop Caps and Nested Styles…", "app.nestedStylesDialog"),
+        ("GREP Styles…", "app.grepStylesDialog"),
+        ("Paragraph Rules…", "app.paragraphRulesDialog"),
+        ("Paragraph Borders and Shading…", "app.paragraphBordersDialog"),
+    ] {
+        if item(ui, label, None, true) {
+            command = Some(id);
+        }
+    }
+    ui.separator();
+    if item(ui, "Bullets and Numbering…", None, true) {
+        command = Some("app.bulletsNumberingDialog");
+    }
+    // Restart Numbering at 1, or Continue Numbering from the paragraph before, for a numbered list.
+    let numbered = p["listType"].as_str() == Some("numbers");
+    let restarts = p["startAt"].is_u64();
+    let label = match (numbered, restarts) {
+        (false, _) => "Restart/Continue Numbering",
+        (true, false) => "Restart Numbering",
+        (true, true) => "Continue Numbering",
+    };
+    if item(ui, label, None, numbered) {
+        attrs = Some(json!({"startAt": if restarts { Value::Null } else { json!(1) }}));
+    }
+    item(ui, "Convert Bullets and Numbering to Text", None, false);
+    if item(ui, "Define Lists…", None, true) {
+        command = Some("list.define");
+    }
+    // Paragraph Direction (World-Ready): switching also mirrors left and right alignment.
+    ui.separator();
+    let rtl = p["direction"] == "rightToLeft";
+    for (on, label, dir) in [(!rtl, "Left to Right", "leftToRight"), (rtl, "Right to Left", "rightToLeft")] {
+        if item(ui, label, Some(on), true) && !on {
+            let align = match serde_json::from_value(p["align"].clone()).unwrap_or_default() {
+                Align::Left => Align::Right,
+                Align::Right => Align::Left,
+                a => a,
+            };
+            attrs = Some(json!({"direction": dir, "align": align}));
+        }
+    }
+    if let Some(attrs) = attrs {
+        let _ = app.run("type.para", json!({"attrs": attrs}));
+    }
+    // As a menu choice: Define Lists… and the other commands open their dialogs.
+    if let Some(id) = command {
+        crate::menus::activate(app, id, &Value::Null);
+    }
+}
+
+/// Variable Font sliders: one per axis, each with a field for a typed value; the style becomes
+/// `Named {tag:value,…}`. Dragging a slider previews on the page and is one undo step once let go;
+/// a click, an arrow key or a typed value applies at once.
+fn variable_font_axes(app: &mut DesignApp, ui: &mut egui::Ui, family: &str, style: &str) {
+    if family.is_empty() {
+        return;
+    }
+    let db = crate::panels::fonts(app);
+    let axes = usable_axes(db.axes(family, style));
+    if axes.is_empty() {
+        return;
+    }
+    let base = designcraft_fonts::base_style(style).to_string();
+    let face = db.face(family, style);
+    let cur = |tag: &str, default: f32| face.coords.iter().find(|(t, _)| t == tag.as_bytes()).map_or(default, |c| c.1);
+    let mut values: Vec<(String, f32)> = axes.iter().map(|a| (a.0.clone(), cur(&a.0, a.3))).collect();
+    crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Variable Font")).size(11.0));
+    // What the sliders did this frame, gathered over every axis before anything is run.
+    let (mut held, mut dragged, mut applied) = (false, false, false);
+    let names: Vec<&str> = axes.iter().map(|a| a.1.as_str()).collect();
+    let label_w = caption_width(app, ui, &names);
+    for ((tag, name, min, _, max), value) in axes.iter().zip(values.iter_mut()) {
+        // Caption, a slider filling the middle, then the value field: every slider is as long.
+        ui.horizontal(|ui| {
+            caption_cell(ui, name, label_w);
+            ui.spacing_mut().slider_width = (ui.available_width() - PANEL_FIELD_W - ui.spacing().item_spacing.x * 2.0).max(40.0);
+            let (step, decimals) = axis_step(*min, *max);
+            // The field beside the slider takes typed values, so the slider's own is hidden.
+            let slider =
+                ui.add(egui::Slider::new(&mut value.1, *min..=*max).step_by(f64::from(step)).show_value(false)).accessible_name((*name).to_owned());
+            // Only the user's own change counts: the slider also reports one when it snaps a value
+            // that is off its steps, which it would then do on every frame.
+            let pressed = slider.is_pointer_button_down_on() || slider.dragged();
+            let changed = slider.changed() && (pressed || slider.has_focus());
+            held |= pressed;
+            dragged |= changed && pressed;
+            applied |= changed && !pressed;
+            if let Some(v) = number(ui, &format!("vf{tag}"), Some(f64::from(value.1)), "", PANEL_FIELD_W, decimals).filter(|v| v.is_finite()) {
+                value.1 = (v as f32).clamp(*min, *max);
+                applied = true;
+            }
+        });
+    }
+    let attrs = json!({"attrs": {"fontStyle": variable_font_style(&base, &values)}});
+    if applied {
+        app.end_live_preview();
+        let _ = app.run("type.char", attrs);
+    } else if dragged {
+        app.live_preview("Variable Font", "type.char", attrs);
+    } else if held {
+        app.hold_live_preview();
+    }
+    // Let go, the preview is committed at the start of the next frame (DesignApp::ui).
+}
+
+/// The slider step and the field's decimals for an axis: whole units, or hundredths for an axis
+/// whose whole range is a few units (Skia's weight runs 0.48–3.2).
+/// The axes a slider can show: a malformed font's axis whose minimum lies above its maximum (or
+/// isn't a number) is left out, since no value fits its range.
+pub(super) fn usable_axes(axes: Vec<(String, String, f32, f32, f32)>) -> Vec<(String, String, f32, f32, f32)> {
+    axes.into_iter().filter(|a| a.2 <= a.4).collect()
+}
+
+pub(super) fn axis_step(min: f32, max: f32) -> (f32, usize) {
+    if max - min >= 10.0 { (1.0, 0) } else { (0.01, 2) }
+}
+
+/// The style for the axis values: `base {tag:value,…}`, each value to at most two decimals.
+pub(super) fn variable_font_style(base: &str, values: &[(String, f32)]) -> String {
+    let spec = values
+        .iter()
+        .map(|(t, v)| {
+            let v = format!("{v:.2}");
+            format!("{t}:{}", v.trim_end_matches('0').trim_end_matches('.'))
+        })
+        .collect::<Vec<_>>()
+        .join(",");
+    format!("{base} {{{spec}}}")
+}
+
+/// The width of the axis sliders' value fields, so the sliders end at the same place.
+const PANEL_FIELD_W: f32 = 52.0;
+
+/// The caption font of the Character panel's rows.
+fn caption_font() -> egui::FontId {
+    egui::FontId::proportional(11.5)
+}
+
+/// The width of the widest of `labels` in the interface language: a column's caption cells.
+fn caption_width(app: &DesignApp, ui: &Ui, labels: &[&str]) -> f32 {
+    let t = Tokens::get(ui.ctx());
+    labels
+        .iter()
+        .map(|l| ui.painter().layout_no_wrap(crate::i18n::tr(&app.ui.language, l).to_string(), caption_font(), t.text).size().x)
+        .fold(0.0, f32::max)
+        .ceil()
+}
+
+/// A Character panel column row: a caption cell `label_w` wide, then the number field filling the
+/// rest of the column. Returns the value committed.
+fn char_field(app: &DesignApp, ui: &mut Ui, label: &str, label_w: f32, field: NumField<'_>) -> Option<f64> {
+    ui.horizontal(|ui| {
+        caption_cell(ui, crate::i18n::tr(&app.ui.language, label), label_w);
+        let width = (ui.available_width() - ui.spacing().item_spacing.x).max(40.0);
+        field.width(width).show(ui)
+    })
+    .inner
+}
+
+/// A left-aligned caption in a cell of fixed width, so the field after it lines up.
+fn caption_cell(ui: &mut Ui, text: &str, width: f32) {
+    let t = Tokens::get(ui.ctx());
+    let (r, _) = ui.allocate_exact_size(vec2(width, crate::widgets::FIELD_H), Sense::hover());
+    crate::rtl::paint(ui.painter(), pos2(r.min.x, r.center().y), egui::Align2::LEFT_CENTER, text, caption_font(), t.text);
+}
+
+/// Whether `composer` (a paragraph's `composer` attribute) is a single-line composer, and the
+/// paragraph and single-line composers of its kind (Japanese or not), for the composer choice.
+pub(crate) fn composer_choice(composer: Option<&str>) -> (bool, [&'static str; 2]) {
+    let single = matches!(composer, Some("singleLine" | "japaneseSingleLine"));
+    let kind = if composer.is_some_and(|c| c.starts_with("japanese")) { ["japanese", "japaneseSingleLine"] } else { ["paragraph", "singleLine"] };
+    (single, kind)
+}
+
+/// The Digits choices: (value, caption, sample of 0–3). The values are the file format's:
+/// `arabic` is 0123, `hindi` the Arabic-Indic ٠١٢٣ and `farsi` the Persian/Urdu ۰۱۲۳; the captions
+/// name them by the script's users.
+pub const DIGIT_OPTIONS: [(&str, &str, &str); 5] =
+    [("default", "Default", ""), ("arabic", "Arabic", "0123"), ("hindi", "Hindi", "٠١٢٣"), ("farsi", "Farsi", "۰۱۲۳"), ("native", "Native", "")];
+
+/// A Digits choice as shown: its translated caption and a sample of the figures.
+pub fn digit_label(lang: &str, o: (&str, &str, &str)) -> String {
+    let name = crate::i18n::tr(lang, o.1);
+    if o.2.is_empty() { name.to_string() } else { format!("{name}  {}", o.2) }
+}
+
+/// The least value a paragraph field takes: the first and last line indents may be negative (a
+/// hanging line, a last line past the right indent), as in InDesign; the others not.
+pub(crate) fn para_field_min(key: &str) -> f64 {
+    if matches!(key, "firstLineIndent" | "lastLineIndent") { -10_000.0 } else { 0.0 }
+}
diff --git a/crates/ui-egui/src/panels/separations.rs b/crates/ui-egui/src/panels/separations.rs
new file mode 100644
index 000000000..a685bee18
--- /dev/null
+++ b/crates/ui-egui/src/panels/separations.rs
@@ -0,0 +1,116 @@
+//! Window › Output › Separations Preview: the plates the print PDF of the spread nearest the
+//! view center puts on film, each ink's percentage under the pointer, one plate or all inks,
+//! and the ink limit.
+
+use craft_prepress::{Alternate, Ink, Process};
+use serde_json::json;
+
+use crate::DesignApp;
+use crate::i18n::tr;
+use crate::theme::Tokens;
+
+/// A swatch for an ink's row.
+fn ink_color(ink: &Ink) -> egui::Color32 {
+    match ink {
+        Ink::Process(Process::Cyan) => egui::Color32::from_rgb(0, 174, 239),
+        Ink::Process(Process::Magenta) => egui::Color32::from_rgb(236, 0, 140),
+        Ink::Process(Process::Yellow) => egui::Color32::from_rgb(255, 242, 0),
+        Ink::Process(Process::Black) => egui::Color32::from_rgb(35, 31, 32),
+        Ink::Spot(s) => {
+            let rgb = match s.alternate {
+                Alternate::Lab([l, a, b]) => designcraft_color::cms::lab::lab_to_srgb(designcraft_color::cms::Lab { l, a, b }),
+                Alternate::Cmyk([c, m, y, k]) => designcraft_color::Color::Cmyk { c, m, y, k }.to_rgb(),
+            };
+            let [r, g, b] = rgb.map(|v| (v.clamp(0.0, 1.0) * 255.0).round() as u8);
+            egui::Color32::from_rgb(r, g, b)
+        }
+    }
+}
+
+pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let t = Tokens::get(ui.ctx());
+    let lang = app.ui.language.clone();
+    let sep = app.ui.separations.clone();
+    let mut run = None;
+    ui.horizontal(|ui| {
+        let limit = sep.as_ref().and_then(|s| s.ink_limit);
+        let modes = [
+            ("Off", sep.is_none(), json!({"plate": null, "inkLimit": null})),
+            ("Separations", sep.is_some() && limit.is_none(), json!({"plate": "all", "inkLimit": null})),
+            ("Ink Limit", limit.is_some(), json!({"inkLimit": limit.unwrap_or(300.0)})),
+        ];
+        for (label, on, params) in modes {
+            if ui.selectable_label(on, crate::rtl::widget(ui, tr(&lang, label))).clicked() && !on {
+                run = Some(params);
+            }
+        }
+    });
+    if let Some(mut limit) = sep.as_ref().and_then(|s| s.ink_limit) {
+        ui.horizontal(|ui| {
+            ui.label(crate::rtl::widget(ui, tr(&lang, "Ink Limit")));
+            if ui.add(egui::DragValue::new(&mut limit).range(0.0..=400.0).suffix("%")).changed() {
+                run = Some(json!({"inkLimit": limit}));
+            }
+        });
+    }
+    if let Some(p) = run.take() {
+        if let Err(e) = app.run("view.separations", p) {
+            app.status_error("Separations Preview", e);
+        }
+        return;
+    }
+    let Some(sep) = sep else {
+        ui.label(egui::RichText::new(tr(&lang, "Shows the plates the exported PDF prints.")).size(11.0).color(t.text_dim));
+        return;
+    };
+    ui.separator();
+    let Some(designcraft_doc::SpreadRef::Doc(si)) = crate::canvas::current_spread(app) else { return };
+    let sheet = match app.canvas.separations.sheet(si) {
+        None => {
+            ui.label(egui::RichText::new(tr(&lang, "Separating…")).size(11.0).color(t.text_dim));
+            return;
+        }
+        Some(Err(e)) => {
+            ui.label(egui::RichText::new(e.as_str()).size(11.0).color(t.text_dim));
+            return;
+        }
+        Some(Ok(sheet)) => sheet.clone(),
+    };
+    // Each ink's percentage under the pointer.
+    let k = f64::from(sheet.plates.dpi) / 72.0;
+    let coverage = app.canvas.separations.pointer.filter(|(psi, _)| *psi == si).and_then(|(_, p)| {
+        let (x, y) = ((p.x - sheet.area.x0) * k, (p.y - sheet.area.y0) * k);
+        (x >= 0.0 && y >= 0.0).then(|| sheet.plates.coverage_at(x as u32, y as u32, &[])).flatten()
+    });
+    let pct = |v: Option<f32>| v.map_or_else(String::new, |v| format!("{v:.0}%"));
+    let row = |ui: &mut egui::Ui, selected: bool, color: Option<egui::Color32>, name: &str, value: String| {
+        ui.horizontal(|ui| {
+            let (r, _) = ui.allocate_exact_size(egui::vec2(12.0, 12.0), egui::Sense::hover());
+            if let Some(c) = color {
+                ui.painter().rect_filled(r, 1.0, c);
+            }
+            let clicked = ui.selectable_label(selected, name).clicked();
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| ui.label(egui::RichText::new(value).size(11.0)));
+            clicked
+        })
+        .inner
+    };
+    if row(ui, sep.plate.is_none(), None, tr(&lang, "All Inks"), pct(coverage.as_ref().map(|c| c.total))) {
+        run = Some(json!({"plate": "all"}));
+    }
+    for (id, ink) in sheet.plates.inks.iter() {
+        let selected = sep.plate.as_deref().and_then(|n| sheet.ink(n)) == Some(id);
+        let value = pct(coverage.as_ref().and_then(|c| c.inks.get(id.index()).copied()));
+        if row(ui, selected, Some(ink_color(ink)), ink.name(), value) {
+            run = Some(json!({"plate": if selected { "all" } else { ink.name() }}));
+        }
+    }
+    for name in &sheet.plates.unseparated {
+        ui.label(egui::RichText::new(format!("{name} ({})", tr(&lang, "not separated"))).size(11.0).color(t.text_dim));
+    }
+    if let Some(p) = run
+        && let Err(e) = app.run("view.separations", p)
+    {
+        app.status_error("Separations Preview", e);
+    }
+}
diff --git a/crates/ui-egui/src/panels/story.rs b/crates/ui-egui/src/panels/story.rs
new file mode 100644
index 000000000..b2d53bff1
--- /dev/null
+++ b/crates/ui-egui/src/panels/story.rs
@@ -0,0 +1,106 @@
+//! Window › Type & Tables › Story: the story-wide options.
+
+use serde_json::{Value, json};
+
+use crate::DesignApp;
+use crate::widgets::{self, NumField};
+
+/// The Story panel: Optical Margin Alignment for the stories of the text selection or the
+/// selected text frames, and the type size its hang amounts are set for. Without text or a text
+/// frame selected, the controls are disabled.
+pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
+    let options = super::text_attrs(app).map(|a| a["storyOptions"].clone());
+    let enabled = options.is_some();
+    let options = options.unwrap_or(Value::Null);
+    let lang = app.ui.language.clone();
+    let tr = |s: &str| crate::i18n::tr(&lang, s).to_string();
+    ui.add_enabled_ui(enabled, |ui| {
+        ui.horizontal_wrapped(|ui| {
+            // Stories that differ show unchecked; a click turns it on for all of them.
+            let mut on = options["opticalMargin"].as_bool().unwrap_or(false);
+            if widgets::checkbox(ui, &mut on, &tr("Optical Margin Alignment")).changed() {
+                let _ = app.run("story.options", json!({"opticalMargin": on}));
+            }
+            let field = NumField::number("storyOpticalMarginSize", options["opticalMarginSize"].as_f64(), " pt", 2)
+                .width(72.0)
+                .range(designcraft_doc::OpticalMargin::MIN_SIZE, designcraft_doc::OpticalMargin::MAX_SIZE);
+            if let Some(size) = crate::chrome::icon_field(ui, "font-size", &tr("Optical Margin Size"), field) {
+                let _ = app.run("story.options", json!({"opticalMarginSize": size}));
+            }
+        });
+    });
+}
+
+#[cfg(test)]
+mod tests {
+    use egui_kittest::{
+        Harness,
+        kittest::{NodeT, Queryable},
+    };
+
+    use super::*;
+
+    fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
+        let mut h = Harness::builder().with_size(egui::vec2(260.0, 200.0)).build_ui_state(
+            |ui, app: &mut DesignApp| {
+                let id = egui::Id::unique("test_fonts");
+                if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
+                    crate::theme::install_fonts(ui.ctx(), "");
+                    ui.data_mut(|d| d.insert_temp(id, true));
+                    return;
+                }
+                show(app, ui);
+            },
+            app,
+        );
+        h.run_steps(3);
+        h
+    }
+
+    fn optical_margin(h: &Harness<'static, DesignApp>, story: u64) -> designcraft_doc::OpticalMargin {
+        h.state().session.active().unwrap().doc.story(designcraft_doc::StoryId(story)).unwrap().optical_margin
+    }
+
+    fn size_field_text(h: &Harness<'static, DesignApp>) -> Option<String> {
+        h.get_all_by_role(egui::accesskit::Role::TextInput).next().unwrap().value()
+    }
+
+    #[test]
+    fn story_panel_sets_and_shows_the_storys_optical_margin() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        let story =
+            app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "“Hung”", "caret": true})).unwrap()["story"]
+                .as_u64()
+                .unwrap();
+        app.run("edit.selectAll", json!({})).unwrap();
+        let mut h = harness(app);
+        assert_eq!(size_field_text(&h).as_deref(), Some("12 pt"));
+        h.get_by_label("Optical Margin Alignment").click();
+        h.run_steps(3);
+        assert!(optical_margin(&h, story).on);
+        assert_eq!(h.get_by_label("Optical Margin Alignment").accesskit_node().toggled(), Some(egui::accesskit::Toggled::True));
+        h.get_all_by_role(egui::accesskit::Role::TextInput).next().unwrap().click();
+        h.run_steps(2);
+        h.event(egui::Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND });
+        h.event(egui::Event::Text("18".into()));
+        h.key_press(egui::Key::Enter);
+        h.run_steps(3);
+        assert_eq!(optical_margin(&h, story), designcraft_doc::OpticalMargin { on: true, size: 18.0 });
+        // A value set elsewhere shows in the panel.
+        h.state_mut().run("story.options", json!({"opticalMarginSize": 30})).unwrap();
+        h.run_steps(3);
+        assert_eq!(size_field_text(&h).as_deref(), Some("30 pt"));
+    }
+
+    #[test]
+    fn story_panel_is_disabled_without_text() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.run("file.new", json!({})).unwrap();
+        let mut h = harness(app);
+        assert!(h.get_by_label("Optical Margin Alignment").accesskit_node().is_disabled());
+        h.get_by_label("Optical Margin Alignment").click();
+        h.run_steps(3);
+        assert_eq!(h.get_by_label("Optical Margin Alignment").accesskit_node().toggled(), Some(egui::accesskit::Toggled::False));
+    }
+}
diff --git a/crates/ui-egui/src/panels/styles.rs b/crates/ui-egui/src/panels/styles.rs
index f7e6fa803..ff45e6327 100644
--- a/crates/ui-egui/src/panels/styles.rs
+++ b/crates/ui-egui/src/panels/styles.rs
@@ -46,12 +46,12 @@ fn list(app: &mut DesignApp, ui: &mut egui::Ui, para: bool) {
         if para && n == designcraft_doc::NO_PARA_STYLE {
             continue;
         }
-        style_row(app, ui, para, n, current.as_deref(), overrides > 0, &groups, &t);
+        style_row(app, ui, para, n, (current.as_deref(), overrides > 0), &groups, &t);
     }
     for g in &groups {
         egui::CollapsingHeader::new(g.as_str()).id_salt(("style_group", para, g)).default_open(true).show(ui, |ui| {
             for n in names.iter().filter(|n| n.rsplit_once('/').is_some_and(|(x, _)| x == g)) {
-                style_row(app, ui, para, n, current.as_deref(), overrides > 0, &groups, &t);
+                style_row(app, ui, para, n, (current.as_deref(), overrides > 0), &groups, &t);
             }
         });
     }
@@ -107,7 +107,15 @@ pub fn character(app: &mut DesignApp, ui: &mut egui::Ui) {
 
 /// One style in the list: click applies (⌥ clears overrides), double-click edits,
 /// right-click: edit, apply, break link, move to group.
-fn style_row(app: &mut DesignApp, ui: &mut egui::Ui, para: bool, n: &str, current: Option<&str>, overridden: bool, groups: &[String], t: &Tokens) {
+fn style_row(
+    app: &mut DesignApp,
+    ui: &mut egui::Ui,
+    para: bool,
+    n: &str,
+    (current, overridden): (Option<&str>, bool),
+    groups: &[String],
+    t: &Tokens,
+) {
     let (row, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 22.0), Sense::click());
     if current == Some(n) {
         ui.painter().rect_filled(row, 0.0, t.row_selected);
@@ -117,7 +125,7 @@ fn style_row(app: &mut DesignApp, ui: &mut egui::Ui, para: bool, n: &str, curren
     let shown = n.rsplit('/').next().unwrap_or(n);
     let label = if n.contains('/') { shown } else { crate::i18n::style_name(&app.ui.language, shown) };
     let row_label = format!("{label}{}", if current == Some(n) && overridden { "+" } else { "" });
-    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, current == Some(n), &row_label));
+    resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, current == Some(n), &row_label));
     crate::rtl::paint(ui.painter(), row.min + vec2(8.0, 11.0), egui::Align2::LEFT_CENTER, &row_label, egui::FontId::proportional(12.5), t.text);
     let editable = n != if para { designcraft_doc::NO_PARA_STYLE } else { designcraft_doc::NO_CHAR_STYLE };
     if resp.double_clicked() && editable {
@@ -169,7 +177,7 @@ fn style_row(app: &mut DesignApp, ui: &mut egui::Ui, para: bool, n: &str, curren
                     }
                 }
                 ui.separator();
-                let id = egui::Id::new(("new_style_group", para));
+                let id = egui::Id::unique(("new_style_group", para));
                 let mut name: String = ui.data(|d| d.get_temp(id)).unwrap_or_default();
                 let r = ui.add(
                     egui::TextEdit::singleline(&mut name)
@@ -219,7 +227,7 @@ mod tests {
         let mut h = Harness::builder().with_size(vec2(360.0, 240.0)).build_ui_state(
             |ui, app: &mut DesignApp| {
                 let tokens = Tokens::get(ui.ctx());
-                style_row(app, ui, true, "Header", Some("Header"), true, &[], &tokens);
+                style_row(app, ui, true, "Header", (Some("Header"), true), &[], &tokens);
             },
             app,
         );
@@ -298,7 +306,7 @@ mod tests {
         let undo_len = app.session.doc().unwrap().history.undo.len();
         let mut h = Harness::builder().with_size(vec2(360.0, 240.0)).build_ui_state(
             |ui, app: &mut DesignApp| {
-                let id = egui::Id::new("test_fonts");
+                let id = egui::Id::unique("test_fonts");
                 if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
                     crate::theme::install_fonts(ui.ctx(), "");
                     ui.data_mut(|d| d.insert_temp(id, true));
diff --git a/crates/ui-egui/src/panels/swatches.rs b/crates/ui-egui/src/panels/swatches.rs
index 878904a5f..fba3eb5b7 100644
--- a/crates/ui-egui/src/panels/swatches.rs
+++ b/crates/ui-egui/src/panels/swatches.rs
@@ -25,10 +25,10 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
             swatch_row(app, ui, &doc, sw, 0.0, fill_cur.as_deref());
         }
         for g in &doc.color_groups {
-            let open_id = egui::Id::new(("color_group_open", &g.name));
+            let open_id = egui::Id::unique(("color_group_open", &g.name));
             let mut open: bool = ui.data(|d| d.get_temp(open_id)).unwrap_or(true);
             let (row, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 22.0), Sense::click());
-            resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &g.name));
+            resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &g.name));
             if resp.hovered() {
                 ui.painter().rect_filled(row, 0.0, t.hover);
             }
@@ -78,7 +78,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     }
     ui.add_space(6.0);
     // InDesign's bottom row: New Color Group, New Swatch, Delete Swatch (the one last clicked).
-    let picked: Option<String> = ui.data(|d| d.get_temp(egui::Id::new(PICKED))).filter(|n: &String| doc.swatch(n).is_some_and(|w| !w.locked));
+    let picked: Option<String> = ui.data(|d| d.get_temp(egui::Id::unique(PICKED))).filter(|n: &String| doc.swatch(n).is_some_and(|w| !w.locked));
     ui.horizontal(|ui| {
         ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
             let del = ui
@@ -88,7 +88,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                 && let Some(name) = &picked
                 && app.run("swatch.delete", json!({"name": name})).is_ok()
             {
-                ui.data_mut(|d| d.remove::<String>(egui::Id::new(PICKED)));
+                ui.data_mut(|d| d.remove::<String>(egui::Id::unique(PICKED)));
             }
             // The selection's fill or stroke (whichever is in front) becomes a swatch; with nothing
             // selected, a new colour.
@@ -167,7 +167,7 @@ fn header(app: &mut DesignApp, ui: &mut egui::Ui, doc: &designcraft_doc::Documen
     ui.horizontal(|ui| {
         let (r, resp) = ui.allocate_exact_size(vec2(27.0, 27.0), Sense::click());
         let tip = crate::i18n::tr(&app.ui.language, if stroke_front { "Stroke" } else { "Fill" });
-        resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tip));
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, tip));
         let fill_r = egui::Rect::from_min_size(r.min + vec2(1.0, 2.0), vec2(16.0, 16.0));
         let stroke_r = egui::Rect::from_min_size(r.min + vec2(10.0, 10.0), vec2(16.0, 16.0));
         let paint = |stroke: bool| {
@@ -230,7 +230,7 @@ fn set_tint(app: &mut DesignApp, percent: f64) -> Result<serde_json::Value, Stri
 fn folder_button(ui: &mut egui::Ui, tip: &str) -> egui::Response {
     let t = Tokens::get(ui.ctx());
     let (r, resp) = ui.allocate_exact_size(vec2(20.0, 20.0), Sense::click());
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tip));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, tip));
     if resp.hovered() {
         ui.painter().rect_filled(r, 3.0, t.hover);
     }
@@ -242,6 +242,33 @@ fn folder_button(ui: &mut egui::Ui, tip: &str) -> egui::Response {
     })
 }
 
+/// The swatch's chip following the pointer while the row is dragged.
+fn paint_drag_chip(ui: &egui::Ui, doc: &designcraft_doc::Document, name: &str, p: egui::Pos2) {
+    let t = Tokens::get(ui.ctx());
+    let (c, g) = crate::widgets::swatch_colors(doc, name, 1.0);
+    let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("swatch_drag")));
+    let chip = egui::Rect::from_min_size(p + vec2(8.0, 8.0), vec2(16.0, 16.0));
+    crate::widgets::paint_chip(&painter, chip, c, g);
+    painter.rect_stroke(chip, 0.0, egui::Stroke::new(1.0, t.field_border), egui::StrokeKind::Outside);
+}
+
+/// The type indicator shown at the right of a swatch row: colour mode (spot dot), gradient or tint.
+fn swatch_kind_label(lang: &str, value: &SwatchValue) -> String {
+    match value {
+        SwatchValue::Color { color, color_type } => {
+            let m = match color {
+                designcraft_color::Color::Cmyk { .. } => "CMYK",
+                designcraft_color::Color::Rgb { .. } => "RGB",
+                designcraft_color::Color::Gray { .. } => crate::i18n::tr(lang, "Gray"),
+            };
+            format!("{}{}", if *color_type == ColorType::Spot { "● " } else { "" }, m)
+        }
+        SwatchValue::Gradient { .. } => "Gradient".into(),
+        SwatchValue::Tint { tint, .. } => format!("{:.0}%", tint * 100.0),
+        _ => String::new(),
+    }
+}
+
 /// One Swatches panel row: chip, name, type; click applies it to the fill or stroke in front of
 /// the proxy (of the frames or their text, see [`super::colors_affect_text`]), the context menu
 /// to the stroke, colour groups and delete.
@@ -256,17 +283,12 @@ fn swatch_row(
     let t = Tokens::get(ui.ctx());
     // Rows can be dragged onto the Gradient panel's ramp.
     let (row, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 22.0), Sense::click_and_drag());
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &sw.name));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &sw.name));
     resp.dnd_set_drag_payload(SwatchDrag(sw.name.clone()));
     if resp.dragged()
         && let Some(p) = ui.ctx().pointer_interact_pos()
     {
-        // The swatch's chip follows the pointer.
-        let (c, g) = crate::widgets::swatch_colors(doc, &sw.name, 1.0);
-        let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("swatch_drag")));
-        let chip = egui::Rect::from_min_size(p + vec2(8.0, 8.0), vec2(16.0, 16.0));
-        crate::widgets::paint_chip(&painter, chip, c, g);
-        painter.rect_stroke(chip, 0.0, egui::Stroke::new(1.0, t.field_border), egui::StrokeKind::Outside);
+        paint_drag_chip(ui, doc, &sw.name, p);
     }
     if fill_cur == Some(sw.name.as_str()) {
         ui.painter().rect_filled(row, 0.0, t.row_selected);
@@ -278,25 +300,13 @@ fn swatch_row(
     crate::widgets::paint_chip(ui.painter(), chip, c, g);
     ui.painter().text(row.min + vec2(28.0 + indent, 11.0), egui::Align2::LEFT_CENTER, &sw.name, egui::FontId::proportional(12.5), t.text);
     // Type indicators: spot dot / process square, colour mode.
-    let kind = match &sw.value {
-        SwatchValue::Color { color, color_type } => {
-            let m = match color {
-                designcraft_color::Color::Cmyk { .. } => "CMYK",
-                designcraft_color::Color::Rgb { .. } => "RGB",
-                designcraft_color::Color::Gray { .. } => crate::i18n::tr(&app.ui.language, "Gray"),
-            };
-            format!("{}{}", if *color_type == ColorType::Spot { "● " } else { "" }, m)
-        }
-        SwatchValue::Gradient { .. } => "Gradient".into(),
-        SwatchValue::Tint { tint, .. } => format!("{:.0}%", tint * 100.0),
-        _ => String::new(),
-    };
+    let kind = swatch_kind_label(&app.ui.language, &sw.value);
     if sw.locked {
         icons::paint(ui.painter(), egui::Rect::from_min_size(egui::pos2(row.max.x - 64.0, row.min.y + 4.0), vec2(13.0, 13.0)), "lock", t.text_dim);
     }
     ui.painter().text(row.right_center() - vec2(6.0, 0.0), egui::Align2::RIGHT_CENTER, kind, egui::FontId::proportional(10.5), t.text_dim);
     if resp.clicked() && !resp.double_clicked() {
-        ui.data_mut(|d| d.insert_temp(egui::Id::new(PICKED), sw.name.clone()));
+        ui.data_mut(|d| d.insert_temp(egui::Id::unique(PICKED), sw.name.clone()));
         let _ = super::apply_swatch(app, app.ui.stroke_front, &sw.name, None);
     }
     // Double-click: Swatch Options (the first click has applied the swatch).
@@ -359,7 +369,7 @@ pub fn color_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
     };
     let text = super::colors_affect_text(app);
     let Some(doc) = app.session.active().map(|d| d.doc.clone()) else { return };
-    let mode_id = egui::Id::new("color_panel_mode");
+    let mode_id = egui::Id::unique("color_panel_mode");
     let mut stroke = app.ui.stroke_front;
     let default_mode = if doc.settings.intent == designcraft_doc::Intent::Print { ColorMode::Cmyk } else { ColorMode::Rgb };
     let mut mode: ColorMode = ui.data(|d| d.get_temp(mode_id)).unwrap_or(default_mode);
@@ -391,7 +401,7 @@ pub fn color_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
         }
         ui.label(egui::RichText::new(&name).size(11.0).color(t.text_dim));
         ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-            egui::ComboBox::from_id_salt("color_mode")
+            let combo = craft_ui::ComboBox::from_id_salt("color_mode")
                 .width(64.0)
                 .selected_text(match mode {
                     ColorMode::Cmyk => "CMYK",
@@ -403,6 +413,7 @@ pub fn color_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
                     ui.selectable_value(&mut mode, ColorMode::Cmyk, "CMYK");
                     ui.selectable_value(&mut mode, ColorMode::Rgb, "RGB");
                 });
+            let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Color Mode"));
         });
     });
     app.ui.stroke_front = stroke;
@@ -427,7 +438,11 @@ pub fn color_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
             // tint is read back from the document every frame) and applies it, clamped, on Enter
             // or when it loses focus.
             ui.spacing_mut().slider_width = (ui.available_width() - 60.0).max(60.0);
-            if ui.add(egui::Slider::new(&mut tint, 0.0..=100.0).integer().show_value(false)).drag_stopped() {
+            // The painted "T" caption is not a text node next to the slider, so name it here.
+            let slider = ui
+                .add(egui::Slider::new(&mut tint, 0.0..=100.0).integer().show_value(false))
+                .accessible_name(crate::i18n::tr(&app.ui.language, "Tint"));
+            if slider.drag_stopped() {
                 commit = Some(tint);
             }
             if let Some(v) =
@@ -530,9 +545,11 @@ fn channel(ui: &mut egui::Ui, label: &str, v: &mut f32, scale: f32, suffix: &str
         changed |= resp.drag_stopped() || resp.clicked();
         // The value is applied when typing ends or a drag stops; until then the field's number
         // lives here, because `v` is read back from the document every frame.
-        let pending_id = ui.id().with(("channel", label));
+        let pending_id = ui.scope_id().with(("channel", label));
         let mut num = ui.data(|d| d.get_temp::<f32>(pending_id)).unwrap_or((*v * scale).round());
-        let field = ui.add(egui::DragValue::new(&mut num).range(0.0..=scale).suffix(suffix).update_while_editing(false));
+        // The channel name is a painted label beside a bare spinner: name the spinner too.
+        let field =
+            ui.add(egui::DragValue::new(&mut num).range(0.0..=scale).suffix(suffix).update_while_editing(false)).accessible_name(label.to_owned());
         if field.dragged() {
             ui.data_mut(|d| d.insert_temp(pending_id, num));
         } else {
@@ -601,11 +618,17 @@ fn color_json(c: &designcraft_color::Color) -> serde_json::Value {
     }
 }
 
-/// Stops in `object.gradient` form.
+/// Stops in `object.gradient` form: a stop on a swatch also names it, so it keeps its inks.
 fn stops_json(g: &designcraft_color::Gradient) -> Vec<serde_json::Value> {
     g.stops
         .iter()
-        .map(|s| json!({"location": s.offset as f64 * 100.0, "color": color_json(&s.color), "opacity": s.opacity as f64 * 100.0, "midpoint": s.midpoint as f64 * 100.0}))
+        .map(|s| {
+            let mut v = json!({"location": s.offset as f64 * 100.0, "color": color_json(&s.color), "opacity": s.opacity as f64 * 100.0, "midpoint": s.midpoint as f64 * 100.0});
+            if let (Some(o), Some(w)) = (v.as_object_mut(), &s.swatch) {
+                o.insert("swatch".to_string(), json!(w));
+            }
+            v
+        })
         .collect()
 }
 
@@ -636,6 +659,62 @@ fn thumbnail(p: &egui::Painter, r: egui::Rect, g: &designcraft_color::Gradient,
     p.rect_stroke(r, 0.0, egui::Stroke::new(1.0, border), egui::StrokeKind::Outside);
 }
 
+/// The gradient across `ramp`, sampled in bands.
+fn paint_ramp(painter: &egui::Painter, ramp: egui::Rect, g: &designcraft_color::Gradient) {
+    let n = 96;
+    for i in 0..n {
+        let (a, b) = (i as f32 / n as f32, (i + 1) as f32 / n as f32);
+        let (c, alpha) = g.sample((a + b) / 2.0);
+        let x0 = ramp.left() + ramp.width() * a;
+        let x1 = ramp.left() + ramp.width() * b + 0.5;
+        painter.rect_filled(egui::Rect::from_x_y_ranges(x0..=x1, ramp.y_range()), 0.0, color32(&c, alpha));
+    }
+}
+
+/// The stops after dragging marker `h` to `o` (`off`: dropped off the ramp, which removes a stop),
+/// and the selection to move to if the drop changed it.
+fn ramp_release(g: &designcraft_color::Gradient, h: RampSel, o: f32, off: bool) -> (Vec<serde_json::Value>, Option<RampSel>) {
+    let mut stops = stops_json(g);
+    let mut sel = None;
+    match h {
+        RampSel::Stop(i) if off => {
+            if i < stops.len() {
+                stops.remove(i);
+            }
+            sel = Some(RampSel::Stop(0));
+        }
+        RampSel::Stop(i) => set_stop(&mut stops, i, "location", json!(o as f64 * 100.0)),
+        RampSel::Mid(i) => set_stop(&mut stops, i, "midpoint", json!(o as f64 * 100.0)),
+    }
+    (stops, sel)
+}
+
+/// Dragging the gradient's thumbnail: its swatch is the payload, and a thumbnail follows the pointer.
+fn drag_gradient_thumbnail(ui: &egui::Ui, resp: &egui::Response, g: &designcraft_color::Gradient, swatch: &str, t: &Tokens) {
+    resp.dnd_set_drag_payload(GradientDrag(swatch.to_string()));
+    if resp.dragged()
+        && let Some(p) = ui.ctx().pointer_interact_pos()
+    {
+        let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("gradient_drag")));
+        thumbnail(&painter, egui::Rect::from_min_size(p + vec2(8.0, 8.0), vec2(18.0, 18.0)), g, t.field_border);
+    }
+}
+
+/// The Gradient panel's Type menu; the kind chosen, as the command's parameters.
+fn gradient_type_combo(ui: &mut egui::Ui, lang: &str, g: &designcraft_color::Gradient, is_gradient: bool) -> Option<serde_json::Value> {
+    let mut send = None;
+    let shown = if is_gradient { crate::i18n::tr(lang, g.kind.label()) } else { "" };
+    let combo = craft_ui::ComboBox::from_id_salt("grad_type").selected_text(crate::rtl::widget(ui, shown)).width(104.0).show_ui(ui, |ui| {
+        for (k, v) in [("Linear", "linear"), ("Radial", "radial")] {
+            if ui.selectable_label(is_gradient && g.kind.label() == k, crate::rtl::widget(ui, crate::i18n::tr(lang, k))).clicked() {
+                send = Some(json!({"kind": v}));
+            }
+        }
+    });
+    let _ = crate::widgets::name_combo(combo, crate::i18n::tr(lang, "Type"));
+    send
+}
+
 /// What's selected on the ramp: a stop, or the midpoint after a stop.
 #[derive(Clone, Copy, PartialEq, Debug)]
 enum RampSel {
@@ -681,8 +760,8 @@ pub fn gradient_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
     let is_gradient = cur.is_some();
     let g = cur.unwrap_or_default();
     let radial = g.kind == designcraft_color::GradientKind::Radial;
-    let sel_id = egui::Id::new("grad_sel");
-    let drag_id = egui::Id::new("grad_drag");
+    let sel_id = egui::Id::unique("grad_sel");
+    let drag_id = egui::Id::unique("grad_drag");
     let mut sel: RampSel = ui.data(|d| d.get_temp(sel_id)).unwrap_or(RampSel::Stop(0));
     let last = g.stops.len().saturating_sub(1);
     sel = match sel {
@@ -699,13 +778,7 @@ pub fn gradient_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
             thumbnail(ui.painter(), r.shrink(1.0), &g, t.field_border);
             // Drag the gradient onto the Swatches panel to keep it as a swatch.
             if is_gradient {
-                resp.dnd_set_drag_payload(GradientDrag(fill.swatch.clone()));
-                if resp.dragged()
-                    && let Some(p) = ui.ctx().pointer_interact_pos()
-                {
-                    let painter = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("gradient_drag")));
-                    thumbnail(&painter, egui::Rect::from_min_size(p + vec2(8.0, 8.0), vec2(18.0, 18.0)), &g, t.field_border);
-                }
+                drag_gradient_thumbnail(ui, &resp, &g, &fill.swatch, &t);
             }
             // Clicking the thumbnail applies the gradient shown (InDesign's way to start one).
             if resp.clicked() && !is_gradient {
@@ -716,14 +789,7 @@ pub fn gradient_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
                 ui.spacing_mut().item_spacing.x = 4.0;
                 ui.horizontal(|ui| {
                     crate::widgets::caption_w(ui, crate::i18n::tr(&lang, "Type:"), 52.0);
-                    let shown = if is_gradient { crate::i18n::tr(&lang, g.kind.label()) } else { "" };
-                    egui::ComboBox::from_id_salt("grad_type").selected_text(crate::rtl::widget(ui, shown)).width(104.0).show_ui(ui, |ui| {
-                        for (k, v) in [("Linear", "linear"), ("Radial", "radial")] {
-                            if ui.selectable_label(is_gradient && g.kind.label() == k, crate::rtl::widget(ui, crate::i18n::tr(&lang, k))).clicked() {
-                                send = Some(json!({"kind": v}));
-                            }
-                        }
-                    });
+                    send = gradient_type_combo(ui, &lang, &g, is_gradient).or(send.take());
                 });
                 ui.horizontal(|ui| {
                     crate::widgets::caption_w(ui, crate::i18n::tr(&lang, "Location:"), 52.0);
@@ -764,14 +830,7 @@ pub fn gradient_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
         let (area, resp) = ui.allocate_exact_size(vec2(w, 40.0), Sense::click_and_drag());
         let ramp = egui::Rect::from_min_size(area.min + vec2(6.0, 10.0), vec2(w - 12.0, 14.0));
         let painter = ui.painter();
-        let n = 96;
-        for i in 0..n {
-            let (a, b) = (i as f32 / n as f32, (i + 1) as f32 / n as f32);
-            let (c, alpha) = g.sample((a + b) / 2.0);
-            let x0 = ramp.left() + ramp.width() * a;
-            let x1 = ramp.left() + ramp.width() * b + 0.5;
-            painter.rect_filled(egui::Rect::from_x_y_ranges(x0..=x1, ramp.y_range()), 0.0, color32(&c, alpha));
-        }
+        paint_ramp(painter, ramp, &g);
         painter.rect_stroke(ramp, 0.0, egui::Stroke::new(1.0, t.field_border), egui::StrokeKind::Outside);
         let x_of = |o: f32| ramp.left() + ramp.width() * o;
         let o_of = |x: f32| ((x - ramp.left()) / ramp.width()).clamp(0.0, 1.0);
@@ -826,16 +885,9 @@ pub fn gradient_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
         if resp.drag_stopped()
             && let Some((h, o, off)) = dragging.take()
         {
-            let mut stops = stops_json(&g);
-            match h {
-                RampSel::Stop(i) if off => {
-                    if i < stops.len() {
-                        stops.remove(i);
-                    }
-                    sel = RampSel::Stop(0);
-                }
-                RampSel::Stop(i) => set_stop(&mut stops, i, "location", json!(o as f64 * 100.0)),
-                RampSel::Mid(i) => set_stop(&mut stops, i, "midpoint", json!(o as f64 * 100.0)),
+            let (stops, kept) = ramp_release(&g, h, o, off);
+            if let Some(kept) = kept {
+                sel = kept;
             }
             send = Some(json!({"stops": stops}));
         }
@@ -872,6 +924,10 @@ pub fn gradient_panel(app: &mut DesignApp, ui: &mut egui::Ui) {
                     let mut rgb = [(r * 255.0) as u8, (gg * 255.0) as u8, (bb * 255.0) as u8];
                     if egui::color_picker::color_edit_button_srgb(ui, &mut rgb).changed() {
                         let mut stops = stops_json(&g);
+                        // A picked color replaces the stop's swatch.
+                        if let Some(o) = stops.get_mut(i).and_then(serde_json::Value::as_object_mut) {
+                            o.remove("swatch");
+                        }
                         set_stop(&mut stops, i, "color", json!(format!("#{:02x}{:02x}{:02x}", rgb[0], rgb[1], rgb[2])));
                         send = Some(json!({"stops": stops}));
                     }
@@ -1005,6 +1061,8 @@ mod gradient_panel_tests {
         assert_eq!(g.stops[1].color, Color::gray(0.6));
         assert!((g.stops[1].offset - 0.8).abs() < 1e-6);
         assert_eq!(g.stops[2].color, Color::gray(0.01), "a 1 % grey stays 1 %");
+        assert_eq!(g.stops[0].swatch.as_deref(), Some("C=0 M=100 Y=0 K=0"), "a stop keeps its swatch");
+        assert_eq!(g.stops[1].swatch, None);
     }
 
     #[test]
@@ -1025,7 +1083,7 @@ mod gradient_panel_tests {
         let app = app_with_frame();
         let mut h = Harness::builder().with_size(vec2(280.0, 200.0)).build_ui_state(
             |ui, app: &mut DesignApp| {
-                let id = egui::Id::new("test_fonts");
+                let id = egui::Id::unique("test_fonts");
                 if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
                     crate::theme::install_fonts(ui.ctx(), "");
                     ui.data_mut(|d| d.insert_temp(id, true));
@@ -1166,7 +1224,7 @@ mod swatches_header_tests {
     fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
         Harness::builder().with_size(vec2(300.0, 520.0)).build_ui_state(
             |ui, app: &mut DesignApp| {
-                let id = egui::Id::new("test_fonts");
+                let id = egui::Id::unique("test_fonts");
                 if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
                     crate::theme::install_fonts(ui.ctx(), "");
                     ui.data_mut(|d| d.insert_temp(id, true));
diff --git a/crates/ui-egui/src/panels/table.rs b/crates/ui-egui/src/panels/table.rs
index ba653364e..90cf274ea 100644
--- a/crates/ui-egui/src/panels/table.rs
+++ b/crates/ui-egui/src/panels/table.rs
@@ -69,13 +69,14 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         for (label, kind, names, cur) in [("Table Style", "table", tnames, tcur), ("Cell Style", "cell", cnames, ccur)] {
             ui.horizontal(|ui| {
                 caption(ui, crate::i18n::tr(&app.ui.language, label));
-                egui::ComboBox::from_id_salt(("tp_style", kind)).selected_text(&cur).width(130.0).show_ui(ui, |ui| {
+                let combo = craft_ui::ComboBox::from_id_salt(("tp_style", kind)).selected_text(&cur).width(130.0).show_ui(ui, |ui| {
                     for n in &names {
                         if ui.selectable_label(*n == cur, n).clicked() {
                             run(app, &format!("style.{kind}.apply"), json!({"name": n, "table": tid}));
                         }
                     }
                 });
+                let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, label));
                 if crate::icons::button(
                     ui,
                     "plus",
@@ -125,7 +126,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
         let row = rows.get(r0).cloned().unwrap_or(Value::Null);
         let exactly = row["mode"] == "exactly";
         caption(ui, crate::i18n::tr(&app.ui.language, "Row Height"));
-        egui::ComboBox::from_id_salt("tp_rowmode")
+        let combo = craft_ui::ComboBox::from_id_salt("tp_rowmode")
             .selected_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, if exactly { "Exactly" } else { "At Least" })))
             .width(70.0)
             .show_ui(ui, |ui| {
@@ -136,6 +137,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                     }
                 }
             });
+        let _ = crate::widgets::name_combo(combo, crate::i18n::tr(&app.ui.language, "Row Height"));
         if let Some(h) = measure(ui, "tp_rowh", row["height"].as_f64(), unit, 64.0) {
             run(app, "table.setRowHeight", json!({"height": h}));
         }
diff --git a/crates/ui-egui/src/panels/tabs.rs b/crates/ui-egui/src/panels/tabs.rs
index db5353afe..49910ca31 100644
--- a/crates/ui-egui/src/panels/tabs.rs
+++ b/crates/ui-egui/src/panels/tabs.rs
@@ -130,7 +130,7 @@ pub(crate) fn ruler(ui: &mut Ui, salt: &str, r: &Ruler) -> Option<RulerEdit> {
         Some(nearest.map_or(Grab::New, |(i, _)| Grab::Tab(i)))
     };
 
-    let key = ui.id().with(("tab_ruler", salt));
+    let key = ui.scope_id().with(("tab_ruler", salt));
     let mut drag: Option<Drag> = ui.data(|d| d.get_temp(key));
     let mut edit = None;
     if resp.drag_started()
@@ -266,11 +266,14 @@ pub(crate) fn align_buttons(ui: &mut Ui, lang: &str, current: TabAlign) -> Optio
 }
 
 /// A one-line text field that commits on Enter or when it loses focus.
-pub(crate) fn text_commit(ui: &mut Ui, id: &str, current: &str, width: f32, enabled: bool) -> Option<String> {
-    let tid = ui.id().with(("tabs_text", id));
+///
+/// `name` is the visible caption's text (`Leader:`, `Align On:`): the field has no label widget of
+/// its own, so screen readers and tests need it named here.
+pub(crate) fn text_commit(ui: &mut Ui, id: &str, current: &str, width: f32, enabled: bool, name: &str) -> Option<String> {
+    let tid = ui.scope_id().with(("tabs_text", id));
     let focused = ui.memory(|m| m.has_focus(tid));
     let mut buf: String = if focused { ui.data(|d| d.get_temp(tid)).unwrap_or_else(|| current.to_string()) } else { current.to_string() };
-    let r = ui.add_enabled(enabled, egui::TextEdit::singleline(&mut buf).id(tid).desired_width(width));
+    let r = ui.add_enabled(enabled, egui::TextEdit::singleline(&mut buf).id(tid).desired_width(width)).accessible_name(name.to_owned());
     ui.data_mut(|d| d.insert_temp(tid, buf.clone()));
     (r.lost_focus() && buf != current).then_some(buf)
 }
@@ -321,7 +324,7 @@ pub fn show(app: &mut DesignApp, ui: &mut Ui) {
     let zoom = app.view().map(|v| v.zoom as f32);
 
     // Panel position above the frame: on request (the magnet, or opening the panel).
-    let win = ui.ctx().memory(|m| m.area_rect(egui::Id::new(("floating_panel", "tabs"))));
+    let win = ui.ctx().memory(|m| m.area_rect(egui::Id::unique(("floating_panel", "tabs"))));
     let state = &mut app.ui.tabs_panel;
     if state.selected.is_some_and(|i| i >= tabs.len()) {
         state.selected = None;
@@ -364,12 +367,14 @@ pub fn show(app: &mut DesignApp, ui: &mut Ui) {
             }
         }
         crate::rtl::label(ui, tr("Leader:"));
-        if let (Some(l), Some(i)) = (text_commit(ui, "leader", sel.map_or("", |s| s.leader.as_str()), 36.0, sel.is_some()), selected) {
+        let leader = text_commit(ui, "leader", sel.map_or("", |s| s.leader.as_str()), 36.0, sel.is_some(), tr("Leader:"));
+        if let (Some(l), Some(i)) = (leader, selected) {
             cmds.push(("type.tabs.change", json!({"index": i, "leader": l})));
         }
         crate::rtl::label(ui, tr("Align On:"));
         let char_tab = sel.is_some_and(|s| s.align == TabAlign::Char);
-        if let (Some(c), Some(i)) = (text_commit(ui, "alignOn", sel.map_or("", |s| s.align_on.as_str()), 18.0, char_tab), selected) {
+        let align_on = text_commit(ui, "alignOn", sel.map_or("", |s| s.align_on.as_str()), 18.0, char_tab, tr("Align On:"));
+        if let (Some(c), Some(i)) = (align_on, selected) {
             cmds.push(("type.tabs.change", json!({"index": i, "alignOn": c})));
         }
         ui.add_space(6.0);
diff --git a/crates/ui-egui/src/panels/typography.rs b/crates/ui-egui/src/panels/typography.rs
index 4206459d0..71358c41a 100644
--- a/crates/ui-egui/src/panels/typography.rs
+++ b/crates/ui-egui/src/panels/typography.rs
@@ -322,7 +322,7 @@ mod tests {
         app.run("edit.selectAll", json!({})).unwrap();
         let mut h = Harness::builder().with_size(vec2(320.0, 1400.0)).build_ui_state(
             |ui, app: &mut DesignApp| {
-                let id = egui::Id::new("test_fonts");
+                let id = egui::Id::unique("test_fonts");
                 if ui.data(|d| d.get_temp::<bool>(id)).is_none() {
                     crate::theme::install_fonts(ui.ctx(), "");
                     ui.data_mut(|d| d.insert_temp(id, true));
diff --git a/crates/ui-egui/src/parent_canvas_tests.rs b/crates/ui-egui/src/parent_canvas_tests.rs
index b3197a7e0..b2e44b8ea 100644
--- a/crates/ui-egui/src/parent_canvas_tests.rs
+++ b/crates/ui-egui/src/parent_canvas_tests.rs
@@ -1,4 +1,4 @@
-use super::*;
+use super::{CanvasLayout, Color32, DesignApp, Point, Pos2, Rect, View, Xf, json, render_texture, vec2};
 
 fn app_with_document_object() -> DesignApp {
     let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
diff --git a/crates/ui-egui/src/prefs.rs b/crates/ui-egui/src/prefs.rs
index cb5a0b54c..9473981f5 100644
--- a/crates/ui-egui/src/prefs.rs
+++ b/crates/ui-egui/src/prefs.rs
@@ -3,114 +3,174 @@
 use craft_ui::docking::{Layout, Location};
 use serde_json::Value;
 
-use crate::UiState;
+use crate::{HiddenPanels, SavedWorkspace, UiState, panel_docking};
+
+/// Saved preferences, and whether reading them discarded anything.
+pub struct ReadPreferences {
+    pub ui: UiState,
+    /// False when unreadable docking data, or an old layout that could not be converted, was
+    /// dropped. The caller keeps the file it read instead of overwriting it.
+    pub intact: bool,
+}
 
 impl UiState {
     /// Read saved preferences, discarding only unreadable optional docking metadata.
     /// A layout from a newer craft-ui version must not reset unrelated settings or named workspaces.
     pub fn from_preferences_json(bytes: &[u8]) -> serde_json::Result<Self> {
+        Self::read_preferences(bytes).map(|read| read.ui)
+    }
+
+    /// [`Self::from_preferences_json`], also reporting whether anything was discarded. Layouts
+    /// saved before the canvas joined the panel layout are converted (see
+    /// [`panel_docking::from_dock_only`]); that is not a loss, unless one cannot be converted.
+    pub fn read_preferences(bytes: &[u8]) -> serde_json::Result<ReadPreferences> {
         let mut saved: Value = serde_json::from_slice(bytes)?;
-        recover_docking(&mut saved);
+        let mut intact = recover_docking(&mut saved);
+        // Shortcut sets this version cannot read load as none (`lenient_sets`): keep the file.
+        intact &= saved.get("shortcutSets").is_none_or(|v| v.is_null() || serde_json::from_value::<craft_keymap::Profiles>(v.clone()).is_ok());
         if let Some(workspaces) = saved.get_mut("customWorkspaces").and_then(Value::as_array_mut) {
             for workspace in workspaces {
-                recover_docking(workspace);
+                intact &= recover_docking(workspace);
             }
         }
-        serde_json::from_value(saved)
+        let mut ui: UiState = serde_json::from_value(saved)?;
+        clear_stale_open_panels(&mut ui);
+        intact &= migrate(&mut ui.docking, &mut ui.floating, &ui.docking_hidden, ui.dock_expanded, ui.icon_groups.as_deref());
+        for workspace in &mut ui.custom_workspaces {
+            let SavedWorkspace { docking, floating, docking_hidden, dock_expanded, icon_groups, .. } = workspace;
+            intact &= migrate(docking, floating, docking_hidden, *dock_expanded, icon_groups.as_deref());
+        }
+        Ok(ReadPreferences { ui, intact })
     }
 }
 
-fn recover_docking(saved: &mut Value) {
-    let Some(fields) = saved.as_object_mut() else { return };
-    if fields.get("docking").is_some_and(|value| serde_json::from_value::<Option<Layout<String>>>(value.clone()).is_err()) {
-        fields.remove("docking");
+/// `UiState::shortcuts` in ui.json. `shortcuts` maps each changed command to its first
+/// shortcut (`""` for none): the map of one text per command that earlier DesignCraft versions
+/// read, and fail on with anything else, which drops the whole file. A command's further
+/// shortcuts go in `shortcutsMore` (command → texts), which those versions ignore. Loading
+/// appends them to the command's entry in `shortcuts`; extra shortcuts for a command missing
+/// there are ignored, because an earlier version that saved the file left that command at its
+/// defaults. `shortcuts` also loads in the shared keymap's array form, which the first builds
+/// on it wrote.
+pub(crate) mod saved_shortcuts {
+    use std::collections::BTreeMap;
+
+    use craft_keymap::{MAX_BINDINGS, Overrides};
+    use serde::ser::SerializeMap;
+    use serde::{Deserialize, Deserializer, Serializer};
+
+    pub fn serialize<S: Serializer>(overrides: &Overrides, serializer: S) -> Result<S::Ok, S::Error> {
+        let mut first = BTreeMap::new();
+        let mut more = BTreeMap::new();
+        for (command, texts) in overrides.iter() {
+            // A blank text is no shortcut, as `""` is in the map.
+            let mut texts = texts.iter().map(String::as_str).filter(|t| !t.trim().is_empty());
+            first.insert(command, texts.next().unwrap_or_default());
+            let rest: Vec<&str> = texts.collect();
+            if !rest.is_empty() {
+                more.insert(command, rest);
+            }
+        }
+        let mut map = serializer.serialize_map(None)?;
+        map.serialize_entry("shortcuts", &first)?;
+        if !more.is_empty() {
+            map.serialize_entry("shortcutsMore", &more)?;
+        }
+        map.end()
     }
-    if let Some(hidden) = fields.get_mut("dockingHidden") {
-        if let Some(entries) = hidden.as_object_mut() {
-            entries.retain(|_, value| serde_json::from_value::<Location<String>>(value.clone()).is_ok());
-        } else {
-            fields.remove("dockingHidden");
+
+    // `Overrides` loads leniently (never fails), so neither field can make ui.json unreadable.
+    #[derive(Default, Deserialize)]
+    #[serde(default, rename_all = "camelCase")]
+    struct Saved {
+        shortcuts: Overrides,
+        shortcuts_more: Overrides,
+    }
+
+    pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Overrides, D::Error> {
+        let Saved { mut shortcuts, shortcuts_more } = Saved::deserialize(deserializer)?;
+        for (command, rest) in shortcuts_more.iter() {
+            let Some(first) = shortcuts.get(command) else { continue };
+            let texts: Vec<String> = first.iter().chain(rest).take(MAX_BINDINGS).cloned().collect();
+            shortcuts.insert(command, texts);
+        }
+        Ok(shortcuts)
+    }
+}
+
+/// `UiState::shortcut_sets`: anything that does not read as shortcut sets (a later format, a
+/// hand edit) loads as none, keeping the rest of ui.json and the `shortcuts` the keymap uses.
+pub(crate) fn lenient_sets<'de, D: serde::Deserializer<'de>>(deserializer: D) -> Result<craft_keymap::Profiles, D::Error> {
+    let value = <Value as serde::Deserialize>::deserialize(deserializer)?;
+    Ok(serde_json::from_value(value).unwrap_or_default())
+}
+
+/// Files from before the canvas joined the panel layout saved the flyout open at quit as
+/// `openPanel`, which is the panel a workspace opens below Properties · Pages · Layers. Only a
+/// workspace's own panel stays: a built-in workspace's (Printing and Proofing: Swatches), and in a
+/// saved workspace one a built-in workspace opens (saving copies it). The current workspace keeps
+/// a saved workspace's panel.
+fn clear_stale_open_panels(ui: &mut UiState) {
+    let built_in = |panel: &str| crate::menus::WORKSPACE_OPEN_PANELS.iter().any(|(_, p)| *p == panel);
+    for workspace in &mut ui.custom_workspaces {
+        if workspace.open_panel.as_deref().is_some_and(|panel| !built_in(panel)) {
+            workspace.open_panel = None;
         }
     }
+    let own = match ui.custom_workspaces.iter().find(|w| w.name == ui.workspace) {
+        Some(saved) => saved.open_panel.as_deref(),
+        None => crate::menus::workspace_open_panel(&ui.workspace),
+    };
+    if ui.open_panel.as_deref() != own {
+        ui.open_panel = None;
+    }
+}
+
+/// Drop docking data this version cannot read. True when nothing was dropped.
+fn recover_docking(saved: &mut Value) -> bool {
+    let Some(fields) = saved.as_object_mut() else { return true };
+    let mut intact = true;
+    if fields.get("docking").is_some_and(|value| serde_json::from_value::<Option<Layout<String>>>(value.clone()).is_err()) {
+        fields.remove("docking");
+        intact = false;
+    }
+    if let Some(hidden) = fields.get_mut("dockingHidden") {
+        // `[[panel, location], …]`, or an object keyed by panel from older files.
+        if let Some(entries) = hidden.as_array_mut() {
+            let before = entries.len();
+            entries.retain(|entry| serde_json::from_value::<(String, Location<String>)>(entry.clone()).is_ok());
+            intact &= entries.len() == before;
+        } else if let Some(entries) = hidden.as_object_mut() {
+            let before = entries.len();
+            entries.retain(|_, value| serde_json::from_value::<Location<String>>(value.clone()).is_ok());
+            intact &= entries.len() == before;
+        } else {
+            fields.remove("dockingHidden");
+            intact = false;
+        }
+    }
+    intact
+}
+
+/// Convert a layout saved before the canvas joined the panel layout. One that cannot be
+/// converted gives way to the workspace's default layout, which the workspace fields
+/// (`dockTab`, `openPanel`, `floating`, `dockExpanded`, `iconGroups`) still describe. False when
+/// a layout was dropped that way.
+fn migrate(
+    docking: &mut Option<Layout<String>>,
+    floating: &mut Vec<(String, [f32; 2])>,
+    hidden: &HiddenPanels,
+    dock_expanded: bool,
+    icon_groups: Option<&[Vec<String>]>,
+) -> bool {
+    let Some(old) = docking.as_ref().filter(|layout| panel_docking::dock_only(layout)) else { return true };
+    *docking = panel_docking::from_dock_only(old, hidden.keys(), dock_expanded, icon_groups);
+    if docking.is_some() {
+        // The converted layout holds the floating dock panels.
+        floating.retain(|(id, _)| crate::dock::float_only(id));
+    }
+    docking.is_some()
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{DesignApp, SavedWorkspace};
-    use serde_json::json;
-
-    fn populated() -> UiState {
-        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
-        app.run("window.panel.move", json!({"panel":"swatches", "anchor":"layers", "zone":"top"})).unwrap();
-        app.run("window.panel.close", json!({"panel":"properties"})).unwrap();
-        app.ui.ui_scale = 1.5;
-        app.ui.language = "ja".into();
-        app.ui.custom_workspaces = vec![
-            SavedWorkspace {
-                name: "Print".into(),
-                docking: app.ui.docking.clone(),
-                docking_hidden: app.ui.docking_hidden.clone(),
-                ..Default::default()
-            },
-            SavedWorkspace { name: "Proof".into(), docking: app.ui.docking.clone(), ..Default::default() },
-        ];
-        app.ui
-    }
-
-    #[test]
-    fn saved_preferences_preserve_valid_layouts_and_hidden_origins() {
-        let original = serde_json::to_value(populated()).unwrap();
-        let loaded = UiState::from_preferences_json(&serde_json::to_vec(&original).unwrap()).unwrap();
-        assert_eq!(serde_json::to_value(loaded).unwrap(), original);
-    }
-
-    #[test]
-    fn future_layouts_recover_independently_without_resetting_preferences_or_workspaces() {
-        let original = populated();
-        for field in ["docking", "dockingHidden"] {
-            for invalid in [json!({"root":{"FutureLayout":{}}}), json!(false)] {
-                let mut saved = serde_json::to_value(&original).unwrap();
-                saved[field] = invalid.clone();
-                saved["customWorkspaces"][0][field] = invalid;
-                assert!(serde_json::from_value::<UiState>(saved.clone()).is_err(), "command parsing remains strict");
-                let loaded = UiState::from_preferences_json(&serde_json::to_vec(&saved).unwrap()).unwrap();
-                assert_eq!(loaded.ui_scale, 1.5);
-                assert_eq!(loaded.language, "ja");
-                assert_eq!(loaded.custom_workspaces.len(), 2);
-                assert_eq!(loaded.custom_workspaces[0].name, "Print");
-                assert_eq!(loaded.custom_workspaces[1].name, "Proof");
-                assert_eq!(loaded.custom_workspaces[1].docking, original.custom_workspaces[1].docking);
-                if field == "docking" {
-                    assert!(loaded.docking.is_none());
-                    assert!(loaded.custom_workspaces[0].docking.is_none());
-                    assert_eq!(loaded.docking_hidden, original.docking_hidden);
-                    assert_eq!(loaded.custom_workspaces[0].docking_hidden, original.custom_workspaces[0].docking_hidden);
-                } else {
-                    assert!(loaded.docking_hidden.is_empty());
-                    assert!(loaded.custom_workspaces[0].docking_hidden.is_empty());
-                    assert_eq!(loaded.docking, original.docking);
-                    assert_eq!(loaded.custom_workspaces[0].docking, original.custom_workspaces[0].docking);
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn unreadable_hidden_origin_does_not_discard_other_origins() {
-        let original = populated();
-        let mut saved = serde_json::to_value(&original).unwrap();
-        saved["dockingHidden"]["futurePanel"] = json!({"FutureLocation":{}});
-        saved["customWorkspaces"][0]["dockingHidden"]["futurePanel"] = json!(false);
-        let loaded = UiState::from_preferences_json(&serde_json::to_vec(&saved).unwrap()).unwrap();
-        assert!(!original.docking_hidden.is_empty());
-        assert_eq!(loaded.docking_hidden, original.docking_hidden);
-        assert_eq!(loaded.custom_workspaces[0].docking_hidden, original.custom_workspaces[0].docking_hidden);
-    }
-
-    #[test]
-    fn unrelated_malformed_preferences_are_still_rejected() {
-        assert!(UiState::from_preferences_json(br#"{"uiScale":"invalid","docking":false}"#).is_err());
-        assert!(UiState::from_preferences_json(br#"{"customWorkspaces":false}"#).is_err());
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/prefs/tests.rs b/crates/ui-egui/src/prefs/tests.rs
new file mode 100644
index 000000000..c897b05ab
--- /dev/null
+++ b/crates/ui-egui/src/prefs/tests.rs
@@ -0,0 +1,312 @@
+use super::*;
+use crate::DesignApp;
+use craft_ui::docking::{Column, Node, Side};
+use serde_json::json;
+
+fn populated() -> UiState {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+    app.run("window.panel.move", json!({"panel":"swatches", "anchor":"layers", "zone":"top"})).unwrap();
+    app.run("window.panel.close", json!({"panel":"properties"})).unwrap();
+    app.ui.ui_scale = 1.5;
+    app.ui.language = "ja".into();
+    app.ui.custom_workspaces = vec![
+        SavedWorkspace { name: "Print".into(), docking: app.ui.docking.clone(), docking_hidden: app.ui.docking_hidden.clone(), ..Default::default() },
+        SavedWorkspace { name: "Proof".into(), docking: app.ui.docking.clone(), ..Default::default() },
+    ];
+    app.ui
+}
+
+#[test]
+fn saved_preferences_preserve_valid_layouts_and_hidden_origins() {
+    let original = serde_json::to_value(populated()).unwrap();
+    let loaded = UiState::from_preferences_json(&serde_json::to_vec(&original).unwrap()).unwrap();
+    assert_eq!(serde_json::to_value(loaded).unwrap(), original);
+}
+
+#[test]
+fn future_layouts_recover_independently_without_resetting_preferences_or_workspaces() {
+    let original = populated();
+    for field in ["docking", "dockingHidden"] {
+        for invalid in [json!({"root":{"FutureLayout":{}}}), json!(false)] {
+            let mut saved = serde_json::to_value(&original).unwrap();
+            saved[field] = invalid.clone();
+            saved["customWorkspaces"][0][field] = invalid;
+            assert!(serde_json::from_value::<UiState>(saved.clone()).is_err(), "command parsing remains strict");
+            let loaded = UiState::from_preferences_json(&serde_json::to_vec(&saved).unwrap()).unwrap();
+            assert_eq!(loaded.ui_scale, 1.5);
+            assert_eq!(loaded.language, "ja");
+            assert_eq!(loaded.custom_workspaces.len(), 2);
+            assert_eq!(loaded.custom_workspaces[0].name, "Print");
+            assert_eq!(loaded.custom_workspaces[1].name, "Proof");
+            assert_eq!(loaded.custom_workspaces[1].docking, original.custom_workspaces[1].docking);
+            if field == "docking" {
+                assert!(loaded.docking.is_none());
+                assert!(loaded.custom_workspaces[0].docking.is_none());
+                assert_eq!(loaded.docking_hidden, original.docking_hidden);
+                assert_eq!(loaded.custom_workspaces[0].docking_hidden, original.custom_workspaces[0].docking_hidden);
+            } else {
+                assert!(loaded.docking_hidden.is_empty());
+                assert!(loaded.custom_workspaces[0].docking_hidden.is_empty());
+                assert_eq!(loaded.docking, original.docking);
+                assert_eq!(loaded.custom_workspaces[0].docking, original.custom_workspaces[0].docking);
+            }
+        }
+    }
+}
+
+#[test]
+fn unreadable_hidden_origin_does_not_discard_other_origins() {
+    let original = populated();
+    let mut saved = serde_json::to_value(&original).unwrap();
+    saved["dockingHidden"].as_array_mut().unwrap().push(json!(["futurePanel", {"FutureLocation":{}}]));
+    saved["customWorkspaces"][0]["dockingHidden"].as_array_mut().unwrap().push(json!(false));
+    let loaded = UiState::from_preferences_json(&serde_json::to_vec(&saved).unwrap()).unwrap();
+    assert!(!original.docking_hidden.is_empty());
+    assert_eq!(loaded.docking_hidden, original.docking_hidden);
+    assert_eq!(loaded.custom_workspaces[0].docking_hidden, original.custom_workspaces[0].docking_hidden);
+}
+
+#[test]
+fn unreadable_shortcut_sets_are_reported_so_the_file_is_kept() {
+    let mut saved = serde_json::to_value(populated()).unwrap();
+    assert!(UiState::read_preferences(&serde_json::to_vec(&saved).unwrap()).unwrap().intact);
+    saved.as_object_mut().unwrap().remove("shortcutSets");
+    assert!(UiState::read_preferences(&serde_json::to_vec(&saved).unwrap()).unwrap().intact, "no sets is no loss");
+    saved["shortcutSets"] = json!("a later format");
+    let read = UiState::read_preferences(&serde_json::to_vec(&saved).unwrap()).unwrap();
+    assert!(!read.intact);
+    assert!(read.ui.shortcut_sets.sets().is_empty(), "the rest of ui.json still loads");
+}
+
+#[test]
+fn unreadable_docking_is_reported_so_the_file_is_kept() {
+    let mut saved = serde_json::to_value(populated()).unwrap();
+    assert!(UiState::read_preferences(&serde_json::to_vec(&saved).unwrap()).unwrap().intact);
+    saved["customWorkspaces"][1]["docking"] = json!({"root":{"FutureLayout":{}}});
+    assert!(!UiState::read_preferences(&serde_json::to_vec(&saved).unwrap()).unwrap().intact);
+}
+
+/// The dock of a layout in the current shape: the canvas beside a dock at the end edge.
+fn dock(layout: &Layout<String>) -> &[Column<String>] {
+    assert!(crate::panel_docking::valid(layout), "{layout:?}");
+    let Some(Node::Split { first, second, .. }) = &layout.root else { panic!("expected the canvas split: {layout:?}") };
+    assert!(matches!(&**first, Node::Tabs { panels, .. } if panels == &["canvas"]));
+    let Node::Dock { side: Side::End, columns } = &**second else { panic!("expected an end dock: {second:?}") };
+    columns
+}
+
+fn panels(column: &Column<String>) -> Vec<Vec<&str>> {
+    column.groups.iter().map(|g| g.panels.iter().map(String::as_str).collect()).collect()
+}
+
+/// Hand-written pre-trial `ui.json` files: each loads through the app's path with nothing lost.
+fn load(saved: serde_json::Value) -> UiState {
+    UiState::read_preferences(&serde_json::to_vec(&saved).unwrap()).map(|read| read.ui).unwrap()
+}
+
+#[test]
+fn classic_dock_file_loads_as_its_workspace_default_layout() {
+    let ui = load(json!({
+        "workspace": "Printing and Proofing", "dockTab": "layers", "dockExpanded": true, "openPanel": "swatches",
+        "floating": [["glyphs", [100.0, 120.0]]],
+    }));
+    assert!(ui.docking.is_none());
+    let layout = crate::panel_docking::default_layout(&ui);
+    let columns = dock(&layout);
+    assert_eq!(panels(&columns[0]), [vec!["properties", "pages", "layers"], vec!["swatches"]]);
+    assert_eq!(columns[0].groups[0].active, 2, "Layers stays in front");
+    assert!(!columns[0].iconic && columns[1].iconic);
+    assert!(columns[1].groups.iter().all(|g| !g.panels.iter().any(|p| p == "glyphs" || p == "swatches")));
+    assert_eq!(layout.floating.len(), 1);
+    assert_eq!(crate::panel_docking::window_groups(&layout.floating[0])[0].panels, ["glyphs"]);
+    assert_eq!(&layout.floating[0].rect[..2], &[100.0, 120.0]);
+}
+
+/// An `openPanel` that was the flyout open at quit is not docked below Properties.
+#[test]
+fn a_flyout_open_at_quit_is_not_docked() {
+    let ui = load(json!({
+        "workspace": "Essentials", "dockExpanded": true, "openPanel": "stroke",
+        "customWorkspaces": [
+            {"name": "Mine", "dockExpanded": true, "openPanel": "effects"},
+            {"name": "Proof", "dockExpanded": true, "openPanel": "swatches"},
+        ],
+    }));
+    assert_eq!(ui.open_panel, None);
+    let layout = crate::panel_docking::default_layout(&ui);
+    assert_eq!(panels(&dock(&layout)[0]), [vec!["properties", "pages", "layers"]], "Stroke stays in its icon group");
+    assert_eq!(ui.custom_workspaces[0].open_panel, None);
+    assert_eq!(ui.custom_workspaces[1].open_panel.as_deref(), Some("swatches"), "saved from Printing and Proofing");
+    let ui = load(json!({"workspace": "Proof", "openPanel": "swatches", "customWorkspaces": [{"name": "Proof", "openPanel": "swatches"}]}));
+    assert_eq!(ui.open_panel.as_deref(), Some("swatches"), "the saved workspace's own panel");
+}
+
+#[test]
+fn dock_only_layout_becomes_the_main_column() {
+    let ui = load(json!({
+        "dockExpanded": true,
+        "docking": {"root": {"Tabs": {"panels": ["properties", "pages", "layers", "swatches"], "active": 3}}, "floating": []},
+        "customWorkspaces": [{
+            "name": "Split", "dockExpanded": true,
+            "docking": {"root": {"Split": {"axis": "Horizontal", "size": {"Ratio": 0.5},
+                "first": {"Tabs": {"panels": ["links"], "active": 0}},
+                "second": {"Split": {"axis": "Vertical", "size": {"Ratio": 0.5},
+                    "first": {"Tabs": {"panels": ["properties", "pages"], "active": 1}},
+                    "second": {"Stack": {"entries": [
+                        {"panel": "layers", "open": true, "height": null},
+                        {"panel": "swatches", "open": false, "height": 120.0}]}}}}}},
+                "floating": []},
+        }],
+    }));
+    let columns = dock(ui.docking.as_ref().unwrap());
+    assert_eq!(panels(&columns[0]), [vec!["properties", "pages", "layers", "swatches"]]);
+    assert_eq!(columns[0].groups[0].active, 3);
+    assert!(!columns[0].iconic);
+    let icons = &columns[1];
+    assert!(icons.iconic && icons.groups.iter().any(|g| g.panels == ["stroke", "color", "gradient"]));
+    assert!(icons.groups.iter().all(|g| !g.panels.iter().any(|p| p == "swatches")), "each panel appears once");
+
+    // Splits: a vertical split stacks groups in one column, a horizontal one adds a column
+    // (the dock lists columns from the window edge inwards).
+    let columns = dock(ui.custom_workspaces[0].docking.as_ref().unwrap());
+    assert_eq!(panels(&columns[0]), [vec!["properties", "pages"], vec!["layers"], vec!["swatches"]]);
+    assert_eq!(columns[0].groups[0].active, 1);
+    assert!(columns[0].groups[2].minimized && columns[0].groups[2].height == Some(120.0), "a closed accordion entry stays minimized");
+    assert_eq!(panels(&columns[1]), [vec!["links"]]);
+    assert!(columns[2].iconic);
+}
+
+#[test]
+fn icon_groups_become_the_iconic_column_in_order() {
+    let ui = load(json!({
+        "dockExpanded": true,
+        "iconGroups": [["pages", "layers"], ["properties", "swatches", "color"]],
+        "docking": {"root": {"Tabs": {"panels": ["properties"], "active": 0}}, "floating": []},
+    }));
+    let columns = dock(ui.docking.as_ref().unwrap());
+    assert_eq!(columns.len(), 2);
+    assert_eq!(panels(&columns[0]), [vec!["properties"]]);
+    assert!(columns[1].iconic);
+    assert_eq!(panels(&columns[1]), [vec!["pages", "layers"], vec!["swatches", "color"]]);
+}
+
+#[test]
+fn collapsed_dock_makes_the_main_column_iconic() {
+    let ui = load(json!({
+        "dockExpanded": false,
+        "docking": {"root": {"Tabs": {"panels": ["properties", "pages", "layers"], "active": 0}}, "floating": []},
+    }));
+    let columns = dock(ui.docking.as_ref().unwrap());
+    assert_eq!(panels(&columns[0]), [vec!["properties", "pages", "layers"]]);
+    assert!(columns.iter().all(|c| c.iconic));
+}
+
+#[test]
+fn floating_windows_and_hidden_places_survive_the_migration() {
+    let saved = json!({
+        "dockExpanded": true,
+        "floating": [["glyphs", [40.0, 60.0]], ["character", [40.0, 60.0]], ["tabs", [10.0, 20.0]]],
+        "docking": {
+            "root": {"Tabs": {"panels": ["properties", "pages", "layers"], "active": 0}},
+            "floating": [{"panels": ["glyphs", "character"], "active": 1, "rect": [40.0, 60.0, 300.0, 400.0]}],
+        },
+        "dockingHidden": {"color": {"floating": null, "anchor": "layers", "placement": {"Split": "Bottom"},
+            "size": {"Ratio": 0.5}, "stack": null}},
+    });
+    let read = UiState::read_preferences(&serde_json::to_vec(&saved).unwrap()).unwrap();
+    assert!(read.intact, "converting is not a loss");
+    let ui = read.ui;
+    let layout = ui.docking.clone().unwrap();
+    let columns = dock(&layout);
+    assert_eq!(layout.floating.len(), 1);
+    assert_eq!(crate::panel_docking::window_groups(&layout.floating[0])[0].panels, ["glyphs", "character"]);
+    assert_eq!(crate::panel_docking::window_groups(&layout.floating[0])[0].active, 1);
+    assert_eq!(layout.floating[0].rect, [40.0, 60.0, 300.0, 400.0]);
+    assert_eq!(ui.floating, [("tabs".to_string(), [10.0, 20.0])], "the layout holds the floating dock panels");
+    assert!(ui.docking_hidden.contains_key("color") && !layout.contains(&"color".to_string()), "a closed panel stays closed");
+    assert!(columns[1].groups.iter().all(|g| g.panels != ["glyphs"]));
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+    app.ui = ui;
+    app.run("window.panel", json!({"panel": "color"})).unwrap();
+    assert!(app.ui.docking.as_ref().unwrap().contains(&"color".to_string()));
+    assert!(!app.ui.docking_hidden.contains_key("color"));
+    // Saved again, the file is in the current shape and loads unchanged.
+    let again = UiState::from_preferences_json(&serde_json::to_vec(&app.ui).unwrap()).unwrap();
+    assert_eq!(again.docking, app.ui.docking);
+}
+
+/// Floating windows saved as a stack of groups (`groups`, before floating windows held split
+/// trees) load as a vertical split of the groups in order, sized by their heights; a window
+/// whose groups were all minimized loads minimized.
+#[test]
+fn floating_stacks_of_groups_load_as_split_windows() {
+    let mut saved = serde_json::to_value(UiState::default()).unwrap();
+    let mut docking = serde_json::to_value(crate::panel_docking::default_layout(&UiState::default())).unwrap();
+    docking["floating"] = json!([
+        {"groups": [
+            {"panels": ["swatches", "color"], "active": 1, "minimized": false, "height": 300.0},
+            {"panels": ["stroke"], "active": 0, "minimized": false, "height": 100.0},
+        ], "rect": [400.0, 100.0, 280.0, 440.0]},
+        {"groups": [{"panels": ["glyphs"], "active": 0, "minimized": true, "height": null}], "rect": [40.0, 60.0, 300.0, 400.0]},
+    ]);
+    docking["root"]["Split"]["second"]["Dock"]["columns"][1]["groups"] = json!([{"panels": ["effects"], "active": 0}]);
+    saved["docking"] = docking;
+    let read = UiState::read_preferences(&serde_json::to_vec(&saved).unwrap()).unwrap();
+    assert!(read.intact);
+    let layout = read.ui.docking.clone().unwrap();
+    dock(&layout);
+    let Node::Split { axis: craft_ui::layout::SplitAxis::Vertical, size: craft_ui::layout::SplitSize::Ratio(ratio), first, second } =
+        &layout.floating[0].root
+    else {
+        panic!("expected a vertical split: {:?}", layout.floating[0]);
+    };
+    assert!((ratio - 0.75).abs() < 1e-4, "{ratio}");
+    assert_eq!(**first, Node::Tabs { panels: vec!["swatches".into(), "color".into()], active: 1 });
+    assert_eq!(**second, Node::Tabs { panels: vec!["stroke".into()], active: 0 });
+    assert_eq!(layout.floating[0].rect, [400.0, 100.0, 280.0, 440.0]);
+    assert!(!layout.floating[0].minimized && layout.floating[1].minimized);
+    let again = UiState::from_preferences_json(&serde_json::to_vec(&read.ui).unwrap()).unwrap();
+    assert_eq!(again.docking, read.ui.docking);
+}
+
+/// An old layout that cannot be converted gives way to the workspace's default and is
+/// reported, so the file it came from is kept.
+#[test]
+fn an_old_layout_that_cannot_be_converted_is_reported() {
+    let saved = json!({"docking": {"root": {"Tabs": {"panels": ["properties", "properties"], "active": 0}}, "floating": []}});
+    let read = UiState::read_preferences(&serde_json::to_vec(&saved).unwrap()).unwrap();
+    assert!(!read.intact);
+    assert_eq!(read.ui.docking, None);
+}
+
+/// `dockingHidden` as an object keyed by panel (files before craft-ui's `Workspace::hidden`
+/// list) loads as the list, drops only its unreadable entries and saves as the list.
+#[test]
+fn hidden_panels_keyed_by_panel_load_as_the_workspace_list() {
+    let place = json!({"floating": null, "anchor": "layers", "placement": {"Split": "Bottom"}, "size": {"Ratio": 0.5}, "stack": null});
+    let saved = json!({
+        "dockingHidden": {"color": place, "swatches": place, "futurePanel": {"FutureLocation": {}}},
+        "customWorkspaces": [{"name": "Old", "dockingHidden": {"stroke": place}}],
+    });
+    let read = UiState::read_preferences(&serde_json::to_vec(&saved).unwrap()).unwrap();
+    assert!(!read.intact, "the unreadable entry is reported so the file is kept");
+    let ui = read.ui;
+    assert_eq!(ui.docking_hidden.keys().collect::<Vec<_>>(), ["color", "swatches"]);
+    assert_eq!(ui.custom_workspaces[0].docking_hidden.keys().collect::<Vec<_>>(), ["stroke"]);
+    let written = serde_json::to_value(&ui).unwrap();
+    assert_eq!(written["dockingHidden"][0][0], "color");
+    let workspace: craft_ui::docking::Workspace<String> =
+        serde_json::from_value(json!({"layout": {"root": null, "floating": []}, "hidden": written["dockingHidden"]})).unwrap();
+    assert_eq!(workspace.hidden, ui.docking_hidden.0, "the same shape as craft-ui's Workspace::hidden");
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+    app.ui = ui;
+    app.run("window.panel", json!({"panel": "color"})).unwrap();
+    assert!(app.ui.docking.as_ref().unwrap().contains(&"color".to_string()));
+    assert!(!app.ui.docking_hidden.contains_key("color"));
+}
+
+#[test]
+fn unrelated_malformed_preferences_are_still_rejected() {
+    assert!(UiState::from_preferences_json(br#"{"uiScale":"invalid","docking":false}"#).is_err());
+    assert!(UiState::from_preferences_json(br#"{"customWorkspaces":false}"#).is_err());
+}
diff --git a/crates/ui-egui/src/render_worker.rs b/crates/ui-egui/src/render_worker.rs
index 36c8016d6..f916e01b5 100644
--- a/crates/ui-egui/src/render_worker.rs
+++ b/crates/ui-egui/src/render_worker.rs
@@ -47,7 +47,7 @@ impl Worker {
                         job = newer;
                     }
                     let t0 = crate::now_ms();
-                    let image = r.render(&job.doc, &job.cache, &job.placed, job.w, job.h, job.view, &job.opts);
+                    let image = r.render(&job.doc, &job.cache, &job.placed, (job.w, job.h), job.view, &job.opts);
                     if done_tx.send(Done { token: job.token, image, ms: crate::now_ms() - t0 }).is_err() {
                         break;
                     }
diff --git a/crates/ui-egui/src/rtl.rs b/crates/ui-egui/src/rtl.rs
index cb88619ec..707231595 100644
--- a/crates/ui-egui/src/rtl.rs
+++ b/crates/ui-egui/src/rtl.rs
@@ -1,12 +1,15 @@
-//! Read-only interface text: Unicode bidi run ordering followed by Arabic shaping.
-//! Source strings stay logical. Never use these galleys for editable text/caret mapping.
+//! Read-only interface text in any script. Source strings stay logical: epaint resolves each
+//! paragraph's direction (`LayoutJob::direction == Auto`), runs the Unicode bidi algorithm once
+//! and orders a row's glyphs for painting while the glyph array and `Galley::job.text` stay
+//! logical. Never use these galleys for editable text/caret mapping (the canvas has its own
+//! composer).
+use egui::epaint::text::TextDirection;
 use egui::text::{LayoutJob, TextWrapping};
-use egui::{Align, Align2, Color32, FontFamily, FontId, Galley, Pos2, Rect, WidgetText};
-use std::{collections::HashMap, ops::Range, sync::Arc};
-use unicode_bidi::{BidiClass, BidiInfo, bidi_class};
-use unicode_segmentation::UnicodeSegmentation;
+use egui::{Align, Align2, Color32, FontId, Galley, Pos2, Rect, WidgetText};
+use std::{collections::HashMap, sync::Arc};
+use unicode_bidi::{BidiClass, bidi_class};
 
-/// Allocation-free preflight: ordinary Latin, CJK and emoji labels need no bidi analysis.
+/// Allocation-free preflight: ordinary Latin, CJK and emoji labels need no cache lookup.
 /// Include directional controls so explicit embeddings/overrides keep their existing behavior.
 fn may_have_rtl(text: &str) -> bool {
     !text.is_ascii()
@@ -29,26 +32,28 @@ fn may_have_rtl(text: &str) -> bool {
         })
 }
 
-fn has_rtl(text: &str) -> bool {
-    may_have_rtl(text) && BidiInfo::new(text, None).has_rtl()
-}
-
-/// Resolve translated labels through bidi, without changing IDs, commands or stored text.
+/// Resolve translated labels through the shaper, without changing IDs, commands or stored text.
 pub fn widget(ui: &egui::Ui, text: impl Into<WidgetText>) -> WidgetText {
     let text = text.into();
-    if !has_rtl(text.text()) {
+    if !may_have_rtl(text.text()) {
         return text;
     }
     let mut job = (*text.into_layout_job(ui.style(), egui::FontSelection::Default, Align::Center)).clone();
+    // The shaper owns bidi: it keeps the glyphs in logical order and gives each row a visual
+    // order (and the paragraph's start edge), so nothing here may reorder or mirror text.
+    job.direction = TextDirection::Auto;
+    if job.language.is_none() {
+        job.language = ui.language();
+    }
     job.wrap = TextWrapping::from_wrap_mode_and_width(ui.wrap_mode(), ui.available_width());
     WidgetText::Galley(layout(ui.ctx(), job))
 }
 
-/// Labels are read-only: egui's LTR selection indices cannot map bidi glyph order.
-/// Accessibility still receives the original logical string through Galley::job.
+/// Labels are read-only: no editable text/caret mapping is derived from a shaped galley.
+/// Accessibility still receives the original logical string through `Galley::job`.
 pub fn label(ui: &mut egui::Ui, text: impl Into<WidgetText>) -> egui::Response {
     let text = text.into();
-    let rtl = has_rtl(text.text());
+    let rtl = may_have_rtl(text.text());
     if !rtl {
         return ui.label(text);
     }
@@ -90,62 +95,6 @@ pub fn paint(p: &egui::Painter, pos: Pos2, anchor: Align2, text: &str, font: Fon
     p.galley(rect.min, galley, color);
 }
 
-/// Reorder directional runs, not characters: the shaper needs logical Arabic to join letters.
-fn visual_line(job: &LayoutJob, bidi: &BidiInfo<'_>, line: Range<usize>) -> LayoutJob {
-    let mut visual = LayoutJob { break_on_newline: false, ..Default::default() };
-    if line.is_empty() {
-        if let Some(section) =
-            job.sections.iter().find(|s| usize::from(s.byte_range.start) <= line.start && line.start <= usize::from(s.byte_range.end))
-        {
-            visual.append("", 0.0, section.format.clone());
-        }
-        return visual;
-    }
-    let Some(para) = bidi.paragraphs.iter().find(|p| p.range.start <= line.start && line.start < p.range.end) else {
-        // Preserve the font/height for an empty line.
-        if let Some(section) = job.sections.first() {
-            visual.append("", 0.0, section.format.clone());
-        }
-        return visual;
-    };
-    let (levels, runs) = bidi.visual_runs(para, line);
-    for run in runs {
-        let rtl = levels[run.start].is_rtl();
-        let mut sections: Vec<_> = job
-            .sections
-            .iter()
-            .filter_map(|section| {
-                let start = run.start.max(section.byte_range.start.into());
-                let end = run.end.min(section.byte_range.end.into());
-                (start < end).then_some((section, start..end))
-            })
-            .collect();
-        if rtl {
-            sections.reverse();
-        }
-        for (section, range) in sections {
-            let mut format = section.format.clone();
-            if rtl {
-                let bold = format.font_id.family == FontFamily::Name("semibold".into());
-                format.font_id.family = FontFamily::Name(if bold { "arabic-semibold" } else { "arabic" }.into());
-                if bold {
-                    format.coords = egui::epaint::text::VariationCoords::new([(*b"wght", 600.0)]);
-                }
-            }
-            let text = &job.text[range];
-            if rtl && !text.chars().any(designcraft_fonts::is_rtl) {
-                // Neutral-only RTL runs have no script for the shaper to infer a direction.
-                // Apply UBA L4 mirroring here; Arabic runs are mirrored by the shaper.
-                let neutral: String = text.chars().rev().map(|c| unicode_bidi_mirroring::get_mirrored(c).unwrap_or(c)).collect();
-                visual.append(&neutral, section.leading_space, format);
-            } else {
-                visual.append(text, section.leading_space, format);
-            }
-        }
-    }
-    visual
-}
-
 const MAX_CACHED_LABELS: usize = 256;
 const MAX_CACHED_TEXT_BYTES: usize = 4096;
 
@@ -191,6 +140,7 @@ impl LayoutCache {
     }
 }
 
+/// Lay out text without RTL candidates directly; otherwise use a bounded job cache that checks full job equality and invalidates on the font token.
 fn layout(ctx: &egui::Context, job: LayoutJob) -> Arc<Galley> {
     if !may_have_rtl(&job.text) {
         return ctx.fonts_mut(|fonts| fonts.layout_job(job));
@@ -200,7 +150,7 @@ fn layout(ctx: &egui::Context, job: LayoutJob) -> Arc<Galley> {
         return layout_uncached(ctx, job);
     }
     let token = ctx.fonts_mut(|fonts| fonts.layout_no_wrap(String::new(), FontId::default(), Color32::TRANSPARENT));
-    let id = egui::Id::new("designcraft.rtl.layout-cache");
+    let id = egui::Id::unique("designcraft.rtl.layout-cache");
     let key = egui::util::hash(&job);
     let cached = ctx.data_mut(|data| data.get_temp_mut_or_default::<LayoutCache>(id).lookup(token, key, &job));
     if let Some(galley) = cached {
@@ -211,100 +161,18 @@ fn layout(ctx: &egui::Context, job: LayoutJob) -> Arc<Galley> {
     galley
 }
 
+/// Set paragraph direction to `Auto` and preserve the logical source, including line separators in a single-line label.
 fn layout_uncached(ctx: &egui::Context, mut job: LayoutJob) -> Arc<Galley> {
-    if !has_rtl(&job.text) {
-        return ctx.fonts_mut(|fonts| fonts.layout_job(job));
-    }
-    let original = Arc::new(job.clone());
-    if !job.break_on_newline {
-        // Single-line widgets show line separators as spaces; byte offsets stay unchanged.
-        job.text = job.text.replace(['\n', '\r'], " ");
-    }
-    let bidi = BidiInfo::new(&job.text, None);
-    let shape = |range| ctx.fonts_mut(|fonts| fonts.layout_job(visual_line(&job, &bidi, range)));
-    // Wrap in logical reading order BEFORE applying bidi separately to each line.
-    let mut ranges = Vec::new();
-    let mut start = 0;
-    for paragraph in job.text.split_inclusive('\n') {
-        let end = start + paragraph.len();
-        let content_end = if paragraph.ends_with('\n') { end - 1 } else { end };
-        if !job.wrap.max_width.is_finite() || shape(start..content_end).size().x <= job.wrap.max_width {
-            ranges.push(start..content_end);
-            start = end;
-            continue;
-        }
-        let mut line_start = start;
-        let mut word_break = start;
-        for (offset, cluster) in job.text[start..content_end].grapheme_indices(true) {
-            let index = start + offset;
-            let boundary = index + cluster.len();
-            if job.wrap.max_width.is_finite() && index > line_start && shape(line_start..boundary).size().x > job.wrap.max_width {
-                let cut = if !job.wrap.break_anywhere && word_break > line_start { word_break } else { index };
-                ranges.push(line_start..cut);
-                line_start = cut;
-            }
-            if cluster.chars().all(char::is_whitespace) {
-                word_break = boundary;
-            }
-        }
-        ranges.push(line_start..content_end);
-        start = end;
-    }
-    if job.text.ends_with('\n') {
-        ranges.push(start..start);
-    }
-    let elided = ranges.len() > job.wrap.max_rows;
-    ranges.truncate(job.wrap.max_rows);
-    let mut lines = Vec::new();
-    for (i, range) in ranges.iter().enumerate() {
-        if elided && i + 1 == ranges.len() {
-            // Append the ellipsis in logical order, then reorder and shape the final line.
-            let mut last = LayoutJob::default();
-            for section in &job.sections {
-                let start = range.start.max(section.byte_range.start.into());
-                let end = range.end.min(section.byte_range.end.into());
-                if start < end {
-                    last.append(&job.text[start..end], 0.0, section.format.clone());
-                }
-            }
-            let format = last.sections.last().or(job.sections.first()).map(|s| s.format.clone()).unwrap_or_default();
-            let tail = job.wrap.overflow_character.map_or(String::new(), |c| c.to_string());
-            let base = bidi.paragraphs.iter().find(|p| p.range.contains(&range.start)).map(|p| p.level);
-            loop {
-                let mut candidate = last.clone();
-                candidate.append(&tail, 0.0, format.clone());
-                let info = BidiInfo::new(&candidate.text, base);
-                let shaped = ctx.fonts_mut(|fonts| fonts.layout_job(visual_line(&candidate, &info, 0..candidate.text.len())));
-                if shaped.size().x <= job.wrap.max_width || last.text.is_empty() {
-                    lines.push(shaped);
-                    break;
-                }
-                let end = last.text.grapheme_indices(true).next_back().map_or(0, |(i, _)| i);
-                last.text.truncate(end);
-                for section in &mut last.sections {
-                    section.byte_range.end = usize::from(section.byte_range.end).min(end).into();
-                }
-                last.sections.retain(|s| s.byte_range.start < s.byte_range.end);
-            }
-        } else {
-            lines.push(shape(range.clone()));
-        }
-    }
-    let mut galley = Galley::concat(original, &lines, ctx.pixels_per_point());
-    galley.elided = elided;
-    // Each Arabic line shares the right edge; Latin runs and numbers remain LTR.
-    let width = galley.rect.width();
-    galley.mesh_bounds = Rect::NOTHING;
-    for row in &mut galley.rows {
-        row.pos.x += width - row.size.x;
-        galley.mesh_bounds |= row.visuals.mesh_bounds.translate(row.pos.to_vec2());
-    }
-    Arc::new(galley)
+    job.direction = TextDirection::Auto;
+    // The 0.37 shaper owns single-line handling as well as bidi. Preserve the logical source
+    // for accessibility and cache equality, including line separators in a single-line label.
+    ctx.fonts_mut(|fonts| fonts.layout_job(job))
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use egui::FontFamily;
 
     fn with_fonts(test: impl FnOnce(&egui::Context)) {
         let ctx = egui::Context::default();
@@ -317,6 +185,20 @@ mod tests {
         output.textures_delta.clear();
     }
 
+    /// The glyphs in the order they are painted, left to right per row.
+    fn drawn(galley: &Galley) -> String {
+        let mut out = String::new();
+        for row in &galley.rows {
+            for i in row.row.visual_order().filter(|&i| row.row.glyphs.get(i).is_some_and(|g| g.advance_width > 0.0)) {
+                if let Some(glyph) = row.row.glyphs.get(i) {
+                    out.push(glyph.chr);
+                }
+            }
+        }
+        out
+    }
+
+    /// The glyphs in logical order (the stored order, independent of the paragraph direction).
     fn displayed(galley: &Galley) -> String {
         galley.rows.iter().flat_map(|row| row.glyphs.iter().filter(|g| g.advance_width > 0.0).map(|g| g.chr)).collect()
     }
@@ -438,22 +320,22 @@ mod tests {
         });
     }
 
+    /// Latin, CJK, combining and emoji labels skip the RTL path; Arabic/Hebrew, controls and Arabic-Indic digits take it.
     #[test]
-    fn ordinary_multilingual_labels_skip_bidi_analysis() {
+    fn ordinary_multilingual_labels_skip_the_rtl_layout_cache() {
         for text in ["", "File (123)", "Édition", "中文排版", "スウォッチ", "e\u{301}", "🎨 🙂"] {
             assert!(!may_have_rtl(text), "{text:?}");
-            assert!(!BidiInfo::new(text, None).has_rtl(), "{text:?}");
         }
         for text in ["ملف", "עברית", "PDF ملف 123", "\u{1e900}", "\u{200f}", "\u{202e}abc\u{202c}", "\u{2067}abc\u{2069}", "١٢٣"] {
             assert!(may_have_rtl(text), "{text:?}");
-            assert_eq!(has_rtl(text), BidiInfo::new(text, None).has_rtl(), "{text:?}");
         }
     }
 
+    /// Non-RTL widgets remain `RichText`, keep their text and lay out with finite bounds.
     #[test]
     fn non_rtl_widgets_keep_native_text_and_formatting() {
         with_fonts(|ctx| {
-            egui::Area::new(egui::Id::new("rtl-fast-path-test")).show(ctx, |ui| {
+            egui::Area::new(egui::Id::unique("rtl-fast-path-test")).show(ctx, |ui| {
                 for text in ["中文", "日本語", "Édition", "🎨"] {
                     let rendered = widget(ui, egui::RichText::new(text).strong());
                     assert!(matches!(rendered, WidgetText::RichText(_)));
@@ -464,25 +346,27 @@ mod tests {
         });
     }
 
+    /// Source and glyph arrays stay logical; painting applies bidi, mirrors brackets, keeps `PDF 123` left-to-right and gives finite metrics.
     #[test]
     fn mixed_arabic_latin_digits_and_brackets_preserve_logical_source() {
         with_fonts(|ctx| {
             let text = "ملف (PDF 123) جديد";
             let galley = plain(ctx, text, FontId::proportional(15.0), Color32::WHITE);
+            // The source stays logical in both the job and the glyph array.
             assert_eq!(galley.job.text, text);
-            let visual = displayed(&galley);
+            let row = &galley.rows[0].row;
+            assert_eq!(row.text(), text);
+            // Painting is reordered once by the shaper: the last logical word is drawn leftmost,
+            // and the Latin number inside the Arabic sentence still reads left to right.
+            let visual = drawn(&galley);
             assert!(visual.contains("PDF 123"), "{visual}");
-            let row = &galley.rows[0];
-            let left_bracket = row.glyphs.iter().find(|g| g.chr == ')' && !g.uv_rect.is_nothing()).unwrap();
-            // A neutral-only final bracket must be mirrored even without an Arabic script run.
-            let job = LayoutJob::simple_singleline("ملف (PDF 123)".to_owned(), FontId::proportional(15.0), Color32::WHITE);
-            let bidi = BidiInfo::new(&job.text, None);
-            let visual_job = visual_line(&job, &bidi, 0..job.text.len());
-            assert!(visual_job.text.starts_with("(PDF 123"), "{}", visual_job.text);
-            let p = row.glyphs.iter().find(|g| g.chr == 'P').unwrap();
-            let three = row.glyphs.iter().find(|g| g.chr == '3').unwrap();
-            assert!(left_bracket.pos.x < p.pos.x && p.pos.x < three.pos.x);
             assert!(visual.starts_with('د'), "Arabic final word belongs at the left: {visual}");
+            let x = |c: char| row.glyphs.iter().find(|g| g.chr == c && g.advance_width > 0.0).unwrap().pos.x;
+            // The shaper mirrors the brackets: the logical ')' is drawn as '(' left of the number,
+            // the logical '(' as ')' right of it.
+            assert!(x(')') < x('P') && x('3') < x('('), "brackets around the number: {visual}");
+            // Letters inside the right-to-left words are placed right to left.
+            assert!(x('ج') < x('ف'), "Arabic word order: {visual}");
             assert!(galley.rect.is_finite());
             assert!(galley.mesh_bounds.is_finite());
         });
@@ -502,23 +386,33 @@ mod tests {
         });
     }
 
+    /// Fallback shaping matches the native Auto-direction shaper in displayed glyphs, sizes, atlas UVs, advances and spaces.
     #[test]
-    fn joins_arabic_letters_using_one_font_including_spaces() {
+    fn arabic_fallback_matches_the_native_shaper_including_spaces() {
         with_fonts(|ctx| {
             let text = "بِدء مُستند جَديد";
             let galley = plain(ctx, text, FontId::proportional(15.0), Color32::WHITE);
             let expected = ctx.fonts_mut(|fonts| {
-                fonts.layout_job(LayoutJob::simple_singleline(text.to_owned(), FontId::new(15.0, FontFamily::Name("arabic".into())), Color32::WHITE))
+                // The native shaper resolves Arabic clusters from the requested UI family. A
+                // different Arabic-primary family changes spaces and line metrics too; it is
+                // not an oracle for fallback shaping in a proportional UI label.
+                let mut job = LayoutJob::simple_singleline(text.to_owned(), FontId::proportional(15.0), Color32::WHITE);
+                job.direction = TextDirection::Auto;
+                fonts.layout_job(job)
             });
+            assert_eq!(galley.job.text, text);
             assert_eq!(displayed(&galley), displayed(&expected));
             assert_eq!(galley.size(), expected.size());
-            // Contextual glyphs (atlas positions) must match the unbroken Arabic shaping run.
+            assert_eq!(galley.rows[0].glyphs.len(), expected.rows[0].glyphs.len());
+            // Contextual glyphs (atlas positions) must match the native logical shaping run.
             for (actual, expected) in galley.rows[0].glyphs.iter().zip(&expected.rows[0].glyphs) {
                 assert_eq!(actual.uv_rect, expected.uv_rect);
+                assert_eq!(actual.advance_width, expected.advance_width);
             }
         });
     }
 
+    /// Logical wrapping puts the first word first and every RTL row flush right within one pixel.
     #[test]
     fn wraps_first_logical_word_first_and_right_aligns_lines() {
         with_fonts(|ctx| {
@@ -530,8 +424,10 @@ mod tests {
             assert!(galley.rows.len() >= 3);
             let first: String = galley.rows[0].glyphs.iter().map(|g| g.chr).collect();
             assert!(first.contains('م') && first.contains('س') && !first.contains('ج'), "{first}");
+            // Every right-to-left row is flush with the right edge. Rows are pixel-snapped, so the
+            // shared edge can differ from the galley width by less than one pixel.
             for row in &galley.rows {
-                assert!((row.pos.x + row.size.x - galley.size().x).abs() < 0.01);
+                assert!((row.pos.x + row.size.x - galley.size().x).abs() < 1.0, "{:?}", row.pos);
             }
             assert_eq!(galley.job.text, text);
         });
diff --git a/crates/ui-egui/src/section_options.rs b/crates/ui-egui/src/section_options.rs
index 899b9fbed..ea96f9f60 100644
--- a/crates/ui-egui/src/section_options.rs
+++ b/crates/ui-egui/src/section_options.rs
@@ -105,7 +105,7 @@ fn text(ui: &mut Ui, d: &mut Dialog, key: &str, width: f32) {
 fn style_menu(ui: &mut Ui, d: &mut Dialog, key: &str) {
     let current: NumberStyle = d.fields.get(key).and_then(|v| serde_json::from_value(v.clone()).ok()).unwrap_or_default();
     let shown = STYLES.iter().find(|(s, _)| *s == current).map_or(STYLES[0].1, |(_, l)| l);
-    egui::ComboBox::from_id_salt(("section_style", key)).selected_text(shown).width(150.0).show_ui(ui, |ui| {
+    craft_ui::ComboBox::from_id_salt(("section_style", key)).selected_text(shown).width(150.0).show_ui(ui, |ui| {
         for (style, label) in STYLES {
             if ui.selectable_label(style == current, label).clicked() {
                 d.fields.insert(key.into(), json!(style));
diff --git a/crates/ui-egui/src/separations.rs b/crates/ui-egui/src/separations.rs
new file mode 100644
index 000000000..d422d08fc
--- /dev/null
+++ b/crates/ui-egui/src/separations.rs
@@ -0,0 +1,464 @@
+//! View › Separations Preview on the canvas: each visible spread exported as Export PDF prints
+//! it and separated into plates (`designcraft_engine::separations`), drawn over the spread.
+//!
+//! Sheets are kept per spread, keyed by document revision, resolution, print settings and color
+//! settings (the CMYK working space is the printing condition plates are separated for), so
+//! panning and redrawing reuse them. Separating runs on a background thread (native); while it
+//! runs the previous sheet of that spread stays on screen. On the web it runs on the UI thread
+//! at a lower resolution.
+
+use std::sync::Arc;
+
+use designcraft_doc::SpreadRef;
+use designcraft_engine::separations::{MAX_DPI, MIN_DPI, Print, Sheet};
+use designcraft_geom::Point;
+use designcraft_tools::CanvasLayout;
+use egui::{Color32, pos2};
+
+use crate::DesignApp;
+use crate::canvas::Xf;
+
+/// View › Separations Preview settings (`None` in `UiState::separations` is off).
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Separations {
+    /// The ink shown alone as film; `None` shows every ink as printed.
+    pub plate: Option<String>,
+    /// Ink Limit: areas whose total ink is over this percentage show in red over gray.
+    pub ink_limit: Option<f32>,
+}
+
+/// Sheets kept when few spreads are visible (each holds one plane per ink).
+const MAX_SHEETS: usize = 6;
+/// Visible spreads separated at most: beyond this many the rest show without plates.
+const MAX_VISIBLE: usize = 4 * MAX_SHEETS;
+/// The highest resolution the web build separates at (on the UI thread).
+#[cfg(target_arch = "wasm32")]
+const WEB_MAX_DPI: f32 = 72.0;
+
+/// What a sheet was separated from.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Key {
+    pub uid: u64,
+    pub revision: u64,
+    pub spread: usize,
+    pub dpi: f32,
+    pub print: Print,
+    /// The color settings it was separated under ([`designcraft_color::cms::generation`]).
+    pub cms: u64,
+}
+
+struct Entry {
+    key: Key,
+    sheet: Result<Arc<Sheet>, String>,
+    /// The texture of the current view of `sheet`.
+    texture: Option<(Separations, egui::TextureHandle)>,
+    /// The frame it was last drawn in.
+    used: u64,
+}
+
+struct Job {
+    key: Key,
+    doc: Arc<designcraft_doc::Document>,
+    cache: Arc<designcraft_compose::Cache>,
+}
+
+struct Done {
+    key: Key,
+    sheet: Result<Sheet, String>,
+    ms: f64,
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+struct Worker {
+    tx: std::sync::mpsc::Sender<Job>,
+    rx: std::sync::mpsc::Receiver<Done>,
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+impl Worker {
+    fn spawn(ctx: egui::Context) -> Option<Self> {
+        let (tx, jobs) = std::sync::mpsc::channel::<Job>();
+        let (done_tx, rx) = std::sync::mpsc::channel::<Done>();
+        std::thread::Builder::new()
+            .name("designcraft-separations".into())
+            .spawn(move || {
+                while let Ok(first) = jobs.recv() {
+                    // Of the jobs waiting, only the newest per spread matters.
+                    let mut batch = vec![first];
+                    while let Ok(next) = jobs.try_recv() {
+                        batch.retain(|j| j.key.spread != next.key.spread);
+                        batch.push(next);
+                    }
+                    for job in batch {
+                        let done = separate(job);
+                        if done_tx.send(done).is_err() {
+                            return;
+                        }
+                        ctx.request_repaint();
+                    }
+                }
+            })
+            .ok()?;
+        Some(Worker { tx, rx })
+    }
+}
+
+fn separate(job: Job) -> Done {
+    let t0 = crate::now_ms();
+    let sheet =
+        designcraft_engine::separations::separate(&job.doc, &job.cache, job.key.spread, job.key.dpi, &job.key.print).map_err(|e| e.to_string());
+    Done { key: job.key, sheet, ms: crate::now_ms() - t0 }
+}
+
+/// The canvas's separated sheets.
+#[derive(Default)]
+pub struct Preview {
+    entries: Vec<Entry>,
+    pending: Vec<Key>,
+    /// The spreads the canvas last drew: every one keeps its sheet, so a visible sheet is never
+    /// evicted only to be separated again next frame.
+    visible: usize,
+    #[cfg(not(target_arch = "wasm32"))]
+    worker: Option<Worker>,
+    #[cfg(not(target_arch = "wasm32"))]
+    worker_started: bool,
+    frame: u64,
+    /// The frame that last separated a sheet on the UI thread.
+    separated_in: Option<u64>,
+    /// The spread and the point in it under the pointer, for the panel's readout.
+    pub pointer: Option<(usize, Point)>,
+    /// How long the last separation took, in milliseconds.
+    pub last_ms: f64,
+    /// The pixels per point the canvas last drew at (0 before it drew).
+    ppp: f64,
+}
+
+impl Preview {
+    fn insert(&mut self, key: Key, sheet: Result<Arc<Sheet>, String>) {
+        self.pending.retain(|k| *k != key);
+        let frame = self.frame;
+        match self.entries.iter_mut().find(|e| e.key.spread == key.spread) {
+            Some(e) => *e = Entry { key, sheet, texture: None, used: frame },
+            None => self.entries.push(Entry { key, sheet, texture: None, used: frame }),
+        }
+        let limit = self.visible.clamp(MAX_SHEETS, MAX_VISIBLE);
+        if self.entries.len() > limit {
+            self.entries.sort_by_key(|e| std::cmp::Reverse(e.used));
+            self.entries.truncate(limit);
+        }
+    }
+
+    /// Notes `key` as sent to the worker. The worker keeps only the newest waiting job of a
+    /// spread and drops the rest unanswered, so an older key of the spread is no longer pending.
+    fn queued(&mut self, key: Key) {
+        self.pending.retain(|k| k.spread != key.spread);
+        self.pending.push(key);
+    }
+
+    /// Collects finished separations.
+    fn poll(&mut self) {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let mut done = Vec::new();
+            if let Some(w) = &self.worker {
+                while let Ok(d) = w.rx.try_recv() {
+                    done.push(d);
+                }
+            }
+            for d in done {
+                self.last_ms = d.ms;
+                self.insert(d.key, d.sheet.map(Arc::new));
+            }
+        }
+    }
+
+    /// Asks for `key` to be separated, unless it is already or is being.
+    fn request(&mut self, ctx: &egui::Context, job: Job) {
+        if self.pending.contains(&job.key) || self.entries.iter().any(|e| e.key == job.key) {
+            return;
+        }
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            if !self.worker_started {
+                self.worker_started = true;
+                self.worker = Worker::spawn(ctx.clone());
+            }
+            if let Some(w) = &self.worker {
+                let key = job.key.clone();
+                if w.tx.send(job).is_ok() {
+                    self.queued(key);
+                    return;
+                }
+                self.worker = None;
+                return;
+            }
+        }
+        // On the UI thread (the web build) one sheet per frame, so input and drawing keep up;
+        // the next frame asks for the rest.
+        if self.separated_in == Some(self.frame) {
+            ctx.request_repaint();
+            return;
+        }
+        self.separated_in = Some(self.frame);
+        let done = separate(job);
+        self.last_ms = done.ms;
+        self.insert(done.key, done.sheet.map(Arc::new));
+    }
+
+    /// The newest sheet of spread `si` (it may be of an earlier revision while the current one
+    /// is being separated).
+    pub fn sheet(&self, si: usize) -> Option<&Result<Arc<Sheet>, String>> {
+        self.entries.iter().find(|e| e.key.spread == si).map(|e| &e.sheet)
+    }
+}
+
+/// The Export PDF settings the preview separates with.
+pub fn print_settings(app: &DesignApp) -> Print {
+    let s = &app.ui.pdf_export;
+    let flatten = if s.flatten.is_empty() { app.ui.flattener.as_str() } else { s.flatten.as_str() };
+    Print {
+        standard: designcraft_engine::separations::Standard::parse(&s.standard).unwrap_or_default(),
+        compress_images: s.compress_images,
+        flatten: match flatten {
+            "high" => Some(300.0),
+            "medium" => Some(150.0),
+            "low" => Some(72.0),
+            _ => None,
+        },
+    }
+}
+
+/// The resolution for a view at `zoom` with `ppp` pixels per point: device pixels per point,
+/// rounded up to a power of two of 72 dpi so that zooming within a step keeps the plates.
+pub fn dpi_for(zoom: f64, ppp: f64) -> f32 {
+    let want = (zoom * ppp).max(1e-3);
+    let step = want.log2().ceil().exp2() * 72.0;
+    let dpi = (step as f32).clamp(MIN_DPI, MAX_DPI);
+    #[cfg(target_arch = "wasm32")]
+    let dpi = dpi.min(WEB_MAX_DPI);
+    dpi
+}
+
+fn key(app: &DesignApp, si: usize, dpi: f32) -> Option<(Key, Job)> {
+    let st = app.session.active()?;
+    let key = Key { uid: st.uid, revision: st.revision, spread: si, dpi, print: print_settings(app), cms: designcraft_color::cms::generation() };
+    Some((key.clone(), Job { key, doc: st.doc.clone(), cache: app.session.cache.clone() }))
+}
+
+/// The sheet of the spread nearest the view center, separated now if the canvas hasn't yet
+/// (for commands and automation, which want an answer).
+pub fn current_sheet(app: &mut DesignApp) -> Result<Arc<Sheet>, String> {
+    let st = app.session.active().ok_or("no document")?;
+    let layout = CanvasLayout::new(&st.doc, st.editing_parents);
+    let slot = crate::canvas::current_slot(app, &layout).and_then(|i| layout.slots.get(i)).map(|s| s.spread);
+    let si = match slot {
+        Some(SpreadRef::Doc(si)) => si,
+        Some(_) => return Err("parent spreads aren't separated".into()),
+        None => st.doc.page_loc(0).map(|(si, _)| si).ok_or("no spread")?,
+    };
+    let ppp = if app.canvas.separations.ppp > 0.0 { app.canvas.separations.ppp } else { 1.0 };
+    let dpi = app.view().map_or(72.0, |v| dpi_for(v.zoom, ppp));
+    let (key, job) = key(app, si, dpi).ok_or("no document")?;
+    let preview = &mut app.canvas.separations;
+    preview.poll();
+    if let Some(e) = preview
+        .entries
+        .iter()
+        .find(|e| e.key.uid == key.uid && e.key.revision == key.revision && e.key.spread == si && e.key.print == key.print && e.key.cms == key.cms)
+    {
+        return e.sheet.clone();
+    }
+    let done = separate(job);
+    preview.last_ms = done.ms;
+    let sheet = done.sheet.map(Arc::new);
+    preview.insert(done.key, sheet.clone());
+    sheet
+}
+
+/// The preview's state for `ui.inspect`: the view, and each kept sheet's plates (`null` when the
+/// preview is off).
+pub fn inspect(app: &DesignApp) -> serde_json::Value {
+    let Some(view) = &app.ui.separations else { return serde_json::Value::Null };
+    let revision = app.session.active().map(|st| (st.uid, st.revision));
+    let preview = &app.canvas.separations;
+    let sheets: Vec<serde_json::Value> = preview
+        .entries
+        .iter()
+        .map(|e| {
+            let mut v = serde_json::json!({"spread": e.key.spread, "dpi": e.key.dpi, "current": revision == Some((e.key.uid, e.key.revision))});
+            match &e.sheet {
+                Ok(sheet) => v["inks"] = sheet.inks().into_iter().map(|(name, spot)| serde_json::json!({"name": name, "spot": spot})).collect(),
+                Err(err) => v["error"] = serde_json::json!(err),
+            }
+            v
+        })
+        .collect();
+    serde_json::json!({
+        "plate": view.plate.as_deref().unwrap_or("all"),
+        "inkLimit": view.ink_limit,
+        "pending": preview.pending.len(),
+        "lastMs": preview.last_ms,
+        "sheets": sheets,
+    })
+}
+
+/// Draws the preview over each visible spread of the canvas.
+pub fn paint(app: &mut DesignApp, ctx: &egui::Context, painter: &egui::Painter, xf: &Xf, layout: &CanvasLayout, screen: egui::Rect) {
+    let Some(view) = app.ui.separations.clone() else {
+        // Off: free the plates.
+        app.canvas.separations.entries.clear();
+        return;
+    };
+    let ppp = f64::from(ctx.pixels_per_point());
+    let dpi = dpi_for(xf.zoom, ppp);
+    app.canvas.separations.ppp = ppp;
+    app.canvas.separations.poll();
+    app.canvas.separations.frame += 1;
+    let frame = app.canvas.separations.frame;
+    let hover = ctx.pointer_hover_pos().filter(|p| screen.contains(*p)).map(|p| xf.to_canvas(p));
+    app.canvas.separations.pointer = None;
+    let Some(st) = app.session.active() else { return };
+    let doc = st.doc.clone();
+    let visible: Vec<(usize, &designcraft_tools::SpreadSlot)> = layout
+        .slots
+        .iter()
+        .filter_map(|slot| {
+            let SpreadRef::Doc(si) = slot.spread else { return None };
+            let sp = doc.spreads.get(si)?;
+            xf.rect(slot.xf.transform_rect_bbox(sp.bounds())).intersects(screen).then_some((si, slot))
+        })
+        .take(MAX_VISIBLE)
+        .collect();
+    app.canvas.separations.visible = visible.len();
+    for (si, slot) in visible {
+        let Some(sp) = doc.spreads.get(si) else { continue };
+        if let Some(c) = hover {
+            let p = slot.xf.inverse() * c;
+            if sp.bounds().contains(p) {
+                app.canvas.separations.pointer = Some((si, p));
+            }
+        }
+        if let Some((_, job)) = key(app, si, dpi) {
+            app.canvas.separations.request(ctx, job);
+        }
+        let Some(entry) = app.canvas.separations.entries.iter_mut().find(|e| e.key.spread == si) else { continue };
+        entry.used = frame;
+        let Ok(sheet) = &entry.sheet else { continue };
+        let texture = match &entry.texture {
+            Some((v, tex)) if *v == view => tex.clone(),
+            _ => {
+                let plate = view.plate.as_deref().and_then(|n| sheet.ink(n));
+                let rgba = sheet.image(plate, view.ink_limit);
+                let size = [sheet.plates.width as usize, sheet.plates.height as usize];
+                if size[0] == 0 || size[1] == 0 || rgba.len() != size[0] * size[1] * 4 {
+                    continue;
+                }
+                let ci = egui::ColorImage::from_rgba_unmultiplied(size, &rgba);
+                let ci = crate::widgets::fit_texture(ci, ctx.input(|i| i.max_texture_side));
+                let tex = ctx.load_texture(format!("separations-{si}"), ci, egui::TextureOptions::LINEAR);
+                entry.texture = Some((view.clone(), tex.clone()));
+                tex
+            }
+        };
+        let a = sheet.area;
+        let corners = [
+            (Point::new(a.x0, a.y0), pos2(0.0, 0.0)),
+            (Point::new(a.x1, a.y0), pos2(1.0, 0.0)),
+            (Point::new(a.x1, a.y1), pos2(1.0, 1.0)),
+            (Point::new(a.x0, a.y1), pos2(0.0, 1.0)),
+        ];
+        let mut mesh = egui::Mesh::with_texture(texture.id());
+        for (c, uv) in corners {
+            mesh.vertices.push(egui::epaint::Vertex { pos: xf.to_screen(slot.xf * c), uv, color: Color32::WHITE });
+        }
+        mesh.indices.extend([0, 1, 2, 0, 2, 3]);
+        painter.add(egui::Shape::mesh(mesh));
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::{Value, json};
+
+    use crate::menus::run_ui;
+
+    #[test]
+    fn every_visible_sheet_stays_and_a_superseded_job_is_not_pending() {
+        let key = |spread, dpi| super::Key { uid: 1, revision: 1, spread, dpi, print: Default::default(), cms: 0 };
+        let mut p = super::Preview { visible: 10, ..Default::default() };
+        for si in 0..10 {
+            p.insert(key(si, 72.0), Err("unseparated".into()));
+        }
+        assert_eq!(p.entries.len(), 10, "ten visible spreads keep ten sheets");
+        p.visible = 1;
+        p.insert(key(10, 72.0), Err("unseparated".into()));
+        assert_eq!(p.entries.len(), super::MAX_SHEETS);
+        // The worker drops a spread's older waiting job, so only the newest stays pending.
+        p.queued(key(3, 72.0));
+        p.queued(key(3, 288.0));
+        p.queued(key(4, 72.0));
+        assert_eq!(p.pending.iter().map(|k| (k.spread, k.dpi)).collect::<Vec<_>>(), [(3, 288.0), (4, 72.0)]);
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn the_ui_thread_separates_one_sheet_per_frame() {
+        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.session.execute("file.new", &json!({"pages": 4, "facing": false})).unwrap();
+        let ctx = egui::Context::default();
+        let jobs = |app: &crate::DesignApp| [0, 1].map(|si| super::key(app, si, 36.0).unwrap().1);
+        // No worker thread, as on the web.
+        app.canvas.separations.worker_started = true;
+        app.canvas.separations.frame = 1;
+        for job in jobs(&app) {
+            app.canvas.separations.request(&ctx, job);
+        }
+        assert_eq!(app.canvas.separations.entries.len(), 1);
+        app.canvas.separations.frame = 2;
+        for job in jobs(&app) {
+            app.canvas.separations.request(&ctx, job);
+        }
+        assert_eq!(app.canvas.separations.entries.len(), 2, "the next frame separates the other");
+    }
+
+    #[test]
+    fn view_separations_lists_the_spot_plate_and_shows_it_alone() {
+        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.session.execute("file.new", &json!({})).unwrap();
+        app.session.execute("swatch.create", &json!({"name": "Gold", "spot": true, "color": {"c": 0, "m": 20, "y": 80, "k": 10}})).unwrap();
+        let id = app.session.execute("frame.create", &json!({"rect": [72, 72, 172, 172]})).unwrap()["id"].clone();
+        app.session.execute("object.fill", &json!({"swatch": "Gold", "ids": [id]})).unwrap();
+
+        let r = run_ui(&mut app, "view.separations", &json!({"plate": "Gold"})).unwrap().unwrap();
+        assert_eq!((r["on"].clone(), r["plate"].clone()), (json!(true), json!("Gold")), "{r}");
+        let inks: Vec<(String, bool)> =
+            r["inks"].as_array().unwrap().iter().map(|i| (i["name"].as_str().unwrap().to_string(), i["spot"] == true)).collect();
+        assert_eq!(inks.last(), Some(&("Gold".to_string(), true)), "{r}");
+        assert_eq!(inks.len(), 5, "the process inks and Gold: {r}");
+        assert_eq!(app.ui.separations.as_ref().and_then(|s| s.plate.as_deref()), Some("Gold"));
+
+        // The menu's params keep working.
+        run_ui(&mut app, "view.separations", &json!({"plate": "cyan"})).unwrap().unwrap();
+        assert_eq!(app.ui.separations.as_ref().and_then(|s| s.plate.as_deref()), Some("Cyan"));
+        let r = run_ui(&mut app, "view.separations", &json!({"inkLimit": 300})).unwrap().unwrap();
+        assert_eq!(r["inkLimit"], 300.0);
+        let r = run_ui(&mut app, "view.separations", &json!({"plate": null, "inkLimit": null})).unwrap().unwrap();
+        assert_eq!(r["on"], false);
+        assert!(app.ui.separations.is_none() && r.get("inks").is_none_or(Value::is_null));
+    }
+
+    /// Plates separated under other color settings (another CMYK working space) aren't reused.
+    #[test]
+    fn plates_of_other_color_settings_are_separated_again() {
+        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+        app.session.execute("file.new", &json!({})).unwrap();
+        let first = super::current_sheet(&mut app).unwrap();
+        assert!(std::sync::Arc::ptr_eq(&first, &super::current_sheet(&mut app).unwrap()), "the same settings reuse the sheet");
+        for e in &mut app.canvas.separations.entries {
+            e.key.cms = e.key.cms.wrapping_add(1);
+        }
+        let again = super::current_sheet(&mut app).unwrap();
+        assert!(!std::sync::Arc::ptr_eq(&first, &again), "a sheet of other color settings is separated again");
+        assert!(app.canvas.separations.entries.iter().all(|e| e.key.cms == designcraft_color::cms::generation()));
+    }
+}
diff --git a/crates/ui-egui/src/services.rs b/crates/ui-egui/src/services.rs
new file mode 100644
index 000000000..b413e90c4
--- /dev/null
+++ b/crates/ui-egui/src/services.rs
@@ -0,0 +1,35 @@
+use super::state::{ImportRequest, ImportedFile};
+
+pub type ReadFn = Box<dyn Fn(&str) -> Result<Vec<u8>, String>>;
+
+pub type WriteFn = Box<dyn FnMut(&str, &[u8]) -> Result<(), String>>;
+
+pub type OpenAsyncFn = Box<dyn FnMut(ImportRequest)>;
+
+/// Starts a browser download; an error means no file was handed to the user.
+pub type DownloadFn = Box<dyn FnMut(&str, &[u8]) -> Result<(), String>>;
+
+pub type ClipboardFn = Box<dyn FnMut() -> Option<String>>;
+
+/// Files delivered asynchronously with their original operation and document identity.
+pub type Inbox = std::sync::Arc<std::sync::Mutex<Vec<ImportedFile>>>;
+
+/// Platform services injected by the host (desktop or web). File dialogs aren't among them: the
+/// app asks for them itself and the host shows them (`DesignApp::show_file_dialogs`).
+#[derive(Default)]
+pub struct Services {
+    pub read: Option<ReadFn>,
+    pub write: Option<WriteFn>,
+    /// Asynchronous open dialog for a purpose (`open`, `place`); the chosen file arrives later
+    /// through [`Services::inbox`]. In a browser, which has no native dialogs.
+    pub open_async: Option<OpenAsyncFn>,
+    /// Hand bytes to the user as a named file (browser download). When set, Save uses it
+    /// instead of writing to a path, and a file saved under a name goes to the downloads with no
+    /// save dialog.
+    pub download: Option<DownloadFn>,
+    /// Files delivered asynchronously, drained every frame with their captured request context.
+    pub inbox: Option<Inbox>,
+    /// The system clipboard's text, for Paste chosen from a menu (egui only delivers it with the
+    /// paste keys, which a native menu bar takes first).
+    pub clipboard_text: Option<ClipboardFn>,
+}
diff --git a/crates/ui-egui/src/shortcut_import.rs b/crates/ui-egui/src/shortcut_import.rs
index 9ccbef1b9..d8387edc5 100644
--- a/crates/ui-egui/src/shortcut_import.rs
+++ b/crates/ui-egui/src/shortcut_import.rs
@@ -1,17 +1,20 @@
 //! Importing a keyboard shortcut set that InDesign's Keyboard Shortcuts dialog saved as text
-//! (Show Set): `window.importShortcuts`.
+//! (Show Set): `window.importShortcuts`, and the InDesign format of the Keyboard Shortcuts
+//! dialog's Import.
 //!
 //! The file lists items under `Product area : <area>` headers, one per line:
 //! `<name> --- [none defined]` or `<name> --- <context>: <keys>, <context>: <keys>`. Item names
-//! use `: ` between submenu levels. Only the Default context applies (DesignCraft has no
-//! shortcut contexts); a type command with no Default entry takes its Text entry.
+//! use `: ` between submenu levels. This module reads the file into a
+//! [`craft_keymap::ForeignSet`]; `craft_keymap::import` matches and applies it. Default keys bind
+//! in the command's home scope; an item without Default keys takes its Text keys.
 
-use std::collections::{BTreeSet, HashMap};
+use std::collections::BTreeMap;
 
+use craft_keymap::import::{MAX_IMPORT_ENTRIES, MAX_IMPORT_TEXT};
+use craft_keymap::{CommandRef, ContextRule, Flavor, ForeignEntry, ForeignKey, ForeignSet, ImportOptions, ImportReport};
 use serde_json::{Value, json};
 
 use crate::DesignApp;
-use crate::menus::{self, Item};
 
 /// Largest set file read. InDesign's full set is a few hundred kilobytes (twice that as UTF-16).
 pub const MAX_BYTES: usize = 8 << 20;
@@ -25,14 +28,20 @@ struct Entry {
 }
 
 struct SetItem {
-    area: String,
+    /// Index into [`ParsedSet::areas`]; `None` before the first `Product area` line.
+    area: Option<usize>,
     name: String,
     entries: Vec<Entry>,
+    /// 1-based line in the file.
+    line: usize,
 }
 
 struct ParsedSet {
     name: String,
+    areas: Vec<String>,
     items: Vec<SetItem>,
+    /// Items past [`MAX_IMPORT_ENTRIES`], not read.
+    dropped: usize,
 }
 
 /// Text from the bytes of a set file: UTF-8 (with or without a BOM) or UTF-16 (by its BOM, or
@@ -68,26 +77,34 @@ fn header<'a>(line: &'a str, label: &str) -> Option<&'a str> {
     rest.trim_start().strip_prefix(':').map(str::trim)
 }
 
+/// The first [`MAX_IMPORT_TEXT`] chars of `s`.
+fn capped(s: &str) -> &str {
+    s.char_indices().nth(MAX_IMPORT_TEXT).and_then(|(end, _)| s.get(..end)).unwrap_or(s)
+}
+
 fn parse(text: &str) -> Result<ParsedSet, String> {
     let text = text.strip_prefix('\u{feff}').unwrap_or(text);
-    let mut set = ParsedSet { name: String::new(), items: Vec::new() };
-    let mut area = String::new();
+    let mut set = ParsedSet { name: String::new(), areas: Vec::new(), items: Vec::new(), dropped: 0 };
     let mut header_seen = false;
-    for line in text.lines() {
-        let line = line.trim_end_matches('\r');
-        let trimmed = line.trim();
+    for (n, line) in text.lines().enumerate() {
+        let trimmed = line.trim_end_matches('\r').trim();
         if let Some(name) = header(trimmed, "Shortcut Set") {
-            set.name = name.to_string();
+            set.name = capped(name).to_string();
             header_seen = true;
         } else if let Some(a) = header(trimmed, "Product area") {
-            area = a.to_string();
+            set.areas.push(capped(a).to_string());
             header_seen = true;
         } else if let Some((name, keys)) = trimmed.split_once(" --- ") {
             let name = name.trim();
             if name.is_empty() {
                 continue;
             }
-            set.items.push(SetItem { area: area.clone(), name: name.to_string(), entries: entries(keys) });
+            if set.items.len() >= MAX_IMPORT_ENTRIES {
+                set.dropped += 1;
+                continue;
+            }
+            let area = set.areas.len().checked_sub(1);
+            set.items.push(SetItem { area, name: name.to_string(), entries: entries(keys), line: n.saturating_add(1) });
         }
     }
     if set.items.is_empty() && !header_seen {
@@ -105,17 +122,18 @@ fn entries(keys: &str) -> Vec<Entry> {
     }
     let mut pieces: Vec<String> = Vec::new();
     for piece in keys.split(", ") {
+        let full = pieces.len() >= MAX_ENTRIES;
         match pieces.last_mut() {
             Some(last) if !piece.contains(": ") => {
                 last.push_str(", ");
                 last.push_str(piece);
             }
+            _ if full => break,
             _ => pieces.push(piece.to_string()),
         }
     }
     pieces
         .into_iter()
-        .take(MAX_ENTRIES)
         .filter_map(|p| {
             let (context, keys) = p.split_once(": ")?;
             Some(Entry { context: context.trim().to_string(), keys: keys.trim().to_string() })
@@ -123,429 +141,176 @@ fn entries(keys: &str) -> Vec<Entry> {
         .collect()
 }
 
-/// Whether the keys use Mac modifier names, where Ctrl is the Control key rather than the
-/// command modifier.
-fn is_mac_set(set: &ParsedSet) -> bool {
-    set.items.iter().flat_map(|i| &i.entries).any(|e| {
-        let k = e.keys.to_lowercase();
-        k.contains("cmd") || k.contains("command") || k.contains('⌘') || k.contains("opt") || k.contains('⌥')
-    })
+/// `s` without a trailing `suffix`, compared without ASCII case.
+fn strip_suffix_ignore_case<'a>(s: &'a str, suffix: &str) -> Option<&'a str> {
+    let at = s.len().checked_sub(suffix.len())?;
+    s.get(at..).filter(|end| end.eq_ignore_ascii_case(suffix)).and_then(|_| s.get(..at))
 }
 
-#[derive(Clone, Copy, PartialEq, Eq)]
-enum Mod {
-    Command,
-    Alt,
-    Shift,
-    Control,
+/// The set as `craft_keymap::import` reads it. An area named `<menu> Menu` is that menu; the
+/// Tools area is the Tools menu, where items named `… Tool` select tools. Items of the Panel Menus
+/// area name their panel first (`Character: All Caps`) and match a command under that panel.
+/// Items of other areas (text and tables, views) have no menu, so they match only by a one-segment
+/// name. The keys are read with Mac modifier names when any key in the set uses one.
+fn foreign(set: &ParsedSet) -> ForeignSet {
+    #[derive(Clone, Copy, Default)]
+    struct Area<'a> {
+        menu: Option<&'a str>,
+        tools: bool,
+        panel_menu: bool,
+    }
+    let flavor = Flavor::detect(set.items.iter().flat_map(|i| &i.entries).map(|e| e.keys.as_str()));
+    let areas: Vec<Area> = set
+        .areas
+        .iter()
+        .map(|a| {
+            let a = a.trim();
+            if a.eq_ignore_ascii_case("tools") {
+                Area { menu: Some(a), tools: true, panel_menu: false }
+            } else if a.eq_ignore_ascii_case("panel menus") {
+                Area { panel_menu: true, ..Area::default() }
+            } else {
+                let menu = strip_suffix_ignore_case(a, " menu").map(str::trim).filter(|m| !m.is_empty() && !m.contains(':'));
+                Area { menu, ..Area::default() }
+            }
+        })
+        .collect();
+    let entries = set
+        .items
+        .iter()
+        .map(|item| {
+            let area = item.area.and_then(|a| areas.get(a)).copied().unwrap_or_default();
+            let mut entry = ForeignEntry::new(area.menu, item.name.split(": ").map(str::trim)).at_line(item.line);
+            if area.panel_menu {
+                entry = entry.in_panel_menu();
+            }
+            entry.is_tool = area.tools && strip_suffix_ignore_case(&item.name, " tool").is_some();
+            entry.keys = item.entries.iter().map(|e| ForeignKey::read(Some(&e.context), &e.keys, flavor)).collect();
+            entry
+        })
+        .collect();
+    ForeignSet::new(entries).with_name(set.name.clone()).with_truncated(set.dropped)
 }
 
-/// Keys as InDesign writes them (`Shift+Ctrl+S`, `Ctrl+Num 5`, `Page Down`, `⇧⌘S`) as a
-/// DesignCraft shortcut string (`Cmd+Shift+S`). Ctrl is the command modifier in a Windows set.
-fn read_keys(keys: &str, mac: bool) -> Result<String, &'static str> {
-    const SYMBOLS: &[(&str, Mod)] = &[("⌘", Mod::Command), ("⌥", Mod::Alt), ("⇧", Mod::Shift), ("⌃", Mod::Control)];
-    const WORDS: &[(&str, Mod)] = &[
-        ("command", Mod::Command),
-        ("cmd", Mod::Command),
-        ("option", Mod::Alt),
-        ("opt", Mod::Alt),
-        ("alt", Mod::Alt),
-        ("shift", Mod::Shift),
-        ("control", Mod::Control),
-        ("ctrl", Mod::Control),
-    ];
-    let mut m = egui::Modifiers::NONE;
-    let mut set = |md: Mod| match md {
-        Mod::Command => m.command = true,
-        Mod::Alt => m.alt = true,
-        Mod::Shift => m.shift = true,
-        Mod::Control if mac => m.ctrl = true,
-        Mod::Control => m.command = true,
-    };
-    let mut rest = keys.trim();
-    'strip: loop {
-        for (sym, md) in SYMBOLS {
-            if let Some(r) = rest.strip_prefix(sym) {
-                set(*md);
-                rest = r.strip_prefix('+').unwrap_or(r).trim_start();
-                continue 'strip;
-            }
-        }
-        for (word, md) in WORDS {
-            let Some(head) = rest.get(..word.len()) else { continue };
-            let Some(after) = rest.get(word.len()..) else { continue };
-            // The word must be followed by a separator and a key: "Alt" alone, or "Altx", is a key name.
-            let mut chars = after.chars();
-            if head.eq_ignore_ascii_case(word) && matches!(chars.next(), Some('+' | ' ' | '-')) && !chars.as_str().is_empty() {
-                set(*md);
-                rest = chars.as_str().trim_start();
-                continue 'strip;
-            }
-        }
-        break;
-    }
-    if m.ctrl {
-        return Err("Control-key shortcuts are not supported");
-    }
-    let key = key_named(rest.trim()).ok_or("unknown key")?;
-    let sc = menus::shortcut_string(m, key);
-    // Only a string the shortcut dispatcher reads back as these keys is imported.
-    match menus::parse_shortcut(&sc) {
-        Some((pm, pk)) if pk == key && same_mods(pm, m) => Ok(sc),
-        _ => Err("unknown key"),
+/// What DesignCraft's contexts take from a set: Default keys bind in the command's home scope; an
+/// item without Default keys takes its Text keys. Unmatched items get likely commands.
+pub fn import_options(remembered: BTreeMap<String, CommandRef>) -> ImportOptions {
+    ImportOptions {
+        contexts: vec![("Default".into(), ContextRule::Home), (crate::keys::TEXT_CONTEXT.into(), ContextRule::HomeWithoutHomeEntry)],
+        remembered,
+        suggest: true,
+        ..ImportOptions::default()
     }
 }
 
-fn same_mods(a: egui::Modifiers, b: egui::Modifiers) -> bool {
-    a.command == b.command && a.alt == b.alt && a.shift == b.shift && a.ctrl == b.ctrl
-}
-
-/// A key by the name InDesign gives it (Windows words, Mac symbols), case- and space-insensitive.
-fn key_named(name: &str) -> Option<egui::Key> {
-    use egui::Key;
-    if name.is_empty() {
-        return None;
-    }
-    let squashed: String = name.chars().filter(|c| !c.is_whitespace()).collect::<String>().to_lowercase();
-    // The numeric keypad: egui doesn't tell its keys apart from the main ones.
-    let n = squashed.strip_prefix("numpad").or_else(|| squashed.strip_prefix("num").filter(|r| !r.is_empty() && *r != "lock")).unwrap_or(&squashed);
-    let key = match n {
-        "up" | "uparrow" | "arrowup" | "↑" => Key::ArrowUp,
-        "down" | "downarrow" | "arrowdown" | "↓" => Key::ArrowDown,
-        "left" | "leftarrow" | "arrowleft" | "←" => Key::ArrowLeft,
-        "right" | "rightarrow" | "arrowright" | "→" => Key::ArrowRight,
-        "pageup" | "pgup" | "⇞" => Key::PageUp,
-        "pagedown" | "pgdn" | "⇟" => Key::PageDown,
-        "home" | "↖" => Key::Home,
-        "end" | "↘" => Key::End,
-        "esc" | "escape" | "⎋" => Key::Escape,
-        "tab" | "⇥" => Key::Tab,
-        "space" | "spacebar" => Key::Space,
-        "enter" | "return" | "↩" | "⏎" | "⌤" => Key::Enter,
-        "backspace" | "⌫" => Key::Backspace,
-        "delete" | "del" | "forwarddelete" | "⌦" => Key::Delete,
-        "insert" | "ins" | "help" => Key::Insert,
-        _ => return Key::from_name(n).or_else(|| Key::from_name(&n.to_uppercase())).or_else(|| Key::from_name(name)),
-    };
-    Some(key)
-}
-
-/// Matching form of a label or menu name: no ellipsis, no `&`, single spaces, lower case, and
-/// no Show/Hide in front (InDesign names a toggle by what choosing it does now).
-fn norm(s: &str) -> String {
-    let s = s.replace('…', "").replace("...", "").replace('&', "");
-    let s = s.split_whitespace().collect::<Vec<_>>().join(" ").to_lowercase();
-    ["show/hide ", "show ", "hide "].iter().find_map(|p| s.strip_prefix(p).filter(|r| !r.is_empty())).map_or(s.clone(), str::to_string)
-}
-
-/// DesignCraft's commands by menu path and label.
-#[derive(Default)]
-struct Index {
-    /// `menu\nsubmenu\nlabel` → ids, in the menu bar.
-    path: HashMap<String, BTreeSet<String>>,
-    /// The same from the engine commands' own menu placement, which a UI command (the one with
-    /// the dialog) may stand in for in the menu bar.
-    engine_path: HashMap<String, BTreeSet<String>>,
-    /// (menu, label) → ids, at any depth of that menu.
-    in_menu: HashMap<(String, String), BTreeSet<String>>,
-    /// label → ids, anywhere.
-    label: HashMap<String, BTreeSet<String>>,
-}
-
-impl Index {
-    fn build() -> Self {
-        fn walk(ix: &mut Index, items: &[Item], path: &mut Vec<String>) {
-            for it in items {
-                match it {
-                    Item::Sub(name, children) => {
-                        path.push(norm(name));
-                        walk(ix, children, path);
-                        path.pop();
-                    }
-                    // A shortcut runs the command without parameters; a fixed-parameter variant can't hold one.
-                    Item::Cmd { label, id, params, .. } if params.is_null() => {
-                        let label = norm(label);
-                        let top = path.first().cloned().unwrap_or_default();
-                        add_path(&mut ix.path, path, &label, id);
-                        ix.in_menu.entry((top, label.clone())).or_default().insert(id.clone());
-                        ix.label.entry(label).or_default().insert(id.clone());
-                    }
-                    _ => {}
-                }
-            }
-        }
-        let mut ix = Index::default();
-        for (menu, entries) in menus::menu_tree() {
-            walk(&mut ix, &entries, &mut vec![norm(menu)]);
-        }
-        for c in designcraft_engine::command_specs() {
-            let label = norm(c.label);
-            if !c.menu.is_empty() {
-                let path: Vec<String> = c.menu.iter().map(|m| norm(m)).collect();
-                add_path(&mut ix.engine_path, &path, &label, c.id);
-            }
-            ix.label.entry(label).or_default().insert(c.id.to_string());
-        }
-        for (id, label, _, _) in menus::UI_COMMANDS {
-            ix.label.entry(norm(label)).or_default().insert((*id).to_string());
-        }
-        ix
-    }
-
-    /// The command an item names, trying the most specific match first. Matches by label alone
-    /// only count when exactly one command has that label.
-    fn find(&self, area: &str, name: &str) -> Option<String> {
-        let one = |s: Option<&BTreeSet<String>>| s.filter(|s| s.len() == 1).and_then(|s| s.first().cloned());
-        let segments: Vec<String> = name.split(": ").map(norm).collect();
-        let last = segments.last().cloned().unwrap_or_default();
-        let area = norm(area);
-        if let Some(menu) = area.strip_suffix(" menu").filter(|m| !m.contains(':')) {
-            let mut key = menu.to_string();
-            for s in &segments {
-                key.push('\n');
-                key.push_str(s);
-            }
-            if let Some(id) = one(self.path.get(&key)) {
-                return Some(id);
-            }
-            if segments.len() > 1
-                && let Some(id) = one(self.in_menu.get(&(menu.to_string(), segments.join(" "))))
-            {
-                return Some(id);
-            }
-            if let Some(id) = one(self.engine_path.get(&key)) {
-                return Some(id);
-            }
-            if let Some(id) = one(self.in_menu.get(&(menu.to_string(), last.clone()))) {
-                return Some(id);
-            }
-            // Menus are arranged differently: the item's own label, if no other command has it.
-            return one(self.label.get(&last));
-        }
-        if segments.len() == 1 { one(self.label.get(&last)) } else { None }
-    }
-}
-
-fn add_path(map: &mut HashMap<String, BTreeSet<String>>, path: &[String], label: &str, id: &str) {
-    let mut key = path.join("\n");
-    key.push('\n');
-    key.push_str(label);
-    map.entry(key).or_default().insert(id.to_string());
-}
-
-/// What the set says about one DesignCraft command, over every item matched to it.
-struct Decision {
-    id: String,
-    item: String,
-    /// The first readable shortcut.
-    shortcut: Option<String>,
-    /// Every matched item said `[none defined]`.
-    all_none: bool,
-}
-
-fn command_label(id: &str) -> String {
-    menus::ui_label(id)
-        .map(|(l, _)| l.to_string())
-        .or_else(|| designcraft_engine::find_command(id).map(|c| c.label.to_string()))
-        .unwrap_or_else(|| id.to_string())
-}
-
-fn keys_of(sc: &str) -> Option<(bool, bool, bool, bool, egui::Key)> {
-    menus::parse_shortcut(sc).map(|(m, k)| (m.command, m.alt, m.shift, m.ctrl, k))
-}
-
-/// Imports a set: every matched command takes the set's shortcut (or none), another command
-/// holding an imported shortcut loses it, and the rest keep theirs. Returns the report.
-pub fn import(app: &mut DesignApp, text: &str) -> Result<Value, String> {
+/// Reads a set's text for craft-keymap's importer. Items past [`MAX_IMPORT_ENTRIES`] are not read;
+/// the set counts them as truncated.
+pub fn read_set(text: &str) -> Result<ForeignSet, String> {
     if text.len() > MAX_BYTES {
         return Err(format!("the set is larger than {} MB", MAX_BYTES >> 20));
     }
-    let set = parse(text)?;
-    let mac = is_mac_set(&set);
-    let ix = Index::build();
-    let mut decisions: Vec<Decision> = Vec::new();
-    let mut unmatched = Vec::new();
-    let mut unmatched_without_shortcut = 0usize;
-    let mut unreadable = Vec::new();
-    for item in &set.items {
-        let shown = if item.area.is_empty() { item.name.clone() } else { format!("{} › {}", item.area, item.name) };
-        let all_keys = item.entries.iter().map(|e| format!("{}: {}", e.context, e.keys)).collect::<Vec<_>>().join(", ");
-        let Some(id) = ix.find(&item.area, &item.name) else {
-            if item.entries.is_empty() {
-                unmatched_without_shortcut += 1;
-            } else {
-                let tool = norm(&item.area) == "tools"
-                    && designcraft_tools::TOOL_GROUPS.iter().flat_map(|g| g.iter()).any(|t| norm(t.label) == norm(&item.name));
-                let mut row = json!({"item": shown, "keys": all_keys});
-                if tool {
-                    row["reason"] = json!("tool keys are fixed");
-                }
-                unmatched.push(row);
-            }
-            continue;
-        };
-        let in_context = |ctx: &'static str| item.entries.iter().filter(move |e| e.context.eq_ignore_ascii_case(ctx)).collect::<Vec<&Entry>>();
-        let text_command = id.starts_with("type.") || id.starts_with("text.");
-        let mut considered = in_context("Default");
-        if considered.is_empty() && text_command {
-            considered = in_context("Text");
-        }
-        let mut read = None;
-        let mut why = "";
-        for e in &considered {
-            match read_keys(&e.keys, mac) {
-                Ok(sc) => {
-                    read = Some(sc);
-                    break;
-                }
-                Err(w) => why = w,
-            }
-        }
-        if read.is_none() && !considered.is_empty() {
-            unreadable.push(json!({"item": shown, "keys": all_keys, "reason": why}));
-        }
-        let pos = match decisions.iter().position(|d| d.id == id) {
-            Some(p) => p,
-            None => {
-                decisions.push(Decision { id: id.clone(), item: shown.clone(), shortcut: None, all_none: true });
-                decisions.len() - 1
-            }
-        };
-        let Some(d) = decisions.get_mut(pos) else { continue };
-        d.all_none &= item.entries.is_empty();
-        if d.shortcut.is_none()
-            && let Some(sc) = read
-        {
-            d.shortcut = Some(sc);
-            d.item = shown;
-        }
-    }
-
-    let before: HashMap<String, Option<String>> = menus::effective_shortcuts(app).into_iter().map(|(id, sc)| (id, Some(sc))).collect();
-    let mut imported = 0usize;
-    let mut taken: Vec<((bool, bool, bool, bool, egui::Key), String)> = Vec::new();
-    let mut skipped = Vec::new();
-    let mut decided: BTreeSet<String> = BTreeSet::new();
-    // When two items in the set want the same keys, the later one takes them (the rule shared by
-    // the Craft apps' importers).
-    let mut winner: HashMap<(bool, bool, bool, bool, egui::Key), usize> = HashMap::new();
-    for (i, d) in decisions.iter().enumerate() {
-        if let Some(keys) = d.shortcut.as_deref().and_then(keys_of) {
-            winner.insert(keys, i);
-        }
-    }
-    for (i, d) in decisions.iter().enumerate() {
-        match &d.shortcut {
-            Some(sc) => {
-                let Some(keys) = keys_of(sc) else { continue };
-                if let Some(w) = winner.get(&keys).filter(|&&w| w != i).and_then(|&w| decisions.get(w)) {
-                    skipped.push(json!({"id": d.id, "item": d.item, "shortcut": sc, "takenBy": w.id}));
-                    continue;
-                }
-                taken.push((keys, d.id.clone()));
-                if menus::default_shortcut(&d.id).and_then(keys_of) == Some(keys) {
-                    app.ui.shortcuts.remove(&d.id);
-                } else {
-                    app.ui.shortcuts.insert(d.id.clone(), sc.clone());
-                }
-            }
-            None if d.all_none => {
-                if menus::default_shortcut(&d.id).is_none() {
-                    app.ui.shortcuts.remove(&d.id);
-                } else {
-                    app.ui.shortcuts.insert(d.id.clone(), String::new());
-                }
-            }
-            None => continue,
-        }
-        imported += 1;
-        decided.insert(d.id.clone());
-    }
-    let mut conflicts = Vec::new();
-    for (id, sc) in menus::effective_shortcuts(app) {
-        if decided.contains(&id) {
-            continue;
-        }
-        // A command sharing its default keys with the one taking them (file.new and the New
-        // Document dialog) keeps them: the dispatcher already prefers the other.
-        let twin = |by: &str| {
-            let default = |id: &str| menus::default_shortcut(id).and_then(keys_of);
-            default(&id).is_some() && default(&id) == default(by)
-        };
-        if let Some(keys) = keys_of(&sc)
-            && taken.iter().any(|(k, by)| *k == keys && !twin(by))
-        {
-            app.ui.shortcuts.insert(id.clone(), String::new());
-            conflicts.push(json!({"id": id, "label": command_label(&id), "shortcut": sc}));
-        }
-    }
-    let changed: Vec<Value> = decisions
-        .iter()
-        .filter(|d| decided.contains(&d.id))
-        .filter_map(|d| {
-            let from = before.get(&d.id).cloned().flatten();
-            let to = menus::shortcut_of(app, &d.id);
-            (from != to).then(|| json!({"id": d.id, "label": command_label(&d.id), "item": d.item, "from": from, "to": to}))
-        })
-        .collect();
-    Ok(json!({
-        "set": set.name,
-        "imported": imported,
-        "changed": changed,
-        "conflictsCleared": conflicts,
-        "skipped": skipped,
-        "unmatched": unmatched,
-        "unmatchedWithoutShortcut": unmatched_without_shortcut,
-        "unreadable": unreadable,
-    }))
+    let parsed = parse(text)?;
+    Ok(foreign(&parsed))
 }
 
-/// One line for the Keyboard Shortcuts dialog about an import's report.
+/// Imports a set as a new shortcut set, which becomes active: every matched command takes the
+/// set's shortcuts (or none, when every item matched to it has none), other commands lose keys it
+/// takes (unless they share them as defaults), and the rest keep theirs. Returns the report, with
+/// the new set's name as `shortcutSet`.
+pub fn import(app: &mut DesignApp, text: &str) -> Result<Value, String> {
+    let set = read_set(text)?;
+    app.sync_keymap();
+    let options = import_options(app.shortcut_answers.clone());
+    let plan = craft_keymap::plan(&set, &app.keymap, &options);
+    let (name, report) = app.ui.shortcut_sets.import_plan(&plan, &app.keymap, None, &crate::shortcuts_dialog::BUILTINS).map_err(|e| e.to_string())?;
+    crate::shortcuts_dialog::load_active_set(app);
+    let mut out = report_json(&report);
+    out["shortcutSet"] = json!(name);
+    Ok(out)
+}
+
+/// An enum of the report as its serde name (`noMatch`, `numpad`).
+fn name_of<T: serde::Serialize>(v: &T) -> Value {
+    serde_json::to_value(v).unwrap_or(Value::Null)
+}
+
+/// The report as `window.importShortcuts` returns it. Commands are command keys (`file.save`,
+/// `window.panel {"panel":"layers"}`) under `id`.
+fn report_json(r: &ImportReport) -> Value {
+    json!({
+        "set": r.set,
+        "imported": r.imported,
+        "changed": Value::Array(r.changed.iter().map(|c| json!({
+            "id": c.command.key(), "label": c.label, "item": c.item, "line": c.line, "from": c.from, "to": c.to,
+        })).collect()),
+        "conflictsCleared": Value::Array(r.conflicts_cleared.iter().map(|c| json!({
+            "id": c.command.key(), "label": c.label, "shortcut": c.shortcut,
+        })).collect()),
+        "skipped": Value::Array(r.skipped.iter().map(|s| json!({
+            "id": s.command.key(), "item": s.item, "line": s.line, "shortcut": s.shortcut,
+            "takenBy": s.kept_by.as_ref().map(|c| c.key()), "reason": name_of(&s.reason),
+        })).collect()),
+        "failed": Value::Array(r.failed.iter().map(|f| json!({
+            "id": f.command.key(), "label": f.label, "change": name_of(&f.change), "shortcuts": f.shortcuts,
+        })).collect()),
+        "unmatched": Value::Array(r.unmatched.iter().map(|u| json!({
+            "item": u.item, "line": u.line, "keys": u.keys, "reason": name_of(&u.reason),
+        })).collect()),
+        "unmatchedWithoutShortcut": r.unmatched_without_shortcut,
+        "unreadable": Value::Array(r.unreadable.iter().map(|u| json!({
+            "item": u.item, "line": u.line, "keys": u.keys, "reason": u.reason.to_string(),
+        })).collect()),
+        "approximated": Value::Array(r.approximated.iter().map(|a| json!({
+            "item": a.item, "line": a.line, "keys": a.keys, "note": name_of(&a.note),
+        })).collect()),
+        "suggestions": Value::Array(r.suggestions.iter().map(|s| json!({
+            "item": s.item, "line": s.line, "candidates": s.candidates.iter().map(|c| c.key()).collect::<Vec<_>>(),
+        })).collect()),
+        "matchedWithoutChange": Value::Array(r.matched_without_change.iter().map(|m| json!({
+            "id": m.command.key(), "label": m.label, "item": m.item, "line": m.line, "reason": name_of(&m.reason),
+        })).collect()),
+        "truncated": r.truncated,
+    })
+}
+
+/// One line for the status bar about an import's report.
 pub fn summary(lang: &str, report: &Value) -> String {
     let n = |k: &str| report[k].as_u64().unwrap_or_default().to_string();
     let len = |k: &str| report[k].as_array().map_or(0, Vec::len).to_string();
-    crate::i18n::tr(lang, "Imported {count} shortcuts from “{set}”; {unmatched} items not matched, {unreadable} unreadable.")
+    // Rows for keys in contexts DesignCraft lacks belong to items that did match.
+    let unmatched = report["unmatched"].as_array().map_or(0, |rows| rows.iter().filter(|r| r["reason"] != "context").count());
+    let mut out = crate::i18n::tr(lang, "Imported {count} shortcuts from “{set}”; {unmatched} items not matched, {unreadable} unreadable.")
         .replace("{count}", &n("imported"))
         .replace("{set}", report["set"].as_str().unwrap_or_default())
-        .replace("{unmatched}", &len("unmatched"))
-        .replace("{unreadable}", &len("unreadable"))
+        .replace("{unmatched}", &unmatched.to_string())
+        .replace("{unreadable}", &len("unreadable"));
+    let reserved = report["skipped"].as_array().map_or(0, |rows| rows.iter().filter(|r| r["reason"] == "reserved").count());
+    if reserved > 0 {
+        out.push(' ');
+        out.push_str(
+            &crate::i18n::tr(lang, "{count} shortcuts are reserved by the system and were left out.").replace("{count}", &reserved.to_string()),
+        );
+    }
+    out
 }
 
-/// The Keyboard Shortcuts dialog's Import button: a native file picker imports at once and
-/// returns the summary; in a browser the chosen file arrives later through the import inbox.
-pub fn pick_and_import(app: &mut DesignApp) -> Option<String> {
-    if let Some(pick) = app.services.pick_open.as_mut() {
-        let path = pick("shortcuts")?;
-        return Some(match app.run("window.importShortcuts", json!({"path": path})) {
-            Ok(report) => summary(&app.ui.language, &report),
-            Err(e) => e,
-        });
-    }
-    let request = app.import_request("shortcuts");
-    if let Some(open) = app.services.open_async.as_mut() {
-        open(request);
-    }
-    None
-}
-
-/// A set file chosen in the browser: import it and say how it went in the open Keyboard
-/// Shortcuts dialog, or the status bar.
+/// A set file chosen in the browser: the open Keyboard Shortcuts dialog reviews it; without the
+/// dialog it is imported at once and the status bar says how it went.
 pub fn import_delivered(app: &mut DesignApp, bytes: &[u8]) {
+    if crate::shortcuts_dialog::deliver(app, bytes) {
+        return;
+    }
     let msg = match decode(bytes).and_then(|text| app.run("window.importShortcuts", json!({"text": text}))) {
         Ok(report) => summary(&app.ui.language, &report),
         Err(e) => e,
     };
-    match app.ui.dialog.as_mut().filter(|d| d.id == "keyboardShortcuts") {
-        Some(d) => {
-            d.fields.insert("message".into(), json!(msg));
-        }
-        None => app.status(msg),
-    }
+    app.status(msg);
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::menus;
 
     fn app() -> DesignApp {
         DesignApp::new(designcraft_engine::Session::new(), crate::Services::default())
@@ -564,10 +329,16 @@ mod tests {
             \tFrobnicate Everything --- Default: Ctrl+F12\r\n\
             \tNever Heard Of It --- [none defined]\r\n\
             Product area : File Menu\r\n\
-            \tClose --- Default: Shift+Ctrl+Num 5, Default: Ctrl+F4\r\n\
+            \tClose --- Default: Shift+Ctrl+Num 5, Default: Ctrl+F4, Tables: Ctrl+3\r\n\
             \tSave --- Default: Ctrl+Hyperspace\r\n\
             \tRevert --- Default: Shift+Ctrl+F9\r\n\
             \tSave As... --- Default: Shift+Ctrl+F9\r\n\
+            Product area : Window Menu\r\n\
+            \tColor: Swatches --- Default: Shift+Ctrl+F2\r\n\
+            Product area : Tools\r\n\
+            \tPen Tool --- Default: Shift+Ctrl+F3\r\n\
+            Product area : File Menu\r\n\
+            \tExit --- Default: Ctrl+Alt+F13\r\n\
             garbage line without a separator\r\n";
         let r = menus::run_ui(&mut app, "window.importShortcuts", &json!({"text": set})).unwrap().unwrap();
         assert_eq!(r["set"], "My Set");
@@ -580,17 +351,82 @@ mod tests {
         assert_eq!(menus::shortcut_of(&app, "app.palette"), None);
         assert!(r["conflictsCleared"].as_array().unwrap().iter().any(|c| c["id"] == "app.palette"), "{r}");
         // Unknown items with shortcuts and unreadable keys are reported; Save keeps its shortcut.
-        assert_eq!(r["unmatched"], json!([{"item": "Edit Menu › Frobnicate Everything", "keys": "Default: Ctrl+F12"}]));
+        assert_eq!(
+            r["unmatched"],
+            json!([
+                {"item": "Edit > Frobnicate Everything", "line": 7, "keys": "Default: Ctrl+F12", "reason": "noMatch"},
+                {"item": "File > Close", "line": 10, "keys": "Tables: Ctrl+3", "reason": "context"},
+            ])
+        );
+        // Keys in a context DesignCraft lacks don't make their matched item count as unmatched.
+        assert!(summary("en", &r).contains("; 1 items not matched"), "{}", summary("en", &r));
         assert_eq!(r["unmatchedWithoutShortcut"], 1);
-        assert_eq!(r["unreadable"][0]["item"], "File Menu › Save");
+        assert_eq!(r["unreadable"][0]["item"], "File > Save");
         assert_eq!(menus::shortcut_of(&app, "app.save").as_deref(), Some("Cmd+S"));
         // Two items want the same keys: the later one takes them.
         assert_eq!(menus::shortcut_of(&app, "app.saveDialog").as_deref(), Some("Cmd+Shift+F9"));
         assert_eq!(r["skipped"][0]["takenBy"], "app.saveDialog", "{r}");
-        assert_eq!(r["imported"], 4);
+        // A Window menu panel item and a Tools item apply to the panel and the tool.
+        assert_eq!(crate::keys::shortcut(&app.keymap, &crate::keys::panel("swatches")).as_deref(), Some("Cmd+Shift+F2"));
+        assert_eq!(crate::keys::shortcut(&app.keymap, &crate::keys::tool("pen")).as_deref(), Some("Cmd+Shift+F3"));
+        // InDesign's name for a command, as an alias.
+        assert_eq!(menus::shortcut_of(&app, "app.quit").as_deref(), Some("Cmd+Alt+F13"));
+        // The numeric keypad key is bound as the main key of the same name, and reported.
+        assert_eq!(r["approximated"][0]["item"], "File > Close", "{r}");
+        assert_eq!(r["imported"], 7, "{r}");
         // Reset Shortcuts is the way back.
         menus::run_ui(&mut app, "window.resetShortcuts", &json!({})).unwrap().unwrap();
-        assert_eq!(menus::shortcut_of(&app, "app.palette").as_deref(), Some("Cmd+Return"));
+        assert_eq!(menus::shortcut_of(&app, "app.palette").as_deref(), Some("Cmd+Enter"));
+    }
+
+    /// Two keys for one command still save a ui.json that earlier versions read: they deserialize
+    /// `shortcuts` as a map of one text per command and drop the whole file otherwise.
+    #[test]
+    fn a_command_with_two_imported_shortcuts_saves_a_ui_json_older_versions_read() {
+        let mut app = app();
+        let set = "Shortcut Set : Two\r\nProduct area : File Menu\r\n\tClose --- Default: Shift+Ctrl+Num 5, Default: Ctrl+F4\r\n";
+        menus::run_ui(&mut app, "window.importShortcuts", &json!({"text": set})).unwrap().unwrap();
+        let keys = app.ui.shortcuts.get("file.close").unwrap().to_vec();
+        assert_eq!(keys.len(), 2, "{keys:?}");
+        let saved = serde_json::to_vec_pretty(&app.ui).unwrap();
+        let fields: Value = serde_json::from_slice(&saved).unwrap();
+        let old: std::collections::BTreeMap<String, String> = serde_json::from_value(fields["shortcuts"].clone()).unwrap();
+        assert_eq!(old.get("file.close"), Some(&keys[0]));
+        assert_eq!(fields["shortcutsMore"], json!({"file.close": [keys[1]]}));
+        let loaded = crate::UiState::from_preferences_json(&saved).unwrap();
+        assert_eq!(loaded.shortcuts, app.ui.shortcuts);
+        // The array form an earlier build of the shared keymap wrote.
+        let draft = json!({"shortcuts": [{"command": "file.close", "keys": keys}, {"command": "app.palette", "keys": []}]});
+        let loaded = crate::UiState::from_preferences_json(&serde_json::to_vec(&draft).unwrap()).unwrap();
+        assert_eq!(loaded.shortcuts.get("file.close"), Some(keys.as_slice()));
+        assert_eq!(loaded.shortcuts.get("app.palette"), Some(&[][..]));
+        // Extra keys for a command an earlier version reset are left out.
+        let reset = json!({"shortcuts": {}, "shortcutsMore": {"file.close": ["Cmd+F4"]}});
+        assert!(crate::UiState::from_preferences_json(&serde_json::to_vec(&reset).unwrap()).unwrap().shortcuts.is_empty());
+    }
+
+    /// A set's key on a chord the system takes is left out and the summary says so.
+    #[test]
+    fn a_reserved_chord_in_a_set_is_left_out() {
+        let mut app = app();
+        // Ctrl in a Windows set is ⌘ on a Mac.
+        let keys = if crate::keys::platform().is_mac() { "Ctrl+Tab" } else { "Alt+F4" };
+        let set = format!("Shortcut Set : OS\r\nProduct area : File Menu\r\n\tExit --- Default: {keys}\r\n");
+        let r = menus::run_ui(&mut app, "window.importShortcuts", &json!({ "text": set })).unwrap().unwrap();
+        assert_eq!(r["skipped"][0]["reason"], "reserved", "{r}");
+        assert_eq!(r["imported"], 0, "{r}");
+        assert_eq!(menus::shortcut_of(&app, "app.quit"), menus::default_shortcut("app.quit").map(str::to_string));
+        assert!(summary("en", &r).ends_with("1 shortcuts are reserved by the system and were left out."), "{}", summary("en", &r));
+    }
+
+    #[test]
+    fn a_panel_item_shares_its_key_with_the_command_that_opens_the_panel() {
+        let mut app = app();
+        let set = "Shortcut Set : Panels\r\nProduct area : Window Menu\r\n\tType & Tables: Character --- Default: Ctrl+T\r\n";
+        let r = menus::run_ui(&mut app, "window.importShortcuts", &json!({"text": set})).unwrap().unwrap();
+        assert_eq!(crate::keys::shortcut(&app.keymap, &crate::keys::panel("character")).as_deref(), Some("Cmd+T"));
+        assert_eq!(menus::shortcut_of(&app, "app.characterPanel").as_deref(), Some("Cmd+T"));
+        assert!(!r["conflictsCleared"].as_array().into_iter().flatten().any(|c| c["id"] == "app.characterPanel"), "{r}");
     }
 
     #[test]
diff --git a/crates/ui-egui/src/shortcuts_dialog.rs b/crates/ui-egui/src/shortcuts_dialog.rs
new file mode 100644
index 000000000..95f8eb10c
--- /dev/null
+++ b/crates/ui-egui/src/shortcuts_dialog.rs
@@ -0,0 +1,503 @@
+//! Edit › Keyboard Shortcuts: craft-keymap's shared dialog over DesignCraft's keymap and the user's
+//! named shortcut sets.
+//!
+//! The dialog edits `DesignApp::keymap` and `UiState::shortcut_sets` in place, so menus show new
+//! keys at once; Cancel puts both back. `UiState::shortcuts` follows the keymap every frame: it is
+//! what ui.json saves for earlier versions and what `sync_keymap` applies. While the dialog is open
+//! `app.ui.dialog` holds a `keyboardShortcuts` entry, so the canvas, the menus' key dispatch and
+//! the control channel treat it as the open modal dialog.
+//!
+//! The InDesign importer stays here (`shortcut_import`): the dialog's Import offers its format
+//! next to craft-keymap's JSON, and the dialog reviews the set before it becomes a new set.
+
+use std::borrow::Cow;
+
+use craft_keymap::ui::{DialogState, Format, Options, Outcome, ShortcutsDialog, Text};
+use craft_keymap::{Bindable, Overrides};
+use serde_json::{Value, json};
+
+use crate::DesignApp;
+use crate::app::file_dialogs::Bound;
+use crate::i18n::tr;
+
+/// The `app.ui.dialog` id while the dialog is open.
+pub const DIALOG_ID: &str = "keyboardShortcuts";
+
+/// DesignCraft's built-in shortcut set: its default keys.
+pub static BUILTINS: [(&str, Overrides); 1] = [("Default", Overrides::new())];
+
+/// The name edits of the built-in set are saved under (translated, made unique).
+pub const CUSTOM_SET: &str = "Custom";
+
+/// The file-picker purpose of the dialog's Import (`DesignApp::ask_open`, `open_async`).
+pub const PURPOSE: &str = "shortcuts";
+
+/// A set saved by InDesign's Show Set, read by `shortcut_import`.
+pub const INDESIGN_FORMAT: Format = Format { id: "indesign", label: "InDesign Shortcut Set (Show Set text)", extensions: &["txt"] };
+
+/// The open dialog: its state and options.
+pub struct Host {
+    state: DialogState,
+    options: Options,
+}
+
+impl Host {
+    fn new() -> Host {
+        Host { state: DialogState::new(), options: options() }
+    }
+
+    pub(crate) fn recording(&self) -> bool {
+        self.state.is_recording()
+    }
+}
+
+/// The owner-approved behavior: live editing with Cancel restoring, conflicts asked about, no
+/// double presses, the US keyboard pane, InDesign sets to import, and no rows for the engine
+/// commands only scripts run.
+fn options() -> Options {
+    Options::default().with(|o| {
+        o.keyboard = true;
+        o.import_formats = vec![INDESIGN_FORMAT];
+        o.visible = Some(crate::keys::listed);
+    })
+}
+
+/// The dialog's words through DesignCraft's catalogs; strings without a translation stay English.
+pub struct DcText<'a> {
+    pub lang: &'a str,
+}
+
+impl Text for DcText<'_> {
+    fn ui<'a>(&'a self, source: &'a str) -> Cow<'a, str> {
+        tr(self.lang, source).into()
+    }
+
+    fn plural(&self, n: u64, one: &str, other: &str) -> String {
+        tr(self.lang, if n == 1 { one } else { other }).replace("{n}", &n.to_string())
+    }
+
+    fn command<'a>(&'a self, b: &'a Bindable) -> Cow<'a, str> {
+        tr(self.lang, &b.label).into()
+    }
+
+    fn segment<'a>(&'a self, s: &'a str) -> Cow<'a, str> {
+        tr(self.lang, s).into()
+    }
+
+    fn rtl(&self) -> bool {
+        crate::i18n::is_rtl(self.lang)
+    }
+}
+
+/// Edit › Keyboard Shortcuts…; with `select`, the dialog opens on that command.
+pub fn open(app: &mut DesignApp, select: Option<&craft_keymap::CommandRef>) {
+    crate::dialogs::cancel(app);
+    app.sync_keymap();
+    let mut host = Host::new();
+    if let Some(command) = select {
+        host.state.select(command);
+    }
+    app.shortcut_dialog = Some(Box::new(host));
+    app.ui.dialog = Some(crate::dialogs::Dialog::new(DIALOG_ID, json!({})));
+}
+
+/// The dialog's size: most of the window, within the dialog's own limits.
+fn size(screen: egui::Vec2) -> egui::Vec2 {
+    let max = egui::vec2(1320.0, 900.0).min(screen - egui::vec2(48.0, 96.0)).max(egui::vec2(240.0, 180.0));
+    let min = egui::vec2(640.0, 480.0).min(max);
+    (screen * 0.8).clamp(min, max)
+}
+
+/// One frame of the open dialog, drawn in DesignCraft's movable modal.
+pub(crate) fn show(app: &mut DesignApp, ctx: &egui::Context) {
+    let mut host = app.shortcut_dialog.take().unwrap_or_else(|| Box::new(Host::new()));
+    let lang = app.ui.language.clone();
+    let text = DcText { lang: &lang };
+    let title = tr(&lang, "Keyboard Shortcuts");
+    let area = egui::Id::unique("dialog");
+    let instance = area.with(DIALOG_ID);
+    let body = size(ctx.content_rect().size());
+    let mut out = None;
+    crate::modal_drag::modal(ctx, area, instance).backdrop_color(egui::Color32::TRANSPARENT).show(ctx, |ui| {
+        let title_top = ui.cursor().top();
+        crate::rtl::label(ui, egui::RichText::new(title).font(crate::theme::semibold(16.0)));
+        let margin = egui::Frame::popup(ui.style()).inner_margin;
+        let title_row = egui::Rect::from_min_max(
+            egui::pos2(ui.max_rect().left() - margin.leftf(), title_top - margin.topf()),
+            egui::pos2(ui.max_rect().left() + body.x + margin.rightf(), ui.min_rect().bottom()),
+        );
+        crate::modal_drag::title_drag(ui, instance, title_row);
+        ui.add_space(8.0);
+        let (rect, _) = ui.allocate_exact_size(body, egui::Sense::hover());
+        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(rect).layout(egui::Layout::top_down(egui::Align::Min)));
+        let dialog = ShortcutsDialog::new(&mut app.keymap, &text).options(&host.options).sets(&mut app.ui.shortcut_sets, &BUILTINS);
+        out = dialog.ui(&mut child, &mut host.state);
+    });
+    // Live: the menus, `sync_keymap` and ui.json follow every edit, and a Cancel. The dialog
+    // saves the sets itself.
+    if app.ui.shortcuts != *app.keymap.overrides() {
+        app.ui.shortcuts = app.keymap.overrides().clone();
+    }
+    match out {
+        Some(Outcome::Import { .. }) => request_import(app, &mut host),
+        Some(Outcome::Export { name, json }) => save_file(app, &format!("{name}.json"), json.as_bytes()),
+        Some(Outcome::Summary { name, html, .. }) => save_file(app, &format!("{name}.html"), html.as_bytes()),
+        Some(Outcome::Remembered(answers)) => app.shortcut_answers = answers,
+        _ => {}
+    }
+    if host.state.is_open() {
+        app.shortcut_dialog = Some(host);
+        return;
+    }
+    if app.ui.dialog.as_ref().is_some_and(|d| d.id == DIALOG_ID) {
+        app.ui.dialog = None;
+    }
+    crate::keys::store(app);
+}
+
+/// OK (`ok`) or Cancel from outside the dialog: `ui.dialog.confirm` and `ui.dialog.cancel`, or
+/// another dialog taking its place. An OK the dialog refuses (no room for another set) leaves it
+/// open with its message and returns the error.
+pub(crate) fn close(app: &mut DesignApp, ok: bool) -> Result<(), String> {
+    let Some(mut host) = app.shortcut_dialog.take() else { return Ok(()) };
+    let lang = app.ui.language.clone();
+    let text = DcText { lang: &lang };
+    let dialog = ShortcutsDialog::new(&mut app.keymap, &text).options(&host.options).sets(&mut app.ui.shortcut_sets, &BUILTINS);
+    if ok {
+        dialog.ok(&mut host.state);
+    } else {
+        dialog.cancel(&mut host.state);
+    }
+    crate::keys::store(app);
+    if ok && host.state.is_open() {
+        app.shortcut_dialog = Some(host);
+        app.ui.dialog = Some(crate::dialogs::Dialog::new(DIALOG_ID, json!({})));
+        return Err("the shortcut set could not be saved".into());
+    }
+    Ok(())
+}
+
+/// Import: the chosen file is read when the open dialog answers, or arrives later through
+/// [`deliver`] in a browser.
+fn request_import(app: &mut DesignApp, host: &mut Host) {
+    let request = app.import_request(PURPOSE);
+    if let Some(open) = app.services.open_async.as_mut() {
+        open(request);
+        return;
+    }
+    let asked = app.ask_open(PURPOSE, Bound::App, |app, path| {
+        // The dialog closed meanwhile: nothing to import into.
+        let Some(mut host) = app.shortcut_dialog.take() else { return Ok(Value::Null) };
+        match crate::shortcut_import::read_file(&path) {
+            Ok(text) => review(app, &mut host, &text),
+            Err(e) => host.state.show_error(e),
+        }
+        app.shortcut_dialog = Some(host);
+        Ok(Value::Null)
+    });
+    if let Err(e) = asked {
+        host.state.show_error(e);
+    }
+}
+
+/// A set file chosen in the browser, for the open dialog. False when the dialog is closed.
+pub(crate) fn deliver(app: &mut DesignApp, bytes: &[u8]) -> bool {
+    let Some(mut host) = app.shortcut_dialog.take() else { return false };
+    match crate::shortcut_import::decode(bytes) {
+        Ok(text) => review(app, &mut host, &text),
+        Err(e) => host.state.show_error(e),
+    }
+    app.shortcut_dialog = Some(host);
+    true
+}
+
+/// A set file's text into the dialog: craft-keymap JSON becomes a new set at once (the dialog
+/// shows why it cannot); an InDesign set opens the import review.
+fn review(app: &mut DesignApp, host: &mut Host, text: &str) {
+    let lang = app.ui.language.clone();
+    let words = DcText { lang: &lang };
+    if text.trim_start().starts_with('{') {
+        let dialog = ShortcutsDialog::new(&mut app.keymap, &words).options(&host.options).sets(&mut app.ui.shortcut_sets, &BUILTINS);
+        // A refused file is reported in the dialog.
+        let _ = dialog.import_json(&mut host.state, text);
+        return;
+    }
+    match crate::shortcut_import::read_set(text) {
+        Ok(set) => {
+            let options = crate::shortcut_import::import_options(app.shortcut_answers.clone());
+            let dialog = ShortcutsDialog::new(&mut app.keymap, &words).options(&host.options).sets(&mut app.ui.shortcut_sets, &BUILTINS);
+            dialog.review_import(&mut host.state, set, options);
+        }
+        Err(e) => host.state.show_error(e),
+    }
+}
+
+/// Writes a file the dialog made where the user chooses (a download on the web).
+fn save_file(app: &mut DesignApp, name: &str, bytes: &[u8]) {
+    let name: String = name.chars().map(|c| if c.is_control() || matches!(c, '/' | '\\' | ':') { '_' } else { c }).collect();
+    let bytes = bytes.to_vec();
+    let asked = app.ask_save(&name, Bound::App, move |app, path| {
+        let result = match app.services.write.as_mut() {
+            Some(write) => write(&path, &bytes),
+            None => Err("no writer".into()),
+        };
+        match result {
+            Ok(()) => app.status(tr(&app.ui.language, "Saved to {path}").replace("{path}", &path)),
+            Err(e) => app.status(e),
+        }
+        Ok(Value::Null)
+    });
+    if let Err(e) = asked {
+        app.status(e);
+    }
+}
+
+/// Loads the active set into the keymap and `ui.shortcuts` (after an import made a new set).
+pub(crate) fn load_active_set(app: &mut DesignApp) {
+    let overrides = app.ui.shortcut_sets.active_overrides(&BUILTINS).clone();
+    app.keymap.set_overrides(overrides.clone());
+    app.ui.shortcuts = overrides;
+}
+
+/// The strings the dialog looks up: `craft_keymap::ui::STRINGS` and both forms of its plurals.
+#[cfg(test)]
+pub(crate) fn strings() -> impl Iterator<Item = &'static str> {
+    craft_keymap::ui::STRINGS.iter().copied().chain(craft_keymap::ui::PLURALS.iter().flat_map(|(one, other)| [*one, *other]))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use craft_keymap::{CommandRef, Trigger};
+    use egui::{Key, Modifiers, vec2};
+    use egui_kittest::Harness;
+    use egui_kittest::kittest::Queryable;
+
+    use crate::menus::shortcut_of;
+
+    fn app() -> DesignApp {
+        DesignApp::new(designcraft_engine::Session::new(), crate::Services::default())
+    }
+
+    /// The app's frame as far as shortcuts go: key dispatch, then the open dialog.
+    fn harness(app: DesignApp) -> Harness<'static, DesignApp> {
+        let mut ready = false;
+        let mut h = Harness::builder().with_size(vec2(1280.0, 860.0)).build_ui_state(
+            move |ui, app: &mut DesignApp| {
+                if !ready {
+                    crate::theme::install_fonts(ui.ctx(), &app.ui.language);
+                    crate::theme::apply(ui.ctx(), &crate::theme::Tokens::for_brightness(crate::theme::Brightness::default()));
+                    ready = true;
+                    return;
+                }
+                crate::menus::shortcuts(app, ui.ctx());
+                crate::dialogs::show(app, ui.ctx());
+            },
+            app,
+        );
+        h.run();
+        h
+    }
+
+    fn opened() -> Harness<'static, DesignApp> {
+        let mut app = app();
+        app.run("app.keyboardShortcuts", json!({})).unwrap();
+        harness(app)
+    }
+
+    fn click(h: &mut Harness<'_, DesignApp>, label: &str) {
+        h.get_by_label(label).click();
+        h.run();
+    }
+
+    fn press(h: &mut Harness<'_, DesignApp>, modifiers: Modifiers, key: Key) {
+        h.key_press_modifiers(modifiers, key);
+        h.run();
+    }
+
+    fn has(h: &Harness<'_, DesignApp>, label: &str) -> bool {
+        h.query_by_label(label).is_some()
+    }
+
+    fn chord(h: &Harness<'_, DesignApp>, text: &str) -> String {
+        Trigger::parse(text).unwrap().display(h.state().keymap.platform())
+    }
+
+    /// Searches for a command and returns the label of its row's shortcut cell, which starts
+    /// recording.
+    fn row(h: &mut Harness<'_, DesignApp>, label: &str, id: &str) -> String {
+        h.get_by_label("Search:").focus();
+        h.run();
+        h.get_by_label("Search:").type_text(label);
+        h.run();
+        format!("{label}: {}", crate::keys::shortcut_display(&h.state().keymap, &CommandRef::new(id)).unwrap())
+    }
+
+    /// A command's shortcut with no changes.
+    fn default_of(id: &str) -> Option<String> {
+        crate::keys::shortcut(&crate::keys::new_keymap(Overrides::new()), &CommandRef::new(id))
+    }
+
+    fn open(h: &Harness<'_, DesignApp>) -> bool {
+        h.state().ui.dialog.as_ref().is_some_and(|d| d.id == DIALOG_ID) && h.state().shortcut_dialog.is_some()
+    }
+
+    #[test]
+    fn a_recorded_chord_runs_nothing_changes_the_menus_at_once_and_ok_keeps_a_custom_set() {
+        let mut h = opened();
+        let quick_apply = row(&mut h, "Quick Apply…", "app.palette");
+        click(&mut h, &quick_apply);
+        // Preferences' chord is recorded, not run.
+        press(&mut h, Modifiers::COMMAND, Key::K);
+        assert!(open(&h), "Preferences did not open");
+        assert!(has(&h, &format!("⚠ {} is used by Preferences…", chord(&h, "Cmd+K"))));
+        click(&mut h, "Take It");
+        assert_eq!(shortcut_of(h.state(), "app.palette").as_deref(), Some("Cmd+K"));
+        assert_eq!(shortcut_of(h.state(), "app.preferences"), None);
+        assert_eq!(h.state().ui.shortcuts.get("app.palette"), Some(&["Cmd+K".to_string()][..]), "ui.json follows live");
+        assert!(h.state().ui.shortcut_sets.sets().is_empty(), "the set is saved by OK");
+
+        click(&mut h, "OK");
+        assert!(!open(&h) && h.state().ui.dialog.is_none());
+        let sets = &h.state().ui.shortcut_sets;
+        assert_eq!(sets.active(), "Custom", "edits of the built-in set become a copy");
+        assert_eq!(sets.active_overrides(&BUILTINS), &h.state().ui.shortcuts);
+        let saved = serde_json::to_value(&h.state().ui).unwrap();
+        assert_eq!(saved["shortcuts"]["app.palette"], "Cmd+K", "the map earlier versions read");
+        assert_eq!(saved["shortcutSets"]["active"], "Custom");
+        // The next frames keep it.
+        h.run();
+        assert_eq!(shortcut_of(h.state(), "app.palette").as_deref(), Some("Cmd+K"));
+    }
+
+    #[test]
+    fn assign_takes_a_held_shortcut_in_one_step_for_the_menus_and_the_keys() {
+        let mut app = app();
+        super::open(&mut app, Some(&CommandRef::new("app.paragraphStylesPanel")));
+        let mut h = harness(app);
+        click(&mut h, "New shortcut: None");
+        press(&mut h, Modifiers::COMMAND, Key::P);
+        assert!(has(&h, "⚠ Print…"), "Print is listed as holding the chord");
+        click(&mut h, "Assign");
+        click(&mut h, "OK");
+        assert!(!open(&h));
+        let app = h.state();
+        assert_eq!(shortcut_of(app, "file.print"), None, "the menus no longer show it on Print");
+        let bindings: Vec<String> = app.keymap.bindings(&CommandRef::new("app.paragraphStylesPanel")).iter().map(|b| b.trigger.to_string()).collect();
+        assert_eq!(bindings, ["Cmd+F11", "Cmd+P"]);
+        // The macOS menu bar holds Paragraph Styles' first shortcut; its new one runs in the app.
+        h.state_mut().native_shortcuts = [("app.paragraphStylesPanel".to_string(), "Cmd+F11".to_string())].into();
+        assert!(!crate::panel_docking::showing(h.state(), "paragraphStyles"));
+        press(&mut h, Modifiers::COMMAND, Key::P);
+        assert!(crate::panel_docking::showing(h.state(), "paragraphStyles"), "Cmd+P opens Paragraph Styles");
+    }
+
+    #[test]
+    fn cancel_puts_the_keys_and_the_sets_back() {
+        let mut h = opened();
+        let quick_apply = row(&mut h, "Quick Apply…", "app.palette");
+        click(&mut h, &quick_apply);
+        press(&mut h, Modifiers::COMMAND | Modifiers::ALT | Modifiers::SHIFT, Key::Num9);
+        assert_eq!(shortcut_of(h.state(), "app.palette").as_deref(), Some("Cmd+Alt+Shift+9"));
+        click(&mut h, "Cancel");
+        h.run();
+        assert!(!open(&h));
+        assert_eq!(shortcut_of(h.state(), "app.palette"), default_of("app.palette"));
+        assert!(h.state().ui.shortcuts.is_empty());
+        assert_eq!(h.state().ui.shortcut_sets, craft_keymap::Profiles::default());
+
+        // `ui.dialog.cancel` from the control channel does the same.
+        h.state_mut().run("app.keyboardShortcuts", json!({"command": "app.palette"})).unwrap();
+        h.run();
+        let quick_apply = row(&mut h, "Quick Apply…", "app.palette");
+        click(&mut h, &quick_apply);
+        press(&mut h, Modifiers::NONE, Key::F2);
+        assert_eq!(shortcut_of(h.state(), "app.palette").as_deref(), Some("F2"));
+        crate::dialogs::cancel(h.state_mut());
+        h.run();
+        assert!(!open(&h));
+        assert_eq!(shortcut_of(h.state(), "app.palette"), default_of("app.palette"));
+    }
+
+    /// An InDesign set through the dialog's Import: reviewed, then a new set with the Window menu
+    /// panel item on the panel and its twin command, and the Tools item on the tool.
+    #[test]
+    fn an_indesign_set_imports_through_the_review_as_a_new_set() {
+        let dir = tempfile::tempdir().unwrap();
+        let path = dir.path().join("studio.txt");
+        std::fs::write(
+            &path,
+            "Shortcut Set : Studio\r\n\
+             Product area : Window Menu\r\n\
+             \tType & Tables: Character --- Default: Ctrl+T\r\n\
+             Product area : Tools\r\n\
+             \tPen Tool --- Default: Shift+Ctrl+F3\r\n\
+             \tFrobnicate Tool --- Default: Shift+Ctrl+F4\r\n",
+        )
+        .unwrap();
+        let picked = path.to_string_lossy().to_string();
+        let mut app = app();
+        app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(Some(picked)));
+        app.run("app.keyboardShortcuts", json!({})).unwrap();
+        let mut h = harness(app);
+        click(&mut h, "Import…");
+        h.state_mut().settle_dialogs();
+        h.run();
+        assert!(has(&h, "Import “Studio”"));
+        assert!(h.state().ui.shortcuts.is_empty(), "the review changes nothing");
+        click(&mut h, "Import as New Set");
+        assert!(has(&h, "Imported as “Studio”"));
+        let panel = |h: &Harness<'_, DesignApp>| crate::keys::shortcut(&h.state().keymap, &crate::keys::panel("character"));
+        assert_eq!(panel(&h).as_deref(), Some("Cmd+T"));
+        assert_eq!(shortcut_of(h.state(), "app.characterPanel").as_deref(), Some("Cmd+T"), "the panel's twin keeps the key they share");
+        assert_eq!(crate::keys::shortcut(&h.state().keymap, &crate::keys::tool("pen")).as_deref(), Some("Cmd+Shift+F3"));
+        click(&mut h, "Done");
+        click(&mut h, "OK");
+        assert!(!open(&h));
+        assert_eq!(h.state().ui.shortcut_sets.active(), "Studio");
+        assert_eq!(h.state().ui.shortcut_sets.active_overrides(&BUILTINS), &h.state().ui.shortcuts);
+        // Back to the defaults by switching sets.
+        h.state_mut().run("window.shortcutSets", json!({"select": "Default"})).unwrap();
+        assert_eq!(
+            crate::keys::shortcut(&h.state().keymap, &crate::keys::tool("pen")),
+            crate::keys::shortcut(&crate::keys::new_keymap(Overrides::new()), &crate::keys::tool("pen"))
+        );
+        assert!(h.state().ui.shortcuts.is_empty());
+    }
+
+    #[test]
+    fn shortcuts_from_an_earlier_version_become_the_active_set() {
+        // A ui.json without sets: its changes become Custom.
+        let mut app = app();
+        app.ui = crate::UiState::from_preferences_json(br#"{"shortcuts": {"app.palette": "Cmd+Alt+Shift+9"}, "shortcutSets": false}"#).unwrap();
+        app.sync_keymap();
+        assert_eq!(app.ui.shortcut_sets.active(), "Custom");
+        assert_eq!(shortcut_of(&app, "app.palette").as_deref(), Some("Cmd+Alt+Shift+9"));
+        // An earlier version changed the shortcuts of the active set "Mine".
+        let mut saved = serde_json::to_value(&app.ui).unwrap();
+        saved["shortcutSets"] = json!({"version": 1, "active": "Mine", "sets": [{"name": "Mine", "overrides": []}]});
+        saved["shortcuts"] = json!({"app.palette": "F2"});
+        app.ui = crate::UiState::from_preferences_json(&serde_json::to_vec(&saved).unwrap()).unwrap();
+        app.sync_keymap();
+        assert_eq!(app.ui.shortcut_sets.active(), "Mine");
+        assert_eq!(app.ui.shortcut_sets.active_overrides(&BUILTINS).get("app.palette"), Some(&["F2".to_string()][..]));
+        assert_eq!(shortcut_of(&app, "app.palette").as_deref(), Some("F2"));
+        let r = app.run("window.shortcutSets", json!({"select": "Default"})).unwrap();
+        assert_eq!(r, json!({"active": "Default", "sets": ["Default", "Mine"], "builtIn": ["Default"]}));
+        assert_eq!(shortcut_of(&app, "app.palette"), default_of("app.palette"));
+        assert!(app.run("window.shortcutSets", json!({"select": "Nope"})).is_err());
+        assert!(serde_json::to_value(&app.ui).unwrap()["shortcuts"].as_object().is_some_and(|m| m.is_empty()));
+    }
+
+    #[test]
+    fn every_dialog_string_reads_in_english_without_a_translation() {
+        let text = DcText { lang: "" };
+        for s in strings() {
+            assert_eq!(text.ui(s), s);
+        }
+        assert_eq!(craft_keymap::ui::STRINGS.len(), 175);
+        assert_eq!(craft_keymap::ui::PLURALS.len(), 11);
+        assert_eq!(text.plural(2, "{n} command will change", "{n} commands will change"), "2 commands will change");
+        assert_eq!(DcText { lang: "fr" }.ui("Cancel"), tr("fr", "Cancel"));
+    }
+}
diff --git a/crates/ui-egui/src/state.rs b/crates/ui-egui/src/state.rs
new file mode 100644
index 000000000..bd038090a
--- /dev/null
+++ b/crates/ui-egui/src/state.rs
@@ -0,0 +1,590 @@
+#[cfg(not(target_arch = "wasm32"))]
+use super::render_worker;
+use super::{Deserialize, Point, Serialize, SnapView, Unit, canvas, dialogs, page_history, panels, prefs, separations, theme};
+
+/// Context captured before any host file-picker or read await.
+#[derive(Clone, Debug)]
+pub struct ImportRequest {
+    pub purpose: String,
+    pub target: Option<u64>,
+}
+
+pub struct ImportedFile {
+    pub request: ImportRequest,
+    pub name: String,
+    pub bytes: Vec<u8>,
+}
+
+/// Closed panels, each with where it goes back, in craft-ui's `Workspace::hidden` shape
+/// (`[[panel, location], …]`). A floating panel's entry is where Dock Panel returns it.
+/// Files from before this shape hold an object keyed by panel; it still loads.
+#[derive(Clone, Debug, Default, PartialEq, Serialize)]
+#[serde(transparent)]
+pub struct HiddenPanels(pub Vec<(String, craft_ui::docking::Location<String>)>);
+
+impl<'de> Deserialize<'de> for HiddenPanels {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        #[derive(Deserialize)]
+        #[serde(untagged)]
+        enum Shape {
+            List(Vec<(String, craft_ui::docking::Location<String>)>),
+            Keyed(std::collections::BTreeMap<String, craft_ui::docking::Location<String>>),
+        }
+        let entries = match Shape::deserialize(deserializer)? {
+            Shape::List(entries) => entries,
+            Shape::Keyed(entries) => entries.into_iter().collect(),
+        };
+        let mut hidden = Self::default();
+        for (panel, location) in entries {
+            hidden.insert(panel, location);
+        }
+        Ok(hidden)
+    }
+}
+
+impl HiddenPanels {
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+    pub fn contains_key(&self, panel: &str) -> bool {
+        self.0.iter().any(|(p, _)| p == panel)
+    }
+    pub fn get(&self, panel: &str) -> Option<&craft_ui::docking::Location<String>> {
+        self.0.iter().find(|(p, _)| p == panel).map(|(_, location)| location)
+    }
+    /// Record where `panel` goes back, replacing an earlier entry.
+    pub fn insert(&mut self, panel: String, location: craft_ui::docking::Location<String>) {
+        self.remove(&panel);
+        self.0.push((panel, location));
+    }
+    pub fn remove(&mut self, panel: &str) {
+        self.0.retain(|(p, _)| p != panel);
+    }
+    pub fn keys(&self) -> impl Iterator<Item = &String> {
+        self.0.iter().map(|(p, _)| p)
+    }
+    pub fn clear(&mut self) {
+        self.0.clear();
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ScreenMode {
+    #[default]
+    Normal,
+    Preview,
+    Bleed,
+    Slug,
+    Presentation,
+}
+
+/// A saved workspace: which bars show and where the panels are.
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+#[serde(default, rename_all = "camelCase")]
+pub struct SavedWorkspace {
+    pub name: String,
+    pub control_bar: bool,
+    pub task_bar: bool,
+    pub task_bar_pin: Option<[f32; 2]>,
+    pub tools_double_column: bool,
+    pub dock_tab: String,
+    pub dock_expanded: bool,
+    pub open_panel: Option<String>,
+    pub floating: Vec<(String, [f32; 2])>,
+    /// Custom panel membership and placement; absent in older workspace files.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub docking: Option<craft_ui::docking::Layout<String>>,
+    #[serde(default, skip_serializing_if = "HiddenPanels::is_empty")]
+    pub docking_hidden: HiddenPanels,
+    /// The workspace's own iconic column (see [`UiState::icon_groups`]).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub icon_groups: Option<Vec<Vec<String>>>,
+    /// Saved with New Workspace › Capture › Panel Locations off: choosing the workspace leaves the
+    /// bars and panels where they are.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub keep_panels: bool,
+    /// New Workspace › Capture › Menu Customization: the menu items hidden with Edit › Menus.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub hidden_menu_items: Option<Vec<String>>,
+}
+
+/// A missing on-by-default bool stays on. `bool::default` is false.
+fn default_true() -> bool {
+    true
+}
+
+/// A missing snap zone stays at the factory width, in screen pixels.
+fn default_zone() -> f64 {
+    4.0
+}
+
+/// File › Export PDF… options: the values persisted in `UiState.pdf_export` and used as the
+/// dialog's defaults. Serialised as `pdfExport` with camelCase field names.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(default, rename_all = "camelCase")]
+pub struct PdfExportSettings {
+    /// Preset (one of the five presets, or "Custom" after a manual edit).
+    pub preset: String,
+    /// PDF standard (`none`, `x1a`, `x4`, `a2b`).
+    pub standard: String,
+    /// Compression › Compress images (JPEG).
+    pub compress_images: bool,
+    /// Transparency flattener preset (`""` = none, `high`, `medium`, `low`).
+    pub flatten: String,
+    pub spreads: bool,
+    pub bleed: bool,
+    pub marks_crop: bool,
+    pub marks_bleed: bool,
+    pub marks_page_info: bool,
+    pub marks_weight: String,
+    pub marks_offset: String,
+    /// File › Export PDF › Advanced › Tagged PDF.
+    pub tagged: bool,
+}
+
+impl Default for PdfExportSettings {
+    fn default() -> Self {
+        PdfExportSettings {
+            preset: "Desktop Printing".into(),
+            standard: "none".into(),
+            compress_images: false,
+            flatten: "".into(),
+            spreads: false,
+            bleed: true,
+            marks_crop: false,
+            marks_bleed: false,
+            marks_page_info: false,
+            marks_weight: "0.25".into(),
+            marks_offset: "6".into(),
+            tagged: true,
+        }
+    }
+}
+
+/// The viewport of New Window's OS window, which shows pane 1.
+pub(crate) fn second_window_viewport() -> egui::ViewportId {
+    egui::ViewportId::from_hash_of("designcraft_second_window")
+}
+
+/// Persisted UI state.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(default, rename_all = "camelCase")]
+pub struct UiState {
+    pub brightness: theme::Brightness,
+    pub screen_mode: ScreenMode,
+    /// The screen mode leaving Presentation returns to: the one it was entered from.
+    pub presentation_return: ScreenMode,
+    /// The view (by its `views` key) Presentation was entered from; leaving puts it back.
+    #[serde(skip)]
+    pub presentation_view: Option<(u64, View)>,
+    /// The page in that view and the place on it, for Go Back after leaving Presentation.
+    #[serde(skip)]
+    pub presentation_page: Option<(designcraft_doc::ids::PageId, designcraft_geom::Vec2)>,
+    /// That view's Go Back / Go Forward history; leaving puts it back with one jump added.
+    #[serde(skip)]
+    pub(crate) presentation_history: Option<page_history::PageHistory>,
+    pub frame_edges: bool,
+    pub rulers: bool,
+    pub guides: bool,
+    pub baseline_grid: bool,
+    pub document_grid: bool,
+    pub text_threads: bool,
+    pub hidden_characters: bool,
+    /// View › Structure › Show Tagged Frames.
+    pub tagged_frames: bool,
+    /// Edit › Menus: hidden menu items (`menu/label`), and Show Full Menus.
+    pub hidden_menu_items: Vec<String>,
+    pub show_full_menus: bool,
+    /// Scripts panel: saved scripts (name, text).
+    pub scripts: Vec<(String, String)>,
+    /// View › Structure › Show Tag Markers.
+    pub tag_markers: bool,
+    /// View › Flattener Preview: objects that involve transparency highlighted in red.
+    #[serde(skip)]
+    pub flattener_preview: bool,
+    /// Tab / Shift+Tab: 1 = every panel hidden, 2 = all but the Tools panel (0 = shown).
+    pub hidden_panels: u8,
+    /// "Don't show again" in the warning before deleting pages that contain objects.
+    pub skip_delete_pages_warning: bool,
+    /// The Pages panel's parents part as its divider was last dragged, and the height the two
+    /// parts shared then (None: a few rows).
+    pub pages_parents_height: Option<[f32; 2]>,
+    /// The Pages panel's Panel Options.
+    pub pages_panel: panels::pages::PanelOptions,
+    /// Edit › Color Settings (re-applied at start).
+    pub color_settings: Option<designcraft_color::cms::ColorSettings>,
+    /// ICC files loaded with Edit › Color Settings › Load Profile… (loaded again at start, before
+    /// `color_settings`, so a loaded working space stays chosen).
+    pub color_profiles: Vec<String>,
+    /// View › Proof Colors and View › Proof Setup.
+    pub proof_colors: bool,
+    pub proof_setup: designcraft_color::cms::ProofSetup,
+    /// Edit › Spelling › Dynamic Spelling: misspelled words underlined on the canvas.
+    pub dynamic_spelling: bool,
+    /// Preferences › Story Editor Display: text size (points).
+    pub story_editor_size: f32,
+    /// View › Story Editor › Show/Hide Depth Ruler.
+    pub story_editor_depth_ruler: bool,
+    /// Preferences › General › Interface Language: supported codes are listed in `i18n::LANGUAGES`.
+    pub language: String,
+    /// Edit › Transparency Flattener Presets: "" (none), "high", "medium" or "low" for PDF export.
+    pub flattener: String,
+    /// File › Export PDF… options (persisted; see `PdfExportSettings`).
+    pub pdf_export: PdfExportSettings,
+    /// The Preview checkbox of Paragraph/Character Style Options, remembered between openings.
+    pub style_preview: bool,
+    /// View › Separations Preview: the plate shown and the ink limit; `None` is off.
+    #[serde(skip)]
+    pub separations: Option<separations::Separations>,
+    /// View › Display Performance.
+    pub display_quality: designcraft_render::DisplayQuality,
+    /// Preferences › Interface › UI scaling (1 = 100%).
+    pub ui_scale: f32,
+    /// Preferences › Appearance of Black: 100% K on screen as rich black (InDesign's default,
+    /// Display All Blacks as Rich Black; off: accurately, as dark grey).
+    pub rich_black: bool,
+    /// View › Overprint Preview.
+    pub overprint_preview: bool,
+    /// Edit › Keyboard Shortcuts: the active shortcut set's changes to the default shortcuts, which
+    /// the keymap uses. Saved as `shortcuts` and `shortcutsMore` (see `prefs::saved_shortcuts`),
+    /// which earlier versions read.
+    #[serde(flatten, with = "prefs::saved_shortcuts")]
+    pub shortcuts: craft_keymap::Overrides,
+    /// The user's named shortcut sets and which one is active (see `shortcuts_dialog`).
+    #[serde(deserialize_with = "prefs::lenient_sets")]
+    pub shortcut_sets: craft_keymap::Profiles,
+    pub control_bar: bool,
+    pub tools_double_column: bool,
+    /// The front tab of the default layout's Properties · Pages · Layers group. `dock_tab`,
+    /// `open_panel`, `floating`, `dock_expanded` and `icon_groups` describe a workspace's
+    /// default layout (`panel_docking::default_layout`).
+    pub dock_tab: String,
+    /// The panel it opens below that group (Printing and Proofing: Swatches).
+    pub open_panel: Option<String>,
+    /// Its floating panels, and the float-only panels' windows (Type › Tabs): (panel id,
+    /// top-left position). A customized layout holds its own floating panels.
+    pub floating: Vec<(String, [f32; 2])>,
+    /// The panel layout once the user customizes it; `None` is the workspace's default layout
+    /// (`panel_docking::default_layout`).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub docking: Option<craft_ui::docking::Layout<String>>,
+    #[serde(default, skip_serializing_if = "HiddenPanels::is_empty")]
+    pub docking_hidden: HiddenPanels,
+    /// The panel (or the canvas) last clicked or selected in the docking layout, while the panel
+    /// stays where the user left it.
+    #[serde(skip)]
+    pub docking_focused: Option<String>,
+    /// Invalidates in-flight gestures when a workspace is replaced.
+    #[serde(skip)]
+    pub docking_generation: u64,
+    /// One-frame reveal request; z-order is never persisted.
+    #[serde(skip)]
+    pub docking_raise: Option<String>,
+    /// The panel last revealed explicitly, which `ui.set closePanel` closes.
+    #[serde(skip)]
+    pub docking_opened: Option<String>,
+    /// The panel whose iconic-column flyout is open, as of the last frame or a command that
+    /// opened it.
+    #[serde(skip)]
+    pub docking_flyout: Option<String>,
+    /// Auto-Collapse Iconic Panels: a flyout closes on Escape or a click outside it. Off by
+    /// default. Saved as `autoCollapseIconicPanels`: `dockAutoCollapse` in older preference files
+    /// holds a default of on, so it is not read.
+    #[serde(rename = "autoCollapseIconicPanels")]
+    pub dock_auto_collapse: bool,
+    /// Whether the default layout's outer column is expanded (false: collapsed to icons).
+    pub dock_expanded: bool,
+    /// A workspace's iconic panel groups (Essentials Classic), shown with their names in the
+    /// iconic column instead of every panel; `None` is one icon per panel.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub icon_groups: Option<Vec<Vec<String>>>,
+    pub units: Unit,
+    pub workspace: String,
+    /// Window › Workspace › New Workspace: saved panel arrangements.
+    pub custom_workspaces: Vec<SavedWorkspace>,
+    /// File › New › Document › Recent: the settings of the last documents made, newest first.
+    pub recent_new_documents: Vec<designcraft_doc::build::NewDocument>,
+    /// The folder of the last file saved or exported: where the save dialog starts for a
+    /// document never saved.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub last_save_folder: Option<String>,
+    /// The font menus' sample text (a key of `panels::FONT_SAMPLES`) and size (0–2).
+    pub font_sample: String,
+    pub font_preview_size: u8,
+    /// File › New › Document › Preview, kept for the session.
+    #[serde(skip)]
+    pub new_document_preview: bool,
+    /// Transform reference point (0..8, row-major; 0 = top-left).
+    pub ref_point: u8,
+    /// Align To target (`selection`, `keyObject`, `margins`, `page`, `spread`).
+    pub align_to: String,
+    /// Properties > Text Style tab: 0 = Paragraph Styles, 1 = Character Styles.
+    pub text_style_tab: u8,
+    /// View › Grids & Guides › Lock Guides: ruler guides can't be dragged.
+    pub guides_locked: bool,
+    pub smart_guides: bool,
+    #[serde(default = "default_true")]
+    pub snap_to_guides: bool,
+    pub snap_to_document_grid: bool,
+    #[serde(default = "default_true")]
+    pub align_edges: bool,
+    #[serde(default = "default_true")]
+    pub align_centers: bool,
+    #[serde(default = "default_true")]
+    pub smart_dimensions: bool,
+    #[serde(default = "default_true")]
+    pub smart_spacing: bool,
+    #[serde(default = "default_zone")]
+    pub snap_zone: f64,
+    /// Tools panel: Formatting Affects Text (J): with text frames selected, colour edits go to
+    /// their text instead of the frames.
+    pub formatting_affects_text: bool,
+    /// Window > Contextual Task Bar.
+    pub task_bar: bool,
+    /// Where the Contextual Task Bar is pinned: its top-left, in points from the canvas's top-left
+    /// (`None`: it follows the selection).
+    pub task_bar_pin: Option<[f32; 2]>,
+    /// Where the Contextual Task Bar was last shown, like [`Self::task_bar_pin`].
+    #[serde(skip)]
+    pub task_bar_at: Option<[f32; 2]>,
+    /// Help › About DesignCraft is open.
+    pub about: bool,
+    /// The About window's tab: 0 About, 1 Contributors, 2 Models (`about::ABOUT_TABS`).
+    #[serde(skip)]
+    pub about_tab: u8,
+    /// URLs to open in the browser on the next frame (Help links, About, start screen).
+    pub pending_urls: Vec<String>,
+    #[serde(skip)]
+    pub status: String,
+    #[serde(skip)]
+    pub dialog: Option<dialogs::Dialog>,
+    #[serde(skip)]
+    pub palette: Option<String>,
+    #[serde(skip)]
+    pub flyout: Option<usize>,
+    /// Type › Tabs: the selected stop and where the panel sits.
+    #[serde(skip)]
+    pub tabs_panel: panels::tabs::PanelState,
+    /// The colour and gradient swatches applied last: what Apply Color (,) and Apply Gradient (.)
+    /// apply again.
+    #[serde(skip)]
+    pub last_color: Option<String>,
+    #[serde(skip)]
+    pub last_gradient: Option<String>,
+    /// Fill/Stroke proxy (Tools and Color panels): the stroke is in front, so Apply None and the
+    /// Color panel act on it (X toggles).
+    #[serde(skip)]
+    pub stroke_front: bool,
+}
+
+impl Default for UiState {
+    fn default() -> Self {
+        UiState {
+            brightness: theme::Brightness::MediumDark,
+            screen_mode: ScreenMode::Normal,
+            presentation_return: ScreenMode::Normal,
+            presentation_view: None,
+            presentation_page: None,
+            presentation_history: None,
+            frame_edges: true,
+            rulers: true,
+            guides: true,
+            baseline_grid: false,
+            document_grid: false,
+            text_threads: false,
+            hidden_characters: false,
+            tagged_frames: false,
+            hidden_menu_items: Vec::new(),
+            show_full_menus: false,
+            story_editor_size: 14.0,
+            story_editor_depth_ruler: true,
+            scripts: vec![
+                ("Number the pages".into(), "# A page-number frame at the bottom of the current page.\nframe.create {\"rect\": [288, 740, 324, 760], \"content\": \"text\", \"text\": \"\"}\ntext.select {\"story\": \"$0.story\", \"anchor\": 0, \"focus\": 0}\ntext.insert {\"text\": \"\\ue000\", \"raw\": true}".into()),
+                ("Two-column grid".into(), "# Four text frames in a 2 × 2 grid.\nframe.grid {\"rect\": [36, 36, 576, 756], \"cols\": 2, \"rows\": 2, \"gutter\": 12}".into()),
+            ],
+            tag_markers: false,
+            flattener_preview: false,
+            hidden_panels: 0,
+            skip_delete_pages_warning: false,
+            pages_parents_height: None,
+            pages_panel: Default::default(),
+            color_settings: None,
+            color_profiles: Vec::new(),
+            proof_colors: false,
+            proof_setup: Default::default(),
+            dynamic_spelling: false,
+            language: String::new(),
+            flattener: String::new(),
+            pdf_export: PdfExportSettings::default(),
+            style_preview: false,
+            separations: None,
+            display_quality: designcraft_render::DisplayQuality::High,
+            ui_scale: 1.0,
+            rich_black: true,
+            overprint_preview: false,
+            shortcuts: Default::default(),
+            shortcut_sets: Default::default(),
+            control_bar: false,
+            tools_double_column: false,
+            dock_tab: "properties".into(),
+            open_panel: None,
+            floating: Vec::new(),
+            docking: None,
+            docking_hidden: Default::default(),
+            docking_generation: 0,
+            docking_raise: None,
+            docking_opened: None,
+            docking_flyout: None,
+            dock_auto_collapse: false,
+            docking_focused: None,
+            dock_expanded: true,
+            icon_groups: None,
+            units: Unit::Picas,
+            workspace: "Essentials".into(),
+            custom_workspaces: Vec::new(),
+            recent_new_documents: Vec::new(),
+            last_save_folder: None,
+            font_sample: "selected".into(),
+            font_preview_size: 1,
+            new_document_preview: false,
+            ref_point: 0,
+            align_to: "selection".into(),
+            text_style_tab: 0,
+            guides_locked: false,
+            smart_guides: true,
+            snap_to_guides: true,
+            snap_to_document_grid: false,
+            align_edges: true,
+            align_centers: true,
+            smart_dimensions: true,
+            smart_spacing: true,
+            snap_zone: 4.0,
+            formatting_affects_text: false,
+            task_bar: true,
+            task_bar_pin: None,
+            task_bar_at: None,
+            about: false,
+            about_tab: 0,
+            pending_urls: Vec::new(),
+            status: String::new(),
+            dialog: None,
+            palette: None,
+            flyout: None,
+            tabs_panel: Default::default(),
+            last_color: None,
+            last_gradient: None,
+            stroke_front: false,
+        }
+    }
+}
+
+impl UiState {
+    /// Copies the live view switches into the snap engine's view.
+    pub fn snap_view(&self) -> SnapView {
+        SnapView {
+            snap_to_guides: self.snap_to_guides,
+            snap_to_document_grid: self.snap_to_document_grid,
+            show_guides: self.guides,
+            smart_guides: self.smart_guides,
+            align_edges: self.align_edges,
+            align_centers: self.align_centers,
+            smart_dimensions: self.smart_dimensions,
+            smart_spacing: self.smart_spacing,
+            zone_px: self.snap_zone,
+            guides_locked: self.guides_locked,
+        }
+    }
+}
+
+/// Per-document view: zoom (screen points per document point) and the canvas point at the
+/// top-left of the canvas area.
+#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
+pub struct View {
+    pub zoom: f64,
+    pub origin: Point,
+    pub fitted: bool,
+    /// View › Rotate Spread: quarter turns clockwise (0–3).
+    pub rotation: u8,
+}
+
+impl Default for View {
+    fn default() -> Self {
+        View { zoom: 0.5, origin: Point::new(-100.0, -100.0), fitted: false, rotation: 0 }
+    }
+}
+
+/// What the canvas texture currently shows.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Shown {
+    /// (doc uid, doc pointer, revision, preview).
+    pub doc: (u64, u64, u64, bool),
+    /// Parent and document spreads have different canvas placement and content.
+    pub editing_parents: bool,
+    /// Canvas point at the texture's top-left, zoom, and texture size in screen points.
+    pub origin: Point,
+    pub zoom: f64,
+    pub size: (f32, f32),
+}
+
+impl CanvasCache {
+    pub fn new() -> Self {
+        let mut renderer = designcraft_render::Renderer::new();
+        renderer.threads = designcraft_render::default_threads();
+        CanvasCache {
+            renderer,
+            texture: None,
+            shown: None,
+            pending: None,
+            token: 0,
+            #[cfg(not(target_arch = "wasm32"))]
+            worker: None,
+            worker_started: false,
+            last_ms: 0.0,
+            shown_doc: None,
+            pending_doc: None,
+            display_key: None,
+            patcher: designcraft_render::Renderer::new(),
+            patches: 0,
+            separations: separations::Preview::default(),
+        }
+    }
+}
+
+impl Default for CanvasCache {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+pub struct CanvasCache {
+    pub renderer: designcraft_render::Renderer,
+    pub texture: Option<egui::TextureHandle>,
+    pub shown: Option<Shown>,
+    /// The request in flight on the worker.
+    pub pending: Option<(u64, Shown)>,
+    pub token: u64,
+    #[cfg(not(target_arch = "wasm32"))]
+    pub worker: Option<render_worker::Worker>,
+    pub worker_started: bool,
+    pub last_ms: f64,
+    /// The document the texture shows (to repaint only what an edit changed).
+    pub shown_doc: Option<std::sync::Arc<designcraft_doc::Document>>,
+    /// Document of the request in flight.
+    pub pending_doc: Option<std::sync::Arc<designcraft_doc::Document>>,
+    /// Display options the texture and the request in flight were rendered with.
+    pub display_key: Option<canvas::DisplayKey>,
+    /// Renders damaged regions (its own context: region sizes vary).
+    pub patcher: designcraft_render::Renderer,
+    /// Partial repaints / full renders since start (perf readout).
+    pub patches: u64,
+    /// View › Separations Preview: the visible spreads' plates.
+    pub separations: separations::Preview,
+}
+
+#[derive(Default, Clone, Copy, Debug, Serialize)]
+pub struct Perf {
+    pub frame_ms: f64,
+    pub render_ms: f64,
+    pub fps: f64,
+}
diff --git a/crates/ui-egui/src/story_editor.rs b/crates/ui-egui/src/story_editor.rs
index 2bd481d82..b7d988416 100644
--- a/crates/ui-egui/src/story_editor.rs
+++ b/crates/ui-egui/src/story_editor.rs
@@ -1,15 +1,23 @@
 //! Story Editor (Edit → Edit in Story Editor, ⌘Y): the story as plain text with each paragraph's
-//! style in the left column and the overset point marked. Edits are applied as minimal range
-//! replacements, so formatting around them is kept.
+//! style in the left column, the depth ruler beside it and the overset point marked. Edits are
+//! applied as minimal range replacements, so formatting around them is kept.
 
-use egui::vec2;
+use egui::{pos2, vec2};
 use serde_json::json;
 
+use designcraft_compose::ComposedStory;
 use designcraft_doc::StoryId;
 
 use crate::DesignApp;
 use crate::theme::Tokens;
 
+/// Width of the depth ruler, in screen points.
+const RULER_WIDTH: f32 = 34.0;
+/// Least distance between two of the depth ruler's labels, in screen points.
+const RULER_LABEL_GAP: f32 = 10.0;
+/// Color of the overset line and label.
+const OVERSET_RED: egui::Color32 = egui::Color32::from_rgb(230, 40, 40);
+
 /// The story open in the Story Editor. Story ids are counted per document, so the editor is bound
 /// to the document the story belongs to.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -41,11 +49,13 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
     let t = Tokens::get(ctx);
     let cs = app.session.cache.get(&st.doc, sid, None);
     let overset = cs.overset_at;
+    let depths = app.ui.story_editor_depth_ruler.then(|| line_depths(&cs));
+    let unit = st.doc.settings.vertical_units;
     let mut open = true;
     let mut edit: Option<(usize, usize, String)> = None;
     let words = story.text.split_whitespace().count().to_string();
     egui::Window::new(crate::i18n::tr(&app.ui.language, "Story Editor — {count} words").replace("{count}", &words))
-        .id(egui::Id::new("story_editor"))
+        .id(egui::Id::unique("story_editor"))
         .open(&mut open)
         .default_size(vec2(560.0, 520.0))
         .show(ctx, |ui| {
@@ -54,14 +64,20 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                     // Style column: the labels are painted after the text, at the rows the text really wraps to.
                     let (column, _) = ui.allocate_exact_size(vec2(130.0, 0.0), egui::Sense::hover());
                     ui.separator();
+                    // Depth ruler: painted after the text too, beside the rows the lines start on.
+                    let ruler = depths.as_ref().map(|_| ui.allocate_exact_size(vec2(RULER_WIDTH, 0.0), egui::Sense::hover()).0);
                     let mut text = story.text.clone();
+                    // (a fixed id: the ruler's allocation above would otherwise move the editor's auto id,
+                    // and its focus and caret with it, whenever the ruler is shown or hidden)
                     let out = egui::TextEdit::multiline(&mut text)
+                        .id_salt("story_text")
                         .font(egui::FontId::proportional(app.ui.story_editor_size.clamp(8.0, 36.0)))
                         .desired_width(f32::INFINITY)
                         .desired_rows(20)
                         .frame(egui::Frame::NONE)
                         .show(ui);
                     let r = out.response;
+                    let changed = r.changed();
                     let starts = paragraph_start_offsets(out.galley.rows.iter().map(|row| (row.pos.y, row.ends_with_newline)));
                     for (i, y) in starts.into_iter().enumerate() {
                         let Some(para) = story.paras.get(i) else { break };
@@ -71,7 +87,34 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                             crate::rtl::label(ui, egui::RichText::new(name).size(11.0).color(t.text_dim));
                         });
                     }
-                    if r.changed() {
+                    let overset_y = overset.filter(|_| !changed).map(|o| {
+                        let ci = char_offsets(&story.text, std::iter::once(o));
+                        out.galley_pos.y + start_rows(&out.galley, &ci).first().map_or(0.0, |row| row.0)
+                    });
+                    if let (Some(ruler), Some(depths)) = (ruler, depths.as_ref().filter(|_| !changed)) {
+                        let bottom = overset_y.unwrap_or(out.galley_pos.y + out.galley.size().y);
+                        let bar = egui::Rect::from_min_max(pos2(ruler.min.x, out.galley_pos.y), pos2(ruler.min.x + RULER_WIDTH, bottom));
+                        ui.painter().rect_filled(bar, 0.0, t.ruler);
+                        let ticks = depth_ticks(depths, unit.ruler_ticks(1.0).0);
+                        let rows = start_rows(&out.galley, &char_offsets(&story.text, ticks.iter().map(|tick| tick.0)));
+                        let marks = ticks.iter().zip(rows).map(|(&(_, depth), row)| (out.galley_pos.y + row.1, depth));
+                        for (y, depth) in spaced_marks(marks, RULER_LABEL_GAP) {
+                            ui.painter().line_segment([pos2(bar.max.x - 8.0, y), pos2(bar.max.x, y)], egui::Stroke::new(1.0, t.ruler_tick));
+                            ui.painter().text(
+                                pos2(bar.min.x + 2.0, y - 1.0),
+                                egui::Align2::LEFT_BOTTOM,
+                                crate::canvas::fmt_tick(unit.from_pt(depth)),
+                                egui::FontId::proportional(9.0),
+                                t.ruler_text,
+                            );
+                        }
+                    }
+                    // The overset line: across the text, and the ruler when it shows, above the first character that doesn't fit.
+                    if let Some(y) = overset_y {
+                        let x0 = ruler.map_or(r.rect.min.x, |rr| rr.min.x);
+                        ui.painter().line_segment([pos2(x0, y), pos2(r.rect.max.x, y)], egui::Stroke::new(1.5, OVERSET_RED));
+                    }
+                    if changed {
                         // Minimal diff: common prefix and suffix.
                         let old = &story.text;
                         let pre = old.bytes().zip(text.bytes()).take_while(|(a, b)| a == b).count();
@@ -88,7 +131,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
                     ui.horizontal(|ui| {
                         ui.label(crate::rtl::widget(
                             ui,
-                            egui::RichText::new(crate::i18n::tr(&app.ui.language, "OVERSET")).color(egui::Color32::from_rgb(230, 40, 40)).strong(),
+                            egui::RichText::new(crate::i18n::tr(&app.ui.language, "OVERSET")).color(OVERSET_RED).strong(),
                         ));
                         crate::rtl::label(
                             ui,
@@ -125,6 +168,128 @@ fn paragraph_start_offsets(rows: impl Iterator<Item = (f32, bool)>) -> Vec<f32>
     starts
 }
 
+/// The depth ruler's values: for each composed line that fits, its first byte and how deep the
+/// story's text fills its frames at that line (points). Each line covers the band of its column
+/// from one leading above its bottom (its ascent and descent when larger) to its bottom; the depth
+/// is the height of the bands covered so far, added up over the story's columns and threaded
+/// frames. A line set below the line before it in the same column also covers the space between
+/// them (paragraph spacing, or the room a wrap object takes). Lines set side by side in one column
+/// (the sub-columns of a split paragraph, or text on both sides of a wrap object) cover one band,
+/// so they count once.
+fn line_depths(cs: &ComposedStory) -> Vec<(usize, f64)> {
+    let mut out = Vec::new();
+    let mut depth = 0.0;
+    for ft in &cs.frames {
+        let mut covered: std::collections::BTreeMap<u32, Vec<(f64, f64)>> = std::collections::BTreeMap::new();
+        let mut before: Option<(u32, f64)> = None;
+        for line in &ft.lines {
+            let bottom = line.baseline + line.descent;
+            let mut top = bottom - line.leading.max(line.ascent + line.descent);
+            if let Some((column, above)) = before
+                && column == line.column
+                && above < top
+            {
+                top = above;
+            }
+            before = Some((line.column, bottom));
+            if top.is_finite() && bottom > top {
+                depth += cover(covered.entry(line.column).or_default(), top, bottom);
+            }
+            out.push((line.range.start, depth));
+        }
+    }
+    out
+}
+
+/// Adds the band `top..bottom` to `bands` (sorted, apart from one another) and returns the height
+/// it covers that `bands` did not.
+fn cover(bands: &mut Vec<(f64, f64)>, top: f64, bottom: f64) -> f64 {
+    let overlap: f64 = bands.iter().map(|&(a, b)| (b.min(bottom) - a.max(top)).max(0.0)).sum();
+    let (mut a, mut b) = (top, bottom);
+    bands.retain(|&(s, e)| {
+        let touches = s <= b + 1e-6 && e >= a - 1e-6;
+        if touches {
+            (a, b) = (a.min(s), b.max(e));
+        }
+        !touches
+    });
+    let at = bands.partition_point(|&(s, _)| s < a);
+    bands.insert(at, (a, b));
+    (bottom - top - overlap).max(0.0)
+}
+
+/// The depth ruler's marks, one at the first line whose depth reaches each multiple of `step`
+/// (points): `(line's first byte, the multiple)`. A line that passes several multiples takes the
+/// deepest.
+fn depth_ticks(depths: &[(usize, f64)], step: f64) -> Vec<(usize, f64)> {
+    if !(step.is_finite() && step > 0.0) {
+        return Vec::new();
+    }
+    let mut out: Vec<(usize, f64)> = Vec::new();
+    let mut reached = 0.0;
+    for &(at, depth) in depths {
+        if !depth.is_finite() {
+            continue;
+        }
+        let n = (depth / step).floor();
+        if n > reached {
+            reached = n;
+            out.push((at, n * step));
+        }
+    }
+    out
+}
+
+/// The depth ruler's marks `(y, depth)` (y ascending) that are drawn: of the marks on one editor
+/// row only the deepest, and a mark on a later row only when it is at least `gap` below the one
+/// drawn before it.
+fn spaced_marks(marks: impl Iterator<Item = (f32, f64)>, gap: f32) -> Vec<(f32, f64)> {
+    let mut out: Vec<(f32, f64)> = Vec::new();
+    for mark in marks {
+        match out.last_mut() {
+            Some(last) if (mark.0 - last.0).abs() < 0.5 => *last = mark,
+            Some(last) if mark.0 - last.0 < gap => {}
+            _ => out.push(mark),
+        }
+    }
+    out
+}
+
+/// The editor rows `(top, bottom)` (galley coordinates) that the characters `cis` (ascending) start
+/// lines on, in one pass over the rows: at a soft wrap, the row a character starts rather than the
+/// end of the row before.
+fn start_rows(galley: &egui::Galley, cis: &[usize]) -> Vec<(f32, f32)> {
+    let mut rows = galley.rows.iter().peekable();
+    let mut start = 0;
+    let mut out = Vec::with_capacity(cis.len());
+    for &ci in cis {
+        while let Some(row) = rows.peek() {
+            let end = start + row.char_count_including_newline().0;
+            if ci < end || rows.len() == 1 {
+                break;
+            }
+            start = end;
+            rows.next();
+        }
+        out.push(rows.peek().map_or((0.0, 0.0), |row| (row.min_y(), row.max_y())));
+    }
+    out
+}
+
+/// Character indices of the byte offsets `bytes` (ascending) in `text`, for the editor's cursors.
+fn char_offsets(text: &str, bytes: impl Iterator<Item = usize>) -> Vec<usize> {
+    let mut chars = text.char_indices().peekable();
+    let mut count = 0;
+    let mut out = Vec::new();
+    for byte in bytes {
+        while chars.next_if(|&(i, _)| i < byte).is_some() {
+            count += 1;
+        }
+        out.push(count);
+    }
+    out
+}
+
 #[cfg(test)]
 mod tests {
     use egui_kittest::kittest::Queryable;
@@ -144,6 +309,234 @@ mod tests {
         assert_eq!(super::paragraph_start_offsets(rows.into_iter()), vec![0.0, 60.0, 80.0]);
     }
 
+    /// The depth runs on through the columns: it never goes back, and the first line of the second
+    /// column is deeper than the last line of the first.
+    #[test]
+    fn depths_run_through_columns() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+        app.run("file.new", json!({})).unwrap();
+        let text = "Depth ruler line of words. ".repeat(80);
+        let r = app.run("frame.create", json!({"rect": [72, 72, 372, 272], "content": "text", "text": text, "caret": false})).unwrap();
+        let (id, sid) = (r["id"].as_u64().unwrap(), designcraft_doc::StoryId(r["story"].as_u64().unwrap()));
+        app.run("object.textFrameOptions", json!({"ids": [id], "columns": 2, "gutter": 12})).unwrap();
+        let st = app.session.active().unwrap();
+        let cs = app.session.cache.get(&st.doc, sid, None);
+        assert!(cs.overset_at.is_some(), "the fixture overflows its frame");
+        let depths = super::line_depths(&cs);
+        let lines: Vec<_> = cs.frames[0].lines.iter().collect();
+        let second = lines.iter().position(|l| l.column == 1).expect("text reaches the second column");
+        assert!(second > 0 && depths.len() == lines.len(), "{} lines, {} depths", lines.len(), depths.len());
+        assert!(depths.windows(2).all(|w| w[1].1 >= w[0].1), "depth never goes back: {depths:?}");
+        assert!(depths[second].1 > depths[second - 1].1, "the second column adds to the first: {depths:?}");
+    }
+
+    /// A split paragraph's sub-columns sit side by side: a line beside one already counted adds
+    /// nothing, whether the sub-columns hold several lines or one each, and the text after the
+    /// split paragraphs goes on from the deeper sub-column.
+    #[test]
+    fn split_paragraph_sub_columns_count_once() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+        app.run("file.new", json!({})).unwrap();
+        let text =
+            format!("Opening line.\n{}\nMiddle line.\nTwo short lines set side by side.\nClosing line.", "Split column words go here. ".repeat(12));
+        let r = app.run("frame.create", json!({"rect": [72, 72, 372, 672], "content": "text", "text": text, "caret": false})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let mut doc = (*app.session.active().unwrap().doc).clone();
+        for i in [1, 3] {
+            doc.story_mut(sid).unwrap().paras[i].para.span_columns = Some(designcraft_doc::SpanColumns::Split(2));
+        }
+        let cs = designcraft_compose::compose_story(&doc, sid, &designcraft_compose::ComposeOptions::default());
+        let lines = &cs.frames[0].lines;
+        let depths = super::line_depths(&cs);
+        assert!(lines.windows(2).any(|w| w[0].para == 1 && w[1].para == 1 && w[1].baseline < w[0].baseline), "para 1 restarts higher");
+        let side =
+            (1..lines.len()).find(|&i| lines[i].para == 3 && lines[i - 1].para == 3 && (lines[i].baseline - lines[i - 1].baseline).abs() < 1e-6);
+        let para3: Vec<_> = lines.iter().filter(|l| l.para == 3).map(|l| (l.baseline, l.x0)).collect();
+        let side = side.unwrap_or_else(|| panic!("para 3 sets one line in each sub-column: {para3:?}"));
+        assert_eq!(depths[side].1, depths[side - 1].1, "the second sub-column's line adds nothing: {depths:?}");
+        for (i, l) in lines.iter().enumerate().filter(|(_, l)| l.para == 1).skip(1) {
+            let beside = lines[..i].iter().any(|o| o.para == 1 && o.baseline >= l.baseline - 1e-6);
+            if beside {
+                assert_eq!(depths[i].1, depths[i - 1].1, "line {i} sits beside one counted: {depths:?}");
+            }
+        }
+        let last = lines.len() - 1;
+        let col_top = cs.frames[0].columns[0].y0;
+        let closing = lines[last].baseline + lines[last].descent - col_top;
+        assert!(depths[last].1 <= closing + 1e-6, "no deeper than the frame holds it: {} > {closing}", depths[last].1);
+        assert!(depths.windows(2).all(|w| w[1].1 >= w[0].1), "{depths:?}");
+    }
+
+    /// Text wrapping on both sides of an object sets one line as two segments on one baseline: the
+    /// second segment adds nothing to the depth.
+    #[test]
+    fn segments_beside_a_wrap_object_share_their_line_depth() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+        app.run("file.new", json!({})).unwrap();
+        let text = "Words that wrap on both sides of the box in the middle. ".repeat(20);
+        let r = app.run("frame.create", json!({"rect": [72, 72, 432, 472], "content": "text", "text": text, "caret": false})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let b = app.run("frame.create", json!({"rect": [232, 150, 272, 300], "content": "graphic"})).unwrap();
+        app.run("object.textWrap", json!({"ids": [b["id"].as_u64().unwrap()], "mode": "boundingBox", "side": "bothSides"})).unwrap();
+        let st = app.session.active().unwrap();
+        let cs = app.session.cache.get(&st.doc, sid, None);
+        let lines = &cs.frames[0].lines;
+        let depths = super::line_depths(&cs);
+        let pairs: Vec<usize> = (1..lines.len()).filter(|&i| (lines[i].baseline - lines[i - 1].baseline).abs() < 1e-6).collect();
+        assert!(!pairs.is_empty(), "the fixture sets lines in two segments");
+        for i in pairs {
+            assert_eq!(depths[i].1, depths[i - 1].1, "segment {i} adds no depth: {depths:?}");
+        }
+        assert!(depths.windows(2).all(|w| w[1].1 >= w[0].1), "{depths:?}");
+    }
+
+    /// Space after a paragraph moves the next one down the frame, and the depth goes down with it.
+    #[test]
+    fn paragraph_spacing_adds_to_the_depth() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+        app.run("file.new", json!({})).unwrap();
+        let r = app.run("frame.create", json!({"rect": [72, 72, 372, 672], "content": "text", "text": "First.\nSecond.", "caret": false})).unwrap();
+        let sid = designcraft_doc::StoryId(r["story"].as_u64().unwrap());
+        let mut doc = (*app.session.active().unwrap().doc).clone();
+        doc.story_mut(sid).unwrap().paras[0].para.space_after = Some(72.0);
+        let cs = designcraft_compose::compose_story(&doc, sid, &designcraft_compose::ComposeOptions::default());
+        let lines = &cs.frames[0].lines;
+        let depths = super::line_depths(&cs);
+        assert_eq!(lines.len(), 2);
+        let moved = (lines[1].baseline + lines[1].descent) - (lines[0].baseline + lines[0].descent);
+        assert!(moved > 72.0, "the space after moves the second paragraph down: {moved}");
+        assert!((depths[1].1 - depths[0].1 - moved).abs() < 1e-6, "the depth goes down as far: {depths:?}, {moved}");
+    }
+
+    /// A mark goes at the first line that reaches a multiple; a line that passes several takes only
+    /// the deepest.
+    #[test]
+    fn ticks_go_at_the_first_line_that_reaches_a_multiple() {
+        let depths = [(0, 10.0), (5, 30.0), (9, 70.0), (12, 100.0), (20, 200.0), (25, f64::NAN)];
+        assert_eq!(super::depth_ticks(&depths, 60.0), vec![(9, 60.0), (20, 180.0)]);
+        assert!(super::depth_ticks(&depths, 0.0).is_empty());
+        assert_eq!(super::char_offsets("aé b", [0, 1, 3, 5].into_iter()), vec![0, 1, 2, 4]);
+    }
+
+    /// Several lines can start on one editor row (narrow columns, large text): only the deepest of
+    /// their marks is drawn there, and marks on rows closer than a label skip, so labels never
+    /// overlap and the ones kept stay spread down the ruler.
+    #[test]
+    fn marks_on_one_row_show_only_the_deepest_and_keep_their_spacing() {
+        let marks = [(20.0, 60.0), (20.0, 120.0), (25.0, 180.0), (40.0, 240.0), (60.0, 300.0)];
+        assert_eq!(super::spaced_marks(marks.into_iter(), 10.0), vec![(20.0, 120.0), (40.0, 240.0), (60.0, 300.0)]);
+        let close = [(0.0, 60.0), (8.0, 120.0), (16.0, 180.0), (24.0, 240.0)];
+        assert_eq!(super::spaced_marks(close.into_iter(), 10.0), vec![(0.0, 60.0), (16.0, 180.0)]);
+    }
+
+    /// A line that starts at a soft wrap in the editor is on the wrapped row, not at the end of the
+    /// row before it, so the overset line and the marks sit beside the text they belong to.
+    #[test]
+    fn a_line_starting_at_a_soft_wrap_is_on_the_wrapped_row() {
+        let ctx = egui::Context::default();
+        let mut galley = None;
+        let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
+            galley = Some(ui.fonts_mut(|f| f.layout("aaaa bbbb".into(), egui::FontId::proportional(14.0), egui::Color32::WHITE, 40.0)));
+        });
+        output.textures_delta.clear();
+        let galley = galley.expect("laid out");
+        assert!(galley.rows.len() >= 2, "the fixture wraps: {} rows", galley.rows.len());
+        let rows = super::start_rows(&galley, &[0, 4, 5, 9, 50]);
+        let (first, second) = ((galley.rows[0].min_y(), galley.rows[0].max_y()), (galley.rows[1].min_y(), galley.rows[1].max_y()));
+        assert_eq!(rows, vec![first, first, second, second, (galley.rows.last().unwrap().min_y(), galley.rows.last().unwrap().max_y())]);
+    }
+
+    /// View › Story Editor › Show/Hide Depth Ruler: the ruler sits between the style column and the
+    /// text, which moves right by the ruler's width; the setting is remembered.
+    #[test]
+    fn depth_ruler_shows_and_hides_from_the_view_menu() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+        app.run("file.new", json!({})).unwrap();
+        let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Ruler story", "caret": false})).unwrap();
+        app.run("app.storyEditor", json!({"story": r["story"].as_u64().unwrap()})).unwrap();
+        assert!(app.ui.story_editor_depth_ruler, "shown by default");
+        let mut h = crate::test_window::open(app, egui::vec2(1440.0, 900.0));
+        h.run_steps(2);
+        let text_x = |h: &egui_kittest::Harness<'_, crate::test_window::Window>| {
+            h.get_by(|n| n.role() == egui::accesskit::Role::MultilineTextInput && n.value().as_deref() == Some("Ruler story")).rect().min.x
+        };
+        let with = text_x(&h);
+        h.state_mut().app.run("view.storyEditorDepthRuler", json!({})).unwrap();
+        h.run_steps(2);
+        let without = text_x(&h);
+        assert!((with - without - super::RULER_WIDTH).abs() < 10.0, "the text moves by the ruler: {with} vs {without}");
+        let app = &h.state().app;
+        assert_eq!(crate::menus::checked(app, "view.storyEditorDepthRuler", &json!({})), Some(false));
+        let saved = serde_json::to_vec(&app.ui).unwrap();
+        assert!(!crate::UiState::from_preferences_json(&saved).unwrap().story_editor_depth_ruler);
+    }
+
+    #[test]
+    fn depth_marks_wait_for_composition_after_editing() {
+        fn marks(shape: &egui::epaint::Shape, tick: egui::Color32) -> usize {
+            match shape {
+                egui::epaint::Shape::Vec(shapes) => shapes.iter().map(|s| marks(s, tick)).sum(),
+                egui::epaint::Shape::LineSegment { points, stroke }
+                    if stroke.color == super::OVERSET_RED || (stroke.color == tick && (points[1].x - points[0].x - 8.0).abs() < 0.01) =>
+                {
+                    1
+                }
+                _ => 0,
+            }
+        }
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+        app.run("file.new", json!({})).unwrap();
+        let text = "First line\nSecond line\nThird line\n".repeat(4);
+        let r = app.run("frame.create", json!({"rect": [72, 72, 372, 172], "content": "text", "text": text, "caret": false})).unwrap();
+        app.run("app.storyEditor", json!({"story": r["story"].as_u64().unwrap()})).unwrap();
+        let mut h = egui_kittest::Harness::builder()
+            .with_size(egui::vec2(900.0, 700.0))
+            .with_accessibility_check(false)
+            .build_ui_state(|ui, app| super::show(app, ui.ctx()), app);
+        h.run_steps(3);
+        let tick = crate::theme::Tokens::get(&h.ctx).ruler_tick;
+        let count = |h: &egui_kittest::Harness<'_, DesignApp>| h.output().shapes.iter().map(|s| marks(&s.shape, tick)).sum::<usize>();
+        assert!(count(&h) >= 2, "the fixture paints ruler ticks and an overset line");
+        h.get_by(|n| n.role() == egui::accesskit::Role::MultilineTextInput).focus();
+        h.run_steps(2);
+        h.key_press_modifiers(egui::Modifiers::CTRL, egui::Key::Home);
+        h.run_steps(2);
+        h.event(egui::Event::Text("Inserted line\n".into()));
+        h.step();
+        assert_eq!(story_text(h.state(), 0), format!("Inserted line\n{text}"));
+        assert_eq!(count(&h), 0, "the edit frame must not map old composition offsets to new text");
+        h.step();
+        assert!(count(&h) >= 2, "the next frame paints the updated composition");
+    }
+
+    /// The Show/Hide Depth Ruler menu label is translated in every interface language.
+    #[test]
+    fn depth_ruler_menu_label_is_translated_in_every_language() {
+        for (lang, _) in crate::i18n::LANGUAGES.iter().filter(|(code, _)| !code.is_empty()) {
+            assert_ne!(crate::i18n::tr(lang, "Show/Hide Depth Ruler"), "Show/Hide Depth Ruler", "{lang}");
+        }
+    }
+
+    /// Showing or hiding the depth ruler keeps the text's focus and caret: typing after the toggle
+    /// still reaches the story.
+    #[test]
+    fn depth_ruler_toggle_keeps_the_text_focused() {
+        let mut app = DesignApp::new(designcraft_engine::Session::new(), Default::default());
+        app.run("file.new", json!({})).unwrap();
+        let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Ruler story", "caret": false})).unwrap();
+        app.run("app.storyEditor", json!({"story": r["story"].as_u64().unwrap()})).unwrap();
+        let mut h = crate::test_window::open(app, egui::vec2(1440.0, 900.0));
+        h.get_by(|n| n.role() == egui::accesskit::Role::MultilineTextInput && n.value().as_deref() == Some("Ruler story")).focus();
+        h.run_steps(2);
+        for (toggle, typed) in [("!", "Ruler story!"), ("?", "Ruler story!?")] {
+            h.state_mut().app.run("view.storyEditorDepthRuler", json!({})).unwrap();
+            h.run_steps(2);
+            h.event(egui::Event::Text(toggle.into()));
+            h.run_steps(2);
+            assert_eq!(story_text(&h.state().app, 0), typed);
+        }
+    }
+
     /// Story ids are counted per document: typing in the editor after switching documents edited
     /// the other document's story with the same id.
     #[test]
diff --git a/crates/ui-egui/src/taskbar.rs b/crates/ui-egui/src/taskbar.rs
index 5b7d34b92..4411d93dd 100644
--- a/crates/ui-egui/src/taskbar.rs
+++ b/crates/ui-egui/src/taskbar.rs
@@ -16,7 +16,7 @@ const GRIP: &str = "task_bar_grip";
 /// Show the bar under `sel` (screen rect of the selection), or where it is pinned, kept inside
 /// `canvas`.
 pub fn show(app: &mut DesignApp, ctx: &egui::Context, sel: Rect, canvas: Rect) {
-    let grip_id = egui::Id::new((GRIP, ctx.viewport_id(), app.pane));
+    let grip_id = egui::Id::unique((GRIP, ctx.viewport_id(), app.pane));
     // (Two separate context calls: `is_pointer_over_egui` inside an `input` closure deadlocks.)
     let dragging = ctx.dragged_id() == Some(grip_id);
     if !app.ui.task_bar || (ctx.input(|i| i.pointer.any_down()) && !ctx.is_pointer_over_egui() && !dragging) {
@@ -29,7 +29,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context, sel: Rect, canvas: Rect) {
     }
     let t = Tokens::get(ctx);
     // The same selection can be shown in two canvases; each bar needs its own area and widgets.
-    let id = egui::Id::new(("task_bar", ctx.viewport_id(), app.pane));
+    let id = egui::Id::unique(("task_bar", ctx.viewport_id(), app.pane));
     // Width from the previous frame (content-sized).
     let w = ctx.memory(|m| m.area_rect(id).map(|r| r.width())).unwrap_or(420.0);
     let at = match app.ui.task_bar_pin {
@@ -100,8 +100,8 @@ fn split_button(ui: &mut Ui, icon: &str, label: &str) -> (egui::Response, egui::
     let (r, _) = ui.allocate_exact_size(vec2(w, FIELD_H), Sense::hover());
     let main = Rect::from_min_max(r.min, pos2(r.max.x - widgets::SEG_W, r.max.y));
     let seg = Rect::from_min_max(pos2(main.max.x, r.min.y), r.max);
-    let mr = ui.interact(main, ui.id().with(("split", label)), Sense::click());
-    let sr = ui.interact(seg, ui.id().with(("splitseg", label)), Sense::click());
+    let mr = ui.interact(main, ui.scope_id().with(("split", label)), Sense::click());
+    let sr = ui.interact(seg, ui.scope_id().with(("splitseg", label)), Sense::click());
     for (rr, resp) in [(main, &mr), (seg, &sr)] {
         if resp.hovered() {
             ui.painter().rect_filled(rr, 0.0, t.hover);
@@ -145,7 +145,7 @@ fn text_controls(app: &mut DesignApp, ui: &mut Ui, in_text: bool) {
     let menu = panels::font_menu(app);
     let shown = if fam.is_empty() { "—".to_string() } else { panels::font_label(app, &menu, &fam) };
     let field = widgets::dropdown(ui, &shown, 150.0);
-    if let Some(f) = panels::font_popup(app, &field, &menu, &fam) {
+    if let Some(f) = panels::font_popup(app, ui, &field, &menu, &fam) {
         panels::apply_font(app, &f);
     }
     let styles = fonts.styles(&fam);
@@ -165,7 +165,7 @@ fn text_controls(app: &mut DesignApp, ui: &mut Ui, in_text: bool) {
         let sw = c["fill"].as_str().unwrap_or("[Black]").to_string();
         let (col, g) = widgets::swatch_colors(&doc, &sw, 1.0);
         let resp = widgets::swatch_chip(ui, 17.0, col, g).on_hover_text(format!("{}: {sw}", crate::i18n::tr(&app.ui.language, "Fill")));
-        resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Task Bar fill"));
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, "Task Bar fill"));
         let mut picked = None;
         egui::Popup::menu(&resp).show(|ui| {
             picked = panels::swatch_list(ui, &doc, &sw);
@@ -227,9 +227,7 @@ fn object_controls(app: &mut DesignApp, ui: &mut Ui) {
             widgets::paint_stroke_chip(ui.painter(), r, col, egui::Color32::from_gray(20));
         }
         let resp = resp.on_hover_text(format!("{}: {sw}", if k == 0 { "Fill" } else { "Stroke" }));
-        resp.widget_info(|| {
-            egui::WidgetInfo::labeled(egui::WidgetType::Button, true, format!("Task Bar {}", if k == 0 { "fill" } else { "stroke" }))
-        });
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, format!("Task Bar {}", if k == 0 { "fill" } else { "stroke" })));
         let mut picked = None;
         egui::Popup::menu(&resp).show(|ui| {
             picked = panels::swatch_list(ui, &doc, &sw);
@@ -311,7 +309,7 @@ mod tests {
     }
 
     fn bar(h: &Harness<'static, Window>) -> egui::Rect {
-        h.ctx.memory(|m| m.area_rect(egui::Id::new(("task_bar", h.ctx.viewport_id(), h.state().app.pane)))).unwrap()
+        h.ctx.memory(|m| m.area_rect(egui::Id::unique(("task_bar", h.ctx.viewport_id(), h.state().app.pane)))).unwrap()
     }
 
     fn grip(h: &Harness<'static, Window>) -> egui::Pos2 {
@@ -371,7 +369,7 @@ mod tests {
         h.state_mut().app.run("window.split", json!({"on":true})).unwrap();
         h.run_steps(6);
         let area =
-            |h: &Harness<'static, Window>, pane| h.ctx.memory(|m| m.area_rect(egui::Id::new(("task_bar", h.ctx.viewport_id(), pane)))).unwrap();
+            |h: &Harness<'static, Window>, pane| h.ctx.memory(|m| m.area_rect(egui::Id::unique(("task_bar", h.ctx.viewport_id(), pane)))).unwrap();
         for pane in [0_u8, 1] {
             h.state_mut().app.run("window.taskBarPin", json!({"at":[100,120]})).unwrap();
             h.run_steps(4);
@@ -397,7 +395,7 @@ mod tests {
         h.state_mut().app.switch_pane(0);
         h.run_steps(4);
         let expected = h.state().app.ui.task_bar_at.unwrap();
-        let left = h.ctx.memory(|m| m.area_rect(egui::Id::new(("task_bar", h.ctx.viewport_id(), 0_u8)))).unwrap();
+        let left = h.ctx.memory(|m| m.area_rect(egui::Id::unique(("task_bar", h.ctx.viewport_id(), 0_u8)))).unwrap();
         click_at(&mut h, pos2(left.max.x - 19.0, left.center().y));
         let pin = h.get_by_label_contains("Pin Bar Position").rect();
         let at = pos2(pin.max.x - 2.0, pin.center().y);
diff --git a/crates/ui-egui/src/tests.rs b/crates/ui-egui/src/tests.rs
new file mode 100644
index 000000000..36bac93a9
--- /dev/null
+++ b/crates/ui-egui/src/tests.rs
@@ -0,0 +1,2085 @@
+use super::*;
+
+/// The Control panel's two-row groups were centred as if they were one row tall, so the second
+/// row hung below the panel and was cut off.
+#[test]
+fn control_bar_shows_its_second_row() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
+    app.run("file.newSample", json!({})).unwrap();
+    app.ui.control_bar = true;
+    let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1440.0, 900.0)).build_ui_state(
+        |ui, app: &mut DesignApp| {
+            let ctx = ui.ctx().clone();
+            app.logic(&ctx);
+            app.ui(ui);
+        },
+        app,
+    );
+    h.run_steps(4);
+    let bar = egui::containers::panel::PanelState::load(&h.ctx, h.ui_id().with("control_bar")).unwrap().outer_rect;
+    assert!(bar.height() > 40.0, "{bar:?}");
+    // The X/Y/W/H group: its second row holds Y: and H:.
+    let group = h.ctx.read_response(egui::Id::unique(("object_control", "dimensions"))).unwrap().rect;
+    assert!(bar.contains(group.left_top()), "the X/Y/W/H group {group:?} is in the Control panel {bar:?}");
+    assert!(group.bottom() <= bar.bottom(), "X/Y/W/H group {group:?} hangs below the Control panel {bar:?}");
+}
+
+#[test]
+fn key_names_sent_as_text_are_dropped() {
+    let text = |t: &str| egui::Event::Text(t.to_string());
+    let events =
+        || vec![text("AltGraph"), text("é"), text("Dead"), text("A"), text("Unidentified"), text("ß"), text("AudioVolumeUp"), text("ab"), text("Æ")];
+    let mut raw = egui::RawInput { events: events(), ..Default::default() };
+    drop_key_name_text(&mut raw, false);
+    assert_eq!(raw.events, vec![text("é"), text("A"), text("ß"), text("ab"), text("Æ")]);
+    assert!(is_key_name("F13") && is_key_name("Escape") && is_key_name("ZoomToggle") && !is_key_name("F") && !is_key_name("Fx"));
+    // Capitalised words (mobile autocompletion) are text.
+    let words = vec![text("Hello"), text("Tokyo"), text("OK"), text("Hi there")];
+    let mut raw = egui::RawInput { events: words.clone(), ..Default::default() };
+    drop_key_name_text(&mut raw, false);
+    assert_eq!(raw.events, words);
+    // A focused text field or a canvas text caret gets its text from the browser's input
+    // events, which hold whole words, key-name-like ones too ("Help").
+    let mut raw = egui::RawInput { events: events(), ..Default::default() };
+    drop_key_name_text(&mut raw, true);
+    assert_eq!(raw.events, events());
+}
+
+/// InDesign shows 100% K as pure black on screen unless Appearance of Black says otherwise
+/// (Display All Blacks as Rich Black is its default); settings saved without the field get it too.
+#[test]
+fn black_shows_as_rich_black_by_default() {
+    assert!(UiState::default().rich_black);
+    let saved: UiState = serde_json::from_str("{}").unwrap();
+    assert!(saved.rich_black);
+    let accurate: UiState = serde_json::from_str(r#"{"richBlack": false}"#).unwrap();
+    assert!(!accurate.rich_black, "a saved choice is kept");
+}
+
+/// Tool readouts measured in picas whatever the document's units (the UI's unit is never set):
+/// they follow the active document's ruler units.
+#[test]
+fn tool_readouts_measure_in_the_documents_units() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
+    assert_eq!(app.view_info().unit, Unit::Picas, "no document: the UI's default");
+    app.run("file.new", json!({})).unwrap();
+    app.run("document.preferences", json!({"horizontalUnits": "inches", "verticalUnits": "millimeters"})).unwrap();
+    assert_eq!(app.view_info().unit, Unit::Inches);
+}
+
+/// Save and Export PDF dialogs started in the home folder (#1653): they start beside a saved
+/// document, and for one never saved in the folder of the last save or export.
+#[test]
+fn save_dialogs_start_beside_the_document_or_in_the_last_folder() {
+    use std::{cell::RefCell, rc::Rc};
+    let home = tempfile::tempdir().unwrap();
+    let elsewhere = tempfile::tempdir().unwrap();
+    let asked: Rc<RefCell<Vec<String>>> = Rc::default();
+    let answer: Rc<RefCell<Option<String>>> = Rc::default();
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
+    let (seen, reply) = (asked.clone(), answer.clone());
+    app.answer_dialogs(move |request| {
+        let craft_dialogs::Request::File(dialog) = request else { return craft_dialogs::Answer::Cancelled };
+        let name = dialog.file_name.clone().unwrap_or_default();
+        seen.borrow_mut().push(dialog.directory.as_ref().map_or_else(|| name.clone(), |folder| folder.join(&name).to_string_lossy().to_string()));
+        reply.borrow().clone().map_or(craft_dialogs::Answer::Cancelled, |path| craft_dialogs::Answer::Paths(vec![path.into()]))
+    });
+    app.services.write = Some(Box::new(|_: &str, _: &[u8]| Ok(())));
+    let last = |asked: &Rc<RefCell<Vec<String>>>| asked.borrow().last().cloned().unwrap_or_default();
+    let export_pdf = |app: &mut DesignApp| {
+        app.ui.dialog = Some(dialogs::Dialog::new("pdfExport", json!({})));
+        app.ui.dialog.as_mut().unwrap().fields.insert("title".into(), json!("Report"));
+        dialogs::confirm(app).unwrap();
+        app.settle_dialogs();
+    };
+    let save_dialog = |app: &mut DesignApp| {
+        app.run("app.saveDialog", json!({})).unwrap();
+        app.settle_dialogs();
+    };
+
+    app.run("file.new", json!({})).unwrap();
+    let untitled = format!("{}.designcraft", app.session.active().unwrap().doc.title);
+    save_dialog(&mut app);
+    assert_eq!(last(&asked), untitled, "never saved, nothing remembered: the system's own folder");
+
+    let saved = home.path().join("Brochure.designcraft");
+    *answer.borrow_mut() = Some(saved.to_string_lossy().to_string());
+    save_dialog(&mut app);
+    assert_eq!(app.session.active().unwrap().path.as_deref(), Some(&*saved.to_string_lossy()));
+    // An export into another folder becomes the last folder used.
+    *answer.borrow_mut() = Some(elsewhere.path().join("Proof.pdf").to_string_lossy().to_string());
+    export_pdf(&mut app);
+    *answer.borrow_mut() = None;
+    export_pdf(&mut app);
+    assert_eq!(last(&asked), home.path().join("Report.pdf").to_string_lossy(), "a saved document exports beside itself");
+
+    app.run("file.new", json!({})).unwrap();
+    let untitled = format!("{}.designcraft", app.session.active().unwrap().doc.title);
+    save_dialog(&mut app);
+    assert_eq!(last(&asked), elsewhere.path().join(untitled).to_string_lossy(), "a new document starts in the last folder used");
+}
+
+/// No name (Save with no document) suggested the remembered folder itself as the file, and a
+/// title with a slash moved the suggestion out of the document's folder.
+#[test]
+fn save_dialog_suggestions_keep_the_folder_and_only_a_file_name() {
+    let folder = tempfile::tempdir().unwrap();
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
+    app.ui.last_save_folder = Some(folder.path().join("Docs").to_string_lossy().to_string());
+    assert_eq!(app.suggested_save_path(""), "");
+    assert_eq!(app.suggested_save_path("Q1/Q2.pdf"), folder.path().join("Docs").join("Q2.pdf").to_string_lossy());
+}
+
+/// An app with one document that has an unsaved edit.
+fn app_with_unsaved_document() -> DesignApp {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
+    app.run("file.new", json!({})).unwrap();
+    assert!(!app.session.documents()[0].is_dirty(), "a new document has nothing to save");
+    app.run("frame.create", json!({"rect": [36, 36, 136, 136]})).unwrap();
+    assert!(app.session.documents()[0].is_dirty());
+    app
+}
+
+/// File ▸ Close (and its shortcut) closed a document with unsaved changes without asking, and
+/// closing discards the document's recovery data too.
+#[test]
+fn closing_an_unsaved_document_asks_first() {
+    let mut app = app_with_unsaved_document();
+    menus::activate(&mut app, "file.close", &Value::Null);
+    assert_eq!(app.session.documents().len(), 1, "the document stays open until the user answers");
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("closeDocument"));
+    // Cancel: nothing happens.
+    app.ui.dialog = None;
+    assert!(app.session.documents()[0].is_dirty());
+    // The tab's × asks too.
+    menus::close_document(&mut app, Some(0));
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("closeDocument"));
+    assert_eq!(app.session.documents().len(), 1);
+}
+
+#[test]
+fn closing_without_saving_discards_the_document() {
+    let mut app = app_with_unsaved_document();
+    menus::close_document(&mut app, None);
+    app.ui.dialog.as_mut().unwrap().fields.insert("discard".into(), json!(true));
+    dialogs::confirm(&mut app).unwrap();
+    assert!(app.session.documents().is_empty());
+    assert!(app.ui.dialog.is_none());
+}
+
+#[test]
+fn closing_with_save_writes_the_file_then_closes() {
+    let mut app = app_with_unsaved_document();
+    let path = std::env::temp_dir().join(format!("designcraft-close-test-{}.designcraft", std::process::id()));
+    app.run("file.saveAs", json!({"path": path})).unwrap();
+    let saved = std::fs::metadata(&path).unwrap().len();
+    app.run("frame.create", json!({"rect": [200, 200, 300, 300]})).unwrap();
+    menus::close_document(&mut app, None);
+    dialogs::confirm(&mut app).unwrap();
+    assert!(app.session.documents().is_empty());
+    let written = std::fs::metadata(&path).unwrap().len();
+    std::fs::remove_file(&path).unwrap();
+    assert!(written > saved, "the second frame was saved ({saved} → {written} bytes)");
+}
+
+/// Save on a document that has no file opens the file picker; cancelling it must not close the
+/// document. (No picker service here: the same as cancelling.)
+#[test]
+fn a_cancelled_save_keeps_the_document_open() {
+    let mut app = app_with_unsaved_document();
+    menus::close_document(&mut app, None);
+    dialogs::confirm(&mut app).unwrap();
+    assert_eq!(app.session.documents().len(), 1);
+    assert!(app.session.documents()[0].is_dirty());
+}
+
+#[test]
+fn closing_a_saved_document_does_not_ask() {
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
+    app.run("file.new", json!({})).unwrap();
+    menus::activate(&mut app, "file.close", &Value::Null);
+    assert!(app.session.documents().is_empty());
+    assert!(app.ui.dialog.is_none());
+}
+
+/// One frame of the quit handling, with the window asked to close when `close`; returns the
+/// commands sent to the window.
+fn quit_frame(app: &mut DesignApp, ctx: &egui::Context, close: bool) -> Vec<egui::ViewportCommand> {
+    let mut raw = egui::RawInput::default();
+    if close {
+        raw.viewports.entry(egui::ViewportId::ROOT).or_default().events.push(egui::ViewportEvent::Close);
+    }
+    let mut out = ctx.run_ui(raw, |ui| app.handle_quit(ui.ctx()));
+    out.textures_delta.clear();
+    out.viewport_output.get(&egui::ViewportId::ROOT).map(|v| v.commands.clone()).unwrap_or_default()
+}
+
+fn dialog_uid(app: &DesignApp) -> Option<u64> {
+    app.ui.dialog.as_ref().filter(|d| d.id == "closeDocument").and_then(|d| d.fields.get("uid")?.as_u64())
+}
+
+/// Quitting closed the window at once, losing unsaved changes (#544).
+#[test]
+fn quitting_with_unsaved_changes_asks_and_cancel_keeps_everything() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    let cmds = quit_frame(&mut app, &ctx, true);
+    assert!(cmds.contains(&egui::ViewportCommand::CancelClose), "{cmds:?}");
+    assert_eq!(dialog_uid(&app), Some(app.session.documents()[0].uid));
+    // Cancel: the window and the document stay as they were.
+    app.ui.dialog = None;
+    for _ in 0..2 {
+        assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    }
+    assert_eq!(app.session.documents().len(), 1);
+    assert!(app.session.documents()[0].is_dirty());
+    // A Save whose file picker is cancelled stops quitting too.
+    quit_frame(&mut app, &ctx, true);
+    dialogs::confirm(&mut app).unwrap();
+    assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert!(app.session.documents()[0].is_dirty());
+}
+
+#[test]
+fn quitting_asks_about_each_unsaved_document_then_closes() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [36, 36, 136, 136]})).unwrap();
+    app.run("file.new", json!({})).unwrap();
+    let uids: Vec<u64> = app.session.documents().iter().map(|d| d.uid).collect();
+    assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
+    for (n, uid) in uids.iter().take(2).enumerate() {
+        assert_eq!(dialog_uid(&app), Some(*uid), "question {n}");
+        assert_eq!(app.session.active().map(|d| d.uid), Some(*uid), "the document asked about is shown");
+        app.ui.dialog.as_mut().unwrap().fields.insert("discard".into(), json!(true));
+        dialogs::confirm(&mut app).unwrap();
+        let cmds = quit_frame(&mut app, &ctx, false);
+        assert_eq!(cmds.contains(&egui::ViewportCommand::Close), n == 1, "{cmds:?}");
+    }
+    // All documents stay open until the backend's final close commits the decision.
+    assert_eq!(app.session.documents().len(), 3);
+    assert!(quit_frame(&mut app, &ctx, true).is_empty());
+    assert!(app.session.documents().is_empty());
+}
+
+/// A later Cancel must not destroy documents already approved for discard.
+#[test]
+fn quitting_later_cancel_retains_every_document_and_active_tab() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [20, 20, 120, 120]})).unwrap();
+    let uids: Vec<u64> = app.session.documents().iter().map(|d| d.uid).collect();
+    let active = app.session.active().unwrap().uid;
+    let revisions: Vec<u64> = app.session.documents().iter().map(|d| d.revision).collect();
+    let docs: Vec<_> = app.session.documents().iter().map(|d| d.doc.clone()).collect();
+    quit_frame(&mut app, &ctx, true);
+    app.ui.dialog.as_mut().unwrap().fields.insert("discard".into(), json!(true));
+    dialogs::confirm(&mut app).unwrap();
+    quit_frame(&mut app, &ctx, false);
+    assert_eq!(dialog_uid(&app), Some(uids[1]));
+    app.ui.dialog = None;
+    assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert_eq!(app.session.documents().iter().map(|d| d.uid).collect::<Vec<_>>(), uids);
+    assert_eq!(app.session.active().unwrap().uid, active);
+    assert_eq!(app.session.documents().iter().map(|d| d.revision).collect::<Vec<_>>(), revisions);
+    for (d, original) in app.session.documents().iter().zip(docs) {
+        assert!(std::sync::Arc::ptr_eq(&d.doc, &original));
+        assert!(d.is_dirty());
+        assert!(!d.history.undo.is_empty());
+    }
+}
+
+fn second_unsaved_document(app: &mut DesignApp) {
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect": [20, 20, 120, 120]})).unwrap();
+}
+
+fn discard_quit_dialog(app: &mut DesignApp) {
+    app.ui.dialog.as_mut().unwrap().fields.insert("discard".into(), json!(true));
+    dialogs::confirm(app).unwrap();
+}
+
+#[test]
+fn native_quit_prompts_restore_window_visibility_without_focusing_completed_quits() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    let commands = quit_frame(&mut app, &ctx, true);
+    assert!(commands.contains(&egui::ViewportCommand::CancelClose));
+    for command in [egui::ViewportCommand::Visible(true), egui::ViewportCommand::Minimized(false), egui::ViewportCommand::Focus] {
+        assert!(commands.contains(&command), "unsaved prompt must restore the window: {commands:?}");
+    }
+    discard_quit_dialog(&mut app);
+    let approved = quit_frame(&mut app, &ctx, false);
+    assert!(approved.contains(&egui::ViewportCommand::Close));
+    let completed = quit_frame(&mut app, &ctx, true);
+    assert!(app.session.documents().is_empty());
+
+    let mut clean = DesignApp::new(designcraft_engine::Session::new(), Services::default());
+    clean.run("file.new", json!({})).unwrap();
+    let clean_close = quit_frame(&mut clean, &ctx, true);
+    let mut control = app_with_unsaved_document();
+    control.quit_without_asking = true;
+    let control_close = quit_frame(&mut control, &ctx, true);
+    for commands in [&approved, &completed, &clean_close, &control_close] {
+        assert!(
+            !commands.iter().any(|command| matches!(
+                command,
+                egui::ViewportCommand::Visible(true) | egui::ViewportCommand::Minimized(false) | egui::ViewportCommand::Focus
+            )),
+            "completed and immediate quits must not activate the window: {commands:?}"
+        );
+    }
+}
+
+/// Dock Quit may arrive again while the first request's dialogs are still open.
+#[test]
+fn repeated_native_quit_requests_preserve_partial_approvals_and_cancel() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    second_unsaved_document(&mut app);
+    let original_active = app.session.active().unwrap().uid;
+    let uids: Vec<_> = app.session.documents().iter().map(|d| d.uid).collect();
+    let docs: Vec<_> = app.session.documents().iter().map(|d| d.doc.clone()).collect();
+    let directory = tempfile::tempdir().unwrap();
+    app.session.recovery_dir = Some(directory.path().to_path_buf());
+    app.run("file.recovery.save", json!({})).unwrap();
+    assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
+    assert_eq!(dialog_uid(&app), Some(uids[0]));
+    discard_quit_dialog(&mut app);
+    quit_frame(&mut app, &ctx, false);
+    assert_eq!(dialog_uid(&app), Some(uids[1]));
+    for _ in 0..3 {
+        assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
+        assert_eq!(dialog_uid(&app), Some(uids[1]));
+    }
+    app.ui.dialog = None; // Cancel the second document, retaining the first Don't Save answer.
+    assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert_eq!(app.session.active().unwrap().uid, original_active);
+    assert_eq!(app.session.documents().iter().map(|d| d.uid).collect::<Vec<_>>(), uids);
+    for (document, original) in app.session.documents().iter().zip(docs) {
+        assert!(std::sync::Arc::ptr_eq(&document.doc, &original));
+        assert!(document.is_dirty());
+        assert!(!document.history.undo.is_empty());
+        assert!(directory.path().join(format!("{}.designcraft", document.uid)).exists());
+    }
+    // A fresh Dock Quit must ask about the first document again after cancellation.
+    assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
+    assert_eq!(dialog_uid(&app), Some(uids[0]));
+}
+
+#[test]
+fn repeated_native_quit_requests_save_and_discard_only_after_all_answers() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    second_unsaved_document(&mut app);
+    let uids: Vec<_> = app.session.documents().iter().map(|d| d.uid).collect();
+    let directory = tempfile::tempdir().unwrap();
+    let path = directory.path().join("saved.designcraft");
+    let chosen = path.to_string_lossy().to_string();
+    app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(Some(chosen.clone())));
+    app.session.recovery_dir = Some(directory.path().join("recovery"));
+    app.run("file.recovery.save", json!({})).unwrap();
+    quit_frame(&mut app, &ctx, true);
+    assert_eq!(dialog_uid(&app), Some(uids[0]));
+    dialogs::confirm(&mut app).unwrap(); // Save the first document.
+    app.settle_dialogs();
+    assert!(!app.session.documents()[0].is_dirty());
+    quit_frame(&mut app, &ctx, false);
+    assert_eq!(dialog_uid(&app), Some(uids[1]));
+    assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
+    assert_eq!(dialog_uid(&app), Some(uids[1]));
+    discard_quit_dialog(&mut app);
+    assert!(quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert_eq!(app.session.documents().len(), 2);
+    assert!(app.session.recovery_dir.as_ref().unwrap().join(format!("{}.designcraft", uids[1])).exists());
+    assert!(quit_frame(&mut app, &ctx, true).is_empty());
+    assert!(app.session.documents().is_empty());
+    assert!(path.exists());
+    assert_eq!(designcraft_engine::Session::new().execute("file.open", &json!({"path": path})).unwrap()["index"], 0);
+    assert_eq!(std::fs::read_dir(app.session.recovery_dir.as_ref().unwrap()).unwrap().count(), 0);
+}
+
+#[test]
+fn quitting_first_cancel_restores_original_clean_active_document() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    app.run("file.new", json!({})).unwrap();
+    let original_active = app.session.active().unwrap().uid;
+    quit_frame(&mut app, &ctx, true);
+    assert_ne!(app.session.active().unwrap().uid, original_active);
+    app.ui.dialog = None;
+    assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert_eq!(app.session.active().unwrap().uid, original_active);
+    assert_eq!(app.session.documents().len(), 2);
+}
+
+#[test]
+fn quitting_save_as_cancel_after_discard_keeps_all_documents() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    second_unsaved_document(&mut app);
+    let active = app.session.active().unwrap().uid;
+    quit_frame(&mut app, &ctx, true);
+    discard_quit_dialog(&mut app);
+    quit_frame(&mut app, &ctx, false);
+    dialogs::confirm(&mut app).unwrap(); // No picker: Save As was cancelled.
+    assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert_eq!(app.session.documents().len(), 2);
+    assert!(app.session.documents().iter().all(|d| d.is_dirty()));
+    assert_eq!(app.session.active().unwrap().uid, active);
+}
+
+#[test]
+fn quitting_save_failure_after_discard_keeps_documents_and_can_retry() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    second_unsaved_document(&mut app);
+    let path = std::env::temp_dir()
+        .join(format!("designcraft-quit-missing-{}-{}", std::process::id(), app.session.active().unwrap().uid))
+        .join("missing")
+        .join("document.designcraft");
+    assert!(!path.parent().unwrap().exists());
+    let picked = path.to_string_lossy().to_string();
+    app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(Some(picked.clone())));
+    quit_frame(&mut app, &ctx, true);
+    discard_quit_dialog(&mut app);
+    quit_frame(&mut app, &ctx, false);
+    // The folder is missing: saving there fails and Quit stops.
+    dialogs::confirm(&mut app).unwrap();
+    app.settle_dialogs();
+    assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert_eq!(app.session.documents().len(), 2);
+    assert!(app.session.documents().iter().all(|d| d.is_dirty()));
+    // Starting over must ask about the previously discarded first document again.
+    quit_frame(&mut app, &ctx, true);
+    assert_eq!(dialog_uid(&app), Some(app.session.documents()[0].uid));
+}
+
+/// Quit › Save on a document never saved, then Cancel in the save dialog: Quit stops and the
+/// document stays open with its changes.
+#[test]
+fn quit_save_cancelled_in_the_save_dialog_stops_quitting() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(None));
+    quit_frame(&mut app, &ctx, true);
+    dialogs::confirm(&mut app).unwrap(); // Save
+    assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close), "Quit waits for the save dialog");
+    assert!(app.quitting.is_some());
+    app.settle_dialogs();
+    assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert!(app.quitting.is_none(), "Quit stopped");
+    assert_eq!(app.session.documents().len(), 1);
+    assert!(app.session.documents()[0].is_dirty());
+}
+
+/// Close › Save on a document never saved, then Cancel in the save dialog: the document stays
+/// open with its changes.
+#[test]
+fn close_save_cancelled_in_the_save_dialog_keeps_the_document_open() {
+    let mut app = app_with_unsaved_document();
+    app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(None));
+    crate::menus::close_document(&mut app, Some(0));
+    dialogs::confirm(&mut app).unwrap(); // Save
+    app.settle_dialogs();
+    assert_eq!(app.session.documents().len(), 1);
+    assert!(app.session.documents()[0].is_dirty());
+}
+
+#[test]
+fn quitting_save_then_later_cancel_keeps_saved_document_open() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    second_unsaved_document(&mut app);
+    let first = app.session.documents()[0].uid;
+    let path = std::env::temp_dir().join(format!("designcraft-quit-save-{}-{first}.designcraft", std::process::id()));
+    let picked = path.to_string_lossy().to_string();
+    app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(Some(picked.clone())));
+    quit_frame(&mut app, &ctx, true);
+    dialogs::confirm(&mut app).unwrap();
+    app.settle_dialogs();
+    quit_frame(&mut app, &ctx, false);
+    assert_eq!(app.session.documents().len(), 2);
+    assert!(!app.session.documents()[0].is_dirty());
+    assert!(path.exists());
+    app.ui.dialog = None;
+    assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert_eq!(app.session.documents()[0].uid, first);
+    assert!(app.session.documents()[1].is_dirty());
+    std::fs::remove_file(path).unwrap();
+}
+
+#[test]
+fn quitting_rechecks_discard_approval_after_a_later_edit() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    second_unsaved_document(&mut app);
+    let first = app.session.documents()[0].uid;
+    quit_frame(&mut app, &ctx, true);
+    discard_quit_dialog(&mut app);
+    quit_frame(&mut app, &ctx, false);
+    app.run("file.activate", json!({"index": 0})).unwrap();
+    app.run("frame.create", json!({"rect": [200, 200, 300, 300]})).unwrap();
+    discard_quit_dialog(&mut app); // Approval is bound to the second UID, despite the switch.
+    assert!(!quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert_eq!(dialog_uid(&app), Some(first), "new edit needs a fresh decision");
+    assert_eq!(app.session.documents().len(), 2);
+}
+
+#[test]
+fn quitting_final_close_rechecks_new_unsaved_document() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    quit_frame(&mut app, &ctx, true);
+    discard_quit_dialog(&mut app);
+    assert!(quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    second_unsaved_document(&mut app); // Arrives after Close was queued, before its event.
+    let new_uid = app.session.active().unwrap().uid;
+    assert!(quit_frame(&mut app, &ctx, true).contains(&egui::ViewportCommand::CancelClose));
+    assert_eq!(dialog_uid(&app), Some(new_uid));
+    assert_eq!(app.session.documents().len(), 2);
+}
+
+#[test]
+fn quitting_pending_save_uses_dialog_uid_after_tab_switch() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    second_unsaved_document(&mut app);
+    let first = app.session.documents()[0].uid;
+    let path = std::env::temp_dir().join(format!("designcraft-quit-uid-{}-{first}.designcraft", std::process::id()));
+    let picked = path.to_string_lossy().to_string();
+    app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(Some(picked.clone())));
+    quit_frame(&mut app, &ctx, true);
+    app.run("file.activate", json!({"index": 1})).unwrap();
+    dialogs::confirm(&mut app).unwrap();
+    app.settle_dialogs();
+    assert_eq!(app.session.documents()[0].path.as_deref(), path.to_str());
+    assert!(!app.session.documents()[0].is_dirty());
+    assert!(app.session.documents()[1].is_dirty());
+    quit_frame(&mut app, &ctx, false);
+    assert_eq!(dialog_uid(&app), Some(app.session.documents()[1].uid));
+    std::fs::remove_file(path).unwrap();
+}
+
+#[test]
+fn quitting_discard_preserves_recovery_until_final_commit() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    let uid = app.session.active().unwrap().uid;
+    let dir = std::env::temp_dir().join(format!("designcraft-quit-recovery-{}-{uid}", std::process::id()));
+    app.session.recovery_dir = Some(dir.clone());
+    app.run("file.recovery.save", json!({})).unwrap();
+    let entry = dir.join(format!("{uid}.designcraft"));
+    quit_frame(&mut app, &ctx, true);
+    discard_quit_dialog(&mut app);
+    assert!(quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert!(entry.exists(), "a queued close is not a committed close");
+    assert!(quit_frame(&mut app, &ctx, true).is_empty());
+    assert!(!entry.exists(), "accepted Don't Save must not be recovered on restart");
+    assert!(app.session.documents().is_empty());
+    std::fs::remove_dir_all(dir).unwrap();
+}
+
+#[test]
+fn quitting_native_exit_commits_completed_approvals_before_close_event() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    quit_frame(&mut app, &ctx, true);
+    discard_quit_dialog(&mut app);
+    assert!(quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert_eq!(app.session.documents().len(), 1);
+    app.finish_confirmed_quit().unwrap();
+    assert!(app.session.documents().is_empty());
+}
+
+#[test]
+fn quitting_native_exit_retains_incomplete_stale_and_new_document_plans() {
+    for case in ["incomplete", "stale", "new document"] {
+        let ctx = egui::Context::default();
+        let mut app = app_with_unsaved_document();
+        if case == "incomplete" {
+            second_unsaved_document(&mut app);
+        }
+        quit_frame(&mut app, &ctx, true);
+        discard_quit_dialog(&mut app);
+        quit_frame(&mut app, &ctx, false);
+        if case == "stale" {
+            app.run("frame.create", json!({"rect": [200, 200, 300, 300]})).unwrap();
+        } else if case == "new document" {
+            second_unsaved_document(&mut app);
+        }
+        let active = app.session.active().unwrap().uid;
+        let before: Vec<_> = app
+            .session
+            .documents()
+            .iter()
+            .map(|d| (d.uid, d.revision, d.doc.clone(), d.selection.items.clone(), d.history.undo.len(), d.history.redo.len()))
+            .collect();
+        app.finish_confirmed_quit().unwrap();
+        assert_eq!(app.session.documents().len(), before.len(), "{case}");
+        assert_eq!(app.session.active().unwrap().uid, active, "{case}");
+        for (d, (uid, revision, doc, selection, undo, redo)) in app.session.documents().iter().zip(before) {
+            assert_eq!(
+                (d.uid, d.revision, &d.selection.items, d.history.undo.len(), d.history.redo.len()),
+                (uid, revision, &selection, undo, redo),
+                "{case}"
+            );
+            assert!(std::sync::Arc::ptr_eq(&d.doc, &doc), "{case}");
+        }
+    }
+}
+
+#[test]
+fn quitting_without_unsaved_changes_closes_at_once() {
+    let ctx = egui::Context::default();
+    let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
+    app.run("file.new", json!({})).unwrap();
+    // Quit (⌘Q) closes the window like its close button.
+    app.run("app.quit", json!({})).unwrap();
+    assert!(quit_frame(&mut app, &ctx, false).contains(&egui::ViewportCommand::Close));
+    assert!(quit_frame(&mut app, &ctx, true).is_empty());
+    assert!(app.ui.dialog.is_none());
+}
+
+/// Scripts must not hang on a question: the control channel's quit never asks.
+#[test]
+fn control_channel_quit_does_not_ask() {
+    let ctx = egui::Context::default();
+    let mut app = app_with_unsaved_document();
+    let (req, _rx) = control::ControlRequest::new("app.quit", json!({}));
+    let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
+        control::handle(&mut app, ui.ctx(), &req);
+    });
+    out.textures_delta.clear();
+    assert!(quit_frame(&mut app, &ctx, true).is_empty());
+    assert!(app.ui.dialog.is_none());
+}
+
+/// The Control panel's two-row groups were centred as if they were one row tall, so the second
+/// row hung below the panel and was cut off.
+#[test]
+fn opening_missing_fonts_offers_repeated_replacement_and_keeps_errors_visible() {
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    app.run("file.new", json!({})).unwrap();
+    app.run("frame.create", json!({"rect":[0,0,200,200], "content":"text", "text":"Sample"})).unwrap();
+    let d = std::sync::Arc::make_mut(&mut app.session.doc_mut().unwrap().doc);
+    let sid = *d.stories.keys().next().unwrap();
+    d.story_mut(sid).unwrap().format_chars(0..6, |f| {
+        f.over.font_family = Some("Unavailable Test Family".into());
+        f.over.font_style = Some("Regular".into());
+    });
+    let path = std::env::temp_dir().join(format!("designcraft-font-open-{}.designcraft", std::process::id()));
+    app.run("file.save", json!({"path":path})).unwrap();
+    app.run("file.open", json!({"path":path})).unwrap();
+    let dialog = app.ui.dialog.as_mut().unwrap();
+    assert_eq!(dialog.id, "findFont");
+    assert_eq!(dialog.fields["onOpen"], true);
+    dialog.fields.insert("family".into(), json!("Unavailable Test Family"));
+    dialog.fields.insert("style".into(), json!("Regular"));
+    dialog.fields.insert("toFamily".into(), json!("Unavailable Target"));
+    dialog.fields.insert("toStyle".into(), json!("Regular"));
+    assert!(dialogs::confirm(&mut app).is_err());
+    assert!(app.ui.dialog.as_ref().unwrap().fields.contains_key("error"));
+    app.ui.dialog.as_mut().unwrap().fields.insert("toFamily".into(), json!("Source Sans 3"));
+    dialogs::confirm(&mut app).unwrap();
+    assert!(!app.ui.dialog.as_ref().unwrap().fields.contains_key("_fonts"));
+    assert!(app.run("font.list", json!({})).unwrap().as_array().unwrap().iter().all(|f| f["missing"] == false));
+    app.ui.dialog = None;
+    app.run("file.save", json!({"path":path})).unwrap();
+    app.run("file.open", json!({"path":path})).unwrap();
+    assert!(app.ui.dialog.is_none());
+    std::fs::remove_file(path).unwrap();
+}
+
+#[test]
+fn snap_view_uses_the_saved_switches() {
+    let mut ui = UiState::default();
+    assert!(ui.snap_view().snap_to_guides);
+    assert!(!ui.snap_view().snap_to_document_grid);
+    assert_eq!(ui.snap_view().zone_px, 4.0);
+    ui.snap_to_guides = false;
+    ui.snap_zone = 0.0;
+    assert!(!ui.snap_view().snap_to_guides);
+    assert_eq!(ui.snap_view().zone_px, 0.0);
+}
+
+#[test]
+fn pdf_export_settings_round_trip() {
+    let ui = UiState::default();
+    let json = serde_json::to_string(&ui).unwrap();
+    let parsed: UiState = serde_json::from_str(&json).unwrap();
+    assert_eq!(parsed.pdf_export, PdfExportSettings::default());
+}
+
+#[test]
+fn pdf_export_settings_defaults() {
+    let settings = PdfExportSettings::default();
+    assert_eq!(settings.preset, "Desktop Printing");
+    assert_eq!(settings.standard, "none");
+    assert!(!settings.compress_images);
+    assert_eq!(settings.flatten, "");
+    assert!(!settings.spreads);
+    assert!(settings.bleed);
+    assert!(!settings.marks_crop);
+    assert!(!settings.marks_bleed);
+    assert!(!settings.marks_page_info);
+    assert_eq!(settings.marks_weight, "0.25");
+    assert_eq!(settings.marks_offset, "6");
+    assert!(settings.tagged);
+}
+
+#[test]
+fn pdf_export_settings_survive_missing_key() {
+    let json = r#"{ "language": "en" }"#;
+    let ui: UiState = serde_json::from_str(json).unwrap();
+    assert_eq!(ui.pdf_export, PdfExportSettings::default());
+}
+
+/// A temporary file named `name` whose bytes aren't a document or a graphic.
+fn unreadable_file(name: &str) -> std::path::PathBuf {
+    let path = std::env::temp_dir().join(format!("designcraft-ui-{}-{name}", std::process::id()));
+    std::fs::write(&path, b"neither a document nor a graphic").unwrap();
+    path
+}
+
+/// The open alert dialog: (title, message).
+fn alert(app: &DesignApp) -> (String, String) {
+    let d = app.ui.dialog.as_ref().expect("an alert is open");
+    assert_eq!(d.id, "alert");
+    (d.fields["title"].as_str().unwrap().to_string(), d.fields["message"].as_str().unwrap().to_string())
+}
+
+#[test]
+fn dropped_documents_open_and_the_rest_is_placed() {
+    for name in ["a.designcraft", "B.IDML", "c.indd", "D.INDT"] {
+        assert!(opens_as_document(name), "{name}");
+    }
+    for name in ["a.png", "b.pdf", "idml.txt", "c.idml.zip", "e.indd.zip"] {
+        assert!(!opens_as_document(name), "{name}");
+    }
+}
+
+/// Files without an extension: dropped, a document opens and anything else is placed; asked
+/// for by the operating system, they wait for the window and then open as documents.
+#[test]
+fn extensionless_documents_open_by_content() {
+    let path = std::env::temp_dir().join(format!("designcraft-ui-{}-Brochure", std::process::id()));
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    app.run("file.new", json!({})).unwrap();
+    let bytes = designcraft_engine::cmd::base64_decode(app.run("file.serialize", json!({})).unwrap()["base64"].as_str().unwrap());
+    std::fs::write(&path, bytes).unwrap();
+    let p = path.to_string_lossy().to_string();
+    app.open_dropped(&p).unwrap();
+    assert_eq!(app.session.documents().len(), 2, "a document opens, it isn't placed");
+    app.open_documents_later([p.clone()]);
+    assert_eq!(app.session.documents().len(), 2, "queued until the window is ready");
+    app.open_os_documents();
+    assert_eq!(app.session.documents().len(), 3);
+    assert_eq!(app.session.active().and_then(|d| d.path.clone()), Some(p));
+    let _ = std::fs::remove_file(&path);
+    let notes = unreadable_file("notes");
+    let e = app.open_dropped(&notes.to_string_lossy()).unwrap_err();
+    let _ = std::fs::remove_file(&notes);
+    assert_eq!(alert(&app), ("Can't Place the File".to_string(), e));
+}
+
+#[test]
+fn status_messages_follow_the_interface_language_but_engine_errors_stay_english() {
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    app.status_error("Table", "No table selected");
+    assert_eq!(app.ui.status, "Table: No table selected");
+    app.ui.language = "cs".into();
+    app.status_error("Table", "No table selected");
+    assert_eq!(app.ui.status, format!("{}: No table selected", crate::i18n::tr("cs", "Table")));
+}
+
+#[test]
+fn dropping_an_unreadable_file_alerts() {
+    // A document opens, so it says it can't be opened.
+    let path = unreadable_file("broken.designcraft");
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    let r = app.open_dropped(&path.to_string_lossy());
+    let _ = std::fs::remove_file(&path);
+    let e = r.unwrap_err();
+    let (title, message) = alert(&app);
+    assert_eq!(title, "Can't Open the File", "a document opens, it isn't placed");
+    assert_eq!(message, e);
+    assert!(app.ui.status.contains(&e), "the status line says it too");
+    assert!(app.session.documents().is_empty());
+    dialogs::confirm(&mut app).unwrap();
+    assert!(app.ui.dialog.is_none(), "OK closes the alert");
+    // Anything else is placed, so it says it can't be placed.
+    app.run("file.new", json!({})).unwrap();
+    let path = unreadable_file("notes.xyz");
+    let r = app.open_dropped(&path.to_string_lossy());
+    let _ = std::fs::remove_file(&path);
+    let e = r.unwrap_err();
+    assert_eq!(alert(&app), ("Can't Place the File".to_string(), e));
+}
+
+#[test]
+fn a_dropped_indd_file_the_converter_rejects_alerts() {
+    let path = unreadable_file("brochure.indd");
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    let r = app.open_dropped(&path.to_string_lossy());
+    let _ = std::fs::remove_file(&path);
+    let e = r.unwrap_err();
+    assert!(e.contains("InDesign file"), "{e}");
+    assert_eq!(alert(&app), ("Can't Open the File".to_string(), e));
+    assert!(app.session.documents().is_empty());
+}
+
+#[test]
+fn dropping_an_ase_file_loads_its_swatches() {
+    let mut source = Session::new();
+    source.execute("file.new", &json!({})).unwrap();
+    source.execute("swatch.create", &json!({"name": "Dropped Teal", "color": "#108080"})).unwrap();
+    let data = source.execute("swatch.save", &json!({"names": ["Dropped Teal"]})).unwrap();
+    let bytes = designcraft_engine::cmd::base64_decode(data["base64"].as_str().unwrap());
+    for name in ["palette.ase", "PALETTE.ASE"] {
+        let path = std::env::temp_dir().join(format!("designcraft-ui-{}-{name}", std::process::id()));
+        std::fs::write(&path, &bytes).unwrap();
+        let mut app = DesignApp::new(Session::new(), Services::default());
+        app.run("file.new", json!({})).unwrap();
+        let r = app.open_dropped(&path.to_string_lossy());
+        let _ = std::fs::remove_file(&path);
+        assert!(app.ui.dialog.is_none(), "{name}: {:?}", app.ui.dialog.as_ref().map(|d| &d.fields));
+        assert_eq!(r, Ok(json!({"added": 1, "replaced": 0})), "{name}");
+        let doc = &app.session.doc().unwrap().doc;
+        assert!(doc.swatches.iter().any(|s| s.name == "Dropped Teal"), "{name}");
+        assert!(doc.assets.is_empty(), "{name} isn't placed");
+    }
+}
+
+#[test]
+fn a_file_dropped_while_a_parent_is_open_lands_on_the_parent() {
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    app.run("file.new", json!({"pages": 3})).unwrap();
+    app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0)));
+    app.run("layout.parents.edit", json!({"on": true})).unwrap();
+    let _ = app.view_mut();
+    let path = std::env::temp_dir().join(format!("designcraft-ui-{}-drop.png", std::process::id()));
+    std::fs::write(&path, designcraft_render::Rendered { width: 10, height: 10, pixels: vec![200; 400] }.to_png()).unwrap();
+    let r = app.open_dropped(&path.to_string_lossy());
+    let _ = std::fs::remove_file(&path);
+    r.unwrap();
+    let d = &app.session.doc().unwrap().doc;
+    assert_eq!(d.parents[0].items.len(), 1, "the graphic is on the parent spread");
+    assert!(d.spreads.iter().all(|s| s.items.is_empty()), "no document page gets it");
+}
+
+#[test]
+fn file_open_failures_show_an_alert() {
+    let path = unreadable_file("open.designcraft");
+    let picked = path.to_string_lossy().to_string();
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    app.answer_dialogs(crate::app::file_dialogs::testing::answer_with(Some(picked)));
+    // The error comes with the dialog's answer, on a later frame: the alert and the status line.
+    app.run("app.openDialog", json!({})).unwrap();
+    app.settle_dialogs();
+    assert_eq!(alert(&app), ("Can't Open the File".to_string(), app.ui.status.clone()));
+    // Placing it says so too.
+    app.ui.dialog = None;
+    app.run("file.new", json!({})).unwrap();
+    app.run("app.placeDialog", json!({})).unwrap();
+    app.settle_dialogs();
+    let _ = std::fs::remove_file(&path);
+    assert_eq!(alert(&app), ("Can't Place the File".to_string(), app.ui.status.clone()));
+}
+
+#[test]
+fn other_command_errors_stay_in_the_status_line() {
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    assert!(app.run("file.open", json!({"path": "/nonexistent/x.designcraft"})).is_err());
+    assert!(app.ui.dialog.is_none(), "a scripted file.open doesn't raise an alert");
+    assert!(!app.ui.status.is_empty());
+    // The control channel's app.open answers with the error; no alert waits for a click.
+    let (req, _rx) = control::ControlRequest::new("app.open", json!({"path": "/nonexistent/x.designcraft"}));
+    let control::Outcome::Done(r) = control::handle(&mut app, &egui::Context::default(), &req) else { panic!("app.open answers") };
+    assert_eq!(r["ok"], json!(false), "{r}");
+    assert!(app.ui.dialog.is_none(), "a control-channel app.open doesn't raise an alert");
+}
+
+/// Copied objects were pasted on the first spread whatever page was in view.
+#[test]
+fn paste_lands_on_the_spread_in_view() {
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    app.run("file.new", json!({"pages": 3, "facingPages": false})).unwrap();
+    let id = app.run("frame.create", json!({"rect": [36, 36, 136, 136]})).unwrap()["id"].clone();
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    app.run("edit.copy", json!({})).unwrap();
+    let pasted_on = |app: &DesignApp| {
+        let st = app.session.active().unwrap();
+        st.doc.find(st.selection.items[0]).unwrap().spread
+    };
+    // Nothing is in view before the canvas is laid out: the first spread, as in a script.
+    app.run("edit.paste", json!({})).unwrap();
+    assert_eq!(pasted_on(&app), designcraft_doc::SpreadRef::Doc(0));
+    app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0)));
+    canvas::go_to_page(&mut app, 2);
+    menus::activate(&mut app, "edit.pasteInPlace", &Value::Null);
+    assert_eq!(pasted_on(&app), designcraft_doc::SpreadRef::Doc(2));
+    canvas::go_to_page(&mut app, 1);
+    app.run("edit.paste", json!({})).unwrap();
+    assert_eq!(pasted_on(&app), designcraft_doc::SpreadRef::Doc(1));
+    // A parent spread while parents are edited.
+    app.run("layout.parents.edit", json!({"on": true})).unwrap();
+    app.run("edit.paste", json!({})).unwrap();
+    assert_eq!(pasted_on(&app), designcraft_doc::SpreadRef::Parent(0));
+    // With an insertion point Paste still goes into the text, where the object is anchored.
+    let story = app.run("frame.create", json!({"rect": [36, 200, 300, 400], "content": "text", "text": "ab"})).unwrap()["story"].clone();
+    app.run("text.select", json!({"story": story, "anchor": 2})).unwrap();
+    assert_eq!(app.run("edit.paste", json!({})).unwrap()["anchored"], 1);
+}
+
+// ---------------------------------------------------------------------------------------
+// egui 0.37 lifecycle, hidden input and screenshot completion regressions.
+// ---------------------------------------------------------------------------------------
+
+/// One frame of the real callback order the native and web hosts use.
+fn shot_frame(app: &mut DesignApp, ctx: &egui::Context, size: egui::Vec2) -> egui::FullOutput {
+    shot_frame_at(app, ctx, egui::Rect::from_min_size(egui::Pos2::ZERO, size), true)
+}
+
+/// One frame at a chosen window rect. `inner_rect = false` is the web/egui_kittest shape:
+/// `screen_rect` is set but `ViewportInfo::inner_rect` is not.
+fn shot_frame_at(app: &mut DesignApp, ctx: &egui::Context, rect: egui::Rect, inner_rect: bool) -> egui::FullOutput {
+    let mut raw = egui::RawInput { screen_rect: Some(rect), ..Default::default() };
+    raw.viewports.insert(
+        egui::ViewportId::ROOT,
+        egui::ViewportInfo {
+            inner_rect: inner_rect.then_some(rect),
+            native_pixels_per_point: Some(1.0),
+            minimized: Some(false),
+            occluded: Some(false),
+            ..Default::default()
+        },
+    );
+    let mut output = ctx.run_ui(raw, |ui| {
+        let ctx = ui.ctx().clone();
+        app.logic(&ctx);
+        app.ui(ui);
+    });
+    output.textures_delta.clear();
+    output
+}
+
+/// A hidden host iteration: the raw input is prepared and then only the logic callback runs.
+fn hidden_tick(app: &mut DesignApp, ctx: &egui::Context, raw: &mut egui::RawInput) -> egui::LogicOutput {
+    app.raw_input_hook(ctx, raw);
+    ctx.run_logic(raw, |ctx| app.logic(ctx))
+}
+
+/// Build a 640x480 root viewport marked minimized and occluded.
+fn hidden_raw() -> egui::RawInput {
+    let rect = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(640.0, 480.0));
+    let mut raw = egui::RawInput { screen_rect: Some(rect), ..Default::default() };
+    raw.viewports.insert(
+        egui::ViewportId::ROOT,
+        egui::ViewportInfo {
+            inner_rect: Some(rect),
+            native_pixels_per_point: Some(1.0),
+            minimized: Some(true),
+            occluded: Some(true),
+            ..Default::default()
+        },
+    );
+    raw
+}
+
+/// Count root `RequestPaintWhileHidden` commands.
+fn hidden_paints(output: &egui::LogicOutput) -> usize {
+    output
+        .viewport_commands
+        .get(&egui::ViewportId::ROOT)
+        .map_or(0, |commands| commands.iter().filter(|c| matches!(c, egui::ViewportCommand::RequestPaintWhileHidden)).count())
+}
+
+/// Remove and return the root screenshot callback, replacing its command with `Focus`.
+fn screenshot_callback(output: &mut egui::FullOutput) -> Option<egui::ScreenshotCallback> {
+    let viewport = output.viewport_output.get_mut(&egui::ViewportId::ROOT)?;
+    for command in &mut viewport.commands {
+        if matches!(command, egui::ViewportCommand::Screenshot(_)) {
+            let egui::ViewportCommand::Screenshot(callback) = std::mem::replace(command, egui::ViewportCommand::Focus) else {
+                return None;
+            };
+            return Some(callback);
+        }
+    }
+    None
+}
+
+/// Create a recording-write app with a new document and four settling frames.
+fn screenshot_app() -> (DesignApp, egui::Context, std::sync::Arc<std::sync::Mutex<Vec<(String, usize)>>>) {
+    let writes: std::sync::Arc<std::sync::Mutex<Vec<(String, usize)>>> = Default::default();
+    let sink = writes.clone();
+    let mut app = DesignApp::new(
+        Session::new(),
+        Services {
+            write: Some(Box::new(move |path, bytes| {
+                sink.lock().unwrap().push((path.to_string(), bytes.len()));
+                Ok(())
+            })),
+            ..Default::default()
+        },
+    );
+    app.run("file.new", json!({"title": "shots"})).unwrap();
+    let ctx = egui::Context::default();
+    for _ in 0..4 {
+        let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+        output.textures_delta.clear();
+    }
+    (app, ctx, writes)
+}
+
+/// The callback only fills a slot; the next logic pass writes and replies once and releases admission.
+#[test]
+fn screenshot_callback_stays_weak_and_writes_only_from_logic() {
+    let (mut app, ctx, writes) = screenshot_app();
+    let (reply, replies) = std::sync::mpsc::channel();
+    let path = std::env::temp_dir().join(format!("designcraft-shot-{}.png", std::process::id()));
+    app.admit_screenshot(Some(path.to_string_lossy().to_string()), reply).unwrap();
+    app.queued_shots[0].1 = 0.0;
+    let mut callback = None;
+    for _ in 0..3 {
+        let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+        if let Some(cb) = screenshot_callback(&mut output) {
+            callback = Some(cb);
+        }
+    }
+    let callback = callback.expect("the settling frames issue one capture");
+    assert!(writes.lock().unwrap().is_empty());
+    // The callback only fills its slot; writing happens in the next logic pass.
+    callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
+    assert!(writes.lock().unwrap().is_empty(), "the callback must not write files");
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    let written = writes.lock().unwrap().clone();
+    assert_eq!(written.len(), 1, "one file after the logic drain");
+    assert_eq!(written[0].0, path.to_string_lossy());
+    let reply = replies.recv().unwrap();
+    assert_eq!(reply["ok"], true, "{reply}");
+    assert_eq!(reply["result"]["width"], 640);
+    assert_eq!(reply["result"]["height"], 480);
+    assert!(app.pending_shots.is_empty(), "the reservation is released");
+}
+
+/// Admission enforces the request count, aggregate RGBA byte budget and per-image limit before capture.
+#[test]
+fn screenshot_admission_bounds_count_aggregate_and_image_bytes() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let admit = |app: &mut DesignApp, path: &str| {
+        let (reply, _replies) = std::sync::mpsc::channel();
+        app.admit_screenshot(Some(path.into()), reply)
+    };
+    for i in 0..SCREENSHOT_MAX_REQUESTS {
+        assert!(admit(&mut app, &format!("shot-{i}.png")).is_ok(), "request {i}");
+    }
+    let error = admit(&mut app, "too-many.png").unwrap_err();
+    assert_eq!(error["ok"], false, "{error}");
+    // Drain the admitted requests without replying so the byte-budget check is exercised.
+    app.pending_shots.clear();
+    app.queued_shots.clear();
+    for _ in 0..2 {
+        shot_frame(&mut app, &ctx, egui::vec2(5120.0, 5120.0));
+    }
+    assert!(admit(&mut app, "hundred-a.png").is_ok());
+    assert!(admit(&mut app, "hundred-b.png").is_ok());
+    let error = admit(&mut app, "over-aggregate.png").unwrap_err();
+    assert!(error["error"].as_str().unwrap_or_default().contains("budget"), "{error}");
+    app.pending_shots.clear();
+    app.queued_shots.clear();
+    for _ in 0..2 {
+        shot_frame(&mut app, &ctx, egui::vec2(6000.0, 6000.0));
+    }
+    let error = admit(&mut app, "too-large.png").unwrap_err();
+    assert!(error["error"].as_str().unwrap_or_default().contains("image limit"), "{error}");
+}
+
+/// A resize invalidates in-flight pixels and retries within the deadline; a timeout errors and late callbacks are inert.
+#[test]
+fn screenshot_epoch_change_and_timeout_drop_stale_pixels() {
+    let (mut app, ctx, writes) = screenshot_app();
+    let (reply, replies) = std::sync::mpsc::channel();
+    app.admit_screenshot(Some("stale.png".into()), reply).unwrap();
+    app.queued_shots[0].1 = 0.0;
+    let mut callback = None;
+    for _ in 0..3 {
+        let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+        if let Some(cb) = screenshot_callback(&mut output) {
+            callback = Some(cb);
+        }
+    }
+    let callback = callback.expect("issued");
+    // Resize away and back: the epoch advances even though the size ends up the same.
+    shot_frame(&mut app, &ctx, egui::vec2(800.0, 600.0));
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    callback.clone().complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    assert!(replies.try_recv().is_err(), "stale pixels must not be replied");
+    assert!(!app.queued_shots.is_empty(), "the request is retried inside its deadline");
+    assert!(writes.lock().unwrap().is_empty());
+    // Let the deadline pass: the retry reports an error and a later callback is inert.
+    app.pending_shots[0].deadline = 0.0;
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    let reply = replies.try_recv().unwrap();
+    assert_eq!(reply["ok"], false, "{reply}");
+    callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    assert!(replies.try_recv().is_err(), "no second reply from a late callback");
+    assert!(writes.lock().unwrap().is_empty());
+    assert!(app.pending_shots.is_empty());
+}
+
+/// A host without `inner_rect` uses `screen_rect` and can still admit and complete a capture.
+#[test]
+fn screenshot_geometry_uses_screen_rect_when_inner_rect_is_absent() {
+    let (mut app, ctx, writes) = screenshot_app();
+    app.screenshot_geometry = None;
+    app.screenshot_epoch = 0;
+    let rect = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(640.0, 480.0));
+    // Web eframe and egui_kittest set screen_rect but not ViewportInfo::inner_rect.
+    for _ in 0..2 {
+        shot_frame_at(&mut app, &ctx, rect, false);
+    }
+    let geometry = app.screenshot_geometry.expect("the screen rect is the logical viewport");
+    assert_eq!((geometry.width, geometry.height), (640, 480), "the fallback is the same logical geometry");
+    let (reply, replies) = std::sync::mpsc::channel();
+    app.admit_screenshot(Some("web-like.png".into()), reply).expect("an inner-rect-less host admits screenshots");
+    app.queued_shots[0].1 = 0.0;
+    let mut callback = None;
+    for _ in 0..3 {
+        if let Some(cb) = screenshot_callback(&mut shot_frame_at(&mut app, &ctx, rect, false)) {
+            callback = Some(cb);
+        }
+    }
+    callback.expect("the capture is issued").complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
+    shot_frame_at(&mut app, &ctx, rect, false);
+    let reply = replies.recv().unwrap();
+    assert_eq!(reply["ok"], true, "{reply}");
+    assert_eq!(writes.lock().unwrap().len(), 1);
+}
+
+/// Apply native pixels-per-point and UI zoom exactly once.
+#[test]
+fn screenshot_geometry_applies_native_dpi_and_zoom_once() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    app.ui.ui_scale = 1.5;
+    let rect = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(100.0, 50.0));
+    let raw = {
+        let mut raw = egui::RawInput { screen_rect: Some(rect), ..Default::default() };
+        raw.viewports.insert(
+            egui::ViewportId::ROOT,
+            egui::ViewportInfo { inner_rect: Some(rect), native_pixels_per_point: Some(2.0), minimized: Some(false), ..Default::default() },
+        );
+        raw
+    };
+    // The first pass applies the zoom; the next logic tick measures the new geometry.
+    for _ in 0..2 {
+        let mut raw = raw.clone();
+        raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().inner_rect = Some(rect);
+        ctx.run_ui(raw, |ui| {
+            app.logic(&ui.ctx().clone());
+            app.ui(ui);
+        })
+        .textures_delta
+        .clear();
+    }
+    let geometry = app.screenshot_geometry.expect("geometry");
+    // 100 x 50 points at 2 physical pixels per point and 1.5 UI zoom: apply each exactly once.
+    assert_eq!((geometry.width, geometry.height), (300, 150));
+}
+
+/// Moving the window leaves the capture epoch unchanged; resizing and resizing back advance it.
+#[test]
+fn screenshot_epoch_ignores_window_position_but_tracks_size_changes() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let before = app.screenshot_epoch;
+    let moved = egui::Rect::from_min_size(egui::pos2(120.0, 80.0), egui::vec2(640.0, 480.0));
+    shot_frame_at(&mut app, &ctx, moved, true);
+    assert_eq!(app.screenshot_epoch, before, "moving the window is not a capture-surface change");
+    shot_frame_at(&mut app, &ctx, egui::Rect::from_min_size(egui::pos2(120.0, 80.0), egui::vec2(800.0, 600.0)), true);
+    let resized = app.screenshot_epoch;
+    assert_ne!(resized, before, "a size change advances the epoch");
+    shot_frame_at(&mut app, &ctx, egui::Rect::from_min_size(egui::pos2(120.0, 80.0), egui::vec2(640.0, 480.0)), true);
+    assert_ne!(app.screenshot_epoch, resized, "and resizing back advances it again");
+}
+
+/// `ui.screenshot` is admitted, waits for capture, then writes once and replies with the dimensions.
+#[test]
+fn control_screenshot_replies_with_the_saved_capture() {
+    let (mut app, ctx, writes) = screenshot_app();
+    let (requests, receiver) = std::sync::mpsc::channel();
+    app = app.with_control(receiver);
+    let (reply, replies) = std::sync::mpsc::channel();
+    requests.send(ControlRequest { method: "ui.screenshot".into(), params: json!({"path": "control.png", "focus": false}), reply }).unwrap();
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    assert_eq!(app.pending_shots.len(), 1, "ui.screenshot is admitted, not issued from the queue");
+    assert!(replies.try_recv().is_err(), "the reply waits for the capture");
+    app.queued_shots[0].1 = 0.0;
+    let mut callback = None;
+    for _ in 0..3 {
+        if let Some(cb) = screenshot_callback(&mut shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0))) {
+            callback = Some(cb);
+        }
+    }
+    let callback = callback.expect("the settled frames issue one capture");
+    callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    let reply = replies.recv().unwrap();
+    assert_eq!(reply["ok"], true, "{reply}");
+    assert_eq!(reply["result"]["width"], 640);
+    assert_eq!(reply["result"]["height"], 480);
+    let written = writes.lock().unwrap().clone();
+    assert_eq!(written.len(), 1);
+    assert_eq!(written[0].0, "control.png");
+    assert!(written[0].1 > 0);
+    assert!(app.pending_shots.is_empty(), "the reservation is released");
+    assert!(app.queued_shots.is_empty());
+}
+
+/// A timed-out capture replies with a no-frame error and writes no file.
+#[test]
+fn control_screenshot_times_out_without_writing_a_file() {
+    let (mut app, ctx, writes) = screenshot_app();
+    let (requests, receiver) = std::sync::mpsc::channel();
+    app = app.with_control(receiver);
+    let (reply, replies) = std::sync::mpsc::channel();
+    requests.send(ControlRequest { method: "ui.screenshot".into(), params: json!({"path": "control.png", "focus": false}), reply }).unwrap();
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    assert_eq!(app.pending_shots.len(), 1);
+    app.pending_shots[0].deadline = 0.0;
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    let reply = replies.recv().unwrap();
+    assert_eq!(reply["ok"], false, "{reply}");
+    assert!(reply["error"].as_str().unwrap_or_default().contains("no frame"), "{reply}");
+    assert!(writes.lock().unwrap().is_empty(), "a timed-out request writes no file");
+    assert!(app.pending_shots.is_empty());
+}
+
+/// A multipass frame ticks for every pass but runs once-per-frame work once.
+#[test]
+fn discarded_pass_runs_the_frame_stage_once_but_ticks_every_pass() {
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    app.run("file.new", json!({"title": "multipass"})).unwrap();
+    let ctx = egui::Context::default();
+    let rect = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(900.0, 600.0));
+    let mut raw = egui::RawInput { screen_rect: Some(rect), ..Default::default() };
+    raw.viewports
+        .insert(egui::ViewportId::ROOT, egui::ViewportInfo { inner_rect: Some(rect), native_pixels_per_point: Some(1.0), ..Default::default() });
+    let mut passes = 0;
+    let mut output = ctx.run_ui(raw, |ui| {
+        passes += 1;
+        if passes == 1 {
+            // Requested before `app.ui` so the first pass is a discarded one and must not
+            // acknowledge injected input.
+            ui.ctx().request_discard("forced multipass regression");
+        }
+        let ctx = ui.ctx().clone();
+        app.logic(&ctx);
+        app.ui(ui);
+    });
+    assert_eq!(output.platform_output.num_completed_passes, 2, "the frame really was multipass");
+    // 0.37's TexturesDelta panics if dropped unapplied; this test only inspects the passes.
+    output.textures_delta.clear();
+    assert_eq!(app.logic_tick_ticks, 2, "every pass ticks queues and deadlines");
+    assert_eq!(app.logic_frame_ticks, 1, "once-per-frame work runs once");
+    assert_eq!(app.input_ticks, 2);
+}
+
+/// Hidden logic requests one paint per tick, injects one queued step at a time, treats unknown visibility as hidden, and lets one visible pass consume the step.
+#[test]
+fn hidden_logic_requests_exactly_one_paint_per_tick_until_a_settled_ui_pass() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let mut raw = hidden_raw();
+    // Three pointer steps queued: one batch may be in the host's pending raw input at a time.
+    app.control_synthetic = vec![
+        egui::Event::PointerMoved(egui::pos2(10.0, 10.0)),
+        egui::Event::PointerMoved(egui::pos2(20.0, 20.0)),
+        egui::Event::PointerMoved(egui::pos2(30.0, 30.0)),
+    ];
+    app.raw_input_hook(&ctx, &mut raw);
+    let injected = raw.events.clone();
+    assert_eq!(app.injected_events.len(), 1, "one pointer event in the batch");
+    assert_eq!(app.control_synthetic.len(), 2, "the rest wait for later host iterations");
+    for tick in 0..3 {
+        let output = hidden_tick(&mut app, &ctx, &mut raw);
+        assert_eq!(hidden_paints(&output), 1, "tick {tick}: exactly one hidden paint request");
+        assert!(app.synthetic_injected, "the injected step is still unapplied");
+        assert!(app.control_input_frame.load(std::sync::atomic::Ordering::Relaxed), "control provenance is retained while hidden");
+        assert_eq!(raw.events, injected, "tick {tick}: no second batch accumulated into the pending raw input");
+        assert_eq!(app.control_synthetic.len(), 2, "tick {tick}: the queue did not drain another step");
+    }
+    // A real visible UI pass takes exactly the one pending event (no duplicated PointerMoved).
+    raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().minimized = Some(false);
+    raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().occluded = Some(false);
+    let mut seen = Vec::new();
+    ctx.run_ui(raw, |ui| {
+        seen = ui.ctx().input(|i| i.events.clone());
+        app.logic(&ui.ctx().clone());
+        app.ui(ui);
+    })
+    .textures_delta
+    .clear();
+    assert_eq!(seen.iter().filter(|event| matches!(event, egui::Event::PointerMoved(_))).count(), 1);
+    assert!(!app.synthetic_injected, "a settled UI pass acknowledges delivery");
+    assert!(app.control_input_frame.load(std::sync::atomic::Ordering::Relaxed), "the pass's end guard still sees the provenance");
+    app.control_synthetic.clear();
+    app.raw_input_hook(&ctx, &mut egui::RawInput::default());
+    assert!(!app.control_input_frame.load(std::sync::atomic::Ordering::Relaxed), "the next host iteration clears it");
+    // Unknown visibility is treated like hidden, and the next queued step is injected.
+    let mut unknown = egui::RawInput::default();
+    unknown.viewports.insert(egui::ViewportId::ROOT, egui::ViewportInfo::default());
+    app.control_synthetic.push(egui::Event::Text("x".into()));
+    app.raw_input_hook(&ctx, &mut unknown);
+    let output = ctx.run_logic(&unknown, |ctx| app.logic(ctx));
+    assert_eq!(hidden_paints(&output), 1, "visible() == None is treated like hidden");
+}
+
+/// A font-gated first pass requeues injected input instead of acknowledging it; a later settled pass consumes it.
+#[test]
+fn font_gated_first_pass_requeues_injected_input_instead_of_acknowledging_it() {
+    let mut app = DesignApp::new(Session::new(), Services::default());
+    app.run("file.new", json!({"title": "fonts"})).unwrap();
+    let ctx = egui::Context::default();
+    app.control_synthetic.push(egui::Event::Text("x".into()));
+    let mut raw = hidden_raw();
+    app.raw_input_hook(&ctx, &mut raw);
+    assert!(app.synthetic_injected);
+    // The first real pass installs fonts and returns before any widget consumes input.
+    ctx.run_ui(raw, |ui| {
+        app.logic(&ui.ctx().clone());
+        app.ui(ui);
+    })
+    .textures_delta
+    .clear();
+    assert!(!app.synthetic_injected, "a font-gated pass is not an acknowledgement");
+    assert_eq!(app.control_synthetic, vec![egui::Event::Text("x".into())], "the batch is back in its queue");
+    assert!(!app.control_input_frame.load(std::sync::atomic::Ordering::Relaxed));
+    // Once fonts are ready the same step is injected and a settled pass consumes it.
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    assert!(app.fonts_ready);
+    let mut raw = hidden_raw();
+    app.raw_input_hook(&ctx, &mut raw);
+    assert!(app.synthetic_injected);
+    raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().minimized = Some(false);
+    ctx.run_ui(raw, |ui| {
+        app.logic(&ui.ctx().clone());
+        app.ui(ui);
+    })
+    .textures_delta
+    .clear();
+    assert!(!app.synthetic_injected);
+    assert!(app.control_synthetic.is_empty());
+}
+
+/// Injected input is acknowledged only by the settled multipass frame.
+#[test]
+fn discarded_pass_does_not_acknowledge_injected_input() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    app.control_synthetic.push(egui::Event::Text("d".into()));
+    let mut raw = hidden_raw();
+    raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().minimized = Some(false);
+    app.raw_input_hook(&ctx, &mut raw);
+    assert!(app.synthetic_injected);
+    let mut passes = 0;
+    let output = ctx.run_ui(raw, |ui| {
+        passes += 1;
+        if passes == 1 {
+            ui.ctx().request_discard("injected input must survive a discarded pass");
+        }
+        app.logic(&ui.ctx().clone());
+        app.ui(ui);
+    });
+    assert_eq!(output.platform_output.num_completed_passes, 2);
+    assert!(!app.synthetic_injected, "the settled second pass acknowledges it");
+    assert!(app.control_synthetic.is_empty());
+}
+
+/// A document change drops the stale batch and removes its events from pending raw input.
+#[test]
+fn a_document_switch_before_the_ui_pass_drops_the_pending_batch() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let pos = egui::pos2(10.0, 10.0);
+    app.control_synthetic.push(egui::Event::PointerMoved(pos));
+    let mut raw = hidden_raw();
+    app.raw_input_hook(&ctx, &mut raw);
+    assert!(app.synthetic_injected);
+    let _ = hidden_tick(&mut app, &ctx, &mut raw);
+    // A menu/control action switched documents before the forced paint.
+    app.run("file.new", json!({"title": "handoff"})).unwrap();
+    app.raw_input_hook(&ctx, &mut raw);
+    assert!(!app.synthetic_injected, "the stale batch was discarded");
+    assert!(app.injected_events.is_empty());
+    assert!(!raw.events.iter().any(|event| matches!(event, egui::Event::PointerMoved(p) if *p == pos)), "the event was removed from pending input");
+    raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().minimized = Some(false);
+    let mut seen = Vec::new();
+    ctx.run_ui(raw, |ui| {
+        seen = ui.ctx().input(|i| i.events.clone());
+        app.logic(&ui.ctx().clone());
+        app.ui(ui);
+    })
+    .textures_delta
+    .clear();
+    assert!(!seen.iter().any(|event| matches!(event, egui::Event::PointerMoved(p) if *p == pos)), "the new document did not receive it");
+}
+
+/// Save a document, make an unsaved edit and return the temporary directory.
+#[cfg(not(target_arch = "wasm32"))]
+fn prepare_revert(app: &mut DesignApp) -> tempfile::TempDir {
+    let dir = tempfile::tempdir().unwrap();
+    app.run("file.saveAs", json!({"path": dir.path().join("revert.designcraft")})).unwrap();
+    app.run("frame.create", json!({"rect": [72, 72, 144, 144], "content": "text", "text": "unsaved"})).unwrap();
+    assert!(app.session.active().unwrap().is_dirty());
+    dir
+}
+
+/// Revert keeps the document uid, advances the identity epoch and clears dirty state.
+#[cfg(not(target_arch = "wasm32"))]
+fn revert_preserving_uid(app: &mut DesignApp) {
+    let before = app.session.active().unwrap();
+    let (uid, epoch) = (before.uid, before.identity_epoch);
+    app.run("file.revert", json!({})).unwrap();
+    let after = app.session.active().unwrap();
+    assert_eq!(after.uid, uid, "Revert keeps the open document's stable identity");
+    assert_ne!(after.identity_epoch, epoch, "Revert replaces the document state");
+    assert!(!after.is_dirty());
+}
+
+/// Input captured before Revert is neither acknowledged nor delivered to the restored document.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_revert_discards_a_buffered_input_batch() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let _dir = prepare_revert(&mut app);
+    let pos = egui::pos2(10.0, 10.0);
+    app.control_synthetic.push(egui::Event::PointerMoved(pos));
+    let mut raw = hidden_raw();
+    app.raw_input_hook(&ctx, &mut raw);
+    assert!(app.synthetic_injected);
+    revert_preserving_uid(&mut app);
+    app.raw_input_hook(&ctx, &mut raw);
+    assert!(!app.synthetic_injected, "input captured before Revert must not reach the restored document");
+    assert!(app.injected_events.is_empty());
+    assert!(!raw.events.iter().any(|event| matches!(event, egui::Event::PointerMoved(p) if *p == pos)));
+}
+
+/// Return `hidden_raw` with the root viewport marked visible.
+#[cfg(not(target_arch = "wasm32"))]
+fn visible_raw() -> egui::RawInput {
+    let mut raw = hidden_raw();
+    let viewport = raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap();
+    viewport.minimized = Some(false);
+    viewport.occluded = Some(false);
+    raw
+}
+
+/// Build Cmd-key press and release events.
+#[cfg(not(target_arch = "wasm32"))]
+fn command_key(key: egui::Key) -> Vec<egui::Event> {
+    let modifiers = egui::Modifiers { command: true, mac_cmd: true, ..egui::Modifiers::NONE };
+    [true, false].map(|pressed| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers }).to_vec()
+}
+
+/// A different document with one selectable item, for an asynchronous open.
+#[cfg(not(target_arch = "wasm32"))]
+fn document_with_a_frame() -> Vec<u8> {
+    let mut session = Session::new();
+    session.execute("file.new", &json!({"title": "Incoming"})).unwrap();
+    session.execute("frame.create", &json!({"rect": [10, 10, 50, 50]})).unwrap();
+    let serialized = session.execute("file.serialize", &json!({})).unwrap();
+    designcraft_engine::cmd::base64_decode(serialized["base64"].as_str().unwrap())
+}
+
+/// One host iteration in eframe's order: `raw_input_hook`, then `run_ui` calling
+/// `App::logic` and `App::ui` (eframe native `update`).
+#[cfg(not(target_arch = "wasm32"))]
+fn run_host_frame(app: &mut DesignApp, ctx: &egui::Context, mut raw: egui::RawInput) {
+    app.raw_input_hook(ctx, &mut raw);
+    ctx.run_ui(raw, |ui| {
+        let ctx = ui.ctx().clone();
+        app.logic(&ctx);
+        if ctx.current_pass_index() == 0 {
+            app.poll_native_actions(&ctx, || None);
+        }
+        app.ui(ui);
+    })
+    .textures_delta
+    .clear();
+}
+
+/// A native Revert runs only after the injected press/release settles; pointer state and user clipboard provenance are preserved.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_native_revert_waits_for_the_control_gesture() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let _dir = prepare_revert(&mut app);
+    let mut actions = std::collections::VecDeque::from([("file.revert".to_owned(), json!({}))]);
+    for pressed in [true, false] {
+        app.control_synthetic.push(egui::Event::PointerButton {
+            pos: egui::pos2(320.0, 240.0),
+            button: egui::PointerButton::Primary,
+            pressed,
+            modifiers: egui::Modifiers::NONE,
+        });
+    }
+    for step in 0..3 {
+        let mut raw = visible_raw();
+        app.raw_input_hook(&ctx, &mut raw);
+        ctx.run_ui(raw, |ui| {
+            let ctx = ui.ctx().clone();
+            app.logic(&ctx);
+            if ctx.current_pass_index() == 0 {
+                app.poll_native_actions(&ctx, || actions.pop_front());
+            }
+            app.ui(ui);
+        })
+        .textures_delta
+        .clear();
+        assert_eq!(app.session.active().unwrap().is_dirty(), step < 2, "Revert runs only after the release");
+        assert_eq!(ctx.input(|input| input.pointer.primary_down()), step == 0, "pointer state is not reset by the boundary");
+    }
+    assert!(actions.is_empty());
+    assert!(app.session.active().unwrap().selection.is_empty());
+    assert!(!app.control_input_frame.load(std::sync::atomic::Ordering::Relaxed), "native actions keep user clipboard provenance");
+}
+
+/// Close is cancelled and deferred while old-document input is pending, then the request survives to the next frame.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_close_waits_for_input_and_keeps_the_request() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let _dir = prepare_revert(&mut app);
+    app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
+    let mut raw = visible_raw();
+    raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap().events.push(egui::ViewportEvent::Close);
+    app.raw_input_hook(&ctx, &mut raw);
+    let mut out = ctx.run_ui(raw, |ui| {
+        app.logic(&ui.ctx().clone());
+        assert!(app.ui.dialog.is_none(), "the close dialog must not receive the old document's input");
+        app.ui(ui);
+    });
+    assert!(out.viewport_output[&egui::ViewportId::ROOT].commands.contains(&egui::ViewportCommand::CancelClose));
+    out.textures_delta.clear();
+    assert_eq!(app.session.documents().len(), 1);
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(dialog_uid(&app), Some(app.session.active().unwrap().uid), "the close request survives the deferred frame");
+}
+
+/// A later control command cannot overtake queued input and eventually completes.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_control_command_waits_for_the_preceding_input() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let (requests, receiver) = std::sync::mpsc::channel();
+    app = app.with_control(receiver);
+    let (movement, first_reply) = ControlRequest::new("ui.move", json!({"x": 10, "y": 10}));
+    let (command, second_reply) = ControlRequest::new("engine.execute", json!({"command": "frame.create", "params": {"rect": [72,72,144,144]}}));
+    requests.send(movement).unwrap();
+    requests.send(command).unwrap();
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(first_reply.try_recv().unwrap()["ok"], true);
+    assert!(second_reply.try_recv().is_err(), "later commands must not overtake queued input");
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert!(second_reply.try_recv().is_err(), "the injected input must settle first");
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(second_reply.try_recv().unwrap()["ok"], true, "the later command is eventually handled");
+}
+
+/// Revert targets the original document before deferred OS-open delivery resumes.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_native_revert_precedes_the_deferred_os_open() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let dir = prepare_revert(&mut app);
+    let original = app.session.active().unwrap().uid;
+    let path = dir.path().join("incoming.designcraft");
+    std::fs::write(&path, document_with_a_frame()).unwrap();
+    app.open_documents_later([path.to_string_lossy().to_string()]);
+    app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
+    let mut actions = std::collections::VecDeque::from([("file.revert".to_owned(), json!({}))]);
+    let mut raw = visible_raw();
+    app.raw_input_hook(&ctx, &mut raw);
+    ctx.run_ui(raw, |ui| {
+        app.logic(&ui.ctx().clone());
+        if ui.ctx().current_pass_index() == 0 {
+            app.poll_native_actions(ui.ctx(), || actions.pop_front());
+        }
+        app.ui(ui);
+    })
+    .textures_delta
+    .clear();
+    assert_eq!(app.session.documents().len(), 1);
+    assert!(app.session.active().unwrap().is_dirty());
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(app.session.active().unwrap().uid, original);
+    assert!(!app.session.active().unwrap().is_dirty(), "Revert runs before delivery resumes");
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(app.session.documents().len(), 2);
+    assert_ne!(app.session.active().unwrap().uid, original);
+    assert!(!app.session.documents().iter().find(|doc| doc.uid == original).unwrap().is_dirty(), "Revert targeted the original document");
+}
+
+/// Preview cleanup cannot replace the input batch's document and runs after the batch settles.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_stale_preview_waits_for_the_input_batch() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let original = app.session.active().unwrap().uid;
+    app.session.preview_new_document(&json!({"title": "Preview"})).unwrap();
+    let preview = app.session.new_document_preview();
+    assert!(preview.is_some());
+    app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(app.session.new_document_preview(), preview, "preview cleanup cannot replace the input's document");
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert!(app.session.new_document_preview().is_none());
+    assert_eq!(app.session.active().unwrap().uid, original);
+}
+
+/// Revert waits for Select All's forwarded text input to settle.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_native_choices_wait_for_forwarded_text_input() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let _dir = prepare_revert(&mut app);
+    let mut text = String::from("native field");
+    ctx.run_ui(visible_raw(), |ui| {
+        ui.text_edit_singleline(&mut text).request_focus();
+    })
+    .textures_delta
+    .clear();
+    assert!(ctx.text_edit_focused(), "the native edit command must forward to an actual text field");
+    let mut actions = std::collections::VecDeque::from([("edit.selectAll".to_owned(), Value::Null), ("file.revert".to_owned(), json!({}))]);
+    app.poll_native_actions(&ctx, || actions.pop_front());
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert!(app.session.active().unwrap().is_dirty(), "Revert waits for Select All's forwarded input");
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert!(!app.session.active().unwrap().is_dirty());
+}
+
+/// A queued native menu event precedes and blocks deferred OS-open delivery without synthetic input.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_arriving_native_event_blocks_an_os_open_without_synthetic_input() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let dir = prepare_revert(&mut app);
+    let original = app.session.active().unwrap().uid;
+    let path = dir.path().join("incoming.designcraft");
+    std::fs::write(&path, document_with_a_frame()).unwrap();
+    app.open_documents_later([path.to_string_lossy().to_string()]);
+    let mut actions = std::collections::VecDeque::from([("file.revert".to_owned(), json!({}))]);
+    app.native_action_notifier(ctx.clone())();
+    let mut raw = visible_raw();
+    app.raw_input_hook(&ctx, &mut raw);
+    ctx.run_ui(raw, |ui| {
+        app.logic(&ui.ctx().clone());
+        assert_eq!(app.session.documents().len(), 1, "a menu event already queued by the host must precede the OS open");
+        if ui.ctx().current_pass_index() == 0 {
+            app.poll_native_actions(ui.ctx(), || actions.pop_front());
+        }
+        app.ui(ui);
+    })
+    .textures_delta
+    .clear();
+    assert!(!app.session.active().unwrap().is_dirty(), "the menu action ran in the real UI callback");
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(app.session.documents().len(), 2);
+    assert_ne!(app.session.active().unwrap().uid, original);
+}
+
+/// Hidden logic-only ticks cannot execute native menu actions; a real UI pass can.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_deferred_native_action_waits_for_a_real_ui_pass() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let _dir = prepare_revert(&mut app);
+    app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
+    let mut actions = std::collections::VecDeque::from([("file.revert".to_owned(), json!({}))]);
+    let mut raw = visible_raw();
+    app.raw_input_hook(&ctx, &mut raw);
+    ctx.run_ui(raw, |ui| {
+        app.logic(&ui.ctx().clone());
+        if ui.ctx().current_pass_index() == 0 {
+            app.poll_native_actions(ui.ctx(), || actions.pop_front());
+        }
+        app.ui(ui);
+    })
+    .textures_delta
+    .clear();
+    assert!(app.session.active().unwrap().is_dirty());
+    let mut raw = hidden_raw();
+    app.raw_input_hook(&ctx, &mut raw);
+    let _ = ctx.run_logic(&raw, |ctx| app.logic(ctx));
+    assert!(app.session.active().unwrap().is_dirty(), "a hidden logic-only tick must not execute native menu actions");
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert!(!app.session.active().unwrap().is_dirty(), "the deferred action runs when a UI callback resumes");
+}
+
+/// An inbox delivery runs only after input sampled for the current document has settled, so
+/// a pending Select All cannot select text in the opened document.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_inbox_open_must_not_receive_a_pending_shortcut() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    app.services.inbox = Some(Inbox::default());
+    let request = app.import_request("open");
+    let file = ImportedFile { request, name: "incoming.designcraft".into(), bytes: document_with_a_frame() };
+    app.services.inbox.as_ref().unwrap().lock().unwrap().push(file);
+    app.control_synthetic.extend(command_key(egui::Key::A));
+    run_host_frame(&mut app, &ctx, visible_raw());
+    // A deferred delivery is handled by the next settled host iteration.
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(app.session.documents().len(), 2, "the inbox file is still opened");
+    assert!(app.session.active().unwrap().selection.is_empty(), "Select All sampled before the asynchronous open must not reach the opened document");
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_os_document_must_not_receive_a_pending_shortcut() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let dir = tempfile::tempdir().unwrap();
+    let path = dir.path().join("incoming.designcraft");
+    std::fs::write(&path, document_with_a_frame()).unwrap();
+    app.open_documents_later([path.to_string_lossy().to_string()]);
+    app.control_synthetic.extend(command_key(egui::Key::A));
+    run_host_frame(&mut app, &ctx, visible_raw());
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(app.session.documents().len(), 2, "the OS document is still opened");
+    assert!(app.session.active().unwrap().selection.is_empty(), "Select All sampled before the OS open must not reach the opened document");
+}
+
+/// The intended boundary: an imported file waits while the batch that was sampled for the
+/// current document is pending, and is handled once that batch has settled.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_inbox_delivery_waits_for_a_settled_batch_then_runs() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    app.services.inbox = Some(Inbox::default());
+    let request = app.import_request("open");
+    let file = ImportedFile { request, name: "incoming.designcraft".into(), bytes: document_with_a_frame() };
+    app.services.inbox.as_ref().unwrap().lock().unwrap().push(file);
+    app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(app.session.documents().len(), 1, "the delivery waited for the injected step");
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(app.session.documents().len(), 2, "the deferred delivery is not lost");
+}
+
+/// Deferred OS open waits for injected input and is not lost.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_host_order_os_document_waits_for_a_settled_batch_then_runs() {
+    let (mut app, ctx, _writes) = screenshot_app();
+    let dir = tempfile::tempdir().unwrap();
+    let path = dir.path().join("incoming.designcraft");
+    std::fs::write(&path, document_with_a_frame()).unwrap();
+    app.open_documents_later([path.to_string_lossy().to_string()]);
+    app.control_synthetic.push(egui::Event::PointerMoved(egui::pos2(10.0, 10.0)));
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(app.session.documents().len(), 1, "the OS open waited for the injected step");
+    run_host_frame(&mut app, &ctx, visible_raw());
+    assert_eq!(app.session.documents().len(), 2, "the deferred OS open is not lost");
+}
+
+/// Revert drops the buffered native drop so it cannot modify the restored document.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_revert_discards_a_buffered_native_drop() {
+    let (mut app, ctx) = drop_test_app();
+    let dir = prepare_revert(&mut app);
+    let path = dir.path().join("drop.png");
+    std::fs::write(&path, designcraft_render::Rendered { width: 10, height: 10, pixels: vec![200; 400] }.to_png()).unwrap();
+    let mut raw = visible_raw_with_drop(&[&path]);
+    app.raw_input_hook(&ctx, &mut raw);
+    assert_eq!(app.pending_drops.len(), 1);
+    revert_preserving_uid(&mut app);
+    let assets_before = app.session.active().unwrap().doc.assets.len();
+    run_ui_pass(&mut app, &ctx, raw);
+    assert_eq!(app.session.active().unwrap().doc.assets.len(), assets_before, "a stale native drop must not modify the restored document");
+    assert!(app.pending_drops.is_empty());
+}
+
+/// Revert rejects pre-issue and in-flight screenshots with a document error, issues no retry and writes no pixels.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_revert_rejects_screenshots_before_issue_and_in_flight() {
+    for in_flight in [false, true] {
+        let (mut app, ctx, writes) = screenshot_app();
+        let _dir = prepare_revert(&mut app);
+        let (reply, replies) = std::sync::mpsc::channel();
+        app.admit_screenshot(Some("revert-stale.png".into()), reply).unwrap();
+        app.queued_shots[0].1 = 0.0;
+        let mut callback = None;
+        if in_flight {
+            for _ in 0..3 {
+                let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+                if let Some(cb) = screenshot_callback(&mut output) {
+                    callback = Some(cb);
+                }
+            }
+            assert!(callback.is_some(), "the in-flight case must actually issue a capture");
+        }
+        revert_preserving_uid(&mut app);
+        if let Some(callback) = callback {
+            callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
+        }
+        for _ in 0..4 {
+            let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+            assert!(screenshot_callback(&mut output).is_none(), "Revert must not issue or retry an old capture (in_flight={in_flight})");
+        }
+        let reply = replies.try_recv().expect("the replaced document's screenshot receives an error");
+        assert_eq!(reply["ok"], false, "in_flight={in_flight}: {reply}");
+        assert!(reply["error"].as_str().unwrap_or_default().contains("document"));
+        assert!(writes.lock().unwrap().is_empty(), "stale pixels must not be saved");
+        assert!(app.pending_shots.is_empty());
+        assert!(app.queued_shots.is_empty());
+    }
+}
+
+// ---------------------------------------------------------------------------------------
+// Document-generation regressions: reused screenshot slots and buffered native drops must
+// not cross a document/dialog/focus change.
+// ---------------------------------------------------------------------------------------
+
+/// A document switch before issue errors the request and leaves no pending or queued capture.
+#[test]
+fn design_generation_screenshot_switch_before_issue_does_not_capture_the_new_document() {
+    let (mut app, ctx, writes) = screenshot_app();
+    let document_a = app.session.active().unwrap().uid;
+    let (requests, receiver) = std::sync::mpsc::channel();
+    app = app.with_control(receiver);
+    let (reply, replies) = std::sync::mpsc::channel();
+    requests
+        .send(ControlRequest { method: "ui.screenshot".into(), params: json!({"path": "switch-before-issue.png", "focus": false}), reply })
+        .unwrap();
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    assert_eq!(app.pending_shots.len(), 1, "ui.screenshot is admitted");
+    assert_eq!(app.pending_shots[0].geometry.document, document_a);
+    // A menu/control action switches documents before the settling rule issues the capture.
+    app.run("file.new", json!({"title": "handoff-before-issue"})).unwrap();
+    let document_b = app.session.active().unwrap().uid;
+    assert_ne!(document_b, document_a);
+    if let Some(at) = app.queued_shots.first_mut() {
+        at.1 = 0.0;
+    }
+    let mut callback = None;
+    for _ in 0..3 {
+        let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+        if let Some(cb) = screenshot_callback(&mut output) {
+            callback = Some(cb);
+        }
+    }
+    if let Some(callback) = callback {
+        callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
+        shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    }
+    assert!(writes.lock().unwrap().is_empty(), "the switched request must not write a file");
+    let reply = replies.try_recv().expect("the switched request must receive an error receipt");
+    assert_eq!(reply["ok"], false, "the old document's request must not succeed on the new one: {reply}");
+    assert!(reply["error"].as_str().unwrap_or_default().contains("document"), "the error must name the document change: {reply}");
+    assert!(app.pending_shots.is_empty(), "the stale request released its admission");
+    assert!(app.queued_shots.is_empty(), "the stale request left no repaint token");
+}
+
+/// An in-flight old-document capture cannot complete or retry on the new document; the request and tokens are released.
+#[test]
+fn design_generation_screenshot_in_flight_after_switch_does_not_complete_on_the_new_document() {
+    let (mut app, ctx, writes) = screenshot_app();
+    let document_a = app.session.active().unwrap().uid;
+    let (reply, replies) = std::sync::mpsc::channel();
+    app.admit_screenshot(Some("switch-in-flight.png".into()), reply).unwrap();
+    app.queued_shots[0].1 = 0.0;
+    let mut callback = None;
+    for _ in 0..3 {
+        let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+        if let Some(cb) = screenshot_callback(&mut output) {
+            callback = Some(cb);
+        }
+    }
+    let callback = callback.expect("the request is issued on the first document");
+    assert_eq!(app.pending_shots[0].geometry.document, document_a);
+    // The capture is in flight on A when the app switches to B.
+    app.run("file.new", json!({"title": "handoff-in-flight"})).unwrap();
+    assert_ne!(app.session.active().unwrap().uid, document_a);
+    callback.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
+    shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    // Old code retries the stale request on B; follow any retry through a completion so the
+    // regression proves that B never receives the old capture.
+    if let Some(at) = app.queued_shots.first_mut() {
+        at.1 = 0.0;
+    }
+    let mut retried = None;
+    for _ in 0..3 {
+        let mut output = shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+        if let Some(cb) = screenshot_callback(&mut output) {
+            retried = Some(cb);
+        }
+    }
+    if let Some(retried) = retried {
+        retried.complete(std::sync::Arc::new(egui::ColorImage::filled([640, 480], egui::Color32::BLACK)));
+        shot_frame(&mut app, &ctx, egui::vec2(640.0, 480.0));
+    }
+    assert!(writes.lock().unwrap().is_empty(), "the in-flight request must not write a file after the switch");
+    let reply = replies.try_recv().expect("the in-flight request must receive an error receipt");
+    assert_eq!(reply["ok"], false, "the in-flight request must not succeed on the new document: {reply}");
+    assert!(reply["error"].as_str().unwrap_or_default().contains("document"), "the error must name the document change: {reply}");
+    assert!(app.pending_shots.is_empty(), "the stale request released its admission");
+    assert!(app.queued_shots.is_empty(), "the stale request left no repaint token");
+}
+
+/// Admission stamps the current session document, not cached geometry from the previous document.
+#[test]
+fn design_generation_screenshot_admission_uses_the_current_document_not_the_cached_geometry() {
+    let (mut app, _ctx, _writes) = screenshot_app();
+    let document_a = app.session.active().unwrap().uid;
+    // `screenshot_app` populated the geometry cache for A. Switch documents without a frame
+    // between the switch and admission, as two control requests in one logic tick would.
+    app.run("file.new", json!({"title": "admission-current-document"})).unwrap();
+    let document_b = app.session.active().unwrap().uid;
+    assert_ne!(document_b, document_a);
+    let (reply, replies) = std::sync::mpsc::channel();
+    app.admit_screenshot(None, reply).unwrap();
+    assert_eq!(app.pending_shots[0].geometry.document, document_b, "admission must use the current session document, not the last cached geometry");
+    assert!(replies.try_recv().is_err(), "admission alone replies only when it fails");
+    app.pending_shots.clear();
+    app.queued_shots.clear();
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+#[derive(Debug)]
+struct TestDroppedFile(std::path::PathBuf);
+
+#[cfg(not(target_arch = "wasm32"))]
+impl egui::DroppedFile for TestDroppedFile {
+    fn path(&self) -> &std::path::Path {
+        &self.0
+    }
+
+    fn bytes(&self) -> Result<Vec<u8>, String> {
+        std::fs::read(&self.0).map_err(|error| error.to_string())
+    }
+}
+
+/// Wrap a path as an egui dropped-file handle backed by the test type.
+#[cfg(not(target_arch = "wasm32"))]
+fn dropped_file(path: &std::path::Path) -> egui::DroppedFileHandle {
+    std::sync::Arc::new(TestDroppedFile(path.to_path_buf()))
+}
+
+/// Create a screenshot app with a fixed canvas rectangle and an initialized view for drop tests.
+#[cfg(not(target_arch = "wasm32"))]
+fn drop_test_app() -> (DesignApp, egui::Context) {
+    let (mut app, ctx, _writes) = screenshot_app();
+    app.canvas_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 900.0)));
+    let _ = app.view_mut();
+    (app, ctx)
+}
+
+/// Write a tiny unique PNG for drop tests.
+#[cfg(not(target_arch = "wasm32"))]
+fn temporary_png(name: &str) -> std::path::PathBuf {
+    let path = std::env::temp_dir().join(format!("designcraft-ui-{}-{name}.png", std::process::id()));
+    std::fs::write(&path, designcraft_render::Rendered { width: 10, height: 10, pixels: vec![200; 400] }.to_png()).unwrap();
+    path
+}
+
+/// Build visible raw input with a pointer move and dropped-file handles.
+#[cfg(not(target_arch = "wasm32"))]
+fn visible_raw_with_drop(paths: &[&std::path::Path]) -> egui::RawInput {
+    let mut raw = hidden_raw();
+    let viewport = raw.viewports.get_mut(&egui::ViewportId::ROOT).unwrap();
+    viewport.minimized = Some(false);
+    viewport.occluded = Some(false);
+    raw.events.push(egui::Event::PointerMoved(egui::pos2(100.0, 100.0)));
+    raw.dropped_files.extend(paths.iter().map(|path| dropped_file(path)));
+    raw
+}
+
+/// Run one logic-plus-UI frame and discard its texture deltas.
+#[cfg(not(target_arch = "wasm32"))]
+fn run_ui_pass(app: &mut DesignApp, ctx: &egui::Context, raw: egui::RawInput) {
+    ctx.run_ui(raw, |ui| {
+        let ctx = ui.ctx().clone();
+        app.logic(&ctx);
+        app.ui(ui);
+    })
+    .textures_delta
+    .clear();
+}
+
+/// A drop buffered before a document switch cannot add assets to the switched document.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_generation_native_drop_is_discarded_when_the_document_changes_before_ui() {
+    let (mut app, ctx) = drop_test_app();
+    let path = temporary_png("drop-document-change");
+    let mut raw = visible_raw_with_drop(&[&path]);
+    app.raw_input_hook(&ctx, &mut raw);
+    assert!(raw.dropped_files.is_empty(), "raw_input_hook captures the native drop");
+    assert_eq!(app.pending_drops.len(), 1, "the raw drop is buffered for the UI pass");
+    // A menu/control action switches documents before the settled UI pass consumes it.
+    app.run("file.new", json!({"title": "drop-target"})).unwrap();
+    let assets_before = app.session.active().unwrap().doc.assets.len();
+    run_ui_pass(&mut app, &ctx, raw);
+    assert_eq!(app.session.active().unwrap().doc.assets.len(), assets_before, "the stale drop must not land in the switched document");
+    assert!(app.pending_drops.is_empty(), "the discarded drop released its buffer");
+    let _ = std::fs::remove_file(path);
+}
+
+/// A drop buffered before a dialog opens cannot land behind it.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_generation_native_drop_is_discarded_when_a_dialog_opens_before_ui() {
+    let (mut app, ctx) = drop_test_app();
+    let path = temporary_png("drop-dialog-change");
+    let mut raw = visible_raw_with_drop(&[&path]);
+    app.raw_input_hook(&ctx, &mut raw);
+    assert_eq!(app.pending_drops.len(), 1);
+    app.run("app.preferences", json!({})).unwrap();
+    assert!(app.ui.dialog.is_some(), "a real dialog changed the generation");
+    let assets_before = app.session.active().unwrap().doc.assets.len();
+    run_ui_pass(&mut app, &ctx, raw);
+    assert_eq!(app.session.active().unwrap().doc.assets.len(), assets_before, "the stale drop must not land behind the dialog");
+    assert!(app.pending_drops.is_empty(), "the discarded drop released its buffer");
+    let _ = std::fs::remove_file(path);
+}
+
+/// A keyboard-focus change invalidates a buffered drop.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_generation_native_drop_is_discarded_when_focus_changes_before_ui() {
+    let (mut app, ctx) = drop_test_app();
+    let path = temporary_png("drop-focus-change");
+    let mut raw = visible_raw_with_drop(&[&path]);
+    app.raw_input_hook(&ctx, &mut raw);
+    assert_eq!(app.pending_drops.len(), 1);
+    let focus = egui::Id::unique("design-generation-drop-focus");
+    assert_ne!(app.input_generation().focus, Some(focus));
+    ctx.memory_mut(|memory| memory.request_focus(focus));
+    assert_eq!(app.input_generation().focus, Some(focus), "keyboard focus changed after the drop was buffered");
+    let assets_before = app.session.active().unwrap().doc.assets.len();
+    run_ui_pass(&mut app, &ctx, raw);
+    assert_eq!(app.session.active().unwrap().doc.assets.len(), assets_before, "the stale drop must not land after a focus change");
+    assert!(app.pending_drops.is_empty(), "the discarded drop released its buffer");
+    let _ = std::fs::remove_file(path);
+}
+
+/// With no generation change, every dropped file in a batch is placed.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn design_generation_native_drop_batch_without_a_change_still_places_every_file() {
+    let (mut app, ctx) = drop_test_app();
+    let first = temporary_png("drop-batch-a");
+    let second = temporary_png("drop-batch-b");
+    let mut raw = visible_raw_with_drop(&[&first, &second]);
+    app.raw_input_hook(&ctx, &mut raw);
+    assert_eq!(app.pending_drops.len(), 2, "both files were captured from the raw input");
+    let assets_before = app.session.active().unwrap().doc.assets.len();
+    run_ui_pass(&mut app, &ctx, raw);
+    assert_eq!(app.session.active().unwrap().doc.assets.len(), assets_before + 2, "both files in the valid batch are placed");
+    assert!(app.pending_drops.is_empty());
+    let _ = std::fs::remove_file(first);
+    let _ = std::fs::remove_file(second);
+}
diff --git a/crates/ui-egui/src/theme.rs b/crates/ui-egui/src/theme.rs
index 666394e09..846cf2e89 100644
--- a/crates/ui-egui/src/theme.rs
+++ b/crates/ui-egui/src/theme.rs
@@ -269,11 +269,12 @@ pub fn install_fonts(ctx: &egui::Context, lang: &str) -> bool {
     let craft = designcraft_fonts::CRAFT_FONTS;
     let mut defs = font_definitions(craft, lang);
     let system = system_ui_fonts(craft);
-    if let Some(system) = system {
+    let found = system.is_some();
+    if let Some(system) = &system {
         add_system_fallbacks(&mut defs, system, lang);
     }
     ctx.set_fonts(defs);
-    system.is_some()
+    found
 }
 
 /// Whether [`install_fonts`] would find the installed fonts cataloged.
@@ -282,6 +283,7 @@ pub fn system_fonts_ready() -> bool {
 }
 
 /// An installed font the UI falls back to for a script the built-in faces lack.
+#[derive(Clone)]
 pub(crate) struct SystemFont {
     /// The ISO 15924 code of the script it is for ("Jpan", "Kore", "Taml"…).
     script: &'static str,
@@ -350,17 +352,25 @@ const SYSTEM_UI_FONTS: &[(&str, char, &[&str])] = &[
 /// Traditional Chinese (font names in the font menus), Indic, Southeast Asian and other scripts
 /// in any build. egui can't find system fonts itself; the document font scan (not on the web)
 /// does.
-fn system_ui_fonts(craft: &[designcraft_fonts::CraftFont]) -> Option<&'static [SystemFont]> {
+fn system_ui_fonts(craft: &[designcraft_fonts::CraftFont]) -> Option<Vec<SystemFont>> {
     static FACES: std::sync::OnceLock<Vec<SystemFont>> = std::sync::OnceLock::new();
     let db = designcraft_fonts::FontDb::global();
     // Never wait for the font scan here (the first frame): it runs in the background, and the
     // faces are read once, when it is done.
-    // (Tests wait instead, so that the fonts don't change in the middle of one.)
     if !db.system_fonts_cataloged() && !cfg!(test) {
         db.scan_in_background();
         return None;
     }
-    Some(FACES.get_or_init(|| installed_ui_fonts(db, craft)))
+    if cfg!(test) {
+        // Tests install controlled faces in the process-wide database (`testing::font_with`),
+        // so the set cannot be cached across them; a cached empty first call would otherwise
+        // hide every face a later test adds. Cataloging here is a no-op once it is done (the
+        // web has no system fonts).
+        #[cfg(not(target_arch = "wasm32"))]
+        let _ = db.load_system_fonts();
+        return Some(installed_ui_fonts(db, craft));
+    }
+    Some(FACES.get_or_init(|| installed_ui_fonts(db, craft)).to_vec())
 }
 
 /// The faces of [`SYSTEM_UI_FONTS`] that `db` has, for the scripts `craft` doesn't cover.
@@ -375,8 +385,12 @@ fn installed_ui_fonts(db: &designcraft_fonts::FontDb, craft: &[designcraft_fonts
                 return None;
             }
             let face = db.face(family, "Regular");
-            // `face` falls back to another family when this one can't be read: keep only the real one.
-            (face.family.eq_ignore_ascii_case(family) && !face.data().is_empty() && face.covers(*sample)).then_some((family, face))
+            // Keep the requested family, and leave bundled document faces to the craft UI stack.
+            (face.family.eq_ignore_ascii_case(family)
+                && !matches!(&face.source, designcraft_fonts::FontSource::Bundled)
+                && !face.data().is_empty()
+                && face.covers(*sample))
+            .then_some((family, face))
         });
         let Some((family, face)) = found else { continue };
         if !faces.iter().any(|f| f.family.eq_ignore_ascii_case(family)) {
@@ -454,6 +468,11 @@ pub(crate) fn font_definitions(craft: &'static [designcraft_fonts::CraftFont], l
     let add = |fonts: &mut FontDefinitions, name: &str, data: &'static [u8]| {
         fonts.font_data.insert(name.into(), Arc::new(FontData::from_static(data)));
     };
+    // egui's last-resort faces (Ubuntu-Light, egui-icons and, with `monochrome_emoji_fonts`,
+    // NotoEmoji-Regular and emoji-icon-font): every family ends with them so a glyph outside
+    // the requested face and the script faces (☰, ⚠, 📋) is not tofu. Captured before the
+    // interface face is added.
+    let last_resort: Vec<String> = fonts.families.get(&FontFamily::Proportional).cloned().unwrap_or_default();
     add(&mut fonts, "ui", include_bytes!("../../../assets/fonts/SourceSans3-Regular.ttf"));
     add(&mut fonts, "ui-semibold", include_bytes!("../../../assets/fonts/SourceSans3-Semibold.ttf"));
     add(&mut fonts, "mono", include_bytes!("../../../assets/fonts/JetBrainsMono-Regular.ttf"));
@@ -467,12 +486,15 @@ pub(crate) fn font_definitions(craft: &'static [designcraft_fonts::CraftFont], l
     let chinese = pick("Hans");
     let arabic = pick("Arab");
     let georgian = pick("Geor");
+    // The manifest can add scripts without a special UI preference order (Hebrew, Devanagari,
+    // ...). They still need installing: system fallback discovery skips scripts supplied here.
+    let other: Vec<_> = craft.iter().filter(|f| !["Jpan", "Hans", "Arab", "Geor"].iter().any(|s| f.scripts.contains(s))).collect();
     let name = |f: &designcraft_fonts::CraftFont| format!("craft-{}-{}", f.family, f.style);
     for f in japanese.iter().chain(&chinese) {
         // CJK faces sit on the Latin baseline (see `baseline_tweak`).
         fonts.font_data.insert(name(f), Arc::new(FontData { tweak: baseline_tweak(f.bytes, 0), ..FontData::from_static(f.bytes) }));
     }
-    for f in arabic.iter().chain(&georgian) {
+    for f in arabic.iter().chain(&georgian).chain(&other) {
         add(&mut fonts, &name(f), f.bytes);
     }
     // Han characters take the forms of the interface language: Chinese faces first for Chinese.
@@ -484,16 +506,25 @@ pub(crate) fn font_definitions(craft: &'static [designcraft_fonts::CraftFont], l
             ja.sort_by_key(|f| (f.family != "BIZ UDPGothic", f.style != "Bold"));
         }
         let (first, second) = if zh { (&chinese, &ja) } else { (&ja, &chinese) };
-        stack.extend(first.iter().chain(second).chain(&arabic).chain(&georgian).map(|f| name(f)));
+        stack.extend(first.iter().chain(second).chain(&arabic).chain(&georgian).chain(&other).map(|f| name(f)));
     }
-    // Arabic runs (rtl.rs): the Arabic face first, so letters and spaces shape as one run.
+    // A bold label keeps every icon/emoji glyph the regular one has: the semibold family ends
+    // with the same last-resort faces, after the script faces.
+    if let Some(stack) = fonts.families.get_mut(&FontFamily::Name("semibold".into())) {
+        stack.extend(last_resort.iter().cloned());
+    }
+    // Arabic runs: the Arabic face first, so letters and spaces shape as one run. These families
+    // keep every other family's fallbacks (the interface faces, the CJK, Arabic and Georgian
+    // script faces, then egui's last-resort icon/emoji faces) so Latin, symbols and emoji inside
+    // Arabic text are not tofu.
     for family in ["arabic", "arabic-semibold"] {
         let ui = if family == "arabic" { "ui" } else { "ui-semibold" };
         let stack = arabic
             .iter()
             .map(|f| name(f))
             .chain([ui.to_string(), "ui".to_string()])
-            .chain(japanese.iter().chain(&chinese).chain(&georgian).map(|f| name(f)));
+            .chain(japanese.iter().chain(&chinese).chain(&georgian).chain(&other).map(|f| name(f)))
+            .chain(last_resort.iter().cloned());
         let mut seen = std::collections::HashSet::new();
         fonts.families.insert(FontFamily::Name(family.into()), stack.filter(|n| seen.insert(n.clone())).collect());
     }
@@ -572,6 +603,26 @@ mod japanese_font_tests {
         ctx
     }
 
+    /// A newly supplied script must remain usable without any matching installed system font.
+    /// Previously craft's script coverage suppressed system discovery while these faces were
+    /// omitted from the actual UI font definitions, so a Hebrew tab panicked on its first glyph.
+    #[test]
+    fn additional_craft_scripts_render_in_every_ui_family() {
+        let bytes = Box::leak(designcraft_fonts::testing::font_with("DC extra scripts", &['ד', 'क']).unwrap().into_boxed_slice());
+        let craft = Box::leak(
+            vec![designcraft_fonts::CraftFont { family: "DC extra scripts", style: "Regular", scripts: &["Hebr", "Deva"], bytes }].into_boxed_slice(),
+        );
+        let ctx = ctx_with(craft);
+        ctx.fonts_mut(|fonts| {
+            for family in families().into_iter().chain([egui::FontFamily::Name("arabic".into()), egui::FontFamily::Name("arabic-semibold".into())]) {
+                let font = egui::FontId::new(13.0, family);
+                assert!(fonts.has_glyph(&font, 'ד') && fonts.has_glyph(&font, 'क'), "missing supplied script in {font:?}");
+                let galley = fonts.layout_no_wrap("דक".into(), font, egui::Color32::WHITE);
+                assert!(galley.size().x > 0.0 && galley.rect.is_finite());
+            }
+        });
+    }
+
     #[test]
     fn japanese_ui_glyphs_are_available_in_every_family() {
         if designcraft_fonts::CRAFT_FONTS.is_empty() {
@@ -766,9 +817,9 @@ mod ukrainian_font_tests {
         for (name, family, style) in
             [("ui", "Source Sans 3", "Regular"), ("ui-semibold", "Source Sans 3", "Semibold"), ("mono", "JetBrains Mono", "Regular")]
         {
-            let data = &definitions.font_data[name].font;
+            let data = definitions.font_data[name].bytes();
             let face = db.face(family, style);
-            assert_eq!(face.data(), data.as_ref(), "configured UI face {name}");
+            assert_eq!(face.data(), data, "configured UI face {name}");
             for character in &characters {
                 assert_ne!(face.glyph_for(*character), 0, "missing {character} in {name}");
             }
@@ -793,9 +844,9 @@ mod russian_font_tests {
         for (name, family, style) in
             [("ui", "Source Sans 3", "Regular"), ("ui-semibold", "Source Sans 3", "Semibold"), ("mono", "JetBrains Mono", "Regular")]
         {
-            let data = &definitions.font_data[name].font;
+            let data = definitions.font_data[name].bytes();
             let face = db.face(family, style);
-            assert_eq!(face.data(), data.as_ref(), "configured UI face {name}");
+            assert_eq!(face.data(), data, "configured UI face {name}");
             for character in &characters {
                 assert_ne!(face.glyph_for(*character), 0, "missing {character} in {name}");
             }
diff --git a/crates/ui-egui/src/title_bar.rs b/crates/ui-egui/src/title_bar.rs
deleted file mode 100644
index a369fa9fb..000000000
--- a/crates/ui-egui/src/title_bar.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-//! The application bar as the window's title bar (macOS): an empty part of it moves the window
-//! when dragged and follows the system's title-bar double-click setting.
-//!
-//! The window has a full-size content view, so AppKit hands every click in the title-bar band to
-//! the app (that is how the bar's own controls work) and does not zoom the window. It does move
-//! the window when a drag starts anywhere in the band, on the bar's controls too, unless the
-//! window is not movable. [`window_movable`] tells the macOS shell when the pointer is on a
-//! control, so it can switch that off before the press.
-
-use std::sync::{Once, OnceLock};
-
-/// System Settings › Desktop & Dock › "Double-click a window's title bar to".
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum DoubleClick {
-    Zoom,
-    Minimize,
-    Nothing,
-}
-
-/// The value of the global default `AppleActionOnDoubleClick`, as `defaults read` prints it.
-/// Anything other than "Minimize" or "None" zooms, the macOS default ("Maximize"; macOS 15 adds
-/// "Fill", which zooming comes closest to).
-pub fn parse(defaults_output: &str) -> DoubleClick {
-    match defaults_output.trim() {
-        "Minimize" => DoubleClick::Minimize,
-        "None" => DoubleClick::Nothing,
-        _ => DoubleClick::Zoom,
-    }
-}
-
-static ACTION: OnceLock<DoubleClick> = OnceLock::new();
-static READ: Once = Once::new();
-
-/// Starts reading the system setting on a background thread, once per run.
-fn prefetch() {
-    READ.call_once(|| {
-        #[cfg(all(target_os = "macos", not(test)))]
-        {
-            // No thread, no setting: the bar zooms.
-            let _ = std::thread::Builder::new().name("title-bar-setting".into()).spawn(|| {
-                let action = match std::process::Command::new("/usr/bin/defaults").args(["read", "-g", "AppleActionOnDoubleClick"]).output() {
-                    Ok(out) if out.status.success() => parse(&String::from_utf8_lossy(&out.stdout)),
-                    // Absent (never changed) or unreadable: the default.
-                    _ => DoubleClick::Zoom,
-                };
-                let _ = ACTION.set(action);
-            });
-        }
-    });
-}
-
-/// The system setting; zoom until it has been read.
-pub fn action() -> DoubleClick {
-    ACTION.get().copied().unwrap_or(DoubleClick::Zoom)
-}
-
-/// What a double-click on the empty title bar asks of the window.
-pub fn double_click_command(action: DoubleClick, maximized: bool) -> Option<egui::ViewportCommand> {
-    match action {
-        DoubleClick::Zoom => Some(egui::ViewportCommand::Maximized(!maximized)),
-        DoubleClick::Minimize => Some(egui::ViewportCommand::Minimized(true)),
-        DoubleClick::Nothing => None,
-    }
-}
-
-/// Makes the empty part of `rect` act as a title bar. Call it before drawing the bar's controls:
-/// they sit on top and take their own clicks.
-///
-/// The area senses clicks only. A drag-sensing background would also receive drags that start
-/// on a click-only control (egui gives clicks and drags to different widgets), so a drag is
-/// detected here as a press on the empty area that has stopped being a click.
-pub fn empty_area(ui: &mut egui::Ui, rect: egui::Rect) {
-    prefetch();
-    let resp = ui.interact(rect, ui.id().with("title_bar_empty"), egui::Sense::click());
-    // A control in this layer covers the empty area under the pointer. Another layer on top (a
-    // modal's backdrop, a tooltip) leaves the window movable, as AppKit's own title bar would be.
-    let on_control =
-        ui.ctx().pointer_hover_pos().is_some_and(|p| rect.contains(p) && ui.ctx().layer_id_at(p) == Some(ui.layer_id())) && !resp.hovered();
-    let pass = ui.ctx().cumulative_pass_nr();
-    ui.data_mut(|d| d.insert_temp(movable_id(), (pass, !on_control)));
-    if resp.double_clicked() {
-        let maximized = ui.input(|i| i.viewport().maximized).unwrap_or(false);
-        if let Some(cmd) = double_click_command(action(), maximized) {
-            ui.ctx().send_viewport_cmd(cmd);
-        }
-    }
-    // egui forgets which widget a press landed on once it can no longer be a click, so the press
-    // is remembered (by its start time) while it still can.
-    let armed = resp.id.with("drag_press");
-    let press = ui.input(|i| i.pointer.press_start_time());
-    if resp.is_pointer_button_down_on() {
-        ui.data_mut(|d| d.insert_temp(armed, press));
-    }
-    if press.is_some() && ui.input(|i| i.pointer.is_decidedly_dragging()) && ui.data(|d| d.get_temp::<Option<f64>>(armed)) == Some(press) {
-        // Once per press: AppKit's drag loop takes the mouse-up, so egui may still see the button
-        // down afterwards.
-        ui.data_mut(|d| d.remove::<Option<f64>>(armed));
-        ui.ctx().send_viewport_cmd(egui::ViewportCommand::StartDrag);
-    }
-}
-
-fn movable_id() -> egui::Id {
-    egui::Id::new("title_bar_window_movable")
-}
-
-/// Whether AppKit may move the window when a drag starts in the title-bar band: false while the
-/// pointer is on one of the bar's controls, so pressing and dragging it does not move the window.
-/// True when neither this pass nor the one before drew a title bar.
-pub fn window_movable(ctx: &egui::Context) -> bool {
-    match ctx.data(|d| d.get_temp::<(u64, bool)>(movable_id())) {
-        Some((pass, movable)) if ctx.cumulative_pass_nr().saturating_sub(pass) <= 1 => movable,
-        _ => true,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn parses_the_defaults_output() {
-        assert_eq!(parse("Maximize\n"), DoubleClick::Zoom);
-        assert_eq!(parse("Minimize\n"), DoubleClick::Minimize);
-        assert_eq!(parse("None\n"), DoubleClick::Nothing);
-        for junk in ["", "Fill", "minimize", "1", "The domain/default pair of (kCFPreferencesAnyApplication, X) does not exist"] {
-            assert_eq!(parse(junk), DoubleClick::Zoom, "{junk:?}");
-        }
-    }
-
-    #[test]
-    fn zoom_toggles_and_minimize_minimizes() {
-        use egui::ViewportCommand::{Maximized, Minimized};
-        assert_eq!(double_click_command(DoubleClick::Zoom, false), Some(Maximized(true)));
-        assert_eq!(double_click_command(DoubleClick::Zoom, true), Some(Maximized(false)));
-        assert_eq!(double_click_command(DoubleClick::Minimize, false), Some(Minimized(true)));
-        assert_eq!(double_click_command(DoubleClick::Nothing, true), None);
-    }
-}
diff --git a/crates/ui-egui/src/toolbar.rs b/crates/ui-egui/src/toolbar.rs
index 6b7d2c1c2..4c6965ffc 100644
--- a/crates/ui-egui/src/toolbar.rs
+++ b/crates/ui-egui/src/toolbar.rs
@@ -15,7 +15,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     let frame = egui::Frame::NONE.fill(t.panel).stroke(Stroke::new(1.0, t.divider));
     // A single column that doesn't fit the window's height becomes two, without changing the
     // preference; whatever two columns still can't fit scrolls.
-    let single_h_id = egui::Id::new("tools_single_column_height");
+    let single_h_id = egui::Id::unique("tools_single_column_height");
     let single_h: Option<f32> = ui.data(|d| d.get_temp(single_h_id));
     let viewport_h = ui.available_height() - frame.total_margin().sum().y;
     let crowded = !app.ui.tools_double_column && single_h.is_some_and(|h| h > viewport_h);
@@ -84,7 +84,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                                 let shown = g.iter().find(|tl| tl.id == current).unwrap_or(&g[0]);
                                 let active = g.iter().any(|tl| tl.id == current);
                                 let name = crate::i18n::tr(&app.ui.language, shown.label);
-                                let tip = match shown.shortcut {
+                                let tip = match crate::menus::tool_shortcut_label(app, shown.id) {
                                     Some(s) => format!("{name} ({s})"),
                                     None => name.to_string(),
                                 };
@@ -101,7 +101,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                                 }
                                 // The release that ends a hold which opened the flyout isn't a click
                                 // on the tool (egui reports releases within 0.8 s as clicks).
-                                let hold_id = egui::Id::new(("flyout_hold", gi));
+                                let hold_id = egui::Id::unique(("flyout_hold", gi));
                                 let ended_hold = resp.clicked() && ui.data_mut(|d| d.remove_temp::<bool>(hold_id)).unwrap_or(false);
                                 if resp.clicked() && !ended_hold {
                                     chosen = Some(shown.id);
@@ -131,7 +131,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                                 }
                                 if app.ui.flyout == Some(gi) {
                                     let pos = resp.rect.right_top() + vec2(4.0, 0.0);
-                                    egui::Area::new(egui::Id::new(("flyout", gi))).order(egui::Order::Foreground).fixed_pos(pos).show(
+                                    egui::Area::new(egui::Id::unique(("flyout", gi))).order(egui::Order::Foreground).fixed_pos(pos).show(
                                         ui.ctx(),
                                         |ui| {
                                             egui::Frame::popup(ui.style()).show(ui, |ui| {
@@ -157,7 +157,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                                                             egui::FontId::proportional(12.5),
                                                             t.text,
                                                         );
-                                                        if let Some(sc) = tl.shortcut {
+                                                        if let Some(sc) = crate::menus::tool_shortcut_label(app, tl.id) {
                                                             ui.painter().text(
                                                                 r.right_center() - vec2(6.0, 0.0),
                                                                 egui::Align2::RIGHT_CENTER,
@@ -166,7 +166,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                                                                 t.text_dim,
                                                             );
                                                         }
-                                                        row.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, tl.label));
+                                                        row.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, tl.label));
                                                         if row.clicked() {
                                                             chosen = Some(tl.id);
                                                         }
@@ -195,7 +195,7 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
                 && chosen.is_none()
                 && !opened_now
             {
-                let area = ui.ctx().memory(|m| m.area_rect(egui::Id::new(("flyout", gi))));
+                let area = ui.ctx().memory(|m| m.area_rect(egui::Id::unique(("flyout", gi))));
                 let outside = ui.input(|i| i.pointer.any_pressed() && i.pointer.interact_pos().is_some_and(|p| area.is_none_or(|a| !a.contains(p))));
                 let esc = ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape));
                 if outside || esc {
@@ -219,6 +219,33 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
     }
 }
 
+/// Row 1 of the proxy: the default-colours and swap buttons.
+fn proxy_default_swap(app: &mut DesignApp, ui: &mut egui::Ui, t: &Tokens, x0: f32, width: f32) {
+    let (row, _) = ui.allocate_exact_size(vec2(width, 11.0), Sense::hover());
+    let def = egui::Rect::from_min_size(egui::pos2(x0, row.min.y), vec2(10.0, 10.0));
+    icons::paint(ui.painter(), def, "default-colors", t.icon);
+    if ui
+        .interact(def, ui.scope_id().with("proxy_default"), Sense::click())
+        .on_hover_ui(|ui| {
+            crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Default Fill and Stroke (D)"));
+        })
+        .clicked()
+    {
+        let _ = app.run("color.defaultFillStroke", json!({}));
+    }
+    let swap = egui::Rect::from_min_size(egui::pos2(x0 + 19.0, row.min.y), vec2(11.0, 11.0));
+    icons::paint(ui.painter(), swap, "swap", t.icon);
+    if ui
+        .interact(swap, ui.scope_id().with("proxy_swap_btn"), Sense::click())
+        .on_hover_ui(|ui| {
+            crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Swap Fill and Stroke (Shift+X)"));
+        })
+        .clicked()
+    {
+        let _ = app.run("color.swapFillStroke", json!({}));
+    }
+}
+
 /// The area under the tools (InDesign 2026 §3 group 5): mini Default Fill/Stroke and Swap, the
 /// overlapping Fill/Stroke proxy, Formatting affects container / text, the Apply None well, a
 /// utility button and the Screen Mode well.
@@ -236,30 +263,7 @@ fn fill_stroke_proxy(app: &mut DesignApp, ui: &mut egui::Ui, width: f32, cols: u
             .map_or(("[None]".to_string(), "[Black]".to_string()), |d| (d.settings.new_object.fill.clone(), d.settings.new_object.stroke.clone())),
     };
     let x0 = ui.max_rect().min.x + (width - 30.0) / 2.0;
-    // Row 1: default colours + swap.
-    let (row, _) = ui.allocate_exact_size(vec2(width, 11.0), Sense::hover());
-    let def = egui::Rect::from_min_size(egui::pos2(x0, row.min.y), vec2(10.0, 10.0));
-    icons::paint(ui.painter(), def, "default-colors", t.icon);
-    if ui
-        .interact(def, ui.id().with("proxy_default"), Sense::click())
-        .on_hover_ui(|ui| {
-            crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Default Fill and Stroke (D)"));
-        })
-        .clicked()
-    {
-        let _ = app.run("color.defaultFillStroke", json!({}));
-    }
-    let swap = egui::Rect::from_min_size(egui::pos2(x0 + 19.0, row.min.y), vec2(11.0, 11.0));
-    icons::paint(ui.painter(), swap, "swap", t.icon);
-    if ui
-        .interact(swap, ui.id().with("proxy_swap_btn"), Sense::click())
-        .on_hover_ui(|ui| {
-            crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Swap Fill and Stroke (Shift+X)"));
-        })
-        .clicked()
-    {
-        let _ = app.run("color.swapFillStroke", json!({}));
-    }
+    proxy_default_swap(app, ui, &t, x0, width);
     ui.add_space(2.0);
     // Proxy: 19.5 pt squares, fill top-left, stroke bottom-right.
     let (r, _) = ui.allocate_exact_size(vec2(width, 31.0), Sense::hover());
@@ -297,15 +301,15 @@ fn fill_stroke_proxy(app: &mut DesignApp, ui: &mut egui::Ui, width: f32, cols: u
         paint_fill(p);
     }
     let fill_tip = crate::i18n::tr(&app.ui.language, "Fill (X)");
-    let fresp = ui.interact(fill_r, ui.id().with("proxy_fill"), Sense::click()).on_hover_ui(|ui| {
+    let fresp = ui.interact(fill_r, ui.scope_id().with("proxy_fill"), Sense::click()).on_hover_ui(|ui| {
         crate::rtl::label(ui, fill_tip);
     });
-    fresp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, fill_tip));
+    fresp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, fill_tip));
     let stroke_tip = crate::i18n::tr(&app.ui.language, "Stroke (X)");
-    let sresp = ui.interact(stroke_r.translate(vec2(0.0, 0.0)), ui.id().with("proxy_stroke"), Sense::click()).on_hover_ui(|ui| {
+    let sresp = ui.interact(stroke_r.translate(vec2(0.0, 0.0)), ui.scope_id().with("proxy_stroke"), Sense::click()).on_hover_ui(|ui| {
         crate::rtl::label(ui, stroke_tip);
     });
-    sresp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, stroke_tip));
+    sresp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, stroke_tip));
     if fresp.clicked() || sresp.clicked() {
         let front =
             if stroke_front { !fresp.clicked() } else { sresp.clicked() && !fill_r.contains(sresp.interact_pointer_pos().unwrap_or_default()) };
@@ -334,7 +338,7 @@ fn fill_stroke_proxy(app: &mut DesignApp, ui: &mut egui::Ui, width: f32, cols: u
         }
         icons::paint(ui.painter(), r.shrink(1.5), icon, if on { t.text_strong } else { t.icon });
         if ui
-            .interact(r, ui.id().with(("proxy_fmt", k)), Sense::click())
+            .interact(r, ui.scope_id().with(("proxy_fmt", k)), Sense::click())
             .on_hover_ui(|ui| {
                 crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, tip));
             })
@@ -373,8 +377,8 @@ fn fill_stroke_proxy(app: &mut DesignApp, ui: &mut egui::Ui, width: f32, cols: u
         for (k, (tip, id)) in applies.into_iter().enumerate() {
             let c = egui::pos2(row.min.x + width / 2.0 + (k as f32 - 1.0) * pitch, row.center().y);
             let r = egui::Rect::from_center_size(c, vec2(18.0, 18.0));
-            let resp = ui.interact(r, ui.id().with(("proxy_apply", k)), Sense::click());
-            resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, crate::i18n::tr(&app.ui.language, tip)));
+            let resp = ui.interact(r, ui.scope_id().with(("proxy_apply", k)), Sense::click());
+            resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, crate::i18n::tr(&app.ui.language, tip)));
             if k == front_kind {
                 ui.painter().rect(r, 2.0, t.well, Stroke::new(1.0, t.well_rim), StrokeKind::Outside);
             }
@@ -391,8 +395,8 @@ fn fill_stroke_proxy(app: &mut DesignApp, ui: &mut egui::Ui, width: f32, cols: u
     } else {
         let well = egui::Rect::from_center_size(egui::pos2(row.min.x + width / 2.0, row.center().y), vec2(28.0, 21.0));
         let (tip, id) = applies[front_kind];
-        let resp = ui.interact(well, ui.id().with("proxy_apply"), Sense::click());
-        resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, crate::i18n::tr(&app.ui.language, tip)));
+        let resp = ui.interact(well, ui.scope_id().with("proxy_apply"), Sense::click());
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, crate::i18n::tr(&app.ui.language, tip)));
         let resp = resp.on_hover_ui(|ui| {
             crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, tip));
         });
@@ -432,7 +436,7 @@ fn fill_stroke_proxy(app: &mut DesignApp, ui: &mut egui::Ui, width: f32, cols: u
                 }
                 let on = crate::menus::checked(app, id, &Value::Null).unwrap_or(false);
                 let label = VIEW_OPTIONS[k];
-                let sc = crate::menus::ui_label(id).and_then(|c| c.1).unwrap_or("");
+                let sc = crate::menus::shortcut_label(app, id, &Value::Null).unwrap_or_default();
                 let text = format!("{}  {}", if on { "✓" } else { "   " }, crate::i18n::tr(&app.ui.language, label));
                 if ui.add(egui::Button::new(crate::rtl::widget(ui, &text)).shortcut_text(sc)).clicked() {
                     let _ = app.run(id, json!({}));
@@ -460,13 +464,13 @@ fn fill_stroke_proxy(app: &mut DesignApp, ui: &mut egui::Ui, width: f32, cols: u
         flyout_triangle(ui.painter(), other, t.icon);
         let tr = |s: &str| crate::i18n::tr(&app.ui.language, s).to_string();
         let (normal_tip, other_tip) = (tr("Normal"), format!("{} (W)", tr("Preview")));
-        let resp = ui.interact(normal, ui.id().with("screen_normal"), Sense::click());
-        resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &normal_tip));
+        let resp = ui.interact(normal, ui.scope_id().with("screen_normal"), Sense::click());
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &normal_tip));
         if resp.on_hover_text(&normal_tip).clicked() {
             let _ = app.run("view.screenMode", json!({"mode": "normal"}));
         }
-        let resp = ui.interact(other, ui.id().with("screen_mode"), Sense::click());
-        resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, &other_tip));
+        let resp = ui.interact(other, ui.scope_id().with("screen_mode"), Sense::click());
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &other_tip));
         let resp = resp.on_hover_text(&other_tip);
         if resp.clicked() {
             let _ = app.run("view.screenMode", json!({"mode": "preview"}));
@@ -482,7 +486,7 @@ fn fill_stroke_proxy(app: &mut DesignApp, ui: &mut egui::Ui, width: f32, cols: u
         return;
     }
     let well = egui::Rect::from_center_size(egui::pos2(row.min.x + width / 2.0, row.center().y), vec2(28.0, 21.0));
-    let resp = ui.interact(well, ui.id().with("screen_mode"), Sense::click());
+    let resp = ui.interact(well, ui.scope_id().with("screen_mode"), Sense::click());
     ui.painter().rect(well, 2.0, t.well, Stroke::new(1.0, t.well_rim), StrokeKind::Outside);
     let preview = mode == crate::ScreenMode::Preview;
     icons::paint(
@@ -550,7 +554,7 @@ fn tool_button(ui: &mut egui::Ui, icon: &str, active: bool, tip: &str) -> egui::
     }
     icons::paint(ui.painter(), egui::Rect::from_center_size(r.center(), egui::vec2(17.0, 17.0)), icon, if active { t.text_strong } else { t.icon });
     let enabled = ui.is_enabled();
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, enabled, tip));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, enabled, tip));
     resp.on_hover_ui(|ui| {
         crate::rtl::label(ui, tip);
     })
@@ -616,388 +620,7 @@ pub(crate) fn apply_none(app: &mut DesignApp) -> Result<Value, String> {
 }
 
 #[cfg(test)]
-mod tests {
-    use egui::{pos2, vec2};
-    use egui_kittest::kittest::Queryable;
-
-    use crate::test_window::{self, wheel};
-
-    /// The last tool group's button and the Fill proxy, near the bottom of the panel.
-    const LAST_TOOL: &str = "Zoom Tool (Z)";
-    const FILL: &str = "Fill (X)";
-    /// Status bar height: the Tools panel ends above it.
-    const STATUS_H: f32 = 17.0;
-
-    fn app(double: bool) -> crate::DesignApp {
-        let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        app.ui.tools_double_column = double;
-        app
-    }
-
-    fn column_width(cols: f32) -> f32 {
-        8.0 + super::BTN * cols + 4.0 * (cols - 1.0) + 8.0
-    }
-
-    fn rect(h: &egui_kittest::Harness<'static, test_window::Window>, label: &str) -> egui::Rect {
-        h.get_by_label(label).rect()
-    }
-
-    /// As InDesign's: a tool group's flyout closes on Esc and on a click outside it (the fill
-    /// swatch, a panel), not only on the canvas.
-    #[test]
-    fn a_tool_flyout_closes_on_escape_and_on_a_click_elsewhere() {
-        use egui::{Event, Modifiers, PointerButton};
-        use egui_kittest::kittest::Queryable;
-        let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let mut h = crate::test_window::open(app, vec2(1400.0, 900.0));
-        let open = |h: &mut egui_kittest::Harness<'static, crate::test_window::Window>| {
-            let at = h.get_by_label("Rectangle Frame Tool (F)").rect().center();
-            h.input_mut().events.push(Event::PointerMoved(at));
-            for pressed in [true, false] {
-                h.input_mut().events.push(Event::PointerButton { pos: at, button: PointerButton::Secondary, pressed, modifiers: Modifiers::NONE });
-            }
-            h.run_steps(3);
-            assert!(h.state().app.ui.flyout.is_some(), "a right-click opens the flyout");
-            let _ = h.get_by_label("Ellipse Frame Tool");
-        };
-        open(&mut h);
-        h.key_press(egui::Key::Escape);
-        h.run_steps(2);
-        assert!(h.state().app.ui.flyout.is_none(), "Esc closes it");
-        // A click on a panel closes it.
-        open(&mut h);
-        crate::test_window::click_at(&mut h, egui::pos2(1300.0, 700.0));
-        assert!(h.state().app.ui.flyout.is_none(), "a click elsewhere closes it");
-        // Choosing a tool in it closes it and selects the tool.
-        open(&mut h);
-        h.get_by_label("Ellipse Frame Tool").click();
-        h.run_steps(3);
-        assert_eq!((h.state().app.session.tool_id(), h.state().app.ui.flyout), ("ellipseFrame", None));
-    }
-
-    /// A flyout opened by holding the group button stays open after the release, and Esc closes
-    /// it without switching the active tool.
-    #[test]
-    fn a_tool_flyout_opened_by_holding_stays_open_and_esc_keeps_the_tool() {
-        use egui::{Event, Modifiers, PointerButton};
-        use egui_kittest::kittest::Queryable;
-        let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
-        let mut h = crate::test_window::open_stepped(app, vec2(1400.0, 900.0), 1.0, 1.0 / 60.0);
-        h.state_mut().app.select_tool("rectangleFrame");
-        h.run_steps(2);
-        let at = h.get_by_label("Rectangle Frame Tool (F)").rect().center();
-        h.input_mut().events.push(Event::PointerMoved(at));
-        h.input_mut().events.push(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-        // Held for half a second: shorter than egui's longest click.
-        h.run_steps(30);
-        assert!(h.state().app.ui.flyout.is_some(), "holding opens the flyout");
-        h.input_mut().events.push(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-        h.run_steps(3);
-        assert!(h.state().app.ui.flyout.is_some(), "the release keeps it open");
-        h.key_press(egui::Key::Escape);
-        h.run_steps(2);
-        assert_eq!((h.state().app.session.tool_id(), h.state().app.ui.flyout), ("rectangleFrame", None));
-    }
-
-    #[test]
-    fn a_short_window_reaches_every_tool() {
-        for double in [false, true] {
-            let (w, ht) = (1000.0, 500.0);
-            let mut h = test_window::open(app(double), vec2(w, ht));
-            let panel = test_window::panel_rect(&h, "tools");
-            wheel(&mut h, panel.center(), vec2(0.0, -2000.0));
-            let visible = egui::Rect::from_min_max(pos2(0.0, panel.min.y), pos2(w, ht - STATUS_H));
-            for label in [LAST_TOOL, FILL] {
-                let r = rect(&h, label);
-                assert!(visible.contains_rect(r), "double column {double}: {label} at {r:?} is outside {visible:?}");
-            }
-            assert_eq!(h.state().app.ui.tools_double_column, double, "the preference is the user's");
-        }
-    }
-
-    #[test]
-    fn tools_take_two_columns_while_one_does_not_fit() {
-        let (w, ht) = (1086.0, 612.0);
-        let mut h = test_window::open(app(false), vec2(w, ht));
-        assert_eq!(test_window::panel_rect(&h, "tools").width(), column_width(2.0));
-        let visible = egui::Rect::from_min_max(pos2(0.0, 0.0), pos2(w, ht - STATUS_H));
-        for label in [LAST_TOOL, FILL] {
-            let r = rect(&h, label);
-            assert!(visible.contains_rect(r), "{label} at {r:?} is outside {visible:?} without scrolling");
-        }
-        assert!(!h.state().app.ui.tools_double_column);
-        // A taller window brings the single column back.
-        h.set_size(vec2(1400.0, 900.0));
-        h.run_steps(4);
-        assert_eq!(test_window::panel_rect(&h, "tools").width(), column_width(1.0));
-        assert!(!h.state().app.ui.tools_double_column);
-    }
-
-    /// Runs `app` in a window and double-clicks the Tools panel's Fill box.
-    fn double_click_fill(app: crate::DesignApp) -> egui_kittest::Harness<'static, crate::DesignApp> {
-        // Frames 1 ms apart, so two clicks make a double-click.
-        let mut h = egui_kittest::Harness::builder().with_size(vec2(1400.0, 900.0)).with_step_dt(0.001).build_ui_state(
-            |ui, app: &mut crate::DesignApp| {
-                let ctx = ui.ctx().clone();
-                app.logic(&ctx);
-                app.ui(ui);
-            },
-            app,
-        );
-        h.run_steps(6);
-        let at = h.get_by_label(FILL).rect().center();
-        h.hover_at(at);
-        h.step();
-        for pressed in [true, false, true, false] {
-            h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
-            h.step();
-        }
-        h.run_steps(3);
-        h
-    }
-
-    #[test]
-    fn double_clicking_the_fill_box_opens_the_color_picker_with_the_selections_colour() {
-        let mut app = app(false);
-        app.run("file.new", serde_json::json!({})).unwrap();
-        let id = app.run("frame.create", serde_json::json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].clone();
-        app.run("object.color", serde_json::json!({"color": "#456daf", "ids": [id]})).unwrap();
-        app.run("selection.set", serde_json::json!({"ids": [id]})).unwrap();
-        let h = double_click_fill(app);
-        let d = h.state().ui.dialog.clone().expect("the Color Picker opened");
-        assert_eq!(d.id, "colorPicker");
-        assert_eq!((d.fields["target"].as_str(), d.fields["hex"].as_str()), (Some("fill"), Some("#456daf")), "{:?}", d.fields);
-    }
-
-    /// With Formatting Affects Text on and a text frame selected, the picker opened from the Fill
-    /// box colours the frame's text, not the frame.
-    #[test]
-    fn the_color_picker_from_the_fill_box_follows_formatting_affects_text() {
-        let mut app = app(false);
-        app.run("file.new", serde_json::json!({})).unwrap();
-        let r = app.run("frame.create", serde_json::json!({"rect": [72, 72, 300, 200], "content": "text", "text": "words", "caret": false})).unwrap();
-        let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
-        app.run("selection.set", serde_json::json!({"ids": [id.0]})).unwrap();
-        app.ui.formatting_affects_text = true;
-        let mut h = double_click_fill(app);
-        let app = h.state_mut();
-        let d = app.ui.dialog.as_mut().expect("the Color Picker opened");
-        assert_eq!(d.fields["text"], true, "{:?}", d.fields);
-        // What the picker's fields hold after #456daf is typed.
-        for (k, v) in [("hex", serde_json::json!("#456daf")), ("rgb", serde_json::json!([0x45, 0x6d, 0xaf])), ("model", serde_json::json!("rgb"))] {
-            d.fields.insert(k.into(), v);
-        }
-        d.fields.insert("edited".into(), serde_json::json!(true));
-        crate::dialogs::confirm(app).unwrap();
-        let st = app.session.active().unwrap();
-        let it = st.doc.item(id).unwrap();
-        assert_eq!(it.fill.swatch, "[None]", "the frame keeps its fill");
-        let story = st.doc.stories.values().find(|s| s.text.starts_with("words")).unwrap();
-        let fill = story.runs().next().unwrap().1.over.fill.clone().expect("the text has a fill");
-        let rgb = st.doc.resolve_color(&fill, 1.0).unwrap().to_rgb();
-        assert!((rgb[0] - 0x45 as f32 / 255.0).abs() < 0.01 && (rgb[2] - 0xaf as f32 / 255.0).abs() < 0.01, "{rgb:?}");
-    }
-
-    #[test]
-    fn a_tall_window_keeps_one_column_and_does_not_scroll() {
-        let mut h = test_window::open(app(false), vec2(1400.0, 900.0));
-        let panel = test_window::panel_rect(&h, "tools");
-        assert_eq!(panel.width(), column_width(1.0));
-        let before = (rect(&h, LAST_TOOL), rect(&h, FILL));
-        assert!(panel.contains_rect(before.0) && panel.contains_rect(before.1), "{before:?} outside {panel:?}");
-        wheel(&mut h, panel.center(), vec2(0.0, -2000.0));
-        assert_eq!((rect(&h, LAST_TOOL), rect(&h, FILL)), before);
-    }
-    #[test]
-    fn the_tools_panel_lays_out_like_indesigns() {
-        // Chris Nielsen's "The Adobe InDesign Toolbox" (InDesign 2020): Gradient Swatch and Gradient
-        // Feather are tools of their own; in two columns Content Collector and Placer, Apply
-        // Color / Gradient / None and Normal / Preview each get a button.
-        for double in [false, true] {
-            let h = test_window::open(app(double), vec2(1400.0, 900.0));
-            let _ = rect(&h, "Gradient Swatch Tool (G)");
-            let _ = rect(&h, "Gradient Feather Tool (Shift+G)");
-            let _ = rect(&h, "View Options");
-            let split = ["Content Placer Tool (B)", "Apply Color (,)", "Apply Gradient (.)", "Normal"];
-            for label in split {
-                assert_eq!(h.query_by_label(label).is_some(), double, "double column {double}: {label}");
-            }
-            let _ = rect(&h, "Content Collector Tool (B)");
-            // One column: the Apply well names what is in front (no fill: Apply None).
-            let _ = rect(&h, "Apply None (/)");
-            if double {
-                let (a, b) = (rect(&h, "Content Collector Tool (B)"), rect(&h, "Content Placer Tool (B)"));
-                assert!((a.center().y - b.center().y).abs() < 1.0 && a.center().x < b.center().x, "side by side: {a:?} {b:?}");
-                let (n, p) = (rect(&h, "Normal"), rect(&h, "Preview (W)"));
-                assert!((n.center().y - p.center().y).abs() < 1.0, "Normal and Preview side by side");
-            }
-        }
-    }
-
-    #[test]
-    fn apply_color_and_gradient_reuse_the_last_ones() {
-        use serde_json::json;
-        let mut app = app(true);
-        app.run("file.new", json!({})).unwrap();
-        let id = app.run("frame.create", json!({"rect": [72, 72, 200, 200], "content": "unassigned"})).unwrap()["id"].clone();
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        let fill = |app: &crate::DesignApp| {
-            let st = app.session.active().unwrap();
-            let it = st.doc.item(st.selection.items[0]).unwrap();
-            (it.fill.swatch.clone(), it.stroke.swatch.clone())
-        };
-        // Apply Color: [Black] at first, then the colour last applied.
-        app.run("color.applyColor", json!({})).unwrap();
-        assert_eq!(fill(&app).0, "[Black]");
-        crate::panels::apply_swatch(&mut app, false, "C=100 M=0 Y=0 K=0", None).unwrap();
-        app.run("color.applyNone", json!({})).unwrap();
-        assert_eq!(fill(&app).0, "[None]");
-        app.run("color.applyColor", json!({})).unwrap();
-        assert_eq!(fill(&app).0, "C=100 M=0 Y=0 K=0");
-        // Apply Gradient: white to black when there's none yet, then that one again.
-        app.run("color.applyGradient", json!({})).unwrap();
-        let g = fill(&app).0;
-        let doc = &app.session.active().unwrap().doc;
-        let grad = designcraft_color::swatch::resolve_gradient(&doc.swatches, &g).expect("a gradient");
-        assert_eq!((grad.stops[0].color.to_rgb(), grad.stops[1].color.to_rgb()), ([1.0; 3], [0.0; 3]));
-        app.run("color.applyColor", json!({})).unwrap();
-        // With the stroke in front, it goes to the stroke; the fill keeps its colour.
-        app.ui.stroke_front = true;
-        app.run("color.applyGradient", json!({})).unwrap();
-        assert_eq!(fill(&app), ("C=100 M=0 Y=0 K=0".to_string(), g));
-        // The shortcuts: , and .
-        for (id, sc) in [("color.applyColor", ","), ("color.applyGradient", ".")] {
-            assert_eq!(crate::menus::ui_label(id).and_then(|c| c.1), Some(sc));
-        }
-    }
-
-    /// A new default gradient on the stroke in front is one undo step; the fill keeps its swatch and tint.
-    #[test]
-    fn apply_gradient_to_the_stroke_is_one_undo_step() {
-        use serde_json::json;
-        let mut app = app(true);
-        app.run("file.new", json!({})).unwrap();
-        let id = app.run("frame.create", json!({"rect": [72, 72, 200, 200], "content": "unassigned"})).unwrap()["id"].clone();
-        app.run("selection.set", json!({"ids": [id]})).unwrap();
-        app.run("object.fill", json!({"swatch": "[Paper]", "tint": 0.5})).unwrap();
-        app.run("object.stroke", json!({"swatch": "[Black]", "tint": 0.7})).unwrap();
-        let paints = |app: &crate::DesignApp| {
-            let st = app.session.active().unwrap();
-            let it = st.doc.item(st.selection.items[0]).unwrap();
-            (it.fill.swatch.clone(), it.fill.tint, it.stroke.swatch.clone(), it.stroke.tint)
-        };
-        let before = paints(&app);
-        app.ui.stroke_front = true;
-        app.run("color.applyGradient", json!({})).unwrap();
-        let after = paints(&app);
-        assert_eq!((&after.0, after.1), (&before.0, before.1), "the fill is untouched");
-        assert_ne!(after.2, before.2, "the stroke is the gradient");
-        app.run("edit.undo", json!({})).unwrap();
-        assert_eq!(paints(&app), before, "one undo restores the stroke");
-    }
-
-    /// With nothing selected, the Color Picker and Apply None set the colours of the next shape
-    /// (the course's poster: a scarlet fill picked before drawing), and the proxy shows them.
-    #[test]
-    fn with_nothing_selected_the_proxy_sets_the_next_shapes_colours() {
-        use serde_json::json;
-        let mut app = app(false);
-        app.run("file.new", json!({})).unwrap();
-        // Frames 1 ms apart, so two clicks make a double-click.
-        let mut h = egui_kittest::Harness::builder().with_size(vec2(1400.0, 900.0)).with_step_dt(0.001).build_ui_state(
-            |ui, app: &mut crate::DesignApp| {
-                let ctx = ui.ctx().clone();
-                app.logic(&ctx);
-                app.ui(ui);
-            },
-            app,
-        );
-        h.run_steps(6);
-        // Double-click the Fill box: the picker opens; OK with nothing selected keeps the colour.
-        let at = h.get_by_label(FILL).rect().center();
-        h.hover_at(at);
-        h.step();
-        for pressed in [true, false, true, false] {
-            h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
-            h.step();
-        }
-        h.run_steps(3);
-        let app = h.state_mut();
-        assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("colorPicker"));
-        let d = app.ui.dialog.as_mut().unwrap();
-        // What the picker's fields hold after #7c1315 is typed.
-        for (k, v) in [("hex", json!("#7c1315")), ("rgb", json!([0x7c, 0x13, 0x15])), ("model", json!("rgb")), ("edited", json!(true))] {
-            d.fields.insert(k.into(), v);
-        }
-        crate::dialogs::confirm(app).unwrap();
-        // Apply None with the stroke in front.
-        app.ui.stroke_front = true;
-        app.run("color.applyNone", json!({})).unwrap();
-        let red = app.session.active().unwrap().doc.settings.new_object.fill.clone();
-        assert_eq!(app.session.active().unwrap().doc.resolve_color(&red, 1.0).unwrap().to_hex(), "#7c1315");
-        // The next rectangle has them.
-        let id = app.run("frame.create", json!({"rect": [72, 72, 200, 200], "content": "unassigned"})).unwrap()["id"].as_u64().unwrap();
-        let st = app.session.active().unwrap();
-        let it = st.doc.item(designcraft_doc::ItemId(id)).unwrap();
-        assert_eq!((it.fill.swatch.as_str(), it.stroke.swatch.as_str()), (red.as_str(), "[None]"));
-    }
-
-    /// The Fill/Stroke proxy's keys run on the selection and stay out of text being typed.
-    #[test]
-    fn fill_stroke_proxy_keys() {
-        use egui::{Event, Key, Modifiers};
-        use serde_json::json;
-        fn press(app: &mut crate::DesignApp, ctx: &egui::Context, key: Key, modifiers: Modifiers) {
-            let events = [true, false].map(|pressed| Event::Key { key, physical_key: None, pressed, repeat: false, modifiers }).to_vec();
-            ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| crate::menus::shortcuts(app, ui.ctx())).textures_delta.clear();
-        }
-        fn colors(app: &crate::DesignApp) -> (String, f32, String, f32) {
-            let st = app.session.active().unwrap();
-            let it = st.doc.item(st.selection.items[0]).unwrap();
-            (it.fill.swatch.clone(), it.fill.tint, it.stroke.swatch.clone(), it.stroke.tint)
-        }
-        let mut app = app(false);
-        let ctx = egui::Context::default();
-        app.run("file.new", json!({})).unwrap();
-        let f = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hello"})).unwrap();
-        app.run("selection.set", json!({"ids": [f["id"]]})).unwrap();
-        app.run("object.fill", json!({"swatch": "[Paper]", "tint": 0.5})).unwrap();
-        app.run("object.stroke", json!({"swatch": "[Black]", "tint": 1.0})).unwrap();
-
-        press(&mut app, &ctx, Key::X, Modifiers::SHIFT);
-        assert_eq!(colors(&app), ("[Black]".into(), 1.0, "[Paper]".into(), 0.5), "Shift+X swaps, tints included");
-        press(&mut app, &ctx, Key::D, Modifiers::NONE);
-        assert_eq!(colors(&app), ("[None]".into(), 1.0, "[Black]".into(), 1.0), "D: no fill, black stroke");
-        press(&mut app, &ctx, Key::X, Modifiers::NONE);
-        assert!(app.ui.stroke_front, "X brings the stroke to the front");
-        press(&mut app, &ctx, Key::Slash, Modifiers::NONE);
-        assert_eq!(colors(&app).2, "[None]", "/ applies None to the stroke in front");
-
-        // Formatting Affects Text (J) with the frame selected: the keys colour its text, as the
-        // proxy shows it, and leave the frame alone.
-        press(&mut app, &ctx, Key::X, Modifiers::NONE);
-        press(&mut app, &ctx, Key::J, Modifiers::NONE);
-        assert!(crate::panels::colors_affect_text(&app));
-        let frame = colors(&app);
-        app.run("type.char", json!({"attrs": {"fill": "[Paper]", "fillTint": 0.5, "stroke": "[Black]", "strokeTint": 1.0}})).unwrap();
-        let text = |app: &mut crate::DesignApp| crate::panels::color_target(app).unwrap();
-        press(&mut app, &ctx, Key::X, Modifiers::SHIFT);
-        assert_eq!(text(&mut app), ("[Black]".into(), 1.0, "[Paper]".into(), 0.5), "Shift+X swaps the text's colours");
-        press(&mut app, &ctx, Key::D, Modifiers::NONE);
-        assert_eq!(text(&mut app), ("[Black]".into(), 1.0, "[None]".into(), 1.0), "D: text gets a black fill and no stroke");
-        press(&mut app, &ctx, Key::Slash, Modifiers::NONE);
-        assert_eq!(text(&mut app).0, "[None]", "/ applies None to the text's fill in front");
-        assert_eq!(colors(&app), frame, "the frame keeps its colours");
-
-        // Typing in a story: the keys are text, not shortcuts.
-        app.session.execute("text.select", &json!({"story": f["story"], "anchor": 5})).unwrap();
-        app.select_tool("type");
-        assert!(app.session.wants_text());
-        let front = app.ui.stroke_front;
-        press(&mut app, &ctx, Key::X, Modifiers::NONE);
-        assert_eq!(app.ui.stroke_front, front, "X while typing leaves the proxy alone");
-    }
-}
+mod tests;
 
 #[cfg(test)]
 mod text_color_tests {
diff --git a/crates/ui-egui/src/toolbar/tests.rs b/crates/ui-egui/src/toolbar/tests.rs
new file mode 100644
index 000000000..6a8ea752c
--- /dev/null
+++ b/crates/ui-egui/src/toolbar/tests.rs
@@ -0,0 +1,380 @@
+use egui::{pos2, vec2};
+use egui_kittest::kittest::Queryable;
+
+use crate::test_window::{self, wheel};
+
+/// The last tool group's button and the Fill proxy, near the bottom of the panel.
+const LAST_TOOL: &str = "Zoom Tool (Z)";
+const FILL: &str = "Fill (X)";
+/// Status bar height: the Tools panel ends above it.
+const STATUS_H: f32 = 17.0;
+
+fn app(double: bool) -> crate::DesignApp {
+    let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    app.ui.tools_double_column = double;
+    app
+}
+
+fn column_width(cols: f32) -> f32 {
+    8.0 + super::BTN * cols + 4.0 * (cols - 1.0) + 8.0
+}
+
+fn rect(h: &egui_kittest::Harness<'static, test_window::Window>, label: &str) -> egui::Rect {
+    h.get_by_label(label).rect()
+}
+
+/// As InDesign's: a tool group's flyout closes on Esc and on a click outside it (the fill
+/// swatch, a panel), not only on the canvas.
+#[test]
+fn a_tool_flyout_closes_on_escape_and_on_a_click_elsewhere() {
+    use egui::{Event, Modifiers, PointerButton};
+    use egui_kittest::kittest::Queryable;
+    let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let mut h = crate::test_window::open(app, vec2(1400.0, 900.0));
+    let open = |h: &mut egui_kittest::Harness<'static, crate::test_window::Window>| {
+        let at = h.get_by_label("Rectangle Frame Tool (F)").rect().center();
+        h.input_mut().events.push(Event::PointerMoved(at));
+        for pressed in [true, false] {
+            h.input_mut().events.push(Event::PointerButton { pos: at, button: PointerButton::Secondary, pressed, modifiers: Modifiers::NONE });
+        }
+        h.run_steps(3);
+        assert!(h.state().app.ui.flyout.is_some(), "a right-click opens the flyout");
+        let _ = h.get_by_label("Ellipse Frame Tool");
+    };
+    open(&mut h);
+    h.key_press(egui::Key::Escape);
+    h.run_steps(2);
+    assert!(h.state().app.ui.flyout.is_none(), "Esc closes it");
+    // A click on a panel closes it.
+    open(&mut h);
+    crate::test_window::click_at(&mut h, egui::pos2(1300.0, 700.0));
+    assert!(h.state().app.ui.flyout.is_none(), "a click elsewhere closes it");
+    // Choosing a tool in it closes it and selects the tool.
+    open(&mut h);
+    h.get_by_label("Ellipse Frame Tool").click();
+    h.run_steps(3);
+    assert_eq!((h.state().app.session.tool_id(), h.state().app.ui.flyout), ("ellipseFrame", None));
+}
+
+/// A flyout opened by holding the group button stays open after the release, and Esc closes
+/// it without switching the active tool.
+#[test]
+fn a_tool_flyout_opened_by_holding_stays_open_and_esc_keeps_the_tool() {
+    use egui::{Event, Modifiers, PointerButton};
+    use egui_kittest::kittest::Queryable;
+    let app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+    let mut h = crate::test_window::open_stepped(app, vec2(1400.0, 900.0), 1.0, 1.0 / 60.0);
+    h.state_mut().app.select_tool("rectangleFrame");
+    h.run_steps(2);
+    let at = h.get_by_label("Rectangle Frame Tool (F)").rect().center();
+    h.input_mut().events.push(Event::PointerMoved(at));
+    h.input_mut().events.push(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    // Held for half a second: shorter than egui's longest click.
+    h.run_steps(30);
+    assert!(h.state().app.ui.flyout.is_some(), "holding opens the flyout");
+    h.input_mut().events.push(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+    assert!(h.state().app.ui.flyout.is_some(), "the release keeps it open");
+    h.key_press(egui::Key::Escape);
+    h.run_steps(2);
+    assert_eq!((h.state().app.session.tool_id(), h.state().app.ui.flyout), ("rectangleFrame", None));
+}
+
+#[test]
+fn a_short_window_reaches_every_tool() {
+    for double in [false, true] {
+        let (w, ht) = (1000.0, 500.0);
+        let mut h = test_window::open(app(double), vec2(w, ht));
+        let panel = test_window::panel_rect(&h, "tools");
+        wheel(&mut h, panel.center(), vec2(0.0, -2000.0));
+        let visible = egui::Rect::from_min_max(pos2(0.0, panel.min.y), pos2(w, ht - STATUS_H));
+        for label in [LAST_TOOL, FILL] {
+            let r = rect(&h, label);
+            assert!(visible.contains_rect(r), "double column {double}: {label} at {r:?} is outside {visible:?}");
+        }
+        assert_eq!(h.state().app.ui.tools_double_column, double, "the preference is the user's");
+    }
+}
+
+#[test]
+fn tools_take_two_columns_while_one_does_not_fit() {
+    let (w, ht) = (1086.0, 612.0);
+    let mut h = test_window::open(app(false), vec2(w, ht));
+    assert_eq!(test_window::panel_rect(&h, "tools").width(), column_width(2.0));
+    let visible = egui::Rect::from_min_max(pos2(0.0, 0.0), pos2(w, ht - STATUS_H));
+    for label in [LAST_TOOL, FILL] {
+        let r = rect(&h, label);
+        assert!(visible.contains_rect(r), "{label} at {r:?} is outside {visible:?} without scrolling");
+    }
+    assert!(!h.state().app.ui.tools_double_column);
+    // A taller window brings the single column back.
+    h.set_size(vec2(1400.0, 900.0));
+    h.run_steps(4);
+    assert_eq!(test_window::panel_rect(&h, "tools").width(), column_width(1.0));
+    assert!(!h.state().app.ui.tools_double_column);
+}
+
+/// Runs `app` in a window and double-clicks the Tools panel's Fill box.
+fn double_click_fill(app: crate::DesignApp) -> egui_kittest::Harness<'static, crate::DesignApp> {
+    // Frames 1 ms apart, so two clicks make a double-click.
+    let mut h = egui_kittest::Harness::builder().with_size(vec2(1400.0, 900.0)).with_step_dt(0.001).build_ui_state(
+        |ui, app: &mut crate::DesignApp| {
+            let ctx = ui.ctx().clone();
+            app.logic(&ctx);
+            app.ui(ui);
+        },
+        app,
+    );
+    h.run_steps(6);
+    let at = h.get_by_label(FILL).rect().center();
+    h.hover_at(at);
+    h.step();
+    for pressed in [true, false, true, false] {
+        h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
+        h.step();
+    }
+    h.run_steps(3);
+    h
+}
+
+#[test]
+fn double_clicking_the_fill_box_opens_the_color_picker_with_the_selections_colour() {
+    let mut app = app(false);
+    app.run("file.new", serde_json::json!({})).unwrap();
+    let id = app.run("frame.create", serde_json::json!({"rect": [72, 72, 200, 200]})).unwrap()["id"].clone();
+    app.run("object.color", serde_json::json!({"color": "#456daf", "ids": [id]})).unwrap();
+    app.run("selection.set", serde_json::json!({"ids": [id]})).unwrap();
+    let h = double_click_fill(app);
+    let d = h.state().ui.dialog.clone().expect("the Color Picker opened");
+    assert_eq!(d.id, "colorPicker");
+    assert_eq!((d.fields["target"].as_str(), d.fields["hex"].as_str()), (Some("fill"), Some("#456daf")), "{:?}", d.fields);
+}
+
+/// With Formatting Affects Text on and a text frame selected, the picker opened from the Fill
+/// box colours the frame's text, not the frame.
+#[test]
+fn the_color_picker_from_the_fill_box_follows_formatting_affects_text() {
+    let mut app = app(false);
+    app.run("file.new", serde_json::json!({})).unwrap();
+    let r = app.run("frame.create", serde_json::json!({"rect": [72, 72, 300, 200], "content": "text", "text": "words", "caret": false})).unwrap();
+    let id = designcraft_doc::ItemId(r["id"].as_u64().unwrap());
+    app.run("selection.set", serde_json::json!({"ids": [id.0]})).unwrap();
+    app.ui.formatting_affects_text = true;
+    let mut h = double_click_fill(app);
+    let app = h.state_mut();
+    let d = app.ui.dialog.as_mut().expect("the Color Picker opened");
+    assert_eq!(d.fields["text"], true, "{:?}", d.fields);
+    // What the picker's fields hold after #456daf is typed.
+    for (k, v) in [("hex", serde_json::json!("#456daf")), ("rgb", serde_json::json!([0x45, 0x6d, 0xaf])), ("model", serde_json::json!("rgb"))] {
+        d.fields.insert(k.into(), v);
+    }
+    d.fields.insert("edited".into(), serde_json::json!(true));
+    crate::dialogs::confirm(app).unwrap();
+    let st = app.session.active().unwrap();
+    let it = st.doc.item(id).unwrap();
+    assert_eq!(it.fill.swatch, "[None]", "the frame keeps its fill");
+    let story = st.doc.stories.values().find(|s| s.text.starts_with("words")).unwrap();
+    let fill = story.runs().next().unwrap().1.over.fill.clone().expect("the text has a fill");
+    let rgb = st.doc.resolve_color(&fill, 1.0).unwrap().to_rgb();
+    assert!((rgb[0] - 0x45 as f32 / 255.0).abs() < 0.01 && (rgb[2] - 0xaf as f32 / 255.0).abs() < 0.01, "{rgb:?}");
+}
+
+#[test]
+fn a_tall_window_keeps_one_column_and_does_not_scroll() {
+    let mut h = test_window::open(app(false), vec2(1400.0, 900.0));
+    let panel = test_window::panel_rect(&h, "tools");
+    assert_eq!(panel.width(), column_width(1.0));
+    let before = (rect(&h, LAST_TOOL), rect(&h, FILL));
+    assert!(panel.contains_rect(before.0) && panel.contains_rect(before.1), "{before:?} outside {panel:?}");
+    wheel(&mut h, panel.center(), vec2(0.0, -2000.0));
+    assert_eq!((rect(&h, LAST_TOOL), rect(&h, FILL)), before);
+}
+#[test]
+fn the_tools_panel_lays_out_like_indesigns() {
+    // Chris Nielsen's "The Adobe InDesign Toolbox" (InDesign 2020): Gradient Swatch and Gradient
+    // Feather are tools of their own; in two columns Content Collector and Placer, Apply
+    // Color / Gradient / None and Normal / Preview each get a button.
+    for double in [false, true] {
+        let h = test_window::open(app(double), vec2(1400.0, 900.0));
+        let _ = rect(&h, "Gradient Swatch Tool (G)");
+        let _ = rect(&h, "Gradient Feather Tool (Shift+G)");
+        let _ = rect(&h, "View Options");
+        let split = ["Content Placer Tool (B)", "Apply Color (,)", "Apply Gradient (.)", "Normal"];
+        for label in split {
+            assert_eq!(h.query_by_label(label).is_some(), double, "double column {double}: {label}");
+        }
+        let _ = rect(&h, "Content Collector Tool (B)");
+        // One column: the Apply well names what is in front (no fill: Apply None).
+        let _ = rect(&h, "Apply None (/)");
+        if double {
+            let (a, b) = (rect(&h, "Content Collector Tool (B)"), rect(&h, "Content Placer Tool (B)"));
+            assert!((a.center().y - b.center().y).abs() < 1.0 && a.center().x < b.center().x, "side by side: {a:?} {b:?}");
+            let (n, p) = (rect(&h, "Normal"), rect(&h, "Preview (W)"));
+            assert!((n.center().y - p.center().y).abs() < 1.0, "Normal and Preview side by side");
+        }
+    }
+}
+
+#[test]
+fn apply_color_and_gradient_reuse_the_last_ones() {
+    use serde_json::json;
+    let mut app = app(true);
+    app.run("file.new", json!({})).unwrap();
+    let id = app.run("frame.create", json!({"rect": [72, 72, 200, 200], "content": "unassigned"})).unwrap()["id"].clone();
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    let fill = |app: &crate::DesignApp| {
+        let st = app.session.active().unwrap();
+        let it = st.doc.item(st.selection.items[0]).unwrap();
+        (it.fill.swatch.clone(), it.stroke.swatch.clone())
+    };
+    // Apply Color: [Black] at first, then the colour last applied.
+    app.run("color.applyColor", json!({})).unwrap();
+    assert_eq!(fill(&app).0, "[Black]");
+    crate::panels::apply_swatch(&mut app, false, "C=100 M=0 Y=0 K=0", None).unwrap();
+    app.run("color.applyNone", json!({})).unwrap();
+    assert_eq!(fill(&app).0, "[None]");
+    app.run("color.applyColor", json!({})).unwrap();
+    assert_eq!(fill(&app).0, "C=100 M=0 Y=0 K=0");
+    // Apply Gradient: white to black when there's none yet, then that one again.
+    app.run("color.applyGradient", json!({})).unwrap();
+    let g = fill(&app).0;
+    let doc = &app.session.active().unwrap().doc;
+    let grad = designcraft_color::swatch::resolve_gradient(&doc.swatches, &g).expect("a gradient");
+    assert_eq!((grad.stops[0].color.to_rgb(), grad.stops[1].color.to_rgb()), ([1.0; 3], [0.0; 3]));
+    app.run("color.applyColor", json!({})).unwrap();
+    // With the stroke in front, it goes to the stroke; the fill keeps its colour.
+    app.ui.stroke_front = true;
+    app.run("color.applyGradient", json!({})).unwrap();
+    assert_eq!(fill(&app), ("C=100 M=0 Y=0 K=0".to_string(), g));
+    // The shortcuts: , and .
+    for (id, sc) in [("color.applyColor", ","), ("color.applyGradient", ".")] {
+        assert_eq!(crate::menus::ui_label(id).and_then(|c| c.1), Some(sc));
+    }
+}
+
+/// A new default gradient on the stroke in front is one undo step; the fill keeps its swatch and tint.
+#[test]
+fn apply_gradient_to_the_stroke_is_one_undo_step() {
+    use serde_json::json;
+    let mut app = app(true);
+    app.run("file.new", json!({})).unwrap();
+    let id = app.run("frame.create", json!({"rect": [72, 72, 200, 200], "content": "unassigned"})).unwrap()["id"].clone();
+    app.run("selection.set", json!({"ids": [id]})).unwrap();
+    app.run("object.fill", json!({"swatch": "[Paper]", "tint": 0.5})).unwrap();
+    app.run("object.stroke", json!({"swatch": "[Black]", "tint": 0.7})).unwrap();
+    let paints = |app: &crate::DesignApp| {
+        let st = app.session.active().unwrap();
+        let it = st.doc.item(st.selection.items[0]).unwrap();
+        (it.fill.swatch.clone(), it.fill.tint, it.stroke.swatch.clone(), it.stroke.tint)
+    };
+    let before = paints(&app);
+    app.ui.stroke_front = true;
+    app.run("color.applyGradient", json!({})).unwrap();
+    let after = paints(&app);
+    assert_eq!((&after.0, after.1), (&before.0, before.1), "the fill is untouched");
+    assert_ne!(after.2, before.2, "the stroke is the gradient");
+    app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(paints(&app), before, "one undo restores the stroke");
+}
+
+/// With nothing selected, the Color Picker and Apply None set the colours of the next shape
+/// (the course's poster: a scarlet fill picked before drawing), and the proxy shows them.
+#[test]
+fn with_nothing_selected_the_proxy_sets_the_next_shapes_colours() {
+    use serde_json::json;
+    let mut app = app(false);
+    app.run("file.new", json!({})).unwrap();
+    // Frames 1 ms apart, so two clicks make a double-click.
+    let mut h = egui_kittest::Harness::builder().with_size(vec2(1400.0, 900.0)).with_step_dt(0.001).build_ui_state(
+        |ui, app: &mut crate::DesignApp| {
+            let ctx = ui.ctx().clone();
+            app.logic(&ctx);
+            app.ui(ui);
+        },
+        app,
+    );
+    h.run_steps(6);
+    // Double-click the Fill box: the picker opens; OK with nothing selected keeps the colour.
+    let at = h.get_by_label(FILL).rect().center();
+    h.hover_at(at);
+    h.step();
+    for pressed in [true, false, true, false] {
+        h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() });
+        h.step();
+    }
+    h.run_steps(3);
+    let app = h.state_mut();
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.id.as_str()), Some("colorPicker"));
+    let d = app.ui.dialog.as_mut().unwrap();
+    // What the picker's fields hold after #7c1315 is typed.
+    for (k, v) in [("hex", json!("#7c1315")), ("rgb", json!([0x7c, 0x13, 0x15])), ("model", json!("rgb")), ("edited", json!(true))] {
+        d.fields.insert(k.into(), v);
+    }
+    crate::dialogs::confirm(app).unwrap();
+    // Apply None with the stroke in front.
+    app.ui.stroke_front = true;
+    app.run("color.applyNone", json!({})).unwrap();
+    let red = app.session.active().unwrap().doc.settings.new_object.fill.clone();
+    assert_eq!(app.session.active().unwrap().doc.resolve_color(&red, 1.0).unwrap().to_hex(), "#7c1315");
+    // The next rectangle has them.
+    let id = app.run("frame.create", json!({"rect": [72, 72, 200, 200], "content": "unassigned"})).unwrap()["id"].as_u64().unwrap();
+    let st = app.session.active().unwrap();
+    let it = st.doc.item(designcraft_doc::ItemId(id)).unwrap();
+    assert_eq!((it.fill.swatch.as_str(), it.stroke.swatch.as_str()), (red.as_str(), "[None]"));
+}
+
+/// The Fill/Stroke proxy's keys run on the selection and stay out of text being typed.
+#[test]
+fn fill_stroke_proxy_keys() {
+    use egui::{Event, Key, Modifiers};
+    use serde_json::json;
+    fn press(app: &mut crate::DesignApp, ctx: &egui::Context, key: Key, modifiers: Modifiers) {
+        let events = [true, false].map(|pressed| Event::Key { key, physical_key: None, pressed, repeat: false, modifiers }).to_vec();
+        ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| crate::menus::shortcuts(app, ui.ctx())).textures_delta.clear();
+    }
+    fn colors(app: &crate::DesignApp) -> (String, f32, String, f32) {
+        let st = app.session.active().unwrap();
+        let it = st.doc.item(st.selection.items[0]).unwrap();
+        (it.fill.swatch.clone(), it.fill.tint, it.stroke.swatch.clone(), it.stroke.tint)
+    }
+    let mut app = app(false);
+    let ctx = egui::Context::default();
+    app.run("file.new", json!({})).unwrap();
+    let f = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hello"})).unwrap();
+    app.run("selection.set", json!({"ids": [f["id"]]})).unwrap();
+    app.run("object.fill", json!({"swatch": "[Paper]", "tint": 0.5})).unwrap();
+    app.run("object.stroke", json!({"swatch": "[Black]", "tint": 1.0})).unwrap();
+
+    press(&mut app, &ctx, Key::X, Modifiers::SHIFT);
+    assert_eq!(colors(&app), ("[Black]".into(), 1.0, "[Paper]".into(), 0.5), "Shift+X swaps, tints included");
+    press(&mut app, &ctx, Key::D, Modifiers::NONE);
+    assert_eq!(colors(&app), ("[None]".into(), 1.0, "[Black]".into(), 1.0), "D: no fill, black stroke");
+    press(&mut app, &ctx, Key::X, Modifiers::NONE);
+    assert!(app.ui.stroke_front, "X brings the stroke to the front");
+    press(&mut app, &ctx, Key::Slash, Modifiers::NONE);
+    assert_eq!(colors(&app).2, "[None]", "/ applies None to the stroke in front");
+
+    // Formatting Affects Text (J) with the frame selected: the keys colour its text, as the
+    // proxy shows it, and leave the frame alone.
+    press(&mut app, &ctx, Key::X, Modifiers::NONE);
+    press(&mut app, &ctx, Key::J, Modifiers::NONE);
+    assert!(crate::panels::colors_affect_text(&app));
+    let frame = colors(&app);
+    app.run("type.char", json!({"attrs": {"fill": "[Paper]", "fillTint": 0.5, "stroke": "[Black]", "strokeTint": 1.0}})).unwrap();
+    let text = |app: &mut crate::DesignApp| crate::panels::color_target(app).unwrap();
+    press(&mut app, &ctx, Key::X, Modifiers::SHIFT);
+    assert_eq!(text(&mut app), ("[Black]".into(), 1.0, "[Paper]".into(), 0.5), "Shift+X swaps the text's colours");
+    press(&mut app, &ctx, Key::D, Modifiers::NONE);
+    assert_eq!(text(&mut app), ("[Black]".into(), 1.0, "[None]".into(), 1.0), "D: text gets a black fill and no stroke");
+    press(&mut app, &ctx, Key::Slash, Modifiers::NONE);
+    assert_eq!(text(&mut app).0, "[None]", "/ applies None to the text's fill in front");
+    assert_eq!(colors(&app), frame, "the frame keeps its colours");
+
+    // Typing in a story: the keys are text, not shortcuts.
+    app.session.execute("text.select", &json!({"story": f["story"], "anchor": 5})).unwrap();
+    app.select_tool("type");
+    assert!(app.session.wants_text());
+    let front = app.ui.stroke_front;
+    press(&mut app, &ctx, Key::X, Modifiers::NONE);
+    assert_eq!(app.ui.stroke_front, front, "X while typing leaves the proxy alone");
+}
diff --git a/crates/ui-egui/src/updates_ui.rs b/crates/ui-egui/src/updates_ui.rs
new file mode 100644
index 000000000..43803c9a5
--- /dev/null
+++ b/crates/ui-egui/src/updates_ui.rs
@@ -0,0 +1,177 @@
+//! Software updates, background check at startup, and startup prompt modal.
+
+use serde_json::Value;
+
+use crate::DesignApp;
+
+#[cfg(not(target_arch = "wasm32"))]
+use craft_update::updater::{Action, Status, Updater};
+
+pub(crate) struct Runtime {
+    #[cfg(not(target_arch = "wasm32"))]
+    updater: Updater,
+    /// The desktop app turns the check at start on; tests and the web build leave it off.
+    #[cfg(not(target_arch = "wasm32"))]
+    startup_check: bool,
+    #[cfg(not(target_arch = "wasm32"))]
+    check_requested: bool,
+    /// The context of the last frame, to wake the UI when a check is queued from a menu callback.
+    #[cfg(not(target_arch = "wasm32"))]
+    repaint: Option<egui::Context>,
+    pub(crate) manual_window_open: bool,
+    pub(crate) status_message: Option<String>,
+}
+
+impl Default for Runtime {
+    fn default() -> Self {
+        Self {
+            #[cfg(not(target_arch = "wasm32"))]
+            updater: Updater::new(&craft_update::suite::DESIGNCRAFT, env!("CARGO_PKG_VERSION")),
+            #[cfg(not(target_arch = "wasm32"))]
+            startup_check: false,
+            #[cfg(not(target_arch = "wasm32"))]
+            check_requested: false,
+            #[cfg(not(target_arch = "wasm32"))]
+            repaint: None,
+            manual_window_open: false,
+            status_message: None,
+        }
+    }
+}
+
+impl DesignApp {
+    /// Whether the app asks for a newer release when it starts (off until the desktop app turns it on).
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn set_startup_update_check(&mut self, on: bool) {
+        self.updates_rt.startup_check = on;
+    }
+}
+
+pub(crate) fn check(app: &mut DesignApp) -> Result<Value, String> {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        app.updates_rt.check_requested = true;
+        if let Some(ctx) = &app.updates_rt.repaint {
+            ctx.request_repaint();
+        }
+        Ok(Value::Null)
+    }
+    #[cfg(target_arch = "wasm32")]
+    {
+        app.updates_rt.manual_window_open = true;
+        app.updates_rt.status_message = Some("Update check is not supported in the web browser.".into());
+        Ok(Value::Null)
+    }
+}
+
+pub(crate) fn tick(app: &mut DesignApp, ctx: &egui::Context) {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let rt = &mut app.updates_rt;
+        rt.repaint = Some(ctx.clone());
+        if std::mem::take(&mut rt.check_requested) {
+            rt.updater.check_now(ctx);
+        } else if rt.startup_check {
+            rt.updater.check_at_start(ctx);
+        }
+        rt.updater.tick(ctx);
+    }
+    #[cfg(target_arch = "wasm32")]
+    let _ = (app, ctx);
+}
+
+pub(crate) fn show(app: &mut DesignApp, ctx: &egui::Context) {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        // The restart helper is scheduled before the app closes, so no update starts over unsaved work.
+        let clean = !app.session.documents().iter().any(|d| d.is_dirty());
+        match app.updates_rt.updater.show_if(ctx, clean) {
+            Action::OpenUrl(url) => ctx.open_url(egui::OpenUrl::new_tab(url)),
+            Action::Close => ctx.send_viewport_cmd(egui::ViewportCommand::Close),
+            Action::None => {}
+        }
+        // The window answers Help ▸ Check for Updates, so it follows the updater's status.
+        let rt = &mut app.updates_rt;
+        (rt.manual_window_open, rt.status_message) = match rt.updater.status() {
+            Status::Idle => (false, None),
+            Status::Checking => (true, Some(crate::i18n::tr(&app.ui.language, "Checking for updates…").to_string())),
+            Status::UpToDate => (
+                true,
+                Some(
+                    crate::i18n::tr(&app.ui.language, "DesignCraft {version} is currently the newest version available.")
+                        .replace("{version}", env!("CARGO_PKG_VERSION")),
+                ),
+            ),
+            Status::Failed(e) => (true, Some(crate::i18n::tr(&app.ui.language, "Could not check for updates:\n{error}").replace("{error}", e))),
+        };
+    }
+
+    if app.updates_rt.manual_window_open {
+        let mut open = true;
+        let title = crate::i18n::tr(&app.ui.language, "DesignCraft Updates");
+        let ok_label = crate::i18n::tr(&app.ui.language, "OK");
+        egui::Window::new(title)
+            .open(&mut open)
+            .collapsible(false)
+            .resizable(false)
+            .pivot(egui::Align2::CENTER_CENTER)
+            .default_pos(ctx.content_rect().center())
+            .show(ctx, |ui| {
+                if let Some(msg) = &app.updates_rt.status_message {
+                    ui.label(msg);
+                }
+                ui.add_space(8.0);
+                if ui.button(ok_label).clicked() {
+                    app.updates_rt.manual_window_open = false;
+                }
+            });
+        if !open {
+            app.updates_rt.manual_window_open = false;
+        }
+    }
+
+    // Closing the window dismisses the outcome it showed.
+    #[cfg(not(target_arch = "wasm32"))]
+    if !app.updates_rt.manual_window_open {
+        app.updates_rt.updater.dismiss_status();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use designcraft_engine::Session;
+
+    #[test]
+    fn default_runtime_is_idle() {
+        let rt = Runtime::default();
+        assert!(!rt.manual_window_open);
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            assert!(!rt.startup_check);
+            assert!(!rt.updater.prompt_open());
+            assert_eq!(rt.updater.status(), &Status::Idle);
+        }
+    }
+
+    #[test]
+    #[cfg(not(target_arch = "wasm32"))]
+    fn startup_prompt_shows_and_closes() {
+        let mut app = DesignApp::new(Session::new(), Default::default());
+        let ctx = egui::Context::default();
+        let release = craft_update::Release {
+            tag: "v99.0.0".into(),
+            version: craft_update::parse_version("99.0.0"),
+            name: "DesignCraft 99.0.0".into(),
+            html_url: "https://github.com/storytold/designcraft/releases/tag/v99.0.0".into(),
+            ..Default::default()
+        };
+        app.updates_rt.updater.offer(release);
+
+        let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
+            show(&mut app, ui.ctx());
+        });
+        output.textures_delta.clear();
+        assert!(app.updates_rt.updater.prompt_open());
+    }
+}
diff --git a/crates/ui-egui/src/widgets.rs b/crates/ui-egui/src/widgets.rs
index e820e21a8..a286afccf 100644
--- a/crates/ui-egui/src/widgets.rs
+++ b/crates/ui-egui/src/widgets.rs
@@ -71,6 +71,7 @@ impl NumKind<'_> {
 /// A numeric field. Build with [`NumField::measure`] / [`NumField::number`], then [`NumField::show`].
 pub struct NumField<'a> {
     id: &'a str,
+    name: Option<&'a str>,
     value: Option<f64>,
     kind: NumKind<'a>,
     width: f32,
@@ -93,9 +94,11 @@ impl<'a> NumField<'a> {
     pub fn number(id: &'a str, value: Option<f64>, suffix: &'a str, decimals: usize) -> Self {
         Self::new(id, value, NumKind::Number { suffix, decimals })
     }
+    /// Initialize a numeric field with no name, label or empty text, a 72-point width, no spinner or presets, the full range and the enabled state.
     fn new(id: &'a str, value: Option<f64>, kind: NumKind<'a>) -> Self {
         NumField {
             id,
+            name: None,
             value,
             kind,
             width: 72.0,
@@ -109,6 +112,23 @@ impl<'a> NumField<'a> {
             empty: None,
         }
     }
+    /// The field's user-facing name, independent of its stable internal ID.
+    pub fn name(mut self, name: &'a str) -> Self {
+        self.name = Some(name);
+        self
+    }
+    /// The editor is labelled by widget `id` (an icon or caption that names the field), so
+    /// assistive technology reads the field's name with its value.
+    pub fn labelled_by(mut self, id: egui::Id) -> Self {
+        self.label = Some(id);
+        self
+    }
+    /// An unset value shows `text` (dimmed), and the preset menu offers it first: picking it, or
+    /// emptying the field, commits `Some(None)` from [`NumField::show_or_clear`].
+    pub fn empty_text(mut self, text: &'a str) -> Self {
+        self.empty = Some(text);
+        self
+    }
     /// Total width (spinner and preset segments included).
     pub fn width(mut self, w: f32) -> Self {
         self.width = w;
@@ -147,19 +167,6 @@ impl<'a> NumField<'a> {
         self.enabled = on;
         self
     }
-    /// The editor is labelled by widget `id` (an icon or caption that names the field), so
-    /// assistive technology reads the field's name with its value.
-    pub fn labelled_by(mut self, id: egui::Id) -> Self {
-        self.label = Some(id);
-        self
-    }
-
-    /// An unset value shows `text` (dimmed), and the preset menu offers it first: picking it, or
-    /// emptying the field, commits `Some(None)` from [`NumField::show_or_clear`].
-    pub fn empty_text(mut self, text: &'a str) -> Self {
-        self.empty = Some(text);
-        self
-    }
 
     /// Draw the field; returns the new value when the user commits an edit (Enter, focus loss,
     /// a spinner click, ↑/↓ while focused (Shift = ×10) or a preset).
@@ -167,11 +174,47 @@ impl<'a> NumField<'a> {
         self.show_or_clear(ui).flatten()
     }
 
+    /// The spinner segment's up and down buttons; the value a click on one gives.
+    fn spinner_segment(&self, ui: &mut Ui, rect: Rect, key: egui::Id, enabled: bool, t: &Tokens) -> Option<f64> {
+        let name = self.name.unwrap_or(self.id);
+        let step = self.step.unwrap_or_else(|| self.kind.step());
+        let clamp = |v: f64| v.clamp(self.range.0, self.range.1);
+        let mut out = None;
+        let seg = Rect::from_min_size(rect.min, vec2(SEG_W, FIELD_H));
+        ui.painter().rect_filled(seg, 0.0, t.input);
+        let up = Rect::from_min_max(seg.min, pos2(seg.max.x, seg.center().y));
+        let down = Rect::from_min_max(pos2(seg.min.x, seg.center().y), seg.max);
+        for (r, dir) in [(up, 1.0), (down, -1.0)] {
+            let resp = ui.interact(r, key.with(("spin", dir as i32)), if enabled { Sense::click() } else { Sense::hover() });
+            if resp.hovered() && enabled {
+                ui.painter().rect_filled(r.shrink(1.0), 0.0, t.hover);
+            }
+            let c = r.center();
+            let (a, b) = if dir > 0.0 { (2.5, -1.5) } else { (-2.5, 1.5) };
+            ui.painter()
+                .line_segment([pos2(c.x - 4.0, c.y + a * 0.6), pos2(c.x, c.y + b)], Stroke::new(1.0, if enabled { t.icon } else { t.text_disabled }));
+            ui.painter()
+                .line_segment([pos2(c.x, c.y + b), pos2(c.x + 4.0, c.y + a * 0.6)], Stroke::new(1.0, if enabled { t.icon } else { t.text_disabled }));
+            // The two spinner halves are real inputs: name them for screen readers and strict
+            // accessibility checks, which would otherwise see unnamed clickable nodes.
+            resp.widget_info(|| {
+                egui::WidgetInfo::labeled(egui::Role::Button, enabled, format!("{} {}", if dir > 0.0 { "Increase" } else { "Decrease" }, name))
+            });
+            if resp.clicked() {
+                let mul = if ui.input(|i| i.modifiers.shift) { 10.0 } else { 1.0 };
+                out = Some(clamp(self.value.unwrap_or(0.0) + dir * step * mul));
+            }
+        }
+        out
+    }
+
     /// Like [`NumField::show`]; a field emptied while it had a value commits `Some(None)` (for
     /// values that may be unset, like a character style's attributes).
     pub fn show_or_clear(self, ui: &mut Ui) -> Option<Option<f64>> {
         let t = Tokens::get(ui.ctx());
-        let key = ui.id().with(self.id);
+        let name = self.name.unwrap_or(self.id);
+        let enabled = self.enabled && ui.is_enabled();
+        let key = ui.scope_id().with(self.id);
         let (rect, _) = ui.allocate_exact_size(vec2(self.width, FIELD_H), Sense::hover());
         let step = self.step.unwrap_or_else(|| self.kind.step());
         let clamp = |v: f64| v.clamp(self.range.0, self.range.1);
@@ -182,43 +225,21 @@ impl<'a> NumField<'a> {
         let focused = ui.memory(|m| m.has_focus(focused_id));
         let (bg, fg, border) =
             if focused { (Color32::WHITE, Color32::from_gray(20), Color32::from_rgb(0x45, 0xa0, 0xf5)) } else { (t.input, t.text, t.field_border) };
-        let fg = if self.enabled { fg } else { t.text_disabled };
+        let fg = if enabled { fg } else { t.text_disabled };
         // Spinner segment.
         if self.spinner {
-            let seg = Rect::from_min_size(rect.min, vec2(SEG_W, FIELD_H));
-            text_rect.min.x = seg.max.x;
-            ui.painter().rect_filled(seg, 0.0, t.input);
-            let up = Rect::from_min_max(seg.min, pos2(seg.max.x, seg.center().y));
-            let down = Rect::from_min_max(pos2(seg.min.x, seg.center().y), seg.max);
-            for (r, dir) in [(up, 1.0), (down, -1.0)] {
-                let resp = ui.interact(r, key.with(("spin", dir as i32)), if self.enabled { Sense::click() } else { Sense::hover() });
-                if resp.hovered() && self.enabled {
-                    ui.painter().rect_filled(r.shrink(1.0), 0.0, t.hover);
-                }
-                let c = r.center();
-                let (a, b) = if dir > 0.0 { (2.5, -1.5) } else { (-2.5, 1.5) };
-                ui.painter().line_segment(
-                    [pos2(c.x - 4.0, c.y + a * 0.6), pos2(c.x, c.y + b)],
-                    Stroke::new(1.0, if self.enabled { t.icon } else { t.text_disabled }),
-                );
-                ui.painter().line_segment(
-                    [pos2(c.x, c.y + b), pos2(c.x + 4.0, c.y + a * 0.6)],
-                    Stroke::new(1.0, if self.enabled { t.icon } else { t.text_disabled }),
-                );
-                if resp.clicked() {
-                    let mul = if ui.input(|i| i.modifiers.shift) { 10.0 } else { 1.0 };
-                    out = Some(clamp(self.value.unwrap_or(0.0) + dir * step * mul));
-                }
-            }
+            text_rect.min.x = rect.min.x + SEG_W;
+            out = self.spinner_segment(ui, rect, key, enabled, &t).or(out);
         }
         // Preset segment.
         let mut preset_resp = None;
         if !self.presets.is_empty() {
             let seg = Rect::from_min_max(pos2(rect.max.x - SEG_W, rect.min.y), rect.max);
             text_rect.max.x = seg.min.x;
-            let resp = ui.interact(seg, key.with("presets"), Sense::click());
-            ui.painter().rect_filled(seg, 0.0, if resp.hovered() { t.hover } else { t.input });
-            chevron_down(ui.painter(), seg.center(), t.icon);
+            let resp = ui.interact(seg, key.with("presets"), if enabled { Sense::click() } else { Sense::hover() });
+            ui.painter().rect_filled(seg, 0.0, if resp.hovered() && enabled { t.hover } else { t.input });
+            chevron_down(ui.painter(), seg.center(), if enabled { t.icon } else { t.text_disabled });
+            resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, enabled, format!("{name} presets")));
             preset_resp = Some(resp);
         }
         // Value.
@@ -230,7 +251,7 @@ impl<'a> NumField<'a> {
             .font(label_font())
             .text_color(fg)
             .margin(egui::Margin::ZERO)
-            .vertical_align(egui::Align::Center);
+            .align(egui::Align2::LEFT_CENTER);
         if let Some(empty) = self.empty {
             te = te.hint_text(egui::RichText::new(empty).font(label_font()).color(t.text_dim));
         }
@@ -239,10 +260,10 @@ impl<'a> NumField<'a> {
         let value_rect = Rect::from_min_max(text_rect.min + vec2(5.0, 1.0), text_rect.max - vec2(1.0, 1.0));
         let mut editor_ui = ui.new_child(egui::UiBuilder::new().max_rect(value_rect));
         editor_ui.set_clip_rect(editor_ui.clip_rect().intersect(text_rect));
-        if !self.enabled {
+        if !enabled {
             editor_ui.disable();
         }
-        let r = editor_ui.put(value_rect, te);
+        let r = editor_ui.put(value_rect, te).accessible_name(name);
         let r = match self.label {
             Some(id) => r.labelled_by(id),
             None => r,
@@ -293,7 +314,9 @@ impl<'a> NumField<'a> {
         if !self.presets.is_empty() {
             p.line_segment([pos2(rect.max.x - SEG_W, rect.min.y), pos2(rect.max.x - SEG_W, rect.max.y)], Stroke::new(1.0, t.field_border));
         }
-        if let Some(resp) = preset_resp {
+        if let Some(resp) = preset_resp
+            && enabled
+        {
             egui::Popup::menu(&resp).show(|ui| {
                 ui.set_min_width(self.width);
                 if let Some(empty) = self.empty
@@ -339,12 +362,23 @@ pub fn chevron_down(p: &egui::Painter, c: egui::Pos2, col: Color32) {
     p.line_segment([pos2(c.x, c.y + 2.0), pos2(c.x + 4.0, c.y - 2.0)], Stroke::new(1.0, col));
 }
 
+/// Name a combo box for screen readers and tests.
+///
+/// `egui::ComboBox` announces its current value, not the field it belongs to, so every combo box
+/// is otherwise an unnamed input. Pass the visible caption (or a semantic name when a painted
+/// caption has no text node of its own).
+pub fn name_combo<R>(combo: egui::InnerResponse<Option<R>>, name: impl Into<String>) -> egui::InnerResponse<Option<R>> {
+    let egui::InnerResponse { inner, response } = combo;
+    egui::InnerResponse { inner, response: response.accessible_name(name) }
+}
+
 /// A dropdown box (field style, ⌄ segment on the right). Returns the response; open a popup on it
 /// with [`egui::Popup::menu`].
 pub fn dropdown(ui: &mut Ui, text: &str, width: f32) -> Response {
     dropdown_h(ui, text, width, FIELD_H)
 }
 
+/// Paint a labelled combo with hover, border and chevron, clip its text, and expose a `ComboBox` role named by the visible text.
 pub fn dropdown_h(ui: &mut Ui, text: &str, width: f32, h: f32) -> Response {
     let t = Tokens::get(ui.ctx());
     let (r, resp) = ui.allocate_exact_size(vec2(width, h), Sense::click());
@@ -356,6 +390,8 @@ pub fn dropdown_h(ui: &mut Ui, text: &str, width: f32, h: f32) -> Response {
     chevron_down(p, seg.center(), t.icon);
     let clip = Rect::from_min_max(r.min, pos2(seg.min.x - 2.0, r.max.y));
     p.with_clip_rect(clip).text(pos2(r.min.x + 7.0, r.center().y), egui::Align2::LEFT_CENTER, text, label_font(), t.text);
+    // A painted, clickable box is otherwise an unidentified input; it opens a choice list.
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, ui.is_enabled(), text));
     resp
 }
 
@@ -390,7 +426,7 @@ pub fn outline_button(ui: &mut Ui, label: &str, width: f32) -> Response {
     p.rect_stroke(r, 2.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
     crate::rtl::paint(p, r.center(), egui::Align2::CENTER_CENTER, label, label_font(), t.text);
     // Screen readers (and tests) find it by its label.
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, label));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, label));
     resp
 }
 
@@ -421,7 +457,7 @@ pub fn link_label(ui: &mut Ui, text: &str, width: f32) -> Response {
     ui.painter().galley(pos, g, t.text);
     let y = r.center().y + 6.5;
     ui.painter().line_segment([pos2(r.min.x, y), pos2(r.min.x + w, y)], Stroke::new(1.0, if resp.hovered() { t.text_strong } else { t.text_dim }));
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Link, true, text));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Link, true, text));
     resp.on_hover_cursor(egui::CursorIcon::PointingHand)
 }
 
@@ -430,9 +466,9 @@ pub fn more_options(ui: &mut Ui, language: &str) -> Response {
     let t = Tokens::get(ui.ctx());
     let (row, _) = ui.allocate_exact_size(vec2(ui.available_width(), 14.0), Sense::hover());
     let r = Rect::from_min_max(pos2(row.max.x - 26.0, row.min.y), pos2(row.max.x - 4.0, row.max.y));
-    let resp = ui.interact(r, ui.id().with(("more", row.min.y as i32)), Sense::click());
+    let resp = ui.interact(r, ui.scope_id().with(("more", row.min.y as i32)), Sense::click());
     let label = crate::i18n::tr(language, "More Options");
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, label));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, ui.is_enabled(), label));
     for i in 0..3 {
         ui.painter().circle_filled(pos2(r.min.x + 4.0 + i as f32 * 7.0, r.center().y), 1.9, if resp.hovered() { t.text_strong } else { t.icon });
     }
@@ -452,7 +488,7 @@ pub fn caption_w(ui: &mut Ui, s: &str, w: f32) {
     let t = Tokens::get(ui.ctx());
     let (r, resp) = ui.allocate_exact_size(vec2(w, FIELD_H), Sense::hover());
     // Painted, so tell screen readers (and UI tests) what it says.
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, s));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, s));
     crate::rtl::paint(ui.painter(), pos2(r.max.x - 2.0, r.center().y), egui::Align2::RIGHT_CENTER, s, egui::FontId::proportional(11.5), t.text);
 }
 
@@ -473,7 +509,7 @@ pub fn section(ui: &mut Ui, title: &str, _default_open: bool) -> bool {
     let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 16.0), Sense::hover());
     crate::rtl::paint(ui.painter(), r.left_center(), egui::Align2::LEFT_CENTER, title, egui::FontId::proportional(11.5), t.text_strong);
     // Screen readers hear the section's title.
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, title));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, title));
     ui.add_space(3.0);
     true
 }
@@ -579,6 +615,7 @@ pub fn icon_toggle(ui: &mut Ui, icon: &str, on: bool, tip: &str) -> Response {
     icon_toggle_sized(ui, icon, on, tip, vec2(23.0, 21.0))
 }
 
+/// Paint an icon toggle at the requested size and expose it as a selected button named by its tooltip.
 pub fn icon_toggle_sized(ui: &mut Ui, icon: &str, on: bool, tip: &str, size: egui::Vec2) -> Response {
     let t = Tokens::get(ui.ctx());
     let (r, resp) = ui.allocate_exact_size(size, Sense::click());
@@ -590,7 +627,7 @@ pub fn icon_toggle_sized(ui: &mut Ui, icon: &str, on: bool, tip: &str, size: egu
     let s = (size.y - 4.0).min(17.0);
     crate::icons::paint(ui.painter(), Rect::from_center_size(r.center(), vec2(s, s)), icon, if on { t.text_strong } else { t.icon });
     // Named by its tooltip, for screen readers.
-    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Button, true, on, tip));
+    resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, on, tip));
     if tip.is_empty() {
         resp
     } else {
@@ -618,8 +655,8 @@ pub fn checkbox(ui: &mut Ui, on: &mut bool, label: &str) -> Response {
         *on = !*on;
         resp.mark_changed();
     }
-    let checked = *on;
-    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::Checkbox, true, checked, label));
+    // A painted check box must still report its role, label and toggled state.
+    resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::CheckBox, ui.is_enabled(), *on, label));
     resp
 }
 
@@ -631,7 +668,7 @@ pub fn segmented(ui: &mut Ui, labels: &[&str], active: usize, width: f32) -> Opt
     let mut out = None;
     for (i, l) in labels.iter().enumerate() {
         let sr = Rect::from_min_size(pos2(r.min.x + w * i as f32, r.min.y), vec2(w, BUTTON_H));
-        let resp = ui.interact(sr, ui.id().with(("seg", l)), Sense::click());
+        let resp = ui.interact(sr, ui.scope_id().with(("seg", l)), Sense::click());
         if i == active {
             ui.painter().rect_filled(sr, 0.0, t.well);
         } else if resp.hovered() {
@@ -807,6 +844,70 @@ mod tests {
         assert_eq!(m.parse("1p0+0p6"), Some(18.0));
         assert_eq!(m.step(), 1.0);
     }
+
+    /// A disabled field's preset button is disabled in AccessKit and cannot open a popup.
+    #[test]
+    fn disabled_numeric_presets_are_disabled_and_do_not_open() {
+        use egui_kittest::kittest::{NodeT, Queryable};
+
+        const PRESETS: &[f64] = &[0.0, 50.0, 100.0];
+        let mut h = egui_kittest::Harness::builder().with_size(vec2(420.0, 240.0)).build_ui(|ui| {
+            assert!(NumField::number("Opacity", Some(50.0), "%", 0).presets(PRESETS).enabled(false).show(ui).is_none());
+        });
+        h.run_steps(2);
+        assert!(h.get_by_label("Opacity presets").accesskit_node().is_disabled());
+        h.get_by_label("Opacity presets").click();
+        h.run_steps(3);
+        assert!(!egui::Popup::is_any_open(&h.ctx), "a disabled preset button must not open its menu");
+        h.check_accessibility();
+    }
+
+    /// Spinner buttons and presets inherit a disabled parent in both AccessKit and widget metadata.
+    #[test]
+    fn numeric_controls_inherit_a_disabled_parents_state() {
+        use egui_kittest::kittest::{NodeT, Queryable};
+
+        const PRESETS: &[f64] = &[0.0, 50.0, 100.0];
+        let mut h = egui_kittest::Harness::builder().with_size(vec2(420.0, 240.0)).build_ui(|ui| {
+            ui.disable();
+            let _ = NumField::number("Opacity", Some(50.0), "%", 0).spinner().presets(PRESETS).show(ui);
+        });
+        h.ctx.all_styles_mut(|style| style.debug.show_interactive_widgets = true);
+        h.run_steps(2);
+        let metadata_enabled = |label: &str| {
+            h.ctx.viewport(|viewport| {
+                let rects = &viewport.prev_pass.widgets;
+                rects
+                    .layers()
+                    .flat_map(|(_, widgets)| widgets)
+                    .filter_map(|widget| rects.info(widget.id))
+                    .find(|info| info.label.as_deref() == Some(label))
+                    .map(|info| info.enabled)
+            })
+        };
+        for label in ["Increase Opacity", "Decrease Opacity", "Opacity presets"] {
+            assert!(h.get_by_label(label).accesskit_node().is_disabled(), "{label} reports the disabled parent");
+            assert_eq!(metadata_enabled(label), Some(false), "{label} metadata reports the disabled parent");
+        }
+        h.get_by_label("Opacity presets").click();
+        h.run_steps(3);
+        assert!(!egui::Popup::is_any_open(&h.ctx), "a preset in a disabled parent must not open its menu");
+        h.check_accessibility();
+    }
+
+    /// Strict accessibility: every input in these fields is named and reports the right role.
+    #[test]
+    fn numeric_dropdown_and_checkbox_inputs_have_accessible_names_and_roles() {
+        const PRESETS: &[f64] = &[0.0, 50.0, 100.0];
+        let mut h = egui_kittest::Harness::builder().with_size(vec2(420.0, 240.0)).build_ui(|ui| {
+            let _ = NumField::number("Opacity", Some(50.0), "%", 0).spinner().presets(PRESETS).show(ui);
+            let _ = dropdown(ui, "Paragraph Styles", 160.0);
+            let mut on = true;
+            let _ = checkbox(ui, &mut on, "Preview");
+        });
+        h.run_steps(2);
+        h.check_accessibility();
+    }
 }
 
 /// `img` made to fit the GPU's largest texture (`max_side` pixels a side), sampled down
diff --git a/crates/ui-egui/tests/it/color_profiles_restart.rs b/crates/ui-egui/tests/it/color_profiles_restart.rs
index ad7ebcc75..e84022b6f 100644
--- a/crates/ui-egui/tests/it/color_profiles_restart.rs
+++ b/crates/ui-egui/tests/it/color_profiles_restart.rs
@@ -6,9 +6,13 @@ use designcraft_engine::Session;
 use designcraft_ui_egui::{DesignApp, Services, UiState};
 use serde_json::json;
 
-/// The app's first frame, where saved settings are applied.
+/// The app's first frame, where saved settings are applied: the host's `logic` tick and the
+/// first real `run_ui` pass (where fonts, theme and colour settings are installed).
 fn start(app: &mut DesignApp) {
-    let mut out = egui::Context::default().run_ui(egui::RawInput::default(), |ui| app.logic(&ui.ctx().clone()));
+    let mut out = egui::Context::default().run_ui(egui::RawInput::default(), |ui| {
+        app.logic(&ui.ctx().clone());
+        app.ui(ui);
+    });
     out.textures_delta.clear();
 }
 
diff --git a/docs/architecture.md b/docs/architecture.md
index 6e0c4c66b..7b86388a9 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -54,7 +54,7 @@ code points in the text. Threading is the story's ordered frame list.
 Every user-visible action is a `CommandSpec` (`id`, `label`, menu path, shortcut, parameter
 doc, `enabled`, `run`, journaled, undoable) in `crates/engine/src/cmd/*`. The UI, the CLI, MCP
 and the control channel all call `Session::execute(id, params)`. UI-only commands (windows,
-panels, zoom, dialogs) are `UI_COMMANDS` in `crates/ui-egui/src/menus.rs`, reachable the same way.
+panels, zoom, dialogs) are `UI_COMMANDS` in `crates/ui-egui/src/menus/ui_commands.rs`, reachable the same way.
 Tool gestures emit Begin/Preview/Commit commands so a drag is one undo step. Every journaled
 command is replayable as a script. Escaped panics during a command or an import/export become an
 error (`engine/src/guard.rs`), never a lost document; native recovery is written periodically
diff --git a/docs/control-protocol.md b/docs/control-protocol.md
index 1dc0eed49..92e7f108e 100644
--- a/docs/control-protocol.md
+++ b/docs/control-protocol.md
@@ -35,7 +35,8 @@ so only enable it while you use it. Transport: `apps/designcraft/src/control_ser
 | `engine.execute` / `ui.menu.invoke` | `{command, params}` | Run any engine or UI command (see `engine.commands`). `ui.menu.invoke` without `params` acts like choosing the menu item: a command labelled "…" that takes parameters opens its dialog. A key the command's params description doesn't name is an error (`unknown parameter …`), not ignored |
 | `engine.commands` | — | Every command: id, label, menu path, shortcut, params doc, enabled |
 | `document.inspect` | — | Pages, spreads, items, stories (overset), styles, swatches, selection |
-| `ui.inspect` | — | Tool, UI state, view (zoom/origin), canvas rect, perf |
+| `ui.inspect` | — | Tool, UI state, view (zoom/origin), canvas rect, panel layout (`docking`), perf, Separations Preview (`separations`: plate, ink limit, each separated spread's plates) |
+| `ui.docking` | — | The panel layout in use, the focused panel and the docking hit rects (see Shared panel docking) |
 | `ui.menu.list` / `ui.tool.list` | — | Menu tree / Tools panel groups |
 | `ui.tool.select` | `{tool}` | Select a tool (`selection`, `type`, `rectangleFrame`, …) |
 | `ui.pointer` | `{events:[{kind: down\|drag\|up\|move\|doubleclick, x, y, space?: "screen"\|"canvas", clicks?}], mods?}` | Drive the active tool through the same code path as the mouse; `clicks` on a `down` is the press count (3 = triple click); returns the selection, the tool and its cursor at the last event (e.g. `LoadedText`, `ThreadLink`, `Unthread`) |
@@ -74,36 +75,128 @@ to finish before retrying a request that would exceed the pending-event limit.
 ## Shared panel docking
 
 Panel arrangements support tab grouping and reordering, horizontal and vertical splits,
-and movable, resizable floating groups inside the application window. Drag a panel tab,
-or use its context menu. Floating groups remain within the application viewport.
+and movable, resizable floating windows. A floating window holds tab groups split side by side
+or one above another, like the dock area. Drag a panel tab, or use its context menu. On the
+desktop each floating window is a window of its own; on the web floating windows stay within
+the application viewport.
 
-The shared layout begins with the existing workspace on the first docking operation.
-Workspace saves retain its groups, active tabs, split sizes, floating geometry, and the
-positions of hidden panels. Resetting a built-in workspace restores its default dock.
+The window is one panel layout: the protected `canvas` panel (the document area) beside a
+dock at the logical end edge, the right in left-to-right languages and the left in
+right-to-left ones. Each built-in workspace has a default layout. Essentials and most others
+have an outer column with the Properties · Pages · Layers group and an iconic column with the
+other panels; Essentials Classic and Typography have their named iconic groups only. A panel a
+workspace opens (Printing and Proofing: Swatches) is a group below Properties · Pages · Layers.
+The `canvas` panel never moves, floats, closes or takes tabs; a panel or tab group dropped
+over it floats there. Workspace saves retain its groups, active tabs, split sizes, floating
+geometry, and the positions of hidden panels. Resetting a built-in workspace restores its
+default dock. Preferences saved before the canvas joined the layout load with nothing lost:
+the classic dock becomes the workspace's default layout, and a customized dock-only layout
+becomes the dock's expanded columns (iconic if the dock was collapsed), with the remaining
+panels (or the workspace's named groups) in the iconic column and its floating windows and
+hidden-panel positions kept. A `ui.json` the app cannot read in full is copied to
+`ui.unreadable.json` before it is saved again.
 
-- `window.panel.move {panel, anchor, zone?, before?}` moves a panel into the target group.
-  `zone` is `tab` (default), `center`, `left`, `right`, `top`, or `bottom`; `before` reorders
-  tabs by panel ID. The destination must already be visible.
-- `window.panel.float {panel, x?, y?, width?, height?}` detaches a panel.
-- `window.panel.dock {panel, anchor?, zone?, before?}` returns a panel to its previous
-  dock placement when possible, or to the supplied destination.
-- `window.panel.activate {panel}` reveals and selects a panel, restoring its saved
-  position when possible. `window.panel.close {panel}` hides it.
+The `window.panel.*`, `window.workspace.*` and `ui.dock` commands are craft-ui's shared
+docking commands (`DockCommand`), with the same ids and params in every craft app. `panel`,
+`anchor`, `target` and `before` take a panel ID or its English name in any case; `onto` is
+read as `anchor`.
+
+- `window.panel.move {panel, anchor, zone?, before?, group?, placement?}` moves a panel into
+  the target group. `zone` is `tab` (default), `center`, `left`, `right`, `top`, `bottom`,
+  `above` or `below`; `before` reorders tabs by panel ID (`null` appends). Beside a panel in a
+  dock column, `top` and `bottom` add a group above or below its group and `left` and `right`
+  add a column on that side; in a floating window, `top` and `bottom` add a group and `left`
+  and `right` are errors (craft-ui's `Placement::for_zone`). `group: true` moves the panel's
+  whole tab group; `placement` is a serialized craft-ui `Placement` and takes precedence over
+  `zone` and `before`.
+- `window.panel.float {panel, x?, y?, width?, height?, group?, column?}` (and
+  `window.floatPanel`) detaches a panel, its tab group (`group`) or its dock column
+  (`column`). Without a position it floats 24 points inside the dock area's top-left corner,
+  clear of the menu bar; a panel floats at its own size and a tab group or column at the size
+  a drag would float it at. Given values replace these. A panel already alone in a floating
+  window moves or resizes, and a tab group that is already a whole floating window keeps its
+  rect unless the params change it.
+- `window.panel.dock {panel, anchor?, zone?, before?, group?, column?, side?}` (and
+  `window.dockPanel`) docks beside `anchor`, or in a new column of the dock at `side`
+  (`Start` or `End`; a new dock when there is none). A panel that already leads that dock's
+  last column stays where it is. `zone` places the panel beside `anchor`, so a `zone` without
+  `anchor` or `side` is an error. Without `anchor` and `side`, a panel that floated from
+  the dock goes back to that place, and another floating panel joins the first dock group. For
+  the float-only Tabs panel (`tabs`), which has its own window outside the layout, float opens
+  that window and dock closes it.
+- `window.panel.activate {panel}` (and `window.panel {panel}`) reveals and selects a panel,
+  restoring its saved position when possible; a panel in an iconic column opens as a flyout
+  beside its icon. `window.panel.close {panel}` hides it.
+- `window.panel.closeGroup {panel}` hides the panel and the panels tabbed with it, and
+  `window.panel.closeOthers {panel}` hides the panels tabbed with it; the result lists them in
+  `closed`.
+- `window.panel.minimize {panel, minimized?}` minimizes the panel's group to its tab strip and
+  `window.panel.iconic {panel, iconic?}` collapses its dock column to icons; without the flag
+  they toggle.
+- `window.workspace.new {name}`, `window.workspace.delete {name}` and `window.workspace.reset`
+  (also `ui.dock.reset`) are `window.newWorkspace`, `window.deleteWorkspace` and
+  `window.resetWorkspace`. `window.workspace {name}` switches workspaces as before.
+- `ui.dock {action}` or `ui.dock {operation, …}` is the shape LightCraft, PDFCraft, CADCraft
+  and SoundCraft use: `open`, `close`, `activate`, `float {rect}`, `moveFloating {rect}`,
+  `move {target, zone?, before?}`, `setStackOpen {open}`, `resizeStack {height}` and
+  `resizeSplit {path, size}`, with `rect` as `[x, y, width, height]`.
+- `window.panel.window` (a panel into or out of its own window) and `window.workspace.lock` are
+  not available in DesignCraft and return an error.
+- `window.collapseToIcons` collapses every dock column to icons.
 
 Panel IDs are stable across themes. Invalid IDs, non-finite or invalid geometry, and
 invalid destinations return an error without changing the arrangement.
 
 `window.panel.layout {action}` also accepts the shared, externally tagged action schema.
 For example, `{"action":{"MoveFloating":{"panel":"properties","rect":[44,66,360,450]}}}`
-updates a floating group's position and size; `{"action":{"ResizeSplit":{"path":[],"size":{"Ratio":0.35}}}}`
-resizes the root divider (`false`/`true` path entries select first/second children).
+updates a floating window's position and size; `{"action":{"ResizeSplit":{"path":[],"size":{"Ratio":0.35}}}}`
+resizes the root divider (`false`/`true` path entries select first/second children), and
+`{"action":{"ResizeWindowSplit":{"panel":"swatches","path":[],"size":{"Ratio":0.6}}}}` resizes
+a divider in the floating window that holds `panel`, by its path from the window's root.
+Floating windows saved as a stack of groups (`{"groups": […], "rect": […]}`) load as groups
+one above another, sized by their saved heights.
 `Move` with `placement: {"Tab":{"before":"swatches"}}` reorders tabs, and
 `SetStackOpen {panel,open}` / `ResizeStack {panel,height}` control accordion entries.
 The UI dispatches these same commands. Unknown panel IDs, invalid geometry, and stale
 split paths return an error without changing the workspace.
 
-After panel customization, `app.tablePanel` (including Shift+F9) still toggles the
-Table panel. `ui.set` with `closePanel` closes the last explicitly opened panel;
-`dockExpanded:false` hides the root dock while floating groups remain visible.
-The icon rail can reopen a collapsed dock through any root panel. Activating a
-floating panel also raises its group. These operations change only UI layout.
+`app.tablePanel` (including Shift+F9) toggles the Table panel. `ui.set` with `closePanel`
+closes the last explicitly opened panel; `dockExpanded:false` collapses every dock column
+to icons and `dockExpanded:true` expands the outer column. Activating a floating panel also
+raises its group. These operations change only UI layout.
+
+Clicking an icon in an iconic column opens its group as a flyout beside the column, on the
+canvas side; clicking the icon again, or another icon, closes it. With Auto-Collapse Iconic
+Panels on (off by default; a column bar's menu toggles it), Escape or a click outside the flyout
+closes it too.
+
+`ui.docking` returns the panel layout in use; `ui.inspect` includes the same object as
+`docking`:
+
+```json
+{"layout": {"root": {"Split": {"axis": "Horizontal", "size": {"FixedSecond": 297.0},
+   "first": {"Tabs": {"panels": ["canvas"], "active": 0}},
+   "second": {"Dock": {"side": "End", "columns": [
+     {"groups": [{"panels": ["properties", "pages", "layers"], "active": 0}], "width": 260.0,
+      "iconic": false, "iconic_width": 37.0},
+     {"groups": [{"panels": ["stroke"], "active": 0}, …], "width": 260.0, "iconic": true,
+      "iconic_width": 37.0}]}}}},
+  "floating": []},
+ "customized": false, "focused": "canvas", "flyout": null, "autoCollapse": false,
+ "rightToLeft": false, "hidden": [],
+ "hitRects": [{"hit": {"Tab": "properties"}, "rect": [983.0, 0.0, 74.0, 27.0]},
+              {"hit": {"DragBar": "properties"}, "rect": [1190.0, 0.0, 56.0, 27.0]},
+              {"hit": {"Icon": "stroke"}, "rect": [1243.0, 14.0, 37.0, 30.0]}, …]}
+```
+
+`layout` is craft-ui's serialized `Layout`; `customized` is false while the workspace's
+default layout is in use; `focused` is the panel (or `canvas`) last clicked or selected, or
+null; `flyout` is the panel whose iconic-column flyout is open (as drawn in the last frame,
+or as a command that opens one sets it); `autoCollapse` is the
+Auto-Collapse Iconic Panels setting; `hidden` lists closed panels that remember their place.
+`hitRects` lists where each docking gesture starts in the last frame, from craft-ui's
+`DockArea::hit_rects`: `hit` is a serialized craft-ui `Hit` (`Tab`, `DragBar`, `Border`,
+`Overflow`, `ColumnBar`, `Collapse`, `StackToggle`, `Title`, `Close`, `Icon`, `IconGrip`,
+`Resize` with its edge, or `Divider`), naming groups, columns and windows by their first panel;
+`rect` is `[x, y, width, height]` in points. Drag from a rect's centre with `ui.drag`, or click
+it with `ui.click`, to script a gesture.
diff --git a/docs/egui-037-migration-plan.md b/docs/egui-037-migration-plan.md
new file mode 100644
index 000000000..165db7892
--- /dev/null
+++ b/docs/egui-037-migration-plan.md
@@ -0,0 +1,1426 @@
+# egui 0.37 migration plan for DesignCraft
+
+Status update (2026-10-25): implementation is ready locally for review and includes main `7ca39c6c10f123d0cd0176eda1511e59667c89d0`. Managed run `egui037-design-main7c-ci-20261025-0817` passed all nine Linux CI stages: 3,344 test executions passed, 0 failed and 6 ignored across 81 summaries. Counts include repeated executions. The current-main integration received independent review. Dependency pins and lockfile are unchanged. Current-source Windows/packages, native IME and paired application performance remain open. Publication requires separate explicit approval; human review and human merge are required.
+
+The original planning record below is historical.
+
+Status: planning only. No production change, build, test, GUI run, browser run, benchmark,
+push, pull request or publication was performed while writing this document. Every future test
+or build runs through `maintenance/task.py run/status/finish` with its own task, source and
+evidence; never run a build directly. Every future push or new pull request needs fresh explicit
+human approval after the exact contents and validation are shown. The contributor credit
+preference remains username-only (`@skylartaylor`); do not add display or real names or any
+agent/model/tool attribution.
+
+This plan covers only `storytold/designcraft`. It records the work needed to move the
+DesignCraft desktop, web and UI crates from the current coherent 0.36.2 dependency set to
+egui 0.37.0, the final reviewed suite fork and the matching final reviewed winit revision.
+Shared-library work remains in `storytold/craft-libs`; this plan consumes it but does not
+redefine it. Candidate `aiongg` revisions below are comparison inputs only. A production
+manifest must name the final reviewed `storytold` revisions, which do not exist until the
+fork/winit/craft-libs publication is reviewed and approved.
+
+Capture acceptance follows the suite contract: a queued-not-issued hidden request and
+each settling frame must request `RequestPaintWhileHidden` from logic; only an issued
+screenshot command forces paint itself. Callback arrival has no implicit wake, so the
+live request owns the viewport waker. Record known issuance UI bounds and a geometry
+epoch, reject/retry any intervening resize/DPI/zoom/surface change even if it changes
+back, and derive pixel scale from returned dimensions only under an unchanged epoch.
+Default limits are 4 requests, 128 MiB/image and 256 MiB aggregate. Count reserved
+in-flight and completed images together.
+
+
+## 1. Baseline and provenance
+
+### 1.1 Exact source baseline
+
+| Item | Value |
+| --- | --- |
+| DesignCraft checkout | `/home/codex/work/CraftApps/egui037-migration-20261022/designcraft` |
+| Baseline commit | `e74208dd7e0c801d15dfdf926d64cfe5e3b346d3` (`Merge pull request #1642 from aiongg/ci-speed`) |
+| Workspace version / edition / MSRV | `0.12.0` / edition 2024 / Rust 1.95 |
+| Lockfile | `Cargo.lock`, format version 4 |
+| Current egui family | `egui`, `epaint`, `ecolor`, `emath`, `eframe`, `egui-wgpu`, `egui-winit`, `egui_kittest`, `epaint_default_fonts` all `0.36.2` from crates.io |
+| Current winit | `git+https://github.com/storytold/winit.git?rev=3d51077fd1a966f84df9ef287839dc84fd5b4ca7` (0.30.13, W1–W14) |
+| Current `craft-ui` | `git+https://github.com/storytold/craft-libs?rev=5c874d51eeb3de70e735c8ce87a59a7dedd47675#5c874d51...` |
+| Upstream egui 0.37.0 | `841a328ba2dd8f6996beb7189ebb7fc00e668a2a` (release commit, not the annotated-tag object) |
+| Candidate egui fork (comparison only) | `aiongg/egui` `craft/0.37` = `a4f9a17f64a6bae61350fb85804c9df0d9865916` (E1–E21; E21b/P7b still to be added) |
+| Candidate winit (comparison only) | `aiongg/winit` `craft/0.30.13-lang` = `8b35388bd719e8cc86a95971ba0bc026c9a8f058` (W1–W27; W15P still to be added) |
+| Final storytold egui pin | **Unknown until approved publication**: a reviewed immutable `storytold/egui` revision containing the complete P8 handoff: E1–E21, E21b/P7b, E4/P2b, P7 key pairing and P7c fixes. Never ship the candidate hash. |
+| Final storytold winit pin | **Unknown until approved publication**: a reviewed immutable `storytold/winit` revision containing W1–W27 plus native W15P PRIMARY. Never ship the candidate hash. |
+| Final `craft-ui` pin | **Unknown until approved publication**: `<FINAL_CRAFT_UI_REV>`, the reviewed CL-2F revision (including CL-1, and CL-3 if it has landed) derived from current craft-libs, not a PR head. D1 uses the reviewed CL-1 + CL-2 provisional revision as a pilot; CL-2F follows the DesignCraft/GridCraft adapter reviews. |
+| Published predecessor | `storytold/egui` `craft/0.36.2` = `767b1cad294120689a514bb4bd68c077e46679b9`; published `storytold/winit` = `ffae5198770d7730e718043f035a772b7dbc3b1b` |
+| craft-libs PR 199 | head `b68de8c5f4f1c060904d211a7b1320aa0f7bce78`; audit tree `ec8840af8c5fda695cf195cdd05e5ae078415c07`. Both are **stale trees, not bases**: they omit `crates/platform` and revert current security/settings/docking/printer fixes. Apply only the API-port hunks from `8614e4a04fae516fba16c22b31ff1008cb6be10b` (and relevant README changes from `1764bca`) onto current craft-libs `49190884278f16c9a9f5823d7698a8ffb5deb062`. |
+| Related language work | `storytold/craft-libs#198`, delivered through fork E5/E9/E12–E17/E19–E21, E21b and winit W17–W27 plus W15P |
+
+Authoritative lifecycle evidence for this plan is
+`/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/lifecycle-source-audit.md`.
+It was checked against upstream `841a328b` and candidate `a4f9a17f`: both native
+`EpiIntegration::update` and web `AppRunner::logic` call `app.logic` then `app.ui` inside
+`Context::run_ui`, so `App::logic` can run once per layout pass in both hosts. After a normally
+completed `run_ui`, `current_pass_index()` is zero even after multiple passes. `run_logic` does
+not restore an old index. `ViewportInfo::visible()` is a method derived from `minimized`/
+`occluded`; it is not a callback-phase signal, and `None` means unknown.
+
+The IME gap is recorded in
+`/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/ime-surrounding-gap.md`. The
+candidate never calls W27 `set_ime_surrounding_text`, and `IMEOutput` has no logical text. E21b/P7b
+is a required new change, not existing capability.
+
+The historical compiler diagnostics at
+`/home/codex/work/ssd2/task-evidence/egui037-audit-20261022/{fork,stock}/designcraft.errors`
+are clues only. They were produced against an earlier prepare state, their counts are not
+acceptance, and the current source may differ. They do show the first API breaks: missing
+`Event::source`, removed `egui::UserData`/`Event::Screenshot`, renamed roles in
+`new_document.rs`, `font_menu.rs`, `panels/*`, and `FontData` blob typing in `theme.rs`.
+
+### 1.2 Packages, binaries, examples and feature targets
+
+| Target | Kind | Relevant manifest | Notes |
+| --- | --- | --- | --- |
+| `designcraft-ui-egui` | library | `crates/ui-egui/Cargo.toml` | The swappable L6 UI. Production depends on `craft-ui`, `egui`; dev depends on `egui_kittest` (`wgpu`, `snapshot`) and `designcraft-fonts` (`testing`). D1 adds an explicit `egui/default_fonts` dev feature (see §3.7). Build script only bakes contributor credits. |
+| `designcraft` | binary | `apps/designcraft/Cargo.toml` | eframe features `default_fonts`, `wgpu`, `accesskit`, `wayland`, `x11`, `links`. D1 adds `clipboard` to preserve Copy/Cut and Paste on 0.37 (0.36.2 forced it through eframe; see §3.5). Native-only `rfd`, `arboard`, `winit`; macOS `muda`, `objc2*`, `fmv-macos-events`; Windows `winsafe`. |
+| `designcraft-web` | wasm binary | `apps/designcraft-web/Cargo.toml` | `eframe` features `default_fonts`, `wgpu`, `accesskit`; `rfd`, `wasm-bindgen`, `web-sys`; `trunk` build. Browser clipboard/drop paths are web-specific. |
+| `designcraft-cli` | binary | `apps/designcraft-cli/Cargo.toml` | No egui/eframe/winit/rfd; headless and MCP. |
+| `ui_shot` | example | `crates/ui-egui/examples/ui_shot.rs` | `egui_kittest::Harness` with wgpu at 1440×900, 2×; drives control requests and saves whole-window PNGs. It steps one UI pass per `harness.step()` and is not native presentation evidence. |
+| `xtask` | workspace tool | `xtask/Cargo.toml` | `cargo xtask ci`, `wasm`, `layers`, `assets`, `pdf-deps`, `test`, `stats`, `parity`. |
+
+There are 22 workspace manifests (`Cargo.toml` plus `apps/*` and `crates/*`), no nested
+workspace, no `vendor/` directory, no examples or benchmarks that use egui other than
+`ui_shot`, and no `[[bench]]`, `[[test]]` or `[[example]]` entries in any manifest. The only
+workspace patch section is the root `[patch.crates-io]` in `Cargo.toml`.
+
+Relevant platform cfgs:
+
+| Cfg | Files | What must remain true |
+| --- | --- | --- |
+| `target_arch = "wasm32"` | `apps/designcraft-web/src/{main,web}.rs`, `crates/ui-egui/src/lib.rs` (`now_ms`, recovery, render worker) | Browser entry point and async file/drop/download paths build and run; native-only recovery, dropped-file paths and render worker stay out. |
+| `not(target_arch = "wasm32")` | `crates/ui-egui/src/lib.rs`, `apps/designcraft/Cargo.toml` | Native recovery, `arboard`, `rfd`, control server, `winit` and the enabled clipboard path keep compiling. |
+| `unix` and `not(target_os = "macos")` | `apps/designcraft/src/main.rs` X11 event-loop builder | XWayland selection and file drops still work; `winit` pin changes do not remove `EventLoopBuilderExtX11`. |
+| `windows` | `apps/designcraft/{Cargo.toml,src/gpu.rs}`, `build.rs` | `winsafe` display-GPU query and Windows resource build remain; DX12 backend selection and `WgpuError` fallback are tested. |
+| `target_os = "macos"` | `apps/designcraft/src/{main,native_menu,mac_window,apple_events}.rs`, `crates/fonts` CoreText | Native menu, Apple events, `movable_by_window_background`, IME marked-text discard and cancelable termination keep their winit W12/W14/W22/W26 behavior. |
+| X11/Wayland | `egui-winit` clipboard path, `apps/designcraft/src/main.rs` | D1 enables the explicit clipboard feature; D3 adds E4/W15P native PRIMARY on the winit data device. One regular data device only; password exclusion and unchanged-selection policy preserved. |
+| `cfg(test)` / `cfg(all(test, unix))` | `crates/ui-egui/src/*`, `apps/designcraft/src/main.rs` | Test-only counters and atomic-writer tests do not leak into release; kittest strict names and missing-glyph policy are explicit. |
+
+### 1.3 Current CI and validation commands
+
+All future commands below run through `maintenance/task.py run` with a unique `--job-id`, the
+owning `--task`, exact `--source` and durable `--evidence`; inspect with `status` and complete
+with `finish` after reviews.
+
+- `cargo xtask ci`: `fmt --all -- --check`, `pdf-deps`, `clippy --workspace --all-targets --
+  -D warnings`, `nextest run --workspace --lib --bins --tests` (or `cargo test`), doctests,
+  `assets`, `layers`, `wasm`.
+- `cargo xtask wasm`: one `cargo check --target wasm32-unknown-unknown --keep-going` over
+  L0–L5 plus `designcraft-ui-egui`.
+- `cargo test -p designcraft-ui-egui --lib` is the package-scoped UI row. It must run with the
+  explicit `egui/default_fonts` dev feature and with `theme::install_fonts` before layout.
+- Clean-checkout dependency gate: after publication, a fresh clone runs
+  `cargo fetch --locked` and `cargo metadata --locked --format-version 1` against the final
+  storytold revisions. A missing/unreachable revision or a machine-local path fails the gate.
+- CI workflow `.github/workflows/ci.yml` runs `cargo xtask ci` on Ubuntu 24.04 with pinned
+  craft-fonts `abb83316d96aa59c1cf64784289e378fe9fa5695`, nextest, and the apt/winit build
+  dependencies.
+- `windows-arm64.yml` packages and installs ARM64; `freebsd.yml` runs the workspace in a
+  FreeBSD VM; `release.yml` uses the shared release workflow.
+- Manual UI evidence: `cargo run --release -p designcraft -- --sample --control 7979`,
+  control requests, `ui.screenshot`, and `cargo run -p designcraft-ui-egui --example ui_shot
+  -- script.jsonl` for offscreen whole-window screenshots.
+- Native/browser workflows are listed in §6.4; `ui_shot` alone is not native focus, IME,
+  picker, clipboard or browser-presentation evidence.
+- There is no performance benchmark target today. `ui.inspect` exposes
+  `perf.frameMs`, `perf.renderMs`, `perf.fps`, `perf.patches`; `perf.frameMs` uses
+  `now_ms()` (`SystemTime` on native, `0.0` on wasm) and is not a monotonic acceptance
+  timer. §7 defines the test-only raw-sample harness.
+
+## 2. What 0.37 changes that actually affects DesignCraft
+
+DesignCraft already uses `eframe::App::logic`/`App::ui` and a root `Ui` on 0.36.2. The
+0.37 migration must preserve that structure; it is not a reason to rewrite panels into
+`Context::root_ui` calls or to move every action out of `logic`.
+
+| 0.37 change | Source anchor | DesignCraft impact |
+| --- | --- | --- |
+| `Event::MouseWheel` gains `source: MouseWheelSource` | `egui/src/data/input/event.rs`, `MouseWheelSource` | Every synthetic wheel event in tests must set `source` (`Unknown` for most; `Wheel`/`Trackpad`/`Momentum` where the behavior under test depends on it). Production matching already uses `..`, but the canvas's Alt-wheel state machine must be rechecked. |
+| `Event::Screenshot` and `egui::UserData` are removed; `ViewportCommand::Screenshot(ScreenshotCallback)` | `egui/src/data/screenshot_callback.rs`, `viewport.rs`; upstream #8489 | `ScreenshotCallback` is one-shot and does not repaint. Replace token/`UserData` correlation with a per-request completion slot owned by the request record and a weak callback; see §3.4. |
+| `WidgetType` is replaced by `accesskit::Role` (`egui::Role`); alias deprecated | `egui/src/lib.rs` compatibility table; #8555 | Map `SelectableLabel` → `Button`, `TextEdit` → `TextInput`, `CheckBox` → `CheckBox`, `Other` → `Unknown`. The full file list is in §3.7: `new_document.rs`, `panels/font_menu.rs`, `panels/pages.rs`, `panels/mod.rs`, `panels/styles.rs`, `panels/cell_stroke.rs`, `panels/properties.rs`, `panels/swatches.rs`, `panels/layers.rs`, `object_control.rs`, `widgets.rs`, `toolbar.rs`, `chrome.rs`, `taskbar.rs`, `icons.rs`, `dialogs.rs`. |
+| `Id::new` deprecated for `Id::unique`; `Ui::id` renamed `Ui::scope_id`; `UiBuilder::id` renamed `scope_id` | `egui/src/id.rs`, `egui/src/ui.rs`; #8534/#8542/#8586 | Mechanical but warning-sensitive because `clippy -D warnings` treats deprecations as failures. Use `Id::unique` for root IDs and `scope_id` for child scopes. Do not change the hashed values: `Id::new` now delegates to `Id::unique`, so state keys remain stable. |
+| `Panel` constructors take `impl AsIdSalt`; panel ID is `parent_ui.scope_id().with_salt(salt)`; `CentralPanel` remains last; root `Ui` is the normal app surface | `egui/src/containers/panel.rs`; #8592 | Existing `Panel::left("tools")`, `Panel::right("dock")`, etc. still type-check. Panel IDs are now parent-salted. DesignCraft does not persist egui memory (eframe persistence is off); update in-memory test lookup keys and retain the actual app-owned UiState/docking preferences. No PanelState migration is needed. Panel order must not change. `CentralPanel::default().show(ui, …)` is correct; `Context::root_ui` must not be called inside `App::ui`. |
+| `default_fonts` is no longer a default `egui`/`epaint` feature | `egui/Cargo.toml`; #8583 | `eframe` still enables it in the app, but `cargo test -p designcraft-ui-egui` does not build the app and `egui_kittest` disables egui defaults. Add `egui/default_fonts` explicitly to the ui crate's dev feature set and install DesignCraft fonts before layout; do not rely on workspace unification. |
+| `FontData.font` is now a shared `Blob` (`Arc<dyn AsRef<[u8]> + Send + Sync>`), not `Cow<[u8]>` | `epaint/src/text/font_data.rs` | Production struct-update code in `theme.rs` still works; tests that compare `data.as_ref()` must use `data.bytes()` or `data.font.as_ref().as_ref()`. This caused the historical `theme.rs:766/793` errors. |
+| `egui_kittest` fails unnamed input widgets and panics on missing glyphs by default | `egui_kittest/src/accessibility.rs`, `builder.rs`; #8589/#8601 | The first green stage must satisfy strict names/glyph policy, not disable it globally. D1 adds names/policy for the existing test surface; D4 completes coverage. Deliberate tofu fixtures use `HarnessBuilder::allow_missing_glyphs()` with a named reason. |
+| Native eframe can discover system fonts through `egui_system_font_provider`, and `NativeOptions::system_font_fallback` defaults true | `eframe/src/native/epi_integration.rs`; #8512 | DesignCraft already catalogs system fonts in `designcraft-fonts` with script-specific families and baseline tweaks. Set the option false and keep the feature off, or font order and line metrics change. Add the #8512 cold-start workload in §7. |
+| Clipboard is no longer forced on by eframe; `egui-winit` clipboard is an explicit feature | `eframe-0.36.2/Cargo.toml` target dep forces `egui-winit/clipboard`; `eframe-0.37.0/Cargo.toml` exposes `clipboard = ["egui-winit/clipboard"]` and depends on egui-winit with defaults off; `egui-winit-0.37.0/src/clipboard.rs` stores only in-process without arboard/smithay | 0.36.2 wrote Copy/Cut to the OS clipboard. On 0.37 without the feature, `ctx.copy_text` is in-process only and `RequestPaste` cannot read the OS clipboard. D1 enables `eframe/clipboard` to preserve native Copy/Cut/Paste, with the control-channel guard. D3 adds E4/W15P PRIMARY on the same winit data-device path. |
+| X11/Wayland PRIMARY selection is new in `egui-winit`, and the candidate's E4 path replaces arboard with winit's data device | `egui-winit/src/clipboard.rs`, `lib.rs`; #8428; E4 | Enabling clipboard makes PRIMARY reachable. The final fork must include E4 plus native W15P; test pointer- and keyboard-triggered ownership (including keyboard-only focus), serial freshness, owner/seat changes, empty/absent offers, self-paste, canceled/slow transfers on wlroots/KWin/Mutter, password exclusion and no second regular data device. |
+| `TextEdit` selection behavior changed on click-away | upstream #8763, unmerged PR #8764 | The fork owns the selected fix. Source audit finds no DesignCraft control that reads an egui `TextEdit` selection in the same pass: formatting acts on the engine `TextSel`; dialog/search buttons read buffers. The regression test documents stock 0.37 click-away behavior and asserts the app's engine selection/target is unchanged; if a future control reads `TextEdit` state, carry #8764 or defer the command with a tested app change. |
+| Text tessellation is reported ~60% slower for plain text | upstream #8731 | UI frame cost may rise even though layout is unchanged. The fix must keep color emoji correct; branch once per row, not clamp-only. Measure the fixed 120-label workload. |
+| DX12 pipeline creation is reported ~4× slower from `wrap_texel_coord` | upstream #8736 | Windows startup can get ~40 ms slower. Measure renderer/shader construction separately from first frame; do not call shader compile time UI performance. |
+| `#8748` hidden-parent/deferred-child is closed and unmerged | upstream #8748 | Do not assume hidden-window child viewport updates are fixed by 0.37. The fork owns a tested solution; DesignCraft must open/update/close its immediate second viewport while the parent is hidden/occluded/overdue, with unknown visibility (`visible() == None`) as well as `Some(false)`. |
+| `Context::root_ui`, `run_ui`, `run_pass`, `run_logic`; root `Ui` cannot be recursively entered; both native and web `App::logic` run per `run_ui` pass | `egui/src/context.rs`; `eframe/src/native/epi_integration.rs`; `eframe/src/web/app_runner.rs`; #8535; lifecycle audit | Use the passed `&mut Ui` in `DesignApp::ui`; use `run_ui` for UI tests and `run_logic` only for side-effect tests. Recursive `root_ui` panics. Do not use `visible()` as a logic/UI phase signal; a forced hidden paint is still a UI pass. |
+| Style defaults changed (roomier buttons, larger corner radius) | #8617/#8445 | Custom `Tokens` still drive most colors, but egui widget spacing/rounding inherited from `Visuals` can shift geometry. Visual baselines need an explained intended change, not a blind update. |
+| E21b/P7b outgoing IME surrounding text is missing | `IMEOutput`/`egui-winit` candidate source; `ime-surrounding-gap.md` | Add the bounded transient payload, built-in `TextEdit` producer and W27 Wayland adapter; DesignCraft's custom canvas editor supplies a real model/preedit/UTF-8 adapter, not `None`. |
+
+## 3. Source audit and concrete migration design
+
+### 3.1 Existing frame flow
+
+The desktop host implements `eframe::App` in `apps/designcraft/src/main.rs`:
+`App::logic` calls `startup.enter`, `take_notice`, the `frames == 2` presented check,
+`frames += 1`, startup error-log installation, macOS native menu/Apple-event polling, then
+`DesignApp::logic`; `App::ui` calls `DesignApp::ui`, then macOS IME/movable handling.
+`App::raw_input_hook` delegates to `DesignApp::raw_input_hook`. The web shell does the same
+in `apps/designcraft-web/src/web.rs`, with asynchronous drop-file reading and a graphics
+health check.
+
+Source facts that constrain the design (verified against the pinned trees):
+
+1. Native `EpiIntegration::update` (`eframe-0.37.0/src/native/epi_integration.rs:349-361`)
+   calls `Context::run_ui(raw_input, |ui| { app.logic(ui.ctx(), …); app.ui(ui, …) })`.
+   Web `AppRunner::logic` (`eframe-0.37.0/src/web/app_runner.rs:290-293`) does the same.
+   A multipass frame therefore calls host and app `logic` once per pass, not once per frame.
+2. `Context::run_logic` (`egui-0.37.0/src/context.rs:1174-1202`) only refreshes viewport/
+   window/focus input; events and time stay from the previous UI pass.
+3. `run_dyn` passes `new_input.take()` to each `begin_pass`; the second pass has no raw
+   events. `PointerState::button_clicked` scans `pointer_events`, which are cleared and
+   repopulated from that empty event list, so a button does not re-fire merely because a
+   pass was discarded. Command-producing UI still needs a one-pass/undo test because a
+   discarded first pass may act on pre-discard geometry; it does not need a global
+   `!will_discard()` ban.
+4. After a completed `run_ui`, `ContextImpl::end_pass` takes `viewport.output`; the returned
+   output owns the completed-pass count and `current_pass_index()` reads the now-zero
+   viewport output. `run_logic` does not restore a stale index. The earlier comment alleging
+   a leftover nonzero count was wrong.
+5. `ViewportInfo` has `minimized`/`occluded` fields and a `visible() -> Option<bool>` method;
+   there is no public `visible` field. `visible() == None` is unknown, and eframe forces a
+   real UI pass for `RequestPaintWhileHidden`/pending `Screenshot` even when hidden.
+6. `update_logic_only` stores the prepared raw input in `pending_raw_input`; the next
+   `update` prepends it to new input. Normal pointer/key/text/IME events can therefore be
+   replayed after hidden logic.
+
+`DesignApp::logic` (`crates/ui-egui/src/lib.rs:1102`) currently does all of:
+`egui_ctx` capture, `window_maximized`, one-time CMS activation through `color_applied`,
+`ctx.set_zoom_factor` from `ui.ui_scale`, `zoom_with_keyboard=false`, font installation and
+the 250 ms system-font poll, `theme::apply`/`restyle`, FPS smoothing from `i.time`, recovery
+autosave from `i.time`, control drain, stale new-document preview cleanup, inbox/open-OS-
+documents, synthetic repaint requests, screenshot collect/issue, shortcut handling, window-
+command flush, native dropped-file handling and quit handling. `DesignApp::ui` (`lib.rs:1472`)
+does layout: app bar, control bar, status bar, Tools, dock, central canvas, second viewport,
+floating panels/story editor/dialogs/about/palette, resize borders, URLs and frame timing.
+
+This is a 0.36.2-shaped flow, not a 0.37 regression. However, 0.37 makes the latent problems
+more important:
+
+1. Every per-frame side effect in `logic` runs again on a discarded second pass. That
+   includes font/theme setup, recovery checks, FPS sampling, screenshot issue/collect and
+   side effects that are not input-driven.
+2. While minimized/occluded, eframe normally runs `Context::run_logic` and no UI pass. All
+   `ctx.input` except viewport/window/focus information is stale. A forced hidden paint is
+   different: `run_ui` does run, with fresh prepared input, even though `visible()` may be
+   `false` or `None`.
+3. Host `App::logic` counts passes in `frames`; on a multipass frame `frames` advances twice,
+   so `startup.presented()` and startup error logging happen at the wrong pass.
+4. Input buffered by `update_logic_only`, and synthetic control events injected in
+   `raw_input_hook` during a hidden tick, can replay into a later UI pass with a different
+   focus or document state.
+
+The correct migration is to make the frame stages explicit, not to merge `logic` into
+`ui`, not to add a generic `Context` bridge, and not to use `visible()` as a phase signal.
+
+### 3.2 Frame-stage contract
+
+Introduce an explicit, testable split inside `DesignApp` while keeping the public
+`logic(&Context)` and `ui(&mut Ui)` entry points that hosts and tests use.
+
+```rust
+// crates/ui-egui/src/lib.rs
+pub fn logic(&mut self, ctx: &egui::Context) {
+    // Every call (first pass, later discarded pass, or hidden run_logic) may poll consumed
+    // queues and deadlines. It must never replay an already-consumed message.
+    self.logic_tick(ctx);
+    // current_pass_index is 0 on the first pass and on hidden run_logic, and >0 on later
+    // passes of the same run_ui. It is not a freshness test and must not gate input reads.
+    if ctx.current_pass_index() == 0 {
+        self.logic_frame(ctx);
+    }
+}
+
+pub fn ui(&mut self, ui: &mut egui::Ui) {
+    let first_pass = ui.ctx().current_pass_index() == 0;
+    self.layout(ui, first_pass);
+}
+```
+
+The guard is deliberately narrow: it removes duplicate per-run_ui side effects, but a hidden
+`run_logic` tick still has index 0, so autosave, control commands, inbox results and deadlines
+continue. A command that arrives between passes is retained in its queue (or its reply is
+pending); the control server requests a repaint, and the next frame's first pass consumes it.
+Never put an unconditional `return` for `current_pass_index() != 0` around queue draining,
+screenshot completion or background deadlines.
+
+`logic_tick` (every call) owns work whose identity is a consumed queue item, revision or
+monotonic deadline:
+
+- `drain_control`; each request is taken once. Screenshot requests add a request record and
+  do not issue from the queue.
+- `drain_inbox` and `open_os_documents` after fonts are ready; inbox items are consumed once.
+- `handle_quit` (fresh `close_requested` in `i.viewport()`), `flush_window_commands`.
+- Screenshot result draining, late-result rejection and deadline replies; take results out
+  of the slot under a short lock before encoding/writing.
+- While a control gesture still has queued synthetic events, request a paint while hidden
+  (§3.3). Never inject a synthetic event during a logic-only tick.
+- Filter buffered OS input after a hidden tick using the focus/document generation recorded
+  at the tick (§3.2 input policy).
+
+`logic_frame` (first pass only) owns genuine once-per-run_ui work:
+
+- `egui_ctx` capture; `window_maximized` update (`lib.rs:1106`).
+- One-time CMS activation through `color_applied` (`lib.rs:1107-1112`).
+- `ctx.set_zoom_factor` from `ui.ui_scale` and `zoom_with_keyboard=false` (`lib.rs:1114-1119`).
+- Font installation/reinstallation from `theme::install_fonts`, `fonts_system` readiness and
+  the 250 ms `request_repaint_after` while the font scan runs (`lib.rs:1121-1131`).
+- `theme::apply`/`restyle` (`lib.rs:1132-1135`).
+- Recovery autosave (`lib.rs:1136-1147`), changed from `ctx.input(i.time)` to a monotonic
+  `Instant` clock so it continues during hidden logic and never uses a stale frame time.
+  Recovery is native-only (`#[cfg(not(target_arch = "wasm32"))]`); wasm uses its browser
+  time source rather than `Instant`/`now_ms()`.
+- FPS smoothing only on a real UI pass, using a monotonic `Instant` on native and the
+  browser frame time on wasm; do not inject zero/duplicate samples from hidden logic.
+- `new_document::end_stale_preview(self)` (`lib.rs:1157`) and the synthetic/control
+  `ctx.request_repaint()` while events remain (`lib.rs:1160-1162`).
+- Screenshot issue after the 120 ms/3-frame settling rule (`lib.rs:1636-1648`).
+- `menus::shortcuts` moves out of `logic` into the first-pass `input_stage` below.
+- Native dropped files move out of `logic` into `pending_drops`, captured in
+  `raw_input_hook`; `logic` never reads stale `ctx.input` drops.
+- `handle_quit` stays in `logic_tick` because `close_requested` is fresh viewport data and a
+  close request must not wait for a first pass.
+
+`layout` calls `input_stage(ui)` only on the first pass, before the app bar:
+
+- `menus::shortcuts(self, ui.ctx())` runs against live input;
+- native dropped files are taken from `pending_drops` (captured in `raw_input_hook`), not
+  read from stale `ctx.input` in logic;
+- no other input event is read twice. `canvas::show` and text fields continue to use egui's
+  normal per-widget input. Shortcut consumption happens before layout, preserving the
+  existing order.
+
+`DesignApp::ui` must never call `ctx.root_ui(...)`: the root `Ui` is already borrowed by
+the host callback, and `Context::root_ui` panics in that situation (#8535). The passed
+`&mut Ui` is the one to use for `Panel`, `CentralPanel`, `Area`, and `show_viewport_immediate`.
+
+Host guard: `apps/designcraft/src/main.rs` must not increment `frames` or run macOS menu/
+Apple-event polling on every pass. Wrap the host body in the same first-pass condition (or
+dedupe with `ctx.cumulative_frame_nr()`), while always delegating to `self.app.logic(ctx)`,
+which has its own narrow guard. `frames` then counts presented `run_ui` frames, preserving
+the `frames == 2` startup.presented semantics. Add a host-level forced-multipass test through
+the actual `App` wrapper, not only `DesignApp`.
+
+`raw_input_hook` remains the one place that sees the exact `RawInput` before a pass. It
+continues the current batching: one pointer event per host iteration, a key press/release
+pair together, with trailing Text retained for a later iteration (`lib.rs:1456-1469`). Add:
+
+- native `raw.dropped_files` capture into `pending_drops` and removal from the raw input, so
+  a hidden `run_logic` cannot re-open the last drop;
+- a focus/document generation snapshot on each hidden logic tick;
+- a filter that drops buffered `Text`/`Ime`/`Paste` events when the focus target or active
+  document changed since the hidden tick, and drops an incomplete pointer chord (press
+  without release or release without press) across a hidden->visible transition. Complete
+  pointer/key events are replayed in order; pointer hover is refreshed or cleared with
+  `PointerGone`. Record the policy and counts in the test-only instrumentation.
+
+On web, `WebShell::raw_input_hook` is called in both the visible and hidden `AppRunner`
+paths. It must capture dropped files and start the asynchronous `bytes_async()` read there,
+pushing the result into the existing inbox. `WebShell::logic` must not take
+`ctx.input_mut` for drops. This is a source correction: the current
+`apps/designcraft-web/src/web.rs:351-370` reads drops in `logic`, while `raw_input_hook`
+(`web.rs:374-379`) does not.
+
+Test-only instrumentation may record stage counts:
+`#[cfg(test)] logic_tick_ticks`, `logic_frame_ticks`, `input_ticks`,
+`screenshot_callbacks`, so forced-multipass and hidden tests can prove one side effect and
+one input stage per frame. The counters must not exist in release builds.
+
+`Context::run_ui` is the test entry point for layout and `Context::run_logic` for
+side-effect-only tests. Do not initialize fonts inside `run_logic` in a UI test: no pass
+runs, so font installation/layout does not behave as in a visible frame. `ui_shot` and
+kittest harnesses call `app.logic(ui.ctx())` and `app.ui(ui)` inside the UI closure as they
+do now, with the same pass-index guard. Tests must also drive the real host/web callback
+order, not a fictional once-per-frame native host.
+
+### 3.3 Control input while hidden
+
+The control channel is used for automation even when the window is minimized. Under
+0.37, a hidden window normally runs only `logic`; synthetic pointer/key/text/IME events
+injected through `raw_input_hook` are not applied unless a UI pass runs. A
+`ViewportCommand::RequestPaintWhileHidden` holds for **one frame** and must be sent again for
+another (`egui/src/viewport.rs:1239-1247`); a plain `request_repaint` does not force a hidden
+paint (`egui-winit/src/lib.rs:1922-1924`).
+
+Policy:
+
+- Do not use `visible()` as a phase signal. Use it only as a hint for whether to request a
+  hidden paint. `None` (unknown visibility) is treated like hidden for this purpose.
+- raw_input_hook runs before both host paths, so deliberately allow its drain-based
+  injection into pending_raw_input during a logic-only iteration. Eframe retains those
+  events for the next full pass. Send RequestPaintWhileHidden while an admitted gesture
+  has queued OR injected-but-unapplied events; acknowledge delivery only from known UI
+  phase. Preserve current pointer/key batching, generation filtering and event order.
+  Test hidden injection followed by forced paint: one action/reply, no dropped or replayed
+  events. An empty synthetic queue alone does not mean pending input was already applied.
+- Pure engine commands (`engine.execute`) never request a hidden paint.
+- `ui.screenshot` already forces a paint through the `Screenshot` viewport command; do not
+  add a second `RequestPaintWhileHidden` for it. Still send `Focus` as today.
+- `ui.dialog.confirm` and other methods whose result depends on layout follow the same
+  pending-gesture rule.
+- The control reply may be `ok` before all events are applied (current behavior). Tests and
+  documentation must assert the final command/undo/document result, not the number of
+  events sent or a single paint request.
+
+### 3.4 Screenshot callback migration
+
+Current code (`lib.rs:587`, `drain_control`, `issue_screenshots` at 1636,
+`collect_screenshots` at 1652) stores `(token, path, reply, deadline)` in `pending_shots`,
+queues `(token, at, frames)` in `queued_shots`, sends
+`ViewportCommand::Screenshot(UserData::new(token))`, then scans `Event::Screenshot` for
+`user_data.downcast_ref::<u64>()`. All of that changes.
+
+Shared contract: the suite selects one bounded, cancelable completion slot per admitted
+request. Eleven existing craft-ui creative consumers adopt its helper; DeckCraft, FigCraft and ArtCraft Native keep a
+small local contract-compatible adapter. DesignCraft uses craft-ui. The helper is staged as
+CL-2 (provisional) and frozen as CL-2F after DesignCraft and GridCraft adapters are reviewed.
+
+DesignCraft request record:
+
+- Keep the existing token counter, path, reply channel, 8 s deadline and 120 ms/3-frame
+  settling rule in `DesignCraft`. These are app-owned.
+- Each `pending_shots` record owns one `craft_ui::capture::CaptureSlot` (provisional API;
+  final name/API after CL-2F). The slot holds the request id, target `ViewportId`, deadline,
+  a weak wake handle and at most one `Arc<ColorImage>`.
+- `issue_screenshots` sends
+  `ctx.send_viewport_cmd(ViewportCommand::Screenshot(ScreenshotCallback::new(move |image| {
+      if let Some(slot) = slot.upgrade() {
+          slot.complete(image); // weak slot; no DesignApp/Context strong capture
+      }
+  })))`.
+  The callback captures only a `Weak` reference to the slot. It must not capture
+  `egui::Context` strongly (no context self-retention cycle), must not encode PNGs, write
+  files, run commands, hold a long lock or borrow mutable app state.
+- `ScreenshotCallback` is one-shot; clones share one callback and complete at most once.
+- Bound admission by both request count and aggregate pending image bytes before issuing a
+  capture. Compute the allowed surface dimensions, reject an oversized/stale image on
+  completion, release its reservation and image, and account for renderer/readback transient
+  memory separately in peak RSS. A post-callback size check alone is not a bound.
+- Capture the target `ViewportId`; use `request_repaint_of(viewport)` from the live slot, not
+  an implicit current/default viewport. Release the slot lock before waking.
+- `drain_screenshot_results` runs in `logic_tick`, matches the slot record, takes the image
+  out under a short lock, then calls `control::save_screenshot(self, image.as_ref(), path)`
+  on the UI thread. Late callbacks for timed-out/canceled/closed records release the image
+  and send no reply/file.
+- Correlate only `ViewportId::ROOT` for `ui.screenshot` until the protocol grows an explicit
+  viewport field; do not guess from the pointer.
+- Account for E2 surface fitting: the returned image may be smaller than the window. Derive
+  x/y scale from the returned image dimensions and the recorded logical viewport rect/DPI;
+  a resize/DPI generation mismatch retries within the deadline or returns an error. Never
+  combine old pixels with current geometry.
+
+Tests: two outstanding tokens/viewports resolve to their own paths; completion is one-shot;
+out-of-order completion; timeout plus late callback; cancel/close/shutdown; delayed readback;
+hidden-window wakeup; aggregate memory returns to zero after drain; a reused viewport/document
+generation does not bind an old capture to a new document; no file/reply from a canceled
+capture; `ui_shot` still renders whole-window PNGs.
+
+### 3.5 Input, IME, clipboard and keyboard layouts
+
+`Event::MouseWheel` constructors in `canvas.rs`, `menus.rs`, `dialogs.rs`, `chrome.rs`,
+`new_document.rs`, `object_control.rs`, `panel_docking_tests.rs` and `lib.rs` must add
+`source`. Use `egui::MouseWheelSource::Unknown` for synthetic wheel input unless a test
+is specifically about `Trackpad`/`Momentum`; the canvas's `wheel_alt` only depends on
+`phase` and `modifiers`, so behavior is preserved.
+
+IME:
+
+- The canvas (`canvas::ime_event`, `canvas::delete_surrounding`) currently handles
+  `Preedit`, `Commit`, `DeleteSurrounding { before_chars, after_chars }`.
+  `delete_surrounding` loops `text.delete` up to 64 times (`canvas.rs:2695-2701`), and each
+  `text.delete` is an ordinary undoable command (`crates/engine/src/lib.rs:565-585`), so the
+  current path can create up to 64 undo entries.
+- E21 adds `ImeEvent::DeleteSurroundingBytes { before_bytes, after_bytes }`. Implement a
+  single mandatory engine command, `text.deleteSurroundingBytes { beforeBytes, afterBytes }`
+  (or an equivalent single `edit`), that deletes the exact UTF-8 ranges around the caret in
+  one `s.edit` call, producing one undo entry. Do not make this optional and do not
+  approximate bytes as characters/`text.delete` loops.
+- Validate both counts are bounded (default cap 4096 bytes each and no larger than the story/
+  selection), both ranges are valid UTF-8 boundaries via `str::get`, no range extends past
+  the story, and no split grapheme is produced. Preserve track-changes behavior by marking
+  deleted text and stepping the caret, as `text.delete` does. Test replacement, deletion-
+  only batches, combining mark/flag/ZWJ, preedit/commit sequencing, `tool_composing()`,
+  focus/serial changes and canceled compositions.
+- The web text agent keeps its existing `DeleteSurrounding` character behavior.
+- E21b/P7b: add the bounded outgoing surrounding-text payload to `IMEOutput`, the built-in
+  `TextEdit` producer and the egui-winit W27 Wayland adapter. DesignCraft's custom canvas
+  editor (`canvas::ime_output`, `canvas.rs:2720-2753`) supplies a real model/preedit/UTF-8
+  adapter: logical committed document text around the caret, preedit excluded, UTF-8 byte
+  cursor/anchor, at most 4000 bytes, explicit Unavailable context (distinct from available-empty) when the selection
+  cannot fit, and clearing on focus loss, no IME, reset and password/no-context. It must not
+  pass display-bidi text or set the payload to `None` as a placeholder. Audit every
+  `IMEOutput` constructor/destructure. Tests cover outgoing text after delete+commit and
+  deletion-only batches, supplementary/combining/RTL text, preedit exclusion, long lines,
+  field/window switching and the full E21b contract: owner/context generation even
+  when unavailable, available-empty distinct, W27 committed clear boundary, latest-pass
+  None replacing earlier payload, old-focus-epoch invalidation, and current-epoch done
+  serial mismatch applying incoming edits once while deferring outgoing until a match.
+  Include initially empty→non-empty and normal→password→normal protocol cases.
+
+Clipboard:
+
+- Source contract: `eframe-0.36.2/Cargo.toml:234-237` forces
+  `egui-winit` with `features = ["clipboard"]` even with eframe defaults off. 0.37's eframe
+  exposes `clipboard = ["egui-winit/clipboard"]` and depends on egui-winit with
+  `default-features = false` (`eframe-0.37.0/Cargo.toml:60,239-241`). Without the feature,
+  `egui-winit-0.37.0/src/clipboard.rs:113-141` stores `set_text` only in-process. DesignCraft's
+  Copy/Cut calls `ctx.copy_text` (`crates/ui-egui/src/lib.rs:806-824`), and its focused-field
+  Paste path sends `ViewportCommand::RequestPaste` (`menus.rs:2717`).
+- Enable `eframe/clipboard` in the D1 source-compatibility PR to preserve native OS
+  Copy/Cut/Paste. This activates arboard/smithay in egui-winit alongside the app's arboard
+  read path; keep the app-owned `install_clipboard_guard` so control actions never write or
+  read the user's clipboard, and keep `Services::clipboard_text` for the menu Paste path that
+  must not go through egui.
+- Native evidence in D1: select text, Copy/Cut, read from an independent arboard
+  process/handle on X11 and Wayland; test object copy and SVG/text paste; verify focused
+  `TextEdit` paste and canvas paste are not doubled; verify control-channel privacy.
+- D1 includes E4/W15P in its complete fork pin; D3 expands native policy coverage. E4 routes regular clipboard through winit's Wayland data device with an
+  arboard fallback; W15P adds a native PRIMARY path on the same connection/event queue and
+  per-seat lifecycle using SCTK 0.19.2 `PrimarySelectionManagerState`/devices/sources/offers.
+  Do not bind a second regular `wl_data_device`. Test PRIMARY pointer- and keyboard-triggered ownership (including keyboard-only focus), serial
+  freshness, owner/seat changes, empty/absent offers, self-paste, canceled/slow transfers,
+  password exclusion and no unchanged-selection reclaim on wlroots/KWin/Mutter. Native
+  capability evidence is still required; compile-only is not acceptance.
+- `Event::PasteImage` is new but DesignCraft has no image-paste contract. Leave it
+  unhandled rather than inventing a placement path. Add a test that it does not panic and
+  does not leak into text paste.
+
+Keyboard layouts: after the fork pin, `RawInput::keyboard_layout_is_latin` and
+`RawInput::latin_layout_chars` (E19) must preserve tool and command shortcuts on Russian,
+Arabic and Hebrew layouts. W25 covers Linux Latin-layout lookup, W26 macOS deletion and W27 Wayland surrounding
+text; Windows keeps its own native input path. E19 also needs a real Windows test
+with a non-Latin layout; a synthetic `KeyboardEvent` test is not enough
+for the OS layout table.
+
+### 3.6 Panels, docking and viewports
+
+`DesignApp::ui` keeps the existing order:
+
+1. `chrome::app_bar` (`Panel::top("app_bar")`)
+2. optional `chrome::control_bar`
+3. `chrome::status_bar` (`Panel::bottom("status_bar")`)
+4. `toolbar::show` (`Panel::left("tools")`)
+5. `dock::show` / `panel_docking::show` (`Panel::right("dock")`,
+   `Panel::right("shared-panel-dock")`, icon columns)
+6. `CentralPanel::default()` last among panels
+7. second-window `show_viewport_immediate`
+8. floating panels/flyouts, story editor, dialogs/about/palette (areas/windows/modals)
+9. custom-titlebar resize borders
+
+0.37's `Panel` constructors accept `AsIdSalt`; the string salts remain stable, but the
+panel `Id` is now `parent_ui.scope_id().with_salt(salt)` (`egui/src/containers/panel.rs:974-
+975`), whereas the 0.36 panel id was the salt alone. D1 updates test helpers such as `dock.rs:473` and `panel_docking_tests.rs:639` to
+load the parent-salted key using the actual parent Ui scope. Eframe persistence is disabled:
+there is no saved egui PanelState migration. Preserve app-owned UiState/docking layout through
+`save_prefs` and test its save/reopen behavior and panel rectangles. Keep the docking identity
+`designcraft-panel-docking` unchanged for saved layout and live drag state.
+
+`craft-ui` CL-1:
+
+- Do not use PR199's `b68de8c`/`ec8840a` trees as a base. They are stale relative to current
+  `4919088`, omit `crates/platform`, and revert current security/settings/docking/printer
+  fixes (including floating-group move/resize guards `d66e345`/`fd9cf54`).
+- Apply only the API-port hunks from `8614e4a` (and relevant README changes from
+  `1764bca`) onto current `4919088`, preserving intervening fixes, `crates/platform` and
+  unrelated crates. Review a diff against both `5c874d51` (the current DesignCraft pin) and
+  `4919088`; pin the exact resulting immutable revision.
+- `WidgetType` → `Role` in `buttons/mod.rs`, `docking/surface.rs`, `layout/resize.rs`,
+  `tabs/mod.rs`; `Id::new` → `Id::unique`; `Ui::id`/`UiBuilder::id` → `scope_id`.
+- The corrected revision keeps the same docking transaction model and `DockArea` API
+  DesignCraft uses. A model/permission change is not incidental: if intentionally changed,
+  state it as a product decision with tests.
+- CL-3 adds the explicit opt-in `DockArea::direction(DockDirection::{LeftToRight,
+  RightToLeft})` visual policy. DesignCraft calls `LeftToRight` explicitly for now (no E9
+  global mirroring) and relies on CL-3's geometry/hit/drag/keyboard tests. Saved physical
+  splits, rectangles and logical tab order must be unchanged by direction; never reverse
+  saved panel order or pass display-bidi text into shaping/clipboard.
+
+The second window uses
+`ViewportId::from_hash_of("designcraft_second_window")` and
+`ViewportBuilder::with_title(...).with_inner_size([960, 720])`. Keep the ID and the
+immediate viewport. Add tests for: opening/closing the second window through
+`window.newWindow`; the main window's pane focus returning on click; close-request
+cancellation of the main viewport; screenshot correlation to the root viewport only;
+`CentralPanel` not consuming the second window's available rect; and #8748 hidden-parent/
+deferred-child behavior while the root is occluded/minimized/overdue and while
+`visible() == None` (open, update, close, and acknowledge without restoring the parent).
+
+### 3.7 Fonts, glyphs, RTL and accessibility
+
+`theme::font_definitions` builds `FontDefinitions` from bundled Source Sans 3/JetBrains
+Mono plus optional craft-fonts (`CRAFT_FONTS_DIR`) and installed system faces selected by
+`SYSTEM_UI_FONTS`. `install_fonts` returns false while the background font scan is
+running and the app reinstalls when `system_fonts_ready()` becomes true. This must stay the
+source of truth.
+
+Concrete changes:
+
+- `theme::SystemFont::new` and the `FontData { index, tweak, ..from_owned }` constructions
+  are source-compatible with 0.37's `FontData`; only test assertions that read
+  `definitions.font_data[name].font` or `data.as_ref()` need `data.bytes()`/`font.as_ref()`.
+- Set `NativeOptions::system_font_fallback = false` explicitly and keep eframe's
+  `system_fonts` feature off. This prevents `egui_system_font_provider` from adding fonts
+  ahead of DesignCraft's script-specific order and makes the policy visible in code.
+  Document that DesignCraft's own `FontDb` provides system fallbacks.
+- `FontDefinitions::default()` is empty when `default_fonts` is off
+  (`epaint-0.37.0/src/text/font_definitions.rs:111-117`). Add `egui/default_fonts` explicitly
+  to the `designcraft-ui-egui` dev feature set and install DesignCraft's fonts before layout
+  in package-scoped tests, together with explicit `monochrome_emoji_fonts` where used.
+  This restores egui's built-in icon/emoji fallback without relying
+  on the app binary's feature unification.
+- Production keeps `MissingGlyphPolicy::Tofu` (the default). Tests that deliberately draw
+  unsupported scripts use `HarnessBuilder::allow_missing_glyphs()` with a named reason; tests
+  proving coverage keep the panic policy. Do not set tofu globally in production tests
+  merely to silence a regression.
+- Test fixtures use the licensed fonts pinned in the egui plan §10.6 (craft-fonts
+  `2481a8a`, Noto Sans Arabic/Thai/CJK, BIZ UDPGothic; Noto Sans Hebrew and Noto Color Emoji
+  from their upstream OFL sources with the recorded SHA256/licences). DesignCraft keeps its
+  own policy: Latin UI/document fonts stay in `assets/fonts/`; central craft-fonts remains an
+  optional `CRAFT_FONTS_DIR` input; do not copy new font binaries into this repository.
+  Fetch fixtures into the task's explicit fixture directory and retain licences.
+- Add a glyph-coverage test over every `i18n` catalog string and every UI font family,
+  using `FontDb` faces, not egui's `has_glyph` alone (it can report false for the face
+  that supplies the replacement glyph). Gate craft-fonts-specific CJK expectations on
+  `CRAFT_FONTS`; when absent, assert the built-in coverage and skip CJK glyph assertions
+  explicitly. Existing Ukrainian/Russian tests in `theme.rs` are the model.
+
+RTL/bidi single owner:
+
+- At D1 the fork's E5/E12 becomes the only bidi owner for egui-rendered UI/label text.
+  `rtl::widget`/`rtl::label` pass logical `LayoutJob`s (with explicit language/direction
+  where needed) to `fonts.layout_job`; remove the manual `BidiInfo::visual_runs` reordering,
+  section reversal, neutral-character mirroring, Arabic family swap and per-row
+  `row.pos.x += width - row.size.x` right-alignment in `rtl.rs`. Keeping them would process
+  Arabic/Hebrew a second time in epaint's `BidiLevels::new` (the fork's
+  `text_layout.rs:120` always runs bidi; `LayoutJob::direction` defaults to `Auto`).
+  The document composer's own `crates/compose/src/bidi.rs`/`shape.rs` remains the bidi
+  owner for document text and canvas glyph placement; this change is about the egui label
+  path, not a rewrite of document composition.
+- Keep `Galley::job.text` as the logical source and use logical strings for clipboard,
+  save, accessibility, search and commands. Never pass visual-order/display-bidi text to
+  shaping or the clipboard. Keep the bounded layout cache (256 labels/4096 bytes) keyed by
+  the logical job, font token and language/direction.
+- Editable `TextEdit` paths use the fork's logical text and grapheme/caret mapping; the
+  custom canvas editor must not feed visual-order strings.
+- D3 differential tests: Arabic/Hebrew/mixed fixtures assert visual glyph order, logical
+  `Galley::job.text`, row widths, caret/hit positions, selection across boundaries, marks,
+  end caret and exactly one alignment (no double right-shift). ASCII fixtures must remain
+  identical to stock 0.37 where the API is shared. Run the fixtures at D3, not "only if
+  replaced".
+
+`Context::set_language` (E17, fork only) is applied once when `ui.language` changes,
+after fonts are installed and before layout. It must not change stored document text,
+ids, commands or persisted workspace data. `Context::language` is the fallback on the
+web if eframe does not set it.
+
+Do not enable `Style::right_to_left` (E9). DesignCraft keeps an LTR panel/docking model with
+RTL text inside labels, matching the persisted `craft_ui::docking::Layout` and existing
+workspaces. Enabling E9 would mirror menus, scrollbars and docking chrome without a product
+decision and would double-mirror shaped text. The explicit `DockArea::direction(LeftToRight)`
+above is the only docking direction policy in this migration.
+
+Accessibility labels: kittest's `check_accessibility` now runs by default, and the first
+green stage must satisfy strict names/glyph policy. Add explicit names where a control is
+an input (`Role::Button`, `TextInput`, `CheckBox`, `Slider`, `SpinButton`, `ComboBox`, `Tab`,
+`Splitter`):
+
+- `icons::button`, `widgets::icon_toggle_sized`, `widgets::checkbox`,
+  `widgets::dropdown`, toolbar/fill/stroke chips: use the existing localized tip/`label`
+  via `Response::accessible_name` or `WidgetInfo`.
+- `widgets::NumField`: add a label field or `.accessible_name`; do not leave the
+  internal `id` as the only name.
+- `dialogs::text_field`: pass the visible label id and use `ui.label_inputs_by(label.id,
+  …)` or `ui.name_inputs(tr(key), …)`; section labels added as plain `ui.label` do not
+  automatically name the field.
+- `panels/font_menu.rs`, `panels/pages.rs`, `panels/layers.rs`, `panels/library.rs`,
+  `story_editor.rs`, `new_document.rs`: bind each field to its visible label; icon-only
+  star/expand buttons use their localized tooltip.
+- Role migration files: the plan's earlier list omitted `panels/properties.rs`,
+  `panels/swatches.rs`, `panels/layers.rs` and `object_control.rs`. Map: swatch/color well →
+  `Role::Button` with the swatch name/value; layer row → `Role::ListItem`/`Role::Button`
+  matching its selectable row behavior; object-control label → `Role::Label`; combo/dropdown →
+  `Role::ComboBox`; numeric field → `Role::SpinButton`; text field → `Role::TextInput`;
+  checkbox → `Role::CheckBox`; tab → `Role::Tab`; split/resize → `Role::Splitter`.
+- `craft_ui::docking::DockArea` already names tab/overflow/resize controls after CL-1/CL-3;
+  keep `Role::Tab`, `Role::Button`, `Role::Splitter` and labels stable.
+- `Response::labelled_by` is preferred when a visible label exists;
+  `Response::accessible_name` for icon-only controls; `Ui::name_inputs` only for
+  third-party/grouped widgets that cannot be named at their construction site. Do not
+  paper over a missing label with a generic "field" name.
+
+### 3.8 Theme and visual defaults
+
+`theme::apply` sets `Visuals`, text styles and widget palette from `Tokens`; most colors
+are explicit. 0.37's roomier button defaults and larger corner radius can change layout
+even when tokens are unchanged. Audit:
+- `v.button_padding`, `v.menu_margin`, `v.window_margin`, `v.item_spacing`,
+  `v.interact_size` and `CornerRadius` in `theme::apply`;
+- `widgets::FIELD_H`, `BUTTON_H`, `SEG_W`;
+- panel default sizes in `dock.rs`, `panel_docking.rs`, `toolbar.rs`;
+- menu popup width/height and `menus::menu_button`;
+- `chrome::app_bar` / `control_bar` / `status_bar` heights.
+
+Do not replace explicit geometry with 0.37 defaults. A visual diff is an intended change
+only after review and is recorded in evidence.
+
+## 4. Dependency and publication topology
+
+### 4.1 Intended suite graph
+
+For suite validation, DesignCraft resolves exactly one copy of each egui-family crate and
+one winit. The revisions below are placeholders until the reviewed `storytold` publications
+exist; candidate `aiongg` hashes are comparison inputs only.
+
+```
+designcraft / designcraft-web / designcraft-ui-egui
+  -> egui 0.37.0          git <FINAL_STORYTOLD_EGUI_REV>   (contains E1-E21, E21b, E4/P2b)
+  -> eframe 0.37.0        git <FINAL_STORYTOLD_EGUI_REV>
+  -> egui-winit 0.37.0    git <FINAL_STORYTOLD_EGUI_REV>
+  -> egui-wgpu 0.37.0     git <FINAL_STORYTOLD_EGUI_REV>
+  -> egui_kittest 0.37.0  git <FINAL_STORYTOLD_EGUI_REV>   (dev)
+  -> epaint/ecolor/emath/epaint_default_fonts  git <FINAL_STORYTOLD_EGUI_REV>
+  -> winit 0.30.13        git <FINAL_STORYTOLD_WINIT_REV>  (W1-W27 plus W15P PRIMARY)
+  -> craft-ui             git <FINAL_CRAFT_UI_REV>         (CL-2F after adapter review; includes CL-1/CL-3)
+  -> wgpu 30.0.1          registry
+  -> accesskit 0.25.1     registry
+```
+
+`egui_extras` is not used by DesignCraft; do not add or patch it. `egui_plot` and
+`egui_dock` are not used; do not assume version numbers for them. `egui_system_font_provider`
+is not used because the `system_fonts` feature stays off.
+
+### 4.2 Root `[patch.crates-io]` additions
+
+A dependency's own `[patch]` section does not propagate to this consumer. Add all of the
+following to the root `Cargo.toml`, each with the same full immutable git revision and no
+moving branch or machine-local path:
+
+```toml
+[patch.crates-io]
+egui = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
+eframe = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
+egui-winit = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
+egui-wgpu = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
+egui_kittest = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
+epaint = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
+epaint_default_fonts = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
+ecolor = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
+emath = { git = "https://github.com/storytold/egui", rev = "<FINAL_STORYTOLD_EGUI_REV>" }
+winit = { git = "https://github.com/storytold/winit", rev = "<FINAL_STORYTOLD_WINIT_REV>" }
+```
+
+The egui remote must be the published, reachable `storytold/egui` mirror containing the
+reviewed fork history. Pinning `aiongg/egui` directly is not the production plan; it would be
+an explicit policy decision, not a default. The winit remote must likewise be the final
+reviewed `storytold/winit`, not the candidate URL/revision. A branch name, a machine-local
+path, or a `path` override must never appear in a shipped manifest.
+
+Workspace dependency versions change from `0.36` to `0.37` for `egui`, `eframe` and
+`egui_kittest`. `egui_extras` is present in the workspace dependencies but is not used by
+DesignCraft; bump it only if a future consumer adds a real dependency on it.
+`apps/designcraft` keeps its eframe feature list and adds `clipboard` in D1 (see §3.5). Do
+not add `system_fonts`.
+
+### 4.3 Lockfile, clean checkout and duplicate checks
+
+After generating a lockfile through the managed build workflow, verify:
+
+- `Cargo.lock` has exactly one `egui`, `epaint`, `ecolor`, `emath`, `eframe`,
+  `egui-winit`, `egui-wgpu`, `egui_kittest` and `winit` entry.
+- Every egui-family source is `git+https://github.com/storytold/egui?rev=<FINAL...>#<FINAL...>`;
+  no `registry+.../egui-0.36.2` or `-0.37.0` remains and no candidate `aiongg` source is
+  shipped.
+- `winit` source is the exact final storytold revision; no registry 0.30.13 and no old
+  `3d51077f...` copy remains.
+- `wgpu` stays `30.0.1`; `accesskit` moves to the version egui 0.37 requires
+  (`0.25.1` in the reference graph).
+- `cargo metadata --locked --format-version 1` resolves the same graph as the lock.
+- `cargo tree -d` shows no duplicate egui-family crate and no duplicate winit. A
+  duplicate `accesskit_consumer` from unrelated crates is a warning to inspect, not an
+  automatic failure.
+- `cargo xtask layers` still reports `designcraft-ui-egui` as the only egui consumer
+  below L7, and `cargo xtask wasm` includes `designcraft-ui-egui`.
+- `cargo xtask ci` passes with the exact lock and with and without `CRAFT_FONTS_DIR` for
+  the font tests that support both.
+- Clean checkout: `cargo fetch --locked` and `cargo metadata --locked --format-version 1`
+  succeed without local overrides. Negative fixture: replacing the final egui/winit revision
+  with a candidate hash or the old DesignCraft winit override must fail the gate.
+
+The root `[patch.crates-io]` also contains the unrelated PDF entries. Keep
+`krilla`, `hayro`, `hayro-interpret`, `hayro-syntax` and `hayro-jbig2` at
+`storytold/craft-libs` `89dcbb3060377a26c99a6d80caa16084366704c4` unchanged. They are not
+egui vendors and have their own provenance, tests and removal conditions.
+
+### 4.4 craft-libs CL-1/CL-2 and language work
+
+CL-1 is a rebased API port, not a merge of PR 199's tree. Start from current
+`4919088`, apply only the `8614e4a` hunks (plus relevant `1764bca` README changes), and
+preserve `d66e345`/`fd9cf54`, `crates/platform`, security/settings/printing and unrelated
+crates. Review the diff against both `5c874d51` (DesignCraft's current pin) and `4919088`.
+The corrected revision must:
+- keep `craft-ui` production source compatible with **stock** egui 0.37.0;
+- expose the same docking transaction model and `DockArea` API DesignCraft uses, plus the
+  CL-3 opt-in direction API;
+- provide the CL-2 capture slot and CL-2F frozen API used by DesignCraft's screenshot adapter;
+- pass its registry-egui 0.37 check, all-feature clippy and tests;
+- publish an immutable revision that DesignCraft can pin.
+
+DesignCraft does not take fork-only API from `craft-ui`: the fork lives in the dependency
+patch table, not in `craft-ui`'s manifest. This keeps `craft-ui` publishable and lets
+DesignCraft choose the fork independently.
+
+Language work (#198) enters DesignCraft only through the final fork pin and the selected app
+changes in §3.5/§3.7. It must not introduce ICU locale conversion, change document language
+semantics, mirror the whole UI, add fonts, or replace the docking model.
+
+## 5. Existing patches and vendored fixes: keep/remove audit
+
+DesignCraft has no `vendor/` directory. Its relevant non-registry inputs are:
+
+| Patch / input | Current revision | Provenance | Decision for this migration | Removal condition |
+| --- | --- | --- | --- | --- |
+| `winit` | `storytold/winit` `3d51077f...` (W1–W14) | storytold/winit `craft/0.30.13`; X11 `with_x11`, macOS `with_close_requested_on_terminate`, `mac_window::sync_movable` | Replace with `<FINAL_STORYTOLD_WINIT_REV>` (W1–W27 plus W15P). W12/W14 remain; W15/W15P/W25/W26/W27 are needed by E4/E19/E21. | Upstream winit 0.30/0.31 contains the equivalent patches and the suite no longer needs the fork. |
+| `egui`/`eframe`/`egui-winit`/`egui-wgpu`/`egui_kittest`/`epaint`/`ecolor`/`emath` | registry 0.36.2 | crates.io | Replace by `<FINAL_STORYTOLD_EGUI_REV>` containing E1–E21, E21b and E4/P2b in D1 after the isolated stock-0.37 comparison, including P7c/P8. Candidate `a4f9a17f` is comparison input, not the pin. | Upstream egui release contains the equivalent behavior (or the suite drops each patch when its `PATCHES.md` condition is met). |
+| `egui_extras` | registry 0.36.2, only in `craft-ui` dev-dependencies | crates.io; not used by DesignCraft | Leave alone. Do not add a patch entry unless a DesignCraft crate directly uses it. | No removal needed. |
+| `krilla` | craft-libs `89dcbb30...`, version `=0.8.2` | PDF backend vendor patch in craft-libs; unrelated to egui | Keep exactly. | Its own PDF backend gate. |
+| `hayro`, `hayro-interpret`, `hayro-syntax`, `hayro-jbig2` | craft-libs `89dcbb30...`, pinned versions | PDF parser vendor patches in craft-libs | Keep exactly. | Their own PDF parser gates. |
+| `craft-ui` | `5c874d51...` | craft-libs published revision | Move to the reviewed CL-1/`<CL-2_PROVISIONAL_REV>` in the D1 capture pilot, then `<FINAL_CRAFT_UI_REV>` (CL-2F/CL-3). | Replaced by the final reviewed revisions. |
+| `craft-pdf`, `craft-atomic`, `craft-cms`, `craft-docpath`, `craft-print` | individual craft-libs revisions | Shared libraries, not egui | Keep. Do not conflate their revisions with the UI migration. | Their own release cadence. |
+
+Do not delete an unrelated vendor or patch merely because the lockfile changes. Do not copy
+`aiongg/egui`'s workspace `[patch]` section into DesignCraft's manifest; only the root
+`[patch.crates-io]` entries above apply.
+
+## 6. Test and regression strategy
+
+### 6.1 Fixtures and determinism
+
+- Use `file.newSample` / `designcraft_engine::sample::magazine()` for a deterministic
+  multi-page document. Avoid user files and environment-dependent font caches.
+- Run native tests with `DESIGNCRAFT_NO_PREFS=1` and a dedicated
+  `DESIGNCRAFT_CONFIG_DIR`, or an explicit empty override, so preferences and recovery do
+  not leak between runs.
+- Build with the pinned craft-fonts ref `abb83316d96aa59c1cf64784289e378fe9fa5695` for
+  release/font evidence, and also without `CRAFT_FONTS_DIR` to keep the bundled-font path
+  tested. Use the §10.6 font fixtures for Arabic/Thai/CJK/Japanese/Hebrew/color-emoji
+  coverage with their recorded SHA256/licences; keep them out of app source.
+- Use fixed window sizes 1440×900 and 1280×800, at 1× and 2× `pixels_per_point`, and
+  fixed themes `mediumDark`, `light`, `highContrast`. Record the exact fixture, font
+  directory, DPI and OS/renderer with every screenshot.
+- Use `CRAFT_UI_DOCKING_FIXTURES` for the existing explicit docking visual fixtures;
+  do not turn those optional captures into unconditional CI jobs.
+- Every command runs through `maintenance/task.py run/status/finish` with an allocated
+  target/VM and durable evidence; do not run tests directly.
+
+### 6.2 Unit / kittest regressions
+
+| Area | Test (new or adapted) | User-observable assertion |
+| --- | --- | --- |
+| Frame staging | `logic_frame_runs_once_across_a_discarded_pass` | Force a `request_discard` by making the Tools panel single-column too tall; assert one font/theme/recovery/FPS tick and one input stage, not two. |
+| Host staging | `host_multipass_counts_one_presented_frame` | Drive the real host `App` wrapper through a forced discard; `frames`/startup.presented/error logging advance once, and macOS menu/Apple-event polling is not duplicated when available. |
+| Hidden logic | `hidden_logic_ticks_after_completed_multipass_keep_working` | A completed multipass frame followed by repeated `run_logic` ticks runs font readiness/recovery/queue checks each tick with fresh viewport data and no stale index assumption. |
+| Hidden forced paint | `forced_hidden_paint_is_a_ui_pass` | `RequestPaintWhileHidden` with `visible() == Some(false)` and with `visible() == None` runs `logic` + `ui`; visibility is not used as a phase guard. |
+| Control while hidden | `control_gesture_requests_paint_until_all_events_apply` | A hidden multi-frame `ui.click`/`ui.drag`/`ui.key` sends `RequestPaintWhileHidden` on each hidden frame while events remain; the final command/undo result is correct. Pure `engine.execute` requests no paint. |
+| Screenshots | `two_screenshot_viewports_resolve_to_their_own_paths` | Internal capture-helper test (the `ui.screenshot` control method stays ROOT-only): two outstanding requests with different tokens/viewports receive the matching image; no cross-write. |
+| Screenshot lifecycle | `screenshot_cancel_timeout_and_late_callback_release` | Timeout/cancel/close writes no file and sends no second reply; a late callback releases its image; aggregate pending bytes return to zero. |
+| Screenshot memory | `screenshot_admission_bounds_aggregate_bytes` | Oversized/concurrent captures are rejected or bounded; peak retained bytes stay within the admitted budget; E2 surface-fit scaling is correct. |
+| Mouse wheel | `wheel_events_keep_their_source_and_phase` | Alt-wheel zoom, plain-wheel scroll, trackpad phase end and momentum source do not latch modifiers. |
+| Roles/IDs | `role_and_id_migration_keeps_existing_state_keys` | A saved `UiState`/workspace round-trips; panel tabs, layer rows and styles resolve by the same stable IDs. |
+| Panel state | `saved_panel_state_migrates_to_parent_salted_ids` | Old-format panel rects/widths load into the new parent-salted keys; the same outer rects and panel order result. |
+| Panels | `panel_order_and_central_rect_are_unchanged` | App bar/control/status/tools/dock occupy the same outer rects; central canvas rect is unchanged at 1440×900 and after narrow-resize. |
+| Docking | `saved_workspace_restores_tree_float_and_hidden_panel` (existing plus 0.37) | Docking tree, floating geometry and hidden placement survive serialization; invalid actions are atomic; direction changes do not reorder saved splits/tabs. |
+| Second window | `second_window_opens_closes_and_keeps_main_focus` | Popout exists, close request removes it, main pane focus returns; main close can still be cancelled. |
+| Hidden child (#8748) | `hidden_parent_child_viewport_updates_and_closes` | With the parent occluded/minimized/overdue and with `visible() == None`, the child opens/updates/closes and acknowledges without restoring the parent. |
+| Accessibility | `every_visible_input_has_an_accessible_name` | `Harness::unnamed_widgets()` is empty; specific roles/labels for tabs, icon buttons, numeric fields, combo boxes, layer rows, swatches and text fields. |
+| Glyphs | `every_catalog_character_has_a_face_or_a_declared_gap` | Bundled fonts cover Latin/Cyrillic catalogs; craft-fonts CJK assertions run when present; tests use panic policy for covered text and explicit tofu only for deliberate gaps. |
+| IME exact bytes | `ime_replacement_deletes_exact_bytes_in_one_undo_step` | `DeleteSurroundingBytes` replaces a combining mark/letter and Undo restores the exact prior text in one step; `DeleteSurrounding` character path still works; caps/UTF-8/track changes are enforced. |
+| IME surrounding text | `outgoing_surrounding_text_is_logical_and_bounded` | DesignCraft canvas emits logical model text after delete+commit/deletion-only; preedit excluded; <=4000 bytes at UTF-8 boundaries; focus/password/no-IME clears; no `None` placeholder; latest completed pass including None replaces the descriptor/payload atomically; owner remains present for Unavailable and W27 clear/epoch/serial behavior follows P7b. |
+| IME composition | existing `canvas`/`story_editor` preedit-commit-cancel tests | Marked text does not duplicate, click-away discards on macOS, no undo step for a cancelled composition. |
+| Text selection (#8763/#8764) | `click_away_then_button_acts_on_engine_selection` | A button reading the app's engine `TextSel` after clicking away from an egui `TextEdit` still acts on the intended range; stock 0.37's TextEdit cursor/selection loss is recorded and does not change the engine target; if a future control reads TextEdit state, the command is deferred with an explanation. |
+| Commands/undo | `multipass_edit_is_one_undo_step` | A text edit, live-preview commit, dialog apply or toolbar/app-bar button produces exactly one history entry across discarded passes (including the second viewport). |
+| Save/reopen | `save_reopen_preserves_document_and_workspace` | Save to a temp `.designcraft`, reopen through `file.openBytes`, compare document model/selection/style/swatches; saved workspace and panel layout restore. |
+| Clipboard native | `copy_cut_write_the_system_clipboard` | On X11 and Wayland, select text/objects, Copy/Cut, read from an independent arboard reader; paste back; control actions never read or replace the clipboard. |
+| CLI control privacy | existing `control_paste_never_reads_the_system_clipboard` | Control actions still never read or replace the user's clipboard. |
+| Web drop | `web_drop_is_captured_in_raw_input_hook` | A browser `drop` with a synthetic File starts the async read in `raw_input_hook`, reaches the inbox once, and opens the document; no drop read remains in `WebShell::logic`. |
+| Buffered input | `hidden_restore_drops_stale_text_ime_and_incomplete_pointer` | After a hidden tick, changed focus/document discards buffered text/IME/paste; a partial pointer chord is dropped; complete pointer/key events replay in order; two windows stay separate. |
+| Menu/palette | existing `menus` tests plus 0.37 role checks | Menus open/close, keyboard activation, overflow within viewport, Quick Apply runs one command. |
+| Canvas | existing guide/column/frame-hit tests plus new 0.37 geometry | Hit tests and smart guides do not regress from panel rect changes. |
+
+### 6.3 Semantic accessibility assertions
+
+Add `Harness::check_accessibility()` (the default) to UI tests and explicit queries:
+
+- Menus: root menu items have `Role::MenuItem` or `Role::MenuBar`; disabled items remain
+  reachable by name.
+- Panel tabs: `Role::Tab`, selected state and localized label; tab drag still starts from
+  the tab rect.
+- Icon-only controls: tooltip text is the accessible name; star/expand, eye/lock, fill/
+  stroke chips, screen-mode toggles, toolbar overflow.
+- Text fields: each has a visible `labelled_by` relationship or a `placeholder`; a blank
+  label is not an acceptable name. Numeric fields expose `Role::SpinButton` and a value.
+- Swatches/color wells, layer rows, object-control labels, combo boxes: the mappings in
+  §3.7, with name/value/selected state.
+- Sliders and split handles: `Role::Slider`/`Role::Splitter`, value/range and accessible
+  name; keyboard arrow changes still work.
+- Dialog modals: `Role::Dialog` or a named `Area`; the title is the name; Escape cancels.
+- Focus: Tab order reaches the control bar, panels, canvas and dialog buttons; focus ring
+  uses `Tokens::accent`/`focus_stroke`; no invisible widget is exposed.
+
+These are semantic assertions, not only screenshot checks. A screen reader sees the same
+names and roles across 0.36.2 -> 0.37 except where a deliberate mapping (e.g.
+`SelectableLabel` -> `Button`) requires a new role.
+
+### 6.4 Visual, native and browser workflows
+
+- Whole-window PNGs at 1440×900/1× and 2×, medium-dark and light, with the same sample
+  document and fonts. Compare against 0.36.2 baseline produced in the same environment.
+- Justify tolerances in advance: geometry assertions use exact `Rect` comparisons for
+  panel/canvas/tab rects (within 0.01 pt), and pixel comparisons allow antialiasing noise
+  only where the change is explained (for example 0.37 corner radius). Do not accept a
+  golden because it changed; inspect `.new` vs `.old`, list the intended deltas, and keep
+  the old baseline for rollback.
+- Add high-contrast, Arabic, Hebrew, CJK and color-emoji fixtures. For RTL, compare glyph
+  order, logical `Galley::job.text`, row width and caret/hit positions, not only pixels.
+- Windows: use a uniquely owned clone and `C:\CraftApps\Launch-CraftDesktop.ps1` through
+  the scheduled-task helper. Drive control-channel edit/save/reopen, dock/float/popout and
+  `ui.screenshot`, inspect fresh screenshots, and record the software renderer
+  (Microsoft Basic Render Driver) as a separate row.
+- Linux: native X11 and Wayland runs with compositor identity; exercise panels, second
+  window, copy/paste/PRIMARY, file drop, IME (Wayland) and visible edited/saved/reopened
+  workflows. No inherited display/compositor exists at planning time; provision an
+  isolated display/window manager and compositor before claiming this row.
+- Browser: run the Trunk build in a pinned browser with WebGPU and `?webgl`; load the sample,
+  edit, save/download, drag-drop a synthetic file, take screenshots and record the browser/
+  adapter/backend. Wasm compile and `ui_shot` are not browser presentation evidence.
+- Keep software-renderer and real-GPU results separate. Capture native screenshots with
+  `ui.screenshot` or a native window capture; `ui_shot` is offscreen only.
+
+### 6.5 Deliberate broken-behavior probes
+
+Before accepting the suite, temporarily break each behavior and confirm the test fails:
+
+1. Remove an `accessible_name` from a toolbar button -> accessibility test names it.
+2. Change a panel salt (`"dock"` -> `"dock2"`) or load the wrong parent-salted test key
+   -> panel identity/geometry test fails; app-owned saved layout remains separately asserted.
+3. Call `ctx.root_ui` inside `DesignApp::ui` -> test panics with the documented recursive
+   borrow message (run in a `catch_unwind` probe, not production).
+4. Remove the first-pass `logic_frame` guard -> forced-multipass test sees two logic-frame
+   ticks. Do not use `visible()` to "fix" it.
+5. Correlate screenshots by arrival order instead of the per-request slot -> two-token/
+   two-viewport test writes the wrong file; cancel a slot and let a late callback arrive ->
+   no file/reply.
+6. Drop `DeleteSurroundingBytes` handling or fall back to the 64-step `text.delete` loop ->
+   exact-byte/one-undo test leaves replacement text or extra undo steps.
+7. Remove the E21b surrounding-text adapter or emit display-bidi text -> logical/bounded
+   outgoing-text test fails.
+8. Restore `rtl.rs`'s manual reorder alongside fork E5/E12 -> RTL differential test shows
+   double processing/double alignment.
+9. Restore `Id::new`/`Ui::id` -> `clippy -D warnings` fails, proving the warning gate.
+10. Reintroduce `Event::Screenshot` scanning or a strong `Context` capture in the callback ->
+    compile/test or cancel/shutdown test fails.
+11. Move web drop reading back into `WebShell::logic` -> browser drop test fails.
+12. Remove the host first-pass guard -> host multipass test sees two frame counts.
+
+## 7. Performance measurement protocol
+
+### 7.1 Baseline timing and environment
+
+Record a baseline **before** changing production code, from the exact current SHA
+`e74208dd...`, lockfile, feature set and craft-ui revision. Run the candidate from the
+exact migration revision. Use separate fresh processes for each sample; do not compare a
+warm process with a cold one.
+
+The benchmark harness is test-only work and must exist in both baseline and candidate
+trees. Stage it in a separate test-only commit, cherry-pick it into a read-only baseline
+worktree at `e74208dd...`, and run the baseline first through `task.py`. It records
+`Instant`-based raw samples around `run_ui`/operation boundaries; it must not use
+`perf.frame_ms`/`now_ms()` (`SystemTime` on native, `0.0` on wasm) as the acceptance timer.
+`ui.inspect` reports only the last frame and `ui_shot` prints control replies, not per-frame
+timings; neither is a sample source.
+
+Record with every result:
+- source SHA (baseline/candidate/stock-0.37 control), `Cargo.lock` SHA-256, feature list,
+  `CRAFT_FONTS_DIR` and craft-fonts ref, fixture name/hash;
+- OS and version, CPU/GPU, driver, backend (`Vulkan`/`DX12`/`Metal`/`GL`/`WebGPU`),
+  renderer type (hardware vs WARP/llvmpipe), display scale, window size, pixels-per-point;
+- profile (`release` unless a debug-only diagnostic is named), warmups, repetitions,
+  raw samples, median/p95/p99, peak RSS, allocations, texture upload bytes and idle
+  CPU/repaint count.
+
+Host capacity/qualification facts: read-only inspection finds an i915 PCI `8086:3E96`
+render device and a readable/writable `/dev/dri/renderD128` to the parent; the worker
+sandbox may hide it. No display session or compositor is inherited. Availability is not a
+qualified Vulkan/OpenGL/native compositor result; the managed renderer probe must identify
+the actual backend. The Windows baseline is software-rendered (Microsoft Basic Render
+Driver). A 128 GiB Windows full clone may not fit current capacity; use an allocated
+baseline-backed overlay with an adequate reservation or retain the platform row as blocked.
+macOS and physical Windows/audio remain separate rows.
+
+### 7.2 Operations
+
+1. **Startup**: at least 20 fresh processes; measure wall/`Instant` from process start to
+   first presented frame and to first interactive sample document. Report RSS and the
+   #8512 system-font discovery/first-missing-glyph component separately. The #8736 DX12
+   renderer/shader/pipeline construction is a separate Windows row, never a UI frame.
+2. **Idle UI**: open the sample, leave it untouched for 60 s, count frames/repaints and CPU.
+   No continuous repaint storm; the font scan's 250 ms poll must stop once cataloged.
+3. **Frame distribution**: at least 1,000 individual frames per configuration, with at
+   least 10 warmups and raw per-frame samples; report p50/p95/p99. Run the sample, the Tools
+   panel two-column state and a floating dock. Record shapes, vertices/indices, texture
+   set/free count/bytes, galley cache size and requested-repaint count.
+4. **Steady operations**: at least 30 timed iterations per operation after 10 warmups:
+   layout, panel open/float/dock/activate latency, canvas zoom/pan/damage patches,
+   selection and caret movement, text layout/tessellation.
+5. **Text tessellation #8731**: fixed 120-label ASCII scene plus a mixed/color-glyph
+   control; time `Context::tessellate` separately for 0.36, stock 0.37 and the final fork.
+   If the ~60% plain-text regression reproduces, require a color-safe row-level fix or a
+   documented exception; clamp-only is not a fix.
+6. **#8736 DX12**: Windows clone; time renderer/pipeline/shader construction separately from
+   first frame, with predictable filtering disabled/enabled as applicable. Record adapter
+   and driver.
+7. **#8512 fonts**: cold process with bundled fonts, with `CRAFT_FONTS_DIR` and with a
+   test-only system provider fixture; compare discovery/startup and glyph coverage. Do not
+   enable the system provider in production to win the measurement.
+8. **#8763/#8764 selection**: select text then click a toolbar/context action; record
+   command latency and assert the intended range/undo. This is correctness evidence; the
+   tail timing is a separate sample.
+9. **#8748 hidden child**: open/update/close the second viewport while the parent is
+   hidden/occluded/overdue; record first visible child frame and close acknowledgement.
+10. **Screenshots**: visible and hidden `ui.screenshot` requests; record reply latency,
+    file size, retained bytes, cancellation/timeout and late-callback cleanup.
+11. **Memory**: RSS after sample load, after 10 pan cycles, after 30 screenshots and after
+    a drain/shutdown; retained image bytes must return to zero.
+12. **Stock-0.37 control**: where the operation exists unchanged on stock 0.37, run the same
+    minimal adapter/harness against 0.36, stock 0.37 and the final fork; explain semantic
+    differences. Unavailable equivalence is an attribution limitation, not proof an
+    upstream regression is unavoidable.
+
+Use matched commands and the same fonts/fixture for baseline and candidate. Do not report
+`cargo build` time as UI performance.
+
+### 7.3 Thresholds and noise policy
+
+Predefine before looking at candidate numbers. The shared suite floors are minimums; an app
+may tighten, never loosen:
+
+- UI frame median: candidate <= baseline + 5%; p95 <= baseline + 10%; p99 (>=1,000 frames)
+  <= baseline + 15%.
+- Canvas render median: <= baseline + 5%; p95 <= +10%; patch count no increase beyond
+  fixture determinism.
+- Idle CPU: <= baseline + 20% and no more than one extra repaint per second after fonts
+  are ready; zero paints in 2 s after settle.
+- Startup: <= baseline +5% median / +10% p95, with the #8736 DX12 shader-compilation component reported
+  separately. A #8736-sized regression needs the upstream/fork fix or explicit approval.
+- Screenshot reply p95: <= baseline + 10%; retained bytes bounded and zero after drain.
+- Peak RSS: investigate a repeatable increase over +5% or +16 MiB, whichever is reached
+  first; report absolute and percentage. (Use the app's existing stricter budget if one is
+  found.)
+- Text tessellation: if the isolated probe reproduces #8731's ~60% regression, require a
+  color-safe row-level fix or a documented exception; never accept a clamp-only shader
+  change.
+- Sub-millisecond operations: the relative increase must also exceed 0.05 ms or be
+  corroborated by stable instruction/allocation counts.
+
+Sample counts: at least 10 warmups and 30 timed iterations per steady operation; at least 20
+fresh processes for startup; at least 1,000 individual frames for frame distributions. Use
+five independent sessions of at least 200 frame samples for tail percentiles, and pool the
+raw samples for p99; do not report p99 from 30 samples. Alternate baseline/candidate rounds;
+discard a session if a build/test/profiling process competes for CPU or the coefficient of
+variation of medians exceeds 3% (5% for microbenchmarks), then rerun. If the difference is
+within 2×MAD of paired samples, call it equal and do not chase it. Re-run and profile before
+filing or accepting a regression. Never auto-update a snapshot or lower a threshold to hide
+a timing or geometry change.
+
+## 8. Staged implementation PRs and rollback
+
+The dependency DAG is:
+
+```text
+plans land -> baseline harness + measurements
+completed winit -> egui P8 (P2b/P7/P7b/P7c included)
+  -> craft-libs CL-1 -> CL-2 reviewed capture prototype
+      -> DesignCraft D1 / GridCraft G1 pilot adapters -> CL-2F API freeze
+DesignCraft D1 -> D2 lifecycle -> D3 extended native/language qualification
+craft-libs CL-3 + D1 -> D4 docking/accessibility
+D2/D3/D4 -> D5 visual/workflow acceptance -> D6 final platform/performance evidence
+```
+
+- **D1 — atomic final-fork compatibility pilot.** Pin the complete final storytold
+  egui/winit graph and reviewed craft-ui CL-1/CL-2 prototype; regenerate the lock.
+  Apply roles/IDs/FontData/wheel changes, explicit native clipboard and test fonts,
+  strict minimum names/glyphs, the shared capture-slot adapter and its cancellation/
+  bounds/wake tests, parent-salted test lookup keys, and the required E21/E21b custom
+  editor adapter. Remove `rtl.rs` duplicate visual reorder/alignment as the final fork
+  becomes the bidi owner. Preserve app-owned UiState/docking preferences; no invented
+  egui-memory migration. Gate: cargo xtask ci/wasm, UI/native tests, one-family graph,
+  clean locked fetch, capture and IME contract tests, clipboard and save/reopen. This
+  reviewed pilot plus GridCraft's adapter permits CL-2F; stock 0.37 is an isolated
+  benchmark/control workspace, never a production handoff. Rollback restores complete
+  e74208dd source/manifests/lock/executable and prior preferences.
+- **D2 — frame stages and hidden input.** Add the narrow once-per-layout-frame guard,
+  host pacing/queue separation, monotonic deadlines, buffered synthetic-input policy
+  and per-step hidden paint. The shared capture API is already adopted in D1; extend
+  hidden/multipass/restore stress tests here. Do not replace it with a local interim
+  slot. Revert D2 as a behavior/test unit only if D1's compatibility checks still pass.
+- **D3 — extended native/language qualification.** After D2 and CL-2F, use the same
+  complete final fork and frozen helper; qualify E4/W15P, P7 key release, E21/E21b and
+  P7c selection/hidden-child behavior on native platforms and add language policy as
+  required. Required IME/bidi API adaptations already land in D1. Rollback removes
+  only these later policy/test changes; it never strips fork patches while retaining
+  fork-only source. A dependency rollback restores the full D1 predecessor set.
+- **D4 — accessibility and glyph contracts.** Add the remaining names/roles, full role
+  file list, explicit `DockArea::direction(LeftToRight)`, and coverage tests. Gate:
+  `unnamed_widgets()` empty, explicit role/label queries, glyph coverage with and without
+  craft-fonts, direction geometry/hit/drag and saved-layout tests. Rollback: revert the
+  label/direction changes; no document or command behavior changes.
+- **D5 — visual/geometry baselines and workflows.** Review every intended 0.37 visual
+  delta, update fixtures only with explanation, add the save/reopen/dock/popout, native
+  X11/Wayland, Windows VM and browser workflow tests. Gate: geometry/hit tests, pixel
+  comparisons, deliberate broken-behavior probes. Rollback: restore the previous reviewed
+  baselines; production remains on D3/D4.
+- **D6 — qualification and performance.** Windows VM, Linux native, browser, macOS gate,
+  paired performance protocol with the stock-0.37 control. No production behavior change
+  unless a measured regression requires a separately reviewed fix. Rollback: no code
+  rollback expected; keep the evidence and the old dependency set until acceptance.
+
+Each PR must be one coherent outcome, use one task id per commit, and carry the validation
+results at the reviewed revision. No PR is published without fresh direct human approval.
+
+## 9. Risks, unresolved questions and blocking acceptance criteria
+
+### Blocking unknowns
+
+1. **Final dependency publications.** The final reviewed `storytold/egui` and
+   `storytold/winit` revisions do not exist yet. Candidate `aiongg` hashes are comparison
+   inputs only. D1 cannot ship until the complete P8 handoff and winit revisions are published with E1–E21,
+   E21b, E4/P2b, W1–W27 and W15P, and a clean checkout fetches them `--locked`.
+2. **craft-libs CL-1/CL-2F revisions.** The 0.37-compatible craft-ui revision must be the
+   `8614e4a` port onto current `4919088`, preserving `d66e345`/`fd9cf54`, `crates/platform`
+   and unrelated fixes. PR199's `b68de8c`/`ec8840a` trees are not bases. The capture API
+   freezes only after the DesignCraft/GridCraft adapter review.
+3. **Clipboard/PRIMARY.** D1 enables `eframe/clipboard` to preserve OS Copy/Cut/Paste. D3
+   needs E4/W15P native evidence on X11 and Wayland (wlroots/KWin/Mutter): pointer-
+   and keyboard-triggered ownership including keyboard-only focus, serial freshness, owner/seat changes, empty/absent offers, self-paste, canceled/
+   slow transfers, password exclusion, no unchanged-selection reclaim and no second regular
+   data device. A compile-only or X11-only result is not acceptance.
+4. **Windows GPU fallback.** E2/E3 turns some egui-wgpu configure/renderer failures into
+   `WgpuError` values rather than panics. DesignCraft's `gpu::finish` already handles
+   `eframe::Error::Wgpu(_)`, but the exact startup fallback behavior must be tested on the
+   Windows clone with a deliberately failing adapter/backend. Do not claim it from unit
+   tests only.
+5. **macOS native evidence.** macOS menu shortcuts, press-and-hold IME, `deleteSurrounding`
+   bytes, `movable_by_window_background`, Dock Quit and viewport screenshots need real
+   hardware or remain explicitly unresolved. A software/VM screenshot is not native
+   evidence.
+6. **`#8731` text tessellation.** The upstream report is a measured regression, not a
+   DesignCraft result. If the candidate reproduces it, a color-safe fix (row-level branch)
+   or an explicit exception is required before accepting the performance row.
+7. **`#8736` DX12 startup.** The shader-compile cost is a Windows startup risk. Measure it
+   separately and do not hide it inside a UI frame average.
+8. **`#8748` hidden-parent/deferred-child.** Closed and unmerged. The final fork must own a
+   tested solution; DesignCraft's immediate second viewport must open/update/close while the
+   parent is hidden/occluded/overdue and while visibility is unknown.
+9. **Accessibility scope.** The exact number of unnamed inputs will only be known after
+   D1's first strict `Harness::check_accessibility()` run. D1 must fix the existing test
+   surface or record an explicit per-test policy; D4 completes the remaining controls. If
+   the D4 remainder is large, split "core chrome/panels" and "dialogs/rare panels"; do not
+   disable the check globally.
+10. **Text selection #8763/#8764.** The source audit finds no control that reads an egui
+    `TextEdit` selection in the same pass, so no app workaround is planned. The fork owns
+    the upstream fix. If implementation finds such a control, carry #8764 or defer the
+    command with a tested app change; do not hide it in the test.
+11. **E21b/P7b.** The incoming E21/W27 path is not full surrounding-text integration.
+    DesignCraft's canvas needs a real logical model/preedit/UTF-8 adapter, bounded at 4000
+    bytes and cleared on focus/password/no-IME; `None` placeholders are not acceptance.
+    Native Wayland IME trace remains required.
+12. **DockArea direction.** CL-3's opt-in direction is a visual policy, not a schema change.
+    DesignCraft passes `LeftToRight` explicitly for now; saved physical splits/rectangles
+    and logical tab order must remain unchanged. No display-bidi text reaches shaping or
+    clipboard.
+13. **Platform capacity/qualification.** The parent can see i915 PCI `8086:3E96` and
+    `/dev/dri/renderD128`; the worker sandbox may hide it, and no display session/compositor
+    is inherited. Windows needs a uniquely owned clone/overlay within allocator capacity
+    (a 128 GiB full clone may not fit). Browser WebGPU/WebGL and real native X11/Wayland
+    workflows need provisioning. These rows remain blockers until executed; availability
+    alone is not a pass.
+14. **Capture API freeze.** CL-2F must be reviewed after both adapters. A strong `Context`
+    capture, unbounded pending images, a late file write/reply or a lock held across wakeup
+    is a blocking failure, not a follow-up.
+15. **`Cargo.lock` coherence.** Regenerate, never hand-edit. A lock with both 0.36.2 and
+    0.37, a candidate `aiongg` source, or a machine-local path is an immediate failure.
+
+### Non-blocking but important
+
+- Style default changes may move toolbar/panel geometry even with explicit tokens.
+- `egui_kittest` 0.37's missing-glyph panic can make an unrelated test fail first; fix the
+  fixture/name or use a named per-test allow with a reason, not a global tofu/disable switch.
+- The web build's new glyph rasterizer can change emoji/fallback rendering. Verify with
+  WebGPU and `?webgl`, and keep texture filter/wrap expectations.
+- `Cargo.lock` must be regenerated through the managed workflow, not hand-edited.
+- The `designcraft-testkit` workspace dependency points at a missing `crates/testkit` in
+  the baseline; it is unused, but the dependency audit must not mistake it for an egui
+  consumer. Do not add or remove it as part of this migration.
+- Saved docking direction must never be implemented by reversing saved panel order or
+  serialized tab order.
+
+## 10. Acceptance checklist
+
+- [ ] Exact baseline SHA and dependency revisions recorded; old 0.36.2 set retained for
+      rollback.
+- [ ] All 22 manifests, root lockfile, root patch section, build scripts, `ui_shot`,
+      platform cfgs and CI workflows audited.
+- [ ] Exactly one egui family and one winit resolve from the final reviewed storytold
+      revisions; no registry 0.36.2, candidate `aiongg` source or machine-local path remains.
+- [ ] Clean checkout passes `cargo fetch --locked` and `cargo metadata --locked`.
+- [ ] `cargo xtask ci`, `cargo xtask wasm`, `cargo test -p designcraft-ui-egui --lib`,
+      `trunk build --release`, native Windows/Linux and browser workflows pass at the
+      reviewed revision.
+- [ ] `App::logic`/`App::ui` root-`Ui` flow preserved; native and web per-pass logic tested;
+      no recursive `root_ui`; multipass, repeated hidden ticks, forced hidden paint and
+      host counters tested; visibility is not used as a phase.
+- [ ] No egui PanelState persistence is invented; parent-salted test keys, panel order/rects and app-owned workspace
+      restore.
+- [ ] Screenshots use the craft-ui completion slot: weak callback, viewport-aware wakeup,
+      one-shot, timeout/cancel/close, out-of-order, bounded aggregate bytes and no strong
+      `Context` cycle.
+- [ ] Commands, undo transactions, save/reopen, workspace persistence, clipboard privacy
+      and native Copy/Cut/Paste are unchanged.
+- [ ] E4/W15P PRIMARY is evidenced natively on X11/Wayland, or explicitly unresolved;
+      password/unchanged-selection policy holds.
+- [ ] E21b outgoing surrounding text is logical, bounded at 4000 bytes, preedit-excluded and
+      cleared on focus/password/no-IME; no `None` placeholder.
+- [ ] Fork E5/E12 is the only bidi owner for egui UI/label text (the document composer
+      remains the document-text owner); no display-bidi text reaches UI shaping or clipboard.
+- [ ] Accessibility role/name assertions pass under strict kittest; glyph coverage is
+      explicit with and without craft-fonts.
+- [ ] Visual baselines have explained intended deltas; geometry/hit/direction/dock tests
+      pass; #8763/#8764 and #8748 tests have the documented expected outcome.
+- [ ] Paired performance results meet the predefined thresholds with >=10 warmups/30
+      steady iterations/20 fresh startups/1,000-frame distributions and a stock-0.37
+      control, or every regression has a reviewed fix/exception.
+- [ ] macOS, real-GPU, Wayland/GNOME and non-Latin-layout gates are either evidenced or
+      listed as unresolved; no result is implied from a compile or software renderer.
+
+## 11. References
+
+Primary source inspected locally (read-only; no checkout switch):
+
+- egui upstream `0.37.0` = `841a328ba2dd8f6996beb7189ebb7fc00e668a2a`:
+  `crates/egui/src/data/input/event.rs`, `data/input/mouse_wheel_source.rs`,
+  `data/input/viewport_info.rs`, `data/screenshot_callback.rs`, `viewport.rs`, `context.rs`,
+  `containers/panel.rs`, `id.rs`, `ui.rs`, `data/output.rs`, `accessibility.rs`,
+  `input_state/mod.rs`; `crates/epaint/src/text/font_definitions.rs`,
+  `crates/epaint/src/text/font_data.rs`;
+  `crates/eframe/src/{epi.rs,native/epi_integration.rs,native/wgpu_integration.rs,web/app_runner.rs}`;
+  `crates/egui-winit/src/{clipboard.rs,lib.rs}`; `crates/egui-wgpu/src/{setup.rs,winit.rs}`;
+  `crates/egui_kittest/src/{builder.rs,accessibility.rs}`.
+- Candidate fork for comparison: `aiongg/egui` `craft/0.37` =
+  `a4f9a17f64a6bae61350fb85804c9df0d9865916`, including `PATCHES.md` (E1–E21; E21b/P7b
+  still to be added). This is not the production pin.
+- Candidate winit for comparison: `aiongg/winit` `craft/0.30.13-lang` =
+  `8b35388bd719e8cc86a95971ba0bc026c9a8f058`, including `PATCHES.md` (W1–W27; W15P still
+  to be added). This is not the production pin.
+- `storytold/craft-libs` PR 199 head =
+  `b68de8c5f4f1c060904d211a7b1320aa0f7bce78`; audit merge
+  `ec8840af8c5fda695cf195cdd05e5ae078415c07`; API-port source
+  `8614e4a04fae516fba16c22b31ff1008cb6be10b`; current craft-libs baseline
+  `49190884278f16c9a9f5823d7698a8ffb5deb062`.
+- `storytold/egui` published 0.36.2 =
+  `767b1cad294120689a514bb4bd68c077e46679b9`; `storytold/winit` published 0.30.13 =
+  `ffae5198770d7730e718043f035a772b7dbc3b1b`.
+- DesignCraft baseline =
+  `e74208dd7e0c801d15dfdf926d64cfe5e3b346d3`.
+- Lifecycle evidence:
+  `/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/lifecycle-source-audit.md`
+  (native/web per-pass logic, zero pass index after completed `run_ui`, `visible()` is not a
+  phase).
+- IME evidence:
+  `/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/ime-surrounding-gap.md`
+  (E21b/P7b gap and custom-editor inventory).
+- Shared suite contract:
+  `/home/codex/work/CraftApps/egui037-migration-20261022/craft-libs/docs/egui-037-suite-rollout.md`
+  (completion slot, DockArea direction, performance sample counts, stock-0.37 control,
+  platform evidence) and `craft-libs/docs/egui-037-migration-plan.md` (§7.7, §7.8, §10).
+- Font fixtures: `egui/docs/egui-037-migration-plan.md` §10.6 (craft-fonts `2481a8a`,
+  Noto Sans Arabic/Thai/CJK, BIZ UDPGothic, Noto Sans Hebrew, Noto Color Emoji; exact
+  SHA256/licences). No font binaries are added by this plan.
+- Historical diagnostics:
+  `/home/codex/work/ssd2/task-evidence/egui037-audit-20261022/{fork,stock}/designcraft.{errors,log,prepare.diff}`.
+- Upstream reports and notes reviewed through the local snapshot
+  `/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/upstream-discussions.json`:
+  [#8731](https://github.com/emilk/egui/issues/8731),
+  [#8736](https://github.com/emilk/egui/issues/8736),
+  [#8763](https://github.com/emilk/egui/issues/8763) / PR
+  [#8764](https://github.com/emilk/egui/pull/8764) (unmerged),
+  [#8748](https://github.com/emilk/egui/pull/8748) (closed, not merged),
+  [#8631](https://github.com/emilk/egui/pull/8631),
+  [#8535](https://github.com/emilk/egui/pull/8535),
+  [#8489](https://github.com/emilk/egui/pull/8489),
+  [#8555](https://github.com/emilk/egui/pull/8555),
+  [#8583](https://github.com/emilk/egui/pull/8583),
+  [#8512](https://github.com/emilk/egui/pull/8512),
+  [#8428](https://github.com/emilk/egui/pull/8428),
+  [#8657](https://github.com/emilk/egui/pull/8657),
+  [#8577](https://github.com/emilk/egui/pull/8577),
+  [#8641](https://github.com/emilk/egui/pull/8641).
+
+These links identify the behavior and reports inspected. They are not fresh DesignCraft
+validation, and an upstream status may have changed since the snapshot.
+
+
+## Local implementation update — 2026-10-23
+
+The user clarified that reviewed plans remain local and implementation proceeds before publication. The earlier requirement to publish/land this plan first is superseded; pushes and PR publication still require explicit approval.
+
+Canonical `storytold/designcraft` `main` now resolves to `2e36dcf909627c8f0e5662fe6b4825b1c1c24420`. The owned checkout was fast-forwarded to this revision. Earlier baseline SHAs and line anchors above are retained as historical review evidence; use this new revision and its exact lockfile for current-main integration and paired measurements. The original refs remain reachable.
+
+Preserve browser page zoom and canvas touch-action:none alongside packaging fixes.
+
+The complete static delta review and exact old/new object identities are retained in the task evidence: `canonical-diffs-refresh-20261023.json` and `overnight-consumer-review-20261023.md`. This amendment claims no new build, native GUI or performance acceptance.
+
+### Local pinned font inputs (2026-10-23)
+
+Parent fetched and verified all eight manifest fonts at `storytold/craft-fonts`
+`2481a8a324b986a45954e90045ed1f8f2efaaf3c` into
+`/home/codex/work/CraftApps/egui037-migration-20261022/fixtures/craft-fonts`.
+Use this exact directory as the optional `CRAFT_FONTS_DIR` build input. All
+manifest SHA256 hashes match; licenses retained. This does not waive the
+required no-corpus test configuration. The separately pinned Hebrew fixture
+is at `/home/codex/work/CraftApps/egui037-migration-20261022/fixtures/noto-sans-hebrew/NotoSansHebrew.ttf`
+with adjacent OFL.txt/provenance.json. Keep these fonts out of app source;
+required test fixtures may use an explicit external input with verified hash
+and clear missing-input behavior, never silently disable glyph checks.
+
+## Final local landing record — 2026-10-25
+
+This section records the current local landing state. Everything above remains historical planning and
+implementation evidence: the older candidate hashes, baseline anchors and "planning only" wording
+describe earlier states and are not the current pins. No commit, index write, ref update, fetch,
+push, pull request, comment, merge, build, fmt, test, Cargo, VM, resource or cleanup action was
+performed while writing this record; the qualification results below were produced separately by
+the parent through the managed `task.py` workflow and are cited as evidence, not rerun here.
+
+### Current dependency pins
+
+| Item | Revision |
+| --- | --- |
+| egui family (`egui`, `epaint`, `ecolor`, `emath`, `eframe`, `egui-wgpu`, `egui-winit`, `egui_kittest`, `egui_extras`, `epaint_default_fonts`) | `storytold/egui` `6d518fc799681571963842f95b55a6b68431b15a` |
+| winit | `storytold/winit` `a517b3846ee8457d84ee4975110bfda6797c44dc` |
+| craft-libs (`craft-ui`, `craft-print`) | `storytold/craft-libs` `25da1314d443171b4adeaad2cd9454b273f35c6f` |
+| CI craft-fonts | `storytold/craft-fonts` `b076417b5880bd4154bd22f00695b1d28c6bea83` |
+
+`Cargo.toml` and `Cargo.lock` resolve one egui family and one winit from these storytold revisions;
+the lock has no registry 0.36.2 egui family and no candidate `aiongg` source. `crates/fonts/build.rs`
+continues to treat craft-fonts as an optional `CRAFT_FONTS_DIR` input, not a manifest dependency.
+
+### Exact dirty union
+
+| Item | Value |
+| --- | --- |
+| Checkout | `/home/codex/work/CraftApps/egui037-migration-20261022/designcraft-implementation` |
+| Git worktree HEAD (unchanged) | `80d13911b2d20fbb5cd9398696627bb3a715417b` |
+| Earlier integrated main base in the dirty state | `d8d78851729a2c1a10e5bfad7c591f3de78651a0` |
+| Imported new main | `45ed6cfce0f86e59ff66ab18a05c3ec03ccef531` (`refs/migration-observations/20261024-1610-main`) |
+| New-main distance from the earlier base | 141 commits, 127 changed paths |
+| Files in the union | 619 = 613 tracked + 6 untracked |
+| Worktree status | 186 entries = 180 modified + 6 untracked |
+| Merge state | no `MERGE_HEAD`; index empty; no conflict markers; `git diff --check` clean |
+
+The six untracked paths are exactly:
+
+- `crates/compose/src/placed.rs`
+- `crates/idml/src/tests/facing_ltr.rs`
+- `crates/idml/src/tests/frame_grid.rs`
+- `crates/ui-egui/src/page_history.rs`
+- `crates/ui-egui/src/panels/story.rs`
+- `docs/egui-037-migration-plan.md`
+
+The 16:28 reconciliation packet recorded 185 status entries: the 92 pre-existing dirty paths plus the
+127 imported paths with 34 overlaps. The current tree adds one later modified tracked path,
+`apps/designcraft/src/native_menu.rs` (the native-menu/action host-order repair), for 186. Of the 127 imported paths, 103 were adopted whole
+and 24 were reviewed 3-way content merges; later reviewed deviations are the Windows-only test fixtures
+in `apps/designcraft-cli/tests/it/cli.rs` and `crates/engine/src/file_access.rs`, the documented
+`Id::new` → `Id::unique` port in `crates/ui-egui/src/panels/story.rs`, and the host-order changes above.
+
+`80d13911` is an ancestor of `45ed6cf`, so an ordinary merge would fast-forward. The eventual manual
+union commit therefore needs both parents, `80d13911b2d20fbb5cd9398696627bb3a715417b` and
+`45ed6cfce0f86e59ff66ab18a05c3ec03ccef531`, to preserve both the migration branch and the imported
+main history. No such commit exists yet.
+
+### Review-1643 findings on the current source
+
+Both actionable defects from the 16:43 review are fixed in the current source:
+
+- **Document generation identity.** `InputGeneration` and `ScreenshotGeometry` now compare
+  `DocState::identity_epoch` through `active_document_epoch()` (`crates/ui-egui/src/lib.rs`), so a
+  `file.revert` that preserves the UID still invalidates buffered input, native drops and admitted or
+  in-flight screenshots. Regression tests cover a buffered input batch, a buffered native drop and
+  screenshots before issue and in flight; all pass in the Linux full-CI job below.
+- **NumField disabled presets.** The preset segment now uses `Sense::hover()` and reports
+  `self.enabled == false` when the field is disabled, does not open its menu, and dims its chevron;
+  `disabled_numeric_presets_are_disabled_and_do_not_open` passes.
+- The earlier `panels/properties.rs` evidence mismatch is also closed: the current file is
+  `9515f944ddbbf61bb2099324ac6825fd7603262adc605686c2a932948a81f768`, matching the later
+  Windows-qualified manifest and the current worktree.
+
+No other real source defect was found in this bounded audit. Residual items below are qualification
+limits, not claimed defects.
+
+### Current qualification evidence
+
+- **Linux full CI** `egui037-designcraft-final-characterization-ci-20261025-0050`: all 9 steps
+  passed (fmt, pdf-deps, clippy, test, i18n-report, doctest, assets, layers, wasm); 77 result
+  summaries total **3230 passed, 0 failed, 6 ignored**. The job's captured unstaged patch is
+  byte-identical to the current tracked worktree diff, so it qualifies the current tracked source.
+  The run includes the corrected canvas characterization test over three batch shapes and the
+  discard/no-discard matrix.
+- **Windows qualification** job 102: all 9 steps passed, **3198 passed across 77 result summaries**
+  on the 619-path source manifest `5208ddb75ad8d06a48c334b48e5e80dc193ae2b9739b119dd50942aa3ebd5a40`.
+  Exactly two test-only Windows fixture paths differ from the applied prior manifest
+  (`apps/designcraft-cli/tests/it/cli.rs`, `crates/engine/src/file_access.rs`); the engine production
+  prefix is unchanged. Qualified desktop executable
+  `a34478f09ccae2571320b3ada489665adae450031ca24918ec4e8b165edfc47a`; qualified CLI
+  `318ec6cb7521f941aaab01a63b2c0f970bd70bfb50e5545aa645f63d1589cbee`.
+- **Native Windows GUI** `native-gui-2238`: edit, undo, redo, selection, save and reopen were captured
+  with document, UI and window evidence; the native input diagnostic ordered three production
+  click/End replays on the qualified executable, each reaching click caret 6 and End caret 12, with
+  all three text strings unchanged and the document clean. Six screenshots were reviewed, but the state JSON is the exact caret
+  oracle because a blinking caret can make two screenshots share pixels.
+- **Native input diagnostic** `native-order-review0048.txt`: no application event loss is shown. The
+  trace records the End press/release pair arriving before the click pair; the app acted correctly
+  for the order it received. The temporary diagnostic build was fully restored to the exact 619-file
+  qualified source and binaries in the VM before the ordered production replays.
+- **Exact-source boundary.** The Windows 619-path manifest predates the host-only canvas
+  characterization test. In the current tree, `crates/ui-egui/src/canvas.rs` differs from that
+  manifest only inside `mod tests` (the first difference starts at line 6016; the test module starts
+  at line 4046), so production bytes are unchanged. The Windows run did not execute that new test;
+  Linux full CI did. This document is amended after the Windows manifest, so the documentation file
+  is also not byte-identical to that earlier snapshot.
+
+### Remaining limits and regression risk
+
+The union includes 141 upstream main commits and 127 changed paths, only part of which is egui 0.37
+API work. It also imports page history/Go Back, the Story panel, notes and table work, optical-margin
+options, linked-file read caps, SVG preflight, IDML facing/frame-grid tests, and other current-main
+features. Review the 180-file tracked diff and the 24 manual overlap resolutions as product changes,
+not as a mechanical dependency bump; the imported tests reduce but do not remove that risk.
+
+Still unqualified for this exact union: macOS native menus/IME/Apple events, real-GPU rendering and
+the DirectX 12 startup row, native Linux X11/Wayland presentation, native Windows IME and clipboard/
+PRIMARY selection, physical-device input ordering, browser presentation beyond the wasm check,
+paired performance against the thresholds in §7, and packaging/release artifacts. The Windows VM
+uses a software renderer. Cross-device QMP command order is not a guest-delivery guarantee; the
+ordered replay gates input on an observed click state rather than zero-delay host issuance.
diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md
index 2a05973af..7b70a9a43 100644
--- a/docs/file-format-parity.md
+++ b/docs/file-format-parity.md
@@ -41,7 +41,7 @@ layer survive interchange; literal XML and round-trip tests are in
 
 | Format | Ext | InDesign | DesignCraft | Fidelity / tests | Weight |
 |---|---|---|---|---|---|
-| PDF (print) | `.pdf` | ✓ all presets, PDF/X-1a/3/4, PDF/A, PDF/UA | ✓ krilla: real text with subset fonts, DeviceCMYK/RGB, spot Separations, bleed/slug, marks, spreads, compression options, remembered settings (#196); **PDF/X-4** with output intent and a validator (#223, #200); **PDF/A-2b**; tagged PDF | 53 tests in `crates/pdf`; no PDF/X-1a or X-3 (needs flattening to PDF 1.3/1.4); no presets / `.joboptions`; no external validator (veraPDF / callas) in CI | 18% |
+| PDF (print) | `.pdf` | ✓ all presets, PDF/X-1a/3/4, PDF/A, PDF/UA | ✓ krilla: real text with subset fonts, DeviceCMYK/RGB, spot Separations, bleed/slug, marks, spreads, compression options, remembered settings (#196); **PDF/X-4** with output intent and a validator (#223, #200); **PDF/A-2b**; tagged PDF; **PDF/X-1a:2003** flattened in its inks by craft-prepress | 53 tests in `crates/pdf`; no PDF/X-3; no presets / `.joboptions`; no external validator (veraPDF / callas) in CI | 18% |
 | PDF (interactive) | `.pdf` | ✓ | ✓ links, bookmarks, buttons, AcroForm fields, page transitions, object states | | 2% |
 | JPEG / PNG | `.jpg`, `.png` | ✓ | PNG from the UI; JPEG from the CLI only | no resolution / colour space options dialog for JPEG | 3% |
 | EPUB reflowable | `.epub` | ✓ | ✓ stories in article order, tables, footnotes and endnotes, CSS from styles, images, nav | | 2% |
@@ -111,7 +111,7 @@ up to 30 points.
 |---|---|
 | INDD real-file corpus, metric, fixes (#21, #114) | 10–30 |
 | IDML real-file corpus, metric, fixes (#193, #338, #339, #340) | 60–100 |
-| PDF/X-1a and X-3 (transparency flattener), PDF presets and `.joboptions`, external validator | 40–70 |
+| PDF/X-3, PDF presets and `.joboptions`, external validator | 30–60 |
 | Print fidelity, PostScript level 3 output and print presets | 25–45 |
 | ICML story import, IDMS snippets | 15–25 |
 | HTML / fixed-layout EPUB with live text | 20–35 |
diff --git a/docs/gaps.md b/docs/gaps.md
index 6723fe1e7..ea9cafd40 100644
--- a/docs/gaps.md
+++ b/docs/gaps.md
@@ -1,6 +1,6 @@
 # Where DesignCraft falls short of InDesign
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-22 · **Change:** minor (gap 28 added: placed-PDF font repair remains after visible unembedded font detection, #909; gap 26 shrunk: autoflow fills the following pages before it adds pages at the end; gap 6 shrunk: Type › Reload Fonts reads fonts installed, edited or removed while running (#328); gap 3: Package links are relative, #340; gap 27 closed: the loaded text cursor threads into a frame inside a group (#1075); .indd and .indt open through indd-utils; gap 0 shrunk: text threads by hand; threading gaps added; Optical kerning from outlines (#181); gap 6: macOS lists fonts that font services and managers activate; shared print spooler; image clipping paths from IDML; Tabs panel listed as present (#343); book chapter update safety; gap 16: Based on Parent leftovers; bounded control click/drag input; swatches on placed greyscale and bitmap images) · **Target:** Adobe InDesign 2026 (21.6)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-24 · **Change:** minor (placed graphic layer-option preservation and explicit rendering warnings; gap 16 shrunk: File › File Info; gap 16: Convert Variable to Text; gap 28 added: placed-PDF font repair remains after visible unembedded font detection, #909; gap 26 shrunk: autoflow fills the following pages before it adds pages at the end; gap 6 shrunk: Type › Reload Fonts reads fonts installed, edited or removed while running (#328); gap 3: Package links are relative, #340; gap 27 closed: the loaded text cursor threads into a frame inside a group (#1075); .indd and .indt open through indd-utils; gap 0 shrunk: text threads by hand; threading gaps added; Optical kerning from outlines (#181); gap 6: macOS lists fonts that font services and managers activate; shared print spooler; image clipping paths from IDML; Tabs panel listed as present (#343); book chapter update safety; gap 16: Based on Parent leftovers; bounded control click/drag input; swatches on placed greyscale and bitmap images) · **Target:** Adobe InDesign 2026 (21.6)
 
 Every known shortfall against InDesign 2026, one entry each, ranked by how much it stops an
 InDesign professional from doing real work. This is the work list: agents pick from the top.
@@ -116,12 +116,13 @@ Kind: **F** feature · **U** UI/UX · **T** typography · **FF** file format ·
 - **Estimate:** 10–20 h. **Doc:** [localization-parity.md](localization-parity.md)
 
 ### 9. PDF output presets and standards (FF)
-- **Missing:** PDF/X-1a and PDF/X-3 (no flattener to PDF 1.3/1.4), Adobe PDF Presets and
-  `.joboptions` load/save, output-intent choice beyond the built-in profile, PDF/UA validation;
-  #159, #32.
-- **Have:** PDF/X-4 with output intent and a validator (`#200`), PDF/A-2b, tagged PDF, CMYK and
-  spot, marks and bleed, the options dialog with remembered settings (#196).
-- **Estimate:** 40–70 h. **Doc:** [file-format-parity.md](file-format-parity.md)
+- **Missing:** PDF/X-3, Adobe PDF Presets and `.joboptions` load/save, output-intent choice
+  beyond the built-in profile, PDF/UA validation; soft effects other than the drop shadow reach
+  the PDF/X-1a flattener as RGB images; #159, #32.
+- **Have:** PDF/X-4 with output intent and a validator (`#200`), PDF/X-1a:2003 through
+  craft-prepress's flattener with its own checks, PDF/A-2b, tagged PDF, CMYK and spot, marks and
+  bleed, the options dialog with remembered settings (#196).
+- **Estimate:** 30–60 h. **Doc:** [file-format-parity.md](file-format-parity.md)
 
 ### 28. Placed-PDF font repair for PDF/X-4 (FF)
 - **Missing:** embedding, substitution or outlining of unembedded fonts in placed PDFs; export
@@ -177,15 +178,18 @@ Kind: **F** feature · **U** UI/UX · **T** typography · **FF** file format ·
 - **Estimate:** 30–50 h.
 
 ### 16. Menu items still missing (U)
-- **Missing:** 151 of 482 in-scope items of InDesign 21.6's menu dump have no match (measured 2026-10-10; some exist under other labels): Type ▸ Notes
+- **Missing:** 149 of 482 in-scope items of InDesign 21.6's menu dump have no match (measured 2026-10-10; some exist under other labels): Type ▸ Notes
+- **Missing:** 150 of 482 in-scope items of InDesign 21.6's menu dump have no match (measured 2026-10-10; some exist under other labels): Type ▸ Notes
   and Track Changes submenus (the panels and commands exist), hyperlink and cross-reference
   update commands, Convert Bullets/Numbering to Text, Convert Variable to Text, Object ▸ Clear
+  Effects / Clear All Transparency / Rotate 180° / Reverse Path,
+  update commands, Convert Bullets/Numbering to Text, Object ▸ Clear
   Effects / Clear All Transparency / Rotate 180° / Reverse Path, Layout ▸ Go Back/Forward,
   Window ▸ Arrange (2-up … 6-up), Trap Presets, Overlays, Edit ▸ Assign Profiles / Convert to
-  Profile / Edit Original, File ▸ File Info / Open PDF / Document and Print Presets / User
+  Profile / Edit Original, File ▸ Open PDF / Document and Print Presets / User
   Settings, Type ▸ Size presets, Table ▸ Table Options / Cell Options submenus, Paste Before/After,
   Convert Columns, Object ▸ Interactive ▸ Convert to (form fields),
-  View ▸ Extras badges and Story Editor options. Pages panel ▸ Parent Options (Based on Parent is
+  View ▸ Extras badges and Story Editor options (Show/Hide Depth Ruler is there). Pages panel ▸ Parent Options (Based on Parent is
   the `layout.parents.options` command only); overriding a base parent's items on a parent spread
   itself (overrides work on document pages only).
 - **Estimate:** 40–70 h (most are thin wrappers over existing engine features).
@@ -202,9 +206,18 @@ Kind: **F** feature · **U** UI/UX · **T** typography · **FF** file format ·
 - **Estimate:** 20–35 h.
 
 ### 19. Placed graphics depth (FF)
+- **Have:** per-placement IDML graphic-layer settings survive IDML/native round trips; native format 4 guards older readers. Unsupported layer visibility is reported by import, preflight and PDF export. See [graphic-layer-options.md](graphic-layer-options.md).
+- **Still missing:** DesignCraft does not apply retained IDML graphic-layer visibility to raster or PDF output; layer-comp choices and the layer-options UI are also missing. Metadata preservation does not establish visual fidelity. Placed-PDF layer choices are applied (see **Layer choices** below).
 - **Safety:** PDF visibility variants preserve catalog/configuration entries and nonzero-generation
   references, redefining the existing catalog rather than choosing an arbitrary object number.
   Encrypted, hybrid-reference and over-budget rewrites are rejected; no print-fidelity claim.
+- **Layer choices:** placed PDFs distinguish explicit all-on visibility from file defaults;
+  choices survive native saves, raster/PDF output and embedded IDML export for the placements the
+  export walks reach: document and parent spreads, groups, and objects anchored in a story. A
+  placement anchored inside table-cell or footnote/endnote text is also prepared for PDF/A-2b.
+  Embedded IDML applies variants inside table-cell and footnote text; endnote variants are prepared,
+  but IDML endnote structures/artwork are not serialized yet. IDML layer variants are embedded
+  copies; external-only export is rejected when choices would be lost.
 - **Missing:** EPS is shown through its preview only (no PostScript interpreter); PSD layer
   comps beyond visibility; the Clipping Path Options dialog (tracing into a clip that keeps the
   frame, Threshold/Tolerance/Inset Frame preview, picking an alpha channel or a path saved in a
diff --git a/docs/graphic-layer-options.md b/docs/graphic-layer-options.md
new file mode 100644
index 000000000..f38d82d34
--- /dev/null
+++ b/docs/graphic-layer-options.md
@@ -0,0 +1,52 @@
+# Placed graphic layer options
+
+IDML `GraphicLayerOption` / `GraphicLayer` settings are retained on each
+`Graphic.layer_options`, not on the shared asset. Two placements of one linked
+file can therefore keep different layer choices while sharing image bytes.
+Scalar option/layer attributes, layer order and parent-child relationships, layer IDs/names, original/current
+visibility, link-update policy and view/export/print flags survive import,
+native save/reopen and IDML export. XML Self IDs are regenerated. Native-edited
+attribute maps cannot inject XML syntax, declare namespaces or override those Self IDs.
+Parent indices are optional in native files; missing entries retain the older
+flat representation. Invalid/cyclic parent indices, parents in closed subtrees and over-budget nesting
+are emitted as top-level layers, retaining their scalar metadata without
+unbounded XML recursion.
+
+This is preservation, **not layer-aware rendering**. The current renderer and
+PDF exporter use the asset's composite/default appearance and do not apply
+these per-placement choices. Changed visibility and explicit view/export/print
+states produce an import warning, a persistent `unsupportedGraphicLayers`
+preflight issue, and a PDF export warning. Nested graphic cells, anchored
+objects and parent items remain detectable after native reopening, including
+when spread items also produce warnings. PDF warnings inspect the source
+document so effect rasterization and transparency flattening cannot hide them.
+
+Native files containing these settings require format version 4. Earlier
+readers reject that version instead of loading and silently discarding the new
+field. Documents without layer settings retain their existing version 2/3
+requirements. Older graphics without `layerOptions` still deserialize with
+`None`, and their JSON representation is unchanged.
+
+Version 4 is a single reader capability shared with explicit all-on placed-PDF
+layer choices (#1671): a version 4 reader must understand both, so the two
+changes ship in the same release. One function in the format crate,
+`required_version`, chooses the version for every save.
+
+Synthetic regressions cover independent overrides on two placements sharing
+one asset, metadata round trips, native reader requirements, nested cells,
+nested layer hierarchy, preflight/PDF warnings after rasterization and flattening,
+and invalid native attribute names and parent indices. Private originals
+and artwork are not repository fixtures; any collection results are local
+metadata checks, not an independent reference-rendering or fidelity oracle.
+
+Local collection check (2026-10-23): a five-document pilot passed before
+expansion to 205 previously converted documents. All 205 completed IDML →
+native save/reopen → IDML; all 1,113 layer records across 68 documents matched
+their input scalar attributes and order, ignoring regenerated Self IDs.
+Persistent preflight warnings appeared in the 57 documents with overrides.
+The private source files, layer names, document paths and per-file logs remain
+outside this repository. Original INDD files were not opened by this check.
+
+Remaining work: apply visibility to PSD layers/PDF optional content, implement
+layer-comp choices and a layer-options UI, and validate appearance against
+verified same-save reference PDFs. Gap 19 remains open.
diff --git a/docs/localization-parity.md b/docs/localization-parity.md
index bc209c118..404cf13a7 100644
--- a/docs/localization-parity.md
+++ b/docs/localization-parity.md
@@ -10,7 +10,7 @@ Script-specific typesetting detail: [cjk.md](cjk.md), [cjk-typography.md](cjk-ty
 
 ## How it was measured
 
-Interface strings live in `crates/ui-egui/src/i18n.rs` (a shared table with German, French,
+Interface strings live in `crates/ui-egui/src/i18n/table.rs` (a shared table with German, French,
 Spanish, Japanese and Simplified Chinese columns) and `crates/ui-egui/src/i18n/{ar,cs,it,ja,ka,pt_br,uk}.rs`.
 Untranslated strings fall back to English. A script (2026-10-10) built the set of English
 interface strings as the union of every catalog's keys, every engine command label and every
diff --git a/docs/mcp.md b/docs/mcp.md
index 741174e13..bd82a0638 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -73,13 +73,13 @@ The release packages ship `designcraft-cli` alongside the desktop app, so no bui
 
 | Install | CLI |
 |---|---|
-| Windows (MSI) | `C:\Program Files\DesignCraft\designcraft-cli.exe` by default (wherever you installed it otherwise), not on `PATH` |
+| Windows (MSI) | `%LOCALAPPDATA%\Programs\ArtCraft\DesignCraft\designcraft-cli.exe` by default (`C:\Program Files\ArtCraft\DesignCraft\designcraft-cli.exe` for an all-users install, under `Program Files (x86)` instead for the 32-bit build, or wherever you installed it otherwise), not on `PATH` |
 | Linux (deb, rpm) | `/usr/bin/designcraft-cli` |
 | macOS | the separate `designcraft-cli-<version>-macos-<arch>.zip` release asset (the `.app` holds only the desktop app) |
 
 ```sh
-# Windows, default install folder
-claude mcp add designcraft -- "C:\Program Files\DesignCraft\designcraft-cli.exe" mcp
+# Windows (PowerShell), default install folder
+claude mcp add designcraft -- "$env:LOCALAPPDATA\Programs\ArtCraft\DesignCraft\designcraft-cli.exe" mcp
 # Linux, or macOS with the CLI unzipped onto PATH
 claude mcp add designcraft -- designcraft-cli mcp
 ```
@@ -88,6 +88,8 @@ claude mcp add designcraft -- designcraft-cli mcp
 
 ```sh
 designcraft-cli mcp --automation-read-root /work/project --automation-write-root /work/project/out
+designcraft-cli mcp --automation-read-root /work/project --automation-read-root /work/shared-assets \
+  --automation-write-root /work/project/out --automation-write-root /tmp/scratch
 ```
 
 ```json
@@ -98,16 +100,16 @@ designcraft-cli mcp --automation-read-root /work/project --automation-write-root
 The two flags (VectorCraft, PhotoCraft and the other Craft apps take the same ones, so one client
 config works across the suite) keep the agent to the folders you give it:
 
-- Every file a command reads must lie inside the **read root**: `open_document`, `file.open`,
+- Every file a command reads must lie inside a **read root**: `open_document`, `file.open`,
   `file.openIdml`, `place_image` and `file.place` / `place.load` / `media.options` with a `path`,
   `links.relink`, `links.relinkFolder`, `color.loadProfile`, `swatch.load`, `library.open`,
   `book.open`, `data.source.select`, `data.merge` and `file.importXml` / `xml.loadDtd` with a `path`,
   and `file.recovery.list` / `file.recovery.open` with a `dir`. A DesignCraft document names more
   files than the agent does: linked images, data sources, book chapters, the `Document Fonts` folder
   beside a document, an IDML package's linked images and the files an image cell of a merge names.
-  Those are read through the same checks, so a path in a document that leads outside the read root
+  Those are read through the same checks, so a path in a document that leads outside the read roots
   reads as a file that isn't there.
-- Every file a command writes must lie inside the **write root**: `save_document`, `export_png`,
+- Every file a command writes must lie inside a **write root**: `save_document`, `export_png`,
   `render_page` with a `path`, `file.save`, `file.saveAs`, `file.saveACopy`, `file.exportPdf`,
   `file.exportEpub`, `file.exportFixedEpub`, `file.exportHtml`, `file.exportText`, `file.exportXml`,
   `file.exportIdml`, `file.printBooklet`, `snippet.export`, `swatch.save`, `library.new` and the
@@ -115,21 +117,26 @@ config works across the suite) keep the agent to the folders you give it:
   `file.package`, `links.copyTo` and `file.recovery.save` / `file.recovery.open` with a `dir`
   (reopening removes the entries it read). `file.package` and `links.copyTo` check their folder
   before they create anything.
-- Read and write access are separate. Give the same folder twice for both. A root left out grants
-  none of its access: with only `--automation-read-root` nothing can be written to disk. Without
-  either flag nothing changes.
+- Each flag may be given more than once (#1552): a path inside any of the read roots may be read,
+  one inside any of the write roots written, so one session can read a project folder and a shared
+  assets folder, or write to an output folder and a scratch folder, without widening a root to
+  their common parent (which the roots don't grant). A folder given twice counts once.
+- Read and write access are separate. Give the same folder to both flags for both. A kind left out
+  grants none of its access: with only `--automation-read-root` nothing can be written to disk.
+  Without either flag nothing changes.
 - A path is made absolute against the server's working directory, then its links are followed: a
-  file (or folder) link that leads out of a root is outside it. For a file that doesn't exist yet,
+  file (or folder) link that leads out of the roots is outside them. For a file that doesn't exist yet,
   its nearest existing folder's links are followed and the rest must be plain names, so `..` below a
   folder that doesn't exist is refused, as is a link that leads nowhere (writing through it would
-  create its target). The result is compared with the root by whole folder names: `/work2/x` is not
+  create its target). The result is compared with each root by whole folder names: `/work2/x` is not
   inside `/work`. On Windows case is ignored, UNC paths (`\\server\share\...`) are resolved like
   drive-letter ones, and device names (`CON`, `NUL`, `COM1`...) are refused.
 - A refused path is an ordinary tool error the agent can read and correct, for example
-  `automation path rejected: outside the write root /work/project/out: /etc/x.designcraft` or
+  `automation path rejected: outside the write root /work/project/out: /etc/x.designcraft` (with
+  several, `outside the write roots /work/project/out, /tmp/scratch: ...`) or
   `automation filesystem access is not granted: write authority is absent: /work/project/out/x.designcraft`.
-- The roots must be existing folders; a missing one stops the server with an error. Each flag is
-  given once (`--flag <dir>` or `--flag=<dir>`).
+- The roots must be existing folders; a missing one stops the server with an error. Each flag takes
+  one folder per use (`--flag <dir>` or `--flag=<dir>`) and may be used again for more.
 
 The flags confine the in-process server, so `--connect` together with them is an error: the server
 would otherwise talk to an app that isn't confined. DesignCraft's desktop app has no equivalent flags
diff --git a/docs/pdf-backend.md b/docs/pdf-backend.md
index 26d73aa77..6dc2a3330 100644
--- a/docs/pdf-backend.md
+++ b/docs/pdf-backend.md
@@ -1,8 +1,8 @@
 # Shared PDF backend
 
-DesignCraft pins `craft-pdf`, patched Krilla 0.8.2 and the five Hayro reader crates (with
-`hayro-cmap`) to craft-libs revision `9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef`. Existing `craft-ui` and `craft-print` revisions
-remain unchanged. The reader migration is reviewed on top of the separate writer change.
+DesignCraft pins `craft-pdf`, patched Krilla 0.8.2 and the six Hayro reader crates (with
+`hayro-cmap` and `hayro-postscript`) to craft-libs revision `92d392cff132eaf53e13afff77f38b5c11b73aa0`. `craft-ui`,
+`craft-print` and the other craft-libs crates are pinned to the same revision. The reader migration is reviewed on top of the separate writer change.
 
 ## Writing
 
@@ -62,8 +62,8 @@ report known backend warnings; they do not certify all PDF fidelity.
 DesignCraft uses a 512 MiB reader input bound, checked before parsing or copying.
 Raster output has shared geometry/allocation bounds. Native unwind guards turn escaped
 backend panics into errors; WASM aborts and process-wide allocation failures are not recoverable.
-Application fonts, image assets, editing and export presets remain app-owned. Existing
-craft-ui/craft-print versions are preserved. The reader migration builds on the independently qualified writer change.
+Application fonts, image assets, editing and export presets remain app-owned. craft-ui and
+craft-print are pinned separately. The reader migration builds on the independently qualified writer change.
 
 The shared commit must be published before a fresh public checkout can resolve these pins.
 No sibling checkout is required. Licences and existing backend asset notices are recorded in
diff --git a/docs/pdf-layer-visibility.md b/docs/pdf-layer-visibility.md
new file mode 100644
index 000000000..1e0525e40
--- /dev/null
+++ b/docs/pdf-layer-visibility.md
@@ -0,0 +1,9 @@
+# Placed PDF layer visibility
+
+Object Layer Options distinguishes a PDF's own default configuration from an explicit visibility choice, including showing every layer. Use File Defaults resets that choice. Only placed PDFs in a mixed selection are changed.
+
+The engine command `object.layerOptions` accepts `hidden` names and optional `useDefaults`. Existing calls with `hidden: []` retain their reset behavior; pass `useDefaults: false` to explicitly show all layers. `useDefaults: true` resets defaults and cannot be combined with hidden names. Every explicit choice, including all-on (`useDefaults: false` with an empty `hidden` list), is checked with one actual visibility rewrite per distinct source before any target is edited or an undo step is recorded: a PDF can list readable layers yet refuse the rewrite (for example an over-budget cross-reference history), and PDFs without readable optional-content layers cannot be rewritten at all. Resetting to file defaults needs no rewrite and is always allowed. A stored choice whose source can no longer be rewritten still fails closed: the canvas does not draw the unmodified source and PDF export reports an error. With no explicit ID, a query selects the first placed PDF anywhere in the selection; an explicit non-PDF ID remains an error. Queries include `overridden` separately from each layer's `visible` and `default` states.
+
+Native saves use format 4 only for an explicit all-on override, on document or parent spreads, in groups or anchored: older readers would otherwise silently render file defaults. Format 4 is one reader capability shared with retained placed-graphic layer options (#1647, see [graphic-layer-options.md](graphic-layer-options.md)), so a version 4 reader understands both. Existing nonempty hidden lists retain their older semantics and format requirements. Raster and PDF export honor the choice; PDF export keeps its existing warned rasterization behavior. Embedded IDML export stores a separate PDF variant per placement and leaves original linked bytes untouched. The export walks cover the placements a page shows through its spreads and through its stories: parent-page and anchored ones too, so a page that inherits the placement does not quietly fall back to the file's defaults. PDF/A-2b preparation also follows stories nested in table cells, footnotes and endnotes, applying both hidden-layer and explicit all-on choices to an export-only raster copy. Embedded IDML applies those choices to anchors in table-cell and footnote text too, with independent variants for placements sharing source bytes. If placements share an item id, they must agree on source asset and layer choice or the export fails rather than embedding the wrong variant. Identical duplicated anchors can still export; the shared-id gap in frame duplication remains separate. Variants inside endnote stories are prepared, but IDML does not serialize endnote structures or their artwork; that remains unsupported (gap 19). External-only IDML export rejects active PDF layer choices because the original external file would lose the choice. A package's IDML copy links the placed files, so it cannot carry a choice either; the package report says so for a placement the export walk reaches, and the packaged DesignCraft document keeps it.
+
+This fixes visibility-state handling, not full InDesign layer/print parity. It does not implement editing the contents of placed PDFs or native INDD placement. Catalog/reference safety fixes landed in #1670.
diff --git a/docs/roadmap.md b/docs/roadmap.md
index 9223ca701..bc2962cb9 100644
--- a/docs/roadmap.md
+++ b/docs/roadmap.md
@@ -63,7 +63,7 @@ set exists; depth gaps are in gaps.md.
 | M3 | Styles (nested/GREP, bullets, keeps, span columns) | ✅; style editing reliability (#169) |
 | M4 | Color & effects | ✅ core; colour management depth |
 | M5 | Graphics & links | ✅ core; EPS preview only |
-| M6 | Files & export (native, IDML, PDF, PNG/JPEG) | IDML ✅, PDF ✅ (X-4, A-2b, tagged); INDD read ✅ (via indd-utils); PDF/X-1a/X-3 and presets ✗ |
+| M6 | Files & export (native, IDML, PDF, PNG/JPEG) | IDML ✅, PDF ✅ (X-4, A-2b, tagged); INDD read ✅ (via indd-utils); PDF/X-1a ✅; PDF/X-3 and presets ✗ |
 | M7 | Long documents (sections, TOC, index, footnotes, books) | ✅ except Books (shallow) |
 | M8 | Tables | ✅ core (table/cell styles, rotation); diagonal lines, anchored objects in cells (#163) |
 | M9 | Performance (MT composition, tiles) | in progress: parallel compose 6.7×, damage regions; incremental composition next |
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 6e676c470..3443ca8e6 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1,6 +1,6 @@
 # DesignCraft parity with Adobe InDesign
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-24 · **Change:** minor (list buttons with the default hanging indent; custom anchored objects honour Relative to Spine; PDF/X-4 visible unembedded font detection, #909; autoflow fills the following pages first; File ▸ Open Recent; .indd and .indt open through indd-utils; text threads by hand; image clipping paths from IDML; anchored objects wrap text; Tabs panel listed as present (#343); spring-loaded Zoom navigation; recovery checkpoint retention; cancelable macOS Dock Quit; Based on Parent; object styles carry effects; colour management on craft-cms, Coated FOGRA39 default CMYK; swatches on placed greyscale and bitmap images) · **Target:** Adobe InDesign 2026 (21.6.0.57, macOS)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-24 · **Change:** minor (Keyboard Shortcuts on craft-keymap's shared dialog, with shortcut sets; Convert Variable to Text; list buttons with the default hanging indent; custom anchored objects honour Relative to Spine; PDF/X-4 visible unembedded font detection, #909; autoflow fills the following pages first; File ▸ Open Recent; .indd and .indt open through indd-utils; text threads by hand; image clipping paths from IDML; anchored objects wrap text; Tabs panel listed as present (#343); spring-loaded Zoom navigation; recovery checkpoint retention; cancelable macOS Dock Quit; Based on Parent; object styles carry effects; colour management on craft-cms, Coated FOGRA39 default CMYK; swatches on placed greyscale and bitmap images) · **Target:** Adobe InDesign 2026 (21.6.0.57, macOS)
 
 The authoritative assessment of how close DesignCraft is to Adobe InDesign. [ROADMAP.md](../ROADMAP.md)
 summarizes it; [gaps.md](gaps.md) lists every known shortfall one at a time; the feature-by-feature
@@ -204,7 +204,7 @@ table is the one summed.
 | Area | Breadth (checklist) | Ready | Hours | Main gaps |
 |---|---|---|---|---|
 | Application shell & workspace | 99% | 55% | 40–60 | context menus not opening on some systems; window controls (#333); System theme (#237); New Window/Arrange; Help menu |
-| Documents, pages, spreads | 100% | 65% | 20–35 | Layout ▸ Pages submenu items, Page Attributes / Color Label, Go Back/Forward, layout grid (CJK) |
+| Documents, pages, spreads | 100% | 65% | 20–35 | Layout ▸ Pages submenu items, Page Attributes / Color Label, layout grid (CJK) |
 | Layers | 100% | 75% | 5–10 | IDML layer order fixed 2026-10-09; Layer panel options depth |
 | Frames, shapes & paths | 100% | 60% | 25–40 | object copy/paste failures, reference point relocation (#337), Join/Reverse Path/Convert Point menu |
 | Transform | 100% | 70% | 10–20 | Rotate 180°; transform panel depth |
@@ -315,7 +315,7 @@ It is evidence of breadth: each item exists. It is not a claim of InDesign-level
 - Control panel scale X/Y, rotation and shear fields (`transform.info`, absolute `transform.set {scaleX, scaleY, rotation, shear}` about the reference point) and Preferences › Transformations are Totals for nested objects and placed graphics.
 - Variable fonts: each named instance is a style (Font menu, shaping with feature variations, metrics, outlines) and embeds at its axis settings in PDF; free axis sliders still to come.
 - Object ▸ Select (first/next above, next/last below, container, content, previous/next in group), full Object ▸ Convert Shape (`object.convertShape`), Table ▸ Split Cell Horizontally/Vertically.
-- Attributes panel (`object.attributes`: Overprint Fill/Stroke/Gap, Nonprinting), with Overprint Gap in Overprint Preview and IDML.
+- Attributes panel (`object.attributes`: Overprint Fill/Stroke/Gap, Nonprinting), with Overprint Gap in Overprint Preview and IDML; PDF export writes them as `/op` and `/OP` with `/OPM 1`.
 - Page Numbering View (Preferences: section or absolute): page labels everywhere follow it; Go to Page takes section names, numbers or `+n`.
 - Preferences › Advanced Type (document `advancedType`: superscript/subscript size and position; IDML TextPreference); subscripts now drop 33.3% like InDesign.
 - Preferences › Composition › Highlight: keep violations, H&J violations (three shades), custom tracking/kerning, substituted fonts.
@@ -324,14 +324,14 @@ It is evidence of breadth: each item exists. It is not a claim of InDesign-level
 - Object ▸ Generate QR Code (`object.qrCode`: web link, text, SMS, email, business card; vector modules as a compound path, into a frame or re-encoded in place).
 - Conditional text (`condition.new/options/delete/apply/list`, Conditional Text panel): hidden conditions drop their text from layout and exports, indicators underline on screen, IDML Condition/AppliedConditions.
 - Endnotes (`endnote.insert/edit/delete/list/options`, Type ▸ Insert Endnote): references number through the document, the endnote frame on a new last page lists them under a heading; IDML keeps the listed text only.
-- Editorial notes (`note.new/edit/delete/convertToText/list`, Notes panel): anchored in text, flagged on screen, never printed or exported.
+- Editorial notes (`note.new/edit/delete/convertToText/convertFromText/split/list`, Notes panel with Split Note, Type › Notes › Convert to Note): anchored in text, flagged on screen, never printed or exported.
 - File ▸ Print Booklet (`file.printBooklet`): saddle-stitch or 2-up consecutive printer spreads as PDF, padded with blanks, with a gap between pages.
-- Edit ▸ Transparency Blend Space (`edit.transparencyBlendSpace`; RGB for web/mobile documents; IDML TransparencyPreference) — exported PDFs give pages with transparency a DeviceCMYK or DeviceRGB page group, so viewers and RIPs blend in that space. On screen, CMYK spreads with separable blend modes use two ink-channel passes through the working colour settings. Parent-page items, nested groups, effects and pasteboard share that path; 100% K in Color Dodge whitens coloured areas while paper stays outside the blend backdrop. Effect blend layers sit outside their clips and offscreen filters, preserving their backdrop in RGB too. The pass count is independent of blended-object count, and unchanged viewports reuse one cached raster (64 MiB cap). Spreads containing Hue, Saturation, Color or Luminosity still use the existing RGB blend followed by a CMYK proof approximation; full nonseparable CMYK blending remains open.
+- Edit ▸ Transparency Blend Space (`edit.transparencyBlendSpace`; RGB for web/mobile documents; IDML TransparencyPreference) — exported PDFs blend in that space: CMYK print exports write their transparency groups and page groups in DeviceCMYK (PDF/X-4 also carries the CMYK working space as its `GTS_PDFX` output intent); RGB exports give pages with transparency a DeviceRGB page group. On screen, CMYK spreads with separable blend modes use two ink-channel passes through the working color settings. Parent-page items, nested groups, effects and pasteboard share that path; 100% K in Color Dodge whitens colored areas while paper stays outside the blend backdrop. Effect blend layers sit outside their clips and offscreen filters, preserving their backdrop in RGB too. The pass count is independent of blended-object count, and unchanged viewports reuse one cached raster (64 MiB cap). Spreads containing Hue, Saturation, Color or Luminosity still use the existing RGB blend followed by a CMYK proof approximation; full nonseparable CMYK blending remains open.
 - High Contrast interface theme (fifth Interface Color Theme: black chrome, white text, yellow selection).
 - Place Excel workbooks (.xlsx): the first worksheet's used range becomes a table (shared/inline strings, numbers, booleans).
 - Object Library (`library.new/open/add/place/remove/list/json/close`, Library panel): `.dclib` files of snippets that keep stories, styles, swatches and images.
 - Ink Manager (`ink.list`, `ink.options`; Swatches panel menu): All Spots to Process, per-ink conversion and ink aliases in PDF output; IDML ConvertToProcess/AliasInkName.
-- Appearance of Black complete: Printing/Exporting rich black for RGB output (PNG), Overprint [Black] Swatch at 100% (document, IDML OverprintBlack).
+- Appearance of Black complete: Printing/Exporting rich black for RGB output (PNG), Overprint [Black] Swatch at 100% (document, IDML OverprintBlack; 100% [Black] fills, strokes and text overprint in PDF export).
 - Hyperlinks and Bookmarks panels (Window ▸ Interactive): new from the selection, edit (`hyperlink.edit`), go to source (`hyperlink.goToSource`), rename bookmarks (`bookmark.rename`), go to page, delete.
 - Nested line styles (`nestedLineStyles` paragraph attribute, Paragraph Style Options › Drop Caps and Nested Styles, IDML AllNestedLineStyles): the first lines restyle until the line breaks settle.
 - Drop caps (`type.para {dropCapLines, dropCapChars, dropCapStyle, dropCapAlignLeft, dropCapScaleDescenders}`, Paragraph panel, Paragraph Style Options › Drop Caps and Nested Styles; IDML DropCapLines/DropCapCharacters/DropcapDetail, the drop cap style as the leading "through 1 Dropcap" nested style): the first characters (code points, as InDesign counts them, never splitting a letter from its combining marks; up to 150) are enlarged from the first line's cap height down N − 1 leadings of the text after them (up to 25 lines; grid steps on a baseline grid), the lines beside them are indented by their advance (on the right in right-to-left paragraphs), spaces right after them are set at their size without widening the indent, baselines don't move; a one-line drop cap keeps a smaller size of its own and sets its tabs at the paragraph's tab stops; Align Left Edge (on by default) moves the drop cap left by its first letter's side bearing so its ink starts at the indent; Scale for Descenders is kept but doesn't change the layout yet; a drop cap character style, and nested styles through the drop cap (Dropcap delimiter). Drawn on screen and in PDF (text in order), with caret, hit testing and selection over the enlarged letters. Vertical text sets no drop caps.
@@ -348,7 +348,7 @@ It is evidence of breadth: each item exists. It is not a claim of InDesign-level
 - Image Import Options › Crop to for placed PDFs (`file.place {pdfCrop: crop|trim|bleed|art|media}`, Place PDF dialog): the frame shows that page box.
 - Stroke styles: striped (thick-thin… and custom bands), wavy and straight-hash strokes now draw on screen and in PDF; named custom stripe/dash/dot styles (`strokeStyle.new/delete/list`, Stroke panel Type list; IDML Striped/Dashed/DottedStrokeStyle).
 - Object ▸ Primary Text Frame (`object.primaryTextFrame`): any text frame's story can become (or stop being) the primary story Smart Text Reflow follows.
-- Column rules (Text Frame Options › Column Rules, `object.textFrameOptions {columnRule, columnRuleWeight, columnRuleColor, columnRuleTint, columnRuleOffset, columnRuleTopInset, columnRuleBottomInset}`, reported by `document.inspect`): a bar centred in each gutter of a multi-column frame, inside the insets and between the columns of right-to-left and vertical frames too, broken around paragraphs that span columns, with weight, colour, tint, horizontal offset and top/bottom insets; on screen, in PDF (tagged as an artifact) and in IDML (`ColumnRule…` attributes of `TextFramePreference`, also in object styles). The dialog shows the frame's options and changes only the fields edited. Rule stroke types and overprint aren't there yet.
+- Column rules (Text Frame Options › Column Rules, `object.textFrameOptions {columnRule, columnRuleWeight, columnRuleColor, columnRuleTint, columnRuleOffset, columnRuleTopInset, columnRuleBottomInset}`, reported by `document.inspect`): a bar centred in each gutter of a multi-column frame from the top line's ascent to the bottom line's descent, between the columns of right-to-left and vertical frames too, broken around paragraphs that span columns, with weight, colour, tint, horizontal offset and top/bottom insets; on screen, in PDF (tagged as an artifact) and in IDML (`ColumnRule…` attributes of `TextFramePreference`, also in object styles). The dialog shows the frame's options and changes only the fields edited. Rule stroke types and overprint aren't there yet.
 - Auto-size (Text Frame Options › Auto-Size, `object.textFrameOptions {autoSize: off|heightOnly|widthOnly|heightAndWidth|heightAndWidthProportionally, autoSizeReference, useMinimumHeight, minimumHeight, useMinimumWidth, minimumWidth, noLineBreaks}`): the frame fits its text exactly after every edit (typing, pasting, style changes, option changes) in the same undo step (opening a file keeps the frame sizes it gives); it grows and shrinks around the reference point, which stays put in spread space for rotated frames too, never below the minimum height/width and never past 10,000 pt. Width Only and No Line Breaks set each paragraph on one line; Height and Width without No Line Breaks keeps the width; Keep Proportions scales both sides until the text fits. IDML keeps all the options (`AutoSizing…`, `…ForAutoSizing` attributes). Not covered: frames of a thread other than the last, vertical frames, type on a path, and multi-column balancing in Keep Proportions.
 - Balance Columns (Text Frame Options › Balance Columns, `object.textFrameOptions {balanceColumns}`, IDML `VerticalBalanceColumns`): in the frame the story ends in, the columns after the last explicit column break fill to about the same depth (the last may be shorter by a line per column); keep options hold, spanning and split paragraphs keep their own balancing, vertical justification then applies to each column as usual, and vertical frames balance their bands. A frame the text runs on from, or that is overset, fills normally.
 - Place a page of an IDML or DesignCraft document (`file.place {layoutPage}`): its objects, stories, styles and swatches as one group (INDD files are not readable).
@@ -361,8 +361,7 @@ It is evidence of breadth: each item exists. It is not a claim of InDesign-level
 - Content Collector and Placer tools (B; `conveyor.collect/place/list/clear`): copies of objects (with stories, styles, images) ride a conveyor between pages and documents; Alt-click keeps them on it.
 - Linked stories (Edit ▸ Place and Link, `story.placeAndLink/links/updateLink/unlink`): child stories copy a parent, show out of date in the Links panel and update.
 - Edit ▸ Menus (`window.hideMenuItem`): hide menu items; menus with hidden items end in Show All Menu Items.
-- View ▸ Separations Preview (`view.separations`): one process plate as ink density, or areas over an ink limit in red (a GCR preview of the rendered view; spot plates and the flattener preview aren't there).
-- Separations Preview plates now come from each object's own colour (CMYK as authored; RGB and images through the colour settings, images via a cached 17³ table), so pure black shows only on the black plate.
+- View ▸ Separations Preview (`view.separations`, Window ▸ Output ▸ Separations Preview, `ink.separations`): the plates the print PDF puts on film, spot plates included. Each visible spread is exported as Export PDF writes it and separated with craft-prepress, so the Ink Manager's aliases and spots to process, overprint and the flattener show as printed. All inks as printed, one plate as film, or an ink limit in red over gray; the panel lists the plates with each ink's percentage under the pointer.
 - Language (Character panel ▸ Language, Properties ▸ Character, `type.char {language}`): text in other languages isn't hyphenated or spell-checked with the English dictionaries, typographer's quotes follow the language (German „…“, French and Russian «…», Swiss, Spanish, Dutch, Nordic, Japanese and Traditional Chinese 「…」, Simplified Chinese “…”), the font's localized forms (OpenType `locl`: Turkish i, Bulgarian Cyrillic, Japanese / Chinese / Korean glyph variants) follow it too, and so does the fallback for CJK characters the font lacks (with Draw Missing Glyphs from Fallback Fonts on): Japanese, Simplified Chinese, Traditional Chinese and Korean each try their own installed system fonts (Japanese starts with the craft-fonts Japanese faces, Mincho first, when built with them; Hangul, kana and Bopomofo pick their language's fonts whatever the language). Language names from IDML keep their spelling; locale codes as InDesign writes them for some languages (`de_DE_2006`, `nl_NL_2005`; any `ll`, `ll_CC`, `ll-CC`) are their language and region for all of the above, and Chinese is also recognised in its common spellings ("Simplified Chinese", "Chinese (Traditional)", `zh_CN`, `zh-Hant`). Spanish is hyphenated with Javier Bezos's Liang patterns (`hyph-es.tex` 5.0, MIT), Portuguese with hyph-utf8's `hyph-pt.tex` 1.4 (BSD-3-Clause) and Norwegian with hyph-utf8's `hyph-no.tex` (permissive), all through the `hypher` crate; hyphenation for other languages isn't bundled yet.
 - Books (`book.new/open/add/remove/list/styleSource/paginate/syncStyles/exportPdf`, Book panel): `.dcbook` files, continuous page numbering, chapter numbers resolved in book order (Automatic, Start Chapter Numbering at, Same as Previous Document; `layout.chapterNumbering`, with a style for Chapter Number variables and cross-references), style sync from a style source, one merged PDF. Section prefixes follow InDesign's rule (up to 8 characters, no + or comma).
 - Numbering & Section Options window as in InDesign (Start Section, automatic or explicit page numbering up to 99999, prefix, style, marker, Include Prefix; the document's chapter numbering and its book); OK applies both in one undo step (`layout.numberingOptions`).
@@ -394,12 +393,14 @@ It is evidence of breadth: each item exists. It is not a claim of InDesign-level
 - View ▸ Rotate Spread (`view.rotateSpread`, `layout.rotateSpreadView`): the spread in view turns in quarter turns on screen (stored with the document and in IDML's spread transform; output is unaffected). The canvas maps each spread through its own transform, so tools, snapping, resize handles, guides, overlays and rendering all follow the turned spread.
 - Vertical type (Vertical Type Tool, Type ▸ Story Direction `type.storyDirection`, IDML StoryOrientation): the direction belongs to the story, so every frame of a thread is vertical or horizontal together and a frame threaded onto a story takes its direction (`object.textFrameOptions {vertical}` sets the frames' stories); lines run top to bottom and follow each other right to left; the arrow keys follow them (Down and Up along the line, Left and Right to the next and previous line, keeping the position along it); CJK characters stay upright and other text turns, on screen and in PDF; CJK line breaking with basic kinsoku (also in horizontal text); Korean breaks at spaces, word by word (Hangul in any language, hanja in Korean text), or between syllables when the paragraph asks for it (`type.para {koreanCharBreaks}`, Paragraph Style Options ▸ Justification; not written to IDML). Upright text is shaped top to bottom: punctuation and brackets take their vertical forms (OpenType `vert`; `vkrn` and `vpal` through OpenType features), glyphs advance by their vertical metrics (`vmtx`) and hang from their vertical origins (`VORG`) on the centre of the ideographic em box (`BASE`, else OS/2), which the first line's ascent follows; turned text keeps its horizontal forms. Tate-chu-yoko (Type ▸ Tate-Chu-Yoko, `type.tateChuYoko`, IDML `Tatechuyoko`) sets a run such as "12" side by side within one em of the line. Ruby (Type ▸ Ruby…, `type.ruby`, IDML RubyString; group ruby spread 1-2-1 or centred) and kenten emphasis dots (`type.kenten`, IDML KentenKind) are set over their text — to its right in vertical frames — without changing line breaks. Warichu and ruby options (per-character ruby, positions, overhang) aren't there yet.
 - Math expressions (Type ▸ Insert Math Expression…, `math.insert`, `math.svg`): a LaTeX subset (fractions, scripts, roots, big operators with limits, Greek, relations and operators with math spacing, `\left…\right`, `\text`) typeset by our own engine into SVG, placed inline at the cursor or as a frame; the LaTeX is kept as alt text and can be edited.
-- Object Layer Options for placed PDFs (`object.pdfLayers`, `object.layerOptions`, Object ▸ Object Layer Options…): the file's optional-content layers listed and shown or hidden per frame on screen; in exported PDFs such graphics go out as 300 ppi images of their visible layers.
+- Object Layer Options for placed PDFs (`object.pdfLayers`, `object.layerOptions`, Object ▸ Object Layer Options…): the file's optional-content layers listed and shown or hidden per frame on screen. Plain and PDF/X-4 exports retain vector artwork and optional content with the source defaults or per-frame overrides, including independent states for repeated placements. Missing or unreadable default configurations and unsupported base states fall back to all-ON defaults with a file-named warning, preserving explicit frame overrides. Readable groups omitted from `/OCGs` are added with a distinct file-named warning, preserving their default ON/OFF states; concurrent recovery warnings are combined. Malformed ON data is recoverable only when a known ON base and empty OFF list prove it cannot hide artwork; missing display names are generated without changing known visibility when no override needs name matching. Contradictory states, unresolved references and ambiguous name overrides remain errors. PDF/A-2b command exports retain the existing 300 ppi raster path for explicit overrides; PDF/A-2 permits optional content, but this change does not extend archival validation. IDML GraphicLayer visibility import remains unsupported.
+- Placed-PDF export preparation is cached per asset and hidden-name set; repeated placements retain recovery warnings (identical warnings are deduplicated). When all groups are visible and named, the original source bytes are embedded without an incremental layer update, including sources whose broken cross-reference tables the reader repairs. Plain, PDF/X-4, booklet and book-merge output register those unmarked groups as visible. Hidden groups or generated names still require a usable cross-reference table; damage errors identify the placed file, and export retains the first placement error rather than replacing it with a later failure.
 - Effects: Inner Glow (edge or centre), Bevel and Emboss (inner bevel lit from the light angle), Satin (`object.innerGlow`, `object.bevel`, `object.satin`); PDF export now keeps soft effects: objects with shadows, glows, feathers, bevels or satin go out as 300 ppi transparent images of their appearance (threaded text frames excepted).
 - Directional Feather (`object.directionalFeather {widths: [top, left, bottom, right]}`): each side fades over its own width.
-- View ▸ Flattener Preview (`view.flattenerPreview`): objects involving transparency highlighted in red; knockout groups export as images (PDF output has no knockout groups).
+- View ▸ Flattener Preview (`view.flattenerPreview`): objects involving transparency highlighted in red; PDF export writes Knockout Group as a knockout transparency group (`/K true`) and Isolate Blending as `/I true`.
 - Live captions (`object.caption {live: true}`, Object ▸ Captions ▸ Generate Live Caption): the caption text is re-filled from the source object's metadata after every edit (same undo step).
-- Style Export Tagging (`style.exportTag`, Paragraph Style Options ▸ Export Tagging): paragraph and character styles choose their HTML element and class in EPUB/HTML.
+- Style Export Tagging (`style.exportTag`, Paragraph Style Options ▸ Export Tagging): paragraph and character styles choose their HTML element and class in EPUB/HTML. Its Split Document (EPUB only) flag marks the styles that start a new EPUB content file when the export splits on export tags.
+- EPUB Export Options › Split Document (`document.epubSplit`, File › Export EPUB… dialog; `file.exportEpub {split}` for one export): off (one content file, the default), before each paragraph of a single paragraph style, or before each paragraph whose style has Split Document on in its Export Tagging. Navigation and note links point across the files. The setting is stored with the document, follows a renamed style, and round-trips through IDML (`EPubExportPreference`); Load Styles carries the per-style flag.
 - Tagged Text: export (`file.exportText {format: "tagged"}`) and place (detected by its header; ASCII, UTF-8 or UTF-16) with paragraph and character styles, font, typeface and size, and `<0x…>` characters.
 - Tagged PDF: one structure element per paragraph (H1–H6 and BlockQuote from Export Tagging, else P) in reading order, frame fills, strokes, rules and tables as artifacts, figures with alt text.
 - EPUB: cover image from the first page (`file.exportEpub {cover}`), and Fixed Layout export (`file.exportFixedEpub`, File ▸ Export EPUB (Fixed Layout)…): pre-paginated pages as 144 ppi images with their text kept for search and read-aloud.
@@ -416,7 +417,7 @@ It is evidence of breadth: each item exists. It is not a claim of InDesign-level
 - Preferences › Appearance of Black: 100% K on screen as rich black (InDesign's default) or accurately as dark grey (`window.richBlack`); the printing/export side is still to come.
 - Spreads of up to 10 pages: Add to Previous Spread and Allow Spread to Shuffle (Pages panel; `layout.pages.toSpread`, `layout.spreadShuffle`); inserted pages go around kept spreads.
 - Page tool (⇧P) and `layout.pageSize`: pages of their own size (or a preset); the spine stays put and objects keep their place on their page. A click selects a page (handles, its liquid page rule tagged above it); dragging a handle previews the liquid rule and springs back, Alt-drag resizes, Shift keeps proportions, with a W/H readout; `anchor` keeps a reference point in place; double-click for exact sizes. With the Page tool the Control panel shows the page (reference point, W/H, preset, orientation, Liquid Page Rule including Controlled by Parent, Show Parent Page Overlay); X/Y and Objects Move with Page are shown, but pages don't move within their spread yet. On an object-based page it selects objects and shows their pins and width/height locks on the canvas (click to toggle, with tooltips).
-- File › Print (⌘P): printer, copies, page range, spreads, marks, bleed; printed as PDF through the system spooler (`file.print`, `file.printers`, `dryRun` for agents). Shortcuts now act like choosing the menu item (dialogs open), and UI commands win shortcut ties (⌘N opens New Document).
+- File › Print (⌘P): printer, copies, page range, spreads, marks, bleed; printed through the system spooler as the PDF File › Export PDF writes with the same settings (effects, flattener, print color, warnings) (`file.print`, `file.printers`, `dryRun` for agents). Shortcuts now act like choosing the menu item (dialogs open), and UI commands win shortcut ties (⌘N opens New Document).
 - Nested styles (through/up to N sentences, words, characters, letters, digits, tabs, breaks, spaces or given characters) and GREP styles (regex → character style), edited in Paragraph Style Options and composed under local formatting; `ui.dialog.open` for agents. Nested line styles are still to come; nested and GREP styles round-trip through IDML.
 - Table and cell styles (round-trip through IDML): cell styles (fill, insets, vertical justification, strokes, paragraph style) and table styles (region cell styles, border, alternating rows, spacing); apply from the Table panel, edits re-apply to every user; `style.cell.*`, `style.table.*`.
 - Style groups: paragraph and character styles shown in group folders, Move to Group (new, existing, none); `style.group` renames every use (styles, stories, table cells, footnotes, object styles).
@@ -425,7 +426,7 @@ It is evidence of breadth: each item exists. It is not a claim of InDesign-level
 - Spring-loaded Zoom: hold Cmd+Space (Ctrl+Space on Windows/Linux) for the Zoom cursor and click/scrubby zoom; Alt-click zooms out. Release returns to the previous tool without changing the document or undo history. Text-frame and text-field typing suppress the shortcut; Space remains Hand.
 - Guides belong to the active layer: hidden with it (or with its Show Guides off) and locked with it.
 - Pencil tool (N): freehand strokes, shown as you draw in the layer's colour, simplified to smooth paths (Alt closes); Smooth and Erase tools re-fit or remove the stretch you drag along (`path.smooth`, `path.erase`).
-- Edit › Keyboard Shortcuts: every command, click and press the new keys, conflicts shown, per-command and global reset; `window.setShortcut`. Import InDesign Set… reads a set saved by InDesign's Show Set (.txt) and reports what it changed and what it could not match; `window.importShortcuts`.
+- Edit › Keyboard Shortcuts (craft-keymap's shared dialog): every command, panel and tool grouped by menu, click and press the new keys (a key another command holds asks first: take it, take it and go there, or keep both), undo, per-command and global reset, named shortcut sets (Default is built in; edits of it become Custom), an on-screen US keyboard, JSON export and import, an HTML summary; `window.setShortcut` (panels as `window.panel` with `{panel}`, tools by id). Panels open with InDesign's keys where DesignCraft leaves them free (Swatches F5, Color F6, Layers F7, Info F8, Stroke F10, Paragraph Styles F11, Character Styles Shift+F11, Pages F12, Align Shift+F7); tools sharing a key take turns (B: Content Collector, Content Placer). Shortcuts run on the shared craft-keymap crate. Import… reads a set saved by InDesign's Show Set (.txt), including its Window menu panel items and Tools items, and shows what it will change and what it could not match, with likely commands to pick for unmatched items, before it becomes a set of its own; `window.importShortcuts`, `window.shortcutSets`.
 - Primary Text Frame (New Document) and Smart Text Reflow: pages are added while the primary story oversets and empty ones at the end removed, in the same undo step (Preferences › Type).
 - Glyphs panel: every character of any font (rendered by our renderer), search by character or U+code, click to insert, recently used.
 - UI scaling (Preferences › Interface, 50–200%; `window.uiScale`); the window title steps aside when the bar is crowded.
@@ -440,12 +441,12 @@ It is evidence of breadth: each item exists. It is not a claim of InDesign-level
 - Pathfinder panel as InDesign's: Paths (Join Path `path.join`, Open/Close Path, Reverse Path), Pathfinder, Convert Shape, Convert Point (`path.convertPoints`: plain, corner, smooth, symmetrical).
 - Make / Release Compound Path (⌘8; nested paths become holes), Create Outlines (⇧⌘O; one path per text colour), Scissors tool (C) with `path.split`.
 - Transform Again / Individually / Sequence Again (⌥⌘3; a moved copy repeats like Step and Repeat), Clear Transformations; Layers: Merge, Delete Unused, Hide/Lock Others, Show/Unlock All; Break Link to Style (paragraph and character).
-- Floating panels: tear a panel off the dock (its float button, or drag its header away) into a movable, resizable window; Dock puts it back; positions persist; `window.floatPanel` / `window.dockPanel`.
+- Floating panels: drag a panel's tab, or a group by its drag bar, off the dock (or choose Float Panel) into a movable floating window that resizes from every edge; Dock Panel (in its tab menu and ≡ menu) puts it back where it was; positions persist; `window.panel.float` / `window.panel.dock` (aliases `window.floatPanel` / `window.dockPanel`).
 - Place SVG (vector in PDF export via krilla-svg, resvg on screen, text in the bundled fonts), Photoshop (.psd/.psb composite in its colour mode — Bitmap, Grayscale, Duotone, Indexed, RGB, CMYK, Lab, 8/16-bit — with merged transparency; extra alpha and spot channels don't change the image), BMP, and Illustrator files saved with PDF compatibility (.ai). A swatch on a placed greyscale or bitmap image (IDML `<Image FillColor>`) colours it on screen and in PDF. New `designcraft-images` crate (L2) for sniffing, sizes and decoding. EPS is still missing.
 - View › Display Performance: Fast (grey boxes, no effects, ⌥⇧⌘Z), Typical (72 ppi proxies, ⌥⌘Z), High Quality (⌥⌘H, our default — the renderer is fast enough).
 - OpenType menu (Character panel): discretionary ligatures, fractions, ordinal, swash, titling, contextual alternates, slashed zero, the four figure styles and stylistic sets 1–20; `type.openType`; mapped to IDML's OTF attributes.
 - Add Anchor Point (=), Delete Anchor Point (-) and Convert Direction Point (⇧C) tools (click toggles smooth/corner, drag pulls out handles), with `path.addAnchor`, `path.deleteAnchor`, `path.convertAnchor`.
-- Gradients: the Gradient Swatch tool (G) drags a gradient's start and end across objects (Shift: 45°); the Gradient panel (InDesign's layout: thumbnail, Type, Location, Angle, Reverse) sets type, angle, reverse and edits stops and midpoints on a ramp (drag, add, drag off to remove, location; drop a swatch from the Swatches panel on a stop or the ramp; stops keep their CMYK), and follows the Fill/Stroke proxy. Edited gradients are unnamed swatches until the Swatches panel's New Swatch names one "New Gradient Swatch" (`swatch.new`, which also duplicates a named swatch); `swatch.create {gradient}` builds one from colour swatches; `object.gradient` (`target: stroke` for a stroke's gradient, drawn across the path's box on screen and in PDF); the vector round-trips through IDML (`GradientFill…`/`GradientStroke…`). A radial gradient stretches with the object's box as InDesign's does (an ellipse reaching the sides of a non-square frame, on screen and in PDF). Text takes a gradient swatch as its fill or stroke, laid across its frame's box as in InDesign (screen and PDF).
+- Gradients: the Gradient Swatch tool (G) drags a gradient's start and end across objects (Shift: 45°); the Gradient panel (InDesign's layout: thumbnail, Type, Location, Angle, Reverse) sets type, angle, reverse and edits stops and midpoints on a ramp (drag, add, drag off to remove, location; drop a swatch from the Swatches panel on a stop or the ramp; stops keep their CMYK, and a stop on a swatch keeps it, so spot stops shade as Separation or DeviceN in PDF), and follows the Fill/Stroke proxy. Edited gradients are unnamed swatches until the Swatches panel's New Swatch names one "New Gradient Swatch" (`swatch.new`, which also duplicates a named swatch); `swatch.create {gradient}` builds one from color swatches; `object.gradient` (`target: stroke` for a stroke's gradient, drawn across the path's box on screen and in PDF); the vector round-trips through IDML (`GradientFill…`/`GradientStroke…`). A radial gradient stretches with the object's box as InDesign's does (an ellipse reaching the sides of a non-square frame, on screen and in PDF). Text takes a gradient swatch as its fill or stroke, laid across its frame's box as in InDesign (screen and PDF).
 - New Document (⌘N) as in InDesign: Recent, Saved, Print, Web and Mobile tabs of page cards (double-click creates) beside the preset's details: document name, size with arrows, units, orientation, pages, start page #, facing pages, primary text frame, columns, margins, bleed and slug per edge (linked or not); Save Document Preset (`file.savePreset`, `file.deletePreset`; saved presets are kept with the preferences, listed by `file.presets` and made by `file.new {preset: name}`); `file.new` takes `intent`, `units`, `startPage` and per-edge `bleed`/`slug`. Preview shows a document with the window's settings in the workspace while it is open; Create keeps it, Close removes it.
 - Document Setup (⌥⌘P), laid out like InDesign's: intent, number of pages, start page # (an even start begins with a left page), facing pages, binding, Page Size (presets keeping the orientation, width and height with arrows, orientation), margins for every page and parent page, bleed and slug per edge (each group linked or not), and Adjust Layout (objects follow the new page size and margins), all in one undo step; measures are read in the document's units, and a value that can't be read keeps the dialog open; `layout.documentSetup {}` reports the setup, margins included.
 - Stroke panel: cap, join, miter limit, alignment, type, Start/End arrowheads (12 kinds, drawn on screen and in PDF; the path is shortened under pointed heads) and gap colour under dashes and dots; with text selected (or text frames selected with Formatting Affects Text on) it shows the text's stroke weight, colour and Stroke Behind Fill.
@@ -454,7 +455,7 @@ It is evidence of breadth: each item exists. It is not a claim of InDesign-level
 - Based on Parent (`layout.parents.options {parent, basedOn}`): a parent shows its base parent's items under its own, on its pages and on the parent itself; chains work, cycles are refused, and items from any parent in the chain can be overridden. IDML carries it as the parent pages' `AppliedMaster`; a cycle or missing base in a file is cleared with a warning on open. The Pages panel has no Parent Options dialog yet.
 - Place PDF: placed PDF pages are sized by their crop box, drawn on screen through hayro (with mip levels) and embedded in exported PDFs as vector form XObjects (krilla), `<PDF>` in IDML.
 - Menus expose the engine's features (TOC, numbering & sections, text variables, hyperlinks, cross-references, footnotes, step and repeat, spelling, fitting/content, effects, Data Merge, Preflight, EPUB); any menu command with parameters gets a dialog generated from its parameter documentation.
-- Table of contents (Layout ▸ Table of Contents dialog: included styles, per-style entry style, page number position and its character style, separator and its character style, alphabetical sorting and level, title style, Replace Existing; generate/update, dot leaders; the definition round-trips through IDML as a TOC style) and text variables (running headers, last page number, chapter number, file name, dates, custom) resolved per page.
+- Table of contents (Layout ▸ Table of Contents dialog: included styles, per-style entry style, page number position and its character style, separator and its character style, alphabetical sorting and level, title style, Replace Existing; generate/update, dot leaders; the definition round-trips through IDML as a TOC style) and text variables (running headers, last page number, chapter number, file name, dates, custom) resolved per page; Convert Variable to Text turns the selected instances, or every instance of one variable, into the text they show on their page.
 - Soft effects: blurred drop shadow, inner shadow, outer glow, basic feather.
 - ~200 commands, all reachable through the JSON control channel; headless CLI rendering to PNG.
 - MCP server (`designcraft-cli mcp [--connect PORT]`, docs/mcp.md): headless engine or the running app; commands, batch, document/story inspection, page renders as images, window screenshots, pointer/keyboard/dialog input.
diff --git a/docs/typography-parity.md b/docs/typography-parity.md
index 12a9dd071..8c92e8dfa 100644
--- a/docs/typography-parity.md
+++ b/docs/typography-parity.md
@@ -1,6 +1,6 @@
 # Typography and composition parity
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-16 · **Change:** minor (Type › Reload Fonts reads fonts installed, edited or removed since start-up (#328, #547); Optical kerning from outlines (#181); macOS lists fonts that font services and managers activate; Justification dialog for the selected paragraphs; anchored objects wrap text; Tabs panel listed as present (#343); character stroke behind fill) · **Target:** Adobe InDesign 2026 (21.6)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-24 · **Change:** minor (Optical Margin Alignment per story with a size in the Story panel, and Ignore Optical Margin in the Paragraph panel menu and paragraph styles, kept through IDML (#947); Type › Reload Fonts reads fonts installed, edited or removed since start-up (#328, #547); Optical kerning from outlines (#181); macOS lists fonts that font services and managers activate; Justification dialog for the selected paragraphs; anchored objects wrap text; Tabs panel listed as present (#343); character stroke behind fill) · **Target:** Adobe InDesign 2026 (21.6)
 
 Typesetting is what InDesign is bought for. A feature can exist and still set text differently
 from InDesign: different line breaks, different page count, overset where InDesign fits. This
@@ -46,7 +46,7 @@ Fidelity: **unmeasured** unless stated.
 | Leading | auto (120%), absolute, leading model | ✓ | ✓ | CJK leading models in cjk-typography.md |
 | First baseline | ascent, cap height, x-height, leading, fixed, min | ✓ | ✓ | |
 | Frame fit / overset | baseline of the last line must fit | descenders must fit | ~ | **differs** (#180): frames go overset where InDesign fits |
-| Baseline grid | document grid relative to the top of the page or each page's top margin; frame grids | ✓ | ✓ | |
+| Baseline grid | document grid relative to the top of the page or each page's top margin; frame grids relative to the top of the page, top margin, top of frame or top inset | ✓ | ✓ | |
 | Vertical justification | top, centre, bottom, justify, paragraph spacing limit | ✓ | ✓ | |
 | Text in shaped frames | lines follow oval, polygon and freeform frame outlines, one inset from the outline | ✓ | ~ | concave shapes set one slot per line (the widest); vertical justification and paragraph shading use the frame's rectangle (#646) |
 | Columns, span / split columns | ✓ | ✓ | ✓ | split columns within a column (#295); text after a span flows below it (#276) |
@@ -58,7 +58,7 @@ Fidelity: **unmeasured** unless stated.
 | Tabs | left/center/right/decimal/align-on, leaders, right-indent tab | ✓ | ~ | Tabs panel with a ruler over the text column, and a Tabs section in Paragraph Style Options (#343); wrapping of lines with tabs fixed (#282) |
 | Paragraph rules, borders, shading | ✓ | ✓ | ✓ | |
 | Balance ragged lines | ✓ | ✓ | ✓ | |
-| Optical margin alignment | ✓ | ✓ (hang table of our own) | ~ | hang amounts are ours, InDesign's unknown |
+| Optical margin alignment | per story with a size, Ignore Optical Margin per paragraph and style | ✓ (hang table of our own, scaled by the story's size; Story panel; IDML `StoryPreference`, `IgnoreEdgeAlignment`) | ~ | hang amounts are ours, InDesign's unknown (#947) |
 | Text wrap | bounding box, shape, jump object/column, wrap sides (text on both sides of an object), contour options, on page items and anchored objects | ✓ | ~ | Detect Edges, Alpha Channel and Photoshop Path contours follow the frame's path (composition doesn't read the image) |
 | Anchored objects | inline, above line, custom | ✓ | ~ | anchored objects in table cells not drawn (#163) |
 | Footnotes, endnotes | ✓ | ✓ | ~ | footnotes don't split across columns yet |
diff --git a/docs/ui-parity.md b/docs/ui-parity.md
index 2430b489b..4bc40c627 100644
--- a/docs/ui-parity.md
+++ b/docs/ui-parity.md
@@ -1,6 +1,6 @@
 # UI and interaction parity
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-21 · **Change:** minor (text Control panel Character/Paragraph modes; Properties ••• expands Character and Paragraph; live corners work; document views row: scrollbars, Alt pans while editing text; Tabs panel listed as present (#343); spring-loaded Zoom navigation; paragraph style override feedback and clearing) · **Target:** Adobe InDesign 2026 (21.6, Medium Dark, macOS)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-24 · **Change:** minor (Story panel; text Control panel Character/Paragraph modes; Properties ••• expands Character and Paragraph; live corners work; document views row: scrollbars, Alt pans while editing text; Tabs panel listed as present (#343); spring-loaded Zoom navigation; paragraph style override feedback and clearing) · **Target:** Adobe InDesign 2026 (21.6, Medium Dark, macOS)
 
 Tools, handles, snapping, nudging, modifiers, shortcuts, panels, menus, context menus and feel,
 against InDesign 2026. The look was measured from the running app
@@ -16,7 +16,7 @@ basics of editing fail for too many users on Windows and Linux.
 | What | Value | How |
 |---|---|---|
 | InDesign 21.6 menu items matched (in scope) | 331 / 482 (69%) | script over the running app's menu dump; see target-app-parity.md |
-| Menu bar | 9 menus, 49 submenus, 340 items | `MENUS` in `crates/ui-egui/src/menus.rs` |
+| Menu bar | 9 menus, 49 submenus, 340 items | `MENUS` in `crates/ui-egui/src/menus/tables.rs` |
 | Commands | 446 engine (188 in menus) + 99 UI | `crates/engine/src/cmd/*`, `UI_COMMANDS` |
 | Theme colours | measured hex values of Medium Dark, 4 brightness themes + High Contrast | `theme::Tokens` vs `11-observed-ui.md` §1 |
 
@@ -35,7 +35,7 @@ basics of editing fail for too many users on Windows and Linux.
 | Overset mark (red + at the out port) | selected frame only | every overset frame, groups included, while frame edges show | ✓ | a deliberate step past InDesign: grouped labels that overflow were invisible until Preflight |
 | Smart guides, snapping to guides/grid/baseline | ✓ | ✓ (2,049-line `snap.rs`) | ~ | vertical smart spacing between two rectangles (#188) |
 | Nudging with arrows, Shift ×10 | ✓ | ✓ | ✓ | |
-| Document views: scrollbars (each split pane), Hand tool by Space, middle drag, or Alt while editing text | ✓ | ✓ | ✓ | `canvas.rs` `scrollbar_tests` |
+| Document views: scrollbars (each split pane), Hand tool by Space, middle drag, or Alt while editing text | ✓ | ✓ | ✓ | `canvas/scroll.rs` `scrollbar_tests` |
 | Gridify while drawing, Gap tool, Live Distribute | ✓ | ✓ | ✓ | |
 | Type tool: caret, selection, double/triple click, drag-and-drop text | ✓ | ✓ | ~ | formatting at a caret discarded (#289); text editing complaints (#23, #174) |
 | Threading: click out port, load text cursor, click frame | ✓ | ✗ ports drawn only; no thread/unthread command; Primary Text Frame and autoflow on Place | ✗ | **alpha blocker** (#352, #194, #165, #140) |
@@ -43,14 +43,14 @@ basics of editing fail for too many users on Windows and Linux.
 | Context menus (canvas, panels, rulers) | ✓ everywhere | 9 context-menu sites, ruler units by right-click | ~ | **not opening for several users** (#238, #187, #160) |
 | IME text input on the canvas | ✓ | ✓ | ~ | not checked by hand with a system IME (#322) |
 | Font menu: search, preview, favourites, type-ahead, filters (class, recently added), styles per family, sample text and size, recently used, similar fonts | ✓ | ✓ | ~ | search field focus on macOS (#335, #86); Adobe Fonts (Find More, activated) out of scope |
-| Keyboard shortcuts: InDesign defaults, editor, sets | ✓ | ✓ editor; defaults from 09-shortcuts.md; imports an InDesign Show Set `.txt` | ✓ | tool keys are fixed, so a set's Tools items are reported, not applied |
+| Keyboard shortcuts: InDesign defaults, editor, sets | ✓ | ✓ editor; defaults from 09-shortcuts.md; panels take keys (InDesign's F5–F12 defaults where free) and tool keys are editable; imports an InDesign Show Set `.txt`, panel and tool items included | ✓ | no Object Styles or Transform panel to give Cmd+F7 or F9; Links (Cmd+Shift+D) keeps DesignCraft's owner of that key |
 | Quick Apply | ✓ | ✓ | ✓ | |
 | Numeric fields: units, arithmetic, scrubbing | ✓ | 21 pt spinner fields with arithmetic | ✓ | |
 | Colour fields: hex, picker from any swatch field | ✓ | ✓ | ~ | hex entry and picker issues (#323, #190) |
-| Panels: Pages, Layers, Swatches, Color, Stroke, Character, Paragraph, Styles, Links, Effects, Text Wrap, Align, Pathfinder, Table, Index, TOC, Hyperlinks, Bookmarks, Articles, Tags, Notes, Track Changes, Object States, Buttons and Forms, Preflight, Data Merge, Library, Scripts, Glyphs, Info, Tabs | ✓ | all present | ~ | Navigator, Trap Presets, Animation, Timing missing; pull-down panels can't scroll on Linux (#267) |
+| Panels: Pages, Layers, Swatches, Color, Stroke, Character, Paragraph, Styles, Links, Effects, Text Wrap, Align, Pathfinder, Table, Index, TOC, Hyperlinks, Bookmarks, Articles, Tags, Notes, Track Changes, Object States, Buttons and Forms, Preflight, Data Merge, Library, Scripts, Glyphs, Info, Tabs, Story | ✓ | all present | ~ | Navigator, Trap Presets, Animation, Timing missing; pull-down panels can't scroll on Linux (#267) |
 | Dialogs: New Document, Document Setup, Preferences (all pages), Paragraph/Character/Object/Table/Cell Style Options, Export PDF, Print, Package, Find/Change | ✓ | present | ~ | generated command dialogs fill the long tail; depth varies |
 | Workspaces | Essentials, Essentials Classic, Advanced, Book, Digital Publishing, Interactive for PDF, Printing and Proofing, Review, Typography, Touch | ✓ named workspaces (Essentials Classic: Control panel and iconic panel groups) + custom; Window › Workspace; no Review or Touch | ~ | tab bar overlaps menus in Book/Advanced (#182) |
-| Story Editor | ✓ | ✓ | ~ | style-name column, depth ruler missing |
+| Story Editor | ✓ | ✓ | ~ | depth ruler and View › Story Editor › Show/Hide Depth Ruler (`story_editor.rs` `depth_ruler_shows_and_hides_from_the_view_menu`); hiding or resizing the style-name column missing |
 | Undo granularity (a drag = one step) | ✓ | ✓ (Begin/Preview/Commit) | ✓ | |
 | Closing with unsaved changes asks | ✓ | ✓ File › Close and window/menu quit (#146, #545) | ✓ | macOS Dock Quit still bypasses the prompt (#544) |
 | UI scaling, System appearance | ✓ | scaling ✓ (#281); follows macOS light/dark ✗ (#237) | ~ | |
@@ -122,6 +122,7 @@ covers checking the sampled and redefined settings in the styles tutorial (2:45
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-24 | minor | Panels row: Story panel (Optical Margin Alignment and its size) |
 | 2026-10-21 | minor | Chrome row: the text Control panel's A/¶ modes; Properties row: ••• expands Character and Paragraph in place |
 | 2026-10-11 | minor | Live corners row to ✓: widget, diamonds, drag, Shift-drag, Alt-click shape cycling (#186) |
 | 2026-10-11 | minor | Added held Cmd+Space / Cmd+Alt+Space Zoom navigation and canvas input regression tests |
diff --git a/packaging/env.sh b/packaging/env.sh
index 55ff3943c..833d69480 100644
--- a/packaging/env.sh
+++ b/packaging/env.sh
@@ -49,7 +49,7 @@ warn() {
 # Copy licence and readme files that exist into a package directory.
 copy_docs() {
   local dest="$1" f
-  for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT; do
+  for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT NOTICE; do
     if [[ -f "$ROOT/$f" ]]; then cp "$ROOT/$f" "$dest/"; fi
   done
   copy_font_licences "$dest"
diff --git a/packaging/freebsd/package.sh b/packaging/freebsd/package.sh
index d11434be0..363ef1e22 100755
--- a/packaging/freebsd/package.sh
+++ b/packaging/freebsd/package.sh
@@ -29,13 +29,25 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
-# FreeBSD's uname says amd64; release file names use x86_64 like the Linux and Windows ones.
-MACHINE="$(uname -m)"
-case "$MACHINE" in
-  amd64 | x86_64) ARCH=x86_64 ;;
-  arm64 | aarch64) ARCH=aarch64 ;;
-  *) echo "unsupported architecture $MACHINE" >&2; exit 2 ;;
+# Release file names use x86_64 and aarch64 like the Linux and Windows ones.
+release_arch() {
+  local arch="$1"
+  case "$arch" in
+    amd64 | x86_64) echo x86_64 ;;
+    arm64 | aarch64) echo aarch64 ;;
+    *) echo "unsupported architecture $arch" >&2; return 2 ;;
+  esac
+  return
+}
+# The release workflow cross-compiles aarch64 in an x86_64 VM with CARGO_BUILD_TARGET set to
+# aarch64-unknown-freebsd: name the archive after the target, not the host's uname -m.
+case "${CARGO_BUILD_TARGET:-}" in
+  "") ARCH="$(release_arch "$(uname -m)")" ;;
+  aarch64-unknown-freebsd | x86_64-unknown-freebsd) ARCH="$(release_arch "${CARGO_BUILD_TARGET%%-*}")" ;;
+  *) echo "CARGO_BUILD_TARGET=$CARGO_BUILD_TARGET is not a supported FreeBSD target" >&2; exit 2 ;;
 esac
+# Only binaries for this machine can run here (the --version check at the end).
+HOST_ARCH="$(release_arch "$(uname -m)" 2>/dev/null)" || HOST_ARCH=""
 if [[ "$DRY_RUN" = 0 ]] && [[ "$(uname -s)" != FreeBSD ]]; then
   echo "error: build on FreeBSD (or pass --dry-run to check the tree layout)" >&2
   exit 2
@@ -47,14 +59,15 @@ echo "==> DesignCraft $VERSION for FreeBSD $ARCH"
 # The release VM has 12 GB; full parallelism on the biggest crates runs it out of memory.
 export CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-4}"
 if [[ "$SKIP_BUILD" = 0 ]]; then
-  (cd "$ROOT" && cargo build --release --locked -p designcraft -p designcraft-cli)
+  (cd "$ROOT" && cargo build --release --locked ${CARGO_BUILD_TARGET:+--target "$CARGO_BUILD_TARGET"} \
+    -p designcraft -p designcraft-cli)
 fi
 WORK="$CARGO_TARGET_DIR/freebsd-package"
 STAGE="$WORK/$BASENAME"
 rm -rf "$WORK"
 mkdir -p "$WORK"
 
-BIN="$CARGO_TARGET_DIR/release"
+BIN="$CARGO_TARGET_DIR/${CARGO_BUILD_TARGET:+$CARGO_BUILD_TARGET/}release"
 OUT_DIR="$DIST"
 if [[ "$DRY_RUN" = 1 ]]; then
   # Stub binaries, and the tarball stays in the work dir so dist/ only ever holds real builds.
@@ -95,7 +108,11 @@ mkdir -p "$OUT_DIR"
 tar -C "$WORK" -czf "$OUT_DIR/$BASENAME.tar.gz" "$BASENAME"
 echo "wrote $OUT_DIR/$BASENAME.tar.gz"
 
-"$STAGE/bin/designcraft-cli" --version
+if [[ "$ARCH" = "$HOST_ARCH" ]]; then
+  "$STAGE/bin/designcraft-cli" --version
+else
+  echo "skipping --version: $ARCH binaries do not run on this $HOST_ARCH host"
+fi
 if [[ "$DRY_RUN" = 1 ]]; then
   echo "==> dry run: tarball contents"
   tar -tzvf "$OUT_DIR/$BASENAME.tar.gz"
diff --git a/packaging/linux/flatpak/ai.storyteller.designcraft.bundle.yml b/packaging/linux/flatpak/ai.storyteller.designcraft.bundle.yml
index 2cfbe6a5e..755d2e2a3 100644
--- a/packaging/linux/flatpak/ai.storyteller.designcraft.bundle.yml
+++ b/packaging/linux/flatpak/ai.storyteller.designcraft.bundle.yml
@@ -22,6 +22,9 @@ finish-args:
   - --socket=fallback-x11
   # X11 shared memory (MIT-SHM). Without it the X11 fallback is slow or fails.
   - --share=ipc
+  # Network: update checks reach GitHub. This shares the host network namespace, so the optional
+  # --control server (127.0.0.1 in the sandbox) is reachable from the host.
+  - --share=network
   # GPU access for egui's renderer (Vulkan, or GL as a fallback).
   - --device=dri
   # Open/Save, Place and Export go through the file-chooser portal (rfd's xdg-portal backend)
@@ -30,9 +33,7 @@ finish-args:
   # line, Open Recent, linked images placed in a layout) work in the usual places.
   - --filesystem=xdg-documents
   - --filesystem=xdg-pictures
-  # Deliberately not granted: network (the optional --control server listens on 127.0.0.1 in
-  # the sandbox; `flatpak override --user --share=network ai.storyteller.designcraft` exposes it
-  # to host agents) and home/host filesystem access.
+  # Home/host filesystem access is deliberately not granted.
 modules:
   - name: designcraft
     buildsystem: simple
diff --git a/packaging/linux/flatpak/ai.storyteller.designcraft.yml b/packaging/linux/flatpak/ai.storyteller.designcraft.yml
index aabee2ebb..1dc2ee4ed 100644
--- a/packaging/linux/flatpak/ai.storyteller.designcraft.yml
+++ b/packaging/linux/flatpak/ai.storyteller.designcraft.yml
@@ -23,6 +23,9 @@ finish-args:
   - --socket=fallback-x11
   # X11 shared memory (MIT-SHM). Without it the X11 fallback is slow or fails.
   - --share=ipc
+  # Network: update checks reach GitHub. This shares the host network namespace, so the optional
+  # --control server (127.0.0.1 in the sandbox) is reachable from the host.
+  - --share=network
   # GPU access for egui's renderer (Vulkan, or GL as a fallback).
   - --device=dri
   # Open/Save, Place and Export go through the file-chooser portal (rfd's xdg-portal backend)
@@ -31,9 +34,7 @@ finish-args:
   # line, Open Recent, linked images placed in a layout) work in the usual places.
   - --filesystem=xdg-documents
   - --filesystem=xdg-pictures
-  # Deliberately not granted: network (the optional --control server listens on 127.0.0.1 in
-  # the sandbox; `flatpak override --user --share=network ai.storyteller.designcraft` exposes it
-  # to host agents) and home/host filesystem access.
+  # Home/host filesystem access is deliberately not granted.
 build-options:
   append-path: /usr/lib/sdk/rust-stable/bin
 modules:
@@ -46,6 +47,7 @@ modules:
     build-commands:
       - cargo --offline build --release --locked -p designcraft
       - install -Dm755 target/release/designcraft /app/bin/designcraft
+      - install -Dm644 NOTICE /app/share/doc/designcraft/NOTICE
       - install -Dm644 packaging/linux/ai.storyteller.designcraft.desktop /app/share/applications/ai.storyteller.designcraft.desktop
       - install -Dm644 packaging/linux/ai.storyteller.designcraft.mime.xml /app/share/mime/packages/ai.storyteller.designcraft.xml
       - mkdir -p /app/share/icons && cp -R assets/app-icon/hicolor /app/share/icons/
diff --git a/packaging/linux/package.sh b/packaging/linux/package.sh
index c4d843eca..fa24385d5 100755
--- a/packaging/linux/package.sh
+++ b/packaging/linux/package.sh
@@ -142,7 +142,6 @@ if has appimage; then
   esac
   APPDIR="$WORK/DesignCraft.AppDir"
   cp -R "$STAGE" "$APPDIR"
-  mv "$APPDIR/usr/share/doc" "$WORK/doc-unused"
   ln -s usr/bin/designcraft "$APPDIR/AppRun"
   cp "$HERE/$APP_ID.desktop" "$APPDIR/$APP_ID.desktop"
   cp "$ROOT/assets/app-icon/hicolor/256x256/apps/$APP_ID.png" "$APPDIR/$APP_ID.png"
diff --git a/packaging/macos/package.sh b/packaging/macos/package.sh
index 21edfa574..8b8f6c41e 100755
--- a/packaging/macos/package.sh
+++ b/packaging/macos/package.sh
@@ -80,6 +80,21 @@ sign() {
   codesign --force --sign "$IDENTITY" ${kc[@]+"${kc[@]}"} "${ts[@]}" "$@"
 }
 
+# `stapler staple` and `stapler validate` both fetch the ticket from Apple's CloudKit, and a dropped
+# connection there (NSURLErrorDomain -1005, "Error 68") fails them although notarization worked.
+# Both are idempotent, so retry with a pause; a missing or bad ticket still fails every try.
+stapler_retry() {
+  local try
+  for try in 1 2 3 4; do
+    xcrun stapler "$1" "$2" && return 0
+    [[ "$try" = 4 ]] && break
+    echo "stapler $1 failed (try $try of 4); retrying in $((try * 20)) s" >&2
+    sleep $((try * 20))
+  done
+  echo "error: stapler $1 $(basename "$2") failed 4 times" >&2
+  exit 1
+}
+
 notarize() {
   local file="$1" out id status
   echo "==> notarizing $(basename "$file") (this can take a few minutes)"
@@ -103,6 +118,8 @@ mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
 # Executable and icon carry the display name (CFBundleExecutable / CFBundleIconFile).
 cp "$WORK/bin/designcraft" "$APP/Contents/MacOS/DesignCraft"
 cp "$ROOT/assets/app-icon/designcraft.icns" "$APP/Contents/Resources/DesignCraft.icns"
+# Required embedded-font notices are independent of optional font inputs.
+cp "$ROOT/NOTICE" "$APP/Contents/Resources/NOTICE"
 # Licences of the embedded craft-fonts fonts (only when built with CRAFT_FONTS_DIR).
 copy_font_licences "$APP/Contents/Resources"
 sed -e "s/@VERSION@/$VERSION/g" -e "s/@SHORT_VERSION@/$SHORT_VERSION/g" \
@@ -120,8 +137,8 @@ codesign --verify --strict --deep --verbose=2 "$APP"
 if [[ "$NOTARIZE" = 1 ]]; then
   ditto -c -k --keepParent "$APP" "$WORK/DesignCraft-notarize.zip"
   notarize "$WORK/DesignCraft-notarize.zip"
-  xcrun stapler staple "$APP"
-  xcrun stapler validate "$APP"
+  stapler_retry staple "$APP"
+  stapler_retry validate "$APP"
   spctl --assess --type execute -vvv "$APP"
 fi
 
@@ -171,8 +188,8 @@ fi
 hdiutil_retry detach detach "$MOUNT" >/dev/null
 if [[ "$NOTARIZE" = 1 ]]; then
   notarize "$DMG"
-  xcrun stapler staple "$DMG"
-  xcrun stapler validate "$DMG"
+  stapler_retry staple "$DMG"
+  stapler_retry validate "$DMG"
   spctl --assess --type open --context context:primary-signature -vvv "$DMG"
 fi
 
diff --git a/packaging/windows/INSTALLATION.md b/packaging/windows/INSTALLATION.md
new file mode 100644
index 000000000..982a5b420
--- /dev/null
+++ b/packaging/windows/INSTALLATION.md
@@ -0,0 +1,35 @@
+# Windows installation policy checks
+
+New installations default to the current account under `Programs\ArtCraft\<App>`.
+The first setup page offers installation for everyone. Scope is selected before duplicate
+checks and directory costing. An update uses the existing context's remembered exact folder;
+`INSTALLFOLDER` supplied explicitly is never replaced. It is a secure MSI property so the
+chosen folder reaches the elevated installer. Silent machine updates pass `ALLUSERS=1`.
+A cross-context copy is refused; changing context means uninstalling the old copy first.
+
+App registration follows the selected context. Existing optional shortcuts and file-handler
+choices stay app-owned. No new cleanup operation or model/settings migration is introduced.
+Packaged resources remain package-owned; separately downloaded shared models are not caches
+and are outside this installer's ownership.
+
+## Repeatable metadata tests
+
+On Windows with WiX 5.0.2 and its matching UI/Util extensions:
+
+```powershell
+./packaging/windows/test-install-policy.ps1 -OutputDirectory ./target/install-policy-tests
+```
+
+The script builds x64, x86 and arm64 packages with deliberately non-executable payloads. It
+uses the actual package source and compiled database. A safe Windows Installer session checks
+24 scope/registration/maintenance cases, remembered and explicit custom folders, sequencing,
+upgrade identity and the original registration inventory recorded in `install-policy.json`.
+The release packaging script runs the compiled checker before signing. Packaging CI runs the
+small fixture builds without compiling the Rust application.
+
+Never install or distribute the `NOT-INSTALLABLE.msi` fixtures as an app. Passing these checks
+does not prove real installation, elevation, legacy-version upgrades, registry writes, optional
+shortcut/menu behaviour, cancellation, rollback or uninstall. Those still require the real
+payload in an authorised clean Windows test environment. Cross-architecture metadata is not
+execution evidence on those architectures. Existing open installer/association PRs must be
+reconciled before publication. Nothing here changes macOS/Linux native packaging conventions.
diff --git a/packaging/windows/check-install-policy.ps1 b/packaging/windows/check-install-policy.ps1
new file mode 100644
index 000000000..5463c0083
--- /dev/null
+++ b/packaging/windows/check-install-policy.ps1
@@ -0,0 +1,370 @@
+<#
+.SYNOPSIS
+  Check the compiled installation policy without installing any product.
+.DESCRIPTION
+  Uses Windows Installer's safe session (OpenPackage option 1). Only property-setting custom
+  actions are exercised. No AppSearch, install, repair, removal or file-writing action runs.
+#>
+param([Parameter(Mandatory = $true)] [string] $MsiPath)
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version Latest
+$policy = Get-Content -Raw -LiteralPath (Join-Path $PSScriptRoot 'install-policy.json') | ConvertFrom-Json
+function Read-Rows($Database, [string] $Sql, [int] $Columns) {
+  $view = $Database.OpenView($Sql)
+  try {
+    [void]$view.Execute()
+    while ($null -ne ($record = $view.Fetch())) {
+      try {
+        $values = @(for ($i = 1; $i -le $Columns; $i++) {
+          $record.GetType().InvokeMember('StringData', 'GetProperty', $null, $record, @($i))
+        })
+        ,$values
+      } finally { [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($record) }
+    }
+  } finally {
+    [void]$view.Close()
+    [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($view)
+  }
+}
+function Set-SessionProperty($Session, [string] $Name, [string] $Value) {
+  [void]$Session.GetType().InvokeMember('Property', 'SetProperty', $null, $Session, @($Name, $Value))
+}
+function Get-SessionProperty($Session, [string] $Name) {
+  $Session.GetType().InvokeMember('Property', 'GetProperty', $null, $Session, @($Name))
+}
+function Get-PackageTemplate($Database) {
+  # Summary information property 7 is the platform: "Intel;1033", "x64;1033" or "Arm64;1033".
+  $summary = $Database.GetType().InvokeMember('SummaryInformation', 'GetProperty', $null, $Database, @(0))
+  try { [string]$summary.GetType().InvokeMember('Property', 'GetProperty', $null, $summary, @(7)) }
+  finally { [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($summary) }
+}
+$installer = $null; $database = $null; $session = $null
+try {
+  $installer = New-Object -ComObject WindowsInstaller.Installer
+  $file = (Resolve-Path -LiteralPath $MsiPath).Path
+  $database = $installer.OpenDatabase($file, 0)
+  $session = $installer.OpenPackage($file, 1)
+  $properties = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Property`, `Value` FROM `Property`' 2)) { $properties[$row[0]] = $row[1] }
+  $secureProperties = @($properties['SecureCustomProperties'] -split ';')
+  if ('INSTALLFOLDER' -notin $secureProperties) {
+    throw 'The selected installation folder must survive elevation (secure INSTALLFOLDER).'
+  }
+  if ($policy.mode -eq 'perUser') {
+    if ($properties.ContainsKey('ALLUSERS')) { throw 'Launcher must remain per-user; machine self-update is not part of this change.' }
+    if ($properties['UpgradeCode'].Trim('{}') -ne $policy.upgradeCode) { throw 'Launcher upgrade identity changed.' }
+    $dirs = @{}
+    foreach ($row in (Read-Rows $database 'SELECT `Directory`, `Directory_Parent`, `DefaultDir` FROM `Directory`' 3)) { $dirs[$row[0]] = @($row[1],$row[2]) }
+    if ($dirs['INSTALLFOLDER'][0] -ne 'CraftSuiteFolder' -or $dirs['CraftSuiteFolder'][1] -ne 'ArtCraft' -or
+        $dirs['CraftSuiteFolder'][0] -ne 'LocalProgramsFolder' -or $dirs['LocalProgramsFolder'][0] -ne 'LocalAppDataFolder') {
+      throw 'Launcher new-install folder must be under the per-user ArtCraft suite root.'
+    }
+    foreach ($explicit in @('', 'F:\Chosen exact launcher')) {
+      Set-SessionProperty $session 'PREVIOUSINSTALLFOLDER' 'E:\Existing exact launcher'
+      Set-SessionProperty $session 'INSTALLFOLDER' $explicit
+      $row = @(Read-Rows $database 'SELECT `Condition` FROM `InstallUISequence` WHERE `Action` = ''CraftRestoreLauncherFolder''' 1)[0]
+      if ($session.EvaluateCondition($row[0]) -eq 1) {
+        if ($session.DoAction('CraftRestoreLauncherFolder') -ne 1) { throw 'Launcher restore action failed.' }
+      }
+      $expected = if ($explicit) { $explicit } else { 'E:\Existing exact launcher' }
+      if ((Get-SessionProperty $session 'INSTALLFOLDER') -ne $expected) { throw 'Launcher custom or existing path was lost.' }
+    }
+    $rows = @(Read-Rows $database 'SELECT `Root`, `Key`, `Name`, `Value` FROM `Registry`' 4)
+    if (@($rows | Where-Object { $_[0] -ne '1' }).Count) { throw 'Launcher registration must stay under the current account.' }
+    foreach ($entry in $policy.registry) {
+      if (@($rows | Where-Object { $_[0] -eq $entry[0] -and $_[1] -eq $entry[1] -and $_[2] -eq $entry[2] -and $_[3] -eq $entry[3] }).Count -ne 1) {
+        throw 'Launcher registration or shortcut preference changed unexpectedly.'
+      }
+    }
+    Write-Output 'PASS ArtCraft Launcher: per-user scope, suite folder, remembered/custom paths and existing registration. No installation performed.'
+    return
+  }
+  if ($properties['ALLUSERS'] -ne '2' -or $properties['MSIINSTALLPERUSER'] -ne '1') {
+    throw 'Policy regression: new packages must default to the per-user dual-scope context.'
+  }
+  if ($properties['UpgradeCode'].Trim('{}') -ne $policy.upgradeCode) { throw 'The existing upgrade identity must not change.' }
+  $directories = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Directory`, `Directory_Parent`, `DefaultDir` FROM `Directory`' 3)) {
+    $directories[$row[0]] = @($row[1], $row[2])
+  }
+  if ($directories['INSTALLFOLDER'][0] -ne 'CraftSuiteFolder' -or
+      $directories['CraftSuiteFolder'][1] -ne 'ArtCraft') { throw 'Expected the app under the ArtCraft suite folder.' }
+  $programs = $directories['CraftSuiteFolder'][0]
+  if ($programs -eq 'ProgramFiles6432Folder') { $programs = $directories[$programs][0] }
+  if ($programs -notin 'ProgramFilesFolder', 'ProgramFiles64Folder') {
+    throw 'Use Windows Installer native folder redirection, not a hard-coded profile path.'
+  }
+  $guards = @(Read-Rows $database 'SELECT `Condition`, `Description` FROM `LaunchCondition`' 2 |
+    Where-Object { $_[0] -match 'CRAFT_(USER|MACHINE)_DIR' })
+  if ($guards.Count -ne 2) { throw 'Expected both duplicate-installation guards.' }
+  $cases = 0
+  foreach ($scope in @('', '2', '1')) {
+    foreach ($user in @('', 'D:\Existing user app')) {
+      foreach ($machine in @('', 'E:\Existing machine app')) {
+        foreach ($installed in @('', '1')) {
+          Set-SessionProperty $session 'ALLUSERS' $scope
+          Set-SessionProperty $session 'Installed' $installed
+          Set-SessionProperty $session 'CRAFT_USER_DIR' $user
+          Set-SessionProperty $session 'CRAFT_MACHINE_DIR' $machine
+          $allowed = $true
+          foreach ($guard in $guards) {
+            $value = $session.EvaluateCondition($guard[0])
+            if ($value -notin 0, 1) { throw 'Invalid duplicate guard.' }
+            if ($value -eq 0) { $allowed = $false }
+          }
+          $opposite = if ($scope -eq '1') { $user } else { $machine }
+          $expected = [bool]$installed -or -not [bool]$opposite
+          if ($allowed -ne $expected) { throw "Scope regression: ALLUSERS='$scope', user=$([bool]$user), machine=$([bool]$machine), maintenance=$([bool]$installed)." }
+          $cases++
+        }
+      }
+    }
+  }
+  # Execute the actual authored type-51 actions in a safe session, not copied resolver logic.
+  foreach ($scope in @('', '2', '1')) {
+    foreach ($explicit in @('', 'F:\Chosen exact app')) {
+      Set-SessionProperty $session 'ALLUSERS' $scope
+      Set-SessionProperty $session 'INSTALLFOLDER' $explicit
+      Set-SessionProperty $session 'CRAFT_USER_DIR' 'D:\Existing user app'
+      Set-SessionProperty $session 'CRAFT_MACHINE_DIR' 'E:\Existing machine app'
+      $action = if ($scope -eq '1') { 'CraftRestoreMachineFolder' } else { 'CraftRestoreUserFolder' }
+      # Evaluate the compiled condition, so the test exercises it instead of calling the action directly.
+      $restore = @(Read-Rows $database ('SELECT `Condition` FROM `InstallExecuteSequence` WHERE `Action` = ''{0}''' -f $action) 1)[0]
+      $selected = $session.EvaluateCondition($restore[0]) -eq 1
+      if ($selected -eq [bool]$explicit) { throw "$action must run only when no folder was supplied (condition: $($restore[0]))." }
+      if ($selected -and $session.DoAction($action) -ne 1) { throw 'Remembered-folder property action failed.' }
+      $expected = if ($explicit) { $explicit } elseif ($scope -eq '1') { 'E:\Existing machine app' } else { 'D:\Existing user app' }
+      if ((Get-SessionProperty $session 'INSTALLFOLDER') -ne $expected) { throw 'Custom or remembered folder was not preserved.' }
+    }
+  }
+  $ui = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Action`, `Sequence` FROM `InstallUISequence`' 2)) { $ui[$row[0]] = [int]$row[1] }
+  if (-not ($ui['AppSearch'] -lt $ui['CraftPreferMachineScope'] -and
+      $ui['CraftPreferMachineScope'] -lt $ui['CraftScopeDlg'] -and
+      $ui['CraftScopeDlg'] -lt $ui['FindRelatedProducts'] -and
+      $ui['FindRelatedProducts'] -lt $ui['LaunchConditions'] -and
+      $ui['CraftScopeDlg'] -lt $ui['CraftRestoreUserFolder'] -and $ui['CraftRestoreUserFolder'] -lt $ui['CostInitialize'] -and
+      $ui['CraftScopeDlg'] -lt $ui['CraftRestoreMachineFolder'] -and $ui['CraftRestoreMachineFolder'] -lt $ui['CostInitialize'])) {
+    throw 'Scope must be chosen after AppSearch and before FindRelatedProducts, launch checks and costing.'
+  }
+  # Windows Installer resolves Program Files for the context it started in, before the wizard's scope choice.
+  # The wizard therefore sets the new-install folder itself, and only in the wizard.
+  $defaults = @(Read-Rows $database 'SELECT `Action`, `Sequence`, `Condition` FROM `InstallUISequence`' 3 | Where-Object { $_[0] -like 'CraftDefault*' })
+  if ($defaults.Count -lt 2) { throw 'The wizard must set the new-install folder after the scope page; Program Files is resolved before the choice.' }
+  foreach ($row in $defaults) {
+    if (-not ($ui['CraftScopeDlg'] -lt [int]$row[1] -and [int]$row[1] -lt $ui['CostInitialize'])) { throw "$($row[0]) must run after the scope page and before costing." }
+  }
+  if (@(Read-Rows $database 'SELECT `Action` FROM `InstallExecuteSequence`' 1 | Where-Object { $_[0] -like 'CraftDefault*' }).Count) {
+    throw 'Silent installs must not use the wizard-only default folder actions.'
+  }
+  # The machine default comes from the environment of the package architecture, not from a folder name.
+  # x86 packages use Program Files (x86) on 64-bit Windows; x64 and Arm64 packages use the 64-bit root.
+  $machineRoot = if ((Get-PackageTemplate $database) -match '^Intel') {
+    if (Get-SessionProperty $session 'VersionNT64') { ${env:ProgramFiles(x86)} } else { $env:ProgramFiles }
+  } elseif ($env:ProgramW6432) { $env:ProgramW6432 } else { $env:ProgramFiles }
+  $machineFolder = (Join-Path $machineRoot "ArtCraft\$($policy.name)") + '\'
+  foreach ($scope in @('1', '')) {
+    Set-SessionProperty $session 'ALLUSERS' $scope
+    Set-SessionProperty $session 'INSTALLFOLDER' ''
+    Set-SessionProperty $session 'CRAFT_MACHINE_DIR' ''
+    Set-SessionProperty $session 'CRAFT_USER_DIR' ''
+    foreach ($row in @($defaults | Sort-Object { [int]$_[1] })) {
+      if ($session.EvaluateCondition($row[2]) -eq 1 -and $session.DoAction($row[0]) -ne 1) { throw "$($row[0]) failed." }
+    }
+    $folder = Get-SessionProperty $session 'INSTALLFOLDER'
+    $wanted = if ($scope -eq '1') { $machineFolder } else { (Join-Path $env:LOCALAPPDATA "Programs\ArtCraft\$($policy.name)") + '\' }
+    if ($folder -ine $wanted) { throw "Wizard default folder for ALLUSERS='$scope' is '$folder', expected '$wanted'." }
+  }
+  # Replay the wizard's compiled folder actions in sequence order, as the full UI runs them. A remembered
+  # folder must win over the new-install default, and a folder the user typed must survive both.
+  $uiFolderActions = @(Read-Rows $database 'SELECT `Action`, `Sequence`, `Condition` FROM `InstallUISequence`' 3 |
+    Where-Object { $_[0] -match '^Craft(Restore|Default)' } | Sort-Object { [int]$_[1] })
+  $userDefault = (Join-Path $env:LOCALAPPDATA "Programs\ArtCraft\$($policy.name)") + '\'
+  foreach ($case in @(
+      @('1', 'D:\Remembered user app', 'E:\Remembered machine app', '', 'E:\Remembered machine app'),
+      @('', 'D:\Remembered user app', 'E:\Remembered machine app', '', 'D:\Remembered user app'),
+      @('1', '', '', '', $machineFolder),
+      @('', '', '', '', $userDefault),
+      @('1', 'D:\Remembered user app', 'E:\Remembered machine app', 'F:\Chosen exact app', 'F:\Chosen exact app'))) {
+    Set-SessionProperty $session 'Installed' ''
+    Set-SessionProperty $session 'ALLUSERS' $case[0]
+    Set-SessionProperty $session 'CRAFT_USER_DIR' $case[1]
+    Set-SessionProperty $session 'CRAFT_MACHINE_DIR' $case[2]
+    Set-SessionProperty $session 'INSTALLFOLDER' $case[3]
+    foreach ($row in $uiFolderActions) {
+      if ($session.EvaluateCondition($row[2]) -eq 1 -and $session.DoAction($row[0]) -ne 1) { throw "$($row[0]) failed." }
+    }
+    $folder = Get-SessionProperty $session 'INSTALLFOLDER'
+    if ($folder -ine $case[4]) { throw "Full-UI folder for ALLUSERS='$($case[0])' is '$folder', expected '$($case[4])'." }
+  }
+  $execute = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Action`, `Sequence` FROM `InstallExecuteSequence`' 2)) { $execute[$row[0]] = [int]$row[1] }
+  foreach ($action in @('CraftRestoreUserFolder','CraftRestoreMachineFolder')) {
+    if (-not ($execute['AppSearch'] -lt $execute[$action] -and $execute[$action] -lt $execute['CostInitialize'])) {
+      throw 'Silent updates must restore the folder before directory costing.'
+    }
+  }
+  foreach ($resolver in @('CraftUFromLegacyExe','CraftMFromLegacyExe')) {
+    if (-not ($execute['AppSearch'] -lt $execute[$resolver] -and $execute[$resolver] -lt $execute['LaunchConditions'])) {
+      throw 'Both legacy folder resolvers must run after AppSearch and before the launch checks.'
+    }
+  }
+  # AppSearch itself never runs in this safe session, so check the compiled searches and then run the
+  # property actions that turn the search results into the remembered folder, once per scope.
+  $appSearch = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Property`, `Signature_` FROM `AppSearch`' 2)) { $appSearch[$row[0]] = $row[1] }
+  $locators = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Signature_`, `Root`, `Key`, `Name`, `Type` FROM `RegLocator`' 5)) { $locators[$row[0]] = $row }
+  $appPaths = '^Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\[^\\]+\.exe$'
+  # Suffix, how to match the key, key, value name, locator type (2 = raw value, 1 = file; the 64-bit flag is masked off).
+  $searchContract = @(
+    @('DIR',       'exact', "Software\$($policy.name)", 'InstallDir',    '2'),
+    @('FOLDER',    'exact', "Software\$($policy.name)", 'InstallFolder', '2'),
+    @('PATH',      'regex', $appPaths,                  'Path',          '2'),
+    @('EXEFOLDER', 'regex', $appPaths,                  '',              '1'),
+    @('EXE',       'regex', $appPaths,                  '',              '1'))
+  $resolverCases = @(
+    @{ name = 'every record, DIR wins';        dir = 'D:\Dir\'; folder = 'D:\Folder\'; path = 'D:\Path\'; exeFolder = 'D:\Exe\'; exe = 'D:\Exe\app.exe'; existing = '';            expected = 'D:\Dir\' },
+    @{ name = 'FOLDER wins without DIR';       dir = '';        folder = 'D:\Folder\'; path = 'D:\Path\'; exeFolder = 'D:\Exe\'; exe = 'D:\Exe\app.exe'; existing = '';            expected = 'D:\Folder\' },
+    @{ name = 'PATH wins without DIR, FOLDER'; dir = '';        folder = '';           path = 'D:\Path\'; exeFolder = 'D:\Exe\'; exe = 'D:\Exe\app.exe'; existing = '';            expected = 'D:\Path\' },
+    @{ name = 'legacy exe folder is last';     dir = '';        folder = '';           path = '';         exeFolder = 'D:\Exe\'; exe = 'D:\Exe\app.exe'; existing = '';            expected = 'D:\Exe\' },
+    @{ name = 'legacy folder needs the exe';   dir = '';        folder = '';           path = '';         exeFolder = 'D:\Exe\'; exe = '';               existing = '';            expected = '' },
+    @{ name = 'a preset folder is kept';       dir = 'D:\Dir\'; folder = 'D:\Folder\'; path = 'D:\Path\'; exeFolder = 'D:\Exe\'; exe = 'D:\Exe\app.exe'; existing = 'P:\Preset\'; expected = 'P:\Preset\' })
+  foreach ($scopeSpec in @(@('U', '1', 'CRAFT_USER_DIR'), @('M', '2', 'CRAFT_MACHINE_DIR'))) {
+    $letter = $scopeSpec[0]; $target = $scopeSpec[2]
+    foreach ($item in $searchContract) {
+      $property = "CRAFT_${letter}_$($item[0])"
+      $locator = if ($appSearch.ContainsKey($property)) { $locators[$appSearch[$property]] } else { $null }
+      $keyOk = $null -ne $locator -and $(if ($item[1] -eq 'exact') { $locator[2] -eq $item[2] } else { $locator[2] -match $item[2] })
+      if (-not $keyOk -or $locator[1] -ne $scopeSpec[1] -or $locator[3] -ne $item[3] -or ([int]$locator[4] -band 3) -ne [int]$item[4]) {
+        throw "Compiled search for $property is missing or points at the wrong registry location."
+      }
+    }
+    $chain = @(Read-Rows $database 'SELECT `Action`, `Sequence`, `Condition` FROM `InstallExecuteSequence`' 3 |
+      Where-Object { $_[0] -match "^Craft${letter}From" } | Sort-Object { [int]$_[1] })
+    $order = @($chain | ForEach-Object { $_[0] }) -join ','
+    if ($order -ne "Craft${letter}FromDIR,Craft${letter}FromFOLDER,Craft${letter}FromPATH,Craft${letter}FromLegacyExe") {
+      throw "Remembered-folder resolvers for scope $letter run in the wrong order: $order"
+    }
+    foreach ($case in $resolverCases) {
+      Set-SessionProperty $session $target $case.existing
+      Set-SessionProperty $session "CRAFT_${letter}_DIR" $case.dir
+      Set-SessionProperty $session "CRAFT_${letter}_FOLDER" $case.folder
+      Set-SessionProperty $session "CRAFT_${letter}_PATH" $case.path
+      Set-SessionProperty $session "CRAFT_${letter}_EXEFOLDER" $case.exeFolder
+      Set-SessionProperty $session "CRAFT_${letter}_EXE" $case.exe
+      foreach ($row in $chain) {
+        if ($session.EvaluateCondition($row[2]) -eq 1 -and $session.DoAction($row[0]) -ne 1) { throw "$($row[0]) failed." }
+      }
+      $got = Get-SessionProperty $session $target
+      if ($got -ne $case.expected) { throw "Resolver chain for scope $letter, case '$($case.name)': got '$got', expected '$($case.expected)'." }
+    }
+  }
+  # Switching the first-page choice must reset BOTH properties, including a back-and-forth change.
+  $events = @(Read-Rows $database 'SELECT `Event`, `Argument`, `Condition`, `Ordering` FROM `ControlEvent` WHERE `Dialog_` = ''CraftScopeDlg'' AND `Control_` = ''Next'' ORDER BY `Ordering`' 4)
+  # Model the full-UI upgrade entry with an existing machine-wide copy. Run
+  # the actual preference action, then the compiled Next events before discovery.
+  Set-SessionProperty $session 'ALLUSERS' '2'
+  Set-SessionProperty $session 'CRAFT_SCOPE' 'user'
+  Set-SessionProperty $session 'CRAFT_USER_DIR' ''
+  Set-SessionProperty $session 'CRAFT_MACHINE_DIR' 'E:\Existing machine app'
+  $preference = @(Read-Rows $database 'SELECT `Condition` FROM `InstallUISequence` WHERE `Action` = ''CraftPreferMachineScope''' 1)[0]
+  if ($session.EvaluateCondition($preference[0]) -ne 1 -or $session.DoAction('CraftPreferMachineScope') -ne 1 -or
+      (Get-SessionProperty $session 'CRAFT_SCOPE') -ne 'machine') {
+    throw 'Full-UI machine upgrades must initially select the existing machine context.'
+  }
+  foreach ($choice in @('machine','user','machine','user')) {
+    Set-SessionProperty $session 'CRAFT_SCOPE' $choice
+    foreach ($event in $events) {
+      if ($event[0] -notmatch '^\[([^\]]+)\]$') { continue }
+      $property = $Matches[1]
+      if ($session.EvaluateCondition($event[2]) -eq 1) {
+        Set-SessionProperty $session $property $(if ($event[1] -eq '{}') { '' } else { $event[1] })
+      }
+    }
+    $allUsers = Get-SessionProperty $session 'ALLUSERS'
+    $perUser = Get-SessionProperty $session 'MSIINSTALLPERUSER'
+    if (($choice -eq 'machine' -and ($allUsers -ne '1' -or $perUser)) -or
+        ($choice -eq 'user' -and ($allUsers -or $perUser -ne '1'))) {
+      throw 'Scope selector does not reset the requested installation context.'
+    }
+  }
+  $actions = @(Read-Rows $database 'SELECT `Action`, `Source`, `Target`, `Type` FROM `CustomAction`' 4)
+  $savedOptions = @($actions | Where-Object { $_[0] -match '^CraftLoadOption[0-9]+M$' })
+  foreach ($option in $savedOptions) {
+    if ([int]$option[3] -ne 51) { throw 'Saved-option test may run only property-setting actions.' }
+    $number = [regex]::Match($option[0], '[0-9]+').Value
+    foreach ($scope in @('2','1')) {
+      Set-SessionProperty $session 'ALLUSERS' $scope
+      Set-SessionProperty $session "CRAFT_OPTION_${number}_M" 'saved-machine-choice'
+      Set-SessionProperty $session "CRAFT_OPTION_${number}_U" 'saved-user-choice'
+      Set-SessionProperty $session $option[1] ''
+      $action = "CraftLoadOption$number" + $(if ($scope -eq '1') { 'M' } else { 'U' })
+      if ($session.DoAction($action) -ne 1) { throw 'Saved-option property action failed.' }
+      $expected = if ($scope -eq '1') { 'saved-machine-choice' } else { 'saved-user-choice' }
+      if ((Get-SessionProperty $session $option[1]) -ne $expected) { throw 'Saved installer choices leaked across contexts.' }
+    }
+  }
+  # Follow the compiled control conditions, not the source's intended appearance.
+  $controls = @(Read-Rows $database 'SELECT `Dialog_`, `Control`, `Type`, `Attributes`, `Text` FROM `Control`' 5)
+  $conditions = @()
+  if (@(Read-Rows $database 'SELECT `Name` FROM `_Tables` WHERE `Name` = ''ControlCondition''' 1).Count) {
+    $conditions = @(Read-Rows $database 'SELECT `Dialog_`, `Control_`, `Action`, `Condition` FROM `ControlCondition`' 4)
+  }
+  function Test-ControlVisible($Control) {
+    $visible = ([int]$Control[3] -band 1) -ne 0
+    foreach ($condition in $conditions) {
+      if ($condition[0] -eq $Control[0] -and $condition[1] -eq $Control[1] -and $session.EvaluateCondition($condition[3]) -eq 1) {
+        if ($condition[2] -eq 'Show') { $visible = $true }
+        if ($condition[2] -eq 'Hide') { $visible = $false }
+      }
+    }
+    return $visible
+  }
+  foreach ($button in @($controls | Where-Object { $_[0] -in 'InstallWelcome','InstallMaintenance','DesktopShortcutDlg' -and ([int]$_[3] -band 8388608) -ne 0 })) {
+    $plain = @($controls | Where-Object { $_[0] -eq $button[0] -and $_[1] -eq ($button[1] + 'User') })
+    if ($plain.Count -ne 1 -or ([int]$plain[0][3] -band 8388608)) { throw 'Scope-aware buttons need an unshielded per-user counterpart.' }
+    foreach ($scope in @('', '2', '1')) {
+      Set-SessionProperty $session 'ALLUSERS' $scope
+      if ((Test-ControlVisible $button) -ne ($scope -eq '1') -or (Test-ControlVisible $plain[0]) -ne ($scope -ne '1')) {
+        throw 'The elevation shield must follow the selected scope.'
+      }
+    }
+    $dialog = $button[0]; $shieldId = $button[1]; $plainId = $plain[0][1]
+    $shieldEvents = @(Read-Rows $database "SELECT ``Event``, ``Argument``, ``Condition``, ``Ordering`` FROM ``ControlEvent`` WHERE ``Dialog_`` = '$dialog' AND ``Control_`` = '$shieldId' ORDER BY ``Ordering``" 4 | ForEach-Object { $_ -join '|' })
+    $plainEvents = @(Read-Rows $database "SELECT ``Event``, ``Argument``, ``Condition``, ``Ordering`` FROM ``ControlEvent`` WHERE ``Dialog_`` = '$dialog' AND ``Control_`` = '$plainId' ORDER BY ``Ordering``" 4 | ForEach-Object { $_ -join '|' })
+    if (($shieldEvents -join "`n") -ne ($plainEvents -join "`n")) { throw 'Per-user and machine buttons must perform the same operation.' }
+  }
+  foreach ($scope in @('', '2', '1')) {
+    Set-SessionProperty $session 'ALLUSERS' $scope
+    foreach ($text in @($controls | Where-Object { $_[4] -like '*for all users*' })) {
+      if ((Test-ControlVisible $text) -ne ($scope -eq '1')) { throw 'The welcome-page scope text must follow the selected scope.' }
+    }
+  }
+  if ($policy.id -in 'deckcraft','filmcraft','soundcraft') {
+    foreach ($route in @(@('WelcomeDlg','Next','InstallDirDlg'),@('InstallDirDlg','Back','WelcomeDlg'))) {
+      $dialog = $route[0]; $control = $route[1]
+      $routes = @(Read-Rows $database "SELECT ``Argument``, ``Condition`` FROM ``ControlEvent`` WHERE ``Dialog_`` = '$dialog' AND ``Control_`` = '$control' AND ``Event`` = 'NewDialog' ORDER BY ``Ordering``" 2)
+      Set-SessionProperty $session 'Installed' ''
+      $destination = ''
+      foreach ($event in $routes) { if ($session.EvaluateCondition($event[1]) -eq 1) { $destination = $event[0] } }
+      if ($destination -ne $route[2]) { throw 'Skipping the licence page must work in both navigation directions.' }
+    }
+  }
+  $registry = @(Read-Rows $database 'SELECT `Root`, `Key`, `Name`, `Value` FROM `Registry`' 4)
+  if (@($registry | Where-Object { $_[0] -in '1', '2' }).Count) { throw 'Registration must follow the selected context, not force HKCU or HKLM.' }
+  if (@($registry | Where-Object { $_[0] -eq '0' -and $_[1] -match '^Software\\Classes(\\|$)' }).Count) {
+    throw 'HKCR keys must be relative to Classes.'
+  }
+  foreach ($entry in $policy.registry) {
+    $found = @($registry | Where-Object { $_[0] -eq $entry[0] -and $_[1] -eq $entry[1] -and $_[2] -eq $entry[2] -and $_[3] -eq $entry[3] })
+    if ($found.Count -ne 1) { throw "Lost or changed registration: $($entry[1]) / $($entry[2])" }
+  }
+  $installDir = @($registry | Where-Object { $_[0] -eq '-1' -and $_[1] -eq "Software\$($policy.name)" -and $_[2] -eq 'InstallDir' -and $_[3] -eq '[INSTALLFOLDER]' })
+  if ($installDir.Count -ne 1) { throw 'A context-sensitive installation-folder record is required.' }
+  Write-Output "PASS $($policy.name): $cases scope cases, folder preservation, action sequencing and registry contract. No installation performed."
+} finally {
+  foreach ($com in @($session, $database, $installer)) {
+    if ($null -ne $com) { [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($com) }
+  }
+}
diff --git a/packaging/windows/designcraft.wxs b/packaging/windows/designcraft.wxs
index 8b41094ce..11514f032 100644
--- a/packaging/windows/designcraft.wxs
+++ b/packaging/windows/designcraft.wxs
@@ -1,27 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  DesignCraft MSI (WiX Toolset v5: `dotnet tool install -g wix`). Built by package.ps1:
-
-    wix build designcraft.wxs installer-ui.wxs -arch x64 -d Version=1.2.3 -d BinDir=... -d IconPath=... -o out.msi
-
-  Per-machine install into Program Files, a Start Menu shortcut, `.designcraft` owned by
-  DesignCraft, and DesignCraft offered under "Open with" for IDML (without taking over the user's
-  default app for it).
--->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package
-      Name="DesignCraft"
-      Manufacturer="Learning Machines LLC"
-      Version="$(var.Version)"
-      UpgradeCode="49E87D30-BB68-4896-AA1D-F45C833CFC3C"
-      Scope="perMachine"
-      Compressed="yes"
-      Language="1033">
+  <?ifndef HasCraftFontLicences ?>
+  <?define HasCraftFontLicences=0 ?>
+  <?endif?>
+  <Package Name="DesignCraft" Manufacturer="Learning Machines LLC" Version="$(var.Version)" UpgradeCode="49E87D30-BB68-4896-AA1D-F45C833CFC3C" Scope="perUserOrMachine" Compressed="yes" Language="1033">
     <SummaryInformation Description="DesignCraft page layout and publishing" Manufacturer="Learning Machines LLC" />
+    <?include $(sys.SOURCEFILEDIR)install-policy.wxi?>
     <!-- Same-version upgrades let successive pre-releases of one X.Y.Z replace each other
          (MSI versions are numeric, so 1.2.3-rc.1 and 1.2.3-rc.2 are both 1.2.3). -->
-    <MajorUpgrade AllowSameVersionUpgrades="yes"
-        DowngradeErrorMessage="A newer version of DesignCraft is already installed." />
+    <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of DesignCraft is already installed." />
     <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
 
     <Icon Id="DesigncraftIcon.ico" SourceFile="$(var.IconPath)" />
@@ -33,11 +20,16 @@
     <!-- Shared native setup UI, including install/uninstall completion. -->
 
     <StandardDirectory Id="ProgramFiles6432Folder">
-      <Directory Id="INSTALLFOLDER" Name="DesignCraft" />
+      <Directory Id="CraftSuiteFolder" Name="ArtCraft">
+        <Directory Id="INSTALLFOLDER" Name="DesignCraft" />
+      </Directory>
     </StandardDirectory>
     <StandardDirectory Id="ProgramMenuFolder" />
 
     <Feature Id="Main" Title="DesignCraft" Level="1">
+      <?if $(var.HasCraftFontLicences) = 1 ?>
+      <ComponentGroupRef Id="CraftFontLicences" />
+      <?endif?>
       <ComponentGroupRef Id="DesigncraftFiles" />
       <ComponentGroupRef Id="CraftInstallerSettings" />
     </Feature>
@@ -46,12 +38,18 @@
   </Package>
 
   <Fragment>
+    <?if $(var.HasCraftFontLicences) = 1 ?>
+    <ComponentGroup Id="CraftFontLicences" Directory="INSTALLFOLDER">
+      <Files Include="$(var.DocsDir)\**" />
+    </ComponentGroup>
+    <?endif?>
     <ComponentGroup Id="DesigncraftFiles" Directory="INSTALLFOLDER">
+      <Component Id="DesigncraftNotice">
+        <File Id="DesigncraftNoticeFile" Source="$(var.BinDir)\NOTICE" KeyPath="yes" />
+      </Component>
       <Component Id="DesigncraftApp" Guid="DE018EF3-EE87-4E36-9F76-0B7B060A195E">
         <File Id="DesigncraftExe" Source="$(var.BinDir)\designcraft.exe" KeyPath="yes">
-          <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuFolder" Name="DesignCraft"
-              Description="DesignCraft page layout and publishing" WorkingDirectory="INSTALLFOLDER" Advertise="yes"
-              Icon="DesigncraftIcon.ico" IconIndex="0" />
+          <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuFolder" Name="DesignCraft" Description="DesignCraft page layout and publishing" WorkingDirectory="INSTALLFOLDER" Advertise="yes" Icon="DesigncraftIcon.ico" IconIndex="0" />
         </File>
 
         <!-- .designcraft: DesignCraft's own format; DesignCraft is its default app. -->
@@ -62,15 +60,16 @@
         </ProgId>
         <!-- IDML: offered under "Open with", never forced as the default. -->
         <ProgId Id="Designcraft.Idml" Description="IDML Document" Icon="DesigncraftExe" IconIndex="0" />
-        <RegistryValue Root="HKLM" Key="Software\Classes\Designcraft.Idml\shell\open\command" Value="&quot;[#DesigncraftExe]&quot; &quot;%1&quot;" Type="string" />
-        <RegistryValue Root="HKLM" Key="Software\Classes\.idml\OpenWithProgids" Name="Designcraft.Idml" Value="" Type="string" />
+        <RegistryValue Root="HKMU" Key="Software\Classes\Designcraft.Idml\shell\open\command" Value="&quot;[#DesigncraftExe]&quot; &quot;%1&quot;" Type="string" />
+        <RegistryValue Root="HKMU" Key="Software\Classes\.idml\OpenWithProgids" Name="Designcraft.Idml" Value="" Type="string" />
 
         <!-- "Open with" app list and the Run dialog (Win+R "designcraft"). -->
-        <RegistryValue Root="HKLM" Key="Software\Classes\Applications\designcraft.exe" Name="FriendlyAppName" Value="DesignCraft" Type="string" />
-        <RegistryValue Root="HKLM" Key="Software\Classes\Applications\designcraft.exe\shell\open\command" Value="&quot;[#DesigncraftExe]&quot; &quot;%1&quot;" Type="string" />
-        <RegistryValue Root="HKLM" Key="Software\Classes\Applications\designcraft.exe\SupportedTypes" Name=".designcraft" Value="" Type="string" />
-        <RegistryValue Root="HKLM" Key="Software\Classes\Applications\designcraft.exe\SupportedTypes" Name=".idml" Value="" Type="string" />
-        <RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\designcraft.exe" Value="[#DesigncraftExe]" Type="string" />
+        <RegistryValue Root="HKMU" Key="Software\Classes\Applications\designcraft.exe" Name="FriendlyAppName" Value="DesignCraft" Type="string" />
+        <RegistryValue Root="HKMU" Key="Software\Classes\Applications\designcraft.exe\shell\open\command" Value="&quot;[#DesigncraftExe]&quot; &quot;%1&quot;" Type="string" />
+        <RegistryValue Root="HKMU" Key="Software\Classes\Applications\designcraft.exe\SupportedTypes" Name=".designcraft" Value="" Type="string" />
+        <RegistryValue Root="HKMU" Key="Software\Classes\Applications\designcraft.exe\SupportedTypes" Name=".idml" Value="" Type="string" />
+        <RegistryValue Root="HKMU" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\designcraft.exe" Value="[#DesigncraftExe]" Type="string" />
+      <RegistryValue Root="HKMU" Key="Software\DesignCraft" Name="InstallDir" Value="[INSTALLFOLDER]" Type="string" />
       </Component>
 
       <Component Id="DesigncraftCli">
diff --git a/packaging/windows/install-policy.json b/packaging/windows/install-policy.json
new file mode 100644
index 000000000..91c3024ed
--- /dev/null
+++ b/packaging/windows/install-policy.json
@@ -0,0 +1,62 @@
+{
+  "id": "designcraft",
+  "name": "DesignCraft",
+  "upgradeCode": "49E87D30-BB68-4896-AA1D-F45C833CFC3C",
+  "sources": [
+    "designcraft.wxs",
+    "installer-ui.wxs"
+  ],
+  "icon": "assets/app-icon/designcraft.ico",
+  "localization": [],
+  "extensions": [],
+  "payloads": [
+    "NOTICE",
+    "designcraft-cli.exe",
+    "designcraft.exe"
+  ],
+  "registry": [
+    [
+      "-1",
+      "Software\\Classes\\Designcraft.Idml\\shell\\open\\command",
+      "",
+      "\"[#DesigncraftExe]\" \"%1\""
+    ],
+    [
+      "-1",
+      "Software\\Classes\\.idml\\OpenWithProgids",
+      "Designcraft.Idml",
+      ""
+    ],
+    [
+      "-1",
+      "Software\\Classes\\Applications\\designcraft.exe",
+      "FriendlyAppName",
+      "DesignCraft"
+    ],
+    [
+      "-1",
+      "Software\\Classes\\Applications\\designcraft.exe\\shell\\open\\command",
+      "",
+      "\"[#DesigncraftExe]\" \"%1\""
+    ],
+    [
+      "-1",
+      "Software\\Classes\\Applications\\designcraft.exe\\SupportedTypes",
+      ".designcraft",
+      ""
+    ],
+    [
+      "-1",
+      "Software\\Classes\\Applications\\designcraft.exe\\SupportedTypes",
+      ".idml",
+      ""
+    ],
+    [
+      "-1",
+      "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\designcraft.exe",
+      "",
+      "[#DesigncraftExe]"
+    ]
+  ],
+  "mode": "dualScope"
+}
diff --git a/packaging/windows/install-policy.wxi b/packaging/windows/install-policy.wxi
new file mode 100644
index 000000000..28cad5b06
--- /dev/null
+++ b/packaging/windows/install-policy.wxi
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <!-- Choose scope before launch checks and directory costing. Never move an existing copy. -->
+  <!-- Only for me leaves ALLUSERS unset. Publishing ALLUSERS=2 here makes FindRelatedProducts treat the run as
+       per-machine and skip the existing per-user copy, so an interactive upgrade installs beside it
+       (two registered products, and uninstall leaves files behind). Checked with real msiexec runs. -->
+  <Property Id="INSTALLFOLDER" Secure="yes" />
+  <Property Id="CRAFT_SCOPE" Value="user" Secure="yes" />
+  <Property Id="CRAFT_U_DIR" Secure="yes"><RegistrySearch Id="CRAFT_U_DIRSearch" Root="HKCU" Key="Software\DesignCraft" Name="InstallDir" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_USER_DIR" Action="CraftUFromDIR" Value="[CRAFT_U_DIR]" After="AppSearch" Sequence="both" Condition="NOT CRAFT_USER_DIR AND CRAFT_U_DIR" />
+  <Property Id="CRAFT_U_FOLDER" Secure="yes"><RegistrySearch Id="CRAFT_U_FOLDERSearch" Root="HKCU" Key="Software\DesignCraft" Name="InstallFolder" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_USER_DIR" Action="CraftUFromFOLDER" Value="[CRAFT_U_FOLDER]" After="CraftUFromDIR" Sequence="both" Condition="NOT CRAFT_USER_DIR AND CRAFT_U_FOLDER" />
+  <Property Id="CRAFT_U_PATH" Secure="yes"><RegistrySearch Id="CRAFT_U_PATHSearch" Root="HKCU" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\designcraft.exe" Name="Path" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_USER_DIR" Action="CraftUFromPATH" Value="[CRAFT_U_PATH]" After="CraftUFromFOLDER" Sequence="both" Condition="NOT CRAFT_USER_DIR AND CRAFT_U_PATH" />
+  <Property Id="CRAFT_U_EXEFOLDER" Secure="yes"><RegistrySearch Id="CRAFT_ULegacyFolder" Root="HKCU" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\designcraft.exe" Type="file" /></Property>
+  <Property Id="CRAFT_U_EXE" Secure="yes"><RegistrySearch Id="CRAFT_ULegacyExe" Root="HKCU" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\designcraft.exe" Type="file"><FileSearch Id="CRAFT_ULegacyFile" Name="designcraft.exe" /></RegistrySearch></Property>
+  <SetProperty Id="CRAFT_USER_DIR" Action="CraftUFromLegacyExe" Value="[CRAFT_U_EXEFOLDER]" After="CraftUFromPATH" Sequence="both" Condition="NOT CRAFT_USER_DIR AND CRAFT_U_EXEFOLDER AND CRAFT_U_EXE" />
+  <Property Id="CRAFT_USER_DIR" Secure="yes" />
+  <Property Id="CRAFT_M_DIR" Secure="yes"><RegistrySearch Id="CRAFT_M_DIRSearch" Root="HKLM" Key="Software\DesignCraft" Name="InstallDir" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_MACHINE_DIR" Action="CraftMFromDIR" Value="[CRAFT_M_DIR]" After="CraftUFromLegacyExe" Sequence="both" Condition="NOT CRAFT_MACHINE_DIR AND CRAFT_M_DIR" />
+  <Property Id="CRAFT_M_FOLDER" Secure="yes"><RegistrySearch Id="CRAFT_M_FOLDERSearch" Root="HKLM" Key="Software\DesignCraft" Name="InstallFolder" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_MACHINE_DIR" Action="CraftMFromFOLDER" Value="[CRAFT_M_FOLDER]" After="CraftMFromDIR" Sequence="both" Condition="NOT CRAFT_MACHINE_DIR AND CRAFT_M_FOLDER" />
+  <Property Id="CRAFT_M_PATH" Secure="yes"><RegistrySearch Id="CRAFT_M_PATHSearch" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\designcraft.exe" Name="Path" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_MACHINE_DIR" Action="CraftMFromPATH" Value="[CRAFT_M_PATH]" After="CraftMFromFOLDER" Sequence="both" Condition="NOT CRAFT_MACHINE_DIR AND CRAFT_M_PATH" />
+  <Property Id="CRAFT_M_EXEFOLDER" Secure="yes"><RegistrySearch Id="CRAFT_MLegacyFolder" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\designcraft.exe" Type="file" /></Property>
+  <Property Id="CRAFT_M_EXE" Secure="yes"><RegistrySearch Id="CRAFT_MLegacyExe" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\designcraft.exe" Type="file"><FileSearch Id="CRAFT_MLegacyFile" Name="designcraft.exe" /></RegistrySearch></Property>
+  <SetProperty Id="CRAFT_MACHINE_DIR" Action="CraftMFromLegacyExe" Value="[CRAFT_M_EXEFOLDER]" After="CraftMFromPATH" Sequence="both" Condition="NOT CRAFT_MACHINE_DIR AND CRAFT_M_EXEFOLDER AND CRAFT_M_EXE" />
+  <Property Id="CRAFT_MACHINE_DIR" Secure="yes" />
+  <SetProperty Id="CRAFT_SCOPE" Action="CraftPreferMachineScope" Value="machine" After="CraftMFromLegacyExe" Sequence="ui" Condition="ALLUSERS = 1 OR (CRAFT_MACHINE_DIR AND NOT CRAFT_USER_DIR)" />
+  <SetProperty Id="INSTALLFOLDER" Action="CraftRestoreUserFolder" Value="[CRAFT_USER_DIR]" Before="CostInitialize" Sequence="both" Condition="NOT INSTALLFOLDER AND ALLUSERS &lt;&gt; 1 AND CRAFT_USER_DIR" />
+  <!-- The wizard can change the context after Windows Installer has already resolved Program Files for the first one.
+       Give the new-install folder explicitly so Everyone never lands in the profile and Only for me never lands in Program Files. -->
+  <?if $(sys.BUILDARCH) = x86 ?>
+  <SetProperty Id="INSTALLFOLDER" Action="CraftDefaultMachineFolder" Value="[%ProgramFiles(x86)]\ArtCraft\DesignCraft\" After="CraftRestoreUserFolder" Sequence="ui" Condition="NOT INSTALLFOLDER AND ALLUSERS = 1 AND VersionNT64" />
+  <SetProperty Id="INSTALLFOLDER" Action="CraftDefaultMachineFolder32" Value="[%ProgramFiles]\ArtCraft\DesignCraft\" After="CraftDefaultMachineFolder" Sequence="ui" Condition="NOT INSTALLFOLDER AND ALLUSERS = 1 AND NOT VersionNT64" />
+  <SetProperty Id="INSTALLFOLDER" Action="CraftDefaultUserFolder" Value="[LocalAppDataFolder]Programs\ArtCraft\DesignCraft\" After="CraftDefaultMachineFolder32" Sequence="ui" Condition="NOT INSTALLFOLDER AND ALLUSERS &lt;&gt; 1" />
+  <?else?>
+  <SetProperty Id="INSTALLFOLDER" Action="CraftDefaultMachineFolder" Value="[%ProgramW6432]\ArtCraft\DesignCraft\" After="CraftRestoreUserFolder" Sequence="ui" Condition="NOT INSTALLFOLDER AND ALLUSERS = 1" />
+  <SetProperty Id="INSTALLFOLDER" Action="CraftDefaultUserFolder" Value="[LocalAppDataFolder]Programs\ArtCraft\DesignCraft\" After="CraftDefaultMachineFolder" Sequence="ui" Condition="NOT INSTALLFOLDER AND ALLUSERS &lt;&gt; 1" />
+  <?endif?>
+  <SetProperty Id="INSTALLFOLDER" Action="CraftRestoreMachineFolder" Value="[CRAFT_MACHINE_DIR]" Before="CraftRestoreUserFolder" Sequence="both" Condition="NOT INSTALLFOLDER AND ALLUSERS = 1 AND CRAFT_MACHINE_DIR" />
+  <Launch Condition="Installed OR ALLUSERS &lt;&gt; 1 OR NOT CRAFT_USER_DIR" Message="This app is already installed for your account. Choose Only for me to update it, or uninstall that copy before changing who it is installed for." />
+  <Launch Condition="Installed OR ALLUSERS = 1 OR NOT CRAFT_MACHINE_DIR" Message="This app is already installed for everyone. Choose Everyone to update it, or pass ALLUSERS=1 to msiexec. Uninstall that copy before changing who it is installed for." />
+  <UI>
+    <TextStyle Id="CraftScopeText" FaceName="Segoe UI" Size="9" />
+    <TextStyle Id="CraftScopeTitle" FaceName="Segoe UI" Size="12" Bold="yes" />
+    <Dialog Id="CraftScopeDlg" Width="370" Height="220" Title="[ProductName] Setup" NoMinimize="yes">
+      <Control Id="Title" Type="Text" X="20" Y="15" Width="330" Height="30" Text="{\CraftScopeTitle}Who should use [ProductName]?" />
+      <Control Id="Info" Type="Text" X="20" Y="50" Width="330" Height="30" Text="{\CraftScopeText}An update keeps the existing folder. New copies use the ArtCraft folder under Programs." />
+      <Control Id="Scope" Type="RadioButtonGroup" X="20" Y="88" Width="330" Height="60" Property="CRAFT_SCOPE">
+        <RadioButtonGroup Property="CRAFT_SCOPE">
+          <RadioButton Value="user" X="0" Y="0" Width="330" Height="20" Text="Only for me (no administrator permission needed)" />
+          <RadioButton Value="machine" X="0" Y="30" Width="330" Height="20" Text="Everyone on this computer (asks an administrator)" />
+        </RadioButtonGroup>
+      </Control>
+      <Control Id="Next" Type="PushButton" X="214" Y="182" Width="66" Height="20" Default="yes" Text="Next">
+        <Publish Property="ALLUSERS" Value="1" Order="1" Condition="CRAFT_SCOPE = &quot;machine&quot;" />
+        <Publish Property="ALLUSERS" Value="{}" Order="2" Condition="CRAFT_SCOPE = &quot;user&quot;" />
+        <Publish Property="MSIINSTALLPERUSER" Value="{}" Order="3" Condition="CRAFT_SCOPE = &quot;machine&quot;" />
+        <Publish Property="MSIINSTALLPERUSER" Value="1" Order="4" Condition="CRAFT_SCOPE = &quot;user&quot;" />
+        <Publish Event="EndDialog" Value="Return" Order="5" />
+      </Control>
+      <Control Id="Cancel" Type="PushButton" X="290" Y="182" Width="60" Height="20" Cancel="yes" Text="Cancel"><Publish Event="EndDialog" Value="Exit" /></Control>
+    </Dialog>
+  </UI>
+  <InstallUISequence>
+    <Show Dialog="CraftScopeDlg" After="CraftPreferMachineScope" Condition="NOT Installed AND NOT REMOVE AND UILevel = 5" />
+    <!-- Related-product discovery runs once, so full UI must choose its context first. -->
+    <FindRelatedProducts After="CraftScopeDlg" />
+  </InstallUISequence>
+</Include>
diff --git a/packaging/windows/installer-ui.wxs b/packaging/windows/installer-ui.wxs
index c5c596c0b..1aac8cb8f 100644
--- a/packaging/windows/installer-ui.wxs
+++ b/packaging/windows/installer-ui.wxs
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by craft-installer for designcraft. Edit the template in craft-libs, then regenerate. -->
-<!-- Adapted from PdfCraft installer-ui.wxs (a6bc63a), GridCraft gridcraft.wxs (5b15827),
-     and EffectCraft installer-ui.wxs (1b4d47f).
-     Copyright (c) 2026 ArtCraft Team and the PdfCraft contributors.
-     Copyright (c) 2026 ArtCraft Team and the GridCraft contributors.
-     Copyright (c) 2026 ArtCraft Team and the EffectCraft contributors.
-     Licensed under MIT OR Apache-2.0; see the repository's LICENSE-MIT and LICENSE-APACHE. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
     <!-- Windows Installer populates files-in-use lists at runtime. Keep their table even
          though these dialogs have no static ListItem rows (the GridCraft UI does the same). -->
     <EnsureTable Id="ListBox" />
     <!-- Reuse the existing package icon as a fallback; MSI supplies its standard message icon. -->
-    <Binary Id="CraftInstallerErrorIcon" SourceFile="$(var.IconPath)" />
+    <Binary Id="CraftErrorIcon" SourceFile="$(var.IconPath)" />
 
 
     <UI Id="CraftInstallerUI">
@@ -22,7 +15,7 @@
       <Property Id="ErrorDialog" Value="CraftInstallerErrorDlg" />
       <Dialog Id="CraftInstallerErrorDlg" Width="320" Height="120" Title="[ProductName] Setup" ErrorDialog="yes" NoMinimize="yes">
         <Control Id="ErrorText" Type="Text" X="60" Y="15" Width="245" Height="65" TabSkip="no" />
-        <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="32" Height="32" FixedSize="yes" IconSize="32" TabSkip="yes" Text="CraftInstallerErrorIcon" />
+        <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="32" Height="32" FixedSize="yes" IconSize="32" TabSkip="yes" Text="CraftErrorIcon" />
         <Control Id="A" Type="PushButton" X="15" Y="90" Width="65" Height="20" Text="Abort" TabSkip="yes">
           <Publish Event="EndDialog" Value="ErrorAbort" />
         </Control>
@@ -46,8 +39,7 @@
         </Control>
       </Dialog>
       <Dialog Id="FilesInUse" Width="320" Height="190" Title="[ProductName] Setup" NoMinimize="yes">
-        <Control Id="Description" Type="Text" X="15" Y="15" Width="290" Height="35"
-            Text="Close the applications listed below, then choose Retry. Ignore may require a restart." />
+        <Control Id="Description" Type="Text" X="15" Y="15" Width="290" Height="35" Text="Close the applications listed below, then choose Retry. Ignore may require a restart." />
         <Control Id="Files" Type="ListBox" X="15" Y="55" Width="290" Height="85" Property="FileInUseProcess" />
         <Control Id="Retry" Type="PushButton" X="95" Y="155" Width="65" Height="20" Default="yes" Text="Retry">
           <Publish Event="EndDialog" Value="Retry" />
@@ -63,10 +55,14 @@
 
       <Dialog Id="InstallWelcome" Width="370" Height="270" Title="[ProductName] Setup">
         <Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Install [ProductName]" />
-        <Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="40"
-            Text="Setup will install [ProductName] for all users and add it to the Start menu. Click Install to continue." />
+        <Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="40" Text="Setup will install [ProductName] for all users and add it to the Start menu. Click Install to continue." HideCondition="ALLUSERS &lt;&gt; 1" ShowCondition="ALLUSERS = 1" />
+        <Control Id="DescriptionUser" Type="Text" X="20" Y="55" Width="330" Height="40" Text="Setup will install [ProductName] only for your account and add it to the Start menu. Click Install to continue." HideCondition="ALLUSERS = 1" ShowCondition="ALLUSERS &lt;&gt; 1" />
 
-        <Control Id="Install" Type="PushButton" X="195" Y="235" Width="75" Height="23" Default="yes" ElevationShield="yes" Text="&amp;Install">
+        <Control Id="Install" Type="PushButton" X="195" Y="235" Width="75" Height="23" Default="yes" DefaultCondition="ALLUSERS = 1" ElevationShield="yes" HideCondition="ALLUSERS &lt;&gt; 1" ShowCondition="ALLUSERS = 1" Text="&amp;Install">
+
+          <Publish Event="EndDialog" Value="Return" Order="99" />
+        </Control>
+        <Control Id="InstallUser" Type="PushButton" DefaultCondition="ALLUSERS &lt;&gt; 1" HideCondition="ALLUSERS = 1" ShowCondition="ALLUSERS &lt;&gt; 1" X="195" Y="235" Width="75" Height="23" Text="&amp;Install">
 
           <Publish Event="EndDialog" Value="Return" Order="99" />
         </Control>
@@ -77,16 +73,27 @@
 
       <Dialog Id="InstallMaintenance" Width="370" Height="270" Title="[ProductName] Setup">
         <Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Maintain [ProductName]" />
-        <Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70"
-            Text="[ProductName] is already installed. Choose Repair to restore missing files and shortcuts, or Remove to uninstall it." />
-        <Control Id="Repair" Type="PushButton" X="110" Y="235" Width="75" Height="23" Default="yes" ElevationShield="yes" Text="&amp;Repair">
+        <Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70" Text="[ProductName] is already installed. Choose Repair to restore missing files and shortcuts, or Remove to uninstall it." />
+        <Control Id="Repair" Type="PushButton" X="110" Y="235" Width="75" Height="23" Default="yes" DefaultCondition="ALLUSERS = 1" ElevationShield="yes" HideCondition="ALLUSERS &lt;&gt; 1" ShowCondition="ALLUSERS = 1" Text="&amp;Repair">
           <!-- Feature events do not retain REINSTALL/REMOVE in the client UI session. -->
           <Publish Property="CraftInstallerOperation" Value="repair" Order="1" />
           <Publish Event="ReinstallMode" Value="amus" Order="2" />
           <Publish Event="Reinstall" Value="ALL" Order="3" />
           <Publish Event="EndDialog" Value="Return" Order="4" />
         </Control>
-        <Control Id="Remove" Type="PushButton" X="195" Y="235" Width="75" Height="23" ElevationShield="yes" Text="R&amp;emove">
+        <Control Id="RepairUser" Type="PushButton" DefaultCondition="ALLUSERS &lt;&gt; 1" HideCondition="ALLUSERS = 1" ShowCondition="ALLUSERS &lt;&gt; 1" X="110" Y="235" Width="75" Height="23" Text="&amp;Repair">
+          <!-- Feature events do not retain REINSTALL/REMOVE in the client UI session. -->
+          <Publish Property="CraftInstallerOperation" Value="repair" Order="1" />
+          <Publish Event="ReinstallMode" Value="amus" Order="2" />
+          <Publish Event="Reinstall" Value="ALL" Order="3" />
+          <Publish Event="EndDialog" Value="Return" Order="4" />
+        </Control>
+        <Control Id="Remove" Type="PushButton" X="195" Y="235" Width="75" Height="23" ElevationShield="yes" HideCondition="ALLUSERS &lt;&gt; 1" ShowCondition="ALLUSERS = 1" Text="R&amp;emove">
+          <Publish Property="CraftInstallerOperation" Value="remove" Order="1" />
+          <Publish Event="Remove" Value="ALL" Order="2" />
+          <Publish Event="EndDialog" Value="Return" Order="3" />
+        </Control>
+        <Control Id="RemoveUser" Type="PushButton" HideCondition="ALLUSERS = 1" ShowCondition="ALLUSERS &lt;&gt; 1" X="195" Y="235" Width="75" Height="23" Text="R&amp;emove">
           <Publish Property="CraftInstallerOperation" Value="remove" Order="1" />
           <Publish Event="Remove" Value="ALL" Order="2" />
           <Publish Event="EndDialog" Value="Return" Order="3" />
@@ -121,16 +128,10 @@
       <Dialog Id="InstallComplete" Width="370" Height="270" Title="[ProductName] Setup">
         <Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Setup completed successfully" HideCondition="REMOVE = &quot;ALL&quot; OR CraftInstallerOperation = &quot;remove&quot;" />
         <Control Id="RemovedTitle" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Uninstall completed successfully" Hidden="yes" ShowCondition="REMOVE = &quot;ALL&quot; OR CraftInstallerOperation = &quot;remove&quot;" />
-        <Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70"
-            Text="[ProductName] is installed. Open it from the Start menu. Click Finish to close setup." HideCondition="REMOVE = &quot;ALL&quot; OR REINSTALL OR CraftInstallerOperation OR ACTION = &quot;ADMIN&quot;" />
-        <Control Id="Removed" Type="Text" X="20" Y="55" Width="330" Height="70" Hidden="yes"
-            Text="[ProductName] was uninstalled. Your documents and settings were kept. Click Finish to close setup."
-            ShowCondition="REMOVE = &quot;ALL&quot; OR CraftInstallerOperation = &quot;remove&quot;" />
-        <Control Id="Repaired" Type="Text" X="20" Y="55" Width="330" Height="70" Hidden="yes"
-            Text="[ProductName] was repaired. Open it from the Start menu. Click Finish to close setup."
-            ShowCondition="(REINSTALL OR CraftInstallerOperation = &quot;repair&quot;) AND NOT REMOVE AND CraftInstallerOperation &lt;&gt; &quot;remove&quot; AND ACTION &lt;&gt; &quot;ADMIN&quot;" />
-        <Control Id="AdminComplete" Type="Text" X="20" Y="55" Width="330" Height="70" Hidden="yes"
-            Text="The administrative image was created. Click Finish to close setup." ShowCondition="ACTION = &quot;ADMIN&quot;" />
+        <Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70" Text="[ProductName] is installed. Open it from the Start menu. Click Finish to close setup." HideCondition="REMOVE = &quot;ALL&quot; OR REINSTALL OR CraftInstallerOperation OR ACTION = &quot;ADMIN&quot;" />
+        <Control Id="Removed" Type="Text" X="20" Y="55" Width="330" Height="70" Hidden="yes" Text="[ProductName] was uninstalled. Your documents and settings were kept. Click Finish to close setup." ShowCondition="REMOVE = &quot;ALL&quot; OR CraftInstallerOperation = &quot;remove&quot;" />
+        <Control Id="Repaired" Type="Text" X="20" Y="55" Width="330" Height="70" Hidden="yes" Text="[ProductName] was repaired. Open it from the Start menu. Click Finish to close setup." ShowCondition="(REINSTALL OR CraftInstallerOperation = &quot;repair&quot;) AND NOT REMOVE AND CraftInstallerOperation &lt;&gt; &quot;remove&quot; AND ACTION &lt;&gt; &quot;ADMIN&quot;" />
+        <Control Id="AdminComplete" Type="Text" X="20" Y="55" Width="330" Height="70" Hidden="yes" Text="The administrative image was created. Click Finish to close setup." ShowCondition="ACTION = &quot;ADMIN&quot;" />
         <Control Id="Finish" Type="PushButton" X="280" Y="235" Width="70" Height="23" Default="yes" Cancel="yes" Text="&amp;Finish">
 
           <Publish Event="EndDialog" Value="Return" Order="999" />
@@ -140,8 +141,7 @@
 
       <Dialog Id="InstallFailed" Width="370" Height="270" Title="[ProductName] Setup">
         <Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Setup failed" />
-        <Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70"
-            Text="[ProductName] setup could not be completed. Resolve the reported error and run setup again." />
+        <Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70" Text="[ProductName] setup could not be completed. Resolve the reported error and run setup again." />
         <Control Id="Finish" Type="PushButton" X="280" Y="235" Width="70" Height="23" Default="yes" Cancel="yes" Text="&amp;Finish">
           <Publish Event="EndDialog" Value="Return" />
         </Control>
@@ -149,8 +149,7 @@
 
       <Dialog Id="InstallCancelled" Width="370" Height="270" Title="[ProductName] Setup">
         <Control Id="Title" Type="Text" X="20" Y="20" Width="330" Height="25" Text="{\CraftInstallerTitle}Setup cancelled" />
-        <Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70"
-            Text="[ProductName] setup was cancelled. Run setup again when you are ready." />
+        <Control Id="Description" Type="Text" X="20" Y="55" Width="330" Height="70" Text="[ProductName] setup was cancelled. Run setup again when you are ready." />
         <Control Id="Finish" Type="PushButton" X="280" Y="235" Width="70" Height="23" Default="yes" Cancel="yes" Text="&amp;Finish">
           <Publish Event="EndDialog" Value="Return" />
         </Control>
@@ -161,8 +160,7 @@
            continues; Cancel ends setup. -->
       <Dialog Id="MsiRMFilesInUse" Width="370" Height="200" Title="[ProductName] Setup" KeepModeless="yes">
         <Control Id="Title" Type="Text" X="20" Y="15" Width="330" Height="25" Text="{\CraftInstallerTitle}Files in use" />
-        <Control Id="Description" Type="Text" X="20" Y="45" Width="330" Height="30"
-            Text="These programs are using files that setup needs to update. Click OK to close them and continue, or Cancel to stop setup." />
+        <Control Id="Description" Type="Text" X="20" Y="45" Width="330" Height="30" Text="These programs are using files that setup needs to update. Click OK to close them and continue, or Cancel to stop setup." />
         <Control Id="List" Type="ListBox" X="20" Y="80" Width="330" Height="55" Property="FileInUseProcess" Sunken="yes" TabSkip="yes" />
         <Control Id="OK" Type="PushButton" X="195" Y="165" Width="75" Height="23" Default="yes" Text="OK">
           <Publish Property="MSIRMSHUTDOWN" Value="2" Order="1" />
@@ -197,12 +195,12 @@
     <Property Id="ARPSYSTEMCOMPONENT" Value="1" />
     <?if $(sys.BUILDARCH) = x86 ?>
       <?define CraftMsiSystemFolder = SystemFolder ?>
-    <?else ?>
+    <?else?>
       <?define CraftMsiSystemFolder = System64Folder ?>
-    <?endif ?>
+    <?endif?>
     <ComponentGroup Id="CraftInstallerSettings" Directory="INSTALLFOLDER">
       <Component Id="CraftInstallerSettingsEntry" Guid="*">
-        <RegistryKey Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Craft.designcraft" ForceDeleteOnUninstall="yes">
+        <RegistryKey Root="HKMU" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Craft.designcraft" ForceDeleteOnUninstall="yes">
           <!-- Legacy Launchers match the canonical MSI name exactly; keep this alias distinct. -->
           <RegistryValue Name="DisplayName" Type="string" Value="[ProductName] (Craft Apps)" KeyPath="yes" />
           <RegistryValue Name="DisplayVersion" Type="string" Value="[ProductVersion]" />
@@ -220,8 +218,7 @@
       </Component>
       <!-- Preserve the app-owned ARPNOMODIFY policy instead of inventing a new default. -->
       <Component Id="CraftInstallerSettingsNoModify" Guid="*" Condition="ARPNOMODIFY = &quot;1&quot;">
-        <RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Craft.designcraft"
-            Name="NoModify" Type="integer" Value="1" KeyPath="yes" />
+        <RegistryValue Root="HKMU" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Craft.designcraft" Name="NoModify" Type="integer" Value="1" KeyPath="yes" />
       </Component>
     </ComponentGroup>
   </Fragment>
diff --git a/packaging/windows/package.ps1 b/packaging/windows/package.ps1
index d413442a6..922790512 100644
--- a/packaging/windows/package.ps1
+++ b/packaging/windows/package.ps1
@@ -90,13 +90,32 @@ Copy-Item (Join-Path $Bin 'designcraft.exe'), (Join-Path $Bin 'designcraft-cli.e
 
 & (Join-Path $PSScriptRoot 'sign.ps1') (Join-Path $Stage 'designcraft.exe') (Join-Path $Stage 'designcraft-cli.exe')
 
+# Required embedded-font notices ship independently of optional font inputs.
+Copy-Item -LiteralPath (Join-Path $Root 'NOTICE') -Destination $Stage
+
+# ---- font notices for the MSI ------------------------------------------------------------------
+# The portable ZIP already carries these notices; stage the complete files before MSI creation too.
+$Docs = Join-Path $Stage 'font-licences'
+New-Item -ItemType Directory -Force -Path $Docs | Out-Null
+$HasCraftFontLicences = 0
+if ($env:CRAFT_FONTS_DIR) {
+  foreach ($ofl in Get-ChildItem -Path (Join-Path $env:CRAFT_FONTS_DIR 'fonts\*\OFL.txt') -File -ErrorAction SilentlyContinue) {
+    Copy-Item -LiteralPath $ofl.FullName -Destination (Join-Path $Docs "OFL-$($ofl.Directory.Name).txt")
+    $HasCraftFontLicences = 1
+  }
+}
+# ---- end font notices for the MSI --------------------------------------------------------------
+
 # ---- MSI ---------------------------------------------------------------------------------------
 $Msi = Join-Path $Dist "designcraft-$Version-windows-$Arch.msi"
 Invoke-Native 'wix build' {
   wix build (Join-Path $PSScriptRoot 'designcraft.wxs') (Join-Path $PSScriptRoot 'installer-ui.wxs') -arch $Arch `
     -d "Version=$MsiVersion" -d "BinDir=$Stage" -d "IconPath=$(Join-Path $Root 'assets\app-icon\designcraft.ico')" `
+    -d "DocsDir=$Docs" -d "HasCraftFontLicences=$HasCraftFontLicences" `
     -o $Msi
 }
+# Check the compiled scope, path and registration contract before signing.
+& (Join-Path $PSScriptRoot 'check-install-policy.ps1') -MsiPath $Msi
 # wix writes its debug symbols (.wixpdb) next to the MSI; keep them out of the release assets.
 Remove-Item -Force -ErrorAction SilentlyContinue ([IO.Path]::ChangeExtension($Msi, '.wixpdb'))
 & (Join-Path $PSScriptRoot 'sign.ps1') $Msi
@@ -112,7 +131,7 @@ Set-Content -Encoding ascii -Path (Join-Path $Portable 'portable.txt') -Value @(
   'DesignCraft portable: preferences, logs and crash recovery are kept in the DesignCraftData folder',
   'next to designcraft.exe. Delete this file to use %APPDATA%\DesignCraft instead.'
 )
-foreach ($f in 'README.md', 'LICENSE', 'LICENSE-MIT', 'LICENSE-APACHE') {
+foreach ($f in 'README.md', 'LICENSE', 'LICENSE-MIT', 'LICENSE-APACHE', 'NOTICE') {
   $p = Join-Path $Root $f
   if (Test-Path $p) { Copy-Item $p $Portable }
 }
diff --git a/packaging/windows/test-install-policy.ps1 b/packaging/windows/test-install-policy.ps1
new file mode 100644
index 000000000..d455d19d1
--- /dev/null
+++ b/packaging/windows/test-install-policy.ps1
@@ -0,0 +1,54 @@
+<#
+.SYNOPSIS
+  Build non-executable installer metadata fixtures; never install them.
+#>
+param(
+  [Parameter(Mandatory = $true)] [string] $OutputDirectory,
+  [ValidateSet('x64','x86','arm64')] [string[]] $Architectures = @('x64','x86','arm64')
+)
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version Latest
+$root = (Resolve-Path (Join-Path $PSScriptRoot '..\..')).Path
+$policy = Get-Content -Raw -LiteralPath (Join-Path $PSScriptRoot 'install-policy.json') | ConvertFrom-Json
+[void](New-Item -ItemType Directory -Force -Path $OutputDirectory)
+$output = (Resolve-Path -LiteralPath $OutputDirectory).Path
+Add-Type -AssemblyName System.Drawing
+foreach ($arch in $Architectures) {
+  $stage = Join-Path $output $arch
+  [void](New-Item -ItemType Directory -Force -Path $stage)
+  foreach ($name in $policy.payloads) {
+    $destination = Join-Path $stage $name
+    [void](New-Item -ItemType Directory -Force -Path ([IO.Path]::GetDirectoryName($destination)))
+    Set-Content -LiteralPath $destination -Encoding Ascii -Value 'NON-EXECUTABLE MSI METADATA TEST FIXTURE'
+  }
+  foreach ($folder in @('docs','models','notices')) {
+    $path = Join-Path $stage $folder
+    [void](New-Item -ItemType Directory -Force -Path $path)
+    Set-Content -LiteralPath (Join-Path $path "$folder-fixture.txt") -Value 'Metadata test fixture, not a user file or model.'
+  }
+  foreach ($model in @('metadata-one.rten','metadata-two.rten')) {
+    Set-Content -LiteralPath (Join-Path (Join-Path $stage 'models') $model) -Encoding Ascii -Value 'NON-EXECUTABLE MODEL METADATA FIXTURE'
+  }
+  foreach ($spec in @(@('banner.bmp',493,58),@('dialog.bmp',493,312))) {
+    $bitmap = [Drawing.Bitmap]::new($spec[1],$spec[2],[Drawing.Imaging.PixelFormat]::Format24bppRgb)
+    try { $bitmap.Save((Join-Path $stage $spec[0]),[Drawing.Imaging.ImageFormat]::Bmp) }
+    finally { $bitmap.Dispose() }
+  }
+  Set-Content -LiteralPath (Join-Path $stage 'licence.rtf') -Encoding Ascii -Value '{\rtf1 Metadata test fixture.}'
+  $sources = @($policy.sources | ForEach-Object { Join-Path $PSScriptRoot $_ })
+  $msi = Join-Path $stage "$($policy.id)-NOT-INSTALLABLE.msi"
+  $extensions = @($policy.extensions | ForEach-Object { '-ext'; "WixToolset.$_.wixext" })
+  & wix build @sources -arch $arch @extensions `
+    -culture en-US -d 'Version=0.0.1' -d 'DisplayVersion=0.0.1-metadata-test' `
+    -d "BinDir=$stage" -d "IconPath=$(Join-Path $root $policy.icon)" `
+    -d "DocsDir=$(Join-Path $stage 'docs')" -d "ModelsDir=$(Join-Path $stage 'models')" `
+    -d "AppNoticesDir=$(Join-Path $stage 'notices')" -d 'HasCraftFontLicences=1' -d 'HasCli=1' `
+    -d "BannerBmp=$(Join-Path $stage 'banner.bmp')" -d "DialogBmp=$(Join-Path $stage 'dialog.bmp')" `
+    -d "UiBannerBmp=$(Join-Path $stage 'banner.bmp')" -d "UiDialogBmp=$(Join-Path $stage 'dialog.bmp')" `
+    -d "LicenseRtf=$(Join-Path $stage 'licence.rtf')" -o $msi @($policy.localization | ForEach-Object { '-loc'; Join-Path $PSScriptRoot $_ })
+  if ($LASTEXITCODE -ne 0) { throw "WiX validation failed for $arch (exit $LASTEXITCODE)." }
+  $shell = (Get-Process -Id $PID).Path
+  & $shell -NoProfile -ExecutionPolicy Bypass -File (Join-Path $PSScriptRoot 'check-install-policy.ps1') -MsiPath $msi
+  if ($LASTEXITCODE -ne 0) { throw "Compiled installer policy failed for $arch (exit $LASTEXITCODE)." }
+  Write-Output "PASS $arch metadata-only package. This is not an executable installer."
+}
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index df7dfa877..6d935ae8f 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -5,5 +5,8 @@ edition.workspace = true
 license.workspace = true
 publish = false
 
+[lints]
+workspace = true
+
 [dependencies]
 serde_json = { workspace = true }
diff --git a/xtask/src/layers.rs b/xtask/src/layers.rs
index 8355fb95d..cff38ae87 100644
--- a/xtask/src/layers.rs
+++ b/xtask/src/layers.rs
@@ -74,7 +74,7 @@ fn intra_layer_allowed(from: &str, to: &str) -> bool {
 
 /// External crates that constitute a UI toolkit / windowing dependency.
 /// Entries ending in `*` are prefixes.
-pub const UI_CRATES: &[&str] = &["craft-ui", "egui", "eframe", "winit", "egui_kittest", "rfd", "bevy*"];
+pub const UI_CRATES: &[&str] = &["craft-ui", "craft-window", "egui", "eframe", "winit", "egui_kittest", "rfd", "bevy*"];
 
 /// First layer allowed to use UI crates.
 pub const UI_MIN_LAYER: u8 = 6;
diff --git a/xtask/src/pdf_deps.rs b/xtask/src/pdf_deps.rs
index 7e9677d52..2f33f3109 100644
--- a/xtask/src/pdf_deps.rs
+++ b/xtask/src/pdf_deps.rs
@@ -4,7 +4,8 @@ use std::process::Command;
 
 use serde_json::Value;
 
-const REV: &str = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef";
+const REPO: &str = "https://github.com/storytold/craft-libs";
+const REV: &str = "92d392cff132eaf53e13afff77f38b5c11b73aa0";
 const PACKAGES: &[(&str, &str)] = &[
     ("craft-pdf", "0.1.0"),
     ("krilla", "0.8.2"),
@@ -13,6 +14,7 @@ const PACKAGES: &[(&str, &str)] = &[
     ("hayro-syntax", "0.7.2"),
     ("hayro-jbig2", "0.3.0"),
     ("hayro-cmap", "0.1.0"),
+    ("hayro-postscript", "0.1.0"),
 ];
 
 pub fn run(root: &Path) -> Result<(), String> {
@@ -32,7 +34,7 @@ pub fn run(root: &Path) -> Result<(), String> {
 
 fn validate(metadata: &Value) -> Result<(), String> {
     let packages = metadata.get("packages").and_then(Value::as_array).ok_or("cargo metadata has no packages")?;
-    let source = format!("git+https://github.com/storytold/craft-libs?rev={REV}#{REV}");
+    let source = format!("git+{REPO}?rev={REV}#{REV}");
     for (name, version) in PACKAGES {
         let matching: Vec<_> = packages.iter().filter(|p| p.get("name").and_then(Value::as_str) == Some(name)).collect();
         let [package] = matching.as_slice() else {
@@ -61,7 +63,7 @@ mod tests {
 
     fn metadata() -> Value {
         json!({"packages": PACKAGES.iter().map(|(name, version)| json!({"id":name,"name":name,"version":version,
-            "source":format!("git+https://github.com/storytold/craft-libs?rev={REV}#{REV}")})).collect::<Vec<_>>(), "resolve": {"nodes": [{"id": "craft-pdf", "features": ["read", "interpret", "raster", "write", "write-pdf"]}]}})
+            "source":format!("git+{REPO}?rev={REV}#{REV}")})).collect::<Vec<_>>(), "resolve": {"nodes": [{"id": "craft-pdf", "features": ["read", "interpret", "raster", "write", "write-pdf"]}]}})
     }
 
     #[test]